From 034d03f514e653e0c689dd23ea6f0c19a46981db Mon Sep 17 00:00:00 2001
From: Oliver Kopp <kopp.dev@gmail.com>
Date: Thu, 26 Oct 2023 16:27:25 +0200
Subject: [PATCH 01/27] Switch to prettier-java

---
 .gitignore                                    |  3 +
 .prettierrc.yaml                              |  3 +
 .vscode/settings.json                         |  3 +-
 build.gradle                                  | 15 +++-
 config/IntelliJ Code Style.xml                | 12 +---
 config/checkstyle/checkstyle.xml              | 67 +++++++++++++++---
 config/checkstyle/checkstyle_reviewdog.xml    | 69 +++++++++++++++----
 .../intellij-13-code-style.md                 | 32 ++++-----
 ...ij.md => intellij-80-run-with-intellij.md} |  2 +-
 .../intellij-81-use-prettier-java.md          | 22 ++++++
 10 files changed, 173 insertions(+), 55 deletions(-)
 create mode 100644 .prettierrc.yaml
 rename docs/getting-into-the-code/guidelines-for-setting-up-a-local-workspace/{intellij-89-run-with-intellij.md => intellij-80-run-with-intellij.md} (99%)
 create mode 100644 docs/getting-into-the-code/guidelines-for-setting-up-a-local-workspace/intellij-81-use-prettier-java.md

diff --git a/.gitignore b/.gitignore
index 28c62cbe9f0..8873797b7fd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,6 @@
+package.json
+package-lock.json
+
 # no generated files in version control
 src/main/gen/
 src/main/generated/
diff --git a/.prettierrc.yaml b/.prettierrc.yaml
new file mode 100644
index 00000000000..eed5d963f44
--- /dev/null
+++ b/.prettierrc.yaml
@@ -0,0 +1,3 @@
+tabWidth: 4
+plugins:
+  - prettier-plugin-java
diff --git a/.vscode/settings.json b/.vscode/settings.json
index 2094775de07..97f15775553 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -2,5 +2,6 @@
     "java.configuration.updateBuildConfiguration": "interactive",
     "java.format.settings.url": "/config/VSCode Code Style.xml",
     "java.checkstyle.configuration": "${workspaceFolder}/config/checkstyle/checkstyle_reviewdog.xml",
-    "java.checkstyle.version": "10.3.4"
+    "java.checkstyle.version": "10.3.4",
+    "java.completion.importOrder": ["#"]
 }
diff --git a/build.gradle b/build.gradle
index c72f3c74bd0..31bf0d8773b 100644
--- a/build.gradle
+++ b/build.gradle
@@ -2,6 +2,16 @@ import org.gradle.internal.os.OperatingSystem
 import org.jabref.build.xjc.XjcPlugin
 import org.jabref.build.xjc.XjcTask
 
+buildscript {
+    repositories {
+        gradlePluginPortal()
+        mavenCentral()
+    }
+    dependencies {
+        classpath("io.spring.javaformat:spring-javaformat-gradle-plugin:0.0.40")
+    }
+}
+
 plugins {
     id 'application'
 
@@ -22,17 +32,18 @@ plugins {
     id 'jacoco'
 
     id 'checkstyle'
+    id 'org.openrewrite.rewrite' version '6.4.0'
 
     id 'project-report'
 
     id 'idea'
-
-    id 'org.openrewrite.rewrite' version '6.4.0'
 }
 
 // Enable following for debugging
 // gradle.startParameter.showStacktrace = org.gradle.api.logging.configuration.ShowStacktrace.
 
+apply plugin: 'io.spring.javaformat'
+
 apply plugin: XjcPlugin
 
 apply from: 'eclipse.gradle'
diff --git a/config/IntelliJ Code Style.xml b/config/IntelliJ Code Style.xml
index 6a03e104d9d..3db7387111f 100644
--- a/config/IntelliJ Code Style.xml	
+++ b/config/IntelliJ Code Style.xml	
@@ -11,28 +11,20 @@
     </option>
     <option name="IMPORT_LAYOUT_TABLE">
       <value>
-        <package name="java" withSubpackages="true" static="false" />
-        <emptyLine />
-        <package name="javax" withSubpackages="true" static="false" />
-        <emptyLine />
-        <package name="javafx" withSubpackages="true" static="false" />
-        <emptyLine />
-        <package name="org.jabref" withSubpackages="true" static="false" />
+        <package name="" withSubpackages="true" static="true" />
         <emptyLine />
         <package name="" withSubpackages="true" static="false" />
-        <emptyLine />
-        <package name="" withSubpackages="true" static="true" />
       </value>
     </option>
   </JavaCodeStyleSettings>
   <codeStyleSettings language="JAVA">
+    <option name="RIGHT_MARGIN" value="255" />
     <option name="KEEP_CONTROL_STATEMENT_IN_ONE_LINE" value="false" />
     <option name="KEEP_BLANK_LINES_IN_DECLARATIONS" value="1" />
     <option name="KEEP_BLANK_LINES_IN_CODE" value="1" />
     <option name="KEEP_BLANK_LINES_BEFORE_RBRACE" value="0" />
     <option name="ALIGN_MULTILINE_CHAINED_METHODS" value="true" />
     <option name="SPACE_BEFORE_ARRAY_INITIALIZER_LBRACE" value="true" />
-    <option name="WRAP_COMMENTS" value="true" />
     <arrangement>
       <rules>
         <section>
diff --git a/config/checkstyle/checkstyle.xml b/config/checkstyle/checkstyle.xml
index b40e6b25d37..9585805c012 100644
--- a/config/checkstyle/checkstyle.xml
+++ b/config/checkstyle/checkstyle.xml
@@ -3,6 +3,8 @@
         "-//Puppy Crawl//DTD Check Configuration 1.3//EN"
         "http://www.checkstyle.org/dtds/configuration_1_3.dtd">
 
+<!-- Extended version of https://github.com/jhipster/prettier-java/blob/main/docs/checkstyle/checkstyle.xml -->
+
 <module name="Checker">
     <property name="charset" value="UTF-8"/>
 
@@ -38,6 +40,8 @@
     <!-- LineLength not in place as PreviewerViewer and RelatedArticlesTab have line length with more than 500 charachters -->
 
     <module name="TreeWalker">
+        <module name="OuterTypeFilename"/>
+
         <!-- Checks for Javadoc comments: https://checkstyle.org/config_javadoc.html -->
         <module name="InvalidJavadocPosition"/>
         <module name="JavadocMethod">
@@ -53,12 +57,12 @@
         <module name="RedundantImport"/>
         <module name="AvoidStarImport"/>
         <module name="IllegalImport"/>
-        <module name="ImportOrder">
-            <property name="groups" value="java,javax,javafx,org.jabref,*"/>
-            <property name="ordered" value="true"/>
-            <property name="separated" value="true"/>
-            <property name="option" value="bottom"/>
-            <property name="sortStaticImportsAlphabetically" value="true"/>
+
+        <module name="CustomImportOrder">
+            <property name="sortImportsInGroupAlphabetically" value="true"/>
+            <property name="separateLineBetweenGroups" value="true"/>
+            <property name="customImportOrderRules" value="STATIC###THIRD_PARTY_PACKAGE"/>
+            <property name="tokens" value="IMPORT, STATIC_IMPORT, PACKAGE_DEF"/>
         </module>
 
         <!-- Checks for whitespace: https://checkstyle.org/config_whitespace.html -->
@@ -67,19 +71,53 @@
         <module name="EmptyLineSeparator">
             <!-- check all except variable declarations -->
             <property name="tokens"
-                      value="IMPORT, STATIC_IMPORT, CLASS_DEF, INTERFACE_DEF, ENUM_DEF, STATIC_INIT, INSTANCE_INIT, METHOD_DEF, CTOR_DEF"/>
+                        value="PACKAGE_DEF, IMPORT, STATIC_IMPORT, CLASS_DEF, INTERFACE_DEF, ENUM_DEF,
+                            STATIC_INIT, INSTANCE_INIT, CTOR_DEF, VARIABLE_DEF, RECORD_DEF,
+                            COMPACT_CTOR_DEF"/>
             <property name="allowMultipleEmptyLines" value="false"/>
             <property name="allowMultipleEmptyLinesInsideClassMembers" value="false"/>
+            <property name="allowNoEmptyLineBetweenFields" value="true"/>
+        </module>
+        <module name="GenericWhitespace">
+        <message key="ws.followed"
+                value="GenericWhitespace ''{0}'' is followed by whitespace."/>
+        <message key="ws.preceded"
+                value="GenericWhitespace ''{0}'' is preceded with whitespace."/>
+        <message key="ws.illegalFollow"
+                value="GenericWhitespace ''{0}'' should followed by whitespace."/>
+        <message key="ws.notPreceded"
+                value="GenericWhitespace ''{0}'' is not preceded with whitespace."/>
+        </module>
+        <module name="MethodParamPad">
+            <property name="tokens"
+                      value="CTOR_DEF, LITERAL_NEW, METHOD_CALL, METHOD_DEF,
+                            SUPER_CTOR_CALL, ENUM_CONSTANT_DEF, RECORD_DEF"/>
+        </module>
+        <module name="NoLineWrap">
+            <property name="tokens" value="PACKAGE_DEF, IMPORT, STATIC_IMPORT"/>
         </module>
-        <module name="GenericWhitespace"/>
-        <module name="MethodParamPad"/>
-        <module name="NoLineWrap"/>
         <module name="NoWhitespaceAfter"/>
-        <module name="NoWhitespaceBefore"/>
+        <module name="NoWhitespaceBefore">
+            <property name="tokens"
+                        value="COMMA, SEMI, POST_INC, POST_DEC, DOT,
+                            LABELED_STAT, METHOD_REF"/>
+            <property name="allowLineBreaks" value="true"/>
+        </module>
         <module name="ParenPad"/>
         <module name="SeparatorWrap">
             <property name="tokens" value="COMMA, SEMI, ELLIPSIS, ARRAY_DECLARATOR, RBRACK, METHOD_REF"/>
         </module>
+        <module name="SeparatorWrap">
+            <property name="id" value="SeparatorWrapDot"/>
+            <property name="tokens" value="DOT"/>
+            <property name="option" value="nl"/>
+        </module>
+        <module name="SeparatorWrap">
+            <property name="id" value="SeparatorWrapComma"/>
+            <property name="tokens" value="COMMA"/>
+            <property name="option" value="EOL"/>
+        </module>
+
         <module name="SingleSpaceSeparator"/>
         <module name="NoWhitespaceBeforeCaseDefaultColon"/>
         <module name="WhitespaceAfter"/>
@@ -135,6 +173,7 @@
         <module name="OneStatementPerLine">
             <property name="treatTryResourcesAsStatement" value="true"/>
         </module>
+        <module name="ModifierOrder"/>
 
         <module name="UnnecessarySemicolonInTryWithResources"/>
 
@@ -158,5 +197,11 @@
         <module name="IllegalIdentifierName"/>
 
         <module name="RecordTypeParameterNameCheck"/>
+
+        <module name="AnnotationLocation">
+            <property name="allowSamelineMultipleAnnotations" value="false"/>
+            <property name="allowSamelineSingleParameterlessAnnotation" value="false"/>
+            <property name="allowSamelineParameterizedAnnotation" value="false"/>
+        </module>
     </module>
 </module>
diff --git a/config/checkstyle/checkstyle_reviewdog.xml b/config/checkstyle/checkstyle_reviewdog.xml
index 510baff905f..38690052390 100644
--- a/config/checkstyle/checkstyle_reviewdog.xml
+++ b/config/checkstyle/checkstyle_reviewdog.xml
@@ -3,6 +3,8 @@
         "-//Puppy Crawl//DTD Check Configuration 1.3//EN"
         "http://www.checkstyle.org/dtds/configuration_1_3.dtd">
 
+<!-- Extended version of https://github.com/jhipster/prettier-java/blob/main/docs/checkstyle/checkstyle.xml -->
+
 <module name="Checker">
     <property name="charset" value="UTF-8"/>
 
@@ -15,7 +17,7 @@
     </module>
 
     <module name="BeforeExecutionExclusionFileFilter">
-        <property name="fileNamePattern" value="(module\-info|heylogs)\.java$"/>
+        <property name="fileNamePattern" value="module\-info\.java$"/>
     </module>
 
     <module name="FileTabCharacter"/>
@@ -38,6 +40,8 @@
     <!-- LineLength not in place as PreviewerViewer and RelatedArticlesTab have line length with more than 500 charachters -->
 
     <module name="TreeWalker">
+        <module name="OuterTypeFilename"/>
+
         <!-- Checks for Javadoc comments: https://checkstyle.org/config_javadoc.html -->
         <module name="InvalidJavadocPosition"/>
         <module name="JavadocMethod">
@@ -53,12 +57,12 @@
         <module name="RedundantImport"/>
         <module name="AvoidStarImport"/>
         <module name="IllegalImport"/>
-        <module name="ImportOrder">
-            <property name="groups" value="java,javax,javafx,org.jabref,*"/>
-            <property name="ordered" value="true"/>
-            <property name="separated" value="true"/>
-            <property name="option" value="bottom"/>
-            <property name="sortStaticImportsAlphabetically" value="true"/>
+
+        <module name="CustomImportOrder">
+            <property name="sortImportsInGroupAlphabetically" value="true"/>
+            <property name="separateLineBetweenGroups" value="true"/>
+            <property name="customImportOrderRules" value="STATIC###THIRD_PARTY_PACKAGE"/>
+            <property name="tokens" value="IMPORT, STATIC_IMPORT, PACKAGE_DEF"/>
         </module>
 
         <!-- Checks for whitespace: https://checkstyle.org/config_whitespace.html -->
@@ -67,19 +71,53 @@
         <module name="EmptyLineSeparator">
             <!-- check all except variable declarations -->
             <property name="tokens"
-                      value="IMPORT, STATIC_IMPORT, CLASS_DEF, INTERFACE_DEF, ENUM_DEF, STATIC_INIT, INSTANCE_INIT, METHOD_DEF, CTOR_DEF"/>
+                        value="PACKAGE_DEF, IMPORT, STATIC_IMPORT, CLASS_DEF, INTERFACE_DEF, ENUM_DEF,
+                            STATIC_INIT, INSTANCE_INIT, CTOR_DEF, VARIABLE_DEF, RECORD_DEF,
+                            COMPACT_CTOR_DEF"/>
             <property name="allowMultipleEmptyLines" value="false"/>
             <property name="allowMultipleEmptyLinesInsideClassMembers" value="false"/>
+            <property name="allowNoEmptyLineBetweenFields" value="true"/>
+        </module>
+        <module name="GenericWhitespace">
+        <message key="ws.followed"
+                value="GenericWhitespace ''{0}'' is followed by whitespace."/>
+        <message key="ws.preceded"
+                value="GenericWhitespace ''{0}'' is preceded with whitespace."/>
+        <message key="ws.illegalFollow"
+                value="GenericWhitespace ''{0}'' should followed by whitespace."/>
+        <message key="ws.notPreceded"
+                value="GenericWhitespace ''{0}'' is not preceded with whitespace."/>
+        </module>
+        <module name="MethodParamPad">
+            <property name="tokens"
+                      value="CTOR_DEF, LITERAL_NEW, METHOD_CALL, METHOD_DEF,
+                            SUPER_CTOR_CALL, ENUM_CONSTANT_DEF, RECORD_DEF"/>
+        </module>
+        <module name="NoLineWrap">
+            <property name="tokens" value="PACKAGE_DEF, IMPORT, STATIC_IMPORT"/>
         </module>
-        <module name="GenericWhitespace"/>
-        <module name="MethodParamPad"/>
-        <module name="NoLineWrap"/>
         <module name="NoWhitespaceAfter"/>
-        <module name="NoWhitespaceBefore"/>
+        <module name="NoWhitespaceBefore">
+            <property name="tokens"
+                        value="COMMA, SEMI, POST_INC, POST_DEC, DOT,
+                            LABELED_STAT, METHOD_REF"/>
+            <property name="allowLineBreaks" value="true"/>
+        </module>
         <module name="ParenPad"/>
         <module name="SeparatorWrap">
             <property name="tokens" value="COMMA, SEMI, ELLIPSIS, ARRAY_DECLARATOR, RBRACK, METHOD_REF"/>
         </module>
+        <module name="SeparatorWrap">
+            <property name="id" value="SeparatorWrapDot"/>
+            <property name="tokens" value="DOT"/>
+            <property name="option" value="nl"/>
+        </module>
+        <module name="SeparatorWrap">
+            <property name="id" value="SeparatorWrapComma"/>
+            <property name="tokens" value="COMMA"/>
+            <property name="option" value="EOL"/>
+        </module>
+
         <module name="SingleSpaceSeparator"/>
         <module name="NoWhitespaceBeforeCaseDefaultColon"/>
         <module name="WhitespaceAfter"/>
@@ -135,6 +173,7 @@
         <module name="OneStatementPerLine">
             <property name="treatTryResourcesAsStatement" value="true"/>
         </module>
+        <module name="ModifierOrder"/>
 
         <module name="UnnecessarySemicolonInTryWithResources"/>
 
@@ -158,5 +197,11 @@
         <module name="IllegalIdentifierName"/>
 
         <module name="RecordTypeParameterNameCheck"/>
+
+        <module name="AnnotationLocation">
+            <property name="allowSamelineMultipleAnnotations" value="false"/>
+            <property name="allowSamelineSingleParameterlessAnnotation" value="false"/>
+            <property name="allowSamelineParameterizedAnnotation" value="false"/>
+        </module>
     </module>
 </module>
diff --git a/docs/getting-into-the-code/guidelines-for-setting-up-a-local-workspace/intellij-13-code-style.md b/docs/getting-into-the-code/guidelines-for-setting-up-a-local-workspace/intellij-13-code-style.md
index 0fbfce3f54e..cad3c8809b9 100644
--- a/docs/getting-into-the-code/guidelines-for-setting-up-a-local-workspace/intellij-13-code-style.md
+++ b/docs/getting-into-the-code/guidelines-for-setting-up-a-local-workspace/intellij-13-code-style.md
@@ -6,16 +6,24 @@ nav_order: 13
 
 # Step 3: Using JabRef's code style
 
-Contributions to JabRef's source code need to have a code formatting that is consistent with existing source code. For that purpose, JabRef provides code-style and check-style definitions.
+Contributions to JabRef's source code need to have a code formatting that is consistent with existing source code.
+For that purpose, JabRef relies on both the [Prettier Java](https://github.com/jhipster/prettier-java#prettier-java) and [checkstyle](https://checkstyle.sourceforge.io/).
+On each push, the [GitHub Prettier Action](https://github.com/marketplace/actions/prettier-action#github-prettier-action) runs and reformats the code.
+JabRef's IntelliJ configuration ensures a close-enough configuration.
+In case you use IntelliJ ultimate, you can also configure prettier to do the formatting.
 
-Install the [CheckStyle-IDEA plugin](http://plugins.jetbrains.com/plugin/1065?pr=idea), it can be found via the plug-in repository:
+## Checkstyle
+
+### Install checkstyle plugin
+
+Install the [Checkstyle-IDEA plugin](http://plugins.jetbrains.com/plugin/1065?pr=idea), it can be found via the plug-in repository:
 Navigate to **File > Settings... > Plugins"**.
 On the top, click on "Marketplace".
 Then, search for "Checkstyle".
-Click on "Install" choose "CheckStyle-IDEA".
+Click on "Install" choose "Checkstyle-IDEA".
 
-{% figure caption:"Install CheckStyle" %}
-![Install CheckStyle](guidelines-intellij-install-checkstyle.png)
+{% figure caption:"Install Checkstyle" %}
+![Install Checkstyle](guidelines-intellij-install-checkstyle.png)
 {% endfigure %}
 
 After clicking, IntelliJ asks for confirmation:
@@ -64,7 +72,7 @@ Click there "OK", too.
 
 Click on "Apply" to store the preferences.
 
-## Put JabRef's checkstyle configuration in place
+### Put JabRef's checkstyle configuration in place
 
 Now, put the checkstyle configuration file is in place:
 
@@ -112,18 +120,6 @@ Then, you can run a check on all modified files.
 ![JabRef's style is active - and we are ready to run a check on all modified files](guidelines-intellij-checkstyle-window.png)
 {% endfigure %}
 
-## Have auto format working properly in JavaDoc
-
-To have auto format working properly in the context of JavaDoc and line wrapping, "Wrap at right margin" has to be disabled. Details are found in [IntelliJ issue 240517](https://youtrack.jetbrains.com/issue/IDEA-240517).
-
-Go to **File > Settings... > Editor > Code Style > Java > JavaDoc**.
-
-At "Other", disable "Wrap at right margin"
-
-{% figure caption:"”Wrap at right margin” disabled" %}
-!["Wrap at right margin" disabled](guidelines-intellij-editor-javadoc-do-not-wrap.png)
-{% endfigure %}
-
 ## Enable proper import cleanup
 
 To enable "magic" creation and auto cleanup of imports, go to **File > Settings... > Editor > General > Auto Import**.
diff --git a/docs/getting-into-the-code/guidelines-for-setting-up-a-local-workspace/intellij-89-run-with-intellij.md b/docs/getting-into-the-code/guidelines-for-setting-up-a-local-workspace/intellij-80-run-with-intellij.md
similarity index 99%
rename from docs/getting-into-the-code/guidelines-for-setting-up-a-local-workspace/intellij-89-run-with-intellij.md
rename to docs/getting-into-the-code/guidelines-for-setting-up-a-local-workspace/intellij-80-run-with-intellij.md
index b0897e95a65..16dd8f5b85a 100644
--- a/docs/getting-into-the-code/guidelines-for-setting-up-a-local-workspace/intellij-89-run-with-intellij.md
+++ b/docs/getting-into-the-code/guidelines-for-setting-up-a-local-workspace/intellij-80-run-with-intellij.md
@@ -1,7 +1,7 @@
 ---
 parent: Set up a local workspace
 grand_parent: Getting into the code
-nav_order: 89
+nav_order: 80
 ---
 
 # Advanced: Build and run using IntelliJ IDEA
diff --git a/docs/getting-into-the-code/guidelines-for-setting-up-a-local-workspace/intellij-81-use-prettier-java.md b/docs/getting-into-the-code/guidelines-for-setting-up-a-local-workspace/intellij-81-use-prettier-java.md
new file mode 100644
index 00000000000..0d65d0b84ab
--- /dev/null
+++ b/docs/getting-into-the-code/guidelines-for-setting-up-a-local-workspace/intellij-81-use-prettier-java.md
@@ -0,0 +1,22 @@
+---
+parent: Set up a local workspace
+grand_parent: Getting into the code
+nav_order: 81
+---
+
+# Advanced: Use Prettier to format the code
+
+{ .note}
+This works on IntelliJ Ultimate only
+
+This howto guides you to to configure [Prettier Java](https://github.com/jhipster/prettier-java/tree/main#prettier-java) for  code autoformatting on save and when pressing <kbd>Ctrl</kbd>+<kbd>Alt</kbd>+<kbd>L</kbd>.
+
+1. Ensure that you have installed [Node.js](https://nodejs.org/en#downloadhttps://nodejs.org/en#download).
+2. Install prettier: `npm install --global prettier`
+3. **File > Settings... > Languages & Frameworks > JavaScript > Prettier**
+4. Select "Automatic Prettier Configuration"
+5. Change "Run for files" to `{**/*,*}.{java}`
+6. Select "Run on save"
+
+{: .note }
+This howto is based on <https://www.jetbrains.com/help/idea/prettier.html>.

From 504f9d4b64b79f67c09404e34509a40d742f058d Mon Sep 17 00:00:00 2001
From: Oliver Kopp <kopp.dev@gmail.com>
Date: Fri, 17 Nov 2023 14:03:28 +0100
Subject: [PATCH 02/27] Add prettier action

---
 .github/workflows/tests.yml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 4e81d87e865..570be2d06ad 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -34,6 +34,10 @@ jobs:
         with:
           submodules: 'true'
           show-progress: 'false'
+      - name: Prettify code
+        uses: creyD/prettier_action@v4.3
+        with:
+          prettier_options: --write **/*.{java}
       - name: Set up JDK
         uses: actions/setup-java@v3
         with:

From d389a54d011ffd99cab966fd1cac0816c1dc13e4 Mon Sep 17 00:00:00 2001
From: Oliver Kopp <kopp.dev@gmail.com>
Date: Fri, 17 Nov 2023 14:08:51 +0100
Subject: [PATCH 03/27] Fix parameters

---
 .github/workflows/tests.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 570be2d06ad..3305b0a9990 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -37,7 +37,8 @@ jobs:
       - name: Prettify code
         uses: creyD/prettier_action@v4.3
         with:
-          prettier_options: --write **/*.{java}
+          prettier_options: --write **/*.java
+          prettier_plugins: "@prettier/plugin-java"
       - name: Set up JDK
         uses: actions/setup-java@v3
         with:

From 0bbd3fb04724a8b4bd219267b150d015f3b11915 Mon Sep 17 00:00:00 2001
From: Oliver Kopp <kopp.dev@gmail.com>
Date: Fri, 17 Nov 2023 14:10:32 +0100
Subject: [PATCH 04/27] Fix build.gradle

---
 build.gradle | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/build.gradle b/build.gradle
index 31bf0d8773b..9d179026b4c 100644
--- a/build.gradle
+++ b/build.gradle
@@ -2,16 +2,6 @@ import org.gradle.internal.os.OperatingSystem
 import org.jabref.build.xjc.XjcPlugin
 import org.jabref.build.xjc.XjcTask
 
-buildscript {
-    repositories {
-        gradlePluginPortal()
-        mavenCentral()
-    }
-    dependencies {
-        classpath("io.spring.javaformat:spring-javaformat-gradle-plugin:0.0.40")
-    }
-}
-
 plugins {
     id 'application'
 

From b2bef3a9f332f3f51f57391c732a4655349a8c1c Mon Sep 17 00:00:00 2001
From: Oliver Kopp <kopp.dev@gmail.com>
Date: Fri, 17 Nov 2023 14:16:19 +0100
Subject: [PATCH 05/27] Fix build.gradle

---
 build.gradle | 2 --
 1 file changed, 2 deletions(-)

diff --git a/build.gradle b/build.gradle
index 9d179026b4c..8d50a6cca0f 100644
--- a/build.gradle
+++ b/build.gradle
@@ -32,8 +32,6 @@ plugins {
 // Enable following for debugging
 // gradle.startParameter.showStacktrace = org.gradle.api.logging.configuration.ShowStacktrace.
 
-apply plugin: 'io.spring.javaformat'
-
 apply plugin: XjcPlugin
 
 apply from: 'eclipse.gradle'

From a21f7b3b0d46f4f9eb538a15f1583e14a295ed30 Mon Sep 17 00:00:00 2001
From: Oliver Kopp <kopp.dev@gmail.com>
Date: Fri, 17 Nov 2023 14:25:27 +0100
Subject: [PATCH 06/27] Try to fix plugin name

---
 .github/workflows/tests.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 3305b0a9990..9db55270b41 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -38,7 +38,7 @@ jobs:
         uses: creyD/prettier_action@v4.3
         with:
           prettier_options: --write **/*.java
-          prettier_plugins: "@prettier/plugin-java"
+          prettier_plugins: "prettier-plugin-java"
       - name: Set up JDK
         uses: actions/setup-java@v3
         with:

From 5725873f52876022fef19aefcb33a53a2cba9616 Mon Sep 17 00:00:00 2001
From: Oliver Kopp <kopp.dev@gmail.com>
Date: Fri, 17 Nov 2023 14:30:55 +0100
Subject: [PATCH 07/27] Try to work-around
 https://github.com/creyD/prettier_action/issues/111

---
 .github/workflows/tests.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 9db55270b41..613ce9b5192 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -34,6 +34,8 @@ jobs:
         with:
           submodules: 'true'
           show-progress: 'false'
+      - name: Install prettier-plugin-java
+        run: npm install -g prettier prettier-plugin-java
       - name: Prettify code
         uses: creyD/prettier_action@v4.3
         with:

From 531306a464f8bacdfc7424775246028a03859324 Mon Sep 17 00:00:00 2001
From: Oliver Kopp <kopp.dev@gmail.com>
Date: Fri, 17 Nov 2023 14:33:35 +0100
Subject: [PATCH 08/27] Try to fix installation

---
 .github/workflows/tests.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 613ce9b5192..519969f90eb 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -35,7 +35,7 @@ jobs:
           submodules: 'true'
           show-progress: 'false'
       - name: Install prettier-plugin-java
-        run: npm install -g prettier prettier-plugin-java
+        run: npm install prettier prettier-plugin-java --save-dev
       - name: Prettify code
         uses: creyD/prettier_action@v4.3
         with:

From e197cfa18c0efd9a3450e870e9973dd309d30b8a Mon Sep 17 00:00:00 2001
From: Oliver Kopp <kopp.dev@gmail.com>
Date: Fri, 17 Nov 2023 14:38:20 +0100
Subject: [PATCH 09/27] Workaround
 https://github.com/creyD/prettier_action/issues/128

---
 .github/workflows/tests.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 519969f90eb..ad961bf2596 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -41,6 +41,7 @@ jobs:
         with:
           prettier_options: --write **/*.java
           prettier_plugins: "prettier-plugin-java"
+          clean_node_folder: false
       - name: Set up JDK
         uses: actions/setup-java@v3
         with:

From b85bc6b7f6c218aa539653e33d1f9bc52adde954 Mon Sep 17 00:00:00 2001
From: Oliver Kopp <kopp.dev@gmail.com>
Date: Fri, 17 Nov 2023 14:42:22 +0100
Subject: [PATCH 10/27] Switch to "npm install"

---
 .github/workflows/tests.yml |  2 +-
 package-lock.json           | 85 +++++++++++++++++++++++++++++++++++++
 package.json                |  6 +++
 3 files changed, 92 insertions(+), 1 deletion(-)
 create mode 100644 package-lock.json
 create mode 100644 package.json

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index ad961bf2596..9f38161f35c 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -35,7 +35,7 @@ jobs:
           submodules: 'true'
           show-progress: 'false'
       - name: Install prettier-plugin-java
-        run: npm install prettier prettier-plugin-java --save-dev
+        run: npm install
       - name: Prettify code
         uses: creyD/prettier_action@v4.3
         with:
diff --git a/package-lock.json b/package-lock.json
new file mode 100644
index 00000000000..923f86a610a
--- /dev/null
+++ b/package-lock.json
@@ -0,0 +1,85 @@
+{
+  "name": "jabref",
+  "lockfileVersion": 3,
+  "requires": true,
+  "packages": {
+    "": {
+      "devDependencies": {
+        "prettier": "^3.1.0",
+        "prettier-plugin-java": "^2.4.0"
+      }
+    },
+    "node_modules/chevrotain": {
+      "version": "6.5.0",
+      "resolved": "https://registry.npmjs.org/chevrotain/-/chevrotain-6.5.0.tgz",
+      "integrity": "sha512-BwqQ/AgmKJ8jcMEjaSnfMybnKMgGTrtDKowfTP3pX4jwVy0kNjRsT/AP6h+wC3+3NC+X8X15VWBnTCQlX+wQFg==",
+      "dev": true,
+      "dependencies": {
+        "regexp-to-ast": "0.4.0"
+      }
+    },
+    "node_modules/java-parser": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/java-parser/-/java-parser-2.1.0.tgz",
+      "integrity": "sha512-oOnFTc7jOe1ts3J/8M1iAzoBOLmY3O/vMRVTJlskFINzg4ky8OIZjx8irZaoaEZ1HIEOAd/b51vM59AaxeyRPw==",
+      "dev": true,
+      "dependencies": {
+        "chevrotain": "6.5.0",
+        "lodash": "4.17.21"
+      }
+    },
+    "node_modules/lodash": {
+      "version": "4.17.21",
+      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
+      "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==",
+      "dev": true
+    },
+    "node_modules/prettier": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.1.0.tgz",
+      "integrity": "sha512-TQLvXjq5IAibjh8EpBIkNKxO749UEWABoiIZehEPiY4GNpVdhaFKqSTu+QrlU6D2dPAfubRmtJTi4K4YkQ5eXw==",
+      "dev": true,
+      "bin": {
+        "prettier": "bin/prettier.cjs"
+      },
+      "engines": {
+        "node": ">=14"
+      },
+      "funding": {
+        "url": "https://github.com/prettier/prettier?sponsor=1"
+      }
+    },
+    "node_modules/prettier-plugin-java": {
+      "version": "2.4.0",
+      "resolved": "https://registry.npmjs.org/prettier-plugin-java/-/prettier-plugin-java-2.4.0.tgz",
+      "integrity": "sha512-Yfso3P0H/8U6NYtpYppW07dEx+WZl48lBRmJ3YmMXHE+YS72HDRcraxMWwvqQh9hn9wkBWnqTlph8BkDwlYd5w==",
+      "dev": true,
+      "dependencies": {
+        "java-parser": "2.1.0",
+        "lodash": "4.17.21",
+        "prettier": "3.0.3"
+      }
+    },
+    "node_modules/prettier-plugin-java/node_modules/prettier": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.0.3.tgz",
+      "integrity": "sha512-L/4pUDMxcNa8R/EthV08Zt42WBO4h1rarVtK0K+QJG0X187OLo7l699jWw0GKuwzkPQ//jMFA/8Xm6Fh3J/DAg==",
+      "dev": true,
+      "bin": {
+        "prettier": "bin/prettier.cjs"
+      },
+      "engines": {
+        "node": ">=14"
+      },
+      "funding": {
+        "url": "https://github.com/prettier/prettier?sponsor=1"
+      }
+    },
+    "node_modules/regexp-to-ast": {
+      "version": "0.4.0",
+      "resolved": "https://registry.npmjs.org/regexp-to-ast/-/regexp-to-ast-0.4.0.tgz",
+      "integrity": "sha512-4qf/7IsIKfSNHQXSwial1IFmfM1Cc/whNBQqRwe0V2stPe7KmN1U0tWQiIx6JiirgSrisjE0eECdNf7Tav1Ntw==",
+      "dev": true
+    }
+  }
+}
diff --git a/package.json b/package.json
new file mode 100644
index 00000000000..44bdf850554
--- /dev/null
+++ b/package.json
@@ -0,0 +1,6 @@
+{
+  "devDependencies": {
+    "prettier": "^3.1.0",
+    "prettier-plugin-java": "^2.4.0"
+  }
+}

From 7d8339c9b6068e462acc447f698ceb61e4e16790 Mon Sep 17 00:00:00 2001
From: Oliver Kopp <kopp.dev@gmail.com>
Date: Fri, 17 Nov 2023 14:50:38 +0100
Subject: [PATCH 11/27] Try to work-around
 https://github.com/creyD/prettier_action/issues/19

---
 .github/workflows/tests.yml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 9f38161f35c..fd1bd7e6634 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -29,11 +29,15 @@ jobs:
     name: Checkstyle
     runs-on: ubuntu-latest
     steps:
+      - name: Get branch name
+        id: branch-name
+        uses: tj-actions/branch-names@v7
       - name: Checkout source
         uses: actions/checkout@v4
         with:
           submodules: 'true'
           show-progress: 'false'
+          ref: ${{ steps.branch-name.outputs.default_branch }}
       - name: Install prettier-plugin-java
         run: npm install
       - name: Prettify code

From f6566fb6908173850df7d32260aac6af2815c394 Mon Sep 17 00:00:00 2001
From: Oliver Kopp <kopp.dev@gmail.com>
Date: Fri, 17 Nov 2023 14:50:46 +0100
Subject: [PATCH 12/27] Really version package*.json

---
 .gitignore | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index 8873797b7fd..28c62cbe9f0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,3 @@
-package.json
-package-lock.json
-
 # no generated files in version control
 src/main/gen/
 src/main/generated/

From 57e11f8fc6ee95cb049fde986d589c62bfaf9531 Mon Sep 17 00:00:00 2001
From: Oliver Kopp <kopp.dev@gmail.com>
Date: Fri, 17 Nov 2023 14:55:21 +0100
Subject: [PATCH 13/27] Branches...

---
 .github/workflows/tests.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index fd1bd7e6634..542862da6e2 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -37,7 +37,7 @@ jobs:
         with:
           submodules: 'true'
           show-progress: 'false'
-          ref: ${{ steps.branch-name.outputs.default_branch }}
+          ref: ${{ steps.branch-name.outputs.current_branch }}
       - name: Install prettier-plugin-java
         run: npm install
       - name: Prettify code

From 5e3eb760d5a9d826282c069bd838660cf8699178 Mon Sep 17 00:00:00 2001
From: Oliver Kopp <kopp.dev@gmail.com>
Date: Fri, 17 Nov 2023 15:01:54 +0100
Subject: [PATCH 14/27] Branches...

---
 .github/workflows/tests.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 542862da6e2..afc81299a10 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -29,15 +29,15 @@ jobs:
     name: Checkstyle
     runs-on: ubuntu-latest
     steps:
-      - name: Get branch name
-        id: branch-name
-        uses: tj-actions/branch-names@v7
       - name: Checkout source
         uses: actions/checkout@v4
         with:
           submodules: 'true'
           show-progress: 'false'
-          ref: ${{ steps.branch-name.outputs.current_branch }}
+      - name: Get branch name
+        id: branch-name
+        uses: tj-actions/branch-names@v7
+      - run: git checkout ${{ steps.branch-name.outputs.current_branch }}
       - name: Install prettier-plugin-java
         run: npm install
       - name: Prettify code

From ac60a12560e42254232ca1c52eac17d6ee9c7fe0 Mon Sep 17 00:00:00 2001
From: Oliver Kopp <kopp.dev@gmail.com>
Date: Fri, 17 Nov 2023 15:04:33 +0100
Subject: [PATCH 15/27] Branches...

---
 .github/workflows/tests.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index afc81299a10..2f89b7e2dc3 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -32,6 +32,7 @@ jobs:
       - name: Checkout source
         uses: actions/checkout@v4
         with:
+          fetch-depth: 0
           submodules: 'true'
           show-progress: 'false'
       - name: Get branch name

From b905db4d8638c4522107f7d455b4df75b6c87001 Mon Sep 17 00:00:00 2001
From: Oliver Kopp <kopp.dev@gmail.com>
Date: Fri, 17 Nov 2023 15:13:42 +0100
Subject: [PATCH 16/27] Try other solution

---
 .github/workflows/tests.yml | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 2f89b7e2dc3..ac74d27100a 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -29,16 +29,19 @@ jobs:
     name: Checkstyle
     runs-on: ubuntu-latest
     steps:
-      - name: Checkout source
+      - name: Checkout source (PR)
+        if: github.event_name == 'pull_request'
+        uses: actions/checkout@v4
+        with:
+          ref: ${{ github.head_ref }}
+          submodules: 'true'
+          show-progress: 'false'
+      - name: Checkout source (no-PR)
+        if: github.event_name != 'pull_request'
         uses: actions/checkout@v4
         with:
-          fetch-depth: 0
           submodules: 'true'
           show-progress: 'false'
-      - name: Get branch name
-        id: branch-name
-        uses: tj-actions/branch-names@v7
-      - run: git checkout ${{ steps.branch-name.outputs.current_branch }}
       - name: Install prettier-plugin-java
         run: npm install
       - name: Prettify code

From 2f43d7b7362aeb212bd3d663f7f77fff78fefa2a Mon Sep 17 00:00:00 2001
From: Oliver Kopp <kopp.dev@gmail.com>
Date: Fri, 17 Nov 2023 15:16:55 +0100
Subject: [PATCH 17/27] Really try to checout

---
 .github/workflows/tests.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index ac74d27100a..3316456e3bc 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -34,6 +34,8 @@ jobs:
         uses: actions/checkout@v4
         with:
           ref: ${{ github.head_ref }}
+          repository: ${{ github.event.pull_request.head.repo.full_name }}
+          token: ${{ secrets.GITHUB_TOKEN }}
           submodules: 'true'
           show-progress: 'false'
       - name: Checkout source (no-PR)

From 8b554fffd6c62b7b07476416b18c22e10e99eccf Mon Sep 17 00:00:00 2001
From: Oliver Kopp <kopp.dev@gmail.com>
Date: Fri, 17 Nov 2023 15:23:16 +0100
Subject: [PATCH 18/27] Let's try with a token

---
 .github/workflows/tests.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 3316456e3bc..8af57046b18 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -35,7 +35,7 @@ jobs:
         with:
           ref: ${{ github.head_ref }}
           repository: ${{ github.event.pull_request.head.repo.full_name }}
-          token: ${{ secrets.GITHUB_TOKEN }}
+          token: ${{ secrets.GH_TOKEN_JABREF_MACHINE_PR_APPROVE }}
           submodules: 'true'
           show-progress: 'false'
       - name: Checkout source (no-PR)
@@ -52,6 +52,7 @@ jobs:
           prettier_options: --write **/*.java
           prettier_plugins: "prettier-plugin-java"
           clean_node_folder: false
+          token: ${{ secrets.GH_TOKEN_JABREF_MACHINE_PR_APPROVE }}
       - name: Set up JDK
         uses: actions/setup-java@v3
         with:

From 6c33d7b7a1434b2447e72daf8f0e34ec0f14bcd6 Mon Sep 17 00:00:00 2001
From: Oliver Kopp <kopp.dev@gmail.com>
Date: Fri, 17 Nov 2023 15:31:54 +0100
Subject: [PATCH 19/27] Revert "Let's try with a token"

This reverts commit 8b554fffd6c62b7b07476416b18c22e10e99eccf.
---
 .github/workflows/tests.yml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 8af57046b18..3316456e3bc 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -35,7 +35,7 @@ jobs:
         with:
           ref: ${{ github.head_ref }}
           repository: ${{ github.event.pull_request.head.repo.full_name }}
-          token: ${{ secrets.GH_TOKEN_JABREF_MACHINE_PR_APPROVE }}
+          token: ${{ secrets.GITHUB_TOKEN }}
           submodules: 'true'
           show-progress: 'false'
       - name: Checkout source (no-PR)
@@ -52,7 +52,6 @@ jobs:
           prettier_options: --write **/*.java
           prettier_plugins: "prettier-plugin-java"
           clean_node_folder: false
-          token: ${{ secrets.GH_TOKEN_JABREF_MACHINE_PR_APPROVE }}
       - name: Set up JDK
         uses: actions/setup-java@v3
         with:

From 8b4d2dd7b913f56a380279c294e363f85f86b610 Mon Sep 17 00:00:00 2001
From: Oliver Kopp <kopp.dev@gmail.com>
Date: Fri, 17 Nov 2023 16:05:52 +0100
Subject: [PATCH 20/27] No token

---
 .github/workflows/tests.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 3316456e3bc..2fb37649b43 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -35,7 +35,6 @@ jobs:
         with:
           ref: ${{ github.head_ref }}
           repository: ${{ github.event.pull_request.head.repo.full_name }}
-          token: ${{ secrets.GITHUB_TOKEN }}
           submodules: 'true'
           show-progress: 'false'
       - name: Checkout source (no-PR)

From 0b1746d31e73aea174ef4aedb55c9fec5d606a3e Mon Sep 17 00:00:00 2001
From: Oliver Kopp <kopp.dev@gmail.com>
Date: Fri, 17 Nov 2023 16:26:22 +0100
Subject: [PATCH 21/27] Reformatted with prettier-java

---
 .../org/jabref/benchmarks/Benchmarks.java     |   70 +-
 src/main/java/module-info.java                |   11 +-
 .../jabref/architecture/AllowedToUseAwt.java  |    1 -
 .../architecture/AllowedToUseLogic.java       |    1 -
 .../AllowedToUseStandardStreams.java          |    1 -
 .../architecture/AllowedToUseSwing.java       |    1 -
 .../ApacheCommonsLang3Allowed.java            |    1 -
 .../org/jabref/cli/ArgumentProcessor.java     |  691 ++--
 .../java/org/jabref/cli/AuxCommandLine.java   |    6 +-
 src/main/java/org/jabref/cli/JabRefCLI.java   |  372 ++-
 .../jabref/cli/JournalListMvGenerator.java    |  118 +-
 src/main/java/org/jabref/cli/Launcher.java    |  128 +-
 .../java/org/jabref/gui/BasePanelMode.java    |    2 +-
 .../java/org/jabref/gui/ClipBoardManager.java |   64 +-
 .../java/org/jabref/gui/DefaultInjector.java  |   21 +-
 .../java/org/jabref/gui/DialogService.java    |  129 +-
 .../jabref/gui/DragAndDropDataFormats.java    |   27 +-
 .../org/jabref/gui/DragAndDropHelper.java     |   13 +-
 .../java/org/jabref/gui/EntryTypeView.java    |  357 +-
 .../org/jabref/gui/EntryTypeViewModel.java    |  172 +-
 src/main/java/org/jabref/gui/FXDialog.java    |   29 +-
 .../jabref/gui/FallbackExceptionHandler.java  |   23 +-
 src/main/java/org/jabref/gui/Globals.java     |   35 +-
 .../org/jabref/gui/JabRefDialogService.java   |  415 ++-
 .../org/jabref/gui/JabRefExecutorService.java |   73 +-
 src/main/java/org/jabref/gui/JabRefFrame.java | 1174 ++++---
 src/main/java/org/jabref/gui/JabRefGUI.java   |  235 +-
 src/main/java/org/jabref/gui/LibraryTab.java  |  616 +++-
 .../org/jabref/gui/LibraryTabContainer.java   |    1 -
 .../java/org/jabref/gui/MainApplication.java  |   23 +-
 src/main/java/org/jabref/gui/MainMenu.java    |  487 ++-
 src/main/java/org/jabref/gui/MainToolBar.java |  302 +-
 .../org/jabref/gui/OpenConsoleAction.java     |   41 +-
 .../org/jabref/gui/SendAsEMailAction.java     |   71 +-
 .../jabref/gui/SendAsKindleEmailAction.java   |   22 +-
 .../jabref/gui/SendAsStandardEmailAction.java |   38 +-
 .../java/org/jabref/gui/StateManager.java     |  166 +-
 src/main/java/org/jabref/gui/Telemetry.java   |   14 +-
 .../java/org/jabref/gui/TelemetryClient.java  |   11 +-
 .../jabref/gui/UpdateTimestampListener.java   |   20 +-
 .../jabref/gui/WaitForSaveFinishedDialog.java |   13 +-
 .../java/org/jabref/gui/actions/Action.java   |    1 -
 .../org/jabref/gui/actions/ActionFactory.java |  143 +-
 .../org/jabref/gui/actions/ActionHelper.java  |  138 +-
 .../org/jabref/gui/actions/JabRefAction.java  |   75 +-
 .../org/jabref/gui/actions/SimpleCommand.java |    8 +-
 .../java/org/jabref/gui/actions/Sources.java  |    2 +-
 .../jabref/gui/actions/StandardActions.java   |  643 +++-
 .../autocompleter/AppendWordsStrategy.java    |    5 +-
 .../AutoCompletePreferences.java              |   16 +-
 .../autocompleter/AutoCompletionInput.java    |    1 +
 .../AutoCompletionTextInputBinding.java       |  119 +-
 .../BibEntrySuggestionProvider.java           |   18 +-
 .../ContentSelectorSuggestionProvider.java    |   15 +-
 .../EmptySuggestionProvider.java              |    9 +-
 .../FieldValueSuggestionProvider.java         |    6 +-
 .../JournalsSuggestionProvider.java           |   16 +-
 .../PersonNameStringConverter.java            |    7 +-
 .../PersonNameSuggestionProvider.java         |   46 +-
 .../StringSuggestionProvider.java             |   11 +-
 .../gui/autocompleter/SuggestionProvider.java |   29 +-
 .../autocompleter/SuggestionProviders.java    |   28 +-
 .../autocompleter/WordSuggestionProvider.java |    8 +-
 .../autosaveandbackup/AutosaveManager.java    |   40 +-
 .../gui/autosaveandbackup/BackupManager.java  |  341 +-
 .../auximport/AuxParserResultViewModel.java   |   48 +-
 .../jabref/gui/auximport/FromAuxDialog.java   |   91 +-
 .../gui/auximport/FromAuxDialogViewModel.java |  100 +-
 .../gui/auximport/NewSubLibraryAction.java    |   16 +-
 .../gui/backup/BackupResolverDialog.java      |   73 +-
 .../gui/bibtexextractor/BibtexExtractor.java  |  100 +-
 .../BibtexExtractorViewModel.java             |  109 +-
 .../bibtexextractor/ExtractBibtexAction.java  |   22 +-
 .../bibtexextractor/ExtractBibtexDialog.java  |   74 +-
 .../GenerateCitationKeyAction.java            |  155 +-
 .../GenerateCitationKeySingleAction.java      |   34 +-
 .../org/jabref/gui/cleanup/CleanupAction.java |  113 +-
 .../org/jabref/gui/cleanup/CleanupDialog.java |   18 +-
 .../gui/cleanup/CleanupPresetPanel.java       |  279 +-
 .../gui/cleanup/CleanupSingleAction.java      |   81 +-
 .../org/jabref/gui/collab/ChangeScanner.java  |   36 +-
 .../org/jabref/gui/collab/DatabaseChange.java |   29 +-
 .../gui/collab/DatabaseChangeDetailsView.java |   15 +-
 .../DatabaseChangeDetailsViewFactory.java     |   57 +-
 .../jabref/gui/collab/DatabaseChangeList.java |  144 +-
 .../gui/collab/DatabaseChangeMonitor.java     |  104 +-
 .../gui/collab/DatabaseChangeResolver.java    |    5 +-
 .../collab/DatabaseChangeResolverFactory.java |   17 +-
 .../collab/DatabaseChangesResolverDialog.java |  154 +-
 .../ExternalChangesResolverViewModel.java     |   72 +-
 .../jabref/gui/collab/entryadd/EntryAdd.java  |   20 +-
 .../gui/collab/entrychange/EntryChange.java   |   31 +-
 .../entrychange/EntryChangeDetailsView.java   |  122 +-
 .../entrychange/EntryChangeResolver.java      |   37 +-
 .../EntryWithPreviewAndSourceDetailsView.java |   24 +-
 .../entrychange/PreviewWithSourceTab.java     |   72 +-
 .../gui/collab/entrydelete/EntryDelete.java   |   23 +-
 .../gui/collab/groupchange/GroupChange.java   |   44 +-
 .../groupchange/GroupChangeDetailsView.java   |    7 +-
 .../collab/metedatachange/MetadataChange.java |   16 +-
 .../MetadataChangeDetailsView.java            |   64 +-
 .../collab/preamblechange/PreambleChange.java |   24 +-
 .../PreambleChangeDetailsView.java            |   27 +-
 .../gui/collab/stringadd/BibTexStringAdd.java |   30 +-
 .../stringadd/BibTexStringAddDetailsView.java |   24 +-
 .../stringchange/BibTexStringChange.java      |   21 +-
 .../BibTexStringChangeDetailsView.java        |   35 +-
 .../stringdelete/BibTexStringDelete.java      |   30 +-
 .../BibTexStringDeleteDetailsView.java        |   24 +-
 .../stringrename/BibTexStringRename.java      |   31 +-
 .../BibTexStringRenameDetailsView.java        |   10 +-
 .../CitationKeyPatternPanel.java              |  137 +-
 .../CitationKeyPatternPanelItemModel.java     |   19 +-
 .../CitationKeyPatternPanelViewModel.java     |   74 +-
 .../FieldFormatterCleanupsPanel.java          |  122 +-
 .../FieldFormatterCleanupsPanelViewModel.java |   85 +-
 .../SaveOrderConfigPanel.java                 |  189 +-
 .../SaveOrderConfigPanelViewModel.java        |   47 +-
 .../SortCriterionViewModel.java               |   12 +-
 .../jabref/gui/copyfiles/CopyFilesAction.java |   59 +-
 .../gui/copyfiles/CopyFilesDialogView.java    |   63 +-
 .../copyfiles/CopyFilesDialogViewModel.java   |   12 +-
 .../CopyFilesResultItemViewModel.java         |   20 +-
 .../CopyFilesResultListDependency.java        |    4 +-
 .../jabref/gui/copyfiles/CopyFilesTask.java   |  126 +-
 .../gui/copyfiles/CopySingleFileAction.java   |   83 +-
 .../org/jabref/gui/desktop/JabRefDesktop.java |  262 +-
 .../jabref/gui/desktop/os/DefaultDesktop.java |   18 +-
 .../java/org/jabref/gui/desktop/os/Linux.java |  193 +-
 .../jabref/gui/desktop/os/NativeDesktop.java  |  103 +-
 .../java/org/jabref/gui/desktop/os/OSX.java   |   39 +-
 .../org/jabref/gui/desktop/os/Windows.java    |   78 +-
 .../jabref/gui/dialogs/AutosaveUiManager.java |   27 +-
 .../jabref/gui/dialogs/BackupUIManager.java   |  131 +-
 .../gui/documentviewer/DocumentViewModel.java |    1 +
 .../documentviewer/DocumentViewerControl.java |  100 +-
 .../documentviewer/DocumentViewerView.java    |   89 +-
 .../DocumentViewerViewModel.java              |   84 +-
 .../gui/documentviewer/PageDimension.java     |    2 +
 .../PdfDocumentPageViewModel.java             |   35 +-
 .../documentviewer/PdfDocumentViewModel.java  |    6 +-
 .../ShowDocumentViewerAction.java             |   26 +-
 .../DuplicateResolverDialog.java              |  185 +-
 .../duplicationFinder/DuplicateSearch.java    |  159 +-
 .../org/jabref/gui/edit/CopyDoiUrlAction.java |   21 +-
 .../org/jabref/gui/edit/CopyMoreAction.java   |  263 +-
 .../java/org/jabref/gui/edit/EditAction.java  |  118 +-
 .../jabref/gui/edit/ManageKeywordsAction.java |   32 +-
 .../jabref/gui/edit/ManageKeywordsDialog.java |  108 +-
 .../gui/edit/ManageKeywordsViewModel.java     |   72 +-
 .../jabref/gui/edit/OpenBrowserAction.java    |   12 +-
 .../jabref/gui/edit/ReplaceStringAction.java  |   12 +-
 .../jabref/gui/edit/ReplaceStringView.java    |   39 +-
 .../gui/edit/ReplaceStringViewModel.java      |   16 +-
 .../AbstractAutomaticFieldEditorTabView.java  |    4 +-
 ...tractAutomaticFieldEditorTabViewModel.java |   19 +-
 .../AutomaticFieldEditorAction.java           |   21 +-
 .../AutomaticFieldEditorDialog.java           |   64 +-
 .../AutomaticFieldEditorViewModel.java        |   26 +-
 .../LastAutomaticFieldEditorEdit.java         |    8 +-
 .../MoveFieldValueAction.java                 |   35 +-
 .../NotificationPaneAdapter.java              |   18 +-
 .../CopyOrMoveFieldContentTabView.java        |   87 +-
 .../CopyOrMoveFieldContentTabViewModel.java   |  142 +-
 .../EditFieldContentTabView.java              |   81 +-
 .../EditFieldContentViewModel.java            |  128 +-
 .../renamefield/RenameFieldTabView.java       |   49 +-
 .../renamefield/RenameFieldViewModel.java     |   80 +-
 .../jabref/gui/entryeditor/CommentsTab.java   |   80 +-
 .../gui/entryeditor/DeprecatedFieldsTab.java  |   85 +-
 .../jabref/gui/entryeditor/EntryEditor.java   |  571 +++-
 .../entryeditor/EntryEditorPreferences.java   |   78 +-
 .../gui/entryeditor/EntryEditorTab.java       |    6 +-
 .../gui/entryeditor/FieldsEditorTab.java      |  138 +-
 .../gui/entryeditor/LatexCitationsTab.java    |  109 +-
 .../LatexCitationsTabViewModel.java           |  143 +-
 .../jabref/gui/entryeditor/MathSciNetTab.java |   30 +-
 .../entryeditor/OpenEntryEditorAction.java    |    4 +-
 .../gui/entryeditor/OptionalFields2Tab.java   |   51 +-
 .../gui/entryeditor/OptionalFieldsTab.java    |   51 +-
 .../entryeditor/OptionalFieldsTabBase.java    |   67 +-
 .../gui/entryeditor/OtherFieldsTab.java       |   87 +-
 .../gui/entryeditor/PreviewSwitchAction.java  |   20 +-
 .../jabref/gui/entryeditor/PreviewTab.java    |   33 +-
 .../gui/entryeditor/RelatedArticlesTab.java   |  180 +-
 .../gui/entryeditor/RequiredFieldsTab.java    |   49 +-
 .../org/jabref/gui/entryeditor/SciteTab.java  |   93 +-
 .../gui/entryeditor/SciteTabViewModel.java    |   55 +-
 .../gui/entryeditor/SciteTallyModel.java      |   30 +-
 .../org/jabref/gui/entryeditor/SourceTab.java |  300 +-
 .../gui/entryeditor/UserDefinedFieldsTab.java |   44 +-
 .../BibEntryRelationsCache.java               |   46 +-
 .../BibEntryRelationsRepository.java          |    7 +-
 .../citationrelationtab/BibEntryView.java     |   45 +-
 .../CitationRelationItem.java                 |    1 +
 .../CitationRelationsTab.java                 |  452 ++-
 .../semanticscholar/AuthorResponse.java       |    1 +
 .../semanticscholar/CitationDataItem.java     |    1 +
 .../semanticscholar/CitationFetcher.java      |    2 -
 .../semanticscholar/CitationsResponse.java    |    1 +
 .../semanticscholar/PaperDetails.java         |   33 +-
 .../semanticscholar/ReferenceDataItem.java    |    1 +
 .../semanticscholar/ReferencesResponse.java   |    1 +
 .../SemanticScholarFetcher.java               |   66 +-
 .../fileannotationtab/FileAnnotationTab.java  |   11 +-
 .../FileAnnotationTabView.java                |  110 +-
 .../FileAnnotationTabViewModel.java           |   78 +-
 .../FileAnnotationViewModel.java              |   17 +-
 .../FulltextSearchResultsTab.java             |  178 +-
 .../gui/errorconsole/ErrorConsoleView.java    |  193 +-
 .../errorconsole/ErrorConsoleViewModel.java   |   98 +-
 .../gui/errorconsole/LogEventViewModel.java   |   15 +-
 .../CreateModifyExporterDialogView.java       |   61 +-
 .../CreateModifyExporterDialogViewModel.java  |   64 +-
 .../jabref/gui/exporter/ExportCommand.java    |  195 +-
 .../gui/exporter/ExportToClipboardAction.java |  144 +-
 .../gui/exporter/ExporterViewModel.java       |    1 -
 .../org/jabref/gui/exporter/SaveAction.java   |   31 +-
 .../jabref/gui/exporter/SaveAllAction.java    |   12 +-
 .../gui/exporter/SaveDatabaseAction.java      |  354 +-
 .../WriteMetadataToLinkedPdfsAction.java      |  163 +-
 .../externalfiles/AutoLinkFilesAction.java    |  133 +-
 .../externalfiles/AutoSetFileLinksUtil.java   |  112 +-
 .../gui/externalfiles/ChainedFilters.java     |   23 +-
 .../jabref/gui/externalfiles/DateRange.java   |    8 +-
 .../externalfiles/DownloadFullTextAction.java |  111 +-
 .../DuplicateDecisionResult.java              |    8 +-
 .../ExternalFilesEntryLinker.java             |  101 +-
 .../gui/externalfiles/FileDownloadTask.java   |   19 +-
 .../externalfiles/FileExtensionViewModel.java |   13 +-
 .../gui/externalfiles/FileFilterUtils.java    |   71 +-
 .../FindUnlinkedFilesAction.java              |    9 +-
 .../externalfiles/GitIgnoreFileFilter.java    |   63 +-
 .../ImportFilesResultItemViewModel.java       |   28 +-
 .../gui/externalfiles/ImportHandler.java      |  347 +-
 .../externalfiles/UnlinkedFilesCrawler.java   |   71 +-
 .../UnlinkedFilesDialogView.java              |  373 ++-
 .../UnlinkedFilesDialogViewModel.java         |  261 +-
 .../externalfiles/UnlinkedPDFFileFilter.java  |   13 +-
 .../CustomExternalFileType.java               |   51 +-
 .../externalfiletype/ExternalFileType.java    |    8 +-
 .../externalfiletype/ExternalFileTypes.java   |  109 +-
 .../StandardExternalFileType.java             |  226 +-
 .../fieldeditors/AbstractEditorViewModel.java |   82 +-
 .../gui/fieldeditors/CitationKeyEditor.java   |   66 +-
 .../CitationKeyEditorViewModel.java           |   29 +-
 .../gui/fieldeditors/ContextMenuAddable.java  |    1 -
 .../jabref/gui/fieldeditors/DateEditor.java   |   55 +-
 .../gui/fieldeditors/DateEditorViewModel.java |   23 +-
 .../gui/fieldeditors/EditorTextArea.java      |   16 +-
 .../gui/fieldeditors/EditorTextField.java     |   16 +-
 .../EditorTypeEditorViewModel.java            |   14 +-
 .../gui/fieldeditors/EditorValidator.java     |   14 +-
 .../gui/fieldeditors/FieldEditorFX.java       |   13 +-
 .../jabref/gui/fieldeditors/FieldEditors.java |  236 +-
 .../gui/fieldeditors/FieldNameLabel.java      |  362 ++-
 .../fieldeditors/GenderEditorViewModel.java   |   14 +-
 .../jabref/gui/fieldeditors/GroupEditor.java  |   89 +-
 .../jabref/gui/fieldeditors/ISSNEditor.java   |   80 +-
 .../gui/fieldeditors/ISSNEditorViewModel.java |   49 +-
 .../gui/fieldeditors/JournalEditor.java       |   74 +-
 .../fieldeditors/JournalEditorViewModel.java  |   39 +-
 .../JournalInfoOptInDialogHelper.java         |   52 +-
 .../gui/fieldeditors/KeywordsEditor.java      |   21 +-
 .../gui/fieldeditors/LinkedEntriesEditor.java |  164 +-
 .../LinkedEntriesEditorViewModel.java         |   26 +-
 .../gui/fieldeditors/LinkedFileViewModel.java |  711 +++-
 .../gui/fieldeditors/LinkedFilesEditor.java   |  471 ++-
 .../LinkedFilesEditorViewModel.java           |  260 +-
 .../fieldeditors/MapBasedEditorViewModel.java |   37 +-
 .../fieldeditors/MonthEditorViewModel.java    |   14 +-
 .../jabref/gui/fieldeditors/OptionEditor.java |   48 +-
 .../fieldeditors/OptionEditorViewModel.java   |   12 +-
 .../jabref/gui/fieldeditors/OwnerEditor.java  |   50 +-
 .../fieldeditors/OwnerEditorViewModel.java    |   14 +-
 .../PaginationEditorViewModel.java            |   14 +-
 .../PatentTypeEditorViewModel.java            |   14 +-
 .../gui/fieldeditors/PersonsEditor.java       |   47 +-
 .../fieldeditors/PersonsEditorViewModel.java  |   20 +-
 .../jabref/gui/fieldeditors/PopOverUtil.java  |   54 +-
 .../jabref/gui/fieldeditors/SimpleEditor.java |   68 +-
 .../fieldeditors/SimpleEditorViewModel.java   |    8 +-
 .../TextInputControlBehavior.java             |   53 +-
 .../gui/fieldeditors/TypeEditorViewModel.java |   14 +-
 .../org/jabref/gui/fieldeditors/URLUtil.java  |   45 +-
 .../jabref/gui/fieldeditors/UrlEditor.java    |   74 +-
 .../gui/fieldeditors/UrlEditorViewModel.java  |   35 +-
 .../WriteMetadataToSinglePdfAction.java       |  112 +-
 .../fieldeditors/YesNoEditorViewModel.java    |   14 +-
 .../fieldeditors/contextmenu/DefaultMenu.java |   48 +-
 .../contextmenu/EditorContextAction.java      |   94 +-
 .../fieldeditors/contextmenu/EditorMenus.java |   67 +-
 .../contextmenu/ProtectedTermsMenu.java       |   82 +-
 .../BaseIdentifierEditorViewModel.java        |  121 +-
 .../DoiIdentifierEditorViewModel.java         |   75 +-
 .../EprintIdentifierEditorViewModel.java      |   74 +-
 .../ISBNIdentifierEditorViewModel.java        |   51 +-
 .../identifier/IdentifierEditor.java          |  133 +-
 .../journalinfo/JournalInfoView.java          |   78 +-
 .../journalinfo/JournalInfoViewModel.java     |  110 +-
 .../jabref/gui/groups/GroupDescriptions.java  |   42 +-
 .../jabref/gui/groups/GroupDialogHeader.java  |    3 +-
 .../jabref/gui/groups/GroupDialogView.java    |  467 ++-
 .../gui/groups/GroupDialogViewModel.java      |  522 ++-
 .../jabref/gui/groups/GroupModeViewModel.java |    1 -
 .../jabref/gui/groups/GroupNodeViewModel.java |  317 +-
 .../gui/groups/GroupTreeNodeViewModel.java    |  115 +-
 .../org/jabref/gui/groups/GroupTreeView.java  |  702 ++--
 .../jabref/gui/groups/GroupTreeViewModel.java |  595 +++-
 .../org/jabref/gui/groups/GroupViewMode.java  |    6 +-
 .../jabref/gui/groups/GroupsPreferences.java  |   29 +-
 .../jabref/gui/groups/MoveGroupChange.java    |    7 +-
 .../gui/groups/UndoableAddOrRemoveGroup.java  |   33 +-
 .../groups/UndoableChangeEntriesOfGroup.java  |   14 +-
 .../gui/groups/UndoableModifySubtree.java     |   16 +-
 .../jabref/gui/groups/UndoableMoveGroup.java  |   26 +-
 .../java/org/jabref/gui/help/AboutAction.java |    7 +-
 .../org/jabref/gui/help/AboutDialogView.java  |   46 +-
 .../jabref/gui/help/AboutDialogViewModel.java |   73 +-
 .../jabref/gui/help/ErrorConsoleAction.java   |    7 +-
 .../java/org/jabref/gui/help/HelpAction.java  |   12 +-
 .../org/jabref/gui/help/NewVersionDialog.java |   76 +-
 .../gui/help/SearchForUpdateAction.java       |   25 +-
 .../org/jabref/gui/help/VersionWorker.java    |   84 +-
 .../java/org/jabref/gui/icon/IconTheme.java   |  100 +-
 .../gui/icon/InternalMaterialDesignIcon.java  |   25 +-
 .../java/org/jabref/gui/icon/JabRefIcon.java  |    2 -
 .../org/jabref/gui/icon/JabRefIconView.java   |   14 +-
 .../jabref/gui/icon/JabRefIkonHandler.java    |    1 -
 .../gui/icon/JabRefMaterialDesignIcon.java    |    9 +-
 .../jabref/gui/icon/JabrefIconProvider.java   |    3 +-
 .../BibEntryTypePrefsAndFileViewModel.java    |   16 +-
 .../importer/GenerateEntryFromIdAction.java   |  101 +-
 .../importer/GenerateEntryFromIdDialog.java   |   42 +-
 .../gui/importer/GrobidOptInDialogHelper.java |   15 +-
 .../jabref/gui/importer/ImportCommand.java    |  241 +-
 .../ImportCustomEntryTypesDialog.java         |   92 +-
 ...ImportCustomEntryTypesDialogViewModel.java |   67 +-
 .../gui/importer/ImportEntriesDialog.java     |  272 +-
 .../gui/importer/ImportEntriesViewModel.java  |  295 +-
 .../gui/importer/ImporterViewModel.java       |    2 +-
 .../gui/importer/NewDatabaseAction.java       |   11 +-
 .../jabref/gui/importer/NewEntryAction.java   |   53 +-
 .../importer/ParserResultWarningDialog.java   |   30 +-
 .../actions/CheckForNewEntryTypesAction.java  |   54 +-
 .../importer/actions/GUIPostOpenAction.java   |    1 -
 .../actions/MergeReviewIntoCommentAction.java |   20 +-
 ...geReviewIntoCommentConfirmationDialog.java |   41 +-
 .../importer/actions/OpenDatabaseAction.java  |  242 +-
 .../fetcher/LookupIdentifierAction.java       |  106 +-
 .../importer/fetcher/WebSearchPaneView.java   |   97 +-
 .../fetcher/WebSearchPaneViewModel.java       |  144 +-
 .../gui/integrity/IntegrityCheckAction.java   |   67 +-
 .../gui/integrity/IntegrityCheckDialog.java   |  220 +-
 .../IntegrityCheckDialogViewModel.java        |    2 -
 .../jabref/gui/journals/AbbreviateAction.java |  181 +-
 .../jabref/gui/journals/AbbreviationType.java |    2 +-
 .../gui/journals/UndoableAbbreviator.java     |   41 +-
 .../gui/journals/UndoableUnabbreviator.java   |   32 +-
 .../gui/keyboard/CodeAreaKeyBindings.java     |  251 +-
 .../org/jabref/gui/keyboard/KeyBinding.java   |  693 +++-
 .../gui/keyboard/KeyBindingCategory.java      |    1 -
 .../gui/keyboard/KeyBindingRepository.java    |   48 +-
 .../gui/keyboard/TextInputKeyBindings.java    |  193 +-
 .../AbstractPropertiesTabView.java            |   13 +-
 .../LibraryPropertiesAction.java              |   32 +-
 .../LibraryPropertiesView.java                |   38 +-
 .../LibraryPropertiesViewModel.java           |    6 +-
 .../PropertiesTabViewModel.java               |    1 -
 .../constants/ConstantsItemModel.java         |   60 +-
 .../constants/ConstantsPropertiesView.java    |  171 +-
 .../ConstantsPropertiesViewModel.java         |   78 +-
 .../contentselectors/ContentSelectorView.java |   89 +-
 .../ContentSelectorViewModel.java             |  128 +-
 .../general/GeneralPropertiesView.java        |   74 +-
 .../general/GeneralPropertiesViewModel.java   |  138 +-
 .../keypattern/KeyPatternPropertiesView.java  |   72 +-
 .../KeyPatternPropertiesViewModel.java        |   50 +-
 .../preamble/PreamblePropertiesView.java      |   24 +-
 .../preamble/PreamblePropertiesViewModel.java |   34 +-
 .../saving/SavingPropertiesView.java          |   61 +-
 .../saving/SavingPropertiesViewModel.java     |  120 +-
 .../gui/linkedfile/AttachFileAction.java      |   75 +-
 .../linkedfile/AttachFileFromURLAction.java   |   92 +-
 .../gui/linkedfile/DeleteFileAction.java      |  117 +-
 .../linkedfile/LinkedFileEditDialogView.java  |   73 +-
 .../LinkedFilesEditDialogViewModel.java       |  118 +-
 .../org/jabref/gui/logging/GuiWriter.java     |    8 +-
 .../gui/maintable/BibEntryTableViewModel.java |  170 +-
 .../org/jabref/gui/maintable/CellFactory.java |   50 +-
 .../gui/maintable/ColumnPreferences.java      |   10 +-
 .../org/jabref/gui/maintable/MainTable.java   |  443 ++-
 .../gui/maintable/MainTableColumnFactory.java |  221 +-
 .../gui/maintable/MainTableColumnModel.java   |   69 +-
 .../gui/maintable/MainTableDataModel.java     |  110 +-
 .../MainTableFieldValueFormatter.java         |   53 +-
 .../maintable/MainTableHeaderContextMenu.java |  151 +-
 .../gui/maintable/MainTablePreferences.java   |   17 +-
 .../gui/maintable/NameDisplayPreferences.java |   21 +-
 .../gui/maintable/OpenExternalFileAction.java |  131 +-
 .../gui/maintable/OpenFolderAction.java       |   76 +-
 .../jabref/gui/maintable/OpenUrlAction.java   |  125 +-
 .../PersistenceVisualStateTable.java          |   51 +-
 .../jabref/gui/maintable/RightClickMenu.java  |  463 ++-
 .../maintable/SearchShortScienceAction.java   |   71 +-
 .../SmartConstrainedResizePolicy.java         |   81 +-
 .../gui/maintable/columns/FieldColumn.java    |   17 +-
 .../gui/maintable/columns/FileColumn.java     |  140 +-
 .../gui/maintable/columns/LibraryColumn.java  |   10 +-
 .../columns/LinkedIdentifierColumn.java       |  120 +-
 .../maintable/columns/MainTableColumn.java    |   19 +-
 .../maintable/columns/SpecialFieldColumn.java |  169 +-
 .../gui/menus/ChangeEntryTypeAction.java      |   27 +-
 .../jabref/gui/menus/ChangeEntryTypeMenu.java |  121 +-
 .../org/jabref/gui/menus/FileHistoryMenu.java |   24 +-
 .../gui/mergeentries/DiffHighlighting.java    |   84 +-
 .../DiffHighlightingEllipsingTextFlow.java    |  113 +-
 .../org/jabref/gui/mergeentries/DiffMode.java |    1 -
 .../gui/mergeentries/EntriesMergeResult.java  |    9 +-
 .../gui/mergeentries/FetchAndMergeEntry.java  |  259 +-
 .../gui/mergeentries/MergeEntriesAction.java  |   52 +-
 .../gui/mergeentries/MergeEntriesDialog.java  |   37 +-
 .../jabref/gui/mergeentries/MergeResult.java  |    7 +-
 .../mergeentries/MergeTwoEntriesAction.java   |   28 +-
 .../MergeWithFetchedEntryAction.java          |   49 +-
 .../mergeentries/MultiMergeEntriesView.java   |  437 ++-
 .../MultiMergeEntriesViewModel.java           |   72 +-
 .../newmergedialog/FieldRowView.java          |  269 +-
 .../newmergedialog/FieldRowViewModel.java     |  162 +-
 .../newmergedialog/GroupDiffMode.java         |    2 +-
 .../PersonsNameFieldRowView.java              |   33 +-
 .../newmergedialog/ShowDiffConfig.java        |    6 +-
 .../ThreeWayMergeHeaderView.java              |   18 +-
 .../newmergedialog/ThreeWayMergeView.java     |  159 +-
 .../ThreeWayMergeViewModel.java               |   32 +-
 .../cell/CopyFieldValueCommand.java           |    7 +-
 .../newmergedialog/cell/FieldNameCell.java    |    1 +
 .../newmergedialog/cell/FieldValueCell.java   |  101 +-
 .../cell/FieldValueCellViewModel.java         |    9 +-
 .../newmergedialog/cell/HeaderCell.java       |   10 +-
 .../newmergedialog/cell/MergedFieldCell.java  |   28 +-
 .../cell/OpenExternalLinkAction.java          |   29 +-
 .../cell/ThreeWayMergeCell.java               |   28 +-
 .../cell/ThreeWayMergeCellViewModel.java      |   36 +-
 .../cell/sidebuttons/InfoButton.java          |   31 +-
 .../sidebuttons/ToggleMergeUnmergeButton.java |   30 +-
 .../diffhighlighter/DiffHighlighter.java      |   36 +-
 .../diffhighlighter/SplitDiffHighlighter.java |  104 +-
 .../UnifiedDiffHighlighter.java               |  121 +-
 .../fieldsmerger/CommentMerger.java           |    1 +
 .../fieldsmerger/FieldMergerFactory.java      |   13 +-
 .../fieldsmerger/FileMerger.java              |    2 +-
 .../fieldsmerger/GroupMerger.java             |   17 +-
 .../fieldsmerger/KeywordMerger.java           |    6 +-
 .../toolbar/ThreeWayMergeToolbar.java         |  168 +-
 .../openoffice/AdvancedCiteDialogView.java    |   33 +-
 .../org/jabref/gui/openoffice/Bootstrap.java  |  262 +-
 .../openoffice/CitationEntryViewModel.java    |   23 +-
 .../DetectOpenOfficeInstallation.java         |   64 +-
 .../openoffice/ManageCitationsDialogView.java |   62 +-
 .../ManageCitationsDialogViewModel.java       |   22 +-
 .../org/jabref/gui/openoffice/OOBibBase.java  |  817 +++--
 .../gui/openoffice/OOBibBaseConnect.java      |  123 +-
 .../org/jabref/gui/openoffice/OOError.java    |  124 +-
 .../gui/openoffice/OpenOfficePanel.java       |  648 +++-
 .../gui/openoffice/StyleSelectDialogView.java |  184 +-
 .../StyleSelectDialogViewModel.java           |  117 +-
 .../openoffice/StyleSelectItemViewModel.java  |   12 +-
 .../AbstractPreferenceTabView.java            |   20 +-
 .../preferences/PreferenceTabViewModel.java   |    1 -
 .../preferences/PreferencesDialogView.java    |  126 +-
 .../PreferencesDialogViewModel.java           |  155 +-
 .../preferences/PreferencesFilterDialog.java  |  111 +-
 .../preferences/PreferencesSearchHandler.java |   48 +-
 .../gui/preferences/PreferencesTab.java       |    2 -
 .../preferences/ShowPreferencesAction.java    |   12 +-
 .../autocompletion/AutoCompletionTab.java     |   80 +-
 .../AutoCompletionTabViewModel.java           |  103 +-
 .../CitationKeyPatternTab.java                |  123 +-
 .../CitationKeyPatternTabViewModel.java       |  139 +-
 .../CustomEntryTypeViewModel.java             |    6 +-
 .../customentrytypes/CustomEntryTypesTab.java |  382 ++-
 .../CustomEntryTypesTabViewModel.java         |  179 +-
 .../customentrytypes/EntryTypeViewModel.java  |   47 +-
 .../customentrytypes/FieldViewModel.java      |   16 +-
 .../customexporter/CustomExporterTab.java     |   47 +-
 .../CustomExporterTabViewModel.java           |   36 +-
 .../customimporter/CustomImporterTab.java     |   69 +-
 .../CustomImporterTabViewModel.java           |  145 +-
 .../gui/preferences/entry/EntryTab.java       |  112 +-
 .../preferences/entry/EntryTabViewModel.java  |  101 +-
 .../entryeditor/EntryEditorTab.java           |  118 +-
 .../entryeditor/EntryEditorTabViewModel.java  |  150 +-
 .../gui/preferences/export/ExportTab.java     |   39 +-
 .../export/ExportTabViewModel.java            |   44 +-
 .../gui/preferences/external/ExternalTab.java |  160 +-
 .../external/ExternalTabViewModel.java        |  254 +-
 .../EditExternalFileTypeEntryDialog.java      |  103 +-
 .../EditExternalFileTypeViewModel.java        |   49 +-
 .../ExternalFileTypeItemViewModel.java        |   29 +-
 .../ExternalFileTypesTab.java                 |  140 +-
 .../ExternalFileTypesTabViewModel.java        |   65 +-
 .../gui/preferences/general/GeneralTab.java   |  276 +-
 .../general/GeneralTabViewModel.java          |  370 ++-
 .../gui/preferences/groups/GroupsTab.java     |   46 +-
 .../groups/GroupsTabViewModel.java            |   35 +-
 .../journals/AbbreviationViewModel.java       |   60 +-
 .../journals/AbbreviationsFileViewModel.java  |   29 +-
 .../journals/JournalAbbreviationsTab.java     |  285 +-
 .../JournalAbbreviationsTabViewModel.java     |  300 +-
 .../keybindings/KeyBindingViewModel.java      |   60 +-
 .../keybindings/KeyBindingsTab.java           |  122 +-
 .../keybindings/KeyBindingsTabViewModel.java  |   95 +-
 .../presets/BashKeyBindingPreset.java         |    1 -
 .../keybindings/presets/KeyBindingPreset.java |    1 -
 .../presets/NewEntryBindingPreset.java        |    1 -
 .../linkedfiles/LinkedFilesTab.java           |  140 +-
 .../linkedfiles/LinkedFilesTabViewModel.java  |  137 +-
 .../nameformatter/NameFormatterItemModel.java |    2 +-
 .../nameformatter/NameFormatterTab.java       |  169 +-
 .../NameFormatterTabViewModel.java            |   37 +-
 .../network/CustomCertificateViewModel.java   |   52 +-
 .../gui/preferences/network/NetworkTab.java   |  298 +-
 .../network/NetworkTabViewModel.java          |  286 +-
 .../gui/preferences/preview/PreviewTab.java   |  417 ++-
 .../preview/PreviewTabViewModel.java          |  443 ++-
 .../NewProtectedTermsFileDialog.java          |   58 +-
 .../ProtectedTermsListItemModel.java          |    1 -
 .../protectedterms/ProtectedTermsTab.java     |  185 +-
 .../ProtectedTermsTabViewModel.java           |  145 +-
 .../gui/preferences/table/TableTab.java       |  234 +-
 .../preferences/table/TableTabViewModel.java  |  321 +-
 .../preferences/websearch/WebSearchTab.java   |  225 +-
 .../websearch/WebSearchTabViewModel.java      |  209 +-
 .../gui/preferences/xmp/XmpPrivacyTab.java    |  137 +-
 .../xmp/XmpPrivacyTabViewModel.java           |   76 +-
 .../gui/preview/CopyCitationAction.java       |  153 +-
 .../org/jabref/gui/preview/PreviewPanel.java  |  145 +-
 .../org/jabref/gui/preview/PreviewViewer.java |  330 +-
 .../gui/push/AbstractPushToApplication.java   |  129 +-
 .../jabref/gui/push/PushToApplication.java    |   13 +-
 .../gui/push/PushToApplicationCommand.java    |  127 +-
 .../gui/push/PushToApplicationSettings.java   |   46 +-
 .../jabref/gui/push/PushToApplications.java   |   34 +-
 .../java/org/jabref/gui/push/PushToEmacs.java |  102 +-
 .../jabref/gui/push/PushToEmacsSettings.java  |   18 +-
 .../java/org/jabref/gui/push/PushToLyx.java   |   59 +-
 .../jabref/gui/push/PushToLyxSettings.java    |   11 +-
 .../jabref/gui/push/PushToSublimeText.java    |   74 +-
 .../org/jabref/gui/push/PushToTeXstudio.java  |   16 +-
 .../org/jabref/gui/push/PushToTexShop.java    |   72 +-
 .../org/jabref/gui/push/PushToTexmaker.java   |   11 +-
 .../java/org/jabref/gui/push/PushToVim.java   |   70 +-
 .../jabref/gui/push/PushToVimSettings.java    |   18 +-
 .../org/jabref/gui/push/PushToWinEdt.java     |   15 +-
 .../jabref/gui/remote/CLIMessageHandler.java  |   31 +-
 .../jabref/gui/search/GlobalSearchBar.java    |  430 ++-
 .../gui/search/GlobalSearchResultDialog.java  |  166 +-
 .../GlobalSearchResultDialogViewModel.java    |   20 +-
 .../RebuildFulltextSearchIndexAction.java     |   53 +-
 .../jabref/gui/search/SearchDisplayMode.java  |   17 +-
 .../gui/search/SearchFieldRightClickMenu.java |  118 +-
 .../jabref/gui/search/SearchResultsTable.java |   58 +-
 .../search/SearchResultsTableDataModel.java   |   69 +-
 .../jabref/gui/search/SearchTextField.java    |    8 +-
 ...tainsAndRegexBasedSearchRuleDescriber.java |   55 +-
 .../GrammarBasedSearchRuleDescriber.java      |  220 +-
 .../rules/describer/SearchDescriber.java      |    1 -
 .../rules/describer/SearchDescribers.java     |   44 +-
 .../ConnectToSharedDatabaseCommand.java       |   11 +-
 .../shared/PullChangesFromSharedAction.java   |   17 +-
 .../shared/SharedDatabaseLoginDialogView.java |  219 +-
 .../SharedDatabaseLoginDialogViewModel.java   |  369 ++-
 .../gui/shared/SharedDatabaseUIManager.java   |  271 +-
 .../gui/sidepane/GroupsSidePaneComponent.java |   61 +-
 .../org/jabref/gui/sidepane/SidePane.java     |   62 +-
 .../gui/sidepane/SidePaneComponent.java       |   25 +-
 .../gui/sidepane/SidePaneContentFactory.java  |   63 +-
 .../org/jabref/gui/sidepane/SidePaneType.java |   18 +-
 .../gui/sidepane/SidePaneViewModel.java       |  122 +-
 .../jabref/gui/sidepane/TogglePaneAction.java |   15 +-
 .../gui/slr/EditExistingStudyAction.java      |   38 +-
 .../gui/slr/ExistingStudySearchAction.java    |  124 +-
 .../gui/slr/ManageStudyDefinitionView.java    |  290 +-
 .../slr/ManageStudyDefinitionViewModel.java   |  195 +-
 .../jabref/gui/slr/SlrStudyAndDirectory.java  |    2 +-
 .../jabref/gui/slr/StartNewStudyAction.java   |   66 +-
 .../org/jabref/gui/slr/StudyCatalogItem.java  |   20 +-
 .../gui/specialfields/SpecialFieldAction.java |  101 +-
 .../SpecialFieldMenuItemFactory.java          |  125 +-
 .../SpecialFieldValueViewModel.java           |    5 +-
 .../specialfields/SpecialFieldViewModel.java  |   65 +-
 .../SpecialFieldsPreferences.java             |    3 +-
 .../gui/texparser/CitationsDisplay.java       |   41 +-
 .../gui/texparser/ParseLatexAction.java       |   15 +-
 .../gui/texparser/ParseLatexDialogView.java   |  169 +-
 .../texparser/ParseLatexDialogViewModel.java  |  217 +-
 .../gui/texparser/ParseLatexResultView.java   |   78 +-
 .../texparser/ParseLatexResultViewModel.java  |   47 +-
 .../gui/texparser/ReferenceViewModel.java     |   18 +-
 .../java/org/jabref/gui/theme/StyleSheet.java |   36 +-
 .../jabref/gui/theme/StyleSheetDataUrl.java   |    7 +-
 .../org/jabref/gui/theme/StyleSheetFile.java  |   31 +-
 src/main/java/org/jabref/gui/theme/Theme.java |   11 +-
 .../org/jabref/gui/theme/ThemeManager.java    |  218 +-
 .../java/org/jabref/gui/theme/ThemeTypes.java |   21 +-
 .../gui/undo/AbstractUndoableJabRefEdit.java  |   17 +-
 .../jabref/gui/undo/CountingUndoManager.java  |   24 +-
 .../org/jabref/gui/undo/NamedCompound.java    |   21 +-
 .../org/jabref/gui/undo/UndoRedoAction.java   |   21 +-
 .../jabref/gui/undo/UndoableChangeType.java   |   28 +-
 .../jabref/gui/undo/UndoableFieldChange.java  |   34 +-
 .../gui/undo/UndoableInsertEntries.java       |   34 +-
 .../jabref/gui/undo/UndoableInsertString.java |   10 +-
 .../jabref/gui/undo/UndoableKeyChange.java    |    8 +-
 .../gui/undo/UndoablePreambleChange.java      |    7 +-
 .../gui/undo/UndoableRemoveEntries.java       |   34 +-
 .../jabref/gui/undo/UndoableRemoveString.java |   10 +-
 .../jabref/gui/undo/UndoableStringChange.java |   22 +-
 .../org/jabref/gui/util/BackgroundTask.java   |   68 +-
 .../java/org/jabref/gui/util/BaseDialog.java  |   63 +-
 .../org/jabref/gui/util/BindingsHelper.java   |  236 +-
 .../java/org/jabref/gui/util/ColorUtil.java   |   29 +-
 .../org/jabref/gui/util/ControlHelper.java    |  101 +-
 .../gui/util/CurrentThreadTaskExecutor.java   |   17 +-
 .../jabref/gui/util/CustomLocalDragboard.java |   11 +-
 .../org/jabref/gui/util/CustomRatingSkin.java |    8 +-
 .../jabref/gui/util/CustomTitledPaneSkin.java |  129 +-
 .../gui/util/DefaultFileUpdateMonitor.java    |   49 +-
 .../jabref/gui/util/DefaultTaskExecutor.java  |   63 +-
 .../jabref/gui/util/DialogWindowState.java    |    1 +
 .../gui/util/DroppingMouseLocation.java       |    2 +-
 .../java/org/jabref/gui/util/FieldsUtil.java  |   59 +-
 .../gui/util/FileDialogConfiguration.java     |   68 +-
 .../jabref/gui/util/FileFilterConverter.java  |  136 +-
 .../jabref/gui/util/FileNodeViewModel.java    |   60 +-
 .../gui/util/IconValidationDecorator.java     |   33 +-
 .../gui/util/JabRefResourceLocator.java       |    8 +-
 .../org/jabref/gui/util/NoSelectionModel.java |   33 +-
 .../jabref/gui/util/OnlyIntegerFormatter.java |    4 +-
 .../gui/util/OptionalObjectProperty.java      |   19 +-
 .../util/OptionalValueTableCellFactory.java   |   12 +-
 .../jabref/gui/util/RecursiveTreeItem.java    |   70 +-
 .../org/jabref/gui/util/StreamGobbler.java    |   16 +-
 .../org/jabref/gui/util/TaskExecutor.java     |    3 -
 .../org/jabref/gui/util/TextFlowLimited.java  |   14 +-
 .../org/jabref/gui/util/TooltipTextUtil.java  |  117 +-
 .../org/jabref/gui/util/UiThreadList.java     |   11 +-
 .../gui/util/ValueTableCellFactory.java       |   89 +-
 .../gui/util/ViewModelListCellFactory.java    |  175 +-
 .../gui/util/ViewModelTableRowFactory.java    |  138 +-
 ...extFieldTableCellVisualizationFactory.java |   68 +-
 .../gui/util/ViewModelTreeCellFactory.java    |   45 +-
 .../util/ViewModelTreeTableCellFactory.java   |   31 +-
 .../util/ViewModelTreeTableRowFactory.java    |  236 +-
 .../org/jabref/gui/util/ZipFileChooser.java   |   57 +-
 .../comparator/NumericFieldComparator.java    |    6 +-
 .../comparator/RankingFieldComparator.java    |   14 +-
 .../comparator/SpecialFieldComparator.java    |    9 +-
 .../component/TemporalAccessorPicker.java     |  103 +-
 .../uithreadaware/UiThreadChangeListener.java |   10 +-
 .../UiThreadInvalidationListener.java         |    4 +-
 .../uithreadaware/UiThreadObservableList.java |    1 -
 .../java/org/jabref/http/JabrefMediaType.java |    4 +-
 .../java/org/jabref/http/dto/BibEntryDTO.java |   63 +-
 .../java/org/jabref/http/dto/GsonFactory.java |    8 +-
 .../org/jabref/http/server/Application.java   |   25 +-
 .../org/jabref/http/server/CORSFilter.java    |   32 +-
 .../jabref/http/server/LibrariesResource.java |   22 +-
 .../jabref/http/server/LibraryResource.java   |   96 +-
 .../org/jabref/http/server/RootResource.java  |   15 +-
 .../java/org/jabref/http/server/Server.java   |  118 +-
 .../org/jabref/logic/JabRefException.java     |   14 +-
 .../java/org/jabref/logic/TypedBibEntry.java  |   15 +-
 .../WatchServiceUnavailableException.java     |    7 +-
 .../logic/auxparser/AuxParserResult.java      |    1 -
 .../logic/auxparser/DefaultAuxParser.java     |   76 +-
 .../jabref/logic/bibtex/BibEntryWriter.java   |  145 +-
 .../logic/bibtex/FieldContentFormatter.java   |    1 -
 .../jabref/logic/bibtex/FieldPreferences.java |   16 +-
 .../org/jabref/logic/bibtex/FieldWriter.java  |  110 +-
 .../jabref/logic/bibtex/FileFieldWriter.java  |   25 +-
 .../bibtex/comparator/BibDatabaseDiff.java    |  105 +-
 .../logic/bibtex/comparator/BibEntryDiff.java |    1 +
 .../bibtex/comparator/BibStringDiff.java      |   47 +-
 .../comparator/BibtexStringComparator.java    |    1 -
 .../comparator/CrossRefEntryComparator.java   |    1 -
 .../bibtex/comparator/EntryComparator.java    |   26 +-
 .../bibtex/comparator/FieldComparator.java    |   17 +-
 .../comparator/FieldComparatorStack.java      |    4 +-
 .../logic/bibtex/comparator/GroupDiff.java    |   17 +-
 .../logic/bibtex/comparator/IdComparator.java |    1 -
 .../logic/bibtex/comparator/MetaDataDiff.java |  117 +-
 .../logic/bibtex/comparator/PreambleDiff.java |   22 +-
 .../java/org/jabref/logic/bst/BstEntry.java   |    1 -
 .../org/jabref/logic/bst/BstFunctions.java    |  449 ++-
 .../jabref/logic/bst/BstPreviewLayout.java    |   17 +-
 src/main/java/org/jabref/logic/bst/BstVM.java |   52 +-
 .../org/jabref/logic/bst/BstVMContext.java    |   33 +-
 .../org/jabref/logic/bst/BstVMException.java  |    1 +
 .../org/jabref/logic/bst/BstVMVisitor.java    |  138 +-
 .../jabref/logic/bst/util/BstCaseChanger.java |   63 +-
 .../logic/bst/util/BstNameFormatter.java      |  132 +-
 .../jabref/logic/bst/util/BstPurifier.java    |   21 +-
 .../logic/bst/util/BstTextPrefixer.java       |   13 +-
 .../logic/bst/util/BstWidthCalculator.java    |   23 +-
 .../AbstractCitationKeyPattern.java           |   18 +-
 .../citationkeypattern/BracketedPattern.java  |  709 ++--
 .../CitationKeyGenerator.java                 |  132 +-
 .../CitationKeyPatternPreferences.java        |  126 +-
 .../DatabaseCitationKeyPattern.java           |    5 +-
 .../GlobalCitationKeyPattern.java             |    1 -
 .../logic/citationstyle/CSLAdapter.java       |   42 +-
 .../logic/citationstyle/CitationStyle.java    |  106 +-
 .../citationstyle/CitationStyleCache.java     |   44 +-
 .../citationstyle/CitationStyleGenerator.java |   95 +-
 .../CitationStyleOutputFormat.java            |    1 -
 .../CitationStylePreviewLayout.java           |   19 +-
 .../citationstyle/JabRefItemDataProvider.java |  192 +-
 .../citationstyle/JabRefLocaleProvider.java   |   36 +-
 .../org/jabref/logic/cleanup/CleanupJob.java  |    2 -
 .../jabref/logic/cleanup/CleanupWorker.java   |   83 +-
 .../cleanup/ConvertToBiblatexCleanup.java     |   72 +-
 .../logic/cleanup/ConvertToBibtexCleanup.java |   66 +-
 .../org/jabref/logic/cleanup/DoiCleanup.java  |   63 +-
 .../jabref/logic/cleanup/EprintCleanup.java   |   45 +-
 .../logic/cleanup/FieldFormatterCleanup.java  |   24 +-
 .../logic/cleanup/FieldFormatterCleanups.java |  147 +-
 .../logic/cleanup/FileLinksCleanup.java       |    8 +-
 .../org/jabref/logic/cleanup/ISSNCleanup.java |    8 +-
 .../logic/cleanup/MoveFieldCleanup.java       |    6 +-
 .../logic/cleanup/MoveFilesCleanup.java       |   24 +-
 .../logic/cleanup/RelativePathsCleanup.java   |   21 +-
 .../logic/cleanup/RenamePdfCleanup.java       |   26 +-
 .../cleanup/TimeStampToCreationDate.java      |   45 +-
 .../cleanup/TimeStampToModificationDate.java  |   49 +-
 .../org/jabref/logic/cleanup/URLCleanup.java  |   96 +-
 .../cleanup/UpgradePdfPsToFileCleanup.java    |   45 +-
 .../org/jabref/logic/crawler/Crawler.java     |   38 +-
 .../StudyCatalogToFetcherConverter.java       |   46 +-
 .../jabref/logic/crawler/StudyFetcher.java    |   55 +-
 .../jabref/logic/crawler/StudyRepository.java |  289 +-
 .../jabref/logic/crawler/StudyYamlParser.java |   24 +-
 .../jabref/logic/database/DatabaseMerger.java |  126 +-
 .../jabref/logic/database/DuplicateCheck.java |  272 +-
 .../exporter/AtomicFileOutputStream.java      |   96 +-
 .../logic/exporter/AtomicFileWriter.java      |    3 +-
 .../logic/exporter/BibDatabaseWriter.java     |  219 +-
 .../org/jabref/logic/exporter/BibWriter.java  |    1 -
 .../logic/exporter/BibtexDatabaseWriter.java  |  111 +-
 .../logic/exporter/BlankLineBehaviour.java    |    2 +-
 .../exporter/EmbeddedBibFilePdfExporter.java  |   87 +-
 .../org/jabref/logic/exporter/Exporter.java   |   68 +-
 .../logic/exporter/ExporterFactory.java       |  260 +-
 .../logic/exporter/GroupSerializer.java       |  151 +-
 .../jabref/logic/exporter/MSBibExporter.java  |   35 +-
 .../logic/exporter/MetaDataSerializer.java    |  203 +-
 .../jabref/logic/exporter/ModsExporter.java   |  192 +-
 .../jabref/logic/exporter/OOCalcDatabase.java |   47 +-
 .../exporter/OpenDocumentRepresentation.java  |  107 +-
 .../OpenDocumentSpreadsheetCreator.java       |  107 +-
 .../exporter/OpenOfficeDocumentCreator.java   |   95 +-
 .../logic/exporter/SaveConfiguration.java     |   24 +-
 .../jabref/logic/exporter/SaveException.java  |   20 +-
 .../SelfContainedSaveConfiguration.java       |   10 +-
 .../logic/exporter/TemplateExporter.java      |  232 +-
 .../jabref/logic/exporter/XmpExporter.java    |   27 +-
 .../jabref/logic/exporter/XmpPdfExporter.java |   48 +-
 .../ExternalFilesContentImporter.java         |   21 +-
 .../externalfiles/LinkedFileHandler.java      |  127 +-
 .../jabref/logic/formatter/Formatters.java    |   66 +-
 .../logic/formatter/IdentityFormatter.java    |    1 -
 .../bibtexfields/AddBracesFormatter.java      |   11 +-
 .../bibtexfields/CleanupUrlFormatter.java     |   25 +-
 .../bibtexfields/ClearFormatter.java          |    1 -
 .../EscapeAmpersandsFormatter.java            |   17 +-
 .../EscapeDollarSignFormatter.java            |    6 +-
 .../EscapeUnderscoresFormatter.java           |    1 -
 .../bibtexfields/HtmlToLatexFormatter.java    |  109 +-
 .../bibtexfields/HtmlToUnicodeFormatter.java  |   11 +-
 .../bibtexfields/LatexCleanupFormatter.java   |   41 +-
 .../bibtexfields/NormalizeDateFormatter.java  |    2 +-
 .../bibtexfields/NormalizeMonthFormatter.java |    5 +-
 .../bibtexfields/NormalizeNamesFormatter.java |    5 +-
 .../bibtexfields/NormalizePagesFormatter.java |   12 +-
 .../OrdinalsToSuperscriptFormatter.java       |   10 +-
 .../bibtexfields/RegexFormatter.java          |   84 +-
 .../bibtexfields/RemoveBracesFormatter.java   |   12 +-
 .../bibtexfields/RemoveDigitsFormatter.java   |    1 -
 .../RemoveHyphenatedNewlinesFormatter.java    |    6 +-
 .../bibtexfields/RemoveNewlinesFormatter.java |    6 +-
 .../RemoveRedundantSpacesFormatter.java       |    5 +-
 .../ReplaceTabsBySpaceFormater.java           |    5 +-
 .../bibtexfields/ShortenDOIFormatter.java     |   32 +-
 .../bibtexfields/TrimWhitespaceFormatter.java |    5 +-
 .../bibtexfields/UnicodeToLatexFormatter.java |   37 +-
 .../bibtexfields/UnitsToLatexFormatter.java   |  150 +-
 .../casechanger/CapitalizeFormatter.java      |    3 +-
 .../casechanger/ProtectTermsFormatter.java    |   10 +-
 .../casechanger/SentenceCaseFormatter.java    |   25 +-
 .../logic/formatter/casechanger/Title.java    |    5 +-
 .../casechanger/TitleCaseFormatter.java       |   43 +-
 .../formatter/casechanger/TitleParser.java    |    8 +-
 .../casechanger/UnprotectTermsFormatter.java  |    4 +-
 .../casechanger/UpperCaseFormatter.java       |    3 +-
 .../logic/formatter/casechanger/Word.java     |  140 +-
 .../minifier/MinifyNameListFormatter.java     |   11 +-
 .../formatter/minifier/TruncateFormatter.java |    2 +-
 .../java/org/jabref/logic/git/GitHandler.java |  123 +-
 .../org/jabref/logic/git/SlrGitHandler.java   |   94 +-
 .../logic/groups/DefaultGroupsFactory.java    |   10 +-
 .../java/org/jabref/logic/help/HelpFile.java  |   44 +-
 .../logic/importer/AuthorListParser.java      |  206 +-
 .../logic/importer/CompositeIdFetcher.java    |   28 +-
 .../logic/importer/EntryBasedFetcher.java     |    2 -
 .../importer/EntryBasedParserFetcher.java     |   14 +-
 .../importer/FetcherClientException.java      |   13 +-
 .../logic/importer/FetcherException.java      |    6 +-
 .../jabref/logic/importer/FetcherResult.java  |    2 +-
 .../importer/FetcherServerException.java      |   14 +-
 .../logic/importer/FulltextFetcher.java       |    4 +-
 .../logic/importer/FulltextFetchers.java      |   93 +-
 .../jabref/logic/importer/IdBasedFetcher.java |    5 +-
 .../logic/importer/IdBasedParserFetcher.java  |   20 +-
 .../org/jabref/logic/importer/IdFetcher.java  |    2 -
 .../logic/importer/IdParserFetcher.java       |   17 +-
 .../jabref/logic/importer/ImportCleanup.java  |    2 -
 .../logic/importer/ImportCleanupBiblatex.java |    7 +-
 .../logic/importer/ImportCleanupBibtex.java   |    3 +-
 .../importer/ImportFormatPreferences.java     |   14 +-
 .../logic/importer/ImportFormatReader.java    |   84 +-
 .../org/jabref/logic/importer/Importer.java   |   79 +-
 .../logic/importer/ImporterPreferences.java   |   47 +-
 .../jabref/logic/importer/OpenDatabase.java   |   34 +-
 .../jabref/logic/importer/OutputPrinter.java  |    1 -
 .../importer/PagedSearchBasedFetcher.java     |   27 +-
 .../PagedSearchBasedParserFetcher.java        |   47 +-
 .../org/jabref/logic/importer/Parser.java     |   11 +-
 .../jabref/logic/importer/ParserResult.java   |   21 +-
 .../jabref/logic/importer/QueryParser.java    |   14 +-
 .../logic/importer/SearchBasedFetcher.java    |   16 +-
 .../importer/SearchBasedParserFetcher.java    |   34 +-
 .../org/jabref/logic/importer/WebFetcher.java |    2 -
 .../jabref/logic/importer/WebFetchers.java    |  148 +-
 .../importer/fetcher/ACMPortalFetcher.java    |   16 +-
 .../jabref/logic/importer/fetcher/ACS.java    |    7 +-
 .../importer/fetcher/AbstractIsbnFetcher.java |   12 +-
 .../logic/importer/fetcher/ApsFetcher.java    |   12 +-
 .../logic/importer/fetcher/ArXivFetcher.java  |  643 +++-
 .../fetcher/AstrophysicsDataSystem.java       |  197 +-
 .../importer/fetcher/BibsonomyScraper.java    |   37 +-
 .../importer/fetcher/BiodiversityLibrary.java |  163 +-
 .../logic/importer/fetcher/BvbFetcher.java    |   17 +-
 .../logic/importer/fetcher/CiteSeer.java      |   69 +-
 ...fComputerScienceBibliographiesFetcher.java |  108 +-
 ...OfComputerScienceBibliographiesParser.java |   51 +-
 .../importer/fetcher/ComplexSearchQuery.java  |  193 +-
 .../fetcher/CompositeSearchBasedFetcher.java  |   75 +-
 .../logic/importer/fetcher/CrossRef.java      |  207 +-
 .../logic/importer/fetcher/DBLPFetcher.java   |   42 +-
 .../logic/importer/fetcher/DOABFetcher.java   |  173 +-
 .../logic/importer/fetcher/DOAJFetcher.java   |  113 +-
 .../jabref/logic/importer/fetcher/DiVA.java   |   11 +-
 .../logic/importer/fetcher/DoiFetcher.java    |  148 +-
 .../logic/importer/fetcher/DoiResolution.java |   56 +-
 .../logic/importer/fetcher/GoogleScholar.java |  127 +-
 .../fetcher/GrobidCitationFetcher.java        |   49 +-
 .../importer/fetcher/GrobidPreferences.java   |    9 +-
 .../logic/importer/fetcher/GvkFetcher.java    |   62 +-
 .../jabref/logic/importer/fetcher/IEEE.java   |  223 +-
 .../importer/fetcher/INSPIREFetcher.java      |   60 +-
 .../importer/fetcher/IacrEprintFetcher.java   |  134 +-
 .../logic/importer/fetcher/IssnFetcher.java   |   34 +-
 .../fetcher/JournalInformationFetcher.java    |  225 +-
 .../logic/importer/fetcher/JstorFetcher.java  |   45 +-
 .../logic/importer/fetcher/LOBIDFetcher.java  |  154 +-
 .../importer/fetcher/LibraryOfCongress.java   |   11 +-
 .../logic/importer/fetcher/MathSciNet.java    |  115 +-
 .../importer/fetcher/MedlineFetcher.java      |  132 +-
 .../jabref/logic/importer/fetcher/Medra.java  |   84 +-
 .../logic/importer/fetcher/MrDLibFetcher.java |   37 +-
 .../logic/importer/fetcher/OpenAccessDoi.java |   63 +-
 .../logic/importer/fetcher/ResearchGate.java  |  157 +-
 .../logic/importer/fetcher/RfcFetcher.java    |   20 +-
 .../fetcher/ScholarArchiveFetcher.java        |   94 +-
 .../logic/importer/fetcher/ScienceDirect.java |  125 +-
 .../importer/fetcher/SemanticScholar.java     |  145 +-
 .../importer/fetcher/SpringerFetcher.java     |  158 +-
 .../logic/importer/fetcher/SpringerLink.java  |   52 +-
 .../logic/importer/fetcher/TitleFetcher.java  |    8 +-
 .../jabref/logic/importer/fetcher/ZbMATH.java |  124 +-
 .../DoiToBibtexConverterComIsbnFetcher.java   |   99 +-
 .../isbntobibtex/EbookDeIsbnFetcher.java      |   39 +-
 .../fetcher/isbntobibtex/IsbnFetcher.java     |   42 +-
 .../isbntobibtex/OpenLibraryIsbnFetcher.java  |  130 +-
 .../AbstractQueryTransformer.java             |   45 +-
 .../transformers/ArXivQueryTransformer.java   |    4 +-
 .../CiteSeerQueryTransformer.java             |   27 +-
 ...ScienceBibliographiesQueryTransformer.java |    3 +-
 .../transformers/DBLPQueryTransformer.java    |    9 +-
 .../transformers/DefaultQueryTransformer.java |    3 +-
 .../transformers/GVKQueryTransformer.java     |   15 +-
 .../transformers/IEEEQueryTransformer.java    |   23 +-
 .../transformers/JstorQueryTransformer.java   |    9 +-
 .../transformers/MedlineQueryTransformer.java |    7 +-
 .../ScholarArchiveQueryTransformer.java       |    4 -
 .../transformers/ScholarQueryTransformer.java |    4 +-
 ...dYearRangeByFilteringQueryTransformer.java |    3 +-
 .../YearRangeByFilteringQueryTransformer.java |   11 +-
 .../importer/fileformat/ACMPortalParser.java  |  178 +-
 .../fileformat/BiblioscapeImporter.java       |  192 +-
 .../importer/fileformat/BibtexImporter.java   |   80 +-
 .../importer/fileformat/BibtexParser.java     |  284 +-
 .../importer/fileformat/CffImporter.java      |   93 +-
 .../fileformat/CitaviXmlImporter.java         |  344 +-
 .../importer/fileformat/CiteSeerParser.java   |   36 +-
 .../importer/fileformat/CoinsParser.java      |   15 +-
 .../importer/fileformat/CopacImporter.java    |  105 +-
 .../importer/fileformat/CustomImporter.java   |   18 +-
 .../importer/fileformat/EndnoteImporter.java  |   74 +-
 .../fileformat/EndnoteXmlImporter.java        |  321 +-
 .../importer/fileformat/InspecImporter.java   |   40 +-
 .../importer/fileformat/IsiImporter.java      |  134 +-
 .../importer/fileformat/MarcXmlParser.java    |  212 +-
 .../importer/fileformat/MedlineImporter.java  |  709 +++-
 .../fileformat/MedlinePlainImporter.java      |  136 +-
 .../importer/fileformat/ModsImporter.java     |  378 ++-
 .../importer/fileformat/MrDLibImporter.java   |   74 +-
 .../importer/fileformat/MsBibImporter.java    |   74 +-
 .../importer/fileformat/OvidImporter.java     |  103 +-
 .../fileformat/PdfContentImporter.java        |  119 +-
 .../PdfEmbeddedBibFileImporter.java           |  104 +-
 .../fileformat/PdfGrobidImporter.java         |   35 +-
 .../fileformat/PdfMergeMetadataImporter.java  |  112 +-
 .../PdfVerbatimBibTextImporter.java           |   41 +-
 .../importer/fileformat/PdfXmpImporter.java   |   21 +-
 .../importer/fileformat/PicaXmlParser.java    |   43 +-
 .../importer/fileformat/RepecNepImporter.java |  145 +-
 .../importer/fileformat/RisImporter.java      |  145 +-
 .../fileformat/SilverPlatterImporter.java     |   84 +-
 .../fileformat/medline/ArticleId.java         |    6 +-
 .../fileformat/medline/Investigator.java      |    9 +-
 .../fileformat/medline/MeshHeading.java       |    6 +-
 .../importer/fileformat/medline/OtherId.java  |    6 +-
 .../medline/PersonalNameSubject.java          |    6 +-
 .../importer/fileformat/mods/Identifier.java  |    5 +-
 .../logic/importer/fileformat/mods/Name.java  |    5 +-
 .../importer/fileformat/mods/RecordInfo.java  |   19 +-
 .../fileformat/mods/package-info.java         |   13 +-
 .../logic/importer/util/FileFieldParser.java  |   44 +-
 .../logic/importer/util/GrobidService.java    |   85 +-
 .../logic/importer/util/GroupsParser.java     |  420 ++-
 .../logic/importer/util/IdentifierParser.java |   10 +-
 .../logic/importer/util/JsonReader.java       |   20 +-
 .../logic/importer/util/MathMLParser.java     |   23 +-
 .../logic/importer/util/MediaTypes.java       |    4 +-
 .../logic/importer/util/MetaDataParser.java   |  184 +-
 .../logic/importer/util/ShortDOIService.java  |   13 +-
 .../util/ShortDOIServiceException.java        |    7 +-
 .../logic/importer/util/StaxParser.java       |   52 +-
 .../integrity/ASCIICharacterChecker.java      |   17 +-
 .../logic/integrity/AbbreviationChecker.java  |   18 +-
 .../logic/integrity/AmpersandChecker.java     |   51 +-
 .../logic/integrity/BibStringChecker.java     |   21 +-
 .../integrity/BibTeXEntryTypeChecker.java     |   11 +-
 .../logic/integrity/BooktitleChecker.java     |    5 +-
 .../logic/integrity/BracesCorrector.java      |    8 +-
 .../logic/integrity/BracketChecker.java       |    9 +-
 .../logic/integrity/CitationKeyChecker.java   |   12 +-
 .../CitationKeyDeviationChecker.java          |   26 +-
 .../CitationKeyDuplicationChecker.java        |   12 +-
 .../logic/integrity/DatabaseChecker.java      |    1 -
 .../jabref/logic/integrity/DateChecker.java   |    1 -
 .../integrity/DoiDuplicationChecker.java      |   39 +-
 .../logic/integrity/DoiValidityChecker.java   |    2 +-
 .../logic/integrity/EditionChecker.java       |   50 +-
 .../jabref/logic/integrity/EntryChecker.java  |    1 -
 .../logic/integrity/EntryLinkChecker.java     |   34 +-
 .../jabref/logic/integrity/FieldChecker.java  |    8 +-
 .../jabref/logic/integrity/FieldCheckers.java |   83 +-
 .../jabref/logic/integrity/FileChecker.java   |   19 +-
 .../logic/integrity/HTMLCharacterChecker.java |   29 +-
 .../logic/integrity/HowPublishedChecker.java  |   14 +-
 .../jabref/logic/integrity/ISBNChecker.java   |    1 -
 .../jabref/logic/integrity/ISSNChecker.java   |    1 -
 .../logic/integrity/IntegrityCheck.java       |   70 +-
 .../logic/integrity/IntegrityMessage.java     |   19 +-
 .../JournalInAbbreviationListChecker.java     |   17 +-
 .../integrity/LatexIntegrityChecker.java      |  116 +-
 .../jabref/logic/integrity/MonthChecker.java  |   31 +-
 .../logic/integrity/NoBibtexFieldChecker.java |   42 +-
 .../jabref/logic/integrity/NoteChecker.java   |   17 +-
 .../jabref/logic/integrity/PagesChecker.java  |   49 +-
 .../logic/integrity/PersonNamesChecker.java   |   24 +-
 .../jabref/logic/integrity/TitleChecker.java  |   27 +-
 .../jabref/logic/integrity/TypeChecker.java   |   12 +-
 .../jabref/logic/integrity/UTF8Checker.java   |   15 +-
 .../jabref/logic/integrity/UrlChecker.java    |    6 +-
 .../integrity/ValidCitationKeyChecker.java    |    1 -
 .../jabref/logic/integrity/YearChecker.java   |   24 +-
 .../jabref/logic/journals/Abbreviation.java   |   73 +-
 .../logic/journals/AbbreviationFormat.java    |   18 +-
 .../logic/journals/AbbreviationParser.java    |   44 +-
 .../logic/journals/AbbreviationWriter.java    |   32 +-
 .../journals/JournalAbbreviationLoader.java   |   40 +-
 .../JournalAbbreviationPreferences.java       |   10 +-
 .../JournalAbbreviationRepository.java        |  146 +-
 .../logic/journals/JournalInformation.java    |   42 +-
 .../java/org/jabref/logic/l10n/Encodings.java |   21 +-
 .../org/jabref/logic/l10n/Localization.java   |  102 +-
 .../jabref/logic/l10n/LocalizationKey.java    |    3 +-
 .../logic/l10n/LocalizationKeyParams.java     |   10 +-
 .../logic/l10n/LocalizationLocator.java       |    4 +-
 .../layout/AbstractParamLayoutFormatter.java  |   11 +-
 .../java/org/jabref/logic/layout/Layout.java  |   46 +-
 .../org/jabref/logic/layout/LayoutEntry.java  |  271 +-
 .../jabref/logic/layout/LayoutFormatter.java  |    1 -
 .../layout/LayoutFormatterPreferences.java    |   20 +-
 .../org/jabref/logic/layout/LayoutHelper.java |  102 +-
 .../logic/layout/ParamLayoutFormatter.java    |    1 -
 .../logic/layout/TextBasedPreviewLayout.java  |   26 +-
 .../layout/format/AuthorAndsReplacer.java     |   27 +-
 .../layout/format/AuthorFirstFirstCommas.java |    6 +-
 .../layout/format/AuthorFirstLastCommas.java  |    6 +-
 .../jabref/logic/layout/format/Authors.java   |   60 +-
 .../jabref/logic/layout/format/CSLType.java   |    1 -
 .../logic/layout/format/CompositeFormat.java  |    1 -
 .../layout/format/CreateBibORDFAuthors.java   |   20 +-
 .../layout/format/CreateDocBook4Authors.java  |    7 +-
 .../layout/format/CreateDocBook4Editors.java  |    7 +-
 .../layout/format/CreateDocBook5Authors.java  |    7 +-
 .../layout/format/CreateDocBook5Editors.java  |    7 +-
 .../logic/layout/format/CurrentDate.java      |    1 -
 .../jabref/logic/layout/format/DOICheck.java  |    1 +
 .../jabref/logic/layout/format/DOIStrip.java  |    1 +
 .../logic/layout/format/DateFormatter.java    |    6 +-
 .../jabref/logic/layout/format/Default.java   |    4 +-
 .../layout/format/DocBookAuthorFormatter.java |   54 +-
 .../logic/layout/format/DocBookVersion.java   |    2 +-
 .../jabref/logic/layout/format/FileLink.java  |    8 +-
 .../jabref/logic/layout/format/HTMLChars.java |   50 +-
 .../logic/layout/format/HTMLParagraphs.java   |    9 +-
 .../logic/layout/format/HayagrivaType.java    |    1 -
 .../jabref/logic/layout/format/IfPlural.java  |    5 +-
 .../logic/layout/format/Iso690FormatDate.java |    7 +-
 .../layout/format/Iso690NamesAuthors.java     |   11 +-
 .../layout/format/JournalAbbreviator.java     |    1 -
 .../format/LatexToUnicodeFormatter.java       |    8 +-
 .../layout/format/MarkdownFormatter.java      |   11 +-
 .../logic/layout/format/NameFormatter.java    |   30 +-
 .../format/NameFormatterPreferences.java      |   12 +-
 .../layout/format/NotFoundFormatter.java      |    7 +-
 .../jabref/logic/layout/format/Ordinal.java   |   14 +-
 .../jabref/logic/layout/format/RTFChars.java  |  150 +-
 .../logic/layout/format/RemoveBrackets.java   |    1 +
 .../layout/format/RemoveBracketsAddComma.java |    1 +
 .../format/RemoveLatexCommandsFormatter.java  |   44 +-
 .../logic/layout/format/RemoveTilde.java      |    1 +
 .../jabref/logic/layout/format/Replace.java   |    1 -
 .../ReplaceUnicodeLigaturesFormatter.java     |    9 +-
 .../ReplaceWithEscapedDoubleQuotes.java       |    1 +
 .../jabref/logic/layout/format/RisMonth.java  |    5 +-
 .../layout/format/ShortMonthFormatter.java    |    1 -
 .../logic/layout/format/ToLowerCase.java      |    1 -
 .../logic/layout/format/ToUpperCase.java      |    1 -
 .../logic/layout/format/WrapContent.java      |    1 -
 .../logic/layout/format/WrapFileLinks.java    |   31 +-
 .../jabref/logic/layout/format/XMLChars.java  |    6 +-
 .../org/jabref/logic/logging/LogMessages.java |    7 +-
 .../jabref/logic/msbib/BibTeXConverter.java   |  126 +-
 .../jabref/logic/msbib/MSBibConverter.java    |  134 +-
 .../org/jabref/logic/msbib/MSBibDatabase.java |   47 +-
 .../org/jabref/logic/msbib/MSBibEntry.java    |  159 +-
 .../jabref/logic/msbib/MSBibEntryType.java    |    2 +-
 .../org/jabref/logic/msbib/MSBibMapping.java  |  230 +-
 .../org/jabref/logic/msbib/MsBibAuthor.java   |   21 +-
 .../org/jabref/logic/msbib/PageNumbers.java   |   14 +-
 .../jabref/logic/net/ProgressInputStream.java |    1 -
 .../jabref/logic/net/ProxyAuthenticator.java  |    5 +-
 .../jabref/logic/net/ProxyPreferences.java    |   54 +-
 .../org/jabref/logic/net/ProxyRegisterer.java |   13 +-
 .../org/jabref/logic/net/URLDownload.java     |  199 +-
 .../jabref/logic/net/ssl/SSLCertificate.java  |   50 +-
 .../jabref/logic/net/ssl/SSLPreferences.java  |    1 +
 .../logic/net/ssl/TrustStoreManager.java      |  147 +-
 .../openoffice/OpenOfficeFileSearch.java      |   78 +-
 .../openoffice/OpenOfficePreferences.java     |   25 +-
 .../logic/openoffice/action/EditInsert.java   |   86 +-
 .../logic/openoffice/action/EditMerge.java    |  223 +-
 .../logic/openoffice/action/EditSeparate.java |   74 +-
 .../logic/openoffice/action/ExportCited.java  |   54 +-
 .../openoffice/action/ManageCitations.java    |   29 +-
 .../logic/openoffice/action/Update.java       |  114 +-
 .../logic/openoffice/backend/Backend52.java   |  368 ++-
 .../logic/openoffice/backend/Codec52.java     |   54 +-
 .../logic/openoffice/backend/GetContext.java  |   39 +-
 .../NamedRangeManagerReferenceMark.java       |   46 +-
 .../backend/NamedRangeReferenceMark.java      |  277 +-
 .../logic/openoffice/frontend/OOFrontend.java |  434 +--
 .../frontend/RangeForOverlapCheck.java        |   18 +-
 .../frontend/UpdateBibliography.java          |  105 +-
 .../frontend/UpdateCitationMarkers.java       |  135 +-
 .../logic/openoffice/style/OOBibStyle.java    |  206 +-
 .../style/OOBibStyleGetCitationMarker.java    |  336 +-
 .../style/OOBibStyleGetNumCitationMarker.java |  120 +-
 .../style/OOFormatBibliography.java           |  135 +-
 .../openoffice/style/OOPreFormatter.java      |   78 +-
 .../logic/openoffice/style/OOProcess.java     |   55 +-
 .../style/OOProcessAuthorYearMarkers.java     |   66 +-
 .../style/OOProcessCitationKeyMarkers.java    |   25 +-
 .../style/OOProcessNumericMarkers.java        |   18 +-
 .../logic/openoffice/style/StyleLoader.java   |   72 +-
 .../jabref/logic/pdf/AnnotationImporter.java  |    2 -
 .../logic/pdf/EntryAnnotationImporter.java    |   24 +-
 .../jabref/logic/pdf/FileAnnotationCache.java |   68 +-
 .../logic/pdf/PdfAnnotationImporter.java      |  109 +-
 .../org/jabref/logic/pdf/TextExtractor.java   |   33 +-
 .../pdf/search/indexing/DocumentReader.java   |  162 +-
 .../search/indexing/IndexingTaskManager.java  |   46 +-
 .../logic/pdf/search/indexing/PdfIndexer.java |  128 +-
 .../pdf/search/retrieval/PdfSearcher.java     |   65 +-
 .../logic/preferences/DOIPreferences.java     |    1 +
 .../logic/preferences/FetcherApiKey.java      |    1 +
 .../logic/preferences/OwnerPreferences.java   |    9 +-
 .../preferences/TimestampPreferences.java     |   15 +-
 .../jabref/logic/preview/PreviewLayout.java   |    6 +-
 .../protectedterms/ProtectedTermsList.java    |   33 +-
 .../protectedterms/ProtectedTermsLoader.java  |  131 +-
 .../protectedterms/ProtectedTermsParser.java  |   44 +-
 .../ProtectedTermsPreferences.java            |   23 +-
 .../org/jabref/logic/remote/Protocol.java     |   24 +-
 .../jabref/logic/remote/RemoteMessage.java    |    2 +-
 .../logic/remote/RemotePreferences.java       |    1 -
 .../org/jabref/logic/remote/RemoteUtil.java   |    3 +-
 .../logic/remote/client/RemoteClient.java     |   34 +-
 .../remote/server/RemoteListenerServer.java   |   34 +-
 .../server/RemoteListenerServerManager.java   |   25 +-
 .../server/RemoteListenerServerThread.java    |   10 +-
 .../remote/server/RemoteMessageHandler.java   |    1 -
 .../jabref/logic/search/DatabaseSearcher.java |   12 +-
 .../org/jabref/logic/search/SearchQuery.java  |   38 +-
 .../jabref/logic/shared/DBMSConnection.java   |   29 +-
 .../shared/DBMSConnectionProperties.java      |   89 +-
 .../DBMSConnectionPropertiesBuilder.java      |   22 +-
 .../jabref/logic/shared/DBMSProcessor.java    |  607 ++--
 .../jabref/logic/shared/DBMSSynchronizer.java |  186 +-
 .../org/jabref/logic/shared/DBMSType.java     |   26 +-
 .../logic/shared/DatabaseConnection.java      |    1 -
 .../shared/DatabaseConnectionProperties.java  |    1 -
 .../jabref/logic/shared/DatabaseLocation.java |    2 +-
 .../logic/shared/DatabaseSynchronizer.java    |    4 +-
 .../jabref/logic/shared/MySQLProcessor.java   |   71 +-
 .../jabref/logic/shared/OracleProcessor.java  |  212 +-
 .../logic/shared/PostgreSQLProcessor.java     |  164 +-
 .../event/SharedEntriesNotPresentEvent.java   |    1 -
 .../shared/event/UpdateRefusedEvent.java      |    6 +-
 .../exception/OfflineLockException.java       |    5 +-
 .../listener/OracleNotificationListener.java  |    3 +-
 .../PostgresSQLNotificationListener.java      |   25 +-
 .../prefs/SharedDatabasePreferences.java      |   57 +-
 .../logic/shared/security/Password.java       |   29 +-
 .../logic/texparser/DefaultLatexParser.java   |   86 +-
 .../jabref/logic/texparser/LatexParser.java   |    2 -
 .../texparser/TexBibEntriesResolver.java      |  126 +-
 .../logic/undo/AddUndoableActionEvent.java    |    7 +-
 .../jabref/logic/undo/UndoChangeEvent.java    |    7 +-
 .../org/jabref/logic/undo/UndoRedoEvent.java  |    7 +-
 .../org/jabref/logic/util/BackupFileType.java |    1 -
 .../java/org/jabref/logic/util/BuildInfo.java |   83 +-
 .../jabref/logic/util/CoarseChangeFilter.java |   20 +-
 .../jabref/logic/util/DelayTaskThrottler.java |   12 +-
 .../logic/util/ExternalLinkCreator.java       |   34 +-
 .../java/org/jabref/logic/util/FileType.java  |    8 +-
 .../MetadataSerializationConfiguration.java   |   10 +-
 src/main/java/org/jabref/logic/util/OS.java   |   34 +-
 .../jabref/logic/util/StandardFileType.java   |   18 +-
 .../java/org/jabref/logic/util/TestEntry.java |   36 +-
 .../jabref/logic/util/UnknownFileType.java    |    3 +-
 .../org/jabref/logic/util/UpdateField.java    |   62 +-
 .../java/org/jabref/logic/util/Version.java   |  124 +-
 .../org/jabref/logic/util/WebViewStore.java   |   15 +-
 .../logic/util/io/AutoLinkPreferences.java    |   36 +-
 .../jabref/logic/util/io/BackupFileUtil.java  |   54 +-
 .../util/io/CitationKeyBasedFileFinder.java   |   42 +-
 .../logic/util/io/DatabaseFileLookup.java     |   29 +-
 .../org/jabref/logic/util/io/FileFinder.java  |    8 +-
 .../org/jabref/logic/util/io/FileFinders.java |   17 +-
 .../org/jabref/logic/util/io/FileHistory.java |    1 -
 .../jabref/logic/util/io/FileNameCleaner.java |    3 +-
 .../logic/util/io/FileNameUniqueness.java     |   79 +-
 .../org/jabref/logic/util/io/FileUtil.java    |  203 +-
 .../logic/util/io/RegExpBasedFileFinder.java  |  131 +-
 .../org/jabref/logic/util/io/XMLUtil.java     |   24 +-
 .../strings/HTMLUnicodeConversionMaps.java    | 1676 +++++-----
 .../util/strings/QuotedStringTokenizer.java   |   10 +-
 .../logic/util/strings/StringManipulator.java |  117 +-
 .../logic/util/strings/StringSimilarity.java  |    9 +-
 .../logic/util/strings/XmlCharsMap.java       |    1 +
 .../xmp/DocumentInformationExtractor.java     |   14 +-
 .../jabref/logic/xmp/DublinCoreExtractor.java |  142 +-
 .../org/jabref/logic/xmp/XmpPreferences.java  |   11 +-
 .../org/jabref/logic/xmp/XmpUtilReader.java   |   69 +-
 .../org/jabref/logic/xmp/XmpUtilShared.java   |   27 +-
 .../org/jabref/logic/xmp/XmpUtilWriter.java   |  141 +-
 .../ConvertLegacyExplicitGroups.java          |   19 +-
 .../migrations/ConvertMarkingToGroups.java    |   59 +-
 .../CustomEntryTypePreferenceMigration.java   |   61 +-
 .../MergeReviewIntoCommentMigration.java      |   71 +-
 .../migrations/PreferencesMigrations.java     |  563 +++-
 .../SpecialFieldsToSeparateFields.java        |   33 +-
 src/main/java/org/jabref/model/ChainNode.java |   12 +-
 .../java/org/jabref/model/FieldChange.java    |   21 +-
 src/main/java/org/jabref/model/TreeNode.java  |   32 +-
 .../jabref/model/database/BibDatabase.java    |  167 +-
 .../model/database/BibDatabaseContext.java    |  128 +-
 .../database/BibDatabaseModeDetection.java    |    9 +-
 .../jabref/model/database/BibDatabases.java   |   15 +-
 .../model/database/KeyChangeListener.java     |   56 +-
 .../event/BibDatabaseContextChangedEvent.java |    1 +
 .../database/event/ChangePropagation.java     |    3 +-
 .../database/event/EntriesAddedEvent.java     |   12 +-
 .../database/event/EntriesRemovedEvent.java   |    6 +-
 .../java/org/jabref/model/entry/Author.java   |   75 +-
 .../org/jabref/model/entry/AuthorList.java    |  130 +-
 .../java/org/jabref/model/entry/BibEntry.java |  442 ++-
 .../org/jabref/model/entry/BibEntryType.java  |   91 +-
 .../model/entry/BibEntryTypeBuilder.java      |   88 +-
 .../model/entry/BibEntryTypesManager.java     |  114 +-
 .../org/jabref/model/entry/BibtexString.java  |   30 +-
 .../jabref/model/entry/CanonicalBibEntry.java |   28 +-
 .../java/org/jabref/model/entry/Date.java     |  277 +-
 .../jabref/model/entry/EntryConverter.java    |   49 +-
 .../org/jabref/model/entry/EntryLinkList.java |   17 +-
 .../org/jabref/model/entry/IdGenerator.java   |    3 +-
 .../java/org/jabref/model/entry/Keyword.java  |   60 +-
 .../org/jabref/model/entry/KeywordList.java   |   66 +-
 .../org/jabref/model/entry/LinkedFile.java    |   62 +-
 .../java/org/jabref/model/entry/Month.java    |    9 +-
 .../jabref/model/entry/ParsedEntryLink.java   |    6 +-
 .../model/entry/SharedBibEntryData.java       |    9 +-
 .../model/entry/event/EntriesEvent.java       |    6 +-
 .../model/entry/event/EntriesEventSource.java |    2 +-
 .../model/entry/event/EntryChangedEvent.java  |    1 -
 .../entry/event/FieldAddedOrRemovedEvent.java |    5 +-
 .../model/entry/event/FieldChangedEvent.java  |   35 +-
 .../jabref/model/entry/field/AMSField.java    |   15 +-
 .../jabref/model/entry/field/BibField.java    |   16 +-
 .../model/entry/field/BiblatexApaField.java   |   16 +-
 .../entry/field/BiblatexSoftwareField.java    |   27 +-
 .../org/jabref/model/entry/field/Field.java   |    2 -
 .../model/entry/field/FieldFactory.java       |  200 +-
 .../model/entry/field/FieldProperty.java      |    2 +-
 .../jabref/model/entry/field/IEEEField.java   |    7 +-
 .../model/entry/field/InternalField.java      |    7 +-
 .../jabref/model/entry/field/OrFields.java    |    8 +-
 .../model/entry/field/SpecialField.java       |   62 +-
 .../model/entry/field/SpecialFieldValue.java  |   10 +-
 .../model/entry/field/StandardField.java      |   30 +-
 .../model/entry/field/UnknownField.java       |   24 +-
 .../entry/field/UserSpecificCommentField.java |   11 +-
 .../jabref/model/entry/identifier/ARK.java    |    5 +-
 .../entry/identifier/ArXivIdentifier.java     |   50 +-
 .../jabref/model/entry/identifier/DOI.java    |  181 +-
 .../jabref/model/entry/identifier/ISBN.java   |   12 +-
 .../jabref/model/entry/identifier/ISSN.java   |    9 +-
 .../model/entry/identifier/IacrEprint.java    |   25 +-
 .../model/entry/identifier/Identifier.java    |    2 -
 .../model/entry/identifier/MathSciNetId.java  |   12 +-
 .../BiblatexAPAEntryTypeDefinitions.java      |   83 +-
 .../entry/types/BiblatexApaEntryType.java     |    8 +-
 .../types/BiblatexEntryTypeDefinitions.java   | 1629 +++++++---
 .../types/BiblatexSoftwareEntryType.java      |    8 +-
 .../BiblatexSoftwareEntryTypeDefinitions.java |  190 +-
 .../types/BibtexEntryTypeDefinitions.java     |  304 +-
 .../jabref/model/entry/types/EntryType.java   |    1 -
 .../model/entry/types/EntryTypeFactory.java   |   58 +-
 .../model/entry/types/IEEETranEntryType.java  |    7 +-
 .../types/IEEETranEntryTypeDefinitions.java   |  124 +-
 ...tematicLiteratureReviewStudyEntryType.java |   11 +-
 ...ratureReviewStudyEntryTypeDefinitions.java |   39 +-
 .../model/entry/types/UnknownEntryType.java   |    6 +-
 .../jabref/model/groups/AbstractGroup.java    |   34 +-
 .../jabref/model/groups/AllEntriesGroup.java  |    6 +-
 .../jabref/model/groups/AutomaticGroup.java   |   14 +-
 .../model/groups/AutomaticKeywordGroup.java   |   59 +-
 .../model/groups/AutomaticPersonsGroup.java   |   31 +-
 .../jabref/model/groups/ExplicitGroup.java    |   52 +-
 .../model/groups/GroupEntryChanger.java       |    2 -
 .../model/groups/GroupHierarchyType.java      |    1 -
 .../jabref/model/groups/GroupTreeNode.java    |   82 +-
 .../org/jabref/model/groups/KeywordGroup.java |   23 +-
 .../jabref/model/groups/LastNameGroup.java    |   51 +-
 .../model/groups/RegexKeywordGroup.java       |   61 +-
 .../org/jabref/model/groups/SearchGroup.java  |   70 +-
 .../org/jabref/model/groups/TexGroup.java     |  116 +-
 .../jabref/model/groups/WordKeywordGroup.java |  111 +-
 .../model/metadata/ContentSelector.java       |    7 +-
 .../model/metadata/ContentSelectors.java      |   13 +-
 .../org/jabref/model/metadata/MetaData.java   |  157 +-
 .../org/jabref/model/metadata/SaveOrder.java  |   58 +-
 .../metadata/SelfContainedSaveOrder.java      |   29 +-
 .../model/openoffice/CitationEntry.java       |    6 +-
 .../model/openoffice/backend/NamedRange.java  |   30 +-
 .../openoffice/backend/NamedRangeManager.java |   35 +-
 .../model/openoffice/ootext/OOFormat.java     |   31 +-
 .../model/openoffice/ootext/OOTextIntoOO.java |  459 ++-
 .../rangesort/FunctionalTextViewCursor.java   |   74 +-
 .../openoffice/rangesort/RangeOverlap.java    |    6 +-
 .../rangesort/RangeOverlapBetween.java        |   79 +-
 .../rangesort/RangeOverlapKind.java           |    4 +-
 .../rangesort/RangeOverlapWithin.java         |   93 +-
 .../model/openoffice/rangesort/RangeSort.java |   42 +-
 .../openoffice/rangesort/RangeSortVisual.java |   52 +-
 .../openoffice/rangesort/RangeSortable.java   |    1 -
 .../model/openoffice/style/Citation.java      |   46 +-
 .../model/openoffice/style/CitationGroup.java |   30 +-
 .../openoffice/style/CitationGroupId.java     |    1 +
 .../openoffice/style/CitationGroups.java      |   67 +-
 .../style/CitationLookupResult.java           |    6 +-
 .../openoffice/style/CitationMarkerEntry.java |    2 -
 .../style/CitationMarkerNormEntry.java        |    1 -
 .../style/CitationMarkerNumericBibEntry.java  |    1 -
 .../style/CitationMarkerNumericEntry.java     |    2 -
 .../model/openoffice/style/CitationType.java  |    3 -
 .../model/openoffice/style/CitedKey.java      |   36 +-
 .../model/openoffice/style/CitedKeys.java     |    1 -
 .../openoffice/style/ComparableCitation.java  |    1 -
 .../openoffice/style/ComparableCitedKey.java  |    3 -
 .../openoffice/style/CompareCitation.java     |   11 +-
 .../openoffice/style/CompareCitedKey.java     |    6 +-
 .../style/NonUniqueCitationMarker.java        |    4 +-
 .../model/openoffice/style/OODataModel.java   |   11 +-
 .../model/openoffice/style/PageInfo.java      |   14 +-
 .../model/openoffice/uno/UnoBookmark.java     |   58 +-
 .../jabref/model/openoffice/uno/UnoCast.java  |   10 +-
 .../model/openoffice/uno/UnoCrossRef.java     |   66 +-
 .../model/openoffice/uno/UnoCursor.java       |   21 +-
 .../model/openoffice/uno/UnoNameAccess.java   |   13 +-
 .../jabref/model/openoffice/uno/UnoNamed.java |   36 +-
 .../model/openoffice/uno/UnoProperties.java   |   70 +-
 .../model/openoffice/uno/UnoRedlines.java     |   15 +-
 .../openoffice/uno/UnoReferenceMark.java      |   76 +-
 .../openoffice/uno/UnoScreenRefresh.java      |    3 +-
 .../model/openoffice/uno/UnoSelection.java    |   42 +-
 .../jabref/model/openoffice/uno/UnoStyle.java |   73 +-
 .../model/openoffice/uno/UnoTextDocument.java |   39 +-
 .../model/openoffice/uno/UnoTextRange.java    |   51 +-
 .../model/openoffice/uno/UnoTextSection.java  |   59 +-
 .../jabref/model/openoffice/uno/UnoUndo.java  |   18 +-
 .../uno/UnoUserDefinedProperty.java           |  125 +-
 .../model/openoffice/util/OOListUtil.java     |   10 +-
 .../jabref/model/openoffice/util/OOPair.java  |    2 +-
 .../model/openoffice/util/OOResult.java       |    1 -
 .../model/openoffice/util/OOTuple3.java       |    1 -
 .../model/openoffice/util/OOVoidResult.java   |    2 +-
 .../org/jabref/model/pdf/FileAnnotation.java  |   93 +-
 .../jabref/model/pdf/FileAnnotationType.java  |   21 +-
 .../model/pdf/search/EnglishStemAnalyzer.java |    1 -
 .../model/pdf/search/PdfSearchResults.java    |    4 +-
 .../pdf/search/SearchFieldConstants.java      |    8 +-
 .../jabref/model/pdf/search/SearchResult.java |   83 +-
 .../model/schema/DublinCoreSchemaCustom.java  |   40 +-
 .../jabref/model/search/GroupSearchQuery.java |    9 +-
 .../model/search/matchers/AndMatcher.java     |    3 +-
 .../model/search/matchers/MatcherSet.java     |    1 -
 .../model/search/matchers/MatcherSets.java    |    2 +-
 .../model/search/matchers/NotMatcher.java     |    1 -
 .../search/rules/ContainsBasedSearchRule.java |   15 +-
 .../search/rules/FullTextSearchRule.java      |   25 +-
 .../search/rules/GrammarBasedSearchRule.java  |  177 +-
 .../search/rules/RegexBasedSearchRule.java    |   25 +-
 .../jabref/model/search/rules/SearchRule.java |    1 -
 .../model/search/rules/SearchRules.java       |   17 +-
 .../model/strings/LatexToUnicodeAdapter.java  |   23 +-
 .../org/jabref/model/strings/StringUtil.java  |  201 +-
 .../strings/UnicodeToReadableCharMap.java     |    2 +-
 .../org/jabref/model/study/FetchResult.java   |    1 +
 .../org/jabref/model/study/QueryResult.java   |    1 +
 .../java/org/jabref/model/study/Study.java    |   59 +-
 .../org/jabref/model/study/StudyDatabase.java |   18 +-
 .../org/jabref/model/study/StudyQuery.java    |   12 +-
 .../org/jabref/model/texparser/Citation.java  |   59 +-
 .../LatexBibEntriesResolverResult.java        |   21 +-
 .../model/texparser/LatexParserResult.java    |   42 +-
 .../jabref/model/util/FileUpdateListener.java |    1 -
 .../jabref/model/util/FileUpdateMonitor.java  |    3 +-
 .../java/org/jabref/model/util/ListUtil.java  |   10 +-
 .../org/jabref/model/util/MultiKeyMap.java    |    1 +
 .../org/jabref/model/util/OptionalUtil.java   |   40 +-
 .../model/util/ResultingStringState.java      |    1 +
 .../org/jabref/model/util/TreeCollector.java  |   40 +-
 .../preferences/BibEntryPreferences.java      |    1 +
 .../preferences/CleanupPreferences.java       |   20 +-
 .../jabref/preferences/ExportPreferences.java |   18 +-
 .../ExternalApplicationsPreferences.java      |   41 +-
 .../jabref/preferences/FilePreferences.java   |   67 +-
 .../jabref/preferences/GuiPreferences.java    |   63 +-
 .../preferences/InternalPreferences.java      |   14 +-
 .../jabref/preferences/JabRefPreferences.java | 2884 ++++++++++++-----
 .../preferences/LibraryPreferences.java       |   19 +-
 .../jabref/preferences/MrDlibPreferences.java |   10 +-
 .../preferences/PreferenceServiceFactory.java |    4 +-
 .../jabref/preferences/PreferencesFilter.java |   47 +-
 .../preferences/PreferencesService.java       |    7 +-
 .../preferences/PreviewPreferences.java       |   42 +-
 .../PushToApplicationPreferences.java         |   18 +-
 .../jabref/preferences/SearchPreferences.java |   25 +-
 .../preferences/SidePanePreferences.java      |   17 +-
 .../preferences/TelemetryPreferences.java     |   15 +-
 .../preferences/WorkspacePreferences.java     |   41 +-
 src/main/resources/csl-styles                 |    2 +-
 .../java/org/jabref/IconsPropertiesTest.java  |   47 +-
 .../architecture/MainArchitectureTest.java    |  218 +-
 .../architecture/TestArchitectureTest.java    |  142 +-
 .../org/jabref/cli/ArgumentProcessorTest.java |  197 +-
 .../org/jabref/cli/AuxCommandLineTest.java    |   39 +-
 .../java/org/jabref/cli/JabRefCLITest.java    |  144 +-
 .../gui/UpdateTimestampListenerTest.java      |   43 +-
 .../AppendPersonNamesStrategyTest.java        |   13 +-
 .../gui/autocompleter/AutoCompleterUtil.java  |    5 +-
 .../BibEntrySuggestionProviderTest.java       |   47 +-
 ...ContentSelectorSuggestionProviderTest.java |  128 +-
 .../DefaultAutoCompleterTest.java             |   67 +-
 .../FieldValueSuggestionProviderTest.java     |  105 +-
 .../PersonNameStringConverterTest.java        |   70 +-
 .../PersonNameSuggestionProviderTest.java     |   95 +-
 .../SuggestionProvidersTest.java              |   82 +-
 .../BackupManagerDiscardedTest.java           |   69 +-
 .../autosaveandbackup/BackupManagerTest.java  |  161 +-
 .../SaveOrderPanelViewModelTest.java          |   67 +-
 .../PdfDocumentViewModelTest.java             |   25 +-
 .../jabref/gui/edit/CopyMoreActionTest.java   |  327 +-
 ...opyOrMoveFieldContentTabViewModelTest.java |  122 +-
 .../EditFieldContentTabViewModelTest.java     |   52 +-
 .../gui/edit/ManageKeywordsViewModelTest.java |  139 +-
 .../gui/edit/RenameFieldViewModelTest.java    |   76 +-
 .../gui/edit/ReplaceStringViewModelTest.java  |   96 +-
 .../gui/entryeditor/CommentsTabTest.java      |   64 +-
 .../jabref/gui/entryeditor/SciteTabTest.java  |   20 +-
 .../entryeditor/SciteTabViewModelTest.java    |   21 +-
 .../jabref/gui/entryeditor/SourceTabTest.java |   51 +-
 .../FileAnnotationViewModelTest.java          |   69 +-
 .../exporter/ExportToClipboardActionTest.java |  145 +-
 .../gui/exporter/SaveDatabaseActionTest.java  |  130 +-
 .../AutoSetFileLinksUtilTest.java             |   59 +-
 .../externalfiles/FileFilterUtilsTest.java    |   59 +-
 .../GitIgnoreFileFilterTest.java              |   51 +-
 .../gui/externalfiles/ImportHandlerTest.java  |  239 +-
 .../UnlinkedFilesCrawlerTest.java             |   72 +-
 .../ExternalFileTypesTest.java                |  152 +-
 .../fieldeditors/LinkedFileViewModelTest.java |  317 +-
 .../LinkedFilesEditorViewModelTest.java       |   65 +-
 .../gui/groups/GroupDialogViewModelTest.java  |  100 +-
 .../gui/groups/GroupNodeViewModelTest.java    |  446 ++-
 .../gui/groups/GroupTreeViewModelTest.java    |  196 +-
 .../gui/importer/NewEntryActionTest.java      |   42 +-
 .../fetcher/WebSearchPaneViewModelTest.java   |   87 +-
 .../gui/keyboard/KeyBindingsTabModelTest.java |  336 +-
 .../ConstantsPropertiesViewModelTest.java     |   69 +-
 .../ContentSelectorViewModelTest.java         |   98 +-
 .../maintable/MainTableColumnModelTest.java   |   34 +-
 .../gui/maintable/MainTableDataModelTest.java |   87 +-
 .../jabref/gui/menus/FileHistoryMenuTest.java |   24 +-
 .../mergeentries/DiffHighlightingTest.java    |  206 +-
 .../mergeentries/FieldRowViewModelTest.java   |  189 +-
 .../gui/mergeentries/GroupMergerTest.java     |   30 +-
 .../ThreeWayMergeCellViewModelTest.java       |   70 +-
 .../ThreeWayMergeViewModelTest.java           |   75 +-
 .../fieldsmerger/FileMergerTest.java          |   27 +-
 .../journals/AbbreviationViewModelTest.java   |   67 +-
 .../JournalAbbreviationsViewModelTabTest.java |  640 +++-
 .../keybindings/KeyBindingViewModelTest.java  |   81 +-
 .../gui/preview/CopyCitationActionTest.java   |  290 +-
 .../org/jabref/gui/push/PushToEmacsTest.java  |   45 +-
 ...sAndRegexBasedSearchRuleDescriberTest.java |   97 +-
 .../gui/search/GetLastSearchHistoryTest.java  |    4 +-
 .../gui/search/GlobalSearchBarTest.java       |   48 +-
 .../GrammarBasedSearchRuleDescriberTest.java  |  225 +-
 .../gui/search/TextFlowEqualityHelper.java    |   23 +-
 .../gui/sidepane/SidePaneViewModelTest.java   |   80 +-
 .../ManageStudyDefinitionViewModelTest.java   |   77 +-
 .../jabref/gui/theme/ThemeManagerTest.java    |  316 +-
 .../java/org/jabref/gui/theme/ThemeTest.java  |   58 +-
 .../org/jabref/gui/util/ColorUtilTest.java    |   16 +-
 .../jabref/gui/util/ControlHelperTest.java    |   56 +-
 .../gui/util/FileDialogConfigurationTest.java |  105 +-
 .../gui/util/OpenConsoleActionTest.java       |   41 +-
 .../gui/util/RecursiveTreeItemTest.java       |   58 +-
 .../jabref/gui/util/TooltipTextUtilTest.java  |  206 +-
 .../NumericFieldComparatorTest.java           |    7 +-
 .../RankingFieldComparatorTest.java           |   18 +-
 .../SpecialFieldComparatorTest.java           |   18 +-
 .../http/server/LibrariesResourceTest.java    |   31 +-
 .../http/server/LibraryResourceTest.java      |   42 +-
 .../org/jabref/http/server/ServerTest.java    |   91 +-
 .../org/jabref/http/server/TestBibFile.java   |    8 +-
 .../org/jabref/logic/TypedBibEntryTest.java   |   10 +-
 .../jabref/logic/auxparser/AuxParserTest.java |  173 +-
 .../logic/auxparser/DefaultAuxParserTest.java |    3 +-
 .../jabref/logic/bibtex/BibEntryAssert.java   |   96 +-
 .../logic/bibtex/BibEntryWriterTest.java      |  378 ++-
 .../bibtex/FieldContentFormatterTest.java     |   49 +-
 .../jabref/logic/bibtex/FieldWriterTest.java  |  128 +-
 .../logic/bibtex/FileFieldWriterTest.java     |   39 +-
 .../comparator/BibDatabaseDiffTest.java       |  217 +-
 .../bibtex/comparator/BibStringDiffTest.java  |  126 +-
 .../BibtexStringComparatorTest.java           |   84 +-
 .../CrossRefEntryComparatorTest.java          |    6 +-
 .../comparator/EntryComparatorTest.java       |  179 +-
 .../comparator/FieldComparatorTest.java       |  201 +-
 .../bibtex/comparator/GroupDiffTest.java      |   82 +-
 .../bibtex/comparator/MetaDataDiffTest.java   |   18 +-
 .../bibtex/comparator/PreambleDiffTest.java   |   46 +-
 .../jabref/logic/bst/BstFunctionsTest.java    |  734 +++--
 .../logic/bst/BstPreviewLayoutTest.java       |  105 +-
 .../java/org/jabref/logic/bst/BstVMTest.java  |  263 +-
 .../jabref/logic/bst/BstVMVisitorTest.java    |  236 +-
 .../logic/bst/util/BstCaseChangersTest.java   |  234 +-
 .../logic/bst/util/BstNameFormatterTest.java  |  153 +-
 .../logic/bst/util/BstPurifierTest.java       |   29 +-
 .../logic/bst/util/BstTextPrefixerTest.java   |   19 +-
 .../bst/util/BstWidthCalculatorTest.java      |   39 +-
 .../AbstractCitationKeyPatternTest.java       |   17 +-
 .../BracketedPatternTest.java                 |  985 ++++--
 .../CitationKeyGeneratorTest.java             | 1689 +++++++---
 .../MakeLabelWithDatabaseTest.java            |  287 +-
 .../MakeLabelWithoutDatabaseTest.java         |   36 +-
 .../citationstyle/CitationStyleCacheTest.java |   38 +-
 .../CitationStyleGeneratorTest.java           | 1052 +++---
 .../citationstyle/CitationStyleTest.java      |   31 +-
 .../JabRefItemDataProviderTest.java           |   70 +-
 .../cleanup/BibtexBiblatexRoundtripTest.java  |   42 +-
 .../logic/cleanup/CleanupWorkerTest.java      |  375 ++-
 .../cleanup/ConvertToBiblatexCleanupTest.java |   34 +-
 .../cleanup/ConvertToBibtexCleanupTest.java   |   33 +-
 .../jabref/logic/cleanup/DoiCleanupTest.java  |  127 +-
 .../logic/cleanup/DoiDecodeCleanupTest.java   |  122 +-
 .../logic/cleanup/EprintCleanupTest.java      |   19 +-
 .../cleanup/FieldFormatterCleanupTest.java    |  116 +-
 .../cleanup/FieldFormatterCleanupsTest.java   |  576 +++-
 .../jabref/logic/cleanup/ISSNCleanupTest.java |   36 +-
 .../logic/cleanup/MoveFilesCleanupTest.java   |  116 +-
 .../logic/cleanup/RenamePdfCleanupTest.java   |  110 +-
 .../cleanup/TimeStampToCreationDateTest.java  |  309 +-
 .../TimeStampToModificationDateTest.java      |  112 +-
 .../jabref/logic/cleanup/URLCleanupTest.java  |  333 +-
 .../org/jabref/logic/crawler/CrawlerTest.java |  152 +-
 .../StudyCatalogToFetcherConverterTest.java   |   61 +-
 .../logic/crawler/StudyRepositoryTest.java    |  423 ++-
 .../logic/crawler/StudyYamlParserTest.java    |   67 +-
 .../logic/database/DatabaseMergerTest.java    |  228 +-
 .../logic/database/DuplicateCheckTest.java    |  812 +++--
 .../exporter/AtomicFileOutputStreamTest.java  |   76 +-
 .../exporter/BibtexDatabaseWriterTest.java    | 1314 ++++++--
 .../logic/exporter/CsvExportFormatTest.java   |   68 +-
 .../logic/exporter/DocBook5ExporterTest.java  |   53 +-
 .../logic/exporter/DocbookExporterTest.java   |   45 +-
 .../EmbeddedBibFilePdfExporterTest.java       |  180 +-
 .../jabref/logic/exporter/ExporterTest.java   |   56 +-
 .../logic/exporter/GroupSerializerTest.java   |  233 +-
 .../exporter/HayagrivaYamlExporterTest.java   |  260 +-
 .../logic/exporter/HtmlExportFormatTest.java  |   21 +-
 .../exporter/MSBibExportFormatFilesTest.java  |   55 +-
 .../exporter/MetaDataSerializerTest.java      |  163 +-
 .../exporter/ModsExportFormatFilesTest.java   |  106 +-
 .../logic/exporter/ModsExportFormatTest.java  |   29 +-
 .../logic/exporter/MsBibExportFormatTest.java |    9 +-
 .../OpenOfficeDocumentCreatorTest.java        |   65 +-
 .../logic/exporter/XmpExporterTest.java       |  289 +-
 .../logic/exporter/XmpPdfExporterTest.java    |  217 +-
 .../logic/exporter/YamlExporterTest.java      |  156 +-
 .../jabref/logic/formatter/FormatterTest.java |   49 +-
 .../formatter/IdentityFormatterTest.java      |    4 +-
 .../bibtexfields/AddBracesFormatterTest.java  |    9 +-
 .../bibtexfields/CleanupUrlFormatterTest.java |   47 +-
 .../bibtexfields/ClearFormatterTest.java      |    4 +-
 .../EscapeAmpersandsFormatterTest.java        |   25 +-
 .../EscapeDollarSignFormatterTest.java        |   37 +-
 .../EscapeUnderscoresFormatterTest.java       |    9 +-
 .../HtmlToLatexFormatterTest.java             |    9 +-
 .../HtmlToUnicodeFormatterTest.java           |   26 +-
 .../LatexCleanupFormatterTest.java            |   22 +-
 .../NormalizeDateFormatterTest.java           |    9 +-
 .../NormalizeEnDashesFormatterTest.java       |   29 +-
 .../NormalizeMonthFormatterTest.java          |    4 +-
 .../NormalizeNamesFormatterTest.java          |  205 +-
 .../NormalizePagesFormatterTest.java          |  147 +-
 .../OrdinalsToSuperscriptFormatterTest.java   |   22 +-
 .../bibtexfields/RegexFormatterTest.java      |   45 +-
 .../RemoveBracesFormatterTest.java            |    4 +-
 .../RemoveDigitsFormatterTest.java            |    4 +-
 ...RemoveHyphenatedNewlinesFormatterTest.java |    4 +-
 .../RemoveNewlinesFormatterTest.java          |   10 +-
 .../RemoveRedundantSpacesFormatterTest.java   |    4 +-
 .../ReplaceTabsBySpaceFormaterTest.java       |    5 +-
 .../ReplaceWithEscapedDoubleQuotesTest.java   |   22 +-
 .../bibtexfields/ShortenDOIFormatterTest.java |    5 +-
 .../TrimWhitespaceFormatterTest.java          |   10 +-
 .../bibtexfields/UnicodeConverterTest.java    |    4 +-
 .../UnicodeToLatexFormatterTest.java          |   23 +-
 .../UnitsToLatexFormatterTest.java            |    4 +-
 .../casechanger/CapitalizeFormatterTest.java  |   15 +-
 .../casechanger/LowerCaseFormatterTest.java   |   18 +-
 .../ProtectTermsFormatterTest.java            |   31 +-
 .../SentenceCaseFormatterTest.java            |   52 +-
 .../casechanger/TitleCaseFormatterTest.java   |  116 +-
 .../UnprotectTermsFormatterTest.java          |   42 +-
 .../casechanger/UpperCaseFormatterTest.java   |   24 +-
 .../minifier/MinifyNameListFormatterTest.java |   41 +-
 .../minifier/TruncateFormatterTest.java       |    5 +-
 .../org/jabref/logic/git/GitHandlerTest.java  |   11 +-
 .../jabref/logic/git/SlrGitHandlerTest.java   |   84 +-
 .../org/jabref/logic/help/HelpFileTest.java   |   12 +-
 .../logic/importer/AuthorListParserTest.java  |   96 +-
 .../logic/importer/BibDatabaseFilesTest.java  |   35 +-
 .../importer/DatabaseFileLookupTest.java      |   17 +-
 .../logic/importer/FulltextFetchersTest.java  |   34 +-
 .../jabref/logic/importer/ImportDataTest.java |   67 +-
 .../ImportFormatReaderIntegrationTest.java    |  119 +-
 .../ImportFormatReaderParameterlessTest.java  |   62 +-
 .../jabref/logic/importer/ImporterTest.java   |   66 +-
 .../logic/importer/OpenDatabaseTest.java      |  109 +-
 .../logic/importer/ParserResultTest.java      |    8 +-
 .../logic/importer/QueryParserTest.java       |   92 +-
 .../logic/importer/WebFetchersTest.java       |  140 +-
 .../fetcher/ACMPortalFetcherTest.java         |   84 +-
 .../logic/importer/fetcher/ACSTest.java       |   15 +-
 .../fetcher/AbstractIsbnFetcherTest.java      |   30 +-
 .../importer/fetcher/ApsFetcherTest.java      |   36 +-
 .../importer/fetcher/ArXivFetcherTest.java    |  890 +++--
 .../fetcher/AstrophysicsDataSystemTest.java   |  257 +-
 .../fetcher/BiodiversityLibraryTest.java      |  157 +-
 .../importer/fetcher/BvbFetcherTest.java      |   82 +-
 .../logic/importer/fetcher/CiteSeerTest.java  |  116 +-
 ...puterScienceBibliographiesFetcherTest.java |  185 +-
 ...mputerScienceBibliographiesParserTest.java |   76 +-
 .../fetcher/CompositeIdFetcherTest.java       |  179 +-
 .../CompositeSearchBasedFetcherTest.java      |  106 +-
 .../logic/importer/fetcher/CrossRefTest.java  |  155 +-
 .../importer/fetcher/DBLPFetcherTest.java     |   43 +-
 .../importer/fetcher/DOABFetcherTest.java     |  217 +-
 .../importer/fetcher/DOAJFetcherTest.java     |  118 +-
 .../logic/importer/fetcher/DiVATest.java      |   43 +-
 .../importer/fetcher/DoiFetcherTest.java      |  185 +-
 .../importer/fetcher/DoiResolutionTest.java   |   45 +-
 .../importer/fetcher/FulltextFetcherTest.java |   23 +-
 .../importer/fetcher/GoogleScholarTest.java   |   52 +-
 .../fetcher/GrobidCitationFetcherTest.java    |  229 +-
 .../importer/fetcher/GvkFetcherTest.java      |   78 +-
 .../logic/importer/fetcher/IEEETest.java      |  228 +-
 .../importer/fetcher/INSPIREFetcherTest.java  |  102 +-
 .../fetcher/IacrEprintFetcherTest.java        |  256 +-
 .../importer/fetcher/IssnFetcherTest.java     |   22 +-
 .../importer/fetcher/JstorFetcherTest.java    |  113 +-
 .../importer/fetcher/LOBIDFetcherTest.java    |  129 +-
 .../fetcher/LibraryOfCongressTest.java        |   66 +-
 .../importer/fetcher/MathSciNetTest.java      |   58 +-
 .../importer/fetcher/MedlineFetcherTest.java  |  117 +-
 .../logic/importer/fetcher/MedraTest.java     |  139 +-
 .../importer/fetcher/MrDLibFetcherTest.java   |   42 +-
 .../importer/fetcher/OpenAccessDoiTest.java   |   15 +-
 .../fetcher/PagedSearchFetcherTest.java       |   12 +-
 .../importer/fetcher/PicaXmlParserTest.java   |   75 +-
 .../importer/fetcher/ResearchGateTest.java    |  164 +-
 .../importer/fetcher/RfcFetcherTest.java      |  136 +-
 .../fetcher/ScholarArchiveFetcherTest.java    |   43 +-
 .../importer/fetcher/ScienceDirectTest.java   |   47 +-
 .../SearchBasedFetcherCapabilityTest.java     |   73 +-
 .../importer/fetcher/SemanticScholarTest.java |  171 +-
 .../importer/fetcher/SpringerFetcherTest.java |  337 +-
 .../importer/fetcher/SpringerLinkTest.java    |   34 +-
 .../importer/fetcher/TitleFetcherTest.java    |   36 +-
 .../logic/importer/fetcher/ZbMATHTest.java    |   45 +-
 ...oiToBibtexConverterComIsbnFetcherTest.java |   67 +-
 .../isbntobibtex/EbookDeIsbnFetcherTest.java  |   69 +-
 .../isbntobibtex/GVKIsbnFetcherTest.java      |  101 +-
 .../fetcher/isbntobibtex/IsbnFetcherTest.java |   58 +-
 .../OpenLibraryIsbnFetcherTest.java           |   58 +-
 .../ArXivQueryTransformerTest.java            |   11 +-
 .../CiteSeerQueryTransformerTest.java         |  114 +-
 ...nceBibliographiesQueryTransformerTest.java |   27 +-
 .../DBLPQueryTransformerTest.java             |   20 +-
 .../DefaultQueryTransformerTest.java          |    5 +-
 .../transformers/GVKQueryTransformerTest.java |   17 +-
 .../IEEEQueryTransformerTest.java             |   38 +-
 .../transformers/InfixTransformerTest.java    |  102 +-
 .../JstorQueryTransformerTest.java            |   20 +-
 .../ScholarQueryTransformerTest.java          |    5 +-
 .../SpringerQueryTransformerTest.java         |   26 +-
 .../transformers/SuffixTransformerTest.java   |  107 +-
 ...rRangeByFilteringQueryTransformerTest.java |   15 +-
 ...rRangeByFilteringQueryTransformerTest.java |   13 +-
 .../ZbMathQueryTransformerTest.java           |   20 +-
 .../fileformat/ACMPortalParserTest.java       |  182 +-
 .../BiblioscapeImporterFilesTest.java         |   18 +-
 .../fileformat/BiblioscapeImporterTest.java   |   26 +-
 .../BiblioscapeImporterTypesTest.java         |   42 +-
 .../fileformat/BibtexImporterTest.java        |  333 +-
 .../importer/fileformat/BibtexParserTest.java | 1992 ++++++++----
 .../importer/fileformat/CffImporterTest.java  |  158 +-
 .../CitaviXmlImporterFilesTest.java           |   19 +-
 .../fileformat/CitaviXmlImporterTest.java     |   12 +-
 .../fileformat/CopacImporterFilesTest.java    |   24 +-
 .../fileformat/CopacImporterTest.java         |   15 +-
 .../fileformat/CustomImporterTest.java        |   50 +-
 .../fileformat/EndnoteImporterTest.java       |  205 +-
 .../EndnoteXmlImporterFilesTest.java          |   39 +-
 .../fileformat/ImporterTestEngine.java        |   59 +-
 .../fileformat/InspecImporterTest.java        |   77 +-
 .../importer/fileformat/IsiImporterTest.java  |  397 ++-
 .../fileformat/MarcXmlParserTest.java         |   21 +-
 .../fileformat/MedlineImporterFilesTest.java  |   36 +-
 .../fileformat/MedlineImporterTest.java       |   10 +-
 .../fileformat/MedlinePlainImporterTest.java  |  311 +-
 .../fileformat/ModsImporterFilesTest.java     |   30 +-
 .../fileformat/MrDLibImporterTest.java        |   28 +-
 .../fileformat/MsBibImporterFilesTest.java    |   21 +-
 .../fileformat/MsBibImporterTest.java         |   46 +-
 .../importer/fileformat/OvidImporterTest.java |  150 +-
 .../PdfContentImporterFilesTest.java          |   16 +-
 .../fileformat/PdfContentImporterTest.java    |  136 +-
 .../PdfEmbeddedBibFileImporterTest.java       |   47 +-
 .../fileformat/PdfGrobidImporterTest.java     |   73 +-
 .../PdfMergeMetadataImporterTest.java         |   73 +-
 .../PdfVerbatimBibTextImporterTest.java       |   58 +-
 .../fileformat/PdfXmpImporterTest.java        |   57 +-
 .../fileformat/RISImporterFilesTest.java      |   10 +-
 .../importer/fileformat/RISImporterTest.java  |   21 +-
 .../fileformat/RepecNepImporterTest.java      |   36 +-
 .../fileformat/SilverPlatterImporterTest.java |   29 +-
 .../importer/util/FileFieldParserTest.java    |  327 +-
 .../importer/util/GrobidServiceTest.java      |  121 +-
 .../logic/importer/util/GroupsParserTest.java |  195 +-
 .../logic/importer/util/JsonReaderTest.java   |   47 +-
 .../logic/importer/util/MathMLParserTest.java |  190 +-
 .../importer/util/MetaDataParserTest.java     |   47 +-
 .../importer/util/ShortDOIServiceTest.java    |   15 +-
 .../logic/importer/util/StaxParserTest.java   |  134 +-
 .../integrity/ASCIICharacterCheckerTest.java  |   39 +-
 .../integrity/AbbreviationCheckerTest.java    |   29 +-
 .../logic/integrity/AmpersandCheckerTest.java |   93 +-
 .../logic/integrity/BibStringCheckerTest.java |   48 +-
 .../logic/integrity/BooktitleCheckerTest.java |   21 +-
 .../logic/integrity/BracesCorrectorTest.java  |    9 +-
 .../logic/integrity/BracketCheckerTest.java   |    7 +-
 .../integrity/CitationKeyCheckerTest.java     |   44 +-
 .../CitationKeyDeviationCheckerTest.java      |   57 +-
 .../CitationKeyDuplicationCheckerTest.java    |   40 +-
 .../logic/integrity/DateCheckerTest.java      |   33 +-
 .../integrity/DoiDuplicationCheckerTest.java  |   69 +-
 .../integrity/DoiValidityCheckerTest.java     |   32 +-
 .../logic/integrity/EditionCheckerTest.java   |  117 +-
 .../logic/integrity/EntryLinkCheckerTest.java |   15 +-
 .../integrity/HTMLCharacterCheckerTest.java   |   51 +-
 .../integrity/HowPublishedCheckerTest.java    |   18 +-
 .../logic/integrity/ISBNCheckerTest.java      |   25 +-
 .../logic/integrity/ISSNCheckerTest.java      |   24 +-
 .../logic/integrity/IntegrityCheckTest.java   |  210 +-
 .../JournalInAbbreviationListCheckerTest.java |   58 +-
 .../integrity/LatexIntegrityCheckerTest.java  |  783 +++--
 .../logic/integrity/MonthCheckerTest.java     |   13 +-
 .../integrity/NoBibTexFieldCheckerTest.java   |   45 +-
 .../logic/integrity/NoteCheckerTest.java      |   18 +-
 .../integrity/PagesCheckerBiblatexTest.java   |   51 +-
 .../integrity/PagesCheckerBibtexTest.java     |   51 +-
 .../integrity/PersonNamesCheckerTest.java     |   55 +-
 .../logic/integrity/TitleCheckerTest.java     |  191 +-
 .../logic/integrity/TypeCheckerTest.java      |   17 +-
 .../logic/integrity/UTF8CheckerTest.java      |   44 +-
 .../logic/integrity/UrlCheckerTest.java       |   24 +-
 .../ValidCitationKeyCheckerTest.java          |   21 +-
 .../logic/integrity/YearCheckerTest.java      |   17 +-
 .../journals/AbbreviationParserTest.java      |   25 +-
 .../logic/journals/AbbreviationTest.java      |   72 +-
 .../journals/AbbreviationWriterTest.java      |   20 +-
 .../logic/journals/AbbreviationsTest.java     |   14 +-
 .../JournalAbbreviationRepositoryTest.java    |  581 +++-
 .../JournalInformationFetcherTest.java        |  291 +-
 .../org/jabref/logic/l10n/EncodingsTest.java  |    5 +-
 .../l10n/JavaLocalizationEntryParser.java     |   67 +-
 .../l10n/JavaLocalizationEntryParserTest.java |  145 +-
 .../org/jabref/logic/l10n/LanguageTest.java   |   22 +-
 .../logic/l10n/LocalizationBundleForTest.java |    3 +-
 .../l10n/LocalizationConsistencyTest.java     |  242 +-
 .../logic/l10n/LocalizationKeyParamsTest.java |   62 +-
 .../logic/l10n/LocalizationKeyTest.java       |   52 +-
 .../jabref/logic/l10n/LocalizationParser.java |  165 +-
 .../jabref/logic/l10n/LocalizationTest.java   |   17 +-
 .../jabref/logic/layout/LayoutEntryTest.java  |  141 +-
 .../jabref/logic/layout/LayoutHelperTest.java |   44 +-
 .../org/jabref/logic/layout/LayoutTest.java   |  148 +-
 .../layout/format/AuthorAbbreviatorTest.java  |   18 +-
 .../AuthorAndToSemicolonReplacerTest.java     |   26 +-
 .../format/AuthorAndsCommaReplacerTest.java   |   22 +-
 .../layout/format/AuthorAndsReplacerTest.java |   30 +-
 .../format/AuthorFirstAbbrLastCommasTest.java |   25 +-
 .../AuthorFirstAbbrLastOxfordCommasTest.java  |   25 +-
 .../format/AuthorFirstFirstCommasTest.java    |   14 +-
 .../layout/format/AuthorFirstFirstTest.java   |   14 +-
 .../format/AuthorFirstLastCommasTest.java     |   35 +-
 .../AuthorFirstLastOxfordCommasTest.java      |   30 +-
 .../layout/format/AuthorLF_FFAbbrTest.java    |   14 +-
 .../logic/layout/format/AuthorLF_FFTest.java  |   14 +-
 .../format/AuthorLastFirstAbbrCommasTest.java |   25 +-
 .../AuthorLastFirstAbbrOxfordCommasTest.java  |   25 +-
 .../AuthorLastFirstAbbreviatorTest.java       |   21 +-
 .../format/AuthorLastFirstCommasTest.java     |   30 +-
 .../AuthorLastFirstOxfordCommasTest.java      |   30 +-
 .../layout/format/AuthorLastFirstTest.java    |   30 +-
 .../logic/layout/format/AuthorNatBibTest.java |   23 +-
 .../logic/layout/format/AuthorOrgSciTest.java |   45 +-
 .../logic/layout/format/AuthorsTest.java      |  197 +-
 .../layout/format/CompositeFormatTest.java    |   35 +-
 .../logic/layout/format/DOICheckTest.java     |   45 +-
 .../logic/layout/format/DOIStripTest.java     |   46 +-
 .../layout/format/DateFormatterTest.java      |   17 +-
 .../logic/layout/format/DefaultTest.java      |   28 +-
 .../layout/format/EntryTypeFormatterTest.java |   13 +-
 .../logic/layout/format/FileLinkTest.java     |   43 +-
 .../logic/layout/format/FirstPageTest.java    |   21 +-
 .../logic/layout/format/HTMLCharsTest.java    |   38 +-
 .../layout/format/HTMLParagraphsTest.java     |   22 +-
 .../logic/layout/format/IfPluralTest.java     |    5 +-
 .../logic/layout/format/LastPageTest.java     |   23 +-
 .../format/LatexToUnicodeFormatterTest.java   |   28 +-
 .../layout/format/MarkdownFormatterTest.java  |   27 +-
 .../layout/format/NameFormatterTest.java      |  101 +-
 .../NoSpaceBetweenAbbreviationsTest.java      |   32 +-
 .../logic/layout/format/OrdinalTest.java      |    9 +-
 .../logic/layout/format/RTFCharsTest.java     |   82 +-
 .../format/RemoveBracketsAddCommaTest.java    |   13 +-
 .../layout/format/RemoveBracketsTest.java     |    9 +-
 .../RemoveLatexCommandsFormatterTest.java     |   11 +-
 .../logic/layout/format/RemoveTildeTest.java  |   26 +-
 .../layout/format/RemoveWhitespaceTest.java   |    9 +-
 .../logic/layout/format/ReplaceTest.java      |   15 +-
 .../ReplaceUnicodeLigaturesFormatterTest.java |    4 +-
 .../logic/layout/format/RisKeywordsTest.java  |   22 +-
 .../logic/layout/format/RisMonthTest.java     |   10 +-
 .../format/ShortMonthFormatterTest.java       |   23 +-
 .../logic/layout/format/ToLowerCaseTest.java  |   26 +-
 .../logic/layout/format/ToUpperCaseTest.java  |   15 +-
 .../logic/layout/format/WrapContentTest.java  |   48 +-
 .../layout/format/WrapFileLinksTest.java      |   49 +-
 .../logic/msbib/MSBibConverterTest.java       |   62 +-
 .../jabref/logic/msbib/MsBibAuthorTest.java   |   29 +-
 .../jabref/logic/msbib/MsBibMappingTest.java  |    5 +-
 .../logic/net/MimeTypeDetectorTest.java       |    1 -
 .../java/org/jabref/logic/net/ProxyTest.java  |   70 +-
 .../org/jabref/logic/net/URLDownloadTest.java |   87 +-
 .../org/jabref/logic/net/URLUtilTest.java     |  119 +-
 .../openoffice/style/OOBibStyleTest.java      | 1183 ++++---
 .../style/OOBibStyleTestHelper.java           |  473 ++-
 .../openoffice/style/OOPreFormatterTest.java  |   39 +-
 .../openoffice/style/StyleLoaderTest.java     |  272 +-
 .../pdf/EntryAnnotationImporterTest.java      |   30 +-
 .../logic/pdf/PdfAnnotationImporterTest.java  |  278 +-
 .../search/indexing/DocumentReaderTest.java   |   52 +-
 .../pdf/search/indexing/PdfIndexerTest.java   |  159 +-
 .../pdf/search/retrieval/PdfSearcherTest.java |   54 +-
 .../ProtectedTermsListTest.java               |   24 +-
 .../ProtectedTermsLoaderTest.java             |  278 +-
 .../logic/remote/RemoteCommunicationTest.java |   21 +-
 .../logic/remote/RemotePreferencesTest.java   |    6 +-
 .../jabref/logic/remote/RemoteSetupTest.java  |   68 +-
 .../jabref/logic/remote/RemoteUtilTest.java   |   34 +-
 .../logic/search/DatabaseSearcherTest.java    |  140 +-
 .../jabref/logic/search/SearchQueryTest.java  |  334 +-
 .../jabref/logic/shared/ConnectorTest.java    |   46 +-
 .../shared/DBMSConnectionPropertiesTest.java  |   39 +-
 .../logic/shared/DBMSConnectionTest.java      |   40 +-
 .../logic/shared/DBMSProcessorTest.java       |  367 ++-
 .../logic/shared/DBMSSynchronizerTest.java    |   94 +-
 .../org/jabref/logic/shared/DBMSTypeTest.java |   48 +-
 .../SynchronizationEventListenerTest.java     |    3 +-
 .../shared/SynchronizationSimulatorTest.java  |  100 +-
 .../org/jabref/logic/shared/TestManager.java  |  112 +-
 .../logic/shared/security/PasswordTest.java   |   13 +-
 .../logic/texparser/DefaultTexParserTest.java |  452 ++-
 .../logic/texparser/LatexParserTest.java      |  284 +-
 .../texparser/TexBibEntriesResolverTest.java  |  223 +-
 .../org/jabref/logic/util/BuildInfoTest.java  |    8 +-
 .../logic/util/DevelopmentStageTest.java      |   53 +-
 .../logic/util/ExternalLinkCreatorTest.java   |   20 +-
 .../logic/util/FileNameCleanerTest.java       |   57 +-
 .../jabref/logic/util/UpdateFieldTest.java    |  257 +-
 .../org/jabref/logic/util/VersionTest.java    |   67 +-
 .../logic/util/io/BackupFileUtilTest.java     |   44 +-
 .../io/CitationKeyBasedFileFinderTest.java    |   87 +-
 .../jabref/logic/util/io/FileHistoryTest.java |   12 +-
 .../logic/util/io/FileNameUniquenessTest.java |   54 +-
 .../jabref/logic/util/io/FileUtilTest.java    |  289 +-
 .../util/io/RegExpBasedFileFinderTest.java    |  217 +-
 .../strings/StringLengthComparatorTest.java   |   47 +-
 .../util/strings/StringManipulatorTest.java   |  127 +-
 .../util/strings/StringSimilarityTest.java    |   23 +-
 .../jabref/logic/xmp/XmpUtilReaderTest.java   |  153 +-
 .../jabref/logic/xmp/XmpUtilWriterTest.java   |  176 +-
 .../ConvertLegacyExplicitGroupsTest.java      |   38 +-
 .../ConvertMarkingToGroupsTest.java           |   37 +-
 ...eReviewIntoCommentActionMigrationTest.java |   78 +-
 .../migrations/PreferencesMigrationsTest.java |  400 ++-
 .../SpecialFieldsToSeparateFieldsTest.java    |  123 +-
 .../org/jabref/model/FieldChangeTest.java     |   69 +-
 .../java/org/jabref/model/TreeNodeTest.java   |  499 ++-
 .../org/jabref/model/TreeNodeTestData.java    |    5 +-
 .../database/BibDatabaseContextTest.java      |   85 +-
 .../BibDatabaseModeDetectionTest.java         |   51 +-
 .../model/database/BibDatabaseTest.java       |  101 +-
 .../database/DuplicationCheckerTest.java      |    5 +-
 .../model/database/KeyChangeListenerTest.java |   41 +-
 .../jabref/model/entry/AuthorListTest.java    | 1870 ++++++++---
 .../org/jabref/model/entry/AuthorTest.java    |   33 +-
 .../org/jabref/model/entry/BibEntryTest.java  |  504 ++-
 .../model/entry/BibEntryTypesManagerTest.java |  272 +-
 .../jabref/model/entry/BibtexStringTest.java  |   24 +-
 .../model/entry/CanonicalBibEntryTest.java    |   33 +-
 .../org/jabref/model/entry/CrossrefTest.java  |  810 ++++-
 .../java/org/jabref/model/entry/DateTest.java |  197 +-
 .../jabref/model/entry/EntryLinkListTest.java |   23 +-
 .../model/entry/EntryTypeFactoryTest.java     |    5 +-
 .../jabref/model/entry/IdGeneratorTest.java   |    5 +-
 .../jabref/model/entry/KeywordListTest.java   |  107 +-
 .../org/jabref/model/entry/KeywordTest.java   |   10 +-
 .../org/jabref/model/entry/MonthTest.java     |  455 +--
 .../model/entry/field/BibFieldTest.java       |   14 +-
 .../model/entry/field/FieldFactoryTest.java   |   55 +-
 .../model/entry/field/SpecialFieldTest.java   |   11 +-
 .../model/entry/field/StandardFieldTest.java  |    4 +-
 .../model/entry/field/UnknownFieldTest.java   |    5 +-
 .../entry/identifier/ArXivIdentifierTest.java |  190 +-
 .../model/entry/identifier/DOITest.java       |  742 +++--
 .../model/entry/identifier/ISBNTest.java      |    4 +-
 .../model/entry/identifier/ISSNTest.java      |    4 +-
 .../entry/identifier/IacrEprintTest.java      |   67 +-
 .../entry/identifier/MathSciNetIdTest.java    |    5 +-
 .../jabref/model/event/EventListenerTest.java |    4 +-
 .../groups/AutomaticKeywordGroupTest.java     |   56 +-
 .../groups/AutomaticPersonsGroupTest.java     |   74 +-
 .../model/groups/ExplicitGroupTest.java       |   70 +-
 .../model/groups/GroupTreeNodeTest.java       |  325 +-
 .../jabref/model/groups/SearchGroupTest.java  |   50 +-
 .../org/jabref/model/groups/TexGroupTest.java |   50 +-
 .../model/groups/WordKeywordGroupTest.java    |   96 +-
 .../jabref/model/metadata/MetaDataTest.java   |    5 +-
 .../model/openoffice/CitationEntryTest.java   |   61 +-
 .../org/jabref/model/paging/PageTest.java     |   10 +-
 .../jabref/model/pdf/FileAnnotationTest.java  |   26 +-
 .../search/matchers/MatcherSetsTest.java      |    7 +-
 .../rules/ContainsBasedSearchRuleTest.java    |   42 +-
 .../rules/GrammarBasedSearchRuleTest.java     |  119 +-
 .../search/rules/SentenceAnalyzerTest.java    |   22 +-
 .../jabref/model/strings/StringUtilTest.java  |  234 +-
 .../jabref/model/texparser/CitationTest.java  |   58 +-
 .../performance/BibtexEntryGenerator.java     |   24 +-
 .../org/jabref/support/CIServerCondition.java |   19 +-
 .../jabref/support/DisabledOnCIServer.java    |    3 +-
 .../testutils/category/DatabaseTest.java      |    3 +-
 .../testutils/category/FetcherTest.java       |    3 +-
 .../jabref/testutils/category/GUITest.java    |    5 +-
 .../styletester/StyleTesterMain.java          |   16 +-
 .../styletester/StyleTesterView.java          |   44 +-
 1962 files changed, 118394 insertions(+), 49536 deletions(-)

diff --git a/src/jmh/java/org/jabref/benchmarks/Benchmarks.java b/src/jmh/java/org/jabref/benchmarks/Benchmarks.java
index 8eae854642c..2f12d81edbc 100644
--- a/src/jmh/java/org/jabref/benchmarks/Benchmarks.java
+++ b/src/jmh/java/org/jabref/benchmarks/Benchmarks.java
@@ -1,5 +1,7 @@
 package org.jabref.benchmarks;
 
+import static org.mockito.Mockito.mock;
+
 import java.io.IOException;
 import java.io.StringReader;
 import java.io.StringWriter;
@@ -7,7 +9,6 @@
 import java.util.List;
 import java.util.Random;
 import java.util.stream.Collectors;
-
 import org.jabref.gui.Globals;
 import org.jabref.logic.bibtex.FieldPreferences;
 import org.jabref.logic.citationkeypattern.CitationKeyPatternPreferences;
@@ -35,7 +36,6 @@
 import org.jabref.model.metadata.MetaData;
 import org.jabref.model.search.rules.SearchRules.SearchFlags;
 import org.jabref.preferences.JabRefPreferences;
-
 import org.openjdk.jmh.Main;
 import org.openjdk.jmh.annotations.Benchmark;
 import org.openjdk.jmh.annotations.Scope;
@@ -43,8 +43,6 @@
 import org.openjdk.jmh.annotations.State;
 import org.openjdk.jmh.runner.RunnerException;
 
-import static org.mockito.Mockito.mock;
-
 @State(Scope.Thread)
 public class Benchmarks {
 
@@ -62,7 +60,11 @@ 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);
@@ -72,27 +74,35 @@ 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());
+            bibWriter,
+            mock(SelfContainedSaveConfiguration.class),
+            mock(FieldPreferences.class),
+            mock(CitationKeyPatternPreferences.class),
+            new BibEntryTypesManager()
+        );
+        databaseWriter.savePartOfDatabase(
+            new BibDatabaseContext(database, new MetaData()),
+            database.getEntries()
+        );
         return outputWriter;
     }
 
     @Benchmark
     public ParserResult parse() throws IOException {
-        BibtexParser parser = new BibtexParser(Globals.prefs.getImportFormatPreferences());
+        BibtexParser parser = new BibtexParser(
+            Globals.prefs.getImportFormatPreferences()
+        );
         return parser.parse(new StringReader(bibtexString));
     }
 
@@ -104,15 +114,29 @@ public String write() throws Exception {
     @Benchmark
     public List<BibEntry> search() {
         // FIXME: Reuse SearchWorker here
-        SearchQuery searchQuery = new SearchQuery("Journal Title 500", EnumSet.noneOf(SearchFlags.class));
-        return database.getEntries().stream().filter(searchQuery::isMatch).collect(Collectors.toList());
+        SearchQuery searchQuery = new SearchQuery(
+            "Journal Title 500",
+            EnumSet.noneOf(SearchFlags.class)
+        );
+        return database
+            .getEntries()
+            .stream()
+            .filter(searchQuery::isMatch)
+            .collect(Collectors.toList());
     }
 
     @Benchmark
     public List<BibEntry> parallelSearch() {
         // FIXME: Reuse SearchWorker here
-        SearchQuery searchQuery = new SearchQuery("Journal Title 500", EnumSet.noneOf(SearchFlags.class));
-        return database.getEntries().parallelStream().filter(searchQuery::isMatch).collect(Collectors.toList());
+        SearchQuery searchQuery = new SearchQuery(
+            "Journal Title 500",
+            EnumSet.noneOf(SearchFlags.class)
+        );
+        return database
+            .getEntries()
+            .parallelStream()
+            .filter(searchQuery::isMatch)
+            .collect(Collectors.toList());
     }
 
     @Benchmark
@@ -140,7 +164,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 70eb10b2914..c363e0b33fe 100644
--- a/src/main/java/module-info.java
+++ b/src/main/java/module-info.java
@@ -26,18 +26,18 @@
     uses org.kordamp.ikonli.IkonProvider;
 
     provides org.kordamp.ikonli.IkonHandler
-            with org.jabref.gui.icon.JabRefIkonHandler;
+        with org.jabref.gui.icon.JabRefIkonHandler;
     provides org.kordamp.ikonli.IkonProvider
-            with org.jabref.gui.icon.JabrefIconProvider;
+        with org.jabref.gui.icon.JabrefIconProvider;
 
     requires org.controlsfx.controls;
     requires org.fxmisc.richtext;
     requires com.tobiasdiez.easybind;
 
     provides com.airhacks.afterburner.views.ResourceLocator
-            with org.jabref.gui.util.JabRefResourceLocator;
+        with org.jabref.gui.util.JabRefResourceLocator;
     provides com.airhacks.afterburner.injection.PresenterFactory
-            with org.jabref.gui.DefaultInjector;
+        with org.jabref.gui.DefaultInjector;
 
     // Logging
     requires org.slf4j;
@@ -47,8 +47,7 @@
     requires org.tinylog.api.slf4j;
     requires org.tinylog.impl;
 
-    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;
diff --git a/src/main/java/org/jabref/architecture/AllowedToUseAwt.java b/src/main/java/org/jabref/architecture/AllowedToUseAwt.java
index d4cdb549485..2f210d440cc 100644
--- a/src/main/java/org/jabref/architecture/AllowedToUseAwt.java
+++ b/src/main/java/org/jabref/architecture/AllowedToUseAwt.java
@@ -4,7 +4,6 @@
  * Annotation to indicate that this logic class can access AWT
  */
 public @interface AllowedToUseAwt {
-
     // The rationale
     String value();
 }
diff --git a/src/main/java/org/jabref/architecture/AllowedToUseLogic.java b/src/main/java/org/jabref/architecture/AllowedToUseLogic.java
index ed6be5be7c4..5a07b2f3239 100644
--- a/src/main/java/org/jabref/architecture/AllowedToUseLogic.java
+++ b/src/main/java/org/jabref/architecture/AllowedToUseLogic.java
@@ -4,7 +4,6 @@
  * Annotation to indicate that this logic class can be used in the model package.
  */
 public @interface AllowedToUseLogic {
-
     // The rationale
     String value();
 }
diff --git a/src/main/java/org/jabref/architecture/AllowedToUseStandardStreams.java b/src/main/java/org/jabref/architecture/AllowedToUseStandardStreams.java
index 1fe80af54d7..bdd78fcc3d1 100644
--- a/src/main/java/org/jabref/architecture/AllowedToUseStandardStreams.java
+++ b/src/main/java/org/jabref/architecture/AllowedToUseStandardStreams.java
@@ -4,7 +4,6 @@
  * Annotation to indicate that this class can use System.Out.* instead of using the logging framework
  */
 public @interface AllowedToUseStandardStreams {
-
     // The rationale
     String value();
 }
diff --git a/src/main/java/org/jabref/architecture/AllowedToUseSwing.java b/src/main/java/org/jabref/architecture/AllowedToUseSwing.java
index 99a40a4bade..6820421c880 100644
--- a/src/main/java/org/jabref/architecture/AllowedToUseSwing.java
+++ b/src/main/java/org/jabref/architecture/AllowedToUseSwing.java
@@ -4,7 +4,6 @@
  * Annotation to indicate that this logic class can access swing
  */
 public @interface AllowedToUseSwing {
-
     // The rationale
     String value();
 }
diff --git a/src/main/java/org/jabref/architecture/ApacheCommonsLang3Allowed.java b/src/main/java/org/jabref/architecture/ApacheCommonsLang3Allowed.java
index 95aa6c0949b..0576a7ccff0 100644
--- a/src/main/java/org/jabref/architecture/ApacheCommonsLang3Allowed.java
+++ b/src/main/java/org/jabref/architecture/ApacheCommonsLang3Allowed.java
@@ -5,7 +5,6 @@
  * The intention is to fully switch to Google Guava and only use Apache Commons Lang3 if there is no other possibility
  */
 public @interface ApacheCommonsLang3Allowed {
-
     // The rationale
     String value();
 }
diff --git a/src/main/java/org/jabref/cli/ArgumentProcessor.java b/src/main/java/org/jabref/cli/ArgumentProcessor.java
index 1f436070319..90c9e987e81 100644
--- a/src/main/java/org/jabref/cli/ArgumentProcessor.java
+++ b/src/main/java/org/jabref/cli/ArgumentProcessor.java
@@ -1,5 +1,6 @@
 package org.jabref.cli;
 
+import com.google.common.base.Throwables;
 import java.io.IOException;
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
@@ -11,7 +12,6 @@
 import java.util.Optional;
 import java.util.Set;
 import java.util.prefs.BackingStoreException;
-
 import org.jabref.gui.Globals;
 import org.jabref.gui.externalfiles.AutoSetFileLinksUtil;
 import org.jabref.gui.undo.NamedCompound;
@@ -58,14 +58,14 @@
 import org.jabref.preferences.FilePreferences;
 import org.jabref.preferences.PreferencesService;
 import org.jabref.preferences.SearchPreferences;
-
-import com.google.common.base.Throwables;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 public class ArgumentProcessor {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(ArgumentProcessor.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(
+        ArgumentProcessor.class
+    );
     private final JabRefCLI cli;
 
     // Written once by processArguments()
@@ -81,11 +81,13 @@ public class ArgumentProcessor {
      * First call the constructor, then call {@link #processArguments()}.
      * Afterward, you can access the {@link #getParserResults()} and other getters.
      */
-    public ArgumentProcessor(String[] args,
-                             Mode startupMode,
-                             PreferencesService preferencesService,
-                             FileUpdateMonitor fileUpdateMonitor,
-                             BibEntryTypesManager entryTypesManager) throws org.apache.commons.cli.ParseException {
+    public ArgumentProcessor(
+        String[] args,
+        Mode startupMode,
+        PreferencesService preferencesService,
+        FileUpdateMonitor fileUpdateMonitor,
+        BibEntryTypesManager entryTypesManager
+    ) throws org.apache.commons.cli.ParseException {
         this.cli = new JabRefCLI(args);
         this.startupMode = startupMode;
         this.preferencesService = preferencesService;
@@ -107,7 +109,10 @@ private Optional<ParserResult> importToOpenBase(String argument) {
         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);
@@ -115,7 +120,11 @@ 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();
         }
     }
@@ -125,19 +134,29 @@ private Optional<ParserResult> importFile(String argument) {
 
         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 (IOException 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 {
             if (OS.WINDOWS) {
                 file = Path.of(address);
             } else {
-                file = Path.of(address.replace("~", System.getProperty("user.home")));
+                file =
+                    Path.of(
+                        address.replace("~", System.getProperty("user.home"))
+                    );
             }
         }
 
@@ -161,26 +180,44 @@ private Optional<ParserResult> importFile(String argument) {
     private Optional<ParserResult> importFile(Path file, String importFormat) {
         try {
             ImportFormatReader importFormatReader = new ImportFormatReader(
-                    preferencesService.getImporterPreferences(),
-                    preferencesService.getImportFormatPreferences(),
-                    fileUpdateMonitor);
+                preferencesService.getImporterPreferences(),
+                preferencesService.getImportFormatPreferences(),
+                fileUpdateMonitor
+            );
 
             if (!"*".equals(importFormat)) {
                 System.out.println(Localization.lang("Importing %0", file));
-                ParserResult result = importFormatReader.importFromFile(importFormat, file);
+                ParserResult result = importFormatReader.importFromFile(
+                    importFormat,
+                    file
+                );
                 return Optional.of(result);
             } else {
                 // * means "guess the format":
-                System.out.println(Localization.lang("Importing file %0 as unknown format", file));
+                System.out.println(
+                    Localization.lang(
+                        "Importing file %0 as unknown format",
+                        file
+                    )
+                );
 
                 ImportFormatReader.UnknownFormatImport importResult =
-                        importFormatReader.importUnknownFormat(file, new DummyFileUpdateMonitor());
-
-                System.out.println(Localization.lang("Format used: %0", importResult.format()));
+                    importFormatReader.importUnknownFormat(
+                        file,
+                        new DummyFileUpdateMonitor()
+                    );
+
+                System.out.println(
+                    Localization.lang("Format used: %0", importResult.format())
+                );
                 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();
         }
     }
@@ -225,7 +262,11 @@ 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."
+                    )
+                );
             }
         }
 
@@ -237,22 +278,36 @@ public void processArguments() {
             automaticallySetFileLinks(loaded);
         }
 
-        if ((cli.isWriteXMPtoPdf() && cli.isEmbeddBibfileInPdf()) || (cli.isWriteMetadatatoPdf() && (cli.isWriteXMPtoPdf() || cli.isEmbeddBibfileInPdf()))) {
-            System.err.println("Give only one of [writeXMPtoPdf, embeddBibfileInPdf, writeMetadatatoPdf]");
+        if (
+            (cli.isWriteXMPtoPdf() && cli.isEmbeddBibfileInPdf()) ||
+            (cli.isWriteMetadatatoPdf() &&
+                (cli.isWriteXMPtoPdf() || cli.isEmbeddBibfileInPdf()))
+        ) {
+            System.err.println(
+                "Give only one of [writeXMPtoPdf, embeddBibfileInPdf, writeMetadatatoPdf]"
+            );
         }
 
-        if (cli.isWriteMetadatatoPdf() || cli.isWriteXMPtoPdf() || cli.isEmbeddBibfileInPdf()) {
+        if (
+            cli.isWriteMetadatatoPdf() ||
+            cli.isWriteXMPtoPdf() ||
+            cli.isEmbeddBibfileInPdf()
+        ) {
             if (!loaded.isEmpty()) {
-                writeMetadataToPdf(loaded,
-                        cli.getWriteMetadatatoPdf(),
-                        preferencesService.getXmpPreferences(),
-                        preferencesService.getFilePreferences(),
-                        preferencesService.getLibraryPreferences().getDefaultBibDatabaseMode(),
-                        Globals.entryTypesManager,
-                        preferencesService.getFieldPreferences(),
-                        Globals.journalAbbreviationRepository,
-                        cli.isWriteXMPtoPdf() || cli.isWriteMetadatatoPdf(),
-                        cli.isEmbeddBibfileInPdf() || cli.isWriteMetadatatoPdf());
+                writeMetadataToPdf(
+                    loaded,
+                    cli.getWriteMetadatatoPdf(),
+                    preferencesService.getXmpPreferences(),
+                    preferencesService.getFilePreferences(),
+                    preferencesService
+                        .getLibraryPreferences()
+                        .getDefaultBibDatabaseMode(),
+                    Globals.entryTypesManager,
+                    preferencesService.getFieldPreferences(),
+                    Globals.journalAbbreviationRepository,
+                    cli.isWriteXMPtoPdf() || cli.isWriteMetadatatoPdf(),
+                    cli.isEmbeddBibfileInPdf() || cli.isWriteMetadatatoPdf()
+                );
             }
         }
 
@@ -261,13 +316,19 @@ 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."
+                    )
+                );
             }
         }
 
         if (cli.isPreferencesExport()) {
             try {
-                preferencesService.exportPreferences(Path.of(cli.getPreferencesExport()));
+                preferencesService.exportPreferences(
+                    Path.of(cli.getPreferencesExport())
+                );
             } catch (JabRefException ex) {
                 LOGGER.error("Cannot export preferences", ex);
             }
@@ -280,38 +341,48 @@ public void processArguments() {
         this.parserResults = loaded;
     }
 
-    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.");
+            LOGGER.error(
+                "The write xmp option depends on a valid import option."
+            );
             return;
         }
         ParserResult pr = loaded.get(loaded.size() - 1);
         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()) {
                 writeMetadataToPDFsOfEntry(
-                        databaseContext,
-                        entry.getCitationKey().orElse("<no cite key defined>"),
-                        entry,
-                        filePreferences,
-                        xmpPdfExporter,
-                        embeddedBibFilePdfExporter,
-                        abbreviationRepository,
-                        writeXMP,
-                        embeddBibfile);
+                    databaseContext,
+                    entry.getCitationKey().orElse("<no cite key defined>"),
+                    entry,
+                    filePreferences,
+                    xmpPdfExporter,
+                    embeddedBibFilePdfExporter,
+                    abbreviationRepository,
+                    writeXMP,
+                    embeddBibfile
+                );
             }
             return;
         }
@@ -327,101 +398,194 @@ private void writeMetadataToPdf(List<ParserResult> loaded,
         }
 
         writeMetadataToPdfByCitekey(
-                databaseContext,
-                citeKeys,
-                filePreferences,
-                xmpPdfExporter,
-                embeddedBibFilePdfExporter,
-                abbreviationRepository,
-                writeXMP,
-                embeddBibfile);
+            databaseContext,
+            citeKeys,
+            filePreferences,
+            xmpPdfExporter,
+            embeddedBibFilePdfExporter,
+            abbreviationRepository,
+            writeXMP,
+            embeddBibfile
+        );
         writeMetadataToPdfByFileNames(
-                databaseContext,
-                pdfs,
-                filePreferences,
-                xmpPdfExporter,
-                embeddedBibFilePdfExporter,
-                abbreviationRepository,
-                writeXMP,
-                embeddBibfile);
+            databaseContext,
+            pdfs,
+            filePreferences,
+            xmpPdfExporter,
+            embeddedBibFilePdfExporter,
+            abbreviationRepository,
+            writeXMP,
+            embeddBibfile
+        );
     }
 
-    private void writeMetadataToPDFsOfEntry(BibDatabaseContext databaseContext,
-                                            String citeKey,
-                                            BibEntry entry,
-                                            FilePreferences filePreferences,
-                                            XmpPdfExporter xmpPdfExporter,
-                                            EmbeddedBibFilePdfExporter embeddedBibFilePdfExporter,
-                                            JournalAbbreviationRepository abbreviationRepository,
-                                            boolean writeXMP,
-                                            boolean embeddBibfile) {
+    private void writeMetadataToPDFsOfEntry(
+        BibDatabaseContext databaseContext,
+        String citeKey,
+        BibEntry entry,
+        FilePreferences filePreferences,
+        XmpPdfExporter xmpPdfExporter,
+        EmbeddedBibFilePdfExporter embeddedBibFilePdfExporter,
+        JournalAbbreviationRepository abbreviationRepository,
+        boolean writeXMP,
+        boolean embeddBibfile
+    ) {
         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 (embeddBibfile) {
-                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 embedd 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 embedd 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) {
-            LOGGER.error("Failed writing metadata on a linked file of {}.", citeKey);
+            LOGGER.error(
+                "Failed writing metadata on a linked file of {}.",
+                citeKey
+            );
         }
     }
 
-    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);
+                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) {
@@ -443,9 +607,14 @@ private boolean exportMatches(List<ParserResult> loaded) {
         BibDatabaseContext databaseContext = pr.getDatabaseContext();
         BibDatabase dataBase = pr.getDatabase();
 
-        SearchPreferences searchPreferences = preferencesService.getSearchPreferences();
-        SearchQuery query = new SearchQuery(searchTerm, searchPreferences.getSearchFlags());
-        List<BibEntry> matches = new DatabaseSearcher(query, dataBase).getMatches();
+        SearchPreferences searchPreferences =
+            preferencesService.getSearchPreferences();
+        SearchQuery query = new SearchQuery(
+            searchTerm,
+            searchPreferences.getSearchFlags()
+        );
+        List<BibEntry> matches = new DatabaseSearcher(query, dataBase)
+            .getMatches();
 
         // export matches
         if (!matches.isEmpty()) {
@@ -454,12 +623,17 @@ private boolean exportMatches(List<ParserResult> loaded) {
             // read in the export format, take default format if no format entered
             switch (data.length) {
                 case 3 -> formatName = data[2];
-                case 2 ->
-                        // default exporter: bib file
-                        formatName = "bib";
+                case 2 -> // 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()
+                    );
                     noGUINeeded = true;
                     return false;
                 }
@@ -473,18 +647,42 @@ private boolean exportMatches(List<ParserResult> loaded) {
             } else {
                 // export new database
                 ExporterFactory exporterFactory = ExporterFactory.create(
-                        preferencesService,
-                        Globals.entryTypesManager);
-                Optional<Exporter> exporter = exporterFactory.getExporterByName(formatName);
+                    preferencesService,
+                    Globals.entryTypesManager
+                );
+                Optional<Exporter> exporter = exporterFactory.getExporterByName(
+                    formatName
+                );
                 if (exporter.isEmpty()) {
-                    System.err.println(Localization.lang("Unknown export format %0", formatName));
+                    System.err.println(
+                        Localization.lang(
+                            "Unknown export format %0",
+                            formatName
+                        )
+                    );
                 } else {
                     // 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(), Globals.journalAbbreviationRepository);
+                        System.out.println(
+                            Localization.lang("Exporting %0", data[1])
+                        );
+                        exporter
+                            .get()
+                            .export(
+                                databaseContext,
+                                Path.of(data[1]),
+                                matches,
+                                Collections.emptyList(),
+                                Globals.journalAbbreviationRepository
+                            );
                     } 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)
+                            )
+                        );
                     }
                 }
             }
@@ -504,9 +702,13 @@ private void doAuxImport(List<ParserResult> loaded) {
         }
 
         if (usageMsg) {
-            System.out.println(Localization.lang("no base-BibTeX-file specified!"));
+            System.out.println(
+                Localization.lang("no base-BibTeX-file specified!")
+            );
             System.out.println(Localization.lang("usage") + " :");
-            System.out.println("jabref --aux infile[.aux],outfile[.bib] base-BibTeX-file");
+            System.out.println(
+                "jabref --aux infile[.aux],outfile[.bib] base-BibTeX-file"
+            );
         }
     }
 
@@ -518,15 +720,19 @@ private List<ParserResult> importAndOpenFiles() {
                 // Leftover arguments that have a "bib" extension are interpreted as
                 // BIB files to open. Other files, and files that could not be opened
                 // as bib, we try to import instead.
-                boolean bibExtension = aLeftOver.toLowerCase(Locale.ENGLISH).endsWith("bib");
+                boolean bibExtension = aLeftOver
+                    .toLowerCase(Locale.ENGLISH)
+                    .endsWith("bib");
 
                 ParserResult pr = new ParserResult();
                 if (bibExtension) {
                     try {
-                        pr = OpenDatabase.loadDatabase(
+                        pr =
+                            OpenDatabase.loadDatabase(
                                 Path.of(aLeftOver),
                                 preferencesService.getImportFormatPreferences(),
-                                fileUpdateMonitor);
+                                fileUpdateMonitor
+                            );
                     } catch (IOException ex) {
                         pr = ParserResult.fromError(ex);
                         LOGGER.error("Error opening file '{}'", aLeftOver, ex);
@@ -543,7 +749,10 @@ private List<ParserResult> importAndOpenFiles() {
                     if (startupMode == Mode.INITIAL_START) {
                         toImport.add(aLeftOver);
                     } else {
-                        loaded.add(importToOpenBase(aLeftOver).orElse(new ParserResult()));
+                        loaded.add(
+                            importToOpenBase(aLeftOver)
+                                .orElse(new ParserResult())
+                        );
                     }
                 } else {
                     loaded.add(pr);
@@ -564,7 +773,11 @@ private List<ParserResult> importAndOpenFiles() {
         }
 
         if (!cli.isBlank() && cli.isBibtexImport()) {
-            importBibtexToOpenBase(cli.getBibtexImport(), preferencesService.getImportFormatPreferences()).ifPresent(loaded::add);
+            importBibtexToOpenBase(
+                cli.getBibtexImport(),
+                preferencesService.getImportFormatPreferences()
+            )
+                .ifPresent(loaded::add);
         }
 
         return loaded;
@@ -597,26 +810,47 @@ 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(preferencesService.getLibraryPreferences().shouldAlwaysReformatOnSave());
+                SelfContainedSaveConfiguration saveConfiguration =
+                    (SelfContainedSaveConfiguration) new SelfContainedSaveConfiguration()
+                        .withReformatOnSave(
+                            preferencesService
+                                .getLibraryPreferences()
+                                .shouldAlwaysReformatOnSave()
+                        );
                 BibDatabaseWriter databaseWriter = new BibtexDatabaseWriter(
-                        bibWriter,
-                        saveConfiguration,
-                        preferencesService.getFieldPreferences(),
-                        preferencesService.getCitationKeyPatternPreferences(),
-                        entryTypesManager);
+                    bibWriter,
+                    saveConfiguration,
+                    preferencesService.getFieldPreferences(),
+                    preferencesService.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()
+            );
         }
     }
 
@@ -630,7 +864,11 @@ 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
@@ -638,28 +876,47 @@ private void exportFile(List<ParserResult> loaded, String[] data) {
             ParserResult parserResult = loaded.get(loaded.size() - 1);
 
             Path path = parserResult.getPath().get().toAbsolutePath();
-            BibDatabaseContext databaseContext = parserResult.getDatabaseContext();
+            BibDatabaseContext databaseContext =
+                parserResult.getDatabaseContext();
             databaseContext.setDatabasePath(path);
-            List<Path> fileDirForDatabase = databaseContext
-                    .getFileDirectories(preferencesService.getFilePreferences());
+            List<Path> fileDirForDatabase = databaseContext.getFileDirectories(
+                preferencesService.getFilePreferences()
+            );
             System.out.println(Localization.lang("Exporting %0", data[0]));
             ExporterFactory exporterFactory = ExporterFactory.create(
-                    preferencesService,
-                    Globals.entryTypesManager);
-            Optional<Exporter> exporter = exporterFactory.getExporterByName(data[1]);
+                preferencesService,
+                Globals.entryTypesManager
+            );
+            Optional<Exporter> exporter = exporterFactory.getExporterByName(
+                data[1]
+            );
             if (exporter.isEmpty()) {
-                System.err.println(Localization.lang("Unknown export format %0", data[1]));
+                System.err.println(
+                    Localization.lang("Unknown export format %0", data[1])
+                );
             } else {
                 // We have an exporter:
                 try {
-                    exporter.get().export(
+                    exporter
+                        .get()
+                        .export(
                             parserResult.getDatabaseContext(),
                             Path.of(data[0]),
-                            parserResult.getDatabaseContext().getDatabase().getEntries(),
+                            parserResult
+                                .getDatabaseContext()
+                                .getDatabase()
+                                .getEntries(),
                             fileDirForDatabase,
-                            Globals.journalAbbreviationRepository);
+                            Globals.journalAbbreviationRepository
+                        );
                 } 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)
+                        )
+                    );
                 }
             }
         }
@@ -667,8 +924,11 @@ private void exportFile(List<ParserResult> loaded, String[] data) {
 
     private void importPreferences() {
         try {
-            preferencesService.importPreferences(Path.of(cli.getPreferencesImport()));
-            Globals.entryTypesManager = preferencesService.getCustomEntryTypesRepository();
+            preferencesService.importPreferences(
+                Path.of(cli.getPreferencesImport())
+            );
+            Globals.entryTypesManager =
+                preferencesService.getCustomEntryTypesRepository();
         } catch (JabRefException ex) {
             LOGGER.error("Cannot import preferences", ex);
         }
@@ -677,11 +937,17 @@ private void importPreferences() {
     private void resetPreferences(String value) {
         if ("all".equals(value.trim())) {
             try {
-                System.out.println(Localization.lang("Setting all preferences to default values."));
+                System.out.println(
+                    Localization.lang(
+                        "Setting all preferences to default values."
+                    )
+                );
                 preferencesService.clear();
                 new SharedDatabasePreferences().clear();
             } catch (BackingStoreException e) {
-                System.err.println(Localization.lang("Unable to clear preferences."));
+                System.err.println(
+                    Localization.lang("Unable to clear preferences.")
+                );
                 LOGGER.error("Unable to clear preferences", e);
             }
         } else {
@@ -689,7 +955,12 @@ private void resetPreferences(String value) {
             for (String key : keys) {
                 try {
                     preferencesService.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());
                 }
@@ -702,10 +973,14 @@ private void automaticallySetFileLinks(List<ParserResult> loaded) {
             BibDatabase database = parserResult.getDatabase();
             LOGGER.info(Localization.lang("Automatically setting file links"));
             AutoSetFileLinksUtil util = new AutoSetFileLinksUtil(
-                    parserResult.getDatabaseContext(),
-                    preferencesService.getFilePreferences(),
-                    preferencesService.getAutoLinkPreferences());
-            util.linkAssociatedFiles(database.getEntries(), new NamedCompound(""));
+                parserResult.getDatabaseContext(),
+                preferencesService.getFilePreferences(),
+                preferencesService.getAutoLinkPreferences()
+            );
+            util.linkAssociatedFiles(
+                database.getEntries(),
+                new NamedCompound("")
+            );
         }
     }
 
@@ -713,11 +988,16 @@ private void regenerateCitationKeys(List<ParserResult> loaded) {
         for (ParserResult parserResult : loaded) {
             BibDatabase database = parserResult.getDatabase();
 
-            LOGGER.info(Localization.lang("Regenerating citation keys according to metadata"));
+            LOGGER.info(
+                Localization.lang(
+                    "Regenerating citation keys according to metadata"
+                )
+            );
 
             CitationKeyGenerator keyGenerator = new CitationKeyGenerator(
-                    parserResult.getDatabaseContext(),
-                    preferencesService.getCitationKeyPatternPreferences());
+                parserResult.getDatabaseContext(),
+                preferencesService.getCitationKeyPatternPreferences()
+            );
             for (BibEntry entry : database.getEntries()) {
                 keyGenerator.generateAndSetKey(entry);
             }
@@ -732,8 +1012,14 @@ 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("The following fetchers are available:"));
+            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();
         }
 
@@ -742,28 +1028,52 @@ private Optional<ParserResult> fetch(String fetchCommand) {
         String query = split[1];
 
         Set<SearchBasedFetcher> fetchers = WebFetchers.getSearchBasedFetchers(
-                preferencesService.getImportFormatPreferences(),
-                preferencesService.getImporterPreferences());
-        Optional<SearchBasedFetcher> selectedFetcher = fetchers.stream()
-                                                               .filter(fetcher -> fetcher.getName().equalsIgnoreCase(engine))
-                                                               .findFirst();
+            preferencesService.getImportFormatPreferences(),
+            preferencesService.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));
+            System.out.println(
+                Localization.lang("Could not find fetcher '%0'", engine)
+            );
 
-            System.out.println(Localization.lang("The following fetchers are available:"));
-            fetchers.forEach(fetcher -> System.out.println("  " + fetcher.getName()));
+            System.out.println(
+                Localization.lang("The following fetchers are available:")
+            );
+            fetchers.forEach(fetcher ->
+                System.out.println("  " + fetcher.getName())
+            );
 
             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);
+                List<BibEntry> matches = selectedFetcher
+                    .get()
+                    .performSearch(query);
                 if (matches.isEmpty()) {
-                    System.out.println("\r" + Localization.lang("No results found."));
+                    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) {
@@ -782,6 +1092,7 @@ public boolean shouldShutDown() {
     }
 
     public enum Mode {
-        INITIAL_START, REMOTE_START
+        INITIAL_START,
+        REMOTE_START,
     }
 }
diff --git a/src/main/java/org/jabref/cli/AuxCommandLine.java b/src/main/java/org/jabref/cli/AuxCommandLine.java
index 61f4c133008..0d2eb8bd496 100644
--- a/src/main/java/org/jabref/cli/AuxCommandLine.java
+++ b/src/main/java/org/jabref/cli/AuxCommandLine.java
@@ -1,7 +1,6 @@
 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;
@@ -10,6 +9,7 @@
 import org.jabref.model.strings.StringUtil;
 
 public class AuxCommandLine {
+
     private final String auxFile;
     private final BibDatabase database;
 
@@ -26,7 +26,9 @@ public BibDatabase perform() {
             AuxParserResult result = auxParser.parse(Path.of(auxFile));
             subDatabase = result.getGeneratedBibDatabase();
             // print statistics
-            System.out.println(new AuxParserResultViewModel(result).getInformation(true));
+            System.out.println(
+                new AuxParserResultViewModel(result).getInformation(true)
+            );
         }
         return subDatabase;
     }
diff --git a/src/main/java/org/jabref/cli/JabRefCLI.java b/src/main/java/org/jabref/cli/JabRefCLI.java
index 484201b63ff..575e58bf242 100644
--- a/src/main/java/org/jabref/cli/JabRefCLI.java
+++ b/src/main/java/org/jabref/cli/JabRefCLI.java
@@ -2,9 +2,13 @@
 
 import java.util.List;
 import java.util.Objects;
-
 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.gui.Globals;
 import org.jabref.logic.exporter.ExporterFactory;
 import org.jabref.logic.importer.ImportFormatReader;
@@ -14,14 +18,8 @@
 import org.jabref.model.util.DummyFileUpdateMonitor;
 import org.jabref.preferences.PreferencesService;
 
-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;
-
 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 String STRING_TABLE_DELIMITER = " : ";
@@ -37,10 +35,12 @@ public JabRefCLI(String[] args) throws ParseException {
     }
 
     public static String getExportMatchesSyntax() {
-        return String.format("[%s]searchTerm,outputFile:%s[,%s]",
-                Localization.lang("field"),
-                Localization.lang("file"),
-                Localization.lang("exportFormat"));
+        return String.format(
+            "[%s]searchTerm,outputFile:%s[,%s]",
+            Localization.lang("field"),
+            Localization.lang("file"),
+            Localization.lang("exportFormat")
+        );
     }
 
     public boolean isHelp() {
@@ -164,129 +164,289 @@ 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;
     }
 
     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("v", "version", false, Localization.lang("Display version"));
-        options.addOption(null, "debug", false, Localization.lang("Show debug level messages"));
+        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")
+        );
 
         // The "-console" option is handled by the install4j launcher
-        options.addOption(null, "console", false, Localization.lang("Show console output (only when the launcher is used)"));
-
-        options.addOption(Option
+        options.addOption(
+            null,
+            "console",
+            false,
+            Localization.lang(
+                "Show console output (only when the launcher is used)"
+            )
+        );
+
+        options.addOption(
+            Option
                 .builder("i")
                 .longOpt("import")
-                .desc(String.format("%s: '%s'", Localization.lang("Import file"), "-i library.bib"))
+                .desc(
+                    String.format(
+                        "%s: '%s'",
+                        Localization.lang("Import file"),
+                        "-i library.bib"
+                    )
+                )
                 .hasArg()
                 .argName("FILE[,FORMAT]")
-                .build());
+                .build()
+        );
 
-        options.addOption(Option
+        options.addOption(
+            Option
                 .builder()
                 .longOpt("importToOpen")
-                .desc(Localization.lang("Same as --import, but will be imported to the opened tab"))
+                .desc(
+                    Localization.lang(
+                        "Same as --import, but will be imported to the opened tab"
+                    )
+                )
                 .hasArg()
                 .argName("FILE[,FORMAT]")
-                .build());
+                .build()
+        );
 
-        options.addOption(Option
+        options.addOption(
+            Option
                 .builder("ib")
                 .longOpt("importBibtex")
-                .desc(String.format("%s: '%s'", Localization.lang("Import BibTeX"), "-ib @article{entry}"))
+                .desc(
+                    String.format(
+                        "%s: '%s'",
+                        Localization.lang("Import BibTeX"),
+                        "-ib @article{entry}"
+                    )
+                )
                 .hasArg()
                 .argName("BIBTEXT_STRING")
-                .build());
+                .build()
+        );
 
-        options.addOption(Option
+        options.addOption(
+            Option
                 .builder("o")
                 .longOpt("output")
-                .desc(String.format("%s: '%s'", Localization.lang("Export an input to a file"), "-i db.bib -o db.htm,html"))
+                .desc(
+                    String.format(
+                        "%s: '%s'",
+                        Localization.lang("Export an input to a file"),
+                        "-i db.bib -o db.htm,html"
+                    )
+                )
                 .hasArg()
                 .argName("FILE[,FORMAT]")
-                .build());
+                .build()
+        );
 
-        options.addOption(Option
+        options.addOption(
+            Option
                 .builder("m")
                 .longOpt("exportMatches")
-                .desc(String.format("%s: '%s'", Localization.lang("Matching"), "-i db.bib -m author=Newton,search.htm,html"))
+                .desc(
+                    String.format(
+                        "%s: '%s'",
+                        Localization.lang("Matching"),
+                        "-i db.bib -m author=Newton,search.htm,html"
+                    )
+                )
                 .hasArg()
                 .argName("QUERY,FILE[,FORMAT]")
-                .build());
+                .build()
+        );
 
-        options.addOption(Option
+        options.addOption(
+            Option
                 .builder("f")
                 .longOpt("fetch")
-                .desc(String.format("%s: '%s'", Localization.lang("Run fetcher"), "-f Medline/PubMed:cancer"))
+                .desc(
+                    String.format(
+                        "%s: '%s'",
+                        Localization.lang("Run fetcher"),
+                        "-f Medline/PubMed:cancer"
+                    )
+                )
                 .hasArg()
                 .argName("FETCHER:QUERY")
-                .build());
+                .build()
+        );
 
-        options.addOption(Option
+        options.addOption(
+            Option
                 .builder("a")
                 .longOpt("aux")
-                .desc(String.format("%s: '%s'", Localization.lang("Sublibrary from AUX to BibTeX"), "-a thesis.aux,new.bib"))
+                .desc(
+                    String.format(
+                        "%s: '%s'",
+                        Localization.lang("Sublibrary from AUX to BibTeX"),
+                        "-a thesis.aux,new.bib"
+                    )
+                )
                 .hasArg()
                 .argName("FILE[.aux],FILE[.bib] FILE")
-                .build());
+                .build()
+        );
 
-        options.addOption(Option
+        options.addOption(
+            Option
                 .builder("x")
                 .longOpt("prexp")
-                .desc(String.format("%s: '%s'", Localization.lang("Export preferences to a file"), "-x prefs.xml"))
+                .desc(
+                    String.format(
+                        "%s: '%s'",
+                        Localization.lang("Export preferences to a file"),
+                        "-x prefs.xml"
+                    )
+                )
                 .hasArg()
                 .argName("[FILE]")
-                .build());
+                .build()
+        );
 
-        options.addOption(Option
+        options.addOption(
+            Option
                 .builder("p")
                 .longOpt("primp")
-                .desc(String.format("%s: '%s'", Localization.lang("Import preferences from a file"), "-p prefs.xml"))
+                .desc(
+                    String.format(
+                        "%s: '%s'",
+                        Localization.lang("Import preferences from a file"),
+                        "-p prefs.xml"
+                    )
+                )
                 .hasArg()
                 .argName("[FILE]")
-                .build());
+                .build()
+        );
 
-        options.addOption(Option
+        options.addOption(
+            Option
                 .builder("d")
                 .longOpt("prdef")
-                .desc(String.format("%s: '%s'", Localization.lang("Reset preferences"), "-d mainFontSize,newline' or '-d all"))
+                .desc(
+                    String.format(
+                        "%s: '%s'",
+                        Localization.lang("Reset preferences"),
+                        "-d mainFontSize,newline' or '-d all"
+                    )
+                )
                 .hasArg()
                 .argName("KEY1[,KEY2][,KEYn] | all")
-                .build());
+                .build()
+        );
 
-        options.addOption(Option
+        options.addOption(
+            Option
                 .builder()
                 .longOpt("writeXMPtoPdf")
-                .desc(String.format("%s: '%s'", Localization.lang("Write BibTeXEntry as XMP metadata to PDF."), "-w pathToMyOwnPaper.pdf"))
+                .desc(
+                    String.format(
+                        "%s: '%s'",
+                        Localization.lang(
+                            "Write BibTeXEntry as XMP metadata to PDF."
+                        ),
+                        "-w pathToMyOwnPaper.pdf"
+                    )
+                )
                 .hasArg()
-                .argName("CITEKEY1[,CITEKEY2][,CITEKEYn] | PDF1[,PDF2][,PDFn] | all")
-                .build());
-
-        options.addOption(Option
+                .argName(
+                    "CITEKEY1[,CITEKEY2][,CITEKEYn] | PDF1[,PDF2][,PDFn] | all"
+                )
+                .build()
+        );
+
+        options.addOption(
+            Option
                 .builder()
                 .longOpt("embeddBibfileInPdf")
-                .desc(String.format("%s: '%s'", Localization.lang("Embed BibTeXEntry in PDF."), "-w pathToMyOwnPaper.pdf"))
+                .desc(
+                    String.format(
+                        "%s: '%s'",
+                        Localization.lang("Embed BibTeXEntry in PDF."),
+                        "-w pathToMyOwnPaper.pdf"
+                    )
+                )
                 .hasArg()
-                .argName("CITEKEY1[,CITEKEY2][,CITEKEYn] | PDF1[,PDF2][,PDFn] | all")
-                .build());
-
-        options.addOption(Option
+                .argName(
+                    "CITEKEY1[,CITEKEY2][,CITEKEYn] | PDF1[,PDF2][,PDFn] | all"
+                )
+                .build()
+        );
+
+        options.addOption(
+            Option
                 .builder("w")
                 .longOpt("writeMetadatatoPdf")
-                .desc(String.format("%s: '%s'", Localization.lang("Write BibTeXEntry as metadata to PDF."), "-w pathToMyOwnPaper.pdf"))
+                .desc(
+                    String.format(
+                        "%s: '%s'",
+                        Localization.lang(
+                            "Write BibTeXEntry as metadata to PDF."
+                        ),
+                        "-w pathToMyOwnPaper.pdf"
+                    )
+                )
                 .hasArg()
-                .argName("CITEKEY1[,CITEKEY2][,CITEKEYn] | PDF1[,PDF2][,PDFn] | all")
-                .build());
+                .argName(
+                    "CITEKEY1[,CITEKEY2][,CITEKEYn] | PDF1[,PDF2][,PDFn] | all"
+                )
+                .build()
+        );
 
         return options;
     }
@@ -299,30 +459,55 @@ public static void printUsage(PreferencesService preferencesService) {
         String header = "";
 
         ImportFormatReader importFormatReader = new ImportFormatReader(
-                preferencesService.getImporterPreferences(),
-                preferencesService.getImportFormatPreferences(),
-                new DummyFileUpdateMonitor());
+            preferencesService.getImporterPreferences(),
+            preferencesService.getImportFormatPreferences(),
+            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 = String.format("%s:%n%s%n", importFormatsIntro, alignStringTable(importFormats));
+            .getImportFormats()
+            .stream()
+            .map(format -> new Pair<>(format.getName(), format.getId()))
+            .toList();
+        String importFormatsIntro = Localization.lang(
+            "Available import formats"
+        );
+        String importFormatsList = String.format(
+            "%s:%n%s%n",
+            importFormatsIntro,
+            alignStringTable(importFormats)
+        );
 
         ExporterFactory exporterFactory = ExporterFactory.create(
-                preferencesService,
-                Globals.entryTypesManager);
+            preferencesService,
+            Globals.entryTypesManager
+        );
         List<Pair<String, String>> exportFormats = exporterFactory
-                .getExporters().stream()
-                .map(format -> new Pair<>(format.getName(), format.getId()))
-                .toList();
+            .getExporters()
+            .stream()
+            .map(format -> new Pair<>(format.getName(), format.getId()))
+            .toList();
         String outFormatsIntro = Localization.lang("Available export formats");
-        String outFormatsList = String.format("%s:%n%s%n", outFormatsIntro, alignStringTable(exportFormats));
-
-        String footer = '\n' + importFormatsList + outFormatsList + "\nPlease report issues at https://github.com/JabRef/jabref/issues.";
+        String outFormatsList = String.format(
+            "%s:%n%s%n",
+            outFormatsIntro,
+            alignStringTable(exportFormats)
+        );
+
+        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() {
@@ -336,9 +521,13 @@ 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());
@@ -358,7 +547,10 @@ protected static String alignStringTable(List<Pair<String, String>> table) {
     /**
      * Creates and wraps a multi-line and colon-seperated string from a List of Strings.
      */
-    protected static String wrapStringList(List<String> list, int firstLineIndentation) {
+    protected static String wrapStringList(
+        List<String> list,
+        int firstLineIndentation
+    ) {
         StringBuilder builder = new StringBuilder();
         int lastBreak = -firstLineIndentation;
 
diff --git a/src/main/java/org/jabref/cli/JournalListMvGenerator.java b/src/main/java/org/jabref/cli/JournalListMvGenerator.java
index 9a4fd3d67c6..e2ed00f0af3 100644
--- a/src/main/java/org/jabref/cli/JournalListMvGenerator.java
+++ b/src/main/java/org/jabref/cli/JournalListMvGenerator.java
@@ -8,12 +8,10 @@
 import java.util.Map;
 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.jabref.logic.journals.Abbreviation;
+import org.jabref.logic.journals.JournalAbbreviationLoader;
 import org.jooq.lambda.Unchecked;
 
 public class JournalListMvGenerator {
@@ -21,55 +19,87 @@ public class JournalListMvGenerator {
     public static void main(String[] args) throws IOException {
         boolean verbose = (args.length == 1) && ("--verbose".equals(args[0]));
 
-        Path abbreviationsDirectory = Path.of("buildres", "abbrv.jabref.org", "journals");
+        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",
-
-                // we currently do not have good support for BibTeX strings
-                "journal_abbreviations_ieee_strings.csv"
-                );
+            // 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"
+        );
 
         Files.createDirectories(journalListMvFile.getParent());
 
-        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());
+        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;
                                         }
-                                        return abbreviation2;
-                                    }));
-                    fullToAbbreviation.putAll(abbreviationMap);
-                }
-            }));
+                                    )
+                                );
+                        fullToAbbreviation.putAll(abbreviationMap);
+                    }
+                })
+            );
         }
     }
 }
diff --git a/src/main/java/org/jabref/cli/Launcher.java b/src/main/java/org/jabref/cli/Launcher.java
index a49ea92e865..2b190f361c6 100644
--- a/src/main/java/org/jabref/cli/Launcher.java
+++ b/src/main/java/org/jabref/cli/Launcher.java
@@ -8,7 +8,7 @@
 import java.nio.file.Path;
 import java.util.Comparator;
 import java.util.Map;
-
+import org.apache.commons.cli.ParseException;
 import org.jabref.gui.Globals;
 import org.jabref.gui.MainApplication;
 import org.jabref.logic.journals.JournalAbbreviationLoader;
@@ -27,8 +27,6 @@
 import org.jabref.model.util.FileUpdateMonitor;
 import org.jabref.preferences.JabRefPreferences;
 import org.jabref.preferences.PreferencesService;
-
-import org.apache.commons.cli.ParseException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.slf4j.bridge.SLF4JBridgeHandler;
@@ -42,6 +40,7 @@
  * - Start the JavaFX application (if not in cli mode)
  */
 public class Launcher {
+
     private static Logger LOGGER;
     private static String[] ARGUMENTS;
     private static boolean isDebugEnabled;
@@ -66,10 +65,16 @@ public static void main(String[] args) {
             Globals.entryTypesManager = entryTypesManager;
 
             // Initialize preferences
-            final JabRefPreferences preferences = JabRefPreferences.getInstance();
+            final JabRefPreferences preferences =
+                JabRefPreferences.getInstance();
 
             // Early exit in case another instance is already running
-            if (!handleMultipleAppInstances(ARGUMENTS, preferences.getRemotePreferences())) {
+            if (
+                !handleMultipleAppInstances(
+                    ARGUMENTS,
+                    preferences.getRemotePreferences()
+                )
+            ) {
                 return;
             }
 
@@ -83,24 +88,34 @@ public static void main(String[] args) {
             clearOldSearchIndices();
 
             try {
-                FileUpdateMonitor fileUpdateMonitor = Globals.getFileUpdateMonitor();
+                FileUpdateMonitor fileUpdateMonitor =
+                    Globals.getFileUpdateMonitor();
 
                 // Process arguments
                 ArgumentProcessor argumentProcessor = new ArgumentProcessor(
-                        ARGUMENTS,
-                        ArgumentProcessor.Mode.INITIAL_START,
-                        preferences,
-                        fileUpdateMonitor,
-                        entryTypesManager);
+                    ARGUMENTS,
+                    ArgumentProcessor.Mode.INITIAL_START,
+                    preferences,
+                    fileUpdateMonitor,
+                    entryTypesManager
+                );
                 argumentProcessor.processArguments();
                 if (argumentProcessor.shouldShutDown()) {
-                    LOGGER.debug("JabRef shut down after processing command line arguments");
+                    LOGGER.debug(
+                        "JabRef shut down after processing command line arguments"
+                    );
                     // A clean shutdown takes 60s time
                     // We don't need the clean shutdown here
                     System.exit(0);
                 }
 
-                MainApplication.main(argumentProcessor.getParserResults(), argumentProcessor.isBlank(), preferences, fileUpdateMonitor, ARGUMENTS);
+                MainApplication.main(
+                    argumentProcessor.getParserResults(),
+                    argumentProcessor.isBlank(),
+                    preferences,
+                    fileUpdateMonitor,
+                    ARGUMENTS
+                );
             } catch (ParseException e) {
                 LOGGER.error("Problem parsing arguments", e);
                 JabRefCLI.printUsage(preferences);
@@ -132,13 +147,23 @@ private static void addLogToDisk() {
         // The "Shared File Writer" is explained at
         // https://tinylog.org/v2/configuration/#shared-file-writer
         Map<String, String> configuration = Map.of(
-                "writerFile", "shared file",
-                "writerFile.level", isDebugEnabled ? "debug" : "info",
-                "level", isDebugEnabled ? "debug" : "info",
-                "writerFile.file", directory.resolve("log.txt").toString(),
-                "writerFile.charset", "UTF-8");
+            "writerFile",
+            "shared file",
+            "writerFile.level",
+            isDebugEnabled ? "debug" : "info",
+            "level",
+            isDebugEnabled ? "debug" : "info",
+            "writerFile.file",
+            directory.resolve("log.txt").toString(),
+            "writerFile.charset",
+            "UTF-8"
+        );
 
-        configuration.entrySet().forEach(config -> Configuration.set(config.getKey(), config.getValue()));
+        configuration
+            .entrySet()
+            .forEach(config ->
+                Configuration.set(config.getKey(), config.getValue())
+            );
         initializeLogger();
     }
 
@@ -146,19 +171,30 @@ private static void initializeLogger() {
         LOGGER = LoggerFactory.getLogger(MainApplication.class);
     }
 
-    private static boolean handleMultipleAppInstances(String[] args, RemotePreferences remotePreferences) {
+    private static boolean handleMultipleAppInstances(
+        String[] args,
+        RemotePreferences remotePreferences
+    ) {
         if (remotePreferences.useRemoteServer()) {
             // Try to contact already running JabRef
-            RemoteClient remoteClient = new RemoteClient(remotePreferences.getPort());
+            RemoteClient remoteClient = new RemoteClient(
+                remotePreferences.getPort()
+            );
             if (remoteClient.ping()) {
                 // We are not alone, there is already a server out there, send command line
                 // arguments to other instance
                 if (remoteClient.sendCommandLineArguments(args)) {
                     // So we assume it's all taken care of, and quit.
-                    LOGGER.info(Localization.lang("Arguments passed on to running JabRef instance. Shutting down."));
+                    LOGGER.info(
+                        Localization.lang(
+                            "Arguments passed on to running JabRef instance. Shutting down."
+                        )
+                    );
                     return false;
                 } else {
-                    LOGGER.warn("Could not communicate with other running JabRef instance.");
+                    LOGGER.warn(
+                        "Could not communicate with other running JabRef instance."
+                    );
                 }
             }
         }
@@ -167,26 +203,38 @@ private static boolean handleMultipleAppInstances(String[] args, RemotePreferenc
 
     private static void initGlobals(PreferencesService preferences) {
         // Read list(s) of journal names and abbreviations
-        Globals.journalAbbreviationRepository = JournalAbbreviationLoader
-                .loadRepository(preferences.getJournalAbbreviationPreferences());
+        Globals.journalAbbreviationRepository =
+            JournalAbbreviationLoader.loadRepository(
+                preferences.getJournalAbbreviationPreferences()
+            );
 
         Globals.entryTypesManager = preferences.getCustomEntryTypesRepository();
-        Globals.protectedTermsLoader = new ProtectedTermsLoader(preferences.getProtectedTermsPreferences());
+        Globals.protectedTermsLoader =
+            new ProtectedTermsLoader(
+                preferences.getProtectedTermsPreferences()
+            );
     }
 
     private static void configureProxy(ProxyPreferences proxyPreferences) {
         ProxyRegisterer.register(proxyPreferences);
-        if (proxyPreferences.shouldUseProxy() && proxyPreferences.shouldUseAuthentication()) {
+        if (
+            proxyPreferences.shouldUseProxy() &&
+            proxyPreferences.shouldUseAuthentication()
+        ) {
             Authenticator.setDefault(new ProxyAuthenticator());
         }
     }
 
     private static void configureSSL(SSLPreferences sslPreferences) {
-        TrustStoreManager.createTruststoreFileIfNotExist(Path.of(sslPreferences.getTruststorePath()));
+        TrustStoreManager.createTruststoreFileIfNotExist(
+            Path.of(sslPreferences.getTruststorePath())
+        );
     }
 
     private static void clearOldSearchIndices() {
-        Path currentIndexPath = OS.getNativeDesktop().getFulltextIndexBaseDirectory();
+        Path currentIndexPath = OS
+            .getNativeDesktop()
+            .getFulltextIndexBaseDirectory();
         Path appData = currentIndexPath.getParent();
 
         try {
@@ -197,13 +245,21 @@ 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")
-                        && !path.equals(currentIndexPath)) {
-                    LOGGER.info("Deleting out-of-date fulltext search index at {}.", path);
-                    Files.walk(path)
-                            .sorted(Comparator.reverseOrder())
-                            .map(Path::toFile)
-                            .forEach(File::delete);
+                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)
+                        .sorted(Comparator.reverseOrder())
+                        .map(Path::toFile)
+                        .forEach(File::delete);
                 }
             }
         } catch (IOException e) {
diff --git a/src/main/java/org/jabref/gui/BasePanelMode.java b/src/main/java/org/jabref/gui/BasePanelMode.java
index 9305439ad2b..43416efdf52 100644
--- a/src/main/java/org/jabref/gui/BasePanelMode.java
+++ b/src/main/java/org/jabref/gui/BasePanelMode.java
@@ -7,5 +7,5 @@
 public enum BasePanelMode {
     SHOWING_NOTHING,
     SHOWING_EDITOR,
-    WILL_SHOW_EDITOR
+    WILL_SHOW_EDITOR,
 }
diff --git a/src/main/java/org/jabref/gui/ClipBoardManager.java b/src/main/java/org/jabref/gui/ClipBoardManager.java
index 8ff63a59374..6ef896c4de6 100644
--- a/src/main/java/org/jabref/gui/ClipBoardManager.java
+++ b/src/main/java/org/jabref/gui/ClipBoardManager.java
@@ -7,14 +7,12 @@
 import java.awt.datatransfer.UnsupportedFlavorException;
 import java.io.IOException;
 import java.util.List;
-
 import javafx.application.Platform;
 import javafx.scene.control.TextInputControl;
 import javafx.scene.input.Clipboard;
 import javafx.scene.input.ClipboardContent;
 import javafx.scene.input.DataFormat;
 import javafx.scene.input.MouseButton;
-
 import org.jabref.architecture.AllowedToUseAwt;
 import org.jabref.logic.bibtex.BibEntryWriter;
 import org.jabref.logic.bibtex.FieldWriter;
@@ -22,7 +20,6 @@
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.BibEntryTypesManager;
 import org.jabref.preferences.PreferencesService;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -31,7 +28,9 @@ public class ClipBoardManager {
 
     public static final DataFormat XML = new DataFormat("application/xml");
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(ClipBoardManager.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(
+        ClipBoardManager.class
+    );
 
     private static Clipboard clipboard;
     private static java.awt.datatransfer.Clipboard primary;
@@ -39,10 +38,18 @@ public class ClipBoardManager {
     private final PreferencesService preferencesService;
 
     public ClipBoardManager(PreferencesService preferencesService) {
-        this(Clipboard.getSystemClipboard(), Toolkit.getDefaultToolkit().getSystemSelection(), preferencesService);
+        this(
+            Clipboard.getSystemClipboard(),
+            Toolkit.getDefaultToolkit().getSystemSelection(),
+            preferencesService
+        );
     }
 
-    public ClipBoardManager(Clipboard clipboard, java.awt.datatransfer.Clipboard primary, PreferencesService preferencesService) {
+    public ClipBoardManager(
+        Clipboard clipboard,
+        java.awt.datatransfer.Clipboard primary,
+        PreferencesService preferencesService
+    ) {
         ClipBoardManager.clipboard = clipboard;
         ClipBoardManager.primary = primary;
         this.preferencesService = preferencesService;
@@ -59,17 +66,26 @@ 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(() -> {
+        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);
+                        primary.setContents(
+                            new StringSelection(newValue),
+                            null
+                        );
                     }
-                }));
+                })
+            );
         input.setOnMouseClicked(event -> {
             if (event.getButton() == MouseButton.MIDDLE) {
-                input.insertText(input.getCaretPosition(), getContentsPrimary());
+                input.insertText(
+                    input.getCaretPosition(),
+                    getContentsPrimary()
+                );
             }
         });
     }
@@ -95,9 +111,14 @@ public static String getContents() {
     public static String getContentsPrimary() {
         if (primary != null) {
             Transferable contents = primary.getContents(null);
-            if ((contents != null) && contents.isDataFlavorSupported(DataFlavor.stringFlavor)) {
+            if (
+                (contents != null) &&
+                contents.isDataFlavorSupported(DataFlavor.stringFlavor)
+            ) {
                 try {
-                    return (String) contents.getTransferData(DataFlavor.stringFlavor);
+                    return (String) contents.getTransferData(
+                        DataFlavor.stringFlavor
+                    );
                 } catch (UnsupportedFlavorException | IOException e) {
                     LOGGER.warn(e.getMessage());
                 }
@@ -142,10 +163,19 @@ 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 {
         final ClipboardContent content = new ClipboardContent();
-        BibEntryWriter writer = new BibEntryWriter(new FieldWriter(preferencesService.getFieldPreferences()), entryTypesManager);
-        String serializedEntries = writer.serializeAll(entries, BibDatabaseMode.BIBTEX);
+        BibEntryWriter writer = new BibEntryWriter(
+            new FieldWriter(preferencesService.getFieldPreferences()),
+            entryTypesManager
+        );
+        String serializedEntries = writer.serializeAll(
+            entries,
+            BibDatabaseMode.BIBTEX
+        );
         // 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
         // Furthermore, storing a string also enables other applications to work with the data
diff --git a/src/main/java/org/jabref/gui/DefaultInjector.java b/src/main/java/org/jabref/gui/DefaultInjector.java
index b74e0efb8ff..e11efa2651c 100644
--- a/src/main/java/org/jabref/gui/DefaultInjector.java
+++ b/src/main/java/org/jabref/gui/DefaultInjector.java
@@ -1,9 +1,9 @@
 package org.jabref.gui;
 
+import com.airhacks.afterburner.injection.Injector;
+import com.airhacks.afterburner.injection.PresenterFactory;
 import java.util.function.Function;
-
 import javax.swing.undo.UndoManager;
-
 import org.jabref.gui.keyboard.KeyBindingRepository;
 import org.jabref.gui.theme.ThemeManager;
 import org.jabref.gui.util.TaskExecutor;
@@ -12,15 +12,14 @@
 import org.jabref.model.entry.BibEntryTypesManager;
 import org.jabref.model.util.FileUpdateMonitor;
 import org.jabref.preferences.PreferencesService;
-
-import com.airhacks.afterburner.injection.Injector;
-import com.airhacks.afterburner.injection.PresenterFactory;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 public class DefaultInjector implements PresenterFactory {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(DefaultInjector.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(
+        DefaultInjector.class
+    );
 
     /**
      * This method takes care of creating dependencies.
@@ -63,7 +62,10 @@ private static Object createDependency(Class<?> clazz) {
     }
 
     @Override
-    public <T> T instantiatePresenter(Class<T> clazz, Function<String, Object> injectionContext) {
+    public <T> T instantiatePresenter(
+        Class<T> clazz,
+        Function<String, Object> injectionContext
+    ) {
         LOGGER.debug("Instantiate {}", clazz.getName());
 
         // Use our own method to construct dependencies
@@ -73,7 +75,10 @@ public <T> T instantiatePresenter(Class<T> clazz, Function<String, Object> injec
     }
 
     @Override
-    public void injectMembers(Object instance, Function<String, Object> injectionContext) {
+    public void injectMembers(
+        Object instance,
+        Function<String, Object> injectionContext
+    ) {
         LOGGER.debug("Inject into {}", instance.getClass().getName());
 
         // Use our own method to construct dependencies
diff --git a/src/main/java/org/jabref/gui/DialogService.java b/src/main/java/org/jabref/gui/DialogService.java
index c152bdcb343..a0fc3c5988a 100644
--- a/src/main/java/org/jabref/gui/DialogService.java
+++ b/src/main/java/org/jabref/gui/DialogService.java
@@ -6,7 +6,6 @@
 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;
@@ -14,32 +13,46 @@
 import javafx.scene.control.ChoiceDialog;
 import javafx.scene.control.DialogPane;
 import javafx.scene.control.TextInputDialog;
-
+import org.controlsfx.control.textfield.CustomPasswordField;
+import org.controlsfx.dialog.ProgressDialog;
 import org.jabref.gui.util.BaseDialog;
 import org.jabref.gui.util.DirectoryDialogConfiguration;
 import org.jabref.gui.util.FileDialogConfiguration;
 import org.jabref.logic.l10n.Localization;
 
-import org.controlsfx.control.textfield.CustomPasswordField;
-import org.controlsfx.dialog.ProgressDialog;
-
 /**
  * This interface provides methods to create dialogs and show them to the user.
  */
 public interface DialogService {
-
     /**
      * This will create and display new {@link ChoiceDialog} of type T with a default choice and a collection of possible choices
      *
      * @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) {
-        return showChoiceDialogAndWait(title, content, okButtonLabel, null, choices);
+    default <T> Optional<T> showChoiceDialogAndWait(
+        String title,
+        String content,
+        String okButtonLabel,
+        Collection<T> choices
+    ) {
+        return showChoiceDialogAndWait(
+            title,
+            content,
+            okButtonLabel,
+            null,
+            choices
+        );
     }
 
     /**
@@ -50,7 +63,11 @@ default <T> Optional<T> showChoiceDialogAndWait(String title, String content, St
     /**
      * 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.
@@ -90,7 +107,10 @@ default <T> Optional<T> showChoiceDialogAndWait(String title, String content, St
      * @param exception the exception causing the error
      */
     default void showErrorDialogAndWait(Exception exception) {
-        showErrorDialogAndWait(Localization.lang("Unhandled exception occurred."), exception);
+        showErrorDialogAndWait(
+            Localization.lang("Unhandled exception occurred."),
+            exception
+        );
     }
 
     /**
@@ -98,7 +118,11 @@ default void showErrorDialogAndWait(Exception exception) {
      *
      * @param exception the exception causing the error
      */
-    void showErrorDialogAndWait(String title, String content, Throwable exception);
+    void showErrorDialogAndWait(
+        String title,
+        String content,
+        Throwable exception
+    );
 
     /**
      * Create and display error dialog displaying the given message.
@@ -125,7 +149,11 @@ default void showErrorDialogAndWait(Exception exception) {
      *
      * @return true if the use clicked "OK" otherwise false
      */
-    boolean showConfirmationDialogAndWait(String title, String content, String okButtonLabel);
+    boolean showConfirmationDialogAndWait(
+        String title,
+        String content,
+        String okButtonLabel
+    );
 
     /**
      * Create and display a new confirmation dialog.
@@ -135,7 +163,12 @@ default void showErrorDialogAndWait(Exception exception) {
      *
      * @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.
@@ -146,8 +179,12 @@ default void showErrorDialogAndWait(Exception exception) {
      *
      * @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.
@@ -158,9 +195,14 @@ 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
@@ -168,7 +210,11 @@ boolean showConfirmationDialogWithOptOutAndWait(String title, String content,
      *
      * @return the entered password if pressed "OK", null otherwise
      */
-    Optional<String> showPasswordDialogAndWait(String title, String header, String content);
+    Optional<String> showPasswordDialogAndWait(
+        String title,
+        String header,
+        String content
+    );
 
     /**
      * Shows a custom dialog without returning any results.
@@ -184,8 +230,12 @@ 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}
@@ -193,7 +243,11 @@ 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.
@@ -201,7 +255,9 @@ Optional<ButtonType> showCustomButtonDialogAndWait(Alert.AlertType type, String
      * @param dialog dialog to show
      * @param <R>    type of result
      */
-    <R> Optional<R> showCustomDialogAndWait(javafx.scene.control.Dialog<R> dialog);
+    <R> Optional<R> showCustomDialogAndWait(
+        javafx.scene.control.Dialog<R> dialog
+    );
 
     /**
      * Constructs and shows a canceable {@link ProgressDialog}. Clicking cancel will cancel the underlying service and close the dialog
@@ -221,7 +277,11 @@ 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
+    );
 
     /**
      * Notify the user in a non-blocking way (i.e., in form of toast in a snackbar).
@@ -238,7 +298,9 @@ Optional<ButtonType> showCustomButtonDialogAndWait(Alert.AlertType type, String
      *
      * @return the selected file or an empty {@link Optional} if no file has been selected
      */
-    Optional<Path> showFileSaveDialog(FileDialogConfiguration fileDialogConfiguration);
+    Optional<Path> showFileSaveDialog(
+        FileDialogConfiguration fileDialogConfiguration
+    );
 
     /**
      * Shows a new file open dialog. The method doesn't return until the
@@ -249,7 +311,9 @@ Optional<ButtonType> showCustomButtonDialogAndWait(Alert.AlertType type, String
      *
      * @return the selected file or an empty {@link Optional} if no file has been selected
      */
-    Optional<Path> showFileOpenDialog(FileDialogConfiguration fileDialogConfiguration);
+    Optional<Path> showFileOpenDialog(
+        FileDialogConfiguration fileDialogConfiguration
+    );
 
     /**
      * Shows a new file open dialog. The method doesn't return until the
@@ -259,7 +323,9 @@ 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
@@ -269,7 +335,9 @@ 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
@@ -288,5 +356,6 @@ Optional<ButtonType> showCustomButtonDialogAndWait(Alert.AlertType type, String
      *
      * @return the selected file or an empty {@link Optional} if no file has been selected
      */
-    Optional<Path> showFileOpenFromArchiveDialog(Path archivePath) throws IOException;
+    Optional<Path> showFileOpenFromArchiveDialog(Path archivePath)
+        throws IOException;
 }
diff --git a/src/main/java/org/jabref/gui/DragAndDropDataFormats.java b/src/main/java/org/jabref/gui/DragAndDropDataFormats.java
index 4ab27396efa..bc2ee349516 100644
--- a/src/main/java/org/jabref/gui/DragAndDropDataFormats.java
+++ b/src/main/java/org/jabref/gui/DragAndDropDataFormats.java
@@ -1,9 +1,7 @@
 package org.jabref.gui;
 
 import java.util.List;
-
 import javafx.scene.input.DataFormat;
-
 import org.jabref.logic.preview.PreviewLayout;
 
 /**
@@ -11,10 +9,23 @@
  */
 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 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;
 }
diff --git a/src/main/java/org/jabref/gui/DragAndDropHelper.java b/src/main/java/org/jabref/gui/DragAndDropHelper.java
index 92e229a5c7f..1860aad56aa 100644
--- a/src/main/java/org/jabref/gui/DragAndDropHelper.java
+++ b/src/main/java/org/jabref/gui/DragAndDropHelper.java
@@ -5,9 +5,7 @@
 import java.util.Collections;
 import java.util.List;
 import java.util.stream.Collectors;
-
 import javafx.scene.input.Dragboard;
-
 import org.jabref.logic.util.io.FileUtil;
 
 public class DragAndDropHelper {
@@ -20,7 +18,12 @@ public static 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());
         }
     }
 
@@ -32,7 +35,9 @@ public static List<String> getGroups(Dragboard dragboard) {
         if (!dragboard.hasContent(DragAndDropDataFormats.GROUP)) {
             return Collections.emptyList();
         } else {
-            return (List<String>) dragboard.getContent(DragAndDropDataFormats.GROUP);
+            return (List<String>) dragboard.getContent(
+                DragAndDropDataFormats.GROUP
+            );
         }
     }
 }
diff --git a/src/main/java/org/jabref/gui/EntryTypeView.java b/src/main/java/org/jabref/gui/EntryTypeView.java
index 238d80d7d17..92722c17ee9 100644
--- a/src/main/java/org/jabref/gui/EntryTypeView.java
+++ b/src/main/java/org/jabref/gui/EntryTypeView.java
@@ -1,10 +1,13 @@
 package org.jabref.gui;
 
+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;
-
 import javafx.application.Platform;
 import javafx.event.Event;
 import javafx.fxml.FXML;
@@ -16,7 +19,6 @@
 import javafx.scene.control.Tooltip;
 import javafx.scene.layout.FlowPane;
 import javafx.stage.Screen;
-
 import org.jabref.gui.util.BaseDialog;
 import org.jabref.gui.util.ControlHelper;
 import org.jabref.gui.util.IconValidationDecorator;
@@ -38,29 +40,46 @@
 import org.jabref.model.util.FileUpdateMonitor;
 import org.jabref.preferences.PreferencesService;
 
-import com.airhacks.afterburner.views.ViewLoader;
-import com.tobiasdiez.easybind.EasyBind;
-import de.saxsys.mvvmfx.utils.validation.visualization.ControlsFxVisualizer;
-import jakarta.inject.Inject;
-
 /**
  * Dialog that prompts the user to choose a type for an entry.
  */
 public class EntryTypeView extends BaseDialog<EntryType> {
 
-    @Inject private StateManager stateManager;
-    @Inject private TaskExecutor taskExecutor;
-    @Inject private FileUpdateMonitor fileUpdateMonitor;
+    @Inject
+    private StateManager stateManager;
+
+    @Inject
+    private TaskExecutor taskExecutor;
+
+    @Inject
+    private FileUpdateMonitor fileUpdateMonitor;
+
+    @FXML
+    private ButtonType generateButton;
+
+    @FXML
+    private TextField idTextField;
 
-    @FXML private ButtonType generateButton;
-    @FXML private TextField idTextField;
-    @FXML private ComboBox<IdBasedFetcher> idBasedFetchers;
-    @FXML private FlowPane recommendedEntriesPane;
-    @FXML private FlowPane otherEntriesPane;
-    @FXML private FlowPane customPane;
-    @FXML private TitledPane recommendedEntriesTitlePane;
-    @FXML private TitledPane otherEntriesTitlePane;
-    @FXML private TitledPane customTitlePane;
+    @FXML
+    private ComboBox<IdBasedFetcher> idBasedFetchers;
+
+    @FXML
+    private FlowPane recommendedEntriesPane;
+
+    @FXML
+    private FlowPane otherEntriesPane;
+
+    @FXML
+    private FlowPane customPane;
+
+    @FXML
+    private TitledPane recommendedEntriesTitlePane;
+
+    @FXML
+    private TitledPane otherEntriesTitlePane;
+
+    @FXML
+    private TitledPane customTitlePane;
 
     private final LibraryTab libraryTab;
     private final DialogService dialogService;
@@ -70,41 +89,76 @@ public class EntryTypeView extends BaseDialog<EntryType> {
     private EntryTypeViewModel viewModel;
     private final ControlsFxVisualizer visualizer = new ControlsFxVisualizer();
 
-    public EntryTypeView(LibraryTab libraryTab, DialogService dialogService, PreferencesService preferences) {
+    public EntryTypeView(
+        LibraryTab libraryTab,
+        DialogService dialogService,
+        PreferencesService preferences
+    ) {
         this.libraryTab = libraryTab;
         this.dialogService = dialogService;
         this.preferencesService = 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()
+        );
 
         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);
+        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) {
+    private void addEntriesToPane(
+        FlowPane pane,
+        Collection<? extends BibEntryType> entryTypes
+    ) {
         for (BibEntryType entryType : entryTypes) {
-            Button entryButton = new Button(entryType.getType().getDisplayName());
+            Button entryButton = new Button(
+                entryType.getType().getDisplayName()
+            );
             entryButton.setUserData(entryType);
-            entryButton.setOnAction(event -> setEntryTypeForReturnAndClose(Optional.of(entryType)));
+            entryButton.setOnAction(event ->
+                setEntryTypeForReturnAndClose(Optional.of(entryType))
+            );
             pane.getChildren().add(entryButton);
 
             EntryType selectedType = entryType.getType();
@@ -123,73 +177,110 @@ private void addEntriesToPane(FlowPane pane, Collection<? extends BibEntryType>
     @FXML
     public void initialize() {
         visualizer.setDecoration(new IconValidationDecorator());
-        viewModel = new EntryTypeViewModel(
+        viewModel =
+            new EntryTypeViewModel(
                 preferencesService,
                 libraryTab,
                 dialogService,
                 stateManager,
                 taskExecutor,
-                fileUpdateMonitor);
+                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();
+        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);
+        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());
-        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());
-            }
-        });
-
-        boolean isBiblatexMode = libraryTab.getBibDatabaseContext().isBiblatexMode();
+        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()
+                        );
+                }
+            });
+
+        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;
-        List<BibEntryType> customTypes = Globals.entryTypesManager.getAllCustomTypes(customTypeDatabaseMode);
+        BibDatabaseMode customTypeDatabaseMode = isBiblatexMode
+            ? BibDatabaseMode.BIBLATEX
+            : BibDatabaseMode.BIBTEX;
+        List<BibEntryType> customTypes =
+            Globals.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());
     }
@@ -209,7 +300,9 @@ private void focusTextField(Event event) {
         idTextField.selectAll();
     }
 
-    private void setEntryTypeForReturnAndClose(Optional<BibEntryType> entryType) {
+    private void setEntryTypeForReturnAndClose(
+        Optional<BibEntryType> entryType
+    ) {
         type = entryType.map(BibEntryType::getType).orElse(null);
         viewModel.stopFetching();
         this.stateManager.clearSearchQuery();
@@ -223,55 +316,89 @@ 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\".");
+                    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.");
+                    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\".");
@@ -280,43 +407,69 @@ public static String getDescription(EntryType selectedType) {
                     return Localization.lang("A multi-volume \"Collection\".");
                 }
                 case MvProceedings -> {
-                    return Localization.lang("A multi-volume \"Proceedings\" entry.");
+                    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\".");
+                    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/EntryTypeViewModel.java b/src/main/java/org/jabref/gui/EntryTypeViewModel.java
index a197348997a..4285b5789fd 100644
--- a/src/main/java/org/jabref/gui/EntryTypeViewModel.java
+++ b/src/main/java/org/jabref/gui/EntryTypeViewModel.java
@@ -1,7 +1,10 @@
 package org.jabref.gui;
 
+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.Optional;
-
 import javafx.beans.property.BooleanProperty;
 import javafx.beans.property.ListProperty;
 import javafx.beans.property.ObjectProperty;
@@ -13,7 +16,6 @@
 import javafx.collections.FXCollections;
 import javafx.concurrent.Task;
 import javafx.concurrent.Worker;
-
 import org.jabref.gui.externalfiles.ImportHandler;
 import org.jabref.gui.importer.NewEntryAction;
 import org.jabref.gui.util.TaskExecutor;
@@ -29,25 +31,27 @@
 import org.jabref.model.strings.StringUtil;
 import org.jabref.model.util.FileUpdateMonitor;
 import org.jabref.preferences.PreferencesService;
-
-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;
 
 public class EntryTypeViewModel {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(EntryTypeViewModel.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(
+        EntryTypeViewModel.class
+    );
 
     private final PreferencesService preferencesService;
-    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 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 StringProperty idText = new SimpleStringProperty();
-    private final BooleanProperty focusAndSelectAllProperty = new SimpleBooleanProperty();
+    private final BooleanProperty focusAndSelectAllProperty =
+        new SimpleBooleanProperty();
     private Task<Optional<BibEntry>> fetcherWorker = new FetcherWorker();
     private final LibraryTab libraryTab;
     private final DialogService dialogService;
@@ -56,12 +60,14 @@ public class EntryTypeViewModel {
     private final TaskExecutor taskExecutor;
     private final FileUpdateMonitor fileUpdateMonitor;
 
-    public EntryTypeViewModel(PreferencesService preferences,
-                              LibraryTab libraryTab,
-                              DialogService dialogService,
-                              StateManager stateManager,
-                              TaskExecutor taskExecutor,
-                              FileUpdateMonitor fileUpdateMonitor) {
+    public EntryTypeViewModel(
+        PreferencesService preferences,
+        LibraryTab libraryTab,
+        DialogService dialogService,
+        StateManager stateManager,
+        TaskExecutor taskExecutor,
+        FileUpdateMonitor fileUpdateMonitor
+    ) {
         this.libraryTab = libraryTab;
         this.preferencesService = preferences;
         this.dialogService = dialogService;
@@ -69,14 +75,24 @@ public EntryTypeViewModel(PreferencesService preferences,
         this.taskExecutor = taskExecutor;
         this.fileUpdateMonitor = fileUpdateMonitor;
 
-        fetchers.addAll(WebFetchers.getIdBasedFetchers(
+        fetchers.addAll(
+            WebFetchers.getIdBasedFetchers(
                 preferences.getImportFormatPreferences(),
-                preferences.getImporterPreferences()));
+                preferences.getImporterPreferences()
+            )
+        );
         selectedItemProperty.setValue(getLastSelectedFetcher());
-        idFieldValidator = new FunctionBasedValidator<>(
+        idFieldValidator =
+            new FunctionBasedValidator<>(
                 idText,
                 StringUtil::isNotBlank,
-                ValidationMessage.error(Localization.lang("Required field \"%0\" is empty.", Localization.lang("ID"))));
+                ValidationMessage.error(
+                    Localization.lang(
+                        "Required field \"%0\" is empty.",
+                        Localization.lang("ID")
+                    )
+                )
+            );
     }
 
     public BooleanProperty searchSuccesfulProperty() {
@@ -104,15 +120,29 @@ public BooleanProperty getFocusAndSelectAllProperty() {
     }
 
     public void storeSelectedFetcher() {
-        preferencesService.getGuiPreferences().setLastSelectedIdBasedFetcher(selectedItemProperty.getValue().getName());
+        preferencesService
+            .getGuiPreferences()
+            .setLastSelectedIdBasedFetcher(
+                selectedItemProperty.getValue().getName()
+            );
     }
 
     private IdBasedFetcher getLastSelectedFetcher() {
-        return fetchers.stream().filter(fetcher -> fetcher.getName()
-                                                          .equals(preferencesService.getGuiPreferences()
-                                                                                    .getLastSelectedIdBasedFetcher()))
-                       .findFirst()
-                       .orElse(new DoiFetcher(preferencesService.getImportFormatPreferences()));
+        return fetchers
+            .stream()
+            .filter(fetcher ->
+                fetcher
+                    .getName()
+                    .equals(
+                        preferencesService
+                            .getGuiPreferences()
+                            .getLastSelectedIdBasedFetcher()
+                    )
+            )
+            .findFirst()
+            .orElse(
+                new DoiFetcher(preferencesService.getImportFormatPreferences())
+            );
     }
 
     public ListProperty<IdBasedFetcher> fetcherItemsProperty() {
@@ -126,6 +156,7 @@ public void stopFetching() {
     }
 
     private class FetcherWorker extends Task<Optional<BibEntry>> {
+
         private IdBasedFetcher fetcher = null;
         private String searchID = "";
 
@@ -152,14 +183,39 @@ public void runFetcherWorker() {
             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);
+                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);
+                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));
+                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);
+            LOGGER.error(
+                "Exception during fetching when using fetcher '{}' with entry id '{}'.",
+                fetcher,
+                searchId,
+                exception
+            );
 
             searchingProperty.set(false);
             fetcherWorker = new FetcherWorker();
@@ -171,18 +227,25 @@ public void runFetcherWorker() {
                 final BibEntry entry = result.get();
 
                 ImportHandler handler = new ImportHandler(
-                        libraryTab.getBibDatabaseContext(),
-                        preferencesService,
-                        fileUpdateMonitor,
-                        libraryTab.getUndoManager(),
-                        stateManager,
-                        dialogService,
-                        taskExecutor);
-                handler.importEntryWithDuplicateCheck(libraryTab.getBibDatabaseContext(), entry);
+                    libraryTab.getBibDatabaseContext(),
+                    preferencesService,
+                    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."));
+                dialogService.showWarningDialogAndWait(
+                    Localization.lang("Empty search ID"),
+                    Localization.lang("The given search ID was empty.")
+                );
             } else {
                 // result is empty
 
@@ -190,17 +253,26 @@ public void runFetcherWorker() {
                 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),
+                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"));
+                        Localization.lang("Return to dialog")
+                    );
                 if (addEntryFlag) {
                     new NewEntryAction(
-                            libraryTab.frame(),
-                            StandardEntryType.Article,
-                            dialogService,
-                            preferencesService,
-                            stateManager).execute();
+                        libraryTab.frame(),
+                        StandardEntryType.Article,
+                        dialogService,
+                        preferencesService,
+                        stateManager
+                    )
+                        .execute();
                     searchSuccesfulProperty.set(true);
                 }
             }
diff --git a/src/main/java/org/jabref/gui/FXDialog.java b/src/main/java/org/jabref/gui/FXDialog.java
index 7b485c24876..5385e8d4f15 100644
--- a/src/main/java/org/jabref/gui/FXDialog.java
+++ b/src/main/java/org/jabref/gui/FXDialog.java
@@ -7,7 +7,6 @@
 import javafx.scene.image.Image;
 import javafx.stage.Modality;
 import javafx.stage.Stage;
-
 import org.jabref.gui.icon.IconTheme;
 import org.jabref.gui.keyboard.KeyBinding;
 import org.jabref.gui.keyboard.KeyBindingRepository;
@@ -24,7 +23,12 @@
  */
 public class FXDialog extends Alert {
 
-    public FXDialog(AlertType type, String title, Image image, boolean isModal) {
+    public FXDialog(
+        AlertType type,
+        String title,
+        Image image,
+        boolean isModal
+    ) {
         this(type, title, isModal);
         setDialogIcon(image);
     }
@@ -46,7 +50,6 @@ public FXDialog(AlertType type, String title) {
 
     public FXDialog(AlertType type, boolean isModal) {
         super(type);
-
         setDialogIcon(IconTheme.getJabRefImage());
 
         Stage dialogWindow = getDialogWindow();
@@ -57,12 +60,20 @@ public FXDialog(AlertType type, boolean isModal) {
             initModality(Modality.NONE);
         }
 
-        dialogWindow.getScene().setOnKeyPressed(event -> {
-            KeyBindingRepository keyBindingRepository = Globals.getKeyPrefs();
-            if (keyBindingRepository.checkKeyCombinationEquality(KeyBinding.CLOSE, event)) {
-                dialogWindow.close();
-            }
-        });
+        dialogWindow
+            .getScene()
+            .setOnKeyPressed(event -> {
+                KeyBindingRepository keyBindingRepository =
+                    Globals.getKeyPrefs();
+                if (
+                    keyBindingRepository.checkKeyCombinationEquality(
+                        KeyBinding.CLOSE,
+                        event
+                    )
+                ) {
+                    dialogWindow.close();
+                }
+            });
     }
 
     public FXDialog(AlertType type) {
diff --git a/src/main/java/org/jabref/gui/FallbackExceptionHandler.java b/src/main/java/org/jabref/gui/FallbackExceptionHandler.java
index 73eaa39e849..06e7f8b3019 100644
--- a/src/main/java/org/jabref/gui/FallbackExceptionHandler.java
+++ b/src/main/java/org/jabref/gui/FallbackExceptionHandler.java
@@ -1,28 +1,37 @@
 package org.jabref.gui;
 
-import org.jabref.gui.util.DefaultTaskExecutor;
-
 import com.airhacks.afterburner.injection.Injector;
+import org.jabref.gui.util.DefaultTaskExecutor;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 /**
  * Catch and log any unhandled exceptions.
  */
-public class FallbackExceptionHandler implements Thread.UncaughtExceptionHandler {
+public class FallbackExceptionHandler
+    implements Thread.UncaughtExceptionHandler {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(FallbackExceptionHandler.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(
+        FallbackExceptionHandler.class
+    );
 
     public static void installExceptionHandler() {
-        Thread.setDefaultUncaughtExceptionHandler(new FallbackExceptionHandler());
+        Thread.setDefaultUncaughtExceptionHandler(
+            new FallbackExceptionHandler()
+        );
     }
 
     @Override
     public void uncaughtException(Thread thread, Throwable exception) {
         LOGGER.error("Uncaught exception occurred in " + thread, exception);
         DefaultTaskExecutor.runInJavaFXThread(() -> {
-                    DialogService dialogService = Injector.instantiateModelOrService(DialogService.class);
-                    dialogService.showErrorDialogAndWait("Uncaught exception occurred in " + thread, exception);
+            DialogService dialogService = Injector.instantiateModelOrService(
+                DialogService.class
+            );
+            dialogService.showErrorDialogAndWait(
+                "Uncaught exception occurred in " + thread,
+                exception
+            );
         });
     }
 }
diff --git a/src/main/java/org/jabref/gui/Globals.java b/src/main/java/org/jabref/gui/Globals.java
index 04ead50bf63..da892616fa8 100644
--- a/src/main/java/org/jabref/gui/Globals.java
+++ b/src/main/java/org/jabref/gui/Globals.java
@@ -1,5 +1,6 @@
 package org.jabref.gui;
 
+import kong.unirest.Unirest;
 import org.jabref.architecture.AllowedToUseAwt;
 import org.jabref.gui.keyboard.KeyBindingRepository;
 import org.jabref.gui.remote.CLIMessageHandler;
@@ -17,8 +18,6 @@
 import org.jabref.model.util.FileUpdateMonitor;
 import org.jabref.preferences.PreferencesService;
 
-import kong.unirest.Unirest;
-
 /**
  * @deprecated try to use {@link StateManager} and {@link org.jabref.preferences.PreferencesService}
  */
@@ -31,14 +30,17 @@ public class Globals {
      */
     public static final BuildInfo BUILD_INFO = new BuildInfo();
 
-    public static final RemoteListenerServerManager REMOTE_LISTENER = new RemoteListenerServerManager();
+    public static final RemoteListenerServerManager REMOTE_LISTENER =
+        new RemoteListenerServerManager();
 
     /**
      * Manager for the state of the GUI.
      */
     public static StateManager stateManager = new StateManager();
 
-    public static final TaskExecutor TASK_EXECUTOR = new DefaultTaskExecutor(stateManager);
+    public static final TaskExecutor TASK_EXECUTOR = new DefaultTaskExecutor(
+        stateManager
+    );
 
     /**
      * Each test case initializes this field if required
@@ -68,8 +70,7 @@ public class Globals {
 
     private static DefaultFileUpdateMonitor fileUpdateMonitor;
 
-    private Globals() {
-    }
+    private Globals() {}
 
     // Key binding preferences
     public static synchronized KeyBindingRepository getKeyPrefs() {
@@ -88,10 +89,12 @@ public static synchronized ClipBoardManager getClipboardManager() {
 
     public static synchronized ThemeManager getThemeManager() {
         if (themeManager == null) {
-            themeManager = new ThemeManager(
+            themeManager =
+                new ThemeManager(
                     prefs.getWorkspacePreferences(),
                     getFileUpdateMonitor(),
-                    Runnable::run);
+                    Runnable::run
+                );
         }
         return themeManager;
     }
@@ -99,7 +102,10 @@ public static synchronized ThemeManager getThemeManager() {
     public static synchronized FileUpdateMonitor getFileUpdateMonitor() {
         if (fileUpdateMonitor == null) {
             fileUpdateMonitor = new DefaultFileUpdateMonitor();
-            JabRefExecutorService.INSTANCE.executeInterruptableTask(fileUpdateMonitor, "FileUpdateMonitor");
+            JabRefExecutorService.INSTANCE.executeInterruptableTask(
+                fileUpdateMonitor,
+                "FileUpdateMonitor"
+            );
         }
         return fileUpdateMonitor;
     }
@@ -107,12 +113,19 @@ public static synchronized FileUpdateMonitor getFileUpdateMonitor() {
     // Background tasks
     public static void startBackgroundTasks() {
         // TODO Currently deactivated due to incompatibilities in XML
-      /*  if (Globals.prefs.getTelemetryPreferences().shouldCollectTelemetry() && !GraphicsEnvironment.isHeadless()) {
+        /*  if (Globals.prefs.getTelemetryPreferences().shouldCollectTelemetry() && !GraphicsEnvironment.isHeadless()) {
             Telemetry.start(prefs.getTelemetryPreferences());
         } */
         RemotePreferences remotePreferences = prefs.getRemotePreferences();
         if (remotePreferences.useRemoteServer()) {
-            Globals.REMOTE_LISTENER.openAndStart(new CLIMessageHandler(prefs, fileUpdateMonitor, entryTypesManager), remotePreferences.getPort());
+            Globals.REMOTE_LISTENER.openAndStart(
+                new CLIMessageHandler(
+                    prefs,
+                    fileUpdateMonitor,
+                    entryTypesManager
+                ),
+                remotePreferences.getPort()
+            );
         }
     }
 
diff --git a/src/main/java/org/jabref/gui/JabRefDialogService.java b/src/main/java/org/jabref/gui/JabRefDialogService.java
index 6f3c333db13..c91e4a9fe9e 100644
--- a/src/main/java/org/jabref/gui/JabRefDialogService.java
+++ b/src/main/java/org/jabref/gui/JabRefDialogService.java
@@ -1,5 +1,6 @@
 package org.jabref.gui;
 
+import com.tobiasdiez.easybind.EasyBind;
 import java.io.File;
 import java.io.IOException;
 import java.nio.file.FileSystem;
@@ -11,7 +12,6 @@
 import java.util.Optional;
 import java.util.function.Consumer;
 import java.util.stream.Collectors;
-
 import javafx.concurrent.Task;
 import javafx.geometry.Pos;
 import javafx.print.PrinterJob;
@@ -34,7 +34,11 @@
 import javafx.stage.Stage;
 import javafx.stage.Window;
 import javafx.util.Duration;
-
+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.util.BackgroundTask;
@@ -44,13 +48,6 @@
 import org.jabref.gui.util.FileDialogConfiguration;
 import org.jabref.gui.util.ZipFileChooser;
 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;
 
@@ -64,11 +61,16 @@
  * advised to rather create a new sub class of {@link FXDialog}.
  */
 public class JabRefDialogService implements DialogService {
+
     // Snackbar dialog maximum size
     public static final int DIALOG_SIZE_LIMIT = 300;
 
-    private static final Duration TOAST_MESSAGE_DISPLAY_TIME = Duration.millis(3000);
-    private static final Logger LOGGER = LoggerFactory.getLogger(JabRefDialogService.class);
+    private static final Duration TOAST_MESSAGE_DISPLAY_TIME = Duration.millis(
+        3000
+    );
+    private static final Logger LOGGER = LoggerFactory.getLogger(
+        JabRefDialogService.class
+    );
 
     private final Window mainWindow;
 
@@ -76,7 +78,11 @@ public JabRefDialogService(Window mainWindow) {
         this.mainWindow = mainWindow;
     }
 
-    private FXDialog createDialog(AlertType type, String title, String content) {
+    private FXDialog createDialog(
+        AlertType type,
+        String title,
+        String content
+    ) {
         FXDialog alert = new FXDialog(type, title, true);
         alert.setHeaderText(null);
         alert.setContentText(content);
@@ -85,8 +91,13 @@ private FXDialog createDialog(AlertType type, String title, String content) {
         return alert;
     }
 
-    private FXDialog createDialogWithOptOut(AlertType type, String title, String content,
-                                            String optOutMessage, Consumer<Boolean> optOutAction) {
+    private FXDialog createDialogWithOptOut(
+        AlertType type,
+        String title,
+        String content,
+        String optOutMessage,
+        Consumer<Boolean> optOutAction
+    ) {
         FXDialog alert = new FXDialog(type, 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
         alert.getDialogPane().applyCss();
@@ -94,15 +105,19 @@ private FXDialog createDialogWithOptOut(AlertType type, String title, String con
 
         // 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;
+        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());
@@ -121,15 +136,40 @@ public static String shortenDialogMessage(String dialogMessage) {
         if (dialogMessage.length() < JabRefDialogService.DIALOG_SIZE_LIMIT) {
             return dialogMessage.trim();
         }
-        return (dialogMessage.substring(0, Math.min(dialogMessage.length(), JabRefDialogService.DIALOG_SIZE_LIMIT)) + "...").trim();
+        return (
+            dialogMessage.substring(
+                0,
+                Math.min(
+                    dialogMessage.length(),
+                    JabRefDialogService.DIALOG_SIZE_LIMIT
+                )
+            ) +
+            "..."
+        ).trim();
     }
 
     @Override
-    public <T> Optional<T> showChoiceDialogAndWait(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());
-        ButtonType okButtonType = new ButtonType(okButtonLabel, ButtonBar.ButtonData.OK_DONE);
-        choiceDialog.getDialogPane().getButtonTypes().setAll(ButtonType.CANCEL, okButtonType);
+    public <T> Optional<T> showChoiceDialogAndWait(
+        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());
+        ButtonType okButtonType = new ButtonType(
+            okButtonLabel,
+            ButtonBar.ButtonData.OK_DONE
+        );
+        choiceDialog
+            .getDialogPane()
+            .getButtonTypes()
+            .setAll(ButtonType.CANCEL, okButtonType);
         choiceDialog.setHeaderText(title);
         choiceDialog.setTitle(title);
         choiceDialog.setContentText(content);
@@ -138,7 +178,10 @@ public <T> Optional<T> showChoiceDialogAndWait(String title, String content, Str
     }
 
     @Override
-    public Optional<String> showInputDialogAndWait(String title, String content) {
+    public Optional<String> showInputDialogAndWait(
+        String title,
+        String content
+    ) {
         TextInputDialog inputDialog = new TextInputDialog();
         inputDialog.setHeaderText(title);
         inputDialog.setContentText(content);
@@ -147,7 +190,11 @@ 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);
@@ -183,7 +230,11 @@ public void showErrorDialogAndWait(String message, Throwable exception) {
     }
 
     @Override
-    public void showErrorDialogAndWait(String title, String content, Throwable exception) {
+    public void showErrorDialogAndWait(
+        String title,
+        String content,
+        Throwable exception
+    ) {
         ExceptionDialog exceptionDialog = new ExceptionDialog(exception);
         exceptionDialog.setHeaderText(title);
         exceptionDialog.setContentText(content);
@@ -193,64 +244,134 @@ 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();
     }
 
     @Override
     public boolean showConfirmationDialogAndWait(String title, String content) {
         FXDialog alert = createDialog(AlertType.CONFIRMATION, title, content);
-        return alert.showAndWait().filter(buttonType -> buttonType == ButtonType.OK).isPresent();
+        return alert
+            .showAndWait()
+            .filter(buttonType -> buttonType == ButtonType.OK)
+            .isPresent();
     }
 
     @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);
+        ButtonType okButtonType = new ButtonType(
+            okButtonLabel,
+            ButtonBar.ButtonData.OK_DONE
+        );
         alert.getButtonTypes().setAll(ButtonType.CANCEL, okButtonType);
-        return alert.showAndWait().filter(buttonType -> buttonType == okButtonType).isPresent();
+        return alert
+            .showAndWait()
+            .filter(buttonType -> buttonType == okButtonType)
+            .isPresent();
     }
 
     @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);
+        ButtonType okButtonType = new ButtonType(
+            okButtonLabel,
+            ButtonBar.ButtonData.OK_DONE
+        );
+        ButtonType cancelButtonType = new ButtonType(
+            cancelButtonLabel,
+            ButtonBar.ButtonData.NO
+        );
         alert.getButtonTypes().setAll(okButtonType, cancelButtonType);
-        return alert.showAndWait().filter(buttonType -> buttonType == okButtonType).isPresent();
+        return alert
+            .showAndWait()
+            .filter(buttonType -> buttonType == okButtonType)
+            .isPresent();
     }
 
     @Override
-    public boolean showConfirmationDialogWithOptOutAndWait(String title, String content,
-                                                           String optOutMessage, Consumer<Boolean> optOutAction) {
-        FXDialog alert = createDialogWithOptOut(AlertType.CONFIRMATION, title, content, optOutMessage, optOutAction);
+    public boolean showConfirmationDialogWithOptOutAndWait(
+        String title,
+        String content,
+        String optOutMessage,
+        Consumer<Boolean> optOutAction
+    ) {
+        FXDialog alert = createDialogWithOptOut(
+            AlertType.CONFIRMATION,
+            title,
+            content,
+            optOutMessage,
+            optOutAction
+        );
         alert.getButtonTypes().setAll(ButtonType.YES, ButtonType.NO);
-        return alert.showAndWait().filter(buttonType -> buttonType == ButtonType.YES).isPresent();
+        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) {
-        FXDialog alert = createDialogWithOptOut(AlertType.CONFIRMATION, title, content, optOutMessage, optOutAction);
-        ButtonType okButtonType = new ButtonType(okButtonLabel, ButtonBar.ButtonData.YES);
-        ButtonType cancelButtonType = new ButtonType(cancelButtonLabel, ButtonBar.ButtonData.NO);
+    public boolean showConfirmationDialogWithOptOutAndWait(
+        String title,
+        String content,
+        String okButtonLabel,
+        String cancelButtonLabel,
+        String optOutMessage,
+        Consumer<Boolean> optOutAction
+    ) {
+        FXDialog alert = createDialogWithOptOut(
+            AlertType.CONFIRMATION,
+            title,
+            content,
+            optOutMessage,
+            optOutAction
+        );
+        ButtonType okButtonType = new ButtonType(
+            okButtonLabel,
+            ButtonBar.ButtonData.YES
+        );
+        ButtonType cancelButtonType = new ButtonType(
+            cancelButtonLabel,
+            ButtonBar.ButtonData.NO
+        );
         alert.getButtonTypes().setAll(okButtonType, cancelButtonType);
-        return alert.showAndWait().filter(buttonType -> buttonType == okButtonType).isPresent();
+        return alert
+            .showAndWait()
+            .filter(buttonType -> buttonType == okButtonType)
+            .isPresent();
     }
 
     @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);
@@ -261,7 +382,9 @@ public Optional<ButtonType> showCustomDialogAndWait(String title, DialogPane con
     }
 
     @Override
-    public <R> Optional<R> showCustomDialogAndWait(javafx.scene.control.Dialog<R> dialog) {
+    public <R> Optional<R> showCustomDialogAndWait(
+        javafx.scene.control.Dialog<R> dialog
+    ) {
         if (dialog.getOwner() == null) {
             dialog.initOwner(mainWindow);
         }
@@ -269,8 +392,13 @@ public <R> Optional<R> showCustomDialogAndWait(javafx.scene.control.Dialog<R> di
     }
 
     @Override
-    public Optional<String> showPasswordDialogAndWait(String title, String header, String content) {
-        javafx.scene.control.Dialog<String> dialog = new javafx.scene.control.Dialog<>();
+    public Optional<String> showPasswordDialogAndWait(
+        String title,
+        String header,
+        String content
+    ) {
+        javafx.scene.control.Dialog<String> dialog =
+            new javafx.scene.control.Dialog<>();
         dialog.setTitle(title);
         dialog.setHeaderText(header);
 
@@ -282,7 +410,10 @@ public Optional<String> showPasswordDialogAndWait(String title, String header, S
         dialog.setTitle(title);
         dialog.getDialogPane().setContent(box);
 
-        dialog.getDialogPane().getButtonTypes().addAll(ButtonType.CANCEL, ButtonType.OK);
+        dialog
+            .getDialogPane()
+            .getButtonTypes()
+            .addAll(ButtonType.CANCEL, ButtonType.OK);
         dialog.setResultConverter(dialogButton -> {
             if (dialogButton == ButtonType.OK) {
                 return passwordField.getText();
@@ -293,17 +424,27 @@ public Optional<String> showPasswordDialogAndWait(String title, String header, S
     }
 
     @Override
-    public <V> void showProgressDialog(String title, String content, Task<V> task) {
+    public <V> void showProgressDialog(
+        String title,
+        String content,
+        Task<V> task
+    ) {
         ProgressDialog progressDialog = new ProgressDialog(task);
         progressDialog.setHeaderText(null);
         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);
+        Button cancelButton = (Button) dialogPane.lookupButton(
+            ButtonType.CANCEL
+        );
         cancelButton.setOnAction(evt -> {
             task.cancel();
             progressDialog.close();
@@ -313,9 +454,16 @@ public <V> void showProgressDialog(String title, String content, Task<V> task) {
     }
 
     @Override
-    public <V> Optional<ButtonType> showBackgroundProgressDialogAndWait(String title, String content, StateManager stateManager) {
+    public <V> Optional<ButtonType> showBackgroundProgressDialogAndWait(
+        String title,
+        String content,
+        StateManager stateManager
+    ) {
         TaskProgressView<Task<?>> taskProgressView = new TaskProgressView<>();
-        EasyBind.bindContent(taskProgressView.getTasks(), stateManager.getBackgroundTasks());
+        EasyBind.bindContent(
+            taskProgressView.getTasks(),
+            stateManager.getBackgroundTasks()
+        );
         taskProgressView.setRetainTasks(false);
         taskProgressView.setGraphicFactory(BackgroundTask::getIcon);
 
@@ -333,12 +481,14 @@ public <V> Optional<ButtonType> showBackgroundProgressDialogAndWait(String title
         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();
     }
@@ -348,69 +498,111 @@ public void notify(String message) {
         LOGGER.info(message);
 
         DefaultTaskExecutor.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"))
-                                              // TODO: Change to a notification overview instead of event log when that is available. The event log is not that user friendly (different purpose).
-                                              .text(
-                                                    "(" + Localization.lang("Check the event log to see all notifications") + ")"
-                                                     + "\n\n" + message)
-                                              .onAction(e -> {
-                                                     ErrorConsoleAction ec = new ErrorConsoleAction();
-                                                     ec.execute();
-                                                 }))
-                         .hideCloseButton()
-                         .show();
+            Notifications
+                .create()
+                .text(message)
+                .position(Pos.BOTTOM_CENTER)
+                .hideAfter(TOAST_MESSAGE_DISPLAY_TIME)
+                .owner(mainWindow)
+                .threshold(
+                    5,
+                    Notifications
+                        .create()
+                        .title(Localization.lang("Last notification"))
+                        // TODO: Change to a notification overview instead of event log when that is available. The event log is not that user friendly (different purpose).
+                        .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) {
+    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);
     }
 
     @Override
-    public Optional<Path> showFileOpenDialog(FileDialogConfiguration fileDialogConfiguration) {
+    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) {
-        DirectoryChooser chooser = getConfiguredDirectoryChooser(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).collect(Collectors.toList()) : Collections.emptyList();
+        return files != null
+            ? files.stream().map(File::toPath).collect(Collectors.toList())
+            : Collections.emptyList();
     }
 
-    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;
     }
 
-    private FileChooser getConfiguredFileChooser(FileDialogConfiguration fileDialogConfiguration) {
+    private FileChooser getConfiguredFileChooser(
+        FileDialogConfiguration fileDialogConfiguration
+    ) {
         FileChooser chooser = new FileChooser();
-        chooser.getExtensionFilters().addAll(fileDialogConfiguration.getExtensionFilters());
-        chooser.setSelectedExtensionFilter(fileDialogConfiguration.getDefaultExtension());
-        chooser.setInitialFileName(fileDialogConfiguration.getInitialFileName());
-        fileDialogConfiguration.getInitialDirectory().map(Path::toFile).ifPresent(chooser::setInitialDirectory);
+        chooser
+            .getExtensionFilters()
+            .addAll(fileDialogConfiguration.getExtensionFilters());
+        chooser.setSelectedExtensionFilter(
+            fileDialogConfiguration.getDefaultExtension()
+        );
+        chooser.setInitialFileName(
+            fileDialogConfiguration.getInitialFileName()
+        );
+        fileDialogConfiguration
+            .getInitialDirectory()
+            .map(Path::toFile)
+            .ifPresent(chooser::setInitialDirectory);
         return chooser;
     }
 
@@ -420,11 +612,20 @@ public boolean showPrintDialog(PrinterJob job) {
     }
 
     @Override
-    public Optional<Path> showFileOpenFromArchiveDialog(Path archivePath) throws IOException {
-        try (FileSystem zipFile = FileSystems.newFileSystem(archivePath, (ClassLoader) null)) {
+    public Optional<Path> showFileOpenFromArchiveDialog(Path archivePath)
+        throws IOException {
+        try (
+            FileSystem zipFile = FileSystems.newFileSystem(
+                archivePath,
+                (ClassLoader) null
+            )
+        ) {
             return new ZipFileChooser(zipFile).showAndWait();
         } catch (NoClassDefFoundError exc) {
-            throw new IOException("Could not instantiate ZIP-archive reader.", exc);
+            throw new IOException(
+                "Could not instantiate ZIP-archive reader.",
+                exc
+            );
         }
     }
 
diff --git a/src/main/java/org/jabref/gui/JabRefExecutorService.java b/src/main/java/org/jabref/gui/JabRefExecutorService.java
index b23beeb8d2c..95471278642 100644
--- a/src/main/java/org/jabref/gui/JabRefExecutorService.java
+++ b/src/main/java/org/jabref/gui/JabRefExecutorService.java
@@ -12,7 +12,6 @@
 import java.util.concurrent.Executors;
 import java.util.concurrent.Future;
 import java.util.concurrent.TimeUnit;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -21,30 +20,34 @@
  */
 public class JabRefExecutorService {
 
-    public static final JabRefExecutorService INSTANCE = new JabRefExecutorService();
-
-    private static final Logger LOGGER = LoggerFactory.getLogger(JabRefExecutorService.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;
-    });
+    public static final JabRefExecutorService INSTANCE =
+        new JabRefExecutorService();
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(
+        JabRefExecutorService.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 Timer timer = new Timer("timer", true);
 
     private Thread remoteThread;
 
-    private JabRefExecutorService() {
-   }
+    private JabRefExecutorService() {}
 
     public void execute(Runnable command) {
         Objects.requireNonNull(command);
@@ -90,7 +93,11 @@ 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);
@@ -100,8 +107,13 @@ public <T> List<Future<T>> executeAll(Collection<Callable<T>> tasks, int timeout
         }
     }
 
-    public void executeInterruptableTask(final Runnable runnable, String taskName) {
-        this.lowPriorityExecutorService.execute(new NamedRunnable(taskName, runnable));
+    public void executeInterruptableTask(
+        final Runnable runnable,
+        String taskName
+    ) {
+        this.lowPriorityExecutorService.execute(
+                new NamedRunnable(taskName, runnable)
+            );
     }
 
     public void executeInterruptableTaskAndWait(Runnable runnable) {
@@ -181,13 +193,22 @@ 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());
+                    LOGGER.error(
+                        "{} did not terminate",
+                        executorService.toString()
+                    );
                 }
             }
         } catch (InterruptedException ie) {
diff --git a/src/main/java/org/jabref/gui/JabRefFrame.java b/src/main/java/org/jabref/gui/JabRefFrame.java
index 8a829134b96..64ebf9f6f94 100644
--- a/src/main/java/org/jabref/gui/JabRefFrame.java
+++ b/src/main/java/org/jabref/gui/JabRefFrame.java
@@ -1,5 +1,9 @@
 package org.jabref.gui;
 
+import com.google.common.eventbus.Subscribe;
+import com.tobiasdiez.easybind.EasyBind;
+import com.tobiasdiez.easybind.EasyObservableList;
+import com.tobiasdiez.easybind.Subscription;
 import java.io.IOException;
 import java.nio.file.Path;
 import java.util.ArrayList;
@@ -10,7 +14,6 @@
 import java.util.TimerTask;
 import java.util.function.Supplier;
 import java.util.stream.Collectors;
-
 import javafx.application.Platform;
 import javafx.beans.InvalidationListener;
 import javafx.beans.Observable;
@@ -32,7 +35,7 @@
 import javafx.scene.layout.BorderPane;
 import javafx.scene.layout.VBox;
 import javafx.stage.Stage;
-
+import org.fxmisc.richtext.CodeArea;
 import org.jabref.gui.actions.ActionFactory;
 import org.jabref.gui.actions.ActionHelper;
 import org.jabref.gui.actions.SimpleCommand;
@@ -75,12 +78,6 @@
 import org.jabref.preferences.GuiPreferences;
 import org.jabref.preferences.PreferencesService;
 import org.jabref.preferences.TelemetryPreferences;
-
-import com.google.common.eventbus.Subscribe;
-import com.tobiasdiez.easybind.EasyBind;
-import com.tobiasdiez.easybind.EasyObservableList;
-import com.tobiasdiez.easybind.Subscription;
-import org.fxmisc.richtext.CodeArea;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -91,7 +88,9 @@ public class JabRefFrame extends BorderPane implements LibraryTabContainer {
 
     public static final String FRAME_TITLE = "JabRef";
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(JabRefFrame.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(
+        JabRefFrame.class
+    );
 
     private final SplitPane splitPane = new SplitPane();
     private final PreferencesService prefs = Globals.prefs;
@@ -99,7 +98,8 @@ public class JabRefFrame extends BorderPane implements LibraryTabContainer {
 
     private final FileHistoryMenu fileHistory;
 
-    @SuppressWarnings({"FieldCanBeLocal"}) private EasyObservableList<BibDatabaseContext> openDatabaseList;
+    @SuppressWarnings({ "FieldCanBeLocal" })
+    private EasyObservableList<BibDatabaseContext> openDatabaseList;
 
     private final Stage mainStage;
     private final StateManager stateManager;
@@ -122,52 +122,54 @@ public JabRefFrame(Stage mainStage) {
         this.undoManager = Globals.undoManager;
         this.fileUpdateMonitor = Globals.getFileUpdateMonitor();
         this.entryTypesManager = Globals.entryTypesManager;
-        this.globalSearchBar = new GlobalSearchBar(this, stateManager, prefs, undoManager, dialogService);
+        this.globalSearchBar =
+            new GlobalSearchBar(
+                this,
+                stateManager,
+                prefs,
+                undoManager,
+                dialogService
+            );
         this.taskExecutor = Globals.TASK_EXECUTOR;
-        this.pushToApplicationCommand = new PushToApplicationCommand(stateManager, dialogService, prefs, taskExecutor);
-        this.fileHistory = new FileHistoryMenu(prefs.getGuiPreferences().getFileHistory(), dialogService, getOpenDatabaseAction());
+        this.pushToApplicationCommand =
+            new PushToApplicationCommand(
+                stateManager,
+                dialogService,
+                prefs,
+                taskExecutor
+            );
+        this.fileHistory =
+            new FileHistoryMenu(
+                prefs.getGuiPreferences().getFileHistory(),
+                dialogService,
+                getOpenDatabaseAction()
+            );
         this.setOnKeyTyped(key -> {
-            if (this.fileHistory.isShowing()) {
-                if (this.fileHistory.openFileByKey(key)) {
-                    this.fileHistory.getParentMenu().hide();
+                if (this.fileHistory.isShowing()) {
+                    if (this.fileHistory.openFileByKey(key)) {
+                        this.fileHistory.getParentMenu().hide();
+                    }
                 }
-            }
-        });
+            });
     }
 
     private void initDragAndDrop() {
         Tab dndIndicator = new Tab(Localization.lang("Open files..."), null);
         dndIndicator.getStyleClass().add("drop");
 
-        EasyBind.subscribe(tabbedPane.skinProperty(), skin -> {
-            if (!(skin instanceof TabPaneSkin)) {
-                return;
-            }
-            // Add drag and drop listeners to JabRefFrame
-            this.getScene().setOnDragOver(event -> {
-                if (DragAndDropHelper.hasBibFiles(event.getDragboard())) {
-                    event.acceptTransferModes(TransferMode.ANY);
-                    if (!tabbedPane.getTabs().contains(dndIndicator)) {
-                        tabbedPane.getTabs().add(dndIndicator);
-                    }
-                    event.consume();
-                } else {
-                    tabbedPane.getTabs().remove(dndIndicator);
-                }
-                // Accept drag entries from MainTable
-                if (event.getDragboard().hasContent(DragAndDropDataFormats.ENTRIES)) {
-                    event.acceptTransferModes(TransferMode.COPY);
-                    event.consume();
+        EasyBind.subscribe(
+            tabbedPane.skinProperty(),
+            skin -> {
+                if (!(skin instanceof TabPaneSkin)) {
+                    return;
                 }
-            });
-
-            this.getScene().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
-                tabbedPane.lookupAll(".tab").forEach(destinationTabNode -> {
-                    destinationTabNode.setOnDragOver(tabDragEvent -> {
-                        if (DragAndDropHelper.hasBibFiles(tabDragEvent.getDragboard()) || DragAndDropHelper.hasGroups(tabDragEvent.getDragboard())) {
-                            tabDragEvent.acceptTransferModes(TransferMode.ANY);
+                // Add drag and drop listeners to JabRefFrame
+                this.getScene()
+                    .setOnDragOver(event -> {
+                        if (
+                            DragAndDropHelper.hasBibFiles(event.getDragboard())
+                        ) {
+                            event.acceptTransferModes(TransferMode.ANY);
                             if (!tabbedPane.getTabs().contains(dndIndicator)) {
                                 tabbedPane.getTabs().add(dndIndicator);
                             }
@@ -175,161 +177,362 @@ private void initDragAndDrop() {
                         } else {
                             tabbedPane.getTabs().remove(dndIndicator);
                         }
-
-                        if (tabDragEvent.getDragboard().hasContent(DragAndDropDataFormats.ENTRIES)) {
-                            tabDragEvent.acceptTransferModes(TransferMode.COPY);
-                            tabDragEvent.consume();
+                        // Accept drag entries from MainTable
+                        if (
+                            event
+                                .getDragboard()
+                                .hasContent(DragAndDropDataFormats.ENTRIES)
+                        ) {
+                            event.acceptTransferModes(TransferMode.COPY);
+                            event.consume();
                         }
                     });
-                    destinationTabNode.setOnDragExited(event1 -> tabbedPane.getTabs().remove(dndIndicator));
-                    destinationTabNode.setOnDragDropped(tabDragEvent -> {
 
-                        Dragboard dragboard = tabDragEvent.getDragboard();
+                this.getScene()
+                    .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
+                        tabbedPane
+                            .lookupAll(".tab")
+                            .forEach(destinationTabNode -> {
+                                destinationTabNode.setOnDragOver(tabDragEvent -> {
+                                        if (
+                                            DragAndDropHelper.hasBibFiles(
+                                                tabDragEvent.getDragboard()
+                                            ) ||
+                                            DragAndDropHelper.hasGroups(
+                                                tabDragEvent.getDragboard()
+                                            )
+                                        ) {
+                                            tabDragEvent.acceptTransferModes(
+                                                TransferMode.ANY
+                                            );
+                                            if (
+                                                !tabbedPane
+                                                    .getTabs()
+                                                    .contains(dndIndicator)
+                                            ) {
+                                                tabbedPane
+                                                    .getTabs()
+                                                    .add(dndIndicator);
+                                            }
+                                            event.consume();
+                                        } else {
+                                            tabbedPane
+                                                .getTabs()
+                                                .remove(dndIndicator);
+                                        }
 
-                        if (DragAndDropHelper.hasBibFiles(dragboard)) {
-                            tabbedPane.getTabs().remove(dndIndicator);
-                            List<Path> bibFiles = DragAndDropHelper.getBibFiles(dragboard);
-                            OpenDatabaseAction openDatabaseAction = this.getOpenDatabaseAction();
-                            openDatabaseAction.openFiles(bibFiles);
-                            tabDragEvent.setDropCompleted(true);
-                            tabDragEvent.consume();
-                        } else {
-                            for (Tab libraryTab : tabbedPane.getTabs()) {
-                                if (libraryTab.getId().equals(destinationTabNode.getId()) &&
-                                        !tabbedPane.getSelectionModel().getSelectedItem().equals(libraryTab)) {
-                                    LibraryTab destinationLibraryTab = (LibraryTab) libraryTab;
-                                    if (DragAndDropHelper.hasGroups(dragboard)) {
-                                        List<String> groupPathToSources = DragAndDropHelper.getGroups(dragboard);
-
-                                        copyRootNode(destinationLibraryTab);
-
-                                        GroupTreeNode destinationLibraryGroupRoot = destinationLibraryTab
-                                                .getBibDatabaseContext()
-                                                .getMetaData()
-                                                .getGroups().get();
-
-                                        for (String pathToSource : groupPathToSources) {
-                                            GroupTreeNode groupTreeNodeToCopy = getCurrentLibraryTab()
-                                                    .getBibDatabaseContext()
-                                                    .getMetaData()
-                                                    .getGroups()
-                                                    .get()
-                                                    .getChildByPath(pathToSource)
-                                                    .get();
-                                            copyGroupTreeNode((LibraryTab) libraryTab, destinationLibraryGroupRoot, groupTreeNodeToCopy);
+                                        if (
+                                            tabDragEvent
+                                                .getDragboard()
+                                                .hasContent(
+                                                    DragAndDropDataFormats.ENTRIES
+                                                )
+                                        ) {
+                                            tabDragEvent.acceptTransferModes(
+                                                TransferMode.COPY
+                                            );
+                                            tabDragEvent.consume();
                                         }
-                                        return;
                                     }
-                                    destinationLibraryTab.dropEntry(stateManager.getLocalDragboard().getBibEntries());
-                                }
-                            }
-                            tabDragEvent.consume();
-                        }
+                                );
+                                destinationTabNode.setOnDragExited(event1 ->
+                                    tabbedPane.getTabs().remove(dndIndicator)
+                                );
+                                destinationTabNode.setOnDragDropped(tabDragEvent -> {
+                                        Dragboard dragboard =
+                                            tabDragEvent.getDragboard();
+
+                                        if (
+                                            DragAndDropHelper.hasBibFiles(
+                                                dragboard
+                                            )
+                                        ) {
+                                            tabbedPane
+                                                .getTabs()
+                                                .remove(dndIndicator);
+                                            List<Path> bibFiles =
+                                                DragAndDropHelper.getBibFiles(
+                                                    dragboard
+                                                );
+                                            OpenDatabaseAction openDatabaseAction =
+                                                this.getOpenDatabaseAction();
+                                            openDatabaseAction.openFiles(
+                                                bibFiles
+                                            );
+                                            tabDragEvent.setDropCompleted(true);
+                                            tabDragEvent.consume();
+                                        } else {
+                                            for (Tab libraryTab : tabbedPane.getTabs()) {
+                                                if (
+                                                    libraryTab
+                                                        .getId()
+                                                        .equals(
+                                                            destinationTabNode.getId()
+                                                        ) &&
+                                                    !tabbedPane
+                                                        .getSelectionModel()
+                                                        .getSelectedItem()
+                                                        .equals(libraryTab)
+                                                ) {
+                                                    LibraryTab destinationLibraryTab =
+                                                        (LibraryTab) libraryTab;
+                                                    if (
+                                                        DragAndDropHelper.hasGroups(
+                                                            dragboard
+                                                        )
+                                                    ) {
+                                                        List<
+                                                            String
+                                                        > groupPathToSources =
+                                                            DragAndDropHelper.getGroups(
+                                                                dragboard
+                                                            );
+
+                                                        copyRootNode(
+                                                            destinationLibraryTab
+                                                        );
+
+                                                        GroupTreeNode destinationLibraryGroupRoot =
+                                                            destinationLibraryTab
+                                                                .getBibDatabaseContext()
+                                                                .getMetaData()
+                                                                .getGroups()
+                                                                .get();
+
+                                                        for (String pathToSource : groupPathToSources) {
+                                                            GroupTreeNode groupTreeNodeToCopy =
+                                                                getCurrentLibraryTab()
+                                                                    .getBibDatabaseContext()
+                                                                    .getMetaData()
+                                                                    .getGroups()
+                                                                    .get()
+                                                                    .getChildByPath(
+                                                                        pathToSource
+                                                                    )
+                                                                    .get();
+                                                            copyGroupTreeNode(
+                                                                (LibraryTab) libraryTab,
+                                                                destinationLibraryGroupRoot,
+                                                                groupTreeNodeToCopy
+                                                            );
+                                                        }
+                                                        return;
+                                                    }
+                                                    destinationLibraryTab.dropEntry(
+                                                        stateManager
+                                                            .getLocalDragboard()
+                                                            .getBibEntries()
+                                                    );
+                                                }
+                                            }
+                                            tabDragEvent.consume();
+                                        }
+                                    }
+                                );
+                            });
+                        event.consume();
                     });
-                });
-                event.consume();
-            });
 
-            this.getScene().setOnDragExited(event -> tabbedPane.getTabs().remove(dndIndicator));
-            this.getScene().setOnDragDropped(event -> {
-                tabbedPane.getTabs().remove(dndIndicator);
-                List<Path> bibFiles = DragAndDropHelper.getBibFiles(event.getDragboard());
-                OpenDatabaseAction openDatabaseAction = this.getOpenDatabaseAction();
-                openDatabaseAction.openFiles(bibFiles);
-                event.setDropCompleted(true);
-                event.consume();
-            });
-        });
+                this.getScene()
+                    .setOnDragExited(event ->
+                        tabbedPane.getTabs().remove(dndIndicator)
+                    );
+                this.getScene()
+                    .setOnDragDropped(event -> {
+                        tabbedPane.getTabs().remove(dndIndicator);
+                        List<Path> bibFiles = DragAndDropHelper.getBibFiles(
+                            event.getDragboard()
+                        );
+                        OpenDatabaseAction openDatabaseAction =
+                            this.getOpenDatabaseAction();
+                        openDatabaseAction.openFiles(bibFiles);
+                        event.setDropCompleted(true);
+                        event.consume();
+                    });
+            }
+        );
     }
 
     private void initKeyBindings() {
-        addEventFilter(KeyEvent.KEY_PRESSED, event -> {
-            Optional<KeyBinding> keyBinding = Globals.getKeyPrefs().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:
-                        getGlobalSearchBar().focus();
-                        break;
-                    case NEW_ARTICLE:
-                        new NewEntryAction(this, StandardEntryType.Article, dialogService, prefs, stateManager).execute();
-                        break;
-                    case NEW_BOOK:
-                        new NewEntryAction(this, StandardEntryType.Book, dialogService, prefs, stateManager).execute();
-                        break;
-                    case NEW_INBOOK:
-                        new NewEntryAction(this, StandardEntryType.InBook, dialogService, prefs, stateManager).execute();
-                        break;
-                    case NEW_MASTERSTHESIS:
-                        new NewEntryAction(this, StandardEntryType.MastersThesis, dialogService, prefs, stateManager).execute();
-                        break;
-                    case NEW_PHDTHESIS:
-                        new NewEntryAction(this, StandardEntryType.PhdThesis, dialogService, prefs, stateManager).execute();
-                        break;
-                    case NEW_PROCEEDINGS:
-                        new NewEntryAction(this, StandardEntryType.Proceedings, dialogService, prefs, stateManager).execute();
-                        break;
-                    case NEW_TECHREPORT:
-                        new NewEntryAction(this, StandardEntryType.TechReport, dialogService, prefs, stateManager).execute();
-                        break;
-                    case NEW_UNPUBLISHED:
-                        new NewEntryAction(this, StandardEntryType.Unpublished, dialogService, prefs, stateManager).execute();
-                        break;
-                    case NEW_INPROCEEDINGS:
-                        new NewEntryAction(this, StandardEntryType.InProceedings, dialogService, prefs, 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();
+        addEventFilter(
+            KeyEvent.KEY_PRESSED,
+            event -> {
+                Optional<KeyBinding> keyBinding = Globals
+                    .getKeyPrefs()
+                    .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:
+                            getGlobalSearchBar().focus();
+                            break;
+                        case NEW_ARTICLE:
+                            new NewEntryAction(
+                                this,
+                                StandardEntryType.Article,
+                                dialogService,
+                                prefs,
+                                stateManager
+                            )
+                                .execute();
+                            break;
+                        case NEW_BOOK:
+                            new NewEntryAction(
+                                this,
+                                StandardEntryType.Book,
+                                dialogService,
+                                prefs,
+                                stateManager
+                            )
+                                .execute();
+                            break;
+                        case NEW_INBOOK:
+                            new NewEntryAction(
+                                this,
+                                StandardEntryType.InBook,
+                                dialogService,
+                                prefs,
+                                stateManager
+                            )
+                                .execute();
+                            break;
+                        case NEW_MASTERSTHESIS:
+                            new NewEntryAction(
+                                this,
+                                StandardEntryType.MastersThesis,
+                                dialogService,
+                                prefs,
+                                stateManager
+                            )
+                                .execute();
+                            break;
+                        case NEW_PHDTHESIS:
+                            new NewEntryAction(
+                                this,
+                                StandardEntryType.PhdThesis,
+                                dialogService,
+                                prefs,
+                                stateManager
+                            )
+                                .execute();
+                            break;
+                        case NEW_PROCEEDINGS:
+                            new NewEntryAction(
+                                this,
+                                StandardEntryType.Proceedings,
+                                dialogService,
+                                prefs,
+                                stateManager
+                            )
+                                .execute();
+                            break;
+                        case NEW_TECHREPORT:
+                            new NewEntryAction(
+                                this,
+                                StandardEntryType.TechReport,
+                                dialogService,
+                                prefs,
+                                stateManager
+                            )
+                                .execute();
+                            break;
+                        case NEW_UNPUBLISHED:
+                            new NewEntryAction(
+                                this,
+                                StandardEntryType.Unpublished,
+                                dialogService,
+                                prefs,
+                                stateManager
+                            )
+                                .execute();
+                            break;
+                        case NEW_INPROCEEDINGS:
+                            new NewEntryAction(
+                                this,
+                                StandardEntryType.InProceedings,
+                                dialogService,
+                                prefs,
+                                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;
-                        }
-                        break;
-                    default:
+                        default:
+                    }
                 }
             }
-        });
+        );
     }
 
     private void initShowTrackingNotification() {
         if (prefs.getTelemetryPreferences().shouldAskToCollectTelemetry()) {
-            JabRefExecutorService.INSTANCE.submit(new TimerTask() {
-                @Override
-                public void run() {
-                    DefaultTaskExecutor.runInJavaFXThread(JabRefFrame.this::showTrackingNotification);
-                }
-            }, 60000); // run in one minute
+            JabRefExecutorService.INSTANCE.submit(
+                new TimerTask() {
+                    @Override
+                    public void run() {
+                        DefaultTaskExecutor.runInJavaFXThread(
+                            JabRefFrame.this::showTrackingNotification
+                        );
+                    }
+                },
+                60000
+            ); // run in one minute
         }
     }
 
     private void showTrackingNotification() {
-        TelemetryPreferences telemetryPreferences = prefs.getTelemetryPreferences();
+        TelemetryPreferences telemetryPreferences =
+            prefs.getTelemetryPreferences();
         boolean shouldCollect = telemetryPreferences.shouldCollectTelemetry();
 
         if (!telemetryPreferences.shouldCollectTelemetry()) {
-            shouldCollect = dialogService.showConfirmationDialogAndWait(
+            shouldCollect =
+                dialogService.showConfirmationDialogAndWait(
                     Localization.lang("Telemetry: Help make JabRef better"),
-                    Localization.lang("To improve the user experience, we would like to collect anonymous statistics on the features you use. We will only record what features you access and how often you do it. We will neither collect any personal data nor the content of bibliographic items. If you choose to allow data collection, you can later disable it via File -> Preferences -> General."),
+                    Localization.lang(
+                        "To improve the user experience, we would like to collect anonymous statistics on the features you use. We will only record what features you access and how often you do it. We will neither collect any personal data nor the content of bibliographic items. If you choose to allow data collection, you can later disable it via File -> Preferences -> General."
+                    ),
                     Localization.lang("Share anonymous statistics"),
-                    Localization.lang("Don't share"));
+                    Localization.lang("Don't share")
+                );
         }
 
         telemetryPreferences.setCollectTelemetry(shouldCollect);
@@ -348,7 +551,12 @@ public void openAction(String filePath) {
      * The MacAdapter calls this method when "About" is selected from the application menu.
      */
     public void about() {
-        new HelpAction(HelpFile.CONTENTS, dialogService, prefs.getFilePreferences()).execute();
+        new HelpAction(
+            HelpFile.CONTENTS,
+            dialogService,
+            prefs.getFilePreferences()
+        )
+            .execute();
     }
 
     /**
@@ -366,9 +574,10 @@ private void tearDownJabRef(List<String> filenames) {
             if (filenames.isEmpty()) {
                 prefs.getGuiPreferences().getLastFilesOpened().clear();
             } else {
-                Path focusedDatabase = getCurrentLibraryTab().getBibDatabaseContext()
-                                                             .getDatabasePath()
-                                                             .orElse(null);
+                Path focusedDatabase = getCurrentLibraryTab()
+                    .getBibDatabaseContext()
+                    .getDatabasePath()
+                    .orElse(null);
                 prefs.getGuiPreferences().setLastFilesOpened(filenames);
                 prefs.getGuiPreferences().setLastFocusedFile(focusedDatabase);
             }
@@ -394,12 +603,21 @@ public boolean quit() {
         It is important to wait for unfinished background tasks before checking if a save-operation is needed, because
         the background tasks may make changes themselves that need saving.
          */
-        if (stateManager.getAnyTasksThatWillNotBeRecoveredRunning().getValue()) {
-            Optional<ButtonType> shouldClose = dialogService.showBackgroundProgressDialogAndWait(
+        if (
+            stateManager.getAnyTasksThatWillNotBeRecoveredRunning().getValue()
+        ) {
+            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))) {
+                    Localization.lang(
+                        "Waiting for background tasks to finish. Quit anyway?"
+                    ),
+                    stateManager
+                );
+            if (
+                !(shouldClose.isPresent() &&
+                    (shouldClose.get() == ButtonType.YES))
+            ) {
                 return false;
             }
         }
@@ -408,8 +626,12 @@ public boolean quit() {
         List<String> filenames = new ArrayList<>();
         for (int i = 0; i < tabbedPane.getTabs().size(); i++) {
             LibraryTab libraryTab = getLibraryTabAt(i);
-            final BibDatabaseContext context = libraryTab.getBibDatabaseContext();
-            if (libraryTab.isModified() && (context.getLocation() == DatabaseLocation.LOCAL)) {
+            final BibDatabaseContext context =
+                libraryTab.getBibDatabaseContext();
+            if (
+                libraryTab.isModified() &&
+                (context.getLocation() == DatabaseLocation.LOCAL)
+            ) {
                 tabbedPane.getSelectionModel().select(i);
                 if (!confirmClose(libraryTab)) {
                     return false;
@@ -420,11 +642,20 @@ public boolean quit() {
                 context.clearDBMSSynchronizer();
             }
             AutosaveManager.shutdown(context);
-            BackupManager.shutdown(context, prefs.getFilePreferences().getBackupDirectory(), prefs.getFilePreferences().shouldCreateBackup());
-            context.getDatabasePath().map(Path::toAbsolutePath).map(Path::toString).ifPresent(filenames::add);
+            BackupManager.shutdown(
+                context,
+                prefs.getFilePreferences().getBackupDirectory(),
+                prefs.getFilePreferences().shouldCreateBackup()
+            );
+            context
+                .getDatabasePath()
+                .map(Path::toAbsolutePath)
+                .map(Path::toString)
+                .ifPresent(filenames::add);
         }
 
-        WaitForSaveFinishedDialog waitForSaveFinishedDialog = new WaitForSaveFinishedDialog(dialogService);
+        WaitForSaveFinishedDialog waitForSaveFinishedDialog =
+            new WaitForSaveFinishedDialog(dialogService);
         waitForSaveFinishedDialog.showAndWait(getLibraryTabs());
 
         // We call saveWindow state here again because under Mac the windowClose listener on the stage isn't triggered when using cmd + q
@@ -453,12 +684,23 @@ public void saveWindowState() {
      */
     private void debugLogWindowState(Stage mainStage) {
         if (LOGGER.isDebugEnabled()) {
-            String debugLogString = "SCREEN DATA:" +
-                    "mainStage.WINDOW_MAXIMISED: " + mainStage.isMaximized() + "\n" +
-                    "mainStage.POS_X: " + mainStage.getX() + "\n" +
-                    "mainStage.POS_Y: " + mainStage.getY() + "\n" +
-                    "mainStage.SIZE_X: " + mainStage.getWidth() + "\n" +
-                    "mainStages.SIZE_Y: " + mainStage.getHeight() + "\n";
+            String debugLogString =
+                "SCREEN DATA:" +
+                "mainStage.WINDOW_MAXIMISED: " +
+                mainStage.isMaximized() +
+                "\n" +
+                "mainStage.POS_X: " +
+                mainStage.getX() +
+                "\n" +
+                "mainStage.POS_Y: " +
+                mainStage.getY() +
+                "\n" +
+                "mainStage.SIZE_X: " +
+                mainStage.getWidth() +
+                "\n" +
+                "mainStages.SIZE_Y: " +
+                mainStage.getHeight() +
+                "\n";
             LOGGER.debug(debugLogString);
         }
     }
@@ -467,30 +709,32 @@ private void initLayout() {
         setId("frame");
 
         MainToolBar mainToolBar = new MainToolBar(
-                this,
-                pushToApplicationCommand,
-                globalSearchBar,
-                dialogService,
-                stateManager,
-                prefs,
-                fileUpdateMonitor,
-                taskExecutor,
-                entryTypesManager,
-                undoManager);
+            this,
+            pushToApplicationCommand,
+            globalSearchBar,
+            dialogService,
+            stateManager,
+            prefs,
+            fileUpdateMonitor,
+            taskExecutor,
+            entryTypesManager,
+            undoManager
+        );
 
         MainMenu mainMenu = new MainMenu(
-                this,
-                sidePane,
-                pushToApplicationCommand,
-                prefs,
-                stateManager,
-                fileUpdateMonitor,
-                taskExecutor,
-                dialogService,
-                Globals.journalAbbreviationRepository,
-                entryTypesManager,
-                undoManager,
-                Globals.getClipboardManager());
+            this,
+            sidePane,
+            pushToApplicationCommand,
+            prefs,
+            stateManager,
+            fileUpdateMonitor,
+            taskExecutor,
+            dialogService,
+            Globals.journalAbbreviationRepository,
+            entryTypesManager,
+            undoManager,
+            Globals.getClipboardManager()
+        );
 
         VBox head = new VBox(mainMenu, mainToolBar);
         head.setSpacing(0d);
@@ -499,21 +743,27 @@ private void initLayout() {
         splitPane.getItems().addAll(tabbedPane);
         SplitPane.setResizableWithParent(sidePane, false);
 
-        sidePane.getChildren().addListener((InvalidationListener) c -> updateSidePane());
+        sidePane
+            .getChildren()
+            .addListener((InvalidationListener) c -> updateSidePane());
         updateSidePane();
 
         // We need to wait with setting the divider since it gets reset a few times during the initial set-up
-        mainStage.showingProperty().addListener(new InvalidationListener() {
-            @Override
-            public void invalidated(Observable observable) {
-                if (mainStage.isShowing()) {
-                    Platform.runLater(() -> {
-                        setDividerPosition();
-                        observable.removeListener(this);
-                    });
+        mainStage
+            .showingProperty()
+            .addListener(
+                new InvalidationListener() {
+                    @Override
+                    public void invalidated(Observable observable) {
+                        if (mainStage.isShowing()) {
+                            Platform.runLater(() -> {
+                                setDividerPosition();
+                                observable.removeListener(this);
+                            });
+                        }
+                    }
                 }
-            }
-        });
+            );
 
         setCenter(splitPane);
     }
@@ -534,8 +784,18 @@ private void updateSidePane() {
 
     private void setDividerPosition() {
         if (mainStage.isShowing() && !sidePane.getChildren().isEmpty()) {
-            splitPane.setDividerPositions(prefs.getGuiPreferences().getSidePaneWidth() / splitPane.getWidth());
-            dividerSubscription = EasyBind.subscribe(sidePane.widthProperty(), width -> prefs.getGuiPreferences().setSidePaneWidth(width.doubleValue()));
+            splitPane.setDividerPositions(
+                prefs.getGuiPreferences().getSidePaneWidth() /
+                splitPane.getWidth()
+            );
+            dividerSubscription =
+                EasyBind.subscribe(
+                    sidePane.widthProperty(),
+                    width ->
+                        prefs
+                            .getGuiPreferences()
+                            .setSidePaneWidth(width.doubleValue())
+                );
         }
     }
 
@@ -552,10 +812,12 @@ public LibraryTab getLibraryTabAt(int i) {
      * Returns a list of all LibraryTabs in this frame.
      */
     public List<LibraryTab> getLibraryTabs() {
-        return tabbedPane.getTabs().stream()
-                         .filter(LibraryTab.class::isInstance)
-                         .map(LibraryTab.class::cast)
-                         .collect(Collectors.toList());
+        return tabbedPane
+            .getTabs()
+            .stream()
+            .filter(LibraryTab.class::isInstance)
+            .map(LibraryTab.class::cast)
+            .collect(Collectors.toList());
     }
 
     public void showLibraryTabAt(int i) {
@@ -567,7 +829,8 @@ public void showLibraryTab(LibraryTab libraryTab) {
     }
 
     public void init() {
-        sidePane = new SidePane(
+        sidePane =
+            new SidePane(
                 this,
                 prefs,
                 Globals.journalAbbreviationRepository,
@@ -576,7 +839,8 @@ public void init() {
                 stateManager,
                 fileUpdateMonitor,
                 entryTypesManager,
-                undoManager);
+                undoManager
+            );
         tabbedPane = new TabPane();
         tabbedPane.setTabDragPolicy(TabPane.TabDragPolicy.REORDER);
 
@@ -585,78 +849,116 @@ public void init() {
         initDragAndDrop();
 
         // Bind global state
-        FilteredList<Tab> filteredTabs = new FilteredList<>(tabbedPane.getTabs());
+        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());
+        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
 
         // Subscribe to the search
-        EasyBind.subscribe(stateManager.activeSearchQueryProperty(),
-                query -> {
-                    if (prefs.getSearchPreferences().shouldKeepSearchString()) {
-                        for (LibraryTab tab : getLibraryTabs()) {
-                            tab.setCurrentSearchQuery(query);
-                        }
-                    } else {
-                        if (getCurrentLibraryTab() != null) {
-                            getCurrentLibraryTab().setCurrentSearchQuery(query);
-                        }
+        EasyBind.subscribe(
+            stateManager.activeSearchQueryProperty(),
+            query -> {
+                if (prefs.getSearchPreferences().shouldKeepSearchString()) {
+                    for (LibraryTab tab : getLibraryTabs()) {
+                        tab.setCurrentSearchQuery(query);
                     }
-                });
+                } else {
+                    if (getCurrentLibraryTab() != null) {
+                        getCurrentLibraryTab().setCurrentSearchQuery(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());
-            } else if (selectedTab == null) {
-                // All databases are closed
-                stateManager.setActiveDatabase(null);
+        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()
+                    );
+                } else if (selectedTab == null) {
+                    // All databases are closed
+                    stateManager.setActiveDatabase(null);
+                }
             }
-        });
+        );
 
         /*
          * 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;
-            }
+        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());
+                // Poor-mans binding to global state
+                stateManager.setSelectedEntries(
+                    libraryTab.getSelectedEntries()
+                );
+
+                // Update active search query when switching between databases
+                if (
+                    prefs.getSearchPreferences().shouldKeepSearchString() &&
+                    libraryTab.getCurrentSearchQuery().isEmpty() &&
+                    stateManager.activeSearchQueryProperty().get().isPresent()
+                ) {
+                    // apply search query also when opening a new library and keep search string is activated
+                    libraryTab.setCurrentSearchQuery(
+                        stateManager.activeSearchQueryProperty().get()
+                    );
+                } else {
+                    stateManager
+                        .activeSearchQueryProperty()
+                        .set(libraryTab.getCurrentSearchQuery());
+                }
 
-            // Update active search query when switching between databases
-            if (prefs.getSearchPreferences().shouldKeepSearchString() && libraryTab.getCurrentSearchQuery().isEmpty() && stateManager.activeSearchQueryProperty().get().isPresent()) {
-                // apply search query also when opening a new library and keep search string is activated
-                libraryTab.setCurrentSearchQuery(stateManager.activeSearchQueryProperty().get());
-            } else {
-                stateManager.activeSearchQueryProperty().set(libraryTab.getCurrentSearchQuery());
+                // Update search autocompleter with information for the correct database:
+                libraryTab.updateSearchManager();
+
+                libraryTab.getUndoManager().postUndoRedoEvent();
+                libraryTab.getMainTable().requestFocus();
+
+                // Set window title - copy tab title
+                StringBinding windowTitle = Bindings.createStringBinding(
+                    () ->
+                        libraryTab.textProperty().getValue() +
+                        " \u2013 " +
+                        FRAME_TITLE,
+                    libraryTab.textProperty()
+                );
+                mainStage.titleProperty().bind(windowTitle);
             }
-
-            // Update search autocompleter with information for the correct database:
-            libraryTab.updateSearchManager();
-
-            libraryTab.getUndoManager().postUndoRedoEvent();
-            libraryTab.getMainTable().requestFocus();
-
-            // Set window title - copy tab title
-            StringBinding windowTitle = Bindings.createStringBinding(
-                    () -> libraryTab.textProperty().getValue() + " \u2013 " + FRAME_TITLE,
-                    libraryTab.textProperty());
-            mainStage.titleProperty().bind(windowTitle);
-        });
+        );
         initShowTrackingNotification();
     }
 
@@ -664,7 +966,10 @@ public void init() {
      * Returns the currently viewed BasePanel.
      */
     public LibraryTab getCurrentLibraryTab() {
-        if ((tabbedPane == null) || (tabbedPane.getSelectionModel().getSelectedItem() == null)) {
+        if (
+            (tabbedPane == null) ||
+            (tabbedPane.getSelectionModel().getSelectedItem() == null)
+        ) {
             return null;
         }
         return (LibraryTab) tabbedPane.getSelectionModel().getSelectedItem();
@@ -691,25 +996,64 @@ public TabPane getTabbedPane() {
      * the column set.
      */
     public void setupAllTables() {
-        tabbedPane.getTabs().forEach(tab -> {
-            if (tab instanceof LibraryTab libraryTab && (libraryTab.getDatabase() != null)) {
-                DefaultTaskExecutor.runInJavaFXThread(libraryTab::setupMainPanel);
-            }
-        });
+        tabbedPane
+            .getTabs()
+            .forEach(tab -> {
+                if (
+                    tab instanceof LibraryTab libraryTab &&
+                    (libraryTab.getDatabase() != null)
+                ) {
+                    DefaultTaskExecutor.runInJavaFXThread(
+                        libraryTab::setupMainPanel
+                    );
+                }
+            });
     }
 
-    private ContextMenu createTabContextMenuFor(LibraryTab tab, KeyBindingRepository keyBindingRepository) {
+    private ContextMenu createTabContextMenuFor(
+        LibraryTab tab,
+        KeyBindingRepository keyBindingRepository
+    ) {
         ContextMenu contextMenu = new ContextMenu();
         ActionFactory factory = new ActionFactory(keyBindingRepository);
 
-        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, prefs, dialogService)),
+        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,
+                        prefs,
+                        dialogService
+                    )
+                ),
                 new SeparatorMenuItem(),
-                factory.createMenuItem(StandardActions.CLOSE_LIBRARY, new CloseDatabaseAction(this, tab)),
-                factory.createMenuItem(StandardActions.CLOSE_OTHER_LIBRARIES, new CloseOthersDatabaseAction(tab)),
-                factory.createMenuItem(StandardActions.CLOSE_ALL_LIBRARIES, new CloseAllDatabaseAction()));
+                factory.createMenuItem(
+                    StandardActions.CLOSE_LIBRARY,
+                    new CloseDatabaseAction(this, tab)
+                ),
+                factory.createMenuItem(
+                    StandardActions.CLOSE_OTHER_LIBRARIES,
+                    new CloseOthersDatabaseAction(tab)
+                ),
+                factory.createMenuItem(
+                    StandardActions.CLOSE_ALL_LIBRARIES,
+                    new CloseAllDatabaseAction()
+                )
+            );
 
         return contextMenu;
     }
@@ -727,9 +1071,13 @@ public void addTab(LibraryTab libraryTab, boolean raisePanel) {
             event.consume();
         });
 
-        libraryTab.setContextMenu(createTabContextMenuFor(libraryTab, Globals.getKeyPrefs()));
+        libraryTab.setContextMenu(
+            createTabContextMenuFor(libraryTab, Globals.getKeyPrefs())
+        );
 
-        libraryTab.getUndoManager().registerListener(new UndoRedoEventManager());
+        libraryTab
+            .getUndoManager()
+            .registerListener(new UndoRedoEventManager());
     }
 
     /**
@@ -740,15 +1088,16 @@ public void addTab(BibDatabaseContext databaseContext, boolean raisePanel) {
         Objects.requireNonNull(databaseContext);
 
         LibraryTab libraryTab = LibraryTab.createLibraryTab(
-                databaseContext,
-                this,
-                dialogService,
-                prefs,
-                stateManager,
-                fileUpdateMonitor,
-                entryTypesManager,
-                undoManager,
-                taskExecutor);
+            databaseContext,
+            this,
+            dialogService,
+            prefs,
+            stateManager,
+            fileUpdateMonitor,
+            entryTypesManager,
+            undoManager,
+            taskExecutor
+        );
 
         addTab(libraryTab, raisePanel);
     }
@@ -770,11 +1119,15 @@ public void addTab(ParserResult parserResult, boolean raisePanel) {
             }
         } else {
             // only add tab if library is not already open
-            Optional<LibraryTab> libraryTab = getLibraryTabs().stream()
-                                                              .filter(p -> p.getBibDatabaseContext()
-                                                                            .getDatabasePath()
-                                                                            .equals(parserResult.getPath()))
-                                                              .findFirst();
+            Optional<LibraryTab> libraryTab = getLibraryTabs()
+                .stream()
+                .filter(p ->
+                    p
+                        .getBibDatabaseContext()
+                        .getDatabasePath()
+                        .equals(parserResult.getPath())
+                )
+                .findFirst();
 
             if (libraryTab.isPresent()) {
                 tabbedPane.getSelectionModel().select(libraryTab.get());
@@ -790,11 +1143,21 @@ public void addTab(ParserResult parserResult, boolean raisePanel) {
      * @param panel        The BasePanel to add to.
      * @param parserResult The entries to add.
      */
-    private void addImportedEntries(final LibraryTab panel, final ParserResult parserResult) {
-        BackgroundTask<ParserResult> task = BackgroundTask.wrap(() -> parserResult);
-        ImportCleanup cleanup = ImportCleanup.targeting(panel.getBibDatabaseContext().getMode());
+    private void addImportedEntries(
+        final LibraryTab panel,
+        final ParserResult parserResult
+    ) {
+        BackgroundTask<ParserResult> task = BackgroundTask.wrap(() ->
+            parserResult
+        );
+        ImportCleanup cleanup = ImportCleanup.targeting(
+            panel.getBibDatabaseContext().getMode()
+        );
         cleanup.doPostCleanup(parserResult.getDatabase().getEntries());
-        ImportEntriesDialog dialog = new ImportEntriesDialog(panel.getBibDatabaseContext(), task);
+        ImportEntriesDialog dialog = new ImportEntriesDialog(
+            panel.getBibDatabaseContext(),
+            task
+        );
         dialog.setTitle(Localization.lang("Import"));
         dialogService.showCustomDialogAndWait(dialog);
     }
@@ -810,20 +1173,35 @@ public FileHistoryMenu getFileHistory() {
      * @return <code>true</code> if the user choose to close the database
      */
     private boolean confirmClose(LibraryTab libraryTab) {
-        String filename = libraryTab.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,
+        String filename = libraryTab
+            .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);
+                saveChanges,
+                discardChanges,
+                returnToLibrary
+            );
 
         if (response.isEmpty()) {
             return true;
@@ -837,22 +1215,39 @@ private boolean confirmClose(LibraryTab libraryTab) {
 
         if (buttonType.equals(saveChanges)) {
             try {
-                SaveDatabaseAction saveAction = new SaveDatabaseAction(libraryTab, dialogService, prefs, Globals.entryTypesManager);
+                SaveDatabaseAction saveAction = new SaveDatabaseAction(
+                    libraryTab,
+                    dialogService,
+                    prefs,
+                    Globals.entryTypesManager
+                );
                 if (saveAction.save()) {
                     return true;
                 }
                 // The action was either canceled or unsuccessful.
-                dialogService.notify(Localization.lang("Unable to save library"));
+                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);
+                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
+                );
             }
             // Save was cancelled or an error occurred.
             return false;
         }
 
         if (buttonType.equals(discardChanges)) {
-            BackupManager.discardBackup(libraryTab.getBibDatabaseContext(), prefs.getFilePreferences().getBackupDirectory());
+            BackupManager.discardBackup(
+                libraryTab.getBibDatabaseContext(),
+                prefs.getFilePreferences().getBackupDirectory()
+            );
             return true;
         }
 
@@ -867,7 +1262,10 @@ public void closeTab(LibraryTab libraryTab) {
 
         final BibDatabaseContext context = libraryTab.getBibDatabaseContext();
 
-        if (libraryTab.isModified() && (context.getLocation() == DatabaseLocation.LOCAL)) {
+        if (
+            libraryTab.isModified() &&
+            (context.getLocation() == DatabaseLocation.LOCAL)
+        ) {
             if (confirmClose(libraryTab)) {
                 removeTab(libraryTab);
             } else {
@@ -882,7 +1280,11 @@ public void closeTab(LibraryTab libraryTab) {
             removeTab(libraryTab);
         }
         AutosaveManager.shutdown(context);
-        BackupManager.shutdown(context, prefs.getFilePreferences().getBackupDirectory(), prefs.getFilePreferences().shouldCreateBackup());
+        BackupManager.shutdown(
+            context,
+            prefs.getFilePreferences().getBackupDirectory(),
+            prefs.getFilePreferences().shouldCreateBackup()
+        );
     }
 
     private void removeTab(LibraryTab libraryTab) {
@@ -898,14 +1300,15 @@ public void closeCurrentTab() {
 
     public OpenDatabaseAction getOpenDatabaseAction() {
         return new OpenDatabaseAction(
-                this,
-                prefs,
-                dialogService,
-                stateManager,
-                fileUpdateMonitor,
-                entryTypesManager,
-                undoManager,
-                taskExecutor);
+            this,
+            prefs,
+            dialogService,
+            stateManager,
+            fileUpdateMonitor,
+            entryTypesManager,
+            undoManager,
+            taskExecutor
+        );
     }
 
     public GlobalSearchBar getGlobalSearchBar() {
@@ -920,14 +1323,22 @@ public DialogService getDialogService() {
         return dialogService;
     }
 
-    private void copyGroupTreeNode(LibraryTab destinationLibraryTab, GroupTreeNode parent, GroupTreeNode groupTreeNodeToCopy) {
+    private void copyGroupTreeNode(
+        LibraryTab destinationLibraryTab,
+        GroupTreeNode parent,
+        GroupTreeNode groupTreeNodeToCopy
+    ) {
         List<BibEntry> allEntries = getCurrentLibraryTab()
-                .getBibDatabaseContext()
-                .getEntries();
+            .getBibDatabaseContext()
+            .getEntries();
         // add groupTreeNodeToCopy to the parent-- in the first run that will the source/main GroupTreeNode
-        GroupTreeNode copiedNode = parent.addSubgroup(groupTreeNodeToCopy.copyNode().getGroup());
+        GroupTreeNode copiedNode = parent.addSubgroup(
+            groupTreeNodeToCopy.copyNode().getGroup()
+        );
         // add all entries of a groupTreeNode to the new library.
-        destinationLibraryTab.dropEntry(groupTreeNodeToCopy.getEntriesInGroup(allEntries));
+        destinationLibraryTab.dropEntry(
+            groupTreeNodeToCopy.getEntriesInGroup(allEntries)
+        );
         // List of all children of groupTreeNodeToCopy
         List<GroupTreeNode> children = groupTreeNodeToCopy.getChildren();
 
@@ -940,20 +1351,28 @@ private void copyGroupTreeNode(LibraryTab destinationLibraryTab, GroupTreeNode p
     }
 
     private void copyRootNode(LibraryTab destinationLibraryTab) {
-        if (!destinationLibraryTab.getBibDatabaseContext().getMetaData().getGroups().isEmpty()) {
+        if (
+            !destinationLibraryTab
+                .getBibDatabaseContext()
+                .getMetaData()
+                .getGroups()
+                .isEmpty()
+        ) {
             return;
         }
         // a root (all entries) GroupTreeNode
-        GroupTreeNode currentLibraryGroupRoot = getCurrentLibraryTab().getBibDatabaseContext()
-                                                                      .getMetaData()
-                                                                      .getGroups()
-                                                                      .get()
-                                                                      .copyNode();
+        GroupTreeNode currentLibraryGroupRoot = getCurrentLibraryTab()
+            .getBibDatabaseContext()
+            .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);
     }
 
     public Stage getMainStage() {
@@ -963,7 +1382,7 @@ public Stage getMainStage() {
     /**
      * The action concerned with closing the window.
      */
-    static protected class CloseAction extends SimpleCommand {
+    protected static class CloseAction extends SimpleCommand {
 
         private final JabRefFrame frame;
 
@@ -977,12 +1396,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) {
+        public CloseDatabaseAction(
+            LibraryTabContainer tabContainer,
+            LibraryTab libraryTab
+        ) {
             this.tabContainer = tabContainer;
             this.libraryTab = libraryTab;
         }
@@ -1035,19 +1457,28 @@ private class OpenDatabaseFolder extends SimpleCommand {
 
         private final Supplier<BibDatabaseContext> databaseContext;
 
-        public OpenDatabaseFolder(Supplier<BibDatabaseContext> databaseContext) {
+        public OpenDatabaseFolder(
+            Supplier<BibDatabaseContext> databaseContext
+        ) {
             this.databaseContext = databaseContext;
         }
 
         @Override
         public void execute() {
-            Optional.of(databaseContext.get()).flatMap(BibDatabaseContext::getDatabasePath).ifPresent(path -> {
-                try {
-                    JabRefDesktop.openFolderAndSelectFile(path, prefs.getExternalApplicationsPreferences(), dialogService);
-                } catch (IOException e) {
-                    LOGGER.info("Could not open folder", e);
-                }
-            });
+            Optional
+                .of(databaseContext.get())
+                .flatMap(BibDatabaseContext::getDatabasePath)
+                .ifPresent(path -> {
+                    try {
+                        JabRefDesktop.openFolderAndSelectFile(
+                            path,
+                            prefs.getExternalApplicationsPreferences(),
+                            dialogService
+                        );
+                    } catch (IOException e) {
+                        LOGGER.info("Could not open folder", e);
+                    }
+                });
         }
     }
 
@@ -1056,7 +1487,8 @@ private class UndoRedoEventManager {
         @Subscribe
         public void listen(UndoRedoEvent event) {
             updateTexts(event);
-            JabRefFrame.this.getCurrentLibraryTab().updateEntryEditorIfShowing();
+            JabRefFrame.this.getCurrentLibraryTab()
+                .updateEntryEditorIfShowing();
         }
 
         @Subscribe
diff --git a/src/main/java/org/jabref/gui/JabRefGUI.java b/src/main/java/org/jabref/gui/JabRefGUI.java
index 9a402703619..edb12998b51 100644
--- a/src/main/java/org/jabref/gui/JabRefGUI.java
+++ b/src/main/java/org/jabref/gui/JabRefGUI.java
@@ -1,18 +1,19 @@
 package org.jabref.gui;
 
+import com.airhacks.afterburner.injection.Injector;
+import com.tobiasdiez.easybind.EasyBind;
+import impl.org.controlsfx.skin.DecorationPane;
 import java.nio.file.Path;
 import java.sql.SQLException;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Optional;
 import java.util.stream.Collectors;
-
 import javafx.application.Platform;
 import javafx.scene.Scene;
 import javafx.scene.input.KeyEvent;
 import javafx.stage.Screen;
 import javafx.stage.Stage;
-
 import org.jabref.gui.help.VersionWorker;
 import org.jabref.gui.icon.IconTheme;
 import org.jabref.gui.importer.ParserResultWarningDialog;
@@ -29,16 +30,14 @@
 import org.jabref.model.util.FileUpdateMonitor;
 import org.jabref.preferences.GuiPreferences;
 import org.jabref.preferences.PreferencesService;
-
-import com.airhacks.afterburner.injection.Injector;
-import com.tobiasdiez.easybind.EasyBind;
-import impl.org.controlsfx.skin.DecorationPane;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 public class JabRefGUI {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(JabRefGUI.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(
+        JabRefGUI.class
+    );
 
     private static JabRefFrame mainFrame;
     private final PreferencesService preferencesService;
@@ -50,11 +49,13 @@ public class JabRefGUI {
     private final List<ParserResult> failed = new ArrayList<>();
     private final List<ParserResult> toOpenTab = new ArrayList<>();
 
-    public JabRefGUI(Stage mainStage,
-                     List<ParserResult> databases,
-                     boolean isBlank,
-                     PreferencesService preferencesService,
-                     FileUpdateMonitor fileUpdateMonitor) {
+    public JabRefGUI(
+        Stage mainStage,
+        List<ParserResult> databases,
+        boolean isBlank,
+        PreferencesService preferencesService,
+        FileUpdateMonitor fileUpdateMonitor
+    ) {
         this.parserResults = databases;
         this.isBlank = isBlank;
         this.preferencesService = preferencesService;
@@ -67,39 +68,57 @@ public JabRefGUI(Stage mainStage,
 
         openWindow(mainStage);
 
-        EasyBind.subscribe(preferencesService.getInternalPreferences().versionCheckEnabledProperty(), enabled -> {
-            if (enabled) {
-                new VersionWorker(Globals.BUILD_INFO.version,
+        EasyBind.subscribe(
+            preferencesService
+                .getInternalPreferences()
+                .versionCheckEnabledProperty(),
+            enabled -> {
+                if (enabled) {
+                    new VersionWorker(
+                        Globals.BUILD_INFO.version,
                         mainFrame.getDialogService(),
                         Globals.TASK_EXECUTOR,
-                        preferencesService)
+                        preferencesService
+                    )
                         .checkForNewVersionDelayed();
+                }
             }
-        });
+        );
 
         setupProxy();
     }
 
     private void setupProxy() {
-        if (!preferencesService.getProxyPreferences().shouldUseProxy()
-                || !preferencesService.getProxyPreferences().shouldUseAuthentication()) {
+        if (
+            !preferencesService.getProxyPreferences().shouldUseProxy() ||
+            !preferencesService.getProxyPreferences().shouldUseAuthentication()
+        ) {
             return;
         }
 
-        if (preferencesService.getProxyPreferences().shouldPersistPassword()
-                && StringUtil.isNotBlank(preferencesService.getProxyPreferences().getPassword())) {
+        if (
+            preferencesService.getProxyPreferences().shouldPersistPassword() &&
+            StringUtil.isNotBlank(
+                preferencesService.getProxyPreferences().getPassword()
+            )
+        ) {
             ProxyRegisterer.register(preferencesService.getProxyPreferences());
             return;
         }
 
-        DialogService dialogService = Injector.instantiateModelOrService(DialogService.class);
+        DialogService dialogService = Injector.instantiateModelOrService(
+            DialogService.class
+        );
         Optional<String> password = dialogService.showPasswordDialogAndWait(
-                Localization.lang("Proxy configuration"),
-                Localization.lang("Proxy requires password"),
-                Localization.lang("Password"));
+            Localization.lang("Proxy configuration"),
+            Localization.lang("Proxy requires password"),
+            Localization.lang("Password")
+        );
 
         if (password.isPresent()) {
-            preferencesService.getProxyPreferences().setPassword(password.get());
+            preferencesService
+                .getProxyPreferences()
+                .setPassword(password.get());
             ProxyRegisterer.register(preferencesService.getProxyPreferences());
         } else {
             LOGGER.warn("No proxy password specified");
@@ -123,7 +142,9 @@ private void openWindow(Stage mainStage) {
         if (guiPreferences.isWindowMaximised()) {
             mainStage.setMaximized(true);
         }
-        if ((Screen.getScreens().size() == 1) && isWindowPositionOutOfBounds()) {
+        if (
+            (Screen.getScreens().size() == 1) && isWindowPositionOutOfBounds()
+        ) {
             // corrects the Window, if it is outside the mainscreen
             LOGGER.debug("The Jabref window is outside the main screen");
             mainStage.setX(0);
@@ -148,7 +169,10 @@ private void openWindow(Stage mainStage) {
         Globals.getThemeManager().installCss(scene);
 
         // Handle TextEditor key bindings
-        scene.addEventFilter(KeyEvent.KEY_PRESSED, event -> TextInputKeyBindings.call(scene, event));
+        scene.addEventFilter(
+            KeyEvent.KEY_PRESSED,
+            event -> TextInputKeyBindings.call(scene, event)
+        );
 
         mainStage.setTitle(JabRefFrame.FRAME_TITLE);
         mainStage.getIcons().addAll(IconTheme.getLogoSetFX());
@@ -169,10 +193,15 @@ private void openWindow(Stage mainStage) {
         Platform.runLater(this::openDatabases);
 
         if (!(fileUpdateMonitor.isActive())) {
-            getMainFrame().getDialogService()
-                          .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."));
+            getMainFrame()
+                .getDialogService()
+                .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."
+                    )
+                );
         }
     }
 
@@ -181,57 +210,71 @@ private void openWindow(Stage mainStage) {
      */
     private void openDatabases() {
         // If the option is enabled, open the last edited libraries, if any.
-        if (!isBlank && preferencesService.getWorkspacePreferences().shouldOpenLastEdited()) {
+        if (
+            !isBlank &&
+            preferencesService.getWorkspacePreferences().shouldOpenLastEdited()
+        ) {
             openLastEditedDatabases();
         }
 
         // From here on, the libraries provided by command line arguments are treated
 
         // Remove invalid databases
-        List<ParserResult> invalidDatabases = parserResults.stream()
-                                                           .filter(ParserResult::isInvalid)
-                                                           .toList();
+        List<ParserResult> invalidDatabases = parserResults
+            .stream()
+            .filter(ParserResult::isInvalid)
+            .toList();
         failed.addAll(invalidDatabases);
         parserResults.removeAll(invalidDatabases);
 
         // passed file (we take the first one) should be focused
-        Path focusedFile = parserResults.stream()
-                                        .findFirst()
-                                        .flatMap(ParserResult::getPath)
-                                        .orElse(preferencesService.getGuiPreferences()
-                                                                 .getLastFocusedFile())
-                                        .toAbsolutePath();
+        Path focusedFile = parserResults
+            .stream()
+            .findFirst()
+            .flatMap(ParserResult::getPath)
+            .orElse(preferencesService.getGuiPreferences().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;
             }
 
             if (parserResult.getDatabase().isShared()) {
                 try {
                     OpenDatabaseAction.openSharedDatabase(
-                            parserResult,
-                            mainFrame,
-                            mainFrame.getDialogService(),
-                            preferencesService,
-                            Globals.stateManager,
-                            Globals.entryTypesManager,
-                            fileUpdateMonitor,
-                            mainFrame.getUndoManager(),
-                            Globals.TASK_EXECUTOR);
-                } catch (SQLException |
-                        DatabaseNotSupportedException |
-                        InvalidDBMSConnectionPropertiesException |
-                        NotASharedDatabaseException e) {
-
+                        parserResult,
+                        mainFrame,
+                        mainFrame.getDialogService(),
+                        preferencesService,
+                        Globals.stateManager,
+                        Globals.entryTypesManager,
+                        fileUpdateMonitor,
+                        mainFrame.getUndoManager(),
+                        Globals.TASK_EXECUTOR
+                    );
+                } catch (
+                    SQLException
+                    | DatabaseNotSupportedException
+                    | InvalidDBMSConnectionPropertiesException
+                    | NotASharedDatabaseException e
+                ) {
                     LOGGER.error("Connection error", e);
-                    mainFrame.getDialogService().showErrorDialogAndWait(
+                    mainFrame
+                        .getDialogService()
+                        .showErrorDialogAndWait(
                             Localization.lang("Connection error"),
                             Localization.lang("A local copy will be opened."),
-                            e);
+                            e
+                        );
                     toOpenTab.add(parserResult);
                 }
             } else if (parserResult.toOpenTab()) {
@@ -251,17 +294,33 @@ private void openDatabases() {
         }
 
         for (ParserResult pr : failed) {
-            String message = Localization.lang("Error opening file '%0'",
-                    pr.getPath().map(Path::toString).orElse("(File name unknown)")) + "\n" +
-                    pr.getErrorMessage();
-
-            mainFrame.getDialogService().showErrorDialogAndWait(Localization.lang("Error opening file"), message);
+            String message =
+                Localization.lang(
+                    "Error opening file '%0'",
+                    pr
+                        .getPath()
+                        .map(Path::toString)
+                        .orElse("(File name unknown)")
+                ) +
+                "\n" +
+                pr.getErrorMessage();
+
+            mainFrame
+                .getDialogService()
+                .showErrorDialogAndWait(
+                    Localization.lang("Error opening file"),
+                    message
+                );
         }
 
         // Display warnings, if any
         int tabNumber = 0;
         for (ParserResult pr : parserResults) {
-            ParserResultWarningDialog.showParserResultWarningDialog(pr, mainFrame, tabNumber++);
+            ParserResultWarningDialog.showParserResultWarningDialog(
+                pr,
+                mainFrame,
+                tabNumber++
+            );
         }
 
         // After adding the databases, go through each and see if
@@ -273,7 +332,11 @@ private void openDatabases() {
         // This is because importToOpen might have been used, which adds to
         // loadedDatabases, but not to getBasePanelCount()
 
-        for (int i = 0; (i < parserResults.size()) && (i < mainFrame.getBasePanelCount()); i++) {
+        for (
+            int i = 0;
+            (i < parserResults.size()) && (i < mainFrame.getBasePanelCount());
+            i++
+        ) {
             ParserResult pr = parserResults.get(i);
             LibraryTab libraryTab = mainFrame.getLibraryTabAt(i);
 
@@ -301,12 +364,23 @@ private void saveWindowState(Stage mainStage) {
      */
     private void debugLogWindowState(Stage mainStage) {
         if (LOGGER.isDebugEnabled()) {
-            String debugLogString = "SCREEN DATA:" +
-                    "mainStage.WINDOW_MAXIMISED: " + mainStage.isMaximized() + "\n" +
-                    "mainStage.POS_X: " + mainStage.getX() + "\n" +
-                    "mainStage.POS_Y: " + mainStage.getY() + "\n" +
-                    "mainStage.SIZE_X: " + mainStage.getWidth() + "\n" +
-                    "mainStages.SIZE_Y: " + mainStage.getHeight() + "\n";
+            String debugLogString =
+                "SCREEN DATA:" +
+                "mainStage.WINDOW_MAXIMISED: " +
+                mainStage.isMaximized() +
+                "\n" +
+                "mainStage.POS_X: " +
+                mainStage.getX() +
+                "\n" +
+                "mainStage.POS_Y: " +
+                mainStage.getY() +
+                "\n" +
+                "mainStage.SIZE_X: " +
+                mainStage.getWidth() +
+                "\n" +
+                "mainStages.SIZE_Y: " +
+                mainStage.getHeight() +
+                "\n";
             LOGGER.debug(debugLogString);
         }
     }
@@ -317,18 +391,27 @@ private void debugLogWindowState(Stage mainStage) {
      * @return outbounds
      */
     private boolean isWindowPositionOutOfBounds() {
-        return !Screen.getPrimary().getBounds().contains(
+        return !Screen
+            .getPrimary()
+            .getBounds()
+            .contains(
                 preferencesService.getGuiPreferences().getPositionX(),
-                preferencesService.getGuiPreferences().getPositionY());
+                preferencesService.getGuiPreferences().getPositionY()
+            );
     }
 
     private void openLastEditedDatabases() {
-        List<String> lastFiles = preferencesService.getGuiPreferences().getLastFilesOpened();
+        List<String> lastFiles = preferencesService
+            .getGuiPreferences()
+            .getLastFilesOpened();
         if (lastFiles.isEmpty()) {
             return;
         }
 
-        List<Path> filesToOpen = lastFiles.stream().map(Path::of).collect(Collectors.toList());
+        List<Path> filesToOpen = lastFiles
+            .stream()
+            .map(Path::of)
+            .collect(Collectors.toList());
         getMainFrame().getOpenDatabaseAction().openFiles(filesToOpen);
     }
 
diff --git a/src/main/java/org/jabref/gui/LibraryTab.java b/src/main/java/org/jabref/gui/LibraryTab.java
index 137a9548678..7150264d135 100644
--- a/src/main/java/org/jabref/gui/LibraryTab.java
+++ b/src/main/java/org/jabref/gui/LibraryTab.java
@@ -1,5 +1,8 @@
 package org.jabref.gui;
 
+import com.google.common.eventbus.Subscribe;
+import com.tobiasdiez.easybind.EasyBind;
+import com.tobiasdiez.easybind.Subscription;
 import java.io.IOException;
 import java.nio.file.Path;
 import java.util.ArrayList;
@@ -8,9 +11,6 @@
 import java.util.Objects;
 import java.util.Optional;
 import java.util.Random;
-
-import javax.swing.undo.UndoManager;
-
 import javafx.animation.PauseTransition;
 import javafx.application.Platform;
 import javafx.beans.property.BooleanProperty;
@@ -24,7 +24,9 @@
 import javafx.scene.control.Tooltip;
 import javafx.scene.layout.BorderPane;
 import javafx.util.Duration;
-
+import javax.swing.undo.UndoManager;
+import org.controlsfx.control.NotificationPane;
+import org.controlsfx.control.action.Action;
 import org.jabref.gui.autocompleter.AutoCompletePreferences;
 import org.jabref.gui.autocompleter.PersonNameSuggestionProvider;
 import org.jabref.gui.autocompleter.SuggestionProviders;
@@ -72,18 +74,14 @@
 import org.jabref.model.entry.field.StandardField;
 import org.jabref.model.util.FileUpdateMonitor;
 import org.jabref.preferences.PreferencesService;
-
-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;
 
 public class LibraryTab extends Tab {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(LibraryTab.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(
+        LibraryTab.class
+    );
     private final JabRefFrame frame;
     private final CountingUndoManager undoManager;
     private final DialogService dialogService;
@@ -91,8 +89,11 @@ public class LibraryTab extends Tab {
     private final FileUpdateMonitor fileUpdateMonitor;
     private final StateManager stateManager;
     private final BibEntryTypesManager entryTypesManager;
-    private final BooleanProperty changedProperty = new SimpleBooleanProperty(false);
-    private final BooleanProperty nonUndoableChangeProperty = new SimpleBooleanProperty(false);
+    private final BooleanProperty changedProperty = new SimpleBooleanProperty(
+        false
+    );
+    private final BooleanProperty nonUndoableChangeProperty =
+        new SimpleBooleanProperty(false);
 
     private BibDatabaseContext bibDatabaseContext;
     private MainTableDataModel tableModel;
@@ -111,7 +112,7 @@ public class LibraryTab extends Tab {
 
     private SuggestionProviders suggestionProviders;
 
-    @SuppressWarnings({"FieldCanBeLocal"})
+    @SuppressWarnings({ "FieldCanBeLocal" })
     private Subscription dividerPositionSubscription;
 
     // the query the user searches when this BasePanel is active
@@ -124,15 +125,17 @@ public class LibraryTab extends Tab {
     private final IndexingTaskManager indexingTaskManager;
     private final TaskExecutor taskExecutor;
 
-    public LibraryTab(BibDatabaseContext bibDatabaseContext,
-                      JabRefFrame frame,
-                      DialogService dialogService,
-                      PreferencesService preferencesService,
-                      StateManager stateManager,
-                      FileUpdateMonitor fileUpdateMonitor,
-                      BibEntryTypesManager entryTypesManager,
-                      CountingUndoManager undoManager,
-                      TaskExecutor taskExecutor) {
+    public LibraryTab(
+        BibDatabaseContext bibDatabaseContext,
+        JabRefFrame frame,
+        DialogService dialogService,
+        PreferencesService preferencesService,
+        StateManager stateManager,
+        FileUpdateMonitor fileUpdateMonitor,
+        BibEntryTypesManager entryTypesManager,
+        CountingUndoManager undoManager,
+        TaskExecutor taskExecutor
+    ) {
         this.frame = Objects.requireNonNull(frame);
         this.bibDatabaseContext = Objects.requireNonNull(bibDatabaseContext);
         this.undoManager = undoManager;
@@ -147,10 +150,19 @@ public LibraryTab(BibDatabaseContext bibDatabaseContext,
         bibDatabaseContext.getDatabase().registerListener(this);
         bibDatabaseContext.getMetaData().registerListener(this);
 
-        this.tableModel = new MainTableDataModel(getBibDatabaseContext(), preferencesService, stateManager);
+        this.tableModel =
+            new MainTableDataModel(
+                getBibDatabaseContext(),
+                preferencesService,
+                stateManager
+            );
 
         citationStyleCache = new CitationStyleCache(bibDatabaseContext);
-        annotationCache = new FileAnnotationCache(bibDatabaseContext, preferencesService.getFilePreferences());
+        annotationCache =
+            new FileAnnotationCache(
+                bibDatabaseContext,
+                preferencesService.getFilePreferences()
+            );
 
         setupMainPanel();
         setupAutoCompletion();
@@ -159,11 +171,13 @@ public LibraryTab(BibDatabaseContext bibDatabaseContext,
         this.getDatabase().registerListener(new EntriesRemovedListener());
 
         // ensure that at each addition of a new entry, the entry is added to the groups interface
-        this.bibDatabaseContext.getDatabase().registerListener(new GroupTreeListener());
+        this.bibDatabaseContext.getDatabase()
+            .registerListener(new GroupTreeListener());
         // ensure that all entry changes mark the panel as changed
         this.bibDatabaseContext.getDatabase().registerListener(this);
 
-        this.getDatabase().registerListener(new UpdateTimestampListener(preferencesService));
+        this.getDatabase()
+            .registerListener(new UpdateTimestampListener(preferencesService));
 
         this.entryEditor = new EntryEditor(this);
 
@@ -173,30 +187,48 @@ public LibraryTab(BibDatabaseContext bibDatabaseContext,
 
         Platform.runLater(() -> {
             EasyBind.subscribe(changedProperty, this::updateTabTitle);
-            stateManager.getOpenDatabases().addListener((ListChangeListener<BibDatabaseContext>) c ->
-                    updateTabTitle(changedProperty.getValue()));
+            stateManager
+                .getOpenDatabases()
+                .addListener(
+                    (ListChangeListener<BibDatabaseContext>) c ->
+                        updateTabTitle(changedProperty.getValue())
+                );
         });
     }
 
-    private static void addChangedInformation(StringBuilder text, String fileName) {
+    private static void addChangedInformation(
+        StringBuilder text,
+        String fileName
+    ) {
         text.append("\n");
         text.append(Localization.lang("Library '%0' has changed.", fileName));
     }
 
-    private static void addModeInfo(StringBuilder text, BibDatabaseContext bibDatabaseContext) {
+    private static void addModeInfo(
+        StringBuilder text,
+        BibDatabaseContext bibDatabaseContext
+    ) {
         String mode = bibDatabaseContext.getMode().getFormattedName();
-        String modeInfo = String.format("\n%s", Localization.lang("%0 mode", mode));
+        String modeInfo = String.format(
+            "\n%s",
+            Localization.lang("%0 mode", mode)
+        );
         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"));
         text.append("]");
     }
 
-    public void setDataLoadingTask(BackgroundTask<ParserResult> dataLoadingTask) {
+    public void setDataLoadingTask(
+        BackgroundTask<ParserResult> dataLoadingTask
+    ) {
         this.dataLoadingTask = dataLoadingTask;
     }
 
@@ -210,7 +242,9 @@ public void cancelLoading() {
      * The layout to display in the tab when it's loading
      */
     public Node createLoadingAnimationLayout() {
-        ProgressIndicator progressIndicator = new ProgressIndicator(ProgressIndicator.INDETERMINATE_PROGRESS);
+        ProgressIndicator progressIndicator = new ProgressIndicator(
+            ProgressIndicator.INDETERMINATE_PROGRESS
+        );
         BorderPane pane = new BorderPane();
         pane.setCenter(progressIndicator);
 
@@ -229,9 +263,19 @@ public void onDatabaseLoadingSucceed(ParserResult result) {
 
         feedData(context);
 
-        if (preferencesService.getFilePreferences().shouldFulltextIndexLinkedFiles()) {
+        if (
+            preferencesService
+                .getFilePreferences()
+                .shouldFulltextIndexLinkedFiles()
+        ) {
             try {
-                indexingTaskManager.updateIndex(PdfIndexer.of(bibDatabaseContext, preferencesService.getFilePreferences()), bibDatabaseContext);
+                indexingTaskManager.updateIndex(
+                    PdfIndexer.of(
+                        bibDatabaseContext,
+                        preferencesService.getFilePreferences()
+                    ),
+                    bibDatabaseContext
+                );
             } catch (IOException e) {
                 LOGGER.error("Cannot access lucene index", e);
             }
@@ -240,15 +284,27 @@ public void onDatabaseLoadingSucceed(ParserResult result) {
 
     public void onDatabaseLoadingFailed(Exception ex) {
         String title = Localization.lang("Connection error");
-        String content = String.format("%s\n\n%s", ex.getMessage(), Localization.lang("A local copy will be opened."));
+        String content = String.format(
+            "%s\n\n%s",
+            ex.getMessage(),
+            Localization.lang("A local copy will be opened.")
+        );
 
         dialogService.showErrorDialogAndWait(title, content, ex);
     }
 
-    public void feedData(BibDatabaseContext bibDatabaseContextFromParserResult) {
+    public void feedData(
+        BibDatabaseContext bibDatabaseContextFromParserResult
+    ) {
         cleanUp();
 
-        if (this.getTabPane().getSelectionModel().selectedItemProperty().get().equals(this)) {
+        if (
+            this.getTabPane()
+                .getSelectionModel()
+                .selectedItemProperty()
+                .get()
+                .equals(this)
+        ) {
             // If you open an existing library, a library tab with a loading animation is added immediately.
             // At that point, the library tab is given a temporary bibDatabaseContext with no entries.
             // This line is necessary because, while there is already a binding that updates the active database when a new tab is added,
@@ -258,19 +314,38 @@ public void feedData(BibDatabaseContext bibDatabaseContextFromParserResult) {
         }
 
         // 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(bibDatabaseContextFromParserResult);
+        Optional<BibDatabaseContext> foundExistingBibDatabase = stateManager
+            .getOpenDatabases()
+            .stream()
+            .filter(databaseContext ->
+                databaseContext.equals(this.bibDatabaseContext)
+            )
+            .findFirst();
+        foundExistingBibDatabase.ifPresent(databaseContext ->
+            stateManager.getOpenDatabases().remove(databaseContext)
+        );
+
+        this.bibDatabaseContext =
+            Objects.requireNonNull(bibDatabaseContextFromParserResult);
 
         stateManager.getOpenDatabases().add(bibDatabaseContextFromParserResult);
 
         bibDatabaseContextFromParserResult.getDatabase().registerListener(this);
         bibDatabaseContextFromParserResult.getMetaData().registerListener(this);
 
-        this.tableModel = new MainTableDataModel(getBibDatabaseContext(), preferencesService, stateManager);
-        citationStyleCache = new CitationStyleCache(bibDatabaseContextFromParserResult);
-        annotationCache = new FileAnnotationCache(bibDatabaseContextFromParserResult, preferencesService.getFilePreferences());
+        this.tableModel =
+            new MainTableDataModel(
+                getBibDatabaseContext(),
+                preferencesService,
+                stateManager
+            );
+        citationStyleCache =
+            new CitationStyleCache(bibDatabaseContextFromParserResult);
+        annotationCache =
+            new FileAnnotationCache(
+                bibDatabaseContextFromParserResult,
+                preferencesService.getFilePreferences()
+            );
 
         setupMainPanel();
         setupAutoCompletion();
@@ -278,18 +353,24 @@ public void feedData(BibDatabaseContext bibDatabaseContextFromParserResult) {
         this.getDatabase().registerListener(new EntriesRemovedListener());
 
         // ensure that at each addition of a new entry, the entry is added to the groups interface
-        this.bibDatabaseContext.getDatabase().registerListener(new GroupTreeListener());
+        this.bibDatabaseContext.getDatabase()
+            .registerListener(new GroupTreeListener());
         // ensure that all entry changes mark the panel as changed
         this.bibDatabaseContext.getDatabase().registerListener(this);
 
-        this.getDatabase().registerListener(new UpdateTimestampListener(preferencesService));
+        this.getDatabase()
+            .registerListener(new UpdateTimestampListener(preferencesService));
 
         this.entryEditor = new EntryEditor(this);
 
         Platform.runLater(() -> {
             EasyBind.subscribe(changedProperty, this::updateTabTitle);
-            stateManager.getOpenDatabases().addListener((ListChangeListener<BibDatabaseContext>) c ->
-                    updateTabTitle(changedProperty.getValue()));
+            stateManager
+                .getOpenDatabases()
+                .addListener(
+                    (ListChangeListener<BibDatabaseContext>) c ->
+                        updateTabTitle(changedProperty.getValue())
+                );
         });
 
         installAutosaveManagerAndBackupManager();
@@ -297,23 +378,47 @@ public void feedData(BibDatabaseContext bibDatabaseContextFromParserResult) {
 
     public void installAutosaveManagerAndBackupManager() {
         if (isDatabaseReadyForAutoSave(bibDatabaseContext)) {
-            AutosaveManager autosaveManager = AutosaveManager.start(bibDatabaseContext);
-            autosaveManager.registerListener(new AutosaveUiManager(this, dialogService, preferencesService, entryTypesManager));
+            AutosaveManager autosaveManager = AutosaveManager.start(
+                bibDatabaseContext
+            );
+            autosaveManager.registerListener(
+                new AutosaveUiManager(
+                    this,
+                    dialogService,
+                    preferencesService,
+                    entryTypesManager
+                )
+            );
         }
-        if (isDatabaseReadyForBackup(bibDatabaseContext) && preferencesService.getFilePreferences().shouldCreateBackup()) {
-            BackupManager.start(this, bibDatabaseContext, Globals.entryTypesManager, preferencesService);
+        if (
+            isDatabaseReadyForBackup(bibDatabaseContext) &&
+            preferencesService.getFilePreferences().shouldCreateBackup()
+        ) {
+            BackupManager.start(
+                this,
+                bibDatabaseContext,
+                Globals.entryTypesManager,
+                preferencesService
+            );
         }
     }
 
     private boolean isDatabaseReadyForAutoSave(BibDatabaseContext context) {
-        return ((context.getLocation() == DatabaseLocation.SHARED)
-                || ((context.getLocation() == DatabaseLocation.LOCAL)
-                && preferencesService.getLibraryPreferences().shouldAutoSave()))
-                && context.getDatabasePath().isPresent();
+        return (
+            ((context.getLocation() == DatabaseLocation.SHARED) ||
+                ((context.getLocation() == DatabaseLocation.LOCAL) &&
+                    preferencesService
+                        .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()
+        );
     }
 
     /**
@@ -324,7 +429,9 @@ private boolean isDatabaseReadyForBackup(BibDatabaseContext context) {
      * Example: *jabref-authors.bib – testbib
      */
     public void updateTabTitle(boolean isChanged) {
-        boolean isAutosaveEnabled = preferencesService.getLibraryPreferences().shouldAutoSave();
+        boolean isAutosaveEnabled = preferencesService
+            .getLibraryPreferences()
+            .shouldAutoSave();
 
         DatabaseLocation databaseLocation = bibDatabaseContext.getLocation();
         Optional<Path> file = bibDatabaseContext.getDatabasePath();
@@ -360,8 +467,13 @@ public void updateTabTitle(boolean isChanged) {
             }
 
             // Unique path fragment
-            Optional<String> uniquePathPart = FileUtil.getUniquePathDirectory(stateManager.collectAllDatabasePaths(), databasePath);
-            uniquePathPart.ifPresent(part -> tabTitle.append(" \u2013 ").append(part));
+            Optional<String> uniquePathPart = FileUtil.getUniquePathDirectory(
+                stateManager.collectAllDatabasePaths(),
+                databasePath
+            );
+            uniquePathPart.ifPresent(part ->
+                tabTitle.append(" \u2013 ").append(part)
+            );
         } else {
             if (databaseLocation == DatabaseLocation.LOCAL) {
                 tabTitle.append(Localization.lang("untitled"));
@@ -376,8 +488,14 @@ public void updateTabTitle(boolean isChanged) {
                 addSharedDbInformation(toolTipText, bibDatabaseContext);
             }
             addModeInfo(toolTipText, bibDatabaseContext);
-            if ((databaseLocation == DatabaseLocation.LOCAL) && bibDatabaseContext.getDatabase().hasEntries()) {
-                addChangedInformation(toolTipText, Localization.lang("untitled"));
+            if (
+                (databaseLocation == DatabaseLocation.LOCAL) &&
+                bibDatabaseContext.getDatabase().hasEntries()
+            ) {
+                addChangedInformation(
+                    toolTipText,
+                    Localization.lang("untitled")
+                );
             }
         }
 
@@ -386,7 +504,11 @@ public void updateTabTitle(boolean isChanged) {
             setTooltip(new Tooltip(toolTipText.toString()));
         });
 
-        if (preferencesService.getFilePreferences().shouldFulltextIndexLinkedFiles()) {
+        if (
+            preferencesService
+                .getFilePreferences()
+                .shouldFulltextIndexLinkedFiles()
+        ) {
             indexingTaskManager.updateDatabaseName(tabTitle.toString());
         }
     }
@@ -437,12 +559,24 @@ private void delete(boolean cut, List<BibEntry> entries) {
             return;
         }
 
-        getUndoManager().addEdit(new UndoableRemoveEntries(bibDatabaseContext.getDatabase(), entries, cut));
+        getUndoManager()
+            .addEdit(
+                new UndoableRemoveEntries(
+                    bibDatabaseContext.getDatabase(),
+                    entries,
+                    cut
+                )
+            );
         bibDatabaseContext.getDatabase().removeEntries(entries);
         ensureNotShowingBottomPanel(entries);
 
         this.changedProperty.setValue(true);
-        dialogService.notify(formatOutputMessage(cut ? Localization.lang("Cut") : Localization.lang("Deleted"), entries.size()));
+        dialogService.notify(
+            formatOutputMessage(
+                cut ? Localization.lang("Cut") : Localization.lang("Deleted"),
+                entries.size()
+            )
+        );
 
         // prevent the main table from loosing focus
         mainTable.requestFocus();
@@ -480,14 +614,26 @@ public void insertEntries(final List<BibEntry> entries) {
             bibDatabaseContext.getDatabase().insertEntries(entries);
 
             // Set owner and timestamp
-            UpdateField.setAutomaticFields(entries,
-                    preferencesService.getOwnerPreferences(),
-                    preferencesService.getTimestampPreferences());
+            UpdateField.setAutomaticFields(
+                entries,
+                preferencesService.getOwnerPreferences(),
+                preferencesService.getTimestampPreferences()
+            );
             // Create an UndoableInsertEntries object.
-            getUndoManager().addEdit(new UndoableInsertEntries(bibDatabaseContext.getDatabase(), entries));
+            getUndoManager()
+                .addEdit(
+                    new UndoableInsertEntries(
+                        bibDatabaseContext.getDatabase(),
+                        entries
+                    )
+                );
 
             this.changedProperty.setValue(true); // The database just changed.
-            if (preferencesService.getEntryEditorPreferences().shouldOpenOnNewEntry()) {
+            if (
+                preferencesService
+                    .getEntryEditorPreferences()
+                    .shouldOpenOnNewEntry()
+            ) {
                 showAndEdit(entries.get(0));
             }
             clearAndSelect(entries.get(0));
@@ -504,7 +650,9 @@ public void editEntryAndFocusField(BibEntry entry, Field field) {
     }
 
     private void createMainTable() {
-        mainTable = new MainTable(tableModel,
+        mainTable =
+            new MainTable(
+                tableModel,
                 this,
                 bibDatabaseContext,
                 preferencesService,
@@ -514,11 +662,16 @@ private void createMainTable() {
                 Globals.getClipboardManager(),
                 entryTypesManager,
                 taskExecutor,
-                fileUpdateMonitor);
+                fileUpdateMonitor
+            );
         // 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();
+            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
@@ -539,9 +692,11 @@ public void setupMainPanel() {
 
         // 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);
+        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();
@@ -561,14 +716,24 @@ public void setupMainPanel() {
      * Set up auto completion for this database
      */
     private void setupAutoCompletion() {
-        AutoCompletePreferences autoCompletePreferences = preferencesService.getAutoCompletePreferences();
+        AutoCompletePreferences autoCompletePreferences =
+            preferencesService.getAutoCompletePreferences();
         if (autoCompletePreferences.shouldAutoComplete()) {
-            suggestionProviders = new SuggestionProviders(getDatabase(), Globals.journalAbbreviationRepository, autoCompletePreferences);
+            suggestionProviders =
+                new SuggestionProviders(
+                    getDatabase(),
+                    Globals.journalAbbreviationRepository,
+                    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 void updateSearchManager() {
@@ -597,7 +762,9 @@ public void showAndEdit(BibEntry entry) {
 
     private void showBottomPane(BasePanelMode newMode) {
         if (newMode != BasePanelMode.SHOWING_EDITOR) {
-            throw new UnsupportedOperationException("new mode not recognized: " + newMode.name());
+            throw new UnsupportedOperationException(
+                "new mode not recognized: " + newMode.name()
+            );
         }
         Node pane = entryEditor;
 
@@ -608,7 +775,9 @@ private void showBottomPane(BasePanelMode newMode) {
         }
         mode = newMode;
 
-        splitPane.setDividerPositions(preferencesService.getEntryEditorPreferences().getDividerPosition());
+        splitPane.setDividerPositions(
+            preferencesService.getEntryEditorPreferences().getDividerPosition()
+        );
     }
 
     /**
@@ -627,11 +796,19 @@ 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
+            );
     }
 
     /**
@@ -648,7 +825,10 @@ public void entryEditorClosing() {
     private void ensureNotShowingBottomPanel(List<BibEntry> entriesToCheck) {
         // This method is not able to close the bottom pane currently
 
-        if ((mode == BasePanelMode.SHOWING_EDITOR) && (entriesToCheck.contains(entryEditor.getEntry()))) {
+        if (
+            (mode == BasePanelMode.SHOWING_EDITOR) &&
+            (entriesToCheck.contains(entryEditor.getEntry()))
+        ) {
             closeBottomPane();
         }
     }
@@ -667,7 +847,9 @@ public void updateEntryEditorIfShowing() {
     public synchronized void markChangedOrUnChanged() {
         if (undoManager.hasChanged()) {
             this.changedProperty.setValue(true);
-        } else if (changedProperty.getValue() && !nonUndoableChangeProperty.getValue()) {
+        } else if (
+            changedProperty.getValue() && !nonUndoableChangeProperty.getValue()
+        ) {
             this.changedProperty.setValue(false);
         }
     }
@@ -677,24 +859,37 @@ public BibDatabase getDatabase() {
     }
 
     private boolean showDeleteConfirmationDialog(int numberOfEntries) {
-        if (preferencesService.getWorkspacePreferences().shouldConfirmDelete()) {
+        if (
+            preferencesService.getWorkspacePreferences().shouldConfirmDelete()
+        ) {
             String title = Localization.lang("Delete entry");
-            String message = Localization.lang("Really delete the selected entry?");
+            String message = Localization.lang(
+                "Really delete the selected entry?"
+            );
             String okButton = Localization.lang("Delete entry");
             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");
             }
 
-            return dialogService.showConfirmationDialogWithOptOutAndWait(title,
-                    message,
-                    okButton,
-                    cancelButton,
-                    Localization.lang("Do not ask again"),
-                    optOut -> preferencesService.getWorkspacePreferences().setConfirmDelete(!optOut));
+            return dialogService.showConfirmationDialogWithOptOutAndWait(
+                title,
+                message,
+                okButton,
+                cancelButton,
+                Localization.lang("Do not ask again"),
+                optOut ->
+                    preferencesService
+                        .getWorkspacePreferences()
+                        .setConfirmDelete(!optOut)
+            );
         } else {
             return true;
         }
@@ -705,7 +900,9 @@ private boolean showDeleteConfirmationDialog(int numberOfEntries) {
      */
     private void saveDividerLocation(Number position) {
         if (mode == BasePanelMode.SHOWING_EDITOR) {
-            preferencesService.getEntryEditorPreferences().setDividerPosition(position.doubleValue());
+            preferencesService
+                .getEntryEditorPreferences()
+                .setDividerPosition(position.doubleValue());
         }
     }
 
@@ -715,7 +912,11 @@ private void saveDividerLocation(Number position) {
     public void cleanUp() {
         changeMonitor.ifPresent(DatabaseChangeMonitor::unregister);
         AutosaveManager.shutdown(bibDatabaseContext);
-        BackupManager.shutdown(bibDatabaseContext, preferencesService.getFilePreferences().getBackupDirectory(), preferencesService.getFilePreferences().shouldCreateBackup());
+        BackupManager.shutdown(
+            bibDatabaseContext,
+            preferencesService.getFilePreferences().getBackupDirectory(),
+            preferencesService.getFilePreferences().shouldCreateBackup()
+        );
     }
 
     /**
@@ -744,7 +945,14 @@ private BibEntry getShowing() {
     }
 
     public String formatOutputMessage(String start, int count) {
-        return String.format("%s %d %s.", start, count, (count > 1 ? Localization.lang("entries") : Localization.lang("entry")));
+        return String.format(
+            "%s %d %s.",
+            start,
+            count,
+            (count > 1
+                    ? Localization.lang("entries")
+                    : Localization.lang("entry"))
+        );
     }
 
     public CountingUndoManager getUndoManager() {
@@ -762,7 +970,9 @@ public Optional<SearchQuery> getCurrentSearchQuery() {
     /**
      * Set the query the user currently searches while this basepanel is active
      */
-    public void setCurrentSearchQuery(Optional<SearchQuery> currentSearchQuery) {
+    public void setCurrentSearchQuery(
+        Optional<SearchQuery> currentSearchQuery
+    ) {
         this.currentSearchQuery = currentSearchQuery;
     }
 
@@ -776,12 +986,17 @@ public FileAnnotationCache getAnnotationCache() {
 
     public void resetChangeMonitor() {
         changeMonitor.ifPresent(DatabaseChangeMonitor::unregister);
-        changeMonitor = Optional.of(new DatabaseChangeMonitor(bibDatabaseContext,
-                fileUpdateMonitor,
-                taskExecutor,
-                dialogService,
-                preferencesService,
-                databaseNotificationPane));
+        changeMonitor =
+            Optional.of(
+                new DatabaseChangeMonitor(
+                    bibDatabaseContext,
+                    fileUpdateMonitor,
+                    taskExecutor,
+                    dialogService,
+                    preferencesService,
+                    databaseNotificationPane
+                )
+            );
     }
 
     public void copy() {
@@ -832,60 +1047,67 @@ 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,
-                                              PreferencesService preferencesService,
-                                              StateManager stateManager,
-                                              JabRefFrame frame,
-                                              FileUpdateMonitor fileUpdateMonitor,
-                                              BibEntryTypesManager entryTypesManager,
-                                              CountingUndoManager undoManager,
-                                              TaskExecutor taskExecutor) {
+    public static LibraryTab createLibraryTab(
+        BackgroundTask<ParserResult> dataLoadingTask,
+        Path file,
+        DialogService dialogService,
+        PreferencesService preferencesService,
+        StateManager stateManager,
+        JabRefFrame frame,
+        FileUpdateMonitor fileUpdateMonitor,
+        BibEntryTypesManager entryTypesManager,
+        CountingUndoManager undoManager,
+        TaskExecutor taskExecutor
+    ) {
         BibDatabaseContext context = new BibDatabaseContext();
         context.setDatabasePath(file);
 
         LibraryTab newTab = new LibraryTab(
-                context,
-                frame,
-                dialogService,
-                preferencesService,
-                stateManager,
-                fileUpdateMonitor,
-                entryTypesManager,
-                undoManager,
-                taskExecutor);
+            context,
+            frame,
+            dialogService,
+            preferencesService,
+            stateManager,
+            fileUpdateMonitor,
+            entryTypesManager,
+            undoManager,
+            taskExecutor
+        );
 
         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,
-                                              JabRefFrame frame,
-                                              DialogService dialogService,
-                                              PreferencesService preferencesService,
-                                              StateManager stateManager,
-                                              FileUpdateMonitor fileUpdateMonitor,
-                                              BibEntryTypesManager entryTypesManager,
-                                              UndoManager undoManager,
-                                              TaskExecutor taskExecutor) {
+    public static LibraryTab createLibraryTab(
+        BibDatabaseContext databaseContext,
+        JabRefFrame frame,
+        DialogService dialogService,
+        PreferencesService preferencesService,
+        StateManager stateManager,
+        FileUpdateMonitor fileUpdateMonitor,
+        BibEntryTypesManager entryTypesManager,
+        UndoManager undoManager,
+        TaskExecutor taskExecutor
+    ) {
         Objects.requireNonNull(databaseContext);
 
         LibraryTab libraryTab = new LibraryTab(
-                databaseContext,
-                frame,
-                dialogService,
-                preferencesService,
-                stateManager,
-                fileUpdateMonitor,
-                entryTypesManager,
-                (CountingUndoManager) undoManager,
-                taskExecutor);
+            databaseContext,
+            frame,
+            dialogService,
+            preferencesService,
+            stateManager,
+            fileUpdateMonitor,
+            entryTypesManager,
+            (CountingUndoManager) undoManager,
+            taskExecutor
+        );
 
         return libraryTab;
     }
@@ -895,14 +1117,26 @@ private class GroupTreeListener {
         @Subscribe
         public void listen(EntriesAddedEvent addedEntriesEvent) {
             // if the event is an undo, don't add it to the current group
-            if (addedEntriesEvent.getEntriesEventSource() == EntriesEventSource.UNDO) {
+            if (
+                addedEntriesEvent.getEntriesEventSource() ==
+                EntriesEventSource.UNDO
+            ) {
                 return;
             }
 
             // Automatically add new entries to the selected group (or set of groups)
-            if (preferencesService.getGroupsPreferences().shouldAutoAssignGroup()) {
-                stateManager.getSelectedGroup(bibDatabaseContext).forEach(
-                        selectedGroup -> selectedGroup.addEntriesToGroup(addedEntriesEvent.getBibEntries()));
+            if (
+                preferencesService
+                    .getGroupsPreferences()
+                    .shouldAutoAssignGroup()
+            ) {
+                stateManager
+                    .getSelectedGroup(bibDatabaseContext)
+                    .forEach(selectedGroup ->
+                        selectedGroup.addEntriesToGroup(
+                            addedEntriesEvent.getBibEntries()
+                        )
+                    );
             }
         }
     }
@@ -919,11 +1153,22 @@ private class IndexUpdateListener {
 
         @Subscribe
         public void listen(EntriesAddedEvent addedEntryEvent) {
-            if (preferencesService.getFilePreferences().shouldFulltextIndexLinkedFiles()) {
+            if (
+                preferencesService
+                    .getFilePreferences()
+                    .shouldFulltextIndexLinkedFiles()
+            ) {
                 try {
-                    PdfIndexer pdfIndexer = PdfIndexer.of(bibDatabaseContext, preferencesService.getFilePreferences());
+                    PdfIndexer pdfIndexer = PdfIndexer.of(
+                        bibDatabaseContext,
+                        preferencesService.getFilePreferences()
+                    );
                     for (BibEntry addedEntry : addedEntryEvent.getBibEntries()) {
-                        indexingTaskManager.addToIndex(pdfIndexer, addedEntry, bibDatabaseContext);
+                        indexingTaskManager.addToIndex(
+                            pdfIndexer,
+                            addedEntry,
+                            bibDatabaseContext
+                        );
                     }
                 } catch (IOException e) {
                     LOGGER.error("Cannot access lucene index", e);
@@ -933,11 +1178,21 @@ public void listen(EntriesAddedEvent addedEntryEvent) {
 
         @Subscribe
         public void listen(EntriesRemovedEvent removedEntriesEvent) {
-            if (preferencesService.getFilePreferences().shouldFulltextIndexLinkedFiles()) {
+            if (
+                preferencesService
+                    .getFilePreferences()
+                    .shouldFulltextIndexLinkedFiles()
+            ) {
                 try {
-                    PdfIndexer pdfIndexer = PdfIndexer.of(bibDatabaseContext, preferencesService.getFilePreferences());
+                    PdfIndexer pdfIndexer = PdfIndexer.of(
+                        bibDatabaseContext,
+                        preferencesService.getFilePreferences()
+                    );
                     for (BibEntry removedEntry : removedEntriesEvent.getBibEntries()) {
-                        indexingTaskManager.removeFromIndex(pdfIndexer, removedEntry);
+                        indexingTaskManager.removeFromIndex(
+                            pdfIndexer,
+                            removedEntry
+                        );
                     }
                 } catch (IOException e) {
                     LOGGER.error("Cannot access lucene index", e);
@@ -947,19 +1202,44 @@ public void listen(EntriesRemovedEvent removedEntriesEvent) {
 
         @Subscribe
         public void listen(FieldChangedEvent fieldChangedEvent) {
-            if (preferencesService.getFilePreferences().shouldFulltextIndexLinkedFiles()) {
+            if (
+                preferencesService
+                    .getFilePreferences()
+                    .shouldFulltextIndexLinkedFiles()
+            ) {
                 if (fieldChangedEvent.getField().equals(StandardField.FILE)) {
-                    List<LinkedFile> oldFileList = FileFieldParser.parse(fieldChangedEvent.getOldValue());
-                    List<LinkedFile> newFileList = FileFieldParser.parse(fieldChangedEvent.getNewValue());
+                    List<LinkedFile> oldFileList = FileFieldParser.parse(
+                        fieldChangedEvent.getOldValue()
+                    );
+                    List<LinkedFile> newFileList = FileFieldParser.parse(
+                        fieldChangedEvent.getNewValue()
+                    );
 
                     List<LinkedFile> addedFiles = new ArrayList<>(newFileList);
                     addedFiles.remove(oldFileList);
-                    List<LinkedFile> removedFiles = new ArrayList<>(oldFileList);
+                    List<LinkedFile> removedFiles = new ArrayList<>(
+                        oldFileList
+                    );
                     removedFiles.remove(newFileList);
 
                     try {
-                        indexingTaskManager.addToIndex(PdfIndexer.of(bibDatabaseContext, preferencesService.getFilePreferences()), fieldChangedEvent.getBibEntry(), addedFiles, bibDatabaseContext);
-                        indexingTaskManager.removeFromIndex(PdfIndexer.of(bibDatabaseContext, preferencesService.getFilePreferences()), fieldChangedEvent.getBibEntry(), removedFiles);
+                        indexingTaskManager.addToIndex(
+                            PdfIndexer.of(
+                                bibDatabaseContext,
+                                preferencesService.getFilePreferences()
+                            ),
+                            fieldChangedEvent.getBibEntry(),
+                            addedFiles,
+                            bibDatabaseContext
+                        );
+                        indexingTaskManager.removeFromIndex(
+                            PdfIndexer.of(
+                                bibDatabaseContext,
+                                preferencesService.getFilePreferences()
+                            ),
+                            fieldChangedEvent.getBibEntry(),
+                            removedFiles
+                        );
                     } catch (IOException e) {
                         LOGGER.warn("I/O error when writing lucene index", e);
                     }
@@ -973,11 +1253,17 @@ public IndexingTaskManager getIndexingTaskManager() {
     }
 
     public static class DatabaseNotification extends NotificationPane {
+
         public DatabaseNotification(Node content) {
             super(content);
         }
 
-        public void notify(Node graphic, String text, List<Action> actions, Duration duration) {
+        public void notify(
+            Node graphic,
+            String text,
+            List<Action> actions,
+            Duration duration
+        ) {
             this.setGraphic(graphic);
             this.setText(text);
             this.getActions().setAll(actions);
diff --git a/src/main/java/org/jabref/gui/LibraryTabContainer.java b/src/main/java/org/jabref/gui/LibraryTabContainer.java
index 4d3c504d503..75c266085e7 100644
--- a/src/main/java/org/jabref/gui/LibraryTabContainer.java
+++ b/src/main/java/org/jabref/gui/LibraryTabContainer.java
@@ -1,7 +1,6 @@
 package org.jabref.gui;
 
 import java.util.List;
-
 import org.jabref.model.database.BibDatabaseContext;
 
 public interface LibraryTabContainer {
diff --git a/src/main/java/org/jabref/gui/MainApplication.java b/src/main/java/org/jabref/gui/MainApplication.java
index a187843977d..f83dcc3a9a7 100644
--- a/src/main/java/org/jabref/gui/MainApplication.java
+++ b/src/main/java/org/jabref/gui/MainApplication.java
@@ -1,10 +1,8 @@
 package org.jabref.gui;
 
 import java.util.List;
-
 import javafx.application.Application;
 import javafx.stage.Stage;
-
 import org.jabref.gui.openoffice.OOBibBaseConnect;
 import org.jabref.logic.importer.ParserResult;
 import org.jabref.model.util.FileUpdateMonitor;
@@ -14,16 +12,19 @@
  * JabRef's main class to process command line options and to start the UI
  */
 public class MainApplication extends Application {
+
     private static List<ParserResult> parserResults;
     private static boolean isBlank;
     private static JabRefPreferences preferences;
     private static FileUpdateMonitor fileUpdateMonitor;
 
-    public static void main(List<ParserResult> parserResults,
-                            boolean blank,
-                            JabRefPreferences preferences,
-                            FileUpdateMonitor fileUpdateMonitor,
-                            String[] args) {
+    public static void main(
+        List<ParserResult> parserResults,
+        boolean blank,
+        JabRefPreferences preferences,
+        FileUpdateMonitor fileUpdateMonitor,
+        String[] args
+    ) {
         MainApplication.parserResults = parserResults;
         MainApplication.isBlank = blank;
         MainApplication.preferences = preferences;
@@ -35,7 +36,13 @@ public static void main(List<ParserResult> parserResults,
     public void start(Stage mainStage) {
         FallbackExceptionHandler.installExceptionHandler();
         Globals.startBackgroundTasks();
-        new JabRefGUI(mainStage, parserResults, isBlank, preferences, fileUpdateMonitor);
+        new JabRefGUI(
+            mainStage,
+            parserResults,
+            isBlank,
+            preferences,
+            fileUpdateMonitor
+        );
     }
 
     @Override
diff --git a/src/main/java/org/jabref/gui/MainMenu.java b/src/main/java/org/jabref/gui/MainMenu.java
index 28a08a31a0d..15b89537965 100644
--- a/src/main/java/org/jabref/gui/MainMenu.java
+++ b/src/main/java/org/jabref/gui/MainMenu.java
@@ -1,13 +1,11 @@
 package org.jabref.gui;
 
-import javax.swing.undo.UndoManager;
-
 import javafx.event.ActionEvent;
 import javafx.scene.control.Menu;
 import javafx.scene.control.MenuBar;
 import javafx.scene.control.MenuItem;
 import javafx.scene.control.SeparatorMenuItem;
-
+import javax.swing.undo.UndoManager;
 import org.jabref.gui.actions.ActionFactory;
 import org.jabref.gui.actions.StandardActions;
 import org.jabref.gui.auximport.NewSubLibraryAction;
@@ -73,6 +71,7 @@
 import org.jabref.preferences.PreferencesService;
 
 public class MainMenu extends MenuBar {
+
     private final JabRefFrame frame;
     private final SidePane sidePane;
     private final PushToApplicationCommand pushToApplicationCommand;
@@ -86,18 +85,20 @@ public class MainMenu extends MenuBar {
     private final UndoManager undoManager;
     private final ClipBoardManager clipBoardManager;
 
-    public MainMenu(JabRefFrame frame,
-                    SidePane sidePane,
-                    PushToApplicationCommand pushToApplicationCommand,
-                    PreferencesService preferencesService,
-                    StateManager stateManager,
-                    FileUpdateMonitor fileUpdateMonitor,
-                    TaskExecutor taskExecutor,
-                    DialogService dialogService,
-                    JournalAbbreviationRepository abbreviationRepository,
-                    BibEntryTypesManager entryTypesManager,
-                    UndoManager undoManager,
-                    ClipBoardManager clipBoardManager) {
+    public MainMenu(
+        JabRefFrame frame,
+        SidePane sidePane,
+        PushToApplicationCommand pushToApplicationCommand,
+        PreferencesService preferencesService,
+        StateManager stateManager,
+        FileUpdateMonitor fileUpdateMonitor,
+        TaskExecutor taskExecutor,
+        DialogService dialogService,
+        JournalAbbreviationRepository abbreviationRepository,
+        BibEntryTypesManager entryTypesManager,
+        UndoManager undoManager,
+        ClipBoardManager clipBoardManager
+    ) {
         this.frame = frame;
         this.sidePane = sidePane;
         this.pushToApplicationCommand = pushToApplicationCommand;
@@ -125,90 +126,356 @@ 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, preferencesService)),
-                factory.createMenuItem(StandardActions.OPEN_LIBRARY, frame.getOpenDatabaseAction()),
+        file
+            .getItems()
+            .addAll(
+                factory.createMenuItem(
+                    StandardActions.NEW_LIBRARY,
+                    new NewDatabaseAction(frame, preferencesService)
+                ),
+                factory.createMenuItem(
+                    StandardActions.OPEN_LIBRARY,
+                    frame.getOpenDatabaseAction()
+                ),
                 frame.getFileHistory(),
-                factory.createMenuItem(StandardActions.SAVE_LIBRARY, new SaveAction(SaveAction.SaveMethod.SAVE, frame, dialogService, preferencesService, stateManager)),
-                factory.createMenuItem(StandardActions.SAVE_LIBRARY_AS, new SaveAction(SaveAction.SaveMethod.SAVE_AS, frame, dialogService, preferencesService, stateManager)),
-                factory.createMenuItem(StandardActions.SAVE_ALL, new SaveAllAction(frame, preferencesService)),
-                factory.createMenuItem(StandardActions.CLOSE_LIBRARY, new JabRefFrame.CloseDatabaseAction(frame)),
-
+                factory.createMenuItem(
+                    StandardActions.SAVE_LIBRARY,
+                    new SaveAction(
+                        SaveAction.SaveMethod.SAVE,
+                        frame,
+                        dialogService,
+                        preferencesService,
+                        stateManager
+                    )
+                ),
+                factory.createMenuItem(
+                    StandardActions.SAVE_LIBRARY_AS,
+                    new SaveAction(
+                        SaveAction.SaveMethod.SAVE_AS,
+                        frame,
+                        dialogService,
+                        preferencesService,
+                        stateManager
+                    )
+                ),
+                factory.createMenuItem(
+                    StandardActions.SAVE_ALL,
+                    new SaveAllAction(frame, preferencesService)
+                ),
+                factory.createMenuItem(
+                    StandardActions.CLOSE_LIBRARY,
+                    new JabRefFrame.CloseDatabaseAction(frame)
+                ),
                 new SeparatorMenuItem(),
-
-                factory.createSubMenu(StandardActions.IMPORT,
-                        factory.createMenuItem(StandardActions.IMPORT_INTO_CURRENT_LIBRARY, new ImportCommand(frame, ImportCommand.ImportMethod.TO_EXISTING, preferencesService, stateManager, fileUpdateMonitor, taskExecutor, dialogService)),
-                        factory.createMenuItem(StandardActions.IMPORT_INTO_NEW_LIBRARY, new ImportCommand(frame, ImportCommand.ImportMethod.AS_NEW, preferencesService, stateManager, fileUpdateMonitor, taskExecutor, dialogService))),
-
-                factory.createSubMenu(StandardActions.EXPORT,
-                        factory.createMenuItem(StandardActions.EXPORT_ALL, new ExportCommand(ExportCommand.ExportMethod.EXPORT_ALL, frame, stateManager, dialogService, preferencesService, entryTypesManager, abbreviationRepository, taskExecutor)),
-                        factory.createMenuItem(StandardActions.EXPORT_SELECTED, new ExportCommand(ExportCommand.ExportMethod.EXPORT_SELECTED, frame, stateManager, dialogService, preferencesService, entryTypesManager, abbreviationRepository, taskExecutor)),
-                        factory.createMenuItem(StandardActions.SAVE_SELECTED_AS_PLAIN_BIBTEX, new SaveAction(SaveAction.SaveMethod.SAVE_SELECTED, frame, dialogService, preferencesService, stateManager))),
-
+                factory.createSubMenu(
+                    StandardActions.IMPORT,
+                    factory.createMenuItem(
+                        StandardActions.IMPORT_INTO_CURRENT_LIBRARY,
+                        new ImportCommand(
+                            frame,
+                            ImportCommand.ImportMethod.TO_EXISTING,
+                            preferencesService,
+                            stateManager,
+                            fileUpdateMonitor,
+                            taskExecutor,
+                            dialogService
+                        )
+                    ),
+                    factory.createMenuItem(
+                        StandardActions.IMPORT_INTO_NEW_LIBRARY,
+                        new ImportCommand(
+                            frame,
+                            ImportCommand.ImportMethod.AS_NEW,
+                            preferencesService,
+                            stateManager,
+                            fileUpdateMonitor,
+                            taskExecutor,
+                            dialogService
+                        )
+                    )
+                ),
+                factory.createSubMenu(
+                    StandardActions.EXPORT,
+                    factory.createMenuItem(
+                        StandardActions.EXPORT_ALL,
+                        new ExportCommand(
+                            ExportCommand.ExportMethod.EXPORT_ALL,
+                            frame,
+                            stateManager,
+                            dialogService,
+                            preferencesService,
+                            entryTypesManager,
+                            abbreviationRepository,
+                            taskExecutor
+                        )
+                    ),
+                    factory.createMenuItem(
+                        StandardActions.EXPORT_SELECTED,
+                        new ExportCommand(
+                            ExportCommand.ExportMethod.EXPORT_SELECTED,
+                            frame,
+                            stateManager,
+                            dialogService,
+                            preferencesService,
+                            entryTypesManager,
+                            abbreviationRepository,
+                            taskExecutor
+                        )
+                    ),
+                    factory.createMenuItem(
+                        StandardActions.SAVE_SELECTED_AS_PLAIN_BIBTEX,
+                        new SaveAction(
+                            SaveAction.SaveMethod.SAVE_SELECTED,
+                            frame,
+                            dialogService,
+                            preferencesService,
+                            stateManager
+                        )
+                    )
+                ),
                 new SeparatorMenuItem(),
-
-                factory.createSubMenu(StandardActions.REMOTE_DB,
-                        factory.createMenuItem(StandardActions.CONNECT_TO_SHARED_DB, new ConnectToSharedDatabaseCommand(frame)),
-                        factory.createMenuItem(StandardActions.PULL_CHANGES_FROM_SHARED_DB, new PullChangesFromSharedAction(stateManager))),
-
+                factory.createSubMenu(
+                    StandardActions.REMOTE_DB,
+                    factory.createMenuItem(
+                        StandardActions.CONNECT_TO_SHARED_DB,
+                        new ConnectToSharedDatabaseCommand(frame)
+                    ),
+                    factory.createMenuItem(
+                        StandardActions.PULL_CHANGES_FROM_SHARED_DB,
+                        new PullChangesFromSharedAction(stateManager)
+                    )
+                ),
                 new SeparatorMenuItem(),
-
-                factory.createMenuItem(StandardActions.SHOW_PREFS, new ShowPreferencesAction(frame, taskExecutor)),
-
+                factory.createMenuItem(
+                    StandardActions.SHOW_PREFS,
+                    new ShowPreferencesAction(frame, taskExecutor)
+                ),
                 new SeparatorMenuItem(),
-
-                factory.createMenuItem(StandardActions.QUIT, new JabRefFrame.CloseAction(frame))
-        );
-
-        edit.getItems().addAll(
-                factory.createMenuItem(StandardActions.UNDO, new UndoRedoAction(StandardActions.UNDO, frame, dialogService, stateManager)),
-                factory.createMenuItem(StandardActions.REDO, new UndoRedoAction(StandardActions.REDO, frame, dialogService, stateManager)),
-
+                factory.createMenuItem(
+                    StandardActions.QUIT,
+                    new JabRefFrame.CloseAction(frame)
+                )
+            );
+
+        edit
+            .getItems()
+            .addAll(
+                factory.createMenuItem(
+                    StandardActions.UNDO,
+                    new UndoRedoAction(
+                        StandardActions.UNDO,
+                        frame,
+                        dialogService,
+                        stateManager
+                    )
+                ),
+                factory.createMenuItem(
+                    StandardActions.REDO,
+                    new UndoRedoAction(
+                        StandardActions.REDO,
+                        frame,
+                        dialogService,
+                        stateManager
+                    )
+                ),
                 new SeparatorMenuItem(),
-
-                factory.createMenuItem(StandardActions.CUT, new EditAction(StandardActions.CUT, frame, stateManager)),
-
-                factory.createMenuItem(StandardActions.COPY, new EditAction(StandardActions.COPY, frame, stateManager)),
-                factory.createSubMenu(StandardActions.COPY_MORE,
-                        factory.createMenuItem(StandardActions.COPY_TITLE, new CopyMoreAction(StandardActions.COPY_TITLE, dialogService, stateManager, clipBoardManager, preferencesService, abbreviationRepository)),
-                        factory.createMenuItem(StandardActions.COPY_KEY, new CopyMoreAction(StandardActions.COPY_KEY, dialogService, stateManager, clipBoardManager, preferencesService, abbreviationRepository)),
-                        factory.createMenuItem(StandardActions.COPY_CITE_KEY, new CopyMoreAction(StandardActions.COPY_CITE_KEY, dialogService, stateManager, clipBoardManager, preferencesService, abbreviationRepository)),
-                        factory.createMenuItem(StandardActions.COPY_KEY_AND_TITLE, new CopyMoreAction(StandardActions.COPY_KEY_AND_TITLE, dialogService, stateManager, clipBoardManager, preferencesService, abbreviationRepository)),
-                        factory.createMenuItem(StandardActions.COPY_KEY_AND_LINK, new CopyMoreAction(StandardActions.COPY_KEY_AND_LINK, dialogService, stateManager, clipBoardManager, preferencesService, abbreviationRepository)),
-                        factory.createMenuItem(StandardActions.COPY_CITATION_PREVIEW, new CopyCitationAction(CitationStyleOutputFormat.HTML, dialogService, stateManager, clipBoardManager, taskExecutor, preferencesService, abbreviationRepository)),
-                        factory.createMenuItem(StandardActions.EXPORT_SELECTED_TO_CLIPBOARD, new ExportToClipboardAction(dialogService, stateManager, clipBoardManager, taskExecutor, preferencesService))),
-
-                factory.createMenuItem(StandardActions.PASTE, new EditAction(StandardActions.PASTE, frame, stateManager)),
-
+                factory.createMenuItem(
+                    StandardActions.CUT,
+                    new EditAction(StandardActions.CUT, frame, stateManager)
+                ),
+                factory.createMenuItem(
+                    StandardActions.COPY,
+                    new EditAction(StandardActions.COPY, frame, stateManager)
+                ),
+                factory.createSubMenu(
+                    StandardActions.COPY_MORE,
+                    factory.createMenuItem(
+                        StandardActions.COPY_TITLE,
+                        new CopyMoreAction(
+                            StandardActions.COPY_TITLE,
+                            dialogService,
+                            stateManager,
+                            clipBoardManager,
+                            preferencesService,
+                            abbreviationRepository
+                        )
+                    ),
+                    factory.createMenuItem(
+                        StandardActions.COPY_KEY,
+                        new CopyMoreAction(
+                            StandardActions.COPY_KEY,
+                            dialogService,
+                            stateManager,
+                            clipBoardManager,
+                            preferencesService,
+                            abbreviationRepository
+                        )
+                    ),
+                    factory.createMenuItem(
+                        StandardActions.COPY_CITE_KEY,
+                        new CopyMoreAction(
+                            StandardActions.COPY_CITE_KEY,
+                            dialogService,
+                            stateManager,
+                            clipBoardManager,
+                            preferencesService,
+                            abbreviationRepository
+                        )
+                    ),
+                    factory.createMenuItem(
+                        StandardActions.COPY_KEY_AND_TITLE,
+                        new CopyMoreAction(
+                            StandardActions.COPY_KEY_AND_TITLE,
+                            dialogService,
+                            stateManager,
+                            clipBoardManager,
+                            preferencesService,
+                            abbreviationRepository
+                        )
+                    ),
+                    factory.createMenuItem(
+                        StandardActions.COPY_KEY_AND_LINK,
+                        new CopyMoreAction(
+                            StandardActions.COPY_KEY_AND_LINK,
+                            dialogService,
+                            stateManager,
+                            clipBoardManager,
+                            preferencesService,
+                            abbreviationRepository
+                        )
+                    ),
+                    factory.createMenuItem(
+                        StandardActions.COPY_CITATION_PREVIEW,
+                        new CopyCitationAction(
+                            CitationStyleOutputFormat.HTML,
+                            dialogService,
+                            stateManager,
+                            clipBoardManager,
+                            taskExecutor,
+                            preferencesService,
+                            abbreviationRepository
+                        )
+                    ),
+                    factory.createMenuItem(
+                        StandardActions.EXPORT_SELECTED_TO_CLIPBOARD,
+                        new ExportToClipboardAction(
+                            dialogService,
+                            stateManager,
+                            clipBoardManager,
+                            taskExecutor,
+                            preferencesService
+                        )
+                    )
+                ),
+                factory.createMenuItem(
+                    StandardActions.PASTE,
+                    new EditAction(StandardActions.PASTE, frame, stateManager)
+                ),
                 new SeparatorMenuItem(),
-
-                factory.createMenuItem(StandardActions.REPLACE_ALL, new ReplaceStringAction(frame, stateManager)),
-                factory.createMenuItem(StandardActions.GENERATE_CITE_KEYS, new GenerateCitationKeyAction(frame, dialogService, stateManager, taskExecutor, preferencesService)),
-
+                factory.createMenuItem(
+                    StandardActions.REPLACE_ALL,
+                    new ReplaceStringAction(frame, stateManager)
+                ),
+                factory.createMenuItem(
+                    StandardActions.GENERATE_CITE_KEYS,
+                    new GenerateCitationKeyAction(
+                        frame,
+                        dialogService,
+                        stateManager,
+                        taskExecutor,
+                        preferencesService
+                    )
+                ),
                 new SeparatorMenuItem(),
-
-                factory.createMenuItem(StandardActions.MANAGE_KEYWORDS, new ManageKeywordsAction(stateManager)),
-                factory.createMenuItem(StandardActions.AUTOMATIC_FIELD_EDITOR, new AutomaticFieldEditorAction(stateManager, dialogService)));
+                factory.createMenuItem(
+                    StandardActions.MANAGE_KEYWORDS,
+                    new ManageKeywordsAction(stateManager)
+                ),
+                factory.createMenuItem(
+                    StandardActions.AUTOMATIC_FIELD_EDITOR,
+                    new AutomaticFieldEditorAction(stateManager, dialogService)
+                )
+            );
         SeparatorMenuItem specialFieldsSeparator = new SeparatorMenuItem();
-        specialFieldsSeparator.visibleProperty().bind(preferencesService.getSpecialFieldsPreferences().specialFieldsEnabledProperty());
-
-        edit.getItems().addAll(
+        specialFieldsSeparator
+            .visibleProperty()
+            .bind(
+                preferencesService
+                    .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, dialogService, preferencesService, undoManager, stateManager),
-                SpecialFieldMenuItemFactory.getSpecialFieldSingleItem(SpecialField.RELEVANCE, factory, frame, dialogService, preferencesService, undoManager, stateManager),
-                SpecialFieldMenuItemFactory.getSpecialFieldSingleItem(SpecialField.QUALITY, factory, frame, dialogService, preferencesService, undoManager, stateManager),
-                SpecialFieldMenuItemFactory.getSpecialFieldSingleItem(SpecialField.PRINTED, factory, frame, dialogService, preferencesService, undoManager, stateManager),
-                SpecialFieldMenuItemFactory.createSpecialFieldMenu(SpecialField.PRIORITY, factory, frame, dialogService, preferencesService, undoManager, stateManager),
-                SpecialFieldMenuItemFactory.createSpecialFieldMenu(SpecialField.READ_STATUS, factory, frame, dialogService, preferencesService, 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();
+                SpecialFieldMenuItemFactory.createSpecialFieldMenu(
+                    SpecialField.RANKING,
+                    factory,
+                    frame,
+                    dialogService,
+                    preferencesService,
+                    undoManager,
+                    stateManager
+                ),
+                SpecialFieldMenuItemFactory.getSpecialFieldSingleItem(
+                    SpecialField.RELEVANCE,
+                    factory,
+                    frame,
+                    dialogService,
+                    preferencesService,
+                    undoManager,
+                    stateManager
+                ),
+                SpecialFieldMenuItemFactory.getSpecialFieldSingleItem(
+                    SpecialField.QUALITY,
+                    factory,
+                    frame,
+                    dialogService,
+                    preferencesService,
+                    undoManager,
+                    stateManager
+                ),
+                SpecialFieldMenuItemFactory.getSpecialFieldSingleItem(
+                    SpecialField.PRINTED,
+                    factory,
+                    frame,
+                    dialogService,
+                    preferencesService,
+                    undoManager,
+                    stateManager
+                ),
+                SpecialFieldMenuItemFactory.createSpecialFieldMenu(
+                    SpecialField.PRIORITY,
+                    factory,
+                    frame,
+                    dialogService,
+                    preferencesService,
+                    undoManager,
+                    stateManager
+                ),
+                SpecialFieldMenuItemFactory.createSpecialFieldMenu(
+                    SpecialField.READ_STATUS,
+                    factory,
+                    frame,
+                    dialogService,
+                    preferencesService,
+                    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();
+                }
             }
-        });
+        );
 
         // @formatter:off
         library.getItems().addAll(
@@ -334,27 +601,41 @@ private void createMenu() {
 
         // @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,
-                                   PreferencesService preferencesService) {
+    private Menu createSendSubMenu(
+        ActionFactory factory,
+        DialogService dialogService,
+        StateManager stateManager,
+        PreferencesService preferencesService
+    ) {
         Menu sendMenu = factory.createMenu(StandardActions.SEND);
-        sendMenu.getItems().addAll(
-                factory.createMenuItem(StandardActions.SEND_AS_EMAIL, new SendAsStandardEmailAction(dialogService, preferencesService, stateManager, entryTypesManager, taskExecutor)),
-                factory.createMenuItem(StandardActions.SEND_TO_KINDLE, new SendAsKindleEmailAction(dialogService, preferencesService, stateManager, taskExecutor))
-        );
+        sendMenu
+            .getItems()
+            .addAll(
+                factory.createMenuItem(
+                    StandardActions.SEND_AS_EMAIL,
+                    new SendAsStandardEmailAction(
+                        dialogService,
+                        preferencesService,
+                        stateManager,
+                        entryTypesManager,
+                        taskExecutor
+                    )
+                ),
+                factory.createMenuItem(
+                    StandardActions.SEND_TO_KINDLE,
+                    new SendAsKindleEmailAction(
+                        dialogService,
+                        preferencesService,
+                        stateManager,
+                        taskExecutor
+                    )
+                )
+            );
 
         return sendMenu;
     }
diff --git a/src/main/java/org/jabref/gui/MainToolBar.java b/src/main/java/org/jabref/gui/MainToolBar.java
index 1e89db1b724..546227b2c11 100644
--- a/src/main/java/org/jabref/gui/MainToolBar.java
+++ b/src/main/java/org/jabref/gui/MainToolBar.java
@@ -1,5 +1,6 @@
 package org.jabref.gui;
 
+import com.tobiasdiez.easybind.EasyBind;
 import javafx.concurrent.Task;
 import javafx.geometry.Orientation;
 import javafx.scene.Group;
@@ -12,7 +13,8 @@
 import javafx.scene.layout.Priority;
 import javafx.scene.layout.Region;
 import javafx.scene.shape.Rectangle;
-
+import org.controlsfx.control.PopOver;
+import org.controlsfx.control.TaskProgressView;
 import org.jabref.gui.actions.ActionFactory;
 import org.jabref.gui.actions.ActionHelper;
 import org.jabref.gui.actions.StandardActions;
@@ -39,11 +41,8 @@
 import org.jabref.model.util.FileUpdateMonitor;
 import org.jabref.preferences.PreferencesService;
 
-import com.tobiasdiez.easybind.EasyBind;
-import org.controlsfx.control.PopOver;
-import org.controlsfx.control.TaskProgressView;
-
 public class MainToolBar extends ToolBar {
+
     private final JabRefFrame frame;
     private final PushToApplicationCommand pushToApplicationCommand;
     private final GlobalSearchBar globalSearchBar;
@@ -58,16 +57,18 @@ public class MainToolBar extends ToolBar {
     private PopOver entryFromIdPopOver;
     private PopOver progressViewPopOver;
 
-    public MainToolBar(JabRefFrame frame,
-                       PushToApplicationCommand pushToApplicationCommand,
-                       GlobalSearchBar globalSearchBar,
-                       DialogService dialogService,
-                       StateManager stateManager,
-                       PreferencesService preferencesService,
-                       FileUpdateMonitor fileUpdateMonitor,
-                       TaskExecutor taskExecutor,
-                       BibEntryTypesManager entryTypesManager,
-                       CountingUndoManager undoManager) {
+    public MainToolBar(
+        JabRefFrame frame,
+        PushToApplicationCommand pushToApplicationCommand,
+        GlobalSearchBar globalSearchBar,
+        DialogService dialogService,
+        StateManager stateManager,
+        PreferencesService preferencesService,
+        FileUpdateMonitor fileUpdateMonitor,
+        TaskExecutor taskExecutor,
+        BibEntryTypesManager entryTypesManager,
+        CountingUndoManager undoManager
+    ) {
         this.frame = frame;
         this.pushToApplicationCommand = pushToApplicationCommand;
         this.globalSearchBar = globalSearchBar;
@@ -88,55 +89,167 @@ private void createToolBar() {
         final Region leftSpacer = new Region();
         final Region rightSpacer = new Region();
 
-        final Button pushToApplicationButton = factory.createIconButton(pushToApplicationCommand.getAction(), pushToApplicationCommand);
-        pushToApplicationCommand.registerReconfigurable(pushToApplicationButton);
+        final Button pushToApplicationButton = factory.createIconButton(
+            pushToApplicationCommand.getAction(),
+            pushToApplicationCommand
+        );
+        pushToApplicationCommand.registerReconfigurable(
+            pushToApplicationButton
+        );
 
         // Setup Toolbar
 
-        getItems().addAll(
+        getItems()
+            .addAll(
                 new HBox(
-                        factory.createIconButton(StandardActions.NEW_LIBRARY, new NewDatabaseAction(frame, preferencesService)),
-                        factory.createIconButton(StandardActions.OPEN_LIBRARY, new OpenDatabaseAction(frame, preferencesService, dialogService, stateManager, fileUpdateMonitor, entryTypesManager, undoManager, taskExecutor)),
-                        factory.createIconButton(StandardActions.SAVE_LIBRARY, new SaveAction(SaveAction.SaveMethod.SAVE, frame, dialogService, preferencesService, stateManager))),
-
+                    factory.createIconButton(
+                        StandardActions.NEW_LIBRARY,
+                        new NewDatabaseAction(frame, preferencesService)
+                    ),
+                    factory.createIconButton(
+                        StandardActions.OPEN_LIBRARY,
+                        new OpenDatabaseAction(
+                            frame,
+                            preferencesService,
+                            dialogService,
+                            stateManager,
+                            fileUpdateMonitor,
+                            entryTypesManager,
+                            undoManager,
+                            taskExecutor
+                        )
+                    ),
+                    factory.createIconButton(
+                        StandardActions.SAVE_LIBRARY,
+                        new SaveAction(
+                            SaveAction.SaveMethod.SAVE,
+                            frame,
+                            dialogService,
+                            preferencesService,
+                            stateManager
+                        )
+                    )
+                ),
                 leftSpacer,
-
                 globalSearchBar,
-
                 rightSpacer,
-
                 new HBox(
-                        factory.createIconButton(StandardActions.NEW_ARTICLE, new NewEntryAction(frame, StandardEntryType.Article, dialogService, preferencesService, stateManager)),
-                        factory.createIconButton(StandardActions.NEW_ENTRY, new NewEntryAction(frame, dialogService, preferencesService, stateManager)),
-                        createNewEntryFromIdButton(),
-                        factory.createIconButton(StandardActions.NEW_ENTRY_FROM_PLAIN_TEXT, new ExtractBibtexAction(dialogService, preferencesService, stateManager)),
-                        factory.createIconButton(StandardActions.DELETE_ENTRY, new EditAction(StandardActions.DELETE_ENTRY, frame, stateManager))),
-
+                    factory.createIconButton(
+                        StandardActions.NEW_ARTICLE,
+                        new NewEntryAction(
+                            frame,
+                            StandardEntryType.Article,
+                            dialogService,
+                            preferencesService,
+                            stateManager
+                        )
+                    ),
+                    factory.createIconButton(
+                        StandardActions.NEW_ENTRY,
+                        new NewEntryAction(
+                            frame,
+                            dialogService,
+                            preferencesService,
+                            stateManager
+                        )
+                    ),
+                    createNewEntryFromIdButton(),
+                    factory.createIconButton(
+                        StandardActions.NEW_ENTRY_FROM_PLAIN_TEXT,
+                        new ExtractBibtexAction(
+                            dialogService,
+                            preferencesService,
+                            stateManager
+                        )
+                    ),
+                    factory.createIconButton(
+                        StandardActions.DELETE_ENTRY,
+                        new EditAction(
+                            StandardActions.DELETE_ENTRY,
+                            frame,
+                            stateManager
+                        )
+                    )
+                ),
                 new Separator(Orientation.VERTICAL),
-
                 new HBox(
-                        factory.createIconButton(StandardActions.UNDO, new UndoRedoAction(StandardActions.UNDO, frame, dialogService, stateManager)),
-                        factory.createIconButton(StandardActions.REDO, new UndoRedoAction(StandardActions.REDO, frame, dialogService, stateManager)),
-                        factory.createIconButton(StandardActions.CUT, new EditAction(StandardActions.CUT, frame, stateManager)),
-                        factory.createIconButton(StandardActions.COPY, new EditAction(StandardActions.COPY, frame, stateManager)),
-                        factory.createIconButton(StandardActions.PASTE, new EditAction(StandardActions.PASTE, frame, stateManager))),
-
+                    factory.createIconButton(
+                        StandardActions.UNDO,
+                        new UndoRedoAction(
+                            StandardActions.UNDO,
+                            frame,
+                            dialogService,
+                            stateManager
+                        )
+                    ),
+                    factory.createIconButton(
+                        StandardActions.REDO,
+                        new UndoRedoAction(
+                            StandardActions.REDO,
+                            frame,
+                            dialogService,
+                            stateManager
+                        )
+                    ),
+                    factory.createIconButton(
+                        StandardActions.CUT,
+                        new EditAction(StandardActions.CUT, frame, stateManager)
+                    ),
+                    factory.createIconButton(
+                        StandardActions.COPY,
+                        new EditAction(
+                            StandardActions.COPY,
+                            frame,
+                            stateManager
+                        )
+                    ),
+                    factory.createIconButton(
+                        StandardActions.PASTE,
+                        new EditAction(
+                            StandardActions.PASTE,
+                            frame,
+                            stateManager
+                        )
+                    )
+                ),
                 new Separator(Orientation.VERTICAL),
-
                 new HBox(
-                        pushToApplicationButton,
-                        factory.createIconButton(StandardActions.GENERATE_CITE_KEYS, new GenerateCitationKeyAction(frame, dialogService, stateManager, taskExecutor, preferencesService)),
-                        factory.createIconButton(StandardActions.CLEANUP_ENTRIES, new CleanupAction(frame, preferencesService, dialogService, stateManager, taskExecutor))),
-
+                    pushToApplicationButton,
+                    factory.createIconButton(
+                        StandardActions.GENERATE_CITE_KEYS,
+                        new GenerateCitationKeyAction(
+                            frame,
+                            dialogService,
+                            stateManager,
+                            taskExecutor,
+                            preferencesService
+                        )
+                    ),
+                    factory.createIconButton(
+                        StandardActions.CLEANUP_ENTRIES,
+                        new CleanupAction(
+                            frame,
+                            preferencesService,
+                            dialogService,
+                            stateManager,
+                            taskExecutor
+                        )
+                    )
+                ),
                 new Separator(Orientation.VERTICAL),
-
-                new HBox(
-                        createTaskIndicator()),
-
+                new HBox(createTaskIndicator()),
                 new Separator(Orientation.VERTICAL),
-
                 new HBox(
-                        factory.createIconButton(StandardActions.OPEN_GITHUB, new OpenBrowserAction("https://github.com/JabRef/jabref", dialogService, preferencesService.getFilePreferences()))));
+                    factory.createIconButton(
+                        StandardActions.OPEN_GITHUB,
+                        new OpenBrowserAction(
+                            "https://github.com/JabRef/jabref",
+                            dialogService,
+                            preferencesService.getFilePreferences()
+                        )
+                    )
+                )
+            );
 
         leftSpacer.setPrefWidth(50);
         leftSpacer.setMinWidth(Region.USE_PREF_SIZE);
@@ -150,17 +263,30 @@ private void createToolBar() {
     Button createNewEntryFromIdButton() {
         Button newEntryFromIdButton = new Button();
 
-        newEntryFromIdButton.setGraphic(IconTheme.JabRefIcons.IMPORT.getGraphicNode());
+        newEntryFromIdButton.setGraphic(
+            IconTheme.JabRefIcons.IMPORT.getGraphicNode()
+        );
         newEntryFromIdButton.getStyleClass().setAll("icon-button");
         newEntryFromIdButton.setFocusTraversable(false);
-        newEntryFromIdButton.disableProperty().bind(ActionHelper.needsDatabase(stateManager).not());
+        newEntryFromIdButton
+            .disableProperty()
+            .bind(ActionHelper.needsDatabase(stateManager).not());
         newEntryFromIdButton.setOnMouseClicked(event -> {
-            GenerateEntryFromIdDialog entryFromId = new GenerateEntryFromIdDialog(frame.getCurrentLibraryTab(), dialogService, preferencesService, taskExecutor, stateManager);
+            GenerateEntryFromIdDialog entryFromId =
+                new GenerateEntryFromIdDialog(
+                    frame.getCurrentLibraryTab(),
+                    dialogService,
+                    preferencesService,
+                    taskExecutor,
+                    stateManager
+                );
 
             if (entryFromIdPopOver == null) {
                 entryFromIdPopOver = new PopOver(entryFromId.getDialogPane());
                 entryFromIdPopOver.setTitle(Localization.lang("Import by ID"));
-                entryFromIdPopOver.setArrowLocation(PopOver.ArrowLocation.TOP_CENTER);
+                entryFromIdPopOver.setArrowLocation(
+                    PopOver.ArrowLocation.TOP_CENTER
+                );
                 entryFromIdPopOver.setContentNode(entryFromId.getDialogPane());
                 entryFromIdPopOver.show(newEntryFromIdButton);
                 entryFromId.setEntryFromIdPopOver(entryFromIdPopOver);
@@ -172,7 +298,9 @@ Button createNewEntryFromIdButton() {
                 entryFromId.setEntryFromIdPopOver(entryFromIdPopOver);
             }
         });
-        newEntryFromIdButton.setTooltip(new Tooltip(Localization.lang("Import by ID")));
+        newEntryFromIdButton.setTooltip(
+            new Tooltip(Localization.lang("Import by ID"))
+        );
 
         return newEntryFromIdButton;
     }
@@ -182,45 +310,65 @@ Group createTaskIndicator() {
         indicator.getStyleClass().add("progress-indicatorToolbar");
         indicator.progressProperty().bind(stateManager.getTasksProgress());
 
-        Tooltip someTasksRunning = new Tooltip(Localization.lang("Background Tasks are running"));
-        Tooltip noTasksRunning = new Tooltip(Localization.lang("Background Tasks are done"));
+        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) -> {
-            /*
+        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);
-            }
-        });
+                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 -> {
-            TaskProgressView<Task<?>> taskProgressView = new TaskProgressView<Task<?>>();
-            EasyBind.bindContent(taskProgressView.getTasks(), stateManager.getBackgroundTasks());
+            TaskProgressView<Task<?>> taskProgressView = new TaskProgressView<
+                Task<?>
+            >();
+            EasyBind.bindContent(
+                taskProgressView.getTasks(),
+                stateManager.getBackgroundTasks()
+            );
             taskProgressView.setRetainTasks(true);
             taskProgressView.setGraphicFactory(BackgroundTask::getIcon);
 
             if (progressViewPopOver == null) {
                 progressViewPopOver = new PopOver(taskProgressView);
-                progressViewPopOver.setTitle(Localization.lang("Background Tasks"));
-                progressViewPopOver.setArrowLocation(PopOver.ArrowLocation.RIGHT_TOP);
+                progressViewPopOver.setTitle(
+                    Localization.lang("Background Tasks")
+                );
+                progressViewPopOver.setArrowLocation(
+                    PopOver.ArrowLocation.RIGHT_TOP
+                );
                 progressViewPopOver.setContentNode(taskProgressView);
                 progressViewPopOver.show(indicator);
             } else if (progressViewPopOver.isShowing()) {
diff --git a/src/main/java/org/jabref/gui/OpenConsoleAction.java b/src/main/java/org/jabref/gui/OpenConsoleAction.java
index acada1d5629..3808e28bc20 100644
--- a/src/main/java/org/jabref/gui/OpenConsoleAction.java
+++ b/src/main/java/org/jabref/gui/OpenConsoleAction.java
@@ -3,19 +3,19 @@
 import java.io.IOException;
 import java.util.Optional;
 import java.util.function.Supplier;
-
 import org.jabref.gui.actions.ActionHelper;
 import org.jabref.gui.actions.SimpleCommand;
 import org.jabref.gui.desktop.JabRefDesktop;
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.preferences.PreferencesService;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 public class OpenConsoleAction extends SimpleCommand {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(OpenConsoleAction.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(
+        OpenConsoleAction.class
+    );
     private final Supplier<BibDatabaseContext> databaseContext;
     private final StateManager stateManager;
     private final PreferencesService preferencesService;
@@ -27,7 +27,12 @@ public class OpenConsoleAction extends SimpleCommand {
      * {@link #OpenConsoleAction(StateManager, PreferencesService)} if not supplying
      * another database.
      */
-    public OpenConsoleAction(Supplier<BibDatabaseContext> databaseContext, StateManager stateManager, PreferencesService preferencesService, DialogService dialogService) {
+    public OpenConsoleAction(
+        Supplier<BibDatabaseContext> databaseContext,
+        StateManager stateManager,
+        PreferencesService preferencesService,
+        DialogService dialogService
+    ) {
         this.databaseContext = databaseContext;
         this.stateManager = stateManager;
         this.preferencesService = preferencesService;
@@ -39,18 +44,30 @@ public OpenConsoleAction(Supplier<BibDatabaseContext> databaseContext, StateMana
     /**
      * Using this constructor will result in executing the command on the active database.
      */
-    public OpenConsoleAction(StateManager stateManager, PreferencesService preferencesService, DialogService dialogService) {
+    public OpenConsoleAction(
+        StateManager stateManager,
+        PreferencesService preferencesService,
+        DialogService dialogService
+    ) {
         this(() -> null, stateManager, preferencesService, dialogService);
     }
 
     @Override
     public void execute() {
-        Optional.ofNullable(databaseContext.get()).or(stateManager::getActiveDatabase).flatMap(BibDatabaseContext::getDatabasePath).ifPresent(path -> {
-            try {
-                JabRefDesktop.openConsole(path, preferencesService, dialogService);
-            } catch (IOException e) {
-                LOGGER.info("Could not open console", e);
-            }
-        });
+        Optional
+            .ofNullable(databaseContext.get())
+            .or(stateManager::getActiveDatabase)
+            .flatMap(BibDatabaseContext::getDatabasePath)
+            .ifPresent(path -> {
+                try {
+                    JabRefDesktop.openConsole(
+                        path,
+                        preferencesService,
+                        dialogService
+                    );
+                } catch (IOException e) {
+                    LOGGER.info("Could not open console", e);
+                }
+            });
     }
 }
diff --git a/src/main/java/org/jabref/gui/SendAsEMailAction.java b/src/main/java/org/jabref/gui/SendAsEMailAction.java
index fad6fe8aa7c..0ea00c2d41b 100644
--- a/src/main/java/org/jabref/gui/SendAsEMailAction.java
+++ b/src/main/java/org/jabref/gui/SendAsEMailAction.java
@@ -7,7 +7,6 @@
 import java.nio.file.Path;
 import java.util.ArrayList;
 import java.util.List;
-
 import org.jabref.architecture.AllowedToUseAwt;
 import org.jabref.gui.actions.SimpleCommand;
 import org.jabref.gui.desktop.JabRefDesktop;
@@ -18,7 +17,6 @@
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.preferences.PreferencesService;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -35,16 +33,20 @@
 @AllowedToUseAwt("Requires AWT to send an email")
 public abstract class SendAsEMailAction extends SimpleCommand {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(SendAsEMailAction.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(
+        SendAsEMailAction.class
+    );
     private final DialogService dialogService;
     private final PreferencesService preferencesService;
     private final StateManager stateManager;
     private final TaskExecutor taskExecutor;
 
-    public SendAsEMailAction(DialogService dialogService,
-                             PreferencesService preferencesService,
-                             StateManager stateManager,
-                             TaskExecutor taskExecutor) {
+    public SendAsEMailAction(
+        DialogService dialogService,
+        PreferencesService preferencesService,
+        StateManager stateManager,
+        TaskExecutor taskExecutor
+    ) {
         this.dialogService = dialogService;
         this.preferencesService = preferencesService;
         this.stateManager = stateManager;
@@ -53,23 +55,29 @@ 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);
+        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);
     }
 
     private String sendEmail() throws Exception {
-        if (!Desktop.isDesktopSupported() || stateManager.getActiveDatabase().isEmpty()) {
+        if (
+            !Desktop.isDesktopSupported() ||
+            stateManager.getActiveDatabase().isEmpty()
+        ) {
             return Localization.lang("Error creating email");
         }
 
         if (stateManager.getSelectedEntries().isEmpty()) {
-            return Localization.lang("This operation requires one or more entries to be selected.");
+            return Localization.lang(
+                "This operation requires one or more entries to be selected."
+            );
         }
 
         List<BibEntry> entries = stateManager.getSelectedEntries();
@@ -78,7 +86,11 @@ private String sendEmail() throws Exception {
         Desktop desktop = Desktop.getDesktop();
         desktop.mail(uriMailTo);
 
-        return String.format("%s: %d", Localization.lang("Entries added to an email"), entries.size());
+        return String.format(
+            "%s: %d",
+            Localization.lang("Entries added to an email"),
+            entries.size()
+        );
     }
 
     private URI getUriMailTo(List<BibEntry> entries) throws URISyntaxException {
@@ -100,17 +112,30 @@ 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 = preferencesService.getExternalApplicationsPreferences().shouldAutoOpenEmailAttachmentsFolder();
-
-        BibDatabaseContext databaseContext = stateManager.getActiveDatabase().get();
-        List<Path> fileList = FileUtil.getListOfLinkedFiles(entries, databaseContext.getFileDirectories(preferencesService.getFilePreferences()));
+        boolean openFolders = preferencesService
+            .getExternalApplicationsPreferences()
+            .shouldAutoOpenEmailAttachmentsFolder();
+
+        BibDatabaseContext databaseContext = stateManager
+            .getActiveDatabase()
+            .get();
+        List<Path> fileList = FileUtil.getListOfLinkedFiles(
+            entries,
+            databaseContext.getFileDirectories(
+                preferencesService.getFilePreferences()
+            )
+        );
 
         List<String> attachments = new ArrayList<>();
         for (Path path : fileList) {
             attachments.add(path.toAbsolutePath().toString());
             if (openFolders) {
                 try {
-                    JabRefDesktop.openFolderAndSelectFile(path.toAbsolutePath(), preferencesService.getExternalApplicationsPreferences(), dialogService);
+                    JabRefDesktop.openFolderAndSelectFile(
+                        path.toAbsolutePath(),
+                        preferencesService.getExternalApplicationsPreferences(),
+                        dialogService
+                    );
                 } catch (IOException e) {
                     LOGGER.debug("Cannot open file", e);
                 }
diff --git a/src/main/java/org/jabref/gui/SendAsKindleEmailAction.java b/src/main/java/org/jabref/gui/SendAsKindleEmailAction.java
index f96944a4fa2..6baf340dca4 100644
--- a/src/main/java/org/jabref/gui/SendAsKindleEmailAction.java
+++ b/src/main/java/org/jabref/gui/SendAsKindleEmailAction.java
@@ -10,17 +10,33 @@
  * configured Kindle email
  */
 public class SendAsKindleEmailAction extends SendAsEMailAction {
+
     private final PreferencesService preferencesService;
 
-    public SendAsKindleEmailAction(DialogService dialogService, PreferencesService preferencesService, StateManager stateManager, TaskExecutor taskExecutor) {
+    public SendAsKindleEmailAction(
+        DialogService dialogService,
+        PreferencesService preferencesService,
+        StateManager stateManager,
+        TaskExecutor taskExecutor
+    ) {
         super(dialogService, preferencesService, stateManager, taskExecutor);
         this.preferencesService = preferencesService;
-        this.executable.bind(ActionHelper.needsEntriesSelected(stateManager).and(ActionHelper.hasLinkedFileForSelectedEntries(stateManager)));
+        this.executable.bind(
+                ActionHelper
+                    .needsEntriesSelected(stateManager)
+                    .and(
+                        ActionHelper.hasLinkedFileForSelectedEntries(
+                            stateManager
+                        )
+                    )
+            );
     }
 
     @Override
     protected String getEmailAddress() {
-        return preferencesService.getExternalApplicationsPreferences().getKindleEmail();
+        return preferencesService
+            .getExternalApplicationsPreferences()
+            .getKindleEmail();
     }
 
     @Override
diff --git a/src/main/java/org/jabref/gui/SendAsStandardEmailAction.java b/src/main/java/org/jabref/gui/SendAsStandardEmailAction.java
index a60fb256820..1357db9229d 100644
--- a/src/main/java/org/jabref/gui/SendAsStandardEmailAction.java
+++ b/src/main/java/org/jabref/gui/SendAsStandardEmailAction.java
@@ -3,7 +3,6 @@
 import java.io.IOException;
 import java.io.StringWriter;
 import java.util.List;
-
 import org.jabref.gui.actions.ActionHelper;
 import org.jabref.gui.util.TaskExecutor;
 import org.jabref.logic.bibtex.BibEntryWriter;
@@ -14,7 +13,6 @@
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.BibEntryTypesManager;
 import org.jabref.preferences.PreferencesService;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -23,16 +21,21 @@
  * by populating the email body
  */
 public class SendAsStandardEmailAction extends SendAsEMailAction {
-    private static final Logger LOGGER = LoggerFactory.getLogger(SendAsStandardEmailAction.class);
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(
+        SendAsStandardEmailAction.class
+    );
     private final PreferencesService preferencesService;
     private final StateManager stateManager;
     private final BibEntryTypesManager entryTypesManager;
 
-    public SendAsStandardEmailAction(DialogService dialogService,
-                                     PreferencesService preferencesService,
-                                     StateManager stateManager,
-                                     BibEntryTypesManager entryTypesManager,
-                                     TaskExecutor taskExecutor) {
+    public SendAsStandardEmailAction(
+        DialogService dialogService,
+        PreferencesService preferencesService,
+        StateManager stateManager,
+        BibEntryTypesManager entryTypesManager,
+        TaskExecutor taskExecutor
+    ) {
         super(dialogService, preferencesService, stateManager, taskExecutor);
         this.preferencesService = preferencesService;
         this.stateManager = stateManager;
@@ -47,21 +50,32 @@ protected String getEmailAddress() {
 
     @Override
     protected String getSubject() {
-        return preferencesService.getExternalApplicationsPreferences().getEmailSubject();
+        return preferencesService
+            .getExternalApplicationsPreferences()
+            .getEmailSubject();
     }
 
     @Override
     protected String getBody() {
         List<BibEntry> entries = stateManager.getSelectedEntries();
-        BibDatabaseContext databaseContext = stateManager.getActiveDatabase().get();
+        BibDatabaseContext databaseContext = stateManager
+            .getActiveDatabase()
+            .get();
         StringWriter rawEntries = new StringWriter();
         BibWriter bibWriter = new BibWriter(rawEntries, OS.NEWLINE);
 
-        BibEntryWriter bibtexEntryWriter = new BibEntryWriter(new FieldWriter(preferencesService.getFieldPreferences()), entryTypesManager);
+        BibEntryWriter bibtexEntryWriter = new BibEntryWriter(
+            new FieldWriter(preferencesService.getFieldPreferences()),
+            entryTypesManager
+        );
 
         for (BibEntry entry : entries) {
             try {
-                bibtexEntryWriter.write(entry, bibWriter, databaseContext.getMode());
+                bibtexEntryWriter.write(
+                    entry,
+                    bibWriter,
+                    databaseContext.getMode()
+                );
             } catch (IOException e) {
                 LOGGER.warn("Problem creating BibTeX file for mailing.", e);
             }
diff --git a/src/main/java/org/jabref/gui/StateManager.java b/src/main/java/org/jabref/gui/StateManager.java
index f1ff42c5785..3d479d5b531 100644
--- a/src/main/java/org/jabref/gui/StateManager.java
+++ b/src/main/java/org/jabref/gui/StateManager.java
@@ -1,11 +1,12 @@
 package org.jabref.gui;
 
+import com.tobiasdiez.easybind.EasyBind;
+import com.tobiasdiez.easybind.EasyBinding;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
 import java.util.Optional;
 import java.util.stream.Collectors;
-
 import javafx.beans.Observable;
 import javafx.beans.binding.Bindings;
 import javafx.beans.property.IntegerProperty;
@@ -20,7 +21,6 @@
 import javafx.concurrent.Task;
 import javafx.scene.Node;
 import javafx.util.Pair;
-
 import org.jabref.gui.edit.automaticfiededitor.LastAutomaticFieldEditorEdit;
 import org.jabref.gui.sidepane.SidePaneType;
 import org.jabref.gui.util.BackgroundTask;
@@ -32,9 +32,6 @@
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.groups.GroupTreeNode;
 import org.jabref.model.util.OptionalUtil;
-
-import com.tobiasdiez.easybind.EasyBind;
-import com.tobiasdiez.easybind.EasyBinding;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -52,29 +49,78 @@
  */
 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 ReadOnlyListWrapper<GroupTreeNode> activeGroups = new ReadOnlyListWrapper<>(FXCollections.observableArrayList());
-    private final ObservableList<BibEntry> selectedEntries = FXCollections.observableArrayList();
-    private final ObservableMap<BibDatabaseContext, ObservableList<GroupTreeNode>> selectedGroups = FXCollections.observableHashMap();
-    private final OptionalObjectProperty<SearchQuery> activeSearchQuery = OptionalObjectProperty.empty();
-    private final ObservableMap<BibDatabaseContext, IntegerProperty> searchResultMap = FXCollections.observableHashMap();
-    private final OptionalObjectProperty<Node> focusOwner = OptionalObjectProperty.empty();
-    private final ObservableList<Pair<BackgroundTask<?>, Task<?>>> backgroundTasks = FXCollections.observableArrayList(task -> new Observable[]{task.getValue().progressProperty(), task.getValue().runningProperty()});
-    private final EasyBinding<Boolean> anyTaskRunning = EasyBind.reduce(backgroundTasks, tasks -> tasks.map(Pair::getValue).anyMatch(Task::isRunning));
-    private final EasyBinding<Boolean> anyTasksThatWillNotBeRecoveredRunning = EasyBind.reduce(backgroundTasks, tasks -> tasks.anyMatch(task -> !task.getKey().willBeRecoveredAutomatically() && task.getValue().isRunning()));
-    private final EasyBinding<Double> tasksProgress = EasyBind.reduce(backgroundTasks, 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 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 ReadOnlyListWrapper<GroupTreeNode> activeGroups =
+        new ReadOnlyListWrapper<>(FXCollections.observableArrayList());
+    private final ObservableList<BibEntry> selectedEntries =
+        FXCollections.observableArrayList();
+    private final ObservableMap<
+        BibDatabaseContext,
+        ObservableList<GroupTreeNode>
+    > selectedGroups = FXCollections.observableHashMap();
+    private final OptionalObjectProperty<SearchQuery> activeSearchQuery =
+        OptionalObjectProperty.empty();
+    private final ObservableMap<
+        BibDatabaseContext,
+        IntegerProperty
+    > searchResultMap = FXCollections.observableHashMap();
+    private final OptionalObjectProperty<Node> focusOwner =
+        OptionalObjectProperty.empty();
+    private final ObservableList<
+        Pair<BackgroundTask<?>, Task<?>>
+    > backgroundTasks = FXCollections.observableArrayList(task ->
+        new Observable[] {
+            task.getValue().progressProperty(),
+            task.getValue().runningProperty(),
+        }
+    );
+    private final EasyBinding<Boolean> anyTaskRunning = EasyBind.reduce(
+        backgroundTasks,
+        tasks -> tasks.map(Pair::getValue).anyMatch(Task::isRunning)
+    );
+    private final EasyBinding<Boolean> anyTasksThatWillNotBeRecoveredRunning =
+        EasyBind.reduce(
+            backgroundTasks,
+            tasks ->
+                tasks.anyMatch(task ->
+                    !task.getKey().willBeRecoveredAutomatically() &&
+                    task.getValue().isRunning()
+                )
+        );
+    private final EasyBinding<Double> tasksProgress = EasyBind.reduce(
+        backgroundTasks,
+        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();
 
     public StateManager() {
-        activeGroups.bind(Bindings.valueAt(selectedGroups, activeDatabase.orElseOpt(null)));
+        activeGroups.bind(
+            Bindings.valueAt(selectedGroups, activeDatabase.orElseOpt(null))
+        );
     }
 
     public ObservableList<SidePaneType> getVisibleSidePaneComponents() {
@@ -97,12 +143,18 @@ public OptionalObjectProperty<SearchQuery> activeSearchQueryProperty() {
         return activeSearchQuery;
     }
 
-    public void setActiveSearchResultSize(BibDatabaseContext database, IntegerProperty resultSize) {
+    public void setActiveSearchResultSize(
+        BibDatabaseContext database,
+        IntegerProperty resultSize
+    ) {
         searchResultMap.put(database, resultSize);
     }
 
     public IntegerProperty getSearchResultSize() {
-        return searchResultMap.getOrDefault(activeDatabase.getValue().orElse(new BibDatabaseContext()), new SimpleIntegerProperty(0));
+        return searchResultMap.getOrDefault(
+            activeDatabase.getValue().orElse(new BibDatabaseContext()),
+            new SimpleIntegerProperty(0)
+        );
     }
 
     public ReadOnlyListProperty<GroupTreeNode> activeGroupProperty() {
@@ -117,14 +169,25 @@ public void setSelectedEntries(List<BibEntry> newSelectedEntries) {
         selectedEntries.setAll(newSelectedEntries);
     }
 
-    public void setSelectedGroups(BibDatabaseContext database, List<GroupTreeNode> newSelectedGroups) {
+    public void setSelectedGroups(
+        BibDatabaseContext database,
+        List<GroupTreeNode> newSelectedGroups
+    ) {
         Objects.requireNonNull(newSelectedGroups);
-        selectedGroups.put(database, FXCollections.observableArrayList(newSelectedGroups));
+        selectedGroups.put(
+            database,
+            FXCollections.observableArrayList(newSelectedGroups)
+        );
     }
 
-    public ObservableList<GroupTreeNode> getSelectedGroup(BibDatabaseContext database) {
-        ObservableList<GroupTreeNode> selectedGroupsForDatabase = selectedGroups.get(database);
-        return selectedGroupsForDatabase != null ? selectedGroupsForDatabase : FXCollections.observableArrayList();
+    public ObservableList<GroupTreeNode> getSelectedGroup(
+        BibDatabaseContext database
+    ) {
+        ObservableList<GroupTreeNode> selectedGroupsForDatabase =
+            selectedGroups.get(database);
+        return selectedGroupsForDatabase != null
+            ? selectedGroupsForDatabase
+            : FXCollections.observableArrayList();
     }
 
     public void clearSelectedGroups(BibDatabaseContext database) {
@@ -145,8 +208,9 @@ public void setActiveDatabase(BibDatabaseContext database) {
     }
 
     public List<BibEntry> getEntriesInCurrentDatabase() {
-        return OptionalUtil.flatMap(activeDatabase.get(), BibDatabaseContext::getEntries)
-                           .collect(Collectors.toList());
+        return OptionalUtil
+            .flatMap(activeDatabase.get(), BibDatabaseContext::getEntries)
+            .collect(Collectors.toList());
     }
 
     public void clearSearchQuery() {
@@ -169,7 +233,10 @@ public ObservableList<Task<?>> getBackgroundTasks() {
         return EasyBind.map(backgroundTasks, Pair::getValue);
     }
 
-    public void addBackgroundTask(BackgroundTask<?> backgroundTask, Task<?> task) {
+    public void addBackgroundTask(
+        BackgroundTask<?> backgroundTask,
+        Task<?> task
+    ) {
         this.backgroundTasks.add(0, new Pair<>(backgroundTask, task));
     }
 
@@ -189,11 +256,16 @@ public DialogWindowState getDialogWindowState(String className) {
         return dialogWindowStates.get(className);
     }
 
-    public void setDialogWindowState(String className, DialogWindowState state) {
+    public void setDialogWindowState(
+        String className,
+        DialogWindowState state
+    ) {
         dialogWindowStates.put(className, state);
     }
 
-    public ObjectProperty<LastAutomaticFieldEditorEdit> lastAutomaticFieldEditorEditProperty() {
+    public ObjectProperty<
+        LastAutomaticFieldEditorEdit
+    > lastAutomaticFieldEditorEditProperty() {
         return lastAutomaticFieldEditorEdit;
     }
 
@@ -201,17 +273,23 @@ public LastAutomaticFieldEditorEdit getLastAutomaticFieldEditorEdit() {
         return lastAutomaticFieldEditorEditProperty().get();
     }
 
-    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("")));
+        getOpenDatabases()
+            .stream()
+            .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/Telemetry.java b/src/main/java/org/jabref/gui/Telemetry.java
index 6bb0a10195b..8cb6d383364 100644
--- a/src/main/java/org/jabref/gui/Telemetry.java
+++ b/src/main/java/org/jabref/gui/Telemetry.java
@@ -1,23 +1,23 @@
 package org.jabref.gui;
 
 import java.util.Optional;
-
 import org.jabref.logic.util.BuildInfo;
 import org.jabref.preferences.TelemetryPreferences;
 
 public class Telemetry {
-    private Telemetry() {
-    }
+
+    private Telemetry() {}
 
     public static Optional<TelemetryClient> getTelemetryClient() {
         return Optional.empty();
     }
 
-    private static void start(TelemetryPreferences telemetryPreferences, BuildInfo buildInfo) {
-    }
+    private static void start(
+        TelemetryPreferences telemetryPreferences,
+        BuildInfo buildInfo
+    ) {}
 
     public static void shutdown() {
-        getTelemetryClient().ifPresent(client -> {
-        });
+        getTelemetryClient().ifPresent(client -> {});
     }
 }
diff --git a/src/main/java/org/jabref/gui/TelemetryClient.java b/src/main/java/org/jabref/gui/TelemetryClient.java
index 077010f5ef6..ba453a4d8d4 100644
--- a/src/main/java/org/jabref/gui/TelemetryClient.java
+++ b/src/main/java/org/jabref/gui/TelemetryClient.java
@@ -3,9 +3,12 @@
 import java.util.Map;
 
 public class TelemetryClient {
-    public void trackEvent(String actionName) {
-    }
 
-    public <K, V> void trackEvent(String actionName, Map<K, V> source, Map<K, V> of) {
-    }
+    public void trackEvent(String actionName) {}
+
+    public <K, V> void trackEvent(
+        String actionName,
+        Map<K, V> source,
+        Map<K, V> of
+    ) {}
 }
diff --git a/src/main/java/org/jabref/gui/UpdateTimestampListener.java b/src/main/java/org/jabref/gui/UpdateTimestampListener.java
index 2ccc4a72d3c..03b237177de 100644
--- a/src/main/java/org/jabref/gui/UpdateTimestampListener.java
+++ b/src/main/java/org/jabref/gui/UpdateTimestampListener.java
@@ -1,16 +1,16 @@
 package org.jabref.gui;
 
+import com.google.common.eventbus.Subscribe;
 import org.jabref.model.entry.event.EntriesEventSource;
 import org.jabref.model.entry.event.EntryChangedEvent;
 import org.jabref.model.entry.field.StandardField;
 import org.jabref.preferences.PreferencesService;
 
-import com.google.common.eventbus.Subscribe;
-
 /**
  * Updates the timestamp of changed entries if the feature is enabled
  */
 class UpdateTimestampListener {
+
     private final PreferencesService preferencesService;
 
     UpdateTimestampListener(PreferencesService preferencesService) {
@@ -21,9 +21,19 @@ class UpdateTimestampListener {
     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 (preferencesService.getTimestampPreferences().shouldAddModificationDate() && event.getEntriesEventSource() != EntriesEventSource.CLEANUP_TIMESTAMP) {
-            event.getBibEntry().setField(StandardField.MODIFICATIONDATE,
-                    preferencesService.getTimestampPreferences().now());
+        if (
+            preferencesService
+                .getTimestampPreferences()
+                .shouldAddModificationDate() &&
+            event.getEntriesEventSource() !=
+                EntriesEventSource.CLEANUP_TIMESTAMP
+        ) {
+            event
+                .getBibEntry()
+                .setField(
+                    StandardField.MODIFICATIONDATE,
+                    preferencesService.getTimestampPreferences().now()
+                );
         }
     }
 }
diff --git a/src/main/java/org/jabref/gui/WaitForSaveFinishedDialog.java b/src/main/java/org/jabref/gui/WaitForSaveFinishedDialog.java
index 43f784669de..db0bb254e3b 100644
--- a/src/main/java/org/jabref/gui/WaitForSaveFinishedDialog.java
+++ b/src/main/java/org/jabref/gui/WaitForSaveFinishedDialog.java
@@ -1,9 +1,7 @@
 package org.jabref.gui;
 
 import java.util.List;
-
 import javafx.concurrent.Task;
-
 import org.jabref.logic.l10n.Localization;
 
 /**
@@ -22,7 +20,9 @@ public void showAndWait(List<LibraryTab> LibraryTabs) {
             Task<Void> waitForSaveFinished = new Task<>() {
                 @Override
                 protected Void call() throws Exception {
-                    while (LibraryTabs.stream().anyMatch(LibraryTab::isSaving)) {
+                    while (
+                        LibraryTabs.stream().anyMatch(LibraryTab::isSaving)
+                    ) {
                         if (isCancelled()) {
                             return null;
                         } else {
@@ -34,9 +34,10 @@ protected Void call() throws Exception {
             };
 
             dialogService.showProgressDialog(
-                    Localization.lang("Please wait..."),
-                    Localization.lang("Waiting for save operation to finish") + "...",
-                    waitForSaveFinished
+                Localization.lang("Please wait..."),
+                Localization.lang("Waiting for save operation to finish") +
+                "...",
+                waitForSaveFinished
             );
         }
     }
diff --git a/src/main/java/org/jabref/gui/actions/Action.java b/src/main/java/org/jabref/gui/actions/Action.java
index e6ccfe487b2..40b4d17f386 100644
--- a/src/main/java/org/jabref/gui/actions/Action.java
+++ b/src/main/java/org/jabref/gui/actions/Action.java
@@ -1,7 +1,6 @@
 package org.jabref.gui.actions;
 
 import java.util.Optional;
-
 import org.jabref.gui.icon.JabRefIcon;
 import org.jabref.gui.keyboard.KeyBinding;
 
diff --git a/src/main/java/org/jabref/gui/actions/ActionFactory.java b/src/main/java/org/jabref/gui/actions/ActionFactory.java
index 3deb6d068ef..45549c9e4d1 100644
--- a/src/main/java/org/jabref/gui/actions/ActionFactory.java
+++ b/src/main/java/org/jabref/gui/actions/ActionFactory.java
@@ -1,10 +1,12 @@
 package org.jabref.gui.actions;
 
+import com.sun.javafx.scene.control.ContextMenuContent;
+import com.tobiasdiez.easybind.EasyBind;
+import de.saxsys.mvvmfx.utils.commands.Command;
 import java.lang.reflect.InaccessibleObjectException;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.util.Objects;
-
 import javafx.beans.binding.BooleanExpression;
 import javafx.scene.control.Button;
 import javafx.scene.control.ButtonBase;
@@ -13,14 +15,9 @@
 import javafx.scene.control.Menu;
 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.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;
 
@@ -29,12 +26,15 @@
  */
 public class ActionFactory {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(ActionFactory.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(
+        ActionFactory.class
+    );
 
     private final KeyBindingRepository keyBindingRepository;
 
     public ActionFactory(KeyBindingRepository keyBindingRepository) {
-        this.keyBindingRepository = Objects.requireNonNull(keyBindingRepository);
+        this.keyBindingRepository =
+            Objects.requireNonNull(keyBindingRepository);
     }
 
     /**
@@ -42,7 +42,9 @@ public ActionFactory(KeyBindingRepository keyBindingRepository) {
      */
     private static void setGraphic(MenuItem node, Action action) {
         node.graphicProperty().unbind();
-        action.getIcon().ifPresent(icon -> node.setGraphic(icon.getGraphicNode()));
+        action
+            .getIcon()
+            .ifPresent(icon -> node.setGraphic(icon.getGraphicNode()));
     }
 
     /*
@@ -58,42 +60,63 @@ 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);
             }
         }
         return null;
     }
 
-    public MenuItem configureMenuItem(Action action, Command command, MenuItem menuItem) {
-        ActionUtils.configureMenuItem(new JabRefAction(action, command, keyBindingRepository, Sources.FromMenu), menuItem);
+    public MenuItem configureMenuItem(
+        Action action,
+        Command command,
+        MenuItem menuItem
+    ) {
+        ActionUtils.configureMenuItem(
+            new JabRefAction(
+                action,
+                command,
+                keyBindingRepository,
+                Sources.FromMenu
+            ),
+            menuItem
+        );
         setGraphic(menuItem, action);
 
         // Show tooltips
         if (command instanceof SimpleCommand simpleCommand) {
             EasyBind.subscribe(
-                    simpleCommand.statusMessageProperty(),
-                    message -> {
-                        Label label = getAssociatedNode(menuItem);
-                        if (label != null) {
-                            label.setMouseTransparent(false);
-                            if (StringUtil.isBlank(message)) {
-                                label.setTooltip(null);
-                            } else {
-                                label.setTooltip(new Tooltip(message));
-                            }
+                simpleCommand.statusMessageProperty(),
+                message -> {
+                    Label label = getAssociatedNode(menuItem);
+                    if (label != null) {
+                        label.setMouseTransparent(false);
+                        if (StringUtil.isBlank(message)) {
+                            label.setTooltip(null);
+                        } else {
+                            label.setTooltip(new Tooltip(message));
                         }
                     }
+                }
             );
         }
 
@@ -106,16 +129,38 @@ public MenuItem createMenuItem(Action action, Command command) {
         return menuItem;
     }
 
-    public CheckMenuItem createCheckMenuItem(Action action, Command command, boolean selected) {
-        CheckMenuItem checkMenuItem = ActionUtils.createCheckMenuItem(new JabRefAction(action, command, keyBindingRepository, Sources.FromMenu));
+    public CheckMenuItem createCheckMenuItem(
+        Action action,
+        Command command,
+        boolean selected
+    ) {
+        CheckMenuItem checkMenuItem = ActionUtils.createCheckMenuItem(
+            new JabRefAction(
+                action,
+                command,
+                keyBindingRepository,
+                Sources.FromMenu
+            )
+        );
         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, Sources.FromMenu));
+    public CheckMenuItem createCheckMenuItem(
+        Action action,
+        Command command,
+        BooleanExpression selectedBinding
+    ) {
+        CheckMenuItem checkMenuItem = ActionUtils.createCheckMenuItem(
+            new JabRefAction(
+                action,
+                command,
+                keyBindingRepository,
+                Sources.FromMenu
+            )
+        );
         EasyBind.subscribe(selectedBinding, checkMenuItem::setSelected);
         setGraphic(checkMenuItem, action);
 
@@ -123,7 +168,9 @@ public CheckMenuItem createCheckMenuItem(Action action, Command command, Boolean
     }
 
     public Menu createMenu(Action action) {
-        Menu menu = ActionUtils.createMenu(new JabRefAction(action, keyBindingRepository));
+        Menu menu = ActionUtils.createMenu(
+            new JabRefAction(action, keyBindingRepository)
+        );
 
         // For some reason the graphic is not set correctly, so let's fix this
         setGraphic(menu, action);
@@ -137,31 +184,53 @@ public Menu createSubMenu(Action action, MenuItem... children) {
     }
 
     public Button createIconButton(Action action, Command command) {
-        Button button = ActionUtils.createButton(new JabRefAction(action, command, keyBindingRepository, Sources.FromButton), ActionUtils.ActionTextBehavior.HIDE);
+        Button button = ActionUtils.createButton(
+            new JabRefAction(
+                action,
+                command,
+                keyBindingRepository,
+                Sources.FromButton
+            ),
+            ActionUtils.ActionTextBehavior.HIDE
+        );
 
         button.getStyleClass().setAll("icon-button");
 
         // For some reason the graphic is not set correctly, so let's fix this
         button.graphicProperty().unbind();
-        action.getIcon().ifPresent(icon -> button.setGraphic(icon.getGraphicNode()));
+        action
+            .getIcon()
+            .ifPresent(icon -> button.setGraphic(icon.getGraphicNode()));
 
         button.setFocusTraversable(false); // Prevent the buttons from stealing the focus
         return button;
     }
 
-    public ButtonBase configureIconButton(Action action, Command command, ButtonBase button) {
+    public ButtonBase configureIconButton(
+        Action action,
+        Command command,
+        ButtonBase button
+    ) {
         ActionUtils.unconfigureButton(button);
         ActionUtils.configureButton(
-                new JabRefAction(action, command, keyBindingRepository, Sources.FromButton),
-                button,
-                ActionUtils.ActionTextBehavior.HIDE);
+            new JabRefAction(
+                action,
+                command,
+                keyBindingRepository,
+                Sources.FromButton
+            ),
+            button,
+            ActionUtils.ActionTextBehavior.HIDE
+        );
 
         button.getStyleClass().add("icon-button");
 
         // For some reason the graphic is not set correctly, so let's fix this
         // ToDO: Find a way to reuse JabRefIconView
         button.graphicProperty().unbind();
-        action.getIcon().ifPresent(icon -> button.setGraphic(icon.getGraphicNode()));
+        action
+            .getIcon()
+            .ifPresent(icon -> button.setGraphic(icon.getGraphicNode()));
 
         return button;
     }
diff --git a/src/main/java/org/jabref/gui/actions/ActionHelper.java b/src/main/java/org/jabref/gui/actions/ActionHelper.java
index e82784a4782..3417d27bc4c 100644
--- a/src/main/java/org/jabref/gui/actions/ActionHelper.java
+++ b/src/main/java/org/jabref/gui/actions/ActionHelper.java
@@ -1,16 +1,16 @@
 package org.jabref.gui.actions;
 
+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;
-
 import javafx.beans.binding.Binding;
 import javafx.beans.binding.Bindings;
 import javafx.beans.binding.BooleanExpression;
 import javafx.collections.ObservableList;
 import javafx.scene.control.TabPane;
-
 import org.jabref.gui.StateManager;
 import org.jabref.logic.shared.DatabaseLocation;
 import org.jabref.logic.util.io.FileUtil;
@@ -20,67 +20,114 @@
 import org.jabref.model.entry.field.Field;
 import org.jabref.preferences.PreferencesService;
 
-import com.tobiasdiez.easybind.EasyBind;
-import com.tobiasdiez.easybind.EasyBinding;
-
 public class ActionHelper {
 
     public static BooleanExpression needsDatabase(StateManager stateManager) {
         return stateManager.activeDatabaseProperty().isPresent();
     }
 
-    public static BooleanExpression needsSharedDatabase(StateManager stateManager) {
-        EasyBinding<Boolean> binding = EasyBind.map(stateManager.activeDatabaseProperty(), context -> context.filter(c -> c.getLocation() == DatabaseLocation.SHARED).isPresent());
+    public static BooleanExpression needsSharedDatabase(
+        StateManager stateManager
+    ) {
+        EasyBinding<Boolean> binding = EasyBind.map(
+            stateManager.activeDatabaseProperty(),
+            context ->
+                context
+                    .filter(c -> c.getLocation() == DatabaseLocation.SHARED)
+                    .isPresent()
+        );
         return BooleanExpression.booleanExpression(binding);
     }
 
-    public static BooleanExpression needsStudyDatabase(StateManager stateManager) {
-        EasyBinding<Boolean> binding = EasyBind.map(stateManager.activeDatabaseProperty(), context -> context.filter(BibDatabaseContext::isStudy).isPresent());
+    public static BooleanExpression needsStudyDatabase(
+        StateManager stateManager
+    ) {
+        EasyBinding<Boolean> binding = EasyBind.map(
+            stateManager.activeDatabaseProperty(),
+            context -> context.filter(BibDatabaseContext::isStudy).isPresent()
+        );
         return BooleanExpression.booleanExpression(binding);
     }
 
-    public static BooleanExpression needsEntriesSelected(StateManager stateManager) {
+    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) {
-        return isAnyFieldSetForSelectedEntry(Collections.singletonList(field), stateManager);
+    public static BooleanExpression isFieldSetForSelectedEntry(
+        Field field,
+        StateManager stateManager
+    ) {
+        return isAnyFieldSetForSelectedEntry(
+            Collections.singletonList(field),
+            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);
+    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);
         return BooleanExpression.booleanExpression(fieldsAreSet);
     }
 
-    public static BooleanExpression isFilePresentForSelectedEntry(StateManager stateManager, PreferencesService preferencesService) {
-        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.get(0).isOnlineLink()) {
-                    return true;
-                }
-
-                Optional<Path> filename = FileUtil.find(
+    public static BooleanExpression isFilePresentForSelectedEntry(
+        StateManager stateManager,
+        PreferencesService preferencesService
+    ) {
+        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.get(0).isOnlineLink()) {
+                        return true;
+                    }
+
+                    Optional<Path> filename = FileUtil.find(
                         stateManager.getActiveDatabase().get(),
                         files.get(0).getLink(),
-                        preferencesService.getFilePreferences());
-                return filename.isPresent();
-            } else {
-                return false;
-            }
-        }).orElseOpt(false);
+                        preferencesService.getFilePreferences()
+                    );
+                    return filename.isPresent();
+                } else {
+                    return false;
+                }
+            })
+            .orElseOpt(false);
 
         return BooleanExpression.booleanExpression(fileIsPresent);
     }
@@ -93,9 +140,16 @@ public static BooleanExpression isFilePresentForSelectedEntry(StateManager state
      * @param stateManager manager for the state of the GUI
      * @return a boolean binding
      */
-    public static BooleanExpression hasLinkedFileForSelectedEntries(StateManager stateManager) {
-        return BooleanExpression.booleanExpression(EasyBind.reduce(stateManager.getSelectedEntries(),
-                entries -> entries.anyMatch(entry -> !entry.getFiles().isEmpty())));
+    public static BooleanExpression hasLinkedFileForSelectedEntries(
+        StateManager stateManager
+    ) {
+        return BooleanExpression.booleanExpression(
+            EasyBind.reduce(
+                stateManager.getSelectedEntries(),
+                entries ->
+                    entries.anyMatch(entry -> !entry.getFiles().isEmpty())
+            )
+        );
     }
 
     public static BooleanExpression isOpenMultiDatabase(TabPane tabbedPane) {
diff --git a/src/main/java/org/jabref/gui/actions/JabRefAction.java b/src/main/java/org/jabref/gui/actions/JabRefAction.java
index e20b7650d90..f7568a75730 100644
--- a/src/main/java/org/jabref/gui/actions/JabRefAction.java
+++ b/src/main/java/org/jabref/gui/actions/JabRefAction.java
@@ -1,30 +1,38 @@
 package org.jabref.gui.actions;
 
+import de.saxsys.mvvmfx.utils.commands.Command;
 import java.util.Map;
-
 import javafx.beans.binding.Bindings;
-
 import org.jabref.gui.Telemetry;
 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}.
  */
 class JabRefAction extends org.controlsfx.control.action.Action {
 
-    public JabRefAction(Action action, KeyBindingRepository keyBindingRepository) {
+    public JabRefAction(
+        Action action,
+        KeyBindingRepository keyBindingRepository
+    ) {
         super(action.getText());
-        action.getIcon()
-              .ifPresent(icon -> setGraphic(icon.getGraphicNode()));
-        action.getKeyBinding()
-              .ifPresent(keyBinding -> keyBindingRepository.getKeyCombination(keyBinding).ifPresent(combination -> setAccelerator(combination)));
+        action.getIcon().ifPresent(icon -> setGraphic(icon.getGraphicNode()));
+        action
+            .getKeyBinding()
+            .ifPresent(keyBinding ->
+                keyBindingRepository
+                    .getKeyCombination(keyBinding)
+                    .ifPresent(combination -> setAccelerator(combination))
+            );
 
         setLongText(action.getDescription());
     }
 
-    public JabRefAction(Action action, Command command, KeyBindingRepository keyBindingRepository) {
+    public JabRefAction(
+        Action action,
+        Command command,
+        KeyBindingRepository keyBindingRepository
+    ) {
         this(action, command, keyBindingRepository, null);
     }
 
@@ -33,9 +41,13 @@ public JabRefAction(Action action, Command command, KeyBindingRepository keyBind
      *
      * @param source is a string contains the source, for example "button"
      */
-    public JabRefAction(Action action, Command command, KeyBindingRepository keyBindingRepository, Sources source) {
+    public JabRefAction(
+        Action action,
+        Command command,
+        KeyBindingRepository keyBindingRepository,
+        Sources source
+    ) {
         this(action, keyBindingRepository);
-
         setEventHandler(event -> {
             command.execute();
             if (source == null) {
@@ -48,7 +60,13 @@ public JabRefAction(Action action, Command command, KeyBindingRepository keyBind
         disabledProperty().bind(command.executableProperty().not());
 
         if (command instanceof SimpleCommand ourCommand) {
-            longTextProperty().bind(Bindings.concat(action.getDescription(), ourCommand.statusMessageProperty()));
+            longTextProperty()
+                .bind(
+                    Bindings.concat(
+                        action.getDescription(),
+                        ourCommand.statusMessageProperty()
+                    )
+                );
         }
     }
 
@@ -57,11 +75,13 @@ private String getActionName(Action action, Command command) {
             return action.getText();
         } else {
             String commandName = command.getClass().getSimpleName();
-            if (commandName.contains("EditAction")
-                    || commandName.contains("CopyMoreAction")
-                    || commandName.contains("CopyCitationAction")
-                    || commandName.contains("PreviewSwitchAction")
-                    || commandName.contains("SaveAction")) {
+            if (
+                commandName.contains("EditAction") ||
+                commandName.contains("CopyMoreAction") ||
+                commandName.contains("CopyCitationAction") ||
+                commandName.contains("PreviewSwitchAction") ||
+                commandName.contains("SaveAction")
+            ) {
                 return command.toString();
             } else {
                 return commandName;
@@ -70,14 +90,21 @@ private String getActionName(Action action, Command command) {
     }
 
     private void trackExecute(String actionName) {
-        Telemetry.getTelemetryClient()
-                 .ifPresent(telemetryClient -> telemetryClient.trackEvent(actionName));
+        Telemetry
+            .getTelemetryClient()
+            .ifPresent(telemetryClient -> telemetryClient.trackEvent(actionName)
+            );
     }
 
     private void trackUserActionSource(String actionName, Sources source) {
-        Telemetry.getTelemetryClient().ifPresent(telemetryClient -> telemetryClient.trackEvent(
-                actionName,
-                Map.of("Source", source.toString()),
-                Map.of()));
+        Telemetry
+            .getTelemetryClient()
+            .ifPresent(telemetryClient ->
+                telemetryClient.trackEvent(
+                    actionName,
+                    Map.of("Source", source.toString()),
+                    Map.of()
+                )
+            );
     }
 }
diff --git a/src/main/java/org/jabref/gui/actions/SimpleCommand.java b/src/main/java/org/jabref/gui/actions/SimpleCommand.java
index 39e3b7ae1ad..0c03a96ba4a 100644
--- a/src/main/java/org/jabref/gui/actions/SimpleCommand.java
+++ b/src/main/java/org/jabref/gui/actions/SimpleCommand.java
@@ -1,19 +1,19 @@
 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.
  */
 public abstract class SimpleCommand extends CommandBase {
 
-    protected ReadOnlyStringWrapper statusMessage = new ReadOnlyStringWrapper("");
+    protected ReadOnlyStringWrapper statusMessage = new ReadOnlyStringWrapper(
+        ""
+    );
 
     public String getStatusMessage() {
         return statusMessage.get();
diff --git a/src/main/java/org/jabref/gui/actions/Sources.java b/src/main/java/org/jabref/gui/actions/Sources.java
index 48a3153f049..a8976f4ef65 100644
--- a/src/main/java/org/jabref/gui/actions/Sources.java
+++ b/src/main/java/org/jabref/gui/actions/Sources.java
@@ -2,5 +2,5 @@
 
 public enum Sources {
     FromButton,
-    FromMenu
+    FromMenu,
 }
diff --git a/src/main/java/org/jabref/gui/actions/StandardActions.java b/src/main/java/org/jabref/gui/actions/StandardActions.java
index 4053cdc7ea1..7d7060363bd 100644
--- a/src/main/java/org/jabref/gui/actions/StandardActions.java
+++ b/src/main/java/org/jabref/gui/actions/StandardActions.java
@@ -1,47 +1,112 @@
 package org.jabref.gui.actions;
 
 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 {
-
     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 \\cite{citation key}"), 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_KEY(
+        Localization.lang("Copy citation key"),
+        KeyBinding.COPY_CITATION_KEY
+    ),
+    COPY_CITE_KEY(
+        Localization.lang("Copy \\cite{citation key}"),
+        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),
-    COPY(Localization.lang("Copy"), IconTheme.JabRefIcons.COPY, KeyBinding.COPY),
-    PASTE(Localization.lang("Paste"), IconTheme.JabRefIcons.PASTE, KeyBinding.PASTE),
+    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
+    ),
+    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),
-    OPEN_EXTERNAL_FILE(Localization.lang("Open file"), IconTheme.JabRefIcons.FILE, KeyBinding.OPEN_FILE),
-    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
+    ),
+    OPEN_EXTERNAL_FILE(
+        Localization.lang("Open file"),
+        IconTheme.JabRefIcons.FILE,
+        KeyBinding.OPEN_FILE
+    ),
+    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),
+    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
+    ),
     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_LOW(Localization.lang("Set priority to low"), IconTheme.JabRefIcons.PRIORITY_LOW),
+    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_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),
@@ -50,63 +115,220 @@ public enum StandardActions implements Action {
     RANK_4(Localization.lang("Set rank to four"), IconTheme.JabRefIcons.RANK4),
     RANK_5(Localization.lang("Set rank to five"), IconTheme.JabRefIcons.RANK5),
     PRINTED(Localization.lang("Printed"), IconTheme.JabRefIcons.PRINTED),
-    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),
+    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
+    ),
     RELEVANCE(Localization.lang("Relevance"), IconTheme.JabRefIcons.RELEVANCE),
-    RELEVANT(Localization.lang("Toggle 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_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),
+    EXPORT(
+        Localization.lang("Export"),
+        IconTheme.JabRefIcons.EXPORT,
+        KeyBinding.EXPORT
+    ),
+    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
+    ),
     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),
-    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),
+    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
+    ),
+    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
+    ),
     MANAGE_KEYWORDS(Localization.lang("Manage keywords")),
     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),
-    TOOGLE_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
+    ),
+    TOOGLE_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),
-    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
+    ),
+    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")),
+    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")),
@@ -114,65 +336,235 @@ 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),
+    SHOW_PREFS(
+        Localization.lang("Preferences"),
+        IconTheme.JabRefIcons.PREFERENCES
+    ),
     MANAGE_JOURNALS(Localization.lang("Manage journal abbreviations")),
-    CUSTOMIZE_KEYBINDING(Localization.lang("Customize key bindings"), IconTheme.JabRefIcons.KEY_BINDINGS),
+    CUSTOMIZE_KEYBINDING(
+        Localization.lang("Customize key bindings"),
+        IconTheme.JabRefIcons.KEY_BINDINGS
+    ),
 
-    EDIT_ENTRY(Localization.lang("Open entry editor"), IconTheme.JabRefIcons.EDIT_ENTRY, KeyBinding.EDIT_ENTRY),
-    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),
+    EDIT_ENTRY(
+        Localization.lang("Open entry editor"),
+        IconTheme.JabRefIcons.EDIT_ENTRY,
+        KeyBinding.EDIT_ENTRY
+    ),
+    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
+    ),
     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_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, KeyBinding.NEW_ENTRY_FROM_PLAIN_TEXT),
+    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,
+        KeyBinding.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),
-    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),
-    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),
+    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
+    ),
+    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
+    ),
+    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
+    ),
 
-    EDIT_FILE_LINK(Localization.lang("Edit"), IconTheme.JabRefIcons.EDIT, KeyBinding.EDIT_ENTRY),
-    DOWNLOAD_FILE(Localization.lang("Download 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),
-    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),
+    EDIT_FILE_LINK(
+        Localization.lang("Edit"),
+        IconTheme.JabRefIcons.EDIT,
+        KeyBinding.EDIT_ENTRY
+    ),
+    DOWNLOAD_FILE(
+        Localization.lang("Download 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
+    ),
+    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
+    ),
 
-    HELP(Localization.lang("Online help"), 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(
+        Localization.lang("Online help"),
+        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")),
 
@@ -189,10 +581,16 @@ public enum StandardActions implements Action {
     GROUP_SUBGROUP_REMOVE(Localization.lang("Remove subgroups")),
     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(
+        Localization.lang("Sort subgroups by # of entries (Descending)")
+    ),
+    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"));
+    GROUP_ENTRIES_REMOVE(
+        Localization.lang("Remove selected entries from this group")
+    );
 
     private final String text;
     private final String description;
@@ -210,21 +608,34 @@ public enum StandardActions implements Action {
         this.keyBinding = Optional.empty();
     }
 
-    StandardActions(String text, IconTheme.JabRefIcons icon, KeyBinding keyBinding) {
+    StandardActions(
+        String text,
+        IconTheme.JabRefIcons icon,
+        KeyBinding keyBinding
+    ) {
         this.text = text;
         this.description = "";
         this.icon = Optional.of(icon);
         this.keyBinding = Optional.of(keyBinding);
     }
 
-    StandardActions(String text, String description, IconTheme.JabRefIcons icon) {
+    StandardActions(
+        String text,
+        String description,
+        IconTheme.JabRefIcons icon
+    ) {
         this.text = text;
         this.description = description;
         this.icon = Optional.of(icon);
         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/autocompleter/AppendWordsStrategy.java b/src/main/java/org/jabref/gui/autocompleter/AppendWordsStrategy.java
index 1cc0563be0b..f2af355d791 100644
--- a/src/main/java/org/jabref/gui/autocompleter/AppendWordsStrategy.java
+++ b/src/main/java/org/jabref/gui/autocompleter/AppendWordsStrategy.java
@@ -13,7 +13,10 @@ public AutoCompletionInput analyze(String input) {
         return determinePrefixAndReturnRemainder(input, getDelimiter());
     }
 
-    private AutoCompletionInput determinePrefixAndReturnRemainder(String input, String delimiter) {
+    private AutoCompletionInput determinePrefixAndReturnRemainder(
+        String input,
+        String delimiter
+    ) {
         int index = input.toLowerCase(Locale.ROOT).lastIndexOf(delimiter);
         if (index >= 0) {
             String prefix = input.substring(0, index + delimiter.length());
diff --git a/src/main/java/org/jabref/gui/autocompleter/AutoCompletePreferences.java b/src/main/java/org/jabref/gui/autocompleter/AutoCompletePreferences.java
index 160abb9ecb3..425a066bf1e 100644
--- a/src/main/java/org/jabref/gui/autocompleter/AutoCompletePreferences.java
+++ b/src/main/java/org/jabref/gui/autocompleter/AutoCompletePreferences.java
@@ -1,21 +1,21 @@
 package org.jabref.gui.autocompleter;
 
 import java.util.Set;
-
 import javafx.beans.property.BooleanProperty;
 import javafx.beans.property.ObjectProperty;
 import javafx.beans.property.SimpleBooleanProperty;
 import javafx.beans.property.SimpleObjectProperty;
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableSet;
-
 import org.jabref.model.entry.field.Field;
 import org.jabref.model.entry.field.FieldFactory;
 
 public class AutoCompletePreferences {
 
     public enum NameFormat {
-        LAST_FIRST, FIRST_LAST, BOTH
+        LAST_FIRST,
+        FIRST_LAST,
+        BOTH,
     }
 
     private final BooleanProperty shouldAutoComplete;
@@ -23,10 +23,12 @@ 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/AutoCompletionInput.java b/src/main/java/org/jabref/gui/autocompleter/AutoCompletionInput.java
index e5ebbdbd34e..5c33b4f94a7 100644
--- a/src/main/java/org/jabref/gui/autocompleter/AutoCompletionInput.java
+++ b/src/main/java/org/jabref/gui/autocompleter/AutoCompletionInput.java
@@ -1,6 +1,7 @@
 package org.jabref.gui.autocompleter;
 
 public class AutoCompletionInput {
+
     private String unfinishedPart;
     private String prefix;
 
diff --git a/src/main/java/org/jabref/gui/autocompleter/AutoCompletionTextInputBinding.java b/src/main/java/org/jabref/gui/autocompleter/AutoCompletionTextInputBinding.java
index 0bb48bb7275..f776e000af2 100644
--- a/src/main/java/org/jabref/gui/autocompleter/AutoCompletionTextInputBinding.java
+++ b/src/main/java/org/jabref/gui/autocompleter/AutoCompletionTextInputBinding.java
@@ -27,35 +27,41 @@
 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.jabref.gui.util.DefaultTaskExecutor;
-
 import org.controlsfx.control.textfield.AutoCompletionBinding;
+import org.jabref.gui.util.DefaultTaskExecutor;
 
 /**
  * Represents a binding between a text input control and an auto-completion popup
  * This class is a slightly modified version of {@link impl.org.controlsfx.autocompletion.AutoCompletionTextFieldBinding}
  * that works with general text input controls instead of just text fields.
  */
-public class AutoCompletionTextInputBinding<T> extends AutoCompletionBinding<T> {
+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) -> {
+    private final ChangeListener<String> textChangeListener = (
+        obs,
+        oldText,
+        newText
+    ) -> {
         if (getCompletionTarget().isFocused()) {
             setUserInputText(newText);
         }
     };
     private boolean showOnFocus;
-    private final ChangeListener<Boolean> focusChangedListener = (obs, oldFocused, newFocused) -> {
+    private final ChangeListener<Boolean> focusChangedListener = (
+        obs,
+        oldFocused,
+        newFocused
+    ) -> {
         if (newFocused) {
             if (showOnFocus) {
                 setUserInputText(getCompletionTarget().getText());
@@ -69,32 +75,45 @@ public class AutoCompletionTextInputBinding<T> extends AutoCompletionBinding<T>
      * 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) {
-
-        this(textInputControl,
-                suggestionProvider,
-                AutoCompletionTextInputBinding.defaultStringConverter(),
-                new ReplaceStrategy());
+    private AutoCompletionTextInputBinding(
+        final TextInputControl textInputControl,
+        Callback<ISuggestionRequest, Collection<T>> suggestionProvider
+    ) {
+        this(
+            textInputControl,
+            suggestionProvider,
+            AutoCompletionTextInputBinding.defaultStringConverter(),
+            new ReplaceStrategy()
+        );
     }
 
-    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
+    ) {
+        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;
         this.inputAnalyzer = inputAnalyzer;
 
         getCompletionTarget().textProperty().addListener(textChangeListener);
-        getCompletionTarget().focusedProperty().addListener(focusChangedListener);
+        getCompletionTarget()
+            .focusedProperty()
+            .addListener(focusChangedListener);
     }
 
     private static <T> StringConverter<T> defaultStringConverter() {
@@ -112,20 +131,50 @@ 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) {
-        new AutoCompletionTextInputBinding<>(textArea, suggestionProvider, 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) {
@@ -133,7 +182,9 @@ private void setUserInputText(String newText) {
             newText = "";
         }
         AutoCompletionInput input = inputAnalyzer.analyze(newText);
-        DefaultTaskExecutor.runInJavaFXThread(() -> setUserInput(input.getUnfinishedPart()));
+        DefaultTaskExecutor.runInJavaFXThread(() ->
+            setUserInput(input.getUnfinishedPart())
+        );
     }
 
     @Override
@@ -144,7 +195,9 @@ public TextInputControl getCompletionTarget() {
     @Override
     public void dispose() {
         getCompletionTarget().textProperty().removeListener(textChangeListener);
-        getCompletionTarget().focusedProperty().removeListener(focusChangedListener);
+        getCompletionTarget()
+            .focusedProperty()
+            .removeListener(focusChangedListener);
     }
 
     @Override
diff --git a/src/main/java/org/jabref/gui/autocompleter/BibEntrySuggestionProvider.java b/src/main/java/org/jabref/gui/autocompleter/BibEntrySuggestionProvider.java
index a69b8a3b1c1..da5330815b3 100644
--- a/src/main/java/org/jabref/gui/autocompleter/BibEntrySuggestionProvider.java
+++ b/src/main/java/org/jabref/gui/autocompleter/BibEntrySuggestionProvider.java
@@ -1,17 +1,15 @@
 package org.jabref.gui.autocompleter;
 
+import com.google.common.base.Equivalence;
 import java.util.Comparator;
 import java.util.stream.Stream;
-
+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;
-
 /**
  * Delivers possible completions as a list of {@link BibEntry} based on their citation key.
  */
@@ -34,11 +32,15 @@ protected Comparator<BibEntry> getComparator() {
     }
 
     @Override
-    protected boolean isMatch(BibEntry entry, AutoCompletionBinding.ISuggestionRequest request) {
+    protected boolean isMatch(
+        BibEntry entry,
+        AutoCompletionBinding.ISuggestionRequest request
+    ) {
         String userText = request.getUserText();
-        return entry.getCitationKey()
-                    .map(key -> StringUtil.containsIgnoreCase(key, userText))
-                    .orElse(false);
+        return entry
+            .getCitationKey()
+            .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 01e56ff5350..4362aed4e6c 100644
--- a/src/main/java/org/jabref/gui/autocompleter/ContentSelectorSuggestionProvider.java
+++ b/src/main/java/org/jabref/gui/autocompleter/ContentSelectorSuggestionProvider.java
@@ -8,21 +8,26 @@
 /**
  * Enriches a suggestion provider by a given set of content selector values.
  */
-public class ContentSelectorSuggestionProvider extends StringSuggestionProvider {
+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;
     }
 
     @Override
     public Stream<String> getSource() {
-        return Stream.concat(contentSelectorValues.stream(), suggestionProvider.getSource());
+        return Stream.concat(
+            contentSelectorValues.stream(),
+            suggestionProvider.getSource()
+        );
     }
 
     @Override
diff --git a/src/main/java/org/jabref/gui/autocompleter/EmptySuggestionProvider.java b/src/main/java/org/jabref/gui/autocompleter/EmptySuggestionProvider.java
index ab7df191fb5..f91cc0bc974 100644
--- a/src/main/java/org/jabref/gui/autocompleter/EmptySuggestionProvider.java
+++ b/src/main/java/org/jabref/gui/autocompleter/EmptySuggestionProvider.java
@@ -1,12 +1,12 @@
 package org.jabref.gui.autocompleter;
 
+import com.google.common.base.Equivalence;
 import java.util.Comparator;
 import java.util.stream.Stream;
-
-import com.google.common.base.Equivalence;
 import org.controlsfx.control.textfield.AutoCompletionBinding;
 
 public class EmptySuggestionProvider extends SuggestionProvider<String> {
+
     @Override
     protected Equivalence<String> getEquivalence() {
         return Equivalence.equals().onResultOf(value -> value);
@@ -18,7 +18,10 @@ protected Comparator<String> getComparator() {
     }
 
     @Override
-    protected boolean isMatch(String candidate, AutoCompletionBinding.ISuggestionRequest request) {
+    protected boolean isMatch(
+        String candidate,
+        AutoCompletionBinding.ISuggestionRequest request
+    ) {
         return false;
     }
 
diff --git a/src/main/java/org/jabref/gui/autocompleter/FieldValueSuggestionProvider.java b/src/main/java/org/jabref/gui/autocompleter/FieldValueSuggestionProvider.java
index 1fae672e250..5122d4a16c6 100644
--- a/src/main/java/org/jabref/gui/autocompleter/FieldValueSuggestionProvider.java
+++ b/src/main/java/org/jabref/gui/autocompleter/FieldValueSuggestionProvider.java
@@ -2,7 +2,6 @@
 
 import java.util.Objects;
 import java.util.stream.Stream;
-
 import org.jabref.model.database.BibDatabase;
 import org.jabref.model.entry.field.Field;
 
@@ -21,6 +20,9 @@ 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 c0ece685519..e01078855d6 100644
--- a/src/main/java/org/jabref/gui/autocompleter/JournalsSuggestionProvider.java
+++ b/src/main/java/org/jabref/gui/autocompleter/JournalsSuggestionProvider.java
@@ -1,25 +1,29 @@
 package org.jabref.gui.autocompleter;
 
+import com.google.common.collect.Streams;
 import java.util.stream.Stream;
-
 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;
-
 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;
     }
 
     @Override
     public Stream<String> getSource() {
-        return Streams.concat(super.getSource(), repository.getFullNames().stream());
+        return Streams.concat(
+            super.getSource(),
+            repository.getFullNames().stream()
+        );
     }
 }
diff --git a/src/main/java/org/jabref/gui/autocompleter/PersonNameStringConverter.java b/src/main/java/org/jabref/gui/autocompleter/PersonNameStringConverter.java
index c78312638af..59ea08aba9b 100644
--- a/src/main/java/org/jabref/gui/autocompleter/PersonNameStringConverter.java
+++ b/src/main/java/org/jabref/gui/autocompleter/PersonNameStringConverter.java
@@ -1,7 +1,6 @@
 package org.jabref.gui.autocompleter;
 
 import javafx.util.StringConverter;
-
 import org.jabref.model.entry.Author;
 import org.jabref.model.entry.AuthorList;
 
@@ -11,7 +10,11 @@ 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 2ff7d4a4ed1..bb72a6a2203 100644
--- a/src/main/java/org/jabref/gui/autocompleter/PersonNameSuggestionProvider.java
+++ b/src/main/java/org/jabref/gui/autocompleter/PersonNameSuggestionProvider.java
@@ -1,12 +1,13 @@
 package org.jabref.gui.autocompleter;
 
+import com.google.common.base.Equivalence;
 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 org.controlsfx.control.textfield.AutoCompletionBinding;
 import org.jabref.model.database.BibDatabase;
 import org.jabref.model.entry.Author;
 import org.jabref.model.entry.AuthorList;
@@ -14,9 +15,6 @@
 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;
-
 /**
  * Delivers possible completions as a list of {@link Author}s.
  */
@@ -26,24 +24,30 @@ public class PersonNameSuggestionProvider extends SuggestionProvider<Author> {
     private final BibDatabase database;
 
     PersonNameSuggestionProvider(Field field, BibDatabase database) {
-        this(Collections.singletonList(Objects.requireNonNull(field)), database);
+        this(
+            Collections.singletonList(Objects.requireNonNull(field)),
+            database
+        );
     }
 
-    public PersonNameSuggestionProvider(Collection<Field> fields, BibDatabase database) {
+    public PersonNameSuggestionProvider(
+        Collection<Field> fields,
+        BibDatabase database
+    ) {
         super();
-
         this.fields = Objects.requireNonNull(fields);
         this.database = database;
     }
 
     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
@@ -57,14 +61,18 @@ protected Comparator<Author> getComparator() {
     }
 
     @Override
-    protected boolean isMatch(Author candidate, AutoCompletionBinding.ISuggestionRequest request) {
-        return StringUtil.containsIgnoreCase(candidate.getLastFirst(false), request.getUserText());
+    protected boolean isMatch(
+        Author candidate,
+        AutoCompletionBinding.ISuggestionRequest request
+    ) {
+        return StringUtil.containsIgnoreCase(
+            candidate.getLastFirst(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 01ba19ef39e..8ddf43ac54f 100644
--- a/src/main/java/org/jabref/gui/autocompleter/StringSuggestionProvider.java
+++ b/src/main/java/org/jabref/gui/autocompleter/StringSuggestionProvider.java
@@ -1,12 +1,10 @@
 package org.jabref.gui.autocompleter;
 
+import com.google.common.base.Equivalence;
 import java.util.Comparator;
 import java.util.stream.Stream;
-
-import org.jabref.model.strings.StringUtil;
-
-import com.google.common.base.Equivalence;
 import org.controlsfx.control.textfield.AutoCompletionBinding;
+import org.jabref.model.strings.StringUtil;
 
 abstract class StringSuggestionProvider extends SuggestionProvider<String> {
 
@@ -21,7 +19,10 @@ protected Comparator<String> getComparator() {
     }
 
     @Override
-    protected boolean isMatch(String candidate, AutoCompletionBinding.ISuggestionRequest request) {
+    protected boolean isMatch(
+        String candidate,
+        AutoCompletionBinding.ISuggestionRequest request
+    ) {
         return StringUtil.containsIgnoreCase(candidate, request.getUserText());
     }
 
diff --git a/src/main/java/org/jabref/gui/autocompleter/SuggestionProvider.java b/src/main/java/org/jabref/gui/autocompleter/SuggestionProvider.java
index 341c9ef8f5e..09e5aa463c8 100644
--- a/src/main/java/org/jabref/gui/autocompleter/SuggestionProvider.java
+++ b/src/main/java/org/jabref/gui/autocompleter/SuggestionProvider.java
@@ -26,13 +26,12 @@
  */
 package org.jabref.gui.autocompleter;
 
+import com.google.common.base.Equivalence;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.Comparator;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
-
-import com.google.common.base.Equivalence;
 import org.controlsfx.control.textfield.AutoCompletionBinding.ISuggestionRequest;
 
 /**
@@ -46,13 +45,14 @@ 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();
         }
@@ -63,11 +63,12 @@ public final Collection<T> provideSuggestions(ISuggestionRequest request) {
     public Collection<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 06d2abef8a8..f9cd6f8b588 100644
--- a/src/main/java/org/jabref/gui/autocompleter/SuggestionProviders.java
+++ b/src/main/java/org/jabref/gui/autocompleter/SuggestionProviders.java
@@ -1,7 +1,6 @@
 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;
@@ -15,7 +14,11 @@ 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;
@@ -27,17 +30,30 @@ public SuggestionProviders() {
     }
 
     public SuggestionProvider<?> getForField(Field field) {
-        if (isEmpty || !autoCompletePreferences.getCompleteFields().contains(field)) {
+        if (
+            isEmpty ||
+            !autoCompletePreferences.getCompleteFields().contains(field)
+        ) {
             return new EmptySuggestionProvider();
         }
 
         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) {
-            return new JournalsSuggestionProvider(field, database, abbreviationRepository);
+        } 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 f83d047b0f7..9131e91129d 100644
--- a/src/main/java/org/jabref/gui/autocompleter/WordSuggestionProvider.java
+++ b/src/main/java/org/jabref/gui/autocompleter/WordSuggestionProvider.java
@@ -2,7 +2,6 @@
 
 import java.util.Objects;
 import java.util.stream.Stream;
-
 import org.jabref.model.database.BibDatabase;
 import org.jabref.model.entry.field.Field;
 
@@ -21,8 +20,9 @@ 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 72402b18dd5..5db53261a04 100644
--- a/src/main/java/org/jabref/gui/autosaveandbackup/AutosaveManager.java
+++ b/src/main/java/org/jabref/gui/autosaveandbackup/AutosaveManager.java
@@ -1,17 +1,15 @@
 package org.jabref.gui.autosaveandbackup;
 
+import com.google.common.eventbus.EventBus;
+import com.google.common.eventbus.Subscribe;
 import java.util.HashSet;
 import java.util.Set;
 import java.util.concurrent.ScheduledThreadPoolExecutor;
 import java.util.concurrent.TimeUnit;
-
 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;
 
@@ -22,7 +20,9 @@
  */
 public class AutosaveManager {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(AutosaveManager.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(
+        AutosaveManager.class
+    );
 
     private static final int DELAY_BETWEEN_AUTOSAVE_ATTEMPTS_IN_SECONDS = 31;
 
@@ -45,17 +45,20 @@ 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,
                 DELAY_BETWEEN_AUTOSAVE_ATTEMPTS_IN_SECONDS,
-                TimeUnit.SECONDS);
+                TimeUnit.SECONDS
+            );
     }
 
     @Subscribe
-    public void listen(@SuppressWarnings("unused") BibDatabaseContextChangedEvent event) {
+    public void listen(
+        @SuppressWarnings("unused") BibDatabaseContextChangedEvent event
+    ) {
         if (!event.isFilteredOut()) {
             this.needsSave = true;
         }
@@ -73,7 +76,9 @@ private void shutdown() {
      * @param bibDatabaseContext Associated {@link BibDatabaseContext}
      */
     public static AutosaveManager start(BibDatabaseContext bibDatabaseContext) {
-        AutosaveManager autosaveManager = new AutosaveManager(bibDatabaseContext);
+        AutosaveManager autosaveManager = new AutosaveManager(
+            bibDatabaseContext
+        );
         runningInstances.add(autosaveManager);
         return autosaveManager;
     }
@@ -84,11 +89,16 @@ 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 -> {
-                            instance.shutdown();
-                            runningInstances.remove(instance);
-                        });
+        runningInstances
+            .stream()
+            .filter(instance ->
+                instance.bibDatabaseContext == bibDatabaseContext
+            )
+            .findAny()
+            .ifPresent(instance -> {
+                instance.shutdown();
+                runningInstances.remove(instance);
+            });
     }
 
     public void registerListener(Object listener) {
diff --git a/src/main/java/org/jabref/gui/autosaveandbackup/BackupManager.java b/src/main/java/org/jabref/gui/autosaveandbackup/BackupManager.java
index 1b9017f192f..ea380af2e58 100644
--- a/src/main/java/org/jabref/gui/autosaveandbackup/BackupManager.java
+++ b/src/main/java/org/jabref/gui/autosaveandbackup/BackupManager.java
@@ -1,5 +1,6 @@
 package org.jabref.gui.autosaveandbackup;
 
+import com.google.common.eventbus.Subscribe;
 import java.io.IOException;
 import java.io.Writer;
 import java.nio.charset.Charset;
@@ -18,9 +19,7 @@
 import java.util.concurrent.LinkedBlockingQueue;
 import java.util.concurrent.ScheduledThreadPoolExecutor;
 import java.util.concurrent.TimeUnit;
-
 import javafx.scene.control.TableColumn;
-
 import org.jabref.gui.LibraryTab;
 import org.jabref.gui.maintable.BibEntryTableViewModel;
 import org.jabref.gui.maintable.columns.MainTableColumn;
@@ -38,8 +37,6 @@
 import org.jabref.model.metadata.SaveOrder;
 import org.jabref.model.metadata.SelfContainedSaveOrder;
 import org.jabref.preferences.PreferencesService;
-
-import com.google.common.eventbus.Subscribe;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -51,7 +48,9 @@
  */
 public class BackupManager {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(BackupManager.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(
+        BackupManager.class
+    );
 
     private static final int MAXIMUM_BACKUP_FILE_COUNT = 10;
 
@@ -71,7 +70,12 @@ public class BackupManager {
     private final Queue<Path> backupFilesQueue = new LinkedBlockingQueue<>();
     private boolean needsBackup = false;
 
-    BackupManager(LibraryTab libraryTab, BibDatabaseContext bibDatabaseContext, BibEntryTypesManager entryTypesManager, PreferencesService preferences) {
+    BackupManager(
+        LibraryTab libraryTab,
+        BibDatabaseContext bibDatabaseContext,
+        BibEntryTypesManager entryTypesManager,
+        PreferencesService preferences
+    ) {
         this.bibDatabaseContext = bibDatabaseContext;
         this.entryTypesManager = entryTypesManager;
         this.preferences = preferences;
@@ -86,14 +90,25 @@ 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);
+    static Optional<Path> getLatestBackupPath(
+        Path originalPath,
+        Path backupDir
+    ) {
+        return BackupFileUtil.getPathOfLatestExistingBackupFile(
+            originalPath,
+            BackupFileType.BACKUP,
+            backupDir
+        );
     }
 
     /**
@@ -104,9 +119,21 @@ static Optional<Path> getLatestBackupPath(Path originalPath, Path backupDir) {
      *
      * @param bibDatabaseContext Associated {@link BibDatabaseContext}
      */
-    public static BackupManager start(LibraryTab libraryTab, BibDatabaseContext bibDatabaseContext, BibEntryTypesManager entryTypesManager, PreferencesService preferences) {
-        BackupManager backupManager = new BackupManager(libraryTab, bibDatabaseContext, entryTypesManager, preferences);
-        backupManager.startBackupTask(preferences.getFilePreferences().getBackupDirectory());
+    public static BackupManager start(
+        LibraryTab libraryTab,
+        BibDatabaseContext bibDatabaseContext,
+        BibEntryTypesManager entryTypesManager,
+        PreferencesService preferences
+    ) {
+        BackupManager backupManager = new BackupManager(
+            libraryTab,
+            bibDatabaseContext,
+            entryTypesManager,
+            preferences
+        );
+        backupManager.startBackupTask(
+            preferences.getFilePreferences().getBackupDirectory()
+        );
         runningInstances.add(backupManager);
         return backupManager;
     }
@@ -116,8 +143,16 @@ 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));
+    public static void discardBackup(
+        BibDatabaseContext bibDatabaseContext,
+        Path backupDir
+    ) {
+        runningInstances
+            .stream()
+            .filter(instance ->
+                instance.bibDatabaseContext == bibDatabaseContext
+            )
+            .forEach(backupManager -> backupManager.discardBackup(backupDir));
     }
 
     /**
@@ -127,9 +162,22 @@ 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));
-        runningInstances.removeIf(instance -> instance.bibDatabaseContext == bibDatabaseContext);
+    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
+        );
     }
 
     /**
@@ -150,41 +198,67 @@ public static boolean backupFileDiffers(Path originalPath, Path backupDir) {
             try {
                 Files.delete(discardedFile);
             } catch (IOException e) {
-                LOGGER.error("Could not remove discarded file {}", discardedFile, e);
+                LOGGER.error(
+                    "Could not remove discarded file {}",
+                    discardedFile,
+                    e
+                );
                 return true;
             }
             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 {
-                return Files.mismatch(originalPath, latestBackupPath) != -1L;
-            } 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 {
+                    return (
+                        Files.mismatch(originalPath, latestBackupPath) != -1L
+                    );
+                } 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);
     }
 
     /**
@@ -193,20 +267,31 @@ public static boolean backupFileDiffers(Path originalPath, Path backupDir) {
      * @param originalPath Path to the file which should be equalized to the backup file.
      */
     public static void restoreBackup(Path originalPath, Path backupDir) {
-        Optional<Path> backupPath = getLatestBackupPath(originalPath, backupDir);
+        Optional<Path> backupPath = getLatestBackupPath(
+            originalPath,
+            backupDir
+        );
         if (backupPath.isEmpty()) {
             LOGGER.error("There is no backup file");
             return;
         }
         try {
-            Files.copy(backupPath.get(), originalPath, StandardCopyOption.REPLACE_EXISTING);
+            Files.copy(
+                backupPath.get(),
+                originalPath,
+                StandardCopyOption.REPLACE_EXISTING
+            );
         } catch (IOException e) {
             LOGGER.error("Error while restoring the backup file.", e);
         }
     }
 
     Optional<Path> determineBackupPathForNewBackup(Path backupDir) {
-        return bibDatabaseContext.getDatabasePath().map(path -> BackupManager.getBackupPathForNewBackup(path, backupDir));
+        return bibDatabaseContext
+            .getDatabasePath()
+            .map(path ->
+                BackupManager.getBackupPathForNewBackup(path, backupDir)
+            );
     }
 
     /**
@@ -227,48 +312,72 @@ void performBackup(Path backupPath) {
             try {
                 Files.delete(oldestBackupFile);
             } catch (IOException e) {
-                LOGGER.error("Could not delete backup file {}", oldestBackupFile, e);
+                LOGGER.error(
+                    "Could not delete backup file {}",
+                    oldestBackupFile,
+                    e
+                );
             }
         }
 
         // 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()
+            .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());
-
-        Charset encoding = bibDatabaseContext.getMetaData().getEncoding().orElse(StandardCharsets.UTF_8);
+                .withReformatOnSave(
+                    preferences
+                        .getLibraryPreferences()
+                        .shouldAlwaysReformatOnSave()
+                );
+
+        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 the write 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());
+        try (
+            Writer writer = new AtomicFileWriter(backupPath, encoding, false)
+        ) {
+            BibWriter bibWriter = new BibWriter(
+                writer,
+                bibDatabaseContext.getDatabase().getNewLineSeparator()
+            );
             new BibtexDatabaseWriter(
-                    bibWriter,
-                    saveConfiguration,
-                    preferences.getFieldPreferences(),
-                    preferences.getCitationKeyPatternPreferences(),
-                    entryTypesManager)
-                    .saveDatabase(bibDatabaseContext);
+                bibWriter,
+                saveConfiguration,
+                preferences.getFieldPreferences(),
+                preferences.getCitationKeyPatternPreferences(),
+                entryTypesManager
+            )
+                .saveDatabase(bibDatabaseContext);
             backupFilesQueue.add(backupPath);
 
             // We wrote the file successfully
@@ -280,7 +389,12 @@ 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"
+        );
     }
 
     /**
@@ -290,7 +404,10 @@ private static Path determineDiscardedFile(Path file, Path backupDir) {
      * Therefore, we mark discarded backups by a --discarded file.
      */
     public void discardBackup(Path backupDir) {
-        Path path = determineDiscardedFile(bibDatabaseContext.getDatabasePath().get(), backupDir);
+        Path path = determineDiscardedFile(
+            bibDatabaseContext.getDatabasePath().get(),
+            backupDir
+        );
         try {
             Files.createFile(path);
         } catch (IOException e) {
@@ -303,7 +420,8 @@ private void logIfCritical(Path backupPath, IOException e) {
         while (innermostCause.getCause() != null) {
             innermostCause = innermostCause.getCause();
         }
-        boolean isErrorInField = innermostCause instanceof InvalidFieldValueException;
+        boolean isErrorInField =
+            innermostCause instanceof InvalidFieldValueException;
 
         // do not print errors in field values into the log during autosave
         if (!isErrorInField) {
@@ -312,7 +430,9 @@ 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;
         }
@@ -322,30 +442,42 @@ 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);
+                }
+            });
     }
 
     /**
@@ -362,7 +494,8 @@ private void shutdown(Path backupDir, boolean createBackup) {
 
         if (createBackup) {
             // Ensure that backup is a recent one
-            determineBackupPathForNewBackup(backupDir).ifPresent(this::performBackup);
+            determineBackupPathForNewBackup(backupDir)
+                .ifPresent(this::performBackup);
         }
     }
 }
diff --git a/src/main/java/org/jabref/gui/auximport/AuxParserResultViewModel.java b/src/main/java/org/jabref/gui/auximport/AuxParserResultViewModel.java
index 511ef2d168a..3eb43d104ff 100644
--- a/src/main/java/org/jabref/gui/auximport/AuxParserResultViewModel.java
+++ b/src/main/java/org/jabref/gui/auximport/AuxParserResultViewModel.java
@@ -1,7 +1,6 @@
 package org.jabref.gui.auximport;
 
 import java.util.stream.Collectors;
-
 import org.jabref.logic.auxparser.AuxParserResult;
 import org.jabref.logic.l10n.Localization;
 
@@ -20,19 +19,48 @@ 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(", ", " (", ")"));
+        if (
+            includeMissingEntries &&
+            (this.auxParserResult.getUnresolvedKeysCount() > 0)
+        ) {
+            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 02e947dc0f0..524f2d7df9b 100644
--- a/src/main/java/org/jabref/gui/auximport/FromAuxDialog.java
+++ b/src/main/java/org/jabref/gui/auximport/FromAuxDialog.java
@@ -1,5 +1,8 @@
 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;
@@ -7,7 +10,6 @@
 import javafx.scene.control.ListView;
 import javafx.scene.control.TextArea;
 import javafx.scene.control.TextField;
-
 import org.jabref.gui.DialogService;
 import org.jabref.gui.LibraryTabContainer;
 import org.jabref.gui.StateManager;
@@ -18,24 +20,37 @@
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.preferences.PreferencesService;
 
-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
  */
 public class FromAuxDialog extends BaseDialog<Void> {
-    @FXML private ButtonType generateButtonType;
-    @FXML private TextField auxFileField;
-    @FXML private ListView<String> notFoundList;
-    @FXML private TextArea statusInfos;
-    @FXML private ComboBox<BibDatabaseContext> libraryListView;
 
-    @Inject private PreferencesService preferences;
-    @Inject private DialogService dialogService;
-    @Inject private ThemeManager themeManager;
-    @Inject private StateManager stateManager;
+    @FXML
+    private ButtonType generateButtonType;
+
+    @FXML
+    private TextField auxFileField;
+
+    @FXML
+    private ListView<String> notFoundList;
+
+    @FXML
+    private TextArea statusInfos;
+
+    @FXML
+    private ComboBox<BibDatabaseContext> libraryListView;
+
+    @Inject
+    private PreferencesService preferences;
+
+    @Inject
+    private DialogService dialogService;
+
+    @Inject
+    private ThemeManager themeManager;
+
+    @Inject
+    private StateManager stateManager;
 
     private final LibraryTabContainer tabContainer;
     private FromAuxDialogViewModel viewModel;
@@ -44,13 +59,20 @@ 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().or(viewModel.notFoundList().emptyProperty().not()));
-        generateButton.defaultButtonProperty().bind(generateButton.disableProperty().not());
+        Button generateButton = (Button) this.getDialogPane()
+            .lookupButton(generateButtonType);
+        generateButton
+            .disableProperty()
+            .bind(
+                viewModel
+                    .parseFailedProperty()
+                    .or(viewModel.notFoundList().emptyProperty().not())
+            );
+        generateButton
+            .defaultButtonProperty()
+            .bind(generateButton.disableProperty().not());
         setResultConverter(button -> {
             if (button == generateButtonType) {
                 viewModel.addResultToTabContainer();
@@ -63,19 +85,34 @@ public FromAuxDialog(LibraryTabContainer tabContainer) {
 
     @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());
+        auxFileField
+            .textProperty()
+            .bindBidirectional(viewModel.auxFileProperty());
+        statusInfos
+            .textProperty()
+            .bindBidirectional(viewModel.statusTextProperty());
         notFoundList.itemsProperty().bind(viewModel.notFoundList());
 
         libraryListView.setEditable(false);
         libraryListView.itemsProperty().bind(viewModel.librariesProperty());
-        libraryListView.valueProperty().bindBidirectional(viewModel.selectedLibraryProperty());
+        libraryListView
+            .valueProperty()
+            .bindBidirectional(viewModel.selectedLibraryProperty());
         new ViewModelListCellFactory<BibDatabaseContext>()
-                .withText(viewModel::getDatabaseName)
-                .install(libraryListView);
-        EasyBind.listen(libraryListView.getSelectionModel().selectedItemProperty(), (obs, oldValue, newValue) -> parseActionPerformed());
+            .withText(viewModel::getDatabaseName)
+            .install(libraryListView);
+        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 a699e52c5b9..5c019326ed9 100644
--- a/src/main/java/org/jabref/gui/auximport/FromAuxDialogViewModel.java
+++ b/src/main/java/org/jabref/gui/auximport/FromAuxDialogViewModel.java
@@ -1,8 +1,8 @@
 package org.jabref.gui.auximport;
 
+import com.tobiasdiez.easybind.EasyBind;
 import java.nio.file.Path;
 import java.util.Optional;
-
 import javafx.beans.property.BooleanProperty;
 import javafx.beans.property.ListProperty;
 import javafx.beans.property.ObjectProperty;
@@ -13,7 +13,6 @@
 import javafx.beans.property.SimpleStringProperty;
 import javafx.beans.property.StringProperty;
 import javafx.collections.FXCollections;
-
 import org.jabref.gui.DialogService;
 import org.jabref.gui.LibraryTabContainer;
 import org.jabref.gui.StateManager;
@@ -29,16 +28,20 @@
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.preferences.PreferencesService;
 
-import com.tobiasdiez.easybind.EasyBind;
-
 public class FromAuxDialogViewModel {
 
-    private final BooleanProperty parseFailedProperty = new SimpleBooleanProperty(false);
+    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 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 LibraryTabContainer tabContainer;
     private final DialogService dialogService;
@@ -47,60 +50,99 @@ public class FromAuxDialogViewModel {
 
     private AuxParserResult auxParserResult;
 
-    public FromAuxDialogViewModel(LibraryTabContainer tabContainer,
-                                  DialogService dialogService,
-                                  PreferencesService preferencesService,
-                                  StateManager stateManager) {
+    public FromAuxDialogViewModel(
+        LibraryTabContainer tabContainer,
+        DialogService dialogService,
+        PreferencesService preferencesService,
+        StateManager stateManager
+    ) {
         this.tabContainer = tabContainer;
         this.dialogService = dialogService;
         this.preferencesService = preferencesService;
         this.stateManager = stateManager;
 
         librariesProperty.setAll(stateManager.getOpenDatabases());
-        selectedLibraryProperty.set(tabContainer.getCurrentLibraryTab().getBibDatabaseContext());
-        EasyBind.listen(selectedLibraryProperty, (obs, oldValue, newValue) -> {
-            if (auxParserResult != null) {
-                parse();
+        selectedLibraryProperty.set(
+            tabContainer.getCurrentLibraryTab().getBibDatabaseContext()
+        );
+        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()
+        FileDialogConfiguration fileDialogConfiguration =
+            new FileDialogConfiguration.Builder()
                 .addExtensionFilter(StandardFileType.AUX)
                 .withDefaultExtension(StandardFileType.AUX)
-                .withInitialDirectory(preferencesService.getFilePreferences().getWorkingDirectory()).build();
-        dialogService.showFileOpenDialog(fileDialogConfiguration).ifPresent(file -> auxFileProperty.setValue(file.toAbsolutePath().toString()));
+                .withInitialDirectory(
+                    preferencesService
+                        .getFilePreferences()
+                        .getWorkingDirectory()
+                )
+                .build();
+        dialogService
+            .showFileOpenDialog(fileDialogConfiguration)
+            .ifPresent(file ->
+                auxFileProperty.setValue(file.toAbsolutePath().toString())
+            );
     }
 
     public void parse() {
         parseFailedProperty.set(false);
         notFoundList.clear();
         statusTextProperty.setValue("");
-        BibDatabase referenceDatabase = selectedLibraryProperty.get().getDatabase();
+        BibDatabase referenceDatabase = selectedLibraryProperty
+            .get()
+            .getDatabase();
         String auxName = auxFileProperty.get();
 
-        if ((auxName != null) && (referenceDatabase != null) && !auxName.isEmpty()) {
+        if (
+            (auxName != null) &&
+            (referenceDatabase != null) &&
+            !auxName.isEmpty()
+        ) {
             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 +151,9 @@ 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 65cc37abfd9..73d20146105 100644
--- a/src/main/java/org/jabref/gui/auximport/NewSubLibraryAction.java
+++ b/src/main/java/org/jabref/gui/auximport/NewSubLibraryAction.java
@@ -1,14 +1,13 @@
 package org.jabref.gui.auximport;
 
+import static org.jabref.gui.actions.ActionHelper.needsDatabase;
+
+import com.airhacks.afterburner.injection.Injector;
 import org.jabref.gui.DialogService;
 import org.jabref.gui.JabRefFrame;
 import org.jabref.gui.StateManager;
 import org.jabref.gui.actions.SimpleCommand;
 
-import com.airhacks.afterburner.injection.Injector;
-
-import static org.jabref.gui.actions.ActionHelper.needsDatabase;
-
 /**
  * The action concerned with generate a new (sub-)database from latex AUX file.
  *
@@ -18,7 +17,10 @@ public class NewSubLibraryAction extends SimpleCommand {
 
     private final JabRefFrame jabRefFrame;
 
-    public NewSubLibraryAction(JabRefFrame jabRefFrame, StateManager stateManager) {
+    public NewSubLibraryAction(
+        JabRefFrame jabRefFrame,
+        StateManager stateManager
+    ) {
         this.jabRefFrame = jabRefFrame;
 
         this.executable.bind(needsDatabase(stateManager));
@@ -26,7 +28,9 @@ public NewSubLibraryAction(JabRefFrame jabRefFrame, StateManager stateManager) {
 
     @Override
     public void execute() {
-        DialogService dialogService = Injector.instantiateModelOrService(DialogService.class);
+        DialogService dialogService = Injector.instantiateModelOrService(
+            DialogService.class
+        );
         dialogService.showCustomDialogAndWait(new FromAuxDialog(jabRefFrame));
     }
 }
diff --git a/src/main/java/org/jabref/gui/backup/BackupResolverDialog.java b/src/main/java/org/jabref/gui/backup/BackupResolverDialog.java
index 502ed96740f..0baee714b70 100644
--- a/src/main/java/org/jabref/gui/backup/BackupResolverDialog.java
+++ b/src/main/java/org/jabref/gui/backup/BackupResolverDialog.java
@@ -3,40 +3,74 @@
 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.JabRefDesktop;
 import org.jabref.logic.l10n.Localization;
 import org.jabref.logic.util.BackupFileType;
 import org.jabref.logic.util.io.BackupFileUtil;
 import org.jabref.preferences.ExternalApplicationsPreferences;
-
-import org.controlsfx.control.HyperlinkLabel;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 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);
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(BackupResolverDialog.class);
+    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);
+        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);
@@ -46,10 +80,15 @@ public BackupResolverDialog(Path originalPath, Path backupDir, ExternalApplicati
                 if (!(e.getSource() instanceof Hyperlink)) {
                     return;
                 }
-                String clickedLinkText = ((Hyperlink) (e.getSource())).getText();
+                String clickedLinkText =
+                    ((Hyperlink) (e.getSource())).getText();
                 if (backupFilename.equals(clickedLinkText)) {
                     try {
-                        JabRefDesktop.openFolderAndSelectFile(backupPathOpt.get(), externalApplicationsPreferences, null);
+                        JabRefDesktop.openFolderAndSelectFile(
+                            backupPathOpt.get(),
+                            externalApplicationsPreferences,
+                            null
+                        );
                     } catch (IOException ex) {
                         LOGGER.error("Could not open backup folder", ex);
                     }
diff --git a/src/main/java/org/jabref/gui/bibtexextractor/BibtexExtractor.java b/src/main/java/org/jabref/gui/bibtexextractor/BibtexExtractor.java
index 6c6fc83eddd..f122fbe42d0 100644
--- a/src/main/java/org/jabref/gui/bibtexextractor/BibtexExtractor.java
+++ b/src/main/java/org/jabref/gui/bibtexextractor/BibtexExtractor.java
@@ -6,7 +6,6 @@
 import java.util.List;
 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;
@@ -23,28 +22,41 @@ public class BibtexExtractor {
     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);
+        "(?:^|[\\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);
+        "\\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);
+        "(?<" +
+        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);
+        "(?<" +
+        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);
+        "(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<>();
@@ -64,9 +76,14 @@ public BibEntry extract(String input) {
     }
 
     private BibEntry generateEntity(String input) {
-        EntryType type = isArticle ? StandardEntryType.Article : StandardEntryType.Book;
+        EntryType type = isArticle
+            ? StandardEntryType.Article
+            : StandardEntryType.Book;
         BibEntry extractedEntity = new BibEntry(type);
-        extractedEntity.setField(StandardField.AUTHOR, String.join(" and ", authors));
+        extractedEntity.setField(
+            StandardField.AUTHOR,
+            String.join(" and ", authors)
+        );
         extractedEntity.setField(StandardField.URL, String.join(", ", urls));
         extractedEntity.setField(StandardField.YEAR, year);
         extractedEntity.setField(StandardField.PAGES, pages);
@@ -74,7 +91,10 @@ private BibEntry generateEntity(String input) {
         if (isArticle) {
             extractedEntity.setField(StandardField.JOURNAL, journalOrPublisher);
         } else {
-            extractedEntity.setField(StandardField.PUBLISHER, journalOrPublisher);
+            extractedEntity.setField(
+                StandardField.PUBLISHER,
+                journalOrPublisher
+            );
         }
         extractedEntity.setField(StandardField.COMMENT, input);
         return extractedEntity;
@@ -91,9 +111,15 @@ private String findUrls(String input) {
     private String findYear(String input) {
         Matcher matcher = YEAR_PATTERN.matcher(input);
         while (matcher.find()) {
-            String yearCandidate = input.substring(matcher.start(), matcher.end());
+            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 +135,12 @@ 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));
     }
@@ -127,9 +158,11 @@ private String findPages(String input) {
     }
 
     private String fixSpaces(String input) {
-        return input.replaceAll("[,.!?;:]", "$0 ")
-                    .replaceAll("\\p{Lt}", " $0")
-                    .replaceAll("\\s+", " ").trim();
+        return input
+            .replaceAll("[,.!?;:]", "$0 ")
+            .replaceAll("\\p{Lt}", " $0")
+            .replaceAll("\\s+", " ")
+            .trim();
     }
 
     private String findParts(String input) {
@@ -142,12 +175,21 @@ 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.addAll(Arrays.asList(input.substring(delimiterIndex + 2).split(",|\\.")));
+            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(",|\\.")));
+            lastParts.addAll(
+                Arrays.asList(input.substring(afterAuthorsIndex).split(",|\\."))
+            );
         }
         int nonDigitParts = 0;
         for (String part : lastParts) {
diff --git a/src/main/java/org/jabref/gui/bibtexextractor/BibtexExtractorViewModel.java b/src/main/java/org/jabref/gui/bibtexextractor/BibtexExtractorViewModel.java
index 7e58dff849e..fb271cfd729 100644
--- a/src/main/java/org/jabref/gui/bibtexextractor/BibtexExtractorViewModel.java
+++ b/src/main/java/org/jabref/gui/bibtexextractor/BibtexExtractorViewModel.java
@@ -3,12 +3,9 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-
-import javax.swing.undo.UndoManager;
-
 import javafx.beans.property.SimpleStringProperty;
 import javafx.beans.property.StringProperty;
-
+import javax.swing.undo.UndoManager;
 import org.jabref.gui.DialogService;
 import org.jabref.gui.StateManager;
 import org.jabref.gui.Telemetry;
@@ -22,39 +19,45 @@
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.util.FileUpdateMonitor;
 import org.jabref.preferences.PreferencesService;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 public class BibtexExtractorViewModel {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(BibtexExtractorViewModel.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(
+        BibtexExtractorViewModel.class
+    );
 
-    private final StringProperty inputTextProperty = new SimpleStringProperty("");
+    private final StringProperty inputTextProperty = new SimpleStringProperty(
+        ""
+    );
     private final DialogService dialogService;
     private final PreferencesService preferencesService;
     private final TaskExecutor taskExecutor;
     private final ImportHandler importHandler;
 
-    public BibtexExtractorViewModel(BibDatabaseContext bibdatabaseContext,
-                                    DialogService dialogService,
-                                    PreferencesService preferencesService,
-                                    FileUpdateMonitor fileUpdateMonitor,
-                                    TaskExecutor taskExecutor,
-                                    UndoManager undoManager,
-                                    StateManager stateManager) {
-
+    public BibtexExtractorViewModel(
+        BibDatabaseContext bibdatabaseContext,
+        DialogService dialogService,
+        PreferencesService preferencesService,
+        FileUpdateMonitor fileUpdateMonitor,
+        TaskExecutor taskExecutor,
+        UndoManager undoManager,
+        StateManager stateManager
+    ) {
         this.dialogService = dialogService;
         this.preferencesService = preferencesService;
         this.taskExecutor = taskExecutor;
-        this.importHandler = new ImportHandler(
+        this.importHandler =
+            new ImportHandler(
                 bibdatabaseContext,
                 preferencesService,
                 fileUpdateMonitor,
                 undoManager,
                 stateManager,
                 dialogService,
-                taskExecutor);
+                taskExecutor
+            );
     }
 
     public StringProperty inputTextProperty() {
@@ -70,36 +73,64 @@ public void startParsing() {
     }
 
     private void parseUsingBibtexExtractor() {
-        BibEntry parsedEntry = new BibtexExtractor().extract(inputTextProperty.getValue());
+        BibEntry parsedEntry = new BibtexExtractor()
+            .extract(inputTextProperty.getValue());
         importHandler.importEntries(List.of(parsedEntry));
         trackNewEntry(parsedEntry, "ParseWithBibTeXExtractor");
     }
 
     private void parseUsingGrobid() {
-        GrobidCitationFetcher grobidCitationFetcher = new GrobidCitationFetcher(preferencesService.getGrobidPreferences(), preferencesService.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);
-                          for (BibEntry bibEntry : parsedEntries) {
-                              trackNewEntry(bibEntry, "ParseWithGrobid");
-                          }
-                      }).executeWith(taskExecutor);
+        GrobidCitationFetcher grobidCitationFetcher = new GrobidCitationFetcher(
+            preferencesService.getGrobidPreferences(),
+            preferencesService.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);
+                for (BibEntry bibEntry : parsedEntries) {
+                    trackNewEntry(bibEntry, "ParseWithGrobid");
+                }
+            })
+            .executeWith(taskExecutor);
     }
 
     private void trackNewEntry(BibEntry bibEntry, String eventMessage) {
         Map<String, String> properties = new HashMap<>();
-        properties.put("EntryType", bibEntry.typeProperty().getValue().getName());
-        Telemetry.getTelemetryClient().ifPresent(client -> client.trackEvent(eventMessage, properties, new HashMap<>()));
+        properties.put(
+            "EntryType",
+            bibEntry.typeProperty().getValue().getName()
+        );
+        Telemetry
+            .getTelemetryClient()
+            .ifPresent(client ->
+                client.trackEvent(eventMessage, properties, new HashMap<>())
+            );
     }
 }
diff --git a/src/main/java/org/jabref/gui/bibtexextractor/ExtractBibtexAction.java b/src/main/java/org/jabref/gui/bibtexextractor/ExtractBibtexAction.java
index 70c693a5fe9..1dbf647bfbc 100644
--- a/src/main/java/org/jabref/gui/bibtexextractor/ExtractBibtexAction.java
+++ b/src/main/java/org/jabref/gui/bibtexextractor/ExtractBibtexAction.java
@@ -1,21 +1,24 @@
 package org.jabref.gui.bibtexextractor;
 
+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.gui.importer.GrobidOptInDialogHelper;
 import org.jabref.preferences.PreferencesService;
 
-import com.airhacks.afterburner.injection.Injector;
-
-import static org.jabref.gui.actions.ActionHelper.needsDatabase;
-
 public class ExtractBibtexAction extends SimpleCommand {
 
     PreferencesService preferencesService;
     DialogService dialogService;
 
-    public ExtractBibtexAction(DialogService dialogService, PreferencesService preferencesService, StateManager stateManager) {
+    public ExtractBibtexAction(
+        DialogService dialogService,
+        PreferencesService preferencesService,
+        StateManager stateManager
+    ) {
         this.preferencesService = preferencesService;
         this.dialogService = dialogService;
         this.executable.bind(needsDatabase(stateManager));
@@ -23,8 +26,13 @@ public ExtractBibtexAction(DialogService dialogService, PreferencesService prefe
 
     @Override
     public void execute() {
-        DialogService dialogService = Injector.instantiateModelOrService(DialogService.class);
-        GrobidOptInDialogHelper.showAndWaitIfUserIsUndecided(dialogService, preferencesService.getGrobidPreferences());
+        DialogService dialogService = Injector.instantiateModelOrService(
+            DialogService.class
+        );
+        GrobidOptInDialogHelper.showAndWaitIfUserIsUndecided(
+            dialogService,
+            preferencesService.getGrobidPreferences()
+        );
         dialogService.showCustomDialogAndWait(new ExtractBibtexDialog());
     }
 }
diff --git a/src/main/java/org/jabref/gui/bibtexextractor/ExtractBibtexDialog.java b/src/main/java/org/jabref/gui/bibtexextractor/ExtractBibtexDialog.java
index c3d8638608f..bb86719f885 100644
--- a/src/main/java/org/jabref/gui/bibtexextractor/ExtractBibtexDialog.java
+++ b/src/main/java/org/jabref/gui/bibtexextractor/ExtractBibtexDialog.java
@@ -1,13 +1,13 @@
 package org.jabref.gui.bibtexextractor;
 
-import javax.swing.undo.UndoManager;
-
+import com.airhacks.afterburner.views.ViewLoader;
+import jakarta.inject.Inject;
 import javafx.fxml.FXML;
 import javafx.scene.control.Button;
 import javafx.scene.control.ButtonType;
 import javafx.scene.control.TextArea;
 import javafx.scene.control.Tooltip;
-
+import javax.swing.undo.UndoManager;
 import org.jabref.gui.DialogService;
 import org.jabref.gui.StateManager;
 import org.jabref.gui.util.BaseDialog;
@@ -17,50 +17,78 @@
 import org.jabref.model.util.FileUpdateMonitor;
 import org.jabref.preferences.PreferencesService;
 
-import com.airhacks.afterburner.views.ViewLoader;
-import jakarta.inject.Inject;
-
 /**
  * GUI Dialog for the feature "Extract BibTeX from plain text".
  */
 public class ExtractBibtexDialog extends BaseDialog<Void> {
 
     private final Button buttonParse;
-    @FXML private TextArea input;
-    @FXML private ButtonType parseButtonType;
+
+    @FXML
+    private TextArea input;
+
+    @FXML
+    private ButtonType parseButtonType;
+
     private BibtexExtractorViewModel viewModel;
-    @Inject private StateManager stateManager;
-    @Inject private DialogService dialogService;
-    @Inject private FileUpdateMonitor fileUpdateMonitor;
-    @Inject private TaskExecutor taskExecutor;
-    @Inject private UndoManager undoManager;
-    @Inject private PreferencesService preferencesService;
+
+    @Inject
+    private StateManager stateManager;
+
+    @Inject
+    private DialogService dialogService;
+
+    @Inject
+    private FileUpdateMonitor fileUpdateMonitor;
+
+    @Inject
+    private TaskExecutor taskExecutor;
+
+    @Inject
+    private UndoManager undoManager;
+
+    @Inject
+    private PreferencesService preferencesService;
 
     public ExtractBibtexDialog() {
-        ViewLoader.view(this)
-                  .load()
-                  .setAsDialogPane(this);
+        ViewLoader.view(this).load().setAsDialogPane(this);
         this.setTitle(Localization.lang("Plain References Parser"));
-        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."
+            )
+        );
         input.selectAll();
 
         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.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());
+        buttonParse
+            .disableProperty()
+            .bind(viewModel.inputTextProperty().isEmpty());
     }
 
     @FXML
     private void initialize() {
-        BibDatabaseContext database = stateManager.getActiveDatabase().orElseThrow(() -> new NullPointerException("Database null"));
-        this.viewModel = new BibtexExtractorViewModel(
+        BibDatabaseContext database = stateManager
+            .getActiveDatabase()
+            .orElseThrow(() -> new NullPointerException("Database null"));
+        this.viewModel =
+            new BibtexExtractorViewModel(
                 database,
                 dialogService,
                 preferencesService,
                 fileUpdateMonitor,
                 taskExecutor,
                 undoManager,
-                stateManager);
+                stateManager
+            );
         input.textProperty().bindBidirectional(viewModel.inputTextProperty());
     }
 }
diff --git a/src/main/java/org/jabref/gui/citationkeypattern/GenerateCitationKeyAction.java b/src/main/java/org/jabref/gui/citationkeypattern/GenerateCitationKeyAction.java
index 5cc07a31c71..5b808a5ba82 100644
--- a/src/main/java/org/jabref/gui/citationkeypattern/GenerateCitationKeyAction.java
+++ b/src/main/java/org/jabref/gui/citationkeypattern/GenerateCitationKeyAction.java
@@ -2,7 +2,6 @@
 
 import java.util.List;
 import java.util.function.Consumer;
-
 import org.jabref.gui.DialogService;
 import org.jabref.gui.JabRefFrame;
 import org.jabref.gui.StateManager;
@@ -30,7 +29,13 @@ public class GenerateCitationKeyAction extends SimpleCommand {
     private final TaskExecutor taskExecutor;
     private final PreferencesService preferencesService;
 
-    public GenerateCitationKeyAction(JabRefFrame frame, DialogService dialogService, StateManager stateManager, TaskExecutor taskExecutor, PreferencesService preferencesService) {
+    public GenerateCitationKeyAction(
+        JabRefFrame frame,
+        DialogService dialogService,
+        StateManager stateManager,
+        TaskExecutor taskExecutor,
+        PreferencesService preferencesService
+    ) {
         this.frame = frame;
         this.dialogService = dialogService;
         this.stateManager = stateManager;
@@ -45,33 +50,60 @@ 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();
 
         if (!this.isCanceled) {
-            BackgroundTask<Void> backgroundTask = this.generateKeysInBackground();
+            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
+                .titleProperty()
+                .set(Localization.lang("Autogenerate citation keys"));
+            backgroundTask
+                .messageProperty()
+                .set(Localization.lang("%0/%1 entries", 0, entries.size()));
 
             backgroundTask.executeWith(this.taskExecutor);
         }
     }
 
-    public static boolean confirmOverwriteKeys(DialogService dialogService, PreferencesService preferencesService) {
-        if (preferencesService.getCitationKeyPatternPreferences().shouldWarnBeforeOverwriteCiteKey()) {
+    public static boolean confirmOverwriteKeys(
+        DialogService dialogService,
+        PreferencesService preferencesService
+    ) {
+        if (
+            preferencesService
+                .getCitationKeyPatternPreferences()
+                .shouldWarnBeforeOverwriteCiteKey()
+        ) {
             return dialogService.showConfirmationDialogWithOptOutAndWait(
-                    Localization.lang("Overwrite keys"),
-                    Localization.lang("One or more keys will be overwritten. Continue?"),
-                    Localization.lang("Overwrite keys"),
-                    Localization.lang("Cancel"),
-                    Localization.lang("Do not ask again"),
-                    optOut -> preferencesService.getCitationKeyPatternPreferences().setWarnBeforeOverwriteCiteKey(!optOut));
+                Localization.lang("Overwrite keys"),
+                Localization.lang(
+                    "One or more keys will be overwritten. Continue?"
+                ),
+                Localization.lang("Overwrite keys"),
+                Localization.lang("Cancel"),
+                Localization.lang("Do not ask again"),
+                optOut ->
+                    preferencesService
+                        .getCitationKeyPatternPreferences()
+                        .setWarnBeforeOverwriteCiteKey(!optOut)
+            );
         } else {
             // Always overwrite keys by default
             return true;
@@ -80,11 +112,19 @@ public static boolean confirmOverwriteKeys(DialogService dialogService, Preferen
 
     private void checkOverwriteKeysChosen() {
         // We don't want to generate keys for entries which already have one thus remove the entries
-        if (this.preferencesService.getCitationKeyPatternPreferences().shouldAvoidOverwriteCiteKey()) {
+        if (
+            this.preferencesService.getCitationKeyPatternPreferences()
+                .shouldAvoidOverwriteCiteKey()
+        ) {
             entries.removeIf(BibEntry::hasCitationKey);
             // if we're going to override some citation keys warn the user about it
-        } else if (entries.parallelStream().anyMatch(BibEntry::hasCitationKey)) {
-            boolean overwriteKeys = confirmOverwriteKeys(dialogService, this.preferencesService);
+        } else if (
+            entries.parallelStream().anyMatch(BibEntry::hasCitationKey)
+        ) {
+            boolean overwriteKeys = confirmOverwriteKeys(
+                dialogService,
+                this.preferencesService
+            );
 
             // The user doesn't want to override citation keys
             if (!overwriteKeys) {
@@ -99,32 +139,62 @@ private BackgroundTask<Void> generateKeysInBackground() {
 
             @Override
             protected Void call() {
-                    if (isCanceled) {
-                        return null;
-                    }
-                    DefaultTaskExecutor.runInJavaFXThread(() -> {
-                        updateProgress(0, entries.size());
-                        messageProperty().set(Localization.lang("%0/%1 entries", 0, entries.size()));
-                    });
-                    stateManager.getActiveDatabase().ifPresent(databaseContext -> {
+                if (isCanceled) {
+                    return null;
+                }
+                DefaultTaskExecutor.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"));
+                        compound =
+                            new NamedCompound(
+                                Localization.lang("Autogenerate citation keys")
+                            );
                         CitationKeyGenerator keyGenerator =
-                                new CitationKeyGenerator(databaseContext, preferencesService.getCitationKeyPatternPreferences());
+                            new CitationKeyGenerator(
+                                databaseContext,
+                                preferencesService.getCitationKeyPatternPreferences()
+                            );
                         int entriesDone = 0;
                         for (BibEntry entry : entries) {
-                            keyGenerator.generateAndSetKey(entry)
-                                        .ifPresent(fieldChange -> compound.addEdit(new UndoableKeyChange(fieldChange)));
+                            keyGenerator
+                                .generateAndSetKey(entry)
+                                .ifPresent(fieldChange ->
+                                    compound.addEdit(
+                                        new UndoableKeyChange(fieldChange)
+                                    )
+                                );
                             entriesDone++;
                             int finalEntriesDone = entriesDone;
                             DefaultTaskExecutor.runInJavaFXThread(() -> {
-                                updateProgress(finalEntriesDone, entries.size());
-                                messageProperty().set(Localization.lang("%0/%1 entries", finalEntriesDone, entries.size()));
+                                updateProgress(
+                                    finalEntriesDone,
+                                    entries.size()
+                                );
+                                messageProperty()
+                                    .set(
+                                        Localization.lang(
+                                            "%0/%1 entries",
+                                            finalEntriesDone,
+                                            entries.size()
+                                        )
+                                    );
                             });
                         }
                         compound.end();
                     });
-                    return null;
+                return null;
             }
 
             @Override
@@ -135,14 +205,25 @@ public BackgroundTask<Void> onSuccess(Consumer<Void> onSuccess) {
                 }
 
                 frame.getCurrentLibraryTab().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 String.format("%s %d %s.", start, count,
-                (count > 1 ? Localization.lang("entries") : Localization.lang("entry")));
+        return String.format(
+            "%s %d %s.",
+            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 04678963e34..86df1af4f9a 100644
--- a/src/main/java/org/jabref/gui/citationkeypattern/GenerateCitationKeySingleAction.java
+++ b/src/main/java/org/jabref/gui/citationkeypattern/GenerateCitationKeySingleAction.java
@@ -1,7 +1,6 @@
 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;
@@ -18,24 +17,45 @@ public class GenerateCitationKeySingleAction extends SimpleCommand {
     private final BibEntry entry;
     private final UndoManager undoManager;
 
-    public GenerateCitationKeySingleAction(BibEntry entry, BibDatabaseContext databaseContext, DialogService dialogService, PreferencesService preferencesService, UndoManager undoManager) {
+    public GenerateCitationKeySingleAction(
+        BibEntry entry,
+        BibDatabaseContext databaseContext,
+        DialogService dialogService,
+        PreferencesService preferencesService,
+        UndoManager undoManager
+    ) {
         this.entry = entry;
         this.databaseContext = databaseContext;
         this.dialogService = dialogService;
         this.preferencesService = preferencesService;
         this.undoManager = undoManager;
 
-        if (preferencesService.getCitationKeyPatternPreferences().shouldAvoidOverwriteCiteKey()) {
+        if (
+            preferencesService
+                .getCitationKeyPatternPreferences()
+                .shouldAvoidOverwriteCiteKey()
+        ) {
             this.executable.bind(entry.getCiteKeyBinding().isEmpty());
         }
     }
 
     @Override
     public void execute() {
-        if (!entry.hasCitationKey() || GenerateCitationKeyAction.confirmOverwriteKeys(dialogService, preferencesService)) {
-            new CitationKeyGenerator(databaseContext, preferencesService.getCitationKeyPatternPreferences())
-                    .generateAndSetKey(entry)
-                    .ifPresent(change -> undoManager.addEdit(new UndoableKeyChange(change)));
+        if (
+            !entry.hasCitationKey() ||
+            GenerateCitationKeyAction.confirmOverwriteKeys(
+                dialogService,
+                preferencesService
+            )
+        ) {
+            new CitationKeyGenerator(
+                databaseContext,
+                preferencesService.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 5cf61dceaee..1b9276b0ad2 100644
--- a/src/main/java/org/jabref/gui/cleanup/CleanupAction.java
+++ b/src/main/java/org/jabref/gui/cleanup/CleanupAction.java
@@ -2,7 +2,6 @@
 
 import java.util.List;
 import java.util.Optional;
-
 import org.jabref.gui.DialogService;
 import org.jabref.gui.JabRefFrame;
 import org.jabref.gui.StateManager;
@@ -31,11 +30,13 @@ public class CleanupAction extends SimpleCommand {
     private boolean isCanceled;
     private int modifiedEntriesCount;
 
-    public CleanupAction(JabRefFrame frame,
-                         PreferencesService preferences,
-                         DialogService dialogService,
-                         StateManager stateManager,
-                         TaskExecutor taskExecutor) {
+    public CleanupAction(
+        JabRefFrame frame,
+        PreferencesService preferences,
+        DialogService dialogService,
+        StateManager stateManager,
+        TaskExecutor taskExecutor
+    ) {
         this.frame = frame;
         this.preferences = preferences;
         this.dialogService = dialogService;
@@ -52,57 +53,89 @@ public void execute() {
         }
 
         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."));
+            dialogService.showInformationDialogAndWait(
+                Localization.lang("Cleanup entry"),
+                Localization.lang("First select entries to clean up.")
+            );
             return;
         }
 
-        dialogService.notify(Localization.lang("Doing a cleanup for %0 entries...",
-                Integer.toString(stateManager.getSelectedEntries().size())));
+        dialogService.notify(
+            Localization.lang(
+                "Doing a cleanup for %0 entries...",
+                Integer.toString(stateManager.getSelectedEntries().size())
+            )
+        );
 
         isCanceled = false;
         modifiedEntriesCount = 0;
 
         CleanupDialog cleanupDialog = new CleanupDialog(
-                stateManager.getActiveDatabase().get(),
-                preferences.getCleanupPreferences(),
-                preferences.getFilePreferences()
+            stateManager.getActiveDatabase().get(),
+            preferences.getCleanupPreferences(),
+            preferences.getFilePreferences()
         );
 
-        Optional<CleanupPreferences> chosenPreset = dialogService.showCustomDialogAndWait(cleanupDialog);
+        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?"),
+            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));
+                        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);
+            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());
+            databaseContext,
+            preferences.getFilePreferences(),
+            preferences.getTimestampPreferences()
+        );
 
         List<FieldChange> changes = cleaner.cleanup(preset, entry);
 
@@ -123,18 +156,32 @@ private void showResults() {
         }
 
         if (modifiedEntriesCount == 0) {
-            dialogService.notify(Localization.lang("No entry needed a clean up"));
+            dialogService.notify(
+                Localization.lang("No entry needed a clean up")
+            );
         } else if (modifiedEntriesCount == 1) {
-            dialogService.notify(Localization.lang("One entry needed a clean up"));
+            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"));
+            NamedCompound ce = new NamedCompound(
+                Localization.lang("Cleanup entry")
+            );
 
             doCleanup(databaseContext, cleanupPreferences, entry, ce);
 
diff --git a/src/main/java/org/jabref/gui/cleanup/CleanupDialog.java b/src/main/java/org/jabref/gui/cleanup/CleanupDialog.java
index 28c94a2cf88..220c24aa518 100644
--- a/src/main/java/org/jabref/gui/cleanup/CleanupDialog.java
+++ b/src/main/java/org/jabref/gui/cleanup/CleanupDialog.java
@@ -2,7 +2,6 @@
 
 import javafx.scene.control.ButtonType;
 import javafx.scene.control.ScrollPane;
-
 import org.jabref.gui.util.BaseDialog;
 import org.jabref.logic.l10n.Localization;
 import org.jabref.model.database.BibDatabaseContext;
@@ -10,12 +9,23 @@
 import org.jabref.preferences.FilePreferences;
 
 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);
+        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();
diff --git a/src/main/java/org/jabref/gui/cleanup/CleanupPresetPanel.java b/src/main/java/org/jabref/gui/cleanup/CleanupPresetPanel.java
index 1a0cf3d6df2..52ee99f2991 100644
--- a/src/main/java/org/jabref/gui/cleanup/CleanupPresetPanel.java
+++ b/src/main/java/org/jabref/gui/cleanup/CleanupPresetPanel.java
@@ -1,16 +1,15 @@
 package org.jabref.gui.cleanup;
 
+import com.airhacks.afterburner.views.ViewLoader;
 import java.nio.file.Path;
 import java.util.EnumSet;
 import java.util.Objects;
 import java.util.Optional;
-
 import javafx.collections.FXCollections;
 import javafx.fxml.FXML;
 import javafx.scene.control.CheckBox;
 import javafx.scene.control.Label;
 import javafx.scene.layout.VBox;
-
 import org.jabref.gui.commonfxcontrols.FieldFormatterCleanupsPanel;
 import org.jabref.logic.cleanup.FieldFormatterCleanups;
 import org.jabref.logic.l10n.Localization;
@@ -19,108 +18,216 @@
 import org.jabref.preferences.CleanupPreferences;
 import org.jabref.preferences.FilePreferences;
 
-import com.airhacks.afterburner.views.ViewLoader;
-
 public class CleanupPresetPanel extends VBox {
 
     private final BibDatabaseContext databaseContext;
-    @FXML private Label cleanupRenamePDFLabel;
-    @FXML private CheckBox cleanUpDOI;
-    @FXML private CheckBox cleanUpEprint;
-    @FXML private CheckBox cleanUpURL;
-    @FXML private CheckBox cleanUpISSN;
-    @FXML private CheckBox cleanUpMovePDF;
-    @FXML private CheckBox cleanUpMakePathsRelative;
-    @FXML private CheckBox cleanUpRenamePDF;
-    @FXML private CheckBox cleanUpRenamePDFonlyRelativePaths;
-    @FXML private CheckBox cleanUpUpgradeExternalLinks;
-    @FXML private CheckBox cleanUpBiblatex;
-    @FXML private CheckBox cleanUpBibtex;
-    @FXML private CheckBox cleanUpTimestampToCreationDate;
-    @FXML private CheckBox cleanUpTimestampToModificationDate;
-    @FXML private FieldFormatterCleanupsPanel formatterCleanupsPanel;
-
-    public CleanupPresetPanel(BibDatabaseContext databaseContext, CleanupPreferences cleanupPreferences, FilePreferences filePreferences) {
+
+    @FXML
+    private Label cleanupRenamePDFLabel;
+
+    @FXML
+    private CheckBox cleanUpDOI;
+
+    @FXML
+    private CheckBox cleanUpEprint;
+
+    @FXML
+    private CheckBox cleanUpURL;
+
+    @FXML
+    private CheckBox cleanUpISSN;
+
+    @FXML
+    private CheckBox cleanUpMovePDF;
+
+    @FXML
+    private CheckBox cleanUpMakePathsRelative;
+
+    @FXML
+    private CheckBox cleanUpRenamePDF;
+
+    @FXML
+    private CheckBox cleanUpRenamePDFonlyRelativePaths;
+
+    @FXML
+    private CheckBox cleanUpUpgradeExternalLinks;
+
+    @FXML
+    private CheckBox cleanUpBiblatex;
+
+    @FXML
+    private CheckBox cleanUpBibtex;
+
+    @FXML
+    private CheckBox cleanUpTimestampToCreationDate;
+
+    @FXML
+    private CheckBox cleanUpTimestampToModificationDate;
+
+    @FXML
+    private FieldFormatterCleanupsPanel formatterCleanupsPanel;
+
+    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);
     }
 
-    private void init(CleanupPreferences cleanupPreferences, FilePreferences filePreferences) {
-        Optional<Path> firstExistingDir = databaseContext.getFirstExistingFileDir(filePreferences);
+    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.
             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);
     }
 
     private void updateDisplay(CleanupPreferences preset) {
-        cleanUpDOI.setSelected(preset.isActive(CleanupPreferences.CleanupStep.CLEAN_UP_DOI));
-        cleanUpEprint.setSelected(preset.isActive(CleanupPreferences.CleanupStep.CLEANUP_EPRINT));
-        cleanUpURL.setSelected(preset.isActive(CleanupPreferences.CleanupStep.CLEAN_UP_URL));
+        cleanUpDOI.setSelected(
+            preset.isActive(CleanupPreferences.CleanupStep.CLEAN_UP_DOI)
+        );
+        cleanUpEprint.setSelected(
+            preset.isActive(CleanupPreferences.CleanupStep.CLEANUP_EPRINT)
+        );
+        cleanUpURL.setSelected(
+            preset.isActive(CleanupPreferences.CleanupStep.CLEAN_UP_URL)
+        );
         if (!cleanUpMovePDF.isDisabled()) {
-            cleanUpMovePDF.setSelected(preset.isActive(CleanupPreferences.CleanupStep.MOVE_PDF));
+            cleanUpMovePDF.setSelected(
+                preset.isActive(CleanupPreferences.CleanupStep.MOVE_PDF)
+            );
         }
-        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));
-        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()));
+        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
+            )
+        );
+        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()
+                )
+            );
     }
 
     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);
@@ -142,13 +249,17 @@ public CleanupPreferences getCleanupPreset() {
         }
         if (cleanUpRenamePDF.isSelected()) {
             if (cleanUpRenamePDFonlyRelativePaths.isSelected()) {
-                activeJobs.add(CleanupPreferences.CleanupStep.RENAME_PDF_ONLY_RELATIVE_PATHS);
+                activeJobs.add(
+                    CleanupPreferences.CleanupStep.RENAME_PDF_ONLY_RELATIVE_PATHS
+                );
             } else {
                 activeJobs.add(CleanupPreferences.CleanupStep.RENAME_PDF);
             }
         }
         if (cleanUpUpgradeExternalLinks.isSelected()) {
-            activeJobs.add(CleanupPreferences.CleanupStep.CLEAN_UP_UPGRADE_EXTERNAL_LINKS);
+            activeJobs.add(
+                CleanupPreferences.CleanupStep.CLEAN_UP_UPGRADE_EXTERNAL_LINKS
+            );
         }
         if (cleanUpBiblatex.isSelected()) {
             activeJobs.add(CleanupPreferences.CleanupStep.CONVERT_TO_BIBLATEX);
@@ -157,16 +268,24 @@ public CleanupPreferences getCleanupPreset() {
             activeJobs.add(CleanupPreferences.CleanupStep.CONVERT_TO_BIBTEX);
         }
         if (cleanUpTimestampToCreationDate.isSelected()) {
-            activeJobs.add(CleanupPreferences.CleanupStep.CONVERT_TIMESTAMP_TO_CREATIONDATE);
+            activeJobs.add(
+                CleanupPreferences.CleanupStep.CONVERT_TIMESTAMP_TO_CREATIONDATE
+            );
         }
         if (cleanUpTimestampToModificationDate.isSelected()) {
-            activeJobs.add(CleanupPreferences.CleanupStep.CONVERT_TIMESTAMP_TO_MODIFICATIONDATE);
+            activeJobs.add(
+                CleanupPreferences.CleanupStep.CONVERT_TIMESTAMP_TO_MODIFICATIONDATE
+            );
         }
 
         activeJobs.add(CleanupPreferences.CleanupStep.FIX_FILE_LINKS);
 
-        return new CleanupPreferences(activeJobs, new FieldFormatterCleanups(
+        return new CleanupPreferences(
+            activeJobs,
+            new FieldFormatterCleanups(
                 !formatterCleanupsPanel.cleanupsDisableProperty().getValue(),
-                formatterCleanupsPanel.cleanupsProperty()));
+                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 a14278b8576..9690ad4dc13 100644
--- a/src/main/java/org/jabref/gui/cleanup/CleanupSingleAction.java
+++ b/src/main/java/org/jabref/gui/cleanup/CleanupSingleAction.java
@@ -2,9 +2,7 @@
 
 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;
@@ -30,7 +28,13 @@ public class CleanupSingleAction extends SimpleCommand {
     private boolean isCanceled;
     private int modifiedEntriesCount;
 
-    public CleanupSingleAction(BibEntry entry, PreferencesService preferences, DialogService dialogService, StateManager stateManager, UndoManager undoManager) {
+    public CleanupSingleAction(
+        BibEntry entry,
+        PreferencesService preferences,
+        DialogService dialogService,
+        StateManager stateManager,
+        UndoManager undoManager
+    ) {
         this.entry = entry;
         this.preferences = preferences;
         this.dialogService = dialogService;
@@ -45,29 +49,45 @@ public void execute() {
         isCanceled = false;
 
         CleanupDialog cleanupDialog = new CleanupDialog(
-                stateManager.getActiveDatabase().get(),
-                preferences.getCleanupPreferences(),
-                preferences.getFilePreferences()
+            stateManager.getActiveDatabase().get(),
+            preferences.getCleanupPreferences(),
+            preferences.getFilePreferences()
         );
 
-        Optional<CleanupPreferences> chosenPreset = dialogService.showCustomDialogAndWait(cleanupDialog);
+        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?"),
+            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));
+                        optOut ->
+                            preferences
+                                .getAutoLinkPreferences()
+                                .setAskAutoNamingPdfs(!optOut)
+                    );
                 if (!confirmed) {
                     isCanceled = true;
                     return;
                 }
             }
 
-            preferences.getCleanupPreferences().setActiveJobs(preset.getActiveJobs());
-            preferences.getCleanupPreferences().setFieldFormatterCleanups(preset.getFieldFormatterCleanups());
+            preferences
+                .getCleanupPreferences()
+                .setActiveJobs(preset.getActiveJobs());
+            preferences
+                .getCleanupPreferences()
+                .setFieldFormatterCleanups(preset.getFieldFormatterCleanups());
 
             cleanup(stateManager.getActiveDatabase().get(), preset);
         });
@@ -76,12 +96,18 @@ public void execute() {
     /**
      * 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());
+            databaseContext,
+            preferences.getFilePreferences(),
+            preferences.getTimestampPreferences()
+        );
 
         List<FieldChange> changes = cleaner.cleanup(preset, entry);
 
@@ -91,15 +117,20 @@ 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 64936e47de4..5e3f40e8f52 100644
--- a/src/main/java/org/jabref/gui/collab/ChangeScanner.java
+++ b/src/main/java/org/jabref/gui/collab/ChangeScanner.java
@@ -3,7 +3,6 @@
 import java.io.IOException;
 import java.util.Collections;
 import java.util.List;
-
 import org.jabref.gui.DialogService;
 import org.jabref.logic.importer.ImportFormatPreferences;
 import org.jabref.logic.importer.OpenDatabase;
@@ -11,24 +10,32 @@
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.util.DummyFileUpdateMonitor;
 import org.jabref.preferences.PreferencesService;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 public class ChangeScanner {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(ChangeScanner.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(
+        ChangeScanner.class
+    );
     private final BibDatabaseContext database;
     private final PreferencesService preferencesService;
 
     private final DatabaseChangeResolverFactory databaseChangeResolverFactory;
 
-    public ChangeScanner(BibDatabaseContext database,
-                         DialogService dialogService,
-                         PreferencesService preferencesService) {
+    public ChangeScanner(
+        BibDatabaseContext database,
+        DialogService dialogService,
+        PreferencesService preferencesService
+    ) {
         this.database = database;
         this.preferencesService = preferencesService;
-        this.databaseChangeResolverFactory = new DatabaseChangeResolverFactory(dialogService, database, preferencesService);
+        this.databaseChangeResolverFactory =
+            new DatabaseChangeResolverFactory(
+                dialogService,
+                database,
+                preferencesService
+            );
     }
 
     public List<DatabaseChange> scanForChanges() {
@@ -39,11 +46,20 @@ public List<DatabaseChange> scanForChanges() {
         try {
             // Parse the modified file
             // Important: apply all post-load actions
-            ImportFormatPreferences importFormatPreferences = preferencesService.getImportFormatPreferences();
-            ParserResult result = OpenDatabase.loadDatabase(database.getDatabasePath().get(), importFormatPreferences, new DummyFileUpdateMonitor());
+            ImportFormatPreferences importFormatPreferences =
+                preferencesService.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 ec28509b864..a4c8ff3c25e 100644
--- a/src/main/java/org/jabref/gui/collab/DatabaseChange.java
+++ b/src/main/java/org/jabref/gui/collab/DatabaseChange.java
@@ -1,12 +1,10 @@
 package org.jabref.gui.collab;
 
 import java.util.Optional;
-
 import javafx.beans.property.BooleanProperty;
 import javafx.beans.property.SimpleBooleanProperty;
 import javafx.beans.property.SimpleStringProperty;
 import javafx.beans.property.StringProperty;
-
 import org.jabref.gui.collab.entryadd.EntryAdd;
 import org.jabref.gui.collab.entrychange.EntryChange;
 import org.jabref.gui.collab.entrydelete.EntryDelete;
@@ -21,18 +19,37 @@
 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 {
+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!");
 
         if (databaseChangeResolverFactory != null) {
-            externalChangeResolver.set(databaseChangeResolverFactory.create(this));
+            externalChangeResolver.set(
+                databaseChangeResolverFactory.create(this)
+            );
         }
     }
 
diff --git a/src/main/java/org/jabref/gui/collab/DatabaseChangeDetailsView.java b/src/main/java/org/jabref/gui/collab/DatabaseChangeDetailsView.java
index 7e3d6c18ff5..e2c1b56d7fe 100644
--- a/src/main/java/org/jabref/gui/collab/DatabaseChangeDetailsView.java
+++ b/src/main/java/org/jabref/gui/collab/DatabaseChangeDetailsView.java
@@ -1,7 +1,6 @@
 package org.jabref.gui.collab;
 
 import javafx.scene.layout.AnchorPane;
-
 import org.jabref.gui.collab.entrychange.EntryChangeDetailsView;
 import org.jabref.gui.collab.entrychange.EntryWithPreviewAndSourceDetailsView;
 import org.jabref.gui.collab.groupchange.GroupChangeDetailsView;
@@ -12,5 +11,15 @@
 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 {}
diff --git a/src/main/java/org/jabref/gui/collab/DatabaseChangeDetailsViewFactory.java b/src/main/java/org/jabref/gui/collab/DatabaseChangeDetailsViewFactory.java
index fddbdd3b973..45ffbfdbb4c 100644
--- a/src/main/java/org/jabref/gui/collab/DatabaseChangeDetailsViewFactory.java
+++ b/src/main/java/org/jabref/gui/collab/DatabaseChangeDetailsViewFactory.java
@@ -29,6 +29,7 @@
 import org.jabref.preferences.PreferencesService;
 
 public class DatabaseChangeDetailsViewFactory {
+
     private final BibDatabaseContext databaseContext;
     private final DialogService dialogService;
     private final StateManager stateManager;
@@ -38,14 +39,16 @@ public class DatabaseChangeDetailsViewFactory {
     private final PreviewViewer previewViewer;
     private final TaskExecutor taskExecutor;
 
-    public DatabaseChangeDetailsViewFactory(BibDatabaseContext databaseContext,
-                                            DialogService dialogService,
-                                            StateManager stateManager,
-                                            ThemeManager themeManager,
-                                            PreferencesService preferencesService,
-                                            BibEntryTypesManager entryTypesManager,
-                                            PreviewViewer previewViewer,
-                                            TaskExecutor taskExecutor) {
+    public DatabaseChangeDetailsViewFactory(
+        BibDatabaseContext databaseContext,
+        DialogService dialogService,
+        StateManager stateManager,
+        ThemeManager themeManager,
+        PreferencesService preferencesService,
+        BibEntryTypesManager entryTypesManager,
+        PreviewViewer previewViewer,
+        TaskExecutor taskExecutor
+    ) {
         this.databaseContext = databaseContext;
         this.dialogService = dialogService;
         this.stateManager = stateManager;
@@ -59,11 +62,34 @@ public DatabaseChangeDetailsViewFactory(BibDatabaseContext databaseContext,
     public DatabaseChangeDetailsView create(DatabaseChange databaseChange) {
         // TODO: Use Pattern Matching for switch once it's out of preview
         if (databaseChange instanceof EntryChange entryChange) {
-            return new EntryChangeDetailsView(entryChange.getOldEntry(), entryChange.getNewEntry(), databaseContext, dialogService, stateManager, themeManager, preferencesService, entryTypesManager, previewViewer, taskExecutor);
+            return new EntryChangeDetailsView(
+                entryChange.getOldEntry(),
+                entryChange.getNewEntry(),
+                databaseContext,
+                dialogService,
+                stateManager,
+                themeManager,
+                preferencesService,
+                entryTypesManager,
+                previewViewer,
+                taskExecutor
+            );
         } else if (databaseChange instanceof EntryAdd entryAdd) {
-            return new EntryWithPreviewAndSourceDetailsView(entryAdd.getAddedEntry(), databaseContext, preferencesService, entryTypesManager, previewViewer);
+            return new EntryWithPreviewAndSourceDetailsView(
+                entryAdd.getAddedEntry(),
+                databaseContext,
+                preferencesService,
+                entryTypesManager,
+                previewViewer
+            );
         } else if (databaseChange instanceof EntryDelete entryDelete) {
-            return new EntryWithPreviewAndSourceDetailsView(entryDelete.getDeletedEntry(), databaseContext, preferencesService, entryTypesManager, previewViewer);
+            return new EntryWithPreviewAndSourceDetailsView(
+                entryDelete.getDeletedEntry(),
+                databaseContext,
+                preferencesService,
+                entryTypesManager,
+                previewViewer
+            );
         } else if (databaseChange instanceof BibTexStringAdd stringAdd) {
             return new BibTexStringAddDetailsView(stringAdd);
         } else if (databaseChange instanceof BibTexStringDelete stringDelete) {
@@ -73,12 +99,17 @@ public DatabaseChangeDetailsView create(DatabaseChange databaseChange) {
         } else if (databaseChange instanceof BibTexStringRename stringRename) {
             return new BibTexStringRenameDetailsView(stringRename);
         } else if (databaseChange instanceof MetadataChange metadataChange) {
-            return new MetadataChangeDetailsView(metadataChange, preferencesService);
+            return new MetadataChangeDetailsView(
+                metadataChange,
+                preferencesService
+            );
         } else if (databaseChange instanceof GroupChange groupChange) {
             return new GroupChangeDetailsView(groupChange);
         } else if (databaseChange instanceof PreambleChange preambleChange) {
             return new PreambleChangeDetailsView(preambleChange);
         }
-        throw new UnsupportedOperationException("Cannot preview the given change: " + databaseChange.getName());
+        throw new UnsupportedOperationException(
+            "Cannot preview the given change: " + databaseChange.getName()
+        );
     }
 }
diff --git a/src/main/java/org/jabref/gui/collab/DatabaseChangeList.java b/src/main/java/org/jabref/gui/collab/DatabaseChangeList.java
index de4f9423303..d8ab6272df0 100644
--- a/src/main/java/org/jabref/gui/collab/DatabaseChangeList.java
+++ b/src/main/java/org/jabref/gui/collab/DatabaseChangeList.java
@@ -3,7 +3,6 @@
 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;
@@ -20,8 +19,8 @@
 import org.jabref.model.database.BibDatabaseContext;
 
 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,146 @@ 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);
+        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);
+        if (
+            diff
+                .getOriginalString()
+                .getName()
+                .equals(diff.getNewString().getName())
+        ) {
+            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.getOriginalEntry() == null) {
-            return new EntryAdd(diff.getNewEntry(), originalDatabase, databaseChangeResolverFactory);
+            return new EntryAdd(
+                diff.getNewEntry(),
+                originalDatabase,
+                databaseChangeResolverFactory
+            );
         }
 
         if (diff.getNewEntry() == null) {
-            return new EntryDelete(diff.getOriginalEntry(), originalDatabase, databaseChangeResolverFactory);
+            return new EntryDelete(
+                diff.getOriginalEntry(),
+                originalDatabase,
+                databaseChangeResolverFactory
+            );
         }
 
-        return new EntryChange(diff.getOriginalEntry(), diff.getNewEntry(), originalDatabase, databaseChangeResolverFactory);
+        return new EntryChange(
+            diff.getOriginalEntry(),
+            diff.getNewEntry(),
+            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 fed43800e19..763a35197ff 100644
--- a/src/main/java/org/jabref/gui/collab/DatabaseChangeMonitor.java
+++ b/src/main/java/org/jabref/gui/collab/DatabaseChangeMonitor.java
@@ -3,9 +3,8 @@
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
-
 import javafx.util.Duration;
-
+import org.controlsfx.control.action.Action;
 import org.jabref.gui.DialogService;
 import org.jabref.gui.LibraryTab;
 import org.jabref.gui.icon.IconTheme;
@@ -16,14 +15,14 @@
 import org.jabref.model.util.FileUpdateListener;
 import org.jabref.model.util.FileUpdateMonitor;
 import org.jabref.preferences.PreferencesService;
-
-import org.controlsfx.control.action.Action;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 public class DatabaseChangeMonitor implements FileUpdateListener {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(DatabaseChangeMonitor.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(
+        DatabaseChangeMonitor.class
+    );
 
     private final BibDatabaseContext database;
     private final FileUpdateMonitor fileMonitor;
@@ -32,12 +31,14 @@ public class DatabaseChangeMonitor implements FileUpdateListener {
     private final DialogService dialogService;
     private final PreferencesService preferencesService;
 
-    public DatabaseChangeMonitor(BibDatabaseContext database,
-                                 FileUpdateMonitor fileMonitor,
-                                 TaskExecutor taskExecutor,
-                                 DialogService dialogService,
-                                 PreferencesService preferencesService,
-                                 LibraryTab.DatabaseNotification notificationPane) {
+    public DatabaseChangeMonitor(
+        BibDatabaseContext database,
+        FileUpdateMonitor fileMonitor,
+        TaskExecutor taskExecutor,
+        DialogService dialogService,
+        PreferencesService preferencesService,
+        LibraryTab.DatabaseNotification notificationPane
+    ) {
         this.database = database;
         this.fileMonitor = fileMonitor;
         this.taskExecutor = taskExecutor;
@@ -46,38 +47,69 @@ 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(changes -> notificationPane.notify(
+        addListener(changes ->
+            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 -> {
-                            dialogService.showCustomDialogAndWait(new DatabaseChangesResolverDialog(changes, database, Localization.lang("External Changes Resolver")));
+                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 -> {
+                            dialogService.showCustomDialogAndWait(
+                                new DatabaseChangesResolverDialog(
+                                    changes,
+                                    database,
+                                    Localization.lang(
+                                        "External Changes Resolver"
+                                    )
+                                )
+                            );
                             notificationPane.hide();
-                        })),
-                Duration.ZERO));
+                        }
+                    )
+                ),
+                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
-            ChangeScanner scanner = new ChangeScanner(database, dialogService, preferencesService);
-            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);
+            ChangeScanner scanner = new ChangeScanner(
+                database,
+                dialogService,
+                preferencesService
+            );
+            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);
         }
     }
 
@@ -86,6 +118,8 @@ public void addListener(DatabaseChangeListener listener) {
     }
 
     public void unregister() {
-        database.getDatabasePath().ifPresent(file -> fileMonitor.removeListener(file, this));
+        database
+            .getDatabasePath()
+            .ifPresent(file -> fileMonitor.removeListener(file, this));
     }
 }
diff --git a/src/main/java/org/jabref/gui/collab/DatabaseChangeResolver.java b/src/main/java/org/jabref/gui/collab/DatabaseChangeResolver.java
index 83c318d4965..66210ef9a6d 100644
--- a/src/main/java/org/jabref/gui/collab/DatabaseChangeResolver.java
+++ b/src/main/java/org/jabref/gui/collab/DatabaseChangeResolver.java
@@ -1,11 +1,12 @@
 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 {
+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 c27c7c600db..ffcdfe42ea9 100644
--- a/src/main/java/org/jabref/gui/collab/DatabaseChangeResolverFactory.java
+++ b/src/main/java/org/jabref/gui/collab/DatabaseChangeResolverFactory.java
@@ -1,7 +1,6 @@
 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;
@@ -9,11 +8,16 @@
 import org.jabref.preferences.PreferencesService;
 
 public class DatabaseChangeResolverFactory {
+
     private final DialogService dialogService;
     private final BibDatabaseContext databaseContext;
     private final PreferencesService preferencesService;
 
-    public DatabaseChangeResolverFactory(DialogService dialogService, BibDatabaseContext databaseContext, PreferencesService preferencesService) {
+    public DatabaseChangeResolverFactory(
+        DialogService dialogService,
+        BibDatabaseContext databaseContext,
+        PreferencesService preferencesService
+    ) {
         this.dialogService = dialogService;
         this.databaseContext = databaseContext;
         this.preferencesService = preferencesService;
@@ -21,7 +25,14 @@ public DatabaseChangeResolverFactory(DialogService dialogService, BibDatabaseCon
 
     public Optional<DatabaseChangeResolver> create(DatabaseChange change) {
         if (change instanceof EntryChange entryChange) {
-            return Optional.of(new EntryChangeResolver(entryChange, dialogService, databaseContext, preferencesService));
+            return Optional.of(
+                new EntryChangeResolver(
+                    entryChange,
+                    dialogService,
+                    databaseContext,
+                    preferencesService
+                )
+            );
         }
 
         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 89167f9f828..a0013b78a53 100644
--- a/src/main/java/org/jabref/gui/collab/DatabaseChangesResolverDialog.java
+++ b/src/main/java/org/jabref/gui/collab/DatabaseChangesResolverDialog.java
@@ -1,11 +1,11 @@
 package org.jabref.gui.collab;
 
+import com.airhacks.afterburner.views.ViewLoader;
+import com.tobiasdiez.easybind.EasyBind;
+import jakarta.inject.Inject;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-
-import javax.swing.undo.UndoManager;
-
 import javafx.beans.property.SimpleStringProperty;
 import javafx.fxml.FXML;
 import javafx.scene.control.Button;
@@ -13,7 +13,7 @@
 import javafx.scene.control.TableColumn;
 import javafx.scene.control.TableView;
 import javafx.scene.layout.BorderPane;
-
+import javax.swing.undo.UndoManager;
 import org.jabref.gui.DialogService;
 import org.jabref.gui.StateManager;
 import org.jabref.gui.preview.PreviewViewer;
@@ -23,28 +23,33 @@
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.entry.BibEntryTypesManager;
 import org.jabref.preferences.PreferencesService;
-
-import com.airhacks.afterburner.views.ViewLoader;
-import com.tobiasdiez.easybind.EasyBind;
-import jakarta.inject.Inject;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 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;
 
@@ -53,13 +58,26 @@ public class DatabaseChangesResolverDialog extends BaseDialog<Boolean> {
 
     private ExternalChangesResolverViewModel viewModel;
 
-    @Inject private UndoManager undoManager;
-    @Inject private StateManager stateManager;
-    @Inject private DialogService dialogService;
-    @Inject private PreferencesService preferencesService;
-    @Inject private ThemeManager themeManager;
-    @Inject private BibEntryTypesManager entryTypesManager;
-    @Inject private TaskExecutor taskExecutor;
+    @Inject
+    private UndoManager undoManager;
+
+    @Inject
+    private StateManager stateManager;
+
+    @Inject
+    private DialogService dialogService;
+
+    @Inject
+    private PreferencesService preferencesService;
+
+    @Inject
+    private ThemeManager themeManager;
+
+    @Inject
+    private BibEntryTypesManager entryTypesManager;
+
+    @Inject
+    private TaskExecutor taskExecutor;
 
     /**
      * A dialog going through given <code>changes</code>, which are diffs to the provided <code>database</code>.
@@ -68,55 +86,92 @@ 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);
+        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;
-            }
-        });
+                if (viewModel.areAllChangesResolved()) {
+                    LOGGER.info("External changes are resolved successfully");
+                    return true;
+                } else {
+                    LOGGER.info("External changes aren't resolved");
+                    return false;
+                }
+            });
     }
 
     @FXML
     private void initialize() {
-        PreviewViewer previewViewer = new PreviewViewer(database, dialogService, preferencesService, stateManager, themeManager, taskExecutor);
-        DatabaseChangeDetailsViewFactory databaseChangeDetailsViewFactory = new DatabaseChangeDetailsViewFactory(database, dialogService, stateManager, themeManager, preferencesService, entryTypesManager, previewViewer, taskExecutor);
+        PreviewViewer previewViewer = new PreviewViewer(
+            database,
+            dialogService,
+            preferencesService,
+            stateManager,
+            themeManager,
+            taskExecutor
+        );
+        DatabaseChangeDetailsViewFactory databaseChangeDetailsViewFactory =
+            new DatabaseChangeDetailsViewFactory(
+                database,
+                dialogService,
+                stateManager,
+                themeManager,
+                preferencesService,
+                entryTypesManager,
+                previewViewer,
+                taskExecutor
+            );
 
         viewModel = new ExternalChangesResolverViewModel(changes, undoManager);
 
-        changeName.setCellValueFactory(data -> new SimpleStringProperty(data.getValue().getName()));
-        askUserToResolveChangeButton.disableProperty().bind(viewModel.canAskUserToResolveChangeProperty().not());
+        changeName.setCellValueFactory(data ->
+            new SimpleStringProperty(data.getValue().getName())
+        );
+        askUserToResolveChangeButton
+            .disableProperty()
+            .bind(viewModel.canAskUserToResolveChangeProperty().not());
 
         changesTableView.setItems(viewModel.getVisibleChanges());
         // Think twice before setting this to MULTIPLE...
-        changesTableView.getSelectionModel().setSelectionMode(SelectionMode.SINGLE);
+        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);
+        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) {
-                viewModel.applyChanges();
-                close();
+        );
+
+        EasyBind.subscribe(
+            viewModel.areAllChangesResolvedProperty(),
+            isResolved -> {
+                if (isResolved) {
+                    viewModel.applyChanges();
+                    close();
+                }
             }
-        });
+        );
     }
 
     @FXML
@@ -131,7 +186,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 0f3906594dc..19a128aa174 100644
--- a/src/main/java/org/jabref/gui/collab/ExternalChangesResolverViewModel.java
+++ b/src/main/java/org/jabref/gui/collab/ExternalChangesResolverViewModel.java
@@ -3,37 +3,40 @@
 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;
 import javafx.beans.property.SimpleObjectProperty;
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableList;
-
+import javax.swing.undo.UndoManager;
 import org.jabref.gui.AbstractViewModel;
 import org.jabref.gui.undo.NamedCompound;
 import org.jabref.logic.l10n.Localization;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 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 NamedCompound ce = new NamedCompound(Localization.lang("Merged external changes"));
-    private final ObservableList<DatabaseChange> visibleChanges = FXCollections.observableArrayList();
+    private final NamedCompound ce = new NamedCompound(
+        Localization.lang("Merged external changes")
+    );
+    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
      * track of changes even when they're removed from the UI.
      */
-    private final ObservableList<DatabaseChange> changes = FXCollections.observableArrayList();
+    private final ObservableList<DatabaseChange> changes =
+        FXCollections.observableArrayList();
 
-    private final ObjectProperty<DatabaseChange> selectedChange = new SimpleObjectProperty<>();
+    private final ObjectProperty<DatabaseChange> selectedChange =
+        new SimpleObjectProperty<>();
 
     private final BooleanBinding areAllChangesResolved;
 
@@ -41,7 +44,10 @@ 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();
 
@@ -49,8 +55,21 @@ public ExternalChangesResolverViewModel(List<DatabaseChange> externalChanges, Un
         this.changes.addAll(externalChanges);
         this.undoManager = undoManager;
 
-        areAllChangesResolved = Bindings.createBooleanBinding(visibleChanges::isEmpty, visibleChanges);
-        canAskUserToResolveChange = Bindings.createBooleanBinding(() -> selectedChange.isNotNull().get() && selectedChange.get().getExternalChangeResolver().isPresent(), selectedChange);
+        areAllChangesResolved =
+            Bindings.createBooleanBinding(
+                visibleChanges::isEmpty,
+                visibleChanges
+            );
+        canAskUserToResolveChange =
+            Bindings.createBooleanBinding(
+                () ->
+                    selectedChange.isNotNull().get() &&
+                    selectedChange
+                        .get()
+                        .getExternalChangeResolver()
+                        .isPresent(),
+                selectedChange
+            );
     }
 
     public ObservableList<DatabaseChange> getVisibleChanges() {
@@ -78,10 +97,11 @@ 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() {
@@ -91,16 +111,20 @@ 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);
+            });
     }
 
     public void applyChanges() {
-        changes.stream().filter(DatabaseChange::isAccepted).forEach(change -> change.applyChange(ce));
+        changes
+            .stream()
+            .filter(DatabaseChange::isAccepted)
+            .forEach(change -> change.applyChange(ce));
         ce.end();
         undoManager.addEdit(ce);
     }
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 abf8ae633bf..bcf4a0835a1 100644
--- a/src/main/java/org/jabref/gui/collab/entryadd/EntryAdd.java
+++ b/src/main/java/org/jabref/gui/collab/entryadd/EntryAdd.java
@@ -9,20 +9,30 @@
 import org.jabref.model.entry.BibEntry;
 
 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
     public void applyChange(NamedCompound undoEdit) {
         databaseContext.getDatabase().insertEntry(addedEntry);
-        undoEdit.addEdit(new UndoableInsertEntries(databaseContext.getDatabase(), addedEntry));
+        undoEdit.addEdit(
+            new UndoableInsertEntries(databaseContext.getDatabase(), addedEntry)
+        );
     }
 
     public BibEntry getAddedEntry() {
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 44189beef93..280f6dd9280 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,6 @@
 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;
@@ -12,18 +11,32 @@
 import org.jabref.model.entry.BibEntry;
 
 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) {
+    public EntryChange(
+        BibEntry oldEntry,
+        BibEntry newEntry,
+        BibDatabaseContext databaseContext
+    ) {
         this(oldEntry, newEntry, databaseContext, null);
     }
 
@@ -40,8 +53,12 @@ public void applyChange(NamedCompound undoEdit) {
         databaseContext.getDatabase().removeEntry(oldEntry);
         databaseContext.getDatabase().insertEntry(newEntry);
         CompoundEdit changeEntryEdit = new CompoundEdit();
-        changeEntryEdit.addEdit(new UndoableRemoveEntries(databaseContext.getDatabase(), oldEntry));
-        changeEntryEdit.addEdit(new UndoableInsertEntries(databaseContext.getDatabase(), newEntry));
+        changeEntryEdit.addEdit(
+            new UndoableRemoveEntries(databaseContext.getDatabase(), oldEntry)
+        );
+        changeEntryEdit.addEdit(
+            new UndoableInsertEntries(databaseContext.getDatabase(), newEntry)
+        );
         changeEntryEdit.end();
 
         undoEdit.addEdit(changeEntryEdit);
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 de482392470..c3e6a70cd56 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,6 @@
 package org.jabref.gui.collab.entrychange;
 
+import com.tobiasdiez.easybind.EasyBind;
 import javafx.event.Event;
 import javafx.geometry.Orientation;
 import javafx.scene.control.Label;
@@ -8,7 +9,6 @@
 import javafx.scene.input.MouseEvent;
 import javafx.scene.layout.VBox;
 import javafx.scene.web.WebView;
-
 import org.jabref.gui.DialogService;
 import org.jabref.gui.StateManager;
 import org.jabref.gui.collab.DatabaseChangeDetailsView;
@@ -21,30 +21,40 @@
 import org.jabref.model.entry.BibEntryTypesManager;
 import org.jabref.preferences.PreferencesService;
 
-import com.tobiasdiez.easybind.EasyBind;
-
 public final class EntryChangeDetailsView extends DatabaseChangeDetailsView {
-    private final PreviewWithSourceTab oldPreviewWithSourcesTab = new PreviewWithSourceTab();
-    private final PreviewWithSourceTab newPreviewWithSourcesTab = new PreviewWithSourceTab();
+
+    private final PreviewWithSourceTab oldPreviewWithSourcesTab =
+        new PreviewWithSourceTab();
+    private final PreviewWithSourceTab newPreviewWithSourcesTab =
+        new PreviewWithSourceTab();
     private boolean scrolling = false;
 
-    public EntryChangeDetailsView(BibEntry oldEntry,
-                                  BibEntry newEntry,
-                                  BibDatabaseContext databaseContext,
-                                  DialogService dialogService,
-                                  StateManager stateManager,
-                                  ThemeManager themeManager,
-                                  PreferencesService preferencesService,
-                                  BibEntryTypesManager entryTypesManager,
-                                  PreviewViewer previewViewer,
-                                  TaskExecutor taskExecutor) {
+    public EntryChangeDetailsView(
+        BibEntry oldEntry,
+        BibEntry newEntry,
+        BibDatabaseContext databaseContext,
+        DialogService dialogService,
+        StateManager stateManager,
+        ThemeManager themeManager,
+        PreferencesService preferencesService,
+        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, preferencesService, stateManager, themeManager, taskExecutor);
+        PreviewViewer previewClone = new PreviewViewer(
+            databaseContext,
+            dialogService,
+            preferencesService,
+            stateManager,
+            themeManager,
+            taskExecutor
+        );
 
         // The scroll bar used is not part of ScrollPane, but the attached WebView.
         WebView previewCloneView = (WebView) previewClone.getContent();
@@ -53,18 +63,47 @@ public EntryChangeDetailsView(BibEntry oldEntry,
         synchronizeScrolling(previewViewerView, previewCloneView);
         // TODO: Also sync scrolling for BibTeX view.
 
-        TabPane oldEntryTabPane = oldPreviewWithSourcesTab.getPreviewWithSourceTab(oldEntry, databaseContext, preferencesService, entryTypesManager, previewClone, Localization.lang("Entry Preview"));
-        TabPane newEntryTabPane = newPreviewWithSourcesTab.getPreviewWithSourceTab(newEntry, databaseContext, preferencesService, entryTypesManager, previewViewer, Localization.lang("Entry Preview"));
+        TabPane oldEntryTabPane =
+            oldPreviewWithSourcesTab.getPreviewWithSourceTab(
+                oldEntry,
+                databaseContext,
+                preferencesService,
+                entryTypesManager,
+                previewClone,
+                Localization.lang("Entry Preview")
+            );
+        TabPane newEntryTabPane =
+            newPreviewWithSourcesTab.getPreviewWithSourceTab(
+                newEntry,
+                databaseContext,
+                preferencesService,
+                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);
@@ -84,19 +123,30 @@ 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) {
-                    if (((MouseEvent) event).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) {
+                        if (((MouseEvent) event).isPrimaryButtonDown()) {
+                            int value = (Integer) webView
+                                .getEngine()
+                                .executeScript("window.scrollY");
+                            otherWebView
+                                .getEngine()
+                                .executeScript(
+                                    "window.scrollTo(0, " + value + ")"
+                                );
+                        }
+                    } else {
+                        otherWebView.fireEvent(
+                            event.copyFor(otherWebView, otherWebView)
+                        );
                     }
-                } else {
-                    otherWebView.fireEvent(event.copyFor(otherWebView, otherWebView));
+                    scrolling = false;
                 }
-                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 8555a2ec517..b9c9037baed 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,6 @@
 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;
@@ -15,12 +14,18 @@
 import org.jabref.preferences.PreferencesService;
 
 public final class EntryChangeResolver extends DatabaseChangeResolver {
+
     private final EntryChange entryChange;
     private final BibDatabaseContext databaseContext;
 
     private final PreferencesService preferencesService;
 
-    public EntryChangeResolver(EntryChange entryChange, DialogService dialogService, BibDatabaseContext databaseContext, PreferencesService preferencesService) {
+    public EntryChangeResolver(
+        EntryChange entryChange,
+        DialogService dialogService,
+        BibDatabaseContext databaseContext,
+        PreferencesService preferencesService
+    ) {
         super(dialogService);
         this.entryChange = entryChange;
         this.databaseContext = databaseContext;
@@ -29,20 +34,32 @@ public EntryChangeResolver(EntryChange entryChange, DialogService dialogService,
 
     @Override
     public Optional<DatabaseChange> askUserToResolveChange() {
-        MergeEntriesDialog mergeEntriesDialog = new MergeEntriesDialog(entryChange.getOldEntry(), entryChange.getNewEntry(), preferencesService);
+        MergeEntriesDialog mergeEntriesDialog = new MergeEntriesDialog(
+            entryChange.getOldEntry(),
+            entryChange.getNewEntry(),
+            preferencesService
+        );
         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) {
+    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 4567dfd91fc..a4372a4ef09 100644
--- a/src/main/java/org/jabref/gui/collab/entrychange/EntryWithPreviewAndSourceDetailsView.java
+++ b/src/main/java/org/jabref/gui/collab/entrychange/EntryWithPreviewAndSourceDetailsView.java
@@ -1,7 +1,6 @@
 package org.jabref.gui.collab.entrychange;
 
 import javafx.scene.control.TabPane;
-
 import org.jabref.gui.collab.DatabaseChangeDetailsView;
 import org.jabref.gui.preview.PreviewViewer;
 import org.jabref.model.database.BibDatabaseContext;
@@ -9,12 +8,27 @@
 import org.jabref.model.entry.BibEntryTypesManager;
 import org.jabref.preferences.PreferencesService;
 
-public final class EntryWithPreviewAndSourceDetailsView extends DatabaseChangeDetailsView {
+public final class EntryWithPreviewAndSourceDetailsView
+    extends DatabaseChangeDetailsView {
 
-    private final PreviewWithSourceTab previewWithSourceTab = new PreviewWithSourceTab();
+    private final PreviewWithSourceTab previewWithSourceTab =
+        new PreviewWithSourceTab();
 
-    public EntryWithPreviewAndSourceDetailsView(BibEntry entry, BibDatabaseContext bibDatabaseContext, PreferencesService preferencesService, BibEntryTypesManager entryTypesManager, PreviewViewer previewViewer) {
-        TabPane tabPanePreviewCode = previewWithSourceTab.getPreviewWithSourceTab(entry, bibDatabaseContext, preferencesService, entryTypesManager, previewViewer);
+    public EntryWithPreviewAndSourceDetailsView(
+        BibEntry entry,
+        BibDatabaseContext bibDatabaseContext,
+        PreferencesService preferencesService,
+        BibEntryTypesManager entryTypesManager,
+        PreviewViewer previewViewer
+    ) {
+        TabPane tabPanePreviewCode =
+            previewWithSourceTab.getPreviewWithSourceTab(
+                entry,
+                bibDatabaseContext,
+                preferencesService,
+                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 be87e21a046..f0e30c2c268 100644
--- a/src/main/java/org/jabref/gui/collab/entrychange/PreviewWithSourceTab.java
+++ b/src/main/java/org/jabref/gui/collab/entrychange/PreviewWithSourceTab.java
@@ -2,10 +2,9 @@
 
 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.preview.PreviewViewer;
 import org.jabref.logic.bibtex.BibEntryWriter;
 import org.jabref.logic.bibtex.FieldPreferences;
@@ -19,21 +18,45 @@
 import org.jabref.model.entry.BibEntryTypesManager;
 import org.jabref.model.strings.StringUtil;
 import org.jabref.preferences.PreferencesService;
-
-import org.fxmisc.richtext.CodeArea;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 public class PreviewWithSourceTab {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(PreviewWithSourceTab.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(
+        PreviewWithSourceTab.class
+    );
 
-    public TabPane getPreviewWithSourceTab(BibEntry entry, BibDatabaseContext bibDatabaseContext, PreferencesService preferencesService, BibEntryTypesManager entryTypesManager, PreviewViewer previewViewer) {
-        return getPreviewWithSourceTab(entry, bibDatabaseContext, preferencesService, entryTypesManager, previewViewer, "");
+    public TabPane getPreviewWithSourceTab(
+        BibEntry entry,
+        BibDatabaseContext bibDatabaseContext,
+        PreferencesService preferencesService,
+        BibEntryTypesManager entryTypesManager,
+        PreviewViewer previewViewer
+    ) {
+        return getPreviewWithSourceTab(
+            entry,
+            bibDatabaseContext,
+            preferencesService,
+            entryTypesManager,
+            previewViewer,
+            ""
+        );
     }
 
-    public TabPane getPreviewWithSourceTab(BibEntry entry, BibDatabaseContext bibDatabaseContext, PreferencesService preferencesService, BibEntryTypesManager entryTypesManager, PreviewViewer previewViewer, String label) {
-        previewViewer.setLayout(preferencesService.getPreviewPreferences().getSelectedPreviewLayout());
+    public TabPane getPreviewWithSourceTab(
+        BibEntry entry,
+        BibDatabaseContext bibDatabaseContext,
+        PreferencesService preferencesService,
+        BibEntryTypesManager entryTypesManager,
+        PreviewViewer previewViewer,
+        String label
+    ) {
+        previewViewer.setLayout(
+            preferencesService
+                .getPreviewPreferences()
+                .getSelectedPreviewLayout()
+        );
         previewViewer.setEntry(entry);
 
         CodeArea codeArea = new CodeArea();
@@ -52,22 +75,43 @@ public TabPane getPreviewWithSourceTab(BibEntry entry, BibDatabaseContext bibDat
         }
 
         try {
-            codeArea.appendText(getSourceString(entry, bibDatabaseContext.getMode(), preferencesService.getFieldPreferences(), entryTypesManager));
+            codeArea.appendText(
+                getSourceString(
+                    entry,
+                    bibDatabaseContext.getMode(),
+                    preferencesService.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);
-        new BibEntryWriter(fieldWriter, entryTypesManager).write(entry, bibWriter, type);
+        FieldWriter fieldWriter = FieldWriter.buildIgnoreHashes(
+            fieldPreferences
+        );
+        new BibEntryWriter(fieldWriter, entryTypesManager)
+            .write(entry, bibWriter, type);
         return writer.toString();
     }
 }
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 36116bb5845..a46b949c94c 100644
--- a/src/main/java/org/jabref/gui/collab/entrydelete/EntryDelete.java
+++ b/src/main/java/org/jabref/gui/collab/entrydelete/EntryDelete.java
@@ -9,20 +9,33 @@
 import org.jabref.model.entry.BibEntry;
 
 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
     public void applyChange(NamedCompound undoEdit) {
         databaseContext.getDatabase().removeEntry(deletedEntry);
-        undoEdit.addEdit(new UndoableRemoveEntries(databaseContext.getDatabase(), deletedEntry));
+        undoEdit.addEdit(
+            new UndoableRemoveEntries(
+                databaseContext.getDatabase(),
+                deletedEntry
+            )
+        );
     }
 
     public BibEntry getDeletedEntry() {
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 4444d0f79c3..6851969548e 100644
--- a/src/main/java/org/jabref/gui/collab/groupchange/GroupChange.java
+++ b/src/main/java/org/jabref/gui/collab/groupchange/GroupChange.java
@@ -12,13 +12,21 @@
 import org.jabref.model.groups.GroupTreeNode;
 
 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,19 +34,33 @@ 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"));
+            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
-            root.setGroup(DefaultGroupsFactory.getAllEntriesGroup(), false, false, null);
+            root.setGroup(
+                DefaultGroupsFactory.getAllEntriesGroup(),
+                false,
+                false,
+                null
+            );
         } else {
             // change root group, even though it'll be AllEntries anyway
             root.setGroup(newRoot.getGroup(), false, false, null);
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 914a2aceb75..be8f9ade471 100644
--- a/src/main/java/org/jabref/gui/collab/groupchange/GroupChangeDetailsView.java
+++ b/src/main/java/org/jabref/gui/collab/groupchange/GroupChangeDetailsView.java
@@ -1,7 +1,6 @@
 package org.jabref.gui.collab.groupchange;
 
 import javafx.scene.control.Label;
-
 import org.jabref.gui.collab.DatabaseChangeDetailsView;
 import org.jabref.logic.l10n.Localization;
 
@@ -12,7 +11,11 @@ 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);
         setLeftAnchor(label, 8d);
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 571fe74b752..ca13e687c9b 100644
--- a/src/main/java/org/jabref/gui/collab/metedatachange/MetadataChange.java
+++ b/src/main/java/org/jabref/gui/collab/metedatachange/MetadataChange.java
@@ -8,9 +8,14 @@
 import org.jabref.model.database.BibDatabaseContext;
 
 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 +27,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 3c2a81e3e01..4bd516798c5 100644
--- a/src/main/java/org/jabref/gui/collab/metedatachange/MetadataChangeDetailsView.java
+++ b/src/main/java/org/jabref/gui/collab/metedatachange/MetadataChangeDetailsView.java
@@ -3,7 +3,6 @@
 import javafx.scene.control.Label;
 import javafx.scene.control.ScrollPane;
 import javafx.scene.layout.VBox;
-
 import org.jabref.gui.collab.DatabaseChangeDetailsView;
 import org.jabref.logic.bibtex.comparator.MetaDataDiff;
 import org.jabref.logic.l10n.Localization;
@@ -11,16 +10,27 @@
 
 public final class MetadataChangeDetailsView extends DatabaseChangeDetailsView {
 
-    public MetadataChangeDetailsView(MetadataChange metadataChange, PreferencesService preferencesService) {
+    public MetadataChangeDetailsView(
+        MetadataChange metadataChange,
+        PreferencesService preferencesService
+    ) {
         VBox container = new VBox(15);
 
-        Label header = new Label(Localization.lang("The following metadata changed:"));
+        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(preferencesService)) {
-            container.getChildren().add(new Label(getDifferenceString(diff.differenceType())));
-            container.getChildren().add(new Label(diff.originalObject().toString()));
+        for (MetaDataDiff.Difference diff : metadataChange
+            .getMetaDataDiff()
+            .getDifferences(preferencesService)) {
+            container
+                .getChildren()
+                .add(new Label(getDifferenceString(diff.differenceType())));
+            container
+                .getChildren()
+                .add(new Label(diff.originalObject().toString()));
             container.getChildren().add(new Label(diff.newObject().toString()));
         }
 
@@ -36,30 +46,24 @@ public MetadataChangeDetailsView(MetadataChange metadataChange, PreferencesServi
 
     private String getDifferenceString(MetaDataDiff.DifferenceType changeType) {
         return switch (changeType) {
-            case PROTECTED ->
-                    Localization.lang("Library protection");
-            case GROUPS_ALTERED ->
-                    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_ALTERED -> 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 5789d2bbbcc..4e70a08567c 100644
--- a/src/main/java/org/jabref/gui/collab/preamblechange/PreambleChange.java
+++ b/src/main/java/org/jabref/gui/collab/preamblechange/PreambleChange.java
@@ -7,16 +7,22 @@
 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;
 
 public final class PreambleChange extends DatabaseChange {
-    private static final Logger LOGGER = LoggerFactory.getLogger(PreambleChange.class);
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(
+        PreambleChange.class
+    );
 
     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;
 
@@ -25,8 +31,16 @@ 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()));
+        databaseContext
+            .getDatabase()
+            .setPreamble(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 8630f62c240..f19f2cea691 100644
--- a/src/main/java/org/jabref/gui/collab/preamblechange/PreambleChangeDetailsView.java
+++ b/src/main/java/org/jabref/gui/collab/preamblechange/PreambleChangeDetailsView.java
@@ -2,7 +2,6 @@
 
 import javafx.scene.control.Label;
 import javafx.scene.layout.VBox;
-
 import org.jabref.gui.collab.DatabaseChangeDetailsView;
 import org.jabref.logic.bibtex.comparator.PreambleDiff;
 import org.jabref.logic.l10n.Localization;
@@ -19,13 +18,33 @@ 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")));
+            container
+                .getChildren()
+                .add(new Label(Localization.lang("Value cleared externally")));
         }
         setLeftAnchor(container, 8d);
         setTopAnchor(container, 8d);
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 98c311ca6dc..39f3ee42a74 100644
--- a/src/main/java/org/jabref/gui/collab/stringadd/BibTexStringAdd.java
+++ b/src/main/java/org/jabref/gui/collab/stringadd/BibTexStringAdd.java
@@ -8,28 +8,46 @@
 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;
 
 public final class BibTexStringAdd extends DatabaseChange {
-    private static final Logger LOGGER = LoggerFactory.getLogger(BibTexStringAdd.class);
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(
+        BibTexStringAdd.class
+    );
 
     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()));
+        setChangeName(
+            Localization.lang("Added string: '%0'", addedString.getName())
+        );
     }
 
     @Override
     public void applyChange(NamedCompound undoEdit) {
         try {
             databaseContext.getDatabase().addString(addedString);
-            undoEdit.addEdit(new UndoableInsertString(databaseContext.getDatabase(), 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 5e34729d108..b19f5fecc9e 100644
--- a/src/main/java/org/jabref/gui/collab/stringadd/BibTexStringAddDetailsView.java
+++ b/src/main/java/org/jabref/gui/collab/stringadd/BibTexStringAddDetailsView.java
@@ -2,21 +2,33 @@
 
 import javafx.scene.control.Label;
 import javafx.scene.layout.VBox;
-
 import org.jabref.gui.collab.DatabaseChangeDetailsView;
 import org.jabref.logic.l10n.Localization;
 
-public final class BibTexStringAddDetailsView extends DatabaseChangeDetailsView {
+public final class BibTexStringAddDetailsView
+    extends DatabaseChangeDetailsView {
 
     public BibTexStringAddDetailsView(BibTexStringAdd stringAdd) {
         VBox container = new VBox();
         Label header = new Label(Localization.lang("Added string"));
         header.getStyleClass().add("sectionHeader");
-        container.getChildren().addAll(
+        container
+            .getChildren()
+            .addAll(
                 header,
-                new Label(Localization.lang("Label: %0", stringAdd.getAddedString().getName())),
-                new Label(Localization.lang("Content: %0", stringAdd.getAddedString().getContent()))
-        );
+                new Label(
+                    Localization.lang(
+                        "Label: %0",
+                        stringAdd.getAddedString().getName()
+                    )
+                ),
+                new Label(
+                    Localization.lang(
+                        "Content: %0",
+                        stringAdd.getAddedString().getContent()
+                    )
+                )
+            );
         setLeftAnchor(container, 8d);
         setTopAnchor(container, 8d);
         setRightAnchor(container, 8d);
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 8cb58e99d46..91ead32b222 100644
--- a/src/main/java/org/jabref/gui/collab/stringchange/BibTexStringChange.java
+++ b/src/main/java/org/jabref/gui/collab/stringchange/BibTexStringChange.java
@@ -7,22 +7,31 @@
 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;
 
 public final class BibTexStringChange extends DatabaseChange {
-    private static final Logger LOGGER = LoggerFactory.getLogger(BibTexStringChange.class);
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(
+        BibTexStringChange.class
+    );
 
     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;
 
-        setChangeName(Localization.lang("Modified string: '%0'", oldString.getName()));
+        setChangeName(
+            Localization.lang("Modified string: '%0'", oldString.getName())
+        );
     }
 
     @Override
@@ -30,7 +39,9 @@ public void applyChange(NamedCompound undoEdit) {
         String oldContent = oldString.getContent();
         String newContent = newString.getContent();
         oldString.setContent(newContent);
-        undoEdit.addEdit(new UndoableStringChange(oldString, false, oldContent, newContent));
+        undoEdit.addEdit(
+            new UndoableStringChange(oldString, false, oldContent, newContent)
+        );
     }
 
     public BibtexString getOldString() {
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 58fa700aa2c..1b8bf1bef39 100644
--- a/src/main/java/org/jabref/gui/collab/stringchange/BibTexStringChangeDetailsView.java
+++ b/src/main/java/org/jabref/gui/collab/stringchange/BibTexStringChangeDetailsView.java
@@ -2,23 +2,44 @@
 
 import javafx.scene.control.Label;
 import javafx.scene.layout.VBox;
-
 import org.jabref.gui.collab.DatabaseChangeDetailsView;
 import org.jabref.logic.l10n.Localization;
 
-public final class BibTexStringChangeDetailsView extends DatabaseChangeDetailsView {
+public final class BibTexStringChangeDetailsView
+    extends DatabaseChangeDetailsView {
 
     public BibTexStringChangeDetailsView(BibTexStringChange stringChange) {
         VBox container = new VBox();
         Label header = new Label(Localization.lang("Modified string"));
         header.getStyleClass().add("sectionHeader");
-        container.getChildren().addAll(
+        container
+            .getChildren()
+            .addAll(
                 header,
-                new Label(Localization.lang("Label: %0", stringChange.getOldString().getName())),
-                new Label(Localization.lang("Content: %0", stringChange.getNewString().getContent()))
-        );
+                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()
+                    )
+                )
+            );
         setLeftAnchor(container, 8d);
         setTopAnchor(container, 8d);
         setRightAnchor(container, 8d);
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 2f55cf7d331..c59b226102b 100644
--- a/src/main/java/org/jabref/gui/collab/stringdelete/BibTexStringDelete.java
+++ b/src/main/java/org/jabref/gui/collab/stringdelete/BibTexStringDelete.java
@@ -7,28 +7,46 @@
 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;
 
 public final class BibTexStringDelete extends DatabaseChange {
-    private static final Logger LOGGER = LoggerFactory.getLogger(BibTexStringDelete.class);
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(
+        BibTexStringDelete.class
+    );
 
     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()));
+        setChangeName(
+            Localization.lang("Deleted string: '%0'", deletedString.getName())
+        );
     }
 
     @Override
     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 2d35145b51d..1e00ad6b656 100644
--- a/src/main/java/org/jabref/gui/collab/stringdelete/BibTexStringDeleteDetailsView.java
+++ b/src/main/java/org/jabref/gui/collab/stringdelete/BibTexStringDeleteDetailsView.java
@@ -2,21 +2,33 @@
 
 import javafx.scene.control.Label;
 import javafx.scene.layout.VBox;
-
 import org.jabref.gui.collab.DatabaseChangeDetailsView;
 import org.jabref.logic.l10n.Localization;
 
-public final class BibTexStringDeleteDetailsView extends DatabaseChangeDetailsView {
+public final class BibTexStringDeleteDetailsView
+    extends DatabaseChangeDetailsView {
 
     public BibTexStringDeleteDetailsView(BibTexStringDelete stringDelete) {
         VBox container = new VBox();
         Label header = new Label(Localization.lang("Deleted string"));
         header.getStyleClass().add("sectionHeader");
-        container.getChildren().addAll(
+        container
+            .getChildren()
+            .addAll(
                 header,
-                new Label(Localization.lang("Label: %0", stringDelete.getDeletedString().getName())),
-                new Label(Localization.lang("Content: %0", stringDelete.getDeletedString().getContent()))
-        );
+                new Label(
+                    Localization.lang(
+                        "Label: %0",
+                        stringDelete.getDeletedString().getName()
+                    )
+                ),
+                new Label(
+                    Localization.lang(
+                        "Content: %0",
+                        stringDelete.getDeletedString().getContent()
+                    )
+                )
+            );
         setLeftAnchor(container, 8d);
         setTopAnchor(container, 8d);
         setRightAnchor(container, 8d);
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 0236ebda467..1b3e69ccaf4 100644
--- a/src/main/java/org/jabref/gui/collab/stringrename/BibTexStringRename.java
+++ b/src/main/java/org/jabref/gui/collab/stringrename/BibTexStringRename.java
@@ -7,35 +7,52 @@
 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;
 
 public final class BibTexStringRename extends DatabaseChange {
-    private static final Logger LOGGER = LoggerFactory.getLogger(BibTexStringRename.class);
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(
+        BibTexStringRename.class
+    );
 
     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;
 
-        setChangeName(Localization.lang("Renamed string: '%0'", oldString.getName()));
+        setChangeName(
+            Localization.lang("Renamed string: '%0'", oldString.getName())
+        );
     }
 
     @Override
     public void applyChange(NamedCompound undoEdit) {
-        if (databaseContext.getDatabase().hasStringByName(newString.getName())) {
+        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();
         String newName = newString.getName();
         oldString.setName(newName);
-        undoEdit.addEdit(new UndoableStringChange(oldString, true, currentName, newName));
+        undoEdit.addEdit(
+            new UndoableStringChange(oldString, true, currentName, newName)
+        );
     }
 
     public BibtexString getOldString() {
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 b810a1c526e..10fd142d81e 100644
--- a/src/main/java/org/jabref/gui/collab/stringrename/BibTexStringRenameDetailsView.java
+++ b/src/main/java/org/jabref/gui/collab/stringrename/BibTexStringRenameDetailsView.java
@@ -1,13 +1,17 @@
 package org.jabref.gui.collab.stringrename;
 
 import javafx.scene.control.Label;
-
 import org.jabref.gui.collab.DatabaseChangeDetailsView;
 
-public final class BibTexStringRenameDetailsView extends DatabaseChangeDetailsView {
+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()
+        );
         setLeftAnchor(label, 8d);
         setTopAnchor(label, 8d);
         setRightAnchor(label, 8d);
diff --git a/src/main/java/org/jabref/gui/commonfxcontrols/CitationKeyPatternPanel.java b/src/main/java/org/jabref/gui/commonfxcontrols/CitationKeyPatternPanel.java
index 1fd7e1cbc8a..191c4093da3 100644
--- a/src/main/java/org/jabref/gui/commonfxcontrols/CitationKeyPatternPanel.java
+++ b/src/main/java/org/jabref/gui/commonfxcontrols/CitationKeyPatternPanel.java
@@ -1,7 +1,8 @@
 package org.jabref.gui.commonfxcontrols;
 
+import com.airhacks.afterburner.views.ViewLoader;
+import jakarta.inject.Inject;
 import java.util.Collection;
-
 import javafx.beans.property.ListProperty;
 import javafx.beans.property.ObjectProperty;
 import javafx.fxml.FXML;
@@ -10,7 +11,6 @@
 import javafx.scene.control.TableView;
 import javafx.scene.control.cell.TextFieldTableCell;
 import javafx.scene.input.KeyEvent;
-
 import org.jabref.gui.icon.IconTheme;
 import org.jabref.gui.util.ValueTableCellFactory;
 import org.jabref.logic.citationkeypattern.AbstractCitationKeyPattern;
@@ -19,16 +19,26 @@
 import org.jabref.model.entry.types.EntryType;
 import org.jabref.preferences.PreferencesService;
 
-import com.airhacks.afterburner.views.ViewLoader;
-import jakarta.inject.Inject;
+public class CitationKeyPatternPanel
+    extends TableView<CitationKeyPatternPanelItemModel> {
 
-public class CitationKeyPatternPanel extends TableView<CitationKeyPatternPanelItemModel> {
+    @FXML
+    public TableColumn<
+        CitationKeyPatternPanelItemModel,
+        EntryType
+    > entryTypeColumn;
+
+    @FXML
+    public TableColumn<CitationKeyPatternPanelItemModel, String> patternColumn;
 
-    @FXML public TableColumn<CitationKeyPatternPanelItemModel, EntryType> entryTypeColumn;
-    @FXML public TableColumn<CitationKeyPatternPanelItemModel, String> patternColumn;
-    @FXML public TableColumn<CitationKeyPatternPanelItemModel, EntryType> actionsColumn;
+    @FXML
+    public TableColumn<
+        CitationKeyPatternPanelItemModel,
+        EntryType
+    > actionsColumn;
 
-    @Inject private PreferencesService preferences;
+    @Inject
+    private PreferencesService preferences;
 
     private CitationKeyPatternPanelViewModel viewModel;
 
@@ -37,53 +47,83 @@ public class CitationKeyPatternPanel extends TableView<CitationKeyPatternPanelIt
 
     public CitationKeyPatternPanel() {
         super();
-
-        ViewLoader.view(this)
-                  .root(this)
-                  .load();
+        ViewLoader.view(this).root(this).load();
     }
 
     @FXML
     private void initialize() {
-        viewModel = new CitationKeyPatternPanelViewModel(preferences.getCitationKeyPatternPreferences());
+        viewModel =
+            new CitationKeyPatternPanelViewModel(
+                preferences.getCitationKeyPatternPreferences()
+            );
 
         this.setEditable(true);
 
         entryTypeColumn.setSortable(true);
         entryTypeColumn.setReorderable(false);
-        entryTypeColumn.setCellValueFactory(cellData -> cellData.getValue().entryType());
+        entryTypeColumn.setCellValueFactory(cellData ->
+            cellData.getValue().entryType()
+        );
         new ValueTableCellFactory<CitationKeyPatternPanelItemModel, EntryType>()
-                .withText(EntryType::getDisplayName)
-                .install(entryTypeColumn);
+            .withText(EntryType::getDisplayName)
+            .install(entryTypeColumn);
         this.setOnSort(event ->
-                viewModel.patternListProperty().sort(CitationKeyPatternPanelViewModel.defaultOnTopComparator));
+                viewModel
+                    .patternListProperty()
+                    .sort(
+                        CitationKeyPatternPanelViewModel.defaultOnTopComparator
+                    )
+            );
 
         patternColumn.setSortable(true);
         patternColumn.setReorderable(false);
-        patternColumn.setCellValueFactory(cellData -> cellData.getValue().pattern());
+        patternColumn.setCellValueFactory(cellData ->
+            cellData.getValue().pattern()
+        );
         patternColumn.setCellFactory(TextFieldTableCell.forTableColumn());
         patternColumn.setEditable(true);
         patternColumn.setOnEditCommit(
-                (TableColumn.CellEditEvent<CitationKeyPatternPanelItemModel, String> event) ->
-                        event.getRowValue().setPattern(event.getNewValue()));
+                (
+                    TableColumn.CellEditEvent<
+                        CitationKeyPatternPanelItemModel,
+                        String
+                    > event
+                ) ->
+            event.getRowValue().setPattern(event.getNewValue())
+        );
 
         actionsColumn.setSortable(false);
         actionsColumn.setReorderable(false);
-        actionsColumn.setCellValueFactory(cellData -> cellData.getValue().entryType());
+        actionsColumn.setCellValueFactory(cellData ->
+            cellData.getValue().entryType()
+        );
         new ValueTableCellFactory<CitationKeyPatternPanelItemModel, EntryType>()
-                .withGraphic(entryType -> IconTheme.JabRefIcons.REFRESH.getGraphicNode())
-                .withTooltip(entryType ->
-                        String.format(Localization.lang("Reset %s to default value"), entryType.getDisplayName()))
-                .withOnMouseClickedEvent(item -> evt ->
-                        viewModel.setItemToDefaultPattern(this.getFocusModel().getFocusedItem()))
-                .install(actionsColumn);
+            .withGraphic(entryType ->
+                IconTheme.JabRefIcons.REFRESH.getGraphicNode()
+            )
+            .withTooltip(entryType ->
+                String.format(
+                    Localization.lang("Reset %s to default value"),
+                    entryType.getDisplayName()
+                )
+            )
+            .withOnMouseClickedEvent(item ->
+                evt ->
+                    viewModel.setItemToDefaultPattern(
+                        this.getFocusModel().getFocusedItem()
+                    )
+            )
+            .install(actionsColumn);
 
         this.setRowFactory(item -> new HighlightTableRow());
         this.setOnKeyTyped(this::jumpToSearchKey);
         this.itemsProperty().bindBidirectional(viewModel.patternListProperty());
     }
 
-    public void setValues(Collection<BibEntryType> entryTypeList, AbstractCitationKeyPattern keyPattern) {
+    public void setValues(
+        Collection<BibEntryType> entryTypeList,
+        AbstractCitationKeyPattern keyPattern
+    ) {
         viewModel.setValues(entryTypeList, keyPattern);
     }
 
@@ -91,11 +131,15 @@ public void resetAll() {
         viewModel.resetAll();
     }
 
-    public ListProperty<CitationKeyPatternPanelItemModel> patternListProperty() {
+    public ListProperty<
+        CitationKeyPatternPanelItemModel
+    > patternListProperty() {
         return viewModel.patternListProperty();
     }
 
-    public ObjectProperty<CitationKeyPatternPanelItemModel> defaultKeyPatternProperty() {
+    public ObjectProperty<
+        CitationKeyPatternPanelItemModel
+    > defaultKeyPatternProperty() {
         return viewModel.defaultKeyPatternProperty();
     }
 
@@ -112,19 +156,40 @@ 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<CitationKeyPatternPanelItemModel> {
+    private static class HighlightTableRow
+        extends TableRow<CitationKeyPatternPanelItemModel> {
+
         @Override
-        public void updateItem(CitationKeyPatternPanelItemModel item, boolean empty) {
+        public void updateItem(
+            CitationKeyPatternPanelItemModel item,
+            boolean empty
+        ) {
             super.updateItem(item, empty);
             if (item == null || item.getEntryType() == null) {
                 setStyle("");
             } else if (isSelected()) {
                 setStyle("-fx-background-color: -fx-selection-bar");
-            } else if (item.getEntryType().getName().equals(CitationKeyPatternPanelViewModel.ENTRY_TYPE_DEFAULT_NAME)) {
+            } else if (
+                item
+                    .getEntryType()
+                    .getName()
+                    .equals(
+                        CitationKeyPatternPanelViewModel.ENTRY_TYPE_DEFAULT_NAME
+                    )
+            ) {
                 setStyle("-fx-background-color: -fx-default-button");
             } else {
                 setStyle("");
diff --git a/src/main/java/org/jabref/gui/commonfxcontrols/CitationKeyPatternPanelItemModel.java b/src/main/java/org/jabref/gui/commonfxcontrols/CitationKeyPatternPanelItemModel.java
index 61b7ce6a61c..c225fca0483 100644
--- a/src/main/java/org/jabref/gui/commonfxcontrols/CitationKeyPatternPanelItemModel.java
+++ b/src/main/java/org/jabref/gui/commonfxcontrols/CitationKeyPatternPanelItemModel.java
@@ -1,19 +1,22 @@
 package org.jabref.gui.commonfxcontrols;
 
 import java.util.Objects;
-
 import javafx.beans.property.ObjectProperty;
 import javafx.beans.property.SimpleObjectProperty;
 import javafx.beans.property.SimpleStringProperty;
 import javafx.beans.property.StringProperty;
-
 import org.jabref.model.entry.types.EntryType;
 
 public class CitationKeyPatternPanelItemModel {
-    private final ObjectProperty<EntryType> entryType = new SimpleObjectProperty<>();
+
+    private final ObjectProperty<EntryType> entryType =
+        new SimpleObjectProperty<>();
     private final StringProperty pattern = new SimpleStringProperty("");
 
-    public CitationKeyPatternPanelItemModel(EntryType entryType, String pattern) {
+    public CitationKeyPatternPanelItemModel(
+        EntryType entryType,
+        String pattern
+    ) {
         Objects.requireNonNull(entryType);
         Objects.requireNonNull(pattern);
         this.entryType.setValue(entryType);
@@ -42,6 +45,12 @@ public StringProperty pattern() {
 
     @Override
     public String toString() {
-        return "[" + entryType.getValue().getName() + "," + pattern.getValue() + "]";
+        return (
+            "[" +
+            entryType.getValue().getName() +
+            "," +
+            pattern.getValue() +
+            "]"
+        );
     }
 }
diff --git a/src/main/java/org/jabref/gui/commonfxcontrols/CitationKeyPatternPanelViewModel.java b/src/main/java/org/jabref/gui/commonfxcontrols/CitationKeyPatternPanelViewModel.java
index e592ef19a7c..2e1ba16b0ff 100644
--- a/src/main/java/org/jabref/gui/commonfxcontrols/CitationKeyPatternPanelViewModel.java
+++ b/src/main/java/org/jabref/gui/commonfxcontrols/CitationKeyPatternPanelViewModel.java
@@ -2,13 +2,11 @@
 
 import java.util.Collection;
 import java.util.Comparator;
-
 import javafx.beans.property.ListProperty;
 import javafx.beans.property.ObjectProperty;
 import javafx.beans.property.SimpleListProperty;
 import javafx.beans.property.SimpleObjectProperty;
 import javafx.collections.FXCollections;
-
 import org.jabref.logic.citationkeypattern.AbstractCitationKeyPattern;
 import org.jabref.logic.citationkeypattern.CitationKeyPatternPreferences;
 import org.jabref.logic.l10n.Localization;
@@ -19,7 +17,9 @@ public class CitationKeyPatternPanelViewModel {
 
     public static final String ENTRY_TYPE_DEFAULT_NAME = "default";
 
-    public static Comparator<CitationKeyPatternPanelItemModel> defaultOnTopComparator = (o1, o2) -> {
+    public static Comparator<
+        CitationKeyPatternPanelItemModel
+    > defaultOnTopComparator = (o1, o2) -> {
         String itemOneName = o1.getEntryType().getName();
         String itemTwoName = o2.getEntryType().getName();
 
@@ -34,38 +34,59 @@ public class CitationKeyPatternPanelViewModel {
         return 0;
     };
 
-    private final ListProperty<CitationKeyPatternPanelItemModel> patternListProperty = new SimpleListProperty<>();
-    private final ObjectProperty<CitationKeyPatternPanelItemModel> defaultItemProperty = new SimpleObjectProperty<>();
+    private final ListProperty<
+        CitationKeyPatternPanelItemModel
+    > patternListProperty = new SimpleListProperty<>();
+    private final ObjectProperty<
+        CitationKeyPatternPanelItemModel
+    > defaultItemProperty = new SimpleObjectProperty<>();
 
     private final CitationKeyPatternPreferences keyPatternPreferences;
 
-    public CitationKeyPatternPanelViewModel(CitationKeyPatternPreferences keyPatternPreferences) {
+    public CitationKeyPatternPanelViewModel(
+        CitationKeyPatternPreferences keyPatternPreferences
+    ) {
         this.keyPatternPreferences = keyPatternPreferences;
     }
 
-    public void setValues(Collection<BibEntryType> entryTypeList, AbstractCitationKeyPattern initialKeyPattern) {
+    public void setValues(
+        Collection<BibEntryType> entryTypeList,
+        AbstractCitationKeyPattern initialKeyPattern
+    ) {
         String defaultPattern;
-        if ((initialKeyPattern.getDefaultValue() == null) || initialKeyPattern.getDefaultValue().isEmpty()) {
+        if (
+            (initialKeyPattern.getDefaultValue() == null) ||
+            initialKeyPattern.getDefaultValue().isEmpty()
+        ) {
             defaultPattern = "";
         } else {
             defaultPattern = initialKeyPattern.getDefaultValue().get(0);
         }
 
-        defaultItemProperty.setValue(new CitationKeyPatternPanelItemModel(new DefaultEntryType(), defaultPattern));
+        defaultItemProperty.setValue(
+            new CitationKeyPatternPanelItemModel(
+                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).get(0);
-                         }
-                         patternListProperty.add(new CitationKeyPatternPanelItemModel(entryType, pattern));
-                     });
+        entryTypeList
+            .stream()
+            .map(BibEntryType::getType)
+            .forEach(entryType -> {
+                String pattern;
+                if (initialKeyPattern.isDefaultValue(entryType)) {
+                    pattern = "";
+                } else {
+                    pattern =
+                        initialKeyPattern.getPatterns().get(entryType).get(0);
+                }
+                patternListProperty.add(
+                    new CitationKeyPatternPanelItemModel(entryType, pattern)
+                );
+            });
     }
 
     public void setItemToDefaultPattern(CitationKeyPatternPanelItemModel item) {
@@ -74,18 +95,25 @@ public void setItemToDefaultPattern(CitationKeyPatternPanelItemModel item) {
 
     public void resetAll() {
         patternListProperty.forEach(item -> item.setPattern(""));
-        defaultItemProperty.getValue().setPattern(keyPatternPreferences.getDefaultPattern());
+        defaultItemProperty
+            .getValue()
+            .setPattern(keyPatternPreferences.getDefaultPattern());
     }
 
-    public ListProperty<CitationKeyPatternPanelItemModel> patternListProperty() {
+    public ListProperty<
+        CitationKeyPatternPanelItemModel
+    > patternListProperty() {
         return patternListProperty;
     }
 
-    public ObjectProperty<CitationKeyPatternPanelItemModel> defaultKeyPatternProperty() {
+    public ObjectProperty<
+        CitationKeyPatternPanelItemModel
+    > defaultKeyPatternProperty() {
         return defaultItemProperty;
     }
 
     public static class DefaultEntryType implements EntryType {
+
         @Override
         public String getName() {
             return ENTRY_TYPE_DEFAULT_NAME;
diff --git a/src/main/java/org/jabref/gui/commonfxcontrols/FieldFormatterCleanupsPanel.java b/src/main/java/org/jabref/gui/commonfxcontrols/FieldFormatterCleanupsPanel.java
index f9994545561..f033a15aa28 100644
--- a/src/main/java/org/jabref/gui/commonfxcontrols/FieldFormatterCleanupsPanel.java
+++ b/src/main/java/org/jabref/gui/commonfxcontrols/FieldFormatterCleanupsPanel.java
@@ -1,5 +1,6 @@
 package org.jabref.gui.commonfxcontrols;
 
+import com.airhacks.afterburner.views.ViewLoader;
 import javafx.beans.property.BooleanProperty;
 import javafx.beans.property.ListProperty;
 import javafx.beans.property.ReadOnlyObjectWrapper;
@@ -12,7 +13,6 @@
 import javafx.scene.control.TableView;
 import javafx.scene.input.KeyCode;
 import javafx.scene.layout.VBox;
-
 import org.jabref.gui.icon.IconTheme;
 import org.jabref.gui.util.BindingsHelper;
 import org.jabref.gui.util.FieldsUtil;
@@ -23,24 +23,33 @@
 import org.jabref.logic.l10n.Localization;
 import org.jabref.model.entry.field.Field;
 
-import com.airhacks.afterburner.views.ViewLoader;
-
 public class FieldFormatterCleanupsPanel extends VBox {
 
-    @FXML private CheckBox cleanupsEnabled;
-    @FXML private TableView<FieldFormatterCleanup> cleanupsList;
-    @FXML private TableColumn<FieldFormatterCleanup, Field> fieldColumn;
-    @FXML private TableColumn<FieldFormatterCleanup, Formatter> formatterColumn;
-    @FXML private TableColumn<FieldFormatterCleanup, Field> actionsColumn;
-    @FXML private ComboBox<Field> addableFields;
-    @FXML private ComboBox<Formatter> addableFormatters;
+    @FXML
+    private CheckBox cleanupsEnabled;
+
+    @FXML
+    private TableView<FieldFormatterCleanup> cleanupsList;
+
+    @FXML
+    private TableColumn<FieldFormatterCleanup, Field> fieldColumn;
+
+    @FXML
+    private TableColumn<FieldFormatterCleanup, Formatter> formatterColumn;
+
+    @FXML
+    private TableColumn<FieldFormatterCleanup, Field> actionsColumn;
+
+    @FXML
+    private ComboBox<Field> addableFields;
+
+    @FXML
+    private ComboBox<Formatter> addableFormatters;
 
     private FieldFormatterCleanupsPanelViewModel viewModel;
 
     public FieldFormatterCleanupsPanel() {
-        ViewLoader.view(this)
-                  .root(this)
-                  .load();
+        ViewLoader.view(this).root(this).load();
     }
 
     @FXML
@@ -57,48 +66,73 @@ 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);
+            .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);
+            .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()))
-                .install(actionsColumn);
-
-        viewModel.selectedCleanupProperty().setValue(cleanupsList.getSelectionModel());
+            .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()
+                    )
+            )
+            .install(actionsColumn);
+
+        viewModel
+            .selectedCleanupProperty()
+            .setValue(cleanupsList.getSelectionModel());
 
         cleanupsList.setOnKeyPressed(event -> {
             if (event.getCode() == KeyCode.DELETE) {
-                viewModel.removeCleanup(cleanupsList.getSelectionModel().getSelectedItem());
+                viewModel.removeCleanup(
+                    cleanupsList.getSelectionModel().getSelectedItem()
+                );
             }
         });
     }
 
     private void setupCombos() {
         new ViewModelListCellFactory<Field>()
-                .withText(Field::getDisplayName)
-                .install(addableFields);
+            .withText(Field::getDisplayName)
+            .install(addableFields);
         addableFields.setConverter(FieldsUtil.FIELD_STRING_CONVERTER);
         addableFields.setOnKeyPressed(event -> {
-            if (event.getCode() == KeyCode.TAB || event.getCode() == KeyCode.ENTER) {
+            if (
+                event.getCode() == KeyCode.TAB ||
+                event.getCode() == KeyCode.ENTER
+            ) {
                 addableFormatters.requestFocus();
                 event.consume();
             }
         });
 
         new ViewModelListCellFactory<Formatter>()
-                .withText(Formatter::getName)
-                .withStringTooltip(Formatter::getDescription)
-                .install(addableFormatters);
+            .withText(Formatter::getName)
+            .withStringTooltip(Formatter::getDescription)
+            .install(addableFormatters);
         addableFormatters.setOnKeyPressed(event -> {
             if (event.getCode() == KeyCode.ENTER) {
                 viewModel.addCleanup();
@@ -108,16 +142,24 @@ private void setupCombos() {
     }
 
     private void setupBindings() {
-        BindingsHelper.bindBidirectional((ObservableValue<Boolean>) cleanupsEnabled.selectedProperty(),
-                viewModel.cleanupsDisableProperty(),
-                disabled -> cleanupsEnabled.selectedProperty().setValue(!disabled),
-                selected -> viewModel.cleanupsDisableProperty().setValue(!selected));
+        BindingsHelper.bindBidirectional(
+            (ObservableValue<Boolean>) cleanupsEnabled.selectedProperty(),
+            viewModel.cleanupsDisableProperty(),
+            disabled -> cleanupsEnabled.selectedProperty().setValue(!disabled),
+            selected -> viewModel.cleanupsDisableProperty().setValue(!selected)
+        );
 
         cleanupsList.itemsProperty().bind(viewModel.cleanupsListProperty());
         addableFields.itemsProperty().bind(viewModel.availableFieldsProperty());
-        addableFields.valueProperty().bindBidirectional(viewModel.selectedFieldProperty());
-        addableFormatters.itemsProperty().bind(viewModel.availableFormattersProperty());
-        addableFormatters.valueProperty().bindBidirectional(viewModel.selectedFormatterProperty());
+        addableFields
+            .valueProperty()
+            .bindBidirectional(viewModel.selectedFieldProperty());
+        addableFormatters
+            .itemsProperty()
+            .bind(viewModel.availableFormattersProperty());
+        addableFormatters
+            .valueProperty()
+            .bindBidirectional(viewModel.selectedFormatterProperty());
     }
 
     @FXML
diff --git a/src/main/java/org/jabref/gui/commonfxcontrols/FieldFormatterCleanupsPanelViewModel.java b/src/main/java/org/jabref/gui/commonfxcontrols/FieldFormatterCleanupsPanelViewModel.java
index 7f77458301b..c4b964aca54 100644
--- a/src/main/java/org/jabref/gui/commonfxcontrols/FieldFormatterCleanupsPanelViewModel.java
+++ b/src/main/java/org/jabref/gui/commonfxcontrols/FieldFormatterCleanupsPanelViewModel.java
@@ -1,7 +1,6 @@
 package org.jabref.gui.commonfxcontrols;
 
 import java.util.Comparator;
-
 import javafx.beans.property.BooleanProperty;
 import javafx.beans.property.ListProperty;
 import javafx.beans.property.ObjectProperty;
@@ -11,7 +10,6 @@
 import javafx.collections.FXCollections;
 import javafx.collections.transformation.SortedList;
 import javafx.scene.control.SelectionModel;
-
 import org.jabref.gui.Globals;
 import org.jabref.gui.util.NoSelectionModel;
 import org.jabref.logic.cleanup.FieldFormatterCleanup;
@@ -23,25 +21,52 @@
 
 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 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<>();
-
-    public 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 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<>();
+
+    public FieldFormatterCleanupsPanelViewModel() {}
 
     public void resetToRecommended() {
-        Globals.stateManager.getActiveDatabase().ifPresent(databaseContext -> {
-            if (databaseContext.isBiblatexMode()) {
-                cleanupsListProperty.setAll(FieldFormatterCleanups.RECOMMEND_BIBLATEX_ACTIONS);
-            } else {
-                cleanupsListProperty.setAll(FieldFormatterCleanups.RECOMMEND_BIBTEX_ACTIONS);
-            }
-        });
+        Globals.stateManager
+            .getActiveDatabase()
+            .ifPresent(databaseContext -> {
+                if (databaseContext.isBiblatexMode()) {
+                    cleanupsListProperty.setAll(
+                        FieldFormatterCleanups.RECOMMEND_BIBLATEX_ACTIONS
+                    );
+                } else {
+                    cleanupsListProperty.setAll(
+                        FieldFormatterCleanups.RECOMMEND_BIBTEX_ACTIONS
+                    );
+                }
+            });
     }
 
     public void clearAll() {
@@ -49,15 +74,23 @@ 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());
-
-        if (cleanupsListProperty.stream().noneMatch(item -> item.equals(cleanup))) {
+            selectedFieldProperty.getValue(),
+            selectedFormatterProperty.getValue()
+        );
+
+        if (
+            cleanupsListProperty
+                .stream()
+                .noneMatch(item -> item.equals(cleanup))
+        ) {
             cleanupsListProperty.add(cleanup);
         }
     }
@@ -74,7 +107,9 @@ public ListProperty<FieldFormatterCleanup> cleanupsListProperty() {
         return cleanupsListProperty;
     }
 
-    public ObjectProperty<SelectionModel<FieldFormatterCleanup>> selectedCleanupProperty() {
+    public ObjectProperty<
+        SelectionModel<FieldFormatterCleanup>
+    > selectedCleanupProperty() {
         return selectedCleanupProperty;
     }
 
diff --git a/src/main/java/org/jabref/gui/commonfxcontrols/SaveOrderConfigPanel.java b/src/main/java/org/jabref/gui/commonfxcontrols/SaveOrderConfigPanel.java
index 0cd15d57a29..7c56e160e08 100644
--- a/src/main/java/org/jabref/gui/commonfxcontrols/SaveOrderConfigPanel.java
+++ b/src/main/java/org/jabref/gui/commonfxcontrols/SaveOrderConfigPanel.java
@@ -1,8 +1,8 @@
 package org.jabref.gui.commonfxcontrols;
 
+import com.airhacks.afterburner.views.ViewLoader;
 import java.util.List;
 import java.util.stream.Collectors;
-
 import javafx.beans.binding.Bindings;
 import javafx.beans.property.BooleanProperty;
 import javafx.beans.property.ListProperty;
@@ -17,7 +17,6 @@
 import javafx.scene.layout.GridPane;
 import javafx.scene.layout.HBox;
 import javafx.scene.layout.VBox;
-
 import org.jabref.gui.icon.IconTheme;
 import org.jabref.gui.icon.JabRefIconView;
 import org.jabref.gui.util.FieldsUtil;
@@ -25,77 +24,114 @@
 import org.jabref.logic.l10n.Localization;
 import org.jabref.model.entry.field.Field;
 
-import com.airhacks.afterburner.views.ViewLoader;
-
 public class SaveOrderConfigPanel extends VBox {
 
-    @FXML private RadioButton exportInSpecifiedOrder;
-    @FXML private RadioButton exportInTableOrder;
-    @FXML private RadioButton exportInOriginalOrder;
-    @FXML private GridPane sortCriterionList;
-    @FXML private Button addButton;
+    @FXML
+    private RadioButton exportInSpecifiedOrder;
+
+    @FXML
+    private RadioButton exportInTableOrder;
+
+    @FXML
+    private RadioButton exportInOriginalOrder;
+
+    @FXML
+    private GridPane sortCriterionList;
+
+    @FXML
+    private Button addButton;
 
     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().get(0), 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().get(0),
+                                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));
-                             }
-                         });
+    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)
+                    );
+                }
+            });
 
         Label label = new Label(String.valueOf(row + 1));
         sortCriterionList.add(label, 0, row);
 
-        ComboBox<Field> field = new ComboBox<>(viewModel.sortableFieldsProperty());
+        ComboBox<Field> field = new ComboBox<>(
+            viewModel.sortableFieldsProperty()
+        );
         field.setMaxWidth(Double.MAX_VALUE);
         new ViewModelListCellFactory<Field>()
-                .withText(FieldsUtil::getNameWithType)
-                .install(field);
+            .withText(FieldsUtil::getNameWithType)
+            .install(field);
         field.setConverter(FieldsUtil.FIELD_STRING_CONVERTER);
-        field.itemsProperty().bindBidirectional(viewModel.sortableFieldsProperty());
-        field.valueProperty().bindBidirectional(criterionViewModel.fieldProperty());
+        field
+            .itemsProperty()
+            .bindBidirectional(viewModel.sortableFieldsProperty());
+        field
+            .valueProperty()
+            .bindBidirectional(criterionViewModel.fieldProperty());
         sortCriterionList.add(field, 1, row);
         GridPane.getHgrow(field);
 
         CheckBox descending = new CheckBox(Localization.lang("Descending"));
-        descending.selectedProperty().bindBidirectional(criterionViewModel.descendingProperty());
+        descending
+            .selectedProperty()
+            .bindBidirectional(criterionViewModel.descendingProperty());
         sortCriterionList.add(descending, 2, row);
 
         HBox hBox = new HBox();
@@ -103,20 +139,31 @@ private void createCriterionRow(SortCriterionViewModel criterionViewModel, int r
         sortCriterionList.add(hBox, 3, row);
     }
 
-    private List<Node> createRowButtons(SortCriterionViewModel criterionViewModel) {
-        Button remove = new Button("", new JabRefIconView(IconTheme.JabRefIcons.REMOVE_NOBOX));
+    private List<Node> createRowButtons(
+        SortCriterionViewModel criterionViewModel
+    ) {
+        Button remove = new Button(
+            "",
+            new JabRefIconView(IconTheme.JabRefIcons.REMOVE_NOBOX)
+        );
         remove.getStyleClass().addAll("icon-button", "narrow");
         remove.setPrefHeight(20.0);
         remove.setPrefWidth(20.0);
         remove.setOnAction(event -> removeCriterion(criterionViewModel));
 
-        Button moveUp = new Button("", new JabRefIconView(IconTheme.JabRefIcons.LIST_MOVE_UP));
+        Button moveUp = new Button(
+            "",
+            new JabRefIconView(IconTheme.JabRefIcons.LIST_MOVE_UP)
+        );
         moveUp.getStyleClass().addAll("icon-button", "narrow");
         moveUp.setPrefHeight(20.0);
         moveUp.setPrefWidth(20.0);
         moveUp.setOnAction(event -> moveCriterionUp(criterionViewModel));
 
-        Button moveDown = new Button("", new JabRefIconView(IconTheme.JabRefIcons.LIST_MOVE_DOWN));
+        Button moveDown = new Button(
+            "",
+            new JabRefIconView(IconTheme.JabRefIcons.LIST_MOVE_DOWN)
+        );
         moveDown.getStyleClass().addAll("icon-button", "narrow");
         moveDown.setPrefHeight(20.0);
         moveDown.setPrefWidth(20.0);
@@ -126,28 +173,40 @@ 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));
-                             }
-                         });
+        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)
+                    );
+                }
+            });
     }
 
     public void setCriteriaLimit(int limit) {
         addButton.disableProperty().unbind();
-        addButton.disableProperty().bind(
+        addButton
+            .disableProperty()
+            .bind(
                 Bindings.createBooleanBinding(
-                        () -> viewModel.sortCriteriaProperty().size() >= limit || !exportInSpecifiedOrder.selectedProperty().get(),
-                        viewModel.sortCriteriaProperty().sizeProperty(),
-                        exportInSpecifiedOrder.selectedProperty()));
+                    () ->
+                        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 6776df54e47..407ef1d9dfe 100644
--- a/src/main/java/org/jabref/gui/commonfxcontrols/SaveOrderConfigPanelViewModel.java
+++ b/src/main/java/org/jabref/gui/commonfxcontrols/SaveOrderConfigPanelViewModel.java
@@ -1,26 +1,31 @@
 package org.jabref.gui.commonfxcontrols;
 
 import java.util.Collections;
-
 import javafx.beans.property.BooleanProperty;
 import javafx.beans.property.ListProperty;
 import javafx.beans.property.SimpleBooleanProperty;
 import javafx.beans.property.SimpleListProperty;
 import javafx.collections.FXCollections;
-
 import org.jabref.model.entry.field.Field;
 
 public class SaveOrderConfigPanelViewModel {
 
-    private final BooleanProperty saveInOriginalProperty = new SimpleBooleanProperty();
-    private final BooleanProperty saveInTableOrderProperty = new SimpleBooleanProperty();
-    private final BooleanProperty saveInSpecifiedOrderProperty = new SimpleBooleanProperty();
+    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());
@@ -32,18 +37,32 @@ public void removeCriterion(SortCriterionViewModel sortCriterionViewModel) {
 
     public void moveCriterionUp(SortCriterionViewModel sortCriterionViewModel) {
         if (selectedSortCriteriaProperty.contains(sortCriterionViewModel)) {
-            int index = selectedSortCriteriaProperty.indexOf(sortCriterionViewModel);
+            int index = selectedSortCriteriaProperty.indexOf(
+                sortCriterionViewModel
+            );
             if (index > 0) {
-                Collections.swap(selectedSortCriteriaProperty, index - 1, index);
+                Collections.swap(
+                    selectedSortCriteriaProperty,
+                    index - 1,
+                    index
+                );
             }
         }
     }
 
-    public void moveCriterionDown(SortCriterionViewModel sortCriterionViewModel) {
+    public void moveCriterionDown(
+        SortCriterionViewModel sortCriterionViewModel
+    ) {
         if (selectedSortCriteriaProperty.contains(sortCriterionViewModel)) {
-            int index = selectedSortCriteriaProperty.indexOf(sortCriterionViewModel);
+            int index = selectedSortCriteriaProperty.indexOf(
+                sortCriterionViewModel
+            );
             if (index >= 0 && index < selectedSortCriteriaProperty.size() - 1) {
-                Collections.swap(selectedSortCriteriaProperty, index + 1, index);
+                Collections.swap(
+                    selectedSortCriteriaProperty,
+                    index + 1,
+                    index
+                );
             }
         }
     }
diff --git a/src/main/java/org/jabref/gui/commonfxcontrols/SortCriterionViewModel.java b/src/main/java/org/jabref/gui/commonfxcontrols/SortCriterionViewModel.java
index 19edca1f9d9..7941f3b2987 100644
--- a/src/main/java/org/jabref/gui/commonfxcontrols/SortCriterionViewModel.java
+++ b/src/main/java/org/jabref/gui/commonfxcontrols/SortCriterionViewModel.java
@@ -4,15 +4,16 @@
 import javafx.beans.property.ObjectProperty;
 import javafx.beans.property.SimpleBooleanProperty;
 import javafx.beans.property.SimpleObjectProperty;
-
 import org.jabref.model.entry.field.Field;
 import org.jabref.model.entry.field.StandardField;
 import org.jabref.model.metadata.SaveOrder;
 
 public class SortCriterionViewModel {
 
-    private final ObjectProperty<Field> fieldProperty = new SimpleObjectProperty<>();
-    private final BooleanProperty descendingProperty = new SimpleBooleanProperty();
+    private final ObjectProperty<Field> fieldProperty =
+        new SimpleObjectProperty<>();
+    private final BooleanProperty descendingProperty =
+        new SimpleBooleanProperty();
 
     public SortCriterionViewModel(SaveOrder.SortCriterion criterion) {
         this.fieldProperty.setValue(criterion.field);
@@ -33,6 +34,9 @@ public BooleanProperty descendingProperty() {
     }
 
     public SaveOrder.SortCriterion getCriterion() {
-        return new SaveOrder.SortCriterion(fieldProperty.getValue(), descendingProperty.getValue());
+        return new SaveOrder.SortCriterion(
+            fieldProperty.getValue(),
+            descendingProperty.getValue()
+        );
     }
 }
diff --git a/src/main/java/org/jabref/gui/copyfiles/CopyFilesAction.java b/src/main/java/org/jabref/gui/copyfiles/CopyFilesAction.java
index 621a319ca75..ebc0fce7678 100644
--- a/src/main/java/org/jabref/gui/copyfiles/CopyFilesAction.java
+++ b/src/main/java/org/jabref/gui/copyfiles/CopyFilesAction.java
@@ -1,11 +1,12 @@
 package org.jabref.gui.copyfiles;
 
+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;
-
 import javafx.concurrent.Task;
-
 import org.jabref.gui.DialogService;
 import org.jabref.gui.StateManager;
 import org.jabref.gui.actions.SimpleCommand;
@@ -16,9 +17,6 @@
 import org.jabref.model.entry.BibEntry;
 import org.jabref.preferences.PreferencesService;
 
-import static org.jabref.gui.actions.ActionHelper.needsDatabase;
-import static org.jabref.gui.actions.ActionHelper.needsEntriesSelected;
-
 public class CopyFilesAction extends SimpleCommand {
 
     private final DialogService dialogService;
@@ -26,41 +24,62 @@ public class CopyFilesAction extends SimpleCommand {
     private final StateManager stateManager;
     private final TaskExecutor taskExecutor;
 
-    public CopyFilesAction(DialogService dialogService,
-                           PreferencesService preferencesService,
-                           StateManager stateManager,
-                           TaskExecutor taskExecutor) {
+    public CopyFilesAction(
+        DialogService dialogService,
+        PreferencesService preferencesService,
+        StateManager stateManager,
+        TaskExecutor taskExecutor
+    ) {
         this.dialogService = dialogService;
         this.preferencesService = preferencesService;
         this.stateManager = stateManager;
         this.taskExecutor = taskExecutor;
 
-        this.executable.bind(needsDatabase(stateManager).and(needsEntriesSelected(stateManager)));
+        this.executable.bind(
+                needsDatabase(stateManager)
+                    .and(needsEntriesSelected(stateManager))
+            );
     }
 
     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(preferencesService.getExportPreferences().getExportWorkingDirectory())
+        DirectoryDialogConfiguration dirDialogConfiguration =
+            new DirectoryDialogConfiguration.Builder()
+                .withInitialDirectory(
+                    preferencesService
+                        .getExportPreferences()
+                        .getExportWorkingDirectory()
+                )
                 .build();
-        Optional<Path> exportPath = dialogService.showDirectorySelectionDialog(dirDialogConfiguration);
+        Optional<Path> exportPath = dialogService.showDirectorySelectionDialog(
+            dirDialogConfiguration
+        );
         exportPath.ifPresent(path -> {
-            Task<List<CopyFilesResultItemViewModel>> exportTask = new CopyFilesTask(database, entries, path, preferencesService);
+            Task<List<CopyFilesResultItemViewModel>> exportTask =
+                new CopyFilesTask(database, entries, path, preferencesService);
             dialogService.showProgressDialog(
-                    Localization.lang("Copy linked files to folder..."),
-                    Localization.lang("Copy linked files to folder..."),
-                    exportTask);
+                Localization.lang("Copy linked files to folder..."),
+                Localization.lang("Copy linked files to folder..."),
+                exportTask
+            );
             taskExecutor.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 7b1bfcc2f58..fdf09038212 100644
--- a/src/main/java/org/jabref/gui/copyfiles/CopyFilesDialogView.java
+++ b/src/main/java/org/jabref/gui/copyfiles/CopyFilesDialogView.java
@@ -1,25 +1,31 @@
 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;
 import javafx.scene.control.TableView;
 import javafx.scene.paint.Color;
-
 import org.jabref.gui.icon.IconTheme;
 import org.jabref.gui.icon.JabRefIcon;
 import org.jabref.gui.util.BaseDialog;
 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;
-    @FXML private TableColumn<CopyFilesResultItemViewModel, JabRefIcon> colStatus;
-    @FXML private TableColumn<CopyFilesResultItemViewModel, String> colMessage;
-    @FXML private TableColumn<CopyFilesResultItemViewModel, String> colFile;
+    @FXML
+    private TableView<CopyFilesResultItemViewModel> tvResult;
+
+    @FXML
+    private TableColumn<CopyFilesResultItemViewModel, JabRefIcon> colStatus;
+
+    @FXML
+    private TableColumn<CopyFilesResultItemViewModel, String> colMessage;
+
+    @FXML
+    private TableColumn<CopyFilesResultItemViewModel, String> colFile;
+
     private final CopyFilesDialogViewModel viewModel;
 
     public CopyFilesDialogView(CopyFilesResultListDependency results) {
@@ -29,9 +35,7 @@ public CopyFilesDialogView(CopyFilesResultListDependency results) {
 
         viewModel = new CopyFilesDialogViewModel(results);
 
-        ViewLoader.view(this)
-                  .load()
-                  .setAsContent(this.getDialogPane());
+        ViewLoader.view(this).load().setAsContent(this.getDialogPane());
     }
 
     @FXML
@@ -41,19 +45,32 @@ private void initialize() {
 
     private void setupTable() {
         colFile.setCellValueFactory(cellData -> cellData.getValue().getFile());
-        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();
-        }));
+        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();
+                })
+        );
 
         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 e30563b4fa9..a1e444d67d1 100644
--- a/src/main/java/org/jabref/gui/copyfiles/CopyFilesDialogViewModel.java
+++ b/src/main/java/org/jabref/gui/copyfiles/CopyFilesDialogViewModel.java
@@ -2,19 +2,23 @@
 
 import javafx.beans.property.SimpleListProperty;
 import javafx.collections.FXCollections;
-
 import org.jabref.gui.AbstractViewModel;
 
 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());
     }
 
-    public SimpleListProperty<CopyFilesResultItemViewModel> copyFilesResultListProperty() {
+    public SimpleListProperty<
+        CopyFilesResultItemViewModel
+    > copyFilesResultListProperty() {
         return this.copyFilesResultItems;
     }
 }
diff --git a/src/main/java/org/jabref/gui/copyfiles/CopyFilesResultItemViewModel.java b/src/main/java/org/jabref/gui/copyfiles/CopyFilesResultItemViewModel.java
index e48f0685112..415ab990001 100644
--- a/src/main/java/org/jabref/gui/copyfiles/CopyFilesResultItemViewModel.java
+++ b/src/main/java/org/jabref/gui/copyfiles/CopyFilesResultItemViewModel.java
@@ -1,22 +1,26 @@
 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;
 import javafx.beans.property.StringProperty;
-
 import org.jabref.gui.icon.IconTheme;
 import org.jabref.gui.icon.JabRefIcon;
 
 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) {
+    public CopyFilesResultItemViewModel(
+        Path file,
+        boolean success,
+        String message
+    ) {
         this.file.setValue(file.toString());
         this.message.setValue(message);
         if (success) {
@@ -38,6 +42,12 @@ 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/CopyFilesResultListDependency.java b/src/main/java/org/jabref/gui/copyfiles/CopyFilesResultListDependency.java
index 71aef284159..e6f5de44456 100644
--- a/src/main/java/org/jabref/gui/copyfiles/CopyFilesResultListDependency.java
+++ b/src/main/java/org/jabref/gui/copyfiles/CopyFilesResultListDependency.java
@@ -14,7 +14,9 @@ public CopyFilesResultListDependency() {
         // empty, workaround for injection into FXML controller
     }
 
-    public CopyFilesResultListDependency(List<CopyFilesResultItemViewModel> results) {
+    public CopyFilesResultListDependency(
+        List<CopyFilesResultItemViewModel> results
+    ) {
         this.results = results;
     }
 
diff --git a/src/main/java/org/jabref/gui/copyfiles/CopyFilesTask.java b/src/main/java/org/jabref/gui/copyfiles/CopyFilesTask.java
index 067b7e948b2..97bdded193e 100644
--- a/src/main/java/org/jabref/gui/copyfiles/CopyFilesTask.java
+++ b/src/main/java/org/jabref/gui/copyfiles/CopyFilesTask.java
@@ -11,9 +11,7 @@
 import java.util.List;
 import java.util.Optional;
 import java.util.function.BiFunction;
-
 import javafx.concurrent.Task;
-
 import org.jabref.logic.l10n.Localization;
 import org.jabref.logic.util.OS;
 import org.jabref.logic.util.io.FileUtil;
@@ -22,47 +20,71 @@
 import org.jabref.model.entry.LinkedFile;
 import org.jabref.model.util.OptionalUtil;
 import org.jabref.preferences.PreferencesService;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 public class CopyFilesTask extends Task<List<CopyFilesResultItemViewModel>> {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(CopyFilesAction.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(
+        CopyFilesAction.class
+    );
     private static final String LOGFILE_PREFIX = "copyFileslog_";
     private static final String LOGFILE_EXT = ".log";
     private final BibDatabaseContext databaseContext;
     private final PreferencesService preferencesService;
     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 localizedSuccessMessage = Localization.lang(
+        "Copied file successfully"
+    );
+    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<>();
+    private final List<CopyFilesResultItemViewModel> results =
+        new ArrayList<>();
     private Optional<Path> newPath = Optional.empty();
     private int numberSuccessful;
     private int totalFilesCounter;
 
-    private final BiFunction<Path, Path, Path> resolvePathFilename = (path, file) -> path.resolve(file.getFileName());
-
-    public CopyFilesTask(BibDatabaseContext databaseContext, List<BibEntry> entries, Path path, PreferencesService preferencesService) {
+    private final BiFunction<Path, Path, Path> resolvePathFilename = (
+            path,
+            file
+        ) ->
+        path.resolve(file.getFileName());
+
+    public CopyFilesTask(
+        BibDatabaseContext databaseContext,
+        List<BibEntry> entries,
+        Path path,
+        PreferencesService preferencesService
+    ) {
         this.databaseContext = databaseContext;
         this.preferencesService = preferencesService;
         this.entries = entries;
         this.exportPath = path;
-        totalFilesCount = entries.stream().mapToLong(entry -> entry.getFiles().size()).sum();
+        totalFilesCount =
+            entries.stream().mapToLong(entry -> entry.getFiles().size()).sum();
     }
 
     @Override
-    protected List<CopyFilesResultItemViewModel> call() throws InterruptedException, IOException {
-
+    protected List<CopyFilesResultItemViewModel> call()
+        throws InterruptedException, IOException {
         updateMessage(Localization.lang("Copying files..."));
         updateProgress(0, totalFilesCount);
 
         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)) {
+        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
+            )
+        ) {
             for (int i = 0; i < entries.size(); i++) {
                 if (isCancelled()) {
                     break;
@@ -75,17 +97,35 @@ 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, preferencesService.getFilePreferences());
+                    Optional<Path> fileToExport = fileName.findIn(
+                        databaseContext,
+                        preferencesService.getFilePreferences()
+                    );
 
-                    newPath = OptionalUtil.combine(Optional.of(exportPath), fileToExport, resolvePathFilename);
+                    newPath =
+                        OptionalUtil.combine(
+                            Optional.of(exportPath),
+                            fileToExport,
+                            resolvePathFilename
+                        );
 
                     if (newPath.isPresent()) {
                         Path newFile = newPath.get();
-                        boolean success = FileUtil.copyFile(fileToExport.get(), newFile, false);
+                        boolean success = FileUtil.copyFile(
+                            fileToExport.get(),
+                            newFile,
+                            false
+                        );
                         updateProgress(totalFilesCounter++, totalFilesCount);
                         try {
                             Thread.sleep(300);
@@ -98,29 +138,47 @@ protected List<CopyFilesResultItemViewModel> call() throws InterruptedException,
                         if (success) {
                             updateMessage(localizedSuccessMessage);
                             numberSuccessful++;
-                            writeLogMessage(newFile, bw, localizedSuccessMessage);
-                            addResultToList(newFile, success, localizedSuccessMessage);
+                            writeLogMessage(
+                                newFile,
+                                bw,
+                                localizedSuccessMessage
+                            );
+                            addResultToList(
+                                newFile,
+                                success,
+                                localizedSuccessMessage
+                            );
                         } else {
                             updateMessage(localizedErrorMessage);
                             writeLogMessage(newFile, bw, localizedErrorMessage);
-                            addResultToList(newFile, success, localizedErrorMessage);
+                            addResultToList(
+                                newFile,
+                                success,
+                                localizedErrorMessage
+                            );
                         }
                     }
                 }
             }
             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;
         }
     }
 
-    private void writeLogMessage(Path newFile, BufferedWriter bw, String logMessage) {
+    private void writeLogMessage(
+        Path newFile,
+        BufferedWriter bw,
+        String logMessage
+    ) {
         try {
             bw.write(logMessage + ": " + newFile);
             bw.write(OS.NEWLINE);
@@ -129,8 +187,16 @@ 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);
+    private void addResultToList(
+        Path newFile,
+        boolean success,
+        String 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 29bc0716b59..6088b6ef3e5 100644
--- a/src/main/java/org/jabref/gui/copyfiles/CopySingleFileAction.java
+++ b/src/main/java/org/jabref/gui/copyfiles/CopySingleFileAction.java
@@ -3,9 +3,7 @@
 import java.nio.file.Path;
 import java.util.Optional;
 import java.util.function.BiFunction;
-
 import javafx.beans.binding.Bindings;
-
 import org.jabref.gui.DialogService;
 import org.jabref.gui.actions.SimpleCommand;
 import org.jabref.gui.util.DirectoryDialogConfiguration;
@@ -23,43 +21,96 @@ 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()
+        DirectoryDialogConfiguration dirDialogConfiguration =
+            new DirectoryDialogConfiguration.Builder()
                 .withInitialDirectory(filePreferences.getWorkingDirectory())
                 .build();
-        Optional<Path> exportPath = dialogService.showDirectorySelectionDialog(dirDialogConfiguration);
+        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> fileToExport = linkedFile.findIn(
+            databaseContext,
+            filePreferences
+        );
+        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/JabRefDesktop.java b/src/main/java/org/jabref/gui/desktop/JabRefDesktop.java
index 94b5a8c9fc0..5cea155b6fa 100644
--- a/src/main/java/org/jabref/gui/desktop/JabRefDesktop.java
+++ b/src/main/java/org/jabref/gui/desktop/JabRefDesktop.java
@@ -9,7 +9,6 @@
 import java.util.Objects;
 import java.util.Optional;
 import java.util.regex.Pattern;
-
 import org.jabref.gui.DialogService;
 import org.jabref.gui.Globals;
 import org.jabref.gui.desktop.os.NativeDesktop;
@@ -28,7 +27,6 @@
 import org.jabref.preferences.ExternalApplicationsPreferences;
 import org.jabref.preferences.FilePreferences;
 import org.jabref.preferences.PreferencesService;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -38,37 +36,45 @@
  */
 public class JabRefDesktop {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(JabRefDesktop.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(
+        JabRefDesktop.class
+    );
 
     private static final NativeDesktop NATIVE_DESKTOP = OS.getNativeDesktop();
-    private static final Pattern REMOTE_LINK_PATTERN = Pattern.compile("[a-z]+://.*");
+    private static final Pattern REMOTE_LINK_PATTERN = Pattern.compile(
+        "[a-z]+://.*"
+    );
 
-    private JabRefDesktop() {
-    }
+    private JabRefDesktop() {}
 
     /**
      * Open a http/pdf/ps viewer for the given link string.
      *
      * Opening a PDF file at the file field is done at {@link org.jabref.gui.fieldeditors.LinkedFileViewModel#open}
      */
-    public static void openExternalViewer(BibDatabaseContext databaseContext,
-                                          PreferencesService preferencesService,
-                                          String initialLink,
-                                          Field initialField,
-                                          DialogService dialogService,
-                                          BibEntry entry)
-            throws IOException {
+    public static void openExternalViewer(
+        BibDatabaseContext databaseContext,
+        PreferencesService preferencesService,
+        String initialLink,
+        Field initialField,
+        DialogService dialogService,
+        BibEntry entry
+    ) throws IOException {
         String link = initialLink;
         Field field = initialField;
         if ((StandardField.PS == field) || (StandardField.PDF == field)) {
             // Find the default directory for this field type:
-            List<Path> directories = databaseContext.getFileDirectories(preferencesService.getFilePreferences());
+            List<Path> directories = databaseContext.getFileDirectories(
+                preferencesService.getFilePreferences()
+            );
 
             Optional<Path> file = FileUtil.find(link, directories);
 
             // Check that the file exists:
             if (file.isEmpty() || !Files.exists(file.get())) {
-                throw new IOException("File not found (" + field + "): '" + link + "'.");
+                throw new IOException(
+                    "File not found (" + field + "): '" + link + "'."
+                );
             }
             link = file.get().toAbsolutePath().toString();
 
@@ -77,8 +83,11 @@ public static void openExternalViewer(BibDatabaseContext databaseContext,
             if (split.length >= 2) {
                 if ("pdf".equalsIgnoreCase(split[split.length - 1])) {
                     field = StandardField.PDF;
-                } else if ("ps".equalsIgnoreCase(split[split.length - 1])
-                        || ((split.length >= 3) && "ps".equalsIgnoreCase(split[split.length - 2]))) {
+                } else if (
+                    "ps".equalsIgnoreCase(split[split.length - 1]) ||
+                    ((split.length >= 3) &&
+                        "ps".equalsIgnoreCase(split[split.length - 2]))
+                ) {
                     field = StandardField.PS;
                 }
             }
@@ -91,18 +100,33 @@ 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);
+                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", eprintTypeOpt.get()));
+                    dialogService.showErrorDialogAndWait(
+                        Localization.lang(
+                            "Unable to open linked eprint. Please verify that the eprint field has a valid '%0' id",
+                            eprintTypeOpt.get()
+                        )
+                    );
                 }
             }
             // should be opened in browser
@@ -113,39 +137,70 @@ public static void openExternalViewer(BibDatabaseContext databaseContext,
             openBrowser(link, preferencesService.getFilePreferences());
         } else if (StandardField.PS == field) {
             try {
-                NATIVE_DESKTOP.openFile(link, StandardField.PS.getName(), preferencesService.getFilePreferences());
+                NATIVE_DESKTOP.openFile(
+                    link,
+                    StandardField.PS.getName(),
+                    preferencesService.getFilePreferences()
+                );
             } catch (IOException e) {
                 LOGGER.error("An error occurred on the command: " + link, e);
             }
         } else if (StandardField.PDF == field) {
             try {
-                NATIVE_DESKTOP.openFile(link, StandardField.PDF.getName(), preferencesService.getFilePreferences());
+                NATIVE_DESKTOP.openFile(
+                    link,
+                    StandardField.PDF.getName(),
+                    preferencesService.getFilePreferences()
+                );
             } catch (IOException e) {
                 LOGGER.error("An error occurred on the command: " + link, e);
             }
         } else {
-            LOGGER.info("Message: currently only PDF, PS and HTML files can be opened by double clicking");
+            LOGGER.info(
+                "Message: currently only PDF, PS and HTML files can be opened by double clicking"
+            );
         }
     }
 
-    private static void openDoi(String doi, PreferencesService preferencesService) throws IOException {
+    private static void openDoi(
+        String doi,
+        PreferencesService preferencesService
+    ) throws IOException {
         String link = DOI.parse(doi).map(DOI::getURIAsASCIIString).orElse(doi);
         openBrowser(link, preferencesService.getFilePreferences());
     }
 
-    public static void openCustomDoi(String link, PreferencesService preferences, DialogService dialogService) {
-        DOI.parse(link)
-           .flatMap(doi -> doi.getExternalURIWithCustomBase(preferences.getDOIPreferences().getDefaultBaseURI()))
-           .ifPresent(uri -> {
-               try {
-                   JabRefDesktop.openBrowser(uri, preferences.getFilePreferences());
-               } catch (IOException e) {
-                   dialogService.showErrorDialogAndWait(Localization.lang("Unable to open link."), e);
-               }
-           });
+    public static void openCustomDoi(
+        String link,
+        PreferencesService preferences,
+        DialogService dialogService
+    ) {
+        DOI
+            .parse(link)
+            .flatMap(doi ->
+                doi.getExternalURIWithCustomBase(
+                    preferences.getDOIPreferences().getDefaultBaseURI()
+                )
+            )
+            .ifPresent(uri -> {
+                try {
+                    JabRefDesktop.openBrowser(
+                        uri,
+                        preferences.getFilePreferences()
+                    );
+                } catch (IOException e) {
+                    dialogService.showErrorDialogAndWait(
+                        Localization.lang("Unable to open link."),
+                        e
+                    );
+                }
+            });
     }
 
-    private static void openIsbn(String isbn, PreferencesService preferencesService) throws IOException {
+    private static void openIsbn(
+        String isbn,
+        PreferencesService preferencesService
+    ) throws IOException {
         String link = "https://openlibrary.org/isbn/" + isbn;
         openBrowser(link, preferencesService.getFilePreferences());
     }
@@ -158,19 +213,31 @@ private static void openIsbn(String isbn, PreferencesService preferencesService)
      * @param link            The filename.
      * @return false if the link couldn't be resolved, true otherwise.
      */
-    public static boolean openExternalFileAnyFormat(final BibDatabaseContext databaseContext,
-                                                    FilePreferences filePreferences,
-                                                    String link,
-                                                    final Optional<ExternalFileType> type) throws IOException {
-        if (REMOTE_LINK_PATTERN.matcher(link.toLowerCase(Locale.ROOT)).matches()) {
+    public static boolean openExternalFileAnyFormat(
+        final BibDatabaseContext databaseContext,
+        FilePreferences filePreferences,
+        String link,
+        final Optional<ExternalFileType> type
+    ) throws IOException {
+        if (
+            REMOTE_LINK_PATTERN.matcher(link.toLowerCase(Locale.ROOT)).matches()
+        ) {
             openBrowser(link, filePreferences);
             return true;
         }
-        Optional<Path> file = FileUtil.find(databaseContext, link, filePreferences);
+        Optional<Path> file = FileUtil.find(
+            databaseContext,
+            link,
+            filePreferences
+        );
         if (file.isPresent() && Files.exists(file.get())) {
             // Open the file:
             String filePath = file.get().toString();
-            openExternalFilePlatformIndependent(type, filePath, filePreferences);
+            openExternalFilePlatformIndependent(
+                type,
+                filePath,
+                filePreferences
+            );
             return true;
         }
 
@@ -179,15 +246,20 @@ public static boolean openExternalFileAnyFormat(final BibDatabaseContext databas
         return true;
     }
 
-    private static void openExternalFilePlatformIndependent(Optional<ExternalFileType> fileType,
-                                                            String filePath,
-                                                            FilePreferences filePreferences)
-            throws IOException {
+    private static void openExternalFilePlatformIndependent(
+        Optional<ExternalFileType> fileType,
+        String filePath,
+        FilePreferences filePreferences
+    ) throws IOException {
         if (fileType.isPresent()) {
             String application = fileType.get().getOpenWithApplication();
 
             if (application.isEmpty()) {
-                NATIVE_DESKTOP.openFile(filePath, fileType.get().getExtension(), filePreferences);
+                NATIVE_DESKTOP.openFile(
+                    filePath,
+                    fileType.get().getExtension(),
+                    filePreferences
+                );
             } else {
                 NATIVE_DESKTOP.openFileWithApplication(filePath, application);
             }
@@ -204,20 +276,24 @@ 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;
         }
 
-        boolean useCustomFileBrowser = externalApplicationsPreferences.useCustomFileBrowser();
+        boolean useCustomFileBrowser =
+            externalApplicationsPreferences.useCustomFileBrowser();
         if (!useCustomFileBrowser) {
             NATIVE_DESKTOP.openFolderAndSelectFile(fileLink);
             return;
         }
         String absolutePath = fileLink.toAbsolutePath().getParent().toString();
-        String command = externalApplicationsPreferences.getCustomFileBrowserCommand();
+        String command =
+            externalApplicationsPreferences.getCustomFileBrowserCommand();
         if (command.isEmpty()) {
             LOGGER.info("No custom file browser command defined");
             NATIVE_DESKTOP.openFolderAndSelectFile(fileLink);
@@ -234,29 +310,43 @@ public static void openFolderAndSelectFile(Path fileLink,
      * @param file Location the console should be opened at.
      *
      */
-    public static void openConsole(Path file, PreferencesService preferencesService, DialogService dialogService) throws IOException {
+    public static void openConsole(
+        Path file,
+        PreferencesService preferencesService,
+        DialogService dialogService
+    ) throws IOException {
         if (file == null) {
             return;
         }
 
         String absolutePath = file.toAbsolutePath().getParent().toString();
 
-        boolean useCustomTerminal = preferencesService.getExternalApplicationsPreferences().useCustomTerminal();
+        boolean useCustomTerminal = preferencesService
+            .getExternalApplicationsPreferences()
+            .useCustomTerminal();
         if (!useCustomTerminal) {
             NATIVE_DESKTOP.openConsole(absolutePath, dialogService);
             return;
         }
-        String command = preferencesService.getExternalApplicationsPreferences().getCustomTerminalCommand();
+        String command = preferencesService
+            .getExternalApplicationsPreferences()
+            .getCustomTerminalCommand();
         command = command.trim();
         if (command.isEmpty()) {
             NATIVE_DESKTOP.openConsole(absolutePath, dialogService);
-            LOGGER.info("Preference for custom terminal is empty. Using default terminal.");
+            LOGGER.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+", " ");
 
@@ -264,14 +354,21 @@ private static void executeCommand(String command, String absolutePath, DialogSe
         command = command.replace("%DIR", absolutePath);
 
         LOGGER.info("Executing command \"{}\"...", command);
-        dialogService.notify(Localization.lang("Executing command \"%0\"...", command));
+        dialogService.notify(
+            Localization.lang("Executing command \"%0\"...", command)
+        );
 
         String[] subcommands = command.split(" ");
         try {
             new ProcessBuilder(subcommands).start();
         } catch (IOException exception) {
             LOGGER.error("Error during command execution", exception);
-            dialogService.notify(Localization.lang("Error occurred while executing the command \"%0\".", command));
+            dialogService.notify(
+                Localization.lang(
+                    "Error occurred while executing the command \"%0\".",
+                    command
+                )
+            );
         }
     }
 
@@ -280,12 +377,15 @@ private static void executeCommand(String command, String absolutePath, DialogSe
      *
      * @param url the URL to open
      */
-    public static void openBrowser(String url, FilePreferences filePreferences) throws IOException {
-        Optional<ExternalFileType> fileType = ExternalFileTypes.getExternalFileTypeByExt("html", filePreferences);
+    public static void openBrowser(String url, FilePreferences filePreferences)
+        throws IOException {
+        Optional<ExternalFileType> fileType =
+            ExternalFileTypes.getExternalFileTypeByExt("html", filePreferences);
         openExternalFilePlatformIndependent(fileType, url, filePreferences);
     }
 
-    public static void openBrowser(URI url, FilePreferences filePreferences) throws IOException {
+    public static void openBrowser(URI url, FilePreferences filePreferences)
+        throws IOException {
         openBrowser(url.toASCIIString(), filePreferences);
     }
 
@@ -294,17 +394,35 @@ public static void openBrowser(URI url, FilePreferences filePreferences) throws
      *
      * @param url the URL to open
      */
-    public static void openBrowserShowPopup(String url, DialogService dialogService, FilePreferences filePreferences) {
+    public static void openBrowserShowPopup(
+        String url,
+        DialogService dialogService,
+        FilePreferences filePreferences
+    ) {
         try {
             openBrowser(url, filePreferences);
         } catch (IOException exception) {
             Globals.getClipboardManager().setContent(url);
             LOGGER.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 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."
+            );
             dialogService.notify(couldNotOpenBrowser);
-            dialogService.showErrorDialogAndWait(couldNotOpenBrowser, couldNotOpenBrowser + "\n" + openManually + "\n" + copiedToClipboard);
+            dialogService.showErrorDialogAndWait(
+                couldNotOpenBrowser,
+                couldNotOpenBrowser +
+                "\n" +
+                openManually +
+                "\n" +
+                copiedToClipboard
+            );
         }
     }
 }
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 7ab380efcb7..43d76b3839c 100644
--- a/src/main/java/org/jabref/gui/desktop/os/DefaultDesktop.java
+++ b/src/main/java/org/jabref/gui/desktop/os/DefaultDesktop.java
@@ -4,12 +4,10 @@
 import java.io.File;
 import java.io.IOException;
 import java.nio.file.Path;
-
 import org.jabref.architecture.AllowedToUseAwt;
 import org.jabref.cli.Launcher;
 import org.jabref.gui.DialogService;
 import org.jabref.preferences.FilePreferences;
-
 import org.slf4j.LoggerFactory;
 
 /**
@@ -22,12 +20,17 @@
 public class DefaultDesktop extends NativeDesktop {
 
     @Override
-    public void openFile(String filePath, String fileType, FilePreferences filePreferences) throws IOException {
+    public void openFile(
+        String filePath,
+        String fileType,
+        FilePreferences filePreferences
+    ) throws IOException {
         Desktop.getDesktop().open(new File(filePath));
     }
 
     @Override
-    public void openFileWithApplication(String filePath, String application) throws IOException {
+    public void openFileWithApplication(String filePath, String application)
+        throws IOException {
         Desktop.getDesktop().open(new File(filePath));
     }
 
@@ -38,8 +41,11 @@ 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.");
+    public void openConsole(String absolutePath, DialogService dialogService)
+        throws IOException {
+        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 eba3745c0e9..e1f3b80b186 100644
--- a/src/main/java/org/jabref/gui/desktop/os/Linux.java
+++ b/src/main/java/org/jabref/gui/desktop/os/Linux.java
@@ -11,7 +11,6 @@
 import java.util.List;
 import java.util.Locale;
 import java.util.Optional;
-
 import org.jabref.architecture.AllowedToUseAwt;
 import org.jabref.cli.Launcher;
 import org.jabref.gui.DialogService;
@@ -21,7 +20,6 @@
 import org.jabref.gui.util.StreamGobbler;
 import org.jabref.logic.l10n.Localization;
 import org.jabref.preferences.FilePreferences;
-
 import org.slf4j.LoggerFactory;
 
 /**
@@ -33,39 +31,69 @@
 @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) {
         JabRefExecutorService.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");
+                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");
+                LoggerFactory
+                    .getLogger(Linux.class)
+                    .debug("Fail back to xdg-open");
                 try {
-                    String[] cmd = {"xdg-open", filePath};
+                    String[] cmd = { "xdg-open", filePath };
                     Runtime.getRuntime().exec(cmd);
                 } catch (Exception e2) {
-                    LoggerFactory.getLogger(Linux.class).warn("Open operation not successful: ", 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);
+                LoggerFactory
+                    .getLogger(Linux.class)
+                    .warn("Native open operation not successful: ", e);
             }
         });
     }
 
     @Override
-    public void openFile(String filePath, String fileType, FilePreferences filePreferences) throws IOException {
-        Optional<ExternalFileType> type = ExternalFileTypes.getExternalFileTypeByExt(fileType, filePreferences);
+    public void openFile(
+        String filePath,
+        String fileType,
+        FilePreferences filePreferences
+    ) throws IOException {
+        Optional<ExternalFileType> type =
+            ExternalFileTypes.getExternalFileTypeByExt(
+                fileType,
+                filePreferences
+            );
         String viewer;
 
-        if (type.isPresent() && !type.get().getOpenWithApplication().isEmpty()) {
+        if (
+            type.isPresent() && !type.get().getOpenWithApplication().isEmpty()
+        ) {
             viewer = type.get().getOpenWithApplication();
-            ProcessBuilder processBuilder = new ProcessBuilder(viewer, filePath);
+            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
+            );
 
             JabRefExecutorService.INSTANCE.execute(streamGobblerInput);
             JabRefExecutorService.INSTANCE.execute(streamGobblerError);
@@ -75,7 +103,8 @@ public void openFile(String filePath, String fileType, FilePreferences filePrefe
     }
 
     @Override
-    public void openFileWithApplication(String filePath, String application) throws IOException {
+    public void openFileWithApplication(String filePath, String application)
+        throws IOException {
         // Use the given app if specified, and the universal "xdg-open" otherwise:
         String[] openWith;
         if ((application != null) && !application.isEmpty()) {
@@ -87,8 +116,14 @@ 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
+            );
 
             JabRefExecutorService.INSTANCE.execute(streamGobblerInput);
             JabRefExecutorService.INSTANCE.execute(streamGobblerError);
@@ -102,69 +137,115 @@ 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);
             if (desktopSession.contains("gnome")) {
-                cmd = new String[] {"nautilus", "--select", absoluteFilePath};
-            } else if (desktopSession.contains("kde") || desktopSession.contains("plasma")) {
-                cmd = new String[] {"dolphin", "--select", absoluteFilePath};
+                cmd = new String[] { "nautilus", "--select", absoluteFilePath };
+            } else if (
+                desktopSession.contains("kde") ||
+                desktopSession.contains("plasma")
+            ) {
+                cmd = new String[] { "dolphin", "--select", absoluteFilePath };
             } else if (desktopSession.contains("mate")) {
-                cmd = new String[] {"caja", "--select", absoluteFilePath};
+                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};
+                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
+        );
 
         JabRefExecutorService.INSTANCE.execute(streamGobblerInput);
         JabRefExecutorService.INSTANCE.execute(streamGobblerError);
     }
 
     @Override
-    public void openConsole(String absolutePath, DialogService dialogService) 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);
+                emulatorName =
+                    emulatorName.substring(
+                        emulatorName.lastIndexOf(File.separator) + 1
+                    );
 
                 String[] cmd;
                 if (emulatorName.contains("gnome")) {
-                    cmd = new String[] {"gnome-terminal", "--working-directory", absolutePath};
+                    cmd =
+                        new String[] {
+                            "gnome-terminal",
+                            "--working-directory",
+                            absolutePath,
+                        };
                 } else if (emulatorName.contains("xfce4")) {
                     // xfce4-terminal requires "--working-directory=<directory>" format (one arg)
-                    cmd = new String[] {"xfce4-terminal", "--working-directory=" + absolutePath};
+                    cmd =
+                        new String[] {
+                            "xfce4-terminal",
+                            "--working-directory=" + absolutePath,
+                        };
                 } else if (emulatorName.contains("konsole")) {
-                    cmd = new String[] {"konsole", "--workdir", absolutePath};
+                    cmd = new String[] { "konsole", "--workdir", absolutePath };
                 } else {
-                    cmd = new String[] {emulatorName, absolutePath};
+                    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
+                );
 
                 JabRefExecutorService.INSTANCE.execute(streamGobblerInput);
                 JabRefExecutorService.INSTANCE.execute(streamGobblerError);
@@ -192,23 +273,41 @@ 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");
+                LoggerFactory
+                    .getLogger(Linux.class)
+                    .error("xdg-user-dir returned nothing");
                 return getUserDirectory();
             }
             String documentsDirectory = strings.get(0);
             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 getUserDirectory();
             }
-            LoggerFactory.getLogger(Linux.class).debug("Got documents path {}", documentsPath);
+            LoggerFactory
+                .getLogger(Linux.class)
+                .debug("Got documents path {}", documentsPath);
             return documentsPath;
         } catch (IOException e) {
-            LoggerFactory.getLogger(Linux.class).error("Error while executing xdg-user-dir", e);
+            LoggerFactory
+                .getLogger(Linux.class)
+                .error("Error while executing xdg-user-dir", e);
         }
 
         // Fallback
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 7e6c4c8fae4..51940de3d35 100644
--- a/src/main/java/org/jabref/gui/desktop/os/NativeDesktop.java
+++ b/src/main/java/org/jabref/gui/desktop/os/NativeDesktop.java
@@ -6,7 +6,7 @@
 import java.net.UnknownHostException;
 import java.nio.file.Files;
 import java.nio.file.Path;
-
+import net.harawata.appdirs.AppDirsFactory;
 import org.jabref.cli.Launcher;
 import org.jabref.gui.DialogService;
 import org.jabref.logic.util.BuildInfo;
@@ -14,8 +14,6 @@
 import org.jabref.model.pdf.search.SearchFieldConstants;
 import org.jabref.model.strings.StringUtil;
 import org.jabref.preferences.FilePreferences;
-
-import net.harawata.appdirs.AppDirsFactory;
 import org.slf4j.LoggerFactory;
 
 /**
@@ -30,7 +28,11 @@
  */
 public abstract class NativeDesktop {
 
-    public abstract void openFile(String filePath, String fileType, FilePreferences filePreferences) throws IOException;
+    public abstract void openFile(
+        String filePath,
+        String fileType,
+        FilePreferences filePreferences
+    ) throws IOException;
 
     /**
      * Opens a file on an Operating System, using the given application.
@@ -38,13 +40,22 @@ public abstract class NativeDesktop {
      * @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;
 
-    public abstract String detectProgramPath(String programName, String directoryName);
+    public abstract String detectProgramPath(
+        String programName,
+        String directoryName
+    );
 
     /**
      * Returns the path to the system's applications folder.
@@ -59,13 +70,13 @@ public abstract class NativeDesktop {
      * @return The path to the directory
      */
     public Path getDefaultFileChooserDirectory() {
-         Path userDirectory = getUserDirectory();
-         Path documents = userDirectory.resolve("Documents");
-         if (!Files.exists(documents)) {
-             return userDirectory;
-         }
-         return documents;
-     }
+        Path userDirectory = getUserDirectory();
+        Path documents = userDirectory.resolve("Documents");
+        if (!Files.exists(documents)) {
+            return userDirectory;
+        }
+        return documents;
+    }
 
     /**
      * Returns the path to the system's user directory.
@@ -77,34 +88,53 @@ public Path getUserDirectory() {
     }
 
     public 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 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 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 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
+                )
+        );
     }
 
     public String getHostName() {
@@ -119,7 +149,12 @@ public String getHostName() {
             try {
                 hostName = InetAddress.getLocalHost().getHostName();
             } catch (UnknownHostException e) {
-                LoggerFactory.getLogger(OS.class).info("Hostname not found. Using \"localhost\" as fallback.", e);
+                LoggerFactory
+                    .getLogger(OS.class)
+                    .info(
+                        "Hostname not found. Using \"localhost\" as fallback.",
+                        e
+                    );
                 hostName = "localhost";
             }
         }
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 7adbd087927..c128851f3f4 100644
--- a/src/main/java/org/jabref/gui/desktop/os/OSX.java
+++ b/src/main/java/org/jabref/gui/desktop/os/OSX.java
@@ -3,7 +3,6 @@
 import java.io.IOException;
 import java.nio.file.Path;
 import java.util.Optional;
-
 import org.jabref.architecture.AllowedToUseAwt;
 import org.jabref.cli.Launcher;
 import org.jabref.gui.DialogService;
@@ -21,33 +20,49 @@
 public class OSX extends NativeDesktop {
 
     @Override
-    public void openFile(String filePath, String fileType, FilePreferences filePreferences) throws IOException {
-        Optional<ExternalFileType> type = ExternalFileTypes.getExternalFileTypeByExt(fileType, filePreferences);
-        if (type.isPresent() && !type.get().getOpenWithApplication().isEmpty()) {
-            openFileWithApplication(filePath, type.get().getOpenWithApplication());
+    public void openFile(
+        String filePath,
+        String fileType,
+        FilePreferences filePreferences
+    ) throws IOException {
+        Optional<ExternalFileType> type =
+            ExternalFileTypes.getExternalFileTypeByExt(
+                fileType,
+                filePreferences
+            );
+        if (
+            type.isPresent() && !type.get().getOpenWithApplication().isEmpty()
+        ) {
+            openFileWithApplication(
+                filePath,
+                type.get().getOpenWithApplication()
+            );
         } else {
-            String[] cmd = {"/usr/bin/open", filePath};
+            String[] cmd = { "/usr/bin/open", filePath };
             Runtime.getRuntime().exec(cmd);
         }
     }
 
     @Override
-    public void openFileWithApplication(String filePath, String application) throws IOException {
+    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();
     }
 
     @Override
     public void openFolderAndSelectFile(Path file) throws IOException {
-        String[] cmd = {"/usr/bin/open", "-R", file.toString()};
+        String[] cmd = { "/usr/bin/open", "-R", file.toString() };
         Runtime.getRuntime().exec(cmd);
     }
 
     @Override
-    public void openConsole(String absolutePath, DialogService dialogService) throws IOException {
-         new ProcessBuilder("open", "-a", "Terminal", absolutePath).start();
+    public void openConsole(String absolutePath, DialogService dialogService)
+        throws IOException {
+        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 bacf32f6406..d6526e40187 100644
--- a/src/main/java/org/jabref/gui/desktop/os/Windows.java
+++ b/src/main/java/org/jabref/gui/desktop/os/Windows.java
@@ -1,21 +1,19 @@
 package org.jabref.gui.desktop.os;
 
+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 java.io.File;
 import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.Optional;
-
 import org.jabref.cli.Launcher;
 import org.jabref.gui.DialogService;
 import org.jabref.gui.externalfiletype.ExternalFileType;
 import org.jabref.gui.externalfiletype.ExternalFileTypes;
 import org.jabref.preferences.FilePreferences;
-
-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;
 
 /**
@@ -29,11 +27,24 @@ public class Windows extends NativeDesktop {
     private static final String DEFAULT_EXECUTABLE_EXTENSION = ".exe";
 
     @Override
-    public void openFile(String filePath, String fileType, FilePreferences filePreferences) throws IOException {
-        Optional<ExternalFileType> type = ExternalFileTypes.getExternalFileTypeByExt(fileType, filePreferences);
-
-        if (type.isPresent() && !type.get().getOpenWithApplication().isEmpty()) {
-            openFileWithApplication(filePath, type.get().getOpenWithApplication());
+    public void openFile(
+        String filePath,
+        String fileType,
+        FilePreferences filePreferences
+    ) throws IOException {
+        Optional<ExternalFileType> type =
+            ExternalFileTypes.getExternalFileTypeByExt(
+                fileType,
+                filePreferences
+            );
+
+        if (
+            type.isPresent() && !type.get().getOpenWithApplication().isEmpty()
+        ) {
+            openFileWithApplication(
+                filePath,
+                type.get().getOpenWithApplication()
+            );
         } else {
             // quote String so explorer handles URL query strings correctly
             String quotePath = "\"" + filePath + "\"";
@@ -61,12 +72,22 @@ public String detectProgramPath(String programName, String directoryName) {
         return "";
     }
 
-    private String getProgramPath(String programName, String directoryName, String progFiles) {
+    private 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);
+            programPath =
+                Path.of(progFiles, programName + DEFAULT_EXECUTABLE_EXTENSION);
         }
         if (Files.exists(programPath)) {
             return programPath.toString();
@@ -88,30 +109,45 @@ public Path getApplicationDirectory() {
     public Path getDefaultFileChooserDirectory() {
         try {
             try {
-                return Path.of(Shell32Util.getKnownFolderPath(KnownFolders.FOLDERID_Documents));
+                return Path.of(
+                    Shell32Util.getKnownFolderPath(
+                        KnownFolders.FOLDERID_Documents
+                    )
+                );
             } catch (UnsatisfiedLinkError e) {
                 // Windows Vista or earlier
-                return Path.of(Shell32Util.getFolderPath(ShlObj.CSIDL_MYDOCUMENTS));
+                return Path.of(
+                    Shell32Util.getFolderPath(ShlObj.CSIDL_MYDOCUMENTS)
+                );
             }
         } catch (Win32Exception e) {
             // needs to be non-static because of org.jabref.cli.Launcher.addLogToDisk
-            LoggerFactory.getLogger(Windows.class).error("Error accessing folder", e);
+            LoggerFactory
+                .getLogger(Windows.class)
+                .error("Error accessing folder", e);
             return Path.of(System.getProperty("user.home"));
         }
     }
 
     @Override
-    public void openFileWithApplication(String filePath, String application) throws IOException {
-        new ProcessBuilder(Path.of(application).toString(), Path.of(filePath).toString()).start();
+    public void openFileWithApplication(String filePath, String application)
+        throws IOException {
+        new ProcessBuilder(
+            Path.of(application).toString(),
+            Path.of(filePath).toString()
+        )
+            .start();
     }
 
     @Override
     public void openFolderAndSelectFile(Path filePath) throws IOException {
-        new ProcessBuilder("explorer.exe", "/select,", filePath.toString()).start();
+        new ProcessBuilder("explorer.exe", "/select,", filePath.toString())
+            .start();
     }
 
     @Override
-    public void openConsole(String absolutePath, DialogService dialogService) throws IOException {
+    public void openConsole(String absolutePath, DialogService dialogService)
+        throws IOException {
         ProcessBuilder process = new ProcessBuilder("cmd.exe", "/c", "start");
         process.directory(new File(absolutePath));
         process.start();
diff --git a/src/main/java/org/jabref/gui/dialogs/AutosaveUiManager.java b/src/main/java/org/jabref/gui/dialogs/AutosaveUiManager.java
index ace8e2a18ad..8f9e2d0f8fe 100644
--- a/src/main/java/org/jabref/gui/dialogs/AutosaveUiManager.java
+++ b/src/main/java/org/jabref/gui/dialogs/AutosaveUiManager.java
@@ -1,13 +1,12 @@
 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.model.database.event.AutosaveEvent;
 import org.jabref.model.entry.BibEntryTypesManager;
 import org.jabref.preferences.PreferencesService;
-
-import com.google.common.eventbus.Subscribe;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -16,18 +15,34 @@
  * the given {@link LibraryTab}.
  */
 public class AutosaveUiManager {
-    private static final Logger LOGGER = LoggerFactory.getLogger(AutosaveUiManager.class);
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(
+        AutosaveUiManager.class
+    );
 
     private final SaveDatabaseAction saveDatabaseAction;
 
-    public AutosaveUiManager(LibraryTab libraryTab, DialogService dialogService, PreferencesService preferencesService, BibEntryTypesManager entryTypesManager) {
-        this.saveDatabaseAction = new SaveDatabaseAction(libraryTab, dialogService, preferencesService, entryTypesManager);
+    public AutosaveUiManager(
+        LibraryTab libraryTab,
+        DialogService dialogService,
+        PreferencesService preferencesService,
+        BibEntryTypesManager entryTypesManager
+    ) {
+        this.saveDatabaseAction =
+            new SaveDatabaseAction(
+                libraryTab,
+                dialogService,
+                preferencesService,
+                entryTypesManager
+            );
     }
 
     @Subscribe
     public void listen(AutosaveEvent event) {
         try {
-            this.saveDatabaseAction.save(SaveDatabaseAction.SaveDatabaseMode.SILENT);
+            this.saveDatabaseAction.save(
+                    SaveDatabaseAction.SaveDatabaseMode.SILENT
+                );
         } catch (Throwable e) {
             LOGGER.error("Problem occurred while saving.", e);
         }
diff --git a/src/main/java/org/jabref/gui/dialogs/BackupUIManager.java b/src/main/java/org/jabref/gui/dialogs/BackupUIManager.java
index 05ba9755db4..b88327280e6 100644
--- a/src/main/java/org/jabref/gui/dialogs/BackupUIManager.java
+++ b/src/main/java/org/jabref/gui/dialogs/BackupUIManager.java
@@ -4,9 +4,7 @@
 import java.nio.file.Path;
 import java.util.List;
 import java.util.Optional;
-
 import javafx.scene.control.ButtonType;
-
 import org.jabref.gui.DialogService;
 import org.jabref.gui.autosaveandbackup.BackupManager;
 import org.jabref.gui.backup.BackupResolverDialog;
@@ -25,7 +23,6 @@
 import org.jabref.model.util.FileUpdateMonitor;
 import org.jabref.preferences.ExternalApplicationsPreferences;
 import org.jabref.preferences.PreferencesService;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -33,67 +30,127 @@
  * Stores all user dialogs related to {@link BackupManager}.
  */
 public class BackupUIManager {
-    private static final Logger LOGGER = LoggerFactory.getLogger(BackupUIManager.class);
 
-    private BackupUIManager() {
-    }
+    private static final Logger LOGGER = LoggerFactory.getLogger(
+        BackupUIManager.class
+    );
+
+    private BackupUIManager() {}
 
-    public static Optional<ParserResult> showRestoreBackupDialog(DialogService dialogService,
-                                                                 Path originalPath,
-                                                                 PreferencesService preferencesService,
-                                                                 FileUpdateMonitor fileUpdateMonitor) {
+    public static Optional<ParserResult> showRestoreBackupDialog(
+        DialogService dialogService,
+        Path originalPath,
+        PreferencesService preferencesService,
+        FileUpdateMonitor fileUpdateMonitor
+    ) {
         var actionOpt = showBackupResolverDialog(
-                dialogService,
-                preferencesService.getExternalApplicationsPreferences(),
-                originalPath,
-                preferencesService.getFilePreferences().getBackupDirectory());
+            dialogService,
+            preferencesService.getExternalApplicationsPreferences(),
+            originalPath,
+            preferencesService.getFilePreferences().getBackupDirectory()
+        );
         return actionOpt.flatMap(action -> {
             if (action == BackupResolverDialog.RESTORE_FROM_BACKUP) {
-                BackupManager.restoreBackup(originalPath, preferencesService.getFilePreferences().getBackupDirectory());
+                BackupManager.restoreBackup(
+                    originalPath,
+                    preferencesService.getFilePreferences().getBackupDirectory()
+                );
                 return Optional.empty();
             } else if (action == BackupResolverDialog.REVIEW_BACKUP) {
-                return showReviewBackupDialog(dialogService, originalPath, preferencesService, fileUpdateMonitor);
+                return showReviewBackupDialog(
+                    dialogService,
+                    originalPath,
+                    preferencesService,
+                    fileUpdateMonitor
+                );
             }
             return Optional.empty();
         });
     }
 
-    private static Optional<ButtonType> showBackupResolverDialog(DialogService dialogService,
-                                                                 ExternalApplicationsPreferences externalApplicationsPreferences,
-                                                                 Path originalPath,
-                                                                 Path backupDir) {
-        return DefaultTaskExecutor.runInJavaFXThread(
-                () -> dialogService.showCustomDialogAndWait(new BackupResolverDialog(originalPath, backupDir, externalApplicationsPreferences)));
+    private static Optional<ButtonType> showBackupResolverDialog(
+        DialogService dialogService,
+        ExternalApplicationsPreferences externalApplicationsPreferences,
+        Path originalPath,
+        Path backupDir
+    ) {
+        return DefaultTaskExecutor.runInJavaFXThread(() ->
+            dialogService.showCustomDialogAndWait(
+                new BackupResolverDialog(
+                    originalPath,
+                    backupDir,
+                    externalApplicationsPreferences
+                )
+            )
+        );
     }
 
     private static Optional<ParserResult> showReviewBackupDialog(
-            DialogService dialogService,
-            Path originalPath,
-            PreferencesService preferencesService,
-            FileUpdateMonitor fileUpdateMonitor) {
+        DialogService dialogService,
+        Path originalPath,
+        PreferencesService preferencesService,
+        FileUpdateMonitor fileUpdateMonitor
+    ) {
         try {
-            ImportFormatPreferences importFormatPreferences = preferencesService.getImportFormatPreferences();
+            ImportFormatPreferences importFormatPreferences =
+                preferencesService.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();
+            BibDatabaseContext originalDatabase =
+                originalParserResult.getDatabaseContext();
 
-            Path backupPath = BackupFileUtil.getPathOfLatestExistingBackupFile(originalPath, BackupFileType.BACKUP, preferencesService.getFilePreferences().getBackupDirectory()).orElseThrow();
-            BibDatabaseContext backupDatabase = OpenDatabase.loadDatabase(backupPath, importFormatPreferences, new DummyFileUpdateMonitor()).getDatabaseContext();
+            Path backupPath = BackupFileUtil
+                .getPathOfLatestExistingBackupFile(
+                    originalPath,
+                    BackupFileType.BACKUP,
+                    preferencesService.getFilePreferences().getBackupDirectory()
+                )
+                .orElseThrow();
+            BibDatabaseContext backupDatabase = OpenDatabase
+                .loadDatabase(
+                    backupPath,
+                    importFormatPreferences,
+                    new DummyFileUpdateMonitor()
+                )
+                .getDatabaseContext();
 
-            DatabaseChangeResolverFactory changeResolverFactory = new DatabaseChangeResolverFactory(dialogService, originalDatabase, preferencesService);
+            DatabaseChangeResolverFactory changeResolverFactory =
+                new DatabaseChangeResolverFactory(
+                    dialogService,
+                    originalDatabase,
+                    preferencesService
+                );
 
             return DefaultTaskExecutor.runInJavaFXThread(() -> {
-                List<DatabaseChange> changes = DatabaseChangeList.compareAndGetChanges(originalDatabase, backupDatabase, changeResolverFactory);
-                DatabaseChangesResolverDialog reviewBackupDialog = new DatabaseChangesResolverDialog(
+                List<DatabaseChange> changes =
+                    DatabaseChangeList.compareAndGetChanges(
+                        originalDatabase,
+                        backupDatabase,
+                        changeResolverFactory
+                    );
+                DatabaseChangesResolverDialog reviewBackupDialog =
+                    new DatabaseChangesResolverDialog(
                         changes,
-                        originalDatabase, "Review Backup"
+                        originalDatabase,
+                        "Review Backup"
+                    );
+                var allChangesResolved = dialogService.showCustomDialogAndWait(
+                    reviewBackupDialog
                 );
-                var allChangesResolved = dialogService.showCustomDialogAndWait(reviewBackupDialog);
                 if (allChangesResolved.isEmpty() || !allChangesResolved.get()) {
                     // In case not all changes are resolved, start from scratch
-                    return showRestoreBackupDialog(dialogService, originalPath, preferencesService, fileUpdateMonitor);
+                    return showRestoreBackupDialog(
+                        dialogService,
+                        originalPath,
+                        preferencesService,
+                        fileUpdateMonitor
+                    );
                 }
 
                 // This does NOT return the original ParserResult, but a modified version with all changes accepted or rejected
diff --git a/src/main/java/org/jabref/gui/documentviewer/DocumentViewModel.java b/src/main/java/org/jabref/gui/documentviewer/DocumentViewModel.java
index 48bf3157521..9e3de6c3b52 100644
--- a/src/main/java/org/jabref/gui/documentviewer/DocumentViewModel.java
+++ b/src/main/java/org/jabref/gui/documentviewer/DocumentViewModel.java
@@ -5,6 +5,7 @@
 import javafx.collections.ObservableList;
 
 public abstract class DocumentViewModel {
+
     private IntegerProperty maxPages = new SimpleIntegerProperty();
 
     public abstract ObservableList<DocumentPageViewModel> getPages();
diff --git a/src/main/java/org/jabref/gui/documentviewer/DocumentViewerControl.java b/src/main/java/org/jabref/gui/documentviewer/DocumentViewerControl.java
index 75709e4f28b..2762de6c21f 100644
--- a/src/main/java/org/jabref/gui/documentviewer/DocumentViewerControl.java
+++ b/src/main/java/org/jabref/gui/documentviewer/DocumentViewerControl.java
@@ -1,9 +1,9 @@
 package org.jabref.gui.documentviewer;
 
+import com.tobiasdiez.easybind.EasyBind;
 import java.util.NoSuchElementException;
 import java.util.Objects;
 import java.util.Optional;
-
 import javafx.animation.FadeTransition;
 import javafx.beans.property.DoubleProperty;
 import javafx.beans.property.ObjectProperty;
@@ -17,24 +17,24 @@
 import javafx.scene.layout.StackPane;
 import javafx.scene.shape.Rectangle;
 import javafx.util.Duration;
-
-import org.jabref.gui.util.BackgroundTask;
-import org.jabref.gui.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.gui.util.BackgroundTask;
+import org.jabref.gui.util.TaskExecutor;
 
 public class DocumentViewerControl extends StackPane {
 
     private final TaskExecutor taskExecutor;
 
-    private final ObjectProperty<Integer> currentPage = new SimpleObjectProperty<>(1);
+    private final ObjectProperty<Integer> currentPage =
+        new SimpleObjectProperty<>(1);
     private final DoubleProperty scrollY = new SimpleDoubleProperty();
     private final DoubleProperty scrollYMax = new SimpleDoubleProperty();
     private VirtualFlow<DocumentPageViewModel, DocumentViewerPage> flow;
-    private PageDimension desiredPageDimension = PageDimension.ofFixedWidth(600);
+    private PageDimension desiredPageDimension = PageDimension.ofFixedWidth(
+        600
+    );
 
     public DocumentViewerControl(TaskExecutor taskExecutor) {
         this.taskExecutor = Objects.requireNonNull(taskExecutor);
@@ -68,17 +68,38 @@ private void showPage(int pageNumber) {
     }
 
     public void show(DocumentViewModel document) {
-        flow = VirtualFlow.createVertical(document.getPages(), DocumentViewerPage::new);
+        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
+            .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)
+            );
     }
 
-    private void updateCurrentPage(ObservableList<DocumentViewerPage> visiblePages) {
+    private void updateCurrentPage(
+        ObservableList<DocumentViewerPage> visiblePages
+    ) {
         if (flow == null) {
             return;
         }
@@ -86,7 +107,10 @@ private void updateCurrentPage(ObservableList<DocumentViewerPage> visiblePages)
         // We try to find the page that is displayed in the center of the viewport
         Optional<DocumentViewerPage> inMiddleOfViewport = Optional.empty();
         try {
-            VirtualFlowHit<DocumentViewerPage> hit = flow.hit(0, flow.getHeight() / 2);
+            VirtualFlowHit<DocumentViewerPage> hit = flow.hit(
+                0,
+                flow.getHeight() / 2
+            );
             if (hit.isCellHit()) {
                 // Successful hit
                 inMiddleOfViewport = Optional.of(hit.getCell());
@@ -101,7 +125,12 @@ 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)
+            );
         }
     }
 
@@ -135,7 +164,9 @@ public void changePageWidth(int delta) {
      * Represents the viewport for a page. Note: the instances of {@link DocumentViewerPage} are reused, i.e., not every
      * page is rendered in a new instance but instead {@link DocumentViewerPage#updateItem(Object)} is called.
      */
-    private class DocumentViewerPage implements Cell<DocumentPageViewModel, StackPane> {
+    private class DocumentViewerPage
+        implements Cell<DocumentPageViewModel, StackPane> {
+
         private final ImageView imageView;
         private final StackPane imageHolder;
         private final Rectangle background;
@@ -157,12 +188,12 @@ public DocumentViewerPage(DocumentPageViewModel initialPage) {
             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);
-                    });
+                .wrap(() -> renderPage(initialPage))
+                .onSuccess(image -> {
+                    imageView.setImage(image);
+                    progress.setVisible(false);
+                    background.setVisible(false);
+                });
             taskExecutor.execute(generateImage);
 
             imageHolder.getChildren().setAll(background, progress, imageView);
@@ -197,16 +228,19 @@ public void updateItem(DocumentPageViewModel page) {
             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();
-                    });
+                .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 17a428b0c95..0caae54d394 100644
--- a/src/main/java/org/jabref/gui/documentviewer/DocumentViewerView.java
+++ b/src/main/java/org/jabref/gui/documentviewer/DocumentViewerView.java
@@ -1,5 +1,7 @@
 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.ButtonBar;
@@ -11,7 +13,6 @@
 import javafx.scene.control.ToggleButton;
 import javafx.scene.layout.BorderPane;
 import javafx.stage.Modality;
-
 import org.jabref.gui.StateManager;
 import org.jabref.gui.util.BaseDialog;
 import org.jabref.gui.util.OnlyIntegerFormatter;
@@ -21,22 +22,37 @@
 import org.jabref.model.entry.LinkedFile;
 import org.jabref.preferences.PreferencesService;
 
-import com.airhacks.afterburner.views.ViewLoader;
-import jakarta.inject.Inject;
-
 public class DocumentViewerView extends BaseDialog<Void> {
 
-    @FXML private ScrollBar scrollBar;
-    @FXML private ComboBox<LinkedFile> fileChoice;
-    @FXML private BorderPane mainPane;
-    @FXML private ToggleButton modeLive;
-    @FXML private ToggleButton modeLock;
-    @FXML private TextField currentPage;
-    @FXML private Label maxPages;
+    @FXML
+    private ScrollBar scrollBar;
+
+    @FXML
+    private ComboBox<LinkedFile> fileChoice;
+
+    @FXML
+    private BorderPane mainPane;
+
+    @FXML
+    private ToggleButton modeLive;
+
+    @FXML
+    private ToggleButton modeLock;
+
+    @FXML
+    private TextField currentPage;
+
+    @FXML
+    private Label maxPages;
+
+    @Inject
+    private StateManager stateManager;
+
+    @Inject
+    private TaskExecutor taskExecutor;
 
-    @Inject private StateManager stateManager;
-    @Inject private TaskExecutor taskExecutor;
-    @Inject private PreferencesService preferencesService;
+    @Inject
+    private PreferencesService preferencesService;
 
     private DocumentViewerControl viewer;
     private DocumentViewerViewModel viewModel;
@@ -45,9 +61,7 @@ public DocumentViewerView() {
         this.setTitle(Localization.lang("Document viewer"));
         this.initModality(Modality.NONE);
 
-        ViewLoader.view(this)
-                  .load()
-                  .setAsContent(this.getDialogPane());
+        ViewLoader.view(this).load().setAsContent(this.getDialogPane());
 
         // 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);
@@ -56,7 +70,8 @@ public DocumentViewerView() {
 
     @FXML
     private void initialize() {
-        viewModel = new DocumentViewerViewModel(stateManager, preferencesService);
+        viewModel =
+            new DocumentViewerViewModel(stateManager, preferencesService);
 
         setupViewer();
         setupScrollbar();
@@ -77,33 +92,47 @@ private void setupScrollbar() {
 
     private void setupPageControls() {
         OnlyIntegerFormatter integerFormatter = new OnlyIntegerFormatter(1);
-        viewModel.currentPageProperty().bindBidirectional(integerFormatter.valueProperty());
+        viewModel
+            .currentPageProperty()
+            .bindBidirectional(integerFormatter.valueProperty());
         currentPage.setTextFormatter(integerFormatter);
         maxPages.textProperty().bind(viewModel.maxPagesProperty().asString());
     }
 
     private void setupFileChoice() {
-        ViewModelListCellFactory<LinkedFile> cellFactory = new ViewModelListCellFactory<LinkedFile>()
+        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
-        fileChoice.itemsProperty().addListener(
-                (observable, oldValue, newValue) -> fileChoice.getSelectionModel().selectFirst());
+        fileChoice
+            .itemsProperty()
+            .addListener((observable, oldValue, newValue) ->
+                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.currentPageProperty().bindBidirectional(viewer.currentPageProperty());
+        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 0a6f670c60e..499ed42131b 100644
--- a/src/main/java/org/jabref/gui/documentviewer/DocumentViewerViewModel.java
+++ b/src/main/java/org/jabref/gui/documentviewer/DocumentViewerViewModel.java
@@ -1,10 +1,10 @@
 package org.jabref.gui.documentviewer;
 
+import com.tobiasdiez.easybind.EasyBind;
 import java.io.IOException;
 import java.nio.file.Path;
 import java.util.List;
 import java.util.Objects;
-
 import javafx.application.Platform;
 import javafx.beans.property.BooleanProperty;
 import javafx.beans.property.IntegerProperty;
@@ -16,53 +16,67 @@
 import javafx.beans.property.SimpleObjectProperty;
 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.logic.util.io.FileUtil;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.LinkedFile;
 import org.jabref.preferences.PreferencesService;
-
-import com.tobiasdiez.easybind.EasyBind;
-import org.apache.pdfbox.Loader;
-import org.apache.pdfbox.pdmodel.PDDocument;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 public class DocumentViewerViewModel extends AbstractViewModel {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(DocumentViewerViewModel.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(
+        DocumentViewerViewModel.class
+    );
 
     private final StateManager stateManager;
     private final PreferencesService preferencesService;
-    private final ObjectProperty<DocumentViewModel> currentDocument = new SimpleObjectProperty<>();
+    private final ObjectProperty<DocumentViewModel> currentDocument =
+        new SimpleObjectProperty<>();
     private final ListProperty<LinkedFile> files = new SimpleListProperty<>();
     private final BooleanProperty liveMode = new SimpleBooleanProperty();
-    private final ObjectProperty<Integer> currentPage = new SimpleObjectProperty<>();
+    private final ObjectProperty<Integer> currentPage =
+        new SimpleObjectProperty<>();
     private final IntegerProperty maxPages = new SimpleIntegerProperty();
 
-    public DocumentViewerViewModel(StateManager stateManager, PreferencesService preferencesService) {
+    public DocumentViewerViewModel(
+        StateManager stateManager,
+        PreferencesService preferencesService
+    ) {
         this.stateManager = Objects.requireNonNull(stateManager);
         this.preferencesService = Objects.requireNonNull(preferencesService);
 
-        this.stateManager.getSelectedEntries().addListener((ListChangeListener<? super BibEntry>) c -> {
-            // Switch to currently selected entry in live mode
-            if (isLiveMode()) {
-                setCurrentEntries(this.stateManager.getSelectedEntries());
-            }
-        });
+        this.stateManager.getSelectedEntries()
+            .addListener(
+                (ListChangeListener<? super BibEntry>) c -> {
+                    // Switch to currently selected entry in live mode
+                    if (isLiveMode()) {
+                        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());
-            }
-        });
+                // 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
-        Platform.runLater(() -> maxPages.bindBidirectional(
-            EasyBind.wrapNullable(currentDocument).selectProperty(DocumentViewModel::maxPagesProperty)));
+        Platform.runLater(() ->
+            maxPages.bindBidirectional(
+                EasyBind
+                    .wrapNullable(currentDocument)
+                    .selectProperty(DocumentViewModel::maxPagesProperty)
+            )
+        );
         setCurrentEntries(this.stateManager.getSelectedEntries());
     }
 
@@ -98,11 +112,13 @@ private void setCurrentEntries(List<BibEntry> entries) {
     }
 
     private void setCurrentEntry(BibEntry entry) {
-        stateManager.getActiveDatabase().ifPresent(database -> {
-            List<LinkedFile> linkedFiles = entry.getFiles();
-            // We don't need to switch to the first file, this is done automatically in the UI part
-            files.setValue(FXCollections.observableArrayList(linkedFiles));
-        });
+        stateManager
+            .getActiveDatabase()
+            .ifPresent(database -> {
+                List<LinkedFile> linkedFiles = entry.getFiles();
+                // We don't need to switch to the first file, this is done automatically in the UI part
+                files.setValue(FXCollections.observableArrayList(linkedFiles));
+            });
     }
 
     private void setCurrentDocument(Path path) {
@@ -118,9 +134,15 @@ private void setCurrentDocument(Path path) {
 
     public void switchToFile(LinkedFile file) {
         if (file != null) {
-            stateManager.getActiveDatabase()
-                        .flatMap(database -> file.findIn(database, preferencesService.getFilePreferences()))
-                        .ifPresent(this::setCurrentDocument);
+            stateManager
+                .getActiveDatabase()
+                .flatMap(database ->
+                    file.findIn(
+                        database,
+                        preferencesService.getFilePreferences()
+                    )
+                )
+                .ifPresent(this::setCurrentDocument);
         }
     }
 
diff --git a/src/main/java/org/jabref/gui/documentviewer/PageDimension.java b/src/main/java/org/jabref/gui/documentviewer/PageDimension.java
index f41c29db1ab..1ecfb80e96e 100644
--- a/src/main/java/org/jabref/gui/documentviewer/PageDimension.java
+++ b/src/main/java/org/jabref/gui/documentviewer/PageDimension.java
@@ -23,6 +23,7 @@ public static PageDimension ofFixedHeight(double height) {
     public abstract int getHeight(double aspectRatio);
 
     private static class FixedWidthPageDimension extends PageDimension {
+
         private final int width;
 
         public FixedWidthPageDimension(int width) {
@@ -41,6 +42,7 @@ public int getHeight(double aspectRatio) {
     }
 
     private static class FixedHeightPageDimension extends PageDimension {
+
         private final int height;
 
         public FixedHeightPageDimension(int height) {
diff --git a/src/main/java/org/jabref/gui/documentviewer/PdfDocumentPageViewModel.java b/src/main/java/org/jabref/gui/documentviewer/PdfDocumentPageViewModel.java
index 607709742b1..e9a4a164315 100644
--- a/src/main/java/org/jabref/gui/documentviewer/PdfDocumentPageViewModel.java
+++ b/src/main/java/org/jabref/gui/documentviewer/PdfDocumentPageViewModel.java
@@ -4,18 +4,15 @@
 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;
 
 /**
  * Represents the view model of a pdf page backed by a {@link PDPage}.
@@ -27,16 +24,32 @@ public class PdfDocumentPageViewModel extends DocumentPageViewModel {
     private final int pageNumber;
     private final PDDocument document;
 
-    public PdfDocumentPageViewModel(PDPage page, int pageNumber, PDDocument document) {
+    public PdfDocumentPageViewModel(
+        PDPage page,
+        int pageNumber,
+        PDDocument document
+    ) {
         this.page = Objects.requireNonNull(page);
         this.pageNumber = pageNumber;
         this.document = 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);
-        BufferedImage dimg = new BufferedImage(newWidth, newHeight, BufferedImage.TYPE_INT_ARGB);
+    private static BufferedImage resize(
+        BufferedImage img,
+        int newWidth,
+        int newHeight
+    ) {
+        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();
         g2d.drawImage(tmp, 0, 0, null);
@@ -51,7 +64,11 @@ 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 7e5ae9a5969..02d8c1fed9d 100644
--- a/src/main/java/org/jabref/gui/documentviewer/PdfDocumentViewModel.java
+++ b/src/main/java/org/jabref/gui/documentviewer/PdfDocumentViewModel.java
@@ -3,10 +3,8 @@
 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;
 
@@ -26,7 +24,9 @@ public ObservableList<DocumentPageViewModel> 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
         for (int i = 0; i < pages.getCount(); i++) {
-            pdfPages.add(new PdfDocumentPageViewModel(pages.get(i), i, document));
+            pdfPages.add(
+                new PdfDocumentPageViewModel(pages.get(i), i, document)
+            );
         }
         return FXCollections.observableArrayList(pdfPages);
     }
diff --git a/src/main/java/org/jabref/gui/documentviewer/ShowDocumentViewerAction.java b/src/main/java/org/jabref/gui/documentviewer/ShowDocumentViewerAction.java
index b05bfae76f6..7990b94766d 100644
--- a/src/main/java/org/jabref/gui/documentviewer/ShowDocumentViewerAction.java
+++ b/src/main/java/org/jabref/gui/documentviewer/ShowDocumentViewerAction.java
@@ -1,24 +1,36 @@
 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.preferences.PreferencesService;
 
-import com.airhacks.afterburner.injection.Injector;
-
-import static org.jabref.gui.actions.ActionHelper.needsEntriesSelected;
-
 public class ShowDocumentViewerAction extends SimpleCommand {
 
-    public ShowDocumentViewerAction(StateManager stateManager, PreferencesService preferences) {
-        this.executable.bind(needsEntriesSelected(stateManager).and(ActionHelper.isFilePresentForSelectedEntry(stateManager, preferences)));
+    public ShowDocumentViewerAction(
+        StateManager stateManager,
+        PreferencesService preferences
+    ) {
+        this.executable.bind(
+                needsEntriesSelected(stateManager)
+                    .and(
+                        ActionHelper.isFilePresentForSelectedEntry(
+                            stateManager,
+                            preferences
+                        )
+                    )
+            );
     }
 
     @Override
     public void execute() {
-        DialogService dialogService = Injector.instantiateModelOrService(DialogService.class);
+        DialogService dialogService = Injector.instantiateModelOrService(
+            DialogService.class
+        );
         dialogService.showCustomDialog(new DocumentViewerView());
     }
 }
diff --git a/src/main/java/org/jabref/gui/duplicationFinder/DuplicateResolverDialog.java b/src/main/java/org/jabref/gui/duplicationFinder/DuplicateResolverDialog.java
index 9cdf97b0de9..6c03ea944bb 100644
--- a/src/main/java/org/jabref/gui/duplicationFinder/DuplicateResolverDialog.java
+++ b/src/main/java/org/jabref/gui/duplicationFinder/DuplicateResolverDialog.java
@@ -5,7 +5,6 @@
 import javafx.scene.control.ButtonBar.ButtonData;
 import javafx.scene.control.ButtonType;
 import javafx.scene.layout.BorderPane;
-
 import org.jabref.gui.DialogService;
 import org.jabref.gui.StateManager;
 import org.jabref.gui.actions.ActionFactory;
@@ -21,7 +20,8 @@
 import org.jabref.model.entry.BibEntry;
 import org.jabref.preferences.PreferencesService;
 
-public class DuplicateResolverDialog extends BaseDialog<DuplicateResolverResult> {
+public class DuplicateResolverDialog
+    extends BaseDialog<DuplicateResolverResult> {
 
     private final BibDatabaseContext database;
     private final StateManager stateManager;
@@ -29,7 +29,7 @@ public class DuplicateResolverDialog extends BaseDialog<DuplicateResolverResult>
     public enum DuplicateResolverType {
         DUPLICATE_SEARCH,
         IMPORT_CHECK,
-        DUPLICATE_SEARCH_WITH_EXACT
+        DUPLICATE_SEARCH_WITH_EXACT,
     }
 
     public enum DuplicateResolverResult {
@@ -38,7 +38,7 @@ public enum DuplicateResolverResult {
         KEEP_RIGHT,
         AUTOREMOVE_EXACT,
         KEEP_MERGE,
-        BREAK
+        BREAK,
     }
 
     private ThreeWayMergeView threeWayMerge;
@@ -46,57 +46,114 @@ public enum DuplicateResolverResult {
     private final ActionFactory actionFactory;
     private final PreferencesService preferencesService;
 
-    public DuplicateResolverDialog(BibEntry one,
-                                   BibEntry two,
-                                   DuplicateResolverType type,
-                                   BibDatabaseContext database,
-                                   StateManager stateManager,
-                                   DialogService dialogService,
-                                   PreferencesService preferencesService) {
+    public DuplicateResolverDialog(
+        BibEntry one,
+        BibEntry two,
+        DuplicateResolverType type,
+        BibDatabaseContext database,
+        StateManager stateManager,
+        DialogService dialogService,
+        PreferencesService preferencesService
+    ) {
         this.setTitle(Localization.lang("Possible duplicate entries"));
         this.database = database;
         this.stateManager = stateManager;
         this.dialogService = dialogService;
         this.preferencesService = preferencesService;
-        this.actionFactory = new ActionFactory(preferencesService.getKeyBindingRepository());
+        this.actionFactory =
+            new ActionFactory(preferencesService.getKeyBindingRepository());
         init(one, two, type);
     }
 
     private void init(BibEntry one, BibEntry two, DuplicateResolverType type) {
         ButtonType cancel = ButtonType.CANCEL;
-        ButtonType merge = new ButtonType(Localization.lang("Keep merged"), ButtonData.OK_DONE);
+        ButtonType merge = new ButtonType(
+            Localization.lang("Keep merged"),
+            ButtonData.OK_DONE
+        );
 
         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) {
             case DUPLICATE_SEARCH -> {
-                first = new ButtonType(Localization.lang("Keep left"), ButtonData.LEFT);
-                second = new ButtonType(Localization.lang("Keep right"), ButtonData.LEFT);
-                both = new ButtonType(Localization.lang("Keep both"), ButtonData.LEFT);
-                threeWayMerge = new ThreeWayMergeView(one, two, preferencesService);
+                first =
+                    new ButtonType(
+                        Localization.lang("Keep left"),
+                        ButtonData.LEFT
+                    );
+                second =
+                    new ButtonType(
+                        Localization.lang("Keep right"),
+                        ButtonData.LEFT
+                    );
+                both =
+                    new ButtonType(
+                        Localization.lang("Keep both"),
+                        ButtonData.LEFT
+                    );
+                threeWayMerge =
+                    new ThreeWayMergeView(one, two, preferencesService);
             }
             case DUPLICATE_SEARCH_WITH_EXACT -> {
-                first = new ButtonType(Localization.lang("Keep left"), ButtonData.LEFT);
-                second = new ButtonType(Localization.lang("Keep right"), ButtonData.LEFT);
-                both = new ButtonType(Localization.lang("Keep both"), ButtonData.LEFT);
+                first =
+                    new ButtonType(
+                        Localization.lang("Keep left"),
+                        ButtonData.LEFT
+                    );
+                second =
+                    new ButtonType(
+                        Localization.lang("Keep right"),
+                        ButtonData.LEFT
+                    );
+                both =
+                    new ButtonType(
+                        Localization.lang("Keep both"),
+                        ButtonData.LEFT
+                    );
                 removeExactVisible = true;
-                threeWayMerge = new ThreeWayMergeView(one, two, preferencesService);
+                threeWayMerge =
+                    new ThreeWayMergeView(one, two, preferencesService);
             }
             case IMPORT_CHECK -> {
-                first = new ButtonType(Localization.lang("Keep old 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("Old entry"),
-                        Localization.lang("From import"), preferencesService);
+                first =
+                    new ButtonType(
+                        Localization.lang("Keep old 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("Old entry"),
+                        Localization.lang("From import"),
+                        preferencesService
+                    );
             }
-            default -> throw new IllegalStateException("Switch expression should be exhaustive");
+            default -> throw new IllegalStateException(
+                "Switch expression should be exhaustive"
+            );
         }
 
-        this.getDialogPane().getButtonTypes().addAll(first, second, both, merge, cancel);
+        this.getDialogPane()
+            .getButtonTypes()
+            .addAll(first, second, both, merge, cancel);
         this.getDialogPane().setFocusTraversable(false);
 
         if (removeExactVisible) {
@@ -104,15 +161,20 @@ private void init(BibEntry one, BibEntry two, DuplicateResolverType type) {
 
             // This will prevent all dialog buttons from having the same size
             // 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));
+            getDialogPane()
+                .getButtonTypes()
+                .stream()
+                .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
-        DialogWindowState state = stateManager.getDialogWindowState(getClass().getSimpleName());
+        DialogWindowState state = stateManager.getDialogWindowState(
+            getClass().getSimpleName()
+        );
         if (state != null) {
-            this.getDialogPane().setPrefSize(state.getWidth(), state.getHeight());
+            this.getDialogPane()
+                .setPrefSize(state.getWidth(), state.getHeight());
             this.setX(state.getX());
             this.setY(state.getY());
         }
@@ -120,26 +182,41 @@ 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;
-            }
-            return null;
-        });
-
-        HelpAction helpCommand = new HelpAction(HelpFile.FIND_DUPLICATES, dialogService, preferencesService.getFilePreferences());
-        Button helpButton = actionFactory.createIconButton(StandardActions.HELP, helpCommand);
+                // 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;
+                }
+                return null;
+            });
+
+        HelpAction helpCommand = new HelpAction(
+            HelpFile.FIND_DUPLICATES,
+            dialogService,
+            preferencesService.getFilePreferences()
+        );
+        Button helpButton = actionFactory.createIconButton(
+            StandardActions.HELP,
+            helpCommand
+        );
         borderPane.setRight(helpButton);
 
         getDialogPane().setContent(borderPane);
diff --git a/src/main/java/org/jabref/gui/duplicationFinder/DuplicateSearch.java b/src/main/java/org/jabref/gui/duplicationFinder/DuplicateSearch.java
index 0beda09fdf5..b603d971b74 100644
--- a/src/main/java/org/jabref/gui/duplicationFinder/DuplicateSearch.java
+++ b/src/main/java/org/jabref/gui/duplicationFinder/DuplicateSearch.java
@@ -1,5 +1,7 @@
 package org.jabref.gui.duplicationFinder;
 
+import static org.jabref.gui.actions.ActionHelper.needsDatabase;
+
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.HashMap;
@@ -10,11 +12,9 @@
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicInteger;
-
 import javafx.beans.binding.Bindings;
 import javafx.beans.property.SimpleIntegerProperty;
 import javafx.beans.property.SimpleStringProperty;
-
 import org.jabref.gui.DialogService;
 import org.jabref.gui.JabRefExecutorService;
 import org.jabref.gui.JabRefFrame;
@@ -37,19 +37,21 @@
 import org.jabref.model.entry.BibEntryTypesManager;
 import org.jabref.preferences.PreferencesService;
 
-import static org.jabref.gui.actions.ActionHelper.needsDatabase;
-
 public class DuplicateSearch extends SimpleCommand {
 
     private final JabRefFrame frame;
-    private final BlockingQueue<List<BibEntry>> duplicates = new LinkedBlockingQueue<>();
+    private final BlockingQueue<List<BibEntry>> duplicates =
+        new LinkedBlockingQueue<>();
 
     private final AtomicBoolean libraryAnalyzed = new AtomicBoolean();
     private final AtomicBoolean autoRemoveExactDuplicates = new AtomicBoolean();
     private final AtomicInteger duplicateCount = new AtomicInteger();
-    private final SimpleStringProperty duplicateCountObservable = new SimpleStringProperty();
-    private final SimpleStringProperty duplicateTotal = new SimpleStringProperty();
-    private final SimpleIntegerProperty duplicateProgress = new SimpleIntegerProperty(0);
+    private final SimpleStringProperty duplicateCountObservable =
+        new SimpleStringProperty();
+    private final SimpleStringProperty duplicateTotal =
+        new SimpleStringProperty();
+    private final SimpleIntegerProperty duplicateProgress =
+        new SimpleIntegerProperty(0);
     private final DialogService dialogService;
     private final StateManager stateManager;
 
@@ -57,12 +59,14 @@ public class DuplicateSearch extends SimpleCommand {
     private final BibEntryTypesManager entryTypesManager;
     private final TaskExecutor taskExecutor;
 
-    public DuplicateSearch(JabRefFrame frame,
-                           DialogService dialogService,
-                           StateManager stateManager,
-                           PreferencesService prefs,
-                           BibEntryTypesManager entryTypesManager,
-                           TaskExecutor taskExecutor) {
+    public DuplicateSearch(
+        JabRefFrame frame,
+        DialogService dialogService,
+        StateManager stateManager,
+        PreferencesService prefs,
+        BibEntryTypesManager entryTypesManager,
+        TaskExecutor taskExecutor
+    ) {
         this.frame = frame;
         this.dialogService = dialogService;
         this.stateManager = stateManager;
@@ -75,7 +79,9 @@ public DuplicateSearch(JabRefFrame frame,
 
     @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,15 +94,26 @@ public void execute() {
             return;
         }
 
-        duplicateCountObservable.addListener((obj, oldValue, newValue) -> DefaultTaskExecutor.runAndWaitInJavaFXThread(() -> duplicateTotal.set(newValue)));
-
-        JabRefExecutorService.INSTANCE.executeInterruptableTask(() -> searchPossibleDuplicates(entries, database.getMode()), "DuplicateSearcher");
-        BackgroundTask.wrap(this::verifyDuplicates)
-                      .onSuccess(this::handleDuplicates)
-                      .executeWith(taskExecutor);
+        duplicateCountObservable.addListener((obj, oldValue, newValue) ->
+            DefaultTaskExecutor.runAndWaitInJavaFXThread(() ->
+                duplicateTotal.set(newValue)
+            )
+        );
+
+        JabRefExecutorService.INSTANCE.executeInterruptableTask(
+            () -> searchPossibleDuplicates(entries, database.getMode()),
+            "DuplicateSearcher"
+        );
+        BackgroundTask
+            .wrap(this::verifyDuplicates)
+            .onSuccess(this::handleDuplicates)
+            .executeWith(taskExecutor);
     }
 
-    private void searchPossibleDuplicates(List<BibEntry> entries, BibDatabaseMode databaseMode) {
+    private void searchPossibleDuplicates(
+        List<BibEntry> entries,
+        BibDatabaseMode databaseMode
+    ) {
         for (int i = 0; i < (entries.size() - 1); i++) {
             for (int j = i + 1; j < entries.size(); j++) {
                 if (Thread.interrupted()) {
@@ -106,9 +123,14 @@ 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()));
+                    duplicateCountObservable.set(
+                        String.valueOf(duplicateCount.incrementAndGet())
+                    );
                 }
             }
         }
@@ -146,25 +168,55 @@ 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;
 
-                DefaultTaskExecutor.runAndWaitInJavaFXThread(() -> askResolveStrategy(result, first, second, resolverType));
+                DefaultTaskExecutor.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, frame.getCurrentLibraryTab().getBibDatabaseContext(), stateManager, dialogService, prefs);
-
-        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)) {
+    private void askResolveStrategy(
+        DuplicateSearchResult result,
+        BibEntry first,
+        BibEntry second,
+        DuplicateResolverType resolverType
+    ) {
+        DuplicateResolverDialog dialog = new DuplicateResolverDialog(
+            first,
+            second,
+            resolverType,
+            frame.getCurrentLibraryTab().getBibDatabaseContext(),
+            stateManager,
+            dialogService,
+            prefs
+        );
+
+        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)
+        ) {
             result.remove(second);
             result.replace(first, dialog.getNewLeftEntry());
             if (resolverResult == DuplicateResolverResult.AUTOREMOVE_EXACT) {
@@ -190,24 +242,43 @@ private void handleDuplicates(DuplicateSearchResult result) {
         }
 
         LibraryTab libraryTab = frame.getCurrentLibraryTab();
-        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);
     }
@@ -237,7 +308,11 @@ public synchronized void remove(BibEntry entry) {
             duplicates++;
         }
 
-        public synchronized void replace(BibEntry first, BibEntry second, BibEntry replacement) {
+        public synchronized void replace(
+            BibEntry first,
+            BibEntry second,
+            BibEntry replacement
+        ) {
             remove(first);
             remove(second);
             toAdd.add(replacement);
diff --git a/src/main/java/org/jabref/gui/edit/CopyDoiUrlAction.java b/src/main/java/org/jabref/gui/edit/CopyDoiUrlAction.java
index 3ef0e61bd90..3cf947d119d 100644
--- a/src/main/java/org/jabref/gui/edit/CopyDoiUrlAction.java
+++ b/src/main/java/org/jabref/gui/edit/CopyDoiUrlAction.java
@@ -1,9 +1,7 @@
 package org.jabref.gui.edit;
 
 import java.util.Optional;
-
 import javafx.scene.control.TextArea;
-
 import org.jabref.gui.DialogService;
 import org.jabref.gui.Globals;
 import org.jabref.gui.actions.SimpleCommand;
@@ -20,7 +18,11 @@ public class CopyDoiUrlAction extends SimpleCommand {
     private final StandardActions action;
     private final DialogService dialogService;
 
-    public CopyDoiUrlAction(TextArea component, StandardActions action, DialogService dialogService) {
+    public CopyDoiUrlAction(
+        TextArea component,
+        StandardActions action,
+        DialogService dialogService
+    ) {
         this.component = component;
         this.action = action;
         this.dialogService = dialogService;
@@ -31,7 +33,10 @@ public void execute() {
         String identifier = component.getText();
 
         if (action == StandardActions.COPY_DOI_URL) {
-            copy(DOI.parse(identifier).map(DOI::getURIAsASCIIString), identifier);
+            copy(
+                DOI.parse(identifier).map(DOI::getURIAsASCIIString),
+                identifier
+            );
         } else {
             copy(DOI.parse(identifier).map(DOI::getDOI), identifier);
         }
@@ -40,9 +45,13 @@ public void execute() {
     private void copy(Optional<String> urlOptional, String identifier) {
         if (urlOptional.isPresent()) {
             Globals.getClipboardManager().setContent(urlOptional.get());
-            dialogService.notify(Localization.lang("The link has been copied to the clipboard."));
+            dialogService.notify(
+                Localization.lang("The link has been copied to the clipboard.")
+            );
         } else {
-            dialogService.notify(Localization.lang("Invalid DOI: '%0'.", identifier));
+            dialogService.notify(
+                Localization.lang("Invalid DOI: '%0'.", identifier)
+            );
         }
     }
 }
diff --git a/src/main/java/org/jabref/gui/edit/CopyMoreAction.java b/src/main/java/org/jabref/gui/edit/CopyMoreAction.java
index 0f9bbe3c103..3c708f9dadb 100644
--- a/src/main/java/org/jabref/gui/edit/CopyMoreAction.java
+++ b/src/main/java/org/jabref/gui/edit/CopyMoreAction.java
@@ -5,7 +5,6 @@
 import java.util.List;
 import java.util.Optional;
 import java.util.stream.Collectors;
-
 import org.jabref.gui.ClipBoardManager;
 import org.jabref.gui.DialogService;
 import org.jabref.gui.JabRefDialogService;
@@ -21,13 +20,14 @@
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.field.StandardField;
 import org.jabref.preferences.PreferencesService;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 public class CopyMoreAction extends SimpleCommand {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(CopyMoreAction.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(
+        CopyMoreAction.class
+    );
     private final StandardActions action;
     private final DialogService dialogService;
     private final StateManager stateManager;
@@ -35,12 +35,14 @@ public class CopyMoreAction extends SimpleCommand {
     private final PreferencesService preferencesService;
     private final JournalAbbreviationRepository abbreviationRepository;
 
-    public CopyMoreAction(StandardActions action,
-                          DialogService dialogService,
-                          StateManager stateManager,
-                          ClipBoardManager clipBoardManager,
-                          PreferencesService preferencesService,
-                          JournalAbbreviationRepository abbreviationRepository) {
+    public CopyMoreAction(
+        StandardActions action,
+        DialogService dialogService,
+        StateManager stateManager,
+        ClipBoardManager clipBoardManager,
+        PreferencesService preferencesService,
+        JournalAbbreviationRepository abbreviationRepository
+    ) {
         this.action = action;
         this.dialogService = dialogService;
         this.stateManager = stateManager;
@@ -53,7 +55,10 @@ public CopyMoreAction(StandardActions action,
 
     @Override
     public void execute() {
-        if (stateManager.getActiveDatabase().isEmpty() || stateManager.getSelectedEntries().isEmpty()) {
+        if (
+            stateManager.getActiveDatabase().isEmpty() ||
+            stateManager.getSelectedEntries().isEmpty()
+        ) {
             return;
         }
 
@@ -71,13 +76,16 @@ public void execute() {
     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."));
+            dialogService.notify(
+                Localization.lang("None of the selected entries have titles.")
+            );
             return;
         }
 
@@ -86,11 +94,20 @@ 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())
+                )
+            );
         }
     }
 
@@ -98,13 +115,18 @@ private void copyKey() {
         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;
         }
 
@@ -113,11 +135,20 @@ private void copyKey() {
 
         if (keys.size() == entries.size()) {
             // All entries had keys.
-            dialogService.notify(Localization.lang("Copied '%0' to clipboard.",
-                    JabRefDialogService.shortenDialogMessage(copiedKeys)));
+            dialogService.notify(
+                Localization.lang(
+                    "Copied '%0' to clipboard.",
+                    JabRefDialogService.shortenDialogMessage(copiedKeys)
+                )
+            );
         } 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())
+                )
+            );
         }
     }
 
@@ -126,21 +157,31 @@ private void copyDoi() {
 
         // Collect all non-null DOI or DOI urls
         if (action == StandardActions.COPY_DOI_URL) {
-            copyDoiList(entries.stream()
+            copyDoiList(
+                entries
+                    .stream()
                     .filter(entry -> entry.getDOI().isPresent())
                     .map(entry -> entry.getDOI().get().getURIAsASCIIString())
-                    .collect(Collectors.toList()), entries.size());
+                    .collect(Collectors.toList()),
+                entries.size()
+            );
         } else {
-            copyDoiList(entries.stream()
+            copyDoiList(
+                entries
+                    .stream()
                     .filter(entry -> entry.getDOI().isPresent())
                     .map(entry -> entry.getDOI().get().getDOI())
-                    .collect(Collectors.toList()), entries.size());
+                    .collect(Collectors.toList()),
+                entries.size()
+            );
         }
     }
 
     private void copyDoiList(List<String> dois, int size) {
         if (dois.isEmpty()) {
-            dialogService.notify(Localization.lang("None of the selected entries have DOIs."));
+            dialogService.notify(
+                Localization.lang("None of the selected entries have DOIs.")
+            );
             return;
         }
 
@@ -149,11 +190,20 @@ 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)
+                )
+            );
         }
     }
 
@@ -161,30 +211,50 @@ private void copyCiteKey() {
         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;
         }
 
-        String citeCommand = Optional.ofNullable(preferencesService.getExternalApplicationsPreferences().getCiteCommand())
-                                     .filter(cite -> cite.contains("\\")) // must contain \
-                                     .orElse("\\cite");
-
-        final String copiedCiteCommand = citeCommand + "{" + String.join(",", keys) + '}';
+        String citeCommand = Optional
+            .ofNullable(
+                preferencesService
+                    .getExternalApplicationsPreferences()
+                    .getCiteCommand()
+            )
+            .filter(cite -> cite.contains("\\")) // must contain \
+            .orElse("\\cite");
+
+        final String copiedCiteCommand =
+            citeCommand + "{" + String.join(",", keys) + '}';
         clipBoardManager.setContent(copiedCiteCommand);
 
         if (keys.size() == entries.size()) {
             // All entries had keys.
-            dialogService.notify(Localization.lang("Copied '%0' to clipboard.",
-                    JabRefDialogService.shortenDialogMessage(copiedCiteCommand)));
+            dialogService.notify(
+                Localization.lang(
+                    "Copied '%0' to clipboard.",
+                    JabRefDialogService.shortenDialogMessage(copiedCiteCommand)
+                )
+            );
         } 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())
+                )
+            );
         }
     }
 
@@ -192,10 +262,18 @@ 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, preferencesService.getLayoutFormatterPreferences(), abbreviationRepository).getLayoutFromText();
+            layout =
+                new LayoutHelper(
+                    layoutString,
+                    preferencesService.getLayoutFormatterPreferences(),
+                    abbreviationRepository
+                )
+                    .getLayoutFromText();
         } catch (IOException e) {
             LOGGER.info("Could not get layout.", e);
             return;
@@ -208,12 +286,21 @@ private void copyKeyAndTitle() {
         for (BibEntry entry : entries) {
             if (entry.hasCitationKey()) {
                 entriesWithKeys++;
-                keyAndTitle.append(layout.doLayout(entry, stateManager.getActiveDatabase().get().getDatabase()));
+                keyAndTitle.append(
+                    layout.doLayout(
+                        entry,
+                        stateManager.getActiveDatabase().get().getDatabase()
+                    )
+                );
             }
         }
 
         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;
         }
 
@@ -221,11 +308,22 @@ 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())
+                )
+            );
         }
     }
 
@@ -240,33 +338,58 @@ private void copyKeyAndLink() {
         StringBuilder keyAndLink = new StringBuilder();
         StringBuilder fallbackString = new StringBuilder();
 
-        List<BibEntry> entriesWithKey = entries.stream()
-                                               .filter(BibEntry::hasCitationKey)
-                                               .collect(Collectors.toList());
+        List<BibEntry> entriesWithKey = entries
+            .stream()
+            .filter(BibEntry::hasCitationKey)
+            .collect(Collectors.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;
         }
 
         for (BibEntry entry : entriesWithKey) {
             String key = entry.getCitationKey().get();
             String url = entry.getField(StandardField.URL).orElse("");
-            keyAndLink.append(url.isEmpty() ? key : String.format("<a href=\"%s\">%s</a>", url, key));
+            keyAndLink.append(
+                url.isEmpty()
+                    ? key
+                    : String.format("<a href=\"%s\">%s</a>", url, key)
+            );
             keyAndLink.append(OS.NEWLINE);
-            fallbackString.append(url.isEmpty() ? key : String.format("%s - %s", key, url));
+            fallbackString.append(
+                url.isEmpty() ? key : String.format("%s - %s", key, url)
+            );
             fallbackString.append(OS.NEWLINE);
         }
 
-        clipBoardManager.setHtmlContent(keyAndLink.toString(), fallbackString.toString());
+        clipBoardManager.setHtmlContent(
+            keyAndLink.toString(),
+            fallbackString.toString()
+        );
 
         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 b0daa482cb0..3b41ac3b928 100644
--- a/src/main/java/org/jabref/gui/edit/EditAction.java
+++ b/src/main/java/org/jabref/gui/edit/EditAction.java
@@ -2,14 +2,12 @@
 
 import javafx.scene.control.TextInputControl;
 import javafx.scene.web.WebView;
-
+import org.fxmisc.richtext.CodeArea;
 import org.jabref.gui.JabRefFrame;
 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;
 
@@ -19,13 +17,19 @@
  */
 public class EditAction extends SimpleCommand {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(EditAction.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(
+        EditAction.class
+    );
 
     private final JabRefFrame frame;
     private final StandardActions action;
     private final StateManager stateManager;
 
-    public EditAction(StandardActions action, JabRefFrame frame, StateManager stateManager) {
+    public EditAction(
+        StandardActions action,
+        JabRefFrame frame,
+        StateManager stateManager
+    ) {
         this.action = action;
         this.frame = frame;
         this.stateManager = stateManager;
@@ -33,7 +37,9 @@ public EditAction(StandardActions action, JabRefFrame frame, StateManager stateM
         if (action == StandardActions.PASTE) {
             this.executable.bind(ActionHelper.needsDatabase(stateManager));
         } else {
-            this.executable.bind(ActionHelper.needsEntriesSelected(stateManager));
+            this.executable.bind(
+                    ActionHelper.needsEntriesSelected(stateManager)
+                );
         }
     }
 
@@ -44,51 +50,71 @@ 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);
+        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
+                } 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 -> frame.getCurrentLibraryTab().copy();
-                    case CUT -> frame.getCurrentLibraryTab().cut();
-                    case PASTE -> frame.getCurrentLibraryTab().paste();
-                    case DELETE_ENTRY -> frame.getCurrentLibraryTab().delete(false);
-                    case UNDO -> {
-                        if (frame.getUndoManager().canUndo()) {
-                            frame.getUndoManager().undo();
+                    switch (action) {
+                        case COPY -> frame.getCurrentLibraryTab().copy();
+                        case CUT -> frame.getCurrentLibraryTab().cut();
+                        case PASTE -> frame.getCurrentLibraryTab().paste();
+                        case DELETE_ENTRY -> frame
+                            .getCurrentLibraryTab()
+                            .delete(false);
+                        case UNDO -> {
+                            if (frame.getUndoManager().canUndo()) {
+                                frame.getUndoManager().undo();
+                            }
                         }
-                    }
-                    case REDO -> {
-                        if (frame.getUndoManager().canRedo()) {
-                            frame.getUndoManager().redo();
+                        case REDO -> {
+                            if (frame.getUndoManager().canRedo()) {
+                                frame.getUndoManager().redo();
+                            }
                         }
+                        default -> LOGGER.debug(
+                            "Only cut/copy/paste/deleteEntry supported but got: {} and focus owner {}",
+                            action,
+                            focusOwner
+                        );
                     }
-                    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 5ea7a6c9565..1fd6dad9c1b 100644
--- a/src/main/java/org/jabref/gui/edit/ManageKeywordsAction.java
+++ b/src/main/java/org/jabref/gui/edit/ManageKeywordsAction.java
@@ -1,16 +1,15 @@
 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
  */
@@ -21,13 +20,28 @@ public class ManageKeywordsAction extends SimpleCommand {
     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.executable.bind(
+                needsDatabase(stateManager)
+                    .and(needsEntriesSelected(stateManager))
+            );
+        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 dialogService = Injector.instantiateModelOrService(
+            DialogService.class
+        );
+        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 3ff79820697..d8de4b24229 100644
--- a/src/main/java/org/jabref/gui/edit/ManageKeywordsDialog.java
+++ b/src/main/java/org/jabref/gui/edit/ManageKeywordsDialog.java
@@ -1,14 +1,15 @@
 package org.jabref.gui.edit;
 
+import com.airhacks.afterburner.views.ViewLoader;
+import com.tobiasdiez.easybind.EasyBind;
+import jakarta.inject.Inject;
 import java.util.List;
-
 import javafx.fxml.FXML;
 import javafx.scene.control.ButtonType;
 import javafx.scene.control.TableColumn;
 import javafx.scene.control.TableView;
 import javafx.scene.control.ToggleGroup;
 import javafx.scene.control.cell.TextFieldTableCell;
-
 import org.jabref.gui.icon.IconTheme;
 import org.jabref.gui.util.BaseDialog;
 import org.jabref.gui.util.BindingsHelper;
@@ -17,27 +18,35 @@
 import org.jabref.model.entry.BibEntry;
 import org.jabref.preferences.PreferencesService;
 
-import com.airhacks.afterburner.views.ViewLoader;
-import com.tobiasdiez.easybind.EasyBind;
-import jakarta.inject.Inject;
-
 public class ManageKeywordsDialog extends BaseDialog<Void> {
+
     private final List<BibEntry> entries;
-    @FXML private TableColumn<String, String> keywordsTableMainColumn;
-    @FXML private TableColumn<String, Boolean> keywordsTableEditColumn;
-    @FXML private TableColumn<String, Boolean> keywordsTableDeleteColumn;
-    @FXML private TableView<String> keywordsTable;
-    @FXML private ToggleGroup displayType;
-    @Inject private PreferencesService preferences;
+
+    @FXML
+    private TableColumn<String, String> keywordsTableMainColumn;
+
+    @FXML
+    private TableColumn<String, Boolean> keywordsTableEditColumn;
+
+    @FXML
+    private TableColumn<String, Boolean> keywordsTableDeleteColumn;
+
+    @FXML
+    private TableView<String> keywordsTable;
+
+    @FXML
+    private ToggleGroup displayType;
+
+    @Inject
+    private PreferencesService preferences;
+
     private ManageKeywordsViewModel viewModel;
 
     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) {
@@ -49,34 +58,61 @@ public ManageKeywordsDialog(List<BibEntry> entries) {
 
     @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 =
+            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;
+                        }
                     }
-                })
-        );
+                )
+            );
 
         keywordsTable.setItems(viewModel.getKeywords());
-        keywordsTableMainColumn.setCellValueFactory(data -> BindingsHelper.constantOf(data.getValue()));
+        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());
+            viewModel
+                .getKeywords()
+                .set(event.getTablePosition().getRow(), event.getNewValue());
         });
-        keywordsTableMainColumn.setCellFactory(TextFieldTableCell.forTableColumn());
-        keywordsTableEditColumn.setCellValueFactory(data -> BindingsHelper.constantOf(true));
-        keywordsTableDeleteColumn.setCellValueFactory(data -> BindingsHelper.constantOf(true));
+        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))
-                .install(keywordsTableEditColumn);
+            .withGraphic(none -> IconTheme.JabRefIcons.EDIT.getGraphicNode())
+            .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))
-                .install(keywordsTableDeleteColumn);
+            .withGraphic(none -> IconTheme.JabRefIcons.REMOVE.getGraphicNode())
+            .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 2730a20635b..d12a17ad06b 100644
--- a/src/main/java/org/jabref/gui/edit/ManageKeywordsViewModel.java
+++ b/src/main/java/org/jabref/gui/edit/ManageKeywordsViewModel.java
@@ -1,13 +1,12 @@
 package org.jabref.gui.edit;
 
+import com.tobiasdiez.easybind.EasyBind;
 import java.util.List;
 import java.util.Optional;
-
 import javafx.beans.property.ObjectProperty;
 import javafx.beans.property.SimpleObjectProperty;
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableList;
-
 import org.jabref.gui.undo.NamedCompound;
 import org.jabref.gui.undo.UndoableFieldChange;
 import org.jabref.logic.l10n.Localization;
@@ -17,17 +16,22 @@
 import org.jabref.model.entry.KeywordList;
 import org.jabref.preferences.BibEntryPreferences;
 
-import com.tobiasdiez.easybind.EasyBind;
-
 public class ManageKeywordsViewModel {
 
     private final List<BibEntry> entries;
-    private final KeywordList sortedKeywordsOfAllEntriesBeforeUpdateByUser = new KeywordList();
+    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();
@@ -50,23 +54,35 @@ private void fillKeywordsList(ManageKeywordsDisplayType type) {
 
         if (type == ManageKeywordsDisplayType.CONTAINED_IN_ALL_ENTRIES) {
             for (BibEntry entry : entries) {
-                KeywordList separatedKeywords = entry.getKeywords(keywordSeparator);
-                sortedKeywordsOfAllEntriesBeforeUpdateByUser.addAll(separatedKeywords);
+                KeywordList separatedKeywords = entry.getKeywords(
+                    keywordSeparator
+                );
+                sortedKeywordsOfAllEntriesBeforeUpdateByUser.addAll(
+                    separatedKeywords
+                );
             }
         } else if (type == ManageKeywordsDisplayType.CONTAINED_IN_ANY_ENTRY) {
             // all keywords from first entry have to be added
             BibEntry firstEntry = entries.get(0);
-            KeywordList separatedKeywords = firstEntry.getKeywords(keywordSeparator);
-            sortedKeywordsOfAllEntriesBeforeUpdateByUser.addAll(separatedKeywords);
+            KeywordList separatedKeywords = firstEntry.getKeywords(
+                keywordSeparator
+            );
+            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
             for (BibEntry entry : entries) {
                 separatedKeywords = entry.getKeywords(keywordSeparator);
-                sortedKeywordsOfAllEntriesBeforeUpdateByUser.retainAll(separatedKeywords);
+                sortedKeywordsOfAllEntriesBeforeUpdateByUser.retainAll(
+                    separatedKeywords
+                );
             }
         } else {
-            throw new IllegalStateException("DisplayType " + type + " not handled");
+            throw new IllegalStateException(
+                "DisplayType " + type + " not handled"
+            );
         }
         for (Keyword keyword : sortedKeywordsOfAllEntriesBeforeUpdateByUser) {
             keywords.add(keyword.get());
@@ -87,7 +103,9 @@ public void saveChanges() {
         // build keywordsToAdd and userSelectedKeywords in parallel
         for (String keyword : keywords) {
             userSelectedKeywords.add(keyword);
-            if (!sortedKeywordsOfAllEntriesBeforeUpdateByUser.contains(keyword)) {
+            if (
+                !sortedKeywordsOfAllEntriesBeforeUpdateByUser.contains(keyword)
+            ) {
                 keywordsToAdd.add(keyword);
             }
         }
@@ -104,15 +122,24 @@ public void saveChanges() {
             return;
         }
 
-        NamedCompound ce = updateKeywords(entries, keywordsToAdd, keywordsToRemove);
+        NamedCompound ce = updateKeywords(
+            entries,
+            keywordsToAdd,
+            keywordsToRemove
+        );
         // 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"));
+        NamedCompound ce = new NamedCompound(
+            Localization.lang("Update keywords")
+        );
         for (BibEntry entry : entries) {
             KeywordList keywords = entry.getKeywords(keywordSeparator);
 
@@ -121,8 +148,13 @@ private NamedCompound updateKeywords(List<BibEntry> entries, KeywordList keyword
             keywords.addAll(keywordsToAdd);
 
             // put keywords back
-            Optional<FieldChange> change = entry.putKeywords(keywords, keywordSeparator);
-            change.ifPresent(fieldChange -> ce.addEdit(new UndoableFieldChange(fieldChange)));
+            Optional<FieldChange> change = entry.putKeywords(
+                keywords,
+                keywordSeparator
+            );
+            change.ifPresent(fieldChange ->
+                ce.addEdit(new UndoableFieldChange(fieldChange))
+            );
         }
         ce.end();
         return ce;
diff --git a/src/main/java/org/jabref/gui/edit/OpenBrowserAction.java b/src/main/java/org/jabref/gui/edit/OpenBrowserAction.java
index 967ffef9e42..81deae2d06f 100644
--- a/src/main/java/org/jabref/gui/edit/OpenBrowserAction.java
+++ b/src/main/java/org/jabref/gui/edit/OpenBrowserAction.java
@@ -11,7 +11,11 @@ public class OpenBrowserAction extends SimpleCommand {
     private final DialogService dialogService;
     private final FilePreferences filePreferences;
 
-    public OpenBrowserAction(String urlToOpen, DialogService dialogService, FilePreferences filePreferences) {
+    public OpenBrowserAction(
+        String urlToOpen,
+        DialogService dialogService,
+        FilePreferences filePreferences
+    ) {
         this.urlToOpen = urlToOpen;
         this.dialogService = dialogService;
         this.filePreferences = filePreferences;
@@ -19,6 +23,10 @@ public OpenBrowserAction(String urlToOpen, DialogService dialogService, FilePref
 
     @Override
     public void execute() {
-        JabRefDesktop.openBrowserShowPopup(urlToOpen, dialogService, filePreferences);
+        JabRefDesktop.openBrowserShowPopup(
+            urlToOpen,
+            dialogService,
+            filePreferences
+        );
     }
 }
diff --git a/src/main/java/org/jabref/gui/edit/ReplaceStringAction.java b/src/main/java/org/jabref/gui/edit/ReplaceStringAction.java
index bf7b7e579d0..1fea74555dd 100644
--- a/src/main/java/org/jabref/gui/edit/ReplaceStringAction.java
+++ b/src/main/java/org/jabref/gui/edit/ReplaceStringAction.java
@@ -1,14 +1,14 @@
 package org.jabref.gui.edit;
 
+import com.airhacks.afterburner.injection.Injector;
 import org.jabref.gui.DialogService;
 import org.jabref.gui.JabRefFrame;
 import org.jabref.gui.StateManager;
 import org.jabref.gui.actions.ActionHelper;
 import org.jabref.gui.actions.SimpleCommand;
 
-import com.airhacks.afterburner.injection.Injector;
-
 public class ReplaceStringAction extends SimpleCommand {
+
     private final JabRefFrame frame;
 
     public ReplaceStringAction(JabRefFrame frame, StateManager stateManager) {
@@ -19,7 +19,11 @@ public ReplaceStringAction(JabRefFrame frame, StateManager stateManager) {
 
     @Override
     public void execute() {
-        DialogService dialogService = Injector.instantiateModelOrService(DialogService.class);
-        dialogService.showCustomDialogAndWait(new ReplaceStringView(frame.getCurrentLibraryTab()));
+        DialogService dialogService = Injector.instantiateModelOrService(
+            DialogService.class
+        );
+        dialogService.showCustomDialogAndWait(
+            new ReplaceStringView(frame.getCurrentLibraryTab())
+        );
     }
 }
diff --git a/src/main/java/org/jabref/gui/edit/ReplaceStringView.java b/src/main/java/org/jabref/gui/edit/ReplaceStringView.java
index a931406c99c..fd4dad8b46f 100644
--- a/src/main/java/org/jabref/gui/edit/ReplaceStringView.java
+++ b/src/main/java/org/jabref/gui/edit/ReplaceStringView.java
@@ -1,28 +1,37 @@
 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;
 import javafx.scene.control.RadioButton;
 import javafx.scene.control.TextField;
-
 import org.jabref.gui.LibraryTab;
 import org.jabref.gui.util.BaseDialog;
 import org.jabref.gui.util.ControlHelper;
 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;
-    @FXML private CheckBox selectFieldOnly;
-    @FXML private ButtonType replaceButton;
-    @FXML private TextField limitFieldInput;
-    @FXML private TextField findField;
-    @FXML private TextField replaceField;
+    @FXML
+    private RadioButton allReplace;
+
+    @FXML
+    private CheckBox selectFieldOnly;
+
+    @FXML
+    private ButtonType replaceButton;
+
+    @FXML
+    private TextField limitFieldInput;
+
+    @FXML
+    private TextField findField;
+
+    @FXML
+    private TextField replaceField;
 
     private ReplaceStringViewModel viewModel;
 
@@ -33,11 +42,13 @@ 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());
+        ControlHelper.setAction(
+            replaceButton,
+            getDialogPane(),
+            event -> buttonReplace()
+        );
     }
 
     @FXML
diff --git a/src/main/java/org/jabref/gui/edit/ReplaceStringViewModel.java b/src/main/java/org/jabref/gui/edit/ReplaceStringViewModel.java
index 04db4bf9147..ab82f70e560 100644
--- a/src/main/java/org/jabref/gui/edit/ReplaceStringViewModel.java
+++ b/src/main/java/org/jabref/gui/edit/ReplaceStringViewModel.java
@@ -2,12 +2,10 @@
 
 import java.util.Objects;
 import java.util.Set;
-
 import javafx.beans.property.BooleanProperty;
 import javafx.beans.property.SimpleBooleanProperty;
 import javafx.beans.property.SimpleStringProperty;
 import javafx.beans.property.StringProperty;
-
 import org.jabref.gui.AbstractViewModel;
 import org.jabref.gui.LibraryTab;
 import org.jabref.gui.undo.NamedCompound;
@@ -18,6 +16,7 @@
 import org.jabref.model.entry.field.FieldFactory;
 
 public class ReplaceStringViewModel extends AbstractViewModel {
+
     private boolean allFieldReplace;
     private String findString;
     private String replaceString;
@@ -27,7 +26,8 @@ public class ReplaceStringViewModel extends AbstractViewModel {
     private StringProperty findStringProperty = new SimpleStringProperty();
     private StringProperty replaceStringProperty = new SimpleStringProperty();
     private StringProperty fieldStringProperty = new SimpleStringProperty();
-    private BooleanProperty allFieldReplaceProperty = new SimpleBooleanProperty();
+    private BooleanProperty allFieldReplaceProperty =
+        new SimpleBooleanProperty();
     private BooleanProperty selectOnlyProperty = new SimpleBooleanProperty();
 
     public ReplaceStringViewModel(LibraryTab libraryTab) {
@@ -42,7 +42,9 @@ public int replace() {
         boolean selOnly = selectOnlyProperty.getValue();
         allFieldReplace = allFieldReplaceProperty.getValue();
 
-        final NamedCompound compound = new NamedCompound(Localization.lang("Replace string"));
+        final NamedCompound compound = new NamedCompound(
+            Localization.lang("Replace string")
+        );
         int counter = 0;
         if (selOnly) {
             for (BibEntry bibEntry : this.panel.getSelectedEntries()) {
@@ -74,7 +76,11 @@ private int replaceItem(BibEntry entry, NamedCompound compound) {
         return counter;
     }
 
-    private int replaceField(BibEntry entry, Field field, NamedCompound compound) {
+    private int replaceField(
+        BibEntry entry,
+        Field field,
+        NamedCompound compound
+    ) {
         if (!entry.hasField(field)) {
             return 0;
         }
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 2954b013f68..4677bfc5402 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,9 @@
 
 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 fe6e60fee01..6cb1a864807 100644
--- a/src/main/java/org/jabref/gui/edit/automaticfiededitor/AbstractAutomaticFieldEditorTabViewModel.java
+++ b/src/main/java/org/jabref/gui/edit/automaticfiededitor/AbstractAutomaticFieldEditorTabViewModel.java
@@ -6,27 +6,32 @@
 import java.util.HashSet;
 import java.util.Objects;
 import java.util.Set;
-
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableList;
-
 import org.jabref.gui.AbstractViewModel;
 import org.jabref.gui.StateManager;
 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;
 
-public abstract class AbstractAutomaticFieldEditorTabViewModel extends AbstractViewModel {
-    public static final Logger LOGGER = LoggerFactory.getLogger(AbstractAutomaticFieldEditorTabViewModel.class);
+public abstract class AbstractAutomaticFieldEditorTabViewModel
+    extends AbstractViewModel {
+
+    public static final Logger LOGGER = LoggerFactory.getLogger(
+        AbstractAutomaticFieldEditorTabViewModel.class
+    );
 
     protected final StateManager stateManager;
 
-    private final ObservableList<Field> allFields = FXCollections.observableArrayList();
+    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 904762ca02a..7f227dd638b 100644
--- a/src/main/java/org/jabref/gui/edit/automaticfiededitor/AutomaticFieldEditorAction.java
+++ b/src/main/java/org/jabref/gui/edit/automaticfiededitor/AutomaticFieldEditorAction.java
@@ -1,25 +1,34 @@
 package org.jabref.gui.edit.automaticfiededitor;
 
+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;
-
 public class AutomaticFieldEditorAction extends SimpleCommand {
+
     private final StateManager stateManager;
     private final DialogService dialogService;
 
-    public AutomaticFieldEditorAction(StateManager stateManager, DialogService dialogService) {
+    public AutomaticFieldEditorAction(
+        StateManager stateManager,
+        DialogService dialogService
+    ) {
         this.stateManager = stateManager;
         this.dialogService = dialogService;
 
-        this.executable.bind(needsDatabase(stateManager).and(needsEntriesSelected(stateManager)));
+        this.executable.bind(
+                needsDatabase(stateManager)
+                    .and(needsEntriesSelected(stateManager))
+            );
     }
 
     @Override
     public void execute() {
-        dialogService.showCustomDialogAndWait(new AutomaticFieldEditorDialog(stateManager));
+        dialogService.showCustomDialogAndWait(
+            new AutomaticFieldEditorDialog(stateManager)
+        );
     }
 }
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 b23e32788ec..3014e9a9c54 100644
--- a/src/main/java/org/jabref/gui/edit/automaticfiededitor/AutomaticFieldEditorDialog.java
+++ b/src/main/java/org/jabref/gui/edit/automaticfiededitor/AutomaticFieldEditorDialog.java
@@ -1,31 +1,29 @@
 package org.jabref.gui.edit.automaticfiededitor;
 
+import com.airhacks.afterburner.views.ViewLoader;
+import com.tobiasdiez.easybind.EasyBind;
 import java.util.ArrayList;
 import java.util.List;
-
-import javax.swing.undo.CannotUndoException;
-import javax.swing.undo.UndoManager;
-
 import javafx.fxml.FXML;
 import javafx.scene.control.ButtonBar;
 import javafx.scene.control.Tab;
 import javafx.scene.control.TabPane;
-
+import javax.swing.undo.CannotUndoException;
+import javax.swing.undo.UndoManager;
 import org.jabref.gui.Globals;
 import org.jabref.gui.StateManager;
 import org.jabref.gui.util.BaseDialog;
 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;
 
 public class AutomaticFieldEditorDialog extends BaseDialog<String> {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(AutomaticFieldEditorDialog.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(
+        AutomaticFieldEditorDialog.class
+    );
 
     @FXML
     private TabPane tabPane;
@@ -43,18 +41,20 @@ public class AutomaticFieldEditorDialog extends BaseDialog<String> {
 
     public AutomaticFieldEditorDialog(StateManager stateManager) {
         this.selectedEntries = stateManager.getSelectedEntries();
-        this.database = stateManager.getActiveDatabase().orElseThrow().getDatabase();
+        this.database =
+            stateManager.getActiveDatabase().orElseThrow().getDatabase();
         this.stateManager = stateManager;
         this.undoManager = Globals.undoManager;
 
         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) {
+            if (
+                buttonType != null &&
+                buttonType.getButtonData() == ButtonBar.ButtonData.OK_DONE
+            ) {
                 saveChanges();
             } else {
                 cancelChanges();
@@ -64,26 +64,44 @@ public AutomaticFieldEditorDialog(StateManager stateManager) {
 
         // This will prevent all dialog buttons from having the same size
         // Read more: https://stackoverflow.com/questions/45866249/javafx-8-alert-different-button-sizes
-        getDialogPane().getButtonTypes().stream()
+        getDialogPane()
+            .getButtonTypes()
+            .stream()
             .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));
+            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 3f517a1dabd..2e1a829f0d2 100644
--- a/src/main/java/org/jabref/gui/edit/automaticfiededitor/AutomaticFieldEditorViewModel.java
+++ b/src/main/java/org/jabref/gui/edit/automaticfiededitor/AutomaticFieldEditorViewModel.java
@@ -1,12 +1,9 @@
 package org.jabref.gui.edit.automaticfiededitor;
 
 import java.util.List;
-
-import javax.swing.undo.UndoManager;
-
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableList;
-
+import javax.swing.undo.UndoManager;
 import org.jabref.gui.AbstractViewModel;
 import org.jabref.gui.StateManager;
 import org.jabref.gui.edit.automaticfiededitor.copyormovecontent.CopyOrMoveFieldContentTabView;
@@ -17,18 +14,27 @@
 import org.jabref.model.entry.BibEntry;
 
 public class AutomaticFieldEditorViewModel extends AbstractViewModel {
+
     public static final String NAMED_COMPOUND_EDITS = "EDIT_FIELDS";
-    private final ObservableList<AutomaticFieldEditorTab> fieldEditorTabs = FXCollections.observableArrayList();
-    private final NamedCompound dialogEdits = new NamedCompound(NAMED_COMPOUND_EDITS);
+    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 EditFieldContentTabView(database, stateManager),
+            new CopyOrMoveFieldContentTabView(database, stateManager),
+            new RenameFieldTabView(database, stateManager)
         );
     }
 
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 a1263576608..67d0ce7bc40 100644
--- a/src/main/java/org/jabref/gui/edit/automaticfiededitor/LastAutomaticFieldEditorEdit.java
+++ b/src/main/java/org/jabref/gui/edit/automaticfiededitor/LastAutomaticFieldEditorEdit.java
@@ -3,16 +3,20 @@
 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 660c2f8454b..42ffa68a47f 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,6 @@
 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;
@@ -10,6 +9,7 @@
 import org.jabref.model.strings.StringUtil;
 
 public class MoveFieldValueAction extends SimpleCommand {
+
     private final Field fromField;
     private final Field toField;
     private final List<BibEntry> entries;
@@ -20,7 +20,13 @@ 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 +34,12 @@ 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);
     }
 
@@ -43,8 +54,22 @@ public void execute() {
                     entry.setField(toField, fromFieldValue);
                     entry.setField(fromField, "");
 
-                    edits.addEdit(new UndoableFieldChange(entry, fromField, fromFieldValue, null));
-                    edits.addEdit(new UndoableFieldChange(entry, toField, toFieldValue, fromFieldValue));
+                    edits.addEdit(
+                        new UndoableFieldChange(
+                            entry,
+                            fromField,
+                            fromFieldValue,
+                            null
+                        )
+                    );
+                    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 4fc8b9d8b63..28f51a32876 100644
--- a/src/main/java/org/jabref/gui/edit/automaticfiededitor/NotificationPaneAdapter.java
+++ b/src/main/java/org/jabref/gui/edit/automaticfiededitor/NotificationPaneAdapter.java
@@ -1,10 +1,8 @@
 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;
 
@@ -15,9 +13,19 @@ public NotificationPaneAdapter(Node content) {
     }
 
     public void notify(int affectedEntries, int totalEntries) {
-        String notificationMessage = String.format("%d/%d affected entries", affectedEntries, totalEntries);
-        Node notificationGraphic = IconTheme.JabRefIcons.INTEGRITY_INFO.getGraphicNode();
+        String notificationMessage = String.format(
+            "%d/%d affected entries",
+            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 179004ec0ac..4616cee5371 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,14 +1,17 @@
 package org.jabref.gui.edit.automaticfiededitor.copyormovecontent;
 
+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 java.util.ArrayList;
 import java.util.List;
-
 import javafx.application.Platform;
 import javafx.fxml.FXML;
 import javafx.scene.control.Button;
 import javafx.scene.control.CheckBox;
 import javafx.scene.control.ComboBox;
-
 import org.jabref.gui.StateManager;
 import org.jabref.gui.edit.automaticfiededitor.AbstractAutomaticFieldEditorTabView;
 import org.jabref.gui.edit.automaticfiededitor.AutomaticFieldEditorTab;
@@ -17,14 +20,12 @@
 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;
+public class CopyOrMoveFieldContentTabView
+    extends AbstractAutomaticFieldEditorTabView
+    implements AutomaticFieldEditorTab {
 
-public class CopyOrMoveFieldContentTabView extends AbstractAutomaticFieldEditorTabView implements AutomaticFieldEditorTab {
     public Button copyContentButton;
+
     @FXML
     private Button moveContentButton;
 
@@ -33,6 +34,7 @@ public class CopyOrMoveFieldContentTabView extends AbstractAutomaticFieldEditorT
 
     @FXML
     private ComboBox<Field> fromFieldComboBox;
+
     @FXML
     private ComboBox<Field> toFieldComboBox;
 
@@ -46,29 +48,52 @@ public class CopyOrMoveFieldContentTabView extends AbstractAutomaticFieldEditorT
 
     private final ControlsFxVisualizer visualizer = new ControlsFxVisualizer();
 
-    public CopyOrMoveFieldContentTabView(BibDatabase database, StateManager stateManager) {
-        this.selectedEntries = new ArrayList<>(stateManager.getSelectedEntries());
+    public CopyOrMoveFieldContentTabView(
+        BibDatabase database,
+        StateManager stateManager
+    ) {
+        this.selectedEntries =
+            new ArrayList<>(stateManager.getSelectedEntries());
         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);
+        viewModel =
+            new CopyOrMoveFieldContentTabViewModel(
+                selectedEntries,
+                database,
+                stateManager
+            );
         initializeFromAndToComboBox();
 
-        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());
+        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);
+            visualizer.initVisualization(
+                viewModel.toFieldValidationStatus(),
+                toFieldComboBox,
+                true
+            );
         });
     }
 
@@ -80,11 +105,21 @@ private void initializeFromAndToComboBox() {
 
         toFieldComboBox.setConverter(FIELD_STRING_CONVERTER);
 
-        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());
+        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()
+        );
     }
 
     @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 3ed3a1b38ee..2d7282c5fed 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,14 +1,16 @@
 package org.jabref.gui.edit.automaticfiededitor.copyormovecontent;
 
+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 javafx.beans.binding.BooleanBinding;
 import javafx.beans.property.BooleanProperty;
 import javafx.beans.property.ObjectProperty;
 import javafx.beans.property.SimpleBooleanProperty;
 import javafx.beans.property.SimpleObjectProperty;
-
 import org.jabref.gui.StateManager;
 import org.jabref.gui.edit.automaticfiededitor.AbstractAutomaticFieldEditorTabViewModel;
 import org.jabref.gui.edit.automaticfiededitor.LastAutomaticFieldEditorEdit;
@@ -21,18 +23,20 @@
 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;
+public class CopyOrMoveFieldContentTabViewModel
+    extends AbstractAutomaticFieldEditorTabViewModel {
 
-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);
+    private final ObjectProperty<Field> toField = new SimpleObjectProperty<>(
+        StandardField.AUTHOR
+    );
 
-    private final BooleanProperty overwriteFieldContent = new SimpleBooleanProperty(Boolean.FALSE);
+    private final BooleanProperty overwriteFieldContent =
+        new SimpleBooleanProperty(Boolean.FALSE);
     private final List<BibEntry> selectedEntries;
 
     private final Validator toFieldValidator;
@@ -41,24 +45,40 @@ 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;
-        });
+        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());
+        canMove =
+            BooleanBinding
+                .booleanExpression(toFieldValidationStatus().validProperty())
+                .and(overwriteFieldContentProperty());
 
-        canSwap = BooleanBinding.booleanExpression(toFieldValidationStatus().validProperty())
-                                .and(overwriteFieldContentProperty());
+        canSwap =
+            BooleanBinding
+                .booleanExpression(toFieldValidationStatus().validProperty())
+                .and(overwriteFieldContentProperty());
     }
 
     public ValidationStatus toFieldValidationStatus() {
@@ -98,19 +118,27 @@ public BooleanProperty overwriteFieldContentProperty() {
     }
 
     public void copyValue() {
-        NamedCompound copyFieldValueEdit = new NamedCompound("COPY_FIELD_VALUE");
+        NamedCompound copyFieldValueEdit = new NamedCompound(
+            "COPY_FIELD_VALUE"
+        );
         int affectedEntriesCount = 0;
         for (BibEntry entry : selectedEntries) {
             String fromFieldValue = entry.getField(fromField.get()).orElse("");
             String toFieldValue = entry.getField(toField.get()).orElse("");
 
-            if (overwriteFieldContent.get() || StringUtil.isBlank(toFieldValue)) {
+            if (
+                overwriteFieldContent.get() || StringUtil.isBlank(toFieldValue)
+            ) {
                 if (StringUtil.isNotBlank(fromFieldValue)) {
                     entry.setField(toField.get(), fromFieldValue);
-                    copyFieldValueEdit.addEdit(new UndoableFieldChange(entry,
+                    copyFieldValueEdit.addEdit(
+                        new UndoableFieldChange(
+                            entry,
                             toField.get(),
                             toFieldValue,
-                            fromFieldValue));
+                            fromFieldValue
+                        )
+                    );
                     affectedEntriesCount++;
                 }
             }
@@ -118,53 +146,75 @@ 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(),
+            affectedEntriesCount =
+                new MoveFieldValueAction(
+                    fromField.get(),
                     toField.get(),
                     selectedEntries,
-                    moveEdit).executeAndGetAffectedEntriesCount();
+                    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() {
-        NamedCompound swapFieldValuesEdit = new NamedCompound("SWAP_FIELD_VALUES");
+        NamedCompound swapFieldValuesEdit = new NamedCompound(
+            "SWAP_FIELD_VALUES"
+        );
         int affectedEntriesCount = 0;
         for (BibEntry entry : selectedEntries) {
             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(
+                swapFieldValuesEdit.addEdit(
+                    new UndoableFieldChange(
                         entry,
                         toField.get(),
                         toFieldValue,
                         fromFieldValue
-                ));
+                    )
+                );
 
-                swapFieldValuesEdit.addEdit(new UndoableFieldChange(
+                swapFieldValuesEdit.addEdit(
+                    new UndoableFieldChange(
                         entry,
                         fromField.get(),
                         fromFieldValue,
                         toFieldValue
-                ));
+                    )
+                );
                 affectedEntriesCount++;
             }
         }
@@ -172,9 +222,13 @@ 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 0c97b3f81e6..b8030fc76aa 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,14 +1,17 @@
 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 java.util.List;
 import javafx.application.Platform;
 import javafx.fxml.FXML;
 import javafx.scene.control.Button;
 import javafx.scene.control.CheckBox;
 import javafx.scene.control.ComboBox;
 import javafx.scene.control.TextField;
-
 import org.jabref.gui.StateManager;
 import org.jabref.gui.edit.automaticfiededitor.AbstractAutomaticFieldEditorTabView;
 import org.jabref.logic.l10n.Localization;
@@ -16,16 +19,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;
+public class EditFieldContentTabView
+    extends AbstractAutomaticFieldEditorTabView {
 
-public class EditFieldContentTabView extends AbstractAutomaticFieldEditorTabView {
     public Button appendValueButton;
     public Button clearFieldButton;
     public Button setValueButton;
+
     @FXML
     private ComboBox<Field> fieldComboBox;
 
@@ -44,38 +44,67 @@ public class EditFieldContentTabView extends AbstractAutomaticFieldEditorTabView
 
     private final ControlsFxVisualizer visualizer = new ControlsFxVisualizer();
 
-    public EditFieldContentTabView(BibDatabase database, StateManager stateManager) {
+    public EditFieldContentTabView(
+        BibDatabase database,
+        StateManager stateManager
+    ) {
         this.selectedEntries = stateManager.getSelectedEntries();
         this.database = database;
         this.stateManager = stateManager;
 
-        ViewLoader.view(this)
-                  .root(this)
-                  .load();
+        ViewLoader.view(this).root(this).load();
     }
 
     @FXML
     public void initialize() {
-        viewModel = new EditFieldContentViewModel(database, selectedEntries, stateManager);
+        viewModel =
+            new EditFieldContentViewModel(
+                database,
+                selectedEntries,
+                stateManager
+            );
         fieldComboBox.setConverter(FIELD_STRING_CONVERTER);
 
         fieldComboBox.getItems().setAll(viewModel.getAllFields());
 
         fieldComboBox.getSelectionModel().selectFirst();
 
-        fieldComboBox.valueProperty().bindBidirectional(viewModel.selectedFieldProperty());
-        EasyBind.listen(fieldComboBox.getEditor().textProperty(), observable -> fieldComboBox.commitValue());
-
-        fieldValueTextField.textProperty().bindBidirectional(viewModel.fieldValueProperty());
-
-        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));
+        fieldComboBox
+            .valueProperty()
+            .bindBidirectional(viewModel.selectedFieldProperty());
+        EasyBind.listen(
+            fieldComboBox.getEditor().textProperty(),
+            observable -> fieldComboBox.commitValue()
+        );
+
+        fieldValueTextField
+            .textProperty()
+            .bindBidirectional(viewModel.fieldValueProperty());
+
+        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
+            )
+        );
     }
 
     @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 933e1d4f87b..f79896af404 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,9 +1,12 @@
 package org.jabref.gui.edit.automaticfiededitor.editfieldcontent;
 
+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;
-
 import javafx.beans.binding.Bindings;
 import javafx.beans.binding.BooleanBinding;
 import javafx.beans.property.BooleanProperty;
@@ -12,7 +15,6 @@
 import javafx.beans.property.SimpleObjectProperty;
 import javafx.beans.property.SimpleStringProperty;
 import javafx.beans.property.StringProperty;
-
 import org.jabref.gui.StateManager;
 import org.jabref.gui.edit.automaticfiededitor.AbstractAutomaticFieldEditorTabViewModel;
 import org.jabref.gui.edit.automaticfiededitor.LastAutomaticFieldEditorEdit;
@@ -24,39 +26,54 @@
 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;
+public class EditFieldContentViewModel
+    extends AbstractAutomaticFieldEditorTabViewModel {
 
-public class EditFieldContentViewModel extends AbstractAutomaticFieldEditorTabViewModel {
     public static final int TAB_INDEX = 0;
 
     private final List<BibEntry> selectedEntries;
 
     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 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() {
@@ -68,13 +85,22 @@ public BooleanBinding canAppendProperty() {
     }
 
     public void clearSelectedField() {
-        NamedCompound clearFieldEdit = new NamedCompound("CLEAR_SELECTED_FIELD");
+        NamedCompound clearFieldEdit = new NamedCompound(
+            "CLEAR_SELECTED_FIELD"
+        );
         int affectedEntriesCount = 0;
         for (BibEntry entry : selectedEntries) {
-            Optional<String> oldFieldValue = entry.getField(selectedField.get());
+            Optional<String> oldFieldValue = entry.getField(
+                selectedField.get()
+            );
             if (oldFieldValue.isPresent()) {
-                entry.clearField(selectedField.get())
-                        .ifPresent(fieldChange -> clearFieldEdit.addEdit(new UndoableFieldChange(fieldChange)));
+                entry
+                    .clearField(selectedField.get())
+                    .ifPresent(fieldChange ->
+                        clearFieldEdit.addEdit(
+                            new UndoableFieldChange(fieldChange)
+                        )
+                    );
                 affectedEntriesCount++;
             }
         }
@@ -82,11 +108,13 @@ public void clearSelectedField() {
         if (clearFieldEdit.hasEdits()) {
             clearFieldEdit.end();
         }
-        stateManager.setLastAutomaticFieldEditorEdit(new LastAutomaticFieldEditorEdit(
+        stateManager.setLastAutomaticFieldEditorEdit(
+            new LastAutomaticFieldEditorEdit(
                 affectedEntriesCount,
                 TAB_INDEX,
                 clearFieldEdit
-        ));
+            )
+        );
     }
 
     public void setFieldValue() {
@@ -94,10 +122,17 @@ public void setFieldValue() {
         String toSetFieldValue = fieldValue.getValue();
         int affectedEntriesCount = 0;
         for (BibEntry entry : selectedEntries) {
-            Optional<String> oldFieldValue = entry.getField(selectedField.get());
+            Optional<String> oldFieldValue = entry.getField(
+                selectedField.get()
+            );
             if (oldFieldValue.isEmpty() || overwriteFieldContent.get()) {
-                entry.setField(selectedField.get(), toSetFieldValue)
-                     .ifPresent(fieldChange -> setFieldEdit.addEdit(new UndoableFieldChange(fieldChange)));
+                entry
+                    .setField(selectedField.get(), toSetFieldValue)
+                    .ifPresent(fieldChange ->
+                        setFieldEdit.addEdit(
+                            new UndoableFieldChange(fieldChange)
+                        )
+                    );
                 fieldValue.set("");
                 // TODO: increment affected entries only when UndoableFieldChange.isPresent()
                 affectedEntriesCount++;
@@ -107,25 +142,38 @@ public void setFieldValue() {
         if (setFieldEdit.hasEdits()) {
             setFieldEdit.end();
         }
-        stateManager.setLastAutomaticFieldEditorEdit(new LastAutomaticFieldEditorEdit(
+        stateManager.setLastAutomaticFieldEditorEdit(
+            new LastAutomaticFieldEditorEdit(
                 affectedEntriesCount,
                 TAB_INDEX,
                 setFieldEdit
-        ));
+            )
+        );
     }
 
     public void appendToFieldValue() {
-        NamedCompound appendToFieldEdit = new NamedCompound("APPEND_TO_SELECTED_FIELD");
+        NamedCompound appendToFieldEdit = new NamedCompound(
+            "APPEND_TO_SELECTED_FIELD"
+        );
         String toAppendFieldValue = fieldValue.getValue();
         int affectedEntriesCount = 0;
         for (BibEntry entry : selectedEntries) {
-            Optional<String> oldFieldValue = entry.getField(selectedField.get());
+            Optional<String> oldFieldValue = entry.getField(
+                selectedField.get()
+            );
             // Append button should be disabled if 'overwriteNonEmptyFields' is false
             if (overwriteFieldContent.get()) {
-                String newFieldValue = oldFieldValue.orElse("").concat(toAppendFieldValue);
-
-                entry.setField(selectedField.get(), newFieldValue)
-                        .ifPresent(fieldChange -> appendToFieldEdit.addEdit(new UndoableFieldChange(fieldChange)));
+                String newFieldValue = oldFieldValue
+                    .orElse("")
+                    .concat(toAppendFieldValue);
+
+                entry
+                    .setField(selectedField.get(), newFieldValue)
+                    .ifPresent(fieldChange ->
+                        appendToFieldEdit.addEdit(
+                            new UndoableFieldChange(fieldChange)
+                        )
+                    );
 
                 fieldValue.set("");
                 affectedEntriesCount++;
@@ -135,11 +183,13 @@ public void appendToFieldValue() {
         if (appendToFieldEdit.hasEdits()) {
             appendToFieldEdit.end();
         }
-        stateManager.setLastAutomaticFieldEditorEdit(new LastAutomaticFieldEditorEdit(
+        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 fc111cecc46..2bc5bf4fe11 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,13 +1,16 @@
 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 java.util.List;
 import javafx.application.Platform;
 import javafx.fxml.FXML;
 import javafx.scene.control.Button;
 import javafx.scene.control.ComboBox;
 import javafx.scene.control.TextField;
-
 import org.jabref.gui.StateManager;
 import org.jabref.gui.edit.automaticfiededitor.AbstractAutomaticFieldEditorTabView;
 import org.jabref.gui.edit.automaticfiededitor.AutomaticFieldEditorTab;
@@ -16,19 +19,19 @@
 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;
+public class RenameFieldTabView
+    extends AbstractAutomaticFieldEditorTabView
+    implements AutomaticFieldEditorTab {
 
-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,29 +44,41 @@ 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
     public void initialize() {
-        viewModel = new RenameFieldViewModel(selectedEntries, database, stateManager);
+        viewModel =
+            new RenameFieldViewModel(selectedEntries, database, stateManager);
 
         fieldComboBox.getItems().setAll(viewModel.getAllFields());
         fieldComboBox.getSelectionModel().selectFirst();
 
         fieldComboBox.setConverter(FIELD_STRING_CONVERTER);
 
-        fieldComboBox.valueProperty().bindBidirectional(viewModel.selectedFieldProperty());
-        EasyBind.listen(fieldComboBox.getEditor().textProperty(), observable -> fieldComboBox.commitValue());
+        fieldComboBox
+            .valueProperty()
+            .bindBidirectional(viewModel.selectedFieldProperty());
+        EasyBind.listen(
+            fieldComboBox.getEditor().textProperty(),
+            observable -> fieldComboBox.commitValue()
+        );
 
-        renameButton.disableProperty().bind(viewModel.canRenameProperty().not());
+        renameButton
+            .disableProperty()
+            .bind(viewModel.canRenameProperty().not());
 
-        newFieldNameTextField.textProperty().bindBidirectional(viewModel.newFieldNameProperty());
+        newFieldNameTextField
+            .textProperty()
+            .bindBidirectional(viewModel.newFieldNameProperty());
 
         Platform.runLater(() -> {
-            visualizer.initVisualization(viewModel.fieldNameValidationStatus(), newFieldNameTextField, true);
+            visualizer.initVisualization(
+                viewModel.fieldNameValidationStatus(),
+                newFieldNameTextField,
+                true
+            );
         });
     }
 
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 6f22623d466..620b9f90ea2 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,14 +1,16 @@
 package org.jabref.gui.edit.automaticfiededitor.renamefield;
 
+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 javafx.beans.binding.Bindings;
 import javafx.beans.binding.BooleanBinding;
 import javafx.beans.property.ObjectProperty;
 import javafx.beans.property.SimpleObjectProperty;
 import javafx.beans.property.SimpleStringProperty;
 import javafx.beans.property.StringProperty;
-
 import org.jabref.gui.StateManager;
 import org.jabref.gui.edit.automaticfiededitor.AbstractAutomaticFieldEditorTabViewModel;
 import org.jabref.gui.edit.automaticfiededitor.LastAutomaticFieldEditorEdit;
@@ -21,15 +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;
+public class RenameFieldViewModel
+    extends AbstractAutomaticFieldEditorTabViewModel {
 
-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 +38,42 @@ 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 +116,27 @@ public void renameField() {
         NamedCompound renameEdit = new NamedCompound("RENAME_EDIT");
         int affectedEntriesCount = 0;
         if (fieldNameValidationStatus().isValid()) {
-            affectedEntriesCount = new MoveFieldValueAction(selectedField.get(),
+            affectedEntriesCount =
+                new MoveFieldValueAction(
+                    selectedField.get(),
                     FieldFactory.parseField(newFieldName.get()),
                     selectedEntries,
                     renameEdit,
-                    false).executeAndGetAffectedEntriesCount();
+                    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/CommentsTab.java b/src/main/java/org/jabref/gui/entryeditor/CommentsTab.java
index 269ab381a83..224a77ccf64 100644
--- a/src/main/java/org/jabref/gui/entryeditor/CommentsTab.java
+++ b/src/main/java/org/jabref/gui/entryeditor/CommentsTab.java
@@ -4,9 +4,7 @@
 import java.util.Map;
 import java.util.Set;
 import java.util.stream.Collectors;
-
 import javax.swing.undo.UndoManager;
-
 import org.jabref.gui.DialogService;
 import org.jabref.gui.StateManager;
 import org.jabref.gui.autocompleter.SuggestionProviders;
@@ -25,31 +23,35 @@
 import org.jabref.preferences.PreferencesService;
 
 public class CommentsTab extends FieldsEditorTab {
+
     public static final String NAME = "Comments";
 
     private final String defaultOwner;
-    public CommentsTab(PreferencesService preferences,
-                       BibDatabaseContext databaseContext,
-                       SuggestionProviders suggestionProviders,
-                       UndoManager undoManager,
-                       DialogService dialogService,
-                       StateManager stateManager,
-                       ThemeManager themeManager,
-                       IndexingTaskManager indexingTaskManager,
-                       TaskExecutor taskExecutor,
-                       JournalAbbreviationRepository journalAbbreviationRepository) {
+
+    public CommentsTab(
+        PreferencesService preferences,
+        BibDatabaseContext databaseContext,
+        SuggestionProviders suggestionProviders,
+        UndoManager undoManager,
+        DialogService dialogService,
+        StateManager stateManager,
+        ThemeManager themeManager,
+        IndexingTaskManager indexingTaskManager,
+        TaskExecutor taskExecutor,
+        JournalAbbreviationRepository journalAbbreviationRepository
+    ) {
         super(
-                false,
-                databaseContext,
-                suggestionProviders,
-                undoManager,
-                dialogService,
-                preferences,
-                stateManager,
-                themeManager,
-                taskExecutor,
-                journalAbbreviationRepository,
-                indexingTaskManager
+            false,
+            databaseContext,
+            suggestionProviders,
+            undoManager,
+            dialogService,
+            preferences,
+            stateManager,
+            themeManager,
+            taskExecutor,
+            journalAbbreviationRepository,
+            indexingTaskManager
         );
         this.defaultOwner = preferences.getOwnerPreferences().getDefaultOwner();
         setText(Localization.lang("Comments"));
@@ -58,15 +60,24 @@ public CommentsTab(PreferencesService preferences,
 
     @Override
     protected Set<Field> determineFieldsToShow(BibEntry entry) {
-        UserSpecificCommentField defaultCommentField = new UserSpecificCommentField(defaultOwner);
+        UserSpecificCommentField defaultCommentField =
+            new UserSpecificCommentField(defaultOwner);
 
         // As default: Show BibTeX comment field and the user-specific comment field of the default owner
-        Set<Field> comments = new LinkedHashSet<>(Set.of(defaultCommentField, StandardField.COMMENT));
+        Set<Field> comments = new LinkedHashSet<>(
+            Set.of(defaultCommentField, StandardField.COMMENT)
+        );
 
-        comments.addAll(entry.getFields().stream()
-                             .filter(field -> field instanceof UserSpecificCommentField ||
-                                     field.getName().toLowerCase().contains("comment"))
-                             .collect(Collectors.toSet()));
+        comments.addAll(
+            entry
+                .getFields()
+                .stream()
+                .filter(field ->
+                    field instanceof UserSpecificCommentField ||
+                    field.getName().toLowerCase().contains("comment")
+                )
+                .collect(Collectors.toSet())
+        );
 
         return comments;
     }
@@ -75,7 +86,10 @@ protected Set<Field> determineFieldsToShow(BibEntry entry) {
     protected void setupPanel(BibEntry entry, boolean compressed) {
         super.setupPanel(entry, compressed);
 
-        for (Map.Entry<Field, FieldEditorFX> fieldEditorEntry : editors.entrySet()) {
+        for (Map.Entry<
+            Field,
+            FieldEditorFX
+        > fieldEditorEntry : editors.entrySet()) {
             Field field = fieldEditorEntry.getKey();
             FieldEditorFX editor = fieldEditorEntry.getValue();
 
@@ -84,7 +98,11 @@ protected void setupPanel(BibEntry entry, boolean compressed) {
                     editor.getNode().setDisable(false);
                 }
             } else {
-                editor.getNode().setDisable(!field.getName().equals(StandardField.COMMENT.getName()));
+                editor
+                    .getNode()
+                    .setDisable(
+                        !field.getName().equals(StandardField.COMMENT.getName())
+                    );
             }
         }
     }
diff --git a/src/main/java/org/jabref/gui/entryeditor/DeprecatedFieldsTab.java b/src/main/java/org/jabref/gui/entryeditor/DeprecatedFieldsTab.java
index a40302d54c6..45047227232 100644
--- a/src/main/java/org/jabref/gui/entryeditor/DeprecatedFieldsTab.java
+++ b/src/main/java/org/jabref/gui/entryeditor/DeprecatedFieldsTab.java
@@ -1,14 +1,12 @@
 package org.jabref.gui.entryeditor;
 
+import com.tobiasdiez.easybind.EasyBind;
 import java.util.Collections;
 import java.util.Optional;
 import java.util.Set;
 import java.util.stream.Collectors;
-
-import javax.swing.undo.UndoManager;
-
 import javafx.scene.control.Tooltip;
-
+import javax.swing.undo.UndoManager;
 import org.jabref.gui.DialogService;
 import org.jabref.gui.StateManager;
 import org.jabref.gui.autocompleter.SuggestionProviders;
@@ -26,44 +24,79 @@
 import org.jabref.model.entry.field.Field;
 import org.jabref.preferences.PreferencesService;
 
-import com.tobiasdiez.easybind.EasyBind;
-
 public class DeprecatedFieldsTab extends FieldsEditorTab {
 
     public static final String NAME = "Deprecated fields";
     private final BibEntryTypesManager entryTypesManager;
 
-    public DeprecatedFieldsTab(BibDatabaseContext databaseContext,
-                               SuggestionProviders suggestionProviders,
-                               UndoManager undoManager,
-                               DialogService dialogService,
-                               PreferencesService preferences,
-                               StateManager stateManager,
-                               ThemeManager themeManager,
-                               IndexingTaskManager indexingTaskManager,
-                               BibEntryTypesManager entryTypesManager,
-                               TaskExecutor taskExecutor,
-                               JournalAbbreviationRepository journalAbbreviationRepository) {
-        super(false, databaseContext, suggestionProviders, undoManager, dialogService, preferences, stateManager, themeManager, taskExecutor, journalAbbreviationRepository, indexingTaskManager);
+    public DeprecatedFieldsTab(
+        BibDatabaseContext databaseContext,
+        SuggestionProviders suggestionProviders,
+        UndoManager undoManager,
+        DialogService dialogService,
+        PreferencesService preferences,
+        StateManager stateManager,
+        ThemeManager themeManager,
+        IndexingTaskManager indexingTaskManager,
+        BibEntryTypesManager entryTypesManager,
+        TaskExecutor taskExecutor,
+        JournalAbbreviationRepository journalAbbreviationRepository
+    ) {
+        super(
+            false,
+            databaseContext,
+            suggestionProviders,
+            undoManager,
+            dialogService,
+            preferences,
+            stateManager,
+            themeManager,
+            taskExecutor,
+            journalAbbreviationRepository,
+            indexingTaskManager
+        );
         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());
     }
 
     @Override
     protected Set<Field> determineFieldsToShow(BibEntry entry) {
         BibDatabaseMode mode = databaseContext.getMode();
-        Optional<BibEntryType> entryType = entryTypesManager.enrich(entry.getType(), mode);
+        Optional<BibEntryType> entryType = entryTypesManager.enrich(
+            entry.getType(),
+            mode
+        );
         if (entryType.isPresent()) {
-            return entryType.get().getDeprecatedFields(mode).stream().filter(field -> !entry.getField(field).isEmpty()).collect(Collectors.toSet());
+            return entryType
+                .get()
+                .getDeprecatedFields(mode)
+                .stream()
+                .filter(field -> !entry.getField(field).isEmpty())
+                .collect(Collectors.toSet());
         } else {
             // Entry type unknown -> treat all fields as required
             return Collections.emptySet();
diff --git a/src/main/java/org/jabref/gui/entryeditor/EntryEditor.java b/src/main/java/org/jabref/gui/entryeditor/EntryEditor.java
index 7ee6f1b6968..2fe0e27fcb5 100644
--- a/src/main/java/org/jabref/gui/entryeditor/EntryEditor.java
+++ b/src/main/java/org/jabref/gui/entryeditor/EntryEditor.java
@@ -1,5 +1,9 @@
 package org.jabref.gui.entryeditor;
 
+import com.airhacks.afterburner.views.ViewLoader;
+import com.tobiasdiez.easybind.EasyBind;
+import com.tobiasdiez.easybind.Subscription;
+import jakarta.inject.Inject;
 import java.io.File;
 import java.nio.file.Path;
 import java.util.Collections;
@@ -12,7 +16,6 @@
 import java.util.Set;
 import java.util.SortedSet;
 import java.util.stream.Collectors;
-
 import javafx.fxml.FXML;
 import javafx.geometry.Side;
 import javafx.scene.control.Button;
@@ -25,7 +28,6 @@
 import javafx.scene.input.KeyEvent;
 import javafx.scene.input.TransferMode;
 import javafx.scene.layout.BorderPane;
-
 import org.jabref.gui.DialogService;
 import org.jabref.gui.LibraryTab;
 import org.jabref.gui.StateManager;
@@ -57,11 +59,6 @@
 import org.jabref.model.entry.field.Field;
 import org.jabref.model.util.FileUpdateMonitor;
 import org.jabref.preferences.PreferencesService;
-
-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;
 
@@ -76,41 +73,69 @@
  */
 public class EntryEditor extends BorderPane {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(EntryEditor.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(
+        EntryEditor.class
+    );
 
     private final LibraryTab libraryTab;
     private final BibDatabaseContext databaseContext;
     private final EntryEditorPreferences entryEditorPreferences;
     private final ExternalFilesEntryLinker fileLinker;
     /*
-    * Tabs which can apply filter, but seems non-sense
-    * */
+     * Tabs which can apply filter, but seems non-sense
+     * */
     private final List<EntryEditorTab> tabs;
     private Subscription typeSubscription;
     /*
-    * A reference to the entry this editor works on.
-    * */
+     * A reference to the entry this editor works on.
+     * */
     private BibEntry entry;
     private SourceTab sourceTab;
 
     /*
-    * tabs to be showed in GUI
-    * */
-    @FXML private TabPane tabbed;
-
-    @FXML private Button typeChangeButton;
-    @FXML private Button fetcherButton;
-    @FXML private Label typeLabel;
-    @Inject private DialogService dialogService;
-    @Inject private TaskExecutor taskExecutor;
-    @Inject private PreferencesService preferencesService;
-    @Inject private StateManager stateManager;
-    @Inject private ThemeManager themeManager;
-    @Inject private FileUpdateMonitor fileMonitor;
-    @Inject private CountingUndoManager undoManager;
-    @Inject private BibEntryTypesManager bibEntryTypesManager;
-    @Inject private KeyBindingRepository keyBindingRepository;
-    @Inject private JournalAbbreviationRepository journalAbbreviationRepository;
+     * tabs to be showed in GUI
+     * */
+    @FXML
+    private TabPane tabbed;
+
+    @FXML
+    private Button typeChangeButton;
+
+    @FXML
+    private Button fetcherButton;
+
+    @FXML
+    private Label typeLabel;
+
+    @Inject
+    private DialogService dialogService;
+
+    @Inject
+    private TaskExecutor taskExecutor;
+
+    @Inject
+    private PreferencesService preferencesService;
+
+    @Inject
+    private StateManager stateManager;
+
+    @Inject
+    private ThemeManager themeManager;
+
+    @Inject
+    private FileUpdateMonitor fileMonitor;
+
+    @Inject
+    private CountingUndoManager undoManager;
+
+    @Inject
+    private BibEntryTypesManager bibEntryTypesManager;
+
+    @Inject
+    private KeyBindingRepository keyBindingRepository;
+
+    @Inject
+    private JournalAbbreviationRepository journalAbbreviationRepository;
 
     private final List<EntryEditorTab> entryEditorTabs = new LinkedList<>();
 
@@ -118,99 +143,132 @@ public EntryEditor(LibraryTab libraryTab) {
         this.libraryTab = libraryTab;
         this.databaseContext = libraryTab.getBibDatabaseContext();
 
-        ViewLoader.view(this)
-                  .root(this)
-                  .load();
-
-        this.entryEditorPreferences = preferencesService.getEntryEditorPreferences();
-        this.fileLinker = new ExternalFilesEntryLinker(preferencesService.getFilePreferences(), databaseContext, dialogService);
+        ViewLoader.view(this).root(this).load();
 
-        EasyBind.subscribe(tabbed.getSelectionModel().selectedItemProperty(), tab -> {
-            EntryEditorTab activeTab = (EntryEditorTab) tab;
-            if (activeTab != null) {
-                activeTab.notifyAboutFocus(entry);
+        this.entryEditorPreferences =
+            preferencesService.getEntryEditorPreferences();
+        this.fileLinker =
+            new ExternalFilesEntryLinker(
+                preferencesService.getFilePreferences(),
+                databaseContext,
+                dialogService
+            );
+
+        EasyBind.subscribe(
+            tabbed.getSelectionModel().selectedItemProperty(),
+            tab -> {
+                EntryEditorTab activeTab = (EntryEditorTab) tab;
+                if (activeTab != null) {
+                    activeTab.notifyAboutFocus(entry);
+                }
             }
-        });
+        );
 
         setupKeyBindings();
 
         this.tabs = createTabs();
 
         this.setOnDragOver(event -> {
-            if (event.getDragboard().hasFiles()) {
-                event.acceptTransferModes(TransferMode.COPY, TransferMode.MOVE, TransferMode.LINK);
-            }
-            event.consume();
-        });
+                if (event.getDragboard().hasFiles()) {
+                    event.acceptTransferModes(
+                        TransferMode.COPY,
+                        TransferMode.MOVE,
+                        TransferMode.LINK
+                    );
+                }
+                event.consume();
+            });
 
         this.setOnDragDropped(event -> {
-            BibEntry entry = this.getEntry();
-            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.getIndexingTaskManager());
-                    }
-                    case MOVE -> {
-                        LOGGER.debug("Mode MOVE");
-                        fileLinker.moveFilesToFileDirRenameAndAddToEntry(entry, draggedFiles, libraryTab.getIndexingTaskManager());
-                    }
-                    case LINK -> {
-                        LOGGER.debug("Mode LINK");
-                        fileLinker.addFilesToEntry(entry, draggedFiles);
+                BibEntry entry = this.getEntry();
+                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.getIndexingTaskManager()
+                            );
+                        }
+                        case MOVE -> {
+                            LOGGER.debug("Mode MOVE");
+                            fileLinker.moveFilesToFileDirRenameAndAddToEntry(
+                                entry,
+                                draggedFiles,
+                                libraryTab.getIndexingTaskManager()
+                            );
+                        }
+                        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, preferencesService.getFilePreferences()).execute();
-                        event.consume();
-                        break;
-                    case CLOSE:
-                    case EDIT_ENTRY:
-                        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,
+                                    preferencesService.getFilePreferences()
+                                )
+                                    .execute();
+                                event.consume();
+                                break;
+                            case CLOSE:
+                            case EDIT_ENTRY:
+                                close();
+                                event.consume();
+                                break;
+                            default:
+                            // Pass other keys to parent
+                        }
+                    }
                 }
-            }
-        });
+            );
     }
 
     @FXML
@@ -225,14 +283,26 @@ private void deleteEntry() {
 
     @FXML
     void generateCiteKeyButton() {
-        GenerateCitationKeySingleAction action = new GenerateCitationKeySingleAction(getEntry(), databaseContext,
-                dialogService, preferencesService, undoManager);
+        GenerateCitationKeySingleAction action =
+            new GenerateCitationKeySingleAction(
+                getEntry(),
+                databaseContext,
+                dialogService,
+                preferencesService,
+                undoManager
+            );
         action.execute();
     }
 
     @FXML
     void generateCleanupButton() {
-        CleanupSingleAction action = new CleanupSingleAction(getEntry(), preferencesService, dialogService, stateManager, undoManager);
+        CleanupSingleAction action = new CleanupSingleAction(
+            getEntry(),
+            preferencesService,
+            dialogService,
+            stateManager,
+            undoManager
+        );
         action.execute();
     }
 
@@ -247,21 +317,116 @@ private void navigateToNextEntry() {
     }
 
     private List<EntryEditorTab> createTabs() {
-        entryEditorTabs.add(new PreviewTab(databaseContext, dialogService, preferencesService, stateManager, themeManager, libraryTab.getIndexingTaskManager(), taskExecutor));
+        entryEditorTabs.add(
+            new PreviewTab(
+                databaseContext,
+                dialogService,
+                preferencesService,
+                stateManager,
+                themeManager,
+                libraryTab.getIndexingTaskManager(),
+                taskExecutor
+            )
+        );
 
         // Required, optional, deprecated, and "other" fields
-        entryEditorTabs.add(new RequiredFieldsTab(databaseContext, libraryTab.getSuggestionProviders(), undoManager, dialogService, preferencesService, stateManager, themeManager, libraryTab.getIndexingTaskManager(), bibEntryTypesManager, taskExecutor, journalAbbreviationRepository));
-        entryEditorTabs.add(new OptionalFieldsTab(databaseContext, libraryTab.getSuggestionProviders(), undoManager, dialogService, preferencesService, stateManager, themeManager, libraryTab.getIndexingTaskManager(), bibEntryTypesManager, taskExecutor, journalAbbreviationRepository));
-        entryEditorTabs.add(new OptionalFields2Tab(databaseContext, libraryTab.getSuggestionProviders(), undoManager, dialogService, preferencesService, stateManager, themeManager, libraryTab.getIndexingTaskManager(), bibEntryTypesManager, taskExecutor, journalAbbreviationRepository));
-        entryEditorTabs.add(new DeprecatedFieldsTab(databaseContext, libraryTab.getSuggestionProviders(), undoManager, dialogService, preferencesService, stateManager, themeManager, libraryTab.getIndexingTaskManager(), bibEntryTypesManager, taskExecutor, journalAbbreviationRepository));
-        entryEditorTabs.add(new OtherFieldsTab(databaseContext, libraryTab.getSuggestionProviders(), undoManager, dialogService, preferencesService, stateManager, themeManager, libraryTab.getIndexingTaskManager(), bibEntryTypesManager, taskExecutor, journalAbbreviationRepository));
+        entryEditorTabs.add(
+            new RequiredFieldsTab(
+                databaseContext,
+                libraryTab.getSuggestionProviders(),
+                undoManager,
+                dialogService,
+                preferencesService,
+                stateManager,
+                themeManager,
+                libraryTab.getIndexingTaskManager(),
+                bibEntryTypesManager,
+                taskExecutor,
+                journalAbbreviationRepository
+            )
+        );
+        entryEditorTabs.add(
+            new OptionalFieldsTab(
+                databaseContext,
+                libraryTab.getSuggestionProviders(),
+                undoManager,
+                dialogService,
+                preferencesService,
+                stateManager,
+                themeManager,
+                libraryTab.getIndexingTaskManager(),
+                bibEntryTypesManager,
+                taskExecutor,
+                journalAbbreviationRepository
+            )
+        );
+        entryEditorTabs.add(
+            new OptionalFields2Tab(
+                databaseContext,
+                libraryTab.getSuggestionProviders(),
+                undoManager,
+                dialogService,
+                preferencesService,
+                stateManager,
+                themeManager,
+                libraryTab.getIndexingTaskManager(),
+                bibEntryTypesManager,
+                taskExecutor,
+                journalAbbreviationRepository
+            )
+        );
+        entryEditorTabs.add(
+            new DeprecatedFieldsTab(
+                databaseContext,
+                libraryTab.getSuggestionProviders(),
+                undoManager,
+                dialogService,
+                preferencesService,
+                stateManager,
+                themeManager,
+                libraryTab.getIndexingTaskManager(),
+                bibEntryTypesManager,
+                taskExecutor,
+                journalAbbreviationRepository
+            )
+        );
+        entryEditorTabs.add(
+            new OtherFieldsTab(
+                databaseContext,
+                libraryTab.getSuggestionProviders(),
+                undoManager,
+                dialogService,
+                preferencesService,
+                stateManager,
+                themeManager,
+                libraryTab.getIndexingTaskManager(),
+                bibEntryTypesManager,
+                taskExecutor,
+                journalAbbreviationRepository
+            )
+        );
 
         // Comment Tab: Tab for general and user-specific comments
-        entryEditorTabs.add(new CommentsTab(preferencesService, databaseContext, libraryTab.getSuggestionProviders(), undoManager, dialogService, stateManager, themeManager, libraryTab.getIndexingTaskManager(), taskExecutor, journalAbbreviationRepository));
+        entryEditorTabs.add(
+            new CommentsTab(
+                preferencesService,
+                databaseContext,
+                libraryTab.getSuggestionProviders(),
+                undoManager,
+                dialogService,
+                stateManager,
+                themeManager,
+                libraryTab.getIndexingTaskManager(),
+                taskExecutor,
+                journalAbbreviationRepository
+            )
+        );
 
         // General fields from preferences
         // First, remove all tabs that are already handled above or below; except for the source tab (which has different titles for BibTeX and BibLaTeX mode)
-        Map<String, Set<Field>> entryEditorTabList = new HashMap<>(entryEditorPreferences.getEntryEditorTabs());
+        Map<String, Set<Field>> entryEditorTabList = new HashMap<>(
+            entryEditorPreferences.getEntryEditorTabs()
+        );
         entryEditorTabList.remove(PreviewTab.NAME);
         entryEditorTabList.remove(RequiredFieldsTab.NAME);
         entryEditorTabList.remove(OptionalFieldsTab.NAME);
@@ -276,18 +441,56 @@ private List<EntryEditorTab> createTabs() {
         entryEditorTabList.remove(SciteTab.NAME);
         entryEditorTabList.remove("Comments");
         // Then show the remaining configured
-        for (Map.Entry<String, Set<Field>> tab : entryEditorTabList.entrySet()) {
-            entryEditorTabs.add(new UserDefinedFieldsTab(tab.getKey(), tab.getValue(), databaseContext, libraryTab.getSuggestionProviders(), undoManager, dialogService, preferencesService, stateManager, themeManager, libraryTab.getIndexingTaskManager(), taskExecutor, journalAbbreviationRepository));
+        for (Map.Entry<
+            String,
+            Set<Field>
+        > tab : entryEditorTabList.entrySet()) {
+            entryEditorTabs.add(
+                new UserDefinedFieldsTab(
+                    tab.getKey(),
+                    tab.getValue(),
+                    databaseContext,
+                    libraryTab.getSuggestionProviders(),
+                    undoManager,
+                    dialogService,
+                    preferencesService,
+                    stateManager,
+                    themeManager,
+                    libraryTab.getIndexingTaskManager(),
+                    taskExecutor,
+                    journalAbbreviationRepository
+                )
+            );
         }
 
         // "Special" tabs
         entryEditorTabs.add(new MathSciNetTab());
-        entryEditorTabs.add(new FileAnnotationTab(libraryTab.getAnnotationCache()));
-        entryEditorTabs.add(new RelatedArticlesTab(entryEditorPreferences, preferencesService, dialogService, taskExecutor));
-        entryEditorTabs.add(new CitationRelationsTab(entryEditorPreferences, dialogService, databaseContext,
-                undoManager, stateManager, fileMonitor, preferencesService, libraryTab));
+        entryEditorTabs.add(
+            new FileAnnotationTab(libraryTab.getAnnotationCache())
+        );
+        entryEditorTabs.add(
+            new RelatedArticlesTab(
+                entryEditorPreferences,
+                preferencesService,
+                dialogService,
+                taskExecutor
+            )
+        );
+        entryEditorTabs.add(
+            new CitationRelationsTab(
+                entryEditorPreferences,
+                dialogService,
+                databaseContext,
+                undoManager,
+                stateManager,
+                fileMonitor,
+                preferencesService,
+                libraryTab
+            )
+        );
 
-        sourceTab = new SourceTab(
+        sourceTab =
+            new SourceTab(
                 databaseContext,
                 undoManager,
                 preferencesService.getFieldPreferences(),
@@ -296,20 +499,40 @@ private List<EntryEditorTab> createTabs() {
                 dialogService,
                 stateManager,
                 bibEntryTypesManager,
-                keyBindingRepository);
+                keyBindingRepository
+            );
         entryEditorTabs.add(sourceTab);
 
-        entryEditorTabs.add(new LatexCitationsTab(databaseContext, preferencesService, taskExecutor, dialogService));
-
-        entryEditorTabs.add(new FulltextSearchResultsTab(stateManager, preferencesService, dialogService, taskExecutor));
+        entryEditorTabs.add(
+            new LatexCitationsTab(
+                databaseContext,
+                preferencesService,
+                taskExecutor,
+                dialogService
+            )
+        );
+
+        entryEditorTabs.add(
+            new FulltextSearchResultsTab(
+                stateManager,
+                preferencesService,
+                dialogService,
+                taskExecutor
+            )
+        );
 
-        entryEditorTabs.add(new SciteTab(preferencesService, taskExecutor, dialogService));
+        entryEditorTabs.add(
+            new SciteTab(preferencesService, taskExecutor, dialogService)
+        );
 
         return entryEditorTabs;
     }
 
     private void recalculateVisibleTabs() {
-        List<Tab> visibleTabs = tabs.stream().filter(tab -> tab.shouldShow(entry)).collect(Collectors.toList());
+        List<Tab> visibleTabs = tabs
+            .stream()
+            .filter(tab -> tab.shouldShow(entry))
+            .collect(Collectors.toList());
 
         // Start of ugly hack:
         // We need to find out, which tabs will be shown and which not and remove and re-add the appropriate tabs
@@ -318,7 +541,10 @@ private void recalculateVisibleTabs() {
         // 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 = tabs.stream().filter(tab -> !tab.shouldShow(entry)).toList();
+        List<EntryEditorTab> toBeRemoved = tabs
+            .stream()
+            .filter(tab -> !tab.shouldShow(entry))
+            .toList();
         tabbed.getTabs().removeAll(toBeRemoved);
 
         // Next add all the visible tabs (if not already present) at the right position
@@ -357,8 +583,12 @@ public void setEntry(BibEntry entry) {
         this.entry = entry;
 
         recalculateVisibleTabs();
-        EasyBind.listen(preferencesService.getPreviewPreferences().showPreviewAsExtraTabProperty(),
-                (obs, oldValue, newValue) -> recalculateVisibleTabs());
+        EasyBind.listen(
+            preferencesService
+                .getPreviewPreferences()
+                .showPreviewAsExtraTabProperty(),
+            (obs, oldValue, newValue) -> recalculateVisibleTabs()
+        );
 
         if (entryEditorPreferences.showSourceTabByDefault()) {
             tabbed.getSelectionModel().select(sourceTab);
@@ -370,11 +600,18 @@ public void setEntry(BibEntry entry) {
         setupToolBar();
 
         // Subscribe to type changes for rebuilding the currently visible tab
-        typeSubscription = EasyBind.subscribe(this.entry.typeProperty(), type -> {
-            typeLabel.setText(new TypedBibEntry(entry, databaseContext.getMode()).getTypeForDisplay());
-            recalculateVisibleTabs();
-            getSelectedTab().notifyAboutFocus(entry);
-        });
+        typeSubscription =
+            EasyBind.subscribe(
+                this.entry.typeProperty(),
+                type -> {
+                    typeLabel.setText(
+                        new TypedBibEntry(entry, databaseContext.getMode())
+                            .getTypeForDisplay()
+                    );
+                    recalculateVisibleTabs();
+                    getSelectedTab().notifyAboutFocus(entry);
+                }
+            );
     }
 
     private EntryEditorTab getSelectedTab() {
@@ -383,32 +620,55 @@ private EntryEditorTab getSelectedTab() {
 
     private void setupToolBar() {
         // Update type label
-        TypedBibEntry typedEntry = new TypedBibEntry(entry, databaseContext.getMode());
+        TypedBibEntry typedEntry = new TypedBibEntry(
+            entry,
+            databaseContext.getMode()
+        );
         typeLabel.setText(typedEntry.getTypeForDisplay());
 
         // Add type change menu
-        ContextMenu typeMenu = new ChangeEntryTypeMenu(Collections.singletonList(entry), databaseContext, undoManager, keyBindingRepository, bibEntryTypesManager).asContextMenu();
-        typeLabel.setOnMouseClicked(event -> typeMenu.show(typeLabel, Side.RIGHT, 0, 0));
-        typeChangeButton.setOnMouseClicked(event -> typeMenu.show(typeChangeButton, Side.RIGHT, 0, 0));
+        ContextMenu typeMenu = new ChangeEntryTypeMenu(
+            Collections.singletonList(entry),
+            databaseContext,
+            undoManager,
+            keyBindingRepository,
+            bibEntryTypesManager
+        )
+            .asContextMenu();
+        typeLabel.setOnMouseClicked(event ->
+            typeMenu.show(typeLabel, 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(
+        SortedSet<EntryBasedFetcher> entryBasedFetchers =
+            WebFetchers.getEntryBasedFetchers(
                 preferencesService.getImporterPreferences(),
                 preferencesService.getImportFormatPreferences(),
                 preferencesService.getFilePreferences(),
-                databaseContext);
+                databaseContext
+            );
         for (EntryBasedFetcher fetcher : entryBasedFetchers) {
             MenuItem fetcherMenuItem = new MenuItem(fetcher.getName());
-            if (fetcher instanceof PdfMergeMetadataImporter.EntryBasedFetcherWrapper) {
+            if (
+                fetcher instanceof
+                PdfMergeMetadataImporter.EntryBasedFetcherWrapper
+            ) {
                 // Handle Grobid Opt-In in case of the PdfMergeMetadataImporter
                 fetcherMenuItem.setOnAction(event -> {
-                    GrobidOptInDialogHelper.showAndWaitIfUserIsUndecided(dialogService, preferencesService.getGrobidPreferences());
+                    GrobidOptInDialogHelper.showAndWaitIfUserIsUndecided(
+                        dialogService,
+                        preferencesService.getGrobidPreferences()
+                    );
                     PdfMergeMetadataImporter.EntryBasedFetcherWrapper pdfMergeMetadataImporter =
-                            new PdfMergeMetadataImporter.EntryBasedFetcherWrapper(
-                                    preferencesService.getImportFormatPreferences(),
-                                    preferencesService.getFilePreferences(),
-                                    databaseContext);
+                        new PdfMergeMetadataImporter.EntryBasedFetcherWrapper(
+                            preferencesService.getImportFormatPreferences(),
+                            preferencesService.getFilePreferences(),
+                            databaseContext
+                        );
                     fetchAndMerge(pdfMergeMetadataImporter);
                 });
             } else {
@@ -417,18 +677,29 @@ private void setupToolBar() {
             fetcherMenu.getItems().add(fetcherMenuItem);
         }
 
-        fetcherButton.setOnMouseClicked(event -> fetcherMenu.show(fetcherButton, Side.RIGHT, 0, 0));
+        fetcherButton.setOnMouseClicked(event ->
+            fetcherMenu.show(fetcherButton, Side.RIGHT, 0, 0)
+        );
     }
 
     private void fetchAndMerge(EntryBasedFetcher fetcher) {
-        new FetchAndMergeEntry(libraryTab.getBibDatabaseContext(), taskExecutor, preferencesService, dialogService, undoManager).fetchAndMerge(entry, fetcher);
+        new FetchAndMergeEntry(
+            libraryTab.getBibDatabaseContext(),
+            taskExecutor,
+            preferencesService,
+            dialogService,
+            undoManager
+        )
+            .fetchAndMerge(entry, fetcher);
     }
 
     public void setFocusToField(Field field) {
         DefaultTaskExecutor.runInJavaFXThread(() -> {
             for (Tab tab : tabbed.getTabs()) {
-                if ((tab instanceof FieldsEditorTab fieldsEditorTab)
-                        && fieldsEditorTab.getShownFields().contains(field)) {
+                if (
+                    (tab instanceof FieldsEditorTab fieldsEditorTab) &&
+                    fieldsEditorTab.getShownFields().contains(field)
+                ) {
                     tabbed.getSelectionModel().select(tab);
                     fieldsEditorTab.requestFocus(field);
                 }
diff --git a/src/main/java/org/jabref/gui/entryeditor/EntryEditorPreferences.java b/src/main/java/org/jabref/gui/entryeditor/EntryEditorPreferences.java
index c2afea3b0af..c8633710c34 100644
--- a/src/main/java/org/jabref/gui/entryeditor/EntryEditorPreferences.java
+++ b/src/main/java/org/jabref/gui/entryeditor/EntryEditorPreferences.java
@@ -2,7 +2,6 @@
 
 import java.util.Map;
 import java.util.Set;
-
 import javafx.beans.property.BooleanProperty;
 import javafx.beans.property.DoubleProperty;
 import javafx.beans.property.MapProperty;
@@ -13,7 +12,6 @@
 import javafx.beans.property.SimpleObjectProperty;
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableMap;
-
 import org.jabref.model.entry.field.Field;
 
 public class EntryEditorPreferences {
@@ -32,7 +30,9 @@ public static JournalPopupEnabled fromString(String status) {
                     return value;
                 }
             }
-            throw new IllegalArgumentException("No enum found with value: " + status);
+            throw new IllegalArgumentException(
+                "No enum found with value: " + status
+            );
         }
     }
 
@@ -49,27 +49,39 @@ public static JournalPopupEnabled fromString(String status) {
     private final ObjectProperty<JournalPopupEnabled> enablementStatus;
     private final BooleanProperty shouldShowSciteTab;
 
-    public EntryEditorPreferences(Map<String, Set<Field>> entryEditorTabList,
-                                  Map<String, Set<Field>> defaultEntryEditorTabList,
-                                  boolean shouldOpenOnNewEntry,
-                                  boolean shouldShowRecommendationsTab,
-                                  boolean shouldShowLatexCitationsTab,
-                                  boolean showSourceTabByDefault,
-                                  boolean enableValidation,
-                                  boolean allowIntegerEditionBibtex,
-                                  double dividerPosition,
-                                  boolean autolinkFilesEnabled,
-                                  JournalPopupEnabled journalPopupEnabled,
-                                  boolean showSciteTab) {
-
-        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.shouldShowLatexCitationsTab = new SimpleBooleanProperty(shouldShowLatexCitationsTab);
-        this.showSourceTabByDefault = new SimpleBooleanProperty(showSourceTabByDefault);
+    public EntryEditorPreferences(
+        Map<String, Set<Field>> entryEditorTabList,
+        Map<String, Set<Field>> defaultEntryEditorTabList,
+        boolean shouldOpenOnNewEntry,
+        boolean shouldShowRecommendationsTab,
+        boolean shouldShowLatexCitationsTab,
+        boolean showSourceTabByDefault,
+        boolean enableValidation,
+        boolean allowIntegerEditionBibtex,
+        double dividerPosition,
+        boolean autolinkFilesEnabled,
+        JournalPopupEnabled journalPopupEnabled,
+        boolean showSciteTab
+    ) {
+        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.shouldShowLatexCitationsTab =
+            new SimpleBooleanProperty(shouldShowLatexCitationsTab);
+        this.showSourceTabByDefault =
+            new SimpleBooleanProperty(showSourceTabByDefault);
         this.enableValidation = new SimpleBooleanProperty(enableValidation);
-        this.allowIntegerEditionBibtex = new SimpleBooleanProperty(allowIntegerEditionBibtex);
+        this.allowIntegerEditionBibtex =
+            new SimpleBooleanProperty(allowIntegerEditionBibtex);
         this.dividerPosition = new SimpleDoubleProperty(dividerPosition);
         this.autoLinkFiles = new SimpleBooleanProperty(autolinkFilesEnabled);
         this.enablementStatus = new SimpleObjectProperty<>(journalPopupEnabled);
@@ -84,8 +96,12 @@ public MapProperty<String, Set<Field>> entryEditorTabs() {
         return entryEditorTabList;
     }
 
-    public void setEntryEditorTabList(Map<String, Set<Field>> entryEditorTabList) {
-        this.entryEditorTabList.set(FXCollections.observableMap(entryEditorTabList));
+    public void setEntryEditorTabList(
+        Map<String, Set<Field>> entryEditorTabList
+    ) {
+        this.entryEditorTabList.set(
+                FXCollections.observableMap(entryEditorTabList)
+            );
     }
 
     public ObservableMap<String, Set<Field>> getDefaultEntryEditorTabs() {
@@ -112,7 +128,9 @@ public BooleanProperty shouldShowRecommendationsTabProperty() {
         return shouldShowRecommendationsTab;
     }
 
-    public void setShouldShowRecommendationsTab(boolean shouldShowRecommendationsTab) {
+    public void setShouldShowRecommendationsTab(
+        boolean shouldShowRecommendationsTab
+    ) {
         this.shouldShowRecommendationsTab.set(shouldShowRecommendationsTab);
     }
 
@@ -124,7 +142,9 @@ public BooleanProperty shouldShowLatexCitationsTabProperty() {
         return shouldShowLatexCitationsTab;
     }
 
-    public void setShouldShowLatexCitationsTab(boolean shouldShowLatexCitationsTab) {
+    public void setShouldShowLatexCitationsTab(
+        boolean shouldShowLatexCitationsTab
+    ) {
         this.shouldShowLatexCitationsTab.set(shouldShowLatexCitationsTab);
     }
 
@@ -160,7 +180,9 @@ public BooleanProperty allowIntegerEditionBibtexProperty() {
         return allowIntegerEditionBibtex;
     }
 
-    public void setAllowIntegerEditionBibtex(boolean allowIntegerEditionBibtex) {
+    public void setAllowIntegerEditionBibtex(
+        boolean allowIntegerEditionBibtex
+    ) {
         this.allowIntegerEditionBibtex.set(allowIntegerEditionBibtex);
     }
 
diff --git a/src/main/java/org/jabref/gui/entryeditor/EntryEditorTab.java b/src/main/java/org/jabref/gui/entryeditor/EntryEditorTab.java
index 6433f21c6b9..a91f6d6701b 100644
--- a/src/main/java/org/jabref/gui/entryeditor/EntryEditorTab.java
+++ b/src/main/java/org/jabref/gui/entryeditor/EntryEditorTab.java
@@ -1,7 +1,6 @@
 package org.jabref.gui.entryeditor;
 
 import javafx.scene.control.Tab;
-
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.types.EntryType;
 
@@ -36,7 +35,10 @@ protected void handleFocus() {
      * Notifies the tab that it got focus and should display the given entry.
      */
     public void notifyAboutFocus(BibEntry entry) {
-        if (!entry.equals(currentEntry) || !entry.getType().equals(currentEntryType)) {
+        if (
+            !entry.equals(currentEntry) ||
+            !entry.getType().equals(currentEntryType)
+        ) {
             currentEntry = entry;
             currentEntryType = entry.getType();
             bindToEntry(entry);
diff --git a/src/main/java/org/jabref/gui/entryeditor/FieldsEditorTab.java b/src/main/java/org/jabref/gui/entryeditor/FieldsEditorTab.java
index 780af05c3c4..6e8efb2843a 100644
--- a/src/main/java/org/jabref/gui/entryeditor/FieldsEditorTab.java
+++ b/src/main/java/org/jabref/gui/entryeditor/FieldsEditorTab.java
@@ -1,5 +1,6 @@
 package org.jabref.gui.entryeditor;
 
+import com.tobiasdiez.easybind.EasyBind;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.LinkedHashMap;
@@ -8,9 +9,6 @@
 import java.util.Objects;
 import java.util.Set;
 import java.util.stream.Stream;
-
-import javax.swing.undo.UndoManager;
-
 import javafx.geometry.VPos;
 import javafx.scene.Node;
 import javafx.scene.Parent;
@@ -22,7 +20,7 @@
 import javafx.scene.layout.Priority;
 import javafx.scene.layout.Region;
 import javafx.scene.layout.RowConstraints;
-
+import javax.swing.undo.UndoManager;
 import org.jabref.gui.DialogService;
 import org.jabref.gui.StateManager;
 import org.jabref.gui.autocompleter.SuggestionProviders;
@@ -39,12 +37,11 @@
 import org.jabref.model.entry.field.Field;
 import org.jabref.preferences.PreferencesService;
 
-import com.tobiasdiez.easybind.EasyBind;
-
 /**
  * A single tab displayed in the EntryEditor holding several FieldEditors.
  */
 abstract class FieldsEditorTab extends EntryEditorTab {
+
     protected final BibDatabaseContext databaseContext;
     protected final Map<Field, FieldEditorFX> editors = new LinkedHashMap<>();
     private final boolean isCompressed;
@@ -61,17 +58,19 @@ abstract class FieldsEditorTab extends EntryEditorTab {
     private Collection<Field> fields = new ArrayList<>();
     private GridPane gridPane;
 
-    public FieldsEditorTab(boolean compressed,
-                           BibDatabaseContext databaseContext,
-                           SuggestionProviders suggestionProviders,
-                           UndoManager undoManager,
-                           DialogService dialogService,
-                           PreferencesService preferences,
-                           StateManager stateManager,
-                           ThemeManager themeManager,
-                           TaskExecutor taskExecutor,
-                           JournalAbbreviationRepository journalAbbreviationRepository,
-                           IndexingTaskManager indexingTaskManager) {
+    public FieldsEditorTab(
+        boolean compressed,
+        BibDatabaseContext databaseContext,
+        SuggestionProviders suggestionProviders,
+        UndoManager undoManager,
+        DialogService dialogService,
+        PreferencesService preferences,
+        StateManager stateManager,
+        ThemeManager themeManager,
+        TaskExecutor taskExecutor,
+        JournalAbbreviationRepository journalAbbreviationRepository,
+        IndexingTaskManager indexingTaskManager
+    ) {
         this.isCompressed = compressed;
         this.databaseContext = Objects.requireNonNull(databaseContext);
         this.suggestionProviders = Objects.requireNonNull(suggestionProviders);
@@ -80,16 +79,25 @@ public FieldsEditorTab(boolean compressed,
         this.preferences = Objects.requireNonNull(preferences);
         this.themeManager = themeManager;
         this.taskExecutor = Objects.requireNonNull(taskExecutor);
-        this.journalAbbreviationRepository = Objects.requireNonNull(journalAbbreviationRepository);
+        this.journalAbbreviationRepository =
+            Objects.requireNonNull(journalAbbreviationRepository);
         this.stateManager = stateManager;
         this.indexingTaskManager = indexingTaskManager;
     }
 
-    private static void addColumn(GridPane gridPane, int columnIndex, List<Label> nodes) {
+    private static void addColumn(
+        GridPane gridPane,
+        int columnIndex,
+        List<Label> nodes
+    ) {
         gridPane.addColumn(columnIndex, nodes.toArray(new Node[0]));
     }
 
-    private static void addColumn(GridPane gridPane, int columnIndex, Stream<Parent> nodes) {
+    private static void addColumn(
+        GridPane gridPane,
+        int columnIndex,
+        Stream<Parent> nodes
+    ) {
         gridPane.addColumn(columnIndex, nodes.toArray(Node[]::new));
     }
 
@@ -110,15 +118,16 @@ protected void setupPanel(BibEntry entry, boolean compressed) {
         List<Label> labels = new ArrayList<>();
         for (Field field : fields) {
             FieldEditorFX fieldEditor = FieldEditors.getForField(
-                    field,
-                    taskExecutor,
-                    dialogService,
-                    journalAbbreviationRepository,
-                    preferences,
-                    databaseContext,
-                    entry.getType(),
-                    suggestionProviders,
-                    undoManager);
+                field,
+                taskExecutor,
+                dialogService,
+                journalAbbreviationRepository,
+                preferences,
+                databaseContext,
+                entry.getType(),
+                suggestionProviders,
+                undoManager
+            );
             fieldEditor.bindToEntry(entry);
 
             editors.put(field, fieldEditor);
@@ -136,35 +145,63 @@ protected void setupPanel(BibEntry entry, boolean compressed) {
 
             addColumn(gridPane, 0, labels.subList(0, rows));
             addColumn(gridPane, 3, labels.subList(rows, labels.size()));
-            addColumn(gridPane, 1, editors.values().stream().map(FieldEditorFX::getNode).limit(rows));
-            addColumn(gridPane, 4, editors.values().stream().map(FieldEditorFX::getNode).skip(rows));
+            addColumn(
+                gridPane,
+                1,
+                editors
+                    .values()
+                    .stream()
+                    .map(FieldEditorFX::getNode)
+                    .limit(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 {
             addColumn(gridPane, 0, labels);
-            addColumn(gridPane, 1, editors.values().stream().map(FieldEditorFX::getNode));
+            addColumn(
+                gridPane,
+                1,
+                editors.values().stream().map(FieldEditorFX::getNode)
+            );
 
-            gridPane.getColumnConstraints().addAll(columnDoNotContract, columnExpand);
+            gridPane
+                .getColumnConstraints()
+                .addAll(columnDoNotContract, columnExpand);
 
             setRegularRowLayout(gridPane);
         }
     }
 
     private void setRegularRowLayout(GridPane gridPane) {
-        double totalWeight = fields.stream()
-                                   .mapToDouble(field -> editors.get(field).getWeight())
-                                   .sum();
+        double totalWeight = fields
+            .stream()
+            .mapToDouble(field -> editors.get(field).getWeight())
+            .sum();
 
         List<RowConstraints> constraints = new ArrayList<>();
         for (Field field : fields) {
             RowConstraints rowExpand = new RowConstraints();
             rowExpand.setVgrow(Priority.ALWAYS);
             rowExpand.setValignment(VPos.TOP);
-            rowExpand.setPercentHeight(100 * editors.get(field).getWeight() / totalWeight);
+            rowExpand.setPercentHeight(
+                (100 * editors.get(field).getWeight()) / totalWeight
+            );
             constraints.add(rowExpand);
         }
         gridPane.getRowConstraints().addAll(constraints);
@@ -238,7 +275,8 @@ private void initPanel() {
             scrollPane.setFitToHeight(true);
 
             SplitPane container = new SplitPane(scrollPane);
-            previewPanel = new PreviewPanel(
+            previewPanel =
+                new PreviewPanel(
                     databaseContext,
                     dialogService,
                     preferences.getKeyBindingRepository(),
@@ -246,14 +284,20 @@ private void initPanel() {
                     stateManager,
                     themeManager,
                     indexingTaskManager,
-                    taskExecutor);
-            EasyBind.subscribe(preferences.getPreviewPreferences().showPreviewAsExtraTabProperty(), show -> {
-                if (show) {
-                    container.getItems().remove(previewPanel);
-                } else {
-                    container.getItems().add(1, previewPanel);
+                    taskExecutor
+                );
+            EasyBind.subscribe(
+                preferences
+                    .getPreviewPreferences()
+                    .showPreviewAsExtraTabProperty(),
+                show -> {
+                    if (show) {
+                        container.getItems().remove(previewPanel);
+                    } else {
+                        container.getItems().add(1, previewPanel);
+                    }
                 }
-            });
+            );
             setContent(container);
         }
     }
diff --git a/src/main/java/org/jabref/gui/entryeditor/LatexCitationsTab.java b/src/main/java/org/jabref/gui/entryeditor/LatexCitationsTab.java
index fd3b47a43f9..d5f2dd1ea0e 100644
--- a/src/main/java/org/jabref/gui/entryeditor/LatexCitationsTab.java
+++ b/src/main/java/org/jabref/gui/entryeditor/LatexCitationsTab.java
@@ -1,5 +1,6 @@
 package org.jabref.gui.entryeditor;
 
+import com.tobiasdiez.easybind.EasyBind;
 import javafx.geometry.HPos;
 import javafx.geometry.Pos;
 import javafx.scene.control.Button;
@@ -13,7 +14,6 @@
 import javafx.scene.layout.RowConstraints;
 import javafx.scene.layout.VBox;
 import javafx.scene.text.Text;
-
 import org.jabref.gui.DialogService;
 import org.jabref.gui.icon.IconTheme;
 import org.jabref.gui.texparser.CitationsDisplay;
@@ -23,8 +23,6 @@
 import org.jabref.model.entry.BibEntry;
 import org.jabref.preferences.PreferencesService;
 
-import com.tobiasdiez.easybind.EasyBind;
-
 public class LatexCitationsTab extends EntryEditorTab {
 
     public static final String NAME = "LaTeX Citations";
@@ -33,22 +31,40 @@ public class LatexCitationsTab extends EntryEditorTab {
     private final ProgressIndicator progressIndicator;
     private final CitationsDisplay citationsDisplay;
 
-    public LatexCitationsTab(BibDatabaseContext databaseContext, PreferencesService preferencesService,
-                             TaskExecutor taskExecutor, DialogService dialogService) {
-        this.viewModel = new LatexCitationsTabViewModel(databaseContext, preferencesService, taskExecutor, dialogService);
+    public LatexCitationsTab(
+        BibDatabaseContext databaseContext,
+        PreferencesService preferencesService,
+        TaskExecutor taskExecutor,
+        DialogService dialogService
+    ) {
+        this.viewModel =
+            new LatexCitationsTabViewModel(
+                databaseContext,
+                preferencesService,
+                taskExecutor,
+                dialogService
+            );
         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();
     }
 
     private void setSearchPane() {
         progressIndicator.setMaxSize(100, 100);
-        citationsDisplay.basePathProperty().bindBidirectional(viewModel.directoryProperty());
+        citationsDisplay
+            .basePathProperty()
+            .bindBidirectional(viewModel.directoryProperty());
         citationsDisplay.setItems(viewModel.getCitationList());
 
         RowConstraints mainRow = new RowConstraints();
@@ -66,34 +82,53 @@ private void setSearchPane() {
         searchPane.setId("citationsPane");
         setContent(searchPane);
 
-        EasyBind.subscribe(viewModel.statusProperty(), status -> {
-            searchPane.getChildren().clear();
-            switch (status) {
-                case IN_PROGRESS:
-                    searchPane.add(progressIndicator, 0, 0);
-                    break;
-                case CITATIONS_FOUND:
-                    searchPane.add(getCitationsPane(), 0, 0);
-                    break;
-                case NO_RESULTS:
-                    searchPane.add(getNotFoundPane(), 0, 0);
-                    break;
-                case ERROR:
-                    searchPane.add(getErrorPane(), 0, 0);
-                    break;
+        EasyBind.subscribe(
+            viewModel.statusProperty(),
+            status -> {
+                searchPane.getChildren().clear();
+                switch (status) {
+                    case IN_PROGRESS:
+                        searchPane.add(progressIndicator, 0, 0);
+                        break;
+                    case CITATIONS_FOUND:
+                        searchPane.add(getCitationsPane(), 0, 0);
+                        break;
+                    case NO_RESULTS:
+                        searchPane.add(getNotFoundPane(), 0, 0);
+                        break;
+                    case ERROR:
+                        searchPane.add(getErrorPane(), 0, 0);
+                        break;
+                }
+                searchPane.add(getLatexDirectoryBox(), 0, 1);
             }
-            searchPane.add(getLatexDirectoryBox(), 0, 1);
-        });
+        );
     }
 
     private HBox getLatexDirectoryBox() {
-        Text latexDirectoryText = new Text(Localization.lang("Current search directory:"));
-        Text latexDirectoryPath = new Text(viewModel.directoryProperty().get().toString());
-        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.setOnAction(event -> viewModel.setLatexDirectory());
-        HBox latexDirectoryBox = new HBox(10, latexDirectoryText, latexDirectoryPath, latexDirectoryButton);
+        Text latexDirectoryText = new Text(
+            Localization.lang("Current search directory:")
+        );
+        Text latexDirectoryPath = new Text(
+            viewModel.directoryProperty().get().toString()
+        );
+        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.setOnAction(event -> viewModel.setLatexDirectory()
+        );
+        HBox latexDirectoryBox = new HBox(
+            10,
+            latexDirectoryText,
+            latexDirectoryPath,
+            latexDirectoryButton
+        );
         latexDirectoryBox.setAlignment(Pos.CENTER);
         return latexDirectoryBox;
     }
@@ -108,7 +143,11 @@ 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);
@@ -118,7 +157,9 @@ 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(viewModel.searchErrorProperty().get());
         VBox errorMessageBox = new VBox(30, titleLabel, errorMessageText);
         errorMessageBox.setStyle("-fx-padding: 30 0 0 30;");
diff --git a/src/main/java/org/jabref/gui/entryeditor/LatexCitationsTabViewModel.java b/src/main/java/org/jabref/gui/entryeditor/LatexCitationsTabViewModel.java
index 8d094f598fd..e5a8bd4174a 100644
--- a/src/main/java/org/jabref/gui/entryeditor/LatexCitationsTabViewModel.java
+++ b/src/main/java/org/jabref/gui/entryeditor/LatexCitationsTabViewModel.java
@@ -7,7 +7,6 @@
 import java.util.List;
 import java.util.Optional;
 import java.util.concurrent.Future;
-
 import javafx.beans.property.ObjectProperty;
 import javafx.beans.property.ReadOnlyListWrapper;
 import javafx.beans.property.SimpleObjectProperty;
@@ -15,7 +14,6 @@
 import javafx.beans.property.StringProperty;
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableList;
-
 import org.jabref.gui.AbstractViewModel;
 import org.jabref.gui.DialogService;
 import org.jabref.gui.util.BackgroundTask;
@@ -29,7 +27,6 @@
 import org.jabref.model.texparser.Citation;
 import org.jabref.model.texparser.LatexParserResult;
 import org.jabref.preferences.PreferencesService;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -39,10 +36,12 @@ enum Status {
         IN_PROGRESS,
         CITATIONS_FOUND,
         NO_RESULTS,
-        ERROR
+        ERROR,
     }
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(LatexCitationsTabViewModel.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(
+        LatexCitationsTabViewModel.class
+    );
     private static final String TEX_EXT = ".tex";
     private final BibDatabaseContext databaseContext;
     private final PreferencesService preferencesService;
@@ -56,16 +55,32 @@ enum Status {
     private LatexParserResult latexParserResult;
     private BibEntry currentEntry;
 
-    public LatexCitationsTabViewModel(BibDatabaseContext databaseContext,
-                                      PreferencesService preferencesService,
-                                      TaskExecutor taskExecutor,
-                                      DialogService dialogService) {
+    public LatexCitationsTabViewModel(
+        BibDatabaseContext databaseContext,
+        PreferencesService preferencesService,
+        TaskExecutor taskExecutor,
+        DialogService dialogService
+    ) {
         this.databaseContext = databaseContext;
         this.preferencesService = preferencesService;
         this.taskExecutor = taskExecutor;
         this.dialogService = dialogService;
-        this.directory = new SimpleObjectProperty<>(databaseContext.getMetaData().getLatexFileDirectory(preferencesService.getFilePreferences().getUserAndHost())
-                                                                   .orElse(FileUtil.getInitialDirectory(databaseContext, preferencesService.getFilePreferences().getWorkingDirectory())));
+        this.directory =
+            new SimpleObjectProperty<>(
+                databaseContext
+                    .getMetaData()
+                    .getLatexFileDirectory(
+                        preferencesService.getFilePreferences().getUserAndHost()
+                    )
+                    .orElse(
+                        FileUtil.getInitialDirectory(
+                            databaseContext,
+                            preferencesService
+                                .getFilePreferences()
+                                .getWorkingDirectory()
+                        )
+                    )
+            );
         this.citationList = FXCollections.observableArrayList();
         this.status = new SimpleObjectProperty<>(Status.IN_PROGRESS);
         this.searchError = new SimpleStringProperty("");
@@ -80,7 +95,11 @@ public void init(BibEntry entry) {
         if (citeKey.isPresent()) {
             startSearch(citeKey.get());
         } 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);
         }
     }
@@ -102,21 +121,31 @@ public StringProperty searchErrorProperty() {
     }
 
     private void startSearch(String citeKey) {
-        searchTask = BackgroundTask.wrap(() -> searchAndParse(citeKey))
-                                   .onRunning(() -> status.set(Status.IN_PROGRESS))
-                                   .onSuccess(result -> {
-                                       citationList.setAll(result);
-                                       status.set(citationList.isEmpty() ? Status.NO_RESULTS : Status.CITATIONS_FOUND);
-                                   })
-                                   .onFailure(error -> {
-                                       searchError.set(error.getMessage());
-                                       status.set(Status.ERROR);
-                                   })
-                                   .executeWith(taskExecutor);
+        searchTask =
+            BackgroundTask
+                .wrap(() -> searchAndParse(citeKey))
+                .onRunning(() -> status.set(Status.IN_PROGRESS))
+                .onSuccess(result -> {
+                    citationList.setAll(result);
+                    status.set(
+                        citationList.isEmpty()
+                            ? Status.NO_RESULTS
+                            : Status.CITATIONS_FOUND
+                    );
+                })
+                .onFailure(error -> {
+                    searchError.set(error.getMessage());
+                    status.set(Status.ERROR);
+                })
+                .executeWith(taskExecutor);
     }
 
     private void cancelSearch() {
-        if (searchTask == null || searchTask.isCancelled() || searchTask.isDone()) {
+        if (
+            searchTask == null ||
+            searchTask.isCancelled() ||
+            searchTask.isDone()
+        ) {
             return;
         }
 
@@ -124,16 +153,35 @@ private void cancelSearch() {
         searchTask.cancel(true);
     }
 
-    private Collection<Citation> searchAndParse(String citeKey) throws IOException {
+    private Collection<Citation> searchAndParse(String citeKey)
+        throws IOException {
         // we need to check whether the user meanwhile set the LaTeX file directory or the database changed locations
-        Path newDirectory = databaseContext.getMetaData().getLatexFileDirectory(preferencesService.getFilePreferences().getUserAndHost())
-                                           .orElse(FileUtil.getInitialDirectory(databaseContext, preferencesService.getFilePreferences().getWorkingDirectory()));
-
-        if (latexParserResult == null || !newDirectory.equals(directory.get())) {
+        Path newDirectory = databaseContext
+            .getMetaData()
+            .getLatexFileDirectory(
+                preferencesService.getFilePreferences().getUserAndHost()
+            )
+            .orElse(
+                FileUtil.getInitialDirectory(
+                    databaseContext,
+                    preferencesService
+                        .getFilePreferences()
+                        .getWorkingDirectory()
+                )
+            );
+
+        if (
+            latexParserResult == null || !newDirectory.equals(directory.get())
+        ) {
             directory.set(newDirectory);
 
             if (!newDirectory.toFile().exists()) {
-                throw new IOException(String.format("Current search directory does not exist: %s", newDirectory));
+                throw new IOException(
+                    String.format(
+                        "Current search directory does not exist: %s",
+                        newDirectory
+                    )
+                );
             }
 
             List<Path> texFiles = searchDirectory(newDirectory);
@@ -150,10 +198,11 @@ private Collection<Citation> searchAndParse(String citeKey) throws IOException {
     private List<Path> searchDirectory(Path directory) {
         LOGGER.debug("Searching directory {}", directory);
         try {
-            return Files.walk(directory)
-                        .filter(Files::isRegularFile)
-                        .filter(path -> path.toString().endsWith(TEX_EXT))
-                        .toList();
+            return Files
+                .walk(directory)
+                .filter(Files::isRegularFile)
+                .filter(path -> path.toString().endsWith(TEX_EXT))
+                .toList();
         } catch (IOException e) {
             LOGGER.error("Error while searching files", e);
             return List.of();
@@ -161,16 +210,30 @@ private List<Path> searchDirectory(Path directory) {
     }
 
     public void setLatexDirectory() {
-        DirectoryDialogConfiguration directoryDialogConfiguration = new DirectoryDialogConfiguration.Builder()
-                .withInitialDirectory(directory.get()).build();
-
-        dialogService.showDirectorySelectionDialog(directoryDialogConfiguration).ifPresent(selectedDirectory ->
-                databaseContext.getMetaData().setLatexFileDirectory(preferencesService.getFilePreferences().getUserAndHost(), selectedDirectory.toAbsolutePath()));
+        DirectoryDialogConfiguration directoryDialogConfiguration =
+            new DirectoryDialogConfiguration.Builder()
+                .withInitialDirectory(directory.get())
+                .build();
+
+        dialogService
+            .showDirectorySelectionDialog(directoryDialogConfiguration)
+            .ifPresent(selectedDirectory ->
+                databaseContext
+                    .getMetaData()
+                    .setLatexFileDirectory(
+                        preferencesService
+                            .getFilePreferences()
+                            .getUserAndHost(),
+                        selectedDirectory.toAbsolutePath()
+                    )
+            );
 
         init(currentEntry);
     }
 
     public boolean shouldShow() {
-        return preferencesService.getEntryEditorPreferences().shouldShowLatexCitationsTab();
+        return preferencesService
+            .getEntryEditorPreferences()
+            .shouldShowLatexCitationsTab();
     }
 }
diff --git a/src/main/java/org/jabref/gui/entryeditor/MathSciNetTab.java b/src/main/java/org/jabref/gui/entryeditor/MathSciNetTab.java
index 9f4ed909090..1ecc6db0060 100644
--- a/src/main/java/org/jabref/gui/entryeditor/MathSciNetTab.java
+++ b/src/main/java/org/jabref/gui/entryeditor/MathSciNetTab.java
@@ -1,11 +1,9 @@
 package org.jabref.gui.entryeditor;
 
 import java.util.Optional;
-
 import javafx.scene.control.ProgressIndicator;
 import javafx.scene.layout.StackPane;
 import javafx.scene.web.WebView;
-
 import org.jabref.logic.l10n.Localization;
 import org.jabref.logic.util.WebViewStore;
 import org.jabref.model.entry.BibEntry;
@@ -21,7 +19,9 @@ public MathSciNetTab() {
     }
 
     private Optional<MathSciNetId> getMathSciNetId(BibEntry entry) {
-        return entry.getField(StandardField.MR_NUMBER).flatMap(MathSciNetId::parse);
+        return entry
+            .getField(StandardField.MR_NUMBER)
+            .flatMap(MathSciNetId::parse);
     }
 
     private StackPane getPane(BibEntry entry) {
@@ -31,21 +31,29 @@ private StackPane getPane(BibEntry entry) {
         WebView browser = WebViewStore.get();
 
         // Quick hack to disable navigating
-        browser.addEventFilter(javafx.scene.input.MouseEvent.ANY, javafx.scene.input.MouseEvent::consume);
+        browser.addEventFilter(
+            javafx.scene.input.MouseEvent.ANY,
+            javafx.scene.input.MouseEvent::consume
+        );
         browser.setContextMenuEnabled(false);
 
         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 4fe0a8101b4..2238c3cc398 100644
--- a/src/main/java/org/jabref/gui/entryeditor/OpenEntryEditorAction.java
+++ b/src/main/java/org/jabref/gui/entryeditor/OpenEntryEditorAction.java
@@ -19,7 +19,9 @@ public OpenEntryEditorAction(JabRefFrame frame, StateManager stateManager) {
 
     public void execute() {
         if (!stateManager.getSelectedEntries().isEmpty()) {
-            frame.getCurrentLibraryTab().showAndEdit(stateManager.getSelectedEntries().get(0));
+            frame
+                .getCurrentLibraryTab()
+                .showAndEdit(stateManager.getSelectedEntries().get(0));
         }
     }
 }
diff --git a/src/main/java/org/jabref/gui/entryeditor/OptionalFields2Tab.java b/src/main/java/org/jabref/gui/entryeditor/OptionalFields2Tab.java
index da37540e513..d8e68ae13f4 100644
--- a/src/main/java/org/jabref/gui/entryeditor/OptionalFields2Tab.java
+++ b/src/main/java/org/jabref/gui/entryeditor/OptionalFields2Tab.java
@@ -1,7 +1,6 @@
 package org.jabref.gui.entryeditor;
 
 import javax.swing.undo.UndoManager;
-
 import org.jabref.gui.DialogService;
 import org.jabref.gui.StateManager;
 import org.jabref.gui.autocompleter.SuggestionProviders;
@@ -18,31 +17,33 @@ public class OptionalFields2Tab extends OptionalFieldsTabBase {
 
     public static final String NAME = "Optional fields 2";
 
-    public OptionalFields2Tab(BibDatabaseContext databaseContext,
-                              SuggestionProviders suggestionProviders,
-                              UndoManager undoManager,
-                              DialogService dialogService,
-                              PreferencesService preferences,
-                              StateManager stateManager,
-                              ThemeManager themeManager,
-                              IndexingTaskManager indexingTaskManager,
-                              BibEntryTypesManager entryTypesManager,
-                              TaskExecutor taskExecutor,
-                              JournalAbbreviationRepository journalAbbreviationRepository) {
+    public OptionalFields2Tab(
+        BibDatabaseContext databaseContext,
+        SuggestionProviders suggestionProviders,
+        UndoManager undoManager,
+        DialogService dialogService,
+        PreferencesService preferences,
+        StateManager stateManager,
+        ThemeManager themeManager,
+        IndexingTaskManager indexingTaskManager,
+        BibEntryTypesManager entryTypesManager,
+        TaskExecutor taskExecutor,
+        JournalAbbreviationRepository journalAbbreviationRepository
+    ) {
         super(
-                Localization.lang("Optional fields 2"),
-                false,
-                databaseContext,
-                suggestionProviders,
-                undoManager,
-                dialogService,
-                preferences,
-                stateManager,
-                themeManager,
-                indexingTaskManager,
-                entryTypesManager,
-                taskExecutor,
-                journalAbbreviationRepository
+            Localization.lang("Optional fields 2"),
+            false,
+            databaseContext,
+            suggestionProviders,
+            undoManager,
+            dialogService,
+            preferences,
+            stateManager,
+            themeManager,
+            indexingTaskManager,
+            entryTypesManager,
+            taskExecutor,
+            journalAbbreviationRepository
         );
     }
 }
diff --git a/src/main/java/org/jabref/gui/entryeditor/OptionalFieldsTab.java b/src/main/java/org/jabref/gui/entryeditor/OptionalFieldsTab.java
index d511ef268cf..d4f0b108fc5 100644
--- a/src/main/java/org/jabref/gui/entryeditor/OptionalFieldsTab.java
+++ b/src/main/java/org/jabref/gui/entryeditor/OptionalFieldsTab.java
@@ -1,7 +1,6 @@
 package org.jabref.gui.entryeditor;
 
 import javax.swing.undo.UndoManager;
-
 import org.jabref.gui.DialogService;
 import org.jabref.gui.StateManager;
 import org.jabref.gui.autocompleter.SuggestionProviders;
@@ -18,31 +17,33 @@ public class OptionalFieldsTab extends OptionalFieldsTabBase {
 
     public static final String NAME = "Optional fields";
 
-    public OptionalFieldsTab(BibDatabaseContext databaseContext,
-                             SuggestionProviders suggestionProviders,
-                             UndoManager undoManager,
-                             DialogService dialogService,
-                             PreferencesService preferences,
-                             StateManager stateManager,
-                             ThemeManager themeManager,
-                             IndexingTaskManager indexingTaskManager,
-                             BibEntryTypesManager entryTypesManager,
-                             TaskExecutor taskExecutor,
-                             JournalAbbreviationRepository journalAbbreviationRepository) {
+    public OptionalFieldsTab(
+        BibDatabaseContext databaseContext,
+        SuggestionProviders suggestionProviders,
+        UndoManager undoManager,
+        DialogService dialogService,
+        PreferencesService preferences,
+        StateManager stateManager,
+        ThemeManager themeManager,
+        IndexingTaskManager indexingTaskManager,
+        BibEntryTypesManager entryTypesManager,
+        TaskExecutor taskExecutor,
+        JournalAbbreviationRepository journalAbbreviationRepository
+    ) {
         super(
-                Localization.lang("Optional fields"),
-                true,
-                databaseContext,
-                suggestionProviders,
-                undoManager,
-                dialogService,
-                preferences,
-                stateManager,
-                themeManager,
-                indexingTaskManager,
-                entryTypesManager,
-                taskExecutor,
-                journalAbbreviationRepository
+            Localization.lang("Optional fields"),
+            true,
+            databaseContext,
+            suggestionProviders,
+            undoManager,
+            dialogService,
+            preferences,
+            stateManager,
+            themeManager,
+            indexingTaskManager,
+            entryTypesManager,
+            taskExecutor,
+            journalAbbreviationRepository
         );
     }
 }
diff --git a/src/main/java/org/jabref/gui/entryeditor/OptionalFieldsTabBase.java b/src/main/java/org/jabref/gui/entryeditor/OptionalFieldsTabBase.java
index edb22834ff2..28f29a18b51 100644
--- a/src/main/java/org/jabref/gui/entryeditor/OptionalFieldsTabBase.java
+++ b/src/main/java/org/jabref/gui/entryeditor/OptionalFieldsTabBase.java
@@ -3,11 +3,8 @@
 import java.util.Collections;
 import java.util.Optional;
 import java.util.Set;
-
-import javax.swing.undo.UndoManager;
-
 import javafx.scene.control.Tooltip;
-
+import javax.swing.undo.UndoManager;
 import org.jabref.gui.DialogService;
 import org.jabref.gui.StateManager;
 import org.jabref.gui.autocompleter.SuggestionProviders;
@@ -26,33 +23,38 @@
 import org.jabref.preferences.PreferencesService;
 
 public class OptionalFieldsTabBase extends FieldsEditorTab {
+
     private final BibEntryTypesManager entryTypesManager;
     private final boolean isPrimaryOptionalFields;
 
-    public OptionalFieldsTabBase(String title,
-                                 boolean isPrimaryOptionalFields,
-                                 BibDatabaseContext databaseContext,
-                                 SuggestionProviders suggestionProviders,
-                                 UndoManager undoManager,
-                                 DialogService dialogService,
-                                 PreferencesService preferences,
-                                 StateManager stateManager,
-                                 ThemeManager themeManager,
-                                 IndexingTaskManager indexingTaskManager,
-                                 BibEntryTypesManager entryTypesManager,
-                                 TaskExecutor taskExecutor,
-                                 JournalAbbreviationRepository journalAbbreviationRepository) {
-        super(true,
-                databaseContext,
-                suggestionProviders,
-                undoManager,
-                dialogService,
-                preferences,
-                stateManager,
-                themeManager,
-                taskExecutor,
-                journalAbbreviationRepository,
-                indexingTaskManager);
+    public OptionalFieldsTabBase(
+        String title,
+        boolean isPrimaryOptionalFields,
+        BibDatabaseContext databaseContext,
+        SuggestionProviders suggestionProviders,
+        UndoManager undoManager,
+        DialogService dialogService,
+        PreferencesService preferences,
+        StateManager stateManager,
+        ThemeManager themeManager,
+        IndexingTaskManager indexingTaskManager,
+        BibEntryTypesManager entryTypesManager,
+        TaskExecutor taskExecutor,
+        JournalAbbreviationRepository journalAbbreviationRepository
+    ) {
+        super(
+            true,
+            databaseContext,
+            suggestionProviders,
+            undoManager,
+            dialogService,
+            preferences,
+            stateManager,
+            themeManager,
+            taskExecutor,
+            journalAbbreviationRepository,
+            indexingTaskManager
+        );
         this.entryTypesManager = entryTypesManager;
         this.isPrimaryOptionalFields = isPrimaryOptionalFields;
         setText(title);
@@ -63,12 +65,17 @@ public OptionalFieldsTabBase(String title,
     @Override
     protected Set<Field> determineFieldsToShow(BibEntry entry) {
         BibDatabaseMode mode = databaseContext.getMode();
-        Optional<BibEntryType> entryType = entryTypesManager.enrich(entry.getType(), mode);
+        Optional<BibEntryType> entryType = entryTypesManager.enrich(
+            entry.getType(),
+            mode
+        );
         if (entryType.isPresent()) {
             if (isPrimaryOptionalFields) {
                 return entryType.get().getPrimaryOptionalFields();
             } else {
-                return entryType.get().getSecondaryOptionalNotDeprecatedFields(mode);
+                return entryType
+                    .get()
+                    .getSecondaryOptionalNotDeprecatedFields(mode);
             }
         } else {
             // Entry type unknown -> treat all fields as required
diff --git a/src/main/java/org/jabref/gui/entryeditor/OtherFieldsTab.java b/src/main/java/org/jabref/gui/entryeditor/OtherFieldsTab.java
index dae09c7a2a3..2e06ef41205 100644
--- a/src/main/java/org/jabref/gui/entryeditor/OtherFieldsTab.java
+++ b/src/main/java/org/jabref/gui/entryeditor/OtherFieldsTab.java
@@ -7,11 +7,8 @@
 import java.util.Optional;
 import java.util.Set;
 import java.util.stream.Collectors;
-
-import javax.swing.undo.UndoManager;
-
 import javafx.scene.control.Tooltip;
-
+import javax.swing.undo.UndoManager;
 import org.jabref.gui.DialogService;
 import org.jabref.gui.StateManager;
 import org.jabref.gui.autocompleter.SuggestionProviders;
@@ -39,32 +36,39 @@ public class OtherFieldsTab extends FieldsEditorTab {
     private final List<Field> customTabFieldNames;
     private final BibEntryTypesManager entryTypesManager;
 
-    public OtherFieldsTab(BibDatabaseContext databaseContext,
-                          SuggestionProviders suggestionProviders,
-                          UndoManager undoManager,
-                          DialogService dialogService,
-                          PreferencesService preferences,
-                          StateManager stateManager,
-                          ThemeManager themeManager,
-                          IndexingTaskManager indexingTaskManager,
-                          BibEntryTypesManager entryTypesManager,
-                          TaskExecutor taskExecutor,
-                          JournalAbbreviationRepository journalAbbreviationRepository) {
-        super(false,
-                databaseContext,
-                suggestionProviders,
-                undoManager,
-                dialogService,
-                preferences,
-                stateManager,
-                themeManager,
-                taskExecutor,
-                journalAbbreviationRepository,
-                indexingTaskManager);
-
+    public OtherFieldsTab(
+        BibDatabaseContext databaseContext,
+        SuggestionProviders suggestionProviders,
+        UndoManager undoManager,
+        DialogService dialogService,
+        PreferencesService preferences,
+        StateManager stateManager,
+        ThemeManager themeManager,
+        IndexingTaskManager indexingTaskManager,
+        BibEntryTypesManager entryTypesManager,
+        TaskExecutor taskExecutor,
+        JournalAbbreviationRepository journalAbbreviationRepository
+    ) {
+        super(
+            false,
+            databaseContext,
+            suggestionProviders,
+            undoManager,
+            dialogService,
+            preferences,
+            stateManager,
+            themeManager,
+            taskExecutor,
+            journalAbbreviationRepository,
+            indexingTaskManager
+        );
         this.entryTypesManager = entryTypesManager;
         this.customTabFieldNames = new ArrayList<>();
-        preferences.getEntryEditorPreferences().getDefaultEntryEditorTabs().values().forEach(customTabFieldNames::addAll);
+        preferences
+            .getEntryEditorPreferences()
+            .getDefaultEntryEditorTabs()
+            .values()
+            .forEach(customTabFieldNames::addAll);
 
         setText(Localization.lang("Other fields"));
         setTooltip(new Tooltip(Localization.lang("Show remaining fields")));
@@ -74,15 +78,30 @@ public OtherFieldsTab(BibDatabaseContext databaseContext,
     @Override
     protected Set<Field> determineFieldsToShow(BibEntry entry) {
         BibDatabaseMode mode = databaseContext.getMode();
-        Optional<BibEntryType> entryType = entryTypesManager.enrich(entry.getType(), mode);
+        Optional<BibEntryType> entryType = entryTypesManager.enrich(
+            entry.getType(),
+            mode
+        );
         if (entryType.isPresent()) {
             Set<Field> allKnownFields = entryType.get().getAllFields();
-            Set<Field> otherFields = entry.getFields().stream()
-                                          .filter(field -> !allKnownFields.contains(field) &&
-                                                  !(field.equals(StandardField.COMMENT) || field instanceof UserSpecificCommentField))
-                                          .collect(Collectors.toCollection(LinkedHashSet::new));
+            Set<Field> otherFields = entry
+                .getFields()
+                .stream()
+                .filter(field ->
+                    !allKnownFields.contains(field) &&
+                    !(field.equals(StandardField.COMMENT) ||
+                        field instanceof UserSpecificCommentField)
+                )
+                .collect(Collectors.toCollection(LinkedHashSet::new));
             otherFields.removeAll(entryType.get().getDeprecatedFields(mode));
-            otherFields.removeAll(entryType.get().getOptionalFields().stream().map(BibField::field).collect(Collectors.toSet()));
+            otherFields.removeAll(
+                entryType
+                    .get()
+                    .getOptionalFields()
+                    .stream()
+                    .map(BibField::field)
+                    .collect(Collectors.toSet())
+            );
             otherFields.remove(InternalField.KEY_FIELD);
             customTabFieldNames.forEach(otherFields::remove);
             return otherFields;
diff --git a/src/main/java/org/jabref/gui/entryeditor/PreviewSwitchAction.java b/src/main/java/org/jabref/gui/entryeditor/PreviewSwitchAction.java
index 366adcc70f8..5bac51cfb78 100644
--- a/src/main/java/org/jabref/gui/entryeditor/PreviewSwitchAction.java
+++ b/src/main/java/org/jabref/gui/entryeditor/PreviewSwitchAction.java
@@ -1,19 +1,26 @@
 package org.jabref.gui.entryeditor;
 
+import static org.jabref.gui.actions.ActionHelper.needsDatabase;
+
 import org.jabref.gui.JabRefFrame;
 import org.jabref.gui.StateManager;
 import org.jabref.gui.actions.SimpleCommand;
 
-import static org.jabref.gui.actions.ActionHelper.needsDatabase;
-
 public class PreviewSwitchAction extends SimpleCommand {
 
-    public enum Direction { PREVIOUS, NEXT }
+    public enum Direction {
+        PREVIOUS,
+        NEXT,
+    }
 
     private final JabRefFrame frame;
     private final Direction direction;
 
-    public PreviewSwitchAction(Direction direction, JabRefFrame frame, StateManager stateManager) {
+    public PreviewSwitchAction(
+        Direction direction,
+        JabRefFrame frame,
+        StateManager stateManager
+    ) {
         this.frame = frame;
         this.direction = direction;
 
@@ -25,7 +32,10 @@ public void execute() {
         if (direction == Direction.NEXT) {
             frame.getCurrentLibraryTab().getEntryEditor().nextPreviewStyle();
         } else {
-            frame.getCurrentLibraryTab().getEntryEditor().previousPreviewStyle();
+            frame
+                .getCurrentLibraryTab()
+                .getEntryEditor()
+                .previousPreviewStyle();
         }
     }
 }
diff --git a/src/main/java/org/jabref/gui/entryeditor/PreviewTab.java b/src/main/java/org/jabref/gui/entryeditor/PreviewTab.java
index 1555f577c45..ff17cb89e56 100644
--- a/src/main/java/org/jabref/gui/entryeditor/PreviewTab.java
+++ b/src/main/java/org/jabref/gui/entryeditor/PreviewTab.java
@@ -13,6 +13,7 @@
 import org.jabref.preferences.PreferencesService;
 
 public class PreviewTab extends EntryEditorTab {
+
     public static final String NAME = "Preview";
     private final DialogService dialogService;
     private final BibDatabaseContext databaseContext;
@@ -23,13 +24,15 @@ public class PreviewTab extends EntryEditorTab {
     private final TaskExecutor taskExecutor;
     private PreviewPanel previewPanel;
 
-    public PreviewTab(BibDatabaseContext databaseContext,
-                      DialogService dialogService,
-                      PreferencesService preferences,
-                      StateManager stateManager,
-                      ThemeManager themeManager,
-                      IndexingTaskManager indexingTaskManager,
-                      TaskExecutor taskExecutor) {
+    public PreviewTab(
+        BibDatabaseContext databaseContext,
+        DialogService dialogService,
+        PreferencesService preferences,
+        StateManager stateManager,
+        ThemeManager themeManager,
+        IndexingTaskManager indexingTaskManager,
+        TaskExecutor taskExecutor
+    ) {
         this.databaseContext = databaseContext;
         this.dialogService = dialogService;
         this.preferences = preferences;
@@ -58,13 +61,25 @@ protected void previousPreviewStyle() {
 
     @Override
     public boolean shouldShow(BibEntry entry) {
-        return preferences.getPreviewPreferences().shouldShowPreviewAsExtraTab();
+        return preferences
+            .getPreviewPreferences()
+            .shouldShowPreviewAsExtraTab();
     }
 
     @Override
     protected void bindToEntry(BibEntry entry) {
         if (previewPanel == null) {
-            previewPanel = new PreviewPanel(databaseContext, dialogService, preferences.getKeyBindingRepository(), preferences, stateManager, themeManager, indexingTaskManager, taskExecutor);
+            previewPanel =
+                new PreviewPanel(
+                    databaseContext,
+                    dialogService,
+                    preferences.getKeyBindingRepository(),
+                    preferences,
+                    stateManager,
+                    themeManager,
+                    indexingTaskManager,
+                    taskExecutor
+                );
             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 1cf3ad74e5b..b04068f5a84 100644
--- a/src/main/java/org/jabref/gui/entryeditor/RelatedArticlesTab.java
+++ b/src/main/java/org/jabref/gui/entryeditor/RelatedArticlesTab.java
@@ -2,7 +2,6 @@
 
 import java.io.IOException;
 import java.util.List;
-
 import javafx.beans.binding.Bindings;
 import javafx.beans.binding.DoubleBinding;
 import javafx.scene.control.Button;
@@ -17,7 +16,6 @@
 import javafx.scene.text.Font;
 import javafx.scene.text.FontPosture;
 import javafx.scene.text.Text;
-
 import org.jabref.gui.DialogService;
 import org.jabref.gui.Globals;
 import org.jabref.gui.desktop.JabRefDesktop;
@@ -32,7 +30,6 @@
 import org.jabref.model.entry.field.StandardField;
 import org.jabref.preferences.MrDlibPreferences;
 import org.jabref.preferences.PreferencesService;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -42,16 +39,20 @@
 public class RelatedArticlesTab extends EntryEditorTab {
 
     public static final String NAME = "Related articles";
-    private static final Logger LOGGER = LoggerFactory.getLogger(RelatedArticlesTab.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(
+        RelatedArticlesTab.class
+    );
     private final EntryEditorPreferences preferences;
     private final DialogService dialogService;
     private final PreferencesService preferencesService;
     private final TaskExecutor taskExecutor;
 
-    public RelatedArticlesTab(EntryEditorPreferences preferences,
-                              PreferencesService preferencesService,
-                              DialogService dialogService,
-                              TaskExecutor taskExecutor) {
+    public RelatedArticlesTab(
+        EntryEditorPreferences preferences,
+        PreferencesService preferencesService,
+        DialogService dialogService,
+        TaskExecutor taskExecutor
+    ) {
         this.taskExecutor = taskExecutor;
         setText(Localization.lang("Related articles"));
         setTooltip(new Tooltip(Localization.lang("Related articles")));
@@ -72,23 +73,32 @@ private StackPane getRelatedArticlesPane(BibEntry entry) {
         ProgressIndicator progress = new ProgressIndicator();
         progress.setMaxSize(100, 100);
 
-        MrDLibFetcher fetcher = new MrDLibFetcher(preferencesService.getWorkspacePreferences().getLanguage().name(),
-                Globals.BUILD_INFO.version, preferencesService.getMrDlibPreferences());
+        MrDLibFetcher fetcher = new MrDLibFetcher(
+            preferencesService.getWorkspacePreferences().getLanguage().name(),
+            Globals.BUILD_INFO.version,
+            preferencesService.getMrDlibPreferences()
+        );
         BackgroundTask
-                .wrap(() -> fetcher.performSearch(entry))
-                .onRunning(() -> progress.setVisible(true))
-                .onSuccess(relatedArticles -> {
-                    ImportCleanup cleanup = ImportCleanup.targeting(BibDatabaseModeDetection.inferMode(new BibDatabase(List.of(entry))));
-                    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);
+            .wrap(() -> fetcher.performSearch(entry))
+            .onRunning(() -> progress.setVisible(true))
+            .onSuccess(relatedArticles -> {
+                ImportCleanup cleanup = ImportCleanup.targeting(
+                    BibDatabaseModeDetection.inferMode(
+                        new BibDatabase(List.of(entry))
+                    )
+                );
+                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);
 
@@ -101,7 +111,10 @@ private StackPane getRelatedArticlesPane(BibEntry entry) {
      * @param list List of BibEntries of related articles
      * @return VBox of related article descriptions to be displayed in the Related Articles tab
      */
-    private ScrollPane getRelatedArticleInfo(List<BibEntry> list, MrDLibFetcher fetcher) {
+    private ScrollPane getRelatedArticleInfo(
+        List<BibEntry> list,
+        MrDLibFetcher fetcher
+    ) {
         ScrollPane scrollPane = new ScrollPane();
 
         VBox vBox = new VBox();
@@ -128,21 +141,36 @@ 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 {
-                        JabRefDesktop.openBrowser(entry.getField(StandardField.URL).get(), preferencesService.getFilePreferences());
+                        JabRefDesktop.openBrowser(
+                            entry.getField(StandardField.URL).get(),
+                            preferencesService.getFilePreferences()
+                        );
                     } catch (IOException e) {
-                        LOGGER.error("Error opening the browser to: " + entry.getField(StandardField.URL).get(), e);
+                        LOGGER.error(
+                            "Error opening the browser to: " +
+                            entry.getField(StandardField.URL).get(),
+                            e
+                        );
                         dialogService.showErrorDialogAndWait(e);
                     }
                 }
             });
 
-            hBox.getChildren().addAll(titleLink, journalText, authorsText, yearText);
+            hBox
+                .getChildren()
+                .addAll(titleLink, journalText, authorsText, yearText);
             vBox.getChildren().add(hBox);
         }
         scrollPane.setContent(vBox);
@@ -160,7 +188,11 @@ 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);
@@ -189,46 +221,98 @@ 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."));
+        Hyperlink mdlLink = new Hyperlink(
+            Localization.lang(
+                "Further information about Mr. DLib for JabRef users."
+            )
+        );
         mdlLink.setOnAction(event -> {
             try {
-                JabRefDesktop.openBrowser("http://mr-dlib.org/information-for-users/information-about-mr-dlib-for-jabref-users/", preferencesService.getFilePreferences());
+                JabRefDesktop.openBrowser(
+                    "http://mr-dlib.org/information-for-users/information-about-mr-dlib-for-jabref-users/",
+                    preferencesService.getFilePreferences()
+                );
             } catch (IOException e) {
-                LOGGER.error("Error opening the browser to Mr. DLib information page.", 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.)"));
-        vb.getChildren().addAll(cbTitle, cbVersion, cbLanguage, cbOS, cbTimezone);
+        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 = preferencesService.getMrDlibPreferences();
+            MrDlibPreferences mrDlibPreferences =
+                preferencesService.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."));
+            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);
+        vbox
+            .getChildren()
+            .addAll(title, line1, line2, mdlLink, line3, vb, button);
         root.setContent(vbox);
 
         return root;
@@ -242,7 +326,11 @@ public boolean shouldShow(BibEntry entry) {
     @Override
     protected void bindToEntry(BibEntry entry) {
         // Ask for consent to send data to Mr. DLib on first time to tab
-        if (preferencesService.getMrDlibPreferences().shouldAcceptRecommendations()) {
+        if (
+            preferencesService
+                .getMrDlibPreferences()
+                .shouldAcceptRecommendations()
+        ) {
             setContent(getRelatedArticlesPane(entry));
         } else {
             setContent(getPrivacyDialog(entry));
diff --git a/src/main/java/org/jabref/gui/entryeditor/RequiredFieldsTab.java b/src/main/java/org/jabref/gui/entryeditor/RequiredFieldsTab.java
index cfc530c9d08..59be96cc820 100644
--- a/src/main/java/org/jabref/gui/entryeditor/RequiredFieldsTab.java
+++ b/src/main/java/org/jabref/gui/entryeditor/RequiredFieldsTab.java
@@ -3,11 +3,8 @@
 import java.util.LinkedHashSet;
 import java.util.Optional;
 import java.util.Set;
-
-import javax.swing.undo.UndoManager;
-
 import javafx.scene.control.Tooltip;
-
+import javax.swing.undo.UndoManager;
 import org.jabref.gui.DialogService;
 import org.jabref.gui.StateManager;
 import org.jabref.gui.autocompleter.SuggestionProviders;
@@ -31,19 +28,32 @@ public class RequiredFieldsTab extends FieldsEditorTab {
     public static final String NAME = "Required fields";
     private final BibEntryTypesManager entryTypesManager;
 
-    public RequiredFieldsTab(BibDatabaseContext databaseContext,
-                             SuggestionProviders suggestionProviders,
-                             UndoManager undoManager,
-                             DialogService dialogService,
-                             PreferencesService preferences,
-                             StateManager stateManager,
-                             ThemeManager themeManager,
-                             IndexingTaskManager indexingTaskManager,
-                             BibEntryTypesManager entryTypesManager,
-                             TaskExecutor taskExecutor,
-                             JournalAbbreviationRepository journalAbbreviationRepository) {
-        super(false, databaseContext, suggestionProviders, undoManager, dialogService,
-                preferences, stateManager, themeManager, taskExecutor, journalAbbreviationRepository, indexingTaskManager);
+    public RequiredFieldsTab(
+        BibDatabaseContext databaseContext,
+        SuggestionProviders suggestionProviders,
+        UndoManager undoManager,
+        DialogService dialogService,
+        PreferencesService preferences,
+        StateManager stateManager,
+        ThemeManager themeManager,
+        IndexingTaskManager indexingTaskManager,
+        BibEntryTypesManager entryTypesManager,
+        TaskExecutor taskExecutor,
+        JournalAbbreviationRepository journalAbbreviationRepository
+    ) {
+        super(
+            false,
+            databaseContext,
+            suggestionProviders,
+            undoManager,
+            dialogService,
+            preferences,
+            stateManager,
+            themeManager,
+            taskExecutor,
+            journalAbbreviationRepository,
+            indexingTaskManager
+        );
         this.entryTypesManager = entryTypesManager;
         setText(Localization.lang("Required fields"));
         setTooltip(new Tooltip(Localization.lang("Show required fields")));
@@ -52,7 +62,10 @@ public RequiredFieldsTab(BibDatabaseContext databaseContext,
 
     @Override
     protected Set<Field> determineFieldsToShow(BibEntry entry) {
-        Optional<BibEntryType> entryType = entryTypesManager.enrich(entry.getType(), databaseContext.getMode());
+        Optional<BibEntryType> entryType = entryTypesManager.enrich(
+            entry.getType(),
+            databaseContext.getMode()
+        );
         Set<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 2033a945a5c..cf8ce783aea 100644
--- a/src/main/java/org/jabref/gui/entryeditor/SciteTab.java
+++ b/src/main/java/org/jabref/gui/entryeditor/SciteTab.java
@@ -1,9 +1,9 @@
 package org.jabref.gui.entryeditor;
 
+import com.tobiasdiez.easybind.EasyBind;
 import java.io.IOException;
 import java.net.URLEncoder;
 import java.nio.charset.StandardCharsets;
-
 import javafx.geometry.HPos;
 import javafx.scene.control.Hyperlink;
 import javafx.scene.control.Label;
@@ -13,7 +13,7 @@
 import javafx.scene.layout.GridPane;
 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.JabRefDesktop;
 import org.jabref.gui.util.TaskExecutor;
@@ -21,13 +21,11 @@
 import org.jabref.model.entry.BibEntry;
 import org.jabref.preferences.PreferencesService;
 
-import com.tobiasdiez.easybind.EasyBind;
-import org.controlsfx.control.HyperlinkLabel;
-
 public class SciteTab extends EntryEditorTab {
 
     public static final String NAME = "Scite";
-    public static final String SCITE_REPORTS_URL_BASE = "https://scite.ai/reports/";
+    public static final String SCITE_REPORTS_URL_BASE =
+        "https://scite.ai/reports/";
 
     private final GridPane sciteResultsPane;
     private final ProgressIndicator progressIndicator;
@@ -35,14 +33,23 @@ public class SciteTab extends EntryEditorTab {
     private final PreferencesService preferencesService;
     private final DialogService dialogService;
 
-    public SciteTab(PreferencesService preferencesService, TaskExecutor taskExecutor, DialogService dialogService) {
+    public SciteTab(
+        PreferencesService preferencesService,
+        TaskExecutor taskExecutor,
+        DialogService dialogService
+    ) {
         this.preferencesService = preferencesService;
-        this.viewModel = new SciteTabViewModel(preferencesService, taskExecutor);
+        this.viewModel =
+            new SciteTabViewModel(preferencesService, taskExecutor);
         this.dialogService = dialogService;
         this.sciteResultsPane = new GridPane();
         this.progressIndicator = new ProgressIndicator();
         setText(NAME);
-        setTooltip(new Tooltip(Localization.lang("Search scite.ai for Smart Citations")));
+        setTooltip(
+            new Tooltip(
+                Localization.lang("Search scite.ai for Smart Citations")
+            )
+        );
         setSciteResultsPane();
     }
 
@@ -58,17 +65,25 @@ 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
@@ -91,25 +106,34 @@ private VBox getErrorPane() {
     }
 
     private VBox getTalliesPane(SciteTallyModel tallModel) {
-        Label titleLabel = new Label(Localization.lang("Tallies for %0", tallModel.doi()));
+        Label titleLabel = new Label(
+            Localization.lang("Tallies for %0", tallModel.doi())
+        );
         titleLabel.getStyleClass().add("scite-tallies-label");
-        Text message = new Text(String.format("Total Citations: %d\nSupporting: %d\nContradicting: %d\nMentioning: %d\nUnclassified: %d\nCiting Publications: %d",
-            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(
+            String.format(
+                "Total Citations: %d\nSupporting: %d\nContradicting: %d\nMentioning: %d\nUnclassified: %d\nCiting Publications: %d",
+                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;
     }
 
     private VBox getMessageBox(String url, Label titleLabel, Text message) {
-        HyperlinkLabel link = new HyperlinkLabel(Localization.lang("See full report at [%0]", url));
+        HyperlinkLabel link = new HyperlinkLabel(
+            Localization.lang("See full report at [%0]", url)
+        );
         link.setOnAction(event -> {
             if (event.getSource() instanceof Hyperlink) {
                 var filePreferences = preferencesService.getFilePreferences();
@@ -118,8 +142,11 @@ private VBox getMessageBox(String url, Label titleLabel, Text message) {
                 } 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(),
+                        "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
                     );
                 }
diff --git a/src/main/java/org/jabref/gui/entryeditor/SciteTabViewModel.java b/src/main/java/org/jabref/gui/entryeditor/SciteTabViewModel.java
index f05ab1ac94b..65f44b40354 100644
--- a/src/main/java/org/jabref/gui/entryeditor/SciteTabViewModel.java
+++ b/src/main/java/org/jabref/gui/entryeditor/SciteTabViewModel.java
@@ -7,12 +7,11 @@
 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.json.JSONObject;
 import org.jabref.gui.AbstractViewModel;
 import org.jabref.gui.util.BackgroundTask;
 import org.jabref.gui.util.TaskExecutor;
@@ -22,8 +21,6 @@
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.identifier.DOI;
 import org.jabref.preferences.PreferencesService;
-
-import kong.unirest.json.JSONObject;
 import org.tinylog.Logger;
 
 public class SciteTabViewModel extends AbstractViewModel {
@@ -34,7 +31,7 @@ public class SciteTabViewModel extends AbstractViewModel {
     public enum SciteStatus {
         IN_PROGRESS,
         FOUND,
-        ERROR
+        ERROR,
     }
 
     private static final String BASE_URL = "https://api.scite.ai/";
@@ -46,7 +43,10 @@ public enum SciteStatus {
 
     private Future<?> searchTask;
 
-    public SciteTabViewModel(PreferencesService preferencesService, TaskExecutor taskExecutor) {
+    public SciteTabViewModel(
+        PreferencesService preferencesService,
+        TaskExecutor taskExecutor
+    ) {
         this.preferencesService = preferencesService;
         this.taskExecutor = taskExecutor;
         this.status = new SimpleObjectProperty<>(SciteStatus.IN_PROGRESS);
@@ -54,7 +54,9 @@ public SciteTabViewModel(PreferencesService preferencesService, TaskExecutor tas
     }
 
     public boolean shouldShow() {
-        return preferencesService.getEntryEditorPreferences().shouldShowSciteTab();
+        return preferencesService
+            .getEntryEditorPreferences()
+            .shouldShowSciteTab();
     }
 
     public void bindToEntry(BibEntry entry) {
@@ -69,26 +71,34 @@ public void bindToEntry(BibEntry entry) {
 
         // The scite.ai api requires a DOI
         if (entry.getDOI().isEmpty()) {
-            searchError.set(Localization.lang("This entry does not have a DOI"));
+            searchError.set(
+                Localization.lang("This entry does not have a DOI")
+            );
             status.set(SciteStatus.ERROR);
             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() {
-        if (searchTask == null || searchTask.isCancelled() || searchTask.isDone()) {
+        if (
+            searchTask == null ||
+            searchTask.isCancelled() ||
+            searchTask.isDone()
+        ) {
             return;
         }
 
@@ -113,7 +123,10 @@ public SciteTallyModel fetchTallies(DOI doi) throws FetcherException {
         } catch (MalformedURLException | URISyntaxException ex) {
             throw new FetcherException("Malformed url for DOs", ex);
         } catch (IOException ioex) {
-            throw new FetcherException("Failed to retrieve tallies for DOI - IO Exception", ioex);
+            throw new FetcherException(
+                "Failed to retrieve tallies for DOI - IO Exception",
+                ioex
+            );
         }
     }
 
diff --git a/src/main/java/org/jabref/gui/entryeditor/SciteTallyModel.java b/src/main/java/org/jabref/gui/entryeditor/SciteTallyModel.java
index b3fbe24ea58..48d9f564137 100644
--- a/src/main/java/org/jabref/gui/entryeditor/SciteTallyModel.java
+++ b/src/main/java/org/jabref/gui/entryeditor/SciteTallyModel.java
@@ -6,14 +6,14 @@
  * Simple model object to hold the scite.ai tallies data for a given DOI
  */
 public record SciteTallyModel(
-        String doi,
-        int total,
-        int supporting,
-        int contradicting,
-        int mentioning,
-        int unclassified,
-        int citingPublications) {
-
+    String doi,
+    int total,
+    int supporting,
+    int contradicting,
+    int mentioning,
+    int unclassified,
+    int citingPublications
+) {
     /**
      * Creates a {@link SciteTallyModel} from a JSONObject (dictionary/map)
      *
@@ -22,13 +22,13 @@ public record SciteTallyModel(
      */
     public static SciteTallyModel fromJSONObject(JSONObject jsonObject) {
         return new SciteTallyModel(
-                jsonObject.getString("doi"),
-                jsonObject.getInt("total"),
-                jsonObject.getInt("supporting"),
-                jsonObject.getInt("contradicting"),
-                jsonObject.getInt("mentioning"),
-                jsonObject.getInt("unclassified"),
-                jsonObject.getInt("citingPublications")
+            jsonObject.getString("doi"),
+            jsonObject.getInt("total"),
+            jsonObject.getInt("supporting"),
+            jsonObject.getInt("contradicting"),
+            jsonObject.getInt("mentioning"),
+            jsonObject.getInt("unclassified"),
+            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 bd39e442b1d..a6f98ce37f6 100644
--- a/src/main/java/org/jabref/gui/entryeditor/SourceTab.java
+++ b/src/main/java/org/jabref/gui/entryeditor/SourceTab.java
@@ -1,5 +1,8 @@
 package org.jabref.gui.entryeditor;
 
+import de.saxsys.mvvmfx.utils.validation.ObservableRuleBasedValidator;
+import de.saxsys.mvvmfx.utils.validation.ValidationMessage;
+import de.saxsys.mvvmfx.utils.validation.ValidationStatus;
 import java.io.IOException;
 import java.io.StringReader;
 import java.io.StringWriter;
@@ -8,9 +11,6 @@
 import java.util.Optional;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
-
-import javax.swing.undo.UndoManager;
-
 import javafx.beans.InvalidationListener;
 import javafx.beans.property.ObjectProperty;
 import javafx.beans.property.SimpleObjectProperty;
@@ -19,7 +19,9 @@
 import javafx.scene.control.Tooltip;
 import javafx.scene.input.InputMethodRequests;
 import javafx.scene.input.KeyEvent;
-
+import javax.swing.undo.UndoManager;
+import org.fxmisc.flowless.VirtualizedScrollPane;
+import org.fxmisc.richtext.CodeArea;
 import org.jabref.gui.DialogService;
 import org.jabref.gui.StateManager;
 import org.jabref.gui.actions.ActionFactory;
@@ -51,23 +53,21 @@
 import org.jabref.model.entry.BibEntryTypesManager;
 import org.jabref.model.entry.field.Field;
 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;
 
 public class SourceTab extends EntryEditorTab {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(SourceTab.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(
+        SourceTab.class
+    );
     private final FieldPreferences fieldPreferences;
     private final BibDatabaseMode mode;
     private final UndoManager undoManager;
-    private final ObjectProperty<ValidationMessage> sourceIsValid = new SimpleObjectProperty<>();
-    private final ObservableRuleBasedValidator sourceValidator = new ObservableRuleBasedValidator();
+    private final ObjectProperty<ValidationMessage> sourceIsValid =
+        new SimpleObjectProperty<>();
+    private final ObservableRuleBasedValidator sourceValidator =
+        new ObservableRuleBasedValidator();
     private final ImportFormatPreferences importFormatPreferences;
     private final FileUpdateMonitor fileMonitor;
     private final DialogService dialogService;
@@ -99,18 +99,27 @@ public void execute() {
         }
     }
 
-    public SourceTab(BibDatabaseContext bibDatabaseContext,
-                     CountingUndoManager undoManager,
-                     FieldPreferences fieldPreferences,
-                     ImportFormatPreferences importFormatPreferences,
-                     FileUpdateMonitor fileMonitor,
-                     DialogService dialogService,
-                     StateManager stateManager,
-                     BibEntryTypesManager entryTypesManager,
-                     KeyBindingRepository keyBindingRepository) {
+    public SourceTab(
+        BibDatabaseContext bibDatabaseContext,
+        CountingUndoManager undoManager,
+        FieldPreferences fieldPreferences,
+        ImportFormatPreferences importFormatPreferences,
+        FileUpdateMonitor fileMonitor,
+        DialogService dialogService,
+        StateManager stateManager,
+        BibEntryTypesManager entryTypesManager,
+        KeyBindingRepository keyBindingRepository
+    ) {
         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;
@@ -121,36 +130,53 @@ public SourceTab(BibDatabaseContext bibDatabaseContext,
         this.entryTypesManager = entryTypesManager;
         this.keyBindingRepository = keyBindingRepository;
 
-        stateManager.activeSearchQueryProperty().addListener((observable, oldValue, newValue) -> {
-            searchHighlightPattern = newValue.flatMap(SearchQuery::getPatternForWords);
-            highlightSearchPattern();
-        });
+        stateManager
+            .activeSearchQueryProperty()
+            .addListener((observable, oldValue, newValue) -> {
+                searchHighlightPattern =
+                    newValue.flatMap(SearchQuery::getPatternForWords);
+                highlightSearchPattern();
+            });
     }
 
     private void highlightSearchPattern() {
         if (searchHighlightPattern.isPresent() && (codeArea != null)) {
             codeArea.setStyleClass(0, codeArea.getLength(), "text");
-            Matcher matcher = searchHighlightPattern.get().matcher(codeArea.getText());
+            Matcher matcher = searchHighlightPattern
+                .get()
+                .matcher(codeArea.getText());
             while (matcher.find()) {
                 for (int i = 0; i <= matcher.groupCount(); i++) {
-                    codeArea.setStyleClass(matcher.start(), matcher.end(), "search");
+                    codeArea.setStyleClass(
+                        matcher.start(),
+                        matcher.end(),
+                        "search"
+                    );
                 }
             }
         }
     }
 
-    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);
-        new BibEntryWriter(fieldWriter, entryTypesManager).write(entry, bibWriter, type);
+        FieldWriter fieldWriter = FieldWriter.buildIgnoreHashes(
+            fieldPreferences
+        );
+        new BibEntryWriter(fieldWriter, entryTypesManager)
+            .write(entry, bibWriter, type);
         return writer.toString();
     }
 
     /* Work around for different input methods.
      * https://github.com/FXMisc/RichTextFX/issues/146
      */
-    private static class InputMethodRequestsObject implements InputMethodRequests {
+    private static class InputMethodRequestsObject
+        implements InputMethodRequests {
 
         @Override
         public String getSelectedText() {
@@ -184,41 +210,86 @@ private void setupSourceEditor() {
             }
         });
         codeArea.setId("bibtexSourceCodeArea");
-        codeArea.addEventFilter(KeyEvent.KEY_PRESSED, event -> CodeAreaKeyBindings.call(codeArea, event, keyBindingRepository));
-        codeArea.addEventFilter(KeyEvent.KEY_PRESSED, this::listenForSaveKeybinding);
+        codeArea.addEventFilter(
+            KeyEvent.KEY_PRESSED,
+            event ->
+                CodeAreaKeyBindings.call(codeArea, event, keyBindingRepository)
+        );
+        codeArea.addEventFilter(
+            KeyEvent.KEY_PRESSED,
+            this::listenForSaveKeybinding
+        );
 
         ActionFactory factory = new ActionFactory(keyBindingRepository);
         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());
-            }
-        });
-        VirtualizedScrollPane<CodeArea> scrollableCodeArea = new VirtualizedScrollPane<>(codeArea);
+        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);
     }
 
@@ -235,13 +306,20 @@ private void updateCodeArea() {
 
             codeArea.clear();
             try {
-                codeArea.appendText(getSourceString(currentEntry, mode, fieldPreferences));
+                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."));
+                codeArea.appendText(
+                    ex.getMessage() +
+                    "\n\n" +
+                    Localization.lang(
+                        "Correct the entry, and reopen editor to display/edit source."
+                    )
+                );
                 LOGGER.debug("Incorrect entry", ex);
             }
         });
@@ -257,7 +335,9 @@ 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) {
@@ -265,9 +345,14 @@ private void storeSource(BibEntry outOfFocusEntry, String text) {
             return;
         }
 
-        BibtexParser bibtexParser = new BibtexParser(importFormatPreferences, fileMonitor);
+        BibtexParser bibtexParser = new BibtexParser(
+            importFormatPreferences,
+            fileMonitor
+        );
         try {
-            ParserResult parserResult = bibtexParser.parse(new StringReader(text));
+            ParserResult parserResult = bibtexParser.parse(
+                new StringReader(text)
+            );
             BibDatabase database = parserResult.getDatabase();
 
             if (database.getEntryCount() > 1) {
@@ -277,7 +362,9 @@ private void storeSource(BibEntry outOfFocusEntry, String text) {
             if (!database.hasEntries()) {
                 if (parserResult.hasWarnings()) {
                     // put the warning into as exception text -> it will be displayed to the user
-                    throw new IllegalStateException(parserResult.warnings().get(0));
+                    throw new IllegalStateException(
+                        parserResult.warnings().get(0)
+                    );
                 } else {
                     throw new IllegalStateException("No entries found.");
                 }
@@ -288,7 +375,9 @@ private void storeSource(BibEntry outOfFocusEntry, String text) {
                 throw new IllegalStateException(parserResult.getErrorMessage());
             }
 
-            NamedCompound compound = new NamedCompound(Localization.lang("source edit"));
+            NamedCompound compound = new NamedCompound(
+                Localization.lang("source edit")
+            );
             BibEntry newEntry = database.getEntries().get(0);
             String newKey = newEntry.getCitationKey().orElse(null);
 
@@ -299,53 +388,94 @@ private void storeSource(BibEntry outOfFocusEntry, String text) {
             }
 
             // First, remove fields that the user has removed.
-            for (Map.Entry<Field, String> field : outOfFocusEntry.getFieldMap().entrySet()) {
+            for (Map.Entry<Field, String> field : outOfFocusEntry
+                .getFieldMap()
+                .entrySet()) {
                 Field fieldName = field.getKey();
                 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);
                 }
             }
 
             // Then set all fields that have been set by the user.
-            for (Map.Entry<Field, String> field : newEntry.getFieldMap().entrySet()) {
+            for (Map.Entry<Field, String> field : newEntry
+                .getFieldMap()
+                .entrySet()) {
                 Field fieldName = field.getKey();
-                String oldValue = outOfFocusEntry.getField(fieldName).orElse(null);
+                String oldValue = outOfFocusEntry
+                    .getField(fieldName)
+                    .orElse(null);
                 String newValue = field.getValue();
                 if (!Objects.equals(oldValue, newValue)) {
                     // Test if the field is legally set.
-                    new FieldWriter(fieldPreferences).write(fieldName, newValue);
-
-                    compound.addEdit(new UndoableFieldChange(outOfFocusEntry, fieldName, oldValue, newValue));
+                    new FieldWriter(fieldPreferences)
+                        .write(fieldName, 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()));
+            if (
+                !Objects.equals(newEntry.getType(), outOfFocusEntry.getType())
+            ) {
+                compound.addEdit(
+                    new UndoableChangeType(
+                        outOfFocusEntry,
+                        outOfFocusEntry.getType(),
+                        newEntry.getType()
+                    )
+                );
                 outOfFocusEntry.setType(newEntry.getType());
             }
             compound.end();
             undoManager.addEdit(compound);
 
             sourceIsValid.setValue(null);
-        } catch (InvalidFieldValueException | IllegalStateException | IOException ex) {
-            sourceIsValid.setValue(ValidationMessage.error(Localization.lang("Problem with parsing entry") + ": " + ex.getMessage()));
+        } catch (
+            InvalidFieldValueException | IllegalStateException | IOException ex
+        ) {
+            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 aa4e65b48e3..b918513c44a 100644
--- a/src/main/java/org/jabref/gui/entryeditor/UserDefinedFieldsTab.java
+++ b/src/main/java/org/jabref/gui/entryeditor/UserDefinedFieldsTab.java
@@ -2,9 +2,7 @@
 
 import java.util.LinkedHashSet;
 import java.util.Set;
-
 import javax.swing.undo.UndoManager;
-
 import org.jabref.gui.DialogService;
 import org.jabref.gui.StateManager;
 import org.jabref.gui.autocompleter.SuggestionProviders;
@@ -19,22 +17,36 @@
 import org.jabref.preferences.PreferencesService;
 
 public class UserDefinedFieldsTab extends FieldsEditorTab {
-    private final LinkedHashSet<Field> fields;
 
-    public UserDefinedFieldsTab(String name,
-                                Set<Field> fields,
-                                BibDatabaseContext databaseContext,
-                                SuggestionProviders suggestionProviders,
-                                UndoManager undoManager,
-                                DialogService dialogService,
-                                PreferencesService preferences,
-                                StateManager stateManager,
-                                ThemeManager themeManager,
-                                IndexingTaskManager indexingTaskManager,
-                                TaskExecutor taskExecutor,
-                                JournalAbbreviationRepository journalAbbreviationRepository) {
-        super(false, databaseContext, suggestionProviders, undoManager, dialogService, preferences, stateManager, themeManager, taskExecutor, journalAbbreviationRepository, indexingTaskManager);
+    private final LinkedHashSet<Field> fields;
 
+    public UserDefinedFieldsTab(
+        String name,
+        Set<Field> fields,
+        BibDatabaseContext databaseContext,
+        SuggestionProviders suggestionProviders,
+        UndoManager undoManager,
+        DialogService dialogService,
+        PreferencesService preferences,
+        StateManager stateManager,
+        ThemeManager themeManager,
+        IndexingTaskManager indexingTaskManager,
+        TaskExecutor taskExecutor,
+        JournalAbbreviationRepository journalAbbreviationRepository
+    ) {
+        super(
+            false,
+            databaseContext,
+            suggestionProviders,
+            undoManager,
+            dialogService,
+            preferences,
+            stateManager,
+            themeManager,
+            taskExecutor,
+            journalAbbreviationRepository,
+            indexingTaskManager
+        );
         this.fields = new LinkedHashSet<>(fields);
 
         setText(name);
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 3f2f9f53b7b..9826ff49a8d 100644
--- a/src/main/java/org/jabref/gui/entryeditor/citationrelationtab/BibEntryRelationsCache.java
+++ b/src/main/java/org/jabref/gui/entryeditor/citationrelationtab/BibEntryRelationsCache.java
@@ -4,35 +4,59 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.identifier.DOI;
 
 public class BibEntryRelationsCache {
-    private static final Map<String, List<BibEntry>> CITATIONS_MAP = new HashMap<>();
-    private static final Map<String, List<BibEntry>> REFERENCES_MAP = new HashMap<>();
+
+    private static final Map<String, List<BibEntry>> CITATIONS_MAP =
+        new HashMap<>();
+    private static final Map<String, List<BibEntry>> REFERENCES_MAP =
+        new HashMap<>();
 
     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) {
-        entry.getDOI().ifPresent(doi -> CITATIONS_MAP.put(doi.getDOI(), citations));
+    public void cacheOrMergeCitations(
+        BibEntry entry,
+        List<BibEntry> citations
+    ) {
+        entry
+            .getDOI()
+            .ifPresent(doi -> CITATIONS_MAP.put(doi.getDOI(), citations));
     }
 
-    public void cacheOrMergeReferences(BibEntry entry, List<BibEntry> references) {
-        entry.getDOI().ifPresent(doi -> REFERENCES_MAP.putIfAbsent(doi.getDOI(), references));
+    public void cacheOrMergeReferences(
+        BibEntry entry,
+        List<BibEntry> references
+    ) {
+        entry
+            .getDOI()
+            .ifPresent(doi ->
+                REFERENCES_MAP.putIfAbsent(doi.getDOI(), references)
+            );
     }
 
     public boolean citationsCached(BibEntry entry) {
-        return CITATIONS_MAP.containsKey(entry.getDOI().map(DOI::getDOI).orElse(""));
+        return CITATIONS_MAP.containsKey(
+            entry.getDOI().map(DOI::getDOI).orElse("")
+        );
     }
 
     public boolean referencesCached(BibEntry entry) {
-        return REFERENCES_MAP.containsKey(entry.getDOI().map(DOI::getDOI).orElse(""));
+        return REFERENCES_MAP.containsKey(
+            entry.getDOI().map(DOI::getDOI).orElse("")
+        );
     }
 }
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 d042c41df50..9dd365012b5 100644
--- a/src/main/java/org/jabref/gui/entryeditor/citationrelationtab/BibEntryRelationsRepository.java
+++ b/src/main/java/org/jabref/gui/entryeditor/citationrelationtab/BibEntryRelationsRepository.java
@@ -1,16 +1,19 @@
 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;
 
 public class BibEntryRelationsRepository {
+
     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 de5bb165576..8c72845e9ac 100644
--- a/src/main/java/org/jabref/gui/entryeditor/citationrelationtab/BibEntryView.java
+++ b/src/main/java/org/jabref/gui/entryeditor/citationrelationtab/BibEntryView.java
@@ -1,13 +1,11 @@
 package org.jabref.gui.entryeditor.citationrelationtab;
 
 import java.util.EnumSet;
-
 import javafx.scene.Node;
 import javafx.scene.control.Label;
 import javafx.scene.layout.HBox;
 import javafx.scene.layout.VBox;
 import javafx.scene.text.Text;
-
 import org.jabref.gui.icon.IconTheme;
 import org.jabref.gui.util.TextFlowLimited;
 import org.jabref.model.entry.BibEntry;
@@ -29,27 +27,39 @@ public class BibEntryView {
     public static Node getEntryNode(BibEntry entry) {
         Node entryType = getIcon(entry.getType()).getGraphicNode();
         entryType.getStyleClass().add("type");
-        Label authors = new Label(entry.getFieldOrAliasLatexFree(StandardField.AUTHOR).orElse(""));
+        Label authors = new Label(
+            entry.getFieldOrAliasLatexFree(StandardField.AUTHOR).orElse("")
+        );
         authors.getStyleClass().add("authors");
         authors.setWrapText(true);
-        Label title = new Label(entry.getFieldOrAliasLatexFree(StandardField.TITLE).orElse(""));
+        Label title = new Label(
+            entry.getFieldOrAliasLatexFree(StandardField.TITLE).orElse("")
+        );
         title.getStyleClass().add("title");
         title.setWrapText(true);
-        Label year = new Label(entry.getFieldOrAliasLatexFree(StandardField.YEAR).orElse(""));
+        Label year = new Label(
+            entry.getFieldOrAliasLatexFree(StandardField.YEAR).orElse("")
+        );
         year.getStyleClass().add("year");
-        Label journal = new Label(entry.getFieldOrAliasLatexFree(StandardField.JOURNAL).orElse(""));
+        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
+            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);
-        });
+        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 +72,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 aacbc90cc5f..eaec35059f1 100644
--- a/src/main/java/org/jabref/gui/entryeditor/citationrelationtab/CitationRelationItem.java
+++ b/src/main/java/org/jabref/gui/entryeditor/citationrelationtab/CitationRelationItem.java
@@ -6,6 +6,7 @@
  * Class to hold a BibEntry and a boolean value whether it is already in the current database or not.
  */
 public class CitationRelationItem {
+
     private final BibEntry entry;
     private final boolean 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 d3c6862aaf6..8a7326bfe28 100644
--- a/src/main/java/org/jabref/gui/entryeditor/citationrelationtab/CitationRelationsTab.java
+++ b/src/main/java/org/jabref/gui/entryeditor/citationrelationtab/CitationRelationsTab.java
@@ -1,11 +1,9 @@
 package org.jabref.gui.entryeditor.citationrelationtab;
 
+import com.tobiasdiez.easybind.EasyBind;
 import java.util.Arrays;
 import java.util.List;
 import java.util.stream.Collectors;
-
-import javax.swing.undo.UndoManager;
-
 import javafx.beans.binding.Bindings;
 import javafx.beans.binding.BooleanBinding;
 import javafx.collections.FXCollections;
@@ -23,7 +21,8 @@
 import javafx.scene.layout.HBox;
 import javafx.scene.layout.Priority;
 import javafx.scene.layout.VBox;
-
+import javax.swing.undo.UndoManager;
+import org.controlsfx.control.CheckListView;
 import org.jabref.gui.DialogService;
 import org.jabref.gui.Globals;
 import org.jabref.gui.LibraryTab;
@@ -42,9 +41,6 @@
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.util.FileUpdateMonitor;
 import org.jabref.preferences.PreferencesService;
-
-import com.tobiasdiez.easybind.EasyBind;
-import org.controlsfx.control.CheckListView;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -53,7 +49,9 @@
  */
 public class CitationRelationsTab extends EntryEditorTab {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(CitationRelationsTab.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(
+        CitationRelationsTab.class
+    );
 
     // Tasks used to implement asynchronous fetching of related articles
     private static BackgroundTask<List<BibEntry>> citingTask;
@@ -68,10 +66,16 @@ public class CitationRelationsTab extends EntryEditorTab {
     private final LibraryTab libraryTab;
     private final BibEntryRelationsRepository bibEntryRelationsRepository;
 
-    public CitationRelationsTab(EntryEditorPreferences preferences, DialogService dialogService,
-                                BibDatabaseContext databaseContext, UndoManager undoManager,
-                                StateManager stateManager, FileUpdateMonitor fileUpdateMonitor,
-                                PreferencesService preferencesService, LibraryTab lTab) {
+    public CitationRelationsTab(
+        EntryEditorPreferences preferences,
+        DialogService dialogService,
+        BibDatabaseContext databaseContext,
+        UndoManager undoManager,
+        StateManager stateManager,
+        FileUpdateMonitor fileUpdateMonitor,
+        PreferencesService preferencesService,
+        LibraryTab lTab
+    ) {
         this.preferences = preferences;
         this.dialogService = dialogService;
         this.databaseContext = databaseContext;
@@ -81,10 +85,15 @@ public CitationRelationsTab(EntryEditorPreferences preferences, DialogService di
         this.preferencesService = preferencesService;
         this.libraryTab = lTab;
         setText(Localization.lang("Citation relations"));
-        setTooltip(new Tooltip(Localization.lang("Show articles related by citation")));
-
-        this.bibEntryRelationsRepository = new BibEntryRelationsRepository(new SemanticScholarFetcher(),
-                new BibEntryRelationsCache());
+        setTooltip(
+            new Tooltip(Localization.lang("Show articles related by citation"))
+        );
+
+        this.bibEntryRelationsRepository =
+            new BibEntryRelationsRepository(
+                new SemanticScholarFetcher(),
+                new BibEntryRelationsCache()
+            );
     }
 
     /**
@@ -113,25 +122,35 @@ private SplitPane getPaneAndStartSearch(BibEntry entry) {
         styleLabel(citedByLabel);
 
         // Create ListViews
-        CheckListView<CitationRelationItem> citingListView = new CheckListView<>();
-        CheckListView<CitationRelationItem> citedByListView = new CheckListView<>();
+        CheckListView<CitationRelationItem> citingListView =
+            new CheckListView<>();
+        CheckListView<CitationRelationItem> citedByListView =
+            new CheckListView<>();
 
         // Create refresh Buttons for both sides
         Button refreshCitingButton = IconTheme.JabRefIcons.REFRESH.asButton();
-        refreshCitingButton.setTooltip(new Tooltip(Localization.lang("Restart search")));
+        refreshCitingButton.setTooltip(
+            new Tooltip(Localization.lang("Restart search"))
+        );
         styleTopBarNode(refreshCitingButton, 15.0);
         Button refreshCitedByButton = IconTheme.JabRefIcons.REFRESH.asButton();
-        refreshCitedByButton.setTooltip(new Tooltip(Localization.lang("Restart search")));
+        refreshCitedByButton.setTooltip(
+            new Tooltip(Localization.lang("Restart search"))
+        );
         styleTopBarNode(refreshCitedByButton, 15.0);
 
         // Create abort buttons for both sides
         Button abortCitingButton = IconTheme.JabRefIcons.CLOSE.asButton();
         abortCitingButton.getGraphic().resize(30, 30);
-        abortCitingButton.setTooltip(new Tooltip(Localization.lang("Cancel search")));
+        abortCitingButton.setTooltip(
+            new Tooltip(Localization.lang("Cancel search"))
+        );
         styleTopBarNode(abortCitingButton, 15.0);
         Button abortCitedButton = IconTheme.JabRefIcons.CLOSE.asButton();
         abortCitedButton.getGraphic().resize(30, 30);
-        abortCitedButton.setTooltip(new Tooltip(Localization.lang("Cancel search")));
+        abortCitedButton.setTooltip(
+            new Tooltip(Localization.lang("Cancel search"))
+        );
         styleTopBarNode(abortCitedButton, 15.0);
 
         ProgressIndicator citingProgress = new ProgressIndicator();
@@ -143,15 +162,35 @@ 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);
@@ -159,12 +198,30 @@ private SplitPane getPaneAndStartSearch(BibEntry entry) {
         citedByVBox.getChildren().addAll(citedByHBox, citedByListView);
 
         refreshCitingButton.setOnMouseClicked(event -> {
-            searchForRelations(entry, citingListView, abortCitingButton,
-                    refreshCitingButton, CitationFetcher.SearchType.CITING, importCitingButton, citingProgress, true);
+            searchForRelations(
+                entry,
+                citingListView,
+                abortCitingButton,
+                refreshCitingButton,
+                CitationFetcher.SearchType.CITING,
+                importCitingButton,
+                citingProgress,
+                true
+            );
         });
 
-        refreshCitedByButton.setOnMouseClicked(event -> searchForRelations(entry, citedByListView, abortCitedButton,
-                refreshCitedByButton, CitationFetcher.SearchType.CITED_BY, importCitedByButton, citedByProgress, 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(citedByVBox, citingVBox);
@@ -172,11 +229,27 @@ private SplitPane getPaneAndStartSearch(BibEntry entry) {
         styleFetchedListView(citingListView);
         styleFetchedListView(citedByListView);
 
-        searchForRelations(entry, citingListView, abortCitingButton, refreshCitingButton,
-                CitationFetcher.SearchType.CITING, importCitingButton, citingProgress, false);
-
-        searchForRelations(entry, citedByListView, abortCitedButton, refreshCitedByButton,
-                CitationFetcher.SearchType.CITED_BY, importCitedByButton, citedByProgress, false);
+        searchForRelations(
+            entry,
+            citingListView,
+            abortCitingButton,
+            refreshCitingButton,
+            CitationFetcher.SearchType.CITING,
+            importCitingButton,
+            citingProgress,
+            false
+        );
+
+        searchForRelations(
+            entry,
+            citedByListView,
+            abortCitedButton,
+            refreshCitedByButton,
+            CitationFetcher.SearchType.CITED_BY,
+            importCitedByButton,
+            citedByProgress,
+            false
+        );
 
         return container;
     }
@@ -186,54 +259,81 @@ private SplitPane getPaneAndStartSearch(BibEntry entry) {
      *
      * @param listView CheckListView to style
      */
-    private void styleFetchedListView(CheckListView<CitationRelationItem> listView) {
+    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.getEntry());
-                    HBox.setHgrow(entryNode, Priority.ALWAYS);
-                    HBox hContainer = new HBox();
-                    hContainer.prefWidthProperty().bind(listView.widthProperty().subtract(25));
-
-                    if (entry.isLocal()) {
-                        Button jumpTo = IconTheme.JabRefIcons.LINK.asButton();
-                        jumpTo.setTooltip(new Tooltip(Localization.lang("Jump to entry in database")));
-                        jumpTo.getStyleClass().add("addEntryButton");
-                        jumpTo.setOnMouseClicked(event -> {
-                            libraryTab.showAndEdit(entry.getEntry());
-                            libraryTab.clearAndSelect(entry.getEntry());
-                            citingTask.cancel();
-                            citedByTask.cancel();
-                        });
-                        hContainer.getChildren().addAll(entryNode, separator, jumpTo);
-                    } else {
-                        ToggleButton addToggle = IconTheme.JabRefIcons.ADD.asToggleButton();
-                        addToggle.setTooltip(new Tooltip(Localization.lang("Select entry")));
-                        EasyBind.subscribe(addToggle.selectedProperty(), selected -> {
+            .withGraphic(entry -> {
+                HBox separator = new HBox();
+                HBox.setHgrow(separator, Priority.SOMETIMES);
+                Node entryNode = BibEntryView.getEntryNode(entry.getEntry());
+                HBox.setHgrow(entryNode, Priority.ALWAYS);
+                HBox hContainer = new HBox();
+                hContainer
+                    .prefWidthProperty()
+                    .bind(listView.widthProperty().subtract(25));
+
+                if (entry.isLocal()) {
+                    Button jumpTo = IconTheme.JabRefIcons.LINK.asButton();
+                    jumpTo.setTooltip(
+                        new Tooltip(
+                            Localization.lang("Jump to entry in database")
+                        )
+                    );
+                    jumpTo.getStyleClass().add("addEntryButton");
+                    jumpTo.setOnMouseClicked(event -> {
+                        libraryTab.showAndEdit(entry.getEntry());
+                        libraryTab.clearAndSelect(entry.getEntry());
+                        citingTask.cancel();
+                        citedByTask.cancel();
+                    });
+                    hContainer
+                        .getChildren()
+                        .addAll(entryNode, separator, 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());
+                                addToggle.setGraphic(
+                                    IconTheme.JabRefIcons.ADD_FILLED
+                                        .withColor(IconTheme.SELECTED_COLOR)
+                                        .getGraphicNode()
+                                );
                             } else {
-                                addToggle.setGraphic(IconTheme.JabRefIcons.ADD.getGraphicNode());
+                                addToggle.setGraphic(
+                                    IconTheme.JabRefIcons.ADD.getGraphicNode()
+                                );
                             }
-                        });
-                        addToggle.getStyleClass().add("addEntryButton");
-                        addToggle.selectedProperty().bindBidirectional(listView.getItemBooleanProperty(entry));
-                        hContainer.getChildren().addAll(entryNode, separator, addToggle);
-                    }
-                    hContainer.getStyleClass().add("entry-container");
+                        }
+                    );
+                    addToggle.getStyleClass().add("addEntryButton");
+                    addToggle
+                        .selectedProperty()
+                        .bindBidirectional(
+                            listView.getItemBooleanProperty(entry)
+                        );
+                    hContainer
+                        .getChildren()
+                        .addAll(entryNode, separator, addToggle);
+                }
+                hContainer.getStyleClass().add("entry-container");
 
-                    return hContainer;
-                })
-                .withOnMouseClickedEvent((ee, event) -> {
-                    if (!ee.isLocal()) {
-                        listView.getCheckModel().toggleCheckState(ee);
-                    }
-                })
-                .withPseudoClass(entrySelected, listView::getItemBooleanProperty)
-                .install(listView);
+                return hContainer;
+            })
+            .withOnMouseClickedEvent((ee, event) -> {
+                if (!ee.isLocal()) {
+                    listView.getCheckModel().toggleCheckState(ee);
+                }
+            })
+            .withPseudoClass(entrySelected, listView::getItemBooleanProperty)
+            .install(listView);
 
         listView.setSelectionModel(new NoSelectionModel<>());
     }
@@ -289,87 +389,165 @@ 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;
         }
 
-        ObservableList<CitationRelationItem> observableList = FXCollections.observableArrayList();
+        ObservableList<CitationRelationItem> observableList =
+            FXCollections.observableArrayList();
 
         listView.setItems(observableList);
 
-        if (citingTask != null && !citingTask.isCanceled() && searchType == CitationFetcher.SearchType.CITING) {
+        if (
+            citingTask != null &&
+            !citingTask.isCanceled() &&
+            searchType == CitationFetcher.SearchType.CITING
+        ) {
             citingTask.cancel();
-        } else if (citedByTask != null && !citedByTask.isCanceled() && searchType == CitationFetcher.SearchType.CITED_BY) {
+        } else if (
+            citedByTask != null &&
+            !citedByTask.isCanceled() &&
+            searchType == CitationFetcher.SearchType.CITED_BY
+        ) {
             citedByTask.cancel();
         }
 
         BackgroundTask<List<BibEntry>> task;
 
         if (searchType == CitationFetcher.SearchType.CITING) {
-            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(Globals.TASK_EXECUTOR);
+        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(Globals.TASK_EXECUTOR);
     }
 
-    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 -> new CitationRelationItem(entr, false))
-                .collect(Collectors.toList()));
+        observableList.setAll(
+            fetchedList
+                .stream()
+                .map(entr -> new CitationRelationItem(entr, false))
+                .collect(Collectors.toList())
+        );
 
         if (!observableList.isEmpty()) {
             listView.refresh();
         } else {
-            Label placeholder = new Label(Localization.lang("No articles found"));
+            Label placeholder = new Label(
+                Localization.lang("No articles found")
+            );
             listView.setPlaceholder(placeholder);
         }
-        BooleanBinding booleanBind = Bindings.isEmpty(listView.getCheckModel().getCheckedItems());
+        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);
 
@@ -396,20 +574,32 @@ private void showNodes(Node... nodes) {
      *
      * @param entriesToImport entries to import
      */
-    private void importEntries(List<CitationRelationItem> entriesToImport, CitationFetcher.SearchType searchType, BibEntry entry) {
+    private void importEntries(
+        List<CitationRelationItem> entriesToImport,
+        CitationFetcher.SearchType searchType,
+        BibEntry entry
+    ) {
         citingTask.cancel();
         citedByTask.cancel();
-        List<BibEntry> entries = entriesToImport.stream().map(CitationRelationItem::getEntry).collect(Collectors.toList());
+        List<BibEntry> entries = entriesToImport
+            .stream()
+            .map(CitationRelationItem::getEntry)
+            .collect(Collectors.toList());
         ImportHandler importHandler = new ImportHandler(
-                databaseContext,
-                preferencesService,
-                fileUpdateMonitor,
-                undoManager,
-                stateManager,
-                dialogService,
-                Globals.TASK_EXECUTOR);
+            databaseContext,
+            preferencesService,
+            fileUpdateMonitor,
+            undoManager,
+            stateManager,
+            dialogService,
+            Globals.TASK_EXECUTOR
+        );
         importHandler.importEntries(entries);
 
-        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/semanticscholar/AuthorResponse.java b/src/main/java/org/jabref/gui/entryeditor/citationrelationtab/semanticscholar/AuthorResponse.java
index f23ba10a54f..72a34722bec 100644
--- a/src/main/java/org/jabref/gui/entryeditor/citationrelationtab/semanticscholar/AuthorResponse.java
+++ b/src/main/java/org/jabref/gui/entryeditor/citationrelationtab/semanticscholar/AuthorResponse.java
@@ -1,6 +1,7 @@
 package org.jabref.gui.entryeditor.citationrelationtab.semanticscholar;
 
 public class AuthorResponse {
+
     private String authorId;
     private String name;
 
diff --git a/src/main/java/org/jabref/gui/entryeditor/citationrelationtab/semanticscholar/CitationDataItem.java b/src/main/java/org/jabref/gui/entryeditor/citationrelationtab/semanticscholar/CitationDataItem.java
index 50a3143bf6c..93dcf653322 100644
--- a/src/main/java/org/jabref/gui/entryeditor/citationrelationtab/semanticscholar/CitationDataItem.java
+++ b/src/main/java/org/jabref/gui/entryeditor/citationrelationtab/semanticscholar/CitationDataItem.java
@@ -1,6 +1,7 @@
 package org.jabref.gui.entryeditor.citationrelationtab.semanticscholar;
 
 public class CitationDataItem {
+
     private PaperDetails citingPaper;
 
     public PaperDetails getCitingPaper() {
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 4b10cadce4f..ff338f42f23 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,7 +1,6 @@
 package org.jabref.gui.entryeditor.citationrelationtab.semanticscholar;
 
 import java.util.List;
-
 import org.jabref.logic.importer.FetcherException;
 import org.jabref.model.entry.BibEntry;
 
@@ -9,7 +8,6 @@
  * Searches web resources for citing related articles based on a {@link BibEntry}.
  */
 public interface CitationFetcher {
-
     /**
      * Possible search methods
      */
diff --git a/src/main/java/org/jabref/gui/entryeditor/citationrelationtab/semanticscholar/CitationsResponse.java b/src/main/java/org/jabref/gui/entryeditor/citationrelationtab/semanticscholar/CitationsResponse.java
index c87eb9346c2..c57b69cd09f 100644
--- a/src/main/java/org/jabref/gui/entryeditor/citationrelationtab/semanticscholar/CitationsResponse.java
+++ b/src/main/java/org/jabref/gui/entryeditor/citationrelationtab/semanticscholar/CitationsResponse.java
@@ -3,6 +3,7 @@
 import java.util.List;
 
 public class CitationsResponse {
+
     private int offset;
     private int next;
     private List<CitationDataItem> data;
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 48db00777cf..97012f20718 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
@@ -2,11 +2,11 @@
 
 import java.util.List;
 import java.util.stream.Collectors;
-
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.field.StandardField;
 
 public class PaperDetails {
+
     private String paperId;
     private String title;
     private String year;
@@ -65,9 +65,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);
 
         return bibEntry;
@@ -75,12 +76,22 @@ 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/ReferenceDataItem.java b/src/main/java/org/jabref/gui/entryeditor/citationrelationtab/semanticscholar/ReferenceDataItem.java
index 4df4c64ea6a..d940e1a5bd8 100644
--- a/src/main/java/org/jabref/gui/entryeditor/citationrelationtab/semanticscholar/ReferenceDataItem.java
+++ b/src/main/java/org/jabref/gui/entryeditor/citationrelationtab/semanticscholar/ReferenceDataItem.java
@@ -1,6 +1,7 @@
 package org.jabref.gui.entryeditor.citationrelationtab.semanticscholar;
 
 public class ReferenceDataItem {
+
     private PaperDetails citedPaper;
 
     public PaperDetails getCitedPaper() {
diff --git a/src/main/java/org/jabref/gui/entryeditor/citationrelationtab/semanticscholar/ReferencesResponse.java b/src/main/java/org/jabref/gui/entryeditor/citationrelationtab/semanticscholar/ReferencesResponse.java
index 8f5506d9cb6..9a135345f94 100644
--- a/src/main/java/org/jabref/gui/entryeditor/citationrelationtab/semanticscholar/ReferencesResponse.java
+++ b/src/main/java/org/jabref/gui/entryeditor/citationrelationtab/semanticscholar/ReferencesResponse.java
@@ -3,6 +3,7 @@
 import java.util.List;
 
 public class ReferencesResponse {
+
     private int offset;
     private int next;
     private List<ReferenceDataItem> data;
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 6699596a7be..3786747f3d1 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,40 +1,50 @@
 package org.jabref.gui.entryeditor.citationrelationtab.semanticscholar;
 
+import com.google.gson.Gson;
 import java.io.IOException;
 import java.net.URI;
 import java.net.URL;
 import java.util.ArrayList;
 import java.util.List;
-
 import org.jabref.logic.importer.FetcherException;
 import org.jabref.logic.net.URLDownload;
 import org.jabref.model.entry.BibEntry;
 
-import com.google.gson.Gson;
-
 public class SemanticScholarFetcher implements CitationFetcher {
-    private static final String SEMANTIC_SCHOLAR_API = "https://api.semanticscholar.org/graph/v1/";
+
+    private static final String SEMANTIC_SCHOLAR_API =
+        "https://api.semanticscholar.org/graph/v1/";
 
     @Override
-    public List<BibEntry> searchCitedBy(BibEntry entry) throws FetcherException {
+    public List<BibEntry> searchCitedBy(BibEntry entry)
+        throws FetcherException {
         if (entry.getDOI().isPresent()) {
             StringBuilder urlBuilder = new StringBuilder(SEMANTIC_SCHOLAR_API)
-                    .append("paper/")
-                    .append("DOI:").append(entry.getDOI().get().getDOI())
-                    .append("/citations")
-                    .append("?fields=").append("title,authors,year,citationCount,referenceCount")
-                    .append("&limit=1000");
+                .append("paper/")
+                .append("DOI:")
+                .append(entry.getDOI().get().getDOI())
+                .append("/citations")
+                .append("?fields=")
+                .append("title,authors,year,citationCount,referenceCount")
+                .append("&limit=1000");
 
             try {
                 URL citationsUrl = URI.create(urlBuilder.toString()).toURL();
 
                 URLDownload urlDownload = new URLDownload(citationsUrl);
                 CitationsResponse citationsResponse = new Gson()
-                        .fromJson(urlDownload.asString(), CitationsResponse.class);
+                    .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();
             } catch (IOException e) {
                 throw new RuntimeException(e);
             }
@@ -47,22 +57,30 @@ public List<BibEntry> searchCitedBy(BibEntry entry) throws FetcherException {
     public List<BibEntry> searchCiting(BibEntry entry) {
         if (entry.getDOI().isPresent()) {
             StringBuilder urlBuilder = new StringBuilder(SEMANTIC_SCHOLAR_API)
-                    .append("paper/")
-                    .append("DOI:").append(entry.getDOI().get().getDOI())
-                    .append("/references")
-                    .append("?fields=").append("title,authors,year,citationCount,referenceCount")
-                    .append("&limit=1000");
+                .append("paper/")
+                .append("DOI:")
+                .append(entry.getDOI().get().getDOI())
+                .append("/references")
+                .append("?fields=")
+                .append("title,authors,year,citationCount,referenceCount")
+                .append("&limit=1000");
             try {
                 URL referencesUrl = URI.create(urlBuilder.toString()).toURL();
 
                 URLDownload urlDownload = new URLDownload(referencesUrl);
                 ReferencesResponse referencesResponse = new Gson()
-                        .fromJson(urlDownload.asString(), ReferencesResponse.class);
+                    .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();
             } catch (IOException e) {
                 throw new RuntimeException(e);
             }
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 338cc91872b..b3c444f286a 100644
--- a/src/main/java/org/jabref/gui/entryeditor/fileannotationtab/FileAnnotationTab.java
+++ b/src/main/java/org/jabref/gui/entryeditor/fileannotationtab/FileAnnotationTab.java
@@ -1,16 +1,14 @@
 package org.jabref.gui.entryeditor.fileannotationtab;
 
+import com.airhacks.afterburner.views.ViewLoader;
 import javafx.scene.Parent;
 import javafx.scene.control.Tooltip;
-
 import org.jabref.gui.entryeditor.EntryEditorTab;
 import org.jabref.logic.l10n.Localization;
 import org.jabref.logic.pdf.FileAnnotationCache;
 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 +28,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 24c75fe9aa0..1b78970524c 100644
--- a/src/main/java/org/jabref/gui/entryeditor/fileannotationtab/FileAnnotationTabView.java
+++ b/src/main/java/org/jabref/gui/entryeditor/fileannotationtab/FileAnnotationTabView.java
@@ -1,7 +1,8 @@
 package org.jabref.gui.entryeditor.fileannotationtab;
 
+import com.tobiasdiez.easybind.EasyBind;
+import jakarta.inject.Inject;
 import java.nio.file.Path;
-
 import javafx.beans.binding.Bindings;
 import javafx.collections.ListChangeListener;
 import javafx.fxml.FXML;
@@ -18,26 +19,38 @@
 import javafx.scene.layout.GridPane;
 import javafx.scene.layout.VBox;
 import javafx.scene.text.TextAlignment;
-
 import org.jabref.gui.util.ViewModelListCellFactory;
 import org.jabref.logic.l10n.Localization;
 import org.jabref.logic.pdf.FileAnnotationCache;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.util.FileUpdateMonitor;
 
-import com.tobiasdiez.easybind.EasyBind;
-import jakarta.inject.Inject;
-
 public class FileAnnotationTabView {
 
-    @FXML public ComboBox<Path> files;
-    @FXML public ListView<FileAnnotationViewModel> annotationList;
-    @FXML public Label author;
-    @FXML public Label page;
-    @FXML public Label date;
-    @FXML public TextArea content;
-    @FXML public TextArea marking;
-    @FXML public VBox details;
+    @FXML
+    public ComboBox<Path> files;
+
+    @FXML
+    public ListView<FileAnnotationViewModel> annotationList;
+
+    @FXML
+    public Label author;
+
+    @FXML
+    public Label page;
+
+    @FXML
+    public Label date;
+
+    @FXML
+    public TextArea content;
+
+    @FXML
+    public TextArea marking;
+
+    @FXML
+    public VBox details;
+
     private final BibEntry entry;
     private final FileAnnotationCache fileAnnotationCache;
     private FileAnnotationTabViewModel viewModel;
@@ -45,35 +58,78 @@ public class FileAnnotationTabView {
     @Inject
     private FileUpdateMonitor fileMonitor;
 
-    public FileAnnotationTabView(BibEntry entry, FileAnnotationCache fileAnnotationCache) {
+    public FileAnnotationTabView(
+        BibEntry entry,
+        FileAnnotationCache fileAnnotationCache
+    ) {
         this.entry = entry;
         this.fileAnnotationCache = fileAnnotationCache;
     }
 
     @FXML
     public void initialize() {
-        viewModel = new FileAnnotationTabViewModel(fileAnnotationCache, entry, fileMonitor);
+        viewModel =
+            new FileAnnotationTabViewModel(
+                fileAnnotationCache,
+                entry,
+                fileMonitor
+            );
 
         // 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>()
+        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.setCellFactory(cellFactory);
-        annotationList.setPlaceholder(new Label(Localization.lang("File has no attached annotations")));
-        Bindings.bindContent(annotationList.itemsProperty().get(), viewModel.annotationsProperty());
+        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());
     }
 
@@ -91,7 +147,9 @@ private Node createFileAnnotationNode(FileAnnotationViewModel annotation) {
         Label marking = new Label(annotation.getMarking());
         Label author = new Label(annotation.getAuthor());
         Label date = new Label(annotation.getDate());
-        Label page = new Label(Localization.lang("Page") + ": " + annotation.getPage());
+        Label page = new Label(
+            Localization.lang("Page") + ": " + annotation.getPage()
+        );
 
         marking.setStyle("-fx-font-size: 0.75em; -fx-font-weight: bold");
         marking.setMaxHeight(30);
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 ff0283a92ee..55debaa6886 100644
--- a/src/main/java/org/jabref/gui/entryeditor/fileannotationtab/FileAnnotationTabViewModel.java
+++ b/src/main/java/org/jabref/gui/entryeditor/fileannotationtab/FileAnnotationTabViewModel.java
@@ -8,14 +8,12 @@
 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;
 import javafx.beans.property.SimpleListProperty;
 import javafx.beans.property.SimpleObjectProperty;
 import javafx.collections.FXCollections;
-
 import org.jabref.gui.AbstractViewModel;
 import org.jabref.gui.Globals;
 import org.jabref.gui.util.DefaultTaskExecutor;
@@ -26,17 +24,24 @@
 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;
 
 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 ReadOnlyBooleanProperty annotationEmpty = annotations.emptyProperty();
+    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 ReadOnlyBooleanProperty annotationEmpty =
+        annotations.emptyProperty();
 
     private final FileAnnotationCache cache;
     private final BibEntry entry;
@@ -45,7 +50,11 @@ public class FileAnnotationTabViewModel extends AbstractViewModel {
     private final FileUpdateMonitor fileMonitor;
     private final FileUpdateListener fileListener = this::reloadAnnotations;
 
-    public FileAnnotationTabViewModel(FileAnnotationCache cache, BibEntry entry, FileUpdateMonitor fileMonitor) {
+    public FileAnnotationTabViewModel(
+        FileAnnotationCache cache,
+        BibEntry entry,
+        FileUpdateMonitor fileMonitor
+    ) {
         this.cache = cache;
         this.entry = entry;
         this.fileMonitor = fileMonitor;
@@ -70,7 +79,9 @@ public ListProperty<Path> filesProperty() {
         return files;
     }
 
-    public void notifyNewSelectedAnnotation(FileAnnotationViewModel newAnnotation) {
+    public void notifyNewSelectedAnnotation(
+        FileAnnotationViewModel newAnnotation
+    ) {
         currentAnnotation.set(newAnnotation);
     }
 
@@ -78,21 +89,26 @@ public void notifyNewSelectedFile(Path newFile) {
         fileMonitor.removeListener(currentFile, fileListener);
         currentFile = newFile;
 
-        Comparator<FileAnnotation> byPage = Comparator.comparingInt(FileAnnotation::getPage);
+        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());
+            .getOrDefault(currentFile, new ArrayList<>())
+            .stream()
+            .filter(annotation -> (null != annotation.getContent()))
+            .sorted(byPage)
+            .map(FileAnnotationViewModel::new)
+            .collect(Collectors.toList());
         annotations.setAll(newAnnotations);
 
         try {
             fileMonitor.addListenerForFile(currentFile, fileListener);
         } catch (IOException e) {
-            LOGGER.error("Problem while watching file for changes " + currentFile, e);
+            LOGGER.error(
+                "Problem while watching file for changes " + currentFile,
+                e
+            );
         }
     }
 
@@ -117,11 +133,27 @@ public void copyCurrentAnnotation() {
             return;
         }
         StringJoiner sj = new StringJoiner("," + OS.NEWLINE);
-        sj.add(Localization.lang("Author") + ": " + getCurrentAnnotation().getAuthor());
-        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("Author") +
+            ": " +
+            getCurrentAnnotation().getAuthor()
+        );
+        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()
+        );
 
         Globals.getClipboardManager().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 d6cd4175103..7adc83ce7d8 100644
--- a/src/main/java/org/jabref/gui/entryeditor/fileannotationtab/FileAnnotationViewModel.java
+++ b/src/main/java/org/jabref/gui/entryeditor/fileannotationtab/FileAnnotationViewModel.java
@@ -2,7 +2,6 @@
 
 import javafx.beans.property.SimpleStringProperty;
 import javafx.beans.property.StringProperty;
-
 import org.jabref.logic.formatter.bibtexfields.RemoveHyphenatedNewlinesFormatter;
 import org.jabref.logic.l10n.Localization;
 import org.jabref.model.pdf.FileAnnotation;
@@ -30,8 +29,12 @@ 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();
@@ -88,10 +91,14 @@ public StringProperty authorProperty() {
     @Override
     public String toString() {
         if (annotation.hasLinkedAnnotation() && this.getContent().isEmpty()) {
-            if (FileAnnotationType.UNDERLINE == annotation.getAnnotationType()) {
+            if (
+                FileAnnotationType.UNDERLINE == annotation.getAnnotationType()
+            ) {
                 return Localization.lang("Empty Underline");
             }
-            if (FileAnnotationType.HIGHLIGHT == annotation.getAnnotationType()) {
+            if (
+                FileAnnotationType.HIGHLIGHT == annotation.getAnnotationType()
+            ) {
                 return Localization.lang("Empty Highlight");
             }
             return Localization.lang("Empty Marking");
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 00f7612f6fb..7f88862c415 100644
--- a/src/main/java/org/jabref/gui/entryeditor/fileannotationtab/FulltextSearchResultsTab.java
+++ b/src/main/java/org/jabref/gui/entryeditor/fileannotationtab/FulltextSearchResultsTab.java
@@ -4,7 +4,6 @@
 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;
@@ -14,7 +13,6 @@
 import javafx.scene.input.MouseButton;
 import javafx.scene.text.Text;
 import javafx.scene.text.TextFlow;
-
 import org.jabref.gui.DialogService;
 import org.jabref.gui.StateManager;
 import org.jabref.gui.actions.ActionFactory;
@@ -33,14 +31,15 @@
 import org.jabref.model.pdf.search.SearchResult;
 import org.jabref.model.search.rules.SearchRules;
 import org.jabref.preferences.PreferencesService;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 public class FulltextSearchResultsTab extends EntryEditorTab {
 
     public static final String NAME = "Search results";
-    private static final Logger LOGGER = LoggerFactory.getLogger(FulltextSearchResultsTab.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(
+        FulltextSearchResultsTab.class
+    );
 
     private final StateManager stateManager;
     private final PreferencesService preferencesService;
@@ -54,14 +53,17 @@ public class FulltextSearchResultsTab extends EntryEditorTab {
 
     private DocumentViewerView documentViewerView;
 
-    public FulltextSearchResultsTab(StateManager stateManager,
-                                    PreferencesService preferencesService,
-                                    DialogService dialogService,
-                                    TaskExecutor taskExecutor) {
+    public FulltextSearchResultsTab(
+        StateManager stateManager,
+        PreferencesService preferencesService,
+        DialogService dialogService,
+        TaskExecutor taskExecutor
+    ) {
         this.stateManager = stateManager;
         this.preferencesService = preferencesService;
         this.dialogService = dialogService;
-        this.actionFactory = new ActionFactory(preferencesService.getKeyBindingRepository());
+        this.actionFactory =
+            new ActionFactory(preferencesService.getKeyBindingRepository());
         this.taskExecutor = taskExecutor;
 
         content = new TextFlow();
@@ -70,15 +72,28 @@ public FulltextSearchResultsTab(StateManager stateManager,
         content.setPadding(new Insets(10));
         setContent(scrollPane);
         setText(Localization.lang("Search results"));
-        this.stateManager.activeSearchQueryProperty().addListener((observable, oldValue, newValue) -> bindToEntry(entry));
+        this.stateManager.activeSearchQueryProperty()
+            .addListener((observable, oldValue, newValue) -> bindToEntry(entry)
+            );
     }
 
     @Override
     public boolean shouldShow(BibEntry entry) {
-        return this.stateManager.activeSearchQueryProperty().isPresent().get() &&
-                this.stateManager.activeSearchQueryProperty().get().isPresent() &&
-                this.stateManager.activeSearchQueryProperty().get().get().getSearchFlags().contains(SearchRules.SearchFlags.FULLTEXT) &&
-                this.stateManager.activeSearchQueryProperty().get().get().getQuery().length() > 0;
+        return (
+            this.stateManager.activeSearchQueryProperty().isPresent().get() &&
+            this.stateManager.activeSearchQueryProperty().get().isPresent() &&
+            this.stateManager.activeSearchQueryProperty()
+                .get()
+                .get()
+                .getSearchFlags()
+                .contains(SearchRules.SearchFlags.FULLTEXT) &&
+            this.stateManager.activeSearchQueryProperty()
+                    .get()
+                    .get()
+                    .getQuery()
+                    .length() >
+                0
+        );
     }
 
     @Override
@@ -90,32 +105,79 @@ protected void bindToEntry(BibEntry entry) {
             documentViewerView = new DocumentViewerView();
         }
         this.entry = entry;
-        PdfSearchResults searchResults = stateManager.activeSearchQueryProperty().get().get().getRule().getFulltextResults(stateManager.activeSearchQueryProperty().get().get().getQuery(), entry);
+        PdfSearchResults searchResults = stateManager
+            .activeSearchQueryProperty()
+            .get()
+            .get()
+            .getRule()
+            .getFulltextResults(
+                stateManager.activeSearchQueryProperty().get().get().getQuery(),
+                entry
+            );
 
         content.getChildren().clear();
 
         if (searchResults.numSearchResults() == 0) {
-            content.getChildren().add(new Text(Localization.lang("No search matches.")));
+            content
+                .getChildren()
+                .add(new Text(Localization.lang("No search matches.")));
         }
 
         // Iterate through files with search hits
-        for (Map.Entry<String, List<SearchResult>> resultsForPath : searchResults.getSearchResultsByPath().entrySet()) {
-            content.getChildren().addAll(createFileLink(resultsForPath.getKey()), lineSeparator());
+        for (Map.Entry<
+            String,
+            List<SearchResult>
+        > resultsForPath : searchResults.getSearchResultsByPath().entrySet()) {
+            content
+                .getChildren()
+                .addAll(
+                    createFileLink(resultsForPath.getKey()),
+                    lineSeparator()
+                );
 
             // Iterate through pages (within file) with search hits
             for (SearchResult searchResult : resultsForPath.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(searchResult.getPageNumber()));
+                    content
+                        .getChildren()
+                        .addAll(
+                            TooltipTextUtil.createTextsFromHtml(
+                                resultTextHtml.replace("</b> <b>", " ")
+                            )
+                        );
+                    content
+                        .getChildren()
+                        .addAll(
+                            new Text(System.lineSeparator()),
+                            lineSeparator(0.8),
+                            createPageLink(searchResult.getPageNumber())
+                        );
                 }
                 if (!searchResult.getAnnotationsResultStringsHtml().isEmpty()) {
-                    Text annotationsText = new Text(System.lineSeparator() + Localization.lang("Found matches in Annotations:") + System.lineSeparator() + System.lineSeparator());
+                    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(searchResult.getPageNumber()));
+                    content
+                        .getChildren()
+                        .addAll(
+                            TooltipTextUtil.createTextsFromHtml(
+                                resultTextHtml.replace("</b> <b>", " ")
+                            )
+                        );
+                    content
+                        .getChildren()
+                        .addAll(
+                            new Text(System.lineSeparator()),
+                            lineSeparator(0.8),
+                            createPageLink(searchResult.getPageNumber())
+                        );
                 }
             }
         }
@@ -123,29 +185,51 @@ protected void bindToEntry(BibEntry entry) {
 
     private Text createFileLink(String pathToFile) {
         LinkedFile linkedFile = new LinkedFile("", Path.of(pathToFile), "pdf");
-        Text fileLinkText = new Text(Localization.lang("Found match in %0", pathToFile) + System.lineSeparator() + System.lineSeparator());
+        Text fileLinkText = new Text(
+            Localization.lang("Found match in %0", pathToFile) +
+            System.lineSeparator() +
+            System.lineSeparator()
+        );
         fileLinkText.setStyle("-fx-font-weight: bold;");
 
         ContextMenu fileContextMenu = getFileContextMenu(linkedFile);
-        Path resolvedPath = linkedFile.findIn(stateManager.getActiveDatabase().get(), preferencesService.getFilePreferences()).orElse(Path.of(pathToFile));
-        Tooltip fileLinkTooltip = new Tooltip(resolvedPath.toAbsolutePath().toString());
+        Path resolvedPath = linkedFile
+            .findIn(
+                stateManager.getActiveDatabase().get(),
+                preferencesService.getFilePreferences()
+            )
+            .orElse(Path.of(pathToFile));
+        Tooltip fileLinkTooltip = new Tooltip(
+            resolvedPath.toAbsolutePath().toString()
+        );
         Tooltip.install(fileLinkText, fileLinkTooltip);
         fileLinkText.setOnMouseClicked(event -> {
             if (MouseButton.PRIMARY.equals(event.getButton())) {
                 try {
-                    JabRefDesktop.openBrowser(resolvedPath.toUri(), preferencesService.getFilePreferences());
+                    JabRefDesktop.openBrowser(
+                        resolvedPath.toUri(),
+                        preferencesService.getFilePreferences()
+                    );
                 } catch (IOException e) {
                     LOGGER.error("Cannot open {}.", resolvedPath.toString(), e);
                 }
             } else {
-                fileContextMenu.show(fileLinkText, event.getScreenX(), event.getScreenY());
+                fileContextMenu.show(
+                    fileLinkText,
+                    event.getScreenX(),
+                    event.getScreenY()
+                );
             }
         });
         return fileLinkText;
     }
 
     private Text createPageLink(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 -> {
@@ -160,10 +244,34 @@ private Text createPageLink(int pageNumber) {
 
     private ContextMenu getFileContextMenu(LinkedFile file) {
         ContextMenu fileContextMenu = new ContextMenu();
-        fileContextMenu.getItems().add(actionFactory.createMenuItem(
-                StandardActions.OPEN_FOLDER, new OpenFolderAction(dialogService, stateManager, preferencesService, entry, file, taskExecutor)));
-        fileContextMenu.getItems().add(actionFactory.createMenuItem(
-                StandardActions.OPEN_EXTERNAL_FILE, new OpenExternalFileAction(dialogService, stateManager, preferencesService, taskExecutor)));
+        fileContextMenu
+            .getItems()
+            .add(
+                actionFactory.createMenuItem(
+                    StandardActions.OPEN_FOLDER,
+                    new OpenFolderAction(
+                        dialogService,
+                        stateManager,
+                        preferencesService,
+                        entry,
+                        file,
+                        taskExecutor
+                    )
+                )
+            );
+        fileContextMenu
+            .getItems()
+            .add(
+                actionFactory.createMenuItem(
+                    StandardActions.OPEN_EXTERNAL_FILE,
+                    new OpenExternalFileAction(
+                        dialogService,
+                        stateManager,
+                        preferencesService,
+                        taskExecutor
+                    )
+                )
+            );
         return fileContextMenu;
     }
 
@@ -173,7 +281,9 @@ private Separator lineSeparator() {
 
     private Separator lineSeparator(double widthMultiplier) {
         Separator lineSeparator = new Separator(Orientation.HORIZONTAL);
-        lineSeparator.prefWidthProperty().bind(content.widthProperty().multiply(widthMultiplier));
+        lineSeparator
+            .prefWidthProperty()
+            .bind(content.widthProperty().multiply(widthMultiplier));
         lineSeparator.setPrefHeight(15);
         return lineSeparator;
     }
diff --git a/src/main/java/org/jabref/gui/errorconsole/ErrorConsoleView.java b/src/main/java/org/jabref/gui/errorconsole/ErrorConsoleView.java
index daf9fb35fe9..728943b7509 100644
--- a/src/main/java/org/jabref/gui/errorconsole/ErrorConsoleView.java
+++ b/src/main/java/org/jabref/gui/errorconsole/ErrorConsoleView.java
@@ -1,5 +1,7 @@
 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;
@@ -15,7 +17,6 @@
 import javafx.scene.layout.VBox;
 import javafx.stage.Modality;
 import javafx.util.Callback;
-
 import org.jabref.gui.ClipBoardManager;
 import org.jabref.gui.DialogService;
 import org.jabref.gui.icon.IconTheme;
@@ -28,97 +29,153 @@
 import org.jabref.logic.util.BuildInfo;
 import org.jabref.preferences.PreferencesService;
 
-import com.airhacks.afterburner.views.ViewLoader;
-import jakarta.inject.Inject;
-
 public class ErrorConsoleView extends BaseDialog<Void> {
 
     private ErrorConsoleViewModel viewModel;
 
-    @FXML private ButtonType copyLogButton;
-    @FXML private ButtonType clearLogButton;
-    @FXML private ButtonType createIssueButton;
-    @FXML private ListView<LogEventViewModel> messagesListView;
-    @FXML private Label descriptionLabel;
+    @FXML
+    private ButtonType copyLogButton;
+
+    @FXML
+    private ButtonType clearLogButton;
 
-    @Inject private DialogService dialogService;
-    @Inject private PreferencesService preferencesService;
-    @Inject private ClipBoardManager clipBoardManager;
-    @Inject private BuildInfo buildInfo;
-    @Inject private KeyBindingRepository keyBindingRepository;
-    @Inject private ThemeManager themeManager;
+    @FXML
+    private ButtonType createIssueButton;
+
+    @FXML
+    private ListView<LogEventViewModel> messagesListView;
+
+    @FXML
+    private Label descriptionLabel;
+
+    @Inject
+    private DialogService dialogService;
+
+    @Inject
+    private PreferencesService preferencesService;
+
+    @Inject
+    private ClipBoardManager clipBoardManager;
+
+    @Inject
+    private BuildInfo buildInfo;
+
+    @Inject
+    private KeyBindingRepository keyBindingRepository;
+
+    @Inject
+    private ThemeManager themeManager;
 
     public ErrorConsoleView() {
         this.setTitle(Localization.lang("Event log"));
         this.initModality(Modality.NONE);
 
-        ViewLoader.view(this)
-                  .load()
-                  .setAsDialogPane(this);
-
-        ControlHelper.setAction(copyLogButton, getDialogPane(), event -> copyLog());
-        ControlHelper.setAction(clearLogButton, getDialogPane(), event -> clearLog());
-        ControlHelper.setAction(createIssueButton, getDialogPane(), event -> createIssue());
+        ViewLoader.view(this).load().setAsDialogPane(this);
+
+        ControlHelper.setAction(
+            copyLogButton,
+            getDialogPane(),
+            event -> copyLog()
+        );
+        ControlHelper.setAction(
+            clearLogButton,
+            getDialogPane(),
+            event -> clearLog()
+        );
+        ControlHelper.setAction(
+            createIssueButton,
+            getDialogPane(),
+            event -> createIssue()
+        );
 
         themeManager.updateFontStyle(getDialogPane().getScene());
     }
 
     @FXML
     private void initialize() {
-        viewModel = new ErrorConsoleViewModel(dialogService, preferencesService, clipBoardManager, buildInfo);
+        viewModel =
+            new ErrorConsoleViewModel(
+                dialogService,
+                preferencesService,
+                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);
-            }
-        }));
-        descriptionLabel.setGraphic(IconTheme.JabRefIcons.CONSOLE.getGraphicNode());
+        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);
+                        }
+                    })
+            );
+        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);
+    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);
+                    }
                 }
-            }
-        };
+            };
     }
 
     @FXML
     private void copySelectedLogEntries(KeyEvent event) {
-        if (keyBindingRepository.checkKeyCombinationEquality(KeyBinding.COPY, event)) {
-            ObservableList<LogEventViewModel> selectedEntries = messagesListView.getSelectionModel().getSelectedItems();
+        if (
+            keyBindingRepository.checkKeyCombinationEquality(
+                KeyBinding.COPY,
+                event
+            )
+        ) {
+            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 5f346cdcd4e..ec1e271b08b 100644
--- a/src/main/java/org/jabref/gui/errorconsole/ErrorConsoleViewModel.java
+++ b/src/main/java/org/jabref/gui/errorconsole/ErrorConsoleViewModel.java
@@ -1,15 +1,15 @@
 package org.jabref.gui.errorconsole;
 
+import com.tobiasdiez.easybind.EasyBind;
 import java.io.IOException;
 import java.net.URISyntaxException;
 import java.util.List;
 import java.util.Objects;
 import java.util.stream.Collectors;
-
 import javafx.beans.property.ListProperty;
 import javafx.beans.property.ReadOnlyListWrapper;
 import javafx.collections.ObservableList;
-
+import org.apache.http.client.utils.URIBuilder;
 import org.jabref.gui.AbstractViewModel;
 import org.jabref.gui.ClipBoardManager;
 import org.jabref.gui.DialogService;
@@ -20,15 +20,14 @@
 import org.jabref.logic.util.BuildInfo;
 import org.jabref.logic.util.OS;
 import org.jabref.preferences.PreferencesService;
-
-import com.tobiasdiez.easybind.EasyBind;
-import org.apache.http.client.utils.URIBuilder;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 public class ErrorConsoleViewModel extends AbstractViewModel {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(ErrorConsoleViewModel.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(
+        ErrorConsoleViewModel.class
+    );
 
     private final DialogService dialogService;
     private final PreferencesService preferencesService;
@@ -36,12 +35,20 @@ public class ErrorConsoleViewModel extends AbstractViewModel {
     private final BuildInfo buildInfo;
     private final ListProperty<LogEventViewModel> allMessagesData;
 
-    public ErrorConsoleViewModel(DialogService dialogService, PreferencesService preferencesService, ClipBoardManager clipBoardManager, BuildInfo buildInfo) {
+    public ErrorConsoleViewModel(
+        DialogService dialogService,
+        PreferencesService preferencesService,
+        ClipBoardManager clipBoardManager,
+        BuildInfo buildInfo
+    ) {
         this.dialogService = Objects.requireNonNull(dialogService);
         this.preferencesService = Objects.requireNonNull(preferencesService);
         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);
     }
 
@@ -55,9 +62,10 @@ public ListProperty<LogEventViewModel> allMessagesDataProperty() {
      * @return all messages as String
      */
     private String getLogMessagesAsString(List<LogEventViewModel> messages) {
-        return messages.stream()
-                       .map(LogEventViewModel::getDetailedText)
-                       .collect(Collectors.joining(OS.NEWLINE));
+        return messages
+            .stream()
+            .map(LogEventViewModel::getDetailedText)
+            .collect(Collectors.joining(OS.NEWLINE));
     }
 
     /**
@@ -91,29 +99,63 @@ public void clearLog() {
     public void reportIssue() {
         try {
             // System info
-            String systemInfo = String.format("JabRef %s%n%s %s %s %nJava %s", buildInfo.version, BuildInfo.OS,
-                    BuildInfo.OS_VERSION, BuildInfo.OS_ARCH, BuildInfo.JAVA_VERSION);
+            String systemInfo = String.format(
+                "JabRef %s%n%s %s %s %nJava %s",
+                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. ...";
+            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.";
-
-            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."));
+            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);
-            JabRefDesktop.openBrowser(uriBuilder.build().toString(), preferencesService.getFilePreferences());
+                .setScheme("https")
+                .setHost("github.com")
+                .setPath("/JabRef/jabref/issues/new")
+                .setParameter("body", issueBody);
+            JabRefDesktop.openBrowser(
+                uriBuilder.build().toString(),
+                preferencesService.getFilePreferences()
+            );
         } 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 24152e82f01..aa62cc0bded 100644
--- a/src/main/java/org/jabref/gui/errorconsole/LogEventViewModel.java
+++ b/src/main/java/org/jabref/gui/errorconsole/LogEventViewModel.java
@@ -1,13 +1,11 @@
 package org.jabref.gui.errorconsole;
 
+import com.google.common.base.Throwables;
 import java.util.Objects;
 import java.util.Optional;
-
 import org.jabref.gui.icon.IconTheme;
 import org.jabref.gui.icon.JabRefIcon;
 import org.jabref.logic.util.OS;
-
-import com.google.common.base.Throwables;
 import org.tinylog.core.LogEntry;
 
 public class LogEventViewModel {
@@ -47,10 +45,17 @@ public JabRefIcon getIcon() {
     }
 
     public Optional<String> getStackTrace() {
-        return Optional.ofNullable(logEvent.getException()).map(Throwables::getStackTraceAsString);
+        return Optional
+            .ofNullable(logEvent.getException())
+            .map(Throwables::getStackTraceAsString);
     }
 
     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 5ad22042ddc..add90da85d4 100644
--- a/src/main/java/org/jabref/gui/exporter/CreateModifyExporterDialogView.java
+++ b/src/main/java/org/jabref/gui/exporter/CreateModifyExporterDialogView.java
@@ -1,51 +1,68 @@
 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;
 import javafx.scene.control.TextField;
-
 import org.jabref.gui.DialogService;
 import org.jabref.gui.util.BaseDialog;
 import org.jabref.logic.l10n.Localization;
 import org.jabref.preferences.PreferencesService;
 
-import com.airhacks.afterburner.views.ViewLoader;
-import jakarta.inject.Inject;
-
-public class CreateModifyExporterDialogView extends BaseDialog<ExporterViewModel> {
+public class CreateModifyExporterDialogView
+    extends BaseDialog<ExporterViewModel> {
 
     private final ExporterViewModel exporter;
-    @FXML private TextField name;
-    @FXML private TextField fileName;
-    @FXML private TextField extension;
-    @FXML private ButtonType saveExporter;
-    @Inject private DialogService dialogService;
-    @Inject private PreferencesService preferences;
+
+    @FXML
+    private TextField name;
+
+    @FXML
+    private TextField fileName;
+
+    @FXML
+    private TextField extension;
+
+    @FXML
+    private ButtonType saveExporter;
+
+    @Inject
+    private DialogService dialogService;
+
+    @Inject
+    private PreferencesService preferences;
+
     private CreateModifyExporterDialogViewModel viewModel;
 
     public CreateModifyExporterDialogView(ExporterViewModel exporter) {
         this.setTitle(Localization.lang("Customize Export Formats"));
         this.exporter = exporter;
 
-        ViewLoader.view(this)
-                  .load()
-                  .setAsDialogPane(this);
+        ViewLoader.view(this).load().setAsDialogPane(this);
 
         this.setResultConverter(button -> {
-            if (button == saveExporter) {
-                return viewModel.saveExporter();
-            } else {
-                return null;
-            }
-        });
+                if (button == saveExporter) {
+                    return viewModel.saveExporter();
+                } else {
+                    return null;
+                }
+            });
     }
 
     @FXML
     private void initialize() {
-        viewModel = new CreateModifyExporterDialogViewModel(exporter, dialogService, preferences);
+        viewModel =
+            new CreateModifyExporterDialogViewModel(
+                exporter,
+                dialogService,
+                preferences
+            );
         name.textProperty().bindBidirectional(viewModel.getName());
-        fileName.textProperty().bindBidirectional(viewModel.getLayoutFileName());
+        fileName
+            .textProperty()
+            .bindBidirectional(viewModel.getLayoutFileName());
         extension.textProperty().bindBidirectional(viewModel.getExtension());
     }
 
diff --git a/src/main/java/org/jabref/gui/exporter/CreateModifyExporterDialogViewModel.java b/src/main/java/org/jabref/gui/exporter/CreateModifyExporterDialogViewModel.java
index 78c808dad3c..60673aa0d7c 100644
--- a/src/main/java/org/jabref/gui/exporter/CreateModifyExporterDialogViewModel.java
+++ b/src/main/java/org/jabref/gui/exporter/CreateModifyExporterDialogViewModel.java
@@ -1,10 +1,8 @@
 package org.jabref.gui.exporter;
 
 import java.nio.file.Path;
-
 import javafx.beans.property.SimpleStringProperty;
 import javafx.beans.property.StringProperty;
-
 import org.jabref.gui.AbstractViewModel;
 import org.jabref.gui.DialogService;
 import org.jabref.gui.util.FileDialogConfiguration;
@@ -12,7 +10,6 @@
 import org.jabref.logic.l10n.Localization;
 import org.jabref.logic.util.StandardFileType;
 import org.jabref.preferences.PreferencesService;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -25,7 +22,9 @@
 
 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 PreferencesService preferences;
@@ -34,9 +33,11 @@ public class CreateModifyExporterDialogViewModel extends AbstractViewModel {
     private final StringProperty layoutFile = new SimpleStringProperty("");
     private final StringProperty extension = new SimpleStringProperty("");
 
-    public CreateModifyExporterDialogViewModel(ExporterViewModel exporter,
-                                               DialogService dialogService,
-                                               PreferencesService preferences) {
+    public CreateModifyExporterDialogViewModel(
+        ExporterViewModel exporter,
+        DialogService dialogService,
+        PreferencesService preferences
+    ) {
         this.dialogService = dialogService;
         this.preferences = preferences;
 
@@ -51,33 +52,56 @@ public CreateModifyExporterDialogViewModel(ExporterViewModel exporter,
     public ExporterViewModel saveExporter() {
         Path layoutFileDir = Path.of(layoutFile.get()).getParent();
         if (layoutFileDir != null) {
-            preferences.getExportPreferences().setExportWorkingDirectory(layoutFileDir);
+            preferences
+                .getExportPreferences()
+                .setExportWorkingDirectory(layoutFileDir);
         }
 
         // Check that there are no empty strings.
-        if (layoutFile.get().isEmpty() || name.get().isEmpty() || extension.get().isEmpty()
-                || !layoutFile.get().endsWith(".layout")) {
+        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());
+            name.get(),
+            layoutFile.get(),
+            extension.get(),
+            preferences.getLayoutFormatterPreferences(),
+            preferences
+                .getSelfContainedExportConfiguration()
+                .getSelfContainedSaveOrder()
+        );
         format.setCustomExport(true);
         return new ExporterViewModel(format);
     }
 
     public void browse() {
-        FileDialogConfiguration fileDialogConfiguration = new FileDialogConfiguration.Builder()
-                .addExtensionFilter(Localization.lang("Custom layout file"), StandardFileType.LAYOUT)
-                .withDefaultExtension(Localization.lang("Custom layout file"), StandardFileType.LAYOUT)
-                .withInitialDirectory(preferences.getExportPreferences().getExportWorkingDirectory()).build();
-        dialogService.showFileOpenDialog(fileDialogConfiguration).ifPresent(f -> layoutFile.set(f.toAbsolutePath().toString()));
+        FileDialogConfiguration fileDialogConfiguration =
+            new FileDialogConfiguration.Builder()
+                .addExtensionFilter(
+                    Localization.lang("Custom layout file"),
+                    StandardFileType.LAYOUT
+                )
+                .withDefaultExtension(
+                    Localization.lang("Custom layout file"),
+                    StandardFileType.LAYOUT
+                )
+                .withInitialDirectory(
+                    preferences
+                        .getExportPreferences()
+                        .getExportWorkingDirectory()
+                )
+                .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 02e034ae763..f07dbe9f6a9 100644
--- a/src/main/java/org/jabref/gui/exporter/ExportCommand.java
+++ b/src/main/java/org/jabref/gui/exporter/ExportCommand.java
@@ -6,10 +6,9 @@
 import java.util.Comparator;
 import java.util.List;
 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.JabRefFrame;
 import org.jabref.gui.LibraryTab;
@@ -31,8 +30,6 @@
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.BibEntryTypesManager;
 import org.jabref.preferences.PreferencesService;
-
-import org.controlsfx.control.action.Action;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -41,9 +38,14 @@
  */
 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);
+    private static final Logger LOGGER = LoggerFactory.getLogger(
+        ExportCommand.class
+    );
 
     private final ExportMethod exportMethod;
     private final JabRefFrame frame;
@@ -54,14 +56,16 @@ public enum ExportMethod { EXPORT_ALL, EXPORT_SELECTED }
     private final JournalAbbreviationRepository abbreviationRepository;
     private final TaskExecutor taskExecutor;
 
-    public ExportCommand(ExportMethod exportMethod,
-                         JabRefFrame frame,
-                         StateManager stateManager,
-                         DialogService dialogService,
-                         PreferencesService preferences,
-                         BibEntryTypesManager entryTypesManager,
-                         JournalAbbreviationRepository abbreviationRepository,
-                         TaskExecutor taskExecutor) {
+    public ExportCommand(
+        ExportMethod exportMethod,
+        JabRefFrame frame,
+        StateManager stateManager,
+        DialogService dialogService,
+        PreferencesService preferences,
+        BibEntryTypesManager entryTypesManager,
+        JournalAbbreviationRepository abbreviationRepository,
+        TaskExecutor taskExecutor
+    ) {
         this.exportMethod = exportMethod;
         this.frame = frame;
         this.stateManager = stateManager;
@@ -71,92 +75,157 @@ 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())
+            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));
+        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().get(0).replace("*", "");
+    private void export(
+        Path file,
+        FileChooser.ExtensionFilter selectedExtensionFilter,
+        List<Exporter> exporters
+    ) {
+        String selectedExtension = selectedExtensionFilter
+            .getExtensions()
+            .get(0)
+            .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:
-        preferences.getExportPreferences().setLastExportExtension(format.getName());
-        preferences.getExportPreferences().setExportWorkingDirectory(file.getParent());
+        preferences
+            .getExportPreferences()
+            .setLastExportExtension(format.getName());
+        preferences
+            .getExportPreferences()
+            .setExportWorkingDirectory(file.getParent());
 
         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 = frame.getCurrentLibraryTab().getNotificationPane();
-                    notificationPane.notify(
-                            IconTheme.JabRefIcons.FOLDER.getGraphicNode(),
-                            Localization.lang("Export operation finished successfully."),
-                            List.of(new Action(Localization.lang("Reveal in File Explorer"), event -> {
+            .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 = frame
+                    .getCurrentLibraryTab()
+                    .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 {
-                                    JabRefDesktop.openFolderAndSelectFile(file, preferences.getExternalApplicationsPreferences(), dialogService);
+                                    JabRefDesktop.openFolderAndSelectFile(
+                                        file,
+                                        preferences.getExternalApplicationsPreferences(),
+                                        dialogService
+                                    );
                                 } catch (IOException e) {
-                                    LOGGER.error("Could not open export folder.", e);
+                                    LOGGER.error(
+                                        "Could not open export folder.",
+                                        e
+                                    );
                                 }
                                 notificationPane.hide();
-                            })),
-                            Duration.seconds(5));
-                })
-                .onFailure(this::handleError)
-                .executeWith(taskExecutor);
+                            }
+                        )
+                    ),
+                    Duration.seconds(5)
+                );
+            })
+            .onFailure(this::handleError)
+            .executeWith(taskExecutor);
     }
 
     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 c0d2e2c7135..3a508565fbf 100644
--- a/src/main/java/org/jabref/gui/exporter/ExportToClipboardAction.java
+++ b/src/main/java/org/jabref/gui/exporter/ExportToClipboardAction.java
@@ -9,9 +9,7 @@
 import java.util.Optional;
 import java.util.Set;
 import java.util.stream.Collectors;
-
 import javafx.scene.input.ClipboardContent;
-
 import org.jabref.gui.ClipBoardManager;
 import org.jabref.gui.DialogService;
 import org.jabref.gui.Globals;
@@ -27,23 +25,25 @@
 import org.jabref.logic.util.StandardFileType;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.preferences.PreferencesService;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 public class ExportToClipboardAction extends SimpleCommand {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(ExportToClipboardAction.class);
+    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);
+        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<>();
@@ -52,11 +52,13 @@ public class ExportToClipboardAction extends SimpleCommand {
     private final PreferencesService preferences;
     private final StateManager stateManager;
 
-    public ExportToClipboardAction(DialogService dialogService,
-                                   StateManager stateManager,
-                                   ClipBoardManager clipBoardManager,
-                                   TaskExecutor taskExecutor,
-                                   PreferencesService preferencesService) {
+    public ExportToClipboardAction(
+        DialogService dialogService,
+        StateManager stateManager,
+        ClipBoardManager clipBoardManager,
+        TaskExecutor taskExecutor,
+        PreferencesService preferencesService
+    ) {
         this.dialogService = dialogService;
         this.clipBoardManager = clipBoardManager;
         this.taskExecutor = taskExecutor;
@@ -69,44 +71,78 @@ 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,
-                Globals.entryTypesManager);
-        List<Exporter> exporters = exporterFactory.getExporters().stream()
-                                                  .sorted(Comparator.comparing(Exporter::getName))
-                                                  .filter(exporter -> SUPPORTED_FILETYPES.contains(exporter.getFileType()))
-                                                  .collect(Collectors.toList());
+            preferences,
+            Globals.entryTypesManager
+        );
+        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());
+        preferences
+            .getExportPreferences()
+            .setLastExportExtension(exporter.getName());
 
         Path tmp = null;
         try {
@@ -117,10 +153,19 @@ private ExportResult exportToClipboard(Exporter exporter) throws Exception {
             entries.addAll(stateManager.getSelectedEntries());
 
             // Write to file:
-            exporter.export(stateManager.getActiveDatabase().get(), tmp, entries, fileDirForDatabase, Globals.journalAbbreviationRepository);
+            exporter.export(
+                stateManager.getActiveDatabase().get(),
+                tmp,
+                entries,
+                fileDirForDatabase,
+                Globals.journalAbbreviationRepository
+            );
             // Read the file and put the contents on the clipboard:
 
-            return new ExportResult(Files.readString(tmp), exporter.getFileType());
+            return new ExportResult(
+                Files.readString(tmp),
+                exporter.getFileType()
+            );
         } finally {
             // Clean up:
             if ((tmp != null) && Files.exists(tmp)) {
@@ -146,9 +191,12 @@ 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 ccfc240193d..37b5e41671f 100644
--- a/src/main/java/org/jabref/gui/exporter/ExporterViewModel.java
+++ b/src/main/java/org/jabref/gui/exporter/ExporterViewModel.java
@@ -2,7 +2,6 @@
 
 import javafx.beans.property.SimpleStringProperty;
 import javafx.beans.property.StringProperty;
-
 import org.jabref.logic.exporter.TemplateExporter;
 
 /**
diff --git a/src/main/java/org/jabref/gui/exporter/SaveAction.java b/src/main/java/org/jabref/gui/exporter/SaveAction.java
index 6f726729034..6b05df458c2 100644
--- a/src/main/java/org/jabref/gui/exporter/SaveAction.java
+++ b/src/main/java/org/jabref/gui/exporter/SaveAction.java
@@ -13,7 +13,11 @@
  */
 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 LibraryTabContainer tabContainer;
@@ -21,18 +25,22 @@ public enum SaveMethod { SAVE, SAVE_AS, SAVE_SELECTED }
     private final DialogService dialogService;
     private final PreferencesService preferencesService;
 
-    public SaveAction(SaveMethod saveMethod,
-                      LibraryTabContainer tabContainer,
-                      DialogService dialogService,
-                      PreferencesService preferencesService,
-                      StateManager stateManager) {
+    public SaveAction(
+        SaveMethod saveMethod,
+        LibraryTabContainer tabContainer,
+        DialogService dialogService,
+        PreferencesService preferencesService,
+        StateManager stateManager
+    ) {
         this.saveMethod = saveMethod;
         this.tabContainer = tabContainer;
         this.dialogService = dialogService;
         this.preferencesService = preferencesService;
 
         if (saveMethod == SaveMethod.SAVE_SELECTED) {
-            this.executable.bind(ActionHelper.needsEntriesSelected(stateManager));
+            this.executable.bind(
+                    ActionHelper.needsEntriesSelected(stateManager)
+                );
         } else {
             this.executable.bind(ActionHelper.needsDatabase(stateManager));
         }
@@ -41,10 +49,11 @@ public SaveAction(SaveMethod saveMethod,
     @Override
     public void execute() {
         SaveDatabaseAction saveDatabaseAction = new SaveDatabaseAction(
-                tabContainer.getCurrentLibraryTab(),
-                dialogService,
-                preferencesService,
-                Globals.entryTypesManager);
+            tabContainer.getCurrentLibraryTab(),
+            dialogService,
+            preferencesService,
+            Globals.entryTypesManager
+        );
 
         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 eb86c5df658..8e72f66165b 100644
--- a/src/main/java/org/jabref/gui/exporter/SaveAllAction.java
+++ b/src/main/java/org/jabref/gui/exporter/SaveAllAction.java
@@ -14,7 +14,10 @@ public class SaveAllAction extends SimpleCommand {
     private final DialogService dialogService;
     private final PreferencesService preferencesService;
 
-    public SaveAllAction(JabRefFrame frame, PreferencesService preferencesService) {
+    public SaveAllAction(
+        JabRefFrame frame,
+        PreferencesService preferencesService
+    ) {
         this.frame = frame;
         this.dialogService = frame.getDialogService();
         this.preferencesService = preferencesService;
@@ -25,7 +28,12 @@ public void execute() {
         dialogService.notify(Localization.lang("Saving all libraries..."));
 
         for (LibraryTab libraryTab : frame.getLibraryTabs()) {
-            SaveDatabaseAction saveDatabaseAction = new SaveDatabaseAction(libraryTab, dialogService, preferencesService, Globals.entryTypesManager);
+            SaveDatabaseAction saveDatabaseAction = new SaveDatabaseAction(
+                libraryTab,
+                dialogService,
+                preferencesService,
+                Globals.entryTypesManager
+            );
             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 87cb097b734..7e25c77c908 100644
--- a/src/main/java/org/jabref/gui/exporter/SaveDatabaseAction.java
+++ b/src/main/java/org/jabref/gui/exporter/SaveDatabaseAction.java
@@ -10,14 +10,12 @@
 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;
 import javafx.scene.control.TableColumn;
 import javafx.scene.layout.VBox;
 import javafx.scene.text.Text;
-
 import org.jabref.gui.DialogService;
 import org.jabref.gui.LibraryTab;
 import org.jabref.gui.autosaveandbackup.AutosaveManager;
@@ -43,7 +41,6 @@
 import org.jabref.model.metadata.SaveOrder;
 import org.jabref.model.metadata.SelfContainedSaveOrder;
 import org.jabref.preferences.PreferencesService;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -55,7 +52,10 @@
  * operation was canceled, or whether it was successful.
  */
 public class SaveDatabaseAction {
-    private static final Logger LOGGER = LoggerFactory.getLogger(SaveDatabaseAction.class);
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(
+        SaveDatabaseAction.class
+    );
 
     private final LibraryTab libraryTab;
     private final DialogService dialogService;
@@ -63,13 +63,16 @@ public class SaveDatabaseAction {
     private final BibEntryTypesManager entryTypesManager;
 
     public enum SaveDatabaseMode {
-        SILENT, NORMAL
+        SILENT,
+        NORMAL,
     }
 
-    public SaveDatabaseAction(LibraryTab libraryTab,
-                              DialogService dialogService,
-                              PreferencesService preferences,
-                              BibEntryTypesManager entryTypesManager) {
+    public SaveDatabaseAction(
+        LibraryTab libraryTab,
+        DialogService dialogService,
+        PreferencesService preferences,
+        BibEntryTypesManager entryTypesManager
+    ) {
         this.libraryTab = libraryTab;
         this.dialogService = dialogService;
         this.preferences = preferences;
@@ -77,7 +80,10 @@ public SaveDatabaseAction(LibraryTab libraryTab,
     }
 
     public boolean save() {
-        return save(libraryTab.getBibDatabaseContext(), SaveDatabaseMode.NORMAL);
+        return save(
+            libraryTab.getBibDatabaseContext(),
+            SaveDatabaseMode.NORMAL
+        );
     }
 
     public boolean save(SaveDatabaseMode mode) {
@@ -96,37 +102,66 @@ 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);
-                    }
-                })
-                .orElse(SaveOrder.getDefaultSaveOrder());
+        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.getGuiPreferences().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
+                        .getGuiPreferences()
+                        .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
+                    );
+                }
+            });
     }
 
     /**
@@ -143,14 +178,22 @@ boolean saveAs(Path file, SaveDatabaseMode mode) {
             final Path oldFile = databasePath.get();
             context.setDatabasePath(oldFile);
             AutosaveManager.shutdown(context);
-            BackupManager.shutdown(context, this.preferences.getFilePreferences().getBackupDirectory(), preferences.getFilePreferences().shouldCreateBackup());
+            BackupManager.shutdown(
+                context,
+                this.preferences.getFilePreferences().getBackupDirectory(),
+                preferences.getFilePreferences().shouldCreateBackup()
+            );
         }
 
         // Set new location
         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());
+            new SharedDatabasePreferences(
+                context.getDatabase().generateSharedDatabaseID()
+            )
+                .putAllDBMSConnectionProperties(
+                    context.getDBMSSynchronizer().getConnectionProperties()
+                );
         }
 
         boolean saveResult = save(file, mode);
@@ -178,20 +221,43 @@ boolean saveAs(Path file, SaveDatabaseMode mode) {
      * @return the path set by the user
      */
     private Optional<Path> askForSavePath() {
-        FileDialogConfiguration fileDialogConfiguration = new FileDialogConfiguration.Builder()
+        FileDialogConfiguration fileDialogConfiguration =
+            new FileDialogConfiguration.Builder()
                 .addExtensionFilter(StandardFileType.BIBTEX_DB)
                 .withDefaultExtension(StandardFileType.BIBTEX_DB)
-                .withInitialDirectory(preferences.getFilePreferences().getWorkingDirectory())
+                .withInitialDirectory(
+                    preferences.getFilePreferences().getWorkingDirectory()
+                )
                 .build();
-        Optional<Path> selectedPath = dialogService.showFileSaveDialog(fileDialogConfiguration);
-        selectedPath.ifPresent(path -> preferences.getFilePreferences().setWorkingDirectory(path.getParent()));
+        Optional<Path> selectedPath = dialogService.showFileSaveDialog(
+            fileDialogConfiguration
+        );
+        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"))) {
+            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();
                     }
                 }
@@ -201,7 +267,10 @@ private Optional<Path> askForSavePath() {
         return selectedPath;
     }
 
-    private boolean save(BibDatabaseContext bibDatabaseContext, SaveDatabaseMode mode) {
+    private boolean save(
+        BibDatabaseContext bibDatabaseContext,
+        SaveDatabaseMode mode
+    ) {
         Optional<Path> databasePath = bibDatabaseContext.getDatabasePath();
         if (databasePath.isEmpty()) {
             Optional<Path> savePath = askForSavePath();
@@ -216,7 +285,9 @@ private boolean save(BibDatabaseContext bibDatabaseContext, SaveDatabaseMode mod
 
     private boolean save(Path targetPath, SaveDatabaseMode mode) {
         if (mode == SaveDatabaseMode.NORMAL) {
-            dialogService.notify(String.format("%s...", Localization.lang("Saving library")));
+            dialogService.notify(
+                String.format("%s...", Localization.lang("Saving library"))
+            );
         }
 
         synchronized (libraryTab) {
@@ -228,15 +299,25 @@ 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();
@@ -245,8 +326,18 @@ private boolean save(Path targetPath, SaveDatabaseMode mode) {
             dialogService.notify(Localization.lang("Library saved"));
             return success;
         } catch (SaveException ex) {
-            LOGGER.error(String.format("A problem occurred when trying to save the file %s", targetPath), ex);
-            dialogService.showErrorDialogAndWait(Localization.lang("Save library"), Localization.lang("Could not save file."), ex);
+            LOGGER.error(
+                String.format(
+                    "A problem occurred when trying to save the file %s",
+                    targetPath
+                ),
+                ex
+            );
+            dialogService.showErrorDialogAndWait(
+                Localization.lang("Save library"),
+                Localization.lang("Could not save file."),
+                ex
+            );
             return false;
         } finally {
             // release panel from save status
@@ -254,34 +345,74 @@ private boolean save(Path targetPath, SaveDatabaseMode mode) {
         }
     }
 
-    private boolean saveDatabase(Path file, boolean selectedOnly, Charset encoding, BibDatabaseWriter.SaveType saveType, SelfContainedSaveOrder saveOrder) throws SaveException {
+    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();
+        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());
+            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);
+                    bibWriter,
+                    saveConfiguration,
+                    preferences.getFieldPreferences(),
+                    preferences.getCitationKeyPatternPreferences(),
+                    entryTypesManager
+                );
 
                 if (selectedOnly) {
-                    databaseWriter.savePartOfDatabase(bibDatabaseContext, libraryTab.getSelectedEntries());
+                    databaseWriter.savePartOfDatabase(
+                        bibDatabaseContext,
+                        libraryTab.getSelectedEntries()
+                    );
                 } else {
                     databaseWriter.saveDatabase(bibDatabaseContext);
                 }
 
-                libraryTab.registerUndoableChanges(databaseWriter.getSaveActionsFieldChanges());
+                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);
             }
@@ -289,29 +420,78 @@ 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("."))),
+        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 ignore = new ButtonType(Localization.lang("Ignore"), ButtonBar.ButtonData.APPLY);
+        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();
+            .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);
-
-                saveDatabase(file, selectedOnly, newEncoding.get(), saveType, saveOrder);
+                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 95f8eb2c7d0..4415f2e68d2 100644
--- a/src/main/java/org/jabref/gui/exporter/WriteMetadataToLinkedPdfsAction.java
+++ b/src/main/java/org/jabref/gui/exporter/WriteMetadataToLinkedPdfsAction.java
@@ -1,11 +1,12 @@
 package org.jabref.gui.exporter;
 
+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;
-
 import org.jabref.gui.DialogService;
 import org.jabref.gui.StateManager;
 import org.jabref.gui.actions.SimpleCommand;
@@ -21,17 +22,17 @@
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.BibEntryTypesManager;
 import org.jabref.preferences.FilePreferences;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import static org.jabref.gui.actions.ActionHelper.needsDatabase;
-
 /**
  * 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 +43,16 @@ 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;
@@ -64,7 +67,9 @@ public WriteMetadataToLinkedPdfsAction(DialogService dialogService,
 
     @Override
     public void execute() {
-        BibDatabaseContext databaseContext = stateManager.getActiveDatabase().get();
+        BibDatabaseContext databaseContext = stateManager
+            .getActiveDatabase()
+            .get();
         if (stateManager.getActiveDatabase().isEmpty()) {
             return;
         }
@@ -75,12 +80,19 @@ 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?"));
+                    Localization.lang("Write metadata to PDF files"),
+                    Localization.lang(
+                        "Write metadata for all PDFs in current library?"
+                    )
+                );
                 if (!confirm) {
                     return;
                 }
@@ -90,16 +102,17 @@ public void execute() {
         dialogService.notify(Localization.lang("Writing metadata..."));
 
         new WriteMetaDataTask(
-                databaseContext,
-                entries,
-                abbreviationRepository,
-                entryTypesManager,
-                fieldPreferences,
-                filePreferences,
-                xmpPreferences,
-                stateManager,
-                dialogService)
-                .executeWith(taskExecutor);
+            databaseContext,
+            entries,
+            abbreviationRepository,
+            entryTypesManager,
+            fieldPreferences,
+            filePreferences,
+            xmpPreferences,
+            stateManager,
+            dialogService
+        )
+            .executeWith(taskExecutor);
     }
 
     private static class WriteMetaDataTask extends BackgroundTask<Void> {
@@ -119,15 +132,17 @@ 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,34 +167,55 @@ protected 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 '{}'",
-                            entry.getCitationKey().orElse(entry.getAuthorTitleYear(16)));
+                    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 {
                                 WriteMetadataToSinglePdfAction.writeMetadataToFile(
-                                        file,
-                                        entry,
-                                        databaseContext,
-                                        abbreviationRepository,
-                                        entryTypesManager,
-                                        fieldPreferences,
-                                        filePreferences,
-                                        xmpPreferences);
+                                    file,
+                                    entry,
+                                    databaseContext,
+                                    abbreviationRepository,
+                                    entryTypesManager,
+                                    fieldPreferences,
+                                    filePreferences,
+                                    xmpPreferences
+                                );
                                 entriesChanged++;
                             } catch (Exception e) {
-                                LOGGER.error("Error while writing XMP data to pdf '{}'", file, e);
+                                LOGGER.error(
+                                    "Error while writing XMP data to pdf '{}'",
+                                    file,
+                                    e
+                                );
                                 failedWrittenFiles.add(file);
                                 errors++;
                             }
@@ -193,12 +229,23 @@ protected 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);
+                LOGGER.error(
+                    "Failed to write XMP data to PDFs:\n" + failedWrittenFiles
+                );
             }
 
             return null;
diff --git a/src/main/java/org/jabref/gui/externalfiles/AutoLinkFilesAction.java b/src/main/java/org/jabref/gui/externalfiles/AutoLinkFilesAction.java
index 689d79dca69..0beff3a18e7 100644
--- a/src/main/java/org/jabref/gui/externalfiles/AutoLinkFilesAction.java
+++ b/src/main/java/org/jabref/gui/externalfiles/AutoLinkFilesAction.java
@@ -1,11 +1,11 @@
 package org.jabref.gui.externalfiles;
 
-import java.util.List;
-
-import javax.swing.undo.UndoManager;
+import static org.jabref.gui.actions.ActionHelper.needsDatabase;
+import static org.jabref.gui.actions.ActionHelper.needsEntriesSelected;
 
+import java.util.List;
 import javafx.concurrent.Task;
-
+import javax.swing.undo.UndoManager;
 import org.jabref.gui.DialogService;
 import org.jabref.gui.StateManager;
 import org.jabref.gui.actions.SimpleCommand;
@@ -17,9 +17,6 @@
 import org.jabref.model.entry.BibEntry;
 import org.jabref.preferences.PreferencesService;
 
-import static org.jabref.gui.actions.ActionHelper.needsDatabase;
-import static org.jabref.gui.actions.ActionHelper.needsEntriesSelected;
-
 /**
  * This Action may only be used in a menu or button.
  * Never in the entry editor. FileListEditor and EntryEditor have other ways to update the file links
@@ -32,65 +29,105 @@ public class AutoLinkFilesAction extends SimpleCommand {
     private final UndoManager undoManager;
     private final TaskExecutor taskExecutor;
 
-    public AutoLinkFilesAction(DialogService dialogService, PreferencesService preferences, StateManager stateManager, UndoManager undoManager, TaskExecutor taskExecutor) {
+    public AutoLinkFilesAction(
+        DialogService dialogService,
+        PreferencesService preferences,
+        StateManager stateManager,
+        UndoManager undoManager,
+        TaskExecutor 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();
         final AutoSetFileLinksUtil util = new AutoSetFileLinksUtil(
-                database,
-                preferences.getFilePreferences(),
-                preferences.getAutoLinkPreferences());
-        final NamedCompound nc = new NamedCompound(Localization.lang("Automatically set file links"));
-
-        Task<AutoSetFileLinksUtil.LinkFilesResult> linkFilesTask = new Task<>() {
-            @Override
-            protected AutoSetFileLinksUtil.LinkFilesResult call() {
-                return util.linkAssociatedFiles(entries, nc);
-            }
-
-            @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;
+            database,
+            preferences.getFilePreferences(),
+            preferences.getAutoLinkPreferences()
+        );
+        final NamedCompound nc = new NamedCompound(
+            Localization.lang("Automatically set file links")
+        );
+
+        Task<AutoSetFileLinksUtil.LinkFilesResult> linkFilesTask =
+            new Task<>() {
+                @Override
+                protected AutoSetFileLinksUtil.LinkFilesResult call() {
+                    return util.linkAssociatedFiles(entries, nc);
                 }
 
-                if (result.getChangedEntries().isEmpty()) {
-                    dialogService.showWarningDialogAndWait("Automatically set file links",
-                            Localization.lang("Finished automatically setting external links.") + "\n"
-                                    + Localization.lang("No files found."));
-                    return;
-                }
+                @Override
+                protected void succeeded() {
+                    AutoSetFileLinksUtil.LinkFilesResult result = getValue();
 
-                if (nc.hasEdits()) {
-                    nc.end();
-                    undoManager.addEdit(nc);
+                    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.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"),
-                Localization.lang("Searching for files"),
-                linkFilesTask);
+            Localization.lang("Automatically setting file links"),
+            Localization.lang("Searching for files"),
+            linkFilesTask
+        );
         taskExecutor.execute(linkFilesTask);
     }
 }
diff --git a/src/main/java/org/jabref/gui/externalfiles/AutoSetFileLinksUtil.java b/src/main/java/org/jabref/gui/externalfiles/AutoSetFileLinksUtil.java
index d1fed3f9f0a..381372a7303 100644
--- a/src/main/java/org/jabref/gui/externalfiles/AutoSetFileLinksUtil.java
+++ b/src/main/java/org/jabref/gui/externalfiles/AutoSetFileLinksUtil.java
@@ -7,7 +7,6 @@
 import java.util.List;
 import java.util.Optional;
 import java.util.stream.Collectors;
-
 import org.jabref.gui.externalfiletype.ExternalFileType;
 import org.jabref.gui.externalfiletype.ExternalFileTypes;
 import org.jabref.gui.externalfiletype.UnknownExternalFileType;
@@ -24,13 +23,13 @@
 import org.jabref.model.entry.LinkedFile;
 import org.jabref.model.entry.field.StandardField;
 import org.jabref.preferences.FilePreferences;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 public class AutoSetFileLinksUtil {
 
     public static class LinkFilesResult {
+
         private final List<BibEntry> changedEntries = new ArrayList<>();
         private final List<IOException> fileExceptions = new ArrayList<>();
 
@@ -51,22 +50,39 @@ public List<IOException> getFileExceptions() {
         }
     }
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(AutoSetFileLinksUtil.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(
+        AutoSetFileLinksUtil.class
+    );
     private final List<Path> directories;
     private final AutoLinkPreferences autoLinkPreferences;
     private final FilePreferences filePreferences;
 
-    public AutoSetFileLinksUtil(BibDatabaseContext databaseContext, FilePreferences filePreferences, AutoLinkPreferences autoLinkPreferences) {
-        this(databaseContext.getFileDirectories(filePreferences), filePreferences, autoLinkPreferences);
+    public AutoSetFileLinksUtil(
+        BibDatabaseContext databaseContext,
+        FilePreferences filePreferences,
+        AutoLinkPreferences autoLinkPreferences
+    ) {
+        this(
+            databaseContext.getFileDirectories(filePreferences),
+            filePreferences,
+            autoLinkPreferences
+        );
     }
 
-    private AutoSetFileLinksUtil(List<Path> directories, FilePreferences filePreferences, AutoLinkPreferences autoLinkPreferences) {
+    private AutoSetFileLinksUtil(
+        List<Path> directories,
+        FilePreferences filePreferences,
+        AutoLinkPreferences autoLinkPreferences
+    ) {
         this.directories = directories;
         this.autoLinkPreferences = autoLinkPreferences;
         this.filePreferences = filePreferences;
     }
 
-    public LinkFilesResult linkAssociatedFiles(List<BibEntry> entries, NamedCompound ce) {
+    public LinkFilesResult linkAssociatedFiles(
+        List<BibEntry> entries,
+        NamedCompound ce
+    ) {
         LinkFilesResult result = new LinkFilesResult();
 
         for (BibEntry entry : entries) {
@@ -84,9 +100,18 @@ public LinkFilesResult linkAssociatedFiles(List<BibEntry> entries, NamedCompound
 
                 for (LinkedFile linkedFile : linkedFiles) {
                     // store undo information
-                    String newVal = FileFieldWriter.getStringRepresentation(linkedFile);
-                    String oldVal = entry.getField(StandardField.FILE).orElse(null);
-                    UndoableFieldChange fieldChange = new UndoableFieldChange(entry, StandardField.FILE, oldVal, newVal);
+                    String newVal = FileFieldWriter.getStringRepresentation(
+                        linkedFile
+                    );
+                    String oldVal = entry
+                        .getField(StandardField.FILE)
+                        .orElse(null);
+                    UndoableFieldChange fieldChange = new UndoableFieldChange(
+                        entry,
+                        StandardField.FILE,
+                        oldVal,
+                        newVal
+                    );
                     ce.addEdit(fieldChange);
                     changed = true;
 
@@ -103,36 +128,65 @@ public LinkFilesResult linkAssociatedFiles(List<BibEntry> entries, NamedCompound
         return result;
     }
 
-    public List<LinkedFile> findAssociatedNotLinkedFiles(BibEntry entry) throws IOException {
+    public List<LinkedFile> findAssociatedNotLinkedFiles(BibEntry entry)
+        throws IOException {
         List<LinkedFile> linkedFiles = new ArrayList<>();
 
-        List<String> extensions = filePreferences.getExternalFileTypes().stream().map(ExternalFileType::getExtension).collect(Collectors.toList());
+        List<String> extensions = filePreferences
+            .getExternalFileTypes()
+            .stream()
+            .map(ExternalFileType::getExtension)
+            .collect(Collectors.toList());
 
         // Run the search operation
-        FileFinder fileFinder = FileFinders.constructFromConfiguration(autoLinkPreferences);
-        List<Path> result = fileFinder.findAssociatedFiles(entry, directories, extensions);
+        FileFinder fileFinder = FileFinders.constructFromConfiguration(
+            autoLinkPreferences
+        );
+        List<Path> result = fileFinder.findAssociatedFiles(
+            entry,
+            directories,
+            extensions
+        );
 
         // 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, filePreferences))
-                                                            .orElse(Optional.of(new UnknownExternalFileType("")));
+                Optional<ExternalFileType> type = FileUtil
+                    .getFileExtension(foundFile)
+                    .map(extension ->
+                        ExternalFileTypes.getExternalFileTypeByExt(
+                            extension,
+                            filePreferences
+                        )
+                    )
+                    .orElse(Optional.of(new UnknownExternalFileType("")));
 
                 String strType = type.isPresent() ? type.get().getName() : "";
-                Path relativeFilePath = FileUtil.relativize(foundFile, directories);
-                LinkedFile linkedFile = new LinkedFile("", relativeFilePath, strType);
+                Path relativeFilePath = FileUtil.relativize(
+                    foundFile,
+                    directories
+                );
+                LinkedFile linkedFile = new LinkedFile(
+                    "",
+                    relativeFilePath,
+                    strType
+                );
                 linkedFiles.add(linkedFile);
             }
         }
diff --git a/src/main/java/org/jabref/gui/externalfiles/ChainedFilters.java b/src/main/java/org/jabref/gui/externalfiles/ChainedFilters.java
index 4162c9c674f..fceee97a984 100644
--- a/src/main/java/org/jabref/gui/externalfiles/ChainedFilters.java
+++ b/src/main/java/org/jabref/gui/externalfiles/ChainedFilters.java
@@ -4,7 +4,6 @@
 import java.nio.file.DirectoryStream;
 import java.nio.file.Path;
 import java.util.Arrays;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -13,7 +12,9 @@
  */
 public class ChainedFilters implements DirectoryStream.Filter<Path> {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(ChainedFilters.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(
+        ChainedFilters.class
+    );
 
     private DirectoryStream.Filter<Path>[] filters;
 
@@ -23,13 +24,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/DateRange.java b/src/main/java/org/jabref/gui/externalfiles/DateRange.java
index b73f700481c..fdbf669c239 100644
--- a/src/main/java/org/jabref/gui/externalfiles/DateRange.java
+++ b/src/main/java/org/jabref/gui/externalfiles/DateRange.java
@@ -11,11 +11,11 @@ public enum DateRange {
 
     private final String dateRange;
 
-    DateRange(String dateRange) { 
-       this.dateRange = dateRange;
+    DateRange(String dateRange) {
+        this.dateRange = dateRange;
     }
 
     public String getDateRange() {
-        return dateRange; 
-    } 
+        return dateRange;
+    }
 }
diff --git a/src/main/java/org/jabref/gui/externalfiles/DownloadFullTextAction.java b/src/main/java/org/jabref/gui/externalfiles/DownloadFullTextAction.java
index 321f31bc31f..69558baf198 100644
--- a/src/main/java/org/jabref/gui/externalfiles/DownloadFullTextAction.java
+++ b/src/main/java/org/jabref/gui/externalfiles/DownloadFullTextAction.java
@@ -5,9 +5,7 @@
 import java.util.Map;
 import java.util.Optional;
 import java.util.concurrent.ConcurrentHashMap;
-
 import javafx.concurrent.Task;
-
 import org.jabref.gui.DialogService;
 import org.jabref.gui.StateManager;
 import org.jabref.gui.actions.ActionHelper;
@@ -20,7 +18,6 @@
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.LinkedFile;
 import org.jabref.preferences.PreferencesService;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -29,7 +26,9 @@
  */
 public class DownloadFullTextAction extends SimpleCommand {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(DownloadFullTextAction.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(
+        DownloadFullTextAction.class
+    );
     // The minimum number of selected entries to ask the user for confirmation
     private static final int WARNING_LIMIT = 5;
 
@@ -38,10 +37,12 @@ public class DownloadFullTextAction extends SimpleCommand {
     private final PreferencesService preferences;
     private final TaskExecutor taskExecutor;
 
-    public DownloadFullTextAction(DialogService dialogService,
-                                  StateManager stateManager,
-                                  PreferencesService preferences,
-                                  TaskExecutor taskExecutor) {
+    public DownloadFullTextAction(
+        DialogService dialogService,
+        StateManager stateManager,
+        PreferencesService preferences,
+        TaskExecutor taskExecutor
+    ) {
         this.dialogService = dialogService;
         this.stateManager = stateManager;
         this.preferences = preferences;
@@ -62,19 +63,27 @@ public void execute() {
             return;
         }
 
-        dialogService.notify(Localization.lang("Looking for full text document..."));
+        dialogService.notify(
+            Localization.lang("Looking for full text document...")
+        );
 
         if (entries.size() >= WARNING_LIMIT) {
-            boolean confirmDownload = dialogService.showConfirmationDialogAndWait(
+            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?"),
+                        "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"));
+                    Localization.lang("Cancel")
+                );
 
             if (!confirmDownload) {
                 dialogService.notify(Localization.lang("Operation canceled."));
@@ -85,12 +94,14 @@ 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<>();
+                Map<BibEntry, Optional<URL>> downloads =
+                    new ConcurrentHashMap<>();
                 int count = 0;
                 for (BibEntry entry : entries) {
                     FulltextFetchers fetchers = new FulltextFetchers(
-                            preferences.getImportFormatPreferences(),
-                            preferences.getImporterPreferences());
+                        preferences.getImportFormatPreferences(),
+                        preferences.getImporterPreferences()
+                    );
                     downloads.put(entry, fetchers.findFullTextPDF(entry));
                     updateProgress(++count, entries.size());
                 }
@@ -99,25 +110,42 @@ protected Map<BibEntry, Optional<URL>> call() {
         };
 
         findFullTextsTask.setOnSucceeded(value ->
-                downloadFullTexts(findFullTextsTask.getValue(), stateManager.getActiveDatabase().get()));
+            downloadFullTexts(
+                findFullTextsTask.getValue(),
+                stateManager.getActiveDatabase().get()
+            )
+        );
 
         dialogService.showProgressDialog(
-                Localization.lang("Download full text documents"),
-                Localization.lang("Looking for full text document..."),
-                findFullTextsTask);
+            Localization.lang("Download full text documents"),
+            Localization.lang("Looking for full text document..."),
+            findFullTextsTask
+        );
 
         taskExecutor.execute(findFullTextsTask);
     }
 
-    private void downloadFullTexts(Map<BibEntry, Optional<URL>> downloads, BibDatabaseContext databaseContext) {
-        for (Map.Entry<BibEntry, Optional<URL>> download : downloads.entrySet()) {
+    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"))
+                    )
+                );
             }
         }
     }
@@ -130,22 +158,33 @@ private void downloadFullTexts(Map<BibEntry, Optional<URL>> downloads, BibDataba
      * @param url             the url "key"
      * @param entry           the entry "value"
      */
-    private void addLinkedFileFromURL(BibDatabaseContext databaseContext, URL url, BibEntry entry) {
+    private void addLinkedFileFromURL(
+        BibDatabaseContext databaseContext,
+        URL url,
+        BibEntry entry
+    ) {
         LinkedFile newLinkedFile = new LinkedFile(url, "");
 
         if (!entry.getFiles().contains(newLinkedFile)) {
             LinkedFileViewModel onlineFile = new LinkedFileViewModel(
-                    newLinkedFile,
-                    entry,
-                    databaseContext,
-                    taskExecutor,
-                    dialogService,
-                    preferences);
+                newLinkedFile,
+                entry,
+                databaseContext,
+                taskExecutor,
+                dialogService,
+                preferences
+            );
 
             onlineFile.download();
         } 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 8bfc842297d..a1c7c541e50 100644
--- a/src/main/java/org/jabref/gui/externalfiles/DuplicateDecisionResult.java
+++ b/src/main/java/org/jabref/gui/externalfiles/DuplicateDecisionResult.java
@@ -4,8 +4,6 @@
 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 57df1e395c8..588a91bfb3a 100644
--- a/src/main/java/org/jabref/gui/externalfiles/ExternalFilesEntryLinker.java
+++ b/src/main/java/org/jabref/gui/externalfiles/ExternalFilesEntryLinker.java
@@ -7,7 +7,6 @@
 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,13 +22,14 @@
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.LinkedFile;
 import org.jabref.preferences.FilePreferences;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 public class ExternalFilesEntryLinker {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(ExternalFilesEntryLinker.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(
+        ExternalFilesEntryLinker.class
+    );
 
     private final FilePreferences filePreferences;
     private final BibDatabaseContext bibDatabaseContext;
@@ -37,18 +37,27 @@ public class ExternalFilesEntryLinker {
     private final RenamePdfCleanup renameFilesCleanup;
     private final DialogService dialogService;
 
-    public ExternalFilesEntryLinker(FilePreferences filePreferences, BibDatabaseContext bibDatabaseContext, DialogService dialogService) {
+    public ExternalFilesEntryLinker(
+        FilePreferences filePreferences,
+        BibDatabaseContext bibDatabaseContext,
+        DialogService dialogService
+    ) {
         this.filePreferences = filePreferences;
         this.bibDatabaseContext = bibDatabaseContext;
-        this.moveFilesCleanup = new MoveFilesCleanup(bibDatabaseContext, filePreferences);
-        this.renameFilesCleanup = new RenamePdfCleanup(false, bibDatabaseContext, filePreferences);
+        this.moveFilesCleanup =
+            new MoveFilesCleanup(bibDatabaseContext, filePreferences);
+        this.renameFilesCleanup =
+            new RenamePdfCleanup(false, bibDatabaseContext, filePreferences);
         this.dialogService = dialogService;
     }
 
     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());
+            Path targetFile = firstExistingFileDir
+                .get()
+                .resolve(file.getFileName());
             if (FileUtil.copyFile(file, targetFile, false)) {
                 return Optional.of(targetFile);
             }
@@ -67,17 +76,31 @@ 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, filePreferences)
-                                                         .orElse(new UnknownExternalFileType(ext));
-                Path relativePath = FileUtil.relativize(file, bibDatabaseContext.getFileDirectories(filePreferences));
-                LinkedFile linkedfile = new LinkedFile("", relativePath, type.getName());
-                entry.addFile(linkedfile);
-            });
+            FileUtil
+                .getFileExtension(file)
+                .ifPresent(ext -> {
+                    ExternalFileType type = ExternalFileTypes
+                        .getExternalFileTypeByExt(ext, filePreferences)
+                        .orElse(new UnknownExternalFileType(ext));
+                    Path relativePath = FileUtil.relativize(
+                        file,
+                        bibDatabaseContext.getFileDirectories(filePreferences)
+                    );
+                    LinkedFile linkedfile = new LinkedFile(
+                        "",
+                        relativePath,
+                        type.getName()
+                    );
+                    entry.addFile(linkedfile);
+                });
         }
     }
 
-    public void moveFilesToFileDirRenameAndAddToEntry(BibEntry entry, List<Path> files, IndexingTaskManager indexingTaskManager) {
+    public void moveFilesToFileDirRenameAndAddToEntry(
+        BibEntry entry,
+        List<Path> files,
+        IndexingTaskManager indexingTaskManager
+    ) {
         try (AutoCloseable blocker = indexingTaskManager.blockNewTasks()) {
             addFilesToEntry(entry, files);
             moveLinkedFilesToFileDir(entry);
@@ -87,17 +110,30 @@ public void moveFilesToFileDirRenameAndAddToEntry(BibEntry entry, List<Path> fil
         }
 
         try {
-            indexingTaskManager.addToIndex(PdfIndexer.of(bibDatabaseContext, filePreferences), entry, bibDatabaseContext);
+            indexingTaskManager.addToIndex(
+                PdfIndexer.of(bibDatabaseContext, filePreferences),
+                entry,
+                bibDatabaseContext
+            );
         } catch (IOException e) {
             LOGGER.error("Could not access Fulltext-Index", e);
         }
     }
 
-    public void copyFilesToFileDirAndAddToEntry(BibEntry entry, List<Path> files, IndexingTaskManager indexingTaskManager) {
+    public void copyFilesToFileDirAndAddToEntry(
+        BibEntry entry,
+        List<Path> files,
+        IndexingTaskManager indexingTaskManager
+    ) {
         try (AutoCloseable blocker = indexingTaskManager.blockNewTasks()) {
             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) {
@@ -105,7 +141,11 @@ public void copyFilesToFileDirAndAddToEntry(BibEntry entry, List<Path> files, In
         }
 
         try {
-            indexingTaskManager.addToIndex(PdfIndexer.of(bibDatabaseContext, filePreferences), entry, bibDatabaseContext);
+            indexingTaskManager.addToIndex(
+                PdfIndexer.of(bibDatabaseContext, filePreferences),
+                entry,
+                bibDatabaseContext
+            );
         } catch (IOException e) {
             LOGGER.error("Could not access Fulltext-Index", e);
         }
@@ -116,11 +156,22 @@ 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/FileDownloadTask.java b/src/main/java/org/jabref/gui/externalfiles/FileDownloadTask.java
index cb49f8f7f11..0eb13920e33 100644
--- a/src/main/java/org/jabref/gui/externalfiles/FileDownloadTask.java
+++ b/src/main/java/org/jabref/gui/externalfiles/FileDownloadTask.java
@@ -1,16 +1,14 @@
 package org.jabref.gui.externalfiles;
 
+import com.tobiasdiez.easybind.EasyBind;
 import java.net.URL;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.StandardCopyOption;
-
 import org.jabref.gui.util.BackgroundTask;
 import org.jabref.logic.net.ProgressInputStream;
 import org.jabref.logic.net.URLDownload;
 
-import com.tobiasdiez.easybind.EasyBind;
-
 public class FileDownloadTask extends BackgroundTask<Path> {
 
     private final URL source;
@@ -26,13 +24,22 @@ protected Path call() throws Exception {
         URLDownload download = new URLDownload(source);
         try (ProgressInputStream inputStream = download.asInputStream()) {
             EasyBind.subscribe(
-                    inputStream.totalNumBytesReadProperty(),
-                    bytesRead -> updateProgress(bytesRead.longValue(), inputStream.getMaxNumBytes()));
+                inputStream.totalNumBytesReadProperty(),
+                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);
+            Files.copy(
+                inputStream,
+                destination,
+                StandardCopyOption.REPLACE_EXISTING
+            );
         }
 
         return destination;
diff --git a/src/main/java/org/jabref/gui/externalfiles/FileExtensionViewModel.java b/src/main/java/org/jabref/gui/externalfiles/FileExtensionViewModel.java
index edab9aa8644..b2147dfa18d 100644
--- a/src/main/java/org/jabref/gui/externalfiles/FileExtensionViewModel.java
+++ b/src/main/java/org/jabref/gui/externalfiles/FileExtensionViewModel.java
@@ -4,7 +4,6 @@
 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.icon.JabRefIcon;
@@ -26,13 +25,17 @@ public class FileExtensionViewModel {
     }
 
     public String getDescription() {
-        return this.description + extensions.stream().collect(Collectors.joining(", ", " (", ")"));
+        return (
+            this.description +
+            extensions.stream().collect(Collectors.joining(", ", " (", ")"))
+        );
     }
 
     public JabRefIcon getIcon() {
-        return ExternalFileTypes.getExternalFileTypeByExt(extensions.get(0), filePreferences)
-                                .map(ExternalFileType::getIcon)
-                                .orElse(null);
+        return ExternalFileTypes
+            .getExternalFileTypeByExt(extensions.get(0), filePreferences)
+            .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 6c9e48d13e3..10c065e816f 100644
--- a/src/main/java/org/jabref/gui/externalfiles/FileFilterUtils.java
+++ b/src/main/java/org/jabref/gui/externalfiles/FileFilterUtils.java
@@ -9,13 +9,14 @@
 import java.util.Comparator;
 import java.util.List;
 import java.util.stream.Collectors;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 public class FileFilterUtils {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(FileFilterUtils.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(
+        FileFilterUtils.class
+    );
 
     /* Returns the last edited time of a file as LocalDateTime. */
     public static LocalDateTime getFileTime(Path path) {
@@ -27,9 +28,9 @@ public static LocalDateTime getFileTime(Path path) {
             return LocalDateTime.now();
         }
         LocalDateTime localDateTime = lastEditedTime
-                .toInstant()
-                .atZone(ZoneId.systemDefault())
-                .toLocalDateTime();
+            .toInstant()
+            .atZone(ZoneId.systemDefault())
+            .toLocalDateTime();
         return localDateTime;
     }
 
@@ -65,13 +66,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;
     }
 
@@ -80,12 +82,18 @@ public static boolean filterByDate(Path path, DateRange filter) {
      * of their corresponding files, from newest to oldest.
      */
     public List<Path> sortByDateAscending(List<Path> files) {
-        return files.stream()
-                .sorted(Comparator.comparingLong(file -> FileFilterUtils.getFileTime(file)
+        return files
+            .stream()
+            .sorted(
+                Comparator.comparingLong(file ->
+                    FileFilterUtils
+                        .getFileTime(file)
                         .atZone(ZoneId.systemDefault())
                         .toInstant()
-                        .toEpochMilli()))
-                .collect(Collectors.toList());
+                        .toEpochMilli()
+                )
+            )
+            .collect(Collectors.toList());
     }
 
     /**
@@ -93,26 +101,35 @@ public List<Path> sortByDateAscending(List<Path> files) {
      * of their corresponding files, from oldest to newest.
      */
     public List<Path> sortByDateDescending(List<Path> files) {
-        return files.stream()
-                .sorted(Comparator.comparingLong(file -> -FileFilterUtils.getFileTime(file)
+        return files
+            .stream()
+            .sorted(
+                Comparator.comparingLong(file ->
+                    -FileFilterUtils
+                        .getFileTime(file)
                         .atZone(ZoneId.systemDefault())
                         .toInstant()
-                        .toEpochMilli()))
-                .collect(Collectors.toList());
+                        .toEpochMilli()
+                )
+            )
+            .collect(Collectors.toList());
     }
 
     /**
      * Sorts a list of Path objects according to the last edited date
      * the order depends on the specified sorter type.
      */
-    public static List<Path> sortByDate(List<Path> files, ExternalFileSorter sortType) {
+    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 7c5cb7bf644..2fed0518a8a 100644
--- a/src/main/java/org/jabref/gui/externalfiles/FindUnlinkedFilesAction.java
+++ b/src/main/java/org/jabref/gui/externalfiles/FindUnlinkedFilesAction.java
@@ -1,17 +1,20 @@
 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;
     private final StateManager stateManager;
 
-    public FindUnlinkedFilesAction(DialogService dialogService, StateManager stateManager) {
+    public FindUnlinkedFilesAction(
+        DialogService dialogService,
+        StateManager stateManager
+    ) {
         this.dialogService = dialogService;
         this.stateManager = stateManager;
 
diff --git a/src/main/java/org/jabref/gui/externalfiles/GitIgnoreFileFilter.java b/src/main/java/org/jabref/gui/externalfiles/GitIgnoreFileFilter.java
index e396c4f883a..8ffb899c875 100644
--- a/src/main/java/org/jabref/gui/externalfiles/GitIgnoreFileFilter.java
+++ b/src/main/java/org/jabref/gui/externalfiles/GitIgnoreFileFilter.java
@@ -1,5 +1,7 @@
 package org.jabref.gui.externalfiles;
 
+import static java.util.function.Predicate.not;
+
 import java.io.IOException;
 import java.nio.file.DirectoryStream;
 import java.nio.file.FileSystems;
@@ -9,44 +11,58 @@
 import java.util.HashSet;
 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);
+    private static final Logger LOGGER = LoggerFactory.getLogger(
+        GitIgnoreFileFilter.class
+    );
 
     private Set<PathMatcher> gitIgnorePatterns;
 
     public GitIgnoreFileFilter(Path path) {
         Path currentPath = path;
-        while ((currentPath != null) && !Files.exists(currentPath.resolve(".gitignore"))) {
+        while (
+            (currentPath != null) &&
+            !Files.exists(currentPath.resolve(".gitignore"))
+        ) {
             currentPath = currentPath.getParent();
         }
         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());
-                gitIgnorePatterns = new HashSet<>(plainGitIgnorePatternsFromGitIgnoreFile);
+                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"));
+                gitIgnorePatterns.add(
+                    FileSystems.getDefault().getPathMatcher("glob:.gitignore")
+                );
             } catch (IOException e) {
                 LOGGER.info("Could not read .gitignore from {}", gitIgnore, e);
                 gitIgnorePatterns = Set.of();
@@ -57,10 +73,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 ->
+        return gitIgnorePatterns
+            .stream()
+            .noneMatch(filter ->
                 // we need this one for "*.png"
                 filter.matches(path.getFileName()) ||
                 // we need this one for "**/*.png"
-                filter.matches(path));
+                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 3677107b427..58616985ee8 100644
--- a/src/main/java/org/jabref/gui/externalfiles/ImportFilesResultItemViewModel.java
+++ b/src/main/java/org/jabref/gui/externalfiles/ImportFilesResultItemViewModel.java
@@ -1,29 +1,37 @@
 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;
 import javafx.beans.property.StringProperty;
 import javafx.scene.paint.Color;
-
 import org.jabref.gui.icon.IconTheme;
 import org.jabref.gui.icon.JabRefIcon;
 
 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) {
+    public ImportFilesResultItemViewModel(
+        Path file,
+        boolean success,
+        String message
+    ) {
         this.file.setValue(file.toString());
         this.message.setValue(message);
         if (success) {
-            this.icon.setValue(IconTheme.JabRefIcons.CHECK.withColor(Color.GREEN));
+            this.icon.setValue(
+                    IconTheme.JabRefIcons.CHECK.withColor(Color.GREEN)
+                );
         } else {
-            this.icon.setValue(IconTheme.JabRefIcons.WARNING.withColor(Color.RED));
+            this.icon.setValue(
+                    IconTheme.JabRefIcons.WARNING.withColor(Color.RED)
+                );
         }
     }
 
@@ -41,6 +49,12 @@ 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 a9fbbe28eb8..a4186106052 100644
--- a/src/main/java/org/jabref/gui/externalfiles/ImportHandler.java
+++ b/src/main/java/org/jabref/gui/externalfiles/ImportHandler.java
@@ -1,5 +1,6 @@
 package org.jabref.gui.externalfiles;
 
+import com.google.common.annotations.VisibleForTesting;
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
 import java.nio.charset.StandardCharsets;
@@ -9,10 +10,8 @@
 import java.util.Collections;
 import java.util.List;
 import java.util.Optional;
-
 import javax.swing.undo.CompoundEdit;
 import javax.swing.undo.UndoManager;
-
 import org.jabref.gui.DialogService;
 import org.jabref.gui.Globals;
 import org.jabref.gui.StateManager;
@@ -51,14 +50,14 @@
 import org.jabref.model.util.FileUpdateMonitor;
 import org.jabref.model.util.OptionalUtil;
 import org.jabref.preferences.PreferencesService;
-
-import com.google.common.annotations.VisibleForTesting;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 public class ImportHandler {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(ImportHandler.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(
+        ImportHandler.class
+    );
     private final BibDatabaseContext bibDatabaseContext;
     private final PreferencesService preferencesService;
     private final FileUpdateMonitor fileUpdateMonitor;
@@ -69,14 +68,15 @@ public class ImportHandler {
     private final DialogService dialogService;
     private final TaskExecutor taskExecutor;
 
-    public ImportHandler(BibDatabaseContext database,
-                         PreferencesService preferencesService,
-                         FileUpdateMonitor fileupdateMonitor,
-                         UndoManager undoManager,
-                         StateManager stateManager,
-                         DialogService dialogService,
-                         TaskExecutor taskExecutor) {
-
+    public ImportHandler(
+        BibDatabaseContext database,
+        PreferencesService preferencesService,
+        FileUpdateMonitor fileupdateMonitor,
+        UndoManager undoManager,
+        StateManager stateManager,
+        DialogService dialogService,
+        TaskExecutor taskExecutor
+    ) {
         this.bibDatabaseContext = database;
         this.preferencesService = preferencesService;
         this.fileUpdateMonitor = fileupdateMonitor;
@@ -84,8 +84,16 @@ public ImportHandler(BibDatabaseContext database,
         this.dialogService = dialogService;
         this.taskExecutor = taskExecutor;
 
-        this.linker = new ExternalFilesEntryLinker(preferencesService.getFilePreferences(), database, dialogService);
-        this.contentImporter = new ExternalFilesContentImporter(preferencesService.getImportFormatPreferences());
+        this.linker =
+            new ExternalFilesEntryLinker(
+                preferencesService.getFilePreferences(),
+                database,
+                dialogService
+            );
+        this.contentImporter =
+            new ExternalFilesContentImporter(
+                preferencesService.getImportFormatPreferences()
+            );
         this.undoManager = undoManager;
     }
 
@@ -93,10 +101,13 @@ public ExternalFilesEntryLinker getLinker() {
         return linker;
     }
 
-    public BackgroundTask<List<ImportFilesResultItemViewModel>> importFilesInBackground(final List<Path> files) {
+    public BackgroundTask<
+        List<ImportFilesResultItemViewModel>
+    > importFilesInBackground(final List<Path> files) {
         return new BackgroundTask<>() {
             private int counter;
-            private final List<ImportFilesResultItemViewModel> results = new ArrayList<>();
+            private final List<ImportFilesResultItemViewModel> results =
+                new ArrayList<>();
 
             @Override
             protected List<ImportFilesResultItemViewModel> call() {
@@ -110,49 +121,118 @@ protected List<ImportFilesResultItemViewModel> call() {
                     }
 
                     DefaultTaskExecutor.runInJavaFXThread(() -> {
-                        updateMessage(Localization.lang("Processing file %0", file.getFileName()));
+                        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();
+                            var pdfImporterResult =
+                                contentImporter.importPDFContent(file);
+                            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(pdfEntriesInFile);
-                                addResultToList(file, true, Localization.lang("File was successfully imported as a new entry"));
+                                addResultToList(
+                                    file,
+                                    true,
+                                    Localization.lang(
+                                        "File was successfully imported as a new entry"
+                                    )
+                                );
                             } else {
-                                entriesToAdd.add(createEmptyEntryWithLink(file));
-                                addResultToList(file, false, Localization.lang("No metadata was found. An empty entry was created with file link"));
+                                entriesToAdd.add(
+                                    createEmptyEntryWithLink(file)
+                                );
+                                addResultToList(
+                                    file,
+                                    false,
+                                    Localization.lang(
+                                        "No metadata 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());
+                                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()));
-
-                        DefaultTaskExecutor.runInJavaFXThread(() -> updateMessage(Localization.lang("Error")));
+                        addResultToList(
+                            file,
+                            false,
+                            Localization.lang(
+                                "Error from import: %0",
+                                ex.getLocalizedMessage()
+                            )
+                        );
+
+                        DefaultTaskExecutor.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
-                    DefaultTaskExecutor.runInJavaFXThread(() -> importEntries(entriesToAdd));
+                    DefaultTaskExecutor.runInJavaFXThread(() ->
+                        importEntries(entriesToAdd)
+                    );
 
-                    ce.addEdit(new UndoableInsertEntries(bibDatabaseContext.getDatabase(), entriesToAdd));
+                    ce.addEdit(
+                        new UndoableInsertEntries(
+                            bibDatabaseContext.getDatabase(),
+                            entriesToAdd
+                        )
+                    );
                     ce.end();
                     undoManager.addEdit(ce);
 
@@ -161,8 +241,16 @@ protected List<ImportFilesResultItemViewModel> call() {
                 return results;
             }
 
-            private void addResultToList(Path newFile, boolean success, String logMessage) {
-                var result = new ImportFilesResultItemViewModel(newFile, success, logMessage);
+            private void addResultToList(
+                Path newFile,
+                boolean success,
+                String logMessage
+            ) {
+                var result = new ImportFilesResultItemViewModel(
+                    newFile,
+                    success,
+                    logMessage
+                );
                 results.add(result);
             }
         };
@@ -180,7 +268,9 @@ private BibEntry createEmptyEntryWithLink(Path file) {
      * There is no automatic download done.
      */
     public void importEntries(List<BibEntry> entries) {
-        ImportCleanup cleanup = ImportCleanup.targeting(bibDatabaseContext.getMode());
+        ImportCleanup cleanup = ImportCleanup.targeting(
+            bibDatabaseContext.getMode()
+        );
         cleanup.doPostCleanup(entries);
         importCleanedEntries(entries);
     }
@@ -192,11 +282,21 @@ public void importCleanedEntries(List<BibEntry> entries) {
         addToGroups(entries, stateManager.getSelectedGroup(bibDatabaseContext));
     }
 
-    public void importEntryWithDuplicateCheck(BibDatabaseContext bibDatabaseContext, BibEntry entry) {
+    public void importEntryWithDuplicateCheck(
+        BibDatabaseContext bibDatabaseContext,
+        BibEntry entry
+    ) {
         BibEntry entryToInsert = cleanUpEntry(bibDatabaseContext, entry);
-        Optional<BibEntry> existingDuplicateInLibrary = findDuplicate(bibDatabaseContext, entryToInsert);
+        Optional<BibEntry> existingDuplicateInLibrary = findDuplicate(
+            bibDatabaseContext,
+            entryToInsert
+        );
         if (existingDuplicateInLibrary.isPresent()) {
-            Optional<BibEntry> duplicateHandledEntry = handleDuplicates(bibDatabaseContext, entryToInsert, existingDuplicateInLibrary.get());
+            Optional<BibEntry> duplicateHandledEntry = handleDuplicates(
+                bibDatabaseContext,
+                entryToInsert,
+                existingDuplicateInLibrary.get()
+            );
             if (duplicateHandledEntry.isEmpty()) {
                 return;
             }
@@ -207,17 +307,38 @@ public void importEntryWithDuplicateCheck(BibDatabaseContext bibDatabaseContext,
     }
 
     @VisibleForTesting
-    BibEntry cleanUpEntry(BibDatabaseContext bibDatabaseContext, BibEntry entry) {
-        ImportCleanup cleanup = ImportCleanup.targeting(bibDatabaseContext.getMode());
+    BibEntry cleanUpEntry(
+        BibDatabaseContext bibDatabaseContext,
+        BibEntry entry
+    ) {
+        ImportCleanup cleanup = ImportCleanup.targeting(
+            bibDatabaseContext.getMode()
+        );
         return cleanup.doPostCleanup(entry);
     }
 
-    public Optional<BibEntry> findDuplicate(BibDatabaseContext bibDatabaseContext, BibEntry entryToCheck) {
-        return new DuplicateCheck(Globals.entryTypesManager).containsDuplicate(bibDatabaseContext.getDatabase(), entryToCheck, bibDatabaseContext.getMode());
+    public Optional<BibEntry> findDuplicate(
+        BibDatabaseContext bibDatabaseContext,
+        BibEntry entryToCheck
+    ) {
+        return new DuplicateCheck(Globals.entryTypesManager)
+            .containsDuplicate(
+                bibDatabaseContext.getDatabase(),
+                entryToCheck,
+                bibDatabaseContext.getMode()
+            );
     }
 
-    public Optional<BibEntry> handleDuplicates(BibDatabaseContext bibDatabaseContext, BibEntry originalEntry, BibEntry duplicateEntry) {
-        DuplicateDecisionResult decisionResult = getDuplicateDecision(originalEntry, duplicateEntry, bibDatabaseContext);
+    public Optional<BibEntry> handleDuplicates(
+        BibDatabaseContext bibDatabaseContext,
+        BibEntry originalEntry,
+        BibEntry duplicateEntry
+    ) {
+        DuplicateDecisionResult decisionResult = getDuplicateDecision(
+            originalEntry,
+            duplicateEntry,
+            bibDatabaseContext
+        );
         switch (decisionResult.decision()) {
             case KEEP_RIGHT:
                 bibDatabaseContext.getDatabase().removeEntry(duplicateEntry);
@@ -236,38 +357,60 @@ public Optional<BibEntry> handleDuplicates(BibDatabaseContext bibDatabaseContext
         return Optional.of(originalEntry);
     }
 
-    public DuplicateDecisionResult getDuplicateDecision(BibEntry originalEntry, BibEntry duplicateEntry, BibDatabaseContext bibDatabaseContext) {
-        DuplicateResolverDialog dialog = new DuplicateResolverDialog(duplicateEntry, originalEntry, DuplicateResolverDialog.DuplicateResolverType.IMPORT_CHECK, bibDatabaseContext, stateManager, dialogService, preferencesService);
-        DuplicateResolverDialog.DuplicateResolverResult decision = dialogService.showCustomDialogAndWait(dialog).orElse(DuplicateResolverDialog.DuplicateResolverResult.BREAK);
+    public DuplicateDecisionResult getDuplicateDecision(
+        BibEntry originalEntry,
+        BibEntry duplicateEntry,
+        BibDatabaseContext bibDatabaseContext
+    ) {
+        DuplicateResolverDialog dialog = new DuplicateResolverDialog(
+            duplicateEntry,
+            originalEntry,
+            DuplicateResolverDialog.DuplicateResolverType.IMPORT_CHECK,
+            bibDatabaseContext,
+            stateManager,
+            dialogService,
+            preferencesService
+        );
+        DuplicateResolverDialog.DuplicateResolverResult decision = dialogService
+            .showCustomDialogAndWait(dialog)
+            .orElse(DuplicateResolverDialog.DuplicateResolverResult.BREAK);
         return new DuplicateDecisionResult(decision, dialog.getMergedEntry());
     }
 
     public void setAutomaticFields(List<BibEntry> entries) {
         UpdateField.setAutomaticFields(
-                entries,
-                preferencesService.getOwnerPreferences(),
-                preferencesService.getTimestampPreferences()
+            entries,
+            preferencesService.getOwnerPreferences(),
+            preferencesService.getTimestampPreferences()
         );
     }
 
     public void downloadLinkedFiles(BibEntry entry) {
-        if (preferencesService.getFilePreferences().shouldDownloadLinkedFiles()) {
-            entry.getFiles().stream()
-                    .filter(LinkedFile::isOnlineLink)
-                    .forEach(linkedFile ->
-                            new LinkedFileViewModel(
-                                    linkedFile,
-                                    entry,
-                                    bibDatabaseContext,
-                                    taskExecutor,
-                                    dialogService,
-                                    preferencesService
-                            ).download()
-                    );
+        if (
+            preferencesService.getFilePreferences().shouldDownloadLinkedFiles()
+        ) {
+            entry
+                .getFiles()
+                .stream()
+                .filter(LinkedFile::isOnlineLink)
+                .forEach(linkedFile ->
+                    new LinkedFileViewModel(
+                        linkedFile,
+                        entry,
+                        bibDatabaseContext,
+                        taskExecutor,
+                        dialogService,
+                        preferencesService
+                    )
+                        .download()
+                );
         }
     }
 
-    private void addToGroups(List<BibEntry> entries, Collection<GroupTreeNode> groups) {
+    private void addToGroups(
+        List<BibEntry> entries,
+        Collection<GroupTreeNode> groups
+    ) {
         for (GroupTreeNode node : groups) {
             if (node.getGroup() instanceof GroupEntryChanger entryChanger) {
                 List<FieldChange> undo = entryChanger.add(entries);
@@ -286,28 +429,46 @@ private void addToGroups(List<BibEntry> entries, Collection<GroupTreeNode> group
      * @param entries entries to generate keys for
      */
     private void generateKeys(List<BibEntry> entries) {
-        if (!preferencesService.getImporterPreferences().isGenerateNewKeyOnImport()) {
+        if (
+            !preferencesService
+                .getImporterPreferences()
+                .isGenerateNewKeyOnImport()
+        ) {
             return;
         }
         CitationKeyGenerator keyGenerator = new CitationKeyGenerator(
-                bibDatabaseContext.getMetaData().getCiteKeyPattern(preferencesService.getCitationKeyPatternPreferences()
-                                                                                     .getKeyPattern()),
-                bibDatabaseContext.getDatabase(),
-                preferencesService.getCitationKeyPatternPreferences());
+            bibDatabaseContext
+                .getMetaData()
+                .getCiteKeyPattern(
+                    preferencesService
+                        .getCitationKeyPatternPreferences()
+                        .getKeyPattern()
+                ),
+            bibDatabaseContext.getDatabase(),
+            preferencesService.getCitationKeyPatternPreferences()
+        );
         entries.forEach(keyGenerator::generateAndSetKey);
     }
 
     public List<BibEntry> handleBibTeXData(String entries) {
-        BibtexParser parser = new BibtexParser(preferencesService.getImportFormatPreferences(), fileUpdateMonitor);
+        BibtexParser parser = new BibtexParser(
+            preferencesService.getImportFormatPreferences(),
+            fileUpdateMonitor
+        );
         try {
-            return parser.parseEntries(new ByteArrayInputStream(entries.getBytes(StandardCharsets.UTF_8)));
+            return parser.parseEntries(
+                new ByteArrayInputStream(
+                    entries.getBytes(StandardCharsets.UTF_8)
+                )
+            );
         } catch (ParseException ex) {
             LOGGER.error("Could not paste", ex);
             return Collections.emptyList();
         }
     }
 
-    public List<BibEntry> handleStringData(String data) throws FetcherException {
+    public List<BibEntry> handleStringData(String data)
+        throws FetcherException {
         if ((data == null) || data.isEmpty()) {
             return Collections.emptyList();
         }
@@ -333,32 +494,50 @@ public List<BibEntry> handleStringData(String data) throws FetcherException {
     private List<BibEntry> tryImportFormats(String data) {
         try {
             ImportFormatReader importFormatReader = new ImportFormatReader(
-                    preferencesService.getImporterPreferences(),
-                    preferencesService.getImportFormatPreferences(),
-                    fileUpdateMonitor);
-            UnknownFormatImport unknownFormatImport = importFormatReader.importUnknownFormat(data);
-            return unknownFormatImport.parserResult().getDatabase().getEntries();
+                preferencesService.getImporterPreferences(),
+                preferencesService.getImportFormatPreferences(),
+                fileUpdateMonitor
+            );
+            UnknownFormatImport unknownFormatImport =
+                importFormatReader.importUnknownFormat(data);
+            return unknownFormatImport
+                .parserResult()
+                .getDatabase()
+                .getEntries();
         } catch (ImportException ex) { // ex is already localized
-            dialogService.showErrorDialogAndWait(Localization.lang("Import error"), ex);
+            dialogService.showErrorDialogAndWait(
+                Localization.lang("Import error"),
+                ex
+            );
             return Collections.emptyList();
         }
     }
 
     private List<BibEntry> fetchByDOI(DOI doi) throws FetcherException {
         LOGGER.info("Found DOI identifer in clipboard");
-        Optional<BibEntry> entry = new DoiFetcher(preferencesService.getImportFormatPreferences()).performSearchById(doi.getDOI());
+        Optional<BibEntry> entry = new DoiFetcher(
+            preferencesService.getImportFormatPreferences()
+        )
+            .performSearchById(doi.getDOI());
         return OptionalUtil.toList(entry);
     }
 
-    private List<BibEntry> fetchByArXiv(ArXivIdentifier arXivIdentifier) throws FetcherException {
+    private List<BibEntry> fetchByArXiv(ArXivIdentifier arXivIdentifier)
+        throws FetcherException {
         LOGGER.info("Found arxiv identifier in clipboard");
-        Optional<BibEntry> entry = new ArXivFetcher(preferencesService.getImportFormatPreferences()).performSearchById(arXivIdentifier.getNormalizedWithoutVersion());
+        Optional<BibEntry> entry = new ArXivFetcher(
+            preferencesService.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(preferencesService.getImportFormatPreferences()).performSearchById(isbn.getNormalized());
+        Optional<BibEntry> entry = new IsbnFetcher(
+            preferencesService.getImportFormatPreferences()
+        )
+            .performSearchById(isbn.getNormalized());
         return OptionalUtil.toList(entry);
     }
 }
diff --git a/src/main/java/org/jabref/gui/externalfiles/UnlinkedFilesCrawler.java b/src/main/java/org/jabref/gui/externalfiles/UnlinkedFilesCrawler.java
index ef26c177a25..f34e2bc8d35 100644
--- a/src/main/java/org/jabref/gui/externalfiles/UnlinkedFilesCrawler.java
+++ b/src/main/java/org/jabref/gui/externalfiles/UnlinkedFilesCrawler.java
@@ -11,15 +11,12 @@
 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.BackgroundTask;
 import org.jabref.gui.util.FileNodeViewModel;
 import org.jabref.model.database.BibDatabase;
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.preferences.FilePreferences;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -28,7 +25,9 @@
  */
 public class UnlinkedFilesCrawler extends BackgroundTask<FileNodeViewModel> {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(UnlinkedFilesCrawler.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(
+        UnlinkedFilesCrawler.class
+    );
 
     private final Path directory;
     private final Filter<Path> fileFilter;
@@ -37,7 +36,14 @@ 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;
@@ -48,7 +54,11 @@ public UnlinkedFilesCrawler(Path directory, Filter<Path> fileFilter, DateRange d
 
     @Override
     protected FileNodeViewModel call() throws IOException {
-        UnlinkedPDFFileFilter unlinkedPDFFileFilter = new UnlinkedPDFFileFilter(fileFilter, databaseContext, filePreferences);
+        UnlinkedPDFFileFilter unlinkedPDFFileFilter = new UnlinkedPDFFileFilter(
+            fileFilter,
+            databaseContext,
+            filePreferences
+        );
         return searchDirectory(directory, unlinkedPDFFileFilter);
     }
 
@@ -74,23 +84,40 @@ protected 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(String.format("Invalid directory for searching: %s", directory));
+            throw new IOException(
+                String.format("Invalid directory for searching: %s", directory)
+            );
         }
 
-        FileNodeViewModel fileNodeViewModelForCurrentDirectory = new FileNodeViewModel(directory);
+        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)
         // 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;
@@ -105,7 +132,10 @@ FileNodeViewModel searchDirectory(Path directory, UnlinkedPDFFileFilter unlinked
 
         // now we crawl into the found subdirectories first (!)
         for (Path subDirectory : subDirectories) {
-            FileNodeViewModel subRoot = searchDirectory(subDirectory, unlinkedPDFFileFilter);
+            FileNodeViewModel subRoot = searchDirectory(
+                subDirectory,
+                unlinkedPDFFileFilter
+            );
             if (!subRoot.getChildren().isEmpty()) {
                 fileCountOfSubdirectories += subRoot.getFileCount();
                 fileNodeViewModelForCurrentDirectory.getChildren().add(subRoot);
@@ -129,12 +159,19 @@ FileNodeViewModel searchDirectory(Path directory, UnlinkedPDFFileFilter unlinked
         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);
+        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/UnlinkedFilesDialogView.java b/src/main/java/org/jabref/gui/externalfiles/UnlinkedFilesDialogView.java
index 03d14de7df1..f0b86ce3db7 100644
--- a/src/main/java/org/jabref/gui/externalfiles/UnlinkedFilesDialogView.java
+++ b/src/main/java/org/jabref/gui/externalfiles/UnlinkedFilesDialogView.java
@@ -1,9 +1,10 @@
 package org.jabref.gui.externalfiles;
 
+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.nio.file.Path;
-
-import javax.swing.undo.UndoManager;
-
 import javafx.application.Platform;
 import javafx.beans.InvalidationListener;
 import javafx.beans.binding.Bindings;
@@ -26,7 +27,8 @@
 import javafx.scene.control.TitledPane;
 import javafx.scene.control.TreeItem;
 import javafx.scene.layout.VBox;
-
+import javax.swing.undo.UndoManager;
+import org.controlsfx.control.CheckTreeView;
 import org.jabref.gui.DialogService;
 import org.jabref.gui.StateManager;
 import org.jabref.gui.actions.ActionFactory;
@@ -47,42 +49,82 @@
 import org.jabref.model.util.FileUpdateMonitor;
 import org.jabref.preferences.PreferencesService;
 
-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 UnlinkedFilesDialogView extends BaseDialog<Void> {
 
-    @FXML private TextField directoryPathField;
-    @FXML private ComboBox<FileExtensionViewModel> fileTypeCombo;
-    @FXML private ComboBox<DateRange> fileDateCombo;
-    @FXML private ComboBox<ExternalFileSorter> fileSortCombo;
-    @FXML private CheckTreeView<FileNodeViewModel> unlinkedFilesList;
-    @FXML private Button scanButton;
-    @FXML private Button exportButton;
-    @FXML private Button importButton;
-    @FXML private Label progressText;
-    @FXML private Accordion accordion;
-    @FXML private ProgressIndicator progressDisplay;
-    @FXML private VBox progressPane;
-
-    @FXML private TableView<ImportFilesResultItemViewModel> importResultTable;
-    @FXML private TableColumn<ImportFilesResultItemViewModel, JabRefIcon> colStatus;
-    @FXML private TableColumn<ImportFilesResultItemViewModel, String> colMessage;
-    @FXML private TableColumn<ImportFilesResultItemViewModel, String> colFile;
-
-    @FXML private TitledPane filePane;
-    @FXML private TitledPane resultPane;
-
-    @Inject private PreferencesService preferencesService;
-    @Inject private DialogService dialogService;
-    @Inject private StateManager stateManager;
-    @Inject private UndoManager undoManager;
-    @Inject private TaskExecutor taskExecutor;
-    @Inject private FileUpdateMonitor fileUpdateMonitor;
-    @Inject private ThemeManager themeManager;
+    @FXML
+    private TextField directoryPathField;
+
+    @FXML
+    private ComboBox<FileExtensionViewModel> fileTypeCombo;
+
+    @FXML
+    private ComboBox<DateRange> fileDateCombo;
+
+    @FXML
+    private ComboBox<ExternalFileSorter> fileSortCombo;
+
+    @FXML
+    private CheckTreeView<FileNodeViewModel> unlinkedFilesList;
+
+    @FXML
+    private Button scanButton;
+
+    @FXML
+    private Button exportButton;
+
+    @FXML
+    private Button importButton;
+
+    @FXML
+    private Label progressText;
+
+    @FXML
+    private Accordion accordion;
+
+    @FXML
+    private ProgressIndicator progressDisplay;
+
+    @FXML
+    private VBox progressPane;
+
+    @FXML
+    private TableView<ImportFilesResultItemViewModel> importResultTable;
+
+    @FXML
+    private TableColumn<ImportFilesResultItemViewModel, JabRefIcon> colStatus;
+
+    @FXML
+    private TableColumn<ImportFilesResultItemViewModel, String> colMessage;
+
+    @FXML
+    private TableColumn<ImportFilesResultItemViewModel, String> colFile;
+
+    @FXML
+    private TitledPane filePane;
+
+    @FXML
+    private TitledPane resultPane;
+
+    @Inject
+    private PreferencesService preferencesService;
+
+    @Inject
+    private DialogService dialogService;
+
+    @Inject
+    private StateManager stateManager;
+
+    @Inject
+    private UndoManager undoManager;
+
+    @Inject
+    private TaskExecutor taskExecutor;
+
+    @Inject
+    private FileUpdateMonitor fileUpdateMonitor;
+
+    @Inject
+    private ThemeManager themeManager;
 
     private final ControlsFxVisualizer validationVisualizer;
     private UnlinkedFilesDialogViewModel viewModel;
@@ -94,9 +136,7 @@ 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) {
@@ -110,35 +150,49 @@ public UnlinkedFilesDialogView() {
 
     @FXML
     private void initialize() {
-        viewModel = new UnlinkedFilesDialogViewModel(
+        viewModel =
+            new UnlinkedFilesDialogViewModel(
                 dialogService,
                 undoManager,
                 fileUpdateMonitor,
                 preferencesService,
                 stateManager,
-                taskExecutor);
-
-        this.bibDatabaseContext = stateManager.getActiveDatabase().orElseThrow(() -> new NullPointerException("No active library"));
-
-        progressDisplay.progressProperty().bind(viewModel.progressValueProperty());
+                taskExecutor
+            );
+
+        this.bibDatabaseContext =
+            stateManager
+                .getActiveDatabase()
+                .orElseThrow(() -> new NullPointerException("No active library")
+                );
+
+        progressDisplay
+            .progressProperty()
+            .bind(viewModel.progressValueProperty());
         progressText.textProperty().bind(viewModel.progressTextProperty());
         progressPane.managedProperty().bind(viewModel.taskActiveProperty());
         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();
@@ -149,82 +203,153 @@ private void initialize() {
     private void initDirectorySelection() {
         validationVisualizer.setDecoration(new IconValidationDecorator());
 
-        directoryPathField.textProperty().bindBidirectional(viewModel.directoryPathProperty());
-        Platform.runLater(() -> validationVisualizer.initVisualization(viewModel.directoryPathValidationStatus(), directoryPathField));
+        directoryPathField
+            .textProperty()
+            .bindBidirectional(viewModel.directoryPathProperty());
+        Platform.runLater(() ->
+            validationVisualizer.initVisualization(
+                viewModel.directoryPathValidationStatus(),
+                directoryPathField
+            )
+        );
 
         new ViewModelListCellFactory<FileExtensionViewModel>()
-                .withText(FileExtensionViewModel::getDescription)
-                .withIcon(FileExtensionViewModel::getIcon)
-                .install(fileTypeCombo);
+            .withText(FileExtensionViewModel::getDescription)
+            .withIcon(FileExtensionViewModel::getIcon)
+            .install(fileTypeCombo);
         fileTypeCombo.setItems(viewModel.getFileFilters());
-        fileTypeCombo.valueProperty().bindBidirectional(viewModel.selectedExtensionProperty());
+        fileTypeCombo
+            .valueProperty()
+            .bindBidirectional(viewModel.selectedExtensionProperty());
         fileTypeCombo.getSelectionModel().selectFirst();
         new ViewModelListCellFactory<DateRange>()
             .withText(DateRange::getDateRange)
             .install(fileDateCombo);
         fileDateCombo.setItems(viewModel.getDateFilters());
-        fileDateCombo.valueProperty().bindBidirectional(viewModel.selectedDateProperty());
+        fileDateCombo
+            .valueProperty()
+            .bindBidirectional(viewModel.selectedDateProperty());
         fileDateCombo.getSelectionModel().selectFirst();
         new ViewModelListCellFactory<ExternalFileSorter>()
-                .withText(ExternalFileSorter::getSorter)
-                .install(fileSortCombo);
+            .withText(ExternalFileSorter::getSorter)
+            .install(fileSortCombo);
         fileSortCombo.setItems(viewModel.getSorters());
-        fileSortCombo.valueProperty().bindBidirectional(viewModel.selectedSortProperty());
+        fileSortCombo
+            .valueProperty()
+            .bindBidirectional(viewModel.selectedSortProperty());
         fileSortCombo.getSelectionModel().selectFirst();
 
-        directoryPathField.setText(bibDatabaseContext.getFirstExistingFileDir(preferencesService.getFilePreferences()).map(Path::toString).orElse(""));
+        directoryPathField.setText(
+            bibDatabaseContext
+                .getFirstExistingFileDir(
+                    preferencesService.getFilePreferences()
+                )
+                .map(Path::toString)
+                .orElse("")
+        );
     }
 
     private void initUnlinkedFilesList() {
         new ViewModelTreeCellFactory<FileNodeViewModel>()
-                .withText(FileNodeViewModel::getDisplayTextWithEditDate)
-                .install(unlinkedFilesList);
-
-        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)));
+            .withText(FileNodeViewModel::getDisplayTextWithEditDate)
+            .install(unlinkedFilesList);
+
+        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.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)
-                .install(colFile);
+            .withText(item -> item)
+            .withTooltip(item -> item)
+            .install(colFile);
 
-        colMessage.setCellValueFactory(cellData -> cellData.getValue().message());
+        colMessage.setCellValueFactory(cellData -> cellData.getValue().message()
+        );
         new ValueTableCellFactory<ImportFilesResultItemViewModel, String>()
-                .withText(item -> item).withTooltip(item -> item)
-                .install(colMessage);
+            .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()
+                    )
+            );
     }
 
     @FXML
@@ -261,12 +386,42 @@ private void expandTree(TreeItem<?> item, boolean expand) {
 
     private ContextMenu createSearchContextMenu() {
         ContextMenu contextMenu = new ContextMenu();
-        ActionFactory factory = new ActionFactory(preferencesService.getKeyBindingRepository());
-
-        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)));
+        ActionFactory factory = new ActionFactory(
+            preferencesService.getKeyBindingRepository()
+        );
+
+        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;
     }
@@ -285,9 +440,17 @@ public SearchContextAction(StandardActions command) {
         public void execute() {
             switch (command) {
                 case SELECT_ALL -> unlinkedFilesList.getCheckModel().checkAll();
-                case UNSELECT_ALL -> unlinkedFilesList.getCheckModel().clearChecks();
-                case EXPAND_ALL -> expandTree(unlinkedFilesList.getRoot(), true);
-                case COLLAPSE_ALL -> expandTree(unlinkedFilesList.getRoot(), false);
+                case UNSELECT_ALL -> unlinkedFilesList
+                    .getCheckModel()
+                    .clearChecks();
+                case EXPAND_ALL -> expandTree(
+                    unlinkedFilesList.getRoot(),
+                    true
+                );
+                case COLLAPSE_ALL -> expandTree(
+                    unlinkedFilesList.getRoot(),
+                    false
+                );
             }
         }
     }
diff --git a/src/main/java/org/jabref/gui/externalfiles/UnlinkedFilesDialogViewModel.java b/src/main/java/org/jabref/gui/externalfiles/UnlinkedFilesDialogViewModel.java
index dffa9a50b51..f4f0c9ce36b 100644
--- a/src/main/java/org/jabref/gui/externalfiles/UnlinkedFilesDialogViewModel.java
+++ b/src/main/java/org/jabref/gui/externalfiles/UnlinkedFilesDialogViewModel.java
@@ -1,5 +1,8 @@
 package org.jabref.gui.externalfiles;
 
+import de.saxsys.mvvmfx.utils.validation.FunctionBasedValidator;
+import de.saxsys.mvvmfx.utils.validation.ValidationMessage;
+import de.saxsys.mvvmfx.utils.validation.ValidationStatus;
 import java.io.BufferedWriter;
 import java.io.IOException;
 import java.nio.charset.StandardCharsets;
@@ -11,9 +14,6 @@
 import java.util.Optional;
 import java.util.function.Predicate;
 import java.util.stream.Collectors;
-
-import javax.swing.undo.UndoManager;
-
 import javafx.beans.property.BooleanProperty;
 import javafx.beans.property.DoubleProperty;
 import javafx.beans.property.ObjectProperty;
@@ -27,7 +27,7 @@
 import javafx.collections.ObservableList;
 import javafx.scene.control.ProgressIndicator;
 import javafx.scene.control.TreeItem;
-
+import javax.swing.undo.UndoManager;
 import org.jabref.gui.DialogService;
 import org.jabref.gui.StateManager;
 import org.jabref.gui.util.BackgroundTask;
@@ -40,31 +40,41 @@
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.util.FileUpdateMonitor;
 import org.jabref.preferences.PreferencesService;
-
-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;
 
 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<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 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 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 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<FileExtensionViewModel> fileFilterList;
     private final ObservableList<DateRange> dateFilterList;
     private final ObservableList<ExternalFileSorter> fileSortList;
@@ -72,62 +82,110 @@ public class UnlinkedFilesDialogViewModel {
     private final DialogService dialogService;
     private final PreferencesService preferences;
     private BackgroundTask<FileNodeViewModel> findUnlinkedFilesTask;
-    private BackgroundTask<List<ImportFilesResultItemViewModel>> importFilesBackgroundTask;
+    private BackgroundTask<
+        List<ImportFilesResultItemViewModel>
+    > importFilesBackgroundTask;
 
     private final BibDatabaseContext bibDatabase;
     private final TaskExecutor taskExecutor;
 
     private final FunctionBasedValidator<String> scanDirectoryValidator;
 
-    public UnlinkedFilesDialogViewModel(DialogService dialogService,
-                                        UndoManager undoManager,
-                                        FileUpdateMonitor fileUpdateMonitor,
-                                        PreferencesService preferences,
-                                        StateManager stateManager,
-                                        TaskExecutor taskExecutor) {
+    public UnlinkedFilesDialogViewModel(
+        DialogService dialogService,
+        UndoManager undoManager,
+        FileUpdateMonitor fileUpdateMonitor,
+        PreferencesService 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(
+        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.getFilePreferences()),
-                new FileExtensionViewModel(StandardFileType.HTML, preferences.getFilePreferences()),
-                new FileExtensionViewModel(StandardFileType.MARKDOWN, preferences.getFilePreferences()),
-                new FileExtensionViewModel(StandardFileType.PDF, preferences.getFilePreferences()));
-
-        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.")));
+                taskExecutor
+            );
+
+        this.fileFilterList =
+            FXCollections.observableArrayList(
+                new FileExtensionViewModel(
+                    StandardFileType.ANY_FILE,
+                    preferences.getFilePreferences()
+                ),
+                new FileExtensionViewModel(
+                    StandardFileType.HTML,
+                    preferences.getFilePreferences()
+                ),
+                new FileExtensionViewModel(
+                    StandardFileType.MARKDOWN,
+                    preferences.getFilePreferences()
+                ),
+                new FileExtensionViewModel(
+                    StandardFileType.PDF,
+                    preferences.getFilePreferences()
+                )
+            );
+
+        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.")
+                )
+            );
 
         treeRootProperty.setValue(Optional.empty());
     }
 
     public void startSearch() {
         Path directory = this.getSearchDirectory();
-        Filter<Path> selectedFileFilter = selectedExtension.getValue().dirFilter();
+        Filter<Path> selectedFileFilter = selectedExtension
+            .getValue()
+            .dirFilter();
         DateRange selectedDateFilter = selectedDate.getValue();
         ExternalFileSorter selectedSortFilter = selectedSort.getValue();
         progressValueProperty.unbind();
         progressTextProperty.unbind();
 
-        findUnlinkedFilesTask = new UnlinkedFilesCrawler(directory, selectedFileFilter, selectedDateFilter, selectedSortFilter, bibDatabase, preferences.getFilePreferences())
+        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());
+                    progressValueProperty.set(
+                        ProgressIndicator.INDETERMINATE_PROGRESS
+                    );
+                    progressTextProperty.setValue(
+                        Localization.lang("Searching file system...")
+                    );
+                    progressTextProperty.bind(
+                        findUnlinkedFilesTask.messageProperty()
+                    );
                     taskActiveProperty.setValue(true);
                     treeRootProperty.setValue(Optional.empty());
                 })
@@ -135,34 +193,43 @@ public void startSearch() {
                     progressValueProperty.set(0);
                     taskActiveProperty.setValue(false);
                 })
-                .onSuccess(treeRoot -> treeRootProperty.setValue(Optional.of(treeRoot)));
+                .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)
-                                                 .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)
+                .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);
     }
 
@@ -170,35 +237,46 @@ 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())
+        FileDialogConfiguration fileDialogConfiguration =
+            new FileDialogConfiguration.Builder()
+                .withInitialDirectory(
+                    preferences.getFilePreferences().getWorkingDirectory()
+                )
                 .addExtensionFilter(StandardFileType.TXT)
                 .withDefaultExtension(StandardFileType.TXT)
                 .build();
-        Optional<Path> exportPath = dialogService.showFileSaveDialog(fileDialogConfiguration);
+        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;
@@ -222,14 +300,23 @@ 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() {
@@ -285,7 +372,9 @@ public BooleanProperty taskActiveProperty() {
         return this.taskActiveProperty;
     }
 
-    public SimpleListProperty<TreeItem<FileNodeViewModel>> checkedFileListProperty() {
+    public SimpleListProperty<
+        TreeItem<FileNodeViewModel>
+    > checkedFileListProperty() {
         return checkedFileListProperty;
     }
 }
diff --git a/src/main/java/org/jabref/gui/externalfiles/UnlinkedPDFFileFilter.java b/src/main/java/org/jabref/gui/externalfiles/UnlinkedPDFFileFilter.java
index 4c53779cc0d..58304059159 100644
--- a/src/main/java/org/jabref/gui/externalfiles/UnlinkedPDFFileFilter.java
+++ b/src/main/java/org/jabref/gui/externalfiles/UnlinkedPDFFileFilter.java
@@ -6,7 +6,6 @@
 import java.nio.file.DirectoryStream.Filter;
 import java.nio.file.Files;
 import java.nio.file.Path;
-
 import org.jabref.logic.util.io.DatabaseFileLookup;
 import org.jabref.model.database.BibDatabase;
 import org.jabref.model.database.BibDatabaseContext;
@@ -25,7 +24,11 @@ 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,11 @@ 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 9a922177f99..92a8ae5da92 100644
--- a/src/main/java/org/jabref/gui/externalfiletype/CustomExternalFileType.java
+++ b/src/main/java/org/jabref/gui/externalfiletype/CustomExternalFileType.java
@@ -1,7 +1,6 @@
 package org.jabref.gui.externalfiletype;
 
 import java.util.Objects;
-
 import org.jabref.gui.icon.IconTheme;
 import org.jabref.gui.icon.JabRefIcon;
 
@@ -19,8 +18,14 @@ 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;
@@ -31,7 +36,14 @@ 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()
+        );
     }
 
     /**
@@ -44,7 +56,9 @@ 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];
@@ -75,7 +89,14 @@ public static ExternalFileType buildFromArgs(String[] val) {
             }
         }
 
-        return new CustomExternalFileType(name, extension, mimeType, openWith, iconName, icon);
+        return new CustomExternalFileType(
+            name,
+            extension,
+            mimeType,
+            openWith,
+            iconName,
+            icon
+        );
     }
 
     @Override
@@ -157,7 +178,14 @@ public String toString() {
     }
 
     public ExternalFileType copy() {
-        return new CustomExternalFileType(name, extension, mimeType, openWith, iconName, icon);
+        return new CustomExternalFileType(
+            name,
+            extension,
+            mimeType,
+            openWith,
+            iconName,
+            icon
+        );
     }
 
     @Override
@@ -179,8 +207,13 @@ 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 0a5a44259cf..677dcdacc5e 100644
--- a/src/main/java/org/jabref/gui/externalfiletype/ExternalFileType.java
+++ b/src/main/java/org/jabref/gui/externalfiletype/ExternalFileType.java
@@ -32,6 +32,12 @@ 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 c3a7ebf3d46..6d8f6fe2151 100644
--- a/src/main/java/org/jabref/gui/externalfiletype/ExternalFileTypes.java
+++ b/src/main/java/org/jabref/gui/externalfiletype/ExternalFileTypes.java
@@ -9,7 +9,6 @@
 import java.util.Locale;
 import java.util.Optional;
 import java.util.Set;
-
 import org.jabref.logic.bibtex.FileFieldWriter;
 import org.jabref.logic.util.io.FileUtil;
 import org.jabref.model.entry.LinkedFile;
@@ -22,10 +21,10 @@ public class ExternalFileTypes {
     // This String is used in the encoded list in prefs of external file type
     // modifications, in order to indicate a removed default file type:
     private static final String FILE_TYPE_REMOVED_FLAG = "REMOVED";
-    private static final ExternalFileType HTML_FALLBACK_TYPE = StandardExternalFileType.URL;
+    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,15 @@ 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, FilePreferences filePreferences) {
-        Optional<ExternalFileType> externalFileType = filePreferences.getExternalFileTypes().stream().filter(type -> type.getName().equals(name)).findFirst();
+    public static Optional<ExternalFileType> getExternalFileTypeByName(
+        String name,
+        FilePreferences filePreferences
+    ) {
+        Optional<ExternalFileType> externalFileType = filePreferences
+            .getExternalFileTypes()
+            .stream()
+            .filter(type -> type.getName().equals(name))
+            .findFirst();
         if (externalFileType.isPresent()) {
             return externalFileType;
         }
@@ -52,9 +58,18 @@ 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, FilePreferences filePreferences) {
+    public static Optional<ExternalFileType> getExternalFileTypeByExt(
+        String extension,
+        FilePreferences filePreferences
+    ) {
         String extensionCleaned = extension.replace(".", "").replace("*", "");
-        return filePreferences.getExternalFileTypes().stream().filter(type -> type.getExtension().equalsIgnoreCase(extensionCleaned)).findFirst();
+        return filePreferences
+            .getExternalFileTypes()
+            .stream()
+            .filter(type ->
+                type.getExtension().equalsIgnoreCase(extensionCleaned)
+            )
+            .findFirst();
     }
 
     /**
@@ -63,8 +78,14 @@ 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, FilePreferences filePreferences) {
-        return filePreferences.getExternalFileTypes().stream().anyMatch(type -> type.getExtension().equalsIgnoreCase(extension));
+    public static boolean isExternalFileTypeByExt(
+        String extension,
+        FilePreferences filePreferences
+    ) {
+        return filePreferences
+            .getExternalFileTypes()
+            .stream()
+            .anyMatch(type -> type.getExtension().equalsIgnoreCase(extension));
     }
 
     /**
@@ -73,12 +94,20 @@ public static boolean isExternalFileTypeByExt(String extension, FilePreferences
      * @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, FilePreferences filePreferences) {
+    public static Optional<ExternalFileType> getExternalFileTypeForName(
+        String filename,
+        FilePreferences filePreferences
+    ) {
         int longestFound = -1;
         ExternalFileType foundType = null;
         for (ExternalFileType type : filePreferences.getExternalFileTypes()) {
-            if (!type.getExtension().isEmpty() && filename.toLowerCase(Locale.ROOT).endsWith(type.getExtension().toLowerCase(Locale.ROOT))
-                    && (type.getExtension().length() > longestFound)) {
+            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,7 +122,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, FilePreferences filePreferences) {
+    public static Optional<ExternalFileType> getExternalFileTypeByMimeType(
+        String mimeType,
+        FilePreferences filePreferences
+    ) {
         // 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 +142,45 @@ public static Optional<ExternalFileType> getExternalFileTypeByMimeType(String mi
         }
     }
 
-    public static Optional<ExternalFileType> getExternalFileTypeByFile(Path file, FilePreferences filePreferences) {
+    public static Optional<ExternalFileType> getExternalFileTypeByFile(
+        Path file,
+        FilePreferences filePreferences
+    ) {
         final String filePath = file.toString();
         final Optional<String> extension = FileUtil.getFileExtension(filePath);
-        return extension.flatMap(ext -> getExternalFileTypeByExt(ext, filePreferences));
+        return extension.flatMap(ext ->
+            getExternalFileTypeByExt(ext, filePreferences)
+        );
     }
 
-    public static Optional<ExternalFileType> getExternalFileTypeByLinkedFile(LinkedFile linkedFile, boolean deduceUnknownType, FilePreferences filePreferences) {
-        Optional<ExternalFileType> type = getExternalFileTypeByName(linkedFile.getFileType(), filePreferences);
-        boolean isUnknownType = type.isEmpty() || (type.get() instanceof UnknownExternalFileType);
+    public static Optional<ExternalFileType> getExternalFileTypeByLinkedFile(
+        LinkedFile linkedFile,
+        boolean deduceUnknownType,
+        FilePreferences filePreferences
+    ) {
+        Optional<ExternalFileType> type = getExternalFileTypeByName(
+            linkedFile.getFileType(),
+            filePreferences
+        );
+        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(), filePreferences);
+            Optional<ExternalFileType> mimeType = getExternalFileTypeByMimeType(
+                linkedFile.getFileType(),
+                filePreferences
+            );
             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, filePreferences));
+            return FileUtil
+                .getFileExtension(linkedFile.getLink())
+                .flatMap(extension ->
+                    getExternalFileTypeByExt(extension, filePreferences)
+                );
         } else {
             return type;
         }
@@ -140,7 +191,9 @@ public static Optional<ExternalFileType> getExternalFileTypeByLinkedFile(LinkedF
      */
     public static String toStringList(Collection<ExternalFileType> fileTypes) {
         // First find a list of the default types:
-        List<ExternalFileType> defTypes = new ArrayList<>(getDefaultExternalFileTypes());
+        List<ExternalFileType> defTypes = new ArrayList<>(
+            getDefaultExternalFileTypes()
+        );
         // Make a list of types that are unchanged:
         List<ExternalFileType> unchanged = new ArrayList<>();
         // Create a result list
@@ -184,7 +237,7 @@ public static String toStringList(Collection<ExternalFileType> fileTypes) {
             i++;
         }
         for (ExternalFileType type : defTypes) {
-            array[i] = new String[] {type.getName(), FILE_TYPE_REMOVED_FLAG};
+            array[i] = new String[] { type.getName(), FILE_TYPE_REMOVED_FLAG };
             i++;
         }
         return FileFieldWriter.encodeStringArray(array);
@@ -195,7 +248,9 @@ public static String toStringList(Collection<ExternalFileType> fileTypes) {
      */
     public static Set<ExternalFileType> fromString(String storedFileTypes) {
         // First get a list of the default file types as a starting point:
-        Set<ExternalFileType> types = new HashSet<>(getDefaultExternalFileTypes());
+        Set<ExternalFileType> types = new HashSet<>(
+            getDefaultExternalFileTypes()
+        );
 
         // If no changes have been stored, simply use the defaults:
         if (StringUtil.isBlank(storedFileTypes)) {
@@ -220,7 +275,9 @@ public static Set<ExternalFileType> fromString(String storedFileTypes) {
                 }
             } else {
                 // A new or modified entry type. Construct it from the string array:
-                ExternalFileType type = CustomExternalFileType.buildFromArgs(val);
+                ExternalFileType type = CustomExternalFileType.buildFromArgs(
+                    val
+                );
                 // Check if there is a default type with the same name. If so, this is a
                 // modification of that type, so remove the default one:
                 ExternalFileType toRemove = null;
diff --git a/src/main/java/org/jabref/gui/externalfiletype/StandardExternalFileType.java b/src/main/java/org/jabref/gui/externalfiletype/StandardExternalFileType.java
index fc12e9670e8..d4de59a81e6 100644
--- a/src/main/java/org/jabref/gui/externalfiletype/StandardExternalFileType.java
+++ b/src/main/java/org/jabref/gui/externalfiletype/StandardExternalFileType.java
@@ -5,31 +5,199 @@
 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
+    ),
+    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
+    ),
+    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
+    ),
+    MARKDOWN(
+        "Markdown",
+        "md",
+        "text/markdown",
+        "emacs",
+        "emacs",
+        IconTheme.JabRefIcons.FILE_TEXT
+    );
 
-    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),
-    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),
-    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),
-    MARKDOWN("Markdown", "md", "text/markdown", "emacs", "emacs", IconTheme.JabRefIcons.FILE_TEXT);
     private final String name;
     private final String extension;
     private final String mimeType;
@@ -37,8 +205,14 @@ 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;
diff --git a/src/main/java/org/jabref/gui/fieldeditors/AbstractEditorViewModel.java b/src/main/java/org/jabref/gui/fieldeditors/AbstractEditorViewModel.java
index 6539d1c8e54..0cf99242d72 100644
--- a/src/main/java/org/jabref/gui/fieldeditors/AbstractEditorViewModel.java
+++ b/src/main/java/org/jabref/gui/fieldeditors/AbstractEditorViewModel.java
@@ -1,12 +1,15 @@
 package org.jabref.gui.fieldeditors;
 
+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 java.util.Collection;
-
-import javax.swing.undo.UndoManager;
-
 import javafx.beans.property.SimpleStringProperty;
 import javafx.beans.property.StringProperty;
-
+import javax.swing.undo.UndoManager;
+import org.controlsfx.control.textfield.AutoCompletionBinding;
 import org.jabref.gui.AbstractViewModel;
 import org.jabref.gui.autocompleter.SuggestionProvider;
 import org.jabref.gui.undo.UndoableFieldChange;
@@ -16,14 +19,8 @@
 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;
-
 public class AbstractEditorViewModel extends AbstractViewModel {
+
     protected final Field field;
     protected StringProperty text = new SimpleStringProperty("");
     protected BibEntry entry;
@@ -32,15 +29,27 @@ 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);
         }
     }
@@ -60,25 +69,38 @@ public void bindToEntry(BibEntry entry) {
         fieldBinding = entry.getFieldBinding(field).asOrdinary();
 
         BindingsHelper.bindBidirectional(
-                this.textProperty(),
-                fieldBinding,
-                newValue -> {
-                    if (newValue != null) {
-                        // A file may be loaded using CRLF. ControlsFX uses hardcoded \n for multiline fields.
-                        // Normalizing is done during writing of the .bib file (see org.jabref.logic.exporter.BibWriter.BibWriter).
-                        // Thus, we need to normalize the line endings.
-                        String oldValue = entry.getField(field).map(value -> value.replace("\r\n", "\n").trim()).orElse(null);
-                        // Autosave and save action trigger the entry editor to reload the fields, so we have to
-                        // check for changes here, otherwise the cursor position is annoyingly reset every few seconds
-                        if (!(newValue.trim()).equals(oldValue)) {
-                            entry.setField(field, newValue);
-                            undoManager.addEdit(new UndoableFieldChange(entry, field, oldValue, newValue));
-                        }
+            this.textProperty(),
+            fieldBinding,
+            newValue -> {
+                if (newValue != null) {
+                    // A file may be loaded using CRLF. ControlsFX uses hardcoded \n for multiline fields.
+                    // Normalizing is done during writing of the .bib file (see org.jabref.logic.exporter.BibWriter.BibWriter).
+                    // Thus, we need to normalize the line endings.
+                    String oldValue = entry
+                        .getField(field)
+                        .map(value -> value.replace("\r\n", "\n").trim())
+                        .orElse(null);
+                    // Autosave and save action trigger the entry editor to reload the fields, so we have to
+                    // check for changes here, otherwise the cursor position is annoyingly reset every few seconds
+                    if (!(newValue.trim()).equals(oldValue)) {
+                        entry.setField(field, newValue);
+                        undoManager.addEdit(
+                            new UndoableFieldChange(
+                                entry,
+                                field,
+                                oldValue,
+                                newValue
+                            )
+                        );
                     }
-                });
+                }
+            }
+        );
     }
 
-    public Collection<?> complete(AutoCompletionBinding.ISuggestionRequest request) {
+    public Collection<?> complete(
+        AutoCompletionBinding.ISuggestionRequest request
+    ) {
         return suggestionProvider.provideSuggestions(request);
     }
 }
diff --git a/src/main/java/org/jabref/gui/fieldeditors/CitationKeyEditor.java b/src/main/java/org/jabref/gui/fieldeditors/CitationKeyEditor.java
index 6466296e017..45bd09938b5 100644
--- a/src/main/java/org/jabref/gui/fieldeditors/CitationKeyEditor.java
+++ b/src/main/java/org/jabref/gui/fieldeditors/CitationKeyEditor.java
@@ -1,14 +1,13 @@
 package org.jabref.gui.fieldeditors;
 
+import com.airhacks.afterburner.views.ViewLoader;
+import jakarta.inject.Inject;
 import java.util.Collections;
-
-import javax.swing.undo.UndoManager;
-
 import javafx.fxml.FXML;
 import javafx.scene.Parent;
 import javafx.scene.control.Button;
 import javafx.scene.layout.HBox;
-
+import javax.swing.undo.UndoManager;
 import org.jabref.gui.DialogService;
 import org.jabref.gui.actions.ActionFactory;
 import org.jabref.gui.actions.StandardActions;
@@ -19,42 +18,54 @@
 import org.jabref.model.entry.field.Field;
 import org.jabref.preferences.PreferencesService;
 
-import com.airhacks.afterburner.views.ViewLoader;
-import jakarta.inject.Inject;
-
 public class CitationKeyEditor extends HBox implements FieldEditorFX {
 
-    @FXML private final CitationKeyEditorViewModel viewModel;
-    @FXML private Button generateCitationKeyButton;
-    @FXML private EditorTextField textField;
+    @FXML
+    private final CitationKeyEditorViewModel viewModel;
+
+    @FXML
+    private Button generateCitationKeyButton;
+
+    @FXML
+    private EditorTextField textField;
+
+    @Inject
+    private PreferencesService preferencesService;
 
-    @Inject private PreferencesService preferencesService;
-    @Inject private DialogService dialogService;
-    @Inject private UndoManager undoManager;
+    @Inject
+    private DialogService dialogService;
 
-    public CitationKeyEditor(Field field,
-                             SuggestionProvider<?> suggestionProvider,
-                             FieldCheckers fieldCheckers,
-                             BibDatabaseContext databaseContext) {
+    @Inject
+    private UndoManager undoManager;
 
-        ViewLoader.view(this)
-                  .root(this)
-                  .load();
+    public CitationKeyEditor(
+        Field field,
+        SuggestionProvider<?> suggestionProvider,
+        FieldCheckers fieldCheckers,
+        BibDatabaseContext databaseContext
+    ) {
+        ViewLoader.view(this).root(this).load();
 
-        this.viewModel = new CitationKeyEditorViewModel(
+        this.viewModel =
+            new CitationKeyEditorViewModel(
                 field,
                 suggestionProvider,
                 fieldCheckers,
                 preferencesService,
                 databaseContext,
                 undoManager,
-                dialogService);
+                dialogService
+            );
 
         textField.textProperty().bindBidirectional(viewModel.textProperty());
 
         textField.initContextMenu(Collections::emptyList);
 
-        new EditorValidator(preferencesService).configureValidation(viewModel.getFieldValidator().getValidationStatus(), textField);
+        new EditorValidator(preferencesService)
+            .configureValidation(
+                viewModel.getFieldValidator().getValidationStatus(),
+                textField
+            );
     }
 
     public CitationKeyEditorViewModel getViewModel() {
@@ -67,10 +78,11 @@ public void bindToEntry(BibEntry entry) {
 
         // Configure button to generate citation key
         new ActionFactory(preferencesService.getKeyBindingRepository())
-                .configureIconButton(
-                        StandardActions.GENERATE_CITE_KEY,
-                        viewModel.getGenerateCiteKeyCommand(),
-                        generateCitationKeyButton);
+            .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 fd495bd0206..70d850ae3d4 100644
--- a/src/main/java/org/jabref/gui/fieldeditors/CitationKeyEditorViewModel.java
+++ b/src/main/java/org/jabref/gui/fieldeditors/CitationKeyEditorViewModel.java
@@ -1,7 +1,7 @@
 package org.jabref.gui.fieldeditors;
 
+import de.saxsys.mvvmfx.utils.commands.Command;
 import javax.swing.undo.UndoManager;
-
 import org.jabref.gui.DialogService;
 import org.jabref.gui.autocompleter.SuggestionProvider;
 import org.jabref.gui.citationkeypattern.GenerateCitationKeySingleAction;
@@ -10,21 +10,22 @@
 import org.jabref.model.entry.field.Field;
 import org.jabref.preferences.PreferencesService;
 
-import de.saxsys.mvvmfx.utils.commands.Command;
-
 public class CitationKeyEditorViewModel extends AbstractEditorViewModel {
+
     private final PreferencesService preferencesService;
     private final BibDatabaseContext databaseContext;
     private final UndoManager undoManager;
     private final DialogService dialogService;
 
-    public CitationKeyEditorViewModel(Field field,
-                                      SuggestionProvider<?> suggestionProvider,
-                                      FieldCheckers fieldCheckers,
-                                      PreferencesService preferencesService,
-                                      BibDatabaseContext databaseContext,
-                                      UndoManager undoManager,
-                                      DialogService dialogService) {
+    public CitationKeyEditorViewModel(
+        Field field,
+        SuggestionProvider<?> suggestionProvider,
+        FieldCheckers fieldCheckers,
+        PreferencesService preferencesService,
+        BibDatabaseContext databaseContext,
+        UndoManager undoManager,
+        DialogService dialogService
+    ) {
         super(field, suggestionProvider, fieldCheckers, undoManager);
         this.preferencesService = preferencesService;
         this.databaseContext = databaseContext;
@@ -33,6 +34,12 @@ public CitationKeyEditorViewModel(Field field,
     }
 
     public Command getGenerateCiteKeyCommand() {
-        return new GenerateCitationKeySingleAction(entry, databaseContext, dialogService, preferencesService, undoManager);
+        return new GenerateCitationKeySingleAction(
+            entry,
+            databaseContext,
+            dialogService,
+            preferencesService,
+            undoManager
+        );
     }
 }
diff --git a/src/main/java/org/jabref/gui/fieldeditors/ContextMenuAddable.java b/src/main/java/org/jabref/gui/fieldeditors/ContextMenuAddable.java
index 708ca1c785b..af13d8250fa 100644
--- a/src/main/java/org/jabref/gui/fieldeditors/ContextMenuAddable.java
+++ b/src/main/java/org/jabref/gui/fieldeditors/ContextMenuAddable.java
@@ -2,7 +2,6 @@
 
 import java.util.List;
 import java.util.function.Supplier;
-
 import javafx.scene.control.MenuItem;
 
 public interface ContextMenuAddable {
diff --git a/src/main/java/org/jabref/gui/fieldeditors/DateEditor.java b/src/main/java/org/jabref/gui/fieldeditors/DateEditor.java
index eb3a39e585e..dc5a064775f 100644
--- a/src/main/java/org/jabref/gui/fieldeditors/DateEditor.java
+++ b/src/main/java/org/jabref/gui/fieldeditors/DateEditor.java
@@ -1,13 +1,12 @@
 package org.jabref.gui.fieldeditors;
 
+import com.airhacks.afterburner.views.ViewLoader;
+import jakarta.inject.Inject;
 import java.time.format.DateTimeFormatter;
-
-import javax.swing.undo.UndoManager;
-
 import javafx.fxml.FXML;
 import javafx.scene.Parent;
 import javafx.scene.layout.HBox;
-
+import javax.swing.undo.UndoManager;
 import org.jabref.gui.autocompleter.SuggestionProvider;
 import org.jabref.gui.util.component.TemporalAccessorPicker;
 import org.jabref.logic.integrity.FieldCheckers;
@@ -15,28 +14,48 @@
 import org.jabref.model.entry.field.Field;
 import org.jabref.preferences.PreferencesService;
 
-import com.airhacks.afterburner.views.ViewLoader;
-import jakarta.inject.Inject;
-
 public class DateEditor extends HBox implements FieldEditorFX {
 
-    @FXML private DateEditorViewModel viewModel;
-    @FXML private TemporalAccessorPicker datePicker;
+    @FXML
+    private DateEditorViewModel viewModel;
+
+    @FXML
+    private TemporalAccessorPicker datePicker;
+
+    @Inject
+    private UndoManager undoManager;
 
-    @Inject private UndoManager undoManager;
-    @Inject private PreferencesService preferencesService;
+    @Inject
+    private PreferencesService preferencesService;
 
-    public DateEditor(Field field, DateTimeFormatter dateFormatter, SuggestionProvider<?> suggestionProvider, FieldCheckers fieldCheckers) {
-        ViewLoader.view(this)
-                  .root(this)
-                  .load();
+    public DateEditor(
+        Field field,
+        DateTimeFormatter dateFormatter,
+        SuggestionProvider<?> suggestionProvider,
+        FieldCheckers fieldCheckers
+    ) {
+        ViewLoader.view(this).root(this).load();
 
-        this.viewModel = new DateEditorViewModel(field, suggestionProvider, dateFormatter, fieldCheckers, undoManager);
+        this.viewModel =
+            new DateEditorViewModel(
+                field,
+                suggestionProvider,
+                dateFormatter,
+                fieldCheckers,
+                undoManager
+            );
 
         datePicker.setStringConverter(viewModel.getDateToStringConverter());
-        datePicker.getEditor().textProperty().bindBidirectional(viewModel.textProperty());
+        datePicker
+            .getEditor()
+            .textProperty()
+            .bindBidirectional(viewModel.textProperty());
 
-        new EditorValidator(preferencesService).configureValidation(viewModel.getFieldValidator().getValidationStatus(), datePicker.getEditor());
+        new EditorValidator(preferencesService)
+            .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 d8bc6e37e12..fec77c583a4 100644
--- a/src/main/java/org/jabref/gui/fieldeditors/DateEditorViewModel.java
+++ b/src/main/java/org/jabref/gui/fieldeditors/DateEditorViewModel.java
@@ -4,26 +4,30 @@
 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 javax.swing.undo.UndoManager;
 import org.jabref.gui.autocompleter.SuggestionProvider;
 import org.jabref.logic.integrity.FieldCheckers;
 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;
 
 public class DateEditorViewModel extends AbstractEditorViewModel {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(DateEditorViewModel.class);
+    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;
     }
@@ -51,7 +55,10 @@ public TemporalAccessor fromString(String string) {
                         return dateFormatter.parse(string);
                     } catch (DateTimeParseException exception) {
                         // We accept all kinds of dates (not just in the format specified)
-                        return Date.parse(string).map(Date::toTemporalAccessor).orElse(null);
+                        return Date
+                            .parse(string)
+                            .map(Date::toTemporalAccessor)
+                            .orElse(null);
                     }
                 } else {
                     return null;
diff --git a/src/main/java/org/jabref/gui/fieldeditors/EditorTextArea.java b/src/main/java/org/jabref/gui/fieldeditors/EditorTextArea.java
index d57148409be..958224c7f7d 100644
--- a/src/main/java/org/jabref/gui/fieldeditors/EditorTextArea.java
+++ b/src/main/java/org/jabref/gui/fieldeditors/EditorTextArea.java
@@ -5,16 +5,16 @@
 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;
-
 import org.jabref.gui.ClipBoardManager;
 import org.jabref.gui.Globals;
 import org.jabref.gui.fieldeditors.contextmenu.EditorContextAction;
 
-public class EditorTextArea extends javafx.scene.control.TextArea implements Initializable, ContextMenuAddable {
+public class EditorTextArea
+    extends javafx.scene.control.TextArea
+    implements Initializable, ContextMenuAddable {
 
     private final ContextMenu contextMenu = new ContextMenu();
     /**
@@ -30,7 +30,6 @@ public EditorTextArea() {
 
     public EditorTextArea(final String text) {
         super(text);
-
         // Hide horizontal scrollbar and always wrap text
         setWrapText(true);
 
@@ -40,7 +39,14 @@ public EditorTextArea(final String text) {
     @Override
     public void initContextMenu(final Supplier<List<MenuItem>> items) {
         setOnContextMenuRequested(event -> {
-            contextMenu.getItems().setAll(EditorContextAction.getDefaultContextMenuItems(this, Globals.getKeyPrefs()));
+            contextMenu
+                .getItems()
+                .setAll(
+                    EditorContextAction.getDefaultContextMenuItems(
+                        this,
+                        Globals.getKeyPrefs()
+                    )
+                );
             contextMenu.getItems().addAll(0, items.get());
 
             TextInputControlBehavior.showContextMenu(this, contextMenu, event);
diff --git a/src/main/java/org/jabref/gui/fieldeditors/EditorTextField.java b/src/main/java/org/jabref/gui/fieldeditors/EditorTextField.java
index c5e8642e23e..4f7917d2b3a 100644
--- a/src/main/java/org/jabref/gui/fieldeditors/EditorTextField.java
+++ b/src/main/java/org/jabref/gui/fieldeditors/EditorTextField.java
@@ -4,18 +4,18 @@
 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;
 import javafx.scene.layout.HBox;
 import javafx.scene.layout.Priority;
-
 import org.jabref.gui.ClipBoardManager;
 import org.jabref.gui.Globals;
 import org.jabref.gui.fieldeditors.contextmenu.EditorContextAction;
 
-public class EditorTextField extends javafx.scene.control.TextField implements Initializable, ContextMenuAddable {
+public class EditorTextField
+    extends javafx.scene.control.TextField
+    implements Initializable, ContextMenuAddable {
 
     private final ContextMenu contextMenu = new ContextMenu();
 
@@ -25,7 +25,6 @@ public EditorTextField() {
 
     public EditorTextField(final String text) {
         super(text);
-
         // Always fill out all the available space
         setPrefHeight(Double.POSITIVE_INFINITY);
         HBox.setHgrow(this, Priority.ALWAYS);
@@ -36,7 +35,14 @@ public EditorTextField(final String text) {
     @Override
     public void initContextMenu(final Supplier<List<MenuItem>> items) {
         setOnContextMenuRequested(event -> {
-            contextMenu.getItems().setAll(EditorContextAction.getDefaultContextMenuItems(this, Globals.getKeyPrefs()));
+            contextMenu
+                .getItems()
+                .setAll(
+                    EditorContextAction.getDefaultContextMenuItems(
+                        this,
+                        Globals.getKeyPrefs()
+                    )
+                );
             contextMenu.getItems().addAll(0, items.get());
 
             TextInputControlBehavior.showContextMenu(this, contextMenu, event);
diff --git a/src/main/java/org/jabref/gui/fieldeditors/EditorTypeEditorViewModel.java b/src/main/java/org/jabref/gui/fieldeditors/EditorTypeEditorViewModel.java
index 0bd8999d003..6c6f5ff1359 100644
--- a/src/main/java/org/jabref/gui/fieldeditors/EditorTypeEditorViewModel.java
+++ b/src/main/java/org/jabref/gui/fieldeditors/EditorTypeEditorViewModel.java
@@ -1,22 +1,24 @@
 package org.jabref.gui.fieldeditors;
 
+import com.google.common.collect.BiMap;
+import com.google.common.collect.HashBiMap;
 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 com.google.common.collect.BiMap;
-import com.google.common.collect.HashBiMap;
-
 public class EditorTypeEditorViewModel extends MapBasedEditorViewModel<String> {
 
     private BiMap<String, String> itemMap = HashBiMap.create(7);
 
-    public EditorTypeEditorViewModel(Field field, SuggestionProvider<?> suggestionProvider, FieldCheckers fieldCheckers, UndoManager undoManager) {
+    public EditorTypeEditorViewModel(
+        Field field,
+        SuggestionProvider<?> suggestionProvider,
+        FieldCheckers fieldCheckers,
+        UndoManager undoManager
+    ) {
         super(field, suggestionProvider, fieldCheckers, undoManager);
-
         itemMap.put("editor", Localization.lang("Editor"));
         itemMap.put("compiler", Localization.lang("Compiler"));
         itemMap.put("founder", Localization.lang("Founder"));
diff --git a/src/main/java/org/jabref/gui/fieldeditors/EditorValidator.java b/src/main/java/org/jabref/gui/fieldeditors/EditorValidator.java
index 6396e4711ac..0dfd0c51ebd 100644
--- a/src/main/java/org/jabref/gui/fieldeditors/EditorValidator.java
+++ b/src/main/java/org/jabref/gui/fieldeditors/EditorValidator.java
@@ -1,13 +1,11 @@
 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.util.IconValidationDecorator;
 import org.jabref.preferences.PreferencesService;
 
-import de.saxsys.mvvmfx.utils.validation.ValidationStatus;
-import de.saxsys.mvvmfx.utils.validation.visualization.ControlsFxVisualizer;
-
 public class EditorValidator {
 
     private final PreferencesService preferences;
@@ -16,9 +14,13 @@ public EditorValidator(PreferencesService 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();
+            ControlsFxVisualizer validationVisualizer =
+                new ControlsFxVisualizer();
             validationVisualizer.setDecoration(new IconValidationDecorator());
             validationVisualizer.initVisualization(status, textInput);
         }
diff --git a/src/main/java/org/jabref/gui/fieldeditors/FieldEditorFX.java b/src/main/java/org/jabref/gui/fieldeditors/FieldEditorFX.java
index f8fafb67800..e90a0b40f8b 100644
--- a/src/main/java/org/jabref/gui/fieldeditors/FieldEditorFX.java
+++ b/src/main/java/org/jabref/gui/fieldeditors/FieldEditorFX.java
@@ -1,22 +1,21 @@
 package org.jabref.gui.fieldeditors;
 
 import javafx.scene.Parent;
-
 import org.jabref.gui.util.ControlHelper;
 import org.jabref.model.entry.BibEntry;
 
 public interface FieldEditorFX {
-
     void bindToEntry(BibEntry entry);
 
     Parent getNode();
 
     default void focus() {
-        getNode().getChildrenUnmodifiable()
-                 .stream()
-                 .findFirst()
-                 .orElse(getNode())
-                 .requestFocus();
+        getNode()
+            .getChildrenUnmodifiable()
+            .stream()
+            .findFirst()
+            .orElse(getNode())
+            .requestFocus();
     }
 
     default boolean childIsFocused() {
diff --git a/src/main/java/org/jabref/gui/fieldeditors/FieldEditors.java b/src/main/java/org/jabref/gui/fieldeditors/FieldEditors.java
index 5e817d5291c..4fe853cd054 100644
--- a/src/main/java/org/jabref/gui/fieldeditors/FieldEditors.java
+++ b/src/main/java/org/jabref/gui/fieldeditors/FieldEditors.java
@@ -3,9 +3,7 @@
 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;
@@ -25,96 +23,244 @@
 import org.jabref.model.entry.types.IEEETranEntryType;
 import org.jabref.model.metadata.MetaData;
 import org.jabref.preferences.PreferencesService;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 @SuppressWarnings("unchecked")
 public class FieldEditors {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(FieldEditors.class);
+    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 PreferencesService preferences,
-                                            final BibDatabaseContext databaseContext,
-                                            final EntryType entryType,
-                                            final SuggestionProviders suggestionProviders,
-                                            final UndoManager undoManager) {
+    public static FieldEditorFX getForField(
+        final Field field,
+        final TaskExecutor taskExecutor,
+        final DialogService dialogService,
+        final JournalAbbreviationRepository journalAbbreviationRepository,
+        final PreferencesService preferences,
+        final BibDatabaseContext databaseContext,
+        final EntryType entryType,
+        final SuggestionProviders suggestionProviders,
+        final UndoManager undoManager
+    ) {
         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());
+            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);
+        if (
+            preferences
+                .getTimestampPreferences()
+                .getTimestampField()
+                .equals(field)
+        ) {
+            return new DateEditor(
+                field,
+                DateTimeFormatter.ofPattern(
+                    preferences.getTimestampPreferences().getTimestampFormat()
+                ),
+                suggestionProvider,
+                fieldCheckers
+            );
         } else if (fieldProperties.contains(FieldProperty.DATE)) {
-            return new DateEditor(field, DateTimeFormatter.ofPattern("[uuuu][-MM][-dd]"), suggestionProvider, fieldCheckers);
+            return new DateEditor(
+                field,
+                DateTimeFormatter.ofPattern("[uuuu][-MM][-dd]"),
+                suggestionProvider,
+                fieldCheckers
+            );
         } else if (fieldProperties.contains(FieldProperty.EXTERNAL)) {
             return new UrlEditor(field, suggestionProvider, fieldCheckers);
         } else if (fieldProperties.contains(FieldProperty.JOURNAL_NAME)) {
             return new JournalEditor(field, suggestionProvider, fieldCheckers);
-        } else if (fieldProperties.contains(FieldProperty.DOI) || fieldProperties.contains(FieldProperty.EPRINT) || fieldProperties.contains(FieldProperty.ISBN)) {
-            return new IdentifierEditor(field, suggestionProvider, fieldCheckers);
+        } else if (
+            fieldProperties.contains(FieldProperty.DOI) ||
+            fieldProperties.contains(FieldProperty.EPRINT) ||
+            fieldProperties.contains(FieldProperty.ISBN)
+        ) {
+            return new IdentifierEditor(
+                field,
+                suggestionProvider,
+                fieldCheckers
+            );
         } else if (fieldProperties.contains(FieldProperty.ISSN)) {
             return new ISSNEditor(field, suggestionProvider, fieldCheckers);
         } else if (field == StandardField.OWNER) {
             return new OwnerEditor(field, suggestionProvider, fieldCheckers);
         } else if (field == StandardField.GROUPS) {
-            return new GroupEditor(field, suggestionProvider, fieldCheckers, preferences, isMultiLine, undoManager);
+            return new GroupEditor(
+                field,
+                suggestionProvider,
+                fieldCheckers,
+                preferences,
+                isMultiLine,
+                undoManager
+            );
         } else if (fieldProperties.contains(FieldProperty.FILE_EDITOR)) {
-            return new LinkedFilesEditor(field, databaseContext, suggestionProvider, fieldCheckers);
+            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 (fieldProperties.contains(FieldProperty.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 (fieldProperties.contains(FieldProperty.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)) {
-            return new LinkedEntriesEditor(field, databaseContext, (SuggestionProvider<BibEntry>) suggestionProvider, fieldCheckers);
-        } else if (fieldProperties.contains(FieldProperty.MULTIPLE_ENTRY_LINK)) {
-            return new LinkedEntriesEditor(field, databaseContext, (SuggestionProvider<BibEntry>) suggestionProvider, fieldCheckers);
+            return new LinkedEntriesEditor(
+                field,
+                databaseContext,
+                (SuggestionProvider<BibEntry>) suggestionProvider,
+                fieldCheckers
+            );
+        } else if (
+            fieldProperties.contains(FieldProperty.MULTIPLE_ENTRY_LINK)
+        ) {
+            return new LinkedEntriesEditor(
+                field,
+                databaseContext,
+                (SuggestionProvider<BibEntry>) suggestionProvider,
+                fieldCheckers
+            );
         } else if (fieldProperties.contains(FieldProperty.PERSON_NAMES)) {
-            return new PersonsEditor(field, suggestionProvider, preferences, fieldCheckers, isMultiLine, undoManager);
+            return new PersonsEditor(
+                field,
+                suggestionProvider,
+                preferences,
+                fieldCheckers,
+                isMultiLine,
+                undoManager
+            );
         } else if (StandardField.KEYWORDS == field) {
-            return new KeywordsEditor(field, suggestionProvider, fieldCheckers, preferences, undoManager);
+            return new KeywordsEditor(
+                field,
+                suggestionProvider,
+                fieldCheckers,
+                preferences,
+                undoManager
+            );
         } else if (field == InternalField.KEY_FIELD) {
-            return new CitationKeyEditor(field, suggestionProvider, fieldCheckers, databaseContext);
+            return new CitationKeyEditor(
+                field,
+                suggestionProvider,
+                fieldCheckers,
+                databaseContext
+            );
         } else {
             // default
-            return new SimpleEditor(field, suggestionProvider, fieldCheckers, preferences, isMultiLine, undoManager);
+            return new SimpleEditor(
+                field,
+                suggestionProvider,
+                fieldCheckers,
+                preferences,
+                isMultiLine,
+                undoManager
+            );
         }
     }
 
-    private static SuggestionProvider<?> getSuggestionProvider(Field field, SuggestionProviders suggestionProviders, MetaData metaData) {
-        SuggestionProvider<?> suggestionProvider = suggestionProviders.getForField(field);
+    private static SuggestionProvider<?> getSuggestionProvider(
+        Field field,
+        SuggestionProviders suggestionProviders,
+        MetaData metaData
+    ) {
+        SuggestionProvider<?> suggestionProvider =
+            suggestionProviders.getForField(field);
 
-        List<String> contentSelectorValues = metaData.getContentSelectorValuesForField(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 33c9018a829..8636765f78e 100644
--- a/src/main/java/org/jabref/gui/fieldeditors/FieldNameLabel.java
+++ b/src/main/java/org/jabref/gui/fieldeditors/FieldNameLabel.java
@@ -5,7 +5,6 @@
 import javafx.scene.control.Label;
 import javafx.scene.control.Tooltip;
 import javafx.stage.Screen;
-
 import org.jabref.logic.l10n.Localization;
 import org.jabref.model.entry.field.Field;
 import org.jabref.model.entry.field.InternalField;
@@ -17,7 +16,6 @@ public class FieldNameLabel extends Label {
 
     public FieldNameLabel(Field field) {
         super(field.getDisplayName());
-
         setPadding(new Insets(4, 0, 0, 0));
         setAlignment(Pos.CENTER);
         setPrefHeight(Double.POSITIVE_INFINITY);
@@ -27,7 +25,7 @@ public FieldNameLabel(Field field) {
             Screen currentScreen = Screen.getPrimary();
             double maxWidth = currentScreen.getBounds().getWidth();
             Tooltip tooltip = new Tooltip(description);
-            tooltip.setMaxWidth(maxWidth * 2 / 3);
+            tooltip.setMaxWidth((maxWidth * 2) / 3);
             tooltip.setWrapText(true);
             this.setTooltip(tooltip);
         }
@@ -38,148 +36,300 @@ 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.");
+                    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.");
+                    return Localization.lang(
+                        "Author(s) of annotations to the work."
+                    );
                 case AUTHOR:
                     return Localization.lang("Author(s) of the work.");
                 case BOOKSUBTITLE:
-                    return Localization.lang("Subtitle related to the \"Booktitle\".");
+                    return Localization.lang(
+                        "Subtitle related to the \"Booktitle\"."
+                    );
                 case BOOKTITLE:
-                    return Localization.lang("Title of the main publication this work is part of.");
+                    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.");
+                    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:
-                    return Localization.lang("Digital Object Identifier of the work.");
+                    return Localization.lang(
+                        "Digital Object Identifier of the work."
+                    );
                 case EDITION:
-                    return Localization.lang("Edition of a printed publication.");
+                    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\".");
+                    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.");
+                    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.");
+                    return Localization.lang(
+                        "Name of a university or some other institution."
+                    );
                 case INTRODUCTION:
-                    return Localization.lang("Author(s) of an introduction to the work.");
+                    return Localization.lang(
+                        "Author(s) of an introduction to the work."
+                    );
                 case ISBN:
-                    return Localization.lang("International Standard Book Number of a book.");
+                    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\".");
+                    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.");
+                    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\".");
+                    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,61 +337,97 @@ 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.");
+                    return Localization.lang(
+                        "Volume of a multi-volume book or a periodical."
+                    );
                 case VOLUMES:
-                    return Localization.lang("Total number of volumes of a multi-volume work.");
+                    return Localization.lang(
+                        "Total number of volumes of a multi-volume work."
+                    );
                 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) {
                 case KEY_FIELD:
-                    return Localization.lang("Key by which the work may be cited.");
+                    return Localization.lang(
+                        "Key by which the work may be cited."
+                    );
             }
         } 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/GenderEditorViewModel.java b/src/main/java/org/jabref/gui/fieldeditors/GenderEditorViewModel.java
index fd7300e5e65..f62064f8c2c 100644
--- a/src/main/java/org/jabref/gui/fieldeditors/GenderEditorViewModel.java
+++ b/src/main/java/org/jabref/gui/fieldeditors/GenderEditorViewModel.java
@@ -1,22 +1,24 @@
 package org.jabref.gui.fieldeditors;
 
+import com.google.common.collect.BiMap;
+import com.google.common.collect.HashBiMap;
 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 com.google.common.collect.BiMap;
-import com.google.common.collect.HashBiMap;
-
 public class GenderEditorViewModel extends MapBasedEditorViewModel<String> {
 
     private final BiMap<String, String> itemMap = HashBiMap.create(7);
 
-    public GenderEditorViewModel(Field field, SuggestionProvider<?> suggestionProvider, FieldCheckers fieldCheckers, UndoManager undoManager) {
+    public GenderEditorViewModel(
+        Field field,
+        SuggestionProvider<?> suggestionProvider,
+        FieldCheckers fieldCheckers,
+        UndoManager undoManager
+    ) {
         super(field, suggestionProvider, fieldCheckers, undoManager);
-
         itemMap.put("sf", Localization.lang("Female name"));
         itemMap.put("sm", Localization.lang("Male name"));
         itemMap.put("sn", Localization.lang("Neuter name"));
diff --git a/src/main/java/org/jabref/gui/fieldeditors/GroupEditor.java b/src/main/java/org/jabref/gui/fieldeditors/GroupEditor.java
index 584e9fcd85e..70311fec6a3 100644
--- a/src/main/java/org/jabref/gui/fieldeditors/GroupEditor.java
+++ b/src/main/java/org/jabref/gui/fieldeditors/GroupEditor.java
@@ -2,11 +2,8 @@
 
 import java.util.List;
 import java.util.Optional;
-
-import javax.swing.undo.UndoManager;
-
 import javafx.scene.input.TransferMode;
-
+import javax.swing.undo.UndoManager;
 import org.jabref.gui.DragAndDropDataFormats;
 import org.jabref.gui.autocompleter.SuggestionProvider;
 import org.jabref.logic.integrity.FieldCheckers;
@@ -19,37 +16,67 @@ public class GroupEditor extends SimpleEditor {
 
     private Optional<BibEntry> bibEntry;
 
-    public GroupEditor(final Field field,
-                       final SuggestionProvider<?> suggestionProvider,
-                       final FieldCheckers fieldCheckers,
-                       final PreferencesService preferences,
-                       final boolean isMultiLine,
-                       final UndoManager undoManager) {
-        super(field, suggestionProvider, fieldCheckers, preferences, isMultiLine, undoManager);
-
+    public GroupEditor(
+        final Field field,
+        final SuggestionProvider<?> suggestionProvider,
+        final FieldCheckers fieldCheckers,
+        final PreferencesService preferences,
+        final boolean isMultiLine,
+        final UndoManager undoManager
+    ) {
+        super(
+            field,
+            suggestionProvider,
+            fieldCheckers,
+            preferences,
+            isMultiLine,
+            undoManager
+        );
         this.setOnDragOver(event -> {
-            if (event.getDragboard().hasContent(DragAndDropDataFormats.GROUP)) {
-                event.acceptTransferModes(TransferMode.MOVE);
-            }
-            event.consume();
-        });
+                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.get(0) != null) {
-                    String newGroup = bibEntry.map(entry -> entry.getField(StandardField.GROUPS)
-                                                                     .map(oldGroups -> oldGroups + (preferences.getBibEntryPreferences().getKeywordSeparator()) + (draggedGroups.get(0)))
-                                                                     .orElse(draggedGroups.get(0)))
-                                                  .orElse(null);
-                    bibEntry.map(entry -> entry.setField(StandardField.GROUPS, newGroup));
-                    success = true;
+                boolean success = false;
+                if (
+                    event
+                        .getDragboard()
+                        .hasContent(DragAndDropDataFormats.GROUP)
+                ) {
+                    List<String> draggedGroups = (List<String>) event
+                        .getDragboard()
+                        .getContent(DragAndDropDataFormats.GROUP);
+                    if (bibEntry.isPresent() && draggedGroups.get(0) != null) {
+                        String newGroup = bibEntry
+                            .map(entry ->
+                                entry
+                                    .getField(StandardField.GROUPS)
+                                    .map(oldGroups ->
+                                        oldGroups +
+                                        (preferences
+                                                .getBibEntryPreferences()
+                                                .getKeywordSeparator()) +
+                                        (draggedGroups.get(0))
+                                    )
+                                    .orElse(draggedGroups.get(0))
+                            )
+                            .orElse(null);
+                        bibEntry.map(entry ->
+                            entry.setField(StandardField.GROUPS, newGroup)
+                        );
+                        success = true;
+                    }
                 }
-            }
-            event.setDropCompleted(success);
-            event.consume();
-        });
+                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 7fc01a07c4a..f3c46ccea72 100644
--- a/src/main/java/org/jabref/gui/fieldeditors/ISSNEditor.java
+++ b/src/main/java/org/jabref/gui/fieldeditors/ISSNEditor.java
@@ -1,14 +1,13 @@
 package org.jabref.gui.fieldeditors;
 
+import com.airhacks.afterburner.views.ViewLoader;
+import jakarta.inject.Inject;
 import java.util.Optional;
-
-import javax.swing.undo.UndoManager;
-
 import javafx.fxml.FXML;
 import javafx.scene.Parent;
 import javafx.scene.control.Button;
 import javafx.scene.layout.HBox;
-
+import javax.swing.undo.UndoManager;
 import org.jabref.gui.DialogService;
 import org.jabref.gui.StateManager;
 import org.jabref.gui.autocompleter.SuggestionProvider;
@@ -19,31 +18,46 @@
 import org.jabref.model.entry.field.Field;
 import org.jabref.preferences.PreferencesService;
 
-import com.airhacks.afterburner.views.ViewLoader;
-import jakarta.inject.Inject;
-
 public class ISSNEditor extends HBox implements FieldEditorFX {
-    @FXML private ISSNEditorViewModel viewModel;
-    @FXML private EditorTextArea textArea;
-    @FXML private Button journalInfoButton;
-    @FXML private Button fetchInformationByIdentifierButton;
-
-    @Inject private DialogService dialogService;
-    @Inject private PreferencesService preferencesService;
-    @Inject private UndoManager undoManager;
-    @Inject private TaskExecutor taskExecutor;
-    @Inject private StateManager stateManager;
-    private Optional<BibEntry> entry = Optional.empty();
 
-    public ISSNEditor(Field field,
-                      SuggestionProvider<?> suggestionProvider,
-                      FieldCheckers fieldCheckers) {
+    @FXML
+    private ISSNEditorViewModel viewModel;
+
+    @FXML
+    private EditorTextArea textArea;
+
+    @FXML
+    private Button journalInfoButton;
+
+    @FXML
+    private Button fetchInformationByIdentifierButton;
+
+    @Inject
+    private DialogService dialogService;
+
+    @Inject
+    private PreferencesService preferencesService;
 
-        ViewLoader.view(this)
-                  .root(this)
-                  .load();
+    @Inject
+    private UndoManager undoManager;
 
-        this.viewModel = new ISSNEditorViewModel(
+    @Inject
+    private TaskExecutor taskExecutor;
+
+    @Inject
+    private StateManager stateManager;
+
+    private Optional<BibEntry> entry = Optional.empty();
+
+    public ISSNEditor(
+        Field field,
+        SuggestionProvider<?> suggestionProvider,
+        FieldCheckers fieldCheckers
+    ) {
+        ViewLoader.view(this).root(this).load();
+
+        this.viewModel =
+            new ISSNEditorViewModel(
                 field,
                 suggestionProvider,
                 fieldCheckers,
@@ -51,12 +65,17 @@ public ISSNEditor(Field field,
                 dialogService,
                 undoManager,
                 stateManager,
-                preferencesService);
+                preferencesService
+            );
 
         textArea.textProperty().bindBidirectional(viewModel.textProperty());
         textArea.initContextMenu(new DefaultMenu(textArea));
 
-        new EditorValidator(preferencesService).configureValidation(viewModel.getFieldValidator().getValidationStatus(), textArea);
+        new EditorValidator(preferencesService)
+            .configureValidation(
+                viewModel.getFieldValidator().getValidationStatus(),
+                textArea
+            );
     }
 
     public ISSNEditorViewModel getViewModel() {
@@ -86,7 +105,12 @@ private void fetchInformationByIdentifier() {
 
     @FXML
     private void showJournalInfo() {
-        if (JournalInfoOptInDialogHelper.isJournalInfoEnabled(dialogService, preferencesService.getEntryEditorPreferences())) {
+        if (
+            JournalInfoOptInDialogHelper.isJournalInfoEnabled(
+                dialogService,
+                preferencesService.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 89cbf76e949..188ef9ea83c 100644
--- a/src/main/java/org/jabref/gui/fieldeditors/ISSNEditorViewModel.java
+++ b/src/main/java/org/jabref/gui/fieldeditors/ISSNEditorViewModel.java
@@ -1,9 +1,7 @@
 package org.jabref.gui.fieldeditors;
 
-import javax.swing.undo.UndoManager;
-
 import javafx.scene.control.Button;
-
+import javax.swing.undo.UndoManager;
 import org.jabref.gui.DialogService;
 import org.jabref.gui.StateManager;
 import org.jabref.gui.autocompleter.SuggestionProvider;
@@ -17,6 +15,7 @@
 import org.jabref.preferences.PreferencesService;
 
 public class ISSNEditorViewModel extends AbstractEditorViewModel {
+
     private final TaskExecutor taskExecutor;
     private final DialogService dialogService;
     private final UndoManager undoManager;
@@ -24,14 +23,15 @@ public class ISSNEditorViewModel extends AbstractEditorViewModel {
     private final PreferencesService preferencesService;
 
     public ISSNEditorViewModel(
-            Field field,
-            SuggestionProvider<?> suggestionProvider,
-            FieldCheckers fieldCheckers,
-            TaskExecutor taskExecutor,
-            DialogService dialogService,
-            UndoManager undoManager,
-            StateManager stateManager,
-            PreferencesService preferencesService) {
+        Field field,
+        SuggestionProvider<?> suggestionProvider,
+        FieldCheckers fieldCheckers,
+        TaskExecutor taskExecutor,
+        DialogService dialogService,
+        UndoManager undoManager,
+        StateManager stateManager,
+        PreferencesService preferencesService
+    ) {
         super(field, suggestionProvider, fieldCheckers, undoManager);
         this.taskExecutor = taskExecutor;
         this.dialogService = dialogService;
@@ -41,14 +41,31 @@ public ISSNEditorViewModel(
     }
 
     public void showJournalInfo(Button journalInfoButton) {
-        PopOverUtil.showJournalInfo(journalInfoButton, entry, dialogService, taskExecutor);
+        PopOverUtil.showJournalInfo(
+            journalInfoButton,
+            entry,
+            dialogService,
+            taskExecutor
+        );
     }
 
     public void fetchBibliographyInformation(BibEntry bibEntry) {
-        stateManager.getActiveDatabase().ifPresentOrElse(
-                databaseContext -> new FetchAndMergeEntry(databaseContext, taskExecutor, preferencesService, dialogService, undoManager)
+        stateManager
+            .getActiveDatabase()
+            .ifPresentOrElse(
+                databaseContext ->
+                    new FetchAndMergeEntry(
+                        databaseContext,
+                        taskExecutor,
+                        preferencesService,
+                        dialogService,
+                        undoManager
+                    )
                         .fetchAndMerge(bibEntry, StandardField.ISSN),
-                () -> dialogService.notify(Localization.lang("No library selected"))
-        );
+                () ->
+                    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 4ab6f29f159..492f2495ca4 100644
--- a/src/main/java/org/jabref/gui/fieldeditors/JournalEditor.java
+++ b/src/main/java/org/jabref/gui/fieldeditors/JournalEditor.java
@@ -1,12 +1,12 @@
 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;
 import javafx.scene.control.Button;
 import javafx.scene.layout.HBox;
-
+import javax.swing.undo.UndoManager;
 import org.jabref.gui.DialogService;
 import org.jabref.gui.autocompleter.AutoCompletionTextInputBinding;
 import org.jabref.gui.autocompleter.SuggestionProvider;
@@ -18,44 +18,63 @@
 import org.jabref.model.entry.field.Field;
 import org.jabref.preferences.PreferencesService;
 
-import com.airhacks.afterburner.views.ViewLoader;
-import jakarta.inject.Inject;
-
 public class JournalEditor extends HBox implements FieldEditorFX {
 
-    @FXML private JournalEditorViewModel viewModel;
-    @FXML private EditorTextField textField;
-    @FXML private Button journalInfoButton;
+    @FXML
+    private JournalEditorViewModel viewModel;
+
+    @FXML
+    private EditorTextField textField;
+
+    @FXML
+    private Button journalInfoButton;
 
-    @Inject private DialogService dialogService;
-    @Inject private PreferencesService preferencesService;
-    @Inject private TaskExecutor taskExecutor;
-    @Inject private JournalAbbreviationRepository abbreviationRepository;
-    @Inject private UndoManager undoManager;
+    @Inject
+    private DialogService dialogService;
 
-    public JournalEditor(Field field,
-                         SuggestionProvider<?> suggestionProvider,
-                         FieldCheckers fieldCheckers) {
+    @Inject
+    private PreferencesService preferencesService;
 
-        ViewLoader.view(this)
-                  .root(this)
-                  .load();
+    @Inject
+    private TaskExecutor taskExecutor;
 
-        this.viewModel = new JournalEditorViewModel(
+    @Inject
+    private JournalAbbreviationRepository abbreviationRepository;
+
+    @Inject
+    private UndoManager undoManager;
+
+    public JournalEditor(
+        Field field,
+        SuggestionProvider<?> suggestionProvider,
+        FieldCheckers fieldCheckers
+    ) {
+        ViewLoader.view(this).root(this).load();
+
+        this.viewModel =
+            new JournalEditorViewModel(
                 field,
                 suggestionProvider,
                 abbreviationRepository,
                 fieldCheckers,
                 taskExecutor,
                 dialogService,
-                undoManager);
+                undoManager
+            );
 
         textField.textProperty().bindBidirectional(viewModel.textProperty());
         textField.initContextMenu(new DefaultMenu(textField));
 
-        AutoCompletionTextInputBinding.autoComplete(textField, viewModel::complete);
+        AutoCompletionTextInputBinding.autoComplete(
+            textField,
+            viewModel::complete
+        );
 
-        new EditorValidator(preferencesService).configureValidation(viewModel.getFieldValidator().getValidationStatus(), textField);
+        new EditorValidator(preferencesService)
+            .configureValidation(
+                viewModel.getFieldValidator().getValidationStatus(),
+                textField
+            );
     }
 
     public JournalEditorViewModel getViewModel() {
@@ -79,7 +98,12 @@ private void toggleAbbreviation() {
 
     @FXML
     private void showJournalInfo() {
-        if (JournalInfoOptInDialogHelper.isJournalInfoEnabled(dialogService, preferencesService.getEntryEditorPreferences())) {
+        if (
+            JournalInfoOptInDialogHelper.isJournalInfoEnabled(
+                dialogService,
+                preferencesService.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 580803cb28b..590e10ea25b 100644
--- a/src/main/java/org/jabref/gui/fieldeditors/JournalEditorViewModel.java
+++ b/src/main/java/org/jabref/gui/fieldeditors/JournalEditorViewModel.java
@@ -1,9 +1,7 @@
 package org.jabref.gui.fieldeditors;
 
-import javax.swing.undo.UndoManager;
-
 import javafx.scene.control.Button;
-
+import javax.swing.undo.UndoManager;
 import org.jabref.gui.DialogService;
 import org.jabref.gui.autocompleter.SuggestionProvider;
 import org.jabref.gui.util.TaskExecutor;
@@ -13,18 +11,20 @@
 import org.jabref.model.strings.StringUtil;
 
 public class JournalEditorViewModel extends AbstractEditorViewModel {
+
     private final JournalAbbreviationRepository journalAbbreviationRepository;
     private final TaskExecutor taskExecutor;
     private final DialogService dialogService;
 
     public JournalEditorViewModel(
-            Field field,
-            SuggestionProvider<?> suggestionProvider,
-            JournalAbbreviationRepository journalAbbreviationRepository,
-            FieldCheckers fieldCheckers,
-            TaskExecutor taskExecutor,
-            DialogService dialogService,
-            UndoManager undoManager) {
+        Field field,
+        SuggestionProvider<?> suggestionProvider,
+        JournalAbbreviationRepository journalAbbreviationRepository,
+        FieldCheckers fieldCheckers,
+        TaskExecutor taskExecutor,
+        DialogService dialogService,
+        UndoManager undoManager
+    ) {
         super(field, suggestionProvider, fieldCheckers, undoManager);
         this.journalAbbreviationRepository = journalAbbreviationRepository;
         this.taskExecutor = taskExecutor;
@@ -39,14 +39,21 @@ 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) {
-        PopOverUtil.showJournalInfo(journalInfoButton, entry, dialogService, taskExecutor);
+        PopOverUtil.showJournalInfo(
+            journalInfoButton,
+            entry,
+            dialogService,
+            taskExecutor
+        );
     }
 }
diff --git a/src/main/java/org/jabref/gui/fieldeditors/JournalInfoOptInDialogHelper.java b/src/main/java/org/jabref/gui/fieldeditors/JournalInfoOptInDialogHelper.java
index b1209ba95db..907104e012e 100644
--- a/src/main/java/org/jabref/gui/fieldeditors/JournalInfoOptInDialogHelper.java
+++ b/src/main/java/org/jabref/gui/fieldeditors/JournalInfoOptInDialogHelper.java
@@ -9,33 +9,55 @@ 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(
+        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
+                    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);
+                    : EntryEditorPreferences.JournalPopupEnabled.DISABLED
+            );
 
             return enableJournalPopup;
         }
 
-        boolean journalInfoEnabled = dialogService.showConfirmationDialogAndWait(
+        boolean journalInfoEnabled =
+            dialogService.showConfirmationDialogAndWait(
                 Localization.lang("Remote services"),
-                Localization.lang("Allow sending ISSN to a JabRef online service (SCimago) for fetching journal information"));
+                Localization.lang(
+                    "Allow sending ISSN to a JabRef online service (SCimago) for fetching journal information"
+                )
+            );
 
-        preferences.setEnableJournalPopup(journalInfoEnabled
+        preferences.setEnableJournalPopup(
+            journalInfoEnabled
                 ? EntryEditorPreferences.JournalPopupEnabled.ENABLED
-                : EntryEditorPreferences.JournalPopupEnabled.DISABLED);
+                : 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 f11f7d1a362..050f5bf54d2 100644
--- a/src/main/java/org/jabref/gui/fieldeditors/KeywordsEditor.java
+++ b/src/main/java/org/jabref/gui/fieldeditors/KeywordsEditor.java
@@ -1,7 +1,6 @@
 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.model.entry.field.Field;
@@ -9,12 +8,20 @@
 
 public class KeywordsEditor extends SimpleEditor implements FieldEditorFX {
 
-    public KeywordsEditor(Field field,
-                          SuggestionProvider<?> suggestionProvider,
-                          FieldCheckers fieldCheckers,
-                          PreferencesService preferences,
-                          UndoManager undoManager) {
-        super(field, suggestionProvider, fieldCheckers, preferences, undoManager);
+    public KeywordsEditor(
+        Field field,
+        SuggestionProvider<?> suggestionProvider,
+        FieldCheckers fieldCheckers,
+        PreferencesService preferences,
+        UndoManager undoManager
+    ) {
+        super(
+            field,
+            suggestionProvider,
+            fieldCheckers,
+            preferences,
+            undoManager
+        );
     }
 
     @Override
diff --git a/src/main/java/org/jabref/gui/fieldeditors/LinkedEntriesEditor.java b/src/main/java/org/jabref/gui/fieldeditors/LinkedEntriesEditor.java
index 3c530084dd3..5d79b8a730e 100644
--- a/src/main/java/org/jabref/gui/fieldeditors/LinkedEntriesEditor.java
+++ b/src/main/java/org/jabref/gui/fieldeditors/LinkedEntriesEditor.java
@@ -1,10 +1,10 @@
 package org.jabref.gui.fieldeditors;
 
+import com.airhacks.afterburner.views.ViewLoader;
+import com.dlsc.gemsfx.TagsField;
+import jakarta.inject.Inject;
 import java.util.Comparator;
 import java.util.stream.Collectors;
-
-import javax.swing.undo.UndoManager;
-
 import javafx.beans.binding.Bindings;
 import javafx.fxml.FXML;
 import javafx.scene.Node;
@@ -14,7 +14,7 @@
 import javafx.scene.control.Label;
 import javafx.scene.input.MouseButton;
 import javafx.scene.layout.HBox;
-
+import javax.swing.undo.UndoManager;
 import org.jabref.gui.ClipBoardManager;
 import org.jabref.gui.DialogService;
 import org.jabref.gui.JabRefDialogService;
@@ -31,72 +31,127 @@
 import org.jabref.model.entry.BibEntry;
 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;
 
 public class LinkedEntriesEditor extends HBox implements FieldEditorFX {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(LinkedEntriesEditor.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(
+        LinkedEntriesEditor.class
+    );
 
-    @FXML public TagsField<ParsedEntryLink> entryLinkField;
+    @FXML
+    public TagsField<ParsedEntryLink> entryLinkField;
 
-    @Inject private DialogService dialogService;
-    @Inject private ClipBoardManager clipBoardManager;
-    @Inject private KeyBindingRepository keyBindingRepository;
-    @Inject private UndoManager undoManager;
+    @Inject
+    private DialogService dialogService;
 
-    private final LinkedEntriesEditorViewModel viewModel;
+    @Inject
+    private ClipBoardManager clipBoardManager;
+
+    @Inject
+    private KeyBindingRepository keyBindingRepository;
 
-    public LinkedEntriesEditor(Field field, BibDatabaseContext databaseContext, SuggestionProvider<BibEntry> suggestionProvider, FieldCheckers fieldCheckers) {
-        ViewLoader.view(this)
-                  .root(this)
-                  .load();
+    @Inject
+    private UndoManager undoManager;
 
-        this.viewModel = new LinkedEntriesEditorViewModel(field, suggestionProvider, databaseContext, fieldCheckers, undoManager);
+    private final LinkedEntriesEditorViewModel viewModel;
 
-        entryLinkField.setCellFactory(new ViewModelListCellFactory<ParsedEntryLink>().withText(ParsedEntryLink::getKey));
+    public LinkedEntriesEditor(
+        Field field,
+        BibDatabaseContext databaseContext,
+        SuggestionProvider<BibEntry> suggestionProvider,
+        FieldCheckers fieldCheckers
+    ) {
+        ViewLoader.view(this).root(this).load();
+
+        this.viewModel =
+            new LinkedEntriesEditorViewModel(
+                field,
+                suggestionProvider,
+                databaseContext,
+                fieldCheckers,
+                undoManager
+            );
+
+        entryLinkField.setCellFactory(
+            new ViewModelListCellFactory<ParsedEntryLink>()
+                .withText(ParsedEntryLink::getKey)
+        );
         // Mind the .collect(Collectors.toList()) as the list needs to be mutable
         entryLinkField.setSuggestionProvider(request ->
-                suggestionProvider.getPossibleSuggestions().stream()
-                                  .filter(suggestion -> suggestion.getCitationKey().orElse("").toLowerCase()
-                                                                  .contains(request.getUserText().toLowerCase()))
-                                  .map(ParsedEntryLink::new)
-                                  .collect(Collectors.toList()));
+            suggestionProvider
+                .getPossibleSuggestions()
+                .stream()
+                .filter(suggestion ->
+                    suggestion
+                        .getCitationKey()
+                        .orElse("")
+                        .toLowerCase()
+                        .contains(request.getUserText().toLowerCase())
+                )
+                .map(ParsedEntryLink::new)
+                .collect(Collectors.toList())
+        );
         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.setComparator(Comparator.comparing(ParsedEntryLink::getKey));
+        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.getEditor().getStyleClass().clear();
         entryLinkField.getEditor().getStyleClass().add("tags-field-editor");
 
-        Bindings.bindContentBidirectional(entryLinkField.getTags(), viewModel.linkedEntriesProperty());
+        Bindings.bindContentBidirectional(
+            entryLinkField.getTags(),
+            viewModel.linkedEntriesProperty()
+        );
     }
 
     private Node createTag(ParsedEntryLink entryLink) {
         Label tagLabel = new Label();
         tagLabel.setText(entryLinkField.getConverter().toString(entryLink));
         tagLabel.setGraphic(IconTheme.JabRefIcons.REMOVE_TAGS.getGraphicNode());
-        tagLabel.getGraphic().setOnMouseClicked(event -> entryLinkField.removeTags(entryLink));
+        tagLabel
+            .getGraphic()
+            .setOnMouseClicked(event -> entryLinkField.removeTags(entryLink));
         tagLabel.setContentDisplay(ContentDisplay.RIGHT);
         tagLabel.setOnMouseClicked(event -> {
-            if (event.getClickCount() == 2 && event.getButton().equals(MouseButton.PRIMARY)) {
+            if (
+                event.getClickCount() == 2 &&
+                event.getButton().equals(MouseButton.PRIMARY)
+            ) {
                 viewModel.jumpToEntry(entryLink);
             }
         });
 
         ContextMenu contextMenu = new ContextMenu();
         ActionFactory factory = new ActionFactory(keyBindingRepository);
-        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;
     }
@@ -116,10 +171,14 @@ public Parent getNode() {
     }
 
     private class TagContextAction extends SimpleCommand {
+
         private final StandardActions command;
         private final ParsedEntryLink entryLink;
 
-        public TagContextAction(StandardActions command, ParsedEntryLink entryLink) {
+        public TagContextAction(
+            StandardActions command,
+            ParsedEntryLink entryLink
+        ) {
             this.command = command;
             this.entryLink = entryLink;
         }
@@ -129,19 +188,32 @@ 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 1b46b1d6c6b..066ba0908e3 100644
--- a/src/main/java/org/jabref/gui/fieldeditors/LinkedEntriesEditorViewModel.java
+++ b/src/main/java/org/jabref/gui/fieldeditors/LinkedEntriesEditorViewModel.java
@@ -1,12 +1,10 @@
 package org.jabref.gui.fieldeditors;
 
-import javax.swing.undo.UndoManager;
-
 import javafx.beans.property.ListProperty;
 import javafx.beans.property.SimpleListProperty;
 import javafx.collections.FXCollections;
 import javafx.util.StringConverter;
-
+import javax.swing.undo.UndoManager;
 import org.jabref.gui.autocompleter.SuggestionProvider;
 import org.jabref.gui.util.BindingsHelper;
 import org.jabref.logic.integrity.FieldCheckers;
@@ -20,16 +18,24 @@ public class LinkedEntriesEditorViewModel extends AbstractEditorViewModel {
     private final BibDatabaseContext databaseContext;
     private final ListProperty<ParsedEntryLink> linkedEntries;
 
-    public LinkedEntriesEditorViewModel(Field field, SuggestionProvider<?> suggestionProvider, BibDatabaseContext databaseContext, FieldCheckers fieldCheckers, UndoManager undoManager) {
+    public LinkedEntriesEditorViewModel(
+        Field field,
+        SuggestionProvider<?> suggestionProvider,
+        BibDatabaseContext databaseContext,
+        FieldCheckers fieldCheckers,
+        UndoManager undoManager
+    ) {
         super(field, suggestionProvider, fieldCheckers, undoManager);
-
         this.databaseContext = databaseContext;
-        linkedEntries = new SimpleListProperty<>(FXCollections.observableArrayList());
+        linkedEntries =
+            new SimpleListProperty<>(FXCollections.observableArrayList());
         BindingsHelper.bindContentBidirectional(
-                linkedEntries,
-                text,
-                EntryLinkList::serialize,
-                newText -> EntryLinkList.parse(newText, databaseContext.getDatabase()));
+            linkedEntries,
+            text,
+            EntryLinkList::serialize,
+            newText ->
+                EntryLinkList.parse(newText, databaseContext.getDatabase())
+        );
     }
 
     public ListProperty<ParsedEntryLink> linkedEntriesProperty() {
diff --git a/src/main/java/org/jabref/gui/fieldeditors/LinkedFileViewModel.java b/src/main/java/org/jabref/gui/fieldeditors/LinkedFileViewModel.java
index 0b3ce97a36e..17213bc5180 100644
--- a/src/main/java/org/jabref/gui/fieldeditors/LinkedFileViewModel.java
+++ b/src/main/java/org/jabref/gui/fieldeditors/LinkedFileViewModel.java
@@ -1,5 +1,9 @@
 package org.jabref.gui.fieldeditors;
 
+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.net.MalformedURLException;
 import java.nio.file.Files;
@@ -10,12 +14,6 @@
 import java.util.Optional;
 import java.util.function.BiPredicate;
 import java.util.function.Supplier;
-
-import javax.net.ssl.HostnameVerifier;
-import javax.net.ssl.HttpsURLConnection;
-import javax.net.ssl.SSLHandshakeException;
-import javax.net.ssl.SSLSocketFactory;
-
 import javafx.beans.Observable;
 import javafx.beans.binding.Bindings;
 import javafx.beans.binding.ObjectBinding;
@@ -28,7 +26,10 @@
 import javafx.scene.control.Alert.AlertType;
 import javafx.scene.control.ButtonBar.ButtonData;
 import javafx.scene.control.ButtonType;
-
+import javax.net.ssl.HostnameVerifier;
+import javax.net.ssl.HttpsURLConnection;
+import javax.net.ssl.SSLHandshakeException;
+import javax.net.ssl.SSLSocketFactory;
 import org.jabref.gui.AbstractViewModel;
 import org.jabref.gui.DialogService;
 import org.jabref.gui.desktop.JabRefDesktop;
@@ -64,24 +65,28 @@
 import org.jabref.model.util.OptionalUtil;
 import org.jabref.preferences.FilePreferences;
 import org.jabref.preferences.PreferencesService;
-
-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;
 
 public class LinkedFileViewModel extends AbstractViewModel {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(LinkedFileViewModel.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(
+        LinkedFileViewModel.class
+    );
 
     private final LinkedFile linkedFile;
     private final BibDatabaseContext databaseContext;
-    private final DoubleProperty downloadProgress = new SimpleDoubleProperty(-1);
-    private final BooleanProperty downloadOngoing = new SimpleBooleanProperty(false);
-    private final BooleanProperty isAutomaticallyFound = new SimpleBooleanProperty(false);
-    private final BooleanProperty isOfflinePdf = new SimpleBooleanProperty(false);
+    private final DoubleProperty downloadProgress = new SimpleDoubleProperty(
+        -1
+    );
+    private final BooleanProperty downloadOngoing = new SimpleBooleanProperty(
+        false
+    );
+    private final BooleanProperty isAutomaticallyFound =
+        new SimpleBooleanProperty(false);
+    private final BooleanProperty isOfflinePdf = new SimpleBooleanProperty(
+        false
+    );
     private final DialogService dialogService;
     private final BibEntry entry;
     private final TaskExecutor taskExecutor;
@@ -92,35 +97,60 @@ public class LinkedFileViewModel extends AbstractViewModel {
 
     private final Validator fileExistsValidator;
 
-    public LinkedFileViewModel(LinkedFile linkedFile,
-                               BibEntry entry,
-                               BibDatabaseContext databaseContext,
-                               TaskExecutor taskExecutor,
-                               DialogService dialogService,
-                               PreferencesService preferencesService) {
-
+    public LinkedFileViewModel(
+        LinkedFile linkedFile,
+        BibEntry entry,
+        BibDatabaseContext databaseContext,
+        TaskExecutor taskExecutor,
+        DialogService dialogService,
+        PreferencesService preferencesService
+    ) {
         this.linkedFile = linkedFile;
         this.preferencesService = preferencesService;
-        this.linkedFileHandler = new LinkedFileHandler(linkedFile, entry, databaseContext, preferencesService.getFilePreferences());
+        this.linkedFileHandler =
+            new LinkedFileHandler(
+                linkedFile,
+                entry,
+                databaseContext,
+                preferencesService.getFilePreferences()
+            );
         this.databaseContext = databaseContext;
         this.entry = entry;
         this.dialogService = dialogService;
         this.taskExecutor = taskExecutor;
 
-        fileExistsValidator = new FunctionBasedValidator<>(
+        fileExistsValidator =
+            new FunctionBasedValidator<>(
                 linkedFile.linkProperty(),
                 link -> {
                     if (linkedFile.isOnlineLink()) {
                         return true;
                     } else {
-                        Optional<Path> path = FileUtil.find(databaseContext, link, preferencesService.getFilePreferences());
+                        Optional<Path> path = FileUtil.find(
+                            databaseContext,
+                            link,
+                            preferencesService.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()));
+                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 BooleanProperty isOfflinePdfProperty() {
@@ -159,19 +189,37 @@ public String getDescriptionAndLink() {
         if (StringUtil.isBlank(linkedFile.getDescription())) {
             return linkedFile.getLink();
         } else {
-            return linkedFile.getDescription() + " (" + linkedFile.getLink() + ")";
+            return (
+                linkedFile.getDescription() + " (" + linkedFile.getLink() + ")"
+            );
         }
     }
 
     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
+                ) +
+                ")"
+            );
         }
     }
 
@@ -180,14 +228,23 @@ public Optional<Path> findIn(List<Path> directories) {
     }
 
     public JabRefIcon getTypeIcon() {
-        return ExternalFileTypes.getExternalFileTypeByLinkedFile(linkedFile, false, preferencesService.getFilePreferences())
-                                .map(ExternalFileType::getIcon)
-                                .orElse(IconTheme.JabRefIcons.FILE);
+        return ExternalFileTypes
+            .getExternalFileTypeByLinkedFile(
+                linkedFile,
+                false,
+                preferencesService.getFilePreferences()
+            )
+            .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;
@@ -202,7 +259,9 @@ public void acceptAsLinked() {
     }
 
     public Observable[] getObservables() {
-        List<Observable> observables = new ArrayList<>(Arrays.asList(linkedFile.getObservables()));
+        List<Observable> observables = new ArrayList<>(
+            Arrays.asList(linkedFile.getObservables())
+        );
         observables.add(downloadOngoing);
         observables.add(downloadProgress);
         observables.add(isAutomaticallyFound);
@@ -211,13 +270,35 @@ public Observable[] getObservables() {
 
     public void open() {
         try {
-            Optional<ExternalFileType> type = ExternalFileTypes.getExternalFileTypeByLinkedFile(linkedFile, true, preferencesService.getFilePreferences());
-            boolean successful = JabRefDesktop.openExternalFileAnyFormat(databaseContext, preferencesService.getFilePreferences(), linkedFile.getLink(), type);
+            Optional<ExternalFileType> type =
+                ExternalFileTypes.getExternalFileTypeByLinkedFile(
+                    linkedFile,
+                    true,
+                    preferencesService.getFilePreferences()
+                );
+            boolean successful = JabRefDesktop.openExternalFileAnyFormat(
+                databaseContext,
+                preferencesService.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
+            );
         }
     }
 
@@ -225,16 +306,27 @@ public void openFolder() {
         try {
             if (!linkedFile.isOnlineLink()) {
                 Optional<Path> resolvedPath = FileUtil.find(
-                        databaseContext,
-                        linkedFile.getLink(),
-                        preferencesService.getFilePreferences());
+                    databaseContext,
+                    linkedFile.getLink(),
+                    preferencesService.getFilePreferences()
+                );
                 if (resolvedPath.isPresent()) {
-                    JabRefDesktop.openFolderAndSelectFile(resolvedPath.get(), preferencesService.getExternalApplicationsPreferences(), dialogService);
+                    JabRefDesktop.openFolderAndSelectFile(
+                        resolvedPath.get(),
+                        preferencesService.getExternalApplicationsPreferences(),
+                        dialogService
+                    );
                 } else {
-                    dialogService.showErrorDialogAndWait(Localization.lang("File not found"));
+                    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);
@@ -248,10 +340,12 @@ public void renameToSuggestion() {
     public void askForNameAndRename() {
         String oldFile = this.linkedFile.getLink();
         Path oldFilePath = Path.of(oldFile);
-        Optional<String> askedFileName = dialogService.showInputDialogWithDefaultAndWait(
+        Optional<String> askedFileName =
+            dialogService.showInputDialogWithDefaultAndWait(
                 Localization.lang("Rename file"),
                 Localization.lang("New Filename"),
-                oldFilePath.getFileName().toString());
+                oldFilePath.getFileName().toString()
+            );
         askedFileName.ifPresent(this::renameFileToName);
     }
 
@@ -261,23 +355,41 @@ public void renameFileToName(String targetFileName) {
             return;
         }
 
-        Optional<Path> file = linkedFile.findIn(databaseContext, preferencesService.getFilePreferences());
+        Optional<Path> file = linkedFile.findIn(
+            databaseContext,
+            preferencesService.getFilePreferences()
+        );
         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(
+            overwriteFile =
+                dialogService.showConfirmationDialogAndWait(
                     Localization.lang("File exists"),
-                    Localization.lang("'%0' exists. Overwrite file?", targetFileName),
-                    Localization.lang("Overwrite"));
+                    Localization.lang(
+                        "'%0' exists. Overwrite file?",
+                        targetFileName
+                    ),
+                    Localization.lang("Overwrite")
+                );
 
             if (!overwriteFile) {
                 return;
@@ -287,7 +399,12 @@ 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."
+                )
+            );
         }
     }
 
@@ -298,26 +415,46 @@ public void moveToDefaultDirectory() {
         }
 
         // Get target folder
-        Optional<Path> fileDir = databaseContext.getFirstExistingFileDir(preferencesService.getFilePreferences());
+        Optional<Path> fileDir = databaseContext.getFirstExistingFileDir(
+            preferencesService.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;
         }
 
-        Optional<Path> file = linkedFile.findIn(databaseContext, preferencesService.getFilePreferences());
+        Optional<Path> file = linkedFile.findIn(
+            databaseContext,
+            preferencesService.getFilePreferences()
+        );
         if (file.isPresent()) {
             // Found the linked file, so move it
             try {
                 linkedFileHandler.moveToDefaultDirectory();
             } catch (IOException exception) {
                 dialogService.showErrorDialogAndWait(
-                        Localization.lang("Move file"),
-                        Localization.lang("Could not move file '%0'.", file.get().toString()),
-                        exception);
+                    Localization.lang("Move file"),
+                    Localization.lang(
+                        "Could not move file '%0'.",
+                        file.get().toString()
+                    ),
+                    exception
+                );
             }
         } 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()
+                )
+            );
         }
     }
 
@@ -329,7 +466,8 @@ public void moveToDefaultDirectory() {
     public boolean isGeneratedNameSameAsOriginal() {
         Path file = Path.of(this.linkedFile.getLink());
         String currentFileName = file.getFileName().toString();
-        String suggestedFileName = this.linkedFileHandler.getSuggestedFileName();
+        String suggestedFileName =
+            this.linkedFileHandler.getSuggestedFileName();
 
         return currentFileName.equals(suggestedFileName);
     }
@@ -340,8 +478,11 @@ public boolean isGeneratedNameSameAsOriginal() {
      * @return true if suggested filepath is same as existing filepath.
      */
     public boolean isGeneratedPathSameAsOriginal() {
-        FilePreferences filePreferences = preferencesService.getFilePreferences();
-        Optional<Path> baseDir = databaseContext.getFirstExistingFileDir(filePreferences);
+        FilePreferences filePreferences =
+            preferencesService.getFilePreferences();
+        Optional<Path> baseDir = databaseContext.getFirstExistingFileDir(
+            filePreferences
+        );
         if (baseDir.isEmpty()) {
             // could not find default path
             return false;
@@ -349,13 +490,18 @@ public boolean isGeneratedPathSameAsOriginal() {
 
         // append File directory pattern if exits
         String targetDirectoryName = FileUtil.createDirNameFromPattern(
-                databaseContext.getDatabase(),
-                entry,
-                filePreferences.getFileDirectoryPattern());
-
-        Optional<Path> targetDir = baseDir.map(dir -> dir.resolve(targetDirectoryName));
-
-        Optional<Path> currentDir = linkedFile.findIn(databaseContext, preferencesService.getFilePreferences()).map(Path::getParent);
+            databaseContext.getDatabase(),
+            entry,
+            filePreferences.getFileDirectoryPattern()
+        );
+
+        Optional<Path> targetDir = baseDir.map(dir ->
+            dir.resolve(targetDirectoryName)
+        );
+
+        Optional<Path> currentDir = linkedFile
+            .findIn(databaseContext, preferencesService.getFilePreferences())
+            .map(Path::getParent);
         if (currentDir.isEmpty()) {
             // Could not find file
             return false;
@@ -383,19 +529,38 @@ public void moveToDefaultDirectoryAndRename() {
      * successfully, does not exist in the first place or the user choose to remove it)
      */
     public boolean delete() {
-        Optional<Path> file = linkedFile.findIn(databaseContext, preferencesService.getFilePreferences());
+        Optional<Path> file = linkedFile.findIn(
+            databaseContext,
+            preferencesService.getFilePreferences()
+        );
 
         if (file.isEmpty()) {
             LOGGER.warn("Could not find file {}", linkedFile.getLink());
             return true;
         }
 
-        ButtonType removeFromEntry = new ButtonType(Localization.lang("Remove from entry"), ButtonData.YES);
-        ButtonType deleteFromEntry = new ButtonType(Localization.lang("Delete from disk"));
-        Optional<ButtonType> buttonType = dialogService.showCustomButtonDialogAndWait(AlertType.INFORMATION,
-                Localization.lang("Delete '%0'", file.get().getFileName().toString()),
-                Localization.lang("Delete '%0' permanently from disk, or just remove the file from the entry? Pressing Delete will delete the file permanently from disk.", file.get().toString()),
-                removeFromEntry, deleteFromEntry, ButtonType.CANCEL);
+        ButtonType removeFromEntry = new ButtonType(
+            Localization.lang("Remove from entry"),
+            ButtonData.YES
+        );
+        ButtonType deleteFromEntry = new ButtonType(
+            Localization.lang("Delete from disk")
+        );
+        Optional<ButtonType> buttonType =
+            dialogService.showCustomButtonDialogAndWait(
+                AlertType.INFORMATION,
+                Localization.lang(
+                    "Delete '%0'",
+                    file.get().getFileName().toString()
+                ),
+                Localization.lang(
+                    "Delete '%0' permanently from disk, or just remove the file from the entry? Pressing Delete will delete the file permanently from disk.",
+                    file.get().toString()
+                ),
+                removeFromEntry,
+                deleteFromEntry,
+                ButtonType.CANCEL
+            );
 
         if (buttonType.isPresent()) {
             if (buttonType.get().equals(removeFromEntry)) {
@@ -407,8 +572,15 @@ public boolean delete() {
                     Files.delete(file.get());
                     return true;
                 } catch (IOException ex) {
-                    dialogService.showErrorDialogAndWait(Localization.lang("Cannot delete file"), Localization.lang("File permission error"));
-                    LOGGER.warn("File permission error while deleting: {}", linkedFile, ex);
+                    dialogService.showErrorDialogAndWait(
+                        Localization.lang("Cannot delete file"),
+                        Localization.lang("File permission error")
+                    );
+                    LOGGER.warn(
+                        "File permission error while deleting: {}",
+                        linkedFile,
+                        ex
+                    );
                 }
             }
         }
@@ -416,7 +588,9 @@ public boolean delete() {
     }
 
     public void edit() {
-        Optional<LinkedFile> editedFile = dialogService.showCustomDialogAndWait(new LinkedFileEditDialogView(this.linkedFile));
+        Optional<LinkedFile> editedFile = dialogService.showCustomDialogAndWait(
+            new LinkedFileEditDialogView(this.linkedFile)
+        );
         editedFile.ifPresent(file -> {
             this.linkedFile.setLink(file.getLink());
             this.linkedFile.setDescription(file.getDescription());
@@ -426,12 +600,22 @@ public void edit() {
 
     public void download() {
         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"
+            );
         }
         try {
-            Optional<Path> targetDirectory = databaseContext.getFirstExistingFileDir(preferencesService.getFilePreferences());
+            Optional<Path> targetDirectory =
+                databaseContext.getFirstExistingFileDir(
+                    preferencesService.getFilePreferences()
+                );
             if (targetDirectory.isEmpty()) {
-                dialogService.showErrorDialogAndWait(Localization.lang("Download file"), Localization.lang("File directory is not set or does not exist!"));
+                dialogService.showErrorDialogAndWait(
+                    Localization.lang("Download file"),
+                    Localization.lang(
+                        "File directory is not set or does not exist!"
+                    )
+                );
                 return;
             }
 
@@ -440,35 +624,72 @@ public void download() {
                 return;
             }
 
-            BackgroundTask<Path> downloadTask = prepareDownloadTask(targetDirectory.get(), urlDownload);
+            BackgroundTask<Path> downloadTask = prepareDownloadTask(
+                targetDirectory.get(),
+                urlDownload
+            );
             downloadTask.onSuccess(destination -> {
                 boolean isDuplicate;
                 try {
-                    isDuplicate = FileNameUniqueness.isDuplicatedFile(targetDirectory.get(), destination.getFileName(), dialogService);
+                    isDuplicate =
+                        FileNameUniqueness.isDuplicatedFile(
+                            targetDirectory.get(),
+                            destination.getFileName(),
+                            dialogService
+                        );
                 } catch (IOException e) {
-                    LOGGER.error("FileNameUniqueness.isDuplicatedFile failed", e);
+                    LOGGER.error(
+                        "FileNameUniqueness.isDuplicatedFile failed",
+                        e
+                    );
                     return;
                 }
 
                 if (!isDuplicate) {
                     // we need to call LinkedFileViewModel#fromFile, because we need to make the path relative to the configured directories
-                    LinkedFile newLinkedFile = LinkedFilesEditorViewModel.fromFile(
+                    LinkedFile newLinkedFile =
+                        LinkedFilesEditorViewModel.fromFile(
                             destination,
-                            databaseContext.getFileDirectories(preferencesService.getFilePreferences()),
-                            preferencesService.getFilePreferences());
-                    entry.replaceDownloadedFile(linkedFile.getLink(), newLinkedFile);
+                            databaseContext.getFileDirectories(
+                                preferencesService.getFilePreferences()
+                            ),
+                            preferencesService.getFilePreferences()
+                        );
+                    entry.replaceDownloadedFile(
+                        linkedFile.getLink(),
+                        newLinkedFile
+                    );
 
                     // Notify in bar when the file type is HTML.
-                    if (newLinkedFile.getFileType().equals(StandardExternalFileType.URL.getName())) {
-                        dialogService.notify(Localization.lang("Downloaded website as an HTML file."));
-                        LOGGER.debug("Downloaded website {} as an HTML file at {}", linkedFile.getLink(), destination);
+                    if (
+                        newLinkedFile
+                            .getFileType()
+                            .equals(StandardExternalFileType.URL.getName())
+                    ) {
+                        dialogService.notify(
+                            Localization.lang(
+                                "Downloaded website as an HTML file."
+                            )
+                        );
+                        LOGGER.debug(
+                            "Downloaded website {} as an HTML file at {}",
+                            linkedFile.getLink(),
+                            destination
+                        );
                     }
                 }
             });
             downloadProgress.bind(downloadTask.workDonePercentageProperty());
             downloadTask.titleProperty().set(Localization.lang("Downloading"));
-            downloadTask.messageProperty().set(
-                    Localization.lang("Fulltext for") + ": " + entry.getCitationKey().orElse(Localization.lang("New entry")));
+            downloadTask
+                .messageProperty()
+                .set(
+                    Localization.lang("Fulltext for") +
+                    ": " +
+                    entry
+                        .getCitationKey()
+                        .orElse(Localization.lang("New entry"))
+                );
             downloadTask.showToUser(true);
             downloadTask.onFailure(ex -> {
                 LOGGER.error("Error downloading from URL: " + urlDownload, ex);
@@ -477,90 +698,185 @@ public void download() {
                 if (ex instanceof FetcherClientException clientException) {
                     statusCode = clientException.getStatusCode();
                     if (statusCode == 401) {
-                        dialogService.showInformationDialogAndWait(Localization.lang("Failed to download from URL"), Localization.lang("401 Unauthorized: 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.\nURL: %0 \n %1", urlDownload.getSource(), fetcherExceptionMessage));
+                        dialogService.showInformationDialogAndWait(
+                            Localization.lang("Failed to download from URL"),
+                            Localization.lang(
+                                "401 Unauthorized: 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.\nURL: %0 \n %1",
+                                urlDownload.getSource(),
+                                fetcherExceptionMessage
+                            )
+                        );
                     } else if (statusCode == 403) {
-                        dialogService.showInformationDialogAndWait(Localization.lang("Failed to download from URL"), Localization.lang("403 Forbidden: Access Denied. You do not have permission to access this resource. Please contact the administrator for assistance or try a different action.\nURL: %0 \n %1", urlDownload.getSource(), fetcherExceptionMessage));
+                        dialogService.showInformationDialogAndWait(
+                            Localization.lang("Failed to download from URL"),
+                            Localization.lang(
+                                "403 Forbidden: Access Denied. You do not have permission to access this resource. Please contact the administrator for assistance or try a different action.\nURL: %0 \n %1",
+                                urlDownload.getSource(),
+                                fetcherExceptionMessage
+                            )
+                        );
                     } else if (statusCode == 404) {
-                        dialogService.showInformationDialogAndWait(Localization.lang("Failed to download from URL"), Localization.lang("404 Not Found Error: 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.\nURL: %0 \n %1", urlDownload.getSource(), fetcherExceptionMessage));
+                        dialogService.showInformationDialogAndWait(
+                            Localization.lang("Failed to download from URL"),
+                            Localization.lang(
+                                "404 Not Found Error: 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.\nURL: %0 \n %1",
+                                urlDownload.getSource(),
+                                fetcherExceptionMessage
+                            )
+                        );
                     }
-                } else if (ex instanceof FetcherServerException serverException) {
+                } else if (
+                    ex instanceof FetcherServerException serverException
+                ) {
                     statusCode = serverException.getStatusCode();
-                    dialogService.showInformationDialogAndWait(Localization.lang("Failed to download from URL"),
-                                Localization.lang("Error downloading from URL. Cause is likely the server side. HTTP Error %0 \n %1 \nURL: %2 \nPlease try again later or contact the server administrator.", statusCode, fetcherExceptionMessage, urlDownload.getSource()));
-                    } else {
-                        dialogService.showErrorDialogAndWait(Localization.lang("Failed to download from URL"), Localization.lang("Error message: %0 \nURL: %1 \nPlease check the URL and try again.", fetcherExceptionMessage, urlDownload.getSource()));
-                    }
-                });
-                taskExecutor.execute(downloadTask);
-            } catch (MalformedURLException exception) {
-                dialogService.showErrorDialogAndWait(Localization.lang("Invalid URL"), exception);
-            }
+                    dialogService.showInformationDialogAndWait(
+                        Localization.lang("Failed to download from URL"),
+                        Localization.lang(
+                            "Error downloading from URL. Cause is likely the server side. HTTP Error %0 \n %1 \nURL: %2 \nPlease try again later or contact the server administrator.",
+                            statusCode,
+                            fetcherExceptionMessage,
+                            urlDownload.getSource()
+                        )
+                    );
+                } else {
+                    dialogService.showErrorDialogAndWait(
+                        Localization.lang("Failed to download from URL"),
+                        Localization.lang(
+                            "Error message: %0 \nURL: %1 \nPlease check the URL and try again.",
+                            fetcherExceptionMessage,
+                            urlDownload.getSource()
+                        )
+                    );
+                }
+            });
+            taskExecutor.execute(downloadTask);
+        } catch (MalformedURLException exception) {
+            dialogService.showErrorDialogAndWait(
+                Localization.lang("Invalid URL"),
+                exception
+            );
         }
+    }
 
-        public boolean checkSSLHandshake(URLDownload urlDownload) {
-            try {
-                urlDownload.canBeReached();
-            } catch (kong.unirest.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?",
-                                    urlDownload.getSource().toString()))) {
-                        return true;
-                    } else {
-                        dialogService.notify(Localization.lang("Download operation canceled."));
-                        return false;
-                    }
+    public boolean checkSSLHandshake(URLDownload urlDownload) {
+        try {
+            urlDownload.canBeReached();
+        } catch (kong.unirest.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?",
+                            urlDownload.getSource().toString()
+                        )
+                    )
+                ) {
+                    return true;
                 } else {
-                    LOGGER.error("Error while checking if the file can be downloaded", ex);
-                    dialogService.notify(Localization.lang("Error downloading"));
+                    dialogService.notify(
+                        Localization.lang("Download operation canceled.")
+                    );
                     return false;
                 }
+            } else {
+                LOGGER.error(
+                    "Error while checking if the file can be downloaded",
+                    ex
+                );
+                dialogService.notify(Localization.lang("Error downloading"));
+                return false;
             }
-            return true;
         }
+        return true;
+    }
 
-    public BackgroundTask<Path> prepareDownloadTask(Path targetDirectory, URLDownload urlDownload) {
-        SSLSocketFactory defaultSSLSocketFactory = HttpsURLConnection.getDefaultSSLSocketFactory();
-        HostnameVerifier defaultHostnameVerifier = HttpsURLConnection.getDefaultHostnameVerifier();
+    public BackgroundTask<Path> prepareDownloadTask(
+        Path targetDirectory,
+        URLDownload urlDownload
+    ) {
+        SSLSocketFactory defaultSSLSocketFactory =
+            HttpsURLConnection.getDefaultSSLSocketFactory();
+        HostnameVerifier defaultHostnameVerifier =
+            HttpsURLConnection.getDefaultHostnameVerifier();
         return BackgroundTask
-                .wrap(() -> {
-                    Optional<ExternalFileType> suggestedType = inferFileType(urlDownload);
-                    ExternalFileType externalFileType = suggestedType.orElse(StandardExternalFileType.PDF);
-
-                    String suggestedName = linkedFileHandler.getSuggestedFileName(externalFileType.getExtension());
-                    String fulltextDir = FileUtil.createDirNameFromPattern(databaseContext.getDatabase(), entry, preferencesService.getFilePreferences().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(() -> URLDownload.setSSLVerification(defaultSSLSocketFactory, defaultHostnameVerifier));
+            .wrap(() -> {
+                Optional<ExternalFileType> suggestedType = inferFileType(
+                    urlDownload
+                );
+                ExternalFileType externalFileType = suggestedType.orElse(
+                    StandardExternalFileType.PDF
+                );
+
+                String suggestedName = linkedFileHandler.getSuggestedFileName(
+                    externalFileType.getExtension()
+                );
+                String fulltextDir = FileUtil.createDirNameFromPattern(
+                    databaseContext.getDatabase(),
+                    entry,
+                    preferencesService
+                        .getFilePreferences()
+                        .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(() ->
+                URLDownload.setSSLVerification(
+                    defaultSSLSocketFactory,
+                    defaultHostnameVerifier
+                )
+            );
     }
 
     private Optional<ExternalFileType> inferFileType(URLDownload urlDownload) {
-        Optional<ExternalFileType> suggestedType = inferFileTypeFromMimeType(urlDownload);
+        Optional<ExternalFileType> suggestedType = inferFileTypeFromMimeType(
+            urlDownload
+        );
 
         // If we did not find a file type from the MIME type, try based on extension:
         if (suggestedType.isEmpty()) {
-            suggestedType = inferFileTypeFromURL(urlDownload.getSource().toExternalForm());
+            suggestedType =
+                inferFileTypeFromURL(urlDownload.getSource().toExternalForm());
         }
         return suggestedType;
     }
 
-    private Optional<ExternalFileType> inferFileTypeFromMimeType(URLDownload urlDownload) {
+    private Optional<ExternalFileType> inferFileTypeFromMimeType(
+        URLDownload urlDownload
+    ) {
         String mimeType = urlDownload.getMimeType();
 
         if (mimeType != null) {
             LOGGER.debug("MIME Type suggested: " + mimeType);
-            return ExternalFileTypes.getExternalFileTypeByMimeType(mimeType, preferencesService.getFilePreferences());
+            return ExternalFileTypes.getExternalFileTypeByMimeType(
+                mimeType,
+                preferencesService.getFilePreferences()
+            );
         } else {
             return Optional.empty();
         }
     }
 
     private Optional<ExternalFileType> inferFileTypeFromURL(String url) {
-        return URLUtil.getSuffix(url, preferencesService.getFilePreferences())
-                      .flatMap(extension -> ExternalFileTypes.getExternalFileTypeByExt(extension, preferencesService.getFilePreferences()));
+        return URLUtil
+            .getSuffix(url, preferencesService.getFilePreferences())
+            .flatMap(extension ->
+                ExternalFileTypes.getExternalFileTypeByExt(
+                    extension,
+                    preferencesService.getFilePreferences()
+                )
+            );
     }
 
     public LinkedFile getFile() {
@@ -572,29 +888,80 @@ public ValidationStatus fileExistsValidationStatus() {
     }
 
     public void parsePdfMetadataAndShowMergeDialog() {
-        linkedFile.findIn(databaseContext, preferencesService.getFilePreferences()).ifPresent(filePath -> {
-            MultiMergeEntriesView dialog = new MultiMergeEntriesView(preferencesService, taskExecutor);
-            dialog.setTitle(Localization.lang("Merge PDF metadata"));
-            dialog.addSource(Localization.lang("Entry"), entry);
-            dialog.addSource(Localization.lang("Verbatim"), wrapImporterToSupplier(new PdfVerbatimBibTextImporter(preferencesService.getImportFormatPreferences()), filePath));
-            dialog.addSource(Localization.lang("Embedded"), wrapImporterToSupplier(new PdfEmbeddedBibFileImporter(preferencesService.getImportFormatPreferences()), filePath));
-            if (preferencesService.getGrobidPreferences().isGrobidEnabled()) {
-                dialog.addSource("Grobid", wrapImporterToSupplier(new PdfGrobidImporter(preferencesService.getImportFormatPreferences()), filePath));
-            }
-            dialog.addSource(Localization.lang("XMP metadata"), wrapImporterToSupplier(new PdfXmpImporter(preferencesService.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, preferencesService.getFilePreferences())
+            .ifPresent(filePath -> {
+                MultiMergeEntriesView dialog = new MultiMergeEntriesView(
+                    preferencesService,
+                    taskExecutor
+                );
+                dialog.setTitle(Localization.lang("Merge PDF metadata"));
+                dialog.addSource(Localization.lang("Entry"), entry);
+                dialog.addSource(
+                    Localization.lang("Verbatim"),
+                    wrapImporterToSupplier(
+                        new PdfVerbatimBibTextImporter(
+                            preferencesService.getImportFormatPreferences()
+                        ),
+                        filePath
+                    )
+                );
+                dialog.addSource(
+                    Localization.lang("Embedded"),
+                    wrapImporterToSupplier(
+                        new PdfEmbeddedBibFileImporter(
+                            preferencesService.getImportFormatPreferences()
+                        ),
+                        filePath
+                    )
+                );
+                if (
+                    preferencesService.getGrobidPreferences().isGrobidEnabled()
+                ) {
+                    dialog.addSource(
+                        "Grobid",
+                        wrapImporterToSupplier(
+                            new PdfGrobidImporter(
+                                preferencesService.getImportFormatPreferences()
+                            ),
+                            filePath
+                        )
+                    );
+                }
+                dialog.addSource(
+                    Localization.lang("XMP metadata"),
+                    wrapImporterToSupplier(
+                        new PdfXmpImporter(
+                            preferencesService.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) {
+    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().get(0);
diff --git a/src/main/java/org/jabref/gui/fieldeditors/LinkedFilesEditor.java b/src/main/java/org/jabref/gui/fieldeditors/LinkedFilesEditor.java
index c6dcee9bceb..3f74dfa8d6d 100644
--- a/src/main/java/org/jabref/gui/fieldeditors/LinkedFilesEditor.java
+++ b/src/main/java/org/jabref/gui/fieldeditors/LinkedFilesEditor.java
@@ -1,9 +1,10 @@
 package org.jabref.gui.fieldeditors;
 
+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;
-
 import javafx.beans.binding.Bindings;
 import javafx.beans.property.SimpleObjectProperty;
 import javafx.collections.ObservableList;
@@ -30,7 +31,7 @@
 import javafx.scene.layout.HBox;
 import javafx.scene.layout.Priority;
 import javafx.scene.text.Text;
-
+import javax.swing.undo.UndoManager;
 import org.jabref.gui.DialogService;
 import org.jabref.gui.DragAndDropDataFormats;
 import org.jabref.gui.Globals;
@@ -58,53 +59,71 @@
 import org.jabref.model.entry.field.Field;
 import org.jabref.preferences.PreferencesService;
 
-import com.airhacks.afterburner.views.ViewLoader;
-import com.tobiasdiez.easybind.EasyBind;
-import com.tobiasdiez.easybind.optional.ObservableOptionalValue;
-import jakarta.inject.Inject;
-
 public class LinkedFilesEditor extends HBox implements FieldEditorFX {
 
-    @FXML private ListView<LinkedFileViewModel> listView;
-    @FXML private JabRefIconView fulltextFetcher;
+    @FXML
+    private ListView<LinkedFileViewModel> listView;
+
+    @FXML
+    private JabRefIconView fulltextFetcher;
 
     private final Field field;
     private final BibDatabaseContext databaseContext;
     private final SuggestionProvider<?> suggestionProvider;
     private final FieldCheckers fieldCheckers;
 
-    @Inject private DialogService dialogService;
-    @Inject private PreferencesService preferencesService;
-    @Inject private BibEntryTypesManager bibEntryTypesManager;
-    @Inject private JournalAbbreviationRepository abbreviationRepository;
-    @Inject private TaskExecutor taskExecutor;
-    @Inject private UndoManager undoManager;
+    @Inject
+    private DialogService dialogService;
 
-    private LinkedFilesEditorViewModel viewModel;
+    @Inject
+    private PreferencesService preferencesService;
 
-    private ObservableOptionalValue<BibEntry> bibEntry = EasyBind.wrapNullable(new SimpleObjectProperty<>());
-    private final UiThreadObservableList<LinkedFileViewModel> decoratedModelList;
+    @Inject
+    private BibEntryTypesManager bibEntryTypesManager;
 
-    public LinkedFilesEditor(Field field,
-                             BibDatabaseContext databaseContext,
-                             SuggestionProvider<?> suggestionProvider,
-                             FieldCheckers fieldCheckers) {
+    @Inject
+    private JournalAbbreviationRepository abbreviationRepository;
+
+    @Inject
+    private TaskExecutor taskExecutor;
+
+    @Inject
+    private UndoManager undoManager;
+
+    private LinkedFilesEditorViewModel viewModel;
+
+    private ObservableOptionalValue<BibEntry> bibEntry = EasyBind.wrapNullable(
+        new SimpleObjectProperty<>()
+    );
+    private final UiThreadObservableList<
+        LinkedFileViewModel
+    > decoratedModelList;
+
+    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);
+        decoratedModelList =
+            new UiThreadObservableList<>(viewModel.filesProperty());
+        Bindings.bindContentBidirectional(
+            listView.itemsProperty().get(),
+            decoratedModelList
+        );
     }
 
     @FXML
     private void initialize() {
-        this.viewModel = new LinkedFilesEditorViewModel(
+        this.viewModel =
+            new LinkedFilesEditorViewModel(
                 field,
                 suggestionProvider,
                 dialogService,
@@ -112,33 +131,48 @@ private void initialize() {
                 taskExecutor,
                 fieldCheckers,
                 preferencesService,
-                undoManager);
+                undoManager
+            );
 
         new ViewModelListCellFactory<LinkedFileViewModel>()
-                .withStringTooltip(LinkedFileViewModel::getDescriptionAndLink)
-                .withGraphic(this::createFileDisplay)
-                .withContextMenu(this::createContextMenuForFile)
-                .withOnMouseClickedEvent(this::handleItemMouseClick)
-                .setOnDragDetected(this::handleOnDragDetected)
-                .setOnDragDropped(this::handleOnDragDropped)
-                .setOnDragOver(this::handleOnDragOver)
-                .withValidation(LinkedFileViewModel::fileExistsValidationStatus)
-                .install(listView);
+            .withStringTooltip(LinkedFileViewModel::getDescriptionAndLink)
+            .withGraphic(this::createFileDisplay)
+            .withContextMenu(this::createContextMenuForFile)
+            .withOnMouseClickedEvent(this::handleItemMouseClick)
+            .setOnDragDetected(this::handleOnDragDetected)
+            .setOnDragDropped(this::handleOnDragDropped)
+            .setOnDragOver(this::handleOnDragOver)
+            .withValidation(LinkedFileViewModel::fileExistsValidationStatus)
+            .install(listView);
         listView.getSelectionModel().setSelectionMode(SelectionMode.MULTIPLE);
 
-        fulltextFetcher.visibleProperty().bind(viewModel.fulltextLookupInProgressProperty().not());
+        fulltextFetcher
+            .visibleProperty()
+            .bind(viewModel.fulltextLookupInProgressProperty().not());
 
         setUpKeyBindings();
     }
 
-    private void handleOnDragOver(LinkedFileViewModel originalItem, DragEvent event) {
-        if ((event.getGestureSource() != originalItem) && event.getDragboard().hasContent(DragAndDropDataFormats.LINKED_FILE)) {
+    private void handleOnDragOver(
+        LinkedFileViewModel originalItem,
+        DragEvent event
+    ) {
+        if (
+            (event.getGestureSource() != originalItem) &&
+            event.getDragboard().hasContent(DragAndDropDataFormats.LINKED_FILE)
+        ) {
             event.acceptTransferModes(TransferMode.MOVE);
         }
     }
 
-    private void handleOnDragDetected(@SuppressWarnings("unused") LinkedFileViewModel linkedFile, MouseEvent event) {
-        LinkedFile selectedItem = listView.getSelectionModel().getSelectedItem().getFile();
+    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);
@@ -149,14 +183,21 @@ private void handleOnDragDetected(@SuppressWarnings("unused") LinkedFileViewMode
         event.consume();
     }
 
-    private void handleOnDragDropped(LinkedFileViewModel originalItem, DragEvent event) {
+    private void handleOnDragDropped(
+        LinkedFileViewModel originalItem,
+        DragEvent event
+    ) {
         Dragboard dragboard = event.getDragboard();
         boolean success = false;
 
-        ObservableList<LinkedFileViewModel> items = listView.itemsProperty().get();
+        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++) {
@@ -185,81 +226,145 @@ 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());
         desc.getStyleClass().setAll("file-row-text");
 
         ProgressBar progressIndicator = new ProgressBar();
-        progressIndicator.progressProperty().bind(linkedFile.downloadProgressProperty());
-        progressIndicator.visibleProperty().bind(linkedFile.downloadOngoingProperty());
+        progressIndicator
+            .progressProperty()
+            .bind(linkedFile.downloadProgressProperty());
+        progressIndicator
+            .visibleProperty()
+            .bind(linkedFile.downloadOngoingProperty());
 
         Label label = new Label();
         label.graphicProperty().bind(linkedFile.typeIconProperty());
         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.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.visibleProperty().bind(linkedFile.isAutomaticallyFoundProperty());
-        acceptAutoLinkedFile.managedProperty().bind(linkedFile.isAutomaticallyFoundProperty());
+        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
+            .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 BibTeXEntry metadata to PDF.")));
-        writeMetadataToPdf.visibleProperty().bind(linkedFile.isOfflinePdfProperty());
+        Button writeMetadataToPdf =
+            IconTheme.JabRefIcons.PDF_METADATA_WRITE.asButton();
+        writeMetadataToPdf.setTooltip(
+            new Tooltip(Localization.lang("Write BibTeXEntry metadata to PDF."))
+        );
+        writeMetadataToPdf
+            .visibleProperty()
+            .bind(linkedFile.isOfflinePdfProperty());
         writeMetadataToPdf.getStyleClass().setAll("icon-button");
-        WriteMetadataToSinglePdfAction writeMetadataToSinglePdfAction = new WriteMetadataToSinglePdfAction(
+        WriteMetadataToSinglePdfAction writeMetadataToSinglePdfAction =
+            new WriteMetadataToSinglePdfAction(
                 linkedFile.getFile(),
                 bibEntry.getValueOrElse(new BibEntry()),
-                databaseContext, dialogService, preferencesService.getFieldPreferences(),
-                preferencesService.getFilePreferences(), preferencesService.getXmpPreferences(), abbreviationRepository, bibEntryTypesManager,
+                databaseContext,
+                dialogService,
+                preferencesService.getFieldPreferences(),
+                preferencesService.getFilePreferences(),
+                preferencesService.getXmpPreferences(),
+                abbreviationRepository,
+                bibEntryTypesManager,
                 taskExecutor
+            );
+        writeMetadataToPdf
+            .disableProperty()
+            .bind(writeMetadataToSinglePdfAction.executableProperty().not());
+        writeMetadataToPdf.setOnAction(event ->
+            writeMetadataToSinglePdfAction.execute()
         );
-        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());
+        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, preferencesService.getGrobidPreferences());
+            GrobidOptInDialogHelper.showAndWaitIfUserIsUndecided(
+                dialogService,
+                preferencesService.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
+            .maxWidthProperty()
+            .bind(listView.widthProperty().subtract(20d));
+        container
+            .getChildren()
+            .addAll(
+                acceptAutoLinkedFile,
+                info,
+                writeMetadataToPdf,
+                parsePdfMetadata
+            );
 
         return container;
     }
 
     private void setUpKeyBindings() {
-        listView.addEventFilter(KeyEvent.KEY_PRESSED, event -> {
-            Optional<KeyBinding> keyBinding = Globals.getKeyPrefs().mapToKeyBinding(event);
-            if (keyBinding.isPresent()) {
-                switch (keyBinding.get()) {
-                    case DELETE_ENTRY:
-                        new DeleteFileAction(dialogService, preferencesService, databaseContext,
-                                viewModel, listView).execute();
-                        event.consume();
-                        break;
-                    default:
+        listView.addEventFilter(
+            KeyEvent.KEY_PRESSED,
+            event -> {
+                Optional<KeyBinding> keyBinding = Globals
+                    .getKeyPrefs()
+                    .mapToKeyBinding(event);
+                if (keyBinding.isPresent()) {
+                    switch (keyBinding.get()) {
+                        case DELETE_ENTRY:
+                            new DeleteFileAction(
+                                dialogService,
+                                preferencesService,
+                                databaseContext,
+                                viewModel,
+                                listView
+                            )
+                                .execute();
+                            event.consume();
+                            break;
+                        default:
                         // Pass other keys to children
+                    }
                 }
             }
-        });
+        );
     }
 
     public LinkedFilesEditorViewModel getViewModel() {
@@ -292,8 +397,14 @@ private void addFromURL() {
         viewModel.addFromURL();
     }
 
-    private void handleItemMouseClick(LinkedFileViewModel linkedFile, MouseEvent event) {
-        if (event.getButton().equals(MouseButton.PRIMARY) && (event.getClickCount() == 2)) {
+    private void handleItemMouseClick(
+        LinkedFileViewModel linkedFile,
+        MouseEvent event
+    ) {
+        if (
+            event.getButton().equals(MouseButton.PRIMARY) &&
+            (event.getClickCount() == 2)
+        ) {
             // Double click -> open
             linkedFile.open();
         }
@@ -304,25 +415,107 @@ public double getWeight() {
         return 3;
     }
 
-    private ContextMenu createContextMenuForFile(LinkedFileViewModel linkedFile) {
+    private ContextMenu createContextMenuForFile(
+        LinkedFileViewModel linkedFile
+    ) {
         ContextMenu menu = new ContextMenu();
         ActionFactory factory = new ActionFactory(Globals.getKeyPrefs());
 
-        menu.getItems().addAll(
-                factory.createMenuItem(StandardActions.EDIT_FILE_LINK, new ContextAction(StandardActions.EDIT_FILE_LINK, linkedFile, preferencesService)),
+        menu
+            .getItems()
+            .addAll(
+                factory.createMenuItem(
+                    StandardActions.EDIT_FILE_LINK,
+                    new ContextAction(
+                        StandardActions.EDIT_FILE_LINK,
+                        linkedFile,
+                        preferencesService
+                    )
+                ),
                 new SeparatorMenuItem(),
-                factory.createMenuItem(StandardActions.OPEN_FILE, new ContextAction(StandardActions.OPEN_FILE, linkedFile, preferencesService)),
-                factory.createMenuItem(StandardActions.OPEN_FOLDER, new ContextAction(StandardActions.OPEN_FOLDER, linkedFile, preferencesService)),
+                factory.createMenuItem(
+                    StandardActions.OPEN_FILE,
+                    new ContextAction(
+                        StandardActions.OPEN_FILE,
+                        linkedFile,
+                        preferencesService
+                    )
+                ),
+                factory.createMenuItem(
+                    StandardActions.OPEN_FOLDER,
+                    new ContextAction(
+                        StandardActions.OPEN_FOLDER,
+                        linkedFile,
+                        preferencesService
+                    )
+                ),
                 new SeparatorMenuItem(),
-                factory.createMenuItem(StandardActions.DOWNLOAD_FILE, new ContextAction(StandardActions.DOWNLOAD_FILE, linkedFile, preferencesService)),
-                factory.createMenuItem(StandardActions.RENAME_FILE_TO_PATTERN, new ContextAction(StandardActions.RENAME_FILE_TO_PATTERN, linkedFile, preferencesService)),
-                factory.createMenuItem(StandardActions.RENAME_FILE_TO_NAME, new ContextAction(StandardActions.RENAME_FILE_TO_NAME, linkedFile, preferencesService)),
-                factory.createMenuItem(StandardActions.MOVE_FILE_TO_FOLDER, new ContextAction(StandardActions.MOVE_FILE_TO_FOLDER, linkedFile, preferencesService)),
-                factory.createMenuItem(StandardActions.MOVE_FILE_TO_FOLDER_AND_RENAME, new ContextAction(StandardActions.MOVE_FILE_TO_FOLDER_AND_RENAME, linkedFile, preferencesService)),
-                factory.createMenuItem(StandardActions.COPY_FILE_TO_FOLDER, new CopySingleFileAction(linkedFile.getFile(), dialogService, databaseContext, preferencesService.getFilePreferences())),
-                factory.createMenuItem(StandardActions.REMOVE_LINK, new ContextAction(StandardActions.REMOVE_LINK, linkedFile, preferencesService)),
-                factory.createMenuItem(StandardActions.DELETE_FILE, new ContextAction(StandardActions.DELETE_FILE, linkedFile, preferencesService))
-        );
+                factory.createMenuItem(
+                    StandardActions.DOWNLOAD_FILE,
+                    new ContextAction(
+                        StandardActions.DOWNLOAD_FILE,
+                        linkedFile,
+                        preferencesService
+                    )
+                ),
+                factory.createMenuItem(
+                    StandardActions.RENAME_FILE_TO_PATTERN,
+                    new ContextAction(
+                        StandardActions.RENAME_FILE_TO_PATTERN,
+                        linkedFile,
+                        preferencesService
+                    )
+                ),
+                factory.createMenuItem(
+                    StandardActions.RENAME_FILE_TO_NAME,
+                    new ContextAction(
+                        StandardActions.RENAME_FILE_TO_NAME,
+                        linkedFile,
+                        preferencesService
+                    )
+                ),
+                factory.createMenuItem(
+                    StandardActions.MOVE_FILE_TO_FOLDER,
+                    new ContextAction(
+                        StandardActions.MOVE_FILE_TO_FOLDER,
+                        linkedFile,
+                        preferencesService
+                    )
+                ),
+                factory.createMenuItem(
+                    StandardActions.MOVE_FILE_TO_FOLDER_AND_RENAME,
+                    new ContextAction(
+                        StandardActions.MOVE_FILE_TO_FOLDER_AND_RENAME,
+                        linkedFile,
+                        preferencesService
+                    )
+                ),
+                factory.createMenuItem(
+                    StandardActions.COPY_FILE_TO_FOLDER,
+                    new CopySingleFileAction(
+                        linkedFile.getFile(),
+                        dialogService,
+                        databaseContext,
+                        preferencesService.getFilePreferences()
+                    )
+                ),
+                factory.createMenuItem(
+                    StandardActions.REMOVE_LINK,
+                    new ContextAction(
+                        StandardActions.REMOVE_LINK,
+                        linkedFile,
+                        preferencesService
+                    )
+                ),
+                factory.createMenuItem(
+                    StandardActions.DELETE_FILE,
+                    new ContextAction(
+                        StandardActions.DELETE_FILE,
+                        linkedFile,
+                        preferencesService
+                    )
+                )
+            );
 
         return menu;
     }
@@ -332,31 +525,81 @@ private class ContextAction extends SimpleCommand {
         private final StandardActions command;
         private final LinkedFileViewModel linkedFile;
 
-        public ContextAction(StandardActions command, LinkedFileViewModel linkedFile, PreferencesService preferencesService) {
+        public ContextAction(
+            StandardActions command,
+            LinkedFileViewModel linkedFile,
+            PreferencesService preferencesService
+        ) {
             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, preferencesService.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, preferencesService.getFilePreferences()).isPresent()
-                                        && !linkedFile.isGeneratedPathSameAsOriginal(),
-                                linkedFile.getFile().linkProperty(), bibEntry.getValue().map(BibEntry::getFieldsObservable).orElse(null));
+                            () ->
+                                !linkedFile.getFile().isOnlineLink() &&
+                                linkedFile
+                                    .getFile()
+                                    .findIn(
+                                        databaseContext,
+                                        preferencesService.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,
+                                        preferencesService.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 OPEN_FILE, OPEN_FOLDER, RENAME_FILE_TO_NAME, DELETE_FILE -> Bindings.createBooleanBinding(
-                                () -> !linkedFile.getFile().isOnlineLink()
-                                        && linkedFile.getFile().findIn(databaseContext, preferencesService.getFilePreferences()).isPresent(),
-                                linkedFile.getFile().linkProperty(), bibEntry.getValue().map(BibEntry::getFieldsObservable).orElse(null));
+                            () -> linkedFile.getFile().isOnlineLink(),
+                            linkedFile.getFile().linkProperty(),
+                            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,
+                                        preferencesService.getFilePreferences()
+                                    )
+                                    .isPresent(),
+                            linkedFile.getFile().linkProperty(),
+                            bibEntry
+                                .getValue()
+                                .map(BibEntry::getFieldsObservable)
+                                .orElse(null)
+                        );
                         default -> BindingsHelper.constantOf(true);
-                    });
+                    }
+                );
         }
 
         @Override
diff --git a/src/main/java/org/jabref/gui/fieldeditors/LinkedFilesEditorViewModel.java b/src/main/java/org/jabref/gui/fieldeditors/LinkedFilesEditorViewModel.java
index 91d0dbf6690..1a25f2aec94 100644
--- a/src/main/java/org/jabref/gui/fieldeditors/LinkedFilesEditorViewModel.java
+++ b/src/main/java/org/jabref/gui/fieldeditors/LinkedFilesEditorViewModel.java
@@ -9,9 +9,6 @@
 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;
@@ -19,7 +16,7 @@
 import javafx.beans.property.SimpleListProperty;
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableList;
-
+import javax.swing.undo.UndoManager;
 import org.jabref.gui.DialogService;
 import org.jabref.gui.autocompleter.SuggestionProvider;
 import org.jabref.gui.externalfiles.AutoSetFileLinksUtil;
@@ -46,48 +43,61 @@
 import org.jabref.model.entry.field.StandardField;
 import org.jabref.preferences.FilePreferences;
 import org.jabref.preferences.PreferencesService;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 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 BooleanProperty fulltextLookupInProgress = new SimpleBooleanProperty(false);
+    private static final Logger LOGGER = LoggerFactory.getLogger(
+        LinkedFilesEditorViewModel.class
+    );
+
+    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 PreferencesService preferences;
 
-    public LinkedFilesEditorViewModel(Field field, SuggestionProvider<?> suggestionProvider,
-                                      DialogService dialogService,
-                                      BibDatabaseContext databaseContext,
-                                      TaskExecutor taskExecutor,
-                                      FieldCheckers fieldCheckers,
-                                      PreferencesService preferences,
-                                      UndoManager undoManager) {
-
+    public LinkedFilesEditorViewModel(
+        Field field,
+        SuggestionProvider<?> suggestionProvider,
+        DialogService dialogService,
+        BibDatabaseContext databaseContext,
+        TaskExecutor taskExecutor,
+        FieldCheckers fieldCheckers,
+        PreferencesService preferences,
+        UndoManager undoManager
+    ) {
         super(field, suggestionProvider, fieldCheckers, undoManager);
-
         this.dialogService = dialogService;
         this.databaseContext = databaseContext;
         this.taskExecutor = taskExecutor;
         this.preferences = preferences;
 
         BindingsHelper.bindContentBidirectional(
-                files,
-                text,
-                LinkedFilesEditorViewModel::getStringRepresentation,
-                this::parseToFileViewModel);
+            files,
+            text,
+            LinkedFilesEditorViewModel::getStringRepresentation,
+            this::parseToFileViewModel
+        );
     }
 
-    private static String getStringRepresentation(List<LinkedFileViewModel> files) {
+    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);
     }
@@ -98,37 +108,57 @@ 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, FilePreferences filePreferences) {
+    public static LinkedFile fromFile(
+        Path file,
+        List<Path> fileDirectories,
+        FilePreferences filePreferences
+    ) {
         String fileExtension = FileUtil.getFileExtension(file).orElse("");
-        ExternalFileType suggestedFileType = ExternalFileTypes.getExternalFileTypeByExt(fileExtension, filePreferences)
-                                                              .orElse(new UnknownExternalFileType(fileExtension));
+        ExternalFileType suggestedFileType = ExternalFileTypes
+            .getExternalFileTypeByExt(fileExtension, filePreferences)
+            .orElse(new UnknownExternalFileType(fileExtension));
         Path relativePath = FileUtil.relativize(file, fileDirectories);
         return new LinkedFile("", relativePath, suggestedFileType.getName());
     }
 
-    public LinkedFileViewModel fromFile(Path file, FilePreferences filePreferences) {
-        List<Path> fileDirectories = databaseContext.getFileDirectories(preferences.getFilePreferences());
-
-        LinkedFile linkedFile = fromFile(file, fileDirectories, filePreferences);
+    public LinkedFileViewModel fromFile(
+        Path file,
+        FilePreferences filePreferences
+    ) {
+        List<Path> fileDirectories = databaseContext.getFileDirectories(
+            preferences.getFilePreferences()
+        );
+
+        LinkedFile linkedFile = fromFile(
+            file,
+            fileDirectories,
+            filePreferences
+        );
         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());
+        return FileFieldParser
+            .parse(stringValue)
+            .stream()
+            .map(linkedFile ->
+                new LinkedFileViewModel(
+                    linkedFile,
+                    entry,
+                    databaseContext,
+                    taskExecutor,
+                    dialogService,
+                    preferences
+                )
+            )
+            .collect(Collectors.toList());
     }
 
     public ObservableList<LinkedFileViewModel> getFiles() {
@@ -140,23 +170,41 @@ 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()
+        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);
@@ -174,25 +222,40 @@ public void addNewFile() {
         }
     }
 
-    private void addNewLinkedFile(Path correctPath, List<Path> fileDirectories) {
-        LinkedFile newLinkedFile = fromFile(correctPath, fileDirectories, preferences.getFilePreferences());
-        files.add(new LinkedFileViewModel(
+    private void addNewLinkedFile(
+        Path correctPath,
+        List<Path> fileDirectories
+    ) {
+        LinkedFile newLinkedFile = fromFile(
+            correctPath,
+            fileDirectories,
+            preferences.getFilePreferences()
+        );
+        files.add(
+            new LinkedFileViewModel(
                 newLinkedFile,
                 entry,
                 databaseContext,
                 taskExecutor,
                 dialogService,
-                preferences));
+                preferences
+            )
+        );
     }
 
     @Override
     public void bindToEntry(BibEntry entry) {
         super.bindToEntry(entry);
 
-        if ((entry != null) && preferences.getEntryEditorPreferences().autoLinkFilesEnabled()) {
-            BackgroundTask<List<LinkedFileViewModel>> findAssociatedNotLinkedFiles = BackgroundTask
-                    .wrap(() -> findAssociatedNotLinkedFiles(entry))
-                    .onSuccess(files::addAll);
+        if (
+            (entry != null) &&
+            preferences.getEntryEditorPreferences().autoLinkFilesEnabled()
+        ) {
+            BackgroundTask<
+                List<LinkedFileViewModel>
+            > findAssociatedNotLinkedFiles = BackgroundTask
+                .wrap(() -> findAssociatedNotLinkedFiles(entry))
+                .onSuccess(files::addAll);
             taskExecutor.execute(findAssociatedNotLinkedFiles);
         }
     }
@@ -200,28 +263,37 @@ public void bindToEntry(BibEntry entry) {
     /**
      * Find files that are probably associated  to the given entry but not yet linked.
      */
-    private List<LinkedFileViewModel> findAssociatedNotLinkedFiles(BibEntry entry) {
+    private List<LinkedFileViewModel> findAssociatedNotLinkedFiles(
+        BibEntry entry
+    ) {
         List<LinkedFileViewModel> result = new ArrayList<>();
 
         AutoSetFileLinksUtil util = new AutoSetFileLinksUtil(
-                databaseContext,
-                preferences.getFilePreferences(),
-                preferences.getAutoLinkPreferences());
+            databaseContext,
+            preferences.getFilePreferences(),
+            preferences.getAutoLinkPreferences()
+        );
         try {
-            List<LinkedFile> linkedFiles = util.findAssociatedNotLinkedFiles(entry);
+            List<LinkedFile> linkedFiles = util.findAssociatedNotLinkedFiles(
+                entry
+            );
             for (LinkedFile linkedFile : linkedFiles) {
                 LinkedFileViewModel newLinkedFile = new LinkedFileViewModel(
-                        linkedFile,
-                        entry,
-                        databaseContext,
-                        taskExecutor,
-                        dialogService,
-                        preferences);
+                    linkedFile,
+                    entry,
+                    databaseContext,
+                    taskExecutor,
+                    dialogService,
+                    preferences
+                );
                 newLinkedFile.markAsAutomaticallyFound();
                 result.add(newLinkedFile);
             }
         } catch (IOException e) {
-            dialogService.showErrorDialogAndWait("Error accessing the file system", e);
+            dialogService.showErrorDialogAndWait(
+                "Error accessing the file system",
+                e
+            );
         }
 
         return result;
@@ -234,16 +306,18 @@ public boolean downloadFile(String urlText) {
             return true;
         } catch (MalformedURLException exception) {
             dialogService.showErrorDialogAndWait(
-                    Localization.lang("Invalid URL"),
-                    exception);
+                Localization.lang("Invalid URL"),
+                exception
+            );
             return false;
         }
     }
 
     public void fetchFulltext() {
         FulltextFetchers fetcher = new FulltextFetchers(
-                preferences.getImportFormatPreferences(),
-                preferences.getImporterPreferences());
+            preferences.getImportFormatPreferences(),
+            preferences.getImporterPreferences()
+        );
         Optional<String> urlField = entry.getField(StandardField.URL);
         boolean download_success = false;
         if (urlField.isPresent()) {
@@ -258,7 +332,9 @@ public void fetchFulltext() {
                     if (url.isPresent()) {
                         addFromURLAndDownload(url.get());
                     } else {
-                        dialogService.notify(Localization.lang("No full text document found"));
+                        dialogService.notify(
+                            Localization.lang("No full text document found")
+                        );
                     }
                 })
                 .executeWith(taskExecutor);
@@ -266,18 +342,20 @@ public void fetchFulltext() {
     }
 
     public void addFromURL() {
-        AttachFileFromURLAction.getUrlForDownloadFromClipBoardOrEntry(dialogService, entry)
-                               .ifPresent(this::downloadFile);
+        AttachFileFromURLAction
+            .getUrlForDownloadFromClipBoardOrEntry(dialogService, entry)
+            .ifPresent(this::downloadFile);
     }
 
     private void addFromURLAndDownload(URL url) {
         LinkedFileViewModel onlineFile = new LinkedFileViewModel(
-                new LinkedFile(url, ""),
-                entry,
-                databaseContext,
-                taskExecutor,
-                dialogService,
-                preferences);
+            new LinkedFile(url, ""),
+            entry,
+            databaseContext,
+            taskExecutor,
+            dialogService,
+            preferences
+        );
         files.add(onlineFile);
         onlineFile.download();
     }
diff --git a/src/main/java/org/jabref/gui/fieldeditors/MapBasedEditorViewModel.java b/src/main/java/org/jabref/gui/fieldeditors/MapBasedEditorViewModel.java
index ada4791afd0..1e000539e7c 100644
--- a/src/main/java/org/jabref/gui/fieldeditors/MapBasedEditorViewModel.java
+++ b/src/main/java/org/jabref/gui/fieldeditors/MapBasedEditorViewModel.java
@@ -1,28 +1,32 @@
 package org.jabref.gui.fieldeditors;
 
+import com.google.common.collect.BiMap;
 import java.util.ArrayList;
 import java.util.List;
-
-import javax.swing.undo.UndoManager;
-
 import javafx.util.StringConverter;
-
+import javax.swing.undo.UndoManager;
 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 org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 /**
  * View model for a field editor that shows various options backed by a map.
  */
-public abstract class MapBasedEditorViewModel<T> extends OptionEditorViewModel<T> {
+public abstract class MapBasedEditorViewModel<T>
+    extends OptionEditorViewModel<T> {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(MapBasedEditorViewModel.class);
+    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);
     }
 
@@ -36,7 +40,9 @@ public String toString(T object) {
                 if (object == null) {
                     return null;
                 } else {
-                    return getItemMap().inverse().getOrDefault(object, object.toString()); // if the object is not found we simply return itself as string
+                    return getItemMap()
+                        .inverse()
+                        .getOrDefault(object, object.toString()); // if the object is not found we simply return itself as string
                 }
             }
 
@@ -45,7 +51,8 @@ public T fromString(String string) {
                 if (string == null) {
                     return null;
                 } else {
-                    return getItemMap().getOrDefault(string, getValueFromString(string));
+                    return getItemMap()
+                        .getOrDefault(string, getValueFromString(string));
                 }
             }
         };
@@ -62,7 +69,13 @@ protected T getValueFromString(String string) {
         try {
             return (T) string;
         } catch (ClassCastException ex) {
-            LOGGER.error(String.format("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", string.getClass()), ex);
+            LOGGER.error(
+                String.format(
+                    "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",
+                    string.getClass()
+                ),
+                ex
+            );
         }
         return null;
     }
diff --git a/src/main/java/org/jabref/gui/fieldeditors/MonthEditorViewModel.java b/src/main/java/org/jabref/gui/fieldeditors/MonthEditorViewModel.java
index eb3b78a5679..99fc20ddb09 100644
--- a/src/main/java/org/jabref/gui/fieldeditors/MonthEditorViewModel.java
+++ b/src/main/java/org/jabref/gui/fieldeditors/MonthEditorViewModel.java
@@ -2,11 +2,8 @@
 
 import java.util.Arrays;
 import java.util.List;
-
-import javax.swing.undo.UndoManager;
-
 import javafx.util.StringConverter;
-
+import javax.swing.undo.UndoManager;
 import org.jabref.gui.autocompleter.SuggestionProvider;
 import org.jabref.logic.integrity.FieldCheckers;
 import org.jabref.model.database.BibDatabaseMode;
@@ -15,9 +12,16 @@
 import org.jabref.model.strings.StringUtil;
 
 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/OptionEditor.java b/src/main/java/org/jabref/gui/fieldeditors/OptionEditor.java
index 1907f6a5d2d..89899265cca 100644
--- a/src/main/java/org/jabref/gui/fieldeditors/OptionEditor.java
+++ b/src/main/java/org/jabref/gui/fieldeditors/OptionEditor.java
@@ -1,43 +1,61 @@
 package org.jabref.gui.fieldeditors;
 
+import com.airhacks.afterburner.views.ViewLoader;
 import javafx.fxml.FXML;
 import javafx.scene.Parent;
 import javafx.scene.control.ComboBox;
 import javafx.scene.control.ContextMenu;
 import javafx.scene.layout.HBox;
-
 import org.jabref.gui.Globals;
 import org.jabref.gui.fieldeditors.contextmenu.EditorContextAction;
 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.
  */
 public class OptionEditor<T> extends HBox implements FieldEditorFX {
 
-    @FXML private final OptionEditorViewModel<T> viewModel;
-    @FXML private ComboBox<T> comboBox;
+    @FXML
+    private final OptionEditorViewModel<T> viewModel;
+
+    @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()
+            .textProperty()
+            .bindBidirectional(viewModel.textProperty());
 
-        comboBox.getEditor().setOnContextMenuRequested(event -> {
-            ContextMenu contextMenu = new ContextMenu();
-            contextMenu.getItems().setAll(EditorContextAction.getDefaultContextMenuItems(comboBox.getEditor(), Globals.getKeyPrefs()));
-            TextInputControlBehavior.showContextMenu(comboBox.getEditor(), contextMenu, event);
-        });
+        comboBox
+            .getEditor()
+            .setOnContextMenuRequested(event -> {
+                ContextMenu contextMenu = new ContextMenu();
+                contextMenu
+                    .getItems()
+                    .setAll(
+                        EditorContextAction.getDefaultContextMenuItems(
+                            comboBox.getEditor(),
+                            Globals.getKeyPrefs()
+                        )
+                    );
+                TextInputControlBehavior.showContextMenu(
+                    comboBox.getEditor(),
+                    contextMenu,
+                    event
+                );
+            });
     }
 
     public OptionEditorViewModel<T> getViewModel() {
diff --git a/src/main/java/org/jabref/gui/fieldeditors/OptionEditorViewModel.java b/src/main/java/org/jabref/gui/fieldeditors/OptionEditorViewModel.java
index df3f339ca64..c0940ae9a21 100644
--- a/src/main/java/org/jabref/gui/fieldeditors/OptionEditorViewModel.java
+++ b/src/main/java/org/jabref/gui/fieldeditors/OptionEditorViewModel.java
@@ -1,18 +1,20 @@
 package org.jabref.gui.fieldeditors;
 
 import java.util.List;
-
-import javax.swing.undo.UndoManager;
-
 import javafx.util.StringConverter;
-
+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 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/OwnerEditor.java b/src/main/java/org/jabref/gui/fieldeditors/OwnerEditor.java
index 48992341443..8d1236488ba 100644
--- a/src/main/java/org/jabref/gui/fieldeditors/OwnerEditor.java
+++ b/src/main/java/org/jabref/gui/fieldeditors/OwnerEditor.java
@@ -1,11 +1,11 @@
 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;
 import javafx.scene.layout.HBox;
-
+import javax.swing.undo.UndoManager;
 import org.jabref.gui.autocompleter.SuggestionProvider;
 import org.jabref.gui.fieldeditors.contextmenu.EditorMenus;
 import org.jabref.logic.integrity.FieldCheckers;
@@ -13,30 +13,44 @@
 import org.jabref.model.entry.field.Field;
 import org.jabref.preferences.PreferencesService;
 
-import com.airhacks.afterburner.views.ViewLoader;
-import jakarta.inject.Inject;
-
 public class OwnerEditor extends HBox implements FieldEditorFX {
 
-    @FXML private OwnerEditorViewModel viewModel;
-    @FXML private EditorTextArea textArea;
+    @FXML
+    private OwnerEditorViewModel viewModel;
+
+    @FXML
+    private EditorTextArea textArea;
+
+    @Inject
+    private PreferencesService preferencesService;
 
-    @Inject private PreferencesService preferencesService;
-    @Inject private UndoManager undoManager;
+    @Inject
+    private UndoManager undoManager;
 
-    public OwnerEditor(Field field,
-                       SuggestionProvider<?> suggestionProvider,
-                       FieldCheckers fieldCheckers) {
-        ViewLoader.view(this)
-                  .root(this)
-                  .load();
+    public OwnerEditor(
+        Field field,
+        SuggestionProvider<?> suggestionProvider,
+        FieldCheckers fieldCheckers
+    ) {
+        ViewLoader.view(this).root(this).load();
 
-        this.viewModel = new OwnerEditorViewModel(field, suggestionProvider, preferencesService, fieldCheckers, undoManager);
+        this.viewModel =
+            new OwnerEditorViewModel(
+                field,
+                suggestionProvider,
+                preferencesService,
+                fieldCheckers,
+                undoManager
+            );
 
         textArea.textProperty().bindBidirectional(viewModel.textProperty());
         textArea.initContextMenu(EditorMenus.getNameMenu(textArea));
 
-        new EditorValidator(preferencesService).configureValidation(viewModel.getFieldValidator().getValidationStatus(), textArea);
+        new EditorValidator(preferencesService)
+            .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 a849489ad96..5297d4d7a7c 100644
--- a/src/main/java/org/jabref/gui/fieldeditors/OwnerEditorViewModel.java
+++ b/src/main/java/org/jabref/gui/fieldeditors/OwnerEditorViewModel.java
@@ -1,20 +1,22 @@
 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.model.entry.field.Field;
 import org.jabref.preferences.PreferencesService;
 
 public class OwnerEditorViewModel extends AbstractEditorViewModel {
+
     private final PreferencesService preferences;
 
-    public OwnerEditorViewModel(Field field,
-                                SuggestionProvider<?> suggestionProvider,
-                                PreferencesService preferences,
-                                FieldCheckers fieldCheckers,
-                                UndoManager undoManager) {
+    public OwnerEditorViewModel(
+        Field field,
+        SuggestionProvider<?> suggestionProvider,
+        PreferencesService preferences,
+        FieldCheckers fieldCheckers,
+        UndoManager undoManager
+    ) {
         super(field, suggestionProvider, fieldCheckers, undoManager);
         this.preferences = preferences;
     }
diff --git a/src/main/java/org/jabref/gui/fieldeditors/PaginationEditorViewModel.java b/src/main/java/org/jabref/gui/fieldeditors/PaginationEditorViewModel.java
index 639d8a36745..2dbbd62b388 100644
--- a/src/main/java/org/jabref/gui/fieldeditors/PaginationEditorViewModel.java
+++ b/src/main/java/org/jabref/gui/fieldeditors/PaginationEditorViewModel.java
@@ -1,22 +1,24 @@
 package org.jabref.gui.fieldeditors;
 
+import com.google.common.collect.BiMap;
+import com.google.common.collect.HashBiMap;
 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 com.google.common.collect.BiMap;
-import com.google.common.collect.HashBiMap;
-
 public class PaginationEditorViewModel extends MapBasedEditorViewModel<String> {
 
     private BiMap<String, String> itemMap = HashBiMap.create(7);
 
-    public PaginationEditorViewModel(Field field, SuggestionProvider<?> suggestionProvider, FieldCheckers fieldCheckers, UndoManager undoManager) {
+    public PaginationEditorViewModel(
+        Field field,
+        SuggestionProvider<?> suggestionProvider,
+        FieldCheckers fieldCheckers,
+        UndoManager undoManager
+    ) {
         super(field, suggestionProvider, fieldCheckers, undoManager);
-
         itemMap.put("page", Localization.lang("Page"));
         itemMap.put("column", Localization.lang("Column"));
         itemMap.put("line", Localization.lang("Line"));
diff --git a/src/main/java/org/jabref/gui/fieldeditors/PatentTypeEditorViewModel.java b/src/main/java/org/jabref/gui/fieldeditors/PatentTypeEditorViewModel.java
index a49281ecc86..3db5731aec2 100644
--- a/src/main/java/org/jabref/gui/fieldeditors/PatentTypeEditorViewModel.java
+++ b/src/main/java/org/jabref/gui/fieldeditors/PatentTypeEditorViewModel.java
@@ -1,22 +1,24 @@
 package org.jabref.gui.fieldeditors;
 
+import com.google.common.collect.BiMap;
+import com.google.common.collect.HashBiMap;
 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 com.google.common.collect.BiMap;
-import com.google.common.collect.HashBiMap;
-
 public class PatentTypeEditorViewModel extends MapBasedEditorViewModel<String> {
 
     private BiMap<String, String> itemMap = HashBiMap.create(12);
 
-    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);
-
         itemMap.put("patent", Localization.lang("Patent"));
         itemMap.put("patentde", Localization.lang("German patent"));
         itemMap.put("patenteu", Localization.lang("European patent"));
diff --git a/src/main/java/org/jabref/gui/fieldeditors/PersonsEditor.java b/src/main/java/org/jabref/gui/fieldeditors/PersonsEditor.java
index 226f85bcf6a..78e626c41bd 100644
--- a/src/main/java/org/jabref/gui/fieldeditors/PersonsEditor.java
+++ b/src/main/java/org/jabref/gui/fieldeditors/PersonsEditor.java
@@ -1,11 +1,9 @@
 package org.jabref.gui.fieldeditors;
 
-import javax.swing.undo.UndoManager;
-
 import javafx.scene.Parent;
 import javafx.scene.control.TextInputControl;
 import javafx.scene.layout.HBox;
-
+import javax.swing.undo.UndoManager;
 import org.jabref.gui.autocompleter.AutoCompletionTextInputBinding;
 import org.jabref.gui.autocompleter.SuggestionProvider;
 import org.jabref.gui.fieldeditors.contextmenu.EditorMenus;
@@ -21,24 +19,45 @@ public class PersonsEditor extends HBox implements FieldEditorFX {
     private final TextInputControl textInput;
     private final UiThreadStringProperty decoratedStringProperty;
 
-    public PersonsEditor(final Field field,
-                         final SuggestionProvider<?> suggestionProvider,
-                         final PreferencesService preferencesService,
-                         final FieldCheckers fieldCheckers,
-                         final boolean isMultiLine,
-                         final UndoManager undoManager) {
-        this.viewModel = new PersonsEditorViewModel(field, suggestionProvider, preferencesService.getAutoCompletePreferences(), fieldCheckers, undoManager);
+    public PersonsEditor(
+        final Field field,
+        final SuggestionProvider<?> suggestionProvider,
+        final PreferencesService preferencesService,
+        final FieldCheckers fieldCheckers,
+        final boolean isMultiLine,
+        final UndoManager undoManager
+    ) {
+        this.viewModel =
+            new PersonsEditorViewModel(
+                field,
+                suggestionProvider,
+                preferencesService.getAutoCompletePreferences(),
+                fieldCheckers,
+                undoManager
+            );
 
         textInput = isMultiLine ? new EditorTextArea() : new EditorTextField();
 
-        decoratedStringProperty = new UiThreadStringProperty(viewModel.textProperty());
+        decoratedStringProperty =
+            new UiThreadStringProperty(viewModel.textProperty());
         textInput.textProperty().bindBidirectional(decoratedStringProperty);
-        ((ContextMenuAddable) textInput).initContextMenu(EditorMenus.getNameMenu(textInput));
+        ((ContextMenuAddable) textInput).initContextMenu(
+                EditorMenus.getNameMenu(textInput)
+            );
         this.getChildren().add(textInput);
 
-        AutoCompletionTextInputBinding.autoComplete(textInput, viewModel::complete, viewModel.getAutoCompletionConverter(), viewModel.getAutoCompletionStrategy());
+        AutoCompletionTextInputBinding.autoComplete(
+            textInput,
+            viewModel::complete,
+            viewModel.getAutoCompletionConverter(),
+            viewModel.getAutoCompletionStrategy()
+        );
 
-        new EditorValidator(preferencesService).configureValidation(viewModel.getFieldValidator().getValidationStatus(), textInput);
+        new EditorValidator(preferencesService)
+            .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 fb995bef63f..67e7f69ccdd 100644
--- a/src/main/java/org/jabref/gui/fieldeditors/PersonsEditorViewModel.java
+++ b/src/main/java/org/jabref/gui/fieldeditors/PersonsEditorViewModel.java
@@ -1,11 +1,9 @@
 package org.jabref.gui.fieldeditors;
 
 import java.util.Collection;
-
-import javax.swing.undo.UndoManager;
-
 import javafx.util.StringConverter;
-
+import javax.swing.undo.UndoManager;
+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 +13,17 @@
 import org.jabref.model.entry.Author;
 import org.jabref.model.entry.field.Field;
 
-import org.controlsfx.control.textfield.AutoCompletionBinding;
-
 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;
     }
@@ -31,7 +33,9 @@ public StringConverter<Author> getAutoCompletionConverter() {
     }
 
     @SuppressWarnings("unchecked")
-    public Collection<Author> complete(AutoCompletionBinding.ISuggestionRequest request) {
+    public Collection<Author> complete(
+        AutoCompletionBinding.ISuggestionRequest request
+    ) {
         return (Collection<Author>) super.complete(request);
     }
 
diff --git a/src/main/java/org/jabref/gui/fieldeditors/PopOverUtil.java b/src/main/java/org/jabref/gui/fieldeditors/PopOverUtil.java
index e2352b679dc..faccbe7fb11 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.gui.util.BackgroundTask;
@@ -13,13 +12,18 @@
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.field.StandardField;
 
-import org.controlsfx.control.PopOver;
-
 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);
+        Optional<String> optionalJournalName = entry.getFieldOrAlias(
+            StandardField.JOURNAL
+        );
 
         if (optionalIssn.isPresent() || optionalJournalName.isPresent()) {
             PopOver popOver = new PopOver();
@@ -33,20 +37,32 @@ public static void showJournalInfo(Button button, BibEntry entry, DialogService
             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);
-                    })
-                    .executeWith(taskExecutor);
+                .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 57bce3f9eea..a65e46bdd5d 100644
--- a/src/main/java/org/jabref/gui/fieldeditors/SimpleEditor.java
+++ b/src/main/java/org/jabref/gui/fieldeditors/SimpleEditor.java
@@ -1,12 +1,10 @@
 package org.jabref.gui.fieldeditors;
 
-import javax.swing.undo.UndoManager;
-
 import javafx.scene.Parent;
 import javafx.scene.control.TextInputControl;
 import javafx.scene.layout.HBox;
 import javafx.scene.layout.Priority;
-
+import javax.swing.undo.UndoManager;
 import org.jabref.gui.autocompleter.AutoCompletionTextInputBinding;
 import org.jabref.gui.autocompleter.ContentSelectorSuggestionProvider;
 import org.jabref.gui.autocompleter.SuggestionProvider;
@@ -21,38 +19,68 @@ public class SimpleEditor extends HBox implements FieldEditorFX {
     private final SimpleEditorViewModel viewModel;
     private final TextInputControl textInput;
 
-    public SimpleEditor(final Field field,
-                        final SuggestionProvider<?> suggestionProvider,
-                        final FieldCheckers fieldCheckers,
-                        final PreferencesService preferences,
-                        final boolean isMultiLine,
-                        final UndoManager undoManager) {
-        this.viewModel = new SimpleEditorViewModel(field, suggestionProvider, fieldCheckers, undoManager);
+    public SimpleEditor(
+        final Field field,
+        final SuggestionProvider<?> suggestionProvider,
+        final FieldCheckers fieldCheckers,
+        final PreferencesService preferences,
+        final boolean isMultiLine,
+        final UndoManager undoManager
+    ) {
+        this.viewModel =
+            new SimpleEditorViewModel(
+                field,
+                suggestionProvider,
+                fieldCheckers,
+                undoManager
+            );
 
         textInput = isMultiLine ? new EditorTextArea() : new EditorTextField();
         HBox.setHgrow(textInput, Priority.ALWAYS);
 
         textInput.textProperty().bindBidirectional(viewModel.textProperty());
-        ((ContextMenuAddable) textInput).initContextMenu(new DefaultMenu(textInput));
+        ((ContextMenuAddable) textInput).initContextMenu(
+                new DefaultMenu(textInput)
+            );
         this.getChildren().add(textInput);
 
         if (!isMultiLine) {
-            AutoCompletionTextInputBinding<?> autoCompleter = AutoCompletionTextInputBinding.autoComplete(textInput, viewModel::complete, viewModel.getAutoCompletionStrategy());
-            if (suggestionProvider instanceof ContentSelectorSuggestionProvider) {
+            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
                 autoCompleter.setShowOnFocus(true);
             }
         }
 
-        new EditorValidator(preferences).configureValidation(viewModel.getFieldValidator().getValidationStatus(), textInput);
+        new EditorValidator(preferences)
+            .configureValidation(
+                viewModel.getFieldValidator().getValidationStatus(),
+                textInput
+            );
     }
 
-    public SimpleEditor(final Field field,
-                        final SuggestionProvider<?> suggestionProvider,
-                        final FieldCheckers fieldCheckers,
-                        final PreferencesService preferences,
-                        UndoManager undoManager) {
-        this(field, suggestionProvider, fieldCheckers, preferences, false, undoManager);
+    public SimpleEditor(
+        final Field field,
+        final SuggestionProvider<?> suggestionProvider,
+        final FieldCheckers fieldCheckers,
+        final PreferencesService preferences,
+        UndoManager undoManager
+    ) {
+        this(
+            field,
+            suggestionProvider,
+            fieldCheckers,
+            preferences,
+            false,
+            undoManager
+        );
     }
 
     @Override
diff --git a/src/main/java/org/jabref/gui/fieldeditors/SimpleEditorViewModel.java b/src/main/java/org/jabref/gui/fieldeditors/SimpleEditorViewModel.java
index acae084f6fc..5d84e15e9a6 100644
--- a/src/main/java/org/jabref/gui/fieldeditors/SimpleEditorViewModel.java
+++ b/src/main/java/org/jabref/gui/fieldeditors/SimpleEditorViewModel.java
@@ -1,7 +1,6 @@
 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;
@@ -10,7 +9,12 @@
 
 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/TextInputControlBehavior.java b/src/main/java/org/jabref/gui/fieldeditors/TextInputControlBehavior.java
index 31a45bc8c68..663d8ef219d 100644
--- a/src/main/java/org/jabref/gui/fieldeditors/TextInputControlBehavior.java
+++ b/src/main/java/org/jabref/gui/fieldeditors/TextInputControlBehavior.java
@@ -1,5 +1,6 @@
 package org.jabref.gui.fieldeditors;
 
+import com.sun.javafx.scene.control.Properties;
 import javafx.geometry.Point2D;
 import javafx.geometry.Rectangle2D;
 import javafx.scene.Scene;
@@ -12,8 +13,6 @@
 import javafx.stage.Screen;
 import javafx.stage.Window;
 
-import com.sun.javafx.scene.control.Properties;
-
 /**
  * This class contains some code taken from {@link com.sun.javafx.scene.control.behavior.TextInputControlBehavior},
  * witch is not accessible and thus we have no other choice.
@@ -25,7 +24,11 @@ public class TextInputControlBehavior {
     /**
      * taken from {@link com.sun.javafx.scene.control.behavior.TextFieldBehavior#contextMenuRequested(javafx.scene.input.ContextMenuEvent)}
      */
-    public static void showContextMenu(TextField textField, ContextMenu contextMenu, ContextMenuEvent e) {
+    public static void showContextMenu(
+        TextField textField,
+        ContextMenu contextMenu,
+        ContextMenuEvent e
+    ) {
         double screenX = e.getScreenX();
         double screenY = e.getScreenY();
         double sceneX = e.getSceneX();
@@ -39,8 +42,14 @@ public static void showContextMenu(TextField textField, ContextMenu contextMenu,
                 menuPos = skin.getMenuPosition();
             } else {
                 menuPos = skin.getMenuPosition();
-                if (menuPos != null && (menuPos.getX() <= 0 || menuPos.getY() <= 0)) {
-                    skin.positionCaret(skin.getIndex(e.getX(), e.getY()), false);
+                if (
+                    menuPos != null &&
+                    (menuPos.getX() <= 0 || menuPos.getY() <= 0)
+                ) {
+                    skin.positionCaret(
+                        skin.getIndex(e.getX(), e.getY()),
+                        false
+                    );
                     menuPos = skin.getMenuPosition();
                 }
             }
@@ -49,8 +58,10 @@ public static void showContextMenu(TextField textField, ContextMenu contextMenu,
                 Point2D p = textField.localToScene(menuPos);
                 Scene scene = textField.getScene();
                 Window window = scene.getWindow();
-                Point2D location = new Point2D(window.getX() + scene.getX() + p.getX(),
-                        window.getY() + scene.getY() + p.getY());
+                Point2D location = new Point2D(
+                    window.getX() + scene.getX() + p.getX(),
+                    window.getY() + scene.getY() + p.getY()
+                );
                 screenX = location.getX();
                 sceneX = p.getX();
                 screenY = location.getY();
@@ -58,7 +69,8 @@ public static void showContextMenu(TextField textField, ContextMenu contextMenu,
         }
 
         double menuWidth = contextMenu.prefWidth(-1);
-        double menuX = screenX - (Properties.IS_TOUCH_SUPPORTED ? (menuWidth / 2) : 0);
+        double menuX =
+            screenX - (Properties.IS_TOUCH_SUPPORTED ? (menuWidth / 2) : 0);
         Screen currentScreen = Screen.getPrimary();
         Rectangle2D bounds = currentScreen.getBounds();
 
@@ -83,7 +95,11 @@ public static void showContextMenu(TextField textField, ContextMenu contextMenu,
     /**
      * taken from {@link com.sun.javafx.scene.control.behavior.TextAreaBehavior#contextMenuRequested(javafx.scene.input.ContextMenuEvent)}
      */
-    public static void showContextMenu(TextArea textArea, ContextMenu contextMenu, ContextMenuEvent e) {
+    public static void showContextMenu(
+        TextArea textArea,
+        ContextMenu contextMenu,
+        ContextMenuEvent e
+    ) {
         double screenX = e.getScreenX();
         double screenY = e.getScreenY();
         double sceneX = e.getSceneX();
@@ -97,8 +113,14 @@ public static void showContextMenu(TextArea textArea, ContextMenu contextMenu, C
                 menuPos = skin.getMenuPosition();
             } else {
                 menuPos = skin.getMenuPosition();
-                if (menuPos != null && (menuPos.getX() <= 0 || menuPos.getY() <= 0)) {
-                    skin.positionCaret(skin.getIndex(e.getX(), e.getY()), false);
+                if (
+                    menuPos != null &&
+                    (menuPos.getX() <= 0 || menuPos.getY() <= 0)
+                ) {
+                    skin.positionCaret(
+                        skin.getIndex(e.getX(), e.getY()),
+                        false
+                    );
                     menuPos = skin.getMenuPosition();
                 }
             }
@@ -107,8 +129,10 @@ public static void showContextMenu(TextArea textArea, ContextMenu contextMenu, C
                 Point2D p = textArea.localToScene(menuPos);
                 Scene scene = textArea.getScene();
                 Window window = scene.getWindow();
-                Point2D location = new Point2D(window.getX() + scene.getX() + p.getX(),
-                        window.getY() + scene.getY() + p.getY());
+                Point2D location = new Point2D(
+                    window.getX() + scene.getX() + p.getX(),
+                    window.getY() + scene.getY() + p.getY()
+                );
                 screenX = location.getX();
                 sceneX = p.getX();
                 screenY = location.getY();
@@ -116,7 +140,8 @@ public static void showContextMenu(TextArea textArea, ContextMenu contextMenu, C
         }
 
         double menuWidth = contextMenu.prefWidth(-1);
-        double menuX = screenX - (Properties.IS_TOUCH_SUPPORTED ? (menuWidth / 2) : 0);
+        double menuX =
+            screenX - (Properties.IS_TOUCH_SUPPORTED ? (menuWidth / 2) : 0);
         Screen currentScreen = Screen.getPrimary();
         Rectangle2D bounds = currentScreen.getBounds();
 
diff --git a/src/main/java/org/jabref/gui/fieldeditors/TypeEditorViewModel.java b/src/main/java/org/jabref/gui/fieldeditors/TypeEditorViewModel.java
index 5bc82b4d1d6..4f9d71784ab 100644
--- a/src/main/java/org/jabref/gui/fieldeditors/TypeEditorViewModel.java
+++ b/src/main/java/org/jabref/gui/fieldeditors/TypeEditorViewModel.java
@@ -1,22 +1,24 @@
 package org.jabref.gui.fieldeditors;
 
+import com.google.common.collect.BiMap;
+import com.google.common.collect.HashBiMap;
 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 com.google.common.collect.BiMap;
-import com.google.common.collect.HashBiMap;
-
 public class TypeEditorViewModel extends MapBasedEditorViewModel<String> {
 
     private BiMap<String, String> itemMap = HashBiMap.create(8);
 
-    public TypeEditorViewModel(Field field, SuggestionProvider<?> suggestionProvider, FieldCheckers fieldCheckers, UndoManager undoManager) {
+    public TypeEditorViewModel(
+        Field field,
+        SuggestionProvider<?> suggestionProvider,
+        FieldCheckers fieldCheckers,
+        UndoManager undoManager
+    ) {
         super(field, suggestionProvider, fieldCheckers, undoManager);
-
         itemMap.put("mathesis", Localization.lang("Master's thesis"));
         itemMap.put("phdthesis", Localization.lang("PhD thesis"));
         itemMap.put("candthesis", Localization.lang("Candidate thesis"));
diff --git a/src/main/java/org/jabref/gui/fieldeditors/URLUtil.java b/src/main/java/org/jabref/gui/fieldeditors/URLUtil.java
index d7f58db7c00..fe2bda46cfc 100644
--- a/src/main/java/org/jabref/gui/fieldeditors/URLUtil.java
+++ b/src/main/java/org/jabref/gui/fieldeditors/URLUtil.java
@@ -6,18 +6,18 @@
 import java.nio.charset.StandardCharsets;
 import java.util.Objects;
 import java.util.Optional;
-
 import org.jabref.gui.externalfiletype.ExternalFileTypes;
 import org.jabref.preferences.FilePreferences;
 
 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.
@@ -53,7 +53,10 @@ public static String cleanGoogleSearchURL(String url) {
                 if (pair.startsWith("url=")) {
                     String value = pair.substring(pair.indexOf('=') + 1);
 
-                    String decode = URLDecoder.decode(value, StandardCharsets.UTF_8);
+                    String decode = URLDecoder.decode(
+                        value,
+                        StandardCharsets.UTF_8
+                    );
                     // url?
                     if (decode.matches(URL_EXP)) {
                         return decode;
@@ -91,13 +94,23 @@ 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, FilePreferences filePreferences) {
+    public static Optional<String> getSuffix(
+        final String link,
+        FilePreferences filePreferences
+    ) {
         String strippedLink = link;
         try {
             // Try to strip the query string, if any, to get the correct suffix:
             URL url = new URL(link);
-            if ((url.getQuery() != null) && (url.getQuery().length() < (link.length() - 1))) {
-                strippedLink = link.substring(0, link.length() - url.getQuery().length() - 1);
+            if (
+                (url.getQuery() != null) &&
+                (url.getQuery().length() < (link.length() - 1))
+            ) {
+                strippedLink =
+                    link.substring(
+                        0,
+                        link.length() - url.getQuery().length() - 1
+                    );
             }
         } catch (MalformedURLException e) {
             // Don't report this error, since this getting the suffix is a non-critical
@@ -106,12 +119,17 @@ public static Optional<String> getSuffix(final String link, FilePreferences file
         // First see if the stripped link gives a reasonable suffix:
         String suffix;
         int strippedLinkIndex = strippedLink.lastIndexOf('.');
-        if ((strippedLinkIndex <= 0) || (strippedLinkIndex == (strippedLink.length() - 1))) {
+        if (
+            (strippedLinkIndex <= 0) ||
+            (strippedLinkIndex == (strippedLink.length() - 1))
+        ) {
             suffix = null;
         } else {
             suffix = strippedLink.substring(strippedLinkIndex + 1);
         }
-        if (!ExternalFileTypes.isExternalFileTypeByExt(suffix, filePreferences)) {
+        if (
+            !ExternalFileTypes.isExternalFileTypeByExt(suffix, filePreferences)
+        ) {
             // If the suffix doesn't seem to give any reasonable file type, try
             // with the non-stripped link:
             int index = link.lastIndexOf('.');
@@ -119,7 +137,12 @@ public static Optional<String> getSuffix(final String link, FilePreferences file
                 // No occurrence, or at the end
                 // Check if there are path separators in the suffix - if so, it is definitely
                 // not a proper suffix, so we should give up:
-                if (strippedLink.substring(strippedLinkIndex + 1).indexOf('/') >= 1) {
+                if (
+                    strippedLink
+                        .substring(strippedLinkIndex + 1)
+                        .indexOf('/') >=
+                    1
+                ) {
                     return Optional.empty();
                 } else {
                     return Optional.of(suffix); // return the first one we found, anyway.
diff --git a/src/main/java/org/jabref/gui/fieldeditors/UrlEditor.java b/src/main/java/org/jabref/gui/fieldeditors/UrlEditor.java
index fd30c7a92b8..34de5bf6337 100644
--- a/src/main/java/org/jabref/gui/fieldeditors/UrlEditor.java
+++ b/src/main/java/org/jabref/gui/fieldeditors/UrlEditor.java
@@ -1,16 +1,15 @@
 package org.jabref.gui.fieldeditors;
 
+import com.airhacks.afterburner.views.ViewLoader;
+import jakarta.inject.Inject;
 import java.util.List;
 import java.util.function.Supplier;
-
-import javax.swing.undo.UndoManager;
-
 import javafx.event.ActionEvent;
 import javafx.fxml.FXML;
 import javafx.scene.Parent;
 import javafx.scene.control.MenuItem;
 import javafx.scene.layout.HBox;
-
+import javax.swing.undo.UndoManager;
 import org.jabref.gui.DialogService;
 import org.jabref.gui.autocompleter.SuggestionProvider;
 import org.jabref.gui.fieldeditors.contextmenu.EditorMenus;
@@ -21,35 +20,60 @@
 import org.jabref.model.entry.field.Field;
 import org.jabref.preferences.PreferencesService;
 
-import com.airhacks.afterburner.views.ViewLoader;
-import jakarta.inject.Inject;
-
 public class UrlEditor extends HBox implements FieldEditorFX {
 
-    @FXML private final UrlEditorViewModel viewModel;
-    @FXML private EditorTextArea textArea;
-
-    @Inject private DialogService dialogService;
-    @Inject private PreferencesService preferencesService;
-    @Inject private UndoManager undoManager;
-
-    public UrlEditor(Field field,
-                     SuggestionProvider<?> suggestionProvider,
-                     FieldCheckers fieldCheckers) {
-        ViewLoader.view(this)
-                  .root(this)
-                  .load();
+    @FXML
+    private final UrlEditorViewModel viewModel;
 
-        this.viewModel = new UrlEditorViewModel(field, suggestionProvider, dialogService, preferencesService, fieldCheckers, undoManager);
+    @FXML
+    private EditorTextArea textArea;
+
+    @Inject
+    private DialogService dialogService;
+
+    @Inject
+    private PreferencesService preferencesService;
+
+    @Inject
+    private UndoManager undoManager;
+
+    public UrlEditor(
+        Field field,
+        SuggestionProvider<?> suggestionProvider,
+        FieldCheckers fieldCheckers
+    ) {
+        ViewLoader.view(this).root(this).load();
+
+        this.viewModel =
+            new UrlEditorViewModel(
+                field,
+                suggestionProvider,
+                dialogService,
+                preferencesService,
+                fieldCheckers,
+                undoManager
+            );
 
         textArea.textProperty().bindBidirectional(viewModel.textProperty());
-        Supplier<List<MenuItem>> contextMenuSupplier = EditorMenus.getCleanupUrlMenu(textArea);
+        Supplier<List<MenuItem>> contextMenuSupplier =
+            EditorMenus.getCleanupUrlMenu(textArea);
         textArea.initContextMenu(contextMenuSupplier);
 
         // 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(preferencesService).configureValidation(viewModel.getFieldValidator().getValidationStatus(), textArea);
+        textArea.setPasteActionHandler(() ->
+            textArea.setText(
+                new CleanupUrlFormatter()
+                    .format(
+                        new TrimWhitespaceFormatter().format(textArea.getText())
+                    )
+            )
+        );
+
+        new EditorValidator(preferencesService)
+            .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 5741ba4ed95..95c0e1d8f37 100644
--- a/src/main/java/org/jabref/gui/fieldeditors/UrlEditorViewModel.java
+++ b/src/main/java/org/jabref/gui/fieldeditors/UrlEditorViewModel.java
@@ -1,12 +1,10 @@
 package org.jabref.gui.fieldeditors;
 
+import com.tobiasdiez.easybind.EasyBind;
 import java.io.IOException;
-
-import javax.swing.undo.UndoManager;
-
 import javafx.beans.property.BooleanProperty;
 import javafx.beans.property.SimpleBooleanProperty;
-
+import javax.swing.undo.UndoManager;
 import org.jabref.gui.DialogService;
 import org.jabref.gui.autocompleter.SuggestionProvider;
 import org.jabref.gui.desktop.JabRefDesktop;
@@ -16,24 +14,30 @@
 import org.jabref.model.strings.StringUtil;
 import org.jabref.preferences.PreferencesService;
 
-import com.tobiasdiez.easybind.EasyBind;
-
 public class UrlEditorViewModel extends AbstractEditorViewModel {
+
     private final DialogService dialogService;
     private final PreferencesService preferencesService;
-    private final BooleanProperty validUrlIsNotPresent = new SimpleBooleanProperty(true);
+    private final BooleanProperty validUrlIsNotPresent =
+        new SimpleBooleanProperty(true);
 
-    public UrlEditorViewModel(Field field,
-                              SuggestionProvider<?> suggestionProvider,
-                              DialogService dialogService,
-                              PreferencesService preferencesService,
-                              FieldCheckers fieldCheckers, UndoManager undoManager) {
+    public UrlEditorViewModel(
+        Field field,
+        SuggestionProvider<?> suggestionProvider,
+        DialogService dialogService,
+        PreferencesService preferencesService,
+        FieldCheckers fieldCheckers,
+        UndoManager undoManager
+    ) {
         super(field, suggestionProvider, fieldCheckers, undoManager);
         this.dialogService = dialogService;
         this.preferencesService = preferencesService;
 
         validUrlIsNotPresent.bind(
-                EasyBind.map(text, input -> StringUtil.isBlank(input) || !URLUtil.isURL(input))
+            EasyBind.map(
+                text,
+                input -> StringUtil.isBlank(input) || !URLUtil.isURL(input)
+            )
         );
     }
 
@@ -51,7 +55,10 @@ public void openExternalLink() {
         }
 
         try {
-            JabRefDesktop.openBrowser(text.get(), preferencesService.getFilePreferences());
+            JabRefDesktop.openBrowser(
+                text.get(),
+                preferencesService.getFilePreferences()
+            );
         } catch (IOException ex) {
             dialogService.notify(Localization.lang("Unable to open link."));
         }
diff --git a/src/main/java/org/jabref/gui/fieldeditors/WriteMetadataToSinglePdfAction.java b/src/main/java/org/jabref/gui/fieldeditors/WriteMetadataToSinglePdfAction.java
index 3f70efaa6ca..58d0dc66fd7 100644
--- a/src/main/java/org/jabref/gui/fieldeditors/WriteMetadataToSinglePdfAction.java
+++ b/src/main/java/org/jabref/gui/fieldeditors/WriteMetadataToSinglePdfAction.java
@@ -3,9 +3,7 @@
 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.gui.util.BackgroundTask;
@@ -21,7 +19,6 @@
 import org.jabref.model.entry.BibEntryTypesManager;
 import org.jabref.model.entry.LinkedFile;
 import org.jabref.preferences.FilePreferences;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -30,7 +27,9 @@
  */
 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 +42,18 @@ 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;
@@ -68,45 +69,78 @@ public WriteMetadataToSinglePdfAction(LinkedFile linkedFile,
     @Override
     public void execute() {
         BackgroundTask<Void> writeTask = BackgroundTask.wrap(() -> {
-            Optional<Path> file = linkedFile.findIn(databaseContext, filePreferences);
+            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("")));
+                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);
+                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));
+            .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 {
+    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());
+        new XmpUtilWriter(xmpPreferences)
+            .writeXmp(file, entry, databaseContext.getDatabase());
 
-        EmbeddedBibFilePdfExporter embeddedBibExporter = new EmbeddedBibFilePdfExporter(
+        EmbeddedBibFilePdfExporter embeddedBibExporter =
+            new EmbeddedBibFilePdfExporter(
                 databaseContext.getMode(),
                 bibEntryTypesManager,
-                fieldPreferences);
+                fieldPreferences
+            );
         embeddedBibExporter.exportToFileByPath(
-                databaseContext,
-                filePreferences,
-                file,
-                abbreviationRepository);
+            databaseContext,
+            filePreferences,
+            file,
+            abbreviationRepository
+        );
     }
 }
diff --git a/src/main/java/org/jabref/gui/fieldeditors/YesNoEditorViewModel.java b/src/main/java/org/jabref/gui/fieldeditors/YesNoEditorViewModel.java
index 8210208853e..57ca1c6c523 100644
--- a/src/main/java/org/jabref/gui/fieldeditors/YesNoEditorViewModel.java
+++ b/src/main/java/org/jabref/gui/fieldeditors/YesNoEditorViewModel.java
@@ -1,21 +1,23 @@
 package org.jabref.gui.fieldeditors;
 
+import com.google.common.collect.BiMap;
+import com.google.common.collect.HashBiMap;
 import javax.swing.undo.UndoManager;
-
 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;
-
 public class YesNoEditorViewModel extends MapBasedEditorViewModel<String> {
 
     private BiMap<String, String> itemMap = HashBiMap.create(2);
 
-    public YesNoEditorViewModel(Field field, SuggestionProvider<?> suggestionProvider, FieldCheckers fieldCheckers, UndoManager undoManager) {
+    public YesNoEditorViewModel(
+        Field field,
+        SuggestionProvider<?> suggestionProvider,
+        FieldCheckers fieldCheckers,
+        UndoManager undoManager
+    ) {
         super(field, suggestionProvider, fieldCheckers, undoManager);
-
         itemMap.put("yes", "Yes");
         itemMap.put("no", "No");
     }
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 c5f95b72fa8..0b234f1b679 100644
--- a/src/main/java/org/jabref/gui/fieldeditors/contextmenu/DefaultMenu.java
+++ b/src/main/java/org/jabref/gui/fieldeditors/contextmenu/DefaultMenu.java
@@ -1,21 +1,18 @@
 package org.jabref.gui.fieldeditors.contextmenu;
 
+import com.tobiasdiez.easybind.EasyBind;
 import java.util.List;
 import java.util.Objects;
 import java.util.function.Supplier;
-
 import javafx.scene.control.Menu;
 import javafx.scene.control.MenuItem;
 import javafx.scene.control.SeparatorMenuItem;
 import javafx.scene.control.TextInputControl;
-
 import org.jabref.logic.cleanup.Formatter;
 import org.jabref.logic.formatter.Formatters;
 import org.jabref.logic.l10n.Localization;
 import org.jabref.model.strings.StringUtil;
 
-import com.tobiasdiez.easybind.EasyBind;
-
 public class DefaultMenu implements Supplier<List<MenuItem>> {
 
     TextInputControl textInputControl;
@@ -31,12 +28,13 @@ public DefaultMenu(TextInputControl textInputControl) {
 
     public List<MenuItem> get() {
         return List.of(
-                getCaseChangeMenu(textInputControl),
-                getConversionMenu(textInputControl),
-                new SeparatorMenuItem(),
-                new ProtectedTermsMenu(textInputControl),
-                new SeparatorMenuItem(),
-                getClearFieldMenuItem(textInputControl));
+            getCaseChangeMenu(textInputControl),
+            getConversionMenu(textInputControl),
+            new SeparatorMenuItem(),
+            new ProtectedTermsMenu(textInputControl),
+            new SeparatorMenuItem(),
+            getClearFieldMenuItem(textInputControl)
+        );
     }
 
     private static Menu getCaseChangeMenu(TextInputControl textInputControl) {
@@ -45,9 +43,19 @@ 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)));
+            EasyBind.subscribe(
+                textInputControl.textProperty(),
+                value -> menuItem.setDisable(StringUtil.isNullOrEmpty(value))
+            );
             menuItem.setOnAction(event ->
-                    textInputControl.textProperty().set(caseChanger.format(textInputControl.textProperty().get())));
+                textInputControl
+                    .textProperty()
+                    .set(
+                        caseChanger.format(
+                            textInputControl.textProperty().get()
+                        )
+                    )
+            );
             submenu.getItems().add(menuItem);
         }
 
@@ -59,9 +67,17 @@ 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)));
+            EasyBind.subscribe(
+                textInputControl.textProperty(),
+                value -> menuItem.setDisable(StringUtil.isNullOrEmpty(value))
+            );
             menuItem.setOnAction(event ->
-                    textInputControl.textProperty().set(converter.format(textInputControl.textProperty().get())));
+                textInputControl
+                    .textProperty()
+                    .set(
+                        converter.format(textInputControl.textProperty().get())
+                    )
+            );
             submenu.getItems().add(menuItem);
         }
 
@@ -69,7 +85,9 @@ private static Menu getConversionMenu(TextInputControl textInputControl) {
     }
 
     // Icon: DELETE_SWEEP
-    private static MenuItem getClearFieldMenuItem(TextInputControl textInputControl) {
+    private static MenuItem getClearFieldMenuItem(
+        TextInputControl textInputControl
+    ) {
         MenuItem menuItem = new MenuItem(Localization.lang("Clear"));
         menuItem.setOnAction(event -> textInputControl.setText(""));
 
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 d0a978f0958..a4b1500c595 100644
--- a/src/main/java/org/jabref/gui/fieldeditors/contextmenu/EditorContextAction.java
+++ b/src/main/java/org/jabref/gui/fieldeditors/contextmenu/EditorContextAction.java
@@ -1,7 +1,7 @@
 package org.jabref.gui.fieldeditors.contextmenu;
 
+import com.sun.javafx.scene.control.Properties;
 import java.util.List;
-
 import javafx.beans.binding.Bindings;
 import javafx.beans.binding.BooleanBinding;
 import javafx.beans.property.BooleanProperty;
@@ -9,7 +9,6 @@
 import javafx.scene.control.PasswordField;
 import javafx.scene.control.TextInputControl;
 import javafx.scene.input.Clipboard;
-
 import org.jabref.gui.actions.ActionFactory;
 import org.jabref.gui.actions.SimpleCommand;
 import org.jabref.gui.actions.StandardActions;
@@ -17,31 +16,52 @@
 import org.jabref.gui.util.BindingsHelper;
 import org.jabref.logic.util.OS;
 
-import com.sun.javafx.scene.control.Properties;
-
 public class EditorContextAction extends SimpleCommand {
 
-    private static final boolean SHOW_HANDLES = Properties.IS_TOUCH_SUPPORTED && !OS.OS_X;
+    private static final boolean SHOW_HANDLES =
+        Properties.IS_TOUCH_SUPPORTED && !OS.OS_X;
 
     private final StandardActions command;
     private final TextInputControl textInputControl;
 
-    public EditorContextAction(StandardActions command, TextInputControl textInputControl) {
+    public EditorContextAction(
+        StandardActions command,
+        TextInputControl textInputControl
+    ) {
         this.command = command;
         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 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");
 
         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 PASTE -> editableBinding.and(
+                        hasStringInClipboardBinding
+                    );
                     case DELETE -> editableBinding.and(hasSelectionBinding);
                     case SELECT_ALL -> {
                         if (SHOW_HANDLES) {
@@ -51,7 +71,8 @@ public EditorContextAction(StandardActions command, TextInputControl textInputCo
                         }
                     }
                     default -> BindingsHelper.constantOf(true);
-                });
+                }
+            );
     }
 
     @Override
@@ -60,7 +81,9 @@ public void execute() {
             case COPY -> textInputControl.copy();
             case CUT -> textInputControl.cut();
             case PASTE -> textInputControl.paste();
-            case DELETE -> textInputControl.deleteText(textInputControl.getSelection());
+            case DELETE -> textInputControl.deleteText(
+                textInputControl.getSelection()
+            );
             case SELECT_ALL -> textInputControl.selectAll();
         }
         textInputControl.requestFocus();
@@ -69,21 +92,44 @@ public void execute() {
     /**
      * Returns the default context menu items (except undo/redo)
      */
-    public static List<MenuItem> getDefaultContextMenuItems(TextInputControl textInputControl,
-                                                            KeyBindingRepository keyBindingRepository) {
+    public static List<MenuItem> getDefaultContextMenuItems(
+        TextInputControl textInputControl,
+        KeyBindingRepository keyBindingRepository
+    ) {
         ActionFactory factory = new ActionFactory(keyBindingRepository);
 
-        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)),
-                selectAllMenuItem);
+            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 59dadd996bb..3aee762f5e1 100644
--- a/src/main/java/org/jabref/gui/fieldeditors/contextmenu/EditorMenus.java
+++ b/src/main/java/org/jabref/gui/fieldeditors/contextmenu/EditorMenus.java
@@ -1,14 +1,13 @@
 package org.jabref.gui.fieldeditors.contextmenu;
 
+import com.tobiasdiez.easybind.EasyBind;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.function.Supplier;
-
 import javafx.scene.control.MenuItem;
 import javafx.scene.control.SeparatorMenuItem;
 import javafx.scene.control.TextArea;
 import javafx.scene.control.TextInputControl;
-
 import org.jabref.gui.DialogService;
 import org.jabref.gui.actions.ActionFactory;
 import org.jabref.gui.actions.StandardActions;
@@ -19,8 +18,6 @@
 import org.jabref.model.strings.StringUtil;
 import org.jabref.preferences.PreferencesService;
 
-import com.tobiasdiez.easybind.EasyBind;
-
 /**
  * Provides context menus for the text fields of the entry editor. Note that we use {@link Supplier} to prevent an early
  * instantiation of the menus. Therefore, they are attached to each text field but instantiation happens on the first
@@ -35,11 +32,23 @@ public class EditorMenus {
      * @param textInput text-input-control that this menu will be connected to
      * @return menu containing items of the default menu and an item for normalizing person names
      */
-    public static Supplier<List<MenuItem>> getNameMenu(final TextInputControl textInput) {
+    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());
@@ -53,11 +62,31 @@ 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, PreferencesService preferencesService) {
+    public static Supplier<List<MenuItem>> getDOIMenu(
+        TextArea textArea,
+        DialogService dialogService,
+        PreferencesService preferencesService
+    ) {
         return () -> {
-            ActionFactory factory = new ActionFactory(preferencesService.getKeyBindingRepository());
-            MenuItem copyDoiMenuItem = factory.createMenuItem(StandardActions.COPY_DOI, new CopyDoiUrlAction(textArea, StandardActions.COPY_DOI, dialogService));
-            MenuItem copyDoiUrlMenuItem = factory.createMenuItem(StandardActions.COPY_DOI_URL, new CopyDoiUrlAction(textArea, StandardActions.COPY_DOI_URL, dialogService));
+            ActionFactory factory = new ActionFactory(
+                preferencesService.getKeyBindingRepository()
+            );
+            MenuItem copyDoiMenuItem = factory.createMenuItem(
+                StandardActions.COPY_DOI,
+                new CopyDoiUrlAction(
+                    textArea,
+                    StandardActions.COPY_DOI,
+                    dialogService
+                )
+            );
+            MenuItem copyDoiUrlMenuItem = factory.createMenuItem(
+                StandardActions.COPY_DOI_URL,
+                new CopyDoiUrlAction(
+                    textArea,
+                    StandardActions.COPY_DOI_URL,
+                    dialogService
+                )
+            );
             List<MenuItem> menuItems = new ArrayList<>();
             menuItems.add(copyDoiMenuItem);
             menuItems.add(copyDoiUrlMenuItem);
@@ -73,11 +102,19 @@ public static Supplier<List<MenuItem>> getDOIMenu(TextArea textArea, DialogServi
      * @param textArea text-area that this menu will be connected to
      * @return menu containing items of the default menu and an item to cleanup a URL
      */
-    public static Supplier<List<MenuItem>> getCleanupUrlMenu(TextArea textArea) {
+    public static Supplier<List<MenuItem>> getCleanupUrlMenu(
+        TextArea textArea
+    ) {
         return () -> {
-            MenuItem cleanupURL = new MenuItem(Localization.lang("Cleanup URL link"));
+            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 cd7f3a59e47..4386712e62b 100644
--- a/src/main/java/org/jabref/gui/fieldeditors/contextmenu/ProtectedTermsMenu.java
+++ b/src/main/java/org/jabref/gui/fieldeditors/contextmenu/ProtectedTermsMenu.java
@@ -2,12 +2,10 @@
 
 import java.util.Objects;
 import java.util.Optional;
-
 import javafx.scene.control.Menu;
 import javafx.scene.control.MenuItem;
 import javafx.scene.control.SeparatorMenuItem;
 import javafx.scene.control.TextInputControl;
-
 import org.jabref.gui.Globals;
 import org.jabref.gui.actions.Action;
 import org.jabref.gui.actions.ActionFactory;
@@ -22,9 +20,13 @@
 
 class ProtectedTermsMenu extends Menu {
 
-    private static final Formatter FORMATTER = new ProtectTermsFormatter(Globals.protectedTermsLoader);
+    private static final Formatter FORMATTER = new ProtectTermsFormatter(
+        Globals.protectedTermsLoader
+    );
     private final TextInputControl textInputControl;
-    private final ActionFactory factory = new ActionFactory(Globals.getKeyPrefs());
+    private final ActionFactory factory = new ActionFactory(
+        Globals.getKeyPrefs()
+    );
 
     private final Action protectSelectionActionInformation = new Action() {
         @Override
@@ -56,8 +58,11 @@ public String getDescription() {
     };
 
     private class ProtectSelectionAction extends SimpleCommand {
+
         ProtectSelectionAction() {
-            this.executable.bind(textInputControl.selectedTextProperty().isNotEmpty());
+            this.executable.bind(
+                    textInputControl.selectedTextProperty().isNotEmpty()
+                );
         }
 
         @Override
@@ -72,36 +77,45 @@ public void execute() {
             if (selectedText.endsWith(" ")) {
                 lastStr = "} ";
             }
-            textInputControl.replaceSelection(firstStr + selectedText.strip() + lastStr);
+            textInputControl.replaceSelection(
+                firstStr + selectedText.strip() + lastStr
+            );
         }
     }
 
     private class UnprotectSelectionAction extends SimpleCommand {
 
         public UnprotectSelectionAction() {
-            this.executable.bind(textInputControl.selectedTextProperty().isNotEmpty());
+            this.executable.bind(
+                    textInputControl.selectedTextProperty().isNotEmpty()
+                );
         }
 
         @Override
         public void execute() {
             String selectedText = textInputControl.getSelectedText();
-            String formattedString = new UnprotectTermsFormatter().format(selectedText);
+            String formattedString = new UnprotectTermsFormatter()
+                .format(selectedText);
             textInputControl.replaceSelection(formattedString);
         }
     }
 
     private class FormatFieldAction extends SimpleCommand {
+
         FormatFieldAction() {
             this.executable.bind(textInputControl.textProperty().isNotEmpty());
         }
 
         @Override
         public void execute() {
-            textInputControl.setText(FORMATTER.format(textInputControl.getText()));
+            textInputControl.setText(
+                FORMATTER.format(textInputControl.getText())
+            );
         }
     }
 
     private class AddToProtectedTermsAction extends SimpleCommand {
+
         ProtectedTermsList list;
 
         public AddToProtectedTermsAction(ProtectedTermsList list) {
@@ -129,7 +143,9 @@ public void execute() {
                 list.addProtectedTerm(text.substring(beginIdx, endIdx));
             } else {
                 // Remove leading and trailing whitespaces
-                list.addProtectedTerm(textInputControl.getSelectedText().strip());
+                list.addProtectedTerm(
+                    textInputControl.getSelectedText().strip()
+                );
             }
         }
     }
@@ -138,23 +154,49 @@ public ProtectedTermsMenu(final TextInputControl textInputControl) {
         super(Localization.lang("Protect terms"));
         this.textInputControl = textInputControl;
 
-        getItems().addAll(factory.createMenuItem(protectSelectionActionInformation, new ProtectSelectionAction()),
+        getItems()
+            .addAll(
+                factory.createMenuItem(
+                    protectSelectionActionInformation,
+                    new ProtectSelectionAction()
+                ),
                 getExternalFilesMenu(),
                 new SeparatorMenuItem(),
-                factory.createMenuItem(() -> Localization.lang("Format field"), new FormatFieldAction()),
-                factory.createMenuItem(unprotectSelectionActionInformation, new UnprotectSelectionAction()));
+                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"));
-
-        Globals.protectedTermsLoader.getProtectedTermsLists().stream()
-                                    .filter(list -> !list.isInternalList())
-                                    .forEach(list -> protectedTermsMenu.getItems().add(
-                                            factory.createMenuItem(list::getDescription, new AddToProtectedTermsAction(list))));
+        Menu protectedTermsMenu = factory.createSubMenu(() ->
+            Localization.lang("Add selected text to list")
+        );
+
+        Globals.protectedTermsLoader
+            .getProtectedTermsLists()
+            .stream()
+            .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"));
+            MenuItem emptyItem = new MenuItem(
+                Localization.lang("No list enabled")
+            );
             emptyItem.setDisable(true);
             protectedTermsMenu.getItems().add(emptyItem);
         }
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 3d77efb0beb..aeda1405cde 100644
--- a/src/main/java/org/jabref/gui/fieldeditors/identifier/BaseIdentifierEditorViewModel.java
+++ b/src/main/java/org/jabref/gui/fieldeditors/identifier/BaseIdentifierEditorViewModel.java
@@ -1,15 +1,13 @@
 package org.jabref.gui.fieldeditors.identifier;
 
+import com.tobiasdiez.easybind.EasyBind;
 import java.io.IOException;
 import java.util.Optional;
-
-import javax.swing.undo.UndoManager;
-
 import javafx.beans.property.BooleanProperty;
 import javafx.beans.property.ObjectProperty;
 import javafx.beans.property.SimpleBooleanProperty;
 import javafx.beans.property.SimpleObjectProperty;
-
+import javax.swing.undo.UndoManager;
 import org.jabref.gui.DialogService;
 import org.jabref.gui.autocompleter.SuggestionProvider;
 import org.jabref.gui.desktop.JabRefDesktop;
@@ -25,30 +23,38 @@
 import org.jabref.model.entry.field.Field;
 import org.jabref.model.entry.identifier.Identifier;
 import org.jabref.preferences.PreferencesService;
-
-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);
+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 identifierLookupInProgress =
+        new SimpleBooleanProperty(false);
+    protected final BooleanProperty canLookupIdentifier =
+        new SimpleBooleanProperty(true);
+    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 PreferencesService preferences;
 
-    public BaseIdentifierEditorViewModel(Field field,
-                                         SuggestionProvider<?> suggestionProvider,
-                                         FieldCheckers fieldCheckers,
-                                         DialogService dialogService,
-                                         TaskExecutor taskExecutor,
-                                         PreferencesService preferences,
-                                         UndoManager undoManager) {
+    public BaseIdentifierEditorViewModel(
+        Field field,
+        SuggestionProvider<?> suggestionProvider,
+        FieldCheckers fieldCheckers,
+        DialogService dialogService,
+        TaskExecutor taskExecutor,
+        PreferencesService preferences,
+        UndoManager undoManager
+    ) {
         super(field, suggestionProvider, fieldCheckers, undoManager);
         this.dialogService = dialogService;
         this.taskExecutor = taskExecutor;
@@ -62,9 +68,14 @@ 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);
+        this.canFetchBibliographyInformationById.set(
+                canFetchBibliographyInformationById
+            );
     }
 
     protected Optional<T> updateIdentifier() {
@@ -76,16 +87,37 @@ protected Optional<T> updateIdentifier() {
         return identifier.get();
     }
 
-    protected void handleIdentifierFetchingError(Exception exception, IdFetcher<T> fetcher) {
+    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,22 +154,36 @@ 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) {
-        LOGGER.warn("Unable to lookup identifier for '{}'", field.getDisplayName());
+        LOGGER.warn(
+            "Unable to lookup identifier for '{}'",
+            field.getDisplayName()
+        );
     }
 
     public void openExternalLink() {
-        identifier.get().flatMap(Identifier::getExternalURI).ifPresent(url -> {
-                    try {
-                        JabRefDesktop.openBrowser(url, preferences.getFilePreferences());
-                    } catch (IOException ex) {
-                        dialogService.showErrorDialogAndWait(Localization.lang("Unable to open link."), ex);
-                    }
+        identifier
+            .get()
+            .flatMap(Identifier::getExternalURI)
+            .ifPresent(url -> {
+                try {
+                    JabRefDesktop.openBrowser(
+                        url,
+                        preferences.getFilePreferences()
+                    );
+                } catch (IOException ex) {
+                    dialogService.showErrorDialogAndWait(
+                        Localization.lang("Unable to open link."),
+                        ex
+                    );
                 }
-        );
+            });
     }
 
     @Override
@@ -145,6 +191,9 @@ 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 319de49cc22..03fdfe58304 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,6 @@
 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 +15,37 @@
 import org.jabref.model.entry.field.StandardField;
 import org.jabref.model.entry.identifier.DOI;
 import org.jabref.preferences.PreferencesService;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-public class DoiIdentifierEditorViewModel extends BaseIdentifierEditorViewModel<DOI> {
-    public static final Logger LOGGER = LoggerFactory.getLogger(DoiIdentifierEditorViewModel.class);
+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,
-                                        PreferencesService preferences,
-                                        UndoManager undoManager,
-                                        StateManager stateManager) {
-        super(StandardField.DOI, suggestionProvider, fieldCheckers, dialogService, taskExecutor, preferences, undoManager);
+    public DoiIdentifierEditorViewModel(
+        SuggestionProvider<?> suggestionProvider,
+        FieldCheckers fieldCheckers,
+        DialogService dialogService,
+        TaskExecutor taskExecutor,
+        PreferencesService preferences,
+        UndoManager undoManager,
+        StateManager stateManager
+    ) {
+        super(
+            StandardField.DOI,
+            suggestionProvider,
+            fieldCheckers,
+            dialogService,
+            taskExecutor,
+            preferences,
+            undoManager
+        );
         this.undoManager = undoManager;
         this.stateManager = stateManager;
         configure(true, true);
@@ -43,30 +55,51 @@ public DoiIdentifierEditorViewModel(SuggestionProvider<?> suggestionProvider,
     public void lookupIdentifier(BibEntry bibEntry) {
         CrossRef doiFetcher = new CrossRef();
 
-        BackgroundTask.wrap(() -> doiFetcher.findIdentifier(entry))
+        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()));
+                    dialogService.notify(
+                        Localization.lang("No %0 found", field.getDisplayName())
+                    );
                 }
-            }).onFailure(e -> handleIdentifierFetchingError(e, doiFetcher)).executeWith(taskExecutor);
+            })
+            .onFailure(e -> handleIdentifierFetchingError(e, doiFetcher))
+            .executeWith(taskExecutor);
     }
 
     @Override
     public void fetchBibliographyInformation(BibEntry bibEntry) {
-        stateManager.getActiveDatabase().ifPresentOrElse(
-                databaseContext -> new FetchAndMergeEntry(databaseContext, taskExecutor, preferences, dialogService, undoManager)
+        stateManager
+            .getActiveDatabase()
+            .ifPresentOrElse(
+                databaseContext ->
+                    new FetchAndMergeEntry(
+                        databaseContext,
+                        taskExecutor,
+                        preferences,
+                        dialogService,
+                        undoManager
+                    )
                         .fetchAndMerge(entry, field),
-                () -> dialogService.notify(Localization.lang("No library selected"))
-        );
+                () ->
+                    dialogService.notify(
+                        Localization.lang("No library selected")
+                    )
+            );
     }
 
     @Override
     public void openExternalLink() {
-        identifier.get().map(DOI::getDOI)
-                  .ifPresent(s -> JabRefDesktop.openCustomDoi(s, preferences, dialogService));
+        identifier
+            .get()
+            .map(DOI::getDOI)
+            .ifPresent(s ->
+                JabRefDesktop.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 59c34f2cea5..0dc4ba349d9 100644
--- a/src/main/java/org/jabref/gui/fieldeditors/identifier/EprintIdentifierEditorViewModel.java
+++ b/src/main/java/org/jabref/gui/fieldeditors/identifier/EprintIdentifierEditorViewModel.java
@@ -1,10 +1,9 @@
 package org.jabref.gui.fieldeditors.identifier;
 
-import javax.swing.undo.UndoManager;
-
+import com.tobiasdiez.easybind.EasyBind;
 import javafx.collections.MapChangeListener;
 import javafx.collections.WeakMapChangeListener;
-
+import javax.swing.undo.UndoManager;
 import org.jabref.gui.DialogService;
 import org.jabref.gui.autocompleter.SuggestionProvider;
 import org.jabref.gui.util.TaskExecutor;
@@ -17,38 +16,51 @@
 import org.jabref.model.entry.identifier.EprintIdentifier;
 import org.jabref.preferences.PreferencesService;
 
-import com.tobiasdiez.easybind.EasyBind;
-
-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
     // 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();
-        }
-    };
+    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,
-                                           PreferencesService preferences,
-                                           UndoManager undoManager) {
-        super(StandardField.EPRINT, suggestionProvider, fieldCheckers, dialogService, taskExecutor, preferences, undoManager);
+    public EprintIdentifierEditorViewModel(
+        SuggestionProvider<?> suggestionProvider,
+        FieldCheckers fieldCheckers,
+        DialogService dialogService,
+        TaskExecutor taskExecutor,
+        PreferencesService 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);
-                }
-            });
-        });
+        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
@@ -57,6 +69,8 @@ public void bindToEntry(BibEntry 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
         // 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 2317f8183e4..bb298c360c8 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,6 @@
 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 +13,30 @@
 import org.jabref.model.entry.identifier.ISBN;
 import org.jabref.preferences.PreferencesService;
 
-public class ISBNIdentifierEditorViewModel extends BaseIdentifierEditorViewModel<ISBN> {
+public class ISBNIdentifierEditorViewModel
+    extends BaseIdentifierEditorViewModel<ISBN> {
+
     private final UndoManager undoManager;
     private final StateManager stateManager;
 
-    public ISBNIdentifierEditorViewModel(SuggestionProvider<?> suggestionProvider,
-                                         FieldCheckers fieldCheckers,
-                                         DialogService dialogService,
-                                         TaskExecutor taskExecutor,
-                                         PreferencesService preferences,
-                                         UndoManager undoManager,
-                                         StateManager stateManager) {
-        super(StandardField.ISBN, suggestionProvider, fieldCheckers, dialogService, taskExecutor, preferences, undoManager);
+    public ISBNIdentifierEditorViewModel(
+        SuggestionProvider<?> suggestionProvider,
+        FieldCheckers fieldCheckers,
+        DialogService dialogService,
+        TaskExecutor taskExecutor,
+        PreferencesService 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 +44,22 @@ public ISBNIdentifierEditorViewModel(SuggestionProvider<?> suggestionProvider,
 
     @Override
     public void fetchBibliographyInformation(BibEntry bibEntry) {
-        stateManager.getActiveDatabase().ifPresentOrElse(
-                databaseContext -> new FetchAndMergeEntry(databaseContext, taskExecutor, preferences, dialogService, undoManager)
+        stateManager
+            .getActiveDatabase()
+            .ifPresentOrElse(
+                databaseContext ->
+                    new FetchAndMergeEntry(
+                        databaseContext,
+                        taskExecutor,
+                        preferences,
+                        dialogService,
+                        undoManager
+                    )
                         .fetchAndMerge(entry, field),
-                () -> dialogService.notify(Localization.lang("No library selected"))
-        );
+                () ->
+                    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 567f6c45047..f82d91d6048 100644
--- a/src/main/java/org/jabref/gui/fieldeditors/identifier/IdentifierEditor.java
+++ b/src/main/java/org/jabref/gui/fieldeditors/identifier/IdentifierEditor.java
@@ -1,15 +1,19 @@
 package org.jabref.gui.fieldeditors.identifier;
 
-import java.util.Optional;
-
-import javax.swing.undo.UndoManager;
+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 com.airhacks.afterburner.injection.Injector;
+import com.airhacks.afterburner.views.ViewLoader;
+import jakarta.inject.Inject;
+import java.util.Optional;
 import javafx.fxml.FXML;
 import javafx.scene.Parent;
 import javafx.scene.control.Button;
 import javafx.scene.control.Tooltip;
 import javafx.scene.layout.HBox;
-
+import javax.swing.undo.UndoManager;
 import org.jabref.gui.DialogService;
 import org.jabref.gui.StateManager;
 import org.jabref.gui.autocompleter.SuggestionProvider;
@@ -25,69 +29,120 @@
 import org.jabref.model.entry.field.Field;
 import org.jabref.preferences.PreferencesService;
 
-import com.airhacks.afterburner.injection.Injector;
-import com.airhacks.afterburner.views.ViewLoader;
-import jakarta.inject.Inject;
+public class IdentifierEditor extends HBox implements FieldEditorFX {
 
-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;
+    @FXML
+    private BaseIdentifierEditorViewModel<?> viewModel;
 
-public class IdentifierEditor extends HBox implements FieldEditorFX {
+    @FXML
+    private EditorTextArea textArea;
 
-    @FXML private BaseIdentifierEditorViewModel<?> viewModel;
-    @FXML private EditorTextArea textArea;
-    @FXML private Button fetchInformationByIdentifierButton;
-    @FXML private Button lookupIdentifierButton;
+    @FXML
+    private Button fetchInformationByIdentifierButton;
 
-    @Inject private DialogService dialogService;
-    @Inject private TaskExecutor taskExecutor;
-    @Inject private PreferencesService preferencesService;
-    @Inject private UndoManager undoManager;
-    @Inject private StateManager stateManager;
+    @FXML
+    private Button lookupIdentifierButton;
 
-    private Optional<BibEntry> entry = Optional.empty();
+    @Inject
+    private DialogService dialogService;
+
+    @Inject
+    private TaskExecutor taskExecutor;
+
+    @Inject
+    private PreferencesService preferencesService;
+
+    @Inject
+    private UndoManager undoManager;
 
-    public IdentifierEditor(Field field,
-                            SuggestionProvider<?> suggestionProvider,
-                            FieldCheckers fieldCheckers) {
+    @Inject
+    private StateManager stateManager;
 
+    private Optional<BibEntry> entry = Optional.empty();
+
+    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.
         Injector.registerExistingAndInject(this);
 
         switch (field) {
-            case DOI ->
-                    this.viewModel = new DoiIdentifierEditorViewModel(suggestionProvider, fieldCheckers, dialogService, taskExecutor, preferencesService, undoManager, stateManager);
-            case ISBN ->
-                    this.viewModel = new ISBNIdentifierEditorViewModel(suggestionProvider, fieldCheckers, dialogService, taskExecutor, preferencesService, undoManager, stateManager);
-            case EPRINT ->
-                    this.viewModel = new EprintIdentifierEditorViewModel(suggestionProvider, fieldCheckers, dialogService, taskExecutor, preferencesService, undoManager);
-
+            case DOI -> this.viewModel =
+                new DoiIdentifierEditorViewModel(
+                    suggestionProvider,
+                    fieldCheckers,
+                    dialogService,
+                    taskExecutor,
+                    preferencesService,
+                    undoManager,
+                    stateManager
+                );
+            case ISBN -> this.viewModel =
+                new ISBNIdentifierEditorViewModel(
+                    suggestionProvider,
+                    fieldCheckers,
+                    dialogService,
+                    taskExecutor,
+                    preferencesService,
+                    undoManager,
+                    stateManager
+                );
+            case EPRINT -> this.viewModel =
+                new EprintIdentifierEditorViewModel(
+                    suggestionProvider,
+                    fieldCheckers,
+                    dialogService,
+                    taskExecutor,
+                    preferencesService,
+                    undoManager
+                );
             case null, default -> {
                 assert field != null;
-                throw new IllegalStateException(String.format("Unable to instantiate a view model for identifier field editor '%s'", field.getDisplayName()));
+                throw new IllegalStateException(
+                    String.format(
+                        "Unable to instantiate a view model for identifier field editor '%s'",
+                        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())));
+            new Tooltip(Localization.lang("Look up %0", field.getDisplayName()))
+        );
 
         if (field.equals(DOI)) {
-            textArea.initContextMenu(EditorMenus.getDOIMenu(textArea, dialogService, preferencesService));
+            textArea.initContextMenu(
+                EditorMenus.getDOIMenu(
+                    textArea,
+                    dialogService,
+                    preferencesService
+                )
+            );
         } else {
             textArea.initContextMenu(new DefaultMenu(textArea));
         }
 
-        new EditorValidator(preferencesService).configureValidation(viewModel.getFieldValidator().getValidationStatus(), textArea);
+        new EditorValidator(preferencesService)
+            .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 adffd08e287..9dba994d2a9 100644
--- a/src/main/java/org/jabref/gui/fieldeditors/journalinfo/JournalInfoView.java
+++ b/src/main/java/org/jabref/gui/fieldeditors/journalinfo/JournalInfoView.java
@@ -1,39 +1,64 @@
 package org.jabref.gui.fieldeditors.journalinfo;
 
+import com.airhacks.afterburner.views.ViewLoader;
 import java.util.Objects;
-
 import javafx.fxml.FXML;
 import javafx.scene.Node;
 import javafx.scene.chart.LineChart;
 import javafx.scene.control.Label;
 import javafx.scene.layout.VBox;
-
 import org.jabref.logic.importer.FetcherException;
 
-import com.airhacks.afterburner.views.ViewLoader;
-
 public class JournalInfoView extends VBox {
-    @FXML private Label title;
-    @FXML private Label categories;
-    @FXML private Label publisher;
-    @FXML private Label hIndex;
-    @FXML private Label issn;
-    @FXML private LineChart<String, Double> sjrChart;
-    @FXML private LineChart<String, Double> citableDocsPrevious3YearsChart;
-    @FXML private LineChart<String, Double> citesOutgoingChart;
-    @FXML private LineChart<String, Double> citesOutgoingPerDocChart;
-    @FXML private LineChart<String, Double> citesIncomingByRecentlyPublishedChart;
-    @FXML private LineChart<String, Double> docsThisYearChart;
+
+    @FXML
+    private Label title;
+
+    @FXML
+    private Label categories;
+
+    @FXML
+    private Label publisher;
+
+    @FXML
+    private Label hIndex;
+
+    @FXML
+    private Label issn;
+
+    @FXML
+    private LineChart<String, Double> sjrChart;
+
+    @FXML
+    private LineChart<String, Double> citableDocsPrevious3YearsChart;
+
+    @FXML
+    private LineChart<String, Double> citesOutgoingChart;
+
+    @FXML
+    private LineChart<String, Double> citesOutgoingPerDocChart;
+
+    @FXML
+    private LineChart<String, Double> citesIncomingByRecentlyPublishedChart;
+
+    @FXML
+    private LineChart<String, Double> docsThisYearChart;
+
     private final JournalInfoViewModel viewModel;
 
     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());
@@ -43,7 +68,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;
     }
@@ -54,10 +80,16 @@ public Node getNode() {
 
     private void bindChartProperties() {
         sjrChart.setData(viewModel.getSjrData());
-        citableDocsPrevious3YearsChart.setData(viewModel.getCitableDocsPrevious3YearsData());
+        citableDocsPrevious3YearsChart.setData(
+            viewModel.getCitableDocsPrevious3YearsData()
+        );
         citesOutgoingChart.setData(viewModel.getCitesOutgoingData());
-        citesOutgoingPerDocChart.setData(viewModel.getCitesOutgoingPerDocData());
-        citesIncomingByRecentlyPublishedChart.setData(viewModel.getCitesIncomingByRecentlyPublishedData());
+        citesOutgoingPerDocChart.setData(
+            viewModel.getCitesOutgoingPerDocData()
+        );
+        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 671bcc3024b..936c09c66ef 100644
--- a/src/main/java/org/jabref/gui/fieldeditors/journalinfo/JournalInfoViewModel.java
+++ b/src/main/java/org/jabref/gui/fieldeditors/journalinfo/JournalInfoViewModel.java
@@ -4,36 +4,52 @@
 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;
 import javafx.scene.chart.XYChart;
 import javafx.util.Pair;
-
 import org.jabref.gui.AbstractViewModel;
 import org.jabref.logic.importer.FetcherException;
 import org.jabref.logic.importer.fetcher.JournalInformationFetcher;
 import org.jabref.logic.journals.JournalInformation;
 
 public class JournalInfoViewModel extends AbstractViewModel {
+
     private final ReadOnlyStringWrapper title = new ReadOnlyStringWrapper();
     private final ReadOnlyStringWrapper country = new ReadOnlyStringWrapper();
-    private final ReadOnlyStringWrapper categories = new ReadOnlyStringWrapper();
+    private final ReadOnlyStringWrapper categories =
+        new ReadOnlyStringWrapper();
     private final ReadOnlyStringWrapper publisher = new ReadOnlyStringWrapper();
     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);
+    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());
@@ -45,11 +61,23 @@ public void populateJournalInformation(String issn, String journalName) throws F
             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()));
+            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())
+            );
         });
     }
 
@@ -145,41 +173,61 @@ public ObservableList<XYChart.Series<String, Double>> getSnipData() {
         return snipData;
     }
 
-    public ObservableList<XYChart.Series<String, Double>> getCitableDocsPrevious3YearsData() {
+    public ObservableList<
+        XYChart.Series<String, Double>
+    > getCitableDocsPrevious3YearsData() {
         return citableDocsPrevious3YearsData;
     }
 
-    public ObservableList<XYChart.Series<String, Double>> getCitesOutgoingData() {
+    public ObservableList<
+        XYChart.Series<String, Double>
+    > getCitesOutgoingData() {
         return citesOutgoingData;
     }
 
-    public ObservableList<XYChart.Series<String, Double>> getCitesOutgoingPerDocData() {
+    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;
     }
 
-    public ObservableList<XYChart.Series<String, Double>> getDocsThisYearData() {
+    public ObservableList<
+        XYChart.Series<String, Double>
+    > getDocsThisYearData() {
         return docsThisYearData;
     }
 
-    public XYChart.Series<String, Double> convertToSeries(List<Pair<Integer, Double>> data) {
+    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()))
+        data
+            .stream()
+            .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"));
+    private static String getFormattedCategories(
+        JournalInformation journalInformation
+    ) {
+        return Arrays
+            .stream(journalInformation.categories().split(","))
+            .map(String::trim)
+            .collect(Collectors.joining("\n"));
     }
 
-    private static String getFormattedPublisher(JournalInformation journalInformation) {
+    private static String getFormattedPublisher(
+        JournalInformation journalInformation
+    ) {
         StringBuilder publisher = new StringBuilder();
         publisher.append(journalInformation.publisher());
         String country = journalInformation.country();
diff --git a/src/main/java/org/jabref/gui/groups/GroupDescriptions.java b/src/main/java/org/jabref/gui/groups/GroupDescriptions.java
index 5023f77e5f0..1151d57eac5 100644
--- a/src/main/java/org/jabref/gui/groups/GroupDescriptions.java
+++ b/src/main/java/org/jabref/gui/groups/GroupDescriptions.java
@@ -8,14 +8,19 @@
 
 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) {
-            sb.append("<i>").append(StringUtil.quoteForHTML(keywordGroup.getName())).append("</i>");
+            sb
+                .append("<i>")
+                .append(StringUtil.quoteForHTML(keywordGroup.getName()))
+                .append("</i>");
         } else {
             sb.append(StringUtil.quoteForHTML(keywordGroup.getName()));
         }
@@ -41,9 +46,15 @@ public static String getShortDescriptionKeywordGroup(KeywordGroup keywordGroup,
         return sb.toString();
     }
 
-    public static String getShortDescriptionExplicitGroup(ExplicitGroup explicitGroup) {
+    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"));
@@ -58,14 +69,22 @@ public static String getShortDescriptionExplicitGroup(ExplicitGroup explicitGrou
     }
 
     public static String getShortDescriptionAllEntriesGroup() {
-        return Localization.lang("<b>All Entries</b> (this group cannot be edited or removed)");
+        return Localization.lang(
+            "<b>All Entries</b> (this group cannot be edited or removed)"
+        );
     }
 
-    public static String getShortDescription(SearchGroup searchGroup, boolean showDynamic) {
+    public static String getShortDescription(
+        SearchGroup searchGroup,
+        boolean showDynamic
+    ) {
         StringBuilder sb = new StringBuilder();
         sb.append("<b>");
         if (showDynamic) {
-            sb.append("<i>").append(StringUtil.quoteForHTML(searchGroup.getName())).append("</i>");
+            sb
+                .append("<i>")
+                .append(StringUtil.quoteForHTML(searchGroup.getName()))
+                .append("</i>");
         } else {
             sb.append(StringUtil.quoteForHTML(searchGroup.getName()));
         }
@@ -73,7 +92,10 @@ 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 0cf5d92b173..45f8625489c 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 0a7c76d0fe4..6005e7465e8 100644
--- a/src/main/java/org/jabref/gui/groups/GroupDialogView.java
+++ b/src/main/java/org/jabref/gui/groups/GroupDialogView.java
@@ -1,9 +1,11 @@
 package org.jabref.gui.groups;
 
+import com.airhacks.afterburner.views.ViewLoader;
+import de.saxsys.mvvmfx.utils.validation.visualization.ControlsFxVisualizer;
+import jakarta.inject.Inject;
 import java.util.EnumMap;
 import java.util.EnumSet;
 import java.util.ServiceLoader;
-
 import javafx.application.Platform;
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableList;
@@ -25,7 +27,10 @@
 import javafx.scene.layout.CornerRadii;
 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.icon.IconTheme;
 import org.jabref.gui.icon.JabrefIconProvider;
@@ -40,14 +45,6 @@
 import org.jabref.model.search.rules.SearchRules.SearchFlags;
 import org.jabref.model.util.FileUpdateMonitor;
 import org.jabref.preferences.PreferencesService;
-
-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.kordamp.ikonli.Ikon;
 import org.kordamp.ikonli.IkonProvider;
 import org.kordamp.ikonli.javafx.FontIcon;
@@ -55,60 +52,113 @@
 public class GroupDialogView extends BaseDialog<AbstractGroup> {
 
     // Basic Settings
-    @FXML private TextField nameField;
-    @FXML private TextField descriptionField;
-    @FXML private TextField iconField;
-    @FXML private Button iconPickerButton;
-    @FXML private ColorPicker colorField;
-    @FXML private ComboBox<GroupHierarchyType> hierarchicalContextCombo;
+    @FXML
+    private TextField nameField;
+
+    @FXML
+    private TextField descriptionField;
+
+    @FXML
+    private TextField iconField;
+
+    @FXML
+    private Button iconPickerButton;
+
+    @FXML
+    private ColorPicker colorField;
+
+    @FXML
+    private ComboBox<GroupHierarchyType> hierarchicalContextCombo;
 
     // Type
-    @FXML private RadioButton explicitRadioButton;
-    @FXML private RadioButton keywordsRadioButton;
-    @FXML private RadioButton searchRadioButton;
-    @FXML private RadioButton autoRadioButton;
-    @FXML private RadioButton texRadioButton;
+    @FXML
+    private RadioButton explicitRadioButton;
+
+    @FXML
+    private RadioButton keywordsRadioButton;
+
+    @FXML
+    private RadioButton searchRadioButton;
+
+    @FXML
+    private RadioButton autoRadioButton;
+
+    @FXML
+    private RadioButton texRadioButton;
 
     // Option Groups
-    @FXML private TextField keywordGroupSearchTerm;
-    @FXML private TextField keywordGroupSearchField;
-    @FXML private CheckBox keywordGroupCaseSensitive;
-    @FXML private CheckBox keywordGroupRegex;
+    @FXML
+    private TextField keywordGroupSearchTerm;
+
+    @FXML
+    private TextField keywordGroupSearchField;
+
+    @FXML
+    private CheckBox keywordGroupCaseSensitive;
 
-    @FXML private TextField searchGroupSearchTerm;
-    @FXML private CheckBox searchGroupCaseSensitive;
-    @FXML private CheckBox searchGroupRegex;
+    @FXML
+    private CheckBox keywordGroupRegex;
 
-    @FXML private RadioButton autoGroupKeywordsOption;
-    @FXML private TextField autoGroupKeywordsField;
-    @FXML private TextField autoGroupKeywordsDeliminator;
-    @FXML private TextField autoGroupKeywordsHierarchicalDeliminator;
-    @FXML private RadioButton autoGroupPersonsOption;
-    @FXML private TextField autoGroupPersonsField;
+    @FXML
+    private TextField searchGroupSearchTerm;
 
-    @FXML private TextField texGroupFilePath;
+    @FXML
+    private CheckBox searchGroupCaseSensitive;
 
-    private final EnumMap<GroupHierarchyType, String> hierarchyText = new EnumMap<>(GroupHierarchyType.class);
-    private final EnumMap<GroupHierarchyType, String> hierarchyToolTip = new EnumMap<>(GroupHierarchyType.class);
+    @FXML
+    private CheckBox searchGroupRegex;
 
-    private final ControlsFxVisualizer validationVisualizer = new ControlsFxVisualizer();
+    @FXML
+    private RadioButton autoGroupKeywordsOption;
+
+    @FXML
+    private TextField autoGroupKeywordsField;
+
+    @FXML
+    private TextField autoGroupKeywordsDeliminator;
+
+    @FXML
+    private TextField autoGroupKeywordsHierarchicalDeliminator;
+
+    @FXML
+    private RadioButton autoGroupPersonsOption;
+
+    @FXML
+    private TextField autoGroupPersonsField;
+
+    @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 ControlsFxVisualizer validationVisualizer =
+        new ControlsFxVisualizer();
 
     private final BibDatabaseContext currentDatabase;
     private final AbstractGroup editedGroup;
     private GroupDialogViewModel viewModel;
-    @Inject private FileUpdateMonitor fileUpdateMonitor;
-    @Inject private DialogService dialogService;
-    @Inject private PreferencesService preferencesService;
 
-    public GroupDialogView(BibDatabaseContext currentDatabase,
-                           AbstractGroup editedGroup,
-                           GroupDialogHeader groupDialogHeader) {
+    @Inject
+    private FileUpdateMonitor fileUpdateMonitor;
+
+    @Inject
+    private DialogService dialogService;
+
+    @Inject
+    private PreferencesService preferencesService;
+
+    public GroupDialogView(
+        BibDatabaseContext currentDatabase,
+        AbstractGroup editedGroup,
+        GroupDialogHeader groupDialogHeader
+    ) {
         this.currentDatabase = currentDatabase;
         this.editedGroup = editedGroup;
 
-        ViewLoader.view(this)
-                  .load()
-                  .setAsDialogPane(this);
+        ViewLoader.view(this).load().setAsDialogPane(this);
 
         if (editedGroup == null) {
             if (groupDialogHeader == GroupDialogHeader.GROUP) {
@@ -117,94 +167,231 @@ public GroupDialogView(BibDatabaseContext currentDatabase,
                 this.setTitle(Localization.lang("Add subgroup"));
             }
         } else {
-            this.setTitle(Localization.lang("Edit group") + " " + editedGroup.getName());
+            this.setTitle(
+                    Localization.lang("Edit group") +
+                    " " +
+                    editedGroup.getName()
+                );
         }
 
-        getDialogPane().getButtonTypes().setAll(ButtonType.OK, ButtonType.CANCEL);
+        getDialogPane()
+            .getButtonTypes()
+            .setAll(ButtonType.OK, ButtonType.CANCEL);
 
-        final Button confirmDialogButton = (Button) getDialogPane().lookupButton(ButtonType.OK);
-        confirmDialogButton.disableProperty().bind(viewModel.validationStatus().validProperty().not());
+        final Button confirmDialogButton = (Button) getDialogPane()
+            .lookupButton(ButtonType.OK);
+        confirmDialogButton
+            .disableProperty()
+            .bind(viewModel.validationStatus().validProperty().not());
         // handle validation before closing dialog and calling resultConverter
-        confirmDialogButton.addEventFilter(ActionEvent.ACTION, viewModel::validationHandler);
+        confirmDialogButton.addEventFilter(
+            ActionEvent.ACTION,
+            viewModel::validationHandler
+        );
     }
 
     @FXML
     public void initialize() {
-        viewModel = new GroupDialogViewModel(dialogService, currentDatabase, preferencesService, editedGroup, fileUpdateMonitor);
+        viewModel =
+            new GroupDialogViewModel(
+                dialogService,
+                currentDatabase,
+                preferencesService,
+                editedGroup,
+                fileUpdateMonitor
+            );
 
         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"));
-        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"));
-        hierarchyText.put(GroupHierarchyType.INDEPENDENT, Localization.lang("Independent"));
-        hierarchyToolTip.put(GroupHierarchyType.INDEPENDENT, Localization.lang("Independent group: When selected, view only this group's entries"));
+        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"
+            )
+        );
+        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"
+            )
+        );
+        hierarchyText.put(
+            GroupHierarchyType.INDEPENDENT,
+            Localization.lang("Independent")
+        );
+        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());
+        descriptionField
+            .textProperty()
+            .bindBidirectional(viewModel.descriptionProperty());
         iconField.textProperty().bindBidirectional(viewModel.iconProperty());
-        colorField.valueProperty().bindBidirectional(viewModel.colorFieldProperty());
-        hierarchicalContextCombo.itemsProperty().bind(viewModel.groupHierarchyListProperty());
+        colorField
+            .valueProperty()
+            .bindBidirectional(viewModel.colorFieldProperty());
+        hierarchicalContextCombo
+            .itemsProperty()
+            .bind(viewModel.groupHierarchyListProperty());
         new ViewModelListCellFactory<GroupHierarchyType>()
-                .withText(hierarchyText::get)
-                .withStringTooltip(hierarchyToolTip::get)
-                .install(hierarchicalContextCombo);
-        hierarchicalContextCombo.valueProperty().bindBidirectional(viewModel.groupHierarchySelectedProperty());
-
-        explicitRadioButton.selectedProperty().bindBidirectional(viewModel.typeExplicitProperty());
-        keywordsRadioButton.selectedProperty().bindBidirectional(viewModel.typeKeywordsProperty());
-        searchRadioButton.selectedProperty().bindBidirectional(viewModel.typeSearchProperty());
-        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());
-        searchGroupCaseSensitive.setSelected(viewModel.searchFlagsProperty().getValue().contains(SearchFlags.CASE_SENSITIVE));
-        searchGroupCaseSensitive.selectedProperty().addListener((observable, oldValue, newValue) -> {
-            EnumSet<SearchFlags> searchFlags = viewModel.searchFlagsProperty().get();
-            if (newValue) {
-                searchFlags.add(SearchRules.SearchFlags.CASE_SENSITIVE);
-            } else {
-                searchFlags.remove(SearchRules.SearchFlags.CASE_SENSITIVE);
-            }
-            viewModel.searchFlagsProperty().set(searchFlags);
-        });
-        searchGroupRegex.setSelected(viewModel.searchFlagsProperty().getValue().contains(SearchFlags.REGULAR_EXPRESSION));
-        searchGroupRegex.selectedProperty().addListener((observable, oldValue, newValue) -> {
-            EnumSet<SearchFlags> searchFlags = viewModel.searchFlagsProperty().get();
-            if (newValue) {
-                searchFlags.add(SearchRules.SearchFlags.REGULAR_EXPRESSION);
-            } else {
-                searchFlags.remove(SearchRules.SearchFlags.REGULAR_EXPRESSION);
-            }
-            viewModel.searchFlagsProperty().set(searchFlags);
-        });
-
-        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());
+            .withText(hierarchyText::get)
+            .withStringTooltip(hierarchyToolTip::get)
+            .install(hierarchicalContextCombo);
+        hierarchicalContextCombo
+            .valueProperty()
+            .bindBidirectional(viewModel.groupHierarchySelectedProperty());
+
+        explicitRadioButton
+            .selectedProperty()
+            .bindBidirectional(viewModel.typeExplicitProperty());
+        keywordsRadioButton
+            .selectedProperty()
+            .bindBidirectional(viewModel.typeKeywordsProperty());
+        searchRadioButton
+            .selectedProperty()
+            .bindBidirectional(viewModel.typeSearchProperty());
+        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());
+        searchGroupCaseSensitive.setSelected(
+            viewModel
+                .searchFlagsProperty()
+                .getValue()
+                .contains(SearchFlags.CASE_SENSITIVE)
+        );
+        searchGroupCaseSensitive
+            .selectedProperty()
+            .addListener((observable, oldValue, newValue) -> {
+                EnumSet<SearchFlags> searchFlags = viewModel
+                    .searchFlagsProperty()
+                    .get();
+                if (newValue) {
+                    searchFlags.add(SearchRules.SearchFlags.CASE_SENSITIVE);
+                } else {
+                    searchFlags.remove(SearchRules.SearchFlags.CASE_SENSITIVE);
+                }
+                viewModel.searchFlagsProperty().set(searchFlags);
+            });
+        searchGroupRegex.setSelected(
+            viewModel
+                .searchFlagsProperty()
+                .getValue()
+                .contains(SearchFlags.REGULAR_EXPRESSION)
+        );
+        searchGroupRegex
+            .selectedProperty()
+            .addListener((observable, oldValue, newValue) -> {
+                EnumSet<SearchFlags> searchFlags = viewModel
+                    .searchFlagsProperty()
+                    .get();
+                if (newValue) {
+                    searchFlags.add(SearchRules.SearchFlags.REGULAR_EXPRESSION);
+                } else {
+                    searchFlags.remove(
+                        SearchRules.SearchFlags.REGULAR_EXPRESSION
+                    );
+                }
+                viewModel.searchFlagsProperty().set(searchFlags);
+            });
+
+        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.searchRegexValidationStatus(), searchGroupSearchTerm);
-            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);
+            validationVisualizer.initVisualization(
+                viewModel.nameValidationStatus(),
+                nameField
+            );
+            validationVisualizer.initVisualization(
+                viewModel.nameContainsDelimiterValidationStatus(),
+                nameField,
+                false
+            );
+            validationVisualizer.initVisualization(
+                viewModel.sameNameValidationStatus(),
+                nameField
+            );
+            validationVisualizer.initVisualization(
+                viewModel.searchRegexValidationStatus(),
+                searchGroupSearchTerm
+            );
+            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();
         });
     }
@@ -224,7 +411,10 @@ 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()));
             }
@@ -233,11 +423,21 @@ 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())));
-
-        GridView<Ikon> ikonGridView = new GridView<>(FXCollections.observableArrayList());
+        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());
         ikonGridView.setPrefWidth(520);
         ikonGridView.setPrefHeight(400);
@@ -262,6 +462,7 @@ private void openIconPicker() {
     }
 
     public class IkonliCell extends GridCell<Ikon> {
+
         @Override
         protected void updateItem(Ikon ikon, boolean empty) {
             super.updateItem(ikon, empty);
@@ -275,11 +476,25 @@ 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)));
+                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();
+                    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 72f98979fc0..7dc4d4de932 100644
--- a/src/main/java/org/jabref/gui/groups/GroupDialogViewModel.java
+++ b/src/main/java/org/jabref/gui/groups/GroupDialogViewModel.java
@@ -1,5 +1,10 @@
 package org.jabref.gui.groups;
 
+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.Files;
 import java.nio.file.Path;
@@ -9,7 +14,6 @@
 import java.util.Optional;
 import java.util.regex.Pattern;
 import java.util.regex.PatternSyntaxException;
-
 import javafx.beans.property.BooleanProperty;
 import javafx.beans.property.ListProperty;
 import javafx.beans.property.ObjectProperty;
@@ -22,7 +26,6 @@
 import javafx.event.Event;
 import javafx.scene.control.ButtonType;
 import javafx.scene.paint.Color;
-
 import org.jabref.gui.DialogService;
 import org.jabref.gui.help.HelpAction;
 import org.jabref.gui.icon.IconTheme;
@@ -54,45 +57,63 @@
 import org.jabref.model.util.FileUpdateMonitor;
 import org.jabref.preferences.PreferencesService;
 
-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 GroupDialogViewModel {
+
     // Basic Settings
     private final StringProperty nameProperty = new SimpleStringProperty("");
-    private final StringProperty descriptionProperty = new SimpleStringProperty("");
+    private final StringProperty descriptionProperty = new SimpleStringProperty(
+        ""
+    );
     private final StringProperty iconProperty = new SimpleStringProperty("");
-    private final ObjectProperty<Color> colorProperty = new SimpleObjectProperty<>();
-    private final ListProperty<GroupHierarchyType> groupHierarchyListProperty = new SimpleListProperty<>();
-    private final ObjectProperty<GroupHierarchyType> groupHierarchySelectedProperty = new SimpleObjectProperty<>();
+    private final ObjectProperty<Color> colorProperty =
+        new SimpleObjectProperty<>();
+    private final ListProperty<GroupHierarchyType> groupHierarchyListProperty =
+        new SimpleListProperty<>();
+    private final ObjectProperty<
+        GroupHierarchyType
+    > groupHierarchySelectedProperty = new SimpleObjectProperty<>();
 
     // Type
-    private final BooleanProperty typeExplicitProperty = new SimpleBooleanProperty();
-    private final BooleanProperty typeKeywordsProperty = new SimpleBooleanProperty();
-    private final BooleanProperty typeSearchProperty = new SimpleBooleanProperty();
-    private final BooleanProperty typeAutoProperty = new SimpleBooleanProperty();
+    private final BooleanProperty typeExplicitProperty =
+        new SimpleBooleanProperty();
+    private final BooleanProperty typeKeywordsProperty =
+        new SimpleBooleanProperty();
+    private final BooleanProperty typeSearchProperty =
+        new SimpleBooleanProperty();
+    private final BooleanProperty typeAutoProperty =
+        new SimpleBooleanProperty();
     private final BooleanProperty typeTexProperty = new SimpleBooleanProperty();
 
     // Option Groups
-    private final StringProperty keywordGroupSearchTermProperty = new SimpleStringProperty("");
-    private final StringProperty keywordGroupSearchFieldProperty = new SimpleStringProperty("");
-    private final BooleanProperty keywordGroupCaseSensitiveProperty = new SimpleBooleanProperty();
-    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 BooleanProperty autoGroupKeywordsOptionProperty = new SimpleBooleanProperty();
-    private final StringProperty autoGroupKeywordsFieldProperty = new SimpleStringProperty("");
-    private final StringProperty autoGroupKeywordsDelimiterProperty = new SimpleStringProperty("");
-    private final StringProperty autoGroupKeywordsHierarchicalDelimiterProperty = new SimpleStringProperty("");
-    private final BooleanProperty autoGroupPersonsOptionProperty = new SimpleBooleanProperty();
-    private final StringProperty autoGroupPersonsFieldProperty = new SimpleStringProperty("");
-
-    private final StringProperty texGroupFilePathProperty = new SimpleStringProperty("");
+    private final StringProperty keywordGroupSearchTermProperty =
+        new SimpleStringProperty("");
+    private final StringProperty keywordGroupSearchFieldProperty =
+        new SimpleStringProperty("");
+    private final BooleanProperty keywordGroupCaseSensitiveProperty =
+        new SimpleBooleanProperty();
+    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 BooleanProperty autoGroupKeywordsOptionProperty =
+        new SimpleBooleanProperty();
+    private final StringProperty autoGroupKeywordsFieldProperty =
+        new SimpleStringProperty("");
+    private final StringProperty autoGroupKeywordsDelimiterProperty =
+        new SimpleStringProperty("");
+    private final StringProperty autoGroupKeywordsHierarchicalDelimiterProperty =
+        new SimpleStringProperty("");
+    private final BooleanProperty autoGroupPersonsOptionProperty =
+        new SimpleBooleanProperty();
+    private final StringProperty autoGroupPersonsFieldProperty =
+        new SimpleStringProperty("");
+
+    private final StringProperty texGroupFilePathProperty =
+        new SimpleStringProperty("");
 
     private Validator nameValidator;
     private Validator nameContainsDelimiterValidator;
@@ -111,11 +132,13 @@ public class GroupDialogViewModel {
     private final AbstractGroup editedGroup;
     private final FileUpdateMonitor fileUpdateMonitor;
 
-    public GroupDialogViewModel(DialogService dialogService,
-                                BibDatabaseContext currentDatabase,
-                                PreferencesService preferencesService,
-                                AbstractGroup editedGroup,
-                                FileUpdateMonitor fileUpdateMonitor) {
+    public GroupDialogViewModel(
+        DialogService dialogService,
+        BibDatabaseContext currentDatabase,
+        PreferencesService preferencesService,
+        AbstractGroup editedGroup,
+        FileUpdateMonitor fileUpdateMonitor
+    ) {
         this.dialogService = dialogService;
         this.preferencesService = preferencesService;
         this.currentDatabase = currentDatabase;
@@ -129,43 +152,79 @@ public GroupDialogViewModel(DialogService dialogService,
     private void setupValidation() {
         validator = new CompositeValidator();
 
-        nameValidator = new FunctionBasedValidator<>(
+        nameValidator =
+            new FunctionBasedValidator<>(
                 nameProperty,
                 StringUtil::isNotBlank,
-                ValidationMessage.error(Localization.lang("Please enter a name for the group.")));
+                ValidationMessage.error(
+                    Localization.lang("Please enter a name for the group.")
+                )
+            );
 
-        nameContainsDelimiterValidator = new FunctionBasedValidator<>(
+        nameContainsDelimiterValidator =
+            new FunctionBasedValidator<>(
                 nameProperty,
-                name -> !name.contains(Character.toString(preferencesService.getBibEntryPreferences().getKeywordSeparator())),
+                name ->
+                    !name.contains(
+                        Character.toString(
+                            preferencesService
+                                .getBibEntryPreferences()
+                                .getKeywordSeparator()
+                        )
+                    ),
                 ValidationMessage.warning(
-                        Localization.lang(
-                                "The group name contains the keyword separator \"%0\" and thus probably does not work as expected.",
-                                Character.toString(preferencesService.getBibEntryPreferences().getKeywordSeparator())
-                        )));
+                    Localization.lang(
+                        "The group name contains the keyword separator \"%0\" and thus probably does not work as expected.",
+                        Character.toString(
+                            preferencesService
+                                .getBibEntryPreferences()
+                                .getKeywordSeparator()
+                        )
+                    )
+                )
+            );
 
-        sameNameValidator = new FunctionBasedValidator<>(
+        sameNameValidator =
+            new FunctionBasedValidator<>(
                 nameProperty,
                 name -> {
-                    Optional<GroupTreeNode> rootGroup = currentDatabase.getMetaData().getGroups();
+                    Optional<GroupTreeNode> rootGroup = currentDatabase
+                        .getMetaData()
+                        .getGroups();
                     if (rootGroup.isPresent()) {
-                        int groupsWithSameName = rootGroup.get().findChildrenSatisfying(group -> group.getName().equals(name)).size();
+                        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 (
+                            (editedGroup == null) ||
+                            editedGroup.getName().equals(name) ||
+                            (groupsWithSameName <= 0)
+                        );
                     }
                     return true;
                 },
                 ValidationMessage.warning(
-                    Localization.lang("There exists already a group with the same name.") + "\n" +
-                    Localization.lang("If you use it, it will inherit all entries from this other group.")
+                    Localization.lang(
+                        "There exists already a group with the same name."
+                    ) +
+                    "\n" +
+                    Localization.lang(
+                        "If you use it, it will inherit all entries from this other group."
+                    )
                 )
-        );
+            );
 
-        keywordRegexValidator = new FunctionBasedValidator<>(
+        keywordRegexValidator =
+            new FunctionBasedValidator<>(
                 keywordGroupSearchTermProperty,
                 input -> {
                     if (!keywordGroupRegexProperty.getValue()) {
@@ -183,29 +242,50 @@ private void setupValidation() {
                         return false;
                     }
                 },
-                ValidationMessage.error(String.format("%s > %n %s %n %n %s",
+                ValidationMessage.error(
+                    String.format(
+                        "%s > %n %s %n %n %s",
                         Localization.lang("Searching for a keyword"),
                         Localization.lang("Keywords"),
-                        Localization.lang("Invalid regular expression."))));
+                        Localization.lang("Invalid regular expression.")
+                    )
+                )
+            );
 
-        keywordFieldEmptyValidator = new FunctionBasedValidator<>(
+        keywordFieldEmptyValidator =
+            new FunctionBasedValidator<>(
                 keywordGroupSearchFieldProperty,
                 StringUtil::isNotBlank,
-                ValidationMessage.error(Localization.lang("Please enter a field name to search for a keyword.")));
+                ValidationMessage.error(
+                    Localization.lang(
+                        "Please enter a field name to search for a keyword."
+                    )
+                )
+            );
 
-        keywordSearchTermEmptyValidator = new FunctionBasedValidator<>(
+        keywordSearchTermEmptyValidator =
+            new FunctionBasedValidator<>(
                 keywordGroupSearchTermProperty,
                 input -> !StringUtil.isNullOrEmpty(input),
-                ValidationMessage.error(String.format("%s > %n %s %n %n %s",
+                ValidationMessage.error(
+                    String.format(
+                        "%s > %n %s %n %n %s",
                         Localization.lang("Searching for a keyword"),
                         Localization.lang("Keywords"),
                         Localization.lang("Search term is empty.")
-                )));
+                    )
+                )
+            );
 
-        searchRegexValidator = new FunctionBasedValidator<>(
+        searchRegexValidator =
+            new FunctionBasedValidator<>(
                 searchGroupSearchTermProperty,
                 input -> {
-                    if (!searchFlagsProperty.getValue().contains(SearchRules.SearchFlags.CASE_SENSITIVE)) {
+                    if (
+                        !searchFlagsProperty
+                            .getValue()
+                            .contains(SearchRules.SearchFlags.CASE_SENSITIVE)
+                    ) {
                         return true;
                     }
 
@@ -221,47 +301,80 @@ private void setupValidation() {
                         return false;
                     }
                 },
-                ValidationMessage.error(String.format("%s > %n %s",
+                ValidationMessage.error(
+                    String.format(
+                        "%s > %n %s",
                         Localization.lang("Free search expression"),
-                        Localization.lang("Invalid regular expression."))));
+                        Localization.lang("Invalid regular expression.")
+                    )
+                )
+            );
 
-        searchSearchTermEmptyValidator = new FunctionBasedValidator<>(
+        searchSearchTermEmptyValidator =
+            new FunctionBasedValidator<>(
                 searchGroupSearchTermProperty,
                 input -> !StringUtil.isNullOrEmpty(input),
-                ValidationMessage.error(String.format("%s > %n %s",
+                ValidationMessage.error(
+                    String.format(
+                        "%s > %n %s",
                         Localization.lang("Free search expression"),
-                        Localization.lang("Search term is empty."))));
+                        Localization.lang("Search term is empty.")
+                    )
+                )
+            );
 
-        texGroupFilePathValidator = new FunctionBasedValidator<>(
+        texGroupFilePathValidator =
+            new FunctionBasedValidator<>(
                 texGroupFilePathProperty,
                 input -> {
                     if (StringUtil.isBlank(input)) {
                         return false;
                     } else {
                         Path inputPath = getAbsoluteTexGroupPath(input);
-                        if (!inputPath.isAbsolute() || !Files.isRegularFile(inputPath)) {
+                        if (
+                            !inputPath.isAbsolute() ||
+                            !Files.isRegularFile(inputPath)
+                        ) {
                             return false;
                         }
-                        return FileUtil.getFileExtension(input)
-                                .map(extension -> extension.equalsIgnoreCase("aux"))
-                                .orElse(false);
+                        return FileUtil
+                            .getFileExtension(input)
+                            .map(extension -> extension.equalsIgnoreCase("aux"))
+                            .orElse(false);
                     }
                 },
-                ValidationMessage.error(Localization.lang("Please provide a valid aux file.")));
+                ValidationMessage.error(
+                    Localization.lang("Please provide a valid aux file.")
+                )
+            );
 
         typeSearchProperty.addListener((obs, _oldValue, isSelected) -> {
             if (isSelected) {
-                validator.addValidators(searchRegexValidator, searchSearchTermEmptyValidator);
+                validator.addValidators(
+                    searchRegexValidator,
+                    searchSearchTermEmptyValidator
+                );
             } else {
-                validator.removeValidators(searchRegexValidator, searchSearchTermEmptyValidator);
+                validator.removeValidators(
+                    searchRegexValidator,
+                    searchSearchTermEmptyValidator
+                );
             }
         });
 
         typeKeywordsProperty.addListener((obs, _oldValue, isSelected) -> {
             if (isSelected) {
-                validator.addValidators(keywordFieldEmptyValidator, keywordRegexValidator, keywordSearchTermEmptyValidator);
+                validator.addValidators(
+                    keywordFieldEmptyValidator,
+                    keywordRegexValidator,
+                    keywordSearchTermEmptyValidator
+                );
             } else {
-                validator.removeValidators(keywordFieldEmptyValidator, keywordRegexValidator, keywordSearchTermEmptyValidator);
+                validator.removeValidators(
+                    keywordFieldEmptyValidator,
+                    keywordRegexValidator,
+                    keywordSearchTermEmptyValidator
+                );
             }
         });
 
@@ -273,9 +386,11 @@ private void setupValidation() {
             }
         });
 
-        validator.addValidators(nameValidator,
-                nameContainsDelimiterValidator,
-                sameNameValidator);
+        validator.addValidators(
+            nameValidator,
+            nameContainsDelimiterValidator,
+            sameNameValidator
+        );
     }
 
     /**
@@ -285,14 +400,22 @@ private void setupValidation() {
      * @return an absolute path if LatexFileDirectory exists; otherwise, returns input
      */
     private Path getAbsoluteTexGroupPath(String input) {
-        Optional<Path> latexFileDirectory = currentDatabase.getMetaData().getLatexFileDirectory(preferencesService.getFilePreferences().getUserAndHost());
-        return latexFileDirectory.map(path -> path.resolve(input)).orElse(Path.of(input));
+        Optional<Path> latexFileDirectory = currentDatabase
+            .getMetaData()
+            .getLatexFileDirectory(
+                preferencesService.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();
         }
@@ -307,71 +430,118 @@ public AbstractGroup resultConverter(ButtonType button) {
         try {
             String groupName = nameProperty.getValue().trim();
             if (typeExplicitProperty.getValue()) {
-                resultingGroup = new ExplicitGroup(
+                resultingGroup =
+                    new ExplicitGroup(
                         groupName,
                         groupHierarchySelectedProperty.getValue(),
-                        preferencesService.getBibEntryPreferences().getKeywordSeparator());
+                        preferencesService
+                            .getBibEntryPreferences()
+                            .getKeywordSeparator()
+                    );
             } else if (typeKeywordsProperty.getValue()) {
                 if (keywordGroupRegexProperty.getValue()) {
-                    resultingGroup = new RegexKeywordGroup(
+                    resultingGroup =
+                        new RegexKeywordGroup(
                             groupName,
                             groupHierarchySelectedProperty.getValue(),
-                            FieldFactory.parseField(keywordGroupSearchFieldProperty.getValue().trim()),
+                            FieldFactory.parseField(
+                                keywordGroupSearchFieldProperty
+                                    .getValue()
+                                    .trim()
+                            ),
                             keywordGroupSearchTermProperty.getValue().trim(),
-                            keywordGroupCaseSensitiveProperty.getValue());
+                            keywordGroupCaseSensitiveProperty.getValue()
+                        );
                 } else {
-                    resultingGroup = new WordKeywordGroup(
+                    resultingGroup =
+                        new WordKeywordGroup(
                             groupName,
                             groupHierarchySelectedProperty.getValue(),
-                            FieldFactory.parseField(keywordGroupSearchFieldProperty.getValue().trim()),
+                            FieldFactory.parseField(
+                                keywordGroupSearchFieldProperty
+                                    .getValue()
+                                    .trim()
+                            ),
                             keywordGroupSearchTermProperty.getValue().trim(),
                             keywordGroupCaseSensitiveProperty.getValue(),
-                            preferencesService.getBibEntryPreferences().getKeywordSeparator(),
-                            false);
+                            preferencesService
+                                .getBibEntryPreferences()
+                                .getKeywordSeparator(),
+                            false
+                        );
                 }
             } else if (typeSearchProperty.getValue()) {
-                resultingGroup = new SearchGroup(
+                resultingGroup =
+                    new SearchGroup(
                         groupName,
                         groupHierarchySelectedProperty.getValue(),
                         searchGroupSearchTermProperty.getValue().trim(),
-                        searchFlagsProperty.getValue());
+                        searchFlagsProperty.getValue()
+                    );
             } else if (typeAutoProperty.getValue()) {
                 if (autoGroupKeywordsOptionProperty.getValue()) {
                     // Set default value for delimiters: ',' for base and '>' for hierarchical
                     char delimiter = ',';
-                    char hierarDelimiter = Keyword.DEFAULT_HIERARCHICAL_DELIMITER;
+                    char hierarDelimiter =
+                        Keyword.DEFAULT_HIERARCHICAL_DELIMITER;
                     autoGroupKeywordsOptionProperty.setValue(Boolean.TRUE);
                     // Modify values for delimiters if user provided customized values
-                    if (!autoGroupKeywordsDelimiterProperty.getValue().isEmpty()) {
-                        delimiter = autoGroupKeywordsDelimiterProperty.getValue().charAt(0);
+                    if (
+                        !autoGroupKeywordsDelimiterProperty.getValue().isEmpty()
+                    ) {
+                        delimiter =
+                            autoGroupKeywordsDelimiterProperty
+                                .getValue()
+                                .charAt(0);
                     }
-                    if (!autoGroupKeywordsHierarchicalDelimiterProperty.getValue().isEmpty()) {
-                        hierarDelimiter = autoGroupKeywordsHierarchicalDelimiterProperty.getValue().charAt(0);
+                    if (
+                        !autoGroupKeywordsHierarchicalDelimiterProperty
+                            .getValue()
+                            .isEmpty()
+                    ) {
+                        hierarDelimiter =
+                            autoGroupKeywordsHierarchicalDelimiterProperty
+                                .getValue()
+                                .charAt(0);
                     }
-                    resultingGroup = new AutomaticKeywordGroup(
+                    resultingGroup =
+                        new AutomaticKeywordGroup(
                             groupName,
                             groupHierarchySelectedProperty.getValue(),
-                            FieldFactory.parseField(autoGroupKeywordsFieldProperty.getValue().trim()),
+                            FieldFactory.parseField(
+                                autoGroupKeywordsFieldProperty.getValue().trim()
+                            ),
                             delimiter,
-                            hierarDelimiter);
+                            hierarDelimiter
+                        );
                 } else {
-                    resultingGroup = new AutomaticPersonsGroup(
+                    resultingGroup =
+                        new AutomaticPersonsGroup(
                             groupName,
                             groupHierarchySelectedProperty.getValue(),
-                            FieldFactory.parseField(autoGroupPersonsFieldProperty.getValue().trim()));
+                            FieldFactory.parseField(
+                                autoGroupPersonsFieldProperty.getValue().trim()
+                            )
+                        );
                 }
             } else if (typeTexProperty.getValue()) {
-                resultingGroup = TexGroup.create(
+                resultingGroup =
+                    TexGroup.create(
                         groupName,
                         groupHierarchySelectedProperty.getValue(),
                         Path.of(texGroupFilePathProperty.getValue().trim()),
                         new DefaultAuxParser(new BibDatabase()),
                         fileUpdateMonitor,
-                        currentDatabase.getMetaData());
+                        currentDatabase.getMetaData()
+                    );
             }
 
             if (resultingGroup != null) {
-                preferencesService.getGroupsPreferences().setDefaultHierarchicalContext(groupHierarchySelectedProperty.getValue());
+                preferencesService
+                    .getGroupsPreferences()
+                    .setDefaultHierarchicalContext(
+                        groupHierarchySelectedProperty.getValue()
+                    );
 
                 resultingGroup.setColor(colorProperty.getValue());
                 resultingGroup.setDescription(descriptionProperty.getValue());
@@ -381,48 +551,77 @@ public AbstractGroup resultConverter(ButtonType button) {
 
             return null;
         } catch (IllegalArgumentException | IOException exception) {
-            dialogService.showErrorDialogAndWait(exception.getLocalizedMessage(), exception);
+            dialogService.showErrorDialogAndWait(
+                exception.getLocalizedMessage(),
+                exception
+            );
             return null;
         }
     }
 
     public void setValues() {
-        groupHierarchyListProperty.setValue(FXCollections.observableArrayList(GroupHierarchyType.values()));
+        groupHierarchyListProperty.setValue(
+            FXCollections.observableArrayList(GroupHierarchyType.values())
+        );
 
         if (editedGroup == null) {
             // creating new group -> defaults!
             colorProperty.setValue(IconTheme.getDefaultGroupColor());
             typeExplicitProperty.setValue(true);
-            groupHierarchySelectedProperty.setValue(preferencesService.getGroupsPreferences().getDefaultHierarchicalContext());
+            groupHierarchySelectedProperty.setValue(
+                preferencesService
+                    .getGroupsPreferences()
+                    .getDefaultHierarchicalContext()
+            );
             autoGroupKeywordsOptionProperty.setValue(Boolean.TRUE);
         } else {
             nameProperty.setValue(editedGroup.getName());
-            colorProperty.setValue(editedGroup.getColor().orElse(IconTheme.getDefaultGroupColor()));
-            descriptionProperty.setValue(editedGroup.getDescription().orElse(""));
+            colorProperty.setValue(
+                editedGroup.getColor().orElse(IconTheme.getDefaultGroupColor())
+            );
+            descriptionProperty.setValue(
+                editedGroup.getDescription().orElse("")
+            );
             iconProperty.setValue(editedGroup.getIconName().orElse(""));
-            groupHierarchySelectedProperty.setValue(editedGroup.getHierarchicalContext());
+            groupHierarchySelectedProperty.setValue(
+                editedGroup.getHierarchicalContext()
+            );
 
             if (editedGroup.getClass() == WordKeywordGroup.class) {
                 typeKeywordsProperty.setValue(true);
 
                 WordKeywordGroup group = (WordKeywordGroup) editedGroup;
-                keywordGroupSearchFieldProperty.setValue(group.getSearchField().getName());
-                keywordGroupSearchTermProperty.setValue(group.getSearchExpression());
-                keywordGroupCaseSensitiveProperty.setValue(group.isCaseSensitive());
+                keywordGroupSearchFieldProperty.setValue(
+                    group.getSearchField().getName()
+                );
+                keywordGroupSearchTermProperty.setValue(
+                    group.getSearchExpression()
+                );
+                keywordGroupCaseSensitiveProperty.setValue(
+                    group.isCaseSensitive()
+                );
                 keywordGroupRegexProperty.setValue(false);
             } else if (editedGroup.getClass() == RegexKeywordGroup.class) {
                 typeKeywordsProperty.setValue(true);
 
                 RegexKeywordGroup group = (RegexKeywordGroup) editedGroup;
-                keywordGroupSearchFieldProperty.setValue(group.getSearchField().getName());
-                keywordGroupSearchTermProperty.setValue(group.getSearchExpression());
-                keywordGroupCaseSensitiveProperty.setValue(group.isCaseSensitive());
+                keywordGroupSearchFieldProperty.setValue(
+                    group.getSearchField().getName()
+                );
+                keywordGroupSearchTermProperty.setValue(
+                    group.getSearchExpression()
+                );
+                keywordGroupCaseSensitiveProperty.setValue(
+                    group.isCaseSensitive()
+                );
                 keywordGroupRegexProperty.setValue(true);
             } else if (editedGroup.getClass() == SearchGroup.class) {
                 typeSearchProperty.setValue(true);
 
                 SearchGroup group = (SearchGroup) editedGroup;
-                searchGroupSearchTermProperty.setValue(group.getSearchExpression());
+                searchGroupSearchTermProperty.setValue(
+                    group.getSearchExpression()
+                );
                 searchFlagsProperty.setValue(group.getSearchFlags());
             } else if (editedGroup.getClass() == ExplicitGroup.class) {
                 typeExplicitProperty.setValue(true);
@@ -430,46 +629,93 @@ public void setValues() {
                 typeAutoProperty.setValue(true);
 
                 if (editedGroup.getClass() == AutomaticKeywordGroup.class) {
-                    AutomaticKeywordGroup group = (AutomaticKeywordGroup) editedGroup;
+                    AutomaticKeywordGroup group =
+                        (AutomaticKeywordGroup) editedGroup;
                     autoGroupKeywordsOptionProperty.setValue(Boolean.TRUE);
-                    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;
+                    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;
                     autoGroupPersonsOptionProperty.setValue(Boolean.TRUE);
-                    autoGroupPersonsFieldProperty.setValue(group.getField().getName());
+                    autoGroupPersonsFieldProperty.setValue(
+                        group.getField().getName()
+                    );
                 }
             } else if (editedGroup.getClass() == TexGroup.class) {
                 typeTexProperty.setValue(true);
 
                 TexGroup group = (TexGroup) editedGroup;
-                texGroupFilePathProperty.setValue(group.getFilePath().toString());
+                texGroupFilePathProperty.setValue(
+                    group.getFilePath().toString()
+                );
             }
         }
     }
 
     public void texGroupBrowse() {
-        FileDialogConfiguration fileDialogConfiguration = new FileDialogConfiguration.Builder()
+        FileDialogConfiguration fileDialogConfiguration =
+            new FileDialogConfiguration.Builder()
                 .addExtensionFilter(StandardFileType.AUX)
                 .withDefaultExtension(StandardFileType.AUX)
-                .withInitialDirectory(currentDatabase.getMetaData()
-                                                     .getLatexFileDirectory(preferencesService.getFilePreferences().getUserAndHost())
-                                                     .orElse(FileUtil.getInitialDirectory(currentDatabase, preferencesService.getFilePreferences().getWorkingDirectory()))).build();
-        dialogService.showFileOpenDialog(fileDialogConfiguration)
-                     .ifPresent(file -> texGroupFilePathProperty.setValue(
-                             FileUtil.relativize(file.toAbsolutePath(), getFileDirectoriesAsPaths()).toString()
-                     ));
+                .withInitialDirectory(
+                    currentDatabase
+                        .getMetaData()
+                        .getLatexFileDirectory(
+                            preferencesService
+                                .getFilePreferences()
+                                .getUserAndHost()
+                        )
+                        .orElse(
+                            FileUtil.getInitialDirectory(
+                                currentDatabase,
+                                preferencesService
+                                    .getFilePreferences()
+                                    .getWorkingDirectory()
+                            )
+                        )
+                )
+                .build();
+        dialogService
+            .showFileOpenDialog(fileDialogConfiguration)
+            .ifPresent(file ->
+                texGroupFilePathProperty.setValue(
+                    FileUtil
+                        .relativize(
+                            file.toAbsolutePath(),
+                            getFileDirectoriesAsPaths()
+                        )
+                        .toString()
+                )
+            );
     }
 
     public void openHelpPage() {
-        new HelpAction(HelpFile.GROUPS, dialogService, preferencesService.getFilePreferences()).execute();
+        new HelpAction(
+            HelpFile.GROUPS,
+            dialogService,
+            preferencesService.getFilePreferences()
+        )
+            .execute();
     }
 
     private List<Path> getFileDirectoriesAsPaths() {
         List<Path> fileDirs = new ArrayList<>();
         MetaData metaData = currentDatabase.getMetaData();
-        metaData.getLatexFileDirectory(preferencesService.getFilePreferences().getUserAndHost()).ifPresent(fileDirs::add);
+        metaData
+            .getLatexFileDirectory(
+                preferencesService.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 022941a97d5..305ce359e92 100644
--- a/src/main/java/org/jabref/gui/groups/GroupModeViewModel.java
+++ b/src/main/java/org/jabref/gui/groups/GroupModeViewModel.java
@@ -2,7 +2,6 @@
 
 import javafx.scene.Node;
 import javafx.scene.control.Tooltip;
-
 import org.jabref.gui.icon.IconTheme.JabRefIcons;
 import org.jabref.logic.l10n.Localization;
 
diff --git a/src/main/java/org/jabref/gui/groups/GroupNodeViewModel.java b/src/main/java/org/jabref/gui/groups/GroupNodeViewModel.java
index bd113bf249e..0d91a71e858 100644
--- a/src/main/java/org/jabref/gui/groups/GroupNodeViewModel.java
+++ b/src/main/java/org/jabref/gui/groups/GroupNodeViewModel.java
@@ -1,10 +1,11 @@
 package org.jabref.gui.groups;
 
+import com.tobiasdiez.easybind.EasyBind;
+import com.tobiasdiez.easybind.EasyObservableList;
 import java.util.List;
 import java.util.Objects;
 import java.util.Optional;
 import java.util.stream.Collectors;
-
 import javafx.beans.InvalidationListener;
 import javafx.beans.WeakInvalidationListener;
 import javafx.beans.binding.Bindings;
@@ -16,7 +17,6 @@
 import javafx.collections.ObservableList;
 import javafx.scene.input.Dragboard;
 import javafx.scene.paint.Color;
-
 import org.jabref.gui.DragAndDropDataFormats;
 import org.jabref.gui.StateManager;
 import org.jabref.gui.icon.IconTheme;
@@ -47,9 +47,6 @@
 import org.jabref.model.strings.StringUtil;
 import org.jabref.preferences.PreferencesService;
 
-import com.tobiasdiez.easybind.EasyBind;
-import com.tobiasdiez.easybind.EasyObservableList;
-
 public class GroupNodeViewModel {
 
     private final String displayName;
@@ -58,18 +55,28 @@ public class GroupNodeViewModel {
     private final BibDatabaseContext databaseContext;
     private final StateManager stateManager;
     private final GroupTreeNode groupNode;
-    private final ObservableList<BibEntry> matchedEntries = FXCollections.observableArrayList();
+    private final ObservableList<BibEntry> matchedEntries =
+        FXCollections.observableArrayList();
     private final SimpleBooleanProperty hasChildren;
-    private final SimpleBooleanProperty expandedProperty = new SimpleBooleanProperty();
+    private final SimpleBooleanProperty expandedProperty =
+        new SimpleBooleanProperty();
     private final BooleanBinding anySelectedEntriesMatched;
     private final BooleanBinding allSelectedEntriesMatched;
     private final TaskExecutor taskExecutor;
     private final CustomLocalDragboard localDragBoard;
     private final ObservableList<BibEntry> entriesList;
     private final PreferencesService preferencesService;
-    private final InvalidationListener onInvalidatedGroup = listener -> refreshGroup();
-
-    public GroupNodeViewModel(BibDatabaseContext databaseContext, StateManager stateManager, TaskExecutor taskExecutor, GroupTreeNode groupNode, CustomLocalDragboard localDragBoard, PreferencesService preferencesService) {
+    private final InvalidationListener onInvalidatedGroup = listener ->
+        refreshGroup();
+
+    public GroupNodeViewModel(
+        BibDatabaseContext databaseContext,
+        StateManager stateManager,
+        TaskExecutor taskExecutor,
+        GroupTreeNode groupNode,
+        CustomLocalDragboard localDragBoard,
+        PreferencesService preferencesService
+    ) {
         this.databaseContext = Objects.requireNonNull(databaseContext);
         this.taskExecutor = Objects.requireNonNull(taskExecutor);
         this.stateManager = Objects.requireNonNull(stateManager);
@@ -80,44 +87,109 @@ 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);
+            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));
         }
         hasChildren = new SimpleBooleanProperty();
         hasChildren.bind(Bindings.isNotEmpty(children));
-        EasyBind.subscribe(preferencesService.getGroupsPreferences().displayGroupCountProperty(), shouldDisplay -> updateMatchedEntries());
+        EasyBind.subscribe(
+            preferencesService
+                .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.
         entriesList = databaseContext.getDatabase().getEntries();
         entriesList.addListener(this::onDatabaseChanged);
 
-        EasyObservableList<Boolean> selectedEntriesMatchStatus = EasyBind.map(stateManager.getSelectedEntries(), groupNode::matches);
-        anySelectedEntriesMatched = selectedEntriesMatchStatus.anyMatch(matched -> matched);
+        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));
-    }
-
-    public GroupNodeViewModel(BibDatabaseContext databaseContext, StateManager stateManager, TaskExecutor taskExecutor, AbstractGroup group, CustomLocalDragboard localDragboard, PreferencesService preferencesService) {
-        this(databaseContext, stateManager, taskExecutor, new GroupTreeNode(group), localDragboard, preferencesService);
-    }
-
-    static GroupNodeViewModel getAllEntriesGroup(BibDatabaseContext newDatabase, StateManager stateManager, TaskExecutor taskExecutor, CustomLocalDragboard localDragBoard, PreferencesService preferencesService) {
-        return new GroupNodeViewModel(newDatabase, stateManager, taskExecutor, DefaultGroupsFactory.getAllEntriesGroup(), localDragBoard, preferencesService);
+        allSelectedEntriesMatched =
+            selectedEntriesMatchStatus
+                .isEmptyBinding()
+                .not()
+                .and(selectedEntriesMatchStatus.allMatch(matched -> matched));
+    }
+
+    public GroupNodeViewModel(
+        BibDatabaseContext databaseContext,
+        StateManager stateManager,
+        TaskExecutor taskExecutor,
+        AbstractGroup group,
+        CustomLocalDragboard localDragboard,
+        PreferencesService preferencesService
+    ) {
+        this(
+            databaseContext,
+            stateManager,
+            taskExecutor,
+            new GroupTreeNode(group),
+            localDragboard,
+            preferencesService
+        );
+    }
+
+    static GroupNodeViewModel getAllEntriesGroup(
+        BibDatabaseContext newDatabase,
+        StateManager stateManager,
+        TaskExecutor taskExecutor,
+        CustomLocalDragboard localDragBoard,
+        PreferencesService preferencesService
+    ) {
+        return new GroupNodeViewModel(
+            newDatabase,
+            stateManager,
+            taskExecutor,
+            DefaultGroupsFactory.getAllEntriesGroup(),
+            localDragBoard,
+            preferencesService
+        );
     }
 
     private GroupNodeViewModel toViewModel(GroupTreeNode child) {
-        return new GroupNodeViewModel(databaseContext, stateManager, taskExecutor, child, localDragBoard, preferencesService);
+        return new GroupNodeViewModel(
+            databaseContext,
+            stateManager,
+            taskExecutor,
+            child,
+            localDragBoard,
+            preferencesService
+        );
     }
 
     public List<FieldChange> addEntriesToGroup(List<BibEntry> entries) {
@@ -187,15 +259,26 @@ 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
@@ -205,13 +288,19 @@ 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() {
-        Color color = groupNode.getGroup().getColor().orElse(IconTheme.getDefaultGroupColor());
-        return IconTheme.JabRefIcons.DEFAULT_GROUP_ICON_COLORED.withColor(color);
+        Color color = groupNode
+            .getGroup()
+            .getColor()
+            .orElse(IconTheme.getDefaultGroupColor());
+        return IconTheme.JabRefIcons.DEFAULT_GROUP_ICON_COLORED.withColor(
+            color
+        );
     }
 
     private Optional<JabRefIcon> parseIcon(String iconCode) {
@@ -229,12 +318,16 @@ public GroupTreeNode getGroupNode() {
     /**
      * Gets invoked if an entry in the current database changes.
      */
-    private void onDatabaseChanged(ListChangeListener.Change<? extends BibEntry> change) {
+    private void onDatabaseChanged(
+        ListChangeListener.Change<? extends BibEntry> change
+    ) {
         while (change.next()) {
             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)) {
                         if (!matchedEntries.contains(changedEntry)) {
                             matchedEntries.add(changedEntry);
@@ -262,7 +355,8 @@ private void refreshGroup() {
         DefaultTaskExecutor.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.getSelectedGroup(this.databaseContext);
+            ObservableList<GroupTreeNode> selectedGroups =
+                this.stateManager.getSelectedGroup(this.databaseContext);
             if (selectedGroups.remove(this.groupNode)) {
                 selectedGroups.add(this.groupNode);
             }
@@ -273,14 +367,17 @@ 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
         // for example, a previously matched entry gets removed -> hits = hits - 1
-        if (preferencesService.getGroupsPreferences().shouldDisplayGroupCount()) {
+        if (
+            preferencesService.getGroupsPreferences().shouldDisplayGroupCount()
+        ) {
             BackgroundTask
-                    .wrap(() -> groupNode.findMatches(databaseContext.getDatabase()))
-                    .onSuccess(entries -> {
-                        matchedEntries.clear();
-                        matchedEntries.addAll(entries);
-                    })
-                    .executeWith(taskExecutor);
+                .wrap(() -> groupNode.findMatches(databaseContext.getDatabase())
+                )
+                .onSuccess(entries -> {
+                    matchedEntries.clear();
+                    matchedEntries.addAll(entries);
+                })
+                .executeWith(taskExecutor);
         }
     }
 
@@ -293,11 +390,17 @@ 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() {
-        return groupNode.getGroup().getColor().orElse(IconTheme.getDefaultGroupColor());
+        return groupNode
+            .getGroup()
+            .getColor()
+            .orElse(IconTheme.getDefaultGroupColor());
     }
 
     public String getPath() {
@@ -317,8 +420,12 @@ 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 canDropOtherGroup = dragboard.hasContent(
+            DragAndDropDataFormats.GROUP
+        );
+        boolean canDropEntries =
+            localDragBoard.hasBibEntries() &&
+            (groupNode.getGroup() instanceof GroupEntryChanger);
         return canDropOtherGroup || canDropEntries;
     }
 
@@ -341,7 +448,10 @@ public Optional<GroupTreeNode> getParent() {
         return groupNode.getParent();
     }
 
-    public void draggedOn(GroupNodeViewModel target, DroppingMouseLocation mouseLocation) {
+    public void draggedOn(
+        GroupNodeViewModel target,
+        DroppingMouseLocation mouseLocation
+    ) {
         // No action, if the target is the same as the source
         if (this.equals(target)) {
             return;
@@ -387,11 +497,17 @@ public boolean canAddEntriesIn() {
             return false;
         } else if (group instanceof ExplicitGroup) {
             return true;
-        } else if (group instanceof LastNameGroup || group instanceof RegexKeywordGroup) {
-            return groupNode.getParent()
-                            .map(parent -> parent.getGroup())
-                            .map(groupParent -> groupParent instanceof AutomaticKeywordGroup || groupParent instanceof AutomaticPersonsGroup)
-                            .orElse(false);
+        } else if (
+            group instanceof LastNameGroup || group instanceof RegexKeywordGroup
+        ) {
+            return groupNode
+                .getParent()
+                .map(parent -> parent.getGroup())
+                .map(groupParent ->
+                    groupParent instanceof AutomaticKeywordGroup ||
+                    groupParent instanceof AutomaticPersonsGroup
+                )
+                .orElse(false);
         } else if (group instanceof KeywordGroup) {
             // also covers WordKeywordGroup
             return true;
@@ -404,7 +520,10 @@ 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()
+            );
         }
     }
 
@@ -416,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(parent -> parent.getGroup())
-                            .map(groupParent -> !(groupParent instanceof AutomaticKeywordGroup || groupParent instanceof AutomaticPersonsGroup))
-                            .orElse(false);
+            return groupNode
+                .getParent()
+                .map(parent -> parent.getGroup())
+                .map(groupParent ->
+                    !(groupParent instanceof AutomaticKeywordGroup ||
+                        groupParent instanceof AutomaticPersonsGroup)
+                )
+                .orElse(false);
         } else if (group instanceof SearchGroup) {
             return true;
         } else if (group instanceof AutomaticKeywordGroup) {
@@ -429,7 +552,10 @@ 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()
+            );
         }
     }
 
@@ -441,10 +567,14 @@ public boolean canAddGroupsIn() {
             return true;
         } else if (group instanceof KeywordGroup) {
             // KeywordGroup is parent of LastNameGroup, RegexKeywordGroup and WordKeywordGroup
-            return groupNode.getParent()
-                            .map(parent -> parent.getGroup())
-                            .map(groupParent -> !(groupParent instanceof AutomaticKeywordGroup || groupParent instanceof AutomaticPersonsGroup))
-                            .orElse(false);
+            return groupNode
+                .getParent()
+                .map(parent -> parent.getGroup())
+                .map(groupParent ->
+                    !(groupParent instanceof AutomaticKeywordGroup ||
+                        groupParent instanceof AutomaticPersonsGroup)
+                )
+                .orElse(false);
         } else if (group instanceof SearchGroup) {
             return true;
         } else if (group instanceof AutomaticKeywordGroup) {
@@ -454,7 +584,10 @@ 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()
+            );
         }
     }
 
@@ -466,10 +599,14 @@ public boolean canRemove() {
             return true;
         } else if (group instanceof KeywordGroup) {
             // KeywordGroup is parent of LastNameGroup, RegexKeywordGroup and WordKeywordGroup
-            return groupNode.getParent()
-                            .map(parent -> parent.getGroup())
-                            .map(groupParent -> !(groupParent instanceof AutomaticKeywordGroup || groupParent instanceof AutomaticPersonsGroup))
-                            .orElse(false);
+            return groupNode
+                .getParent()
+                .map(parent -> parent.getGroup())
+                .map(groupParent ->
+                    !(groupParent instanceof AutomaticKeywordGroup ||
+                        groupParent instanceof AutomaticPersonsGroup)
+                )
+                .orElse(false);
         } else if (group instanceof SearchGroup) {
             return true;
         } else if (group instanceof AutomaticKeywordGroup) {
@@ -479,7 +616,10 @@ 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()
+            );
         }
     }
 
@@ -491,10 +631,14 @@ public boolean isEditable() {
             return true;
         } else if (group instanceof KeywordGroup) {
             // KeywordGroup is parent of LastNameGroup, RegexKeywordGroup and WordKeywordGroup
-            return groupNode.getParent()
-                            .map(parent -> parent.getGroup())
-                            .map(groupParent -> !(groupParent instanceof AutomaticKeywordGroup || groupParent instanceof AutomaticPersonsGroup))
-                            .orElse(false);
+            return groupNode
+                .getParent()
+                .map(parent -> parent.getGroup())
+                .map(groupParent ->
+                    !(groupParent instanceof AutomaticKeywordGroup ||
+                        groupParent instanceof AutomaticPersonsGroup)
+                )
+                .orElse(false);
         } else if (group instanceof SearchGroup) {
             return true;
         } else if (group instanceof AutomaticKeywordGroup) {
@@ -504,7 +648,10 @@ 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()
+            );
         }
     }
 }
diff --git a/src/main/java/org/jabref/gui/groups/GroupTreeNodeViewModel.java b/src/main/java/org/jabref/gui/groups/GroupTreeNodeViewModel.java
index 4383ec85ebf..b1babbe6b79 100644
--- a/src/main/java/org/jabref/gui/groups/GroupTreeNodeViewModel.java
+++ b/src/main/java/org/jabref/gui/groups/GroupTreeNodeViewModel.java
@@ -3,10 +3,8 @@
 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;
@@ -17,13 +15,14 @@
 import org.jabref.model.groups.GroupTreeNode;
 import org.jabref.model.groups.KeywordGroup;
 import org.jabref.model.groups.SearchGroup;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 public class GroupTreeNodeViewModel {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(GroupTreeNodeViewModel.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(
+        GroupTreeNodeViewModel.class
+    );
 
     private final GroupTreeNode node;
 
@@ -60,29 +59,50 @@ public String getDescription() {
         String shortDescription = "";
         boolean showDynamic = true;
         if (group instanceof ExplicitGroup explicitGroup) {
-            shortDescription = GroupDescriptions.getShortDescriptionExplicitGroup(explicitGroup);
+            shortDescription =
+                GroupDescriptions.getShortDescriptionExplicitGroup(
+                    explicitGroup
+                );
         } else if (group instanceof KeywordGroup keywordGroup) {
-            shortDescription = GroupDescriptions.getShortDescriptionKeywordGroup(keywordGroup, showDynamic);
+            shortDescription =
+                GroupDescriptions.getShortDescriptionKeywordGroup(
+                    keywordGroup,
+                    showDynamic
+                );
         } else if (group instanceof SearchGroup searchGroup) {
-            shortDescription = GroupDescriptions.getShortDescription(searchGroup, showDynamic);
+            shortDescription =
+                GroupDescriptions.getShortDescription(searchGroup, showDynamic);
         } else {
-            shortDescription = GroupDescriptions.getShortDescriptionAllEntriesGroup();
+            shortDescription =
+                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
@@ -112,27 +132,38 @@ public boolean canBeEdited() {
     }
 
     public boolean canMoveUp() {
-        return (getNode().getPreviousSibling() != null)
-                && !(getNode().getGroup() instanceof AllEntriesGroup);
+        return (
+            (getNode().getPreviousSibling() != null) &&
+            !(getNode().getGroup() instanceof AllEntriesGroup)
+        );
     }
 
     public boolean canMoveDown() {
-        return (getNode().getNextSibling() != null)
-                && !(getNode().getGroup() instanceof AllEntriesGroup);
+        return (
+            (getNode().getNextSibling() != null) &&
+            !(getNode().getGroup() instanceof AllEntriesGroup)
+        );
     }
 
     public boolean canMoveLeft() {
-        return !(getNode().getGroup() instanceof AllEntriesGroup)
-                // TODO: Null!
-                && !(getNode().getParent().get().getGroup() instanceof AllEntriesGroup);
+        return (
+            !(getNode().getGroup() instanceof AllEntriesGroup) &&
+            // TODO: Null!
+            !(getNode().getParent().get().getGroup() instanceof AllEntriesGroup)
+        );
     }
 
     public boolean canMoveRight() {
-        return (getNode().getPreviousSibling() != null)
-                && !(getNode().getGroup() instanceof AllEntriesGroup);
+        return (
+            (getNode().getPreviousSibling() != null) &&
+            !(getNode().getGroup() instanceof AllEntriesGroup)
+        );
     }
 
-    public void changeEntriesTo(List<BibEntry> entries, UndoManager undoManager) {
+    public void changeEntriesTo(
+        List<BibEntry> entries,
+        UndoManager undoManager
+    ) {
         AbstractGroup group = node.getGroup();
         List<FieldChange> changesRemove = new ArrayList<>();
         List<FieldChange> changesAdd = new ArrayList<>();
@@ -163,14 +194,25 @@ 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));
+                undoRemove.addEdit(
+                    UndoableChangeEntriesOfGroup.getUndoableEdit(
+                        this,
+                        changesAdd
+                    )
+                );
             }
             undoManager.addEdit(undoRemove);
         } else if (!changesAdd.isEmpty()) {
-            undoManager.addEdit(UndoableChangeEntriesOfGroup.getUndoableEdit(this, changesAdd));
+            undoManager.addEdit(
+                UndoableChangeEntriesOfGroup.getUndoableEdit(this, changesAdd)
+            );
         }
     }
 
@@ -182,14 +224,18 @@ public boolean isAllEntriesGroup() {
         return getNode().getGroup() instanceof AllEntriesGroup;
     }
 
-    public void addNewGroup(AbstractGroup newGroup, CountingUndoManager undoManager) {
+    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);
+            this,
+            new GroupTreeNodeViewModel(newNode),
+            UndoableAddOrRemoveGroup.ADD_NODE
+        );
         undoManager.addEdit(undo);
     }
 
@@ -200,7 +246,12 @@ public List<FieldChange> addEntriesToGroup(List<BibEntry> entries) {
         return node.addEntriesToGroup(entries);
     }
 
-    public void subscribeToDescendantChanged(Consumer<GroupTreeNodeViewModel> subscriber) {
-        getNode().subscribeToDescendantChanged(node -> subscriber.accept(new GroupTreeNodeViewModel(node)));
+    public void subscribeToDescendantChanged(
+        Consumer<GroupTreeNodeViewModel> subscriber
+    ) {
+        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 6cb538bcd8d..16225eccc6c 100644
--- a/src/main/java/org/jabref/gui/groups/GroupTreeView.java
+++ b/src/main/java/org/jabref/gui/groups/GroupTreeView.java
@@ -1,5 +1,6 @@
 package org.jabref.gui.groups;
 
+import com.tobiasdiez.easybind.EasyBind;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.text.DecimalFormat;
@@ -10,7 +11,6 @@
 import java.util.Objects;
 import java.util.Optional;
 import java.util.stream.Collectors;
-
 import javafx.application.Platform;
 import javafx.beans.binding.Bindings;
 import javafx.beans.property.ObjectProperty;
@@ -42,7 +42,8 @@
 import javafx.scene.layout.Priority;
 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.gui.DialogService;
 import org.jabref.gui.DragAndDropDataFormats;
 import org.jabref.gui.StateManager;
@@ -60,10 +61,6 @@
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.groups.AllEntriesGroup;
 import org.jabref.preferences.PreferencesService;
-
-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;
@@ -71,19 +68,31 @@
 
 public class GroupTreeView extends BorderPane {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(GroupTreeView.class);
+    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_ROOTELEMENT = PseudoClass.getPseudoClass("root");
-    private static final PseudoClass PSEUDOCLASS_SUBELEMENT = PseudoClass.getPseudoClass("sub"); // > 1 deep
+    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 double SCROLL_SPEED_UP = 3.0;
 
     private TreeTableView<GroupNodeViewModel> groupTree;
     private TreeTableColumn<GroupNodeViewModel, GroupNodeViewModel> mainColumn;
-    private TreeTableColumn<GroupNodeViewModel, GroupNodeViewModel> numberColumn;
-    private TreeTableColumn<GroupNodeViewModel, GroupNodeViewModel> expansionNodeColumn;
+    private TreeTableColumn<
+        GroupNodeViewModel,
+        GroupNodeViewModel
+    > numberColumn;
+    private TreeTableColumn<
+        GroupNodeViewModel,
+        GroupNodeViewModel
+    > expansionNodeColumn;
     private CustomTextField searchField;
 
     private final StateManager stateManager;
@@ -106,17 +115,26 @@ 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,
-                         PreferencesService preferencesService,
-                         DialogService dialogService) {
+    public GroupTreeView(
+        TaskExecutor taskExecutor,
+        StateManager stateManager,
+        PreferencesService preferencesService,
+        DialogService dialogService
+    ) {
         this.taskExecutor = taskExecutor;
         this.stateManager = stateManager;
         this.preferencesService = preferencesService;
         this.dialogService = dialogService;
 
         createNodes();
-        this.getStylesheets().add(Objects.requireNonNull(GroupTreeView.class.getResource("GroupTree.css")).toExternalForm());
+        this.getStylesheets()
+            .add(
+                Objects
+                    .requireNonNull(
+                        GroupTreeView.class.getResource("GroupTree.css")
+                    )
+                    .toExternalForm()
+            );
         initialize();
     }
 
@@ -148,11 +166,17 @@ private void createNodes() {
 
         groupTree = new TreeTableView<>();
         groupTree.setId("groupTree");
-        groupTree.setColumnResizePolicy(TreeTableView.CONSTRAINED_RESIZE_POLICY_FLEX_LAST_COLUMN);
-        groupTree.getColumns().addAll(List.of(mainColumn, numberColumn, expansionNodeColumn));
+        groupTree.setColumnResizePolicy(
+            TreeTableView.CONSTRAINED_RESIZE_POLICY_FLEX_LAST_COLUMN
+        );
+        groupTree
+            .getColumns()
+            .addAll(List.of(mainColumn, numberColumn, expansionNodeColumn));
         this.setCenter(groupTree);
 
-        mainColumn.prefWidthProperty().bind(groupTree.widthProperty().subtract(80d).subtract(15d));
+        mainColumn
+            .prefWidthProperty()
+            .bind(groupTree.widthProperty().subtract(80d).subtract(15d));
 
         Button addNewGroup = new Button(Localization.lang("Add group"));
         addNewGroup.setId("addNewGroup");
@@ -168,7 +192,14 @@ private void createNodes() {
 
     private void initialize() {
         this.localDragboard = stateManager.getLocalDragboard();
-        viewModel = new GroupTreeViewModel(stateManager, dialogService, preferencesService, taskExecutor, localDragboard);
+        viewModel =
+            new GroupTreeViewModel(
+                stateManager,
+                dialogService,
+                preferencesService,
+                taskExecutor,
+                localDragboard
+            );
 
         // Set-up groups tree
         groupTree.getSelectionModel().setSelectionMode(SelectionMode.MULTIPLE);
@@ -176,83 +207,135 @@ private void initialize() {
 
         // Set-up bindings
         Platform.runLater(() ->
-                BindingsHelper.bindContentBidirectional(
-                        groupTree.getSelectionModel().getSelectedItems(),
-                        viewModel.selectedGroupsProperty(),
-                        newSelectedGroups -> newSelectedGroups.forEach(this::selectNode),
-                        this::updateSelection
-                ));
+            BindingsHelper.bindContentBidirectional(
+                groupTree.getSelectionModel().getSelectedItems(),
+                viewModel.selectedGroupsProperty(),
+                newSelectedGroups ->
+                    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>()
-                .withText(GroupNodeViewModel::getDisplayName)
-                .withIcon(GroupNodeViewModel::getIcon)
-                .withTooltip(GroupNodeViewModel::getDescription)
-                .install(mainColumn);
+            .withText(GroupNodeViewModel::getDisplayName)
+            .withIcon(GroupNodeViewModel::getIcon)
+            .withTooltip(GroupNodeViewModel::getDescription)
+            .install(mainColumn);
 
         // Number of hits (only if user wants to see them)
         new ViewModelTreeTableCellFactory<GroupNodeViewModel>()
-                .withGraphic(this::createNumberCell)
-                .install(numberColumn);
+            .withGraphic(this::createNumberCell)
+            .install(numberColumn);
 
         // Arrow indicating expanded status
         new ViewModelTreeTableCellFactory<GroupNodeViewModel>()
-                .withGraphic(this::getArrowCell)
-                .withOnMouseClickedEvent(group -> event -> {
+            .withGraphic(this::getArrowCell)
+            .withOnMouseClickedEvent(group ->
+                event -> {
                     group.toggleExpansion();
                     event.consume();
-                })
-                .install(expansionNodeColumn);
+                }
+            )
+            .install(expansionNodeColumn);
 
         new ViewModelTreeTableRowFactory<GroupNodeViewModel>()
-                .withContextMenu(this::createContextMenuForGroup)
-                .withEventFilter(MouseEvent.MOUSE_PRESSED, (row, event) -> {
-                    if (((MouseEvent) event).getButton() == MouseButton.SECONDARY && !stateManager.getSelectedEntries().isEmpty()) {
+            .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")) {
+                        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()))
-                .install(groupTree);
+                }
+            )
+            .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()
+                    )
+            )
+            .install(groupTree);
 
         setupDragScrolling();
 
@@ -275,56 +358,98 @@ 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(preferencesService.getGroupsPreferences().displayGroupCountProperty(),
-                shouldDisplayGroupCount -> {
-                    if (text.textProperty().isBound()) {
-                        text.textProperty().unbind();
-                        text.setText("");
-                    }
+        EasyBind.subscribe(
+            preferencesService
+                .getGroupsPreferences()
+                .displayGroupCountProperty(),
+            shouldDisplayGroupCount -> {
+                if (text.textProperty().isBound()) {
+                    text.textProperty().unbind();
+                    text.setText("");
+                }
 
-                    if (shouldDisplayGroupCount) {
-                        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);
-                    }
-                });
+                if (shouldDisplayGroupCount) {
+                    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);
+                }
+            }
+        );
         text.getStyleClass().setAll("text");
 
-        text.styleProperty().bind(Bindings.createStringBinding(() -> {
-            double reducedFontSize;
-            double font_size = preferencesService.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 String.format("-fx-font-size: %fem;", reducedFontSize);
-        }, preferencesService.getWorkspacePreferences().mainFontSizeProperty()));
+        text
+            .styleProperty()
+            .bind(
+                Bindings.createStringBinding(
+                    () -> {
+                        double reducedFontSize;
+                        double font_size = preferencesService
+                            .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 String.format(
+                            "-fx-font-size: %fem;",
+                            reducedFontSize
+                        );
+                    },
+                    preferencesService
+                        .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());
             }
@@ -344,19 +469,34 @@ 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);
+        if (
+            dragboard.hasContent(DragAndDropDataFormats.GROUP) &&
+            row.getItem().canAddGroupsIn()
+        ) {
+            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);
+                    .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;
                 }
@@ -377,9 +517,17 @@ 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
@@ -393,11 +541,21 @@ private void handleOnDragOver(TreeTableRow<GroupNodeViewModel> row, GroupNodeVie
         }
     }
 
-    private void updateSelection(List<TreeItem<GroupNodeViewModel>> newSelectedGroups) {
+    private void updateSelection(
+        List<TreeItem<GroupNodeViewModel>> newSelectedGroups
+    ) {
         if ((newSelectedGroups == null) || newSelectedGroups.isEmpty()) {
             viewModel.selectedGroupsProperty().clear();
         } else {
-            List<GroupNodeViewModel> list = newSelectedGroups.stream().filter(model -> (model != null) && !(model.getValue().getGroupNode().getGroup() instanceof AllEntriesGroup)).map(TreeItem::getValue).collect(Collectors.toList());
+            List<GroupNodeViewModel> list = newSelectedGroups
+                .stream()
+                .filter(model ->
+                    (model != null) &&
+                    !(model.getValue().getGroupNode().getGroup() instanceof
+                        AllEntriesGroup)
+                )
+                .map(TreeItem::getValue)
+                .collect(Collectors.toList());
             viewModel.selectedGroupsProperty().setAll(list);
         }
     }
@@ -408,24 +566,28 @@ 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();
-                        }
+            .ifPresent(treeItem -> {
+                if (expandParents) {
+                    TreeItem<GroupNodeViewModel> parent = treeItem.getParent();
+                    while (parent != null) {
+                        parent.setExpanded(true);
+                        parent = parent.getParent();
                     }
-                    groupTree.getSelectionModel().select(treeItem);
-                });
+                }
+                groupTree.getSelectionModel().select(treeItem);
+            });
     }
 
-    private Optional<TreeItem<GroupNodeViewModel>> getTreeItemByValue(GroupNodeViewModel value) {
+    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();
         }
@@ -449,13 +611,19 @@ private void setupDragScrolling() {
         // 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 -> {
@@ -475,14 +643,19 @@ private void setupDragScrolling() {
 
             double distanceFromNonScrollableInsideArea;
             if (scrollingUp) {
-                distanceFromNonScrollableInsideArea = scrollableAreaHeight - event.getY();
+                distanceFromNonScrollableInsideArea =
+                    scrollableAreaHeight - event.getY();
             } else {
-                distanceFromNonScrollableInsideArea = scrollableAreaHeight - (groupTree.getHeight() - event.getY());
+                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;
+            scrollVelocity =
+                (baseFactor * (1.0 + distanceFromNonScrollableInsideArea)) /
+                10.0;
             if (scrollingUp) {
                 scrollVelocity = -scrollVelocity;
             }
@@ -503,14 +676,19 @@ private void initScrolling() {
             return;
         }
 
-        double heightOfOneNode = groupTree.getChildrenUnmodifiable().get(0).getLayoutBounds().getHeight();
+        double heightOfOneNode = groupTree
+            .getChildrenUnmodifiable()
+            .get(0)
+            .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)
         heightOfOneNode = heightOfOneNode * 2.0;
 
         // At most scroll area is three entries large
-        scrollableAreaHeight = Math.min(heightOfOneNode * 3.0, groupTree.getHeight() / 3.0);
+        scrollableAreaHeight =
+            Math.min(heightOfOneNode * 3.0, groupTree.getHeight() / 3.0);
         upperBorder = scrollableAreaHeight;
         lowerBorder = groupTree.getHeight() - scrollableAreaHeight;
 
@@ -522,8 +700,10 @@ private void initScrolling() {
 
     private Optional<ScrollBar> getVerticalScrollbar() {
         for (Node node : groupTree.lookupAll(".scroll-bar")) {
-            if (node instanceof ScrollBar scrollbar
-                    && scrollbar.getOrientation().equals(Orientation.VERTICAL)) {
+            if (
+                node instanceof ScrollBar scrollbar &&
+                scrollbar.getOrientation().equals(Orientation.VERTICAL)
+            ) {
                 return Optional.of(scrollbar);
             }
         }
@@ -536,34 +716,103 @@ private ContextMenu createContextMenuForGroup(GroupNodeViewModel group) {
         }
 
         ContextMenu contextMenu = new ContextMenu();
-        ActionFactory factory = new ActionFactory(preferencesService.getKeyBindingRepository());
+        ActionFactory factory = new ActionFactory(
+            preferencesService.getKeyBindingRepository()
+        );
 
         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
+                    )
+                );
         }
 
-        contextMenu.getItems().addAll(
-                factory.createMenuItem(StandardActions.GROUP_EDIT, new ContextAction(StandardActions.GROUP_EDIT, 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)),
+                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))
-        );
+                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");
@@ -589,15 +838,25 @@ 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) {
+        } catch (
+            NoSuchMethodException
+            | IllegalAccessException
+            | InvocationTargetException ex
+        ) {
             LOGGER.error("Failed to decorate text field with clear button", ex);
         }
     }
 
     private static class DragExpansionHandler {
+
         private static final long DRAG_TIME_BEFORE_EXPANDING_MS = 1000;
         private TreeItem<GroupNodeViewModel> draggedItem;
         private long dragStarted;
@@ -610,7 +869,10 @@ public void expandGroup(TreeItem<GroupNodeViewModel> treeItem) {
                 return;
             }
 
-            if ((System.currentTimeMillis() - this.dragStarted) > DRAG_TIME_BEFORE_EXPANDING_MS) {
+            if (
+                (System.currentTimeMillis() - this.dragStarted) >
+                DRAG_TIME_BEFORE_EXPANDING_MS
+            ) {
                 // expand or collapse the tree item and reset the time
                 this.dragStarted = System.currentTimeMillis();
                 this.draggedItem.setExpanded(!this.draggedItem.isExpanded());
@@ -626,61 +888,75 @@ private class ContextAction extends SimpleCommand {
         private final StandardActions command;
         private final GroupNodeViewModel group;
 
-        public ContextAction(StandardActions command, GroupNodeViewModel group) {
+        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_SUBGROUP_ADD ->
-                        viewModel.addNewSubgroup(group, GroupDialogHeader.SUBGROUP);
-                case GROUP_SUBGROUP_REMOVE ->
-                        viewModel.removeSubgroups(group);
-                case GROUP_SUBGROUP_SORT ->
-                        viewModel.sortAlphabeticallyRecursive(group.getGroupNode());
-                case GROUP_SUBGROUP_SORT_REVERSE ->
-                        viewModel.sortReverseAlphabeticallyRecursive(group.getGroupNode());
-                case GROUP_SUBGROUP_SORT_ENTRIES ->
-                        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_SUBGROUP_ADD -> viewModel.addNewSubgroup(
+                    group,
+                    GroupDialogHeader.SUBGROUP
+                );
+                case GROUP_SUBGROUP_REMOVE -> viewModel.removeSubgroups(group);
+                case GROUP_SUBGROUP_SORT -> viewModel.sortAlphabeticallyRecursive(
+                    group.getGroupNode()
+                );
+                case GROUP_SUBGROUP_SORT_REVERSE -> viewModel.sortReverseAlphabeticallyRecursive(
+                    group.getGroupNode()
+                );
+                case GROUP_SUBGROUP_SORT_ENTRIES -> 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
+                );
             }
         }
     }
diff --git a/src/main/java/org/jabref/gui/groups/GroupTreeViewModel.java b/src/main/java/org/jabref/gui/groups/GroupTreeViewModel.java
index 1c720457053..95783d332bd 100644
--- a/src/main/java/org/jabref/gui/groups/GroupTreeViewModel.java
+++ b/src/main/java/org/jabref/gui/groups/GroupTreeViewModel.java
@@ -1,5 +1,6 @@
 package org.jabref.gui.groups;
 
+import com.tobiasdiez.easybind.EasyBind;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Comparator;
@@ -8,7 +9,6 @@
 import java.util.Optional;
 import java.util.function.Predicate;
 import java.util.stream.Collectors;
-
 import javafx.beans.property.ListProperty;
 import javafx.beans.property.ObjectProperty;
 import javafx.beans.property.SimpleListProperty;
@@ -20,7 +20,6 @@
 import javafx.scene.control.Alert;
 import javafx.scene.control.ButtonBar;
 import javafx.scene.control.ButtonType;
-
 import org.jabref.gui.AbstractViewModel;
 import org.jabref.gui.DialogService;
 import org.jabref.gui.StateManager;
@@ -41,38 +40,64 @@
 import org.jabref.model.metadata.MetaData;
 import org.jabref.preferences.PreferencesService;
 
-import com.tobiasdiez.easybind.EasyBind;
-
 public class GroupTreeViewModel extends AbstractViewModel {
 
-    private final ObjectProperty<GroupNodeViewModel> rootGroup = new SimpleObjectProperty<>();
-    private final ListProperty<GroupNodeViewModel> selectedGroups = new SimpleListProperty<>(FXCollections.observableArrayList());
+    private final ObjectProperty<GroupNodeViewModel> rootGroup =
+        new SimpleObjectProperty<>();
+    private final ListProperty<GroupNodeViewModel> selectedGroups =
+        new SimpleListProperty<>(FXCollections.observableArrayList());
     private final StateManager stateManager;
     private final DialogService dialogService;
     private final PreferencesService 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();
+    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();
+    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, PreferencesService preferencesService, TaskExecutor taskExecutor, CustomLocalDragboard localDragboard) {
+    public GroupTreeViewModel(
+        StateManager stateManager,
+        DialogService dialogService,
+        PreferencesService preferencesService,
+        TaskExecutor taskExecutor,
+        CustomLocalDragboard localDragboard
+    ) {
         this.stateManager = Objects.requireNonNull(stateManager);
         this.dialogService = Objects.requireNonNull(dialogService);
         this.preferences = Objects.requireNonNull(preferencesService);
@@ -80,18 +105,25 @@ public GroupTreeViewModel(StateManager stateManager, DialogService dialogService
         this.localDragboard = Objects.requireNonNull(localDragboard);
 
         // Register listener
-        EasyBind.subscribe(stateManager.activeDatabaseProperty(), this::onActiveDatabaseChanged);
+        EasyBind.subscribe(
+            stateManager.activeDatabaseProperty(),
+            this::onActiveDatabaseChanged
+        );
         EasyBind.subscribe(selectedGroups, this::onSelectedGroupChanged);
 
         // Set-up bindings
-        filterPredicate.bind(EasyBind.map(filterText, text -> group -> group.isMatchedBy(text)));
+        filterPredicate.bind(
+            EasyBind.map(filterText, text -> group -> group.isMatchedBy(text))
+        );
 
         // Init
         refresh();
     }
 
     private void refresh() {
-        onActiveDatabaseChanged(stateManager.activeDatabaseProperty().getValue());
+        onActiveDatabaseChanged(
+            stateManager.activeDatabaseProperty().getValue()
+        );
     }
 
     public ObjectProperty<GroupNodeViewModel> rootGroupProperty() {
@@ -102,7 +134,9 @@ public ListProperty<GroupNodeViewModel> selectedGroupsProperty() {
         return selectedGroups;
     }
 
-    public ObjectProperty<Predicate<GroupNodeViewModel>> filterPredicateProperty() {
+    public ObjectProperty<
+        Predicate<GroupNodeViewModel>
+    > filterPredicateProperty() {
         return filterPredicate;
     }
 
@@ -114,8 +148,14 @@ public StringProperty filterTextProperty() {
      * Gets invoked if the user selects a different group.
      * We need to notify the {@link StateManager} about this change so that the main table gets updated.
      */
-    private void onSelectedGroupChanged(ObservableList<GroupNodeViewModel> newValue) {
-        if (!currentDatabase.equals(stateManager.activeDatabaseProperty().getValue())) {
+    private void onSelectedGroupChanged(
+        ObservableList<GroupNodeViewModel> newValue
+    ) {
+        if (
+            !currentDatabase.equals(
+                stateManager.activeDatabaseProperty().getValue()
+            )
+        ) {
             // Switch of database occurred -> do nothing
             return;
         }
@@ -124,7 +164,13 @@ private void onSelectedGroupChanged(ObservableList<GroupNodeViewModel> newValue)
             if ((newValue == null) || newValue.isEmpty()) {
                 stateManager.clearSelectedGroups(database);
             } else {
-                stateManager.setSelectedGroups(database, newValue.stream().map(GroupNodeViewModel::getGroupNode).collect(Collectors.toList()));
+                stateManager.setSelectedGroups(
+                    database,
+                    newValue
+                        .stream()
+                        .map(GroupNodeViewModel::getGroupNode)
+                        .collect(Collectors.toList())
+                );
             }
         });
     }
@@ -136,7 +182,12 @@ 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."
+                )
+            );
         }
     }
 
@@ -144,22 +195,56 @@ public void addNewGroupToRoot() {
      * Gets invoked if the user changes the active database.
      * We need to get the new group tree and update the view
      */
-    private void onActiveDatabaseChanged(Optional<BibDatabaseContext> newDatabase) {
+    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));
+                .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.getSelectedGroup(newDatabase.get()).isEmpty()) {
-                stateManager.setSelectedGroups(newDatabase.get(), Collections.singletonList(newRoot.getGroupNode()));
+                stateManager.setSelectedGroups(
+                    newDatabase.get(),
+                    Collections.singletonList(newRoot.getGroupNode())
+                );
             }
             selectedGroups.setAll(
-                    stateManager.getSelectedGroup(newDatabase.get()).stream()
-                                .map(selectedGroup -> new GroupNodeViewModel(newDatabase.get(), stateManager, taskExecutor, selectedGroup, localDragboard, preferences))
-                                .collect(Collectors.toList()));
+                stateManager
+                    .getSelectedGroup(newDatabase.get())
+                    .stream()
+                    .map(selectedGroup ->
+                        new GroupNodeViewModel(
+                            newDatabase.get(),
+                            stateManager,
+                            taskExecutor,
+                            selectedGroup,
+                            localDragboard,
+                            preferences
+                        )
+                    )
+                    .collect(Collectors.toList())
+            );
         } else {
             rootGroup.setValue(null);
         }
@@ -169,12 +254,15 @@ 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) {
+    public void addNewSubgroup(
+        GroupNodeViewModel parent,
+        GroupDialogHeader groupDialogHeader
+    ) {
         currentDatabase.ifPresent(database -> {
-            Optional<AbstractGroup> newGroup = dialogService.showCustomDialogAndWait(new GroupDialogView(
-                    database,
-                    null,
-                    groupDialogHeader));
+            Optional<AbstractGroup> newGroup =
+                dialogService.showCustomDialogAndWait(
+                    new GroupDialogView(database, null, groupDialogHeader)
+                );
 
             newGroup.ifPresent(group -> {
                 parent.addSubgroup(group);
@@ -186,17 +274,24 @@ public void addNewSubgroup(GroupNodeViewModel parent, GroupDialogHeader groupDia
                 // TODO: Expand parent to make new group visible
                 // parent.expand();
 
-                dialogService.notify(Localization.lang("Added group \"%0\".", group.getName()));
+                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) {
+    private boolean isGroupTypeEqual(
+        AbstractGroup oldGroup,
+        AbstractGroup newGroup
+    ) {
         return oldGroup.getClass().equals(newGroup.getClass());
     }
 
@@ -214,38 +309,91 @@ boolean onlyMinorChanges(AbstractGroup oldGroup, AbstractGroup newGroup) {
             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());
+            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()
+                )
+            );
         } 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());
+            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()
+                )
+            );
         } else if (oldGroup.getClass() == AutomaticPersonsGroup.class) {
-            AutomaticPersonsGroup oldAutomaticPersonsGroup = (AutomaticPersonsGroup) oldGroup;
-            AutomaticPersonsGroup newAutomaticPersonsGroup = (AutomaticPersonsGroup) newGroup;
-
-            return Objects.equals(oldAutomaticPersonsGroup.getField().getName(), newAutomaticPersonsGroup.getField().getName());
+            AutomaticPersonsGroup oldAutomaticPersonsGroup =
+                (AutomaticPersonsGroup) oldGroup;
+            AutomaticPersonsGroup newAutomaticPersonsGroup =
+                (AutomaticPersonsGroup) newGroup;
+
+            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;
     }
@@ -255,26 +403,43 @@ boolean onlyMinorChanges(AbstractGroup oldGroup, AbstractGroup newGroup) {
      */
     public void editGroup(GroupNodeViewModel oldGroup) {
         currentDatabase.ifPresent(database -> {
-            Optional<AbstractGroup> newGroup = dialogService.showCustomDialogAndWait(new GroupDialogView(
-                    database,
-                    oldGroup.getGroupNode().getGroup(),
-                    GroupDialogHeader.SUBGROUP));
+            Optional<AbstractGroup> newGroup =
+                dialogService.showCustomDialogAndWait(
+                    new GroupDialogView(
+                        database,
+                        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);
+                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) {
+                if (
+                    groupTypeEqual &&
+                    !group.getName().equals(oldGroupName) &&
+                    onlyMinorModifications
+                ) {
                     int groupsWithSameName = 0;
-                    Optional<GroupTreeNode> databaseRootGroup = currentDatabase.get().getMetaData().getGroups();
+                    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();
+                        groupsWithSameName =
+                            databaseRootGroup
+                                .get()
+                                .findChildrenSatisfying(g ->
+                                    g.getName().equals(oldGroupName)
+                                )
+                                .size();
                     }
                     boolean removePreviousAssignments = true;
                     // We found more than 2 groups, so we cannot simply remove old assignment
@@ -282,25 +447,34 @@ public void editGroup(GroupNodeViewModel oldGroup) {
                         removePreviousAssignments = false;
                     }
 
-                    oldGroup.getGroupNode().setGroup(
+                    oldGroup
+                        .getGroupNode()
+                        .setGroup(
                             group,
                             true,
                             removePreviousAssignments,
-                            database.getEntries());
-
-                    dialogService.notify(Localization.lang("Modified group \"%0\".", group.getName()));
+                            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());
+                if (
+                    groupTypeEqual &&
+                    onlyMinorChanges(oldGroup.getGroupNode().getGroup(), group)
+                ) {
+                    oldGroup
+                        .getGroupNode()
+                        .setGroup(group, true, true, database.getEntries());
 
                     writeGroupChangesToMetaData();
                     refresh();
@@ -309,29 +483,58 @@ public void editGroup(GroupNodeViewModel oldGroup) {
 
                 // 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);
+                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)");
+                    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,
+                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);
+                        cancel
+                    );
+                boolean removePreviousAssignments =
+                    (oldGroup.getGroupNode().getGroup() instanceof
+                        ExplicitGroup) &&
+                    (group instanceof ExplicitGroup);
 
                 int groupsWithSameName = 0;
-                Optional<GroupTreeNode> databaseRootGroup = currentDatabase.get().getMetaData().getGroups();
+                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();
+                    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
@@ -339,19 +542,37 @@ public void editGroup(GroupNodeViewModel oldGroup) {
                     removePreviousAssignments = false;
                 }
 
-                if (previousAssignments.isPresent() && (previousAssignments.get().getButtonData() == ButtonBar.ButtonData.YES)) {
-                    oldGroup.getGroupNode().setGroup(
+                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(
+                            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)) {
+                            database.getEntries()
+                        );
+                } else if (
+                    previousAssignments.isPresent() &&
+                    (previousAssignments.get().getButtonData() ==
+                        ButtonBar.ButtonData.CANCEL_CLOSE)
+                ) {
                     return;
                 }
 
@@ -374,7 +595,9 @@ public void editGroup(GroupNodeViewModel oldGroup) {
                 //    undoAddPreviousEntries = UndoableChangeEntriesOfGroup.getUndoableEdit(null, addChange);
                 // }
 
-                dialogService.notify(Localization.lang("Modified group \"%0\".", group.getName()));
+                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();
@@ -384,8 +607,12 @@ public void editGroup(GroupNodeViewModel oldGroup) {
 
     public void removeSubgroups(GroupNodeViewModel group) {
         boolean confirmation = dialogService.showConfirmationDialogAndWait(
-                Localization.lang("Remove subgroups"),
-                Localization.lang("Remove all subgroups of \"%0\"?", group.getDisplayName()));
+            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");
@@ -394,7 +621,12 @@ public void removeSubgroups(GroupNodeViewModel group) {
                 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();
         }
     }
@@ -402,15 +634,24 @@ public void removeSubgroups(GroupNodeViewModel group) {
     public void removeGroupKeepSubgroups(GroupNodeViewModel group) {
         boolean confirmed;
         if (selectedGroups.size() <= 1) {
-            confirmed = dialogService.showConfirmationDialogAndWait(
+            confirmed =
+                dialogService.showConfirmationDialogAndWait(
                     Localization.lang("Remove group"),
-                    Localization.lang("Remove group \"%0\" and keep its subgroups?", group.getDisplayName()),
-                    Localization.lang("Remove"));
+                    Localization.lang(
+                        "Remove group \"%0\" and keep its subgroups?",
+                        group.getDisplayName()
+                    ),
+                    Localization.lang("Remove")
+                );
         } else {
-            confirmed = dialogService.showConfirmationDialogAndWait(
+            confirmed =
+                dialogService.showConfirmationDialogAndWait(
                     Localization.lang("Remove groups"),
-                    Localization.lang("Remove all selected groups and keep their subgroups?"),
-                    Localization.lang("Remove all"));
+                    Localization.lang(
+                        "Remove all selected groups and keep their subgroups?"
+                    ),
+                    Localization.lang("Remove all")
+                );
         }
 
         if (confirmed) {
@@ -418,19 +659,34 @@ public void removeGroupKeepSubgroups(GroupNodeViewModel group) {
             // final UndoableAddOrRemoveGroup undo = new UndoableAddOrRemoveGroup(groupsRoot, node, UndoableAddOrRemoveGroup.REMOVE_NODE_KEEP_CHILDREN);
             // panel.getUndoManager().addEdit(undo);
 
-            List<GroupNodeViewModel> selectedGroupNodes = new ArrayList<>(selectedGroups);
+            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
+                    .getParent()
+                    .ifPresent(parent ->
+                        groupNode.moveAllChildrenTo(
+                            parent,
+                            parent.getIndexOfChild(groupNode).get()
+                        )
+                    );
                 groupNode.removeFromParent();
             });
 
             if (selectedGroupNodes.size() > 1) {
-                dialogService.notify(Localization.lang("Removed all selected groups."));
+                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();
         }
@@ -442,15 +698,24 @@ public void removeGroupKeepSubgroups(GroupNodeViewModel group) {
     public void removeGroupAndSubgroups(GroupNodeViewModel group) {
         boolean confirmed;
         if (selectedGroups.size() <= 1) {
-            confirmed = dialogService.showConfirmationDialogAndWait(
+            confirmed =
+                dialogService.showConfirmationDialogAndWait(
                     Localization.lang("Remove group and subgroups"),
-                    Localization.lang("Remove group \"%0\" and its subgroups?", group.getDisplayName()),
-                    Localization.lang("Remove"));
+                    Localization.lang(
+                        "Remove group \"%0\" and its subgroups?",
+                        group.getDisplayName()
+                    ),
+                    Localization.lang("Remove")
+                );
         } else {
-            confirmed = dialogService.showConfirmationDialogAndWait(
+            confirmed =
+                dialogService.showConfirmationDialogAndWait(
                     Localization.lang("Remove groups and subgroups"),
-                    Localization.lang("Remove all selected groups and their subgroups?"),
-                    Localization.lang("Remove all"));
+                    Localization.lang(
+                        "Remove all selected groups and their subgroups?"
+                    ),
+                    Localization.lang("Remove all")
+                );
         }
 
         if (confirmed) {
@@ -458,16 +723,27 @@ public void removeGroupAndSubgroups(GroupNodeViewModel group) {
             // final UndoableAddOrRemoveGroup undo = new UndoableAddOrRemoveGroup(groupsRoot, node, UndoableAddOrRemoveGroup.REMOVE_NODE_AND_CHILDREN);
             // panel.getUndoManager().addEdit(undo);
 
-            ArrayList<GroupNodeViewModel> selectedGroupNodes = new ArrayList<>(selectedGroups);
+            ArrayList<GroupNodeViewModel> selectedGroupNodes = new ArrayList<>(
+                selectedGroups
+            );
             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();
         }
@@ -479,15 +755,24 @@ public void removeGroupAndSubgroups(GroupNodeViewModel group) {
     public void removeGroupNoSubgroups(GroupNodeViewModel group) {
         boolean confirmed;
         if (selectedGroups.size() <= 1) {
-            confirmed = dialogService.showConfirmationDialogAndWait(
+            confirmed =
+                dialogService.showConfirmationDialogAndWait(
                     Localization.lang("Remove group"),
-                    Localization.lang("Remove group \"%0\"?", group.getDisplayName()),
-                    Localization.lang("Remove"));
+                    Localization.lang(
+                        "Remove group \"%0\"?",
+                        group.getDisplayName()
+                    ),
+                    Localization.lang("Remove")
+                );
         } else {
-            confirmed = dialogService.showConfirmationDialogAndWait(
+            confirmed =
+                dialogService.showConfirmationDialogAndWait(
                     Localization.lang("Remove groups and subgroups"),
-                    Localization.lang("Remove all selected groups and their subgroups?"),
-                    Localization.lang("Remove all"));
+                    Localization.lang(
+                        "Remove all selected groups and their subgroups?"
+                    ),
+                    Localization.lang("Remove all")
+                );
         }
 
         if (confirmed) {
@@ -495,16 +780,25 @@ public void removeGroupNoSubgroups(GroupNodeViewModel group) {
             // final UndoableAddOrRemoveGroup undo = new UndoableAddOrRemoveGroup(groupsRoot, node, UndoableAddOrRemoveGroup.REMOVE_NODE_WITHOUT_CHILDREN);
             // panel.getUndoManager().addEdit(undo);
 
-            ArrayList<GroupNodeViewModel> selectedGroupNodes = new ArrayList<>(selectedGroups);
+            ArrayList<GroupNodeViewModel> selectedGroupNodes = new ArrayList<>(
+                selectedGroups
+            );
             selectedGroupNodes.forEach(eachNode -> {
                 removeGroupsAndSubGroupsFromEntries(eachNode);
                 eachNode.getGroupNode().removeFromParent();
             });
 
             if (selectedGroupNodes.size() > 1) {
-                dialogService.notify(Localization.lang("Removed all selected groups."));
+                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();
         }
@@ -519,12 +813,21 @@ void removeGroupsAndSubGroupsFromEntries(GroupNodeViewModel group) {
         if (group.getGroupNode().getGroup() instanceof ExplicitGroup) {
             int groupsWithSameName = 0;
             String name = group.getGroupNode().getGroup().getName();
-            Optional<GroupTreeNode> rootGroup = currentDatabase.get().getMetaData().getGroups();
+            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);
             }
         }
@@ -535,8 +838,9 @@ public void addSelectedEntries(GroupNodeViewModel group) {
         // if (!WarnAssignmentSideEffects.warnAssignmentSideEffects(node.getNode().getGroup(), panel.frame())) {
         //    return; // user aborted operation
 
-        group.getGroupNode().addEntriesToGroup(stateManager.getSelectedEntries());
-
+        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)); }
@@ -563,8 +867,9 @@ public void removeSelectedEntries(GroupNodeViewModel group) {
         // if (!WarnAssignmentSideEffects.warnAssignmentSideEffects(mNode.getNode().getGroup(), mPanel.frame())) {
         //    return; // user aborted operation
 
-        group.getGroupNode().removeEntriesFromGroup(stateManager.getSelectedEntries());
-
+        group
+            .getGroupNode()
+            .removeEntriesFromGroup(stateManager.getSelectedEntries());
         // TODO: Add undo
         // if (!undo.isEmpty()) {
         //    mPanel.getUndoManager().addEdit(UndoableChangeEntriesOfGroup.getUndoableEdit(mNode, undo));
diff --git a/src/main/java/org/jabref/gui/groups/GroupViewMode.java b/src/main/java/org/jabref/gui/groups/GroupViewMode.java
index 564c85496e6..0631733e9bc 100644
--- a/src/main/java/org/jabref/gui/groups/GroupViewMode.java
+++ b/src/main/java/org/jabref/gui/groups/GroupViewMode.java
@@ -1,4 +1,6 @@
 package org.jabref.gui.groups;
 
-public enum GroupViewMode { INTERSECTION, UNION }
-
+public enum GroupViewMode {
+    INTERSECTION,
+    UNION,
+}
diff --git a/src/main/java/org/jabref/gui/groups/GroupsPreferences.java b/src/main/java/org/jabref/gui/groups/GroupsPreferences.java
index e83d5546daa..0d44157b670 100644
--- a/src/main/java/org/jabref/gui/groups/GroupsPreferences.java
+++ b/src/main/java/org/jabref/gui/groups/GroupsPreferences.java
@@ -4,7 +4,6 @@
 import javafx.beans.property.ObjectProperty;
 import javafx.beans.property.SimpleBooleanProperty;
 import javafx.beans.property.SimpleObjectProperty;
-
 import org.jabref.model.groups.GroupHierarchyType;
 
 public class GroupsPreferences {
@@ -14,15 +13,19 @@ public class GroupsPreferences {
     private final BooleanProperty shouldDisplayGroupCount;
     private final ObjectProperty<GroupHierarchyType> defaultHierarchicalContext;
 
-    public GroupsPreferences(GroupViewMode groupViewMode,
-                             boolean shouldAutoAssignGroup,
-                             boolean shouldDisplayGroupCount,
-                             GroupHierarchyType defaultHierarchicalContext) {
-
+    public GroupsPreferences(
+        GroupViewMode groupViewMode,
+        boolean shouldAutoAssignGroup,
+        boolean shouldDisplayGroupCount,
+        GroupHierarchyType defaultHierarchicalContext
+    ) {
         this.groupViewMode = new SimpleObjectProperty<>(groupViewMode);
-        this.shouldAutoAssignGroup = new SimpleBooleanProperty(shouldAutoAssignGroup);
-        this.shouldDisplayGroupCount = new SimpleBooleanProperty(shouldDisplayGroupCount);
-        this.defaultHierarchicalContext = new SimpleObjectProperty<>(defaultHierarchicalContext);
+        this.shouldAutoAssignGroup =
+            new SimpleBooleanProperty(shouldAutoAssignGroup);
+        this.shouldDisplayGroupCount =
+            new SimpleBooleanProperty(shouldDisplayGroupCount);
+        this.defaultHierarchicalContext =
+            new SimpleObjectProperty<>(defaultHierarchicalContext);
     }
 
     public GroupViewMode getGroupViewMode() {
@@ -65,11 +68,15 @@ public GroupHierarchyType getDefaultHierarchicalContext() {
         return defaultHierarchicalContext.get();
     }
 
-    public ObjectProperty<GroupHierarchyType> defaultHierarchicalContextProperty() {
+    public ObjectProperty<
+        GroupHierarchyType
+    > defaultHierarchicalContextProperty() {
         return defaultHierarchicalContext;
     }
 
-    public void setDefaultHierarchicalContext(GroupHierarchyType defaultHierarchicalContext) {
+    public void setDefaultHierarchicalContext(
+        GroupHierarchyType defaultHierarchicalContext
+    ) {
         this.defaultHierarchicalContext.set(defaultHierarchicalContext);
     }
 }
diff --git a/src/main/java/org/jabref/gui/groups/MoveGroupChange.java b/src/main/java/org/jabref/gui/groups/MoveGroupChange.java
index e52f9cbef8d..e312d541b32 100644
--- a/src/main/java/org/jabref/gui/groups/MoveGroupChange.java
+++ b/src/main/java/org/jabref/gui/groups/MoveGroupChange.java
@@ -13,7 +13,12 @@ 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 1ff64104841..53193339a5f 100644
--- a/src/main/java/org/jabref/gui/groups/UndoableAddOrRemoveGroup.java
+++ b/src/main/java/org/jabref/gui/groups/UndoableAddOrRemoveGroup.java
@@ -1,7 +1,6 @@
 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;
@@ -63,17 +62,22 @@ 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 +126,11 @@ 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);
@@ -142,10 +149,14 @@ private void doOperation(boolean undo) {
                 case REMOVE_NODE_KEEP_CHILDREN:
                     // remove node, then insert all children
                     GroupTreeNode removedNode = cursor
-                            .getChildAt(childIndex).get();
+                        .getChildAt(childIndex)
+                        .get();
                     cursor.removeChild(childIndex);
                     while (removedNode.getNumberOfChildren() > 0) {
-                        removedNode.getFirstChild().get().moveTo(cursor, childIndex);
+                        removedNode
+                            .getFirstChild()
+                            .get()
+                            .moveTo(cursor, childIndex);
                     }
                     break;
                 case REMOVE_NODE_AND_CHILDREN:
diff --git a/src/main/java/org/jabref/gui/groups/UndoableChangeEntriesOfGroup.java b/src/main/java/org/jabref/gui/groups/UndoableChangeEntriesOfGroup.java
index 3f4b36b6351..cc7c3f5f1fa 100644
--- a/src/main/java/org/jabref/gui/groups/UndoableChangeEntriesOfGroup.java
+++ b/src/main/java/org/jabref/gui/groups/UndoableChangeEntriesOfGroup.java
@@ -1,9 +1,7 @@
 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;
@@ -11,12 +9,16 @@
 
 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 8f92c717259..24ca7681a15 100644
--- a/src/main/java/org/jabref/gui/groups/UndoableModifySubtree.java
+++ b/src/main/java/org/jabref/gui/groups/UndoableModifySubtree.java
@@ -2,7 +2,6 @@
 
 import java.util.ArrayList;
 import java.util.List;
-
 import org.jabref.gui.undo.AbstractUndoableJabRefEdit;
 import org.jabref.model.groups.GroupTreeNode;
 
@@ -30,8 +29,11 @@ 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 +51,9 @@ 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 +65,9 @@ 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 c4f367d31f7..bc59f38bbe7 100644
--- a/src/main/java/org/jabref/gui/groups/UndoableMoveGroup.java
+++ b/src/main/java/org/jabref/gui/groups/UndoableMoveGroup.java
@@ -2,7 +2,6 @@
 
 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;
@@ -15,7 +14,10 @@ class UndoableMoveGroup extends AbstractUndoableJabRefEdit {
     private final List<Integer> pathToOldParent;
     private final int oldChildIndex;
 
-    public UndoableMoveGroup(GroupTreeNodeViewModel root, MoveGroupChange moveChange) {
+    public UndoableMoveGroup(
+        GroupTreeNodeViewModel root,
+        MoveGroupChange moveChange
+    ) {
         this.root = Objects.requireNonNull(root);
         Objects.requireNonNull(moveChange);
         pathToOldParent = moveChange.getOldParent().getIndexedPathFromRoot();
@@ -33,19 +35,31 @@ public String getPresentationName() {
     public void undo() {
         super.undo();
 
-        GroupTreeNode newParent = root.getNode().getDescendant(pathToNewParent).get(); // TODO: NULL
+        GroupTreeNode newParent = root
+            .getNode()
+            .getDescendant(pathToNewParent)
+            .get(); // TODO: NULL
         GroupTreeNode node = newParent.getChildAt(newChildIndex).get(); // TODO: Null
         // TODO: NULL
-        node.moveTo(root.getNode().getDescendant(pathToOldParent).get(), oldChildIndex);
+        node.moveTo(
+            root.getNode().getDescendant(pathToOldParent).get(),
+            oldChildIndex
+        );
     }
 
     @Override
     public void redo() {
         super.redo();
 
-        GroupTreeNode oldParent = root.getNode().getDescendant(pathToOldParent).get(); // TODO: NULL
+        GroupTreeNode oldParent = root
+            .getNode()
+            .getDescendant(pathToOldParent)
+            .get(); // TODO: NULL
         GroupTreeNode node = oldParent.getChildAt(oldChildIndex).get(); // TODO:Null
         // TODO: NULL
-        node.moveTo(root.getNode().getDescendant(pathToNewParent).get(), newChildIndex);
+        node.moveTo(
+            root.getNode().getDescendant(pathToNewParent).get(),
+            newChildIndex
+        );
     }
 }
diff --git a/src/main/java/org/jabref/gui/help/AboutAction.java b/src/main/java/org/jabref/gui/help/AboutAction.java
index 9cc3a5447ee..7d22fddcd95 100644
--- a/src/main/java/org/jabref/gui/help/AboutAction.java
+++ b/src/main/java/org/jabref/gui/help/AboutAction.java
@@ -1,10 +1,9 @@
 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;
@@ -15,7 +14,9 @@ public AboutAction() {
 
     @Override
     public void execute() {
-        DialogService dialogService = Injector.instantiateModelOrService(DialogService.class);
+        DialogService dialogService = Injector.instantiateModelOrService(
+            DialogService.class
+        );
         dialogService.showCustomDialog(aboutDialogView);
     }
 
diff --git a/src/main/java/org/jabref/gui/help/AboutDialogView.java b/src/main/java/org/jabref/gui/help/AboutDialogView.java
index 6698ecce3ca..f7114281177 100644
--- a/src/main/java/org/jabref/gui/help/AboutDialogView.java
+++ b/src/main/java/org/jabref/gui/help/AboutDialogView.java
@@ -1,9 +1,10 @@
 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;
-
 import org.jabref.gui.ClipBoardManager;
 import org.jabref.gui.DialogService;
 import org.jabref.gui.util.BaseDialog;
@@ -12,29 +13,38 @@
 import org.jabref.logic.util.BuildInfo;
 import org.jabref.preferences.PreferencesService;
 
-import com.airhacks.afterburner.views.ViewLoader;
-import jakarta.inject.Inject;
-
 public class AboutDialogView extends BaseDialog<Void> {
 
-    @FXML private ButtonType copyVersionButton;
-    @FXML private TextArea textAreaVersions;
+    @FXML
+    private ButtonType copyVersionButton;
+
+    @FXML
+    private TextArea textAreaVersions;
+
+    @Inject
+    private DialogService dialogService;
+
+    @Inject
+    private PreferencesService preferencesService;
+
+    @Inject
+    private ClipBoardManager clipBoardManager;
 
-    @Inject private DialogService dialogService;
-    @Inject private PreferencesService preferencesService;
-    @Inject private ClipBoardManager clipBoardManager;
-    @Inject private BuildInfo buildInfo;
+    @Inject
+    private BuildInfo buildInfo;
 
     private AboutDialogViewModel viewModel;
 
     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 +53,13 @@ public AboutDialogViewModel getViewModel() {
 
     @FXML
     private void initialize() {
-        viewModel = new AboutDialogViewModel(dialogService, preferencesService, clipBoardManager, buildInfo);
+        viewModel =
+            new AboutDialogViewModel(
+                dialogService,
+                preferencesService,
+                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 4a14c8b836c..bd4635eec8e 100644
--- a/src/main/java/org/jabref/gui/help/AboutDialogViewModel.java
+++ b/src/main/java/org/jabref/gui/help/AboutDialogViewModel.java
@@ -1,15 +1,14 @@
 package org.jabref.gui.help;
 
+import com.google.common.collect.Lists;
 import java.io.IOException;
 import java.util.Locale;
 import java.util.Objects;
 import java.util.stream.Collectors;
-
 import javafx.beans.property.ReadOnlyBooleanProperty;
 import javafx.beans.property.ReadOnlyBooleanWrapper;
 import javafx.beans.property.ReadOnlyStringProperty;
 import javafx.beans.property.ReadOnlyStringWrapper;
-
 import org.jabref.gui.AbstractViewModel;
 import org.jabref.gui.ClipBoardManager;
 import org.jabref.gui.DialogService;
@@ -17,8 +16,6 @@
 import org.jabref.logic.l10n.Localization;
 import org.jabref.logic.util.BuildInfo;
 import org.jabref.preferences.PreferencesService;
-
-import com.google.common.collect.Lists;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -26,25 +23,40 @@ 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.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 static final String LICENSE_URL =
+        "https://github.com/JabRef/jabref/blob/main/LICENSE.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();
-    private final Logger logger = LoggerFactory.getLogger(AboutDialogViewModel.class);
+    private final ReadOnlyStringWrapper environmentInfo =
+        new ReadOnlyStringWrapper();
+    private final Logger logger = LoggerFactory.getLogger(
+        AboutDialogViewModel.class
+    );
     private final ReadOnlyStringWrapper heading = new ReadOnlyStringWrapper();
-    private final ReadOnlyStringWrapper maintainers = new ReadOnlyStringWrapper();
+    private final ReadOnlyStringWrapper maintainers =
+        new ReadOnlyStringWrapper();
     private final ReadOnlyStringWrapper license = new ReadOnlyStringWrapper();
-    private final ReadOnlyBooleanWrapper isDevelopmentVersion = new ReadOnlyBooleanWrapper();
+    private final ReadOnlyBooleanWrapper isDevelopmentVersion =
+        new ReadOnlyBooleanWrapper();
     private final DialogService dialogService;
     private final PreferencesService preferencesService;
-    private final ReadOnlyStringWrapper developmentVersion = new ReadOnlyStringWrapper();
+    private final ReadOnlyStringWrapper developmentVersion =
+        new ReadOnlyStringWrapper();
     private final ClipBoardManager clipBoardManager;
 
-    public AboutDialogViewModel(DialogService dialogService, PreferencesService preferencesService, ClipBoardManager clipBoardManager, BuildInfo buildInfo) {
+    public AboutDialogViewModel(
+        DialogService dialogService,
+        PreferencesService preferencesService,
+        ClipBoardManager clipBoardManager,
+        BuildInfo buildInfo
+    ) {
         this.dialogService = Objects.requireNonNull(dialogService);
         this.preferencesService = Objects.requireNonNull(preferencesService);
         this.clipBoardManager = Objects.requireNonNull(clipBoardManager);
@@ -55,18 +67,31 @@ public AboutDialogViewModel(DialogService dialogService, PreferencesService pref
             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);
+        String javafx_version = System
+            .getProperty("javafx.runtime.version", BuildInfo.UNKNOWN_VERSION)
+            .toLowerCase(Locale.ROOT);
 
-        versionInfo = String.format("JabRef %s%n%s %s %s %nJava %s %nJavaFX %s", buildInfo.version, BuildInfo.OS,
-                BuildInfo.OS_VERSION, BuildInfo.OS_ARCH, BuildInfo.JAVA_VERSION, javafx_version);
+        versionInfo =
+            String.format(
+                "JabRef %s%n%s %s %s %nJava %s %nJavaFX %s",
+                buildInfo.version,
+                BuildInfo.OS,
+                BuildInfo.OS_VERSION,
+                BuildInfo.OS_ARCH,
+                BuildInfo.JAVA_VERSION,
+                javafx_version
+            );
     }
 
     public String getDevelopmentVersion() {
@@ -152,9 +177,15 @@ public void openDonation() {
 
     private void openWebsite(String url) {
         try {
-            JabRefDesktop.openBrowser(url, preferencesService.getFilePreferences());
+            JabRefDesktop.openBrowser(
+                url,
+                preferencesService.getFilePreferences()
+            );
         } catch (IOException e) {
-            dialogService.showErrorDialogAndWait(Localization.lang("Could not open website."), e);
+            dialogService.showErrorDialogAndWait(
+                Localization.lang("Could not open website."),
+                e
+            );
             logger.error("Could not open default browser.", e);
         }
     }
diff --git a/src/main/java/org/jabref/gui/help/ErrorConsoleAction.java b/src/main/java/org/jabref/gui/help/ErrorConsoleAction.java
index a27ffacee40..657a304ed32 100644
--- a/src/main/java/org/jabref/gui/help/ErrorConsoleAction.java
+++ b/src/main/java/org/jabref/gui/help/ErrorConsoleAction.java
@@ -1,11 +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 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,
@@ -17,7 +16,9 @@ public class ErrorConsoleAction extends SimpleCommand {
 
     @Override
     public void execute() {
-        DialogService dialogService = Injector.instantiateModelOrService(DialogService.class);
+        DialogService dialogService = Injector.instantiateModelOrService(
+            DialogService.class
+        );
         dialogService.showCustomDialog(new ErrorConsoleView());
     }
 }
diff --git a/src/main/java/org/jabref/gui/help/HelpAction.java b/src/main/java/org/jabref/gui/help/HelpAction.java
index 816e215731d..0d7b19e44c7 100644
--- a/src/main/java/org/jabref/gui/help/HelpAction.java
+++ b/src/main/java/org/jabref/gui/help/HelpAction.java
@@ -16,7 +16,11 @@ public class HelpAction extends SimpleCommand {
     private final DialogService dialogService;
     private final FilePreferences filePreferences;
 
-    public HelpAction(HelpFile helpPage, DialogService dialogService, FilePreferences filePreferences) {
+    public HelpAction(
+        HelpFile helpPage,
+        DialogService dialogService,
+        FilePreferences filePreferences
+    ) {
         this.helpPage = helpPage;
         this.dialogService = dialogService;
         this.filePreferences = filePreferences;
@@ -25,7 +29,11 @@ public HelpAction(HelpFile helpPage, DialogService dialogService, FilePreference
     void openHelpPage(HelpFile helpPage) {
         StringBuilder sb = new StringBuilder("https://docs.jabref.org/");
         sb.append(helpPage.getPageName());
-        JabRefDesktop.openBrowserShowPopup(sb.toString(), dialogService, filePreferences);
+        JabRefDesktop.openBrowserShowPopup(
+            sb.toString(),
+            dialogService,
+            filePreferences
+        );
     }
 
     @Override
diff --git a/src/main/java/org/jabref/gui/help/NewVersionDialog.java b/src/main/java/org/jabref/gui/help/NewVersionDialog.java
index 7f51da7b2a9..a28ee0de2f3 100644
--- a/src/main/java/org/jabref/gui/help/NewVersionDialog.java
+++ b/src/main/java/org/jabref/gui/help/NewVersionDialog.java
@@ -6,7 +6,6 @@
 import javafx.scene.control.Hyperlink;
 import javafx.scene.control.Label;
 import javafx.scene.layout.VBox;
-
 import org.jabref.gui.DialogService;
 import org.jabref.gui.desktop.JabRefDesktop;
 import org.jabref.gui.util.BaseDialog;
@@ -16,34 +15,71 @@
 
 public class NewVersionDialog extends BaseDialog<Boolean> {
 
-    public NewVersionDialog(Version currentVersion, Version latestVersion, DialogService dialogService, FilePreferences filePreferences) {
+    public NewVersionDialog(
+        Version currentVersion,
+        Version latestVersion,
+        DialogService dialogService,
+        FilePreferences filePreferences
+    ) {
         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);
+        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) {
-                JabRefDesktop.openBrowserShowPopup(Version.JABREF_DOWNLOAD_URL, dialogService, filePreferences);
-            }
-            return true;
-        });
-        Button defaultButton = (Button) this.getDialogPane().lookupButton(btnDownloadUpdate);
+                if (button == btnIgnoreUpdate) {
+                    return false;
+                } else if (button == btnDownloadUpdate) {
+                    JabRefDesktop.openBrowserShowPopup(
+                        Version.JABREF_DOWNLOAD_URL,
+                        dialogService,
+                        filePreferences
+                    );
+                }
+                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."));
+        Hyperlink lblMoreInformation = new Hyperlink(
+            Localization.lang("To see what is new view the changelog.")
+        );
         lblMoreInformation.setOnAction(event ->
-                JabRefDesktop.openBrowserShowPopup(latestVersion.getChangelogUrl(), dialogService, filePreferences)
+            JabRefDesktop.openBrowserShowPopup(
+                latestVersion.getChangelogUrl(),
+                dialogService,
+                filePreferences
+            )
         );
 
         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
+            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 9d0f12ea503..84d47e8e063 100644
--- a/src/main/java/org/jabref/gui/help/SearchForUpdateAction.java
+++ b/src/main/java/org/jabref/gui/help/SearchForUpdateAction.java
@@ -13,21 +13,32 @@ public class SearchForUpdateAction extends SimpleCommand {
     private final DialogService dialogService;
     private final TaskExecutor taskExecutor;
 
-    public SearchForUpdateAction(BuildInfo buildInfo,
-                                 PreferencesService preferencesService,
-                                 DialogService dialogService,
-                                 TaskExecutor taskExecutor) {
+    public SearchForUpdateAction(
+        BuildInfo buildInfo,
+        PreferencesService preferencesService,
+        DialogService dialogService,
+        TaskExecutor taskExecutor
+    ) {
         this.buildInfo = buildInfo;
         this.preferencesService = preferencesService;
         this.dialogService = dialogService;
         this.taskExecutor = taskExecutor;
 
-        this.executable.bind(preferencesService.getInternalPreferences().versionCheckEnabledProperty());
+        this.executable.bind(
+                preferencesService
+                    .getInternalPreferences()
+                    .versionCheckEnabledProperty()
+            );
     }
 
     @Override
     public void execute() {
-        new VersionWorker(buildInfo.version, dialogService, taskExecutor, preferencesService)
-                .checkForNewVersionAsync();
+        new VersionWorker(
+            buildInfo.version,
+            dialogService,
+            taskExecutor,
+            preferencesService
+        )
+            .checkForNewVersionAsync();
     }
 }
diff --git a/src/main/java/org/jabref/gui/help/VersionWorker.java b/src/main/java/org/jabref/gui/help/VersionWorker.java
index 5a21e89cf78..813507fb1c5 100644
--- a/src/main/java/org/jabref/gui/help/VersionWorker.java
+++ b/src/main/java/org/jabref/gui/help/VersionWorker.java
@@ -5,7 +5,6 @@
 import java.util.Objects;
 import java.util.Optional;
 import java.util.concurrent.TimeUnit;
-
 import org.jabref.gui.DialogService;
 import org.jabref.gui.util.BackgroundTask;
 import org.jabref.gui.util.TaskExecutor;
@@ -14,7 +13,6 @@
 import org.jabref.preferences.FilePreferences;
 import org.jabref.preferences.InternalPreferences;
 import org.jabref.preferences.PreferencesService;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -28,7 +26,9 @@
  */
 public class VersionWorker {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(VersionWorker.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(
+        VersionWorker.class
+    );
 
     /**
      * The current version of the installed JabRef
@@ -40,10 +40,12 @@ public class VersionWorker {
     private final InternalPreferences internalPreferences;
     private final FilePreferences filePreferences;
 
-    public VersionWorker(Version installedVersion,
-                         DialogService dialogService,
-                         TaskExecutor taskExecutor,
-                         PreferencesService preferencesService) {
+    public VersionWorker(
+        Version installedVersion,
+        DialogService dialogService,
+        TaskExecutor taskExecutor,
+        PreferencesService preferencesService
+    ) {
         this.installedVersion = Objects.requireNonNull(installedVersion);
         this.dialogService = Objects.requireNonNull(dialogService);
         this.taskExecutor = Objects.requireNonNull(taskExecutor);
@@ -65,10 +67,11 @@ public void checkForNewVersionAsync() {
             return;
         }
 
-        BackgroundTask.wrap(this::getNewVersion)
-                      .onSuccess(version -> showUpdateInfo(version, true))
-                      .onFailure(exception -> showConnectionError(exception, true))
-                      .executeWith(taskExecutor);
+        BackgroundTask
+            .wrap(this::getNewVersion)
+            .onSuccess(version -> showUpdateInfo(version, true))
+            .onFailure(exception -> showConnectionError(exception, true))
+            .executeWith(taskExecutor);
     }
 
     public void checkForNewVersionDelayed() {
@@ -76,20 +79,32 @@ public void checkForNewVersionDelayed() {
             return;
         }
 
-        BackgroundTask.wrap(this::getNewVersion)
-                      .onSuccess(version -> showUpdateInfo(version, false))
-                      .onFailure(exception -> showConnectionError(exception, false))
-                      .scheduleWith(taskExecutor, 30, TimeUnit.SECONDS);
+        BackgroundTask
+            .wrap(this::getNewVersion)
+            .onSuccess(version -> showUpdateInfo(version, false))
+            .onFailure(exception -> showConnectionError(exception, false))
+            .scheduleWith(taskExecutor, 30, TimeUnit.SECONDS);
     }
 
     /**
      * Prints the connection problem to the status bar and shows a dialog if it was executed manually
      */
-    private void showConnectionError(Exception exception, boolean manualExecution) {
+    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 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
+            );
         }
         LOGGER.debug("Could not connect to the update server.", exception);
     }
@@ -98,16 +113,37 @@ private void showConnectionError(Exception exception, boolean manualExecution) {
      * Prints up-to-date to the status bar (and shows a dialog it was executed manually) if there is now new version.
      * Shows a "New Version" Dialog to the user if there is.
      */
-    private void showUpdateInfo(Optional<Version> newerVersion, boolean manualExecution) {
+    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)) {
+        if (
+            newerVersion.isEmpty() ||
+            (newerVersion
+                    .get()
+                    .equals(internalPreferences.getIgnoredVersion()) &&
+                !manualExecution)
+        ) {
             if (manualExecution) {
-                dialogService.notify(Localization.lang("JabRef is up-to-date."));
+                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, filePreferences))
-                             .orElse(true)) {
+            if (
+                dialogService
+                    .showCustomDialogAndWait(
+                        new NewVersionDialog(
+                            installedVersion,
+                            newerVersion.get(),
+                            dialogService,
+                            filePreferences
+                        )
+                    )
+                    .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 05beb9a51f7..9c8bd284fc5 100644
--- a/src/main/java/org/jabref/gui/icon/IconTheme.java
+++ b/src/main/java/org/jabref/gui/icon/IconTheme.java
@@ -1,5 +1,7 @@
 package org.jabref.gui.icon;
 
+import static java.util.EnumSet.allOf;
+
 import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.InputStreamReader;
@@ -15,13 +17,11 @@
 import java.util.Optional;
 import java.util.ServiceLoader;
 import java.util.Set;
-
 import javafx.scene.Node;
 import javafx.scene.control.Button;
 import javafx.scene.control.ToggleButton;
 import javafx.scene.image.Image;
 import javafx.scene.paint.Color;
-
 import org.kordamp.ikonli.Ikon;
 import org.kordamp.ikonli.IkonProvider;
 import org.kordamp.ikonli.materialdesign2.MaterialDesignA;
@@ -48,15 +48,18 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import static java.util.EnumSet.allOf;
-
 public class IconTheme {
 
     public static final Color DEFAULT_DISABLED_COLOR = Color.web("#c8c8c8");
     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 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 Set<Ikon> ICON_NAMES = new HashSet<>();
 
     public static Color getDefaultGroupColor() {
@@ -67,8 +70,15 @@ 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() {
@@ -76,7 +86,9 @@ public static Image getJabRefImage() {
     }
 
     private static void loadAllIkons() {
-        ServiceLoader<IkonProvider> providers = ServiceLoader.load(IkonProvider.class);
+        ServiceLoader<IkonProvider> providers = ServiceLoader.load(
+            IkonProvider.class
+        );
 
         for (IkonProvider provider : providers) {
             ICON_NAMES.addAll(allOf(provider.getIkon()));
@@ -104,11 +116,18 @@ 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 " + name + ", so falling back on default icon "
-                        + DEFAULT_ICON_PATH);
+            LOGGER.warn(
+                "Could not find icon url by name " +
+                name +
+                ", so falling back on default icon " +
+                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
+        );
     }
 
     /**
@@ -122,14 +141,23 @@ public static URL getIconUrl(String name) {
      * @return A Map containing all key-value pairs found.
      */
     // FIXME: prefix can be removed?!
-    private static Map<String, String> readIconThemeFile(URL url, String prefix) {
+    private static Map<String, String> readIconThemeFile(
+        URL url,
+        String prefix
+    ) {
         Objects.requireNonNull(url, "url");
         Objects.requireNonNull(prefix, "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("=")) {
@@ -161,7 +189,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),
@@ -212,11 +239,41 @@ 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),
@@ -352,6 +409,7 @@ public enum JabRefIcons implements JabRefIcon {
         ACCEPT_LEFT(MaterialDesignS.SUBDIRECTORY_ARROW_LEFT),
         ACCEPT_RIGHT(MaterialDesignS.SUBDIRECTORY_ARROW_RIGHT),
         MERGE_GROUPS(MaterialDesignS.SOURCE_MERGE);
+
         private final JabRefIcon icon;
 
         JabRefIcons(Ikon... icons) {
diff --git a/src/main/java/org/jabref/gui/icon/InternalMaterialDesignIcon.java b/src/main/java/org/jabref/gui/icon/InternalMaterialDesignIcon.java
index 7beb065f7c2..8ce08e50de6 100644
--- a/src/main/java/org/jabref/gui/icon/InternalMaterialDesignIcon.java
+++ b/src/main/java/org/jabref/gui/icon/InternalMaterialDesignIcon.java
@@ -4,12 +4,9 @@
 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;
 
@@ -34,7 +31,12 @@ 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();
     }
 
@@ -44,17 +46,24 @@ public Node getGraphicNode() {
         FontIcon fontIcon = FontIcon.of(icon);
         fontIcon.getStyleClass().add("glyph-icon");
 
-//      Override the default color from the css files
-        color.ifPresent(color -> fontIcon.setStyle(fontIcon.getStyle() +
+        //      Override the default color from the css files
+        color.ifPresent(color ->
+            fontIcon.setStyle(
+                fontIcon.getStyle() +
                 String.format("-fx-fill: %s;", ColorUtil.toRGBCode(color)) +
-                String.format("-fx-icon-color: %s;", ColorUtil.toRGBCode(color))));
+                String.format("-fx-icon-color: %s;", ColorUtil.toRGBCode(color))
+            )
+        );
 
         return fontIcon;
     }
 
     @Override
     public JabRefIcon disabled() {
-        return new InternalMaterialDesignIcon(IconTheme.DEFAULT_DISABLED_COLOR, icons);
+        return new InternalMaterialDesignIcon(
+            IconTheme.DEFAULT_DISABLED_COLOR,
+            icons
+        );
     }
 
     @Override
diff --git a/src/main/java/org/jabref/gui/icon/JabRefIcon.java b/src/main/java/org/jabref/gui/icon/JabRefIcon.java
index c7d37eb2d53..1346973b443 100644
--- a/src/main/java/org/jabref/gui/icon/JabRefIcon.java
+++ b/src/main/java/org/jabref/gui/icon/JabRefIcon.java
@@ -2,11 +2,9 @@
 
 import javafx.scene.Node;
 import javafx.scene.paint.Color;
-
 import org.kordamp.ikonli.Ikon;
 
 public interface JabRefIcon {
-
     Node getGraphicNode();
 
     String name();
diff --git a/src/main/java/org/jabref/gui/icon/JabRefIconView.java b/src/main/java/org/jabref/gui/icon/JabRefIconView.java
index ed0f4e54b29..dbbbd19cec3 100644
--- a/src/main/java/org/jabref/gui/icon/JabRefIconView.java
+++ b/src/main/java/org/jabref/gui/icon/JabRefIconView.java
@@ -1,13 +1,11 @@
 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 {
@@ -25,7 +23,10 @@ public JabRefIconView(JabRefIcons icon, int size) {
         this.glyphSize = new SimpleObjectProperty<>(size);
 
         EasyBind.subscribe(glyph, glyph -> setIconCode(glyph.getIkon()));
-        EasyBind.subscribe(glyphSize, glyphsize -> setIconSize(glyphsize.intValue()));
+        EasyBind.subscribe(
+            glyphSize,
+            glyphsize -> setIconSize(glyphsize.intValue())
+        );
     }
 
     public JabRefIconView(IconTheme.JabRefIcons icon) {
@@ -37,7 +38,10 @@ public JabRefIconView(IconTheme.JabRefIcons icon) {
         int px = (int) size.pixels(getFont());
         glyphSize.set(px);
         EasyBind.subscribe(glyph, glyph -> setIconCode(glyph.getIkon()));
-        EasyBind.subscribe(glyphSize, glyphsize -> setIconSize(glyphsize.intValue()));
+        EasyBind.subscribe(
+            glyphSize,
+            glyphsize -> setIconSize(glyphsize.intValue())
+        );
     }
 
     public JabRefIconView() {
diff --git a/src/main/java/org/jabref/gui/icon/JabRefIkonHandler.java b/src/main/java/org/jabref/gui/icon/JabRefIkonHandler.java
index 2f9bc45e0d1..3d219284b60 100644
--- a/src/main/java/org/jabref/gui/icon/JabRefIkonHandler.java
+++ b/src/main/java/org/jabref/gui/icon/JabRefIkonHandler.java
@@ -2,7 +2,6 @@
 
 import java.io.InputStream;
 import java.net.URL;
-
 import org.kordamp.ikonli.AbstractIkonHandler;
 import org.kordamp.ikonli.Ikon;
 
diff --git a/src/main/java/org/jabref/gui/icon/JabRefMaterialDesignIcon.java b/src/main/java/org/jabref/gui/icon/JabRefMaterialDesignIcon.java
index 6f697cc1e4a..63c4514d451 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'),
@@ -41,13 +40,17 @@ public enum JabRefMaterialDesignIcon implements Ikon {
         this.code = code;
     }
 
-    public static JabRefMaterialDesignIcon findByDescription(String description) {
+    public static JabRefMaterialDesignIcon findByDescription(
+        String description
+    ) {
         for (JabRefMaterialDesignIcon font : values()) {
             if (font.getDescription().equals(description)) {
                 return font;
             }
         }
-        throw new IllegalArgumentException("Icon description '" + description + "' is invalid!");
+        throw new IllegalArgumentException(
+            "Icon description '" + description + "' is invalid!"
+        );
     }
 
     @Override
diff --git a/src/main/java/org/jabref/gui/icon/JabrefIconProvider.java b/src/main/java/org/jabref/gui/icon/JabrefIconProvider.java
index f794bbccd47..670b2ada618 100644
--- a/src/main/java/org/jabref/gui/icon/JabrefIconProvider.java
+++ b/src/main/java/org/jabref/gui/icon/JabrefIconProvider.java
@@ -2,7 +2,8 @@
 
 import org.kordamp.ikonli.IkonProvider;
 
-public class JabrefIconProvider implements IkonProvider<JabRefMaterialDesignIcon> {
+public class JabrefIconProvider
+    implements IkonProvider<JabRefMaterialDesignIcon> {
 
     @Override
     public Class<JabRefMaterialDesignIcon> getIkon() {
diff --git a/src/main/java/org/jabref/gui/importer/BibEntryTypePrefsAndFileViewModel.java b/src/main/java/org/jabref/gui/importer/BibEntryTypePrefsAndFileViewModel.java
index 27735d96c4a..02dd0e55604 100644
--- a/src/main/java/org/jabref/gui/importer/BibEntryTypePrefsAndFileViewModel.java
+++ b/src/main/java/org/jabref/gui/importer/BibEntryTypePrefsAndFileViewModel.java
@@ -4,15 +4,21 @@
 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)",
-                MetaDataSerializer.serializeCustomEntryTypes(customTypeFromFile),
-                MetaDataSerializer.serializeCustomEntryTypes(customTypeFromPreferences));
+        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 d6e36a5d1eb..b25aa08a384 100644
--- a/src/main/java/org/jabref/gui/importer/GenerateEntryFromIdAction.java
+++ b/src/main/java/org/jabref/gui/importer/GenerateEntryFromIdAction.java
@@ -1,7 +1,7 @@
 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,13 +18,14 @@
 import org.jabref.model.entry.types.StandardEntryType;
 import org.jabref.model.util.FileUpdateMonitor;
 import org.jabref.preferences.PreferencesService;
-
-import org.controlsfx.control.PopOver;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 public class GenerateEntryFromIdAction extends SimpleCommand {
-    private static final Logger LOGGER = LoggerFactory.getLogger(GenerateEntryFromIdAction.class);
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(
+        GenerateEntryFromIdAction.class
+    );
 
     private final LibraryTab libraryTab;
     private final DialogService dialogService;
@@ -35,14 +36,16 @@ public class GenerateEntryFromIdAction extends SimpleCommand {
     private final StateManager stateManager;
     private final FileUpdateMonitor fileUpdateMonitor;
 
-    public GenerateEntryFromIdAction(LibraryTab libraryTab,
-                                     DialogService dialogService,
-                                     PreferencesService preferencesService,
-                                     TaskExecutor taskExecutor,
-                                     PopOver entryFromIdPopOver,
-                                     String identifier,
-                                     StateManager stateManager,
-                                     FileUpdateMonitor fileUpdateMonitor) {
+    public GenerateEntryFromIdAction(
+        LibraryTab libraryTab,
+        DialogService dialogService,
+        PreferencesService preferencesService,
+        TaskExecutor taskExecutor,
+        PopOver entryFromIdPopOver,
+        String identifier,
+        StateManager stateManager,
+        FileUpdateMonitor fileUpdateMonitor
+    ) {
         this.libraryTab = libraryTab;
         this.dialogService = dialogService;
         this.preferencesService = preferencesService;
@@ -55,31 +58,60 @@ public GenerateEntryFromIdAction(LibraryTab libraryTab,
 
     @Override
     public void execute() {
-        BackgroundTask<Optional<BibEntry>> backgroundTask = searchAndImportEntryInBackground();
+        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()));
+            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;
+                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;
+                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);
+                msg =
+                    Localization.lang(
+                        "Error message %0",
+                        fetcherExceptionMessage
+                    );
             }
 
             LOGGER.info(fetcherExceptionMessage, exception);
 
-            if (dialogService.showConfirmationDialogAndWait(Localization.lang("Failed to import by ID"), msg, Localization.lang("Add entry manually"))) {
+            if (
+                dialogService.showConfirmationDialogAndWait(
+                    Localization.lang("Failed to import by ID"),
+                    msg,
+                    Localization.lang("Add entry manually")
+                )
+            ) {
                 // add entry manually
-                new NewEntryAction(libraryTab.frame(), StandardEntryType.Article, dialogService,
-                                   preferencesService, stateManager).execute();
+                new NewEntryAction(
+                    libraryTab.frame(),
+                    StandardEntryType.Article,
+                    dialogService,
+                    preferencesService,
+                    stateManager
+                )
+                    .execute();
             }
         });
         backgroundTask.onSuccess(bibEntry -> {
@@ -87,14 +119,18 @@ public void execute() {
             if (result.isPresent()) {
                 final BibEntry entry = result.get();
                 ImportHandler handler = new ImportHandler(
-                        libraryTab.getBibDatabaseContext(),
-                        preferencesService,
-                        fileUpdateMonitor,
-                        libraryTab.getUndoManager(),
-                        stateManager,
-                        dialogService,
-                        taskExecutor);
-                handler.importEntryWithDuplicateCheck(libraryTab.getBibDatabaseContext(), entry);
+                    libraryTab.getBibDatabaseContext(),
+                    preferencesService,
+                    fileUpdateMonitor,
+                    libraryTab.getUndoManager(),
+                    stateManager,
+                    dialogService,
+                    taskExecutor
+                );
+                handler.importEntryWithDuplicateCheck(
+                    libraryTab.getBibDatabaseContext(),
+                    entry
+                );
             } else {
                 dialogService.notify("No entry found or import canceled");
             }
@@ -102,7 +138,9 @@ public void execute() {
         backgroundTask.executeWith(taskExecutor);
     }
 
-    private BackgroundTask<Optional<BibEntry>> searchAndImportEntryInBackground() {
+    private BackgroundTask<
+        Optional<BibEntry>
+    > searchAndImportEntryInBackground() {
         return new BackgroundTask<>() {
             @Override
             protected Optional<BibEntry> call() throws FetcherException {
@@ -110,7 +148,10 @@ protected Optional<BibEntry> call() throws FetcherException {
                     return Optional.empty();
                 }
                 updateMessage(Localization.lang("Searching..."));
-                return new CompositeIdFetcher(preferencesService.getImportFormatPreferences()).performSearchById(identifier);
+                return new CompositeIdFetcher(
+                    preferencesService.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 e1a1c7cfc26..900bc8ee477 100644
--- a/src/main/java/org/jabref/gui/importer/GenerateEntryFromIdDialog.java
+++ b/src/main/java/org/jabref/gui/importer/GenerateEntryFromIdDialog.java
@@ -1,10 +1,12 @@
 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,17 +16,19 @@
 import org.jabref.model.util.FileUpdateMonitor;
 import org.jabref.preferences.PreferencesService;
 
-import com.airhacks.afterburner.views.ViewLoader;
-import jakarta.inject.Inject;
-import org.controlsfx.control.PopOver;
-
 public class GenerateEntryFromIdDialog {
 
-    @FXML DialogPane dialogPane;
-    @FXML TextField idTextField;
-    @FXML Button generateButton;
+    @FXML
+    DialogPane dialogPane;
+
+    @FXML
+    TextField idTextField;
+
+    @FXML
+    Button generateButton;
 
-    @Inject private FileUpdateMonitor fileUpdateMonitor;
+    @Inject
+    private FileUpdateMonitor fileUpdateMonitor;
 
     private final PreferencesService preferencesService;
     private final DialogService dialogService;
@@ -34,18 +38,27 @@ public class GenerateEntryFromIdDialog {
 
     private PopOver entryFromIdPopOver;
 
-    public GenerateEntryFromIdDialog(LibraryTab libraryTab, DialogService dialogService, PreferencesService preferencesService, TaskExecutor taskExecutor, StateManager stateManager) {
+    public GenerateEntryFromIdDialog(
+        LibraryTab libraryTab,
+        DialogService dialogService,
+        PreferencesService preferencesService,
+        TaskExecutor taskExecutor,
+        StateManager stateManager
+    ) {
         ViewLoader.view(this).load();
         this.preferencesService = preferencesService;
         this.dialogService = dialogService;
         this.libraryTab = libraryTab;
         this.taskExecutor = taskExecutor;
         this.stateManager = stateManager;
-        this.generateButton.setGraphic(IconTheme.JabRefIcons.IMPORT.getGraphicNode());
+        this.generateButton.setGraphic(
+                IconTheme.JabRefIcons.IMPORT.getGraphicNode()
+            );
         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,7 +66,8 @@ public GenerateEntryFromIdDialog(LibraryTab libraryTab, DialogService dialogServ
 
         this.idTextField.requestFocus();
 
-        GenerateEntryFromIdAction generateEntryFromIdAction = new GenerateEntryFromIdAction(
+        GenerateEntryFromIdAction generateEntryFromIdAction =
+            new GenerateEntryFromIdAction(
                 libraryTab,
                 dialogService,
                 preferencesService,
@@ -62,7 +76,7 @@ public GenerateEntryFromIdDialog(LibraryTab libraryTab, DialogService dialogServ
                 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 07382713e29..d10e1abc635 100644
--- a/src/main/java/org/jabref/gui/importer/GrobidOptInDialogHelper.java
+++ b/src/main/java/org/jabref/gui/importer/GrobidOptInDialogHelper.java
@@ -18,18 +18,25 @@ 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(
+        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(
+                    "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.grobidOptOutProperty().setValue(optOut));
+                optOut -> preferences.grobidOptOutProperty().setValue(optOut)
+            );
         preferences.grobidEnabledProperty().setValue(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 fd74e7a5199..34a8aca7ac0 100644
--- a/src/main/java/org/jabref/gui/importer/ImportCommand.java
+++ b/src/main/java/org/jabref/gui/importer/ImportCommand.java
@@ -1,5 +1,7 @@
 package org.jabref.gui.importer;
 
+import static org.jabref.gui.actions.ActionHelper.needsDatabase;
+
 import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
@@ -8,9 +10,7 @@
 import java.util.List;
 import java.util.Optional;
 import java.util.SortedSet;
-
 import javafx.stage.FileChooser;
-
 import org.jabref.gui.DialogService;
 import org.jabref.gui.JabRefFrame;
 import org.jabref.gui.LibraryTab;
@@ -34,19 +34,22 @@
 import org.jabref.model.database.BibDatabase;
 import org.jabref.model.util.FileUpdateMonitor;
 import org.jabref.preferences.PreferencesService;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import static org.jabref.gui.actions.ActionHelper.needsDatabase;
-
 /**
  * Perform an import action
  */
 public class ImportCommand extends SimpleCommand {
-    private static final Logger LOGGER = LoggerFactory.getLogger(ImportCommand.class);
 
-    public enum ImportMethod { AS_NEW, TO_EXISTING }
+    private static final Logger LOGGER = LoggerFactory.getLogger(
+        ImportCommand.class
+    );
+
+    public enum ImportMethod {
+        AS_NEW,
+        TO_EXISTING,
+    }
 
     private final JabRefFrame frame;
     private final ImportMethod importMethod;
@@ -56,13 +59,15 @@ public enum ImportMethod { AS_NEW, TO_EXISTING }
     private final FileUpdateMonitor fileUpdateMonitor;
     private final TaskExecutor taskExecutor;
 
-    public ImportCommand(JabRefFrame frame,
-                         ImportMethod importMethod,
-                         PreferencesService preferencesService,
-                         StateManager stateManager,
-                         FileUpdateMonitor fileUpdateMonitor,
-                         TaskExecutor taskExecutor,
-                         DialogService dialogService) {
+    public ImportCommand(
+        JabRefFrame frame,
+        ImportMethod importMethod,
+        PreferencesService preferencesService,
+        StateManager stateManager,
+        FileUpdateMonitor fileUpdateMonitor,
+        TaskExecutor taskExecutor,
+        DialogService dialogService
+    ) {
         this.frame = frame;
         this.importMethod = importMethod;
         this.preferencesService = preferencesService;
@@ -78,106 +83,194 @@ public ImportCommand(JabRefFrame frame,
     @Override
     public void execute() {
         ImportFormatReader importFormatReader = new ImportFormatReader(
-                preferencesService.getImporterPreferences(),
-                preferencesService.getImportFormatPreferences(),
-                fileUpdateMonitor);
+            preferencesService.getImporterPreferences(),
+            preferencesService.getImportFormatPreferences(),
+            fileUpdateMonitor
+        );
         SortedSet<Importer> importers = importFormatReader.getImportFormats();
 
-        FileDialogConfiguration fileDialogConfiguration = new FileDialogConfiguration.Builder()
+        FileDialogConfiguration fileDialogConfiguration =
+            new FileDialogConfiguration.Builder()
                 .addExtensionFilter(FileFilterConverter.ANY_FILE)
-                .addExtensionFilter(FileFilterConverter.forAllImporters(importers))
-                .addExtensionFilter(FileFilterConverter.importerToExtensionFilter(importers))
-                .withInitialDirectory(preferencesService.getImporterPreferences().getImportWorkingDirectory())
+                .addExtensionFilter(
+                    FileFilterConverter.forAllImporters(importers)
+                )
+                .addExtensionFilter(
+                    FileFilterConverter.importerToExtensionFilter(importers)
+                )
+                .withInitialDirectory(
+                    preferencesService
+                        .getImporterPreferences()
+                        .getImportWorkingDirectory()
+                )
                 .build();
-        dialogService.showFileOpenDialog(fileDialogConfiguration)
-                     .ifPresent(path -> importSingleFile(path, importers, fileDialogConfiguration.getSelectedExtensionFilter()));
+        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"),
-                    Localization.lang("File not found") + ": '" + file.getFileName() + "'.");
+            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 -> {
+            task
+                .onSuccess(parserResult -> {
                     frame.addTab(parserResult.getDatabaseContext(), true);
-                    dialogService.notify(Localization.lang("Imported entries") + ": " + parserResult.getDatabase().getEntries().size());
+                    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."));
+                    dialogService.notify(
+                        Localization.lang(
+                            "Error importing. See the error log for details."
+                        )
+                    );
                 })
                 .executeWith(taskExecutor);
         } else {
             final LibraryTab libraryTab = frame.getCurrentLibraryTab();
 
-            ImportEntriesDialog dialog = new ImportEntriesDialog(libraryTab.getBibDatabaseContext(), task);
+            ImportEntriesDialog dialog = new ImportEntriesDialog(
+                libraryTab.getBibDatabaseContext(),
+                task
+            );
             dialog.setTitle(Localization.lang("Import"));
             dialogService.showCustomDialogAndWait(dialog);
         }
 
         // Set last working dir for import
-        preferencesService.getImporterPreferences().setImportWorkingDirectory(file.getParent());
+        preferencesService
+            .getImporterPreferences()
+            .setImportWorkingDirectory(file.getParent());
     }
 
     /**
      * @throws IOException of a specified importer
      */
-    private ParserResult doImport(List<Path> files, Importer importFormat) throws IOException {
+    private ParserResult doImport(List<Path> files, Importer importFormat)
+        throws IOException {
         Optional<Importer> importer = Optional.ofNullable(importFormat);
         // We import all files and collect their results
-        List<ImportFormatReader.UnknownFormatImport> imports = new ArrayList<>();
+        List<ImportFormatReader.UnknownFormatImport> imports =
+            new ArrayList<>();
         ImportFormatReader importFormatReader = new ImportFormatReader(
-                preferencesService.getImporterPreferences(),
-                preferencesService.getImportFormatPreferences(),
-                fileUpdateMonitor);
+            preferencesService.getImporterPreferences(),
+            preferencesService.getImportFormatPreferences(),
+            fileUpdateMonitor
+        );
         for (Path filename : files) {
             try {
                 if (importer.isEmpty()) {
                     // Unknown format
                     DefaultTaskExecutor.runAndWaitInJavaFXThread(() -> {
-                        if (FileUtil.isPDFFile(filename) && GrobidOptInDialogHelper.showAndWaitIfUserIsUndecided(dialogService, preferencesService.getGrobidPreferences())) {
+                        if (
+                            FileUtil.isPDFFile(filename) &&
+                            GrobidOptInDialogHelper.showAndWaitIfUserIsUndecided(
+                                dialogService,
+                                preferencesService.getGrobidPreferences()
+                            )
+                        ) {
                             importFormatReader.reset();
                         }
-                        dialogService.notify(Localization.lang("Importing file %0 as unknown format", filename.getFileName().toString()));
+                        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 {
                     DefaultTaskExecutor.runAndWaitInJavaFXThread(() -> {
-                        if (((importer.get() instanceof PdfGrobidImporter)
-                                || (importer.get() instanceof PdfMergeMetadataImporter))
-                                && GrobidOptInDialogHelper.showAndWaitIfUserIsUndecided(dialogService, preferencesService.getGrobidPreferences())) {
+                        if (
+                            ((importer.get() instanceof PdfGrobidImporter) ||
+                                (importer.get() instanceof
+                                    PdfMergeMetadataImporter)) &&
+                            GrobidOptInDialogHelper.showAndWaitIfUserIsUndecided(
+                                dialogService,
+                                preferencesService.getGrobidPreferences()
+                            )
+                        ) {
                             importFormatReader.reset();
                         }
-                        dialogService.notify(Localization.lang("Importing in %0 format", importer.get().getName()) + "...");
+                        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) {
-                DefaultTaskExecutor.runAndWaitInJavaFXThread(
-                        () -> dialogService.showWarningDialogAndWait(
-                                Localization.lang("Import error"),
-                                Localization.lang("Please check your library file for wrong syntax.")
-                                + "\n\n"
-                                + ex.getLocalizedMessage()));
+                DefaultTaskExecutor.runAndWaitInJavaFXThread(() ->
+                    dialogService.showWarningDialogAndWait(
+                        Localization.lang("Import error"),
+                        Localization.lang(
+                            "Please check your library file for wrong syntax."
+                        ) +
+                        "\n\n" +
+                        ex.getLocalizedMessage()
+                    )
+                );
             }
         }
 
         if (imports.isEmpty()) {
-            DefaultTaskExecutor.runAndWaitInJavaFXThread(
-                    () -> dialogService.showWarningDialogAndWait(
-                            Localization.lang("Import error"),
-                            Localization.lang("No entries found. Please make sure you are using the correct import filter.")));
+            DefaultTaskExecutor.runAndWaitInJavaFXThread(() ->
+                dialogService.showWarningDialogAndWait(
+                    Localization.lang("Import error"),
+                    Localization.lang(
+                        "No entries found. Please make sure you are using the correct import filter."
+                    )
+                )
+            );
 
             return new ParserResult();
         }
@@ -188,7 +281,9 @@ private ParserResult doImport(List<Path> files, Importer importFormat) throws IO
     /**
      * TODO: Move this to logic package. Blocked by undo functionality.
      */
-    public ParserResult mergeImportResults(List<ImportFormatReader.UnknownFormatImport> imports) {
+    public ParserResult mergeImportResults(
+        List<ImportFormatReader.UnknownFormatImport> imports
+    ) {
         BibDatabase resultDatabase = new BibDatabase();
         ParserResult result = new ParserResult(resultDatabase);
 
@@ -197,21 +292,39 @@ public ParserResult mergeImportResults(List<ImportFormatReader.UnknownFormatImpo
                 continue;
             }
             ParserResult parserResult = importResult.parserResult();
-            resultDatabase.insertEntries(parserResult.getDatabase().getEntries());
+            resultDatabase.insertEntries(
+                parserResult.getDatabase().getEntries()
+            );
 
-            if (ImportFormatReader.BIBTEX_FORMAT.equals(importResult.format())) {
+            if (
+                ImportFormatReader.BIBTEX_FORMAT.equals(importResult.format())
+            ) {
                 // additional treatment of BibTeX
-                new DatabaseMerger(preferencesService.getBibEntryPreferences().getKeywordSeparator()).mergeMetaData(
+                new DatabaseMerger(
+                    preferencesService
+                        .getBibEntryPreferences()
+                        .getKeywordSeparator()
+                )
+                    .mergeMetaData(
                         result.getMetaData(),
                         parserResult.getMetaData(),
-                        importResult.parserResult().getPath().map(path -> path.getFileName().toString()).orElse("unknown"),
-                        parserResult.getDatabase().getEntries());
+                        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)
         }
 
         // set timestamp and owner
-        UpdateField.setAutomaticFields(resultDatabase.getEntries(), preferencesService.getOwnerPreferences(), preferencesService.getTimestampPreferences()); // set timestamp and owner
+        UpdateField.setAutomaticFields(
+            resultDatabase.getEntries(),
+            preferencesService.getOwnerPreferences(),
+            preferencesService.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 93ce743ad3b..2b13a8ff725 100644
--- a/src/main/java/org/jabref/gui/importer/ImportCustomEntryTypesDialog.java
+++ b/src/main/java/org/jabref/gui/importer/ImportCustomEntryTypesDialog.java
@@ -1,51 +1,65 @@
 package org.jabref.gui.importer;
 
+import com.airhacks.afterburner.views.ViewLoader;
+import jakarta.inject.Inject;
 import java.util.List;
-
 import javafx.beans.binding.Bindings;
 import javafx.fxml.FXML;
 import javafx.scene.control.ButtonType;
 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.model.database.BibDatabaseMode;
 import org.jabref.model.entry.BibEntryType;
 import org.jabref.preferences.PreferencesService;
 
-import com.airhacks.afterburner.views.ViewLoader;
-import jakarta.inject.Inject;
-import org.controlsfx.control.CheckListView;
-
 public class ImportCustomEntryTypesDialog extends BaseDialog<Void> {
 
     private final List<BibEntryType> customEntryTypes;
 
-    @Inject private PreferencesService preferencesService;
-    @FXML private VBox boxDifferentCustomization;
+    @Inject
+    private PreferencesService preferencesService;
+
+    @FXML
+    private VBox boxDifferentCustomization;
 
-    @FXML private CheckListView<BibEntryType> unknownEntryTypesCheckList;
-    @FXML private CheckListView<BibEntryTypePrefsAndFileViewModel> differentCustomizationCheckList;
+    @FXML
+    private CheckListView<BibEntryType> unknownEntryTypesCheckList;
+
+    @FXML
+    private CheckListView<
+        BibEntryTypePrefsAndFileViewModel
+    > differentCustomizationCheckList;
 
     private final BibDatabaseMode mode;
     private ImportCustomEntryTypesDialogViewModel viewModel;
 
-    public ImportCustomEntryTypesDialog(BibDatabaseMode mode, List<BibEntryType> customEntryTypes) {
+    public ImportCustomEntryTypesDialog(
+        BibDatabaseMode mode,
+        List<BibEntryType> customEntryTypes
+    ) {
         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());
+                    unknownEntryTypesCheckList
+                        .getCheckModel()
+                        .getCheckedItems(),
+                    differentCustomizationCheckList
+                        .getCheckModel()
+                        .getCheckedItems()
+                        .stream()
+                        .map(
+                            BibEntryTypePrefsAndFileViewModel::customTypeFromPreferences
+                        )
+                        .toList()
+                );
             }
             return null;
         });
@@ -55,17 +69,39 @@ public ImportCustomEntryTypesDialog(BibDatabaseMode mode, List<BibEntryType> cus
 
     @FXML
     public void initialize() {
-        viewModel = new ImportCustomEntryTypesDialogViewModel(mode, customEntryTypes, preferencesService);
-        boxDifferentCustomization.visibleProperty().bind(Bindings.isNotEmpty(viewModel.differentCustomizations()));
-        boxDifferentCustomization.managedProperty().bind(Bindings.isNotEmpty(viewModel.differentCustomizations()));
+        viewModel =
+            new ImportCustomEntryTypesDialogViewModel(
+                mode,
+                customEntryTypes,
+                preferencesService
+            );
+        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());
+        );
+        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 0a7102698e0..dd1da7be7ad 100644
--- a/src/main/java/org/jabref/gui/importer/ImportCustomEntryTypesDialogViewModel.java
+++ b/src/main/java/org/jabref/gui/importer/ImportCustomEntryTypesDialogViewModel.java
@@ -2,42 +2,62 @@
 
 import java.util.List;
 import java.util.Optional;
-
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableList;
-
 import org.jabref.gui.Globals;
 import org.jabref.model.database.BibDatabaseMode;
 import org.jabref.model.entry.BibEntryType;
 import org.jabref.model.entry.types.EntryTypeFactory;
 import org.jabref.preferences.PreferencesService;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 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 PreferencesService preferencesService;
 
-    private final ObservableList<BibEntryType> newTypes = FXCollections.observableArrayList();
-    private final ObservableList<BibEntryTypePrefsAndFileViewModel> differentCustomizationTypes = FXCollections.observableArrayList();
+    private final ObservableList<BibEntryType> newTypes =
+        FXCollections.observableArrayList();
+    private final ObservableList<
+        BibEntryTypePrefsAndFileViewModel
+    > differentCustomizationTypes = FXCollections.observableArrayList();
 
-    public ImportCustomEntryTypesDialogViewModel(BibDatabaseMode mode, List<BibEntryType> entryTypes, PreferencesService preferencesService) {
+    public ImportCustomEntryTypesDialogViewModel(
+        BibDatabaseMode mode,
+        List<BibEntryType> entryTypes,
+        PreferencesService preferencesService
+    ) {
         this.mode = mode;
         this.preferencesService = preferencesService;
 
         for (BibEntryType customType : entryTypes) {
-            Optional<BibEntryType> currentlyStoredType = Globals.entryTypesManager.enrich(customType.getType(), mode);
+            Optional<BibEntryType> currentlyStoredType =
+                Globals.entryTypesManager.enrich(customType.getType(), mode);
             if (currentlyStoredType.isEmpty()) {
                 newTypes.add(customType);
             } else {
-                if (!EntryTypeFactory.nameAndFieldsAreEqual(customType, currentlyStoredType.get())) {
-                    LOGGER.info("currently stored type:    {}", 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
+                        )
+                    );
                 }
             }
         }
@@ -47,18 +67,31 @@ public ObservableList<BibEntryType> newTypes() {
         return this.newTypes;
     }
 
-    public ObservableList<BibEntryTypePrefsAndFileViewModel> differentCustomizations() {
+    public ObservableList<
+        BibEntryTypePrefsAndFileViewModel
+    > differentCustomizations() {
         return this.differentCustomizationTypes;
     }
 
-    public void importBibEntryTypes(List<BibEntryType> checkedUnknownEntryTypes, List<BibEntryType> checkedDifferentEntryTypes) {
+    public void importBibEntryTypes(
+        List<BibEntryType> checkedUnknownEntryTypes,
+        List<BibEntryType> checkedDifferentEntryTypes
+    ) {
         if (!checkedUnknownEntryTypes.isEmpty()) {
-            checkedUnknownEntryTypes.forEach(type -> Globals.entryTypesManager.addCustomOrModifiedType(type, mode));
-            preferencesService.storeCustomEntryTypesRepository(Globals.entryTypesManager);
+            checkedUnknownEntryTypes.forEach(type ->
+                Globals.entryTypesManager.addCustomOrModifiedType(type, mode)
+            );
+            preferencesService.storeCustomEntryTypesRepository(
+                Globals.entryTypesManager
+            );
         }
         if (!checkedDifferentEntryTypes.isEmpty()) {
-            checkedUnknownEntryTypes.forEach(type -> Globals.entryTypesManager.addCustomOrModifiedType(type, mode));
-            preferencesService.storeCustomEntryTypesRepository(Globals.entryTypesManager);
+            checkedUnknownEntryTypes.forEach(type ->
+                Globals.entryTypesManager.addCustomOrModifiedType(type, mode)
+            );
+            preferencesService.storeCustomEntryTypesRepository(
+                Globals.entryTypesManager
+            );
         }
     }
 }
diff --git a/src/main/java/org/jabref/gui/importer/ImportEntriesDialog.java b/src/main/java/org/jabref/gui/importer/ImportEntriesDialog.java
index 2a1d1688868..38bba1df99d 100644
--- a/src/main/java/org/jabref/gui/importer/ImportEntriesDialog.java
+++ b/src/main/java/org/jabref/gui/importer/ImportEntriesDialog.java
@@ -1,10 +1,10 @@
 package org.jabref.gui.importer;
 
+import com.airhacks.afterburner.views.ViewLoader;
+import com.tobiasdiez.easybind.EasyBind;
+import jakarta.inject.Inject;
 import java.util.EnumSet;
 import java.util.Optional;
-
-import javax.swing.undo.UndoManager;
-
 import javafx.beans.binding.Bindings;
 import javafx.beans.binding.BooleanBinding;
 import javafx.css.PseudoClass;
@@ -21,7 +21,8 @@
 import javafx.scene.layout.Priority;
 import javafx.scene.layout.VBox;
 import javafx.scene.text.Text;
-
+import javax.swing.undo.UndoManager;
+import org.controlsfx.control.CheckListView;
 import org.jabref.gui.DialogService;
 import org.jabref.gui.StateManager;
 import org.jabref.gui.icon.IconTheme;
@@ -44,11 +45,6 @@
 import org.jabref.model.util.FileUpdateMonitor;
 import org.jabref.preferences.PreferencesService;
 
-import com.airhacks.afterburner.views.ViewLoader;
-import com.tobiasdiez.easybind.EasyBind;
-import jakarta.inject.Inject;
-import org.controlsfx.control.CheckListView;
-
 public class ImportEntriesDialog extends BaseDialog<Boolean> {
 
     public CheckListView<BibEntry> entriesListView;
@@ -59,13 +55,28 @@ public class ImportEntriesDialog extends BaseDialog<Boolean> {
     public CheckBox downloadLinkedOnlineFiles;
     private final BackgroundTask<ParserResult> task;
     private ImportEntriesViewModel viewModel;
-    @Inject private TaskExecutor taskExecutor;
-    @Inject private DialogService dialogService;
-    @Inject private UndoManager undoManager;
-    @Inject private PreferencesService preferences;
-    @Inject private StateManager stateManager;
-    @Inject private BibEntryTypesManager entryTypesManager;
-    @Inject private FileUpdateMonitor fileUpdateMonitor;
+
+    @Inject
+    private TaskExecutor taskExecutor;
+
+    @Inject
+    private DialogService dialogService;
+
+    @Inject
+    private UndoManager undoManager;
+
+    @Inject
+    private PreferencesService preferences;
+
+    @Inject
+    private StateManager stateManager;
+
+    @Inject
+    private BibEntryTypesManager entryTypesManager;
+
+    @Inject
+    private FileUpdateMonitor fileUpdateMonitor;
+
     private final BibDatabaseContext database;
 
     /**
@@ -74,22 +85,30 @@ public class ImportEntriesDialog extends BaseDialog<Boolean> {
      * @param database the database to import into
      * @param task     the task executed for parsing the selected files(s).
      */
-    public ImportEntriesDialog(BibDatabaseContext database, BackgroundTask<ParserResult> task) {
+    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());
+                viewModel.importEntries(
+                    entriesListView.getCheckModel().getCheckedItems(),
+                    downloadLinkedOnlineFiles.isSelected()
+                );
             } else {
                 dialogService.notify(Localization.lang("Import canceled"));
             }
@@ -100,7 +119,18 @@ public ImportEntriesDialog(BibDatabaseContext database, BackgroundTask<ParserRes
 
     @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);
@@ -109,102 +139,174 @@ 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") +
+                        "]"
+                    );
+                }
 
-                    if (dbOpt.isEmpty()) {
-                        return Localization.lang("untitled");
-                    }
+                if (dbOpt.isEmpty()) {
+                    return Localization.lang("untitled");
+                }
 
-                    return dbOpt.get();
-                })
-                .install(libraryListView);
-        viewModel.selectedDbProperty().bind(libraryListView.getSelectionModel().selectedItemProperty());
-        stateManager.getActiveDatabase().ifPresent(database1 -> libraryListView.getSelectionModel().select(database1));
+                return dbOpt.get();
+            })
+            .install(libraryListView);
+        viewModel
+            .selectedDbProperty()
+            .bind(libraryListView.getSelectionModel().selectedItemProperty());
+        stateManager
+            .getActiveDatabase()
+            .ifPresent(database1 ->
+                libraryListView.getSelectionModel().select(database1)
+            );
 
-        PseudoClass entrySelected = PseudoClass.getPseudoClass("entry-selected");
+        PseudoClass entrySelected = PseudoClass.getPseudoClass(
+            "entry-selected"
+        );
         new ViewModelListCellFactory<BibEntry>()
-                .withGraphic(entry -> {
-                    ToggleButton addToggle = IconTheme.JabRefIcons.ADD.asToggleButton();
-                    EasyBind.subscribe(addToggle.selectedProperty(), selected -> {
+            .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());
+                            addToggle.setGraphic(
+                                IconTheme.JabRefIcons.ADD_FILLED
+                                    .withColor(IconTheme.SELECTED_COLOR)
+                                    .getGraphicNode()
+                            );
                         } else {
-                            addToggle.setGraphic(IconTheme.JabRefIcons.ADD.getGraphicNode());
+                            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 = getEntryNode(entry);
-                    HBox.setHgrow(entryNode, Priority.ALWAYS);
-                    HBox container = new HBox(entryNode, separator, addToggle);
-                    container.getStyleClass().add("entry-container");
-
-                    BackgroundTask.wrap(() -> viewModel.hasDuplicate(entry)).onSuccess(duplicateFound -> {
+                    }
+                );
+                addToggle.getStyleClass().add("addEntryButton");
+                addToggle
+                    .selectedProperty()
+                    .bindBidirectional(
+                        entriesListView.getItemBooleanProperty(entry)
+                    );
+                HBox separator = new HBox();
+                HBox.setHgrow(separator, Priority.SOMETIMES);
+                Node entryNode = getEntryNode(entry);
+                HBox.setHgrow(entryNode, Priority.ALWAYS);
+                HBox container = new HBox(entryNode, separator, addToggle);
+                container.getStyleClass().add("entry-container");
+
+                BackgroundTask
+                    .wrap(() -> viewModel.hasDuplicate(entry))
+                    .onSuccess(duplicateFound -> {
                         if (duplicateFound) {
-                            Button duplicateButton = IconTheme.JabRefIcons.DUPLICATE.asButton();
-                            duplicateButton.setTooltip(new Tooltip(Localization.lang("Possible duplicate of existing entry. Click to resolve.")));
-                            duplicateButton.setOnAction(event -> viewModel.resolveDuplicate(entry));
+                            Button duplicateButton =
+                                IconTheme.JabRefIcons.DUPLICATE.asButton();
+                            duplicateButton.setTooltip(
+                                new Tooltip(
+                                    Localization.lang(
+                                        "Possible duplicate of existing entry. Click to resolve."
+                                    )
+                                )
+                            );
+                            duplicateButton.setOnAction(event ->
+                                viewModel.resolveDuplicate(entry)
+                            );
                             container.getChildren().add(1, duplicateButton);
                         }
-                    }).executeWith(taskExecutor);
+                    })
+                    .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();
-                    }
+                if (entriesListView.getItems().size() == 1) {
+                    selectAllNewEntries();
+                }
 
-                    return container;
-                })
-                .withOnMouseClickedEvent((entry, event) -> entriesListView.getCheckModel().toggleCheckState(entry))
-                .withPseudoClass(entrySelected, entriesListView::getItemBooleanProperty)
-                .install(entriesListView);
+                return container;
+            })
+            .withOnMouseClickedEvent((entry, event) ->
+                entriesListView.getCheckModel().toggleCheckState(entry)
+            )
+            .withPseudoClass(
+                entrySelected,
+                entriesListView::getItemBooleanProperty
+            )
+            .install(entriesListView);
 
-        selectedItems.textProperty().bind(Bindings.size(entriesListView.getCheckModel().getCheckedItems()).asString());
-        totalItems.textProperty().bind(Bindings.size(entriesListView.getItems()).asString());
+        selectedItems
+            .textProperty()
+            .bind(
+                Bindings
+                    .size(entriesListView.getCheckModel().getCheckedItems())
+                    .asString()
+            );
+        totalItems
+            .textProperty()
+            .bind(Bindings.size(entriesListView.getItems()).asString());
         entriesListView.setSelectionModel(new NoSelectionModel<>());
     }
 
     private Node getEntryNode(BibEntry entry) {
         Node entryType = getIcon(entry.getType()).getGraphicNode();
         entryType.getStyleClass().add("type");
-        Label authors = new Label(entry.getFieldOrAliasLatexFree(StandardField.AUTHOR).orElse(""));
+        Label authors = new Label(
+            entry.getFieldOrAliasLatexFree(StandardField.AUTHOR).orElse("")
+        );
         authors.getStyleClass().add("authors");
-        Label title = new Label(entry.getFieldOrAliasLatexFree(StandardField.TITLE).orElse(""));
+        Label title = new Label(
+            entry.getFieldOrAliasLatexFree(StandardField.TITLE).orElse("")
+        );
         title.getStyleClass().add("title");
-        Label year = new Label(entry.getFieldOrAliasLatexFree(StandardField.YEAR).orElse(""));
+        Label year = new Label(
+            entry.getFieldOrAliasLatexFree(StandardField.YEAR).orElse("")
+        );
         year.getStyleClass().add("year");
-        Label journal = new Label(entry.getFieldOrAliasLatexFree(StandardField.JOURNAL).orElse(""));
+        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
+            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);
-        });
+        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;
     }
 
     private 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/importer/ImportEntriesViewModel.java b/src/main/java/org/jabref/gui/importer/ImportEntriesViewModel.java
index eeffe49a74c..4f9d8d34322 100644
--- a/src/main/java/org/jabref/gui/importer/ImportEntriesViewModel.java
+++ b/src/main/java/org/jabref/gui/importer/ImportEntriesViewModel.java
@@ -2,16 +2,13 @@
 
 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;
 import javafx.beans.property.StringProperty;
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableList;
-
+import javax.swing.undo.UndoManager;
 import org.jabref.gui.AbstractViewModel;
 import org.jabref.gui.DialogService;
 import org.jabref.gui.StateManager;
@@ -30,13 +27,14 @@
 import org.jabref.model.entry.LinkedFile;
 import org.jabref.model.util.FileUpdateMonitor;
 import org.jabref.preferences.PreferencesService;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 public class ImportEntriesViewModel extends AbstractViewModel {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(ImportEntriesViewModel.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(
+        ImportEntriesViewModel.class
+    );
 
     private final StringProperty message;
     private final TaskExecutor taskExecutor;
@@ -55,15 +53,17 @@ 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,
-                                  PreferencesService preferences,
-                                  StateManager stateManager,
-                                  BibEntryTypesManager entryTypesManager,
-                                  FileUpdateMonitor fileUpdateMonitor) {
+    public ImportEntriesViewModel(
+        BackgroundTask<ParserResult> task,
+        TaskExecutor taskExecutor,
+        BibDatabaseContext databaseContext,
+        DialogService dialogService,
+        UndoManager undoManager,
+        PreferencesService preferences,
+        StateManager stateManager,
+        BibEntryTypesManager entryTypesManager,
+        FileUpdateMonitor fileUpdateMonitor
+    ) {
         this.taskExecutor = taskExecutor;
         this.databaseContext = databaseContext;
         this.dialogService = dialogService;
@@ -77,18 +77,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() {
@@ -112,9 +119,16 @@ 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()
+        );
     }
 
     /**
@@ -122,72 +136,121 @@ public boolean hasDuplicate(BibEntry entry) {
      *
      * @param entriesToImport subset of the entries contained in parserResult
      */
-    public void importEntries(List<BibEntry> entriesToImport, boolean shouldDownloadFiles) {
+    public void importEntries(
+        List<BibEntry> entriesToImport,
+        boolean shouldDownloadFiles
+    ) {
         // Check if we are supposed to warn about duplicates.
         // If so, then see if there are duplicates, and warn if yes.
-        if (preferences.getImporterPreferences().shouldWarnAboutDuplicatesOnImport()) {
-            BackgroundTask.wrap(() -> entriesToImport.stream()
-                                                     .anyMatch(this::hasDuplicate)).onSuccess(duplicateFound -> {
-                if (duplicateFound) {
-                    boolean continueImport = dialogService.showConfirmationDialogWithOptOutAndWait(Localization.lang("Duplicates found"),
-                            Localization.lang("There are possible duplicates that haven't been resolved. Continue?"),
-                            Localization.lang("Continue with import"),
-                            Localization.lang("Cancel import"),
-                            Localization.lang("Do not ask again"),
-                            optOut -> preferences.getImporterPreferences().setWarnAboutDuplicatesOnImport(!optOut));
+        if (
+            preferences
+                .getImporterPreferences()
+                .shouldWarnAboutDuplicatesOnImport()
+        ) {
+            BackgroundTask
+                .wrap(() ->
+                    entriesToImport.stream().anyMatch(this::hasDuplicate)
+                )
+                .onSuccess(duplicateFound -> {
+                    if (duplicateFound) {
+                        boolean continueImport =
+                            dialogService.showConfirmationDialogWithOptOutAndWait(
+                                Localization.lang("Duplicates found"),
+                                Localization.lang(
+                                    "There are possible duplicates that haven't been resolved. Continue?"
+                                ),
+                                Localization.lang("Continue with import"),
+                                Localization.lang("Cancel import"),
+                                Localization.lang("Do not ask again"),
+                                optOut ->
+                                    preferences
+                                        .getImporterPreferences()
+                                        .setWarnAboutDuplicatesOnImport(!optOut)
+                            );
 
-                    if (!continueImport) {
-                        dialogService.notify(Localization.lang("Import canceled"));
+                        if (!continueImport) {
+                            dialogService.notify(
+                                Localization.lang("Import canceled")
+                            );
+                        } else {
+                            buildImportHandlerThenImportEntries(
+                                entriesToImport
+                            );
+                        }
                     } else {
                         buildImportHandlerThenImportEntries(entriesToImport);
                     }
-                } else {
-                    buildImportHandlerThenImportEntries(entriesToImport);
-                }
-            }).executeWith(taskExecutor);
+                })
+                .executeWith(taskExecutor);
         } else {
             buildImportHandlerThenImportEntries(entriesToImport);
         }
 
         // Remember the selection in the dialog
-        preferences.getFilePreferences().setDownloadLinkedFiles(shouldDownloadFiles);
+        preferences
+            .getFilePreferences()
+            .setDownloadLinkedFiles(shouldDownloadFiles);
 
         if (shouldDownloadFiles) {
             for (BibEntry bibEntry : entriesToImport) {
-                bibEntry.getFiles().stream().filter(LinkedFile::isOnlineLink).forEach(linkedFile ->
+                bibEntry
+                    .getFiles()
+                    .stream()
+                    .filter(LinkedFile::isOnlineLink)
+                    .forEach(linkedFile ->
                         new LinkedFileViewModel(
-                                linkedFile,
-                                bibEntry,
-                                databaseContext,
-                                taskExecutor,
-                                dialogService,
-                                preferences).download());
+                            linkedFile,
+                            bibEntry,
+                            databaseContext,
+                            taskExecutor,
+                            dialogService,
+                            preferences
+                        )
+                            .download()
+                    );
             }
         }
 
-        new DatabaseMerger(preferences.getBibEntryPreferences().getKeywordSeparator()).mergeStrings(
+        new DatabaseMerger(
+            preferences.getBibEntryPreferences().getKeywordSeparator()
+        )
+            .mergeStrings(
                 databaseContext.getDatabase(),
-                parserResult.getDatabase());
-        new DatabaseMerger(preferences.getBibEntryPreferences().getKeywordSeparator()).mergeMetaData(
+                parserResult.getDatabase()
+            );
+        new DatabaseMerger(
+            preferences.getBibEntryPreferences().getKeywordSeparator()
+        )
+            .mergeMetaData(
                 databaseContext.getMetaData(),
                 parserResult.getMetaData(),
-                parserResult.getPath().map(path -> path.getFileName().toString()).orElse("unknown"),
-                parserResult.getDatabase().getEntries());
-
-//        JabRefGUI.getMainFrame().getCurrentLibraryTab().markBaseChanged();
+                parserResult
+                    .getPath()
+                    .map(path -> path.getFileName().toString())
+                    .orElse("unknown"),
+                parserResult.getDatabase().getEntries()
+            );
+        //        JabRefGUI.getMainFrame().getCurrentLibraryTab().markBaseChanged();
     }
 
-    private void buildImportHandlerThenImportEntries(List<BibEntry> entriesToImport) {
+    private void buildImportHandlerThenImportEntries(
+        List<BibEntry> entriesToImport
+    ) {
         ImportHandler importHandler = new ImportHandler(
-                selectedDb.getValue(),
-                preferences,
-                fileUpdateMonitor,
-                undoManager,
-                stateManager,
-                dialogService,
-                taskExecutor);
+            selectedDb.getValue(),
+            preferences,
+            fileUpdateMonitor,
+            undoManager,
+            stateManager,
+            dialogService,
+            taskExecutor
+        );
         importHandler.importEntries(entriesToImport);
-        dialogService.notify(Localization.lang("Number of entries successfully imported") + ": " + entriesToImport.size());
+        dialogService.notify(
+            Localization.lang("Number of entries successfully imported") +
+            ": " +
+            entriesToImport.size()
+        );
     }
 
     /**
@@ -201,7 +264,10 @@ 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);
             }
         }
@@ -210,25 +276,53 @@ private Optional<BibEntry> findInternalDuplicate(BibEntry entry) {
 
     public void resolveDuplicate(BibEntry entry) {
         // First, try to find duplicate in the existing library
-        Optional<BibEntry> other = new DuplicateCheck(entryTypesManager).containsDuplicate(databaseContext.getDatabase(), entry, databaseContext.getMode());
+        Optional<BibEntry> other = new DuplicateCheck(entryTypesManager)
+            .containsDuplicate(
+                databaseContext.getDatabase(),
+                entry,
+                databaseContext.getMode()
+            );
         if (other.isPresent()) {
-            DuplicateResolverDialog dialog = new DuplicateResolverDialog(other.get(),
-                    entry, DuplicateResolverDialog.DuplicateResolverType.IMPORT_CHECK, databaseContext, stateManager, dialogService, preferences);
+            DuplicateResolverDialog dialog = new DuplicateResolverDialog(
+                other.get(),
+                entry,
+                DuplicateResolverDialog.DuplicateResolverType.IMPORT_CHECK,
+                databaseContext,
+                stateManager,
+                dialogService,
+                preferences
+            );
 
-            DuplicateResolverDialog.DuplicateResolverResult result = dialogService.showCustomDialogAndWait(dialog)
-                                                                                  .orElse(DuplicateResolverDialog.DuplicateResolverResult.BREAK);
+            DuplicateResolverDialog.DuplicateResolverResult result =
+                dialogService
+                    .showCustomDialogAndWait(dialog)
+                    .orElse(
+                        DuplicateResolverDialog.DuplicateResolverResult.BREAK
+                    );
 
-            if (result == DuplicateResolverDialog.DuplicateResolverResult.KEEP_LEFT) {
+            if (
+                result ==
+                DuplicateResolverDialog.DuplicateResolverResult.KEEP_LEFT
+            ) {
                 // TODO: Remove old entry. Or... add it to a list of entries
                 // to be deleted. We only delete
                 // it after Ok is clicked.
                 // entriesToDelete.add(other.get());
-            } else if (result == DuplicateResolverDialog.DuplicateResolverResult.KEEP_RIGHT) {
+            } else if (
+                result ==
+                DuplicateResolverDialog.DuplicateResolverResult.KEEP_RIGHT
+            ) {
                 // Remove the entry from the import inspection dialog.
                 entries.remove(entry);
-            } else if (result == DuplicateResolverDialog.DuplicateResolverResult.KEEP_BOTH) {
+            } else if (
+                result ==
+                DuplicateResolverDialog.DuplicateResolverResult.KEEP_BOTH
+            ) {
                 // Do nothing.
-            } else if (result == DuplicateResolverDialog.DuplicateResolverResult.KEEP_MERGE) {
+            } else if (
+                result ==
+                DuplicateResolverDialog.DuplicateResolverResult.KEEP_MERGE
+            ) {
                 // TODO: Remove old entry. Or... add it to a list of entries
                 // to be deleted. We only delete
                 // it after Ok is clicked.
@@ -243,20 +337,43 @@ public void resolveDuplicate(BibEntry entry) {
         // Second, check if the duplicate is of another entry in the import:
         other = findInternalDuplicate(entry);
         if (other.isPresent()) {
-            DuplicateResolverDialog diag = new DuplicateResolverDialog(entry,
-                    other.get(), DuplicateResolverDialog.DuplicateResolverType.DUPLICATE_SEARCH, databaseContext, stateManager, dialogService, preferences);
+            DuplicateResolverDialog diag = new DuplicateResolverDialog(
+                entry,
+                other.get(),
+                DuplicateResolverDialog.DuplicateResolverType.DUPLICATE_SEARCH,
+                databaseContext,
+                stateManager,
+                dialogService,
+                preferences
+            );
 
-            DuplicateResolverDialog.DuplicateResolverResult answer = dialogService.showCustomDialogAndWait(diag)
-                                                                                  .orElse(DuplicateResolverDialog.DuplicateResolverResult.BREAK);
-            if (answer == DuplicateResolverDialog.DuplicateResolverResult.KEEP_LEFT) {
+            DuplicateResolverDialog.DuplicateResolverResult answer =
+                dialogService
+                    .showCustomDialogAndWait(diag)
+                    .orElse(
+                        DuplicateResolverDialog.DuplicateResolverResult.BREAK
+                    );
+            if (
+                answer ==
+                DuplicateResolverDialog.DuplicateResolverResult.KEEP_LEFT
+            ) {
                 // Remove other entry
                 entries.remove(other.get());
-            } else if (answer == DuplicateResolverDialog.DuplicateResolverResult.KEEP_RIGHT) {
+            } else if (
+                answer ==
+                DuplicateResolverDialog.DuplicateResolverResult.KEEP_RIGHT
+            ) {
                 // Remove entry
                 entries.remove(entry);
-            } else if (answer == DuplicateResolverDialog.DuplicateResolverResult.KEEP_BOTH) {
+            } else if (
+                answer ==
+                DuplicateResolverDialog.DuplicateResolverResult.KEEP_BOTH
+            ) {
                 // Do nothing
-            } else if (answer == DuplicateResolverDialog.DuplicateResolverResult.KEEP_MERGE) {
+            } else if (
+                answer ==
+                DuplicateResolverDialog.DuplicateResolverResult.KEEP_MERGE
+            ) {
                 // Replace both entries by merged entry
                 entries.add(diag.getMergedEntry());
                 entries.remove(entry);
diff --git a/src/main/java/org/jabref/gui/importer/ImporterViewModel.java b/src/main/java/org/jabref/gui/importer/ImporterViewModel.java
index 9ec890a57a1..7c88355b53f 100644
--- a/src/main/java/org/jabref/gui/importer/ImporterViewModel.java
+++ b/src/main/java/org/jabref/gui/importer/ImporterViewModel.java
@@ -2,10 +2,10 @@
 
 import javafx.beans.property.SimpleStringProperty;
 import javafx.beans.property.StringProperty;
-
 import org.jabref.logic.importer.fileformat.CustomImporter;
 
 public class ImporterViewModel {
+
     private final CustomImporter importer;
     private final StringProperty name = new SimpleStringProperty();
     private final StringProperty classname = new SimpleStringProperty();
diff --git a/src/main/java/org/jabref/gui/importer/NewDatabaseAction.java b/src/main/java/org/jabref/gui/importer/NewDatabaseAction.java
index f45cbbd2a70..383b2cee2cb 100644
--- a/src/main/java/org/jabref/gui/importer/NewDatabaseAction.java
+++ b/src/main/java/org/jabref/gui/importer/NewDatabaseAction.java
@@ -19,7 +19,10 @@ public class NewDatabaseAction extends SimpleCommand {
      * @param jabRefFrame        the application frame of JabRef
      * @param preferencesService the preferencesService of JabRef
      */
-    public NewDatabaseAction(JabRefFrame jabRefFrame, PreferencesService preferencesService) {
+    public NewDatabaseAction(
+        JabRefFrame jabRefFrame,
+        PreferencesService preferencesService
+    ) {
         this.jabRefFrame = jabRefFrame;
         this.preferencesService = preferencesService;
     }
@@ -27,7 +30,11 @@ public NewDatabaseAction(JabRefFrame jabRefFrame, PreferencesService preferences
     @Override
     public void execute() {
         BibDatabaseContext bibDatabaseContext = new BibDatabaseContext();
-        bibDatabaseContext.setMode(preferencesService.getLibraryPreferences().getDefaultBibDatabaseMode());
+        bibDatabaseContext.setMode(
+            preferencesService
+                .getLibraryPreferences()
+                .getDefaultBibDatabaseMode()
+        );
         jabRefFrame.addTab(bibDatabaseContext, true);
     }
 }
diff --git a/src/main/java/org/jabref/gui/importer/NewEntryAction.java b/src/main/java/org/jabref/gui/importer/NewEntryAction.java
index 4086cec912f..525c49e8dac 100644
--- a/src/main/java/org/jabref/gui/importer/NewEntryAction.java
+++ b/src/main/java/org/jabref/gui/importer/NewEntryAction.java
@@ -1,9 +1,10 @@
 package org.jabref.gui.importer;
 
+import static org.jabref.gui.actions.ActionHelper.needsDatabase;
+
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Optional;
-
 import org.jabref.gui.DialogService;
 import org.jabref.gui.EntryTypeView;
 import org.jabref.gui.JabRefFrame;
@@ -13,15 +14,14 @@
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.types.EntryType;
 import org.jabref.preferences.PreferencesService;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import static org.jabref.gui.actions.ActionHelper.needsDatabase;
-
 public class NewEntryAction extends SimpleCommand {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(NewEntryAction.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(
+        NewEntryAction.class
+    );
 
     private final JabRefFrame jabRefFrame;
 
@@ -34,7 +34,12 @@ public class NewEntryAction extends SimpleCommand {
 
     private final PreferencesService preferences;
 
-    public NewEntryAction(JabRefFrame jabRefFrame, DialogService dialogService, PreferencesService preferences, StateManager stateManager) {
+    public NewEntryAction(
+        JabRefFrame jabRefFrame,
+        DialogService dialogService,
+        PreferencesService preferences,
+        StateManager stateManager
+    ) {
         this.jabRefFrame = jabRefFrame;
         this.dialogService = dialogService;
         this.preferences = preferences;
@@ -44,7 +49,13 @@ public NewEntryAction(JabRefFrame jabRefFrame, DialogService dialogService, Pref
         this.executable.bind(needsDatabase(stateManager));
     }
 
-    public NewEntryAction(JabRefFrame jabRefFrame, EntryType type, DialogService dialogService, PreferencesService preferences, StateManager stateManager) {
+    public NewEntryAction(
+        JabRefFrame jabRefFrame,
+        EntryType type,
+        DialogService dialogService,
+        PreferencesService preferences,
+        StateManager stateManager
+    ) {
         this(jabRefFrame, dialogService, preferences, stateManager);
         this.type = Optional.of(type);
     }
@@ -52,21 +63,33 @@ public NewEntryAction(JabRefFrame jabRefFrame, EntryType type, DialogService dia
     @Override
     public void execute() {
         if (jabRefFrame.getBasePanelCount() <= 0) {
-            LOGGER.error("Action 'New entry' must be disabled when no database is open.");
+            LOGGER.error(
+                "Action 'New entry' must be disabled when no database is open."
+            );
             return;
         }
 
         if (type.isPresent()) {
-            jabRefFrame.getCurrentLibraryTab().insertEntry(new BibEntry(type.get()));
+            jabRefFrame
+                .getCurrentLibraryTab()
+                .insertEntry(new BibEntry(type.get()));
         } else {
-            EntryTypeView typeChoiceDialog = new EntryTypeView(jabRefFrame.getCurrentLibraryTab(), dialogService, preferences);
-            EntryType selectedType = dialogService.showCustomDialogAndWait(typeChoiceDialog).orElse(null);
+            EntryTypeView typeChoiceDialog = new EntryTypeView(
+                jabRefFrame.getCurrentLibraryTab(),
+                dialogService,
+                preferences
+            );
+            EntryType selectedType = dialogService
+                .showCustomDialogAndWait(typeChoiceDialog)
+                .orElse(null);
             if (selectedType == null) {
                 return;
             }
 
             trackNewEntry(selectedType);
-            jabRefFrame.getCurrentLibraryTab().insertEntry(new BibEntry(selectedType));
+            jabRefFrame
+                .getCurrentLibraryTab()
+                .insertEntry(new BibEntry(selectedType));
         }
     }
 
@@ -74,6 +97,10 @@ private void trackNewEntry(EntryType type) {
         Map<String, String> properties = new HashMap<>();
         properties.put("EntryType", type.getName());
 
-        Telemetry.getTelemetryClient().ifPresent(client -> client.trackEvent("NewEntry", properties, new HashMap<>()));
+        Telemetry
+            .getTelemetryClient()
+            .ifPresent(client ->
+                client.trackEvent("NewEntry", properties, new HashMap<>())
+            );
     }
 }
diff --git a/src/main/java/org/jabref/gui/importer/ParserResultWarningDialog.java b/src/main/java/org/jabref/gui/importer/ParserResultWarningDialog.java
index ec07cbc93b4..b3434f2a5d0 100644
--- a/src/main/java/org/jabref/gui/importer/ParserResultWarningDialog.java
+++ b/src/main/java/org/jabref/gui/importer/ParserResultWarningDialog.java
@@ -2,7 +2,6 @@
 
 import java.util.List;
 import java.util.Objects;
-
 import org.jabref.gui.JabRefFrame;
 import org.jabref.logic.importer.ParserResult;
 import org.jabref.logic.l10n.Localization;
@@ -12,8 +11,7 @@
  */
 public class ParserResultWarningDialog {
 
-    private ParserResultWarningDialog() {
-    }
+    private ParserResultWarningDialog() {}
 
     /**
      * Shows a dialog with the warnings from an import or open of a file
@@ -21,7 +19,10 @@ private ParserResultWarningDialog() {
      * @param parserResult - ParserResult for the current import/open
      * @param jabRefFrame  - the JabRefFrame
      */
-    public static void showParserResultWarningDialog(final ParserResult parserResult, final JabRefFrame jabRefFrame) {
+    public static void showParserResultWarningDialog(
+        final ParserResult parserResult,
+        final JabRefFrame jabRefFrame
+    ) {
         Objects.requireNonNull(parserResult);
         Objects.requireNonNull(jabRefFrame);
         showParserResultWarningDialog(parserResult, jabRefFrame, -1);
@@ -34,8 +35,11 @@ public static void showParserResultWarningDialog(final ParserResult parserResult
      * @param jabRefFrame    - the JabRefFrame
      * @param dataBaseNumber - Database tab number to activate when showing the warning dialog
      */
-    public static void showParserResultWarningDialog(final ParserResult parserResult, final JabRefFrame jabRefFrame,
-                                                     final int dataBaseNumber) {
+    public static void showParserResultWarningDialog(
+        final ParserResult parserResult,
+        final JabRefFrame jabRefFrame,
+        final int dataBaseNumber
+    ) {
         Objects.requireNonNull(parserResult);
         Objects.requireNonNull(jabRefFrame);
         // Return if no warnings
@@ -53,7 +57,9 @@ public static void showParserResultWarningDialog(final ParserResult parserResult
         final StringBuilder dialogContent = new StringBuilder();
         int warningCount = 1;
         for (final String warning : warnings) {
-            dialogContent.append(String.format("%d. %s%n", warningCount++, warning));
+            dialogContent.append(
+                String.format("%d. %s%n", warningCount++, warning)
+            );
         }
         dialogContent.deleteCharAt(dialogContent.length() - 1);
 
@@ -62,10 +68,16 @@ public static void showParserResultWarningDialog(final ParserResult parserResult
         if (dataBaseNumber < 0 || 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
-        jabRefFrame.getDialogService().showWarningDialogAndWait(dialogTitle, dialogContent.toString());
+        jabRefFrame
+            .getDialogService()
+            .showWarningDialogAndWait(dialogTitle, dialogContent.toString());
     }
 }
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 c1e0208a65e..fba51e2f192 100644
--- a/src/main/java/org/jabref/gui/importer/actions/CheckForNewEntryTypesAction.java
+++ b/src/main/java/org/jabref/gui/importer/actions/CheckForNewEntryTypesAction.java
@@ -1,8 +1,8 @@
 package org.jabref.gui.importer.actions;
 
+import com.airhacks.afterburner.injection.Injector;
 import java.util.List;
 import java.util.stream.Collectors;
-
 import org.jabref.gui.DialogService;
 import org.jabref.gui.Globals;
 import org.jabref.gui.LibraryTab;
@@ -11,8 +11,6 @@
 import org.jabref.model.database.BibDatabaseMode;
 import org.jabref.model.entry.BibEntryType;
 
-import com.airhacks.afterburner.injection.Injector;
-
 /**
  * This action checks whether any new custom entry types were loaded from this
  * BIB file. If so, an offer to remember these entry types is given.
@@ -21,26 +19,54 @@ public class CheckForNewEntryTypesAction implements GUIPostOpenAction {
 
     @Override
     public boolean isActionNecessary(ParserResult parserResult) {
-        return !getListOfUnknownAndUnequalCustomizations(parserResult).isEmpty();
+        return !getListOfUnknownAndUnequalCustomizations(parserResult)
+            .isEmpty();
     }
 
     @Override
-    public void performAction(LibraryTab libraryTab, ParserResult parserResult) {
+    public void performAction(
+        LibraryTab libraryTab,
+        ParserResult parserResult
+    ) {
         BibDatabaseMode mode = getBibDatabaseModeFromParserResult(parserResult);
-        DialogService dialogService = Injector.instantiateModelOrService(DialogService.class);
-        dialogService.showCustomDialogAndWait(new ImportCustomEntryTypesDialog(mode, getListOfUnknownAndUnequalCustomizations(parserResult)));
+        DialogService dialogService = Injector.instantiateModelOrService(
+            DialogService.class
+        );
+        dialogService.showCustomDialogAndWait(
+            new ImportCustomEntryTypesDialog(
+                mode,
+                getListOfUnknownAndUnequalCustomizations(parserResult)
+            )
+        );
     }
 
-    private List<BibEntryType> getListOfUnknownAndUnequalCustomizations(ParserResult parserResult) {
+    private List<BibEntryType> getListOfUnknownAndUnequalCustomizations(
+        ParserResult parserResult
+    ) {
         BibDatabaseMode mode = getBibDatabaseModeFromParserResult(parserResult);
 
-        return parserResult.getEntryTypes()
-                           .stream()
-                           .filter(type -> Globals.entryTypesManager.isDifferentCustomOrModifiedType(type, mode))
-                           .collect(Collectors.toList());
+        return parserResult
+            .getEntryTypes()
+            .stream()
+            .filter(type ->
+                Globals.entryTypesManager.isDifferentCustomOrModifiedType(
+                    type,
+                    mode
+                )
+            )
+            .collect(Collectors.toList());
     }
 
-    private BibDatabaseMode getBibDatabaseModeFromParserResult(ParserResult parserResult) {
-        return parserResult.getMetaData().getMode().orElse(Globals.prefs.getLibraryPreferences().getDefaultBibDatabaseMode());
+    private BibDatabaseMode getBibDatabaseModeFromParserResult(
+        ParserResult parserResult
+    ) {
+        return parserResult
+            .getMetaData()
+            .getMode()
+            .orElse(
+                Globals.prefs
+                    .getLibraryPreferences()
+                    .getDefaultBibDatabaseMode()
+            );
     }
 }
diff --git a/src/main/java/org/jabref/gui/importer/actions/GUIPostOpenAction.java b/src/main/java/org/jabref/gui/importer/actions/GUIPostOpenAction.java
index cc943956861..5c19ab5368d 100644
--- a/src/main/java/org/jabref/gui/importer/actions/GUIPostOpenAction.java
+++ b/src/main/java/org/jabref/gui/importer/actions/GUIPostOpenAction.java
@@ -13,7 +13,6 @@
  * flexible manner.
  */
 public interface GUIPostOpenAction {
-
     /**
      * This method is queried in order to find out whether the action needs to be
      * performed or not.
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 a8bb0a453f1..b4b5ac0c712 100644
--- a/src/main/java/org/jabref/gui/importer/actions/MergeReviewIntoCommentAction.java
+++ b/src/main/java/org/jabref/gui/importer/actions/MergeReviewIntoCommentAction.java
@@ -1,7 +1,6 @@
 package org.jabref.gui.importer.actions;
 
 import java.util.List;
-
 import org.jabref.gui.LibraryTab;
 import org.jabref.logic.importer.ParserResult;
 import org.jabref.migrations.MergeReviewIntoCommentMigration;
@@ -15,12 +14,23 @@ public boolean isActionNecessary(ParserResult parserResult) {
     }
 
     @Override
-    public void performAction(LibraryTab libraryTab, ParserResult parserResult) {
-        MergeReviewIntoCommentMigration migration = new MergeReviewIntoCommentMigration();
+    public void performAction(
+        LibraryTab libraryTab,
+        ParserResult parserResult
+    ) {
+        MergeReviewIntoCommentMigration migration =
+            new MergeReviewIntoCommentMigration();
 
         migration.performMigration(parserResult);
-        List<BibEntry> conflicts = MergeReviewIntoCommentMigration.collectConflicts(parserResult);
-        if (!conflicts.isEmpty() && new MergeReviewIntoCommentConfirmationDialog(libraryTab.frame().getDialogService()).askUserForMerge(conflicts)) {
+        List<BibEntry> conflicts =
+            MergeReviewIntoCommentMigration.collectConflicts(parserResult);
+        if (
+            !conflicts.isEmpty() &&
+            new MergeReviewIntoCommentConfirmationDialog(
+                libraryTab.frame().getDialogService()
+            )
+                .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 ece4bb4e079..f227201dc67 100644
--- a/src/main/java/org/jabref/gui/importer/actions/MergeReviewIntoCommentConfirmationDialog.java
+++ b/src/main/java/org/jabref/gui/importer/actions/MergeReviewIntoCommentConfirmationDialog.java
@@ -3,7 +3,6 @@
 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;
@@ -12,27 +11,39 @@ public class MergeReviewIntoCommentConfirmationDialog {
 
     private final DialogService dialogService;
 
-    public MergeReviewIntoCommentConfirmationDialog(DialogService dialogService) {
+    public MergeReviewIntoCommentConfirmationDialog(
+        DialogService dialogService
+    ) {
         this.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.");
+            .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("Review Field Migration"),
+            content,
+            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 4e2854ba764..2157e51d9b5 100644
--- a/src/main/java/org/jabref/gui/importer/actions/OpenDatabaseAction.java
+++ b/src/main/java/org/jabref/gui/importer/actions/OpenDatabaseAction.java
@@ -10,9 +10,7 @@
 import java.util.Map;
 import java.util.Objects;
 import java.util.Optional;
-
 import javax.swing.undo.UndoManager;
-
 import org.jabref.gui.DialogService;
 import org.jabref.gui.JabRefFrame;
 import org.jabref.gui.LibraryTab;
@@ -38,23 +36,25 @@
 import org.jabref.model.entry.BibEntryTypesManager;
 import org.jabref.model.util.FileUpdateMonitor;
 import org.jabref.preferences.PreferencesService;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 // The action concerned with opening an existing database.
 public class OpenDatabaseAction extends SimpleCommand {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(OpenDatabaseAction.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(
+        OpenDatabaseAction.class
+    );
 
     // 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());
+        // 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()
+    );
 
     private final JabRefFrame frame;
     private final PreferencesService preferencesService;
@@ -65,14 +65,16 @@ public class OpenDatabaseAction extends SimpleCommand {
     private final CountingUndoManager undoManager;
     private final TaskExecutor taskExecutor;
 
-    public OpenDatabaseAction(JabRefFrame frame,
-                              PreferencesService preferencesService,
-                              DialogService dialogService,
-                              StateManager stateManager,
-                              FileUpdateMonitor fileUpdateMonitor,
-                              BibEntryTypesManager entryTypesManager,
-                              CountingUndoManager undoManager,
-                              TaskExecutor taskExecutor) {
+    public OpenDatabaseAction(
+        JabRefFrame frame,
+        PreferencesService preferencesService,
+        DialogService dialogService,
+        StateManager stateManager,
+        FileUpdateMonitor fileUpdateMonitor,
+        BibEntryTypesManager entryTypesManager,
+        CountingUndoManager undoManager,
+        TaskExecutor taskExecutor
+    ) {
         this.frame = frame;
         this.preferencesService = preferencesService;
         this.dialogService = dialogService;
@@ -89,7 +91,10 @@ public OpenDatabaseAction(JabRefFrame frame,
      * @param libraryTab The BasePanel where the database is shown.
      * @param result     The result of the BIB file parse operation.
      */
-    public static void performPostOpenActions(LibraryTab libraryTab, ParserResult result) {
+    public static void performPostOpenActions(
+        LibraryTab libraryTab,
+        ParserResult result
+    ) {
         for (GUIPostOpenAction action : OpenDatabaseAction.POST_OPEN_ACTIONS) {
             if (action.isActionNecessary(result)) {
                 action.performAction(libraryTab, result);
@@ -100,13 +105,17 @@ public static void performPostOpenActions(LibraryTab libraryTab, ParserResult re
 
     @Override
     public void execute() {
-        FileDialogConfiguration fileDialogConfiguration = new FileDialogConfiguration.Builder()
+        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(filesToOpen);
     }
 
@@ -115,10 +124,21 @@ public void execute() {
      */
     private Path getInitialDirectory() {
         if (frame.getLibraryTabs().isEmpty()) {
-            return preferencesService.getFilePreferences().getWorkingDirectory();
+            return preferencesService
+                .getFilePreferences()
+                .getWorkingDirectory();
         } else {
-            Optional<Path> databasePath = frame.getCurrentLibraryTab().getBibDatabaseContext().getDatabasePath();
-            return databasePath.map(Path::getParent).orElse(preferencesService.getFilePreferences().getWorkingDirectory());
+            Optional<Path> databasePath = frame
+                .getCurrentLibraryTab()
+                .getBibDatabaseContext()
+                .getDatabasePath();
+            return databasePath
+                .map(Path::getParent)
+                .orElse(
+                    preferencesService
+                        .getFilePreferences()
+                        .getWorkingDirectory()
+                );
         }
     }
 
@@ -144,12 +164,24 @@ public void openFiles(List<Path> filesToOpen) {
         int removed = 0;
 
         // Check if any of the files are already open:
-        for (Iterator<Path> iterator = filesToOpen.iterator(); iterator.hasNext(); ) {
+        for (
+            Iterator<Path> iterator = filesToOpen.iterator();
+            iterator.hasNext();
+        ) {
             Path file = iterator.next();
             for (int i = 0; i < frame.getLibraryTabs().size(); i++) {
                 LibraryTab libraryTab = frame.getLibraryTabAt(i);
-                if ((libraryTab.getBibDatabaseContext().getDatabasePath().isPresent())
-                        && libraryTab.getBibDatabaseContext().getDatabasePath().get().equals(file)) {
+                if (
+                    (libraryTab
+                            .getBibDatabaseContext()
+                            .getDatabasePath()
+                            .isPresent()) &&
+                    libraryTab
+                        .getBibDatabaseContext()
+                        .getDatabasePath()
+                        .get()
+                        .equals(file)
+                ) {
                     iterator.remove();
                     removed++;
                     // See if we removed the final one. If so, we must perhaps
@@ -166,7 +198,9 @@ public void openFiles(List<Path> filesToOpen) {
         // Run the actual open in a thread to prevent the program
         // locking until the file is loaded.
         if (!filesToOpen.isEmpty()) {
-            FileHistory fileHistory = preferencesService.getGuiPreferences().getFileHistory();
+            FileHistory fileHistory = preferencesService
+                .getGuiPreferences()
+                .getFileHistory();
             filesToOpen.forEach(theFile -> {
                 // This method will execute the concrete file opening and loading in a background thread
                 openTheFile(theFile);
@@ -190,19 +224,22 @@ private void openTheFile(Path file) {
             return;
         }
 
-        BackgroundTask<ParserResult> backgroundTask = BackgroundTask.wrap(() -> loadDatabase(file));
+        BackgroundTask<ParserResult> backgroundTask = BackgroundTask.wrap(() ->
+            loadDatabase(file)
+        );
         // The backgroundTask is executed within the method createLibraryTab
         LibraryTab newTab = LibraryTab.createLibraryTab(
-                backgroundTask,
-                file,
-                dialogService,
-                preferencesService,
-                stateManager,
-                frame,
-                fileUpdateMonitor,
-                entryTypesManager,
-                undoManager,
-                taskExecutor);
+            backgroundTask,
+            file,
+            dialogService,
+            preferencesService,
+            stateManager,
+            frame,
+            fileUpdateMonitor,
+            entryTypesManager,
+            undoManager,
+            taskExecutor
+        );
         backgroundTask.onFinished(() -> trackOpenNewDatabase(newTab));
     }
 
@@ -211,30 +248,52 @@ private ParserResult loadDatabase(Path file) throws Exception {
 
         dialogService.notify(Localization.lang("Opening") + ": '" + file + "'");
 
-        preferencesService.getFilePreferences().setWorkingDirectory(fileToLoad.getParent());
-        Path backupDir = preferencesService.getFilePreferences().getBackupDirectory();
+        preferencesService
+            .getFilePreferences()
+            .setWorkingDirectory(fileToLoad.getParent());
+        Path backupDir = preferencesService
+            .getFilePreferences()
+            .getBackupDirectory();
 
         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, preferencesService, fileUpdateMonitor)
-                                          .orElse(null);
+            parserResult =
+                BackupUIManager
+                    .showRestoreBackupDialog(
+                        dialogService,
+                        fileToLoad,
+                        preferencesService,
+                        fileUpdateMonitor
+                    )
+                    .orElse(null);
         }
 
         try {
             if (parserResult == null) {
                 // No backup was restored, do the "normal" loading
-                parserResult = OpenDatabase.loadDatabase(fileToLoad,
+                parserResult =
+                    OpenDatabase.loadDatabase(
+                        fileToLoad,
                         preferencesService.getImportFormatPreferences(),
-                        fileUpdateMonitor);
+                        fileUpdateMonitor
+                    );
             }
 
             if (parserResult.hasWarnings()) {
-                String content = Localization.lang("Please check your library file for wrong syntax.")
-                        + "\n\n" + parserResult.getErrorMessage();
+                String content =
+                    Localization.lang(
+                        "Please check your library file for wrong syntax."
+                    ) +
+                    "\n\n" +
+                    parserResult.getErrorMessage();
                 DefaultTaskExecutor.runInJavaFXThread(() ->
-                        dialogService.showWarningDialogAndWait(Localization.lang("Open library error"), content));
+                    dialogService.showWarningDialogAndWait(
+                        Localization.lang("Open library error"),
+                        content
+                    )
+                );
             }
         } catch (IOException e) {
             parserResult = ParserResult.fromError(e);
@@ -242,50 +301,69 @@ private ParserResult loadDatabase(Path file) throws Exception {
         }
 
         if (parserResult.getDatabase().isShared()) {
-                         openSharedDatabase(
-                                 parserResult,
-                                 frame,
-                                 dialogService,
-                                 preferencesService,
-                                 stateManager,
-                                 entryTypesManager,
-                                 fileUpdateMonitor,
-                                 undoManager,
-                                 taskExecutor);
+            openSharedDatabase(
+                parserResult,
+                frame,
+                dialogService,
+                preferencesService,
+                stateManager,
+                entryTypesManager,
+                fileUpdateMonitor,
+                undoManager,
+                taskExecutor
+            );
         }
         return parserResult;
     }
 
     private void trackOpenNewDatabase(LibraryTab libraryTab) {
-        Telemetry.getTelemetryClient().ifPresent(client -> client.trackEvent(
-                "OpenNewDatabase",
-                Map.of(),
-                Map.of("NumberOfEntries", (double) libraryTab.getBibDatabaseContext().getDatabase().getEntryCount())));
+        Telemetry
+            .getTelemetryClient()
+            .ifPresent(client ->
+                client.trackEvent(
+                    "OpenNewDatabase",
+                    Map.of(),
+                    Map.of(
+                        "NumberOfEntries",
+                        (double) libraryTab
+                            .getBibDatabaseContext()
+                            .getDatabase()
+                            .getEntryCount()
+                    )
+                )
+            );
     }
 
-    public static void openSharedDatabase(ParserResult parserResult,
-                                          JabRefFrame frame,
-                                          DialogService dialogService,
-                                          PreferencesService preferencesService,
-                                          StateManager stateManager,
-                                          BibEntryTypesManager entryTypesManager,
-                                          FileUpdateMonitor fileUpdateMonitor,
-                                          UndoManager undoManager,
-                                          TaskExecutor taskExecutor)
-            throws SQLException, DatabaseNotSupportedException, InvalidDBMSConnectionPropertiesException, NotASharedDatabaseException {
+    public static void openSharedDatabase(
+        ParserResult parserResult,
+        JabRefFrame frame,
+        DialogService dialogService,
+        PreferencesService preferencesService,
+        StateManager stateManager,
+        BibEntryTypesManager entryTypesManager,
+        FileUpdateMonitor fileUpdateMonitor,
+        UndoManager undoManager,
+        TaskExecutor taskExecutor
+    )
+        throws SQLException, DatabaseNotSupportedException, InvalidDBMSConnectionPropertiesException, NotASharedDatabaseException {
         try {
             new SharedDatabaseUIManager(
-                    frame,
-                    dialogService,
-                    preferencesService,
-                    stateManager,
-                    entryTypesManager,
-                    fileUpdateMonitor,
-                    undoManager,
-                    taskExecutor)
-                    .openSharedDatabaseFromParserResult(parserResult);
-        } catch (SQLException | DatabaseNotSupportedException | InvalidDBMSConnectionPropertiesException |
-                 NotASharedDatabaseException e) {
+                frame,
+                dialogService,
+                preferencesService,
+                stateManager,
+                entryTypesManager,
+                fileUpdateMonitor,
+                undoManager,
+                taskExecutor
+            )
+                .openSharedDatabaseFromParserResult(parserResult);
+        } 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/fetcher/LookupIdentifierAction.java b/src/main/java/org/jabref/gui/importer/fetcher/LookupIdentifierAction.java
index 745006517fa..1f194a7def4 100644
--- a/src/main/java/org/jabref/gui/importer/fetcher/LookupIdentifierAction.java
+++ b/src/main/java/org/jabref/gui/importer/fetcher/LookupIdentifierAction.java
@@ -1,10 +1,11 @@
 package org.jabref.gui.importer.fetcher;
 
+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;
-
 import org.jabref.gui.JabRefFrame;
 import org.jabref.gui.StateManager;
 import org.jabref.gui.actions.Action;
@@ -21,16 +22,15 @@
 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;
-
-public class LookupIdentifierAction<T extends Identifier> extends SimpleCommand {
+public class LookupIdentifierAction<T extends Identifier>
+    extends SimpleCommand {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(LookupIdentifierAction.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(
+        LookupIdentifierAction.class
+    );
 
     private final JabRefFrame frame;
 
@@ -39,27 +39,42 @@ public class LookupIdentifierAction<T extends Identifier> extends SimpleCommand
     private final UndoManager undoManager;
     private final TaskExecutor taskExecutor;
 
-    public LookupIdentifierAction(JabRefFrame frame,
-                                  IdFetcher<T> fetcher,
-                                  StateManager stateManager,
-                                  UndoManager undoManager,
-                                  TaskExecutor taskExecutor) {
+    public LookupIdentifierAction(
+        JabRefFrame frame,
+        IdFetcher<T> fetcher,
+        StateManager stateManager,
+        UndoManager undoManager,
+        TaskExecutor taskExecutor
+    ) {
         this.frame = frame;
         this.fetcher = fetcher;
         this.stateManager = stateManager;
         this.undoManager = undoManager;
         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(frame.getDialogService()::notify)
-                          .executeWith(taskExecutor);
+            BackgroundTask
+                .wrap(() -> lookupIdentifiers(stateManager.getSelectedEntries())
+                )
+                .onSuccess(frame.getDialogService()::notify)
+                .executeWith(taskExecutor);
         } catch (Exception e) {
             LOGGER.error("Problem running ID Worker", e);
         }
@@ -71,28 +86,55 @@ 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));
-            DefaultTaskExecutor.runInJavaFXThread(() -> frame.getDialogService().notify(statusMessage));
+            final String statusMessage = Localization.lang(
+                "Looking up %0... - entry %1 out of %2 - found %3",
+                fetcher.getIdentifierName(),
+                Integer.toString(count),
+                totalCount,
+                Integer.toString(foundCount)
+            );
+            DefaultTaskExecutor.runInJavaFXThread(() ->
+                frame.getDialogService().notify(statusMessage)
+            );
             Optional<T> identifier = Optional.empty();
             try {
                 identifier = fetcher.findIdentifier(bibEntry);
             } catch (FetcherException e) {
-                LOGGER.error("Could not fetch " + fetcher.getIdentifierName(), e);
+                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());
+            if (
+                identifier.isPresent() &&
+                !bibEntry.hasField(identifier.get().getDefaultField())
+            ) {
+                Optional<FieldChange> fieldChange = bibEntry.setField(
+                    identifier.get().getDefaultField(),
+                    identifier.get().getNormalized()
+                );
                 if (fieldChange.isPresent()) {
-                    namedCompound.addEdit(new UndoableFieldChange(fieldChange.get()));
+                    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));
-                    DefaultTaskExecutor.runInJavaFXThread(() -> frame.getDialogService().notify(nextStatusMessage));
+                    final String nextStatusMessage = Localization.lang(
+                        "Looking up %0... - entry %1 out of %2 - found %3",
+                        fetcher.getIdentifierName(),
+                        Integer.toString(count),
+                        totalCount,
+                        Integer.toString(foundCount)
+                    );
+                    DefaultTaskExecutor.runInJavaFXThread(() ->
+                        frame.getDialogService().notify(nextStatusMessage)
+                    );
                 }
             }
         }
@@ -100,6 +142,10 @@ private String lookupIdentifiers(List<BibEntry> bibEntries) {
         if (foundCount > 0) {
             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 737d3a23137..7660bceb1b0 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,6 @@
 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;
@@ -11,7 +12,6 @@
 import javafx.scene.layout.Priority;
 import javafx.scene.layout.StackPane;
 import javafx.scene.layout.VBox;
-
 import org.jabref.gui.ClipBoardManager;
 import org.jabref.gui.DialogService;
 import org.jabref.gui.StateManager;
@@ -24,43 +24,66 @@
 import org.jabref.logic.l10n.Localization;
 import org.jabref.preferences.PreferencesService;
 
-import com.tobiasdiez.easybind.EasyBind;
-
 public class WebSearchPaneView extends VBox {
 
-    private static final PseudoClass QUERY_INVALID = PseudoClass.getPseudoClass("invalid");
+    private static final PseudoClass QUERY_INVALID = PseudoClass.getPseudoClass(
+        "invalid"
+    );
 
     private final WebSearchPaneViewModel viewModel;
     private final PreferencesService preferences;
     private final DialogService dialogService;
 
-    public WebSearchPaneView(PreferencesService preferences, DialogService dialogService, StateManager stateManager) {
+    public WebSearchPaneView(
+        PreferencesService preferences,
+        DialogService dialogService,
+        StateManager stateManager
+    ) {
         this.preferences = preferences;
         this.dialogService = dialogService;
-        this.viewModel = new WebSearchPaneViewModel(preferences, dialogService, stateManager);
+        this.viewModel =
+            new WebSearchPaneViewModel(
+                preferences,
+                dialogService,
+                stateManager
+            );
         initialize();
     }
 
     private void initialize() {
         ComboBox<SearchBasedFetcher> fetchers = new ComboBox<>();
         new ViewModelListCellFactory<SearchBasedFetcher>()
-                .withText(SearchBasedFetcher::getName)
-                .install(fetchers);
+            .withText(SearchBasedFetcher::getName)
+            .install(fetchers);
         fetchers.itemsProperty().bind(viewModel.fetchersProperty());
-        fetchers.valueProperty().bindBidirectional(viewModel.selectedFetcherProperty());
+        fetchers
+            .valueProperty()
+            .bindBidirectional(viewModel.selectedFetcherProperty());
         fetchers.setMaxWidth(Double.POSITIVE_INFINITY);
 
         // Create help button for currently selected fetcher
         StackPane helpButtonContainer = new StackPane();
-        ActionFactory factory = new ActionFactory(preferences.getKeyBindingRepository());
-        EasyBind.subscribe(viewModel.selectedFetcherProperty(), fetcher -> {
-            if ((fetcher != null) && fetcher.getHelpPage().isPresent()) {
-                Button helpButton = factory.createIconButton(StandardActions.HELP, new HelpAction(fetcher.getHelpPage().get(), dialogService, preferences.getFilePreferences()));
-                helpButtonContainer.getChildren().setAll(helpButton);
-            } else {
-                helpButtonContainer.getChildren().clear();
+        ActionFactory factory = new ActionFactory(
+            preferences.getKeyBindingRepository()
+        );
+        EasyBind.subscribe(
+            viewModel.selectedFetcherProperty(),
+            fetcher -> {
+                if ((fetcher != null) && fetcher.getHelpPage().isPresent()) {
+                    Button helpButton = factory.createIconButton(
+                        StandardActions.HELP,
+                        new HelpAction(
+                            fetcher.getHelpPage().get(),
+                            dialogService,
+                            preferences.getFilePreferences()
+                        )
+                    );
+                    helpButtonContainer.getChildren().setAll(helpButton);
+                } else {
+                    helpButtonContainer.getChildren().clear();
+                }
             }
-        });
+        );
         HBox fetcherContainer = new HBox(fetchers, helpButtonContainer);
         HBox.setHgrow(fetchers, Priority.ALWAYS);
 
@@ -69,16 +92,32 @@ private void initialize() {
         query.getStyleClass().add("searchBar");
 
         viewModel.queryProperty().bind(query.textProperty());
-        EasyBind.subscribe(viewModel.queryValidationStatus().validProperty(),
-                valid -> {
-                    if (!valid && viewModel.queryValidationStatus().getHighestMessage().isPresent()) {
-                        query.setTooltip(new Tooltip(viewModel.queryValidationStatus().getHighestMessage().get().getMessage()));
-                        query.pseudoClassStateChanged(QUERY_INVALID, true);
-                    } else {
-                        query.setTooltip(null);
-                        query.pseudoClassStateChanged(QUERY_INVALID, false);
-                    }
-                });
+        EasyBind.subscribe(
+            viewModel.queryValidationStatus().validProperty(),
+            valid -> {
+                if (
+                    !valid &&
+                    viewModel
+                        .queryValidationStatus()
+                        .getHighestMessage()
+                        .isPresent()
+                ) {
+                    query.setTooltip(
+                        new Tooltip(
+                            viewModel
+                                .queryValidationStatus()
+                                .getHighestMessage()
+                                .get()
+                                .getMessage()
+                        )
+                    );
+                    query.pseudoClassStateChanged(QUERY_INVALID, true);
+                } else {
+                    query.setTooltip(null);
+                    query.pseudoClassStateChanged(QUERY_INVALID, false);
+                }
+            }
+        );
 
         // Allows triggering search on pressing enter
         query.setOnKeyPressed(event -> {
@@ -90,7 +129,9 @@ private void initialize() {
         ClipBoardManager.addX11Support(query);
 
         // Create button that triggers search
-        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());
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 985bede5b5a..03d7d5001b3 100644
--- a/src/main/java/org/jabref/gui/importer/fetcher/WebSearchPaneViewModel.java
+++ b/src/main/java/org/jabref/gui/importer/fetcher/WebSearchPaneViewModel.java
@@ -1,8 +1,14 @@
 package org.jabref.gui.importer.fetcher;
 
+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 java.util.Map;
 import java.util.concurrent.Callable;
-
 import javafx.beans.property.ListProperty;
 import javafx.beans.property.ObjectProperty;
 import javafx.beans.property.SimpleListProperty;
@@ -11,7 +17,10 @@
 import javafx.beans.property.StringProperty;
 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.Telemetry;
@@ -27,22 +36,12 @@
 import org.jabref.preferences.PreferencesService;
 import org.jabref.preferences.SidePanePreferences;
 
-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;
-
 public class WebSearchPaneViewModel {
 
-    private final ObjectProperty<SearchBasedFetcher> selectedFetcher = new SimpleObjectProperty<>();
-    private final ListProperty<SearchBasedFetcher> fetchers = new SimpleListProperty<>(FXCollections.observableArrayList());
+    private final ObjectProperty<SearchBasedFetcher> selectedFetcher =
+        new SimpleObjectProperty<>();
+    private final ListProperty<SearchBasedFetcher> fetchers =
+        new SimpleListProperty<>(FXCollections.observableArrayList());
     private final StringProperty query = new SimpleStringProperty();
     private final DialogService dialogService;
     private final PreferencesService preferencesService;
@@ -51,29 +50,46 @@ public class WebSearchPaneViewModel {
     private final Validator searchQueryValidator;
     private final SyntaxParser parser = new StandardSyntaxParser();
 
-    public WebSearchPaneViewModel(PreferencesService preferencesService, DialogService dialogService, StateManager stateManager) {
+    public WebSearchPaneViewModel(
+        PreferencesService preferencesService,
+        DialogService dialogService,
+        StateManager stateManager
+    ) {
         this.dialogService = dialogService;
         this.stateManager = stateManager;
         this.preferencesService = preferencesService;
 
-        fetchers.setAll(WebFetchers.getSearchBasedFetchers(
+        fetchers.setAll(
+            WebFetchers.getSearchBasedFetchers(
                 preferencesService.getImportFormatPreferences(),
-                preferencesService.getImporterPreferences()));
+                preferencesService.getImporterPreferences()
+            )
+        );
 
         // Choose last-selected fetcher as default
-        SidePanePreferences sidePanePreferences = preferencesService.getSidePanePreferences();
-        int defaultFetcherIndex = sidePanePreferences.getWebSearchFetcherSelected();
-        if ((defaultFetcherIndex <= 0) || (defaultFetcherIndex >= fetchers.size())) {
+        SidePanePreferences sidePanePreferences =
+            preferencesService.getSidePanePreferences();
+        int defaultFetcherIndex =
+            sidePanePreferences.getWebSearchFetcherSelected();
+        if (
+            (defaultFetcherIndex <= 0) ||
+            (defaultFetcherIndex >= fetchers.size())
+        ) {
             selectedFetcherProperty().setValue(fetchers.get(0));
         } else {
-            selectedFetcherProperty().setValue(fetchers.get(defaultFetcherIndex));
+            selectedFetcherProperty()
+                .setValue(fetchers.get(defaultFetcherIndex));
         }
-        EasyBind.subscribe(selectedFetcherProperty(), newFetcher -> {
-            int newIndex = fetchers.indexOf(newFetcher);
-            sidePanePreferences.setWebSearchFetcherSelected(newIndex);
-        });
+        EasyBind.subscribe(
+            selectedFetcherProperty(),
+            newFetcher -> {
+                int newIndex = fetchers.indexOf(newFetcher);
+                sidePanePreferences.setWebSearchFetcherSelected(newIndex);
+            }
+        );
 
-        searchQueryValidator = new FunctionBasedValidator<>(
+        searchQueryValidator =
+            new FunctionBasedValidator<>(
                 query,
                 queryText -> {
                     if (StringUtil.isBlank(queryText)) {
@@ -93,14 +109,26 @@ public WebSearchPaneViewModel(PreferencesService preferencesService, DialogServi
                         String element = e.currentToken.image;
                         int position = e.currentToken.beginColumn;
                         if (element == null) {
-                            return ValidationMessage.error(Localization.lang("Invalid query. Check position %0.", position));
+                            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));
+                            return ValidationMessage.error(
+                                Localization.lang(
+                                    "Invalid query element '%0' at position %1",
+                                    element,
+                                    position
+                                )
+                            );
                         }
                     } catch (QueryNodeParseException e) {
                         return ValidationMessage.error("");
                     }
-                });
+                }
+            );
     }
 
     public ObservableList<SearchBasedFetcher> getFetchers() {
@@ -129,7 +157,11 @@ public StringProperty queryProperty() {
 
     public void search() {
         if (!preferencesService.getImporterPreferences().areImporterEnabled()) {
-            if (!preferencesService.getImporterPreferences().areImporterEnabled()) {
+            if (
+                !preferencesService
+                    .getImporterPreferences()
+                    .areImporterEnabled()
+            ) {
                 dialogService.notify(Localization.lang("Web search disabled"));
                 return;
             }
@@ -137,33 +169,59 @@ public void search() {
 
         String query = getQuery().trim();
         if (StringUtil.isBlank(query)) {
-            dialogService.notify(Localization.lang("Please enter a search string"));
+            dialogService.notify(
+                Localization.lang("Please enter a search string")
+            );
             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;
         }
 
         SearchBasedFetcher activeFetcher = getSelectedFetcher();
-        Callable<ParserResult> parserResultCallable = () -> new ParserResult(activeFetcher.performSearch(query));
+        Callable<ParserResult> parserResultCallable = () ->
+            new ParserResult(activeFetcher.performSearch(query));
         String fetcherName = activeFetcher.getName();
 
         if (CompositeIdFetcher.containsValidId(query)) {
-            CompositeIdFetcher compositeIdFetcher = new CompositeIdFetcher(preferencesService.getImportFormatPreferences());
-            parserResultCallable = () -> new ParserResult(OptionalUtil.toList(compositeIdFetcher.performSearchById(query)));
+            CompositeIdFetcher compositeIdFetcher = new CompositeIdFetcher(
+                preferencesService.getImportFormatPreferences()
+            );
+            parserResultCallable =
+                () ->
+                    new ParserResult(
+                        OptionalUtil.toList(
+                            compositeIdFetcher.performSearchById(query)
+                        )
+                    );
             fetcherName = Localization.lang("Identifier-based Web Search");
         }
 
         final String finalFetcherName = fetcherName;
-        Telemetry.getTelemetryClient().ifPresent(client ->
-                client.trackEvent("search", Map.of("fetcher", finalFetcherName), Map.of()));
-
-        BackgroundTask<ParserResult> task = BackgroundTask.wrap(parserResultCallable)
-                             .withInitialMessage(Localization.lang("Processing %0", query));
+        Telemetry
+            .getTelemetryClient()
+            .ifPresent(client ->
+                client.trackEvent(
+                    "search",
+                    Map.of("fetcher", finalFetcherName),
+                    Map.of()
+                )
+            );
+
+        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(finalFetcherName);
         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 5e6e2df5a37..14fe8f47a14 100644
--- a/src/main/java/org/jabref/gui/integrity/IntegrityCheckAction.java
+++ b/src/main/java/org/jabref/gui/integrity/IntegrityCheckAction.java
@@ -1,11 +1,11 @@
 package org.jabref.gui.integrity;
 
+import static org.jabref.gui.actions.ActionHelper.needsDatabase;
+
 import java.util.ArrayList;
 import java.util.List;
-
 import javafx.collections.ObservableList;
 import javafx.concurrent.Task;
-
 import org.jabref.gui.DialogService;
 import org.jabref.gui.JabRefFrame;
 import org.jabref.gui.StateManager;
@@ -19,8 +19,6 @@
 import org.jabref.model.entry.BibEntry;
 import org.jabref.preferences.PreferencesService;
 
-import static org.jabref.gui.actions.ActionHelper.needsDatabase;
-
 public class IntegrityCheckAction extends SimpleCommand {
 
     private final TaskExecutor taskExecutor;
@@ -30,12 +28,14 @@ public class IntegrityCheckAction extends SimpleCommand {
     private final StateManager stateManager;
     private final JournalAbbreviationRepository abbreviationRepository;
 
-    public IntegrityCheckAction(JabRefFrame frame,
-                                PreferencesService preferencesService,
-                                DialogService dialogService,
-                                StateManager stateManager,
-                                TaskExecutor taskExecutor,
-                                JournalAbbreviationRepository abbreviationRepository) {
+    public IntegrityCheckAction(
+        JabRefFrame frame,
+        PreferencesService preferencesService,
+        DialogService dialogService,
+        StateManager stateManager,
+        TaskExecutor taskExecutor,
+        JournalAbbreviationRepository abbreviationRepository
+    ) {
         this.frame = frame;
         this.stateManager = stateManager;
         this.taskExecutor = taskExecutor;
@@ -48,18 +48,28 @@ public IntegrityCheckAction(JabRefFrame frame,
 
     @Override
     public void execute() {
-        BibDatabaseContext database = stateManager.getActiveDatabase().orElseThrow(() -> new NullPointerException("Database null"));
-        IntegrityCheck check = new IntegrityCheck(database,
-                preferencesService.getFilePreferences(),
-                preferencesService.getCitationKeyPatternPreferences(),
-                abbreviationRepository,
-                preferencesService.getEntryEditorPreferences().shouldAllowIntegerEditionBibtex());
+        BibDatabaseContext database = stateManager
+            .getActiveDatabase()
+            .orElseThrow(() -> new NullPointerException("Database null"));
+        IntegrityCheck check = new IntegrityCheck(
+            database,
+            preferencesService.getFilePreferences(),
+            preferencesService.getCitationKeyPatternPreferences(),
+            abbreviationRepository,
+            preferencesService
+                .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()));
+                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;
@@ -78,15 +88,26 @@ protected List<IntegrityMessage> call() {
             if (messages.isEmpty()) {
                 dialogService.notify(Localization.lang("No problems found."));
             } else {
-                dialogService.showCustomDialogAndWait(new IntegrityCheckDialog(messages, frame.getCurrentLibraryTab()));
+                dialogService.showCustomDialogAndWait(
+                    new IntegrityCheckDialog(
+                        messages,
+                        frame.getCurrentLibraryTab()
+                    )
+                );
             }
         });
-        task.setOnFailed(event -> dialogService.showErrorDialogAndWait("Integrity check failed.", task.getException()));
+        task.setOnFailed(event ->
+            dialogService.showErrorDialogAndWait(
+                "Integrity check failed.",
+                task.getException()
+            )
+        );
 
         dialogService.showProgressDialog(
-                Localization.lang("Checking integrity..."),
-                Localization.lang("Checking integrity..."),
-                task);
+            Localization.lang("Checking integrity..."),
+            Localization.lang("Checking integrity..."),
+            task
+        );
         taskExecutor.execute(task);
     }
 }
diff --git a/src/main/java/org/jabref/gui/integrity/IntegrityCheckDialog.java b/src/main/java/org/jabref/gui/integrity/IntegrityCheckDialog.java
index 368951a4bc3..39103b9ea00 100644
--- a/src/main/java/org/jabref/gui/integrity/IntegrityCheckDialog.java
+++ b/src/main/java/org/jabref/gui/integrity/IntegrityCheckDialog.java
@@ -1,8 +1,9 @@
 package org.jabref.gui.integrity;
 
+import com.airhacks.afterburner.views.ViewLoader;
+import jakarta.inject.Inject;
 import java.util.List;
 import java.util.function.Function;
-
 import javafx.beans.property.ReadOnlyStringWrapper;
 import javafx.collections.ListChangeListener;
 import javafx.fxml.FXML;
@@ -12,7 +13,7 @@
 import javafx.scene.control.TableView;
 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,44 +21,65 @@
 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;
-
 public class IntegrityCheckDialog extends BaseDialog<Void> {
 
-    @FXML private TableView<IntegrityMessage> messagesTable;
-    @FXML private TableColumn<IntegrityMessage, String> keyColumn;
-    @FXML private TableColumn<IntegrityMessage, String> fieldColumn;
-    @FXML private TableColumn<IntegrityMessage, String> messageColumn;
-    @FXML private MenuButton keyFilterButton;
-    @FXML private MenuButton fieldFilterButton;
-    @FXML private MenuButton messageFilterButton;
+    @FXML
+    private TableView<IntegrityMessage> messagesTable;
+
+    @FXML
+    private TableColumn<IntegrityMessage, String> keyColumn;
+
+    @FXML
+    private TableColumn<IntegrityMessage, String> fieldColumn;
+
+    @FXML
+    private TableColumn<IntegrityMessage, String> messageColumn;
+
+    @FXML
+    private MenuButton keyFilterButton;
+
+    @FXML
+    private MenuButton fieldFilterButton;
+
+    @FXML
+    private MenuButton messageFilterButton;
 
-    @Inject private ThemeManager themeManager;
+    @Inject
+    private ThemeManager themeManager;
 
     private final List<IntegrityMessage> messages;
     private final LibraryTab libraryTab;
     private IntegrityCheckDialogViewModel viewModel;
     private TableFilter<IntegrityMessage> tableFilter;
 
-    public IntegrityCheckDialog(List<IntegrityMessage> messages, LibraryTab libraryTab) {
+    public IntegrityCheckDialog(
+        List<IntegrityMessage> messages,
+        LibraryTab libraryTab
+    ) {
         this.messages = messages;
         this.libraryTab = libraryTab;
         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) {
+    private void onSelectionChanged(
+        ListChangeListener.Change<? extends IntegrityMessage> change
+    ) {
         if (change.next()) {
-            change.getAddedSubList().stream().findFirst().ifPresent(message ->
-                    libraryTab.editEntryAndFocusField(message.getEntry(), message.getField()));
+            change
+                .getAddedSubList()
+                .stream()
+                .findFirst()
+                .ifPresent(message ->
+                    libraryTab.editEntryAndFocusField(
+                        message.getEntry(),
+                        message.getField()
+                    )
+                );
         }
     }
 
@@ -69,79 +91,111 @@ public IntegrityCheckDialogViewModel getViewModel() {
     private void initialize() {
         viewModel = new IntegrityCheckDialogViewModel(messages);
 
-        messagesTable.getSelectionModel().getSelectedItems().addListener(this::onSelectionChanged);
+        messagesTable
+            .getSelectionModel()
+            .getSelectedItems()
+            .addListener(this::onSelectionChanged);
         messagesTable.setItems(viewModel.getMessages());
-        keyColumn.setCellValueFactory(row -> new ReadOnlyStringWrapper(row.getValue().getEntry().getCitationKey().orElse("")));
-        fieldColumn.setCellValueFactory(row -> new ReadOnlyStringWrapper(row.getValue().getField().getDisplayName()));
-        messageColumn.setCellValueFactory(row -> new ReadOnlyStringWrapper(row.getValue().getMessage()));
+        keyColumn.setCellValueFactory(row ->
+            new ReadOnlyStringWrapper(
+                row.getValue().getEntry().getCitationKey().orElse("")
+            )
+        );
+        fieldColumn.setCellValueFactory(row ->
+            new ReadOnlyStringWrapper(
+                row.getValue().getField().getDisplayName()
+            )
+        );
+        messageColumn.setCellValueFactory(row ->
+            new ReadOnlyStringWrapper(row.getValue().getMessage())
+        );
 
         new ValueTableCellFactory<IntegrityMessage, String>()
-                .withText(Function.identity())
-                .withTooltip(Function.identity())
-                .install(messageColumn);
-
-        tableFilter = TableFilter.forTableView(messagesTable)
-                                 .apply();
-
-        tableFilter.getColumnFilter(keyColumn).ifPresent(columnFilter -> {
-            ContextMenu keyContextMenu = keyColumn.getContextMenu();
-            if (keyContextMenu != null) {
-                keyFilterButton.setContextMenu(keyContextMenu);
-                keyFilterButton.setOnMouseClicked(event -> {
-                    if (event.getButton() == MouseButton.PRIMARY) {
-                        if (keyContextMenu.isShowing()) {
-                            keyContextMenu.setX(event.getScreenX());
-                            keyContextMenu.setY(event.getScreenY());
-                        } else {
-                            keyContextMenu.show(keyFilterButton, event.getScreenX(), event.getScreenY());
+            .withText(Function.identity())
+            .withTooltip(Function.identity())
+            .install(messageColumn);
+
+        tableFilter = TableFilter.forTableView(messagesTable).apply();
+
+        tableFilter
+            .getColumnFilter(keyColumn)
+            .ifPresent(columnFilter -> {
+                ContextMenu keyContextMenu = keyColumn.getContextMenu();
+                if (keyContextMenu != null) {
+                    keyFilterButton.setContextMenu(keyContextMenu);
+                    keyFilterButton.setOnMouseClicked(event -> {
+                        if (event.getButton() == MouseButton.PRIMARY) {
+                            if (keyContextMenu.isShowing()) {
+                                keyContextMenu.setX(event.getScreenX());
+                                keyContextMenu.setY(event.getScreenY());
+                            } else {
+                                keyContextMenu.show(
+                                    keyFilterButton,
+                                    event.getScreenX(),
+                                    event.getScreenY()
+                                );
+                            }
                         }
-                    }
-                });
-            }
-        });
-
-        tableFilter.getColumnFilter(fieldColumn).ifPresent(columnFilter -> {
-            ContextMenu fieldContextMenu = fieldColumn.getContextMenu();
-            if (fieldContextMenu != null) {
-                fieldFilterButton.setContextMenu(fieldContextMenu);
-                fieldFilterButton.setOnMouseClicked(event -> {
-                    if (event.getButton() == MouseButton.PRIMARY) {
-                        if (fieldContextMenu.isShowing()) {
-                            fieldContextMenu.setX(event.getScreenX());
-                            fieldContextMenu.setY(event.getScreenY());
-                        } else {
-                            fieldContextMenu.show(fieldFilterButton, event.getScreenX(), event.getScreenY());
+                    });
+                }
+            });
+
+        tableFilter
+            .getColumnFilter(fieldColumn)
+            .ifPresent(columnFilter -> {
+                ContextMenu fieldContextMenu = fieldColumn.getContextMenu();
+                if (fieldContextMenu != null) {
+                    fieldFilterButton.setContextMenu(fieldContextMenu);
+                    fieldFilterButton.setOnMouseClicked(event -> {
+                        if (event.getButton() == MouseButton.PRIMARY) {
+                            if (fieldContextMenu.isShowing()) {
+                                fieldContextMenu.setX(event.getScreenX());
+                                fieldContextMenu.setY(event.getScreenY());
+                            } else {
+                                fieldContextMenu.show(
+                                    fieldFilterButton,
+                                    event.getScreenX(),
+                                    event.getScreenY()
+                                );
+                            }
                         }
-                    }
-                });
-            }
-        });
-
-        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());
+                    });
+                }
+            });
+
+        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 1313417642e..9f09b5a1975 100644
--- a/src/main/java/org/jabref/gui/integrity/IntegrityCheckDialogViewModel.java
+++ b/src/main/java/org/jabref/gui/integrity/IntegrityCheckDialogViewModel.java
@@ -1,10 +1,8 @@
 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;
 
diff --git a/src/main/java/org/jabref/gui/journals/AbbreviateAction.java b/src/main/java/org/jabref/gui/journals/AbbreviateAction.java
index a1a723287d9..218f7aac0fa 100644
--- a/src/main/java/org/jabref/gui/journals/AbbreviateAction.java
+++ b/src/main/java/org/jabref/gui/journals/AbbreviateAction.java
@@ -6,7 +6,6 @@
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.Future;
 import java.util.stream.Collectors;
-
 import org.jabref.gui.DialogService;
 import org.jabref.gui.Globals;
 import org.jabref.gui.JabRefExecutorService;
@@ -24,7 +23,6 @@
 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;
 
@@ -33,7 +31,9 @@
  */
 public class AbbreviateAction extends SimpleCommand {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(AbbreviateAction.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(
+        AbbreviateAction.class
+    );
 
     private final StandardActions action;
     private final JabRefFrame frame;
@@ -45,13 +45,15 @@ public class AbbreviateAction extends SimpleCommand {
 
     private AbbreviationType abbreviationType;
 
-    public AbbreviateAction(StandardActions action,
-                            JabRefFrame frame,
-                            DialogService dialogService,
-                            StateManager stateManager,
-                            JournalAbbreviationPreferences abbreviationPreferences,
-                            JournalAbbreviationRepository abbreviationRepository,
-                            TaskExecutor taskExecutor) {
+    public AbbreviateAction(
+        StandardActions action,
+        JabRefFrame frame,
+        DialogService dialogService,
+        StateManager stateManager,
+        JournalAbbreviationPreferences abbreviationPreferences,
+        JournalAbbreviationRepository abbreviationRepository,
+        TaskExecutor taskExecutor
+    ) {
         this.action = action;
         this.frame = frame;
         this.dialogService = dialogService;
@@ -61,9 +63,12 @@ public AbbreviateAction(StandardActions action,
         this.taskExecutor = taskExecutor;
 
         switch (action) {
-            case ABBREVIATE_DEFAULT -> abbreviationType = AbbreviationType.DEFAULT;
-            case ABBREVIATE_DOTLESS -> abbreviationType = AbbreviationType.DOTLESS;
-            case ABBREVIATE_SHORTEST_UNIQUE -> abbreviationType = AbbreviationType.SHORTEST_UNIQUE;
+            case ABBREVIATE_DEFAULT -> abbreviationType =
+                AbbreviationType.DEFAULT;
+            case ABBREVIATE_DOTLESS -> abbreviationType =
+                AbbreviationType.DOTLESS;
+            case ABBREVIATE_SHORTEST_UNIQUE -> abbreviationType =
+                AbbreviationType.SHORTEST_UNIQUE;
             default -> LOGGER.debug("Unknown action: " + action.name());
         }
 
@@ -72,51 +77,94 @@ public AbbreviateAction(StandardActions action,
 
     @Override
     public void execute() {
-        if ((action == StandardActions.ABBREVIATE_DEFAULT)
-                || (action == StandardActions.ABBREVIATE_DOTLESS)
-                || (action == StandardActions.ABBREVIATE_SHORTEST_UNIQUE)) {
+        if (
+            (action == StandardActions.ABBREVIATE_DEFAULT) ||
+            (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) {
+    private String abbreviate(
+        BibDatabaseContext databaseContext,
+        List<BibEntry> entries
+    ) {
         UndoableAbbreviator undoableAbbreviator = new UndoableAbbreviator(
-                abbreviationRepository,
-                abbreviationType,
-                journalAbbreviationPreferences.shouldUseFJournalField());
+            abbreviationRepository,
+            abbreviationType,
+            journalAbbreviationPreferences.shouldUseFJournalField()
+        );
 
-        NamedCompound ce = new NamedCompound(Localization.lang("Abbreviate journal names"));
+        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 = JabRefExecutorService.INSTANCE.executeAll(tasks);
+        List<Future<Boolean>> futures =
+            JabRefExecutorService.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.");
@@ -125,23 +173,52 @@ private String abbreviate(BibDatabaseContext databaseContext, List<BibEntry> ent
         ce.end();
         frame.getUndoManager().addEdit(ce);
         frame.getCurrentLibraryTab().markBaseChanged();
-        return Localization.lang("Abbreviated %0 journal names.", String.valueOf(count));
+        return Localization.lang(
+            "Abbreviated %0 journal names.",
+            String.valueOf(count)
+        );
     }
 
-    private String unabbreviate(BibDatabaseContext databaseContext, List<BibEntry> entries) {
-        UndoableUnabbreviator undoableAbbreviator = new UndoableUnabbreviator(Globals.journalAbbreviationRepository);
-
-        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();
+    private String unabbreviate(
+        BibDatabaseContext databaseContext,
+        List<BibEntry> entries
+    ) {
+        UndoableUnabbreviator undoableAbbreviator = new UndoableUnabbreviator(
+            Globals.journalAbbreviationRepository
+        );
+
+        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();
         if (count == 0) {
-            return Localization.lang("No journal names could be unabbreviated.");
+            return Localization.lang(
+                "No journal names could be unabbreviated."
+            );
         }
 
         ce.end();
         frame.getUndoManager().addEdit(ce);
         frame.getCurrentLibraryTab().markBaseChanged();
-        return Localization.lang("Unabbreviated %0 journal names.", String.valueOf(count));
+        return Localization.lang(
+            "Unabbreviated %0 journal names.",
+            String.valueOf(count)
+        );
     }
 }
diff --git a/src/main/java/org/jabref/gui/journals/AbbreviationType.java b/src/main/java/org/jabref/gui/journals/AbbreviationType.java
index 949364e8359..d24e163f62f 100644
--- a/src/main/java/org/jabref/gui/journals/AbbreviationType.java
+++ b/src/main/java/org/jabref/gui/journals/AbbreviationType.java
@@ -6,5 +6,5 @@
 public enum AbbreviationType {
     DEFAULT,
     DOTLESS,
-    SHORTEST_UNIQUE
+    SHORTEST_UNIQUE,
 }
diff --git a/src/main/java/org/jabref/gui/journals/UndoableAbbreviator.java b/src/main/java/org/jabref/gui/journals/UndoableAbbreviator.java
index 94d817674a9..05b6e65fca5 100644
--- a/src/main/java/org/jabref/gui/journals/UndoableAbbreviator.java
+++ b/src/main/java/org/jabref/gui/journals/UndoableAbbreviator.java
@@ -1,7 +1,6 @@
 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;
@@ -17,7 +16,11 @@ 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;
@@ -32,7 +35,12 @@ 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;
         }
@@ -47,7 +55,9 @@ public boolean abbreviate(BibDatabase database, BibEntry entry, Field fieldName,
             return false; // Unknown, cannot abbreviate anything.
         }
 
-        Abbreviation abbreviation = journalAbbreviationRepository.get(text).get();
+        Abbreviation abbreviation = journalAbbreviationRepository
+            .get(text)
+            .get();
         String newText = getAbbreviatedName(abbreviation);
 
         if (newText.equals(origText)) {
@@ -55,13 +65,26 @@ 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);
-        ce.addEdit(new UndoableFieldChange(entry, fieldName, origText, newText));
+        ce.addEdit(
+            new UndoableFieldChange(entry, fieldName, origText, newText)
+        );
         return true;
     }
 
@@ -74,7 +97,9 @@ private String getAbbreviatedName(Abbreviation text) {
             case SHORTEST_UNIQUE:
                 return text.getShortestUniqueAbbreviation();
             default:
-                throw new IllegalStateException(String.format("Unexpected value: %s", abbreviationType));
+                throw new IllegalStateException(
+                    String.format("Unexpected value: %s", abbreviationType)
+                );
         }
     }
 }
diff --git a/src/main/java/org/jabref/gui/journals/UndoableUnabbreviator.java b/src/main/java/org/jabref/gui/journals/UndoableUnabbreviator.java
index acb101aef58..f468299ac83 100644
--- a/src/main/java/org/jabref/gui/journals/UndoableUnabbreviator.java
+++ b/src/main/java/org/jabref/gui/journals/UndoableUnabbreviator.java
@@ -1,7 +1,6 @@
 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;
@@ -15,7 +14,9 @@ public class UndoableUnabbreviator {
 
     private final JournalAbbreviationRepository journalAbbreviationRepository;
 
-    public UndoableUnabbreviator(JournalAbbreviationRepository journalAbbreviationRepository) {
+    public UndoableUnabbreviator(
+        JournalAbbreviationRepository journalAbbreviationRepository
+    ) {
         this.journalAbbreviationRepository = journalAbbreviationRepository;
     }
 
@@ -27,7 +28,12 @@ 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;
         }
@@ -50,15 +56,25 @@ public boolean unabbreviate(BibDatabase database, BibEntry entry, Field field, C
             return false; // Cannot unabbreviate unabbreviated name.
         }
 
-        Abbreviation abbreviation = journalAbbreviationRepository.get(text).get();
+        Abbreviation abbreviation = journalAbbreviationRepository
+            .get(text)
+            .get();
         String newText = abbreviation.getName();
         entry.setField(field, newText);
         ce.addEdit(new UndoableFieldChange(entry, field, origText, newText));
         return true;
     }
 
-    public boolean restoreFromFJournal(BibEntry entry, Field field, CompoundEdit ce) {
-        if ((StandardField.JOURNAL != field && StandardField.JOURNALTITLE != field) || !entry.hasField(AMSField.FJOURNAL)) {
+    public boolean restoreFromFJournal(
+        BibEntry entry,
+        Field field,
+        CompoundEdit ce
+    ) {
+        if (
+            (StandardField.JOURNAL != field &&
+                StandardField.JOURNALTITLE != field) ||
+            !entry.hasField(AMSField.FJOURNAL)
+        ) {
             return false;
         }
 
@@ -66,7 +82,9 @@ public boolean restoreFromFJournal(BibEntry entry, Field field, CompoundEdit ce)
         String newText = entry.getField(AMSField.FJOURNAL).get().trim();
 
         entry.setField(AMSField.FJOURNAL, "");
-        ce.addEdit(new UndoableFieldChange(entry, AMSField.FJOURNAL, newText, ""));
+        ce.addEdit(
+            new UndoableFieldChange(entry, AMSField.FJOURNAL, newText, "")
+        );
 
         entry.setField(field, newText);
         ce.addEdit(new UndoableFieldChange(entry, field, origText, newText));
diff --git a/src/main/java/org/jabref/gui/keyboard/CodeAreaKeyBindings.java b/src/main/java/org/jabref/gui/keyboard/CodeAreaKeyBindings.java
index 8c199b02c97..bac36229026 100644
--- a/src/main/java/org/jabref/gui/keyboard/CodeAreaKeyBindings.java
+++ b/src/main/java/org/jabref/gui/keyboard/CodeAreaKeyBindings.java
@@ -1,111 +1,160 @@
 package org.jabref.gui.keyboard;
 
 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 5706d55cc7b..71fbddb7c7a 100644
--- a/src/main/java/org/jabref/gui/keyboard/KeyBinding.java
+++ b/src/main/java/org/jabref/gui/keyboard/KeyBinding.java
@@ -3,121 +3,616 @@
 import org.jabref.logic.l10n.Localization;
 
 public enum KeyBinding {
-    EDITOR_DELETE("Delete", Localization.lang("Delete text"), "", KeyBindingCategory.EDITOR),
+    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),
-    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),
-    CLEANUP("Cleanup", Localization.lang("Cleanup entries"), "alt+F8", KeyBindingCategory.QUALITY),
-    CLOSE_DATABASE("Close library", Localization.lang("Close library"), "ctrl+W", KeyBindingCategory.FILE),
-    CLOSE("Close dialog", Localization.lang("Close dialog"), "Esc", KeyBindingCategory.VIEW),
+    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
+    ),
+    CLEANUP(
+        "Cleanup",
+        Localization.lang("Cleanup entries"),
+        "alt+F8",
+        KeyBindingCategory.QUALITY
+    ),
+    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_CITE_CITATION_KEY("Copy \\cite{citation key}", Localization.lang("Copy \\cite{citation key}"), "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_TITLE(
+        "Copy title",
+        Localization.lang("Copy title"),
+        "ctrl+shift+alt+T",
+        KeyBindingCategory.EDIT
+    ),
+    COPY_CITE_CITATION_KEY(
+        "Copy \\cite{citation key}",
+        Localization.lang("Copy \\cite{citation key}"),
+        "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
+    ),
     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),
-    EDIT_ENTRY("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),
+    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
+    ),
+    EDIT_ENTRY(
+        "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
+    ),
     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_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("New entry from plain text", Localization.lang("New entry from plain text"), "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_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(
+        "New entry from plain text",
+        Localization.lang("New entry from plain text"),
+        "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),
-    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_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),
-    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),
+    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_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
+    ),
+    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),
-    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),
-    SEARCH("Search", Localization.lang("Search"), "ctrl+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),
+    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
+    ),
+    SEARCH(
+        "Search",
+        Localization.lang("Search"),
+        "ctrl+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
+    ),
     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"), "ESCAPE", 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);
+    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"),
+        "ESCAPE",
+        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 ae8cb0b673f..04e28765c11 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 05ecd14a34e..236d8d5932d 100644
--- a/src/main/java/org/jabref/gui/keyboard/KeyBindingRepository.java
+++ b/src/main/java/org/jabref/gui/keyboard/KeyBindingRepository.java
@@ -9,11 +9,9 @@
 import java.util.SortedMap;
 import java.util.TreeMap;
 import java.util.stream.Collectors;
-
 import javafx.scene.input.KeyCode;
 import javafx.scene.input.KeyCombination;
 import javafx.scene.input.KeyEvent;
-
 import org.jabref.logic.util.OS;
 
 public class KeyBindingRepository {
@@ -32,9 +30,14 @@ public KeyBindingRepository(SortedMap<KeyBinding, String> bindings) {
     }
 
     public KeyBindingRepository(List<String> bindNames, List<String> bindings) {
-        this.bindings = new TreeMap<>(Comparator.comparing(KeyBinding::getLocalization));
-
-        if ((bindNames.isEmpty()) || (bindings.isEmpty()) || (bindNames.size() != bindings.size())) {
+        this.bindings =
+            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());
@@ -53,7 +56,10 @@ 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;
@@ -68,7 +74,9 @@ public Optional<String> get(KeyBinding key) {
 
     public String get(String key) {
         Optional<KeyBinding> keyBinding = getKeyBinding(key);
-        Optional<String> result = keyBinding.flatMap(k -> Optional.ofNullable(bindings.get(k)));
+        Optional<String> result = keyBinding.flatMap(k ->
+            Optional.ofNullable(bindings.get(k))
+        );
 
         if (result.isPresent()) {
             return result.get();
@@ -95,11 +103,15 @@ 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) {
-        getKeyBinding(key).ifPresent(b -> bindings.put(b, b.getDefaultKeyBinding()));
+        getKeyBinding(key)
+            .ifPresent(b -> bindings.put(b, b.getDefaultKeyBinding()));
     }
 
     public void resetToDefault() {
@@ -137,13 +149,23 @@ public Optional<KeyCombination> getKeyCombination(KeyBinding bindName) {
      * @param keyEvent as KeEvent
      * @return true if matching, else false
      */
-    public boolean checkKeyCombinationEquality(KeyBinding binding, KeyEvent keyEvent) {
-        return getKeyCombination(binding).filter(combination -> checkKeyCombinationEquality(combination, keyEvent))
-                                         .isPresent();
+    public boolean checkKeyCombinationEquality(
+        KeyBinding binding,
+        KeyEvent keyEvent
+    ) {
+        return getKeyCombination(binding)
+            .filter(combination ->
+                checkKeyCombinationEquality(combination, keyEvent)
+            )
+            .isPresent();
     }
 
     public List<String> getBindNames() {
-        return bindings.keySet().stream().map(KeyBinding::getConstant).collect(Collectors.toList());
+        return bindings
+            .keySet()
+            .stream()
+            .map(KeyBinding::getConstant)
+            .collect(Collectors.toList());
     }
 
     public List<String> getBindings() {
diff --git a/src/main/java/org/jabref/gui/keyboard/TextInputKeyBindings.java b/src/main/java/org/jabref/gui/keyboard/TextInputKeyBindings.java
index d63ac9459c2..1a643485962 100644
--- a/src/main/java/org/jabref/gui/keyboard/TextInputKeyBindings.java
+++ b/src/main/java/org/jabref/gui/keyboard/TextInputKeyBindings.java
@@ -3,7 +3,6 @@
 import javafx.scene.Scene;
 import javafx.scene.control.TextInputControl;
 import javafx.scene.input.KeyEvent;
-
 import org.jabref.gui.Globals;
 import org.jabref.logic.util.strings.StringManipulator;
 import org.jabref.model.util.ResultingStringState;
@@ -13,89 +12,117 @@ public class TextInputKeyBindings {
     public static void call(Scene scene, KeyEvent event) {
         if (scene.focusOwnerProperty().get() instanceof TextInputControl) {
             KeyBindingRepository keyBindingRepository = Globals.getKeyPrefs();
-            TextInputControl focusedTextField = (TextInputControl) scene.focusOwnerProperty().get();
-            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();
-                    }
-                    case CLOSE -> {
-                        focusedTextField.clear();
-                        event.consume();
+            TextInputControl focusedTextField = (TextInputControl) scene
+                .focusOwnerProperty()
+                .get();
+            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();
+                        }
+                        case CLOSE -> {
+                            focusedTextField.clear();
+                            event.consume();
+                        }
                     }
-                }
-            });
+                });
         }
     }
 }
diff --git a/src/main/java/org/jabref/gui/libraryproperties/AbstractPropertiesTabView.java b/src/main/java/org/jabref/gui/libraryproperties/AbstractPropertiesTabView.java
index f967733b32c..1f4d2d8f9df 100644
--- a/src/main/java/org/jabref/gui/libraryproperties/AbstractPropertiesTabView.java
+++ b/src/main/java/org/jabref/gui/libraryproperties/AbstractPropertiesTabView.java
@@ -1,16 +1,19 @@
 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;
+    @Inject
+    protected DialogService dialogService;
 
     protected BibDatabaseContext databaseContext;
     protected T viewModel;
diff --git a/src/main/java/org/jabref/gui/libraryproperties/LibraryPropertiesAction.java b/src/main/java/org/jabref/gui/libraryproperties/LibraryPropertiesAction.java
index 1632c696d43..db41ee39517 100644
--- a/src/main/java/org/jabref/gui/libraryproperties/LibraryPropertiesAction.java
+++ b/src/main/java/org/jabref/gui/libraryproperties/LibraryPropertiesAction.java
@@ -1,20 +1,21 @@
 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 java.util.function.Supplier;
 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;
-
 public class LibraryPropertiesAction extends SimpleCommand {
-    private static final Logger LOGGER = LoggerFactory.getLogger(LibraryPropertiesAction.class);
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(
+        LibraryPropertiesAction.class
+    );
 
     private final StateManager stateManager;
     private final Supplier<BibDatabaseContext> alternateDatabase;
@@ -24,20 +25,31 @@ 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;
     }
 
     @Override
     public void execute() {
-        DialogService dialogService = Injector.instantiateModelOrService(DialogService.class);
+        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 5286d4fbfbf..1732bc67c22 100644
--- a/src/main/java/org/jabref/gui/libraryproperties/LibraryPropertiesView.java
+++ b/src/main/java/org/jabref/gui/libraryproperties/LibraryPropertiesView.java
@@ -1,26 +1,29 @@
 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;
 import javafx.scene.control.Tab;
 import javafx.scene.control.TabPane;
-
 import org.jabref.gui.theme.ThemeManager;
 import org.jabref.gui.util.BaseDialog;
 import org.jabref.gui.util.ControlHelper;
 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> {
 
-public class LibraryPropertiesView extends BaseDialog<LibraryPropertiesViewModel> {
+    @FXML
+    private TabPane tabPane;
 
-    @FXML private TabPane tabPane;
-    @FXML private ButtonType saveButton;
+    @FXML
+    private ButtonType saveButton;
 
-    @Inject private ThemeManager themeManager;
+    @Inject
+    private ThemeManager themeManager;
 
     private final BibDatabaseContext databaseContext;
     private LibraryPropertiesViewModel viewModel;
@@ -28,14 +31,21 @@ 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"));
         }
@@ -53,7 +63,9 @@ private void initialize() {
             scrollPane.setFitToWidth(true);
             tabPane.getTabs().add(new Tab(pane.getTabName(), scrollPane));
             if (pane instanceof AbstractPropertiesTabView<?> propertiesTab) {
-                propertiesTab.prefHeightProperty().bind(tabPane.tabMaxHeightProperty());
+                propertiesTab
+                    .prefHeightProperty()
+                    .bind(tabPane.tabMaxHeightProperty());
                 propertiesTab.prefWidthProperty().bind(tabPane.widthProperty());
                 propertiesTab.getStyleClass().add("propertiesTab");
             }
diff --git a/src/main/java/org/jabref/gui/libraryproperties/LibraryPropertiesViewModel.java b/src/main/java/org/jabref/gui/libraryproperties/LibraryPropertiesViewModel.java
index 9939528cc36..2c18a4647e0 100644
--- a/src/main/java/org/jabref/gui/libraryproperties/LibraryPropertiesViewModel.java
+++ b/src/main/java/org/jabref/gui/libraryproperties/LibraryPropertiesViewModel.java
@@ -1,7 +1,6 @@
 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;
@@ -15,14 +14,15 @@ public class LibraryPropertiesViewModel {
     private final List<PropertiesTab> propertiesTabs;
 
     public LibraryPropertiesViewModel(BibDatabaseContext databaseContext) {
-        propertiesTabs = List.of(
+        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/PropertiesTabViewModel.java b/src/main/java/org/jabref/gui/libraryproperties/PropertiesTabViewModel.java
index e14e84b1224..fa35c8fe13f 100644
--- a/src/main/java/org/jabref/gui/libraryproperties/PropertiesTabViewModel.java
+++ b/src/main/java/org/jabref/gui/libraryproperties/PropertiesTabViewModel.java
@@ -1,7 +1,6 @@
 package org.jabref.gui.libraryproperties;
 
 public interface PropertiesTabViewModel {
-
     void setValues();
 
     void storeSettings();
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 fb262a59e80..63ee6bacad6 100644
--- a/src/main/java/org/jabref/gui/libraryproperties/constants/ConstantsItemModel.java
+++ b/src/main/java/org/jabref/gui/libraryproperties/constants/ConstantsItemModel.java
@@ -1,22 +1,21 @@
 package org.jabref.gui.libraryproperties.constants;
 
-import java.util.regex.Pattern;
-
-import javafx.beans.property.ReadOnlyBooleanProperty;
-import javafx.beans.property.SimpleStringProperty;
-import javafx.beans.property.StringProperty;
-
-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;
+import javafx.beans.property.ReadOnlyBooleanProperty;
+import javafx.beans.property.SimpleStringProperty;
+import javafx.beans.property.StringProperty;
+import org.jabref.logic.l10n.Localization;
 
 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,9 +28,18 @@ 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);
-        combinedValidator = new CompositeValidator(labelValidator, contentValidator);
+        labelValidator =
+            new FunctionBasedValidator<>(
+                this.labelProperty,
+                ConstantsItemModel::validateLabel
+            );
+        contentValidator =
+            new FunctionBasedValidator<>(
+                this.contentProperty,
+                ConstantsItemModel::validateContent
+            );
+        combinedValidator =
+            new CompositeValidator(labelValidator, contentValidator);
     }
 
     public ValidationStatus labelValidation() {
@@ -66,13 +74,25 @@ private static ValidationMessage validateLabel(String input) {
         if (input == null) {
             return ValidationMessage.error("May not be null");
         } else if (input.trim().isEmpty()) {
-            return ValidationMessage.error(Localization.lang("Please enter the string's label"));
+            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
         }
@@ -80,9 +100,13 @@ private static ValidationMessage validateLabel(String input) {
 
     private static ValidationMessage validateContent(String input) {
         if (input == null) {
-            return ValidationMessage.error(Localization.lang("Must not be empty!"));
+            return ValidationMessage.error(
+                Localization.lang("Must not be empty!")
+            );
         } else if (input.trim().isEmpty()) {
-            return ValidationMessage.error(Localization.lang("Must not be empty!"));
+            return ValidationMessage.error(
+                Localization.lang("Must not be empty!")
+            );
         } 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 76b0debf639..939af70db1f 100644
--- a/src/main/java/org/jabref/gui/libraryproperties/constants/ConstantsPropertiesView.java
+++ b/src/main/java/org/jabref/gui/libraryproperties/constants/ConstantsPropertiesView.java
@@ -1,7 +1,8 @@
 package org.jabref.gui.libraryproperties.constants;
 
+import com.airhacks.afterburner.views.ViewLoader;
+import jakarta.inject.Inject;
 import java.util.Optional;
-
 import javafx.fxml.FXML;
 import javafx.scene.control.Button;
 import javafx.scene.control.ButtonType;
@@ -9,7 +10,6 @@
 import javafx.scene.control.TableView;
 import javafx.scene.control.Tooltip;
 import javafx.util.converter.DefaultStringConverter;
-
 import org.jabref.gui.DialogService;
 import org.jabref.gui.icon.IconTheme;
 import org.jabref.gui.libraryproperties.AbstractPropertiesTabView;
@@ -20,27 +20,38 @@
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.preferences.PreferencesService;
 
-import com.airhacks.afterburner.views.ViewLoader;
-import jakarta.inject.Inject;
+public class ConstantsPropertiesView
+    extends AbstractPropertiesTabView<ConstantsPropertiesViewModel>
+    implements PropertiesTab {
 
-public class ConstantsPropertiesView extends AbstractPropertiesTabView<ConstantsPropertiesViewModel> implements PropertiesTab {
+    @FXML
+    private TableView<ConstantsItemModel> stringsList;
 
-    @FXML private TableView<ConstantsItemModel> stringsList;
-    @FXML private TableColumn<ConstantsItemModel, String> labelColumn;
-    @FXML private TableColumn<ConstantsItemModel, String> contentColumn;
-    @FXML private TableColumn<ConstantsItemModel, String> actionsColumn;
-    @FXML private Button addStringButton;
-    @FXML private ButtonType saveButton;
+    @FXML
+    private TableColumn<ConstantsItemModel, String> labelColumn;
 
-    @Inject private PreferencesService preferencesService;
-    @Inject private DialogService dialogService;
+    @FXML
+    private TableColumn<ConstantsItemModel, String> contentColumn;
+
+    @FXML
+    private TableColumn<ConstantsItemModel, String> actionsColumn;
+
+    @FXML
+    private Button addStringButton;
+
+    @FXML
+    private ButtonType saveButton;
+
+    @Inject
+    private PreferencesService preferencesService;
+
+    @Inject
+    private DialogService dialogService;
 
     public ConstantsPropertiesView(BibDatabaseContext databaseContext) {
         this.databaseContext = databaseContext;
 
-        ViewLoader.view(this)
-                  .root(this)
-                  .load();
+        ViewLoader.view(this).root(this).load();
     }
 
     @Override
@@ -49,63 +60,103 @@ public String getTabName() {
     }
 
     public void initialize() {
-        this.viewModel = new ConstantsPropertiesViewModel(databaseContext, dialogService, preferencesService.getFilePreferences());
+        this.viewModel =
+            new ConstantsPropertiesViewModel(
+                databaseContext,
+                dialogService,
+                preferencesService.getFilePreferences()
+            );
 
-        addStringButton.setTooltip(new Tooltip(Localization.lang("New string")));
+        addStringButton.setTooltip(
+            new Tooltip(Localization.lang("New string"))
+        );
 
         labelColumn.setSortable(true);
         labelColumn.setReorderable(false);
 
-        labelColumn.setCellValueFactory(cellData -> cellData.getValue().labelProperty());
-        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());
+        labelColumn.setCellValueFactory(cellData ->
+            cellData.getValue().labelProperty()
+        );
+        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);
             }
-
-            // 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);
-        contentColumn.setCellValueFactory(cellData -> cellData.getValue().contentProperty());
-        new ViewModelTextFieldTableCellVisualizationFactory<ConstantsItemModel, String>()
-                .withValidation(ConstantsItemModel::contentValidation)
-                .install(contentColumn, new DefaultStringConverter());
-        contentColumn.setOnEditCommit((TableColumn.CellEditEvent<ConstantsItemModel, String> cell) ->
-                cell.getRowValue().setContent(cell.getNewValue()));
+        contentColumn.setCellValueFactory(cellData ->
+            cellData.getValue().contentProperty()
+        );
+        new ViewModelTextFieldTableCellVisualizationFactory<
+            ConstantsItemModel,
+            String
+        >()
+            .withValidation(ConstantsItemModel::contentValidation)
+            .install(contentColumn, new DefaultStringConverter());
+        contentColumn.setOnEditCommit(
+                (TableColumn.CellEditEvent<ConstantsItemModel, String> cell) ->
+            cell.getRowValue().setContent(cell.getNewValue())
+        );
 
         actionsColumn.setSortable(false);
         actionsColumn.setReorderable(false);
-        actionsColumn.setCellValueFactory(cellData -> cellData.getValue().labelProperty());
+        actionsColumn.setCellValueFactory(cellData ->
+            cellData.getValue().labelProperty()
+        );
         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()))
-                .install(actionsColumn);
-
-        stringsList.itemsProperty().bindBidirectional(viewModel.stringsListProperty());
+            .withGraphic(label ->
+                IconTheme.JabRefIcons.DELETE_ENTRY.getGraphicNode()
+            )
+            .withTooltip(label -> Localization.lang("Remove string %0", label))
+            .withOnMouseClickedEvent(item ->
+                evt ->
+                    viewModel.removeString(
+                        stringsList.getFocusModel().getFocusedItem()
+                    )
+            )
+            .install(actionsColumn);
+
+        stringsList
+            .itemsProperty()
+            .bindBidirectional(viewModel.stringsListProperty());
         stringsList.setEditable(true);
     }
 
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 36f4ddeff07..cf81acfac1a 100644
--- a/src/main/java/org/jabref/gui/libraryproperties/constants/ConstantsPropertiesViewModel.java
+++ b/src/main/java/org/jabref/gui/libraryproperties/constants/ConstantsPropertiesViewModel.java
@@ -1,10 +1,10 @@
 package org.jabref.gui.libraryproperties.constants;
 
+import com.tobiasdiez.easybind.EasyBind;
 import java.util.Comparator;
 import java.util.Locale;
 import java.util.Optional;
 import java.util.stream.Collectors;
-
 import javafx.beans.property.BooleanProperty;
 import javafx.beans.property.ListProperty;
 import javafx.beans.property.SimpleBooleanProperty;
@@ -12,7 +12,6 @@
 import javafx.beans.value.ObservableValue;
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableList;
-
 import org.jabref.gui.DialogService;
 import org.jabref.gui.help.HelpAction;
 import org.jabref.gui.libraryproperties.PropertiesTabViewModel;
@@ -22,14 +21,12 @@
 import org.jabref.model.entry.BibtexString;
 import org.jabref.preferences.FilePreferences;
 
-import com.tobiasdiez.easybind.EasyBind;
-
 public class ConstantsPropertiesViewModel implements PropertiesTabViewModel {
 
     private static final String NEW_STRING_LABEL = "NewString"; // must not contain spaces
 
     private final ListProperty<ConstantsItemModel> stringsListProperty =
-            new SimpleListProperty<>(FXCollections.observableArrayList());
+        new SimpleListProperty<>(FXCollections.observableArrayList());
 
     private final BooleanProperty validProperty = new SimpleBooleanProperty();
 
@@ -38,22 +35,39 @@ public class ConstantsPropertiesViewModel implements PropertiesTabViewModel {
     private final DialogService dialogService;
     private final FilePreferences filePreferences;
 
-    public ConstantsPropertiesViewModel(BibDatabaseContext databaseContext, DialogService dialogService, FilePreferences filePreferences) {
+    public ConstantsPropertiesViewModel(
+        BibDatabaseContext databaseContext,
+        DialogService dialogService,
+        FilePreferences filePreferences
+    ) {
         this.databaseContext = databaseContext;
         this.dialogService = dialogService;
         this.filePreferences = filePreferences;
 
         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,34 +91,52 @@ 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) {
-        return new ConstantsItemModel(bibtexString.getName(), bibtexString.getContent());
+    private ConstantsItemModel convertFromBibTexString(
+        BibtexString bibtexString
+    ) {
+        return new ConstantsItemModel(
+            bibtexString.getName(),
+            bibtexString.getContent()
+        );
     }
 
     @Override
     public void storeSettings() {
-        databaseContext.getDatabase().setStrings(stringsListProperty.stream()
-                                                                    .map(this::fromBibtexStringViewModel)
-                                                                    .collect(Collectors.toList()));
+        databaseContext
+            .getDatabase()
+            .setStrings(
+                stringsListProperty
+                    .stream()
+                    .map(this::fromBibtexStringViewModel)
+                    .collect(Collectors.toList())
+            );
     }
 
-    private BibtexString fromBibtexStringViewModel(ConstantsItemModel viewModel) {
+    private BibtexString fromBibtexStringViewModel(
+        ConstantsItemModel viewModel
+    ) {
         String label = viewModel.labelProperty().getValue();
         String content = viewModel.contentProperty().getValue();
         return new BibtexString(label, content);
     }
 
     public Optional<ConstantsItemModel> labelAlreadyExists(String label) {
-        return stringsListProperty.stream()
-                                  .filter(item -> item.labelProperty().getValue().equals(label))
-                                  .findFirst();
+        return stringsListProperty
+            .stream()
+            .filter(item -> item.labelProperty().getValue().equals(label))
+            .findFirst();
     }
 
     public void openHelpPage() {
-        new HelpAction(HelpFile.STRING_EDITOR, dialogService, filePreferences).execute();
+        new HelpAction(HelpFile.STRING_EDITOR, dialogService, filePreferences)
+            .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 90f354b71ce..d8ff5228822 100644
--- a/src/main/java/org/jabref/gui/libraryproperties/contentselectors/ContentSelectorView.java
+++ b/src/main/java/org/jabref/gui/libraryproperties/contentselectors/ContentSelectorView.java
@@ -1,14 +1,15 @@
 package org.jabref.gui.libraryproperties.contentselectors;
 
+import com.airhacks.afterburner.views.ViewLoader;
+import com.tobiasdiez.easybind.EasyBind;
+import jakarta.inject.Inject;
 import java.util.Optional;
 import java.util.function.Supplier;
-
 import javafx.beans.property.ListProperty;
 import javafx.fxml.FXML;
 import javafx.scene.control.Button;
 import javafx.scene.control.ListView;
 import javafx.scene.control.SelectionModel;
-
 import org.jabref.gui.DialogService;
 import org.jabref.gui.libraryproperties.AbstractPropertiesTabView;
 import org.jabref.gui.util.ViewModelListCellFactory;
@@ -16,28 +17,33 @@
 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;
+public class ContentSelectorView
+    extends AbstractPropertiesTabView<ContentSelectorViewModel> {
 
-public class ContentSelectorView extends AbstractPropertiesTabView<ContentSelectorViewModel> {
+    @FXML
+    private Button removeFieldNameButton;
+
+    @FXML
+    private Button addKeywordButton;
+
+    @FXML
+    private Button removeKeywordButton;
+
+    @FXML
+    private ListView<Field> fieldsListView;
 
-    @FXML private Button removeFieldNameButton;
-    @FXML private Button addKeywordButton;
-    @FXML private Button removeKeywordButton;
-    @FXML private ListView<Field> fieldsListView;
-    @FXML private ListView<String> keywordsListView;
+    @FXML
+    private ListView<String> keywordsListView;
 
-    @Inject private DialogService dialogService;
+    @Inject
+    private DialogService dialogService;
 
     private final BibDatabaseContext databaseContext;
 
     public ContentSelectorView(BibDatabaseContext databaseContext) {
         this.databaseContext = databaseContext;
 
-        ViewLoader.view(this)
-                  .root(this)
-                  .load();
+        ViewLoader.view(this).root(this).load();
     }
 
     @Override
@@ -47,7 +53,8 @@ public String getTabName() {
 
     @FXML
     public void initialize() {
-        this.viewModel = new ContentSelectorViewModel(databaseContext, dialogService);
+        this.viewModel =
+            new ContentSelectorViewModel(databaseContext, dialogService);
 
         initFieldNameComponents();
         initKeywordsComponents();
@@ -55,19 +62,32 @@ 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);
-        removeFieldNameButton.disableProperty().bind(viewModel.isNoFieldNameSelected());
-        EasyBind.subscribe(viewModel.selectedFieldProperty(), viewModel::populateKeywords);
+            .withText(Field::getDisplayName)
+            .install(fieldsListView);
+        removeFieldNameButton
+            .disableProperty()
+            .bind(viewModel.isNoFieldNameSelected());
+        EasyBind.subscribe(
+            viewModel.selectedFieldProperty(),
+            viewModel::populateKeywords
+        );
     }
 
     private void initKeywordsComponents() {
         initListView(keywordsListView, viewModel::getKeywordsBackingList);
-        viewModel.selectedKeywordProperty().bind(keywordsListView.getSelectionModel().selectedItemProperty());
-        addKeywordButton.disableProperty().bind(viewModel.isFieldNameListEmpty());
-        removeKeywordButton.disableProperty().bind(viewModel.isNoKeywordSelected());
+        viewModel
+            .selectedKeywordProperty()
+            .bind(keywordsListView.getSelectionModel().selectedItemProperty());
+        addKeywordButton
+            .disableProperty()
+            .bind(viewModel.isFieldNameListEmpty());
+        removeKeywordButton
+            .disableProperty()
+            .bind(viewModel.isNoKeywordSelected());
     }
 
     @FXML
@@ -77,7 +97,8 @@ private void addNewFieldName() {
 
     @FXML
     private void removeFieldName() {
-        getSelectedField().ifPresent(viewModel::showRemoveFieldNameConfirmationDialog);
+        getSelectedField()
+            .ifPresent(viewModel::showRemoveFieldNameConfirmationDialog);
     }
 
     @FXML
@@ -90,20 +111,30 @@ private void removeKeyword() {
         Optional<Field> fieldName = getSelectedField();
         Optional<String> keywordToRemove = getSelectedKeyword();
         if (fieldName.isPresent() && keywordToRemove.isPresent()) {
-            viewModel.showRemoveKeywordConfirmationDialog(fieldName.get(), keywordToRemove.get());
+            viewModel.showRemoveKeywordConfirmationDialog(
+                fieldName.get(),
+                keywordToRemove.get()
+            );
         }
     }
 
-    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();
     }
 
     private Optional<Field> getSelectedField() {
-        return Optional.of(fieldsListView.getSelectionModel()).map(SelectionModel::getSelectedItem);
+        return Optional
+            .of(fieldsListView.getSelectionModel())
+            .map(SelectionModel::getSelectedItem);
     }
 
     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 db23506e8fd..c6e3cc3b581 100644
--- a/src/main/java/org/jabref/gui/libraryproperties/contentselectors/ContentSelectorViewModel.java
+++ b/src/main/java/org/jabref/gui/libraryproperties/contentselectors/ContentSelectorViewModel.java
@@ -10,7 +10,6 @@
 import java.util.Map;
 import java.util.Set;
 import java.util.stream.Collectors;
-
 import javafx.beans.binding.Bindings;
 import javafx.beans.binding.BooleanBinding;
 import javafx.beans.property.ListProperty;
@@ -20,7 +19,6 @@
 import javafx.beans.property.SimpleStringProperty;
 import javafx.beans.property.StringProperty;
 import javafx.collections.FXCollections;
-
 import org.jabref.gui.DialogService;
 import org.jabref.gui.libraryproperties.PropertiesTabViewModel;
 import org.jabref.logic.l10n.Localization;
@@ -33,18 +31,31 @@
 
 public class ContentSelectorViewModel implements PropertiesTabViewModel {
 
-    private static final List<Field> DEFAULT_FIELD_NAMES = Arrays.asList(StandardField.AUTHOR, StandardField.JOURNAL, StandardField.KEYWORDS, StandardField.PUBLISHER);
+    private static final List<Field> DEFAULT_FIELD_NAMES = Arrays.asList(
+        StandardField.AUTHOR,
+        StandardField.JOURNAL,
+        StandardField.KEYWORDS,
+        StandardField.PUBLISHER
+    );
 
     private final MetaData metaData;
     private final DialogService dialogService;
     private final 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 ObjectProperty<Field> selectedField = new SimpleObjectProperty<>();
+    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();
 
-    ContentSelectorViewModel(BibDatabaseContext databaseContext, DialogService dialogService) {
+    ContentSelectorViewModel(
+        BibDatabaseContext databaseContext,
+        DialogService dialogService
+    ) {
         this.metaData = databaseContext.getMetaData();
         this.dialogService = dialogService;
     }
@@ -52,9 +63,15 @@ public class ContentSelectorViewModel implements PropertiesTabViewModel {
     @Override
     public void setValues() {
         // Populate field names keyword map
-        metaData.getContentSelectors().getContentSelectors().forEach(
-                existingContentSelector -> fieldKeywordsMap.put(existingContentSelector.getField(), new ArrayList<>(existingContentSelector.getValues()))
-        );
+        metaData
+            .getContentSelectors()
+            .getContentSelectors()
+            .forEach(existingContentSelector ->
+                fieldKeywordsMap.put(
+                    existingContentSelector.getField(),
+                    new ArrayList<>(existingContentSelector.getValues())
+                )
+            );
 
         // Populate Field names list
         List<Field> existingFields = new ArrayList<>(fieldKeywordsMap.keySet());
@@ -67,16 +84,23 @@ public void setValues() {
 
     @Override
     public void storeSettings() {
-        List<Field> metaDataFields = metaData.getContentSelectors().getFieldsWithSelectors();
+        List<Field> metaDataFields = metaData
+            .getContentSelectors()
+            .getFieldsWithSelectors();
 
         if (isDefaultMap(fieldKeywordsMap)) {
-            Iterator<ContentSelector> iterator = metaData.getContentSelectors().getContentSelectors().iterator();
+            Iterator<ContentSelector> iterator = metaData
+                .getContentSelectors()
+                .getContentSelectors()
+                .iterator();
             while (iterator.hasNext()) {
                 metaData.clearContentSelectors(iterator.next().getField());
             }
         }
 
-        fieldKeywordsMap.forEach((field, keywords) -> updateMetaDataContentSelector(metaDataFields, field, keywords));
+        fieldKeywordsMap.forEach((field, keywords) ->
+            updateMetaDataContentSelector(metaDataFields, field, keywords)
+        );
 
         List<Field> fieldNamesToRemove = filterFieldsToRemove();
         fieldNamesToRemove.forEach(metaData::clearContentSelectors);
@@ -126,15 +150,24 @@ BooleanBinding isNoKeywordSelected() {
     }
 
     void showInputFieldNameDialog() {
-        dialogService.showInputDialogAndWait(Localization.lang("Add new field name"), Localization.lang("Field name"))
-                     .map(FieldFactory::parseField)
-                     .ifPresent(this::addFieldIfUnique);
+        dialogService
+            .showInputDialogAndWait(
+                Localization.lang("Add new field name"),
+                Localization.lang("Field name")
+            )
+            .map(FieldFactory::parseField)
+            .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;
         }
 
@@ -144,13 +177,18 @@ private void addFieldIfUnique(Field fieldToAdd) {
 
     void showRemoveFieldNameConfirmationDialog(Field fieldToRemove) {
         if (fieldToRemove == null) {
-            dialogService.showErrorDialogAndWait(Localization.lang("No field name selected!"));
+            dialogService.showErrorDialogAndWait(
+                Localization.lang("No field name selected!")
+            );
             return;
         }
 
         boolean deleteConfirmed = dialogService.showConfirmationDialogAndWait(
-                Localization.lang("Remove field name"),
-                Localization.lang("Are you sure you want to remove field name: \"%0\"?", fieldToRemove.getDisplayName())
+            Localization.lang("Remove field name"),
+            Localization.lang(
+                "Are you sure you want to remove field name: \"%0\"?",
+                fieldToRemove.getDisplayName()
+            )
         );
 
         if (deleteConfirmed) {
@@ -171,26 +209,46 @@ 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;
         }
 
-        List<String> existingKeywords = fieldKeywordsMap.getOrDefault(field, new ArrayList<>());
+        List<String> existingKeywords = fieldKeywordsMap.getOrDefault(
+            field,
+            new ArrayList<>()
+        );
         existingKeywords.add(keywordToAdd);
         existingKeywords.sort(Comparator.naturalOrder());
         fieldKeywordsMap.put(field, existingKeywords);
         populateKeywords(field);
     }
 
-    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));
+    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
+            )
+        );
         if (deleteConfirmed) {
             removeKeyword(field, keywordToRemove);
         }
@@ -203,12 +261,19 @@ private void removeKeyword(Field field, String keywordToRemove) {
 
     private List<Field> filterFieldsToRemove() {
         Set<Field> newlyAddedKeywords = fieldKeywordsMap.keySet();
-        return metaData.getContentSelectors().getFieldsWithSelectors().stream()
-                       .filter(field -> !newlyAddedKeywords.contains(field))
-                       .collect(Collectors.toList());
+        return metaData
+            .getContentSelectors()
+            .getFieldsWithSelectors()
+            .stream()
+            .filter(field -> !newlyAddedKeywords.contains(field))
+            .collect(Collectors.toList());
     }
 
-    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));
@@ -222,7 +287,8 @@ private void updateMetaDataContentSelector(List<Field> existingFields, Field fie
 
     private boolean keywordsHaveChanged(Field field, List<String> keywords) {
         HashSet<String> keywordsSet = asHashSet(keywords);
-        List<String> existingKeywords = metaData.getContentSelectorValuesForField(field);
+        List<String> existingKeywords =
+            metaData.getContentSelectorValuesForField(field);
         if (!keywordsSet.equals(asHashSet(existingKeywords))) {
             return true;
         }
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 a0c63a436c0..b771b17882a 100644
--- a/src/main/java/org/jabref/gui/libraryproperties/general/GeneralPropertiesView.java
+++ b/src/main/java/org/jabref/gui/libraryproperties/general/GeneralPropertiesView.java
@@ -1,11 +1,11 @@
 package org.jabref.gui.libraryproperties.general;
 
+import com.airhacks.afterburner.views.ViewLoader;
+import jakarta.inject.Inject;
 import java.nio.charset.Charset;
-
 import javafx.fxml.FXML;
 import javafx.scene.control.ComboBox;
 import javafx.scene.control.TextField;
-
 import org.jabref.gui.libraryproperties.AbstractPropertiesTabView;
 import org.jabref.gui.util.ViewModelListCellFactory;
 import org.jabref.logic.l10n.Localization;
@@ -13,24 +13,31 @@
 import org.jabref.model.database.BibDatabaseMode;
 import org.jabref.preferences.PreferencesService;
 
-import com.airhacks.afterburner.views.ViewLoader;
-import jakarta.inject.Inject;
+public class GeneralPropertiesView
+    extends AbstractPropertiesTabView<GeneralPropertiesViewModel> {
+
+    @FXML
+    private ComboBox<Charset> encoding;
 
-public class GeneralPropertiesView extends AbstractPropertiesTabView<GeneralPropertiesViewModel> {
-    @FXML private ComboBox<Charset> encoding;
-    @FXML private ComboBox<BibDatabaseMode> databaseMode;
-    @FXML private TextField generalFileDirectory;
-    @FXML private TextField userSpecificFileDirectory;
-    @FXML private TextField laTexFileDirectory;
+    @FXML
+    private ComboBox<BibDatabaseMode> databaseMode;
+
+    @FXML
+    private TextField generalFileDirectory;
+
+    @FXML
+    private TextField userSpecificFileDirectory;
+
+    @FXML
+    private TextField laTexFileDirectory;
 
-    @Inject private PreferencesService preferencesService;
+    @Inject
+    private PreferencesService preferencesService;
 
     public GeneralPropertiesView(BibDatabaseContext databaseContext) {
         this.databaseContext = databaseContext;
 
-        ViewLoader.view(this)
-                  .root(this)
-                  .load();
+        ViewLoader.view(this).root(this).load();
     }
 
     @Override
@@ -39,24 +46,41 @@ public String getTabName() {
     }
 
     public void initialize() {
-        this.viewModel = new GeneralPropertiesViewModel(databaseContext, dialogService, preferencesService);
+        this.viewModel =
+            new GeneralPropertiesViewModel(
+                databaseContext,
+                dialogService,
+                preferencesService
+            );
 
         new ViewModelListCellFactory<Charset>()
-                .withText(Charset::displayName)
-                .install(encoding);
+            .withText(Charset::displayName)
+            .install(encoding);
         encoding.disableProperty().bind(viewModel.encodingDisableProperty());
         encoding.itemsProperty().bind(viewModel.encodingsProperty());
-        encoding.valueProperty().bindBidirectional(viewModel.selectedEncodingProperty());
+        encoding
+            .valueProperty()
+            .bindBidirectional(viewModel.selectedEncodingProperty());
 
         new ViewModelListCellFactory<BibDatabaseMode>()
-                .withText(BibDatabaseMode::getFormattedName)
-                .install(databaseMode);
+            .withText(BibDatabaseMode::getFormattedName)
+            .install(databaseMode);
         databaseMode.itemsProperty().bind(viewModel.databaseModesProperty());
-        databaseMode.valueProperty().bindBidirectional(viewModel.selectedDatabaseModeProperty());
-
-        generalFileDirectory.textProperty().bindBidirectional(viewModel.generalFileDirectoryPropertyProperty());
-        userSpecificFileDirectory.textProperty().bindBidirectional(viewModel.userSpecificFileDirectoryProperty());
-        laTexFileDirectory.textProperty().bindBidirectional(viewModel.laTexFileDirectoryProperty());
+        databaseMode
+            .valueProperty()
+            .bindBidirectional(viewModel.selectedDatabaseModeProperty());
+
+        generalFileDirectory
+            .textProperty()
+            .bindBidirectional(
+                viewModel.generalFileDirectoryPropertyProperty()
+            );
+        userSpecificFileDirectory
+            .textProperty()
+            .bindBidirectional(viewModel.userSpecificFileDirectoryProperty());
+        laTexFileDirectory
+            .textProperty()
+            .bindBidirectional(viewModel.laTexFileDirectoryProperty());
     }
 
     @FXML
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 f54cfd5d151..00fb964da18 100644
--- a/src/main/java/org/jabref/gui/libraryproperties/general/GeneralPropertiesViewModel.java
+++ b/src/main/java/org/jabref/gui/libraryproperties/general/GeneralPropertiesViewModel.java
@@ -3,7 +3,6 @@
 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;
@@ -13,7 +12,6 @@
 import javafx.beans.property.SimpleStringProperty;
 import javafx.beans.property.StringProperty;
 import javafx.collections.FXCollections;
-
 import org.jabref.gui.DialogService;
 import org.jabref.gui.libraryproperties.PropertiesTabViewModel;
 import org.jabref.gui.util.DirectoryDialogConfiguration;
@@ -26,14 +24,29 @@
 
 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().get(0));
-    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("");
+    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().get(0));
+    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("");
 
     private final DialogService dialogService;
     private final PreferencesService preferencesService;
@@ -42,26 +55,57 @@ public class GeneralPropertiesViewModel implements PropertiesTabViewModel {
     private final MetaData metaData;
     private final DirectoryDialogConfiguration directoryDialogConfiguration;
 
-    GeneralPropertiesViewModel(BibDatabaseContext databaseContext, DialogService dialogService, PreferencesService preferencesService) {
+    GeneralPropertiesViewModel(
+        BibDatabaseContext databaseContext,
+        DialogService dialogService,
+        PreferencesService preferencesService
+    ) {
         this.dialogService = dialogService;
         this.preferencesService = preferencesService;
         this.databaseContext = databaseContext;
         this.metaData = databaseContext.getMetaData();
 
-        this.directoryDialogConfiguration = new DirectoryDialogConfiguration.Builder()
-                .withInitialDirectory(preferencesService.getFilePreferences().getWorkingDirectory()).build();
+        this.directoryDialogConfiguration =
+            new DirectoryDialogConfiguration.Builder()
+                .withInitialDirectory(
+                    preferencesService
+                        .getFilePreferences()
+                        .getWorkingDirectory()
+                )
+                .build();
     }
 
     @Override
     public void setValues() {
-        boolean isShared = databaseContext.getLocation() == DatabaseLocation.SHARED;
+        boolean isShared =
+            databaseContext.getLocation() == DatabaseLocation.SHARED;
         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(preferencesService.getFilePreferences().getUserAndHost()).orElse("").trim());
-        laTexFileDirectoryProperty.setValue(metaData.getLatexFileDirectory(preferencesService.getFilePreferences().getUserAndHost()).map(Path::toString).orElse(""));
+        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(
+                    preferencesService.getFilePreferences().getUserAndHost()
+                )
+                .orElse("")
+                .trim()
+        );
+        laTexFileDirectoryProperty.setValue(
+            metaData
+                .getLatexFileDirectory(
+                    preferencesService.getFilePreferences().getUserAndHost()
+                )
+                .map(Path::toString)
+                .orElse("")
+        );
     }
 
     @Override
@@ -71,43 +115,71 @@ public void storeSettings() {
         newMetaData.setEncoding(selectedEncodingProperty.getValue());
         newMetaData.setMode(selectedDatabaseModeProperty.getValue());
 
-        String generalFileDirectory = generalFileDirectoryProperty.getValue().trim();
+        String generalFileDirectory = generalFileDirectoryProperty
+            .getValue()
+            .trim();
         if (generalFileDirectory.isEmpty()) {
             newMetaData.clearDefaultFileDirectory();
         } else {
             newMetaData.setDefaultFileDirectory(generalFileDirectory);
         }
 
-        String userSpecificFileDirectory = userSpecificFileDirectoryProperty.getValue();
+        String userSpecificFileDirectory =
+            userSpecificFileDirectoryProperty.getValue();
         if (userSpecificFileDirectory.isEmpty()) {
-            newMetaData.clearUserFileDirectory(preferencesService.getFilePreferences().getUserAndHost());
+            newMetaData.clearUserFileDirectory(
+                preferencesService.getFilePreferences().getUserAndHost()
+            );
         } else {
-            newMetaData.setUserFileDirectory(preferencesService.getFilePreferences().getUserAndHost(), userSpecificFileDirectory);
+            newMetaData.setUserFileDirectory(
+                preferencesService.getFilePreferences().getUserAndHost(),
+                userSpecificFileDirectory
+            );
         }
 
         String latexFileDirectory = laTexFileDirectoryProperty.getValue();
         if (latexFileDirectory.isEmpty()) {
-            newMetaData.clearLatexFileDirectory(preferencesService.getFilePreferences().getUserAndHost());
+            newMetaData.clearLatexFileDirectory(
+                preferencesService.getFilePreferences().getUserAndHost()
+            );
         } else {
-            newMetaData.setLatexFileDirectory(preferencesService.getFilePreferences().getUserAndHost(), Path.of(latexFileDirectory));
+            newMetaData.setLatexFileDirectory(
+                preferencesService.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() {
@@ -126,7 +198,9 @@ public ListProperty<BibDatabaseMode> databaseModesProperty() {
         return databaseModesProperty;
     }
 
-    public SimpleObjectProperty<BibDatabaseMode> selectedDatabaseModeProperty() {
+    public SimpleObjectProperty<
+        BibDatabaseMode
+    > selectedDatabaseModeProperty() {
         return selectedDatabaseModeProperty;
     }
 
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 42a573f335d..fe35f92c916 100644
--- a/src/main/java/org/jabref/gui/libraryproperties/keypattern/KeyPatternPropertiesView.java
+++ b/src/main/java/org/jabref/gui/libraryproperties/keypattern/KeyPatternPropertiesView.java
@@ -1,8 +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;
-
 import org.jabref.gui.Globals;
 import org.jabref.gui.actions.ActionFactory;
 import org.jabref.gui.actions.StandardActions;
@@ -16,23 +17,26 @@
 import org.jabref.model.entry.BibEntryTypesManager;
 import org.jabref.preferences.PreferencesService;
 
-import com.airhacks.afterburner.views.ViewLoader;
-import jakarta.inject.Inject;
+public class KeyPatternPropertiesView
+    extends AbstractPropertiesTabView<KeyPatternPropertiesViewModel>
+    implements PropertiesTab {
+
+    @FXML
+    private Button keyPatternHelp;
 
-public class KeyPatternPropertiesView extends AbstractPropertiesTabView<KeyPatternPropertiesViewModel> implements PropertiesTab {
+    @FXML
+    private CitationKeyPatternPanel bibtexKeyPatternTable;
 
-    @FXML private Button keyPatternHelp;
-    @FXML private CitationKeyPatternPanel bibtexKeyPatternTable;
+    @Inject
+    private PreferencesService preferencesService;
 
-    @Inject private PreferencesService preferencesService;
-    @Inject private BibEntryTypesManager bibEntryTypesManager;
+    @Inject
+    private BibEntryTypesManager bibEntryTypesManager;
 
     public KeyPatternPropertiesView(BibDatabaseContext databaseContext) {
         this.databaseContext = databaseContext;
 
-        ViewLoader.view(this)
-                  .root(this)
-                  .load();
+        ViewLoader.view(this).root(this).load();
     }
 
     @Override
@@ -41,23 +45,53 @@ public String getTabName() {
     }
 
     public void initialize() {
-        this.viewModel = new KeyPatternPropertiesViewModel(databaseContext, preferencesService);
+        this.viewModel =
+            new KeyPatternPropertiesViewModel(
+                databaseContext,
+                preferencesService
+            );
 
-        bibtexKeyPatternTable.patternListProperty().bindBidirectional(viewModel.patternListProperty());
-        bibtexKeyPatternTable.defaultKeyPatternProperty().bindBidirectional(viewModel.defaultKeyPatternProperty());
+        bibtexKeyPatternTable
+            .patternListProperty()
+            .bindBidirectional(viewModel.patternListProperty());
+        bibtexKeyPatternTable
+            .defaultKeyPatternProperty()
+            .bindBidirectional(viewModel.defaultKeyPatternProperty());
 
         ActionFactory actionFactory = new ActionFactory(Globals.getKeyPrefs());
-        actionFactory.configureIconButton(StandardActions.HELP_KEY_PATTERNS, new HelpAction(HelpFile.CITATION_KEY_PATTERN, dialogService, preferencesService.getFilePreferences()), keyPatternHelp);
+        actionFactory.configureIconButton(
+            StandardActions.HELP_KEY_PATTERNS,
+            new HelpAction(
+                HelpFile.CITATION_KEY_PATTERN,
+                dialogService,
+                preferencesService.getFilePreferences()
+            ),
+            keyPatternHelp
+        );
     }
 
     @Override
     public void setValues() {
         viewModel.setValues();
         bibtexKeyPatternTable.setValues(
-                bibEntryTypesManager.getAllTypes(databaseContext.getMetaData().getMode()
-                                                                .orElse(preferencesService.getLibraryPreferences()
-                                                                                          .getDefaultBibDatabaseMode())),
-                databaseContext.getMetaData().getCiteKeyPattern(preferencesService.getCitationKeyPatternPreferences().getKeyPattern()));
+            bibEntryTypesManager.getAllTypes(
+                databaseContext
+                    .getMetaData()
+                    .getMode()
+                    .orElse(
+                        preferencesService
+                            .getLibraryPreferences()
+                            .getDefaultBibDatabaseMode()
+                    )
+            ),
+            databaseContext
+                .getMetaData()
+                .getCiteKeyPattern(
+                    preferencesService
+                        .getCitationKeyPatternPreferences()
+                        .getKeyPattern()
+                )
+        );
     }
 
     @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 2cf6484b430..78ece995e50 100644
--- a/src/main/java/org/jabref/gui/libraryproperties/keypattern/KeyPatternPropertiesViewModel.java
+++ b/src/main/java/org/jabref/gui/libraryproperties/keypattern/KeyPatternPropertiesViewModel.java
@@ -5,7 +5,6 @@
 import javafx.beans.property.SimpleListProperty;
 import javafx.beans.property.SimpleObjectProperty;
 import javafx.collections.FXCollections;
-
 import org.jabref.gui.commonfxcontrols.CitationKeyPatternPanelItemModel;
 import org.jabref.gui.commonfxcontrols.CitationKeyPatternPanelViewModel;
 import org.jabref.gui.libraryproperties.PropertiesTabViewModel;
@@ -17,15 +16,28 @@ 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<CitationKeyPatternPanelItemModel> patternListProperty = new SimpleListProperty<>(FXCollections.observableArrayList());
-    private final ObjectProperty<CitationKeyPatternPanelItemModel> defaultKeyPatternProperty = new SimpleObjectProperty<>(
-            new CitationKeyPatternPanelItemModel(new CitationKeyPatternPanelViewModel.DefaultEntryType(), ""));
+    private final ListProperty<
+        CitationKeyPatternPanelItemModel
+    > patternListProperty = new SimpleListProperty<>(
+        FXCollections.observableArrayList()
+    );
+    private final ObjectProperty<
+        CitationKeyPatternPanelItemModel
+    > defaultKeyPatternProperty = new SimpleObjectProperty<>(
+        new CitationKeyPatternPanelItemModel(
+            new CitationKeyPatternPanelViewModel.DefaultEntryType(),
+            ""
+        )
+    );
 
     private final PreferencesService preferencesService;
 
     private final BibDatabaseContext databaseContext;
 
-    public KeyPatternPropertiesViewModel(BibDatabaseContext databaseContext, PreferencesService preferencesService) {
+    public KeyPatternPropertiesViewModel(
+        BibDatabaseContext databaseContext,
+        PreferencesService preferencesService
+    ) {
         this.databaseContext = databaseContext;
         this.preferencesService = preferencesService;
     }
@@ -37,31 +49,47 @@ public void setValues() {
 
     @Override
     public void storeSettings() {
-        DatabaseCitationKeyPattern newKeyPattern = new DatabaseCitationKeyPattern(preferencesService.getCitationKeyPatternPreferences().getKeyPattern());
+        DatabaseCitationKeyPattern newKeyPattern =
+            new DatabaseCitationKeyPattern(
+                preferencesService
+                    .getCitationKeyPatternPreferences()
+                    .getKeyPattern()
+            );
 
         patternListProperty.forEach(item -> {
             String patternString = item.getPattern();
             if (!item.getEntryType().getName().equals("default")) {
                 if (!patternString.trim().isEmpty()) {
-                    newKeyPattern.addCitationKeyPattern(item.getEntryType(), patternString);
+                    newKeyPattern.addCitationKeyPattern(
+                        item.getEntryType(),
+                        patternString
+                    );
                 }
             }
         });
 
-        if (!defaultKeyPatternProperty.getValue().getPattern().trim().isEmpty()) {
+        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
             // at the end of the pattern
-            newKeyPattern.setDefaultValue(defaultKeyPatternProperty.getValue().getPattern());
+            newKeyPattern.setDefaultValue(
+                defaultKeyPatternProperty.getValue().getPattern()
+            );
         }
 
         databaseContext.getMetaData().setCiteKeyPattern(newKeyPattern);
     }
 
-    public ListProperty<CitationKeyPatternPanelItemModel> patternListProperty() {
+    public ListProperty<
+        CitationKeyPatternPanelItemModel
+    > patternListProperty() {
         return patternListProperty;
     }
 
-    public ObjectProperty<CitationKeyPatternPanelItemModel> defaultKeyPatternProperty() {
+    public ObjectProperty<
+        CitationKeyPatternPanelItemModel
+    > defaultKeyPatternProperty() {
         return defaultKeyPatternProperty;
     }
 }
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 36a5f106fe0..70378775674 100644
--- a/src/main/java/org/jabref/gui/libraryproperties/preamble/PreamblePropertiesView.java
+++ b/src/main/java/org/jabref/gui/libraryproperties/preamble/PreamblePropertiesView.java
@@ -1,28 +1,27 @@
 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;
-
+import javax.swing.undo.UndoManager;
 import org.jabref.gui.libraryproperties.AbstractPropertiesTabView;
 import org.jabref.logic.l10n.Localization;
 import org.jabref.model.database.BibDatabaseContext;
 
-import com.airhacks.afterburner.views.ViewLoader;
-import jakarta.inject.Inject;
+public class PreamblePropertiesView
+    extends AbstractPropertiesTabView<PreamblePropertiesViewModel> {
 
-public class PreamblePropertiesView extends AbstractPropertiesTabView<PreamblePropertiesViewModel> {
-    @FXML private TextArea preamble;
+    @FXML
+    private TextArea preamble;
 
-    @Inject private UndoManager undoManager;
+    @Inject
+    private UndoManager undoManager;
 
     public PreamblePropertiesView(BibDatabaseContext databaseContext) {
         this.databaseContext = databaseContext;
 
-        ViewLoader.view(this)
-                  .root(this)
-                  .load();
+        ViewLoader.view(this).root(this).load();
     }
 
     @Override
@@ -31,7 +30,8 @@ public String getTabName() {
     }
 
     public void initialize() {
-        this.viewModel = new PreamblePropertiesViewModel(databaseContext, undoManager);
+        this.viewModel =
+            new PreamblePropertiesViewModel(databaseContext, undoManager);
 
         preamble.textProperty().bindBidirectional(viewModel.preambleProperty());
     }
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 5ac3f81b951..e13c377d8da 100644
--- a/src/main/java/org/jabref/gui/libraryproperties/preamble/PreamblePropertiesViewModel.java
+++ b/src/main/java/org/jabref/gui/libraryproperties/preamble/PreamblePropertiesViewModel.java
@@ -1,35 +1,53 @@
 package org.jabref.gui.libraryproperties.preamble;
 
-import javax.swing.undo.UndoManager;
-
 import javafx.beans.property.SimpleStringProperty;
 import javafx.beans.property.StringProperty;
-
+import javax.swing.undo.UndoManager;
 import org.jabref.gui.libraryproperties.PropertiesTabViewModel;
 import org.jabref.gui.undo.UndoablePreambleChange;
 import org.jabref.model.database.BibDatabaseContext;
 
 public class PreamblePropertiesViewModel implements PropertiesTabViewModel {
-    private final StringProperty preambleProperty = new SimpleStringProperty("");
+
+    private final StringProperty preambleProperty = new SimpleStringProperty(
+        ""
+    );
 
     private final BibDatabaseContext databaseContext;
     private final UndoManager undoManager;
 
-    PreamblePropertiesViewModel(BibDatabaseContext databaseContext, UndoManager undoManager) {
+    PreamblePropertiesViewModel(
+        BibDatabaseContext databaseContext,
+        UndoManager undoManager
+    ) {
         this.undoManager = undoManager;
         this.databaseContext = databaseContext;
     }
 
     @Override
     public void setValues() {
-        preambleProperty.setValue(databaseContext.getDatabase().getPreamble().orElse(""));
+        preambleProperty.setValue(
+            databaseContext.getDatabase().getPreamble().orElse("")
+        );
     }
 
     @Override
     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));
+        if (
+            !databaseContext
+                .getDatabase()
+                .getPreamble()
+                .orElse("")
+                .equals(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 524a051e20b..5656e10c34a 100644
--- a/src/main/java/org/jabref/gui/libraryproperties/saving/SavingPropertiesView.java
+++ b/src/main/java/org/jabref/gui/libraryproperties/saving/SavingPropertiesView.java
@@ -1,8 +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;
-
 import org.jabref.gui.commonfxcontrols.FieldFormatterCleanupsPanel;
 import org.jabref.gui.commonfxcontrols.SaveOrderConfigPanel;
 import org.jabref.gui.libraryproperties.AbstractPropertiesTabView;
@@ -11,23 +12,26 @@
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.preferences.PreferencesService;
 
-import com.airhacks.afterburner.views.ViewLoader;
-import jakarta.inject.Inject;
+public class SavingPropertiesView
+    extends AbstractPropertiesTabView<SavingPropertiesViewModel>
+    implements PropertiesTab {
+
+    @FXML
+    private CheckBox protect;
 
-public class SavingPropertiesView extends AbstractPropertiesTabView<SavingPropertiesViewModel> implements PropertiesTab {
+    @FXML
+    private SaveOrderConfigPanel saveOrderConfigPanel;
 
-    @FXML private CheckBox protect;
-    @FXML private SaveOrderConfigPanel saveOrderConfigPanel;
-    @FXML private FieldFormatterCleanupsPanel fieldFormatterCleanupsPanel;
+    @FXML
+    private FieldFormatterCleanupsPanel fieldFormatterCleanupsPanel;
 
-    @Inject private PreferencesService preferencesService;
+    @Inject
+    private PreferencesService preferencesService;
 
     public SavingPropertiesView(BibDatabaseContext databaseContext) {
         this.databaseContext = databaseContext;
 
-        ViewLoader.view(this)
-                  .root(this)
-                  .load();
+        ViewLoader.view(this).root(this).load();
     }
 
     @Override
@@ -36,18 +40,35 @@ public String getTabName() {
     }
 
     public void initialize() {
-        this.viewModel = new SavingPropertiesViewModel(databaseContext, preferencesService);
+        this.viewModel =
+            new SavingPropertiesViewModel(databaseContext, preferencesService);
 
         protect.disableProperty().bind(viewModel.protectDisableProperty());
-        protect.selectedProperty().bindBidirectional(viewModel.libraryProtectedProperty());
+        protect
+            .selectedProperty()
+            .bindBidirectional(viewModel.libraryProtectedProperty());
 
-        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
+            .saveInOriginalProperty()
+            .bindBidirectional(viewModel.saveInOriginalProperty());
+        saveOrderConfigPanel
+            .saveInTableOrderProperty()
+            .bindBidirectional(viewModel.saveInTableOrderProperty());
+        saveOrderConfigPanel
+            .saveInSpecifiedOrderProperty()
+            .bindBidirectional(viewModel.saveInSpecifiedOrderProperty());
+        saveOrderConfigPanel
+            .sortableFieldsProperty()
+            .bind(viewModel.sortableFieldsProperty());
+        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 9e01a3a76eb..4eda5b23519 100644
--- a/src/main/java/org/jabref/gui/libraryproperties/saving/SavingPropertiesViewModel.java
+++ b/src/main/java/org/jabref/gui/libraryproperties/saving/SavingPropertiesViewModel.java
@@ -4,13 +4,11 @@
 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;
 import javafx.beans.property.SimpleListProperty;
 import javafx.collections.FXCollections;
-
 import org.jabref.gui.commonfxcontrols.SortCriterionViewModel;
 import org.jabref.gui.libraryproperties.PropertiesTabViewModel;
 import org.jabref.logic.cleanup.FieldFormatterCleanup;
@@ -27,38 +25,56 @@
 
 public class SavingPropertiesViewModel implements PropertiesTabViewModel {
 
-    private static final SaveOrder UI_DEFAULT_SAVE_ORDER = new SaveOrder(SaveOrder.OrderType.ORIGINAL, List.of(
+    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();
+    private final BooleanProperty protectDisableProperty =
+        new SimpleBooleanProperty();
+    private final BooleanProperty libraryProtectedProperty =
+        new SimpleBooleanProperty();
 
     // SaveOrderConfigPanel
-    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 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<>())
+        );
 
     // FieldFormatterCleanupsPanel
-    private final BooleanProperty cleanupsDisableProperty = new SimpleBooleanProperty();
-    private final ListProperty<FieldFormatterCleanup> cleanupsProperty = new SimpleListProperty<>(FXCollections.emptyObservableList());
+    private final BooleanProperty cleanupsDisableProperty =
+        new SimpleBooleanProperty();
+    private final ListProperty<FieldFormatterCleanup> cleanupsProperty =
+        new SimpleListProperty<>(FXCollections.emptyObservableList());
 
     private final BibDatabaseContext databaseContext;
     private final MetaData initialMetaData;
     private final SaveOrder saveOrder;
     private final PreferencesService preferencesService;
 
-    public SavingPropertiesViewModel(BibDatabaseContext databaseContext, PreferencesService preferencesService) {
+    public SavingPropertiesViewModel(
+        BibDatabaseContext databaseContext,
+        PreferencesService preferencesService
+    ) {
         this.databaseContext = databaseContext;
         this.preferencesService = preferencesService;
         this.initialMetaData = databaseContext.getMetaData();
-        this.saveOrder = initialMetaData.getSaveOrder().orElse(UI_DEFAULT_SAVE_ORDER);
+        this.saveOrder =
+            initialMetaData.getSaveOrder().orElse(UI_DEFAULT_SAVE_ORDER);
     }
 
     @Override
@@ -81,23 +97,46 @@ public void setValues() {
         fields.add(InternalField.KEY_FIELD);
         fields.add(InternalField.TYPE_HEADER);
 
-        sortableFieldsProperty.addAll(FieldFactory.getStandardFieldsWithCitationKey());
+        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 = preferencesService.getDefaultCleanupPreset();
-            cleanupsDisableProperty.setValue(!defaultPreset.getFieldFormatterCleanups().isEnabled());
-            cleanupsProperty.setValue(FXCollections.observableArrayList(defaultPreset.getFieldFormatterCleanups().getConfiguredActions()));
-        });
+        Optional<FieldFormatterCleanups> saveActions =
+            initialMetaData.getSaveActions();
+        saveActions.ifPresentOrElse(
+            value -> {
+                cleanupsDisableProperty.setValue(!value.isEnabled());
+                cleanupsProperty.setValue(
+                    FXCollections.observableArrayList(
+                        value.getConfiguredActions()
+                    )
+                );
+            },
+            () -> {
+                CleanupPreferences defaultPreset =
+                    preferencesService.getDefaultCleanupPreset();
+                cleanupsDisableProperty.setValue(
+                    !defaultPreset.getFieldFormatterCleanups().isEnabled()
+                );
+                cleanupsProperty.setValue(
+                    FXCollections.observableArrayList(
+                        defaultPreset
+                            .getFieldFormatterCleanups()
+                            .getConfiguredActions()
+                    )
+                );
+            }
+        );
     }
 
     @Override
@@ -110,11 +149,17 @@ public void storeSettings() {
             newMetaData.markAsNotProtected();
         }
 
-        FieldFormatterCleanups fieldFormatterCleanups = new FieldFormatterCleanups(
+        FieldFormatterCleanups fieldFormatterCleanups =
+            new FieldFormatterCleanups(
                 !cleanupsDisableProperty().getValue(),
-                cleanupsProperty());
-
-        if (FieldFormatterCleanups.DEFAULT_SAVE_ACTIONS.equals(fieldFormatterCleanups.getConfiguredActions())) {
+                cleanupsProperty()
+            );
+
+        if (
+            FieldFormatterCleanups.DEFAULT_SAVE_ACTIONS.equals(
+                fieldFormatterCleanups.getConfiguredActions()
+            )
+        ) {
             newMetaData.clearSaveActions();
         } else {
             // if all actions have been removed, remove the save actions from the MetaData
@@ -126,8 +171,15 @@ public void storeSettings() {
         }
 
         SaveOrder newSaveOrder = new SaveOrder(
-                SaveOrder.OrderType.fromBooleans(saveInSpecifiedOrderProperty.getValue(), saveInOriginalProperty.getValue()),
-                sortCriteriaProperty.stream().map(SortCriterionViewModel::getCriterion).toList());
+            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 8dad9f0399c..58825eb57ac 100644
--- a/src/main/java/org/jabref/gui/linkedfile/AttachFileAction.java
+++ b/src/main/java/org/jabref/gui/linkedfile/AttachFileAction.java
@@ -2,7 +2,6 @@
 
 import java.nio.file.Path;
 import java.util.Optional;
-
 import org.jabref.gui.DialogService;
 import org.jabref.gui.LibraryTab;
 import org.jabref.gui.StateManager;
@@ -25,58 +24,82 @@ public class AttachFileAction extends SimpleCommand {
     private final DialogService dialogService;
     private final FilePreferences filePreferences;
 
-    public AttachFileAction(LibraryTab libraryTab,
-                            DialogService dialogService,
-                            StateManager stateManager,
-                            FilePreferences filePreferences) {
+    public AttachFileAction(
+        LibraryTab libraryTab,
+        DialogService dialogService,
+        StateManager stateManager,
+        FilePreferences filePreferences
+    ) {
         this.libraryTab = libraryTab;
         this.stateManager = stateManager;
         this.dialogService = dialogService;
         this.filePreferences = filePreferences;
 
-        this.executable.bind(ActionHelper.needsEntriesSelected(1, stateManager));
+        this.executable.bind(
+                ActionHelper.needsEntriesSelected(1, stateManager)
+            );
     }
 
     @Override
     public void execute() {
         if (stateManager.getActiveDatabase().isEmpty()) {
-            dialogService.notify(Localization.lang("This operation requires an open library."));
+            dialogService.notify(
+                Localization.lang("This operation requires an open library.")
+            );
             return;
         }
 
         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;
         }
 
-        BibDatabaseContext databaseContext = stateManager.getActiveDatabase().get();
+        BibDatabaseContext databaseContext = stateManager
+            .getActiveDatabase()
+            .get();
 
         BibEntry entry = stateManager.getSelectedEntries().get(0);
 
-        Path workingDirectory = databaseContext.getFirstExistingFileDir(filePreferences)
-                                               .orElse(filePreferences.getWorkingDirectory());
+        Path workingDirectory = databaseContext
+            .getFirstExistingFileDir(filePreferences)
+            .orElse(filePreferences.getWorkingDirectory());
 
-        FileDialogConfiguration fileDialogConfiguration = new FileDialogConfiguration.Builder()
+        FileDialogConfiguration fileDialogConfiguration =
+            new FileDialogConfiguration.Builder()
                 .withInitialDirectory(workingDirectory)
                 .build();
 
-        dialogService.showFileOpenDialog(fileDialogConfiguration).ifPresent(newFile -> {
-            LinkedFile linkedFile = LinkedFilesEditorViewModel.fromFile(
+        dialogService
+            .showFileOpenDialog(fileDialogConfiguration)
+            .ifPresent(newFile -> {
+                LinkedFile linkedFile = LinkedFilesEditorViewModel.fromFile(
                     newFile,
                     databaseContext.getFileDirectories(filePreferences),
-                    filePreferences);
+                    filePreferences
+                );
 
-            LinkedFileEditDialogView dialog = new LinkedFileEditDialogView(linkedFile);
+                LinkedFileEditDialogView dialog = new LinkedFileEditDialogView(
+                    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 08c9240b0a2..be98c61c1de 100644
--- a/src/main/java/org/jabref/gui/linkedfile/AttachFileFromURLAction.java
+++ b/src/main/java/org/jabref/gui/linkedfile/AttachFileFromURLAction.java
@@ -3,7 +3,6 @@
 import java.net.MalformedURLException;
 import java.net.URL;
 import java.util.Optional;
-
 import org.jabref.gui.ClipBoardManager;
 import org.jabref.gui.DialogService;
 import org.jabref.gui.StateManager;
@@ -25,35 +24,50 @@ public class AttachFileFromURLAction extends SimpleCommand {
     private final PreferencesService preferencesService;
     private final TaskExecutor taskExecutor;
 
-    public AttachFileFromURLAction(DialogService dialogService,
-                                   StateManager stateManager,
-                                   TaskExecutor taskExecutor,
-                                   PreferencesService preferencesService) {
+    public AttachFileFromURLAction(
+        DialogService dialogService,
+        StateManager stateManager,
+        TaskExecutor taskExecutor,
+        PreferencesService preferencesService
+    ) {
         this.stateManager = stateManager;
         this.dialogService = dialogService;
         this.taskExecutor = taskExecutor;
         this.preferencesService = preferencesService;
 
-        this.executable.bind(ActionHelper.needsEntriesSelected(1, stateManager));
+        this.executable.bind(
+                ActionHelper.needsEntriesSelected(1, stateManager)
+            );
     }
 
     @Override
     public void execute() {
         if (stateManager.getActiveDatabase().isEmpty()) {
-            dialogService.notify(Localization.lang("This operation requires an open library."));
+            dialogService.notify(
+                Localization.lang("This operation requires an open library.")
+            );
             return;
         }
 
         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;
         }
 
-        BibDatabaseContext databaseContext = stateManager.getActiveDatabase().get();
+        BibDatabaseContext databaseContext = stateManager
+            .getActiveDatabase()
+            .get();
 
         BibEntry entry = stateManager.getSelectedEntries().get(0);
 
-        Optional<String> urlforDownload = getUrlForDownloadFromClipBoardOrEntry(dialogService, entry);
+        Optional<String> urlforDownload = getUrlForDownloadFromClipBoardOrEntry(
+            dialogService,
+            entry
+        );
 
         if (urlforDownload.isEmpty()) {
             return;
@@ -62,31 +76,57 @@ public void execute() {
         try {
             URL url = new URL(urlforDownload.get());
             LinkedFileViewModel onlineFile = new LinkedFileViewModel(
-                             new LinkedFile(url, ""),
-                             entry,
-                             databaseContext,
-                             taskExecutor,
-                             dialogService,
-                             preferencesService);
+                new LinkedFile(url, ""),
+                entry,
+                databaseContext,
+                taskExecutor,
+                dialogService,
+                preferencesService
+            );
             onlineFile.download();
         } catch (MalformedURLException exception) {
-            dialogService.showErrorDialogAndWait(Localization.lang("Invalid URL"), 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 a1f9ef3bb15..146f9250b02 100644
--- a/src/main/java/org/jabref/gui/linkedfile/DeleteFileAction.java
+++ b/src/main/java/org/jabref/gui/linkedfile/DeleteFileAction.java
@@ -5,12 +5,10 @@
 import java.nio.file.Path;
 import java.util.List;
 import java.util.Optional;
-
 import javafx.scene.control.Alert;
 import javafx.scene.control.ButtonBar;
 import javafx.scene.control.ButtonType;
 import javafx.scene.control.ListView;
-
 import org.jabref.gui.DialogService;
 import org.jabref.gui.actions.SimpleCommand;
 import org.jabref.gui.fieldeditors.LinkedFileViewModel;
@@ -19,13 +17,14 @@
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.entry.LinkedFile;
 import org.jabref.preferences.PreferencesService;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 public class DeleteFileAction extends SimpleCommand {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(DeleteFileAction.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(
+        DeleteFileAction.class
+    );
 
     private final DialogService dialogService;
     private final PreferencesService preferences;
@@ -33,11 +32,13 @@ public class DeleteFileAction extends SimpleCommand {
     private final LinkedFilesEditorViewModel viewModel;
     private final ListView<LinkedFileViewModel> listView;
 
-    public DeleteFileAction(DialogService dialogService,
-                            PreferencesService preferences,
-                            BibDatabaseContext databaseContext,
-                            LinkedFilesEditorViewModel viewModel,
-                            ListView<LinkedFileViewModel> listView) {
+    public DeleteFileAction(
+        DialogService dialogService,
+        PreferencesService preferences,
+        BibDatabaseContext databaseContext,
+        LinkedFilesEditorViewModel viewModel,
+        ListView<LinkedFileViewModel> listView
+    ) {
         this.dialogService = dialogService;
         this.preferences = preferences;
         this.databaseContext = databaseContext;
@@ -47,10 +48,16 @@ public DeleteFileAction(DialogService dialogService,
 
     @Override
     public void execute() {
-        List<LinkedFileViewModel> toBeDeleted = List.copyOf(listView.getSelectionModel().getSelectedItems());
+        List<LinkedFileViewModel> toBeDeleted = List.copyOf(
+            listView.getSelectionModel().getSelectedItems()
+        );
 
         if (toBeDeleted.isEmpty()) {
-            dialogService.notify(Localization.lang("This operation requires selected linked files."));
+            dialogService.notify(
+                Localization.lang(
+                    "This operation requires selected linked files."
+                )
+            );
             return;
         }
 
@@ -58,26 +65,59 @@ public void execute() {
         String dialogContent;
 
         if (toBeDeleted.size() != 1) {
-            dialogTitle = Localization.lang("Delete %0 files", toBeDeleted.size());
-            dialogContent = Localization.lang("Delete %0 files permanently from disk, or just remove the files from the entry? " +
-                    "Pressing Delete will delete the files permanently from disk.", toBeDeleted.size());
+            dialogTitle =
+                Localization.lang("Delete %0 files", toBeDeleted.size());
+            dialogContent =
+                Localization.lang(
+                    "Delete %0 files permanently from disk, or just remove the files from the entry? " +
+                    "Pressing Delete will delete the files permanently from disk.",
+                    toBeDeleted.size()
+                );
         } else {
-            Optional<Path> file = toBeDeleted.get(0).getFile().findIn(databaseContext, preferences.getFilePreferences());
+            Optional<Path> file = toBeDeleted
+                .get(0)
+                .getFile()
+                .findIn(databaseContext, preferences.getFilePreferences());
 
             if (file.isPresent()) {
-                dialogTitle = Localization.lang("Delete '%0'", file.get().getFileName().toString());
-                dialogContent = Localization.lang("Delete '%0' permanently from disk, or just remove the file from the entry? " +
-                        "Pressing Delete will delete the file permanently from disk.", file.get().toString());
+                dialogTitle =
+                    Localization.lang(
+                        "Delete '%0'",
+                        file.get().getFileName().toString()
+                    );
+                dialogContent =
+                    Localization.lang(
+                        "Delete '%0' permanently from disk, or just remove the file from the entry? " +
+                        "Pressing Delete will delete the file permanently from disk.",
+                        file.get().toString()
+                    );
             } else {
-                dialogService.notify(Localization.lang("Error accessing file '%0'.", toBeDeleted.get(0).getFile().getLink()));
+                dialogService.notify(
+                    Localization.lang(
+                        "Error accessing file '%0'.",
+                        toBeDeleted.get(0).getFile().getLink()
+                    )
+                );
                 return;
             }
         }
 
-        ButtonType removeFromEntry = new ButtonType(Localization.lang("Remove from entry"), ButtonBar.ButtonData.YES);
-        ButtonType deleteFromEntry = new ButtonType(Localization.lang("Delete from disk"));
-        Optional<ButtonType> buttonType = dialogService.showCustomButtonDialogAndWait(Alert.AlertType.INFORMATION,
-                dialogTitle, dialogContent, removeFromEntry, deleteFromEntry, ButtonType.CANCEL);
+        ButtonType removeFromEntry = new ButtonType(
+            Localization.lang("Remove from entry"),
+            ButtonBar.ButtonData.YES
+        );
+        ButtonType deleteFromEntry = new ButtonType(
+            Localization.lang("Delete from disk")
+        );
+        Optional<ButtonType> buttonType =
+            dialogService.showCustomButtonDialogAndWait(
+                Alert.AlertType.INFORMATION,
+                dialogTitle,
+                dialogContent,
+                removeFromEntry,
+                deleteFromEntry,
+                ButtonType.CANCEL
+            );
 
         if (buttonType.isPresent()) {
             if (buttonType.get().equals(removeFromEntry)) {
@@ -96,7 +136,10 @@ public void execute() {
      * @param toBeDeleted the files to be deleted
      * @param deleteFromDisk if true, the files are deleted from disk, otherwise they are only removed from the entry
      */
-    private void deleteFiles(List<LinkedFileViewModel> toBeDeleted, boolean deleteFromDisk) {
+    private void deleteFiles(
+        List<LinkedFileViewModel> toBeDeleted,
+        boolean deleteFromDisk
+    ) {
         for (LinkedFileViewModel fileViewModel : toBeDeleted) {
             if (fileViewModel.getFile().isOnlineLink()) {
                 viewModel.removeFileLink(fileViewModel);
@@ -117,7 +160,10 @@ private void deleteFiles(List<LinkedFileViewModel> toBeDeleted, boolean deleteFr
     public void deleteFileFromDisk(LinkedFileViewModel fileViewModel) {
         LinkedFile linkedFile = fileViewModel.getFile();
 
-        Optional<Path> file = linkedFile.findIn(databaseContext, preferences.getFilePreferences());
+        Optional<Path> file = linkedFile.findIn(
+            databaseContext,
+            preferences.getFilePreferences()
+        );
 
         if (file.isEmpty()) {
             LOGGER.warn("Could not find file {}", linkedFile.getLink());
@@ -126,13 +172,24 @@ public void deleteFileFromDisk(LinkedFileViewModel fileViewModel) {
         if (file.isPresent()) {
             try {
                 Files.delete(file.get());
-            } catch (
-                    IOException ex) {
-                dialogService.showErrorDialogAndWait(Localization.lang("Cannot delete file"), Localization.lang("File permission error"));
-                LOGGER.warn("File permission error while deleting: {}", linkedFile, ex);
+            } catch (IOException ex) {
+                dialogService.showErrorDialogAndWait(
+                    Localization.lang("Cannot delete file"),
+                    Localization.lang("File permission error")
+                );
+                LOGGER.warn(
+                    "File permission error while deleting: {}",
+                    linkedFile,
+                    ex
+                );
             }
         } else {
-            dialogService.notify(Localization.lang("Error accessing file '%0'.", linkedFile.getLink()));
+            dialogService.notify(
+                Localization.lang(
+                    "Error accessing file '%0'.",
+                    linkedFile.getLink()
+                )
+            );
         }
     }
 }
diff --git a/src/main/java/org/jabref/gui/linkedfile/LinkedFileEditDialogView.java b/src/main/java/org/jabref/gui/linkedfile/LinkedFileEditDialogView.java
index 7a9c333d0a2..019e032fd25 100644
--- a/src/main/java/org/jabref/gui/linkedfile/LinkedFileEditDialogView.java
+++ b/src/main/java/org/jabref/gui/linkedfile/LinkedFileEditDialogView.java
@@ -1,11 +1,12 @@
 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;
 import javafx.scene.control.ComboBox;
 import javafx.scene.control.TextField;
-
 import org.jabref.gui.DialogService;
 import org.jabref.gui.StateManager;
 import org.jabref.gui.externalfiletype.ExternalFileType;
@@ -15,19 +16,25 @@
 import org.jabref.model.entry.LinkedFile;
 import org.jabref.preferences.PreferencesService;
 
-import com.airhacks.afterburner.views.ViewLoader;
-import jakarta.inject.Inject;
-
 public class LinkedFileEditDialogView extends BaseDialog<LinkedFile> {
 
-    @FXML private TextField link;
-    @FXML private TextField description;
-    @FXML private ComboBox<ExternalFileType> fileType;
+    @FXML
+    private TextField link;
+
+    @FXML
+    private TextField description;
+
+    @FXML
+    private ComboBox<ExternalFileType> fileType;
+
+    @Inject
+    private DialogService dialogService;
 
-    @Inject private DialogService dialogService;
-    @Inject private StateManager stateManager;
+    @Inject
+    private StateManager stateManager;
 
-    @Inject private PreferencesService preferences;
+    @Inject
+    private PreferencesService preferences;
 
     private LinkedFilesEditDialogViewModel viewModel;
 
@@ -36,35 +43,47 @@ public class LinkedFileEditDialogView extends BaseDialog<LinkedFile> {
     public LinkedFileEditDialogView(LinkedFile linkedFile) {
         this.linkedFile = linkedFile;
 
-        ViewLoader.view(this)
-                  .load()
-                  .setAsContent(this.getDialogPane());
+        ViewLoader.view(this).load().setAsContent(this.getDialogPane());
 
-        this.getDialogPane().getButtonTypes().addAll(ButtonType.APPLY, ButtonType.CANCEL);
+        this.getDialogPane()
+            .getButtonTypes()
+            .addAll(ButtonType.APPLY, ButtonType.CANCEL);
         this.setResizable(false);
         this.setTitle(Localization.lang("Edit file link"));
 
         this.setResultConverter(button -> {
-            if (button == ButtonType.APPLY) {
-                return viewModel.getNewLinkedFile();
-            } else {
-                return null;
-            }
-        });
+                if (button == ButtonType.APPLY) {
+                    return viewModel.getNewLinkedFile();
+                } else {
+                    return null;
+                }
+            });
     }
 
     @FXML
     private void initialize() {
-        viewModel = new LinkedFilesEditDialogViewModel(linkedFile, stateManager.getActiveDatabase().get(), dialogService, preferences.getFilePreferences());
-        fileType.itemsProperty().bindBidirectional(viewModel.externalFileTypeProperty());
+        viewModel =
+            new LinkedFilesEditDialogViewModel(
+                linkedFile,
+                stateManager.getActiveDatabase().get(),
+                dialogService,
+                preferences.getFilePreferences()
+            );
+        fileType
+            .itemsProperty()
+            .bindBidirectional(viewModel.externalFileTypeProperty());
         new ViewModelListCellFactory<ExternalFileType>()
-                .withIcon(ExternalFileType::getIcon)
-                .withText(ExternalFileType::getName)
-                .install(fileType);
+            .withIcon(ExternalFileType::getIcon)
+            .withText(ExternalFileType::getName)
+            .install(fileType);
 
-        description.textProperty().bindBidirectional(viewModel.descriptionProperty());
+        description
+            .textProperty()
+            .bindBidirectional(viewModel.descriptionProperty());
         link.textProperty().bindBidirectional(viewModel.linkProperty());
-        fileType.valueProperty().bindBidirectional(viewModel.selectedExternalFileTypeProperty());
+        fileType
+            .valueProperty()
+            .bindBidirectional(viewModel.selectedExternalFileTypeProperty());
     }
 
     @FXML
diff --git a/src/main/java/org/jabref/gui/linkedfile/LinkedFilesEditDialogViewModel.java b/src/main/java/org/jabref/gui/linkedfile/LinkedFilesEditDialogViewModel.java
index 646d1b64c93..3d3617efe19 100644
--- a/src/main/java/org/jabref/gui/linkedfile/LinkedFilesEditDialogViewModel.java
+++ b/src/main/java/org/jabref/gui/linkedfile/LinkedFilesEditDialogViewModel.java
@@ -1,12 +1,13 @@
 package org.jabref.gui.linkedfile;
 
+import com.tobiasdiez.easybind.EasyBind;
+import com.tobiasdiez.easybind.optional.ObservableOptionalValue;
 import java.net.MalformedURLException;
 import java.net.URL;
 import java.nio.file.Path;
 import java.util.List;
 import java.util.Optional;
 import java.util.regex.Pattern;
-
 import javafx.beans.property.ListProperty;
 import javafx.beans.property.ObjectProperty;
 import javafx.beans.property.SimpleListProperty;
@@ -14,7 +15,6 @@
 import javafx.beans.property.SimpleStringProperty;
 import javafx.beans.property.StringProperty;
 import javafx.collections.FXCollections;
-
 import org.jabref.gui.AbstractViewModel;
 import org.jabref.gui.DialogService;
 import org.jabref.gui.externalfiletype.ExternalFileType;
@@ -26,31 +26,41 @@
 import org.jabref.model.entry.LinkedFile;
 import org.jabref.preferences.FilePreferences;
 
-import com.tobiasdiez.easybind.EasyBind;
-import com.tobiasdiez.easybind.optional.ObservableOptionalValue;
-
 public class LinkedFilesEditDialogViewModel extends AbstractViewModel {
 
-    private static final Pattern REMOTE_LINK_PATTERN = Pattern.compile("[a-z]+://.*");
+    private static final Pattern REMOTE_LINK_PATTERN = Pattern.compile(
+        "[a-z]+://.*"
+    );
     private final StringProperty link = new SimpleStringProperty("");
     private final StringProperty description = new SimpleStringProperty("");
-    private final ListProperty<ExternalFileType> allExternalFileTypes = new SimpleListProperty<>(FXCollections.emptyObservableList());
-    private final ObjectProperty<ExternalFileType> selectedExternalFileType = new SimpleObjectProperty<>();
-    private final ObservableOptionalValue<ExternalFileType> monadicSelectedExternalFileType;
+    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 FilePreferences filePreferences;
 
-    public LinkedFilesEditDialogViewModel(LinkedFile linkedFile,
-                                          BibDatabaseContext database,
-                                          DialogService dialogService,
-                                          FilePreferences filePreferences) {
+    public LinkedFilesEditDialogViewModel(
+        LinkedFile linkedFile,
+        BibDatabaseContext database,
+        DialogService dialogService,
+        FilePreferences filePreferences
+    ) {
         this.database = database;
         this.dialogService = dialogService;
         this.filePreferences = filePreferences;
-        allExternalFileTypes.set(FXCollections.observableArrayList(filePreferences.getExternalFileTypes()));
-
-        monadicSelectedExternalFileType = EasyBind.wrapNullable(selectedExternalFileType);
+        allExternalFileTypes.set(
+            FXCollections.observableArrayList(
+                filePreferences.getExternalFileTypes()
+            )
+        );
+
+        monadicSelectedExternalFileType =
+            EasyBind.wrapNullable(selectedExternalFileType);
         setValues(linkedFile);
     }
 
@@ -58,37 +68,46 @@ private void setExternalFileTypeByExtension(String link) {
         if (!link.isEmpty()) {
             // Check if this looks like a remote link:
             if (REMOTE_LINK_PATTERN.matcher(link).matches()) {
-                ExternalFileTypes.getExternalFileTypeByExt("html", filePreferences)
-                                 .ifPresent(selectedExternalFileType::setValue);
+                ExternalFileTypes
+                    .getExternalFileTypeByExt("html", filePreferences)
+                    .ifPresent(selectedExternalFileType::setValue);
             }
 
             // Try to guess the file type:
             String theLink = link.trim();
-            ExternalFileTypes.getExternalFileTypeForName(theLink, filePreferences)
-                             .ifPresent(selectedExternalFileType::setValue);
+            ExternalFileTypes
+                .getExternalFileTypeForName(theLink, filePreferences)
+                .ifPresent(selectedExternalFileType::setValue);
         }
     }
 
     public void openBrowseDialog() {
         String fileText = link.get();
 
-        Optional<Path> file = FileUtil.find(database, fileText, filePreferences);
+        Optional<Path> file = FileUtil.find(
+            database,
+            fileText,
+            filePreferences
+        );
 
         Path workingDir = file.orElse(filePreferences.getWorkingDirectory());
         String fileName = Path.of(fileText).getFileName().toString();
 
-        FileDialogConfiguration fileDialogConfiguration = new FileDialogConfiguration.Builder()
+        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));
+        dialogService
+            .showFileOpenDialog(fileDialogConfiguration)
+            .ifPresent(path -> {
+                // Store the directory for next time:
+                filePreferences.setWorkingDirectory(path);
+                link.set(relativize(path));
 
-            setExternalFileTypeByExtension(link.getValueSafe());
-        });
+                setExternalFileTypeByExtension(link.getValueSafe());
+            });
     }
 
     public void setValues(LinkedFile linkedFile) {
@@ -103,10 +122,20 @@ public void setValues(LinkedFile linkedFile) {
         selectedExternalFileType.setValue(null);
 
         // See what is a reasonable selection for the type combobox:
-        Optional<ExternalFileType> fileType = ExternalFileTypes.getExternalFileTypeByLinkedFile(linkedFile, false, filePreferences);
-        if (fileType.isPresent() && !(fileType.get() instanceof UnknownExternalFileType)) {
+        Optional<ExternalFileType> fileType =
+            ExternalFileTypes.getExternalFileTypeByLinkedFile(
+                linkedFile,
+                false,
+                filePreferences
+            );
+        if (
+            fileType.isPresent() &&
+            !(fileType.get() instanceof UnknownExternalFileType)
+        ) {
             selectedExternalFileType.setValue(fileType.get());
-        } else if ((linkedFile.getLink() != null) && (!linkedFile.getLink().isEmpty())) {
+        } else if (
+            (linkedFile.getLink() != null) && (!linkedFile.getLink().isEmpty())
+        ) {
             setExternalFileTypeByExtension(linkedFile.getLink());
         }
     }
@@ -128,20 +157,37 @@ 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(), new URL(link.getValue()), fileType);
+                return new LinkedFile(
+                    description.getValue(),
+                    new URL(link.getValue()),
+                    fileType
+                );
             } catch (MalformedURLException e) {
-                return new LinkedFile(description.getValue(), link.getValue(), fileType);
+                return new LinkedFile(
+                    description.getValue(),
+                    link.getValue(),
+                    fileType
+                );
             }
         }
-        return new LinkedFile(description.getValue(), Path.of(link.getValue()), fileType);
+        return new LinkedFile(
+            description.getValue(),
+            Path.of(link.getValue()),
+            fileType
+        );
     }
 
     private String relativize(Path filePath) {
-        List<Path> fileDirectories = database.getFileDirectories(filePreferences);
+        List<Path> fileDirectories = database.getFileDirectories(
+            filePreferences
+        );
         return FileUtil.relativize(filePath, fileDirectories).toString();
     }
 }
diff --git a/src/main/java/org/jabref/gui/logging/GuiWriter.java b/src/main/java/org/jabref/gui/logging/GuiWriter.java
index 4dff37ad4f3..94b4ae51f5b 100644
--- a/src/main/java/org/jabref/gui/logging/GuiWriter.java
+++ b/src/main/java/org/jabref/gui/logging/GuiWriter.java
@@ -4,9 +4,7 @@
 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;
@@ -32,10 +30,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 6f614cb2679..e9de99a19b8 100644
--- a/src/main/java/org/jabref/gui/maintable/BibEntryTableViewModel.java
+++ b/src/main/java/org/jabref/gui/maintable/BibEntryTableViewModel.java
@@ -1,5 +1,8 @@
 package org.jabref.gui.maintable;
 
+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;
@@ -9,14 +12,12 @@
 import java.util.Optional;
 import java.util.function.Predicate;
 import java.util.stream.Collectors;
-
 import javafx.beans.Observable;
 import javafx.beans.binding.Binding;
 import javafx.beans.binding.Bindings;
 import javafx.beans.property.ReadOnlyStringWrapper;
 import javafx.beans.property.StringProperty;
 import javafx.beans.value.ObservableValue;
-
 import org.jabref.gui.specialfields.SpecialFieldValueViewModel;
 import org.jabref.gui.util.uithreadaware.UiThreadBinding;
 import org.jabref.logic.importer.util.FileFieldParser;
@@ -30,62 +31,102 @@
 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;
-
 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 ObservableValue<
+        MainTableFieldValueFormatter
+    > fieldValueFormatter;
+    private final Map<OrFields, ObservableValue<String>> fieldValues =
+        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;
     private final BibDatabaseContext bibDatabaseContext;
 
-    public BibEntryTableViewModel(BibEntry entry, BibDatabaseContext bibDatabaseContext, ObservableValue<MainTableFieldValueFormatter> fieldValueFormatter) {
+    public BibEntryTableViewModel(
+        BibEntry entry,
+        BibDatabaseContext bibDatabaseContext,
+        ObservableValue<MainTableFieldValueFormatter> fieldValueFormatter
+    ) {
         this.entry = entry;
         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);
+        this.matchedGroups =
+            createMatchedGroupsBinding(bibDatabaseContext, entry);
         this.bibDatabaseContext = bibDatabaseContext;
     }
 
-    private static EasyBinding<Map<Field, String>> createLinkedIdentifiersBinding(BibEntry entry) {
+    private static EasyBinding<
+        Map<Field, String>
+    > createLinkedIdentifiersBinding(BibEntry entry) {
         return EasyBind.combine(
-                entry.getFieldBinding(StandardField.URL),
-                entry.getFieldBinding(StandardField.DOI),
-                entry.getFieldBinding(StandardField.URI),
-                entry.getFieldBinding(StandardField.EPRINT),
-                entry.getFieldBinding(StandardField.ISBN),
-                (url, doi, uri, eprint, isbn) -> {
-                    Map<Field, String> identifiers = new HashMap<>();
-                    url.ifPresent(value -> identifiers.put(StandardField.URL, value));
-                    doi.ifPresent(value -> identifiers.put(StandardField.DOI, value));
-                    uri.ifPresent(value -> identifiers.put(StandardField.URI, value));
-                    eprint.ifPresent(value -> identifiers.put(StandardField.EPRINT, value));
-                    isbn.ifPresent(value -> identifiers.put(StandardField.ISBN, value));
-                    return identifiers;
-                });
+            entry.getFieldBinding(StandardField.URL),
+            entry.getFieldBinding(StandardField.DOI),
+            entry.getFieldBinding(StandardField.URI),
+            entry.getFieldBinding(StandardField.EPRINT),
+            entry.getFieldBinding(StandardField.ISBN),
+            (url, doi, uri, eprint, isbn) -> {
+                Map<Field, String> identifiers = new HashMap<>();
+                url.ifPresent(value -> identifiers.put(StandardField.URL, value)
+                );
+                doi.ifPresent(value -> identifiers.put(StandardField.DOI, value)
+                );
+                uri.ifPresent(value -> identifiers.put(StandardField.URI, value)
+                );
+                eprint.ifPresent(value ->
+                    identifiers.put(StandardField.EPRINT, value)
+                );
+                isbn.ifPresent(value ->
+                    identifiers.put(StandardField.ISBN, value)
+                );
+                return identifiers;
+            }
+        );
     }
 
     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(),
+    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())));
+                    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) {
@@ -104,23 +145,51 @@ public ObservableValue<List<AbstractGroup>> getMatchedGroups() {
         return matchedGroups;
     }
 
-    public ObservableValue<Optional<SpecialFieldValueViewModel>> getSpecialField(SpecialField field) {
-        OptionalBinding<SpecialFieldValueViewModel> value = specialFieldValues.get(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)) {
+            } 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));
+                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;
@@ -132,17 +201,26 @@ public ObservableValue<String> getFields(OrFields fields) {
             return value;
         }
 
-        ArrayList<Observable> observables = new ArrayList<>(List.of(entry.getObservables()));
+        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 bibDatabaseContextProperty() {
-        return new ReadOnlyStringWrapper(bibDatabaseContext.getDatabasePath().map(Path::toString).orElse(""));
+        return new ReadOnlyStringWrapper(
+            bibDatabaseContext.getDatabasePath().map(Path::toString).orElse("")
+        );
     }
 }
diff --git a/src/main/java/org/jabref/gui/maintable/CellFactory.java b/src/main/java/org/jabref/gui/maintable/CellFactory.java
index e3309e94c1d..9f200ed0fe7 100644
--- a/src/main/java/org/jabref/gui/maintable/CellFactory.java
+++ b/src/main/java/org/jabref/gui/maintable/CellFactory.java
@@ -2,11 +2,8 @@
 
 import java.util.HashMap;
 import java.util.Map;
-
-import javax.swing.undo.UndoManager;
-
 import javafx.scene.Node;
-
+import javax.swing.undo.UndoManager;
 import org.jabref.gui.externalfiletype.ExternalFileType;
 import org.jabref.gui.icon.IconTheme;
 import org.jabref.gui.icon.JabRefIcon;
@@ -21,7 +18,10 @@ public class CellFactory {
 
     private final Map<Field, JabRefIcon> TABLE_ICONS = new HashMap<>();
 
-    public CellFactory(PreferencesService preferencesService, UndoManager undoManager) {
+    public CellFactory(
+        PreferencesService preferencesService,
+        UndoManager undoManager
+    ) {
         JabRefIcon icon;
         icon = IconTheme.JabRefIcons.PDF_FILE;
         // icon.setToo(Localization.lang("Open") + " PDF");
@@ -55,42 +55,68 @@ public CellFactory(PreferencesService preferencesService, UndoManager undoManage
         // icon.setToolTipText(Localization.lang("Open file"));
         TABLE_ICONS.put(StandardField.FILE, icon);
 
-        for (ExternalFileType fileType : preferencesService.getFilePreferences().getExternalFileTypes()) {
+        for (ExternalFileType fileType : preferencesService
+            .getFilePreferences()
+            .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, preferencesService, undoManager);
+        SpecialFieldViewModel relevanceViewModel = new SpecialFieldViewModel(
+            SpecialField.RELEVANCE,
+            preferencesService,
+            undoManager
+        );
         icon = relevanceViewModel.getIcon();
         // icon.setToolTipText(relevanceViewModel.getLocalization());
         TABLE_ICONS.put(SpecialField.RELEVANCE, icon);
 
-        SpecialFieldViewModel qualityViewModel = new SpecialFieldViewModel(SpecialField.QUALITY, preferencesService, undoManager);
+        SpecialFieldViewModel qualityViewModel = new SpecialFieldViewModel(
+            SpecialField.QUALITY,
+            preferencesService,
+            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, preferencesService, undoManager);
+        SpecialFieldViewModel rankViewModel = new SpecialFieldViewModel(
+            SpecialField.RANKING,
+            preferencesService,
+            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, preferencesService, undoManager);
+        SpecialFieldViewModel priorityViewModel = new SpecialFieldViewModel(
+            SpecialField.PRIORITY,
+            preferencesService,
+            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, preferencesService, undoManager);
+        SpecialFieldViewModel readViewModel = new SpecialFieldViewModel(
+            SpecialField.READ_STATUS,
+            preferencesService,
+            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, preferencesService, undoManager);
+        SpecialFieldViewModel printedViewModel = new SpecialFieldViewModel(
+            SpecialField.PRINTED,
+            preferencesService,
+            undoManager
+        );
         icon = printedViewModel.getIcon();
         // icon.setToolTipText(printedViewModel.getLocalization());
         TABLE_ICONS.put(SpecialField.PRINTED, icon);
diff --git a/src/main/java/org/jabref/gui/maintable/ColumnPreferences.java b/src/main/java/org/jabref/gui/maintable/ColumnPreferences.java
index ca000f2ce28..83bf000327e 100644
--- a/src/main/java/org/jabref/gui/maintable/ColumnPreferences.java
+++ b/src/main/java/org/jabref/gui/maintable/ColumnPreferences.java
@@ -1,7 +1,6 @@
 package org.jabref.gui.maintable;
 
 import java.util.List;
-
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableList;
 
@@ -13,10 +12,13 @@ public class ColumnPreferences {
     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);
+        this.columnSortOrder =
+            FXCollections.observableArrayList(columnSortOrder);
     }
 
     public ObservableList<MainTableColumnModel> getColumns() {
diff --git a/src/main/java/org/jabref/gui/maintable/MainTable.java b/src/main/java/org/jabref/gui/maintable/MainTable.java
index 7c4e2b2e329..a612623be0f 100644
--- a/src/main/java/org/jabref/gui/maintable/MainTable.java
+++ b/src/main/java/org/jabref/gui/maintable/MainTable.java
@@ -1,5 +1,6 @@
 package org.jabref.gui.maintable;
 
+import com.google.common.eventbus.Subscribe;
 import java.io.File;
 import java.io.IOException;
 import java.nio.file.Path;
@@ -7,9 +8,6 @@
 import java.util.Objects;
 import java.util.Optional;
 import java.util.stream.Collectors;
-
-import javax.swing.undo.UndoManager;
-
 import javafx.collections.ListChangeListener;
 import javafx.scene.control.SelectionMode;
 import javafx.scene.control.TableColumn;
@@ -23,7 +21,7 @@
 import javafx.scene.input.MouseDragEvent;
 import javafx.scene.input.MouseEvent;
 import javafx.scene.input.TransferMode;
-
+import javax.swing.undo.UndoManager;
 import org.jabref.gui.ClipBoardManager;
 import org.jabref.gui.DialogService;
 import org.jabref.gui.DragAndDropDataFormats;
@@ -52,14 +50,14 @@
 import org.jabref.model.entry.BibEntryTypesManager;
 import org.jabref.model.util.FileUpdateMonitor;
 import org.jabref.preferences.PreferencesService;
-
-import com.google.common.eventbus.Subscribe;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 public class MainTable extends TableView<BibEntryTableViewModel> {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(MainTable.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(
+        MainTable.class
+    );
 
     private final LibraryTab libraryTab;
     private final DialogService dialogService;
@@ -75,19 +73,20 @@ public class MainTable extends TableView<BibEntryTableViewModel> {
     private long lastKeyPressTime;
     private String columnSearchTerm;
 
-    public MainTable(MainTableDataModel model,
-                     LibraryTab libraryTab,
-                     BibDatabaseContext database,
-                     PreferencesService preferencesService,
-                     DialogService dialogService,
-                     StateManager stateManager,
-                     KeyBindingRepository keyBindingRepository,
-                     ClipBoardManager clipBoardManager,
-                     BibEntryTypesManager entryTypesManager,
-                     TaskExecutor taskExecutor,
-                     FileUpdateMonitor fileUpdateMonitor) {
+    public MainTable(
+        MainTableDataModel model,
+        LibraryTab libraryTab,
+        BibDatabaseContext database,
+        PreferencesService preferencesService,
+        DialogService dialogService,
+        StateManager stateManager,
+        KeyBindingRepository keyBindingRepository,
+        ClipBoardManager clipBoardManager,
+        BibEntryTypesManager entryTypesManager,
+        TaskExecutor taskExecutor,
+        FileUpdateMonitor fileUpdateMonitor
+    ) {
         super();
-
         this.libraryTab = libraryTab;
         this.dialogService = dialogService;
         this.stateManager = stateManager;
@@ -97,69 +96,85 @@ public MainTable(MainTableDataModel model,
         this.entryTypesManager = entryTypesManager;
         this.taskExecutor = taskExecutor;
         UndoManager undoManager = libraryTab.getUndoManager();
-        MainTablePreferences mainTablePreferences = preferencesService.getMainTablePreferences();
+        MainTablePreferences mainTablePreferences =
+            preferencesService.getMainTablePreferences();
 
-        importHandler = new ImportHandler(
+        importHandler =
+            new ImportHandler(
                 database,
                 preferencesService,
                 fileUpdateMonitor,
                 undoManager,
                 stateManager,
                 dialogService,
-                taskExecutor);
+                taskExecutor
+            );
 
         localDragboard = stateManager.getLocalDragboard();
 
         this.setOnDragOver(this::handleOnDragOverTableView);
         this.setOnDragDropped(this::handleOnDragDroppedTableView);
 
-        this.getColumns().addAll(
+        this.getColumns()
+            .addAll(
                 new MainTableColumnFactory(
-                        database,
-                        preferencesService,
-                        preferencesService.getMainTableColumnPreferences(),
-                        libraryTab.getUndoManager(),
-                        dialogService,
-                        stateManager,
-                        taskExecutor).createColumns());
+                    database,
+                    preferencesService,
+                    preferencesService.getMainTableColumnPreferences(),
+                    libraryTab.getUndoManager(),
+                    dialogService,
+                    stateManager,
+                    taskExecutor
+                )
+                    .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,
-                        preferencesService,
-                        undoManager,
-                        clipBoardManager,
-                        taskExecutor,
-                        Globals.journalAbbreviationRepository,
-                        entryTypesManager))
-                .setOnDragDetected(this::handleOnDragDetected)
-                .setOnDragDropped(this::handleOnDragDropped)
-                .setOnDragOver(this::handleOnDragOver)
-                .setOnDragExited(this::handleOnDragExited)
-                .setOnMouseDragEntered(this::handleOnDragEntered)
-                .install(this);
+            .withOnMouseClickedEvent((entry, event) -> {
+                if (event.getClickCount() == 2) {
+                    libraryTab.showAndEdit(entry.getEntry());
+                }
+            })
+            .withContextMenu(entry ->
+                RightClickMenu.create(
+                    entry,
+                    keyBindingRepository,
+                    libraryTab,
+                    dialogService,
+                    stateManager,
+                    preferencesService,
+                    undoManager,
+                    clipBoardManager,
+                    taskExecutor,
+                    Globals.journalAbbreviationRepository,
+                    entryTypesManager
+                )
+            )
+            .setOnDragDetected(this::handleOnDragDetected)
+            .setOnDragDropped(this::handleOnDragDropped)
+            .setOnDragOver(this::handleOnDragOver)
+            .setOnDragExited(this::handleOnDragExited)
+            .setOnMouseDragEntered(this::handleOnDragEntered)
+            .install(this);
 
         this.getSortOrder().clear();
 
-        mainTablePreferences.getColumnPreferences().getColumnSortOrder().forEach(columnModel ->
-                this.getColumns().stream()
+        mainTablePreferences
+            .getColumnPreferences()
+            .getColumnSortOrder()
+            .forEach(columnModel ->
+                this.getColumns()
+                    .stream()
                     .map(column -> (MainTableColumn<?>) column)
                     .filter(column -> column.getModel().equals(columnModel))
                     .findFirst()
                     .ifPresent(column -> {
                         LOGGER.debug("Adding sort order for col {} ", column);
                         this.getSortOrder().add(column);
-                    }));
+                    })
+            );
 
         if (mainTablePreferences.getResizeColumnsToFit()) {
             this.setColumnResizePolicy(new SmartConstrainedResizePolicy());
@@ -170,32 +185,42 @@ public MainTable(MainTableDataModel model,
         this.setItems(model.getEntriesFilteredAndSorted());
 
         // Enable sorting
-        model.getEntriesFilteredAndSorted().comparatorProperty().bind(this.comparatorProperty());
+        model
+            .getEntriesFilteredAndSorted()
+            .comparatorProperty()
+            .bind(this.comparatorProperty());
 
-        this.getStylesheets().add(MainTable.class.getResource("MainTable.css").toExternalForm());
+        this.getStylesheets()
+            .add(MainTable.class.getResource("MainTable.css").toExternalForm());
 
         // Store visual state
-        new PersistenceVisualStateTable(this, mainTablePreferences.getColumnPreferences()).addListeners();
+        new PersistenceVisualStateTable(
+            this,
+            mainTablePreferences.getColumnPreferences()
+        )
+            .addListeners();
 
         setupKeyBindings(keyBindingRepository);
 
         this.setOnKeyTyped(key -> {
-            if (this.getSortOrder().isEmpty()) {
-                return;
-            }
-            this.jumpToSearchKey(getSortOrder().get(0), key);
-        });
+                if (this.getSortOrder().isEmpty()) {
+                    return;
+                }
+                this.jumpToSearchKey(getSortOrder().get(0), key);
+            });
 
         database.getDatabase().registerListener(this);
 
-        MainTableColumnFactory rightClickMenuFactory = new MainTableColumnFactory(
+        MainTableColumnFactory rightClickMenuFactory =
+            new MainTableColumnFactory(
                 database,
                 preferencesService,
                 preferencesService.getMainTableColumnPreferences(),
                 libraryTab.getUndoManager(),
                 dialogService,
                 stateManager,
-                taskExecutor);
+                taskExecutor
+            );
 
         // Enable the header right-click menu.
         new MainTableHeaderContextMenu(this, rightClickMenuFactory).show(true);
@@ -207,7 +232,10 @@ 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) {
+    private void jumpToSearchKey(
+        TableColumn<BibEntryTableViewModel, ?> sortedColumn,
+        KeyEvent keyEvent
+    ) {
         if ((keyEvent.getCharacter() == null) || (sortedColumn == null)) {
             return;
         }
@@ -220,12 +248,18 @@ 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))
+        this.getItems()
+            .stream()
+            .filter(item ->
+                Optional
+                    .ofNullable(
+                        sortedColumn.getCellObservableValue(item).getValue()
+                    )
+                    .map(Object::toString)
+                    .orElse("")
+                    .toLowerCase()
+                    .startsWith(columnSearchTerm)
+            )
             .findFirst()
             .ifPresent(item -> {
                 this.scrollTo(item);
@@ -235,15 +269,18 @@ private void jumpToSearchKey(TableColumn<BibEntryTableViewModel, ?> sortedColumn
 
     @Subscribe
     public void listen(EntriesAddedEvent event) {
-        DefaultTaskExecutor.runInJavaFXThread(() -> clearAndSelect(event.getFirstEntry()));
+        DefaultTaskExecutor.runInJavaFXThread(() ->
+            clearAndSelect(event.getFirstEntry())
+        );
     }
 
     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);
+            });
     }
 
     public void copy() {
@@ -252,9 +289,17 @@ public void copy() {
         if (!selectedEntries.isEmpty()) {
             try {
                 clipBoardManager.setContent(selectedEntries, entryTypesManager);
-                dialogService.notify(libraryTab.formatOutputMessage(Localization.lang("Copied"), selectedEntries.size()));
+                dialogService.notify(
+                    libraryTab.formatOutputMessage(
+                        Localization.lang("Copied"),
+                        selectedEntries.size()
+                    )
+                );
             } catch (IOException e) {
-                LOGGER.error("Error while copying selected entries to clipboard", e);
+                LOGGER.error(
+                    "Error while copying selected entries to clipboard",
+                    e
+                );
             }
         }
     }
@@ -265,52 +310,73 @@ public void cut() {
     }
 
     private void setupKeyBindings(KeyBindingRepository keyBindings) {
-        EditAction pasteAction = new EditAction(StandardActions.PASTE, libraryTab.frame(), stateManager);
-        EditAction copyAction = new EditAction(StandardActions.COPY, libraryTab.frame(), stateManager);
-        EditAction cutAction = new EditAction(StandardActions.CUT, libraryTab.frame(), stateManager);
-        EditAction deleteAction = new EditAction(StandardActions.DELETE_ENTRY, libraryTab.frame(), stateManager);
-
-        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.frame(),
+            stateManager
+        );
+        EditAction copyAction = new EditAction(
+            StandardActions.COPY,
+            libraryTab.frame(),
+            stateManager
+        );
+        EditAction cutAction = new EditAction(
+            StandardActions.CUT,
+            libraryTab.frame(),
+            stateManager
+        );
+        EditAction deleteAction = new EditAction(
+            StandardActions.DELETE_ENTRY,
+            libraryTab.frame(),
+            stateManager
+        );
+
+        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;
-                    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;
+                            default:
+                            // Pass other keys to parent
+                        }
+                    }
                 }
-            }
-        });
+            );
     }
 
     public void clearAndSelectFirst() {
@@ -345,9 +411,15 @@ private List<BibEntry> handleNonBibTeXStringData(String data) {
             return this.importHandler.handleStringData(data);
         } 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);
             }
@@ -357,11 +429,18 @@ private List<BibEntry> handleNonBibTeXStringData(String data) {
 
     public void dropEntry(List<BibEntry> entriesToAdd) {
         for (BibEntry entry : entriesToAdd) {
-            importHandler.importEntryWithDuplicateCheck(database, (BibEntry) entry.clone());
+            importHandler.importEntryWithDuplicateCheck(
+                database,
+                (BibEntry) entry.clone()
+            );
         }
     }
 
-    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);
@@ -376,24 +455,42 @@ private void handleOnDragOverTableView(DragEvent event) {
         event.consume();
     }
 
-    private void handleOnDragEntered(TableRow<BibEntryTableViewModel> row, BibEntryTableViewModel entry, MouseDragEvent event) {
+    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());
 
         // The following is necessary to initiate the drag and drop in JavaFX,
         // although we don't need the contents, it does not work without
@@ -410,32 +507,57 @@ 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).executeWith(taskExecutor);
+                case TOP, BOTTOM -> importHandler
+                    .importFilesInBackground(files)
+                    .executeWith(taskExecutor);
                 case CENTER -> {
                     BibEntry entry = target.getEntry();
                     switch (event.getTransferMode()) {
                         case LINK -> {
                             LOGGER.debug("Mode LINK"); // shift on win or no modifier
-                            importHandler.getLinker().addFilesToEntry(entry, files);
+                            importHandler
+                                .getLinker()
+                                .addFilesToEntry(entry, files);
                         }
                         case MOVE -> {
                             LOGGER.debug("Mode MOVE"); // alt on win
-                            importHandler.getLinker().moveFilesToFileDirRenameAndAddToEntry(entry, files, libraryTab.getIndexingTaskManager());
+                            importHandler
+                                .getLinker()
+                                .moveFilesToFileDirRenameAndAddToEntry(
+                                    entry,
+                                    files,
+                                    libraryTab.getIndexingTaskManager()
+                                );
                         }
                         case COPY -> {
                             LOGGER.debug("Mode Copy"); // ctrl on win
-                            importHandler.getLinker().copyFilesToFileDirAndAddToEntry(entry, files, libraryTab.getIndexingTaskManager());
+                            importHandler
+                                .getLinker()
+                                .copyFilesToFileDirAndAddToEntry(
+                                    entry,
+                                    files,
+                                    libraryTab.getIndexingTaskManager()
+                                );
                         }
                     }
                 }
@@ -452,8 +574,15 @@ private void handleOnDragDroppedTableView(DragEvent event) {
         boolean success = false;
 
         if (event.getDragboard().hasFiles()) {
-            List<Path> files = event.getDragboard().getFiles().stream().map(File::toPath).collect(Collectors.toList());
-            importHandler.importFilesInBackground(files).executeWith(taskExecutor);
+            List<Path> files = event
+                .getDragboard()
+                .getFiles()
+                .stream()
+                .map(File::toPath)
+                .collect(Collectors.toList());
+            importHandler
+                .importFilesInBackground(files)
+                .executeWith(taskExecutor);
 
             success = true;
         }
@@ -462,7 +591,9 @@ private void handleOnDragDroppedTableView(DragEvent event) {
         event.consume();
     }
 
-    public void addSelectionListener(ListChangeListener<? super BibEntryTableViewModel> listener) {
+    public void addSelectionListener(
+        ListChangeListener<? super BibEntryTableViewModel> listener
+    ) {
         getSelectionModel().getSelectedItems().addListener(listener);
     }
 
@@ -476,23 +607,27 @@ public BibEntry getEntryAt(int row) {
 
     public List<BibEntry> getSelectedEntries() {
         return getSelectionModel()
-                .getSelectedItems()
-                .stream()
-                .map(BibEntryTableViewModel::getEntry)
-                .collect(Collectors.toList());
+            .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();
     }
 
-    public static List<MainTableColumnModel> toColumnModels(List<TableColumn<BibEntryTableViewModel, ?>> columns) {
-        return columns.stream()
-                      .filter(col -> col instanceof MainTableColumn<?>)
-                      .map(column -> ((MainTableColumn<?>) column).getModel())
-                      .collect(Collectors.toList());
+    public static List<MainTableColumnModel> toColumnModels(
+        List<TableColumn<BibEntryTableViewModel, ?>> columns
+    ) {
+        return columns
+            .stream()
+            .filter(col -> col instanceof MainTableColumn<?>)
+            .map(column -> ((MainTableColumn<?>) column).getModel())
+            .collect(Collectors.toList());
     }
 }
diff --git a/src/main/java/org/jabref/gui/maintable/MainTableColumnFactory.java b/src/main/java/org/jabref/gui/maintable/MainTableColumnFactory.java
index fba775083a9..1f7eb42092c 100644
--- a/src/main/java/org/jabref/gui/maintable/MainTableColumnFactory.java
+++ b/src/main/java/org/jabref/gui/maintable/MainTableColumnFactory.java
@@ -6,9 +6,6 @@
 import java.util.Objects;
 import java.util.Optional;
 import java.util.stream.Collectors;
-
-import javax.swing.undo.UndoManager;
-
 import javafx.beans.property.ReadOnlyObjectWrapper;
 import javafx.geometry.Insets;
 import javafx.geometry.Pos;
@@ -20,7 +17,7 @@
 import javafx.scene.paint.Color;
 import javafx.scene.shape.Rectangle;
 import javafx.scene.text.Text;
-
+import javax.swing.undo.UndoManager;
 import org.jabref.gui.DialogService;
 import org.jabref.gui.StateManager;
 import org.jabref.gui.icon.IconTheme;
@@ -41,7 +38,6 @@
 import org.jabref.model.entry.field.SpecialField;
 import org.jabref.model.groups.AbstractGroup;
 import org.jabref.preferences.PreferencesService;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -49,7 +45,9 @@ public class MainTableColumnFactory {
 
     public static final String STYLE_ICON_COLUMN = "column-icon";
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(MainTableColumnFactory.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(
+        MainTableColumnFactory.class
+    );
 
     private final PreferencesService preferencesService;
     private final ColumnPreferences columnPreferences;
@@ -60,13 +58,15 @@ public class MainTableColumnFactory {
     private final TaskExecutor taskExecutor;
     private final StateManager stateManager;
 
-    public MainTableColumnFactory(BibDatabaseContext database,
-                                  PreferencesService preferencesService,
-                                  ColumnPreferences abstractColumnPrefs,
-                                  UndoManager undoManager,
-                                  DialogService dialogService,
-                                  StateManager stateManager,
-                                  TaskExecutor taskExecutor) {
+    public MainTableColumnFactory(
+        BibDatabaseContext database,
+        PreferencesService preferencesService,
+        ColumnPreferences abstractColumnPrefs,
+        UndoManager undoManager,
+        DialogService dialogService,
+        StateManager stateManager,
+        TaskExecutor taskExecutor
+    ) {
         this.database = Objects.requireNonNull(database);
         this.preferencesService = Objects.requireNonNull(preferencesService);
         this.columnPreferences = abstractColumnPrefs;
@@ -77,7 +77,9 @@ public MainTableColumnFactory(BibDatabaseContext database,
         this.stateManager = stateManager;
     }
 
-    public TableColumn<BibEntryTableViewModel, ?> createColumn(MainTableColumnModel column) {
+    public TableColumn<BibEntryTableViewModel, ?> createColumn(
+        MainTableColumnModel column
+    ) {
         TableColumn<BibEntryTableViewModel, ?> returnColumn = null;
         switch (column.getType()) {
             case INDEX:
@@ -102,11 +104,16 @@ public MainTableColumnFactory(BibDatabaseContext database,
                 break;
             case SPECIALFIELD:
                 if (!column.getQualifier().isBlank()) {
-                    Field field = FieldFactory.parseField(column.getQualifier());
+                    Field field = FieldFactory.parseField(
+                        column.getQualifier()
+                    );
                     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);
                     }
                 }
@@ -122,11 +129,14 @@ public MainTableColumnFactory(BibDatabaseContext database,
     }
 
     public List<TableColumn<BibEntryTableViewModel, ?>> createColumns() {
-        List<TableColumn<BibEntryTableViewModel, ?>> columns = new ArrayList<>();
+        List<TableColumn<BibEntryTableViewModel, ?>> columns =
+            new ArrayList<>();
 
-        columnPreferences.getColumns().forEach(column -> {
-            columns.add(createColumn(column));
-        });
+        columnPreferences
+            .getColumns()
+            .forEach(column -> {
+                columns.add(createColumn(column));
+            });
 
         return columns;
     }
@@ -140,18 +150,33 @@ public static void setExactWidth(TableColumn<?, ?> column, double width) {
     /**
      * Creates a column with a continous number
      */
-    private TableColumn<BibEntryTableViewModel, String> createIndexColumn(MainTableColumnModel columnModel) {
-        TableColumn<BibEntryTableViewModel, String> column = new MainTableColumn<>(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()));
+        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);
+            .withText(text -> text)
+            .install(column);
         column.setSortable(false);
         return column;
     }
@@ -159,27 +184,40 @@ 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);
-        Node headerGraphic = IconTheme.JabRefIcons.DEFAULT_GROUP_ICON.getGraphicNode();
-        Tooltip.install(headerGraphic, new Tooltip(Localization.lang("Group color")));
+    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);
         column.getStyleClass().add(STYLE_ICON_COLUMN);
         setExactWidth(column, ColumnPreferences.ICON_COLUMN_WIDTH);
         column.setResizable(false);
-        column.setCellValueFactory(cellData -> cellData.getValue().getMatchedGroups());
+        column.setCellValueFactory(cellData ->
+            cellData.getValue().getMatchedGroups()
+        );
         new ValueTableCellFactory<BibEntryTableViewModel, List<AbstractGroup>>()
-                .withGraphic(this::createGroupColorRegion)
-                .install(column);
+            .withGraphic(this::createGroupColorRegion)
+            .install(column);
         column.setStyle("-fx-padding: 0 0 0 0;");
         column.setSortable(true);
         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();
@@ -188,21 +226,31 @@ 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;
         }
@@ -212,52 +260,83 @@ private Node createGroupColorRegion(BibEntryTableViewModel entry, List<AbstractG
     /**
      * Creates a text column to display any standard field.
      */
-    private TableColumn<BibEntryTableViewModel, ?> createFieldColumn(MainTableColumnModel columnModel) {
+    private TableColumn<BibEntryTableViewModel, ?> createFieldColumn(
+        MainTableColumnModel columnModel
+    ) {
         return new FieldColumn(columnModel);
     }
 
     /**
      * 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, preferencesService, stateManager);
+    private TableColumn<
+        BibEntryTableViewModel,
+        Map<Field, String>
+    > createIdentifierColumn(MainTableColumnModel columnModel) {
+        return new LinkedIdentifierColumn(
+            columnModel,
+            cellFactory,
+            database,
+            dialogService,
+            preferencesService,
+            stateManager
+        );
     }
 
     /**
      * Creates a column that displays a {@link SpecialField}
      */
-    private TableColumn<BibEntryTableViewModel, Optional<SpecialFieldValueViewModel>> createSpecialFieldColumn(MainTableColumnModel columnModel) {
-        return new SpecialFieldColumn(columnModel, preferencesService, undoManager);
+    private TableColumn<
+        BibEntryTableViewModel,
+        Optional<SpecialFieldValueViewModel>
+    > createSpecialFieldColumn(MainTableColumnModel columnModel) {
+        return new SpecialFieldColumn(
+            columnModel,
+            preferencesService,
+            undoManager
+        );
     }
 
     /**
      * 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,
-                preferencesService,
-                taskExecutor);
+    private TableColumn<
+        BibEntryTableViewModel,
+        List<LinkedFile>
+    > createFilesColumn(MainTableColumnModel columnModel) {
+        return new FileColumn(
+            columnModel,
+            database,
+            dialogService,
+            preferencesService,
+            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,
-                database,
-                dialogService,
-                preferencesService,
-                columnModel.getQualifier(),
-                taskExecutor);
+    private TableColumn<
+        BibEntryTableViewModel,
+        List<LinkedFile>
+    > createExtraFileColumn(MainTableColumnModel columnModel) {
+        return new FileColumn(
+            columnModel,
+            database,
+            dialogService,
+            preferencesService,
+            columnModel.getQualifier(),
+            taskExecutor
+        );
     }
 
     /**
      * 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 77bcecaf7a1..89376a846cf 100644
--- a/src/main/java/org/jabref/gui/maintable/MainTableColumnModel.java
+++ b/src/main/java/org/jabref/gui/maintable/MainTableColumnModel.java
@@ -3,7 +3,6 @@
 import java.util.EnumSet;
 import java.util.List;
 import java.util.Objects;
-
 import javafx.beans.property.DoubleProperty;
 import javafx.beans.property.ObjectProperty;
 import javafx.beans.property.ReadOnlyStringWrapper;
@@ -12,12 +11,10 @@
 import javafx.beans.property.SimpleStringProperty;
 import javafx.beans.property.StringProperty;
 import javafx.scene.control.TableColumn;
-
 import org.jabref.gui.util.FieldsUtil;
 import org.jabref.logic.l10n.Localization;
 import org.jabref.model.entry.field.FieldFactory;
 import org.jabref.model.metadata.SaveOrder;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -29,7 +26,9 @@ public class MainTableColumnModel {
 
     public static final Character COLUMNS_QUALIFIER_DELIMITER = ':';
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(MainTableColumnModel.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(
+        MainTableColumnModel.class
+    );
 
     public enum Type {
         INDEX("index", Localization.lang("Index")),
@@ -41,7 +40,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, LINKED_IDENTIFIER);
+        public static final EnumSet<Type> ICON_COLUMNS = EnumSet.of(
+            EXTRAFILE,
+            FILES,
+            GROUPS,
+            LINKED_IDENTIFIER
+        );
 
         private final String name;
         private final String displayName;
@@ -75,10 +79,12 @@ public static Type fromString(String text) {
         }
     }
 
-    private final ObjectProperty<Type> typeProperty = new SimpleObjectProperty<>();
+    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<>();
 
     /**
      * This is used by the preferences dialog, to initialize available columns the user can add to the table.
@@ -119,7 +125,6 @@ public MainTableColumnModel(Type type) {
      */
     public MainTableColumnModel(Type type, String qualifier, double width) {
         this(type, qualifier);
-
         this.widthProperty.setValue(width);
     }
 
@@ -135,18 +140,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)) {
+        if (
+            (Type.ICON_COLUMNS.contains(typeProperty.getValue()) &&
+                qualifierProperty.getValue().isBlank()) ||
+            (typeProperty.getValue() == Type.INDEX)
+        ) {
             return typeProperty.getValue().getDisplayName();
         } else {
             // 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()));
+            return FieldsUtil.getNameWithType(
+                FieldFactory.parseField(qualifierProperty.getValue())
+            );
         }
     }
 
@@ -180,9 +194,12 @@ public ObjectProperty<TableColumn.SortType> sortTypeProperty() {
      */
     public List<SaveOrder.SortCriterion> getSortCriteria() {
         boolean descending = getSortType() == TableColumn.SortType.DESCENDING;
-        return FieldFactory.parseOrFields(getQualifier()).getFields().stream()
-                .map(field -> new SaveOrder.SortCriterion(field, descending))
-                .toList();
+        return FieldFactory
+            .parseOrFields(getQualifier())
+            .getFields()
+            .stream()
+            .map(field -> new SaveOrder.SortCriterion(field, descending))
+            .toList();
     }
 
     @Override
@@ -200,12 +217,18 @@ public boolean equals(Object o) {
         if (typeProperty.getValue() != that.typeProperty.getValue()) {
             return false;
         }
-        return Objects.equals(qualifierProperty.getValue(), that.qualifierProperty.getValue());
+        return Objects.equals(
+            qualifierProperty.getValue(),
+            that.qualifierProperty.getValue()
+        );
     }
 
     @Override
     public int hashCode() {
-        return Objects.hash(typeProperty.getValue(), qualifierProperty.getValue());
+        return Objects.hash(
+            typeProperty.getValue(),
+            qualifierProperty.getValue()
+        );
     }
 
     /**
@@ -216,14 +239,18 @@ public int hashCode() {
      */
     public static MainTableColumnModel parse(String rawColumnName) {
         Objects.requireNonNull(rawColumnName);
-        String[] splittedName = rawColumnName.split(COLUMNS_QUALIFIER_DELIMITER.toString());
+        String[] splittedName = rawColumnName.split(
+            COLUMNS_QUALIFIER_DELIMITER.toString()
+        );
 
         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
             } else {
diff --git a/src/main/java/org/jabref/gui/maintable/MainTableDataModel.java b/src/main/java/org/jabref/gui/maintable/MainTableDataModel.java
index bc91167bb88..8cdce920a8a 100644
--- a/src/main/java/org/jabref/gui/maintable/MainTableDataModel.java
+++ b/src/main/java/org/jabref/gui/maintable/MainTableDataModel.java
@@ -1,8 +1,8 @@
 package org.jabref.gui.maintable;
 
+import com.tobiasdiez.easybind.EasyBind;
 import java.util.List;
 import java.util.Optional;
-
 import javafx.beans.binding.Bindings;
 import javafx.beans.property.IntegerProperty;
 import javafx.beans.property.ObjectProperty;
@@ -11,7 +11,6 @@
 import javafx.collections.ObservableList;
 import javafx.collections.transformation.FilteredList;
 import javafx.collections.transformation.SortedList;
-
 import org.jabref.gui.StateManager;
 import org.jabref.gui.groups.GroupViewMode;
 import org.jabref.gui.groups.GroupsPreferences;
@@ -24,34 +23,60 @@
 import org.jabref.model.search.matchers.MatcherSets;
 import org.jabref.preferences.PreferencesService;
 
-import com.tobiasdiez.easybind.EasyBind;
-
 public class MainTableDataModel {
+
     private final FilteredList<BibEntryTableViewModel> entriesFiltered;
     private final SortedList<BibEntryTableViewModel> entriesFilteredAndSorted;
-    private final ObjectProperty<MainTableFieldValueFormatter> fieldValueFormatter;
+    private final ObjectProperty<
+        MainTableFieldValueFormatter
+    > fieldValueFormatter;
     private final GroupsPreferences groupsPreferences;
     private final NameDisplayPreferences nameDisplayPreferences;
     private final BibDatabaseContext bibDatabaseContext;
 
-    public MainTableDataModel(BibDatabaseContext context, PreferencesService preferencesService, StateManager stateManager) {
+    public MainTableDataModel(
+        BibDatabaseContext context,
+        PreferencesService preferencesService,
+        StateManager stateManager
+    ) {
         this.groupsPreferences = preferencesService.getGroupsPreferences();
-        this.nameDisplayPreferences = preferencesService.getNameDisplayPreferences();
+        this.nameDisplayPreferences =
+            preferencesService.getNameDisplayPreferences();
         this.bibDatabaseContext = context;
-        this.fieldValueFormatter = new SimpleObjectProperty<>(
-                new MainTableFieldValueFormatter(nameDisplayPreferences, bibDatabaseContext));
-
-        ObservableList<BibEntry> allEntries = BindingsHelper.forUI(context.getDatabase().getEntries());
-        ObservableList<BibEntryTableViewModel> entriesViewModel = EasyBind.mapBacked(allEntries, entry ->
-                new BibEntryTableViewModel(entry, bibDatabaseContext, fieldValueFormatter));
+        this.fieldValueFormatter =
+            new SimpleObjectProperty<>(
+                new MainTableFieldValueFormatter(
+                    nameDisplayPreferences,
+                    bibDatabaseContext
+                )
+            );
+
+        ObservableList<BibEntry> allEntries = BindingsHelper.forUI(
+            context.getDatabase().getEntries()
+        );
+        ObservableList<BibEntryTableViewModel> entriesViewModel =
+            EasyBind.mapBacked(
+                allEntries,
+                entry ->
+                    new BibEntryTableViewModel(
+                        entry,
+                        bibDatabaseContext,
+                        fieldValueFormatter
+                    )
+            );
 
         entriesFiltered = new FilteredList<>(entriesViewModel);
-        entriesFiltered.predicateProperty().bind(
-                EasyBind.combine(stateManager.activeGroupProperty(),
-                        stateManager.activeSearchQueryProperty(),
-                        groupsPreferences.groupViewModeProperty(),
-                        (groups, query, groupViewMode) -> entry -> isMatched(groups, query, entry))
-        );
+        entriesFiltered
+            .predicateProperty()
+            .bind(
+                EasyBind.combine(
+                    stateManager.activeGroupProperty(),
+                    stateManager.activeSearchQueryProperty(),
+                    groupsPreferences.groupViewModeProperty(),
+                    (groups, query, groupViewMode) ->
+                        entry -> isMatched(groups, query, entry)
+                )
+            );
 
         IntegerProperty resultSize = new SimpleIntegerProperty();
         resultSize.bind(Bindings.size(entriesFiltered));
@@ -60,31 +85,47 @@ public MainTableDataModel(BibDatabaseContext context, PreferencesService prefere
         entriesFilteredAndSorted = new SortedList<>(entriesFiltered);
     }
 
-    private boolean isMatched(ObservableList<GroupTreeNode> groups, Optional<SearchQuery> query, BibEntryTableViewModel entry) {
-        return isMatchedByGroup(groups, entry) && isMatchedBySearch(query, entry);
+    private boolean isMatched(
+        ObservableList<GroupTreeNode> groups,
+        Optional<SearchQuery> query,
+        BibEntryTableViewModel entry
+    ) {
+        return (
+            isMatchedByGroup(groups, entry) && isMatchedBySearch(query, entry)
+        );
     }
 
-    private boolean isMatchedBySearch(Optional<SearchQuery> query, BibEntryTableViewModel entry) {
-        return query.map(matcher -> matcher.isMatch(entry.getEntry()))
-                    .orElse(true);
+    private boolean isMatchedBySearch(
+        Optional<SearchQuery> query,
+        BibEntryTableViewModel entry
+    ) {
+        return query
+            .map(matcher -> matcher.isMatch(entry.getEntry()))
+            .orElse(true);
     }
 
-    private boolean isMatchedByGroup(ObservableList<GroupTreeNode> groups, BibEntryTableViewModel entry) {
+    private boolean isMatchedByGroup(
+        ObservableList<GroupTreeNode> groups,
+        BibEntryTableViewModel entry
+    ) {
         return createGroupMatcher(groups)
-                .map(matcher -> matcher.isMatch(entry.getEntry()))
-                .orElse(true);
+            .map(matcher -> matcher.isMatch(entry.getEntry()))
+            .orElse(true);
     }
 
-    private Optional<MatcherSet> createGroupMatcher(List<GroupTreeNode> selectedGroups) {
+    private Optional<MatcherSet> createGroupMatcher(
+        List<GroupTreeNode> selectedGroups
+    ) {
         if ((selectedGroups == null) || selectedGroups.isEmpty()) {
             // No selected group, show all entries
             return Optional.empty();
         }
 
         final MatcherSet searchRules = MatcherSets.build(
-                groupsPreferences.getGroupViewMode() == GroupViewMode.INTERSECTION
-                        ? MatcherSets.MatcherType.AND
-                        : MatcherSets.MatcherType.OR);
+            groupsPreferences.getGroupViewMode() == GroupViewMode.INTERSECTION
+                ? MatcherSets.MatcherType.AND
+                : MatcherSets.MatcherType.OR
+        );
 
         for (GroupTreeNode node : selectedGroups) {
             searchRules.addRule(node.getSearchMatcher());
@@ -97,6 +138,11 @@ public SortedList<BibEntryTableViewModel> getEntriesFilteredAndSorted() {
     }
 
     public void refresh() {
-        this.fieldValueFormatter.setValue(new MainTableFieldValueFormatter(nameDisplayPreferences, bibDatabaseContext));
+        this.fieldValueFormatter.setValue(
+                new MainTableFieldValueFormatter(
+                    nameDisplayPreferences,
+                    bibDatabaseContext
+                )
+            );
     }
 }
diff --git a/src/main/java/org/jabref/gui/maintable/MainTableFieldValueFormatter.java b/src/main/java/org/jabref/gui/maintable/MainTableFieldValueFormatter.java
index 33841527a34..fc65aef7465 100644
--- a/src/main/java/org/jabref/gui/maintable/MainTableFieldValueFormatter.java
+++ b/src/main/java/org/jabref/gui/maintable/MainTableFieldValueFormatter.java
@@ -1,7 +1,9 @@
 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 java.util.Optional;
 import org.jabref.model.database.BibDatabase;
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.entry.AuthorList;
@@ -10,15 +12,16 @@
 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;
-
 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();
@@ -32,16 +35,26 @@ public MainTableFieldValueFormatter(NameDisplayPreferences nameDisplayPreference
      * @param entry the BibEntry of {@link BibEntryTableViewModel}.
      * @return The formatted name field.
      */
-    public String formatFieldsValues(final OrFields fields, final BibEntry entry) {
+    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)) {
-                Optional<String> name = entry.getResolvedFieldOrAlias(field, bibDatabase);
+            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();
@@ -65,20 +78,28 @@ private String formatFieldWithAuthorValue(final String nameToFormat) {
 
         AuthorList authors = AuthorList.parse(nameToFormat);
 
-        if (((displayStyle == DisplayStyle.FIRSTNAME_LASTNAME)
-                || (displayStyle == DisplayStyle.LASTNAME_FIRSTNAME))
-                && (abbreviationStyle == AbbreviationStyle.LASTNAME_ONLY)) {
+        if (
+            ((displayStyle == DisplayStyle.FIRSTNAME_LASTNAME) ||
+                (displayStyle == DisplayStyle.LASTNAME_FIRSTNAME)) &&
+            (abbreviationStyle == AbbreviationStyle.LASTNAME_ONLY)
+        ) {
             return authors.latexFree().getAsLastNames(false);
         }
 
         return switch (displayStyle) {
             default -> nameToFormat;
-            case FIRSTNAME_LASTNAME -> authors.latexFree().getAsFirstLastNames(
+            case FIRSTNAME_LASTNAME -> authors
+                .latexFree()
+                .getAsFirstLastNames(
                     abbreviationStyle == AbbreviationStyle.FULL,
-                    false);
-            case LASTNAME_FIRSTNAME -> authors.latexFree().getAsLastFirstNames(
+                    false
+                );
+            case LASTNAME_FIRSTNAME -> authors
+                .latexFree()
+                .getAsLastFirstNames(
                     abbreviationStyle == AbbreviationStyle.FULL,
-                    false);
+                    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 37b628ed5cd..1ba64926ccb 100644
--- a/src/main/java/org/jabref/gui/maintable/MainTableHeaderContextMenu.java
+++ b/src/main/java/org/jabref/gui/maintable/MainTableHeaderContextMenu.java
@@ -2,14 +2,12 @@
 
 import java.util.ArrayList;
 import java.util.List;
-
 import javafx.collections.ObservableList;
 import javafx.scene.control.ContextMenu;
 import javafx.scene.control.RadioMenuItem;
 import javafx.scene.control.SeparatorMenuItem;
 import javafx.scene.control.TableColumn;
 import javafx.scene.layout.StackPane;
-
 import org.jabref.gui.maintable.columns.MainTableColumn;
 
 public class MainTableHeaderContextMenu extends ContextMenu {
@@ -22,7 +20,10 @@ public class MainTableHeaderContextMenu extends ContextMenu {
      * Constructor for the right click menu
      *
      */
-    public MainTableHeaderContextMenu(MainTable mainTable, MainTableColumnFactory factory) {
+    public MainTableHeaderContextMenu(
+        MainTable mainTable,
+        MainTableColumnFactory factory
+    ) {
         super();
         this.mainTable = mainTable;
         this.factory = factory;
@@ -51,10 +52,14 @@ public void show(boolean show) {
     private void constructItems(MainTable mainTable) {
         // Reset the right-click menu
         this.getItems().clear();
-        List<TableColumn<BibEntryTableViewModel, ?>> commonColumns = commonColumns();
+        List<TableColumn<BibEntryTableViewModel, ?>> commonColumns =
+            commonColumns();
 
         // Populate the menu with currently used fields
-        for (TableColumn<BibEntryTableViewModel, ?> column : mainTable.getColumns()) {
+        for (TableColumn<
+            BibEntryTableViewModel,
+            ?
+        > column : mainTable.getColumns()) {
             // Append only if the column has not already been added (a common column)
             RightClickMenuItem itemToAdd = createMenuItem(column, true);
             this.getItems().add(itemToAdd);
@@ -62,7 +67,10 @@ private void constructItems(MainTable mainTable) {
             // 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())
+                );
             }
         }
 
@@ -71,7 +79,10 @@ private void constructItems(MainTable mainTable) {
 
         // Append to the menu the current remaining columns in the common columns.
 
-        for (TableColumn<BibEntryTableViewModel, ?> tableColumn : commonColumns) {
+        for (TableColumn<
+            BibEntryTableViewModel,
+            ?
+        > tableColumn : commonColumns) {
             RightClickMenuItem itemToAdd = createMenuItem(tableColumn, false);
             this.getItems().add(itemToAdd);
         }
@@ -82,7 +93,10 @@ private void constructItems(MainTable mainTable) {
      *
      */
     @SuppressWarnings("rawtypes")
-    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();
@@ -94,7 +108,8 @@ private RightClickMenuItem createMenuItem(TableColumn<BibEntryTableViewModel, ?>
      *
      */
     private int obtainIndexOfColumn(MainTableColumn searchColumn) {
-        ObservableList<TableColumn<BibEntryTableViewModel, ?>> columns = mainTable.getColumns();
+        ObservableList<TableColumn<BibEntryTableViewModel, ?>> columns =
+            mainTable.getColumns();
         for (int i = 0; i < columns.size(); i++) {
             TableColumn<BibEntryTableViewModel, ?> column = columns.get(i);
             MainTableColumnModel model = ((MainTableColumn) column).getModel();
@@ -122,7 +137,12 @@ private void addColumn(MainTableColumn tableColumn, int index) {
      */
     @SuppressWarnings("rawtypes")
     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())
+            );
     }
 
     /**
@@ -135,9 +155,11 @@ 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;
@@ -162,22 +184,72 @@ private boolean isColumnInList(MainTableColumn searchColumn, List<TableColumn<Bi
 
         // Create the MainTableColumn Models from qualifiers + types.
         List<MainTableColumnModel> commonColumns = new ArrayList<>();
-        commonColumns.add(new MainTableColumnModel(MainTableColumnModel.Type.GROUPS));
-        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.GROUPS)
+        );
+        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
+            )
+        );
 
         // Create the Table Columns from the models using factory methods.
-        List<TableColumn<BibEntryTableViewModel, ?>> commonTableColumns = new ArrayList<>();
-        for (MainTableColumnModel columnModel: commonColumns) {
-            TableColumn<BibEntryTableViewModel, ?> tableColumn = factory.createColumn(columnModel);
+        List<TableColumn<BibEntryTableViewModel, ?>> commonTableColumns =
+            new ArrayList<>();
+        for (MainTableColumnModel columnModel : commonColumns) {
+            TableColumn<BibEntryTableViewModel, ?> tableColumn =
+                factory.createColumn(columnModel);
             commonTableColumns.add(tableColumn);
         }
         return commonTableColumns;
@@ -188,10 +260,15 @@ private boolean isColumnInList(MainTableColumn searchColumn, List<TableColumn<Bi
      *
      */
     private class RightClickMenuItem extends RadioMenuItem {
+
         private int index;
         private boolean visibleInTable;
 
-        RightClickMenuItem(String displayName, MainTableColumn column, boolean isVisible) {
+        RightClickMenuItem(
+            String displayName,
+            MainTableColumn column,
+            boolean isVisible
+        ) {
             super(displayName);
             setVisibleInTable(isVisible);
             // Flag item as selected if the item is already in the main table.
@@ -201,15 +278,15 @@ private class RightClickMenuItem extends RadioMenuItem {
 
             // 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);
-            });
+                    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 f2f42a62503..82af334c708 100644
--- a/src/main/java/org/jabref/gui/maintable/MainTablePreferences.java
+++ b/src/main/java/org/jabref/gui/maintable/MainTablePreferences.java
@@ -4,13 +4,18 @@
 import javafx.beans.property.SimpleBooleanProperty;
 
 public class MainTablePreferences {
-    private final ColumnPreferences columnPreferences;
-    private final BooleanProperty resizeColumnsToFit = new SimpleBooleanProperty();
-    private final BooleanProperty extraFileColumnsEnabled = new SimpleBooleanProperty();
 
-    public MainTablePreferences(ColumnPreferences columnPreferences,
-                                boolean resizeColumnsToFit,
-                                boolean extraFileColumnsEnabled) {
+    private final ColumnPreferences columnPreferences;
+    private final BooleanProperty resizeColumnsToFit =
+        new SimpleBooleanProperty();
+    private final BooleanProperty extraFileColumnsEnabled =
+        new SimpleBooleanProperty();
+
+    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/NameDisplayPreferences.java b/src/main/java/org/jabref/gui/maintable/NameDisplayPreferences.java
index 8ffc1b2032f..29d505c4c25 100644
--- a/src/main/java/org/jabref/gui/maintable/NameDisplayPreferences.java
+++ b/src/main/java/org/jabref/gui/maintable/NameDisplayPreferences.java
@@ -6,18 +6,27 @@
 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<DisplayStyle> displayStyle =
+        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/OpenExternalFileAction.java b/src/main/java/org/jabref/gui/maintable/OpenExternalFileAction.java
index deece3ec936..0713174f05a 100644
--- a/src/main/java/org/jabref/gui/maintable/OpenExternalFileAction.java
+++ b/src/main/java/org/jabref/gui/maintable/OpenExternalFileAction.java
@@ -2,7 +2,6 @@
 
 import java.util.LinkedList;
 import java.util.List;
-
 import org.jabref.gui.DialogService;
 import org.jabref.gui.StateManager;
 import org.jabref.gui.actions.ActionHelper;
@@ -26,19 +25,30 @@ public class OpenExternalFileAction extends SimpleCommand {
     private final LinkedFile linkedFile;
     private final TaskExecutor taskExecutor;
 
-    public OpenExternalFileAction(DialogService dialogService,
-                                  StateManager stateManager,
-                                  PreferencesService preferencesService,
-                                  TaskExecutor taskExecutor) {
-        this(dialogService, stateManager, preferencesService, null, null, taskExecutor);
+    public OpenExternalFileAction(
+        DialogService dialogService,
+        StateManager stateManager,
+        PreferencesService preferencesService,
+        TaskExecutor taskExecutor
+    ) {
+        this(
+            dialogService,
+            stateManager,
+            preferencesService,
+            null,
+            null,
+            taskExecutor
+        );
     }
 
-    public OpenExternalFileAction(DialogService dialogService,
-                                  StateManager stateManager,
-                                  PreferencesService preferencesService,
-                                  BibEntry entry,
-                                  LinkedFile linkedFile,
-                                  TaskExecutor taskExecutor) {
+    public OpenExternalFileAction(
+        DialogService dialogService,
+        StateManager stateManager,
+        PreferencesService preferencesService,
+        BibEntry entry,
+        LinkedFile linkedFile,
+        TaskExecutor taskExecutor
+    ) {
         this.dialogService = dialogService;
         this.stateManager = stateManager;
         this.preferencesService = preferencesService;
@@ -47,9 +57,11 @@ 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 +74,65 @@ 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,
-                                preferencesService);
+                    for (BibEntry entry : selectedEntries) {
+                        for (LinkedFile linkedFile : entry.getFiles()) {
+                            linkedFileViewModel =
+                                new LinkedFileViewModel(
+                                    linkedFile,
+                                    entry,
+                                    databaseContext,
+                                    taskExecutor,
+                                    dialogService,
+                                    preferencesService
+                                );
 
-                        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,
-                        preferencesService);
-                linkedFileViewModel.open();
-            }
-        });
+                    linkedFileViewModelList.forEach(LinkedFileViewModel::open);
+                } else {
+                    LinkedFileViewModel linkedFileViewModel =
+                        new LinkedFileViewModel(
+                            linkedFile,
+                            entry,
+                            databaseContext,
+                            taskExecutor,
+                            dialogService,
+                            preferencesService
+                        );
+                    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 97e9063c76f..fce17337d25 100644
--- a/src/main/java/org/jabref/gui/maintable/OpenFolderAction.java
+++ b/src/main/java/org/jabref/gui/maintable/OpenFolderAction.java
@@ -20,19 +20,30 @@ public class OpenFolderAction extends SimpleCommand {
     private final LinkedFile linkedFile;
     private final TaskExecutor taskExecutor;
 
-    public OpenFolderAction(DialogService dialogService,
-                            StateManager stateManager,
-                            PreferencesService preferencesService,
-                            TaskExecutor taskExecutor) {
-        this(dialogService, stateManager, preferencesService, null, null, taskExecutor);
+    public OpenFolderAction(
+        DialogService dialogService,
+        StateManager stateManager,
+        PreferencesService preferencesService,
+        TaskExecutor taskExecutor
+    ) {
+        this(
+            dialogService,
+            stateManager,
+            preferencesService,
+            null,
+            null,
+            taskExecutor
+        );
     }
 
-    public OpenFolderAction(DialogService dialogService,
-                            StateManager stateManager,
-                            PreferencesService preferencesService,
-                            BibEntry entry,
-                            LinkedFile linkedFile,
-                            TaskExecutor taskExecutor) {
+    public OpenFolderAction(
+        DialogService dialogService,
+        StateManager stateManager,
+        PreferencesService preferencesService,
+        BibEntry entry,
+        LinkedFile linkedFile,
+        TaskExecutor taskExecutor
+    ) {
         this.dialogService = dialogService;
         this.stateManager = stateManager;
         this.preferencesService = preferencesService;
@@ -41,7 +52,12 @@ public OpenFolderAction(DialogService dialogService,
         this.taskExecutor = taskExecutor;
 
         if (this.linkedFile == null) {
-            this.executable.bind(ActionHelper.isFilePresentForSelectedEntry(stateManager, preferencesService));
+            this.executable.bind(
+                    ActionHelper.isFilePresentForSelectedEntry(
+                        stateManager,
+                        preferencesService
+                    )
+                );
         } else {
             this.setExecutable(true);
         }
@@ -49,26 +65,36 @@ public OpenFolderAction(DialogService dialogService,
 
     @Override
     public void execute() {
-            stateManager.getActiveDatabase().ifPresent(databaseContext -> {
+        stateManager
+            .getActiveDatabase()
+            .ifPresent(databaseContext -> {
                 if (entry == null) {
-                    stateManager.getSelectedEntries().stream().filter(entry -> !entry.getFiles().isEmpty()).forEach(entry -> {
-                        LinkedFileViewModel linkedFileViewModel = new LinkedFileViewModel(
-                                entry.getFiles().get(0),
-                                entry,
-                                databaseContext,
-                                taskExecutor,
-                                dialogService,
-                                preferencesService);
-                        linkedFileViewModel.openFolder();
-                    });
+                    stateManager
+                        .getSelectedEntries()
+                        .stream()
+                        .filter(entry -> !entry.getFiles().isEmpty())
+                        .forEach(entry -> {
+                            LinkedFileViewModel linkedFileViewModel =
+                                new LinkedFileViewModel(
+                                    entry.getFiles().get(0),
+                                    entry,
+                                    databaseContext,
+                                    taskExecutor,
+                                    dialogService,
+                                    preferencesService
+                                );
+                            linkedFileViewModel.openFolder();
+                        });
                 } else {
-                    LinkedFileViewModel linkedFileViewModel = new LinkedFileViewModel(
+                    LinkedFileViewModel linkedFileViewModel =
+                        new LinkedFileViewModel(
                             linkedFile,
                             entry,
                             databaseContext,
                             taskExecutor,
                             dialogService,
-                            preferencesService);
+                            preferencesService
+                        );
                     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 9848f509cf3..a4b9b6d5456 100644
--- a/src/main/java/org/jabref/gui/maintable/OpenUrlAction.java
+++ b/src/main/java/org/jabref/gui/maintable/OpenUrlAction.java
@@ -3,9 +3,7 @@
 import java.io.IOException;
 import java.util.List;
 import java.util.Optional;
-
 import javafx.beans.binding.BooleanExpression;
-
 import org.jabref.gui.DialogService;
 import org.jabref.gui.StateManager;
 import org.jabref.gui.actions.ActionHelper;
@@ -23,61 +21,100 @@ public class OpenUrlAction extends SimpleCommand {
     private final StateManager stateManager;
     private final PreferencesService preferences;
 
-    public OpenUrlAction(DialogService dialogService, StateManager stateManager, PreferencesService preferences) {
+    public OpenUrlAction(
+        DialogService dialogService,
+        StateManager stateManager,
+        PreferencesService 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);
-        this.executable.bind(ActionHelper.needsEntriesSelected(1, stateManager).and(fieldIsSet));
+        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.get(0);
+                BibEntry entry = entries.get(0);
 
-            // 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()) {
-                        JabRefDesktop.openCustomDoi(link.get(), preferences, dialogService);
-                    } else {
-                        JabRefDesktop.openExternalViewer(databaseContext, preferences, link.get(), field, dialogService, entry);
+                if (link.isPresent()) {
+                    try {
+                        if (
+                            field.equals(StandardField.DOI) &&
+                            preferences.getDOIPreferences().isUseCustom()
+                        ) {
+                            JabRefDesktop.openCustomDoi(
+                                link.get(),
+                                preferences,
+                                dialogService
+                            );
+                        } else {
+                            JabRefDesktop.openExternalViewer(
+                                databaseContext,
+                                preferences,
+                                link.get(),
+                                field,
+                                dialogService,
+                                entry
+                            );
+                        }
+                    } catch (IOException e) {
+                        dialogService.showErrorDialogAndWait(
+                            Localization.lang("Unable to open link."),
+                            e
+                        );
                     }
-                } 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 f47ead43426..3919c89b3fc 100644
--- a/src/main/java/org/jabref/gui/maintable/PersistenceVisualStateTable.java
+++ b/src/main/java/org/jabref/gui/maintable/PersistenceVisualStateTable.java
@@ -2,14 +2,11 @@
 
 import java.util.List;
 import java.util.stream.Collectors;
-
 import javafx.beans.InvalidationListener;
 import javafx.collections.ListChangeListener;
 import javafx.scene.control.TableColumn;
 import javafx.scene.control.TableView;
-
 import org.jabref.gui.maintable.columns.MainTableColumn;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -18,29 +15,44 @@
  */
 public class PersistenceVisualStateTable {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(PersistenceVisualStateTable.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(
+        PersistenceVisualStateTable.class
+    );
 
     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
+            .getColumns()
+            .addListener((InvalidationListener) obs -> updateColumns());
+        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,
         // 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());
-             });
+        table
+            .getColumns()
+            .stream()
+            .map(col -> ((MainTableColumn<?>) col).getModel())
+            .forEach(model -> {
+                model.widthProperty().addListener(obs -> updateColumns());
+                model.sortTypeProperty().addListener(obs -> updateColumns());
+            });
     }
 
     /**
@@ -65,10 +77,13 @@ private void updateSortOrder() {
         preferences.setColumnSortOrder(toList(table.getSortOrder()));
     }
 
-    private List<MainTableColumnModel> toList(List<TableColumn<BibEntryTableViewModel, ?>> columns) {
-        return columns.stream()
-                .filter(col -> col instanceof MainTableColumn<?>)
-                .map(column -> ((MainTableColumn<?>) column).getModel())
-                .collect(Collectors.toList());
+    private List<MainTableColumnModel> toList(
+        List<TableColumn<BibEntryTableViewModel, ?>> columns
+    ) {
+        return columns
+            .stream()
+            .filter(col -> col instanceof MainTableColumn<?>)
+            .map(column -> ((MainTableColumn<?>) column).getModel())
+            .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 42686574b3e..cb625c099f6 100644
--- a/src/main/java/org/jabref/gui/maintable/RightClickMenu.java
+++ b/src/main/java/org/jabref/gui/maintable/RightClickMenu.java
@@ -1,11 +1,9 @@
 package org.jabref.gui.maintable;
 
-import javax.swing.undo.UndoManager;
-
 import javafx.scene.control.ContextMenu;
 import javafx.scene.control.Menu;
 import javafx.scene.control.SeparatorMenuItem;
-
+import javax.swing.undo.UndoManager;
 import org.jabref.gui.ClipBoardManager;
 import org.jabref.gui.DialogService;
 import org.jabref.gui.LibraryTab;
@@ -36,107 +34,414 @@
 
 public class RightClickMenu {
 
-    public static ContextMenu create(BibEntryTableViewModel entry,
-                                     KeyBindingRepository keyBindingRepository,
-                                     LibraryTab libraryTab,
-                                     DialogService dialogService,
-                                     StateManager stateManager,
-                                     PreferencesService preferencesService,
-                                     UndoManager undoManager,
-                                     ClipBoardManager clipBoardManager,
-                                     TaskExecutor taskExecutor,
-                                     JournalAbbreviationRepository abbreviationRepository,
-                                     BibEntryTypesManager entryTypesManager) {
+    public static ContextMenu create(
+        BibEntryTableViewModel entry,
+        KeyBindingRepository keyBindingRepository,
+        LibraryTab libraryTab,
+        DialogService dialogService,
+        StateManager stateManager,
+        PreferencesService preferencesService,
+        UndoManager undoManager,
+        ClipBoardManager clipBoardManager,
+        TaskExecutor taskExecutor,
+        JournalAbbreviationRepository abbreviationRepository,
+        BibEntryTypesManager entryTypesManager
+    ) {
         ActionFactory factory = new ActionFactory(keyBindingRepository);
         ContextMenu contextMenu = new ContextMenu();
 
-        contextMenu.getItems().addAll(
-                factory.createMenuItem(StandardActions.COPY, new EditAction(StandardActions.COPY, libraryTab.frame(), stateManager)),
-                createCopySubMenu(factory, dialogService, stateManager, preferencesService, clipBoardManager, abbreviationRepository, taskExecutor),
-                factory.createMenuItem(StandardActions.PASTE, new EditAction(StandardActions.PASTE, libraryTab.frame(), stateManager)),
-                factory.createMenuItem(StandardActions.CUT, new EditAction(StandardActions.CUT, libraryTab.frame(), stateManager)),
-                factory.createMenuItem(StandardActions.MERGE_ENTRIES, new MergeEntriesAction(dialogService, stateManager, preferencesService)),
-                factory.createMenuItem(StandardActions.DELETE_ENTRY, new EditAction(StandardActions.DELETE_ENTRY, libraryTab.frame(), stateManager)),
-
+        contextMenu
+            .getItems()
+            .addAll(
+                factory.createMenuItem(
+                    StandardActions.COPY,
+                    new EditAction(
+                        StandardActions.COPY,
+                        libraryTab.frame(),
+                        stateManager
+                    )
+                ),
+                createCopySubMenu(
+                    factory,
+                    dialogService,
+                    stateManager,
+                    preferencesService,
+                    clipBoardManager,
+                    abbreviationRepository,
+                    taskExecutor
+                ),
+                factory.createMenuItem(
+                    StandardActions.PASTE,
+                    new EditAction(
+                        StandardActions.PASTE,
+                        libraryTab.frame(),
+                        stateManager
+                    )
+                ),
+                factory.createMenuItem(
+                    StandardActions.CUT,
+                    new EditAction(
+                        StandardActions.CUT,
+                        libraryTab.frame(),
+                        stateManager
+                    )
+                ),
+                factory.createMenuItem(
+                    StandardActions.MERGE_ENTRIES,
+                    new MergeEntriesAction(
+                        dialogService,
+                        stateManager,
+                        preferencesService
+                    )
+                ),
+                factory.createMenuItem(
+                    StandardActions.DELETE_ENTRY,
+                    new EditAction(
+                        StandardActions.DELETE_ENTRY,
+                        libraryTab.frame(),
+                        stateManager
+                    )
+                ),
                 new SeparatorMenuItem(),
-
-                createSendSubMenu(factory, dialogService, stateManager, preferencesService, entryTypesManager, taskExecutor),
-
-                SpecialFieldMenuItemFactory.createSpecialFieldMenu(SpecialField.RANKING, factory, libraryTab.frame(), dialogService, preferencesService, undoManager, stateManager),
-                SpecialFieldMenuItemFactory.getSpecialFieldSingleItem(SpecialField.RELEVANCE, factory, libraryTab.frame(), dialogService, preferencesService, undoManager, stateManager),
-                SpecialFieldMenuItemFactory.getSpecialFieldSingleItem(SpecialField.QUALITY, factory, libraryTab.frame(), dialogService, preferencesService, undoManager, stateManager),
-                SpecialFieldMenuItemFactory.getSpecialFieldSingleItem(SpecialField.PRINTED, factory, libraryTab.frame(), dialogService, preferencesService, undoManager, stateManager),
-                SpecialFieldMenuItemFactory.createSpecialFieldMenu(SpecialField.PRIORITY, factory, libraryTab.frame(), dialogService, preferencesService, undoManager, stateManager),
-                SpecialFieldMenuItemFactory.createSpecialFieldMenu(SpecialField.READ_STATUS, factory, libraryTab.frame(), dialogService, preferencesService, undoManager, stateManager),
-
+                createSendSubMenu(
+                    factory,
+                    dialogService,
+                    stateManager,
+                    preferencesService,
+                    entryTypesManager,
+                    taskExecutor
+                ),
+                SpecialFieldMenuItemFactory.createSpecialFieldMenu(
+                    SpecialField.RANKING,
+                    factory,
+                    libraryTab.frame(),
+                    dialogService,
+                    preferencesService,
+                    undoManager,
+                    stateManager
+                ),
+                SpecialFieldMenuItemFactory.getSpecialFieldSingleItem(
+                    SpecialField.RELEVANCE,
+                    factory,
+                    libraryTab.frame(),
+                    dialogService,
+                    preferencesService,
+                    undoManager,
+                    stateManager
+                ),
+                SpecialFieldMenuItemFactory.getSpecialFieldSingleItem(
+                    SpecialField.QUALITY,
+                    factory,
+                    libraryTab.frame(),
+                    dialogService,
+                    preferencesService,
+                    undoManager,
+                    stateManager
+                ),
+                SpecialFieldMenuItemFactory.getSpecialFieldSingleItem(
+                    SpecialField.PRINTED,
+                    factory,
+                    libraryTab.frame(),
+                    dialogService,
+                    preferencesService,
+                    undoManager,
+                    stateManager
+                ),
+                SpecialFieldMenuItemFactory.createSpecialFieldMenu(
+                    SpecialField.PRIORITY,
+                    factory,
+                    libraryTab.frame(),
+                    dialogService,
+                    preferencesService,
+                    undoManager,
+                    stateManager
+                ),
+                SpecialFieldMenuItemFactory.createSpecialFieldMenu(
+                    SpecialField.READ_STATUS,
+                    factory,
+                    libraryTab.frame(),
+                    dialogService,
+                    preferencesService,
+                    undoManager,
+                    stateManager
+                ),
                 new SeparatorMenuItem(),
-
-                factory.createMenuItem(StandardActions.ATTACH_FILE, new AttachFileAction(libraryTab, dialogService, stateManager, preferencesService.getFilePreferences())),
-                factory.createMenuItem(StandardActions.ATTACH_FILE_FROM_URL, new AttachFileFromURLAction(dialogService, stateManager, taskExecutor, preferencesService)),
-                factory.createMenuItem(StandardActions.OPEN_FOLDER, new OpenFolderAction(dialogService, stateManager, preferencesService, taskExecutor)),
-                factory.createMenuItem(StandardActions.OPEN_EXTERNAL_FILE, new OpenExternalFileAction(dialogService, stateManager, preferencesService, taskExecutor)),
-
-                factory.createMenuItem(StandardActions.OPEN_URL, new OpenUrlAction(dialogService, stateManager, preferencesService)),
-                factory.createMenuItem(StandardActions.SEARCH_SHORTSCIENCE, new SearchShortScienceAction(dialogService, stateManager, preferencesService)),
-
+                factory.createMenuItem(
+                    StandardActions.ATTACH_FILE,
+                    new AttachFileAction(
+                        libraryTab,
+                        dialogService,
+                        stateManager,
+                        preferencesService.getFilePreferences()
+                    )
+                ),
+                factory.createMenuItem(
+                    StandardActions.ATTACH_FILE_FROM_URL,
+                    new AttachFileFromURLAction(
+                        dialogService,
+                        stateManager,
+                        taskExecutor,
+                        preferencesService
+                    )
+                ),
+                factory.createMenuItem(
+                    StandardActions.OPEN_FOLDER,
+                    new OpenFolderAction(
+                        dialogService,
+                        stateManager,
+                        preferencesService,
+                        taskExecutor
+                    )
+                ),
+                factory.createMenuItem(
+                    StandardActions.OPEN_EXTERNAL_FILE,
+                    new OpenExternalFileAction(
+                        dialogService,
+                        stateManager,
+                        preferencesService,
+                        taskExecutor
+                    )
+                ),
+                factory.createMenuItem(
+                    StandardActions.OPEN_URL,
+                    new OpenUrlAction(
+                        dialogService,
+                        stateManager,
+                        preferencesService
+                    )
+                ),
+                factory.createMenuItem(
+                    StandardActions.SEARCH_SHORTSCIENCE,
+                    new SearchShortScienceAction(
+                        dialogService,
+                        stateManager,
+                        preferencesService
+                    )
+                ),
                 new SeparatorMenuItem(),
-
-                new ChangeEntryTypeMenu(libraryTab.getSelectedEntries(), libraryTab.getBibDatabaseContext(), undoManager, keyBindingRepository, entryTypesManager).asSubMenu(),
-                factory.createMenuItem(StandardActions.MERGE_WITH_FETCHED_ENTRY, new MergeWithFetchedEntryAction(dialogService, stateManager, taskExecutor, preferencesService, undoManager))
-        );
+                new ChangeEntryTypeMenu(
+                    libraryTab.getSelectedEntries(),
+                    libraryTab.getBibDatabaseContext(),
+                    undoManager,
+                    keyBindingRepository,
+                    entryTypesManager
+                )
+                    .asSubMenu(),
+                factory.createMenuItem(
+                    StandardActions.MERGE_WITH_FETCHED_ENTRY,
+                    new MergeWithFetchedEntryAction(
+                        dialogService,
+                        stateManager,
+                        taskExecutor,
+                        preferencesService,
+                        undoManager
+                    )
+                )
+            );
 
         return contextMenu;
     }
 
-    private static Menu createCopySubMenu(ActionFactory factory,
-                                          DialogService dialogService,
-                                          StateManager stateManager,
-                                          PreferencesService preferencesService,
-                                          ClipBoardManager clipBoardManager,
-                                          JournalAbbreviationRepository abbreviationRepository,
-                                          TaskExecutor taskExecutor) {
+    private static Menu createCopySubMenu(
+        ActionFactory factory,
+        DialogService dialogService,
+        StateManager stateManager,
+        PreferencesService preferencesService,
+        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, preferencesService, abbreviationRepository)),
-                factory.createMenuItem(StandardActions.COPY_KEY, new CopyMoreAction(StandardActions.COPY_KEY, dialogService, stateManager, clipBoardManager, preferencesService, abbreviationRepository)),
-                factory.createMenuItem(StandardActions.COPY_CITE_KEY, new CopyMoreAction(StandardActions.COPY_CITE_KEY, dialogService, stateManager, clipBoardManager, preferencesService, abbreviationRepository)),
-                factory.createMenuItem(StandardActions.COPY_KEY_AND_TITLE, new CopyMoreAction(StandardActions.COPY_KEY_AND_TITLE, dialogService, stateManager, clipBoardManager, preferencesService, abbreviationRepository)),
-                factory.createMenuItem(StandardActions.COPY_KEY_AND_LINK, new CopyMoreAction(StandardActions.COPY_KEY_AND_LINK, dialogService, stateManager, clipBoardManager, preferencesService, abbreviationRepository)),
-                factory.createMenuItem(StandardActions.COPY_DOI, new CopyMoreAction(StandardActions.COPY_DOI, dialogService, stateManager, clipBoardManager, preferencesService, abbreviationRepository)),
-                factory.createMenuItem(StandardActions.COPY_DOI_URL, new CopyMoreAction(StandardActions.COPY_DOI_URL, dialogService, stateManager, clipBoardManager, preferencesService, abbreviationRepository)),
+        copySpecialMenu
+            .getItems()
+            .addAll(
+                factory.createMenuItem(
+                    StandardActions.COPY_TITLE,
+                    new CopyMoreAction(
+                        StandardActions.COPY_TITLE,
+                        dialogService,
+                        stateManager,
+                        clipBoardManager,
+                        preferencesService,
+                        abbreviationRepository
+                    )
+                ),
+                factory.createMenuItem(
+                    StandardActions.COPY_KEY,
+                    new CopyMoreAction(
+                        StandardActions.COPY_KEY,
+                        dialogService,
+                        stateManager,
+                        clipBoardManager,
+                        preferencesService,
+                        abbreviationRepository
+                    )
+                ),
+                factory.createMenuItem(
+                    StandardActions.COPY_CITE_KEY,
+                    new CopyMoreAction(
+                        StandardActions.COPY_CITE_KEY,
+                        dialogService,
+                        stateManager,
+                        clipBoardManager,
+                        preferencesService,
+                        abbreviationRepository
+                    )
+                ),
+                factory.createMenuItem(
+                    StandardActions.COPY_KEY_AND_TITLE,
+                    new CopyMoreAction(
+                        StandardActions.COPY_KEY_AND_TITLE,
+                        dialogService,
+                        stateManager,
+                        clipBoardManager,
+                        preferencesService,
+                        abbreviationRepository
+                    )
+                ),
+                factory.createMenuItem(
+                    StandardActions.COPY_KEY_AND_LINK,
+                    new CopyMoreAction(
+                        StandardActions.COPY_KEY_AND_LINK,
+                        dialogService,
+                        stateManager,
+                        clipBoardManager,
+                        preferencesService,
+                        abbreviationRepository
+                    )
+                ),
+                factory.createMenuItem(
+                    StandardActions.COPY_DOI,
+                    new CopyMoreAction(
+                        StandardActions.COPY_DOI,
+                        dialogService,
+                        stateManager,
+                        clipBoardManager,
+                        preferencesService,
+                        abbreviationRepository
+                    )
+                ),
+                factory.createMenuItem(
+                    StandardActions.COPY_DOI_URL,
+                    new CopyMoreAction(
+                        StandardActions.COPY_DOI_URL,
+                        dialogService,
+                        stateManager,
+                        clipBoardManager,
+                        preferencesService,
+                        abbreviationRepository
+                    )
+                ),
                 new SeparatorMenuItem()
-        );
+            );
 
         // the submenu will behave dependent on what style is currently selected (citation/preview)
-        PreviewPreferences previewPreferences = preferencesService.getPreviewPreferences();
-        if (previewPreferences.getSelectedPreviewLayout() instanceof CitationStylePreviewLayout) {
-            copySpecialMenu.getItems().addAll(
-                    factory.createMenuItem(StandardActions.COPY_CITATION_HTML, new CopyCitationAction(CitationStyleOutputFormat.HTML, dialogService, stateManager, clipBoardManager, taskExecutor, preferencesService, abbreviationRepository)),
-                    factory.createMenuItem(StandardActions.COPY_CITATION_TEXT, new CopyCitationAction(CitationStyleOutputFormat.TEXT, dialogService, stateManager, clipBoardManager, taskExecutor, preferencesService, abbreviationRepository)));
+        PreviewPreferences previewPreferences =
+            preferencesService.getPreviewPreferences();
+        if (
+            previewPreferences.getSelectedPreviewLayout() instanceof
+            CitationStylePreviewLayout
+        ) {
+            copySpecialMenu
+                .getItems()
+                .addAll(
+                    factory.createMenuItem(
+                        StandardActions.COPY_CITATION_HTML,
+                        new CopyCitationAction(
+                            CitationStyleOutputFormat.HTML,
+                            dialogService,
+                            stateManager,
+                            clipBoardManager,
+                            taskExecutor,
+                            preferencesService,
+                            abbreviationRepository
+                        )
+                    ),
+                    factory.createMenuItem(
+                        StandardActions.COPY_CITATION_TEXT,
+                        new CopyCitationAction(
+                            CitationStyleOutputFormat.TEXT,
+                            dialogService,
+                            stateManager,
+                            clipBoardManager,
+                            taskExecutor,
+                            preferencesService,
+                            abbreviationRepository
+                        )
+                    )
+                );
         } else {
-            copySpecialMenu.getItems().add(factory.createMenuItem(StandardActions.COPY_CITATION_PREVIEW, new CopyCitationAction(CitationStyleOutputFormat.HTML, dialogService, stateManager, clipBoardManager, taskExecutor, preferencesService, abbreviationRepository)));
+            copySpecialMenu
+                .getItems()
+                .add(
+                    factory.createMenuItem(
+                        StandardActions.COPY_CITATION_PREVIEW,
+                        new CopyCitationAction(
+                            CitationStyleOutputFormat.HTML,
+                            dialogService,
+                            stateManager,
+                            clipBoardManager,
+                            taskExecutor,
+                            preferencesService,
+                            abbreviationRepository
+                        )
+                    )
+                );
         }
 
-        copySpecialMenu.getItems().addAll(
+        copySpecialMenu
+            .getItems()
+            .addAll(
                 new SeparatorMenuItem(),
-                factory.createMenuItem(StandardActions.EXPORT_TO_CLIPBOARD, new ExportToClipboardAction(dialogService, stateManager, clipBoardManager, taskExecutor, preferencesService)));
+                factory.createMenuItem(
+                    StandardActions.EXPORT_TO_CLIPBOARD,
+                    new ExportToClipboardAction(
+                        dialogService,
+                        stateManager,
+                        clipBoardManager,
+                        taskExecutor,
+                        preferencesService
+                    )
+                )
+            );
 
         return copySpecialMenu;
     }
 
-    private static Menu createSendSubMenu(ActionFactory factory,
-                                          DialogService dialogService,
-                                          StateManager stateManager,
-                                          PreferencesService preferencesService,
-                                          BibEntryTypesManager entryTypesManager,
-                                          TaskExecutor taskExecutor) {
+    private static Menu createSendSubMenu(
+        ActionFactory factory,
+        DialogService dialogService,
+        StateManager stateManager,
+        PreferencesService preferencesService,
+        BibEntryTypesManager entryTypesManager,
+        TaskExecutor taskExecutor
+    ) {
         Menu sendMenu = factory.createMenu(StandardActions.SEND);
-        sendMenu.getItems().addAll(
-                factory.createMenuItem(StandardActions.SEND_AS_EMAIL, new SendAsStandardEmailAction(dialogService, preferencesService, stateManager, entryTypesManager, taskExecutor)),
-                factory.createMenuItem(StandardActions.SEND_TO_KINDLE, new SendAsKindleEmailAction(dialogService, preferencesService, stateManager, taskExecutor)),
+        sendMenu
+            .getItems()
+            .addAll(
+                factory.createMenuItem(
+                    StandardActions.SEND_AS_EMAIL,
+                    new SendAsStandardEmailAction(
+                        dialogService,
+                        preferencesService,
+                        stateManager,
+                        entryTypesManager,
+                        taskExecutor
+                    )
+                ),
+                factory.createMenuItem(
+                    StandardActions.SEND_TO_KINDLE,
+                    new SendAsKindleEmailAction(
+                        dialogService,
+                        preferencesService,
+                        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 d94e49a0052..a515cb4e7bd 100644
--- a/src/main/java/org/jabref/gui/maintable/SearchShortScienceAction.java
+++ b/src/main/java/org/jabref/gui/maintable/SearchShortScienceAction.java
@@ -1,10 +1,11 @@
 package org.jabref.gui.maintable;
 
+import static org.jabref.gui.actions.ActionHelper.isFieldSetForSelectedEntry;
+import static org.jabref.gui.actions.ActionHelper.needsEntriesSelected;
+
 import java.io.IOException;
 import java.util.List;
-
 import javafx.beans.binding.BooleanExpression;
-
 import org.jabref.gui.DialogService;
 import org.jabref.gui.StateManager;
 import org.jabref.gui.actions.SimpleCommand;
@@ -15,39 +16,67 @@
 import org.jabref.model.entry.field.StandardField;
 import org.jabref.preferences.PreferencesService;
 
-import static org.jabref.gui.actions.ActionHelper.isFieldSetForSelectedEntry;
-import static org.jabref.gui.actions.ActionHelper.needsEntriesSelected;
-
 public class SearchShortScienceAction extends SimpleCommand {
+
     private final DialogService dialogService;
     private final StateManager stateManager;
     private final PreferencesService preferencesService;
 
-    public SearchShortScienceAction(DialogService dialogService, StateManager stateManager, PreferencesService preferencesService) {
+    public SearchShortScienceAction(
+        DialogService dialogService,
+        StateManager stateManager,
+        PreferencesService preferencesService
+    ) {
         this.dialogService = dialogService;
         this.stateManager = stateManager;
         this.preferencesService = preferencesService;
 
-        BooleanExpression fieldIsSet = isFieldSetForSelectedEntry(StandardField.TITLE, stateManager);
-        this.executable.bind(needsEntriesSelected(1, stateManager).and(fieldIsSet));
+        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.get(0)).ifPresent(url -> {
-                try {
-                    JabRefDesktop.openExternalViewer(databaseContext, preferencesService, url, StandardField.URL, dialogService, bibEntries.get(0));
-                } 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.get(0))
+                    .ifPresent(url -> {
+                        try {
+                            JabRefDesktop.openExternalViewer(
+                                databaseContext,
+                                preferencesService,
+                                url,
+                                StandardField.URL,
+                                dialogService,
+                                bibEntries.get(0)
+                            );
+                        } 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 4096455c765..8d3ce694853 100644
--- a/src/main/java/org/jabref/gui/maintable/SmartConstrainedResizePolicy.java
+++ b/src/main/java/org/jabref/gui/maintable/SmartConstrainedResizePolicy.java
@@ -4,12 +4,10 @@
 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;
 import javafx.util.Callback;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -18,9 +16,12 @@
  * We make sure that the width of all columns sums up to the total width of the table.
  * However, in contrast to {@link TableView#CONSTRAINED_RESIZE_POLICY} we size the columns initially by their preferred width.
  */
-public class SmartConstrainedResizePolicy implements Callback<TableView.ResizeFeatures, Boolean> {
+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) {
@@ -33,11 +34,18 @@ 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();
+        List<? extends TableColumnBase<?, ?>> visibleLeafColumns =
+            table.getVisibleLeafColumns();
+        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) {
@@ -64,33 +72,67 @@ 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);
         }
     }
 
     private Boolean constrainedResize(TableView.ResizeFeatures<?> prop) {
         TableView<?> table = prop.getTable();
-        List<? extends TableColumnBase<?, ?>> visibleLeafColumns = table.getVisibleLeafColumns();
-        return constrainedResize(prop,
-                false,
-                getContentWidth(table) - 2,
-                visibleLeafColumns);
+        List<? extends TableColumnBase<?, ?>> visibleLeafColumns =
+            table.getVisibleLeafColumns();
+        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;
         }
@@ -99,7 +141,8 @@ private Boolean constrainedResize(TableView.ResizeFeatures prop, Boolean isFirst
     private Double getContentWidth(TableView<?> table) {
         try {
             // TODO: reflective access, should be removed
-            Field privateStringField = TableView.class.getDeclaredField("contentWidth");
+            Field privateStringField =
+                TableView.class.getDeclaredField("contentWidth");
             privateStringField.setAccessible(true);
             return (Double) privateStringField.get(table);
         } catch (IllegalAccessException | NoSuchFieldException e) {
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 698e8e16895..88151eea4fa 100644
--- a/src/main/java/org/jabref/gui/maintable/columns/FieldColumn.java
+++ b/src/main/java/org/jabref/gui/maintable/columns/FieldColumn.java
@@ -1,7 +1,7 @@
 package org.jabref.gui.maintable.columns;
 
+import com.google.common.collect.MoreCollectors;
 import javafx.beans.value.ObservableValue;
-
 import org.jabref.gui.maintable.BibEntryTableViewModel;
 import org.jabref.gui.maintable.MainTableColumnModel;
 import org.jabref.gui.util.ValueTableCellFactory;
@@ -11,8 +11,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
  */
@@ -28,12 +26,15 @@ public FieldColumn(MainTableColumnModel model) {
         setCellValueFactory(param -> getFieldValue(param.getValue()));
 
         new ValueTableCellFactory<BibEntryTableViewModel, String>()
-                .withText(text -> text)
-                .install(this);
+            .withText(text -> text)
+            .install(this);
 
         if (fields.hasExactlyOne()) {
             // comparator can't parse more than one value
-            Field field = fields.getFields().stream().collect(MoreCollectors.onlyElement());
+            Field field = fields
+                .getFields()
+                .stream()
+                .collect(MoreCollectors.onlyElement());
 
             if ((field instanceof UnknownField) || field.isNumeric()) {
                 this.setComparator(new NumericFieldComparator());
@@ -53,7 +54,9 @@ public String getDisplayName() {
         return fields.getDisplayName();
     }
 
-    private ObservableValue<String> getFieldValue(BibEntryTableViewModel entry) {
+    private ObservableValue<String> getFieldValue(
+        BibEntryTableViewModel entry
+    ) {
         if (fields.isEmpty()) {
             return null;
         } else {
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 6dd1634c1a5..6a44ed3f986 100644
--- a/src/main/java/org/jabref/gui/maintable/columns/FileColumn.java
+++ b/src/main/java/org/jabref/gui/maintable/columns/FileColumn.java
@@ -3,13 +3,11 @@
 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;
 import javafx.scene.control.Tooltip;
 import javafx.scene.input.MouseButton;
-
 import org.jabref.gui.DialogService;
 import org.jabref.gui.externalfiletype.ExternalFileType;
 import org.jabref.gui.externalfiletype.ExternalFileTypes;
@@ -40,11 +38,13 @@ public class FileColumn extends MainTableColumn<List<LinkedFile>> {
     /**
      * Creates a joined column for all the linked files.
      */
-    public FileColumn(MainTableColumnModel model,
-                      BibDatabaseContext database,
-                      DialogService dialogService,
-                      PreferencesService preferencesService,
-                      TaskExecutor taskExecutor) {
+    public FileColumn(
+        MainTableColumnModel model,
+        BibDatabaseContext database,
+        DialogService dialogService,
+        PreferencesService preferencesService,
+        TaskExecutor taskExecutor
+    ) {
         super(model);
         this.database = Objects.requireNonNull(database);
         this.dialogService = dialogService;
@@ -54,37 +54,50 @@ public FileColumn(MainTableColumnModel model,
         setCommonSettings();
 
         Node headerGraphic = IconTheme.JabRefIcons.FILE.getGraphicNode();
-        Tooltip.install(headerGraphic, new Tooltip(Localization.lang("Linked files")));
+        Tooltip.install(
+            headerGraphic,
+            new Tooltip(Localization.lang("Linked files"))
+        );
         this.setGraphic(headerGraphic);
 
         new ValueTableCellFactory<BibEntryTableViewModel, List<LinkedFile>>()
-                .withGraphic(this::createFileIcon)
-                .withTooltip(this::createFileTooltip)
-                .withMenu(this::createFileMenu)
-                .withOnMouseClickedEvent((entry, linkedFiles) -> event -> {
-                    if ((event.getButton() == MouseButton.PRIMARY) && (linkedFiles.size() == 1)) {
+            .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.get(0),
+                        LinkedFileViewModel linkedFileViewModel =
+                            new LinkedFileViewModel(
+                                linkedFiles.get(0),
                                 entry.getEntry(),
                                 database,
                                 taskExecutor,
                                 dialogService,
-                                preferencesService);
+                                preferencesService
+                            );
                         linkedFileViewModel.open();
                     }
-                })
-                .install(this);
+                }
+            )
+            .install(this);
     }
 
     /**
      * Creates a column for all the linked files of a single file type.
      */
-    public FileColumn(MainTableColumnModel model,
-                      BibDatabaseContext database,
-                      DialogService dialogService,
-                      PreferencesService preferencesService,
-                      String fileType,
-                      TaskExecutor taskExecutor) {
+    public FileColumn(
+        MainTableColumnModel model,
+        BibDatabaseContext database,
+        DialogService dialogService,
+        PreferencesService preferencesService,
+        String fileType,
+        TaskExecutor taskExecutor
+    ) {
         super(model);
         this.database = Objects.requireNonNull(database);
         this.dialogService = dialogService;
@@ -93,31 +106,57 @@ public FileColumn(MainTableColumnModel model,
 
         setCommonSettings();
 
-        this.setGraphic(ExternalFileTypes.getExternalFileTypeByName(fileType, preferencesService.getFilePreferences())
-                                         .map(ExternalFileType::getIcon).orElse(IconTheme.JabRefIcons.FILE)
-                                         .getGraphicNode());
+        this.setGraphic(
+                ExternalFileTypes
+                    .getExternalFileTypeByName(
+                        fileType,
+                        preferencesService.getFilePreferences()
+                    )
+                    .map(ExternalFileType::getIcon)
+                    .orElse(IconTheme.JabRefIcons.FILE)
+                    .getGraphicNode()
+            );
 
         new ValueTableCellFactory<BibEntryTableViewModel, List<LinkedFile>>()
-                .withGraphic(linkedFiles -> createFileIcon(linkedFiles.stream().filter(linkedFile ->
-                                linkedFile.getFileType().equalsIgnoreCase(fileType)).collect(Collectors.toList())))
-                .install(this);
+            .withGraphic(linkedFiles ->
+                createFileIcon(
+                    linkedFiles
+                        .stream()
+                        .filter(linkedFile ->
+                            linkedFile.getFileType().equalsIgnoreCase(fileType)
+                        )
+                        .collect(Collectors.toList())
+                )
+            )
+            .install(this);
     }
 
     private void setCommonSettings() {
         this.setResizable(false);
-        MainTableColumnFactory.setExactWidth(this, ColumnPreferences.ICON_COLUMN_WIDTH);
+        MainTableColumnFactory.setExactWidth(
+            this,
+            ColumnPreferences.ICON_COLUMN_WIDTH
+        );
         this.getStyleClass().add(MainTableColumnFactory.STYLE_ICON_COLUMN);
-        this.setCellValueFactory(cellData -> cellData.getValue().getLinkedFiles());
+        this.setCellValueFactory(cellData ->
+                cellData.getValue().getLinkedFiles()
+            );
     }
 
     private String createFileTooltip(List<LinkedFile> linkedFiles) {
         if (!linkedFiles.isEmpty()) {
-            return Localization.lang("Open file %0", linkedFiles.get(0).getLink());
+            return Localization.lang(
+                "Open file %0",
+                linkedFiles.get(0).getLink()
+            );
         }
         return null;
     }
 
-    private ContextMenu createFileMenu(BibEntryTableViewModel entry, List<LinkedFile> linkedFiles) {
+    private ContextMenu createFileMenu(
+        BibEntryTableViewModel entry,
+        List<LinkedFile> linkedFiles
+    ) {
         if (linkedFiles.size() <= 1) {
             return null;
         }
@@ -125,15 +164,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,
-                    preferencesService);
-
-            MenuItem menuItem = new MenuItem(linkedFileViewModel.getTruncatedDescriptionAndLink(),
-                    linkedFileViewModel.getTypeIcon().getGraphicNode());
+            LinkedFileViewModel linkedFileViewModel = new LinkedFileViewModel(
+                linkedFile,
+                entry.getEntry(),
+                database,
+                taskExecutor,
+                dialogService,
+                preferencesService
+            );
+
+            MenuItem menuItem = new MenuItem(
+                linkedFileViewModel.getTruncatedDescriptionAndLink(),
+                linkedFileViewModel.getTypeIcon().getGraphicNode()
+            );
             menuItem.setOnAction(event -> linkedFileViewModel.open());
             contextMenu.getItems().add(menuItem);
         }
@@ -145,10 +188,15 @@ private Node createFileIcon(List<LinkedFile> linkedFiles) {
         if (linkedFiles.size() > 1) {
             return IconTheme.JabRefIcons.FILE_MULTIPLE.getGraphicNode();
         } else if (linkedFiles.size() == 1) {
-            return ExternalFileTypes.getExternalFileTypeByLinkedFile(linkedFiles.get(0), true, preferencesService.getFilePreferences())
-                                    .map(ExternalFileType::getIcon)
-                                    .orElse(IconTheme.JabRefIcons.FILE)
-                                    .getGraphicNode();
+            return ExternalFileTypes
+                .getExternalFileTypeByLinkedFile(
+                    linkedFiles.get(0),
+                    true,
+                    preferencesService.getFilePreferences()
+                )
+                .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 61e2e1ba154..652342c381b 100644
--- a/src/main/java/org/jabref/gui/maintable/columns/LibraryColumn.java
+++ b/src/main/java/org/jabref/gui/maintable/columns/LibraryColumn.java
@@ -11,11 +11,13 @@ public class LibraryColumn extends MainTableColumn<String> {
 
     public LibraryColumn(MainTableColumnModel model) {
         super(model);
-
         setText(Localization.lang("Library"));
-        new ValueTableCellFactory<BibEntryTableViewModel, String>().withText(FileUtil::getBaseName)
-                                                                   .install(this);
-        setCellValueFactory(param -> param.getValue().bibDatabaseContextProperty());
+        new ValueTableCellFactory<BibEntryTableViewModel, String>()
+            .withText(FileUtil::getBaseName)
+            .install(this);
+        setCellValueFactory(param ->
+            param.getValue().bibDatabaseContextProperty()
+        );
     }
 
     public LibraryColumn() {
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 bb307cf7eda..d8598b31ead 100644
--- a/src/main/java/org/jabref/gui/maintable/columns/LinkedIdentifierColumn.java
+++ b/src/main/java/org/jabref/gui/maintable/columns/LinkedIdentifierColumn.java
@@ -2,13 +2,11 @@
 
 import java.io.IOException;
 import java.util.Map;
-
 import javafx.scene.Node;
 import javafx.scene.control.ContextMenu;
 import javafx.scene.control.MenuItem;
 import javafx.scene.control.Tooltip;
 import javafx.scene.input.MouseButton;
-
 import org.jabref.gui.DialogService;
 import org.jabref.gui.StateManager;
 import org.jabref.gui.desktop.JabRefDesktop;
@@ -29,19 +27,22 @@
 /**
  * A clickable icons column for DOIs, URLs, URIs and EPrints.
  */
-public class LinkedIdentifierColumn extends MainTableColumn<Map<Field, String>> {
+public class LinkedIdentifierColumn
+    extends MainTableColumn<Map<Field, String>> {
 
     private final BibDatabaseContext database;
     private final CellFactory cellFactory;
     private final DialogService dialogService;
     private final PreferencesService preferences;
 
-    public LinkedIdentifierColumn(MainTableColumnModel model,
-                                  CellFactory cellFactory,
-                                  BibDatabaseContext database,
-                                  DialogService dialogService,
-                                  PreferencesService preferences,
-                                  StateManager stateManager) {
+    public LinkedIdentifierColumn(
+        MainTableColumnModel model,
+        CellFactory cellFactory,
+        BibDatabaseContext database,
+        DialogService dialogService,
+        PreferencesService preferences,
+        StateManager stateManager
+    ) {
         super(model);
         this.database = database;
         this.cellFactory = cellFactory;
@@ -49,23 +50,41 @@ public LinkedIdentifierColumn(MainTableColumnModel model,
         this.preferences = preferences;
 
         Node headerGraphic = IconTheme.JabRefIcons.WWW.getGraphicNode();
-        Tooltip.install(headerGraphic, new Tooltip(Localization.lang("Linked identifiers")));
+        Tooltip.install(
+            headerGraphic,
+            new Tooltip(Localization.lang("Linked identifiers"))
+        );
         this.setGraphic(headerGraphic);
         this.getStyleClass().add(MainTableColumnFactory.STYLE_ICON_COLUMN);
-        MainTableColumnFactory.setExactWidth(this, ColumnPreferences.ICON_COLUMN_WIDTH);
+        MainTableColumnFactory.setExactWidth(
+            this,
+            ColumnPreferences.ICON_COLUMN_WIDTH
+        );
         this.setResizable(false);
-        this.setCellValueFactory(cellData -> cellData.getValue().getLinkedIdentifiers());
+        this.setCellValueFactory(cellData ->
+                cellData.getValue().getLinkedIdentifiers()
+            );
         new ValueTableCellFactory<BibEntryTableViewModel, Map<Field, String>>()
-                .withGraphic(this::createIdentifierGraphic)
-                .withTooltip(this::createIdentifierTooltip)
-                .withMenu(this::createIdentifierMenu)
-                .withOnMouseClickedEvent((entry, linkedFiles) -> event -> {
+            .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();
+                    if (
+                        (linkedFiles.size() == 1) &&
+                        (event.getButton() == MouseButton.PRIMARY)
+                    ) {
+                        new OpenUrlAction(
+                            dialogService,
+                            stateManager,
+                            preferences
+                        )
+                            .execute();
                     }
-                })
-                .install(this);
+                }
+            )
+            .install(this);
     }
 
     private Node createIdentifierGraphic(Map<Field, String> values) {
@@ -80,31 +99,62 @@ 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 {
-                    JabRefDesktop.openExternalViewer(database, preferences, values.get(field), field, dialogService, entry.getEntry());
-                } catch (IOException e) {
-                    dialogService.showErrorDialogAndWait(Localization.lang("Unable to open link."), e);
-                }
-                event.consume();
+        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 {
+                        JabRefDesktop.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);
             });
-            contextMenu.getItems().add(menuItem);
-        });
 
         return contextMenu;
     }
diff --git a/src/main/java/org/jabref/gui/maintable/columns/MainTableColumn.java b/src/main/java/org/jabref/gui/maintable/columns/MainTableColumn.java
index 034ac62d7b0..97b9d13e546 100644
--- a/src/main/java/org/jabref/gui/maintable/columns/MainTableColumn.java
+++ b/src/main/java/org/jabref/gui/maintable/columns/MainTableColumn.java
@@ -2,7 +2,6 @@
 
 import javafx.beans.value.ObservableValue;
 import javafx.scene.control.TableColumn;
-
 import org.jabref.gui.maintable.BibEntryTableViewModel;
 import org.jabref.gui.maintable.MainTableColumnModel;
 import org.jabref.gui.util.BindingsHelper;
@@ -15,16 +14,18 @@ public MainTableColumn(MainTableColumnModel model) {
         this.model = model;
 
         BindingsHelper.bindBidirectional(
-                this.widthProperty(),
-                model.widthProperty(),
-                value -> this.setPrefWidth(model.widthProperty().getValue()),
-                value -> model.widthProperty().setValue(this.getWidth()));
+            this.widthProperty(),
+            model.widthProperty(),
+            value -> this.setPrefWidth(model.widthProperty().getValue()),
+            value -> model.widthProperty().setValue(this.getWidth())
+        );
 
         BindingsHelper.bindBidirectional(
-                this.sortTypeProperty(),
-                (ObservableValue<SortType>) model.sortTypeProperty(),
-                value -> this.setSortType(model.sortTypeProperty().getValue()),
-                value -> model.sortTypeProperty().setValue(this.getSortType()));
+            this.sortTypeProperty(),
+            (ObservableValue<SortType>) model.sortTypeProperty(),
+            value -> this.setSortType(model.sortTypeProperty().getValue()),
+            value -> model.sortTypeProperty().setValue(this.getSortType())
+        );
     }
 
     public MainTableColumnModel getModel() {
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 971bb5e0f69..4dc23d978c7 100644
--- a/src/main/java/org/jabref/gui/maintable/columns/SpecialFieldColumn.java
+++ b/src/main/java/org/jabref/gui/maintable/columns/SpecialFieldColumn.java
@@ -1,16 +1,15 @@
 package org.jabref.gui.maintable.columns;
 
+import com.tobiasdiez.easybind.EasyBind;
 import java.util.Optional;
-
-import javax.swing.undo.UndoManager;
-
 import javafx.scene.Node;
 import javafx.scene.control.ContextMenu;
 import javafx.scene.control.MenuItem;
 import javafx.scene.control.Tooltip;
 import javafx.scene.input.MouseButton;
 import javafx.scene.input.MouseEvent;
-
+import javax.swing.undo.UndoManager;
+import org.controlsfx.control.Rating;
 import org.jabref.gui.icon.JabRefIcon;
 import org.jabref.gui.maintable.BibEntryTableViewModel;
 import org.jabref.gui.maintable.ColumnPreferences;
@@ -28,58 +27,97 @@
 import org.jabref.model.entry.field.SpecialFieldValue;
 import org.jabref.preferences.PreferencesService;
 
-import com.tobiasdiez.easybind.EasyBind;
-import org.controlsfx.control.Rating;
-
 /**
  * A column that displays a SpecialField
  */
-public class SpecialFieldColumn extends MainTableColumn<Optional<SpecialFieldValueViewModel>> {
+public class SpecialFieldColumn
+    extends MainTableColumn<Optional<SpecialFieldValueViewModel>> {
 
     private final PreferencesService preferencesService;
     private final UndoManager undoManager;
 
-    public SpecialFieldColumn(MainTableColumnModel model, PreferencesService preferencesService, UndoManager undoManager) {
+    public SpecialFieldColumn(
+        MainTableColumnModel model,
+        PreferencesService preferencesService,
+        UndoManager undoManager
+    ) {
         super(model);
         this.preferencesService = preferencesService;
         this.undoManager = undoManager;
 
-        SpecialField specialField = (SpecialField) FieldFactory.parseField(model.getQualifier());
-        SpecialFieldViewModel specialFieldViewModel = new SpecialFieldViewModel(specialField, preferencesService, undoManager);
+        SpecialField specialField = (SpecialField) FieldFactory.parseField(
+            model.getQualifier()
+        );
+        SpecialFieldViewModel specialFieldViewModel = new SpecialFieldViewModel(
+            specialField,
+            preferencesService,
+            undoManager
+        );
 
         Node headerGraphic = specialFieldViewModel.getIcon().getGraphicNode();
-        Tooltip.install(headerGraphic, new Tooltip(specialFieldViewModel.getLocalization()));
+        Tooltip.install(
+            headerGraphic,
+            new Tooltip(specialFieldViewModel.getLocalization())
+        );
         this.setGraphic(headerGraphic);
         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)
-                    .install(this);
+            new OptionalValueTableCellFactory<
+                BibEntryTableViewModel,
+                SpecialFieldValueViewModel
+            >()
+                .withGraphic(this::createSpecialRating)
+                .install(this);
         } else {
-            MainTableColumnFactory.setExactWidth(this, ColumnPreferences.ICON_COLUMN_WIDTH);
+            MainTableColumnFactory.setExactWidth(
+                this,
+                ColumnPreferences.ICON_COLUMN_WIDTH
+            );
             this.setResizable(false);
 
             if (specialField.isSingleValueField()) {
-                new OptionalValueTableCellFactory<BibEntryTableViewModel, SpecialFieldValueViewModel>()
-                        .withGraphic((entry, value) -> createSpecialFieldIcon(value, specialFieldViewModel))
-                        .withOnMouseClickedEvent((entry, value) -> event -> {
+                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);
+                        }
+                    )
+                    .install(this);
             } else {
-                new OptionalValueTableCellFactory<BibEntryTableViewModel, SpecialFieldValueViewModel>()
-                        .withGraphic((entry, value) -> createSpecialFieldIcon(value, specialFieldViewModel))
-                        .withMenu((entry, value) -> createSpecialFieldMenu(entry.getEntry(), specialFieldViewModel))
-                        .install(this);
+                new OptionalValueTableCellFactory<
+                    BibEntryTableViewModel,
+                    SpecialFieldValueViewModel
+                >()
+                    .withGraphic((entry, value) ->
+                        createSpecialFieldIcon(value, specialFieldViewModel)
+                    )
+                    .withMenu((entry, value) ->
+                        createSpecialFieldMenu(
+                            entry.getEntry(),
+                            specialFieldViewModel
+                        )
+                    )
+                    .install(this);
             }
         }
 
-        this.setCellValueFactory(cellData -> cellData.getValue().getSpecialField(specialField));
+        this.setCellValueFactory(cellData ->
+                cellData.getValue().getSpecialField(specialField)
+            );
 
         if (specialField == SpecialField.RANKING) {
             this.setComparator(new RankingFieldComparator());
@@ -90,7 +128,10 @@ public SpecialFieldColumn(MainTableColumnModel model, PreferencesService prefere
         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,41 +140,69 @@ private Rating createSpecialRating(BibEntryTableViewModel entry, Optional<Specia
             ranking.setRating(0);
         }
 
-        ranking.addEventFilter(MouseEvent.MOUSE_CLICKED, event -> {
-            if (event.getButton().equals(MouseButton.PRIMARY) && event.getClickCount() == 2) {
-                ranking.setRating(0);
-                event.consume();
-            } else if (event.getButton().equals(MouseButton.SECONDARY)) {
-                event.consume();
+        ranking.addEventFilter(
+            MouseEvent.MOUSE_CLICKED,
+            event -> {
+                if (
+                    event.getButton().equals(MouseButton.PRIMARY) &&
+                    event.getClickCount() == 2
+                ) {
+                    ranking.setRating(0);
+                    event.consume();
+                } else if (event.getButton().equals(MouseButton.SECONDARY)) {
+                    event.consume();
+                }
             }
-        });
-
-        EasyBind.subscribe(ranking.ratingProperty(), rating ->
-                new SpecialFieldViewModel(SpecialField.RANKING, preferencesService, undoManager)
-                        .setSpecialFieldValue(entry.getEntry(), SpecialFieldValue.getRating(rating.intValue())));
+        );
+
+        EasyBind.subscribe(
+            ranking.ratingProperty(),
+            rating ->
+                new SpecialFieldViewModel(
+                    SpecialField.RANKING,
+                    preferencesService,
+                    undoManager
+                )
+                    .setSpecialFieldValue(
+                        entry.getEntry(),
+                        SpecialFieldValue.getRating(rating.intValue())
+                    )
+        );
 
         return ranking;
     }
 
-    private ContextMenu createSpecialFieldMenu(BibEntry entry, SpecialFieldViewModel specialField) {
+    private ContextMenu createSpecialFieldMenu(
+        BibEntry entry,
+        SpecialFieldViewModel specialField
+    ) {
         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 97037881c5d..8c2c15905b6 100644
--- a/src/main/java/org/jabref/gui/menus/ChangeEntryTypeAction.java
+++ b/src/main/java/org/jabref/gui/menus/ChangeEntryTypeAction.java
@@ -1,12 +1,9 @@
 package org.jabref.gui.menus;
 
 import java.util.List;
-
-import javax.swing.undo.UndoManager;
-
 import javafx.beans.property.ReadOnlyStringProperty;
 import javafx.beans.property.ReadOnlyStringWrapper;
-
+import javax.swing.undo.UndoManager;
 import org.jabref.gui.EntryTypeView;
 import org.jabref.gui.actions.SimpleCommand;
 import org.jabref.gui.undo.NamedCompound;
@@ -22,18 +19,30 @@ public class ChangeEntryTypeAction extends SimpleCommand {
     private final UndoManager undoManager;
     private final ReadOnlyStringWrapper statusMessageProperty;
 
-    public ChangeEntryTypeAction(EntryType type, List<BibEntry> entries, UndoManager undoManager) {
+    public ChangeEntryTypeAction(
+        EntryType type,
+        List<BibEntry> entries,
+        UndoManager undoManager
+    ) {
         this.type = type;
         this.entries = entries;
         this.undoManager = undoManager;
-        this.statusMessageProperty = new ReadOnlyStringWrapper(EntryTypeView.getDescription(type));
+        this.statusMessageProperty =
+            new ReadOnlyStringWrapper(EntryTypeView.getDescription(type));
     }
 
     @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))));
+        NamedCompound compound = new NamedCompound(
+            Localization.lang("Change entry type")
+        );
+        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 df9c8c4ef66..c6012d6c080 100644
--- a/src/main/java/org/jabref/gui/menus/ChangeEntryTypeMenu.java
+++ b/src/main/java/org/jabref/gui/menus/ChangeEntryTypeMenu.java
@@ -3,16 +3,13 @@
 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;
 import javafx.scene.control.Menu;
 import javafx.scene.control.MenuItem;
 import javafx.scene.control.SeparatorMenuItem;
-
+import javax.swing.undo.UndoManager;
 import org.jabref.gui.actions.ActionFactory;
 import org.jabref.gui.keyboard.KeyBindingRepository;
 import org.jabref.logic.l10n.Localization;
@@ -32,11 +29,13 @@ public class ChangeEntryTypeMenu {
     private final ActionFactory factory;
     private final BibEntryTypesManager entryTypesManager;
 
-    public ChangeEntryTypeMenu(List<BibEntry> entries,
-                               BibDatabaseContext bibDatabaseContext,
-                               UndoManager undoManager,
-                               KeyBindingRepository keyBindingRepository,
-                               BibEntryTypesManager entryTypesManager) {
+    public ChangeEntryTypeMenu(
+        List<BibEntry> entries,
+        BibDatabaseContext bibDatabaseContext,
+        UndoManager undoManager,
+        KeyBindingRepository keyBindingRepository,
+        BibEntryTypesManager entryTypesManager
+    ) {
         this.entries = entries;
         this.bibDatabaseContext = bibDatabaseContext;
         this.undoManager = undoManager;
@@ -46,67 +45,115 @@ public ChangeEntryTypeMenu(List<BibEntry> entries,
 
     public ContextMenu asContextMenu() {
         ContextMenu menu = new ContextMenu();
-        menu.getItems().setAll(getMenuItems(entries, bibDatabaseContext, undoManager));
+        menu
+            .getItems()
+            .setAll(getMenuItems(entries, bibDatabaseContext, undoManager));
         return menu;
     }
 
     public Menu asSubMenu() {
         Menu menu = new Menu(Localization.lang("Change entry type"));
-        menu.getItems().setAll(getMenuItems(entries, bibDatabaseContext, undoManager));
+        menu
+            .getItems()
+            .setAll(getMenuItems(entries, bibDatabaseContext, undoManager));
         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)
-                    .ifPresent(items::add);
+            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
-                    ));
+            createSubMenu(
+                "IEEETran",
+                IEEETranEntryTypeDefinitions.ALL,
+                entries,
+                undoManager
+            )
+                .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()) {
             subMenu = factory.createMenu(() -> text);
-            subMenu.getItems().addAll(fromEntryTypes(entryTypes, entries, undoManager));
+            subMenu
+                .getItems()
+                .addAll(fromEntryTypes(entryTypes, entries, undoManager));
         }
 
         return Optional.ofNullable(subMenu);
     }
 
-    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();
+    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();
     }
 }
diff --git a/src/main/java/org/jabref/gui/menus/FileHistoryMenu.java b/src/main/java/org/jabref/gui/menus/FileHistoryMenu.java
index ab580b5fcd6..efe525ef740 100644
--- a/src/main/java/org/jabref/gui/menus/FileHistoryMenu.java
+++ b/src/main/java/org/jabref/gui/menus/FileHistoryMenu.java
@@ -2,12 +2,10 @@
 
 import java.nio.file.Files;
 import java.nio.file.Path;
-
 import javafx.scene.control.Menu;
 import javafx.scene.control.MenuItem;
 import javafx.scene.control.SeparatorMenuItem;
 import javafx.scene.input.KeyEvent;
-
 import org.jabref.gui.DialogService;
 import org.jabref.gui.importer.actions.OpenDatabaseAction;
 import org.jabref.logic.l10n.Localization;
@@ -20,11 +18,17 @@ 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();
-        clearRecentLibraries.setText(Localization.lang("Clear recent libraries"));
+        clearRecentLibraries.setText(
+            Localization.lang("Clear recent libraries")
+        );
         clearRecentLibraries.setOnAction(event -> clearLibrariesHistory());
 
         this.history = fileHistory;
@@ -52,7 +56,9 @@ public boolean openFileByKey(KeyEvent keyEvent) {
         if (num <= 0 || num > history.size()) {
             return false;
         }
-        this.openFile(history.get(Integer.parseInt(keyEvent.getCharacter()) - 1));
+        this.openFile(
+                history.get(Integer.parseInt(keyEvent.getCharacter()) - 1)
+            );
         return true;
     }
 
@@ -71,10 +77,7 @@ 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) {
@@ -94,7 +97,8 @@ public void openFile(Path file) {
         if (!Files.exists(file)) {
             this.dialogService.showErrorDialogAndWait(
                     Localization.lang("File not found"),
-                    Localization.lang("File not found") + ": " + file);
+                    Localization.lang("File not found") + ": " + file
+                );
             history.removeItem(file);
             setItems();
             return;
diff --git a/src/main/java/org/jabref/gui/mergeentries/DiffHighlighting.java b/src/main/java/org/jabref/gui/mergeentries/DiffHighlighting.java
index 514ce4fe370..07612ba76a9 100644
--- a/src/main/java/org/jabref/gui/mergeentries/DiffHighlighting.java
+++ b/src/main/java/org/jabref/gui/mergeentries/DiffHighlighting.java
@@ -1,28 +1,36 @@
 package org.jabref.gui.mergeentries;
 
+import com.github.difflib.DiffUtils;
+import com.github.difflib.patch.AbstractDelta;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
 import java.util.stream.Collectors;
-
 import javafx.scene.text.Text;
-
-import com.github.difflib.DiffUtils;
-import com.github.difflib.patch.AbstractDelta;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 public class DiffHighlighting {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(DiffHighlighting.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(
+        DiffHighlighting.class
+    );
 
-    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> stringList = Arrays.asList(baseString.split(separator));
-        List<Text> result = stringList.stream().map(text -> forUnchanged(text + separator)).collect(Collectors.toList());
-        List<AbstractDelta<String>> deltaList = DiffUtils.diff(stringList, Arrays.asList(modifiedString.split(separator))).getDeltas();
+        List<Text> result = stringList
+            .stream()
+            .map(text -> forUnchanged(text + separator))
+            .collect(Collectors.toList());
+        List<AbstractDelta<String>> deltaList = DiffUtils
+            .diff(stringList, Arrays.asList(modifiedString.split(separator)))
+            .getDeltas();
         Collections.reverse(deltaList);
         for (AbstractDelta<String> delta : deltaList) {
             int startPos = delta.getSource().getPosition();
@@ -31,20 +39,41 @@ public static List<Text> generateDiffHighlighting(String baseString, String modi
             switch (delta.getType()) {
                 case CHANGE:
                     for (String line : lines) {
-                        result.set(startPos + offset, forRemoved(line + separator));
+                        result.set(
+                            startPos + offset,
+                            forRemoved(line + separator)
+                        );
                         offset++;
                     }
-                    result.set(startPos + offset - 1, forRemoved(stringList.get((startPos + offset) - 1) + separator));
-                    result.add(startPos + offset, forAdded(String.join(separator, delta.getTarget().getLines())));
+                    result.set(
+                        startPos + offset - 1,
+                        forRemoved(
+                            stringList.get((startPos + offset) - 1) + separator
+                        )
+                    );
+                    result.add(
+                        startPos + offset,
+                        forAdded(
+                            String.join(separator, delta.getTarget().getLines())
+                        )
+                    );
                     break;
                 case DELETE:
                     for (String line : lines) {
-                        result.set(startPos + offset, forRemoved(line + separator));
+                        result.set(
+                            startPos + offset,
+                            forRemoved(line + separator)
+                        );
                         offset++;
                     }
                     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;
@@ -77,10 +106,19 @@ public static Text forRemoved(String text) {
         return node;
     }
 
-    public static List<Text> generateSymmetricHighlighting(String baseString, String modifiedString, String separator) {
+    public static List<Text> generateSymmetricHighlighting(
+        String baseString,
+        String modifiedString,
+        String separator
+    ) {
         List<String> stringList = Arrays.asList(baseString.split(separator));
-        List<Text> result = stringList.stream().map(text -> DiffHighlighting.forUnchanged(text + separator)).collect(Collectors.toList());
-        List<AbstractDelta<String>> deltaList = DiffUtils.diff(stringList, Arrays.asList(modifiedString.split(separator))).getDeltas();
+        List<Text> result = stringList
+            .stream()
+            .map(text -> DiffHighlighting.forUnchanged(text + separator))
+            .collect(Collectors.toList());
+        List<AbstractDelta<String>> deltaList = DiffUtils
+            .diff(stringList, Arrays.asList(modifiedString.split(separator)))
+            .getDeltas();
         Collections.reverse(deltaList);
         for (AbstractDelta<String> delta : deltaList) {
             int startPos = delta.getSource().getPosition();
@@ -89,13 +127,19 @@ public static List<Text> generateSymmetricHighlighting(String baseString, String
             switch (delta.getType()) {
                 case CHANGE:
                     for (String line : lines) {
-                        result.set(startPos + offset, forChanged(line + separator));
+                        result.set(
+                            startPos + offset,
+                            forChanged(line + separator)
+                        );
                         offset++;
                     }
                     break;
                 case DELETE:
                     for (String line : lines) {
-                        result.set(startPos + offset, forAdded(line + separator));
+                        result.set(
+                            startPos + offset,
+                            forAdded(line + separator)
+                        );
                         offset++;
                     }
                     break;
diff --git a/src/main/java/org/jabref/gui/mergeentries/DiffHighlightingEllipsingTextFlow.java b/src/main/java/org/jabref/gui/mergeentries/DiffHighlightingEllipsingTextFlow.java
index 312fc30ca99..3e8c5b9b9d1 100644
--- a/src/main/java/org/jabref/gui/mergeentries/DiffHighlightingEllipsingTextFlow.java
+++ b/src/main/java/org/jabref/gui/mergeentries/DiffHighlightingEllipsingTextFlow.java
@@ -1,7 +1,7 @@
 package org.jabref.gui.mergeentries;
 
+import com.tobiasdiez.easybind.EasyObservableValue;
 import java.util.List;
-
 import javafx.beans.DefaultProperty;
 import javafx.beans.property.ObjectProperty;
 import javafx.beans.property.StringProperty;
@@ -13,23 +13,32 @@
 import javafx.scene.text.Text;
 import javafx.scene.text.TextFlow;
 
-import com.tobiasdiez.easybind.EasyObservableValue;
-
 @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 ListChangeListener<Node> listChangeListener = this::adjustChildren;
+    private final ObservableList<Node> allChildren =
+        FXCollections.observableArrayList();
+    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);
@@ -37,7 +46,9 @@ public DiffHighlightingEllipsingTextFlow(String fullText, EasyObservableValue<St
 
         this.comparisonString = comparisonString;
         this.diffMode = diffMode;
-        comparisonString.addListener((obs, oldValue, newValue) -> highlightDiff());
+        comparisonString.addListener((obs, oldValue, newValue) ->
+            highlightDiff()
+        );
         diffMode.addListener((obs, oldValue, newValue) -> highlightDiff());
         highlightDiff();
     }
@@ -47,7 +58,9 @@ public ObservableList<Node> getChildren() {
         return allChildren;
     }
 
-    private void adjustChildren(ListChangeListener.Change<? extends Node> change) {
+    private void adjustChildren(
+        ListChangeListener.Change<? extends Node> change
+    ) {
         super.getChildren().clear();
         super.getChildren().addAll(allChildren);
         super.autosize();
@@ -87,17 +100,27 @@ private boolean fillUntilOverflowing() {
             if (super.getChildren().size() == allChildren.size()) {
                 if (allChildren.size() > 0) {
                     // all Texts are displayed, let's make sure all chars are as well
-                    Node lastChildAsShown = super.getChildren().get(super.getChildren().size() - 1);
+                    Node lastChildAsShown = super
+                        .getChildren()
+                        .get(super.getChildren().size() - 1);
                     Node lastChild = allChildren.get(allChildren.size() - 1);
-                    if (lastChildAsShown instanceof Text && ((Text) lastChildAsShown).getText().length() < ((Text) lastChild).getText().length()) {
-                        ((Text) lastChildAsShown).setText(((Text) lastChild).getText());
+                    if (
+                        lastChildAsShown instanceof Text &&
+                        ((Text) lastChildAsShown).getText().length() <
+                            ((Text) lastChild).getText().length()
+                    ) {
+                        ((Text) lastChildAsShown).setText(
+                                ((Text) lastChild).getText()
+                            );
                     } else {
                         // nothing to fill the space with
                         return false;
                     }
                 }
             } else {
-                super.getChildren().add(allChildren.get(super.getChildren().size()));
+                super
+                    .getChildren()
+                    .add(allChildren.get(super.getChildren().size()));
             }
             super.autosize();
         }
@@ -106,15 +129,27 @@ 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());
+            Text shortenedChild = new Text(
+                ellipseString(lastChildAsShown.getText())
+            );
+            shortenedChild
+                .getStyleClass()
+                .addAll(lastChildAsShown.getStyleClass());
             super.getChildren().add(shortenedChild);
             super.autosize();
         }
@@ -123,17 +158,31 @@ 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());
-            };
+        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()
+                    );
+                };
             allChildren.addAll(highlightedText);
         } else {
             Text text = new Text(fullText);
@@ -157,7 +206,9 @@ public final void setEllipsisString(String value) {
     }
 
     public String getEllipsisString() {
-        return ellipsisString == null ? DEFAULT_ELLIPSIS_STRING : ellipsisString.get();
+        return ellipsisString == null
+            ? DEFAULT_ELLIPSIS_STRING
+            : ellipsisString.get();
     }
 
     public final StringProperty ellipsisStringProperty() {
diff --git a/src/main/java/org/jabref/gui/mergeentries/DiffMode.java b/src/main/java/org/jabref/gui/mergeentries/DiffMode.java
index de05daebb10..b46f0b4f4b1 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 b134b11688a..7532b6d972d 100644
--- a/src/main/java/org/jabref/gui/mergeentries/EntriesMergeResult.java
+++ b/src/main/java/org/jabref/gui/mergeentries/EntriesMergeResult.java
@@ -3,6 +3,9 @@
 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 c5c65b1cc5d..154ac10bc16 100644
--- a/src/main/java/org/jabref/gui/mergeentries/FetchAndMergeEntry.java
+++ b/src/main/java/org/jabref/gui/mergeentries/FetchAndMergeEntry.java
@@ -7,9 +7,7 @@
 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.undo.NamedCompound;
 import org.jabref.gui.undo.UndoableChangeType;
@@ -31,7 +29,6 @@
 import org.jabref.model.entry.field.StandardField;
 import org.jabref.model.entry.types.EntryType;
 import org.jabref.preferences.PreferencesService;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -41,19 +38,27 @@
 public class FetchAndMergeEntry {
 
     // A list of all field which are supported
-    public static List<Field> SUPPORTED_FIELDS = Arrays.asList(StandardField.DOI, StandardField.EPRINT, StandardField.ISBN);
-    private static final Logger LOGGER = LoggerFactory.getLogger(FetchAndMergeEntry.class);
+    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;
     private final UndoManager undoManager;
     private final BibDatabaseContext bibDatabaseContext;
     private final TaskExecutor taskExecutor;
     private final PreferencesService preferencesService;
 
-    public FetchAndMergeEntry(BibDatabaseContext bibDatabaseContext,
-                              TaskExecutor taskExecutor,
-                              PreferencesService preferencesService,
-                              DialogService dialogService,
-                              UndoManager undoManager) {
+    public FetchAndMergeEntry(
+        BibDatabaseContext bibDatabaseContext,
+        TaskExecutor taskExecutor,
+        PreferencesService preferencesService,
+        DialogService dialogService,
+        UndoManager undoManager
+    ) {
         this.bibDatabaseContext = bibDatabaseContext;
         this.taskExecutor = taskExecutor;
         this.preferencesService = preferencesService;
@@ -73,51 +78,126 @@ 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, preferencesService.getImportFormatPreferences());
+                Optional<IdBasedFetcher> fetcher =
+                    WebFetchers.getIdBasedFetcherForField(
+                        field,
+                        preferencesService.getImportFormatPreferences()
+                    );
                 if (fetcher.isPresent()) {
-                    BackgroundTask.wrap(() -> fetcher.get().performSearchById(fieldContent.get()))
-                                  .onSuccess(fetchedEntry -> {
-                                      ImportCleanup cleanup = ImportCleanup.targeting(bibDatabaseContext.getMode());
-                                      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);
+                    BackgroundTask
+                        .wrap(() ->
+                            fetcher.get().performSearchById(fieldContent.get())
+                        )
+                        .onSuccess(fetchedEntry -> {
+                            ImportCleanup cleanup = ImportCleanup.targeting(
+                                bibDatabaseContext.getMode()
+                            );
+                            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()));
+                dialogService.notify(
+                    Localization.lang("No %0 found", field.getDisplayName())
+                );
             }
         }
     }
 
-    private void showMergeDialog(BibEntry originalEntry, BibEntry fetchedEntry, WebFetcher fetcher) {
-        MergeEntriesDialog dialog = new MergeEntriesDialog(originalEntry, fetchedEntry, preferencesService);
-        dialog.setTitle(Localization.lang("Merge entry with %0 information", fetcher.getName()));
+    private void showMergeDialog(
+        BibEntry originalEntry,
+        BibEntry fetchedEntry,
+        WebFetcher fetcher
+    ) {
+        MergeEntriesDialog dialog = new MergeEntriesDialog(
+            originalEntry,
+            fetchedEntry,
+            preferencesService
+        );
+        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);
+        dialog.setRightHeaderText(
+            Localization.lang("Entry from %0", fetcher.getName())
+        );
+        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));
+            Set<Field> jointFields = new TreeSet<>(
+                Comparator.comparing(Field::getName)
+            );
             jointFields.addAll(mergedEntry.get().getFields());
-            Set<Field> originalFields = new TreeSet<>(Comparator.comparing(Field::getName));
+            Set<Field> originalFields = new TreeSet<>(
+                Comparator.comparing(Field::getName)
+            );
             originalFields.addAll(originalEntry.getFields());
             boolean edited = false;
 
@@ -127,28 +207,53 @@ private void showMergeDialog(BibEntry originalEntry, BibEntry fetchedEntry, WebF
 
             if (!oldType.equals(newType)) {
                 originalEntry.setType(newType);
-                ce.addEdit(new UndoableChangeType(originalEntry, oldType, newType));
+                ce.addEdit(
+                    new UndoableChangeType(originalEntry, oldType, newType)
+                );
                 edited = true;
             }
 
             // fields
             for (Field field : jointFields) {
                 Optional<String> originalString = originalEntry.getField(field);
-                Optional<String> mergedString = mergedEntry.get().getField(field);
-                if (originalString.isEmpty() || !originalString.equals(mergedString)) {
+                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()));
+                    ce.addEdit(
+                        new UndoableFieldChange(
+                            originalEntry,
+                            field,
+                            originalString.orElse(null),
+                            mergedString.get()
+                        )
+                    );
                     edited = true;
                 }
             }
 
             // Remove fields which are not in the merged entry, unless they are internal fields
             for (Field field : originalFields) {
-                if (!jointFields.contains(field) && !FieldFactory.isInternalField(field)) {
-                    Optional<String> originalString = originalEntry.getField(field);
+                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 +261,12 @@ 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"));
             }
@@ -166,20 +276,37 @@ 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());
-                              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);
+        BackgroundTask
+            .wrap(() -> fetcher.performSearch(entry).stream().findFirst())
+            .onSuccess(fetchedEntry -> {
+                if (fetchedEntry.isPresent()) {
+                    ImportCleanup cleanup = ImportCleanup.targeting(
+                        bibDatabaseContext.getMode()
+                    );
+                    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/MergeEntriesAction.java b/src/main/java/org/jabref/gui/mergeentries/MergeEntriesAction.java
index acb97eb167c..c2983cfe004 100644
--- a/src/main/java/org/jabref/gui/mergeentries/MergeEntriesAction.java
+++ b/src/main/java/org/jabref/gui/mergeentries/MergeEntriesAction.java
@@ -2,7 +2,6 @@
 
 import java.util.List;
 import java.util.Optional;
-
 import org.jabref.gui.DialogService;
 import org.jabref.gui.StateManager;
 import org.jabref.gui.actions.ActionHelper;
@@ -14,17 +13,27 @@
 import org.jabref.preferences.PreferencesService;
 
 public class MergeEntriesAction extends SimpleCommand {
+
     private static final int NUMBER_OF_ENTRIES_NEEDED = 2;
     private final DialogService dialogService;
     private final StateManager stateManager;
     private final PreferencesService preferencesService;
 
-    public MergeEntriesAction(DialogService dialogService, StateManager stateManager, PreferencesService preferencesService) {
+    public MergeEntriesAction(
+        DialogService dialogService,
+        StateManager stateManager,
+        PreferencesService preferencesService
+    ) {
         this.dialogService = dialogService;
         this.stateManager = stateManager;
         this.preferencesService = preferencesService;
 
-        this.executable.bind(ActionHelper.needsEntriesSelected(NUMBER_OF_ENTRIES_NEEDED, stateManager));
+        this.executable.bind(
+                ActionHelper.needsEntriesSelected(
+                    NUMBER_OF_ENTRIES_NEEDED,
+                    stateManager
+                )
+            );
     }
 
     @Override
@@ -38,8 +47,11 @@ public void execute() {
         if (selectedEntries.size() != 2) {
             // Inform the user to select entries first.
             dialogService.showInformationDialogAndWait(
-                    Localization.lang("Merge entries"),
-                    Localization.lang("You have to choose exactly two entries to merge."));
+                Localization.lang("Merge entries"),
+                Localization.lang(
+                    "You have to choose exactly two entries to merge."
+                )
+            );
             return;
         }
 
@@ -50,7 +62,11 @@ 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;
@@ -59,14 +75,26 @@ public void execute() {
             second = one;
         }
 
-        MergeEntriesDialog dialog = new MergeEntriesDialog(first, second, preferencesService);
+        MergeEntriesDialog dialog = new MergeEntriesDialog(
+            first,
+            second,
+            preferencesService
+        );
         dialog.setTitle(Localization.lang("Merge entries"));
 
-        Optional<EntriesMergeResult> mergeResultOpt = dialogService.showCustomDialogAndWait(dialog);
-        mergeResultOpt.ifPresentOrElse(entriesMergeResult -> {
-            new MergeTwoEntriesAction(entriesMergeResult, stateManager).execute();
+        Optional<EntriesMergeResult> mergeResultOpt =
+            dialogService.showCustomDialogAndWait(dialog);
+        mergeResultOpt.ifPresentOrElse(
+            entriesMergeResult -> {
+                new MergeTwoEntriesAction(entriesMergeResult, stateManager)
+                    .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 6766050972a..dc4a1791641 100644
--- a/src/main/java/org/jabref/gui/mergeentries/MergeEntriesDialog.java
+++ b/src/main/java/org/jabref/gui/mergeentries/MergeEntriesDialog.java
@@ -2,7 +2,6 @@
 
 import javafx.scene.control.ButtonBar;
 import javafx.scene.control.ButtonType;
-
 import org.jabref.gui.mergeentries.newmergedialog.ShowDiffConfig;
 import org.jabref.gui.mergeentries.newmergedialog.ThreeWayMergeView;
 import org.jabref.gui.util.BaseDialog;
@@ -11,11 +10,16 @@
 import org.jabref.preferences.PreferencesService;
 
 public class MergeEntriesDialog extends BaseDialog<EntriesMergeResult> {
+
     private final ThreeWayMergeView threeWayMergeView;
     private final BibEntry one;
     private final BibEntry two;
 
-    public MergeEntriesDialog(BibEntry one, BibEntry two, PreferencesService preferencesService) {
+    public MergeEntriesDialog(
+        BibEntry one,
+        BibEntry two,
+        PreferencesService preferencesService
+    ) {
         threeWayMergeView = new ThreeWayMergeView(one, two, preferencesService);
         this.one = one;
         this.two = two;
@@ -33,16 +37,27 @@ private void init() {
         this.getDialogPane().setContent(threeWayMergeView);
 
         // Create buttons
-        ButtonType replaceEntries = new ButtonType(Localization.lang("Merge entries"), ButtonBar.ButtonData.OK_DONE);
-        this.getDialogPane().getButtonTypes().setAll(ButtonType.CANCEL, replaceEntries);
+        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;
-            }
-        });
+                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 6db5a7a60e5..cffe2ac2f2f 100644
--- a/src/main/java/org/jabref/gui/mergeentries/MergeResult.java
+++ b/src/main/java/org/jabref/gui/mergeentries/MergeResult.java
@@ -3,6 +3,7 @@
 import org.jabref.model.entry.BibEntry;
 
 public record MergeResult(
-        BibEntry leftEntry, BibEntry rightEntry, BibEntry mergedEntry
-) {
-}
+    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 d5e695b6810..4f5e3ef3e98 100644
--- a/src/main/java/org/jabref/gui/mergeentries/MergeTwoEntriesAction.java
+++ b/src/main/java/org/jabref/gui/mergeentries/MergeTwoEntriesAction.java
@@ -2,7 +2,6 @@
 
 import java.util.Arrays;
 import java.util.List;
-
 import org.jabref.gui.Globals;
 import org.jabref.gui.StateManager;
 import org.jabref.gui.actions.SimpleCommand;
@@ -14,10 +13,14 @@
 import org.jabref.model.entry.BibEntry;
 
 public class MergeTwoEntriesAction extends SimpleCommand {
+
     private final EntriesMergeResult entriesMergeResult;
     private final StateManager stateManager;
 
-    public MergeTwoEntriesAction(EntriesMergeResult entriesMergeResult, StateManager stateManager) {
+    public MergeTwoEntriesAction(
+        EntriesMergeResult entriesMergeResult,
+        StateManager stateManager
+    ) {
         this.entriesMergeResult = entriesMergeResult;
         this.stateManager = stateManager;
     }
@@ -28,14 +31,27 @@ public void execute() {
             return;
         }
 
-        BibDatabase database = stateManager.getActiveDatabase().get().getDatabase();
-        List<BibEntry> entriesToRemove = Arrays.asList(entriesMergeResult.originalLeftEntry(), entriesMergeResult.originalRightEntry());
+        BibDatabase database = stateManager
+            .getActiveDatabase()
+            .get()
+            .getDatabase();
+        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()));
+        NamedCompound ce = new NamedCompound(
+            Localization.lang("Merge entries")
+        );
+        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 a4702e075a8..16e5ac7a47d 100644
--- a/src/main/java/org/jabref/gui/mergeentries/MergeWithFetchedEntryAction.java
+++ b/src/main/java/org/jabref/gui/mergeentries/MergeWithFetchedEntryAction.java
@@ -1,7 +1,6 @@
 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;
@@ -21,19 +20,29 @@ public class MergeWithFetchedEntryAction extends SimpleCommand {
     private final UndoManager undoManager;
     private final TaskExecutor taskExecutor;
 
-    public MergeWithFetchedEntryAction(DialogService dialogService,
-                                       StateManager stateManager,
-                                       TaskExecutor taskExecutor,
-                                       PreferencesService preferencesService,
-                                       UndoManager undoManager) {
+    public MergeWithFetchedEntryAction(
+        DialogService dialogService,
+        StateManager stateManager,
+        TaskExecutor taskExecutor,
+        PreferencesService preferencesService,
+        UndoManager undoManager
+    ) {
         this.dialogService = dialogService;
         this.stateManager = stateManager;
         this.taskExecutor = taskExecutor;
         this.preferencesService = preferencesService;
         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 +53,29 @@ 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("This operation requires exactly one item to be selected."));
+                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().get(0);
-        new FetchAndMergeEntry(stateManager.getActiveDatabase().get(), taskExecutor, preferencesService, dialogService, undoManager).fetchAndMerge(originalEntry);
+        new FetchAndMergeEntry(
+            stateManager.getActiveDatabase().get(),
+            taskExecutor,
+            preferencesService,
+            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 bcdbb7dafaf..383975af6ca 100644
--- a/src/main/java/org/jabref/gui/mergeentries/MultiMergeEntriesView.java
+++ b/src/main/java/org/jabref/gui/mergeentries/MultiMergeEntriesView.java
@@ -1,11 +1,13 @@
 package org.jabref.gui.mergeentries;
 
+import com.airhacks.afterburner.views.ViewLoader;
+import com.tobiasdiez.easybind.EasyBind;
+import com.tobiasdiez.easybind.EasyObservableValue;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.NoSuchElementException;
 import java.util.function.Supplier;
-
 import javafx.collections.FXCollections;
 import javafx.collections.ListChangeListener;
 import javafx.collections.MapChangeListener;
@@ -34,7 +36,6 @@
 import javafx.scene.layout.RowConstraints;
 import javafx.scene.layout.VBox;
 import javafx.scene.text.TextAlignment;
-
 import org.jabref.gui.icon.IconTheme;
 import org.jabref.gui.util.BaseDialog;
 import org.jabref.gui.util.BindingsHelper;
@@ -49,33 +50,47 @@
 import org.jabref.model.entry.field.FieldFactory;
 import org.jabref.model.entry.field.StandardField;
 import org.jabref.preferences.PreferencesService;
-
-import com.airhacks.afterburner.views.ViewLoader;
-import com.tobiasdiez.easybind.EasyBind;
-import com.tobiasdiez.easybind.EasyObservableValue;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 public class MultiMergeEntriesView extends BaseDialog<BibEntry> {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(MultiMergeEntriesView.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(
+        MultiMergeEntriesView.class
+    );
 
     // LEFT
-    @FXML private ScrollPane leftScrollPane;
-    @FXML private VBox fieldHeader;
+    @FXML
+    private ScrollPane leftScrollPane;
+
+    @FXML
+    private VBox fieldHeader;
 
     // CENTER
-    @FXML private ScrollPane topScrollPane;
-    @FXML private HBox supplierHeader;
-    @FXML private ScrollPane centerScrollPane;
-    @FXML private GridPane optionsGrid;
+    @FXML
+    private ScrollPane topScrollPane;
+
+    @FXML
+    private HBox supplierHeader;
+
+    @FXML
+    private ScrollPane centerScrollPane;
+
+    @FXML
+    private GridPane optionsGrid;
 
     // RIGHT
-    @FXML private ScrollPane rightScrollPane;
-    @FXML private VBox fieldEditor;
+    @FXML
+    private ScrollPane rightScrollPane;
+
+    @FXML
+    private VBox fieldEditor;
 
-    @FXML private Label failedSuppliers;
-    @FXML private ComboBox<DiffMode> diffMode;
+    @FXML
+    private Label failedSuppliers;
+
+    @FXML
+    private ComboBox<DiffMode> diffMode;
 
     private final ToggleGroup headerToggleGroup = new ToggleGroup();
     private final HashMap<Field, FieldRow> fieldRows = new HashMap<>();
@@ -85,73 +100,123 @@ public class MultiMergeEntriesView extends BaseDialog<BibEntry> {
 
     private final PreferencesService preferences;
 
-    public MultiMergeEntriesView(PreferencesService preferences,
-                                 TaskExecutor taskExecutor) {
+    public MultiMergeEntriesView(
+        PreferencesService 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);
-        this.getDialogPane().getButtonTypes().setAll(ButtonType.CANCEL, mergeEntries);
+        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
+            .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
+            .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
     public void initialize() {
-        topScrollPane.hvalueProperty().bindBidirectional(centerScrollPane.hvalueProperty());
-        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())
-                ))
-        );
+        topScrollPane
+            .hvalueProperty()
+            .bindBidirectional(centerScrollPane.hvalueProperty());
+        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()
+                            )
+                        )
+                )
+            );
 
         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);
+            .withText(DiffMode::getDisplayText)
+            .install(diffMode);
         diffMode.setValue(preferences.getGuiPreferences().getMergeDiffMode());
-        EasyBind.subscribe(this.diffMode.valueProperty(), mode -> preferences.getGuiPreferences().setMergeDiffMode(mode));
+        EasyBind.subscribe(
+            this.diffMode.valueProperty(),
+            mode -> preferences.getGuiPreferences().setMergeDiffMode(mode)
+        );
     }
 
-    private void addColumn(MultiMergeEntriesViewModel.EntrySource entrySourceColumn) {
+    private void addColumn(
+        MultiMergeEntriesViewModel.EntrySource entrySourceColumn
+    ) {
         // add header
         int columnIndex = supplierHeader.getChildren().size();
-        ToggleButton header = generateEntryHeader(entrySourceColumn, columnIndex);
+        ToggleButton header = generateEntryHeader(
+            entrySourceColumn,
+            columnIndex
+        );
         header.getStyleClass().add("toggle-button");
         HBox.setHgrow(header, Priority.ALWAYS);
         supplierHeader.getChildren().add(header);
@@ -168,16 +233,24 @@ 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());
@@ -189,19 +262,23 @@ private ToggleButton generateEntryHeader(MultiMergeEntriesViewModel.EntrySource
             progressIndicator.setMinHeight(Control.USE_PREF_SIZE);
             progressIndicator.setMaxHeight(Control.USE_PREF_SIZE);
             header.setGraphic(progressIndicator);
-            progressIndicator.visibleProperty().bind(column.isLoadingProperty());
+            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 +289,15 @@ 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);
@@ -228,18 +312,32 @@ private void writeBibEntryToColumn(MultiMergeEntriesViewModel.EntrySource entryS
      * @param sourceButton the header button to setup
      * @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);
-            }
-        });
+    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);
+                }
+            });
     }
 
     /**
@@ -252,7 +350,10 @@ 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 {
@@ -267,13 +368,22 @@ public Cell(String content, Field field, int columnIndex) {
             The text only shows up after one text in that same row is selected by the user.
              */
             DefaultTaskExecutor.runInJavaFXThread(() -> {
-
                 FieldRow row = fieldRows.get(field);
 
-                prefWidthProperty().bind(((Region) supplierHeader.getChildren().get(columnIndex)).widthProperty());
+                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());
+                prefHeightProperty()
+                    .bind(
+                        ((Region) fieldEditor
+                                .getChildren()
+                                .get(row.rowIndex)).heightProperty()
+                    );
                 setMinHeight(Control.USE_PREF_SIZE);
                 setMaxHeight(Control.USE_PREF_SIZE);
 
@@ -288,7 +398,16 @@ public Cell(String content, Field field, int columnIndex) {
                 HBox.setHgrow(cellButton, Priority.ALWAYS);
 
                 // Text
-                DiffHighlightingEllipsingTextFlow buttonText = new DiffHighlightingEllipsingTextFlow(content, viewModel.mergedEntryProperty().get().getFieldBinding(field).asOrdinary(), diffMode.valueProperty());
+                DiffHighlightingEllipsingTextFlow buttonText =
+                    new DiffHighlightingEllipsingTextFlow(
+                        content,
+                        viewModel
+                            .mergedEntryProperty()
+                            .get()
+                            .getFieldBinding(field)
+                            .asOrdinary(),
+                        diffMode.valueProperty()
+                    );
 
                 buttonText.maxWidthProperty().bind(widthProperty().add(-10));
                 buttonText.maxHeightProperty().bind(heightProperty());
@@ -309,25 +428,41 @@ public Cell(String content, Field field, int columnIndex) {
                 }
 
                 if (field.equals(StandardField.DOI)) {
-                    Button doiButton = IconTheme.JabRefIcons.LOOKUP_IDENTIFIER.asButton();
+                    Button doiButton =
+                        IconTheme.JabRefIcons.LOOKUP_IDENTIFIER.asButton();
                     HBox.setHgrow(doiButton, Priority.NEVER);
-                    doiButton.prefHeightProperty().bind(cellButton.heightProperty());
+                    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());
+                        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;
+                        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;
+                                }
                             }
-                        });
+                        );
                     });
                 }
             });
@@ -339,11 +474,19 @@ public String getContent() {
     }
 
     public void addSource(String title, BibEntry entry) {
-        viewModel.addSource(new MultiMergeEntriesViewModel.EntrySource(title, entry));
+        viewModel.addSource(
+            new MultiMergeEntriesViewModel.EntrySource(title, 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 {
@@ -354,7 +497,8 @@ 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;
+        @SuppressWarnings("FieldCanBeLocal")
+        private EasyObservableValue<String> fieldBinding;
 
         public FieldRow(Field field, int rowIndex) {
             this.rowIndex = rowIndex;
@@ -370,16 +514,30 @@ 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,20 +548,29 @@ 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,
-                    text -> {
-                        if (text != null) {
-                            fieldEditorCell.setText(text);
-                        }
-                    },
-                    binding -> {
-                        if (binding != null) {
-                            viewModel.mergedEntryProperty().get().setField(field, binding);
-                        }
-                    });
+                fieldEditorCell.textProperty(),
+                fieldBinding,
+                text -> {
+                    if (text != null) {
+                        fieldEditorCell.setText(text);
+                    }
+                },
+                binding -> {
+                    if (binding != null) {
+                        viewModel
+                            .mergedEntryProperty()
+                            .get()
+                            .setField(field, binding);
+                    }
+                }
+            );
 
             fieldEditorCell.setMaxHeight(Double.MAX_VALUE);
             VBox.setVgrow(fieldEditorCell, Priority.ALWAYS);
@@ -411,7 +578,9 @@ private void addRow(Field field) {
 
             // setup header label
             Label fieldHeaderLabel = new Label(field.getDisplayName());
-            fieldHeaderLabel.prefHeightProperty().bind(fieldEditorCell.heightProperty());
+            fieldHeaderLabel
+                .prefHeightProperty()
+                .bind(fieldEditorCell.heightProperty());
             fieldHeaderLabel.setMaxWidth(Control.USE_PREF_SIZE);
             fieldHeaderLabel.setMinWidth(Control.USE_PREF_SIZE);
             fieldHeader.getChildren().add(fieldHeaderLabel);
@@ -420,7 +589,9 @@ private void addRow(Field field) {
             RowConstraints constraint = new RowConstraints();
             constraint.setMinHeight(Control.USE_PREF_SIZE);
             constraint.setMaxHeight(Control.USE_PREF_SIZE);
-            constraint.prefHeightProperty().bind(fieldEditorCell.heightProperty());
+            constraint
+                .prefHeightProperty()
+                .bind(fieldEditorCell.heightProperty());
             optionsGrid.getRowConstraints().add(constraint);
         }
     }
diff --git a/src/main/java/org/jabref/gui/mergeentries/MultiMergeEntriesViewModel.java b/src/main/java/org/jabref/gui/mergeentries/MultiMergeEntriesViewModel.java
index a73301a7fa4..27194ea7e66 100644
--- a/src/main/java/org/jabref/gui/mergeentries/MultiMergeEntriesViewModel.java
+++ b/src/main/java/org/jabref/gui/mergeentries/MultiMergeEntriesViewModel.java
@@ -2,7 +2,6 @@
 
 import java.util.Map;
 import java.util.function.Supplier;
-
 import javafx.beans.property.BooleanProperty;
 import javafx.beans.property.ListProperty;
 import javafx.beans.property.ObjectProperty;
@@ -13,7 +12,6 @@
 import javafx.beans.property.StringProperty;
 import javafx.collections.FXCollections;
 import javafx.scene.control.ButtonType;
-
 import org.jabref.gui.AbstractViewModel;
 import org.jabref.gui.util.BackgroundTask;
 import org.jabref.gui.util.TaskExecutor;
@@ -22,24 +20,32 @@
 
 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 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);
     }
@@ -48,10 +54,19 @@ public void updateFields(BibEntry entry) {
         if (entry == null) {
             return;
         }
-        for (Map.Entry<Field, String> fieldEntry : entry.getFieldMap().entrySet()) {
+        for (Map.Entry<Field, String> fieldEntry : entry
+            .getFieldMap()
+            .entrySet()) {
             // make sure there is a row for the field
-            if (!mergedEntry.get().getFieldsObservable().containsKey(fieldEntry.getKey())) {
-                mergedEntry.get().setField(fieldEntry.getKey(), fieldEntry.getValue());
+            if (
+                !mergedEntry
+                    .get()
+                    .getFieldsObservable()
+                    .containsKey(fieldEntry.getKey())
+            ) {
+                mergedEntry
+                    .get()
+                    .setField(fieldEntry.getKey(), fieldEntry.getValue());
             }
         }
     }
@@ -76,20 +91,29 @@ public ListProperty<String> failedSuppliersProperty() {
     }
 
     public static class EntrySource {
-        private final StringProperty title = new SimpleStringProperty("");
-        private final ObjectProperty<BibEntry> entry = new SimpleObjectProperty<>();
-        private final BooleanProperty isLoading = new SimpleBooleanProperty(false);
 
-        public EntrySource(String title, Supplier<BibEntry> entrySupplier, TaskExecutor taskExecutor) {
+        private final StringProperty title = new SimpleStringProperty("");
+        private final ObjectProperty<BibEntry> entry =
+            new SimpleObjectProperty<>();
+        private final BooleanProperty isLoading = new SimpleBooleanProperty(
+            false
+        );
+
+        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);
+            BackgroundTask
+                .wrap(entrySupplier::get)
+                .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 afb25d2a4a8..c9cd0a1cf6d 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,12 @@
 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 +20,6 @@
 import org.jabref.model.entry.field.Field;
 import org.jabref.model.strings.StringUtil;
 import org.jabref.preferences.PreferencesService;
-
-import com.tobiasdiez.easybind.EasyBind;
-import org.fxmisc.richtext.StyleClassedTextArea;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -29,11 +27,16 @@
  * A controller class to control left, right and merged field values
  */
 public class FieldRowView {
-    private static final Logger LOGGER = LoggerFactory.getLogger(FieldRowView.class);
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(
+        FieldRowView.class
+    );
 
     protected final FieldRowViewModel viewModel;
 
-    protected final BooleanProperty shouldShowDiffs = new SimpleBooleanProperty(true);
+    protected final BooleanProperty shouldShowDiffs = new SimpleBooleanProperty(
+        true
+    );
     private final FieldNameCell fieldNameCell;
     private final FieldValueCell leftValueCell;
     private final FieldValueCell rightValueCell;
@@ -43,80 +46,142 @@ public class FieldRowView {
 
     private GridPane parent;
 
-    public FieldRowView(Field field, BibEntry leftEntry, BibEntry rightEntry, BibEntry mergedEntry, FieldMergerFactory fieldMergerFactory, PreferencesService preferencesService, int rowIndex) {
-        viewModel = new FieldRowViewModel(field, leftEntry, rightEntry, mergedEntry, fieldMergerFactory);
+    public FieldRowView(
+        Field field,
+        BibEntry leftEntry,
+        BibEntry rightEntry,
+        BibEntry mergedEntry,
+        FieldMergerFactory fieldMergerFactory,
+        PreferencesService preferencesService,
+        int rowIndex
+    ) {
+        viewModel =
+            new FieldRowViewModel(
+                field,
+                leftEntry,
+                rightEntry,
+                mergedEntry,
+                fieldMergerFactory
+            );
 
         fieldNameCell = new FieldNameCell(field.getDisplayName(), rowIndex);
-        leftValueCell = new FieldValueCell(viewModel.getLeftFieldValue(), rowIndex, preferencesService);
-        rightValueCell = new FieldValueCell(viewModel.getRightFieldValue(), rowIndex, preferencesService);
-        mergedValueCell = new MergedFieldCell(viewModel.getMergedFieldValue(), rowIndex);
+        leftValueCell =
+            new FieldValueCell(
+                viewModel.getLeftFieldValue(),
+                rowIndex,
+                preferencesService
+            );
+        rightValueCell =
+            new FieldValueCell(
+                viewModel.getRightFieldValue(),
+                rowIndex,
+                preferencesService
+            );
+        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.
         // 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());
+            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);
 
-        mergedValueCell.textProperty().bindBidirectional(viewModel.mergedFieldValueProperty());
-        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);
+        mergedValueCell
+            .textProperty()
+            .bindBidirectional(viewModel.mergedFieldValueProperty());
+        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(
+            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.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.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 +221,11 @@ 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...");
@@ -166,24 +235,50 @@ public void showDiff(ShowDiffConfig diffConfig) {
         // Clearing old diff styles based on previous diffConfig
         hideDiff();
         if (shouldShowDiffs.get()) {
-            if (diffConfig.diffView() == ThreeWayMergeToolbar.DiffView.UNIFIED) {
-                new UnifiedDiffHighlighter(leftLabel, rightLabel, diffConfig.diffHighlightingMethod()).highlight();
+            if (
+                diffConfig.diffView() == ThreeWayMergeToolbar.DiffView.UNIFIED
+            ) {
+                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
+                    );
             }
         }
     }
@@ -195,13 +290,25 @@ public void hideDiff() {
 
         LOGGER.debug("Hiding diffs...");
 
-        int leftValueLength = getLeftValueCell().getStyleClassedLabel().getLength();
-        getLeftValueCell().getStyleClassedLabel().clearStyle(0, leftValueLength);
-        getLeftValueCell().getStyleClassedLabel().replaceText(viewModel.getLeftFieldValue());
-
-        int rightValueLength = getRightValueCell().getStyleClassedLabel().getLength();
-        getRightValueCell().getStyleClassedLabel().clearStyle(0, rightValueLength);
-        getRightValueCell().getStyleClassedLabel().replaceText(viewModel.getRightFieldValue());
+        int leftValueLength = getLeftValueCell()
+            .getStyleClassedLabel()
+            .getLength();
+        getLeftValueCell()
+            .getStyleClassedLabel()
+            .clearStyle(0, leftValueLength);
+        getLeftValueCell()
+            .getStyleClassedLabel()
+            .replaceText(viewModel.getLeftFieldValue());
+
+        int rightValueLength = getRightValueCell()
+            .getStyleClassedLabel()
+            .getLength();
+        getRightValueCell()
+            .getStyleClassedLabel()
+            .clearStyle(0, rightValueLength);
+        getRightValueCell()
+            .getStyleClassedLabel()
+            .replaceText(viewModel.getRightFieldValue());
     }
 
     public boolean hasEqualLeftAndRightValues() {
@@ -210,6 +317,18 @@ 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 46886d9bee1..f110ad89f40 100644
--- a/src/main/java/org/jabref/gui/mergeentries/newmergedialog/FieldRowViewModel.java
+++ b/src/main/java/org/jabref/gui/mergeentries/newmergedialog/FieldRowViewModel.java
@@ -1,10 +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;
 import javafx.beans.property.BooleanProperty;
@@ -13,7 +9,10 @@
 import javafx.beans.property.SimpleObjectProperty;
 import javafx.beans.property.SimpleStringProperty;
 import javafx.beans.property.StringProperty;
-
+import javax.swing.undo.AbstractUndoableEdit;
+import javax.swing.undo.CannotRedoException;
+import javax.swing.undo.CannotUndoException;
+import javax.swing.undo.CompoundEdit;
 import org.jabref.gui.mergeentries.newmergedialog.fieldsmerger.FieldMerger;
 import org.jabref.gui.mergeentries.newmergedialog.fieldsmerger.FieldMergerFactory;
 import org.jabref.model.entry.BibEntry;
@@ -21,12 +20,11 @@
 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;
 
 public class FieldRowViewModel {
+
     public enum Selection {
         LEFT,
         RIGHT,
@@ -34,17 +32,24 @@ public enum Selection {
          * When the user types something into the merged field value and neither the left nor
          * right values match it, NONE is selected
          * */
-        NONE
+        NONE,
     }
 
-    private final Logger LOGGER = LoggerFactory.getLogger(FieldRowViewModel.class);
-    private final BooleanProperty isFieldsMerged = new SimpleBooleanProperty(Boolean.FALSE);
+    private final Logger LOGGER = LoggerFactory.getLogger(
+        FieldRowViewModel.class
+    );
+    private final BooleanProperty isFieldsMerged = new SimpleBooleanProperty(
+        Boolean.FALSE
+    );
 
-    private final ObjectProperty<Selection> selection = new SimpleObjectProperty<>();
+    private final ObjectProperty<Selection> selection =
+        new SimpleObjectProperty<>();
 
     private final StringProperty leftFieldValue = new SimpleStringProperty("");
     private final StringProperty rightFieldValue = new SimpleStringProperty("");
-    private final StringProperty mergedFieldValue = new SimpleStringProperty("");
+    private final StringProperty mergedFieldValue = new SimpleStringProperty(
+        ""
+    );
 
     private final Field field;
 
@@ -60,7 +65,13 @@ 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,49 +86,90 @@ 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);
+        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());
+        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.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(
+            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(
+            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);
+        EasyBind.subscribe(
+            hasEqualLeftAndRightBinding(),
+            this::setIsFieldsMerged
+        );
     }
 
     public void selectNonEmptyValue() {
@@ -171,14 +223,23 @@ public void mergeFields() {
         String oldRightFieldValue = getRightFieldValue();
 
         FieldMerger fieldMerger = fieldMergerFactory.create(field);
-        String mergedFields = fieldMerger.merge(getLeftFieldValue(), getRightFieldValue());
+        String mergedFields = fieldMerger.merge(
+            getLeftFieldValue(),
+            getRightFieldValue()
+        );
         setLeftFieldValue(mergedFields);
         setRightFieldValue(mergedFields);
 
         if (fieldsMergedEdit.canRedo()) {
             fieldsMergedEdit.redo();
         } else {
-            fieldsMergedEdit.addEdit(new MergeFieldsUndo(oldLeftFieldValue, oldRightFieldValue, mergedFields));
+            fieldsMergedEdit.addEdit(
+                new MergeFieldsUndo(
+                    oldLeftFieldValue,
+                    oldRightFieldValue,
+                    mergedFields
+                )
+            );
             fieldsMergedEdit.end();
         }
     }
@@ -258,6 +319,7 @@ public BibEntry getMergedEntry() {
     }
 
     class MergeFieldsUndo extends AbstractUndoableEdit {
+
         private final String oldLeft;
         private final String oldRight;
         private final String mergedFields;
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 e9e79069e01..e9d28c53a94 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 84544d77efd..b743eb728cc 100644
--- a/src/main/java/org/jabref/gui/mergeentries/newmergedialog/PersonsNameFieldRowView.java
+++ b/src/main/java/org/jabref/gui/mergeentries/newmergedialog/PersonsNameFieldRowView.java
@@ -11,25 +11,50 @@
 import org.jabref.preferences.PreferencesService;
 
 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, PreferencesService preferencesService, int rowIndex) {
-        super(field, leftEntry, rightEntry, mergedEntry, fieldMergerFactory, preferencesService, rowIndex);
+    public PersonsNameFieldRowView(
+        Field field,
+        BibEntry leftEntry,
+        BibEntry rightEntry,
+        BibEntry mergedEntry,
+        FieldMergerFactory fieldMergerFactory,
+        PreferencesService preferencesService,
+        int rowIndex
+    ) {
+        super(
+            field,
+            leftEntry,
+            rightEntry,
+            mergedEntry,
+            fieldMergerFactory,
+            preferencesService,
+            rowIndex
+        );
         assert field.getProperties().contains(FieldProperty.PERSON_NAMES);
 
         var authorsParser = new AuthorListParser();
         leftEntryNames = authorsParser.parse(viewModel.getLeftFieldValue());
         rightEntryNames = authorsParser.parse(viewModel.getRightFieldValue());
 
-        if (!viewModel.hasEqualLeftAndRightValues() && leftEntryNames.equals(rightEntryNames)) {
+        if (
+            !viewModel.hasEqualLeftAndRightValues() &&
+            leftEntryNames.equals(rightEntryNames)
+        ) {
             showPersonsNamesAreTheSameInfo();
             shouldShowDiffs.set(false);
         }
     }
 
     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 0f36d9ad5d2..16ba4e818d4 100644
--- a/src/main/java/org/jabref/gui/mergeentries/newmergedialog/ShowDiffConfig.java
+++ b/src/main/java/org/jabref/gui/mergeentries/newmergedialog/ShowDiffConfig.java
@@ -3,6 +3,6 @@
 import org.jabref.gui.mergeentries.newmergedialog.toolbar.ThreeWayMergeToolbar.DiffView;
 
 public record ShowDiffConfig(
-        DiffView diffView,
-        DiffMethod diffHighlightingMethod) {
-}
+    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 bf896f4b8a5..2f8a6d661c5 100644
--- a/src/main/java/org/jabref/gui/mergeentries/newmergedialog/ThreeWayMergeHeaderView.java
+++ b/src/main/java/org/jabref/gui/mergeentries/newmergedialog/ThreeWayMergeHeaderView.java
@@ -3,7 +3,6 @@
 import javafx.geometry.Insets;
 import javafx.scene.control.Control;
 import javafx.scene.layout.GridPane;
-
 import org.jabref.gui.mergeentries.newmergedialog.cell.HeaderCell;
 import org.jabref.logic.l10n.Localization;
 
@@ -12,6 +11,7 @@
  * with longer text, but I wanted all cells to have the same width
  */
 public class ThreeWayMergeHeaderView extends GridPane {
+
     public static final String DEFAULT_STYLE_CLASS = "merge-header";
     private final HeaderCell leftHeaderCell;
     private final HeaderCell rightHeaderCell;
@@ -23,13 +23,15 @@ public ThreeWayMergeHeaderView(String leftHeader, String rightHeader) {
 
         this.leftHeaderCell = new HeaderCell(leftHeader);
         this.rightHeaderCell = new HeaderCell(rightHeader);
-        this.mergedHeaderCell = new HeaderCell(Localization.lang("Merged Entry"));
-
-        addRow(0,
-               new HeaderCell(""),
-               leftHeaderCell,
-               rightHeaderCell,
-               mergedHeaderCell
+        this.mergedHeaderCell =
+            new HeaderCell(Localization.lang("Merged Entry"));
+
+        addRow(
+            0,
+            new HeaderCell(""),
+            leftHeaderCell,
+            rightHeaderCell,
+            mergedHeaderCell
         );
 
         setPrefHeight(Control.USE_COMPUTED_SIZE);
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 ac04d895b11..a3d0289e55b 100644
--- a/src/main/java/org/jabref/gui/mergeentries/newmergedialog/ThreeWayMergeView.java
+++ b/src/main/java/org/jabref/gui/mergeentries/newmergedialog/ThreeWayMergeView.java
@@ -2,7 +2,6 @@
 
 import java.util.ArrayList;
 import java.util.List;
-
 import javafx.scene.control.ScrollPane;
 import javafx.scene.layout.ColumnConstraints;
 import javafx.scene.layout.GridPane;
@@ -10,7 +9,6 @@
 import javafx.scene.layout.RowConstraints;
 import javafx.scene.layout.VBox;
 import javafx.stage.Screen;
-
 import org.jabref.gui.mergeentries.newmergedialog.fieldsmerger.FieldMergerFactory;
 import org.jabref.gui.mergeentries.newmergedialog.toolbar.ThreeWayMergeToolbar;
 import org.jabref.logic.l10n.Localization;
@@ -20,15 +18,24 @@
 import org.jabref.preferences.PreferencesService;
 
 public class ThreeWayMergeView extends VBox {
-    public static final int GRID_COLUMN_MIN_WIDTH = 250;
 
-    public static final String LEFT_DEFAULT_HEADER = Localization.lang("Left Entry");
-    public static final String RIGHT_DEFAULT_HEADER = Localization.lang("Right Entry");
+    public static final int GRID_COLUMN_MIN_WIDTH = 250;
 
-    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);
+    public static final String LEFT_DEFAULT_HEADER = Localization.lang(
+        "Left Entry"
+    );
+    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 ThreeWayMergeToolbar toolbar;
     private final ThreeWayMergeHeaderView headerView;
     private final ScrollPane scrollPane;
@@ -42,13 +49,34 @@ public class ThreeWayMergeView extends VBox {
     private final FieldMergerFactory fieldMergerFactory;
     private final String keywordSeparator;
 
-    public ThreeWayMergeView(BibEntry leftEntry, BibEntry rightEntry, String leftHeader, String rightHeader, PreferencesService preferencesService) {
+    public ThreeWayMergeView(
+        BibEntry leftEntry,
+        BibEntry rightEntry,
+        String leftHeader,
+        String rightHeader,
+        PreferencesService preferencesService
+    ) {
         this.preferencesService = preferencesService;
 
-        getStylesheets().add(ThreeWayMergeView.class.getResource("ThreeWayMergeView.css").toExternalForm());
-        viewModel = new ThreeWayMergeViewModel((BibEntry) leftEntry.clone(), (BibEntry) rightEntry.clone(), leftHeader, rightHeader);
-        this.fieldMergerFactory = new FieldMergerFactory(preferencesService.getBibEntryPreferences());
-        this.keywordSeparator = preferencesService.getBibEntryPreferences().getKeywordSeparator().toString();
+        getStylesheets()
+            .add(
+                ThreeWayMergeView.class.getResource("ThreeWayMergeView.css")
+                    .toExternalForm()
+            );
+        viewModel =
+            new ThreeWayMergeViewModel(
+                (BibEntry) leftEntry.clone(),
+                (BibEntry) rightEntry.clone(),
+                leftHeader,
+                rightHeader
+            );
+        this.fieldMergerFactory =
+            new FieldMergerFactory(preferencesService.getBibEntryPreferences());
+        this.keywordSeparator =
+            preferencesService
+                .getBibEntryPreferences()
+                .getKeywordSeparator()
+                .toString();
 
         mergeGridPane = new GridPane();
         scrollPane = new ScrollPane();
@@ -67,18 +95,34 @@ public ThreeWayMergeView(BibEntry leftEntry, BibEntry rightEntry, String leftHea
         getChildren().addAll(toolbar, headerView, scrollPane);
     }
 
-    public ThreeWayMergeView(BibEntry leftEntry, BibEntry rightEntry, PreferencesService preferencesService) {
-        this(leftEntry, rightEntry, LEFT_DEFAULT_HEADER, RIGHT_DEFAULT_HEADER, preferencesService);
+    public ThreeWayMergeView(
+        BibEntry leftEntry,
+        BibEntry rightEntry,
+        PreferencesService preferencesService
+    ) {
+        this(
+            leftEntry,
+            rightEntry,
+            LEFT_DEFAULT_HEADER,
+            RIGHT_DEFAULT_HEADER,
+            preferencesService
+        );
     }
 
     private void initializeToolbar() {
-        toolbar.setOnSelectLeftEntryValuesButtonClicked(this::selectLeftEntryValues);
-        toolbar.setOnSelectRightEntryValuesButtonClicked(this::selectRightEntryValues);
+        toolbar.setOnSelectLeftEntryValuesButtonClicked(
+            this::selectLeftEntryValues
+        );
+        toolbar.setOnSelectRightEntryValuesButtonClicked(
+            this::selectRightEntryValues
+        );
 
         toolbar.showDiffProperty().addListener(e -> updateDiff());
         toolbar.diffViewProperty().addListener(e -> updateDiff());
         toolbar.diffHighlightingMethodProperty().addListener(e -> updateDiff());
-        toolbar.hideEqualFieldsProperty().addListener(e -> showOrHideEqualFields());
+        toolbar
+            .hideEqualFieldsProperty()
+            .addListener(e -> showOrHideEqualFields());
 
         updateDiff();
         showOrHideEqualFields();
@@ -99,10 +143,30 @@ 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 {
@@ -111,10 +175,14 @@ private void updateDiff() {
     }
 
     private void initializeHeaderView() {
-        headerView.getColumnConstraints().addAll(fieldNameColumnConstraints,
-                                                 leftEntryColumnConstraints,
-                                                 rightEntryColumnConstraints,
-                                                 mergedEntryColumnConstraints);
+        headerView
+            .getColumnConstraints()
+            .addAll(
+                fieldNameColumnConstraints,
+                leftEntryColumnConstraints,
+                rightEntryColumnConstraints,
+                mergedEntryColumnConstraints
+            );
     }
 
     private void initializeScrollPane() {
@@ -131,9 +199,20 @@ private void initializeColumnConstraints() {
     }
 
     private void initializeMergeGridPane() {
-        mergeGridPane.getColumnConstraints().addAll(fieldNameColumnConstraints, leftEntryColumnConstraints, rightEntryColumnConstraints, mergedEntryColumnConstraints);
-
-        for (int fieldIndex = 0; fieldIndex < viewModel.numberOfVisibleFields(); fieldIndex++) {
+        mergeGridPane
+            .getColumnConstraints()
+            .addAll(
+                fieldNameColumnConstraints,
+                leftEntryColumnConstraints,
+                rightEntryColumnConstraints,
+                mergedEntryColumnConstraints
+            );
+
+        for (
+            int fieldIndex = 0;
+            fieldIndex < viewModel.numberOfVisibleFields();
+            fieldIndex++
+        ) {
             addRow(fieldIndex);
 
             mergeGridPane.getRowConstraints().add(new RowConstraints());
@@ -149,9 +228,27 @@ private void addRow(int fieldIndex) {
 
         FieldRowView fieldRow;
         if (field.getProperties().contains(FieldProperty.PERSON_NAMES)) {
-            fieldRow = new PersonsNameFieldRowView(field, getLeftEntry(), getRightEntry(), getMergedEntry(), fieldMergerFactory, preferencesService, fieldIndex);
+            fieldRow =
+                new PersonsNameFieldRowView(
+                    field,
+                    getLeftEntry(),
+                    getRightEntry(),
+                    getMergedEntry(),
+                    fieldMergerFactory,
+                    preferencesService,
+                    fieldIndex
+                );
         } else {
-            fieldRow = new FieldRowView(field, getLeftEntry(), getRightEntry(), getMergedEntry(), fieldMergerFactory, preferencesService, fieldIndex);
+            fieldRow =
+                new FieldRowView(
+                    field,
+                    getLeftEntry(),
+                    getRightEntry(),
+                    getMergedEntry(),
+                    fieldMergerFactory,
+                    preferencesService,
+                    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 8df57827673..76d2f5119e6 100644
--- a/src/main/java/org/jabref/gui/mergeentries/newmergedialog/ThreeWayMergeViewModel.java
+++ b/src/main/java/org/jabref/gui/mergeentries/newmergedialog/ThreeWayMergeViewModel.java
@@ -5,14 +5,12 @@
 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;
 import javafx.beans.property.StringProperty;
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableList;
-
 import org.jabref.gui.AbstractViewModel;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.field.Field;
@@ -21,15 +19,24 @@
 
 public class ThreeWayMergeViewModel extends AbstractViewModel {
 
-    private final ObjectProperty<BibEntry> leftEntry = new SimpleObjectProperty<>();
-    private final ObjectProperty<BibEntry> rightEntry = new SimpleObjectProperty<>();
-    private final ObjectProperty<BibEntry> mergedEntry = new SimpleObjectProperty<>();
+    private final ObjectProperty<BibEntry> leftEntry =
+        new SimpleObjectProperty<>();
+    private final ObjectProperty<BibEntry> rightEntry =
+        new SimpleObjectProperty<>();
+    private final ObjectProperty<BibEntry> mergedEntry =
+        new SimpleObjectProperty<>();
     private final StringProperty leftHeader = new SimpleStringProperty();
     private final StringProperty rightHeader = new SimpleStringProperty();
 
-    private final ObservableList<Field> visibleFields = FXCollections.observableArrayList();
+    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 +49,14 @@ 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 e18a831933b..a9e4b43b5cf 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,16 +1,19 @@
 package org.jabref.gui.mergeentries.newmergedialog.cell;
 
 import java.util.Objects;
-
 import org.jabref.gui.ClipBoardManager;
 import org.jabref.gui.actions.SimpleCommand;
 import org.jabref.preferences.PreferencesService;
 
 public class CopyFieldValueCommand extends SimpleCommand {
+
     private final String fieldValue;
     private final ClipBoardManager clipBoardManager;
 
-    public CopyFieldValueCommand(PreferencesService preferencesService, final String fieldValue) {
+    public CopyFieldValueCommand(
+        PreferencesService preferencesService,
+        final String fieldValue
+    ) {
         Objects.requireNonNull(fieldValue, "Field value cannot be null");
         this.fieldValue = fieldValue;
         this.clipBoardManager = new ClipBoardManager(preferencesService);
diff --git a/src/main/java/org/jabref/gui/mergeentries/newmergedialog/cell/FieldNameCell.java b/src/main/java/org/jabref/gui/mergeentries/newmergedialog/cell/FieldNameCell.java
index a435f623187..f557555d5ed 100644
--- a/src/main/java/org/jabref/gui/mergeentries/newmergedialog/cell/FieldNameCell.java
+++ b/src/main/java/org/jabref/gui/mergeentries/newmergedialog/cell/FieldNameCell.java
@@ -9,6 +9,7 @@
  * A readonly cell used to display the name of some field.
  */
 public class FieldNameCell extends ThreeWayMergeCell {
+
     public static final String DEFAULT_STYLE_CLASS = "field-name";
     protected final HBox actionLayout = new HBox();
     private final Label label = new Label();
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 3b7d0036722..55e574f4ce3 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,6 @@
 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;
@@ -18,7 +19,8 @@
 import javafx.scene.layout.HBox;
 import javafx.scene.layout.Priority;
 import javafx.scene.paint.Color;
-
+import org.fxmisc.flowless.VirtualizedScrollPane;
+import org.fxmisc.richtext.StyleClassedTextArea;
 import org.jabref.gui.Globals;
 import org.jabref.gui.actions.ActionFactory;
 import org.jabref.gui.fieldeditors.URLUtil;
@@ -27,10 +29,6 @@
 import org.jabref.model.entry.identifier.DOI;
 import org.jabref.model.strings.StringUtil;
 import org.jabref.preferences.PreferencesService;
-
-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;
@@ -40,36 +38,47 @@
  * A readonly, selectable field cell that contains the value of some field
  */
 public class FieldValueCell extends ThreeWayMergeCell implements Toggle {
-    public static final Logger LOGGER = LoggerFactory.getLogger(FieldValueCell.class);
+
+    public static final Logger LOGGER = LoggerFactory.getLogger(
+        FieldValueCell.class
+    );
 
     public static final String DEFAULT_STYLE_CLASS = "merge-field-value";
     public static final String SELECTION_BOX_STYLE_CLASS = "selection-box";
 
-    private static final PseudoClass SELECTED_PSEUDO_CLASS = PseudoClass.getPseudoClass("selected");
+    private static final PseudoClass SELECTED_PSEUDO_CLASS =
+        PseudoClass.getPseudoClass("selected");
 
     private final PreferencesService preferencesService;
 
     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();
     private final HBox actionsContainer = new HBox();
     private final FieldValueCellViewModel viewModel;
 
-    public FieldValueCell(String text, int rowIndex, PreferencesService preferencesService) {
+    public FieldValueCell(
+        String text,
+        int rowIndex,
+        PreferencesService preferencesService
+    ) {
         super(text, rowIndex);
-
         this.preferencesService = preferencesService;
         this.factory = new ActionFactory(Globals.getKeyPrefs());
         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());
 
@@ -103,17 +112,26 @@ private void initializeLabel() {
         // Workarounds
         preventTextSelectionViaMouseEvents();
 
-        label.prefHeightProperty().bind(label.totalHeightEstimateProperty().orElseConst(-1d));
+        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() {
-        actionsContainer.getChildren().setAll(createOpenLinkButton(), createCopyButton());
+        actionsContainer
+            .getChildren()
+            .setAll(createOpenLinkButton(), createCopyButton());
         actionsContainer.setAlignment(Pos.TOP_CENTER);
         actionsContainer.setPrefWidth(28);
     }
@@ -131,7 +149,10 @@ private Button createCopyButton() {
         FontIcon copyIcon = FontIcon.of(MaterialDesignC.CONTENT_COPY);
         copyIcon.getStyleClass().add("action-icon");
 
-        Button copyButton = factory.createIconButton(() -> Localization.lang("Copy"), new CopyFieldValueCommand(preferencesService, getText()));
+        Button copyButton = factory.createIconButton(
+            () -> Localization.lang("Copy"),
+            new CopyFieldValueCommand(preferencesService, getText())
+        );
         copyButton.setGraphic(copyIcon);
         copyButton.setContentDisplay(ContentDisplay.GRAPHIC_ONLY);
         copyButton.setMaxHeight(Double.MAX_VALUE);
@@ -144,12 +165,27 @@ 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(), preferencesService.getFilePreferences()));
+        Button openLinkButton = factory.createIconButton(
+            () -> Localization.lang("Open Link"),
+            new OpenExternalLinkAction(
+                getText(),
+                preferencesService.getFilePreferences()
+            )
+        );
         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;
     }
@@ -160,17 +196,22 @@ private void initializeScrollPane() {
     }
 
     private void preventTextSelectionViaMouseEvents() {
-        label.addEventFilter(MouseEvent.ANY, e -> {
-            if ((e.getEventType() == MouseEvent.MOUSE_DRAGGED) ||
+        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.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 7587d1e261b..e95e6858bec 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
@@ -9,9 +9,14 @@
 import javafx.scene.control.ToggleGroup;
 
 public class FieldValueCellViewModel {
+
     private final StringProperty fieldValue = new SimpleStringProperty();
-    private final BooleanProperty selected = new SimpleBooleanProperty(FieldValueCell.class, "selected");
-    private final ObjectProperty<ToggleGroup> toggleGroup = new SimpleObjectProperty<>();
+    private final BooleanProperty selected = new SimpleBooleanProperty(
+        FieldValueCell.class,
+        "selected"
+    );
+    private final ObjectProperty<ToggleGroup> toggleGroup =
+        new SimpleObjectProperty<>();
 
     public FieldValueCellViewModel(String text) {
         setFieldValue(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 70ca433229a..84ff082fdba 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
@@ -7,6 +7,7 @@
  * A readonly cell used to display the header of the ThreeWayMerge UI at the top of the layout.
  * */
 public class HeaderCell extends ThreeWayMergeCell {
+
     public static final String DEFAULT_STYLE_CLASS = "merge-header-cell";
     private final Label label = new Label();
 
@@ -23,6 +24,13 @@ 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 89c591ee0ac..d2b52d0aff0 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
@@ -5,12 +5,11 @@
 import javafx.scene.input.ScrollEvent;
 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";
 
     private final StyleClassedTextArea textArea = new StyleClassedTextArea();
@@ -27,10 +26,12 @@ 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 +39,14 @@ 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 abc43d3f049..96a95423588 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
@@ -2,12 +2,10 @@
 
 import java.io.IOException;
 import java.net.URI;
-
 import org.jabref.gui.actions.SimpleCommand;
 import org.jabref.gui.desktop.JabRefDesktop;
 import org.jabref.model.entry.identifier.DOI;
 import org.jabref.preferences.FilePreferences;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -15,13 +13,19 @@
  * A command for opening DOIs and URLs. This was created primarily for simplifying {@link FieldValueCell}.
  */
 public class OpenExternalLinkAction extends SimpleCommand {
-    private final Logger LOGGER = LoggerFactory.getLogger(OpenExternalLinkAction.class);
+
+    private final Logger LOGGER = LoggerFactory.getLogger(
+        OpenExternalLinkAction.class
+    );
 
     private final FilePreferences filePreferences;
 
     private final String urlOrDoi;
 
-    public OpenExternalLinkAction(String urlOrDoi, FilePreferences filePreferences) {
+    public OpenExternalLinkAction(
+        String urlOrDoi,
+        FilePreferences filePreferences
+    ) {
         this.filePreferences = filePreferences;
         this.urlOrDoi = urlOrDoi;
     }
@@ -31,17 +35,22 @@ public void execute() {
         try {
             if (DOI.isValid(urlOrDoi)) {
                 JabRefDesktop.openBrowser(
-                        DOI.parse(urlOrDoi)
-                           .flatMap(DOI::getExternalURI)
-                           .map(URI::toString)
-                           .orElse(""),
-                        filePreferences
+                    DOI
+                        .parse(urlOrDoi)
+                        .flatMap(DOI::getExternalURI)
+                        .map(URI::toString)
+                        .orElse(""),
+                    filePreferences
                 );
             } else {
                 JabRefDesktop.openBrowser(urlOrDoi, filePreferences);
             }
         } catch (IOException e) {
-            LOGGER.warn("Cannot open the given external link '{}'", urlOrDoi, 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 1c9df85a6bd..e4c63df6786 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,12 +1,12 @@
 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";
     public static final int HEADER_ROW = -1;
@@ -18,12 +18,24 @@ 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 e5674a60251..fe59de87c13 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,18 +1,24 @@
 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");
-    private final BooleanProperty even = new SimpleBooleanProperty(ThreeWayMergeCell.class, "even");
+    private final BooleanProperty odd = new SimpleBooleanProperty(
+        ThreeWayMergeCell.class,
+        "odd"
+    );
+    private final BooleanProperty even = new SimpleBooleanProperty(
+        ThreeWayMergeCell.class,
+        "even"
+    );
 
     public ThreeWayMergeCellViewModel(String text, int rowIndex) {
         setText(text);
@@ -24,13 +30,19 @@ public ThreeWayMergeCellViewModel(String text, int rowIndex) {
             }
         }
 
-        EasyBind.subscribe(odd, isOdd -> {
-            setEven(!isOdd);
-        });
+        EasyBind.subscribe(
+            odd,
+            isOdd -> {
+                setEven(!isOdd);
+            }
+        );
 
-        EasyBind.subscribe(even, isEven -> {
-            setOdd(!isEven);
-        });
+        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 55bb2009bbf..9a6de68df6a 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,11 +1,10 @@
 package org.jabref.gui.mergeentries.newmergedialog.cell.sidebuttons;
 
+import com.tobiasdiez.easybind.EasyBind;
 import java.util.Optional;
-
 import javafx.beans.property.SimpleStringProperty;
 import javafx.beans.property.StringProperty;
 import javafx.scene.control.Button;
-
 import org.jabref.gui.Globals;
 import org.jabref.gui.actions.Action;
 import org.jabref.gui.actions.ActionFactory;
@@ -13,11 +12,12 @@
 import org.jabref.gui.icon.IconTheme;
 import org.jabref.gui.icon.JabRefIcon;
 
-import com.tobiasdiez.easybind.EasyBind;
-
 public class InfoButton extends Button {
+
     private final StringProperty infoMessage = new SimpleStringProperty();
-    private final ActionFactory actionFactory = new ActionFactory(Globals.getKeyPrefs());
+    private final ActionFactory actionFactory = new ActionFactory(
+        Globals.getKeyPrefs()
+    );
 
     private final Action mergeAction = new Action() {
         @Override
@@ -34,18 +34,25 @@ public String getText() {
     public InfoButton(String infoMessage) {
         this.infoMessage.setValue(infoMessage);
         configureButton();
-        EasyBind.subscribe(this.infoMessage, newWarningMessage -> configureButton());
+        EasyBind.subscribe(
+            this.infoMessage,
+            newWarningMessage -> configureButton()
+        );
     }
 
     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 4622918ec50..0b985304d3e 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,13 +1,11 @@
 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;
 import javafx.beans.property.SimpleObjectProperty;
 import javafx.scene.control.Button;
-
 import org.jabref.gui.Globals;
 import org.jabref.gui.actions.Action;
 import org.jabref.gui.actions.ActionFactory;
@@ -18,10 +16,16 @@
 import org.jabref.model.entry.field.Field;
 
 public class ToggleMergeUnmergeButton extends Button {
-    private final ObjectProperty<FieldState> fieldState = new SimpleObjectProperty<>(FieldState.UNMERGED);
-    private final BooleanProperty canMerge = new SimpleBooleanProperty(Boolean.TRUE);
 
-    private final ActionFactory actionFactory = new ActionFactory(Globals.getKeyPrefs());
+    private final ObjectProperty<FieldState> fieldState =
+        new SimpleObjectProperty<>(FieldState.UNMERGED);
+    private final BooleanProperty canMerge = new SimpleBooleanProperty(
+        Boolean.TRUE
+    );
+
+    private final ActionFactory actionFactory = new ActionFactory(
+        Globals.getKeyPrefs()
+    );
 
     private final Field field;
 
@@ -36,12 +40,20 @@ public ToggleMergeUnmergeButton(Field field) {
 
     private void configureMergeButton() {
         ToggleMergeCommand mergeCommand = new ToggleMergeCommand();
-        actionFactory.configureIconButton(mergeCommand.mergeAction, mergeCommand, this);
+        actionFactory.configureIconButton(
+            mergeCommand.mergeAction,
+            mergeCommand,
+            this
+        );
     }
 
     private void configureUnmergeButton() {
         ToggleMergeCommand unmergeCommand = new ToggleMergeCommand();
-        actionFactory.configureIconButton(unmergeCommand.unmergeAction, unmergeCommand, this);
+        actionFactory.configureIconButton(
+            unmergeCommand.unmergeAction,
+            unmergeCommand,
+            this
+        );
     }
 
     public ObjectProperty<FieldState> fieldStateProperty() {
@@ -72,6 +84,7 @@ public void setCanMerge(boolean value) {
     }
 
     private class ToggleMergeCommand extends SimpleCommand {
+
         private final Action mergeAction = new Action() {
             @Override
             public Optional<JabRefIcon> getIcon() {
@@ -109,6 +122,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 0e69aed2c1c..53775f7ecb0 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
@@ -3,20 +3,30 @@
 import java.util.Arrays;
 import java.util.List;
 import java.util.Objects;
-
+import org.fxmisc.richtext.StyleClassedTextArea;
 import org.jabref.gui.mergeentries.newmergedialog.DiffMethod;
 
-import org.fxmisc.richtext.StyleClassedTextArea;
+public abstract sealed class DiffHighlighter
+    permits SplitDiffHighlighter, UnifiedDiffHighlighter {
 
-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) {
-        Objects.requireNonNull(sourceTextview, "source text view MUST NOT be null.");
-        Objects.requireNonNull(targetTextview, "target text view MUST NOT be null.");
+    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."
+        );
 
         this.sourceTextview = sourceTextview;
         this.targetTextview = targetTextview;
@@ -42,7 +52,9 @@ public String getSeparator() {
     }
 
     public enum BasicDiffMethod implements DiffMethod {
-        WORDS(" "), CHARS(""), COMMA(",");
+        WORDS(" "),
+        CHARS(""),
+        COMMA(",");
 
         private final String separator;
 
@@ -61,12 +73,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 f5194732eda..31ea10af885 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,10 @@
 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 java.util.List;
 import org.fxmisc.richtext.StyleClassedTextArea;
+import org.jabref.gui.mergeentries.newmergedialog.DiffMethod;
 
 /**
  * A diff highlighter in which changes are split between source and target text view.
@@ -14,7 +12,11 @@
  */
 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 +31,9 @@ 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,40 +41,82 @@ 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");
-                case INSERT ->
-                        targetTextview.setStyleClass(affectedTargetTokensPositionInText, affectedTargetTokensPositionInText + joinedTargetTokensLength, "addition");
+                case DELETE -> sourceTextview.setStyleClass(
+                    affectedSourceTokensPositionInText,
+                    affectedSourceTokensPositionInText +
+                    joinedSourceTokensLength,
+                    "deletion"
+                );
+                case INSERT -> targetTextview.setStyleClass(
+                    affectedTargetTokensPositionInText,
+                    affectedTargetTokensPositionInText +
+                    joinedTargetTokensLength,
+                    "addition"
+                );
             }
         }
     }
 
-    public int getPositionInText(int positionInTokenList, List<String> tokenList) {
+    public int getPositionInText(
+        int positionInTokenList,
+        List<String> tokenList
+    ) {
         if (positionInTokenList == 0) {
             return 0;
         } else {
-            return tokenList.stream().limit(positionInTokenList).map(String::length)
-                    .reduce(Integer::sum)
-                    .map(value -> value + (getSeparator().length() * positionInTokenList))
-                    .orElse(0);
+            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 c15e0420f3b..86bc3a982bc 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,13 @@
 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 java.util.ArrayList;
+import java.util.List;
+import java.util.Optional;
 import org.fxmisc.richtext.StyleClassedTextArea;
+import org.jabref.gui.mergeentries.newmergedialog.DiffMethod;
 
 /**
  * A diff highlighter in which differences of type {@link DeltaType#CHANGE} are unified and represented by an insertion
@@ -17,7 +15,11 @@
  */
 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 +35,9 @@ 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<>();
 
@@ -44,25 +48,50 @@ public void highlight() {
                     int changePosition = delta.getTarget().getPosition();
                     int deletionPoint = changePosition + deletionCount;
                     int insertionPoint = deletionPoint + 1;
-                    List<String> deltaSourceWords = delta.getSource().getLines();
-                    List<String> deltaTargetWords = delta.getTarget().getLines();
+                    List<String> deltaSourceWords = delta
+                        .getSource()
+                        .getLines();
+                    List<String> deltaTargetWords = delta
+                        .getTarget()
+                        .getLines();
 
                     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(deletionPoint, 1, ChangeType.CHANGE_DELETION)
+                    );
+                    changeList.add(
+                        new Change(
+                            insertionPoint,
+                            deltaTargetWords.size(),
+                            ChangeType.ADDITION
+                        )
+                    );
                     deletionCount++;
                 }
                 case DELETE -> {
-                    int deletionPoint = delta.getTarget().getPosition() + deletionCount;
-                    unifiedWords.add(deletionPoint, join(delta.getSource().getLines()));
-
-                    changeList.add(new Change(deletionPoint, 1, ChangeType.DELETION));
+                    int deletionPoint =
+                        delta.getTarget().getPosition() + deletionCount;
+                    unifiedWords.add(
+                        deletionPoint,
+                        join(delta.getSource().getLines())
+                    );
+
+                    changeList.add(
+                        new Change(deletionPoint, 1, ChangeType.DELETION)
+                    );
                     deletionCount++;
                 }
                 case INSERT -> {
-                    int insertionPoint = delta.getTarget().getPosition() + deletionCount;
-                    changeList.add(new Change(insertionPoint, delta.getTarget().getLines().size(), ChangeType.ADDITION));
+                    int insertionPoint =
+                        delta.getTarget().getPosition() + deletionCount;
+                    changeList.add(
+                        new Change(
+                            insertionPoint,
+                            delta.getTarget().getLines().size(),
+                            ChangeType.ADDITION
+                        )
+                    );
                 }
             }
         }
@@ -71,24 +100,50 @@ public void highlight() {
         boolean changeInProgress = false;
         for (int position = 0; position < unifiedWords.size(); position++) {
             String word = unifiedWords.get(position);
-            Optional<Change> changeAtPosition = findChange(position, changeList);
+            Optional<Change> changeAtPosition = findChange(
+                position,
+                changeList
+            );
             if (changeAtPosition.isEmpty()) {
-                appendToTextArea(targetTextview, getSeparator() + word, "unchanged");
+                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");
+                        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;
@@ -100,20 +155,30 @@ public void highlight() {
         }
     }
 
-    private void appendToTextArea(StyleClassedTextArea textArea, String text, String styleClass) {
+    private void appendToTextArea(
+        StyleClassedTextArea textArea,
+        String text,
+        String styleClass
+    ) {
         if (text.isEmpty()) {
             return;
         }
         // Append separator without styling it
         if (text.startsWith(getSeparator())) {
             textArea.append(getSeparator(), "unchanged");
-            textArea.append(text.substring(getSeparator().length()), styleClass);
+            textArea.append(
+                text.substring(getSeparator().length()),
+                styleClass
+            );
         } else {
             textArea.append(text, styleClass);
         }
     }
 
     private Optional<Change> findChange(int position, List<Change> changeList) {
-        return changeList.stream().filter(change -> change.position() == position).findAny();
+        return changeList
+            .stream()
+            .filter(change -> change.position() == position)
+            .findAny();
     }
 }
diff --git a/src/main/java/org/jabref/gui/mergeentries/newmergedialog/fieldsmerger/CommentMerger.java b/src/main/java/org/jabref/gui/mergeentries/newmergedialog/fieldsmerger/CommentMerger.java
index 9beb1819423..fbd102cad16 100644
--- a/src/main/java/org/jabref/gui/mergeentries/newmergedialog/fieldsmerger/CommentMerger.java
+++ b/src/main/java/org/jabref/gui/mergeentries/newmergedialog/fieldsmerger/CommentMerger.java
@@ -7,6 +7,7 @@
  * A merger for the {@link StandardField#COMMENT} field
  * */
 public class CommentMerger implements FieldMerger {
+
     @Override
     public String merge(String fieldValueA, String fieldValueB) {
         return fieldValueA + OS.NEWLINE + fieldValueB;
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 24be429302a..dd426f67c93 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
@@ -5,6 +5,7 @@
 import org.jabref.preferences.BibEntryPreferences;
 
 public class FieldMergerFactory {
+
     private final BibEntryPreferences bibEntryPreferences;
 
     public FieldMergerFactory(BibEntryPreferences bibEntryPreferences) {
@@ -21,11 +22,19 @@ 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 91063b931f1..d3ee4cba7a4 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,7 +1,6 @@
 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;
@@ -12,6 +11,7 @@
  * A merger for the {@link StandardField#FILE} field
  * */
 public class FileMerger implements FieldMerger {
+
     @Override
     public String merge(String filesA, String filesB) {
         if (StringUtil.isBlank(filesA + filesB)) {
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 2b892fcd31a..be6e88af2bf 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
@@ -3,7 +3,6 @@
 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;
 
@@ -11,8 +10,11 @@
  * A merger for the {@link StandardField#GROUPS} field
  * */
 public class GroupMerger implements FieldMerger {
+
     public static final String GROUPS_SEPARATOR = ", ";
-    public static final Pattern GROUPS_SEPARATOR_REGEX = Pattern.compile("\s*,\s*");
+    public static final Pattern GROUPS_SEPARATOR_REGEX = Pattern.compile(
+        "\s*,\s*"
+    );
 
     @Override
     public String merge(String groupsA, String groupsB) {
@@ -23,9 +25,14 @@ public String merge(String groupsA, String groupsB) {
         } else if (StringUtil.isBlank(groupsB)) {
             return groupsA;
         } else {
-            return Arrays.stream(GROUPS_SEPARATOR_REGEX.split(groupsA + GROUPS_SEPARATOR + groupsB))
-                         .distinct()
-                         .collect(Collectors.joining(GROUPS_SEPARATOR));
+            return Arrays
+                .stream(
+                    GROUPS_SEPARATOR_REGEX.split(
+                        groupsA + GROUPS_SEPARATOR + groupsB
+                    )
+                )
+                .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 8e7e7540767..7e30d73bcfd 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,7 +1,6 @@
 package org.jabref.gui.mergeentries.newmergedialog.fieldsmerger;
 
 import java.util.Objects;
-
 import org.jabref.model.entry.KeywordList;
 import org.jabref.model.entry.field.StandardField;
 import org.jabref.preferences.BibEntryPreferences;
@@ -10,6 +9,7 @@
  * A merger for the {@link StandardField#KEYWORDS} field
  * */
 public class KeywordMerger implements FieldMerger {
+
     private final BibEntryPreferences bibEntryPreferences;
 
     public KeywordMerger(BibEntryPreferences bibEntryPreferences) {
@@ -20,6 +20,8 @@ public KeywordMerger(BibEntryPreferences bibEntryPreferences) {
     @Override
     public String merge(String keywordsA, String keywordsB) {
         Character delimiter = bibEntryPreferences.getKeywordSeparator();
-        return KeywordList.merge(keywordsA, keywordsB, delimiter).getAsString(delimiter);
+        return KeywordList
+            .merge(keywordsA, keywordsB, delimiter)
+            .getAsString(delimiter);
     }
 }
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 03a595741e5..9975f1fe6d4 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,10 @@
 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;
@@ -13,20 +18,14 @@
 import javafx.scene.control.ToggleGroup;
 import javafx.scene.layout.AnchorPane;
 import javafx.util.StringConverter;
-
 import org.jabref.gui.mergeentries.newmergedialog.DiffMethod;
 import org.jabref.gui.mergeentries.newmergedialog.diffhighlighter.DiffHighlighter.BasicDiffMethod;
 import org.jabref.logic.l10n.Localization;
 import org.jabref.preferences.GuiPreferences;
 import org.jabref.preferences.PreferencesService;
 
-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;
 
@@ -54,61 +53,87 @@ public class ThreeWayMergeToolbar extends AnchorPane {
     @Inject
     private PreferencesService preferencesService;
 
-    private final ObjectProperty<DiffMethod> diffHighlightingMethod = new SimpleObjectProperty<>();
-    private final BooleanProperty onlyShowChangedFields = new SimpleBooleanProperty();
+    private final ObjectProperty<DiffMethod> diffHighlightingMethod =
+        new SimpleObjectProperty<>();
+    private final BooleanProperty onlyShowChangedFields =
+        new SimpleBooleanProperty();
     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();
-            }
-
-            @Override
-            public PlainTextOrDiff fromString(String string) {
-                return PlainTextOrDiff.fromString(string);
+        plainTextOrDiffComboBox.setConverter(
+            new StringConverter<>() {
+                @Override
+                public String toString(PlainTextOrDiff plainTextOrDiff) {
+                    return plainTextOrDiff.getValue();
+                }
+
+                @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(preferencesService.getGuiPreferences().mergeShowChangedFieldOnlyProperty());
-        onlyShowChangedFields.bind(onlyShowChangedFieldsCheck.selectedProperty());
+        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(
+                preferencesService
+                    .getGuiPreferences()
+                    .mergeShowChangedFieldOnlyProperty()
+            );
+        onlyShowChangedFields.bind(
+            onlyShowChangedFieldsCheck.selectedProperty()
+        );
 
         loadSavedConfiguration();
     }
@@ -116,21 +141,46 @@ public DiffView fromString(String string) {
     private void loadSavedConfiguration() {
         GuiPreferences guiPreferences = preferencesService.getGuiPreferences();
 
-        PlainTextOrDiff plainTextOrDiffPreference = guiPreferences.getMergeShouldShowDiff() ? PlainTextOrDiff.Diff : PlainTextOrDiff.PLAIN_TEXT;
-        plainTextOrDiffComboBox.getSelectionModel().select(plainTextOrDiffPreference);
-
-        DiffView diffViewPreference = guiPreferences.getMergeShouldShowUnifiedDiff() ? DiffView.UNIFIED : DiffView.SPLIT;
+        PlainTextOrDiff plainTextOrDiffPreference =
+            guiPreferences.getMergeShouldShowDiff()
+                ? PlainTextOrDiff.Diff
+                : PlainTextOrDiff.PLAIN_TEXT;
+        plainTextOrDiffComboBox
+            .getSelectionModel()
+            .select(plainTextOrDiffPreference);
+
+        DiffView diffViewPreference =
+            guiPreferences.getMergeShouldShowUnifiedDiff()
+                ? DiffView.UNIFIED
+                : DiffView.SPLIT;
         diffViewComboBox.getSelectionModel().select(diffViewPreference);
 
-        diffHighlightingMethodToggleGroup.selectToggle(guiPreferences.getMergeHighlightWords() ? highlightWordsRadioButton : highlightCharactersRadioButtons);
+        diffHighlightingMethodToggleGroup.selectToggle(
+            guiPreferences.getMergeHighlightWords()
+                ? highlightWordsRadioButton
+                : highlightCharactersRadioButtons
+        );
     }
 
     public void saveToolbarConfiguration() {
-        preferencesService.getGuiPreferences().setMergeShouldShowDiff(plainTextOrDiffComboBox.getValue() == PlainTextOrDiff.Diff);
-        preferencesService.getGuiPreferences().setMergeShouldShowUnifiedDiff(diffViewComboBox.getValue() == DiffView.UNIFIED);
-
-        boolean highlightWordsRadioButtonValue = diffHighlightingMethodToggleGroup.getSelectedToggle().equals(highlightWordsRadioButton);
-        preferencesService.getGuiPreferences().setMergeHighlightWords(highlightWordsRadioButtonValue);
+        preferencesService
+            .getGuiPreferences()
+            .setMergeShouldShowDiff(
+                plainTextOrDiffComboBox.getValue() == PlainTextOrDiff.Diff
+            );
+        preferencesService
+            .getGuiPreferences()
+            .setMergeShouldShowUnifiedDiff(
+                diffViewComboBox.getValue() == DiffView.UNIFIED
+            );
+
+        boolean highlightWordsRadioButtonValue =
+            diffHighlightingMethodToggleGroup
+                .getSelectedToggle()
+                .equals(highlightWordsRadioButton);
+        preferencesService
+            .getGuiPreferences()
+            .setMergeHighlightWords(highlightWordsRadioButtonValue);
     }
 
     public ObjectProperty<DiffView> diffViewProperty() {
@@ -150,7 +200,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() {
@@ -198,7 +250,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;
 
@@ -222,6 +275,7 @@ public static PlainTextOrDiff fromString(String str) {
     public enum DiffView {
         UNIFIED(Localization.lang("Unified View")),
         SPLIT(Localization.lang("Split View"));
+
         private final String value;
 
         DiffView(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 18029ee5f40..abb256093a0 100644
--- a/src/main/java/org/jabref/gui/openoffice/AdvancedCiteDialogView.java
+++ b/src/main/java/org/jabref/gui/openoffice/AdvancedCiteDialogView.java
@@ -1,28 +1,33 @@
 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;
 import javafx.scene.control.TextField;
 import javafx.scene.control.ToggleGroup;
-
 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;
 
-public class AdvancedCiteDialogView extends BaseDialog<AdvancedCiteDialogViewModel> {
+    @FXML
+    private RadioButton inPar;
+
+    @FXML
+    private RadioButton inText;
+
+    @FXML
+    private ToggleGroup citeToggleGroup;
 
-    @FXML private TextField pageInfo;
-    @FXML private RadioButton inPar;
-    @FXML private RadioButton inText;
-    @FXML private ToggleGroup citeToggleGroup;
     private AdvancedCiteDialogViewModel viewModel;
 
     public AdvancedCiteDialogView() {
-        ViewLoader.view(this)
-                  .load()
-                  .setAsDialogPane(this);
+        ViewLoader.view(this).load().setAsDialogPane(this);
 
         setResultConverter(btn -> {
             if (btn == ButtonType.OK) {
@@ -38,8 +43,12 @@ public AdvancedCiteDialogView() {
     private void initialize() {
         viewModel = new AdvancedCiteDialogViewModel();
 
-        inPar.selectedProperty().bindBidirectional(viewModel.citeInParProperty());
-        inText.selectedProperty().bindBidirectional(viewModel.citeInTextProperty());
+        inPar
+            .selectedProperty()
+            .bindBidirectional(viewModel.citeInParProperty());
+        inText
+            .selectedProperty()
+            .bindBidirectional(viewModel.citeInTextProperty());
         pageInfo.textProperty().bindBidirectional(viewModel.pageInfoProperty());
     }
 }
diff --git a/src/main/java/org/jabref/gui/openoffice/Bootstrap.java b/src/main/java/org/jabref/gui/openoffice/Bootstrap.java
index e7338713e9e..e2bd4297d2f 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;
@@ -48,47 +35,97 @@
 import com.sun.star.loader.XImplementationLoader;
 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));
+        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
+            )
+        );
     }
 
     /**
@@ -109,7 +146,12 @@ private static void insertBasicFactories(XSet xSet, XImplementationLoader xImpLo
      * @since LibreOffice 5.1
      */
     public static String[] getDefaultOptions() {
-        return new String[] {"--nologo", "--nodefault", "--norestore", "--nolockcheck"};
+        return new String[] {
+            "--nologo",
+            "--nodefault",
+            "--norestore",
+            "--nolockcheck",
+        };
     }
 
     /**
@@ -119,8 +161,12 @@ 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 {
-        return createInitialComponentContext((Map<String, Object>) context_entries);
+    public static XComponentContext createInitialComponentContext(
+        Hashtable<String, Object> context_entries
+    ) throws Exception {
+        return createInitialComponentContext(
+            (Map<String, Object>) context_entries
+        );
     }
 
     /**
@@ -130,12 +176,20 @@ 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());
-        XInitialization xInit = UnoRuntime.queryInterface(XInitialization.class, xImpLoader);
-        Object[] args = new Object[] {xSMgr};
+        XImplementationLoader xImpLoader = UnoRuntime.queryInterface(
+            XImplementationLoader.class,
+            new JavaLoader()
+        );
+        XInitialization xInit = UnoRuntime.queryInterface(
+            XInitialization.class,
+            xImpLoader
+        );
+        Object[] args = new Object[] { xSMgr };
         xInit.initialize(args);
 
         // initial component context
@@ -143,9 +197,15 @@ 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);
+        XComponentContext xContext = new ComponentContext(
+            context_entries,
+            null
+        );
 
         xSMgr.setDefaultContext(xContext);
 
@@ -164,8 +224,13 @@ public static XComponentContext createInitialComponentContext(Map<String, Object
      * @return a freshly bootstrapped service manager
      * @throws Exception if things go awry.
      */
-    public static XMultiServiceFactory createSimpleServiceManager() throws Exception {
-        return UnoRuntime.queryInterface(XMultiServiceFactory.class, createInitialComponentContext((Map<String, Object>) null).getServiceManager());
+    public static XMultiServiceFactory createSimpleServiceManager()
+        throws Exception {
+        return UnoRuntime.queryInterface(
+            XMultiServiceFactory.class,
+            createInitialComponentContext((Map<String, Object>) null)
+                .getServiceManager()
+        );
     }
 
     /**
@@ -177,8 +242,12 @@ public static XMultiServiceFactory createSimpleServiceManager() throws Exception
      * <code>cppuhelper/defaultBootstrap_InitialComponentContext()</code>.
      * @throws Exception if things go awry.
      */
-    public static XComponentContext defaultBootstrap_InitialComponentContext() throws Exception {
-        return defaultBootstrap_InitialComponentContext((String) null, (Map<String, String>) null);
+    public static XComponentContext defaultBootstrap_InitialComponentContext()
+        throws Exception {
+        return defaultBootstrap_InitialComponentContext(
+            (String) null,
+            (Map<String, String>) null
+        );
     }
 
     /**
@@ -189,8 +258,14 @@ 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
+        );
     }
 
     /**
@@ -204,20 +279,28 @@ 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) {
             pairs = new String[2 * bootstrap_parameters.size()];
             int n = 0;
-            for (Map.Entry<String, String> bootstrap_parameter : bootstrap_parameters.entrySet()) {
+            for (Map.Entry<
+                String,
+                String
+            > bootstrap_parameter : bootstrap_parameters.entrySet()) {
                 pairs[n++] = bootstrap_parameter.getKey();
                 pairs[n++] = bootstrap_parameter.getValue();
             }
         }
 
         if (!M_LOADED_JUH) {
-            if ("The Android Project".equals(System.getProperty("java.vendor"))) {
+            if (
+                "The Android Project".equals(System.getProperty("java.vendor"))
+            ) {
                 // Find out if we are configured with DISABLE_DYNLOADING or
                 // not. Try to load the lo-bootstrap shared library which
                 // won't exist in the DISABLE_DYNLOADING case. (And which will
@@ -235,17 +318,34 @@ public static XComponentContext defaultBootstrap_InitialComponentContext(String
                 }
 
                 if (!disable_dynloading) {
-                    NativeLibraryLoader.loadLibrary(Bootstrap.class.getClassLoader(), "juh");
+                    NativeLibraryLoader.loadLibrary(
+                        Bootstrap.class.getClassLoader(),
+                        "juh"
+                    );
                 }
             } else {
-                NativeLibraryLoader.loadLibrary(Bootstrap.class.getClassLoader(), "juh");
+                NativeLibraryLoader.loadLibrary(
+                    Bootstrap.class.getClassLoader(),
+                    "juh"
+                );
             }
             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.
@@ -254,7 +354,8 @@ public static XComponentContext defaultBootstrap_InitialComponentContext(String
      * @throws BootstrapException if things go awry.
      * @since UDK 3.1.0
      */
-    public static XComponentContext bootstrap(Path ooPath) throws BootstrapException {
+    public static XComponentContext bootstrap(Path ooPath)
+        throws BootstrapException {
         String[] defaultArgArray = getDefaultOptions();
         return bootstrap(defaultArgArray, ooPath);
     }
@@ -268,13 +369,15 @@ 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!");
             }
@@ -293,7 +396,8 @@ public static XComponentContext bootstrap(String[] argArray, Path path) throws B
             pipe(p.getErrorStream(), System.err, "CE> ");
 
             // initial service manager
-            XMultiComponentFactory xLocalServiceManager = xLocalContext.getServiceManager();
+            XMultiComponentFactory xLocalServiceManager =
+                xLocalContext.getServiceManager();
             if (xLocalServiceManager == null) {
                 throw new BootstrapException("no initial service manager!");
             }
@@ -302,14 +406,20 @@ 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) {
+            for (int i = 0;; ++i) {
                 try {
                     // try to connect to office
                     Object context = xUrlResolver.resolve(sConnect);
-                    xContext = UnoRuntime.queryInterface(XComponentContext.class, context);
+                    xContext =
+                        UnoRuntime.queryInterface(
+                            XComponentContext.class,
+                            context
+                        );
                     if (xContext == null) {
                         throw new BootstrapException("no component context!");
                     }
@@ -334,14 +444,20 @@ public static XComponentContext bootstrap(String[] argArray, Path path) throws B
         return xContext;
     }
 
-    private static void pipe(final InputStream in, final PrintStream out, final String prefix) {
+    private static void pipe(
+        final InputStream in,
+        final PrintStream out,
+        final String prefix
+    ) {
         new Thread("Pipe: " + prefix) {
             @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 (; ; ) {
+                    for (;;) {
                         String s = r.readLine();
                         if (s == null) {
                             break;
@@ -354,8 +470,8 @@ public void run() {
                     e.printStackTrace(System.err);
                 }
             }
-        }.start();
+        }
+            .start();
     }
 }
-
 // vim:set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/src/main/java/org/jabref/gui/openoffice/CitationEntryViewModel.java b/src/main/java/org/jabref/gui/openoffice/CitationEntryViewModel.java
index c29f24c8424..fadd14b595f 100644
--- a/src/main/java/org/jabref/gui/openoffice/CitationEntryViewModel.java
+++ b/src/main/java/org/jabref/gui/openoffice/CitationEntryViewModel.java
@@ -2,27 +2,40 @@
 
 import javafx.beans.property.SimpleStringProperty;
 import javafx.beans.property.StringProperty;
-
 import org.jabref.model.openoffice.CitationEntry;
 
 public class CitationEntryViewModel {
 
     private final StringProperty citation = new SimpleStringProperty("");
-    private final StringProperty extraInformation = new SimpleStringProperty("");
+    private final StringProperty extraInformation = new SimpleStringProperty(
+        ""
+    );
     private final String refMarkName;
 
-    public CitationEntryViewModel(String refMarkName, String citation, String extraInfo) {
+    public CitationEntryViewModel(
+        String refMarkName,
+        String citation,
+        String extraInfo
+    ) {
         this.refMarkName = refMarkName;
         this.citation.setValue(citation);
         this.extraInformation.setValue(extraInfo);
     }
 
     public CitationEntryViewModel(CitationEntry citationEntry) {
-        this(citationEntry.getRefMarkName(), citationEntry.getContext(), citationEntry.getPageInfo().orElse(""));
+        this(
+            citationEntry.getRefMarkName(),
+            citationEntry.getContext(),
+            citationEntry.getPageInfo().orElse("")
+        );
     }
 
     public CitationEntry toCitationEntry() {
-        return new CitationEntry(refMarkName, citation.getValue(), extraInformation.getValue());
+        return new CitationEntry(
+            refMarkName,
+            citation.getValue(),
+            extraInformation.getValue()
+        );
     }
 
     public StringProperty citationProperty() {
diff --git a/src/main/java/org/jabref/gui/openoffice/DetectOpenOfficeInstallation.java b/src/main/java/org/jabref/gui/openoffice/DetectOpenOfficeInstallation.java
index f7e94eb4c62..0e7b2dac8d9 100644
--- a/src/main/java/org/jabref/gui/openoffice/DetectOpenOfficeInstallation.java
+++ b/src/main/java/org/jabref/gui/openoffice/DetectOpenOfficeInstallation.java
@@ -4,7 +4,6 @@
 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;
@@ -22,7 +21,10 @@ 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;
     }
@@ -34,35 +36,59 @@ public boolean isExecutablePathDefined() {
     public Optional<Path> selectInstallationPath() {
         final NativeDesktop nativeDesktop = OS.getNativeDesktop();
 
-        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()
+        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.getApplicationDirectory())
                 .build();
-        return dialogService.showDirectorySelectionDialog(dirDialogConfiguration);
+        return dialogService.showDirectorySelectionDialog(
+            dirDialogConfiguration
+        );
     }
 
     /**
      * Checks whether the executablePath exists
      */
-    private boolean checkAutoDetectedPaths(OpenOfficePreferences openOfficePreferences) {
+    private boolean checkAutoDetectedPaths(
+        OpenOfficePreferences openOfficePreferences
+    ) {
         String executablePath = openOfficePreferences.getExecutablePath();
 
         if (OS.LINUX && (System.getenv("FLATPAK_SANDBOX_DIR") != null)) {
-            executablePath = OpenOfficePreferences.DEFAULT_LINUX_FLATPAK_EXEC_PATH;
+            executablePath =
+                OpenOfficePreferences.DEFAULT_LINUX_FLATPAK_EXEC_PATH;
         }
-        return !StringUtil.isNullOrEmpty(executablePath) && Files.exists(Path.of(executablePath));
+        return (
+            !StringUtil.isNullOrEmpty(executablePath) &&
+            Files.exists(Path.of(executablePath))
+        );
     }
 
     public boolean setOpenOfficePreferences(Path installDir) {
         Optional<Path> execPath = Optional.empty();
 
         if (OS.WINDOWS) {
-            execPath = FileUtil.find(OpenOfficePreferences.WINDOWS_EXECUTABLE, installDir);
+            execPath =
+                FileUtil.find(
+                    OpenOfficePreferences.WINDOWS_EXECUTABLE,
+                    installDir
+                );
         } else if (OS.OS_X) {
-            execPath = FileUtil.find(OpenOfficePreferences.OSX_EXECUTABLE, installDir);
+            execPath =
+                FileUtil.find(OpenOfficePreferences.OSX_EXECUTABLE, installDir);
         } else if (OS.LINUX) {
-            execPath = FileUtil.find(OpenOfficePreferences.LINUX_EXECUTABLE, installDir);
+            execPath =
+                FileUtil.find(
+                    OpenOfficePreferences.LINUX_EXECUTABLE,
+                    installDir
+                );
         }
 
         if (execPath.isPresent()) {
@@ -83,10 +109,14 @@ 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("Please choose which one to connect to:"),
-                Localization.lang("Use selected instance"),
-                installDirs);
+            Localization.lang("Choose OpenOffice/LibreOffice executable"),
+            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 986c971c9d0..fb7606cd8b6 100644
--- a/src/main/java/org/jabref/gui/openoffice/ManageCitationsDialogView.java
+++ b/src/main/java/org/jabref/gui/openoffice/ManageCitationsDialogView.java
@@ -1,5 +1,7 @@
 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;
@@ -9,16 +11,12 @@
 import javafx.scene.control.cell.TextFieldTableCell;
 import javafx.scene.layout.FlowPane;
 import javafx.scene.text.Text;
-
 import org.jabref.gui.DialogService;
 import org.jabref.gui.util.BaseDialog;
 import org.jabref.gui.util.ValueTableCellFactory;
 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>";
@@ -26,20 +24,24 @@ public class ManageCitationsDialogView extends BaseDialog<Void> {
 
     private final OOBibBase ooBase;
 
-    @FXML private TableView<CitationEntryViewModel> citationsTableView;
-    @FXML private TableColumn<CitationEntryViewModel, String> citation;
-    @FXML private TableColumn<CitationEntryViewModel, String> extraInfo;
+    @FXML
+    private TableView<CitationEntryViewModel> citationsTableView;
+
+    @FXML
+    private TableColumn<CitationEntryViewModel, String> citation;
+
+    @FXML
+    private TableColumn<CitationEntryViewModel, String> extraInfo;
 
-    @Inject private DialogService dialogService;
+    @Inject
+    private DialogService dialogService;
 
     private ManageCitationsDialogViewModel viewModel;
 
     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) {
@@ -55,25 +57,45 @@ public ManageCitationsDialogView(OOBibBase ooBase) {
     private void initialize() {
         viewModel = new ManageCitationsDialogViewModel(ooBase, dialogService);
 
-        citation.setCellValueFactory(cellData -> cellData.getValue().citationProperty());
-        new ValueTableCellFactory<CitationEntryViewModel, String>().withGraphic(this::getText).install(citation);
+        citation.setCellValueFactory(cellData ->
+            cellData.getValue().citationProperty()
+        );
+        new ValueTableCellFactory<CitationEntryViewModel, String>()
+            .withGraphic(this::getText)
+            .install(citation);
 
-        extraInfo.setCellValueFactory(cellData -> cellData.getValue().extraInformationProperty());
+        extraInfo.setCellValueFactory(cellData ->
+            cellData.getValue().extraInformationProperty()
+        );
         extraInfo.setEditable(true);
 
         citationsTableView.setEditable(true);
 
-        citationsTableView.itemsProperty().bindBidirectional(viewModel.citationsProperty());
+        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 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 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()
+        );
 
         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 697212fde54..3834714dba3 100644
--- a/src/main/java/org/jabref/gui/openoffice/ManageCitationsDialogViewModel.java
+++ b/src/main/java/org/jabref/gui/openoffice/ManageCitationsDialogViewModel.java
@@ -3,39 +3,46 @@
 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;
-
 import org.jabref.gui.DialogService;
 import org.jabref.model.openoffice.CitationEntry;
 
 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;
 
-    public ManageCitationsDialogViewModel(OOBibBase ooBase, DialogService dialogService) {
+    public ManageCitationsDialogViewModel(
+        OOBibBase ooBase,
+        DialogService dialogService
+    ) {
         this.ooBase = ooBase;
         this.dialogService = dialogService;
 
-        Optional<List<CitationEntry>> citationEntries = ooBase.guiActionGetCitationEntries();
+        Optional<List<CitationEntry>> citationEntries =
+            ooBase.guiActionGetCitationEntries();
         this.failedToGetCitationEntries = citationEntries.isEmpty();
         if (citationEntries.isEmpty()) {
             return;
         }
 
         for (CitationEntry entry : citationEntries.get()) {
-            CitationEntryViewModel itemViewModelEntry = new CitationEntryViewModel(entry);
+            CitationEntryViewModel itemViewModelEntry =
+                new CitationEntryViewModel(entry);
             citations.add(itemViewModelEntry);
         }
     }
 
     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 +50,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 f66e353fef5..0317cdc0140 100644
--- a/src/main/java/org/jabref/gui/openoffice/OOBibBase.java
+++ b/src/main/java/org/jabref/gui/openoffice/OOBibBase.java
@@ -1,5 +1,14 @@
 package org.jabref.gui.openoffice;
 
+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 java.nio.file.Path;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -8,7 +17,6 @@
 import java.util.Optional;
 import java.util.function.Supplier;
 import java.util.stream.Collectors;
-
 import org.jabref.gui.DialogService;
 import org.jabref.logic.JabRefException;
 import org.jabref.logic.l10n.Localization;
@@ -37,16 +45,6 @@
 import org.jabref.model.openoffice.uno.UnoUndo;
 import org.jabref.model.openoffice.util.OOResult;
 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.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 org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -55,7 +53,9 @@
  */
 class OOBibBase {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(OOBibBase.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(
+        OOBibBase.class
+    );
 
     private final DialogService dialogService;
 
@@ -68,10 +68,7 @@ class OOBibBase {
     private final OOBibBaseConnect connection;
 
     public OOBibBase(Path loPath, DialogService dialogService)
-            throws
-            BootstrapException,
-            CreationException {
-
+        throws BootstrapException, CreationException {
         this.dialogService = dialogService;
         this.connection = new OOBibBaseConnect(loPath, dialogService);
 
@@ -83,22 +80,32 @@ public void guiActionSelectDocument(boolean autoSelectForSingle) {
         final String errorTitle = Localization.lang("Problem connecting");
 
         try {
-
             this.connection.selectDocument(autoSelectForSingle);
         } catch (NoDocumentFoundException ex) {
             OOError.from(ex).showErrorDialog(dialogService);
         } catch (DisposedException ex) {
-            OOError.from(ex).setTitle(errorTitle).showErrorDialog(dialogService);
-        } catch (WrappedTargetException
-                | IndexOutOfBoundsException
-                | NoSuchElementException ex) {
+            OOError
+                .from(ex)
+                .setTitle(errorTitle)
+                .showErrorDialog(dialogService);
+        } catch (
+            WrappedTargetException
+            | IndexOutOfBoundsException
+            | NoSuchElementException ex
+        ) {
             LOGGER.warn("Problem connecting", ex);
-            OOError.fromMisc(ex).setTitle(errorTitle).showErrorDialog(dialogService);
+            OOError
+                .fromMisc(ex)
+                .setTitle(errorTitle)
+                .showErrorDialog(dialogService);
         }
 
         if (this.isConnectedToDocument()) {
-            dialogService.notify(Localization.lang("Connected to document") + ": "
-                    + this.getCurrentDocumentTitle().orElse(""));
+            dialogService.notify(
+                Localization.lang("Connected to document") +
+                ": " +
+                this.getCurrentDocumentTitle().orElse("")
+            );
         }
     }
 
@@ -146,11 +153,15 @@ void showDialog(String errorTitle, OOError err) {
         err.setTitle(errorTitle).showErrorDialog(dialogService);
     }
 
-    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"));
+    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"));
         if (msg.isEmpty()) {
             return OOVoidResult.ok();
         } else {
@@ -171,7 +182,10 @@ boolean testDialog(String errorTitle, List<OOVoidResult<OOError>> results) {
     }
 
     @SafeVarargs
-    final boolean testDialog(String errorTitle, OOVoidResult<OOError>... results) {
+    final boolean testDialog(
+        String errorTitle,
+        OOVoidResult<OOError>... results
+    ) {
         List<OOVoidResult<OOError>> resultList = Arrays.asList(results);
         return testDialog(collectResults(errorTitle, resultList));
     }
@@ -179,7 +193,10 @@ 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);
 
@@ -189,9 +206,14 @@ 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);
@@ -200,38 +222,59 @@ 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.");
-        OOResult<FunctionalTextViewCursor, String> result = FunctionalTextViewCursor.get(doc);
+            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."
+            );
+        OOResult<FunctionalTextViewCursor, String> result =
+            FunctionalTextViewCursor.get(doc);
         if (result.isError()) {
             LOGGER.warn(result.getError());
         }
-        return result.mapError(detail -> new OOError(errorTitle, messageOnFailureToObtain));
+        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) {
-            return OOVoidResult.error(OOError.fromMisc(ex).setTitle(errorTitle));
+            return OOVoidResult.error(
+                OOError.fromMisc(ex).setTitle(errorTitle)
+            );
         }
     }
 
-    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;
@@ -240,19 +283,30 @@ private static OOVoidResult<OOError> checkRangeOverlapsWithCursor(XTextDocument
         boolean requireSeparation = false;
         OOVoidResult<JabRefException> res;
         try {
-            res = frontend.checkRangeOverlapsWithCursor(doc,
+            res =
+                frontend.checkRangeOverlapsWithCursor(
+                    doc,
                     userRanges,
-                    requireSeparation);
+                    requireSeparation
+                );
         } catch (NoDocumentException ex) {
             return OOVoidResult.error(OOError.from(ex).setTitle(errorTitle));
         } catch (WrappedTargetException ex) {
-            return OOVoidResult.error(OOError.fromMisc(ex).setTitle(errorTitle));
+            return OOVoidResult.error(
+                OOError.fromMisc(ex).setTitle(errorTitle)
+            );
         }
 
         if (res.isError()) {
-            final String xtitle = Localization.lang("The cursor is in a protected area.");
+            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);
     }
@@ -263,32 +317,47 @@ private static OOVoidResult<OOError> checkRangeOverlapsWithCursor(XTextDocument
      *
      * ******************************************************/
 
-    private static OOVoidResult<OOError> checkIfOpenOfficeIsRecordingChanges(XTextDocument doc) {
-        String errorTitle = Localization.lang("Recording and/or Recorded changes");
+    private static OOVoidResult<OOError> checkIfOpenOfficeIsRecordingChanges(
+        XTextDocument doc
+    ) {
+        String errorTitle = Localization.lang(
+            "Recording and/or Recorded changes"
+        );
         try {
             boolean recordingChanges = UnoRedlines.getRecordChanges(doc);
             int nRedlines = UnoRedlines.countRedlines(doc);
             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();
@@ -308,14 +377,15 @@ 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 {
@@ -323,8 +393,10 @@ 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 {
@@ -335,87 +407,133 @@ 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 {
-
-        Optional<String> internalName = UnoStyle.getInternalNameOfStyle(doc, familyName, styleName);
+    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");
-                    }
-                            + "\n"
-                            + Localization.lang("Please create it in the document or change in the file:")
-                            + "\n"
-                            + pathToStyleFile;
+                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"
+                    );
+                } +
+                "\n" +
+                Localization.lang(
+                    "Please create it in the document or change in the file:"
+                ) +
+                "\n" +
+                pathToStyleFile;
             return OOVoidResult.error(new OOError("StyleIsNotKnown", msg));
         }
 
         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");
-                    }
-                            + "\n"
-                            + Localization.lang("Please use the latter in the style file below"
-                            + " to avoid localization problems.")
-                            + "\n"
-                            + pathToStyleFile;
-            return OOVoidResult.error(new OOError("StyleNameIsNotInternal", 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"
+                    );
+                } +
+                "\n" +
+                Localization.lang(
+                    "Please use the latter in the style file below" +
+                    " to avoid localization problems."
+                ) +
+                "\n" +
+                pathToStyleFile;
+            return OOVoidResult.error(
+                new OOError("StyleNameIsNotInternal", msg)
+            );
         }
         return OOVoidResult.ok();
     }
 
-    public OOVoidResult<OOError> checkStylesExistInTheDocument(OOBibStyle style, XTextDocument doc) {
+    public OOVoidResult<OOError> checkStylesExistInTheDocument(
+        OOBibStyle style,
+        XTextDocument doc
+    ) {
         String pathToStyleFile = style.getPath();
 
         List<OOVoidResult<OOError>> results = new ArrayList<>();
         try {
-            results.add(checkStyleExistsInTheDocument(UnoStyle.PARAGRAPH_STYLES,
+            results.add(
+                checkStyleExistsInTheDocument(
+                    UnoStyle.PARAGRAPH_STYLES,
                     style.getReferenceHeaderParagraphFormat(),
                     doc,
                     "ReferenceHeaderParagraphFormat",
-                    pathToStyleFile));
-            results.add(checkStyleExistsInTheDocument(UnoStyle.PARAGRAPH_STYLES,
+                    pathToStyleFile
+                )
+            );
+            results.add(
+                checkStyleExistsInTheDocument(
+                    UnoStyle.PARAGRAPH_STYLES,
                     style.getReferenceParagraphFormat(),
                     doc,
                     "ReferenceParagraphFormat",
-                    pathToStyleFile));
+                    pathToStyleFile
+                )
+            );
             if (style.isFormatCitations()) {
-                results.add(checkStyleExistsInTheDocument(UnoStyle.CHARACTER_STYLES,
+                results.add(
+                    checkStyleExistsInTheDocument(
+                        UnoStyle.CHARACTER_STYLES,
                         style.getCitationCharacterFormat(),
                         doc,
                         "CitationCharacterFormat",
-                        pathToStyleFile));
+                        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);
@@ -428,7 +546,9 @@ public OOVoidResult<OOError> checkStylesExistInTheDocument(OOBibStyle style, XTe
      * ******************************************************/
     public Optional<List<CitationEntry>> guiActionGetCitationEntries() {
         final Optional<List<CitationEntry>> FAIL = Optional.empty();
-        final String errorTitle = Localization.lang("Problem collecting citations");
+        final String errorTitle = Localization.lang(
+            "Problem collecting citations"
+        );
 
         OOResult<XTextDocument, OOError> odoc = getXTextDocument();
         if (testDialog(errorTitle, odoc.asVoidResult())) {
@@ -442,17 +562,25 @@ public Optional<List<CitationEntry>> guiActionGetCitationEntries() {
         }
 
         try {
-
             return Optional.of(ManageCitations.getCitationEntries(doc));
         } catch (NoDocumentException ex) {
-            OOError.from(ex).setTitle(errorTitle).showErrorDialog(dialogService);
+            OOError
+                .from(ex)
+                .setTitle(errorTitle)
+                .showErrorDialog(dialogService);
             return FAIL;
         } catch (DisposedException ex) {
-            OOError.from(ex).setTitle(errorTitle).showErrorDialog(dialogService);
+            OOError
+                .from(ex)
+                .setTitle(errorTitle)
+                .showErrorDialog(dialogService);
             return FAIL;
         } catch (WrappedTargetException ex) {
             LOGGER.warn(errorTitle, ex);
-            OOError.fromMisc(ex).setTitle(errorTitle).showErrorDialog(dialogService);
+            OOError
+                .fromMisc(ex)
+                .setTitle(errorTitle)
+                .showErrorDialog(dialogService);
             return FAIL;
         }
     }
@@ -476,8 +604,12 @@ public Optional<List<CitationEntry>> guiActionGetCitationEntries() {
      *      citation from the text).</li>
      * </ul>
      */
-    public void guiActionApplyCitationEntries(List<CitationEntry> citationEntries) {
-        final String errorTitle = Localization.lang("Problem modifying citation");
+    public void guiActionApplyCitationEntries(
+        List<CitationEntry> citationEntries
+    ) {
+        final String errorTitle = Localization.lang(
+            "Problem modifying citation"
+        );
 
         OOResult<XTextDocument, OOError> odoc = getXTextDocument();
         if (testDialog(errorTitle, odoc.asVoidResult())) {
@@ -486,18 +618,28 @@ public void guiActionApplyCitationEntries(List<CitationEntry> citationEntries) {
         XTextDocument doc = odoc.get();
 
         try {
-
             ManageCitations.applyCitationEntries(doc, citationEntries);
         } catch (NoDocumentException ex) {
-            OOError.from(ex).setTitle(errorTitle).showErrorDialog(dialogService);
+            OOError
+                .from(ex)
+                .setTitle(errorTitle)
+                .showErrorDialog(dialogService);
         } catch (DisposedException ex) {
-            OOError.from(ex).setTitle(errorTitle).showErrorDialog(dialogService);
-        } catch (PropertyVetoException
-                | IllegalTypeException
-                | WrappedTargetException
-                | com.sun.star.lang.IllegalArgumentException ex) {
+            OOError
+                .from(ex)
+                .setTitle(errorTitle)
+                .showErrorDialog(dialogService);
+        } catch (
+            PropertyVetoException
+            | IllegalTypeException
+            | WrappedTargetException
+            | com.sun.star.lang.IllegalArgumentException ex
+        ) {
             LOGGER.warn(errorTitle, ex);
-            OOError.fromMisc(ex).setTitle(errorTitle).showErrorDialog(dialogService);
+            OOError
+                .fromMisc(ex)
+                .setTitle(errorTitle)
+                .showErrorDialog(dialogService);
         }
     }
 
@@ -517,20 +659,28 @@ 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,
-                                     BibDatabase database,
-                                     OOBibStyle style,
-                                     CitationType citationType,
-                                     String pageInfo,
-                                     Optional<Update.SyncOptions> syncOptions) {
-
+    public void guiActionInsertEntry(
+        List<BibEntry> entries,
+        BibDatabase database,
+        OOBibStyle 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))) {
+                selectedBibEntryIsRequired(
+                    entries,
+                    OOError::noEntriesSelectedForCitation
+                )
+            )
+        ) {
             return;
         }
         XTextDocument doc = odoc.get();
@@ -540,18 +690,30 @@ public void guiActionInsertEntry(List<BibEntry> entries,
             return;
         }
 
-        OOResult<XTextCursor, OOError> cursor = getUserCursorForTextInsertion(doc, errorTitle);
+        OOResult<XTextCursor, OOError> cursor = getUserCursorForTextInsertion(
+            doc,
+            errorTitle
+        );
         if (testDialog(errorTitle, cursor.asVoidResult())) {
             return;
         }
 
-        if (testDialog(errorTitle, checkRangeOverlapsWithCursor(doc, frontend.get()))) {
+        if (
+            testDialog(
+                errorTitle,
+                checkRangeOverlapsWithCursor(doc, frontend.get())
+            )
+        ) {
             return;
         }
 
-        if (testDialog(errorTitle,
+        if (
+            testDialog(
+                errorTitle,
                 checkStylesExistInTheDocument(style, doc),
-                checkIfOpenOfficeIsRecordingChanges(doc))) {
+                checkIfOpenOfficeIsRecordingChanges(doc)
+            )
+        ) {
             return;
         }
 
@@ -567,12 +729,22 @@ public void guiActionInsertEntry(List<BibEntry> entries,
         }
 
         syncOptions
-                .map(e -> e.setUpdateBibliography(this.refreshBibliographyDuringSyncWhenCiting))
-                .map(e -> e.setAlwaysAddCitedOnPages(this.alwaysAddCitedOnPages));
+            .map(e ->
+                e.setUpdateBibliography(
+                    this.refreshBibliographyDuringSyncWhenCiting
+                )
+            )
+            .map(e -> e.setAlwaysAddCitedOnPages(this.alwaysAddCitedOnPages));
 
         if (syncOptions.isPresent()) {
-            if (testDialog(databaseIsRequired(syncOptions.get().databases,
-                    OOError::noDataBaseIsOpenForSyncingAfterCitation))) {
+            if (
+                testDialog(
+                    databaseIsRequired(
+                        syncOptions.get().databases,
+                        OOError::noDataBaseIsOpenForSyncingAfterCitation
+                    )
+                )
+            ) {
                 return;
             }
         }
@@ -580,29 +752,47 @@ public void guiActionInsertEntry(List<BibEntry> entries,
         try {
             UnoUndo.enterUndoContext(doc, "Insert citation");
 
-            EditInsert.insertCitationGroup(doc,
-                    frontend.get(),
-                    cursor.get(),
-                    entries,
-                    database,
-                    style,
-                    citationType,
-                    pageInfo);
+            EditInsert.insertCitationGroup(
+                doc,
+                frontend.get(),
+                cursor.get(),
+                entries,
+                database,
+                style,
+                citationType,
+                pageInfo
+            );
 
             if (syncOptions.isPresent()) {
-                Update.resyncDocument(doc, style, fcursor.get(), syncOptions.get());
+                Update.resyncDocument(
+                    doc,
+                    style,
+                    fcursor.get(),
+                    syncOptions.get()
+                );
             }
         } catch (NoDocumentException ex) {
-            OOError.from(ex).setTitle(errorTitle).showErrorDialog(dialogService);
+            OOError
+                .from(ex)
+                .setTitle(errorTitle)
+                .showErrorDialog(dialogService);
         } catch (DisposedException ex) {
-            OOError.from(ex).setTitle(errorTitle).showErrorDialog(dialogService);
-        } catch (CreationException
-                | IllegalTypeException
-                | NotRemoveableException
-                | PropertyVetoException
-                | WrappedTargetException ex) {
+            OOError
+                .from(ex)
+                .setTitle(errorTitle)
+                .showErrorDialog(dialogService);
+        } catch (
+            CreationException
+            | IllegalTypeException
+            | NotRemoveableException
+            | PropertyVetoException
+            | WrappedTargetException ex
+        ) {
             LOGGER.warn("Could not insert entry", ex);
-            OOError.fromMisc(ex).setTitle(errorTitle).showErrorDialog(dialogService);
+            OOError
+                .fromMisc(ex)
+                .setTitle(errorTitle)
+                .showErrorDialog(dialogService);
         } finally {
             UnoUndo.leaveUndoContext(doc);
         }
@@ -611,24 +801,38 @@ public void guiActionInsertEntry(List<BibEntry> entries,
     /**
      * GUI action "Merge citations"
      */
-    public void guiActionMergeCitationGroups(List<BibDatabase> databases, OOBibStyle style) {
-        final String errorTitle = Localization.lang("Problem combining cite markers");
+    public void guiActionMergeCitationGroups(
+        List<BibDatabase> databases,
+        OOBibStyle style
+    ) {
+        final String errorTitle = Localization.lang(
+            "Problem combining cite markers"
+        );
 
         OOResult<XTextDocument, OOError> odoc = getXTextDocument();
-        if (testDialog(errorTitle,
+        if (
+            testDialog(
+                errorTitle,
                 odoc.asVoidResult(),
                 styleIsRequired(style),
-                databaseIsRequired(databases, OOError::noDataBaseIsOpen))) {
+                databaseIsRequired(databases, OOError::noDataBaseIsOpen)
+            )
+        ) {
             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(style, doc),
-                checkIfOpenOfficeIsRecordingChanges(doc))) {
+                checkIfOpenOfficeIsRecordingChanges(doc)
+            )
+        ) {
             return;
         }
 
@@ -636,24 +840,41 @@ public void guiActionMergeCitationGroups(List<BibDatabase> databases, OOBibStyle
             UnoUndo.enterUndoContext(doc, "Merge citations");
 
             OOFrontend frontend = new OOFrontend(doc);
-            boolean madeModifications = EditMerge.mergeCitationGroups(doc, frontend, style);
+            boolean madeModifications = EditMerge.mergeCitationGroups(
+                doc,
+                frontend,
+                style
+            );
             if (madeModifications) {
                 UnoCrossRef.refresh(doc);
-                Update.SyncOptions syncOptions = new Update.SyncOptions(databases);
+                Update.SyncOptions syncOptions = new Update.SyncOptions(
+                    databases
+                );
                 Update.resyncDocument(doc, style, fcursor.get(), syncOptions);
             }
         } catch (NoDocumentException ex) {
-            OOError.from(ex).setTitle(errorTitle).showErrorDialog(dialogService);
+            OOError
+                .from(ex)
+                .setTitle(errorTitle)
+                .showErrorDialog(dialogService);
         } catch (DisposedException ex) {
-            OOError.from(ex).setTitle(errorTitle).showErrorDialog(dialogService);
-        } catch (CreationException
-                | IllegalTypeException
-                | NotRemoveableException
-                | PropertyVetoException
-                | WrappedTargetException
-                | com.sun.star.lang.IllegalArgumentException ex) {
+            OOError
+                .from(ex)
+                .setTitle(errorTitle)
+                .showErrorDialog(dialogService);
+        } catch (
+            CreationException
+            | IllegalTypeException
+            | NotRemoveableException
+            | PropertyVetoException
+            | WrappedTargetException
+            | com.sun.star.lang.IllegalArgumentException ex
+        ) {
             LOGGER.warn("Problem combining cite markers", ex);
-            OOError.fromMisc(ex).setTitle(errorTitle).showErrorDialog(dialogService);
+            OOError
+                .fromMisc(ex)
+                .setTitle(errorTitle)
+                .showErrorDialog(dialogService);
         } finally {
             UnoUndo.leaveUndoContext(doc);
             fcursor.get().restore(doc);
@@ -665,24 +886,38 @@ public void guiActionMergeCitationGroups(List<BibDatabase> databases, OOBibStyle
      * <p>
      * Do the opposite of MergeCitationGroups. Combined markers are split, with a space inserted between.
      */
-    public void guiActionSeparateCitations(List<BibDatabase> databases, OOBibStyle style) {
-        final String errorTitle = Localization.lang("Problem during separating cite markers");
+    public void guiActionSeparateCitations(
+        List<BibDatabase> databases,
+        OOBibStyle style
+    ) {
+        final String errorTitle = Localization.lang(
+            "Problem during separating cite markers"
+        );
 
         OOResult<XTextDocument, OOError> odoc = getXTextDocument();
-        if (testDialog(errorTitle,
+        if (
+            testDialog(
+                errorTitle,
                 odoc.asVoidResult(),
                 styleIsRequired(style),
-                databaseIsRequired(databases, OOError::noDataBaseIsOpen))) {
+                databaseIsRequired(databases, OOError::noDataBaseIsOpen)
+            )
+        ) {
             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(style, doc),
-                checkIfOpenOfficeIsRecordingChanges(doc))) {
+                checkIfOpenOfficeIsRecordingChanges(doc)
+            )
+        ) {
             return;
         }
 
@@ -690,24 +925,42 @@ public void guiActionSeparateCitations(List<BibDatabase> databases, OOBibStyle s
             UnoUndo.enterUndoContext(doc, "Separate citations");
 
             OOFrontend frontend = new OOFrontend(doc);
-            boolean madeModifications = EditSeparate.separateCitations(doc, frontend, databases, style);
+            boolean madeModifications = EditSeparate.separateCitations(
+                doc,
+                frontend,
+                databases,
+                style
+            );
             if (madeModifications) {
                 UnoCrossRef.refresh(doc);
-                Update.SyncOptions syncOptions = new Update.SyncOptions(databases);
+                Update.SyncOptions syncOptions = new Update.SyncOptions(
+                    databases
+                );
                 Update.resyncDocument(doc, style, fcursor.get(), syncOptions);
             }
         } catch (NoDocumentException ex) {
-            OOError.from(ex).setTitle(errorTitle).showErrorDialog(dialogService);
+            OOError
+                .from(ex)
+                .setTitle(errorTitle)
+                .showErrorDialog(dialogService);
         } catch (DisposedException ex) {
-            OOError.from(ex).setTitle(errorTitle).showErrorDialog(dialogService);
-        } catch (CreationException
-                | IllegalTypeException
-                | NotRemoveableException
-                | PropertyVetoException
-                | WrappedTargetException
-                | com.sun.star.lang.IllegalArgumentException ex) {
+            OOError
+                .from(ex)
+                .setTitle(errorTitle)
+                .showErrorDialog(dialogService);
+        } catch (
+            CreationException
+            | 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);
+            OOError
+                .fromMisc(ex)
+                .setTitle(errorTitle)
+                .showErrorDialog(dialogService);
         } finally {
             UnoUndo.leaveUndoContext(doc);
             fcursor.get().restore(doc);
@@ -721,23 +974,37 @@ public void guiActionSeparateCitations(List<BibDatabase> databases, OOBibStyle s
      *
      * @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");
+        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))) {
+                databaseIsRequired(
+                    databases,
+                    OOError::noDataBaseIsOpenForExport
+                )
+            )
+        ) {
             return FAIL;
         }
         XTextDocument doc = odoc.get();
 
         try {
-
             ExportCited.GenerateDatabaseResult result;
             try {
-                UnoUndo.enterUndoContext(doc, "Changes during \"Export cited\"");
+                UnoUndo.enterUndoContext(
+                    doc,
+                    "Changes during \"Export cited\""
+                );
                 result = ExportCited.generateDatabase(doc, databases);
             } finally {
                 // There should be no changes, thus no Undo entry should appear
@@ -747,23 +1014,29 @@ 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("Unable to generate new library"),
+                    Localization.lang(
+                        "Your OpenOffice/LibreOffice document references" +
+                        " no citation keys" +
+                        " which could also be found in your current library."
+                    )
+                );
                 return FAIL;
             }
 
             List<String> unresolvedKeys = result.unresolvedKeys;
             if (!unresolvedKeys.isEmpty()) {
                 dialogService.showErrorDialogAndWait(
-                        Localization.lang("Unable to generate new library"),
-                        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.",
-                                String.valueOf(unresolvedKeys.size()),
-                                String.join(", ", unresolvedKeys)));
+                    Localization.lang("Unable to generate new library"),
+                    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.",
+                        String.valueOf(unresolvedKeys.size()),
+                        String.join(", ", unresolvedKeys)
+                    )
+                );
                 if (returnPartialResult) {
                     return Optional.of(result.newDatabase);
                 } else {
@@ -774,11 +1047,19 @@ public Optional<BibDatabase> exportCitedHelper(List<BibDatabase> databases, bool
         } catch (NoDocumentException ex) {
             OOError.from(ex).showErrorDialog(dialogService);
         } catch (DisposedException ex) {
-            OOError.from(ex).setTitle(errorTitle).showErrorDialog(dialogService);
-        } catch (WrappedTargetException
-                | com.sun.star.lang.IllegalArgumentException ex) {
+            OOError
+                .from(ex)
+                .setTitle(errorTitle)
+                .showErrorDialog(dialogService);
+        } catch (
+            WrappedTargetException
+            | com.sun.star.lang.IllegalArgumentException ex
+        ) {
             LOGGER.warn("Problem generating new database.", ex);
-            OOError.fromMisc(ex).setTitle(errorTitle).showErrorDialog(dialogService);
+            OOError
+                .fromMisc(ex)
+                .setTitle(errorTitle)
+                .showErrorDialog(dialogService);
         }
         return FAIL;
     }
@@ -789,26 +1070,39 @@ public Optional<BibDatabase> exportCitedHelper(List<BibDatabase> databases, bool
      * @param databases Must have at least one.
      * @param style     Style.
      */
-    public void guiActionUpdateDocument(List<BibDatabase> databases, OOBibStyle style) {
-        final String errorTitle = Localization.lang("Unable to synchronize bibliography");
+    public void guiActionUpdateDocument(
+        List<BibDatabase> databases,
+        OOBibStyle style
+    ) {
+        final String errorTitle = Localization.lang(
+            "Unable to synchronize bibliography"
+        );
 
         try {
-
             OOResult<XTextDocument, OOError> odoc = getXTextDocument();
-            if (testDialog(errorTitle,
+            if (
+                testDialog(
+                    errorTitle,
                     odoc.asVoidResult(),
-                    styleIsRequired(style))) {
+                    styleIsRequired(style)
+                )
+            ) {
                 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(style, doc),
-                    checkIfOpenOfficeIsRecordingChanges(doc))) {
+                    checkIfOpenOfficeIsRecordingChanges(doc)
+                )
+            ) {
                 return;
             }
 
@@ -821,12 +1115,21 @@ public void guiActionUpdateDocument(List<BibDatabase> databases, OOBibStyle styl
             try {
                 UnoUndo.enterUndoContext(doc, "Refresh bibliography");
 
-                Update.SyncOptions syncOptions = new Update.SyncOptions(databases);
+                Update.SyncOptions syncOptions = new Update.SyncOptions(
+                    databases
+                );
                 syncOptions
-                        .setUpdateBibliography(true)
-                        .setAlwaysAddCitedOnPages(this.alwaysAddCitedOnPages);
+                    .setUpdateBibliography(true)
+                    .setAlwaysAddCitedOnPages(this.alwaysAddCitedOnPages);
 
-                unresolvedKeys = Update.synchronizeDocument(doc, frontend, style, fcursor.get(), syncOptions);
+                unresolvedKeys =
+                    Update.synchronizeDocument(
+                        doc,
+                        frontend,
+                        style,
+                        fcursor.get(),
+                        syncOptions
+                    );
             } finally {
                 UnoUndo.leaveUndoContext(doc);
                 fcursor.get().restore(doc);
@@ -834,20 +1137,32 @@ public void guiActionUpdateDocument(List<BibDatabase> databases, OOBibStyle styl
 
             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.get(0));
+                    "Your OpenOffice/LibreOffice document references the citation key '%0'," +
+                    " which could not be found in your current library.",
+                    unresolvedKeys.get(0)
+                );
                 dialogService.showErrorDialogAndWait(errorTitle, msg);
             }
         } catch (NoDocumentException ex) {
-            OOError.from(ex).setTitle(errorTitle).showErrorDialog(dialogService);
+            OOError
+                .from(ex)
+                .setTitle(errorTitle)
+                .showErrorDialog(dialogService);
         } catch (DisposedException ex) {
-            OOError.from(ex).setTitle(errorTitle).showErrorDialog(dialogService);
-        } catch (CreationException
-                | WrappedTargetException
-                | com.sun.star.lang.IllegalArgumentException ex) {
+            OOError
+                .from(ex)
+                .setTitle(errorTitle)
+                .showErrorDialog(dialogService);
+        } catch (
+            CreationException
+            | WrappedTargetException
+            | com.sun.star.lang.IllegalArgumentException ex
+        ) {
             LOGGER.warn("Could not update bibliography", ex);
-            OOError.fromMisc(ex).setTitle(errorTitle).showErrorDialog(dialogService);
+            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 59603fabbca..2d63c0df110 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,17 +14,30 @@
 import com.sun.star.lang.XMultiComponentFactory;
 import com.sun.star.text.XTextDocument;
 import com.sun.star.uno.XComponentContext;
+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 org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import static com.sun.star.uno.UnoRuntime.queryInterface;
-
 /**
  * Establish connection to a document opened in OpenOffice or LibreOffice.
  */
 public class OOBibBaseConnect {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(OOBibBaseConnect.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(
+        OOBibBaseConnect.class
+    );
 
     private final DialogService dialogService;
     private final XDesktop xDesktop;
@@ -50,19 +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 {
-
+        throws CreationException, BootstrapException {
         // Get the office component context:
         XComponentContext context = Bootstrap.bootstrap(loPath);
         XMultiComponentFactory sem = context.getServiceManager();
@@ -71,7 +65,11 @@ private XDesktop simpleBootstrap(Path loPath)
         // hierarchy of frames that contain viewable components:
         Object desktop;
         try {
-            desktop = sem.createInstanceWithContext("com.sun.star.frame.Desktop", context);
+            desktop =
+                sem.createInstanceWithContext(
+                    "com.sun.star.frame.Desktop",
+                    context
+                );
         } catch (com.sun.star.uno.Exception e) {
             throw new CreationException(e.getMessage());
         }
@@ -84,9 +82,12 @@ 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()) {
@@ -95,15 +96,15 @@ public static void closeOfficeConnection() {
                 }
             }
         } catch (Exception ex) {
-            LOGGER.error("Exception disposing office process connection bridge", ex);
+            LOGGER.error(
+                "Exception disposing office process connection bridge",
+                ex
+            );
         }
     }
 
     private static List<XTextDocument> getTextDocuments(XDesktop desktop)
-            throws
-            NoSuchElementException,
-            WrappedTargetException {
-
+        throws NoSuchElementException, WrappedTargetException {
         List<XTextDocument> result = new ArrayList<>();
 
         XEnumerationAccess enumAccess = desktop.getComponents();
@@ -112,7 +113,10 @@ private static List<XTextDocument> getTextDocuments(XDesktop desktop)
         while (compEnum.hasMoreElements()) {
             Object next = compEnum.nextElement();
             XComponent comp = UnoCast.cast(XComponent.class, next).get();
-            Optional<XTextDocument> doc = UnoCast.cast(XTextDocument.class, comp);
+            Optional<XTextDocument> doc = UnoCast.cast(
+                XTextDocument.class,
+                comp
+            );
             doc.ifPresent(result::add);
         }
         return result;
@@ -123,9 +127,10 @@ 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 {
 
             private final XTextDocument xTextDocument;
@@ -133,7 +138,8 @@ class DocumentTitleViewModel {
 
             public DocumentTitleViewModel(XTextDocument xTextDocument) {
                 this.xTextDocument = xTextDocument;
-                this.description = UnoTextDocument.getFrameTitle(xTextDocument).orElse("");
+                this.description =
+                    UnoTextDocument.getFrameTitle(xTextDocument).orElse("");
             }
 
             public XTextDocument getXtextDocument() {
@@ -146,23 +152,25 @@ 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);
+            dialogService.showChoiceDialogAndWait(
+                Localization.lang("Select document"),
+                Localization.lang("Found documents:"),
+                Localization.lang("Use selected document"),
+                viewModel
+            );
 
         return selectedDocument
-                .map(DocumentTitleViewModel::getXtextDocument)
-                .orElse(null);
+            .map(DocumentTitleViewModel::getXtextDocument)
+            .orElse(null);
     }
 
     /**
@@ -177,11 +185,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);
         if (textDocumentList.isEmpty()) {
@@ -189,8 +193,11 @@ public void selectDocument(boolean autoSelectForSingle)
         } else if ((textDocumentList.size() == 1) && autoSelectForSingle) {
             selected = textDocumentList.get(0); // 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 +243,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 c8ad7ef53aa..71575c67a31 100644
--- a/src/main/java/org/jabref/gui/openoffice/OOError.java
+++ b/src/main/java/org/jabref/gui/openoffice/OOError.java
@@ -1,13 +1,12 @@
 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;
@@ -41,48 +40,55 @@ public void showErrorDialog(DialogService dialogService) {
 
     public static OOError from(JabRefException err) {
         return new OOError(
-                Localization.lang("JabRefException"),
-                err.getLocalizedMessage(),
-                err);
+            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."),
-                err);
+            Localization.lang("Connection lost"),
+            Localization.lang(
+                "Connection to OpenOffice/LibreOffice has been lost." +
+                " Please make sure OpenOffice/LibreOffice is running," +
+                " and try to reconnect."
+            ),
+            err
+        );
     }
 
     // For NoDocumentException
     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."),
-                err);
+            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."
+            ),
+            err
+        );
     }
 
     // For NoDocumentFoundException
     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."),
-                err);
+            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."
+            ),
+            err
+        );
     }
 
     public static OOError fromMisc(Exception err) {
-        return new OOError(
-                "Exception",
-                err.getMessage(),
-                err);
+        return new OOError("Exception", err.getMessage(), err);
     }
 
     /*
@@ -92,50 +98,70 @@ public static OOError fromMisc(Exception err) {
     // noDataBaseIsOpenForCiting
     public static OOError noDataBaseIsOpenForCiting() {
         return new OOError(
-                Localization.lang("No database"),
-                Localization.lang("No bibliography database is open for citation.")
-                        + "\n"
-                        + Localization.lang("Open one before citing."));
+            Localization.lang("No database"),
+            Localization.lang(
+                "No bibliography database is open for citation."
+            ) +
+            "\n" +
+            Localization.lang("Open one before citing.")
+        );
     }
 
     public static OOError noDataBaseIsOpenForSyncingAfterCitation() {
         return new OOError(
-                Localization.lang("No database"),
-                Localization.lang("No database is open for updating citation markers after citing.")
-                        + "\n"
-                        + Localization.lang("Open one before citing."));
+            Localization.lang("No database"),
+            Localization.lang(
+                "No database is open for updating citation markers after citing."
+            ) +
+            "\n" +
+            Localization.lang("Open one before citing.")
+        );
     }
 
     // noDataBaseIsOpenForExport
     public static OOError noDataBaseIsOpenForExport() {
         return new OOError(
-                Localization.lang("No database is open"),
-                Localization.lang("We need a database to export from. Open one."));
+            Localization.lang("No database is open"),
+            Localization.lang("We need a database to export from. Open one.")
+        );
     }
 
     // noDataBaseIsOpenForExport
     public static OOError noDataBaseIsOpen() {
         return new OOError(
-                Localization.lang("No database is open"),
-                Localization.lang("This operation requires a bibliography database."));
+            Localization.lang("No database is open"),
+            Localization.lang(
+                "This operation requires a bibliography database."
+            )
+        );
     }
 
     // noValidStyleSelected
     public static OOError noValidStyleSelected() {
-        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."));
+        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."
+            )
+        );
     }
 
     // noEntriesSelectedForCitation
     public static OOError noEntriesSelectedForCitation() {
-        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."));
+        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 9e8b49e7d6a..a0ee264bc39 100644
--- a/src/main/java/org/jabref/gui/openoffice/OpenOfficePanel.java
+++ b/src/main/java/org/jabref/gui/openoffice/OpenOfficePanel.java
@@ -1,13 +1,11 @@
 package org.jabref.gui.openoffice;
 
+import com.sun.star.comp.helper.BootstrapException;
 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 javafx.concurrent.Task;
 import javafx.geometry.Insets;
 import javafx.geometry.Side;
@@ -25,7 +23,7 @@
 import javafx.scene.layout.HBox;
 import javafx.scene.layout.Priority;
 import javafx.scene.layout.VBox;
-
+import javax.swing.undo.UndoManager;
 import org.jabref.gui.DialogService;
 import org.jabref.gui.JabRefGUI;
 import org.jabref.gui.LibraryTab;
@@ -59,8 +57,6 @@
 import org.jabref.model.openoffice.uno.CreationException;
 import org.jabref.model.util.FileUpdateMonitor;
 import org.jabref.preferences.PreferencesService;
-
-import com.sun.star.comp.helper.BootstrapException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -69,22 +65,40 @@
  */
 public class OpenOfficePanel {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(OpenOfficePanel.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(
+        OpenOfficePanel.class
+    );
     private final DialogService dialogService;
 
     private final Button connect;
     private final Button manualConnect;
     private final Button selectDocument;
-    private final Button setStyleFile = new Button(Localization.lang("Select style"));
+    private final Button setStyleFile = new Button(
+        Localization.lang("Select style")
+    );
     private final Button pushEntries = new Button(Localization.lang("Cite"));
-    private final Button pushEntriesInt = new Button(Localization.lang("Cite in-text"));
-    private final Button pushEntriesEmpty = new Button(Localization.lang("Insert empty citation"));
-    private final Button pushEntriesAdvanced = new Button(Localization.lang("Cite special"));
+    private final Button pushEntriesInt = new Button(
+        Localization.lang("Cite in-text")
+    );
+    private final Button pushEntriesEmpty = new Button(
+        Localization.lang("Insert empty citation")
+    );
+    private final Button pushEntriesAdvanced = new Button(
+        Localization.lang("Cite special")
+    );
     private final Button update;
-    private final Button merge = new Button(Localization.lang("Merge citations"));
-    private final Button unmerge = new Button(Localization.lang("Separate citations"));
-    private final Button manageCitations = new Button(Localization.lang("Manage citations"));
-    private final Button exportCitations = new Button(Localization.lang("Export cited"));
+    private final Button merge = new Button(
+        Localization.lang("Merge citations")
+    );
+    private final Button unmerge = new Button(
+        Localization.lang("Separate citations")
+    );
+    private final Button manageCitations = new Button(
+        Localization.lang("Manage citations")
+    );
+    private final Button exportCitations = new Button(
+        Localization.lang("Export cited")
+    );
     private final Button settingsB = new Button(Localization.lang("Settings"));
     private final Button help;
     private final VBox vbox = new VBox();
@@ -100,16 +114,18 @@ public class OpenOfficePanel {
     private OOBibBase ooBase;
     private OOBibStyle style;
 
-    public OpenOfficePanel(LibraryTabContainer tabContainer,
-                           PreferencesService preferencesService,
-                           KeyBindingRepository keyBindingRepository,
-                           JournalAbbreviationRepository abbreviationRepository,
-                           TaskExecutor taskExecutor,
-                           DialogService dialogService,
-                           StateManager stateManager,
-                           FileUpdateMonitor fileUpdateMonitor,
-                           BibEntryTypesManager entryTypesManager,
-                           UndoManager undoManager) {
+    public OpenOfficePanel(
+        LibraryTabContainer tabContainer,
+        PreferencesService preferencesService,
+        KeyBindingRepository keyBindingRepository,
+        JournalAbbreviationRepository abbreviationRepository,
+        TaskExecutor taskExecutor,
+        DialogService dialogService,
+        StateManager stateManager,
+        FileUpdateMonitor fileUpdateMonitor,
+        BibEntryTypesManager entryTypesManager,
+        UndoManager undoManager
+    ) {
         this.tabContainer = tabContainer;
         this.fileUpdateMonitor = fileUpdateMonitor;
         this.entryTypesManager = entryTypesManager;
@@ -121,32 +137,54 @@ public OpenOfficePanel(LibraryTabContainer tabContainer,
         this.undoManager = undoManager;
 
         connect = new Button();
-        connect.setGraphic(IconTheme.JabRefIcons.CONNECT_OPEN_OFFICE.getGraphicNode());
+        connect.setGraphic(
+            IconTheme.JabRefIcons.CONNECT_OPEN_OFFICE.getGraphicNode()
+        );
         connect.setTooltip(new Tooltip(Localization.lang("Connect")));
         connect.setMaxWidth(Double.MAX_VALUE);
 
         manualConnect = new Button();
-        manualConnect.setGraphic(IconTheme.JabRefIcons.CONNECT_OPEN_OFFICE.getGraphicNode());
-        manualConnect.setTooltip(new Tooltip(Localization.lang("Manual connect")));
+        manualConnect.setGraphic(
+            IconTheme.JabRefIcons.CONNECT_OPEN_OFFICE.getGraphicNode()
+        );
+        manualConnect.setTooltip(
+            new Tooltip(Localization.lang("Manual connect"))
+        );
         manualConnect.setMaxWidth(Double.MAX_VALUE);
 
-        help = factory.createIconButton(StandardActions.HELP, new HelpAction(HelpFile.OPENOFFICE_LIBREOFFICE, dialogService, preferencesService.getFilePreferences()));
+        help =
+            factory.createIconButton(
+                StandardActions.HELP,
+                new HelpAction(
+                    HelpFile.OPENOFFICE_LIBREOFFICE,
+                    dialogService,
+                    preferencesService.getFilePreferences()
+                )
+            );
         help.setMaxWidth(Double.MAX_VALUE);
 
         selectDocument = new Button();
         selectDocument.setGraphic(IconTheme.JabRefIcons.OPEN.getGraphicNode());
-        selectDocument.setTooltip(new Tooltip(Localization.lang("Select Writer document")));
+        selectDocument.setTooltip(
+            new Tooltip(Localization.lang("Select Writer document"))
+        );
         selectDocument.setMaxWidth(Double.MAX_VALUE);
 
         update = new Button();
         update.setGraphic(IconTheme.JabRefIcons.REFRESH.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(
+        loader =
+            new StyleLoader(
                 preferencesService.getOpenOfficePreferences(),
                 preferencesService.getLayoutFormatterPreferences(),
-                abbreviationRepository);
+                abbreviationRepository
+            );
 
         initPanel();
     }
@@ -169,10 +207,17 @@ private boolean getOrUpdateTheStyle(String title) {
             try {
                 style.ensureUpToDate();
             } catch (IOException ex) {
-                LOGGER.warn("Unable to reload style file '" + style.getPath() + "'", ex);
-                String msg = Localization.lang("Unable to reload style file")
-                        + "'" + style.getPath() + "'"
-                        + "\n" + ex.getMessage();
+                LOGGER.warn(
+                    "Unable to reload style file '" + style.getPath() + "'",
+                    ex
+                );
+                String msg =
+                    Localization.lang("Unable to reload style file") +
+                    "'" +
+                    style.getPath() +
+                    "'" +
+                    "\n" +
+                    ex.getMessage();
                 new OOError(title, msg, ex).showErrorDialog(dialogService);
                 return FAIL;
             }
@@ -184,36 +229,86 @@ 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.setTooltip(
+            new Tooltip(
+                Localization.lang(
+                    "Select which open Writer document to work on"
+                )
+            )
+        );
         selectDocument.setOnAction(e -> ooBase.guiActionSelectDocument(false));
 
         setStyleFile.setMaxWidth(Double.MAX_VALUE);
         setStyleFile.setOnAction(event ->
-                dialogService.showCustomDialogAndWait(new StyleSelectDialogView(loader))
-                             .ifPresent(selectedStyle -> {
-                                 style = selectedStyle;
-                                 try {
-                                     style.ensureUpToDate();
-                                 } catch (IOException e) {
-                                     LOGGER.warn("Unable to reload style file '" + style.getPath() + "'", e);
-                                 }
-                                 dialogService.notify(Localization.lang("Current style is '%0'", style.getName()));
-                             }));
-
-        pushEntries.setTooltip(new Tooltip(Localization.lang("Cite selected entries between parenthesis")));
-        pushEntries.setOnAction(e -> pushEntries(CitationType.AUTHORYEAR_PAR, false));
+            dialogService
+                .showCustomDialogAndWait(new StyleSelectDialogView(loader))
+                .ifPresent(selectedStyle -> {
+                    style = selectedStyle;
+                    try {
+                        style.ensureUpToDate();
+                    } catch (IOException e) {
+                        LOGGER.warn(
+                            "Unable to reload style file '" +
+                            style.getPath() +
+                            "'",
+                            e
+                        );
+                    }
+                    dialogService.notify(
+                        Localization.lang(
+                            "Current style is '%0'",
+                            style.getName()
+                        )
+                    );
+                })
+        );
+
+        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.setOnAction(e -> pushEntries(CitationType.AUTHORYEAR_INTEXT, false));
+        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.setOnAction(e -> pushEntries(CitationType.INVISIBLE_CIT, false));
+        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.setOnAction(e -> pushEntries(CitationType.AUTHORYEAR_INTEXT, true));
+        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("Ensure that the bibliography is up-to-date")));
+        update.setTooltip(
+            new Tooltip(
+                Localization.lang("Ensure that the bibliography is up-to-date")
+            )
+        );
 
         update.setOnAction(event -> {
             String title = Localization.lang("Could not update bibliography");
@@ -225,20 +320,36 @@ private void initPanel() {
         });
 
         merge.setMaxWidth(Double.MAX_VALUE);
-        merge.setTooltip(new Tooltip(Localization.lang("Combine pairs of citations that are separated by spaces only")));
-        merge.setOnAction(e -> ooBase.guiActionMergeCitationGroups(getBaseList(), style));
+        merge.setTooltip(
+            new Tooltip(
+                Localization.lang(
+                    "Combine pairs of citations that are separated by spaces only"
+                )
+            )
+        );
+        merge.setOnAction(e ->
+            ooBase.guiActionMergeCitationGroups(getBaseList(), style)
+        );
 
         unmerge.setMaxWidth(Double.MAX_VALUE);
-        unmerge.setTooltip(new Tooltip(Localization.lang("Separate merged citations")));
-        unmerge.setOnAction(e -> ooBase.guiActionSeparateCitations(getBaseList(), style));
+        unmerge.setTooltip(
+            new Tooltip(Localization.lang("Separate merged citations"))
+        );
+        unmerge.setOnAction(e ->
+            ooBase.guiActionSeparateCitations(getBaseList(), style)
+        );
 
         ContextMenu settingsMenu = createSettingsPopup();
         settingsB.setMaxWidth(Double.MAX_VALUE);
         settingsB.setContextMenu(settingsMenu);
-        settingsB.setOnAction(e -> settingsMenu.show(settingsB, Side.BOTTOM, 0, 0));
+        settingsB.setOnAction(e ->
+            settingsMenu.show(settingsB, Side.BOTTOM, 0, 0)
+        );
         manageCitations.setMaxWidth(Double.MAX_VALUE);
         manageCitations.setOnAction(e -> {
-            ManageCitationsDialogView dialog = new ManageCitationsDialogView(ooBase);
+            ManageCitationsDialogView dialog = new ManageCitationsDialogView(
+                ooBase
+            );
             if (dialog.isOkToShowThisDialog()) {
                 dialogService.showCustomDialogAndWait(dialog);
             }
@@ -250,7 +361,9 @@ private void initPanel() {
         updateButtonAvailability();
 
         HBox hbox = new HBox();
-        hbox.getChildren().addAll(connect, manualConnect, selectDocument, update, help);
+        hbox
+            .getChildren()
+            .addAll(connect, manualConnect, selectDocument, update, help);
         hbox.getChildren().forEach(btn -> HBox.setHgrow(btn, Priority.ALWAYS));
 
         FlowPane flow = new FlowPane();
@@ -259,7 +372,9 @@ private void initPanel() {
         flow.setHgap(4);
         flow.setPrefWrapLength(200);
         flow.getChildren().addAll(setStyleFile, pushEntries, pushEntriesInt);
-        flow.getChildren().addAll(pushEntriesAdvanced, pushEntriesEmpty, merge, unmerge);
+        flow
+            .getChildren()
+            .addAll(pushEntriesAdvanced, pushEntriesEmpty, merge, unmerge);
         flow.getChildren().addAll(manageCitations, exportCitations, settingsB);
 
         vbox.setFillWidth(true);
@@ -269,40 +384,55 @@ 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());
+            BibDatabaseContext databaseContext = new BibDatabaseContext(
+                newDatabase.get()
+            );
             LibraryTab libraryTab = LibraryTab.createLibraryTab(
-                    databaseContext,
-                    JabRefGUI.getMainFrame(),
-                    dialogService,
-                    preferencesService,
-                    stateManager,
-                    fileUpdateMonitor,
-                    entryTypesManager,
-                    undoManager,
-                    taskExecutor);
+                databaseContext,
+                JabRefGUI.getMainFrame(),
+                dialogService,
+                preferencesService,
+                stateManager,
+                fileUpdateMonitor,
+                entryTypesManager,
+                undoManager,
+                taskExecutor
+            );
             tabContainer.addTab(libraryTab, true);
         }
     }
 
     private List<BibDatabase> getBaseList() {
         List<BibDatabase> databases = new ArrayList<>();
-        if (preferencesService.getOpenOfficePreferences().getUseAllDatabases()) {
+        if (
+            preferencesService.getOpenOfficePreferences().getUseAllDatabases()
+        ) {
             for (BibDatabaseContext database : stateManager.getOpenDatabases()) {
                 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(preferencesService.getOpenOfficePreferences(), dialogService);
+        DetectOpenOfficeInstallation officeInstallation =
+            new DetectOpenOfficeInstallation(
+                preferencesService.getOpenOfficePreferences(),
+                dialogService
+            );
 
         if (officeInstallation.isExecutablePathDefined()) {
             connect();
@@ -315,48 +445,96 @@ protected List<Path> call() {
             };
 
             taskConnectIfInstalled.setOnSucceeded(evt -> {
-                var installations = new ArrayList<>(taskConnectIfInstalled.getValue());
+                var installations = new ArrayList<>(
+                    taskConnectIfInstalled.getValue()
+                );
                 if (installations.isEmpty()) {
-                    officeInstallation.selectInstallationPath().ifPresent(installations::add);
+                    officeInstallation
+                        .selectInstallationPath()
+                        .ifPresent(installations::add);
                 }
-                Optional<Path> actualFile = officeInstallation.chooseAmongInstallations(installations);
-                if (actualFile.isPresent() && officeInstallation.setOpenOfficePreferences(actualFile.get())) {
+                Optional<Path> actualFile =
+                    officeInstallation.chooseAmongInstallations(installations);
+                if (
+                    actualFile.isPresent() &&
+                    officeInstallation.setOpenOfficePreferences(
+                        actualFile.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);
+            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);
-
-        DetectOpenOfficeInstallation officeInstallation = new DetectOpenOfficeInstallation(preferencesService.getOpenOfficePreferences(), dialogService);
+        var fileDialogConfiguration = new DirectoryDialogConfiguration.Builder()
+            .withInitialDirectory(System.getProperty("user.home"))
+            .build();
+        Optional<Path> selectedPath =
+            dialogService.showDirectorySelectionDialog(fileDialogConfiguration);
+
+        DetectOpenOfficeInstallation officeInstallation =
+            new DetectOpenOfficeInstallation(
+                preferencesService.getOpenOfficePreferences(),
+                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."
+                )
+            );
         }
     }
 
     private void updateButtonAvailability() {
         boolean isConnected = ooBase != null;
-        boolean isConnectedToDocument = isConnected && !ooBase.isDocumentConnectionMissing();
+        boolean isConnectedToDocument =
+            isConnected && !ooBase.isDocumentConnectionMissing();
 
         // For these, we need to watch something
         boolean hasStyle = true; // (style != null);
@@ -364,9 +542,12 @@ private void updateButtonAvailability() {
         boolean hasSelectedBibEntry = true;
 
         selectDocument.setDisable(!isConnected);
-        pushEntries.setDisable(!(isConnectedToDocument && hasStyle && hasDatabase));
+        pushEntries.setDisable(
+            !(isConnectedToDocument && hasStyle && hasDatabase)
+        );
 
-        boolean canCite = isConnectedToDocument && hasStyle && hasSelectedBibEntry;
+        boolean canCite =
+            isConnectedToDocument && hasStyle && hasSelectedBibEntry;
         pushEntriesInt.setDisable(!canCite);
         pushEntriesEmpty.setDisable(!canCite);
         pushEntriesAdvanced.setDisable(!canCite);
@@ -384,9 +565,16 @@ private void connect() {
         Task<OOBibBase> connectTask = new Task<>() {
             @Override
             protected OOBibBase call() throws Exception {
-                updateProgress(ProgressBar.INDETERMINATE_PROGRESS, ProgressBar.INDETERMINATE_PROGRESS);
-
-                var path = Path.of(preferencesService.getOpenOfficePreferences().getExecutablePath());
+                updateProgress(
+                    ProgressBar.INDETERMINATE_PROGRESS,
+                    ProgressBar.INDETERMINATE_PROGRESS
+                );
+
+                var path = Path.of(
+                    preferencesService
+                        .getOpenOfficePreferences()
+                        .getExecutablePath()
+                );
                 return createBibBase(path);
             }
         };
@@ -404,32 +592,71 @@ protected OOBibBase call() throws Exception {
             Throwable ex = connectTask.getException();
             LOGGER.error("autodetect failed", ex);
             if (ex instanceof UnsatisfiedLinkError) {
-                LOGGER.warn("Could not connect to running OpenOffice/LibreOffice", ex);
-
-                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."));
+                LOGGER.warn(
+                    "Could not connect to running OpenOffice/LibreOffice",
+                    ex
+                );
+
+                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."
+                    )
+                );
             } else if (ex instanceof IOException) {
-                LOGGER.warn("Could not connect to running OpenOffice/LibreOffice", ex);
-
-                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);
+                LOGGER.warn(
+                    "Could not connect to running OpenOffice/LibreOffice",
+                    ex
+                );
+
+                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
+                );
             } else if (ex instanceof BootstrapException bootstrapEx) {
-               LOGGER.error("Exception boostrap cause", bootstrapEx.getTargetException());
-               dialogService.showErrorDialogAndWait("Bootstrap error", bootstrapEx.getTargetException());
+                LOGGER.error(
+                    "Exception boostrap cause",
+                    bootstrapEx.getTargetException()
+                );
+                dialogService.showErrorDialogAndWait(
+                    "Bootstrap error",
+                    bootstrapEx.getTargetException()
+                );
             } else {
-                dialogService.showErrorDialogAndWait(Localization.lang("Autodetection failed"), Localization.lang("Autodetection failed"), ex);
+                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);
     }
 
-    private OOBibBase createBibBase(Path loPath) throws BootstrapException, CreationException {
+    private OOBibBase createBibBase(Path loPath)
+        throws BootstrapException, CreationException {
         return new OOBibBase(loPath, dialogService);
     }
 
@@ -439,39 +666,52 @@ private OOBibBase createBibBase(Path loPath) throws BootstrapException, Creation
      * @param withText      False means invisible citation (no text).
      * @param inParenthesis True means "(Au and Thor 2000)". False means "Au and Thor (2000)".
      */
-    private static CitationType citationTypeFromOptions(boolean withText, boolean inParenthesis) {
+    private static CitationType citationTypeFromOptions(
+        boolean withText,
+        boolean inParenthesis
+    ) {
         if (!withText) {
             return CitationType.INVISIBLE_CIT;
         }
         return inParenthesis
-                ? CitationType.AUTHORYEAR_PAR
-                : CitationType.AUTHORYEAR_INTEXT;
+            ? CitationType.AUTHORYEAR_PAR
+            : CitationType.AUTHORYEAR_INTEXT;
     }
 
     private void pushEntries(CitationType citationType, boolean addPageInfo) {
-        final String errorDialogTitle = Localization.lang("Error pushing entries");
-
-        if (stateManager.getActiveDatabase().isEmpty()
-                || (stateManager.getActiveDatabase().get().getDatabase() == null)) {
-            OOError.noDataBaseIsOpenForCiting()
-                   .setTitle(errorDialogTitle)
-                   .showErrorDialog(dialogService);
+        final String errorDialogTitle = Localization.lang(
+            "Error pushing entries"
+        );
+
+        if (
+            stateManager.getActiveDatabase().isEmpty() ||
+            (stateManager.getActiveDatabase().get().getDatabase() == null)
+        ) {
+            OOError
+                .noDataBaseIsOpenForCiting()
+                .setTitle(errorDialogTitle)
+                .showErrorDialog(dialogService);
             return;
         }
 
-        final BibDatabase database = stateManager.getActiveDatabase().get().getDatabase();
+        final BibDatabase database = stateManager
+            .getActiveDatabase()
+            .get()
+            .getDatabase();
         if (database == null) {
-            OOError.noDataBaseIsOpenForCiting()
-                   .setTitle(errorDialogTitle)
-                   .showErrorDialog(dialogService);
+            OOError
+                .noDataBaseIsOpenForCiting()
+                .setTitle(errorDialogTitle)
+                .showErrorDialog(dialogService);
             return;
         }
 
         List<BibEntry> entries = stateManager.getSelectedEntries();
         if (entries.isEmpty()) {
-            OOError.noEntriesSelectedForCitation()
-                   .setTitle(errorDialogTitle)
-                   .showErrorDialog(dialogService);
+            OOError
+                .noEntriesSelectedForCitation()
+                .setTitle(errorDialogTitle)
+                .showErrorDialog(dialogService);
             return;
         }
 
@@ -483,13 +723,20 @@ 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;
@@ -501,17 +748,20 @@ private void pushEntries(CitationType citationType, boolean addPageInfo) {
             return;
         }
 
-        Optional<Update.SyncOptions> syncOptions =
-                preferencesService.getOpenOfficePreferences().getSyncWhenCiting()
-                        ? Optional.of(new Update.SyncOptions(getBaseList()))
-                        : Optional.empty();
-
-        ooBase.guiActionInsertEntry(entries,
-                database,
-                style,
-                citationType,
-                pageInfo,
-                syncOptions);
+        Optional<Update.SyncOptions> syncOptions = preferencesService
+                .getOpenOfficePreferences()
+                .getSyncWhenCiting()
+            ? Optional.of(new Update.SyncOptions(getBaseList()))
+            : Optional.empty();
+
+        ooBase.guiActionInsertEntry(
+            entries,
+            database,
+            style,
+            citationType,
+            pageInfo,
+            syncOptions
+        );
     }
 
     /**
@@ -537,22 +787,32 @@ 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"));
-
-        Optional<BibDatabaseContext> databaseContext = stateManager.getActiveDatabase();
+        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()) {
             // Generate keys
-            CitationKeyPatternPreferences prefs = preferencesService.getCitationKeyPatternPreferences();
-            NamedCompound undoCompound = new NamedCompound(Localization.lang("Cite"));
+            CitationKeyPatternPreferences prefs =
+                preferencesService.getCitationKeyPatternPreferences();
+            NamedCompound undoCompound = new NamedCompound(
+                Localization.lang("Cite")
+            );
             for (BibEntry entry : entries) {
                 if (entry.getCitationKey().isEmpty()) {
                     // Generate key
                     new CitationKeyGenerator(databaseContext.get(), prefs)
-                            .generateAndSetKey(entry)
-                            .ifPresent(change -> undoCompound.addEdit(new UndoableKeyChange(change)));
+                        .generateAndSetKey(entry)
+                        .ifPresent(change ->
+                            undoCompound.addEdit(new UndoableKeyChange(change))
+                        );
                 }
             }
             undoCompound.end();
@@ -567,20 +827,37 @@ private boolean checkThatEntriesHaveKeys(List<BibEntry> entries) {
     }
 
     private ContextMenu createSettingsPopup() {
-        OpenOfficePreferences openOfficePreferences = preferencesService.getOpenOfficePreferences();
+        OpenOfficePreferences openOfficePreferences =
+            preferencesService.getOpenOfficePreferences();
 
         ContextMenu contextMenu = new ContextMenu();
 
-        CheckMenuItem autoSync = new CheckMenuItem(Localization.lang("Automatically sync bibliography when inserting citations"));
-        autoSync.selectedProperty().set(preferencesService.getOpenOfficePreferences().getSyncWhenCiting());
+        CheckMenuItem autoSync = new CheckMenuItem(
+            Localization.lang(
+                "Automatically sync bibliography when inserting citations"
+            )
+        );
+        autoSync
+            .selectedProperty()
+            .set(
+                preferencesService
+                    .getOpenOfficePreferences()
+                    .getSyncWhenCiting()
+            );
 
         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);
@@ -588,21 +865,34 @@ private ContextMenu createSettingsPopup() {
             useActiveBase.setSelected(true);
         }
 
-        autoSync.setOnAction(e -> openOfficePreferences.setSyncWhenCiting(autoSync.isSelected()));
-        useAllBases.setOnAction(e -> openOfficePreferences.setUseAllDatabases(useAllBases.isSelected()));
-        useActiveBase.setOnAction(e -> openOfficePreferences.setUseAllDatabases(!useActiveBase.isSelected()));
+        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"));
+            dialogService.notify(
+                Localization.lang("Cleared connection settings")
+            );
         });
 
-        contextMenu.getItems().addAll(
+        contextMenu
+            .getItems()
+            .addAll(
                 autoSync,
                 new SeparatorMenuItem(),
                 useActiveBase,
                 useAllBases,
                 new SeparatorMenuItem(),
-                clearConnectionSettings);
+                clearConnectionSettings
+            );
 
         return contextMenu;
     }
diff --git a/src/main/java/org/jabref/gui/openoffice/StyleSelectDialogView.java b/src/main/java/org/jabref/gui/openoffice/StyleSelectDialogView.java
index 2dd29a449e1..762bfbb6d6d 100644
--- a/src/main/java/org/jabref/gui/openoffice/StyleSelectDialogView.java
+++ b/src/main/java/org/jabref/gui/openoffice/StyleSelectDialogView.java
@@ -1,5 +1,8 @@
 package org.jabref.gui.openoffice;
 
+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;
@@ -8,7 +11,6 @@
 import javafx.scene.control.TableColumn;
 import javafx.scene.control.TableView;
 import javafx.scene.layout.VBox;
-
 import org.jabref.gui.DialogService;
 import org.jabref.gui.StateManager;
 import org.jabref.gui.icon.IconTheme;
@@ -27,29 +29,47 @@
 import org.jabref.model.entry.types.StandardEntryType;
 import org.jabref.preferences.PreferencesService;
 
-import com.airhacks.afterburner.views.ViewLoader;
-import com.tobiasdiez.easybind.EasyBind;
-import jakarta.inject.Inject;
-
 public class StyleSelectDialogView extends BaseDialog<OOBibStyle> {
 
     private final MenuItem edit = new MenuItem(Localization.lang("Edit"));
     private final MenuItem reload = new MenuItem(Localization.lang("Reload"));
     private final StyleLoader loader;
 
-    @FXML private TableColumn<StyleSelectItemViewModel, String> colName;
-    @FXML private TableView<StyleSelectItemViewModel> tvStyles;
-    @FXML private TableColumn<StyleSelectItemViewModel, String> colJournals;
-    @FXML private TableColumn<StyleSelectItemViewModel, String> colFile;
-    @FXML private TableColumn<StyleSelectItemViewModel, Boolean> colDeleteIcon;
-    @FXML private Button add;
-    @FXML private VBox vbox;
+    @FXML
+    private TableColumn<StyleSelectItemViewModel, String> colName;
+
+    @FXML
+    private TableView<StyleSelectItemViewModel> tvStyles;
+
+    @FXML
+    private TableColumn<StyleSelectItemViewModel, String> colJournals;
+
+    @FXML
+    private TableColumn<StyleSelectItemViewModel, String> colFile;
+
+    @FXML
+    private TableColumn<StyleSelectItemViewModel, Boolean> colDeleteIcon;
+
+    @FXML
+    private Button add;
+
+    @FXML
+    private VBox vbox;
+
+    @Inject
+    private PreferencesService preferencesService;
+
+    @Inject
+    private DialogService dialogService;
 
-    @Inject private PreferencesService preferencesService;
-    @Inject private DialogService dialogService;
-    @Inject private StateManager stateManager;
-    @Inject private ThemeManager themeManager;
-    @Inject private TaskExecutor taskExecutor;
+    @Inject
+    private StateManager stateManager;
+
+    @Inject
+    private ThemeManager themeManager;
+
+    @Inject
+    private TaskExecutor taskExecutor;
 
     private StyleSelectDialogViewModel viewModel;
     private PreviewViewer previewArticle;
@@ -58,14 +78,15 @@ public class StyleSelectDialogView extends BaseDialog<OOBibStyle> {
     public StyleSelectDialogView(StyleLoader loader) {
         this.loader = loader;
 
-        ViewLoader.view(this)
-                  .load()
-                  .setAsDialogPane(this);
+        ViewLoader.view(this).load().setAsDialogPane(this);
 
         setResultConverter(button -> {
             if (button == ButtonType.OK) {
                 viewModel.storePrefs();
-                return tvStyles.getSelectionModel().getSelectedItem().getStyle();
+                return tvStyles
+                    .getSelectionModel()
+                    .getSelectedItem()
+                    .getStyle();
             }
             return null;
         });
@@ -74,60 +95,107 @@ public StyleSelectDialogView(StyleLoader loader) {
 
     @FXML
     private void initialize() {
-        viewModel = new StyleSelectDialogViewModel(dialogService, loader, preferencesService);
-
-        previewArticle = new PreviewViewer(new BibDatabaseContext(), dialogService, preferencesService, stateManager, themeManager, taskExecutor);
+        viewModel =
+            new StyleSelectDialogViewModel(
+                dialogService,
+                loader,
+                preferencesService
+            );
+
+        previewArticle =
+            new PreviewViewer(
+                new BibDatabaseContext(),
+                dialogService,
+                preferencesService,
+                stateManager,
+                themeManager,
+                taskExecutor
+            );
         previewArticle.setEntry(TestEntry.getTestEntry());
         vbox.getChildren().add(previewArticle);
 
-        previewBook = new PreviewViewer(new BibDatabaseContext(), dialogService, preferencesService, stateManager, themeManager, taskExecutor);
+        previewBook =
+            new PreviewViewer(
+                new BibDatabaseContext(),
+                dialogService,
+                preferencesService,
+                stateManager,
+                themeManager,
+                taskExecutor
+            );
         previewBook.setEntry(TestEntry.getTestEntryBook());
         vbox.getChildren().add(previewBook);
 
-        colName.setCellValueFactory(cellData -> cellData.getValue().nameProperty());
-        colJournals.setCellValueFactory(cellData -> cellData.getValue().journalsProperty());
-        colFile.setCellValueFactory(cellData -> cellData.getValue().fileProperty());
-        colDeleteIcon.setCellValueFactory(cellData -> cellData.getValue().internalStyleProperty());
+        colName.setCellValueFactory(cellData ->
+            cellData.getValue().nameProperty()
+        );
+        colJournals.setCellValueFactory(cellData ->
+            cellData.getValue().journalsProperty()
+        );
+        colFile.setCellValueFactory(cellData ->
+            cellData.getValue().fileProperty()
+        );
+        colDeleteIcon.setCellValueFactory(cellData ->
+            cellData.getValue().internalStyleProperty()
+        );
 
         new ValueTableCellFactory<StyleSelectItemViewModel, Boolean>()
-                .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);
+            .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);
 
         edit.setOnAction(e -> viewModel.editStyle());
 
         new ViewModelTableRowFactory<StyleSelectItemViewModel>()
-                .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);
-            }
-        });
+            .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.setItems(viewModel.stylesProperty());
 
         add.setGraphic(IconTheme.JabRefIcons.ADD.getGraphicNode());
 
-        EasyBind.subscribe(viewModel.selectedItemProperty(), style -> {
-            tvStyles.getSelectionModel().select(style);
-            previewArticle.setLayout(new TextBasedPreviewLayout(style.getStyle().getReferenceFormat(StandardEntryType.Article)));
-            previewBook.setLayout(new TextBasedPreviewLayout(style.getStyle().getReferenceFormat(StandardEntryType.Book)));
-        });
+        EasyBind.subscribe(
+            viewModel.selectedItemProperty(),
+            style -> {
+                tvStyles.getSelectionModel().select(style);
+                previewArticle.setLayout(
+                    new TextBasedPreviewLayout(
+                        style
+                            .getStyle()
+                            .getReferenceFormat(StandardEntryType.Article)
+                    )
+                );
+                previewBook.setLayout(
+                    new TextBasedPreviewLayout(
+                        style
+                            .getStyle()
+                            .getReferenceFormat(StandardEntryType.Book)
+                    )
+                );
+            }
+        );
     }
 
     private ContextMenu createContextMenu() {
diff --git a/src/main/java/org/jabref/gui/openoffice/StyleSelectDialogViewModel.java b/src/main/java/org/jabref/gui/openoffice/StyleSelectDialogViewModel.java
index 3fc36eec238..df0db4b1292 100644
--- a/src/main/java/org/jabref/gui/openoffice/StyleSelectDialogViewModel.java
+++ b/src/main/java/org/jabref/gui/openoffice/StyleSelectDialogViewModel.java
@@ -5,7 +5,6 @@
 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;
@@ -15,7 +14,6 @@
 import javafx.scene.control.DialogPane;
 import javafx.scene.control.ScrollPane;
 import javafx.scene.control.TextArea;
-
 import org.jabref.gui.DialogService;
 import org.jabref.gui.desktop.JabRefDesktop;
 import org.jabref.gui.externalfiletype.ExternalFileType;
@@ -36,13 +34,20 @@ public class StyleSelectDialogViewModel {
     private final StyleLoader styleLoader;
     private final OpenOfficePreferences openOfficePreferences;
     private final FilePreferences filePreferences;
-    private final ListProperty<StyleSelectItemViewModel> styles = new SimpleListProperty<>(FXCollections.observableArrayList());
-    private final ObjectProperty<StyleSelectItemViewModel> selectedItem = new SimpleObjectProperty<>();
-
-    public StyleSelectDialogViewModel(DialogService dialogService, StyleLoader styleLoader, PreferencesService preferencesService) {
+    private final ListProperty<StyleSelectItemViewModel> styles =
+        new SimpleListProperty<>(FXCollections.observableArrayList());
+    private final ObjectProperty<StyleSelectItemViewModel> selectedItem =
+        new SimpleObjectProperty<>();
+
+    public StyleSelectDialogViewModel(
+        DialogService dialogService,
+        StyleLoader styleLoader,
+        PreferencesService preferencesService
+    ) {
         this.dialogService = dialogService;
         this.filePreferences = preferencesService.getFilePreferences();
-        this.openOfficePreferences = preferencesService.getOpenOfficePreferences();
+        this.openOfficePreferences =
+            preferencesService.getOpenOfficePreferences();
         this.styleLoader = styleLoader;
 
         styles.addAll(loadStyles());
@@ -52,7 +57,14 @@ public StyleSelectDialogViewModel(DialogService dialogService, StyleLoader style
     }
 
     public StyleSelectItemViewModel fromOOBibStyle(OOBibStyle 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 OOBibStyle toOOBibStyle(StyleSelectItemViewModel item) {
@@ -60,25 +72,46 @@ public OOBibStyle toOOBibStyle(StyleSelectItemViewModel item) {
     }
 
     public void addStyleFile() {
-        FileDialogConfiguration fileDialogConfiguration = new FileDialogConfiguration.Builder()
-                .addExtensionFilter(Localization.lang("Style file"), StandardFileType.JSTYLE)
-                .withDefaultExtension(Localization.lang("Style file"), StandardFileType.JSTYLE)
+        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.setCurrentStyle(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\"."));
-            }
-        });
+        Optional<Path> path = dialogService.showFileOpenDialog(
+            fileDialogConfiguration
+        );
+        path
+            .map(Path::toAbsolutePath)
+            .map(Path::toString)
+            .ifPresent(stylePath -> {
+                if (styleLoader.addStyleIfValid(stylePath)) {
+                    openOfficePreferences.setCurrentStyle(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() {
@@ -94,9 +127,18 @@ public void deleteStyle() {
 
     public void editStyle() {
         OOBibStyle style = selectedItem.getValue().getStyle();
-        Optional<ExternalFileType> type = ExternalFileTypes.getExternalFileTypeByExt("jstyle", filePreferences);
+        Optional<ExternalFileType> type =
+            ExternalFileTypes.getExternalFileTypeByExt(
+                "jstyle",
+                filePreferences
+            );
         try {
-            JabRefDesktop.openExternalFileAnyFormat(new BibDatabaseContext(), filePreferences, style.getPath(), type);
+            JabRefDesktop.openExternalFileAnyFormat(
+                new BibDatabaseContext(),
+                filePreferences,
+                style.getPath(),
+                type
+            );
         } catch (IOException e) {
             dialogService.showErrorDialogAndWait(e);
         }
@@ -110,7 +152,11 @@ public void viewStyle(StyleSelectItemViewModel item) {
         TextArea styleView = new TextArea(item.getStyle().getLocalCopy());
         scrollPane.setContent(styleView);
         pane.setContent(scrollPane);
-        dialogService.showCustomDialogAndWait(item.getStyle().getName(), pane, ButtonType.OK);
+        dialogService.showCustomDialogAndWait(
+            item.getStyle().getName(),
+            pane,
+            ButtonType.OK
+        );
     }
 
     public ObjectProperty<StyleSelectItemViewModel> selectedItemProperty() {
@@ -118,16 +164,23 @@ public ObjectProperty<StyleSelectItemViewModel> selectedItemProperty() {
     }
 
     public void storePrefs() {
-        List<String> externalStyles = styles.stream()
-                                            .map(this::toOOBibStyle)
-                                            .filter(style -> !style.isInternalStyle())
-                                            .map(OOBibStyle::getPath)
-                                            .collect(Collectors.toList());
+        List<String> externalStyles = styles
+            .stream()
+            .map(this::toOOBibStyle)
+            .filter(style -> !style.isInternalStyle())
+            .map(OOBibStyle::getPath)
+            .collect(Collectors.toList());
         openOfficePreferences.setExternalStyles(externalStyles);
-        openOfficePreferences.setCurrentStyle(selectedItem.getValue().getStylePath());
+        openOfficePreferences.setCurrentStyle(
+            selectedItem.getValue().getStylePath()
+        );
     }
 
     private StyleSelectItemViewModel getStyleOrDefault(String stylePath) {
-        return styles.stream().filter(style -> style.getStylePath().equals(stylePath)).findFirst().orElse(styles.get(0));
+        return styles
+            .stream()
+            .filter(style -> style.getStylePath().equals(stylePath))
+            .findFirst()
+            .orElse(styles.get(0));
     }
 }
diff --git a/src/main/java/org/jabref/gui/openoffice/StyleSelectItemViewModel.java b/src/main/java/org/jabref/gui/openoffice/StyleSelectItemViewModel.java
index af7390aeb65..80ac7148cbb 100644
--- a/src/main/java/org/jabref/gui/openoffice/StyleSelectItemViewModel.java
+++ b/src/main/java/org/jabref/gui/openoffice/StyleSelectItemViewModel.java
@@ -7,7 +7,6 @@
 import javafx.beans.property.SimpleStringProperty;
 import javafx.beans.property.StringProperty;
 import javafx.scene.Node;
-
 import org.jabref.gui.icon.IconTheme;
 import org.jabref.logic.openoffice.style.OOBibStyle;
 
@@ -16,11 +15,18 @@ 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 OOBibStyle style;
     private final BooleanProperty internalStyle = new SimpleBooleanProperty();
 
-    public StyleSelectItemViewModel(String name, String journals, String file, OOBibStyle style) {
+    public StyleSelectItemViewModel(
+        String name,
+        String journals,
+        String file,
+        OOBibStyle style
+    ) {
         this.name.setValue(name);
         this.journals.setValue(journals);
         this.file.setValue(file);
diff --git a/src/main/java/org/jabref/gui/preferences/AbstractPreferenceTabView.java b/src/main/java/org/jabref/gui/preferences/AbstractPreferenceTabView.java
index 61ea82243fa..26cee411fda 100644
--- a/src/main/java/org/jabref/gui/preferences/AbstractPreferenceTabView.java
+++ b/src/main/java/org/jabref/gui/preferences/AbstractPreferenceTabView.java
@@ -1,21 +1,27 @@
 package org.jabref.gui.preferences;
 
+import jakarta.inject.Inject;
 import java.util.List;
-
 import javafx.scene.Node;
 import javafx.scene.layout.VBox;
-
 import org.jabref.gui.DialogService;
 import org.jabref.gui.util.TaskExecutor;
 import org.jabref.preferences.PreferencesService;
 
-import jakarta.inject.Inject;
+public abstract class AbstractPreferenceTabView<
+    T extends PreferenceTabViewModel
+>
+    extends VBox
+    implements PreferencesTab {
+
+    @Inject
+    protected TaskExecutor taskExecutor;
 
-public abstract class AbstractPreferenceTabView<T extends PreferenceTabViewModel> extends VBox implements PreferencesTab {
+    @Inject
+    protected DialogService dialogService;
 
-    @Inject protected TaskExecutor taskExecutor;
-    @Inject protected DialogService dialogService;
-    @Inject protected PreferencesService preferencesService;
+    @Inject
+    protected PreferencesService preferencesService;
 
     protected T viewModel;
 
diff --git a/src/main/java/org/jabref/gui/preferences/PreferenceTabViewModel.java b/src/main/java/org/jabref/gui/preferences/PreferenceTabViewModel.java
index 06821b7ff2a..474fe0746fc 100644
--- a/src/main/java/org/jabref/gui/preferences/PreferenceTabViewModel.java
+++ b/src/main/java/org/jabref/gui/preferences/PreferenceTabViewModel.java
@@ -4,7 +4,6 @@
 import java.util.List;
 
 public interface PreferenceTabViewModel {
-
     /**
      * This method is called when the dialog is opened, or if it is made
      * visible after being hidden. The tab should update all its values.
diff --git a/src/main/java/org/jabref/gui/preferences/PreferencesDialogView.java b/src/main/java/org/jabref/gui/preferences/PreferencesDialogView.java
index 1de0bdd99f0..929dcbd0065 100644
--- a/src/main/java/org/jabref/gui/preferences/PreferencesDialogView.java
+++ b/src/main/java/org/jabref/gui/preferences/PreferencesDialogView.java
@@ -1,14 +1,16 @@
 package org.jabref.gui.preferences;
 
+import com.airhacks.afterburner.views.ViewLoader;
+import com.tobiasdiez.easybind.EasyBind;
+import jakarta.inject.Inject;
 import java.util.Locale;
-
 import javafx.fxml.FXML;
 import javafx.scene.control.ButtonType;
 import javafx.scene.control.ListView;
 import javafx.scene.control.ScrollPane;
 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.JabRefFrame;
 import org.jabref.gui.icon.IconTheme;
@@ -20,27 +22,37 @@
 import org.jabref.logic.l10n.Localization;
 import org.jabref.preferences.PreferencesService;
 
-import com.airhacks.afterburner.views.ViewLoader;
-import com.tobiasdiez.easybind.EasyBind;
-import jakarta.inject.Inject;
-import org.controlsfx.control.textfield.CustomTextField;
-
 /**
  * Preferences dialog. Contains a TabbedPane, and tabs will be defined in separate classes. Tabs MUST implement the
  * PreferencesTab interface, since this dialog will call the storeSettings() method of all tabs when the user presses
  * ok.
  */
-public class PreferencesDialogView extends BaseDialog<PreferencesDialogViewModel> {
+public class PreferencesDialogView
+    extends BaseDialog<PreferencesDialogViewModel> {
+
+    @FXML
+    private CustomTextField searchBox;
+
+    @FXML
+    private ListView<PreferencesTab> preferenceTabList;
+
+    @FXML
+    private ScrollPane preferencesContainer;
+
+    @FXML
+    private ButtonType saveButton;
+
+    @FXML
+    private ToggleButton memoryStickMode;
 
-    @FXML private CustomTextField searchBox;
-    @FXML private ListView<PreferencesTab> preferenceTabList;
-    @FXML private ScrollPane preferencesContainer;
-    @FXML private ButtonType saveButton;
-    @FXML private ToggleButton memoryStickMode;
+    @Inject
+    private DialogService dialogService;
 
-    @Inject private DialogService dialogService;
-    @Inject private PreferencesService preferencesService;
-    @Inject private ThemeManager themeManager;
+    @Inject
+    private PreferencesService preferencesService;
+
+    @Inject
+    private ThemeManager themeManager;
 
     private final JabRefFrame frame;
     private PreferencesDialogViewModel viewModel;
@@ -49,11 +61,13 @@ public PreferencesDialogView(JabRefFrame frame) {
         this.frame = frame;
         this.setTitle(Localization.lang("JabRef preferences"));
 
-        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 -> {
@@ -71,43 +85,73 @@ public PreferencesDialogViewModel getViewModel() {
 
     @FXML
     private void initialize() {
-        viewModel = new PreferencesDialogViewModel(dialogService, preferencesService, frame);
+        viewModel =
+            new PreferencesDialogViewModel(
+                dialogService,
+                preferencesService,
+                frame
+            );
 
-        preferenceTabList.itemsProperty().setValue(viewModel.getPreferenceTabs());
+        preferenceTabList
+            .itemsProperty()
+            .setValue(viewModel.getPreferenceTabs());
 
         // The list view does not respect the listener for the dialog and needs its own
         preferenceTabList.setOnKeyReleased(key -> {
-            if (preferencesService.getKeyBindingRepository().checkKeyCombinationEquality(KeyBinding.CLOSE, key)) {
+            if (
+                preferencesService
+                    .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();
-        });
+        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);
+                }
             }
-        });
+        );
 
         preferenceTabList.getSelectionModel().selectFirst();
         new ViewModelListCellFactory<PreferencesTab>()
-                .withText(PreferencesTab::getTabName)
-                .install(preferenceTabList);
+            .withText(PreferencesTab::getTabName)
+            .install(preferenceTabList);
 
-        memoryStickMode.selectedProperty().bindBidirectional(viewModel.getMemoryStickProperty());
+        memoryStickMode
+            .selectedProperty()
+            .bindBidirectional(viewModel.getMemoryStickProperty());
 
         viewModel.setValues();
     }
diff --git a/src/main/java/org/jabref/gui/preferences/PreferencesDialogViewModel.java b/src/main/java/org/jabref/gui/preferences/PreferencesDialogViewModel.java
index 35f6a9db00b..ac19f497d89 100644
--- a/src/main/java/org/jabref/gui/preferences/PreferencesDialogViewModel.java
+++ b/src/main/java/org/jabref/gui/preferences/PreferencesDialogViewModel.java
@@ -3,13 +3,11 @@
 import java.util.ArrayList;
 import java.util.List;
 import java.util.prefs.BackingStoreException;
-
 import javafx.beans.property.BooleanProperty;
 import javafx.beans.property.ReadOnlyListWrapper;
 import javafx.beans.property.SimpleBooleanProperty;
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableList;
-
 import org.jabref.gui.AbstractViewModel;
 import org.jabref.gui.DialogService;
 import org.jabref.gui.Globals;
@@ -42,27 +40,34 @@
 import org.jabref.logic.util.StandardFileType;
 import org.jabref.preferences.PreferencesFilter;
 import org.jabref.preferences.PreferencesService;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 public class PreferencesDialogViewModel extends AbstractViewModel {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(PreferencesDialogViewModel.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(
+        PreferencesDialogViewModel.class
+    );
 
-    private final SimpleBooleanProperty memoryStickProperty = new SimpleBooleanProperty();
+    private final SimpleBooleanProperty memoryStickProperty =
+        new SimpleBooleanProperty();
 
     private final DialogService dialogService;
     private final PreferencesService preferences;
     private final ObservableList<PreferencesTab> preferenceTabs;
     private final JabRefFrame frame;
 
-    public PreferencesDialogViewModel(DialogService dialogService, PreferencesService preferences, JabRefFrame frame) {
+    public PreferencesDialogViewModel(
+        DialogService dialogService,
+        PreferencesService preferences,
+        JabRefFrame frame
+    ) {
         this.dialogService = dialogService;
         this.preferences = preferences;
         this.frame = frame;
 
-        preferenceTabs = FXCollections.observableArrayList(
+        preferenceTabs =
+            FXCollections.observableArrayList(
                 new GeneralTab(),
                 new KeyBindingsTab(),
                 new GroupsTab(),
@@ -85,7 +90,7 @@ public PreferencesDialogViewModel(DialogService dialogService, PreferencesServic
                 new CustomImporterTab(),
                 new CustomExporterTab(),
                 new NetworkTab()
-        );
+            );
     }
 
     public ObservableList<PreferencesTab> getPreferenceTabs() {
@@ -93,65 +98,103 @@ public ObservableList<PreferencesTab> getPreferenceTabs() {
     }
 
     public void importPreferences() {
-        FileDialogConfiguration fileDialogConfiguration = new FileDialogConfiguration.Builder()
+        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);
-                             updateAfterPreferenceChanges();
-
-                             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);
-                         }
-                     });
+                .withInitialDirectory(
+                    preferences
+                        .getInternalPreferences()
+                        .getLastPreferencesExportPath()
+                )
+                .build();
+
+        dialogService
+            .showFileOpenDialog(fileDialogConfiguration)
+            .ifPresent(file -> {
+                try {
+                    preferences.importPreferences(file);
+                    updateAfterPreferenceChanges();
+
+                    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()
+        FileDialogConfiguration fileDialogConfiguration =
+            new FileDialogConfiguration.Builder()
                 .addExtensionFilter(StandardFileType.XML)
                 .withDefaultExtension(StandardFileType.XML)
-                .withInitialDirectory(preferences.getInternalPreferences().getLastPreferencesExportPath())
+                .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);
-                         }
-                     });
+        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(
+        boolean resetPreferencesConfirmed =
+            dialogService.showConfirmationDialogAndWait(
                 Localization.lang("Reset preferences"),
-                Localization.lang("Are you sure you want to reset all settings to default values?"),
+                Localization.lang(
+                    "Are you sure you want to reset all settings to default values?"
+                ),
                 Localization.lang("Reset preferences"),
-                Localization.lang("Cancel"));
+                Localization.lang("Cancel")
+            );
         if (resetPreferencesConfirmed) {
             try {
                 preferences.clear();
 
-                dialogService.showWarningDialogAndWait(Localization.lang("Reset preferences"),
-                        Localization.lang("You must restart JabRef for this to come into effect."));
+                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);
-                dialogService.showErrorDialogAndWait(Localization.lang("Reset preferences"), ex);
+                dialogService.showErrorDialogAndWait(
+                    Localization.lang("Reset preferences"),
+                    ex
+                );
             }
 
             updateAfterPreferenceChanges();
@@ -164,7 +207,9 @@ public void resetPreferences() {
     private void updateAfterPreferenceChanges() {
         setValues();
 
-        frame.getLibraryTabs().forEach(panel -> panel.getMainTable().getTableModel().refresh());
+        frame
+            .getLibraryTabs()
+            .forEach(panel -> panel.getMainTable().getTableModel().refresh());
     }
 
     /**
@@ -188,7 +233,9 @@ public void storeAllSettings() {
         }
 
         // Store settings
-        preferences.getInternalPreferences().setMemoryStickMode(memoryStickProperty.get());
+        preferences
+            .getInternalPreferences()
+            .setMemoryStickMode(memoryStickProperty.get());
 
         for (PreferencesTab tab : preferenceTabs) {
             tab.storeSettings();
@@ -197,10 +244,14 @@ public void storeAllSettings() {
         preferences.flush();
 
         if (!restartWarnings.isEmpty()) {
-            dialogService.showWarningDialogAndWait(Localization.lang("Restart required"),
-                    String.join(",\n", restartWarnings)
-                            + "\n\n"
-                            + Localization.lang("You must restart JabRef for this to come into effect."));
+            dialogService.showWarningDialogAndWait(
+                Localization.lang("Restart required"),
+                String.join(",\n", restartWarnings) +
+                "\n\n" +
+                Localization.lang(
+                    "You must restart JabRef for this to come into effect."
+                )
+            );
         }
 
         frame.setupAllTables();
@@ -215,7 +266,9 @@ public void storeAllSettings() {
      * Inserts the preference values into the Properties of the ViewModel
      */
     public void setValues() {
-        memoryStickProperty.setValue(preferences.getInternalPreferences().isMemoryStickMode());
+        memoryStickProperty.setValue(
+            preferences.getInternalPreferences().isMemoryStickMode()
+        );
 
         for (PreferencesTab preferencesTab : preferenceTabs) {
             preferencesTab.setValues();
diff --git a/src/main/java/org/jabref/gui/preferences/PreferencesFilterDialog.java b/src/main/java/org/jabref/gui/preferences/PreferencesFilterDialog.java
index 9b57810578b..a2827ac2d75 100644
--- a/src/main/java/org/jabref/gui/preferences/PreferencesFilterDialog.java
+++ b/src/main/java/org/jabref/gui/preferences/PreferencesFilterDialog.java
@@ -1,8 +1,9 @@
 package org.jabref.gui.preferences;
 
+import com.airhacks.afterburner.views.ViewLoader;
+import com.tobiasdiez.easybind.EasyBind;
 import java.util.Locale;
 import java.util.Objects;
-
 import javafx.beans.binding.Bindings;
 import javafx.beans.property.ReadOnlyObjectWrapper;
 import javafx.beans.property.ReadOnlyStringWrapper;
@@ -15,37 +16,56 @@
 import javafx.scene.control.TableColumn;
 import javafx.scene.control.TableView;
 import javafx.scene.control.TextField;
-
 import org.jabref.gui.util.BaseDialog;
 import org.jabref.logic.l10n.Localization;
 import org.jabref.preferences.PreferencesFilter;
 
-import com.airhacks.afterburner.views.ViewLoader;
-import com.tobiasdiez.easybind.EasyBind;
-
 public class PreferencesFilterDialog extends BaseDialog<Void> {
 
     private final PreferencesFilter preferencesFilter;
-    private final ObservableList<PreferencesFilter.PreferenceOption> preferenceOptions;
-    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, String> columnKey;
-    @FXML private TableColumn<PreferencesFilter.PreferenceOption, Object> columnValue;
-    @FXML private TableColumn<PreferencesFilter.PreferenceOption, Object> columnDefaultValue;
-    @FXML private CheckBox showOnlyDeviatingPreferenceOptions;
-    @FXML private Label count;
-    @FXML private TextField searchField;
+    private final ObservableList<
+        PreferencesFilter.PreferenceOption
+    > preferenceOptions;
+    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, String> columnKey;
+
+    @FXML
+    private TableColumn<PreferencesFilter.PreferenceOption, Object> columnValue;
+
+    @FXML
+    private TableColumn<
+        PreferencesFilter.PreferenceOption,
+        Object
+    > columnDefaultValue;
+
+    @FXML
+    private CheckBox showOnlyDeviatingPreferenceOptions;
+
+    @FXML
+    private Label count;
+
+    @FXML
+    private TextField searchField;
 
     public PreferencesFilterDialog(PreferencesFilter preferencesFilter) {
         this.preferencesFilter = Objects.requireNonNull(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"));
     }
@@ -53,25 +73,52 @@ 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()));
-        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("")));
+        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("")
+            )
+        );
         table.setItems(filteredOptions);
-        count.textProperty().bind(Bindings.size(table.getItems()).asString("(%d)"));
+        count
+            .textProperty()
+            .bind(Bindings.size(table.getItems()).asString("(%d)"));
         updateModel();
     }
 
     private void updateModel() {
         if (showOnlyDeviatingPreferenceOptions.isSelected()) {
-            preferenceOptions.setAll(preferencesFilter.getDeviatingPreferences());
+            preferenceOptions.setAll(
+                preferencesFilter.getDeviatingPreferences()
+            );
         } else {
             preferenceOptions.setAll(preferencesFilter.getPreferenceOptions());
         }
diff --git a/src/main/java/org/jabref/gui/preferences/PreferencesSearchHandler.java b/src/main/java/org/jabref/gui/preferences/PreferencesSearchHandler.java
index 96cbfe053d6..1e9d5ede8ea 100644
--- a/src/main/java/org/jabref/gui/preferences/PreferencesSearchHandler.java
+++ b/src/main/java/org/jabref/gui/preferences/PreferencesSearchHandler.java
@@ -1,9 +1,9 @@
 package org.jabref.gui.preferences;
 
+import com.google.common.collect.ArrayListMultimap;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Locale;
-
 import javafx.beans.property.ListProperty;
 import javafx.beans.property.SimpleListProperty;
 import javafx.collections.FXCollections;
@@ -12,20 +12,26 @@
 import javafx.scene.Parent;
 import javafx.scene.control.Labeled;
 
-import com.google.common.collect.ArrayListMultimap;
-
 class PreferencesSearchHandler {
 
-    private static PseudoClass labelHighlight = PseudoClass.getPseudoClass("search-highlight");
+    private static PseudoClass labelHighlight = PseudoClass.getPseudoClass(
+        "search-highlight"
+    );
     private final List<PreferencesTab> preferenceTabs;
     private final ListProperty<PreferencesTab> filteredPreferenceTabs;
-    private final ArrayListMultimap<PreferencesTab, Labeled> preferenceTabsLabelNames;
+    private final ArrayListMultimap<
+        PreferencesTab,
+        Labeled
+    > preferenceTabsLabelNames;
     private final ArrayList<Labeled> highlightedLabels = new ArrayList<>();
 
     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 +50,10 @@ 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 +70,9 @@ 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() {
@@ -73,12 +84,17 @@ private void clearSearch() {
      * mapping from PreferencesTab to all its Labeled type nodes.
      */
     private ArrayListMultimap<PreferencesTab, Labeled> getPrefsTabLabelMap() {
-        ArrayListMultimap<PreferencesTab, Labeled> prefsTabLabelMap = ArrayListMultimap.create();
+        ArrayListMultimap<PreferencesTab, Labeled> prefsTabLabelMap =
+            ArrayListMultimap.create();
         for (PreferencesTab preferencesTab : preferenceTabs) {
             Node builder = preferencesTab.getBuilder();
             if (builder instanceof Parent) {
                 Parent parentBuilder = (Parent) builder;
-                scanLabeledControls(parentBuilder, prefsTabLabelMap, preferencesTab);
+                scanLabeledControls(
+                    parentBuilder,
+                    prefsTabLabelMap,
+                    preferencesTab
+                );
             }
         }
         return prefsTabLabelMap;
@@ -88,10 +104,18 @@ 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)) {
-                scanLabeledControls((Parent) child, prefsTabLabelMap, preferencesTab);
+                scanLabeledControls(
+                    (Parent) child,
+                    prefsTabLabelMap,
+                    preferencesTab
+                );
             } else {
                 Labeled labeled = (Labeled) child;
                 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 d038e49622f..c9bf78f0b3a 100644
--- a/src/main/java/org/jabref/gui/preferences/PreferencesTab.java
+++ b/src/main/java/org/jabref/gui/preferences/PreferencesTab.java
@@ -1,7 +1,6 @@
 package org.jabref.gui.preferences;
 
 import java.util.List;
-
 import javafx.scene.Node;
 
 /**
@@ -10,7 +9,6 @@
  * It needs to extend from Component.
  */
 public interface PreferencesTab {
-
     Node getBuilder();
 
     /**
diff --git a/src/main/java/org/jabref/gui/preferences/ShowPreferencesAction.java b/src/main/java/org/jabref/gui/preferences/ShowPreferencesAction.java
index b070e914aea..0e494c680e6 100644
--- a/src/main/java/org/jabref/gui/preferences/ShowPreferencesAction.java
+++ b/src/main/java/org/jabref/gui/preferences/ShowPreferencesAction.java
@@ -1,25 +1,29 @@
 package org.jabref.gui.preferences;
 
+import com.airhacks.afterburner.injection.Injector;
 import org.jabref.gui.DialogService;
 import org.jabref.gui.JabRefFrame;
 import org.jabref.gui.actions.SimpleCommand;
 import org.jabref.gui.util.TaskExecutor;
 
-import com.airhacks.afterburner.injection.Injector;
-
 public class ShowPreferencesAction extends SimpleCommand {
 
     private final JabRefFrame jabRefFrame;
     private final TaskExecutor taskExecutor;
 
-    public ShowPreferencesAction(JabRefFrame jabRefFrame, TaskExecutor taskExecutor) {
+    public ShowPreferencesAction(
+        JabRefFrame jabRefFrame,
+        TaskExecutor taskExecutor
+    ) {
         this.jabRefFrame = jabRefFrame;
         this.taskExecutor = taskExecutor;
     }
 
     @Override
     public void execute() {
-        DialogService dialogService = Injector.instantiateModelOrService(DialogService.class);
+        DialogService dialogService = Injector.instantiateModelOrService(
+            DialogService.class
+        );
         dialogService.showCustomDialog(new PreferencesDialogView(jabRefFrame));
     }
 }
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 119930370f4..bbe08a23a9f 100644
--- a/src/main/java/org/jabref/gui/preferences/autocompletion/AutoCompletionTab.java
+++ b/src/main/java/org/jabref/gui/preferences/autocompletion/AutoCompletionTab.java
@@ -1,31 +1,44 @@
 package org.jabref.gui.preferences.autocompletion;
 
+import com.airhacks.afterburner.views.ViewLoader;
 import javafx.fxml.FXML;
 import javafx.scene.control.CheckBox;
 import javafx.scene.control.RadioButton;
 import javafx.scene.control.TextField;
-
 import org.jabref.gui.preferences.AbstractPreferenceTabView;
 import org.jabref.gui.preferences.PreferencesTab;
 import org.jabref.logic.l10n.Localization;
 
-import com.airhacks.afterburner.views.ViewLoader;
+public class AutoCompletionTab
+    extends AbstractPreferenceTabView<AutoCompletionTabViewModel>
+    implements PreferencesTab {
+
+    @FXML
+    private CheckBox enableAutoComplete;
+
+    @FXML
+    private TextField autoCompleteFields;
 
-public class AutoCompletionTab extends AbstractPreferenceTabView<AutoCompletionTabViewModel> implements PreferencesTab {
+    @FXML
+    private RadioButton autoCompleteFirstLast;
 
-    @FXML private CheckBox enableAutoComplete;
-    @FXML private TextField autoCompleteFields;
-    @FXML private RadioButton autoCompleteFirstLast;
-    @FXML private RadioButton autoCompleteLastFirst;
-    @FXML private RadioButton autoCompleteBoth;
-    @FXML private RadioButton firstNameModeAbbreviated;
-    @FXML private RadioButton firstNameModeFull;
-    @FXML private RadioButton firstNameModeBoth;
+    @FXML
+    private RadioButton autoCompleteLastFirst;
+
+    @FXML
+    private RadioButton autoCompleteBoth;
+
+    @FXML
+    private RadioButton firstNameModeAbbreviated;
+
+    @FXML
+    private RadioButton firstNameModeFull;
+
+    @FXML
+    private RadioButton firstNameModeBoth;
 
     public AutoCompletionTab() {
-        ViewLoader.view(this)
-                  .root(this)
-                  .load();
+        ViewLoader.view(this).root(this).load();
     }
 
     @Override
@@ -34,15 +47,34 @@ public String getTabName() {
     }
 
     public void initialize() {
-        viewModel = new AutoCompletionTabViewModel(preferencesService.getAutoCompletePreferences());
-
-        enableAutoComplete.selectedProperty().bindBidirectional(viewModel.enableAutoCompleteProperty());
-        autoCompleteFields.textProperty().bindBidirectional(viewModel.autoCompleteFieldsProperty());
-        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());
+        viewModel =
+            new AutoCompletionTabViewModel(
+                preferencesService.getAutoCompletePreferences()
+            );
+
+        enableAutoComplete
+            .selectedProperty()
+            .bindBidirectional(viewModel.enableAutoCompleteProperty());
+        autoCompleteFields
+            .textProperty()
+            .bindBidirectional(viewModel.autoCompleteFieldsProperty());
+        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());
     }
 }
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 8b9b6633f6e..47229ac276d 100644
--- a/src/main/java/org/jabref/gui/preferences/autocompletion/AutoCompletionTabViewModel.java
+++ b/src/main/java/org/jabref/gui/preferences/autocompletion/AutoCompletionTabViewModel.java
@@ -2,12 +2,10 @@
 
 import java.util.ArrayList;
 import java.util.List;
-
 import javafx.beans.property.BooleanProperty;
 import javafx.beans.property.SimpleBooleanProperty;
 import javafx.beans.property.SimpleStringProperty;
 import javafx.beans.property.StringProperty;
-
 import org.jabref.gui.autocompleter.AutoCompleteFirstNameMode;
 import org.jabref.gui.autocompleter.AutoCompletePreferences;
 import org.jabref.gui.preferences.PreferenceTabViewModel;
@@ -16,38 +14,60 @@
 
 public class AutoCompletionTabViewModel implements PreferenceTabViewModel {
 
-    private final BooleanProperty enableAutoCompleteProperty = new SimpleBooleanProperty();
-    private final StringProperty autoCompleteFieldsProperty = new SimpleStringProperty();
-    private final BooleanProperty autoCompleteFirstLastProperty = new SimpleBooleanProperty();
-    private final BooleanProperty autoCompleteLastFirstProperty = new SimpleBooleanProperty();
-    private final BooleanProperty autoCompleteBothProperty = new SimpleBooleanProperty();
-    private final BooleanProperty firstNameModeAbbreviatedProperty = new SimpleBooleanProperty();
-    private final BooleanProperty firstNameModeFullProperty = new SimpleBooleanProperty();
-    private final BooleanProperty firstNameModeBothProperty = new SimpleBooleanProperty();
+    private final BooleanProperty enableAutoCompleteProperty =
+        new SimpleBooleanProperty();
+    private final StringProperty autoCompleteFieldsProperty =
+        new SimpleStringProperty();
+    private final BooleanProperty autoCompleteFirstLastProperty =
+        new SimpleBooleanProperty();
+    private final BooleanProperty autoCompleteLastFirstProperty =
+        new SimpleBooleanProperty();
+    private final BooleanProperty autoCompleteBothProperty =
+        new SimpleBooleanProperty();
+    private final BooleanProperty firstNameModeAbbreviatedProperty =
+        new SimpleBooleanProperty();
+    private final BooleanProperty firstNameModeFullProperty =
+        new SimpleBooleanProperty();
+    private final BooleanProperty firstNameModeBothProperty =
+        new SimpleBooleanProperty();
 
     private final AutoCompletePreferences autoCompletePreferences;
 
     private final List<String> restartWarnings = new ArrayList<>();
 
-    public AutoCompletionTabViewModel(AutoCompletePreferences autoCompletePreferences) {
+    public AutoCompletionTabViewModel(
+        AutoCompletePreferences autoCompletePreferences
+    ) {
         this.autoCompletePreferences = autoCompletePreferences;
     }
 
     @Override
     public void setValues() {
-        enableAutoCompleteProperty.setValue(autoCompletePreferences.shouldAutoComplete());
-        autoCompleteFieldsProperty.setValue(autoCompletePreferences.getCompleteNamesAsString());
-
-        if (autoCompletePreferences.getNameFormat() == AutoCompletePreferences.NameFormat.FIRST_LAST) {
+        enableAutoCompleteProperty.setValue(
+            autoCompletePreferences.shouldAutoComplete()
+        );
+        autoCompleteFieldsProperty.setValue(
+            autoCompletePreferences.getCompleteNamesAsString()
+        );
+
+        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);
         }
 
         switch (autoCompletePreferences.getFirstNameMode()) {
-            case ONLY_ABBREVIATED -> firstNameModeAbbreviatedProperty.setValue(true);
+            case ONLY_ABBREVIATED -> firstNameModeAbbreviatedProperty.setValue(
+                true
+            );
             case ONLY_FULL -> firstNameModeFullProperty.setValue(true);
             default -> firstNameModeBothProperty.setValue(true);
         }
@@ -55,34 +75,61 @@ public void setValues() {
 
     @Override
     public void storeSettings() {
-        autoCompletePreferences.setAutoComplete(enableAutoCompleteProperty.getValue());
+        autoCompletePreferences.setAutoComplete(
+            enableAutoCompleteProperty.getValue()
+        );
 
         if (autoCompleteBothProperty.getValue()) {
-            autoCompletePreferences.setNameFormat(AutoCompletePreferences.NameFormat.BOTH);
+            autoCompletePreferences.setNameFormat(
+                AutoCompletePreferences.NameFormat.BOTH
+            );
         } else if (autoCompleteFirstLastProperty.getValue()) {
-            autoCompletePreferences.setNameFormat(AutoCompletePreferences.NameFormat.FIRST_LAST);
+            autoCompletePreferences.setNameFormat(
+                AutoCompletePreferences.NameFormat.FIRST_LAST
+            );
         } else if (autoCompleteLastFirstProperty.getValue()) {
-            autoCompletePreferences.setNameFormat(AutoCompletePreferences.NameFormat.LAST_FIRST);
+            autoCompletePreferences.setNameFormat(
+                AutoCompletePreferences.NameFormat.LAST_FIRST
+            );
         }
 
         if (firstNameModeBothProperty.getValue()) {
-            autoCompletePreferences.setFirstNameMode(AutoCompleteFirstNameMode.BOTH);
+            autoCompletePreferences.setFirstNameMode(
+                AutoCompleteFirstNameMode.BOTH
+            );
         } else if (firstNameModeAbbreviatedProperty.getValue()) {
-            autoCompletePreferences.setFirstNameMode(AutoCompleteFirstNameMode.ONLY_ABBREVIATED);
+            autoCompletePreferences.setFirstNameMode(
+                AutoCompleteFirstNameMode.ONLY_ABBREVIATED
+            );
         } else if (firstNameModeFullProperty.getValue()) {
-            autoCompletePreferences.setFirstNameMode(AutoCompleteFirstNameMode.ONLY_FULL);
+            autoCompletePreferences.setFirstNameMode(
+                AutoCompleteFirstNameMode.ONLY_FULL
+            );
         }
 
-        if (autoCompletePreferences.shouldAutoComplete() != enableAutoCompleteProperty.getValue()) {
+        if (
+            autoCompletePreferences.shouldAutoComplete() !=
+            enableAutoCompleteProperty.getValue()
+        ) {
             if (enableAutoCompleteProperty.getValue()) {
-                restartWarnings.add(Localization.lang("Auto complete enabled."));
+                restartWarnings.add(
+                    Localization.lang("Auto complete enabled.")
+                );
             } else {
-                restartWarnings.add(Localization.lang("Auto complete disabled."));
+                restartWarnings.add(
+                    Localization.lang("Auto complete disabled.")
+                );
             }
         }
 
         autoCompletePreferences.getCompleteFields().clear();
-        autoCompletePreferences.getCompleteFields().addAll(FieldFactory.parseFieldList(autoCompleteFieldsProperty.getValue()));
+        autoCompletePreferences
+            .getCompleteFields()
+            .addAll(
+                FieldFactory.parseFieldList(
+                    autoCompleteFieldsProperty.getValue()
+                )
+            );
     }
 
     @Override
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 5f14bd5247e..be7628c1df4 100644
--- a/src/main/java/org/jabref/gui/preferences/citationkeypattern/CitationKeyPatternTab.java
+++ b/src/main/java/org/jabref/gui/preferences/citationkeypattern/CitationKeyPatternTab.java
@@ -1,11 +1,11 @@
 package org.jabref.gui.preferences.citationkeypattern;
 
+import com.airhacks.afterburner.views.ViewLoader;
 import javafx.fxml.FXML;
 import javafx.scene.control.Button;
 import javafx.scene.control.CheckBox;
 import javafx.scene.control.RadioButton;
 import javafx.scene.control.TextField;
-
 import org.jabref.gui.Globals;
 import org.jabref.gui.actions.ActionFactory;
 import org.jabref.gui.actions.StandardActions;
@@ -16,26 +16,45 @@
 import org.jabref.logic.help.HelpFile;
 import org.jabref.logic.l10n.Localization;
 
-import com.airhacks.afterburner.views.ViewLoader;
+public class CitationKeyPatternTab
+    extends AbstractPreferenceTabView<CitationKeyPatternTabViewModel>
+    implements PreferencesTab {
+
+    @FXML
+    private CheckBox overwriteAllow;
+
+    @FXML
+    private CheckBox overwriteWarning;
+
+    @FXML
+    private CheckBox generateOnSave;
 
-public class CitationKeyPatternTab extends AbstractPreferenceTabView<CitationKeyPatternTabViewModel> implements PreferencesTab {
+    @FXML
+    private RadioButton letterStartA;
+
+    @FXML
+    private RadioButton letterStartB;
 
-    @FXML private CheckBox overwriteAllow;
-    @FXML private CheckBox overwriteWarning;
-    @FXML private CheckBox generateOnSave;
-    @FXML private RadioButton letterStartA;
-    @FXML private RadioButton letterStartB;
-    @FXML private RadioButton letterAlwaysAdd;
-    @FXML private TextField keyPatternRegex;
-    @FXML private TextField keyPatternReplacement;
-    @FXML private TextField unwantedCharacters;
-    @FXML private Button keyPatternHelp;
-    @FXML private CitationKeyPatternPanel bibtexKeyPatternTable;
+    @FXML
+    private RadioButton letterAlwaysAdd;
+
+    @FXML
+    private TextField keyPatternRegex;
+
+    @FXML
+    private TextField keyPatternReplacement;
+
+    @FXML
+    private TextField unwantedCharacters;
+
+    @FXML
+    private Button keyPatternHelp;
+
+    @FXML
+    private CitationKeyPatternPanel bibtexKeyPatternTable;
 
     public CitationKeyPatternTab() {
-        ViewLoader.view(this)
-                  .root(this)
-                  .load();
+        ViewLoader.view(this).root(this).load();
     }
 
     @Override
@@ -44,31 +63,71 @@ public String getTabName() {
     }
 
     public void initialize() {
-        this.viewModel = new CitationKeyPatternTabViewModel(preferencesService.getCitationKeyPatternPreferences());
+        this.viewModel =
+            new CitationKeyPatternTabViewModel(
+                preferencesService.getCitationKeyPatternPreferences()
+            );
 
-        overwriteAllow.selectedProperty().bindBidirectional(viewModel.overwriteAllowProperty());
-        overwriteWarning.selectedProperty().bindBidirectional(viewModel.overwriteWarningProperty());
-        generateOnSave.selectedProperty().bindBidirectional(viewModel.generateOnSaveProperty());
-        letterStartA.selectedProperty().bindBidirectional(viewModel.letterStartAProperty());
-        letterStartB.selectedProperty().bindBidirectional(viewModel.letterStartBProperty());
-        letterAlwaysAdd.selectedProperty().bindBidirectional(viewModel.letterAlwaysAddProperty());
-        keyPatternRegex.textProperty().bindBidirectional(viewModel.keyPatternRegexProperty());
-        keyPatternReplacement.textProperty().bindBidirectional(viewModel.keyPatternReplacementProperty());
-        unwantedCharacters.textProperty().bindBidirectional(viewModel.unwantedCharactersProperty());
+        overwriteAllow
+            .selectedProperty()
+            .bindBidirectional(viewModel.overwriteAllowProperty());
+        overwriteWarning
+            .selectedProperty()
+            .bindBidirectional(viewModel.overwriteWarningProperty());
+        generateOnSave
+            .selectedProperty()
+            .bindBidirectional(viewModel.generateOnSaveProperty());
+        letterStartA
+            .selectedProperty()
+            .bindBidirectional(viewModel.letterStartAProperty());
+        letterStartB
+            .selectedProperty()
+            .bindBidirectional(viewModel.letterStartBProperty());
+        letterAlwaysAdd
+            .selectedProperty()
+            .bindBidirectional(viewModel.letterAlwaysAddProperty());
+        keyPatternRegex
+            .textProperty()
+            .bindBidirectional(viewModel.keyPatternRegexProperty());
+        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(Globals.getKeyPrefs());
-        actionFactory.configureIconButton(StandardActions.HELP_KEY_PATTERNS, new HelpAction(HelpFile.CITATION_KEY_PATTERN, dialogService, preferencesService.getFilePreferences()), keyPatternHelp);
+        actionFactory.configureIconButton(
+            StandardActions.HELP_KEY_PATTERNS,
+            new HelpAction(
+                HelpFile.CITATION_KEY_PATTERN,
+                dialogService,
+                preferencesService.getFilePreferences()
+            ),
+            keyPatternHelp
+        );
     }
 
     @Override
     public void setValues() {
         viewModel.setValues();
         bibtexKeyPatternTable.setValues(
-                Globals.entryTypesManager.getAllTypes(preferencesService.getLibraryPreferences().getDefaultBibDatabaseMode()),
-                preferencesService.getCitationKeyPatternPreferences().getKeyPattern());
+            Globals.entryTypesManager.getAllTypes(
+                preferencesService
+                    .getLibraryPreferences()
+                    .getDefaultBibDatabaseMode()
+            ),
+            preferencesService
+                .getCitationKeyPatternPreferences()
+                .getKeyPattern()
+        );
     }
 
     @Override
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 d9645f976cb..52c6dad18ad 100644
--- a/src/main/java/org/jabref/gui/preferences/citationkeypattern/CitationKeyPatternTabViewModel.java
+++ b/src/main/java/org/jabref/gui/preferences/citationkeypattern/CitationKeyPatternTabViewModel.java
@@ -9,7 +9,6 @@
 import javafx.beans.property.SimpleStringProperty;
 import javafx.beans.property.StringProperty;
 import javafx.collections.FXCollections;
-
 import org.jabref.gui.commonfxcontrols.CitationKeyPatternPanelItemModel;
 import org.jabref.gui.commonfxcontrols.CitationKeyPatternPanelViewModel;
 import org.jabref.gui.preferences.PreferenceTabViewModel;
@@ -18,41 +17,72 @@
 
 public class CitationKeyPatternTabViewModel implements PreferenceTabViewModel {
 
-    private final BooleanProperty overwriteAllowProperty = new SimpleBooleanProperty();
-    private final BooleanProperty overwriteWarningProperty = new SimpleBooleanProperty();
-    private final BooleanProperty generateOnSaveProperty = new SimpleBooleanProperty();
-    private final BooleanProperty letterStartAProperty = new SimpleBooleanProperty();
-    private final BooleanProperty letterStartBProperty = new SimpleBooleanProperty();
-    private final BooleanProperty letterAlwaysAddProperty = new SimpleBooleanProperty();
-    private final StringProperty keyPatternRegexProperty = new SimpleStringProperty();
-    private final StringProperty keyPatternReplacementProperty = new SimpleStringProperty();
-    private final StringProperty unwantedCharactersProperty = new SimpleStringProperty();
+    private final BooleanProperty overwriteAllowProperty =
+        new SimpleBooleanProperty();
+    private final BooleanProperty overwriteWarningProperty =
+        new SimpleBooleanProperty();
+    private final BooleanProperty generateOnSaveProperty =
+        new SimpleBooleanProperty();
+    private final BooleanProperty letterStartAProperty =
+        new SimpleBooleanProperty();
+    private final BooleanProperty letterStartBProperty =
+        new SimpleBooleanProperty();
+    private final BooleanProperty letterAlwaysAddProperty =
+        new SimpleBooleanProperty();
+    private final StringProperty keyPatternRegexProperty =
+        new SimpleStringProperty();
+    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<CitationKeyPatternPanelItemModel> patternListProperty = new SimpleListProperty<>(FXCollections.observableArrayList());
-    private final ObjectProperty<CitationKeyPatternPanelItemModel> defaultKeyPatternProperty = new SimpleObjectProperty<>(
-            new CitationKeyPatternPanelItemModel(new CitationKeyPatternPanelViewModel.DefaultEntryType(), ""));
+    private final ListProperty<
+        CitationKeyPatternPanelItemModel
+    > patternListProperty = new SimpleListProperty<>(
+        FXCollections.observableArrayList()
+    );
+    private final ObjectProperty<
+        CitationKeyPatternPanelItemModel
+    > defaultKeyPatternProperty = new SimpleObjectProperty<>(
+        new CitationKeyPatternPanelItemModel(
+            new CitationKeyPatternPanelViewModel.DefaultEntryType(),
+            ""
+        )
+    );
 
     private final CitationKeyPatternPreferences keyPatternPreferences;
 
-    public CitationKeyPatternTabViewModel(CitationKeyPatternPreferences keyPatternPreferences) {
+    public CitationKeyPatternTabViewModel(
+        CitationKeyPatternPreferences keyPatternPreferences
+    ) {
         this.keyPatternPreferences = keyPatternPreferences;
     }
 
     @Override
     public void setValues() {
-        overwriteAllowProperty.setValue(!keyPatternPreferences.shouldAvoidOverwriteCiteKey());
-        overwriteWarningProperty.setValue(keyPatternPreferences.shouldWarnBeforeOverwriteCiteKey());
-        generateOnSaveProperty.setValue(keyPatternPreferences.shouldGenerateCiteKeysBeforeSaving());
-
-        if (keyPatternPreferences.getKeySuffix()
-                == CitationKeyPatternPreferences.KeySuffix.ALWAYS) {
+        overwriteAllowProperty.setValue(
+            !keyPatternPreferences.shouldAvoidOverwriteCiteKey()
+        );
+        overwriteWarningProperty.setValue(
+            keyPatternPreferences.shouldWarnBeforeOverwriteCiteKey()
+        );
+        generateOnSaveProperty.setValue(
+            keyPatternPreferences.shouldGenerateCiteKeysBeforeSaving()
+        );
+
+        if (
+            keyPatternPreferences.getKeySuffix() ==
+            CitationKeyPatternPreferences.KeySuffix.ALWAYS
+        ) {
             letterAlwaysAddProperty.setValue(true);
             letterStartAProperty.setValue(false);
             letterStartBProperty.setValue(false);
-        } else if (keyPatternPreferences.getKeySuffix()
-                == CitationKeyPatternPreferences.KeySuffix.SECOND_WITH_A) {
+        } else if (
+            keyPatternPreferences.getKeySuffix() ==
+            CitationKeyPatternPreferences.KeySuffix.SECOND_WITH_A
+        ) {
             letterAlwaysAddProperty.setValue(false);
             letterStartAProperty.setValue(true);
             letterStartBProperty.setValue(false);
@@ -62,31 +92,46 @@ public void setValues() {
             letterStartBProperty.setValue(true);
         }
 
-        keyPatternRegexProperty.setValue(keyPatternPreferences.getKeyPatternRegex());
-        keyPatternReplacementProperty.setValue(keyPatternPreferences.getKeyPatternReplacement());
-        unwantedCharactersProperty.setValue(keyPatternPreferences.getUnwantedCharacters());
+        keyPatternRegexProperty.setValue(
+            keyPatternPreferences.getKeyPatternRegex()
+        );
+        keyPatternReplacementProperty.setValue(
+            keyPatternPreferences.getKeyPatternReplacement()
+        );
+        unwantedCharactersProperty.setValue(
+            keyPatternPreferences.getUnwantedCharacters()
+        );
     }
 
     @Override
     public void storeSettings() {
-        GlobalCitationKeyPattern newKeyPattern =
-                new GlobalCitationKeyPattern(keyPatternPreferences.getKeyPattern().getDefaultValue());
+        GlobalCitationKeyPattern newKeyPattern = new GlobalCitationKeyPattern(
+            keyPatternPreferences.getKeyPattern().getDefaultValue()
+        );
         patternListProperty.forEach(item -> {
             String patternString = item.getPattern();
             if (!item.getEntryType().getName().equals("default")) {
                 if (!patternString.trim().isEmpty()) {
-                    newKeyPattern.addCitationKeyPattern(item.getEntryType(), patternString);
+                    newKeyPattern.addCitationKeyPattern(
+                        item.getEntryType(),
+                        patternString
+                    );
                 }
             }
         });
 
-        if (!defaultKeyPatternProperty.getValue().getPattern().trim().isEmpty()) {
+        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
             // at the end of the pattern
-            newKeyPattern.setDefaultValue(defaultKeyPatternProperty.getValue().getPattern());
+            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;
@@ -94,13 +139,25 @@ public void storeSettings() {
             keySuffix = CitationKeyPatternPreferences.KeySuffix.SECOND_WITH_B;
         }
 
-        keyPatternPreferences.setAvoidOverwriteCiteKey(!overwriteAllowProperty.getValue());
-        keyPatternPreferences.setWarnBeforeOverwriteCiteKey(overwriteWarningProperty.getValue());
-        keyPatternPreferences.setGenerateCiteKeysBeforeSaving(generateOnSaveProperty.getValue());
+        keyPatternPreferences.setAvoidOverwriteCiteKey(
+            !overwriteAllowProperty.getValue()
+        );
+        keyPatternPreferences.setWarnBeforeOverwriteCiteKey(
+            overwriteWarningProperty.getValue()
+        );
+        keyPatternPreferences.setGenerateCiteKeysBeforeSaving(
+            generateOnSaveProperty.getValue()
+        );
         keyPatternPreferences.setKeySuffix(keySuffix);
-        keyPatternPreferences.setKeyPatternRegex(keyPatternRegexProperty.getValue());
-        keyPatternPreferences.setKeyPatternReplacement(keyPatternReplacementProperty.getValue());
-        keyPatternPreferences.setUnwantedCharacters(unwantedCharactersProperty.getValue());
+        keyPatternPreferences.setKeyPatternRegex(
+            keyPatternRegexProperty.getValue()
+        );
+        keyPatternPreferences.setKeyPatternReplacement(
+            keyPatternReplacementProperty.getValue()
+        );
+        keyPatternPreferences.setUnwantedCharacters(
+            unwantedCharactersProperty.getValue()
+        );
         keyPatternPreferences.setKeyPattern(newKeyPattern);
     }
 
@@ -136,11 +193,15 @@ public StringProperty keyPatternReplacementProperty() {
         return keyPatternReplacementProperty;
     }
 
-    public ListProperty<CitationKeyPatternPanelItemModel> patternListProperty() {
+    public ListProperty<
+        CitationKeyPatternPanelItemModel
+    > patternListProperty() {
         return patternListProperty;
     }
 
-    public ObjectProperty<CitationKeyPatternPanelItemModel> defaultKeyPatternProperty() {
+    public ObjectProperty<
+        CitationKeyPatternPanelItemModel
+    > defaultKeyPatternProperty() {
         return defaultKeyPatternProperty;
     }
 
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 fe6f7eea700..49210d85955 100644
--- a/src/main/java/org/jabref/gui/preferences/customentrytypes/CustomEntryTypeViewModel.java
+++ b/src/main/java/org/jabref/gui/preferences/customentrytypes/CustomEntryTypeViewModel.java
@@ -1,13 +1,15 @@
 package org.jabref.gui.preferences.customentrytypes;
 
 import java.util.function.Predicate;
-
 import org.jabref.model.entry.BibEntryType;
 import org.jabref.model.entry.field.Field;
 
 public class CustomEntryTypeViewModel extends EntryTypeViewModel {
 
-    public CustomEntryTypeViewModel(BibEntryType entryType, Predicate<Field> isMultiline) {
+    public CustomEntryTypeViewModel(
+        BibEntryType entryType,
+        Predicate<Field> isMultiline
+    ) {
         super(entryType, isMultiline);
     }
 }
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 02317d97885..93c95c930d1 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,9 @@
 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;
@@ -19,7 +23,6 @@
 import javafx.scene.input.Dragboard;
 import javafx.scene.input.MouseEvent;
 import javafx.scene.input.TransferMode;
-
 import org.jabref.gui.DragAndDropDataFormats;
 import org.jabref.gui.StateManager;
 import org.jabref.gui.icon.IconTheme;
@@ -36,36 +39,55 @@
 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 {
+
+    @FXML
+    private TableView<EntryTypeViewModel> entryTypesTable;
+
+    @FXML
+    private TableColumn<EntryTypeViewModel, String> entryTypColumn;
+
+    @FXML
+    private TableColumn<EntryTypeViewModel, String> entryTypeActionsColumn;
 
-public class CustomEntryTypesTab extends AbstractPreferenceTabView<CustomEntryTypesTabViewModel> implements PreferencesTab {
+    @FXML
+    private TextField addNewEntryType;
 
-    @FXML private TableView<EntryTypeViewModel> entryTypesTable;
-    @FXML private TableColumn<EntryTypeViewModel, String> entryTypColumn;
-    @FXML private TableColumn<EntryTypeViewModel, String> entryTypeActionsColumn;
-    @FXML private TextField addNewEntryType;
-    @FXML private TableView<FieldViewModel> fields;
-    @FXML private TableColumn<FieldViewModel, String> fieldNameColumn;
-    @FXML private TableColumn<FieldViewModel, Boolean> fieldTypeColumn;
-    @FXML private TableColumn<FieldViewModel, String> fieldTypeActionColumn;
-    @FXML private TableColumn<FieldViewModel, Boolean> fieldTypeMultilineColumn;
-    @FXML private ComboBox<Field> addNewField;
-    @FXML private Button addNewEntryTypeButton;
-    @FXML private Button addNewFieldButton;
+    @FXML
+    private TableView<FieldViewModel> fields;
 
-    @Inject private StateManager stateManager;
+    @FXML
+    private TableColumn<FieldViewModel, String> fieldNameColumn;
+
+    @FXML
+    private TableColumn<FieldViewModel, Boolean> fieldTypeColumn;
+
+    @FXML
+    private TableColumn<FieldViewModel, String> fieldTypeActionColumn;
+
+    @FXML
+    private TableColumn<FieldViewModel, Boolean> fieldTypeMultilineColumn;
+
+    @FXML
+    private ComboBox<Field> addNewField;
+
+    @FXML
+    private Button addNewEntryTypeButton;
+
+    @FXML
+    private Button addNewFieldButton;
+
+    @Inject
+    private StateManager stateManager;
 
     private final ControlsFxVisualizer visualizer = new ControlsFxVisualizer();
 
     private CustomLocalDragboard localDragboard;
 
     public CustomEntryTypesTab() {
-        ViewLoader.view(this)
-                  .root(this)
-                  .load();
+        ViewLoader.view(this).root(this).load();
     }
 
     @Override
@@ -74,11 +96,24 @@ public String getTabName() {
     }
 
     public void initialize() {
-        BibDatabaseMode mode = stateManager.getActiveDatabase().map(BibDatabaseContext::getMode)
-                                           .orElse(preferencesService.getLibraryPreferences().getDefaultBibDatabaseMode());
-        BibEntryTypesManager entryTypesRepository = preferencesService.getCustomEntryTypesRepository();
-
-        this.viewModel = new CustomEntryTypesTabViewModel(mode, entryTypesRepository, dialogService, preferencesService);
+        BibDatabaseMode mode = stateManager
+            .getActiveDatabase()
+            .map(BibDatabaseContext::getMode)
+            .orElse(
+                preferencesService
+                    .getLibraryPreferences()
+                    .getDefaultBibDatabaseMode()
+            );
+        BibEntryTypesManager entryTypesRepository =
+            preferencesService.getCustomEntryTypesRepository();
+
+        this.viewModel =
+            new CustomEntryTypesTabViewModel(
+                mode,
+                entryTypesRepository,
+                dialogService,
+                preferencesService
+            );
 
         // As the state manager gets injected it's not available in the constructor
         this.localDragboard = stateManager.getLocalDragboard();
@@ -86,127 +121,214 @@ public void initialize() {
         setupEntryTypesTable();
         setupFieldsTable();
 
-        addNewEntryTypeButton.disableProperty().bind(viewModel.entryTypeValidationStatus().validProperty().not());
-        addNewFieldButton.disableProperty().bind(viewModel.fieldValidationStatus().validProperty().not());
+        addNewEntryTypeButton
+            .disableProperty()
+            .bind(viewModel.entryTypeValidationStatus().validProperty().not());
+        addNewFieldButton
+            .disableProperty()
+            .bind(viewModel.fieldValidationStatus().validProperty().not());
 
         Platform.runLater(() -> {
-            visualizer.initVisualization(viewModel.entryTypeValidationStatus(), addNewEntryType, true);
-            visualizer.initVisualization(viewModel.fieldValidationStatus(), addNewField, true);
+            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
         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 -> {
-                        };
-                    }
-                })
-                .install(entryTypeActionsColumn);
-
-        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);
+            .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
+            .entryTypeToAddProperty()
+            .bindBidirectional(addNewEntryType.textProperty());
+
+        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.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);
+        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();
-                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();
-        });
-
-        fieldTypeColumn.setCellFactory(CheckBoxTableCell.forTableColumn(fieldTypeColumn));
-        fieldTypeColumn.setCellValueFactory(item -> item.getValue().requiredProperty());
+        );
+
+        fieldTypeColumn.setCellFactory(
+            CheckBoxTableCell.forTableColumn(fieldTypeColumn)
+        );
+        fieldTypeColumn.setCellValueFactory(item ->
+            item.getValue().requiredProperty()
+        );
         makeRotatedColumnHeader(fieldTypeColumn, Localization.lang("Required"));
 
-        fieldTypeMultilineColumn.setCellFactory(CheckBoxTableCell.forTableColumn(fieldTypeMultilineColumn));
-        fieldTypeMultilineColumn.setCellValueFactory(item -> item.getValue().multilineProperty());
-        makeRotatedColumnHeader(fieldTypeMultilineColumn, Localization.lang("Multiline"));
+        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()))
-                .install(fieldTypeActionColumn);
+            .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()
+                    )
+            )
+            .install(fieldTypeActionColumn);
 
         new ViewModelTableRowFactory<FieldViewModel>()
-                .setOnDragDetected(this::handleOnDragDetected)
-                .setOnDragDropped(this::handleOnDragDropped)
-                .setOnDragOver(this::handleOnDragOver)
-                .setOnDragExited(this::handleOnDragExited)
-                .install(fields);
+            .setOnDragDetected(this::handleOnDragDetected)
+            .setOnDragDropped(this::handleOnDragDropped)
+            .setOnDragOver(this::handleOnDragOver)
+            .setOnDragExited(this::handleOnDragExited)
+            .install(fields);
 
         addNewField.setItems(viewModel.fieldsForAdding());
         addNewField.setConverter(FieldsUtil.FIELD_STRING_CONVERTER);
 
-        viewModel.newFieldToAddProperty().bindBidirectional(addNewField.valueProperty());
+        viewModel
+            .newFieldToAddProperty()
+            .bindBidirectional(addNewField.valueProperty());
         // 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) {
+    private void makeRotatedColumnHeader(
+        TableColumn<?, ?> column,
+        String text
+    ) {
         Label label = new Label();
         label.setText(text);
         label.setRotate(-90);
@@ -215,16 +337,25 @@ 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,9 +367,15 @@ 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);
+            FieldViewModel field = localDragboard.getValue(
+                FieldViewModel.class
+            );
             fields.getItems().remove(field);
 
             if (row.isEmpty()) {
@@ -253,7 +390,11 @@ 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);
     }
 
@@ -272,9 +413,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"));
+            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 08cd62c0ec4..1e61a2ed752 100644
--- a/src/main/java/org/jabref/gui/preferences/customentrytypes/CustomEntryTypesTabViewModel.java
+++ b/src/main/java/org/jabref/gui/preferences/customentrytypes/CustomEntryTypesTabViewModel.java
@@ -1,5 +1,9 @@
 package org.jabref.gui.preferences.customentrytypes;
 
+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;
@@ -8,7 +12,6 @@
 import java.util.Set;
 import java.util.function.Predicate;
 import java.util.stream.Collectors;
-
 import javafx.beans.Observable;
 import javafx.beans.property.ObjectProperty;
 import javafx.beans.property.SimpleObjectProperty;
@@ -16,7 +19,6 @@
 import javafx.beans.property.StringProperty;
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableList;
-
 import org.jabref.gui.DialogService;
 import org.jabref.gui.preferences.PreferenceTabViewModel;
 import org.jabref.logic.l10n.Localization;
@@ -34,18 +36,21 @@
 import org.jabref.model.strings.StringUtil;
 import org.jabref.preferences.PreferencesService;
 
-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 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 ObjectProperty<Field> newFieldToAdd =
+        new SimpleObjectProperty<>();
+    private final ObservableList<EntryTypeViewModel> entryTypesWithFields =
+        FXCollections.observableArrayList(extractor ->
+            new Observable[] { extractor.entryType(), extractor.fields() }
+        );
     private final List<BibEntryType> entryTypesToDelete = new ArrayList<>();
 
     private final PreferencesService preferencesService;
@@ -57,27 +62,47 @@ 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,
-                                        PreferencesService preferencesService) {
+    public CustomEntryTypesTabViewModel(
+        BibDatabaseMode mode,
+        BibEntryTypesManager entryTypesManager,
+        DialogService dialogService,
+        PreferencesService preferencesService
+    ) {
         this.preferencesService = preferencesService;
         this.entryTypesManager = entryTypesManager;
         this.dialogService = dialogService;
         this.bibDatabaseMode = mode;
 
-        this.multiLineFields.addAll(preferencesService.getFieldPreferences().getNonWrappableFields());
+        this.multiLineFields.addAll(
+                preferencesService.getFieldPreferences().getNonWrappableFields()
+            );
 
-        entryTypeValidator = new FunctionBasedValidator<>(
+        entryTypeValidator =
+            new FunctionBasedValidator<>(
                 entryTypeToAdd,
                 StringUtil::isNotBlank,
-                ValidationMessage.error(Localization.lang("Entry type cannot be empty. Please enter a name.")));
-        fieldValidator = new FunctionBasedValidator<>(
+                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.")));
+                input ->
+                    (input != null) &&
+                    StringUtil.isNotBlank(input.getDisplayName()),
+                ValidationMessage.error(
+                    Localization.lang(
+                        "Field cannot be empty. Please enter a name."
+                    )
+                )
+            );
     }
 
     @Override
@@ -85,12 +110,20 @@ public void setValues() {
         if (!this.entryTypesWithFields.isEmpty()) {
             this.entryTypesWithFields.clear();
         }
-        Collection<BibEntryType> allTypes = entryTypesManager.getAllTypes(bibDatabaseMode);
+        Collection<BibEntryType> allTypes = entryTypesManager.getAllTypes(
+            bibDatabaseMode
+        );
 
         for (BibEntryType entryType : allTypes) {
             EntryTypeViewModel viewModel;
-            if (entryTypesManager.isCustomType(entryType.getType(), bibDatabaseMode)) {
-                viewModel = new CustomEntryTypeViewModel(entryType, isMultiline);
+            if (
+                entryTypesManager.isCustomType(
+                    entryType.getType(),
+                    bibDatabaseMode
+                )
+            ) {
+                viewModel =
+                    new CustomEntryTypeViewModel(entryType, isMultiline);
             } else {
                 viewModel = new EntryTypeViewModel(entryType, isMultiline);
             }
@@ -105,34 +138,59 @@ public void storeSettings() {
             BibEntryType type = typeViewModel.entryType().getValue();
             List<FieldViewModel> allFields = typeViewModel.fields();
 
-            multilineFields.addAll(allFields.stream()
-                                            .filter(FieldViewModel::isMultiline)
-                                            .map(FieldViewModel::toField)
-                                            .toList());
-
-            List<OrFields> required = allFields.stream()
-                                               .filter(FieldViewModel::isRequired)
-                                               .map(FieldViewModel::toField)
-                                               .map(OrFields::new)
-                                               .collect(Collectors.toList());
-            List<BibField> fields = allFields.stream().map(FieldViewModel::toBibField).collect(Collectors.toList());
-
-            BibEntryType newType = new BibEntryType(type.getType(), fields, required);
+            multilineFields.addAll(
+                allFields
+                    .stream()
+                    .filter(FieldViewModel::isMultiline)
+                    .map(FieldViewModel::toField)
+                    .toList()
+            );
+
+            List<OrFields> required = allFields
+                .stream()
+                .filter(FieldViewModel::isRequired)
+                .map(FieldViewModel::toField)
+                .map(OrFields::new)
+                .collect(Collectors.toList());
+            List<BibField> fields = allFields
+                .stream()
+                .map(FieldViewModel::toBibField)
+                .collect(Collectors.toList());
+
+            BibEntryType newType = new BibEntryType(
+                type.getType(),
+                fields,
+                required
+            );
             entryTypesManager.addCustomOrModifiedType(newType, bibDatabaseMode);
         }
 
         for (var entryType : entryTypesToDelete) {
-            entryTypesManager.removeCustomOrModifiedEntryType(entryType, bibDatabaseMode);
+            entryTypesManager.removeCustomOrModifiedEntryType(
+                entryType,
+                bibDatabaseMode
+            );
         }
 
-        preferencesService.getFieldPreferences().setNonWrappableFields(multilineFields);
+        preferencesService
+            .getFieldPreferences()
+            .setNonWrappableFields(multilineFields);
         preferencesService.storeCustomEntryTypesRepository(entryTypesManager);
     }
 
     public EntryTypeViewModel addNewCustomEntryType() {
-        EntryType newentryType = new UnknownEntryType(entryTypeToAdd.getValue());
-        BibEntryType type = new BibEntryType(newentryType, new ArrayList<>(), Collections.emptyList());
-        EntryTypeViewModel viewModel = new CustomEntryTypeViewModel(type, isMultiline);
+        EntryType newentryType = new UnknownEntryType(
+            entryTypeToAdd.getValue()
+        );
+        BibEntryType type = new BibEntryType(
+            newentryType,
+            new ArrayList<>(),
+            Collections.emptyList()
+        );
+        EntryTypeViewModel viewModel = new CustomEntryTypeViewModel(
+            type,
+            isMultiline
+        );
         this.entryTypesWithFields.add(viewModel);
         this.entryTypeToAdd.setValue("");
 
@@ -150,22 +208,37 @@ 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("Duplicate fields"),
+                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));
+        ObservableList<FieldViewModel> entryFields =
+            this.selectedEntryType.getValue().fields();
+        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 11c99161151..17f430b7684 100644
--- a/src/main/java/org/jabref/gui/preferences/customentrytypes/EntryTypeViewModel.java
+++ b/src/main/java/org/jabref/gui/preferences/customentrytypes/EntryTypeViewModel.java
@@ -1,33 +1,43 @@
 package org.jabref.gui.preferences.customentrytypes;
 
+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;
-
 import javafx.beans.property.ObjectProperty;
 import javafx.beans.property.SimpleObjectProperty;
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableList;
-
 import org.jabref.model.entry.BibEntryType;
 import org.jabref.model.entry.field.Field;
 
-import static org.jabref.gui.preferences.customentrytypes.FieldViewModel.Mandatory;
-
 public class EntryTypeViewModel {
 
-    private final ObjectProperty<BibEntryType> entryType = new SimpleObjectProperty<>();
+    private final ObjectProperty<BibEntryType> entryType =
+        new SimpleObjectProperty<>();
     private final ObservableList<FieldViewModel> fields;
 
-    public EntryTypeViewModel(BibEntryType entryType, Predicate<Field> isMultiline) {
+    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);
     }
 
@@ -45,7 +55,10 @@ public boolean equals(Object obj) {
             return false;
         }
         EntryTypeViewModel other = (EntryTypeViewModel) obj;
-        return Objects.equals(entryType, other.entryType) && Objects.equals(fields, other.fields);
+        return (
+            Objects.equals(entryType, other.entryType) &&
+            Objects.equals(fields, other.fields)
+        );
     }
 
     public void addField(FieldViewModel field) {
@@ -66,6 +79,12 @@ public void removeField(FieldViewModel focusedItem) {
 
     @Override
     public String toString() {
-        return "CustomEntryTypeViewModel [entryType=" + entryType + ", fields=" + fields + "]";
+        return (
+            "CustomEntryTypeViewModel [entryType=" +
+            entryType +
+            ", fields=" +
+            fields +
+            "]"
+        );
     }
 }
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 2894d83f681..a66833ab368 100644
--- a/src/main/java/org/jabref/gui/preferences/customentrytypes/FieldViewModel.java
+++ b/src/main/java/org/jabref/gui/preferences/customentrytypes/FieldViewModel.java
@@ -6,7 +6,6 @@
 import javafx.beans.property.SimpleObjectProperty;
 import javafx.beans.property.SimpleStringProperty;
 import javafx.beans.property.StringProperty;
-
 import org.jabref.logic.l10n.Localization;
 import org.jabref.model.entry.field.BibField;
 import org.jabref.model.entry.field.Field;
@@ -19,12 +18,15 @@ public class FieldViewModel {
     private final StringProperty displayName = new SimpleStringProperty("");
     private final BooleanProperty required = new SimpleBooleanProperty();
     private final BooleanProperty multiline = new SimpleBooleanProperty();
-    private final ObjectProperty<FieldPriority> priorityProperty = new SimpleObjectProperty<>();
-
-    public FieldViewModel(Field field,
-                          Mandatory required,
-                          FieldPriority priorityProperty,
-                          boolean multiline) {
+    private final ObjectProperty<FieldPriority> priorityProperty =
+        new SimpleObjectProperty<>();
+
+    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 883e7faf5c9..b7a0aba6d2c 100644
--- a/src/main/java/org/jabref/gui/preferences/customexporter/CustomExporterTab.java
+++ b/src/main/java/org/jabref/gui/preferences/customexporter/CustomExporterTab.java
@@ -1,29 +1,34 @@
 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;
 import javafx.scene.control.TableView;
-
 import org.jabref.gui.exporter.ExporterViewModel;
 import org.jabref.gui.preferences.AbstractPreferenceTabView;
 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 TableView<ExporterViewModel> exporterTable;
-    @FXML private TableColumn<ExporterViewModel, String> nameColumn;
-    @FXML private TableColumn<ExporterViewModel, String> layoutColumn;
-    @FXML private TableColumn<ExporterViewModel, String> extensionColumn;
+    @FXML
+    private TableColumn<ExporterViewModel, String> nameColumn;
+
+    @FXML
+    private TableColumn<ExporterViewModel, String> layoutColumn;
+
+    @FXML
+    private TableColumn<ExporterViewModel, String> extensionColumn;
 
     public CustomExporterTab() {
-        ViewLoader.view(this)
-                  .root(this)
-                  .load();
+        ViewLoader.view(this).root(this).load();
     }
 
     @Override
@@ -33,14 +38,24 @@ public String getTabName() {
 
     @FXML
     private void initialize() {
-        viewModel = new CustomExporterTabViewModel(preferencesService, dialogService);
+        viewModel =
+            new CustomExporterTabViewModel(preferencesService, dialogService);
 
-        exporterTable.getSelectionModel().setSelectionMode(SelectionMode.MULTIPLE);
+        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());
+        layoutColumn.setCellValueFactory(cellData ->
+            cellData.getValue().layoutFileName()
+        );
+        extensionColumn.setCellValueFactory(cellData ->
+            cellData.getValue().extension()
+        );
     }
 
     @FXML
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 fea81d07b09..b1621c45f3a 100644
--- a/src/main/java/org/jabref/gui/preferences/customexporter/CustomExporterTabViewModel.java
+++ b/src/main/java/org/jabref/gui/preferences/customexporter/CustomExporterTabViewModel.java
@@ -3,11 +3,9 @@
 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;
-
 import org.jabref.gui.DialogService;
 import org.jabref.gui.exporter.CreateModifyExporterDialogView;
 import org.jabref.gui.exporter.ExporterViewModel;
@@ -17,20 +15,27 @@
 
 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 PreferencesService preferences;
     private final DialogService dialogService;
 
-    public CustomExporterTabViewModel(PreferencesService preferences, DialogService dialogService) {
+    public CustomExporterTabViewModel(
+        PreferencesService preferences,
+        DialogService dialogService
+    ) {
         this.preferences = preferences;
         this.dialogService = dialogService;
     }
 
     @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,15 +44,18 @@ 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);
     }
 
     public void addExporter() {
-        CreateModifyExporterDialogView dialog = new CreateModifyExporterDialogView(null);
-        Optional<ExporterViewModel> exporter = dialogService.showCustomDialogAndWait(dialog);
+        CreateModifyExporterDialogView dialog =
+            new CreateModifyExporterDialogView(null);
+        Optional<ExporterViewModel> exporter =
+            dialogService.showCustomDialogAndWait(dialog);
         if ((exporter != null) && exporter.isPresent()) {
             exporters.add(exporter.get());
         }
@@ -59,8 +67,10 @@ public void modifyExporter() {
         }
 
         ExporterViewModel exporterToModify = selectedExporters.get(0);
-        CreateModifyExporterDialogView dialog = new CreateModifyExporterDialogView(exporterToModify);
-        Optional<ExporterViewModel> exporter = dialogService.showCustomDialogAndWait(dialog);
+        CreateModifyExporterDialogView dialog =
+            new CreateModifyExporterDialogView(exporterToModify);
+        Optional<ExporterViewModel> exporter =
+            dialogService.showCustomDialogAndWait(dialog);
         if ((exporter != null) && exporter.isPresent()) {
             exporters.remove(exporterToModify);
             exporters.add(exporter.get());
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 bf484645721..9b127f85662 100644
--- a/src/main/java/org/jabref/gui/preferences/customimporter/CustomImporterTab.java
+++ b/src/main/java/org/jabref/gui/preferences/customimporter/CustomImporterTab.java
@@ -1,33 +1,40 @@
 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;
 import javafx.scene.control.TableColumn;
 import javafx.scene.control.TableView;
 import javafx.scene.control.Tooltip;
-
 import org.jabref.gui.importer.ImporterViewModel;
 import org.jabref.gui.preferences.AbstractPreferenceTabView;
 import org.jabref.gui.preferences.PreferencesTab;
 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 TableView<ImporterViewModel> importerTable;
-    @FXML private TableColumn<ImporterViewModel, String> nameColumn;
-    @FXML private TableColumn<ImporterViewModel, String> classColumn;
-    @FXML private TableColumn<ImporterViewModel, String> basePathColumn;
-    @FXML private Button addButton;
+    @FXML
+    private TableColumn<ImporterViewModel, String> nameColumn;
+
+    @FXML
+    private TableColumn<ImporterViewModel, String> classColumn;
+
+    @FXML
+    private TableColumn<ImporterViewModel, String> basePathColumn;
+
+    @FXML
+    private Button addButton;
 
     public CustomImporterTab() {
-        ViewLoader.view(this)
-                  .root(this)
-                  .load();
+        ViewLoader.view(this).root(this).load();
     }
 
     @Override
@@ -37,21 +44,39 @@ public String getTabName() {
 
     @FXML
     private void initialize() {
-        viewModel = new CustomImporterTabViewModel(preferencesService, dialogService);
+        viewModel =
+            new CustomImporterTabViewModel(preferencesService, dialogService);
 
-        importerTable.getSelectionModel().setSelectionMode(SelectionMode.MULTIPLE);
+        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());
+        classColumn.setCellValueFactory(cellData ->
+            cellData.getValue().className()
+        );
+        basePathColumn.setCellValueFactory(cellData ->
+            cellData.getValue().basePath()
+        );
         new ViewModelTableRowFactory<ImporterViewModel>()
-                .withTooltip(importer -> importer.getLogic().getDescription())
-                .install(importerTable);
+            .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 f7f86004674..71fc7e5d112 100644
--- a/src/main/java/org/jabref/gui/preferences/customimporter/CustomImporterTabViewModel.java
+++ b/src/main/java/org/jabref/gui/preferences/customimporter/CustomImporterTabViewModel.java
@@ -6,11 +6,9 @@
 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;
-
 import org.jabref.gui.DialogService;
 import org.jabref.gui.importer.ImporterViewModel;
 import org.jabref.gui.preferences.PreferenceTabViewModel;
@@ -21,28 +19,36 @@
 import org.jabref.logic.util.StandardFileType;
 import org.jabref.logic.util.io.FileUtil;
 import org.jabref.preferences.PreferencesService;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 public class CustomImporterTabViewModel implements PreferenceTabViewModel {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(CustomImporterTabViewModel.class);
+    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 PreferencesService preferences;
     private final DialogService dialogService;
 
-    public CustomImporterTabViewModel(PreferencesService preferences, DialogService dialogService) {
+    public CustomImporterTabViewModel(
+        PreferencesService preferences,
+        DialogService dialogService
+    ) {
         this.preferences = preferences;
         this.dialogService = dialogService;
     }
 
     @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 +57,14 @@ 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 +75,9 @@ 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,55 +89,115 @@ private static String pathToClass(String basePath, Path path) {
     }
 
     public void addImporter() {
-        FileDialogConfiguration fileDialogConfiguration = new FileDialogConfiguration.Builder()
-                .addExtensionFilter(StandardFileType.CLASS, StandardFileType.JAR, StandardFileType.ZIP)
+        FileDialogConfiguration fileDialogConfiguration =
+            new FileDialogConfiguration.Builder()
+                .addExtensionFilter(
+                    StandardFileType.CLASS,
+                    StandardFileType.JAR,
+                    StandardFileType.ZIP
+                )
                 .withDefaultExtension(StandardFileType.CLASS)
-                .withInitialDirectory(preferences.getFilePreferences().getWorkingDirectory())
+                .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();
+        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();
 
             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?"),
-                            exc);
+                        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 {
                     String basePath = selectedFile.get().getParent().toString();
-                    String className = pathToClass(basePath, selectedFile.get());
-                    CustomImporter importer = new CustomImporter(basePath, className);
+                    String className = pathToClass(
+                        basePath,
+                        selectedFile.get()
+                    );
+                    CustomImporter importer = new CustomImporter(
+                        basePath,
+                        className
+                    );
 
                     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);
+                    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()),
-                            exc);
+                        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 ecdbd6aefc0..d681a5694a1 100644
--- a/src/main/java/org/jabref/gui/preferences/entry/EntryTab.java
+++ b/src/main/java/org/jabref/gui/preferences/entry/EntryTab.java
@@ -1,13 +1,13 @@
 package org.jabref.gui.preferences.entry;
 
+import com.airhacks.afterburner.views.ViewLoader;
+import jakarta.inject.Inject;
 import java.util.function.UnaryOperator;
-
 import javafx.fxml.FXML;
 import javafx.scene.control.Button;
 import javafx.scene.control.CheckBox;
 import javafx.scene.control.TextField;
 import javafx.scene.control.TextFormatter;
-
 import org.jabref.gui.actions.ActionFactory;
 import org.jabref.gui.actions.StandardActions;
 import org.jabref.gui.help.HelpAction;
@@ -17,39 +17,53 @@
 import org.jabref.logic.help.HelpFile;
 import org.jabref.logic.l10n.Localization;
 
-import com.airhacks.afterburner.views.ViewLoader;
-import jakarta.inject.Inject;
+public class EntryTab
+    extends AbstractPreferenceTabView<EntryTabViewModel>
+    implements PreferencesTab {
 
-public class EntryTab extends AbstractPreferenceTabView<EntryTabViewModel> implements PreferencesTab {
+    @FXML
+    private TextField keywordSeparator;
 
+    @FXML
+    private CheckBox resolveStrings;
 
+    @FXML
+    private TextField resolveStringsForFields;
 
-    @FXML private TextField keywordSeparator;
+    @FXML
+    private TextField nonWrappableFields;
 
-    @FXML private CheckBox resolveStrings;
-    @FXML private TextField resolveStringsForFields;
-    @FXML private TextField nonWrappableFields;
+    @FXML
+    private CheckBox markOwner;
 
-    @FXML private CheckBox markOwner;
-    @FXML private TextField markOwnerName;
-    @FXML private CheckBox markOwnerOverwrite;
-    @FXML private Button markOwnerHelp;
+    @FXML
+    private TextField markOwnerName;
 
-    @FXML private CheckBox addCreationDate;
-    @FXML private CheckBox addModificationDate;
+    @FXML
+    private CheckBox markOwnerOverwrite;
 
-    @Inject private KeyBindingRepository keyBindingRepository;
+    @FXML
+    private Button markOwnerHelp;
+
+    @FXML
+    private CheckBox addCreationDate;
+
+    @FXML
+    private CheckBox addModificationDate;
+
+    @Inject
+    private KeyBindingRepository keyBindingRepository;
 
     public EntryTab() {
-        ViewLoader.view(this)
-                  .root(this)
-                  .load();
+        ViewLoader.view(this).root(this).load();
     }
 
     public void initialize() {
         this.viewModel = new EntryTabViewModel(preferencesService);
 
-        keywordSeparator.textProperty().bindBidirectional(viewModel.keywordSeparatorProperty());
+        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 -> {
@@ -58,25 +72,55 @@ public void initialize() {
             }
             return null; // null means the change is rejected
         };
-        TextFormatter<String> formatter = new TextFormatter<>(singleCharacterFilter);
+        TextFormatter<String> formatter = new TextFormatter<>(
+            singleCharacterFilter
+        );
 
         keywordSeparator.setTextFormatter(formatter);
 
-        resolveStrings.selectedProperty().bindBidirectional(viewModel.resolveStringsProperty());
-        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.disableProperty().bind(markOwner.selectedProperty().not());
-
-        addCreationDate.selectedProperty().bindBidirectional(viewModel.addCreationDateProperty());
-        addModificationDate.selectedProperty().bindBidirectional(viewModel.addModificationDateProperty());
+        resolveStrings
+            .selectedProperty()
+            .bindBidirectional(viewModel.resolveStringsProperty());
+        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
+            .disableProperty()
+            .bind(markOwner.selectedProperty().not());
+
+        addCreationDate
+            .selectedProperty()
+            .bindBidirectional(viewModel.addCreationDateProperty());
+        addModificationDate
+            .selectedProperty()
+            .bindBidirectional(viewModel.addModificationDateProperty());
 
         ActionFactory actionFactory = new ActionFactory(keyBindingRepository);
-        actionFactory.configureIconButton(StandardActions.HELP, new HelpAction(HelpFile.OWNER, dialogService, preferencesService.getFilePreferences()), markOwnerHelp);
+        actionFactory.configureIconButton(
+            StandardActions.HELP,
+            new HelpAction(
+                HelpFile.OWNER,
+                dialogService,
+                preferencesService.getFilePreferences()
+            ),
+            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 feabcb4438c..dfed9652b0a 100644
--- a/src/main/java/org/jabref/gui/preferences/entry/EntryTabViewModel.java
+++ b/src/main/java/org/jabref/gui/preferences/entry/EntryTabViewModel.java
@@ -4,7 +4,6 @@
 import javafx.beans.property.SimpleBooleanProperty;
 import javafx.beans.property.SimpleStringProperty;
 import javafx.beans.property.StringProperty;
-
 import org.jabref.gui.preferences.PreferenceTabViewModel;
 import org.jabref.logic.bibtex.FieldPreferences;
 import org.jabref.logic.preferences.OwnerPreferences;
@@ -15,17 +14,26 @@
 
 public class EntryTabViewModel implements PreferenceTabViewModel {
 
-    private final StringProperty keywordSeparatorProperty = new SimpleStringProperty("");
-
-    private final BooleanProperty resolveStringsProperty = new SimpleBooleanProperty();
-    private final StringProperty resolveStringsForFieldsProperty = new SimpleStringProperty("");
-    private final StringProperty nonWrappableFieldsProperty = new SimpleStringProperty("");
-
-    private final BooleanProperty markOwnerProperty = new SimpleBooleanProperty();
-    private final StringProperty markOwnerNameProperty = new SimpleStringProperty("");
-    private final BooleanProperty markOwnerOverwriteProperty = new SimpleBooleanProperty();
-    private final BooleanProperty addCreationDateProperty = new SimpleBooleanProperty();
-    private final BooleanProperty addModificationDateProperty = new SimpleBooleanProperty();
+    private final StringProperty keywordSeparatorProperty =
+        new SimpleStringProperty("");
+
+    private final BooleanProperty resolveStringsProperty =
+        new SimpleBooleanProperty();
+    private final StringProperty resolveStringsForFieldsProperty =
+        new SimpleStringProperty("");
+    private final StringProperty nonWrappableFieldsProperty =
+        new SimpleStringProperty("");
+
+    private final BooleanProperty markOwnerProperty =
+        new SimpleBooleanProperty();
+    private final StringProperty markOwnerNameProperty =
+        new SimpleStringProperty("");
+    private final BooleanProperty markOwnerOverwriteProperty =
+        new SimpleBooleanProperty();
+    private final BooleanProperty addCreationDateProperty =
+        new SimpleBooleanProperty();
+    private final BooleanProperty addModificationDateProperty =
+        new SimpleBooleanProperty();
 
     private final FieldPreferences fieldPreferences;
     private final BibEntryPreferences bibEntryPreferences;
@@ -36,39 +44,74 @@ public EntryTabViewModel(PreferencesService preferencesService) {
         this.bibEntryPreferences = preferencesService.getBibEntryPreferences();
         this.fieldPreferences = preferencesService.getFieldPreferences();
         this.ownerPreferences = preferencesService.getOwnerPreferences();
-        this.timestampPreferences = preferencesService.getTimestampPreferences();
+        this.timestampPreferences =
+            preferencesService.getTimestampPreferences();
     }
 
     @Override
     public void setValues() {
-        keywordSeparatorProperty.setValue(bibEntryPreferences.getKeywordSeparator().toString());
-
-        resolveStringsProperty.setValue(fieldPreferences.shouldResolveStrings());
-        resolveStringsForFieldsProperty.setValue(FieldFactory.serializeFieldsList(fieldPreferences.getResolvableFields()));
-        nonWrappableFieldsProperty.setValue(FieldFactory.serializeFieldsList(fieldPreferences.getNonWrappableFields()));
+        keywordSeparatorProperty.setValue(
+            bibEntryPreferences.getKeywordSeparator().toString()
+        );
+
+        resolveStringsProperty.setValue(
+            fieldPreferences.shouldResolveStrings()
+        );
+        resolveStringsForFieldsProperty.setValue(
+            FieldFactory.serializeFieldsList(
+                fieldPreferences.getResolvableFields()
+            )
+        );
+        nonWrappableFieldsProperty.setValue(
+            FieldFactory.serializeFieldsList(
+                fieldPreferences.getNonWrappableFields()
+            )
+        );
 
         markOwnerProperty.setValue(ownerPreferences.isUseOwner());
         markOwnerNameProperty.setValue(ownerPreferences.getDefaultOwner());
-        markOwnerOverwriteProperty.setValue(ownerPreferences.isOverwriteOwner());
-
-        addCreationDateProperty.setValue(timestampPreferences.shouldAddCreationDate());
-        addModificationDateProperty.setValue(timestampPreferences.shouldAddModificationDate());
+        markOwnerOverwriteProperty.setValue(
+            ownerPreferences.isOverwriteOwner()
+        );
+
+        addCreationDateProperty.setValue(
+            timestampPreferences.shouldAddCreationDate()
+        );
+        addModificationDateProperty.setValue(
+            timestampPreferences.shouldAddModificationDate()
+        );
     }
 
     @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());
-        ownerPreferences.setOverwriteOwner(markOwnerOverwriteProperty.getValue());
-
-        timestampPreferences.setAddCreationDate(addCreationDateProperty.getValue());
-        timestampPreferences.setAddModificationDate(addModificationDateProperty.getValue());
+        ownerPreferences.setOverwriteOwner(
+            markOwnerOverwriteProperty.getValue()
+        );
+
+        timestampPreferences.setAddCreationDate(
+            addCreationDateProperty.getValue()
+        );
+        timestampPreferences.setAddModificationDate(
+            addModificationDateProperty.getValue()
+        );
     }
 
     public StringProperty keywordSeparatorProperty() {
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 b2bf2b93d4d..af35eb447bb 100644
--- a/src/main/java/org/jabref/gui/preferences/entryeditor/EntryEditorTab.java
+++ b/src/main/java/org/jabref/gui/preferences/entryeditor/EntryEditorTab.java
@@ -1,10 +1,11 @@
 package org.jabref.gui.preferences.entryeditor;
 
+import com.airhacks.afterburner.views.ViewLoader;
+import jakarta.inject.Inject;
 import javafx.fxml.FXML;
 import javafx.scene.control.Button;
 import javafx.scene.control.CheckBox;
 import javafx.scene.control.TextArea;
-
 import org.jabref.gui.actions.ActionFactory;
 import org.jabref.gui.actions.StandardActions;
 import org.jabref.gui.help.HelpAction;
@@ -14,31 +15,51 @@
 import org.jabref.logic.help.HelpFile;
 import org.jabref.logic.l10n.Localization;
 
-import com.airhacks.afterburner.views.ViewLoader;
-import jakarta.inject.Inject;
+public class EntryEditorTab
+    extends AbstractPreferenceTabView<EntryEditorTabViewModel>
+    implements PreferencesTab {
+
+    @FXML
+    private CheckBox openOnNewEntry;
+
+    @FXML
+    private CheckBox defaultSource;
+
+    @FXML
+    private CheckBox enableRelatedArticlesTab;
+
+    @FXML
+    private CheckBox acceptRecommendations;
 
-public class EntryEditorTab extends AbstractPreferenceTabView<EntryEditorTabViewModel> implements PreferencesTab {
+    @FXML
+    private CheckBox enableLatexCitationsTab;
+
+    @FXML
+    private CheckBox enableValidation;
 
-    @FXML private CheckBox openOnNewEntry;
-    @FXML private CheckBox defaultSource;
-    @FXML private CheckBox enableRelatedArticlesTab;
-    @FXML private CheckBox acceptRecommendations;
-    @FXML private CheckBox enableLatexCitationsTab;
-    @FXML private CheckBox enableValidation;
-    @FXML private CheckBox allowIntegerEdition;
-    @FXML private CheckBox journalPopupEnabled;
-    @FXML private CheckBox autoLinkFilesEnabled;
-    @FXML private CheckBox enableSciteTab;
+    @FXML
+    private CheckBox allowIntegerEdition;
 
-    @FXML private Button generalFieldsHelp;
-    @FXML private TextArea fieldsTextArea;
+    @FXML
+    private CheckBox journalPopupEnabled;
+
+    @FXML
+    private CheckBox autoLinkFilesEnabled;
+
+    @FXML
+    private CheckBox enableSciteTab;
+
+    @FXML
+    private Button generalFieldsHelp;
+
+    @FXML
+    private TextArea fieldsTextArea;
 
-    @Inject private KeyBindingRepository keyBindingRepository;
+    @Inject
+    private KeyBindingRepository keyBindingRepository;
 
     public EntryEditorTab() {
-        ViewLoader.view(this)
-                  .root(this)
-                  .load();
+        ViewLoader.view(this).root(this).load();
     }
 
     @Override
@@ -47,23 +68,54 @@ public String getTabName() {
     }
 
     public void initialize() {
-        this.viewModel = new EntryEditorTabViewModel(dialogService, preferencesService);
+        this.viewModel =
+            new EntryEditorTabViewModel(dialogService, preferencesService);
 
-        openOnNewEntry.selectedProperty().bindBidirectional(viewModel.openOnNewEntryProperty());
-        defaultSource.selectedProperty().bindBidirectional(viewModel.defaultSourceProperty());
-        enableRelatedArticlesTab.selectedProperty().bindBidirectional(viewModel.enableRelatedArticlesTabProperty());
-        acceptRecommendations.selectedProperty().bindBidirectional(viewModel.acceptRecommendationsProperty());
-        enableLatexCitationsTab.selectedProperty().bindBidirectional(viewModel.enableLatexCitationsTabProperty());
-        enableValidation.selectedProperty().bindBidirectional(viewModel.enableValidationProperty());
-        allowIntegerEdition.selectedProperty().bindBidirectional(viewModel.allowIntegerEditionProperty());
-        journalPopupEnabled.selectedProperty().bindBidirectional(viewModel.journalPopupProperty());
-        autoLinkFilesEnabled.selectedProperty().bindBidirectional(viewModel.autoLinkFilesEnabledProperty());
-        enableSciteTab.selectedProperty().bindBidirectional(viewModel.enableSciteTabProperty());
+        openOnNewEntry
+            .selectedProperty()
+            .bindBidirectional(viewModel.openOnNewEntryProperty());
+        defaultSource
+            .selectedProperty()
+            .bindBidirectional(viewModel.defaultSourceProperty());
+        enableRelatedArticlesTab
+            .selectedProperty()
+            .bindBidirectional(viewModel.enableRelatedArticlesTabProperty());
+        acceptRecommendations
+            .selectedProperty()
+            .bindBidirectional(viewModel.acceptRecommendationsProperty());
+        enableLatexCitationsTab
+            .selectedProperty()
+            .bindBidirectional(viewModel.enableLatexCitationsTabProperty());
+        enableValidation
+            .selectedProperty()
+            .bindBidirectional(viewModel.enableValidationProperty());
+        allowIntegerEdition
+            .selectedProperty()
+            .bindBidirectional(viewModel.allowIntegerEditionProperty());
+        journalPopupEnabled
+            .selectedProperty()
+            .bindBidirectional(viewModel.journalPopupProperty());
+        autoLinkFilesEnabled
+            .selectedProperty()
+            .bindBidirectional(viewModel.autoLinkFilesEnabledProperty());
+        enableSciteTab
+            .selectedProperty()
+            .bindBidirectional(viewModel.enableSciteTabProperty());
 
-        fieldsTextArea.textProperty().bindBidirectional(viewModel.fieldsProperty());
+        fieldsTextArea
+            .textProperty()
+            .bindBidirectional(viewModel.fieldsProperty());
 
         ActionFactory actionFactory = new ActionFactory(keyBindingRepository);
-        actionFactory.configureIconButton(StandardActions.HELP, new HelpAction(HelpFile.GENERAL_FIELDS, dialogService, preferencesService.getFilePreferences()), generalFieldsHelp);
+        actionFactory.configureIconButton(
+            StandardActions.HELP,
+            new HelpAction(
+                HelpFile.GENERAL_FIELDS,
+                dialogService,
+                preferencesService.getFilePreferences()
+            ),
+            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 b31dcb12582..9f5b3178e6b 100644
--- a/src/main/java/org/jabref/gui/preferences/entryeditor/EntryEditorTabViewModel.java
+++ b/src/main/java/org/jabref/gui/preferences/entryeditor/EntryEditorTabViewModel.java
@@ -3,12 +3,10 @@
 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;
 import javafx.beans.property.StringProperty;
-
 import org.jabref.gui.DialogService;
 import org.jabref.gui.entryeditor.EntryEditorPreferences;
 import org.jabref.gui.preferences.PreferenceTabViewModel;
@@ -21,16 +19,26 @@
 
 public class EntryEditorTabViewModel implements PreferenceTabViewModel {
 
-    private final BooleanProperty openOnNewEntryProperty = new SimpleBooleanProperty();
-    private final BooleanProperty defaultSourceProperty = new SimpleBooleanProperty();
-    private final BooleanProperty enableRelatedArticlesTabProperty = new SimpleBooleanProperty();
-    private final BooleanProperty acceptRecommendationsProperty = new SimpleBooleanProperty();
-    private final BooleanProperty enableLatexCitationsTabProperty = new SimpleBooleanProperty();
-    private final BooleanProperty enableValidationProperty = new SimpleBooleanProperty();
-    private final BooleanProperty allowIntegerEditionProperty = new SimpleBooleanProperty();
-    private final BooleanProperty journalPopupProperty = new SimpleBooleanProperty();
-    private final BooleanProperty autoLinkEnabledProperty = new SimpleBooleanProperty();
-    private final BooleanProperty enableSciteTabProperty = new SimpleBooleanProperty();
+    private final BooleanProperty openOnNewEntryProperty =
+        new SimpleBooleanProperty();
+    private final BooleanProperty defaultSourceProperty =
+        new SimpleBooleanProperty();
+    private final BooleanProperty enableRelatedArticlesTabProperty =
+        new SimpleBooleanProperty();
+    private final BooleanProperty acceptRecommendationsProperty =
+        new SimpleBooleanProperty();
+    private final BooleanProperty enableLatexCitationsTabProperty =
+        new SimpleBooleanProperty();
+    private final BooleanProperty enableValidationProperty =
+        new SimpleBooleanProperty();
+    private final BooleanProperty allowIntegerEditionProperty =
+        new SimpleBooleanProperty();
+    private final BooleanProperty journalPopupProperty =
+        new SimpleBooleanProperty();
+    private final BooleanProperty autoLinkEnabledProperty =
+        new SimpleBooleanProperty();
+    private final BooleanProperty enableSciteTabProperty =
+        new SimpleBooleanProperty();
 
     private final StringProperty fieldsProperty = new SimpleStringProperty();
 
@@ -39,10 +47,14 @@ public class EntryEditorTabViewModel implements PreferenceTabViewModel {
     private final EntryEditorPreferences entryEditorPreferences;
     private final MrDlibPreferences mrDlibPreferences;
 
-    public EntryEditorTabViewModel(DialogService dialogService, PreferencesService preferencesService) {
+    public EntryEditorTabViewModel(
+        DialogService dialogService,
+        PreferencesService preferencesService
+    ) {
         this.dialogService = dialogService;
         this.preferencesService = preferencesService;
-        this.entryEditorPreferences = preferencesService.getEntryEditorPreferences();
+        this.entryEditorPreferences =
+            preferencesService.getEntryEditorPreferences();
         this.mrDlibPreferences = preferencesService.getMrDlibPreferences();
     }
 
@@ -51,22 +63,47 @@ public void setValues() {
         // ToDo: Include CustomizeGeneralFieldsDialog in PreferencesDialog
         // therefore yet unused: entryEditorPreferences.getEntryEditorTabList();
 
-        openOnNewEntryProperty.setValue(entryEditorPreferences.shouldOpenOnNewEntry());
-        defaultSourceProperty.setValue(entryEditorPreferences.showSourceTabByDefault());
-        enableRelatedArticlesTabProperty.setValue(entryEditorPreferences.shouldShowRecommendationsTab());
-        acceptRecommendationsProperty.setValue(mrDlibPreferences.shouldAcceptRecommendations());
-        enableLatexCitationsTabProperty.setValue(entryEditorPreferences.shouldShowLatexCitationsTab());
-        enableValidationProperty.setValue(entryEditorPreferences.shouldEnableValidation());
-        allowIntegerEditionProperty.setValue(entryEditorPreferences.shouldAllowIntegerEditionBibtex());
-        journalPopupProperty.setValue(entryEditorPreferences.shouldEnableJournalPopup() == EntryEditorPreferences.JournalPopupEnabled.ENABLED);
-        autoLinkEnabledProperty.setValue(entryEditorPreferences.autoLinkFilesEnabled());
-        enableSciteTabProperty.setValue(entryEditorPreferences.shouldShowSciteTab());
+        openOnNewEntryProperty.setValue(
+            entryEditorPreferences.shouldOpenOnNewEntry()
+        );
+        defaultSourceProperty.setValue(
+            entryEditorPreferences.showSourceTabByDefault()
+        );
+        enableRelatedArticlesTabProperty.setValue(
+            entryEditorPreferences.shouldShowRecommendationsTab()
+        );
+        acceptRecommendationsProperty.setValue(
+            mrDlibPreferences.shouldAcceptRecommendations()
+        );
+        enableLatexCitationsTabProperty.setValue(
+            entryEditorPreferences.shouldShowLatexCitationsTab()
+        );
+        enableValidationProperty.setValue(
+            entryEditorPreferences.shouldEnableValidation()
+        );
+        allowIntegerEditionProperty.setValue(
+            entryEditorPreferences.shouldAllowIntegerEditionBibtex()
+        );
+        journalPopupProperty.setValue(
+            entryEditorPreferences.shouldEnableJournalPopup() ==
+            EntryEditorPreferences.JournalPopupEnabled.ENABLED
+        );
+        autoLinkEnabledProperty.setValue(
+            entryEditorPreferences.autoLinkFilesEnabled()
+        );
+        enableSciteTabProperty.setValue(
+            entryEditorPreferences.shouldShowSciteTab()
+        );
 
         setFields(entryEditorPreferences.getEntryEditorTabs());
     }
 
     public void resetToDefaults() {
-        setFields(preferencesService.getEntryEditorPreferences().getDefaultEntryEditorTabs());
+        setFields(
+            preferencesService
+                .getEntryEditorPreferences()
+                .getDefaultEntryEditorTabs()
+        );
     }
 
     private void setFields(Map<String, Set<Field>> tabNamesAndFields) {
@@ -85,19 +122,39 @@ private void setFields(Map<String, Set<Field>> tabNamesAndFields) {
     @Override
     public void storeSettings() {
         // entryEditorPreferences.setEntryEditorTabList();
-        entryEditorPreferences.setShouldOpenOnNewEntry(openOnNewEntryProperty.getValue());
-        entryEditorPreferences.setShouldShowRecommendationsTab(enableRelatedArticlesTabProperty.getValue());
-        mrDlibPreferences.setAcceptRecommendations(acceptRecommendationsProperty.getValue());
-        entryEditorPreferences.setShouldShowLatexCitationsTab(enableLatexCitationsTabProperty.getValue());
-        entryEditorPreferences.setShowSourceTabByDefault(defaultSourceProperty.getValue());
-        entryEditorPreferences.setEnableValidation(enableValidationProperty.getValue());
-        entryEditorPreferences.setAllowIntegerEditionBibtex(allowIntegerEditionProperty.getValue());
-        entryEditorPreferences.setEnableJournalPopup(journalPopupProperty.getValue()
+        entryEditorPreferences.setShouldOpenOnNewEntry(
+            openOnNewEntryProperty.getValue()
+        );
+        entryEditorPreferences.setShouldShowRecommendationsTab(
+            enableRelatedArticlesTabProperty.getValue()
+        );
+        mrDlibPreferences.setAcceptRecommendations(
+            acceptRecommendationsProperty.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.JournalPopupEnabled.DISABLED
+        );
         // entryEditorPreferences.setDividerPosition();
-        entryEditorPreferences.setAutoLinkFilesEnabled(autoLinkEnabledProperty.getValue());
-        entryEditorPreferences.setShouldShowSciteTab(enableSciteTabProperty.getValue());
+        entryEditorPreferences.setAutoLinkFilesEnabled(
+            autoLinkEnabledProperty.getValue()
+        );
+        entryEditorPreferences.setShouldShowSciteTab(
+            enableSciteTabProperty.getValue()
+        );
 
         Map<String, Set<Field>> customTabsMap = new LinkedHashMap<>();
         String[] lines = fieldsProperty.get().split("\n");
@@ -106,8 +163,11 @@ public void storeSettings() {
             String[] parts = line.split(":");
             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("Error"),
+                    Localization.lang(
+                        "Each line must be of the following form: 'tab:field1;field2;...;fieldN'."
+                    )
+                );
                 return;
             }
 
@@ -115,12 +175,18 @@ public void storeSettings() {
             // 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
             String unwantedChars = "#{}()~,^&-\"'`ʹ\\";
-            String testString = CitationKeyGenerator.cleanKey(parts[1], 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("Error"),
+                    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 6f020818cff..2454f3ece4e 100644
--- a/src/main/java/org/jabref/gui/preferences/export/ExportTab.java
+++ b/src/main/java/org/jabref/gui/preferences/export/ExportTab.java
@@ -1,21 +1,21 @@
 package org.jabref.gui.preferences.export;
 
+import com.airhacks.afterburner.views.ViewLoader;
 import javafx.fxml.FXML;
-
 import org.jabref.gui.commonfxcontrols.SaveOrderConfigPanel;
 import org.jabref.gui.preferences.AbstractPreferenceTabView;
 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;
+    @FXML
+    private SaveOrderConfigPanel exportOrderPanel;
 
     public ExportTab() {
-        ViewLoader.view(this)
-                  .root(this)
-                  .load();
+        ViewLoader.view(this).root(this).load();
     }
 
     @Override
@@ -24,13 +24,24 @@ public String getTabName() {
     }
 
     public void initialize() {
-        this.viewModel = new ExportTabViewModel(preferencesService.getExportPreferences());
-
-        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());
+        this.viewModel =
+            new ExportTabViewModel(preferencesService.getExportPreferences());
+
+        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 f8b278b9708..30c0879aa37 100644
--- a/src/main/java/org/jabref/gui/preferences/export/ExportTabViewModel.java
+++ b/src/main/java/org/jabref/gui/preferences/export/ExportTabViewModel.java
@@ -2,13 +2,11 @@
 
 import java.util.ArrayList;
 import java.util.Set;
-
 import javafx.beans.property.BooleanProperty;
 import javafx.beans.property.ListProperty;
 import javafx.beans.property.SimpleBooleanProperty;
 import javafx.beans.property.SimpleListProperty;
 import javafx.collections.FXCollections;
-
 import org.jabref.gui.commonfxcontrols.SortCriterionViewModel;
 import org.jabref.gui.preferences.PreferenceTabViewModel;
 import org.jabref.model.entry.field.Field;
@@ -20,11 +18,18 @@
 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 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 ExportPreferences exportPreferences;
 
@@ -40,23 +45,36 @@ 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);
         fields.add(InternalField.INTERNAL_ALL_TEXT_FIELDS_FIELD);
         fields.add(InternalField.KEY_FIELD);
         fields.add(InternalField.TYPE_HEADER);
-        sortableFieldsProperty.addAll(FieldFactory.getStandardFieldsWithCitationKey());
+        sortableFieldsProperty.addAll(
+            FieldFactory.getStandardFieldsWithCitationKey()
+        );
     }
 
     @Override
     public void storeSettings() {
         SaveOrder newSaveOrder = new SaveOrder(
-                SaveOrder.OrderType.fromBooleans(exportInSpecifiedOrderProperty.getValue(), exportInOriginalProperty.getValue()),
-                sortCriteriaProperty.stream().map(SortCriterionViewModel::getCriterion).toList());
+            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 0ac80610051..7c1e3371e04 100644
--- a/src/main/java/org/jabref/gui/preferences/external/ExternalTab.java
+++ b/src/main/java/org/jabref/gui/preferences/external/ExternalTab.java
@@ -1,12 +1,13 @@
 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;
 import javafx.scene.control.CheckBox;
 import javafx.scene.control.ComboBox;
 import javafx.scene.control.TextField;
-
 import org.jabref.gui.actions.ActionFactory;
 import org.jabref.gui.actions.StandardActions;
 import org.jabref.gui.help.HelpAction;
@@ -18,31 +19,51 @@
 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 {
+
+    @FXML
+    private TextField eMailReferenceSubject;
+
+    @FXML
+    private CheckBox autoOpenAttachedFolders;
+
+    @FXML
+    private ComboBox<PushToApplication> pushToApplicationCombo;
 
-public class ExternalTab extends AbstractPreferenceTabView<ExternalTabViewModel> implements PreferencesTab {
+    @FXML
+    private TextField citeCommand;
 
-    @FXML private TextField eMailReferenceSubject;
-    @FXML private CheckBox autoOpenAttachedFolders;
-    @FXML private ComboBox<PushToApplication> pushToApplicationCombo;
-    @FXML private TextField citeCommand;
-    @FXML private Button autolinkExternalHelp;
+    @FXML
+    private Button autolinkExternalHelp;
 
-    @FXML private CheckBox useCustomTerminal;
-    @FXML private TextField customTerminalCommand;
-    @FXML private Button customTerminalBrowse;
-    @FXML private CheckBox useCustomFileBrowser;
-    @FXML private TextField customFileBrowserCommand;
-    @FXML private Button customFileBrowserBrowse;
-    @FXML private TextField kindleEmail;
+    @FXML
+    private CheckBox useCustomTerminal;
 
-    private final ControlsFxVisualizer validationVisualizer = new ControlsFxVisualizer();
+    @FXML
+    private TextField customTerminalCommand;
+
+    @FXML
+    private Button customTerminalBrowse;
+
+    @FXML
+    private CheckBox useCustomFileBrowser;
+
+    @FXML
+    private TextField customFileBrowserCommand;
+
+    @FXML
+    private Button customFileBrowserBrowse;
+
+    @FXML
+    private TextField kindleEmail;
+
+    private final ControlsFxVisualizer validationVisualizer =
+        new ControlsFxVisualizer();
 
     public ExternalTab() {
-        ViewLoader.view(this)
-                  .root(this)
-                  .load();
+        ViewLoader.view(this).root(this).load();
     }
 
     @Override
@@ -51,40 +72,85 @@ public String getTabName() {
     }
 
     public void initialize() {
-        this.viewModel = new ExternalTabViewModel(dialogService, preferencesService);
+        this.viewModel =
+            new ExternalTabViewModel(dialogService, preferencesService);
 
         new ViewModelListCellFactory<PushToApplication>()
-                .withText(PushToApplication::getDisplayName)
-                .withIcon(PushToApplication::getApplicationIcon)
-                .install(pushToApplicationCombo);
-
-        eMailReferenceSubject.textProperty().bindBidirectional(viewModel.eMailReferenceSubjectProperty());
-        autoOpenAttachedFolders.selectedProperty().bindBidirectional(viewModel.autoOpenAttachedFoldersProperty());
-
-        pushToApplicationCombo.itemsProperty().bind(viewModel.pushToApplicationsListProperty());
-        pushToApplicationCombo.valueProperty().bindBidirectional(viewModel.selectedPushToApplication());
-        citeCommand.textProperty().bindBidirectional(viewModel.citeCommandProperty());
-
-        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());
-
-        kindleEmail.textProperty().bindBidirectional(viewModel.kindleEmailProperty());
+            .withText(PushToApplication::getDisplayName)
+            .withIcon(PushToApplication::getApplicationIcon)
+            .install(pushToApplicationCombo);
+
+        eMailReferenceSubject
+            .textProperty()
+            .bindBidirectional(viewModel.eMailReferenceSubjectProperty());
+        autoOpenAttachedFolders
+            .selectedProperty()
+            .bindBidirectional(viewModel.autoOpenAttachedFoldersProperty());
+
+        pushToApplicationCombo
+            .itemsProperty()
+            .bind(viewModel.pushToApplicationsListProperty());
+        pushToApplicationCombo
+            .valueProperty()
+            .bindBidirectional(viewModel.selectedPushToApplication());
+        citeCommand
+            .textProperty()
+            .bindBidirectional(viewModel.citeCommandProperty());
+
+        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());
+
+        kindleEmail
+            .textProperty()
+            .bindBidirectional(viewModel.kindleEmailProperty());
 
         validationVisualizer.setDecoration(new IconValidationDecorator());
         Platform.runLater(() -> {
-            validationVisualizer.initVisualization(viewModel.terminalCommandValidationStatus(), customTerminalCommand);
-            validationVisualizer.initVisualization(viewModel.fileBrowserCommandValidationStatus(), customFileBrowserCommand);
+            validationVisualizer.initVisualization(
+                viewModel.terminalCommandValidationStatus(),
+                customTerminalCommand
+            );
+            validationVisualizer.initVisualization(
+                viewModel.fileBrowserCommandValidationStatus(),
+                customFileBrowserCommand
+            );
         });
 
-        ActionFactory actionFactory = new ActionFactory(preferencesService.getKeyBindingRepository());
-        actionFactory.configureIconButton(StandardActions.HELP_PUSH_TO_APPLICATION, new HelpAction(HelpFile.PUSH_TO_APPLICATION, dialogService, preferencesService.getFilePreferences()), autolinkExternalHelp);
+        ActionFactory actionFactory = new ActionFactory(
+            preferencesService.getKeyBindingRepository()
+        );
+        actionFactory.configureIconButton(
+            StandardActions.HELP_PUSH_TO_APPLICATION,
+            new HelpAction(
+                HelpFile.PUSH_TO_APPLICATION,
+                dialogService,
+                preferencesService.getFilePreferences()
+            ),
+            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 f8e7f96993c..884509dce83 100644
--- a/src/main/java/org/jabref/gui/preferences/external/ExternalTabViewModel.java
+++ b/src/main/java/org/jabref/gui/preferences/external/ExternalTabViewModel.java
@@ -1,7 +1,11 @@
 package org.jabref.gui.preferences.external;
 
+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;
-
 import javafx.beans.property.BooleanProperty;
 import javafx.beans.property.ListProperty;
 import javafx.beans.property.ObjectProperty;
@@ -13,7 +17,6 @@
 import javafx.collections.FXCollections;
 import javafx.scene.control.ButtonType;
 import javafx.scene.control.DialogPane;
-
 import org.jabref.gui.DialogService;
 import org.jabref.gui.preferences.PreferenceTabViewModel;
 import org.jabref.gui.push.PushToApplication;
@@ -27,24 +30,32 @@
 import org.jabref.preferences.PreferencesService;
 import org.jabref.preferences.PushToApplicationPreferences;
 
-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 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 StringProperty citeCommandProperty = new SimpleStringProperty("");
-    private final BooleanProperty useCustomTerminalProperty = new SimpleBooleanProperty();
-    private final StringProperty customTerminalCommandProperty = new SimpleStringProperty("");
-    private final BooleanProperty useCustomFileBrowserProperty = new SimpleBooleanProperty();
-    private final StringProperty customFileBrowserCommandProperty = new SimpleStringProperty("");
-    private final StringProperty kindleEmailProperty = new SimpleStringProperty("");
+    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 StringProperty citeCommandProperty = new SimpleStringProperty(
+        ""
+    );
+    private final BooleanProperty useCustomTerminalProperty =
+        new SimpleBooleanProperty();
+    private final StringProperty customTerminalCommandProperty =
+        new SimpleStringProperty("");
+    private final BooleanProperty useCustomFileBrowserProperty =
+        new SimpleBooleanProperty();
+    private final StringProperty customFileBrowserCommandProperty =
+        new SimpleStringProperty("");
+    private final StringProperty kindleEmailProperty = new SimpleStringProperty(
+        ""
+    );
 
     private final Validator terminalCommandValidator;
     private final Validator fileBrowserCommandValidator;
@@ -52,76 +63,150 @@ public class ExternalTabViewModel implements PreferenceTabViewModel {
     private final DialogService dialogService;
     private final PreferencesService 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;
     private final PushToApplicationPreferences workingPushToApplicationPreferences;
 
-    public ExternalTabViewModel(DialogService dialogService, PreferencesService preferencesService) {
+    public ExternalTabViewModel(
+        DialogService dialogService,
+        PreferencesService preferencesService
+    ) {
         this.dialogService = dialogService;
         this.preferences = preferencesService;
-        this.initialExternalApplicationPreferences = preferences.getExternalApplicationsPreferences();
-        this.initialPushToApplicationPreferences = preferences.getPushToApplicationPreferences();
-        this.workingPushToApplicationPreferences = new PushToApplicationPreferences(
+        this.initialExternalApplicationPreferences =
+            preferences.getExternalApplicationsPreferences();
+        this.initialPushToApplicationPreferences =
+            preferences.getPushToApplicationPreferences();
+        this.workingPushToApplicationPreferences =
+            new PushToApplicationPreferences(
                 initialPushToApplicationPreferences.getActiveApplicationName(),
-                new HashMap<>(initialPushToApplicationPreferences.getCommandPaths()),
+                new HashMap<>(
+                    initialPushToApplicationPreferences.getCommandPaths()
+                ),
                 initialPushToApplicationPreferences.getEmacsArguments(),
-                initialPushToApplicationPreferences.getVimServer());
+                initialPushToApplicationPreferences.getVimServer()
+            );
 
-        terminalCommandValidator = new FunctionBasedValidator<>(
+        terminalCommandValidator =
+            new FunctionBasedValidator<>(
                 customTerminalCommandProperty,
                 input -> !StringUtil.isNullOrEmpty(input),
-                ValidationMessage.error(String.format("%s > %s %n %n %s",
+                ValidationMessage.error(
+                    String.format(
+                        "%s > %s %n %n %s",
                         Localization.lang("External programs"),
                         Localization.lang("Custom applications"),
-                        Localization.lang("Please specify a terminal application."))));
-
-        fileBrowserCommandValidator = new FunctionBasedValidator<>(
+                        Localization.lang(
+                            "Please specify a terminal application."
+                        )
+                    )
+                )
+            );
+
+        fileBrowserCommandValidator =
+            new FunctionBasedValidator<>(
                 customFileBrowserCommandProperty,
                 input -> !StringUtil.isNullOrEmpty(input),
-                ValidationMessage.error(String.format("%s > %s %n %n %s",
+                ValidationMessage.error(
+                    String.format(
+                        "%s > %s %n %n %s",
                         Localization.lang("External programs"),
                         Localization.lang("Custom applications"),
-                        Localization.lang("Please specify a file browser."))));
+                        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());
-        useCustomTerminalProperty.setValue(initialExternalApplicationPreferences.useCustomTerminal());
-        customTerminalCommandProperty.setValue(initialExternalApplicationPreferences.getCustomTerminalCommand());
-        useCustomFileBrowserProperty.setValue(initialExternalApplicationPreferences.useCustomFileBrowser());
-        customFileBrowserCommandProperty.setValue(initialExternalApplicationPreferences.getCustomFileBrowserCommand());
-        kindleEmailProperty.setValue(initialExternalApplicationPreferences.getKindleEmail());
+            PushToApplications
+                .getApplicationByName(
+                    initialPushToApplicationPreferences.getActiveApplicationName(),
+                    dialogService,
+                    preferences
+                )
+                .orElse(new PushToEmacs(dialogService, preferences))
+        );
+
+        citeCommandProperty.setValue(
+            initialExternalApplicationPreferences.getCiteCommand()
+        );
+        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();
-        externalPreferences.setEMailSubject(eMailReferenceSubjectProperty.getValue());
-        externalPreferences.setAutoOpenEmailAttachmentsFolder(autoOpenAttachedFoldersProperty.getValue());
+        ExternalApplicationsPreferences externalPreferences =
+            preferences.getExternalApplicationsPreferences();
+        externalPreferences.setEMailSubject(
+            eMailReferenceSubjectProperty.getValue()
+        );
+        externalPreferences.setAutoOpenEmailAttachmentsFolder(
+            autoOpenAttachedFoldersProperty.getValue()
+        );
         externalPreferences.setCiteCommand(citeCommandProperty.getValue());
-        externalPreferences.setUseCustomTerminal(useCustomTerminalProperty.getValue());
-        externalPreferences.setCustomTerminalCommand(customTerminalCommandProperty.getValue());
-        externalPreferences.setUseCustomFileBrowser(useCustomFileBrowserProperty.getValue());
-        externalPreferences.setCustomFileBrowserCommand(customFileBrowserCommandProperty.getValue());
+        externalPreferences.setUseCustomTerminal(
+            useCustomTerminalProperty.getValue()
+        );
+        externalPreferences.setCustomTerminalCommand(
+            customTerminalCommandProperty.getValue()
+        );
+        externalPreferences.setUseCustomFileBrowser(
+            useCustomFileBrowserProperty.getValue()
+        );
+        externalPreferences.setCustomFileBrowserCommand(
+            customFileBrowserCommandProperty.getValue()
+        );
         externalPreferences.setKindleEmail(kindleEmailProperty.getValue());
 
-        PushToApplicationPreferences pushPreferences = preferences.getPushToApplicationPreferences();
-        pushPreferences.setActiveApplicationName(selectedPushToApplicationProperty.getValue().getDisplayName());
-        pushPreferences.setCommandPaths(workingPushToApplicationPreferences.getCommandPaths());
-        pushPreferences.setEmacsArguments(workingPushToApplicationPreferences.getEmacsArguments());
-        pushPreferences.setVimServer(workingPushToApplicationPreferences.getVimServer());
+        PushToApplicationPreferences pushPreferences =
+            preferences.getPushToApplicationPreferences();
+        pushPreferences.setActiveApplicationName(
+            selectedPushToApplicationProperty.getValue().getDisplayName()
+        );
+        pushPreferences.setCommandPaths(
+            workingPushToApplicationPreferences.getCommandPaths()
+        );
+        pushPreferences.setEmacsArguments(
+            workingPushToApplicationPreferences.getEmacsArguments()
+        );
+        pushPreferences.setVimServer(
+            workingPushToApplicationPreferences.getVimServer()
+        );
     }
 
     public ValidationStatus terminalCommandValidationStatus() {
@@ -146,40 +231,59 @@ 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;
     }
 
     public void pushToApplicationSettings() {
-        PushToApplication selectedApplication = selectedPushToApplicationProperty.getValue();
-        PushToApplicationSettings settings = selectedApplication.getSettings(selectedApplication, workingPushToApplicationPreferences);
+        PushToApplication selectedApplication =
+            selectedPushToApplicationProperty.getValue();
+        PushToApplicationSettings settings = selectedApplication.getSettings(
+            selectedApplication,
+            workingPushToApplicationPreferences
+        );
 
         DialogPane dialogPane = new DialogPane();
         dialogPane.setContent(settings.getSettingsPane());
 
-        dialogService.showCustomDialogAndWait(
+        dialogService
+            .showCustomDialogAndWait(
                 Localization.lang("Application settings"),
                 dialogPane,
-                ButtonType.OK, ButtonType.CANCEL)
-                     .ifPresent(btn -> {
-                                 if (btn == ButtonType.OK) {
-                                     settings.storeSettings();
-                                 }
-                             }
-                     );
+                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
@@ -229,6 +333,10 @@ public StringProperty customFileBrowserCommandProperty() {
     }
 
     public void resetCiteCommandToDefault() {
-        this.citeCommandProperty.setValue(preferences.getExternalApplicationsPreferences().getDefaultCiteCommand());
+        this.citeCommandProperty.setValue(
+                preferences
+                    .getExternalApplicationsPreferences()
+                    .getDefaultCiteCommand()
+            );
     }
 }
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 e5aa3e55c03..5972414ad92 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,7 @@
 package org.jabref.gui.preferences.externalfiletypes;
 
+import com.airhacks.afterburner.views.ViewLoader;
+import jakarta.inject.Inject;
 import javafx.event.ActionEvent;
 import javafx.fxml.FXML;
 import javafx.scene.control.Button;
@@ -8,51 +10,70 @@
 import javafx.scene.control.RadioButton;
 import javafx.scene.control.TextField;
 import javafx.scene.control.ToggleGroup;
-
 import org.jabref.gui.DialogService;
 import org.jabref.gui.desktop.os.NativeDesktop;
 import org.jabref.gui.util.BaseDialog;
 import org.jabref.gui.util.FileDialogConfiguration;
 import org.jabref.logic.util.OS;
 
-import com.airhacks.afterburner.views.ViewLoader;
-import jakarta.inject.Inject;
-
 public class EditExternalFileTypeEntryDialog extends BaseDialog<Void> {
 
-    @FXML private RadioButton defaultApplication;
-    @FXML private ToggleGroup applicationToggleGroup;
-    @FXML private TextField extension;
-    @FXML private TextField name;
-    @FXML private TextField mimeType;
-    @FXML private RadioButton customApplication;
-    @FXML private TextField selectedApplication;
-    @FXML private Button btnBrowse;
-    @FXML private Label icon;
-    @Inject private DialogService dialogService;
+    @FXML
+    private RadioButton defaultApplication;
+
+    @FXML
+    private ToggleGroup applicationToggleGroup;
+
+    @FXML
+    private TextField extension;
+
+    @FXML
+    private TextField name;
+
+    @FXML
+    private TextField mimeType;
+
+    @FXML
+    private RadioButton customApplication;
+
+    @FXML
+    private TextField selectedApplication;
+
+    @FXML
+    private Button btnBrowse;
+
+    @FXML
+    private Label icon;
+
+    @Inject
+    private DialogService dialogService;
 
     private final NativeDesktop nativeDesktop = OS.getNativeDesktop();
-    private final FileDialogConfiguration fileDialogConfiguration = new FileDialogConfiguration.Builder().withInitialDirectory(nativeDesktop.getApplicationDirectory()).build();
+    private final FileDialogConfiguration fileDialogConfiguration =
+        new FileDialogConfiguration.Builder()
+            .withInitialDirectory(nativeDesktop.getApplicationDirectory())
+            .build();
 
     private final ExternalFileTypeItemViewModel item;
 
     private EditExternalFileTypeViewModel viewModel;
 
-    public EditExternalFileTypeEntryDialog(ExternalFileTypeItemViewModel item, String dialogTitle) {
+    public EditExternalFileTypeEntryDialog(
+        ExternalFileTypeItemViewModel item,
+        String dialogTitle
+    ) {
         this.item = item;
 
         this.setTitle(dialogTitle);
 
-        ViewLoader.view(this)
-                  .load()
-                  .setAsDialogPane(this);
+        ViewLoader.view(this).load().setAsDialogPane(this);
 
         this.setResultConverter(button -> {
-            if (button == ButtonType.OK) {
-                viewModel.storeSettings();
-            }
-            return null;
-        });
+                if (button == ButtonType.OK) {
+                    viewModel.storeSettings();
+                }
+                return null;
+            });
     }
 
     @FXML
@@ -61,19 +82,37 @@ public void initialize() {
 
         icon.setGraphic(viewModel.getIcon());
 
-        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());
+        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());
+        selectedApplication
+            .textProperty()
+            .bindBidirectional(viewModel.selectedApplicationProperty());
     }
 
     @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 7a095e76b94..d46c26d5448 100644
--- a/src/main/java/org/jabref/gui/preferences/externalfiletypes/EditExternalFileTypeViewModel.java
+++ b/src/main/java/org/jabref/gui/preferences/externalfiletypes/EditExternalFileTypeViewModel.java
@@ -7,27 +7,43 @@
 import javafx.scene.Node;
 
 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);
-
-    public EditExternalFileTypeViewModel(ExternalFileTypeItemViewModel fileTypeViewModel) {
+    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);
+
+    public EditExternalFileTypeViewModel(
+        ExternalFileTypeItemViewModel fileTypeViewModel
+    ) {
         this.fileTypeViewModel = fileTypeViewModel;
 
-        extensionProperty.setValue(fileTypeViewModel.extensionProperty().getValue());
+        extensionProperty.setValue(
+            fileTypeViewModel.extensionProperty().getValue()
+        );
         nameProperty.setValue(fileTypeViewModel.nameProperty().getValue());
-        mimeTypeProperty.setValue(fileTypeViewModel.mimetypeProperty().getValue());
+        mimeTypeProperty.setValue(
+            fileTypeViewModel.mimetypeProperty().getValue()
+        );
 
         if (fileTypeViewModel.applicationProperty().getValue().isEmpty()) {
             defaultApplicationSelectedProperty.setValue(true);
         } else {
             customApplicationSelectedProperty.setValue(true);
-            selectedApplicationProperty.setValue(fileTypeViewModel.applicationProperty().getValue());
+            selectedApplicationProperty.setValue(
+                fileTypeViewModel.applicationProperty().getValue()
+            );
         }
     }
 
@@ -60,8 +76,12 @@ public BooleanProperty customApplicationSelectedProperty() {
     }
 
     public void storeSettings() {
-        fileTypeViewModel.nameProperty().setValue(nameProperty.getValue().trim());
-        fileTypeViewModel.mimetypeProperty().setValue(mimeTypeProperty.getValue().trim());
+        fileTypeViewModel
+            .nameProperty()
+            .setValue(nameProperty.getValue().trim());
+        fileTypeViewModel
+            .mimetypeProperty()
+            .setValue(mimeTypeProperty.getValue().trim());
 
         String ext = extensionProperty.getValue().trim();
         if (!ext.isEmpty() && (ext.charAt(0) == '.')) {
@@ -73,7 +93,10 @@ 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:
-        if (defaultApplicationSelectedProperty.getValue() || application.isEmpty()) {
+        if (
+            defaultApplicationSelectedProperty.getValue() ||
+            application.isEmpty()
+        ) {
             fileTypeViewModel.applicationProperty().setValue("");
             selectedApplicationProperty.setValue("");
         } else {
diff --git a/src/main/java/org/jabref/gui/preferences/externalfiletypes/ExternalFileTypeItemViewModel.java b/src/main/java/org/jabref/gui/preferences/externalfiletypes/ExternalFileTypeItemViewModel.java
index da149d6e516..495d4bc9d58 100644
--- a/src/main/java/org/jabref/gui/preferences/externalfiletypes/ExternalFileTypeItemViewModel.java
+++ b/src/main/java/org/jabref/gui/preferences/externalfiletypes/ExternalFileTypeItemViewModel.java
@@ -4,14 +4,15 @@
 import javafx.beans.property.SimpleObjectProperty;
 import javafx.beans.property.SimpleStringProperty;
 import javafx.beans.property.StringProperty;
-
 import org.jabref.gui.externalfiletype.CustomExternalFileType;
 import org.jabref.gui.externalfiletype.ExternalFileType;
 import org.jabref.gui.icon.IconTheme;
 import org.jabref.gui.icon.JabRefIcon;
 
 public class ExternalFileTypeItemViewModel {
-    private final ObjectProperty<JabRefIcon> icon = new SimpleObjectProperty<>();
+
+    private final ObjectProperty<JabRefIcon> icon =
+        new SimpleObjectProperty<>();
     private final StringProperty name = new SimpleStringProperty();
     private final StringProperty extension = new SimpleStringProperty();
     private final StringProperty mimetype = new SimpleStringProperty();
@@ -26,7 +27,16 @@ public ExternalFileTypeItemViewModel(ExternalFileType fileType) {
     }
 
     public ExternalFileTypeItemViewModel() {
-        this(new CustomExternalFileType("", "", "", "", "new", IconTheme.JabRefIcons.FILE));
+        this(
+            new CustomExternalFileType(
+                "",
+                "",
+                "",
+                "",
+                "new",
+                IconTheme.JabRefIcons.FILE
+            )
+        );
     }
 
     public ObjectProperty<JabRefIcon> iconProperty() {
@@ -58,11 +68,12 @@ public StringProperty applicationProperty() {
 
     public ExternalFileType toExternalFileType() {
         return new CustomExternalFileType(
-                this.name.get(),
-                this.extension.get(),
-                this.mimetype.get(),
-                this.application.get(),
-                this.icon.get().name(),
-                this.icon.get());
+            this.name.get(),
+            this.extension.get(),
+            this.mimetype.get(),
+            this.application.get(),
+            this.icon.get().name(),
+            this.icon.get()
+        );
     }
 }
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 b131484ddc3..1672a1ca6cf 100644
--- a/src/main/java/org/jabref/gui/preferences/externalfiletypes/ExternalFileTypesTab.java
+++ b/src/main/java/org/jabref/gui/preferences/externalfiletypes/ExternalFileTypesTab.java
@@ -1,9 +1,9 @@
 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;
-
 import org.jabref.gui.icon.IconTheme;
 import org.jabref.gui.icon.JabRefIcon;
 import org.jabref.gui.preferences.AbstractPreferenceTabView;
@@ -12,26 +12,60 @@
 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, 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, Boolean> fileTypesTableEditColumn;
-    @FXML private TableColumn<ExternalFileTypeItemViewModel, Boolean> fileTypesTableDeleteColumn;
-    @FXML private TableView<ExternalFileTypeItemViewModel> fileTypesTable;
+    @FXML
+    private TableColumn<
+        ExternalFileTypeItemViewModel,
+        String
+    > fileTypesTableMimeTypeColumn;
+
+    @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,49 +75,73 @@ public String getTabName() {
 
     @FXML
     public void initialize() {
-        viewModel = new ExternalFileTypesTabViewModel(preferencesService.getFilePreferences(), dialogService);
+        viewModel =
+            new ExternalFileTypesTabViewModel(
+                preferencesService.getFilePreferences(),
+                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);
+            .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);
+            .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);
+            .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);
+            .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);
+            .withText(extension -> extension)
+            .install(fileTypesTableApplicationColumn);
 
-        fileTypesTableEditColumn.setCellValueFactory(data -> BindingsHelper.constantOf(true));
-        fileTypesTableDeleteColumn.setCellValueFactory(data -> BindingsHelper.constantOf(true));
+        fileTypesTableEditColumn.setCellValueFactory(data ->
+            BindingsHelper.constantOf(true)
+        );
+        fileTypesTableDeleteColumn.setCellValueFactory(data ->
+            BindingsHelper.constantOf(true)
+        );
 
         new ValueTableCellFactory<ExternalFileTypeItemViewModel, JabRefIcon>()
-                .withGraphic(JabRefIcon::getGraphicNode)
-                .install(fileTypesTableIconColumn);
+            .withGraphic(JabRefIcon::getGraphicNode)
+            .install(fileTypesTableIconColumn);
         new ValueTableCellFactory<ExternalFileTypeItemViewModel, Boolean>()
-                .withGraphic(none -> IconTheme.JabRefIcons.EDIT.getGraphicNode())
-                .withOnMouseClickedEvent((type, none) -> event -> viewModel.edit(type))
-                .install(fileTypesTableEditColumn);
+            .withGraphic(none -> IconTheme.JabRefIcons.EDIT.getGraphicNode())
+            .withOnMouseClickedEvent((type, none) ->
+                event -> viewModel.edit(type)
+            )
+            .install(fileTypesTableEditColumn);
         new ValueTableCellFactory<ExternalFileTypeItemViewModel, Boolean>()
-                .withGraphic(none -> IconTheme.JabRefIcons.DELETE_ENTRY.getGraphicNode())
-                .withOnMouseClickedEvent((type, none) -> event -> viewModel.remove(type))
-                .install(fileTypesTableDeleteColumn);
+            .withGraphic(none ->
+                IconTheme.JabRefIcons.DELETE_ENTRY.getGraphicNode()
+            )
+            .withOnMouseClickedEvent((type, none) ->
+                event -> viewModel.remove(type)
+            )
+            .install(fileTypesTableDeleteColumn);
     }
 
     @FXML
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 b61818105f0..6a71ddad79f 100644
--- a/src/main/java/org/jabref/gui/preferences/externalfiletypes/ExternalFileTypesTabViewModel.java
+++ b/src/main/java/org/jabref/gui/preferences/externalfiletypes/ExternalFileTypesTabViewModel.java
@@ -3,10 +3,8 @@
 import java.util.Comparator;
 import java.util.HashSet;
 import java.util.Set;
-
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableList;
-
 import org.jabref.gui.DialogService;
 import org.jabref.gui.externalfiletype.ExternalFileType;
 import org.jabref.gui.externalfiletype.ExternalFileTypes;
@@ -16,12 +14,16 @@
 
 public class ExternalFileTypesTabViewModel implements PreferenceTabViewModel {
 
-    private final ObservableList<ExternalFileTypeItemViewModel> fileTypes = FXCollections.observableArrayList();
+    private final ObservableList<ExternalFileTypeItemViewModel> fileTypes =
+        FXCollections.observableArrayList();
 
     private final FilePreferences filePreferences;
     private final DialogService dialogService;
 
-    public ExternalFileTypesTabViewModel(FilePreferences filePreferences, DialogService dialogService) {
+    public ExternalFileTypesTabViewModel(
+        FilePreferences filePreferences,
+        DialogService dialogService
+    ) {
         this.filePreferences = filePreferences;
         this.dialogService = dialogService;
     }
@@ -29,33 +31,53 @@ public ExternalFileTypesTabViewModel(FilePreferences filePreferences, DialogServ
     @Override
     public void setValues() {
         fileTypes.clear();
-        fileTypes.addAll(filePreferences.getExternalFileTypes().stream()
-                       .map(ExternalFileTypeItemViewModel::new)
-                       .toList());
-        fileTypes.sort(Comparator.comparing(ExternalFileTypeItemViewModel::getName));
+        fileTypes.addAll(
+            filePreferences
+                .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))
+            );
 
         filePreferences.getExternalFileTypes().clear();
         filePreferences.getExternalFileTypes().addAll(saveList);
     }
 
     public void resetToDefaults() {
-        fileTypes.setAll(ExternalFileTypes.getDefaultExternalFileTypes().stream()
-                                          .map(ExternalFileTypeItemViewModel::new)
-                                          .toList());
-        fileTypes.sort(Comparator.comparing(ExternalFileTypeItemViewModel::getName));
+        fileTypes.setAll(
+            ExternalFileTypes
+                .getDefaultExternalFileTypes()
+                .stream()
+                .map(ExternalFileTypeItemViewModel::new)
+                .toList()
+        );
+        fileTypes.sort(
+            Comparator.comparing(ExternalFileTypeItemViewModel::getName)
+        );
     }
 
     public void addNewType() {
-        ExternalFileTypeItemViewModel item = new ExternalFileTypeItemViewModel();
+        ExternalFileTypeItemViewModel item =
+            new ExternalFileTypeItemViewModel();
         fileTypes.add(item);
         showEditDialog(item, Localization.lang("Add new file type"));
     }
@@ -64,8 +86,13 @@ public ObservableList<ExternalFileTypeItemViewModel> getFileTypes() {
         return fileTypes;
     }
 
-    private void showEditDialog(ExternalFileTypeItemViewModel item, String dialogTitle) {
-        dialogService.showCustomDialogAndWait(new EditExternalFileTypeEntryDialog(item, dialogTitle));
+    private void showEditDialog(
+        ExternalFileTypeItemViewModel item,
+        String dialogTitle
+    ) {
+        dialogService.showCustomDialogAndWait(
+            new EditExternalFileTypeEntryDialog(item, dialogTitle)
+        );
     }
 
     public void edit(ExternalFileTypeItemViewModel type) {
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 529a9ca6a66..d3159df5af9 100644
--- a/src/main/java/org/jabref/gui/preferences/general/GeneralTab.java
+++ b/src/main/java/org/jabref/gui/preferences/general/GeneralTab.java
@@ -1,7 +1,10 @@
 package org.jabref.gui.preferences.general;
 
+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;
-
 import javafx.application.Platform;
 import javafx.fxml.FXML;
 import javafx.geometry.Pos;
@@ -12,7 +15,6 @@
 import javafx.scene.control.TextField;
 import javafx.scene.control.TextFormatter;
 import javafx.util.converter.IntegerStringConverter;
-
 import org.jabref.gui.actions.ActionFactory;
 import org.jabref.gui.actions.StandardActions;
 import org.jabref.gui.help.HelpAction;
@@ -28,53 +30,98 @@
 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;
+public class GeneralTab
+    extends AbstractPreferenceTabView<GeneralTabViewModel>
+    implements PreferencesTab {
+
+    @FXML
+    private ComboBox<Language> language;
+
+    @FXML
+    private ComboBox<ThemeTypes> theme;
 
-public class GeneralTab extends AbstractPreferenceTabView<GeneralTabViewModel> implements PreferencesTab {
-
-    @FXML private ComboBox<Language> language;
-    @FXML private ComboBox<ThemeTypes> theme;
-    @FXML private CheckBox themeSyncOs;
-    @FXML private TextField customThemePath;
-    @FXML private Button customThemeBrowse;
-    @FXML private CheckBox fontOverride;
-    @FXML private Spinner<Integer> fontSize;
-    @FXML private CheckBox openLastStartup;
-    @FXML private CheckBox showAdvancedHints;
-    @FXML private CheckBox inspectionWarningDuplicate;
-    @FXML private CheckBox confirmDelete;
-    @FXML private CheckBox collectTelemetry;
-    @FXML private ComboBox<BibDatabaseMode> biblatexMode;
-    @FXML private CheckBox alwaysReformatBib;
-    @FXML private CheckBox autosaveLocalLibraries;
-    @FXML private Button autosaveLocalLibrariesHelp;
-    @FXML private CheckBox createBackup;
-    @FXML private TextField backupDirectory;
-    @FXML private CheckBox remoteServer;
-    @FXML private TextField remotePort;
-    @FXML private Button remoteHelp;
-    @Inject private FileUpdateMonitor fileUpdateMonitor;
-    @Inject private BibEntryTypesManager entryTypesManager;
-
-    private final ControlsFxVisualizer validationVisualizer = new ControlsFxVisualizer();
+    @FXML
+    private CheckBox themeSyncOs;
+
+    @FXML
+    private TextField customThemePath;
+
+    @FXML
+    private Button customThemeBrowse;
+
+    @FXML
+    private CheckBox fontOverride;
+
+    @FXML
+    private Spinner<Integer> fontSize;
+
+    @FXML
+    private CheckBox openLastStartup;
+
+    @FXML
+    private CheckBox showAdvancedHints;
+
+    @FXML
+    private CheckBox inspectionWarningDuplicate;
+
+    @FXML
+    private CheckBox confirmDelete;
+
+    @FXML
+    private CheckBox collectTelemetry;
+
+    @FXML
+    private ComboBox<BibDatabaseMode> biblatexMode;
+
+    @FXML
+    private CheckBox alwaysReformatBib;
+
+    @FXML
+    private CheckBox autosaveLocalLibraries;
+
+    @FXML
+    private Button autosaveLocalLibrariesHelp;
+
+    @FXML
+    private CheckBox createBackup;
+
+    @FXML
+    private TextField backupDirectory;
+
+    @FXML
+    private CheckBox remoteServer;
+
+    @FXML
+    private TextField remotePort;
+
+    @FXML
+    private Button remoteHelp;
+
+    @Inject
+    private FileUpdateMonitor fileUpdateMonitor;
+
+    @Inject
+    private BibEntryTypesManager entryTypesManager;
+
+    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,
+    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,70 +130,147 @@ public String getTabName() {
     }
 
     public void initialize() {
-        this.viewModel = new GeneralTabViewModel(dialogService, preferencesService, fileUpdateMonitor, entryTypesManager);
+        this.viewModel =
+            new GeneralTabViewModel(
+                dialogService,
+                preferencesService,
+                fileUpdateMonitor,
+                entryTypesManager
+            );
 
         new ViewModelListCellFactory<Language>()
-                .withText(Language::getDisplayName)
-                .install(language);
+            .withText(Language::getDisplayName)
+            .install(language);
         language.itemsProperty().bind(viewModel.languagesListProperty());
-        language.valueProperty().bindBidirectional(viewModel.selectedLanguageProperty());
+        language
+            .valueProperty()
+            .bindBidirectional(viewModel.selectedLanguageProperty());
 
-        fontOverride.selectedProperty().bindBidirectional(viewModel.fontOverrideProperty());
+        fontOverride
+            .selectedProperty()
+            .bindBidirectional(viewModel.fontOverrideProperty());
 
         // Spinner does neither support alignment nor disableProperty in FXML
         fontSize.disableProperty().bind(fontOverride.selectedProperty().not());
         fontSize.getEditor().setAlignment(Pos.CENTER_RIGHT);
         fontSize.setValueFactory(GeneralTabViewModel.fontSizeValueFactory);
-        fontSize.getEditor().textProperty().bindBidirectional(viewModel.fontSizeProperty());
+        fontSize
+            .getEditor()
+            .textProperty()
+            .bindBidirectional(viewModel.fontSizeProperty());
         fontSize.getEditor().setTextFormatter(fontSizeFormatter);
 
         new ViewModelListCellFactory<ThemeTypes>()
-                .withText(ThemeTypes::getDisplayName)
-                .install(theme);
+            .withText(ThemeTypes::getDisplayName)
+            .install(theme);
         theme.itemsProperty().bind(viewModel.themesListProperty());
-        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);
-        });
+        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);
+            }
+        );
 
         validationVisualizer.setDecoration(new IconValidationDecorator());
 
-        openLastStartup.selectedProperty().bindBidirectional(viewModel.openLastStartupProperty());
-        showAdvancedHints.selectedProperty().bindBidirectional(viewModel.showAdvancedHintsProperty());
-        inspectionWarningDuplicate.selectedProperty().bindBidirectional(viewModel.inspectionWarningDuplicateProperty());
-        confirmDelete.selectedProperty().bindBidirectional(viewModel.confirmDeleteProperty());
+        openLastStartup
+            .selectedProperty()
+            .bindBidirectional(viewModel.openLastStartupProperty());
+        showAdvancedHints
+            .selectedProperty()
+            .bindBidirectional(viewModel.showAdvancedHintsProperty());
+        inspectionWarningDuplicate
+            .selectedProperty()
+            .bindBidirectional(viewModel.inspectionWarningDuplicateProperty());
+        confirmDelete
+            .selectedProperty()
+            .bindBidirectional(viewModel.confirmDeleteProperty());
 
-        collectTelemetry.selectedProperty().bindBidirectional(viewModel.collectTelemetryProperty());
+        collectTelemetry
+            .selectedProperty()
+            .bindBidirectional(viewModel.collectTelemetryProperty());
 
         new ViewModelListCellFactory<BibDatabaseMode>()
-                .withText(BibDatabaseMode::getFormattedName)
-                .install(biblatexMode);
+            .withText(BibDatabaseMode::getFormattedName)
+            .install(biblatexMode);
         biblatexMode.itemsProperty().bind(viewModel.biblatexModeListProperty());
-        biblatexMode.valueProperty().bindBidirectional(viewModel.selectedBiblatexModeProperty());
+        biblatexMode
+            .valueProperty()
+            .bindBidirectional(viewModel.selectedBiblatexModeProperty());
 
-        alwaysReformatBib.selectedProperty().bindBidirectional(viewModel.alwaysReformatBibProperty());
-        autosaveLocalLibraries.selectedProperty().bindBidirectional(viewModel.autosaveLocalLibrariesProperty());
-        ActionFactory actionFactory = new ActionFactory(preferencesService.getKeyBindingRepository());
-        actionFactory.configureIconButton(StandardActions.HELP, new HelpAction(HelpFile.AUTOSAVE, dialogService, preferencesService.getFilePreferences()), autosaveLocalLibrariesHelp);
-        actionFactory.configureIconButton(StandardActions.HELP, new HelpAction(HelpFile.REMOTE, dialogService, preferencesService.getFilePreferences()), remoteHelp);
+        alwaysReformatBib
+            .selectedProperty()
+            .bindBidirectional(viewModel.alwaysReformatBibProperty());
+        autosaveLocalLibraries
+            .selectedProperty()
+            .bindBidirectional(viewModel.autosaveLocalLibrariesProperty());
+        ActionFactory actionFactory = new ActionFactory(
+            preferencesService.getKeyBindingRepository()
+        );
+        actionFactory.configureIconButton(
+            StandardActions.HELP,
+            new HelpAction(
+                HelpFile.AUTOSAVE,
+                dialogService,
+                preferencesService.getFilePreferences()
+            ),
+            autosaveLocalLibrariesHelp
+        );
+        actionFactory.configureIconButton(
+            StandardActions.HELP,
+            new HelpAction(
+                HelpFile.REMOTE,
+                dialogService,
+                preferencesService.getFilePreferences()
+            ),
+            remoteHelp
+        );
 
-        createBackup.selectedProperty().bindBidirectional(viewModel.createBackupProperty());
-        backupDirectory.textProperty().bindBidirectional(viewModel.backupDirectoryProperty());
-        backupDirectory.disableProperty().bind(viewModel.createBackupProperty().not());
+        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);
+            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());
-        remotePort.disableProperty().bind(remoteServer.selectedProperty().not());
+        remoteServer
+            .selectedProperty()
+            .bindBidirectional(viewModel.remoteServerProperty());
+        remotePort
+            .textProperty()
+            .bindBidirectional(viewModel.remotePortProperty());
+        remotePort
+            .disableProperty()
+            .bind(remoteServer.selectedProperty().not());
     }
 
     @FXML
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 d47bb33183f..7f74cdb7c5c 100644
--- a/src/main/java/org/jabref/gui/preferences/general/GeneralTabViewModel.java
+++ b/src/main/java/org/jabref/gui/preferences/general/GeneralTabViewModel.java
@@ -1,11 +1,15 @@
 package org.jabref.gui.preferences.general;
 
+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;
-
 import javafx.beans.property.BooleanProperty;
 import javafx.beans.property.ListProperty;
 import javafx.beans.property.ObjectProperty;
@@ -18,7 +22,6 @@
 import javafx.beans.property.StringProperty;
 import javafx.collections.FXCollections;
 import javafx.scene.control.SpinnerValueFactory;
-
 import org.jabref.gui.DialogService;
 import org.jabref.gui.Globals;
 import org.jabref.gui.desktop.JabRefDesktop;
@@ -45,47 +48,64 @@
 import org.jabref.preferences.TelemetryPreferences;
 import org.jabref.preferences.WorkspacePreferences;
 
-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 GeneralTabViewModel implements PreferenceTabViewModel {
 
     protected static SpinnerValueFactory<Integer> fontSizeValueFactory =
-            new SpinnerValueFactory.IntegerSpinnerValueFactory(9, Integer.MAX_VALUE);
+        new SpinnerValueFactory.IntegerSpinnerValueFactory(
+            9,
+            Integer.MAX_VALUE
+        );
 
     private final ReadOnlyListProperty<Language> languagesListProperty =
-            new ReadOnlyListWrapper<>(FXCollections.observableArrayList(Language.values()));
-    private final ObjectProperty<Language> selectedLanguageProperty = new SimpleObjectProperty<>();
+        new ReadOnlyListWrapper<>(
+            FXCollections.observableArrayList(Language.values())
+        );
+    private final ObjectProperty<Language> selectedLanguageProperty =
+        new SimpleObjectProperty<>();
 
     private final ReadOnlyListProperty<ThemeTypes> themesListProperty =
-            new ReadOnlyListWrapper<>(FXCollections.observableArrayList(ThemeTypes.values()));
-    private final ObjectProperty<ThemeTypes> selectedThemeProperty = new SimpleObjectProperty<>();
+        new ReadOnlyListWrapper<>(
+            FXCollections.observableArrayList(ThemeTypes.values())
+        );
+    private final ObjectProperty<ThemeTypes> selectedThemeProperty =
+        new SimpleObjectProperty<>();
 
-    private final BooleanProperty themeSyncOsProperty = new SimpleBooleanProperty();
+    private final BooleanProperty themeSyncOsProperty =
+        new SimpleBooleanProperty();
 
-    private final StringProperty customPathToThemeProperty = new SimpleStringProperty();
+    private final StringProperty customPathToThemeProperty =
+        new SimpleStringProperty();
 
-    private final BooleanProperty fontOverrideProperty = new SimpleBooleanProperty();
+    private final BooleanProperty fontOverrideProperty =
+        new SimpleBooleanProperty();
     private final StringProperty fontSizeProperty = new SimpleStringProperty();
 
-    private final BooleanProperty openLastStartupProperty = new SimpleBooleanProperty();
-    private final BooleanProperty showAdvancedHintsProperty = new SimpleBooleanProperty();
-    private final BooleanProperty inspectionWarningDuplicateProperty = new SimpleBooleanProperty();
-    private final BooleanProperty confirmDeleteProperty = new SimpleBooleanProperty();
-
-    private final BooleanProperty collectTelemetryProperty = new SimpleBooleanProperty();
-
-    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();
-
-    private final BooleanProperty createBackupProperty = new SimpleBooleanProperty();
-    private final StringProperty backupDirectoryProperty = new SimpleStringProperty("");
+    private final BooleanProperty openLastStartupProperty =
+        new SimpleBooleanProperty();
+    private final BooleanProperty showAdvancedHintsProperty =
+        new SimpleBooleanProperty();
+    private final BooleanProperty inspectionWarningDuplicateProperty =
+        new SimpleBooleanProperty();
+    private final BooleanProperty confirmDeleteProperty =
+        new SimpleBooleanProperty();
+
+    private final BooleanProperty collectTelemetryProperty =
+        new SimpleBooleanProperty();
+
+    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();
+
+    private final BooleanProperty createBackupProperty =
+        new SimpleBooleanProperty();
+    private final StringProperty backupDirectoryProperty =
+        new SimpleStringProperty("");
 
     private final DialogService dialogService;
     private final PreferencesService preferences;
@@ -99,16 +119,25 @@ public class GeneralTabViewModel implements PreferenceTabViewModel {
     private final Validator customPathToThemeValidator;
 
     private final List<String> restartWarning = new ArrayList<>();
-    private final BooleanProperty remoteServerProperty = new SimpleBooleanProperty();
-    private final StringProperty remotePortProperty = new SimpleStringProperty("");
+    private final BooleanProperty remoteServerProperty =
+        new SimpleBooleanProperty();
+    private final StringProperty remotePortProperty = new SimpleStringProperty(
+        ""
+    );
     private final Validator remotePortValidator;
     private final InternalPreferences internalPreferences;
-    private final BooleanProperty versionCheckProperty = new SimpleBooleanProperty();
+    private final BooleanProperty versionCheckProperty =
+        new SimpleBooleanProperty();
     private final FileUpdateMonitor fileUpdateMonitor;
     private final BibEntryTypesManager entryTypesManager;
     private TrustStoreManager trustStoreManager;
 
-    public GeneralTabViewModel(DialogService dialogService, PreferencesService preferences, FileUpdateMonitor fileUpdateMonitor, BibEntryTypesManager entryTypesManager) {
+    public GeneralTabViewModel(
+        DialogService dialogService,
+        PreferencesService preferences,
+        FileUpdateMonitor fileUpdateMonitor,
+        BibEntryTypesManager entryTypesManager
+    ) {
         this.dialogService = dialogService;
         this.preferences = preferences;
         this.workspacePreferences = preferences.getWorkspacePreferences();
@@ -121,44 +150,73 @@ public GeneralTabViewModel(DialogService dialogService, PreferencesService prefe
         this.entryTypesManager = entryTypesManager;
         this.trustStoreManager = trustStoreManager;
 
-        fontSizeValidator = new FunctionBasedValidator<>(
+        fontSizeValidator =
+            new FunctionBasedValidator<>(
                 fontSizeProperty,
                 input -> {
                     try {
-                        return Integer.parseInt(fontSizeProperty().getValue()) > 8;
+                        return (
+                            Integer.parseInt(fontSizeProperty().getValue()) > 8
+                        );
                     } catch (NumberFormatException ex) {
                         return false;
                     }
                 },
-                ValidationMessage.error(String.format("%s > %s %n %n %s",
+                ValidationMessage.error(
+                    String.format(
+                        "%s > %s %n %n %s",
                         Localization.lang("General"),
                         Localization.lang("Font settings"),
-                        Localization.lang("You must enter an integer value higher than 8."))));
-
-        customPathToThemeValidator = new FunctionBasedValidator<>(
+                        Localization.lang(
+                            "You must enter an integer value higher than 8."
+                        )
+                    )
+                )
+            );
+
+        customPathToThemeValidator =
+            new FunctionBasedValidator<>(
                 customPathToThemeProperty,
                 input -> !StringUtil.isNullOrEmpty(input),
-                ValidationMessage.error(String.format("%s > %s %n %n %s",
+                ValidationMessage.error(
+                    String.format(
+                        "%s > %s %n %n %s",
                         Localization.lang("General"),
                         Localization.lang("Visual theme"),
-                        Localization.lang("Please specify a css theme file."))));
+                        Localization.lang("Please specify a css theme file.")
+                    )
+                )
+            );
 
-        remotePortValidator = new FunctionBasedValidator<>(
+        remotePortValidator =
+            new FunctionBasedValidator<>(
                 remotePortProperty,
                 input -> {
                     try {
-                        int portNumber = Integer.parseInt(remotePortProperty().getValue());
+                        int portNumber = Integer.parseInt(
+                            remotePortProperty().getValue()
+                        );
                         return RemoteUtil.isUserPort(portNumber);
                     } catch (NumberFormatException ex) {
                         return false;
                     }
                 },
-                ValidationMessage.error(String.format("%s > %s %n %n %s",
+                ValidationMessage.error(
+                    String.format(
+                        "%s > %s %n %n %s",
                         Localization.lang("Network"),
                         Localization.lang("Remote operation"),
-                        Localization.lang("You must enter an integer value in the interval 1025-65535"))));
+                        Localization.lang(
+                            "You must enter an integer value in the interval 1025-65535"
+                        )
+                    )
+                )
+            );
 
-        this.trustStoreManager = new TrustStoreManager(Path.of(preferences.getSSLPreferences().getTruststorePath()));
+        this.trustStoreManager =
+            new TrustStoreManager(
+                Path.of(preferences.getSSLPreferences().getTruststorePath())
+            );
     }
 
     public ValidationStatus remotePortValidationStatus() {
@@ -172,38 +230,62 @@ public void setValues() {
         // 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());
+                customPathToThemeProperty.setValue(
+                    workspacePreferences.getTheme().getName()
+                );
             }
         }
         themeSyncOsProperty.setValue(workspacePreferences.shouldThemeSyncOs());
 
-        fontOverrideProperty.setValue(workspacePreferences.shouldOverrideDefaultFontSize());
-        fontSizeProperty.setValue(String.valueOf(workspacePreferences.getMainFontSize()));
-
-        openLastStartupProperty.setValue(workspacePreferences.shouldOpenLastEdited());
-        showAdvancedHintsProperty.setValue(workspacePreferences.shouldShowAdvancedHints());
-        inspectionWarningDuplicateProperty.setValue(workspacePreferences.shouldWarnAboutDuplicatesInInspection());
-        confirmDeleteProperty.setValue(workspacePreferences.shouldConfirmDelete());
-
-        collectTelemetryProperty.setValue(telemetryPreferences.shouldCollectTelemetry());
-
-        bibliographyModeListProperty.setValue(FXCollections.observableArrayList(BibDatabaseMode.values()));
-        selectedBiblatexModeProperty.setValue(libraryPreferences.getDefaultBibDatabaseMode());
-
-        alwaysReformatBibProperty.setValue(libraryPreferences.shouldAlwaysReformatOnSave());
+        fontOverrideProperty.setValue(
+            workspacePreferences.shouldOverrideDefaultFontSize()
+        );
+        fontSizeProperty.setValue(
+            String.valueOf(workspacePreferences.getMainFontSize())
+        );
+
+        openLastStartupProperty.setValue(
+            workspacePreferences.shouldOpenLastEdited()
+        );
+        showAdvancedHintsProperty.setValue(
+            workspacePreferences.shouldShowAdvancedHints()
+        );
+        inspectionWarningDuplicateProperty.setValue(
+            workspacePreferences.shouldWarnAboutDuplicatesInInspection()
+        );
+        confirmDeleteProperty.setValue(
+            workspacePreferences.shouldConfirmDelete()
+        );
+
+        collectTelemetryProperty.setValue(
+            telemetryPreferences.shouldCollectTelemetry()
+        );
+
+        bibliographyModeListProperty.setValue(
+            FXCollections.observableArrayList(BibDatabaseMode.values())
+        );
+        selectedBiblatexModeProperty.setValue(
+            libraryPreferences.getDefaultBibDatabaseMode()
+        );
+
+        alwaysReformatBibProperty.setValue(
+            libraryPreferences.shouldAlwaysReformatOnSave()
+        );
         autosaveLocalLibraries.setValue(libraryPreferences.shouldAutoSave());
 
         createBackupProperty.setValue(filePreferences.shouldCreateBackup());
-        backupDirectoryProperty.setValue(filePreferences.getBackupDirectory().toString());
+        backupDirectoryProperty.setValue(
+            filePreferences.getBackupDirectory().toString()
+        );
 
         remoteServerProperty.setValue(remotePreferences.useRemoteServer());
-        remotePortProperty.setValue(String.valueOf(remotePreferences.getPort()));
+        remotePortProperty.setValue(
+            String.valueOf(remotePreferences.getPort())
+        );
     }
 
     @Override
@@ -212,53 +294,88 @@ 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()));
+        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 CUSTOM -> workspacePreferences.setTheme(Theme.custom(customPathToThemeProperty.getValue()));
+            case LIGHT -> workspacePreferences.setTheme(Theme.light());
+            case DARK -> workspacePreferences.setTheme(Theme.dark());
+            case CUSTOM -> workspacePreferences.setTheme(
+                Theme.custom(customPathToThemeProperty.getValue())
+            );
         }
         workspacePreferences.setThemeSyncOs(themeSyncOsProperty.getValue());
 
-        workspacePreferences.setOpenLastEdited(openLastStartupProperty.getValue());
-        workspacePreferences.setShowAdvancedHints(showAdvancedHintsProperty.getValue());
-        workspacePreferences.setWarnAboutDuplicatesInInspection(inspectionWarningDuplicateProperty.getValue());
+        workspacePreferences.setOpenLastEdited(
+            openLastStartupProperty.getValue()
+        );
+        workspacePreferences.setShowAdvancedHints(
+            showAdvancedHintsProperty.getValue()
+        );
+        workspacePreferences.setWarnAboutDuplicatesInInspection(
+            inspectionWarningDuplicateProperty.getValue()
+        );
         workspacePreferences.setConfirmDelete(confirmDeleteProperty.getValue());
 
-        telemetryPreferences.setCollectTelemetry(collectTelemetryProperty.getValue());
+        telemetryPreferences.setCollectTelemetry(
+            collectTelemetryProperty.getValue()
+        );
 
-        libraryPreferences.setDefaultBibDatabaseMode(selectedBiblatexModeProperty.getValue());
+        libraryPreferences.setDefaultBibDatabaseMode(
+            selectedBiblatexModeProperty.getValue()
+        );
 
-        libraryPreferences.setAlwaysReformatOnSave(alwaysReformatBibProperty.getValue());
+        libraryPreferences.setAlwaysReformatOnSave(
+            alwaysReformatBibProperty.getValue()
+        );
         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);
-            }
-        });
-
-        internalPreferences.setVersionCheckEnabled(versionCheckProperty.getValue());
-
-        getPortAsInt(remotePortProperty.getValue()).ifPresent(newPort -> {
-            if (remotePreferences.isDifferentPort(newPort)) {
-                remotePreferences.setPort(newPort);
-            }
-        });
+        filePreferences
+            .createBackupProperty()
+            .setValue(createBackupProperty.getValue());
+        filePreferences
+            .backupDirectoryProperty()
+            .setValue(Path.of(backupDirectoryProperty.getValue()));
+
+        getPortAsInt(remotePortProperty.getValue())
+            .ifPresent(newPort -> {
+                if (remotePreferences.isDifferentPort(newPort)) {
+                    remotePreferences.setPort(newPort);
+                }
+            });
+
+        internalPreferences.setVersionCheckEnabled(
+            versionCheckProperty.getValue()
+        );
+
+        getPortAsInt(remotePortProperty.getValue())
+            .ifPresent(newPort -> {
+                if (remotePreferences.isDifferentPort(newPort)) {
+                    remotePreferences.setPort(newPort);
+                }
+            });
 
         if (remoteServerProperty.getValue()) {
             remotePreferences.setUseRemoteServer(true);
-            Globals.REMOTE_LISTENER.openAndStart(new CLIMessageHandler(preferences, fileUpdateMonitor, entryTypesManager), remotePreferences.getPort());
+            Globals.REMOTE_LISTENER.openAndStart(
+                new CLIMessageHandler(
+                    preferences,
+                    fileUpdateMonitor,
+                    entryTypesManager
+                ),
+                remotePreferences.getPort()
+            );
         } else {
             remotePreferences.setUseRemoteServer(false);
             Globals.REMOTE_LISTENER.stop();
@@ -267,7 +384,14 @@ public void storeSettings() {
 
         if (remoteServerProperty.getValue()) {
             remotePreferences.setUseRemoteServer(true);
-            Globals.REMOTE_LISTENER.openAndStart(new CLIMessageHandler(preferences, fileUpdateMonitor, entryTypesManager), remotePreferences.getPort());
+            Globals.REMOTE_LISTENER.openAndStart(
+                new CLIMessageHandler(
+                    preferences,
+                    fileUpdateMonitor,
+                    entryTypesManager
+                ),
+                remotePreferences.getPort()
+            );
         } else {
             remotePreferences.setUseRemoteServer(false);
             Globals.REMOTE_LISTENER.stop();
@@ -301,8 +425,11 @@ 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;
@@ -338,13 +465,24 @@ public StringProperty customPathToThemeProperty() {
     }
 
     public void importCSSFile() {
-        FileDialogConfiguration fileDialogConfiguration = new FileDialogConfiguration.Builder()
+        FileDialogConfiguration fileDialogConfiguration =
+            new FileDialogConfiguration.Builder()
                 .addExtensionFilter(StandardFileType.CSS)
                 .withDefaultExtension(StandardFileType.CSS)
-                .withInitialDirectory(preferences.getInternalPreferences().getLastPreferencesExportPath()).build();
-
-        dialogService.showFileOpenDialog(fileDialogConfiguration).ifPresent(file ->
-                customPathToThemeProperty.setValue(file.toAbsolutePath().toString()));
+                .withInitialDirectory(
+                    preferences
+                        .getInternalPreferences()
+                        .getLastPreferencesExportPath()
+                )
+                .build();
+
+        dialogService
+            .showFileOpenDialog(fileDialogConfiguration)
+            .ifPresent(file ->
+                customPathToThemeProperty.setValue(
+                    file.toAbsolutePath().toString()
+                )
+            );
     }
 
     public BooleanProperty fontOverrideProperty() {
@@ -401,9 +539,14 @@ 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() {
@@ -419,7 +562,10 @@ public void openBrowser() {
         try {
             JabRefDesktop.openBrowser(url, preferences.getFilePreferences());
         } catch (IOException e) {
-            dialogService.showErrorDialogAndWait(Localization.lang("Could not open website."), e);
+            dialogService.showErrorDialogAndWait(
+                Localization.lang("Could not open website."),
+                e
+            );
         }
     }
 
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 1bb3bb1f2bb..183dab0b4fe 100644
--- a/src/main/java/org/jabref/gui/preferences/groups/GroupsTab.java
+++ b/src/main/java/org/jabref/gui/preferences/groups/GroupsTab.java
@@ -1,26 +1,31 @@
 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;
-
 import org.jabref.gui.preferences.AbstractPreferenceTabView;
 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 groupViewModeIntersection;
-    @FXML private RadioButton groupViewModeUnion;
-    @FXML private CheckBox autoAssignGroup;
-    @FXML private CheckBox displayGroupCount;
+    @FXML
+    private RadioButton groupViewModeUnion;
+
+    @FXML
+    private CheckBox autoAssignGroup;
+
+    @FXML
+    private CheckBox displayGroupCount;
 
     public GroupsTab() {
-        ViewLoader.view(this)
-                  .root(this)
-                  .load();
+        ViewLoader.view(this).root(this).load();
     }
 
     @Override
@@ -29,11 +34,20 @@ public String getTabName() {
     }
 
     public void initialize() {
-        this.viewModel = new GroupsTabViewModel(preferencesService.getGroupsPreferences());
-
-        groupViewModeIntersection.selectedProperty().bindBidirectional(viewModel.groupViewModeIntersectionProperty());
-        groupViewModeUnion.selectedProperty().bindBidirectional(viewModel.groupViewModeUnionProperty());
-        autoAssignGroup.selectedProperty().bindBidirectional(viewModel.autoAssignGroupProperty());
-        displayGroupCount.selectedProperty().bindBidirectional(viewModel.displayGroupCount());
+        this.viewModel =
+            new GroupsTabViewModel(preferencesService.getGroupsPreferences());
+
+        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 84286ab62f3..bcc123e634c 100644
--- a/src/main/java/org/jabref/gui/preferences/groups/GroupsTabViewModel.java
+++ b/src/main/java/org/jabref/gui/preferences/groups/GroupsTabViewModel.java
@@ -2,17 +2,20 @@
 
 import javafx.beans.property.BooleanProperty;
 import javafx.beans.property.SimpleBooleanProperty;
-
 import org.jabref.gui.groups.GroupViewMode;
 import org.jabref.gui.groups.GroupsPreferences;
 import org.jabref.gui.preferences.PreferenceTabViewModel;
 
 public class GroupsTabViewModel implements PreferenceTabViewModel {
 
-    private final BooleanProperty groupViewModeIntersectionProperty = new SimpleBooleanProperty();
-    private final BooleanProperty groupViewModeUnionProperty = new SimpleBooleanProperty();
-    private final BooleanProperty autoAssignGroupProperty = new SimpleBooleanProperty();
-    private final BooleanProperty displayGroupCountProperty = new SimpleBooleanProperty();
+    private final BooleanProperty groupViewModeIntersectionProperty =
+        new SimpleBooleanProperty();
+    private final BooleanProperty groupViewModeUnionProperty =
+        new SimpleBooleanProperty();
+    private final BooleanProperty autoAssignGroupProperty =
+        new SimpleBooleanProperty();
+    private final BooleanProperty displayGroupCountProperty =
+        new SimpleBooleanProperty();
 
     private final GroupsPreferences groupsPreferences;
 
@@ -32,15 +35,27 @@ public void setValues() {
                 groupViewModeUnionProperty.setValue(true);
             }
         }
-        autoAssignGroupProperty.setValue(groupsPreferences.shouldAutoAssignGroup());
-        displayGroupCountProperty.setValue(groupsPreferences.shouldDisplayGroupCount());
+        autoAssignGroupProperty.setValue(
+            groupsPreferences.shouldAutoAssignGroup()
+        );
+        displayGroupCountProperty.setValue(
+            groupsPreferences.shouldDisplayGroupCount()
+        );
     }
 
     @Override
     public void storeSettings() {
-        groupsPreferences.setGroupViewMode(groupViewModeIntersectionProperty.getValue() ? GroupViewMode.INTERSECTION : GroupViewMode.UNION);
-        groupsPreferences.setAutoAssignGroup(autoAssignGroupProperty.getValue());
-        groupsPreferences.setDisplayGroupCount(displayGroupCountProperty.getValue());
+        groupsPreferences.setGroupViewMode(
+            groupViewModeIntersectionProperty.getValue()
+                ? GroupViewMode.INTERSECTION
+                : GroupViewMode.UNION
+        );
+        groupsPreferences.setAutoAssignGroup(
+            autoAssignGroupProperty.getValue()
+        );
+        groupsPreferences.setDisplayGroupCount(
+            displayGroupCountProperty.getValue()
+        );
     }
 
     public BooleanProperty groupViewModeIntersectionProperty() {
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 1c13439cf6b..0dde9ac7f39 100644
--- a/src/main/java/org/jabref/gui/preferences/journals/AbbreviationViewModel.java
+++ b/src/main/java/org/jabref/gui/preferences/journals/AbbreviationViewModel.java
@@ -2,12 +2,10 @@
 
 import java.util.Locale;
 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 org.jabref.logic.journals.Abbreviation;
 
 /**
@@ -18,10 +16,12 @@ public class AbbreviationViewModel {
 
     private final StringProperty name = new SimpleStringProperty("");
     private final StringProperty abbreviation = new SimpleStringProperty("");
-    private final StringProperty shortestUniqueAbbreviation = new SimpleStringProperty("");
+    private final StringProperty shortestUniqueAbbreviation =
+        new SimpleStringProperty("");
 
     // Used when a "null" abbreviation object is added
-    private final BooleanProperty pseudoAbbreviation = new SimpleBooleanProperty();
+    private final BooleanProperty pseudoAbbreviation =
+        new SimpleBooleanProperty();
 
     public AbbreviationViewModel(Abbreviation abbreviationObject) {
         this.pseudoAbbreviation.set(abbreviationObject == null);
@@ -30,18 +30,28 @@ 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 {
-                this.shortestUniqueAbbreviation.setValue(shortestUniqueAbbreviationOfAbbreviation);
+                this.shortestUniqueAbbreviation.setValue(
+                        shortestUniqueAbbreviationOfAbbreviation
+                    );
             }
         }
     }
 
     public Abbreviation getAbbreviationObject() {
-        return new Abbreviation(getName(), getAbbreviation(), getShortestUniqueAbbreviation());
+        return new Abbreviation(
+            getName(),
+            getAbbreviation(),
+            getShortestUniqueAbbreviation()
+        );
     }
 
     public String getName() {
@@ -64,7 +74,9 @@ public String getShortestUniqueAbbreviation() {
         return shortestUniqueAbbreviation.get();
     }
 
-    public void setShortestUniqueAbbreviation(String shortestUniqueAbbreviation) {
+    public void setShortestUniqueAbbreviation(
+        String shortestUniqueAbbreviation
+    ) {
         this.shortestUniqueAbbreviation.set(shortestUniqueAbbreviation);
     }
 
@@ -97,21 +109,35 @@ public boolean equals(Object o) {
             return false;
         }
         AbbreviationViewModel that = (AbbreviationViewModel) o;
-        return getName().equals(that.getName())
-                && getAbbreviation().equals(that.getAbbreviation())
-                && getShortestUniqueAbbreviation().equals(that.getShortestUniqueAbbreviation())
-                && (isPseudoAbbreviation() == that.isPseudoAbbreviation());
+        return (
+            getName().equals(that.getName()) &&
+            getAbbreviation().equals(that.getAbbreviation()) &&
+            getShortestUniqueAbbreviation()
+                .equals(that.getShortestUniqueAbbreviation()) &&
+            (isPseudoAbbreviation() == that.isPseudoAbbreviation())
+        );
     }
 
     @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 88ecb96d240..6dbbfb196de 100644
--- a/src/main/java/org/jabref/gui/preferences/journals/AbbreviationsFileViewModel.java
+++ b/src/main/java/org/jabref/gui/preferences/journals/AbbreviationsFileViewModel.java
@@ -9,12 +9,10 @@
 import java.util.Objects;
 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;
@@ -25,8 +23,8 @@
  */
 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;
@@ -42,7 +40,10 @@ public AbbreviationsFileViewModel(Path filePath) {
      * a placeholder and its path will be null meaning it has no place on the filesystem. Its isPseudoFile property
      * will therefore be set to true.
      */
-    public AbbreviationsFileViewModel(List<AbbreviationViewModel> abbreviations, String name) {
+    public AbbreviationsFileViewModel(
+        List<AbbreviationViewModel> abbreviations,
+        String name
+    ) {
         this.abbreviations.addAll(abbreviations);
         this.name = name;
         this.path = Optional.empty();
@@ -51,8 +52,13 @@ 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();
         }
@@ -65,10 +71,11 @@ 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());
+            List<Abbreviation> actualAbbreviations = 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 279961a7871..4a93a2f4ffc 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,8 @@
 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;
@@ -21,7 +24,7 @@
 import javafx.scene.control.cell.TextFieldTableCell;
 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,55 +34,82 @@
 import org.jabref.logic.journals.JournalAbbreviationRepository;
 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;
-
 /**
  * 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 Label loadingLabel;
-    @FXML private ProgressIndicator progressIndicator;
+    @FXML
+    private ProgressIndicator progressIndicator;
+
+    @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 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> actionsColumn;
+    @FXML
+    private TableColumn<AbbreviationViewModel, String> actionsColumn;
 
     private FilteredList<AbbreviationViewModel> filteredAbbreviations;
-    @FXML private ComboBox<AbbreviationsFileViewModel> journalFilesBox;
 
-    @FXML private Button addAbbreviationButton;
-    @FXML private Button removeAbbreviationListButton;
+    @FXML
+    private ComboBox<AbbreviationsFileViewModel> journalFilesBox;
 
-    @FXML private CustomTextField searchBox;
-    @FXML private CheckBox useFJournal;
+    @FXML
+    private Button addAbbreviationButton;
 
-    @Inject private TaskExecutor taskExecutor;
-    @Inject private JournalAbbreviationRepository abbreviationRepository;
+    @FXML
+    private Button removeAbbreviationListButton;
+
+    @FXML
+    private CustomTextField searchBox;
+
+    @FXML
+    private CheckBox useFJournal;
+
+    @Inject
+    private TaskExecutor taskExecutor;
+
+    @Inject
+    private JournalAbbreviationRepository abbreviationRepository;
 
     private Timeline invalidateSearch;
 
     public JournalAbbreviationsTab() {
-        ViewLoader.view(this)
-                  .root(this)
-                  .load();
+        ViewLoader.view(this).root(this).load();
     }
 
     @FXML
     private void initialize() {
-        viewModel = new JournalAbbreviationsTabViewModel(
+        viewModel =
+            new JournalAbbreviationsTabViewModel(
                 preferencesService.getJournalAbbreviationPreferences(),
                 dialogService,
                 taskExecutor,
-                abbreviationRepository);
+                abbreviationRepository
+            );
 
-        filteredAbbreviations = new FilteredList<>(viewModel.abbreviationsProperty());
+        filteredAbbreviations =
+            new FilteredList<>(viewModel.abbreviationsProperty());
 
         setUpTable();
         setBindings();
@@ -90,67 +120,157 @@ private void initialize() {
     }
 
     private void setUpTable() {
-        journalTableNameColumn.setCellValueFactory(cellData -> cellData.getValue().nameProperty());
-        journalTableNameColumn.setCellFactory(TextFieldTableCell.forTableColumn());
+        journalTableNameColumn.setCellValueFactory(cellData ->
+            cellData.getValue().nameProperty()
+        );
+        journalTableNameColumn.setCellFactory(
+            TextFieldTableCell.forTableColumn()
+        );
 
-        journalTableAbbreviationColumn.setCellValueFactory(cellData -> cellData.getValue().abbreviationProperty());
-        journalTableAbbreviationColumn.setCellFactory(TextFieldTableCell.forTableColumn());
+        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());
+        actionsColumn.setCellValueFactory(cellData ->
+            cellData.getValue().nameProperty()
+        );
         new ValueTableCellFactory<AbbreviationViewModel, String>()
-                .withGraphic(name -> IconTheme.JabRefIcons.DELETE_ENTRY.getGraphicNode())
-                .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()))
-                .install(actionsColumn);
+            .withGraphic(name ->
+                IconTheme.JabRefIcons.DELETE_ENTRY.getGraphicNode()
+            )
+            .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()
+                    )
+            )
+            .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());
-        journalFilesBox.itemsProperty().bindBidirectional(viewModel.journalFilesProperty());
-        journalFilesBox.valueProperty().bindBidirectional(viewModel.currentFileProperty());
+        EasyBind.subscribe(
+            journalAbbreviationsTable
+                .getSelectionModel()
+                .selectedItemProperty(),
+            newValue -> viewModel.currentAbbreviationProperty().set(newValue)
+        );
+        EasyBind.subscribe(
+            viewModel.currentAbbreviationProperty(),
+            newValue ->
+                journalAbbreviationsTable.getSelectionModel().select(newValue)
+        );
 
-        addAbbreviationButton.disableProperty().bind(viewModel.isEditableAndRemovableProperty().not());
+        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());
 
         loadingLabel.visibleProperty().bind(viewModel.isLoadingProperty());
         progressIndicator.visibleProperty().bind(viewModel.isLoadingProperty());
 
-        searchBox.textProperty().addListener((observable, previousText, searchTerm) ->
-                filteredAbbreviations.setPredicate(abbreviation -> searchTerm.isEmpty() || abbreviation.containsCaseIndependent(searchTerm)));
-
-        useFJournal.selectedProperty().bindBidirectional(viewModel.useFJournalProperty());
+        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))
+        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
+                    )
+                )
+            );
     }
 
     @FXML
@@ -183,29 +303,40 @@ private void addAbbreviationActions() {
         editAbbreviation();
     }
 
-    private static StringProperty createFlashingColorStringProperty(final ObjectProperty<Color> flashingColor) {
-        final StringProperty flashingColorStringProperty = new SimpleStringProperty();
+    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()));
     }
 
     @FXML
     private void editAbbreviation() {
         journalAbbreviationsTable.edit(
-                journalAbbreviationsTable.getSelectionModel().getSelectedIndex(),
-                journalTableNameColumn);
+            journalAbbreviationsTable.getSelectionModel().getSelectedIndex(),
+            journalTableNameColumn
+        );
     }
 
     private void selectNewAbbreviation() {
         int lastRow = viewModel.abbreviationsCountProperty().get() - 1;
         journalAbbreviationsTable.scrollTo(lastRow);
         journalAbbreviationsTable.getSelectionModel().select(lastRow);
-        journalAbbreviationsTable.getFocusModel().focus(lastRow, journalTableNameColumn);
+        journalAbbreviationsTable
+            .getFocusModel()
+            .focus(lastRow, journalTableNameColumn);
     }
 
     @Override
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 c7be0ebe1a3..96928ae3bb5 100644
--- a/src/main/java/org/jabref/gui/preferences/journals/JournalAbbreviationsTabViewModel.java
+++ b/src/main/java/org/jabref/gui/preferences/journals/JournalAbbreviationsTabViewModel.java
@@ -5,14 +5,12 @@
 import java.util.List;
 import java.util.Objects;
 import java.util.stream.Collectors;
-
 import javafx.beans.property.SimpleBooleanProperty;
 import javafx.beans.property.SimpleIntegerProperty;
 import javafx.beans.property.SimpleListProperty;
 import javafx.beans.property.SimpleObjectProperty;
 import javafx.collections.FXCollections;
 import javafx.collections.ListChangeListener;
-
 import org.jabref.gui.DialogService;
 import org.jabref.gui.Globals;
 import org.jabref.gui.preferences.PreferenceTabViewModel;
@@ -25,7 +23,6 @@
 import org.jabref.logic.journals.JournalAbbreviationRepository;
 import org.jabref.logic.l10n.Localization;
 import org.jabref.logic.util.StandardFileType;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -33,22 +30,38 @@
  * 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.
  */
-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 SimpleIntegerProperty abbreviationsCount = new SimpleIntegerProperty();
-
-    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 useFJournal = new SimpleBooleanProperty(true);
+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 SimpleIntegerProperty abbreviationsCount =
+        new SimpleIntegerProperty();
+
+    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 useFJournal = new SimpleBooleanProperty(
+        true
+    );
 
     private final DialogService dialogService;
     private final TaskExecutor taskExecutor;
@@ -57,32 +70,46 @@ 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.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();
+            boolean isAbbreviation =
+                (newValue != null) && !newValue.isPseudoAbbreviation();
+            boolean isEditableFile =
+                (currentFile.get() != null) &&
+                !currentFile.get().isBuiltInListProperty().get();
             isEditableAndRemovable.set(isEditableFile);
-            isAbbreviationEditableAndRemovable.set(isAbbreviation && isEditableFile);
+            isAbbreviationEditableAndRemovable.set(
+                isAbbreviation && isEditableFile
+            );
         });
         currentFile.addListener((observable, oldValue, newValue) -> {
             if (oldValue != null) {
-                abbreviations.unbindBidirectional(oldValue.abbreviationsProperty());
+                abbreviations.unbindBidirectional(
+                    oldValue.abbreviationsProperty()
+                );
                 currentAbbreviation.set(null);
             }
             if (newValue != null) {
                 isFileRemovable.set(!newValue.isBuiltInListProperty().get());
-                abbreviations.bindBidirectional(newValue.abbreviationsProperty());
+                abbreviations.bindBidirectional(
+                    newValue.abbreviationsProperty()
+                );
                 if (!abbreviations.isEmpty()) {
-                    currentAbbreviation.set(abbreviations.get(abbreviations.size() - 1));
+                    currentAbbreviation.set(
+                        abbreviations.get(abbreviations.size() - 1)
+                    );
                 }
             } else {
                 isFileRemovable.set(false);
@@ -94,15 +121,24 @@ public JournalAbbreviationsTabViewModel(JournalAbbreviationPreferences abbreviat
                 }
             }
         });
-        journalFiles.addListener((ListChangeListener<AbbreviationsFileViewModel>) lcl -> {
-            if (lcl.next()) {
-                if (!lcl.wasReplaced()) {
-                    if (lcl.wasAdded() && !lcl.getAddedSubList().get(0).isBuiltInListProperty().get()) {
-                        currentFile.set(lcl.getAddedSubList().get(0));
+        journalFiles.addListener(
+            (ListChangeListener<AbbreviationsFileViewModel>) lcl -> {
+                if (lcl.next()) {
+                    if (!lcl.wasReplaced()) {
+                        if (
+                            lcl.wasAdded() &&
+                            !lcl
+                                .getAddedSubList()
+                                .get(0)
+                                .isBuiltInListProperty()
+                                .get()
+                        ) {
+                            currentFile.set(lcl.getAddedSubList().get(0));
+                        }
                     }
                 }
             }
-        });
+        );
     }
 
     @Override
@@ -118,7 +154,8 @@ public void setValues() {
      * Read all saved file paths and read their abbreviations.
      */
     public void createFileObjects() {
-        List<String> externalFiles = abbreviationsPreferences.getExternalJournalLists();
+        List<String> externalFiles =
+            abbreviationsPreferences.getExternalJournalLists();
         externalFiles.forEach(name -> openFile(Path.of(name)));
     }
 
@@ -129,7 +166,9 @@ public void createFileObjects() {
      */
     public void selectLastJournalFile() {
         if (!journalFiles.isEmpty()) {
-            currentFile.set(journalFilesProperty().get(journalFilesProperty().size() - 1));
+            currentFile.set(
+                journalFilesProperty().get(journalFilesProperty().size() - 1)
+            );
         }
     }
 
@@ -138,18 +177,24 @@ public void selectLastJournalFile() {
      */
     public void addBuiltInList() {
         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();
-                })
-                .onFailure(dialogService::showErrorDialogAndWait)
-                .executeWith(taskExecutor);
+            .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();
+            })
+            .onFailure(dialogService::showErrorDialogAndWait)
+            .executeWith(taskExecutor);
     }
 
     /**
@@ -157,11 +202,14 @@ public void addBuiltInList() {
      * basically just calls the {@link #openFile(Path)}} method.
      */
     public void addNewFile() {
-        FileDialogConfiguration fileDialogConfiguration = new FileDialogConfiguration.Builder()
+        FileDialogConfiguration fileDialogConfiguration =
+            new FileDialogConfiguration.Builder()
                 .addExtensionFilter(StandardFileType.CSV)
                 .build();
 
-        dialogService.showFileSaveDialog(fileDialogConfiguration).ifPresent(this::openFile);
+        dialogService
+            .showFileSaveDialog(fileDialogConfiguration)
+            .ifPresent(this::openFile);
     }
 
     /**
@@ -172,10 +220,16 @@ public void addNewFile() {
      * @param filePath path to the file
      */
     private void openFile(Path filePath) {
-        AbbreviationsFileViewModel abbreviationsFile = new AbbreviationsFileViewModel(filePath);
+        AbbreviationsFileViewModel abbreviationsFile =
+            new AbbreviationsFileViewModel(filePath);
         if (journalFiles.contains(abbreviationsFile)) {
-            dialogService.showErrorDialogAndWait(Localization.lang("Duplicated Journal File"),
-                    Localization.lang("Journal file %s already added", filePath.toString()));
+            dialogService.showErrorDialogAndWait(
+                Localization.lang("Duplicated Journal File"),
+                Localization.lang(
+                    "Journal file %s already added",
+                    filePath.toString()
+                )
+            );
             return;
         }
         if (abbreviationsFile.exists()) {
@@ -189,11 +243,14 @@ private void openFile(Path filePath) {
     }
 
     public void openFile() {
-        FileDialogConfiguration fileDialogConfiguration = new FileDialogConfiguration.Builder()
+        FileDialogConfiguration fileDialogConfiguration =
+            new FileDialogConfiguration.Builder()
                 .addExtensionFilter(StandardFileType.CSV)
                 .build();
 
-        dialogService.showFileOpenDialog(fileDialogConfiguration).ifPresent(this::openFile);
+        dialogService
+            .showFileOpenDialog(fileDialogConfiguration)
+            .ifPresent(this::openFile);
     }
 
     /**
@@ -216,10 +273,18 @@ public void removeCurrentFile() {
      * property to the new abbreviation.
      */
     public void addAbbreviation(Abbreviation abbreviationObject) {
-        AbbreviationViewModel abbreviationViewModel = new AbbreviationViewModel(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 +293,13 @@ public void addAbbreviation(Abbreviation abbreviationObject) {
     }
 
     public void addAbbreviation() {
-        addAbbreviation(new Abbreviation(
+        addAbbreviation(
+            new Abbreviation(
                 Localization.lang("Name"),
                 Localization.lang("Abbreviation"),
-                Localization.lang("Shortest unique abbreviation")));
+                Localization.lang("Shortest unique abbreviation")
+            )
+        );
     }
 
     /**
@@ -239,36 +307,58 @@ public void addAbbreviation() {
      */
     void editAbbreviation(Abbreviation abbreviationObject) {
         if (isEditableAndRemovable.get()) {
-            AbbreviationViewModel abbViewModel = new AbbreviationViewModel(abbreviationObject);
+            AbbreviationViewModel abbViewModel = new AbbreviationViewModel(
+                abbreviationObject
+            );
             if (abbreviations.contains(abbViewModel)) {
                 if (abbViewModel.equals(currentAbbreviation.get())) {
-                    setCurrentAbbreviationNameAndAbbreviationIfValid(abbreviationObject);
+                    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);
+                setCurrentAbbreviationNameAndAbbreviationIfValid(
+                    abbreviationObject
+                );
             }
         }
     }
 
-    private void setCurrentAbbreviationNameAndAbbreviationIfValid(Abbreviation abbreviationObject) {
+    private void setCurrentAbbreviationNameAndAbbreviationIfValid(
+        Abbreviation abbreviationObject
+    ) {
         if (abbreviationObject.getName().trim().isEmpty()) {
-            dialogService.showErrorDialogAndWait(Localization.lang("Name cannot be empty"));
+            dialogService.showErrorDialogAndWait(
+                Localization.lang("Name cannot be empty")
+            );
             return;
         }
         if (abbreviationObject.getAbbreviation().trim().isEmpty()) {
-            dialogService.showErrorDialogAndWait(Localization.lang("Abbreviation cannot be empty"));
+            dialogService.showErrorDialogAndWait(
+                Localization.lang("Abbreviation cannot be empty")
+            );
             return;
         }
         AbbreviationViewModel abbreviationViewModel = currentAbbreviation.get();
         abbreviationViewModel.setName(abbreviationObject.getName());
-        abbreviationViewModel.setAbbreviation(abbreviationObject.getAbbreviation());
+        abbreviationViewModel.setAbbreviation(
+            abbreviationObject.getAbbreviation()
+        );
         if (abbreviationObject.isDefaultShortestUniqueAbbreviation()) {
             abbreviationViewModel.setShortestUniqueAbbreviation("");
         } else {
-            abbreviationViewModel.setShortestUniqueAbbreviation(abbreviationObject.getShortestUniqueAbbreviation());
+            abbreviationViewModel.setShortestUniqueAbbreviation(
+                abbreviationObject.getShortestUniqueAbbreviation()
+            );
         }
         shouldWriteLists = true;
     }
@@ -279,7 +369,10 @@ 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));
@@ -326,32 +419,45 @@ 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 -> Globals.journalAbbreviationRepository =
-                        JournalAbbreviationLoader.loadRepository(abbreviationsPreferences))
-                .onFailure(exception -> LOGGER.error("Failed to store journal preferences.", exception))
-                .executeWith(taskExecutor);
+            .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 ->
+                Globals.journalAbbreviationRepository =
+                    JournalAbbreviationLoader.loadRepository(
+                        abbreviationsPreferences
+                    )
+            )
+            .onFailure(exception ->
+                LOGGER.error("Failed to store journal preferences.", exception)
+            )
+            .executeWith(taskExecutor);
     }
 
     public SimpleBooleanProperty isLoadingProperty() {
         return isLoading;
     }
 
-    public SimpleListProperty<AbbreviationsFileViewModel> journalFilesProperty() {
+    public SimpleListProperty<
+        AbbreviationsFileViewModel
+    > journalFilesProperty() {
         return journalFiles;
     }
 
@@ -363,11 +469,15 @@ public SimpleIntegerProperty abbreviationsCountProperty() {
         return abbreviationsCount;
     }
 
-    public SimpleObjectProperty<AbbreviationsFileViewModel> currentFileProperty() {
+    public SimpleObjectProperty<
+        AbbreviationsFileViewModel
+    > currentFileProperty() {
         return currentFile;
     }
 
-    public SimpleObjectProperty<AbbreviationViewModel> currentAbbreviationProperty() {
+    public SimpleObjectProperty<
+        AbbreviationViewModel
+    > currentAbbreviationProperty() {
         return currentAbbreviation;
     }
 
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 5caa9ca82e3..cd459e2c2e1 100644
--- a/src/main/java/org/jabref/gui/preferences/keybindings/KeyBindingViewModel.java
+++ b/src/main/java/org/jabref/gui/preferences/keybindings/KeyBindingViewModel.java
@@ -1,22 +1,19 @@
 package org.jabref.gui.preferences.keybindings;
 
+import com.google.common.base.CaseFormat;
 import java.util.Optional;
-
 import javafx.beans.property.SimpleStringProperty;
 import javafx.beans.property.StringProperty;
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableList;
 import javafx.scene.input.KeyCode;
 import javafx.scene.input.KeyEvent;
-
 import org.jabref.gui.icon.IconTheme;
 import org.jabref.gui.icon.JabRefIcon;
 import org.jabref.gui.keyboard.KeyBinding;
 import org.jabref.gui.keyboard.KeyBindingCategory;
 import org.jabref.gui.keyboard.KeyBindingRepository;
 
-import com.google.common.base.CaseFormat;
-
 /**
  * This class represents a view model for objects of the KeyBinding
  * class. It has two properties representing the localized name of an
@@ -28,21 +25,30 @@ 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 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();
@@ -69,13 +75,21 @@ private void setBinding(String bind) {
         String[] parts = bind.split(" ");
         StringBuilder displayBind = new StringBuilder();
         for (String part : parts) {
-            displayBind.append(CaseFormat.LOWER_CAMEL.to(CaseFormat.UPPER_CAMEL, part)).append(" ");
+            displayBind
+                .append(CaseFormat.LOWER_CAMEL.to(CaseFormat.UPPER_CAMEL, part))
+                .append(" ");
         }
-        this.shownBinding.set(displayBind.toString().trim().replace(" ", " + "));
+        this.shownBinding.set(
+                displayBind.toString().trim().replace(" ", " + ")
+            );
     }
 
     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 +111,14 @@ 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;
         }
 
@@ -116,7 +136,11 @@ public boolean setNewBinding(KeyEvent evt) {
 
         // if no modifier keys are pressed, only special keys can be shortcuts
         if (modifiers.isEmpty()) {
-            if (!(code.isFunctionKey() || (code == KeyCode.ESCAPE) || (code == KeyCode.DELETE))) {
+            if (
+                !(code.isFunctionKey() ||
+                    (code == KeyCode.ESCAPE) ||
+                    (code == KeyCode.DELETE))
+            ) {
                 return false;
             }
         }
@@ -147,10 +171,14 @@ public void clear() {
     }
 
     public Optional<JabRefIcon> getResetIcon() {
-        return isCategory() ? Optional.empty() : Optional.of(IconTheme.JabRefIcons.REFRESH);
+        return isCategory()
+            ? Optional.empty()
+            : Optional.of(IconTheme.JabRefIcons.REFRESH);
     }
 
     public Optional<JabRefIcon> getClearIcon() {
-        return isCategory() ? Optional.empty() : Optional.of(IconTheme.JabRefIcons.CLEANUP_ENTRIES);
+        return isCategory()
+            ? Optional.empty()
+            : Optional.of(IconTheme.JabRefIcons.CLEANUP_ENTRIES);
     }
 }
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 973159b9378..0264e4edb45 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,8 @@
 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;
@@ -8,7 +11,6 @@
 import javafx.scene.control.TreeItem;
 import javafx.scene.control.TreeTableColumn;
 import javafx.scene.control.TreeTableView;
-
 import org.jabref.gui.icon.JabRefIcon;
 import org.jabref.gui.keyboard.KeyBindingRepository;
 import org.jabref.gui.preferences.AbstractPreferenceTabView;
@@ -18,25 +20,39 @@
 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 TreeTableView<KeyBindingViewModel> keyBindingsTable;
-    @FXML private TreeTableColumn<KeyBindingViewModel, String> actionColumn;
-    @FXML private TreeTableColumn<KeyBindingViewModel, String> shortcutColumn;
-    @FXML private TreeTableColumn<KeyBindingViewModel, KeyBindingViewModel> resetColumn;
-    @FXML private TreeTableColumn<KeyBindingViewModel, KeyBindingViewModel> clearColumn;
-    @FXML private MenuButton presetsButton;
+    @FXML
+    private TreeTableColumn<KeyBindingViewModel, String> actionColumn;
 
-    @Inject private KeyBindingRepository keyBindingRepository;
+    @FXML
+    private TreeTableColumn<KeyBindingViewModel, String> shortcutColumn;
+
+    @FXML
+    private TreeTableColumn<
+        KeyBindingViewModel,
+        KeyBindingViewModel
+    > resetColumn;
+
+    @FXML
+    private TreeTableColumn<
+        KeyBindingViewModel,
+        KeyBindingViewModel
+    > clearColumn;
+
+    @FXML
+    private MenuButton presetsButton;
+
+    @Inject
+    private KeyBindingRepository keyBindingRepository;
 
     public KeyBindingsTab() {
-        ViewLoader.view(this)
-                  .root(this)
-                  .load();
+        ViewLoader.view(this).root(this).load();
     }
 
     @Override
@@ -46,31 +62,69 @@ public String getTabName() {
 
     @FXML
     private void initialize() {
-        viewModel = new KeyBindingsTabViewModel(keyBindingRepository, dialogService, preferencesService);
+        viewModel =
+            new KeyBindingsTabViewModel(
+                keyBindingRepository,
+                dialogService,
+                preferencesService
+            );
 
-        keyBindingsTable.getSelectionModel().setSelectionMode(SelectionMode.SINGLE);
-        viewModel.selectedKeyBindingProperty().bind(
-                EasyBind.wrapNullable(keyBindingsTable.selectionModelProperty())
-                        .mapObservable(SelectionModel::selectedItemProperty)
-                        .mapObservable(TreeItem::valueProperty)
-        );
+        keyBindingsTable
+            .getSelectionModel()
+            .setSelectionMode(SelectionMode.SINGLE);
+        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()
         );
-        actionColumn.setCellValueFactory(cellData -> cellData.getValue().getValue().nameProperty());
-        shortcutColumn.setCellValueFactory(cellData -> cellData.getValue().getValue().shownBindingProperty());
         new ViewModelTreeTableCellFactory<KeyBindingViewModel>()
-                .withGraphic(keyBinding -> keyBinding.getResetIcon().map(JabRefIcon::getGraphicNode).orElse(null))
-                .withOnMouseClickedEvent(keyBinding -> evt -> keyBinding.resetToDefault())
-                .install(resetColumn);
+            .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))
-                .withOnMouseClickedEvent(keyBinding -> evt -> keyBinding.clear())
-                .install(clearColumn);
+            .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 cf7332d5432..dce2ba7fa59 100644
--- a/src/main/java/org/jabref/gui/preferences/keybindings/KeyBindingsTabViewModel.java
+++ b/src/main/java/org/jabref/gui/preferences/keybindings/KeyBindingsTabViewModel.java
@@ -4,7 +4,6 @@
 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;
@@ -14,7 +13,6 @@
 import javafx.scene.control.ButtonBar;
 import javafx.scene.control.ButtonType;
 import javafx.scene.input.KeyEvent;
-
 import org.jabref.gui.DialogService;
 import org.jabref.gui.keyboard.KeyBindingCategory;
 import org.jabref.gui.keyboard.KeyBindingRepository;
@@ -31,17 +29,27 @@ public class KeyBindingsTabViewModel implements PreferenceTabViewModel {
     private final KeyBindingRepository keyBindingRepository;
     private final KeyBindingRepository initialKeyBindingRepository;
     private final PreferencesService preferences;
-    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 OptionalObjectProperty<
+        KeyBindingViewModel
+    > selectedKeyBinding = OptionalObjectProperty.empty();
+    private final ObjectProperty<KeyBindingViewModel> rootKeyBinding =
+        new SimpleObjectProperty<>();
+    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, PreferencesService preferences) {
-        this.keyBindingRepository = Objects.requireNonNull(keyBindingRepository);
-        this.initialKeyBindingRepository = new KeyBindingRepository(keyBindingRepository.getKeyBindings());
+    public KeyBindingsTabViewModel(
+        KeyBindingRepository keyBindingRepository,
+        DialogService dialogService,
+        PreferencesService preferences
+    ) {
+        this.keyBindingRepository =
+            Objects.requireNonNull(keyBindingRepository);
+        this.initialKeyBindingRepository =
+            new KeyBindingRepository(keyBindingRepository.getKeyBindings());
         this.dialogService = Objects.requireNonNull(dialogService);
         this.preferences = Objects.requireNonNull(preferences);
 
@@ -54,22 +62,36 @@ 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);
     }
 
     public void setNewBindingForCurrent(KeyEvent event) {
-        Optional<KeyBindingViewModel> selectedKeyBindingValue = selectedKeyBinding.getValue();
+        Optional<KeyBindingViewModel> selectedKeyBindingValue =
+            selectedKeyBinding.getValue();
         if (selectedKeyBindingValue.isEmpty()) {
             return;
         }
@@ -80,7 +102,10 @@ public void setNewBindingForCurrent(KeyEvent event) {
         }
 
         if (selectedEntry.setNewBinding(event)) {
-            keyBindingRepository.put(selectedEntry.getKeyBinding(), selectedEntry.getBinding());
+            keyBindingRepository.put(
+                selectedEntry.getKeyBinding(),
+                selectedEntry.getBinding()
+            );
         }
     }
 
@@ -94,15 +119,27 @@ public void storeSettings() {
 
     public void resetToDefault() {
         String title = Localization.lang("Resetting all key bindings");
-        String content = Localization.lang("All key bindings 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();
-            }
-        });
+        String content = Localization.lang(
+            "All key bindings 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();
+                }
+            });
     }
 
     public void loadPreset(KeyBindingPreset preset) {
@@ -123,7 +160,9 @@ public List<String> getRestartWarnings() {
         return restartWarning;
     }
 
-    public OptionalObjectProperty<KeyBindingViewModel> selectedKeyBindingProperty() {
+    public OptionalObjectProperty<
+        KeyBindingViewModel
+    > selectedKeyBindingProperty() {
         return selectedKeyBinding;
     }
 
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 72265447c39..d1b1c7adeca 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
@@ -2,7 +2,6 @@
 
 import java.util.HashMap;
 import java.util.Map;
-
 import org.jabref.gui.keyboard.KeyBinding;
 
 public class BashKeyBindingPreset implements KeyBindingPreset {
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 4eae173e8de..68e962073ed 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,7 +1,6 @@
 package org.jabref.gui.preferences.keybindings.presets;
 
 import java.util.Map;
-
 import org.jabref.gui.keyboard.KeyBinding;
 
 public interface KeyBindingPreset {
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 c86f0647cc0..214671c00aa 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
@@ -2,7 +2,6 @@
 
 import java.util.HashMap;
 import java.util.Map;
-
 import org.jabref.gui.keyboard.KeyBinding;
 import org.jabref.logic.l10n.Localization;
 
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 83325c8e3f2..0ef99d6166b 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,7 @@
 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;
@@ -7,7 +9,6 @@
 import javafx.scene.control.ComboBox;
 import javafx.scene.control.RadioButton;
 import javafx.scene.control.TextField;
-
 import org.jabref.gui.Globals;
 import org.jabref.gui.actions.ActionFactory;
 import org.jabref.gui.actions.StandardActions;
@@ -18,32 +19,51 @@
 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 {
+
+    @FXML
+    private TextField mainFileDirectory;
+
+    @FXML
+    private RadioButton useMainFileDirectory;
+
+    @FXML
+    private RadioButton useBibLocationAsPrimary;
+
+    @FXML
+    private Button browseDirectory;
+
+    @FXML
+    private Button autolinkRegexHelp;
+
+    @FXML
+    private RadioButton autolinkFileStartsBibtex;
+
+    @FXML
+    private RadioButton autolinkFileExactBibtex;
+
+    @FXML
+    private RadioButton autolinkUseRegex;
 
-public class LinkedFilesTab extends AbstractPreferenceTabView<LinkedFilesTabViewModel> implements PreferencesTab {
+    @FXML
+    private TextField autolinkRegexKey;
 
-    @FXML private TextField mainFileDirectory;
-    @FXML private RadioButton useMainFileDirectory;
-    @FXML private RadioButton useBibLocationAsPrimary;
-    @FXML private Button browseDirectory;
-    @FXML private Button autolinkRegexHelp;
-    @FXML private RadioButton autolinkFileStartsBibtex;
-    @FXML private RadioButton autolinkFileExactBibtex;
-    @FXML private RadioButton autolinkUseRegex;
-    @FXML private TextField autolinkRegexKey;
+    @FXML
+    private CheckBox fulltextIndex;
 
-    @FXML private CheckBox fulltextIndex;
+    @FXML
+    private ComboBox<String> fileNamePattern;
 
-    @FXML private ComboBox<String> fileNamePattern;
-    @FXML private TextField fileDirectoryPattern;
+    @FXML
+    private TextField fileDirectoryPattern;
 
-    private final ControlsFxVisualizer validationVisualizer = new ControlsFxVisualizer();
+    private final ControlsFxVisualizer validationVisualizer =
+        new ControlsFxVisualizer();
 
     public LinkedFilesTab() {
-        ViewLoader.view(this)
-                  .root(this)
-                  .load();
+        ViewLoader.view(this).root(this).load();
     }
 
     @Override
@@ -52,29 +72,71 @@ public String getTabName() {
     }
 
     public void initialize() {
-        this.viewModel = new LinkedFilesTabViewModel(dialogService, preferencesService);
-
-        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());
-
-        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());
+        this.viewModel =
+            new LinkedFilesTabViewModel(dialogService, preferencesService);
+
+        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());
+
+        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());
 
         ActionFactory actionFactory = new ActionFactory(Globals.getKeyPrefs());
-        actionFactory.configureIconButton(StandardActions.HELP_REGEX_SEARCH, new HelpAction(HelpFile.REGEX_SEARCH, dialogService, preferencesService.getFilePreferences()), autolinkRegexHelp);
+        actionFactory.configureIconButton(
+            StandardActions.HELP_REGEX_SEARCH,
+            new HelpAction(
+                HelpFile.REGEX_SEARCH,
+                dialogService,
+                preferencesService.getFilePreferences()
+            ),
+            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 d020b267179..2088032e599 100644
--- a/src/main/java/org/jabref/gui/preferences/linkedfiles/LinkedFilesTabViewModel.java
+++ b/src/main/java/org/jabref/gui/preferences/linkedfiles/LinkedFilesTabViewModel.java
@@ -1,9 +1,12 @@
 package org.jabref.gui.preferences.linkedfiles;
 
+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;
-
 import javafx.beans.property.BooleanProperty;
 import javafx.beans.property.ListProperty;
 import javafx.beans.property.SimpleBooleanProperty;
@@ -11,7 +14,6 @@
 import javafx.beans.property.SimpleStringProperty;
 import javafx.beans.property.StringProperty;
 import javafx.collections.FXCollections;
-
 import org.jabref.gui.DialogService;
 import org.jabref.gui.preferences.PreferenceTabViewModel;
 import org.jabref.gui.util.DirectoryDialogConfiguration;
@@ -20,25 +22,33 @@
 import org.jabref.preferences.FilePreferences;
 import org.jabref.preferences.PreferencesService;
 
-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 LinkedFilesTabViewModel implements PreferenceTabViewModel {
 
-    private final StringProperty mainFileDirectoryProperty = new SimpleStringProperty("");
-    private final BooleanProperty useMainFileDirectoryProperty = new SimpleBooleanProperty();
-    private final BooleanProperty useBibLocationAsPrimaryProperty = new SimpleBooleanProperty();
-    private final BooleanProperty autolinkFileStartsBibtexProperty = new SimpleBooleanProperty();
-    private final BooleanProperty autolinkFileExactBibtexProperty = new SimpleBooleanProperty();
-    private final BooleanProperty autolinkUseRegexProperty = new SimpleBooleanProperty();
-    private final StringProperty autolinkRegexKeyProperty = new SimpleStringProperty("");
+    private final StringProperty mainFileDirectoryProperty =
+        new SimpleStringProperty("");
+    private final BooleanProperty useMainFileDirectoryProperty =
+        new SimpleBooleanProperty();
+    private final BooleanProperty useBibLocationAsPrimaryProperty =
+        new SimpleBooleanProperty();
+    private final BooleanProperty autolinkFileStartsBibtexProperty =
+        new SimpleBooleanProperty();
+    private final BooleanProperty autolinkFileExactBibtexProperty =
+        new SimpleBooleanProperty();
+    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();
+    private final StringProperty fileNamePatternProperty =
+        new SimpleStringProperty();
+    private final StringProperty fileDirectoryPatternProperty =
+        new SimpleStringProperty();
 
     private final Validator mainFileDirValidator;
 
@@ -46,16 +56,23 @@ public class LinkedFilesTabViewModel implements PreferenceTabViewModel {
     private final FilePreferences filePreferences;
     private final AutoLinkPreferences autoLinkPreferences;
 
-    public LinkedFilesTabViewModel(DialogService dialogService, PreferencesService preferences) {
+    public LinkedFilesTabViewModel(
+        DialogService dialogService,
+        PreferencesService preferences
+    ) {
         this.dialogService = dialogService;
         this.filePreferences = preferences.getFilePreferences();
         this.autoLinkPreferences = preferences.getAutoLinkPreferences();
 
-        mainFileDirValidator = new FunctionBasedValidator<>(
+        mainFileDirValidator =
+            new FunctionBasedValidator<>(
                 mainFileDirectoryProperty,
                 mainDirectoryPath -> {
                     ValidationMessage error = ValidationMessage.error(
-                            Localization.lang("Main file directory '%0' not found.\nCheck the tab \"Linked files\".", mainDirectoryPath)
+                        Localization.lang(
+                            "Main file directory '%0' not found.\nCheck the tab \"Linked files\".",
+                            mainDirectoryPath
+                        )
                     );
                     try {
                         Path path = Path.of(mainDirectoryPath);
@@ -68,18 +85,31 @@ public LinkedFilesTabViewModel(DialogService dialogService, PreferencesService p
                     // 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());
-        useMainFileDirectoryProperty.setValue(!filePreferences.shouldStoreFilesRelativeToBibFile());
-        useBibLocationAsPrimaryProperty.setValue(filePreferences.shouldStoreFilesRelativeToBibFile());
-        fulltextIndex.setValue(filePreferences.shouldFulltextIndexLinkedFiles());
+        mainFileDirectoryProperty.setValue(
+            filePreferences
+                .getMainFileDirectory()
+                .orElse(Path.of(""))
+                .toString()
+        );
+        useMainFileDirectoryProperty.setValue(
+            !filePreferences.shouldStoreFilesRelativeToBibFile()
+        );
+        useBibLocationAsPrimaryProperty.setValue(
+            filePreferences.shouldStoreFilesRelativeToBibFile()
+        );
+        fulltextIndex.setValue(
+            filePreferences.shouldFulltextIndexLinkedFiles()
+        );
         fileNamePatternProperty.setValue(filePreferences.getFileNamePattern());
-        fileDirectoryPatternProperty.setValue(filePreferences.getFileDirectoryPattern());
+        fileDirectoryPatternProperty.setValue(
+            filePreferences.getFileDirectoryPattern()
+        );
 
         // Autolink preferences
         switch (autoLinkPreferences.getCitationKeyDependency()) {
@@ -88,28 +118,44 @@ public void setValues() {
             case REGEX -> autolinkUseRegexProperty.setValue(true);
         }
 
-        autolinkRegexKeyProperty.setValue(autoLinkPreferences.getRegularExpression());
+        autolinkRegexKeyProperty.setValue(
+            autoLinkPreferences.getRegularExpression()
+        );
     }
 
     @Override
     public void storeSettings() {
         // External files preferences / Attached files preferences / File preferences
-        filePreferences.setMainFileDirectory(mainFileDirectoryProperty.getValue());
-        filePreferences.setStoreFilesRelativeToBibFile(useBibLocationAsPrimaryProperty.getValue());
+        filePreferences.setMainFileDirectory(
+            mainFileDirectoryProperty.getValue()
+        );
+        filePreferences.setStoreFilesRelativeToBibFile(
+            useBibLocationAsPrimaryProperty.getValue()
+        );
         filePreferences.setFileNamePattern(fileNamePatternProperty.getValue());
-        filePreferences.setFileDirectoryPattern(fileDirectoryPatternProperty.getValue());
+        filePreferences.setFileDirectoryPattern(
+            fileDirectoryPatternProperty.getValue()
+        );
         filePreferences.setFulltextIndexLinkedFiles(fulltextIndex.getValue());
 
         // 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());
+        autoLinkPreferences.setRegularExpression(
+            autolinkRegexKeyProperty.getValue()
+        );
     }
 
     ValidationStatus mainFileDirValidationStatus() {
@@ -119,9 +165,14 @@ ValidationStatus mainFileDirValidationStatus() {
     @Override
     public boolean validateSettings() {
         ValidationStatus validationStatus = mainFileDirValidationStatus();
-        if (!validationStatus.isValid() && useMainFileDirectoryProperty().get()) {
-            validationStatus.getHighestMessage().ifPresent(message ->
-                    dialogService.showErrorDialogAndWait(message.getMessage()));
+        if (
+            !validationStatus.isValid() && useMainFileDirectoryProperty().get()
+        ) {
+            validationStatus
+                .getHighestMessage()
+                .ifPresent(message ->
+                    dialogService.showErrorDialogAndWait(message.getMessage())
+                );
             return false;
         }
         return true;
@@ -129,9 +180,14 @@ 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
@@ -179,4 +235,3 @@ public BooleanProperty useMainFileDirectoryProperty() {
         return useMainFileDirectoryProperty;
     }
 }
-
diff --git a/src/main/java/org/jabref/gui/preferences/nameformatter/NameFormatterItemModel.java b/src/main/java/org/jabref/gui/preferences/nameformatter/NameFormatterItemModel.java
index 91a3761b8e2..81f1253ea97 100644
--- a/src/main/java/org/jabref/gui/preferences/nameformatter/NameFormatterItemModel.java
+++ b/src/main/java/org/jabref/gui/preferences/nameformatter/NameFormatterItemModel.java
@@ -2,10 +2,10 @@
 
 import javafx.beans.property.SimpleStringProperty;
 import javafx.beans.property.StringProperty;
-
 import org.jabref.logic.layout.format.NameFormatter;
 
 public class NameFormatterItemModel {
+
     private final StringProperty name = new SimpleStringProperty("");
     private final StringProperty format = new SimpleStringProperty("");
 
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 932678f7cfa..d741d0e50ae 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,6 @@
 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;
@@ -8,7 +9,6 @@
 import javafx.scene.control.cell.TextFieldTableCell;
 import javafx.scene.input.KeyCode;
 import javafx.scene.input.KeyEvent;
-
 import org.jabref.gui.Globals;
 import org.jabref.gui.actions.ActionFactory;
 import org.jabref.gui.actions.StandardActions;
@@ -20,22 +20,33 @@
 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 {
+
+    @FXML
+    private TableView<NameFormatterItemModel> formatterList;
+
+    @FXML
+    private TableColumn<NameFormatterItemModel, String> formatterNameColumn;
+
+    @FXML
+    private TableColumn<NameFormatterItemModel, String> formatterStringColumn;
+
+    @FXML
+    private TableColumn<NameFormatterItemModel, String> actionsColumn;
+
+    @FXML
+    private TextField addFormatterName;
 
-public class NameFormatterTab extends AbstractPreferenceTabView<NameFormatterTabViewModel> implements PreferencesTab {
+    @FXML
+    private TextField addFormatterString;
 
-    @FXML private TableView<NameFormatterItemModel> formatterList;
-    @FXML private TableColumn<NameFormatterItemModel, String> formatterNameColumn;
-    @FXML private TableColumn<NameFormatterItemModel, String> formatterStringColumn;
-    @FXML private TableColumn<NameFormatterItemModel, String> actionsColumn;
-    @FXML private TextField addFormatterName;
-    @FXML private TextField addFormatterString;
-    @FXML private Button formatterHelp;
+    @FXML
+    private Button formatterHelp;
 
     public NameFormatterTab() {
-        ViewLoader.view(this)
-                  .root(this)
-                  .load();
+        ViewLoader.view(this).root(this).load();
     }
 
     @Override
@@ -44,66 +55,122 @@ public String getTabName() {
     }
 
     public void initialize() {
-        this.viewModel = new NameFormatterTabViewModel(preferencesService.getNameFormatterPreferences());
+        this.viewModel =
+            new NameFormatterTabViewModel(
+                preferencesService.getNameFormatterPreferences()
+            );
 
         formatterNameColumn.setSortable(true);
         formatterNameColumn.setReorderable(false);
-        formatterNameColumn.setCellValueFactory(cellData -> cellData.getValue().nameProperty());
+        formatterNameColumn.setCellValueFactory(cellData ->
+            cellData.getValue().nameProperty()
+        );
         formatterNameColumn.setCellFactory(TextFieldTableCell.forTableColumn());
         formatterNameColumn.setEditable(true);
         formatterNameColumn.setOnEditCommit(
-                (TableColumn.CellEditEvent<NameFormatterItemModel, String> event) ->
-                        event.getRowValue().setName(event.getNewValue()));
+                (
+                    TableColumn.CellEditEvent<
+                        NameFormatterItemModel,
+                        String
+                    > event
+                ) ->
+            event.getRowValue().setName(event.getNewValue())
+        );
 
         formatterStringColumn.setSortable(true);
         formatterStringColumn.setReorderable(false);
-        formatterStringColumn.setCellValueFactory(cellData -> cellData.getValue().formatProperty());
-        formatterStringColumn.setCellFactory(TextFieldTableCell.forTableColumn());
+        formatterStringColumn.setCellValueFactory(cellData ->
+            cellData.getValue().formatProperty()
+        );
+        formatterStringColumn.setCellFactory(
+            TextFieldTableCell.forTableColumn()
+        );
         formatterStringColumn.setEditable(true);
         formatterStringColumn.setOnEditCommit(
-                (TableColumn.CellEditEvent<NameFormatterItemModel, String> event) ->
-                        event.getRowValue().setFormat(event.getNewValue()));
+                (
+                    TableColumn.CellEditEvent<
+                        NameFormatterItemModel,
+                        String
+                    > event
+                ) ->
+            event.getRowValue().setFormat(event.getNewValue())
+        );
 
         actionsColumn.setSortable(false);
         actionsColumn.setReorderable(false);
-        actionsColumn.setCellValueFactory(cellData -> cellData.getValue().nameProperty());
+        actionsColumn.setCellValueFactory(cellData ->
+            cellData.getValue().nameProperty()
+        );
         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()))
-                .install(actionsColumn);
-
-        formatterList.addEventFilter(KeyEvent.KEY_PRESSED, event -> {
-            if (event.getCode() == KeyCode.DELETE) {
-                viewModel.removeFormatter(formatterList.getSelectionModel().getSelectedItem());
-                event.consume();
+            .withGraphic(name ->
+                IconTheme.JabRefIcons.DELETE_ENTRY.getGraphicNode()
+            )
+            .withTooltip(name ->
+                Localization.lang("Remove formatter '%0'", name)
+            )
+            .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.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();
+        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();
+                }
             }
-        });
-
-        addFormatterString.textProperty().bindBidirectional(viewModel.addFormatterStringProperty());
-        addFormatterString.addEventFilter(KeyEvent.KEY_PRESSED, event -> {
-            if (event.getCode() == KeyCode.ENTER) {
-                viewModel.addFormatter();
-                addFormatterName.requestFocus();
-                event.consume();
+        );
+
+        addFormatterString
+            .textProperty()
+            .bindBidirectional(viewModel.addFormatterStringProperty());
+        addFormatterString.addEventFilter(
+            KeyEvent.KEY_PRESSED,
+            event -> {
+                if (event.getCode() == KeyCode.ENTER) {
+                    viewModel.addFormatter();
+                    addFormatterName.requestFocus();
+                    event.consume();
+                }
             }
-        });
+        );
 
         ActionFactory actionFactory = new ActionFactory(Globals.getKeyPrefs());
-        actionFactory.configureIconButton(StandardActions.HELP_NAME_FORMATTER, new HelpAction(HelpFile.CUSTOM_EXPORTS_NAME_FORMATTER, dialogService, preferencesService.getFilePreferences()), formatterHelp);
+        actionFactory.configureIconButton(
+            StandardActions.HELP_NAME_FORMATTER,
+            new HelpAction(
+                HelpFile.CUSTOM_EXPORTS_NAME_FORMATTER,
+                dialogService,
+                preferencesService.getFilePreferences()
+            ),
+            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 4efae9eea8e..53b5bfb58fa 100644
--- a/src/main/java/org/jabref/gui/preferences/nameformatter/NameFormatterTabViewModel.java
+++ b/src/main/java/org/jabref/gui/preferences/nameformatter/NameFormatterTabViewModel.java
@@ -2,22 +2,23 @@
 
 import java.util.ArrayList;
 import java.util.List;
-
 import javafx.beans.property.ListProperty;
 import javafx.beans.property.SimpleListProperty;
 import javafx.beans.property.SimpleStringProperty;
 import javafx.beans.property.StringProperty;
 import javafx.collections.FXCollections;
-
 import org.jabref.gui.preferences.PreferenceTabViewModel;
 import org.jabref.logic.layout.format.NameFormatterPreferences;
 import org.jabref.model.strings.StringUtil;
 
 public class NameFormatterTabViewModel implements PreferenceTabViewModel {
 
-    private final ListProperty<NameFormatterItemModel> formatterListProperty = new SimpleListProperty<>(FXCollections.observableArrayList());
-    private final StringProperty addFormatterNameProperty = new SimpleStringProperty();
-    private final StringProperty addFormatterStringProperty = new SimpleStringProperty();
+    private final ListProperty<NameFormatterItemModel> formatterListProperty =
+        new SimpleListProperty<>(FXCollections.observableArrayList());
+    private final StringProperty addFormatterNameProperty =
+        new SimpleStringProperty();
+    private final StringProperty addFormatterStringProperty =
+        new SimpleStringProperty();
 
     private final NameFormatterPreferences nameFormatterPreferences;
 
@@ -33,16 +34,22 @@ public void setValues() {
 
         for (int i = 0; i < names.size(); i++) {
             if (i < formats.size()) {
-                formatterListProperty.add(new NameFormatterItemModel(names.get(i), formats.get(i)));
+                formatterListProperty.add(
+                    new NameFormatterItemModel(names.get(i), formats.get(i))
+                );
             } else {
-                formatterListProperty.add(new NameFormatterItemModel(names.get(i)));
+                formatterListProperty.add(
+                    new NameFormatterItemModel(names.get(i))
+                );
             }
         }
     }
 
     @Override
     public void storeSettings() {
-        formatterListProperty.removeIf(formatter -> formatter.getName().isEmpty());
+        formatterListProperty.removeIf(formatter ->
+            formatter.getName().isEmpty()
+        );
 
         List<String> names = new ArrayList<>(formatterListProperty.size());
         List<String> formats = new ArrayList<>(formatterListProperty.size());
@@ -56,10 +63,16 @@ 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 48844b9056f..90419bfea7f 100644
--- a/src/main/java/org/jabref/gui/preferences/network/CustomCertificateViewModel.java
+++ b/src/main/java/org/jabref/gui/preferences/network/CustomCertificateViewModel.java
@@ -2,28 +2,41 @@
 
 import java.time.LocalDate;
 import java.util.Optional;
-
 import javafx.beans.property.ObjectProperty;
 import javafx.beans.property.ReadOnlyObjectProperty;
 import javafx.beans.property.ReadOnlyStringProperty;
 import javafx.beans.property.SimpleObjectProperty;
 import javafx.beans.property.SimpleStringProperty;
 import javafx.beans.property.StringProperty;
-
 import org.jabref.gui.AbstractViewModel;
 import org.jabref.logic.net.ssl.SSLCertificate;
 
 public class CustomCertificateViewModel extends AbstractViewModel {
-    private final StringProperty serialNumberProperty = new SimpleStringProperty("");
+
+    private final StringProperty serialNumberProperty =
+        new SimpleStringProperty("");
     private final StringProperty issuerProperty = new SimpleStringProperty("");
-    private final ObjectProperty<LocalDate> validFromProperty = new SimpleObjectProperty<>();
-    private final ObjectProperty<LocalDate> validToProperty = new SimpleObjectProperty<>();
-    private final StringProperty signatureAlgorithmProperty = new SimpleStringProperty("");
+    private final ObjectProperty<LocalDate> validFromProperty =
+        new SimpleObjectProperty<>();
+    private final ObjectProperty<LocalDate> validToProperty =
+        new SimpleObjectProperty<>();
+    private final StringProperty signatureAlgorithmProperty =
+        new SimpleStringProperty("");
     private final StringProperty versionProperty = new SimpleStringProperty("");
-    private final StringProperty thumbprintProperty = new SimpleStringProperty("");
+    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);
@@ -78,7 +91,9 @@ public StringProperty pathPropertyProperty() {
     }
 
     public Optional<String> getPath() {
-        if (pathProperty.getValue() == null || pathProperty.getValue().isEmpty()) {
+        if (
+            pathProperty.getValue() == null || pathProperty.getValue().isEmpty()
+        ) {
             return Optional.empty();
         } else {
             return Optional.of(pathProperty.getValue());
@@ -102,14 +117,17 @@ public String getSignatureAlgorithm() {
         return signatureAlgorithmProperty.getValue();
     }
 
-    public static CustomCertificateViewModel fromSSLCertificate(SSLCertificate sslCertificate) {
+    public static CustomCertificateViewModel fromSSLCertificate(
+        SSLCertificate sslCertificate
+    ) {
         return new CustomCertificateViewModel(
-                sslCertificate.getSHA256Thumbprint(),
-                sslCertificate.getSerialNumber(),
-                sslCertificate.getIssuer(),
-                sslCertificate.getValidFrom(),
-                sslCertificate.getValidTo(),
-                sslCertificate.getSignatureAlgorithm(),
-                sslCertificate.getVersion().toString());
+            sslCertificate.getSHA256Thumbprint(),
+            sslCertificate.getSerialNumber(),
+            sslCertificate.getIssuer(),
+            sslCertificate.getValidFrom(),
+            sslCertificate.getValidTo(),
+            sslCertificate.getSignatureAlgorithm(),
+            sslCertificate.getVersion().toString()
+        );
     }
 }
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 2b1294f01a0..fc5283dca24 100644
--- a/src/main/java/org/jabref/gui/preferences/network/NetworkTab.java
+++ b/src/main/java/org/jabref/gui/preferences/network/NetworkTab.java
@@ -1,8 +1,10 @@
 package org.jabref.gui.preferences.network;
 
+import com.airhacks.afterburner.views.ViewLoader;
+import com.tobiasdiez.easybind.EasyBind;
+import de.saxsys.mvvmfx.utils.validation.visualization.ControlsFxVisualizer;
 import java.time.LocalDate;
 import java.time.format.DateTimeFormatter;
-
 import javafx.application.Platform;
 import javafx.beans.binding.BooleanBinding;
 import javafx.beans.property.SimpleStringProperty;
@@ -16,7 +18,7 @@
 import javafx.scene.control.TextField;
 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,45 +26,87 @@
 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;
+public class NetworkTab
+    extends AbstractPreferenceTabView<NetworkTabViewModel>
+    implements PreferencesTab {
+
+    @FXML
+    private CheckBox versionCheck;
+
+    @FXML
+    private CheckBox proxyUse;
 
-public class NetworkTab extends AbstractPreferenceTabView<NetworkTabViewModel> implements PreferencesTab {
-    @FXML private CheckBox versionCheck;
-    @FXML private CheckBox proxyUse;
-    @FXML private Label proxyHostnameLabel;
-    @FXML private TextField proxyHostname;
-    @FXML private Label proxyPortLabel;
-    @FXML private TextField proxyPort;
-    @FXML private CheckBox proxyUseAuthentication;
-    @FXML private Label proxyUsernameLabel;
-    @FXML private TextField proxyUsername;
-    @FXML private Label proxyPasswordLabel;
-    @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 TableView<CustomCertificateViewModel> customCertificatesTable;
-    @FXML private TableColumn<CustomCertificateViewModel, String> certIssuer;
-    @FXML private TableColumn<CustomCertificateViewModel, String> certSerialNumber;
-    @FXML private TableColumn<CustomCertificateViewModel, String> certSignatureAlgorithm;
-    @FXML private TableColumn<CustomCertificateViewModel, String> certValidFrom;
-    @FXML private TableColumn<CustomCertificateViewModel, String> certValidTo;
-    @FXML private TableColumn<CustomCertificateViewModel, String> certVersion;
-    @FXML private TableColumn<CustomCertificateViewModel, String> actionsColumn;
+    @FXML
+    private Label proxyHostnameLabel;
+
+    @FXML
+    private TextField proxyHostname;
+
+    @FXML
+    private Label proxyPortLabel;
+
+    @FXML
+    private TextField proxyPort;
+
+    @FXML
+    private CheckBox proxyUseAuthentication;
+
+    @FXML
+    private Label proxyUsernameLabel;
+
+    @FXML
+    private TextField proxyUsername;
+
+    @FXML
+    private Label proxyPasswordLabel;
+
+    @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 TableView<CustomCertificateViewModel> customCertificatesTable;
+
+    @FXML
+    private TableColumn<CustomCertificateViewModel, String> certIssuer;
+
+    @FXML
+    private TableColumn<CustomCertificateViewModel, String> certSerialNumber;
+
+    @FXML
+    private TableColumn<
+        CustomCertificateViewModel,
+        String
+    > certSignatureAlgorithm;
+
+    @FXML
+    private TableColumn<CustomCertificateViewModel, String> certValidFrom;
+
+    @FXML
+    private TableColumn<CustomCertificateViewModel, String> certValidTo;
+
+    @FXML
+    private TableColumn<CustomCertificateViewModel, String> certVersion;
+
+    @FXML
+    private TableColumn<CustomCertificateViewModel, String> actionsColumn;
 
     private String proxyPasswordText = "";
     private int proxyPasswordCaretPosition = 0;
 
-    private final ControlsFxVisualizer validationVisualizer = new ControlsFxVisualizer();
+    private final ControlsFxVisualizer validationVisualizer =
+        new ControlsFxVisualizer();
 
     public NetworkTab() {
-        ViewLoader.view(this)
-                  .root(this)
-                  .load();
+        ViewLoader.view(this).root(this).load();
     }
 
     @Override
@@ -71,67 +115,161 @@ public String getTabName() {
     }
 
     public void initialize() {
-        this.viewModel = new NetworkTabViewModel(dialogService, preferencesService);
+        this.viewModel =
+            new NetworkTabViewModel(dialogService, preferencesService);
 
-        versionCheck.selectedProperty().bindBidirectional(viewModel.versionCheckProperty());
+        versionCheck
+            .selectedProperty()
+            .bindBidirectional(viewModel.versionCheckProperty());
 
-        proxyUse.selectedProperty().bindBidirectional(viewModel.proxyUseProperty());
-        proxyHostnameLabel.disableProperty().bind(proxyUse.selectedProperty().not());
-        proxyHostname.textProperty().bindBidirectional(viewModel.proxyHostnameProperty());
+        proxyUse
+            .selectedProperty()
+            .bindBidirectional(viewModel.proxyUseProperty());
+        proxyHostnameLabel
+            .disableProperty()
+            .bind(proxyUse.selectedProperty().not());
+        proxyHostname
+            .textProperty()
+            .bindBidirectional(viewModel.proxyHostnameProperty());
         proxyHostname.disableProperty().bind(proxyUse.selectedProperty().not());
-        proxyPortLabel.disableProperty().bind(proxyUse.selectedProperty().not());
-        proxyPort.textProperty().bindBidirectional(viewModel.proxyPortProperty());
+        proxyPortLabel
+            .disableProperty()
+            .bind(proxyUse.selectedProperty().not());
+        proxyPort
+            .textProperty()
+            .bindBidirectional(viewModel.proxyPortProperty());
         proxyPort.disableProperty().bind(proxyUse.selectedProperty().not());
-        proxyUseAuthentication.selectedProperty().bindBidirectional(viewModel.proxyUseAuthenticationProperty());
-        proxyUseAuthentication.disableProperty().bind(proxyUse.selectedProperty().not());
-
-        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);
+        proxyUseAuthentication
+            .selectedProperty()
+            .bindBidirectional(viewModel.proxyUseAuthenticationProperty());
+        proxyUseAuthentication
+            .disableProperty()
+            .bind(proxyUse.selectedProperty().not());
+
+        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);
+                }
             }
-        });
+        );
 
-        proxyPassword.setRight(IconTheme.JabRefIcons.PASSWORD_REVEALED.getGraphicNode());
-        proxyPassword.getRight().addEventFilter(MouseEvent.MOUSE_PRESSED, this::proxyPasswordReveal);
-        proxyPassword.getRight().addEventFilter(MouseEvent.MOUSE_RELEASED, this::proxyPasswordMask);
-        proxyPassword.getRight().addEventFilter(MouseEvent.MOUSE_EXITED, this::proxyPasswordMask);
+        proxyPassword.setRight(
+            IconTheme.JabRefIcons.PASSWORD_REVEALED.getGraphicNode()
+        );
+        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);
+            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));
+        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)
+        );
 
-        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());
+        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)))
-                .install(actionsColumn);
+            .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)
+                        )
+            )
+            .install(actionsColumn);
     }
 
     private String formatDate(LocalDate localDate) {
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 9b5d646c7c6..847530a93de 100644
--- a/src/main/java/org/jabref/gui/preferences/network/NetworkTabViewModel.java
+++ b/src/main/java/org/jabref/gui/preferences/network/NetworkTabViewModel.java
@@ -1,12 +1,16 @@
 package org.jabref.gui.preferences.network;
 
+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.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 javafx.beans.property.BooleanProperty;
 import javafx.beans.property.ListProperty;
 import javafx.beans.property.ReadOnlyBooleanProperty;
@@ -17,7 +21,7 @@
 import javafx.collections.FXCollections;
 import javafx.collections.ListChangeListener;
 import javafx.stage.FileChooser;
-
+import kong.unirest.UnirestException;
 import org.jabref.gui.DialogService;
 import org.jabref.gui.preferences.PreferenceTabViewModel;
 import org.jabref.gui.util.FileDialogConfiguration;
@@ -33,24 +37,32 @@
 import org.jabref.preferences.InternalPreferences;
 import org.jabref.preferences.PreferencesService;
 
-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.UnirestException;
-
 public class NetworkTabViewModel implements PreferenceTabViewModel {
-    private final BooleanProperty versionCheckProperty = new SimpleBooleanProperty();
-    private final BooleanProperty proxyUseProperty = new SimpleBooleanProperty();
-    private final StringProperty proxyHostnameProperty = new SimpleStringProperty("");
-    private final StringProperty proxyPortProperty = new SimpleStringProperty("");
-    private final BooleanProperty proxyUseAuthenticationProperty = new SimpleBooleanProperty();
-    private final StringProperty proxyUsernameProperty = new SimpleStringProperty("");
-    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 BooleanProperty versionCheckProperty =
+        new SimpleBooleanProperty();
+    private final BooleanProperty proxyUseProperty =
+        new SimpleBooleanProperty();
+    private final StringProperty proxyHostnameProperty =
+        new SimpleStringProperty("");
+    private final StringProperty proxyPortProperty = new SimpleStringProperty(
+        ""
+    );
+    private final BooleanProperty proxyUseAuthenticationProperty =
+        new SimpleBooleanProperty();
+    private final StringProperty proxyUsernameProperty =
+        new SimpleStringProperty("");
+    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 Validator proxyHostnameValidator;
     private final Validator proxyPortValidator;
@@ -60,69 +72,103 @@ public class NetworkTabViewModel implements PreferenceTabViewModel {
     private final DialogService dialogService;
     private final PreferencesService preferences;
 
-
     private final ProxyPreferences proxyPreferences;
     private final ProxyPreferences backupProxyPreferences;
     private final InternalPreferences internalPreferences;
 
     private final TrustStoreManager trustStoreManager;
 
-    private final AtomicBoolean sslCertificatesChanged = new AtomicBoolean(false);
+    private final AtomicBoolean sslCertificatesChanged = new AtomicBoolean(
+        false
+    );
 
-    public NetworkTabViewModel(DialogService dialogService,
-                               PreferencesService preferences) {
+    public NetworkTabViewModel(
+        DialogService dialogService,
+        PreferencesService preferences
+    ) {
         this.dialogService = dialogService;
         this.preferences = preferences;
         this.proxyPreferences = preferences.getProxyPreferences();
         this.internalPreferences = preferences.getInternalPreferences();
 
-        backupProxyPreferences = new ProxyPreferences(
+        backupProxyPreferences =
+            new ProxyPreferences(
                 proxyPreferences.shouldUseProxy(),
                 proxyPreferences.getHostname(),
                 proxyPreferences.getPort(),
                 proxyPreferences.shouldUseAuthentication(),
                 proxyPreferences.getUsername(),
                 proxyPreferences.getPassword(),
-                proxyPreferences.shouldPersistPassword());
+                proxyPreferences.shouldPersistPassword()
+            );
 
-        proxyHostnameValidator = new FunctionBasedValidator<>(
+        proxyHostnameValidator =
+            new FunctionBasedValidator<>(
                 proxyHostnameProperty,
                 input -> !StringUtil.isNullOrEmpty(input),
-                ValidationMessage.error(String.format("%s > %s %n %n %s",
+                ValidationMessage.error(
+                    String.format(
+                        "%s > %s %n %n %s",
                         Localization.lang("Network"),
                         Localization.lang("Proxy configuration"),
-                        Localization.lang("Please specify a hostname"))));
+                        Localization.lang("Please specify a hostname")
+                    )
+                )
+            );
 
-        proxyPortValidator = new FunctionBasedValidator<>(
+        proxyPortValidator =
+            new FunctionBasedValidator<>(
                 proxyPortProperty,
                 input -> getPortAsInt(input).isPresent(),
-                ValidationMessage.error(String.format("%s > %s %n %n %s",
+                ValidationMessage.error(
+                    String.format(
+                        "%s > %s %n %n %s",
                         Localization.lang("Network"),
                         Localization.lang("Proxy configuration"),
-                        Localization.lang("Please specify a port"))));
+                        Localization.lang("Please specify a port")
+                    )
+                )
+            );
 
-        proxyUsernameValidator = new FunctionBasedValidator<>(
+        proxyUsernameValidator =
+            new FunctionBasedValidator<>(
                 proxyUsernameProperty,
                 input -> !StringUtil.isNullOrEmpty(input),
-                ValidationMessage.error(String.format("%s > %s %n %n %s",
+                ValidationMessage.error(
+                    String.format(
+                        "%s > %s %n %n %s",
                         Localization.lang("Network"),
                         Localization.lang("Proxy configuration"),
-                        Localization.lang("Please specify a username"))));
+                        Localization.lang("Please specify a username")
+                    )
+                )
+            );
 
-        proxyPasswordValidator = new FunctionBasedValidator<>(
+        proxyPasswordValidator =
+            new FunctionBasedValidator<>(
                 proxyPasswordProperty,
                 input -> !input.isBlank(),
-                ValidationMessage.error(String.format("%s > %s %n %n %s",
+                ValidationMessage.error(
+                    String.format(
+                        "%s > %s %n %n %s",
                         Localization.lang("Network"),
                         Localization.lang("Proxy configuration"),
-                        Localization.lang("Please specify a password"))));
-
-        this.trustStoreManager = new TrustStoreManager(Path.of(preferences.getSSLPreferences().getTruststorePath()));
+                        Localization.lang("Please specify a password")
+                    )
+                )
+            );
+
+        this.trustStoreManager =
+            new TrustStoreManager(
+                Path.of(preferences.getSSLPreferences().getTruststorePath())
+            );
     }
 
     @Override
     public void setValues() {
-        versionCheckProperty.setValue(internalPreferences.isVersionCheckEnabled());
+        versionCheckProperty.setValue(
+            internalPreferences.isVersionCheckEnabled()
+        );
 
         setProxyValues();
         setSSLValues();
@@ -132,29 +178,55 @@ private void setProxyValues() {
         proxyUseProperty.setValue(proxyPreferences.shouldUseProxy());
         proxyHostnameProperty.setValue(proxyPreferences.getHostname());
         proxyPortProperty.setValue(proxyPreferences.getPort());
-        proxyUseAuthenticationProperty.setValue(proxyPreferences.shouldUseAuthentication());
+        proxyUseAuthenticationProperty.setValue(
+            proxyPreferences.shouldUseAuthentication()
+        );
         proxyUsernameProperty.setValue(proxyPreferences.getUsername());
         proxyPasswordProperty.setValue(proxyPreferences.getPassword());
-        proxyPersistPasswordProperty.setValue(proxyPreferences.shouldPersistPassword());
+        proxyPersistPasswordProperty.setValue(
+            proxyPreferences.shouldPersistPassword()
+        );
         passwordPersistAvailable.setValue(OS.isKeyringAvailable());
     }
 
     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().get(0);
-                    certificate.getPath().ifPresent(path -> trustStoreManager
-                            .addCertificate(formatCustomAlias(certificate.getThumbprint()), Path.of(path)));
-                } else if (c.wasRemoved()) {
-                    CustomCertificateViewModel certificate = c.getRemoved().get(0);
-                    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()
+                            .get(0);
+                        certificate
+                            .getPath()
+                            .ifPresent(path ->
+                                trustStoreManager.addCertificate(
+                                    formatCustomAlias(
+                                        certificate.getThumbprint()
+                                    ),
+                                    Path.of(path)
+                                )
+                            );
+                    } else if (c.wasRemoved()) {
+                        CustomCertificateViewModel certificate = c
+                            .getRemoved()
+                            .get(0);
+                        trustStoreManager.deleteCertificate(
+                            formatCustomAlias(certificate.getThumbprint())
+                        );
+                    }
                 }
             }
-        });
+        );
     }
 
     @Override
@@ -162,9 +234,13 @@ public void storeSettings() {
         proxyPreferences.setUseProxy(proxyUseProperty.getValue());
         proxyPreferences.setHostname(proxyHostnameProperty.getValue().trim());
         proxyPreferences.setPort(proxyPortProperty.getValue().trim());
-        proxyPreferences.setUseAuthentication(proxyUseAuthenticationProperty.getValue());
+        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);
 
@@ -211,8 +287,11 @@ 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;
@@ -222,13 +301,18 @@ public boolean validateSettings() {
      * Check the connection by using the given url. Used for validating the http proxy. The checking result will be appear when request finished. The checking result could be either success or fail, if fail, the cause will be displayed.
      */
     public void checkConnection() {
-        final String connectionSuccessText = Localization.lang("Connection successful!");
-        final String connectionFailedText = Localization.lang("Connection failed!");
+        final String connectionSuccessText = Localization.lang(
+            "Connection successful!"
+        );
+        final String connectionFailedText = Localization.lang(
+            "Connection failed!"
+        );
         final String dialogTitle = Localization.lang("Check Proxy Setting");
 
         final String testUrl = "http://jabref.org";
 
-        ProxyRegisterer.register(new ProxyPreferences(
+        ProxyRegisterer.register(
+            new ProxyPreferences(
                 proxyUseProperty.getValue(),
                 proxyHostnameProperty.getValue().trim(),
                 proxyPortProperty.getValue().trim(),
@@ -236,20 +320,30 @@ public void checkConnection() {
                 proxyUsernameProperty.getValue().trim(),
                 proxyPasswordProperty.getValue(),
                 proxyPersistPasswordProperty.getValue()
-        ));
+            )
+        );
 
         URLDownload urlDownload;
         try {
             urlDownload = new URLDownload(testUrl);
             if (urlDownload.canBeReached()) {
-                dialogService.showInformationDialogAndWait(dialogTitle, connectionSuccessText);
+                dialogService.showInformationDialogAndWait(
+                    dialogTitle,
+                    connectionSuccessText
+                );
             } else {
-                dialogService.showErrorDialogAndWait(dialogTitle, connectionFailedText);
+                dialogService.showErrorDialogAndWait(
+                    dialogTitle,
+                    connectionFailedText
+                );
             }
         } catch (MalformedURLException e) {
             // Why would that happen? Because one of developers inserted a failing url in testUrl...
         } catch (UnirestException e) {
-            dialogService.showErrorDialogAndWait(dialogTitle, connectionFailedText);
+            dialogService.showErrorDialogAndWait(
+                dialogTitle,
+                connectionFailedText
+            );
         }
 
         ProxyRegisterer.register(backupProxyPreferences);
@@ -300,25 +394,61 @@ public ReadOnlyBooleanProperty passwordPersistAvailable() {
         return passwordPersistAvailable;
     }
 
-    public ListProperty<CustomCertificateViewModel> customCertificateListProperty() {
+    public ListProperty<
+        CustomCertificateViewModel
+    > customCertificateListProperty() {
         return 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())
+        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"));
-            }
-        }));
+        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 90d6aa1f7ef..c1cd365ea7b 100644
--- a/src/main/java/org/jabref/gui/preferences/preview/PreviewTab.java
+++ b/src/main/java/org/jabref/gui/preferences/preview/PreviewTab.java
@@ -1,8 +1,11 @@
 package org.jabref.gui.preferences.preview;
 
+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.ArrayList;
 import java.util.List;
-
 import javafx.application.Platform;
 import javafx.beans.property.ListProperty;
 import javafx.fxml.FXML;
@@ -18,7 +21,9 @@
 import javafx.scene.input.KeyEvent;
 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.Globals;
 import org.jabref.gui.StateManager;
 import org.jabref.gui.actions.ActionFactory;
@@ -37,43 +42,62 @@
 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;
+public class PreviewTab
+    extends AbstractPreferenceTabView<PreviewTabViewModel>
+    implements PreferencesTab {
+
+    @FXML
+    private CheckBox showAsTabCheckBox;
+
+    @FXML
+    private ListView<PreviewLayout> availableListView;
+
+    @FXML
+    private ListView<PreviewLayout> chosenListView;
+
+    @FXML
+    private Button toRightButton;
+
+    @FXML
+    private Button toLeftButton;
+
+    @FXML
+    private Button sortUpButton;
+
+    @FXML
+    private Button sortDownButton;
+
+    @FXML
+    private Label readOnlyLabel;
+
+    @FXML
+    private Button resetDefaultButton;
 
-public class PreviewTab extends AbstractPreferenceTabView<PreviewTabViewModel> implements PreferencesTab {
+    @FXML
+    private Tab previewTab;
 
-    @FXML private CheckBox showAsTabCheckBox;
-    @FXML private ListView<PreviewLayout> availableListView;
-    @FXML private ListView<PreviewLayout> chosenListView;
-    @FXML private Button toRightButton;
-    @FXML private Button toLeftButton;
-    @FXML private Button sortUpButton;
-    @FXML private Button sortDownButton;
-    @FXML private Label readOnlyLabel;
-    @FXML private Button resetDefaultButton;
-    @FXML private Tab previewTab;
-    @FXML private CodeArea editArea;
-    @FXML private CustomTextField searchBox;
+    @FXML
+    private CodeArea editArea;
 
-    @Inject private StateManager stateManager;
-    @Inject private ThemeManager themeManager;
+    @FXML
+    private CustomTextField searchBox;
+
+    @Inject
+    private StateManager stateManager;
+
+    @Inject
+    private ThemeManager themeManager;
 
     private final ContextMenu contextMenu = new ContextMenu();
 
     private long lastKeyPressTime;
     private String listSearchTerm;
 
-    private final ControlsFxVisualizer validationVisualizer = new ControlsFxVisualizer();
+    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 {
@@ -104,99 +128,251 @@ public String getTabName() {
     }
 
     public void initialize() {
-        this.viewModel = new PreviewTabViewModel(dialogService, preferencesService.getPreviewPreferences(), taskExecutor, stateManager);
+        this.viewModel =
+            new PreviewTabViewModel(
+                dialogService,
+                preferencesService.getPreviewPreferences(),
+                taskExecutor,
+                stateManager
+            );
         lastKeyPressTime = System.currentTimeMillis();
 
-        showAsTabCheckBox.selectedProperty().bindBidirectional(viewModel.showAsExtraTabProperty());
+        showAsTabCheckBox
+            .selectedProperty()
+            .bindBidirectional(viewModel.showAsExtraTabProperty());
 
         searchBox.setPromptText(Localization.lang("Search") + "...");
         searchBox.setLeft(IconTheme.JabRefIcons.SEARCH.getGraphicNode());
 
         ActionFactory factory = new ActionFactory(Globals.getKeyPrefs());
-        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");
 
         availableListView.setItems(viewModel.getFilteredAvailableLayouts());
-        viewModel.availableSelectionModelProperty().setValue(availableListView.getSelectionModel());
+        viewModel
+            .availableSelectionModelProperty()
+            .setValue(availableListView.getSelectionModel());
         new ViewModelListCellFactory<PreviewLayout>()
-                .withText(PreviewLayout::getDisplayName)
-                .install(availableListView);
+            .withText(PreviewLayout::getDisplayName)
+            .install(availableListView);
         availableListView.setOnDragOver(this::dragOver);
         availableListView.setOnDragDetected(this::dragDetectedInAvailable);
-        availableListView.setOnDragDropped(event -> dragDropped(viewModel.availableListProperty(), event));
-        availableListView.setOnKeyTyped(event -> jumpToSearchKey(availableListView, 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));
-
-        chosenListView.itemsProperty().bindBidirectional(viewModel.chosenListProperty());
-        viewModel.chosenSelectionModelProperty().setValue(chosenListView.getSelectionModel());
+        availableListView
+            .getSelectionModel()
+            .setSelectionMode(SelectionMode.MULTIPLE);
+        availableListView
+            .selectionModelProperty()
+            .getValue()
+            .selectedItemProperty()
+            .addListener((observable, oldValue, newValue) ->
+                viewModel.setPreviewLayout(newValue)
+            );
+
+        chosenListView
+            .itemsProperty()
+            .bindBidirectional(viewModel.chosenListProperty());
+        viewModel
+            .chosenSelectionModelProperty()
+            .setValue(chosenListView.getSelectionModel());
         new ViewModelListCellFactory<PreviewLayout>()
-                .withText(PreviewLayout::getDisplayName)
-                .setOnDragDropped(this::dragDroppedInChosenCell)
-                .install(chosenListView);
+            .withText(PreviewLayout::getDisplayName)
+            .setOnDragDropped(this::dragDroppedInChosenCell)
+            .install(chosenListView);
         chosenListView.setOnDragOver(this::dragOver);
         chosenListView.setOnDragDetected(this::dragDetectedInChosen);
-        chosenListView.setOnDragDropped(event -> dragDropped(viewModel.chosenListProperty(), event));
-        chosenListView.setOnKeyTyped(event -> jumpToSearchKey(chosenListView, 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, preferencesService, stateManager, themeManager, taskExecutor);
+        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,
+            preferencesService,
+            stateManager,
+            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()));
+        EasyBind.subscribe(
+            viewModel.selectedLayoutProperty(),
+            previewViewer::setLayout
+        );
+        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(),
-                viewModel.sourceTextProperty(),
-                newSourceText -> editArea.replaceText(newSourceText),
-                newEditText -> {
-                    viewModel.sourceTextProperty().setValue(newEditText);
-                    viewModel.refreshPreview();
-                });
-
-        editArea.textProperty().addListener((obs, oldValue, newValue) ->
-                editArea.setStyleSpans(0, viewModel.computeHighlighting(newValue)));
-
-        editArea.focusedProperty().addListener((observable, oldValue, newValue) -> {
-            if (!newValue) {
+            editArea.textProperty(),
+            viewModel.sourceTextProperty(),
+            newSourceText -> editArea.replaceText(newSourceText),
+            newEditText -> {
+                viewModel.sourceTextProperty().setValue(newEditText);
                 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().get(0).disableProperty().bind(viewModel.selectedIsEditableProperty().not());
-        contextMenu.getItems().get(2).disableProperty().bind(viewModel.selectedIsEditableProperty().not());
-        editArea.editableProperty().bind(viewModel.selectedIsEditableProperty());
+        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()
+            .get(0)
+            .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
+            )
+        );
     }
 
     /**
@@ -207,7 +383,10 @@ public void initialize() {
      * @param keypressed The pressed character
      */
 
-    private void jumpToSearchKey(ListView<PreviewLayout> list, KeyEvent keypressed) {
+    private void jumpToSearchKey(
+        ListView<PreviewLayout> list,
+        KeyEvent keypressed
+    ) {
         if (keypressed.getCharacter() == null) {
             return;
         }
@@ -220,8 +399,14 @@ 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) {
@@ -229,31 +414,63 @@ 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();
     }
 
-    private void dragDropped(ListProperty<PreviewLayout> targetList, DragEvent event) {
-        boolean success = viewModel.dragDropped(targetList, event.getDragboard());
+    private void dragDropped(
+        ListProperty<PreviewLayout> targetList,
+        DragEvent event
+    ) {
+        boolean success = viewModel.dragDropped(
+            targetList,
+            event.getDragboard()
+        );
         event.setDropCompleted(success);
         event.consume();
     }
 
-    private void dragDroppedInChosenCell(PreviewLayout targetLayout, DragEvent event) {
-        boolean success = viewModel.dragDroppedInChosenCell(targetLayout, event.getDragboard());
+    private void dragDroppedInChosenCell(
+        PreviewLayout targetLayout,
+        DragEvent event
+    ) {
+        boolean success = viewModel.dragDroppedInChosenCell(
+            targetLayout,
+            event.getDragboard()
+        );
         event.setDropCompleted(success);
         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 9906b6afc42..8a0984efd8a 100644
--- a/src/main/java/org/jabref/gui/preferences/preview/PreviewTabViewModel.java
+++ b/src/main/java/org/jabref/gui/preferences/preview/PreviewTabViewModel.java
@@ -1,5 +1,9 @@
 package org.jabref.gui.preferences.preview;
 
+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;
@@ -7,7 +11,6 @@
 import java.util.List;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
-
 import javafx.beans.property.BooleanProperty;
 import javafx.beans.property.ListProperty;
 import javafx.beans.property.ObjectProperty;
@@ -23,7 +26,8 @@
 import javafx.scene.input.DragEvent;
 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.Globals;
@@ -39,13 +43,6 @@
 import org.jabref.logic.layout.TextBasedPreviewLayout;
 import org.jabref.logic.preview.PreviewLayout;
 import org.jabref.preferences.PreviewPreferences;
-
-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;
 
@@ -59,19 +56,37 @@
  * */
 public class PreviewTabViewModel implements PreferenceTabViewModel {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(PreviewTabViewModel.class);
-
-    private final BooleanProperty showAsExtraTabProperty = 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 BooleanProperty selectedIsEditableProperty = new SimpleBooleanProperty(false);
-    private final ObjectProperty<PreviewLayout> selectedLayoutProperty = new SimpleObjectProperty<>();
-    private final StringProperty sourceTextProperty = new SimpleStringProperty("");
+    private static final Logger LOGGER = LoggerFactory.getLogger(
+        PreviewTabViewModel.class
+    );
+
+    private final BooleanProperty showAsExtraTabProperty =
+        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 BooleanProperty selectedIsEditableProperty =
+        new SimpleBooleanProperty(false);
+    private final ObjectProperty<PreviewLayout> selectedLayoutProperty =
+        new SimpleObjectProperty<>();
+    private final StringProperty sourceTextProperty = new SimpleStringProperty(
+        ""
+    );
 
     private final DialogService dialogService;
     private final PreviewPreferences previewPreferences;
@@ -81,58 +96,99 @@ public class PreviewTabViewModel implements PreferenceTabViewModel {
 
     private final CustomLocalDragboard localDragboard;
     private ListProperty<PreviewLayout> dragSourceList = null;
-    private ObjectProperty<MultipleSelectionModel<PreviewLayout>> dragSourceSelectionModel = null;
-
-    public PreviewTabViewModel(DialogService dialogService,
-                               PreviewPreferences previewPreferences,
-                               TaskExecutor taskExecutor,
-                               StateManager stateManager) {
+    private ObjectProperty<
+        MultipleSelectionModel<PreviewLayout>
+    > dragSourceSelectionModel = null;
+
+    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) {
+            if (
+                selectedLayoutProperty.getValue() instanceof
+                TextBasedPreviewLayout layout
+            ) {
                 layout.setText(sourceTextProperty.getValue());
             }
         });
 
-        chosenListValidator = new FunctionBasedValidator<>(
+        chosenListValidator =
+            new FunctionBasedValidator<>(
                 chosenListProperty,
                 input -> !chosenListProperty.getValue().isEmpty(),
-                ValidationMessage.error(String.format("%s > %s %n %n %s",
-                                Localization.lang("Entry preview"),
-                                Localization.lang("Selected"),
-                                Localization.lang("Selected Layouts can not be empty")
-                        )
+                ValidationMessage.error(
+                    String.format(
+                        "%s > %s %n %n %s",
+                        Localization.lang("Entry preview"),
+                        Localization.lang("Selected"),
+                        Localization.lang("Selected Layouts can not be empty")
+                    )
                 )
-        );
+            );
     }
 
     @Override
     public void setValues() {
-        showAsExtraTabProperty.set(previewPreferences.shouldShowPreviewAsExtraTab());
+        showAsExtraTabProperty.set(
+            previewPreferences.shouldShowPreviewAsExtraTab()
+        );
         chosenListProperty().getValue().clear();
-        chosenListProperty.getValue().addAll(previewPreferences.getLayoutCycle());
+        chosenListProperty
+            .getValue()
+            .addAll(previewPreferences.getLayoutCycle());
 
         availableListProperty.clear();
-        if (chosenListProperty.stream().noneMatch(TextBasedPreviewLayout.class::isInstance)) {
-            availableListProperty.getValue().add(previewPreferences.getCustomPreviewLayout());
+        if (
+            chosenListProperty
+                .stream()
+                .noneMatch(TextBasedPreviewLayout.class::isInstance)
+        ) {
+            availableListProperty
+                .getValue()
+                .add(previewPreferences.getCustomPreviewLayout());
         }
 
-        BackgroundTask.wrap(CitationStyle::discoverCitationStyles)
-                      .onSuccess(styles -> styles.stream()
-                                                 .map(style -> new CitationStylePreviewLayout(style, Globals.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);
+        BackgroundTask
+            .wrap(CitationStyle::discoverCitationStyles)
+            .onSuccess(styles ->
+                styles
+                    .stream()
+                    .map(style ->
+                        new CitationStylePreviewLayout(
+                            style,
+                            Globals.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);
     }
 
     public void setPreviewLayout(PreviewLayout selectedLayout) {
@@ -147,30 +203,48 @@ public void setPreviewLayout(PreviewLayout selectedLayout) {
         } catch (StringIndexOutOfBoundsException exception) {
             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("Parsing error") +
+                ": " +
+                Localization.lang("illegal backslash expression"),
+                exception
+            );
         }
 
         if (selectedLayout instanceof TextBasedPreviewLayout layout) {
-            sourceTextProperty.setValue(layout.getText().replace("__NEWLINE__", "\n"));
+            sourceTextProperty.setValue(
+                layout.getText().replace("__NEWLINE__", "\n")
+            );
             selectedIsEditableProperty.setValue(true);
         } else {
-            sourceTextProperty.setValue(((CitationStylePreviewLayout) selectedLayout).getSource());
+            sourceTextProperty.setValue(
+                ((CitationStylePreviewLayout) selectedLayout).getSource()
+            );
             selectedIsEditableProperty.setValue(false);
         }
     }
 
     public void refreshPreview() {
         setPreviewLayout(null);
-        setPreviewLayout(chosenSelectionModelProperty.getValue().getSelectedItem());
+        setPreviewLayout(
+            chosenSelectionModelProperty.getValue().getSelectedItem()
+        );
     }
 
     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)
+            );
     }
 
     /**
@@ -182,19 +256,38 @@ public void storeSettings() {
             chosenListProperty.add(previewPreferences.getCustomPreviewLayout());
         }
 
-        PreviewLayout customLayout = findLayoutByName(TextBasedPreviewLayout.NAME);
+        PreviewLayout customLayout = findLayoutByName(
+            TextBasedPreviewLayout.NAME
+        );
         if (customLayout == null) {
             customLayout = previewPreferences.getCustomPreviewLayout();
         }
 
         previewPreferences.getLayoutCycle().clear();
         previewPreferences.getLayoutCycle().addAll(chosenListProperty);
-        previewPreferences.setShowPreviewAsExtraTab(showAsExtraTabProperty.getValue());
-        previewPreferences.setCustomPreviewLayout((TextBasedPreviewLayout) customLayout);
+        previewPreferences.setShowPreviewAsExtraTab(
+            showAsExtraTabProperty.getValue()
+        );
+        previewPreferences.setCustomPreviewLayout(
+            (TextBasedPreviewLayout) customLayout
+        );
 
-        if (!chosenSelectionModelProperty.getValue().getSelectedItems().isEmpty()) {
-            previewPreferences.setLayoutCyclePosition(chosenListProperty.getValue().indexOf(
-                    chosenSelectionModelProperty.getValue().getSelectedItems().get(0)));
+        if (
+            !chosenSelectionModelProperty
+                .getValue()
+                .getSelectedItems()
+                .isEmpty()
+        ) {
+            previewPreferences.setLayoutCyclePosition(
+                chosenListProperty
+                    .getValue()
+                    .indexOf(
+                        chosenSelectionModelProperty
+                            .getValue()
+                            .getSelectedItems()
+                            .get(0)
+                    )
+            );
         }
     }
 
@@ -207,8 +300,13 @@ 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;
         }
@@ -216,18 +314,24 @@ 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() {
@@ -235,18 +339,27 @@ 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();
 
         for (int oldIndex : selected) {
             boolean alreadyTaken = newIndices.contains(oldIndex - 1);
-            int newIndex = (oldIndex > 0) && !alreadyTaken ? oldIndex - 1 : oldIndex;
-            chosenListProperty.add(newIndex, chosenListProperty.remove(oldIndex));
+            int newIndex = (oldIndex > 0) && !alreadyTaken
+                ? oldIndex - 1
+                : oldIndex;
+            chosenListProperty.add(
+                newIndex,
+                chosenListProperty.remove(oldIndex)
+            );
             newIndices.add(newIndex);
         }
 
-        newIndices.forEach(index -> chosenSelectionModelProperty.getValue().select(index));
+        newIndices.forEach(index ->
+            chosenSelectionModelProperty.getValue().select(index)
+        );
         chosenSelectionModelProperty.getValue().select(newIndices.get(0));
         refreshPreview();
     }
@@ -256,25 +369,37 @@ 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;
-            chosenListProperty.add(newIndex, chosenListProperty.remove(oldIndex));
+            int newIndex = (oldIndex < (chosenListProperty.size() - 1)) &&
+                !alreadyTaken
+                ? oldIndex + 1
+                : oldIndex;
+            chosenListProperty.add(
+                newIndex,
+                chosenListProperty.remove(oldIndex)
+            );
             newIndices.add(newIndex);
         }
 
-        newIndices.forEach(index -> chosenSelectionModelProperty.getValue().select(index));
+        newIndices.forEach(index ->
+            chosenSelectionModelProperty.getValue().select(index)
+        );
         chosenSelectionModelProperty.getValue().select(newIndices.get(0));
         refreshPreview();
     }
 
     public void resetDefaultLayout() {
-        PreviewLayout defaultLayout = findLayoutByName(TextBasedPreviewLayout.NAME);
+        PreviewLayout defaultLayout = findLayoutByName(
+            TextBasedPreviewLayout.NAME
+        );
         if (defaultLayout instanceof TextBasedPreviewLayout layout) {
             layout.setText(previewPreferences.getDefaultCustomPreviewLayout());
         }
@@ -294,9 +419,13 @@ 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 ATTRIBUTES = Pattern.compile("(\\w+\\h*)(=)(\\h*\"[^\"]+\")");
+        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;
         final int GROUP_ELEMENT_NAME = 3;
@@ -308,52 +437,106 @@ public StyleSpans<Collection<String>> computeHighlighting(String text) {
 
         Matcher matcher = XML_TAG.matcher(text);
         int lastKeywordEnd = 0;
-        StyleSpansBuilder<Collection<String>> spansBuilder = new StyleSpansBuilder<>();
+        StyleSpansBuilder<Collection<String>> spansBuilder =
+            new StyleSpansBuilder<>();
         while (matcher.find()) {
-            spansBuilder.add(Collections.emptyList(), matcher.start() - lastKeywordEnd);
+            spansBuilder.add(
+                Collections.emptyList(),
+                matcher.start() - lastKeywordEnd
+            );
             if (matcher.group("COMMENT") != null) {
-                spansBuilder.add(Collections.singleton("comment"), matcher.end() - matcher.start());
+                spansBuilder.add(
+                    Collections.singleton("comment"),
+                    matcher.end() - matcher.start()
+                );
             } else {
                 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));
+                    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)
+                    );
 
                     if (!attributesText.isEmpty()) {
                         lastKeywordEnd = 0;
 
-                        Matcher attributesMatcher = ATTRIBUTES.matcher(attributesText);
+                        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();
         }
-        spansBuilder.add(Collections.emptyList(), text.length() - lastKeywordEnd);
+        spansBuilder.add(
+            Collections.emptyList(),
+            text.length() - lastKeywordEnd
+        );
         return spansBuilder.create();
     }
 
     public void dragOver(DragEvent event) {
-        if (event.getDragboard().hasContent(DragAndDropDataFormats.PREVIEWLAYOUTS)) {
+        if (
+            event
+                .getDragboard()
+                .hasContent(DragAndDropDataFormats.PREVIEWLAYOUTS)
+        ) {
             event.acceptTransferModes(TransferMode.MOVE);
         }
     }
 
-    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);
@@ -368,11 +551,15 @@ public void dragDetected(ListProperty<PreviewLayout> sourceList, ObjectProperty<
      * @param targetList either availableListView or chosenListView
      */
 
-    public boolean dragDropped(ListProperty<PreviewLayout> targetList, Dragboard dragboard) {
+    public boolean dragDropped(
+        ListProperty<PreviewLayout> targetList,
+        Dragboard dragboard
+    ) {
         boolean success = false;
 
         if (dragboard.hasContent(DragAndDropDataFormats.PREVIEWLAYOUTS)) {
-            List<PreviewLayout> draggedLayouts = localDragboard.getPreviewLayouts();
+            List<PreviewLayout> draggedLayouts =
+                localDragboard.getPreviewLayouts();
             if (!draggedLayouts.isEmpty()) {
                 dragSourceSelectionModel.getValue().clearSelection();
                 dragSourceList.getValue().removeAll(draggedLayouts);
@@ -380,7 +567,13 @@ 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())
+                        );
                 }
             }
         }
@@ -394,14 +587,21 @@ 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) {
+    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);
+                int targetId = chosenListProperty
+                    .getValue()
+                    .indexOf(targetLayout);
 
                 // see https://stackoverflow.com/questions/28603224/sort-tableview-with-drag-and-drop-rows
                 int onSelectedDelta = 0;
@@ -419,14 +619,20 @@ 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);
+                chosenListProperty
+                    .getValue()
+                    .addAll(targetId, draggedSelectedLayouts);
 
-                draggedSelectedLayouts.forEach(layout -> chosenSelectionModelProperty.getValue().select(layout));
+                draggedSelectedLayouts.forEach(layout ->
+                    chosenSelectionModelProperty.getValue().select(layout)
+                );
 
                 success = true;
             }
@@ -448,12 +654,15 @@ public FilteredList<PreviewLayout> getFilteredAvailableLayouts() {
     }
 
     public void setAvailableFilter(String searchTerm) {
-        this.filteredAvailableLayouts.setPredicate(
-                preview -> searchTerm.isEmpty()
-                        || preview.containsCaseIndependent(searchTerm));
+        this.filteredAvailableLayouts.setPredicate(preview ->
+                searchTerm.isEmpty() ||
+                preview.containsCaseIndependent(searchTerm)
+            );
     }
 
-    public ObjectProperty<MultipleSelectionModel<PreviewLayout>> availableSelectionModelProperty() {
+    public ObjectProperty<
+        MultipleSelectionModel<PreviewLayout>
+    > availableSelectionModelProperty() {
         return availableSelectionModelProperty;
     }
 
@@ -461,7 +670,9 @@ public ListProperty<PreviewLayout> chosenListProperty() {
         return chosenListProperty;
     }
 
-    public ObjectProperty<MultipleSelectionModel<PreviewLayout>> chosenSelectionModelProperty() {
+    public ObjectProperty<
+        MultipleSelectionModel<PreviewLayout>
+    > chosenSelectionModelProperty() {
         return chosenSelectionModelProperty;
     }
 
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 7802e7fde1b..7d41eb85700 100644
--- a/src/main/java/org/jabref/gui/preferences/protectedterms/NewProtectedTermsFileDialog.java
+++ b/src/main/java/org/jabref/gui/preferences/protectedterms/NewProtectedTermsFileDialog.java
@@ -2,14 +2,12 @@
 
 import java.util.ArrayList;
 import java.util.List;
-
 import javafx.scene.control.Button;
 import javafx.scene.control.ButtonType;
 import javafx.scene.control.Label;
 import javafx.scene.control.TextField;
 import javafx.scene.layout.HBox;
 import javafx.scene.layout.VBox;
-
 import org.jabref.gui.DialogService;
 import org.jabref.gui.util.BaseDialog;
 import org.jabref.gui.util.FileDialogConfiguration;
@@ -23,36 +21,64 @@ 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)
+        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
-        );
+        getDialogPane()
+            .getButtonTypes()
+            .setAll(ButtonType.OK, ButtonType.CANCEL);
 
         setResultConverter(button -> {
             if (button == ButtonType.OK) {
-                ProtectedTermsList newList = new ProtectedTermsList(newDescription.getText(), new ArrayList<>(), newFile.getText(), false);
+                ProtectedTermsList newList = new ProtectedTermsList(
+                    newDescription.getText(),
+                    new ArrayList<>(),
+                    newFile.getText(),
+                    false
+                );
                 newList.setEnabled(true);
                 newList.createAndWriteHeading(newDescription.getText());
                 termsLists.add(new ProtectedTermsListItemModel(newList));
diff --git a/src/main/java/org/jabref/gui/preferences/protectedterms/ProtectedTermsListItemModel.java b/src/main/java/org/jabref/gui/preferences/protectedterms/ProtectedTermsListItemModel.java
index ad06b94b55c..5c6e7d76b95 100644
--- a/src/main/java/org/jabref/gui/preferences/protectedterms/ProtectedTermsListItemModel.java
+++ b/src/main/java/org/jabref/gui/preferences/protectedterms/ProtectedTermsListItemModel.java
@@ -6,7 +6,6 @@
 import javafx.beans.property.ReadOnlyStringProperty;
 import javafx.beans.property.ReadOnlyStringWrapper;
 import javafx.beans.property.SimpleBooleanProperty;
-
 import org.jabref.logic.protectedterms.ProtectedTermsList;
 
 public class ProtectedTermsListItemModel {
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 3695201ca61..97b29c8623b 100644
--- a/src/main/java/org/jabref/gui/preferences/protectedterms/ProtectedTermsTab.java
+++ b/src/main/java/org/jabref/gui/preferences/protectedterms/ProtectedTermsTab.java
@@ -1,12 +1,13 @@
 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;
 import javafx.scene.control.TableColumn;
 import javafx.scene.control.TableView;
 import javafx.scene.control.cell.CheckBoxTableCell;
-
 import org.jabref.gui.actions.ActionFactory;
 import org.jabref.gui.actions.SimpleCommand;
 import org.jabref.gui.actions.StandardActions;
@@ -21,27 +22,54 @@
 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 {
-    @FXML private TableView<ProtectedTermsListItemModel> filesTable;
-    @FXML private TableColumn<ProtectedTermsListItemModel, Boolean> filesTableEnabledColumn;
-    @FXML private TableColumn<ProtectedTermsListItemModel, String> filesTableDescriptionColumn;
-    @FXML private TableColumn<ProtectedTermsListItemModel, String> filesTableFileColumn;
-    @FXML private TableColumn<ProtectedTermsListItemModel, Boolean> filesTableEditColumn;
-    @FXML private TableColumn<ProtectedTermsListItemModel, Boolean> filesTableDeleteColumn;
+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;
+
+    @FXML
+    private TableColumn<
+        ProtectedTermsListItemModel,
+        String
+    > filesTableFileColumn;
+
+    @FXML
+    private TableColumn<
+        ProtectedTermsListItemModel,
+        Boolean
+    > filesTableEditColumn;
 
-    @Inject private ProtectedTermsLoader termsLoader;
-    @Inject private KeyBindingRepository keyBindingRepository;
+    @FXML
+    private TableColumn<
+        ProtectedTermsListItemModel,
+        Boolean
+    > filesTableDeleteColumn;
+
+    @Inject
+    private ProtectedTermsLoader termsLoader;
+
+    @Inject
+    private KeyBindingRepository keyBindingRepository;
 
     public ProtectedTermsTab() {
-        ViewLoader.view(this)
-                  .root(this)
-                  .load();
+        ViewLoader.view(this).root(this).load();
     }
 
     @Override
@@ -51,38 +79,65 @@ public String getTabName() {
 
     @FXML
     public void initialize() {
-        viewModel = new ProtectedTermsTabViewModel(termsLoader, dialogService, preferencesService);
+        viewModel =
+            new ProtectedTermsTabViewModel(
+                termsLoader,
+                dialogService,
+                preferencesService
+            );
 
         new ViewModelTableRowFactory<ProtectedTermsListItemModel>()
-                .withContextMenu(this::createContextMenu)
-                .install(filesTable);
-        filesTableEnabledColumn.setCellFactory(CheckBoxTableCell.forTableColumn(filesTableEnabledColumn));
-        filesTableEnabledColumn.setCellValueFactory(data -> data.getValue().enabledProperty());
-        filesTableDescriptionColumn.setCellValueFactory(data -> BindingsHelper.constantOf(data.getValue().getTermsList().getDescription()));
+            .withContextMenu(this::createContextMenu)
+            .install(filesTable);
+        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"));
+                return BindingsHelper.constantOf(
+                    Localization.lang("Internal list")
+                );
             } else {
                 return BindingsHelper.constantOf(list.getLocation());
             }
         });
 
-        filesTableEditColumn.setCellValueFactory(data -> data.getValue().internalProperty().not());
+        filesTableEditColumn.setCellValueFactory(data ->
+            data.getValue().internalProperty().not()
+        );
         new ValueTableCellFactory<ProtectedTermsListItemModel, Boolean>()
-                .withGraphic(none -> IconTheme.JabRefIcons.EDIT.getGraphicNode())
-                .withVisibleExpression(ReadOnlyBooleanWrapper::new)
-                .withOnMouseClickedEvent((item, none) -> event -> viewModel.edit(item))
-                .install(filesTableEditColumn);
-
-        filesTableDeleteColumn.setCellValueFactory(data -> data.getValue().internalProperty().not());
+            .withGraphic(none -> IconTheme.JabRefIcons.EDIT.getGraphicNode())
+            .withVisibleExpression(ReadOnlyBooleanWrapper::new)
+            .withOnMouseClickedEvent((item, none) ->
+                event -> viewModel.edit(item)
+            )
+            .install(filesTableEditColumn);
+
+        filesTableDeleteColumn.setCellValueFactory(data ->
+            data.getValue().internalProperty().not()
+        );
         new ValueTableCellFactory<ProtectedTermsListItemModel, Boolean>()
-                .withGraphic(none -> IconTheme.JabRefIcons.DELETE_ENTRY.getGraphicNode())
-                .withVisibleExpression(ReadOnlyBooleanWrapper::new)
-                .withTooltip(none -> Localization.lang("Remove protected terms file"))
-                .withOnMouseClickedEvent((item, none) -> event -> viewModel.removeList(item))
-                .install(filesTableDeleteColumn);
+            .withGraphic(none ->
+                IconTheme.JabRefIcons.DELETE_ENTRY.getGraphicNode()
+            )
+            .withVisibleExpression(ReadOnlyBooleanWrapper::new)
+            .withTooltip(none ->
+                Localization.lang("Remove protected terms file")
+            )
+            .withOnMouseClickedEvent((item, none) ->
+                event -> viewModel.removeList(item)
+            )
+            .install(filesTableDeleteColumn);
 
         filesTable.itemsProperty().set(viewModel.termsFilesProperty());
     }
@@ -90,12 +145,38 @@ public void initialize() {
     private ContextMenu createContextMenu(ProtectedTermsListItemModel file) {
         ActionFactory factory = new ActionFactory(keyBindingRepository);
         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");
 
@@ -117,15 +198,25 @@ private class ContextAction extends SimpleCommand {
         private final StandardActions command;
         private final ProtectedTermsListItemModel itemModel;
 
-        public ContextAction(StandardActions command, ProtectedTermsListItemModel itemModel) {
+        public ContextAction(
+            StandardActions command,
+            ProtectedTermsListItemModel itemModel
+        ) {
             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 93ffa2b05fb..2793415290f 100644
--- a/src/main/java/org/jabref/gui/preferences/protectedterms/ProtectedTermsTabViewModel.java
+++ b/src/main/java/org/jabref/gui/preferences/protectedterms/ProtectedTermsTabViewModel.java
@@ -5,7 +5,6 @@
 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;
@@ -13,7 +12,6 @@
 import javafx.scene.control.DialogPane;
 import javafx.scene.control.ScrollPane;
 import javafx.scene.control.TextArea;
-
 import org.jabref.gui.DialogService;
 import org.jabref.gui.desktop.JabRefDesktop;
 import org.jabref.gui.externalfiletype.ExternalFileType;
@@ -29,32 +27,44 @@
 import org.jabref.model.util.OptionalUtil;
 import org.jabref.preferences.FilePreferences;
 import org.jabref.preferences.PreferencesService;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 public class ProtectedTermsTabViewModel implements PreferenceTabViewModel {
-    private static final Logger LOGGER = LoggerFactory.getLogger(ProtectedTermsTabViewModel.class);
+
+    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 FilePreferences filePreferences;
     private final DialogService dialogService;
     private final ProtectedTermsPreferences protectedTermsPreferences;
 
-    public ProtectedTermsTabViewModel(ProtectedTermsLoader termsLoader,
-                                      DialogService dialogService,
-                                      PreferencesService preferencesService) {
+    public ProtectedTermsTabViewModel(
+        ProtectedTermsLoader termsLoader,
+        DialogService dialogService,
+        PreferencesService preferencesService
+    ) {
         this.termsLoader = termsLoader;
         this.dialogService = dialogService;
         this.filePreferences = preferencesService.getFilePreferences();
-        this.protectedTermsPreferences = preferencesService.getProtectedTermsPreferences();
+        this.protectedTermsPreferences =
+            preferencesService.getProtectedTermsPreferences();
     }
 
     @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
@@ -64,8 +74,11 @@ 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());
@@ -81,34 +94,64 @@ public void storeSettings() {
             }
         }
 
-        protectedTermsPreferences.setEnabledInternalTermLists(enabledInternalList);
-        protectedTermsPreferences.setEnabledExternalTermLists(enabledExternalList);
-        protectedTermsPreferences.setDisabledInternalTermLists(disabledInternalList);
-        protectedTermsPreferences.setDisabledExternalTermLists(disabledExternalList);
+        protectedTermsPreferences.setEnabledInternalTermLists(
+            enabledInternalList
+        );
+        protectedTermsPreferences.setEnabledExternalTermLists(
+            enabledExternalList
+        );
+        protectedTermsPreferences.setDisabledInternalTermLists(
+            disabledInternalList
+        );
+        protectedTermsPreferences.setDisabledExternalTermLists(
+            disabledExternalList
+        );
 
         termsLoader.update(protectedTermsPreferences);
     }
 
     public void addFile() {
-        FileDialogConfiguration fileDialogConfiguration = new FileDialogConfiguration.Builder()
-                .addExtensionFilter(Localization.lang("Protected terms file"), StandardFileType.TERMS)
-                .withDefaultExtension(Localization.lang("Protected terms file"), StandardFileType.TERMS)
+        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)));
-                     });
+        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?"),
+        if (
+            !list.isInternalList() &&
+            dialogService.showConfirmationDialogAndWait(
                 Localization.lang("Remove protected terms file"),
-                Localization.lang("Cancel"))) {
+                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");
@@ -117,18 +160,34 @@ 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", filePreferences),
-                ExternalFileTypes.getExternalFileTypeByExt("txt", filePreferences)
+        Optional<ExternalFileType> termsFileType = OptionalUtil.<
+            ExternalFileType
+        >orElse(
+            ExternalFileTypes.getExternalFileTypeByExt(
+                "terms",
+                filePreferences
+            ),
+            ExternalFileTypes.getExternalFileTypeByExt("txt", filePreferences)
         );
 
         String fileName = file.getTermsList().getLocation();
         try {
-            JabRefDesktop.openExternalFileAnyFormat(new BibDatabaseContext(), filePreferences, fileName, termsFileType);
+            JabRefDesktop.openExternalFileAnyFormat(
+                new BibDatabaseContext(),
+                filePreferences,
+                fileName,
+                termsFileType
+            );
         } catch (IOException e) {
             LOGGER.warn("Problem open protected terms file editor", e);
         }
@@ -147,17 +206,31 @@ 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));
+            termsFilesProperty.set(
+                index,
+                new ProtectedTermsListItemModel(newList)
+            );
         } else {
-            LOGGER.warn("Problem reloading protected terms file {}.", oldList.getLocation());
+            LOGGER.warn(
+                "Problem reloading protected terms file {}.",
+                oldList.getLocation()
+            );
         }
     }
 
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 4d802c8b611..4b20b976890 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,7 @@
 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;
@@ -10,7 +12,6 @@
 import javafx.scene.control.TableView;
 import javafx.scene.input.KeyCode;
 import javafx.scene.input.KeyEvent;
-
 import org.jabref.gui.actions.ActionFactory;
 import org.jabref.gui.actions.StandardActions;
 import org.jabref.gui.help.HelpAction;
@@ -24,34 +25,60 @@
 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 {
+
+    @FXML
+    private TableView<MainTableColumnModel> columnsList;
+
+    @FXML
+    private TableColumn<MainTableColumnModel, String> nameColumn;
+
+    @FXML
+    private TableColumn<MainTableColumnModel, String> actionsColumn;
+
+    @FXML
+    private ComboBox<MainTableColumnModel> addColumnName;
+
+    @FXML
+    private CheckBox specialFieldsEnable;
+
+    @FXML
+    private Button specialFieldsHelp;
+
+    @FXML
+    private CheckBox extraFileColumnsEnable;
+
+    @FXML
+    private CheckBox autoResizeColumns;
+
+    @FXML
+    private RadioButton namesNatbib;
+
+    @FXML
+    private RadioButton nameAsIs;
+
+    @FXML
+    private RadioButton nameFirstLast;
+
+    @FXML
+    private RadioButton nameLastFirst;
 
-public class TableTab extends AbstractPreferenceTabView<TableTabViewModel> implements PreferencesTab {
+    @FXML
+    private RadioButton abbreviationDisabled;
 
-    @FXML private TableView<MainTableColumnModel> columnsList;
-    @FXML private TableColumn<MainTableColumnModel, String> nameColumn;
-    @FXML private TableColumn<MainTableColumnModel, String> actionsColumn;
-    @FXML private ComboBox<MainTableColumnModel> addColumnName;
-    @FXML private CheckBox specialFieldsEnable;
-    @FXML private Button specialFieldsHelp;
-    @FXML private CheckBox extraFileColumnsEnable;
-    @FXML private CheckBox autoResizeColumns;
+    @FXML
+    private RadioButton abbreviationEnabled;
 
-    @FXML private RadioButton namesNatbib;
-    @FXML private RadioButton nameAsIs;
-    @FXML private RadioButton nameFirstLast;
-    @FXML private RadioButton nameLastFirst;
-    @FXML private RadioButton abbreviationDisabled;
-    @FXML private RadioButton abbreviationEnabled;
-    @FXML private RadioButton abbreviationLastNameOnly;
+    @FXML
+    private RadioButton abbreviationLastNameOnly;
 
-    private final ControlsFxVisualizer validationVisualizer = new ControlsFxVisualizer();
+    private final ControlsFxVisualizer validationVisualizer =
+        new ControlsFxVisualizer();
 
     public TableTab() {
-        ViewLoader.view(this)
-                  .root(this)
-                  .load();
+        ViewLoader.view(this).root(this).load();
     }
 
     @Override
@@ -60,76 +87,149 @@ public String getTabName() {
     }
 
     public void initialize() {
-        this.viewModel = new TableTabViewModel(dialogService, preferencesService);
+        this.viewModel =
+            new TableTabViewModel(dialogService, preferencesService);
 
         setupTable();
         setupBindings();
 
-        ActionFactory actionFactory = new ActionFactory(preferencesService.getKeyBindingRepository());
-        actionFactory.configureIconButton(StandardActions.HELP_SPECIAL_FIELDS, new HelpAction(HelpFile.SPECIAL_FIELDS, dialogService, preferencesService.getFilePreferences()), specialFieldsHelp);
+        ActionFactory actionFactory = new ActionFactory(
+            preferencesService.getKeyBindingRepository()
+        );
+        actionFactory.configureIconButton(
+            StandardActions.HELP_SPECIAL_FIELDS,
+            new HelpAction(
+                HelpFile.SPECIAL_FIELDS,
+                dialogService,
+                preferencesService.getFilePreferences()
+            ),
+            specialFieldsHelp
+        );
     }
 
     private void setupTable() {
         nameColumn.setSortable(false);
         nameColumn.setReorderable(false);
-        nameColumn.setCellValueFactory(cellData -> cellData.getValue().nameProperty());
+        nameColumn.setCellValueFactory(cellData ->
+            cellData.getValue().nameProperty()
+        );
         new ValueTableCellFactory<MainTableColumnModel, String>()
-                .withText(name -> name)
-                .install(nameColumn);
+            .withText(name -> name)
+            .install(nameColumn);
 
         actionsColumn.setSortable(false);
         actionsColumn.setReorderable(false);
-        actionsColumn.setCellValueFactory(cellData -> cellData.getValue().nameProperty());
+        actionsColumn.setCellValueFactory(cellData ->
+            cellData.getValue().nameProperty()
+        );
         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()))
-                .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();
+            .withGraphic(item ->
+                IconTheme.JabRefIcons.DELETE_ENTRY.getGraphicNode()
+            )
+            .withTooltip(name -> Localization.lang("Remove column") + " " + name
+            )
+            .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.itemsProperty().bind(viewModel.columnsListProperty());
 
         new ViewModelListCellFactory<MainTableColumnModel>()
-                .withText(MainTableColumnModel::getDisplayName)
-                .install(addColumnName);
-        addColumnName.itemsProperty().bind(viewModel.availableColumnsProperty());
-        addColumnName.valueProperty().bindBidirectional(viewModel.addColumnProperty());
+            .withText(MainTableColumnModel::getDisplayName)
+            .install(addColumnName);
+        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());
-
-        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()));
+        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())
+            );
     }
 
     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 50370d0c37b..433c14515cf 100644
--- a/src/main/java/org/jabref/gui/preferences/table/TableTabViewModel.java
+++ b/src/main/java/org/jabref/gui/preferences/table/TableTabViewModel.java
@@ -1,7 +1,10 @@
 package org.jabref.gui.preferences.table;
 
+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;
-
 import javafx.beans.property.BooleanProperty;
 import javafx.beans.property.ListProperty;
 import javafx.beans.property.ObjectProperty;
@@ -11,7 +14,6 @@
 import javafx.collections.FXCollections;
 import javafx.scene.control.SelectionModel;
 import javafx.util.StringConverter;
-
 import org.jabref.gui.DialogService;
 import org.jabref.gui.externalfiletype.ExternalFileType;
 import org.jabref.gui.maintable.ColumnPreferences;
@@ -30,44 +32,57 @@
 import org.jabref.model.entry.field.StandardField;
 import org.jabref.preferences.PreferencesService;
 
-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 TableTabViewModel implements PreferenceTabViewModel {
 
-    static StringConverter<MainTableColumnModel> columnNameStringConverter = new StringConverter<>() {
-        @Override
-        public String toString(MainTableColumnModel object) {
-            if (object != null) {
-                return object.getName();
-            } else {
-                return "";
+    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();
-
-    private final BooleanProperty namesNatbibProperty = new SimpleBooleanProperty();
-    private final BooleanProperty nameAsIsProperty = new SimpleBooleanProperty();
-    private final BooleanProperty nameFirstLastProperty = new SimpleBooleanProperty();
-    private final BooleanProperty nameLastFirstProperty = new SimpleBooleanProperty();
-    private final BooleanProperty abbreviationDisabledProperty = new SimpleBooleanProperty();
-    private final BooleanProperty abbreviationEnabledProperty = new SimpleBooleanProperty();
-    private final BooleanProperty abbreviationLastNameOnlyProperty = new SimpleBooleanProperty();
+            @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();
+
+    private final BooleanProperty namesNatbibProperty =
+        new SimpleBooleanProperty();
+    private final BooleanProperty nameAsIsProperty =
+        new SimpleBooleanProperty();
+    private final BooleanProperty nameFirstLastProperty =
+        new SimpleBooleanProperty();
+    private final BooleanProperty nameLastFirstProperty =
+        new SimpleBooleanProperty();
+    private final BooleanProperty abbreviationDisabledProperty =
+        new SimpleBooleanProperty();
+    private final BooleanProperty abbreviationEnabledProperty =
+        new SimpleBooleanProperty();
+    private final BooleanProperty abbreviationLastNameOnlyProperty =
+        new SimpleBooleanProperty();
 
     private final Validator columnsNotEmptyValidator;
 
@@ -79,65 +94,109 @@ public MainTableColumnModel fromString(String string) {
     private final NameDisplayPreferences nameDisplayPreferences;
     private final MainTablePreferences mainTablePreferences;
 
-    public TableTabViewModel(DialogService dialogService, PreferencesService preferences) {
+    public TableTabViewModel(
+        DialogService dialogService,
+        PreferencesService preferences
+    ) {
         this.dialogService = dialogService;
         this.preferences = preferences;
-        this.specialFieldsPreferences = preferences.getSpecialFieldsPreferences();
+        this.specialFieldsPreferences =
+            preferences.getSpecialFieldsPreferences();
         this.nameDisplayPreferences = preferences.getNameDisplayPreferences();
         this.mainTablePreferences = preferences.getMainTablePreferences();
 
-        specialFieldsEnabledProperty.addListener((observable, oldValue, newValue) -> {
-            if (newValue) {
-                insertSpecialFieldColumns();
-            } else {
-                removeSpecialFieldColumns();
+        specialFieldsEnabledProperty.addListener(
+            (observable, oldValue, newValue) -> {
+                if (newValue) {
+                    insertSpecialFieldColumns();
+                } else {
+                    removeSpecialFieldColumns();
+                }
             }
-        });
+        );
 
-        extraFileColumnsEnabledProperty.addListener((observable, oldValue, newValue) -> {
-            if (newValue) {
-                insertExtraFileColumns();
-            } else {
-                removeExtraFileColumns();
+        extraFileColumnsEnabledProperty.addListener(
+            (observable, oldValue, newValue) -> {
+                if (newValue) {
+                    insertExtraFileColumns();
+                } else {
+                    removeExtraFileColumns();
+                }
             }
-        });
+        );
 
-        columnsNotEmptyValidator = new FunctionBasedValidator<>(
+        columnsNotEmptyValidator =
+            new FunctionBasedValidator<>(
                 columnsListProperty,
                 list -> !list.isEmpty(),
-                ValidationMessage.error(String.format("%s > %s %n %n %s",
+                ValidationMessage.error(
+                    String.format(
+                        "%s > %s %n %n %s",
                         Localization.lang("Entry table columns"),
                         Localization.lang("Columns"),
-                        Localization.lang("List must not be empty."))));
+                        Localization.lang("List must not be empty.")
+                    )
+                )
+            );
     }
 
     @Override
     public void setValues() {
         initialColumnPreferences = mainTablePreferences.getColumnPreferences();
 
-        specialFieldsEnabledProperty.setValue(specialFieldsPreferences.isSpecialFieldsEnabled());
-        extraFileColumnsEnabledProperty.setValue(mainTablePreferences.getExtraFileColumnsEnabled());
-        autoResizeColumnsProperty.setValue(mainTablePreferences.getResizeColumnsToFit());
+        specialFieldsEnabledProperty.setValue(
+            specialFieldsPreferences.isSpecialFieldsEnabled()
+        );
+        extraFileColumnsEnabledProperty.setValue(
+            mainTablePreferences.getExtraFileColumnsEnabled()
+        );
+        autoResizeColumnsProperty.setValue(
+            mainTablePreferences.getResizeColumnsToFit()
+        );
 
         fillColumnList();
 
         availableColumnsProperty.clear();
         availableColumnsProperty.addAll(
-                new MainTableColumnModel(MainTableColumnModel.Type.INDEX),
-                new MainTableColumnModel(MainTableColumnModel.Type.LINKED_IDENTIFIER),
-                new MainTableColumnModel(MainTableColumnModel.Type.GROUPS),
-                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.INDEX),
+            new MainTableColumnModel(
+                MainTableColumnModel.Type.LINKED_IDENTIFIER
+            ),
+            new MainTableColumnModel(MainTableColumnModel.Type.GROUPS),
+            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()
+            )
         );
 
-        EnumSet.allOf(StandardField.class).stream()
-               .map(Field::getName)
-               .map(name -> new MainTableColumnModel(MainTableColumnModel.Type.NORMALFIELD, name))
-               .forEach(item -> availableColumnsProperty.getValue().add(item));
+        EnumSet
+            .allOf(StandardField.class)
+            .stream()
+            .map(Field::getName)
+            .map(name ->
+                new MainTableColumnModel(
+                    MainTableColumnModel.Type.NORMALFIELD,
+                    name
+                )
+            )
+            .forEach(item -> availableColumnsProperty.getValue().add(item));
 
         if (specialFieldsEnabledProperty.getValue()) {
             insertSpecialFieldColumns();
@@ -156,7 +215,9 @@ public void setValues() {
 
         switch (nameDisplayPreferences.getAbbreviationStyle()) {
             case FULL -> abbreviationEnabledProperty.setValue(true);
-            case LASTNAME_ONLY -> abbreviationLastNameOnlyProperty.setValue(true);
+            case LASTNAME_ONLY -> abbreviationLastNameOnlyProperty.setValue(
+                true
+            );
             case NONE -> abbreviationDisabledProperty.setValue(true);
         }
     }
@@ -164,32 +225,65 @@ public void setValues() {
     public void fillColumnList() {
         columnsListProperty.getValue().clear();
         if (initialColumnPreferences != null) {
-            initialColumnPreferences.getColumns().forEach(columnsListProperty.getValue()::add);
+            initialColumnPreferences
+                .getColumns()
+                .forEach(columnsListProperty.getValue()::add);
         }
     }
 
     private void insertSpecialFieldColumns() {
-        EnumSet.allOf(SpecialField.class).stream()
-               .map(Field::getName)
-               .map(name -> new MainTableColumnModel(MainTableColumnModel.Type.SPECIALFIELD, name))
-               .forEach(item -> availableColumnsProperty.getValue().add(0, item));
+        EnumSet
+            .allOf(SpecialField.class)
+            .stream()
+            .map(Field::getName)
+            .map(name ->
+                new MainTableColumnModel(
+                    MainTableColumnModel.Type.SPECIALFIELD,
+                    name
+                )
+            )
+            .forEach(item -> availableColumnsProperty.getValue().add(0, item));
     }
 
     private void removeSpecialFieldColumns() {
-        columnsListProperty.getValue().removeIf(column -> column.getType().equals(MainTableColumnModel.Type.SPECIALFIELD));
-        availableColumnsProperty.getValue().removeIf(column -> column.getType().equals(MainTableColumnModel.Type.SPECIALFIELD));
+        columnsListProperty
+            .getValue()
+            .removeIf(column ->
+                column.getType().equals(MainTableColumnModel.Type.SPECIALFIELD)
+            );
+        availableColumnsProperty
+            .getValue()
+            .removeIf(column ->
+                column.getType().equals(MainTableColumnModel.Type.SPECIALFIELD)
+            );
     }
 
     private void insertExtraFileColumns() {
-        preferences.getFilePreferences().getExternalFileTypes().stream()
-                   .map(ExternalFileType::getName)
-                   .map(name -> new MainTableColumnModel(MainTableColumnModel.Type.EXTRAFILE, name))
-                   .forEach(item -> availableColumnsProperty.getValue().add(item));
+        preferences
+            .getFilePreferences()
+            .getExternalFileTypes()
+            .stream()
+            .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().equals(MainTableColumnModel.Type.EXTRAFILE));
-        availableColumnsProperty.getValue().removeIf(column -> column.getType().equals(MainTableColumnModel.Type.EXTRAFILE));
+        columnsListProperty
+            .getValue()
+            .removeIf(column ->
+                column.getType().equals(MainTableColumnModel.Type.EXTRAFILE)
+            );
+        availableColumnsProperty
+            .getValue()
+            .removeIf(column ->
+                column.getType().equals(MainTableColumnModel.Type.EXTRAFILE)
+            );
     }
 
     public void insertColumnInList() {
@@ -197,7 +291,14 @@ 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);
         }
@@ -208,7 +309,9 @@ 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;
@@ -220,9 +323,14 @@ 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))) {
+        if (
+            (selectedColumn == null) ||
+            (row > (columnsListProperty.getValue().size() - 2))
+        ) {
             return;
         }
 
@@ -233,20 +341,32 @@ public void moveColumnDown() {
 
     @Override
     public void storeSettings() {
-        mainTablePreferences.getColumnPreferences().setColumns(columnsListProperty.getValue());
-        mainTablePreferences.setResizeColumnsToFit(autoResizeColumnsProperty.getValue());
-        mainTablePreferences.setExtraFileColumnsEnabled(extraFileColumnsEnabledProperty.getValue());
+        mainTablePreferences
+            .getColumnPreferences()
+            .setColumns(columnsListProperty.getValue());
+        mainTablePreferences.setResizeColumnsToFit(
+            autoResizeColumnsProperty.getValue()
+        );
+        mainTablePreferences.setExtraFileColumnsEnabled(
+            extraFileColumnsEnabledProperty.getValue()
+        );
 
-        specialFieldsPreferences.setSpecialFieldsEnabled(specialFieldsEnabledProperty.getValue());
+        specialFieldsPreferences.setSpecialFieldsEnabled(
+            specialFieldsEnabledProperty.getValue()
+        );
 
         if (nameLastFirstProperty.getValue()) {
-            nameDisplayPreferences.setDisplayStyle(DisplayStyle.LASTNAME_FIRSTNAME);
+            nameDisplayPreferences.setDisplayStyle(
+                DisplayStyle.LASTNAME_FIRSTNAME
+            );
         } else if (namesNatbibProperty.getValue()) {
             nameDisplayPreferences.setDisplayStyle(DisplayStyle.NATBIB);
         } else if (nameAsIsProperty.getValue()) {
             nameDisplayPreferences.setDisplayStyle(DisplayStyle.AS_IS);
         } else if (nameFirstLastProperty.getValue()) {
-            nameDisplayPreferences.setDisplayStyle(DisplayStyle.FIRSTNAME_LASTNAME);
+            nameDisplayPreferences.setDisplayStyle(
+                DisplayStyle.FIRSTNAME_LASTNAME
+            );
         }
 
         if (abbreviationDisabledProperty.getValue()) {
@@ -254,7 +374,9 @@ public void storeSettings() {
         } else if (abbreviationEnabledProperty.getValue()) {
             nameDisplayPreferences.setAbbreviationStyle(AbbreviationStyle.FULL);
         } else if (abbreviationLastNameOnlyProperty.getValue()) {
-            nameDisplayPreferences.setAbbreviationStyle(AbbreviationStyle.LASTNAME_ONLY);
+            nameDisplayPreferences.setAbbreviationStyle(
+                AbbreviationStyle.LASTNAME_ONLY
+            );
         }
     }
 
@@ -266,8 +388,11 @@ 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;
@@ -277,7 +402,9 @@ public ListProperty<MainTableColumnModel> columnsListProperty() {
         return this.columnsListProperty;
     }
 
-    public ObjectProperty<SelectionModel<MainTableColumnModel>> selectedColumnModelProperty() {
+    public ObjectProperty<
+        SelectionModel<MainTableColumnModel>
+    > selectedColumnModelProperty() {
         return selectedColumnModelProperty;
     }
 
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 20f28898f75..c74328845d3 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,7 @@
 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;
@@ -13,7 +15,6 @@
 import javafx.scene.control.cell.CheckBoxTableCell;
 import javafx.scene.control.cell.TextFieldTableCell;
 import javafx.scene.input.MouseButton;
-
 import org.jabref.gui.preferences.AbstractPreferenceTabView;
 import org.jabref.gui.preferences.PreferencesTab;
 import org.jabref.gui.slr.StudyCatalogItem;
@@ -22,37 +23,63 @@
 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 {
+
+    @FXML
+    private CheckBox enableWebSearch;
+
+    @FXML
+    private CheckBox generateNewKeyOnImport;
+
+    @FXML
+    private CheckBox warnAboutDuplicatesOnImport;
+
+    @FXML
+    private CheckBox downloadLinkedOnlineFiles;
+
+    @FXML
+    private CheckBox useCustomDOI;
+
+    @FXML
+    private TextField useCustomDOIName;
+
+    @FXML
+    private CheckBox grobidEnabled;
 
-public class WebSearchTab extends AbstractPreferenceTabView<WebSearchTabViewModel> implements PreferencesTab {
+    @FXML
+    private TextField grobidURL;
+
+    @FXML
+    private ComboBox<FetcherApiKey> apiKeySelector;
+
+    @FXML
+    private TextField customApiKey;
 
-    @FXML private CheckBox enableWebSearch;
-    @FXML private CheckBox generateNewKeyOnImport;
-    @FXML private CheckBox warnAboutDuplicatesOnImport;
-    @FXML private CheckBox downloadLinkedOnlineFiles;
+    @FXML
+    private CheckBox useCustomApiKey;
 
-    @FXML private CheckBox useCustomDOI;
-    @FXML private TextField useCustomDOIName;
+    @FXML
+    private Button testCustomApiKey;
 
-    @FXML private CheckBox grobidEnabled;
-    @FXML private TextField grobidURL;
+    @FXML
+    private CheckBox persistApiKeys;
 
-    @FXML private ComboBox<FetcherApiKey> apiKeySelector;
-    @FXML private TextField customApiKey;
-    @FXML private CheckBox useCustomApiKey;
-    @FXML private Button testCustomApiKey;
+    @FXML
+    private SplitPane persistentTooltipWrapper; // The disabled persistApiKeys control does not show tooltips
 
-    @FXML private CheckBox persistApiKeys;
-    @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;
+    @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
@@ -61,73 +88,127 @@ public String getTabName() {
     }
 
     public void initialize() {
-        this.viewModel = new WebSearchTabViewModel(preferencesService, dialogService);
-
-        enableWebSearch.selectedProperty().bindBidirectional(viewModel.enableWebSearchProperty());
-        generateNewKeyOnImport.selectedProperty().bindBidirectional(viewModel.generateKeyOnImportProperty());
-        warnAboutDuplicatesOnImport.selectedProperty().bindBidirectional(viewModel.warnAboutDuplicatesOnImportProperty());
-        downloadLinkedOnlineFiles.selectedProperty().bindBidirectional(viewModel.shouldDownloadLinkedOnlineFiles());
-
-        grobidEnabled.selectedProperty().bindBidirectional(viewModel.grobidEnabledProperty());
-        grobidURL.textProperty().bindBidirectional(viewModel.grobidURLProperty());
-        grobidURL.disableProperty().bind(grobidEnabled.selectedProperty().not());
-
-        useCustomDOI.selectedProperty().bindBidirectional(viewModel.useCustomDOIProperty());
-        useCustomDOIName.textProperty().bindBidirectional(viewModel.useCustomDOINameProperty());
-        useCustomDOIName.disableProperty().bind(useCustomDOI.selectedProperty().not());
+        this.viewModel =
+            new WebSearchTabViewModel(preferencesService, dialogService);
+
+        enableWebSearch
+            .selectedProperty()
+            .bindBidirectional(viewModel.enableWebSearchProperty());
+        generateNewKeyOnImport
+            .selectedProperty()
+            .bindBidirectional(viewModel.generateKeyOnImportProperty());
+        warnAboutDuplicatesOnImport
+            .selectedProperty()
+            .bindBidirectional(viewModel.warnAboutDuplicatesOnImportProperty());
+        downloadLinkedOnlineFiles
+            .selectedProperty()
+            .bindBidirectional(viewModel.shouldDownloadLinkedOnlineFiles());
+
+        grobidEnabled
+            .selectedProperty()
+            .bindBidirectional(viewModel.grobidEnabledProperty());
+        grobidURL
+            .textProperty()
+            .bindBidirectional(viewModel.grobidURLProperty());
+        grobidURL
+            .disableProperty()
+            .bind(grobidEnabled.selectedProperty().not());
+
+        useCustomDOI
+            .selectedProperty()
+            .bindBidirectional(viewModel.useCustomDOIProperty());
+        useCustomDOIName
+            .textProperty()
+            .bindBidirectional(viewModel.useCustomDOINameProperty());
+        useCustomDOIName
+            .disableProperty()
+            .bind(useCustomDOI.selectedProperty().not());
 
         new ViewModelTableRowFactory<StudyCatalogItem>()
-                .withOnMouseClickedEvent((entry, event) -> {
-                    if (event.getButton() == MouseButton.PRIMARY) {
-                        entry.setEnabled(!entry.isEnabled());
-                    }
-                })
-                .install(catalogTable);
+            .withOnMouseClickedEvent((entry, event) -> {
+                if (event.getButton() == MouseButton.PRIMARY) {
+                    entry.setEnabled(!entry.isEnabled());
+                }
+            })
+            .install(catalogTable);
 
         catalogColumn.setReorderable(false);
         catalogColumn.setCellFactory(TextFieldTableCell.forTableColumn());
 
         catalogEnabledColumn.setResizable(false);
         catalogEnabledColumn.setReorderable(false);
-        catalogEnabledColumn.setCellFactory(CheckBoxTableCell.forTableColumn(catalogEnabledColumn));
-        catalogEnabledColumn.setCellValueFactory(param -> param.getValue().enabledProperty());
+        catalogEnabledColumn.setCellFactory(
+            CheckBoxTableCell.forTableColumn(catalogEnabledColumn)
+        );
+        catalogEnabledColumn.setCellValueFactory(param ->
+            param.getValue().enabledProperty()
+        );
 
         catalogColumn.setEditable(false);
-        catalogColumn.setCellValueFactory(param -> param.getValue().nameProperty());
+        catalogColumn.setCellValueFactory(param ->
+            param.getValue().nameProperty()
+        );
         catalogTable.setItems(viewModel.getCatalogs());
 
         new ViewModelListCellFactory<FetcherApiKey>()
-                .withText(FetcherApiKey::getName)
-                .install(apiKeySelector);
-        apiKeySelector.getSelectionModel().selectedItemProperty().addListener((observable, oldValue, newValue) -> {
-            if (oldValue != null) {
-                updateFetcherApiKey(oldValue);
-            }
-            if (newValue != null) {
-                useCustomApiKey.setSelected(newValue.shouldUse());
-                customApiKey.setText(newValue.getKey());
-            }
-        });
-        customApiKey.textProperty().addListener(listener -> updateFetcherApiKey(apiKeySelector.valueProperty().get()));
-
-        customApiKey.disableProperty().bind(useCustomApiKey.selectedProperty().not());
-        testCustomApiKey.disableProperty().bind(useCustomApiKey.selectedProperty().not());
-
-        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);
+            .withText(FetcherApiKey::getName)
+            .install(apiKeySelector);
+        apiKeySelector
+            .getSelectionModel()
+            .selectedItemProperty()
+            .addListener((observable, oldValue, newValue) -> {
+                if (oldValue != null) {
+                    updateFetcherApiKey(oldValue);
+                }
+                if (newValue != null) {
+                    useCustomApiKey.setSelected(newValue.shouldUse());
+                    customApiKey.setText(newValue.getKey());
+                }
+            });
+        customApiKey
+            .textProperty()
+            .addListener(listener ->
+                updateFetcherApiKey(apiKeySelector.valueProperty().get())
+            );
+
+        customApiKey
+            .disableProperty()
+            .bind(useCustomApiKey.selectedProperty().not());
+        testCustomApiKey
+            .disableProperty()
+            .bind(useCustomApiKey.selectedProperty().not());
+
+        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);
+                }
             }
-        });
+        );
 
         apiKeySelector.setItems(viewModel.fetcherApiKeys());
         viewModel.selectedApiKeyProperty().bind(apiKeySelector.valueProperty());
 
         // Content is set later
-        viewModel.fetcherApiKeys().addListener((InvalidationListener) change -> apiKeySelector.getSelectionModel().selectFirst());
+        viewModel
+            .fetcherApiKeys()
+            .addListener(
+                (InvalidationListener) change ->
+                    apiKeySelector.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 1ba2ef247fe..b028210bc5f 100644
--- a/src/main/java/org/jabref/gui/preferences/websearch/WebSearchTabViewModel.java
+++ b/src/main/java/org/jabref/gui/preferences/websearch/WebSearchTabViewModel.java
@@ -4,11 +4,6 @@
 import java.net.HttpURLConnection;
 import java.util.Optional;
 import java.util.stream.Collectors;
-
-import javax.net.ssl.HostnameVerifier;
-import javax.net.ssl.HttpsURLConnection;
-import javax.net.ssl.SSLSocketFactory;
-
 import javafx.beans.property.BooleanProperty;
 import javafx.beans.property.ListProperty;
 import javafx.beans.property.ObjectProperty;
@@ -20,7 +15,10 @@
 import javafx.beans.property.StringProperty;
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableList;
-
+import javax.net.ssl.HostnameVerifier;
+import javax.net.ssl.HttpsURLConnection;
+import javax.net.ssl.SSLSocketFactory;
+import kong.unirest.UnirestException;
 import org.jabref.gui.DialogService;
 import org.jabref.gui.preferences.PreferenceTabViewModel;
 import org.jabref.gui.slr.StudyCatalogItem;
@@ -39,25 +37,38 @@
 import org.jabref.preferences.FilePreferences;
 import org.jabref.preferences.PreferencesService;
 
-import kong.unirest.UnirestException;
-
 public class WebSearchTabViewModel implements PreferenceTabViewModel {
-    private final BooleanProperty enableWebSearchProperty = new SimpleBooleanProperty();
-    private final BooleanProperty generateKeyOnImportProperty = new SimpleBooleanProperty();
-    private final BooleanProperty warnAboutDuplicatesOnImportProperty = new SimpleBooleanProperty();
-    private final BooleanProperty shouldDownloadLinkedOnlineFiles = new SimpleBooleanProperty();
 
-    private final BooleanProperty useCustomDOIProperty = new SimpleBooleanProperty();
-    private final StringProperty useCustomDOINameProperty = new SimpleStringProperty("");
-
-    private final ObservableList<StudyCatalogItem> catalogs = FXCollections.observableArrayList();
-    private final BooleanProperty grobidEnabledProperty = new SimpleBooleanProperty();
-    private final StringProperty grobidURLProperty = new SimpleStringProperty("");
-
-    private final ListProperty<FetcherApiKey> apiKeys = new SimpleListProperty<>();
-    private final ObjectProperty<FetcherApiKey> selectedApiKeyProperty = new SimpleObjectProperty<>();
-    private final BooleanProperty apikeyPersistProperty = new SimpleBooleanProperty();
-    private final BooleanProperty apikeyPersistAvailableProperty = new SimpleBooleanProperty();
+    private final BooleanProperty enableWebSearchProperty =
+        new SimpleBooleanProperty();
+    private final BooleanProperty generateKeyOnImportProperty =
+        new SimpleBooleanProperty();
+    private final BooleanProperty warnAboutDuplicatesOnImportProperty =
+        new SimpleBooleanProperty();
+    private final BooleanProperty shouldDownloadLinkedOnlineFiles =
+        new SimpleBooleanProperty();
+
+    private final BooleanProperty useCustomDOIProperty =
+        new SimpleBooleanProperty();
+    private final StringProperty useCustomDOINameProperty =
+        new SimpleStringProperty("");
+
+    private final ObservableList<StudyCatalogItem> catalogs =
+        FXCollections.observableArrayList();
+    private final BooleanProperty grobidEnabledProperty =
+        new SimpleBooleanProperty();
+    private final StringProperty grobidURLProperty = new SimpleStringProperty(
+        ""
+    );
+
+    private final ListProperty<FetcherApiKey> apiKeys =
+        new SimpleListProperty<>();
+    private final ObjectProperty<FetcherApiKey> selectedApiKeyProperty =
+        new SimpleObjectProperty<>();
+    private final BooleanProperty apikeyPersistProperty =
+        new SimpleBooleanProperty();
+    private final BooleanProperty apikeyPersistAvailableProperty =
+        new SimpleBooleanProperty();
 
     private final DialogService dialogService;
     private final PreferencesService preferencesService;
@@ -67,22 +78,34 @@ public class WebSearchTabViewModel implements PreferenceTabViewModel {
     private final FilePreferences filePreferences;
     private final ImportFormatPreferences importFormatPreferences;
 
-    public WebSearchTabViewModel(PreferencesService preferencesService, DialogService dialogService) {
+    public WebSearchTabViewModel(
+        PreferencesService preferencesService,
+        DialogService dialogService
+    ) {
         this.dialogService = dialogService;
         this.preferencesService = preferencesService;
         this.importerPreferences = preferencesService.getImporterPreferences();
         this.grobidPreferences = preferencesService.getGrobidPreferences();
         this.doiPreferences = preferencesService.getDOIPreferences();
         this.filePreferences = preferencesService.getFilePreferences();
-        this.importFormatPreferences = preferencesService.getImportFormatPreferences();
+        this.importFormatPreferences =
+            preferencesService.getImportFormatPreferences();
     }
 
     @Override
     public void setValues() {
-        enableWebSearchProperty.setValue(importerPreferences.areImporterEnabled());
-        generateKeyOnImportProperty.setValue(importerPreferences.isGenerateNewKeyOnImport());
-        warnAboutDuplicatesOnImportProperty.setValue(importerPreferences.shouldWarnAboutDuplicatesOnImport());
-        shouldDownloadLinkedOnlineFiles.setValue(filePreferences.shouldDownloadLinkedFiles());
+        enableWebSearchProperty.setValue(
+            importerPreferences.areImporterEnabled()
+        );
+        generateKeyOnImportProperty.setValue(
+            importerPreferences.isGenerateNewKeyOnImport()
+        );
+        warnAboutDuplicatesOnImportProperty.setValue(
+            importerPreferences.shouldWarnAboutDuplicatesOnImport()
+        );
+        shouldDownloadLinkedOnlineFiles.setValue(
+            filePreferences.shouldDownloadLinkedFiles()
+        );
 
         useCustomDOIProperty.setValue(doiPreferences.isUseCustom());
         useCustomDOINameProperty.setValue(doiPreferences.getDefaultBaseURI());
@@ -90,41 +113,76 @@ public void setValues() {
         grobidEnabledProperty.setValue(grobidPreferences.isGrobidEnabled());
         grobidURLProperty.setValue(grobidPreferences.getGrobidURL());
 
-        apiKeys.setValue(FXCollections.observableArrayList(preferencesService.getImporterPreferences().getApiKeys()));
+        apiKeys.setValue(
+            FXCollections.observableArrayList(
+                preferencesService.getImporterPreferences().getApiKeys()
+            )
+        );
         apikeyPersistAvailableProperty.setValue(OS.isKeyringAvailable());
-        apikeyPersistProperty.setValue(preferencesService.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(
+            preferencesService
+                .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());
-        filePreferences.setDownloadLinkedFiles(shouldDownloadLinkedOnlineFiles.getValue());
+        importerPreferences.setImporterEnabled(
+            enableWebSearchProperty.getValue()
+        );
+        importerPreferences.setGenerateNewKeyOnImport(
+            generateKeyOnImportProperty.getValue()
+        );
+        importerPreferences.setWarnAboutDuplicatesOnImport(
+            warnAboutDuplicatesOnImportProperty.getValue()
+        );
+        filePreferences.setDownloadLinkedFiles(
+            shouldDownloadLinkedOnlineFiles.getValue()
+        );
 
         grobidPreferences.setGrobidEnabled(grobidEnabledProperty.getValue());
         grobidPreferences.setGrobidOptOut(grobidPreferences.isGrobidOptOut());
         grobidPreferences.setGrobidURL(grobidURLProperty.getValue());
         doiPreferences.setUseCustom(useCustomDOIProperty.get());
-        doiPreferences.setDefaultBaseURI(useCustomDOINameProperty.getValue().trim());
+        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());
         preferencesService.getImporterPreferences().getApiKeys().clear();
         if (apikeyPersistAvailableProperty.get()) {
-            preferencesService.getImporterPreferences().getApiKeys().addAll(apiKeys);
+            preferencesService
+                .getImporterPreferences()
+                .getApiKeys()
+                .addAll(apiKeys);
         }
     }
 
@@ -183,26 +241,29 @@ public BooleanProperty getApikeyPersistProperty() {
     public void checkCustomApiKey() {
         final String apiKeyName = selectedApiKeyProperty.get().getName();
 
-        final Optional<CustomizableKeyFetcher> fetcherOpt =
-                WebFetchers.getCustomizableKeyFetchers(
-                                   preferencesService.getImportFormatPreferences(),
-                                   preferencesService.getImporterPreferences())
-                           .stream()
-                           .filter(fetcher -> fetcher.getName().equals(apiKeyName))
-                           .findFirst();
+        final Optional<CustomizableKeyFetcher> fetcherOpt = WebFetchers
+            .getCustomizableKeyFetchers(
+                preferencesService.getImportFormatPreferences(),
+                preferencesService.getImporterPreferences()
+            )
+            .stream()
+            .filter(fetcher -> fetcher.getName().equals(apiKeyName))
+            .findFirst();
 
         if (fetcherOpt.isEmpty()) {
             dialogService.showErrorDialogAndWait(
-                    Localization.lang("Check %0 API Key Setting", apiKeyName),
-                    Localization.lang("Fetcher unknown!"));
+                Localization.lang("Check %0 API Key Setting", apiKeyName),
+                Localization.lang("Fetcher unknown!")
+            );
             return;
         }
 
         final String testUrlWithoutApiKey = fetcherOpt.get().getTestUrl();
         if (testUrlWithoutApiKey == null) {
             dialogService.showWarningDialogAndWait(
-                    Localization.lang("Check %0 API Key Setting", apiKeyName),
-                    Localization.lang("Fetcher cannot be tested!"));
+                Localization.lang("Check %0 API Key Setting", apiKeyName),
+                Localization.lang("Fetcher cannot be tested!")
+            );
             return;
         }
 
@@ -212,15 +273,23 @@ public void checkCustomApiKey() {
         if (!apiKey.isEmpty()) {
             URLDownload urlDownload;
             try {
-                SSLSocketFactory defaultSslSocketFactory = HttpsURLConnection.getDefaultSSLSocketFactory();
-                HostnameVerifier defaultHostnameVerifier = HttpsURLConnection.getDefaultHostnameVerifier();
+                SSLSocketFactory defaultSslSocketFactory =
+                    HttpsURLConnection.getDefaultSSLSocketFactory();
+                HostnameVerifier defaultHostnameVerifier =
+                    HttpsURLConnection.getDefaultHostnameVerifier();
 
                 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();
+                int statusCode =
+                    ((HttpURLConnection) urlDownload
+                            .getSource()
+                            .openConnection()).getResponseCode();
                 keyValid = (statusCode >= 200) && (statusCode < 300);
 
-                URLDownload.setSSLVerification(defaultSslSocketFactory, defaultHostnameVerifier);
+                URLDownload.setSSLVerification(
+                    defaultSslSocketFactory,
+                    defaultHostnameVerifier
+                );
             } catch (IOException | UnirestException e) {
                 keyValid = false;
             }
@@ -229,9 +298,15 @@ 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 1183bb3cd3d..2bfc6905d3f 100644
--- a/src/main/java/org/jabref/gui/preferences/xmp/XmpPrivacyTab.java
+++ b/src/main/java/org/jabref/gui/preferences/xmp/XmpPrivacyTab.java
@@ -1,5 +1,7 @@
 package org.jabref.gui.preferences.xmp;
 
+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;
@@ -9,7 +11,6 @@
 import javafx.scene.control.TableView;
 import javafx.scene.input.KeyCode;
 import javafx.scene.input.KeyEvent;
-
 import org.jabref.gui.icon.IconTheme;
 import org.jabref.gui.preferences.AbstractPreferenceTabView;
 import org.jabref.gui.preferences.PreferencesTab;
@@ -21,24 +22,33 @@
 import org.jabref.logic.l10n.Localization;
 import org.jabref.model.entry.field.Field;
 
-import com.airhacks.afterburner.views.ViewLoader;
-import de.saxsys.mvvmfx.utils.validation.visualization.ControlsFxVisualizer;
+public class XmpPrivacyTab
+    extends AbstractPreferenceTabView<XmpPrivacyTabViewModel>
+    implements PreferencesTab {
 
-public class XmpPrivacyTab extends AbstractPreferenceTabView<XmpPrivacyTabViewModel> implements PreferencesTab {
+    @FXML
+    private CheckBox enableXmpFilter;
 
-    @FXML private CheckBox enableXmpFilter;
-    @FXML private TableView<Field> filterList;
-    @FXML private TableColumn<Field, Field> fieldColumn;
-    @FXML private TableColumn<Field, Field> actionsColumn;
-    @FXML private ComboBox<Field> addFieldName;
-    @FXML private Button addField;
+    @FXML
+    private TableView<Field> filterList;
 
-    private final ControlsFxVisualizer validationVisualizer = new ControlsFxVisualizer();
+    @FXML
+    private TableColumn<Field, Field> fieldColumn;
+
+    @FXML
+    private TableColumn<Field, Field> actionsColumn;
+
+    @FXML
+    private ComboBox<Field> addFieldName;
+
+    @FXML
+    private Button addField;
+
+    private final ControlsFxVisualizer validationVisualizer =
+        new ControlsFxVisualizer();
 
     public XmpPrivacyTab() {
-        ViewLoader.view(this)
-                  .root(this)
-                  .load();
+        ViewLoader.view(this).root(this).load();
     }
 
     @Override
@@ -47,55 +57,94 @@ public String getTabName() {
     }
 
     public void initialize() {
-        this.viewModel = new XmpPrivacyTabViewModel(dialogService, preferencesService.getXmpPreferences());
-
-        enableXmpFilter.selectedProperty().bindBidirectional(viewModel.xmpFilterEnabledProperty());
-        filterList.disableProperty().bind(viewModel.xmpFilterEnabledProperty().not());
-        addFieldName.disableProperty().bind(viewModel.xmpFilterEnabledProperty().not());
-        addField.disableProperty().bind(viewModel.xmpFilterEnabledProperty().not());
+        this.viewModel =
+            new XmpPrivacyTabViewModel(
+                dialogService,
+                preferencesService.getXmpPreferences()
+            );
+
+        enableXmpFilter
+            .selectedProperty()
+            .bindBidirectional(viewModel.xmpFilterEnabledProperty());
+        filterList
+            .disableProperty()
+            .bind(viewModel.xmpFilterEnabledProperty().not());
+        addFieldName
+            .disableProperty()
+            .bind(viewModel.xmpFilterEnabledProperty().not());
+        addField
+            .disableProperty()
+            .bind(viewModel.xmpFilterEnabledProperty().not());
 
         fieldColumn.setSortable(true);
         fieldColumn.setReorderable(false);
-        fieldColumn.setCellValueFactory(cellData -> BindingsHelper.constantOf(cellData.getValue()));
+        fieldColumn.setCellValueFactory(cellData ->
+            BindingsHelper.constantOf(cellData.getValue())
+        );
         new ValueTableCellFactory<Field, Field>()
-                .withText(FieldsUtil::getNameWithType)
-                .install(fieldColumn);
+            .withText(FieldsUtil::getNameWithType)
+            .install(fieldColumn);
 
         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()))
-                .install(actionsColumn);
-
-        filterList.addEventFilter(KeyEvent.KEY_PRESSED, event -> {
-            if (event.getCode() == KeyCode.DELETE) {
-                viewModel.removeFilter(filterList.getSelectionModel().getSelectedItem());
-                event.consume();
+            .withGraphic(item ->
+                IconTheme.JabRefIcons.DELETE_ENTRY.getGraphicNode()
+            )
+            .withTooltip(item ->
+                Localization.lang("Remove") + " " + item.getName()
+            )
+            .withOnMouseClickedEvent(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.itemsProperty().bind(viewModel.filterListProperty());
 
         addFieldName.setEditable(true);
         new ViewModelListCellFactory<Field>()
-                .withText(FieldsUtil::getNameWithType)
-                .install(addFieldName);
+            .withText(FieldsUtil::getNameWithType)
+            .install(addFieldName);
         addFieldName.itemsProperty().bind(viewModel.availableFieldsProperty());
-        addFieldName.valueProperty().bindBidirectional(viewModel.addFieldNameProperty());
+        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 6fce5dc324f..b6a5eac0bb7 100644
--- a/src/main/java/org/jabref/gui/preferences/xmp/XmpPrivacyTabViewModel.java
+++ b/src/main/java/org/jabref/gui/preferences/xmp/XmpPrivacyTabViewModel.java
@@ -1,7 +1,10 @@
 package org.jabref.gui.preferences.xmp;
 
+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;
-
 import javafx.beans.property.BooleanProperty;
 import javafx.beans.property.ListProperty;
 import javafx.beans.property.ObjectProperty;
@@ -9,7 +12,6 @@
 import javafx.beans.property.SimpleListProperty;
 import javafx.beans.property.SimpleObjectProperty;
 import javafx.collections.FXCollections;
-
 import org.jabref.gui.DialogService;
 import org.jabref.gui.preferences.PreferenceTabViewModel;
 import org.jabref.logic.l10n.Localization;
@@ -17,53 +19,69 @@
 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;
-
 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 ObjectProperty<Field> addFieldProperty = new SimpleObjectProperty<>();
+    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 ObjectProperty<Field> addFieldProperty =
+        new SimpleObjectProperty<>();
 
     private final DialogService dialogService;
     private final XmpPreferences xmpPreferences;
 
     private final Validator xmpFilterListValidator;
 
-    XmpPrivacyTabViewModel(DialogService dialogService, XmpPreferences xmpPreferences) {
+    XmpPrivacyTabViewModel(
+        DialogService dialogService,
+        XmpPreferences xmpPreferences
+    ) {
         this.dialogService = dialogService;
         this.xmpPreferences = xmpPreferences;
 
-        xmpFilterListValidator = new FunctionBasedValidator<>(
+        xmpFilterListValidator =
+            new FunctionBasedValidator<>(
                 xmpFilterListProperty,
                 input -> input.size() > 0,
-                ValidationMessage.error(String.format("%s > %s %n %n %s",
+                ValidationMessage.error(
+                    String.format(
+                        "%s > %s %n %n %s",
                         Localization.lang("XMP metadata"),
                         Localization.lang("Filter List"),
-                        Localization.lang("List must not be empty."))));
+                        Localization.lang("List must not be empty.")
+                    )
+                )
+            );
     }
 
     @Override
     public void setValues() {
-        xmpFilterEnabledProperty.setValue(xmpPreferences.shouldUseXmpPrivacyFilter());
+        xmpFilterEnabledProperty.setValue(
+            xmpPreferences.shouldUseXmpPrivacyFilter()
+        );
 
         xmpFilterListProperty.clear();
         xmpFilterListProperty.addAll(xmpPreferences.getXmpPrivacyFilter());
 
         availableFieldsProperty.clear();
         availableFieldsProperty.addAll(FieldFactory.getCommonFields());
-        availableFieldsProperty.sort((Comparator.comparing(Field::getDisplayName)));
+        availableFieldsProperty.sort(
+            (Comparator.comparing(Field::getDisplayName))
+        );
     }
 
     @Override
     public void storeSettings() {
-        xmpPreferences.setUseXmpPrivacyFilter(xmpFilterEnabledProperty.getValue());
+        xmpPreferences.setUseXmpPrivacyFilter(
+            xmpFilterEnabledProperty.getValue()
+        );
         xmpPreferences.getXmpPrivacyFilter().clear();
-        xmpPreferences.getXmpPrivacyFilter().addAll(xmpFilterListProperty.getValue());
+        xmpPreferences
+            .getXmpPrivacyFilter()
+            .addAll(xmpFilterListProperty.getValue());
     }
 
     public void addField() {
@@ -71,7 +89,14 @@ 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);
         }
@@ -88,9 +113,14 @@ public ValidationStatus xmpFilterListValidationStatus() {
     @Override
     public boolean validateSettings() {
         ValidationStatus validationStatus = xmpFilterListValidationStatus();
-        if (xmpFilterEnabledProperty.getValue() && !validationStatus.isValid()) {
-            validationStatus.getHighestMessage().ifPresent(message ->
-                    dialogService.showErrorDialogAndWait(message.getMessage()));
+        if (
+            xmpFilterEnabledProperty.getValue() && !validationStatus.isValid()
+        ) {
+            validationStatus
+                .getHighestMessage()
+                .ifPresent(message ->
+                    dialogService.showErrorDialogAndWait(message.getMessage())
+                );
             return false;
         }
         return true;
diff --git a/src/main/java/org/jabref/gui/preview/CopyCitationAction.java b/src/main/java/org/jabref/gui/preview/CopyCitationAction.java
index 164eec87b57..a33a3dfcb99 100644
--- a/src/main/java/org/jabref/gui/preview/CopyCitationAction.java
+++ b/src/main/java/org/jabref/gui/preview/CopyCitationAction.java
@@ -5,9 +5,7 @@
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
-
 import javafx.scene.input.ClipboardContent;
-
 import org.jabref.gui.ClipBoardManager;
 import org.jabref.gui.DialogService;
 import org.jabref.gui.Globals;
@@ -28,7 +26,6 @@
 import org.jabref.logic.util.OS;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.preferences.PreferencesService;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -37,7 +34,9 @@
  */
 public class CopyCitationAction extends SimpleCommand {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(CopyCitationAction.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(
+        CopyCitationAction.class
+    );
 
     private final List<BibEntry> selectedEntries;
     private final CitationStyleOutputFormat outputFormat;
@@ -49,13 +48,15 @@ public class CopyCitationAction extends SimpleCommand {
     private final PreferencesService preferencesService;
     private final JournalAbbreviationRepository abbreviationRepository;
 
-    public CopyCitationAction(CitationStyleOutputFormat outputFormat,
-                              DialogService dialogService,
-                              StateManager stateManager,
-                              ClipBoardManager clipBoardManager,
-                              TaskExecutor taskExecutor,
-                              PreferencesService preferencesService,
-                              JournalAbbreviationRepository abbreviationRepository) {
+    public CopyCitationAction(
+        CitationStyleOutputFormat outputFormat,
+        DialogService dialogService,
+        StateManager stateManager,
+        ClipBoardManager clipBoardManager,
+        TaskExecutor taskExecutor,
+        PreferencesService preferencesService,
+        JournalAbbreviationRepository abbreviationRepository
+    ) {
         this.outputFormat = outputFormat;
         this.dialogService = dialogService;
         this.stateManager = stateManager;
@@ -70,42 +71,73 @@ 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);
+        BackgroundTask
+            .wrap(this::generateCitations)
+            .onFailure(ex ->
+                LOGGER.error(
+                    "Error while copying citations to the clipboard",
+                    ex
+                )
+            )
+            .onSuccess(this::setClipBoardContent)
+            .executeWith(taskExecutor);
     }
 
     private List<String> generateCitations() 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 = preferencesService.getPreviewPreferences().getSelectedPreviewLayout();
-
-        if (previewLayout instanceof CitationStylePreviewLayout citationStyleLayout) {
+        PreviewLayout previewLayout = preferencesService
+            .getPreviewPreferences()
+            .getSelectedPreviewLayout();
+
+        if (
+            previewLayout instanceof
+            CitationStylePreviewLayout citationStyleLayout
+        ) {
             styleSource = citationStyleLayout.getSource();
         }
 
         if (styleSource != null) {
-            return CitationStyleGenerator.generateCitations(selectedEntries, styleSource, outputFormat, stateManager.getActiveDatabase().get(), Globals.entryTypesManager);
+            return CitationStyleGenerator.generateCitations(
+                selectedEntries,
+                styleSource,
+                outputFormat,
+                stateManager.getActiveDatabase().get(),
+                Globals.entryTypesManager
+            );
         } else {
             return generateTextBasedPreviewLayoutCitations();
         }
     }
 
-    private List<String> generateTextBasedPreviewLayoutCitations() throws IOException {
+    private List<String> generateTextBasedPreviewLayoutCitations()
+        throws IOException {
         if (stateManager.getActiveDatabase().isEmpty()) {
             return Collections.emptyList();
         }
 
-        TextBasedPreviewLayout customPreviewLayout = preferencesService.getPreviewPreferences().getCustomPreviewLayout();
-        StringReader customLayoutReader = new StringReader(customPreviewLayout.getText().replace("__NEWLINE__", "\n"));
-        Layout layout = new LayoutHelper(customLayoutReader, preferencesService.getLayoutFormatterPreferences(), abbreviationRepository)
-                .getLayoutFromText();
+        TextBasedPreviewLayout customPreviewLayout = preferencesService
+            .getPreviewPreferences()
+            .getCustomPreviewLayout();
+        StringReader customLayoutReader = new StringReader(
+            customPreviewLayout.getText().replace("__NEWLINE__", "\n")
+        );
+        Layout layout = new LayoutHelper(
+            customLayoutReader,
+            preferencesService.getLayoutFormatterPreferences(),
+            abbreviationRepository
+        )
+            .getLayoutFromText();
 
         List<String> citations = new ArrayList<>(selectedEntries.size());
         for (BibEntry entry : selectedEntries) {
-            citations.add(layout.doLayout(entry, stateManager.getActiveDatabase().get().getDatabase()));
+            citations.add(
+                layout.doLayout(
+                    entry,
+                    stateManager.getActiveDatabase().get().getDatabase()
+                )
+            );
         }
         return citations;
     }
@@ -115,8 +147,18 @@ private List<String> generateTextBasedPreviewLayoutCitations() throws IOExceptio
      */
     protected 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.putHtml(
+            String.join(
+                CitationStyleOutputFormat.HTML.getLineSeparator(),
+                citations
+            )
+        );
+        content.putString(
+            String.join(
+                CitationStyleOutputFormat.HTML.getLineSeparator(),
+                citations
+            )
+        );
         return content;
     }
 
@@ -125,7 +167,12 @@ protected static ClipboardContent processPreview(List<String> citations) {
      */
     protected 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;
     }
 
@@ -133,17 +180,28 @@ protected static ClipboardContent processText(List<String> citations) {
      * Inserts each citation into a HTML body and copies it to the clipboard
      */
     protected 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;
-
-        result += String.join(CitationStyleOutputFormat.HTML.getLineSeparator(), citations);
-        result += OS.NEWLINE +
-                "   </body>" + OS.NEWLINE +
-                "</html>" + 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;
 
         ClipboardContent content = new ClipboardContent();
         content.putString(result);
@@ -152,7 +210,9 @@ protected static ClipboardContent processHtml(List<String> citations) {
     }
 
     private void setClipBoardContent(List<String> citations) {
-        PreviewLayout previewLayout = preferencesService.getPreviewPreferences().getSelectedPreviewLayout();
+        PreviewLayout previewLayout = preferencesService
+            .getPreviewPreferences()
+            .getSelectedPreviewLayout();
 
         // if it's not a citation style take care of the preview
         if (!(previewLayout instanceof CitationStylePreviewLayout)) {
@@ -164,13 +224,22 @@ private void setClipBoardContent(List<String> citations) {
                 case HTML -> content = processHtml(citations);
                 case TEXT -> content = processText(citations);
                 default -> {
-                    LOGGER.warn("unknown output format: '" + outputFormat + "', processing it via the default.");
+                    LOGGER.warn(
+                        "unknown output format: '" +
+                        outputFormat +
+                        "', processing it via the default."
+                    );
                     content = processText(citations);
                 }
             }
             clipBoardManager.setContent(content);
         }
 
-        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 a2416d43098..35e681d7f6b 100644
--- a/src/main/java/org/jabref/gui/preview/PreviewPanel.java
+++ b/src/main/java/org/jabref/gui/preview/PreviewPanel.java
@@ -5,7 +5,6 @@
 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;
@@ -15,7 +14,6 @@
 import javafx.scene.input.KeyEvent;
 import javafx.scene.input.TransferMode;
 import javafx.scene.layout.VBox;
-
 import org.jabref.gui.DialogService;
 import org.jabref.gui.StateManager;
 import org.jabref.gui.externalfiles.ExternalFilesEntryLinker;
@@ -31,13 +29,14 @@
 import org.jabref.model.entry.BibEntry;
 import org.jabref.preferences.PreferencesService;
 import org.jabref.preferences.PreviewPreferences;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 public class PreviewPanel extends VBox {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(PreviewPanel.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(
+        PreviewPanel.class
+    );
 
     private final ExternalFilesEntryLinker fileLinker;
     private final KeyBindingRepository keyBindingRepository;
@@ -48,29 +47,47 @@ public class PreviewPanel extends VBox {
     private final IndexingTaskManager indexingTaskManager;
     private BibEntry entry;
 
-    public PreviewPanel(BibDatabaseContext database,
-                        DialogService dialogService,
-                        KeyBindingRepository keyBindingRepository,
-                        PreferencesService preferencesService,
-                        StateManager stateManager,
-                        ThemeManager themeManager,
-                        IndexingTaskManager indexingTaskManager,
-                        TaskExecutor taskExecutor) {
+    public PreviewPanel(
+        BibDatabaseContext database,
+        DialogService dialogService,
+        KeyBindingRepository keyBindingRepository,
+        PreferencesService preferencesService,
+        StateManager stateManager,
+        ThemeManager themeManager,
+        IndexingTaskManager indexingTaskManager,
+        TaskExecutor taskExecutor
+    ) {
         this.keyBindingRepository = keyBindingRepository;
         this.dialogService = dialogService;
         this.stateManager = stateManager;
         this.previewPreferences = preferencesService.getPreviewPreferences();
         this.indexingTaskManager = indexingTaskManager;
-        this.fileLinker = new ExternalFilesEntryLinker(preferencesService.getFilePreferences(), database, dialogService);
-
-        PreviewPreferences previewPreferences = preferencesService.getPreviewPreferences();
-        previewView = new PreviewViewer(database, dialogService, preferencesService, stateManager, themeManager, taskExecutor);
+        this.fileLinker =
+            new ExternalFilesEntryLinker(
+                preferencesService.getFilePreferences(),
+                database,
+                dialogService
+            );
+
+        PreviewPreferences previewPreferences =
+            preferencesService.getPreviewPreferences();
+        previewView =
+            new PreviewViewer(
+                database,
+                dialogService,
+                preferencesService,
+                stateManager,
+                themeManager,
+                taskExecutor
+            );
         previewView.setLayout(previewPreferences.getSelectedPreviewLayout());
         previewView.setContextMenu(createPopupMenu());
         previewView.setOnDragDetected(event -> {
             previewView.startFullDrag();
 
-            Dragboard dragboard = previewView.startDragAndDrop(TransferMode.COPY);
+            Dragboard dragboard = previewView.startDragAndDrop(
+                TransferMode.COPY
+            );
             ClipboardContent content = new ClipboardContent();
             content.putHtml(previewView.getSelectionHtmlContent());
             dragboard.setContent(content);
@@ -80,7 +97,11 @@ public PreviewPanel(BibDatabaseContext database,
 
         previewView.setOnDragOver(event -> {
             if (event.getDragboard().hasFiles()) {
-                event.acceptTransferModes(TransferMode.COPY, TransferMode.MOVE, TransferMode.LINK);
+                event.acceptTransferModes(
+                    TransferMode.COPY,
+                    TransferMode.MOVE,
+                    TransferMode.LINK
+                );
             }
             event.consume();
         });
@@ -88,11 +109,20 @@ public PreviewPanel(BibDatabaseContext database,
         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());
+                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, indexingTaskManager);
+                    fileLinker.moveFilesToFileDirRenameAndAddToEntry(
+                        entry,
+                        files,
+                        indexingTaskManager
+                    );
                 }
                 if (event.getTransferMode() == TransferMode.LINK) {
                     LOGGER.debug("Node LINK"); // alt on win
@@ -100,7 +130,11 @@ public PreviewPanel(BibDatabaseContext database,
                 }
                 if (event.getTransferMode() == TransferMode.COPY) {
                     LOGGER.debug("Mode Copy"); // ctrl on win, no modifier on Xubuntu
-                    fileLinker.copyFilesToFileDirAndAddToEntry(entry, files, indexingTaskManager);
+                    fileLinker.copyFilesToFileDirAndAddToEntry(
+                        entry,
+                        files,
+                        indexingTaskManager
+                    );
                 }
                 success = true;
             }
@@ -115,33 +149,57 @@ public PreviewPanel(BibDatabaseContext database,
     }
 
     private void createKeyBindings() {
-        previewView.addEventFilter(KeyEvent.KEY_PRESSED, event -> {
-            Optional<KeyBinding> keyBinding = keyBindingRepository.mapToKeyBinding(event);
-            if (keyBinding.isPresent()) {
-                switch (keyBinding.get()) {
-                    case COPY_PREVIEW:
-                        previewView.copyPreviewToClipBoard();
-                        event.consume();
-                        break;
-                    default:
+        previewView.addEventFilter(
+            KeyEvent.KEY_PRESSED,
+            event -> {
+                Optional<KeyBinding> keyBinding =
+                    keyBindingRepository.mapToKeyBinding(event);
+                if (keyBinding.isPresent()) {
+                    switch (keyBinding.get()) {
+                        case COPY_PREVIEW:
+                            previewView.copyPreviewToClipBoard();
+                            event.consume();
+                            break;
+                        default:
+                    }
                 }
             }
-        });
+        );
     }
 
     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 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()
+        );
         printEntryPreview.setOnAction(event -> previewView.print());
-        MenuItem previousPreviewLayout = new MenuItem(Localization.lang("Previous preview layout"));
-        keyBindingRepository.getKeyCombination(KeyBinding.PREVIOUS_PREVIEW_LAYOUT).ifPresent(previousPreviewLayout::setAccelerator);
+        MenuItem previousPreviewLayout = new MenuItem(
+            Localization.lang("Previous preview layout")
+        );
+        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);
+        MenuItem nextPreviewLayout = new MenuItem(
+            Localization.lang("Next preview layout")
+        );
+        keyBindingRepository
+            .getKeyCombination(KeyBinding.NEXT_PREVIEW_LAYOUT)
+            .ifPresent(nextPreviewLayout::setAccelerator);
         nextPreviewLayout.setOnAction(event -> this.nextPreviewStyle());
 
         ContextMenu menu = new ContextMenu();
@@ -177,6 +235,11 @@ 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/PreviewViewer.java b/src/main/java/org/jabref/gui/preview/PreviewViewer.java
index 544275f741a..76a67918a0b 100644
--- a/src/main/java/org/jabref/gui/preview/PreviewViewer.java
+++ b/src/main/java/org/jabref/gui/preview/PreviewViewer.java
@@ -5,7 +5,6 @@
 import java.util.Objects;
 import java.util.Optional;
 import java.util.regex.Pattern;
-
 import javafx.beans.InvalidationListener;
 import javafx.beans.Observable;
 import javafx.beans.value.ChangeListener;
@@ -14,7 +13,6 @@
 import javafx.scene.control.ScrollPane;
 import javafx.scene.input.ClipboardContent;
 import javafx.scene.web.WebView;
-
 import org.jabref.gui.ClipBoardManager;
 import org.jabref.gui.DialogService;
 import org.jabref.gui.Globals;
@@ -31,7 +29,6 @@
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.preferences.PreferencesService;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.w3c.dom.Document;
@@ -45,78 +42,83 @@
  */
 public class PreviewViewer extends ScrollPane implements InvalidationListener {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(PreviewViewer.class);
+    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 = """
-                                                                   function getSelectionHtml() {
-                                                                   var html = "";
-                                                                   if (typeof window.getSelection != "undefined") {
-                                                                       var sel = window.getSelection();
-                                                                       if (sel.rangeCount) {
-                                                                           var container = document.createElement("div");
-                                                                           for (var i = 0, len = sel.rangeCount; i < len; ++i) {
-                                                                               container.appendChild(sel.getRangeAt(i).cloneContents());
-                                                                           }
-                                                                           html = container.innerHTML;
-                                                                       }
-                                                                   } else if (typeof document.selection != "undefined") {
-                                                                       if (document.selection.type == "Text") {
-                                                                           html = document.selection.createRange().htmlText;
-                                                                       }
-                                                                   }
-                                                                   return html;
-                                                                   }
-                                                               getSelectionHtml();
-                                                               """;
+    private static final String JS_GET_SELECTION_HTML_SCRIPT =
+        """
+            function getSelectionHtml() {
+            var html = "";
+            if (typeof window.getSelection != "undefined") {
+                var sel = window.getSelection();
+                if (sel.rangeCount) {
+                    var container = document.createElement("div");
+                    for (var i = 0, len = sel.rangeCount; i < len; ++i) {
+                        container.appendChild(sel.getRangeAt(i).cloneContents());
+                    }
+                    html = container.innerHTML;
+                }
+            } else if (typeof document.selection != "undefined") {
+                if (document.selection.type == "Text") {
+                    html = document.selection.createRange().htmlText;
+                }
+            }
+            return html;
+            }
+        getSelectionHtml();
+        """;
     private static final String JS_HIGHLIGHT_FUNCTION =
-            """
-                    <head>
-                       <meta charset="UTF-8">
-                       <style>
-                           mark{
-                               background: orange;
-                               color: black;
-                           }
-                       </style>
-                       <script type="text/javascript">
-                    /*!***************************************************
-                    * mark.js v9.0.0
-                    * https://markjs.io/
-                    * Copyright (c) 2014–2018, Julian Kühnel
-                    * Released under the MIT license https://git.io/vwTVl
-                    *****************************************************/
+        """
+        <head>
+           <meta charset="UTF-8">
+           <style>
+               mark{
+                   background: orange;
+                   color: black;
+               }
+           </style>
+           <script type="text/javascript">
+        /*!***************************************************
+        * mark.js v9.0.0
+        * https://markjs.io/
+        * Copyright (c) 2014–2018, Julian Kühnel
+        * Released under the MIT license https://git.io/vwTVl
+        *****************************************************/
 
-                    !function(e,t){"object"==typeof exports&&"undefined"!=typeof module?module.exports=t():"function"==typeof define&&define.amd?define(t):e.Mark=t()}(this,function(){"use strict";function e(t){return(e="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(e){return typeof e}:function(e){return e&&"function"==typeof Symbol&&e.constructor===Symbol&&e!==Symbol.prototype?"symbol":typeof e})(t)}function t(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}function n(e,t){for(var n=0;n<t.length;n++){var r=t[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(e,r.key,r)}}function r(e,t,r){return t&&n(e.prototype,t),r&&n(e,r),e}function o(){return(o=Object.assign||function(e){for(var t=1;t<arguments.length;t++){var n=arguments[t];for(var r in n)Object.prototype.hasOwnProperty.call(n,r)&&(e[r]=n[r])}return e}).apply(this,arguments)}var i=
+        !function(e,t){"object"==typeof exports&&"undefined"!=typeof module?module.exports=t():"function"==typeof define&&define.amd?define(t):e.Mark=t()}(this,function(){"use strict";function e(t){return(e="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(e){return typeof e}:function(e){return e&&"function"==typeof Symbol&&e.constructor===Symbol&&e!==Symbol.prototype?"symbol":typeof e})(t)}function t(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}function n(e,t){for(var n=0;n<t.length;n++){var r=t[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(e,r.key,r)}}function r(e,t,r){return t&&n(e.prototype,t),r&&n(e,r),e}function o(){return(o=Object.assign||function(e){for(var t=1;t<arguments.length;t++){var n=arguments[t];for(var r in n)Object.prototype.hasOwnProperty.call(n,r)&&(e[r]=n[r])}return e}).apply(this,arguments)}var i=
 
-                    /* */
+        /* */
 
-                    function(){function e(n){var r=!(arguments.length>1&&void 0!==arguments[1])||arguments[1],o=arguments.length>2&&void 0!==arguments[2]?arguments[2]:[],i=arguments.length>3&&void 0!==arguments[3]?arguments[3]:5e3;t(this,e),this.ctx=n,this.iframes=r,this.exclude=o,this.iframesTimeout=i}return r(e,[{key:"getContexts",value:function(){var e=[];return(void 0!==this.ctx&&this.ctx?NodeList.prototype.isPrototypeOf(this.ctx)?Array.prototype.slice.call(this.ctx):Array.isArray(this.ctx)?this.ctx:"string"==typeof this.ctx?Array.prototype.slice.call(document.querySelectorAll(this.ctx)):[this.ctx]:[]).forEach(function(t){var n=e.filter(function(e){return e.contains(t)}).length>0;-1!==e.indexOf(t)||n||e.push(t)}),e}},{key:"getIframeContents",value:function(e,t){var n,r=arguments.length>2&&void 0!==arguments[2]?arguments[2]:function(){};try{var o=e.contentWindow;if(n=o.document,!o||!n)throw new Error("iframe inaccessible")}catch(e){r()}n&&t(n)}},{key:"isIframeBlank",value:function(e){var t="about:blank",n=e.getAttribute("src").trim();return e.contentWindow.location.href===t&&n!==t&&n}},{key:"observeIframeLoad",value:function(e,t,n){var r=this,o=!1,i=null,a=function a(){if(!o){o=!0,clearTimeout(i);try{r.isIframeBlank(e)||(e.removeEventListener("load",a),r.getIframeContents(e,t,n))}catch(e){n()}}};e.addEventListener("load",a),i=setTimeout(a,this.iframesTimeout)}},{key:"onIframeReady",value:function(e,t,n){try{"complete"===e.contentWindow.document.readyState?this.isIframeBlank(e)?this.observeIframeLoad(e,t,n):this.getIframeContents(e,t,n):this.observeIframeLoad(e,t,n)}catch(e){n()}}},{key:"waitForIframes",value:function(e,t){var n=this,r=0;this.forEachIframe(e,function(){return!0},function(e){r++,n.waitForIframes(e.querySelector("html"),function(){--r||t()})},function(e){e||t()})}},{key:"forEachIframe",value:function(t,n,r){var o=this,i=arguments.length>3&&void 0!==arguments[3]?arguments[3]:function(){},a=t.querySelectorAll("iframe"),s=a.length,c=0;a=Array.prototype.slice.call(a);var u=function(){--s<=0&&i(c)};s||u(),a.forEach(function(t){e.matches(t,o.exclude)?u():o.onIframeReady(t,function(e){n(t)&&(c++,r(e)),u()},u)})}},{key:"createIterator",value:function(e,t,n){return document.createNodeIterator(e,t,n,!1)}},{key:"createInstanceOnIframe",value:function(t){return new e(t.querySelector("html"),this.iframes)}},{key:"compareNodeIframe",value:function(e,t,n){if(e.compareDocumentPosition(n)&Node.DOCUMENT_POSITION_PRECEDING){if(null===t)return!0;if(t.compareDocumentPosition(n)&Node.DOCUMENT_POSITION_FOLLOWING)return!0}return!1}},{key:"getIteratorNode",value:function(e){var t=e.previousNode();return{prevNode:t,node:null===t?e.nextNode():e.nextNode()&&e.nextNode()}}},{key:"checkIframeFilter",value:function(e,t,n,r){var o=!1,i=!1;return r.forEach(function(e,t){e.val===n&&(o=t,i=e.handled)}),this.compareNodeIframe(e,t,n)?(!1!==o||i?!1===o||i||(r[o].handled=!0):r.push({val:n,handled:!0}),!0):(!1===o&&r.push({val:n,handled:!1}),!1)}},{key:"handleOpenIframes",value:function(e,t,n,r){var o=this;e.forEach(function(e){e.handled||o.getIframeContents(e.val,function(e){o.createInstanceOnIframe(e).forEachNode(t,n,r)})})}},{key:"iterateThroughNodes",value:function(e,t,n,r,o){for(var i,a,s,c=this,u=this.createIterator(t,e,r),l=[],h=[];s=void 0,s=c.getIteratorNode(u),a=s.prevNode,i=s.node;)this.iframes&&this.forEachIframe(t,function(e){return c.checkIframeFilter(i,a,e,l)},function(t){c.createInstanceOnIframe(t).forEachNode(e,function(e){return h.push(e)},r)}),h.push(i);h.forEach(function(e){n(e)}),this.iframes&&this.handleOpenIframes(l,e,n,r),o()}},{key:"forEachNode",value:function(e,t,n){var r=this,o=arguments.length>3&&void 0!==arguments[3]?arguments[3]:function(){},i=this.getContexts(),a=i.length;a||o(),i.forEach(function(i){var s=function(){r.iterateThroughNodes(e,i,t,n,function(){--a<=0&&o()})};r.iframes?r.waitForIframes(i,s):s()})}}],[{key:"matches",value:function(e,t){var n="string"==typeof t?[t]:t,r=e.matches||e.matchesSelector||e.msMatchesSelector||e.mozMatchesSelector||e.oMatchesSelector||e.webkitMatchesSelector;if(r){var o=!1;return n.every(function(t){return!r.call(e,t)||(o=!0,!1)}),o}return!1}}]),e}(),a=
+        function(){function e(n){var r=!(arguments.length>1&&void 0!==arguments[1])||arguments[1],o=arguments.length>2&&void 0!==arguments[2]?arguments[2]:[],i=arguments.length>3&&void 0!==arguments[3]?arguments[3]:5e3;t(this,e),this.ctx=n,this.iframes=r,this.exclude=o,this.iframesTimeout=i}return r(e,[{key:"getContexts",value:function(){var e=[];return(void 0!==this.ctx&&this.ctx?NodeList.prototype.isPrototypeOf(this.ctx)?Array.prototype.slice.call(this.ctx):Array.isArray(this.ctx)?this.ctx:"string"==typeof this.ctx?Array.prototype.slice.call(document.querySelectorAll(this.ctx)):[this.ctx]:[]).forEach(function(t){var n=e.filter(function(e){return e.contains(t)}).length>0;-1!==e.indexOf(t)||n||e.push(t)}),e}},{key:"getIframeContents",value:function(e,t){var n,r=arguments.length>2&&void 0!==arguments[2]?arguments[2]:function(){};try{var o=e.contentWindow;if(n=o.document,!o||!n)throw new Error("iframe inaccessible")}catch(e){r()}n&&t(n)}},{key:"isIframeBlank",value:function(e){var t="about:blank",n=e.getAttribute("src").trim();return e.contentWindow.location.href===t&&n!==t&&n}},{key:"observeIframeLoad",value:function(e,t,n){var r=this,o=!1,i=null,a=function a(){if(!o){o=!0,clearTimeout(i);try{r.isIframeBlank(e)||(e.removeEventListener("load",a),r.getIframeContents(e,t,n))}catch(e){n()}}};e.addEventListener("load",a),i=setTimeout(a,this.iframesTimeout)}},{key:"onIframeReady",value:function(e,t,n){try{"complete"===e.contentWindow.document.readyState?this.isIframeBlank(e)?this.observeIframeLoad(e,t,n):this.getIframeContents(e,t,n):this.observeIframeLoad(e,t,n)}catch(e){n()}}},{key:"waitForIframes",value:function(e,t){var n=this,r=0;this.forEachIframe(e,function(){return!0},function(e){r++,n.waitForIframes(e.querySelector("html"),function(){--r||t()})},function(e){e||t()})}},{key:"forEachIframe",value:function(t,n,r){var o=this,i=arguments.length>3&&void 0!==arguments[3]?arguments[3]:function(){},a=t.querySelectorAll("iframe"),s=a.length,c=0;a=Array.prototype.slice.call(a);var u=function(){--s<=0&&i(c)};s||u(),a.forEach(function(t){e.matches(t,o.exclude)?u():o.onIframeReady(t,function(e){n(t)&&(c++,r(e)),u()},u)})}},{key:"createIterator",value:function(e,t,n){return document.createNodeIterator(e,t,n,!1)}},{key:"createInstanceOnIframe",value:function(t){return new e(t.querySelector("html"),this.iframes)}},{key:"compareNodeIframe",value:function(e,t,n){if(e.compareDocumentPosition(n)&Node.DOCUMENT_POSITION_PRECEDING){if(null===t)return!0;if(t.compareDocumentPosition(n)&Node.DOCUMENT_POSITION_FOLLOWING)return!0}return!1}},{key:"getIteratorNode",value:function(e){var t=e.previousNode();return{prevNode:t,node:null===t?e.nextNode():e.nextNode()&&e.nextNode()}}},{key:"checkIframeFilter",value:function(e,t,n,r){var o=!1,i=!1;return r.forEach(function(e,t){e.val===n&&(o=t,i=e.handled)}),this.compareNodeIframe(e,t,n)?(!1!==o||i?!1===o||i||(r[o].handled=!0):r.push({val:n,handled:!0}),!0):(!1===o&&r.push({val:n,handled:!1}),!1)}},{key:"handleOpenIframes",value:function(e,t,n,r){var o=this;e.forEach(function(e){e.handled||o.getIframeContents(e.val,function(e){o.createInstanceOnIframe(e).forEachNode(t,n,r)})})}},{key:"iterateThroughNodes",value:function(e,t,n,r,o){for(var i,a,s,c=this,u=this.createIterator(t,e,r),l=[],h=[];s=void 0,s=c.getIteratorNode(u),a=s.prevNode,i=s.node;)this.iframes&&this.forEachIframe(t,function(e){return c.checkIframeFilter(i,a,e,l)},function(t){c.createInstanceOnIframe(t).forEachNode(e,function(e){return h.push(e)},r)}),h.push(i);h.forEach(function(e){n(e)}),this.iframes&&this.handleOpenIframes(l,e,n,r),o()}},{key:"forEachNode",value:function(e,t,n){var r=this,o=arguments.length>3&&void 0!==arguments[3]?arguments[3]:function(){},i=this.getContexts(),a=i.length;a||o(),i.forEach(function(i){var s=function(){r.iterateThroughNodes(e,i,t,n,function(){--a<=0&&o()})};r.iframes?r.waitForIframes(i,s):s()})}}],[{key:"matches",value:function(e,t){var n="string"==typeof t?[t]:t,r=e.matches||e.matchesSelector||e.msMatchesSelector||e.mozMatchesSelector||e.oMatchesSelector||e.webkitMatchesSelector;if(r){var o=!1;return n.every(function(t){return!r.call(e,t)||(o=!0,!1)}),o}return!1}}]),e}(),a=
 
-                    /* */
+        /* */
 
-                    function(){function e(n){t(this,e),this.opt=o({},{diacritics:!0,synonyms:{},accuracy:"partially",caseSensitive:!1,ignoreJoiners:!1,ignorePunctuation:[],wildcards:"disabled"},n)}return r(e,[{key:"create",value:function(e){return"disabled"!==this.opt.wildcards&&(e=this.setupWildcardsRegExp(e)),e=this.escapeStr(e),Object.keys(this.opt.synonyms).length&&(e=this.createSynonymsRegExp(e)),(this.opt.ignoreJoiners||this.opt.ignorePunctuation.length)&&(e=this.setupIgnoreJoinersRegExp(e)),this.opt.diacritics&&(e=this.createDiacriticsRegExp(e)),e=this.createMergedBlanksRegExp(e),(this.opt.ignoreJoiners||this.opt.ignorePunctuation.length)&&(e=this.createJoinersRegExp(e)),"disabled"!==this.opt.wildcards&&(e=this.createWildcardsRegExp(e)),e=this.createAccuracyRegExp(e),new RegExp(e,"gm".concat(this.opt.caseSensitive?"":"i"))}},{key:"sortByLength",value:function(e){return e.sort(function(e,t){return e.length===t.length?e>t?1:-1:t.length-e.length})}},{key:"escapeStr",value:function(e){return e.replace(/[\\-\\[\\]\\/\\{\\}\\(\\)\\*\\+\\?\\.\\\\\\^\\$\\|]/g,"\\\\$&")}},{key:"createSynonymsRegExp",value:function(e){var t=this,n=this.opt.synonyms,r=this.opt.caseSensitive?"":"i",o=this.opt.ignoreJoiners||this.opt.ignorePunctuation.length?"\\0":"";for(var i in n)if(n.hasOwnProperty(i)){var a=Array.isArray(n[i])?n[i]:[n[i]];a.unshift(i),(a=this.sortByLength(a).map(function(e){return"disabled"!==t.opt.wildcards&&(e=t.setupWildcardsRegExp(e)),e=t.escapeStr(e)}).filter(function(e){return""!==e})).length>1&&(e=e.replace(new RegExp("(".concat(a.map(function(e){return t.escapeStr(e)}).join("|"),")"),"gm".concat(r)),o+"(".concat(a.map(function(e){return t.processSynonyms(e)}).join("|"),")")+o))}return e}},{key:"processSynonyms",value:function(e){return(this.opt.ignoreJoiners||this.opt.ignorePunctuation.length)&&(e=this.setupIgnoreJoinersRegExp(e)),e}},{key:"setupWildcardsRegExp",value:function(e){return(e=e.replace(/(?:\\\\)*\\?/g,function(e){return"\\\\"===e.charAt(0)?"?":"\u0001"})).replace(/(?:\\\\)*\\*/g,function(e){return"\\\\"===e.charAt(0)?"*":"\u0002"})}},{key:"createWildcardsRegExp",value:function(e){var t="withSpaces"===this.opt.wildcards;return e.replace(/\\u0001/g,t?"[\\\\S\\\\s]?":"\\\\S?").replace(/\\u0002/g,t?"[\\\\S\\\\s]*?":"\\\\S*")}},{key:"setupIgnoreJoinersRegExp",value:function(e){return e.replace(/[^(|)\\\\]/g,function(e,t,n){var r=n.charAt(t+1);return/[(|)\\\\]/.test(r)||""===r?e:e+"\\0"})}},{key:"createJoinersRegExp",value:function(e){var t=[],n=this.opt.ignorePunctuation;return Array.isArray(n)&&n.length&&t.push(this.escapeStr(n.join(""))),this.opt.ignoreJoiners&&t.push("\\\\u00ad\\\\u200b\\\\u200c\\\\u200d"),t.length?e.split(/\\u0000+/).join("[".concat(t.join(""),"]*")):e}},{key:"createDiacriticsRegExp",value:function(e){var t=this.opt.caseSensitive?"":"i",n=this.opt.caseSensitive?["aàáảãạăằắẳẵặâầấẩẫậäåāą","AÀÁẢÃẠĂẰẮẲẴẶÂẦẤẨẪẬÄÅĀĄ","cçćč","CÇĆČ","dđď","DĐĎ","eèéẻẽẹêềếểễệëěēę","EÈÉẺẼẸÊỀẾỂỄỆËĚĒĘ","iìíỉĩịîïī","IÌÍỈĨỊÎÏĪ","lł","LŁ","nñňń","NÑŇŃ","oòóỏõọôồốổỗộơởỡớờợöøō","OÒÓỎÕỌÔỒỐỔỖỘƠỞỠỚỜỢÖØŌ","rř","RŘ","sšśșş","SŠŚȘŞ","tťțţ","TŤȚŢ","uùúủũụưừứửữựûüůū","UÙÚỦŨỤƯỪỨỬỮỰÛÜŮŪ","yýỳỷỹỵÿ","YÝỲỶỸỴŸ","zžżź","ZŽŻŹ"]:["aàáảãạăằắẳẵặâầấẩẫậäåāąAÀÁẢÃẠĂẰẮẲẴẶÂẦẤẨẪẬÄÅĀĄ","cçćčCÇĆČ","dđďDĐĎ","eèéẻẽẹêềếểễệëěēęEÈÉẺẼẸÊỀẾỂỄỆËĚĒĘ","iìíỉĩịîïīIÌÍỈĨỊÎÏĪ","lłLŁ","nñňńNÑŇŃ","oòóỏõọôồốổỗộơởỡớờợöøōOÒÓỎÕỌÔỒỐỔỖỘƠỞỠỚỜỢÖØŌ","rřRŘ","sšśșşSŠŚȘŞ","tťțţTŤȚŢ","uùúủũụưừứửữựûüůūUÙÚỦŨỤƯỪỨỬỮỰÛÜŮŪ","yýỳỷỹỵÿYÝỲỶỸỴŸ","zžżźZŽŻŹ"],r=[];return e.split("").forEach(function(o){n.every(function(n){if(-1!==n.indexOf(o)){if(r.indexOf(n)>-1)return!1;e=e.replace(new RegExp("[".concat(n,"]"),"gm".concat(t)),"[".concat(n,"]")),r.push(n)}return!0})}),e}},{key:"createMergedBlanksRegExp",value:function(e){return e.replace(/[\\s]+/gim,"[\\\\s]+")}},{key:"createAccuracyRegExp",value:function(e){var t=this,n=this.opt.accuracy,r="string"==typeof n?n:n.value,o="string"==typeof n?[]:n.limiters,i="";switch(o.forEach(function(e){i+="|".concat(t.escapeStr(e))}),r){case"partially":default:return"()(".concat(e,")");case"complementary":return i="\\\\s"+(i||this.escapeStr("!\\"#$%&'()*+,-./:;<=>?@[\\\\]^_`{|}~¡¿")),"()([^".concat(i,"]*").concat(e,"[^").concat(i,"]*)");case"exactly":return"(^|\\\\s".concat(i,")(").concat(e,")(?=$|\\\\s").concat(i,")")}}}]),e}(),s=
+        function(){function e(n){t(this,e),this.opt=o({},{diacritics:!0,synonyms:{},accuracy:"partially",caseSensitive:!1,ignoreJoiners:!1,ignorePunctuation:[],wildcards:"disabled"},n)}return r(e,[{key:"create",value:function(e){return"disabled"!==this.opt.wildcards&&(e=this.setupWildcardsRegExp(e)),e=this.escapeStr(e),Object.keys(this.opt.synonyms).length&&(e=this.createSynonymsRegExp(e)),(this.opt.ignoreJoiners||this.opt.ignorePunctuation.length)&&(e=this.setupIgnoreJoinersRegExp(e)),this.opt.diacritics&&(e=this.createDiacriticsRegExp(e)),e=this.createMergedBlanksRegExp(e),(this.opt.ignoreJoiners||this.opt.ignorePunctuation.length)&&(e=this.createJoinersRegExp(e)),"disabled"!==this.opt.wildcards&&(e=this.createWildcardsRegExp(e)),e=this.createAccuracyRegExp(e),new RegExp(e,"gm".concat(this.opt.caseSensitive?"":"i"))}},{key:"sortByLength",value:function(e){return e.sort(function(e,t){return e.length===t.length?e>t?1:-1:t.length-e.length})}},{key:"escapeStr",value:function(e){return e.replace(/[\\-\\[\\]\\/\\{\\}\\(\\)\\*\\+\\?\\.\\\\\\^\\$\\|]/g,"\\\\$&")}},{key:"createSynonymsRegExp",value:function(e){var t=this,n=this.opt.synonyms,r=this.opt.caseSensitive?"":"i",o=this.opt.ignoreJoiners||this.opt.ignorePunctuation.length?"\\0":"";for(var i in n)if(n.hasOwnProperty(i)){var a=Array.isArray(n[i])?n[i]:[n[i]];a.unshift(i),(a=this.sortByLength(a).map(function(e){return"disabled"!==t.opt.wildcards&&(e=t.setupWildcardsRegExp(e)),e=t.escapeStr(e)}).filter(function(e){return""!==e})).length>1&&(e=e.replace(new RegExp("(".concat(a.map(function(e){return t.escapeStr(e)}).join("|"),")"),"gm".concat(r)),o+"(".concat(a.map(function(e){return t.processSynonyms(e)}).join("|"),")")+o))}return e}},{key:"processSynonyms",value:function(e){return(this.opt.ignoreJoiners||this.opt.ignorePunctuation.length)&&(e=this.setupIgnoreJoinersRegExp(e)),e}},{key:"setupWildcardsRegExp",value:function(e){return(e=e.replace(/(?:\\\\)*\\?/g,function(e){return"\\\\"===e.charAt(0)?"?":"\u0001"})).replace(/(?:\\\\)*\\*/g,function(e){return"\\\\"===e.charAt(0)?"*":"\u0002"})}},{key:"createWildcardsRegExp",value:function(e){var t="withSpaces"===this.opt.wildcards;return e.replace(/\\u0001/g,t?"[\\\\S\\\\s]?":"\\\\S?").replace(/\\u0002/g,t?"[\\\\S\\\\s]*?":"\\\\S*")}},{key:"setupIgnoreJoinersRegExp",value:function(e){return e.replace(/[^(|)\\\\]/g,function(e,t,n){var r=n.charAt(t+1);return/[(|)\\\\]/.test(r)||""===r?e:e+"\\0"})}},{key:"createJoinersRegExp",value:function(e){var t=[],n=this.opt.ignorePunctuation;return Array.isArray(n)&&n.length&&t.push(this.escapeStr(n.join(""))),this.opt.ignoreJoiners&&t.push("\\\\u00ad\\\\u200b\\\\u200c\\\\u200d"),t.length?e.split(/\\u0000+/).join("[".concat(t.join(""),"]*")):e}},{key:"createDiacriticsRegExp",value:function(e){var t=this.opt.caseSensitive?"":"i",n=this.opt.caseSensitive?["aàáảãạăằắẳẵặâầấẩẫậäåāą","AÀÁẢÃẠĂẰẮẲẴẶÂẦẤẨẪẬÄÅĀĄ","cçćč","CÇĆČ","dđď","DĐĎ","eèéẻẽẹêềếểễệëěēę","EÈÉẺẼẸÊỀẾỂỄỆËĚĒĘ","iìíỉĩịîïī","IÌÍỈĨỊÎÏĪ","lł","LŁ","nñňń","NÑŇŃ","oòóỏõọôồốổỗộơởỡớờợöøō","OÒÓỎÕỌÔỒỐỔỖỘƠỞỠỚỜỢÖØŌ","rř","RŘ","sšśșş","SŠŚȘŞ","tťțţ","TŤȚŢ","uùúủũụưừứửữựûüůū","UÙÚỦŨỤƯỪỨỬỮỰÛÜŮŪ","yýỳỷỹỵÿ","YÝỲỶỸỴŸ","zžżź","ZŽŻŹ"]:["aàáảãạăằắẳẵặâầấẩẫậäåāąAÀÁẢÃẠĂẰẮẲẴẶÂẦẤẨẪẬÄÅĀĄ","cçćčCÇĆČ","dđďDĐĎ","eèéẻẽẹêềếểễệëěēęEÈÉẺẼẸÊỀẾỂỄỆËĚĒĘ","iìíỉĩịîïīIÌÍỈĨỊÎÏĪ","lłLŁ","nñňńNÑŇŃ","oòóỏõọôồốổỗộơởỡớờợöøōOÒÓỎÕỌÔỒỐỔỖỘƠỞỠỚỜỢÖØŌ","rřRŘ","sšśșşSŠŚȘŞ","tťțţTŤȚŢ","uùúủũụưừứửữựûüůūUÙÚỦŨỤƯỪỨỬỮỰÛÜŮŪ","yýỳỷỹỵÿYÝỲỶỸỴŸ","zžżźZŽŻŹ"],r=[];return e.split("").forEach(function(o){n.every(function(n){if(-1!==n.indexOf(o)){if(r.indexOf(n)>-1)return!1;e=e.replace(new RegExp("[".concat(n,"]"),"gm".concat(t)),"[".concat(n,"]")),r.push(n)}return!0})}),e}},{key:"createMergedBlanksRegExp",value:function(e){return e.replace(/[\\s]+/gim,"[\\\\s]+")}},{key:"createAccuracyRegExp",value:function(e){var t=this,n=this.opt.accuracy,r="string"==typeof n?n:n.value,o="string"==typeof n?[]:n.limiters,i="";switch(o.forEach(function(e){i+="|".concat(t.escapeStr(e))}),r){case"partially":default:return"()(".concat(e,")");case"complementary":return i="\\\\s"+(i||this.escapeStr("!\\"#$%&'()*+,-./:;<=>?@[\\\\]^_`{|}~¡¿")),"()([^".concat(i,"]*").concat(e,"[^").concat(i,"]*)");case"exactly":return"(^|\\\\s".concat(i,")(").concat(e,")(?=$|\\\\s").concat(i,")")}}}]),e}(),s=
 
-                    /* */
+        /* */
 
-                    function(){function n(e){t(this,n),this.ctx=e,this.ie=!1;var r=window.navigator.userAgent;(r.indexOf("MSIE")>-1||r.indexOf("Trident")>-1)&&(this.ie=!0)}return r(n,[{key:"log",value:function(t){var n=arguments.length>1&&void 0!==arguments[1]?arguments[1]:"debug",r=this.opt.log;this.opt.debug&&"object"===e(r)&&"function"==typeof r[n]&&r[n]("mark.js: ".concat(t))}},{key:"getSeparatedKeywords",value:function(e){var t=this,n=[];return e.forEach(function(e){t.opt.separateWordSearch?e.split(" ").forEach(function(e){e.trim()&&-1===n.indexOf(e)&&n.push(e)}):e.trim()&&-1===n.indexOf(e)&&n.push(e)}),{keywords:n.sort(function(e,t){return t.length-e.length}),length:n.length}}},{key:"isNumeric",value:function(e){return Number(parseFloat(e))==e}},{key:"checkRanges",value:function(e){var t=this;if(!Array.isArray(e)||"[object Object]"!==Object.prototype.toString.call(e[0]))return this.log("markRanges() will only accept an array of objects"),this.opt.noMatch(e),[];var n=[],r=0;return e.sort(function(e,t){return e.start-t.start}).forEach(function(e){var o=t.callNoMatchOnInvalidRanges(e,r),i=o.start,a=o.end;o.valid&&(e.start=i,e.length=a-i,n.push(e),r=a)}),n}},{key:"callNoMatchOnInvalidRanges",value:function(e,t){var n,r,o=!1;return e&&void 0!==e.start?(r=(n=parseInt(e.start,10))+parseInt(e.length,10),this.isNumeric(e.start)&&this.isNumeric(e.length)&&r-t>0&&r-n>0?o=!0:(this.log("Ignoring invalid or overlapping range: "+"".concat(JSON.stringify(e))),this.opt.noMatch(e))):(this.log("Ignoring invalid range: ".concat(JSON.stringify(e))),this.opt.noMatch(e)),{start:n,end:r,valid:o}}},{key:"checkWhitespaceRanges",value:function(e,t,n){var r,o=!0,i=n.length,a=t-i,s=parseInt(e.start,10)-a;return(r=(s=s>i?i:s)+parseInt(e.length,10))>i&&(r=i,this.log("End range automatically set to the max value of ".concat(i))),s<0||r-s<0||s>i||r>i?(o=!1,this.log("Invalid range: ".concat(JSON.stringify(e))),this.opt.noMatch(e)):""===n.substring(s,r).replace(/\\s+/g,"")&&(o=!1,this.log("Skipping whitespace only range: "+JSON.stringify(e)),this.opt.noMatch(e)),{start:s,end:r,valid:o}}},{key:"getTextNodes",value:function(e){var t=this,n="",r=[];this.iterator.forEachNode(NodeFilter.SHOW_TEXT,function(e){r.push({start:n.length,end:(n+=e.textContent).length,node:e})},function(e){return t.matchesExclude(e.parentNode)?NodeFilter.FILTER_REJECT:NodeFilter.FILTER_ACCEPT},function(){e({value:n,nodes:r})})}},{key:"matchesExclude",value:function(e){return i.matches(e,this.opt.exclude.concat(["script","style","title","head","html"]))}},{key:"wrapRangeInTextNode",value:function(e,t,n){var r=this.opt.element?this.opt.element:"mark",o=e.splitText(t),i=o.splitText(n-t),a=document.createElement(r);return a.setAttribute("data-markjs","true"),this.opt.className&&a.setAttribute("class",this.opt.className),a.textContent=o.textContent,o.parentNode.replaceChild(a,o),i}},{key:"wrapRangeInMappedTextNode",value:function(e,t,n,r,o){var i=this;e.nodes.every(function(a,s){var c=e.nodes[s+1];if(void 0===c||c.start>t){if(!r(a.node))return!1;var u=t-a.start,l=(n>a.end?a.end:n)-a.start,h=e.value.substr(0,a.start),f=e.value.substr(l+a.start);if(a.node=i.wrapRangeInTextNode(a.node,u,l),e.value=h+f,e.nodes.forEach(function(t,n){n>=s&&(e.nodes[n].start>0&&n!==s&&(e.nodes[n].start-=l),e.nodes[n].end-=l)}),n-=l,o(a.node.previousSibling,a.start),!(n>a.end))return!1;t=a.end}return!0})}},{key:"wrapGroups",value:function(e,t,n,r){return r((e=this.wrapRangeInTextNode(e,t,t+n)).previousSibling),e}},{key:"separateGroups",value:function(e,t,n,r,o){for(var i=t.length,a=1;a<i;a++){var s=e.textContent.indexOf(t[a]);t[a]&&s>-1&&r(t[a],e)&&(e=this.wrapGroups(e,s,t[a].length,o))}return e}},{key:"wrapMatches",value:function(e,t,n,r,o){var i=this,a=0===t?0:t+1;this.getTextNodes(function(t){t.nodes.forEach(function(t){var o;for(t=t.node;null!==(o=e.exec(t.textContent))&&""!==o[a];){if(i.opt.separateGroups)t=i.separateGroups(t,o,a,n,r);else{if(!n(o[a],t))continue;var s=o.index;if(0!==a)for(var c=1;c<a;c++)s+=o[c].length;t=i.wrapGroups(t,s,o[a].length,r)}e.lastIndex=0}}),o()})}},{key:"wrapMatchesAcrossElements",value:function(e,t,n,r,o){var i=this,a=0===t?0:t+1;this.getTextNodes(function(t){for(var s;null!==(s=e.exec(t.value))&&""!==s[a];){var c=s.index;if(0!==a)for(var u=1;u<a;u++)c+=s[u].length;var l=c+s[a].length;i.wrapRangeInMappedTextNode(t,c,l,function(e){return n(s[a],e)},function(t,n){e.lastIndex=n,r(t)})}o()})}},{key:"wrapRangeFromIndex",value:function(e,t,n,r){var o=this;this.getTextNodes(function(i){var a=i.value.length;e.forEach(function(e,r){var s=o.checkWhitespaceRanges(e,a,i.value),c=s.start,u=s.end;s.valid&&o.wrapRangeInMappedTextNode(i,c,u,function(n){return t(n,e,i.value.substring(c,u),r)},function(t){n(t,e)})}),r()})}},{key:"unwrapMatches",value:function(e){for(var t=e.parentNode,n=document.createDocumentFragment();e.firstChild;)n.appendChild(e.removeChild(e.firstChild));t.replaceChild(n,e),this.ie?this.normalizeTextNode(t):t.normalize()}},{key:"normalizeTextNode",value:function(e){if(e){if(3===e.nodeType)for(;e.nextSibling&&3===e.nextSibling.nodeType;)e.nodeValue+=e.nextSibling.nodeValue,e.parentNode.removeChild(e.nextSibling);else this.normalizeTextNode(e.firstChild);this.normalizeTextNode(e.nextSibling)}}},{key:"markRegExp",value:function(e,t){var n=this;this.opt=t,this.log('Searching with expression "'.concat(e,'"'));var r=0,o="wrapMatches";this.opt.acrossElements&&(o="wrapMatchesAcrossElements"),this[o](e,this.opt.ignoreGroups,function(e,t){return n.opt.filter(t,e,r)},function(e){r++,n.opt.each(e)},function(){0===r&&n.opt.noMatch(e),n.opt.done(r)})}},{key:"mark",value:function(e,t){var n=this;this.opt=t;var r=0,o="wrapMatches",i=this.getSeparatedKeywords("string"==typeof e?[e]:e),s=i.keywords,c=i.length;this.opt.acrossElements&&(o="wrapMatchesAcrossElements"),0===c?this.opt.done(r):function e(t){var i=new a(n.opt).create(t),u=0;n.log('Searching with expression "'.concat(i,'"')),n[o](i,1,function(e,o){return n.opt.filter(o,t,r,u)},function(e){u++,r++,n.opt.each(e)},function(){0===u&&n.opt.noMatch(t),s[c-1]===t?n.opt.done(r):e(s[s.indexOf(t)+1])})}(s[0])}},{key:"markRanges",value:function(e,t){var n=this;this.opt=t;var r=0,o=this.checkRanges(e);o&&o.length?(this.log("Starting to mark with the following ranges: "+JSON.stringify(o)),this.wrapRangeFromIndex(o,function(e,t,r,o){return n.opt.filter(e,t,r,o)},function(e,t){r++,n.opt.each(e,t)},function(){n.opt.done(r)})):this.opt.done(r)}},{key:"unmark",value:function(e){var t=this;this.opt=e;var n=this.opt.element?this.opt.element:"*";n+="[data-markjs]",this.opt.className&&(n+=".".concat(this.opt.className)),this.log('Removal selector "'.concat(n,'"')),this.iterator.forEachNode(NodeFilter.SHOW_ELEMENT,function(e){t.unwrapMatches(e)},function(e){var r=i.matches(e,n),o=t.matchesExclude(e);return!r||o?NodeFilter.FILTER_REJECT:NodeFilter.FILTER_ACCEPT},this.opt.done)}},{key:"opt",set:function(e){this._opt=o({},{element:"",className:"",exclude:[],iframes:!1,iframesTimeout:5e3,separateWordSearch:!0,acrossElements:!1,ignoreGroups:0,each:function(){},noMatch:function(){},filter:function(){return!0},done:function(){},debug:!1,log:window.console},e)},get:function(){return this._opt}},{key:"iterator",get:function(){return new i(this.ctx,this.opt.iframes,this.opt.exclude,this.opt.iframesTimeout)}}]),n}();return function(e){var t=this,n=new s(e);return this.mark=function(e,r){return n.mark(e,r),t},this.markRegExp=function(e,r){return n.markRegExp(e,r),t},this.markRanges=function(e,r){return n.markRanges(e,r),t},this.unmark=function(e){return n.unmark(e),t},this}});
+        function(){function n(e){t(this,n),this.ctx=e,this.ie=!1;var r=window.navigator.userAgent;(r.indexOf("MSIE")>-1||r.indexOf("Trident")>-1)&&(this.ie=!0)}return r(n,[{key:"log",value:function(t){var n=arguments.length>1&&void 0!==arguments[1]?arguments[1]:"debug",r=this.opt.log;this.opt.debug&&"object"===e(r)&&"function"==typeof r[n]&&r[n]("mark.js: ".concat(t))}},{key:"getSeparatedKeywords",value:function(e){var t=this,n=[];return e.forEach(function(e){t.opt.separateWordSearch?e.split(" ").forEach(function(e){e.trim()&&-1===n.indexOf(e)&&n.push(e)}):e.trim()&&-1===n.indexOf(e)&&n.push(e)}),{keywords:n.sort(function(e,t){return t.length-e.length}),length:n.length}}},{key:"isNumeric",value:function(e){return Number(parseFloat(e))==e}},{key:"checkRanges",value:function(e){var t=this;if(!Array.isArray(e)||"[object Object]"!==Object.prototype.toString.call(e[0]))return this.log("markRanges() will only accept an array of objects"),this.opt.noMatch(e),[];var n=[],r=0;return e.sort(function(e,t){return e.start-t.start}).forEach(function(e){var o=t.callNoMatchOnInvalidRanges(e,r),i=o.start,a=o.end;o.valid&&(e.start=i,e.length=a-i,n.push(e),r=a)}),n}},{key:"callNoMatchOnInvalidRanges",value:function(e,t){var n,r,o=!1;return e&&void 0!==e.start?(r=(n=parseInt(e.start,10))+parseInt(e.length,10),this.isNumeric(e.start)&&this.isNumeric(e.length)&&r-t>0&&r-n>0?o=!0:(this.log("Ignoring invalid or overlapping range: "+"".concat(JSON.stringify(e))),this.opt.noMatch(e))):(this.log("Ignoring invalid range: ".concat(JSON.stringify(e))),this.opt.noMatch(e)),{start:n,end:r,valid:o}}},{key:"checkWhitespaceRanges",value:function(e,t,n){var r,o=!0,i=n.length,a=t-i,s=parseInt(e.start,10)-a;return(r=(s=s>i?i:s)+parseInt(e.length,10))>i&&(r=i,this.log("End range automatically set to the max value of ".concat(i))),s<0||r-s<0||s>i||r>i?(o=!1,this.log("Invalid range: ".concat(JSON.stringify(e))),this.opt.noMatch(e)):""===n.substring(s,r).replace(/\\s+/g,"")&&(o=!1,this.log("Skipping whitespace only range: "+JSON.stringify(e)),this.opt.noMatch(e)),{start:s,end:r,valid:o}}},{key:"getTextNodes",value:function(e){var t=this,n="",r=[];this.iterator.forEachNode(NodeFilter.SHOW_TEXT,function(e){r.push({start:n.length,end:(n+=e.textContent).length,node:e})},function(e){return t.matchesExclude(e.parentNode)?NodeFilter.FILTER_REJECT:NodeFilter.FILTER_ACCEPT},function(){e({value:n,nodes:r})})}},{key:"matchesExclude",value:function(e){return i.matches(e,this.opt.exclude.concat(["script","style","title","head","html"]))}},{key:"wrapRangeInTextNode",value:function(e,t,n){var r=this.opt.element?this.opt.element:"mark",o=e.splitText(t),i=o.splitText(n-t),a=document.createElement(r);return a.setAttribute("data-markjs","true"),this.opt.className&&a.setAttribute("class",this.opt.className),a.textContent=o.textContent,o.parentNode.replaceChild(a,o),i}},{key:"wrapRangeInMappedTextNode",value:function(e,t,n,r,o){var i=this;e.nodes.every(function(a,s){var c=e.nodes[s+1];if(void 0===c||c.start>t){if(!r(a.node))return!1;var u=t-a.start,l=(n>a.end?a.end:n)-a.start,h=e.value.substr(0,a.start),f=e.value.substr(l+a.start);if(a.node=i.wrapRangeInTextNode(a.node,u,l),e.value=h+f,e.nodes.forEach(function(t,n){n>=s&&(e.nodes[n].start>0&&n!==s&&(e.nodes[n].start-=l),e.nodes[n].end-=l)}),n-=l,o(a.node.previousSibling,a.start),!(n>a.end))return!1;t=a.end}return!0})}},{key:"wrapGroups",value:function(e,t,n,r){return r((e=this.wrapRangeInTextNode(e,t,t+n)).previousSibling),e}},{key:"separateGroups",value:function(e,t,n,r,o){for(var i=t.length,a=1;a<i;a++){var s=e.textContent.indexOf(t[a]);t[a]&&s>-1&&r(t[a],e)&&(e=this.wrapGroups(e,s,t[a].length,o))}return e}},{key:"wrapMatches",value:function(e,t,n,r,o){var i=this,a=0===t?0:t+1;this.getTextNodes(function(t){t.nodes.forEach(function(t){var o;for(t=t.node;null!==(o=e.exec(t.textContent))&&""!==o[a];){if(i.opt.separateGroups)t=i.separateGroups(t,o,a,n,r);else{if(!n(o[a],t))continue;var s=o.index;if(0!==a)for(var c=1;c<a;c++)s+=o[c].length;t=i.wrapGroups(t,s,o[a].length,r)}e.lastIndex=0}}),o()})}},{key:"wrapMatchesAcrossElements",value:function(e,t,n,r,o){var i=this,a=0===t?0:t+1;this.getTextNodes(function(t){for(var s;null!==(s=e.exec(t.value))&&""!==s[a];){var c=s.index;if(0!==a)for(var u=1;u<a;u++)c+=s[u].length;var l=c+s[a].length;i.wrapRangeInMappedTextNode(t,c,l,function(e){return n(s[a],e)},function(t,n){e.lastIndex=n,r(t)})}o()})}},{key:"wrapRangeFromIndex",value:function(e,t,n,r){var o=this;this.getTextNodes(function(i){var a=i.value.length;e.forEach(function(e,r){var s=o.checkWhitespaceRanges(e,a,i.value),c=s.start,u=s.end;s.valid&&o.wrapRangeInMappedTextNode(i,c,u,function(n){return t(n,e,i.value.substring(c,u),r)},function(t){n(t,e)})}),r()})}},{key:"unwrapMatches",value:function(e){for(var t=e.parentNode,n=document.createDocumentFragment();e.firstChild;)n.appendChild(e.removeChild(e.firstChild));t.replaceChild(n,e),this.ie?this.normalizeTextNode(t):t.normalize()}},{key:"normalizeTextNode",value:function(e){if(e){if(3===e.nodeType)for(;e.nextSibling&&3===e.nextSibling.nodeType;)e.nodeValue+=e.nextSibling.nodeValue,e.parentNode.removeChild(e.nextSibling);else this.normalizeTextNode(e.firstChild);this.normalizeTextNode(e.nextSibling)}}},{key:"markRegExp",value:function(e,t){var n=this;this.opt=t,this.log('Searching with expression "'.concat(e,'"'));var r=0,o="wrapMatches";this.opt.acrossElements&&(o="wrapMatchesAcrossElements"),this[o](e,this.opt.ignoreGroups,function(e,t){return n.opt.filter(t,e,r)},function(e){r++,n.opt.each(e)},function(){0===r&&n.opt.noMatch(e),n.opt.done(r)})}},{key:"mark",value:function(e,t){var n=this;this.opt=t;var r=0,o="wrapMatches",i=this.getSeparatedKeywords("string"==typeof e?[e]:e),s=i.keywords,c=i.length;this.opt.acrossElements&&(o="wrapMatchesAcrossElements"),0===c?this.opt.done(r):function e(t){var i=new a(n.opt).create(t),u=0;n.log('Searching with expression "'.concat(i,'"')),n[o](i,1,function(e,o){return n.opt.filter(o,t,r,u)},function(e){u++,r++,n.opt.each(e)},function(){0===u&&n.opt.noMatch(t),s[c-1]===t?n.opt.done(r):e(s[s.indexOf(t)+1])})}(s[0])}},{key:"markRanges",value:function(e,t){var n=this;this.opt=t;var r=0,o=this.checkRanges(e);o&&o.length?(this.log("Starting to mark with the following ranges: "+JSON.stringify(o)),this.wrapRangeFromIndex(o,function(e,t,r,o){return n.opt.filter(e,t,r,o)},function(e,t){r++,n.opt.each(e,t)},function(){n.opt.done(r)})):this.opt.done(r)}},{key:"unmark",value:function(e){var t=this;this.opt=e;var n=this.opt.element?this.opt.element:"*";n+="[data-markjs]",this.opt.className&&(n+=".".concat(this.opt.className)),this.log('Removal selector "'.concat(n,'"')),this.iterator.forEachNode(NodeFilter.SHOW_ELEMENT,function(e){t.unwrapMatches(e)},function(e){var r=i.matches(e,n),o=t.matchesExclude(e);return!r||o?NodeFilter.FILTER_REJECT:NodeFilter.FILTER_ACCEPT},this.opt.done)}},{key:"opt",set:function(e){this._opt=o({},{element:"",className:"",exclude:[],iframes:!1,iframesTimeout:5e3,separateWordSearch:!0,acrossElements:!1,ignoreGroups:0,each:function(){},noMatch:function(){},filter:function(){return!0},done:function(){},debug:!1,log:window.console},e)},get:function(){return this._opt}},{key:"iterator",get:function(){return new i(this.ctx,this.opt.iframes,this.opt.exclude,this.opt.iframesTimeout)}}]),n}();return function(e){var t=this,n=new s(e);return this.mark=function(e,r){return n.mark(e,r),t},this.markRegExp=function(e,r){return n.markRegExp(e,r),t},this.markRanges=function(e,r){return n.markRanges(e,r),t},this.unmark=function(e){return n.unmark(e),t},this}});
 
-                       </script>
+           </script>
 
-                    </head>""";
+        </head>""";
     // 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);}
-            }""";
+        """
+        {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.
     private static final String JS_UNMARK_WITH_CALLBACK =
-            """
-            var markInstance = new Mark(document.getElementById("content"));
-            markInstance.unmark(%s);""";
-    private static final Pattern UNESCAPED_FORWARD_SLASH = Pattern.compile("(?<!\\\\)/");
+        """
+        var markInstance = new Mark(document.getElementById("content"));
+        markInstance.unmark(%s);""";
+    private static final Pattern UNESCAPED_FORWARD_SLASH = Pattern.compile(
+        "(?<!\\\\)/"
+    );
 
     private final ClipBoardManager clipBoardManager;
     private final DialogService dialogService;
@@ -135,20 +137,27 @@ function getSelectionHtml() {
     private final BibDatabaseContext database;
     private boolean registered;
 
-    private final ChangeListener<Optional<SearchQuery>> listener = (queryObservable, queryOldValue, queryNewValue) -> {
-        searchHighlightPattern = queryNewValue.flatMap(SearchQuery::getJavaScriptPatternForWords);
+    private final ChangeListener<Optional<SearchQuery>> listener = (
+        queryObservable,
+        queryOldValue,
+        queryNewValue
+    ) -> {
+        searchHighlightPattern =
+            queryNewValue.flatMap(SearchQuery::getJavaScriptPatternForWords);
         highlightSearchPattern();
     };
 
     /**
      * @param database Used for resolving strings and pdf directories for links.
      */
-    public PreviewViewer(BibDatabaseContext database,
-                         DialogService dialogService,
-                         PreferencesService preferencesService,
-                         StateManager stateManager,
-                         ThemeManager themeManager,
-                         TaskExecutor taskExecutor) {
+    public PreviewViewer(
+        BibDatabaseContext database,
+        DialogService dialogService,
+        PreferencesService preferencesService,
+        StateManager stateManager,
+        ThemeManager themeManager,
+        TaskExecutor taskExecutor
+    ) {
         this.database = Objects.requireNonNull(database);
         this.dialogService = dialogService;
         this.preferencesService = preferencesService;
@@ -161,39 +170,58 @@ 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) {
-                stateManager.activeSearchQueryProperty().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 {
-                            JabRefDesktop.openBrowser(href, preferencesService.getFilePreferences());
-                        } 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) {
+                    stateManager
+                        .activeSearchQueryProperty()
+                        .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 {
+                                    JabRefDesktop.openBrowser(
+                                        href,
+                                        preferencesService.getFilePreferences()
+                                    );
+                                } catch (MalformedURLException exception) {
+                                    LOGGER.error("Invalid URL", exception);
+                                } catch (IOException exception) {
+                                    LOGGER.error(
+                                        "Invalid URL Input",
+                                        exception
+                                    );
+                                }
+                            }
+                            evt.preventDefault();
+                        },
+                        false
+                    );
+                }
+            });
 
         themeManager.installCss(previewView.getEngine());
     }
@@ -201,10 +229,16 @@ public PreviewViewer(BibDatabaseContext database,
     private void highlightSearchPattern() {
         String callbackForUnmark = "";
         if (searchHighlightPattern.isPresent()) {
-            String javaScriptRegex = createJavaScriptRegex(searchHighlightPattern.get());
-            callbackForUnmark = String.format(JS_MARK_REG_EXP_CALLBACK, javaScriptRegex);
+            String javaScriptRegex = createJavaScriptRegex(
+                searchHighlightPattern.get()
+            );
+            callbackForUnmark =
+                String.format(JS_MARK_REG_EXP_CALLBACK, javaScriptRegex);
         }
-        String unmarkInstance = String.format(JS_UNMARK_WITH_CALLBACK, callbackForUnmark);
+        String unmarkInstance = String.format(
+            JS_UNMARK_WITH_CALLBACK,
+            callbackForUnmark
+        );
         previewView.getEngine().executeScript(unmarkInstance);
     }
 
@@ -258,25 +292,46 @@ private void update() {
         Number.serialExportNumber = 1; // Set entry number in case that is included in the preview layout.
 
         BackgroundTask
-                .wrap(() -> layout.generatePreview(entry.get(), database))
-                .onRunning(() -> setPreviewText("<i>" + Localization.lang("Processing %0", Localization.lang("Citation Style")) + ": " + layout.getDisplayName() + " ..." + "</i>"))
-                .onSuccess(this::setPreviewText)
-                .onFailure(exception -> {
-                    LOGGER.error("Error while generating citation style", exception);
-                    setPreviewText(Localization.lang("Error while generating citation style"));
-                })
-                .executeWith(taskExecutor);
+            .wrap(() -> layout.generatePreview(entry.get(), database))
+            .onRunning(() ->
+                setPreviewText(
+                    "<i>" +
+                    Localization.lang(
+                        "Processing %0",
+                        Localization.lang("Citation Style")
+                    ) +
+                    ": " +
+                    layout.getDisplayName() +
+                    " ..." +
+                    "</i>"
+                )
+            )
+            .onSuccess(this::setPreviewText)
+            .onFailure(exception -> {
+                LOGGER.error(
+                    "Error while generating citation style",
+                    exception
+                );
+                setPreviewText(
+                    Localization.lang("Error while generating citation style")
+                );
+            })
+            .executeWith(taskExecutor);
     }
 
     private void setPreviewText(String text) {
-        String myText = String.format("""
-                <html>
-                    %s
-                    <body id="previewBody">
-                        <div id="content"> %s </div>
-                    </body>
-                </html>
-                """, JS_HIGHLIGHT_FUNCTION, text);
+        String myText = String.format(
+            """
+            <html>
+                %s
+                <body id="previewBody">
+                    <div id="content"> %s </div>
+                </body>
+            </html>
+            """,
+            JS_HIGHLIGHT_FUNCTION,
+            text
+        );
         previewView.getEngine().setJavaScriptEnabled(true);
         previewView.getEngine().loadContent(myText);
 
@@ -291,13 +346,24 @@ public void print() {
         }
 
         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);
+            .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);
     }
 
     public void copyPreviewToClipBoard() {
@@ -305,7 +371,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);
     }
@@ -324,10 +394,14 @@ public void invalidated(Observable observable) {
     }
 
     public String getSelectionTextContent() {
-        return (String) previewView.getEngine().executeScript("window.getSelection().toString()");
+        return (String) previewView
+            .getEngine()
+            .executeScript("window.getSelection().toString()");
     }
 
     public String getSelectionHtmlContent() {
-        return (String) previewView.getEngine().executeScript(JS_GET_SELECTION_HTML_SCRIPT);
+        return (String) previewView
+            .getEngine()
+            .executeScript(JS_GET_SELECTION_HTML_SCRIPT);
     }
 }
diff --git a/src/main/java/org/jabref/gui/push/AbstractPushToApplication.java b/src/main/java/org/jabref/gui/push/AbstractPushToApplication.java
index aa84c74d3e9..f4b4790d092 100644
--- a/src/main/java/org/jabref/gui/push/AbstractPushToApplication.java
+++ b/src/main/java/org/jabref/gui/push/AbstractPushToApplication.java
@@ -3,7 +3,6 @@
 import java.io.IOException;
 import java.util.List;
 import java.util.Optional;
-
 import org.jabref.gui.DialogService;
 import org.jabref.gui.actions.Action;
 import org.jabref.gui.icon.IconTheme;
@@ -16,7 +15,6 @@
 import org.jabref.model.strings.StringUtil;
 import org.jabref.preferences.PreferencesService;
 import org.jabref.preferences.PushToApplicationPreferences;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -25,7 +23,9 @@
  */
 public abstract class AbstractPushToApplication implements PushToApplication {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(AbstractPushToApplication.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(
+        AbstractPushToApplication.class
+    );
     private static final String CITE_KEY1 = "key1";
     private static final String CITE_KEY2 = "key2";
 
@@ -43,15 +43,23 @@ public abstract class AbstractPushToApplication implements PushToApplication {
     private String cachedCiteSuffix;
     private String cachedCiteDelimiter;
 
-    public AbstractPushToApplication(DialogService dialogService, PreferencesService preferencesService) {
+    public AbstractPushToApplication(
+        DialogService dialogService,
+        PreferencesService preferencesService
+    ) {
         this.dialogService = dialogService;
         this.preferencesService = preferencesService;
     }
 
     private void dissectCiteCommand() {
-        String preferencesCiteCommand = preferencesService.getExternalApplicationsPreferences().getCiteCommand();
-
-        if (preferencesCiteCommand != null && preferencesCiteCommand.equals(cachedCiteCommand)) {
+        String preferencesCiteCommand = preferencesService
+            .getExternalApplicationsPreferences()
+            .getCiteCommand();
+
+        if (
+            preferencesCiteCommand != null &&
+            preferencesCiteCommand.equals(cachedCiteCommand)
+        ) {
             return;
         }
 
@@ -59,13 +67,26 @@ private void dissectCiteCommand() {
 
         int indexKey1 = cachedCiteCommand.indexOf(CITE_KEY1);
         int indexKey2 = cachedCiteCommand.indexOf(CITE_KEY2);
-        if (indexKey1 < 0 || indexKey2 < 0 || indexKey2 < (indexKey1 + CITE_KEY1.length())) {
+        if (
+            indexKey1 < 0 ||
+            indexKey2 < 0 ||
+            indexKey2 < (indexKey1 + CITE_KEY1.length())
+        ) {
             return;
         }
 
         cachedCitePrefix = preferencesCiteCommand.substring(0, indexKey1);
-        cachedCiteDelimiter = preferencesCiteCommand.substring(preferencesCiteCommand.lastIndexOf(CITE_KEY1) + CITE_KEY1.length(), indexKey2);
-        cachedCiteSuffix = preferencesCiteCommand.substring(preferencesCiteCommand.lastIndexOf(CITE_KEY2) + CITE_KEY2.length());
+        cachedCiteDelimiter =
+            preferencesCiteCommand.substring(
+                preferencesCiteCommand.lastIndexOf(CITE_KEY1) +
+                CITE_KEY1.length(),
+                indexKey2
+            );
+        cachedCiteSuffix =
+            preferencesCiteCommand.substring(
+                preferencesCiteCommand.lastIndexOf(CITE_KEY2) +
+                CITE_KEY2.length()
+            );
     }
 
     @Override
@@ -75,7 +96,10 @@ public JabRefIcon getApplicationIcon() {
 
     @Override
     public String getTooltip() {
-        return Localization.lang("Push entries to external application (%0)", getDisplayName());
+        return Localization.lang(
+            "Push entries to external application (%0)",
+            getDisplayName()
+        );
     }
 
     @Override
@@ -84,12 +108,20 @@ public Action getAction() {
     }
 
     @Override
-    public void pushEntries(BibDatabaseContext database, List<BibEntry> entries, String keyString) {
+    public void pushEntries(
+        BibDatabaseContext database,
+        List<BibEntry> entries,
+        String keyString
+    ) {
         couldNotPush = false;
         couldNotCall = false;
         notDefined = false;
 
-        commandPath = preferencesService.getPushToApplicationPreferences().getCommandPaths().get(this.getDisplayName());
+        commandPath =
+            preferencesService
+                .getPushToApplicationPreferences()
+                .getCommandPaths()
+                .get(this.getDisplayName());
 
         // Check if a path to the command has been specified
         if (StringUtil.isNullOrEmpty(commandPath)) {
@@ -102,25 +134,33 @@ public void pushEntries(BibDatabaseContext database, List<BibEntry> entries, Str
             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 processBuilder = new ProcessBuilder(
-                        "open",
-                        "-a",
-                        commands[0],
-                        "-n",
-                        "--args",
-                        commands[1],
-                        commands[2]
+                    "open",
+                    "-a",
+                    commands[0],
+                    "-n",
+                    "--args",
+                    commands[1],
+                    commands[2]
                 );
                 processBuilder.start();
             } else {
-                ProcessBuilder processBuilder = new ProcessBuilder(getCommandLine(keyString));
+                ProcessBuilder processBuilder = new ProcessBuilder(
+                    getCommandLine(keyString)
+                );
                 processBuilder.start();
             }
         } catch (IOException excep) {
-            LOGGER.warn("Error: Could not call executable '{}'", commandPath, excep);
+            LOGGER.warn(
+                "Error: Could not call executable '{}'",
+                commandPath,
+                excep
+            );
             couldNotCall = true;
         }
     }
@@ -129,18 +169,29 @@ public void pushEntries(BibDatabaseContext database, List<BibEntry> entries, Str
     public void onOperationCompleted() {
         if (notDefined) {
             dialogService.showErrorDialogAndWait(
-                    Localization.lang("Error pushing entries"),
-                    Localization.lang("Path to %0 not defined", getDisplayName()) + ".");
+                Localization.lang("Error pushing entries"),
+                Localization.lang("Path to %0 not defined", getDisplayName()) +
+                "."
+            );
         } else if (couldNotCall) {
             dialogService.showErrorDialogAndWait(
-                    Localization.lang("Error pushing entries"),
-                    Localization.lang("Could not call executable") + " '" + commandPath + "'.");
+                Localization.lang("Error pushing entries"),
+                Localization.lang("Could not call executable") +
+                " '" +
+                commandPath +
+                "'."
+            );
         } else if (couldNotPush) {
             dialogService.showErrorDialogAndWait(
-                    Localization.lang("Error pushing entries"),
-                    Localization.lang("Could not connect to %0", getDisplayName()) + ".");
+                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()) +
+                "."
+            );
         }
     }
 
@@ -185,14 +236,26 @@ protected String getCiteSuffix() {
     }
 
     @Override
-    public PushToApplicationSettings getSettings(PushToApplication application, PushToApplicationPreferences preferences) {
-        return new PushToApplicationSettings(application, dialogService, preferencesService.getFilePreferences(), preferences);
+    public PushToApplicationSettings getSettings(
+        PushToApplication application,
+        PushToApplicationPreferences preferences
+    ) {
+        return new PushToApplicationSettings(
+            application,
+            dialogService,
+            preferencesService.getFilePreferences(),
+            preferences
+        );
     }
 
     protected class PushToApplicationAction implements Action {
+
         @Override
         public String getText() {
-            return Localization.lang("Push entries to external application (%0)", getDisplayName());
+            return Localization.lang(
+                "Push entries to external application (%0)",
+                getDisplayName()
+            );
         }
 
         @Override
diff --git a/src/main/java/org/jabref/gui/push/PushToApplication.java b/src/main/java/org/jabref/gui/push/PushToApplication.java
index b7d5223e83d..5b9754a83db 100644
--- a/src/main/java/org/jabref/gui/push/PushToApplication.java
+++ b/src/main/java/org/jabref/gui/push/PushToApplication.java
@@ -1,7 +1,6 @@
 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;
@@ -12,7 +11,6 @@
  * Class that defines interaction with an external application in the form of "pushing" selected entries to it.
  */
 public interface PushToApplication {
-
     String getDisplayName();
 
     String getTooltip();
@@ -23,7 +21,11 @@ public interface PushToApplication {
      * The actual operation. This method will not be called on the event dispatch thread, so it should not do GUI
      * operations without utilizing invokeLater().
      */
-    void pushEntries(BibDatabaseContext database, List<BibEntry> entries, String keyString);
+    void pushEntries(
+        BibDatabaseContext database,
+        List<BibEntry> entries,
+        String keyString
+    );
 
     /**
      * Reporting etc., this method is called on the event dispatch thread after pushEntries() returns.
@@ -40,7 +42,10 @@ 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 21be03170ec..d52a544491d 100644
--- a/src/main/java/org/jabref/gui/push/PushToApplicationCommand.java
+++ b/src/main/java/org/jabref/gui/push/PushToApplicationCommand.java
@@ -1,13 +1,15 @@
 package org.jabref.gui.push;
 
+import static org.jabref.gui.actions.ActionHelper.needsDatabase;
+import static org.jabref.gui.actions.ActionHelper.needsEntriesSelected;
+
+import com.tobiasdiez.easybind.EasyBind;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
 import java.util.Optional;
-
 import javafx.scene.control.ButtonBase;
 import javafx.scene.control.MenuItem;
-
 import org.jabref.gui.DialogService;
 import org.jabref.gui.StateManager;
 import org.jabref.gui.actions.Action;
@@ -21,20 +23,17 @@
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.strings.StringUtil;
 import org.jabref.preferences.PreferencesService;
-
-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;
-
 /**
  * An Action class representing the process of invoking a PushToApplication operation.
  */
 public class PushToApplicationCommand extends SimpleCommand {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(PushToApplicationCommand.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(
+        PushToApplicationCommand.class
+    );
 
     private final StateManager stateManager;
     private final DialogService dialogService;
@@ -45,23 +44,43 @@ public class PushToApplicationCommand extends SimpleCommand {
 
     private PushToApplication application;
 
-    public PushToApplicationCommand(StateManager stateManager, DialogService dialogService, PreferencesService preferencesService, TaskExecutor taskExecutor) {
+    public PushToApplicationCommand(
+        StateManager stateManager,
+        DialogService dialogService,
+        PreferencesService preferencesService,
+        TaskExecutor taskExecutor
+    ) {
         this.stateManager = stateManager;
         this.dialogService = dialogService;
         this.preferencesService = preferencesService;
         this.taskExecutor = taskExecutor;
 
-        setApplication(preferencesService.getPushToApplicationPreferences()
-                                                            .getActiveApplicationName());
-
-        EasyBind.subscribe(preferencesService.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.")));
+        setApplication(
+            preferencesService
+                .getPushToApplicationPreferences()
+                .getActiveApplicationName()
+        );
+
+        EasyBind.subscribe(
+            preferencesService
+                .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."
+                    )
+                )
+            );
     }
 
     public void registerReconfigurable(Object node) {
@@ -74,21 +93,35 @@ public void registerReconfigurable(Object node) {
     }
 
     private void setApplication(String applicationName) {
-        final ActionFactory factory = new ActionFactory(preferencesService.getKeyBindingRepository());
-        PushToApplication application = PushToApplications.getApplicationByName(
-                                                                  applicationName,
-                                                                  dialogService,
-                                                                  preferencesService)
-                                                          .orElse(new PushToEmacs(dialogService, preferencesService));
-
-        preferencesService.getPushToApplicationPreferences().setActiveApplicationName(application.getDisplayName());
+        final ActionFactory factory = new ActionFactory(
+            preferencesService.getKeyBindingRepository()
+        );
+        PushToApplication application = PushToApplications
+            .getApplicationByName(
+                applicationName,
+                dialogService,
+                preferencesService
+            )
+            .orElse(new PushToEmacs(dialogService, preferencesService));
+
+        preferencesService
+            .getPushToApplicationPreferences()
+            .setActiveApplicationName(application.getDisplayName());
         this.application = Objects.requireNonNull(application);
 
         reconfigurableControls.forEach(object -> {
             if (object instanceof MenuItem) {
-                factory.configureMenuItem(application.getAction(), this, (MenuItem) object);
+                factory.configureMenuItem(
+                    application.getAction(),
+                    this,
+                    (MenuItem) object
+                );
             } else if (object instanceof ButtonBase) {
-                factory.configureIconButton(application.getAction(), this, (ButtonBase) object);
+                factory.configureIconButton(
+                    application.getAction(),
+                    this,
+                    (ButtonBase) object
+                );
             }
         });
     }
@@ -97,7 +130,10 @@ public Action getAction() {
         return application.getAction();
     }
 
-    private static String getKeyString(List<BibEntry> entries, String delimiter) {
+    private static String getKeyString(
+        List<BibEntry> entries,
+        String delimiter
+    ) {
         StringBuilder result = new StringBuilder();
         Optional<String> citeKey;
         boolean first = true;
@@ -124,22 +160,35 @@ public void execute() {
             for (BibEntry entry : stateManager.getSelectedEntries()) {
                 if (StringUtil.isBlank(entry.getCitationKey())) {
                     dialogService.showErrorDialogAndWait(
-                            application.getDisplayName(),
-                            Localization.lang("This operation requires all selected entries to have citation keys defined."));
+                        application.getDisplayName(),
+                        Localization.lang(
+                            "This operation requires all selected entries to have citation keys defined."
+                        )
+                    );
                     return;
                 }
             }
         }
 
         // 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);
+        BackgroundTask
+            .wrap(this::pushEntries)
+            .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/PushToApplicationSettings.java b/src/main/java/org/jabref/gui/push/PushToApplicationSettings.java
index f0846330e3d..fb8b088f167 100644
--- a/src/main/java/org/jabref/gui/push/PushToApplicationSettings.java
+++ b/src/main/java/org/jabref/gui/push/PushToApplicationSettings.java
@@ -2,7 +2,6 @@
 
 import java.util.HashMap;
 import java.util.Map;
-
 import javafx.scene.control.Button;
 import javafx.scene.control.Label;
 import javafx.scene.control.TextField;
@@ -10,7 +9,6 @@
 import javafx.scene.layout.ColumnConstraints;
 import javafx.scene.layout.GridPane;
 import javafx.scene.layout.Priority;
-
 import org.jabref.gui.DialogService;
 import org.jabref.gui.icon.IconTheme;
 import org.jabref.gui.util.FileDialogConfiguration;
@@ -26,10 +24,12 @@ 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;
 
@@ -48,22 +48,34 @@ public PushToApplicationSettings(PushToApplication application,
         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()));
+        StringBuilder commandLine = new StringBuilder(
+            Localization.lang("Path to %0", application.getDisplayName())
+        );
         if (this.application.getCommandName() == null) {
             commandLine.append(':');
         } else {
-            commandLine.append(" (").append(this.application.getCommandName()).append("):");
+            commandLine
+                .append(" (")
+                .append(this.application.getCommandName())
+                .append("):");
         }
         commandLabel.setText(commandLine.toString());
         settingsPane.add(commandLabel, 0, 0);
 
-        path.setText(preferences.getCommandPaths().get(this.application.getDisplayName()));
+        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();
@@ -71,7 +83,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);
     }
 
     /**
@@ -80,7 +94,9 @@ public PushToApplicationSettings(PushToApplication application,
      * state of the widgets in the settings panel to Globals.prefs.
      */
     public void storeSettings() {
-        Map<String, String> commandPaths = new HashMap<>(preferences.getCommandPaths());
+        Map<String, String> commandPaths = new HashMap<>(
+            preferences.getCommandPaths()
+        );
         commandPaths.put(application.getDisplayName(), path.getText());
         preferences.setCommandPaths(commandPaths);
     }
diff --git a/src/main/java/org/jabref/gui/push/PushToApplications.java b/src/main/java/org/jabref/gui/push/PushToApplications.java
index 91d087f84fd..e5e8ad797a6 100644
--- a/src/main/java/org/jabref/gui/push/PushToApplications.java
+++ b/src/main/java/org/jabref/gui/push/PushToApplications.java
@@ -3,7 +3,6 @@
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Optional;
-
 import org.jabref.gui.DialogService;
 import org.jabref.preferences.PreferencesService;
 
@@ -18,17 +17,21 @@ public class PushToApplications {
     public static final String SUBLIME_TEXT = "Sublime Text";
     public static final String TEXSHOP = "TeXShop";
 
-    private static final List<PushToApplication> APPLICATIONS = new ArrayList<>();
+    private static final List<PushToApplication> APPLICATIONS =
+        new ArrayList<>();
 
-    private PushToApplications() {
-    }
+    private PushToApplications() {}
 
-    public static List<PushToApplication> getAllApplications(DialogService dialogService, PreferencesService preferencesService) {
+    public static List<PushToApplication> getAllApplications(
+        DialogService dialogService,
+        PreferencesService preferencesService
+    ) {
         if (!APPLICATIONS.isEmpty()) {
             return APPLICATIONS;
         }
 
-        APPLICATIONS.addAll(List.of(
+        APPLICATIONS.addAll(
+            List.of(
                 new PushToEmacs(dialogService, preferencesService),
                 new PushToLyx(dialogService, preferencesService),
                 new PushToSublimeText(dialogService, preferencesService),
@@ -36,14 +39,23 @@ public static List<PushToApplication> getAllApplications(DialogService dialogSer
                 new PushToTeXstudio(dialogService, preferencesService),
                 new PushToVim(dialogService, preferencesService),
                 new PushToWinEdt(dialogService, preferencesService),
-                new PushToTexShop(dialogService, preferencesService)));
+                new PushToTexShop(dialogService, preferencesService)
+            )
+        );
 
         return APPLICATIONS;
     }
 
-    public static Optional<PushToApplication> getApplicationByName(String applicationName, DialogService dialogService, PreferencesService preferencesService) {
-        return getAllApplications(dialogService, preferencesService).stream()
-                                                                    .filter(application -> application.getDisplayName().equals(applicationName))
-                                                                    .findAny();
+    public static Optional<PushToApplication> getApplicationByName(
+        String applicationName,
+        DialogService dialogService,
+        PreferencesService preferencesService
+    ) {
+        return getAllApplications(dialogService, preferencesService)
+            .stream()
+            .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 1b9afb42af8..d5136deb81e 100644
--- a/src/main/java/org/jabref/gui/push/PushToEmacs.java
+++ b/src/main/java/org/jabref/gui/push/PushToEmacs.java
@@ -4,7 +4,6 @@
 import java.io.InputStream;
 import java.util.Arrays;
 import java.util.List;
-
 import org.jabref.gui.DialogService;
 import org.jabref.gui.JabRefExecutorService;
 import org.jabref.gui.icon.IconTheme;
@@ -15,7 +14,6 @@
 import org.jabref.model.entry.BibEntry;
 import org.jabref.preferences.PreferencesService;
 import org.jabref.preferences.PushToApplicationPreferences;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -23,12 +21,17 @@ public class PushToEmacs extends AbstractPushToApplication {
 
     public static final String NAME = PushToApplications.EMACS;
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(PushToEmacs.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(
+        PushToEmacs.class
+    );
 
     /**
      * @param preferencesService getPushToApplicationPreferences(), getExternalApplicationsPreferences(), and getFilePreferences() are used
      */
-    public PushToEmacs(DialogService dialogService, PreferencesService preferencesService) {
+    public PushToEmacs(
+        DialogService dialogService,
+        PreferencesService preferencesService
+    ) {
         super(dialogService, preferencesService);
     }
 
@@ -43,30 +46,44 @@ public JabRefIcon getApplicationIcon() {
     }
 
     @Override
-    public void pushEntries(BibDatabaseContext database, List<BibEntry> entries, String keys) {
+    public void pushEntries(
+        BibDatabaseContext database,
+        List<BibEntry> entries,
+        String keys
+    ) {
         couldNotPush = false;
         couldNotCall = false;
         notDefined = false;
 
-        PushToApplicationPreferences pushToApplicationPreferences = preferencesService.getPushToApplicationPreferences();
+        PushToApplicationPreferences pushToApplicationPreferences =
+            preferencesService.getPushToApplicationPreferences();
 
-        commandPath = pushToApplicationPreferences.getCommandPaths().get(this.getDisplayName());
+        commandPath =
+            pushToApplicationPreferences
+                .getCommandPaths()
+                .get(this.getDisplayName());
 
         if ((commandPath == null) || commandPath.trim().isEmpty()) {
             notDefined = true;
             return;
         }
 
-        commandPath = pushToApplicationPreferences.getCommandPaths().get(this.getDisplayName());
+        commandPath =
+            pushToApplicationPreferences
+                .getCommandPaths()
+                .get(this.getDisplayName());
 
-        String[] addParams = pushToApplicationPreferences.getEmacsArguments().split(" ");
+        String[] addParams = pushToApplicationPreferences
+            .getEmacsArguments()
+            .split(" ");
         try {
             String[] com = new String[addParams.length + 2];
             com[0] = commandPath;
             System.arraycopy(addParams, 0, com, 1, addParams.length);
 
             // Surrounding with is handled below
-            String prefix = "(with-current-buffer (window-buffer (selected-window)) (insert ";
+            String prefix =
+                "(with-current-buffer (window-buffer (selected-window)) (insert ";
             String suffix = "))";
 
             if (OS.WINDOWS) {
@@ -75,28 +92,39 @@ 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();
+            LOGGER
+                .atDebug()
+                .setMessage("Executing command {}")
+                .addArgument(() -> Arrays.toString(com))
+                .log();
 
             final Process p = Runtime.getRuntime().exec(com);
 
@@ -129,11 +157,15 @@ public void pushEntries(BibDatabaseContext database, List<BibEntry> entries, Str
     @Override
     public void onOperationCompleted() {
         if (couldNotPush) {
-            dialogService.showErrorDialogAndWait(Localization.lang("Error pushing entries"),
-                    Localization.lang("Could not push to a running emacs daemon."));
+            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"),
-                    Localization.lang("Could not run the emacs client."));
+            dialogService.showErrorDialogAndWait(
+                Localization.lang("Error pushing entries"),
+                Localization.lang("Could not run the emacs client.")
+            );
         } else {
             super.onOperationCompleted();
         }
@@ -145,7 +177,15 @@ protected String getCommandName() {
     }
 
     @Override
-    public PushToApplicationSettings getSettings(PushToApplication application, PushToApplicationPreferences preferences) {
-        return new PushToEmacsSettings(application, dialogService, preferencesService.getFilePreferences(), preferences);
+    public PushToApplicationSettings getSettings(
+        PushToApplication application,
+        PushToApplicationPreferences preferences
+    ) {
+        return new PushToEmacsSettings(
+            application,
+            dialogService,
+            preferencesService.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 c60ad74f38b..995d624b947 100644
--- a/src/main/java/org/jabref/gui/push/PushToEmacsSettings.java
+++ b/src/main/java/org/jabref/gui/push/PushToEmacsSettings.java
@@ -2,7 +2,6 @@
 
 import javafx.scene.control.Label;
 import javafx.scene.control.TextField;
-
 import org.jabref.gui.DialogService;
 import org.jabref.logic.l10n.Localization;
 import org.jabref.preferences.FilePreferences;
@@ -12,13 +11,18 @@ 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);
+        settingsPane.add(
+            new Label(Localization.lang("Additional parameters") + ":"),
+            0,
+            1
+        );
         settingsPane.add(additionalParams, 1, 1);
         additionalParams.setText(preferences.getEmacsArguments());
     }
diff --git a/src/main/java/org/jabref/gui/push/PushToLyx.java b/src/main/java/org/jabref/gui/push/PushToLyx.java
index 9277529d592..e855cb88ac8 100644
--- a/src/main/java/org/jabref/gui/push/PushToLyx.java
+++ b/src/main/java/org/jabref/gui/push/PushToLyx.java
@@ -6,7 +6,6 @@
 import java.io.IOException;
 import java.nio.charset.StandardCharsets;
 import java.util.List;
-
 import org.jabref.gui.DialogService;
 import org.jabref.gui.JabRefExecutorService;
 import org.jabref.gui.icon.IconTheme;
@@ -16,7 +15,6 @@
 import org.jabref.model.entry.BibEntry;
 import org.jabref.preferences.PreferencesService;
 import org.jabref.preferences.PushToApplicationPreferences;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -24,9 +22,14 @@ public class PushToLyx extends AbstractPushToApplication {
 
     public static final String NAME = PushToApplications.LYX;
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(PushToLyx.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(
+        PushToLyx.class
+    );
 
-    public PushToLyx(DialogService dialogService, PreferencesService preferencesService) {
+    public PushToLyx(
+        DialogService dialogService,
+        PreferencesService preferencesService
+    ) {
         super(dialogService, preferencesService);
     }
 
@@ -43,28 +46,52 @@ public JabRefIcon getApplicationIcon() {
     @Override
     public void onOperationCompleted() {
         if (couldNotPush) {
-            dialogService.showErrorDialogAndWait(Localization.lang("Error pushing entries"),
-                    Localization.lang("Verify that LyX is running and that the lyxpipe is valid.")
-                            + "[" + commandPath + "]");
+            dialogService.showErrorDialogAndWait(
+                Localization.lang("Error pushing entries"),
+                Localization.lang(
+                    "Verify that LyX is running and that the lyxpipe is valid."
+                ) +
+                "[" +
+                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, preferencesService.getFilePreferences(), preferences);
+    public PushToApplicationSettings getSettings(
+        PushToApplication application,
+        PushToApplicationPreferences preferences
+    ) {
+        return new PushToLyxSettings(
+            application,
+            dialogService,
+            preferencesService.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 = preferencesService.getPushToApplicationPreferences().getCommandPaths().get(this.getDisplayName());
+        commandPath =
+            preferencesService
+                .getPushToApplicationPreferences()
+                .getCommandPaths()
+                .get(this.getDisplayName());
 
         if ((commandPath == null) || commandPath.trim().isEmpty()) {
             notDefined = true;
@@ -87,8 +114,12 @@ public void pushEntries(BibDatabaseContext database, final List<BibEntry> entrie
         final File lyxpipe = lp;
 
         JabRefExecutorService.INSTANCE.executeAndWait(() -> {
-            try (FileWriter fw = new FileWriter(lyxpipe, StandardCharsets.UTF_8); BufferedWriter lyxOut = new BufferedWriter(fw)) {
-                String citeStr = "LYXCMD:sampleclient:citation-insert:" + keyString;
+            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;
diff --git a/src/main/java/org/jabref/gui/push/PushToLyxSettings.java b/src/main/java/org/jabref/gui/push/PushToLyxSettings.java
index 19d258990c8..60dcc42cbd6 100644
--- a/src/main/java/org/jabref/gui/push/PushToLyxSettings.java
+++ b/src/main/java/org/jabref/gui/push/PushToLyxSettings.java
@@ -7,12 +7,13 @@
 
 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 437354b10ed..c1eda0aba8e 100644
--- a/src/main/java/org/jabref/gui/push/PushToSublimeText.java
+++ b/src/main/java/org/jabref/gui/push/PushToSublimeText.java
@@ -4,7 +4,6 @@
 import java.nio.file.Path;
 import java.util.List;
 import java.util.Map;
-
 import org.jabref.gui.DialogService;
 import org.jabref.gui.JabRefExecutorService;
 import org.jabref.gui.icon.IconTheme;
@@ -15,7 +14,6 @@
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.strings.StringUtil;
 import org.jabref.preferences.PreferencesService;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -23,9 +21,14 @@ public class PushToSublimeText extends AbstractPushToApplication {
 
     public static final String NAME = PushToApplications.SUBLIME_TEXT;
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(PushToSublimeText.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(
+        PushToSublimeText.class
+    );
 
-    public PushToSublimeText(DialogService dialogService, PreferencesService preferencesService) {
+    public PushToSublimeText(
+        DialogService dialogService,
+        PreferencesService preferencesService
+    ) {
         super(dialogService, preferencesService);
     }
 
@@ -40,12 +43,20 @@ public JabRefIcon getApplicationIcon() {
     }
 
     @Override
-    public void pushEntries(BibDatabaseContext database, List<BibEntry> entries, String keyString) {
+    public void pushEntries(
+        BibDatabaseContext database,
+        List<BibEntry> entries,
+        String keyString
+    ) {
         couldNotPush = false;
         couldNotCall = false;
         notDefined = false;
 
-        commandPath = preferencesService.getPushToApplicationPreferences().getCommandPaths().get(this.getDisplayName());
+        commandPath =
+            preferencesService
+                .getPushToApplicationPreferences()
+                .getCommandPaths()
+                .get(this.getDisplayName());
 
         // Check if a path to the command has been specified
         if (StringUtil.isNullOrEmpty(commandPath)) {
@@ -53,20 +64,35 @@ public void pushEntries(BibDatabaseContext database, List<BibEntry> entries, Str
             return;
         }
         try {
-            LOGGER.debug("Sublime string: {}", String.join(" ", getCommandLine(keyString)));
-            ProcessBuilder processBuilder = new ProcessBuilder(getCommandLine(keyString));
+            LOGGER.debug(
+                "Sublime string: {}",
+                String.join(" ", getCommandLine(keyString))
+            );
+            ProcessBuilder processBuilder = new ProcessBuilder(
+                getCommandLine(keyString)
+            );
             processBuilder.inheritIO();
             Map<String, String> envs = processBuilder.environment();
             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
+            );
 
             JabRefExecutorService.INSTANCE.execute(streamGobblerInput);
             JabRefExecutorService.INSTANCE.execute(streamGobblerError);
         } catch (IOException excep) {
-            LOGGER.warn("Error: Could not call executable '{}'", commandPath, excep);
+            LOGGER.warn(
+                "Error: Could not call executable '{}'",
+                commandPath,
+                excep
+            );
             couldNotCall = true;
         }
     }
@@ -81,9 +107,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 a7a0a1657f1..30daf218884 100644
--- a/src/main/java/org/jabref/gui/push/PushToTeXstudio.java
+++ b/src/main/java/org/jabref/gui/push/PushToTeXstudio.java
@@ -9,7 +9,10 @@ public class PushToTeXstudio extends AbstractPushToApplication {
 
     public static final String NAME = PushToApplications.TEXSTUDIO;
 
-    public PushToTeXstudio(DialogService dialogService, PreferencesService preferencesService) {
+    public PushToTeXstudio(
+        DialogService dialogService,
+        PreferencesService preferencesService
+    ) {
         super(dialogService, preferencesService);
     }
 
@@ -25,6 +28,15 @@ public JabRefIcon getApplicationIcon() {
 
     @Override
     protected String[] getCommandLine(String keyString) {
-        return new String[] {commandPath, "--insert-cite", String.format("%s%s%s", getCitePrefix(), keyString, getCiteSuffix())};
+        return new String[] {
+            commandPath,
+            "--insert-cite",
+            String.format(
+                "%s%s%s",
+                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 72f8c66a7a1..b971332b7de 100644
--- a/src/main/java/org/jabref/gui/push/PushToTexShop.java
+++ b/src/main/java/org/jabref/gui/push/PushToTexShop.java
@@ -2,7 +2,6 @@
 
 import java.io.IOException;
 import java.util.List;
-
 import org.jabref.gui.DialogService;
 import org.jabref.gui.JabRefExecutorService;
 import org.jabref.gui.icon.IconTheme;
@@ -13,7 +12,6 @@
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.preferences.PreferencesService;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -21,9 +19,14 @@ public class PushToTexShop extends AbstractPushToApplication {
 
     public static final String NAME = PushToApplications.TEXSHOP;
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(PushToTexShop.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(
+        PushToTexShop.class
+    );
 
-    public PushToTexShop(DialogService dialogService, PreferencesService preferencesService) {
+    public PushToTexShop(
+        DialogService dialogService,
+        PreferencesService preferencesService
+    ) {
         super(dialogService, preferencesService);
     }
 
@@ -38,25 +41,48 @@ public JabRefIcon getApplicationIcon() {
     }
 
     @Override
-    public void pushEntries(BibDatabaseContext database, List<BibEntry> entries, String keyString) {
+    public void pushEntries(
+        BibDatabaseContext database,
+        List<BibEntry> entries,
+        String keyString
+    ) {
         couldNotPush = false;
         couldNotCall = false;
         notDefined = false;
 
-        commandPath = preferencesService.getPushToApplicationPreferences().getCommandPaths().get(this.getDisplayName());
+        commandPath =
+            preferencesService
+                .getPushToApplicationPreferences()
+                .getCommandPaths()
+                .get(this.getDisplayName());
 
         try {
-            LOGGER.debug("TexShop string: {}", String.join(" ", getCommandLine(keyString)));
-            ProcessBuilder processBuilder = new ProcessBuilder(getCommandLine(keyString));
+            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
+            );
 
             JabRefExecutorService.INSTANCE.execute(streamGobblerInput);
             JabRefExecutorService.INSTANCE.execute(streamGobblerError);
         } catch (IOException excep) {
-            LOGGER.warn("Error: Could not call executable '{}'", commandPath, excep);
+            LOGGER.warn(
+                "Error: Could not call executable '{}'",
+                commandPath,
+                excep
+            );
             couldNotCall = true;
         }
     }
@@ -69,16 +95,26 @@ protected String[] getCommandLine(String keyString) {
             citeCommand = "\"\\" + getCitePrefix();
         }
 
-        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};
+            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/PushToTexmaker.java b/src/main/java/org/jabref/gui/push/PushToTexmaker.java
index eccecdc5cff..12351050d68 100644
--- a/src/main/java/org/jabref/gui/push/PushToTexmaker.java
+++ b/src/main/java/org/jabref/gui/push/PushToTexmaker.java
@@ -12,7 +12,10 @@ public class PushToTexmaker extends AbstractPushToApplication {
 
     public static final String NAME = "Texmaker";
 
-    public PushToTexmaker(DialogService dialogService, PreferencesService preferencesService) {
+    public PushToTexmaker(
+        DialogService dialogService,
+        PreferencesService preferencesService
+    ) {
         super(dialogService, preferencesService);
     }
 
@@ -28,6 +31,10 @@ public JabRefIcon getApplicationIcon() {
 
     @Override
     protected String[] getCommandLine(String keyString) {
-        return new String[] {commandPath, "-insert", getCitePrefix() + keyString + getCiteSuffix()};
+        return new String[] {
+            commandPath,
+            "-insert",
+            getCitePrefix() + keyString + getCiteSuffix(),
+        };
     }
 }
diff --git a/src/main/java/org/jabref/gui/push/PushToVim.java b/src/main/java/org/jabref/gui/push/PushToVim.java
index c31077a6671..e0e14295924 100644
--- a/src/main/java/org/jabref/gui/push/PushToVim.java
+++ b/src/main/java/org/jabref/gui/push/PushToVim.java
@@ -4,7 +4,6 @@
 import java.io.InputStream;
 import java.util.Arrays;
 import java.util.List;
-
 import org.jabref.gui.DialogService;
 import org.jabref.gui.JabRefExecutorService;
 import org.jabref.gui.icon.IconTheme;
@@ -14,7 +13,6 @@
 import org.jabref.model.entry.BibEntry;
 import org.jabref.preferences.PreferencesService;
 import org.jabref.preferences.PushToApplicationPreferences;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -22,9 +20,14 @@ public class PushToVim extends AbstractPushToApplication {
 
     public static final String NAME = PushToApplications.VIM;
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(PushToVim.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(
+        PushToVim.class
+    );
 
-    public PushToVim(DialogService dialogService, PreferencesService preferencesService) {
+    public PushToVim(
+        DialogService dialogService,
+        PreferencesService preferencesService
+    ) {
         super(dialogService, preferencesService);
     }
 
@@ -39,17 +42,33 @@ public JabRefIcon getApplicationIcon() {
     }
 
     @Override
-    public PushToApplicationSettings getSettings(PushToApplication application, PushToApplicationPreferences preferences) {
-        return new PushToVimSettings(application, dialogService, preferencesService.getFilePreferences(), preferences);
+    public PushToApplicationSettings getSettings(
+        PushToApplication application,
+        PushToApplicationPreferences preferences
+    ) {
+        return new PushToVimSettings(
+            application,
+            dialogService,
+            preferencesService.getFilePreferences(),
+            preferences
+        );
     }
 
     @Override
-    public void pushEntries(BibDatabaseContext database, List<BibEntry> entries, String keys) {
+    public void pushEntries(
+        BibDatabaseContext database,
+        List<BibEntry> entries,
+        String keys
+    ) {
         couldNotPush = false;
         couldNotCall = false;
         notDefined = false;
 
-        commandPath = preferencesService.getPushToApplicationPreferences().getCommandPaths().get(this.getDisplayName());
+        commandPath =
+            preferencesService
+                .getPushToApplicationPreferences()
+                .getCommandPaths()
+                .get(this.getDisplayName());
 
         if ((commandPath == null) || commandPath.trim().isEmpty()) {
             notDefined = true;
@@ -57,14 +76,21 @@ public void pushEntries(BibDatabaseContext database, List<BibEntry> entries, Str
         }
 
         try {
-            String[] com = new String[]{commandPath, "--servername",
-                    preferencesService.getPushToApplicationPreferences().getVimServer(), "--remote-send",
-                    "<C-\\><C-N>a" + getCitePrefix() + keys + getCiteSuffix()};
-
-            LOGGER.atDebug()
-                  .setMessage("Executing command {}")
-                  .addArgument(() -> Arrays.toString(com))
-                  .log();
+            String[] com = new String[] {
+                commandPath,
+                "--servername",
+                preferencesService
+                    .getPushToApplicationPreferences()
+                    .getVimServer(),
+                "--remote-send",
+                "<C-\\><C-N>a" + getCitePrefix() + keys + getCiteSuffix(),
+            };
+
+            LOGGER
+                .atDebug()
+                .setMessage("Executing command {}")
+                .addArgument(() -> Arrays.toString(com))
+                .log();
 
             final Process p = Runtime.getRuntime().exec(com);
 
@@ -97,11 +123,15 @@ public void pushEntries(BibDatabaseContext database, List<BibEntry> entries, Str
     @Override
     public void onOperationCompleted() {
         if (couldNotPush) {
-            dialogService.showErrorDialogAndWait(Localization.lang("Error pushing entries"),
-                    Localization.lang("Could not push to a running Vim server."));
+            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"),
-                    Localization.lang("Could not run the 'vim' program."));
+            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 08ac9c9abfe..58cb9fdcb53 100644
--- a/src/main/java/org/jabref/gui/push/PushToVimSettings.java
+++ b/src/main/java/org/jabref/gui/push/PushToVimSettings.java
@@ -2,7 +2,6 @@
 
 import javafx.scene.control.Label;
 import javafx.scene.control.TextField;
-
 import org.jabref.gui.DialogService;
 import org.jabref.logic.l10n.Localization;
 import org.jabref.preferences.FilePreferences;
@@ -12,13 +11,18 @@ 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);
+        settingsPane.add(
+            new Label(Localization.lang("Vim server name") + ":"),
+            0,
+            1
+        );
         settingsPane.add(vimServer, 1, 1);
         vimServer.setText(preferences.getVimServer());
     }
diff --git a/src/main/java/org/jabref/gui/push/PushToWinEdt.java b/src/main/java/org/jabref/gui/push/PushToWinEdt.java
index 58374b36be4..b6728dbd0fa 100644
--- a/src/main/java/org/jabref/gui/push/PushToWinEdt.java
+++ b/src/main/java/org/jabref/gui/push/PushToWinEdt.java
@@ -9,7 +9,10 @@ public class PushToWinEdt extends AbstractPushToApplication {
 
     public static final String NAME = PushToApplications.WIN_EDT;
 
-    public PushToWinEdt(DialogService dialogService, PreferencesService preferencesService) {
+    public PushToWinEdt(
+        DialogService dialogService,
+        PreferencesService preferencesService
+    ) {
         super(dialogService, preferencesService);
     }
 
@@ -25,7 +28,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 272d84fd600..016df2a44d9 100644
--- a/src/main/java/org/jabref/gui/remote/CLIMessageHandler.java
+++ b/src/main/java/org/jabref/gui/remote/CLIMessageHandler.java
@@ -1,9 +1,8 @@
 package org.jabref.gui.remote;
 
 import java.util.List;
-
 import javafx.application.Platform;
-
+import org.apache.commons.cli.ParseException;
 import org.jabref.cli.ArgumentProcessor;
 import org.jabref.gui.JabRefGUI;
 import org.jabref.logic.importer.ParserResult;
@@ -11,19 +10,24 @@
 import org.jabref.model.entry.BibEntryTypesManager;
 import org.jabref.model.util.FileUpdateMonitor;
 import org.jabref.preferences.PreferencesService;
-
-import org.apache.commons.cli.ParseException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 public class CLIMessageHandler implements RemoteMessageHandler {
-    private static final Logger LOGGER = LoggerFactory.getLogger(CLIMessageHandler.class);
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(
+        CLIMessageHandler.class
+    );
 
     private final PreferencesService preferencesService;
     private final FileUpdateMonitor fileUpdateMonitor;
     private final BibEntryTypesManager entryTypesManager;
 
-    public CLIMessageHandler(PreferencesService preferencesService, FileUpdateMonitor fileUpdateMonitor, BibEntryTypesManager entryTypesManager) {
+    public CLIMessageHandler(
+        PreferencesService preferencesService,
+        FileUpdateMonitor fileUpdateMonitor,
+        BibEntryTypesManager entryTypesManager
+    ) {
         this.preferencesService = preferencesService;
         this.fileUpdateMonitor = fileUpdateMonitor;
         this.entryTypesManager = entryTypesManager;
@@ -33,19 +37,20 @@ public CLIMessageHandler(PreferencesService preferencesService, FileUpdateMonito
     public void handleCommandLineArguments(String[] message) {
         try {
             ArgumentProcessor argumentProcessor = new ArgumentProcessor(
-                    message,
-                    ArgumentProcessor.Mode.REMOTE_START,
-                    preferencesService,
-                    fileUpdateMonitor,
-                    entryTypesManager);
+                message,
+                ArgumentProcessor.Mode.REMOTE_START,
+                preferencesService,
+                fileUpdateMonitor,
+                entryTypesManager
+            );
             argumentProcessor.processArguments();
             List<ParserResult> loaded = argumentProcessor.getParserResults();
             for (int i = 0; i < loaded.size(); i++) {
                 ParserResult pr = loaded.get(i);
                 boolean focusPanel = i == 0;
                 Platform.runLater(() ->
-                        // Need to run this on the JavaFX thread
-                        JabRefGUI.getMainFrame().addTab(pr, focusPanel)
+                    // Need to run this on the JavaFX thread
+                    JabRefGUI.getMainFrame().addTab(pr, focusPanel)
                 );
             }
         } catch (ParseException e) {
diff --git a/src/main/java/org/jabref/gui/search/GlobalSearchBar.java b/src/main/java/org/jabref/gui/search/GlobalSearchBar.java
index e419c97b827..f6782af6905 100644
--- a/src/main/java/org/jabref/gui/search/GlobalSearchBar.java
+++ b/src/main/java/org/jabref/gui/search/GlobalSearchBar.java
@@ -1,5 +1,12 @@
 package org.jabref.gui.search;
 
+import static org.jabref.gui.actions.ActionHelper.needsDatabase;
+
+import de.saxsys.mvvmfx.utils.validation.FunctionBasedValidator;
+import de.saxsys.mvvmfx.utils.validation.ValidationMessage;
+import de.saxsys.mvvmfx.utils.validation.Validator;
+import de.saxsys.mvvmfx.utils.validation.visualization.ControlsFxVisualizer;
+import impl.org.controlsfx.skin.AutoCompletePopup;
 import java.lang.reflect.Field;
 import java.time.Duration;
 import java.util.List;
@@ -7,9 +14,6 @@
 import java.util.Optional;
 import java.util.regex.Pattern;
 import java.util.regex.PatternSyntaxException;
-
-import javax.swing.undo.UndoManager;
-
 import javafx.application.Platform;
 import javafx.beans.binding.Bindings;
 import javafx.beans.binding.BooleanBinding;
@@ -40,7 +44,9 @@
 import javafx.scene.layout.StackPane;
 import javafx.scene.text.Text;
 import javafx.scene.text.TextFlow;
-
+import javax.swing.undo.UndoManager;
+import org.controlsfx.control.textfield.AutoCompletionBinding;
+import org.controlsfx.control.textfield.CustomTextField;
 import org.jabref.gui.ClipBoardManager;
 import org.jabref.gui.DialogService;
 import org.jabref.gui.JabRefFrame;
@@ -65,28 +71,22 @@
 import org.jabref.model.search.rules.SearchRules;
 import org.jabref.preferences.PreferencesService;
 import org.jabref.preferences.SearchPreferences;
-
-import de.saxsys.mvvmfx.utils.validation.FunctionBasedValidator;
-import de.saxsys.mvvmfx.utils.validation.ValidationMessage;
-import de.saxsys.mvvmfx.utils.validation.Validator;
-import de.saxsys.mvvmfx.utils.validation.visualization.ControlsFxVisualizer;
-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;
-
 public class GlobalSearchBar extends HBox {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(GlobalSearchBar.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(
+        GlobalSearchBar.class
+    );
 
     private static final int SEARCH_DELAY = 400;
-    private static final PseudoClass CLASS_NO_RESULTS = PseudoClass.getPseudoClass("emptyResult");
-    private static final PseudoClass CLASS_RESULTS_FOUND = PseudoClass.getPseudoClass("emptyResult");
+    private static final PseudoClass CLASS_NO_RESULTS =
+        PseudoClass.getPseudoClass("emptyResult");
+    private static final PseudoClass CLASS_RESULTS_FOUND =
+        PseudoClass.getPseudoClass("emptyResult");
 
     private final CustomTextField searchField = SearchTextField.create();
     private final ToggleButton caseSensitiveButton;
@@ -106,10 +106,17 @@ public class GlobalSearchBar extends HBox {
     private final SearchPreferences searchPreferences;
     private final DialogService dialogService;
 
-    private final BooleanProperty globalSearchActive = new SimpleBooleanProperty(false);
+    private final BooleanProperty globalSearchActive =
+        new SimpleBooleanProperty(false);
     private GlobalSearchResultDialog globalSearchResultDialog;
 
-    public GlobalSearchBar(JabRefFrame frame, StateManager stateManager, PreferencesService preferencesService, CountingUndoManager undoManager, DialogService dialogService) {
+    public GlobalSearchBar(
+        JabRefFrame frame,
+        StateManager stateManager,
+        PreferencesService preferencesService,
+        CountingUndoManager undoManager,
+        DialogService dialogService
+    ) {
         super();
         this.stateManager = stateManager;
         this.preferencesService = preferencesService;
@@ -127,51 +134,72 @@ public GlobalSearchBar(JabRefFrame frame, StateManager stateManager, Preferences
         searchFieldTooltip.setMaxHeight(10);
         updateHintVisibility();
 
-        KeyBindingRepository keyBindingRepository = preferencesService.getKeyBindingRepository();
-        searchField.addEventFilter(KeyEvent.KEY_PRESSED, event -> {
-            Optional<KeyBinding> keyBinding = keyBindingRepository.mapToKeyBinding(event);
-            if (keyBinding.isPresent()) {
-                if (keyBinding.get() == KeyBinding.CLOSE) {
-                    // Clear search and select first entry, if available
-                    searchField.setText("");
-                    frame.getCurrentLibraryTab().getMainTable().getSelectionModel().selectFirst();
-                    event.consume();
+        KeyBindingRepository keyBindingRepository =
+            preferencesService.getKeyBindingRepository();
+        searchField.addEventFilter(
+            KeyEvent.KEY_PRESSED,
+            event -> {
+                Optional<KeyBinding> keyBinding =
+                    keyBindingRepository.mapToKeyBinding(event);
+                if (keyBinding.isPresent()) {
+                    if (keyBinding.get() == KeyBinding.CLOSE) {
+                        // Clear search and select first entry, if available
+                        searchField.setText("");
+                        frame
+                            .getCurrentLibraryTab()
+                            .getMainTable()
+                            .getSelectionModel()
+                            .selectFirst();
+                        event.consume();
+                    }
                 }
             }
-        });
+        );
 
-        searchField.setContextMenu(SearchFieldRightClickMenu.create(
+        searchField.setContextMenu(
+            SearchFieldRightClickMenu.create(
                 keyBindingRepository,
                 stateManager,
                 searchField,
-                frame));
+                frame
+            )
+        );
 
         ObservableList<String> search = stateManager.getWholeSearchHistory();
-        search.addListener((ListChangeListener.Change<? extends String> change) -> {
-            searchField.setContextMenu(SearchFieldRightClickMenu.create(
-                    keyBindingRepository,
-                    stateManager,
-                    searchField,
-                    frame));
-        });
+        search.addListener((ListChangeListener.Change<
+            ? extends String
+        > change) -> {
+                searchField.setContextMenu(
+                    SearchFieldRightClickMenu.create(
+                        keyBindingRepository,
+                        stateManager,
+                        searchField,
+                        frame
+                    )
+                );
+            }
+        );
 
         ClipBoardManager.addX11Support(searchField);
 
         regularExpressionButton = IconTheme.JabRefIcons.REG_EX.asToggleButton();
-        caseSensitiveButton = IconTheme.JabRefIcons.CASE_SENSITIVE.asToggleButton();
+        caseSensitiveButton =
+            IconTheme.JabRefIcons.CASE_SENSITIVE.asToggleButton();
         fulltextButton = IconTheme.JabRefIcons.FULLTEXT.asToggleButton();
-        openGlobalSearchButton = IconTheme.JabRefIcons.OPEN_GLOBAL_SEARCH.asButton();
-        keepSearchString = IconTheme.JabRefIcons.KEEP_SEARCH_STRING.asToggleButton();
+        openGlobalSearchButton =
+            IconTheme.JabRefIcons.OPEN_GLOBAL_SEARCH.asButton();
+        keepSearchString =
+            IconTheme.JabRefIcons.KEEP_SEARCH_STRING.asToggleButton();
 
         initSearchModifierButtons();
 
-        BooleanBinding focusedOrActive = searchField.focusedProperty()
-                                                    .or(regularExpressionButton.focusedProperty())
-                                                    .or(caseSensitiveButton.focusedProperty())
-                                                    .or(fulltextButton.focusedProperty())
-                                                    .or(keepSearchString.focusedProperty())
-                                                    .or(searchField.textProperty()
-                                                                   .isNotEmpty());
+        BooleanBinding focusedOrActive = searchField
+            .focusedProperty()
+            .or(regularExpressionButton.focusedProperty())
+            .or(caseSensitiveButton.focusedProperty())
+            .or(fulltextButton.focusedProperty())
+            .or(keepSearchString.focusedProperty())
+            .or(searchField.textProperty().isNotEmpty());
 
         regularExpressionButton.visibleProperty().unbind();
         regularExpressionButton.visibleProperty().bind(focusedOrActive);
@@ -182,95 +210,168 @@ public GlobalSearchBar(JabRefFrame frame, StateManager stateManager, Preferences
         keepSearchString.visibleProperty().unbind();
         keepSearchString.visibleProperty().bind(focusedOrActive);
 
-        StackPane modifierButtons = new StackPane(new HBox(regularExpressionButton, caseSensitiveButton, fulltextButton, keepSearchString));
+        StackPane modifierButtons = new StackPane(
+            new HBox(
+                regularExpressionButton,
+                caseSensitiveButton,
+                fulltextButton,
+                keepSearchString
+            )
+        );
         modifierButtons.setAlignment(Pos.CENTER);
         searchField.setRight(new HBox(searchField.getRight(), modifierButtons));
         searchField.getStyleClass().add("search-field");
         searchField.setMinWidth(100);
         HBox.setHgrow(searchField, Priority.ALWAYS);
 
-        regexValidator = new FunctionBasedValidator<>(
+        regexValidator =
+            new FunctionBasedValidator<>(
                 searchField.textProperty(),
-                query -> !(regularExpressionButton.isSelected() && !validRegex()),
-                ValidationMessage.error(Localization.lang("Invalid regular expression")));
+                query ->
+                    !(regularExpressionButton.isSelected() && !validRegex()),
+                ValidationMessage.error(
+                    Localization.lang("Invalid regular expression")
+                )
+            );
         ControlsFxVisualizer visualizer = new ControlsFxVisualizer();
         visualizer.setDecoration(new IconValidationDecorator(Pos.CENTER_LEFT));
-        Platform.runLater(() -> visualizer.initVisualization(regexValidator.getValidationStatus(), searchField));
-
-        this.getChildren().addAll(searchField, openGlobalSearchButton, currentResults);
+        Platform.runLater(() ->
+            visualizer.initVisualization(
+                regexValidator.getValidationStatus(),
+                searchField
+            )
+        );
+
+        this.getChildren()
+            .addAll(searchField, openGlobalSearchButton, currentResults);
         this.setSpacing(4.0);
         this.setAlignment(Pos.CENTER_LEFT);
 
-        Timer searchTask = FxTimer.create(Duration.ofMillis(SEARCH_DELAY), this::updateSearchQuery);
+        Timer searchTask = FxTimer.create(
+            Duration.ofMillis(SEARCH_DELAY),
+            this::updateSearchQuery
+        );
         BindingsHelper.bindBidirectional(
-                stateManager.activeSearchQueryProperty(),
-                searchField.textProperty(),
-                searchTerm -> {
-                    // Async update
-                    searchTask.restart();
-                },
-                query -> setSearchTerm(query.map(SearchQuery::getQuery).orElse("")));
-
-        this.stateManager.activeSearchQueryProperty().addListener((obs, oldvalue, newValue) -> newValue.ifPresent(this::updateSearchResultsForQuery));
-        this.stateManager.activeDatabaseProperty().addListener((obs, oldValue, newValue) -> stateManager.activeSearchQueryProperty().get().ifPresent(this::updateSearchResultsForQuery));
+            stateManager.activeSearchQueryProperty(),
+            searchField.textProperty(),
+            searchTerm -> {
+                // Async update
+                searchTask.restart();
+            },
+            query -> setSearchTerm(query.map(SearchQuery::getQuery).orElse(""))
+        );
+
+        this.stateManager.activeSearchQueryProperty()
+            .addListener((obs, oldvalue, newValue) ->
+                newValue.ifPresent(this::updateSearchResultsForQuery)
+            );
+        this.stateManager.activeDatabaseProperty()
+            .addListener((obs, oldValue, newValue) ->
+                stateManager
+                    .activeSearchQueryProperty()
+                    .get()
+                    .ifPresent(this::updateSearchResultsForQuery)
+            );
         /*
          * The listener tracks a change on the focus property value.
          * This happens, from active (user types a query) to inactive / focus
          * 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 updateSearchResultsForQuery(SearchQuery query) {
-        updateResults(this.stateManager.getSearchResultSize().intValue(), SearchDescribers.getSearchDescriberFor(query).getDescription(),
-                query.isGrammarBasedSearch());
+        updateResults(
+            this.stateManager.getSearchResultSize().intValue(),
+            SearchDescribers.getSearchDescriberFor(query).getDescription(),
+            query.isGrammarBasedSearch()
+        );
     }
 
     private void initSearchModifierButtons() {
-        regularExpressionButton.setSelected(searchPreferences.isRegularExpression());
-        regularExpressionButton.setTooltip(new Tooltip(Localization.lang("regular expression")));
+        regularExpressionButton.setSelected(
+            searchPreferences.isRegularExpression()
+        );
+        regularExpressionButton.setTooltip(
+            new Tooltip(Localization.lang("regular expression"))
+        );
         initSearchModifierButton(regularExpressionButton);
         regularExpressionButton.setOnAction(event -> {
-            searchPreferences.setSearchFlag(SearchRules.SearchFlags.REGULAR_EXPRESSION, regularExpressionButton.isSelected());
+            searchPreferences.setSearchFlag(
+                SearchRules.SearchFlags.REGULAR_EXPRESSION,
+                regularExpressionButton.isSelected()
+            );
             updateSearchQuery();
         });
 
         caseSensitiveButton.setSelected(searchPreferences.isCaseSensitive());
-        caseSensitiveButton.setTooltip(new Tooltip(Localization.lang("Case sensitive")));
+        caseSensitiveButton.setTooltip(
+            new Tooltip(Localization.lang("Case sensitive"))
+        );
         initSearchModifierButton(caseSensitiveButton);
         caseSensitiveButton.setOnAction(event -> {
-            searchPreferences.setSearchFlag(SearchRules.SearchFlags.CASE_SENSITIVE, caseSensitiveButton.isSelected());
+            searchPreferences.setSearchFlag(
+                SearchRules.SearchFlags.CASE_SENSITIVE,
+                caseSensitiveButton.isSelected()
+            );
             updateSearchQuery();
         });
 
         fulltextButton.setSelected(searchPreferences.isFulltext());
-        fulltextButton.setTooltip(new Tooltip(Localization.lang("Fulltext search")));
+        fulltextButton.setTooltip(
+            new Tooltip(Localization.lang("Fulltext search"))
+        );
         initSearchModifierButton(fulltextButton);
         fulltextButton.setOnAction(event -> {
-            searchPreferences.setSearchFlag(SearchRules.SearchFlags.FULLTEXT, fulltextButton.isSelected());
+            searchPreferences.setSearchFlag(
+                SearchRules.SearchFlags.FULLTEXT,
+                fulltextButton.isSelected()
+            );
             updateSearchQuery();
         });
 
-        keepSearchString.setSelected(searchPreferences.shouldKeepSearchString());
-        keepSearchString.setTooltip(new Tooltip(Localization.lang("Keep search string across libraries")));
+        keepSearchString.setSelected(
+            searchPreferences.shouldKeepSearchString()
+        );
+        keepSearchString.setTooltip(
+            new Tooltip(
+                Localization.lang("Keep search string across libraries")
+            )
+        );
         initSearchModifierButton(keepSearchString);
         keepSearchString.setOnAction(evt -> {
-            searchPreferences.setSearchFlag(SearchRules.SearchFlags.KEEP_SEARCH_STRING, keepSearchString.isSelected());
+            searchPreferences.setSearchFlag(
+                SearchRules.SearchFlags.KEEP_SEARCH_STRING,
+                keepSearchString.isSelected()
+            );
             updateSearchQuery();
         });
 
-        openGlobalSearchButton.disableProperty().bindBidirectional(globalSearchActive);
-        openGlobalSearchButton.setTooltip(new Tooltip(Localization.lang("Search across libraries in a new window")));
+        openGlobalSearchButton
+            .disableProperty()
+            .bindBidirectional(globalSearchActive);
+        openGlobalSearchButton.setTooltip(
+            new Tooltip(
+                Localization.lang("Search across libraries in a new window")
+            )
+        );
         initSearchModifierButton(openGlobalSearchButton);
         openGlobalSearchButton.setOnAction(evt -> {
             globalSearchActive.setValue(true);
-            globalSearchResultDialog = new GlobalSearchResultDialog(undoManager);
+            globalSearchResultDialog =
+                new GlobalSearchResultDialog(undoManager);
             updateSearchQuery();
             dialogService.showCustomDialogAndWait(globalSearchResultDialog);
             globalSearchActive.setValue(false);
@@ -312,11 +413,16 @@ public void updateSearchQuery() {
 
         // Invalid regular expression
         if (!regexValidator.getValidationStatus().isValid()) {
-            currentResults.setText(Localization.lang("Invalid regular expression"));
+            currentResults.setText(
+                Localization.lang("Invalid regular expression")
+            );
             return;
         }
 
-        SearchQuery searchQuery = new SearchQuery(this.searchField.getText(), searchPreferences.getSearchFlags());
+        SearchQuery searchQuery = new SearchQuery(
+            this.searchField.getText(),
+            searchPreferences.getSearchFlags()
+        );
         if (!searchQuery.isValid()) {
             informUserAboutInvalidSearchQuery();
             return;
@@ -339,16 +445,27 @@ private void informUserAboutInvalidSearchQuery() {
 
         stateManager.clearSearchQuery();
 
-        String illegalSearch = Localization.lang("Search failed: illegal search expression");
+        String illegalSearch = Localization.lang(
+            "Search failed: illegal search expression"
+        );
         currentResults.setText(illegalSearch);
     }
 
     public void setAutoCompleter(SuggestionProvider<Author> searchCompleter) {
-        if (preferencesService.getAutoCompletePreferences().shouldAutoComplete()) {
-            AutoCompletionTextInputBinding<Author> autoComplete = AutoCompletionTextInputBinding.autoComplete(searchField,
+        if (
+            preferencesService.getAutoCompletePreferences().shouldAutoComplete()
+        ) {
+            AutoCompletionTextInputBinding<Author> autoComplete =
+                AutoCompletionTextInputBinding.autoComplete(
+                    searchField,
                     searchCompleter::provideSuggestions,
-                    new PersonNameStringConverter(false, false, AutoCompleteFirstNameMode.BOTH),
-                    new AppendPersonNamesStrategy());
+                    new PersonNameStringConverter(
+                        false,
+                        false,
+                        AutoCompleteFirstNameMode.BOTH
+                    ),
+                    new AppendPersonNamesStrategy()
+                );
             AutoCompletePopup<Author> popup = getPopup(autoComplete);
             popup.setSkin(new SearchPopupSkin<>(popup));
         }
@@ -358,24 +475,37 @@ public void setAutoCompleter(SuggestionProvider<Author> searchCompleter) {
      * The popup has private access in {@link AutoCompletionBinding}, so we use reflection to access it.
      */
     @SuppressWarnings("unchecked")
-    private <T> AutoCompletePopup<T> getPopup(AutoCompletionBinding<T> autoCompletionBinding) {
+    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);
+            return (AutoCompletePopup<T>) privatePopup.get(
+                autoCompletionBinding
+            );
         } catch (IllegalAccessException | NoSuchFieldException e) {
             LOGGER.error("Could not get access to auto completion popup", e);
             return new AutoCompletePopup<>();
         }
     }
 
-    private void updateResults(int matched, TextFlow description, boolean grammarBasedSearch) {
+    private void updateResults(
+        int matched,
+        TextFlow description,
+        boolean grammarBasedSearch
+    ) {
         if (matched == 0) {
             currentResults.setText(Localization.lang("No results found."));
             searchField.pseudoClassStateChanged(CLASS_NO_RESULTS, true);
         } else {
-            currentResults.setText(Localization.lang("Found %0 results.", String.valueOf(matched)));
+            currentResults.setText(
+                Localization.lang("Found %0 results.", String.valueOf(matched))
+            );
             searchField.pseudoClassStateChanged(CLASS_RESULTS_FOUND, true);
         }
         if (grammarBasedSearch) {
@@ -390,9 +520,16 @@ private void updateResults(int matched, TextFlow description, boolean grammarBas
     }
 
     private void setSearchFieldHintTooltip(TextFlow description) {
-        if (preferencesService.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);
+        if (
+            preferencesService
+                .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);
 
             if (description == null) {
                 TextFlow emptyHintTooltip = new TextFlow();
@@ -415,10 +552,13 @@ public void setSearchTerm(String searchTerm) {
             return;
         }
 
-        DefaultTaskExecutor.runInJavaFXThread(() -> searchField.setText(searchTerm));
+        DefaultTaskExecutor.runInJavaFXThread(() ->
+            searchField.setText(searchTerm)
+        );
     }
 
-    private static class SearchPopupSkin<T> implements Skin<AutoCompletePopup<T>> {
+    private static class SearchPopupSkin<T>
+        implements Skin<AutoCompletePopup<T>> {
 
         private final AutoCompletePopup<T> control;
         private final ListView<T> suggestionList;
@@ -428,12 +568,35 @@ 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.prefWidthProperty().bind(control.prefWidthProperty());
-            this.suggestionList.maxWidthProperty().bind(control.maxWidthProperty());
-            this.suggestionList.minWidthProperty().bind(control.minWidthProperty());
+            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());
 
             this.container = new BorderPane();
             this.container.setCenter(suggestionList);
@@ -443,30 +606,39 @@ public SearchPopupSkin(AutoCompletePopup<T> control) {
 
         private void registerEventListener() {
             this.suggestionList.setOnMouseClicked(me -> {
-                if (me.getButton() == MouseButton.PRIMARY) {
-                    this.onSuggestionChosen(this.suggestionList.getSelectionModel().getSelectedItem());
-                }
-            });
+                    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;
-                }
-            });
+                    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;
+                    }
+                });
         }
 
         private void onSuggestionChosen(T suggestion) {
             if (suggestion != null) {
-                Event.fireEvent(this.control, new AutoCompletePopup.SuggestionEvent<>(suggestion));
+                Event.fireEvent(
+                    this.control,
+                    new AutoCompletePopup.SuggestionEvent<>(suggestion)
+                );
             }
         }
 
diff --git a/src/main/java/org/jabref/gui/search/GlobalSearchResultDialog.java b/src/main/java/org/jabref/gui/search/GlobalSearchResultDialog.java
index 338ed960023..654e7e8fa76 100644
--- a/src/main/java/org/jabref/gui/search/GlobalSearchResultDialog.java
+++ b/src/main/java/org/jabref/gui/search/GlobalSearchResultDialog.java
@@ -1,14 +1,15 @@
 package org.jabref.gui.search;
 
-import javax.swing.undo.UndoManager;
-
+import com.airhacks.afterburner.views.ViewLoader;
+import com.tobiasdiez.easybind.EasyBind;
+import jakarta.inject.Inject;
 import javafx.fxml.FXML;
 import javafx.scene.control.SplitPane;
 import javafx.scene.control.ToggleButton;
 import javafx.stage.Modality;
 import javafx.stage.Stage;
 import javafx.stage.WindowEvent;
-
+import javax.swing.undo.UndoManager;
 import org.jabref.gui.DialogService;
 import org.jabref.gui.StateManager;
 import org.jabref.gui.icon.IconTheme;
@@ -20,22 +21,30 @@
 import org.jabref.logic.l10n.Localization;
 import org.jabref.preferences.PreferencesService;
 
-import com.airhacks.afterburner.views.ViewLoader;
-import com.tobiasdiez.easybind.EasyBind;
-import jakarta.inject.Inject;
-
 public class GlobalSearchResultDialog extends BaseDialog<Void> {
 
-    @FXML private SplitPane container;
-    @FXML private ToggleButton keepOnTop;
+    @FXML
+    private SplitPane container;
+
+    @FXML
+    private ToggleButton keepOnTop;
 
     private final UndoManager undoManager;
 
-    @Inject private PreferencesService preferencesService;
-    @Inject private StateManager stateManager;
-    @Inject private DialogService dialogService;
-    @Inject private ThemeManager themeManager;
-    @Inject private TaskExecutor taskExecutor;
+    @Inject
+    private PreferencesService preferencesService;
+
+    @Inject
+    private StateManager stateManager;
+
+    @Inject
+    private DialogService dialogService;
+
+    @Inject
+    private ThemeManager themeManager;
+
+    @Inject
+    private TaskExecutor taskExecutor;
 
     private GlobalSearchResultDialogViewModel viewModel;
 
@@ -43,9 +52,7 @@ public GlobalSearchResultDialog(UndoManager undoManager) {
         this.undoManager = undoManager;
 
         setTitle(Localization.lang("Search results from open libraries"));
-        ViewLoader.view(this)
-                  .load()
-                  .setAsDialogPane(this);
+        ViewLoader.view(this).load().setAsDialogPane(this);
         initModality(Modality.NONE);
     }
 
@@ -53,46 +60,107 @@ public GlobalSearchResultDialog(UndoManager undoManager) {
     private void initialize() {
         viewModel = new GlobalSearchResultDialogViewModel(preferencesService);
 
-        PreviewViewer previewViewer = new PreviewViewer(viewModel.getSearchDatabaseContext(), dialogService, preferencesService, stateManager, themeManager, taskExecutor);
-        previewViewer.setLayout(preferencesService.getPreviewPreferences().getSelectedPreviewLayout());
-
-        SearchResultsTableDataModel model = new SearchResultsTableDataModel(viewModel.getSearchDatabaseContext(), preferencesService, stateManager);
-        SearchResultsTable resultsTable = new SearchResultsTable(model, viewModel.getSearchDatabaseContext(), preferencesService, undoManager, dialogService, stateManager, taskExecutor);
-
-        resultsTable.getColumns().removeIf(SpecialFieldColumn.class::isInstance);
+        PreviewViewer previewViewer = new PreviewViewer(
+            viewModel.getSearchDatabaseContext(),
+            dialogService,
+            preferencesService,
+            stateManager,
+            themeManager,
+            taskExecutor
+        );
+        previewViewer.setLayout(
+            preferencesService
+                .getPreviewPreferences()
+                .getSelectedPreviewLayout()
+        );
+
+        SearchResultsTableDataModel model = new SearchResultsTableDataModel(
+            viewModel.getSearchDatabaseContext(),
+            preferencesService,
+            stateManager
+        );
+        SearchResultsTable resultsTable = new SearchResultsTable(
+            model,
+            viewModel.getSearchDatabaseContext(),
+            preferencesService,
+            undoManager,
+            dialogService,
+            stateManager,
+            taskExecutor
+        );
+
+        resultsTable
+            .getColumns()
+            .removeIf(SpecialFieldColumn.class::isInstance);
         resultsTable.getSelectionModel().selectFirst();
 
         if (resultsTable.getSelectionModel().getSelectedItem() != null) {
-            previewViewer.setEntry(resultsTable.getSelectionModel().getSelectedItem().getEntry());
+            previewViewer.setEntry(
+                resultsTable.getSelectionModel().getSelectedItem().getEntry()
+            );
         }
 
-        resultsTable.getSelectionModel().selectedItemProperty().addListener((obs, old, newValue) -> {
-            if (newValue != null) {
-                previewViewer.setEntry(newValue.getEntry());
-            } else {
-                previewViewer.setEntry(old.getEntry());
-            }
-        });
+        resultsTable
+            .getSelectionModel()
+            .selectedItemProperty()
+            .addListener((obs, old, newValue) -> {
+                if (newValue != null) {
+                    previewViewer.setEntry(newValue.getEntry());
+                } else {
+                    previewViewer.setEntry(old.getEntry());
+                }
+            });
 
         container.getItems().addAll(resultsTable, previewViewer);
 
         keepOnTop.selectedProperty().bindBidirectional(viewModel.keepOnTop());
-        EasyBind.subscribe(viewModel.keepOnTop(), value -> {
-            Stage stage = (Stage) getDialogPane().getScene().getWindow();
-            stage.setAlwaysOnTop(value);
-            keepOnTop.setGraphic(value
-                    ? IconTheme.JabRefIcons.KEEP_ON_TOP.getGraphicNode()
-                    : IconTheme.JabRefIcons.KEEP_ON_TOP_OFF.getGraphicNode());
-        });
-
-        getDialogPane().getScene().getWindow().addEventHandler(WindowEvent.WINDOW_SHOWN, event -> {
-            getDialogPane().setPrefHeight(preferencesService.getSearchPreferences().getSearchWindowHeight());
-            getDialogPane().setPrefWidth(preferencesService.getSearchPreferences().getSearchWindowWidth());
-        });
-
-        getDialogPane().getScene().getWindow().addEventHandler(WindowEvent.WINDOW_HIDDEN, event -> {
-            preferencesService.getSearchPreferences().setSearchWindowHeight(getHeight());
-            preferencesService.getSearchPreferences().setSearchWindowWidth(getWidth());
-        });
+        EasyBind.subscribe(
+            viewModel.keepOnTop(),
+            value -> {
+                Stage stage = (Stage) getDialogPane().getScene().getWindow();
+                stage.setAlwaysOnTop(value);
+                keepOnTop.setGraphic(
+                    value
+                        ? IconTheme.JabRefIcons.KEEP_ON_TOP.getGraphicNode()
+                        : IconTheme.JabRefIcons.KEEP_ON_TOP_OFF.getGraphicNode()
+                );
+            }
+        );
+
+        getDialogPane()
+            .getScene()
+            .getWindow()
+            .addEventHandler(
+                WindowEvent.WINDOW_SHOWN,
+                event -> {
+                    getDialogPane()
+                        .setPrefHeight(
+                            preferencesService
+                                .getSearchPreferences()
+                                .getSearchWindowHeight()
+                        );
+                    getDialogPane()
+                        .setPrefWidth(
+                            preferencesService
+                                .getSearchPreferences()
+                                .getSearchWindowWidth()
+                        );
+                }
+            );
+
+        getDialogPane()
+            .getScene()
+            .getWindow()
+            .addEventHandler(
+                WindowEvent.WINDOW_HIDDEN,
+                event -> {
+                    preferencesService
+                        .getSearchPreferences()
+                        .setSearchWindowHeight(getHeight());
+                    preferencesService
+                        .getSearchPreferences()
+                        .setSearchWindowWidth(getWidth());
+                }
+            );
     }
 }
diff --git a/src/main/java/org/jabref/gui/search/GlobalSearchResultDialogViewModel.java b/src/main/java/org/jabref/gui/search/GlobalSearchResultDialogViewModel.java
index aab636eabc6..81162ddafcf 100644
--- a/src/main/java/org/jabref/gui/search/GlobalSearchResultDialogViewModel.java
+++ b/src/main/java/org/jabref/gui/search/GlobalSearchResultDialogViewModel.java
@@ -1,24 +1,30 @@
 package org.jabref.gui.search;
 
+import com.tobiasdiez.easybind.EasyBind;
 import javafx.beans.property.BooleanProperty;
 import javafx.beans.property.SimpleBooleanProperty;
-
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.preferences.PreferencesService;
 import org.jabref.preferences.SearchPreferences;
 
-import com.tobiasdiez.easybind.EasyBind;
-
 public class GlobalSearchResultDialogViewModel {
-    private final BibDatabaseContext searchDatabaseContext = new BibDatabaseContext();
+
+    private final BibDatabaseContext searchDatabaseContext =
+        new BibDatabaseContext();
     private final BooleanProperty keepOnTop = new SimpleBooleanProperty();
 
-    public GlobalSearchResultDialogViewModel(PreferencesService preferencesService) {
-        SearchPreferences searchPreferences = preferencesService.getSearchPreferences();
+    public GlobalSearchResultDialogViewModel(
+        PreferencesService preferencesService
+    ) {
+        SearchPreferences searchPreferences =
+            preferencesService.getSearchPreferences();
 
         keepOnTop.set(searchPreferences.shouldKeepWindowOnTop());
 
-        EasyBind.subscribe(this.keepOnTop, searchPreferences::setKeepWindowOnTop);
+        EasyBind.subscribe(
+            this.keepOnTop,
+            searchPreferences::setKeepWindowOnTop
+        );
     }
 
     public BibDatabaseContext getSearchDatabaseContext() {
diff --git a/src/main/java/org/jabref/gui/search/RebuildFulltextSearchIndexAction.java b/src/main/java/org/jabref/gui/search/RebuildFulltextSearchIndexAction.java
index 4fb2a575ab6..e50eb69e85a 100644
--- a/src/main/java/org/jabref/gui/search/RebuildFulltextSearchIndexAction.java
+++ b/src/main/java/org/jabref/gui/search/RebuildFulltextSearchIndexAction.java
@@ -1,7 +1,8 @@
 package org.jabref.gui.search;
 
-import java.io.IOException;
+import static org.jabref.gui.actions.ActionHelper.needsDatabase;
 
+import java.io.IOException;
 import org.jabref.gui.DialogService;
 import org.jabref.gui.LibraryTab;
 import org.jabref.gui.StateManager;
@@ -12,15 +13,14 @@
 import org.jabref.logic.pdf.search.indexing.PdfIndexer;
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.preferences.FilePreferences;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import static org.jabref.gui.actions.ActionHelper.needsDatabase;
-
 public class RebuildFulltextSearchIndexAction extends SimpleCommand {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(LibraryTab.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(
+        LibraryTab.class
+    );
 
     private final StateManager stateManager;
     private final GetCurrentLibraryTab currentLibraryTab;
@@ -32,11 +32,13 @@ public class RebuildFulltextSearchIndexAction extends SimpleCommand {
 
     private boolean shouldContinue = true;
 
-    public RebuildFulltextSearchIndexAction(StateManager stateManager,
-                                            GetCurrentLibraryTab currentLibraryTab,
-                                            DialogService dialogService,
-                                            FilePreferences filePreferences,
-                                            TaskExecutor taskExecutor) {
+    public RebuildFulltextSearchIndexAction(
+        StateManager stateManager,
+        GetCurrentLibraryTab currentLibraryTab,
+        DialogService dialogService,
+        FilePreferences filePreferences,
+        TaskExecutor taskExecutor
+    ) {
         this.stateManager = stateManager;
         this.currentLibraryTab = currentLibraryTab;
         this.dialogService = dialogService;
@@ -49,8 +51,7 @@ public RebuildFulltextSearchIndexAction(StateManager stateManager,
     @Override
     public void execute() {
         init();
-        BackgroundTask.wrap(this::rebuildIndex)
-                      .executeWith(taskExecutor);
+        BackgroundTask.wrap(this::rebuildIndex).executeWith(taskExecutor);
     }
 
     public void init() {
@@ -60,13 +61,18 @@ public void init() {
 
         databaseContext = stateManager.getActiveDatabase().get();
         boolean confirm = dialogService.showConfirmationDialogAndWait(
-                Localization.lang("Rebuild fulltext search index"),
-                Localization.lang("Rebuild fulltext search index for current library?"));
+            Localization.lang("Rebuild fulltext search index"),
+            Localization.lang(
+                "Rebuild fulltext search index for current library?"
+            )
+        );
         if (!confirm) {
             shouldContinue = false;
             return;
         }
-        dialogService.notify(Localization.lang("Rebuilding fulltext search index..."));
+        dialogService.notify(
+            Localization.lang("Rebuilding fulltext search index...")
+        );
     }
 
     private void rebuildIndex() {
@@ -74,10 +80,21 @@ private void rebuildIndex() {
             return;
         }
         try {
-            currentLibraryTab.get().getIndexingTaskManager().createIndex(PdfIndexer.of(databaseContext, filePreferences));
-            currentLibraryTab.get().getIndexingTaskManager().updateIndex(PdfIndexer.of(databaseContext, filePreferences), databaseContext);
+            currentLibraryTab
+                .get()
+                .getIndexingTaskManager()
+                .createIndex(PdfIndexer.of(databaseContext, filePreferences));
+            currentLibraryTab
+                .get()
+                .getIndexingTaskManager()
+                .updateIndex(
+                    PdfIndexer.of(databaseContext, filePreferences),
+                    databaseContext
+                );
         } catch (IOException e) {
-            dialogService.notify(Localization.lang("Failed to access fulltext search index"));
+            dialogService.notify(
+                Localization.lang("Failed to access fulltext search index")
+            );
             LOGGER.error("Failed to access fulltext search index", e);
         }
     }
diff --git a/src/main/java/org/jabref/gui/search/SearchDisplayMode.java b/src/main/java/org/jabref/gui/search/SearchDisplayMode.java
index 18074f57a71..b98dbe6f12d 100644
--- a/src/main/java/org/jabref/gui/search/SearchDisplayMode.java
+++ b/src/main/java/org/jabref/gui/search/SearchDisplayMode.java
@@ -1,16 +1,20 @@
 package org.jabref.gui.search;
 
 import java.util.function.Supplier;
-
 import org.jabref.logic.l10n.Localization;
 
 /**
  * Collects the possible search modes
  */
 public enum SearchDisplayMode {
-
-    FLOAT(() -> Localization.lang("Float"), () -> Localization.lang("Gray out non-hits")),
-    FILTER(() -> Localization.lang("Filter"), () -> Localization.lang("Hide non-hits"));
+    FLOAT(
+        () -> Localization.lang("Float"),
+        () -> Localization.lang("Gray out non-hits")
+    ),
+    FILTER(
+        () -> Localization.lang("Filter"),
+        () -> Localization.lang("Hide non-hits")
+    );
 
     private final Supplier<String> displayName;
     private final Supplier<String> toolTipText;
@@ -18,7 +22,10 @@ public enum SearchDisplayMode {
     /**
      * We have to use supplier for the localized text so that language changes are correctly reflected.
      */
-    SearchDisplayMode(Supplier<String> displayName, Supplier<String> toolTipText) {
+    SearchDisplayMode(
+        Supplier<String> displayName,
+        Supplier<String> toolTipText
+    ) {
         this.displayName = displayName;
         this.toolTipText = toolTipText;
     }
diff --git a/src/main/java/org/jabref/gui/search/SearchFieldRightClickMenu.java b/src/main/java/org/jabref/gui/search/SearchFieldRightClickMenu.java
index 5839619b881..9ed8c583f01 100644
--- a/src/main/java/org/jabref/gui/search/SearchFieldRightClickMenu.java
+++ b/src/main/java/org/jabref/gui/search/SearchFieldRightClickMenu.java
@@ -4,7 +4,7 @@
 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.JabRefFrame;
 import org.jabref.gui.StateManager;
 import org.jabref.gui.actions.ActionFactory;
@@ -14,60 +14,108 @@
 import org.jabref.gui.keyboard.KeyBindingRepository;
 import org.jabref.logic.l10n.Localization;
 
-import org.controlsfx.control.textfield.CustomTextField;
-
 public class SearchFieldRightClickMenu {
-    public static ContextMenu create(KeyBindingRepository keyBindingRepository,
-                                     StateManager stateManager,
-                                     CustomTextField searchField,
-                                     JabRefFrame frame) {
+
+    public static ContextMenu create(
+        KeyBindingRepository keyBindingRepository,
+        StateManager stateManager,
+        CustomTextField searchField,
+        JabRefFrame frame
+    ) {
         ActionFactory factory = new ActionFactory(keyBindingRepository);
         ContextMenu contextMenu = new ContextMenu();
 
-        contextMenu.getItems().addAll(
-                factory.createMenuItem(StandardActions.UNDO, new EditAction(StandardActions.UNDO, frame, stateManager)),
-                factory.createMenuItem(StandardActions.REDO, new EditAction(StandardActions.REDO, frame, stateManager)),
-                factory.createMenuItem(StandardActions.CUT, new EditAction(StandardActions.CUT, frame, stateManager)),
-                factory.createMenuItem(StandardActions.COPY, new EditAction(StandardActions.COPY, frame, stateManager)),
-                factory.createMenuItem(StandardActions.PASTE, new EditAction(StandardActions.PASTE, frame, stateManager)),
-                factory.createMenuItem(StandardActions.DELETE, new EditAction(StandardActions.DELETE, frame, stateManager)),
-
+        contextMenu
+            .getItems()
+            .addAll(
+                factory.createMenuItem(
+                    StandardActions.UNDO,
+                    new EditAction(StandardActions.UNDO, frame, stateManager)
+                ),
+                factory.createMenuItem(
+                    StandardActions.REDO,
+                    new EditAction(StandardActions.REDO, frame, stateManager)
+                ),
+                factory.createMenuItem(
+                    StandardActions.CUT,
+                    new EditAction(StandardActions.CUT, frame, stateManager)
+                ),
+                factory.createMenuItem(
+                    StandardActions.COPY,
+                    new EditAction(StandardActions.COPY, frame, stateManager)
+                ),
+                factory.createMenuItem(
+                    StandardActions.PASTE,
+                    new EditAction(StandardActions.PASTE, frame, stateManager)
+                ),
+                factory.createMenuItem(
+                    StandardActions.DELETE,
+                    new EditAction(StandardActions.DELETE, frame, stateManager)
+                ),
                 new SeparatorMenuItem(),
-
-                factory.createMenuItem(StandardActions.SELECT_ALL, new EditAction(StandardActions.SELECT_ALL, null, stateManager)),
-                createSearchFromHistorySubMenu(factory, stateManager, searchField)
-        );
+                factory.createMenuItem(
+                    StandardActions.SELECT_ALL,
+                    new EditAction(
+                        StandardActions.SELECT_ALL,
+                        null,
+                        stateManager
+                    )
+                ),
+                createSearchFromHistorySubMenu(
+                    factory,
+                    stateManager,
+                    searchField
+                )
+            );
 
         return contextMenu;
     }
 
-    private static Menu createSearchFromHistorySubMenu(ActionFactory factory,
-                                                       StateManager stateManager,
-                                                       CustomTextField searchField) {
-        Menu searchFromHistorySubMenu = factory.createMenu(() -> Localization.lang("Search from history..."));
+    private static Menu createSearchFromHistorySubMenu(
+        ActionFactory factory,
+        StateManager stateManager,
+        CustomTextField searchField
+    ) {
+        Menu searchFromHistorySubMenu = factory.createMenu(() ->
+            Localization.lang("Search from history...")
+        );
 
         int num = stateManager.getLastSearchHistory(10).size();
         if (num == 0) {
-            MenuItem item = new MenuItem(Localization.lang("your search history is empty"));
+            MenuItem item = new MenuItem(
+                Localization.lang("your search history is empty")
+            );
             searchFromHistorySubMenu.getItems().addAll(item);
         } else {
             for (int i = 0; i < num; i++) {
                 int finalI = i;
-                MenuItem item = factory.createMenuItem(() -> stateManager.getLastSearchHistory(10).get(finalI), new SimpleCommand() {
-                    @Override
-                    public void execute() {
-                        searchField.setText(stateManager.getLastSearchHistory(10).get(finalI));
+                MenuItem item = factory.createMenuItem(
+                    () -> stateManager.getLastSearchHistory(10).get(finalI),
+                    new SimpleCommand() {
+                        @Override
+                        public void execute() {
+                            searchField.setText(
+                                stateManager
+                                    .getLastSearchHistory(10)
+                                    .get(finalI)
+                            );
+                        }
                     }
-                });
+                );
                 searchFromHistorySubMenu.getItems().addAll(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);
+            );
+            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 2e4a3c710f5..4ff9ce1e64e 100644
--- a/src/main/java/org/jabref/gui/search/SearchResultsTable.java
+++ b/src/main/java/org/jabref/gui/search/SearchResultsTable.java
@@ -1,13 +1,10 @@
 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;
-
+import javax.swing.undo.UndoManager;
 import org.jabref.gui.DialogService;
 import org.jabref.gui.StateManager;
 import org.jabref.gui.maintable.BibEntryTableViewModel;
@@ -24,25 +21,30 @@
 
 public class SearchResultsTable extends TableView<BibEntryTableViewModel> {
 
-    public SearchResultsTable(SearchResultsTableDataModel model,
-                              BibDatabaseContext database,
-                              PreferencesService preferencesService,
-                              UndoManager undoManager,
-                              DialogService dialogService,
-                              StateManager stateManager,
-                              TaskExecutor taskExecutor) {
+    public SearchResultsTable(
+        SearchResultsTableDataModel model,
+        BibDatabaseContext database,
+        PreferencesService preferencesService,
+        UndoManager undoManager,
+        DialogService dialogService,
+        StateManager stateManager,
+        TaskExecutor taskExecutor
+    ) {
         super();
+        MainTablePreferences mainTablePreferences =
+            preferencesService.getMainTablePreferences();
 
-        MainTablePreferences mainTablePreferences = preferencesService.getMainTablePreferences();
-
-        List<TableColumn<BibEntryTableViewModel, ?>> allCols = new MainTableColumnFactory(
+        List<TableColumn<BibEntryTableViewModel, ?>> allCols =
+            new MainTableColumnFactory(
                 database,
                 preferencesService,
                 preferencesService.getSearchDialogColumnPreferences(),
                 undoManager,
                 dialogService,
                 stateManager,
-                taskExecutor).createColumns();
+                taskExecutor
+            )
+                .createColumns();
 
         if (allCols.stream().noneMatch(LibraryColumn.class::isInstance)) {
             allCols.add(0, new LibraryColumn());
@@ -50,12 +52,17 @@ public SearchResultsTable(SearchResultsTableDataModel model,
         this.getColumns().addAll(allCols);
 
         this.getSortOrder().clear();
-        preferencesService.getSearchDialogColumnPreferences().getColumnSortOrder().forEach(columnModel ->
-                this.getColumns().stream()
+        preferencesService
+            .getSearchDialogColumnPreferences()
+            .getColumnSortOrder()
+            .forEach(columnModel ->
+                this.getColumns()
+                    .stream()
                     .map(column -> (MainTableColumn<?>) column)
                     .filter(column -> column.getModel().equals(columnModel))
                     .findFirst()
-                    .ifPresent(column -> this.getSortOrder().add(column)));
+                    .ifPresent(column -> this.getSortOrder().add(column))
+            );
 
         if (mainTablePreferences.getResizeColumnsToFit()) {
             this.setColumnResizePolicy(new SmartConstrainedResizePolicy());
@@ -64,14 +71,21 @@ public SearchResultsTable(SearchResultsTableDataModel model,
         this.getSelectionModel().setSelectionMode(SelectionMode.SINGLE);
         this.setItems(model.getEntriesFilteredAndSorted());
         // Enable sorting
-        model.getEntriesFilteredAndSorted().comparatorProperty().bind(this.comparatorProperty());
+        model
+            .getEntriesFilteredAndSorted()
+            .comparatorProperty()
+            .bind(this.comparatorProperty());
 
-        this.getStylesheets().add(MainTable.class.getResource("MainTable.css").toExternalForm());
+        this.getStylesheets()
+            .add(MainTable.class.getResource("MainTable.css").toExternalForm());
 
         // Store visual state
-        new PersistenceVisualStateTable(this, preferencesService.getSearchDialogColumnPreferences()).addListeners();
+        new PersistenceVisualStateTable(
+            this,
+            preferencesService.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 967c397b799..0e9fb6484d6 100644
--- a/src/main/java/org/jabref/gui/search/SearchResultsTableDataModel.java
+++ b/src/main/java/org/jabref/gui/search/SearchResultsTableDataModel.java
@@ -1,15 +1,14 @@
 package org.jabref.gui.search;
 
+import com.tobiasdiez.easybind.EasyBind;
 import java.util.List;
 import java.util.Optional;
-
 import javafx.beans.property.ObjectProperty;
 import javafx.beans.property.SimpleObjectProperty;
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableList;
 import javafx.collections.transformation.FilteredList;
 import javafx.collections.transformation.SortedList;
-
 import org.jabref.gui.StateManager;
 import org.jabref.gui.maintable.BibEntryTableViewModel;
 import org.jabref.gui.maintable.MainTableFieldValueFormatter;
@@ -19,38 +18,71 @@
 import org.jabref.model.entry.BibEntry;
 import org.jabref.preferences.PreferencesService;
 
-import com.tobiasdiez.easybind.EasyBind;
-
 public class SearchResultsTableDataModel {
 
     private final FilteredList<BibEntryTableViewModel> entriesFiltered;
     private final SortedList<BibEntryTableViewModel> entriesSorted;
-    private final ObjectProperty<MainTableFieldValueFormatter> fieldValueFormatter;
+    private final ObjectProperty<
+        MainTableFieldValueFormatter
+    > fieldValueFormatter;
     private final NameDisplayPreferences nameDisplayPreferences;
     private final BibDatabaseContext bibDatabaseContext;
 
-    public SearchResultsTableDataModel(BibDatabaseContext bibDatabaseContext, PreferencesService preferencesService, StateManager stateManager) {
-        this.nameDisplayPreferences = preferencesService.getNameDisplayPreferences();
+    public SearchResultsTableDataModel(
+        BibDatabaseContext bibDatabaseContext,
+        PreferencesService preferencesService,
+        StateManager stateManager
+    ) {
+        this.nameDisplayPreferences =
+            preferencesService.getNameDisplayPreferences();
         this.bibDatabaseContext = bibDatabaseContext;
-        this.fieldValueFormatter = new SimpleObjectProperty<>(new MainTableFieldValueFormatter(nameDisplayPreferences, bibDatabaseContext));
+        this.fieldValueFormatter =
+            new SimpleObjectProperty<>(
+                new MainTableFieldValueFormatter(
+                    nameDisplayPreferences,
+                    bibDatabaseContext
+                )
+            );
 
-        ObservableList<BibEntryTableViewModel> entriesViewModel = FXCollections.observableArrayList();
+        ObservableList<BibEntryTableViewModel> entriesViewModel =
+            FXCollections.observableArrayList();
         for (BibDatabaseContext context : stateManager.getOpenDatabases()) {
-            ObservableList<BibEntry> entriesForDb = context.getDatabase().getEntries();
-            List<BibEntryTableViewModel> viewModelForDb = EasyBind.mapBacked(entriesForDb, entry -> new BibEntryTableViewModel(entry, context, fieldValueFormatter));
+            ObservableList<BibEntry> entriesForDb = context
+                .getDatabase()
+                .getEntries();
+            List<BibEntryTableViewModel> viewModelForDb = EasyBind.mapBacked(
+                entriesForDb,
+                entry ->
+                    new BibEntryTableViewModel(
+                        entry,
+                        context,
+                        fieldValueFormatter
+                    )
+            );
             entriesViewModel.addAll(viewModelForDb);
         }
 
         entriesFiltered = new FilteredList<>(entriesViewModel);
-        entriesFiltered.predicateProperty().bind(EasyBind.map(stateManager.activeSearchQueryProperty(), query -> entry -> isMatchedBySearch(query, entry)));
+        entriesFiltered
+            .predicateProperty()
+            .bind(
+                EasyBind.map(
+                    stateManager.activeSearchQueryProperty(),
+                    query -> entry -> isMatchedBySearch(query, entry)
+                )
+            );
 
         // We need to wrap the list since otherwise sorting in the table does not work
         entriesSorted = new SortedList<>(entriesFiltered);
     }
 
-    private boolean isMatchedBySearch(Optional<SearchQuery> query, BibEntryTableViewModel entry) {
-        return query.map(matcher -> matcher.isMatch(entry.getEntry()))
-                    .orElse(true);
+    private boolean isMatchedBySearch(
+        Optional<SearchQuery> query,
+        BibEntryTableViewModel entry
+    ) {
+        return query
+            .map(matcher -> matcher.isMatch(entry.getEntry()))
+            .orElse(true);
     }
 
     public SortedList<BibEntryTableViewModel> getEntriesFilteredAndSorted() {
@@ -58,6 +90,11 @@ public SortedList<BibEntryTableViewModel> getEntriesFilteredAndSorted() {
     }
 
     public void refresh() {
-        this.fieldValueFormatter.setValue(new MainTableFieldValueFormatter(nameDisplayPreferences, bibDatabaseContext));
+        this.fieldValueFormatter.setValue(
+                new MainTableFieldValueFormatter(
+                    nameDisplayPreferences,
+                    bibDatabaseContext
+                )
+            );
     }
 }
diff --git a/src/main/java/org/jabref/gui/search/SearchTextField.java b/src/main/java/org/jabref/gui/search/SearchTextField.java
index 5073d01475a..961add7ff6e 100644
--- a/src/main/java/org/jabref/gui/search/SearchTextField.java
+++ b/src/main/java/org/jabref/gui/search/SearchTextField.java
@@ -1,15 +1,15 @@
 package org.jabref.gui.search;
 
-import org.jabref.gui.icon.IconTheme;
-import org.jabref.logic.l10n.Localization;
-
 import org.controlsfx.control.textfield.CustomTextField;
 import org.controlsfx.control.textfield.TextFields;
+import org.jabref.gui.icon.IconTheme;
+import org.jabref.logic.l10n.Localization;
 
 public class SearchTextField {
 
     public static CustomTextField create() {
-        CustomTextField textField = (CustomTextField) TextFields.createClearableTextField();
+        CustomTextField textField =
+            (CustomTextField) TextFields.createClearableTextField();
         textField.setPromptText(Localization.lang("Search") + "...");
         textField.setLeft(IconTheme.JabRefIcons.SEARCH.getGraphicNode());
         textField.setId("searchField");
diff --git a/src/main/java/org/jabref/gui/search/rules/describer/ContainsAndRegexBasedSearchRuleDescriber.java b/src/main/java/org/jabref/gui/search/rules/describer/ContainsAndRegexBasedSearchRuleDescriber.java
index d411c263c7c..66579508b17 100644
--- a/src/main/java/org/jabref/gui/search/rules/describer/ContainsAndRegexBasedSearchRuleDescriber.java
+++ b/src/main/java/org/jabref/gui/search/rules/describer/ContainsAndRegexBasedSearchRuleDescriber.java
@@ -2,22 +2,24 @@
 
 import java.util.EnumSet;
 import java.util.List;
-
 import javafx.scene.text.Text;
 import javafx.scene.text.TextFlow;
-
 import org.jabref.gui.util.TooltipTextUtil;
 import org.jabref.logic.l10n.Localization;
 import org.jabref.model.search.rules.SearchRules;
 import org.jabref.model.search.rules.SearchRules.SearchFlags;
 import org.jabref.model.search.rules.SentenceAnalyzer;
 
-public class ContainsAndRegexBasedSearchRuleDescriber implements SearchDescriber {
+public class ContainsAndRegexBasedSearchRuleDescriber
+    implements SearchDescriber {
 
     private final EnumSet<SearchFlags> searchFlags;
     private final String query;
 
-    public ContainsAndRegexBasedSearchRuleDescriber(EnumSet<SearchFlags> searchFlags, String query) {
+    public ContainsAndRegexBasedSearchRuleDescriber(
+        EnumSet<SearchFlags> searchFlags,
+        String query
+    ) {
         this.searchFlags = searchFlags;
         this.query = query;
     }
@@ -27,16 +29,39 @@ public TextFlow getDescription() {
         List<String> words = new SentenceAnalyzer(query).getWords();
         String firstWord = words.isEmpty() ? "" : words.get(0);
 
-        String temp = searchFlags.contains(SearchRules.SearchFlags.REGULAR_EXPRESSION) ? Localization.lang(
-                "This search contains entries in which any field contains the regular expression <b>%0</b>")
-                : Localization.lang("This search contains entries in which any field contains the term <b>%0</b>");
-        List<Text> textList = TooltipTextUtil.formatToTexts(temp, new TooltipTextUtil.TextReplacement("<b>%0</b>", firstWord, TooltipTextUtil.TextType.BOLD));
+        String temp = searchFlags.contains(
+                SearchRules.SearchFlags.REGULAR_EXPRESSION
+            )
+            ? Localization.lang(
+                "This search contains entries in which any field contains the regular expression <b>%0</b>"
+            )
+            : Localization.lang(
+                "This search contains entries in which any field contains the term <b>%0</b>"
+            );
+        List<Text> textList = TooltipTextUtil.formatToTexts(
+            temp,
+            new TooltipTextUtil.TextReplacement(
+                "<b>%0</b>",
+                firstWord,
+                TooltipTextUtil.TextType.BOLD
+            )
+        );
 
         if (words.size() > 1) {
             List<String> unprocessedWords = words.subList(1, words.size());
             for (String word : unprocessedWords) {
-                textList.add(TooltipTextUtil.createText(String.format(" %s ", Localization.lang("and")), TooltipTextUtil.TextType.NORMAL));
-                textList.add(TooltipTextUtil.createText(word, TooltipTextUtil.TextType.BOLD));
+                textList.add(
+                    TooltipTextUtil.createText(
+                        String.format(" %s ", Localization.lang("and")),
+                        TooltipTextUtil.TextType.NORMAL
+                    )
+                );
+                textList.add(
+                    TooltipTextUtil.createText(
+                        word,
+                        TooltipTextUtil.TextType.BOLD
+                    )
+                );
             }
         }
 
@@ -49,9 +74,15 @@ public TextFlow getDescription() {
 
     private Text getCaseSensitiveDescription() {
         if (searchFlags.contains(SearchRules.SearchFlags.CASE_SENSITIVE)) {
-            return TooltipTextUtil.createText(String.format(" (%s). ", Localization.lang("case sensitive")), TooltipTextUtil.TextType.NORMAL);
+            return TooltipTextUtil.createText(
+                String.format(" (%s). ", Localization.lang("case sensitive")),
+                TooltipTextUtil.TextType.NORMAL
+            );
         } else {
-            return TooltipTextUtil.createText(String.format(" (%s). ", Localization.lang("case insensitive")), TooltipTextUtil.TextType.NORMAL);
+            return TooltipTextUtil.createText(
+                String.format(" (%s). ", Localization.lang("case insensitive")),
+                TooltipTextUtil.TextType.NORMAL
+            );
         }
     }
 }
diff --git a/src/main/java/org/jabref/gui/search/rules/describer/GrammarBasedSearchRuleDescriber.java b/src/main/java/org/jabref/gui/search/rules/describer/GrammarBasedSearchRuleDescriber.java
index 9ca6bea4e94..f7eedec2c86 100644
--- a/src/main/java/org/jabref/gui/search/rules/describer/GrammarBasedSearchRuleDescriber.java
+++ b/src/main/java/org/jabref/gui/search/rules/describer/GrammarBasedSearchRuleDescriber.java
@@ -6,10 +6,9 @@
 import java.util.Objects;
 import java.util.Optional;
 import java.util.regex.Pattern;
-
 import javafx.scene.text.Text;
 import javafx.scene.text.TextFlow;
-
+import org.antlr.v4.runtime.tree.ParseTree;
 import org.jabref.gui.util.TooltipTextUtil;
 import org.jabref.logic.l10n.Localization;
 import org.jabref.model.search.rules.GrammarBasedSearchRule;
@@ -19,14 +18,15 @@
 import org.jabref.search.SearchBaseVisitor;
 import org.jabref.search.SearchParser;
 
-import org.antlr.v4.runtime.tree.ParseTree;
-
 public class GrammarBasedSearchRuleDescriber implements SearchDescriber {
 
     private final EnumSet<SearchFlags> searchFlags;
     private final ParseTree parseTree;
 
-    public GrammarBasedSearchRuleDescriber(EnumSet<SearchFlags> searchFlags, ParseTree parseTree) {
+    public GrammarBasedSearchRuleDescriber(
+        EnumSet<SearchFlags> searchFlags,
+        ParseTree parseTree
+    ) {
         this.searchFlags = searchFlags;
         this.parseTree = Objects.requireNonNull(parseTree);
     }
@@ -34,19 +34,49 @@ public GrammarBasedSearchRuleDescriber(EnumSet<SearchFlags> searchFlags, ParseTr
     @Override
     public TextFlow getDescription() {
         TextFlow textFlow = new TextFlow();
-        DescriptionSearchBaseVisitor descriptionSearchBaseVisitor = new DescriptionSearchBaseVisitor();
+        DescriptionSearchBaseVisitor descriptionSearchBaseVisitor =
+            new DescriptionSearchBaseVisitor();
 
         // describe advanced search expression
-        textFlow.getChildren().add(TooltipTextUtil.createText(String.format("%s ", Localization.lang("This search contains entries in which")), TooltipTextUtil.TextType.NORMAL));
-        textFlow.getChildren().addAll(descriptionSearchBaseVisitor.visit(parseTree));
-        textFlow.getChildren().add(TooltipTextUtil.createText(". ", TooltipTextUtil.TextType.NORMAL));
-        textFlow.getChildren().add(TooltipTextUtil.createText(searchFlags.contains(SearchRules.SearchFlags.CASE_SENSITIVE) ? Localization
-                .lang("The search is case-sensitive.") :
-                Localization.lang("The search is case-insensitive."), TooltipTextUtil.TextType.NORMAL));
+        textFlow
+            .getChildren()
+            .add(
+                TooltipTextUtil.createText(
+                    String.format(
+                        "%s ",
+                        Localization.lang(
+                            "This search contains entries in which"
+                        )
+                    ),
+                    TooltipTextUtil.TextType.NORMAL
+                )
+            );
+        textFlow
+            .getChildren()
+            .addAll(descriptionSearchBaseVisitor.visit(parseTree));
+        textFlow
+            .getChildren()
+            .add(
+                TooltipTextUtil.createText(
+                    ". ",
+                    TooltipTextUtil.TextType.NORMAL
+                )
+            );
+        textFlow
+            .getChildren()
+            .add(
+                TooltipTextUtil.createText(
+                    searchFlags.contains(SearchRules.SearchFlags.CASE_SENSITIVE)
+                        ? Localization.lang("The search is case-sensitive.")
+                        : Localization.lang("The search is case-insensitive."),
+                    TooltipTextUtil.TextType.NORMAL
+                )
+            );
         return textFlow;
     }
 
-    private class DescriptionSearchBaseVisitor extends SearchBaseVisitor<List<Text>> {
+    private class DescriptionSearchBaseVisitor
+        extends SearchBaseVisitor<List<Text>> {
 
         @Override
         public List<Text> visitStart(SearchParser.StartContext context) {
@@ -54,74 +84,176 @@ public List<Text> visitStart(SearchParser.StartContext context) {
         }
 
         @Override
-        public List<Text> visitUnaryExpression(SearchParser.UnaryExpressionContext context) {
+        public List<Text> visitUnaryExpression(
+            SearchParser.UnaryExpressionContext context
+        ) {
             List<Text> textList = visit(context.expression());
-            textList.add(0, TooltipTextUtil.createText(Localization.lang("not").concat(" "), TooltipTextUtil.TextType.NORMAL));
+            textList.add(
+                0,
+                TooltipTextUtil.createText(
+                    Localization.lang("not").concat(" "),
+                    TooltipTextUtil.TextType.NORMAL
+                )
+            );
             return textList;
         }
 
         @Override
-        public List<Text> visitParenExpression(SearchParser.ParenExpressionContext context) {
+        public List<Text> visitParenExpression(
+            SearchParser.ParenExpressionContext context
+        ) {
             ArrayList<Text> textList = new ArrayList<>();
-            textList.add(TooltipTextUtil.createText(String.format("%s", context.expression()), TooltipTextUtil.TextType.NORMAL));
+            textList.add(
+                TooltipTextUtil.createText(
+                    String.format("%s", context.expression()),
+                    TooltipTextUtil.TextType.NORMAL
+                )
+            );
             return textList;
         }
 
         @Override
-        public List<Text> visitBinaryExpression(SearchParser.BinaryExpressionContext context) {
+        public List<Text> visitBinaryExpression(
+            SearchParser.BinaryExpressionContext context
+        ) {
             List<Text> textList = visit(context.left);
             if ("AND".equalsIgnoreCase(context.operator.getText())) {
-                textList.add(TooltipTextUtil.createText(String.format(" %s ", Localization.lang("and")), TooltipTextUtil.TextType.NORMAL));
+                textList.add(
+                    TooltipTextUtil.createText(
+                        String.format(" %s ", Localization.lang("and")),
+                        TooltipTextUtil.TextType.NORMAL
+                    )
+                );
             } else {
-                textList.add(TooltipTextUtil.createText(String.format(" %s ", Localization.lang("or")), TooltipTextUtil.TextType.NORMAL));
+                textList.add(
+                    TooltipTextUtil.createText(
+                        String.format(" %s ", Localization.lang("or")),
+                        TooltipTextUtil.TextType.NORMAL
+                    )
+                );
             }
             textList.addAll(visit(context.right));
             return textList;
         }
 
         @Override
-        public List<Text> visitComparison(SearchParser.ComparisonContext context) {
+        public List<Text> visitComparison(
+            SearchParser.ComparisonContext context
+        ) {
             final List<Text> textList = new ArrayList<>();
-            final Optional<SearchParser.NameContext> fieldDescriptor = Optional.ofNullable(context.left);
-            final String value = StringUtil.unquote(context.right.getText(), '"');
+            final Optional<SearchParser.NameContext> fieldDescriptor =
+                Optional.ofNullable(context.left);
+            final String value = StringUtil.unquote(
+                context.right.getText(),
+                '"'
+            );
             if (!fieldDescriptor.isPresent()) {
-                TextFlow description = new ContainsAndRegexBasedSearchRuleDescriber(searchFlags, value).getDescription();
-                description.getChildren().forEach(it -> textList.add((Text) it));
+                TextFlow description =
+                    new ContainsAndRegexBasedSearchRuleDescriber(
+                        searchFlags,
+                        value
+                    )
+                        .getDescription();
+                description
+                    .getChildren()
+                    .forEach(it -> textList.add((Text) it));
                 return textList;
             }
 
-            final String field = StringUtil.unquote(fieldDescriptor.get().getText(), '"');
-            final GrammarBasedSearchRule.ComparisonOperator operator = GrammarBasedSearchRule.ComparisonOperator.build(context.operator.getText());
+            final String field = StringUtil.unquote(
+                fieldDescriptor.get().getText(),
+                '"'
+            );
+            final GrammarBasedSearchRule.ComparisonOperator operator =
+                GrammarBasedSearchRule.ComparisonOperator.build(
+                    context.operator.getText()
+                );
 
             final boolean regExpFieldSpec = !Pattern.matches("\\w+", field);
-            String temp = regExpFieldSpec ? Localization.lang(
-                    "any field that matches the regular expression <b>%0</b>") : Localization.lang("the field <b>%0</b>");
+            String temp = regExpFieldSpec
+                ? Localization.lang(
+                    "any field that matches the regular expression <b>%0</b>"
+                )
+                : Localization.lang("the field <b>%0</b>");
 
-            if (operator == GrammarBasedSearchRule.ComparisonOperator.CONTAINS) {
-                if (searchFlags.contains(SearchRules.SearchFlags.REGULAR_EXPRESSION)) {
-                    temp = Localization.lang("%0 contains the regular expression <b>%1</b>", temp);
+            if (
+                operator == GrammarBasedSearchRule.ComparisonOperator.CONTAINS
+            ) {
+                if (
+                    searchFlags.contains(
+                        SearchRules.SearchFlags.REGULAR_EXPRESSION
+                    )
+                ) {
+                    temp =
+                        Localization.lang(
+                            "%0 contains the regular expression <b>%1</b>",
+                            temp
+                        );
                 } else {
-                    temp = Localization.lang("%0 contains the term <b>%1</b>", temp);
+                    temp =
+                        Localization.lang(
+                            "%0 contains the term <b>%1</b>",
+                            temp
+                        );
                 }
-            } else if (operator == GrammarBasedSearchRule.ComparisonOperator.EXACT) {
-                if (searchFlags.contains(SearchRules.SearchFlags.REGULAR_EXPRESSION)) {
-                    temp = Localization.lang("%0 matches the regular expression <b>%1</b>", temp);
+            } else if (
+                operator == GrammarBasedSearchRule.ComparisonOperator.EXACT
+            ) {
+                if (
+                    searchFlags.contains(
+                        SearchRules.SearchFlags.REGULAR_EXPRESSION
+                    )
+                ) {
+                    temp =
+                        Localization.lang(
+                            "%0 matches the regular expression <b>%1</b>",
+                            temp
+                        );
                 } else {
-                    temp = Localization.lang("%0 matches the term <b>%1</b>", temp);
+                    temp =
+                        Localization.lang(
+                            "%0 matches the term <b>%1</b>",
+                            temp
+                        );
                 }
-            } else if (operator == GrammarBasedSearchRule.ComparisonOperator.DOES_NOT_CONTAIN) {
-                if (searchFlags.contains(SearchRules.SearchFlags.REGULAR_EXPRESSION)) {
-                    temp = Localization.lang("%0 doesn't contain the regular expression <b>%1</b>", temp);
+            } else if (
+                operator ==
+                GrammarBasedSearchRule.ComparisonOperator.DOES_NOT_CONTAIN
+            ) {
+                if (
+                    searchFlags.contains(
+                        SearchRules.SearchFlags.REGULAR_EXPRESSION
+                    )
+                ) {
+                    temp =
+                        Localization.lang(
+                            "%0 doesn't contain the regular expression <b>%1</b>",
+                            temp
+                        );
                 } else {
-                    temp = Localization.lang("%0 doesn't contain the term <b>%1</b>", temp);
+                    temp =
+                        Localization.lang(
+                            "%0 doesn't contain the term <b>%1</b>",
+                            temp
+                        );
                 }
             } else {
                 throw new IllegalStateException("CANNOT HAPPEN!");
             }
 
-            List<Text> formattedTexts = TooltipTextUtil.formatToTexts(temp,
-                    new TooltipTextUtil.TextReplacement("<b>%0</b>", field, TooltipTextUtil.TextType.BOLD),
-                    new TooltipTextUtil.TextReplacement("<b>%1</b>", value, TooltipTextUtil.TextType.BOLD));
+            List<Text> formattedTexts = TooltipTextUtil.formatToTexts(
+                temp,
+                new TooltipTextUtil.TextReplacement(
+                    "<b>%0</b>",
+                    field,
+                    TooltipTextUtil.TextType.BOLD
+                ),
+                new TooltipTextUtil.TextReplacement(
+                    "<b>%1</b>",
+                    value,
+                    TooltipTextUtil.TextType.BOLD
+                )
+            );
             textList.addAll(formattedTexts);
             return textList;
         }
diff --git a/src/main/java/org/jabref/gui/search/rules/describer/SearchDescriber.java b/src/main/java/org/jabref/gui/search/rules/describer/SearchDescriber.java
index d3a18ecfd60..67fd63c785c 100644
--- a/src/main/java/org/jabref/gui/search/rules/describer/SearchDescriber.java
+++ b/src/main/java/org/jabref/gui/search/rules/describer/SearchDescriber.java
@@ -4,6 +4,5 @@
 
 @FunctionalInterface
 public interface SearchDescriber {
-
     TextFlow getDescription();
 }
diff --git a/src/main/java/org/jabref/gui/search/rules/describer/SearchDescribers.java b/src/main/java/org/jabref/gui/search/rules/describer/SearchDescribers.java
index de696f03632..c509786f4f5 100644
--- a/src/main/java/org/jabref/gui/search/rules/describer/SearchDescribers.java
+++ b/src/main/java/org/jabref/gui/search/rules/describer/SearchDescribers.java
@@ -7,8 +7,7 @@
 
 public class SearchDescribers {
 
-    private SearchDescribers() {
-    }
+    private SearchDescribers() {}
 
     /**
      * Get the search describer for a given search query.
@@ -16,15 +15,40 @@ private SearchDescribers() {
      * @param searchQuery the search query
      * @return the search describer to turn the search into something human understandable
      */
-    public static SearchDescriber getSearchDescriberFor(SearchQuery searchQuery) {
-        if (searchQuery.getRule() instanceof GrammarBasedSearchRule grammarBasedSearchRule) {
-            return new GrammarBasedSearchRuleDescriber(grammarBasedSearchRule.getSearchFlags(), grammarBasedSearchRule.getTree());
-        } else if (searchQuery.getRule() instanceof ContainsBasedSearchRule containBasedSearchRule) {
-            return new ContainsAndRegexBasedSearchRuleDescriber(containBasedSearchRule.getSearchFlags(), searchQuery.getQuery());
-        } else if (searchQuery.getRule() instanceof RegexBasedSearchRule regexBasedSearchRule) {
-            return new ContainsAndRegexBasedSearchRuleDescriber(regexBasedSearchRule.getSearchFlags(), searchQuery.getQuery());
+    public static SearchDescriber getSearchDescriberFor(
+        SearchQuery searchQuery
+    ) {
+        if (
+            searchQuery.getRule() instanceof
+            GrammarBasedSearchRule grammarBasedSearchRule
+        ) {
+            return new GrammarBasedSearchRuleDescriber(
+                grammarBasedSearchRule.getSearchFlags(),
+                grammarBasedSearchRule.getTree()
+            );
+        } else if (
+            searchQuery.getRule() instanceof
+            ContainsBasedSearchRule containBasedSearchRule
+        ) {
+            return new ContainsAndRegexBasedSearchRuleDescriber(
+                containBasedSearchRule.getSearchFlags(),
+                searchQuery.getQuery()
+            );
+        } else if (
+            searchQuery.getRule() instanceof
+            RegexBasedSearchRule regexBasedSearchRule
+        ) {
+            return new ContainsAndRegexBasedSearchRuleDescriber(
+                regexBasedSearchRule.getSearchFlags(),
+                searchQuery.getQuery()
+            );
         } else {
-            throw new IllegalStateException("Cannot find a describer for searchRule " + searchQuery.getRule() + " and query " + searchQuery.getQuery());
+            throw new IllegalStateException(
+                "Cannot find a describer for searchRule " +
+                searchQuery.getRule() +
+                " and query " +
+                searchQuery.getQuery()
+            );
         }
     }
 }
diff --git a/src/main/java/org/jabref/gui/shared/ConnectToSharedDatabaseCommand.java b/src/main/java/org/jabref/gui/shared/ConnectToSharedDatabaseCommand.java
index 9a79e714a65..28b90236808 100644
--- a/src/main/java/org/jabref/gui/shared/ConnectToSharedDatabaseCommand.java
+++ b/src/main/java/org/jabref/gui/shared/ConnectToSharedDatabaseCommand.java
@@ -1,11 +1,10 @@
 package org.jabref.gui.shared;
 
+import com.airhacks.afterburner.injection.Injector;
 import org.jabref.gui.DialogService;
 import org.jabref.gui.JabRefFrame;
 import org.jabref.gui.actions.SimpleCommand;
 
-import com.airhacks.afterburner.injection.Injector;
-
 /**
  * Opens a shared database.
  */
@@ -19,7 +18,11 @@ public ConnectToSharedDatabaseCommand(JabRefFrame jabRefFrame) {
 
     @Override
     public void execute() {
-        DialogService dialogService = Injector.instantiateModelOrService(DialogService.class);
-        dialogService.showCustomDialogAndWait(new SharedDatabaseLoginDialogView(jabRefFrame));
+        DialogService dialogService = Injector.instantiateModelOrService(
+            DialogService.class
+        );
+        dialogService.showCustomDialogAndWait(
+            new SharedDatabaseLoginDialogView(jabRefFrame)
+        );
     }
 }
diff --git a/src/main/java/org/jabref/gui/shared/PullChangesFromSharedAction.java b/src/main/java/org/jabref/gui/shared/PullChangesFromSharedAction.java
index d19090cf367..849f6f43ee6 100644
--- a/src/main/java/org/jabref/gui/shared/PullChangesFromSharedAction.java
+++ b/src/main/java/org/jabref/gui/shared/PullChangesFromSharedAction.java
@@ -12,13 +12,20 @@ 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 a3307e7dad4..cf8e15be38a 100644
--- a/src/main/java/org/jabref/gui/shared/SharedDatabaseLoginDialogView.java
+++ b/src/main/java/org/jabref/gui/shared/SharedDatabaseLoginDialogView.java
@@ -1,7 +1,9 @@
 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;
 import javafx.fxml.FXML;
@@ -11,7 +13,7 @@
 import javafx.scene.control.ComboBox;
 import javafx.scene.control.PasswordField;
 import javafx.scene.control.TextField;
-
+import javax.swing.undo.UndoManager;
 import org.jabref.gui.DialogService;
 import org.jabref.gui.JabRefFrame;
 import org.jabref.gui.StateManager;
@@ -25,36 +27,76 @@
 import org.jabref.model.util.FileUpdateMonitor;
 import org.jabref.preferences.PreferencesService;
 
-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 SharedDatabaseLoginDialogView extends BaseDialog<Void> {
-    @FXML private ComboBox<DBMSType> databaseType;
-    @FXML private TextField host;
-    @FXML private TextField database;
-    @FXML private TextField port;
-    @FXML private TextField user;
-    @FXML private PasswordField password;
-    @FXML private CheckBox rememberPassword;
-    @FXML private TextField folder;
-    @FXML private Button browseButton;
-    @FXML private CheckBox autosave;
-    @FXML private ButtonType connectButton;
-    @FXML private CheckBox useSSL;
-    @FXML private TextField fileKeystore;
-    @FXML private PasswordField passwordKeystore;
-    @FXML private Button browseKeystore;
-    @FXML private TextField serverTimezone;
-
-    @Inject private DialogService dialogService;
-    @Inject private PreferencesService preferencesService;
-    @Inject private StateManager stateManager;
-    @Inject private BibEntryTypesManager entryTypesManager;
-    @Inject private FileUpdateMonitor fileUpdateMonitor;
-    @Inject private UndoManager undoManager;
-    @Inject private TaskExecutor taskExecutor;
+
+    @FXML
+    private ComboBox<DBMSType> databaseType;
+
+    @FXML
+    private TextField host;
+
+    @FXML
+    private TextField database;
+
+    @FXML
+    private TextField port;
+
+    @FXML
+    private TextField user;
+
+    @FXML
+    private PasswordField password;
+
+    @FXML
+    private CheckBox rememberPassword;
+
+    @FXML
+    private TextField folder;
+
+    @FXML
+    private Button browseButton;
+
+    @FXML
+    private CheckBox autosave;
+
+    @FXML
+    private ButtonType connectButton;
+
+    @FXML
+    private CheckBox useSSL;
+
+    @FXML
+    private TextField fileKeystore;
+
+    @FXML
+    private PasswordField passwordKeystore;
+
+    @FXML
+    private Button browseKeystore;
+
+    @FXML
+    private TextField serverTimezone;
+
+    @Inject
+    private DialogService dialogService;
+
+    @Inject
+    private PreferencesService preferencesService;
+
+    @Inject
+    private StateManager stateManager;
+
+    @Inject
+    private BibEntryTypesManager entryTypesManager;
+
+    @Inject
+    private FileUpdateMonitor fileUpdateMonitor;
+
+    @Inject
+    private UndoManager undoManager;
+
+    @Inject
+    private TaskExecutor taskExecutor;
 
     private final JabRefFrame frame;
     private SharedDatabaseLoginDialogViewModel viewModel;
@@ -64,15 +106,30 @@ public SharedDatabaseLoginDialogView(JabRefFrame frame) {
         this.frame = frame;
         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);
+        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
+            .disableProperty()
+            .bind(viewModel.formValidation().validProperty().not());
+        btnConnect
+            .textProperty()
+            .bind(
+                EasyBind.map(
+                    viewModel.loadingProperty(),
+                    loading ->
+                        loading
+                            ? Localization.lang("Connecting...")
+                            : Localization.lang("Connect")
+                )
+            );
     }
 
     @FXML
@@ -88,7 +145,8 @@ private void openDatabase() {
     private void initialize() {
         visualizer.setDecoration(new IconValidationDecorator());
 
-        viewModel = new SharedDatabaseLoginDialogViewModel(
+        viewModel =
+            new SharedDatabaseLoginDialogViewModel(
                 frame,
                 dialogService,
                 preferencesService,
@@ -96,7 +154,8 @@ private void initialize() {
                 entryTypesManager,
                 fileUpdateMonitor,
                 undoManager,
-                taskExecutor);
+                taskExecutor
+            );
         databaseType.getItems().addAll(DBMSType.values());
         databaseType.getSelectionModel().select(0);
 
@@ -105,35 +164,79 @@ private void initialize() {
         user.textProperty().bindBidirectional(viewModel.userProperty());
         password.textProperty().bindBidirectional(viewModel.passwordProperty());
         port.textProperty().bindBidirectional(viewModel.portProperty());
-        serverTimezone.textProperty().bindBidirectional(viewModel.serverTimezoneProperty());
-        databaseType.valueProperty().bindBidirectional(viewModel.selectedDbmstypeProperty());
+        serverTimezone
+            .textProperty()
+            .bindBidirectional(viewModel.serverTimezoneProperty());
+        databaseType
+            .valueProperty()
+            .bindBidirectional(viewModel.selectedDbmstypeProperty());
 
         folder.textProperty().bindBidirectional(viewModel.folderProperty());
         browseButton.disableProperty().bind(viewModel.autosaveProperty().not());
         folder.disableProperty().bind(viewModel.autosaveProperty().not());
-        autosave.selectedProperty().bindBidirectional(viewModel.autosaveProperty());
+        autosave
+            .selectedProperty()
+            .bindBidirectional(viewModel.autosaveProperty());
 
         useSSL.selectedProperty().bindBidirectional(viewModel.useSSLProperty());
 
-        fileKeystore.textProperty().bindBidirectional(viewModel.keyStoreProperty());
+        fileKeystore
+            .textProperty()
+            .bindBidirectional(viewModel.keyStoreProperty());
 
         browseKeystore.disableProperty().bind(viewModel.useSSLProperty().not());
-        passwordKeystore.disableProperty().bind(viewModel.useSSLProperty().not());
-        passwordKeystore.textProperty().bindBidirectional(viewModel.keyStorePasswordProperty());
-        rememberPassword.selectedProperty().bindBidirectional(viewModel.rememberPasswordProperty());
+        passwordKeystore
+            .disableProperty()
+            .bind(viewModel.useSSLProperty().not());
+        passwordKeystore
+            .textProperty()
+            .bindBidirectional(viewModel.keyStorePasswordProperty());
+        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));
+            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
+                    )
+            );
         });
     }
 
diff --git a/src/main/java/org/jabref/gui/shared/SharedDatabaseLoginDialogViewModel.java b/src/main/java/org/jabref/gui/shared/SharedDatabaseLoginDialogViewModel.java
index 0e13f6bd2a4..8ea753c9f6f 100644
--- a/src/main/java/org/jabref/gui/shared/SharedDatabaseLoginDialogViewModel.java
+++ b/src/main/java/org/jabref/gui/shared/SharedDatabaseLoginDialogViewModel.java
@@ -1,5 +1,11 @@
 package org.jabref.gui.shared;
 
+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 java.io.UnsupportedEncodingException;
 import java.nio.file.Files;
 import java.nio.file.Path;
@@ -8,9 +14,6 @@
 import java.util.List;
 import java.util.Optional;
 import java.util.function.Predicate;
-
-import javax.swing.undo.UndoManager;
-
 import javafx.beans.property.BooleanProperty;
 import javafx.beans.property.ObjectProperty;
 import javafx.beans.property.SimpleBooleanProperty;
@@ -20,7 +23,7 @@
 import javafx.scene.control.Alert.AlertType;
 import javafx.scene.control.ButtonBar.ButtonData;
 import javafx.scene.control.ButtonType;
-
+import javax.swing.undo.UndoManager;
 import org.jabref.gui.AbstractViewModel;
 import org.jabref.gui.DialogService;
 import org.jabref.gui.Globals;
@@ -47,21 +50,17 @@
 import org.jabref.model.entry.BibEntryTypesManager;
 import org.jabref.model.util.FileUpdateMonitor;
 import org.jabref.preferences.PreferencesService;
-
-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;
 
 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("");
@@ -70,17 +69,20 @@ public class SharedDatabaseLoginDialogViewModel extends AbstractViewModel {
     private final StringProperty password = new SimpleStringProperty("");
     private final StringProperty folder = new SimpleStringProperty("");
     private final BooleanProperty autosave = new SimpleBooleanProperty();
-    private final BooleanProperty rememberPassword = new SimpleBooleanProperty();
+    private final BooleanProperty rememberPassword =
+        new SimpleBooleanProperty();
     private final BooleanProperty loading = new SimpleBooleanProperty();
     private final StringProperty keystore = new SimpleStringProperty("");
     private final BooleanProperty useSSL = new SimpleBooleanProperty();
-    private final StringProperty keyStorePasswordProperty = new SimpleStringProperty("");
+    private final StringProperty keyStorePasswordProperty =
+        new SimpleStringProperty("");
     private final StringProperty serverTimezone = new SimpleStringProperty("");
 
     private final JabRefFrame frame;
     private final DialogService dialogService;
     private final PreferencesService preferencesService;
-    private final SharedDatabasePreferences sharedDatabasePreferences = new SharedDatabasePreferences();
+    private final SharedDatabasePreferences sharedDatabasePreferences =
+        new SharedDatabasePreferences();
     private final StateManager stateManager;
     private final BibEntryTypesManager entryTypesManager;
     private final FileUpdateMonitor fileUpdateMonitor;
@@ -95,14 +97,16 @@ public class SharedDatabaseLoginDialogViewModel extends AbstractViewModel {
     private final Validator keystoreValidator;
     private final CompositeValidator formValidator;
 
-    public SharedDatabaseLoginDialogViewModel(JabRefFrame frame,
-                                              DialogService dialogService,
-                                              PreferencesService preferencesService,
-                                              StateManager stateManager,
-                                              BibEntryTypesManager entryTypesManager,
-                                              FileUpdateMonitor fileUpdateMonitor,
-                                              UndoManager undoManager,
-                                              TaskExecutor taskExecutor) {
+    public SharedDatabaseLoginDialogViewModel(
+        JabRefFrame frame,
+        DialogService dialogService,
+        PreferencesService preferencesService,
+        StateManager stateManager,
+        BibEntryTypesManager entryTypesManager,
+        FileUpdateMonitor fileUpdateMonitor,
+        UndoManager undoManager,
+        TaskExecutor taskExecutor
+    ) {
         this.frame = frame;
         this.dialogService = dialogService;
         this.preferencesService = preferencesService;
@@ -112,27 +116,92 @@ public SharedDatabaseLoginDialogViewModel(JabRefFrame frame,
         this.undoManager = undoManager;
         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> 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);
+        formValidator.addValidators(
+            databaseValidator,
+            hostValidator,
+            portValidator,
+            userValidator
+        );
 
         applyPreferences();
     }
 
     public boolean openDatabase() {
-        DBMSConnectionProperties connectionProperties = new DBMSConnectionPropertiesBuilder()
+        DBMSConnectionProperties connectionProperties =
+            new DBMSConnectionPropertiesBuilder()
                 .setType(selectedDBMSType.getValue())
                 .setHost(host.getValue())
                 .setPort(Integer.parseInt(port.getValue()))
@@ -152,25 +221,42 @@ public boolean openDatabase() {
 
     private void setupKeyStore() {
         System.setProperty("javax.net.ssl.trustStore", keystore.getValue());
-        System.setProperty("javax.net.ssl.trustStorePassword", keyStorePasswordProperty.getValue());
+        System.setProperty(
+            "javax.net.ssl.trustStorePassword",
+            keyStorePasswordProperty.getValue()
+        );
         System.setProperty("javax.net.debug", "ssl");
     }
 
-    private boolean openSharedDatabase(DBMSConnectionProperties connectionProperties) {
+    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;
         }
 
         if (autosave.get()) {
             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()),
+            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"));
+                        Localization.lang("Cancel")
+                    );
                 if (!overwriteFilePressed) {
                     return true;
                 }
@@ -181,49 +267,86 @@ private boolean openSharedDatabase(DBMSConnectionProperties connectionProperties
 
         try {
             SharedDatabaseUIManager manager = new SharedDatabaseUIManager(
-                    frame,
-                    dialogService,
-                    preferencesService,
-                    stateManager,
-                    entryTypesManager,
-                    fileUpdateMonitor,
-                    undoManager,
-                    taskExecutor);
-            LibraryTab libraryTab = manager.openNewSharedDatabaseTab(connectionProperties);
+                frame,
+                dialogService,
+                preferencesService,
+                stateManager,
+                entryTypesManager,
+                fileUpdateMonitor,
+                undoManager,
+                taskExecutor
+            );
+            LibraryTab libraryTab = manager.openNewSharedDatabaseTab(
+                connectionProperties
+            );
             setPreferences();
 
             if (!folder.getValue().isEmpty() && autosave.get()) {
                 try {
-                    new SaveDatabaseAction(libraryTab, dialogService, preferencesService, Globals.entryTypesManager).saveAs(Path.of(folder.getValue()));
+                    new SaveDatabaseAction(
+                        libraryTab,
+                        dialogService,
+                        preferencesService,
+                        Globals.entryTypesManager
+                    )
+                        .saveAs(Path.of(folder.getValue()));
                 } catch (Throwable e) {
                     LOGGER.error("Error while saving the database", e);
                 }
             }
 
             return true;
-        } catch (SQLException | InvalidDBMSConnectionPropertiesException exception) {
-            dialogService.showErrorDialogAndWait(Localization.lang("Connection error"), exception);
+        } catch (
+            SQLException | InvalidDBMSConnectionPropertiesException exception
+        ) {
+            dialogService.showErrorDialogAndWait(
+                Localization.lang("Connection error"),
+                exception
+            );
         } catch (DatabaseNotSupportedException exception) {
             ButtonType openHelp = new ButtonType("Open Help", ButtonData.OTHER);
 
-            Optional<ButtonType> result = dialogService.showCustomButtonDialogAndWait(AlertType.INFORMATION,
+            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, preferencesService.getFilePreferences()).execute());
-            result.filter(btn -> btn.equals(ButtonType.OK)).ifPresent(btn -> openSharedDatabase(connectionProperties));
+                    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,
+                        preferencesService.getFilePreferences()
+                    )
+                        .execute()
+                );
+            result
+                .filter(btn -> btn.equals(ButtonType.OK))
+                .ifPresent(btn -> openSharedDatabase(connectionProperties));
         }
         loading.set(false);
         return false;
     }
 
     private void setPreferences() {
-        sharedDatabasePreferences.setType(selectedDBMSType.getValue().toString());
+        sharedDatabasePreferences.setType(
+            selectedDBMSType.getValue().toString()
+        );
         sharedDatabasePreferences.setHost(host.getValue());
         sharedDatabasePreferences.setPort(port.getValue());
         sharedDatabasePreferences.setName(database.getValue());
@@ -234,9 +357,16 @@ private void setPreferences() {
 
         if (rememberPassword.get()) {
             try {
-                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);
+                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
@@ -252,19 +382,31 @@ private void setPreferences() {
      * Fetches possibly saved data and configures the control elements respectively.
      */
     private void applyPreferences() {
-        Optional<String> sharedDatabaseType = sharedDatabasePreferences.getType();
-        Optional<String> sharedDatabaseHost = sharedDatabasePreferences.getHost();
-        Optional<String> sharedDatabasePort = sharedDatabasePreferences.getPort();
-        Optional<String> sharedDatabaseName = sharedDatabasePreferences.getName();
-        Optional<String> sharedDatabaseUser = sharedDatabasePreferences.getUser();
-        Optional<String> sharedDatabasePassword = sharedDatabasePreferences.getPassword();
-        boolean sharedDatabaseRememberPassword = sharedDatabasePreferences.getRememberPassword();
-        Optional<String> sharedDatabaseFolder = sharedDatabasePreferences.getFolder();
-        boolean sharedDatabaseAutosave = sharedDatabasePreferences.getAutosave();
-        Optional<String> sharedDatabaseKeystoreFile = sharedDatabasePreferences.getKeyStoreFile();
+        Optional<String> sharedDatabaseType =
+            sharedDatabasePreferences.getType();
+        Optional<String> sharedDatabaseHost =
+            sharedDatabasePreferences.getHost();
+        Optional<String> sharedDatabasePort =
+            sharedDatabasePreferences.getPort();
+        Optional<String> sharedDatabaseName =
+            sharedDatabasePreferences.getName();
+        Optional<String> sharedDatabaseUser =
+            sharedDatabasePreferences.getUser();
+        Optional<String> sharedDatabasePassword =
+            sharedDatabasePreferences.getPassword();
+        boolean sharedDatabaseRememberPassword =
+            sharedDatabasePreferences.getRememberPassword();
+        Optional<String> sharedDatabaseFolder =
+            sharedDatabasePreferences.getFolder();
+        boolean sharedDatabaseAutosave =
+            sharedDatabasePreferences.getAutosave();
+        Optional<String> sharedDatabaseKeystoreFile =
+            sharedDatabasePreferences.getKeyStoreFile();
 
         if (sharedDatabaseType.isPresent()) {
-            Optional<DBMSType> dbmsType = DBMSType.fromString(sharedDatabaseType.get());
+            Optional<DBMSType> dbmsType = DBMSType.fromString(
+                sharedDatabaseType.get()
+            );
             dbmsType.ifPresent(selectedDBMSType::set);
         }
 
@@ -275,11 +417,24 @@ private void applyPreferences() {
         sharedDatabaseKeystoreFile.ifPresent(keystore::set);
         useSSL.setValue(sharedDatabasePreferences.isUseSSL());
 
-        if (sharedDatabasePassword.isPresent() && sharedDatabaseUser.isPresent()) {
+        if (
+            sharedDatabasePassword.isPresent() && sharedDatabaseUser.isPresent()
+        ) {
             try {
-                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);
+                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
+                );
             }
         }
 
@@ -289,34 +444,56 @@ private void applyPreferences() {
         autosave.set(sharedDatabaseAutosave);
     }
 
-    private boolean isSharedDatabaseAlreadyPresent(DBMSConnectionProperties connectionProperties) {
+    private boolean isSharedDatabaseAlreadyPresent(
+        DBMSConnectionProperties connectionProperties
+    ) {
         List<LibraryTab> libraryTabs = frame.getLibraryTabs();
-        return libraryTabs.parallelStream().anyMatch(panel -> {
-            BibDatabaseContext context = panel.getBibDatabaseContext();
-
-            return (context.getLocation() == DatabaseLocation.SHARED) &&
-                    connectionProperties.equals(context.getDBMSSynchronizer().getConnectionProperties());
-        });
+        return libraryTabs
+            .parallelStream()
+            .anyMatch(panel -> {
+                BibDatabaseContext context = panel.getBibDatabaseContext();
+
+                return (
+                    (context.getLocation() == DatabaseLocation.SHARED) &&
+                    connectionProperties.equals(
+                        context.getDBMSSynchronizer().getConnectionProperties()
+                    )
+                );
+            });
     }
 
     public void showSaveDbToFileDialog() {
-        FileDialogConfiguration fileDialogConfiguration = new FileDialogConfiguration.Builder()
+        FileDialogConfiguration fileDialogConfiguration =
+            new FileDialogConfiguration.Builder()
                 .addExtensionFilter(StandardFileType.BIBTEX_DB)
                 .withDefaultExtension(StandardFileType.BIBTEX_DB)
-                .withInitialDirectory(preferencesService.getFilePreferences().getWorkingDirectory())
+                .withInitialDirectory(
+                    preferencesService
+                        .getFilePreferences()
+                        .getWorkingDirectory()
+                )
                 .build();
-        Optional<Path> exportPath = dialogService.showFileSaveDialog(fileDialogConfiguration);
+        Optional<Path> exportPath = dialogService.showFileSaveDialog(
+            fileDialogConfiguration
+        );
         exportPath.ifPresent(path -> folder.setValue(path.toString()));
     }
 
     public void showOpenKeystoreFileDialog() {
-        FileDialogConfiguration fileDialogConfiguration = new FileDialogConfiguration.Builder()
+        FileDialogConfiguration fileDialogConfiguration =
+            new FileDialogConfiguration.Builder()
                 .addExtensionFilter(FileFilterConverter.ANY_FILE)
                 .addExtensionFilter(StandardFileType.JAVA_KEYSTORE)
                 .withDefaultExtension(StandardFileType.JAVA_KEYSTORE)
-                .withInitialDirectory(preferencesService.getFilePreferences().getWorkingDirectory())
+                .withInitialDirectory(
+                    preferencesService
+                        .getFilePreferences()
+                        .getWorkingDirectory()
+                )
                 .build();
-        Optional<Path> keystorePath = dialogService.showFileOpenDialog(fileDialogConfiguration);
+        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 44d92e9c216..fac4bd13dde 100644
--- a/src/main/java/org/jabref/gui/shared/SharedDatabaseUIManager.java
+++ b/src/main/java/org/jabref/gui/shared/SharedDatabaseUIManager.java
@@ -1,16 +1,14 @@
 package org.jabref.gui.shared;
 
+import com.google.common.eventbus.Subscribe;
 import java.sql.SQLException;
 import java.util.Objects;
 import java.util.Optional;
-
-import javax.swing.undo.UndoManager;
-
 import javafx.scene.control.Alert.AlertType;
 import javafx.scene.control.ButtonBar;
 import javafx.scene.control.ButtonBar.ButtonData;
 import javafx.scene.control.ButtonType;
-
+import javax.swing.undo.UndoManager;
 import org.jabref.gui.DialogService;
 import org.jabref.gui.JabRefFrame;
 import org.jabref.gui.LibraryTab;
@@ -40,8 +38,6 @@
 import org.jabref.model.util.FileUpdateMonitor;
 import org.jabref.preferences.PreferencesService;
 
-import com.google.common.eventbus.Subscribe;
-
 public class SharedDatabaseUIManager {
 
     private final JabRefFrame frame;
@@ -54,14 +50,16 @@ public class SharedDatabaseUIManager {
     private final UndoManager undoManager;
     private final TaskExecutor taskExecutor;
 
-    public SharedDatabaseUIManager(JabRefFrame frame,
-                                   DialogService dialogService,
-                                   PreferencesService preferencesService,
-                                   StateManager stateManager,
-                                   BibEntryTypesManager entryTypesManager,
-                                   FileUpdateMonitor fileUpdateMonitor,
-                                   UndoManager undoManager,
-                                   TaskExecutor taskExecutor) {
+    public SharedDatabaseUIManager(
+        JabRefFrame frame,
+        DialogService dialogService,
+        PreferencesService preferencesService,
+        StateManager stateManager,
+        BibEntryTypesManager entryTypesManager,
+        FileUpdateMonitor fileUpdateMonitor,
+        UndoManager undoManager,
+        TaskExecutor taskExecutor
+    ) {
         this.frame = frame;
         this.dialogService = dialogService;
         this.preferencesService = preferencesService;
@@ -74,24 +72,44 @@ public SharedDatabaseUIManager(JabRefFrame frame,
 
     @Subscribe
     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,
+        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."),
+                Localization.lang(
+                    "The connection to the server has been terminated."
+                ),
                 reconnect,
                 workOffline,
-                closeLibrary);
+                closeLibrary
+            );
 
         if (answer.isPresent()) {
             if (answer.get().equals(reconnect)) {
                 frame.closeCurrentTab();
-                dialogService.showCustomDialogAndWait(new SharedDatabaseLoginDialogView(frame));
+                dialogService.showCustomDialogAndWait(
+                    new SharedDatabaseLoginDialogView(frame)
+                );
             } else if (answer.get().equals(workOffline)) {
-                connectionLostEvent.getBibDatabaseContext().convertToLocalDatabase();
-                frame.getLibraryTabs().forEach(tab -> tab.updateTabTitle(tab.isModified()));
+                connectionLostEvent
+                    .getBibDatabaseContext()
+                    .convertToLocalDatabase();
+                frame
+                    .getLibraryTabs()
+                    .forEach(tab -> tab.updateTabTitle(tab.isModified()));
                 dialogService.notify(Localization.lang("Working offline."));
             }
         } else {
@@ -106,25 +124,73 @@ 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, preferencesService);
+            MergeEntriesDialog dialog = new MergeEntriesDialog(
+                localBibEntry,
+                sharedBibEntry,
+                preferencesService
+            );
             dialog.setTitle(Localization.lang("Update refused"));
-            Optional<BibEntry> mergedEntry = dialogService.showCustomDialogAndWait(dialog).map(EntriesMergeResult::mergedEntry);
+            Optional<BibEntry> mergedEntry = dialogService
+                .showCustomDialogAndWait(dialog)
+                .map(EntriesMergeResult::mergedEntry);
 
             mergedEntry.ifPresent(mergedBibEntry -> {
-                mergedBibEntry.getSharedBibEntryData().setSharedID(sharedBibEntry.getSharedBibEntryData().getSharedID());
-                mergedBibEntry.getSharedBibEntryData().setVersion(sharedBibEntry.getSharedBibEntryData().getVersion());
+                mergedBibEntry
+                    .getSharedBibEntryData()
+                    .setSharedID(
+                        sharedBibEntry.getSharedBibEntryData().getSharedID()
+                    );
+                mergedBibEntry
+                    .getSharedBibEntryData()
+                    .setVersion(
+                        sharedBibEntry.getSharedBibEntryData().getVersion()
+                    );
 
                 dbmsSynchronizer.synchronizeSharedEntry(mergedBibEntry);
                 dbmsSynchronizer.synchronizeLocalDatabase();
@@ -137,13 +203,29 @@ public void listen(SharedEntriesNotPresentEvent event) {
         LibraryTab libraryTab = frame.getCurrentLibraryTab();
         EntryEditor entryEditor = libraryTab.getEntryEditor();
 
-        libraryTab.getUndoManager().addEdit(new UndoableRemoveEntries(libraryTab.getDatabase(), event.getBibEntries()));
-
-        if (Objects.nonNull(entryEditor) && (event.getBibEntries().contains(entryEditor.getEntry()))) {
-            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."));
+        libraryTab
+            .getUndoManager()
+            .addEdit(
+                new UndoableRemoveEntries(
+                    libraryTab.getDatabase(),
+                    event.getBibEntries()
+                )
+            );
+
+        if (
+            Objects.nonNull(entryEditor) &&
+            (event.getBibEntries().contains(entryEditor.getEntry()))
+        ) {
+            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."
+                )
+            );
             libraryTab.closeBottomPane();
         }
     }
@@ -154,66 +236,101 @@ public void listen(SharedEntriesNotPresentEvent event) {
      * @param dbmsConnectionProperties Connection data
      * @return BasePanel which also used by {@link SaveDatabaseAction}
      */
-    public LibraryTab openNewSharedDatabaseTab(DBMSConnectionProperties dbmsConnectionProperties)
-            throws SQLException, DatabaseNotSupportedException, InvalidDBMSConnectionPropertiesException {
-
+    public LibraryTab openNewSharedDatabaseTab(
+        DBMSConnectionProperties dbmsConnectionProperties
+    )
+        throws SQLException, DatabaseNotSupportedException, InvalidDBMSConnectionPropertiesException {
         BibDatabaseContext bibDatabaseContext = new BibDatabaseContext();
-        bibDatabaseContext.setMode(preferencesService.getLibraryPreferences().getDefaultBibDatabaseMode());
+        bibDatabaseContext.setMode(
+            preferencesService
+                .getLibraryPreferences()
+                .getDefaultBibDatabaseMode()
+        );
         DBMSSynchronizer synchronizer = new DBMSSynchronizer(
-                bibDatabaseContext,
-                preferencesService.getBibEntryPreferences().getKeywordSeparator(),
-                preferencesService.getCitationKeyPatternPreferences().getKeyPattern(),
-                fileUpdateMonitor);
+            bibDatabaseContext,
+            preferencesService.getBibEntryPreferences().getKeywordSeparator(),
+            preferencesService
+                .getCitationKeyPatternPreferences()
+                .getKeyPattern(),
+            fileUpdateMonitor
+        );
         bibDatabaseContext.convertToSharedDatabase(synchronizer);
 
         dbmsSynchronizer = bibDatabaseContext.getDBMSSynchronizer();
-        dbmsSynchronizer.openSharedDatabase(new DBMSConnection(dbmsConnectionProperties));
+        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()
+            )
+        );
 
         LibraryTab libraryTab = LibraryTab.createLibraryTab(
-                bibDatabaseContext,
-                frame,
-                dialogService,
-                preferencesService,
-                stateManager,
-                fileUpdateMonitor,
-                entryTypesManager,
-                undoManager,
-                taskExecutor);
+            bibDatabaseContext,
+            frame,
+            dialogService,
+            preferencesService,
+            stateManager,
+            fileUpdateMonitor,
+            entryTypesManager,
+            undoManager,
+            taskExecutor
+        );
         frame.addTab(libraryTab, true);
         return libraryTab;
     }
 
     public void openSharedDatabaseFromParserResult(ParserResult parserResult)
-            throws SQLException, DatabaseNotSupportedException, InvalidDBMSConnectionPropertiesException,
-            NotASharedDatabaseException {
-
-        Optional<String> sharedDatabaseIDOptional = parserResult.getDatabase().getSharedDatabaseID();
+        throws SQLException, DatabaseNotSupportedException, InvalidDBMSConnectionPropertiesException, NotASharedDatabaseException {
+        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 = new BibDatabaseContext();
-        bibDatabaseContext.setMode(preferencesService.getLibraryPreferences().getDefaultBibDatabaseMode());
+        bibDatabaseContext.setMode(
+            preferencesService
+                .getLibraryPreferences()
+                .getDefaultBibDatabaseMode()
+        );
         DBMSSynchronizer synchronizer = new DBMSSynchronizer(
-                bibDatabaseContext,
-                preferencesService.getBibEntryPreferences().getKeywordSeparator(),
-                preferencesService.getCitationKeyPatternPreferences().getKeyPattern(),
-                fileUpdateMonitor);
+            bibDatabaseContext,
+            preferencesService.getBibEntryPreferences().getKeywordSeparator(),
+            preferencesService
+                .getCitationKeyPatternPreferences()
+                .getKeyPattern(),
+            fileUpdateMonitor
+        );
         bibDatabaseContext.convertToSharedDatabase(synchronizer);
 
         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.openSharedDatabase(
+            new DBMSConnection(dbmsConnectionProperties)
+        );
         dbmsSynchronizer.registerListener(this);
         parserResult.setDatabaseContext(bibDatabaseContext);
-        dialogService.notify(Localization.lang("Connection to %0 server established.", dbmsConnectionProperties.getType().toString()));
+        dialogService.notify(
+            Localization.lang(
+                "Connection to %0 server established.",
+                dbmsConnectionProperties.getType().toString()
+            )
+        );
     }
 }
diff --git a/src/main/java/org/jabref/gui/sidepane/GroupsSidePaneComponent.java b/src/main/java/org/jabref/gui/sidepane/GroupsSidePaneComponent.java
index 1ead8207f46..8447f60d077 100644
--- a/src/main/java/org/jabref/gui/sidepane/GroupsSidePaneComponent.java
+++ b/src/main/java/org/jabref/gui/sidepane/GroupsSidePaneComponent.java
@@ -1,7 +1,7 @@
 package org.jabref.gui.sidepane;
 
+import com.tobiasdiez.easybind.EasyBind;
 import javafx.scene.control.Button;
-
 import org.jabref.gui.DialogService;
 import org.jabref.gui.actions.SimpleCommand;
 import org.jabref.gui.groups.GroupModeViewModel;
@@ -10,34 +10,51 @@
 import org.jabref.gui.icon.IconTheme;
 import org.jabref.logic.l10n.Localization;
 
-import com.tobiasdiez.easybind.EasyBind;
-
 public class GroupsSidePaneComponent extends SidePaneComponent {
+
     private final GroupsPreferences groupsPreferences;
     private final DialogService dialogService;
-    private final Button intersectionUnionToggle = IconTheme.JabRefIcons.GROUP_INTERSECTION.asButton();
-
-    public GroupsSidePaneComponent(SimpleCommand closeCommand,
-                                   SimpleCommand moveUpCommand,
-                                   SimpleCommand moveDownCommand,
-                                   SidePaneContentFactory contentFactory,
-                                   GroupsPreferences groupsPreferences,
-                                   DialogService dialogService) {
-        super(SidePaneType.GROUPS, closeCommand, moveUpCommand, moveDownCommand, contentFactory);
+    private final Button intersectionUnionToggle =
+        IconTheme.JabRefIcons.GROUP_INTERSECTION.asButton();
+
+    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;
         setupIntersectionUnionToggle();
 
-        EasyBind.subscribe(groupsPreferences.groupViewModeProperty(), mode -> {
-            GroupModeViewModel modeViewModel = new GroupModeViewModel(mode);
-            intersectionUnionToggle.setGraphic(modeViewModel.getUnionIntersectionGraphic());
-            intersectionUnionToggle.setTooltip(modeViewModel.getUnionIntersectionTooltip());
-        });
+        EasyBind.subscribe(
+            groupsPreferences.groupViewModeProperty(),
+            mode -> {
+                GroupModeViewModel modeViewModel = new GroupModeViewModel(mode);
+                intersectionUnionToggle.setGraphic(
+                    modeViewModel.getUnionIntersectionGraphic()
+                );
+                intersectionUnionToggle.setTooltip(
+                    modeViewModel.getUnionIntersectionTooltip()
+                );
+            }
+        );
     }
 
     private void setupIntersectionUnionToggle() {
         addExtraButtonToHeader(intersectionUnionToggle, 0);
-        intersectionUnionToggle.setOnAction(event -> new ToggleUnionIntersectionAction().execute());
+        intersectionUnionToggle.setOnAction(event ->
+            new ToggleUnionIntersectionAction().execute()
+        );
     }
 
     private class ToggleUnionIntersectionAction extends SimpleCommand {
@@ -48,10 +65,14 @@ public void execute() {
 
             if (mode == GroupViewMode.UNION) {
                 groupsPreferences.setGroupViewMode(GroupViewMode.INTERSECTION);
-                dialogService.notify(Localization.lang("Group view mode set to intersection"));
+                dialogService.notify(
+                    Localization.lang("Group view mode set to intersection")
+                );
             } else if (mode == GroupViewMode.INTERSECTION) {
                 groupsPreferences.setGroupViewMode(GroupViewMode.UNION);
-                dialogService.notify(Localization.lang("Group view mode set to union"));
+                dialogService.notify(
+                    Localization.lang("Group view mode set to union")
+                );
             }
         }
     }
diff --git a/src/main/java/org/jabref/gui/sidepane/SidePane.java b/src/main/java/org/jabref/gui/sidepane/SidePane.java
index fa8b74e170a..2ea44ba7785 100644
--- a/src/main/java/org/jabref/gui/sidepane/SidePane.java
+++ b/src/main/java/org/jabref/gui/sidepane/SidePane.java
@@ -2,14 +2,11 @@
 
 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;
 import javafx.scene.layout.VBox;
-
+import javax.swing.undo.UndoManager;
 import org.jabref.gui.DialogService;
 import org.jabref.gui.LibraryTabContainer;
 import org.jabref.gui.StateManager;
@@ -21,26 +18,31 @@
 import org.jabref.preferences.PreferencesService;
 
 public class SidePane extends VBox {
+
     private final SidePaneViewModel viewModel;
     private final PreferencesService preferencesService;
     private final StateManager stateManager;
 
     // These bindings need to be stored, otherwise they are garbage collected
     @SuppressWarnings("MismatchedQueryAndUpdateOfCollection")
-    private final Map<SidePaneType, BooleanBinding> visibleBindings = new HashMap<>();
+    private final Map<SidePaneType, BooleanBinding> visibleBindings =
+        new HashMap<>();
 
-    public SidePane(LibraryTabContainer tabContainer,
-                    PreferencesService preferencesService,
-                    JournalAbbreviationRepository abbreviationRepository,
-                    TaskExecutor taskExecutor,
-                    DialogService dialogService,
-                    StateManager stateManager,
-                    FileUpdateMonitor fileUpdateMonitor,
-                    BibEntryTypesManager entryTypesManager,
-                    UndoManager undoManager) {
+    public SidePane(
+        LibraryTabContainer tabContainer,
+        PreferencesService preferencesService,
+        JournalAbbreviationRepository abbreviationRepository,
+        TaskExecutor taskExecutor,
+        DialogService dialogService,
+        StateManager stateManager,
+        FileUpdateMonitor fileUpdateMonitor,
+        BibEntryTypesManager entryTypesManager,
+        UndoManager undoManager
+    ) {
         this.stateManager = stateManager;
         this.preferencesService = preferencesService;
-        this.viewModel = new SidePaneViewModel(
+        this.viewModel =
+            new SidePaneViewModel(
                 tabContainer,
                 preferencesService,
                 abbreviationRepository,
@@ -49,30 +51,38 @@ public SidePane(LibraryTabContainer tabContainer,
                 dialogService,
                 fileUpdateMonitor,
                 entryTypesManager,
-                undoManager);
+                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());
+            () -> stateManager.getVisibleSidePaneComponents().contains(pane),
+            stateManager.getVisibleSidePaneComponents()
+        );
         visibleBindings.put(pane, visibility);
         return visibility;
     }
 
     public SimpleCommand getToggleCommandFor(SidePaneType sidePane) {
-        return new TogglePaneAction(stateManager, sidePane, preferencesService.getSidePanePreferences());
+        return new TogglePaneAction(
+            stateManager,
+            sidePane,
+            preferencesService.getSidePanePreferences()
+        );
     }
 
     public SidePaneComponent getSidePaneComponent(SidePaneType type) {
diff --git a/src/main/java/org/jabref/gui/sidepane/SidePaneComponent.java b/src/main/java/org/jabref/gui/sidepane/SidePaneComponent.java
index 8abb96582dc..c4aa87f6c51 100644
--- a/src/main/java/org/jabref/gui/sidepane/SidePaneComponent.java
+++ b/src/main/java/org/jabref/gui/sidepane/SidePaneComponent.java
@@ -8,13 +8,13 @@
 import javafx.scene.layout.HBox;
 import javafx.scene.layout.Priority;
 import javafx.scene.layout.VBox;
-
 import org.jabref.gui.actions.SimpleCommand;
 import org.jabref.gui.groups.GroupTreeView;
 import org.jabref.gui.icon.IconTheme;
 import org.jabref.logic.l10n.Localization;
 
 public class SidePaneComponent extends BorderPane {
+
     private final SidePaneType sidePaneType;
     private final SimpleCommand closeCommand;
     private final SimpleCommand moveUpCommand;
@@ -23,11 +23,13 @@ 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;
@@ -40,7 +42,12 @@ private void initialize() {
         getStyleClass().add("sidePaneComponent");
         setTop(createHeaderView());
         setCenter(contentFactory.create(sidePaneType));
-        VBox.setVgrow(this, sidePaneType == SidePaneType.GROUPS ? Priority.ALWAYS : Priority.NEVER);
+        VBox.setVgrow(
+            this,
+            sidePaneType == SidePaneType.GROUPS
+                ? Priority.ALWAYS
+                : Priority.NEVER
+        );
     }
 
     private Node createHeaderView() {
@@ -53,7 +60,9 @@ private Node createHeaderView() {
         upButton.setOnAction(e -> moveUpCommand.execute());
 
         Button downButton = IconTheme.JabRefIcons.DOWN.asButton();
-        downButton.setTooltip(new Tooltip(Localization.lang("Move panel down")));
+        downButton.setTooltip(
+            new Tooltip(Localization.lang("Move panel down"))
+        );
         downButton.setOnAction(e -> moveDownCommand.execute());
 
         this.buttonContainer = new HBox();
diff --git a/src/main/java/org/jabref/gui/sidepane/SidePaneContentFactory.java b/src/main/java/org/jabref/gui/sidepane/SidePaneContentFactory.java
index 8a8c5a03af4..f11a28f26c0 100644
--- a/src/main/java/org/jabref/gui/sidepane/SidePaneContentFactory.java
+++ b/src/main/java/org/jabref/gui/sidepane/SidePaneContentFactory.java
@@ -1,9 +1,7 @@
 package org.jabref.gui.sidepane;
 
-import javax.swing.undo.UndoManager;
-
 import javafx.scene.Node;
-
+import javax.swing.undo.UndoManager;
 import org.jabref.gui.DialogService;
 import org.jabref.gui.LibraryTabContainer;
 import org.jabref.gui.StateManager;
@@ -17,6 +15,7 @@
 import org.jabref.preferences.PreferencesService;
 
 public class SidePaneContentFactory {
+
     private final LibraryTabContainer tabContainer;
     private final PreferencesService preferences;
     private final JournalAbbreviationRepository abbreviationRepository;
@@ -27,15 +26,17 @@ public class SidePaneContentFactory {
     private final BibEntryTypesManager entryTypesManager;
     private final UndoManager undoManager;
 
-    public SidePaneContentFactory(LibraryTabContainer tabContainer,
-                                  PreferencesService preferences,
-                                  JournalAbbreviationRepository abbreviationRepository,
-                                  TaskExecutor taskExecutor,
-                                  DialogService dialogService,
-                                  StateManager stateManager,
-                                  FileUpdateMonitor fileUpdateMonitor,
-                                  BibEntryTypesManager entryTypesManager,
-                                  UndoManager undoManager) {
+    public SidePaneContentFactory(
+        LibraryTabContainer tabContainer,
+        PreferencesService preferences,
+        JournalAbbreviationRepository abbreviationRepository,
+        TaskExecutor taskExecutor,
+        DialogService dialogService,
+        StateManager stateManager,
+        FileUpdateMonitor fileUpdateMonitor,
+        BibEntryTypesManager entryTypesManager,
+        UndoManager undoManager
+    ) {
         this.tabContainer = tabContainer;
         this.preferences = preferences;
         this.abbreviationRepository = abbreviationRepository;
@@ -50,25 +51,29 @@ public SidePaneContentFactory(LibraryTabContainer tabContainer,
     public Node create(SidePaneType sidePaneType) {
         return switch (sidePaneType) {
             case GROUPS -> new GroupTreeView(
-                    taskExecutor,
-                    stateManager,
-                    preferences,
-                    dialogService);
+                taskExecutor,
+                stateManager,
+                preferences,
+                dialogService
+            );
             case OPEN_OFFICE -> new OpenOfficePanel(
-                    tabContainer,
-                    preferences,
-                    preferences.getKeyBindingRepository(),
-                    abbreviationRepository,
-                    taskExecutor,
-                    dialogService,
-                    stateManager,
-                    fileUpdateMonitor,
-                    entryTypesManager,
-                    undoManager).getContent();
+                tabContainer,
+                preferences,
+                preferences.getKeyBindingRepository(),
+                abbreviationRepository,
+                taskExecutor,
+                dialogService,
+                stateManager,
+                fileUpdateMonitor,
+                entryTypesManager,
+                undoManager
+            )
+                .getContent();
             case WEB_SEARCH -> new WebSearchPaneView(
-                    preferences,
-                    dialogService,
-                    stateManager);
+                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 494f936bbe9..aef2ab2decb 100644
--- a/src/main/java/org/jabref/gui/sidepane/SidePaneType.java
+++ b/src/main/java/org/jabref/gui/sidepane/SidePaneType.java
@@ -10,9 +10,21 @@
  * Definition of all possible components in the side pane.
  */
 public enum SidePaneType {
-    OPEN_OFFICE("OpenOffice/LibreOffice", IconTheme.JabRefIcons.FILE_OPENOFFICE, StandardActions.TOOGLE_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.TOOGLE_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 16d500b57b1..42e546f5903 100644
--- a/src/main/java/org/jabref/gui/sidepane/SidePaneViewModel.java
+++ b/src/main/java/org/jabref/gui/sidepane/SidePaneViewModel.java
@@ -7,12 +7,9 @@
 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;
-
+import javax.swing.undo.UndoManager;
 import org.jabref.gui.AbstractViewModel;
 import org.jabref.gui.DialogService;
 import org.jabref.gui.LibraryTabContainer;
@@ -24,33 +21,39 @@
 import org.jabref.model.util.FileUpdateMonitor;
 import org.jabref.preferences.PreferencesService;
 import org.jabref.preferences.SidePanePreferences;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 public class SidePaneViewModel extends AbstractViewModel {
-    private static final Logger LOGGER = LoggerFactory.getLogger(SidePaneViewModel.class);
 
-    private final Map<SidePaneType, SidePaneComponent> sidePaneComponentLookup = new HashMap<>();
+    private static final Logger LOGGER = LoggerFactory.getLogger(
+        SidePaneViewModel.class
+    );
+
+    private final Map<SidePaneType, SidePaneComponent> sidePaneComponentLookup =
+        new HashMap<>();
 
     private final PreferencesService preferencesService;
     private final StateManager stateManager;
     private final SidePaneContentFactory sidePaneContentFactory;
     private final DialogService dialogService;
 
-    public SidePaneViewModel(LibraryTabContainer tabContainer,
-                             PreferencesService preferencesService,
-                             JournalAbbreviationRepository abbreviationRepository,
-                             StateManager stateManager,
-                             TaskExecutor taskExecutor,
-                             DialogService dialogService,
-                             FileUpdateMonitor fileUpdateMonitor,
-                             BibEntryTypesManager entryTypesManager,
-                             UndoManager undoManager) {
+    public SidePaneViewModel(
+        LibraryTabContainer tabContainer,
+        PreferencesService preferencesService,
+        JournalAbbreviationRepository abbreviationRepository,
+        StateManager stateManager,
+        TaskExecutor taskExecutor,
+        DialogService dialogService,
+        FileUpdateMonitor fileUpdateMonitor,
+        BibEntryTypesManager entryTypesManager,
+        UndoManager undoManager
+    ) {
         this.preferencesService = preferencesService;
         this.stateManager = stateManager;
         this.dialogService = dialogService;
-        this.sidePaneContentFactory = new SidePaneContentFactory(
+        this.sidePaneContentFactory =
+            new SidePaneContentFactory(
                 tabContainer,
                 preferencesService,
                 abbreviationRepository,
@@ -59,37 +62,54 @@ public SidePaneViewModel(LibraryTabContainer tabContainer,
                 stateManager,
                 fileUpdateMonitor,
                 entryTypesManager,
-                undoManager);
-
-        preferencesService.getSidePanePreferences().visiblePanes().forEach(this::show);
-        getPanes().addListener((ListChangeListener<? super SidePaneType>) change -> {
-            while (change.next()) {
-                if (change.wasAdded()) {
-                    preferencesService.getSidePanePreferences().visiblePanes().add(change.getAddedSubList().get(0));
-                } else if (change.wasRemoved()) {
-                    preferencesService.getSidePanePreferences().visiblePanes().remove(change.getRemoved().get(0));
+                undoManager
+            );
+
+        preferencesService
+            .getSidePanePreferences()
+            .visiblePanes()
+            .forEach(this::show);
+        getPanes()
+            .addListener(
+                (ListChangeListener<? super SidePaneType>) change -> {
+                    while (change.next()) {
+                        if (change.wasAdded()) {
+                            preferencesService
+                                .getSidePanePreferences()
+                                .visiblePanes()
+                                .add(change.getAddedSubList().get(0));
+                        } else if (change.wasRemoved()) {
+                            preferencesService
+                                .getSidePanePreferences()
+                                .visiblePanes()
+                                .remove(change.getRemoved().get(0));
+                        }
+                    }
                 }
-            }
-        });
+            );
     }
 
     protected SidePaneComponent getSidePaneComponent(SidePaneType pane) {
         SidePaneComponent sidePaneComponent = sidePaneComponentLookup.get(pane);
         if (sidePaneComponent == null) {
-            sidePaneComponent = switch (pane) {
-                case GROUPS -> new GroupsSidePaneComponent(
+            sidePaneComponent =
+                switch (pane) {
+                    case GROUPS -> new GroupsSidePaneComponent(
                         new ClosePaneAction(pane),
                         new MoveUpAction(pane),
                         new MoveDownAction(pane),
                         sidePaneContentFactory,
                         preferencesService.getGroupsPreferences(),
-                        dialogService);
-                case WEB_SEARCH, OPEN_OFFICE -> new SidePaneComponent(pane,
+                        dialogService
+                    );
+                    case WEB_SEARCH, OPEN_OFFICE -> new SidePaneComponent(
+                        pane,
                         new ClosePaneAction(pane),
                         new MoveUpAction(pane),
                         new MoveDownAction(pane),
-                        sidePaneContentFactory);
-            };
+                        sidePaneContentFactory
+                    );
+                };
             sidePaneComponentLookup.put(pane, sidePaneComponent);
         }
         return sidePaneComponent;
@@ -100,10 +120,15 @@ protected SidePaneComponent getSidePaneComponent(SidePaneType pane) {
      * position next time.
      */
     private void updatePreferredPositions() {
-        Map<SidePaneType, Integer> preferredPositions = new HashMap<>(preferencesService.getSidePanePreferences()
-                                                                                        .getPreferredPositions());
-        IntStream.range(0, getPanes().size()).forEach(i -> preferredPositions.put(getPanes().get(i), i));
-        preferencesService.getSidePanePreferences().setPreferredPositions(preferredPositions);
+        Map<SidePaneType, Integer> preferredPositions = new HashMap<>(
+            preferencesService.getSidePanePreferences().getPreferredPositions()
+        );
+        IntStream
+            .range(0, getPanes().size())
+            .forEach(i -> preferredPositions.put(getPanes().get(i), i));
+        preferencesService
+            .getSidePanePreferences()
+            .setPreferredPositions(preferredPositions);
     }
 
     public void moveUp(SidePaneType pane) {
@@ -129,7 +154,10 @@ public void moveDown(SidePaneType pane) {
                 swap(getPanes(), currentPosition, newPosition);
                 updatePreferredPositions();
             } else {
-                LOGGER.debug("SidePaneComponent {} is already at the top", pane.getTitle());
+                LOGGER.debug(
+                    "SidePaneComponent {} is already at the top",
+                    pane.getTitle()
+                );
             }
         } else {
             LOGGER.warn("SidePaneComponent {} not visible", pane.getTitle());
@@ -139,7 +167,12 @@ public void moveDown(SidePaneType pane) {
     private void show(SidePaneType pane) {
         if (!getPanes().contains(pane)) {
             getPanes().add(pane);
-            getPanes().sort(new PreferredIndexSort(preferencesService.getSidePanePreferences()));
+            getPanes()
+                .sort(
+                    new PreferredIndexSort(
+                        preferencesService.getSidePanePreferences()
+                    )
+                );
         } else {
             LOGGER.warn("SidePaneComponent {} not visible", pane.getTitle());
         }
@@ -158,12 +191,14 @@ private <T> void swap(ObservableList<T> observableList, int i, int j) {
     /**
      * Helper class for sorting visible side panes based on their preferred position.
      */
-    protected static class PreferredIndexSort implements Comparator<SidePaneType> {
+    protected static class PreferredIndexSort
+        implements Comparator<SidePaneType> {
 
         private final Map<SidePaneType, Integer> preferredPositions;
 
         public PreferredIndexSort(SidePanePreferences sidePanePreferences) {
-            this.preferredPositions = sidePanePreferences.getPreferredPositions();
+            this.preferredPositions =
+                sidePanePreferences.getPreferredPositions();
         }
 
         @Override
@@ -175,6 +210,7 @@ public int compare(SidePaneType type1, SidePaneType type2) {
     }
 
     private class MoveUpAction extends SimpleCommand {
+
         private final SidePaneType toMoveUpPane;
 
         public MoveUpAction(SidePaneType toMoveUpPane) {
@@ -188,6 +224,7 @@ public void execute() {
     }
 
     private class MoveDownAction extends SimpleCommand {
+
         private final SidePaneType toMoveDownPane;
 
         public MoveDownAction(SidePaneType toMoveDownPane) {
@@ -201,6 +238,7 @@ public void execute() {
     }
 
     public class ClosePaneAction extends SimpleCommand {
+
         private final SidePaneType toClosePane;
 
         public ClosePaneAction(SidePaneType toClosePane) {
diff --git a/src/main/java/org/jabref/gui/sidepane/TogglePaneAction.java b/src/main/java/org/jabref/gui/sidepane/TogglePaneAction.java
index 087a53db78f..399adf0c2c4 100644
--- a/src/main/java/org/jabref/gui/sidepane/TogglePaneAction.java
+++ b/src/main/java/org/jabref/gui/sidepane/TogglePaneAction.java
@@ -5,11 +5,16 @@
 import org.jabref.preferences.SidePanePreferences;
 
 public class TogglePaneAction extends SimpleCommand {
+
     private final StateManager stateManager;
     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 +24,13 @@ 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 f86eae44389..141530c272f 100644
--- a/src/main/java/org/jabref/gui/slr/EditExistingStudyAction.java
+++ b/src/main/java/org/jabref/gui/slr/EditExistingStudyAction.java
@@ -2,7 +2,6 @@
 
 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,17 +11,22 @@
 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;
 
 public class EditExistingStudyAction extends SimpleCommand {
-    private static final Logger LOGGER = LoggerFactory.getLogger(EditExistingStudyAction.class);
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(
+        EditExistingStudyAction.class
+    );
 
     private final DialogService dialogService;
     private final StateManager stateManager;
 
-    public EditExistingStudyAction(DialogService dialogService, StateManager stateManager) {
+    public EditExistingStudyAction(
+        DialogService dialogService,
+        StateManager stateManager
+    ) {
         this.dialogService = dialogService;
         this.stateManager = stateManager;
         this.executable.bind(ActionHelper.needsStudyDatabase(stateManager));
@@ -32,10 +36,15 @@ 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();
+        BibDatabaseContext bibDatabaseContext = stateManager
+            .getActiveDatabase()
+            .get();
 
         // The action can only be called on an existing AND saved study library
         // The saving is ensured at creation of a study library
@@ -51,13 +60,24 @@ 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);
+            dialogService.showErrorDialogAndWait(
+                Localization.lang("Error opening file"),
+                e
+            );
             return;
         }
 
         // When the dialog returns, the study.yml file is updated (or kept unmodified at Cancel)
-        dialogService.showCustomDialogAndWait(new ManageStudyDefinitionView(study, studyDirectory));
+        dialogService.showCustomDialogAndWait(
+            new ManageStudyDefinitionView(study, studyDirectory)
+        );
     }
 }
diff --git a/src/main/java/org/jabref/gui/slr/ExistingStudySearchAction.java b/src/main/java/org/jabref/gui/slr/ExistingStudySearchAction.java
index 827a25edc25..a08f1ae300a 100644
--- a/src/main/java/org/jabref/gui/slr/ExistingStudySearchAction.java
+++ b/src/main/java/org/jabref/gui/slr/ExistingStudySearchAction.java
@@ -2,7 +2,7 @@
 
 import java.io.IOException;
 import java.nio.file.Path;
-
+import org.eclipse.jgit.api.errors.GitAPIException;
 import org.jabref.gui.DialogService;
 import org.jabref.gui.JabRefFrame;
 import org.jabref.gui.StateManager;
@@ -19,13 +19,14 @@
 import org.jabref.model.entry.BibEntryTypesManager;
 import org.jabref.model.util.FileUpdateMonitor;
 import org.jabref.preferences.PreferencesService;
-
-import org.eclipse.jgit.api.errors.GitAPIException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 public class ExistingStudySearchAction extends SimpleCommand {
-    private static final Logger LOGGER = LoggerFactory.getLogger(ExistingStudySearchAction.class);
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(
+        ExistingStudySearchAction.class
+    );
 
     protected final DialogService dialogService;
 
@@ -43,32 +44,36 @@ public class ExistingStudySearchAction extends SimpleCommand {
      * @param openDatabaseAction Required to open the tab after the study is exectued
      */
     public ExistingStudySearchAction(
-            JabRefFrame frame,
-            OpenDatabaseAction openDatabaseAction,
-            DialogService dialogService,
-            FileUpdateMonitor fileUpdateMonitor,
-            TaskExecutor taskExecutor,
-            PreferencesService preferencesService,
-            StateManager stateManager) {
-        this(frame,
-                openDatabaseAction,
-                dialogService,
-                fileUpdateMonitor,
-                taskExecutor,
-                preferencesService,
-                stateManager,
-                false);
+        JabRefFrame frame,
+        OpenDatabaseAction openDatabaseAction,
+        DialogService dialogService,
+        FileUpdateMonitor fileUpdateMonitor,
+        TaskExecutor taskExecutor,
+        PreferencesService preferencesService,
+        StateManager stateManager
+    ) {
+        this(
+            frame,
+            openDatabaseAction,
+            dialogService,
+            fileUpdateMonitor,
+            taskExecutor,
+            preferencesService,
+            stateManager,
+            false
+        );
     }
 
     protected ExistingStudySearchAction(
-            JabRefFrame frame,
-            OpenDatabaseAction openDatabaseAction,
-            DialogService dialogService,
-            FileUpdateMonitor fileUpdateMonitor,
-            TaskExecutor taskExecutor,
-            PreferencesService preferencesService,
-            StateManager stateManager,
-            boolean isNew) {
+        JabRefFrame frame,
+        OpenDatabaseAction openDatabaseAction,
+        DialogService dialogService,
+        FileUpdateMonitor fileUpdateMonitor,
+        TaskExecutor taskExecutor,
+        PreferencesService preferencesService,
+        StateManager stateManager,
+        boolean isNew
+    ) {
         this.frame = frame;
         this.openDatabaseAction = openDatabaseAction;
         this.dialogService = dialogService;
@@ -88,13 +93,16 @@ public void execute() {
             LOGGER.error("Database is not present, even if it should");
             return;
         }
-        BibDatabaseContext bibDatabaseContext = stateManager.getActiveDatabase().get();
+        BibDatabaseContext bibDatabaseContext = stateManager
+            .getActiveDatabase()
+            .get();
 
         if (bibDatabaseContext.getDatabasePath().isEmpty()) {
             LOGGER.error("Database path is not present, even if it should");
             return;
         }
-        this.studyDirectory = bibDatabaseContext.getDatabasePath().get().getParent();
+        this.studyDirectory =
+            bibDatabaseContext.getDatabasePath().get().getParent();
 
         crawl();
     }
@@ -103,44 +111,66 @@ 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(
+            crawler =
+                new Crawler(
                     this.studyDirectory,
                     new SlrGitHandler(this.studyDirectory),
                     preferencesService,
                     new BibEntryTypesManager(),
-                    fileUpdateMonitor);
+                    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"));
-                          openDatabaseAction.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"));
+                openDatabaseAction.openFile(
+                    Path.of(
+                        this.studyDirectory.toString(),
+                        Crawler.FILENAME_STUDY_RESULT_BIB
+                    )
+                );
+            })
+            .executeWith(taskExecutor);
     }
 
     /**
      * Hook for setting up the crawl phase (e.g., initialization the repository)
      */
-    protected void crawlPreparation(Path studyRepositoryRoot) throws IOException, GitAPIException {
+    protected void crawlPreparation(Path studyRepositoryRoot)
+        throws IOException, GitAPIException {
         // Do nothing with the repository as repository is already setup
 
         // The user focused an SLR
diff --git a/src/main/java/org/jabref/gui/slr/ManageStudyDefinitionView.java b/src/main/java/org/jabref/gui/slr/ManageStudyDefinitionView.java
index 912d42c6645..d4f9015ac4e 100644
--- a/src/main/java/org/jabref/gui/slr/ManageStudyDefinitionView.java
+++ b/src/main/java/org/jabref/gui/slr/ManageStudyDefinitionView.java
@@ -1,10 +1,11 @@
 package org.jabref.gui.slr;
 
+import com.airhacks.afterburner.views.ViewLoader;
+import jakarta.inject.Inject;
 import java.nio.file.Path;
 import java.util.Optional;
 import java.util.StringJoiner;
 import java.util.function.Consumer;
-
 import javafx.beans.binding.Bindings;
 import javafx.beans.property.SimpleStringProperty;
 import javafx.fxml.FXML;
@@ -20,7 +21,6 @@
 import javafx.scene.control.cell.TextFieldTableCell;
 import javafx.scene.input.KeyCode;
 import javafx.scene.input.MouseButton;
-
 import org.jabref.gui.DialogService;
 import org.jabref.gui.icon.IconTheme;
 import org.jabref.gui.theme.ThemeManager;
@@ -31,9 +31,6 @@
 import org.jabref.logic.l10n.Localization;
 import org.jabref.model.study.Study;
 import org.jabref.preferences.PreferencesService;
-
-import com.airhacks.afterburner.views.ViewLoader;
-import jakarta.inject.Inject;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -41,38 +38,81 @@
  * This class controls the user interface of the study definition management dialog. The UI elements and their layout
  * are defined in the FXML file.
  */
-public class ManageStudyDefinitionView extends BaseDialog<SlrStudyAndDirectory> {
-    private static final Logger LOGGER = LoggerFactory.getLogger(ManageStudyDefinitionView.class);
+public class ManageStudyDefinitionView
+    extends BaseDialog<SlrStudyAndDirectory> {
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(
+        ManageStudyDefinitionView.class
+    );
+
+    @FXML
+    private TextField studyTitle;
+
+    @FXML
+    private TextField addAuthor;
+
+    @FXML
+    private TextField addResearchQuestion;
+
+    @FXML
+    private TextField addQuery;
+
+    @FXML
+    private TextField studyDirectory;
+
+    @FXML
+    private Button selectStudyDirectory;
+
+    @FXML
+    private ButtonType saveSurveyButtonType;
 
-    @FXML private TextField studyTitle;
-    @FXML private TextField addAuthor;
-    @FXML private TextField addResearchQuestion;
-    @FXML private TextField addQuery;
-    @FXML private TextField studyDirectory;
-    @FXML private Button selectStudyDirectory;
+    @FXML
+    private Label helpIcon;
+
+    @FXML
+    private TableView<String> authorTableView;
+
+    @FXML
+    private TableColumn<String, String> authorsColumn;
+
+    @FXML
+    private TableColumn<String, String> authorsActionColumn;
+
+    @FXML
+    private TableView<String> questionTableView;
+
+    @FXML
+    private TableColumn<String, String> questionsColumn;
 
-    @FXML private ButtonType saveSurveyButtonType;
-    @FXML private Label helpIcon;
+    @FXML
+    private TableColumn<String, String> questionsActionColumn;
+
+    @FXML
+    private TableView<String> queryTableView;
 
-    @FXML private TableView<String> authorTableView;
-    @FXML private TableColumn<String, String> authorsColumn;
-    @FXML private TableColumn<String, String> authorsActionColumn;
+    @FXML
+    private TableColumn<String, String> queriesColumn;
+
+    @FXML
+    private TableColumn<String, String> queriesActionColumn;
 
-    @FXML private TableView<String> questionTableView;
-    @FXML private TableColumn<String, String> questionsColumn;
-    @FXML private TableColumn<String, String> questionsActionColumn;
+    @FXML
+    private TableView<StudyCatalogItem> catalogTable;
+
+    @FXML
+    private TableColumn<StudyCatalogItem, Boolean> catalogEnabledColumn;
+
+    @FXML
+    private TableColumn<StudyCatalogItem, String> catalogColumn;
 
-    @FXML private TableView<String> queryTableView;
-    @FXML private TableColumn<String, String> queriesColumn;
-    @FXML private TableColumn<String, String> queriesActionColumn;
+    @Inject
+    private DialogService dialogService;
 
-    @FXML private TableView<StudyCatalogItem> catalogTable;
-    @FXML private TableColumn<StudyCatalogItem, Boolean> catalogEnabledColumn;
-    @FXML private TableColumn<StudyCatalogItem, String> catalogColumn;
+    @Inject
+    private PreferencesService prefs;
 
-    @Inject private DialogService dialogService;
-    @Inject private PreferencesService prefs;
-    @Inject private ThemeManager themeManager;
+    @Inject
+    private ThemeManager themeManager;
 
     private ManageStudyDefinitionViewModel viewModel;
 
@@ -94,9 +134,7 @@ public ManageStudyDefinitionView(Path pathToStudyDataDirectory) {
         this.setTitle("Define study parameters");
         this.study = Optional.empty();
 
-        ViewLoader.view(this)
-                  .load()
-                  .setAsDialogPane(this);
+        ViewLoader.view(this).load().setAsDialogPane(this);
 
         setupSaveSurveyButton(false);
 
@@ -114,9 +152,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);
 
@@ -124,18 +160,30 @@ public ManageStudyDefinitionView(Study study, Path studyDirectory) {
     }
 
     private void setupSaveSurveyButton(boolean isEdit) {
-        Button saveSurveyButton = (Button) this.getDialogPane().lookupButton(saveSurveyButtonType);
+        Button saveSurveyButton = (Button) this.getDialogPane()
+            .lookupButton(saveSurveyButtonType);
 
         if (!isEdit) {
             saveSurveyButton.setText(Localization.lang("Start survey"));
         }
 
-        saveSurveyButton.disableProperty().bind(Bindings.or(Bindings.or(Bindings.or(Bindings.or(
+        saveSurveyButton
+            .disableProperty()
+            .bind(
+                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()));
+                                Bindings.isEmpty(viewModel.getCatalogs())
+                            ),
+                            Bindings.isEmpty(viewModel.getAuthors())
+                        ),
+                        viewModel.getTitle().isEmpty()
+                    ),
+                    viewModel.getDirectory().isEmpty()
+                )
+            );
 
         setResultConverter(button -> {
             if (button == saveSurveyButtonType) {
@@ -149,17 +197,21 @@ private void setupSaveSurveyButton(boolean isEdit) {
     @FXML
     private void initialize() {
         if (study.isEmpty()) {
-            viewModel = new ManageStudyDefinitionViewModel(
+            viewModel =
+                new ManageStudyDefinitionViewModel(
                     prefs.getImportFormatPreferences(),
                     prefs.getImporterPreferences(),
-                    dialogService);
+                    dialogService
+                );
         } else {
-            viewModel = new ManageStudyDefinitionViewModel(
+            viewModel =
+                new ManageStudyDefinitionViewModel(
                     study.get(),
                     pathToStudyDataDirectory,
                     prefs.getImportFormatPreferences(),
                     prefs.getImporterPreferences(),
-                    dialogService);
+                    dialogService
+                );
 
             // The directory of the study cannot be changed
             studyDirectory.setEditable(false);
@@ -168,7 +220,9 @@ private void initialize() {
 
         // Listen whether any catalogs are removed from selection -> Add back to the catalog selector
         studyTitle.textProperty().bindBidirectional(viewModel.titleProperty());
-        studyDirectory.textProperty().bindBidirectional(viewModel.getDirectory());
+        studyDirectory
+            .textProperty()
+            .bindBidirectional(viewModel.getDirectory());
 
         initAuthorTab();
         initQuestionsTab();
@@ -177,58 +231,114 @@ private void initialize() {
     }
 
     private void initAuthorTab() {
-        setupCommonPropertiesForTables(addAuthor, this::addAuthor, authorsColumn, authorsActionColumn);
-        setupCellFactories(authorsColumn, authorsActionColumn, viewModel::deleteAuthor);
+        setupCommonPropertiesForTables(
+            addAuthor,
+            this::addAuthor,
+            authorsColumn,
+            authorsActionColumn
+        );
+        setupCellFactories(
+            authorsColumn,
+            authorsActionColumn,
+            viewModel::deleteAuthor
+        );
         authorTableView.setItems(viewModel.getAuthors());
     }
 
     private void initQuestionsTab() {
-        setupCommonPropertiesForTables(addResearchQuestion, this::addResearchQuestion, questionsColumn, questionsActionColumn);
-        setupCellFactories(questionsColumn, questionsActionColumn, viewModel::deleteQuestion);
+        setupCommonPropertiesForTables(
+            addResearchQuestion,
+            this::addResearchQuestion,
+            questionsColumn,
+            questionsActionColumn
+        );
+        setupCellFactories(
+            questionsColumn,
+            questionsActionColumn,
+            viewModel::deleteQuestion
+        );
         questionTableView.setItems(viewModel.getResearchQuestions());
     }
 
     private void initQueriesTab() {
-        setupCommonPropertiesForTables(addQuery, this::addQuery, queriesColumn, queriesActionColumn);
-        setupCellFactories(queriesColumn, queriesActionColumn, viewModel::deleteQuery);
+        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());
-                    }
-                })
-                .install(catalogTable);
+            .withOnMouseClickedEvent((entry, event) -> {
+                if (event.getButton() == MouseButton.PRIMARY) {
+                    entry.setEnabled(!entry.isEnabled());
+                }
+            })
+            .install(catalogTable);
 
         catalogColumn.setReorderable(false);
         catalogColumn.setCellFactory(TextFieldTableCell.forTableColumn());
 
         catalogEnabledColumn.setResizable(false);
         catalogEnabledColumn.setReorderable(false);
-        catalogEnabledColumn.setCellFactory(CheckBoxTableCell.forTableColumn(catalogEnabledColumn));
-        catalogEnabledColumn.setCellValueFactory(param -> param.getValue().enabledProperty());
+        catalogEnabledColumn.setCellFactory(
+            CheckBoxTableCell.forTableColumn(catalogEnabledColumn)
+        );
+        catalogEnabledColumn.setCellValueFactory(param ->
+            param.getValue().enabledProperty()
+        );
 
         catalogColumn.setEditable(false);
-        catalogColumn.setCellValueFactory(param -> param.getValue().nameProperty());
+        catalogColumn.setCellValueFactory(param ->
+            param.getValue().nameProperty()
+        );
 
         catalogTable.setItems(viewModel.getCatalogs());
     }
 
-    private void setupCommonPropertiesForTables(Node addControl,
-                                                Runnable addAction,
-                                                TableColumn<?, String> contentColumn,
-                                                TableColumn<?, String> actionColumn) {
+    private void setupCommonPropertiesForTables(
+        Node addControl,
+        Runnable addAction,
+        TableColumn<?, String> contentColumn,
+        TableColumn<?, String> actionColumn
+    ) {
         addControl.setOnKeyPressed(event -> {
             if (event.getCode() == KeyCode.ENTER) {
                 addAction.run();
@@ -241,17 +351,24 @@ private void setupCommonPropertiesForTables(Node addControl,
         actionColumn.setResizable(false);
     }
 
-    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()));
+    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))
-                .install(actionColumn);
+            .withGraphic(item ->
+                IconTheme.JabRefIcons.DELETE_ENTRY.getGraphicNode()
+            )
+            .withTooltip(name -> Localization.lang("Remove"))
+            .withOnMouseClickedEvent(item -> evt -> removeAction.accept(item))
+            .install(actionColumn);
     }
 
     @FXML
@@ -274,10 +391,15 @@ private void addQuery() {
 
     @FXML
     public void selectStudyDirectory() {
-        DirectoryDialogConfiguration directoryDialogConfiguration = new DirectoryDialogConfiguration.Builder()
+        DirectoryDialogConfiguration directoryDialogConfiguration =
+            new DirectoryDialogConfiguration.Builder()
                 .withInitialDirectory(pathToStudyDataDirectory)
                 .build();
 
-        viewModel.setStudyDirectory(dialogService.showDirectorySelectionDialog(directoryDialogConfiguration));
+        viewModel.setStudyDirectory(
+            dialogService.showDirectorySelectionDialog(
+                directoryDialogConfiguration
+            )
+        );
     }
 }
diff --git a/src/main/java/org/jabref/gui/slr/ManageStudyDefinitionViewModel.java b/src/main/java/org/jabref/gui/slr/ManageStudyDefinitionViewModel.java
index 54267048793..f0213b13564 100644
--- a/src/main/java/org/jabref/gui/slr/ManageStudyDefinitionViewModel.java
+++ b/src/main/java/org/jabref/gui/slr/ManageStudyDefinitionViewModel.java
@@ -8,13 +8,11 @@
 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;
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableList;
-
 import org.jabref.gui.DialogService;
 import org.jabref.logic.crawler.StudyRepository;
 import org.jabref.logic.crawler.StudyYamlParser;
@@ -32,7 +30,6 @@
 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;
 
@@ -41,19 +38,27 @@
  * 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);
+        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();
-    private final ObservableList<String> researchQuestions = FXCollections.observableArrayList();
-    private final ObservableList<String> queries = FXCollections.observableArrayList();
-    private final ObservableList<StudyCatalogItem> databases = FXCollections.observableArrayList();
+    private final ObservableList<String> authors =
+        FXCollections.observableArrayList();
+    private final ObservableList<String> researchQuestions =
+        FXCollections.observableArrayList();
+    private final ObservableList<String> queries =
+        FXCollections.observableArrayList();
+    private final ObservableList<StudyCatalogItem> databases =
+        FXCollections.observableArrayList();
 
     // Hold the complement of databases for the selector
     private final SimpleStringProperty directory = new SimpleStringProperty();
@@ -63,20 +68,30 @@ public class ManageStudyDefinitionViewModel {
     /**
      * Constructor for a new study
      */
-    public ManageStudyDefinitionViewModel(ImportFormatPreferences importFormatPreferences,
-                                          ImporterPreferences importerPreferences,
-                                          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,
+        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);
     }
 
@@ -86,28 +101,42 @@ 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,
-                                          DialogService dialogService) {
+    public ManageStudyDefinitionViewModel(
+        Study study,
+        Path studyDirectory,
+        ImportFormatPreferences importFormatPreferences,
+        ImporterPreferences importerPreferences,
+        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());
+        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);
@@ -145,7 +174,10 @@ public void addAuthor(String author) {
     }
 
     public void addResearchQuestion(String researchQuestion) {
-        if (researchQuestion.isBlank() || researchQuestions.contains(researchQuestion)) {
+        if (
+            researchQuestion.isBlank() ||
+            researchQuestions.contains(researchQuestion)
+        ) {
             return;
         }
         researchQuestions.add(researchQuestion);
@@ -160,38 +192,74 @@ 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()));
+            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));
+            LOGGER.error(
+                "Invalid path was provided: {}",
+                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);
+            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);
+            LOGGER.error(
+                "Could not write study file {}",
+                studyDefinitionFile,
+                e
+            );
+            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
         }
 
@@ -203,7 +271,12 @@ 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) {
diff --git a/src/main/java/org/jabref/gui/slr/SlrStudyAndDirectory.java b/src/main/java/org/jabref/gui/slr/SlrStudyAndDirectory.java
index 223d99d5224..07c81dfcc6b 100644
--- a/src/main/java/org/jabref/gui/slr/SlrStudyAndDirectory.java
+++ b/src/main/java/org/jabref/gui/slr/SlrStudyAndDirectory.java
@@ -2,10 +2,10 @@
 
 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 848d36d4cb5..70cfa629a2d 100644
--- a/src/main/java/org/jabref/gui/slr/StartNewStudyAction.java
+++ b/src/main/java/org/jabref/gui/slr/StartNewStudyAction.java
@@ -3,7 +3,7 @@
 import java.io.IOException;
 import java.nio.file.Path;
 import java.util.Optional;
-
+import org.eclipse.jgit.api.errors.GitAPIException;
 import org.jabref.gui.JabRefFrame;
 import org.jabref.gui.StateManager;
 import org.jabref.gui.util.TaskExecutor;
@@ -14,8 +14,6 @@
 import org.jabref.model.study.Study;
 import org.jabref.model.util.FileUpdateMonitor;
 import org.jabref.preferences.PreferencesService;
-
-import org.eclipse.jgit.api.errors.GitAPIException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -31,41 +29,61 @@
  * There is the hook {@link StartNewStudyAction#crawlPreparation(Path)}, which is used by {@link ExistingStudySearchAction#crawl()}.
  */
 public class StartNewStudyAction extends ExistingStudySearchAction {
-    private static final Logger LOGGER = LoggerFactory.getLogger(StartNewStudyAction.class);
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(
+        StartNewStudyAction.class
+    );
 
     Study newStudy;
 
-    public StartNewStudyAction(JabRefFrame frame,
-                               FileUpdateMonitor fileUpdateMonitor,
-                               TaskExecutor taskExecutor,
-                               PreferencesService preferencesService,
-                               StateManager stateManager) {
-        super(frame,
-                frame.getOpenDatabaseAction(),
-                frame.getDialogService(),
-                fileUpdateMonitor,
-                taskExecutor,
-                preferencesService,
-                stateManager,
-                true);
+    public StartNewStudyAction(
+        JabRefFrame frame,
+        FileUpdateMonitor fileUpdateMonitor,
+        TaskExecutor taskExecutor,
+        PreferencesService preferencesService,
+        StateManager stateManager
+    ) {
+        super(
+            frame,
+            frame.getOpenDatabaseAction(),
+            frame.getDialogService(),
+            fileUpdateMonitor,
+            taskExecutor,
+            preferencesService,
+            stateManager,
+            true
+        );
     }
 
     @Override
-    protected void crawlPreparation(Path studyRepositoryRoot) throws IOException, GitAPIException {
+    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 "Initial commit" should also contain the created YAML.
         // Thus, we append to that commit.
-        new GitHandler(studyRepositoryRoot).createCommitOnCurrentBranch("Initial commit", true);
+        new GitHandler(studyRepositoryRoot)
+            .createCommitOnCurrentBranch("Initial commit", true);
     }
 
     @Override
     public void execute() {
-        Optional<SlrStudyAndDirectory> studyAndDirectory = dialogService.showCustomDialogAndWait(
-                new ManageStudyDefinitionView(preferencesService.getFilePreferences().getWorkingDirectory()));
+        Optional<SlrStudyAndDirectory> studyAndDirectory =
+            dialogService.showCustomDialogAndWait(
+                new ManageStudyDefinitionView(
+                    preferencesService
+                        .getFilePreferences()
+                        .getWorkingDirectory()
+                )
+            );
         if (studyAndDirectory.isEmpty()) {
             return;
         }
@@ -74,7 +92,9 @@ public void execute() {
             LOGGER.error("Study directory is blank");
             // This branch probably is never taken
             // Thus, we re-use existing localization
-            dialogService.showErrorDialogAndWait(Localization.lang("Must not be empty!"));
+            dialogService.showErrorDialogAndWait(
+                Localization.lang("Must not be empty!")
+            );
             return;
         }
         studyDirectory = studyAndDirectory.get().getStudyDirectory();
diff --git a/src/main/java/org/jabref/gui/slr/StudyCatalogItem.java b/src/main/java/org/jabref/gui/slr/StudyCatalogItem.java
index b379d373bf9..c2c763ecc0b 100644
--- a/src/main/java/org/jabref/gui/slr/StudyCatalogItem.java
+++ b/src/main/java/org/jabref/gui/slr/StudyCatalogItem.java
@@ -1,18 +1,17 @@
 package org.jabref.gui.slr;
 
 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 org.jabref.model.study.StudyDatabase;
 
 /**
  * View representation of {@link StudyDatabase}
  */
 public class StudyCatalogItem {
+
     private final StringProperty name;
     private final BooleanProperty enabled;
 
@@ -47,10 +46,14 @@ 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 +65,10 @@ 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 d95cff66d47..aa5ced02ee1 100644
--- a/src/main/java/org/jabref/gui/specialfields/SpecialFieldAction.java
+++ b/src/main/java/org/jabref/gui/specialfields/SpecialFieldAction.java
@@ -4,9 +4,7 @@
 import java.util.List;
 import java.util.Objects;
 import java.util.Optional;
-
 import javax.swing.undo.UndoManager;
-
 import org.jabref.gui.DialogService;
 import org.jabref.gui.JabRefFrame;
 import org.jabref.gui.StateManager;
@@ -20,13 +18,14 @@
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.field.SpecialField;
 import org.jabref.preferences.PreferencesService;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 public class SpecialFieldAction extends SimpleCommand {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(SpecialFieldAction.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(
+        SpecialFieldAction.class
+    );
     private final JabRefFrame frame;
     private final SpecialField specialField;
     private final String value;
@@ -40,15 +39,17 @@ 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(JabRefFrame frame,
-                              SpecialField specialField,
-                              String value,
-                              boolean nullFieldIfValueIsTheSame,
-                              String undoText,
-                              DialogService dialogService,
-                              PreferencesService preferencesService,
-                              UndoManager undoManager,
-                              StateManager stateManager) {
+    public SpecialFieldAction(
+        JabRefFrame frame,
+        SpecialField specialField,
+        String value,
+        boolean nullFieldIfValueIsTheSame,
+        String undoText,
+        DialogService dialogService,
+        PreferencesService preferencesService,
+        UndoManager undoManager,
+        StateManager stateManager
+    ) {
         this.frame = frame;
         this.specialField = specialField;
         this.value = value;
@@ -73,9 +74,16 @@ public void execute() {
             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);
+                Optional<FieldChange> change = UpdateField.updateField(
+                    bibEntry,
+                    specialField,
+                    value,
+                    nullFieldIfValueIsTheSame
+                );
 
-                change.ifPresent(fieldChange -> ce.addEdit(new UndoableFieldChange(fieldChange)));
+                change.ifPresent(fieldChange ->
+                    ce.addEdit(new UndoableFieldChange(fieldChange))
+                );
             }
             ce.end();
             if (ce.hasEdits()) {
@@ -84,13 +92,18 @@ public void execute() {
                 frame.getCurrentLibraryTab().updateEntryEditorIfShowing();
                 String outText;
                 if (nullFieldIfValueIsTheSame || value == null) {
-                    outText = getTextDone(specialField, Integer.toString(bes.size()));
+                    outText =
+                        getTextDone(specialField, Integer.toString(bes.size()));
                 } else {
-                    outText = getTextDone(specialField, value, Integer.toString(bes.size()));
+                    outText =
+                        getTextDone(
+                            specialField,
+                            value,
+                            Integer.toString(bes.size())
+                        );
                 }
                 dialogService.notify(outText);
             }
-
             // 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);
@@ -100,21 +113,55 @@ public void execute() {
     private String getTextDone(SpecialField field, String... params) {
         Objects.requireNonNull(params);
 
-        SpecialFieldViewModel viewModel = new SpecialFieldViewModel(field, preferencesService, undoManager);
+        SpecialFieldViewModel viewModel = new SpecialFieldViewModel(
+            field,
+            preferencesService,
+            undoManager
+        );
 
-        if (field.isSingleValueField() && (params.length == 1) && (params[0] != null)) {
+        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)) {
+            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 2fa0a404799..f3b62857e86 100644
--- a/src/main/java/org/jabref/gui/specialfields/SpecialFieldMenuItemFactory.java
+++ b/src/main/java/org/jabref/gui/specialfields/SpecialFieldMenuItemFactory.java
@@ -1,12 +1,10 @@
 package org.jabref.gui.specialfields;
 
+import de.saxsys.mvvmfx.utils.commands.Command;
 import java.util.function.Function;
-
-import javax.swing.undo.UndoManager;
-
 import javafx.scene.control.Menu;
 import javafx.scene.control.MenuItem;
-
+import javax.swing.undo.UndoManager;
 import org.jabref.gui.DialogService;
 import org.jabref.gui.JabRefFrame;
 import org.jabref.gui.StateManager;
@@ -15,51 +13,102 @@
 import org.jabref.model.entry.field.SpecialFieldValue;
 import org.jabref.preferences.PreferencesService;
 
-import de.saxsys.mvvmfx.utils.commands.Command;
-
 public class SpecialFieldMenuItemFactory {
-    public static MenuItem getSpecialFieldSingleItem(SpecialField field,
-                                                     ActionFactory factory,
-                                                     JabRefFrame frame,
-                                                     DialogService dialogService,
-                                                     PreferencesService preferencesService,
-                                                     UndoManager undoManager,
-                                                     StateManager stateManager) {
-        SpecialFieldValueViewModel specialField = new SpecialFieldValueViewModel(field.getValues().get(0));
-        MenuItem menuItem = factory.createMenuItem(specialField.getAction(),
-                new SpecialFieldViewModel(field, preferencesService, undoManager)
-                        .getSpecialFieldAction(field.getValues().get(0), frame, dialogService, stateManager));
-        menuItem.visibleProperty().bind(preferencesService.getSpecialFieldsPreferences().specialFieldsEnabledProperty());
+
+    public static MenuItem getSpecialFieldSingleItem(
+        SpecialField field,
+        ActionFactory factory,
+        JabRefFrame frame,
+        DialogService dialogService,
+        PreferencesService preferencesService,
+        UndoManager undoManager,
+        StateManager stateManager
+    ) {
+        SpecialFieldValueViewModel specialField =
+            new SpecialFieldValueViewModel(field.getValues().get(0));
+        MenuItem menuItem = factory.createMenuItem(
+            specialField.getAction(),
+            new SpecialFieldViewModel(field, preferencesService, undoManager)
+                .getSpecialFieldAction(
+                    field.getValues().get(0),
+                    frame,
+                    dialogService,
+                    stateManager
+                )
+        );
+        menuItem
+            .visibleProperty()
+            .bind(
+                preferencesService
+                    .getSpecialFieldsPreferences()
+                    .specialFieldsEnabledProperty()
+            );
         return menuItem;
     }
 
-    public static Menu createSpecialFieldMenu(SpecialField field,
-                                              ActionFactory factory,
-                                              JabRefFrame frame,
-                                              DialogService dialogService,
-                                              PreferencesService preferencesService,
-                                              UndoManager undoManager,
-                                              StateManager stateManager) {
-
-        return createSpecialFieldMenu(field, factory, preferencesService, undoManager, specialField ->
-                new SpecialFieldViewModel(field, preferencesService, undoManager)
-                        .getSpecialFieldAction(specialField.getValue(), frame, dialogService, stateManager));
+    public static Menu createSpecialFieldMenu(
+        SpecialField field,
+        ActionFactory factory,
+        JabRefFrame frame,
+        DialogService dialogService,
+        PreferencesService preferencesService,
+        UndoManager undoManager,
+        StateManager stateManager
+    ) {
+        return createSpecialFieldMenu(
+            field,
+            factory,
+            preferencesService,
+            undoManager,
+            specialField ->
+                new SpecialFieldViewModel(
+                    field,
+                    preferencesService,
+                    undoManager
+                )
+                    .getSpecialFieldAction(
+                        specialField.getValue(),
+                        frame,
+                        dialogService,
+                        stateManager
+                    )
+        );
     }
 
-    public static Menu createSpecialFieldMenu(SpecialField field,
-                                              ActionFactory factory,
-                                              PreferencesService preferencesService,
-                                              UndoManager undoManager,
-                                              Function<SpecialFieldValueViewModel, Command> commandFactory) {
-        SpecialFieldViewModel viewModel = new SpecialFieldViewModel(field, preferencesService, undoManager);
+    public static Menu createSpecialFieldMenu(
+        SpecialField field,
+        ActionFactory factory,
+        PreferencesService preferencesService,
+        UndoManager undoManager,
+        Function<SpecialFieldValueViewModel, Command> commandFactory
+    ) {
+        SpecialFieldViewModel viewModel = new SpecialFieldViewModel(
+            field,
+            preferencesService,
+            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)));
+            SpecialFieldValueViewModel valueViewModel =
+                new SpecialFieldValueViewModel(Value);
+            menu
+                .getItems()
+                .add(
+                    factory.createMenuItem(
+                        valueViewModel.getAction(),
+                        commandFactory.apply(valueViewModel)
+                    )
+                );
         }
 
-        menu.visibleProperty().bind(preferencesService.getSpecialFieldsPreferences().specialFieldsEnabledProperty());
+        menu
+            .visibleProperty()
+            .bind(
+                preferencesService
+                    .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 e2d3ffda9a6..6df1ae372bd 100644
--- a/src/main/java/org/jabref/gui/specialfields/SpecialFieldValueViewModel.java
+++ b/src/main/java/org/jabref/gui/specialfields/SpecialFieldValueViewModel.java
@@ -2,7 +2,6 @@
 
 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;
@@ -44,7 +43,9 @@ public String getToolTipText() {
             case RANK_3 -> Localization.lang("Three stars");
             case RANK_4 -> Localization.lang("Four stars");
             case RANK_5 -> Localization.lang("Five stars");
-            case CLEAR_READ_STATUS -> Localization.lang("No read status information");
+            case CLEAR_READ_STATUS -> Localization.lang(
+                "No read status information"
+            );
             case READ -> Localization.lang("Read status read");
             case SKIMMED -> Localization.lang("Read status skimmed");
             case RELEVANT -> Localization.lang("Toggle relevance");
diff --git a/src/main/java/org/jabref/gui/specialfields/SpecialFieldViewModel.java b/src/main/java/org/jabref/gui/specialfields/SpecialFieldViewModel.java
index 596b1848a5a..6b3a8210dd9 100644
--- a/src/main/java/org/jabref/gui/specialfields/SpecialFieldViewModel.java
+++ b/src/main/java/org/jabref/gui/specialfields/SpecialFieldViewModel.java
@@ -4,9 +4,7 @@
 import java.util.Objects;
 import java.util.Optional;
 import java.util.stream.Collectors;
-
 import javax.swing.undo.UndoManager;
-
 import org.jabref.gui.DialogService;
 import org.jabref.gui.JabRefFrame;
 import org.jabref.gui.StateManager;
@@ -27,7 +25,11 @@ public class SpecialFieldViewModel {
     private final PreferencesService preferencesService;
     private final UndoManager undoManager;
 
-    public SpecialFieldViewModel(SpecialField field, PreferencesService preferencesService, UndoManager undoManager) {
+    public SpecialFieldViewModel(
+        SpecialField field,
+        PreferencesService preferencesService,
+        UndoManager undoManager
+    ) {
         this.field = Objects.requireNonNull(field);
         this.preferencesService = Objects.requireNonNull(preferencesService);
         this.undoManager = Objects.requireNonNull(undoManager);
@@ -37,21 +39,24 @@ public SpecialField getField() {
         return field;
     }
 
-    public SpecialFieldAction getSpecialFieldAction(SpecialFieldValue value,
-                                                    JabRefFrame frame,
-                                                    DialogService dialogService,
-                                                    StateManager stateManager) {
+    public SpecialFieldAction getSpecialFieldAction(
+        SpecialFieldValue value,
+        JabRefFrame frame,
+        DialogService dialogService,
+        StateManager stateManager
+    ) {
         return new SpecialFieldAction(
-                frame,
-                field,
-                value.getFieldValue().orElse(null),
-                // 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,
-                preferencesService,
-                undoManager,
-                stateManager);
+            frame,
+            field,
+            value.getFieldValue().orElse(null),
+            // 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,
+            preferencesService,
+            undoManager,
+            stateManager
+        );
     }
 
     public JabRefIcon getIcon() {
@@ -78,15 +83,27 @@ public JabRefIcon getEmptyIcon() {
     }
 
     public List<SpecialFieldValueViewModel> getValues() {
-        return field.getValues().stream()
-                    .map(SpecialFieldValueViewModel::new)
-                    .collect(Collectors.toList());
+        return field
+            .getValues()
+            .stream()
+            .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());
-
-        change.ifPresent(fieldChange -> undoManager.addEdit(new UndoableFieldChange(fieldChange)));
+    public void setSpecialFieldValue(
+        BibEntry bibEntry,
+        SpecialFieldValue value
+    ) {
+        Optional<FieldChange> change = UpdateField.updateField(
+            bibEntry,
+            getField(),
+            value.getFieldValue().orElse(null),
+            getField().isSingleValueField()
+        );
+
+        change.ifPresent(fieldChange ->
+            undoManager.addEdit(new UndoableFieldChange(fieldChange))
+        );
     }
 
     public void toggle(BibEntry entry) {
diff --git a/src/main/java/org/jabref/gui/specialfields/SpecialFieldsPreferences.java b/src/main/java/org/jabref/gui/specialfields/SpecialFieldsPreferences.java
index ee015786a0d..a59bef6bfd1 100644
--- a/src/main/java/org/jabref/gui/specialfields/SpecialFieldsPreferences.java
+++ b/src/main/java/org/jabref/gui/specialfields/SpecialFieldsPreferences.java
@@ -10,7 +10,8 @@ public class SpecialFieldsPreferences {
     private final BooleanProperty specialFieldsEnabled;
 
     public SpecialFieldsPreferences(boolean specialFieldsEnabled) {
-        this.specialFieldsEnabled = new SimpleBooleanProperty(specialFieldsEnabled);
+        this.specialFieldsEnabled =
+            new SimpleBooleanProperty(specialFieldsEnabled);
     }
 
     public boolean isSpecialFieldsEnabled() {
diff --git a/src/main/java/org/jabref/gui/texparser/CitationsDisplay.java b/src/main/java/org/jabref/gui/texparser/CitationsDisplay.java
index 8e03598787f..5b3e2d9477d 100644
--- a/src/main/java/org/jabref/gui/texparser/CitationsDisplay.java
+++ b/src/main/java/org/jabref/gui/texparser/CitationsDisplay.java
@@ -3,7 +3,6 @@
 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;
@@ -15,7 +14,6 @@
 import javafx.scene.layout.VBox;
 import javafx.scene.text.Text;
 import javafx.scene.text.TextFlow;
-
 import org.jabref.gui.icon.IconTheme;
 import org.jabref.gui.util.ViewModelListCellFactory;
 import org.jabref.model.strings.LatexToUnicodeAdapter;
@@ -27,9 +25,10 @@ public class CitationsDisplay extends ListView<Citation> {
 
     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");
     }
@@ -43,16 +42,34 @@ private Node getDisplayGraphic(Citation item) {
             basePath.set(item.getPath().getRoot());
         }
 
-        Node citationIcon = IconTheme.JabRefIcons.LATEX_COMMENT.getGraphicNode();
-        Text contextText = new Text(LatexToUnicodeAdapter.format(item.getContext()));
-        contextText.wrappingWidthProperty().bind(this.widthProperty().subtract(85));
+        Node citationIcon =
+            IconTheme.JabRefIcons.LATEX_COMMENT.getGraphicNode();
+        Text contextText = new Text(
+            LatexToUnicodeAdapter.format(item.getContext())
+        );
+        contextText
+            .wrappingWidthProperty()
+            .bind(this.widthProperty().subtract(85));
         HBox contextBox = new HBox(8, citationIcon, contextText);
         contextBox.getStyleClass().add("contextBox");
 
-        Label fileNameLabel = new Label(String.format("%s", basePath.get().relativize(item.getPath())));
-        fileNameLabel.setGraphic(IconTheme.JabRefIcons.LATEX_FILE.getGraphicNode());
-        Label positionLabel = new Label(String.format("(%s:%s-%s)", item.getLine(), item.getColStart(), item.getColEnd()));
-        positionLabel.setGraphic(IconTheme.JabRefIcons.LATEX_LINE.getGraphicNode());
+        Label fileNameLabel = new Label(
+            String.format("%s", basePath.get().relativize(item.getPath()))
+        );
+        fileNameLabel.setGraphic(
+            IconTheme.JabRefIcons.LATEX_FILE.getGraphicNode()
+        );
+        Label positionLabel = new Label(
+            String.format(
+                "(%s:%s-%s)",
+                item.getLine(),
+                item.getColStart(),
+                item.getColEnd()
+            )
+        );
+        positionLabel.setGraphic(
+            IconTheme.JabRefIcons.LATEX_LINE.getGraphicNode()
+        );
         HBox dataBox = new HBox(5, fileNameLabel, positionLabel);
 
         return new VBox(contextBox, dataBox);
diff --git a/src/main/java/org/jabref/gui/texparser/ParseLatexAction.java b/src/main/java/org/jabref/gui/texparser/ParseLatexAction.java
index 637feed20fb..d8af43dbaaa 100644
--- a/src/main/java/org/jabref/gui/texparser/ParseLatexAction.java
+++ b/src/main/java/org/jabref/gui/texparser/ParseLatexAction.java
@@ -1,13 +1,12 @@
 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;
@@ -19,8 +18,14 @@ public ParseLatexAction(StateManager stateManager) {
 
     @Override
     public void execute() {
-        DialogService dialogService = Injector.instantiateModelOrService(DialogService.class);
-        BibDatabaseContext database = stateManager.getActiveDatabase().orElseThrow(NullPointerException::new);
-        dialogService.showCustomDialogAndWait(new ParseLatexDialogView(database));
+        DialogService dialogService = Injector.instantiateModelOrService(
+            DialogService.class
+        );
+        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 6f95e828754..48ff82026c0 100644
--- a/src/main/java/org/jabref/gui/texparser/ParseLatexDialogView.java
+++ b/src/main/java/org/jabref/gui/texparser/ParseLatexDialogView.java
@@ -1,5 +1,9 @@
 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;
@@ -8,7 +12,7 @@
 import javafx.scene.control.ProgressIndicator;
 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,29 +27,50 @@
 import org.jabref.model.util.FileUpdateMonitor;
 import org.jabref.preferences.PreferencesService;
 
-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;
     private final ControlsFxVisualizer validationVisualizer;
-    @FXML private TextField latexDirectoryField;
-    @FXML private Button browseButton;
-    @FXML private Button searchButton;
-    @FXML private ProgressIndicator progressIndicator;
-    @FXML private CheckTreeView<FileNodeViewModel> fileTreeView;
-    @FXML private Button selectAllButton;
-    @FXML private Button unselectAllButton;
-    @FXML private ButtonType parseButtonType;
-    @Inject private DialogService dialogService;
-    @Inject private TaskExecutor taskExecutor;
-    @Inject private PreferencesService preferencesService;
-    @Inject private FileUpdateMonitor fileMonitor;
-    @Inject private ThemeManager themeManager;
+
+    @FXML
+    private TextField latexDirectoryField;
+
+    @FXML
+    private Button browseButton;
+
+    @FXML
+    private Button searchButton;
+
+    @FXML
+    private ProgressIndicator progressIndicator;
+
+    @FXML
+    private CheckTreeView<FileNodeViewModel> fileTreeView;
+
+    @FXML
+    private Button selectAllButton;
+
+    @FXML
+    private Button unselectAllButton;
+
+    @FXML
+    private ButtonType parseButtonType;
+
+    @Inject
+    private DialogService dialogService;
+
+    @Inject
+    private TaskExecutor taskExecutor;
+
+    @Inject
+    private PreferencesService preferencesService;
+
+    @Inject
+    private FileUpdateMonitor fileMonitor;
+
+    @Inject
+    private ThemeManager themeManager;
+
     private ParseLatexDialogViewModel viewModel;
 
     public ParseLatexDialogView(BibDatabaseContext databaseContext) {
@@ -56,41 +81,93 @@ public ParseLatexDialogView(BibDatabaseContext databaseContext) {
 
         ViewLoader.view(this).load().setAsDialogPane(this);
 
-        ControlHelper.setAction(parseButtonType, getDialogPane(), event -> viewModel.parseButtonClicked());
-        Button parseButton = (Button) getDialogPane().lookupButton(parseButtonType);
-        parseButton.disableProperty().bind(viewModel.noFilesFoundProperty().or(
-                Bindings.isEmpty(viewModel.getCheckedFileList())));
+        ControlHelper.setAction(
+            parseButtonType,
+            getDialogPane(),
+            event -> viewModel.parseButtonClicked()
+        );
+        Button parseButton = (Button) getDialogPane()
+            .lookupButton(parseButtonType);
+        parseButton
+            .disableProperty()
+            .bind(
+                viewModel
+                    .noFilesFoundProperty()
+                    .or(Bindings.isEmpty(viewModel.getCheckedFileList()))
+            );
 
         themeManager.updateFontStyle(getDialogPane().getScene());
     }
 
     @FXML
     private void initialize() {
-        viewModel = new ParseLatexDialogViewModel(databaseContext, dialogService, taskExecutor, preferencesService, fileMonitor);
-
-        fileTreeView.getSelectionModel().setSelectionMode(SelectionMode.MULTIPLE);
-        fileTreeView.showRootProperty().bindBidirectional(viewModel.successfulSearchProperty());
-        fileTreeView.rootProperty().bind(EasyBind.map(viewModel.rootProperty(), fileNode ->
-                new RecursiveTreeItem<>(fileNode, FileNodeViewModel::getChildren)));
+        viewModel =
+            new ParseLatexDialogViewModel(
+                databaseContext,
+                dialogService,
+                taskExecutor,
+                preferencesService,
+                fileMonitor
+            );
+
+        fileTreeView
+            .getSelectionModel()
+            .setSelectionMode(SelectionMode.MULTIPLE);
+        fileTreeView
+            .showRootProperty()
+            .bindBidirectional(viewModel.successfulSearchProperty());
+        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());
+            .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());
         validationVisualizer.setDecoration(new IconValidationDecorator());
-        validationVisualizer.initVisualization(viewModel.latexDirectoryValidation(), latexDirectoryField);
-        browseButton.disableProperty().bindBidirectional(viewModel.searchInProgressProperty());
-        searchButton.disableProperty().bind(viewModel.latexDirectoryValidation().validProperty().not());
-        selectAllButton.disableProperty().bindBidirectional(viewModel.noFilesFoundProperty());
-        unselectAllButton.disableProperty().bindBidirectional(viewModel.noFilesFoundProperty());
-        progressIndicator.visibleProperty().bindBidirectional(viewModel.searchInProgressProperty());
+        validationVisualizer.initVisualization(
+            viewModel.latexDirectoryValidation(),
+            latexDirectoryField
+        );
+        browseButton
+            .disableProperty()
+            .bindBidirectional(viewModel.searchInProgressProperty());
+        searchButton
+            .disableProperty()
+            .bind(viewModel.latexDirectoryValidation().validProperty().not());
+        selectAllButton
+            .disableProperty()
+            .bindBidirectional(viewModel.noFilesFoundProperty());
+        unselectAllButton
+            .disableProperty()
+            .bindBidirectional(viewModel.noFilesFoundProperty());
+        progressIndicator
+            .visibleProperty()
+            .bindBidirectional(viewModel.searchInProgressProperty());
     }
 
     @FXML
diff --git a/src/main/java/org/jabref/gui/texparser/ParseLatexDialogViewModel.java b/src/main/java/org/jabref/gui/texparser/ParseLatexDialogViewModel.java
index a374ee73f99..34f83e2582d 100644
--- a/src/main/java/org/jabref/gui/texparser/ParseLatexDialogViewModel.java
+++ b/src/main/java/org/jabref/gui/texparser/ParseLatexDialogViewModel.java
@@ -1,5 +1,9 @@
 package org.jabref.gui.texparser;
 
+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.FileSystemException;
 import java.nio.file.Files;
@@ -9,7 +13,6 @@
 import java.util.function.Predicate;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
-
 import javafx.beans.property.BooleanProperty;
 import javafx.beans.property.ObjectProperty;
 import javafx.beans.property.ReadOnlyListWrapper;
@@ -20,7 +23,6 @@
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableList;
 import javafx.scene.control.TreeItem;
-
 import org.jabref.gui.AbstractViewModel;
 import org.jabref.gui.DialogService;
 import org.jabref.gui.util.BackgroundTask;
@@ -34,17 +36,14 @@
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.util.FileUpdateMonitor;
 import org.jabref.preferences.PreferencesService;
-
-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;
 
 public class ParseLatexDialogViewModel extends AbstractViewModel {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(ParseLatexDialogViewModel.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(
+        ParseLatexDialogViewModel.class
+    );
     private static final String TEX_EXT = ".tex";
     private final BibDatabaseContext databaseContext;
     private final DialogService dialogService;
@@ -59,28 +58,52 @@ public class ParseLatexDialogViewModel extends AbstractViewModel {
     private final BooleanProperty searchInProgress;
     private final BooleanProperty successfulSearch;
 
-    public ParseLatexDialogViewModel(BibDatabaseContext databaseContext,
-                                     DialogService dialogService,
-                                     TaskExecutor taskExecutor,
-                                     PreferencesService preferencesService,
-                                     FileUpdateMonitor fileMonitor) {
+    public ParseLatexDialogViewModel(
+        BibDatabaseContext databaseContext,
+        DialogService dialogService,
+        TaskExecutor taskExecutor,
+        PreferencesService preferencesService,
+        FileUpdateMonitor fileMonitor
+    ) {
         this.databaseContext = databaseContext;
         this.dialogService = dialogService;
         this.taskExecutor = taskExecutor;
         this.preferencesService = preferencesService;
         this.fileMonitor = fileMonitor;
-        this.latexFileDirectory = new SimpleStringProperty(databaseContext.getMetaData().getLatexFileDirectory(preferencesService.getFilePreferences().getUserAndHost())
-                                                                          .orElse(FileUtil.getInitialDirectory(databaseContext, preferencesService.getFilePreferences().getWorkingDirectory()))
-                                                                          .toAbsolutePath().toString());
+        this.latexFileDirectory =
+            new SimpleStringProperty(
+                databaseContext
+                    .getMetaData()
+                    .getLatexFileDirectory(
+                        preferencesService.getFilePreferences().getUserAndHost()
+                    )
+                    .orElse(
+                        FileUtil.getInitialDirectory(
+                            databaseContext,
+                            preferencesService
+                                .getFilePreferences()
+                                .getWorkingDirectory()
+                        )
+                    )
+                    .toAbsolutePath()
+                    .toString()
+            );
         this.root = new SimpleObjectProperty<>();
         this.checkedFileList = FXCollections.observableArrayList();
         this.noFilesFound = new SimpleBooleanProperty(true);
         this.searchInProgress = new SimpleBooleanProperty(false);
         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.")));
+        Predicate<String> isDirectory = path ->
+            Path.of(path).toFile().isDirectory();
+        latexDirectoryValidator =
+            new FunctionBasedValidator<>(
+                latexFileDirectory,
+                isDirectory,
+                ValidationMessage.error(
+                    Localization.lang("Please enter a valid file path.")
+                )
+            );
     }
 
     public StringProperty latexFileDirectoryProperty() {
@@ -112,65 +135,102 @@ 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());
-            preferencesService.getFilePreferences().setWorkingDirectory(selectedDirectory.toAbsolutePath());
-        });
+        dialogService
+            .showDirectorySelectionDialog(directoryDialogConfiguration)
+            .ifPresent(selectedDirectory -> {
+                latexFileDirectory.set(
+                    selectedDirectory.toAbsolutePath().toString()
+                );
+                preferencesService
+                    .getFilePreferences()
+                    .setWorkingDirectory(selectedDirectory.toAbsolutePath());
+            });
     }
 
     /**
      * Run a recursive search in a background task.
      */
     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);
+        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);
     }
 
     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(String.format(Localization.lang("JabRef does not have permission to access %s"), exception.getCause().getMessage()));
+            dialogService.showErrorDialogAndWait(
+                String.format(
+                    Localization.lang(
+                        "JabRef does not have permission to access %s"
+                    ),
+                    exception.getCause().getMessage()
+                )
+            );
         } else {
             dialogService.showErrorDialogAndWait(exception);
         }
     }
 
-    private FileNodeViewModel searchDirectory(Path directory) throws IOException {
+    private FileNodeViewModel searchDirectory(Path directory)
+        throws IOException {
         if ((directory == null) || !directory.toFile().isDirectory()) {
-            throw new IOException(String.format("Invalid directory for searching: %s", directory));
+            throw new IOException(
+                String.format("Invalid directory for searching: %s", directory)
+            );
         }
 
         FileNodeViewModel parent = new FileNodeViewModel(directory);
         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(String.format("%s while searching files: %s", e.getClass().getName(), e.getMessage()));
+            LOGGER.error(
+                String.format(
+                    "%s while searching files: %s",
+                    e.getClass().getName(),
+                    e.getMessage()
+                )
+            );
             return parent;
         }
 
         List<Path> subDirectories = fileListPartition.get(true);
-        List<Path> files = fileListPartition.get(false)
-                                            .stream()
-                                            .filter(path -> path.toString().endsWith(TEX_EXT))
-                                            .collect(Collectors.toList());
+        List<Path> files = fileListPartition
+            .get(false)
+            .stream()
+            .filter(path -> path.toString().endsWith(TEX_EXT))
+            .collect(Collectors.toList());
         int fileCount = 0;
 
         for (Path subDirectory : subDirectories) {
@@ -183,9 +243,14 @@ private FileNodeViewModel searchDirectory(Path directory) throws IOException {
         }
 
         parent.setFileCount(files.size() + fileCount);
-        parent.getChildren().addAll(files.stream()
-                                         .map(FileNodeViewModel::new)
-                                         .collect(Collectors.toList()));
+        parent
+            .getChildren()
+            .addAll(
+                files
+                    .stream()
+                    .map(FileNodeViewModel::new)
+                    .collect(Collectors.toList())
+            );
         return parent;
     }
 
@@ -193,27 +258,41 @@ 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())
-                                             .collect(Collectors.toList());
+        List<Path> fileList = checkedFileList
+            .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;
         }
 
         TexBibEntriesResolver entriesResolver = new TexBibEntriesResolver(
-                databaseContext.getDatabase(),
-                preferencesService.getLibraryPreferences(),
-                preferencesService.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);
+            databaseContext.getDatabase(),
+            preferencesService.getLibraryPreferences(),
+            preferencesService.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);
     }
 }
diff --git a/src/main/java/org/jabref/gui/texparser/ParseLatexResultView.java b/src/main/java/org/jabref/gui/texparser/ParseLatexResultView.java
index 7fc00e8b7eb..d209e16c030 100644
--- a/src/main/java/org/jabref/gui/texparser/ParseLatexResultView.java
+++ b/src/main/java/org/jabref/gui/texparser/ParseLatexResultView.java
@@ -1,13 +1,14 @@
 package org.jabref.gui.texparser;
 
+import com.airhacks.afterburner.views.ViewLoader;
+import com.tobiasdiez.easybind.EasyBind;
+import jakarta.inject.Inject;
 import java.nio.file.Path;
-
 import javafx.fxml.FXML;
 import javafx.scene.control.Button;
 import javafx.scene.control.ButtonType;
 import javafx.scene.control.ListView;
 import javafx.scene.text.Text;
-
 import org.jabref.gui.theme.ThemeManager;
 import org.jabref.gui.util.BaseDialog;
 import org.jabref.gui.util.ControlHelper;
@@ -16,22 +17,31 @@
 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;
-
 public class ParseLatexResultView extends BaseDialog<Void> {
 
     private final LatexBibEntriesResolverResult resolverResult;
     private final BibDatabaseContext databaseContext;
     private final Path basePath;
-    @FXML private ListView<ReferenceViewModel> referenceListView;
-    @FXML private CitationsDisplay citationsDisplay;
-    @FXML private ButtonType importButtonType;
-    @Inject private ThemeManager themeManager;
+
+    @FXML
+    private ListView<ReferenceViewModel> referenceListView;
+
+    @FXML
+    private CitationsDisplay citationsDisplay;
+
+    @FXML
+    private ButtonType importButtonType;
+
+    @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,34 +50,44 @@ public ParseLatexResultView(LatexBibEntriesResolverResult resolverResult, BibDat
 
         ViewLoader.view(this).load().setAsDialogPane(this);
 
-        ControlHelper.setAction(importButtonType, getDialogPane(), event -> {
-            viewModel.importButtonClicked();
-            close();
-        });
-        Button importButton = (Button) getDialogPane().lookupButton(importButtonType);
-        importButton.disableProperty().bind(viewModel.importButtonDisabledProperty());
+        ControlHelper.setAction(
+            importButtonType,
+            getDialogPane(),
+            event -> {
+                viewModel.importButtonClicked();
+                close();
+            }
+        );
+        Button importButton = (Button) getDialogPane()
+            .lookupButton(importButtonType);
+        importButton
+            .disableProperty()
+            .bind(viewModel.importButtonDisabledProperty());
 
         themeManager.updateFontStyle(getDialogPane().getScene());
     }
 
     @FXML
     private void initialize() {
-        viewModel = new ParseLatexResultViewModel(resolverResult, databaseContext);
+        viewModel =
+            new ParseLatexResultViewModel(resolverResult, databaseContext);
 
         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;
-                })
-                .install(referenceListView);
-
-        EasyBind.subscribe(referenceListView.getSelectionModel().selectedItemProperty(),
-                viewModel::activeReferenceChanged);
+            .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(),
+            viewModel::activeReferenceChanged
+        );
 
         citationsDisplay.basePathProperty().set(basePath);
         citationsDisplay.setItems(viewModel.getCitationListByReference());
diff --git a/src/main/java/org/jabref/gui/texparser/ParseLatexResultViewModel.java b/src/main/java/org/jabref/gui/texparser/ParseLatexResultViewModel.java
index c40d86c52ae..48826f3f7bc 100644
--- a/src/main/java/org/jabref/gui/texparser/ParseLatexResultViewModel.java
+++ b/src/main/java/org/jabref/gui/texparser/ParseLatexResultViewModel.java
@@ -1,16 +1,15 @@
 package org.jabref.gui.texparser;
 
+import com.airhacks.afterburner.injection.Injector;
 import java.util.Collection;
 import java.util.Map;
 import java.util.Set;
 import java.util.stream.Collectors;
-
 import javafx.beans.property.BooleanProperty;
 import javafx.beans.property.ReadOnlyListWrapper;
 import javafx.beans.property.SimpleBooleanProperty;
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableList;
-
 import org.jabref.gui.AbstractViewModel;
 import org.jabref.gui.DialogService;
 import org.jabref.gui.importer.ImportEntriesDialog;
@@ -21,8 +20,6 @@
 import org.jabref.model.texparser.Citation;
 import org.jabref.model.texparser.LatexBibEntriesResolverResult;
 
-import com.airhacks.afterburner.injection.Injector;
-
 public class ParseLatexResultViewModel extends AbstractViewModel {
 
     private final LatexBibEntriesResolverResult resolverResult;
@@ -31,19 +28,40 @@ 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() {
@@ -73,8 +91,15 @@ public void activeReferenceChanged(ReferenceViewModel reference) {
      * Search and import unknown references from associated BIB files.
      */
     public void importButtonClicked() {
-        DialogService dialogService = Injector.instantiateModelOrService(DialogService.class);
-        ImportEntriesDialog dialog = new ImportEntriesDialog(databaseContext, BackgroundTask.wrap(() -> new ParserResult(resolverResult.getNewEntries())));
+        DialogService dialogService = Injector.instantiateModelOrService(
+            DialogService.class
+        );
+        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 5d34915b8b4..5bcf8c0f0c6 100644
--- a/src/main/java/org/jabref/gui/texparser/ReferenceViewModel.java
+++ b/src/main/java/org/jabref/gui/texparser/ReferenceViewModel.java
@@ -1,11 +1,9 @@
 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;
 
 public class ReferenceViewModel {
@@ -14,7 +12,11 @@ public class ReferenceViewModel {
     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 +41,11 @@ public String getDisplayText() {
 
     @Override
     public String toString() {
-        return String.format("ReferenceViewModel{entry='%s', highlighted=%s, citationList=%s}",
-                this.entry,
-                this.highlighted,
-                this.citationList);
+        return String.format(
+            "ReferenceViewModel{entry='%s', highlighted=%s, citationList=%s}",
+            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 4f833937d1c..7ada5f1903a 100644
--- a/src/main/java/org/jabref/gui/theme/StyleSheet.java
+++ b/src/main/java/org/jabref/gui/theme/StyleSheet.java
@@ -6,9 +6,7 @@
 import java.nio.file.InvalidPathException;
 import java.nio.file.Path;
 import java.util.Optional;
-
 import org.jabref.gui.JabRefFrame;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -17,7 +15,9 @@ abstract class StyleSheet {
     static final String DATA_URL_PREFIX = "data:text/css;charset=utf-8;base64,";
     static final String EMPTY_WEBENGINE_CSS = DATA_URL_PREFIX;
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(StyleSheet.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(
+        StyleSheet.class
+    );
 
     abstract URL getSceneStylesheet();
 
@@ -30,21 +30,33 @@ Path getWatchPath() {
     abstract void reload();
 
     static Optional<StyleSheet> create(String name) {
-        Optional<URL> styleSheetUrl = Optional.ofNullable(JabRefFrame.class.getResource(name));
+        Optional<URL> styleSheetUrl = Optional.ofNullable(
+            JabRefFrame.class.getResource(name)
+        );
 
         if (styleSheetUrl.isEmpty()) {
             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());
+                LOGGER.warn(
+                    "Cannot load additional css {} because it is an invalid path: {}",
+                    name,
+                    e.getLocalizedMessage()
+                );
             } catch (MalformedURLException e) {
-                LOGGER.warn("Cannot load additional css url {} because it is a malformed url: {}", name, e.getLocalizedMessage());
+                LOGGER.warn(
+                    "Cannot load additional css url {} because it is a malformed url: {}",
+                    name,
+                    e.getLocalizedMessage()
+                );
             }
         }
 
         if (styleSheetUrl.isEmpty()) {
             try {
-                return Optional.of(new StyleSheetDataUrl(new URL(EMPTY_WEBENGINE_CSS)));
+                return Optional.of(
+                    new StyleSheetDataUrl(new URL(EMPTY_WEBENGINE_CSS))
+                );
             } catch (MalformedURLException e) {
                 return Optional.empty();
             }
@@ -52,12 +64,18 @@ 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 04045faa41b..b8d153b5aad 100644
--- a/src/main/java/org/jabref/gui/theme/StyleSheetDataUrl.java
+++ b/src/main/java/org/jabref/gui/theme/StyleSheetDataUrl.java
@@ -25,7 +25,12 @@ 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 3e98abf7142..ee1f0227bee 100644
--- a/src/main/java/org/jabref/gui/theme/StyleSheetFile.java
+++ b/src/main/java/org/jabref/gui/theme/StyleSheetFile.java
@@ -1,5 +1,6 @@
 package org.jabref.gui.theme;
 
+import com.google.common.base.Strings;
 import java.io.IOException;
 import java.io.InputStream;
 import java.net.URI;
@@ -10,8 +11,6 @@
 import java.util.Base64;
 import java.util.Optional;
 import java.util.concurrent.atomic.AtomicReference;
-
-import com.google.common.base.Strings;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -45,7 +44,9 @@ final class StyleSheetFile extends StyleSheet {
      */
     static final int MAX_IN_MEMORY_CSS_LENGTH = 48000;
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(StyleSheetFile.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(
+        StyleSheetFile.class
+    );
 
     private final URL url;
     private final Path path;
@@ -71,12 +72,18 @@ void reload() {
     @Override
     public URL getSceneStylesheet() {
         if (!Files.exists(path)) {
-            LOGGER.warn("Cannot load additional css {} because the file does not exist.", path);
+            LOGGER.warn(
+                "Cannot load additional css {} because the file does not exist.",
+                path
+            );
             return null;
         }
 
         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 +119,19 @@ 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);
-                    LOGGER.debug("Embedded css in data URL of length {}", embeddedDataUrl.length());
+                    String embeddedDataUrl =
+                        DATA_URL_PREFIX +
+                        Base64.getEncoder().encodeToString(data);
+                    LOGGER.debug(
+                        "Embedded css in data URL of length {}",
+                        embeddedDataUrl.length()
+                    );
                     return Optional.of(embeddedDataUrl);
                 } else {
-                    LOGGER.debug("Not embedding css in data URL as the length is >= {}", MAX_IN_MEMORY_CSS_LENGTH);
+                    LOGGER.debug(
+                        "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 8100343cb5a..3ebfcfd46a8 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 d92586a615d..703dc9a9f50 100644
--- a/src/main/java/org/jabref/gui/theme/ThemeManager.java
+++ b/src/main/java/org/jabref/gui/theme/ThemeManager.java
@@ -1,5 +1,7 @@
 package org.jabref.gui.theme;
 
+import com.jthemedetecor.OsThemeDetector;
+import com.tobiasdiez.easybind.EasyBind;
 import java.io.IOException;
 import java.net.URL;
 import java.nio.file.Path;
@@ -10,17 +12,12 @@
 import java.util.Set;
 import java.util.WeakHashMap;
 import java.util.function.Consumer;
-
 import javafx.scene.Scene;
 import javafx.scene.web.WebEngine;
-
 import org.jabref.gui.util.DefaultTaskExecutor;
 import org.jabref.model.util.FileUpdateListener;
 import org.jabref.model.util.FileUpdateMonitor;
 import org.jabref.preferences.WorkspacePreferences;
-
-import com.jthemedetecor.OsThemeDetector;
-import com.tobiasdiez.easybind.EasyBind;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -39,7 +36,9 @@
  */
 public class ThemeManager {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(ThemeManager.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(
+        ThemeManager.class
+    );
 
     private final WorkspacePreferences workspacePreferences;
     private final FileUpdateMonitor fileUpdateMonitor;
@@ -49,13 +48,18 @@ public class ThemeManager {
     private Theme theme;
 
     private Scene mainWindowScene;
-    private final Set<WebEngine> webEngines = Collections.newSetFromMap(new WeakHashMap<>());
+    private final Set<WebEngine> webEngines = Collections.newSetFromMap(
+        new WeakHashMap<>()
+    );
     private final OsThemeDetector detector = OsThemeDetector.getDetector();
 
-    public ThemeManager(WorkspacePreferences workspacePreferences,
-                        FileUpdateMonitor fileUpdateMonitor,
-                        Consumer<Runnable> updateRunner) {
-        this.workspacePreferences = Objects.requireNonNull(workspacePreferences);
+    public ThemeManager(
+        WorkspacePreferences workspacePreferences,
+        FileUpdateMonitor fileUpdateMonitor,
+        Consumer<Runnable> updateRunner
+    ) {
+        this.workspacePreferences =
+            Objects.requireNonNull(workspacePreferences);
         this.fileUpdateMonitor = Objects.requireNonNull(fileUpdateMonitor);
         this.updateRunner = Objects.requireNonNull(updateRunner);
 
@@ -67,15 +71,29 @@ public ThemeManager(WorkspacePreferences workspacePreferences,
         addStylesheetToWatchlist(this.baseStyleSheet, this::baseCssLiveUpdate);
         baseCssLiveUpdate();
 
-        EasyBind.subscribe(workspacePreferences.themeProperty(), theme -> updateThemeSettings());
-        EasyBind.subscribe(workspacePreferences.themeSyncOsProperty(), theme -> updateThemeSettings());
-        EasyBind.subscribe(workspacePreferences.shouldOverrideDefaultFontSizeProperty(), should -> updateFontSettings());
-        EasyBind.subscribe(workspacePreferences.mainFontSizeProperty(), size -> updateFontSettings());
+        EasyBind.subscribe(
+            workspacePreferences.themeProperty(),
+            theme -> updateThemeSettings()
+        );
+        EasyBind.subscribe(
+            workspacePreferences.themeSyncOsProperty(),
+            theme -> updateThemeSettings()
+        );
+        EasyBind.subscribe(
+            workspacePreferences.shouldOverrideDefaultFontSizeProperty(),
+            should -> updateFontSettings()
+        );
+        EasyBind.subscribe(
+            workspacePreferences.mainFontSizeProperty(),
+            size -> updateFontSettings()
+        );
         detector.registerListener(isDark -> updateThemeSettings());
     }
 
     private void updateThemeSettings() {
-        Theme newTheme = Objects.requireNonNull(workspacePreferences.getTheme());
+        Theme newTheme = Objects.requireNonNull(
+            workspacePreferences.getTheme()
+        );
 
         if (workspacePreferences.themeSyncOsProperty().getValue()) {
             if (detector.isDark()) {
@@ -88,38 +106,63 @@ private void updateThemeSettings() {
         if (newTheme.equals(theme)) {
             LOGGER.info("Not updating theme because it hasn't changed");
         } else {
-            theme.getAdditionalStylesheet().ifPresent(this::removeStylesheetFromWatchList);
+            theme
+                .getAdditionalStylesheet()
+                .ifPresent(this::removeStylesheetFromWatchList);
         }
 
         this.theme = newTheme;
-        LOGGER.info("Theme set to {} with base css {}", newTheme, baseStyleSheet);
+        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();
     }
 
     private void updateFontSettings() {
-        DefaultTaskExecutor.runInJavaFXThread(() -> updateRunner.accept(() -> getMainWindowScene().ifPresent(this::updateFontStyle)));
+        DefaultTaskExecutor.runInJavaFXThread(() ->
+            updateRunner.accept(() ->
+                getMainWindowScene().ifPresent(this::updateFontStyle)
+            )
+        );
     }
 
     private void removeStylesheetFromWatchList(StyleSheet styleSheet) {
         Path oldPath = styleSheet.getWatchPath();
         if (oldPath != null) {
-            fileUpdateMonitor.removeListener(oldPath, this::additionalCssLiveUpdate);
+            fileUpdateMonitor.removeListener(
+                oldPath,
+                this::additionalCssLiveUpdate
+            );
             LOGGER.info("No longer watch css {} for live updates", oldPath);
         }
     }
 
-    private void addStylesheetToWatchlist(StyleSheet styleSheet, FileUpdateListener updateMethod) {
+    private void addStylesheetToWatchlist(
+        StyleSheet styleSheet,
+        FileUpdateListener updateMethod
+    ) {
         Path watchPath = styleSheet.getWatchPath();
         if (watchPath != null) {
             try {
                 fileUpdateMonitor.addListenerForFile(watchPath, updateMethod);
                 LOGGER.info("Watching css {} for live updates", watchPath);
             } catch (IOException e) {
-                LOGGER.warn("Cannot watch css path {} for live updates", watchPath, e);
+                LOGGER.warn(
+                    "Cannot watch css path {} for live updates",
+                    watchPath,
+                    e
+                );
             }
         }
     }
@@ -132,56 +175,84 @@ private void baseCssLiveUpdate() {
             LOGGER.debug("Updating base CSS for main window scene");
         }
 
-        DefaultTaskExecutor.runInJavaFXThread(() -> updateRunner.accept(this::updateBaseCss));
+        DefaultTaskExecutor.runInJavaFXThread(() ->
+            updateRunner.accept(this::updateBaseCss)
+        );
     }
 
     private void additionalCssLiveUpdate() {
-        final String newStyleSheetLocation = this.theme.getAdditionalStylesheet().map(styleSheet -> {
-            styleSheet.reload();
-            return styleSheet.getWebEngineStylesheet();
-        }).orElse("");
+        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());
+        LOGGER.debug(
+            "Updating additional CSS for main window scene and {} web engines",
+            webEngines.size()
+        );
 
         DefaultTaskExecutor.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);
-                    });
-                })
+            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() {
-        getMainWindowScene().ifPresent(scene -> {
-            List<String> stylesheets = scene.getStylesheets();
-            if (!stylesheets.isEmpty()) {
-                stylesheets.remove(0);
-            }
-
-            stylesheets.add(0, baseStyleSheet.getSceneStylesheet().toExternalForm());
-        });
+        getMainWindowScene()
+            .ifPresent(scene -> {
+                List<String> stylesheets = scene.getStylesheets();
+                if (!stylesheets.isEmpty()) {
+                    stylesheets.remove(0);
+                }
+
+                stylesheets.add(
+                    0,
+                    baseStyleSheet.getSceneStylesheet().toExternalForm()
+                );
+            });
     }
 
     private void updateAdditionalCss() {
-        getMainWindowScene().ifPresent(scene -> scene.getStylesheets().setAll(List.of(
-                baseStyleSheet.getSceneStylesheet().toExternalForm(),
-                theme.getAdditionalStylesheet().map(styleSheet -> {
-                         URL stylesheetUrl = styleSheet.getSceneStylesheet();
-                         if (stylesheetUrl != null) {
-                             return stylesheetUrl.toExternalForm();
-                         } else {
-                             return "";
-                         }
-                     })
-                     .orElse("")
-        )));
+        getMainWindowScene()
+            .ifPresent(scene ->
+                scene
+                    .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,8 +279,13 @@ public void installCss(Scene mainWindowScene) {
     public void installCss(WebEngine webEngine) {
         updateRunner.accept(() -> {
             if (this.webEngines.add(webEngine)) {
-                webEngine.setUserStyleSheetLocation(this.theme.getAdditionalStylesheet().isPresent() ?
-                        this.theme.getAdditionalStylesheet().get().getWebEngineStylesheet() : "");
+                webEngine.setUserStyleSheetLocation(
+                    this.theme.getAdditionalStylesheet().isPresent()
+                        ? this.theme.getAdditionalStylesheet()
+                            .get()
+                            .getWebEngineStylesheet()
+                        : ""
+                );
             }
         });
     }
@@ -222,9 +298,21 @@ public void installCss(WebEngine webEngine) {
      */
     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 73523ae9c47..6032990ad15 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 d5f4fa0663f..3c9b6c2cee3 100644
--- a/src/main/java/org/jabref/gui/undo/AbstractUndoableJabRefEdit.java
+++ b/src/main/java/org/jabref/gui/undo/AbstractUndoableJabRefEdit.java
@@ -1,18 +1,29 @@
 package org.jabref.gui.undo;
 
 import javax.swing.undo.AbstractUndoableEdit;
-
 import org.jabref.logic.l10n.Localization;
 
 public class AbstractUndoableJabRefEdit extends AbstractUndoableEdit {
 
     @Override
     public String getUndoPresentationName() {
-        return "<html>" + Localization.lang("Undo") + ": " + getPresentationName() + "</html>";
+        return (
+            "<html>" +
+            Localization.lang("Undo") +
+            ": " +
+            getPresentationName() +
+            "</html>"
+        );
     }
 
     @Override
     public String getRedoPresentationName() {
-        return "<html>" + Localization.lang("Redo") + ": " + getPresentationName() + "</html>";
+        return (
+            "<html>" +
+            Localization.lang("Redo") +
+            ": " +
+            getPresentationName() +
+            "</html>"
+        );
     }
 }
diff --git a/src/main/java/org/jabref/gui/undo/CountingUndoManager.java b/src/main/java/org/jabref/gui/undo/CountingUndoManager.java
index 75a044a6a1f..36ab3250679 100644
--- a/src/main/java/org/jabref/gui/undo/CountingUndoManager.java
+++ b/src/main/java/org/jabref/gui/undo/CountingUndoManager.java
@@ -1,15 +1,13 @@
 package org.jabref.gui.undo;
 
+import com.google.common.eventbus.EventBus;
 import javax.swing.undo.CannotUndoException;
 import javax.swing.undo.UndoManager;
 import javax.swing.undo.UndoableEdit;
-
 import org.jabref.logic.l10n.Localization;
 import org.jabref.logic.undo.AddUndoableActionEvent;
 import org.jabref.logic.undo.UndoRedoEvent;
 
-import com.google.common.eventbus.EventBus;
-
 public class CountingUndoManager extends UndoManager {
 
     private int unchangedPoint;
@@ -59,14 +57,26 @@ public void unregisterListener(Object object) {
     public void postUndoRedoEvent() {
         boolean canRedo = this.canRedo();
         boolean canUndo = this.canUndo();
-        eventBus.post(new UndoRedoEvent(canUndo, canUndo ? getUndoPresentationName() : Localization.lang("Undo"),
-                canRedo, canRedo ? getRedoPresentationName() : Localization.lang("Redo")));
+        eventBus.post(
+            new UndoRedoEvent(
+                canUndo,
+                canUndo ? getUndoPresentationName() : Localization.lang("Undo"),
+                canRedo,
+                canRedo ? getRedoPresentationName() : Localization.lang("Redo")
+            )
+        );
     }
 
     private void postAddUndoEvent() {
         boolean canRedo = this.canRedo();
         boolean canUndo = this.canUndo();
-        eventBus.post(new AddUndoableActionEvent(canUndo, canUndo ? getUndoPresentationName() : Localization.lang("Undo"),
-                canRedo, canRedo ? getRedoPresentationName() : Localization.lang("Redo")));
+        eventBus.post(
+            new AddUndoableActionEvent(
+                canUndo,
+                canUndo ? getUndoPresentationName() : Localization.lang("Undo"),
+                canRedo,
+                canRedo ? getRedoPresentationName() : Localization.lang("Redo")
+            )
+        );
     }
 }
diff --git a/src/main/java/org/jabref/gui/undo/NamedCompound.java b/src/main/java/org/jabref/gui/undo/NamedCompound.java
index 55be19a96e3..069750e3f46 100644
--- a/src/main/java/org/jabref/gui/undo/NamedCompound.java
+++ b/src/main/java/org/jabref/gui/undo/NamedCompound.java
@@ -2,7 +2,6 @@
 
 import javax.swing.undo.CompoundEdit;
 import javax.swing.undo.UndoableEdit;
-
 import org.jabref.logic.l10n.Localization;
 
 public class NamedCompound extends CompoundEdit {
@@ -27,12 +26,28 @@ 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/UndoRedoAction.java b/src/main/java/org/jabref/gui/undo/UndoRedoAction.java
index 9515bda0654..5bfad338bb1 100644
--- a/src/main/java/org/jabref/gui/undo/UndoRedoAction.java
+++ b/src/main/java/org/jabref/gui/undo/UndoRedoAction.java
@@ -2,7 +2,6 @@
 
 import javax.swing.undo.CannotRedoException;
 import javax.swing.undo.CannotUndoException;
-
 import org.jabref.gui.DialogService;
 import org.jabref.gui.JabRefFrame;
 import org.jabref.gui.LibraryTab;
@@ -11,19 +10,25 @@
 import org.jabref.gui.actions.SimpleCommand;
 import org.jabref.gui.actions.StandardActions;
 import org.jabref.logic.l10n.Localization;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 public class UndoRedoAction extends SimpleCommand {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(UndoRedoAction.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(
+        UndoRedoAction.class
+    );
 
     private final StandardActions action;
     private final JabRefFrame frame;
     private DialogService dialogService;
 
-    public UndoRedoAction(StandardActions action, JabRefFrame frame, DialogService dialogService, StateManager stateManager) {
+    public UndoRedoAction(
+        StandardActions action,
+        JabRefFrame frame,
+        DialogService dialogService,
+        StateManager stateManager
+    ) {
         this.action = action;
         this.frame = frame;
         this.dialogService = dialogService;
@@ -42,7 +47,9 @@ public void execute() {
                 libraryTab.markBaseChanged();
                 dialogService.notify(Localization.lang("Undo"));
             } catch (CannotUndoException ex) {
-                dialogService.notify(Localization.lang("Nothing to undo") + '.');
+                dialogService.notify(
+                    Localization.lang("Nothing to undo") + '.'
+                );
             }
             frame.getCurrentLibraryTab().markChangedOrUnChanged();
         } else if (action == StandardActions.REDO) {
@@ -51,7 +58,9 @@ public void execute() {
                 libraryTab.markBaseChanged();
                 dialogService.notify(Localization.lang("Redo"));
             } catch (CannotRedoException ex) {
-                dialogService.notify(Localization.lang("Nothing to redo") + '.');
+                dialogService.notify(
+                    Localization.lang("Nothing to redo") + '.'
+                );
             }
 
             libraryTab.markChangedOrUnChanged();
diff --git a/src/main/java/org/jabref/gui/undo/UndoableChangeType.java b/src/main/java/org/jabref/gui/undo/UndoableChangeType.java
index 05d29f902e8..19edc2b6dce 100644
--- a/src/main/java/org/jabref/gui/undo/UndoableChangeType.java
+++ b/src/main/java/org/jabref/gui/undo/UndoableChangeType.java
@@ -11,15 +11,24 @@
  * This class represents the change of type for an entry.
  */
 public class UndoableChangeType extends AbstractUndoableJabRefEdit {
+
     private final EntryType oldType;
     private final EntryType newType;
     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) {
+    public UndoableChangeType(
+        BibEntry entry,
+        EntryType oldType,
+        EntryType newType
+    ) {
         this.oldType = oldType;
         this.newType = newType;
         this.entry = entry;
@@ -27,10 +36,17 @@ public UndoableChangeType(BibEntry entry, EntryType oldType, EntryType newType)
 
     @Override
     public String getPresentationName() {
-        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()));
+        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())
+        );
     }
 
     @Override
diff --git a/src/main/java/org/jabref/gui/undo/UndoableFieldChange.java b/src/main/java/org/jabref/gui/undo/UndoableFieldChange.java
index efb96c70020..2d5b172d3bc 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;
 
@@ -15,14 +14,22 @@
  * new value. Old/new values can be null.
  */
 public class UndoableFieldChange extends AbstractUndoableJabRefEdit {
-    private static final Logger LOGGER = LoggerFactory.getLogger(UndoableFieldChange.class);
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(
+        UndoableFieldChange.class
+    );
 
     private final BibEntry entry;
     private final Field field;
     private final String oldValue;
     private final String newValue;
 
-    public UndoableFieldChange(BibEntry entry, Field field, String oldValue, String newValue) {
+    public UndoableFieldChange(
+        BibEntry entry,
+        Field field,
+        String oldValue,
+        String newValue
+    ) {
         this.entry = entry;
         this.field = field;
         this.oldValue = oldValue;
@@ -30,15 +37,25 @@ public UndoableFieldChange(BibEntry entry, Field field, String oldValue, String
     }
 
     public UndoableFieldChange(FieldChange change) {
-        this(change.getEntry(), change.getField(), change.getOldValue(), change.getNewValue());
+        this(
+            change.getEntry(),
+            change.getField(),
+            change.getOldValue(),
+            change.getNewValue()
+        );
     }
 
     @Override
     public String getPresentationName() {
-        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")));
+        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"))
+        );
     }
 
     @Override
@@ -52,7 +69,6 @@ public void undo() {
             } else {
                 entry.setField(field, oldValue);
             }
-
             // this is the only exception explicitly thrown here
         } catch (IllegalArgumentException ex) {
             LOGGER.info("Cannot perform undo", ex);
diff --git a/src/main/java/org/jabref/gui/undo/UndoableInsertEntries.java b/src/main/java/org/jabref/gui/undo/UndoableInsertEntries.java
index 3af516b94c1..9c1264c5143 100644
--- a/src/main/java/org/jabref/gui/undo/UndoableInsertEntries.java
+++ b/src/main/java/org/jabref/gui/undo/UndoableInsertEntries.java
@@ -2,12 +2,10 @@
 
 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;
 
@@ -18,7 +16,9 @@
  */
 public class UndoableInsertEntries extends AbstractUndoableJabRefEdit {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(UndoableInsertEntries.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(
+        UndoableInsertEntries.class
+    );
     private final BibDatabase database;
     private final List<BibEntry> entries;
     private final boolean paste;
@@ -31,7 +31,11 @@ public UndoableInsertEntries(BibDatabase database, List<BibEntry> entries) {
         this(database, entries, false);
     }
 
-    public UndoableInsertEntries(BibDatabase database, List<BibEntry> entries, boolean paste) {
+    public UndoableInsertEntries(
+        BibDatabase database,
+        List<BibEntry> entries,
+        boolean paste
+    ) {
         this.database = database;
         this.entries = entries;
         this.paste = paste;
@@ -43,8 +47,15 @@ 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.get(0).getCitationKey().orElse(Localization.lang("undefined"))));
+                return Localization.lang(
+                    "paste entry %0",
+                    StringUtil.boldHTML(
+                        entries
+                            .get(0)
+                            .getCitationKey()
+                            .orElse(Localization.lang("undefined"))
+                    )
+                );
             } else {
                 return null;
             }
@@ -52,8 +63,15 @@ 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.get(0).getCitationKey().orElse(Localization.lang("undefined"))));
+                return Localization.lang(
+                    "insert entry %0",
+                    StringUtil.boldHTML(
+                        entries
+                            .get(0)
+                            .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 6485861abbe..aee395f42ea 100644
--- a/src/main/java/org/jabref/gui/undo/UndoableInsertString.java
+++ b/src/main/java/org/jabref/gui/undo/UndoableInsertString.java
@@ -5,13 +5,14 @@
 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;
 
 public class UndoableInsertString extends AbstractUndoableJabRefEdit {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(UndoableInsertString.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(
+        UndoableInsertString.class
+    );
 
     private final BibDatabase base;
     private final BibtexString string;
@@ -23,7 +24,10 @@ public UndoableInsertString(BibDatabase base, BibtexString string) {
 
     @Override
     public String getPresentationName() {
-        return Localization.lang("insert string %0", StringUtil.boldHTML(string.toString()));
+        return Localization.lang(
+            "insert string %0",
+            StringUtil.boldHTML(string.toString())
+        );
     }
 
     @Override
diff --git a/src/main/java/org/jabref/gui/undo/UndoableKeyChange.java b/src/main/java/org/jabref/gui/undo/UndoableKeyChange.java
index 8b37869d6a8..7d55592b34f 100644
--- a/src/main/java/org/jabref/gui/undo/UndoableKeyChange.java
+++ b/src/main/java/org/jabref/gui/undo/UndoableKeyChange.java
@@ -28,9 +28,11 @@ public UndoableKeyChange(BibEntry entry, String oldValue, String newValue) {
 
     @Override
     public String getPresentationName() {
-        return Localization.lang("change key from %0 to %1",
-                StringUtil.boldHTML(oldValue, Localization.lang("undefined")),
-                StringUtil.boldHTML(newValue, Localization.lang("undefined")));
+        return Localization.lang(
+            "change key from %0 to %1",
+            StringUtil.boldHTML(oldValue, Localization.lang("undefined")),
+            StringUtil.boldHTML(newValue, Localization.lang("undefined"))
+        );
     }
 
     @Override
diff --git a/src/main/java/org/jabref/gui/undo/UndoablePreambleChange.java b/src/main/java/org/jabref/gui/undo/UndoablePreambleChange.java
index 10d89179eaf..67e05b211d3 100644
--- a/src/main/java/org/jabref/gui/undo/UndoablePreambleChange.java
+++ b/src/main/java/org/jabref/gui/undo/UndoablePreambleChange.java
@@ -12,8 +12,11 @@ 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 65b6ae48331..7351a9d4338 100644
--- a/src/main/java/org/jabref/gui/undo/UndoableRemoveEntries.java
+++ b/src/main/java/org/jabref/gui/undo/UndoableRemoveEntries.java
@@ -2,13 +2,11 @@
 
 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;
 
@@ -21,7 +19,9 @@
  */
 public class UndoableRemoveEntries extends AbstractUndoableJabRefEdit {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(UndoableRemoveEntries.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(
+        UndoableRemoveEntries.class
+    );
     private final BibDatabase base;
     private final List<BibEntry> entries;
     private final boolean cut;
@@ -34,7 +34,11 @@ public UndoableRemoveEntries(BibDatabase base, List<BibEntry> entries) {
         this(base, entries, false);
     }
 
-    public UndoableRemoveEntries(BibDatabase base, List<BibEntry> entries, boolean cut) {
+    public UndoableRemoveEntries(
+        BibDatabase base,
+        List<BibEntry> entries,
+        boolean cut
+    ) {
         this.base = base;
         this.entries = entries;
         this.cut = cut;
@@ -46,8 +50,15 @@ 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.get(0).getCitationKey().orElse(Localization.lang("undefined"))));
+                return Localization.lang(
+                    "cut entry %0",
+                    StringUtil.boldHTML(
+                        entries
+                            .get(0)
+                            .getCitationKey()
+                            .orElse(Localization.lang("undefined"))
+                    )
+                );
             } else {
                 return null;
             }
@@ -55,8 +66,15 @@ 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.get(0).getCitationKey().orElse(Localization.lang("undefined"))));
+                return Localization.lang(
+                    "remove entry %0",
+                    StringUtil.boldHTML(
+                        entries
+                            .get(0)
+                            .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 2c086ed3cf0..9babbdf2f97 100644
--- a/src/main/java/org/jabref/gui/undo/UndoableRemoveString.java
+++ b/src/main/java/org/jabref/gui/undo/UndoableRemoveString.java
@@ -5,13 +5,14 @@
 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;
 
 public class UndoableRemoveString extends AbstractUndoableJabRefEdit {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(UndoableRemoveString.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(
+        UndoableRemoveString.class
+    );
     private final BibDatabase base;
     private final BibtexString string;
 
@@ -22,7 +23,10 @@ public UndoableRemoveString(BibDatabase base, BibtexString string) {
 
     @Override
     public String getPresentationName() {
-        return Localization.lang("remove string %0", StringUtil.boldHTML(string.toString()));
+        return Localization.lang(
+            "remove string %0",
+            StringUtil.boldHTML(string.toString())
+        );
     }
 
     @Override
diff --git a/src/main/java/org/jabref/gui/undo/UndoableStringChange.java b/src/main/java/org/jabref/gui/undo/UndoableStringChange.java
index 883f1675750..451ccae1e31 100644
--- a/src/main/java/org/jabref/gui/undo/UndoableStringChange.java
+++ b/src/main/java/org/jabref/gui/undo/UndoableStringChange.java
@@ -11,7 +11,12 @@ 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,10 +25,17 @@ 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",
-                        StringUtil.boldHTML(oldValue), StringUtil.boldHTML(newValue));
+        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)
+            );
     }
 
     @Override
diff --git a/src/main/java/org/jabref/gui/util/BackgroundTask.java b/src/main/java/org/jabref/gui/util/BackgroundTask.java
index 9e6fe46980c..824eaa9474d 100644
--- a/src/main/java/org/jabref/gui/util/BackgroundTask.java
+++ b/src/main/java/org/jabref/gui/util/BackgroundTask.java
@@ -1,11 +1,12 @@
 package org.jabref.gui.util;
 
+import com.google.common.collect.ImmutableMap;
+import com.tobiasdiez.easybind.EasyBind;
 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 javafx.beans.property.BooleanProperty;
 import javafx.beans.property.DoubleProperty;
 import javafx.beans.property.ObjectProperty;
@@ -16,13 +17,9 @@
 import javafx.beans.property.StringProperty;
 import javafx.concurrent.Task;
 import javafx.scene.Node;
-
 import org.jabref.gui.icon.IconTheme;
 import org.jabref.logic.l10n.Localization;
 
-import com.google.common.collect.ImmutableMap;
-import com.tobiasdiez.easybind.EasyBind;
-
 /**
  * This class is essentially a wrapper around {@link Task}.
  * We cannot use {@link Task} directly since it runs certain update notifications on the JavaFX thread,
@@ -34,7 +31,8 @@
 public abstract class BackgroundTask<V> {
 
     public static ImmutableMap<String, Node> iconMap = ImmutableMap.of(
-            Localization.lang("Downloading"), IconTheme.JabRefIcons.DOWNLOAD.getGraphicNode()
+        Localization.lang("Downloading"),
+        IconTheme.JabRefIcons.DOWNLOAD.getGraphicNode()
     );
 
     private Runnable onRunning;
@@ -42,15 +40,26 @@ public abstract class BackgroundTask<V> {
     private Consumer<Exception> onException;
     private Runnable onFinished;
     private final BooleanProperty isCanceled = 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);
+    private final StringProperty title = new SimpleStringProperty(
+        this.getClass().getSimpleName()
+    );
+    private final DoubleProperty workDonePercentage = new SimpleDoubleProperty(
+        0
+    );
     private final BooleanProperty showToUser = new SimpleBooleanProperty(false);
-    private final BooleanProperty willBeRecoveredAutomatically = new SimpleBooleanProperty(false);
+    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) {
@@ -135,7 +144,9 @@ public boolean willBeRecoveredAutomatically() {
         return willBeRecoveredAutomatically.get();
     }
 
-    public void willBeRecoveredAutomatically(boolean willBeRecoveredAutomatically) {
+    public void willBeRecoveredAutomatically(
+        boolean willBeRecoveredAutomatically
+    ) {
         this.willBeRecoveredAutomatically.set(willBeRecoveredAutomatically);
     }
 
@@ -183,7 +194,11 @@ public Future<?> executeWith(TaskExecutor taskExecutor) {
         return taskExecutor.execute(this);
     }
 
-    public Future<?> scheduleWith(TaskExecutor taskExecutor, long delay, TimeUnit unit) {
+    public Future<?> scheduleWith(
+        TaskExecutor taskExecutor,
+        long delay,
+        TimeUnit unit
+    ) {
         return taskExecutor.schedule(this, delay, unit);
     }
 
@@ -202,13 +217,18 @@ public BackgroundTask<V> onFinished(Runnable onFinished) {
      * @param nextTaskFactory the function that creates the new task
      * @param <T>             type of the return value of the second task
      */
-    public <T> BackgroundTask<T> then(Function<V, BackgroundTask<T>> nextTaskFactory) {
+    public <T> BackgroundTask<T> then(
+        Function<V, BackgroundTask<T>> nextTaskFactory
+    ) {
         return new BackgroundTask<>() {
             @Override
             protected T call() throws Exception {
                 V result = BackgroundTask.this.call();
                 BackgroundTask<T> nextTask = nextTaskFactory.apply(result);
-                EasyBind.subscribe(nextTask.progressProperty(), this::updateProgress);
+                EasyBind.subscribe(
+                    nextTask.progressProperty(),
+                    this::updateProgress
+                );
                 return nextTask.call();
             }
         };
@@ -225,8 +245,13 @@ public <T> BackgroundTask<T> thenRun(Function<V, T> nextOperation) {
             @Override
             protected T call() throws Exception {
                 V result = BackgroundTask.this.call();
-                BackgroundTask<T> nextTask = BackgroundTask.wrap(() -> nextOperation.apply(result));
-                EasyBind.subscribe(nextTask.progressProperty(), this::updateProgress);
+                BackgroundTask<T> nextTask = BackgroundTask.wrap(() ->
+                    nextOperation.apply(result)
+                );
+                EasyBind.subscribe(
+                    nextTask.progressProperty(),
+                    this::updateProgress
+                );
                 return nextTask.call();
             }
         };
@@ -242,8 +267,13 @@ public BackgroundTask<Void> thenRun(Consumer<V> nextOperation) {
             @Override
             protected Void call() throws Exception {
                 V result = BackgroundTask.this.call();
-                BackgroundTask<Void> nextTask = BackgroundTask.wrap(() -> nextOperation.accept(result));
-                EasyBind.subscribe(nextTask.progressProperty(), this::updateProgress);
+                BackgroundTask<Void> nextTask = BackgroundTask.wrap(() ->
+                    nextOperation.accept(result)
+                );
+                EasyBind.subscribe(
+                    nextTask.progressProperty(),
+                    this::updateProgress
+                );
                 return nextTask.call();
             }
         };
diff --git a/src/main/java/org/jabref/gui/util/BaseDialog.java b/src/main/java/org/jabref/gui/util/BaseDialog.java
index 721fcb377cf..2b49e9762b8 100644
--- a/src/main/java/org/jabref/gui/util/BaseDialog.java
+++ b/src/main/java/org/jabref/gui/util/BaseDialog.java
@@ -1,52 +1,69 @@
 package org.jabref.gui.util;
 
 import java.util.Optional;
-
 import javafx.scene.control.Button;
 import javafx.scene.control.ButtonType;
 import javafx.scene.control.Dialog;
 import javafx.scene.image.Image;
 import javafx.scene.input.KeyCode;
 import javafx.stage.Stage;
-
 import org.jabref.gui.Globals;
 import org.jabref.gui.icon.IconTheme;
 import org.jabref.gui.keyboard.KeyBinding;
 import org.jabref.gui.keyboard.KeyBindingRepository;
 
-public class BaseDialog<T> extends Dialog<T> implements org.jabref.gui.Dialog<T> {
+public class BaseDialog<T>
+    extends Dialog<T>
+    implements org.jabref.gui.Dialog<T> {
 
     protected BaseDialog() {
-        getDialogPane().getScene().setOnKeyPressed(event -> {
-            KeyBindingRepository keyBindingRepository = Globals.getKeyPrefs();
-            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 =
+                    Globals.getKeyPrefs();
+                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);
     }
 
     private Optional<Button> getDefaultButton() {
-        return Optional.ofNullable((Button) getDialogPane().lookupButton(getDefaultButtonType()));
+        return Optional.ofNullable(
+            (Button) getDialogPane().lookupButton(getDefaultButtonType())
+        );
     }
 
     private ButtonType getDefaultButtonType() {
-        return getDialogPane().getButtonTypes().stream()
-                              .filter(buttonType -> buttonType.getButtonData().isDefaultButton())
-                              .findFirst()
-                              .orElse(ButtonType.OK);
+        return getDialogPane()
+            .getButtonTypes()
+            .stream()
+            .filter(buttonType -> buttonType.getButtonData().isDefaultButton())
+            .findFirst()
+            .orElse(ButtonType.OK);
     }
 
     private void setDialogIcon(Image image) {
diff --git a/src/main/java/org/jabref/gui/util/BindingsHelper.java b/src/main/java/org/jabref/gui/util/BindingsHelper.java
index 48cef619852..0cd6920e393 100644
--- a/src/main/java/org/jabref/gui/util/BindingsHelper.java
+++ b/src/main/java/org/jabref/gui/util/BindingsHelper.java
@@ -1,10 +1,12 @@
 package org.jabref.gui.util;
 
+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;
-
 import javafx.beans.binding.BooleanBinding;
 import javafx.beans.binding.ObjectBinding;
 import javafx.beans.binding.StringBinding;
@@ -20,28 +22,34 @@
 import javafx.css.PseudoClass;
 import javafx.scene.Node;
 
-import com.tobiasdiez.easybind.EasyBind;
-import com.tobiasdiez.easybind.PreboundBinding;
-import com.tobiasdiez.easybind.Subscription;
-
 /**
  * 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);
-        Subscription subscription = EasyBind.subscribe(condition, changePseudoClass);
+    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
         changePseudoClass.accept(condition.getValue());
         return subscription;
     }
 
-    public static <T, U> ObservableList<U> map(ObservableValue<T> source, Function<T, List<U>> mapper) {
+    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() {
@@ -50,31 +58,54 @@ protected List<U> computeValue() {
         };
 
         ObservableList<U> list = FXCollections.observableArrayList();
-        binding.addListener((observable, oldValue, newValue) -> list.setAll(newValue));
+        binding.addListener((observable, oldValue, newValue) ->
+            list.setAll(newValue)
+        );
         return list;
     }
 
     /**
      * 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) {
-        Consumer<B> updateA = newValueB -> propertyA.setValue(mapBtoA.apply(newValueB));
-        Consumer<A> updateB = newValueA -> propertyB.setValue(mapAtoB.apply(newValueA));
+    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);
     }
 
     /**
      * 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 +114,33 @@ 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 +149,33 @@ 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) {
-        Consumer<B> updateList = newValueB -> listProperty.setAll(mapToList.apply(newValueB));
-        Consumer<List<A>> updateB = newValueList -> property.setValue(mapToB.apply(newValueList));
-
-        bindContentBidirectional(
-                listProperty,
-                property,
-                updateList,
-                updateB);
+    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);
     }
 
-    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 +184,15 @@ 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 +229,21 @@ 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 +254,12 @@ 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 +271,12 @@ 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;
@@ -210,15 +290,27 @@ public ChangeListener<? super B> getChangeListenerB() {
             return this::changedB;
         }
 
-        public void changedA(ObservableValue<? extends A> observable, A oldValue, A newValue) {
+        public void changedA(
+            ObservableValue<? extends A> observable,
+            A oldValue,
+            A newValue
+        ) {
             updateLocked(updateB, oldValue, newValue);
         }
 
-        public void changedB(ObservableValue<? extends B> observable, B oldValue, B newValue) {
+        public void changedB(
+            ObservableValue<? extends B> observable,
+            B oldValue,
+            B newValue
+        ) {
             updateLocked(updateA, oldValue, newValue);
         }
 
-        private <T> void updateLocked(Consumer<T> update, T oldValue, T newValue) {
+        private <T> void updateLocked(
+            Consumer<T> update,
+            T oldValue,
+            T newValue
+        ) {
             if (!updating) {
                 try {
                     updating = true;
@@ -230,7 +322,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 +331,12 @@ 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;
@@ -246,7 +344,11 @@ public BidirectionalListBinding(ObservableList<A> listProperty, ObservableValue<
         }
 
         @Override
-        public void changed(ObservableValue<? extends B> observable, B oldValue, B newValue) {
+        public void changed(
+            ObservableValue<? extends B> observable,
+            B oldValue,
+            B newValue
+        ) {
             if (!updating) {
                 try {
                     updating = true;
@@ -270,7 +372,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 +381,12 @@ 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;
@@ -286,7 +394,11 @@ public BidirectionalMapBinding(ObservableMap<A, V> mapProperty, ObservableValue<
         }
 
         @Override
-        public void changed(ObservableValue<? extends B> observable, B oldValue, B newValue) {
+        public void changed(
+            ObservableValue<? extends B> observable,
+            B oldValue,
+            B newValue
+        ) {
             if (!updating) {
                 try {
                     updating = true;
diff --git a/src/main/java/org/jabref/gui/util/ColorUtil.java b/src/main/java/org/jabref/gui/util/ColorUtil.java
index 326c7f0f27d..51cc87c43c4 100644
--- a/src/main/java/org/jabref/gui/util/ColorUtil.java
+++ b/src/main/java/org/jabref/gui/util/ColorUtil.java
@@ -5,21 +5,30 @@
 public class ColorUtil {
 
     public static String toRGBCode(Color color) {
-        return String.format("#%02X%02X%02X",
-                (int) (color.getRed() * 255),
-                (int) (color.getGreen() * 255),
-                (int) (color.getBlue() * 255));
+        return String.format(
+            "#%02X%02X%02X",
+            (int) (color.getRed() * 255),
+            (int) (color.getGreen() * 255),
+            (int) (color.getBlue() * 255)
+        );
     }
 
     public static String toRGBACode(Color color) {
-        return String.format("rgba(%d,%d,%d,%f)",
-                (int) (color.getRed() * 255),
-                (int) (color.getGreen() * 255),
-                (int) (color.getBlue() * 255),
-                color.getOpacity());
+        return String.format(
+            "rgba(%d,%d,%d,%f)",
+            (int) (color.getRed() * 255),
+            (int) (color.getGreen() * 255),
+            (int) (color.getBlue() * 255),
+            color.getOpacity()
+        );
     }
 
     public static String toHex(Color validFieldBackgroundColor) {
-        return String.format("#%02x%02x%02x", (int) validFieldBackgroundColor.getRed(), (int) validFieldBackgroundColor.getGreen(), (int) validFieldBackgroundColor.getBlue());
+        return String.format(
+            "#%02x%02x%02x",
+            (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 b4320a6bda3..e7c4490c6ab 100644
--- a/src/main/java/org/jabref/gui/util/ControlHelper.java
+++ b/src/main/java/org/jabref/gui/util/ControlHelper.java
@@ -2,7 +2,6 @@
 
 import java.util.function.Consumer;
 import java.util.function.UnaryOperator;
-
 import javafx.css.PseudoClass;
 import javafx.event.ActionEvent;
 import javafx.event.Event;
@@ -17,28 +16,51 @@
 public class ControlHelper {
 
     // Pseudo-classes for drag and drop
-    private static PseudoClass dragOverBottom = PseudoClass.getPseudoClass("dragOver-bottom");
-    private static PseudoClass dragOverCenter = PseudoClass.getPseudoClass("dragOver-center");
-    private static PseudoClass dragOverTop = PseudoClass.getPseudoClass("dragOver-top");
-
-    public enum EllipsisPosition { BEGINNING, CENTER, ENDING }
+    private static PseudoClass dragOverBottom = PseudoClass.getPseudoClass(
+        "dragOver-bottom"
+    );
+    private static PseudoClass dragOverCenter = PseudoClass.getPseudoClass(
+        "dragOver-center"
+    );
+    private static PseudoClass dragOverTop = PseudoClass.getPseudoClass(
+        "dragOver-top"
+    );
+
+    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) {
-                return childIsFocused((Parent) child);
-            } else {
-                return child.isFocused();
-            }
-        });
+        return (
+            node.isFocused() ||
+            node
+                .getChildrenUnmodifiable()
+                .stream()
+                .anyMatch(child -> {
+                    if (child instanceof Parent) {
+                        return childIsFocused((Parent) child);
+                    } else {
+                        return child.isFocused();
+                    }
+                })
+        );
     }
 
     /**
@@ -57,7 +79,10 @@ public static TextFormatter<String> getIntegerTextFormatter() {
         return new TextFormatter<>(filter);
     }
 
-    public static void removePseudoClasses(Cell<?> cell, PseudoClass... pseudoClasses) {
+    public static void removePseudoClasses(
+        Cell<?> cell,
+        PseudoClass... pseudoClasses
+    ) {
         for (PseudoClass pseudoClass : pseudoClasses) {
             cell.pseudoClassStateChanged(pseudoClass, false);
         }
@@ -66,7 +91,10 @@ public static void removePseudoClasses(Cell<?> cell, PseudoClass... pseudoClasse
     /**
      * Determines where the mouse is in the given cell.
      */
-    public static DroppingMouseLocation getDroppingMouseLocation(Cell<?> cell, DragEvent event) {
+    public static DroppingMouseLocation getDroppingMouseLocation(
+        Cell<?> cell,
+        DragEvent event
+    ) {
         if ((cell.getHeight() * 0.25) > event.getY()) {
             return DroppingMouseLocation.TOP;
         } else if ((cell.getHeight() * 0.75) < event.getY()) {
@@ -111,7 +139,12 @@ 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 +163,30 @@ 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/CurrentThreadTaskExecutor.java b/src/main/java/org/jabref/gui/util/CurrentThreadTaskExecutor.java
index e615225f715..77f19952e61 100644
--- a/src/main/java/org/jabref/gui/util/CurrentThreadTaskExecutor.java
+++ b/src/main/java/org/jabref/gui/util/CurrentThreadTaskExecutor.java
@@ -6,11 +6,8 @@
 import java.util.concurrent.Future;
 import java.util.concurrent.TimeUnit;
 import java.util.function.Consumer;
-
 import javafx.concurrent.Task;
-
 import org.jabref.logic.util.DelayTaskThrottler;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -21,8 +18,11 @@
  */
 public class CurrentThreadTaskExecutor implements TaskExecutor {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(CurrentThreadTaskExecutor.class);
-    private final WeakHashMap<DelayTaskThrottler, Void> throttlers = new WeakHashMap<>();
+    private static final Logger LOGGER = LoggerFactory.getLogger(
+        CurrentThreadTaskExecutor.class
+    );
+    private final WeakHashMap<DelayTaskThrottler, Void> throttlers =
+        new WeakHashMap<>();
 
     /**
      * Executes the task on the current thread. The code is essentially taken from {@link
@@ -58,7 +58,11 @@ public <V> Future<V> execute(Task<V> task) {
     }
 
     @Override
-    public <V> Future<?> schedule(BackgroundTask<V> task, long delay, TimeUnit unit) {
+    public <V> Future<?> schedule(
+        BackgroundTask<V> task,
+        long delay,
+        TimeUnit unit
+    ) {
         return execute(task);
     }
 
@@ -75,6 +79,7 @@ public DelayTaskThrottler createThrottler(int delay) {
     }
 
     private static class FailedFuture<T> implements Future<T> {
+
         private final Throwable exception;
 
         FailedFuture(Throwable exception) {
diff --git a/src/main/java/org/jabref/gui/util/CustomLocalDragboard.java b/src/main/java/org/jabref/gui/util/CustomLocalDragboard.java
index 7a35d42e311..475d1bf777d 100644
--- a/src/main/java/org/jabref/gui/util/CustomLocalDragboard.java
+++ b/src/main/java/org/jabref/gui/util/CustomLocalDragboard.java
@@ -4,7 +4,6 @@
 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;
@@ -16,7 +15,10 @@
  */
 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<>();
 
@@ -78,7 +80,10 @@ public boolean hasBibEntries() {
      * @param previewLayouts The list to put
      */
     public void putPreviewLayouts(List<PreviewLayout> previewLayouts) {
-        putValue(DragAndDropDataFormats.PREVIEWLAYOUT_LIST_CLASS, previewLayouts);
+        putValue(
+            DragAndDropDataFormats.PREVIEWLAYOUT_LIST_CLASS,
+            previewLayouts
+        );
     }
 
     /**
diff --git a/src/main/java/org/jabref/gui/util/CustomRatingSkin.java b/src/main/java/org/jabref/gui/util/CustomRatingSkin.java
index 96e6e8d75d5..f7ea44cecf0 100644
--- a/src/main/java/org/jabref/gui/util/CustomRatingSkin.java
+++ b/src/main/java/org/jabref/gui/util/CustomRatingSkin.java
@@ -1,16 +1,14 @@
 package org.jabref.gui.util;
 
-import javafx.scene.Node;
-
-import org.jabref.gui.icon.IconTheme;
-
 import impl.org.controlsfx.skin.RatingSkin;
+import javafx.scene.Node;
 import org.controlsfx.control.Rating;
+import org.jabref.gui.icon.IconTheme;
 
 public class CustomRatingSkin extends RatingSkin {
+
     public CustomRatingSkin(Rating control) {
         super(control);
-
         consumeMouseEvents(false);
     }
 
diff --git a/src/main/java/org/jabref/gui/util/CustomTitledPaneSkin.java b/src/main/java/org/jabref/gui/util/CustomTitledPaneSkin.java
index f9bc58e5aaf..0e00d333e0a 100644
--- a/src/main/java/org/jabref/gui/util/CustomTitledPaneSkin.java
+++ b/src/main/java/org/jabref/gui/util/CustomTitledPaneSkin.java
@@ -1,10 +1,11 @@
 package org.jabref.gui.util;
 
+import static javafx.css.StyleConverter.getEnumConverter;
+
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 import java.util.Objects;
-
 import javafx.beans.binding.Bindings;
 import javafx.beans.binding.DoubleBinding;
 import javafx.beans.property.ObjectProperty;
@@ -21,8 +22,6 @@
 import javafx.scene.text.Text;
 import javafx.scene.transform.Rotate;
 
-import static javafx.css.StyleConverter.getEnumConverter;
-
 /**
  *
  * CustomTitledPaneSkin with option to move arrow to the right
@@ -31,7 +30,8 @@
 public class CustomTitledPaneSkin extends TitledPaneSkin {
 
     public enum ArrowSide {
-        LEFT, RIGHT
+        LEFT,
+        RIGHT,
     }
 
     /* ********************************************************
@@ -40,13 +40,18 @@ public enum ArrowSide {
      *                                                        *
      **********************************************************/
 
-    private final StyleableObjectProperty<ArrowSide> arrowSide = new SimpleStyleableObjectProperty<>(StyleableProperties.ARROW_SIDE, this, "arrowSide", ArrowSide.LEFT) {
-
-        @Override
-        protected void invalidated() {
-            adjustTitleLayout();
-        }
-    };
+    private final StyleableObjectProperty<ArrowSide> arrowSide =
+        new SimpleStyleableObjectProperty<>(
+            StyleableProperties.ARROW_SIDE,
+            this,
+            "arrowSide",
+            ArrowSide.LEFT
+        ) {
+            @Override
+            protected void invalidated() {
+                adjustTitleLayout();
+            }
+        };
 
     public final void setArrowSide(ArrowSide arrowSide) {
         this.arrowSide.set(arrowSide);
@@ -84,7 +89,8 @@ public final ObjectProperty<ArrowSide> arrowSideProperty() {
     public CustomTitledPaneSkin(TitledPane control) {
         super(control);
         title = (Region) Objects.requireNonNull(control.lookup(".title"));
-        arrowButton = (Region) Objects.requireNonNull(title.lookup(".arrow-button"));
+        arrowButton =
+            (Region) Objects.requireNonNull(title.lookup(".arrow-button"));
         arrow = (Region) Objects.requireNonNull(arrowButton.lookup(".arrow"));
         text = (Text) Objects.requireNonNull(title.lookup(".text"));
 
@@ -92,14 +98,21 @@ 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);
 
-        registerChangeListener(control.graphicProperty(), ov -> adjustTitleLayout());
+        registerChangeListener(
+            control.graphicProperty(),
+            ov -> adjustTitleLayout()
+        );
     }
 
     /* ********************************************************
@@ -115,17 +128,37 @@ 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 +211,41 @@ 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;
+        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();
                 }
-                return null;
-            }
 
-        };
+                @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/DefaultFileUpdateMonitor.java b/src/main/java/org/jabref/gui/util/DefaultFileUpdateMonitor.java
index 9d53439b90e..182fe260edf 100644
--- a/src/main/java/org/jabref/gui/util/DefaultFileUpdateMonitor.java
+++ b/src/main/java/org/jabref/gui/util/DefaultFileUpdateMonitor.java
@@ -1,5 +1,7 @@
 package org.jabref.gui.util;
 
+import com.google.common.collect.ArrayListMultimap;
+import com.google.common.collect.Multimap;
 import java.io.IOException;
 import java.nio.file.ClosedWatchServiceException;
 import java.nio.file.FileSystems;
@@ -11,14 +13,10 @@
 import java.util.Optional;
 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;
 
@@ -30,16 +28,23 @@
  */
 public class DefaultFileUpdateMonitor implements Runnable, FileUpdateMonitor {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(DefaultFileUpdateMonitor.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(
+        DefaultFileUpdateMonitor.class
+    );
 
-    private final Multimap<Path, FileUpdateListener> listeners = ArrayListMultimap.create(20, 4);
+    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() {
-        try (WatchService watcher = FileSystems.getDefault().newWatchService()) {
+        try (
+            WatchService watcher = FileSystems.getDefault().newWatchService()
+        ) {
             this.watcher = watcher;
             filesystemMonitorFailure.set(Optional.empty());
 
@@ -57,11 +62,15 @@ public void run() {
                     if (kind == StandardWatchEventKinds.OVERFLOW) {
                         Thread.yield();
                         continue;
-                    } else if (kind == StandardWatchEventKinds.ENTRY_CREATE || kind == StandardWatchEventKinds.ENTRY_MODIFY) {
+                    } 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());
+                        Path path =
+                            ((Path) key.watchable()).resolve(ev.context());
                         notifyAboutChange(path);
                     }
                     key.reset();
@@ -70,7 +79,10 @@ public void run() {
             }
         } catch (IOException e) {
             JabRefException exception = new WatchServiceUnavailableException(
-                    e.getMessage(), e.getLocalizedMessage(), e.getCause());
+                e.getMessage(),
+                e.getLocalizedMessage(),
+                e.getCause()
+            );
             filesystemMonitorFailure.set(Optional.of(exception));
             LOGGER.warn("Error during watching", e);
         }
@@ -86,14 +98,23 @@ private void notifyAboutChange(Path path) {
     }
 
     @Override
-    public void addListenerForFile(Path file, FileUpdateListener listener) throws IOException {
+    public void addListenerForFile(Path file, FileUpdateListener listener)
+        throws IOException {
         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/DefaultTaskExecutor.java b/src/main/java/org/jabref/gui/util/DefaultTaskExecutor.java
index 8240a5b209f..b74c27be6fe 100644
--- a/src/main/java/org/jabref/gui/util/DefaultTaskExecutor.java
+++ b/src/main/java/org/jabref/gui/util/DefaultTaskExecutor.java
@@ -12,13 +12,10 @@
 import java.util.concurrent.ScheduledExecutorService;
 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.DelayTaskThrottler;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -28,11 +25,15 @@
  */
 public class DefaultTaskExecutor implements TaskExecutor {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(DefaultTaskExecutor.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(
+        DefaultTaskExecutor.class
+    );
 
     private final ExecutorService executor = Executors.newFixedThreadPool(5);
-    private final ScheduledExecutorService scheduledExecutor = Executors.newScheduledThreadPool(2);
-    private final WeakHashMap<DelayTaskThrottler, Void> throttlers = new WeakHashMap<>();
+    private final ScheduledExecutorService scheduledExecutor =
+        Executors.newScheduledThreadPool(2);
+    private final WeakHashMap<DelayTaskThrottler, Void> throttlers =
+        new WeakHashMap<>();
 
     private final StateManager stateManager;
 
@@ -118,7 +119,11 @@ public <V> Future<V> execute(Task<V> task) {
     }
 
     @Override
-    public <V> Future<?> schedule(BackgroundTask<V> task, long delay, TimeUnit unit) {
+    public <V> Future<?> schedule(
+        BackgroundTask<V> task,
+        long delay,
+        TimeUnit unit
+    ) {
         return scheduledExecutor.schedule(getJavaFXTask(task), delay, unit);
     }
 
@@ -127,7 +132,11 @@ public <V> Future<?> schedule(BackgroundTask<V> task, long delay, TimeUnit unit)
      */
     @Override
     public void shutdown() {
-        stateManager.getBackgroundTasks().stream().filter(task -> !task.isDone()).forEach(Task::cancel);
+        stateManager
+            .getBackgroundTasks()
+            .stream()
+            .filter(task -> !task.isDone())
+            .forEach(Task::cancel);
         executor.shutdownNow();
         scheduledExecutor.shutdownNow();
         throttlers.forEach((throttler, aVoid) -> throttler.shutdown());
@@ -145,14 +154,30 @@ private <V> Task<V> getJavaFXTask(BackgroundTask<V> task) {
             {
                 this.updateMessage(task.messageProperty().get());
                 this.updateTitle(task.titleProperty().get());
-                BindingsHelper.subscribeFuture(task.progressProperty(), progress -> updateProgress(progress.getWorkDone(), progress.getMax()));
-                BindingsHelper.subscribeFuture(task.messageProperty(), this::updateMessage);
-                BindingsHelper.subscribeFuture(task.titleProperty(), this::updateTitle);
-                BindingsHelper.subscribeFuture(task.isCanceledProperty(), cancelled -> {
-                    if (cancelled) {
-                        cancel();
+                BindingsHelper.subscribeFuture(
+                    task.progressProperty(),
+                    progress ->
+                        updateProgress(
+                            progress.getWorkDone(),
+                            progress.getMax()
+                        )
+                );
+                BindingsHelper.subscribeFuture(
+                    task.messageProperty(),
+                    this::updateMessage
+                );
+                BindingsHelper.subscribeFuture(
+                    task.titleProperty(),
+                    this::updateTitle
+                );
+                BindingsHelper.subscribeFuture(
+                    task.isCanceledProperty(),
+                    cancelled -> {
+                        if (cancelled) {
+                            cancel();
+                        }
                     }
-                });
+                );
                 setOnCancelled(event -> task.cancel());
             }
 
@@ -167,11 +192,15 @@ public V call() throws Exception {
         }
         Consumer<V> onSuccess = task.getOnSuccess();
         if (onSuccess != null) {
-            javaTask.setOnSucceeded(event -> onSuccess.accept(javaTask.getValue()));
+            javaTask.setOnSucceeded(event ->
+                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/DialogWindowState.java b/src/main/java/org/jabref/gui/util/DialogWindowState.java
index b179a6d4085..4a0c4df09bd 100644
--- a/src/main/java/org/jabref/gui/util/DialogWindowState.java
+++ b/src/main/java/org/jabref/gui/util/DialogWindowState.java
@@ -5,6 +5,7 @@
  * these properties stay consistent when they are closed and re-opened
  */
 public class DialogWindowState {
+
     private final double x;
     private final double y;
     private final double height;
diff --git a/src/main/java/org/jabref/gui/util/DroppingMouseLocation.java b/src/main/java/org/jabref/gui/util/DroppingMouseLocation.java
index 99bbf6671e2..a391c6c922b 100644
--- a/src/main/java/org/jabref/gui/util/DroppingMouseLocation.java
+++ b/src/main/java/org/jabref/gui/util/DroppingMouseLocation.java
@@ -6,5 +6,5 @@
 public enum DroppingMouseLocation {
     BOTTOM,
     CENTER,
-    TOP
+    TOP,
 }
diff --git a/src/main/java/org/jabref/gui/util/FieldsUtil.java b/src/main/java/org/jabref/gui/util/FieldsUtil.java
index 398c3e120d7..9c190dd6d7f 100644
--- a/src/main/java/org/jabref/gui/util/FieldsUtil.java
+++ b/src/main/java/org/jabref/gui/util/FieldsUtil.java
@@ -1,7 +1,6 @@
 package org.jabref.gui.util;
 
 import javafx.util.StringConverter;
-
 import org.jabref.gui.Globals;
 import org.jabref.gui.specialfields.SpecialFieldViewModel;
 import org.jabref.logic.l10n.Localization;
@@ -14,32 +13,54 @@
 
 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) {
         if (field instanceof SpecialField specialField) {
-            return new SpecialFieldViewModel(specialField, Globals.prefs, Globals.undoManager).getLocalization()
-                    + " (" + Localization.lang("Special") + ")";
+            return (
+                new SpecialFieldViewModel(
+                    specialField,
+                    Globals.prefs,
+                    Globals.undoManager
+                )
+                    .getLocalization() +
+                " (" +
+                Localization.lang("Special") +
+                ")"
+            );
         } else if (field instanceof IEEEField) {
-            return field.getDisplayName() + " (" + Localization.lang("IEEE") + ")";
+            return (
+                field.getDisplayName() + " (" + Localization.lang("IEEE") + ")"
+            );
         } else if (field instanceof InternalField) {
-            return field.getDisplayName() + " (" + Localization.lang("Internal") + ")";
+            return (
+                field.getDisplayName() +
+                " (" +
+                Localization.lang("Internal") +
+                ")"
+            );
         } else if (field instanceof UnknownField) {
-            return field.getDisplayName() + " (" + Localization.lang("Custom") + ")";
+            return (
+                field.getDisplayName() +
+                " (" +
+                Localization.lang("Custom") +
+                ")"
+            );
         } else {
             return field.getDisplayName();
         }
diff --git a/src/main/java/org/jabref/gui/util/FileDialogConfiguration.java b/src/main/java/org/jabref/gui/util/FileDialogConfiguration.java
index e4e559ab150..4608c6e4b3e 100644
--- a/src/main/java/org/jabref/gui/util/FileDialogConfiguration.java
+++ b/src/main/java/org/jabref/gui/util/FileDialogConfiguration.java
@@ -7,9 +7,7 @@
 import java.util.Objects;
 import java.util.Optional;
 import java.util.stream.Stream;
-
 import javafx.stage.FileChooser;
-
 import org.jabref.logic.util.FileType;
 
 public class FileDialogConfiguration {
@@ -20,8 +18,12 @@ 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;
@@ -48,19 +50,27 @@ public FileChooser.ExtensionFilter getSelectedExtensionFilter() {
         return selectedExtensionFilter;
     }
 
-    public void setSelectedExtensionFilter(FileChooser.ExtensionFilter selectedExtensionFilter) {
+    public void setSelectedExtensionFilter(
+        FileChooser.ExtensionFilter selectedExtensionFilter
+    ) {
         this.selectedExtensionFilter = selectedExtensionFilter;
     }
 
     public static class Builder {
 
-        private final List<FileChooser.ExtensionFilter> extensionFilters = new ArrayList<>();
+        private final List<FileChooser.ExtensionFilter> extensionFilters =
+            new ArrayList<>();
         private Path initialDirectory;
         private FileChooser.ExtensionFilter defaultExtension;
         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) {
@@ -95,7 +105,9 @@ public Builder withInitialFileName(String initialFileName) {
             return this;
         }
 
-        public Builder withDefaultExtension(FileChooser.ExtensionFilter extensionFilter) {
+        public Builder withDefaultExtension(
+            FileChooser.ExtensionFilter extensionFilter
+        ) {
             defaultExtension = extensionFilter;
             return this;
         }
@@ -105,16 +117,24 @@ public Builder withDefaultExtension(FileType fileType) {
             return this;
         }
 
-        public Builder withDefaultExtension(String description, FileType fileType) {
-            defaultExtension = FileFilterConverter.toExtensionFilter(description, fileType);
+        public Builder withDefaultExtension(
+            String description,
+            FileType fileType
+        ) {
+            defaultExtension =
+                FileFilterConverter.toExtensionFilter(description, fileType);
             return this;
         }
 
         public Builder withDefaultExtension(String fileTypeDescription) {
-            extensionFilters.stream()
-                            .filter(type -> type.getDescription().equalsIgnoreCase(fileTypeDescription))
-                            .findFirst()
-                            .ifPresent(extensionFilter -> defaultExtension = extensionFilter);
+            extensionFilters
+                .stream()
+                .filter(type ->
+                    type.getDescription().equalsIgnoreCase(fileTypeDescription)
+                )
+                .findFirst()
+                .ifPresent(extensionFilter -> defaultExtension = extensionFilter
+                );
 
             return this;
         }
@@ -124,20 +144,28 @@ public Builder addExtensionFilter(FileChooser.ExtensionFilter filter) {
             return this;
         }
 
-        public Builder addExtensionFilter(List<FileChooser.ExtensionFilter> filters) {
+        public Builder addExtensionFilter(
+            List<FileChooser.ExtensionFilter> filters
+        ) {
             extensionFilters.addAll(filters);
             return this;
         }
 
         public Builder addExtensionFilter(FileType... fileTypes) {
-            Stream.of(fileTypes)
-                  .map(FileFilterConverter::toExtensionFilter)
-                  .forEachOrdered(this::addExtensionFilter);
+            Stream
+                .of(fileTypes)
+                .map(FileFilterConverter::toExtensionFilter)
+                .forEachOrdered(this::addExtensionFilter);
             return this;
         }
 
-        public Builder addExtensionFilter(String description, FileType fileType) {
-            extensionFilters.add(FileFilterConverter.toExtensionFilter(description, fileType));
+        public Builder addExtensionFilter(
+            String description,
+            FileType fileType
+        ) {
+            extensionFilters.add(
+                FileFilterConverter.toExtensionFilter(description, fileType)
+            );
             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 3e7a6c33315..7c317c4ab69 100644
--- a/src/main/java/org/jabref/gui/util/FileFilterConverter.java
+++ b/src/main/java/org/jabref/gui/util/FileFilterConverter.java
@@ -9,9 +9,7 @@
 import java.util.Optional;
 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;
@@ -21,51 +19,106 @@
 
 public class FileFilterConverter {
 
-    public static FileChooser.ExtensionFilter ANY_FILE = new FileChooser.ExtensionFilter(Localization.lang("Any file"), "*.*");
-
-    private FileFilterConverter() {
+    public static FileChooser.ExtensionFilter ANY_FILE =
+        new FileChooser.ExtensionFilter(Localization.lang("Any file"), "*.*");
+
+    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()
+        );
     }
 
-    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());
+    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());
-
-        return new FileChooser.ExtensionFilter(Localization.lang("Available import formats"), flatExtensions);
+    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());
+
+        return new FileChooser.ExtensionFilter(
+            Localization.lang("Available import formats"),
+            flatExtensions
+        );
     }
 
-    public static List<FileChooser.ExtensionFilter> importerToExtensionFilter(Collection<Importer> importers) {
-        return importers.stream()
-                        .map(importer -> toExtensionFilter(importer.getName(), importer.getFileType()))
-                        .collect(Collectors.toList());
+    public static List<FileChooser.ExtensionFilter> importerToExtensionFilter(
+        Collection<Importer> importers
+    ) {
+        return importers
+            .stream()
+            .map(importer ->
+                toExtensionFilter(importer.getName(), importer.getFileType())
+            )
+            .collect(Collectors.toList());
     }
 
-    public static List<FileChooser.ExtensionFilter> exporterToExtensionFilter(Collection<Exporter> exporters) {
-        return exporters.stream()
-                        .map(exporter -> toExtensionFilter(exporter.getName(), exporter.getFileType()))
-                        .collect(Collectors.toList());
+    public static List<FileChooser.ExtensionFilter> exporterToExtensionFilter(
+        Collection<Exporter> exporters
+    ) {
+        return exporters
+            .stream()
+            .map(exporter ->
+                toExtensionFilter(exporter.getName(), exporter.getFileType())
+            )
+            .collect(Collectors.toList());
     }
 
-    public static FileFilter toFileFilter(FileChooser.ExtensionFilter extensionFilter) {
+    public static FileFilter toFileFilter(
+        FileChooser.ExtensionFilter extensionFilter
+    ) {
         return toFileFilter(extensionFilter.getExtensions());
     }
 
@@ -81,17 +134,20 @@ 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 2410ad4b67c..732f6446f55 100644
--- a/src/main/java/org/jabref/gui/util/FileNodeViewModel.java
+++ b/src/main/java/org/jabref/gui/util/FileNodeViewModel.java
@@ -8,19 +8,18 @@
 import java.time.ZoneId;
 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);
+    private static final Logger LOGGER = LoggerFactory.getLogger(
+        FileNodeViewModel.class
+    );
     private final Path path;
     private final ObservableList<FileNodeViewModel> children;
     private int fileCount;
@@ -52,11 +51,13 @@ public void setFileCount(int fileCount) {
      */
     public static String formatDateTime(FileTime fileTime) {
         LocalDateTime localDateTime = fileTime
-                .toInstant()
-                .atZone(ZoneId.systemDefault())
-                .toLocalDateTime();
+            .toInstant()
+            .atZone(ZoneId.systemDefault())
+            .toLocalDateTime();
 
-        return localDateTime.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm"));
+        return localDateTime.format(
+            DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm")
+        );
     }
 
     /**
@@ -64,8 +65,14 @@ public static String formatDateTime(FileTime fileTime) {
      */
     public String getDisplayText() {
         if (path.toFile().isDirectory()) {
-            return String.format("%s (%s %s)", path.getFileName(), fileCount,
-                    fileCount == 1 ? Localization.lang("file") : Localization.lang("files"));
+            return String.format(
+                "%s (%s %s)",
+                path.getFileName(),
+                fileCount,
+                fileCount == 1
+                    ? Localization.lang("file")
+                    : Localization.lang("files")
+            );
         }
         return path.getFileName().toString();
     }
@@ -76,8 +83,14 @@ public String getDisplayText() {
      */
     public String getDisplayTextWithEditDate() {
         if (path.toFile().isDirectory()) {
-            return String.format("%s (%s %s)", path.getFileName(), fileCount,
-                    fileCount == 1 ? Localization.lang("file") : Localization.lang("files"));
+            return String.format(
+                "%s (%s %s)",
+                path.getFileName(),
+                fileCount,
+                fileCount == 1
+                    ? Localization.lang("file")
+                    : Localization.lang("files")
+            );
         }
         FileTime lastEditedTime = null;
         try {
@@ -85,15 +98,22 @@ public String getDisplayTextWithEditDate() {
         } catch (IOException e) {
             LOGGER.error("Exception Caught", e);
         }
-        return String.format("%s (%s: %s)", path.getFileName().toString(), Localization.lang("last edited"), formatDateTime(lastEditedTime));
+        return String.format(
+            "%s (%s: %s)",
+            path.getFileName().toString(),
+            Localization.lang("last edited"),
+            formatDateTime(lastEditedTime)
+        );
     }
 
     @Override
     public String toString() {
-        return String.format("FileNodeViewModel{path=%s, children=%s, fileCount=%s}",
-                this.path,
-                this.children,
-                this.fileCount);
+        return String.format(
+            "FileNodeViewModel{path=%s, children=%s, fileCount=%s}",
+            this.path,
+            this.children,
+            this.fileCount
+        );
     }
 
     @Override
@@ -110,6 +130,10 @@ public boolean equals(Object obj) {
             return false;
         }
         FileNodeViewModel other = (FileNodeViewModel) obj;
-        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/IconValidationDecorator.java b/src/main/java/org/jabref/gui/util/IconValidationDecorator.java
index 2608c5c0663..a43ce2f0a54 100644
--- a/src/main/java/org/jabref/gui/util/IconValidationDecorator.java
+++ b/src/main/java/org/jabref/gui/util/IconValidationDecorator.java
@@ -2,19 +2,16 @@
 
 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;
 
 /**
  * This class is similar to {@link GraphicValidationDecoration} but with a different style and font-based icon.
@@ -43,8 +40,16 @@ 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 +60,22 @@ 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));
+    protected Collection<Decoration> createValidationDecorations(
+        ValidationMessage message
+    ) {
+        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 03d4a2bfbe1..7c0449a7c93 100644
--- a/src/main/java/org/jabref/gui/util/JabRefResourceLocator.java
+++ b/src/main/java/org/jabref/gui/util/JabRefResourceLocator.java
@@ -1,16 +1,16 @@
 package org.jabref.gui.util;
 
+import com.airhacks.afterburner.views.ResourceLocator;
 import java.util.ResourceBundle;
-
 import org.jabref.logic.l10n.Localization;
-
-import com.airhacks.afterburner.views.ResourceLocator;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 public class JabRefResourceLocator implements ResourceLocator {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(JabRefResourceLocator.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(
+        JabRefResourceLocator.class
+    );
 
     @Override
     public ResourceBundle getResourceBundle(String s) {
diff --git a/src/main/java/org/jabref/gui/util/NoSelectionModel.java b/src/main/java/org/jabref/gui/util/NoSelectionModel.java
index 88cba6e413c..12139ba9f28 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 7b7293a3b73..448d0ab64cc 100644
--- a/src/main/java/org/jabref/gui/util/OnlyIntegerFormatter.java
+++ b/src/main/java/org/jabref/gui/util/OnlyIntegerFormatter.java
@@ -2,7 +2,6 @@
 
 import java.util.function.UnaryOperator;
 import java.util.regex.Pattern;
-
 import javafx.scene.control.TextFormatter;
 import javafx.util.converter.IntegerStringConverter;
 
@@ -22,7 +21,8 @@ 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 a52d5654732..1b721c0e1dc 100644
--- a/src/main/java/org/jabref/gui/util/OptionalObjectProperty.java
+++ b/src/main/java/org/jabref/gui/util/OptionalObjectProperty.java
@@ -1,17 +1,16 @@
 package org.jabref.gui.util;
 
+import com.tobiasdiez.easybind.PreboundBinding;
 import java.util.Optional;
-
 import javafx.beans.binding.BooleanExpression;
 import javafx.beans.binding.ObjectBinding;
 import javafx.beans.property.SimpleObjectProperty;
 
-import com.tobiasdiez.easybind.PreboundBinding;
-
 /**
  * Similar to {@link com.tobiasdiez.easybind.monadic.MonadicObservableValue}
  */
-public class OptionalObjectProperty<T> extends SimpleObjectProperty<Optional<T>> {
+public class OptionalObjectProperty<T>
+    extends SimpleObjectProperty<Optional<T>> {
 
     private OptionalObjectProperty(Optional<T> initialValue) {
         super(initialValue);
@@ -35,11 +34,13 @@ protected T computeValue() {
     }
 
     public BooleanExpression isPresent() {
-        return BooleanExpression.booleanExpression(new PreboundBinding<Boolean>(this) {
-            @Override
-            protected Boolean computeValue() {
-                return OptionalObjectProperty.this.getValue().isPresent();
+        return BooleanExpression.booleanExpression(
+            new PreboundBinding<Boolean>(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 2232561583b..85b4cd98ad7 100644
--- a/src/main/java/org/jabref/gui/util/OptionalValueTableCellFactory.java
+++ b/src/main/java/org/jabref/gui/util/OptionalValueTableCellFactory.java
@@ -2,7 +2,6 @@
 
 import java.util.Optional;
 import java.util.function.BiFunction;
-
 import javafx.scene.Node;
 import javafx.scene.control.TableCell;
 
@@ -12,18 +11,23 @@
  * @param <S> view model of table row
  * @param <T> cell value
  */
-public class OptionalValueTableCellFactory<S, T> extends ValueTableCellFactory<S, Optional<T>> {
+public class OptionalValueTableCellFactory<S, T>
+    extends ValueTableCellFactory<S, Optional<T>> {
 
     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;
     }
 
-    public OptionalValueTableCellFactory<S, T> withDefaultGraphic(Node defaultGraphic) {
+    public OptionalValueTableCellFactory<S, T> withDefaultGraphic(
+        Node defaultGraphic
+    ) {
         this.defaultGraphic = defaultGraphic;
         setToGraphic();
         return this;
diff --git a/src/main/java/org/jabref/gui/util/RecursiveTreeItem.java b/src/main/java/org/jabref/gui/util/RecursiveTreeItem.java
index 75519a2f9e4..e769a137d22 100644
--- a/src/main/java/org/jabref/gui/util/RecursiveTreeItem.java
+++ b/src/main/java/org/jabref/gui/util/RecursiveTreeItem.java
@@ -1,7 +1,7 @@
 package org.jabref.gui.util;
 
+import com.tobiasdiez.easybind.EasyBind;
 import java.util.function.Predicate;
-
 import javafx.beans.binding.Bindings;
 import javafx.beans.property.BooleanProperty;
 import javafx.beans.property.ObjectProperty;
@@ -13,8 +13,6 @@
 import javafx.scene.control.CheckBoxTreeItem;
 import javafx.util.Callback;
 
-import com.tobiasdiez.easybind.EasyBind;
-
 /**
  * Taken from https://gist.github.com/lestard/011e9ed4433f9eb791a8
  * As CheckBoxTreeItem extends TreeItem, this class will work for both.
@@ -23,24 +21,42 @@ public class RecursiveTreeItem<T> extends CheckBoxTreeItem<T> {
 
     private final Callback<T, BooleanProperty> expandedProperty;
     private final Callback<T, ObservableList<T>> childrenFactory;
-    private final ObjectProperty<Predicate<T>> filter = new SimpleObjectProperty<>();
+    private final ObjectProperty<Predicate<T>> filter =
+        new SimpleObjectProperty<>();
     private FilteredList<RecursiveTreeItem<T>> children;
 
-    public RecursiveTreeItem(final T value, Callback<T, ObservableList<T>> func) {
+    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;
         this.expandedProperty = expandedProperty;
         if (filter != null) {
@@ -52,23 +68,41 @@ 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) {
+    private void bindExpandedProperty(
+        T value,
+        Callback<T, BooleanProperty> expandedProperty
+    ) {
         if (expandedProperty != null) {
             expandedProperty().bindBidirectional(expandedProperty.call(value));
         }
     }
 
     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);
     }
diff --git a/src/main/java/org/jabref/gui/util/StreamGobbler.java b/src/main/java/org/jabref/gui/util/StreamGobbler.java
index b2131968f87..103ad9c3cb2 100644
--- a/src/main/java/org/jabref/gui/util/StreamGobbler.java
+++ b/src/main/java/org/jabref/gui/util/StreamGobbler.java
@@ -5,13 +5,14 @@
 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);
+    private static final Logger LOGGER = LoggerFactory.getLogger(
+        StreamGobbler.class
+    );
 
     private InputStream inputStream;
     private Consumer<String> consumer;
@@ -23,10 +24,17 @@ public StreamGobbler(InputStream inputStream, Consumer<String> consumer) {
 
     @Override
     public void run() {
-        try (BufferedReader reader = new BufferedReader(new InputStreamReader(inputStream))) {
+        try (
+            BufferedReader reader = new BufferedReader(
+                new InputStreamReader(inputStream)
+            )
+        ) {
             reader.lines().forEach(consumer);
         } catch (IOException e) {
-            LOGGER.error("Error when reading process stream from external application", e);
+            LOGGER.error(
+                "Error when reading process stream from external application",
+                e
+            );
         }
     }
 }
diff --git a/src/main/java/org/jabref/gui/util/TaskExecutor.java b/src/main/java/org/jabref/gui/util/TaskExecutor.java
index e08d858a0cc..daefb05d9e7 100644
--- a/src/main/java/org/jabref/gui/util/TaskExecutor.java
+++ b/src/main/java/org/jabref/gui/util/TaskExecutor.java
@@ -2,9 +2,7 @@
 
 import java.util.concurrent.Future;
 import java.util.concurrent.TimeUnit;
-
 import javafx.concurrent.Task;
-
 import org.jabref.logic.util.DelayTaskThrottler;
 
 /**
@@ -14,7 +12,6 @@
  * use, scheduling, thread pooling, etc.
  */
 public interface TaskExecutor {
-
     /**
      * Runs the given task and returns a Future representing that task.
      *
diff --git a/src/main/java/org/jabref/gui/util/TextFlowLimited.java b/src/main/java/org/jabref/gui/util/TextFlowLimited.java
index 42638536c66..9eb2987bacd 100644
--- a/src/main/java/org/jabref/gui/util/TextFlowLimited.java
+++ b/src/main/java/org/jabref/gui/util/TextFlowLimited.java
@@ -10,17 +10,16 @@
 import javafx.scene.text.Text;
 import javafx.scene.text.TextFlow;
 import javafx.util.Duration;
-
 import org.jabref.logic.l10n.Localization;
 
 public class TextFlowLimited extends TextFlow {
+
     private boolean isCollapsed = true;
     private Hyperlink moreLink = new Hyperlink(Localization.lang("(more)"));
     private Rectangle clip = new Rectangle();
 
     public TextFlowLimited(Text... texts) {
         super(texts);
-
         this.setPrefWidth(Region.USE_PREF_SIZE);
 
         moreLink.setOnAction(event -> expand());
@@ -67,7 +66,16 @@ 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.setHeight(computePrefHeight(this.getWidth()));
diff --git a/src/main/java/org/jabref/gui/util/TooltipTextUtil.java b/src/main/java/org/jabref/gui/util/TooltipTextUtil.java
index bc07e000068..630bba3742f 100644
--- a/src/main/java/org/jabref/gui/util/TooltipTextUtil.java
+++ b/src/main/java/org/jabref/gui/util/TooltipTextUtil.java
@@ -5,7 +5,6 @@
 import java.util.Optional;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
-
 import javafx.scene.text.Text;
 
 /**
@@ -16,12 +15,19 @@ 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
     // .*? 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 TT_TEXT = Pattern.compile(
+        "(?s)(?<before>.*?)<tt>(?<in>.*?)</tt>"
+    );
 
-    private static final Pattern B_TEXT = Pattern.compile("(?s)(?<before>.*?)<b>(?<in>.*?)</b>");
+    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) {
@@ -62,7 +68,12 @@ public static List<Text> createTextsFromHtml(String htmlString) {
                 result.addAll(convertHtmlBold(before));
             }
             String in = matcher.group("in");
-            result.add(TooltipTextUtil.createText(in, TooltipTextUtil.TextType.MONOSPACED));
+            result.add(
+                TooltipTextUtil.createText(
+                    in,
+                    TooltipTextUtil.TextType.MONOSPACED
+                )
+            );
         }
         if (lastMatchPos < htmlString.length()) {
             String remaining = htmlString.substring(lastMatchPos);
@@ -97,7 +108,10 @@ private static List<Text> convertHtmlBold(String htmlString) {
     /**
      * Formats a String to multiple Texts by replacing some parts and adding font characteristics.
      */
-    public static List<Text> formatToTexts(String original, TextReplacement... replacements) {
+    public static List<Text> formatToTexts(
+        String original,
+        TextReplacement... replacements
+    ) {
         List<Text> textList = new ArrayList<>();
         textList.add(new Text(original));
         for (TextReplacement replacement : replacements) {
@@ -107,8 +121,14 @@ public static List<Text> formatToTexts(String original, TextReplacement... repla
         return textList;
     }
 
-    private static void splitReplace(List<Text> textList, TextReplacement replacement) {
-        Optional<Text> textContainingReplacement = textList.stream().filter(it -> it.getText().contains(replacement.toReplace)).findFirst();
+    private static void splitReplace(
+        List<Text> textList,
+        TextReplacement replacement
+    ) {
+        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,32 +136,85 @@ 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"
+            );
         }
     }
 
     public static class TextReplacement {
+
         private final String toReplace;
         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;
@@ -151,7 +224,9 @@ public TextReplacement(String toReplace, String replacement, TooltipTextUtil.Tex
     public static String textToHtmlString(Text text) {
         String textString = text.getText();
         textString = textString.replace("\n", "<br>");
-        if (text.getStyleClass().toString().contains("tooltip-text-monospaced")) {
+        if (
+            text.getStyleClass().toString().contains("tooltip-text-monospaced")
+        ) {
             textString = String.format("<tt>%s</tt>", textString);
         }
         if (text.getStyleClass().toString().contains("tooltip-text-bold")) {
diff --git a/src/main/java/org/jabref/gui/util/UiThreadList.java b/src/main/java/org/jabref/gui/util/UiThreadList.java
index 1e2f582a578..795a0daa66f 100644
--- a/src/main/java/org/jabref/gui/util/UiThreadList.java
+++ b/src/main/java/org/jabref/gui/util/UiThreadList.java
@@ -1,24 +1,27 @@
 package org.jabref.gui.util;
 
 import java.util.concurrent.CountDownLatch;
-
 import javafx.application.Platform;
 import javafx.collections.ListChangeListener;
 import javafx.collections.ObservableList;
 import javafx.collections.transformation.TransformationList;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 class UiThreadList<T> extends TransformationList<T, T> {
-    private static final Logger LOGGER = LoggerFactory.getLogger(UiThreadList.class);
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(
+        UiThreadList.class
+    );
 
     public UiThreadList(ObservableList<? extends T> source) {
         super(source);
     }
 
     @Override
-    protected void sourceChanged(ListChangeListener.Change<? extends T> change) {
+    protected void sourceChanged(
+        ListChangeListener.Change<? extends T> change
+    ) {
         if (Platform.isFxApplicationThread()) {
             fireChange(change);
         } else {
diff --git a/src/main/java/org/jabref/gui/util/ValueTableCellFactory.java b/src/main/java/org/jabref/gui/util/ValueTableCellFactory.java
index 683c70ea9d0..7edf926019c 100644
--- a/src/main/java/org/jabref/gui/util/ValueTableCellFactory.java
+++ b/src/main/java/org/jabref/gui/util/ValueTableCellFactory.java
@@ -2,7 +2,6 @@
 
 import java.util.function.BiFunction;
 import java.util.function.Function;
-
 import javafx.beans.binding.BooleanExpression;
 import javafx.event.EventHandler;
 import javafx.scene.Node;
@@ -14,7 +13,6 @@
 import javafx.scene.input.MouseEvent;
 import javafx.stage.Screen;
 import javafx.util.Callback;
-
 import org.jabref.model.strings.StringUtil;
 
 /**
@@ -23,11 +21,16 @@
  * @param <S> view model of table row
  * @param <T> cell value
  */
-public class ValueTableCellFactory<S, T> implements Callback<TableColumn<S, T>, TableCell<S, T>> {
+public class ValueTableCellFactory<S, T>
+    implements Callback<TableColumn<S, T>, TableCell<S, T>> {
 
     private Function<T, String> toText;
     private BiFunction<S, T, Node> toGraphic;
-    private BiFunction<S, T, EventHandler<? super MouseEvent>> toOnMouseClickedEvent;
+    private BiFunction<
+        S,
+        T,
+        EventHandler<? super MouseEvent>
+    > toOnMouseClickedEvent;
     private Function<T, BooleanExpression> toDisableExpression;
     private Function<T, BooleanExpression> toVisibleExpression;
     private BiFunction<S, T, String> toTooltip;
@@ -39,52 +42,73 @@ public ValueTableCellFactory<S, T> withText(Function<T, String> toText) {
         return this;
     }
 
-    public ValueTableCellFactory<S, T> withGraphic(Function<T, Node> toGraphic) {
+    public ValueTableCellFactory<S, T> withGraphic(
+        Function<T, Node> toGraphic
+    ) {
         this.toGraphic = (rowItem, value) -> toGraphic.apply(value);
         return this;
     }
 
-    public ValueTableCellFactory<S, T> withGraphic(BiFunction<S, T, Node> toGraphic) {
+    public ValueTableCellFactory<S, T> withGraphic(
+        BiFunction<S, T, Node> toGraphic
+    ) {
         this.toGraphic = toGraphic;
         return this;
     }
 
-    public ValueTableCellFactory<S, T> withTooltip(BiFunction<S, T, String> toTooltip) {
+    public ValueTableCellFactory<S, T> withTooltip(
+        BiFunction<S, T, String> toTooltip
+    ) {
         this.toTooltip = toTooltip;
         return this;
     }
 
-    public ValueTableCellFactory<S, T> withTooltip(Function<T, String> toTooltip) {
+    public ValueTableCellFactory<S, T> withTooltip(
+        Function<T, String> toTooltip
+    ) {
         this.toTooltip = (rowItem, value) -> toTooltip.apply(value);
         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) {
-        this.toOnMouseClickedEvent = (rowItem, value) -> toOnMouseClickedEvent.apply(value);
+    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;
     }
 
-    public ValueTableCellFactory<S, T> withMenu(BiFunction<S, T, ContextMenu> menuFactory) {
+    public ValueTableCellFactory<S, T> withMenu(
+        BiFunction<S, T, ContextMenu> menuFactory
+    ) {
         this.menuFactory = menuFactory;
         return this;
     }
@@ -96,7 +120,12 @@ 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);
@@ -114,9 +143,11 @@ protected void updateItem(T item, boolean empty) {
                         String tooltipText = toTooltip.apply(rowItem, item);
                         if (StringUtil.isNotBlank(tooltipText)) {
                             Screen currentScreen = Screen.getPrimary();
-                            double maxWidth = currentScreen.getBounds().getWidth();
+                            double maxWidth = currentScreen
+                                .getBounds()
+                                .getWidth();
                             Tooltip tooltip = new Tooltip(tooltipText);
-                            tooltip.setMaxWidth(maxWidth * 2 / 3);
+                            tooltip.setMaxWidth((maxWidth * 2) / 3);
                             tooltip.setWrapText(true);
                             setTooltip(tooltip);
                         }
@@ -127,7 +158,12 @@ protected void updateItem(T item, boolean empty) {
                         setOnContextMenuRequested(event -> {
                             if (!isEmpty()) {
                                 setContextMenu(contextMenuFactory.apply(item));
-                                getContextMenu().show(this, event.getScreenX(), event.getScreenY());
+                                getContextMenu()
+                                    .show(
+                                        this,
+                                        event.getScreenX(),
+                                        event.getScreenY()
+                                    );
                             }
                             event.consume();
                         });
@@ -135,14 +171,23 @@ protected void updateItem(T item, boolean empty) {
 
                     setOnMouseClicked(event -> {
                         if (toOnMouseClickedEvent != null) {
-                            toOnMouseClickedEvent.apply(rowItem, item).handle(event);
+                            toOnMouseClickedEvent
+                                .apply(rowItem, item)
+                                .handle(event);
                         }
 
                         if ((menuFactory != null) && !event.isConsumed()) {
                             if (event.getButton() == MouseButton.PRIMARY) {
-                                ContextMenu menu = menuFactory.apply(rowItem, item);
+                                ContextMenu menu = menuFactory.apply(
+                                    rowItem,
+                                    item
+                                );
                                 if (menu != null) {
-                                    menu.show(this, event.getScreenX(), event.getScreenY());
+                                    menu.show(
+                                        this,
+                                        event.getScreenX(),
+                                        event.getScreenY()
+                                    );
                                     event.consume();
                                 }
                             }
diff --git a/src/main/java/org/jabref/gui/util/ViewModelListCellFactory.java b/src/main/java/org/jabref/gui/util/ViewModelListCellFactory.java
index 41e0727583f..9ccc462ef40 100644
--- a/src/main/java/org/jabref/gui/util/ViewModelListCellFactory.java
+++ b/src/main/java/org/jabref/gui/util/ViewModelListCellFactory.java
@@ -1,11 +1,12 @@
 package org.jabref.gui.util;
 
+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;
-
 import javafx.beans.value.ObservableValue;
 import javafx.css.PseudoClass;
 import javafx.scene.Node;
@@ -18,21 +19,19 @@
 import javafx.scene.input.MouseEvent;
 import javafx.scene.paint.Color;
 import javafx.util.Callback;
-
 import org.jabref.gui.icon.JabRefIcon;
 import org.jabref.model.strings.StringUtil;
 
-import com.tobiasdiez.easybind.Subscription;
-import de.saxsys.mvvmfx.utils.validation.ValidationStatus;
-
 /**
  * Constructs a {@link ListCell} based on the view model of the row and a bunch of specified converter methods.
  *
  * @param <T> cell value
  */
-public class ViewModelListCellFactory<T> implements Callback<ListView<T>, ListCell<T>> {
+public class ViewModelListCellFactory<T>
+    implements Callback<ListView<T>, ListCell<T>> {
 
-    private static final PseudoClass INVALID_PSEUDO_CLASS = PseudoClass.getPseudoClass("invalid");
+    private static final PseudoClass INVALID_PSEUDO_CLASS =
+        PseudoClass.getPseudoClass("invalid");
 
     private Callback<T, String> toText;
     private Callback<T, Node> toGraphic;
@@ -45,7 +44,10 @@ 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) {
@@ -53,89 +55,128 @@ public ViewModelListCellFactory<T> withText(Callback<T, String> toText) {
         return this;
     }
 
-    public ViewModelListCellFactory<T> withGraphic(Callback<T, Node> toGraphic) {
+    public ViewModelListCellFactory<T> withGraphic(
+        Callback<T, Node> toGraphic
+    ) {
         this.toGraphic = toGraphic;
         return this;
     }
 
-    public ViewModelListCellFactory<T> withIcon(Callback<T, JabRefIcon> toIcon) {
-        this.toGraphic = viewModel -> {
-            JabRefIcon icon = toIcon.call(viewModel);
-            if (icon != null) {
-                return icon.getGraphicNode();
-            }
-            return null;
-        };
+    public ViewModelListCellFactory<T> withIcon(
+        Callback<T, JabRefIcon> toIcon
+    ) {
+        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;
-        };
+    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;
+            };
         return this;
     }
 
-    public ViewModelListCellFactory<T> withTooltip(Callback<T, Tooltip> toTooltip) {
+    public ViewModelListCellFactory<T> withTooltip(
+        Callback<T, Tooltip> toTooltip
+    ) {
         this.toTooltip = toTooltip;
         return this;
     }
 
-    public ViewModelListCellFactory<T> withContextMenu(Callback<T, ContextMenu> toContextMenu) {
+    public ViewModelListCellFactory<T> withContextMenu(
+        Callback<T, ContextMenu> toContextMenu
+    ) {
         this.toContextMenu = toContextMenu;
         return this;
     }
 
-    public ViewModelListCellFactory<T> withStyleClass(Callback<T, String> toStyleClass) {
+    public ViewModelListCellFactory<T> withStyleClass(
+        Callback<T, String> toStyleClass
+    ) {
         this.toStyleClass = toStyleClass;
         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;
     }
@@ -177,7 +218,9 @@ protected void updateItem(T item, boolean empty) {
                         setGraphic(toGraphic.call(viewModel));
                     }
                     if (toOnMouseClickedEvent != null) {
-                        setOnMouseClicked(event -> toOnMouseClickedEvent.accept(viewModel, event));
+                        setOnMouseClicked(event ->
+                            toOnMouseClickedEvent.accept(viewModel, event)
+                        );
                     }
                     if (toStyleClass != null) {
                         getStyleClass().setAll(toStyleClass.call(viewModel));
@@ -189,36 +232,62 @@ protected void updateItem(T item, boolean empty) {
                         setContextMenu(toContextMenu.call(viewModel));
                     }
                     if (toOnDragDetected != null) {
-                        setOnDragDetected(event -> toOnDragDetected.accept(viewModel, event));
+                        setOnDragDetected(event ->
+                            toOnDragDetected.accept(viewModel, event)
+                        );
                     }
                     if (toOnDragDropped != null) {
-                        setOnDragDropped(event -> toOnDragDropped.accept(viewModel, event));
+                        setOnDragDropped(event ->
+                            toOnDragDropped.accept(viewModel, event)
+                        );
                     }
                     if (toOnDragEntered != null) {
-                        setOnDragEntered(event -> toOnDragEntered.accept(viewModel, event));
+                        setOnDragEntered(event ->
+                            toOnDragEntered.accept(viewModel, event)
+                        );
                     }
                     if (toOnDragExited != null) {
-                        setOnDragExited(event -> toOnDragExited.accept(viewModel, event));
+                        setOnDragExited(event ->
+                            toOnDragExited.accept(viewModel, event)
+                        );
                     }
                     if (toOnDragOver != null) {
-                        setOnDragOver(event -> toOnDragOver.accept(viewModel, event));
+                        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(
+                    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));
+                                condition
+                            )
+                        );
                     }
                     if (validationStatusProperty != null) {
-                        validationStatusProperty.call(viewModel)
-                                                .getHighestMessage()
-                                                .ifPresent(message -> setTooltip(new Tooltip(message.getMessage())));
+                        validationStatusProperty
+                            .call(viewModel)
+                            .getHighestMessage()
+                            .ifPresent(message ->
+                                setTooltip(new Tooltip(message.getMessage()))
+                            );
 
-                        subscriptions.add(BindingsHelper.includePseudoClassWhen(
+                        subscriptions.add(
+                            BindingsHelper.includePseudoClassWhen(
                                 this,
                                 INVALID_PSEUDO_CLASS,
-                                validationStatusProperty.call(viewModel).validProperty().not()));
+                                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 87114e3b6a0..877117b3807 100644
--- a/src/main/java/org/jabref/gui/util/ViewModelTableRowFactory.java
+++ b/src/main/java/org/jabref/gui/util/ViewModelTableRowFactory.java
@@ -2,7 +2,6 @@
 
 import java.util.function.BiConsumer;
 import java.util.function.Function;
-
 import javafx.geometry.Bounds;
 import javafx.geometry.Point2D;
 import javafx.scene.control.ContextMenu;
@@ -16,9 +15,7 @@
 import javafx.scene.input.MouseDragEvent;
 import javafx.scene.input.MouseEvent;
 import javafx.util.Callback;
-
 import org.jabref.model.strings.StringUtil;
-
 import org.reactfx.util.TriConsumer;
 
 /**
@@ -26,7 +23,8 @@
  *
  * @param <S> view model
  */
-public class ViewModelTableRowFactory<S> implements Callback<TableView<S>, TableRow<S>> {
+public class ViewModelTableRowFactory<S>
+    implements Callback<TableView<S>, TableRow<S>> {
 
     private BiConsumer<S, ? super MouseEvent> onMouseClickedEvent;
     private Function<S, ContextMenu> contextMenuFactory;
@@ -35,71 +33,113 @@ public class ViewModelTableRowFactory<S> implements Callback<TableView<S>, Table
     private BiConsumer<S, ? super DragEvent> toOnDragEntered;
     private TriConsumer<TableRow<S>, S, ? super DragEvent> toOnDragExited;
     private TriConsumer<TableRow<S>, S, ? super DragEvent> toOnDragOver;
-    private TriConsumer<TableRow<S>, S, ? super MouseDragEvent> toOnMouseDragEntered;
+    private TriConsumer<
+        TableRow<S>,
+        S,
+        ? super MouseDragEvent
+    > toOnMouseDragEntered;
     private Callback<S, String> toTooltip;
 
-    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) {
-        return setOnDragExited((row, viewModel, event) -> toOnDragExited.accept(viewModel, event));
+    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) {
-        return setOnDragOver((row, viewModel, event) -> toOnDragOver.accept(viewModel, event));
+    public ViewModelTableRowFactory<S> setOnDragOver(
+        BiConsumer<S, ? super DragEvent> toOnDragOver
+    ) {
+        return setOnDragOver((row, viewModel, event) ->
+            toOnDragOver.accept(viewModel, event)
+        );
     }
 
-    public ViewModelTableRowFactory<S> withTooltip(Callback<S, String> toTooltip) {
+    public ViewModelTableRowFactory<S> withTooltip(
+        Callback<S, String> toTooltip
+    ) {
         this.toTooltip = toTooltip;
         return this;
     }
@@ -128,27 +168,49 @@ public TableRow<S> call(TableView<S> tableView) {
             row.setOnContextMenuRequested(event -> {
                 if (!row.isEmpty()) {
                     row.setContextMenu(contextMenuFactory.apply(row.getItem()));
-                    row.getContextMenu().show(row, event.getScreenX(), event.getScreenY());
+                    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()));
+            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()
+                            );
                     }
-                    row.getContextMenu().show(row, screenPosition.getX(), screenPosition.getY());
                 }
-            });
+            );
         }
 
         if (toOnDragDetected != null) {
diff --git a/src/main/java/org/jabref/gui/util/ViewModelTextFieldTableCellVisualizationFactory.java b/src/main/java/org/jabref/gui/util/ViewModelTextFieldTableCellVisualizationFactory.java
index b7688c3b250..b3a24d71cbb 100644
--- a/src/main/java/org/jabref/gui/util/ViewModelTextFieldTableCellVisualizationFactory.java
+++ b/src/main/java/org/jabref/gui/util/ViewModelTextFieldTableCellVisualizationFactory.java
@@ -1,10 +1,11 @@
 package org.jabref.gui.util;
 
+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;
-
 import javafx.application.Platform;
 import javafx.css.PseudoClass;
 import javafx.scene.control.TableCell;
@@ -16,22 +17,26 @@
 import javafx.util.Callback;
 import javafx.util.StringConverter;
 
-import com.tobiasdiez.easybind.Subscription;
-import de.saxsys.mvvmfx.utils.validation.ValidationStatus;
-
-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 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;
     }
 
-    public void install(TableColumn<S, T> column, StringConverter<T> stringConverter) {
+    public void install(
+        TableColumn<S, T> column,
+        StringConverter<T> stringConverter
+    ) {
         column.setCellFactory(this);
         this.stringConverter = stringConverter;
     }
@@ -46,10 +51,13 @@ 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();
-                }));
+                lookupTextField()
+                    .ifPresent(textField ->
+                        Platform.runLater(() -> {
+                            textField.requestFocus();
+                            textField.selectAll();
+                        })
+                    );
             }
 
             /**
@@ -64,8 +72,13 @@ private Optional<TextField> lookupTextField() {
                     // 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) {
-                            return Optional.of((TextField) hbox.getChildren().get(1));
+                        if (
+                            (hbox.getChildren().size() > 1) &&
+                            hbox.getChildren().get(1) instanceof TextField
+                        ) {
+                            return Optional.of(
+                                (TextField) hbox.getChildren().get(1)
+                            );
                         }
                     }
                     return Optional.empty();
@@ -79,7 +92,11 @@ public void updateItem(T item, boolean empty) {
                 subscriptions.forEach(Subscription::unsubscribe);
                 subscriptions.clear();
 
-                if (empty || getTableRow() == null || getTableRow().getItem() == null) {
+                if (
+                    empty ||
+                    getTableRow() == null ||
+                    getTableRow().getItem() == null
+                ) {
                     setText(null);
                     setGraphic(null);
                     setOnMouseClicked(null);
@@ -88,14 +105,23 @@ 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(
+                        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)
+                                    .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 8080afb6c1a..9f7458d2d2e 100644
--- a/src/main/java/org/jabref/gui/util/ViewModelTreeCellFactory.java
+++ b/src/main/java/org/jabref/gui/util/ViewModelTreeCellFactory.java
@@ -12,7 +12,6 @@
 import javafx.scene.input.MouseEvent;
 import javafx.util.Callback;
 import javafx.util.StringConverter;
-
 import org.jabref.gui.icon.JabRefIcon;
 
 /**
@@ -20,7 +19,8 @@
  *
  * @param <T> cell value
  */
-public class ViewModelTreeCellFactory<T> implements Callback<TreeView<T>, TreeCell<T>> {
+public class ViewModelTreeCellFactory<T>
+    implements Callback<TreeView<T>, TreeCell<T>> {
 
     private Callback<T, String> toText;
     private Callback<T, Node> toGraphic;
@@ -32,22 +32,30 @@ public ViewModelTreeCellFactory<T> withText(Callback<T, String> toText) {
         return this;
     }
 
-    public ViewModelTreeCellFactory<T> withGraphic(Callback<T, Node> toGraphic) {
+    public ViewModelTreeCellFactory<T> withGraphic(
+        Callback<T, Node> toGraphic
+    ) {
         this.toGraphic = toGraphic;
         return this;
     }
 
-    public ViewModelTreeCellFactory<T> withIcon(Callback<T, JabRefIcon> toIcon) {
+    public ViewModelTreeCellFactory<T> withIcon(
+        Callback<T, JabRefIcon> toIcon
+    ) {
         this.toGraphic = viewModel -> toIcon.call(viewModel).getGraphicNode();
         return this;
     }
 
-    public ViewModelTreeCellFactory<T> withTooltip(Callback<T, String> toTooltip) {
+    public ViewModelTreeCellFactory<T> withTooltip(
+        Callback<T, String> toTooltip
+    ) {
         this.toTooltip = 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;
     }
@@ -59,18 +67,25 @@ public void install(TreeView<T> treeView) {
     @Override
     public TreeCell<T> call(TreeView<T> tree) {
         Callback<TreeItem<T>, ObservableValue<Boolean>> getSelectedProperty =
-                item -> {
-                    if (item instanceof CheckBoxTreeItem<?>) {
-                        return ((CheckBoxTreeItem<?>) item).selectedProperty();
-                    }
-                    return null;
-                };
+            item -> {
+                if (item instanceof CheckBoxTreeItem<?>) {
+                    return ((CheckBoxTreeItem<?>) item).selectedProperty();
+                }
+                return null;
+            };
 
-        StringConverter<TreeItem<T>> converter = new StringConverter<TreeItem<T>>() {
+        StringConverter<TreeItem<T>> converter = new StringConverter<
+            TreeItem<T>
+        >() {
             @Override
             public String toString(TreeItem<T> treeItem) {
-                return treeItem == null || treeItem.getValue() == null || toText == null ?
-                        "" : toText.call(treeItem.getValue());
+                return (
+                        treeItem == null ||
+                        treeItem.getValue() == null ||
+                        toText == null
+                    )
+                    ? ""
+                    : toText.call(treeItem.getValue());
             }
 
             @Override
diff --git a/src/main/java/org/jabref/gui/util/ViewModelTreeTableCellFactory.java b/src/main/java/org/jabref/gui/util/ViewModelTreeTableCellFactory.java
index a1e3f81b7bf..9727cf7b987 100644
--- a/src/main/java/org/jabref/gui/util/ViewModelTreeTableCellFactory.java
+++ b/src/main/java/org/jabref/gui/util/ViewModelTreeTableCellFactory.java
@@ -7,7 +7,6 @@
 import javafx.scene.control.TreeTableColumn;
 import javafx.scene.input.MouseEvent;
 import javafx.util.Callback;
-
 import org.jabref.gui.icon.JabRefIcon;
 import org.jabref.model.strings.StringUtil;
 
@@ -16,35 +15,45 @@
  *
  * @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;
     private Callback<S, EventHandler<? super MouseEvent>> toOnMouseClickedEvent;
     private Callback<S, String> toTooltip;
 
-    public ViewModelTreeTableCellFactory<S> withText(Callback<S, String> toText) {
+    public ViewModelTreeTableCellFactory<S> withText(
+        Callback<S, String> toText
+    ) {
         this.toText = toText;
         return this;
     }
 
-    public ViewModelTreeTableCellFactory<S> withGraphic(Callback<S, Node> toGraphic) {
+    public ViewModelTreeTableCellFactory<S> withGraphic(
+        Callback<S, Node> toGraphic
+    ) {
         this.toGraphic = toGraphic;
         return this;
     }
 
-    public ViewModelTreeTableCellFactory<S> withIcon(Callback<S, JabRefIcon> toIcon) {
+    public ViewModelTreeTableCellFactory<S> withIcon(
+        Callback<S, JabRefIcon> toIcon
+    ) {
         this.toGraphic = viewModel -> toIcon.call(viewModel).getGraphicNode();
         return this;
     }
 
-    public ViewModelTreeTableCellFactory<S> withTooltip(Callback<S, String> toTooltip) {
+    public ViewModelTreeTableCellFactory<S> withTooltip(
+        Callback<S, String> toTooltip
+    ) {
         this.toTooltip = toTooltip;
         return this;
     }
 
     public ViewModelTreeTableCellFactory<S> withOnMouseClickedEvent(
-            Callback<S, EventHandler<? super MouseEvent>> toOnMouseClickedEvent) {
+        Callback<S, EventHandler<? super MouseEvent>> toOnMouseClickedEvent
+    ) {
         this.toOnMouseClickedEvent = toOnMouseClickedEvent;
         return this;
     }
@@ -74,7 +83,9 @@ protected void updateItem(S viewModel, boolean empty) {
                         }
                     }
                     if (toOnMouseClickedEvent != null) {
-                        setOnMouseClicked(toOnMouseClickedEvent.call(viewModel));
+                        setOnMouseClicked(
+                            toOnMouseClickedEvent.call(viewModel)
+                        );
                     }
                 }
             }
@@ -82,7 +93,9 @@ protected void updateItem(S viewModel, boolean empty) {
     }
 
     public void install(TreeTableColumn<S, S> column) {
-        column.setCellValueFactory(cellData -> cellData.getValue().valueProperty());
+        column.setCellValueFactory(cellData ->
+            cellData.getValue().valueProperty()
+        );
         column.setCellFactory(this);
     }
 }
diff --git a/src/main/java/org/jabref/gui/util/ViewModelTreeTableRowFactory.java b/src/main/java/org/jabref/gui/util/ViewModelTreeTableRowFactory.java
index c89436d8064..5852e78358d 100644
--- a/src/main/java/org/jabref/gui/util/ViewModelTreeTableRowFactory.java
+++ b/src/main/java/org/jabref/gui/util/ViewModelTreeTableRowFactory.java
@@ -1,5 +1,6 @@
 package org.jabref.gui.util;
 
+import com.tobiasdiez.easybind.Subscription;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -7,7 +8,6 @@
 import java.util.function.BiConsumer;
 import java.util.function.Consumer;
 import java.util.function.Function;
-
 import javafx.beans.value.ObservableValue;
 import javafx.css.PseudoClass;
 import javafx.event.Event;
@@ -23,101 +23,161 @@
 import javafx.scene.input.MouseDragEvent;
 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>> {
+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;
     private Function<S, ContextMenu> contextMenuFactory;
-    private TriConsumer<TreeTableRow<S>, S, ? super MouseEvent> toOnDragDetected;
+    private TriConsumer<
+        TreeTableRow<S>,
+        S,
+        ? super MouseEvent
+    > toOnDragDetected;
     private TriConsumer<TreeTableRow<S>, S, ? super DragEvent> toOnDragDropped;
     private BiConsumer<S, ? super DragEvent> toOnDragEntered;
     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<>();
-
-    public ViewModelTreeTableRowFactory<S> withOnMouseClickedEvent(BiConsumer<S, ? super MouseEvent> event) {
+    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<>();
+
+    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) {
-        return setOnDragExited((row, viewModel, event) -> toOnDragExited.accept(viewModel, event));
+    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) {
-        return setOnDragOver((row, viewModel, event) -> toOnDragOver.accept(viewModel, event));
+    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;
     }
@@ -144,36 +204,68 @@ protected void updateItem(S row, boolean empty) {
                     setOnContextMenuRequested(event -> {
                         if (!isEmpty()) {
                             setContextMenu(contextMenuFactory.apply(row));
-                            getContextMenu().show(this, event.getScreenX(), event.getScreenY());
+                            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()));
+                    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()
+                                    );
                             }
-                            getContextMenu().show(this, screenPosition.getX(), screenPosition.getY());
                         }
-                    });
+                    );
                 }
 
                 if (!empty && (row != null)) {
                     if (onMouseClickedEvent != null) {
-                        setOnMouseClicked(event -> onMouseClickedEvent.accept(getItem(), event));
+                        setOnMouseClicked(event ->
+                            onMouseClickedEvent.accept(getItem(), event)
+                        );
                     }
 
                     if (onMousePressedEvent != null) {
-                        setOnMousePressed(event -> onMousePressedEvent.accept(getItem(), event));
+                        setOnMousePressed(event ->
+                            onMousePressedEvent.accept(getItem(), event)
+                        );
                     }
 
                     if (toCustomInitializer != null) {
@@ -181,35 +273,61 @@ protected void updateItem(S row, boolean empty) {
                     }
 
                     if (toOnDragDetected != null) {
-                        setOnDragDetected(event -> toOnDragDetected.accept(this, getItem(), event));
+                        setOnDragDetected(event ->
+                            toOnDragDetected.accept(this, getItem(), event)
+                        );
                     }
                     if (toOnDragDropped != null) {
-                        setOnDragDropped(event -> toOnDragDropped.accept(this, getItem(), event));
+                        setOnDragDropped(event ->
+                            toOnDragDropped.accept(this, getItem(), event)
+                        );
                     }
                     if (toOnDragEntered != null) {
-                        setOnDragEntered(event -> toOnDragEntered.accept(getItem(), event));
+                        setOnDragEntered(event ->
+                            toOnDragEntered.accept(getItem(), event)
+                        );
                     }
                     if (toOnDragExited != null) {
-                        setOnDragExited(event -> toOnDragExited.accept(this, getItem(), event));
+                        setOnDragExited(event ->
+                            toOnDragExited.accept(this, getItem(), event)
+                        );
                     }
                     if (toOnDragOver != null) {
-                        setOnDragOver(event -> toOnDragOver.accept(this, getItem(), event));
+                        setOnDragOver(event ->
+                            toOnDragOver.accept(this, getItem(), event)
+                        );
                     }
 
                     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(
+                    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));
+                                condition
+                            )
+                        );
                     }
                 }
             }
diff --git a/src/main/java/org/jabref/gui/util/ZipFileChooser.java b/src/main/java/org/jabref/gui/util/ZipFileChooser.java
index dd8fd8b63e5..5f155bbfef4 100644
--- a/src/main/java/org/jabref/gui/util/ZipFileChooser.java
+++ b/src/main/java/org/jabref/gui/util/ZipFileChooser.java
@@ -9,7 +9,6 @@
 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;
@@ -18,7 +17,6 @@
 import javafx.scene.control.SelectionMode;
 import javafx.scene.control.TableColumn;
 import javafx.scene.control.TableView;
-
 import org.jabref.logic.l10n.Localization;
 
 /**
@@ -34,20 +32,40 @@ public class ZipFileChooser extends BaseDialog<Path> {
     public ZipFileChooser(FileSystem zipFile) throws IOException {
         setTitle(Localization.lang("Select file from ZIP-archive"));
 
-        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, Number> sizeColumn = new TableColumn<>(Localization.lang("Size"));
+        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, 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()));
+        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)));
+                    ZonedDateTime
+                        .ofInstant(
+                            Files
+                                .getLastModifiedTime(data.getValue())
+                                .toInstant(),
+                            ZoneId.systemDefault()
+                        )
+                        .format(
+                            DateTimeFormatter.ofLocalizedDateTime(
+                                FormatStyle.MEDIUM
+                            )
+                        )
+                );
             } catch (IOException e) {
                 // Ignore
                 return new ReadOnlyStringWrapper("");
@@ -65,10 +83,9 @@ public ZipFileChooser(FileSystem zipFile) throws IOException {
 
         getDialogPane().setContent(table);
 
-        getDialogPane().getButtonTypes().setAll(
-                ButtonType.OK,
-                ButtonType.CANCEL
-        );
+        getDialogPane()
+            .getButtonTypes()
+            .setAll(ButtonType.OK, ButtonType.CANCEL);
 
         setResultConverter(button -> {
             if (button == ButtonType.OK) {
@@ -85,12 +102,16 @@ 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()));
+            Files
+                .walk(rootDir)
+                .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 38dd0d535ab..c99fea60c38 100644
--- a/src/main/java/org/jabref/gui/util/comparator/NumericFieldComparator.java
+++ b/src/main/java/org/jabref/gui/util/comparator/NumericFieldComparator.java
@@ -1,7 +1,6 @@
 package org.jabref.gui.util.comparator;
 
 import java.util.Comparator;
-
 import org.jabref.model.strings.StringUtil;
 
 /**
@@ -48,7 +47,10 @@ private static boolean isNumber(String number) {
         if (StringUtil.isNullOrEmpty(number)) {
             return false;
         }
-        if (number.length() == 1 && (number.charAt(0) == '-' || number.charAt(0) == '+')) {
+        if (
+            number.length() == 1 &&
+            (number.charAt(0) == '-' || number.charAt(0) == '+')
+        ) {
             return false;
         }
         for (int i = 0; i < number.length(); i++) {
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 79f6ff49aa5..76018685ef1 100644
--- a/src/main/java/org/jabref/gui/util/comparator/RankingFieldComparator.java
+++ b/src/main/java/org/jabref/gui/util/comparator/RankingFieldComparator.java
@@ -2,7 +2,6 @@
 
 import java.util.Comparator;
 import java.util.Optional;
-
 import org.jabref.gui.specialfields.SpecialFieldValueViewModel;
 
 /**
@@ -10,13 +9,20 @@
  * <p>
  * Inverse comparison of ranking as rank5 is higher than rank1
  */
-public class RankingFieldComparator implements Comparator<Optional<SpecialFieldValueViewModel>> {
+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());
+                int compareToRes = val1
+                    .get()
+                    .getValue()
+                    .compareTo(val2.get().getValue());
                 if (compareToRes == 0) {
                     return 0;
                 } else {
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 4c3575ad114..181953989ea 100644
--- a/src/main/java/org/jabref/gui/util/comparator/SpecialFieldComparator.java
+++ b/src/main/java/org/jabref/gui/util/comparator/SpecialFieldComparator.java
@@ -2,13 +2,16 @@
 
 import java.util.Comparator;
 import java.util.Optional;
-
 import org.jabref.gui.specialfields.SpecialFieldValueViewModel;
 
-public class SpecialFieldComparator implements Comparator<Optional<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 2ca9cf1e407..3f3163f857b 100644
--- a/src/main/java/org/jabref/gui/util/component/TemporalAccessorPicker.java
+++ b/src/main/java/org/jabref/gui/util/component/TemporalAccessorPicker.java
@@ -11,13 +11,11 @@
 import java.time.temporal.TemporalAccessor;
 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.Globals;
 import org.jabref.gui.fieldeditors.TextInputControlBehavior;
 import org.jabref.gui.fieldeditors.contextmenu.EditorContextAction;
@@ -42,24 +40,43 @@
  * Inspiration taken from https://github.com/edvin/tornadofx-controls/blob/master/src/main/java/tornadofx/control/DateTimePicker.java
  */
 public class TemporalAccessorPicker extends DatePicker {
-    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 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);
 
     public TemporalAccessorPicker() {
         setConverter(new InternalConverter());
 
         // Synchronize changes of the underlying date value with the temporalAccessorValue
-        BindingsHelper.bindBidirectional(valueProperty(), temporalAccessorValue,
-                TemporalAccessorPicker::addCurrentTime,
-                TemporalAccessorPicker::getDate);
-
-        getEditor().setOnContextMenuRequested(event -> {
-            ContextMenu contextMenu = new ContextMenu();
-            contextMenu.getItems().setAll(EditorContextAction.getDefaultContextMenuItems(getEditor(), Globals.getKeyPrefs()));
-            TextInputControlBehavior.showContextMenu(getEditor(), contextMenu, event);
-        });
+        BindingsHelper.bindBidirectional(
+            valueProperty(),
+            temporalAccessorValue,
+            TemporalAccessorPicker::addCurrentTime,
+            TemporalAccessorPicker::getDate
+        );
+
+        getEditor()
+            .setOnContextMenuRequested(event -> {
+                ContextMenu contextMenu = new ContextMenu();
+                contextMenu
+                    .getItems()
+                    .setAll(
+                        EditorContextAction.getDefaultContextMenuItems(
+                            getEditor(),
+                            Globals.getKeyPrefs()
+                        )
+                    );
+                TextInputControlBehavior.showContextMenu(
+                    getEditor(),
+                    contextMenu,
+                    event
+                );
+            });
     }
 
     private static TemporalAccessor addCurrentTime(LocalDate date) {
@@ -96,34 +113,45 @@ private static LocalDate getLocalDate(TemporalAccessor dateTime) {
         }
     }
 
-    public final ObjectProperty<StringConverter<TemporalAccessor>> stringConverterProperty() {
+    public final ObjectProperty<
+        StringConverter<TemporalAccessor>
+    > stringConverterProperty() {
         return converter;
     }
 
     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);
+            };
+        return Objects.requireNonNullElseGet(
+            stringConverterProperty().get(),
+            () -> newConverter
+        );
     }
 
-    public final void setStringConverter(StringConverter<TemporalAccessor> value) {
+    public final void setStringConverter(
+        StringConverter<TemporalAccessor> value
+    ) {
         stringConverterProperty().set(value);
     }
 
@@ -131,7 +159,9 @@ public TemporalAccessor getTemporalAccessorValue() {
         return temporalAccessorValue.get();
     }
 
-    public void setTemporalAccessorValue(TemporalAccessor temporalAccessorValue) {
+    public void setTemporalAccessorValue(
+        TemporalAccessor temporalAccessorValue
+    ) {
         this.temporalAccessorValue.set(temporalAccessorValue);
     }
 
@@ -140,12 +170,15 @@ public ObjectProperty<TemporalAccessor> temporalAccessorValueProperty() {
     }
 
     private class InternalConverter extends StringConverter<LocalDate> {
+
         @Override
         public String toString(LocalDate object) {
             TemporalAccessor value = getTemporalAccessorValue();
 
             // Keeps the original text when it is an invalid date
-            return value != null ? getStringConverter().toString(value) : getEditor().getText();
+            return value != null
+                ? getStringConverter().toString(value)
+                : getEditor().getText();
         }
 
         @Override
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 29d31651d5b..9ad59a70056 100644
--- a/src/main/java/org/jabref/gui/util/uithreadaware/UiThreadChangeListener.java
+++ b/src/main/java/org/jabref/gui/util/uithreadaware/UiThreadChangeListener.java
@@ -12,8 +12,14 @@ public UiThreadChangeListener(ChangeListener<T> delegate) {
     }
 
     @Override
-    public void changed(ObservableValue<? extends T> observable, T oldValue, T newValue) {
-        UiThreadHelper.ensureUiThreadExecution(() -> delegate.changed(observable, oldValue, newValue));
+    public void changed(
+        ObservableValue<? extends T> observable,
+        T oldValue,
+        T newValue
+    ) {
+        UiThreadHelper.ensureUiThreadExecution(() ->
+            delegate.changed(observable, oldValue, newValue)
+        );
     }
 
     @Override
diff --git a/src/main/java/org/jabref/gui/util/uithreadaware/UiThreadInvalidationListener.java b/src/main/java/org/jabref/gui/util/uithreadaware/UiThreadInvalidationListener.java
index 818c85a15a5..704463f2dc3 100644
--- a/src/main/java/org/jabref/gui/util/uithreadaware/UiThreadInvalidationListener.java
+++ b/src/main/java/org/jabref/gui/util/uithreadaware/UiThreadInvalidationListener.java
@@ -13,7 +13,9 @@ public UiThreadInvalidationListener(InvalidationListener delegate) {
 
     @Override
     public void invalidated(Observable observable) {
-        UiThreadHelper.ensureUiThreadExecution(() -> delegate.invalidated(observable));
+        UiThreadHelper.ensureUiThreadExecution(() ->
+            delegate.invalidated(observable)
+        );
     }
 
     @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 17556211480..a6c47d2518d 100644
--- a/src/main/java/org/jabref/gui/util/uithreadaware/UiThreadObservableList.java
+++ b/src/main/java/org/jabref/gui/util/uithreadaware/UiThreadObservableList.java
@@ -4,7 +4,6 @@
 import java.util.Iterator;
 import java.util.List;
 import java.util.ListIterator;
-
 import javafx.beans.InvalidationListener;
 import javafx.collections.ListChangeListener;
 import javafx.collections.ObservableList;
diff --git a/src/main/java/org/jabref/http/JabrefMediaType.java b/src/main/java/org/jabref/http/JabrefMediaType.java
index b1d3598867e..bd28fe06695 100644
--- a/src/main/java/org/jabref/http/JabrefMediaType.java
+++ b/src/main/java/org/jabref/http/JabrefMediaType.java
@@ -1,6 +1,8 @@
 package org.jabref.http;
 
 public class JabrefMediaType {
+
     public static final String BIBTEX = "application/x-bibtex";
-    public static final String JSON_CSL_ITEM = "application/x-bibtex-library-csl+json";
+    public static final String JSON_CSL_ITEM =
+        "application/x-bibtex-library-csl+json";
 }
diff --git a/src/main/java/org/jabref/http/dto/BibEntryDTO.java b/src/main/java/org/jabref/http/dto/BibEntryDTO.java
index 1e36564072d..1b8b168f729 100644
--- a/src/main/java/org/jabref/http/dto/BibEntryDTO.java
+++ b/src/main/java/org/jabref/http/dto/BibEntryDTO.java
@@ -1,8 +1,8 @@
 package org.jabref.http.dto;
 
+import com.google.common.base.MoreObjects;
 import java.io.IOException;
 import java.io.StringWriter;
-
 import org.jabref.logic.bibtex.BibEntryWriter;
 import org.jabref.logic.bibtex.FieldPreferences;
 import org.jabref.logic.bibtex.FieldWriter;
@@ -11,8 +11,6 @@
 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;
 
@@ -24,22 +22,48 @@
  * @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 static final Logger LOGGER = LoggerFactory.getLogger(BibEntryDTO.class);
+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(),
-                bibEntry.getUserComments(),
-                bibEntry.getCitationKey().orElse(""),
-                convertToString(bibEntry, bibDatabaseMode, fieldWriterPreferences, bibEntryTypesManager)
+    public BibEntryDTO(
+        BibEntry bibEntry,
+        BibDatabaseMode bibDatabaseMode,
+        FieldPreferences fieldWriterPreferences,
+        BibEntryTypesManager bibEntryTypesManager
+    ) {
+        this(
+            bibEntry.getSharedBibEntryData(),
+            bibEntry.getUserComments(),
+            bibEntry.getCitationKey().orElse(""),
+            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) {
@@ -61,11 +85,12 @@ 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();
+        return MoreObjects
+            .toStringHelper(this)
+            .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 77da67f9ba4..2c8bf08163a 100644
--- a/src/main/java/org/jabref/http/dto/GsonFactory.java
+++ b/src/main/java/org/jabref/http/dto/GsonFactory.java
@@ -5,14 +5,12 @@
 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/server/Application.java b/src/main/java/org/jabref/http/server/Application.java
index 00567335edb..17b349a3bea 100644
--- a/src/main/java/org/jabref/http/server/Application.java
+++ b/src/main/java/org/jabref/http/server/Application.java
@@ -1,14 +1,12 @@
 package org.jabref.http.server;
 
-import java.util.Set;
-
-import org.jabref.http.dto.GsonFactory;
-import org.jabref.preferences.PreferenceServiceFactory;
-
 import jakarta.inject.Inject;
 import jakarta.ws.rs.ApplicationPath;
+import java.util.Set;
 import org.glassfish.hk2.api.ServiceLocator;
 import org.glassfish.hk2.utilities.ServiceLocatorUtilities;
+import org.jabref.http.dto.GsonFactory;
+import org.jabref.preferences.PreferenceServiceFactory;
 
 @ApplicationPath("/")
 public class Application extends jakarta.ws.rs.core.Application {
@@ -19,14 +17,25 @@ public class Application extends jakarta.ws.rs.core.Application {
     @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
+        );
     }
 
     /**
      * Separate initialization method, because @Inject does not support injection at the constructor
      */
     private void initialize() {
-        ServiceLocatorUtilities.addFactoryConstants(serviceLocator, new GsonFactory());
-        ServiceLocatorUtilities.addFactoryConstants(serviceLocator, new PreferenceServiceFactory());
+        ServiceLocatorUtilities.addFactoryConstants(
+            serviceLocator,
+            new GsonFactory()
+        );
+        ServiceLocatorUtilities.addFactoryConstants(
+            serviceLocator,
+            new PreferenceServiceFactory()
+        );
     }
 }
diff --git a/src/main/java/org/jabref/http/server/CORSFilter.java b/src/main/java/org/jabref/http/server/CORSFilter.java
index 7489305808f..37537cbc482 100644
--- a/src/main/java/org/jabref/http/server/CORSFilter.java
+++ b/src/main/java/org/jabref/http/server/CORSFilter.java
@@ -7,17 +7,37 @@
 
 @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
-            responseContext.getHeaders().add("Access-Control-Allow-Origin", "*");
+            responseContext
+                .getHeaders()
+                .add("Access-Control-Allow-Origin", "*");
         } else if (requestOrigin.contains("://localhost")) {
-            responseContext.getHeaders().add("Access-Control-Allow-Origin", requestOrigin);
+            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-Credentials", "false");
+        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 a5ea28c0ee1..e4717bfe3c2 100644
--- a/src/main/java/org/jabref/http/server/LibrariesResource.java
+++ b/src/main/java/org/jabref/http/server/LibrariesResource.java
@@ -1,29 +1,33 @@
 package org.jabref.http.server;
 
-import java.util.List;
-
-import org.jabref.logic.util.io.BackupFileUtil;
-import org.jabref.preferences.PreferencesService;
-
 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 java.util.List;
+import org.jabref.logic.util.io.BackupFileUtil;
+import org.jabref.preferences.PreferencesService;
 
 @Path("libraries")
 public class LibrariesResource {
+
     @Inject
     PreferencesService preferences;
 
     @GET
     @Produces(MediaType.APPLICATION_JSON)
     public String get() {
-        List<String> fileNamesWithUniqueSuffix = preferences.getGuiPreferences().getLastFilesOpened().stream()
-                                                            .map(java.nio.file.Path::of)
-                                                            .map(p -> p.getFileName() + "-" + BackupFileUtil.getUniqueFilePrefix(p))
-                                                            .toList();
+        List<String> fileNamesWithUniqueSuffix = preferences
+            .getGuiPreferences()
+            .getLastFilesOpened()
+            .stream()
+            .map(java.nio.file.Path::of)
+            .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 2ff4b970723..85ce0e88220 100644
--- a/src/main/java/org/jabref/http/server/LibraryResource.java
+++ b/src/main/java/org/jabref/http/server/LibraryResource.java
@@ -1,10 +1,19 @@
 package org.jabref.http.server;
 
+import com.google.gson.Gson;
+import jakarta.inject.Inject;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.InternalServerErrorException;
+import jakarta.ws.rs.NotFoundException;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.PathParam;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.Response;
 import java.io.IOException;
 import java.nio.file.Files;
 import java.util.List;
 import java.util.Objects;
-
 import org.jabref.gui.Globals;
 import org.jabref.http.JabrefMediaType;
 import org.jabref.http.dto.BibEntryDTO;
@@ -15,23 +24,15 @@
 import org.jabref.model.entry.BibEntryTypesManager;
 import org.jabref.model.util.DummyFileUpdateMonitor;
 import org.jabref.preferences.PreferencesService;
-
-import com.google.gson.Gson;
-import jakarta.inject.Inject;
-import jakarta.ws.rs.GET;
-import jakarta.ws.rs.InternalServerErrorException;
-import jakarta.ws.rs.NotFoundException;
-import jakarta.ws.rs.Path;
-import jakarta.ws.rs.PathParam;
-import jakarta.ws.rs.Produces;
-import jakarta.ws.rs.core.MediaType;
-import jakarta.ws.rs.core.Response;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 @Path("libraries/{id}")
 public class LibraryResource {
-    public static final Logger LOGGER = LoggerFactory.getLogger(LibraryResource.class);
+
+    public static final Logger LOGGER = LoggerFactory.getLogger(
+        LibraryResource.class
+    );
 
     @Inject
     PreferencesService preferences;
@@ -43,10 +44,24 @@ public class LibraryResource {
     @Produces(MediaType.APPLICATION_JSON)
     public String getJson(@PathParam("id") String id) {
         ParserResult parserResult = getParserResult(id);
-        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(), Globals.entryTypesManager))
-                                             .toList();
+        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(),
+                    Globals.entryTypesManager
+                )
+            )
+            .toList();
         return gson.toJson(list);
     }
 
@@ -54,8 +69,12 @@ public String getJson(@PathParam("id") String id) {
     @Produces(JabrefMediaType.JSON_CSL_ITEM)
     public String getClsItemJson(@PathParam("id") String id) {
         ParserResult parserResult = getParserResult(id);
-        JabRefItemDataProvider jabRefItemDataProvider = new JabRefItemDataProvider();
-        jabRefItemDataProvider.setData(parserResult.getDatabaseContext(), new BibEntryTypesManager());
+        JabRefItemDataProvider jabRefItemDataProvider =
+            new JabRefItemDataProvider();
+        jabRefItemDataProvider.setData(
+            parserResult.getDatabaseContext(),
+            new BibEntryTypesManager()
+        );
         return jabRefItemDataProvider.toJson();
     }
 
@@ -63,10 +82,18 @@ 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);
+            throw new InternalServerErrorException(
+                "Could not parse library",
+                e
+            );
         }
         return parserResult;
     }
@@ -80,19 +107,26 @@ public Response getBibtex(@PathParam("id") String id) {
             libraryAsString = Files.readString(library);
         } catch (IOException e) {
             LOGGER.error("Could not read library {}", library, e);
-            throw new InternalServerErrorException("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.getGuiPreferences().getLastFilesOpened()
-                          .stream()
-                          .map(java.nio.file.Path::of)
-                          .filter(p -> (p.getFileName() + "-" + BackupFileUtil.getUniqueFilePrefix(p)).equals(id))
-                          .findAny()
-                          .orElseThrow(NotFoundException::new);
+        return preferences
+            .getGuiPreferences()
+            .getLastFilesOpened()
+            .stream()
+            .map(java.nio.file.Path::of)
+            .filter(p ->
+                (p.getFileName() +
+                    "-" +
+                    BackupFileUtil.getUniqueFilePrefix(p)).equals(id)
+            )
+            .findAny()
+            .orElseThrow(NotFoundException::new);
     }
 }
diff --git a/src/main/java/org/jabref/http/server/RootResource.java b/src/main/java/org/jabref/http/server/RootResource.java
index c55f2583db3..2b5e713de55 100644
--- a/src/main/java/org/jabref/http/server/RootResource.java
+++ b/src/main/java/org/jabref/http/server/RootResource.java
@@ -7,16 +7,17 @@
 
 @Path("/")
 public class RootResource {
+
     @GET
     @Produces(MediaType.TEXT_HTML)
     public String get() {
         return """
-<html>
-<body>
-<p>
-  JabRef http API runs. Please navigate to <a href="libraries">libraries</a>.
-</p>
-</body>
-""";
+        <html>
+        <body>
+        <p>
+          JabRef http API runs. Please navigate to <a href="libraries">libraries</a>.
+        </p>
+        </body>
+        """;
     }
 }
diff --git a/src/main/java/org/jabref/http/server/Server.java b/src/main/java/org/jabref/http/server/Server.java
index e238dceb577..abe74b1083b 100644
--- a/src/main/java/org/jabref/http/server/Server.java
+++ b/src/main/java/org/jabref/http/server/Server.java
@@ -1,5 +1,6 @@
 package org.jabref.http.server;
 
+import jakarta.ws.rs.SeBootstrap;
 import java.net.URI;
 import java.net.URISyntaxException;
 import java.nio.file.Files;
@@ -7,24 +8,22 @@
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
-
-import javax.net.ssl.SSLContext;
-
 import javafx.collections.ObservableList;
-
+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.util.OS;
 import org.jabref.preferences.JabRefPreferences;
-
-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.")
+@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);
 
     private static SeBootstrap.Instance serverInstance;
@@ -33,25 +32,33 @@ public class Server {
      * Starts an http server serving the last files opened in JabRef<br>
      * More files can be provided as args.
      */
-    public static void main(final String[] args) throws InterruptedException, URISyntaxException {
+    public static void main(final String[] args)
+        throws InterruptedException, URISyntaxException {
         SLF4JBridgeHandler.removeHandlersForRootLogger();
         SLF4JBridgeHandler.install();
 
-        final ObservableList<String> lastFilesOpened = JabRefPreferences.getInstance().getGuiPreferences().getLastFilesOpened();
+        final ObservableList<String> lastFilesOpened = JabRefPreferences
+            .getInstance()
+            .getGuiPreferences()
+            .getLastFilesOpened();
 
         // 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
         if (args.length > 0) {
             LOGGER.debug("Command line parameters passed");
-            List<String> filesToAdd = Arrays.stream(args)
-                                            .map(Path::of)
-                                            .filter(Files::exists)
-                                            .map(Path::toString)
-                                            .filter(path -> !lastFilesOpened.contains(path))
-                                            .toList();
-
-            LOGGER.debug("Adding following files to the list of opened libraries: {}", filesToAdd);
+            List<String> filesToAdd = Arrays
+                .stream(args)
+                .map(Path::of)
+                .filter(Files::exists)
+                .map(Path::toString)
+                .filter(path -> !lastFilesOpened.contains(path))
+                .toList();
+
+            LOGGER.debug(
+                "Adding following files to the list of opened libraries: {}",
+                filesToAdd
+            );
 
             // add the files in the front of the last opened libraries
             Collections.reverse(filesToAdd);
@@ -61,10 +68,16 @@ public static void main(final String[] args) throws InterruptedException, URISyn
         }
 
         if (lastFilesOpened.isEmpty()) {
-            LOGGER.debug("still no library available to serve, serve the demo library");
+            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.toString());
         }
@@ -80,39 +93,56 @@ public static void main(final String[] args) throws InterruptedException, URISyn
     private static void startServer() {
         SSLContext sslContext = getSslContext();
         SeBootstrap.Configuration configuration = SeBootstrap.Configuration
-                .builder()
-                .sslContext(sslContext)
-                .protocol("HTTPS")
-                .port(6051)
-                .build();
+            .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 ->
-                    System.out.printf("Stop result: %s [Native stop result: %s].%n", stopResult,
-                            stopResult.unwrap(Object.class)));
-            final URI uri = instance.configuration().baseUri();
-            System.out.printf("Instance %s running at %s [Native handle: %s].%n", instance, uri,
-                    instance.unwrap(Object.class));
-            System.out.println("Send SIGKILL to shutdown.");
-            serverInstance = instance;
-        });
+        SeBootstrap
+            .start(Application.class, configuration)
+            .thenAccept(instance -> {
+                LOGGER.debug("Server started.");
+                instance.stopOnShutdown(stopResult ->
+                    System.out.printf(
+                        "Stop result: %s [Native stop result: %s].%n",
+                        stopResult,
+                        stopResult.unwrap(Object.class)
+                    )
+                );
+                final URI uri = instance.configuration().baseUri();
+                System.out.printf(
+                    "Instance %s running at %s [Native handle: %s].%n",
+                    instance,
+                    uri,
+                    instance.unwrap(Object.class)
+                );
+                System.out.println("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();
     }
diff --git a/src/main/java/org/jabref/logic/JabRefException.java b/src/main/java/org/jabref/logic/JabRefException.java
index 687383f9823..45041856d47 100644
--- a/src/main/java/org/jabref/logic/JabRefException.java
+++ b/src/main/java/org/jabref/logic/JabRefException.java
@@ -5,7 +5,9 @@
 
 public class JabRefException extends Exception {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(JabRefException.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(
+        JabRefException.class
+    );
     private String localizedMessage;
 
     public JabRefException(String message) {
@@ -21,7 +23,11 @@ public JabRefException(String message, String localizedMessage) {
         this.localizedMessage = localizedMessage;
     }
 
-    public JabRefException(String message, String localizedMessage, Throwable cause) {
+    public JabRefException(
+        String message,
+        String localizedMessage,
+        Throwable cause
+    ) {
         super(message, cause);
         this.localizedMessage = localizedMessage;
     }
@@ -33,7 +39,9 @@ public JabRefException(Throwable cause) {
     @Override
     public String getLocalizedMessage() {
         if (localizedMessage == null) {
-            LOGGER.debug("No localized exception message defined. Falling back to getMessage().");
+            LOGGER.debug(
+                "No localized exception message defined. Falling back to getMessage()."
+            );
             return getMessage();
         } else {
             return localizedMessage;
diff --git a/src/main/java/org/jabref/logic/TypedBibEntry.java b/src/main/java/org/jabref/logic/TypedBibEntry.java
index a4da3dbcb80..b562aaa0f35 100644
--- a/src/main/java/org/jabref/logic/TypedBibEntry.java
+++ b/src/main/java/org/jabref/logic/TypedBibEntry.java
@@ -2,7 +2,6 @@
 
 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;
@@ -38,10 +37,18 @@ public TypedBibEntry(BibEntry entry, BibDatabaseContext databaseContext) {
      *
      * @return true if all required fields are set, false otherwise
      */
-    public boolean hasAllRequiredFields(BibEntryTypesManager entryTypesManager) {
-        Optional<BibEntryType> type = entryTypesManager.enrich(entry.getType(), this.mode);
+    public boolean hasAllRequiredFields(
+        BibEntryTypesManager entryTypesManager
+    ) {
+        Optional<BibEntryType> type = entryTypesManager.enrich(
+            entry.getType(),
+            this.mode
+        );
         if (type.isPresent()) {
-            return entry.allFieldsPresent(type.get().getRequiredFields(), database.orElse(null));
+            return entry.allFieldsPresent(
+                type.get().getRequiredFields(),
+                database.orElse(null)
+            );
         } else {
             return true;
         }
diff --git a/src/main/java/org/jabref/logic/WatchServiceUnavailableException.java b/src/main/java/org/jabref/logic/WatchServiceUnavailableException.java
index e669bef855b..c99446b08f8 100644
--- a/src/main/java/org/jabref/logic/WatchServiceUnavailableException.java
+++ b/src/main/java/org/jabref/logic/WatchServiceUnavailableException.java
@@ -1,7 +1,12 @@
 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/auxparser/AuxParserResult.java b/src/main/java/org/jabref/logic/auxparser/AuxParserResult.java
index d9ca4460f74..177555a4a75 100644
--- a/src/main/java/org/jabref/logic/auxparser/AuxParserResult.java
+++ b/src/main/java/org/jabref/logic/auxparser/AuxParserResult.java
@@ -5,7 +5,6 @@
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
-
 import org.jabref.model.database.BibDatabase;
 import org.jabref.model.entry.BibtexString;
 
diff --git a/src/main/java/org/jabref/logic/auxparser/DefaultAuxParser.java b/src/main/java/org/jabref/logic/auxparser/DefaultAuxParser.java
index 68c80974aa4..ac732a5508c 100644
--- a/src/main/java/org/jabref/logic/auxparser/DefaultAuxParser.java
+++ b/src/main/java/org/jabref/logic/auxparser/DefaultAuxParser.java
@@ -10,11 +10,9 @@
 import java.util.Optional;
 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;
 
@@ -30,10 +28,17 @@
  * BibTeX citation: \citation{x,y,z} Biblatex citation: \abx@aux@cite{x,y,z} Nested AUX files: \@input{x}
  */
 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 INPUT_PATTERN = Pattern.compile("\\\\@input\\{(.+)\\}");
+    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 INPUT_PATTERN = Pattern.compile(
+        "\\\\@input\\{(.+)\\}"
+    );
 
     private final BibDatabase masterDatabase;
 
@@ -83,7 +88,12 @@ 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()) {
@@ -126,8 +136,15 @@ private void resolveTags(AuxParserResult result) {
         List<BibEntry> entriesToInsert = new ArrayList<>();
 
         for (String key : result.getUniqueKeys()) {
-            if (!result.getGeneratedBibDatabase().getEntryByCitationKey(key).isPresent()) {
-                Optional<BibEntry> entry = masterDatabase.getEntryByCitationKey(key);
+            if (
+                !result
+                    .getGeneratedBibDatabase()
+                    .getEntryByCitationKey(key)
+                    .isPresent()
+            ) {
+                Optional<BibEntry> entry = masterDatabase.getEntryByCitationKey(
+                    key
+                );
                 if (entry.isPresent()) {
                     entriesToInsert.add(entry.get());
                 } else {
@@ -141,7 +158,11 @@ 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()
+                )
+            );
         }
     }
 
@@ -151,23 +172,34 @@ private void resolveTags(AuxParserResult result) {
      * @param entries Entries to check for CrossRefs
      * @param result AUX file
      */
-    private void resolveCrossReferences(List<BibEntry> entries, 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).isPresent()) {
-                    Optional<BibEntry> refEntry = masterDatabase.getEntryByCitationKey(crossref);
-
-                    if (refEntry.isPresent()) {
-                        if (!entriesToInsert.contains(refEntry.get())) {
-                            entriesToInsert.add(refEntry.get());
-                            result.increaseCrossRefEntriesCounter();
+            entry
+                .getField(StandardField.CROSSREF)
+                .ifPresent(crossref -> {
+                    if (
+                        !result
+                            .getGeneratedBibDatabase()
+                            .getEntryByCitationKey(crossref)
+                            .isPresent()
+                    ) {
+                        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);
                         }
-                    } 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 663fa3e3fee..3b0a96063a7 100644
--- a/src/main/java/org/jabref/logic/bibtex/BibEntryWriter.java
+++ b/src/main/java/org/jabref/logic/bibtex/BibEntryWriter.java
@@ -13,7 +13,6 @@
 import java.util.TreeSet;
 import java.util.function.Predicate;
 import java.util.stream.Collectors;
-
 import org.jabref.logic.TypedBibEntry;
 import org.jabref.logic.exporter.BibWriter;
 import org.jabref.logic.util.OS;
@@ -26,22 +25,29 @@
 import org.jabref.model.entry.field.InternalField;
 import org.jabref.model.entry.field.OrFields;
 import org.jabref.model.strings.StringUtil;
-
 import org.slf4j.LoggerFactory;
 
 public class BibEntryWriter {
 
-    private static final org.slf4j.Logger LOGGER = LoggerFactory.getLogger(BibEntryWriter.class);
+    private static final org.slf4j.Logger LOGGER = LoggerFactory.getLogger(
+        BibEntryWriter.class
+    );
 
     private final BibEntryTypesManager entryTypesManager;
     private final FieldWriter fieldWriter;
 
-    public BibEntryWriter(FieldWriter fieldWriter, BibEntryTypesManager entryTypesManager) {
+    public BibEntryWriter(
+        FieldWriter fieldWriter,
+        BibEntryTypesManager entryTypesManager
+    ) {
         this.fieldWriter = fieldWriter;
         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 +56,11 @@ 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 +72,12 @@ 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());
@@ -71,11 +86,16 @@ public void write(BibEntry entry, BibWriter out, BibDatabaseMode bibDatabaseMode
         }
 
         writeUserComments(entry, out);
-        writeRequiredFieldsFirstRemainingFieldsSecond(entry, out, bibDatabaseMode);
+        writeRequiredFieldsFirstRemainingFieldsSecond(
+            entry,
+            out,
+            bibDatabaseMode
+        );
         out.finishBlock();
     }
 
-    private void writeUserComments(BibEntry entry, BibWriter out) throws IOException {
+    private void writeUserComments(BibEntry entry, BibWriter out)
+        throws IOException {
         String userComments = entry.getUserComments();
 
         if (!userComments.isEmpty()) {
@@ -88,8 +108,11 @@ 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() + '{');
@@ -100,28 +123,33 @@ private void writeRequiredFieldsFirstRemainingFieldsSecond(BibEntry entry, BibWr
         written.add(InternalField.KEY_FIELD);
         final int indent = getLengthOfLongestFieldName(entry);
 
-        Optional<BibEntryType> type = entryTypesManager.enrich(entry.getType(), bibDatabaseMode);
+        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))
-                    .collect(Collectors.toList());
+            List<Field> requiredFields = type
+                .get()
+                .getRequiredFields()
+                .stream()
+                .map(OrFields::getFields)
+                .flatMap(Collection::stream)
+                .sorted(Comparator.comparing(Field::getName))
+                .collect(Collectors.toList());
 
             for (Field field : requiredFields) {
                 writeField(entry, out, field, indent);
             }
 
             // Then optional fields
-            List<Field> optionalFields = type.get()
-                                             .getOptionalFields()
-                                             .stream()
-                                             .map(BibField::field)
-                                             .sorted(Comparator.comparing(Field::getName))
-                                             .collect(Collectors.toList());
+            List<Field> optionalFields = type
+                .get()
+                .getOptionalFields()
+                .stream()
+                .map(BibField::field)
+                .sorted(Comparator.comparing(Field::getName))
+                .collect(Collectors.toList());
 
             for (Field field : optionalFields) {
                 writeField(entry, out, field, indent);
@@ -131,10 +159,15 @@ private void writeRequiredFieldsFirstRemainingFieldsSecond(BibEntry entry, BibWr
             written.addAll(optionalFields);
         }
         // 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);
@@ -144,8 +177,11 @@ private void writeRequiredFieldsFirstRemainingFieldsSecond(BibEntry entry, BibWr
         out.writeLine("}");
     }
 
-    private void writeKeyField(BibEntry entry, BibWriter out) throws IOException {
-        String keyField = StringUtil.shaveString(entry.getCitationKey().orElse(""));
+    private void writeKeyField(BibEntry entry, BibWriter out)
+        throws IOException {
+        String keyField = StringUtil.shaveString(
+            entry.getCitationKey().orElse("")
+        );
         out.writeLine(keyField + ',');
     }
 
@@ -157,7 +193,12 @@ 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
@@ -167,21 +208,37 @@ 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(",");
         }
     }
 
     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);
+        Predicate<Field> isNotCitationKey = field ->
+            InternalField.KEY_FIELD != field;
+        return entry
+            .getFields()
+            .stream()
+            .filter(isNotCitationKey)
+            .mapToInt(field -> field.getName().length())
+            .max()
+            .orElse(0);
     }
 
     /**
@@ -198,6 +255,10 @@ 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/FieldContentFormatter.java b/src/main/java/org/jabref/logic/bibtex/FieldContentFormatter.java
index 726ea97de55..7487257c318 100644
--- a/src/main/java/org/jabref/logic/bibtex/FieldContentFormatter.java
+++ b/src/main/java/org/jabref/logic/bibtex/FieldContentFormatter.java
@@ -4,7 +4,6 @@
 import java.util.Objects;
 import java.util.Set;
 import java.util.regex.Pattern;
-
 import org.jabref.model.entry.field.Field;
 import org.jabref.model.entry.field.StandardField;
 
diff --git a/src/main/java/org/jabref/logic/bibtex/FieldPreferences.java b/src/main/java/org/jabref/logic/bibtex/FieldPreferences.java
index 7390f932c74..0fd646adcc6 100644
--- a/src/main/java/org/jabref/logic/bibtex/FieldPreferences.java
+++ b/src/main/java/org/jabref/logic/bibtex/FieldPreferences.java
@@ -2,12 +2,10 @@
 
 import java.util.Collection;
 import java.util.List;
-
 import javafx.beans.property.BooleanProperty;
 import javafx.beans.property.SimpleBooleanProperty;
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableList;
-
 import org.jabref.model.entry.field.Field;
 
 public class FieldPreferences {
@@ -19,12 +17,16 @@ 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);
+        this.resolvableFields =
+            FXCollections.observableArrayList(resolvableFields);
+        this.nonWrappableFields =
+            FXCollections.observableArrayList(nonWrappableFields);
     }
 
     public boolean shouldResolveStrings() {
diff --git a/src/main/java/org/jabref/logic/bibtex/FieldWriter.java b/src/main/java/org/jabref/logic/bibtex/FieldWriter.java
index 7e9c91e46b7..7af4f6bedb3 100644
--- a/src/main/java/org/jabref/logic/bibtex/FieldWriter.java
+++ b/src/main/java/org/jabref/logic/bibtex/FieldWriter.java
@@ -1,7 +1,6 @@
 package org.jabref.logic.bibtex;
 
 import org.jabref.model.entry.field.Field;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -13,7 +12,9 @@ public class FieldWriter {
     // See also ADR-0024
     public static final char BIBTEX_STRING_START_END_SYMBOL = '#';
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(FieldWriter.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(
+        FieldWriter.class
+    );
 
     private static final char FIELD_START = '{';
     private static final char FIELD_END = '}';
@@ -26,7 +27,10 @@ public FieldWriter(FieldPreferences preferences) {
         this(true, preferences);
     }
 
-    private FieldWriter(boolean neverFailOnHashes, FieldPreferences preferences) {
+    private FieldWriter(
+        boolean neverFailOnHashes,
+        FieldPreferences preferences
+    ) {
         this.neverFailOnHashes = neverFailOnHashes;
         this.preferences = preferences;
 
@@ -37,7 +41,8 @@ public static FieldWriter buildIgnoreHashes(FieldPreferences prefs) {
         return new FieldWriter(true, prefs);
     }
 
-    private static void checkBraces(String text) throws InvalidFieldValueException {
+    private static void checkBraces(String text)
+        throws InvalidFieldValueException {
         int left = 0;
         int right = 0;
 
@@ -59,16 +64,30 @@ 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);
-            throw new InvalidFieldValueException("Braces don't match. Field value: " + text);
+            throw new InvalidFieldValueException(
+                "Braces don't match. Field value: " + text
+            );
         }
     }
 
@@ -80,7 +99,8 @@ private static void checkBraces(String text) throws InvalidFieldValueException {
      * @return a formatted string suitable for output
      * @throws InvalidFieldValueException if s is not a correct bibtex string, e.g., because of improperly balanced braces or using # not paired
      */
-    public String write(Field field, String content) throws InvalidFieldValueException {
+    public String write(Field field, String content)
+        throws InvalidFieldValueException {
         if (content == null) {
             return FIELD_START + String.valueOf(FIELD_END);
         }
@@ -97,7 +117,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);
 
         StringBuilder stringBuilder = new StringBuilder();
@@ -125,21 +146,30 @@ private String formatAndResolveStrings(String content, Field field) throws Inval
                 pos1 = content.length(); // No more occurrences found.
                 pos2 = -1;
             } else {
-                pos2 = content.indexOf(BIBTEX_STRING_START_END_SYMBOL, pos1 + 1);
+                pos2 =
+                    content.indexOf(BIBTEX_STRING_START_END_SYMBOL, pos1 + 1);
                 if (pos2 == -1) {
                     if (neverFailOnHashes) {
                         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 '\\{}'. "
-                                + "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);
+                        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"
-                                        + "In JabRef, use pairs of # characters to indicate a string.\n"
-                                        + "Note that the entry causing the problem has been selected. Field value: " + content);
+                            "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
+                        );
                     }
                 }
             }
@@ -151,8 +181,14 @@ 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,
-                        (pos2 + 1) == content.length());
+                writeStringLabel(
+                    stringBuilder,
+                    content,
+                    pos1 + 1,
+                    pos2,
+                    pos1 == pivot,
+                    (pos2 + 1) == content.length()
+                );
             }
 
             if (pos2 > -1) {
@@ -173,10 +209,13 @@ 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 stringBuilder = new StringBuilder(
+            String.valueOf(FIELD_START)
+        );
         stringBuilder.append(formatter.format(content, field));
         stringBuilder.append(FIELD_END);
         return stringBuilder.toString();
@@ -186,7 +225,12 @@ private String formatWithoutResolvingStrings(String content, Field field) throws
      * @param stringBuilder the StringBuilder to append the text to
      * @param text          the text to append
      */
-    private void writeText(StringBuilder stringBuilder, String text, int startPos, int endPos) {
+    private void writeText(
+        StringBuilder stringBuilder,
+        String text,
+        int startPos,
+        int endPos
+    ) {
         stringBuilder.append(FIELD_START);
         stringBuilder.append(text, startPos, endPos);
         stringBuilder.append(FIELD_END);
@@ -200,8 +244,18 @@ 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 237e160dfb9..15fc7974439 100644
--- a/src/main/java/org/jabref/logic/bibtex/FileFieldWriter.java
+++ b/src/main/java/org/jabref/logic/bibtex/FileFieldWriter.java
@@ -4,19 +4,22 @@
 import java.util.Collections;
 import java.util.List;
 import java.util.stream.Collectors;
-
 import org.jabref.model.entry.LinkedFile;
 
 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) {
-            array[i] = new String[] {entry.getDescription(), entry.getLink(), entry.getFileType()};
+            array[i] =
+                new String[] {
+                    entry.getDescription(),
+                    entry.getLink(),
+                    entry.getFileType(),
+                };
             i++;
         }
         return encodeStringArray(array);
@@ -34,9 +37,10 @@ public static String getStringRepresentation(LinkedFile field) {
      * @return The encoded String.
      */
     public static String encodeStringArray(String[][] values) {
-        return Arrays.stream(values)
-                     .map(FileFieldWriter::encodeStringArray)
-                     .collect(Collectors.joining(";"));
+        return Arrays
+            .stream(values)
+            .map(FileFieldWriter::encodeStringArray)
+            .collect(Collectors.joining(";"));
     }
 
     /**
@@ -47,9 +51,10 @@ 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/comparator/BibDatabaseDiff.java b/src/main/java/org/jabref/logic/bibtex/comparator/BibDatabaseDiff.java
index 7645ed85d1c..84185b9512f 100644
--- a/src/main/java/org/jabref/logic/bibtex/comparator/BibDatabaseDiff.java
+++ b/src/main/java/org/jabref/logic/bibtex/comparator/BibDatabaseDiff.java
@@ -5,7 +5,6 @@
 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;
@@ -21,32 +20,66 @@ public class BibDatabaseDiff {
     private final List<BibStringDiff> bibStringDiffs;
     private final List<BibEntryDiff> entryDiffs;
 
-    private BibDatabaseDiff(BibDatabaseContext originalDatabase, BibDatabaseContext newDatabase, boolean includeEmptyEntries) {
-        metaDataDiff = MetaDataDiff.compare(originalDatabase.getMetaData(), newDatabase.getMetaData()).orElse(null);
-        preambleDiff = PreambleDiff.compare(originalDatabase, newDatabase).orElse(null);
-        bibStringDiffs = BibStringDiff.compare(originalDatabase.getDatabase(), newDatabase.getDatabase());
+    private BibDatabaseDiff(
+        BibDatabaseContext originalDatabase,
+        BibDatabaseContext newDatabase,
+        boolean includeEmptyEntries
+    ) {
+        metaDataDiff =
+            MetaDataDiff
+                .compare(
+                    originalDatabase.getMetaData(),
+                    newDatabase.getMetaData()
+                )
+                .orElse(null);
+        preambleDiff =
+            PreambleDiff.compare(originalDatabase, newDatabase).orElse(null);
+        bibStringDiffs =
+            BibStringDiff.compare(
+                originalDatabase.getDatabase(),
+                newDatabase.getDatabase()
+            );
 
         // Sort both databases according to a common sort key.
         EntryComparator comparator = getEntryComparator();
-        List<BibEntry> originalEntriesSorted = originalDatabase.getDatabase().getEntriesSorted(comparator);
-        List<BibEntry> newEntriesSorted = newDatabase.getDatabase().getEntriesSorted(comparator);
+        List<BibEntry> originalEntriesSorted = originalDatabase
+            .getDatabase()
+            .getEntriesSorted(comparator);
+        List<BibEntry> newEntriesSorted = newDatabase
+            .getDatabase()
+            .getEntriesSorted(comparator);
 
         if (!includeEmptyEntries) {
             originalEntriesSorted.removeIf(BibEntry::isEmpty);
             newEntriesSorted.removeIf(BibEntry::isEmpty);
         }
 
-        entryDiffs = compareEntries(originalEntriesSorted, newEntriesSorted, originalDatabase.getMode());
+        entryDiffs =
+            compareEntries(
+                originalEntriesSorted,
+                newEntriesSorted,
+                originalDatabase.getMode()
+            );
     }
 
     private static EntryComparator getEntryComparator() {
-        EntryComparator comparator = new EntryComparator(false, true, StandardField.TITLE);
-        comparator = new EntryComparator(false, true, StandardField.AUTHOR, comparator);
-        comparator = new EntryComparator(false, true, StandardField.YEAR, comparator);
+        EntryComparator comparator = new EntryComparator(
+            false,
+            true,
+            StandardField.TITLE
+        );
+        comparator =
+            new EntryComparator(false, true, StandardField.AUTHOR, comparator);
+        comparator =
+            new EntryComparator(false, true, StandardField.YEAR, comparator);
         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<>();
 
         // Create a HashSet where we can put references to entries in the new
@@ -57,11 +90,13 @@ private static List<BibEntryDiff> compareEntries(List<BibEntry> originalEntries,
         // 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) {
+        mainLoop:for (BibEntry originalEntry : originalEntries) {
             for (int i = 0; i < newEntries.size(); i++) {
                 if (!used.contains(i)) {
-                    double score = DuplicateCheck.compareEntriesStrictly(originalEntry, newEntries.get(i));
+                    double score = DuplicateCheck.compareEntriesStrictly(
+                        originalEntry,
+                        newEntries.get(i)
+                    );
                     if (score > 1) {
                         used.add(i);
                         continue mainLoop;
@@ -74,14 +109,19 @@ private static List<BibEntryDiff> compareEntries(List<BibEntry> originalEntries,
         }
 
         // Now we've found all exact matches, look through the remaining entries, looking for close matches.
-        DuplicateCheck duplicateCheck = new DuplicateCheck(new BibEntryTypesManager());
+        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.
             double bestMatch = 0;
             int bestMatchIndex = 0;
             for (int i = 0; i < newEntries.size(); i++) {
                 if (!used.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;
@@ -90,11 +130,18 @@ private static List<BibEntryDiff> compareEntries(List<BibEntry> originalEntries,
             }
 
             BibEntry bestEntry = newEntries.get(bestMatchIndex);
-            if (bestMatch > MATCH_THRESHOLD
-                    || hasEqualCitationKey(originalEntry, bestEntry)
-                    || duplicateCheck.isDuplicate(originalEntry, bestEntry, mode)) {
+            if (
+                bestMatch > MATCH_THRESHOLD ||
+                hasEqualCitationKey(originalEntry, bestEntry) ||
+                duplicateCheck.isDuplicate(originalEntry, bestEntry, mode)
+            ) {
                 used.add(bestMatchIndex);
-                differences.add(new BibEntryDiff(originalEntry, newEntries.get(bestMatchIndex)));
+                differences.add(
+                    new BibEntryDiff(
+                        originalEntry,
+                        newEntries.get(bestMatchIndex)
+                    )
+                );
             } else {
                 differences.add(new BibEntryDiff(originalEntry, null));
             }
@@ -110,11 +157,21 @@ private static List<BibEntryDiff> compareEntries(List<BibEntry> originalEntries,
         return differences;
     }
 
-    private static boolean hasEqualCitationKey(BibEntry oneEntry, BibEntry twoEntry) {
-        return oneEntry.hasCitationKey() && twoEntry.hasCitationKey() && oneEntry.getCitationKey().equals(twoEntry.getCitationKey());
+    private static boolean hasEqualCitationKey(
+        BibEntry oneEntry,
+        BibEntry twoEntry
+    ) {
+        return (
+            oneEntry.hasCitationKey() &&
+            twoEntry.hasCitationKey() &&
+            oneEntry.getCitationKey().equals(twoEntry.getCitationKey())
+        );
     }
 
-    public static BibDatabaseDiff compare(BibDatabaseContext base, BibDatabaseContext changed) {
+    public static BibDatabaseDiff compare(
+        BibDatabaseContext base,
+        BibDatabaseContext changed
+    ) {
         return new BibDatabaseDiff(base, changed, false);
     }
 
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 bcd098a3850..b379a3d3265 100644
--- a/src/main/java/org/jabref/logic/bibtex/comparator/BibEntryDiff.java
+++ b/src/main/java/org/jabref/logic/bibtex/comparator/BibEntryDiff.java
@@ -3,6 +3,7 @@
 import org.jabref.model.entry.BibEntry;
 
 public class BibEntryDiff {
+
     private final BibEntry originalEntry;
     private final BibEntry newEntry;
 
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 65fe125a765..b02679552b4 100644
--- a/src/main/java/org/jabref/logic/bibtex/comparator/BibStringDiff.java
+++ b/src/main/java/org/jabref/logic/bibtex/comparator/BibStringDiff.java
@@ -8,7 +8,6 @@
 import java.util.Objects;
 import java.util.Optional;
 import java.util.Set;
-
 import org.jabref.model.database.BibDatabase;
 import org.jabref.model.entry.BibtexString;
 
@@ -22,7 +21,10 @@ 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();
         }
@@ -35,12 +37,18 @@ 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();
+                .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())) {
+                if (
+                    !Objects.equals(
+                        original.getContent(),
+                        match.get().getContent()
+                    )
+                ) {
                     // But they have non-matching contents, so we've found a change.
                     differences.add(new BibStringDiff(original, match.get()));
                 }
@@ -52,13 +60,17 @@ 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
-        for (Iterator<BibtexString> iterator = notMatched.iterator(); iterator.hasNext(); ) {
+        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();
+                .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.
@@ -74,9 +86,13 @@ public static List<BibStringDiff> compare(BibDatabase originalDatabase, BibDatab
         }
 
         // 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)));
+        newDatabase
+            .getStringValues()
+            .stream()
+            .filter(test -> !used.contains(test))
+            .forEach(newString ->
+                differences.add(new BibStringDiff(null, newString))
+            );
 
         return differences;
     }
@@ -99,7 +115,10 @@ 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 36df24c09e7..74882219423 100644
--- a/src/main/java/org/jabref/logic/bibtex/comparator/BibtexStringComparator.java
+++ b/src/main/java/org/jabref/logic/bibtex/comparator/BibtexStringComparator.java
@@ -2,7 +2,6 @@
 
 import java.util.Comparator;
 import java.util.Locale;
-
 import org.jabref.model.entry.BibtexString;
 
 public class BibtexStringComparator implements Comparator<BibtexString> {
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 f988c3c96b6..0d20c0f11a2 100644
--- a/src/main/java/org/jabref/logic/bibtex/comparator/CrossRefEntryComparator.java
+++ b/src/main/java/org/jabref/logic/bibtex/comparator/CrossRefEntryComparator.java
@@ -1,7 +1,6 @@
 package org.jabref.logic.bibtex.comparator;
 
 import java.util.Comparator;
-
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.field.StandardField;
 
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 ec91a76ee5f..2fc3f4a1461 100644
--- a/src/main/java/org/jabref/logic/bibtex/comparator/EntryComparator.java
+++ b/src/main/java/org/jabref/logic/bibtex/comparator/EntryComparator.java
@@ -3,7 +3,6 @@
 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;
@@ -31,7 +30,12 @@ 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;
@@ -60,9 +64,13 @@ public int compare(BibEntry e1, BibEntry e2) {
         if (binary) {
             // We just separate on set and unset fields:
             if (f1 == null) {
-                return f2 == null ? (next == null ? idCompare(e1, e2) : next.compare(e1, e2)) : 1;
+                return f2 == null
+                    ? (next == null ? idCompare(e1, e2) : next.compare(e1, e2))
+                    : 1;
             } else {
-                return f2 == null ? -1 : (next == null ? idCompare(e1, e2) : next.compare(e1, e2));
+                return f2 == null
+                    ? -1
+                    : (next == null ? idCompare(e1, e2) : next.compare(e1, e2));
             }
         }
 
@@ -70,10 +78,16 @@ public int compare(BibEntry e1, BibEntry e2) {
         // sorted according to last name.
         if (sortField.getProperties().contains(FieldProperty.PERSON_NAMES)) {
             if (f1 != null) {
-                f1 = AuthorList.fixAuthorForAlphabetization((String) f1).toLowerCase(Locale.ROOT);
+                f1 =
+                    AuthorList
+                        .fixAuthorForAlphabetization((String) f1)
+                        .toLowerCase(Locale.ROOT);
             }
             if (f2 != null) {
-                f2 = AuthorList.fixAuthorForAlphabetization((String) f2).toLowerCase(Locale.ROOT);
+                f2 =
+                    AuthorList
+                        .fixAuthorForAlphabetization((String) f2)
+                        .toLowerCase(Locale.ROOT);
             }
         } else if (sortField.equals(InternalField.TYPE_HEADER)) {
             // Sort by type.
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 42f86e0d78d..385b642deb2 100644
--- a/src/main/java/org/jabref/logic/bibtex/comparator/FieldComparator.java
+++ b/src/main/java/org/jabref/logic/bibtex/comparator/FieldComparator.java
@@ -6,7 +6,6 @@
 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;
@@ -26,7 +25,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 +55,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();
         }
@@ -61,7 +66,11 @@ private static Collator getCollator() {
     private FieldType determineFieldType() {
         if (InternalField.TYPE_HEADER == this.fields.getPrimary()) {
             return FieldType.TYPE;
-        } else if (this.fields.getPrimary().getProperties().contains(FieldProperty.PERSON_NAMES)) {
+        } else if (
+            this.fields.getPrimary()
+                .getProperties()
+                .contains(FieldProperty.PERSON_NAMES)
+        ) {
             return FieldType.NAME;
         } else if (StandardField.YEAR == this.fields.getPrimary()) {
             return FieldType.YEAR;
diff --git a/src/main/java/org/jabref/logic/bibtex/comparator/FieldComparatorStack.java b/src/main/java/org/jabref/logic/bibtex/comparator/FieldComparatorStack.java
index b7c9526e1cd..dbc66250eb0 100644
--- a/src/main/java/org/jabref/logic/bibtex/comparator/FieldComparatorStack.java
+++ b/src/main/java/org/jabref/logic/bibtex/comparator/FieldComparatorStack.java
@@ -12,7 +12,9 @@ public class FieldComparatorStack<T> implements Comparator<T> {
 
     private final List<? extends Comparator<? super T>> comparators;
 
-    public FieldComparatorStack(List<? extends Comparator<? super T>> comparators) {
+    public FieldComparatorStack(
+        List<? extends Comparator<? super T>> comparators
+    ) {
         this.comparators = comparators;
     }
 
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 35c2e5a1338..0f305bab2c1 100644
--- a/src/main/java/org/jabref/logic/bibtex/comparator/GroupDiff.java
+++ b/src/main/java/org/jabref/logic/bibtex/comparator/GroupDiff.java
@@ -1,11 +1,11 @@
 package org.jabref.logic.bibtex.comparator;
 
 import java.util.Optional;
-
 import org.jabref.model.groups.GroupTreeNode;
 import org.jabref.model.metadata.MetaData;
 
 public class GroupDiff {
+
     private final GroupTreeNode originalGroupRoot;
     private final GroupTreeNode newGroupRoot;
 
@@ -18,12 +18,21 @@ public class GroupDiff {
      * This method only detects whether a change took place or not. It does not determine the type of change. This would
      * be possible, but difficult to do properly, so we rather only report the change.
      */
-    public static Optional<GroupDiff> compare(MetaData originalMetaData, MetaData newMetaData) {
-        final Optional<GroupTreeNode> originalGroups = originalMetaData.getGroups();
+    public static Optional<GroupDiff> compare(
+        MetaData originalMetaData,
+        MetaData newMetaData
+    ) {
+        final Optional<GroupTreeNode> originalGroups =
+            originalMetaData.getGroups();
         final Optional<GroupTreeNode> newGroups = newMetaData.getGroups();
 
         if (!originalGroups.equals(newGroups)) {
-            return Optional.of(new GroupDiff(originalGroups.orElse(null), newGroups.orElse(null)));
+            return Optional.of(
+                new GroupDiff(
+                    originalGroups.orElse(null),
+                    newGroups.orElse(null)
+                )
+            );
         } else {
             return Optional.empty();
         }
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 f46851fa098..1026fd79b22 100644
--- a/src/main/java/org/jabref/logic/bibtex/comparator/IdComparator.java
+++ b/src/main/java/org/jabref/logic/bibtex/comparator/IdComparator.java
@@ -1,7 +1,6 @@
 package org.jabref.logic.bibtex.comparator;
 
 import java.util.Comparator;
-
 import org.jabref.model.entry.BibEntry;
 
 /**
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 5420ef97391..d9f1bf2fbbe 100644
--- a/src/main/java/org/jabref/logic/bibtex/comparator/MetaDataDiff.java
+++ b/src/main/java/org/jabref/logic/bibtex/comparator/MetaDataDiff.java
@@ -4,11 +4,11 @@
 import java.util.List;
 import java.util.Objects;
 import java.util.Optional;
-
 import org.jabref.model.metadata.MetaData;
 import org.jabref.preferences.PreferencesService;
 
 public class MetaDataDiff {
+
     public enum DifferenceType {
         PROTECTED,
         GROUPS_ALTERED,
@@ -21,11 +21,14 @@ public enum DifferenceType {
         SAVE_ACTIONS,
         MODE,
         GENERAL_FILE_DIRECTORY,
-        CONTENT_SELECTOR
+        CONTENT_SELECTOR,
     }
 
-    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;
@@ -37,7 +40,10 @@ private MetaDataDiff(MetaData originalMetaData, MetaData newMetaData) {
         this.groupDiff = GroupDiff.compare(originalMetaData, newMetaData);
     }
 
-    public static Optional<MetaDataDiff> compare(MetaData originalMetaData, MetaData newMetaData) {
+    public static Optional<MetaDataDiff> compare(
+        MetaData originalMetaData,
+        MetaData newMetaData
+    ) {
         if (originalMetaData.equals(newMetaData)) {
             return Optional.empty();
         } else {
@@ -45,9 +51,16 @@ public static Optional<MetaDataDiff> compare(MetaData originalMetaData, MetaData
         }
     }
 
-    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)) {
-            changes.add(new Difference(differenceType, originalObject, newObject));
+            changes.add(
+                new Difference(differenceType, originalObject, newObject)
+            );
         }
     }
 
@@ -56,20 +69,82 @@ private void addToListIfDiff(List<Difference> changes, DifferenceType difference
      */
     public List<Difference> getDifferences(PreferencesService preferences) {
         List<Difference> changes = new ArrayList<>();
-        addToListIfDiff(changes, DifferenceType.PROTECTED, originalMetaData.isProtected(), newMetaData.isProtected());
-        addToListIfDiff(changes, DifferenceType.GROUPS_ALTERED, 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.getCiteKeyPattern(preferences.getCitationKeyPatternPreferences().getKeyPattern()),
-                newMetaData.getCiteKeyPattern(preferences.getCitationKeyPatternPreferences().getKeyPattern()));
-        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.PROTECTED,
+            originalMetaData.isProtected(),
+            newMetaData.isProtected()
+        );
+        addToListIfDiff(
+            changes,
+            DifferenceType.GROUPS_ALTERED,
+            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.getCiteKeyPattern(
+                preferences.getCitationKeyPatternPreferences().getKeyPattern()
+            ),
+            newMetaData.getCiteKeyPattern(
+                preferences.getCitationKeyPatternPreferences().getKeyPattern()
+            )
+        );
+        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;
     }
 
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 2308a8d80c6..271dc70021e 100644
--- a/src/main/java/org/jabref/logic/bibtex/comparator/PreambleDiff.java
+++ b/src/main/java/org/jabref/logic/bibtex/comparator/PreambleDiff.java
@@ -2,7 +2,6 @@
 
 import java.util.Objects;
 import java.util.Optional;
-
 import org.jabref.model.database.BibDatabaseContext;
 
 public class PreambleDiff {
@@ -15,13 +14,23 @@ public class PreambleDiff {
         this.newPreamble = newPreamble;
     }
 
-    public static Optional<PreambleDiff> compare(BibDatabaseContext originalDatabase, BibDatabaseContext newDatabase) {
-        Optional<String> originalPreamble = originalDatabase.getDatabase().getPreamble();
+    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 +52,10 @@ 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
diff --git a/src/main/java/org/jabref/logic/bst/BstEntry.java b/src/main/java/org/jabref/logic/bst/BstEntry.java
index 89571de8046..af5c717457a 100644
--- a/src/main/java/org/jabref/logic/bst/BstEntry.java
+++ b/src/main/java/org/jabref/logic/bst/BstEntry.java
@@ -2,7 +2,6 @@
 
 import java.util.HashMap;
 import java.util.Map;
-
 import org.jabref.model.entry.BibEntry;
 
 public class BstEntry {
diff --git a/src/main/java/org/jabref/logic/bst/BstFunctions.java b/src/main/java/org/jabref/logic/bst/BstFunctions.java
index 1e048da1a45..1a2fe55145b 100644
--- a/src/main/java/org/jabref/logic/bst/BstFunctions.java
+++ b/src/main/java/org/jabref/logic/bst/BstFunctions.java
@@ -6,7 +6,8 @@
 import java.util.Optional;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
-
+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,15 +16,17 @@
 import org.jabref.model.database.BibDatabase;
 import org.jabref.model.entry.Author;
 import org.jabref.model.entry.AuthorList;
-
-import org.antlr.v4.runtime.ParserRuleContext;
-import org.antlr.v4.runtime.tree.ParseTree;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 public class BstFunctions {
-    private static final Logger LOGGER = LoggerFactory.getLogger(BstFunctions.class);
-    private static final Pattern ADD_PERIOD_PATTERN = Pattern.compile("([^.?!}\\s])(}|\\s)*$");
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(
+        BstFunctions.class
+    );
+    private static final Pattern ADD_PERIOD_PATTERN = Pattern.compile(
+        "([^.?!}\\s])(}|\\s)*$"
+    );
 
     private final Map<String, String> strings;
     private final Map<String, Integer> integers;
@@ -37,20 +40,26 @@ public class BstFunctions {
 
     @FunctionalInterface
     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;
@@ -107,7 +116,11 @@ 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();
@@ -116,7 +129,11 @@ private void bstIsGreaterThan(BstVMVisitor visitor, ParserRuleContext ctx) {
             throw new BstVMException("Can only compare two integers with >");
         }
 
-        stack.push(((Integer) o1).compareTo((Integer) o2) > 0 ? BstVM.TRUE : BstVM.FALSE);
+        stack.push(
+            ((Integer) o1).compareTo((Integer) o2) > 0
+                ? BstVM.TRUE
+                : BstVM.FALSE
+        );
     }
 
     /**
@@ -126,16 +143,26 @@ private void bstIsGreaterThan(BstVMVisitor visitor, ParserRuleContext ctx) {
      */
     private void bstIsLowerThan(BstVMVisitor visitor, ParserRuleContext ctx) {
         if (stack.size() < 2) {
-            throw new BstVMException("Not enough operands on stack for operation <");
+            throw new BstVMException(
+                "Not enough operands on stack for operation <"
+            );
         }
         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()));
-        }
-
-        stack.push(((Integer) o1).compareTo((Integer) o2) < 0 ? BstVM.TRUE : BstVM.FALSE);
+            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
+        );
     }
 
     /**
@@ -144,7 +171,11 @@ 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();
@@ -167,13 +198,21 @@ 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);
@@ -185,13 +224,21 @@ 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);
@@ -204,7 +251,11 @@ 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();
@@ -219,7 +270,11 @@ 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);
@@ -237,20 +292,35 @@ public void execute(BstVMVisitor visitor, ParserRuleContext ctx) {
         }
 
         @Override
-        public void execute(BstVMVisitor visitor, ParserRuleContext ctx, BstEntry bstEntry) {
+        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();
 
             if (o2 instanceof String value) {
-                if ((bstEntry != null) && bstEntry.localStrings.containsKey(name)) {
+                if (
+                    (bstEntry != null) &&
+                    bstEntry.localStrings.containsKey(name)
+                ) {
                     bstEntry.localStrings.put(name, value);
                     return;
                 }
@@ -259,7 +329,10 @@ public void execute(BstVMVisitor visitor, ParserRuleContext ctx, BstEntry bstEnt
                     strings.put(name, value);
                 }
             } else if (o2 instanceof Integer value) {
-                if ((bstEntry != null) && bstEntry.localIntegers.containsKey(name)) {
+                if (
+                    (bstEntry != null) &&
+                    bstEntry.localIntegers.containsKey(name)
+                ) {
                     bstEntry.localIntegers.put(name, value);
                     return;
                 }
@@ -268,7 +341,11 @@ 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()
+                        )
+                );
             }
         }
     }
@@ -280,12 +357,20 @@ 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);
@@ -315,17 +400,28 @@ private void bstAddPeriod(BstVMVisitor visitor, ParserRuleContext ctx) {
      * default.type function.
      */
     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
-        public void execute(BstVMVisitor visitor, ParserRuleContext ctx, BstEntry bstEntry) {
+        public void execute(
+            BstVMVisitor visitor,
+            ParserRuleContext ctx,
+            BstEntry bstEntry
+        ) {
             if (bstEntry == null) {
                 this.execute(visitor, ctx); // Throw error
             } else {
-                functions.get(bstEntry.entry.getType().getName()).execute(visitor, ctx, bstEntry);
+                functions
+                    .get(bstEntry.entry.getType().getName())
+                    .execute(visitor, ctx, bstEntry);
             }
         }
     }
@@ -351,20 +447,37 @@ 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()));
-        }
-
-        stack.push(BstCaseChanger.changeCase(toChange, BstCaseChanger.FormatMode.of(format)));
+            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)
+            )
+        );
     }
 
     /**
@@ -374,12 +487,20 @@ 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));
@@ -390,13 +511,22 @@ private void bstChrToInt(BstVMVisitor visitor, ParserRuleContext ctx) {
      * entry.
      */
     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
-        public void execute(BstVMVisitor visitor, ParserRuleContext ctx, BstEntry bstEntryContext) {
+        public void execute(
+            BstVMVisitor visitor,
+            ParserRuleContext ctx,
+            BstEntry bstEntryContext
+        ) {
             if (bstEntryContext == null) {
                 execute(visitor, ctx);
                 return;
@@ -411,7 +541,11 @@ 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();
 
@@ -426,7 +560,11 @@ 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();
 
@@ -436,7 +574,11 @@ 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()
+                    )
+            );
         }
 
         stack.push("".equals(s.trim()) ? BstVM.TRUE : BstVM.FALSE);
@@ -455,13 +597,21 @@ 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();
         Object o3 = stack.pop();
 
-        if (!(o1 instanceof String) && !(o2 instanceof Integer) && !(o3 instanceof String)) {
+        if (
+            !(o1 instanceof String) &&
+            !(o2 instanceof Integer) &&
+            !(o3 instanceof String)
+        ) {
             // warning("A string is needed for change.case$");
             stack.push("");
             return;
@@ -476,7 +626,13 @@ 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);
 
@@ -492,17 +648,29 @@ 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();
         Object f2 = stack.pop();
         Object i = stack.pop();
 
-        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()));
+        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()
+                    )
+            );
         }
 
         if (((Integer) i) > 0) {
@@ -512,7 +680,11 @@ private void bstIf(BstVMVisitor visitor, ParserRuleContext ctx) {
         }
     }
 
-    private void callIdentifierOrTree(Object f, BstVMVisitor visitor, ParserRuleContext ctx) {
+    private void callIdentifierOrTree(
+        Object f,
+        BstVMVisitor visitor,
+        ParserRuleContext ctx
+    ) {
         if (f instanceof ParseTree tree) {
             visitor.visit(tree);
         } else if (f instanceof BstVMVisitor.Identifier identifier) {
@@ -529,12 +701,20 @@ 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()));
@@ -546,12 +726,20 @@ 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());
@@ -563,7 +751,11 @@ 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();
 
@@ -573,7 +765,11 @@ 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;
         }
@@ -600,12 +796,20 @@ 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());
@@ -638,7 +842,11 @@ 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();
 
@@ -686,14 +894,26 @@ private void bstStack(BstVMVisitor visitor, ParserRuleContext ctx) {
      */
     private 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 len) && (o2 instanceof Integer start) && (o3 instanceof String s))) {
-            throw new BstVMException("Expecting two integers and a string for substring$ (line %d)".formatted(ctx.start.getLine()));
+        if (
+            !((o1 instanceof Integer len) &&
+                (o2 instanceof Integer start) &&
+                (o3 instanceof String s))
+        ) {
+            throw new BstVMException(
+                "Expecting two integers and a string for substring$ (line %d)".formatted(
+                        ctx.start.getLine()
+                    )
+            );
         }
 
         int lenI = len;
@@ -715,7 +935,9 @@ private void bstSubstring(BstVMVisitor visitor, ParserRuleContext ctx) {
             startI += s.length() + 1;
             startI = Math.max(1, (startI + 1) - lenI);
         }
-        stack.push(s.substring(startI - 1, Math.min((startI - 1) + lenI, s.length())));
+        stack.push(
+            s.substring(startI - 1, Math.min((startI - 1) + lenI, s.length()))
+        );
     }
 
     /**
@@ -728,7 +950,11 @@ private 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();
@@ -750,12 +976,20 @@ 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();
@@ -806,19 +1040,29 @@ 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;
         }
@@ -830,7 +1074,11 @@ private void bstTextPrefix(BstVMVisitor visitor, ParserRuleContext ctx) {
      * Pops and prints the top of the stack to the log file. It's useful for debugging.
      */
     private void bstTop(BstVMVisitor visitor, ParserRuleContext ctx) {
-        LOGGER.debug("Stack entry {} (line {})", stack.pop(), ctx.start.getLine());
+        LOGGER.debug(
+            "Stack entry {} (line {})",
+            stack.pop(),
+            ctx.start.getLine()
+        );
     }
 
     /**
@@ -838,13 +1086,20 @@ private void bstTop(BstVMVisitor visitor, ParserRuleContext ctx) {
      * the null string if the type is either unknown or undefined.
      */
     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
-        public void execute(BstVMVisitor visitor, ParserRuleContext ctx, BstEntry bstEntryContext) {
+        public void execute(
+            BstVMVisitor visitor,
+            ParserRuleContext ctx,
+            BstEntry bstEntryContext
+        ) {
             if (bstEntryContext == null) {
                 this.execute(visitor, ctx);
                 return;
@@ -870,14 +1125,26 @@ 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()));
+        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()
+                    )
+            );
         }
 
         do {
@@ -885,8 +1152,12 @@ 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;
@@ -906,7 +1177,11 @@ 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 06a253968b9..d2cb847fb8d 100644
--- a/src/main/java/org/jabref/logic/bst/BstPreviewLayout.java
+++ b/src/main/java/org/jabref/logic/bst/BstPreviewLayout.java
@@ -3,7 +3,6 @@
 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;
@@ -13,13 +12,14 @@
 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;
 
 public class BstPreviewLayout implements PreviewLayout {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(BstPreviewLayout.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(
+        BstPreviewLayout.class
+    );
 
     private final String name;
 
@@ -30,19 +30,24 @@ public BstPreviewLayout(Path path) {
         name = path.getFileName().toString();
         if (!Files.exists(path)) {
             LOGGER.error("File {} not found", path.toAbsolutePath());
-            error = Localization.lang("Error opening file '%0'", path.toString());
+            error =
+                Localization.lang("Error opening file '%0'", path.toString());
             return;
         }
         try {
             bstVM = new BstVM(path);
         } catch (Exception e) {
             LOGGER.error("Could not read {}.", path.toAbsolutePath(), e);
-            error = Localization.lang("Error opening file '%0'", path.toString());
+            error =
+                Localization.lang("Error opening file '%0'", path.toString());
         }
     }
 
     @Override
-    public String generatePreview(BibEntry originalEntry, BibDatabaseContext databaseContext) {
+    public String generatePreview(
+        BibEntry originalEntry,
+        BibDatabaseContext databaseContext
+    ) {
         if (error != null) {
             return error;
         }
diff --git a/src/main/java/org/jabref/logic/bst/BstVM.java b/src/main/java/org/jabref/logic/bst/BstVM.java
index bb643572fe5..eed5a61f314 100644
--- a/src/main/java/org/jabref/logic/bst/BstVM.java
+++ b/src/main/java/org/jabref/logic/bst/BstVM.java
@@ -7,10 +7,6 @@
 import java.util.Deque;
 import java.util.List;
 import java.util.Objects;
-
-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 +16,8 @@
 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;
 
 public class BstVM {
 
@@ -66,7 +64,10 @@ private static ParseTree charStream2CommonTree(CharStream query) {
      * @param bibDatabase (may be null) the bibDatabase used for resolving strings / crossref
      * @return list of references in plain text form
      */
-    public String render(Collection<BibEntry> bibEntries, BibDatabase bibDatabase) {
+    public String render(
+        Collection<BibEntry> bibEntries,
+        BibDatabase bibDatabase
+    ) {
         Objects.requireNonNull(bibEntries);
 
         List<BstEntry> entries = new ArrayList<>(bibEntries.size());
@@ -76,12 +77,24 @@ public String render(Collection<BibEntry> bibEntries, BibDatabase bibDatabase) {
 
         StringBuilder resultBuffer = new StringBuilder();
 
-        BstVMContext bstVMContext = new BstVMContext(entries, bibDatabase, path);
-        bstVMContext.functions().putAll(new BstFunctions(bstVMContext, resultBuffer).getBuiltInFunctions());
+        BstVMContext bstVMContext = new BstVMContext(
+            entries,
+            bibDatabase,
+            path
+        );
+        bstVMContext
+            .functions()
+            .putAll(
+                new BstFunctions(bstVMContext, resultBuffer)
+                    .getBuiltInFunctions()
+            );
         bstVMContext.integers().put("entry.max$", Integer.MAX_VALUE);
         bstVMContext.integers().put("global.max$", Integer.MAX_VALUE);
 
-        BstVMVisitor bstVMVisitor = new BstVMVisitor(bstVMContext, resultBuffer);
+        BstVMVisitor bstVMVisitor = new BstVMVisitor(
+            bstVMContext,
+            resultBuffer
+        );
         bstVMVisitor.visit(tree);
 
         latestContext = bstVMContext;
@@ -97,18 +110,29 @@ 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"
+            );
         }
     }
 
     private static class ThrowingErrorListener extends BaseErrorListener {
-        public static final ThrowingErrorListener INSTANCE = new ThrowingErrorListener();
+
+        public static final ThrowingErrorListener INSTANCE =
+            new ThrowingErrorListener();
 
         @Override
-        public void syntaxError(Recognizer<?, ?> recognizer, Object offendingSymbol,
-                                int line, int charPositionInLine, String msg, RecognitionException e)
-                throws ParseCancellationException {
-            throw new ParseCancellationException("line " + line + ":" + charPositionInLine + " " + msg);
+        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/logic/bst/BstVMContext.java b/src/main/java/org/jabref/logic/bst/BstVMContext.java
index 472ec047734..54acd984af7 100644
--- a/src/main/java/org/jabref/logic/bst/BstVMContext.java
+++ b/src/main/java/org/jabref/logic/bst/BstVMContext.java
@@ -7,18 +7,31 @@
 import java.util.List;
 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 BstVMContext(List<BstEntry> entries, BibDatabase bibDatabase, 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/BstVMException.java b/src/main/java/org/jabref/logic/bst/BstVMException.java
index 2851166d094..52de2d9e9f9 100644
--- a/src/main/java/org/jabref/logic/bst/BstVMException.java
+++ b/src/main/java/org/jabref/logic/bst/BstVMException.java
@@ -1,6 +1,7 @@
 package org.jabref.logic.bst;
 
 public class BstVMException extends RuntimeException {
+
     public BstVMException(String string) {
         super(string);
     }
diff --git a/src/main/java/org/jabref/logic/bst/BstVMVisitor.java b/src/main/java/org/jabref/logic/bst/BstVMVisitor.java
index 100279e35a3..f589aa41b8c 100644
--- a/src/main/java/org/jabref/logic/bst/BstVMVisitor.java
+++ b/src/main/java/org/jabref/logic/bst/BstVMVisitor.java
@@ -5,7 +5,9 @@
 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,23 +15,21 @@
 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;
 
 class BstVMVisitor extends BstBaseVisitor<Integer> {
-    private static final Logger LOGGER = LoggerFactory.getLogger(BstVMVisitor.class);
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(
+        BstVMVisitor.class
+    );
 
     private final BstVMContext bstVMContext;
     private final StringBuilder bbl;
 
     private BstEntry selectedBstEntry = null;
 
-    public record Identifier(String name) {
-    }
+    public record Identifier(String name) {}
 
     public BstVMVisitor(BstVMContext bstVMContext, StringBuilder bbl) {
         this.bstVMContext = bstVMContext;
@@ -58,48 +58,68 @@ public Integer visitIntegersCommand(BstParser.IntegersCommandContext ctx) {
 
     @Override
     public Integer visitFunctionCommand(BstParser.FunctionCommandContext ctx) {
-        bstVMContext.functions().put(ctx.id.getText(),
-                (visitor, functionContext) -> visitor.visit(ctx.function));
+        bstVMContext
+            .functions()
+            .put(
+                ctx.id.getText(),
+                (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));
+        String replacement = ctx.repl
+            .getText()
+            .substring(1, ctx.repl.getText().length() - 1);
+        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);
             }
         }
@@ -133,7 +153,9 @@ 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());
@@ -177,7 +199,9 @@ public Integer visitEntryCommand(BstParser.EntryCommandContext ctx) {
 
     @Override
     public Integer visitSortCommand(BstParser.SortCommandContext ctx) {
-        bstVMContext.entries().sort(Comparator.comparing(o -> (o.localStrings.get("sort.key$"))));
+        bstVMContext
+            .entries()
+            .sort(Comparator.comparing(o -> (o.localStrings.get("sort.key$"))));
         return BstVM.TRUE;
     }
 
@@ -194,11 +218,15 @@ protected void resolveIdentifier(String name, ParserRuleContext ctx) {
                 return;
             }
             if (selectedBstEntry.localStrings.containsKey(name)) {
-                bstVMContext.stack().push(selectedBstEntry.localStrings.get(name));
+                bstVMContext
+                    .stack()
+                    .push(selectedBstEntry.localStrings.get(name));
                 return;
             }
             if (selectedBstEntry.localIntegers.containsKey(name)) {
-                bstVMContext.stack().push(selectedBstEntry.localIntegers.get(name));
+                bstVMContext
+                    .stack()
+                    .push(selectedBstEntry.localIntegers.get(name));
                 return;
             }
         }
@@ -223,7 +251,10 @@ protected void resolveIdentifier(String name, ParserRuleContext ctx) {
     public Integer visitBstFunction(BstParser.BstFunctionContext ctx) {
         String name = ctx.getChild(0).getText();
         if (bstVMContext.functions().containsKey(name)) {
-            bstVMContext.functions().get(name).execute(this, ctx, selectedBstEntry);
+            bstVMContext
+                .functions()
+                .get(name)
+                .execute(this, ctx, selectedBstEntry);
         } else {
             visit(ctx.getChild(0));
         }
@@ -239,12 +270,18 @@ public Integer visitStackitem(BstParser.StackitemContext ctx) {
                     switch (token.getSymbol().getType()) {
                         case BstParser.STRING -> {
                             String s = token.getText();
-                            bstVMContext.stack().push(s.substring(1, s.length() - 1));
+                            bstVMContext
+                                .stack()
+                                .push(s.substring(1, s.length() - 1));
                         }
-                        case BstParser.INTEGER ->
-                                bstVMContext.stack().push(Integer.parseInt(token.getText().substring(1)));
-                        case BstParser.QUOTED ->
-                                bstVMContext.stack().push(new Identifier(token.getText().substring(1)));
+                        case BstParser.INTEGER -> bstVMContext
+                            .stack()
+                            .push(
+                                Integer.parseInt(token.getText().substring(1))
+                            );
+                        case BstParser.QUOTED -> bstVMContext
+                            .stack()
+                            .push(new Identifier(token.getText().substring(1)));
                     }
                 } else if (childNode instanceof BstParser.StackContext) {
                     bstVMContext.stack().push(childNode);
@@ -252,9 +289,12 @@ public Integer visitStackitem(BstParser.StackitemContext ctx) {
                     this.visit(childNode);
                 }
             } catch (BstVMException e) {
-                bstVMContext.path().ifPresentOrElse(
+                bstVMContext
+                    .path()
+                    .ifPresentOrElse(
                         path -> LOGGER.error("{} ({})", e.getMessage(), path),
-                        () -> LOGGER.error(e.getMessage()));
+                        () -> LOGGER.error(e.getMessage())
+                    );
                 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 dd3e7c7b05c..42fa529745f 100644
--- a/src/main/java/org/jabref/logic/bst/util/BstCaseChanger.java
+++ b/src/main/java/org/jabref/logic/bst/util/BstCaseChanger.java
@@ -2,13 +2,14 @@
 
 import java.util.Locale;
 import java.util.Optional;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 public final class BstCaseChanger {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(BstCaseChanger.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(
+        BstCaseChanger.class
+    );
 
     // stores whether the char before the current char was a colon
     private boolean prevColon = true;
@@ -67,8 +68,7 @@ public static FormatMode of(final String bstFormat) {
         }
     }
 
-    private BstCaseChanger() {
-    }
+    private BstCaseChanger() {}
 
     /**
      * Changes case of the given string s
@@ -97,7 +97,11 @@ 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;
@@ -142,7 +146,12 @@ private String doChangeCase(String s, FormatMode format) {
      *
      * @param start  the current position. It points to the opening brace
      */
-    private int convertSpecialChar(StringBuilder sb, char[] c, int start, FormatMode format) {
+    private int convertSpecialChar(
+        StringBuilder sb,
+        char[] c,
+        int start,
+        FormatMode format
+    ) {
         int i = start;
 
         sb.append(c[i]);
@@ -177,7 +186,13 @@ 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();
 
@@ -210,7 +225,12 @@ private int convertAccented(char[] c, int start, String s, StringBuilder sb, For
         return pos;
     }
 
-    private int convertNonControl(char[] c, int start, StringBuilder sb, FormatMode format) {
+    private int convertNonControl(
+        char[] c,
+        int start,
+        StringBuilder sb,
+        FormatMode format
+    ) {
         int pos = start;
         switch (format) {
             case TITLE_LOWERS, ALL_LOWERS -> {
@@ -221,17 +241,25 @@ 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 -> {
-                if ((i == 0) || (prevColon && Character.isWhitespace(c[i - 1]))) {
+                if (
+                    (i == 0) || (prevColon && Character.isWhitespace(c[i - 1]))
+                ) {
                     sb.append(c[i]);
                 } else {
                     sb.append(Character.toLowerCase(c[i]));
@@ -242,12 +270,11 @@ 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 cd65735aa57..287ec47ab26 100644
--- a/src/main/java/org/jabref/logic/bst/util/BstNameFormatter.java
+++ b/src/main/java/org/jabref/logic/bst/util/BstNameFormatter.java
@@ -4,11 +4,9 @@
 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;
 
@@ -29,10 +27,12 @@
  *
  */
 public class BstNameFormatter {
-    private static final Logger LOGGER = LoggerFactory.getLogger(BstNameFormatter.class);
 
-    private BstNameFormatter() {
-    }
+    private static final Logger LOGGER = LoggerFactory.getLogger(
+        BstNameFormatter.class
+    );
+
+    private BstNameFormatter() {}
 
     /**
      * Formats the nth author of the author name list by a given format string
@@ -41,14 +41,25 @@ private BstNameFormatter() {
      * @param whichName       index of the list, starting with 1
      * @param formatString    TODO
      */
-    public static String formatName(String authorsNameList, int whichName, String formatString) {
+    public static String formatName(
+        String authorsNameList,
+        int whichName,
+        String formatString
+    ) {
         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);
+        return BstNameFormatter.formatName(
+            al.getAuthor(whichName - 1),
+            formatString
+        );
     }
 
     public static String formatName(Author author, String format) {
@@ -81,7 +92,11 @@ 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]);
                         }
@@ -89,30 +104,32 @@ public static String formatName(Author author, String format) {
                     i++;
                 }
                 i--; // unskip last brace (for last i++ at the end)
-                String control = level1Chars.toString().toLowerCase(Locale.ROOT);
+                String control = level1Chars
+                    .toString()
+                    .toLowerCase(Locale.ROOT);
 
                 if (control.isEmpty()) {
                     continue;
                 }
 
                 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.getFirst();
-                    case 'v' ->
-                            author.getVon();
-                    case 'l' ->
-                            author.getLast();
-                    case 'j' ->
-                            author.getJr();
-                    default ->
-                            throw new BstVMException("Internal error");
-                };
+                Optional<String> tokenS =
+                    switch (type) {
+                        case 'f' -> author.getFirst();
+                        case 'v' -> author.getVon();
+                        case 'l' -> author.getLast();
+                        case 'j' -> author.getJr();
+                        default -> throw new BstVMException("Internal error");
+                    };
 
                 if (tokenS.isEmpty()) {
                     i++;
@@ -126,13 +143,20 @@ 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
+                        );
                     }
                 }
 
                 // Now we know what to do
 
-                if ((braceLevel == 0) && (wholeChar.charAt(wholeChar.length() - 1) == '}')) {
+                if (
+                    (braceLevel == 0) &&
+                    (wholeChar.charAt(wholeChar.length() - 1) == '}')
+                ) {
                     wholeChar.deleteCharAt(wholeChar.length() - 1);
                 }
 
@@ -151,8 +175,17 @@ public static String formatName(Author author, String format) {
                         }
                         if (((j + 1) < d.length) && (d[j + 1] == '{')) {
                             StringBuilder interTokenSb = new StringBuilder();
-                            j = BstNameFormatter.consumeToMatchingBrace(interTokenSb, d, j + 1);
-                            interToken = interTokenSb.substring(1, interTokenSb.length() - 1);
+                            j =
+                                BstNameFormatter.consumeToMatchingBrace(
+                                    interTokenSb,
+                                    d,
+                                    j + 1
+                                );
+                            interToken =
+                                interTokenSb.substring(
+                                    1,
+                                    interTokenSb.length() - 1
+                                );
                         }
 
                         for (int k = 0; k < tokens.length; k++) {
@@ -160,8 +193,13 @@ 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
@@ -176,7 +214,17 @@ 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(' ');
@@ -200,9 +248,16 @@ 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(' ');
@@ -217,7 +272,10 @@ public static String formatName(Author author, String format) {
             i++;
         }
         if (braceLevel != 0) {
-            LOGGER.warn("Unbalanced brace in format string for nameFormat: {}", format);
+            LOGGER.warn(
+                "Unbalanced brace in format string for nameFormat: {}",
+                format
+            );
         }
 
         return sb.toString();
@@ -226,7 +284,11 @@ public static String formatName(Author author, String format) {
     /**
      * Including the matching brace.
      */
-    public static int consumeToMatchingBrace(StringBuilder interTokenSb, char[] c, int pos) {
+    public static int consumeToMatchingBrace(
+        StringBuilder interTokenSb,
+        char[] c,
+        int pos
+    ) {
         int braceLevel = 0;
 
         for (int i = pos; i < c.length; i++) {
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 2b0fce0b735..2e5e7486528 100644
--- a/src/main/java/org/jabref/logic/bst/util/BstPurifier.java
+++ b/src/main/java/org/jabref/logic/bst/util/BstPurifier.java
@@ -14,10 +14,12 @@
  *
  */
 public class BstPurifier {
-    private static final Logger LOGGER = LoggerFactory.getLogger(BstPurifier.class);
 
-    private BstPurifier() {
-    }
+    private static final Logger LOGGER = LoggerFactory.getLogger(
+        BstPurifier.class
+    );
+
+    private BstPurifier() {}
 
     public static String purify(String toPurify) {
         StringBuilder sb = new StringBuilder();
@@ -40,12 +42,16 @@ public static String purify(String toPurify) {
                     i++; // skip brace
                     while ((i < n) && (braceLevel > 0)) {
                         i++; // skip backslash
-                        BstCaseChanger.findSpecialChar(cs, i).ifPresent(sb::append);
+                        BstCaseChanger
+                            .findSpecialChar(cs, i)
+                            .ifPresent(sb::append);
 
                         while ((i < n) && Character.isLetter(cs[i])) {
                             i++;
                         }
-                        while ((i < n) && (braceLevel > 0) && ((c = cs[i]) != '\\')) {
+                        while (
+                            (i < n) && (braceLevel > 0) && ((c = cs[i]) != '\\')
+                        ) {
                             if (Character.isLetterOrDigit(c)) {
                                 sb.append(c);
                             } else if (c == '}') {
@@ -62,7 +68,10 @@ public static String purify(String toPurify) {
                 if (braceLevel > 0) {
                     braceLevel--;
                 } else {
-                    LOGGER.warn("Unbalanced brace in string for purify$: {}", toPurify);
+                    LOGGER.warn(
+                        "Unbalanced brace in string for purify$: {}",
+                        toPurify
+                    );
                 }
             }
             i++;
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 31cbc71de9b..ecb53a6a374 100644
--- a/src/main/java/org/jabref/logic/bst/util/BstTextPrefixer.java
+++ b/src/main/java/org/jabref/logic/bst/util/BstTextPrefixer.java
@@ -18,10 +18,12 @@
  *
  */
 public class BstTextPrefixer {
-    private static final Logger LOGGER = LoggerFactory.getLogger(BstTextPrefixer.class);
 
-    private BstTextPrefixer() {
-    }
+    private static final Logger LOGGER = LoggerFactory.getLogger(
+        BstTextPrefixer.class
+    );
+
+    private BstTextPrefixer() {}
 
     public static String textPrefix(int inNumOfChars, String toPrefix) {
         int numOfChars = inNumOfChars;
@@ -54,7 +56,10 @@ public static String textPrefix(int inNumOfChars, String toPrefix) {
                 if (braceLevel > 0) {
                     braceLevel--;
                 } else {
-                    LOGGER.warn("Unbalanced brace in string for purify$: {}", toPrefix);
+                    LOGGER.warn(
+                        "Unbalanced brace in string for purify$: {}",
+                        toPrefix
+                    );
                 }
             } else {
                 numOfChars--;
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 c286fe1497b..f537220b385 100644
--- a/src/main/java/org/jabref/logic/bst/util/BstWidthCalculator.java
+++ b/src/main/java/org/jabref/logic/bst/util/BstWidthCalculator.java
@@ -15,7 +15,9 @@
  */
 public class BstWidthCalculator {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(BstWidthCalculator.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(
+        BstWidthCalculator.class
+    );
 
     /*
      * Quoted from Bibtex:
@@ -134,8 +136,7 @@ public class BstWidthCalculator {
         }
     }
 
-    private BstWidthCalculator() {
-    }
+    private BstWidthCalculator() {}
 
     private static int getSpecialCharWidth(char[] c, int pos) {
         if ((pos + 1) < c.length) {
@@ -203,8 +204,16 @@ public static int width(String toMeasure) {
                         if ((i < n) && (i == afterBackslash)) {
                             i++; // Skip non-alpha control seq
                         } else {
-                            if (BstCaseChanger.findSpecialChar(c, afterBackslash).isPresent()) {
-                                result += BstWidthCalculator.getSpecialCharWidth(c, afterBackslash);
+                            if (
+                                BstCaseChanger
+                                    .findSpecialChar(c, afterBackslash)
+                                    .isPresent()
+                            ) {
+                                result +=
+                                BstWidthCalculator.getSpecialCharWidth(
+                                    c,
+                                    afterBackslash
+                                );
                             }
                         }
                         while ((i < n) && Character.isWhitespace(c[i])) {
@@ -227,7 +236,9 @@ public static int width(String toMeasure) {
                 if (braceLevel > 0) {
                     braceLevel--;
                 } else {
-                    LOGGER.warn("Too many closing braces in string: " + toMeasure);
+                    LOGGER.warn(
+                        "Too many closing braces in string: " + toMeasure
+                    );
                 }
             }
             result += BstWidthCalculator.getCharWidth(c[i]);
diff --git a/src/main/java/org/jabref/logic/citationkeypattern/AbstractCitationKeyPattern.java b/src/main/java/org/jabref/logic/citationkeypattern/AbstractCitationKeyPattern.java
index 083aebb736c..655c0e7db0f 100644
--- a/src/main/java/org/jabref/logic/citationkeypattern/AbstractCitationKeyPattern.java
+++ b/src/main/java/org/jabref/logic/citationkeypattern/AbstractCitationKeyPattern.java
@@ -8,7 +8,6 @@
 import java.util.Set;
 import java.util.StringTokenizer;
 import java.util.stream.Collectors;
-
 import org.jabref.model.entry.types.EntryType;
 
 /**
@@ -49,7 +48,9 @@ public void addCitationKeyPattern(EntryType type, String pattern) {
 
     @Override
     public String toString() {
-        final StringBuilder sb = new StringBuilder("AbstractCitationKeyPattern{");
+        final StringBuilder sb = new StringBuilder(
+            "AbstractCitationKeyPattern{"
+        );
         sb.append("defaultPattern=").append(defaultPattern);
         sb.append(", data=").append(data);
         sb.append('}');
@@ -65,7 +66,10 @@ public boolean equals(Object o) {
             return false;
         }
         AbstractCitationKeyPattern that = (AbstractCitationKeyPattern) o;
-        return Objects.equals(defaultPattern, that.defaultPattern) && Objects.equals(data, that.data);
+        return (
+            Objects.equals(defaultPattern, that.defaultPattern) &&
+            Objects.equals(data, that.data)
+        );
     }
 
     @Override
@@ -120,7 +124,8 @@ public List<String> getDefaultValue() {
      */
     public void setDefaultValue(String bibtexKeyPattern) {
         Objects.requireNonNull(bibtexKeyPattern);
-        this.defaultPattern = AbstractCitationKeyPattern.split(bibtexKeyPattern);
+        this.defaultPattern =
+            AbstractCitationKeyPattern.split(bibtexKeyPattern);
     }
 
     public Set<EntryType> getAllKeys() {
@@ -128,7 +133,10 @@ public Set<EntryType> getAllKeys() {
     }
 
     public Map<EntryType, List<String>> 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 List<String> 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 4fd02d39c1f..795b0e78707 100644
--- a/src/main/java/org/jabref/logic/citationkeypattern/BracketedPattern.java
+++ b/src/main/java/org/jabref/logic/citationkeypattern/BracketedPattern.java
@@ -18,7 +18,6 @@
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;
-
 import org.jabref.logic.cleanup.Formatter;
 import org.jabref.logic.formatter.Formatters;
 import org.jabref.logic.formatter.casechanger.Word;
@@ -34,7 +33,6 @@
 import org.jabref.model.entry.field.StandardField;
 import org.jabref.model.strings.LatexToUnicodeAdapter;
 import org.jabref.model.strings.StringUtil;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -48,7 +46,10 @@
  * </p>
  */
 public class BracketedPattern {
-    private static final Logger LOGGER = LoggerFactory.getLogger(BracketedPattern.class);
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(
+        BracketedPattern.class
+    );
 
     /**
      * The maximum number of characters in the first author's last name.
@@ -69,20 +70,29 @@ public class BracketedPattern {
     /**
      * Matches everything that is not an uppercase ASCII letter. The intended use is to remove all lowercase letters
      */
-    private static final Pattern NOT_CAPITAL_CHARACTER = Pattern.compile("[^A-Z]");
+    private static final Pattern NOT_CAPITAL_CHARACTER = Pattern.compile(
+        "[^A-Z]"
+    );
 
     /**
      * 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]+(?=}\\))");
+    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 Pattern WHITESPACE = Pattern.compile(
+        "\\p{javaWhitespace}"
+    );
 
     private enum Institution {
         SCHOOL,
@@ -93,17 +103,26 @@ 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.
@@ -117,9 +136,13 @@ public static EnumSet<Institution> findTypes(List<String> nameParts) {
             for (String namePart : nameParts) {
                 if (UNIVERSITIES.matcher(namePart).matches()) {
                     parts.add(Institution.UNIVERSITY);
-                } else if (TECHNOLOGICAL_INSTITUTES.matcher(namePart).matches()) {
+                } else if (
+                    TECHNOLOGICAL_INSTITUTES.matcher(namePart).matches()
+                ) {
                     parts.add(Institution.TECHNOLOGY);
-                } else if (StandardField.SCHOOL.getName().equalsIgnoreCase(namePart)) {
+                } else if (
+                    StandardField.SCHOOL.getName().equalsIgnoreCase(namePart)
+                ) {
                     parts.add(Institution.SCHOOL);
                 } else if (DEPARTMENTS_OR_LABS.matcher(namePart).matches()) {
                     parts.add(Institution.DEPARTMENT);
@@ -174,9 +197,18 @@ public String expand(BibEntry bibentry, BibDatabase database) {
      * @param database         The database to use for string-lookups and cross-refs. May be null.
      * @return The expanded pattern. The empty string is returned, if it could not be expanded.
      */
-    public String expand(BibEntry bibentry, Character keywordDelimiter, BibDatabase database) {
+    public String expand(
+        BibEntry bibentry,
+        Character keywordDelimiter,
+        BibDatabase database
+    ) {
         Objects.requireNonNull(bibentry);
-        return expandBrackets(this.pattern, keywordDelimiter, bibentry, database);
+        return expandBrackets(
+            this.pattern,
+            keywordDelimiter,
+            bibentry,
+            database
+        );
     }
 
     /**
@@ -188,10 +220,18 @@ 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));
+        return expandBrackets(
+            pattern,
+            expandBracketContent(keywordDelimiter, entry, database)
+        );
     }
 
     /**
@@ -203,16 +243,32 @@ 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.get(0), keywordDelimiter, database);
+            expandedPattern =
+                getFieldValue(
+                    entry,
+                    fieldParts.get(0),
+                    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;
         };
@@ -226,24 +282,38 @@ 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);
+        StringTokenizer parsedPattern = new StringTokenizer(
+            pattern,
+            "\\[]\"",
+            true
+        );
 
         while (parsedPattern.hasMoreTokens()) {
             String token = parsedPattern.nextToken();
             switch (token) {
                 case "\"" -> appendQuote(expandedPattern, parsedPattern);
                 case "[" -> {
-                    String fieldMarker = contentBetweenBrackets(parsedPattern, pattern);
-                    expandedPattern.append(bracketContentHandler.apply(fieldMarker));
+                    String fieldMarker = contentBetweenBrackets(
+                        parsedPattern,
+                        pattern
+                    );
+                    expandedPattern.append(
+                        bracketContentHandler.apply(fieldMarker)
+                    );
                 }
                 case "\\" -> {
                     if (parsedPattern.hasMoreTokens()) {
                         expandedPattern.append(parsedPattern.nextToken());
                     } else {
-                        LOGGER.warn("Found a \"\\\" that is not part of an escape sequence");
+                        LOGGER.warn(
+                            "Found a \"\\\" that is not part of an escape sequence"
+                        );
                     }
                 }
                 default -> expandedPattern.append(token);
@@ -263,7 +333,10 @@ public static String expandBrackets(String pattern, Function<String, String> bra
      * @param tokenizer the tokenizer producing the tokens
      * @return the content enclosed by brackets
      */
-    private static String contentBetweenBrackets(StringTokenizer tokenizer, final String pattern) {
+    private static String contentBetweenBrackets(
+        StringTokenizer tokenizer,
+        final String pattern
+    ) {
         StringBuilder bracketContent = new StringBuilder();
         boolean foundClosingBracket = false;
         int subBrackets = 0;
@@ -305,8 +378,11 @@ private static String contentBetweenBrackets(StringTokenizer tokenizer, final St
      * @param stringBuilder the <code>StringBuilder</code> to which tokens will be appended
      * @param tokenizer     the tokenizer producing the tokens
      */
-    private static void appendQuote(StringBuilder stringBuilder, StringTokenizer tokenizer) {
-        stringBuilder.append("\"");  // We know that the previous token was \"
+    private static void appendQuote(
+        StringBuilder stringBuilder,
+        StringTokenizer tokenizer
+    ) {
+        stringBuilder.append("\""); // We know that the previous token was \"
         String token = "";
         while (tokenizer.hasMoreTokens() && !"\"".equals(token)) {
             token = tokenizer.nextToken();
@@ -323,11 +399,18 @@ 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
@@ -337,7 +420,13 @@ public static String getFieldValue(BibEntry entry, String pattern, Character key
                     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);
@@ -376,23 +465,36 @@ 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));
                     return authN(authorList, num);
                 } else if (pattern.matches("authors\\d+")) {
-                    return nAuthors(authorList, Integer.parseInt(pattern.substring(7)));
+                    return nAuthors(
+                        authorList,
+                        Integer.parseInt(pattern.substring(7))
+                    );
                 } 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) {
@@ -419,9 +521,11 @@ 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));
@@ -432,36 +536,98 @@ 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("");
+                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 ("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
-                } else if (yearString.startsWith("in") || yearString.startsWith("sub")) {
+                } else if (
+                    yearString.startsWith("in") || yearString.startsWith("sub")
+                ) {
                     return "IP";
                 } else if (yearString.length() > 2) {
                     return yearString.substring(yearString.length() - 2);
@@ -469,11 +635,19 @@ 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 "";
@@ -489,7 +663,10 @@ 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) {
@@ -504,7 +681,12 @@ 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);
@@ -520,22 +702,41 @@ public static String getFieldValue(BibEntry entry, String pattern, Character key
      * @return an {@link AuthorList} consisting of authors and institution keys with resolved latex.
      */
     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.getLast()
-                                                     .map(lastPart -> isInstitution(author) ?
-                                                             generateInstitutionKey(lastPart) :
-                                                             LatexToUnicodeAdapter.format(lastPart))
-                                                     .orElse(null);
-                             return new Author(
-                                     author.getFirst().map(LatexToUnicodeAdapter::format).orElse(null),
-                                     author.getFirstAbbr().map(LatexToUnicodeAdapter::format).orElse(null),
-                                     author.getVon().map(LatexToUnicodeAdapter::format).orElse(null),
-                                     lastName,
-                                     author.getJr().map(LatexToUnicodeAdapter::format).orElse(null));
-                         })
-                         .collect(AuthorList.collect());
+        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
+                    .getLast()
+                    .map(lastPart ->
+                        isInstitution(author)
+                            ? generateInstitutionKey(lastPart)
+                            : LatexToUnicodeAdapter.format(lastPart)
+                    )
+                    .orElse(null);
+                return new Author(
+                    author
+                        .getFirst()
+                        .map(LatexToUnicodeAdapter::format)
+                        .orElse(null),
+                    author
+                        .getFirstAbbr()
+                        .map(LatexToUnicodeAdapter::format)
+                        .orElse(null),
+                    author
+                        .getVon()
+                        .map(LatexToUnicodeAdapter::format)
+                        .orElse(null),
+                    lastName,
+                    author
+                        .getJr()
+                        .map(LatexToUnicodeAdapter::format)
+                        .orElse(null)
+                );
+            })
+            .collect(AuthorList.collect());
     }
 
     /**
@@ -545,9 +746,14 @@ 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.getFirst().isEmpty() && author.getFirstAbbr().isEmpty() && author.getJr().isEmpty()
-                && author.getVon().isEmpty() && author.getLast().isPresent()
-                && WHITESPACE.matcher(author.getLast().get()).find();
+        return (
+            author.getFirst().isEmpty() &&
+            author.getFirstAbbr().isEmpty() &&
+            author.getJr().isEmpty() &&
+            author.getVon().isEmpty() &&
+            author.getLast().isPresent() &&
+            WHITESPACE.matcher(author.getLast().get()).find()
+        );
     }
 
     /**
@@ -559,7 +765,12 @@ 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);
@@ -567,8 +778,9 @@ 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));
@@ -576,16 +788,29 @@ static String applyModifiers(final String label, final List<String> parts, final
                 }
                 resultingLabel = abbreviateSB.toString();
             } else {
-                Optional<Formatter> formatter = Formatters.getFormatterForModifier(modifier);
+                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(")")) {
+                } 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);
+                    LOGGER.warn(
+                        "Key generator warning: unknown modifier '{}'.",
+                        modifier
+                    );
                 }
             }
         }
@@ -612,8 +837,11 @@ 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))
-                    && (ss.charAt(piv) != '-')) {
+            while (
+                (piv < ss.length()) &&
+                !Character.isWhitespace(ss.charAt(piv)) &&
+                (ss.charAt(piv) != '-')
+            ) {
                 current.append(ss.charAt(piv));
                 piv++;
             }
@@ -650,7 +878,9 @@ private static String camelizeTitle(String title) {
                 String word = titleScanner.next();
 
                 // Camelize the word
-                word = word.substring(0, 1).toUpperCase(Locale.ROOT) + word.substring(1);
+                word =
+                    word.substring(0, 1).toUpperCase(Locale.ROOT) +
+                    word.substring(1);
 
                 if (stringBuilder.length() > 0) {
                     stringBuilder.append(' ');
@@ -674,13 +904,19 @@ public static String camelizeSignificantWordsInTitle(String title) {
                 String word = titleScanner.next();
 
                 // Camelize the word if it is significant
-                boolean camelize = !Word.SMALLER_WORDS.contains(word.toLowerCase(Locale.ROOT));
+                boolean camelize = !Word.SMALLER_WORDS.contains(
+                    word.toLowerCase(Locale.ROOT)
+                );
 
                 // We want to capitalize significant words and the first word of the title
                 if (camelize || (stringJoiner.length() == 0)) {
-                    word = word.substring(0, 1).toUpperCase(Locale.ROOT) + word.substring(1);
+                    word =
+                        word.substring(0, 1).toUpperCase(Locale.ROOT) +
+                        word.substring(1);
                 } else {
-                    word = word.substring(0, 1).toLowerCase(Locale.ROOT) + word.substring(1);
+                    word =
+                        word.substring(0, 1).toLowerCase(Locale.ROOT) +
+                        word.substring(1);
                 }
 
                 stringJoiner.add(word);
@@ -694,10 +930,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(" "));
         }
     }
 
@@ -705,17 +941,23 @@ private static String getTitleWordsWithSpaces(int number, String title) {
         String formattedTitle = formatTitle(title);
 
         try (Scanner titleScanner = new Scanner(formattedTitle)) {
-            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();
+        return in
+            .codePoints()
+            .filter(Character::isLetterOrDigit)
+            .collect(
+                StringBuilder::new,
+                StringBuilder::appendCodePoint,
+                StringBuilder::append
+            )
+            .toString();
     }
 
     /**
@@ -726,10 +968,16 @@ private static String keepLettersAndDigitsOnly(String in) {
      * This method is guaranteed to never return null.
      */
     private static String firstAuthor(AuthorList authorList) {
-        return authorList.getAuthors().stream()
-                         .findFirst()
-                         .flatMap(author -> author.getLast().isPresent() ? author.getLast() : author.getVon())
-                         .orElse("");
+        return authorList
+            .getAuthors()
+            .stream()
+            .findFirst()
+            .flatMap(author ->
+                author.getLast().isPresent()
+                    ? author.getLast()
+                    : author.getVon()
+            )
+            .orElse("");
     }
 
     /**
@@ -740,11 +988,13 @@ private static String firstAuthor(AuthorList authorList) {
      * never return null.
      */
     private static String firstAuthorForenameInitials(AuthorList authorList) {
-        return authorList.getAuthors().stream()
-                         .findFirst()
-                         .flatMap(Author::getFirstAbbr)
-                         .map(s -> s.substring(0, 1))
-                         .orElse("");
+        return authorList
+            .getAuthors()
+            .stream()
+            .findFirst()
+            .flatMap(Author::getFirstAbbr)
+            .map(s -> s.substring(0, 1))
+            .orElse("");
     }
 
     /**
@@ -755,8 +1005,9 @@ private static String firstAuthorForenameInitials(AuthorList authorList) {
      * never return null.
      */
     private static String firstAuthorVonAndLast(AuthorList authorList) {
-        return authorList.isEmpty() ? "" :
-                authorList.getAuthor(0).getLastOnly().replace(" ", "");
+        return authorList.isEmpty()
+            ? ""
+            : authorList.getAuthor(0).getLastOnly().replace(" ", "");
     }
 
     /**
@@ -769,7 +1020,11 @@ private static String lastAuthor(AuthorList authorList) {
         if (authorList.isEmpty()) {
             return "";
         }
-        return authorList.getAuthors().get(authorList.getNumberOfAuthors() - 1).getLast().orElse("");
+        return authorList
+            .getAuthors()
+            .get(authorList.getNumberOfAuthors() - 1)
+            .getLast()
+            .orElse("");
     }
 
     /**
@@ -783,8 +1038,11 @@ private static String lastAuthorForenameInitials(AuthorList authorList) {
         if (authorList.isEmpty()) {
             return "";
         }
-        return authorList.getAuthor(authorList.getNumberOfAuthors() - 1).getFirstAbbr().map(s -> s.substring(0, 1))
-                         .orElse("");
+        return authorList
+            .getAuthor(authorList.getNumberOfAuthors() - 1)
+            .getFirstAbbr()
+            .map(s -> s.substring(0, 1))
+            .orElse("");
     }
 
     /**
@@ -798,7 +1056,12 @@ private static String lastAuthorForenameInitials(AuthorList authorList) {
      * @return the surname of all authors/editors
      */
     static String allAuthors(AuthorList authorList) {
-        return joinAuthorsOnLastName(authorList, authorList.getNumberOfAuthors(), "", "EtAl");
+        return joinAuthorsOnLastName(
+            authorList,
+            authorList.getNumberOfAuthors(),
+            "",
+            "EtAl"
+        );
     }
 
     /**
@@ -820,28 +1083,42 @@ static String authorsAlpha(AuthorList authorList) {
         }
 
         if (authorList.getNumberOfAuthors() == 1) {
-            String[] firstAuthor = authorList.getAuthor(0).getLastOnly()
-                                             .replaceAll("\\s+", " ").trim().split(" ");
+            String[] firstAuthor = authorList
+                .getAuthor(0)
+                .getLastOnly()
+                .replaceAll("\\s+", " ")
+                .trim()
+                .split(" ");
             // take first letter of any "prefixes" (e.g. van der Aalst -> vd)
             for (int j = 0; j < (firstAuthor.length - 1); j++) {
                 alphaStyle.append(firstAuthor[j], 0, 1);
             }
             // append last part of last name completely
-            alphaStyle.append(firstAuthor[firstAuthor.length - 1], 0,
-                    Math.min(3, firstAuthor[firstAuthor.length - 1].length()));
+            alphaStyle.append(
+                firstAuthor[firstAuthor.length - 1],
+                0,
+                Math.min(3, firstAuthor[firstAuthor.length - 1].length())
+            );
         } else {
-            boolean andOthersPresent = authorList.getAuthor(maxAuthors - 1).equals(Author.OTHERS);
+            boolean andOthersPresent = authorList
+                .getAuthor(maxAuthors - 1)
+                .equals(Author.OTHERS);
             if (andOthersPresent) {
                 maxAuthors--;
             }
-            List<String> vonAndLastNames = authorList.getAuthors().stream()
-                                                     .limit(maxAuthors)
-                                                     .map(Author::getLastOnly)
-                                                     .collect(Collectors.toList());
+            List<String> vonAndLastNames = authorList
+                .getAuthors()
+                .stream()
+                .limit(maxAuthors)
+                .map(Author::getLastOnly)
+                .collect(Collectors.toList());
             for (String vonAndLast : vonAndLastNames) {
                 // replace all whitespaces by " "
                 // split the lastname at " "
-                String[] nameParts = vonAndLast.replaceAll("\\s+", " ").trim().split(" ");
+                String[] nameParts = vonAndLast
+                    .replaceAll("\\s+", " ")
+                    .trim()
+                    .split(" ");
                 for (String part : nameParts) {
                     // use first character of each part of lastname
                     alphaStyle.append(part, 0, 1);
@@ -865,23 +1142,34 @@ static String authorsAlpha(AuthorList authorList) {
      * @return a string consisting of authors' last names separated by a `delimiter` and with any authors excess of
      * `maxAuthors` replaced with `suffix`
      */
-    private 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.getLast();
-                             }
-                         })
-                         .flatMap(Optional::stream)
-                         .limit(maxAuthors)
-                         .collect(Collectors.joining(delimiter, "", finalSuffix));
+    private 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.getLast();
+                }
+            })
+            .flatMap(Optional::stream)
+            .limit(maxAuthors)
+            .collect(Collectors.joining(delimiter, "", finalSuffix));
     }
 
     /**
@@ -927,8 +1215,11 @@ static String authEtal(AuthorList authorList, String delim, String append) {
         if (authorList.isEmpty()) {
             return "";
         }
-        if ((authorList.getNumberOfAuthors() <= 2)
-                && ((authorList.getNumberOfAuthors() == 1) || !authorList.getAuthor(1).equals(Author.OTHERS))) {
+        if (
+            (authorList.getNumberOfAuthors() <= 2) &&
+            ((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)
             return joinAuthorsOnLastName(authorList, 2, delim, "");
@@ -945,7 +1236,11 @@ private static String authNofMth(AuthorList authorList, int n, int m) {
         // have m counting from 0
         int mminusone = m - 1;
 
-        if ((authorList.getNumberOfAuthors() <= mminusone) || (n < 0) || (mminusone < 0)) {
+        if (
+            (authorList.getNumberOfAuthors() <= mminusone) ||
+            (n < 0) ||
+            (mminusone < 0)
+        ) {
             return "";
         }
 
@@ -953,8 +1248,10 @@ private static String authNofMth(AuthorList authorList, int n, int m) {
         if (lastAuthor.equals(Author.OTHERS)) {
             return "+";
         }
-        String lastName = lastAuthor.getLast()
-                                    .map(CitationKeyGenerator::removeDefaultUnwantedCharacters).orElse("");
+        String lastName = lastAuthor
+            .getLast()
+            .map(CitationKeyGenerator::removeDefaultUnwantedCharacters)
+            .orElse("");
         return lastName.length() > n ? lastName.substring(0, n) : lastName;
     }
 
@@ -999,16 +1296,16 @@ 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 > 1) && ((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.getAuthors().stream().limit(limit).toList()
+            );
             return authIniN(allButOthers, n - 1) + "+";
         }
 
@@ -1041,12 +1338,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("");
     }
 
     /**
@@ -1072,12 +1370,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("");
     }
 
     /**
@@ -1100,7 +1399,9 @@ protected static List<String> parseFieldAndModifiers(String arg) {
             } else if ((currentChar == '(') && !escaped) {
                 inParenthesis++;
                 current.append(currentChar);
-            } else if ((currentChar == ')') && !escaped && (inParenthesis > 0)) {
+            } else if (
+                (currentChar == ')') && !escaped && (inParenthesis > 0)
+            ) {
                 inParenthesis--;
                 current.append(currentChar);
             } else if (currentChar == '\\') {
@@ -1198,11 +1499,18 @@ private static String generateInstitutionKey(String content) {
             return LatexToUnicodeAdapter.format(matcher.group());
         }
 
-        Optional<String> unicodeFormattedName = LatexToUnicodeAdapter.parse(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
         result = StringUtil.replaceSpecialCharacters(result);
@@ -1216,7 +1524,9 @@ private static String generateInstitutionKey(String content) {
         String rest = null;
 
         for (int index = 0; index < institutionNameTokens.length; index++) {
-            List<String> tokenParts = getValidInstitutionNameParts(institutionNameTokens[index]);
+            List<String> tokenParts = getValidInstitutionNameParts(
+                institutionNameTokens[index]
+            );
             EnumSet<Institution> tokenTypes = Institution.findTypes(tokenParts);
 
             if (tokenTypes.contains(Institution.UNIVERSITY)) {
@@ -1234,9 +1544,11 @@ private static String generateInstitutionKey(String content) {
                 if ((index > 0) && (department == null)) {
                     department = institutionNameTokens[index - 1];
                 }
-            } else if ((tokenTypes.contains(Institution.SCHOOL)
-                    || tokenTypes.contains(Institution.DEPARTMENT))
-                    && (institutionNameTokens.length > 1)) {
+            } else if (
+                (tokenTypes.contains(Institution.SCHOOL) ||
+                    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.
                 StringBuilder schoolSB = new StringBuilder();
@@ -1244,11 +1556,15 @@ private static String generateInstitutionKey(String content) {
                 for (String k : tokenParts) {
                     if (noOtherInstitutionKeyWord(k)) {
                         if (tokenTypes.contains(Institution.SCHOOL)) {
-                            schoolSB.append(NOT_CAPITAL_CHARACTER.matcher(k).replaceAll(""));
+                            schoolSB.append(
+                                NOT_CAPITAL_CHARACTER.matcher(k).replaceAll("")
+                            );
                         }
                         // Explicitly defined department part is build the same way as school
                         if (tokenTypes.contains(Institution.DEPARTMENT)) {
-                            departmentSB.append(NOT_CAPITAL_CHARACTER.matcher(k).replaceAll(""));
+                            departmentSB.append(
+                                NOT_CAPITAL_CHARACTER.matcher(k).replaceAll("")
+                            );
                         }
                     }
                 }
@@ -1262,10 +1578,11 @@ private 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);
@@ -1274,10 +1591,14 @@ private static String generateInstitutionKey(String content) {
         }
 
         // Putting parts together.
-        return (university == null ? Objects.toString(rest, "") : university)
-                + (school == null ? "" : school)
-                + ((department == null)
-                || ((school != null) && department.equals(school)) ? "" : department);
+        return (
+            (university == null ? Objects.toString(rest, "") : university) +
+            (school == null ? "" : school) +
+            ((department == null) ||
+                    ((school != null) && department.equals(school))
+                    ? ""
+                    : department)
+        );
     }
 
     /**
@@ -1287,10 +1608,12 @@ private static String generateInstitutionKey(String content) {
      * @param word to check
      */
     private static boolean noOtherInstitutionKeyWord(String word) {
-        return !DEPARTMENTS.matcher(word).matches()
-                && !StandardField.SCHOOL.getName().equalsIgnoreCase(word)
-                && !"faculty".equalsIgnoreCase(word)
-                && !NOT_CAPITAL_CHARACTER.matcher(word).replaceAll("").isEmpty();
+        return (
+            !DEPARTMENTS.matcher(word).matches() &&
+            !StandardField.SCHOOL.getName().equalsIgnoreCase(word) &&
+            !"faculty".equalsIgnoreCase(word) &&
+            !NOT_CAPITAL_CHARACTER.matcher(word).replaceAll("").isEmpty()
+        );
     }
 
     private static List<String> getValidInstitutionNameParts(String name) {
@@ -1299,11 +1622,15 @@ 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)))
-                    || ((part.length() >= 3) && "uni".equalsIgnoreCase(part.substring(0, 3)))) {
+            if (
+                (!(part.isEmpty()) &&
+                    !ignore.contains(part.toLowerCase(Locale.ENGLISH)) && // remove ignored words
+                    // remove empty
+                    (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 aa3b78d9db6..c2f8b7cef3f 100644
--- a/src/main/java/org/jabref/logic/citationkeypattern/CitationKeyGenerator.java
+++ b/src/main/java/org/jabref/logic/citationkeypattern/CitationKeyGenerator.java
@@ -6,14 +6,12 @@
 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;
 
@@ -21,10 +19,12 @@
  * This is the utility class of the LabelPattern package.
  */
 public class CitationKeyGenerator extends BracketedPattern {
+
     /**
      * All single characters that we can use for extending a key to make it unique.
      */
-    public static final String APPENDIX_CHARACTERS = "abcdefghijklmnopqrstuvwxyz";
+    public static final String APPENDIX_CHARACTERS =
+        "abcdefghijklmnopqrstuvwxyz";
 
     /**
      * List of unwanted characters. These will be removed at the end.
@@ -33,27 +33,57 @@ public class CitationKeyGenerator extends BracketedPattern {
      */
     public static final String DEFAULT_UNWANTED_CHARACTERS = "-`ʹ:!;?^";
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(CitationKeyGenerator.class);
+    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 AbstractCitationKeyPattern citeKeyPattern;
     private final BibDatabase database;
     private final CitationKeyPatternPreferences citationKeyPatternPreferences;
     private final String unwantedCharacters;
 
-    public CitationKeyGenerator(BibDatabaseContext bibDatabaseContext, CitationKeyPatternPreferences citationKeyPatternPreferences) {
-        this(bibDatabaseContext.getMetaData().getCiteKeyPattern(citationKeyPatternPreferences.getKeyPattern()),
-                bibDatabaseContext.getDatabase(),
-                citationKeyPatternPreferences);
+    public CitationKeyGenerator(
+        BibDatabaseContext bibDatabaseContext,
+        CitationKeyPatternPreferences citationKeyPatternPreferences
+    ) {
+        this(
+            bibDatabaseContext
+                .getMetaData()
+                .getCiteKeyPattern(
+                    citationKeyPatternPreferences.getKeyPattern()
+                ),
+            bibDatabaseContext.getDatabase(),
+            citationKeyPatternPreferences
+        );
     }
 
-    public CitationKeyGenerator(AbstractCitationKeyPattern citeKeyPattern, BibDatabase database, CitationKeyPatternPreferences citationKeyPatternPreferences) {
+    public CitationKeyGenerator(
+        AbstractCitationKeyPattern citeKeyPattern,
+        BibDatabase database,
+        CitationKeyPatternPreferences citationKeyPatternPreferences
+    ) {
         this.citeKeyPattern = Objects.requireNonNull(citeKeyPattern);
         this.database = Objects.requireNonNull(database);
-        this.citationKeyPatternPreferences = Objects.requireNonNull(citationKeyPatternPreferences);
-        this.unwantedCharacters = citationKeyPatternPreferences.getUnwantedCharacters();
+        this.citationKeyPatternPreferences =
+            Objects.requireNonNull(citationKeyPatternPreferences);
+        this.unwantedCharacters =
+            citationKeyPatternPreferences.getUnwantedCharacters();
     }
 
     /**
@@ -65,7 +95,10 @@ public CitationKeyGenerator(AbstractCitationKeyPattern citeKeyPattern, BibDataba
     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);
         }
@@ -75,13 +108,20 @@ public static String removeDefaultUnwantedCharacters(String key) {
         return removeUnwantedCharacters(key, DEFAULT_UNWANTED_CHARACTERS);
     }
 
-    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();
+    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();
 
         // Replace non-English characters like umlauts etc. with a sensible
         // letter or letter combination that bibtex can accept.
@@ -89,7 +129,8 @@ public static String removeUnwantedCharacters(String key, String unwantedCharact
     }
 
     public static String cleanKey(String key, String unwantedCharacters) {
-        return removeUnwantedCharacters(key, unwantedCharacters).replaceAll("\\s", "");
+        return removeUnwantedCharacters(key, unwantedCharacters)
+            .replaceAll("\\s", "");
     }
 
     /**
@@ -122,13 +163,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;
@@ -137,7 +180,8 @@ private String appendLettersToKey(String key, String oldKey) {
                 moddedKey = key + getAppendix(number);
                 number++;
 
-                occurrences = database.getNumberOfCitationKeyOccurrences(moddedKey);
+                occurrences =
+                    database.getNumberOfCitationKeyOccurrences(moddedKey);
                 // only happens if #getAddition() is buggy
                 if (Objects.equals(oldKey, moddedKey)) {
                     occurrences--;
@@ -159,11 +203,16 @@ private String replaceWithRegex(String key) {
         // Remove Regular Expressions while generating Keys
         String regex = citationKeyPatternPreferences.getKeyPatternRegex();
         if ((regex != null) && !regex.trim().isEmpty()) {
-            String replacement = citationKeyPatternPreferences.getKeyPatternReplacement();
+            String replacement =
+                citationKeyPatternPreferences.getKeyPatternReplacement();
             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;
@@ -177,7 +226,10 @@ private String createCitationKeyFromPattern(BibEntry entry) {
         if (citationKeyPattern.isEmpty()) {
             return "";
         }
-        return expandBrackets(citationKeyPattern.get(0), expandBracketContent(entry));
+        return expandBrackets(
+            citationKeyPattern.get(0),
+            expandBracketContent(entry)
+        );
     }
 
     /**
@@ -187,18 +239,34 @@ private String createCitationKeyFromPattern(BibEntry entry) {
      * @return a cleaned citation key for the given {@link BibEntry}
      */
     private Function<String, String> expandBracketContent(BibEntry entry) {
-        Character keywordDelimiter = citationKeyPatternPreferences.getKeywordDelimiter();
+        Character keywordDelimiter =
+            citationKeyPatternPreferences.getKeywordDelimiter();
 
         return (String bracket) -> {
             String expandedPattern;
             List<String> fieldParts = parseFieldAndModifiers(bracket);
 
-            expandedPattern = removeUnwantedCharacters(getFieldValue(entry, fieldParts.get(0), keywordDelimiter, database), unwantedCharacters);
+            expandedPattern =
+                removeUnwantedCharacters(
+                    getFieldValue(
+                        entry,
+                        fieldParts.get(0),
+                        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 3e2c4492d27..d06123aa274 100644
--- a/src/main/java/org/jabref/logic/citationkeypattern/CitationKeyPatternPreferences.java
+++ b/src/main/java/org/jabref/logic/citationkeypattern/CitationKeyPatternPreferences.java
@@ -1,5 +1,6 @@
 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,41 +9,51 @@
 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 ...
-    }
-
-    private final BooleanProperty shouldAvoidOverwriteCiteKey = new SimpleBooleanProperty();
-    private final BooleanProperty shouldWarnBeforeOverwriteCiteKey = new SimpleBooleanProperty();
-    private final BooleanProperty shouldGenerateCiteKeysBeforeSaving = new SimpleBooleanProperty();
-    private final ObjectProperty<KeySuffix> keySuffix = new SimpleObjectProperty<>();
+        ALWAYS, // CiteKeyA, CiteKeyB, CiteKeyC ...
+        SECOND_WITH_A, // CiteKey, CiteKeyA, CiteKeyB ...
+        SECOND_WITH_B, // CiteKey, CiteKeyB, CiteKeyC ...
+    }
+
+    private final BooleanProperty shouldAvoidOverwriteCiteKey =
+        new SimpleBooleanProperty();
+    private final BooleanProperty shouldWarnBeforeOverwriteCiteKey =
+        new SimpleBooleanProperty();
+    private final BooleanProperty shouldGenerateCiteKeysBeforeSaving =
+        new SimpleBooleanProperty();
+    private final ObjectProperty<KeySuffix> keySuffix =
+        new SimpleObjectProperty<>();
     private final StringProperty keyPatternRegex = new SimpleStringProperty();
-    private final StringProperty keyPatternReplacement = new SimpleStringProperty();
-    private final StringProperty unwantedCharacters = new SimpleStringProperty();
-    private final ObjectProperty<GlobalCitationKeyPattern> keyPattern = new SimpleObjectProperty<>();
+    private final StringProperty keyPatternReplacement =
+        new SimpleStringProperty();
+    private final StringProperty unwantedCharacters =
+        new SimpleStringProperty();
+    private final ObjectProperty<GlobalCitationKeyPattern> keyPattern =
+        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,
-                                         GlobalCitationKeyPattern keyPattern,
-                                         String defaultPattern,
-                                         ReadOnlyObjectProperty<Character> keywordDelimiter) {
-
+    public CitationKeyPatternPreferences(
+        boolean shouldAvoidOverwriteCiteKey,
+        boolean shouldWarnBeforeOverwriteCiteKey,
+        boolean shouldGenerateCiteKeysBeforeSaving,
+        KeySuffix keySuffix,
+        String keyPatternRegex,
+        String keyPatternReplacement,
+        String unwantedCharacters,
+        GlobalCitationKeyPattern keyPattern,
+        String defaultPattern,
+        ReadOnlyObjectProperty<Character> keywordDelimiter
+    ) {
         this.shouldAvoidOverwriteCiteKey.set(shouldAvoidOverwriteCiteKey);
-        this.shouldWarnBeforeOverwriteCiteKey.set(shouldWarnBeforeOverwriteCiteKey);
-        this.shouldGenerateCiteKeysBeforeSaving.set(shouldGenerateCiteKeysBeforeSaving);
+        this.shouldWarnBeforeOverwriteCiteKey.set(
+                shouldWarnBeforeOverwriteCiteKey
+            );
+        this.shouldGenerateCiteKeysBeforeSaving.set(
+                shouldGenerateCiteKeysBeforeSaving
+            );
         this.keySuffix.set(keySuffix);
         this.keyPatternRegex.set(keyPatternRegex);
         this.keyPatternReplacement.set(keyPatternReplacement);
@@ -54,27 +65,30 @@ public CitationKeyPatternPreferences(boolean shouldAvoidOverwriteCiteKey,
     }
 
     @VisibleForTesting
-    public CitationKeyPatternPreferences(boolean shouldAvoidOverwriteCiteKey,
-                                         boolean shouldWarnBeforeOverwriteCiteKey,
-                                         boolean shouldGenerateCiteKeysBeforeSaving,
-                                         KeySuffix keySuffix,
-                                         String keyPatternRegex,
-                                         String keyPatternReplacement,
-                                         String unwantedCharacters,
-                                         GlobalCitationKeyPattern keyPattern,
-                                         String defaultPattern,
-                                         Character keywordDelimiter) {
-
-        this(shouldAvoidOverwriteCiteKey,
-                shouldWarnBeforeOverwriteCiteKey,
-                shouldGenerateCiteKeysBeforeSaving,
-                keySuffix,
-                keyPatternRegex,
-                keyPatternReplacement,
-                unwantedCharacters,
-                keyPattern,
-                defaultPattern,
-                new SimpleObjectProperty<>(keywordDelimiter));
+    public CitationKeyPatternPreferences(
+        boolean shouldAvoidOverwriteCiteKey,
+        boolean shouldWarnBeforeOverwriteCiteKey,
+        boolean shouldGenerateCiteKeysBeforeSaving,
+        KeySuffix keySuffix,
+        String keyPatternRegex,
+        String keyPatternReplacement,
+        String unwantedCharacters,
+        GlobalCitationKeyPattern keyPattern,
+        String defaultPattern,
+        Character keywordDelimiter
+    ) {
+        this(
+            shouldAvoidOverwriteCiteKey,
+            shouldWarnBeforeOverwriteCiteKey,
+            shouldGenerateCiteKeysBeforeSaving,
+            keySuffix,
+            keyPatternRegex,
+            keyPatternReplacement,
+            unwantedCharacters,
+            keyPattern,
+            defaultPattern,
+            new SimpleObjectProperty<>(keywordDelimiter)
+        );
     }
 
     public boolean shouldAvoidOverwriteCiteKey() {
@@ -97,8 +111,12 @@ public BooleanProperty shouldWarnBeforeOverwriteCiteKeyProperty() {
         return shouldWarnBeforeOverwriteCiteKey;
     }
 
-    public void setWarnBeforeOverwriteCiteKey(boolean shouldWarnBeforeOverwriteCiteKey) {
-        this.shouldWarnBeforeOverwriteCiteKey.set(shouldWarnBeforeOverwriteCiteKey);
+    public void setWarnBeforeOverwriteCiteKey(
+        boolean shouldWarnBeforeOverwriteCiteKey
+    ) {
+        this.shouldWarnBeforeOverwriteCiteKey.set(
+                shouldWarnBeforeOverwriteCiteKey
+            );
     }
 
     public boolean shouldGenerateCiteKeysBeforeSaving() {
@@ -109,8 +127,12 @@ public BooleanProperty shouldGenerateCiteKeysBeforeSavingProperty() {
         return shouldGenerateCiteKeysBeforeSaving;
     }
 
-    public void setGenerateCiteKeysBeforeSaving(boolean shouldGenerateCiteKeysBeforeSaving) {
-        this.shouldGenerateCiteKeysBeforeSaving.set(shouldGenerateCiteKeysBeforeSaving);
+    public void setGenerateCiteKeysBeforeSaving(
+        boolean shouldGenerateCiteKeysBeforeSaving
+    ) {
+        this.shouldGenerateCiteKeysBeforeSaving.set(
+                shouldGenerateCiteKeysBeforeSaving
+            );
     }
 
     public KeySuffix getKeySuffix() {
diff --git a/src/main/java/org/jabref/logic/citationkeypattern/DatabaseCitationKeyPattern.java b/src/main/java/org/jabref/logic/citationkeypattern/DatabaseCitationKeyPattern.java
index 33e643d4a4c..8a2cd852f82 100644
--- a/src/main/java/org/jabref/logic/citationkeypattern/DatabaseCitationKeyPattern.java
+++ b/src/main/java/org/jabref/logic/citationkeypattern/DatabaseCitationKeyPattern.java
@@ -1,14 +1,15 @@
 package org.jabref.logic.citationkeypattern;
 
 import java.util.List;
-
 import org.jabref.model.entry.types.EntryType;
 
 public class DatabaseCitationKeyPattern extends AbstractCitationKeyPattern {
 
     private final GlobalCitationKeyPattern globalCitationKeyPattern;
 
-    public DatabaseCitationKeyPattern(GlobalCitationKeyPattern globalCitationKeyPattern) {
+    public DatabaseCitationKeyPattern(
+        GlobalCitationKeyPattern globalCitationKeyPattern
+    ) {
         this.globalCitationKeyPattern = globalCitationKeyPattern;
     }
 
diff --git a/src/main/java/org/jabref/logic/citationkeypattern/GlobalCitationKeyPattern.java b/src/main/java/org/jabref/logic/citationkeypattern/GlobalCitationKeyPattern.java
index 38c6b3000b9..21f6d5dae90 100644
--- a/src/main/java/org/jabref/logic/citationkeypattern/GlobalCitationKeyPattern.java
+++ b/src/main/java/org/jabref/logic/citationkeypattern/GlobalCitationKeyPattern.java
@@ -1,7 +1,6 @@
 package org.jabref.logic.citationkeypattern;
 
 import java.util.List;
-
 import org.jabref.model.entry.types.EntryType;
 
 public class GlobalCitationKeyPattern extends AbstractCitationKeyPattern {
diff --git a/src/main/java/org/jabref/logic/citationstyle/CSLAdapter.java b/src/main/java/org/jabref/logic/citationstyle/CSLAdapter.java
index 7c015d570d0..f1cb4f1648e 100644
--- a/src/main/java/org/jabref/logic/citationstyle/CSLAdapter.java
+++ b/src/main/java/org/jabref/logic/citationstyle/CSLAdapter.java
@@ -1,18 +1,16 @@
 package org.jabref.logic.citationstyle;
 
+import de.undercouch.citeproc.CSL;
+import de.undercouch.citeproc.DefaultAbbreviationProvider;
+import de.undercouch.citeproc.output.Bibliography;
 import java.io.IOException;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Objects;
-
 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;
-
 /**
  * Provides an adapter class to CSL. It holds a CSL instance under the hood that is only recreated when
  * the style changes.
@@ -31,7 +29,8 @@
  */
 public class CSLAdapter {
 
-    private final JabRefItemDataProvider dataProvider = new JabRefItemDataProvider();
+    private final JabRefItemDataProvider dataProvider =
+        new JabRefItemDataProvider();
     private String style;
     private CitationStyleOutputFormat format;
     private CSL cslInstance;
@@ -42,7 +41,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());
@@ -57,16 +62,29 @@ public synchronized List<String> makeBibliography(List<BibEntry> bibEntries, Str
      * @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;
         }
 
-        if (newCslInstanceNeedsToBeCreated || (!Objects.equals(newFormat, format))) {
+        if (
+            newCslInstanceNeedsToBeCreated ||
+            (!Objects.equals(newFormat, format))
+        ) {
             cslInstance.setOutputFormat(newFormat.getFormat());
             format = newFormat;
         }
diff --git a/src/main/java/org/jabref/logic/citationstyle/CitationStyle.java b/src/main/java/org/jabref/logic/citationstyle/CitationStyle.java
index fb0aab7dc97..f84f62f86ab 100644
--- a/src/main/java/org/jabref/logic/citationstyle/CitationStyle.java
+++ b/src/main/java/org/jabref/logic/citationstyle/CitationStyle.java
@@ -1,5 +1,6 @@
 package org.jabref.logic.citationstyle;
 
+import de.undercouch.citeproc.helper.CSLUtils;
 import java.io.IOException;
 import java.io.StringReader;
 import java.net.URI;
@@ -16,13 +17,9 @@
 import java.util.Optional;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
-
 import javax.xml.parsers.DocumentBuilderFactory;
 import javax.xml.parsers.ParserConfigurationException;
-
 import org.jabref.logic.util.StandardFileType;
-
-import de.undercouch.citeproc.helper.CSLUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.w3c.dom.CharacterData;
@@ -39,16 +36,23 @@ public class CitationStyle {
 
     public static final String DEFAULT = "/ieee.csl";
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(CitationStyle.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(
+        CitationStyle.class
+    );
     private static final String STYLES_ROOT = "/csl-styles";
     private static final List<CitationStyle> STYLES = new ArrayList<>();
-    private static final DocumentBuilderFactory FACTORY = DocumentBuilderFactory.newInstance();
+    private static final DocumentBuilderFactory FACTORY =
+        DocumentBuilderFactory.newInstance();
 
     private final String filePath;
     private final String title;
     private final String source;
 
-    private CitationStyle(final String filename, final String title, final String source) {
+    private CitationStyle(
+        final String filename,
+        final String title,
+        final String source
+    ) {
         this.filePath = Objects.requireNonNull(filename);
         this.title = Objects.requireNonNull(title);
         this.source = Objects.requireNonNull(source);
@@ -57,27 +61,46 @@ private CitationStyle(final String filename, final String title, final String so
     /**
      * Creates an CitationStyle instance out of the style string
      */
-    private static Optional<CitationStyle> createCitationStyleFromSource(final String source, final String filename) {
-        if ((filename != null) && !filename.isEmpty() && (source != null) && !source.isEmpty()) {
+    private static Optional<CitationStyle> createCitationStyleFromSource(
+        final String source,
+        final String filename
+    ) {
+        if (
+            (filename != null) &&
+            !filename.isEmpty() &&
+            (source != null) &&
+            !source.isEmpty()
+        ) {
             try {
                 InputSource inputSource = new InputSource();
-                inputSource.setCharacterStream(new StringReader(stripInvalidProlog(source)));
+                inputSource.setCharacterStream(
+                    new StringReader(stripInvalidProlog(source))
+                );
 
                 Document doc = FACTORY.newDocumentBuilder().parse(inputSource);
 
                 // See CSL#canFormatBibliographies, checks if the tag exists
                 NodeList bibs = doc.getElementsByTagName("bibliography");
                 if (bibs.getLength() <= 0) {
-                    LOGGER.debug("no bibliography element for file {} ", filename);
+                    LOGGER.debug(
+                        "no bibliography element for file {} ",
+                        filename
+                    );
                     return Optional.empty();
                 }
 
                 NodeList nodes = doc.getElementsByTagName("info");
-                NodeList titleNode = ((Element) nodes.item(0)).getElementsByTagName("title");
-                String title = ((CharacterData) titleNode.item(0).getFirstChild()).getData();
+                NodeList titleNode =
+                    ((Element) nodes.item(0)).getElementsByTagName("title");
+                String title =
+                    ((CharacterData) titleNode
+                            .item(0)
+                            .getFirstChild()).getData();
 
                 return Optional.of(new CitationStyle(filename, title, source));
-            } catch (ParserConfigurationException | SAXException | IOException e) {
+            } catch (
+                ParserConfigurationException | SAXException | IOException e
+            ) {
                 LOGGER.error("Error while parsing source", e);
             }
         }
@@ -96,7 +119,9 @@ private static String stripInvalidProlog(String source) {
     /**
      * Loads the CitationStyle from the given file
      */
-    public static Optional<CitationStyle> createCitationStyleFromFile(final String styleFile) {
+    public static Optional<CitationStyle> createCitationStyleFromFile(
+        final String styleFile
+    ) {
         if (!isCitationStyleFile(styleFile)) {
             LOGGER.error("Can only load style files: {}", styleFile);
             return Optional.empty();
@@ -104,11 +129,18 @@ public static Optional<CitationStyle> createCitationStyleFromFile(final String s
 
         try {
             String text;
-            String internalFile = STYLES_ROOT + (styleFile.startsWith("/") ? "" : "/") + styleFile;
+            String internalFile =
+                STYLES_ROOT +
+                (styleFile.startsWith("/") ? "" : "/") +
+                styleFile;
             URL url = CitationStyle.class.getResource(internalFile);
 
             if (url != null) {
-                text = CSLUtils.readURLToString(url, StandardCharsets.UTF_8.toString());
+                text =
+                    CSLUtils.readURLToString(
+                        url,
+                        StandardCharsets.UTF_8.toString()
+                    );
             } else {
                 // if the url is null then the style is located outside the classpath
                 text = Files.readString(Path.of(styleFile));
@@ -128,7 +160,8 @@ public static Optional<CitationStyle> createCitationStyleFromFile(final String s
      * @return default citation style
      */
     public static CitationStyle getDefault() {
-        return createCitationStyleFromFile(DEFAULT).orElse(new CitationStyle("", "Empty", ""));
+        return createCitationStyleFromFile(DEFAULT)
+            .orElse(new CitationStyle("", "Empty", ""));
     }
 
     /**
@@ -141,7 +174,8 @@ public static List<CitationStyle> discoverCitationStyles() {
             return STYLES;
         }
 
-        URL url = CitationStyle.class.getResource(STYLES_ROOT + "/acm-siggraph.csl");
+        URL url =
+            CitationStyle.class.getResource(STYLES_ROOT + "/acm-siggraph.csl");
         Objects.requireNonNull(url);
 
         try {
@@ -151,19 +185,30 @@ public static List<CitationStyle> discoverCitationStyles() {
 
             return STYLES;
         } catch (URISyntaxException | IOException e) {
-            LOGGER.error("something went wrong while searching available CitationStyles", 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"))) {
-            return stream.map(Path::getFileName)
-                         .map(Path::toString)
-                         .map(CitationStyle::createCitationStyleFromFile)
-                         .filter(Optional::isPresent)
-                         .map(Optional::get)
-                         .collect(Collectors.toList());
+    private static List<CitationStyle> discoverCitationStylesInPath(Path path)
+        throws IOException {
+        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());
         }
     }
 
@@ -171,7 +216,10 @@ 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 f94aaef26d9..7a39a1cb59e 100644
--- a/src/main/java/org/jabref/logic/citationstyle/CitationStyleCache.java
+++ b/src/main/java/org/jabref/logic/citationstyle/CitationStyleCache.java
@@ -1,18 +1,16 @@
 package org.jabref.logic.citationstyle;
 
+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;
-
 import org.jabref.logic.preview.PreviewLayout;
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.database.event.EntriesRemovedEvent;
 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;
-
 /**
  * Caches the generated Citations for quicker access
  * {@link CitationStyleGenerator} generates the citation with JavaScript which may take some time
@@ -25,17 +23,28 @@ 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 "";
-                }
-            }
-        });
-        databaseContext.getDatabase().registerListener(new BibDatabaseEntryListener());
+        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());
     }
 
     /**
@@ -54,6 +63,7 @@ public void setCitationStyle(PreviewLayout citationStyle) {
     }
 
     private class BibDatabaseEntryListener {
+
         /**
          * removes the outdated citation of the changed entry
          */
diff --git a/src/main/java/org/jabref/logic/citationstyle/CitationStyleGenerator.java b/src/main/java/org/jabref/logic/citationstyle/CitationStyleGenerator.java
index d9f5f2f8e45..74f19066be4 100644
--- a/src/main/java/org/jabref/logic/citationstyle/CitationStyleGenerator.java
+++ b/src/main/java/org/jabref/logic/citationstyle/CitationStyleGenerator.java
@@ -3,12 +3,10 @@
 import java.io.IOException;
 import java.util.Collections;
 import java.util.List;
-
 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 org.jbibtex.TokenMgrException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -19,18 +17,23 @@
  */
 public class CitationStyleGenerator {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(CitationStyleGenerator.class);
+    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 the given entry and 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 generateCitation(BibEntry entry, CitationStyle style, BibEntryTypesManager entryTypesManager) {
+    protected static String generateCitation(
+        BibEntry entry,
+        CitationStyle style,
+        BibEntryTypesManager entryTypesManager
+    ) {
         return generateCitation(entry, style.getSource(), entryTypesManager);
     }
 
@@ -39,8 +42,18 @@ protected static String generateCitation(BibEntry entry, CitationStyle style, Bi
      *
      * @implNote the citation is generated using JavaScript which may take some time, better call it from outside the main Thread
      */
-    protected static String generateCitation(BibEntry entry, String style, BibEntryTypesManager entryTypesManager) {
-        return generateCitation(entry, style, CitationStyleOutputFormat.HTML, new BibDatabaseContext(), entryTypesManager);
+    protected static String generateCitation(
+        BibEntry entry,
+        String style,
+        BibEntryTypesManager entryTypesManager
+    ) {
+        return generateCitation(
+            entry,
+            style,
+            CitationStyleOutputFormat.HTML,
+            new BibDatabaseContext(),
+            entryTypesManager
+        );
     }
 
     /**
@@ -48,8 +61,23 @@ protected static String generateCitation(BibEntry entry, String style, BibEntryT
      *
      * @implNote the citation is generated using JavaScript which may take some time, better call it from outside the main Thread
      */
-    public static String generateCitation(BibEntry entry, String style, CitationStyleOutputFormat outputFormat, BibDatabaseContext databaseContext, BibEntryTypesManager entryTypesManager) {
-        return generateCitations(Collections.singletonList(entry), style, outputFormat, databaseContext, entryTypesManager).stream().findFirst().orElse("");
+    public static String generateCitation(
+        BibEntry entry,
+        String style,
+        CitationStyleOutputFormat outputFormat,
+        BibDatabaseContext databaseContext,
+        BibEntryTypesManager entryTypesManager
+    ) {
+        return generateCitations(
+            Collections.singletonList(entry),
+            style,
+            outputFormat,
+            databaseContext,
+            entryTypesManager
+        )
+            .stream()
+            .findFirst()
+            .orElse("");
     }
 
     /**
@@ -57,23 +85,50 @@ public static String generateCitation(BibEntry entry, String style, CitationStyl
      *
      * @implNote The citations are generated using JavaScript which may take some time, better call it from outside the main thread.
      */
-    public static List<String> generateCitations(List<BibEntry> bibEntries, String style, CitationStyleOutputFormat outputFormat, BibDatabaseContext databaseContext, BibEntryTypesManager entryTypesManager) {
+    public static List<String> generateCitations(
+        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 d06763cb2c1..bac7e2f6e5b 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.util.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 7e790c3ef0e..a3da0fc87a7 100644
--- a/src/main/java/org/jabref/logic/citationstyle/CitationStylePreviewLayout.java
+++ b/src/main/java/org/jabref/logic/citationstyle/CitationStylePreviewLayout.java
@@ -6,17 +6,30 @@
 import org.jabref.model.entry.BibEntryTypesManager;
 
 public 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.generateCitation(entry, citationStyle.getSource(), CitationStyleOutputFormat.HTML, databaseContext, bibEntryTypesManager);
+    public String generatePreview(
+        BibEntry entry,
+        BibDatabaseContext databaseContext
+    ) {
+        return CitationStyleGenerator.generateCitation(
+            entry,
+            citationStyle.getSource(),
+            CitationStyleOutputFormat.HTML,
+            databaseContext,
+            bibEntryTypesManager
+        );
     }
 
     @Override
diff --git a/src/main/java/org/jabref/logic/citationstyle/JabRefItemDataProvider.java b/src/main/java/org/jabref/logic/citationstyle/JabRefItemDataProvider.java
index 2310a7c6b25..45005ab49b9 100644
--- a/src/main/java/org/jabref/logic/citationstyle/JabRefItemDataProvider.java
+++ b/src/main/java/org/jabref/logic/citationstyle/JabRefItemDataProvider.java
@@ -1,5 +1,9 @@
 package org.jabref.logic.citationstyle;
 
+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 java.util.ArrayList;
 import java.util.Collection;
 import java.util.LinkedHashSet;
@@ -8,7 +12,6 @@
 import java.util.Optional;
 import java.util.Set;
 import java.util.stream.Collectors;
-
 import org.jabref.logic.formatter.bibtexfields.RemoveNewlinesFormatter;
 import org.jabref.logic.integrity.PagesChecker;
 import org.jabref.model.database.BibDatabaseContext;
@@ -21,11 +24,6 @@
 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;
@@ -36,7 +34,8 @@
  */
 public class JabRefItemDataProvider implements ItemDataProvider {
 
-    private static final BibTeXConverter BIBTEX_CONVERTER = new BibTeXConverter();
+    private static final BibTeXConverter BIBTEX_CONVERTER =
+        new BibTeXConverter();
 
     private final StringJsonBuilderFactory stringJsonBuilderFactory;
 
@@ -97,17 +96,28 @@ public JabRefItemDataProvider() {
      * </tbody>
      * </table>
      */
-    private CSLItemData bibEntryToCSLItemData(BibEntry originalBibEntry, BibDatabaseContext bibDatabaseContext, BibEntryTypesManager entryTypesManager) {
+    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();
+        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
@@ -115,53 +125,78 @@ private CSLItemData bibEntryToCSLItemData(BibEntry originalBibEntry, BibDatabase
             // See BibTeXConverter
             if (bibDatabaseContext.isBiblatexMode()) {
                 // Map "number" to CSL "issue", unless no number exists
-                Optional<String> numberField = bibEntry.getField(StandardField.NUMBER);
-                numberField.ifPresent(number -> {
-                            bibEntry.setField(StandardField.ISSUE, number);
-                            bibEntry.clearField(StandardField.NUMBER);
-                        }
+                Optional<String> numberField = bibEntry.getField(
+                    StandardField.NUMBER
                 );
-
-                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 -> {
+                numberField.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.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);
+                        }
+                    });
             }
         }
 
-        Set<Field> fields = new LinkedHashSet<>(entryType.map(BibEntryType::getAllFields).orElse(bibEntry.getFields()));
+        Set<Field> fields = new LinkedHashSet<>(
+            entryType
+                .map(BibEntryType::getAllFields)
+                .orElse(bibEntry.getFields())
+        );
         fields.addAll(bibEntry.getFields());
         for (Field key : fields) {
-            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));
-                    });
+            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)
+                    );
+                });
         }
         return BIBTEX_CONVERTER.toItemData(bibTeXEntry);
     }
@@ -169,11 +204,22 @@ private CSLItemData bibEntryToCSLItemData(BibEntry originalBibEntry, BibDatabase
     /**
      * Fills the data with all entries in given bibDatabaseContext
      */
-    public void setData(BibDatabaseContext bibDatabaseContext, BibEntryTypesManager entryTypesManager) {
-        this.setData(bibDatabaseContext.getEntries(), bibDatabaseContext, 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;
@@ -188,26 +234,44 @@ 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);
+        return data
+            .stream()
+            .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(",", "[", "]"));
+        return entries
+            .stream()
+            .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 376303c7caf..0975fa742c7 100644
--- a/src/main/java/org/jabref/logic/citationstyle/JabRefLocaleProvider.java
+++ b/src/main/java/org/jabref/logic/citationstyle/JabRefLocaleProvider.java
@@ -1,14 +1,13 @@
 package org.jabref.logic.citationstyle;
 
+import de.undercouch.citeproc.LocaleProvider;
+import de.undercouch.citeproc.helper.CSLUtils;
 import java.io.IOException;
 import java.io.UncheckedIOException;
 import java.net.URL;
 import java.util.HashMap;
 import java.util.Map;
 
-import de.undercouch.citeproc.LocaleProvider;
-import de.undercouch.citeproc.helper.CSLUtils;
-
 /**
  * A {@link LocaleProvider} that loads locales from a directory in the current module.
  * <p>
@@ -22,17 +21,28 @@ public class JabRefLocaleProvider implements LocaleProvider {
 
     @Override
     public String retrieveLocale(String lang) {
-        return locales.computeIfAbsent(lang, locale -> {
-            try {
-                URL url = getClass().getResource(LOCALES_ROOT + "/locales-" + locale + ".xml");
-                if (url == null) {
-                    throw new IllegalArgumentException("Unable to load locale " + locale);
-                }
+        return locales.computeIfAbsent(
+            lang,
+            locale -> {
+                try {
+                    URL url = getClass()
+                        .getResource(
+                            LOCALES_ROOT + "/locales-" + locale + ".xml"
+                        );
+                    if (url == null) {
+                        throw new IllegalArgumentException(
+                            "Unable to load locale " + locale
+                        );
+                    }
 
-                return CSLUtils.readURLToString(url, "UTF-8");
-            } catch (IOException e) {
-                throw new UncheckedIOException("failed to read locale " + locale, e);
+                    return CSLUtils.readURLToString(url, "UTF-8");
+                } catch (IOException 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 a36f12a2408..2a1d2603713 100644
--- a/src/main/java/org/jabref/logic/cleanup/CleanupJob.java
+++ b/src/main/java/org/jabref/logic/cleanup/CleanupJob.java
@@ -1,13 +1,11 @@
 package org.jabref.logic.cleanup;
 
 import java.util.List;
-
 import org.jabref.model.FieldChange;
 import org.jabref.model.entry.BibEntry;
 
 @FunctionalInterface
 public interface CleanupJob {
-
     /**
      * Cleanup the entry.
      */
diff --git a/src/main/java/org/jabref/logic/cleanup/CleanupWorker.java b/src/main/java/org/jabref/logic/cleanup/CleanupWorker.java
index 1663db75f87..0a7e8ca31df 100644
--- a/src/main/java/org/jabref/logic/cleanup/CleanupWorker.java
+++ b/src/main/java/org/jabref/logic/cleanup/CleanupWorker.java
@@ -3,7 +3,6 @@
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
-
 import org.jabref.logic.preferences.TimestampPreferences;
 import org.jabref.model.FieldChange;
 import org.jabref.model.database.BibDatabaseContext;
@@ -17,13 +16,20 @@ public class CleanupWorker {
     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;
     }
 
-    public List<FieldChange> cleanup(CleanupPreferences preset, BibEntry entry) {
+    public List<FieldChange> cleanup(
+        CleanupPreferences preset,
+        BibEntry entry
+    ) {
         Objects.requireNonNull(preset);
         Objects.requireNonNull(entry);
 
@@ -37,7 +43,9 @@ public List<FieldChange> cleanup(CleanupPreferences preset, BibEntry entry) {
         return changes;
     }
 
-    private List<CleanupJob> determineCleanupActions(CleanupPreferences preset) {
+    private List<CleanupJob> determineCleanupActions(
+        CleanupPreferences preset
+    ) {
         List<CleanupJob> jobs = new ArrayList<>();
 
         for (CleanupPreferences.CleanupStep action : preset.getActiveJobs()) {
@@ -45,7 +53,9 @@ private List<CleanupJob> determineCleanupActions(CleanupPreferences preset) {
         }
 
         if (preset.getFieldFormatterCleanups().isEnabled()) {
-            jobs.addAll(preset.getFieldFormatterCleanups().getConfiguredActions());
+            jobs.addAll(
+                preset.getFieldFormatterCleanups().getConfiguredActions()
+            );
         }
 
         return jobs;
@@ -53,36 +63,39 @@ 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 RENAME_PDF_ONLY_RELATIVE_PATHS ->
-                    new RenamePdfCleanup(true, databaseContext, filePreferences);
-            case CLEAN_UP_UPGRADE_EXTERNAL_LINKS ->
-                    new UpgradePdfPsToFileCleanup();
-            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 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 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());
         };
     }
 }
diff --git a/src/main/java/org/jabref/logic/cleanup/ConvertToBiblatexCleanup.java b/src/main/java/org/jabref/logic/cleanup/ConvertToBiblatexCleanup.java
index 470d01f335b..db868c6509f 100644
--- a/src/main/java/org/jabref/logic/cleanup/ConvertToBiblatexCleanup.java
+++ b/src/main/java/org/jabref/logic/cleanup/ConvertToBiblatexCleanup.java
@@ -4,7 +4,6 @@
 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;
@@ -21,37 +20,64 @@ 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).isPresent())) {
-                    // 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).isPresent())
+                    ) {
+                        // 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());
+            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 1b289c091d9..d3f6d593077 100644
--- a/src/main/java/org/jabref/logic/cleanup/ConvertToBibtexCleanup.java
+++ b/src/main/java/org/jabref/logic/cleanup/ConvertToBibtexCleanup.java
@@ -3,7 +3,6 @@
 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;
@@ -22,30 +21,57 @@ 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).isPresent())) {
-                    // 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).isPresent())
+                    ) {
+                        // 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 1cb3f2d04e3..5c5ee704615 100644
--- a/src/main/java/org/jabref/logic/cleanup/DoiCleanup.java
+++ b/src/main/java/org/jabref/logic/cleanup/DoiCleanup.java
@@ -6,7 +6,6 @@
 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;
@@ -24,8 +23,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) {
@@ -33,10 +36,13 @@ public List<FieldChange> cleanup(BibEntry entry) {
 
         // First check if the Doi Field is empty
         if (entry.hasField(StandardField.DOI)) {
-            String doiFieldValue = entry.getField(StandardField.DOI).orElse(null);
+            String doiFieldValue = entry
+                .getField(StandardField.DOI)
+                .orElse(null);
 
             String decodeDoiFieldValue = "";
-            decodeDoiFieldValue = URLDecoder.decode(doiFieldValue, StandardCharsets.UTF_8);
+            decodeDoiFieldValue =
+                URLDecoder.decode(doiFieldValue, StandardCharsets.UTF_8);
             doiFieldValue = decodeDoiFieldValue;
 
             Optional<DOI> doi = DOI.parse(doiFieldValue);
@@ -46,14 +52,23 @@ 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,26 +80,40 @@ 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);
+                        });
                 }
             }
         }
         return changes;
     }
 
-    private void removeFieldValue(BibEntry entry, Field field, List<FieldChange> changes) {
-        CleanupJob eraser = new FieldFormatterCleanup(field, new ClearFormatter());
+    private void removeFieldValue(
+        BibEntry entry,
+        Field field,
+        List<FieldChange> changes
+    ) {
+        CleanupJob eraser = new FieldFormatterCleanup(
+            field,
+            new ClearFormatter()
+        );
         changes.addAll(eraser.cleanup(entry));
     }
 }
diff --git a/src/main/java/org/jabref/logic/cleanup/EprintCleanup.java b/src/main/java/org/jabref/logic/cleanup/EprintCleanup.java
index 27ab856c499..5202fa29c8e 100644
--- a/src/main/java/org/jabref/logic/cleanup/EprintCleanup.java
+++ b/src/main/java/org/jabref/logic/cleanup/EprintCleanup.java
@@ -4,7 +4,6 @@
 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;
@@ -20,28 +19,44 @@ public class EprintCleanup implements CleanupJob {
     public List<FieldChange> cleanup(BibEntry entry) {
         List<FieldChange> changes = new ArrayList<>();
 
-        for (Field field : Arrays.asList(StandardField.URL, StandardField.JOURNAL, StandardField.JOURNALTITLE, StandardField.NOTE)) {
-            Optional<ArXivIdentifier> arXivIdentifier = entry.getField(field).flatMap(ArXivIdentifier::parse);
+        for (Field field : Arrays.asList(
+            StandardField.URL,
+            StandardField.JOURNAL,
+            StandardField.JOURNALTITLE,
+            StandardField.NOTE
+        )) {
+            Optional<ArXivIdentifier> arXivIdentifier = entry
+                .getField(field)
+                .flatMap(ArXivIdentifier::parse);
 
             if (arXivIdentifier.isPresent()) {
-                entry.setField(StandardField.EPRINT, arXivIdentifier.get().getNormalized())
-                     .ifPresent(changes::add);
+                entry
+                    .setField(
+                        StandardField.EPRINT,
+                        arXivIdentifier.get().getNormalized()
+                    )
+                    .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 197debd20fd..4e3eb32ce82 100644
--- a/src/main/java/org/jabref/logic/cleanup/FieldFormatterCleanup.java
+++ b/src/main/java/org/jabref/logic/cleanup/FieldFormatterCleanup.java
@@ -6,7 +6,6 @@
 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;
@@ -47,7 +46,10 @@ public List<FieldChange> cleanup(BibEntry entry) {
      * @param entry    the entry to be cleaned up
      * @return a list of changes of the entry
      */
-    private List<FieldChange> cleanupSingleField(Field fieldKey, BibEntry entry) {
+    private List<FieldChange> cleanupSingleField(
+        Field fieldKey,
+        BibEntry entry
+    ) {
         if (!entry.hasField(fieldKey)) {
             // Not set -> nothing to do
             return Collections.emptyList();
@@ -64,9 +66,18 @@ private List<FieldChange> cleanupSingleField(Field fieldKey, BibEntry entry) {
                 entry.clearField(fieldKey);
                 newValue = null;
             } else {
-                entry.setField(fieldKey, newValue, EntriesEventSource.SAVE_ACTION);
+                entry.setField(
+                    fieldKey,
+                    newValue,
+                    EntriesEventSource.SAVE_ACTION
+                );
             }
-            FieldChange change = new FieldChange(entry, fieldKey, oldValue, newValue);
+            FieldChange change = new FieldChange(
+                entry,
+                fieldKey,
+                oldValue,
+                newValue
+            );
             return Collections.singletonList(change);
         }
     }
@@ -110,7 +121,10 @@ public boolean equals(Object obj) {
             return true;
         }
         if (obj instanceof FieldFormatterCleanup that) {
-            return Objects.equals(field, that.field) && Objects.equals(formatter, that.formatter);
+            return (
+                Objects.equals(field, that.field) &&
+                Objects.equals(formatter, that.formatter)
+            );
         }
         return false;
     }
diff --git a/src/main/java/org/jabref/logic/cleanup/FieldFormatterCleanups.java b/src/main/java/org/jabref/logic/cleanup/FieldFormatterCleanups.java
index bb9651f9145..12f238a761e 100644
--- a/src/main/java/org/jabref/logic/cleanup/FieldFormatterCleanups.java
+++ b/src/main/java/org/jabref/logic/cleanup/FieldFormatterCleanups.java
@@ -10,7 +10,6 @@
 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,7 +28,6 @@
 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;
 
@@ -42,7 +40,9 @@ public class FieldFormatterCleanups {
     public static final String ENABLED = "enabled";
     public static final String DISABLED = "disabled";
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(FieldFormatterCleanups.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(
+        FieldFormatterCleanups.class
+    );
 
     /**
      * This parses the key/list map of fields and clean up actions for the field.
@@ -55,34 +55,77 @@ 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())));
-        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())));
+        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.
-        RECOMMEND_BIBLATEX_ACTIONS = Collections.unmodifiableList(recommendedBiblatexFormatters);
+        RECOMMEND_BIBLATEX_ACTIONS =
+            Collections.unmodifiableList(recommendedBiblatexFormatters);
     }
 
     private final boolean enabled;
     private final List<FieldFormatterCleanup> actions;
 
-    public FieldFormatterCleanups(boolean enabled, List<FieldFormatterCleanup> actions) {
+    public FieldFormatterCleanups(
+        boolean enabled,
+        List<FieldFormatterCleanup> actions
+    ) {
         this.enabled = enabled;
         this.actions = Objects.requireNonNull(actions);
     }
@@ -90,7 +133,10 @@ 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<>();
@@ -114,7 +160,11 @@ public static String getMetaDataString(List<FieldFormatterCleanup> actionList, S
         for (Map.Entry<Field, List<String>> entry : groupedByField.entrySet()) {
             result.append(entry.getKey().getName());
 
-            StringJoiner joiner = new StringJoiner(",", "[", "]" + newLineSeparator);
+            StringJoiner joiner = new StringJoiner(
+                ",",
+                "[",
+                "]" + newLineSeparator
+            );
             entry.getValue().forEach(joiner::add);
             result.append(joiner);
         }
@@ -172,19 +222,25 @@ public static List<FieldFormatterCleanup> parse(String formatterString) {
         List<FieldFormatterCleanup> result = new ArrayList<>();
 
         // first remove all newlines for easier parsing
-        String formatterStringWithoutLineBreaks = StringUtil.unifyLineBreaks(formatterString, "");
-
-        Matcher matcher = FIELD_FORMATTER_CLEANUP_PATTERN.matcher(formatterStringWithoutLineBreaks);
+        String formatterStringWithoutLineBreaks = StringUtil.unifyLineBreaks(
+            formatterString,
+            ""
+        );
+
+        Matcher matcher = FIELD_FORMATTER_CLEANUP_PATTERN.matcher(
+            formatterStringWithoutLineBreaks
+        );
         while (matcher.find()) {
             String fieldKey = matcher.group(1);
             Field field = FieldFactory.parseField(fieldKey);
 
             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;
@@ -193,10 +249,15 @@ public static List<FieldFormatterCleanup> parse(String formatterString) {
     // ToDo: This should reside in MetaDataParser
     public static FieldFormatterCleanups parse(List<String> formatterMetaList) {
         if ((formatterMetaList != null) && (formatterMetaList.size() >= 2)) {
-            boolean enablementStatus = FieldFormatterCleanups.ENABLED.equals(formatterMetaList.get(0));
+            boolean enablementStatus = FieldFormatterCleanups.ENABLED.equals(
+                formatterMetaList.get(0)
+            );
             String formatterString = formatterMetaList.get(1);
 
-            return new FieldFormatterCleanups(enablementStatus, parse(formatterString));
+            return new FieldFormatterCleanups(
+                enablementStatus,
+                parse(formatterString)
+            );
         } else {
             // return default actions
             return new FieldFormatterCleanups(false, DEFAULT_SAVE_ACTIONS);
@@ -224,16 +285,24 @@ public boolean equals(Object obj) {
             return true;
         }
         if (obj instanceof FieldFormatterCleanups other) {
-            return Objects.equals(actions, other.actions) && (enabled == other.enabled);
+            return (
+                Objects.equals(actions, other.actions) &&
+                (enabled == other.enabled)
+            );
         }
         return false;
     }
 
     @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 fb72153186f..b5467651caa 100644
--- a/src/main/java/org/jabref/logic/cleanup/FileLinksCleanup.java
+++ b/src/main/java/org/jabref/logic/cleanup/FileLinksCleanup.java
@@ -3,7 +3,6 @@
 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;
@@ -28,7 +27,12 @@ public List<FieldChange> cleanup(BibEntry entry) {
         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 735e408b3a5..e7fc1461325 100644
--- a/src/main/java/org/jabref/logic/cleanup/ISSNCleanup.java
+++ b/src/main/java/org/jabref/logic/cleanup/ISSNCleanup.java
@@ -3,7 +3,6 @@
 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;
@@ -21,7 +20,12 @@ 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 86b04f816f2..a68bcf210ea 100644
--- a/src/main/java/org/jabref/logic/cleanup/MoveFieldCleanup.java
+++ b/src/main/java/org/jabref/logic/cleanup/MoveFieldCleanup.java
@@ -2,7 +2,6 @@
 
 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;
@@ -23,8 +22,9 @@ 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 4fad8316175..1cdd299eaed 100644
--- a/src/main/java/org/jabref/logic/cleanup/MoveFilesCleanup.java
+++ b/src/main/java/org/jabref/logic/cleanup/MoveFilesCleanup.java
@@ -5,7 +5,6 @@
 import java.util.List;
 import java.util.Objects;
 import java.util.Optional;
-
 import org.jabref.logic.externalfiles.LinkedFileHandler;
 import org.jabref.model.FieldChange;
 import org.jabref.model.database.BibDatabaseContext;
@@ -13,18 +12,22 @@
 import org.jabref.model.entry.LinkedFile;
 import org.jabref.model.util.OptionalUtil;
 import org.jabref.preferences.FilePreferences;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 public class MoveFilesCleanup implements CleanupJob {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(MoveFilesCleanup.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(
+        MoveFilesCleanup.class
+    );
 
     private final BibDatabaseContext databaseContext;
     private final FilePreferences filePreferences;
 
-    public MoveFilesCleanup(BibDatabaseContext databaseContext, FilePreferences filePreferences) {
+    public MoveFilesCleanup(
+        BibDatabaseContext databaseContext,
+        FilePreferences filePreferences
+    ) {
         this.databaseContext = Objects.requireNonNull(databaseContext);
         this.filePreferences = Objects.requireNonNull(filePreferences);
     }
@@ -35,14 +38,23 @@ 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) {
                     changed = true;
                 }
             } catch (IOException exception) {
-                LOGGER.error("Error while moving file {}", file.getLink(), exception);
+                LOGGER.error(
+                    "Error while moving file {}",
+                    file.getLink(),
+                    exception
+                );
             }
         }
 
diff --git a/src/main/java/org/jabref/logic/cleanup/RelativePathsCleanup.java b/src/main/java/org/jabref/logic/cleanup/RelativePathsCleanup.java
index f4d6c619a77..2f1f5d71c39 100644
--- a/src/main/java/org/jabref/logic/cleanup/RelativePathsCleanup.java
+++ b/src/main/java/org/jabref/logic/cleanup/RelativePathsCleanup.java
@@ -6,7 +6,6 @@
 import java.util.List;
 import java.util.Objects;
 import java.util.Optional;
-
 import org.jabref.logic.util.io.FileUtil;
 import org.jabref.model.FieldChange;
 import org.jabref.model.database.BibDatabaseContext;
@@ -19,7 +18,10 @@ 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 +40,22 @@ 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.getFileDirectories(filePreferences))
+                newFileName =
+                    FileUtil
+                        .relativize(
+                            Path.of(oldFileName),
+                            databaseContext.getFileDirectories(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/RenamePdfCleanup.java b/src/main/java/org/jabref/logic/cleanup/RenamePdfCleanup.java
index c9d04e14596..150888b2314 100644
--- a/src/main/java/org/jabref/logic/cleanup/RenamePdfCleanup.java
+++ b/src/main/java/org/jabref/logic/cleanup/RenamePdfCleanup.java
@@ -6,7 +6,6 @@
 import java.util.List;
 import java.util.Objects;
 import java.util.Optional;
-
 import org.jabref.logic.externalfiles.LinkedFileHandler;
 import org.jabref.model.FieldChange;
 import org.jabref.model.database.BibDatabaseContext;
@@ -14,18 +13,24 @@
 import org.jabref.model.entry.LinkedFile;
 import org.jabref.model.util.OptionalUtil;
 import org.jabref.preferences.FilePreferences;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 public class RenamePdfCleanup implements CleanupJob {
-    private static final Logger LOGGER = LoggerFactory.getLogger(RenamePdfCleanup.class);
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(
+        RenamePdfCleanup.class
+    );
 
     private final BibDatabaseContext databaseContext;
     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,14 +46,23 @@ 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) {
                     changed = true;
                 }
             } catch (IOException exception) {
-                LOGGER.error("Error while renaming file {}", file.getLink(), exception);
+                LOGGER.error(
+                    "Error while renaming file {}",
+                    file.getLink(),
+                    exception
+                );
             }
         }
 
diff --git a/src/main/java/org/jabref/logic/cleanup/TimeStampToCreationDate.java b/src/main/java/org/jabref/logic/cleanup/TimeStampToCreationDate.java
index 2d69a224853..37efe9c5c2a 100644
--- a/src/main/java/org/jabref/logic/cleanup/TimeStampToCreationDate.java
+++ b/src/main/java/org/jabref/logic/cleanup/TimeStampToCreationDate.java
@@ -7,7 +7,6 @@
 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;
@@ -45,10 +44,18 @@ private Optional<String> formatTimeStamp(String timeStamp) {
             int year = date.getYear().orElse(1);
             int month = getMonth(date);
             int day = date.getDay().orElse(1);
-            LocalDateTime localDateTime = LocalDateTime.of(year, month, day, 0, 0);
+            LocalDateTime localDateTime = LocalDateTime.of(
+                year,
+                month,
+                day,
+                0,
+                0
+            );
             // Remove any time unites smaller than seconds
             localDateTime.truncatedTo(ChronoUnit.SECONDS);
-            return Optional.of(localDateTime.format(DateTimeFormatter.ISO_LOCAL_DATE_TIME));
+            return Optional.of(
+                localDateTime.format(DateTimeFormatter.ISO_LOCAL_DATE_TIME)
+            );
         }
     }
 
@@ -67,19 +74,41 @@ 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
-            entry.clearField(timeStampField, EntriesEventSource.CLEANUP_TIMESTAMP);
+            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 6006484f7ff..456009b9935 100644
--- a/src/main/java/org/jabref/logic/cleanup/TimeStampToModificationDate.java
+++ b/src/main/java/org/jabref/logic/cleanup/TimeStampToModificationDate.java
@@ -7,7 +7,6 @@
 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;
@@ -26,7 +25,9 @@ public class TimeStampToModificationDate implements CleanupJob {
 
     private final Field timeStampField;
 
-    public TimeStampToModificationDate(TimestampPreferences timestampPreferences) {
+    public TimeStampToModificationDate(
+        TimestampPreferences timestampPreferences
+    ) {
         timeStampField = timestampPreferences.getTimestampField();
     }
 
@@ -45,10 +46,18 @@ private Optional<String> formatTimeStamp(String timeStamp) {
             int year = date.getYear().orElse(1);
             int month = getMonth(date);
             int day = date.getDay().orElse(1);
-            LocalDateTime localDateTime = LocalDateTime.of(year, month, day, 0, 0);
+            LocalDateTime localDateTime = LocalDateTime.of(
+                year,
+                month,
+                day,
+                0,
+                0
+            );
             // Remove any time unites smaller than seconds
             localDateTime.truncatedTo(ChronoUnit.SECONDS);
-            return Optional.of(localDateTime.format(DateTimeFormatter.ISO_LOCAL_DATE_TIME));
+            return Optional.of(
+                localDateTime.format(DateTimeFormatter.ISO_LOCAL_DATE_TIME)
+            );
         }
     }
 
@@ -67,19 +76,41 @@ 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
-            entry.clearField(timeStampField, EntriesEventSource.CLEANUP_TIMESTAMP);
+            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 13554eca215..7f1aaeb8a1e 100644
--- a/src/main/java/org/jabref/logic/cleanup/URLCleanup.java
+++ b/src/main/java/org/jabref/logic/cleanup/URLCleanup.java
@@ -4,7 +4,6 @@
 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;
@@ -23,21 +22,33 @@ public class URLCleanup implements CleanupJob {
      * In order to be functional, we made the necessary adjustments regarding Java
      * features (mainly doubled backslashes).
      */
-    public 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 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 String DATE_TERMS_REGEX = "accessed on|visited on|retrieved on|viewed on";
+    public static final String DATE_TERMS_REGEX =
+        "accessed on|visited on|retrieved on|viewed on";
 
     private static final Field NOTE_FIELD = StandardField.NOTE;
     private static final Field URL_FIELD = StandardField.URL;
     private static final Field URLDATE_FIELD = StandardField.URLDATE;
 
-    final Pattern urlPattern = Pattern.compile(URL_REGEX, Pattern.CASE_INSENSITIVE);
-    final Pattern dateTermsPattern = Pattern.compile(DATE_TERMS_REGEX, Pattern.CASE_INSENSITIVE);
-    final Pattern datePattern = Pattern.compile(Date.DATE_REGEX, Pattern.CASE_INSENSITIVE);
-    private final NormalizeDateFormatter formatter = new NormalizeDateFormatter();
+    final Pattern urlPattern = Pattern.compile(
+        URL_REGEX,
+        Pattern.CASE_INSENSITIVE
+    );
+    final Pattern dateTermsPattern = Pattern.compile(
+        DATE_TERMS_REGEX,
+        Pattern.CASE_INSENSITIVE
+    );
+    final Pattern datePattern = Pattern.compile(
+        Date.DATE_REGEX,
+        Pattern.CASE_INSENSITIVE
+    );
+    private final NormalizeDateFormatter formatter =
+        new NormalizeDateFormatter();
 
     @Override
     public List<FieldChange> cleanup(BibEntry entry) {
@@ -46,7 +57,9 @@ public List<FieldChange> cleanup(BibEntry entry) {
         String noteFieldValue = entry.getField(NOTE_FIELD).orElse("");
 
         final Matcher urlMatcher = urlPattern.matcher(noteFieldValue);
-        final Matcher dateTermsMatcher = dateTermsPattern.matcher(noteFieldValue);
+        final Matcher dateTermsMatcher = dateTermsPattern.matcher(
+            noteFieldValue
+        );
         final Matcher dateMatcher = datePattern.matcher(noteFieldValue);
 
         if (urlMatcher.find()) {
@@ -54,19 +67,18 @@ public List<FieldChange> cleanup(BibEntry entry) {
 
             // 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\\{\\}(, )?", "");
+                .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
@@ -75,33 +87,47 @@ public List<FieldChange> cleanup(BibEntry entry) {
             if (entry.hasField(URL_FIELD)) {
                 String urlFieldValue = entry.getField(URL_FIELD).orElse("");
                 if (urlFieldValue.equals(url)) {
-                    entry.setField(NOTE_FIELD, newNoteFieldValue).ifPresent(changes::add);
+                    entry
+                        .setField(NOTE_FIELD, newNoteFieldValue)
+                        .ifPresent(changes::add);
                 }
             } else {
-                entry.setField(NOTE_FIELD, newNoteFieldValue).ifPresent(changes::add);
+                entry
+                    .setField(NOTE_FIELD, newNoteFieldValue)
+                    .ifPresent(changes::add);
                 entry.setField(URL_FIELD, url).ifPresent(changes::add);
             }
 
             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)) {
-                        String urlDateFieldValue = entry.getField(URLDATE_FIELD).orElse("");
+                        String urlDateFieldValue = entry
+                            .getField(URLDATE_FIELD)
+                            .orElse("");
                         if (urlDateFieldValue.equals(formattedDate)) {
-                            entry.setField(NOTE_FIELD, newNoteFieldValue).ifPresent(changes::add);
+                            entry
+                                .setField(NOTE_FIELD, newNoteFieldValue)
+                                .ifPresent(changes::add);
                         }
                     } else {
-                        entry.setField(NOTE_FIELD, newNoteFieldValue).ifPresent(changes::add);
-                        entry.setField(URLDATE_FIELD, formattedDate).ifPresent(changes::add);
+                        entry
+                            .setField(NOTE_FIELD, newNoteFieldValue)
+                            .ifPresent(changes::add);
+                        entry
+                            .setField(URLDATE_FIELD, formattedDate)
+                            .ifPresent(changes::add);
                     }
                 }
             }
diff --git a/src/main/java/org/jabref/logic/cleanup/UpgradePdfPsToFileCleanup.java b/src/main/java/org/jabref/logic/cleanup/UpgradePdfPsToFileCleanup.java
index 731a3ed6f0d..4d6116a0237 100644
--- a/src/main/java/org/jabref/logic/cleanup/UpgradePdfPsToFileCleanup.java
+++ b/src/main/java/org/jabref/logic/cleanup/UpgradePdfPsToFileCleanup.java
@@ -5,7 +5,6 @@
 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;
@@ -36,23 +35,43 @@ 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) {
             String newValue = FileFieldWriter.getStringRepresentation(fileList);
             entry.setField(StandardField.FILE, newValue);
-            changes.add(new FieldChange(entry, StandardField.FILE, oldFileContent, newValue));
+            changes.add(
+                new FieldChange(
+                    entry,
+                    StandardField.FILE,
+                    oldFileContent,
+                    newValue
+                )
+            );
         }
 
         return changes;
diff --git a/src/main/java/org/jabref/logic/crawler/Crawler.java b/src/main/java/org/jabref/logic/crawler/Crawler.java
index 16eaf006b57..e3831a5549e 100644
--- a/src/main/java/org/jabref/logic/crawler/Crawler.java
+++ b/src/main/java/org/jabref/logic/crawler/Crawler.java
@@ -3,7 +3,7 @@
 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,8 +12,6 @@
 import org.jabref.model.util.FileUpdateMonitor;
 import org.jabref.preferences.PreferencesService;
 
-import org.eclipse.jgit.api.errors.GitAPIException;
-
 /**
  * This class provides a service for SLR support by conducting an automated search and persistance
  * of studies using the queries and E-Libraries specified in the provided study definition file.
@@ -22,6 +20,7 @@
  * and a StudyFetcher that manages the crawling over the selected E-Libraries.
  */
 public class Crawler {
+
     public static final String FILENAME_STUDY_RESULT_BIB = "studyResult.bib";
 
     private final StudyRepository studyRepository;
@@ -32,24 +31,32 @@ public class Crawler {
      *
      * @param studyRepositoryRoot The path to the study repository
      */
-    public Crawler(Path studyRepositoryRoot,
-                   SlrGitHandler gitHandler,
-                   PreferencesService preferencesService,
-                   BibEntryTypesManager bibEntryTypesManager,
-                   FileUpdateMonitor fileUpdateMonitor) throws IllegalArgumentException, IOException, ParseException {
-        this.studyRepository = new StudyRepository(
+    public Crawler(
+        Path studyRepositoryRoot,
+        SlrGitHandler gitHandler,
+        PreferencesService preferencesService,
+        BibEntryTypesManager bibEntryTypesManager,
+        FileUpdateMonitor fileUpdateMonitor
+    ) throws IllegalArgumentException, IOException, ParseException {
+        this.studyRepository =
+            new StudyRepository(
                 studyRepositoryRoot,
                 gitHandler,
                 preferencesService,
                 fileUpdateMonitor,
-                bibEntryTypesManager);
-        StudyCatalogToFetcherConverter studyCatalogToFetcherConverter = new StudyCatalogToFetcherConverter(
+                bibEntryTypesManager
+            );
+        StudyCatalogToFetcherConverter studyCatalogToFetcherConverter =
+            new StudyCatalogToFetcherConverter(
                 studyRepository.getActiveLibraryEntries(),
                 preferencesService.getImportFormatPreferences(),
-                preferencesService.getImporterPreferences());
-        this.studyFetcher = new StudyFetcher(
+                preferencesService.getImporterPreferences()
+            );
+        this.studyFetcher =
+            new StudyFetcher(
                 studyCatalogToFetcherConverter.getActiveFetchers(),
-                studyRepository.getSearchQueryStrings());
+                studyRepository.getSearchQueryStrings()
+            );
     }
 
     /**
@@ -66,7 +73,8 @@ public Crawler(Path studyRepositoryRoot,
      *
      * @throws IOException Thrown if a problem occurred during the persistence of the result.
      */
-    public void performCrawl() throws IOException, GitAPIException, SaveException {
+    public void performCrawl()
+        throws IOException, GitAPIException, SaveException {
         List<QueryResult> results = studyFetcher.crawl();
         studyRepository.persist(results);
     }
diff --git a/src/main/java/org/jabref/logic/crawler/StudyCatalogToFetcherConverter.java b/src/main/java/org/jabref/logic/crawler/StudyCatalogToFetcherConverter.java
index b0f0c26be4d..f6fe3b81d55 100644
--- a/src/main/java/org/jabref/logic/crawler/StudyCatalogToFetcherConverter.java
+++ b/src/main/java/org/jabref/logic/crawler/StudyCatalogToFetcherConverter.java
@@ -4,7 +4,6 @@
 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;
@@ -15,13 +14,16 @@
  * Converts library entries from the given study into their corresponding fetchers.
  */
 class StudyCatalogToFetcherConverter {
+
     private final List<StudyDatabase> libraryEntries;
     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 +46,14 @@ public List<SearchBasedFetcher> getActiveFetchers() {
      * @param libraryEntries List of entries
      * @return List of fetcher instances
      */
-    private List<SearchBasedFetcher> getFetchersFromLibraryEntries(List<StudyDatabase> libraryEntries) {
-        return libraryEntries.parallelStream()
-                             .map(this::createFetcherFromLibraryEntry)
-                             .filter(Objects::nonNull)
-                             .collect(Collectors.toList());
+    private List<SearchBasedFetcher> getFetchersFromLibraryEntries(
+        List<StudyDatabase> libraryEntries
+    ) {
+        return libraryEntries
+            .parallelStream()
+            .map(this::createFetcherFromLibraryEntry)
+            .filter(Objects::nonNull)
+            .collect(Collectors.toList());
     }
 
     /**
@@ -57,12 +62,23 @@ private List<SearchBasedFetcher> getFetchersFromLibraryEntries(List<StudyDatabas
      * @param studyDatabase the entry that will be converted
      * @return An instance of the fetcher defined by the library entry.
      */
-    private SearchBasedFetcher createFetcherFromLibraryEntry(StudyDatabase studyDatabase) {
-        Set<SearchBasedFetcher> searchBasedFetchers = WebFetchers.getSearchBasedFetchers(importFormatPreferences, importerPreferences);
+    private SearchBasedFetcher createFetcherFromLibraryEntry(
+        StudyDatabase studyDatabase
+    ) {
+        Set<SearchBasedFetcher> searchBasedFetchers =
+            WebFetchers.getSearchBasedFetchers(
+                importFormatPreferences,
+                importerPreferences
+            );
         String libraryNameFromFetcher = studyDatabase.getName();
-        return searchBasedFetchers.stream()
-                                  .filter(searchBasedFetcher -> searchBasedFetcher.getName().equalsIgnoreCase(libraryNameFromFetcher))
-                                  .findAny()
-                                  .orElse(null);
+        return searchBasedFetchers
+            .stream()
+            .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 d37738a1a30..56458538b69 100644
--- a/src/main/java/org/jabref/logic/crawler/StudyFetcher.java
+++ b/src/main/java/org/jabref/logic/crawler/StudyFetcher.java
@@ -4,7 +4,6 @@
 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,7 +11,6 @@
 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;
 
@@ -21,13 +19,19 @@
  * and aggregates the results returned by the fetchers by query and E-Library.
  */
 class StudyFetcher {
-    private static final Logger LOGGER = LoggerFactory.getLogger(StudyFetcher.class);
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(
+        StudyFetcher.class
+    );
     private static final int MAX_AMOUNT_OF_RESULTS_PER_FETCHER = 100;
 
     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;
     }
@@ -38,9 +42,10 @@ class StudyFetcher {
      * If any library API is not available, its corresponding entry is missing from the internal map.
      */
     public List<QueryResult> crawl() {
-        return searchQueries.parallelStream()
-                            .map(this::getQueryResult)
-                            .collect(Collectors.toList());
+        return searchQueries
+            .parallelStream()
+            .map(this::getQueryResult)
+            .collect(Collectors.toList());
     }
 
     private QueryResult getQueryResult(String searchQuery) {
@@ -54,26 +59,44 @@ private QueryResult getQueryResult(String searchQuery) {
      * @return Mapping of each fetcher by name and all their retrieved publications as a BibDatabase
      */
     private List<FetchResult> performSearchOnQuery(String searchQuery) {
-        return activeFetchers.parallelStream()
-                             .map(fetcher -> performSearchOnQueryForFetcher(searchQuery, fetcher))
-                             .filter(Objects::nonNull)
-                             .collect(Collectors.toList());
+        return activeFetchers
+            .parallelStream()
+            .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);
             }
-            return new FetchResult(fetcher.getName(), new BibDatabase(fetchResult));
+            return new FetchResult(
+                fetcher.getName(),
+                new BibDatabase(fetchResult)
+            );
         } catch (FetcherException e) {
-            LOGGER.warn(String.format("%s API request failed", fetcher.getName()), e);
+            LOGGER.warn(
+                String.format("%s API request failed", fetcher.getName()),
+                e
+            );
             return null;
         }
     }
diff --git a/src/main/java/org/jabref/logic/crawler/StudyRepository.java b/src/main/java/org/jabref/logic/crawler/StudyRepository.java
index dc490090339..816e832cb23 100644
--- a/src/main/java/org/jabref/logic/crawler/StudyRepository.java
+++ b/src/main/java/org/jabref/logic/crawler/StudyRepository.java
@@ -10,7 +10,7 @@
 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,8 +36,6 @@
 import org.jabref.model.study.StudyQuery;
 import org.jabref.model.util.FileUpdateMonitor;
 import org.jabref.preferences.PreferencesService;
-
-import org.eclipse.jgit.api.errors.GitAPIException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -49,13 +47,18 @@
  * as well as the sharing, and versioning of results using git.
  */
 public class StudyRepository {
+
     // Tests work with study.yml
     public static final String STUDY_DEFINITION_FILE_NAME = "study.yml";
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(StudyRepository.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(
+        StudyRepository.class
+    );
 
     private static final Pattern MATCH_COLON = Pattern.compile(":");
-    private static final Pattern MATCH_ILLEGAL_CHARACTERS = Pattern.compile("[^A-Za-z0-9_.\\s=-]");
+    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
     private static final String REMOTE = "origin";
@@ -80,47 +83,67 @@ 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,
-                           PreferencesService preferencesService,
-                           FileUpdateMonitor fileUpdateMonitor,
-                           BibEntryTypesManager bibEntryTypesManager) throws IOException {
+    public StudyRepository(
+        Path pathToRepository,
+        SlrGitHandler gitHandler,
+        PreferencesService preferencesService,
+        FileUpdateMonitor fileUpdateMonitor,
+        BibEntryTypesManager bibEntryTypesManager
+    ) throws IOException {
         this.repositoryPath = pathToRepository;
         this.gitHandler = gitHandler;
         this.preferencesService = preferencesService;
         this.fileUpdateMonitor = fileUpdateMonitor;
-        this.studyDefinitionFile = Path.of(repositoryPath.toString(), STUDY_DEFINITION_FILE_NAME);
+        this.studyDefinitionFile =
+            Path.of(repositoryPath.toString(), STUDY_DEFINITION_FILE_NAME);
         this.bibEntryTypesManager = bibEntryTypesManager;
 
         if (Files.notExists(repositoryPath)) {
             throw new IOException("The given repository does not exists.");
         }
         try {
-            gitHandler.createCommitOnCurrentBranch("Save changes before searching.", false);
+            gitHandler.createCommitOnCurrentBranch(
+                "Save changes before searching.",
+                false
+            );
             gitHandler.checkoutBranch(WORK_BRANCH);
             updateWorkAndSearchBranch();
         } catch (GitAPIException e) {
             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 {
-            final String updateRepositoryStructureMessage = "Update repository structure";
+            final String updateRepositoryStructureMessage =
+                "Update repository structure";
 
             // Update repository structure on work branch in case of changes
             setUpRepositoryStructureForQueriesAndFetchers();
-            gitHandler.createCommitOnCurrentBranch(updateRepositoryStructureMessage, false);
+            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));
+            boolean studyDefinitionDoesNotExistOrChanged =
+                !(Files.exists(studyDefinitionFile) &&
+                    new StudyYamlParser()
+                        .parseStudyYamlFile(studyDefinitionFile)
+                        .equals(study));
             if (studyDefinitionDoesNotExistOrChanged) {
-                new StudyYamlParser().writeStudyYamlFile(study, studyDefinitionFile);
+                new StudyYamlParser()
+                    .writeStudyYamlFile(study, studyDefinitionFile);
             }
             setUpRepositoryStructureForQueriesAndFetchers();
-            gitHandler.createCommitOnCurrentBranch(updateRepositoryStructureMessage, false);
+            gitHandler.createCommitOnCurrentBranch(
+                updateRepositoryStructureMessage,
+                false
+            );
         } catch (GitAPIException e) {
             LOGGER.error("Could not checkout search branch.");
         }
@@ -134,11 +157,18 @@ 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),
+            return OpenDatabase
+                .loadDatabase(
+                    getPathToFetcherResultFile(query, fetcherName),
                     preferencesService.getImportFormatPreferences(),
-                    fileUpdateMonitor).getDatabaseContext();
+                    fileUpdateMonitor
+                )
+                .getDatabaseContext();
         }
         return new BibDatabaseContext();
     }
@@ -146,11 +176,16 @@ public BibDatabaseContext getFetcherResultEntries(String query, String fetcherNa
     /**
      * Returns the merged entries stored in the repository for a certain query
      */
-    public BibDatabaseContext getQueryResultEntries(String query) throws IOException {
+    public BibDatabaseContext getQueryResultEntries(String query)
+        throws IOException {
         if (Files.exists(getPathToQueryResultFile(query))) {
-            return OpenDatabase.loadDatabase(getPathToQueryResultFile(query),
+            return OpenDatabase
+                .loadDatabase(
+                    getPathToQueryResultFile(query),
                     preferencesService.getImportFormatPreferences(),
-                    fileUpdateMonitor).getDatabaseContext();
+                    fileUpdateMonitor
+                )
+                .getDatabaseContext();
         }
         return new BibDatabaseContext();
     }
@@ -160,9 +195,13 @@ public BibDatabaseContext getQueryResultEntries(String query) throws IOException
      */
     public BibDatabaseContext getStudyResultEntries() throws IOException {
         if (Files.exists(getPathToStudyResultFile())) {
-            return OpenDatabase.loadDatabase(getPathToStudyResultFile(),
+            return OpenDatabase
+                .loadDatabase(
+                    getPathToStudyResultFile(),
                     preferencesService.getImportFormatPreferences(),
-                    fileUpdateMonitor).getDatabaseContext();
+                    fileUpdateMonitor
+                )
+                .getDatabaseContext();
         }
         return new BibDatabaseContext();
     }
@@ -183,10 +222,11 @@ 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());
     }
 
     /**
@@ -195,11 +235,13 @@ public List<String> getSearchQueryStrings() {
      * @return List of BibEntries of type Library
      * @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());
+    public List<StudyDatabase> getActiveLibraryEntries()
+        throws IllegalArgumentException {
+        return study
+            .getDatabases()
+            .parallelStream()
+            .filter(StudyDatabase::isEnabled)
+            .collect(Collectors.toList());
     }
 
     public Study getStudy() {
@@ -218,21 +260,30 @@ 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);
-            boolean newSearchResults = gitHandler.createCommitOnCurrentBranch(commitMessage, false);
+            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) {
@@ -244,7 +295,8 @@ public void persist(List<QueryResult> crawlResults) throws IOException, GitAPIEx
      * Update the remote tracking branches of the work and search branches
      * The currently checked out branch is not changed if the method is executed successfully
      */
-    private void updateRemoteSearchAndWorkBranch() throws IOException, GitAPIException {
+    private void updateRemoteSearchAndWorkBranch()
+        throws IOException, GitAPIException {
         String currentBranch = gitHandler.getCurrentlyCheckedOutBranch();
 
         // update remote search branch
@@ -262,7 +314,8 @@ private void updateRemoteSearchAndWorkBranch() throws IOException, GitAPIExcepti
      * Updates the local work and search branches with changes from their tracking remote branches
      * The currently checked out branch is not changed if the method is executed successfully
      */
-    private void updateWorkAndSearchBranch() throws IOException, GitAPIException {
+    private void updateWorkAndSearchBranch()
+        throws IOException, GitAPIException {
         String currentBranch = gitHandler.getCurrentlyCheckedOutBranch();
 
         // update search branch
@@ -279,16 +332,22 @@ private void updateWorkAndSearchBranch() throws IOException, GitAPIException {
     /**
      * Create for each query a folder, and for each fetcher a bib file in the query folder to store its results.
      */
-    private void setUpRepositoryStructureForQueriesAndFetchers() throws IOException {
+    private void setUpRepositoryStructureForQueriesAndFetchers()
+        throws IOException {
         // Cannot use stream here since IOException has to be thrown
-        StudyCatalogToFetcherConverter converter = new StudyCatalogToFetcherConverter(
+        StudyCatalogToFetcherConverter converter =
+            new StudyCatalogToFetcherConverter(
                 this.getActiveLibraryEntries(),
                 preferencesService.getImportFormatPreferences(),
-                preferencesService.getImporterPreferences());
+                preferencesService.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();
@@ -311,7 +370,10 @@ private void createFolder(Path folder) throws IOException {
         }
     }
 
-    private void createFetcherResultFile(String query, SearchBasedFetcher searchBasedFetcher) {
+    private void createFetcherResultFile(
+        String query,
+        SearchBasedFetcher searchBasedFetcher
+    ) {
         String fetcherName = searchBasedFetcher.getName();
         Path fetcherResultFile = getPathToFetcherResultFile(query, fetcherName);
         createBibFile(fetcherResultFile);
@@ -331,7 +393,10 @@ 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
+                );
             }
         }
     }
@@ -359,10 +424,12 @@ private void createBibFile(Path file) {
     private String trimNameAndAddID(String query) {
         // Replace all field: with field= for folder name
         String trimmedNamed = MATCH_COLON.matcher(query).replaceAll("=");
-        trimmedNamed = MATCH_ILLEGAL_CHARACTERS.matcher(trimmedNamed).replaceAll("");
+        trimmedNamed =
+            MATCH_ILLEGAL_CHARACTERS.matcher(trimmedNamed).replaceAll("");
         String id = computeIDForQuery(query);
         // Whole path has to be shorter than 260
-        int remainingPathLength = 220 - studyDefinitionFile.toString().length() - id.length();
+        int remainingPathLength =
+            220 - studyDefinitionFile.toString().length() - id.length();
         if (query.length() > remainingPathLength) {
             trimmedNamed = query.substring(0, remainingPathLength);
         }
@@ -381,18 +448,28 @@ 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(preferencesService.getBibEntryPreferences().getKeywordSeparator());
+    private void persistResults(List<QueryResult> crawlResults)
+        throws IOException, SaveException {
+        DatabaseMerger merger = new DatabaseMerger(
+            preferencesService.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);
+                merger.merge(
+                    existingFetcherResult.getDatabase(),
+                    fetcherEntries
+                );
 
                 // Create citation keys for all entries that do not have one
                 generateCiteKeys(existingFetcherResult, fetcherEntries);
@@ -400,57 +477,113 @@ 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());
+            BibDatabaseContext existingQueryEntries = getQueryResultEntries(
+                result.getQuery()
+            );
 
             // Merge new entries into query result file
-            merger.merge(existingQueryEntries.getDatabase(), queryResultEntries);
+            merger.merge(
+                existingQueryEntries.getDatabase(),
+                queryResultEntries
+            );
             // Aggregate all new entries for every query into the study result
             merger.merge(newStudyResultEntries, queryResultEntries);
 
-            writeResultToFile(getPathToQueryResultFile(result.getQuery()), existingQueryEntries);
+            writeResultToFile(
+                getPathToQueryResultFile(result.getQuery()),
+                existingQueryEntries
+            );
         }
         BibDatabaseContext existingStudyResultEntries = getStudyResultEntries();
 
         // Merge new entries into study result file
-        merger.merge(existingStudyResultEntries.getDatabase(), newStudyResultEntries);
-
-        writeResultToFile(getPathToStudyResultFile(), existingStudyResultEntries);
+        merger.merge(
+            existingStudyResultEntries.getDatabase(),
+            newStudyResultEntries
+        );
+
+        writeResultToFile(
+            getPathToStudyResultFile(),
+            existingStudyResultEntries
+        );
     }
 
-    private void generateCiteKeys(BibDatabaseContext existingEntries, BibDatabase targetEntries) {
-        CitationKeyGenerator citationKeyGenerator = new CitationKeyGenerator(existingEntries,
-                preferencesService.getCitationKeyPatternPreferences());
-        targetEntries.getEntries().stream().filter(bibEntry -> !bibEntry.hasCitationKey()).forEach(citationKeyGenerator::generateAndSetKey);
+    private void generateCiteKeys(
+        BibDatabaseContext existingEntries,
+        BibDatabase targetEntries
+    ) {
+        CitationKeyGenerator citationKeyGenerator = new CitationKeyGenerator(
+            existingEntries,
+            preferencesService.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(preferencesService.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(
+                        preferencesService
+                            .getLibraryPreferences()
+                            .shouldAlwaysReformatOnSave()
+                    );
             BibWriter bibWriter = new BibWriter(fileWriter, OS.NEWLINE);
             BibtexDatabaseWriter databaseWriter = new BibtexDatabaseWriter(
-                    bibWriter,
-                    saveConfiguration,
-                    preferencesService.getFieldPreferences(),
-                    preferencesService.getCitationKeyPatternPreferences(),
-                    bibEntryTypesManager);
+                bibWriter,
+                saveConfiguration,
+                preferencesService.getFieldPreferences(),
+                preferencesService.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) {
-        return repositoryPath.resolve(trimNameAndAddID(query)).resolve("result.bib");
+        return repositoryPath
+            .resolve(trimNameAndAddID(query))
+            .resolve("result.bib");
     }
 
     private Path getPathToStudyResultFile() {
diff --git a/src/main/java/org/jabref/logic/crawler/StudyYamlParser.java b/src/main/java/org/jabref/logic/crawler/StudyYamlParser.java
index 618dd18c42b..2a7fbfe3b77 100644
--- a/src/main/java/org/jabref/logic/crawler/StudyYamlParser.java
+++ b/src/main/java/org/jabref/logic/crawler/StudyYamlParser.java
@@ -1,16 +1,14 @@
 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 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>
  */
@@ -21,7 +19,11 @@ public class StudyYamlParser {
      */
     public Study parseStudyYamlFile(Path studyYamlFile) throws IOException {
         ObjectMapper yamlMapper = new ObjectMapper(new YAMLFactory());
-        try (InputStream fileInputStream = new FileInputStream(studyYamlFile.toFile())) {
+        try (
+            InputStream fileInputStream = new FileInputStream(
+                studyYamlFile.toFile()
+            )
+        ) {
             return yamlMapper.readValue(fileInputStream, Study.class);
         }
     }
@@ -29,9 +31,13 @@ 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));
+    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)
+        );
         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 7d7db0eede4..412b322927b 100644
--- a/src/main/java/org/jabref/logic/database/DatabaseMerger.java
+++ b/src/main/java/org/jabref/logic/database/DatabaseMerger.java
@@ -3,7 +3,6 @@
 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,13 +14,14 @@
 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;
 
 public class DatabaseMerger {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(DatabaseMerger.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(
+        DatabaseMerger.class
+    );
     private final char keywordDelimiter;
 
     public DatabaseMerger(char keywordDelimiter) {
@@ -47,18 +47,39 @@ 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());
+        mergeMetaData(
+            target.getMetaData(),
+            other.getMetaData(),
+            otherFileName,
+            other.getEntries()
+        );
     }
 
     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());
+        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());
         target.insertEntries(newEntries);
     }
 
@@ -67,19 +88,34 @@ 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)) {
                         suffix++;
                         newName = bibtexStringName + "_" + suffix;
                     }
-                    BibtexString newBibtexString = new BibtexString(newName, importedContent);
+                    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 +129,12 @@ 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 +143,45 @@ public void mergeMetaData(MetaData target, MetaData other, String otherFilename,
         mergeContentSelectors(target, other);
     }
 
-    private void mergeGroups(MetaData target, MetaData other, String otherFilename, List<BibEntry> allOtherEntries) {
+    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(
+        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);
+                            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));
-        });
+                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 3090c9a8778..55b63030aad 100644
--- a/src/main/java/org/jabref/logic/database/DuplicateCheck.java
+++ b/src/main/java/org/jabref/logic/database/DuplicateCheck.java
@@ -1,5 +1,6 @@
 package org.jabref.logic.database;
 
+import com.google.common.collect.Sets;
 import java.util.Collection;
 import java.util.HashMap;
 import java.util.HashSet;
@@ -9,7 +10,6 @@
 import java.util.Optional;
 import java.util.Set;
 import java.util.stream.Collectors;
-
 import org.jabref.logic.util.OS;
 import org.jabref.logic.util.strings.StringSimilarity;
 import org.jabref.model.database.BibDatabase;
@@ -27,8 +27,6 @@
 import org.jabref.model.entry.identifier.DOI;
 import org.jabref.model.entry.identifier.ISBN;
 import org.jabref.model.strings.StringUtil;
-
-import com.google.common.collect.Sets;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -36,9 +34,12 @@
  * 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 Logger LOGGER = LoggerFactory.getLogger(DuplicateCheck.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(
+        DuplicateCheck.class
+    );
     /*
      * Integer values for indicating result of duplicate check (for entries):
      */
@@ -73,71 +74,123 @@ public DuplicateCheck(BibEntryTypesManager entryTypesManager) {
         this.entryTypesManager = entryTypesManager;
     }
 
-    private static boolean haveSameIdentifier(final BibEntry one, final BibEntry two) {
+    private static boolean haveSameIdentifier(
+        final BibEntry one,
+        final BibEntry two
+    ) {
         for (final Field name : FieldFactory.getIdentifierFieldNames()) {
-            if (one.getField(name).isPresent() && one.getField(name).equals(two.getField(name))) {
+            if (
+                one.getField(name).isPresent() &&
+                one.getField(name).equals(two.getField(name))
+            ) {
                 return true;
             }
         }
         return false;
     }
 
-    private static boolean haveDifferentEntryType(final BibEntry one, final BibEntry two) {
+    private static boolean haveDifferentEntryType(
+        final BibEntry one,
+        final BibEntry two
+    ) {
         return !one.getType().equals(two.getType());
     }
 
-    private static boolean haveDifferentEditions(final BibEntry one, final BibEntry two) {
+    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);
+            ? new double[] { 0., 0. }
+            : DuplicateCheck.compareFieldSet(
+                requiredFields
+                    .stream()
+                    .map(OrFields::getPrimary)
+                    .collect(Collectors.toSet()),
+                one,
+                two
+            );
     }
 
     private static boolean isFarFromThreshold(double value) {
         if (value < 0.0) {
             LOGGER.debug("Value {} is below zero. Should not happen", value);
         }
-        return value - DuplicateCheck.DUPLICATE_THRESHOLD > DuplicateCheck.DOUBT_RANGE;
+        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 denominator = (req[1] * DuplicateCheck.REQUIRED_WEIGHT) + 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};
+            return new double[] { 0.0, 0.0 };
         }
         double equalWeights = 0;
         double totalWeights = 0.;
         for (final Field field : fields) {
-            final double currentWeight = DuplicateCheck.FIELD_WEIGHTS.getOrDefault(field, 1.0);
+            final double currentWeight =
+                DuplicateCheck.FIELD_WEIGHTS.getOrDefault(field, 1.0);
             totalWeights += currentWeight;
             int result = DuplicateCheck.compareSingleField(field, one, two);
             if (result == EQUAL) {
@@ -147,13 +200,17 @@ private static double[] compareFieldSet(final Collection<Field> fields, final Bi
             }
         }
         if (totalWeights > 0) {
-            return new double[] {equalWeights / totalWeights, totalWeights};
+            return new double[] { equalWeights / totalWeights, totalWeights };
         }
         // all fields are empty in both --> have no difference at all
-        return new double[] {0.0, 0.0};
+        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.getField(field);
         final Optional<String> optionalStringTwo = two.getField(field);
         if (!optionalStringOne.isPresent()) {
@@ -182,12 +239,24 @@ private static int compareSingleField(final Field field, final BibEntry one, fin
         return compareField(stringOne, stringTwo);
     }
 
-    private static int compareAuthorField(final String stringOne, final String stringTwo) {
+    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 double similarity = DuplicateCheck.correlateByWords(authorOne, authorTwo);
+        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;
         }
@@ -199,7 +268,10 @@ private static int compareAuthorField(final String stringOne, final String strin
      * We do a replace to harmonize these to a simple "-"
      * After this, a simple test for equality should be enough
      */
-    private static int comparePagesField(final String stringOne, final String stringTwo) {
+    private static int comparePagesField(
+        final String stringOne,
+        final String stringTwo
+    ) {
         final String processedStringOne = stringOne.replaceAll("[- ]+", "-");
         final String processedStringTwo = stringTwo.replaceAll("[- ]+", "-");
         if (processedStringOne.equals(processedStringTwo)) {
@@ -212,26 +284,55 @@ private static int comparePagesField(final String stringOne, final String string
      * We do not attempt to harmonize abbreviation state of the journal names,
      * but we remove periods from the names in case they are abbreviated with and without dots:
      */
-    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);
+    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
+        );
         if (similarity > 0.8) {
             return EQUAL;
         }
         return NOT_EQUAL;
     }
 
-    private static int compareChapterField(final String stringOne, final String stringTwo) {
-        final String processedStringOne = stringOne.replaceAll("(?i)chapter", "").trim();
-        final String processedStringTwo = stringTwo.replaceAll("(?i)chapter", "").trim();
+    private static int compareChapterField(
+        final String stringOne,
+        final String stringTwo
+    ) {
+        final String processedStringOne = stringOne
+            .replaceAll("(?i)chapter", "")
+            .trim();
+        final String processedStringTwo = stringTwo
+            .replaceAll("(?i)chapter", "")
+            .trim();
         return compareField(processedStringOne, processedStringTwo);
     }
 
-    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);
+    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
+        );
         if (similarity > 0.8) {
             return EQUAL;
         }
@@ -255,7 +356,11 @@ public static double compareEntriesStrictly(BibEntry one, BibEntry two) {
         return (double) score / allFields.size();
     }
 
-    private static boolean isSingleFieldEqual(BibEntry one, BibEntry two, Field field) {
+    private static boolean isSingleFieldEqual(
+        BibEntry one,
+        BibEntry two,
+        Field field
+    ) {
         final Optional<String> stringOne = one.getField(field);
         final Optional<String> stringTwo = two.getField(field);
         if (stringOne.isEmpty() && stringTwo.isEmpty()) {
@@ -264,8 +369,9 @@ 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));
     }
 
     /**
@@ -311,16 +417,27 @@ 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 similarity = (longerLength - distanceIgnoredCase) / longerLength;
-        LOGGER.debug("Longer string: {} Shorter string: {} Similarity: {}", longer, shorter, similarity);
+        final double distanceIgnoredCase = new StringSimilarity()
+            .editDistanceIgnoreCase(longer, shorter);
+        final double similarity =
+            (longerLength - distanceIgnoredCase) / longerLength;
+        LOGGER.debug(
+            "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
+    ) {
         if (haveSameIdentifier(one, two)) {
             return true;
         }
@@ -338,16 +455,25 @@ public boolean isDuplicate(final BibEntry one, final BibEntry two, final BibData
             return Objects.equals(oneISBN, twoISBN);
         }
 
-        if (haveDifferentEntryType(one, two) ||
-                haveDifferentEditions(one, two) ||
-                haveDifferentChaptersOrPagesOfTheSameBook(one, two)) {
+        if (
+            haveDifferentEntryType(one, two) ||
+            haveDifferentEditions(one, two) ||
+            haveDifferentChaptersOrPagesOfTheSameBook(one, two)
+        ) {
             return false;
         }
 
-        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);
+            final double[] reqCmpResult = compareRequiredFields(
+                entryType,
+                one,
+                two
+            );
 
             if (isFarFromThreshold(reqCmpResult[0])) {
                 // Far from the threshold value, so we base our decision on the required fields only
@@ -361,7 +487,14 @@ public boolean isDuplicate(final BibEntry one, final BibEntry two, final BibData
         }
         // 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
+        );
     }
 
     /**
@@ -374,10 +507,15 @@ 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 c60323c6bc9..0771bd3942d 100644
--- a/src/main/java/org/jabref/logic/exporter/AtomicFileOutputStream.java
+++ b/src/main/java/org/jabref/logic/exporter/AtomicFileOutputStream.java
@@ -12,10 +12,8 @@
 import java.nio.file.attribute.PosixFilePermission;
 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;
 
@@ -46,10 +44,13 @@
  */
 public class AtomicFileOutputStream extends FilterOutputStream {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(AtomicFileOutputStream.class);
+    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().get(0);
+    private static final String SAVE_EXTENSION =
+        "." + BackupFileType.SAVE.getExtensions().get(0);
 
     /**
      * The file we want to create/replace.
@@ -78,9 +79,15 @@ public class AtomicFileOutputStream extends FilterOutputStream {
      * @param path       the path of the file to write to or replace
      * @param keepBackup whether to keep the backup file (.sav) after a successful write process
      */
-    public AtomicFileOutputStream(Path path, boolean keepBackup) throws IOException {
+    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);
+        this(
+            path,
+            getPathOfTemporaryFile(path),
+            new FileOutputStream(getPathOfTemporaryFile(path).toFile()),
+            keepBackup
+        );
     }
 
     /**
@@ -96,7 +103,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;
@@ -110,14 +122,22 @@ public AtomicFileOutputStream(Path path) throws IOException {
                     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
+            );
         }
     }
 
@@ -160,7 +180,11 @@ public void abort() {
             Files.deleteIfExists(temporaryFile);
             Files.deleteIfExists(backupFile);
         } catch (IOException exception) {
-            LOGGER.debug("Unable to abort writing to file {}", temporaryFile, exception);
+            LOGGER.debug(
+                "Unable to abort writing to file {}",
+                temporaryFile,
+                exception
+            );
         }
     }
 
@@ -172,7 +196,11 @@ private void cleanup() {
         } catch (IOException exception) {
             // Currently, we always get the exception:
             // Unable to release lock on file C:\Users\koppor\AppData\Local\Temp\junit11976839611279549873\error-during-save.txt.tmp: java.nio.channels.ClosedChannelException
-            LOGGER.debug("Unable to release lock on file {}", temporaryFile, exception);
+            LOGGER.debug(
+                "Unable to release lock on file {}",
+                temporaryFile,
+                exception
+            );
         }
         try {
             Files.deleteIfExists(temporaryFile);
@@ -207,29 +235,45 @@ public void close() throws IOException {
 
             // 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);
+            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);
+                    Files.copy(
+                        targetFile,
+                        backupFile,
+                        StandardCopyOption.REPLACE_EXISTING
+                    );
                 } catch (Exception e) {
                     LOGGER.warn("Could not create backup file {}", backupFile);
                 }
                 if (FileUtil.IS_POSIX_COMPLIANT) {
                     try {
-                        oldFilePermissions = Files.getPosixFilePermissions(targetFile);
+                        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;
@@ -238,9 +282,16 @@ public void close() throws IOException {
             // Restore file permissions
             if (FileUtil.IS_POSIX_COMPLIANT) {
                 try {
-                    Files.setPosixFilePermissions(targetFile, oldFilePermissions);
+                    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
+                    );
                 }
             }
 
@@ -274,4 +325,3 @@ public void write(int b) throws IOException {
         }
     }
 }
-
diff --git a/src/main/java/org/jabref/logic/exporter/AtomicFileWriter.java b/src/main/java/org/jabref/logic/exporter/AtomicFileWriter.java
index 19274cbeafa..12c601b86bc 100644
--- a/src/main/java/org/jabref/logic/exporter/AtomicFileWriter.java
+++ b/src/main/java/org/jabref/logic/exporter/AtomicFileWriter.java
@@ -25,7 +25,8 @@ public AtomicFileWriter(Path file, Charset encoding) throws IOException {
         this(file, encoding, false);
     }
 
-    public AtomicFileWriter(Path file, Charset encoding, boolean keepBackup) throws IOException {
+    public AtomicFileWriter(Path file, Charset encoding, boolean keepBackup)
+        throws IOException {
         super(new AtomicFileOutputStream(file, keepBackup), encoding);
         encoder = encoding.newEncoder();
     }
diff --git a/src/main/java/org/jabref/logic/exporter/BibDatabaseWriter.java b/src/main/java/org/jabref/logic/exporter/BibDatabaseWriter.java
index 68df8656bf1..56f41b29649 100644
--- a/src/main/java/org/jabref/logic/exporter/BibDatabaseWriter.java
+++ b/src/main/java/org/jabref/logic/exporter/BibDatabaseWriter.java
@@ -16,7 +16,6 @@
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import java.util.stream.Stream;
-
 import org.jabref.logic.bibtex.comparator.BibtexStringComparator;
 import org.jabref.logic.bibtex.comparator.CrossRefEntryComparator;
 import org.jabref.logic.bibtex.comparator.FieldComparator;
@@ -41,7 +40,6 @@
 import org.jabref.model.metadata.SaveOrder;
 import org.jabref.model.metadata.SelfContainedSaveOrder;
 import org.jabref.model.strings.StringUtil;
-
 import org.jooq.lambda.Unchecked;
 
 /**
@@ -54,30 +52,43 @@
  */
 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;
-    protected final List<FieldChange> saveActionsFieldChanges = new ArrayList<>();
+    protected final List<FieldChange> saveActionsFieldChanges =
+        new ArrayList<>();
     protected final BibEntryTypesManager entryTypesManager;
 
-    public BibDatabaseWriter(BibWriter bibWriter,
-                             SelfContainedSaveConfiguration saveConfiguration,
-                             CitationKeyPatternPreferences keyPatternPreferences,
-                             BibEntryTypesManager entryTypesManager) {
+    public BibDatabaseWriter(
+        BibWriter bibWriter,
+        SelfContainedSaveConfiguration saveConfiguration,
+        CitationKeyPatternPreferences keyPatternPreferences,
+        BibEntryTypesManager entryTypesManager
+    ) {
         this.bibWriter = Objects.requireNonNull(bibWriter);
         this.saveConfiguration = saveConfiguration;
         this.keyPatternPreferences = keyPatternPreferences;
         this.entryTypesManager = entryTypesManager;
-        assert saveConfiguration.getSaveOrder().getOrderType() != SaveOrder.OrderType.TABLE;
+        assert saveConfiguration.getSaveOrder().getOrderType() !=
+        SaveOrder.OrderType.TABLE;
     }
 
-    private static List<FieldChange> applySaveActions(List<BibEntry> toChange, MetaData metaData) {
+    private static List<FieldChange> applySaveActions(
+        List<BibEntry> toChange,
+        MetaData metaData
+    ) {
         List<FieldChange> changes = new ArrayList<>();
 
-        Optional<FieldFormatterCleanups> saveActions = metaData.getSaveActions();
+        Optional<FieldFormatterCleanups> saveActions =
+            metaData.getSaveActions();
         saveActions.ifPresent(actions -> {
             // save actions defined -> apply for every entry
             for (BibEntry entry : toChange) {
@@ -86,10 +97,15 @@ private static List<FieldChange> applySaveActions(List<BibEntry> toChange, MetaD
         });
 
         // Run standard cleanups
-        List<FieldFormatterCleanup> preSaveCleanups =
-                Stream.of(new TrimWhitespaceFormatter())
-                      .map(formatter -> new FieldFormatterCleanup(InternalField.INTERNAL_ALL_FIELD, formatter))
-                      .toList();
+        List<FieldFormatterCleanup> preSaveCleanups = Stream
+            .of(new TrimWhitespaceFormatter())
+            .map(formatter ->
+                new FieldFormatterCleanup(
+                    InternalField.INTERNAL_ALL_FIELD,
+                    formatter
+                )
+            )
+            .toList();
         for (FieldFormatterCleanup formatter : preSaveCleanups) {
             for (BibEntry entry : toChange) {
                 changes.addAll(formatter.cleanup(entry));
@@ -99,11 +115,16 @@ private static List<FieldChange> applySaveActions(List<BibEntry> toChange, MetaD
         return changes;
     }
 
-    public static List<FieldChange> applySaveActions(BibEntry entry, MetaData metaData) {
+    public static List<FieldChange> applySaveActions(
+        BibEntry entry,
+        MetaData metaData
+    ) {
         return applySaveActions(Collections.singletonList(entry), metaData);
     }
 
-    private static List<Comparator<BibEntry>> getSaveComparators(SaveOrder saveOrder) {
+    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
@@ -115,9 +136,11 @@ 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));
         }
@@ -130,12 +153,16 @@ 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);
 
         List<Comparator<BibEntry>> comparators = getSaveComparators(saveOrder);
-        FieldComparatorStack<BibEntry> comparatorStack = new FieldComparatorStack<>(comparators);
+        FieldComparatorStack<BibEntry> comparatorStack =
+            new FieldComparatorStack<>(comparators);
 
         List<BibEntry> sorted = new ArrayList<>(entriesToSort);
         sorted.sort(comparatorStack);
@@ -149,11 +176,14 @@ 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();
+    public void saveDatabase(BibDatabaseContext bibDatabaseContext)
+        throws IOException {
+        List<BibEntry> entries = bibDatabaseContext
+            .getDatabase()
+            .getEntries()
+            .stream()
+            .filter(entry -> !entry.isEmpty())
+            .toList();
         savePartOfDatabase(bibDatabaseContext, entries);
     }
 
@@ -162,30 +192,51 @@ 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();
-        sharedDatabaseIDOptional.ifPresent(Unchecked.consumer(id -> writeDatabaseID(id)));
+    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);
         }
 
         bibWriter.finishBlock();
 
         // Write preamble if there is one.
-        writePreamble(bibDatabaseContext.getDatabase().getPreamble().orElse(""));
+        writePreamble(
+            bibDatabaseContext.getDatabase().getPreamble().orElse("")
+        );
 
         // Write strings if there are any.
         writeStrings(bibDatabaseContext.getDatabase());
 
         // Write database entries.
-        List<BibEntry> sortedEntries = getSortedEntries(entries, saveConfiguration.getSelfContainedSaveOrder());
-        List<FieldChange> saveActionChanges = applySaveActions(sortedEntries, bibDatabaseContext.getMetaData());
+        List<BibEntry> sortedEntries = getSortedEntries(
+            entries,
+            saveConfiguration.getSelfContainedSaveOrder()
+        );
+        List<FieldChange> saveActionChanges = applySaveActions(
+            sortedEntries,
+            bibDatabaseContext.getMetaData()
+        );
         saveActionsFieldChanges.addAll(saveActionChanges);
         if (keyPatternPreferences.shouldGenerateCiteKeysBeforeSaving()) {
-            List<FieldChange> keyChanges = generateCitationKeys(bibDatabaseContext, sortedEntries);
+            List<FieldChange> keyChanges = generateCitationKeys(
+                bibDatabaseContext,
+                sortedEntries
+            );
             saveActionsFieldChanges.addAll(keyChanges);
         }
 
@@ -196,10 +247,17 @@ public void savePartOfDatabase(BibDatabaseContext bibDatabaseContext, List<BibEn
             // Check if we must write the type definition for this
             // entry, as well. Our criterion is that all non-standard
             // types (*not* all customized standard types) must be written.
-            if (entryTypesManager.isCustomType(entry.getType(), bibDatabaseContext.getMode())) {
+            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);
+                entryTypesManager
+                    .enrich(entry.getType(), bibDatabaseContext.getMode())
+                    .ifPresent(typesToWrite::add);
             }
 
             writeEntry(entry, bibDatabaseContext.getMode());
@@ -207,7 +265,10 @@ public void savePartOfDatabase(BibDatabaseContext bibDatabaseContext, List<BibEn
 
         if (saveConfiguration.getSaveType() == SaveType.WITH_JABREF_META_DATA) {
             // Write meta data.
-            writeMetaData(bibDatabaseContext.getMetaData(), keyPatternPreferences.getKeyPattern());
+            writeMetaData(
+                bibDatabaseContext.getMetaData(),
+                keyPatternPreferences.getKeyPattern()
+            );
 
             // Write type definitions, if any:
             writeEntryTypeDefinitions(typesToWrite);
@@ -217,31 +278,47 @@ 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;
+    protected abstract void writeEntry(BibEntry entry, BibDatabaseMode mode)
+        throws IOException;
 
     protected abstract void writeEpilogue(String epilogue) throws IOException;
 
     /**
      * Writes all data to the specified writer, using each object's toString() method.
      */
-    protected void writeMetaData(MetaData metaData, GlobalCitationKeyPattern globalCiteKeyPattern) throws IOException {
+    protected void writeMetaData(
+        MetaData metaData,
+        GlobalCitationKeyPattern 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()) {
+        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;
 
-    protected abstract void writeDatabaseID(String sharedDatabaseID) throws IOException;
+    protected abstract void writeDatabaseID(String sharedDatabaseID)
+        throws IOException;
 
     /**
      * Write all strings in alphabetical order, modified to produce a safe (for BibTeX) order of the strings if they
@@ -250,11 +327,12 @@ protected void writeMetaData(MetaData metaData, GlobalCitationKeyPattern globalC
      * @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;
@@ -265,7 +343,9 @@ private void writeStrings(BibDatabase database) throws IOException {
 
         for (BibtexString.Type t : BibtexString.Type.values()) {
             for (BibtexString bs : strings) {
-                if (remaining.containsKey(bs.getName()) && (bs.getType() == t)) {
+                if (
+                    remaining.containsKey(bs.getName()) && (bs.getType() == t)
+                ) {
                     writeString(bs, remaining, maxKeyLength);
                 }
             }
@@ -274,8 +354,11 @@ private void writeStrings(BibDatabase database) throws IOException {
         bibWriter.finishBlock();
     }
 
-    protected void writeString(BibtexString bibtexString, Map<String, BibtexString> remaining, int maxKeyLength)
-            throws IOException {
+    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());
 
@@ -300,27 +383,39 @@ protected void writeString(BibtexString bibtexString, Map<String, BibtexString>
         writeString(bibtexString, maxKeyLength);
     }
 
-    protected abstract void writeString(BibtexString bibtexString, int maxKeyLength)
-            throws IOException;
+    protected abstract void writeString(
+        BibtexString bibtexString,
+        int maxKeyLength
+    ) throws IOException;
 
-    protected void writeEntryTypeDefinitions(SortedSet<BibEntryType> types) throws IOException {
+    protected void writeEntryTypeDefinitions(SortedSet<BibEntryType> types)
+        throws IOException {
         for (BibEntryType type : types) {
             writeEntryTypeDefinition(type);
         }
     }
 
-    protected abstract void writeEntryTypeDefinition(BibEntryType customType) throws IOException;
+    protected abstract void writeEntryTypeDefinition(BibEntryType customType)
+        throws IOException;
 
     /**
      * 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)) {
-                Optional<FieldChange> change = keyGenerator.generateAndSetKey(bes);
+                Optional<FieldChange> change = keyGenerator.generateAndSetKey(
+                    bes
+                );
                 change.ifPresent(changes::add);
             }
         }
diff --git a/src/main/java/org/jabref/logic/exporter/BibWriter.java b/src/main/java/org/jabref/logic/exporter/BibWriter.java
index f6931653542..9348ee90083 100644
--- a/src/main/java/org/jabref/logic/exporter/BibWriter.java
+++ b/src/main/java/org/jabref/logic/exporter/BibWriter.java
@@ -2,7 +2,6 @@
 
 import java.io.IOException;
 import java.io.Writer;
-
 import org.jabref.model.strings.StringUtil;
 
 /**
diff --git a/src/main/java/org/jabref/logic/exporter/BibtexDatabaseWriter.java b/src/main/java/org/jabref/logic/exporter/BibtexDatabaseWriter.java
index 9f7e035d67d..1ab7111627d 100644
--- a/src/main/java/org/jabref/logic/exporter/BibtexDatabaseWriter.java
+++ b/src/main/java/org/jabref/logic/exporter/BibtexDatabaseWriter.java
@@ -5,7 +5,6 @@
 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;
@@ -35,30 +34,36 @@ public class BibtexDatabaseWriter extends BibDatabaseWriter {
 
     private final FieldPreferences fieldPreferences;
 
-    public BibtexDatabaseWriter(BibWriter bibWriter,
-                                SelfContainedSaveConfiguration saveConfiguration,
-                                FieldPreferences fieldPreferences,
-                                CitationKeyPatternPreferences citationKeyPatternPreferences,
-                                BibEntryTypesManager entryTypesManager) {
-        super(bibWriter,
-                saveConfiguration,
-                citationKeyPatternPreferences,
-                entryTypesManager);
-
+    public BibtexDatabaseWriter(
+        BibWriter bibWriter,
+        SelfContainedSaveConfiguration saveConfiguration,
+        FieldPreferences fieldPreferences,
+        CitationKeyPatternPreferences citationKeyPatternPreferences,
+        BibEntryTypesManager entryTypesManager
+    ) {
+        super(
+            bibWriter,
+            saveConfiguration,
+            citationKeyPatternPreferences,
+            entryTypesManager
+        );
         this.fieldPreferences = fieldPreferences;
     }
 
-    public BibtexDatabaseWriter(Writer writer,
-                                String newline,
-                                SelfContainedSaveConfiguration saveConfiguration,
-                                FieldPreferences fieldPreferences,
-                                CitationKeyPatternPreferences citationKeyPatternPreferences,
-                                BibEntryTypesManager entryTypesManager) {
-        super(new BibWriter(writer, newline),
-                saveConfiguration,
-                citationKeyPatternPreferences,
-                entryTypesManager);
-
+    public BibtexDatabaseWriter(
+        Writer writer,
+        String newline,
+        SelfContainedSaveConfiguration saveConfiguration,
+        FieldPreferences fieldPreferences,
+        CitationKeyPatternPreferences citationKeyPatternPreferences,
+        BibEntryTypesManager entryTypesManager
+    ) {
+        super(
+            new BibWriter(writer, newline),
+            saveConfiguration,
+            citationKeyPatternPreferences,
+            entryTypesManager
+        );
         this.fieldPreferences = fieldPreferences;
     }
 
@@ -71,7 +76,8 @@ protected void writeEpilogue(String epilogue) throws IOException {
     }
 
     @Override
-    protected void writeMetaDataItem(Map.Entry<String, String> metaItem) throws IOException {
+    protected void writeMetaDataItem(Map.Entry<String, String> metaItem)
+        throws IOException {
         bibWriter.write(COMMENT_PREFIX + "{");
         bibWriter.write(MetaData.META_FLAG);
         bibWriter.write(metaItem.getKey());
@@ -92,9 +98,13 @@ protected void writePreamble(String preamble) throws IOException {
     }
 
     @Override
-    protected void writeString(BibtexString bibtexString, int maxKeyLength) throws IOException {
+    protected void writeString(BibtexString bibtexString, int maxKeyLength)
+        throws IOException {
         // If the string has not been modified, write it back as it was
-        if (!saveConfiguration.shouldReformatFile() && !bibtexString.hasChanged()) {
+        if (
+            !saveConfiguration.shouldReformatFile() &&
+            !bibtexString.hasChanged()
+        ) {
             bibWriter.write(bibtexString.getParsedSerialization());
             return;
         }
@@ -105,14 +115,24 @@ 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());
+                    .write(
+                        InternalField.BIBTEX_STRING,
+                        bibtexString.getContent()
+                    );
                 bibWriter.write(formatted);
             } catch (InvalidFieldValueException ex) {
                 throw new IOException(ex);
@@ -123,20 +143,32 @@ protected void writeString(BibtexString bibtexString, int maxKeyLength) throws I
     }
 
     @Override
-    protected void writeEntryTypeDefinition(BibEntryType customType) throws IOException {
+    protected void writeEntryTypeDefinition(BibEntryType customType)
+        throws IOException {
         bibWriter.write(COMMENT_PREFIX + "{");
-        bibWriter.write(MetaDataSerializer.serializeCustomEntryTypes(customType));
+        bibWriter.write(
+            MetaDataSerializer.serializeCustomEntryTypes(customType)
+        );
         bibWriter.writeLine("}");
         bibWriter.finishBlock();
     }
 
     @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;
         }
 
@@ -154,8 +186,17 @@ 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);
-        bibtexEntryWriter.write(entry, bibWriter, mode, saveConfiguration.shouldReformatFile());
+    protected void writeEntry(BibEntry entry, BibDatabaseMode mode)
+        throws IOException {
+        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/BlankLineBehaviour.java b/src/main/java/org/jabref/logic/exporter/BlankLineBehaviour.java
index 96957869a27..3796d20e9fd 100644
--- a/src/main/java/org/jabref/logic/exporter/BlankLineBehaviour.java
+++ b/src/main/java/org/jabref/logic/exporter/BlankLineBehaviour.java
@@ -5,5 +5,5 @@
  */
 public enum BlankLineBehaviour {
     KEEP_BLANKS,
-    DELETE_BLANKS
+    DELETE_BLANKS,
 }
diff --git a/src/main/java/org/jabref/logic/exporter/EmbeddedBibFilePdfExporter.java b/src/main/java/org/jabref/logic/exporter/EmbeddedBibFilePdfExporter.java
index 4657ad37eff..65289f47da0 100644
--- a/src/main/java/org/jabref/logic/exporter/EmbeddedBibFilePdfExporter.java
+++ b/src/main/java/org/jabref/logic/exporter/EmbeddedBibFilePdfExporter.java
@@ -11,7 +11,16 @@
 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,17 +33,6 @@
 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;
 
@@ -42,15 +40,22 @@
  * A custom exporter to write bib entries to an embedded bib file.
  */
 public class EmbeddedBibFilePdfExporter extends Exporter {
+
     public static String EMBEDDED_FILE_NAME = "main.bib";
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(EmbeddedBibFilePdfExporter.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(
+        EmbeddedBibFilePdfExporter.class
+    );
 
     private final BibDatabaseMode bibDatabaseMode;
     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 +68,11 @@ 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);
@@ -73,11 +82,21 @@ public void export(BibDatabaseContext databaseContext, Path file, List<BibEntry>
                 PDPage page = new PDPage();
                 document.addPage(page);
 
-                try (PDPageContentStream contentStream = new PDPageContentStream(document, page)) {
+                try (
+                    PDPageContentStream contentStream = new PDPageContentStream(
+                        document,
+                        page
+                    )
+                ) {
                     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.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.endText();
                 }
                 document.save(file.toString());
@@ -103,14 +122,17 @@ private void embedBibTex(String bibTeX, Path path) throws IOException {
         // See https://issues.apache.org/jira/browse/PDFBOX-4028
         Path newFile = Files.createTempFile("JabRef", "pdf");
         try (PDDocument document = Loader.loadPDF(path.toFile())) {
-            PDDocumentNameDictionary nameDictionary = document.getDocumentCatalog().getNames();
+            PDDocumentNameDictionary nameDictionary = document
+                .getDocumentCatalog()
+                .getNames();
             PDEmbeddedFilesNameTreeNode efTree;
             Map<String, PDComplexFileSpecification> names;
 
             if (nameDictionary == null) {
                 efTree = new PDEmbeddedFilesNameTreeNode();
                 names = new HashMap<>();
-                nameDictionary = new PDDocumentNameDictionary(document.getDocumentCatalog());
+                nameDictionary =
+                    new PDDocumentNameDictionary(document.getDocumentCatalog());
                 nameDictionary.setEmbeddedFiles(efTree);
                 document.getDocumentCatalog().setNames(nameDictionary);
             } else {
@@ -133,9 +155,14 @@ 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);
+                PDEmbeddedFile embeddedFile = new PDEmbeddedFile(
+                    document,
+                    inputStream
+                );
                 embeddedFile.setSubtype("text/x-bibtex");
                 embeddedFile.setSize(bibTeX.length());
                 fileSpecification.setEmbeddedFile(embeddedFile);
@@ -144,7 +171,12 @@ 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()
+                            )
+                        );
                     }
                 }
 
@@ -161,8 +193,13 @@ private void embedBibTex(String bibTeX, Path path) throws IOException {
     private String getBibString(List<BibEntry> entries) throws IOException {
         StringWriter stringWriter = new StringWriter();
         BibWriter bibWriter = new BibWriter(stringWriter, OS.NEWLINE);
-        FieldWriter fieldWriter = FieldWriter.buildIgnoreHashes(fieldPreferences);
-        BibEntryWriter bibEntryWriter = new BibEntryWriter(fieldWriter, bibEntryTypesManager);
+        FieldWriter fieldWriter = FieldWriter.buildIgnoreHashes(
+            fieldPreferences
+        );
+        BibEntryWriter bibEntryWriter = new BibEntryWriter(
+            fieldWriter,
+            bibEntryTypesManager
+        );
         for (BibEntry entry : entries) {
             bibEntryWriter.write(entry, bibWriter, bibDatabaseMode);
         }
diff --git a/src/main/java/org/jabref/logic/exporter/Exporter.java b/src/main/java/org/jabref/logic/exporter/Exporter.java
index 61e1c5751ae..0d07d846934 100644
--- a/src/main/java/org/jabref/logic/exporter/Exporter.java
+++ b/src/main/java/org/jabref/logic/exporter/Exporter.java
@@ -5,7 +5,6 @@
 import java.util.Collections;
 import java.util.List;
 import java.util.Optional;
-
 import org.jabref.logic.journals.JournalAbbreviationRepository;
 import org.jabref.logic.util.FileType;
 import org.jabref.model.database.BibDatabaseContext;
@@ -58,9 +57,19 @@ 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 +84,29 @@ 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);
+                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 +128,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 +141,21 @@ 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 b38bb57dc95..cd3a48b9cce 100644
--- a/src/main/java/org/jabref/logic/exporter/ExporterFactory.java
+++ b/src/main/java/org/jabref/logic/exporter/ExporterFactory.java
@@ -5,7 +5,6 @@
 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;
@@ -24,44 +23,244 @@ private ExporterFactory(List<Exporter> exporters) {
         this.exporters = Objects.requireNonNull(exporters);
     }
 
-    public static ExporterFactory create(PreferencesService preferencesService,
-                                         BibEntryTypesManager entryTypesManager) {
-
-        List<TemplateExporter> customFormats = preferencesService.getExportPreferences().getCustomExporters();
-        LayoutFormatterPreferences layoutPreferences = preferencesService.getLayoutFormatterPreferences();
-        SelfContainedSaveOrder saveOrder = SelfContainedSaveOrder.of(preferencesService.getSelfContainedExportConfiguration().getSaveOrder());
+    public static ExporterFactory create(
+        PreferencesService preferencesService,
+        BibEntryTypesManager entryTypesManager
+    ) {
+        List<TemplateExporter> customFormats = preferencesService
+            .getExportPreferences()
+            .getCustomExporters();
+        LayoutFormatterPreferences layoutPreferences =
+            preferencesService.getLayoutFormatterPreferences();
+        SelfContainedSaveOrder saveOrder = SelfContainedSaveOrder.of(
+            preferencesService
+                .getSelfContainedExportConfiguration()
+                .getSaveOrder()
+        );
         XmpPreferences xmpPreferences = preferencesService.getXmpPreferences();
-        FieldPreferences fieldPreferences = preferencesService.getFieldPreferences();
-        BibDatabaseMode bibDatabaseMode = preferencesService.getLibraryPreferences().getDefaultBibDatabaseMode();
+        FieldPreferences fieldPreferences =
+            preferencesService.getFieldPreferences();
+        BibDatabaseMode bibDatabaseMode = preferencesService
+            .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
+            )
+        );
 
         // Now add custom export formats
         exporters.addAll(customFormats);
@@ -85,6 +284,9 @@ 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 609a1aa4827..c0499839985 100644
--- a/src/main/java/org/jabref/logic/exporter/GroupSerializer.java
+++ b/src/main/java/org/jabref/logic/exporter/GroupSerializer.java
@@ -2,9 +2,7 @@
 
 import java.util.ArrayList;
 import java.util.List;
-
 import javafx.scene.paint.Color;
-
 import org.jabref.logic.util.MetadataSerializationConfiguration;
 import org.jabref.logic.util.io.FileUtil;
 import org.jabref.model.groups.AbstractGroup;
@@ -22,6 +20,7 @@
 import org.jabref.model.strings.StringUtil;
 
 public class GroupSerializer {
+
     private static String serializeAllEntriesGroup() {
         return MetadataSerializationConfiguration.ALL_ENTRIES_GROUP_ID;
     }
@@ -29,7 +28,13 @@ 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 +48,31 @@ 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 +87,39 @@ 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(SearchRules.SearchFlags.CASE_SENSITIVE)));
+        sb.append(
+            StringUtil.booleanToBinaryString(
+                group
+                    .getSearchFlags()
+                    .contains(SearchRules.SearchFlags.CASE_SENSITIVE)
+            )
+        );
         sb.append(MetadataSerializationConfiguration.GROUP_UNIT_SEPARATOR);
-        sb.append(StringUtil.booleanToBinaryString(group.getSearchFlags().contains(SearchRules.SearchFlags.REGULAR_EXPRESSION)));
+        sb.append(
+            StringUtil.booleanToBinaryString(
+                group
+                    .getSearchFlags()
+                    .contains(SearchRules.SearchFlags.REGULAR_EXPRESSION)
+            )
+        );
         sb.append(MetadataSerializationConfiguration.GROUP_UNIT_SEPARATOR);
 
         appendGroupDetails(sb, group);
@@ -80,7 +127,10 @@ private String serializeSearchGroup(SearchGroup group) {
         return sb.toString();
     }
 
-    private void appendGroupDetails(StringBuilder builder, AbstractGroup group) {
+    private void appendGroupDetails(
+        StringBuilder builder,
+        AbstractGroup group
+    ) {
         builder.append(StringUtil.booleanToBinaryString(group.isExpanded()));
         builder.append(MetadataSerializationConfiguration.GROUP_UNIT_SEPARATOR);
         builder.append(group.getColor().map(Color::toString).orElse(""));
@@ -103,7 +153,11 @@ public List<String> serializeTree(GroupTreeNode node) {
         List<String> representation = new ArrayList<>();
 
         // Append current node
-        representation.add(String.valueOf(node.getLevel()) + ' ' + serializeGroup(node.getGroup()));
+        representation.add(
+            String.valueOf(node.getLevel()) +
+            ' ' +
+            serializeGroup(node.getGroup())
+        );
 
         // Append children
         for (GroupTreeNode child : node.getChildren()) {
@@ -129,18 +183,32 @@ 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);
@@ -150,16 +218,33 @@ private String serializeTexGroup(TexGroup group) {
 
     private String serializeAutomaticPersonsGroup(AutomaticPersonsGroup group) {
         StringBuilder sb = new StringBuilder();
-        sb.append(MetadataSerializationConfiguration.AUTOMATIC_PERSONS_GROUP_ID);
+        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));
+    private void appendAutomaticGroupDetails(
+        StringBuilder builder,
+        AutomaticGroup group
+    ) {
+        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);
@@ -167,13 +252,33 @@ private void appendAutomaticGroupDetails(StringBuilder builder, AutomaticGroup g
 
     private String serializeAutomaticKeywordGroup(AutomaticKeywordGroup group) {
         StringBuilder sb = new StringBuilder();
-        sb.append(MetadataSerializationConfiguration.AUTOMATIC_KEYWORD_GROUP_ID);
+        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(
+            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(
+            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.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 1a1da69dab1..0d4c5e7f0fb 100644
--- a/src/main/java/org/jabref/logic/exporter/MSBibExporter.java
+++ b/src/main/java/org/jabref/logic/exporter/MSBibExporter.java
@@ -5,7 +5,6 @@
 import java.nio.file.Path;
 import java.util.List;
 import java.util.Objects;
-
 import javax.xml.transform.OutputKeys;
 import javax.xml.transform.Transformer;
 import javax.xml.transform.TransformerException;
@@ -13,7 +12,6 @@
 import javax.xml.transform.TransformerFactoryConfigurationError;
 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;
@@ -29,8 +27,11 @@ public MSBibExporter() {
     }
 
     @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);
 
@@ -38,17 +39,33 @@ public void export(final BibDatabaseContext databaseContext, final Path file,
             return;
         }
 
-        MSBibDatabase msBibDatabase = new MSBibDatabase(databaseContext.getDatabase(), entries);
+        MSBibDatabase msBibDatabase = new MSBibDatabase(
+            databaseContext.getDatabase(),
+            entries
+        );
 
         // forcing to use UTF8 output format for some problems with xml export in other encodings
-        try (AtomicFileWriter ps = new AtomicFileWriter(file, StandardCharsets.UTF_8)) {
+        try (
+            AtomicFileWriter ps = new AtomicFileWriter(
+                file,
+                StandardCharsets.UTF_8
+            )
+        ) {
             try {
-                DOMSource source = new DOMSource(msBibDatabase.getDomForExport());
+                DOMSource source = new DOMSource(
+                    msBibDatabase.getDomForExport()
+                );
                 StreamResult result = new StreamResult(ps);
-                Transformer trans = TransformerFactory.newInstance().newTransformer();
+                Transformer trans = TransformerFactory
+                    .newInstance()
+                    .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 60c143dab88..0135601f17c 100644
--- a/src/main/java/org/jabref/logic/exporter/MetaDataSerializer.java
+++ b/src/main/java/org/jabref/logic/exporter/MetaDataSerializer.java
@@ -8,7 +8,6 @@
 import java.util.StringJoiner;
 import java.util.TreeMap;
 import java.util.stream.Collectors;
-
 import org.jabref.logic.citationkeypattern.AbstractCitationKeyPattern;
 import org.jabref.logic.citationkeypattern.GlobalCitationKeyPattern;
 import org.jabref.logic.cleanup.FieldFormatterCleanups;
@@ -27,58 +26,130 @@
  */
 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,
-                                                             GlobalCitationKeyPattern globalCiteKeyPattern) {
-
+    public static Map<String, String> getSerializedStringMap(
+        MetaData metaData,
+        GlobalCitationKeyPattern globalCiteKeyPattern
+    ) {
         // 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
         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, saveActions.getAsStringList(OS.NEWLINE)));
+        metaData
+            .getSaveOrder()
+            .ifPresent(saveOrderConfig ->
+                stringyMetaData.put(
+                    MetaData.SAVE_ORDER_CONFIG,
+                    saveOrderConfig.getAsStringList()
+                )
+            );
+        metaData
+            .getSaveActions()
+            .ifPresent(saveActions ->
+                stringyMetaData.put(
+                    MetaData.SAVE_ACTIONS,
+                    saveActions.getAsStringList(OS.NEWLINE)
+                )
+            );
         if (metaData.isProtected()) {
-            stringyMetaData.put(MetaData.PROTECTED_FLAG_META, Collections.singletonList("true"));
+            stringyMetaData.put(
+                MetaData.PROTECTED_FLAG_META,
+                Collections.singletonList("true")
+            );
         }
-        stringyMetaData.putAll(serializeCiteKeyPattern(metaData, globalCiteKeyPattern));
-        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())));
+        stringyMetaData.putAll(
+            serializeCiteKeyPattern(metaData, globalCiteKeyPattern)
+        );
+        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.getContentSelectorList()) {
-            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);
+        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)
+                )
+            );
 
         // 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()) {
+        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());
         }
@@ -86,18 +157,29 @@ 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()) {
+        for (Map.Entry<
+            String,
+            List<String>
+        > metaItem : stringyMetaData.entrySet()) {
             List<String> itemList = metaItem.getValue();
             if (itemList.isEmpty()) {
                 // Only add non-empty values
                 continue;
             }
 
-            boolean isSaveActions = metaItem.getKey().equals(MetaData.SAVE_ACTIONS);
+            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;
@@ -106,11 +188,17 @@ 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();
@@ -122,9 +210,13 @@ private static Map<String, String> serializeMetaData(Map<String, List<String>> s
         return serializedMetaData;
     }
 
-    private static Map<String, List<String>> serializeCiteKeyPattern(MetaData metaData, GlobalCitationKeyPattern globalCitationKeyPattern) {
+    private static Map<String, List<String>> serializeCiteKeyPattern(
+        MetaData metaData,
+        GlobalCitationKeyPattern globalCitationKeyPattern
+    ) {
         Map<String, List<String>> stringyPattern = new HashMap<>();
-        AbstractCitationKeyPattern citationKeyPattern = metaData.getCiteKeyPattern(globalCitationKeyPattern);
+        AbstractCitationKeyPattern citationKeyPattern =
+            metaData.getCiteKeyPattern(globalCitationKeyPattern);
         for (EntryType key : citationKeyPattern.getAllKeys()) {
             if (!citationKeyPattern.isDefaultValue(key)) {
                 List<String> data = new ArrayList<>();
@@ -133,7 +225,10 @@ private static Map<String, List<String>> serializeCiteKeyPattern(MetaData metaDa
                 stringyPattern.put(metaDataKey, data);
             }
         }
-        if ((citationKeyPattern.getDefaultValue() != null) && !citationKeyPattern.getDefaultValue().isEmpty()) {
+        if (
+            (citationKeyPattern.getDefaultValue() != null) &&
+            !citationKeyPattern.getDefaultValue().isEmpty()
+        ) {
             List<String> data = new ArrayList<>();
             data.add(citationKeyPattern.getDefaultValue().get(0));
             stringyPattern.put(MetaData.KEYPATTERNDEFAULT, data);
@@ -146,7 +241,13 @@ 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);
         }
@@ -158,13 +259,19 @@ public static String serializeCustomEntryTypes(BibEntryType entryType) {
         builder.append(MetaData.ENTRYTYPE_FLAG);
         builder.append(entryType.getType().getName());
         builder.append(": req[");
-        builder.append(FieldFactory.serializeOrFieldsList(entryType.getRequiredFields()));
+        builder.append(
+            FieldFactory.serializeOrFieldsList(entryType.getRequiredFields())
+        );
         builder.append("] opt[");
-        builder.append(FieldFactory.serializeFieldsList(
-                entryType.getOptionalFields()
-                         .stream()
-                         .map(BibField::field)
-                         .collect(Collectors.toList())));
+        builder.append(
+            FieldFactory.serializeFieldsList(
+                entryType
+                    .getOptionalFields()
+                    .stream()
+                    .map(BibField::field)
+                    .collect(Collectors.toList())
+            )
+        );
         builder.append("]");
         return builder.toString();
     }
diff --git a/src/main/java/org/jabref/logic/exporter/ModsExporter.java b/src/main/java/org/jabref/logic/exporter/ModsExporter.java
index 893f93980b9..f9ec3b99dac 100644
--- a/src/main/java/org/jabref/logic/exporter/ModsExporter.java
+++ b/src/main/java/org/jabref/logic/exporter/ModsExporter.java
@@ -13,7 +13,6 @@
 import java.util.Map;
 import java.util.Objects;
 import java.util.TreeMap;
-
 import javax.xml.stream.XMLOutputFactory;
 import javax.xml.stream.XMLStreamException;
 import javax.xml.stream.XMLStreamWriter;
@@ -23,7 +22,6 @@
 import javax.xml.transform.TransformerFactory;
 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;
@@ -31,7 +29,6 @@
 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;
 
@@ -40,19 +37,27 @@
  */
 class ModsExporter extends Exporter {
 
-    private static final String MODS_NAMESPACE_URI = "http://www.loc.gov/mods/v3";
+    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);
+    private static final Logger LOGGER = LoggerFactory.getLogger(
+        ModsExporter.class
+    );
 
     public ModsExporter() {
         super("mods", "MODS", StandardFileType.XML);
     }
 
     @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
@@ -70,10 +75,16 @@ public void export(final BibDatabaseContext databaseContext, final Path file, Li
                     String citekey = bibEntry.getCitationKey().get();
                     addIdentifier(writer, new UnknownField("citekey"), citekey);
                 } else {
-                    writer.writeStartElement("mods", "mods", MODS_NAMESPACE_URI);
+                    writer.writeStartElement(
+                        "mods",
+                        "mods",
+                        MODS_NAMESPACE_URI
+                    );
                 }
 
-                Map<Field, String> fieldMap = new TreeMap<>(Comparator.comparing(Field::getName));
+                Map<Field, String> fieldMap = new TreeMap<>(
+                    Comparator.comparing(Field::getName)
+                );
                 fieldMap.putAll(bibEntry.getFieldMap());
                 addGenre(writer, bibEntry.getType());
 
@@ -142,31 +153,57 @@ public void export(final BibDatabaseContext databaseContext, final Path file, Li
         }
     }
 
-    private XMLStreamWriter createWriter(StringWriter sw) throws XMLStreamException {
+    private XMLStreamWriter createWriter(StringWriter sw)
+        throws XMLStreamException {
         XMLOutputFactory outputFactory = XMLOutputFactory.newFactory();
 
-        XMLStreamWriter writer = outputFactory.createXMLStreamWriter(new StreamResult(sw));
-        writer.writeDTD("<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?>\n");
+        XMLStreamWriter writer = outputFactory.createXMLStreamWriter(
+            new StreamResult(sw)
+        );
+        writer.writeDTD(
+            "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?>\n"
+        );
         writer.writeStartElement("mods", "modsCollection", MODS_NAMESPACE_URI);
         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.writeNamespace(
+            "xsi",
+            "http://www.w3.org/2001/XMLSchema-instance"
+        );
+        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 {
-        Transformer transformer = TransformerFactory.newInstance().newTransformer();
+    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");
+        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 +217,11 @@ 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 +241,11 @@ 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 {
@@ -220,7 +265,11 @@ private void writePartInformation(XMLStreamWriter writer, List<String> parts, Ma
         }
     }
 
-    private void trackOriginInformation(List<String> originItems, Field field, String value) {
+    private void trackOriginInformation(
+        List<String> originItems,
+        Field field,
+        String value
+    ) {
         if (field.equals(StandardField.YEAR)) {
             originItems.add(value);
         } else if (field.equals(new UnknownField("created"))) {
@@ -244,19 +293,22 @@ private void addPart(List<String> part, String value) {
         part.add(value);
     }
 
-    private void addGenre(XMLStreamWriter writer, EntryType entryType) throws XMLStreamException {
+    private void addGenre(XMLStreamWriter writer, EntryType entryType)
+        throws XMLStreamException {
         writer.writeStartElement("mods", "genre", MODS_NAMESPACE_URI);
         writer.writeCharacters(entryType.getName());
         writer.writeEndElement();
     }
 
-    private void addAbstract(XMLStreamWriter writer, String value) throws XMLStreamException {
+    private void addAbstract(XMLStreamWriter writer, String value)
+        throws XMLStreamException {
         writer.writeStartElement("mods", "abstract", MODS_NAMESPACE_URI);
         writer.writeCharacters(value);
         writer.writeEndElement(); // end abstract
     }
 
-    private void addTitle(XMLStreamWriter writer, String value) throws XMLStreamException {
+    private void addTitle(XMLStreamWriter writer, String value)
+        throws XMLStreamException {
         writer.writeStartElement("mods", "titleInfo", MODS_NAMESPACE_URI);
         writer.writeStartElement("mods", "title", MODS_NAMESPACE_URI);
         writer.writeCharacters(value);
@@ -264,7 +316,8 @@ private void addTitle(XMLStreamWriter writer, String value) throws XMLStreamExce
         writer.writeEndElement(); // end titleInfo
     }
 
-    private void addAffiliation(XMLStreamWriter writer, String value) throws XMLStreamException {
+    private void addAffiliation(XMLStreamWriter writer, String value)
+        throws XMLStreamException {
         writer.writeStartElement("mods", "name", MODS_NAMESPACE_URI);
         writer.writeStartElement("mods", "affiliation", MODS_NAMESPACE_URI);
         writer.writeCharacters(value);
@@ -272,18 +325,24 @@ private void addAffiliation(XMLStreamWriter writer, String value) throws XMLStre
         writer.writeEndElement(); // end name
     }
 
-    private void addLocation(XMLStreamWriter writer, String value) throws XMLStreamException {
+    private void addLocation(XMLStreamWriter writer, String value)
+        throws XMLStreamException {
         writer.writeStartElement("mods", "location", MODS_NAMESPACE_URI);
         String[] locations = value.split(", ");
         for (String location : locations) {
-            writer.writeStartElement("mods", "physicalLocation", MODS_NAMESPACE_URI);
+            writer.writeStartElement(
+                "mods",
+                "physicalLocation",
+                MODS_NAMESPACE_URI
+            );
             writer.writeCharacters(location);
             writer.writeEndElement();
         }
         writer.writeEndElement();
     }
 
-    private void addNote(XMLStreamWriter writer, String value) throws XMLStreamException {
+    private void addNote(XMLStreamWriter writer, String value)
+        throws XMLStreamException {
         String[] notes = value.split(", ");
         for (String note : notes) {
             writer.writeStartElement("mods", "note", MODS_NAMESPACE_URI);
@@ -292,7 +351,8 @@ private void addNote(XMLStreamWriter writer, String value) throws XMLStreamExcep
         }
     }
 
-    private void addUrl(XMLStreamWriter writer, String value) throws XMLStreamException {
+    private void addUrl(XMLStreamWriter writer, String value)
+        throws XMLStreamException {
         String[] urls = value.split(", ");
         writer.writeStartElement("mods", "location", MODS_NAMESPACE_URI);
         for (String url : urls) {
@@ -303,7 +363,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);
 
@@ -316,7 +377,8 @@ private void addJournal(XMLStreamWriter writer, String value) throws XMLStreamEx
         writer.writeEndElement(); // End titleInfo element
     }
 
-    private void addLanguage(XMLStreamWriter writer, String value) throws XMLStreamException {
+    private void addLanguage(XMLStreamWriter writer, String value)
+        throws XMLStreamException {
         writer.writeStartElement("mods", "language", MODS_NAMESPACE_URI);
         writer.writeStartElement("mods", "languageTerm", MODS_NAMESPACE_URI);
         writer.writeCharacters(value);
@@ -324,7 +386,8 @@ private void addLanguage(XMLStreamWriter writer, String value) throws XMLStreamE
         writer.writeEndElement(); // end language
     }
 
-    private void addPages(XMLStreamWriter writer, String value) throws XMLStreamException {
+    private void addPages(XMLStreamWriter writer, String value)
+        throws XMLStreamException {
         if (value.contains(DOUBLE_MINUS)) {
             addStartAndEndPage(writer, value, DOUBLE_MINUS);
         } else if (value.contains(MINUS)) {
@@ -339,7 +402,8 @@ private void addPages(XMLStreamWriter writer, String value) throws XMLStreamExce
         }
     }
 
-    private void addKeyWords(XMLStreamWriter writer, String value) throws XMLStreamException {
+    private void addKeyWords(XMLStreamWriter writer, String value)
+        throws XMLStreamException {
         String[] keywords = value.split(", ");
 
         for (String keyword : keywords) {
@@ -351,7 +415,8 @@ private void addKeyWords(XMLStreamWriter writer, String value) throws XMLStreamE
         }
     }
 
-    private void handleAuthors(XMLStreamWriter writer, String value) throws XMLStreamException {
+    private void handleAuthors(XMLStreamWriter writer, String value)
+        throws XMLStreamException {
         String[] authors = value.split("and");
         for (String author : authors) {
             writer.writeStartElement("mods", "name", MODS_NAMESPACE_URI);
@@ -361,7 +426,11 @@ private void handleAuthors(XMLStreamWriter writer, String value) throws XMLStrea
                 // 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);
+                writer.writeStartElement(
+                    "mods",
+                    "namePart",
+                    MODS_NAMESPACE_URI
+                );
                 writer.writeAttribute("type", "family");
                 writer.writeCharacters(familyName);
                 writer.writeEndElement();
@@ -371,7 +440,11 @@ private void handleAuthors(XMLStreamWriter writer, String value) throws XMLStrea
                 String[] forenames = forename.split(" ");
                 for (String given : forenames) {
                     if (!given.isEmpty()) {
-                        writer.writeStartElement("mods", "namePart", MODS_NAMESPACE_URI);
+                        writer.writeStartElement(
+                            "mods",
+                            "namePart",
+                            MODS_NAMESPACE_URI
+                        );
                         writer.writeAttribute("type", "given");
                         writer.writeCharacters(given);
                         writer.writeEndElement();
@@ -380,7 +453,11 @@ private void handleAuthors(XMLStreamWriter writer, String value) throws XMLStrea
                 writer.writeEndElement();
             } else {
                 // no "," indicates that there should only be a family name
-                writer.writeStartElement("mods", "namePart", MODS_NAMESPACE_URI);
+                writer.writeStartElement(
+                    "mods",
+                    "namePart",
+                    MODS_NAMESPACE_URI
+                );
                 writer.writeAttribute("type", "family");
                 writer.writeCharacters(author);
                 writer.writeEndElement();
@@ -389,8 +466,11 @@ 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);
             writer.writeAttribute("ID", value);
@@ -401,7 +481,11 @@ 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 +505,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,8 +515,11 @@ 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);
         } else if (field.equals(new UnknownField("created"))) {
@@ -442,7 +530,12 @@ 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"))) {
@@ -453,7 +546,11 @@ private void addOriginInformation(XMLStreamWriter writer, Field field, String va
             writer.writeStartElement("mods", "place", MODS_NAMESPACE_URI);
             String[] places = value.split(", ");
             for (String place : places) {
-                writer.writeStartElement("mods", "placeTerm", MODS_NAMESPACE_URI);
+                writer.writeStartElement(
+                    "mods",
+                    "placeTerm",
+                    MODS_NAMESPACE_URI
+                );
                 writer.writeAttribute("type", "text");
                 writer.writeCharacters(place);
                 writer.writeEndElement();
@@ -466,7 +563,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 6c8ce936464..7de05996d3d 100644
--- a/src/main/java/org/jabref/logic/exporter/OOCalcDatabase.java
+++ b/src/main/java/org/jabref/logic/exporter/OOCalcDatabase.java
@@ -4,9 +4,7 @@
 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,7 +17,6 @@
 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;
@@ -28,12 +25,20 @@
 
 class OOCalcDatabase {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(OOCalcDatabase.class);
-    private static final Field REPORT_TYPE_FIELD = new UnknownField("reporttype");
+    private static final Logger LOGGER = LoggerFactory.getLogger(
+        OOCalcDatabase.class
+    );
+    private static final Field REPORT_TYPE_FIELD = new UnknownField(
+        "reporttype"
+    );
 
     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());
@@ -53,7 +58,11 @@ private static String getField(BibEntry e, Field field) {
     public Document getDOMrepresentation() {
         Document document = null;
         try {
-            document = DocumentBuilderFactory.newInstance().newDocumentBuilder().newDocument();
+            document =
+                DocumentBuilderFactory
+                    .newInstance()
+                    .newDocumentBuilder()
+                    .newDocument();
             Element root = createRootElement(document);
             Element body = document.createElement("office:body");
             Element table = createTableElement(document);
@@ -76,10 +85,22 @@ public Document getDOMrepresentation() {
     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()));
+        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))));
+                addTableCell(
+                    document,
+                    row,
+                    new RemoveWhitespace()
+                        .format(
+                            new RemoveBrackets()
+                                .format(getField(entry, StandardField.TITLE))
+                        )
+                );
             } else {
                 addTableCell(document, row, getField(entry, field));
             }
@@ -130,7 +151,11 @@ private Element createRootElement(Document document) {
         return root;
     }
 
-    private static void addTableCell(Document doc, Element parent, String content) {
+    private static void addTableCell(
+        Document doc,
+        Element parent,
+        String content
+    ) {
         Element cell = doc.createElement("table:table-cell");
         Element text = doc.createElement("text:p");
         Text textNode = doc.createTextNode(content);
diff --git a/src/main/java/org/jabref/logic/exporter/OpenDocumentRepresentation.java b/src/main/java/org/jabref/logic/exporter/OpenDocumentRepresentation.java
index c705dd4845f..a93310fe7d7 100644
--- a/src/main/java/org/jabref/logic/exporter/OpenDocumentRepresentation.java
+++ b/src/main/java/org/jabref/logic/exporter/OpenDocumentRepresentation.java
@@ -3,10 +3,8 @@
 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,7 +16,6 @@
 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;
@@ -27,12 +24,17 @@
 
 class OpenDocumentRepresentation {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(OpenDocumentRepresentation.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(
+        OpenDocumentRepresentation.class
+    );
     private final List<BibEntry> entries;
 
     private final BibDatabase database;
 
-    public OpenDocumentRepresentation(BibDatabase database, List<BibEntry> entries) {
+    public OpenDocumentRepresentation(
+        BibDatabase database,
+        List<BibEntry> entries
+    ) {
         this.database = database;
         // Make a list of comparators for sorting the entries:
         List<FieldComparator> comparators = new ArrayList<>();
@@ -56,18 +58,43 @@ public OpenDocumentRepresentation(BibDatabase database, List<BibEntry> entries)
     public Document getDOMrepresentation() {
         Document result = null;
         try {
-            DocumentBuilder dbuild = DocumentBuilderFactory.newInstance().newDocumentBuilder();
+            DocumentBuilder dbuild = DocumentBuilderFactory
+                .newInstance()
+                .newDocumentBuilder();
             result = dbuild.newDocument();
-            Element collection = result.createElement("office:document-content");
+            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: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:meta", "urn:oasis:names:tc:opendocument:xmlns:meta: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: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:xlink", "http://www.w3.org/1999/xlink");
+            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);
 
@@ -143,7 +170,11 @@ public Document getDOMrepresentation() {
             for (BibEntry e : entries) {
                 row = result.createElement("table:table-row");
                 addTableCell(result, row, getField(e, InternalField.KEY_FIELD));
-                addTableCell(result, row, new GetOpenOfficeType().format(e.getType().getName()));
+                addTableCell(
+                    result,
+                    row,
+                    new GetOpenOfficeType().format(e.getType().getName())
+                );
                 addTableCell(result, row, getField(e, StandardField.ADDRESS));
                 addTableCell(result, row, getField(e, StandardField.ASSIGNEE));
                 addTableCell(result, row, getField(e, StandardField.ANNOTE));
@@ -154,23 +185,55 @@ public Document getDOMrepresentation() {
                 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.HOWPUBLISHED));
-                addTableCell(result, row, getField(e, StandardField.INSTITUTION));
+                addTableCell(
+                    result,
+                    row,
+                    getField(e, StandardField.HOWPUBLISHED)
+                );
+                addTableCell(
+                    result,
+                    row,
+                    getField(e, StandardField.INSTITUTION)
+                );
                 addTableCell(result, row, getField(e, StandardField.JOURNAL));
                 addTableCell(result, row, getField(e, StandardField.LANGUAGE));
                 addTableCell(result, row, getField(e, StandardField.MONTH));
-                addTableCell(result, row, getField(e, StandardField.MONTHFILED));
-                addTableCell(result, row, getField(e, StandardField.NATIONALITY));
+                addTableCell(
+                    result,
+                    row,
+                    getField(e, StandardField.MONTHFILED)
+                );
+                addTableCell(
+                    result,
+                    row,
+                    getField(e, StandardField.NATIONALITY)
+                );
                 addTableCell(result, row, getField(e, StandardField.NOTE));
                 addTableCell(result, row, getField(e, StandardField.NUMBER));
-                addTableCell(result, row, getField(e, StandardField.ORGANIZATION));
+                addTableCell(
+                    result,
+                    row,
+                    getField(e, StandardField.ORGANIZATION)
+                );
                 addTableCell(result, row, getField(e, StandardField.PAGES));
                 addTableCell(result, row, getField(e, StandardField.PUBLISHER));
                 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, getField(e, new UnknownField("reporttype")));
+                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));
                 addTableCell(result, row, getField(e, StandardField.YEARFILED));
diff --git a/src/main/java/org/jabref/logic/exporter/OpenDocumentSpreadsheetCreator.java b/src/main/java/org/jabref/logic/exporter/OpenDocumentSpreadsheetCreator.java
index f8462664548..c825d308b50 100644
--- a/src/main/java/org/jabref/logic/exporter/OpenDocumentSpreadsheetCreator.java
+++ b/src/main/java/org/jabref/logic/exporter/OpenDocumentSpreadsheetCreator.java
@@ -19,36 +19,45 @@
 import java.util.zip.CRC32;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipOutputStream;
-
 import javax.xml.transform.OutputKeys;
 import javax.xml.transform.Transformer;
 import javax.xml.transform.TransformerFactory;
 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
      */
     public OpenDocumentSpreadsheetCreator() {
-        super("ods", Localization.lang("OpenDocument spreadsheet"), StandardFileType.ODS);
+        super(
+            "ods",
+            Localization.lang("OpenDocument spreadsheet"),
+            StandardFileType.ODS
+        );
     }
 
-    private static void storeOpenDocumentSpreadsheetFile(Path file, InputStream source) throws IOException {
-
-        try (ZipOutputStream out = new ZipOutputStream(new BufferedOutputStream(Files.newOutputStream(file)))) {
+    private static void storeOpenDocumentSpreadsheetFile(
+        Path file,
+        InputStream source
+    ) throws IOException {
+        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";
@@ -74,22 +83,43 @@ 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-INF/manifest.xml", "/resource/ods/manifest.xml", out);
+            OpenDocumentSpreadsheetCreator.addResourceFile(
+                "meta.xml",
+                "/resource/ods/meta.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);
-        OpenDocumentSpreadsheetCreator.exportOpenDocumentSpreadsheetXML(tmpFile, database, entries);
+        OpenDocumentSpreadsheetCreator.exportOpenDocumentSpreadsheetXML(
+            tmpFile,
+            database,
+            entries
+        );
 
         // Then add the content to the zip file:
-        try (BufferedInputStream in = new BufferedInputStream(new FileInputStream(tmpFile))) {
-            OpenDocumentSpreadsheetCreator.storeOpenDocumentSpreadsheetFile(file, in);
+        try (
+            BufferedInputStream in = new BufferedInputStream(
+                new FileInputStream(tmpFile)
+            )
+        ) {
+            OpenDocumentSpreadsheetCreator.storeOpenDocumentSpreadsheetFile(
+                file,
+                in
+            );
         }
         // Delete the temporary file:
         if (!tmpFile.delete()) {
@@ -98,22 +128,43 @@ 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) {
-        OpenDocumentRepresentation od = new OpenDocumentRepresentation(database, entries);
-
-        try (Writer ps = new OutputStreamWriter(new FileOutputStream(tmpFile), StandardCharsets.UTF_8)) {
+    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
+            )
+        ) {
             DOMSource source = new DOMSource(od.getDOMrepresentation());
             StreamResult result = new StreamResult(ps);
-            Transformer trans = TransformerFactory.newInstance().newTransformer();
+            Transformer trans = TransformerFactory
+                .newInstance()
+                .newTransformer();
             trans.setOutputProperty(OutputKeys.INDENT, "yes");
             trans.transform(source, result);
         } catch (Exception e) {
@@ -121,7 +172,11 @@ 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 0ab35a55bd0..1543647fde5 100644
--- a/src/main/java/org/jabref/logic/exporter/OpenOfficeDocumentCreator.java
+++ b/src/main/java/org/jabref/logic/exporter/OpenOfficeDocumentCreator.java
@@ -18,34 +18,42 @@
 import java.util.Objects;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipOutputStream;
-
 import javax.xml.transform.OutputKeys;
 import javax.xml.transform.Transformer;
 import javax.xml.transform.TransformerFactory;
 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);
+    private static final Logger LOGGER = LoggerFactory.getLogger(
+        OpenOfficeDocumentCreator.class
+    );
 
     /**
      * Creates a new instance of OpenOfficeDocumentCreator
      */
     public OpenOfficeDocumentCreator() {
-        super("oocalc", "Old OpenOffice/LibreOffice Calc format", StandardFileType.SXC);
+        super(
+            "oocalc",
+            "Old OpenOffice/LibreOffice Calc format",
+            StandardFileType.SXC
+        );
     }
 
-    private static void storeOpenOfficeFile(Path file, InputStream source) throws Exception {
-        try (ZipOutputStream out = new ZipOutputStream(new BufferedOutputStream(Files.newOutputStream(file)))) {
+    private static void storeOpenOfficeFile(Path file, InputStream source)
+        throws Exception {
+        try (
+            ZipOutputStream out = new ZipOutputStream(
+                new BufferedOutputStream(Files.newOutputStream(file))
+            )
+        ) {
             ZipEntry zipEntry = new ZipEntry("content.xml");
             out.putNextEntry(zipEntry);
             int c;
@@ -56,20 +64,43 @@ 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);
+        OpenOfficeDocumentCreator.exportOpenOfficeCalcXML(
+            tmpFile,
+            database,
+            entries
+        );
 
         // Then add the content to the zip file:
-        try (BufferedInputStream in = new BufferedInputStream(new FileInputStream(tmpFile))) {
+        try (
+            BufferedInputStream in = new BufferedInputStream(
+                new FileInputStream(tmpFile)
+            )
+        ) {
             OpenOfficeDocumentCreator.storeOpenOfficeFile(file, in);
         }
 
@@ -80,22 +111,40 @@ 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();
+            Transformer trans = TransformerFactory
+                .newInstance()
+                .newTransformer();
             trans.setOutputProperty(OutputKeys.INDENT, "yes");
             trans.transform(source, result);
         } catch (Exception e) {
@@ -103,7 +152,11 @@ 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 358659113e5..76b6ab52dec 100644
--- a/src/main/java/org/jabref/logic/exporter/SaveConfiguration.java
+++ b/src/main/java/org/jabref/logic/exporter/SaveConfiguration.java
@@ -13,10 +13,12 @@ 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,10 +26,12 @@ public SaveConfiguration(SaveOrder saveOrder,
     }
 
     public SaveConfiguration() {
-        this(SaveOrder.getDefaultSaveOrder(),
-                false,
-                BibDatabaseWriter.SaveType.WITH_JABREF_META_DATA,
-                false);
+        this(
+            SaveOrder.getDefaultSaveOrder(),
+            false,
+            BibDatabaseWriter.SaveType.WITH_JABREF_META_DATA,
+            false
+        );
     }
 
     public SaveOrder getSaveOrder() {
@@ -57,7 +61,9 @@ public BibDatabaseWriter.SaveType getSaveType() {
         return saveType;
     }
 
-    public SaveConfiguration withSaveType(BibDatabaseWriter.SaveType newSaveType) {
+    public SaveConfiguration withSaveType(
+        BibDatabaseWriter.SaveType newSaveType
+    ) {
         this.saveType = newSaveType;
         return this;
     }
diff --git a/src/main/java/org/jabref/logic/exporter/SaveException.java b/src/main/java/org/jabref/logic/exporter/SaveException.java
index b3e8c2171c9..a1104b8a921 100644
--- a/src/main/java/org/jabref/logic/exporter/SaveException.java
+++ b/src/main/java/org/jabref/logic/exporter/SaveException.java
@@ -10,10 +10,15 @@
 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"));
+        "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;
@@ -46,7 +51,12 @@ public SaveException(String message, BibEntry entry) {
         this.entry = entry;
     }
 
-    public SaveException(String message, String localizedMessage, BibEntry entry, Throwable base) {
+    public SaveException(
+        String message,
+        String localizedMessage,
+        BibEntry entry,
+        Throwable base
+    ) {
         super(message, base);
         this.localizedMessage = localizedMessage;
         this.entry = entry;
diff --git a/src/main/java/org/jabref/logic/exporter/SelfContainedSaveConfiguration.java b/src/main/java/org/jabref/logic/exporter/SelfContainedSaveConfiguration.java
index 1e5cb241a1e..8b06a9b1e26 100644
--- a/src/main/java/org/jabref/logic/exporter/SelfContainedSaveConfiguration.java
+++ b/src/main/java/org/jabref/logic/exporter/SelfContainedSaveConfiguration.java
@@ -7,15 +7,17 @@
  * This is a {@link SaveOrder} where the contained saveConfiguration is a {@link org.jabref.model.metadata.SelfContainedSaveOrder}
  */
 public class SelfContainedSaveConfiguration extends SaveConfiguration {
+
     public SelfContainedSaveConfiguration() {
         super();
     }
 
     public SelfContainedSaveConfiguration(
-            SelfContainedSaveOrder saveOrder,
-            Boolean makeBackup,
-            BibDatabaseWriter.SaveType saveType,
-            Boolean reformatFile) {
+        SelfContainedSaveOrder saveOrder,
+        Boolean makeBackup,
+        BibDatabaseWriter.SaveType saveType,
+        Boolean reformatFile
+    ) {
         super(saveOrder, makeBackup, saveType, reformatFile);
     }
 
diff --git a/src/main/java/org/jabref/logic/exporter/TemplateExporter.java b/src/main/java/org/jabref/logic/exporter/TemplateExporter.java
index d9d0c33766d..b3045a24842 100644
--- a/src/main/java/org/jabref/logic/exporter/TemplateExporter.java
+++ b/src/main/java/org/jabref/logic/exporter/TemplateExporter.java
@@ -15,7 +15,6 @@
 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,7 +29,6 @@
 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;
 
@@ -46,7 +44,9 @@ public class TemplateExporter extends Exporter {
     private static final String BEGIN_INFIX = ".begin";
     private static final String END_INFIX = ".end";
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(TemplateExporter.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(
+        TemplateExporter.class
+    );
 
     private final String lfFileName;
     private final String directory;
@@ -64,12 +64,23 @@ 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) {
-        this(displayName, consoleName, lfFileName, directory, extension, null, null, null);
+    public TemplateExporter(
+        String displayName,
+        String consoleName,
+        String lfFileName,
+        String directory,
+        FileType extension
+    ) {
+        this(
+            displayName,
+            consoleName,
+            lfFileName,
+            directory,
+            extension,
+            null,
+            null,
+            null
+        );
     }
 
     /**
@@ -79,18 +90,22 @@ 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,
-                name,
-                lfFileName,
-                null,
-                StandardFileType.fromExtensions(extension),
-                layoutPreferences,
-                saveOrder);
+    public TemplateExporter(
+        String name,
+        String lfFileName,
+        String extension,
+        LayoutFormatterPreferences layoutPreferences,
+        SelfContainedSaveOrder saveOrder
+    ) {
+        this(
+            name,
+            name,
+            lfFileName,
+            null,
+            StandardFileType.fromExtensions(extension),
+            layoutPreferences,
+            saveOrder
+        );
     }
 
     /**
@@ -102,14 +117,25 @@ 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,23 +149,30 @@ 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;
         }
         this.directory = directory;
         this.layoutPreferences = layoutPreferences;
-        this.saveOrder = saveOrder == null ? SaveOrder.getDefaultSaveOrder() : saveOrder;
+        this.saveOrder =
+            saveOrder == null ? SaveOrder.getDefaultSaveOrder() : saveOrder;
         this.blankLineBehaviour = blankLineBehaviour;
     }
 
@@ -192,16 +225,28 @@ 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);
 
@@ -221,8 +266,17 @@ public void export(final BibDatabaseContext databaseContext,
             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);
+            try (
+                Reader reader = getReader(
+                    lfFileName + BEGIN_INFIX + LAYOUT_EXTENSION
+                )
+            ) {
+                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
@@ -238,19 +292,31 @@ public void export(final BibDatabaseContext databaseContext,
              * Write database entries; entries will be sorted as they appear on the
              * screen, or sorted by author, depending on Preferences.
              */
-            List<BibEntry> sorted = BibDatabaseWriter.getSortedEntries(entries, saveOrder);
+            List<BibEntry> sorted = BibDatabaseWriter.getSortedEntries(
+                entries,
+                saveOrder
+            );
 
             // Load default layout
             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) {
                 missingFormatters.addAll(defLayout.getMissingFormatters());
                 if (!missingFormatters.isEmpty()) {
-                    LOGGER.warn("Missing formatters found: {}", missingFormatters);
+                    LOGGER.warn(
+                        "Missing formatters found: {}",
+                        missingFormatters
+                    );
                 }
             }
             Map<EntryType, Layout> layouts = new HashMap<>();
@@ -264,13 +330,25 @@ 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) {
-                            missingFormatters.addAll(layout.getMissingFormatters());
+                            missingFormatters.addAll(
+                                layout.getMissingFormatters()
+                            );
                         }
                     } catch (IOException ex) {
                         // The exception indicates that no type-specific layout
@@ -282,23 +360,42 @@ 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);
+                    if (
+                        blankLineBehaviour == BlankLineBehaviour.DELETE_BLANKS
+                    ) {
+                        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);
                             }
                         }
                     } else {
-                        ps.write(layout.doLayout(entry, databaseContext.getDatabase()));
+                        ps.write(
+                            layout.doLayout(
+                                entry,
+                                databaseContext.getDatabase()
+                            )
+                        );
                     }
                 }
             }
 
             // Print footer
             Layout endLayout = null;
-            try (Reader reader = getReader(lfFileName + END_INFIX + LAYOUT_EXTENSION)) {
-                layoutHelper = new LayoutHelper(reader, fileDirForDatabase, layoutPreferences, abbreviationRepository);
+            try (
+                Reader reader = getReader(
+                    lfFileName + END_INFIX + LAYOUT_EXTENSION
+                )
+            ) {
+                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
@@ -314,7 +411,10 @@ public void export(final BibDatabaseContext databaseContext,
             layoutPreferences.clearCustomExportNameFormatters();
 
             if (!missingFormatters.isEmpty() && LOGGER.isWarnEnabled()) {
-                LOGGER.warn("Formatters {} not found", String.join(", ", missingFormatters));
+                LOGGER.warn(
+                    "Formatters {} not found",
+                    String.join(", ", missingFormatters)
+                );
             }
         }
     }
@@ -326,7 +426,12 @@ public void export(final BibDatabaseContext databaseContext,
     private void readFormatterFile() {
         Path formatterFile = Path.of(lfFileName + FORMATTERS_EXTENSION);
         if (Files.exists(formatterFile)) {
-            try (Reader in = Files.newBufferedReader(formatterFile, StandardCharsets.UTF_8)) {
+            try (
+                Reader in = Files.newBufferedReader(
+                    formatterFile,
+                    StandardCharsets.UTF_8
+                )
+            ) {
                 // Ok, we found and opened the file. Read all contents:
                 StringBuilder sb = new StringBuilder();
                 int c;
@@ -345,7 +450,10 @@ private void readFormatterFile() {
                     if ((index > 0) && ((index + 1) < line.length())) {
                         String formatterName = line.substring(0, index);
                         String contents = line.substring(index + 1);
-                        layoutPreferences.putCustomExportNameFormatter(formatterName, contents);
+                        layoutPreferences.putCustomExportNameFormatter(
+                            formatterName,
+                            contents
+                        );
                     }
                 }
             } catch (IOException ex) {
diff --git a/src/main/java/org/jabref/logic/exporter/XmpExporter.java b/src/main/java/org/jabref/logic/exporter/XmpExporter.java
index 23730852ee0..7c7e77445c3 100644
--- a/src/main/java/org/jabref/logic/exporter/XmpExporter.java
+++ b/src/main/java/org/jabref/logic/exporter/XmpExporter.java
@@ -6,7 +6,6 @@
 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;
@@ -36,7 +35,11 @@ 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);
@@ -47,11 +50,21 @@ public void export(BibDatabaseContext databaseContext, Path file, List<BibEntry>
 
         // 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)) {
+        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 {
@@ -64,8 +77,10 @@ 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);
+    private void writeBibToXmp(Path file, List<BibEntry> entries)
+        throws IOException {
+        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 e9eaeeb56a0..06b3bf050c7 100644
--- a/src/main/java/org/jabref/logic/exporter/XmpPdfExporter.java
+++ b/src/main/java/org/jabref/logic/exporter/XmpPdfExporter.java
@@ -5,34 +5,43 @@
 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;
 
 public class XmpPdfExporter extends Exporter {
-    private static final Logger LOGGER = LoggerFactory.getLogger(XmpPdfExporter.class);
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(
+        XmpPdfExporter.class
+    );
 
     private final XmpPreferences xmpPreferences;
 
     public XmpPdfExporter(XmpPreferences xmpPreferences) {
-        super("pdf", Localization.lang("XMP-annotated PDF"), StandardFileType.PDF);
+        super(
+            "pdf",
+            Localization.lang("XMP-annotated PDF"),
+            StandardFileType.PDF
+        );
         this.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);
@@ -44,18 +53,29 @@ public void export(BibDatabaseContext databaseContext, Path pdfFile, List<BibEnt
                 PDPage page = new PDPage();
                 document.addPage(page);
 
-                try (PDPageContentStream contentStream = new PDPageContentStream(document, page)) {
+                try (
+                    PDPageContentStream contentStream = new PDPageContentStream(
+                        document,
+                        page
+                    )
+                ) {
                     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.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.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/ExternalFilesContentImporter.java b/src/main/java/org/jabref/logic/externalfiles/ExternalFilesContentImporter.java
index e75b1df2683..7e1323f8383 100644
--- a/src/main/java/org/jabref/logic/externalfiles/ExternalFilesContentImporter.java
+++ b/src/main/java/org/jabref/logic/externalfiles/ExternalFilesContentImporter.java
@@ -2,7 +2,6 @@
 
 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;
@@ -13,19 +12,29 @@ public class ExternalFilesContentImporter {
 
     private final ImportFormatPreferences importFormatPreferences;
 
-    public ExternalFilesContentImporter(ImportFormatPreferences importFormatPreferences) {
+    public ExternalFilesContentImporter(
+        ImportFormatPreferences importFormatPreferences
+    ) {
         this.importFormatPreferences = importFormatPreferences;
     }
 
     public ParserResult importPDFContent(Path file) {
         try {
-            return new PdfMergeMetadataImporter(importFormatPreferences).importDatabase(file);
+            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 {
-        return OpenDatabase.loadDatabase(bibFile, importFormatPreferences, fileUpdateMonitor);
+    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 ae53b953352..12a106994d6 100644
--- a/src/main/java/org/jabref/logic/externalfiles/LinkedFileHandler.java
+++ b/src/main/java/org/jabref/logic/externalfiles/LinkedFileHandler.java
@@ -8,19 +8,19 @@
 import java.util.Objects;
 import java.util.Optional;
 import java.util.stream.Stream;
-
 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.jabref.preferences.FilePreferences;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 public class LinkedFileHandler {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(LinkedFileHandler.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(
+        LinkedFileHandler.class
+    );
 
     private final BibDatabaseContext databaseContext;
     private final FilePreferences filePreferences;
@@ -28,10 +28,12 @@ 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);
@@ -39,12 +41,16 @@ public LinkedFileHandler(LinkedFile fileEntry,
     }
 
     public boolean moveToDefaultDirectory() throws IOException {
-        Optional<Path> targetDirectory = databaseContext.getFirstExistingFileDir(filePreferences);
+        Optional<Path> targetDirectory =
+            databaseContext.getFirstExistingFileDir(filePreferences);
         if (targetDirectory.isEmpty()) {
             return false;
         }
 
-        Optional<Path> oldFile = fileEntry.findIn(databaseContext, filePreferences);
+        Optional<Path> oldFile = fileEntry.findIn(
+            databaseContext,
+            filePreferences
+        );
         if (oldFile.isEmpty()) {
             // Could not find file
             return false;
@@ -52,16 +58,25 @@ public boolean moveToDefaultDirectory() throws IOException {
 
         String targetDirectoryName = "";
         if (!filePreferences.getFileDirectoryPattern().isEmpty()) {
-            targetDirectoryName = FileUtil.createDirNameFromPattern(
+            targetDirectoryName =
+                FileUtil.createDirNameFromPattern(
                     databaseContext.getDatabase(),
                     entry,
-                    filePreferences.getFileDirectoryPattern());
+                    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
@@ -80,8 +95,14 @@ public boolean renameToSuggestedName() throws IOException {
         return renameToName(getSuggestedFileName(), false);
     }
 
-    public boolean renameToName(String targetFileName, boolean overwriteExistingFile) throws IOException {
-        Optional<Path> oldFile = fileEntry.findIn(databaseContext, filePreferences);
+    public boolean renameToName(
+        String targetFileName,
+        boolean overwriteExistingFile
+    ) throws IOException {
+        Optional<Path> oldFile = fileEntry.findIn(
+            databaseContext,
+            filePreferences
+        );
         if (oldFile.isEmpty()) {
             return false;
         }
@@ -90,17 +111,30 @@ 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
         // 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);
+        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
+            );
             return false;
         }
 
-        if (Files.exists(newPath) && !pathsDifferOnlyByCase && overwriteExistingFile) {
+        if (
+            Files.exists(newPath) &&
+            !pathsDifferOnlyByCase &&
+            overwriteExistingFile
+        ) {
             Files.createDirectories(newPath.getParent());
             LOGGER.debug("Overwriting existing file {}", newPath);
             Files.move(oldPath, newPath, StandardCopyOption.REPLACE_EXISTING);
@@ -116,21 +150,32 @@ public boolean renameToName(String targetFileName, boolean overwriteExistingFile
     }
 
     private String relativize(Path path) {
-        List<Path> fileDirectories = databaseContext.getFileDirectories(filePreferences);
+        List<Path> fileDirectories = databaseContext.getFileDirectories(
+            filePreferences
+        );
         return FileUtil.relativize(path, fileDirectories).toString();
     }
 
     public String getSuggestedFileName() {
         String oldFileName = fileEntry.getLink();
 
-        String extension = FileUtil.getFileExtension(oldFileName).orElse(fileEntry.getFileType());
+        String extension = FileUtil
+            .getFileExtension(oldFileName)
+            .orElse(fileEntry.getFileType());
         return getSuggestedFileName(extension);
     }
 
     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);
@@ -142,19 +187,37 @@ 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 flEntry, BibEntry entry, String targetFileName) {
+    public Optional<Path> findExistingFile(
+        LinkedFile flEntry,
+        BibEntry entry,
+        String targetFileName
+    ) {
         // The .get() is legal without check because the method will always return a value.
-        Path targetFilePath = flEntry.findIn(databaseContext, filePreferences)
-                                     .get().getParent().resolve(targetFileName);
-        Path oldFilePath = flEntry.findIn(databaseContext, filePreferences).get();
+        Path targetFilePath = flEntry
+            .findIn(databaseContext, filePreferences)
+            .get()
+            .getParent()
+            .resolve(targetFileName);
+        Path oldFilePath = flEntry
+            .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);
+            LOGGER.error(
+                "Could not get the list of files in target directory",
+                e
+            );
         }
         return matchedByDiffCase;
     }
diff --git a/src/main/java/org/jabref/logic/formatter/Formatters.java b/src/main/java/org/jabref/logic/formatter/Formatters.java
index ad57b7f6202..74df450768f 100644
--- a/src/main/java/org/jabref/logic/formatter/Formatters.java
+++ b/src/main/java/org/jabref/logic/formatter/Formatters.java
@@ -6,7 +6,6 @@
 import java.util.Objects;
 import java.util.Optional;
 import java.util.regex.Pattern;
-
 import org.jabref.logic.cleanup.Formatter;
 import org.jabref.logic.formatter.bibtexfields.CleanupUrlFormatter;
 import org.jabref.logic.formatter.bibtexfields.ClearFormatter;
@@ -38,49 +37,51 @@
 import org.jabref.logic.layout.format.ReplaceUnicodeLigaturesFormatter;
 
 public class Formatters {
-    private static final Pattern TRUNCATE_PATTERN = Pattern.compile("\\Atruncate\\d+\\z");
 
-    private Formatters() {
-    }
+    private static final Pattern TRUNCATE_PATTERN = Pattern.compile(
+        "\\Atruncate\\d+\\z"
+    );
+
+    private Formatters() {}
 
     public static List<Formatter> getConverters() {
         return Arrays.asList(
-                new HtmlToLatexFormatter(),
-                new HtmlToUnicodeFormatter(),
-                new LatexToUnicodeFormatter(),
-                new UnicodeToLatexFormatter()
+            new HtmlToLatexFormatter(),
+            new HtmlToUnicodeFormatter(),
+            new LatexToUnicodeFormatter(),
+            new UnicodeToLatexFormatter()
         );
     }
 
     public static List<Formatter> getCaseChangers() {
         return Arrays.asList(
-                new CapitalizeFormatter(),
-                new LowerCaseFormatter(),
-                new SentenceCaseFormatter(),
-                new TitleCaseFormatter(),
-                new UpperCaseFormatter()
+            new CapitalizeFormatter(),
+            new LowerCaseFormatter(),
+            new SentenceCaseFormatter(),
+            new TitleCaseFormatter(),
+            new UpperCaseFormatter()
         );
     }
 
     public static List<Formatter> getOthers() {
         return Arrays.asList(
-                new ClearFormatter(),
-                new CleanupUrlFormatter(),
-                new LatexCleanupFormatter(),
-                new MinifyNameListFormatter(),
-                new NormalizeDateFormatter(),
-                new NormalizeMonthFormatter(),
-                new NormalizeNamesFormatter(),
-                new NormalizePagesFormatter(),
-                new OrdinalsToSuperscriptFormatter(),
-                new RemoveBracesFormatter(),
-                new UnitsToLatexFormatter(),
-                new EscapeUnderscoresFormatter(),
-                new EscapeAmpersandsFormatter(),
-                new EscapeDollarSignFormatter(),
-                new ShortenDOIFormatter(),
-                new ReplaceUnicodeLigaturesFormatter(),
-                new UnprotectTermsFormatter()
+            new ClearFormatter(),
+            new CleanupUrlFormatter(),
+            new LatexCleanupFormatter(),
+            new MinifyNameListFormatter(),
+            new NormalizeDateFormatter(),
+            new NormalizeMonthFormatter(),
+            new NormalizeNamesFormatter(),
+            new NormalizePagesFormatter(),
+            new OrdinalsToSuperscriptFormatter(),
+            new RemoveBracesFormatter(),
+            new UnitsToLatexFormatter(),
+            new EscapeUnderscoresFormatter(),
+            new EscapeAmpersandsFormatter(),
+            new EscapeDollarSignFormatter(),
+            new ShortenDOIFormatter(),
+            new ReplaceUnicodeLigaturesFormatter(),
+            new UnprotectTermsFormatter()
         );
     }
 
@@ -115,7 +116,10 @@ public static Optional<Formatter> getFormatterForModifier(String modifier) {
             int truncateAfter = Integer.parseInt(modifier.substring(8));
             return Optional.of(new TruncateFormatter(truncateAfter));
         } else {
-            return getAll().stream().filter(f -> f.getKey().equals(modifier)).findAny();
+            return getAll()
+                .stream()
+                .filter(f -> f.getKey().equals(modifier))
+                .findAny();
         }
     }
 }
diff --git a/src/main/java/org/jabref/logic/formatter/IdentityFormatter.java b/src/main/java/org/jabref/logic/formatter/IdentityFormatter.java
index c5f63de22fa..212c63777ca 100644
--- a/src/main/java/org/jabref/logic/formatter/IdentityFormatter.java
+++ b/src/main/java/org/jabref/logic/formatter/IdentityFormatter.java
@@ -1,7 +1,6 @@
 package org.jabref.logic.formatter;
 
 import java.util.Objects;
-
 import org.jabref.logic.cleanup.Formatter;
 import org.jabref.logic.l10n.Localization;
 
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 3d787e1f28b..567eec4ae92 100644
--- a/src/main/java/org/jabref/logic/formatter/bibtexfields/AddBracesFormatter.java
+++ b/src/main/java/org/jabref/logic/formatter/bibtexfields/AddBracesFormatter.java
@@ -1,7 +1,6 @@
 package org.jabref.logic.formatter.bibtexfields;
 
 import java.util.Objects;
-
 import org.jabref.logic.cleanup.Formatter;
 import org.jabref.logic.l10n.Localization;
 
@@ -21,7 +20,11 @@ public String getKey() {
     public String format(String value) {
         Objects.requireNonNull(value);
 
-        if ((value.length() >= 2) && (value.charAt(0) != '{') && (value.charAt(value.length() - 1) != '}')) {
+        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 {
@@ -31,7 +34,9 @@ public String format(String value) {
 
     @Override
     public String getDescription() {
-        return Localization.lang("Add braces encapsulating the complete field content.");
+        return Localization.lang(
+            "Add braces encapsulating the complete field content."
+        );
     }
 
     @Override
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 d14596de208..2b8fbd66e81 100644
--- a/src/main/java/org/jabref/logic/formatter/bibtexfields/CleanupUrlFormatter.java
+++ b/src/main/java/org/jabref/logic/formatter/bibtexfields/CleanupUrlFormatter.java
@@ -6,7 +6,6 @@
 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;
 
@@ -19,7 +18,9 @@
 public class CleanupUrlFormatter extends Formatter {
 
     // This regexp find "url=" or "to=" parameter in full link and get text after them
-    private static final Pattern PATTERN_URL = Pattern.compile("(?:url|to)=([^&]*)");
+    private static final Pattern PATTERN_URL = Pattern.compile(
+        "(?:url|to)=([^&]*)"
+    );
 
     @Override
     public String getName() {
@@ -50,8 +51,8 @@ public String getKey() {
     @Override
     public String format(String url) {
         var toDecode = Objects
-                .requireNonNull(url, "Null url")
-                .replaceAll("\\+", "%2b");
+            .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 +62,19 @@ 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 ec54760965b..c9360a601b5 100644
--- a/src/main/java/org/jabref/logic/formatter/bibtexfields/ClearFormatter.java
+++ b/src/main/java/org/jabref/logic/formatter/bibtexfields/ClearFormatter.java
@@ -1,7 +1,6 @@
 package org.jabref.logic.formatter.bibtexfields;
 
 import java.util.Objects;
-
 import org.jabref.logic.cleanup.Formatter;
 import org.jabref.logic.l10n.Localization;
 
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 bc9423ea08a..e401c6811ff 100644
--- a/src/main/java/org/jabref/logic/formatter/bibtexfields/EscapeAmpersandsFormatter.java
+++ b/src/main/java/org/jabref/logic/formatter/bibtexfields/EscapeAmpersandsFormatter.java
@@ -1,7 +1,6 @@
 package org.jabref.logic.formatter.bibtexfields;
 
 import java.util.Objects;
-
 import org.jabref.logic.cleanup.Formatter;
 import org.jabref.logic.l10n.Localization;
 
@@ -38,7 +37,9 @@ public String format(String value) {
                 if (!inCommandOption) {
                     commandName.append(c);
                 }
-            } else if (Character.isWhitespace(c) && (inCommand || inCommandOption)) {
+            } else if (
+                Character.isWhitespace(c) && (inCommand || inCommandOption)
+            ) {
                 // Whitespace
             } else if (inCommandName) {
                 // This means the command name is ended.
@@ -62,7 +63,9 @@ public String format(String value) {
                 if ("begin".contentEquals(commandName)) {
                     nestedEnvironments++;
                 }
-                if ((nestedEnvironments > 0) && "end".contentEquals(commandName)) {
+                if (
+                    (nestedEnvironments > 0) && "end".contentEquals(commandName)
+                ) {
                     nestedEnvironments--;
                 }
 
@@ -72,8 +75,12 @@ 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))
-                    && (nestedEnvironments == 0)) {
+            if (
+                (c == '&') &&
+                !escape &&
+                !(inCommand && "url".contentEquals(commandName)) &&
+                (nestedEnvironments == 0)
+            ) {
                 result.append("\\&");
             } else {
                 result.append(c);
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 d3f53708614..445cf04aeb5 100644
--- a/src/main/java/org/jabref/logic/formatter/bibtexfields/EscapeDollarSignFormatter.java
+++ b/src/main/java/org/jabref/logic/formatter/bibtexfields/EscapeDollarSignFormatter.java
@@ -2,7 +2,6 @@
 
 import java.util.Objects;
 import java.util.regex.Matcher;
-
 import org.jabref.logic.cleanup.Formatter;
 import org.jabref.logic.l10n.Localization;
 
@@ -21,7 +20,10 @@ public String getKey() {
     @Override
     public String format(String value) {
         Objects.requireNonNull(value);
-        return value.replaceAll("(?<!\\\\)\\$", Matcher.quoteReplacement("\\$"));
+        return value.replaceAll(
+            "(?<!\\\\)\\$",
+            Matcher.quoteReplacement("\\$")
+        );
     }
 
     @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 8a5a3c1a3b4..9bcd8fa054b 100644
--- a/src/main/java/org/jabref/logic/formatter/bibtexfields/EscapeUnderscoresFormatter.java
+++ b/src/main/java/org/jabref/logic/formatter/bibtexfields/EscapeUnderscoresFormatter.java
@@ -2,7 +2,6 @@
 
 import java.util.Objects;
 import java.util.regex.Pattern;
-
 import org.jabref.logic.cleanup.Formatter;
 import org.jabref.logic.l10n.Localization;
 
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 33664983425..eb7b255be3e 100644
--- a/src/main/java/org/jabref/logic/formatter/bibtexfields/HtmlToLatexFormatter.java
+++ b/src/main/java/org/jabref/logic/formatter/bibtexfields/HtmlToLatexFormatter.java
@@ -4,24 +4,30 @@
 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;
 
 public class HtmlToLatexFormatter extends Formatter implements LayoutFormatter {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(HtmlToLatexFormatter.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(
+        HtmlToLatexFormatter.class
+    );
 
     private static final int MAX_TAG_LENGTH = 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_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_PATTERN4 = Pattern.compile("&(\\w+);");
 
     @Override
@@ -34,8 +40,16 @@ public String format(String text) {
 
         StringBuilder sb = new StringBuilder();
         // 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\\}");
+        result =
+            result.replaceAll(
+                "<[ ]?sup>([^<]+)</sup>",
+                "\\\\textsuperscript\\{$1\\}"
+            );
+        result =
+            result.replaceAll(
+                "<[ ]?sub>([^<]+)</sub>",
+                "\\\\textsubscript\\{$1\\}"
+            );
 
         // TODO: maybe rewrite this based on regular expressions instead
         // Note that (at least) the IEEE Xplore fetcher must be fixed as it relies on the current way to
@@ -57,18 +71,34 @@ public String format(String text) {
         result = sb.toString();
 
         // Handle text based HTML entities
-        Set<String> patterns = HTMLUnicodeConversionMaps.HTML_LATEX_CONVERSION_MAP.keySet();
+        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
         Matcher m = ESCAPED_PATTERN.matcher(result);
         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.replace("&#" + m.group(1) + m.group(2) + m.group(3) + ";",
-                        HTMLUnicodeConversionMaps.NUMERICAL_LATEX_CONVERSION_MAP.get(num));
+            if (
+                HTMLUnicodeConversionMaps.NUMERICAL_LATEX_CONVERSION_MAP.containsKey(
+                    num
+                )
+            ) {
+                result =
+                    result.replace(
+                        "&#" + m.group(1) + m.group(2) + m.group(3) + ";",
+                        HTMLUnicodeConversionMaps.NUMERICAL_LATEX_CONVERSION_MAP.get(
+                            num
+                        )
+                    );
             }
         }
 
@@ -78,14 +108,46 @@ 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) +
+                            "}}"
+                        );
                 }
             }
         }
@@ -94,7 +156,14 @@ 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 5ff4e95bb71..27fc6839c07 100644
--- a/src/main/java/org/jabref/logic/formatter/bibtexfields/HtmlToUnicodeFormatter.java
+++ b/src/main/java/org/jabref/logic/formatter/bibtexfields/HtmlToUnicodeFormatter.java
@@ -1,14 +1,15 @@
 package org.jabref.logic.formatter.bibtexfields;
 
+import org.apache.commons.lang3.StringEscapeUtils;
 import org.jabref.architecture.ApacheCommonsLang3Allowed;
 import org.jabref.logic.cleanup.Formatter;
 import org.jabref.logic.l10n.Localization;
 import org.jabref.logic.layout.LayoutFormatter;
 
-import org.apache.commons.lang3.StringEscapeUtils;
-
 @ApacheCommonsLang3Allowed("There is no equivalent in Google's Guava")
-public class HtmlToUnicodeFormatter extends Formatter implements LayoutFormatter {
+public class HtmlToUnicodeFormatter
+    extends Formatter
+    implements LayoutFormatter {
 
     @Override
     public String getName() {
@@ -33,6 +34,8 @@ public String getExampleInput() {
     @Override
     public String format(String fieldText) {
         // StringEscapeUtils converts characters and regex kills tags
-        return StringEscapeUtils.unescapeHtml4(fieldText).replaceAll("<[^>]*>", "");
+        return StringEscapeUtils
+            .unescapeHtml4(fieldText)
+            .replaceAll("<[^>]*>", "");
     }
 }
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 5415156bb7b..db79317b5fd 100644
--- a/src/main/java/org/jabref/logic/formatter/bibtexfields/LatexCleanupFormatter.java
+++ b/src/main/java/org/jabref/logic/formatter/bibtexfields/LatexCleanupFormatter.java
@@ -1,7 +1,6 @@
 package org.jabref.logic.formatter.bibtexfields;
 
 import java.util.regex.Pattern;
-
 import org.jabref.logic.cleanup.Formatter;
 import org.jabref.logic.l10n.Localization;
 
@@ -10,14 +9,24 @@
  */
 public class LatexCleanupFormatter extends Formatter {
 
-    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 ESCAPE_PERCENT_SIGN_ONCE = Pattern.compile("(^|[^\\\\%])%");
+    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 ESCAPE_PERCENT_SIGN_ONCE = Pattern.compile(
+        "(^|[^\\\\%])%"
+    );
 
     @Override
     public String getName() {
@@ -40,18 +49,24 @@ public String format(String oldString) {
         // 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 =
+            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 =
+            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 385b36996ca..d2f2f4a7a00 100644
--- a/src/main/java/org/jabref/logic/formatter/bibtexfields/NormalizeDateFormatter.java
+++ b/src/main/java/org/jabref/logic/formatter/bibtexfields/NormalizeDateFormatter.java
@@ -1,7 +1,6 @@
 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;
@@ -10,6 +9,7 @@
  * This class transforms date to the format yyyy-mm-dd or yyyy-mm..
  */
 public class NormalizeDateFormatter extends Formatter {
+
     @Override
     public String getName() {
         return Localization.lang("Normalize date");
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 5dcc74847d2..1e2d7dd630b 100644
--- a/src/main/java/org/jabref/logic/formatter/bibtexfields/NormalizeMonthFormatter.java
+++ b/src/main/java/org/jabref/logic/formatter/bibtexfields/NormalizeMonthFormatter.java
@@ -2,7 +2,6 @@
 
 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;
@@ -28,7 +27,9 @@ public String format(String value) {
 
     @Override
     public String getDescription() {
-        return Localization.lang("Normalize month to BibTeX standard abbreviation.");
+        return Localization.lang(
+            "Normalize month to BibTeX standard abbreviation."
+        );
     }
 
     @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 10383eb983d..809967719b6 100644
--- a/src/main/java/org/jabref/logic/formatter/bibtexfields/NormalizeNamesFormatter.java
+++ b/src/main/java/org/jabref/logic/formatter/bibtexfields/NormalizeNamesFormatter.java
@@ -1,7 +1,6 @@
 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;
@@ -30,7 +29,9 @@ public String format(String nameList) {
 
     @Override
     public String getDescription() {
-        return Localization.lang("Normalizes lists of persons to the BibTeX standard.");
+        return Localization.lang(
+            "Normalizes lists of persons to the BibTeX standard."
+        );
     }
 
     @Override
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 8bdb2aef9b4..07007cbe411 100644
--- a/src/main/java/org/jabref/logic/formatter/bibtexfields/NormalizePagesFormatter.java
+++ b/src/main/java/org/jabref/logic/formatter/bibtexfields/NormalizePagesFormatter.java
@@ -3,7 +3,6 @@
 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;
@@ -36,10 +35,15 @@
  */
 public class NormalizePagesFormatter extends Formatter {
 
-    private static final Pattern EM_EN_DASH_PATTERN = Pattern.compile("\u2013|\u2014");
-    private static final Pattern DASHES_DETECT_PATTERN = Pattern.compile("[ ]*-+[ ]*");
+    private static final Pattern EM_EN_DASH_PATTERN = Pattern.compile(
+        "\u2013|\u2014"
+    );
+    private static final Pattern DASHES_DETECT_PATTERN = Pattern.compile(
+        "[ ]*-+[ ]*"
+    );
 
-    private final Formatter unprotectTermsFormatter = new UnprotectTermsFormatter();
+    private final Formatter unprotectTermsFormatter =
+        new UnprotectTermsFormatter();
 
     @Override
     public String getName() {
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 ff30823e416..4d22b127c68 100644
--- a/src/main/java/org/jabref/logic/formatter/bibtexfields/OrdinalsToSuperscriptFormatter.java
+++ b/src/main/java/org/jabref/logic/formatter/bibtexfields/OrdinalsToSuperscriptFormatter.java
@@ -3,7 +3,6 @@
 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;
 
@@ -13,10 +12,13 @@
 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}";
+    private static final String SUPERSCRIPT_REPLACE_PATTERN =
+        "$1\\\\textsuperscript{$2}";
 
     @Override
     public String getName() {
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 26859a82699..10df86ab84a 100644
--- a/src/main/java/org/jabref/logic/formatter/bibtexfields/RegexFormatter.java
+++ b/src/main/java/org/jabref/logic/formatter/bibtexfields/RegexFormatter.java
@@ -6,23 +6,30 @@
 import java.util.regex.Matcher;
 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("\\\\\\}");
+    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 Pattern ENCLOSED_IN_CURLY_BRACES = Pattern.compile(
+        "\\{.*?}"
+    );
     private static final String REGEX_CAPTURING_GROUP = "regex";
     private static final String REPLACEMENT_CAPTURING_GROUP = "replacement";
     /**
@@ -30,11 +37,19 @@ public class RegexFormatter extends Formatter {
      * 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 + ">.*)\"\\)$");
+        "^\\(\"(?<" +
+        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');
-    private static final String PLACEHOLDER_FOR_CLOSING_CURLY_BRACE = Character.toString('\u0A16');
+    private static final String PLACEHOLDER_FOR_PROTECTED_GROUP =
+        Character.toString('\u0A14');
+    private static final String PLACEHOLDER_FOR_OPENING_CURLY_BRACE =
+        Character.toString('\u0A15');
+    private static final String PLACEHOLDER_FOR_CLOSING_CURLY_BRACE =
+        Character.toString('\u0A16');
     private final String regex;
     private final String replacement;
 
@@ -50,7 +65,8 @@ public RegexFormatter(String input) {
         Matcher constructorArgument = CONSTRUCTOR_ARGUMENT.matcher(input);
         if (constructorArgument.matches()) {
             regex = constructorArgument.group(REGEX_CAPTURING_GROUP);
-            replacement = constructorArgument.group(REPLACEMENT_CAPTURING_GROUP);
+            replacement =
+                constructorArgument.group(REPLACEMENT_CAPTURING_GROUP);
         } else {
             regex = null;
             replacement = null;
@@ -75,16 +91,23 @@ private String replaceHonoringProtectedGroups(final String input) {
         while (matcher.find()) {
             replaced.add(matcher.group());
         }
-        String workingString = matcher.replaceAll(PLACEHOLDER_FOR_PROTECTED_GROUP);
+        String workingString = matcher.replaceAll(
+            PLACEHOLDER_FOR_PROTECTED_GROUP
+        );
         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;
         }
 
         for (String r : replaced) {
-            workingString = workingString.replaceFirst(PLACEHOLDER_FOR_PROTECTED_GROUP, r);
+            workingString =
+                workingString.replaceFirst(PLACEHOLDER_FOR_PROTECTED_GROUP, r);
         }
         return workingString;
     }
@@ -96,22 +119,35 @@ public String format(final String input) {
             return input;
         }
 
-        Matcher escapedOpeningCurlyBrace = ESCAPED_OPENING_CURLY_BRACE.matcher(input);
-        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);
-
-        final String regexMatchesReplaced = replaceHonoringProtectedGroups(inputWithPlaceholder);
+        Matcher escapedOpeningCurlyBrace = ESCAPED_OPENING_CURLY_BRACE.matcher(
+            input
+        );
+        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
+            );
+
+        final String regexMatchesReplaced = replaceHonoringProtectedGroups(
+            inputWithPlaceholder
+        );
 
         return regexMatchesReplaced
-                .replaceAll(PLACEHOLDER_FOR_OPENING_CURLY_BRACE, "\\\\{")
-                .replaceAll(PLACEHOLDER_FOR_CLOSING_CURLY_BRACE, "\\\\}");
+            .replaceAll(PLACEHOLDER_FOR_OPENING_CURLY_BRACE, "\\\\{")
+            .replaceAll(PLACEHOLDER_FOR_CLOSING_CURLY_BRACE, "\\\\}");
     }
 
     @Override
     public String getDescription() {
-        return Localization.lang("Add a regular expression for the key pattern.");
+        return Localization.lang(
+            "Add a regular expression for the key pattern."
+        );
     }
 
     @Override
diff --git a/src/main/java/org/jabref/logic/formatter/bibtexfields/RemoveBracesFormatter.java b/src/main/java/org/jabref/logic/formatter/bibtexfields/RemoveBracesFormatter.java
index fdbc4f21d09..9e204e4bdcf 100644
--- a/src/main/java/org/jabref/logic/formatter/bibtexfields/RemoveBracesFormatter.java
+++ b/src/main/java/org/jabref/logic/formatter/bibtexfields/RemoveBracesFormatter.java
@@ -1,7 +1,6 @@
 package org.jabref.logic.formatter.bibtexfields;
 
 import java.util.Objects;
-
 import org.jabref.logic.cleanup.Formatter;
 import org.jabref.logic.l10n.Localization;
 
@@ -22,8 +21,11 @@ public String format(String value) {
         Objects.requireNonNull(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
@@ -40,7 +42,9 @@ public String format(String value) {
 
     @Override
     public String getDescription() {
-        return Localization.lang("Removes braces encapsulating the complete field content.");
+        return Localization.lang(
+            "Removes braces encapsulating the complete field content."
+        );
     }
 
     @Override
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 124b7dc8907..7a1b87fbf3c 100644
--- a/src/main/java/org/jabref/logic/formatter/bibtexfields/RemoveDigitsFormatter.java
+++ b/src/main/java/org/jabref/logic/formatter/bibtexfields/RemoveDigitsFormatter.java
@@ -2,7 +2,6 @@
 
 import java.util.Objects;
 import java.util.regex.Pattern;
-
 import org.jabref.logic.cleanup.Formatter;
 import org.jabref.logic.l10n.Localization;
 
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 b31099fcc1a..18c991ccd35 100644
--- a/src/main/java/org/jabref/logic/formatter/bibtexfields/RemoveHyphenatedNewlinesFormatter.java
+++ b/src/main/java/org/jabref/logic/formatter/bibtexfields/RemoveHyphenatedNewlinesFormatter.java
@@ -2,7 +2,6 @@
 
 import java.util.Objects;
 import java.util.regex.Pattern;
-
 import org.jabref.logic.cleanup.Formatter;
 import org.jabref.logic.l10n.Localization;
 
@@ -10,6 +9,7 @@
  * Removes all hyphenated line breaks in the string.
  */
 public class RemoveHyphenatedNewlinesFormatter extends Formatter {
+
     private static final Pattern HYPHENATED_WORDS = Pattern.compile("-\\R");
 
     @Override
@@ -32,7 +32,9 @@ public String format(String value) {
 
     @Override
     public String getDescription() {
-        return Localization.lang("Removes all hyphenated line breaks in the field content.");
+        return Localization.lang(
+            "Removes all hyphenated line breaks in the field content."
+        );
     }
 
     @Override
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 8f24a0aee0e..538d563f40b 100644
--- a/src/main/java/org/jabref/logic/formatter/bibtexfields/RemoveNewlinesFormatter.java
+++ b/src/main/java/org/jabref/logic/formatter/bibtexfields/RemoveNewlinesFormatter.java
@@ -2,7 +2,6 @@
 
 import java.util.Objects;
 import java.util.regex.Pattern;
-
 import org.jabref.logic.cleanup.Formatter;
 import org.jabref.logic.l10n.Localization;
 
@@ -10,6 +9,7 @@
  * Removes all line breaks in the string.
  */
 public class RemoveNewlinesFormatter extends Formatter {
+
     private static final Pattern LINEBREAKS = Pattern.compile("\\R");
 
     @Override
@@ -32,7 +32,9 @@ public String format(String value) {
 
     @Override
     public String getDescription() {
-        return Localization.lang("Removes all line breaks in the field content.");
+        return Localization.lang(
+            "Removes all line breaks in the field content."
+        );
     }
 
     @Override
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 6cdd0ff373b..2b8ce4dedf4 100644
--- a/src/main/java/org/jabref/logic/formatter/bibtexfields/RemoveRedundantSpacesFormatter.java
+++ b/src/main/java/org/jabref/logic/formatter/bibtexfields/RemoveRedundantSpacesFormatter.java
@@ -2,7 +2,6 @@
 
 import java.util.Objects;
 import java.util.regex.Pattern;
-
 import org.jabref.logic.cleanup.Formatter;
 import org.jabref.logic.l10n.Localization;
 
@@ -31,7 +30,9 @@ 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/ReplaceTabsBySpaceFormater.java b/src/main/java/org/jabref/logic/formatter/bibtexfields/ReplaceTabsBySpaceFormater.java
index 3d42f46a68c..d5f1c1d7401 100644
--- a/src/main/java/org/jabref/logic/formatter/bibtexfields/ReplaceTabsBySpaceFormater.java
+++ b/src/main/java/org/jabref/logic/formatter/bibtexfields/ReplaceTabsBySpaceFormater.java
@@ -2,7 +2,6 @@
 
 import java.util.Objects;
 import java.util.regex.Pattern;
-
 import org.jabref.logic.cleanup.Formatter;
 import org.jabref.logic.l10n.Localization;
 
@@ -31,7 +30,9 @@ public String format(String value) {
 
     @Override
     public String getDescription() {
-        return Localization.lang("Replace tabs with space in the field content.");
+        return Localization.lang(
+            "Replace tabs with space in the field content."
+        );
     }
 
     @Override
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 56ee1af1c0f..bf9361fb36c 100644
--- a/src/main/java/org/jabref/logic/formatter/bibtexfields/ShortenDOIFormatter.java
+++ b/src/main/java/org/jabref/logic/formatter/bibtexfields/ShortenDOIFormatter.java
@@ -3,20 +3,22 @@
 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;
 
 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 Logger LOGGER = LoggerFactory.getLogger(
+        ShortenDOIFormatter.class
+    );
+    private static final Predicate<String> SHORT_DOI_FORMAT = Pattern
+        .compile("^10/[a-zA-Z0-9]+$")
+        .asPredicate();
 
     @Override
     public String getName() {
@@ -31,15 +33,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 8f80fdfaeb5..034b90450dc 100644
--- a/src/main/java/org/jabref/logic/formatter/bibtexfields/TrimWhitespaceFormatter.java
+++ b/src/main/java/org/jabref/logic/formatter/bibtexfields/TrimWhitespaceFormatter.java
@@ -1,7 +1,6 @@
 package org.jabref.logic.formatter.bibtexfields;
 
 import java.util.Objects;
-
 import org.jabref.logic.cleanup.Formatter;
 import org.jabref.logic.l10n.Localization;
 
@@ -28,7 +27,9 @@ public String format(String value) {
 
     @Override
     public String getDescription() {
-        return Localization.lang("Trim all whitespace characters in the field content.");
+        return Localization.lang(
+            "Trim all whitespace characters in the field content."
+        );
     }
 
     @Override
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 ee7a663da76..fe5c86799b0 100644
--- a/src/main/java/org/jabref/logic/formatter/bibtexfields/UnicodeToLatexFormatter.java
+++ b/src/main/java/org/jabref/logic/formatter/bibtexfields/UnicodeToLatexFormatter.java
@@ -2,18 +2,20 @@
 
 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;
 
-public class UnicodeToLatexFormatter extends Formatter implements LayoutFormatter {
+public class UnicodeToLatexFormatter
+    extends Formatter
+    implements LayoutFormatter {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(UnicodeToLatexFormatter.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(
+        UnicodeToLatexFormatter.class
+    );
 
     @Override
     public String format(String text) {
@@ -24,9 +26,15 @@ public String format(String text) {
         }
 
         // Standard symbols
-        for (Map.Entry<String, String> unicodeLatexPair : HTMLUnicodeConversionMaps.UNICODE_LATEX_CONVERSION_MAP
-                .entrySet()) {
-            result = result.replace(unicodeLatexPair.getKey(), unicodeLatexPair.getValue());
+        for (Map.Entry<
+            String,
+            String
+        > unicodeLatexPair : HTMLUnicodeConversionMaps.UNICODE_LATEX_CONVERSION_MAP.entrySet()) {
+            result =
+                result.replace(
+                    unicodeLatexPair.getKey(),
+                    unicodeLatexPair.getValue()
+                );
         }
 
         // Combining accents
@@ -36,7 +44,9 @@ public String format(String text) {
             if (!consumed && (i < (result.length() - 1))) {
                 int cpCurrent = result.codePointAt(i);
                 Integer cpNext = result.codePointAt(i + 1);
-                String code = HTMLUnicodeConversionMaps.ESCAPED_ACCENTS.get(cpNext);
+                String code = HTMLUnicodeConversionMaps.ESCAPED_ACCENTS.get(
+                    cpNext
+                );
                 if (code == null) {
                     // skip next index to avoid reading surrogate as a separate char
                     if (!Character.isBmpCodePoint(cpCurrent)) {
@@ -44,7 +54,12 @@ public String format(String text) {
                     }
                     sb.appendCodePoint(cpCurrent);
                 } else {
-                    sb.append("{\\").append(code).append('{').append((char) cpCurrent).append("}}");
+                    sb
+                        .append("{\\")
+                        .append(code)
+                        .append('{')
+                        .append((char) cpCurrent)
+                        .append("}}");
                     consumed = true;
                 }
             } else {
@@ -68,7 +83,9 @@ public String format(String text) {
 
     @Override
     public String getDescription() {
-        return Localization.lang("Converts Unicode characters to LaTeX encoding.");
+        return Localization.lang(
+            "Converts Unicode characters to LaTeX encoding."
+        );
     }
 
     @Override
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 2f9413f9296..6c67f2acd3c 100644
--- a/src/main/java/org/jabref/logic/formatter/bibtexfields/UnitsToLatexFormatter.java
+++ b/src/main/java/org/jabref/logic/formatter/bibtexfields/UnitsToLatexFormatter.java
@@ -5,7 +5,6 @@
 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;
@@ -13,77 +12,80 @@
 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
+        "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
+        "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);
@@ -100,7 +102,10 @@ public String format(String text) {
         }
 
         // 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");
+        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
         result = result.replaceAll("([0-9,\\.]+) ([Bb][Ii][Tt])", "$1~$2");
@@ -108,9 +113,18 @@ public String format(String text) {
         // 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
+            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/CapitalizeFormatter.java b/src/main/java/org/jabref/logic/formatter/casechanger/CapitalizeFormatter.java
index 881c318a782..8b7f4d9ee16 100644
--- a/src/main/java/org/jabref/logic/formatter/casechanger/CapitalizeFormatter.java
+++ b/src/main/java/org/jabref/logic/formatter/casechanger/CapitalizeFormatter.java
@@ -30,7 +30,8 @@ public String format(String input) {
     @Override
     public String getDescription() {
         return Localization.lang(
-                "Changes The First Letter Of All Words To Capital Case And The Remaining Letters To Lower Case.");
+            "Changes The First Letter Of All Words To Capital Case And The Remaining Letters To Lower Case."
+        );
     }
 
     @Override
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 002a4a6be95..34dfa6036c6 100644
--- a/src/main/java/org/jabref/logic/formatter/casechanger/ProtectTermsFormatter.java
+++ b/src/main/java/org/jabref/logic/formatter/casechanger/ProtectTermsFormatter.java
@@ -2,7 +2,6 @@
 
 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;
@@ -28,7 +27,11 @@ private String format(String text, List<String> listOfWords) {
         // 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");
+            result =
+                result.replaceAll(
+                    "(^|[- /\\[(}\"])" + listOfWord + "($|[^a-zA-Z}])",
+                    "$1\\{" + listOfWord + "\\}$2"
+                );
         }
         // Remove the empty brackets
         result = result.replace("{}", "");
@@ -47,7 +50,8 @@ public String format(String text) {
     @Override
     public String getDescription() {
         return Localization.lang(
-                "Adds {} brackets around acronyms, month names and countries to preserve their case.");
+            "Adds {} brackets around acronyms, month names and countries to preserve their case."
+        );
     }
 
     @Override
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 5f73c4839db..c7b2cbe6a55 100644
--- a/src/main/java/org/jabref/logic/formatter/casechanger/SentenceCaseFormatter.java
+++ b/src/main/java/org/jabref/logic/formatter/casechanger/SentenceCaseFormatter.java
@@ -1,7 +1,6 @@
 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;
@@ -23,22 +22,24 @@ public String getKey() {
      */
     @Override
     public String format(String input) {
-        return StringUtil.getStringAsSentences(input)
-                .stream()
-                .map(new LowerCaseFormatter()::format)
-                .map(Title::new)
-                .map(title -> {
-                    title.getFirstWord().ifPresent(Word::toUpperFirst);
-                    return title;
-                })
-                .map(Object::toString)
-                .collect(Collectors.joining(" "));
+        return StringUtil
+            .getStringAsSentences(input)
+            .stream()
+            .map(new LowerCaseFormatter()::format)
+            .map(Title::new)
+            .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.");
+            "Capitalize the first word, changes other words to lower case."
+        );
     }
 
     @Override
diff --git a/src/main/java/org/jabref/logic/formatter/casechanger/Title.java b/src/main/java/org/jabref/logic/formatter/casechanger/Title.java
index 30c8a2aeb37..aa5a090fdef 100644
--- a/src/main/java/org/jabref/logic/formatter/casechanger/Title.java
+++ b/src/main/java/org/jabref/logic/formatter/casechanger/Title.java
@@ -37,6 +37,9 @@ public Optional<Word> getLastWord() {
 
     @Override
     public String toString() {
-        return words.stream().map(Word::toString).collect(Collectors.joining(" "));
+        return words
+            .stream()
+            .map(Word::toString)
+            .collect(Collectors.joining(" "));
     }
 }
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 857cc6a772b..30b4a647794 100644
--- a/src/main/java/org/jabref/logic/formatter/casechanger/TitleCaseFormatter.java
+++ b/src/main/java/org/jabref/logic/formatter/casechanger/TitleCaseFormatter.java
@@ -1,7 +1,6 @@
 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;
@@ -25,32 +24,42 @@ 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();
-                })
-                .collect(Collectors.joining(" "));
+                return title.toString();
+            })
+            .collect(Collectors.joining(" "));
     }
 
     @Override
     public String getDescription() {
         return Localization.lang(
-                "Capitalize all Words, but Converts Articles, Prepositions, and Conjunctions to Lower Case.");
+            "Capitalize all Words, but Converts Articles, Prepositions, and Conjunctions to Lower Case."
+        );
     }
 
     @Override
diff --git a/src/main/java/org/jabref/logic/formatter/casechanger/TitleParser.java b/src/main/java/org/jabref/logic/formatter/casechanger/TitleParser.java
index 3e02a7c1fc5..16869ac7300 100644
--- a/src/main/java/org/jabref/logic/formatter/casechanger/TitleParser.java
+++ b/src/main/java/org/jabref/logic/formatter/casechanger/TitleParser.java
@@ -46,7 +46,13 @@ private Optional<Word> createWord(boolean[] isProtected) {
         char[] chars = buffer.toString().toCharArray();
         boolean[] protectedChars = new boolean[chars.length];
 
-        System.arraycopy(isProtected, wordStart, protectedChars, 0, chars.length);
+        System.arraycopy(
+            isProtected,
+            wordStart,
+            protectedChars,
+            0,
+            chars.length
+        );
 
         reset();
 
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 cc2d5ab2096..b4cc6ad9844 100644
--- a/src/main/java/org/jabref/logic/formatter/casechanger/UnprotectTermsFormatter.java
+++ b/src/main/java/org/jabref/logic/formatter/casechanger/UnprotectTermsFormatter.java
@@ -1,7 +1,6 @@
 package org.jabref.logic.formatter.casechanger;
 
 import java.util.Objects;
-
 import org.jabref.logic.cleanup.Formatter;
 import org.jabref.logic.l10n.Localization;
 
@@ -43,7 +42,8 @@ public String format(String text) {
     @Override
     public String getDescription() {
         return Localization.lang(
-                "Removes all balanced {} braces around words.");
+            "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 b3c52eebe1c..fe3df0a9b5e 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 a78138affee..b3beabfb6fa 100644
--- a/src/main/java/org/jabref/logic/formatter/casechanger/Word.java
+++ b/src/main/java/org/jabref/logic/formatter/casechanger/Word.java
@@ -13,6 +13,7 @@
  * A word can have protected chars (enclosed in '{' '}') and may be a small (a, an, the, ...) word.
  */
 public final class Word {
+
     /**
      * Set containing common lowercase function words
      */
@@ -28,19 +29,90 @@ public final class Word {
         Set<String> conjunctions = new HashSet<>();
 
         // Conjunctions used as part of Title case capitalisation to specifically check if word is conjunction or not
-        conjunctions.addAll(Arrays.asList("and", "but", "for", "nor", "or", "so", "yet"));
+        conjunctions.addAll(
+            Arrays.asList("and", "but", "for", "nor", "or", "so", "yet")
+        );
         // Articles
         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"));
+        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);
         // Dashes
-        dashes.addAll(Arrays.asList(
-                '-', '~', '⸗', '〰', '᐀', '֊', '־', '‐', '‑', '‒',
-                '–', '—', '―', '⁓', '⁻', '₋', '−', '⸺', '⸻',
-                '〜', '゠', '︱', '︲', '﹘', '﹣', '－'
-        ));
+        dashes.addAll(
+            Arrays.asList(
+                '-',
+                '~',
+                '⸗',
+                '〰',
+                '᐀',
+                '֊',
+                '־',
+                '‐',
+                '‑',
+                '‒',
+                '–',
+                '—',
+                '―',
+                '⁓',
+                '⁻',
+                '₋',
+                '−',
+                '⸺',
+                '⸻',
+                '〜',
+                '゠',
+                '︱',
+                '︲',
+                '﹘',
+                '﹣',
+                '－'
+            )
+        );
 
         // unmodifiable for thread safety
         DASHES = dashes;
@@ -49,9 +121,11 @@ public final class Word {
         CONJUNCTIONS = conjunctions;
 
         // unmodifiable for thread safety
-        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) {
@@ -59,7 +133,9 @@ 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"
+            );
         }
     }
 
@@ -95,9 +171,10 @@ 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]);
             }
         }
     }
@@ -105,9 +182,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]);
             }
         }
     }
@@ -115,35 +193,41 @@ 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]);
             }
         }
     }
 
     public boolean isSmallerWord() {
         // "word:" is still a small "word"
-        return SMALLER_WORDS.contains(this.toString().replace(":", "").toLowerCase(Locale.ROOT));
+        return SMALLER_WORDS.contains(
+            this.toString().replace(":", "").toLowerCase(Locale.ROOT)
+        );
     }
 
     public boolean isLargerWord() {
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 0c2ccd0ed5e..7d6fac3a284 100644
--- a/src/main/java/org/jabref/logic/formatter/minifier/MinifyNameListFormatter.java
+++ b/src/main/java/org/jabref/logic/formatter/minifier/MinifyNameListFormatter.java
@@ -1,7 +1,6 @@
 package org.jabref.logic.formatter.minifier;
 
 import java.util.Objects;
-
 import org.jabref.logic.cleanup.Formatter;
 import org.jabref.logic.l10n.Localization;
 
@@ -9,6 +8,7 @@
  * Replaces three or more authors with and others
  */
 public class MinifyNameListFormatter extends Formatter {
+
     @Override
     public String getName() {
         return Localization.lang("Minify list of person names");
@@ -42,7 +42,9 @@ 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
@@ -66,7 +68,10 @@ private String abbreviateAuthor(String authorField) {
         }
 
         // already abbreviated
-        if ("others".equals(authors[authors.length - 1]) && (authors.length == 2)) {
+        if (
+            "others".equals(authors[authors.length - 1]) &&
+            (authors.length == 2)
+        ) {
             return authorField;
         }
 
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 8ee8f76ffc1..92219dc03c8 100644
--- a/src/main/java/org/jabref/logic/formatter/minifier/TruncateFormatter.java
+++ b/src/main/java/org/jabref/logic/formatter/minifier/TruncateFormatter.java
@@ -1,11 +1,11 @@
 package org.jabref.logic.formatter.minifier;
 
 import java.util.Objects;
-
 import org.jabref.logic.cleanup.Formatter;
 import org.jabref.logic.l10n.Localization;
 
 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 e865e9b9299..da372baf7b7 100644
--- a/src/main/java/org/jabref/logic/git/GitHandler.java
+++ b/src/main/java/org/jabref/logic/git/GitHandler.java
@@ -6,9 +6,6 @@
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.Optional;
-
-import org.jabref.logic.util.io.FileUtil;
-
 import org.eclipse.jgit.api.Git;
 import org.eclipse.jgit.api.RmCommand;
 import org.eclipse.jgit.api.Status;
@@ -17,6 +14,7 @@
 import org.eclipse.jgit.merge.MergeStrategy;
 import org.eclipse.jgit.transport.CredentialsProvider;
 import org.eclipse.jgit.transport.UsernamePasswordCredentialsProvider;
+import org.jabref.logic.util.io.FileUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -25,12 +23,18 @@
  * This provides an easy-to-use interface to manage a git repository
  */
 public class GitHandler {
+
     static final Logger LOGGER = LoggerFactory.getLogger(GitHandler.class);
     final Path repositoryPath;
     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);
+    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);
 
     /**
      * Initialize the handler for the given repository
@@ -42,20 +46,22 @@ 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,10 +74,19 @@ void setupGitIgnore() {
         try {
             Path gitignore = Path.of(repositoryPath.toString(), ".gitignore");
             if (!Files.exists(gitignore)) {
-                FileUtil.copyFile(Path.of(this.getClass().getResource("git.gitignore").toURI()), gitignore, false);
+                FileUtil.copyFile(
+                    Path.of(
+                        this.getClass().getResource("git.gitignore").toURI()
+                    ),
+                    gitignore,
+                    false
+                );
             }
         } catch (URISyntaxException 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
+            );
         }
     }
 
@@ -89,14 +104,16 @@ boolean isGitRepository() {
      *
      * @param branchToCheckout Name of the branch to check out
      */
-    public void checkoutBranch(String branchToCheckout) throws IOException, GitAPIException {
+    public void checkoutBranch(String branchToCheckout)
+        throws IOException, GitAPIException {
         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();
+            git
+                .checkout()
+                // If the branch does not exist, create it
+                .setCreateBranch(branch.isEmpty())
+                .setName(branchToCheckout)
+                .call();
         }
     }
 
@@ -104,13 +121,15 @@ public void checkoutBranch(String branchToCheckout) throws IOException, GitAPIEx
      * Returns the reference of the specified branch
      * If it does not exist returns an empty optional
      */
-    Optional<Ref> getRefForBranch(String branchName) throws GitAPIException, IOException {
+    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();
         }
     }
 
@@ -120,28 +139,29 @@ 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;
@@ -153,7 +173,11 @@ 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);
@@ -162,11 +186,12 @@ public void mergeBranches(String targetBranch, String sourceBranch, MergeStrateg
                 return;
             }
             this.checkoutBranch(targetBranch);
-            git.merge()
-               .include(sourceBranchRef.get())
-               .setStrategy(mergeStrategy)
-               .setMessage("Merge search branch into working branch.")
-               .call();
+            git
+                .merge()
+                .include(sourceBranchRef.get())
+                .setStrategy(mergeStrategy)
+                .setMessage("Merge search branch into working branch.")
+                .call();
         }
         this.checkoutBranch(currentBranch);
     }
@@ -178,9 +203,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");
             }
@@ -190,9 +213,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 cd61520ae03..5fffa42411d 100644
--- a/src/main/java/org/jabref/logic/git/SlrGitHandler.java
+++ b/src/main/java/org/jabref/logic/git/SlrGitHandler.java
@@ -11,9 +11,6 @@
 import java.util.Objects;
 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;
@@ -23,6 +20,7 @@
 import org.eclipse.jgit.lib.Ref;
 import org.eclipse.jgit.lib.Repository;
 import org.eclipse.jgit.treewalk.CanonicalTreeParser;
+import org.jabref.logic.crawler.StudyRepository;
 
 public class SlrGitHandler extends GitHandler {
 
@@ -35,7 +33,10 @@ 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);
@@ -50,7 +51,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()) {
@@ -58,8 +60,12 @@ String calculatePatchOfNewSearchResults(String sourceBranch) throws IOException,
             }
             Repository repository = git.getRepository();
             ObjectId branchHead = sourceBranchRef.get().getObjectId();
-            ObjectId treeIdHead = repository.resolve(branchHead.getName() + "^{tree}");
-            ObjectId treeIdHeadParent = repository.resolve(branchHead.getName() + "~1^{tree}");
+            ObjectId treeIdHead = repository.resolve(
+                branchHead.getName() + "^{tree}"
+            );
+            ObjectId treeIdHeadParent = repository.resolve(
+                branchHead.getName() + "~1^{tree}"
+            );
 
             try (ObjectReader reader = repository.newObjectReader()) {
                 CanonicalTreeParser oldTreeIter = new CanonicalTreeParser();
@@ -70,9 +76,16 @@ String calculatePatchOfNewSearchResults(String sourceBranch) throws IOException,
                 ByteArrayOutputStream put = new ByteArrayOutputStream();
                 try (DiffFormatter formatter = new DiffFormatter(put)) {
                     formatter.setRepository(git.getRepository());
-                    List<DiffEntry> entries = formatter.scan(oldTreeIter, newTreeIter);
+                    List<DiffEntry> entries = formatter.scan(
+                        oldTreeIter,
+                        newTreeIter
+                    );
                     for (DiffEntry entry : entries) {
-                        if (entry.getChangeType().equals(DiffEntry.ChangeType.MODIFY)) {
+                        if (
+                            entry
+                                .getChangeType()
+                                .equals(DiffEntry.ChangeType.MODIFY)
+                        ) {
                             formatter.format(entry);
                         }
                     }
@@ -92,7 +105,8 @@ String calculatePatchOfNewSearchResults(String sourceBranch) throws IOException,
      * @param patch the patch (diff) as a string
      * @return Returns a map where each file has its path as a key and the string contains the hunk of new results
      */
-    Map<Path, String> parsePatchForAddedEntries(String patch) throws IOException, GitAPIException {
+    Map<Path, String> parsePatchForAddedEntries(String patch)
+        throws IOException, GitAPIException {
         String[] tokens = patch.split("\n");
         // Tracks for each file the related diff. Represents each file by its relative path
         Map<Path, String> diffsPerFile = new HashMap<>();
@@ -104,18 +118,28 @@ Map<Path, String> parsePatchForAddedEntries(String patch) throws IOException, Gi
             if (currentToken.startsWith("diff --git a/")) {
                 // If the diff is related to a different file, save the diff for the previous file
                 if (!(Objects.isNull(relativePath) || Objects.isNull(joiner))) {
-                    if (!relativePath.contains(StudyRepository.STUDY_DEFINITION_FILE_NAME)) {
-                        diffsPerFile.put(Path.of(repositoryPath.toString(), relativePath), joiner.toString());
+                    if (
+                        !relativePath.contains(
+                            StudyRepository.STUDY_DEFINITION_FILE_NAME
+                        )
+                    ) {
+                        diffsPerFile.put(
+                            Path.of(repositoryPath.toString(), relativePath),
+                            joiner.toString()
+                        );
                     }
                 }
                 // Find the relative path of the file that is related with the current diff
-                relativePath = currentToken.substring(13, currentToken.indexOf(" b/"));
+                relativePath =
+                    currentToken.substring(13, currentToken.indexOf(" b/"));
                 content = false;
                 joiner = new StringJoiner("\n");
                 continue;
             }
             // From here on content follows
-            if (currentToken.startsWith("@@ ") && currentToken.endsWith(" @@")) {
+            if (
+                currentToken.startsWith("@@ ") && currentToken.endsWith(" @@")
+            ) {
                 content = true;
                 continue;
             }
@@ -129,7 +153,10 @@ Map<Path, String> parsePatchForAddedEntries(String patch) throws IOException, Gi
         }
         if (!(Objects.isNull(relativePath) || Objects.isNull(joiner))) {
             // For the last file this has to be done at the end
-            diffsPerFile.put(Path.of(repositoryPath.toString(), relativePath), joiner.toString());
+            diffsPerFile.put(
+                Path.of(repositoryPath.toString(), relativePath),
+                joiner.toString()
+            );
         }
         return diffsPerFile;
     }
@@ -139,20 +166,29 @@ 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);
+        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.");
                 }
-                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 f544aff90d7..00f9a6a04a0 100644
--- a/src/main/java/org/jabref/logic/groups/DefaultGroupsFactory.java
+++ b/src/main/java/org/jabref/logic/groups/DefaultGroupsFactory.java
@@ -5,13 +5,15 @@
 
 public class DefaultGroupsFactory {
 
-    private static String ALL_ENTRIES_GROUP_DEFAULT_ICON = "ALL_ENTRIES_GROUP_ICON";
+    private static 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"));
+        AllEntriesGroup group = new AllEntriesGroup(
+            Localization.lang("All entries")
+        );
         group.setIconName(ALL_ENTRIES_GROUP_DEFAULT_ICON);
         return group;
     }
diff --git a/src/main/java/org/jabref/logic/help/HelpFile.java b/src/main/java/org/jabref/logic/help/HelpFile.java
index 0ba653c7f87..5ba702f6117 100644
--- a/src/main/java/org/jabref/logic/help/HelpFile.java
+++ b/src/main/java/org/jabref/logic/help/HelpFile.java
@@ -10,15 +10,21 @@ 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.
@@ -26,25 +32,41 @@ public enum HelpFile {
     FETCHER_ACM("collect/import-using-online-bibliographic-database#acmportal"),
     FETCHER_ADS("collect/import-using-online-bibliographic-database#ads"),
     FETCHER_BIBSONOMY_SCRAPER(""),
-    FETCHER_CITESEERX("collect/import-using-online-bibliographic-database#citeseer"),
+    FETCHER_CITESEERX(
+        "collect/import-using-online-bibliographic-database#citeseer"
+    ),
     FETCHER_DBLP("collect/import-using-online-bibliographic-database#dblp"),
     FETCHER_DIVA("collect/add-entry-using-an-id"),
     FETCHER_DOAJ("collect/import-using-online-bibliographic-database#doaj"),
     FETCHER_DOI("collect/add-entry-using-an-id"),
-    FETCHER_GOOGLE_SCHOLAR("collect/import-using-online-bibliographic-database#googlescholar"),
+    FETCHER_GOOGLE_SCHOLAR(
+        "collect/import-using-online-bibliographic-database#googlescholar"
+    ),
     FETCHER_GVK("collect/import-using-online-bibliographic-database#gvk"),
-    FETCHER_IEEEXPLORE("collect/import-using-online-bibliographic-database#ieeexplore"),
-    FETCHER_INSPIRE("collect/import-using-online-bibliographic-database#inspire"),
+    FETCHER_IEEEXPLORE(
+        "collect/import-using-online-bibliographic-database#ieeexplore"
+    ),
+    FETCHER_INSPIRE(
+        "collect/import-using-online-bibliographic-database#inspire"
+    ),
     FETCHER_ISBN("collect/add-entry-using-an-id"),
-    FETCHER_MEDLINE("collect/import-using-online-bibliographic-database#medline"),
-    FETCHER_OAI2_ARXIV("collect/import-using-online-bibliographic-database#arxiv"),
+    FETCHER_MEDLINE(
+        "collect/import-using-online-bibliographic-database#medline"
+    ),
+    FETCHER_OAI2_ARXIV(
+        "collect/import-using-online-bibliographic-database#arxiv"
+    ),
     FETCHER_RFC("collect/add-entry-using-an-id"),
-    FETCHER_SPRINGER("collect/import-using-online-bibliographic-database#springer"),
+    FETCHER_SPRINGER(
+        "collect/import-using-online-bibliographic-database#springer"
+    ),
     FETCHER_TITLE("collect/add-entry-using-an-id"),
     FETCHER_SCIENCEDIRECT(""),
     DATABASE_PROPERTIES("setup/databaseproperties"),
     FIND_DUPLICATES("finding-sorting-and-cleaning-entries/findduplicates"),
-    SQL_DATABASE_MIGRATION("collaborative-work/sqldatabase/sqldatabasemigration"),
+    SQL_DATABASE_MIGRATION(
+        "collaborative-work/sqldatabase/sqldatabasemigration"
+    ),
     PUSH_TO_APPLICATION("cite/pushtoapplications");
 
     private final String pageName;
diff --git a/src/main/java/org/jabref/logic/importer/AuthorListParser.java b/src/main/java/org/jabref/logic/importer/AuthorListParser.java
index 08a4028c458..338259d6242 100644
--- a/src/main/java/org/jabref/logic/importer/AuthorListParser.java
+++ b/src/main/java/org/jabref/logic/importer/AuthorListParser.java
@@ -9,7 +9,6 @@
 import java.util.Objects;
 import java.util.Optional;
 import java.util.Set;
-
 import org.jabref.model.entry.Author;
 import org.jabref.model.entry.AuthorList;
 import org.jabref.model.strings.StringUtil;
@@ -17,8 +16,16 @@
 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
 
@@ -31,7 +38,19 @@ public class AuthorListParser {
     // "-") 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");
+        "aa",
+        "ae",
+        "l",
+        "o",
+        "oe",
+        "i",
+        "AA",
+        "AE",
+        "L",
+        "O",
+        "OE",
+        "j"
+    );
     /**
      * the raw bibtex author/editor field
      */
@@ -63,7 +82,10 @@ public class AuthorListParser {
      *
      * @return New string with correct seperation
      */
-    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
         int avoidedTimes = 0;
@@ -104,26 +126,39 @@ public AuthorList parse(String listOfNames) {
         final boolean andOthersPresent;
         if (StringUtil.endsWithIgnoreCase(listOfNames, andOthersSuffix)) {
             andOthersPresent = true;
-            listOfNames = StringUtil.removeStringAtTheEnd(listOfNames, " and others");
+            listOfNames =
+                StringUtil.removeStringAtTheEnd(listOfNames, " and others");
         } else {
             andOthersPresent = false;
         }
 
         // Handle case names in order lastname, firstname and separated by ","
         // E.g., Ali Babar, M., Dingsøyr, T., Lago, P., van der Vliet, H.
-        final boolean authorsContainAND = listOfNames.toUpperCase(Locale.ENGLISH).contains(" AND ");
+        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"
@@ -140,7 +175,11 @@ public AuthorList parse(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--;
                     }
@@ -148,7 +187,8 @@ public AuthorList parse(String listOfNames) {
 
                 if ((valuePartsCount % 2) == 0) {
                     // We hit the described special case with name affix like Jr
-                    listOfNames = buildWithAffix(avoidIndex, arrayNameList).toString();
+                    listOfNames =
+                        buildWithAffix(avoidIndex, arrayNameList).toString();
                 }
             }
         }
@@ -212,14 +252,25 @@ 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;
                             }
 
-                            int thisTermToken = previousTermToken + TOKEN_GROUP_LENGTH;
-                            if ((thisTermToken >= 0) && tokens.get(thisTermToken).equals('-')) {
+                            int thisTermToken =
+                                previousTermToken + TOKEN_GROUP_LENGTH;
+                            if (
+                                (thisTermToken >= 0) &&
+                                tokens.get(thisTermToken).equals('-')
+                            ) {
                                 // We are in a name which contained a hyphen
                                 break;
                             }
@@ -256,7 +307,9 @@ private Optional<Author> getAuthor() {
             if (vonStart < 0) { // no 'von part'
                 lastPartEnd = tokens.size();
                 lastPartStart = tokens.size() - TOKEN_GROUP_LENGTH;
-                int index = (tokens.size() - (2 * TOKEN_GROUP_LENGTH)) + OFFSET_TOKEN_TERM;
+                int index =
+                    (tokens.size() - (2 * TOKEN_GROUP_LENGTH)) +
+                    OFFSET_TOKEN_TERM;
                 if (index > 0) {
                     Character ch = (Character) tokens.get(index);
                     if (ch == '-') {
@@ -316,7 +369,11 @@ private Optional<Author> getAuthor() {
             }
         }
 
-        if ((firstPartStart == -1) && (lastPartStart == -1) && (vonPartStart != -1)) {
+        if (
+            (firstPartStart == -1) &&
+            (lastPartStart == -1) &&
+            (vonPartStart != -1)
+        ) {
             // There is no first or last name, but we have a von part. This is likely
             // to indicate a single-entry name without an initial capital letter, such
             // as "unknown".
@@ -328,20 +385,64 @@ 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 ((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 (
+            (firstPart != null) &&
+            (lastPart != null) &&
+            lastPart.equals(lastPart.toUpperCase(Locale.ROOT)) &&
+            (lastPart.length() < 5) &&
+            (Character.UnicodeScript.of(lastPart.charAt(0)) !=
+                Character.UnicodeScript.HAN)
+        ) {
             // The last part is a small string in complete upper case, so 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
             // The length < 5 constraint should allow for "Smith S.H." as input
-            return Optional.of(new Author(lastPart, lastPart, vonPart, firstPart, jrPart));
+            return Optional.of(
+                new Author(lastPart, lastPart, vonPart, firstPart, jrPart)
+            );
         } else {
-            return Optional.of(new Author(firstPart, firstAbbr, vonPart, lastPart, jrPart));
+            return Optional.of(
+                new Author(firstPart, firstAbbr, vonPart, lastPart, jrPart)
+            );
         }
     }
 
@@ -358,7 +459,13 @@ 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));
@@ -367,7 +474,11 @@ private String concatTokens(List<Object> tokens, int start, int end, int offset,
         }
         int updatedStart = start + TOKEN_GROUP_LENGTH;
         while (updatedStart < end) {
-            result.append(tokens.get((updatedStart - TOKEN_GROUP_LENGTH) + OFFSET_TOKEN_TERM));
+            result.append(
+                tokens.get(
+                    (updatedStart - TOKEN_GROUP_LENGTH) + OFFSET_TOKEN_TERM
+                )
+            );
             result.append((String) tokens.get(updatedStart + offset));
             if (dotAfter) {
                 result.append('.');
@@ -435,15 +546,26 @@ private Token getToken() {
                 bracesLevel++;
             }
 
-            if (firstLetterIsFound && (tokenAbbrEnd < 0) && ((bracesLevel == 0) || (c == '{'))) {
+            if (
+                firstLetterIsFound &&
+                (tokenAbbrEnd < 0) &&
+                ((bracesLevel == 0) || (c == '{'))
+            ) {
                 tokenAbbrEnd = tokenEnd;
             }
             if ((c == '}') && (bracesLevel > 0)) {
                 bracesLevel--;
             }
-            if (!firstLetterIsFound && (currentBackslash < 0) && Character.isLetter(c)) {
+            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"
@@ -454,7 +576,10 @@ private Token getToken() {
             }
             if ((currentBackslash >= 0) && !Character.isLetter(c)) {
                 if (!firstLetterIsFound) {
-                    String texCmdName = original.substring(currentBackslash + 1, tokenEnd);
+                    String texCmdName = original.substring(
+                        currentBackslash + 1,
+                        tokenEnd
+                    );
                     if (TEX_NAMES.contains(texCmdName)) {
                         tokenCase = Character.isUpperCase(texCmdName.charAt(0));
                         firstLetterIsFound = true;
@@ -465,7 +590,10 @@ private Token getToken() {
             if (c == '\\') {
                 currentBackslash = tokenEnd;
             }
-            if ((bracesLevel == 0) && ((",;-".indexOf(c) != -1) || Character.isWhitespace(c))) {
+            if (
+                (bracesLevel == 0) &&
+                ((",;-".indexOf(c) != -1) || Character.isWhitespace(c))
+            ) {
                 break;
             }
             tokenEnd++;
@@ -473,7 +601,9 @@ private Token getToken() {
         if (tokenAbbrEnd < 0) {
             tokenAbbrEnd = tokenEnd;
         }
-        if ((tokenEnd < original.length()) && (original.charAt(tokenEnd) == '-')) {
+        if (
+            (tokenEnd < original.length()) && (original.charAt(tokenEnd) == '-')
+        ) {
             tokenTerm = '-';
         }
         if ("and".equalsIgnoreCase(original.substring(tokenStart, tokenEnd))) {
@@ -488,6 +618,6 @@ private enum Token {
         EOF,
         AND,
         COMMA,
-        WORD
+        WORD,
     }
 }
diff --git a/src/main/java/org/jabref/logic/importer/CompositeIdFetcher.java b/src/main/java/org/jabref/logic/importer/CompositeIdFetcher.java
index 83d939a3085..4ee6ca65c66 100644
--- a/src/main/java/org/jabref/logic/importer/CompositeIdFetcher.java
+++ b/src/main/java/org/jabref/logic/importer/CompositeIdFetcher.java
@@ -2,7 +2,6 @@
 
 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;
@@ -19,21 +18,26 @@ public CompositeIdFetcher(ImportFormatPreferences importFormatPreferences) {
         this.importFormatPreferences = importFormatPreferences;
     }
 
-    public Optional<BibEntry> performSearchById(String identifier) throws FetcherException {
+    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);
+        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))
-                    .performSearchById(isbn.get().getNormalized());
+                // .addRetryFetcher(new EbookDeIsbnFetcher(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
         Optional<IacrEprint> iacrEprint = IacrEprint.parse(identifier);
@@ -50,9 +54,13 @@ public String getName() {
 
     public static boolean containsValidId(String identifier) {
         Optional<DOI> doi = DOI.findInText(identifier);
-        Optional<ArXivIdentifier> arXivIdentifier = ArXivIdentifier.parse(identifier);
+        Optional<ArXivIdentifier> arXivIdentifier = ArXivIdentifier.parse(
+            identifier
+        );
         Optional<ISBN> isbn = ISBN.parse(identifier);
 
-        return Stream.of(doi, arXivIdentifier, isbn).anyMatch(Optional::isPresent);
+        return Stream
+            .of(doi, arXivIdentifier, isbn)
+            .anyMatch(Optional::isPresent);
     }
 }
diff --git a/src/main/java/org/jabref/logic/importer/EntryBasedFetcher.java b/src/main/java/org/jabref/logic/importer/EntryBasedFetcher.java
index 2cc1544a93f..f83a65ba107 100644
--- a/src/main/java/org/jabref/logic/importer/EntryBasedFetcher.java
+++ b/src/main/java/org/jabref/logic/importer/EntryBasedFetcher.java
@@ -1,7 +1,6 @@
 package org.jabref.logic.importer;
 
 import java.util.List;
-
 import org.jabref.model.entry.BibEntry;
 
 /**
@@ -10,7 +9,6 @@
  * May return multiple search hits.
  */
 public interface EntryBasedFetcher extends WebFetcher {
-
     /**
      * Looks for hits which are matched by the given {@link BibEntry}.
      *
diff --git a/src/main/java/org/jabref/logic/importer/EntryBasedParserFetcher.java b/src/main/java/org/jabref/logic/importer/EntryBasedParserFetcher.java
index 0adef8aca44..65301d32a21 100644
--- a/src/main/java/org/jabref/logic/importer/EntryBasedParserFetcher.java
+++ b/src/main/java/org/jabref/logic/importer/EntryBasedParserFetcher.java
@@ -9,7 +9,6 @@
 import java.util.Collections;
 import java.util.List;
 import java.util.Objects;
-
 import org.jabref.logic.cleanup.Formatter;
 import org.jabref.model.entry.BibEntry;
 
@@ -20,13 +19,13 @@
  * 3. Post-process fetched entries
  */
 public interface EntryBasedParserFetcher extends EntryBasedFetcher {
-
     /**
      * Constructs a URL based on the {@link BibEntry}.
      *
      * @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}.
@@ -52,7 +51,8 @@ default void doPostCleanup(BibEntry entry) {
     }
 
     @Override
-    default List<BibEntry> performSearch(BibEntry entry) throws FetcherException {
+    default List<BibEntry> performSearch(BibEntry entry)
+        throws FetcherException {
         Objects.requireNonNull(entry);
 
         URL UrlForEntry;
@@ -64,7 +64,11 @@ default List<BibEntry> performSearch(BibEntry entry) throws FetcherException {
             throw new FetcherException("Search URI is malformed", e);
         }
 
-        try (InputStream stream = new BufferedInputStream(UrlForEntry.openStream())) {
+        try (
+            InputStream stream = new BufferedInputStream(
+                UrlForEntry.openStream()
+            )
+        ) {
             List<BibEntry> fetchedEntries = getParser().parseEntries(stream);
 
             // Post-cleanup
diff --git a/src/main/java/org/jabref/logic/importer/FetcherClientException.java b/src/main/java/org/jabref/logic/importer/FetcherClientException.java
index ada85e02903..1ca9d09afa8 100644
--- a/src/main/java/org/jabref/logic/importer/FetcherClientException.java
+++ b/src/main/java/org/jabref/logic/importer/FetcherClientException.java
@@ -4,13 +4,18 @@
  * Should be thrown when you encounter an HTTP status code error &gt;= 400 and &lt; 500.
  */
 public class FetcherClientException extends FetcherException {
+
     private int statusCode;
 
     public FetcherClientException(String errorMessage, Throwable cause) {
         super(errorMessage, cause);
     }
 
-    public FetcherClientException(String errorMessage, Throwable cause, int statusCode) {
+    public FetcherClientException(
+        String errorMessage,
+        Throwable cause,
+        int statusCode
+    ) {
         super(errorMessage, cause);
         this.statusCode = statusCode;
     }
@@ -19,7 +24,11 @@ public FetcherClientException(String errorMessage) {
         super(errorMessage);
     }
 
-    public FetcherClientException(String errorMessage, String localizedMessage, Throwable cause) {
+    public FetcherClientException(
+        String errorMessage,
+        String localizedMessage,
+        Throwable cause
+    ) {
         super(errorMessage, localizedMessage, cause);
     }
 
diff --git a/src/main/java/org/jabref/logic/importer/FetcherException.java b/src/main/java/org/jabref/logic/importer/FetcherException.java
index 03557eef2bc..7fc4f6257ef 100644
--- a/src/main/java/org/jabref/logic/importer/FetcherException.java
+++ b/src/main/java/org/jabref/logic/importer/FetcherException.java
@@ -12,7 +12,11 @@ public FetcherException(String errorMessage) {
         super(errorMessage);
     }
 
-    public FetcherException(String errorMessage, String localizedMessage, Throwable cause) {
+    public FetcherException(
+        String errorMessage,
+        String localizedMessage,
+        Throwable cause
+    ) {
         super(errorMessage, localizedMessage, cause);
     }
 }
diff --git a/src/main/java/org/jabref/logic/importer/FetcherResult.java b/src/main/java/org/jabref/logic/importer/FetcherResult.java
index 1561b7a1b12..f6dd916b7d8 100644
--- a/src/main/java/org/jabref/logic/importer/FetcherResult.java
+++ b/src/main/java/org/jabref/logic/importer/FetcherResult.java
@@ -1,10 +1,10 @@
 package org.jabref.logic.importer;
 
 import java.net.URL;
-
 import org.jabref.logic.importer.fetcher.TrustLevel;
 
 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 7b657553b5f..b1ed04a244f 100644
--- a/src/main/java/org/jabref/logic/importer/FetcherServerException.java
+++ b/src/main/java/org/jabref/logic/importer/FetcherServerException.java
@@ -1,15 +1,21 @@
 package org.jabref.logic.importer;
+
 /**
  *  Should be thrown when you encounter a http status code error >= 500
  */
 public class FetcherServerException extends FetcherException {
+
     private int statusCode;
 
     public FetcherServerException(String errorMessage, Throwable cause) {
         super(errorMessage, cause);
     }
 
-    public FetcherServerException(String errorMessage, Throwable cause, int statusCode) {
+    public FetcherServerException(
+        String errorMessage,
+        Throwable cause,
+        int statusCode
+    ) {
         super(errorMessage, cause);
         this.statusCode = statusCode;
     }
@@ -18,7 +24,11 @@ public FetcherServerException(String errorMessage) {
         super(errorMessage);
     }
 
-    public FetcherServerException(String errorMessage, String localizedMessage, Throwable cause) {
+    public FetcherServerException(
+        String errorMessage,
+        String localizedMessage,
+        Throwable cause
+    ) {
         super(errorMessage, localizedMessage, cause);
     }
 
diff --git a/src/main/java/org/jabref/logic/importer/FulltextFetcher.java b/src/main/java/org/jabref/logic/importer/FulltextFetcher.java
index dc578db661c..e5e99341684 100644
--- a/src/main/java/org/jabref/logic/importer/FulltextFetcher.java
+++ b/src/main/java/org/jabref/logic/importer/FulltextFetcher.java
@@ -3,7 +3,6 @@
 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;
 
@@ -22,7 +21,8 @@ public interface FulltextFetcher {
      * @throws java.io.IOException  if an IO operation has failed
      * @throws FetcherException     if a fetcher specific error occurred
      */
-    Optional<URL> findFullText(BibEntry entry) throws IOException, FetcherException;
+    Optional<URL> findFullText(BibEntry entry)
+        throws IOException, FetcherException;
 
     /**
      * Returns the level of trust for this fetcher.
diff --git a/src/main/java/org/jabref/logic/importer/FulltextFetchers.java b/src/main/java/org/jabref/logic/importer/FulltextFetchers.java
index 753beb94b59..603185bd851 100644
--- a/src/main/java/org/jabref/logic/importer/FulltextFetchers.java
+++ b/src/main/java/org/jabref/logic/importer/FulltextFetchers.java
@@ -16,13 +16,11 @@
 import java.util.concurrent.TimeUnit;
 import java.util.function.Predicate;
 import java.util.stream.Collectors;
-
 import org.jabref.gui.JabRefExecutorService;
 import org.jabref.logic.net.URLDownload;
 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;
 
@@ -32,7 +30,10 @@
  * Combines multiple {@link FulltextFetcher}s together. Each fetcher is invoked, the "best" result (sorted by the fetcher trust level) is returned.
  */
 public class FulltextFetchers {
-    private static final Logger LOGGER = LoggerFactory.getLogger(FulltextFetchers.class);
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(
+        FulltextFetchers.class
+    );
 
     // Timeout in seconds
     private static final int FETCHER_TIMEOUT = 10;
@@ -48,8 +49,16 @@ public class FulltextFetchers {
         return false;
     };
 
-    public FulltextFetchers(ImportFormatPreferences importFormatPreferences, ImporterPreferences importerPreferences) {
-        this(WebFetchers.getFullTextFetchers(importFormatPreferences, importerPreferences));
+    public FulltextFetchers(
+        ImportFormatPreferences importFormatPreferences,
+        ImporterPreferences importerPreferences
+    ) {
+        this(
+            WebFetchers.getFullTextFetchers(
+                importFormatPreferences,
+                importerPreferences
+            )
+        );
     }
 
     FulltextFetchers(Set<FulltextFetcher> fetcher) {
@@ -59,35 +68,54 @@ public FulltextFetchers(ImportFormatPreferences importFormatPreferences, Importe
     public Optional<URL> findFullTextPDF(BibEntry entry) {
         // for accuracy, fetch DOI first but do not modify entry
         BibEntry clonedEntry = (BibEntry) entry.clone();
-        Optional<DOI> doi = clonedEntry.getField(StandardField.DOI).flatMap(DOI::parse);
+        Optional<DOI> doi = clonedEntry
+            .getField(StandardField.DOI)
+            .flatMap(DOI::parse);
 
         if (doi.isEmpty()) {
             findDoiForEntry(clonedEntry);
         }
 
-        List<Future<Optional<FetcherResult>>> result = JabRefExecutorService.INSTANCE.executeAll(getCallables(clonedEntry, finders), FETCHER_TIMEOUT, TimeUnit.SECONDS);
-
-        return result.stream()
-                     .map(FulltextFetchers::getResults)
-                     .filter(Optional::isPresent)
-                     .map(Optional::get)
-                     .filter(res -> Objects.nonNull(res.getSource()))
-                     .sorted(Comparator.comparingInt((FetcherResult res) -> res.getTrust().getTrustScore()).reversed())
-                     .map(FetcherResult::getSource)
-                     .findFirst();
+        List<Future<Optional<FetcherResult>>> result =
+            JabRefExecutorService.INSTANCE.executeAll(
+                getCallables(clonedEntry, finders),
+                FETCHER_TIMEOUT,
+                TimeUnit.SECONDS
+            );
+
+        return result
+            .stream()
+            .map(FulltextFetchers::getResults)
+            .filter(Optional::isPresent)
+            .map(Optional::get)
+            .filter(res -> Objects.nonNull(res.getSource()))
+            .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()));
+            WebFetchers
+                .getIdFetcherForIdentifier(DOI.class)
+                .findIdentifier(clonedEntry)
+                .ifPresent(e ->
+                    clonedEntry.setField(StandardField.DOI, e.getDOI())
+                );
         } catch (FetcherException e) {
             LOGGER.debug("Failed to find DOI", e);
         }
     }
 
-    private static Optional<FetcherResult> getResults(Future<Optional<FetcherResult>> future) {
+    private static Optional<FetcherResult> getResults(
+        Future<Optional<FetcherResult>> future
+    ) {
         try {
             return future.get();
         } catch (InterruptedException ignore) {
@@ -98,12 +126,17 @@ private static Optional<FetcherResult> getResults(Future<Optional<FetcherResult>
         return Optional.empty();
     }
 
-    private Callable<Optional<FetcherResult>> getCallable(BibEntry entry, FulltextFetcher fetcher) {
+    private Callable<Optional<FetcherResult>> getCallable(
+        BibEntry entry,
+        FulltextFetcher fetcher
+    ) {
         return () -> {
             try {
-                return fetcher.findFullText(entry)
-                              .filter(url -> isPDF.test(url.toString()))
-                              .map(url -> new FetcherResult(fetcher.getTrustLevel(), url));
+                return fetcher
+                    .findFullText(entry)
+                    .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);
             }
@@ -111,9 +144,13 @@ 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))
-                       .collect(Collectors.toList());
+    private List<Callable<Optional<FetcherResult>>> getCallables(
+        BibEntry entry,
+        Set<FulltextFetcher> fetchers
+    ) {
+        return fetchers
+            .stream()
+            .map(f -> getCallable(entry, f))
+            .collect(Collectors.toList());
     }
 }
diff --git a/src/main/java/org/jabref/logic/importer/IdBasedFetcher.java b/src/main/java/org/jabref/logic/importer/IdBasedFetcher.java
index 62caee59199..5c9092a42fe 100644
--- a/src/main/java/org/jabref/logic/importer/IdBasedFetcher.java
+++ b/src/main/java/org/jabref/logic/importer/IdBasedFetcher.java
@@ -1,7 +1,6 @@
 package org.jabref.logic.importer;
 
 import java.util.Optional;
-
 import org.jabref.model.entry.BibEntry;
 
 /**
@@ -9,12 +8,12 @@
  * Examples are ISBN numbers and DOIs.
  */
 public interface IdBasedFetcher extends WebFetcher {
-
     /**
      * Looks for bibliographic information associated to the given identifier.
      *
      * @param identifier a string which uniquely identifies the item
      * @return a {@link BibEntry} containing the bibliographic information (or an empty optional if no data was found)
      */
-    Optional<BibEntry> performSearchById(String identifier) throws FetcherException;
+    Optional<BibEntry> performSearchById(String identifier)
+        throws FetcherException;
 }
diff --git a/src/main/java/org/jabref/logic/importer/IdBasedParserFetcher.java b/src/main/java/org/jabref/logic/importer/IdBasedParserFetcher.java
index e348b69b8d8..8fd192b59b8 100644
--- a/src/main/java/org/jabref/logic/importer/IdBasedParserFetcher.java
+++ b/src/main/java/org/jabref/logic/importer/IdBasedParserFetcher.java
@@ -7,11 +7,9 @@
 import java.net.URL;
 import java.util.List;
 import java.util.Optional;
-
 import org.jabref.logic.cleanup.Formatter;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.strings.StringUtil;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -22,7 +20,6 @@
  * 3. Post-process fetched entries
  */
 public interface IdBasedParserFetcher extends IdBasedFetcher {
-
     Logger LOGGER = LoggerFactory.getLogger(IdBasedParserFetcher.class);
 
     /**
@@ -30,7 +27,8 @@ public interface IdBasedParserFetcher extends IdBasedFetcher {
      *
      * @param identifier the ID
      */
-    URL getUrlForIdentifier(String identifier) throws URISyntaxException, MalformedURLException, FetcherException;
+    URL getUrlForIdentifier(String identifier)
+        throws URISyntaxException, MalformedURLException, FetcherException;
 
     /**
      * Returns the parser used to convert the response to a list of {@link BibEntry}.
@@ -56,12 +54,16 @@ default void doPostCleanup(BibEntry entry) {
     }
 
     @Override
-    default Optional<BibEntry> performSearchById(String identifier) throws FetcherException {
+    default Optional<BibEntry> performSearchById(String identifier)
+        throws FetcherException {
         if (StringUtil.isBlank(identifier)) {
             return Optional.empty();
         }
 
-        try (InputStream stream = getUrlDownload(getUrlForIdentifier(identifier)).asInputStream()) {
+        try (
+            InputStream stream = getUrlDownload(getUrlForIdentifier(identifier))
+                .asInputStream()
+        ) {
             List<BibEntry> fetchedEntries = getParser().parseEntries(stream);
 
             if (fetchedEntries.isEmpty()) {
@@ -69,7 +71,11 @@ default Optional<BibEntry> performSearchById(String identifier) throws FetcherEx
             }
 
             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.get(0);
diff --git a/src/main/java/org/jabref/logic/importer/IdFetcher.java b/src/main/java/org/jabref/logic/importer/IdFetcher.java
index 110ad4b3038..7864daa6451 100644
--- a/src/main/java/org/jabref/logic/importer/IdFetcher.java
+++ b/src/main/java/org/jabref/logic/importer/IdFetcher.java
@@ -1,7 +1,6 @@
 package org.jabref.logic.importer;
 
 import java.util.Optional;
-
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.identifier.Identifier;
 
@@ -9,7 +8,6 @@
  * Looks for article identifier based on already present bibliographic information.
  */
 public interface IdFetcher<T extends Identifier> extends WebFetcher {
-
     /**
      * Looks for an identifier based on the information stored in the given {@link BibEntry}.
      *
diff --git a/src/main/java/org/jabref/logic/importer/IdParserFetcher.java b/src/main/java/org/jabref/logic/importer/IdParserFetcher.java
index b9b5ed92e44..204e92c50b7 100644
--- a/src/main/java/org/jabref/logic/importer/IdParserFetcher.java
+++ b/src/main/java/org/jabref/logic/importer/IdParserFetcher.java
@@ -10,11 +10,9 @@
 import java.util.List;
 import java.util.Objects;
 import java.util.Optional;
-
 import org.jabref.logic.cleanup.Formatter;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.identifier.Identifier;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -25,7 +23,6 @@
  * 3. Extract identifier
  */
 public interface IdParserFetcher<T extends Identifier> extends IdFetcher<T> {
-
     Logger LOGGER = LoggerFactory.getLogger(IdParserFetcher.class);
 
     /**
@@ -33,7 +30,8 @@ public interface IdParserFetcher<T extends Identifier> extends IdFetcher<T> {
      *
      * @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}.
@@ -65,13 +63,20 @@ default void doPostCleanup(BibEntry entry) {
      *                       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 {
         Objects.requireNonNull(entry);
 
-        try (InputStream stream = new BufferedInputStream(getURLForEntry(entry).openStream())) {
+        try (
+            InputStream stream = new BufferedInputStream(
+                getURLForEntry(entry).openStream()
+            )
+        ) {
             List<BibEntry> fetchedEntries = getParser().parseEntries(stream);
 
             if (fetchedEntries.isEmpty()) {
diff --git a/src/main/java/org/jabref/logic/importer/ImportCleanup.java b/src/main/java/org/jabref/logic/importer/ImportCleanup.java
index c6af4d0a2cd..2f1d52095da 100644
--- a/src/main/java/org/jabref/logic/importer/ImportCleanup.java
+++ b/src/main/java/org/jabref/logic/importer/ImportCleanup.java
@@ -1,12 +1,10 @@
 package org.jabref.logic.importer;
 
 import java.util.Collection;
-
 import org.jabref.model.database.BibDatabaseMode;
 import org.jabref.model.entry.BibEntry;
 
 public interface ImportCleanup {
-
     static ImportCleanup targeting(BibDatabaseMode mode) {
         return switch (mode) {
             case BIBTEX -> new ImportCleanupBibtex();
diff --git a/src/main/java/org/jabref/logic/importer/ImportCleanupBiblatex.java b/src/main/java/org/jabref/logic/importer/ImportCleanupBiblatex.java
index 99919a2d3f0..6b53ee4d685 100644
--- a/src/main/java/org/jabref/logic/importer/ImportCleanupBiblatex.java
+++ b/src/main/java/org/jabref/logic/importer/ImportCleanupBiblatex.java
@@ -5,7 +5,8 @@
 
 public class ImportCleanupBiblatex implements ImportCleanup {
 
-    private final ConvertToBiblatexCleanup convertToBiblatexCleanup = new ConvertToBiblatexCleanup();
+    private final ConvertToBiblatexCleanup convertToBiblatexCleanup =
+        new ConvertToBiblatexCleanup();
 
     /**
      * Performs a format conversion of the given entry into the targeted format.
@@ -15,7 +16,7 @@ public class ImportCleanupBiblatex implements ImportCleanup {
      */
     @Override
     public BibEntry doPostCleanup(BibEntry entry) {
-         convertToBiblatexCleanup.cleanup(entry);
-         return entry;
+        convertToBiblatexCleanup.cleanup(entry);
+        return entry;
     }
 }
diff --git a/src/main/java/org/jabref/logic/importer/ImportCleanupBibtex.java b/src/main/java/org/jabref/logic/importer/ImportCleanupBibtex.java
index ddda1f73e73..8c876f19ae8 100644
--- a/src/main/java/org/jabref/logic/importer/ImportCleanupBibtex.java
+++ b/src/main/java/org/jabref/logic/importer/ImportCleanupBibtex.java
@@ -5,7 +5,8 @@
 
 public class ImportCleanupBibtex implements ImportCleanup {
 
-    private final ConvertToBibtexCleanup convertToBibtexCleanup = new ConvertToBibtexCleanup();
+    private final ConvertToBibtexCleanup convertToBibtexCleanup =
+        new ConvertToBibtexCleanup();
 
     /**
      * Performs a format conversion of the given entry into the targeted format.
diff --git a/src/main/java/org/jabref/logic/importer/ImportFormatPreferences.java b/src/main/java/org/jabref/logic/importer/ImportFormatPreferences.java
index 62319455519..a6555be605b 100644
--- a/src/main/java/org/jabref/logic/importer/ImportFormatPreferences.java
+++ b/src/main/java/org/jabref/logic/importer/ImportFormatPreferences.java
@@ -8,10 +8,10 @@
 import org.jabref.preferences.BibEntryPreferences;
 
 public record ImportFormatPreferences(
-        BibEntryPreferences bibEntryPreferences,
-        CitationKeyPatternPreferences citationKeyPatternPreferences,
-        FieldPreferences fieldPreferences,
-        XmpPreferences xmpPreferences,
-        DOIPreferences doiPreferences,
-        GrobidPreferences grobidPreferences) {
-}
+    BibEntryPreferences bibEntryPreferences,
+    CitationKeyPatternPreferences citationKeyPatternPreferences,
+    FieldPreferences fieldPreferences,
+    XmpPreferences xmpPreferences,
+    DOIPreferences doiPreferences,
+    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 c7eb32f0d38..64b6a3f862e 100644
--- a/src/main/java/org/jabref/logic/importer/ImportFormatReader.java
+++ b/src/main/java/org/jabref/logic/importer/ImportFormatReader.java
@@ -8,7 +8,6 @@
 import java.util.Optional;
 import java.util.SortedSet;
 import java.util.TreeSet;
-
 import org.jabref.logic.importer.fileformat.BiblioscapeImporter;
 import org.jabref.logic.importer.fileformat.BibtexImporter;
 import org.jabref.logic.importer.fileformat.CffImporter;
@@ -51,9 +50,11 @@ public class ImportFormatReader {
     private final ImportFormatPreferences importFormatPreferences;
     private final FileUpdateMonitor fileUpdateMonitor;
 
-    public ImportFormatReader(ImporterPreferences importerPreferences,
-                              ImportFormatPreferences importFormatPreferences,
-                              FileUpdateMonitor fileUpdateMonitor) {
+    public ImportFormatReader(
+        ImporterPreferences importerPreferences,
+        ImportFormatPreferences importFormatPreferences,
+        FileUpdateMonitor fileUpdateMonitor
+    ) {
         this.importerPreferences = importerPreferences;
         this.importFormatPreferences = importFormatPreferences;
         this.fileUpdateMonitor = fileUpdateMonitor;
@@ -78,13 +79,17 @@ public void reset() {
         if (importFormatPreferences.grobidPreferences().isGrobidEnabled()) {
             formats.add(new PdfGrobidImporter(importFormatPreferences));
         }
-        formats.add(new PdfXmpImporter(importFormatPreferences.xmpPreferences()));
+        formats.add(
+            new PdfXmpImporter(importFormatPreferences.xmpPreferences())
+        );
         formats.add(new RepecNepImporter(importFormatPreferences));
         formats.add(new RisImporter());
         formats.add(new SilverPlatterImporter());
         formats.add(new CffImporter());
         formats.add(new BiblioscapeImporter());
-        formats.add(new BibtexImporter(importFormatPreferences, fileUpdateMonitor));
+        formats.add(
+            new BibtexImporter(importFormatPreferences, fileUpdateMonitor)
+        );
         formats.add(new CitaviXmlImporter());
 
         // Get custom import formats
@@ -109,11 +114,14 @@ private Optional<Importer> getByCliId(String cliId) {
         return Optional.empty();
     }
 
-    public ParserResult importFromFile(String format, Path file) throws ImportException {
+    public ParserResult importFromFile(String format, Path file)
+        throws ImportException {
         Optional<Importer> importer = getByCliId(format);
 
         if (importer.isEmpty()) {
-            throw new ImportException(Localization.lang("Unknown import format") + ": " + format);
+            throw new ImportException(
+                Localization.lang("Unknown import format") + ": " + format
+            );
         }
 
         try {
@@ -135,8 +143,10 @@ 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,
@@ -146,26 +156,46 @@ 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);
+                    return new UnknownFormatImport(
+                        ImportFormatReader.BIBTEX_FORMAT,
+                        parserResult
+                    );
                 } else {
                     throw new ImportException(parserResult.getErrorMessage());
                 }
             } 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."
+                    )
+                );
             }
         }
     }
@@ -179,7 +209,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;
@@ -193,7 +226,9 @@ private UnknownFormatImport importUnknownFormat(CheckedFunction<Importer, Parser
                 }
 
                 ParserResult parserResult = importDatabase.apply(imFo);
-                List<BibEntry> entries = parserResult.getDatabase().getEntries();
+                List<BibEntry> entries = parserResult
+                    .getDatabase()
+                    .getEntries();
 
                 BibDatabases.purgeEmptyEntries(entries);
                 int entryCount = entries.size();
@@ -214,12 +249,13 @@ private UnknownFormatImport importUnknownFormat(CheckedFunction<Importer, Parser
             return new UnknownFormatImport(bestFormatName, parserResult);
         }
 
-        throw new ImportException(Localization.lang("Could not find a suitable import format."));
+        throw new ImportException(
+            Localization.lang("Could not find a suitable import format.")
+        );
     }
 
     @FunctionalInterface
     public interface CheckedFunction<T, R> {
-
         R apply(T t) throws IOException;
     }
 
@@ -231,9 +267,13 @@ public interface CheckedFunction<T, R> {
      * @return an UnknownFormatImport with the imported entries and metadata
      * @throws ImportException if the import fails (for example, if no suitable importer is found)
      */
-    public UnknownFormatImport importUnknownFormat(String data) throws ImportException {
+    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 56bde6f0e3e..3e9a0f22651 100644
--- a/src/main/java/org/jabref/logic/importer/Importer.java
+++ b/src/main/java/org/jabref/logic/importer/Importer.java
@@ -1,5 +1,7 @@
 package org.jabref.logic.importer;
 
+import com.ibm.icu.text.CharsetDetector;
+import com.ibm.icu.text.CharsetMatch;
 import java.io.BufferedInputStream;
 import java.io.BufferedReader;
 import java.io.IOException;
@@ -13,13 +15,9 @@
 import java.nio.file.StandardOpenOption;
 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;
 
@@ -28,7 +26,9 @@
  */
 public abstract class Importer implements Comparable<Importer> {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(Importer.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(
+        Importer.class
+    );
 
     /**
      * Check whether the source is in the correct format for this importer.
@@ -39,7 +39,8 @@ public abstract class Importer implements Comparable<Importer> {
      * Thus the correct behaviour is to return false if it is certain that the file is not of the suitable type, and
      * true otherwise. Returning true is the safe choice if not certain.
      */
-    public abstract boolean isRecognizedFormat(BufferedReader input) throws IOException;
+    public abstract boolean isRecognizedFormat(BufferedReader input)
+        throws IOException;
 
     /**
      * Check whether the source is in the correct format for this importer.
@@ -62,8 +63,10 @@ public boolean isRecognizedFormat(Path filePath) throws IOException {
      * @throws IOException Signals that an I/O exception has occurred.
      */
     public boolean isRecognizedFormat(String data) throws IOException {
-        try (StringReader stringReader = new StringReader(data);
-             BufferedReader bufferedReader = new BufferedReader(stringReader)) {
+        try (
+            StringReader stringReader = new StringReader(data);
+            BufferedReader bufferedReader = new BufferedReader(stringReader)
+        ) {
             return isRecognizedFormat(bufferedReader);
         }
     }
@@ -81,7 +84,8 @@ public boolean isRecognizedFormat(String data) throws IOException {
      *
      * @param input the input to read from
      */
-    public abstract ParserResult importDatabase(BufferedReader input) throws IOException;
+    public abstract ParserResult importDatabase(BufferedReader input)
+        throws IOException;
 
     /**
      * Parse the database in the specified file.
@@ -89,12 +93,21 @@ public boolean isRecognizedFormat(String data) throws IOException {
      * @param filePath the path to the file which should be imported
      */
     public ParserResult importDatabase(Path filePath) throws IOException {
-        try (InputStream inputStream = Files.newInputStream(filePath, StandardOpenOption.READ)) {
-            BufferedInputStream bufferedInputStream = new BufferedInputStream(inputStream);
+        try (
+            InputStream inputStream = Files.newInputStream(
+                filePath,
+                StandardOpenOption.READ
+            )
+        ) {
+            BufferedInputStream bufferedInputStream = new BufferedInputStream(
+                inputStream
+            );
 
             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);
 
             // store the detected encoding
@@ -104,13 +117,21 @@ public ParserResult importDatabase(Path filePath) throws IOException {
 
             // 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;
         }
     }
 
-    protected static Charset getCharset(BufferedInputStream bufferedInputStream) {
+    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.
@@ -124,7 +145,11 @@ protected static Charset getCharset(BufferedInputStream bufferedInputStream) {
                 return defaultCharSet;
             }
 
-            if (Arrays.stream(matches).anyMatch(charset -> "ASCII".equals(charset.getName()))) {
+            if (
+                Arrays
+                    .stream(matches)
+                    .anyMatch(charset -> "ASCII".equals(charset.getName()))
+            ) {
                 return defaultCharSet;
             }
 
@@ -148,26 +173,38 @@ protected static Charset getCharset(BufferedInputStream bufferedInputStream) {
      * @throws IOException Signals that an I/O exception has occurred.
      */
     public ParserResult importDatabase(String data) throws IOException {
-        try (StringReader stringReader = new StringReader(data);
-             BufferedReader bufferedReader = new BufferedReader(stringReader)) {
+        try (
+            StringReader stringReader = new StringReader(data);
+            BufferedReader bufferedReader = new BufferedReader(stringReader)
+        ) {
             return importDatabase(bufferedReader);
         }
     }
 
     public static BufferedReader getReader(Path filePath) throws IOException {
-        InputStream stream = Files.newInputStream(filePath, StandardOpenOption.READ);
+        InputStream stream = Files.newInputStream(
+            filePath,
+            StandardOpenOption.READ
+        );
 
         if (FileUtil.isBibFile(filePath)) {
             return getReader(stream);
         }
 
-        return new BufferedReader(new InputStreamReader(stream, StandardCharsets.UTF_8));
+        return new BufferedReader(
+            new InputStreamReader(stream, StandardCharsets.UTF_8)
+        );
     }
 
     public static BufferedReader getReader(InputStream stream) {
-        BufferedInputStream bufferedInputStream = new BufferedInputStream(stream);
+        BufferedInputStream bufferedInputStream = new BufferedInputStream(
+            stream
+        );
         Charset charset = getCharset(bufferedInputStream);
-        InputStreamReader reader = new InputStreamReader(bufferedInputStream, charset);
+        InputStreamReader reader = new InputStreamReader(
+            bufferedInputStream,
+            charset
+        );
         return new BufferedReader(reader);
     }
 
diff --git a/src/main/java/org/jabref/logic/importer/ImporterPreferences.java b/src/main/java/org/jabref/logic/importer/ImporterPreferences.java
index c706ff46799..780e83f15c1 100644
--- a/src/main/java/org/jabref/logic/importer/ImporterPreferences.java
+++ b/src/main/java/org/jabref/logic/importer/ImporterPreferences.java
@@ -4,7 +4,6 @@
 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;
@@ -12,7 +11,6 @@
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableList;
 import javafx.collections.ObservableSet;
-
 import org.jabref.logic.importer.fileformat.CustomImporter;
 import org.jabref.logic.preferences.FetcherApiKey;
 
@@ -26,18 +24,24 @@ 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);
-        this.warnAboutDuplicatesOnImport = new SimpleBooleanProperty(warnAboutDuplicatesOnImport);
+        this.generateNewKeyOnImport =
+            new SimpleBooleanProperty(generateNewKeyOnImport);
+        this.importWorkingDirectory =
+            new SimpleObjectProperty<>(importWorkingDirectory);
+        this.warnAboutDuplicatesOnImport =
+            new SimpleBooleanProperty(warnAboutDuplicatesOnImport);
         this.customImporters = FXCollections.observableSet(customImporters);
         this.apiKeys = FXCollections.observableSet(apiKeys);
         this.persistCustomKeys = new SimpleBooleanProperty(persistCustomKeys);
@@ -88,7 +92,9 @@ public BooleanProperty warnAboutDuplicatesOnImportProperty() {
         return warnAboutDuplicatesOnImport;
     }
 
-    public void setWarnAboutDuplicatesOnImport(boolean warnAboutDuplicatesOnImport) {
+    public void setWarnAboutDuplicatesOnImport(
+        boolean warnAboutDuplicatesOnImport
+    ) {
         this.warnAboutDuplicatesOnImport.set(warnAboutDuplicatesOnImport);
     }
 
@@ -118,11 +124,12 @@ 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);
+        return apiKeys
+            .stream()
+            .filter(key -> key.getName().equalsIgnoreCase(name))
+            .filter(FetcherApiKey::shouldUse)
+            .findFirst()
+            .map(FetcherApiKey::getKey);
     }
 
     public void setCatalogs(List<String> catalogs) {
@@ -131,6 +138,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 9edcc2c3df2..9f6cc4b16ef 100644
--- a/src/main/java/org/jabref/logic/importer/OpenDatabase.java
+++ b/src/main/java/org/jabref/logic/importer/OpenDatabase.java
@@ -4,7 +4,6 @@
 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;
@@ -14,8 +13,7 @@
 
 public class OpenDatabase {
 
-    private OpenDatabase() {
-    }
+    private OpenDatabase() {}
 
     /**
      * Load database (bib-file)
@@ -23,19 +21,31 @@ 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)
-            throws IOException {
-        ParserResult result = new BibtexImporter(importFormatPreferences, fileMonitor).importDatabase(fileToOpen);
-        performLoadDatabaseMigrations(result, importFormatPreferences.bibEntryPreferences().getKeywordSeparator());
+    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()
+        );
         return result;
     }
 
-    private static void performLoadDatabaseMigrations(ParserResult parserResult,
-                                                      Character keywordDelimited) {
+    private static void performLoadDatabaseMigrations(
+        ParserResult parserResult,
+        Character keywordDelimited
+    ) {
         List<PostOpenMigration> postOpenMigrations = Arrays.asList(
-                new ConvertLegacyExplicitGroups(),
-                new ConvertMarkingToGroups(),
-                new SpecialFieldsToSeparateFields(keywordDelimited)
+            new ConvertLegacyExplicitGroups(),
+            new ConvertMarkingToGroups(),
+            new SpecialFieldsToSeparateFields(keywordDelimited)
         );
 
         for (PostOpenMigration migration : postOpenMigrations) {
diff --git a/src/main/java/org/jabref/logic/importer/OutputPrinter.java b/src/main/java/org/jabref/logic/importer/OutputPrinter.java
index ca4f5eb8163..d59f653e811 100644
--- a/src/main/java/org/jabref/logic/importer/OutputPrinter.java
+++ b/src/main/java/org/jabref/logic/importer/OutputPrinter.java
@@ -1,7 +1,6 @@
 package org.jabref.logic.importer;
 
 public interface OutputPrinter {
-
     void setStatus(String s);
 
     void showMessage(String message, String title, int msgType);
diff --git a/src/main/java/org/jabref/logic/importer/PagedSearchBasedFetcher.java b/src/main/java/org/jabref/logic/importer/PagedSearchBasedFetcher.java
index bafae176485..74ba36a3490 100644
--- a/src/main/java/org/jabref/logic/importer/PagedSearchBasedFetcher.java
+++ b/src/main/java/org/jabref/logic/importer/PagedSearchBasedFetcher.java
@@ -3,39 +3,45 @@
 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;
 
 public interface PagedSearchBasedFetcher extends SearchBasedFetcher {
-
     /**
      * @param luceneQuery the root node of the lucene query
      * @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.");
+            throw new FetcherException(
+                "An error occurred during parsing of the query."
+            );
         }
     }
 
@@ -53,7 +59,8 @@ default int getPageSize() {
      * @return a list of {@link BibEntry}, which are matched by the query (may be empty)
      */
     @Override
-    default List<BibEntry> performSearch(QueryNode luceneQuery) throws FetcherException {
+    default List<BibEntry> performSearch(QueryNode luceneQuery)
+        throws FetcherException {
         return new ArrayList<>(performSearchPaged(luceneQuery, 0).getContent());
     }
 }
diff --git a/src/main/java/org/jabref/logic/importer/PagedSearchBasedParserFetcher.java b/src/main/java/org/jabref/logic/importer/PagedSearchBasedParserFetcher.java
index 9f08d042c69..e98d4d32787 100644
--- a/src/main/java/org/jabref/logic/importer/PagedSearchBasedParserFetcher.java
+++ b/src/main/java/org/jabref/logic/importer/PagedSearchBasedParserFetcher.java
@@ -6,35 +6,51 @@
 import java.net.URISyntaxException;
 import java.net.URL;
 import java.util.List;
-
+import org.apache.lucene.queryparser.flexible.core.nodes.QueryNode;
 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 {
-
+public interface PagedSearchBasedParserFetcher
+    extends SearchBasedParserFetcher, PagedSearchBasedFetcher {
     @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));
+        return new Page<>(
+            luceneQuery.toString(),
+            pageNumber,
+            getBibEntries(urlForQuery)
+        );
     }
 
-    private List<BibEntry> getBibEntries(URL urlForQuery) throws FetcherException {
+    private List<BibEntry> getBibEntries(URL urlForQuery)
+        throws FetcherException {
         try (InputStream stream = getUrlDownload(urlForQuery).asInputStream()) {
             List<BibEntry> fetchedEntries = getParser().parseEntries(stream);
             fetchedEntries.forEach(this::doPostCleanup);
             return fetchedEntries;
         } catch (IOException e) {
-            throw new FetcherException("A network error occurred while fetching from " + urlForQuery, e);
+            throw new FetcherException(
+                "A network error occurred while fetching from " + urlForQuery,
+                e
+            );
         } catch (ParseException e) {
-            throw new FetcherException("An internal parser error occurred while fetching from " + urlForQuery, e);
+            throw new FetcherException(
+                "An internal parser error occurred while fetching from " +
+                urlForQuery,
+                e
+            );
         }
     }
 
@@ -44,15 +60,18 @@ 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, FetcherException;
+    URL getURLForQuery(QueryNode luceneQuery, int pageNumber)
+        throws URISyntaxException, MalformedURLException, FetcherException;
 
     @Override
-    default URL getURLForQuery(QueryNode luceneQuery) throws URISyntaxException, MalformedURLException, FetcherException {
+    default URL getURLForQuery(QueryNode luceneQuery)
+        throws URISyntaxException, MalformedURLException, FetcherException {
         return getURLForQuery(luceneQuery, 0);
     }
 
     @Override
-    default List<BibEntry> performSearch(QueryNode luceneQuery) throws FetcherException {
+    default List<BibEntry> performSearch(QueryNode luceneQuery)
+        throws FetcherException {
         return SearchBasedParserFetcher.super.performSearch(luceneQuery);
     }
 }
diff --git a/src/main/java/org/jabref/logic/importer/Parser.java b/src/main/java/org/jabref/logic/importer/Parser.java
index 86674d78c1f..e6b4fe8e1b1 100644
--- a/src/main/java/org/jabref/logic/importer/Parser.java
+++ b/src/main/java/org/jabref/logic/importer/Parser.java
@@ -4,17 +4,20 @@
 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}.
  */
 public interface Parser {
-
     List<BibEntry> parseEntries(InputStream inputStream) throws ParseException;
 
-    default List<BibEntry> parseEntries(String dataString) throws ParseException {
-        return parseEntries(new ByteArrayInputStream(dataString.getBytes(StandardCharsets.UTF_8)));
+    default List<BibEntry> parseEntries(String dataString)
+        throws ParseException {
+        return parseEntries(
+            new ByteArrayInputStream(
+                dataString.getBytes(StandardCharsets.UTF_8)
+            )
+        );
     }
 }
diff --git a/src/main/java/org/jabref/logic/importer/ParserResult.java b/src/main/java/org/jabref/logic/importer/ParserResult.java
index 2f134224562..9f5d0d97e05 100644
--- a/src/main/java/org/jabref/logic/importer/ParserResult.java
+++ b/src/main/java/org/jabref/logic/importer/ParserResult.java
@@ -9,7 +9,6 @@
 import java.util.Objects;
 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;
@@ -18,6 +17,7 @@
 import org.jabref.model.metadata.MetaData;
 
 public class ParserResult {
+
     private final Set<BibEntryType> entryTypes;
     private final List<String> warnings = new ArrayList<>();
     private BibDatabase database;
@@ -39,7 +39,11 @@ public ParserResult(BibDatabase database) {
         this(database, new MetaData(), new HashSet<>());
     }
 
-    public ParserResult(BibDatabase database, MetaData metaData, Set<BibEntryType> entryTypes) {
+    public ParserResult(
+        BibDatabase database,
+        MetaData metaData,
+        Set<BibEntryType> entryTypes
+    ) {
         this.database = Objects.requireNonNull(database);
         this.metaData = Objects.requireNonNull(metaData);
         this.entryTypes = Objects.requireNonNull(entryTypes);
@@ -55,7 +59,8 @@ public static ParserResult fromErrorMessage(String message) {
     private static String getErrorMessage(Exception exception) {
         String errorMessage = exception.getLocalizedMessage();
         if (exception.getCause() != null) {
-            errorMessage += " Caused by: " + exception.getCause().getLocalizedMessage();
+            errorMessage +=
+            " Caused by: " + exception.getCause().getLocalizedMessage();
         }
         return errorMessage;
     }
@@ -147,10 +152,12 @@ 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 wasChangedOnMigration() {
diff --git a/src/main/java/org/jabref/logic/importer/QueryParser.java b/src/main/java/org/jabref/logic/importer/QueryParser.java
index 65359122ff2..ca81271888b 100644
--- a/src/main/java/org/jabref/logic/importer/QueryParser.java
+++ b/src/main/java/org/jabref/logic/importer/QueryParser.java
@@ -6,14 +6,12 @@
 import java.util.List;
 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;
+import org.jabref.logic.importer.fetcher.ComplexSearchQuery;
 
 /**
  * This class converts a query string written in lucene syntax into a complex  query.
@@ -29,7 +27,9 @@ public class QueryParser {
      * @param query The given query string
      * @return A complex query containing all fields of the query string
      */
-    public Optional<ComplexSearchQuery> parseQueryStringIntoComplexQuery(String query) {
+    public Optional<ComplexSearchQuery> parseQueryStringIntoComplexQuery(
+        String query
+    ) {
         try {
             StandardQueryParser parser = new StandardQueryParser();
             Query luceneQuery = parser.parse(query, "default");
@@ -42,7 +42,11 @@ public Optional<ComplexSearchQuery> parseQueryStringIntoComplexQuery(String quer
             List<Term> sortedTerms = new ArrayList<>(terms);
             sortedTerms.sort(Comparator.comparing(Term::text).reversed());
             return Optional.of(ComplexSearchQuery.fromTerms(sortedTerms));
-        } catch (QueryNodeException | IllegalStateException | IllegalArgumentException ex) {
+        } catch (
+            QueryNodeException
+            | IllegalStateException
+            | IllegalArgumentException ex
+        ) {
             return Optional.empty();
         }
     }
diff --git a/src/main/java/org/jabref/logic/importer/SearchBasedFetcher.java b/src/main/java/org/jabref/logic/importer/SearchBasedFetcher.java
index 34858548f7e..ad0675ed564 100644
--- a/src/main/java/org/jabref/logic/importer/SearchBasedFetcher.java
+++ b/src/main/java/org/jabref/logic/importer/SearchBasedFetcher.java
@@ -1,16 +1,14 @@
 package org.jabref.logic.importer;
 
+import static org.jabref.logic.importer.fetcher.transformers.AbstractQueryTransformer.NO_EXPLICIT_FIELD;
+
 import java.util.Collections;
 import java.util.List;
-
-import org.jabref.model.entry.BibEntry;
-
 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 static org.jabref.logic.importer.fetcher.transformers.AbstractQueryTransformer.NO_EXPLICIT_FIELD;
+import org.jabref.model.entry.BibEntry;
 
 /**
  * Searches web resources for bibliographic information based on a free-text query.
@@ -20,7 +18,6 @@
  * </p>
  */
 public interface SearchBasedFetcher extends WebFetcher {
-
     /**
      * This method is used to send complex queries using fielded search.
      *
@@ -35,7 +32,8 @@ public interface SearchBasedFetcher extends WebFetcher {
      * @param searchQuery query string that can be parsed into a lucene query
      * @return a list of {@link BibEntry}, which are matched by the query (may be empty)
      */
-    default List<BibEntry> performSearch(String searchQuery) throws FetcherException {
+    default List<BibEntry> performSearch(String searchQuery)
+        throws FetcherException {
         if (searchQuery.isBlank()) {
             return Collections.emptyList();
         }
@@ -45,7 +43,9 @@ default List<BibEntry> performSearch(String searchQuery) throws FetcherException
         try {
             queryNode = parser.parse(searchQuery, NO_EXPLICIT_FIELD);
         } catch (QueryNodeParseException e) {
-            throw new FetcherException("An error occurred when parsing the query");
+            throw new FetcherException(
+                "An error occurred when parsing the query"
+            );
         }
 
         return this.performSearch(queryNode);
diff --git a/src/main/java/org/jabref/logic/importer/SearchBasedParserFetcher.java b/src/main/java/org/jabref/logic/importer/SearchBasedParserFetcher.java
index 1d9c2882acf..c4b0789b76c 100644
--- a/src/main/java/org/jabref/logic/importer/SearchBasedParserFetcher.java
+++ b/src/main/java/org/jabref/logic/importer/SearchBasedParserFetcher.java
@@ -6,12 +6,10 @@
 import java.net.URISyntaxException;
 import java.net.URL;
 import java.util.List;
-
+import org.apache.lucene.queryparser.flexible.core.nodes.QueryNode;
 import org.jabref.logic.cleanup.Formatter;
 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>
@@ -34,7 +32,6 @@
  * </p>
  */
 public interface SearchBasedParserFetcher extends SearchBasedFetcher {
-
     /**
      * This method is used to send queries with advanced URL parameters.
      * This method is necessary as the performSearch method does not support certain URL parameters that are used for
@@ -43,26 +40,40 @@ public interface SearchBasedParserFetcher extends SearchBasedFetcher {
      * @param luceneQuery the root node of the lucene query
      */
     @Override
-    default List<BibEntry> performSearch(QueryNode luceneQuery) throws FetcherException {
+    default List<BibEntry> performSearch(QueryNode luceneQuery)
+        throws FetcherException {
         // ADR-0014
         URL urlForQuery;
         try {
             urlForQuery = getURLForQuery(luceneQuery);
-        } catch (URISyntaxException | MalformedURLException | FetcherException e) {
-            throw new FetcherException("Search URI crafted from complex search query is malformed", e);
+        } catch (
+            URISyntaxException | MalformedURLException | FetcherException e
+        ) {
+            throw new FetcherException(
+                "Search URI crafted from complex search query is malformed",
+                e
+            );
         }
         return getBibEntries(urlForQuery);
     }
 
-    private List<BibEntry> getBibEntries(URL urlForQuery) throws FetcherException {
+    private List<BibEntry> getBibEntries(URL urlForQuery)
+        throws FetcherException {
         try (InputStream stream = getUrlDownload(urlForQuery).asInputStream()) {
             List<BibEntry> fetchedEntries = getParser().parseEntries(stream);
             fetchedEntries.forEach(this::doPostCleanup);
             return fetchedEntries;
         } catch (IOException e) {
-            throw new FetcherException("A network error occurred while fetching from " + urlForQuery, e);
+            throw new FetcherException(
+                "A network error occurred while fetching from " + urlForQuery,
+                e
+            );
         } catch (ParseException e) {
-            throw new FetcherException("An internal parser error occurred while fetching from " + urlForQuery, e);
+            throw new FetcherException(
+                "An internal parser error occurred while fetching from " +
+                urlForQuery,
+                e
+            );
         }
     }
 
@@ -76,7 +87,8 @@ 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;
 
     /**
      * Performs a cleanup of the fetched entry.
diff --git a/src/main/java/org/jabref/logic/importer/WebFetcher.java b/src/main/java/org/jabref/logic/importer/WebFetcher.java
index a1745cba6d1..6913234ac38 100644
--- a/src/main/java/org/jabref/logic/importer/WebFetcher.java
+++ b/src/main/java/org/jabref/logic/importer/WebFetcher.java
@@ -2,7 +2,6 @@
 
 import java.net.URL;
 import java.util.Optional;
-
 import org.jabref.logic.help.HelpFile;
 import org.jabref.logic.net.URLDownload;
 
@@ -10,7 +9,6 @@
  * Searches web resources for bibliographic information.
  */
 public interface WebFetcher {
-
     /**
      * Returns the localized name of this fetcher.
      * The title can be used to display the fetcher in the menu and in the side pane.
diff --git a/src/main/java/org/jabref/logic/importer/WebFetchers.java b/src/main/java/org/jabref/logic/importer/WebFetchers.java
index 8a3f741a452..36b57f75ee5 100644
--- a/src/main/java/org/jabref/logic/importer/WebFetchers.java
+++ b/src/main/java/org/jabref/logic/importer/WebFetchers.java
@@ -1,5 +1,10 @@
 package org.jabref.logic.importer;
 
+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;
@@ -7,7 +12,6 @@
 import java.util.Set;
 import java.util.SortedSet;
 import java.util.TreeSet;
-
 import org.jabref.logic.importer.fetcher.ACMPortalFetcher;
 import org.jabref.logic.importer.fetcher.ACS;
 import org.jabref.logic.importer.fetcher.ApsFetcher;
@@ -54,28 +58,21 @@
 import org.jabref.model.entry.identifier.Identifier;
 import org.jabref.preferences.FilePreferences;
 
-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;
-
 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();
             }
@@ -84,15 +81,21 @@ public static Optional<IdBasedFetcher> getIdBasedFetcherForField(Field field, Im
     }
 
     @SuppressWarnings("unchecked")
-    public static <T extends Identifier> IdFetcher<T> getIdFetcherForIdentifier(Class<T> clazz) {
+    public static <T extends Identifier> IdFetcher<T> getIdFetcherForIdentifier(
+        Class<T> clazz
+    ) {
         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()
+            );
         }
     }
 
-    public static Optional<IdFetcher<? extends Identifier>> getIdFetcherForField(Field field) {
+    public static Optional<
+        IdFetcher<? extends Identifier>
+    > getIdFetcherForField(Field field) {
         if (field == StandardField.DOI) {
             return Optional.of(new CrossRef());
         }
@@ -102,14 +105,24 @@ public static Optional<IdFetcher<? extends Identifier>> getIdFetcherForField(Fie
     /**
      * @return sorted set containing search based fetchers
      */
-    public static SortedSet<SearchBasedFetcher> getSearchBasedFetchers(ImportFormatPreferences importFormatPreferences, ImporterPreferences importerPreferences) {
-        SortedSet<SearchBasedFetcher> set = new TreeSet<>(new CompositeSearchFirstComparator());
+    public static SortedSet<SearchBasedFetcher> getSearchBasedFetchers(
+        ImportFormatPreferences importFormatPreferences,
+        ImporterPreferences importerPreferences
+    ) {
+        SortedSet<SearchBasedFetcher> set = new TreeSet<>(
+            new CompositeSearchFirstComparator()
+        );
         set.add(new ArXivFetcher(importFormatPreferences));
         set.add(new INSPIREFetcher(importFormatPreferences));
         set.add(new GvkFetcher(importFormatPreferences));
         set.add(new BvbFetcher());
         set.add(new MedlineFetcher());
-        set.add(new AstrophysicsDataSystem(importFormatPreferences, importerPreferences));
+        set.add(
+            new AstrophysicsDataSystem(
+                importFormatPreferences,
+                importerPreferences
+            )
+        );
         set.add(new MathSciNet(importFormatPreferences));
         set.add(new ZbMATH(importFormatPreferences));
         set.add(new ACMPortalFetcher());
@@ -135,14 +148,23 @@ public static SortedSet<SearchBasedFetcher> getSearchBasedFetchers(ImportFormatP
     /**
      * @return sorted set containing id based fetchers
      */
-    public static SortedSet<IdBasedFetcher> getIdBasedFetchers(ImportFormatPreferences importFormatPreferences,
-                                                               ImporterPreferences importerPreferences) {
-        SortedSet<IdBasedFetcher> set = new TreeSet<>(Comparator.comparing(WebFetcher::getName));
+    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 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());
@@ -161,22 +183,37 @@ public static SortedSet<IdBasedFetcher> getIdBasedFetchers(ImportFormatPreferenc
     /**
      * @return sorted set containing entry based fetchers
      */
-    public static SortedSet<EntryBasedFetcher> getEntryBasedFetchers(ImporterPreferences importerPreferences,
-                                                                     ImportFormatPreferences importFormatPreferences,
-                                                                     FilePreferences filePreferences,
-                                                                     BibDatabaseContext databaseContext) {
-        SortedSet<EntryBasedFetcher> set = new TreeSet<>(Comparator.comparing(WebFetcher::getName));
+    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));
+        set.add(
+            new AstrophysicsDataSystem(
+                importFormatPreferences,
+                importerPreferences
+            )
+        );
         set.add(new DoiFetcher(importFormatPreferences));
         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));
-        set.add(new PdfMergeMetadataImporter.EntryBasedFetcherWrapper(importFormatPreferences, filePreferences, databaseContext));
+        set.add(
+            new PdfMergeMetadataImporter.EntryBasedFetcherWrapper(
+                importFormatPreferences,
+                filePreferences,
+                databaseContext
+            )
+        );
         set.add(new SemanticScholar(importerPreferences));
         set.add(new ResearchGate(importFormatPreferences));
         return set;
@@ -185,8 +222,12 @@ public static SortedSet<EntryBasedFetcher> getEntryBasedFetchers(ImporterPrefere
     /**
      * @return sorted set containing id fetchers
      */
-    public static SortedSet<IdFetcher<? extends Identifier>> getIdFetchers(ImportFormatPreferences importFormatPreferences) {
-        SortedSet<IdFetcher<?>> set = new TreeSet<>(Comparator.comparing(WebFetcher::getName));
+    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));
         return set;
@@ -195,11 +236,16 @@ 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
-        fetchers.add(new DoiResolution(importFormatPreferences.doiPreferences()));
+        fetchers.add(
+            new DoiResolution(importFormatPreferences.doiPreferences())
+        );
 
         // Publishers
         fetchers.add(new ScienceDirect(importerPreferences));
@@ -223,12 +269,20 @@ 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));
         fetchers.add(new ScienceDirect(importerPreferences));
-        fetchers.add(new AstrophysicsDataSystem(importFormatPreferences, importerPreferences));
+        fetchers.add(
+            new AstrophysicsDataSystem(
+                importFormatPreferences,
+                importerPreferences
+            )
+        );
         fetchers.add(new BiodiversityLibrary(importerPreferences));
         return fetchers;
     }
@@ -238,9 +292,15 @@ public static Set<CustomizableKeyFetcher> getCustomizableKeyFetchers(ImportForma
  *  Places "Search Selected" to the first of the set
  */
 class CompositeSearchFirstComparator implements Comparator<SearchBasedFetcher> {
+
     @Override
     public int compare(SearchBasedFetcher s1, SearchBasedFetcher s2) {
-        if (Objects.equals(s1.getName(), CompositeSearchBasedFetcher.FETCHER_NAME)) {
+        if (
+            Objects.equals(
+                s1.getName(),
+                CompositeSearchBasedFetcher.FETCHER_NAME
+            )
+        ) {
             return -1;
         } else {
             return s1.getName().compareTo(s2.getName());
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 5fd153a07f2..6ab46df5beb 100644
--- a/src/main/java/org/jabref/logic/importer/fetcher/ACMPortalFetcher.java
+++ b/src/main/java/org/jabref/logic/importer/fetcher/ACMPortalFetcher.java
@@ -6,7 +6,8 @@
 import java.net.URISyntaxException;
 import java.net.URL;
 import java.util.Optional;
-
+import org.apache.http.client.utils.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.Parser;
@@ -14,14 +15,12 @@
 import org.jabref.logic.importer.fetcher.transformers.DefaultQueryTransformer;
 import org.jabref.logic.importer.fileformat.ACMPortalParser;
 
-import org.apache.http.client.utils.URIBuilder;
-import org.apache.lucene.queryparser.flexible.core.nodes.QueryNode;
-
 public class ACMPortalFetcher implements SearchBasedParserFetcher {
 
     public static final String FETCHER_NAME = "ACM Portal";
 
-    private static final String SEARCH_URL = "https://dl.acm.org/action/doSearch";
+    private static final String SEARCH_URL =
+        "https://dl.acm.org/action/doSearch";
 
     public ACMPortalFetcher() {
         // website dl.acm.org requires cookies
@@ -39,7 +38,9 @@ public Optional<HelpFile> getHelpPage() {
     }
 
     private static String createQueryString(QueryNode query) {
-        return new DefaultQueryTransformer().transformLuceneQuery(query).orElse("");
+        return new DefaultQueryTransformer()
+            .transformLuceneQuery(query)
+            .orElse("");
     }
 
     /**
@@ -49,7 +50,8 @@ private static String createQueryString(QueryNode query) {
      * @return query URL
      */
     @Override
-    public URL getURLForQuery(QueryNode query) throws URISyntaxException, MalformedURLException, FetcherException {
+    public URL getURLForQuery(QueryNode query)
+        throws URISyntaxException, MalformedURLException, FetcherException {
         URIBuilder uriBuilder = new URIBuilder(SEARCH_URL);
         uriBuilder.addParameter("AllField", createQueryString(query));
         return uriBuilder.build().toURL();
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 b2fff10f38f..fa3ba1b29e8 100644
--- a/src/main/java/org/jabref/logic/importer/fetcher/ACS.java
+++ b/src/main/java/org/jabref/logic/importer/fetcher/ACS.java
@@ -4,12 +4,10 @@
 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;
@@ -20,6 +18,7 @@
  * FulltextFetcher implementation that attempts to find a PDF URL at ACS.
  */
 public class ACS implements FulltextFetcher {
+
     private static final Logger LOGGER = LoggerFactory.getLogger(ACS.class);
 
     private static final String SOURCE = "https://pubs.acs.org/doi/abs/%s";
@@ -39,7 +38,9 @@ public Optional<URL> findFullText(BibEntry entry) throws IOException {
         Objects.requireNonNull(entry);
 
         // DOI search
-        Optional<DOI> doi = entry.getField(StandardField.DOI).flatMap(DOI::parse);
+        Optional<DOI> doi = entry
+            .getField(StandardField.DOI)
+            .flatMap(DOI::parse);
 
         if (!doi.isPresent()) {
             return Optional.empty();
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 efa37343f95..38d7d1889b1 100644
--- a/src/main/java/org/jabref/logic/importer/fetcher/AbstractIsbnFetcher.java
+++ b/src/main/java/org/jabref/logic/importer/fetcher/AbstractIsbnFetcher.java
@@ -1,7 +1,6 @@
 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.IdBasedParserFetcher;
@@ -15,7 +14,9 @@ public abstract class AbstractIsbnFetcher implements IdBasedParserFetcher {
 
     protected final ImportFormatPreferences importFormatPreferences;
 
-    public AbstractIsbnFetcher(ImportFormatPreferences importFormatPreferences) {
+    public AbstractIsbnFetcher(
+        ImportFormatPreferences importFormatPreferences
+    ) {
         this.importFormatPreferences = importFormatPreferences;
     }
 
@@ -24,10 +25,13 @@ public Optional<HelpFile> getHelpPage() {
         return Optional.of(HelpFile.FETCHER_ISBN);
     }
 
-    protected void ensureThatIsbnIsValid(String identifier) throws FetcherException {
+    protected void ensureThatIsbnIsValid(String identifier)
+        throws FetcherException {
         ISBN isbn = new ISBN(identifier);
         if (!isbn.isValid()) {
-            throw new FetcherException(Localization.lang("Invalid ISBN: '%0'.", identifier));
+            throw new FetcherException(
+                Localization.lang("Invalid ISBN: '%0'.", identifier)
+            );
         }
     }
 
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 3d589ffa9c7..028ecbd5d0d 100644
--- a/src/main/java/org/jabref/logic/importer/fetcher/ApsFetcher.java
+++ b/src/main/java/org/jabref/logic/importer/fetcher/ApsFetcher.java
@@ -6,13 +6,11 @@
 import java.net.URLConnection;
 import java.util.Objects;
 import java.util.Optional;
-
+import kong.unirest.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.Unirest;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -22,7 +20,9 @@
  */
 public class ApsFetcher implements FulltextFetcher {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(ApsFetcher.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(
+        ApsFetcher.class
+    );
 
     // The actual API needs either an API key or a header. This is a workaround.
     private static final String DOI_URL = "https://www.doi.org/";
@@ -32,7 +32,9 @@ public class ApsFetcher 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.isPresent()) {
             return Optional.empty();
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 6586226e275..998254f2bdd 100644
--- a/src/main/java/org/jabref/logic/importer/fetcher/ArXivFetcher.java
+++ b/src/main/java/org/jabref/logic/importer/fetcher/ArXivFetcher.java
@@ -18,11 +18,11 @@
 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.http.client.utils.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;
@@ -46,9 +46,6 @@
 import org.jabref.model.paging.Page;
 import org.jabref.model.strings.StringUtil;
 import org.jabref.model.util.OptionalUtil;
-
-import org.apache.http.client.utils.URIBuilder;
-import org.apache.lucene.queryparser.flexible.core.nodes.QueryNode;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.w3c.dom.Document;
@@ -69,9 +66,16 @@
  * @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);
+    private static final Logger LOGGER = LoggerFactory.getLogger(
+        ArXivFetcher.class
+    );
 
     // See https://blog.arxiv.org/2022/02/17/new-arxiv-articles-are-now-automatically-assigned-dois/
     private static final String DOI_PREFIX = "10.48550/arXiv.";
@@ -81,7 +85,10 @@ 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:
@@ -90,11 +97,23 @@ 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 Map<String, String> ARXIV_KEYWORDS_WITH_COMMA_REPLACEMENTS = Collections.unmodifiableMap(Map.of(
-            "Computational Engineering, Finance, and Science", "Computational Engineering / Finance / Science",
-            "Distributed, Parallel, and Cluster Computing", "Distributed / Parallel / Cluster Computing"));
+    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 = Collections.unmodifiableMap(
+        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;
@@ -107,7 +126,10 @@ public ArXivFetcher(ImportFormatPreferences importFormatPreferences) {
     /**
      * @param doiFetcher The fetcher, maybe be NULL if no additional search is desired.
      */
-    public ArXivFetcher(ImportFormatPreferences importFormatPreferences, DoiFetcher doiFetcher) {
+    public ArXivFetcher(
+        ImportFormatPreferences importFormatPreferences,
+        DoiFetcher doiFetcher
+    ) {
         this.arXiv = new ArXiv(importFormatPreferences);
         this.doiFetcher = doiFetcher;
         this.importFormatPreferences = importFormatPreferences;
@@ -139,19 +161,34 @@ public Optional<HelpFile> getHelpPage() {
      * @param bibEntry A BibEntry to modify
      */
     private void adaptKeywordsFrom(BibEntry bibEntry) {
-        Optional<String> allKeywords = bibEntry.getField(StandardField.KEYWORDS);
+        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
             // (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(
+            String filteredKeywords = KeywordList
+                .merge(
                     allKeywords.get(),
                     "",
-                    importFormatPreferences.bibEntryPreferences().getKeywordSeparator()).toString();
+                    importFormatPreferences
+                        .bibEntryPreferences()
+                        .getKeywordSeparator()
+                )
+                .toString();
             bibEntry.setField(StandardField.KEYWORDS, filteredKeywords);
         }
     }
@@ -180,9 +217,13 @@ private static String getAutomaticDoi(String arXivId) {
     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
         // ArXiv's API again (method 'findIdentifier')
-        Optional<String> entryEprint = arXivBibEntry.getField(StandardField.EPRINT);
+        Optional<String> entryEprint = arXivBibEntry.getField(
+            StandardField.EPRINT
+        );
         if (entryEprint.isEmpty()) {
-            LOGGER.error("Cannot infer ArXiv-issued DOI from BibEntry: no 'EPRINT' field found");
+            LOGGER.error(
+                "Cannot infer ArXiv-issued DOI from BibEntry: no 'EPRINT' field found"
+            );
             return Optional.empty();
         } else {
             return Optional.of(ArXivFetcher.getAutomaticDoi(entryEprint.get()));
@@ -218,7 +259,9 @@ private static boolean isManualDoi(String doi) {
      * @return User-issued DOI, if any field exists and if it's not an automatic one (see {@link #getAutomaticDoi(ArXivIdentifier)})
      */
     private static Optional<String> getManualDoi(BibEntry arXivBibEntry) {
-        return arXivBibEntry.getField(StandardField.DOI).filter(ArXivFetcher::isManualDoi);
+        return arXivBibEntry
+            .getField(StandardField.DOI)
+            .filter(ArXivFetcher::isManualDoi);
     }
 
     /**
@@ -227,12 +270,17 @@ 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) {
             if (!(e.getCause() instanceof FetcherException)) {
-                LOGGER.error("The supplied future should only throw a FetcherException.", e);
+                LOGGER.error(
+                    "The supplied future should only throw a FetcherException.",
+                    e
+                );
                 throw e;
             }
             throw (FetcherException) e.getCause();
@@ -247,12 +295,21 @@ 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);
         } catch (FetcherException | CompletionException e) {
-            LOGGER.error("Failed to fetch future BibEntry with id '{}' (skipping merge).", id, e);
+            LOGGER.error(
+                "Failed to fetch future BibEntry with id '{}' (skipping merge).",
+                id,
+                e
+            );
             return;
         }
 
@@ -260,7 +317,10 @@ 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
+            );
         }
     }
 
@@ -270,14 +330,23 @@ 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);
+            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
+            );
         }
     }
 
@@ -288,9 +357,13 @@ 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 {
-
-        Optional<CompletableFuture<Optional<BibEntry>>> automaticDoiBibEntryFuture;
+    private void inplaceAsyncInfuseArXivWithDoi(
+        CompletableFuture<Optional<BibEntry>> arXivBibEntryFuture,
+        Optional<ArXivIdentifier> arXivId
+    ) throws FetcherException {
+        Optional<
+            CompletableFuture<Optional<BibEntry>>
+        > automaticDoiBibEntryFuture;
         Optional<BibEntry> arXivBibEntry;
 
         Optional<String> automaticDoi;
@@ -300,31 +373,54 @@ private void inplaceAsyncInfuseArXivWithDoi(CompletableFuture<Optional<BibEntry>
         // 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()));
-
-            arXivBibEntry = ArXivFetcher.waitForBibEntryRetrieval(arXivBibEntryFuture);
+            automaticDoi =
+                Optional.of(ArXivFetcher.getAutomaticDoi(arXivId.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)
-            arXivBibEntry = ArXivFetcher.waitForBibEntryRetrieval(arXivBibEntryFuture);
+            arXivBibEntry =
+                ArXivFetcher.waitForBibEntryRetrieval(arXivBibEntryFuture);
             if (arXivBibEntry.isEmpty()) {
                 return;
             }
 
             automaticDoi = ArXivFetcher.getAutomaticDoi(arXivBibEntry.get());
-            automaticDoiBibEntryFuture = automaticDoi.map(arXiv::asyncPerformSearchById);
+            automaticDoiBibEntryFuture =
+                automaticDoi.map(arXiv::asyncPerformSearchById);
         }
 
         manualDoi = ArXivFetcher.getManualDoi(arXivBibEntry.get());
-        Optional<CompletableFuture<Optional<BibEntry>>> manualDoiBibEntryFuture = manualDoi.map(doiFetcher::asyncPerformSearchById);
+        Optional<
+            CompletableFuture<Optional<BibEntry>>
+        > manualDoiBibEntryFuture = manualDoi.map(
+            doiFetcher::asyncPerformSearchById
+        );
 
         automaticDoiBibEntryFuture.ifPresent(future ->
-                mergeArXivEntryWithFutureDoiEntry(arXivBibEntry.get(), future, CHOSEN_AUTOMATIC_DOI_FIELDS, automaticDoi.get()));
+            mergeArXivEntryWithFutureDoiEntry(
+                arXivBibEntry.get(),
+                future,
+                CHOSEN_AUTOMATIC_DOI_FIELDS,
+                automaticDoi.get()
+            )
+        );
         manualDoiBibEntryFuture.ifPresent(future ->
-                mergeArXivEntryWithFutureDoiEntry(arXivBibEntry.get(), future, CHOSEN_MANUAL_DOI_FIELDS, manualDoi.get()));
+            mergeArXivEntryWithFutureDoiEntry(
+                arXivBibEntry.get(),
+                future,
+                CHOSEN_MANUAL_DOI_FIELDS,
+                manualDoi.get()
+            )
+        );
     }
 
     /**
@@ -335,42 +431,65 @@ 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 {
-
-        Page<BibEntry> result = arXiv.performSearchPaged(luceneQuery, pageNumber);
+    public Page<BibEntry> performSearchPaged(
+        QueryNode luceneQuery,
+        int pageNumber
+    ) throws FetcherException {
+        Page<BibEntry> result = arXiv.performSearchPaged(
+            luceneQuery,
+            pageNumber
+        );
         if (this.doiFetcher == null) {
             return result;
         }
 
-        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());
-
-        return new Page<>(result.getQuery(), result.getPageNumber(), modifiedSearchResult);
+        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());
+
+        return new Page<>(
+            result.getQuery(),
+            result.getPageNumber(),
+            modifiedSearchResult
+        );
     }
 
     @Override
-    public Optional<BibEntry> performSearchById(String identifier) throws FetcherException {
-        CompletableFuture<Optional<BibEntry>> arXivBibEntryPromise = arXiv.asyncPerformSearchById(identifier);
+    public Optional<BibEntry> performSearchById(String identifier)
+        throws FetcherException {
+        CompletableFuture<Optional<BibEntry>> arXivBibEntryPromise =
+            arXiv.asyncPerformSearchById(identifier);
         if (this.doiFetcher != null) {
-            inplaceAsyncInfuseArXivWithDoi(arXivBibEntryPromise, ArXivIdentifier.parse(identifier));
+            inplaceAsyncInfuseArXivWithDoi(
+                arXivBibEntryPromise,
+                ArXivIdentifier.parse(identifier)
+            );
         }
         return arXivBibEntryPromise.join();
     }
 
     @Override
-    public Optional<ArXivIdentifier> findIdentifier(BibEntry entry) throws FetcherException {
+    public Optional<ArXivIdentifier> findIdentifier(BibEntry entry)
+        throws FetcherException {
         return arXiv.findIdentifier(entry);
     }
 
@@ -390,11 +509,19 @@ 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 class ArXiv implements FulltextFetcher, PagedSearchBasedFetcher, IdBasedFetcher, IdFetcher<ArXivIdentifier> {
+    protected class ArXiv
+        implements
+            FulltextFetcher,
+            PagedSearchBasedFetcher,
+            IdBasedFetcher,
+            IdFetcher<ArXivIdentifier> {
 
-        private static final Logger LOGGER = LoggerFactory.getLogger(ArXivFetcher.ArXiv.class);
+        private static final Logger LOGGER = LoggerFactory.getLogger(
+            ArXivFetcher.ArXiv.class
+        );
 
-        private static final String API_URL = "https://export.arxiv.org/api/query";
+        private static final String API_URL =
+            "https://export.arxiv.org/api/query";
 
         private final ImportFormatPreferences importFormatPreferences;
 
@@ -407,12 +534,15 @@ 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();
-                pdfUrl.ifPresent(url -> LOGGER.info("Fulltext PDF found @ arXiv."));
+                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) {
                 LOGGER.warn("arXiv API request failed", e);
@@ -426,8 +556,14 @@ public TrustLevel getTrustLevel() {
             return TrustLevel.PREPRINT;
         }
 
-        private Optional<ArXivEntry> searchForEntry(String searchQuery) throws FetcherException {
-            List<ArXivEntry> entries = queryApi(searchQuery, Collections.emptyList(), 0, 1);
+        private Optional<ArXivEntry> searchForEntry(String searchQuery)
+            throws FetcherException {
+            List<ArXivEntry> entries = queryApi(
+                searchQuery,
+                Collections.emptyList(),
+                0,
+                1
+            );
             if (entries.size() == 1) {
                 return Optional.of(entries.get(0));
             } else {
@@ -435,13 +571,19 @@ private Optional<ArXivEntry> searchForEntry(String searchQuery) throws FetcherEx
             }
         }
 
-        private Optional<ArXivEntry> searchForEntryById(String id) throws FetcherException {
+        private Optional<ArXivEntry> searchForEntryById(String id)
+            throws FetcherException {
             Optional<ArXivIdentifier> identifier = ArXivIdentifier.parse(id);
             if (identifier.isEmpty()) {
                 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.get(0));
             } else {
@@ -449,7 +591,8 @@ private Optional<ArXivEntry> searchForEntryById(String id) throws FetcherExcepti
             }
         }
 
-        private List<ArXivEntry> searchForEntries(BibEntry originalEntry) throws FetcherException {
+        private List<ArXivEntry> searchForEntries(BibEntry originalEntry)
+            throws FetcherException {
             // We need to clone the entry, because we modify it by a cleanup job.
             final BibEntry entry = (BibEntry) originalEntry.clone();
 
@@ -459,7 +602,9 @@ private List<ArXivEntry> searchForEntries(BibEntry originalEntry) throws Fetcher
             if (StringUtil.isNotBlank(identifier)) {
                 try {
                     // Get pdf of entry with the specified id
-                    return OptionalUtil.toList(searchForEntryById(identifier.get()));
+                    return OptionalUtil.toList(
+                        searchForEntryById(identifier.get())
+                    );
                 } catch (FetcherException e) {
                     LOGGER.warn("arXiv eprint API request failed", e);
                 }
@@ -467,17 +612,29 @@ 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
-            if (doiString.isPresent() && ArXivFetcher.isManualDoi(doiString.get())) {
+            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));
-                query = String.join("+AND+", OptionalUtil.toList(authorQuery, titleQuery));
+                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)
+                    );
             }
 
             Optional<ArXivEntry> arxivEntry = searchForEntry(query);
@@ -485,7 +642,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);
                 }
@@ -494,16 +653,33 @@ 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)
-                throws FetcherException {
+        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"));
-
-            return entries.stream().map(ArXivEntry::new).collect(Collectors.toList());
+            List<Node> entries = XMLUtil.asList(
+                result.getElementsByTagName("entry")
+            );
+
+            return entries
+                .stream()
+                .map(ArXivEntry::new)
+                .collect(Collectors.toList());
         }
 
         /**
@@ -522,42 +698,74 @@ 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"
+                );
             }
 
             try {
                 URIBuilder uriBuilder = new URIBuilder(API_URL);
                 // The arXiv API has problems with accents, so we remove them (i.e. Fréchet -> Frechet)
                 if (StringUtil.isNotBlank(searchQuery)) {
-                    uriBuilder.addParameter("search_query", StringUtil.stripAccents(searchQuery));
+                    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));
+                uriBuilder.addParameter(
+                    "max_results",
+                    String.valueOf(maxResults)
+                );
                 URL url = uriBuilder.build().toURL();
 
-                DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
+                DocumentBuilderFactory factory =
+                    DocumentBuilderFactory.newInstance();
                 DocumentBuilder builder = factory.newDocumentBuilder();
 
-                HttpURLConnection connection = (HttpURLConnection) url.openConnection();
+                HttpURLConnection connection =
+                    (HttpURLConnection) url.openConnection();
                 if (connection.getResponseCode() == 400) {
                     // Bad request error from server, try to get more information
-                    throw getException(builder.parse(connection.getErrorStream()));
+                    throw getException(
+                        builder.parse(connection.getErrorStream())
+                    );
                 } else {
                     return builder.parse(connection.getInputStream());
                 }
-            } catch (SAXException | ParserConfigurationException | IOException | URISyntaxException exception) {
-                throw new FetcherException("arXiv API request failed", exception);
+            } catch (
+                SAXException
+                | ParserConfigurationException
+                | IOException
+                | URISyntaxException exception
+            ) {
+                throw new FetcherException(
+                    "arXiv API request failed",
+                    exception
+                );
             }
         }
 
         private FetcherException getException(Document error) {
-            List<Node> entries = XMLUtil.asList(error.getElementsByTagName("entry"));
+            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:
@@ -570,9 +778,15 @@ private FetcherException getException(Document error) {
             if (entries.size() == 1) {
                 Node node = entries.get(0);
                 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);
                 }
             }
@@ -596,26 +810,68 @@ 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());
-            return new Page<>(transformedQuery, pageNumber, filterYears(searchResult, transformer));
+            String transformedQuery = transformer
+                .transformLuceneQuery(luceneQuery)
+                .orElse("");
+            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) {
-            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());
+        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());
         }
 
-        protected CompletableFuture<Optional<BibEntry>> asyncPerformSearchById(String identifier) throws CompletionException {
+        protected CompletableFuture<Optional<BibEntry>> asyncPerformSearchById(
+            String identifier
+        ) throws CompletionException {
             return CompletableFuture.supplyAsync(() -> {
                 try {
                     return performSearchById(identifier);
@@ -626,18 +882,27 @@ protected CompletableFuture<Optional<BibEntry>> asyncPerformSearchById(String id
         }
 
         @Override
-        public Optional<BibEntry> performSearchById(String identifier) throws FetcherException {
+        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();
+        public Optional<ArXivIdentifier> findIdentifier(BibEntry entry)
+            throws FetcherException {
+            return searchForEntries(entry)
+                .stream()
+                .map(ArXivEntry::getId)
+                .filter(Optional::isPresent)
+                .map(Optional::get)
+                .findFirst();
         }
 
         @Override
@@ -663,7 +928,10 @@ public ArXivEntry(Node item) {
 
                 // Title of the article
                 // The result from the arXiv contains hard line breaks, try to remove them
-                title = XMLUtil.getNodeContent(item, "title").map(ArXivEntry::correctLineBreaks);
+                title =
+                    XMLUtil
+                        .getNodeContent(item, "title")
+                        .map(ArXivEntry::correctLineBreaks);
 
                 // The url leading to the abstract page
                 urlAbstractPage = XMLUtil.getNodeContent(item, "id");
@@ -672,35 +940,52 @@ public ArXivEntry(Node item) {
                 publishedDate = XMLUtil.getNodeContent(item, "published");
 
                 // Abstract of the article
-                abstractText = XMLUtil.getNodeContent(item, "summary").map(ArXivEntry::correctLineBreaks)
-                                      .map(String::trim);
+                abstractText =
+                    XMLUtil
+                        .getNodeContent(item, "summary")
+                        .map(ArXivEntry::correctLineBreaks)
+                        .map(String::trim);
 
                 // 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);
                 }
 
                 // Categories (arXiv, ACM, or MSC classification)
                 categories = new ArrayList<>();
-                for (Node categoryNode : XMLUtil.getNodesByName(item, "category")) {
-                    Optional<String> category = XMLUtil.getAttributeContent(categoryNode, "term");
+                for (Node categoryNode : XMLUtil.getNodesByName(
+                    item,
+                    "category"
+                )) {
+                    Optional<String> category = XMLUtil.getAttributeContent(
+                        categoryNode,
+                        "term"
+                    );
                     category.ifPresent(categories::add);
                 }
 
                 // Links
                 Optional<URL> pdfUrlParsed = Optional.empty();
                 for (Node linkNode : XMLUtil.getNodesByName(item, "link")) {
-                    Optional<String> linkTitle = XMLUtil.getAttributeContent(linkNode, "title");
+                    Optional<String> linkTitle = XMLUtil.getAttributeContent(
+                        linkNode,
+                        "title"
+                    );
                     if (linkTitle.equals(Optional.of("pdf"))) {
-                        pdfUrlParsed = XMLUtil.getAttributeContent(linkNode, "href").map(url -> {
-                            try {
-                                return new URL(url);
-                            } catch (MalformedURLException e) {
-                                return null;
-                            }
-                        });
+                        pdfUrlParsed =
+                            XMLUtil
+                                .getAttributeContent(linkNode, "href")
+                                .map(url -> {
+                                    try {
+                                        return new URL(url);
+                                    } catch (MalformedURLException e) {
+                                        return null;
+                                    }
+                                });
                     }
                 }
                 pdfUrl = pdfUrlParsed;
@@ -709,18 +994,25 @@ public ArXivEntry(Node item) {
                 doi = XMLUtil.getNodeContent(item, "arxiv:doi");
 
                 // Journal reference (as provided by the author)
-                journalReferenceText = XMLUtil.getNodeContent(item, "arxiv:journal_ref");
+                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"));
+                primaryCategory =
+                    XMLUtil
+                        .getNode(item, "arxiv:primary_category")
+                        .flatMap(node ->
+                            XMLUtil.getAttributeContent(node, "term")
+                        );
             }
 
             public static String correctLineBreaks(String s) {
                 String result = s.replaceAll("\\n(?!\\s*\\n)", " ");
                 result = result.replaceAll("\\s*\\n\\s*", "\n");
-                return result.replaceAll(" {2,}", " ").replaceAll("(^\\s*|\\s+$)", "");
+                return result
+                    .replaceAll(" {2,}", " ")
+                    .replaceAll("(^\\s*|\\s+$)", "");
             }
 
             /**
@@ -734,7 +1026,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() {
@@ -758,16 +1052,41 @@ public Optional<String> getDate() {
             public BibEntry toBibEntry(Character keywordDelimiter) {
                 BibEntry bibEntry = new BibEntry(StandardEntryType.Article);
                 bibEntry.setField(StandardField.EPRINTTYPE, "arXiv");
-                bibEntry.setField(StandardField.AUTHOR, String.join(" and ", authorNames));
+                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));
-                doi.ifPresent(doiContent -> bibEntry.setField(StandardField.DOI, doiContent));
-                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"))));
+                getIdString()
+                    .ifPresent(id -> bibEntry.setField(StandardField.EPRINT, id)
+                    );
+                title.ifPresent(titleContent ->
+                    bibEntry.setField(StandardField.TITLE, titleContent)
+                );
+                doi.ifPresent(doiContent ->
+                    bibEntry.setField(StandardField.DOI, doiContent)
+                );
+                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")
+                            )
+                        )
+                    );
                 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 65a32b295cb..ec48157edb6 100644
--- a/src/main/java/org/jabref/logic/importer/fetcher/AstrophysicsDataSystem.java
+++ b/src/main/java/org/jabref/logic/importer/fetcher/AstrophysicsDataSystem.java
@@ -11,7 +11,11 @@
 import java.util.Objects;
 import java.util.Optional;
 import java.util.stream.Collectors;
-
+import kong.unirest.json.JSONArray;
+import kong.unirest.json.JSONException;
+import kong.unirest.json.JSONObject;
+import org.apache.http.client.utils.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;
@@ -38,26 +42,30 @@
 import org.jabref.model.paging.Page;
 import org.jabref.model.strings.StringUtil;
 
-import kong.unirest.json.JSONArray;
-import kong.unirest.json.JSONException;
-import kong.unirest.json.JSONObject;
-import org.apache.http.client.utils.URIBuilder;
-import org.apache.lucene.queryparser.flexible.core.nodes.QueryNode;
-
 /**
  * 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 {
-
-    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_KEY = new BuildInfo().astrophysicsDataSystemAPIKey;
+    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_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;
     }
@@ -74,7 +82,8 @@ private static String buildPostData(Collection<String> bibcodes) {
     /**
      * @return export URL endpoint
      */
-    private static URL getURLforExport() throws URISyntaxException, MalformedURLException {
+    private static URL getURLforExport()
+        throws URISyntaxException, MalformedURLException {
         return new URIBuilder(API_EXPORT_URL).build().toURL();
     }
 
@@ -88,12 +97,21 @@ 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, FetcherException {
+    public URL getURLForQuery(QueryNode luceneQuery, int pageNumber)
+        throws URISyntaxException, MalformedURLException, FetcherException {
         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));
+        builder.addParameter(
+            "start",
+            String.valueOf(getPageSize() * pageNumber)
+        );
         return builder.build().toURL();
     }
 
@@ -102,16 +120,21 @@ public URL getURLForQuery(QueryNode luceneQuery, int pageNumber) throws URISynta
      * @return URL which points to a search request for given entry
      */
     @Override
-    public URL getURLForEntry(BibEntry entry) throws URISyntaxException, MalformedURLException {
+    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(""));
         }
@@ -129,8 +152,10 @@ 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 FetcherException, URISyntaxException, MalformedURLException {
-        String query = "doi:\"" + identifier + "\" OR " + "bibcode:\"" + identifier + "\"";
+    public URL getUrlForIdentifier(String identifier)
+        throws FetcherException, URISyntaxException, MalformedURLException {
+        String query =
+            "doi:\"" + identifier + "\" OR " + "bibcode:\"" + identifier + "\"";
         URIBuilder builder = new URIBuilder(API_SEARCH_URL);
         builder.addParameter("q", query);
         builder.addParameter("fl", "bibcode");
@@ -149,32 +174,66 @@ public Parser getParser() {
 
     @Override
     public void doPostCleanup(BibEntry entry) {
-        new FieldFormatterCleanup(StandardField.ABSTRACT, new RemoveBracesFormatter()).cleanup(entry);
-        new FieldFormatterCleanup(StandardField.ABSTRACT, new RemoveNewlinesFormatter()).cleanup(entry);
-        new FieldFormatterCleanup(StandardField.TITLE, new RemoveBracesFormatter()).cleanup(entry);
-        new FieldFormatterCleanup(StandardField.AUTHOR, new NormalizeNamesFormatter()).cleanup(entry);
-        new FieldFormatterCleanup(StandardField.MONTH, new NormalizeMonthFormatter()).cleanup(entry);
+        new FieldFormatterCleanup(
+            StandardField.ABSTRACT,
+            new RemoveBracesFormatter()
+        )
+            .cleanup(entry);
+        new FieldFormatterCleanup(
+            StandardField.ABSTRACT,
+            new RemoveNewlinesFormatter()
+        )
+            .cleanup(entry);
+        new FieldFormatterCleanup(
+            StandardField.TITLE,
+            new RemoveBracesFormatter()
+        )
+            .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);
+        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));
-
-        entry.getField(StandardField.ABSTRACT)
-             .map(abstractText -> abstractText.replace("<P />", ""))
-             .map(abstractText -> abstractText.replace("\\textbackslash", ""))
-             .map(String::trim)
-             .ifPresent(abstractText -> entry.setField(StandardField.ABSTRACT, abstractText));
+        new MoveFieldCleanup(new UnknownField("adsurl"), StandardField.URL)
+            .cleanup(entry);
+        entry
+            .getField(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)
+            );
         // 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()) {
+    public List<BibEntry> performSearch(BibEntry entry)
+        throws FetcherException {
+        if (
+            entry.getFieldOrAlias(StandardField.TITLE).isEmpty() &&
+            entry.getFieldOrAlias(StandardField.AUTHOR).isEmpty()
+        ) {
             return Collections.emptyList();
         }
 
@@ -197,7 +256,9 @@ private List<String> fetchBibcodes(URL url) throws FetcherException {
             URLDownload download = getUrlDownload(url);
             String content = download.asString();
             JSONObject obj = new JSONObject(content);
-            JSONArray codes = obj.getJSONObject("response").getJSONArray("docs");
+            JSONArray codes = obj
+                .getJSONObject("response")
+                .getJSONArray("docs");
             List<String> bibcodes = new ArrayList<>();
             for (int i = 0; i < codes.length(); i++) {
                 bibcodes.add(codes.getJSONObject(i).getString("bibcode"));
@@ -211,21 +272,29 @@ private List<String> fetchBibcodes(URL url) throws FetcherException {
     }
 
     @Override
-    public Optional<BibEntry> performSearchById(String identifier) throws FetcherException {
+    public Optional<BibEntry> performSearchById(String identifier)
+        throws FetcherException {
         if (StringUtil.isBlank(identifier)) {
             return Optional.empty();
         }
 
         try {
-            List<String> bibcodes = fetchBibcodes(getUrlForIdentifier(identifier));
+            List<String> bibcodes = fetchBibcodes(
+                getUrlForIdentifier(identifier)
+            );
             List<BibEntry> fetchedEntries = performSearchByIds(bibcodes);
 
             if (fetchedEntries.isEmpty()) {
                 return Optional.empty();
             }
             if (fetchedEntries.size() > 1) {
-                LOGGER.info("Fetcher " + getName() + "found more than one result for identifier " + identifier
-                        + ". We will use the first entry.");
+                LOGGER.info(
+                    "Fetcher " +
+                    getName() +
+                    "found more than one result for identifier " +
+                    identifier +
+                    ". We will use the first entry."
+                );
             }
             BibEntry entry = fetchedEntries.get(0);
             return Optional.of(entry);
@@ -240,22 +309,31 @@ 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();
         }
         try {
             String postData = buildPostData(ids);
             URLDownload download = new URLDownload(getURLforExport());
-            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();
             JSONObject obj = new JSONObject(content);
 
             try {
-                List<BibEntry> fetchedEntries = getParser().parseEntries(obj.optString("export"));
+                List<BibEntry> fetchedEntries = getParser()
+                    .parseEntries(obj.optString("export"));
                 if (fetchedEntries.isEmpty()) {
                     return Collections.emptyList();
                 }
@@ -276,7 +354,8 @@ private List<BibEntry> performSearchByIds(Collection<String> identifiers) throws
     }
 
     @Override
-    public List<BibEntry> performSearch(QueryNode luceneQuery) throws FetcherException {
+    public List<BibEntry> performSearch(QueryNode luceneQuery)
+        throws FetcherException {
         URL urlForQuery;
         try {
             urlForQuery = getURLForQuery(luceneQuery);
@@ -290,7 +369,10 @@ 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 +390,10 @@ 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 f506d0128f2..a346124190f 100644
--- a/src/main/java/org/jabref/logic/importer/fetcher/BibsonomyScraper.java
+++ b/src/main/java/org/jabref/logic/importer/fetcher/BibsonomyScraper.java
@@ -3,13 +3,11 @@
 import java.io.IOException;
 import java.net.URL;
 import java.util.Optional;
-
 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;
 
@@ -18,26 +16,43 @@
  */
 public class BibsonomyScraper {
 
-    private static final String BIBSONOMY_SCRAPER = "https://scraper.bibsonomy.org/service?url=";
+    private static final String BIBSONOMY_SCRAPER =
+        "https://scraper.bibsonomy.org/service?url=";
     private static final String BIBSONOMY_SCRAPER_POST = "&format=bibtex";
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(BibsonomyScraper.class);
+    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");
+            String cleanURL = entryUrl
+                .replace("%", "%25")
+                .replace(":", "%3A")
+                .replace("/", "%2F")
+                .replace("?", "%3F")
+                .replace("&", "%26")
+                .replace("=", "%3D");
 
-            URL url = new URL(BibsonomyScraper.BIBSONOMY_SCRAPER + cleanURL + BibsonomyScraper.BIBSONOMY_SCRAPER_POST);
+            URL url = new URL(
+                BibsonomyScraper.BIBSONOMY_SCRAPER +
+                cleanURL +
+                BibsonomyScraper.BIBSONOMY_SCRAPER_POST
+            );
             String bibtex = new URLDownload(url).asString();
-            return BibtexParser.singleFromString(bibtex, importFormatPreferences);
+            return BibtexParser.singleFromString(
+                bibtex,
+                importFormatPreferences
+            );
         } catch (IOException ex) {
             LOGGER.warn("Could not download entry", ex);
             return Optional.empty();
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 f118e035a77..31a542a3f30 100644
--- a/src/main/java/org/jabref/logic/importer/fetcher/BiodiversityLibrary.java
+++ b/src/main/java/org/jabref/logic/importer/fetcher/BiodiversityLibrary.java
@@ -8,7 +8,11 @@
 import java.util.Collections;
 import java.util.List;
 import java.util.stream.IntStream;
-
+import kong.unirest.json.JSONArray;
+import kong.unirest.json.JSONException;
+import kong.unirest.json.JSONObject;
+import org.apache.http.client.utils.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;
@@ -23,12 +27,6 @@
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.field.StandardField;
 import org.jabref.model.entry.types.StandardEntryType;
-
-import kong.unirest.json.JSONArray;
-import kong.unirest.json.JSONException;
-import kong.unirest.json.JSONObject;
-import org.apache.http.client.utils.URIBuilder;
-import org.apache.lucene.queryparser.flexible.core.nodes.QueryNode;
 import org.tinylog.Logger;
 
 /**
@@ -36,12 +34,16 @@
  *
  * @see <a href="https://www.biodiversitylibrary.org/docs/api3.html">API documentation</a>
  */
-public class BiodiversityLibrary implements SearchBasedParserFetcher, CustomizableKeyFetcher {
+public class BiodiversityLibrary
+    implements SearchBasedParserFetcher, CustomizableKeyFetcher {
 
-    private static final String API_KEY = new BuildInfo().biodiversityHeritageApiKey;
-    private static final String BASE_URL = "https://www.biodiversitylibrary.org/api3";
+    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";
 
@@ -63,13 +65,17 @@ public String getTestUrl() {
 
     public URL getBaseURL() throws URISyntaxException, MalformedURLException {
         URIBuilder baseURI = new URIBuilder(BASE_URL);
-        baseURI.addParameter("apikey", importerPreferences.getApiKey(getName()).orElse(API_KEY));
+        baseURI.addParameter(
+            "apikey",
+            importerPreferences.getApiKey(getName()).orElse(API_KEY)
+        );
         baseURI.addParameter("format", RESPONSE_FORMAT);
 
         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");
@@ -80,7 +86,8 @@ public URL getItemMetadataURL(String identifier) throws URISyntaxException, Malf
         return uriBuilder.build().toURL();
     }
 
-    public URL getPartMetadataURL(String identifier) throws URISyntaxException, MalformedURLException {
+    public URL getPartMetadataURL(String identifier)
+        throws URISyntaxException, MalformedURLException {
         URIBuilder uriBuilder = new URIBuilder(getBaseURL().toURI());
         uriBuilder.addParameter("op", "GetPartMetadata");
         uriBuilder.addParameter("pages", "f");
@@ -97,30 +104,68 @@ public JSONObject getDetails(URL url) throws IOException {
         return new JSONObject(response).getJSONArray("Result").getJSONObject(0);
     }
 
-    public BibEntry parseBibJSONtoBibtex(JSONObject item, BibEntry entry) throws IOException, URISyntaxException {
+    public BibEntry parseBibJSONtoBibtex(JSONObject item, BibEntry entry)
+        throws IOException, URISyntaxException {
         if (item.has("BHLType")) {
             if (item.getString("BHLType").equals("Part")) {
                 URL url = getPartMetadataURL(item.getString("PartID"));
                 JSONObject itemsDetails = getDetails(url);
-                entry.setField(StandardField.LANGUAGE, itemsDetails.optString("Language", ""));
-
-                entry.setField(StandardField.DOI, itemsDetails.optString("Doi", ""));
-
-                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", ""));
+                entry.setField(
+                    StandardField.LANGUAGE,
+                    itemsDetails.optString("Language", "")
+                );
+
+                entry.setField(
+                    StandardField.DOI,
+                    itemsDetails.optString("Doi", "")
+                );
+
+                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", "")
+                );
             }
 
             if (item.getString("BHLType").equals("Item")) {
                 URL url = getItemMetadataURL(item.getString("ItemID"));
                 JSONObject itemsDetails = getDetails(url);
-                entry.setField(StandardField.EDITOR, itemsDetails.optString("Sponsor", ""));
-                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)) {
-                    entry.setField(StandardField.DATE, itemsDetails.getString("Date"));
+                entry.setField(
+                    StandardField.EDITOR,
+                    itemsDetails.optString("Sponsor", "")
+                );
+                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)
+                ) {
+                    entry.setField(
+                        StandardField.DATE,
+                        itemsDetails.getString("Date")
+                    );
                 }
             }
         }
@@ -138,15 +183,30 @@ public BibEntry jsonResultToBibEntry(JSONObject item) {
         }
         entry.setField(StandardField.TITLE, item.optString("Title", ""));
 
-        entry.setField(StandardField.AUTHOR, toAuthors(item.optJSONArray("Authors")));
+        entry.setField(
+            StandardField.AUTHOR,
+            toAuthors(item.optJSONArray("Authors"))
+        );
 
         entry.setField(StandardField.PAGES, item.optString("PageRange", ""));
-        entry.setField(StandardField.LOCATION, item.optString("PublisherPlace", ""));
-        entry.setField(StandardField.PUBLISHER, item.optString("PublisherName", ""));
+        entry.setField(
+            StandardField.LOCATION,
+            item.optString("PublisherPlace", "")
+        );
+        entry.setField(
+            StandardField.PUBLISHER,
+            item.optString("PublisherName", "")
+        );
 
         entry.setField(StandardField.DATE, item.optString("Date", ""));
-        entry.setField(StandardField.YEAR, item.optString("PublicationDate", ""));
-        entry.setField(StandardField.JOURNALTITLE, item.optString("ContainerTitle", ""));
+        entry.setField(
+            StandardField.YEAR,
+            item.optString("PublicationDate", "")
+        );
+        entry.setField(
+            StandardField.JOURNALTITLE,
+            item.optString("ContainerTitle", "")
+        );
         entry.setField(StandardField.VOLUME, item.optString("Volume", ""));
 
         return entry;
@@ -158,12 +218,14 @@ 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();
+        return IntStream
+            .range(0, authors.length())
+            .mapToObj(authors::getJSONObject)
+            .map(author ->
+                new Author(author.optString("Name", ""), "", "", "", "")
+            )
+            .collect(AuthorList.collect())
+            .getAsFirstLastNamesWithAnd();
     }
 
     @Override
@@ -187,10 +249,12 @@ public Parser getParser() {
                 try {
                     entry = parseBibJSONtoBibtex(item, entry);
                 } catch (
-                        JSONException |
-                        IOException |
-                        URISyntaxException exception) {
-                    throw new ParseException("Error when parsing entry", exception);
+                    JSONException | IOException | URISyntaxException exception
+                ) {
+                    throw new ParseException(
+                        "Error when parsing entry",
+                        exception
+                    );
                 }
                 entries.add(entry);
             }
@@ -200,12 +264,17 @@ public Parser getParser() {
     }
 
     @Override
-    public URL getURLForQuery(QueryNode luceneQuery) throws URISyntaxException, MalformedURLException, FetcherException {
+    public URL getURLForQuery(QueryNode luceneQuery)
+        throws URISyntaxException, MalformedURLException, FetcherException {
         URIBuilder uriBuilder = new URIBuilder(getBaseURL().toURI());
-        BiodiversityLibraryTransformer transformer = new BiodiversityLibraryTransformer();
+        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 1c0d07871d5..9841255dcb1 100644
--- a/src/main/java/org/jabref/logic/importer/fetcher/BvbFetcher.java
+++ b/src/main/java/org/jabref/logic/importer/fetcher/BvbFetcher.java
@@ -4,19 +4,18 @@
 import java.net.URISyntaxException;
 import java.net.URL;
 import java.util.Optional;
-
+import org.apache.http.client.utils.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.http.client.utils.URIBuilder;
-import org.apache.lucene.queryparser.flexible.core.nodes.QueryNode;
-
 public class BvbFetcher implements SearchBasedParserFetcher {
 
-    private static final String URL_PATTERN = "http://bvbr.bib-bvb.de:5661/bvb01sru?";
+    private static final String URL_PATTERN =
+        "http://bvbr.bib-bvb.de:5661/bvb01sru?";
 
     @Override
     public String getName() {
@@ -29,12 +28,16 @@ public Optional<HelpFile> getHelpPage() {
     }
 
     @Override
-    public URL getURLForQuery(QueryNode query) throws URISyntaxException, MalformedURLException {
+    public URL getURLForQuery(QueryNode query)
+        throws URISyntaxException, MalformedURLException {
         URIBuilder uriBuilder = new URIBuilder(URL_PATTERN);
         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 f8a16138a6c..75aae239a42 100644
--- a/src/main/java/org/jabref/logic/importer/fetcher/CiteSeer.java
+++ b/src/main/java/org/jabref/logic/importer/fetcher/CiteSeer.java
@@ -5,7 +5,11 @@
 import java.util.List;
 import java.util.Objects;
 import java.util.Optional;
-
+import kong.unirest.JsonNode;
+import kong.unirest.Unirest;
+import kong.unirest.json.JSONArray;
+import kong.unirest.json.JSONElement;
+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;
@@ -16,24 +20,19 @@
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.field.StandardField;
 
-import kong.unirest.JsonNode;
-import kong.unirest.Unirest;
-import kong.unirest.json.JSONArray;
-import kong.unirest.json.JSONElement;
-import org.apache.lucene.queryparser.flexible.core.nodes.QueryNode;
-
 public class CiteSeer implements SearchBasedFetcher, FulltextFetcher {
 
     private static final String BASE_URL = "citeseerx.ist.psu.edu";
 
-    private static final String API_URL = "https://citeseerx.ist.psu.edu/api/search";
+    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() {
@@ -46,44 +45,56 @@ public Optional<HelpFile> getHelpPage() {
     }
 
     @Override
-    public List<BibEntry> performSearch(QueryNode luceneQuery) throws FetcherException {
+    public List<BibEntry> performSearch(QueryNode luceneQuery)
+        throws FetcherException {
         // ADR-0014
         try {
             JSONElement payload = getPayloadJSON(luceneQuery);
-            JsonNode requestResponse = 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().getBody();
-
-            Optional<JSONArray> jsonResponse = Optional.of(requestResponse)
-                                                    .map(JsonNode::getObject)
-                                                    .filter(Objects::nonNull)
-                                                    .map(response -> response.optJSONArray("response"))
-                                                    .filter(Objects::nonNull);
+            JsonNode requestResponse = 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()
+                .getBody();
+
+            Optional<JSONArray> jsonResponse = Optional
+                .of(requestResponse)
+                .map(JsonNode::getObject)
+                .filter(Objects::nonNull)
+                .map(response -> response.optJSONArray("response"))
+                .filter(Objects::nonNull);
 
             if (!jsonResponse.isPresent()) {
                 return List.of();
             }
 
             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
+            );
         }
     }
 
     private JSONElement getPayloadJSON(QueryNode luceneQuery) {
         transformer = new CiteSeerQueryTransformer();
-        String transformedQuery = transformer.transformLuceneQuery(luceneQuery).orElse("");
+        String transformedQuery = transformer
+            .transformLuceneQuery(luceneQuery)
+            .orElse("");
         return transformer.getJSONPayload();
     }
 
     @Override
-    public Optional<URL> findFullText(BibEntry entry) throws IOException, FetcherException {
+    public Optional<URL> findFullText(BibEntry entry)
+        throws IOException, FetcherException {
         Objects.requireNonNull(entry);
 
         // does not use a valid DOI, but Cite Seer's id / hash available for each entry
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 71bf613c79d..652092c084e 100644
--- a/src/main/java/org/jabref/logic/importer/fetcher/CollectionOfComputerScienceBibliographiesFetcher.java
+++ b/src/main/java/org/jabref/logic/importer/fetcher/CollectionOfComputerScienceBibliographiesFetcher.java
@@ -4,7 +4,8 @@
 import java.net.URISyntaxException;
 import java.net.URL;
 import java.util.Arrays;
-
+import org.apache.http.client.utils.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;
@@ -21,26 +22,36 @@
 import org.jabref.model.entry.field.StandardField;
 import org.jabref.model.entry.field.UnknownField;
 
-import org.apache.http.client.utils.URIBuilder;
-import org.apache.lucene.queryparser.flexible.core.nodes.QueryNode;
-
-public class CollectionOfComputerScienceBibliographiesFetcher implements SearchBasedParserFetcher {
+public class CollectionOfComputerScienceBibliographiesFetcher
+    implements SearchBasedParserFetcher {
 
-    private static final String BASIC_SEARCH_URL = "http://liinwww.ira.uka.de/bibliography/rss?";
+    private static final String BASIC_SEARCH_URL =
+        "http://liinwww.ira.uka.de/bibliography/rss?";
 
     private final CollectionOfComputerScienceBibliographiesParser parser;
 
-    public CollectionOfComputerScienceBibliographiesFetcher(ImportFormatPreferences importFormatPreferences) {
-        this.parser = new CollectionOfComputerScienceBibliographiesParser(importFormatPreferences);
+    public CollectionOfComputerScienceBibliographiesFetcher(
+        ImportFormatPreferences importFormatPreferences
+    ) {
+        this.parser =
+            new CollectionOfComputerScienceBibliographiesParser(
+                importFormatPreferences
+            );
     }
 
     @Override
-    public URL getURLForQuery(QueryNode luceneQuery) throws URISyntaxException, MalformedURLException, FetcherException {
+    public URL getURLForQuery(QueryNode luceneQuery)
+        throws URISyntaxException, MalformedURLException, FetcherException {
         return new URIBuilder(BASIC_SEARCH_URL)
-                .addParameter("query", new CollectionOfComputerScienceBibliographiesQueryTransformer().transformLuceneQuery(luceneQuery).orElse(""))
-                .addParameter("sort", "score")
-                .build()
-                .toURL();
+            .addParameter(
+                "query",
+                new CollectionOfComputerScienceBibliographiesQueryTransformer()
+                    .transformLuceneQuery(luceneQuery)
+                    .orElse("")
+            )
+            .addParameter("sort", "score")
+            .build()
+            .toURL();
     }
 
     @Override
@@ -55,36 +66,55 @@ 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.EDITOR, new RemoveDigitsFormatter()).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"
         // 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 4a351e40cfc..2839f19c347 100644
--- a/src/main/java/org/jabref/logic/importer/fetcher/CollectionOfComputerScienceBibliographiesParser.java
+++ b/src/main/java/org/jabref/logic/importer/fetcher/CollectionOfComputerScienceBibliographiesParser.java
@@ -7,7 +7,6 @@
 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.ImportFormatPreferences;
 import org.jabref.logic.importer.ParseException;
@@ -18,24 +17,34 @@
 
 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();
     }
 
     @Override
-    public List<BibEntry> parseEntries(InputStream inputStream) throws ParseException {
+    public List<BibEntry> parseEntries(InputStream inputStream)
+        throws ParseException {
         try {
-            List<String> links = matchRegexFromInputStreamHtml(inputStream, REGEX_FOR_LINKS);
+            List<String> links = matchRegexFromInputStreamHtml(
+                inputStream,
+                REGEX_FOR_LINKS
+            );
             String bibtexDataString = parseBibtexStringsFromLinks(links)
-                    .stream()
-                    .collect(Collectors.joining());
+                .stream()
+                .collect(Collectors.joining());
 
             return bibtexParser.parseEntries(bibtexDataString);
         } catch (IOException e) {
@@ -43,19 +52,30 @@ public List<BibEntry> parseEntries(InputStream inputStream) throws ParseExceptio
         }
     }
 
-    private List<String> matchRegexFromInputStreamHtml(InputStream inputStream, Pattern pattern) {
+    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());
+            return scanner
+                .findAll(pattern)
+                .map(match -> htmlToUnicodeFormatter.format(match.group(1)))
+                .collect(Collectors.toList());
         }
     }
 
-    private List<String> parseBibtexStringsFromLinks(List<String> links) throws IOException {
+    private List<String> parseBibtexStringsFromLinks(List<String> links)
+        throws IOException {
         List<String> bibtexStringsFromAllLinks = new ArrayList<>();
         for (String link : links) {
-            try (InputStream inputStream = new URLDownload(link).asInputStream()) {
-                List<String> bibtexStringsFromLink = matchRegexFromInputStreamHtml(inputStream, REGEX_FOR_BIBTEX);
+            try (
+                InputStream inputStream = new URLDownload(link).asInputStream()
+            ) {
+                List<String> bibtexStringsFromLink =
+                    matchRegexFromInputStreamHtml(
+                        inputStream,
+                        REGEX_FOR_BIBTEX
+                    );
                 bibtexStringsFromAllLinks.addAll(bibtexStringsFromLink);
             }
         }
@@ -63,4 +83,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 0d1f0d39c6f..980f4c5e722 100644
--- a/src/main/java/org/jabref/logic/importer/fetcher/ComplexSearchQuery.java
+++ b/src/main/java/org/jabref/logic/importer/fetcher/ComplexSearchQuery.java
@@ -6,12 +6,11 @@
 import java.util.Objects;
 import java.util.Optional;
 import java.util.StringJoiner;
-
-import org.jabref.model.strings.StringUtil;
-
 import org.apache.lucene.index.Term;
+import org.jabref.model.strings.StringUtil;
 
 public class ComplexSearchQuery {
+
     // Field for non-fielded search
     private final List<String> defaultField;
     private final List<String> authors;
@@ -23,7 +22,17 @@ 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;
@@ -108,56 +117,103 @@ 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()) {
+        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
     public String toString() {
         StringJoiner stringJoiner = new StringJoiner(" ");
 
-        getSingleYear().ifPresent(singleYear -> stringJoiner.add(singleYear.toString()));
-        getFromYear().ifPresent(fromYear -> stringJoiner.add(fromYear.toString()));
+        getSingleYear()
+            .ifPresent(singleYear -> stringJoiner.add(singleYear.toString()));
+        getFromYear()
+            .ifPresent(fromYear -> stringJoiner.add(fromYear.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();
     }
 
     public static class ComplexSearchQueryBuilder {
+
         private final List<String> defaultFieldPhrases = new ArrayList<>();
         private final List<String> authors = new ArrayList<>();
         private final List<String> titlePhrases = new ArrayList<>();
@@ -168,15 +224,23 @@ public static class ComplexSearchQueryBuilder {
         private Integer toYear;
         private Integer singleYear;
 
-        private ComplexSearchQueryBuilder() {
-        }
+        private ComplexSearchQueryBuilder() {}
 
-        public ComplexSearchQueryBuilder defaultFieldPhrase(String defaultFieldPhrase) {
+        public ComplexSearchQueryBuilder defaultFieldPhrase(
+            String defaultFieldPhrase
+        ) {
             if (Objects.requireNonNull(defaultFieldPhrase).isBlank()) {
-                throw new IllegalArgumentException("Parameter must not be blank");
+                throw new IllegalArgumentException(
+                    "Parameter must not be blank"
+                );
             }
             // Strip all quotes before wrapping
-            this.defaultFieldPhrases.add(String.format("\"%s\"", defaultFieldPhrase.replace("\"", "")));
+            this.defaultFieldPhrases.add(
+                    String.format(
+                        "\"%s\"",
+                        defaultFieldPhrase.replace("\"", "")
+                    )
+                );
             return this;
         }
 
@@ -185,7 +249,9 @@ public ComplexSearchQueryBuilder defaultFieldPhrase(String defaultFieldPhrase) {
          */
         public ComplexSearchQueryBuilder author(String author) {
             if (Objects.requireNonNull(author).isBlank()) {
-                throw new IllegalArgumentException("Parameter must not be blank");
+                throw new IllegalArgumentException(
+                    "Parameter must not be blank"
+                );
             }
             // Strip all quotes before wrapping
             this.authors.add(String.format("\"%s\"", author.replace("\"", "")));
@@ -197,10 +263,14 @@ public ComplexSearchQueryBuilder author(String author) {
          */
         public ComplexSearchQueryBuilder titlePhrase(String titlePhrase) {
             if (Objects.requireNonNull(titlePhrase).isBlank()) {
-                throw new IllegalArgumentException("Parameter must not be blank");
+                throw new IllegalArgumentException(
+                    "Parameter must not be blank"
+                );
             }
             // Strip all quotes before wrapping
-            this.titlePhrases.add(String.format("\"%s\"", titlePhrase.replace("\"", "")));
+            this.titlePhrases.add(
+                    String.format("\"%s\"", titlePhrase.replace("\"", ""))
+                );
             return this;
         }
 
@@ -209,16 +279,25 @@ public ComplexSearchQueryBuilder titlePhrase(String titlePhrase) {
          */
         public ComplexSearchQueryBuilder abstractPhrase(String abstractPhrase) {
             if (Objects.requireNonNull(abstractPhrase).isBlank()) {
-                throw new IllegalArgumentException("Parameter must not be blank");
+                throw new IllegalArgumentException(
+                    "Parameter must not be blank"
+                );
             }
             // Strip all quotes before wrapping
-            this.titlePhrases.add(String.format("\"%s\"", abstractPhrase.replace("\"", "")));
+            this.titlePhrases.add(
+                    String.format("\"%s\"", abstractPhrase.replace("\"", ""))
+                );
             return this;
         }
 
-        public ComplexSearchQueryBuilder fromYearAndToYear(Integer fromYear, Integer toYear) {
+        public ComplexSearchQueryBuilder fromYearAndToYear(
+            Integer fromYear,
+            Integer toYear
+        ) {
             if (Objects.nonNull(singleYear)) {
-                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 +306,9 @@ public ComplexSearchQueryBuilder fromYearAndToYear(Integer fromYear, Integer toY
 
         public ComplexSearchQueryBuilder singleYear(Integer singleYear) {
             if (Objects.nonNull(fromYear) || Objects.nonNull(toYear)) {
-                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;
@@ -235,7 +316,9 @@ public ComplexSearchQueryBuilder singleYear(Integer singleYear) {
 
         public ComplexSearchQueryBuilder journal(String journal) {
             if (Objects.requireNonNull(journal).isBlank()) {
-                throw new IllegalArgumentException("Parameter must not be blank");
+                throw new IllegalArgumentException(
+                    "Parameter must not be blank"
+                );
             }
             this.journal = String.format("\"%s\"", journal.replace("\"", ""));
             return this;
@@ -243,7 +326,9 @@ public ComplexSearchQueryBuilder journal(String journal) {
 
         public ComplexSearchQueryBuilder DOI(String doi) {
             if (Objects.requireNonNull(doi).isBlank()) {
-                throw new IllegalArgumentException("Parameter must not be blank");
+                throw new IllegalArgumentException(
+                    "Parameter must not be blank"
+                );
             }
             this.doi = doi.replace("\"", "");
             return this;
@@ -276,9 +361,21 @@ public ComplexSearchQueryBuilder terms(Collection<Term> terms) {
          */
         public ComplexSearchQuery build() throws IllegalStateException {
             if (textSearchFieldsAndYearFieldsAreEmpty()) {
-                throw new IllegalStateException("At least one text field has to be set");
+                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,16 +398,30 @@ 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() {
-            return Objects.isNull(singleYear) && Objects.isNull(fromYear) && Objects.isNull(toYear);
+            return (
+                Objects.isNull(singleYear) &&
+                Objects.isNull(fromYear) &&
+                Objects.isNull(toYear)
+            );
         }
 
         private boolean stringListIsBlank(List<String> stringList) {
-            return Objects.isNull(stringList) || stringList.stream().allMatch(String::isBlank);
+            return (
+                Objects.isNull(stringList) ||
+                stringList.stream().allMatch(String::isBlank)
+            );
         }
     }
 }
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 0d1ac3c7304..64dc6760cb9 100644
--- a/src/main/java/org/jabref/logic/importer/fetcher/CompositeSearchBasedFetcher.java
+++ b/src/main/java/org/jabref/logic/importer/fetcher/CompositeSearchBasedFetcher.java
@@ -5,14 +5,12 @@
 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;
 
@@ -20,24 +18,39 @@ public class CompositeSearchBasedFetcher implements SearchBasedFetcher {
 
     public static final String FETCHER_NAME = "Search Selected";
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(CompositeSearchBasedFetcher.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(
+        CompositeSearchBasedFetcher.class
+    );
 
     private Set<SearchBasedFetcher> fetchers;
     private final int maximumNumberOfReturnedResults;
 
-    public CompositeSearchBasedFetcher(Set<SearchBasedFetcher> searchBasedFetchers, ImporterPreferences importerPreferences, int maximumNumberOfReturnedResults)
-            throws IllegalArgumentException {
+    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!");
+            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;
     }
 
@@ -52,18 +65,28 @@ public Optional<HelpFile> getHelpPage() {
     }
 
     @Override
-    public List<BibEntry> performSearch(QueryNode luceneQuery) throws FetcherException {
+    public List<BibEntry> performSearch(QueryNode luceneQuery)
+        throws FetcherException {
         // 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(String.format("%s API request failed", searchBasedFetcher.getName()), e);
-                               return Stream.empty();
-                           }
-                       })
-                       .limit(maximumNumberOfReturnedResults)
-                       .collect(Collectors.toList());
+        return fetchers
+            .parallelStream()
+            .flatMap(searchBasedFetcher -> {
+                try {
+                    return searchBasedFetcher
+                        .performSearch(luceneQuery)
+                        .stream();
+                } catch (FetcherException e) {
+                    LOGGER.warn(
+                        String.format(
+                            "%s API request failed",
+                            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 4826239e3e6..70466c7eca2 100644
--- a/src/main/java/org/jabref/logic/importer/fetcher/CrossRef.java
+++ b/src/main/java/org/jabref/logic/importer/fetcher/CrossRef.java
@@ -8,7 +8,11 @@
 import java.util.List;
 import java.util.Optional;
 import java.util.stream.IntStream;
-
+import kong.unirest.json.JSONArray;
+import kong.unirest.json.JSONException;
+import kong.unirest.json.JSONObject;
+import org.apache.http.client.utils.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.RemoveBracesFormatter;
@@ -31,22 +35,22 @@
 import org.jabref.model.entry.types.StandardEntryType;
 import org.jabref.model.util.OptionalUtil;
 
-import kong.unirest.json.JSONArray;
-import kong.unirest.json.JSONException;
-import kong.unirest.json.JSONObject;
-import org.apache.http.client.utils.URIBuilder;
-import org.apache.lucene.queryparser.flexible.core.nodes.QueryNode;
-
 /**
  * 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 RemoveBracesFormatter REMOVE_BRACES_FORMATTER = new RemoveBracesFormatter();
+    private static final RemoveBracesFormatter REMOVE_BRACES_FORMATTER =
+        new RemoveBracesFormatter();
 
     @Override
     public String getName() {
@@ -54,27 +58,44 @@ 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 ->
+        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, FetcherException {
+    public URL getURLForQuery(QueryNode luceneQuery)
+        throws URISyntaxException, MalformedURLException, FetcherException {
         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, FetcherException {
+    public URL getUrlForIdentifier(String identifier)
+        throws URISyntaxException, MalformedURLException, FetcherException {
         URIBuilder uriBuilder = new URIBuilder(API_URL + "/" + identifier);
         return uriBuilder.build().toURL();
     }
@@ -113,8 +134,16 @@ 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
-        if (entry.getField(StandardField.TITLE).equals(entry.getField(StandardField.SUBTITLE))) {
-            new FieldFormatterCleanup(StandardField.SUBTITLE, new ClearFormatter()).cleanup(entry);
+        if (
+            entry
+                .getField(StandardField.TITLE)
+                .equals(entry.getField(StandardField.SUBTITLE))
+        ) {
+            new FieldFormatterCleanup(
+                StandardField.SUBTITLE,
+                new ClearFormatter()
+            )
+                .cleanup(entry);
         }
     }
 
@@ -122,31 +151,66 @@ private BibEntry jsonItemToBibEntry(JSONObject item) throws ParseException {
         try {
             BibEntry entry = new BibEntry();
             entry.setType(convertType(item.getString("type")));
-            entry.setField(StandardField.TITLE,
-                    Optional.ofNullable(item.optJSONArray("title"))
-                            .map(array -> array.optString(0)).orElse(""));
-            entry.setField(StandardField.SUBTITLE,
-                    Optional.ofNullable(item.optJSONArray("subtitle"))
-                            .map(array -> array.optString(0)).orElse(""));
-            entry.setField(StandardField.AUTHOR, toAuthors(item.optJSONArray("author")));
-            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("")
+            entry.setField(
+                StandardField.TITLE,
+                Optional
+                    .ofNullable(item.optJSONArray("title"))
+                    .map(array -> array.optString(0))
+                    .orElse("")
+            );
+            entry.setField(
+                StandardField.SUBTITLE,
+                Optional
+                    .ofNullable(item.optJSONArray("subtitle"))
+                    .map(array -> array.optString(0))
+                    .orElse("")
+            );
+            entry.setField(
+                StandardField.AUTHOR,
+                toAuthors(item.optJSONArray("author"))
+            );
+            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("")
             );
             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.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);
+            throw new ParseException(
+                "CrossRef API JSON format has changed",
+                exception
+            );
         }
     }
 
@@ -156,39 +220,74 @@ 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();
+        return IntStream
+            .range(0, authors.length())
+            .mapToObj(authors::getJSONObject)
+            .map(author ->
+                new Author(
+                    author.optString("given", ""),
+                    "",
+                    "",
+                    author.optString("family", ""),
+                    ""
+                )
+            )
+            .collect(AuthorList.collect())
+            .getAsFirstLastNamesWithAnd();
     }
 
     private EntryType convertType(String type) {
-        return "journal-article".equals(type) ? StandardEntryType.Article : StandardEntryType.Misc;
+        return "journal-article".equals(type)
+            ? StandardEntryType.Article
+            : StandardEntryType.Misc;
     }
 
     @Override
-    public Optional<DOI> extractIdentifier(BibEntry inputEntry, List<BibEntry> fetchedEntries) throws FetcherException {
-
-        final String entryTitle = REMOVE_BRACES_FORMATTER.format(inputEntry.getFieldLatexFree(StandardField.TITLE).orElse(""));
+    public Optional<DOI> extractIdentifier(
+        BibEntry inputEntry,
+        List<BibEntry> fetchedEntries
+    ) throws FetcherException {
+        final String entryTitle = REMOVE_BRACES_FORMATTER.format(
+            inputEntry.getFieldLatexFree(StandardField.TITLE).orElse("")
+        );
         final StringSimilarity stringSimilarity = new StringSimilarity();
 
         for (BibEntry fetchedEntry : fetchedEntries) {
             // currently only title-based comparison
             // title
-            Optional<String> dataTitle = fetchedEntry.getField(StandardField.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
-            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> 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
+                        )
+                )
+            ) {
                 return fetchedEntry.getDOI();
             }
         }
@@ -205,7 +304,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 1eef08ff5f6..d1164c6fb65 100644
--- a/src/main/java/org/jabref/logic/importer/fetcher/DBLPFetcher.java
+++ b/src/main/java/org/jabref/logic/importer/fetcher/DBLPFetcher.java
@@ -6,7 +6,8 @@
 import java.util.List;
 import java.util.Objects;
 import java.util.Optional;
-
+import org.apache.http.client.utils.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;
@@ -23,18 +24,17 @@
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.field.StandardField;
 
-import org.apache.http.client.utils.URIBuilder;
-import org.apache.lucene.queryparser.flexible.core.nodes.QueryNode;
-
 /**
  * Fetches BibTeX data from DBLP (dblp.org)
  *
  * @see <a href="https://dblp.dagstuhl.de/faq/13501473">Basic API documentation</a>
  */
 public class DBLPFetcher implements SearchBasedParserFetcher {
+
     public static final String FETCHER_NAME = "DBLP";
 
-    private static final String BASIC_SEARCH_URL = "https://dblp.org/search/publ/api";
+    private static final String BASIC_SEARCH_URL =
+        "https://dblp.org/search/publ/api";
 
     private final ImportFormatPreferences importFormatPreferences;
 
@@ -44,9 +44,15 @@ public DBLPFetcher(ImportFormatPreferences importFormatPreferences) {
     }
 
     @Override
-    public URL getURLForQuery(QueryNode luceneQuery) throws URISyntaxException, MalformedURLException, FetcherException {
+    public URL getURLForQuery(QueryNode luceneQuery)
+        throws URISyntaxException, MalformedURLException, FetcherException {
         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
@@ -65,12 +71,22 @@ 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 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 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 ff10e62c69d..efb7fbc6a80 100644
--- a/src/main/java/org/jabref/logic/importer/fetcher/DOABFetcher.java
+++ b/src/main/java/org/jabref/logic/importer/fetcher/DOABFetcher.java
@@ -7,7 +7,11 @@
 import java.util.Collections;
 import java.util.List;
 import java.util.StringJoiner;
-
+import kong.unirest.json.JSONArray;
+import kong.unirest.json.JSONException;
+import kong.unirest.json.JSONObject;
+import org.apache.http.client.utils.URIBuilder;
+import org.apache.lucene.queryparser.flexible.core.nodes.QueryNode;
 import org.jabref.logic.importer.FetcherException;
 import org.jabref.logic.importer.Parser;
 import org.jabref.logic.importer.SearchBasedParserFetcher;
@@ -20,18 +24,14 @@
 import org.jabref.model.entry.types.StandardEntryType;
 import org.jabref.model.strings.StringUtil;
 
-import kong.unirest.json.JSONArray;
-import kong.unirest.json.JSONException;
-import kong.unirest.json.JSONObject;
-import org.apache.http.client.utils.URIBuilder;
-import org.apache.lucene.queryparser.flexible.core.nodes.QueryNode;
-
 /**
  * fetches books from https://www.doabooks.org/ through
  * <a href="https://www.doabooks.org/en/resources/metadata-harvesting-and-content-dissemination">their API</a>.
  */
 public class DOABFetcher implements SearchBasedParserFetcher {
-    private static final String SEARCH_URL = "https://directory.doabooks.org/rest/search?";
+
+    private static final String SEARCH_URL =
+        "https://directory.doabooks.org/rest/search?";
 
     @Override
     public String getName() {
@@ -39,9 +39,12 @@ public String getName() {
     }
 
     @Override
-    public URL getURLForQuery(QueryNode luceneQuery) throws URISyntaxException, MalformedURLException, FetcherException {
+    public URL getURLForQuery(QueryNode luceneQuery)
+        throws URISyntaxException, MalformedURLException, FetcherException {
         URIBuilder builder = new URIBuilder(SEARCH_URL);
-        String query = new DefaultQueryTransformer().transformLuceneQuery(luceneQuery).orElse("");
+        String query = new DefaultQueryTransformer()
+            .transformLuceneQuery(luceneQuery)
+            .orElse("");
         // adding quotations for the query for more specified results
         // without the quotation the results returned are not relevant to the query
         query = ("\"".concat(query)).concat("\"");
@@ -65,15 +68,23 @@ public Parser getParser() {
             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
-                JSONArray metadataArray = response.getJSONObject(0).getJSONArray("metadata");
-                JSONArray bitstreamArray = response.getJSONObject(0).getJSONArray("bitstreams");
+                JSONArray metadataArray = response
+                    .getJSONObject(0)
+                    .getJSONArray("metadata");
+                JSONArray bitstreamArray = response
+                    .getJSONObject(0)
+                    .getJSONArray("bitstreams");
                 BibEntry entry = jsonToBibEntry(metadataArray, bitstreamArray);
                 return Collections.singletonList(entry);
             }
             List<BibEntry> entries = new ArrayList<>(response.length());
             for (int i = 0; i < response.length(); i++) {
-                JSONArray metadataArray = response.getJSONObject(i).getJSONArray("metadata");
-                JSONArray bitstreamArray = response.getJSONObject(i).getJSONArray("bitstreams");
+                JSONArray metadataArray = response
+                    .getJSONObject(i)
+                    .getJSONArray("metadata");
+                JSONArray bitstreamArray = response
+                    .getJSONObject(i)
+                    .getJSONArray("bitstreams");
                 BibEntry entry = jsonToBibEntry(metadataArray, bitstreamArray);
                 entries.add(entry);
             }
@@ -81,7 +92,10 @@ public Parser getParser() {
         };
     }
 
-    private BibEntry jsonToBibEntry(JSONArray metadataArray, JSONArray bitstreamArray) {
+    private BibEntry jsonToBibEntry(
+        JSONArray metadataArray,
+        JSONArray bitstreamArray
+    ) {
         BibEntry entry = new BibEntry();
         List<Author> authorsList = new ArrayList<>();
         List<Author> editorsList = new ArrayList<>();
@@ -98,10 +112,24 @@ private BibEntry jsonToBibEntry(JSONArray metadataArray, JSONArray bitstreamArra
             JSONArray array = bitstreamObject.getJSONArray("metadata");
             for (int k = 0; k < array.length(); k++) {
                 JSONObject metadataInBitstreamObject = array.getJSONObject(k);
-                if (metadataInBitstreamObject.getString("key").equals("dc.identifier.isbn")) {
-                    entry.setField(StandardField.ISBN, metadataInBitstreamObject.getString("value"));
-                } else if (metadataInBitstreamObject.getString("key").equals("oapen.relation.isbn")) {
-                    entry.setField(StandardField.ISBN, metadataInBitstreamObject.getString("value"));
+                if (
+                    metadataInBitstreamObject
+                        .getString("key")
+                        .equals("dc.identifier.isbn")
+                ) {
+                    entry.setField(
+                        StandardField.ISBN,
+                        metadataInBitstreamObject.getString("value")
+                    );
+                } else if (
+                    metadataInBitstreamObject
+                        .getString("key")
+                        .equals("oapen.relation.isbn")
+                ) {
+                    entry.setField(
+                        StandardField.ISBN,
+                        metadataInBitstreamObject.getString("value")
+                    );
                 }
             }
         }
@@ -111,52 +139,99 @@ 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")));
+                        authorsList.add(
+                            toAuthor(dataObject.getString("value"))
+                        );
                     }
                 }
                 case "dc.type" -> entry.setType(StandardEntryType.Book);
-                case "dc.date.issued" -> entry.setField(StandardField.DATE, String.valueOf(
-                        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,
+                    String.valueOf(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"));
+                        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 "oapen.imprint" -> publisherImprint = 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 "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)
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 8898c730253..0117a356fbf 100644
--- a/src/main/java/org/jabref/logic/importer/fetcher/DOAJFetcher.java
+++ b/src/main/java/org/jabref/logic/importer/fetcher/DOAJFetcher.java
@@ -10,7 +10,10 @@
 import java.util.Objects;
 import java.util.Optional;
 import java.util.stream.Collectors;
-
+import kong.unirest.json.JSONArray;
+import kong.unirest.json.JSONObject;
+import org.apache.http.client.utils.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.ImportFormatPreferences;
@@ -23,11 +26,6 @@
 import org.jabref.model.entry.field.StandardField;
 import org.jabref.model.entry.types.StandardEntryType;
 import org.jabref.model.strings.StringUtil;
-
-import kong.unirest.json.JSONArray;
-import kong.unirest.json.JSONObject;
-import org.apache.http.client.utils.URIBuilder;
-import org.apache.lucene.queryparser.flexible.core.nodes.QueryNode;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -38,9 +36,12 @@
  */
 public class DOAJFetcher implements SearchBasedParserFetcher {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(DOAJFetcher.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(
+        DOAJFetcher.class
+    );
 
-    private static final String SEARCH_URL = "https://doaj.org/api/v1/search/articles/";
+    private static final String SEARCH_URL =
+        "https://doaj.org/api/v1/search/articles/";
     private final ImportFormatPreferences preferences;
 
     public DOAJFetcher(ImportFormatPreferences preferences) {
@@ -53,12 +54,24 @@ 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);
 
@@ -73,7 +86,10 @@ public static BibEntry parseBibJSONtoBibtex(JSONObject bibJsonEntry, Character k
                     LOGGER.info("Empty author name.");
                 }
             }
-            entry.setField(StandardField.AUTHOR, String.join(" and ", authorList));
+            entry.setField(
+                StandardField.AUTHOR,
+                String.join(" and ", authorList)
+            );
         } else {
             LOGGER.info("No author found.");
         }
@@ -88,10 +104,17 @@ 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"));
+                entry.setField(
+                    StandardField.PAGES,
+                    bibJsonEntry.getString("start_page")
+                );
             }
         }
 
@@ -100,7 +123,10 @@ public static BibEntry parseBibJSONtoBibtex(JSONObject bibJsonEntry, Character k
             JSONObject journal = bibJsonEntry.getJSONObject("journal");
             // Journal title
             if (journal.has("title")) {
-                entry.setField(StandardField.JOURNAL, journal.getString("title").trim());
+                entry.setField(
+                    StandardField.JOURNAL,
+                    journal.getString("title").trim()
+                );
             } else {
                 LOGGER.info("No journal title found.");
             }
@@ -119,7 +145,10 @@ public static BibEntry parseBibJSONtoBibtex(JSONObject bibJsonEntry, Character k
             JSONArray keywords = bibJsonEntry.getJSONArray("keywords");
             for (int i = 0; i < keywords.length(); i++) {
                 if (!keywords.isNull(i)) {
-                    entry.addKeyword(keywords.getString(i).trim(), keywordSeparator);
+                    entry.addKeyword(
+                        keywords.getString(i).trim(),
+                        keywordSeparator
+                    );
                 }
             }
         }
@@ -130,11 +159,20 @@ public static BibEntry parseBibJSONtoBibtex(JSONObject bibJsonEntry, Character k
             for (int i = 0; i < identifiers.length(); i++) {
                 String type = identifiers.getJSONObject(i).getString("type");
                 if ("doi".equals(type)) {
-                    entry.setField(StandardField.DOI, identifiers.getJSONObject(i).getString("id"));
+                    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")
+                    );
                 }
             }
         }
@@ -145,8 +183,14 @@ public static BibEntry parseBibJSONtoBibtex(JSONObject bibJsonEntry, Character k
             for (int i = 0; i < links.length(); i++) {
                 if (links.getJSONObject(i).has("type")) {
                     String type = links.getJSONObject(i).getString("type");
-                    if ("fulltext".equals(type) && links.getJSONObject(i).has("url")) {
-                        entry.setField(StandardField.URL, links.getJSONObject(i).getString("url"));
+                    if (
+                        "fulltext".equals(type) &&
+                        links.getJSONObject(i).has("url")
+                    ) {
+                        entry.setField(
+                            StandardField.URL,
+                            links.getJSONObject(i).getString("url")
+                        );
                     }
                 }
             }
@@ -185,9 +229,15 @@ public Optional<HelpFile> getHelpPage() {
     }
 
     @Override
-    public URL getURLForQuery(QueryNode luceneQuery) throws URISyntaxException, MalformedURLException, FetcherException {
+    public URL getURLForQuery(QueryNode luceneQuery)
+        throws URISyntaxException, MalformedURLException, FetcherException {
         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)
@@ -198,15 +248,24 @@ 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<>();
             if (jsonObject.has("results")) {
                 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());
+                    JSONObject bibJsonEntry = results
+                        .getJSONObject(i)
+                        .getJSONObject("bibjson");
+                    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 b9a5dc4cc1b..d7bf87eed80 100644
--- a/src/main/java/org/jabref/logic/importer/fetcher/DiVA.java
+++ b/src/main/java/org/jabref/logic/importer/fetcher/DiVA.java
@@ -4,7 +4,7 @@
 import java.net.URISyntaxException;
 import java.net.URL;
 import java.util.Optional;
-
+import org.apache.http.client.utils.URIBuilder;
 import org.jabref.logic.help.HelpFile;
 import org.jabref.logic.importer.FetcherException;
 import org.jabref.logic.importer.IdBasedParserFetcher;
@@ -12,8 +12,6 @@
 import org.jabref.logic.importer.Parser;
 import org.jabref.logic.importer.fileformat.BibtexParser;
 
-import org.apache.http.client.utils.URIBuilder;
-
 /*
  * http://www.diva-portal.org/smash/aboutdiva.jsf?dswid=-3222
  * DiVA portal contains research publications and student theses from 40 Swedish universities and research institutions.
@@ -37,8 +35,11 @@ public Optional<HelpFile> getHelpPage() {
     }
 
     @Override
-    public URL getUrlForIdentifier(String identifier) throws URISyntaxException, MalformedURLException, FetcherException {
-        URIBuilder uriBuilder = new URIBuilder("http://www.diva-portal.org/smash/getreferences");
+    public URL getUrlForIdentifier(String identifier)
+        throws URISyntaxException, MalformedURLException, FetcherException {
+        URIBuilder uriBuilder = new URIBuilder(
+            "http://www.diva-portal.org/smash/getreferences"
+        );
 
         uriBuilder.addParameter("referenceFormat", "BibTex");
         uriBuilder.addParameter("pids", identifier);
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 276b9883d4d..c0896bfcd63 100644
--- a/src/main/java/org/jabref/logic/importer/fetcher/DoiFetcher.java
+++ b/src/main/java/org/jabref/logic/importer/fetcher/DoiFetcher.java
@@ -1,5 +1,6 @@
 package org.jabref.logic.importer.fetcher;
 
+import com.google.common.util.concurrent.RateLimiter;
 import java.io.IOException;
 import java.net.HttpURLConnection;
 import java.net.URL;
@@ -10,7 +11,9 @@
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.CompletionException;
 import java.util.regex.Pattern;
-
+import kong.unirest.json.JSONArray;
+import kong.unirest.json.JSONException;
+import kong.unirest.json.JSONObject;
 import org.jabref.logic.cleanup.FieldFormatterCleanup;
 import org.jabref.logic.formatter.bibtexfields.ClearFormatter;
 import org.jabref.logic.formatter.bibtexfields.NormalizePagesFormatter;
@@ -29,11 +32,6 @@
 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.json.JSONArray;
-import kong.unirest.json.JSONException;
-import kong.unirest.json.JSONObject;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -43,12 +41,17 @@ public class DoiFetcher implements IdBasedFetcher, EntryBasedFetcher {
 
     private static final String APS_JOURNAL_ORG_DOI_ID = "1103";
     private static final String APS_SUFFIX = "([\\w]+\\.)([\\w]+\\.)([\\w]+)";
-    private static final Pattern APS_SUFFIX_PATTERN = Pattern.compile(APS_SUFFIX);
+    private static final Pattern APS_SUFFIX_PATTERN = Pattern.compile(
+        APS_SUFFIX
+    );
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(DoiFetcher.class);
+    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
-    private static final RateLimiter DATA_CITE_DCN_RATE_LIMITER = RateLimiter.create(3.33);
+    private static final RateLimiter DATA_CITE_DCN_RATE_LIMITER =
+        RateLimiter.create(3.33);
 
     /*
      * By default, it seems that CrossRef DOI Content Negotiation responses are returned by their API pools, more specifically the public one
@@ -57,7 +60,8 @@ public class DoiFetcher implements IdBasedFetcher, EntryBasedFetcher {
      * to default to 50 request / second. However, because of its dynamic nature, this rate could change between API calls, so we need to update it
      * atomically when that happens (as multiple threads might access it at the same time)
      */
-    private static final RateLimiter CROSSREF_DCN_RATE_LIMITER = RateLimiter.create(50.0);
+    private static final RateLimiter CROSSREF_DCN_RATE_LIMITER =
+        RateLimiter.create(50.0);
 
     private final ImportFormatPreferences preferences;
 
@@ -82,7 +86,9 @@ private void doAPILimiting(String identifier) {
 
         try {
             Optional<String> agency;
-            if (doi.isPresent() && (agency = getAgency(doi.get())).isPresent()) {
+            if (
+                doi.isPresent() && (agency = getAgency(doi.get())).isPresent()
+            ) {
                 double waitingTime = 0.0;
                 if ("datacite".equalsIgnoreCase(agency.get())) {
                     waitingTime = DATA_CITE_DCN_RATE_LIMITER.acquire();
@@ -90,15 +96,23 @@ private void doAPILimiting(String identifier) {
                     waitingTime = CROSSREF_DCN_RATE_LIMITER.acquire();
                 } // mEDRA does not explicit an API rating
 
-                LOGGER.trace(String.format("Thread %s, searching for DOI '%s', waited %.2fs because of API rate limiter",
-                        Thread.currentThread().threadId(), identifier, waitingTime));
+                LOGGER.trace(
+                    String.format(
+                        "Thread %s, searching for DOI '%s', waited %.2fs because of API rate limiter",
+                        Thread.currentThread().threadId(),
+                        identifier,
+                        waitingTime
+                    )
+                );
             }
         } catch (IOException e) {
             LOGGER.warn("Could not limit DOI API access rate", e);
         }
     }
 
-    protected CompletableFuture<Optional<BibEntry>> asyncPerformSearchById(String identifier) {
+    protected CompletableFuture<Optional<BibEntry>> asyncPerformSearchById(
+        String identifier
+    ) {
         doAPILimiting(identifier);
         return CompletableFuture.supplyAsync(() -> {
             try {
@@ -110,7 +124,8 @@ protected CompletableFuture<Optional<BibEntry>> asyncPerformSearchById(String id
     }
 
     @Override
-    public Optional<BibEntry> performSearchById(String identifier) throws FetcherException {
+    public Optional<BibEntry> performSearchById(String identifier)
+        throws FetcherException {
         Optional<DOI> doi = DOI.parse(identifier);
 
         try {
@@ -119,7 +134,9 @@ public Optional<BibEntry> performSearchById(String identifier) throws FetcherExc
 
                 // mEDRA does not return a parsable bibtex string
                 Optional<String> agency = getAgency(doi.get());
-                if (agency.isPresent() && "medra".equalsIgnoreCase(agency.get())) {
+                if (
+                    agency.isPresent() && "medra".equalsIgnoreCase(agency.get())
+                ) {
                     return new Medra().performSearchById(identifier);
                 }
                 URL doiURL = new URL(doi.get().getURIAsASCIIString());
@@ -142,19 +159,35 @@ public Optional<BibEntry> performSearchById(String identifier) throws FetcherExc
                 }
 
                 // BibTeX entry
-                fetchedEntry = BibtexParser.singleFromString(bibtexString, preferences);
+                fetchedEntry =
+                    BibtexParser.singleFromString(bibtexString, preferences);
                 fetchedEntry.ifPresent(this::doPostCleanup);
 
                 // Crossref has a dynamic API rate limit
-                if (agency.isPresent() && "crossref".equalsIgnoreCase(agency.get())) {
+                if (
+                    agency.isPresent() &&
+                    "crossref".equalsIgnoreCase(agency.get())
+                ) {
                     updateCrossrefAPIRate(openConnection);
                 }
 
                 // 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)) {
+                if (
+                    fetchedEntry.isPresent() &&
+                    fetchedEntry.get().hasField(StandardField.DOI)
+                ) {
                     BibEntry entry = fetchedEntry.get();
-                    if (isAPSJournal(entry, entry.getField(StandardField.DOI).get()) && !entry.hasField(StandardField.PAGES)) {
-                        setPageCountToArticleId(entry, entry.getField(StandardField.DOI).get());
+                    if (
+                        isAPSJournal(
+                            entry,
+                            entry.getField(StandardField.DOI).get()
+                        ) &&
+                        !entry.hasField(StandardField.PAGES)
+                    ) {
+                        setPageCountToArticleId(
+                            entry,
+                            entry.getField(StandardField.DOI).get()
+                        );
                     }
                 }
 
@@ -163,43 +196,71 @@ public Optional<BibEntry> performSearchById(String identifier) throws FetcherExc
                 }
                 return fetchedEntry;
             } else {
-                throw new FetcherException(Localization.lang("Invalid DOI: '%0'.", identifier));
+                throw new FetcherException(
+                    Localization.lang("Invalid DOI: '%0'.", identifier)
+                );
             }
         } catch (IOException e) {
-            throw new FetcherException(Localization.lang("Connection error"), e);
+            throw new FetcherException(
+                Localization.lang("Connection error"),
+                e
+            );
         } catch (ParseException e) {
             throw new FetcherException("Could not parse BibTeX entry", e);
         } catch (JSONException e) {
-            throw new FetcherException("Could not retrieve Registration Agency", e);
+            throw new FetcherException(
+                "Could not retrieve Registration Agency",
+                e
+            );
         }
     }
 
     private void doPostCleanup(BibEntry entry) {
-        new FieldFormatterCleanup(StandardField.PAGES, new NormalizePagesFormatter()).cleanup(entry);
-        new FieldFormatterCleanup(StandardField.URL, new ClearFormatter()).cleanup(entry);
+        new FieldFormatterCleanup(
+            StandardField.PAGES,
+            new NormalizePagesFormatter()
+        )
+            .cleanup(entry);
+        new FieldFormatterCleanup(StandardField.URL, new ClearFormatter())
+            .cleanup(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 xRateLimit = existingConnection.getHeaderField("X-Rate-Limit-Limit");
-
-            double newRate = Double.parseDouble(xRateLimit) / Double.parseDouble(xRateLimitInterval);
+            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 oldRate = CROSSREF_DCN_RATE_LIMITER.getRate();
 
             // In theory, the actual update might rarely happen...
             if (Math.abs(newRate - oldRate) >= 1.0) {
-                LOGGER.info(String.format("Updated Crossref API rate limit from %.2f to %.2f", oldRate, newRate));
+                LOGGER.info(
+                    String.format(
+                        "Updated Crossref API rate limit from %.2f to %.2f",
+                        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"
+            );
         }
     }
 
     @Override
-    public List<BibEntry> performSearch(BibEntry entry) throws FetcherException {
+    public List<BibEntry> performSearch(BibEntry entry)
+        throws FetcherException {
         Optional<String> doi = entry.getField(StandardField.DOI);
         if (doi.isPresent()) {
             return OptionalUtil.toList(performSearchById(doi.get()));
@@ -216,8 +277,11 @@ public List<BibEntry> performSearch(BibEntry entry) throws FetcherException {
     public Optional<String> getAgency(DOI doi) throws IOException {
         Optional<String> agency = Optional.empty();
         try {
-            URLDownload download = getUrlDownload(new URL(DOI.AGENCY_RESOLVER + "/" + doi.getDOI()));
-            JSONObject response = new JSONArray(download.asString()).getJSONObject(0);
+            URLDownload download = getUrlDownload(
+                new URL(DOI.AGENCY_RESOLVER + "/" + doi.getDOI())
+            );
+            JSONObject response = new JSONArray(download.asString())
+                .getJSONObject(0);
             if (response != null) {
                 agency = Optional.ofNullable(response.optString("RA"));
             }
@@ -230,7 +294,9 @@ public Optional<String> getAgency(DOI doi) throws IOException {
     }
 
     private void setPageCountToArticleId(BibEntry entry, String doiAsString) {
-        String articleId = doiAsString.substring(doiAsString.lastIndexOf('.') + 1);
+        String articleId = doiAsString.substring(
+            doiAsString.lastIndexOf('.') + 1
+        );
         entry.setField(StandardField.PAGES, articleId);
     }
 
@@ -240,7 +306,13 @@ 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 db14fad1dc3..77b15efbdc5 100644
--- a/src/main/java/org/jabref/logic/importer/fetcher/DoiResolution.java
+++ b/src/main/java/org/jabref/logic/importer/fetcher/DoiResolution.java
@@ -11,7 +11,6 @@
 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 +20,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;
@@ -39,7 +37,9 @@
  */
 public class DoiResolution implements FulltextFetcher {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(DoiResolution.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(
+        DoiResolution.class
+    );
     private DOIPreferences doiPreferences;
 
     public DoiResolution(DOIPreferences doiPreferences) {
@@ -51,7 +51,9 @@ public DoiResolution(DOIPreferences doiPreferences) {
     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();
@@ -62,10 +64,12 @@ public Optional<URL> findFullText(BibEntry entry) throws IOException {
         String doiLink;
         if (doiPreferences.isUseCustom()) {
             base = new URL(doiPreferences.getDefaultBaseURI());
-            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();
@@ -103,17 +107,28 @@ public Optional<URL> findFullText(BibEntry entry) throws IOException {
 
             List<URL> links = new ArrayList<>();
             for (Element element : hrefElements) {
-                String href = element.attr("abs:href").toLowerCase(Locale.ENGLISH);
+                String href = element
+                    .attr("abs:href")
+                    .toLowerCase(Locale.ENGLISH);
                 String hrefText = element.text().toLowerCase(Locale.ENGLISH);
                 // Only check if pdf is included in the link or inside the text
                 // 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(new URL(href));
                 }
 
-                if (href.contains("pdf") || hrefText.contains("pdf") && new URLDownload(href).isPdf()) {
+                if (
+                    href.contains("pdf") ||
+                    (hrefText.contains("pdf") && new URLDownload(href).isPdf())
+                ) {
                     links.add(new URL(href));
                 }
             }
@@ -143,8 +158,13 @@ public Optional<URL> findFullText(BibEntry entry) throws IOException {
      * See https://scholar.google.com/intl/de/scholar/inclusion.html#indexing
      */
     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();
+        Elements citationPdfUrlElement = html
+            .head()
+            .select("meta[name='citation_pdf_url']");
+        Optional<String> citationPdfUrl = citationPdfUrlElement
+            .stream()
+            .map(e -> e.attr("content"))
+            .findFirst();
 
         if (citationPdfUrl.isPresent()) {
             try {
@@ -159,8 +179,9 @@ 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();
+            .stream()
+            .map(e -> e.attr("src"))
+            .findFirst();
 
         if (pdfUrl.isPresent()) {
             try {
@@ -174,7 +195,10 @@ private Optional<URL> findEmbeddedLink(Document html, URL base) {
     }
 
     private Optional<URL> findDistinctLinks(List<URL> urls) {
-        List<URL> distinctLinks = urls.stream().distinct().collect(Collectors.toList());
+        List<URL> distinctLinks = urls
+            .stream()
+            .distinct()
+            .collect(Collectors.toList());
 
         if (distinctLinks.isEmpty()) {
             return Optional.empty();
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 f931190e135..26ae8dd9479 100644
--- a/src/main/java/org/jabref/logic/importer/fetcher/GoogleScholar.java
+++ b/src/main/java/org/jabref/logic/importer/fetcher/GoogleScholar.java
@@ -12,7 +12,8 @@
 import java.util.Optional;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
-
+import org.apache.http.client.utils.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;
@@ -26,9 +27,6 @@
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.field.StandardField;
 import org.jabref.model.paging.Page;
-
-import org.apache.http.client.utils.URIBuilder;
-import org.apache.lucene.queryparser.flexible.core.nodes.QueryNode;
 import org.jsoup.Jsoup;
 import org.jsoup.nodes.Document;
 import org.jsoup.select.Elements;
@@ -41,11 +39,17 @@
  * Search String infos: https://scholar.google.com/intl/en/scholar/help.html#searching
  */
 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 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 String BASIC_SEARCH_URL = "https://scholar.google.ch/scholar?";
+    private static final String BASIC_SEARCH_URL =
+        "https://scholar.google.ch/scholar?";
 
     private static final int NUM_RESULTS = 10;
 
@@ -57,7 +61,8 @@ public GoogleScholar(ImportFormatPreferences importFormatPreferences) {
     }
 
     @Override
-    public Optional<URL> findFullText(BibEntry entry) throws IOException, FetcherException {
+    public Optional<URL> findFullText(BibEntry entry)
+        throws IOException, FetcherException {
         Objects.requireNonNull(entry);
 
         // Search in title
@@ -70,7 +75,10 @@ public Optional<URL> findFullText(BibEntry entry) throws IOException, FetcherExc
             URIBuilder uriBuilder = new URIBuilder(BASIC_SEARCH_URL);
             uriBuilder.addParameter("as_q", "");
             // as_epq as exact phrase
-            uriBuilder.addParameter("as_epq", entry.getField(StandardField.TITLE).orElse(""));
+            uriBuilder.addParameter(
+                "as_epq",
+                entry.getField(StandardField.TITLE).orElse("")
+            );
             // as_occt field to search in
             uriBuilder.addParameter("as_occt", "title");
 
@@ -88,16 +96,23 @@ public TrustLevel getTrustLevel() {
     private Optional<URL> search(String url) throws IOException {
         Optional<URL> pdfLink = Optional.empty();
 
-        Document doc = Jsoup.connect(url).userAgent(URLDownload.USER_AGENT).get();
+        Document doc = Jsoup
+            .connect(url)
+            .userAgent(URLDownload.USER_AGENT)
+            .get();
 
         if (needsCaptcha(doc.body().html())) {
-            LOGGER.warn("Hit Google traffic limitation. Captcha prevents automatic fetching.");
+            LOGGER.warn(
+                "Hit Google traffic limitation. Captcha prevents automatic fetching."
+            );
             return Optional.empty();
         }
         // Check results for PDF link
         // TODO: link always on first result or none?
         for (int i = 0; i < NUM_RESULTS; i++) {
-            Elements link = doc.select(String.format("div[data-rp=%S] div.gs_or_ggsm a", i));
+            Elements link = doc.select(
+                String.format("div[data-rp=%S] div.gs_or_ggsm a", i)
+            );
 
             if (link.first() != null) {
                 String target = link.first().attr("href");
@@ -128,12 +143,20 @@ 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)) {
-            throw new FetcherException("Fetching from Google Scholar failed: Captacha hit at " + queryURL + ".",
-                    Localization.lang("This might be caused by reaching the traffic limitation of Google Scholar (see 'Help' for details)."), null);
+            throw new FetcherException(
+                "Fetching from Google Scholar failed: Captacha hit at " +
+                queryURL +
+                ".",
+                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);
@@ -144,17 +167,22 @@ private void addHitsFromQuery(List<BibEntry> entryList, String queryURL) throws
         }
     }
 
-    private BibEntry downloadEntry(String link) throws IOException, FetcherException {
+    private BibEntry downloadEntry(String link)
+        throws IOException, FetcherException {
         String downloadedContent = new URLDownload(link).asString();
         BibtexParser parser = new BibtexParser(importFormatPreferences);
         ParserResult result = parser.parse(new StringReader(downloadedContent));
         if ((result == null) || (result.getDatabase() == null)) {
-            throw new FetcherException("Parsing entries from Google Scholar bib file failed.");
+            throw new FetcherException(
+                "Parsing entries from Google Scholar bib file failed."
+            );
         } else {
             Collection<BibEntry> entries = result.getDatabase().getEntries();
             if (entries.size() != 1) {
                 LOGGER.debug(entries.size() + " entries found! (" + link + ")");
-                throw new FetcherException("Parsing entries from Google Scholar bib file failed.");
+                throw new FetcherException(
+                    "Parsing entries from Google Scholar bib file failed."
+                );
             } else {
                 BibEntry entry = entries.iterator().next();
                 return entry;
@@ -164,21 +192,32 @@ private BibEntry downloadEntry(String link) throws IOException, FetcherException
 
     private void obtainAndModifyCookie() throws FetcherException {
         try {
-            URLDownload downloader = new URLDownload("https://scholar.google.com");
+            URLDownload downloader = new URLDownload(
+                "https://scholar.google.com"
+            );
             List<HttpCookie> cookies = downloader.getCookieFromUrl();
             for (HttpCookie cookie : cookies) {
                 // append "CF=4" which represents "Citation format bibtex"
                 cookie.setValue(cookie.getValue() + ":CF=4");
             }
         } catch (IOException e) {
-            throw new FetcherException("Cookie configuration for Google Scholar failed.", e);
+            throw new FetcherException(
+                "Cookie configuration for Google Scholar failed.",
+                e
+            );
         }
     }
 
     @Override
-    public Page<BibEntry> performSearchPaged(QueryNode luceneQuery, int pageNumber) throws FetcherException {
-        ScholarQueryTransformer queryTransformer = new ScholarQueryTransformer();
-        String transformedQuery = queryTransformer.transformLuceneQuery(luceneQuery).orElse("");
+    public Page<BibEntry> performSearchPaged(
+        QueryNode luceneQuery,
+        int pageNumber
+    ) throws FetcherException {
+        ScholarQueryTransformer queryTransformer =
+            new ScholarQueryTransformer();
+        String transformedQuery = queryTransformer
+            .transformLuceneQuery(luceneQuery)
+            .orElse("");
         try {
             obtainAndModifyCookie();
             List<BibEntry> foundEntries = new ArrayList<>(10);
@@ -186,10 +225,19 @@ public Page<BibEntry> performSearchPaged(QueryNode luceneQuery, int pageNumber)
             uriBuilder.addParameter("hl", "en");
             uriBuilder.addParameter("btnG", "Search");
             uriBuilder.addParameter("q", transformedQuery);
-            uriBuilder.addParameter("start", String.valueOf(pageNumber * getPageSize()));
+            uriBuilder.addParameter(
+                "start",
+                String.valueOf(pageNumber * getPageSize())
+            );
             uriBuilder.addParameter("num", String.valueOf(getPageSize()));
-            uriBuilder.addParameter("as_ylo", String.valueOf(queryTransformer.getStartYear()));
-            uriBuilder.addParameter("as_yhi", String.valueOf(queryTransformer.getEndYear()));
+            uriBuilder.addParameter(
+                "as_ylo",
+                String.valueOf(queryTransformer.getStartYear())
+            );
+            uriBuilder.addParameter(
+                "as_yhi",
+                String.valueOf(queryTransformer.getEndYear())
+            );
 
             try {
                 addHitsFromQuery(foundEntries, uriBuilder.toString());
@@ -203,16 +251,33 @@ public Page<BibEntry> performSearchPaged(QueryNode luceneQuery, int pageNumber)
                 // 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
-                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);
+                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
+                    );
                 } else {
-                    throw new FetcherException("Error while fetching from " + getName(), e);
+                    throw new FetcherException(
+                        "Error while fetching from " + getName(),
+                        e
+                    );
                 }
             }
             return new Page<>(transformedQuery, pageNumber, foundEntries);
         } catch (URISyntaxException e) {
-            throw new FetcherException("Error while fetching from " + getName(), e);
+            throw new FetcherException(
+                "Error while fetching from " + getName(),
+                e
+            );
         }
     }
 }
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 716a10be48d..c0a10707051 100644
--- a/src/main/java/org/jabref/logic/importer/fetcher/GrobidCitationFetcher.java
+++ b/src/main/java/org/jabref/logic/importer/fetcher/GrobidCitationFetcher.java
@@ -7,15 +7,13 @@
 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.logic.importer.FetcherException;
 import org.jabref.logic.importer.ImportFormatPreferences;
 import org.jabref.logic.importer.ParseException;
 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;
@@ -24,16 +22,24 @@
 
 public class GrobidCitationFetcher implements SearchBasedFetcher {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(GrobidCitationFetcher.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(
+        GrobidCitationFetcher.class
+    );
 
     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;
     }
@@ -45,9 +51,14 @@ public GrobidCitationFetcher(GrobidPreferences grobidPreferences, ImportFormatPr
      * @return A BibTeX string if extraction is successful
      * @throws FetcherException
      */
-    private Optional<BibEntry> parseUsingGrobid(String plainText) throws FetcherException {
+    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) {
             String msg = "Connection failure.";
             LOGGER.debug(msg, e);
@@ -69,15 +80,20 @@ public String getName() {
     }
 
     @Override
-    public List<BibEntry> performSearch(String searchQuery) throws FetcherException {
+    public List<BibEntry> performSearch(String searchQuery)
+        throws FetcherException {
         List<BibEntry> collect;
         try {
-            collect = Arrays.stream(searchQuery.split("\\r\\r+|\\n\\n+|\\r\\n(\\r\\n)+"))
-                            .map(String::trim)
-                            .filter(str -> !str.isBlank())
-                            .map(Unchecked.function(this::parseUsingGrobid))
-                            .flatMap(Optional::stream)
-                            .collect(Collectors.toList());
+            collect =
+                Arrays
+                    .stream(
+                        searchQuery.split("\\r\\r+|\\n\\n+|\\r\\n(\\r\\n)+")
+                    )
+                    .map(String::trim)
+                    .filter(str -> !str.isBlank())
+                    .map(Unchecked.function(this::parseUsingGrobid))
+                    .flatMap(Optional::stream)
+                    .collect(Collectors.toList());
         } catch (UncheckedException e) {
             // This "undoes" Unchecked.function(this::parseUsingGrobid))
             throw (FetcherException) e.getCause();
@@ -89,7 +105,8 @@ public List<BibEntry> performSearch(String searchQuery) throws FetcherException
      * Not used
      */
     @Override
-    public List<BibEntry> performSearch(QueryNode luceneQuery) throws FetcherException {
+    public List<BibEntry> performSearch(QueryNode luceneQuery)
+        throws FetcherException {
         return Collections.emptyList();
     }
 }
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 e87b54f08fe..40db5bc8216 100644
--- a/src/main/java/org/jabref/logic/importer/fetcher/GrobidPreferences.java
+++ b/src/main/java/org/jabref/logic/importer/fetcher/GrobidPreferences.java
@@ -6,13 +6,16 @@
 import javafx.beans.property.StringProperty;
 
 public class GrobidPreferences {
+
     private final BooleanProperty grobidEnabled;
     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);
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 3105cdc6423..a4d6d5c823d 100644
--- a/src/main/java/org/jabref/logic/importer/fetcher/GvkFetcher.java
+++ b/src/main/java/org/jabref/logic/importer/fetcher/GvkFetcher.java
@@ -6,7 +6,8 @@
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.Optional;
-
+import org.apache.http.client.utils.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;
@@ -20,18 +21,30 @@
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.field.StandardField;
 
-import org.apache.http.client.utils.URIBuilder;
-import org.apache.lucene.queryparser.flexible.core.nodes.QueryNode;
-
-public class GvkFetcher extends AbstractIsbnFetcher implements SearchBasedParserFetcher {
+public class GvkFetcher
+    extends AbstractIsbnFetcher
+    implements SearchBasedParserFetcher {
 
-    private static final String URL_PATTERN = "https://sru.k10plus.de/opac-de-627?";
+    private static final String URL_PATTERN =
+        "https://sru.k10plus.de/opac-de-627?";
 
     /**
      * 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);
@@ -48,11 +61,17 @@ public Optional<HelpFile> getHelpPage() {
     }
 
     @Override
-    public URL getURLForQuery(QueryNode luceneQuery) throws URISyntaxException, MalformedURLException, FetcherException {
+    public URL getURLForQuery(QueryNode luceneQuery)
+        throws URISyntaxException, MalformedURLException, FetcherException {
         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");
@@ -62,7 +81,8 @@ public URL getURLForQuery(QueryNode luceneQuery) throws URISyntaxException, Malf
     }
 
     @Override
-    public URL getUrlForIdentifier(String identifier) throws URISyntaxException, MalformedURLException, FetcherException {
+    public URL getUrlForIdentifier(String identifier)
+        throws URISyntaxException, MalformedURLException, FetcherException {
         this.ensureThatIsbnIsValid(identifier);
         URIBuilder uriBuilder = new URIBuilder(URL_PATTERN);
         uriBuilder.addParameter("version", "1.1");
@@ -86,9 +106,23 @@ 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);
+        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 398ebf62fc1..4911239f607 100644
--- a/src/main/java/org/jabref/logic/importer/fetcher/IEEE.java
+++ b/src/main/java/org/jabref/logic/importer/fetcher/IEEE.java
@@ -13,7 +13,10 @@
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;
-
+import kong.unirest.json.JSONArray;
+import kong.unirest.json.JSONObject;
+import org.apache.http.client.utils.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;
@@ -30,11 +33,6 @@
 import org.jabref.model.entry.field.StandardField;
 import org.jabref.model.entry.identifier.DOI;
 import org.jabref.model.entry.types.StandardEntryType;
-
-import kong.unirest.json.JSONArray;
-import kong.unirest.json.JSONObject;
-import org.apache.http.client.utils.URIBuilder;
-import org.apache.lucene.queryparser.flexible.core.nodes.QueryNode;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -45,41 +43,60 @@
  *
  * @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 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 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 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 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) {
-        this.importFormatPreferences = Objects.requireNonNull(importFormatPreferences);
+    public IEEE(
+        ImportFormatPreferences importFormatPreferences,
+        ImporterPreferences importerPreferences
+    ) {
+        this.importFormatPreferences =
+            Objects.requireNonNull(importFormatPreferences);
         this.importerPreferences = Objects.requireNonNull(importerPreferences);
     }
 
     /**
      * @implNote <a href="https://developer.ieee.org/docs/read/Metadata_API_responses">documentation</a>
      */
-    private static BibEntry parseJsonResponse(JSONObject jsonEntry, Character keywordSeparator) {
+    private static BibEntry parseJsonResponse(
+        JSONObject jsonEntry,
+        Character keywordSeparator
+    ) {
         BibEntry entry = new BibEntry();
 
         switch (jsonEntry.optString("content_type")) {
             case "Books" -> entry.setType(StandardEntryType.Book);
-            case "Conferences" -> entry.setType(StandardEntryType.InProceedings);
+            case "Conferences" -> entry.setType(
+                StandardEntryType.InProceedings
+            );
             case "Courses" -> entry.setType(StandardEntryType.Misc);
             default -> entry.setType(StandardEntryType.Article);
         }
@@ -89,29 +106,48 @@ 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.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.YEAR,
+            jsonEntry.optString("publication_year")
+        );
+        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);
+                    });
             }
         }
 
@@ -119,15 +155,32 @@ private static BibEntry parseJsonResponse(JSONObject jsonEntry, Character keywor
         entry.setField(StandardField.ISSN, jsonEntry.optString("issn"));
         entry.setField(StandardField.ISSUE, jsonEntry.optString("issue"));
         try {
-            entry.addFile(new LinkedFile(new URL(jsonEntry.optString("pdf_url")), "PDF"));
+            entry.addFile(
+                new LinkedFile(new URL(jsonEntry.optString("pdf_url")), "PDF")
+            );
         } catch (MalformedURLException e) {
             LOGGER.error("Fetched PDF URL String is malformed.");
         }
-        entry.setField(StandardField.JOURNALTITLE, jsonEntry.optString("publication_title"));
-        entry.setField(StandardField.DATE, jsonEntry.optString("publication_date"));
-        entry.setField(StandardField.EVENTTITLEADDON, jsonEntry.optString("conference_location"));
-        entry.setField(StandardField.EVENTDATE, jsonEntry.optString("conference_dates"));
-        entry.setField(StandardField.PUBLISHER, jsonEntry.optString("publisher"));
+        entry.setField(
+            StandardField.JOURNALTITLE,
+            jsonEntry.optString("publication_title")
+        );
+        entry.setField(
+            StandardField.DATE,
+            jsonEntry.optString("publication_date")
+        );
+        entry.setField(
+            StandardField.EVENTTITLEADDON,
+            jsonEntry.optString("conference_location")
+        );
+        entry.setField(
+            StandardField.EVENTDATE,
+            jsonEntry.optString("conference_dates")
+        );
+        entry.setField(
+            StandardField.PUBLISHER,
+            jsonEntry.optString("publisher")
+        );
         entry.setField(StandardField.TITLE, jsonEntry.optString("title"));
         entry.setField(StandardField.VOLUME, jsonEntry.optString("volume"));
 
@@ -143,7 +196,9 @@ public Optional<URL> findFullText(BibEntry entry) throws IOException {
         // Try URL first -- will primarily work for entries from the old IEEE search
         Optional<String> urlString = entry.getField(StandardField.URL);
         if (urlString.isPresent()) {
-            Matcher documentUrlMatcher = DOCUMENT_PATTERN.matcher(urlString.get());
+            Matcher documentUrlMatcher = DOCUMENT_PATTERN.matcher(
+                urlString.get()
+            );
             if (documentUrlMatcher.find()) {
                 String docId = documentUrlMatcher.group(1);
                 stampString = STAMP_BASE_STRING_DOCUMENT + docId;
@@ -159,10 +214,18 @@ public Optional<URL> findFullText(BibEntry entry) throws IOException {
 
         // 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()) {
+            Optional<DOI> doi = entry
+                .getField(StandardField.DOI)
+                .flatMap(DOI::parse);
+            if (
+                doi.isPresent() &&
+                doi.get().getDOI().startsWith(IEEE_DOI) &&
+                doi.get().getExternalURI().isPresent()
+            ) {
                 // Download the HTML page from IEEE
-                URLDownload urlDownload = new URLDownload(doi.get().getExternalURI().get().toURL());
+                URLDownload urlDownload = new URLDownload(
+                    doi.get().getExternalURI().get().toURL()
+                );
                 // We don't need to modify the cookies, but we need support for them
                 urlDownload.getCookieFromUrl();
 
@@ -205,7 +268,11 @@ 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<>();
@@ -213,18 +280,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;
                     }
@@ -258,12 +345,17 @@ public String getTestUrl() {
     }
 
     @Override
-    public URL getURLForQuery(QueryNode luceneQuery, int pageNumber) throws URISyntaxException, MalformedURLException, FetcherException {
+    public URL getURLForQuery(QueryNode luceneQuery, int pageNumber)
+        throws URISyntaxException, MalformedURLException, FetcherException {
         // 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");
+        String transformedQuery = transformer
+            .transformLuceneQuery(luceneQuery)
+            .orElse("");
+        URIBuilder uriBuilder = new URIBuilder(
+            "https://ieeexploreapi.ieee.org/api/v1/search/articles"
+        );
         uriBuilder.addParameter("apikey", getApiKey());
         if (!transformedQuery.isBlank()) {
             uriBuilder.addParameter("querytext", transformedQuery);
@@ -271,19 +363,34 @@ public URL getURLForQuery(QueryNode luceneQuery, int pageNumber) throws URISynta
         uriBuilder.addParameter("max_records", String.valueOf(getPageSize()));
         // Currently not working as part of the query string
         if (transformer.getJournal().isPresent()) {
-            uriBuilder.addParameter("publication_title", transformer.getJournal().get());
+            uriBuilder.addParameter(
+                "publication_title",
+                transformer.getJournal().get()
+            );
         }
         if (transformer.getStartYear().isPresent()) {
-            uriBuilder.addParameter("start_year", String.valueOf(transformer.getStartYear().get()));
+            uriBuilder.addParameter(
+                "start_year",
+                String.valueOf(transformer.getStartYear().get())
+            );
         }
         if (transformer.getEndYear().isPresent()) {
-            uriBuilder.addParameter("end_year", String.valueOf(transformer.getEndYear().get()));
+            uriBuilder.addParameter(
+                "end_year",
+                String.valueOf(transformer.getEndYear().get())
+            );
         }
         if (transformer.getArticleNumber().isPresent()) {
-            uriBuilder.addParameter("article_number", transformer.getArticleNumber().get());
+            uriBuilder.addParameter(
+                "article_number",
+                transformer.getArticleNumber().get()
+            );
         }
         // Starts to index at 1 for the first entry
-        uriBuilder.addParameter("start_record", String.valueOf(getPageSize() * pageNumber) + 1);
+        uriBuilder.addParameter(
+            "start_record",
+            String.valueOf(getPageSize() * pageNumber) + 1
+        );
 
         return uriBuilder.build().toURL();
     }
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 67f9e84afc0..fdbe3a17467 100644
--- a/src/main/java/org/jabref/logic/importer/fetcher/INSPIREFetcher.java
+++ b/src/main/java/org/jabref/logic/importer/fetcher/INSPIREFetcher.java
@@ -8,7 +8,8 @@
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Optional;
-
+import org.apache.http.client.utils.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.RemoveBracesFormatter;
@@ -28,17 +29,18 @@
 import org.jabref.model.entry.field.StandardField;
 import org.jabref.model.entry.field.UnknownField;
 
-import org.apache.http.client.utils.URIBuilder;
-import org.apache.lucene.queryparser.flexible.core.nodes.QueryNode;
-
 /**
  * Fetches data from the INSPIRE database.
  */
-public class INSPIREFetcher implements SearchBasedParserFetcher, EntryBasedFetcher {
+public class INSPIREFetcher
+    implements SearchBasedParserFetcher, EntryBasedFetcher {
 
-    private static final String INSPIRE_HOST = "https://inspirehep.net/api/literature/";
-    private static final String INSPIRE_DOI_HOST = "https://inspirehep.net/api/doi/";
-    private static final String INSPIRE_ARXIV_HOST = "https://inspirehep.net/api/arxiv/";
+    private static final String INSPIRE_HOST =
+        "https://inspirehep.net/api/literature/";
+    private static final String INSPIRE_DOI_HOST =
+        "https://inspirehep.net/api/doi/";
+    private static final String INSPIRE_ARXIV_HOST =
+        "https://inspirehep.net/api/arxiv/";
 
     private final ImportFormatPreferences importFormatPreferences;
 
@@ -57,9 +59,15 @@ public Optional<HelpFile> getHelpPage() {
     }
 
     @Override
-    public URL getURLForQuery(QueryNode luceneQuery) throws URISyntaxException, MalformedURLException, FetcherException {
+    public URL getURLForQuery(QueryNode luceneQuery)
+        throws URISyntaxException, MalformedURLException, FetcherException {
         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();
     }
 
@@ -73,12 +81,24 @@ 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 RemoveBracesFormatter()).cleanup(entry);
-
-        new FieldFormatterCleanup(StandardField.TITLE, new LatexToUnicodeFormatter()).cleanup(entry);
+        new FieldFormatterCleanup(
+            StandardField.TITLE,
+            new RemoveBracesFormatter()
+        )
+            .cleanup(entry);
+
+        new FieldFormatterCleanup(
+            StandardField.TITLE,
+            new LatexToUnicodeFormatter()
+        )
+            .cleanup(entry);
     }
 
     @Override
@@ -87,14 +107,20 @@ public Parser getParser() {
     }
 
     @Override
-    public List<BibEntry> performSearch(BibEntry entry) throws FetcherException {
+    public List<BibEntry> performSearch(BibEntry entry)
+        throws FetcherException {
         List<BibEntry> results = new ArrayList<>();
         Optional<String> doi = entry.getField(StandardField.DOI);
-        Optional<String> archiveprefix = entry.getFieldOrAlias(StandardField.ARCHIVEPREFIX);
+        Optional<String> archiveprefix = entry.getFieldOrAlias(
+            StandardField.ARCHIVEPREFIX
+        );
         Optional<String> eprint = entry.getField(StandardField.EPRINT);
         String url;
 
-        if (archiveprefix.filter("arxiv"::equals).isPresent() && eprint.isPresent()) {
+        if (
+            archiveprefix.filter("arxiv"::equals).isPresent() &&
+            eprint.isPresent()
+        ) {
             url = INSPIRE_ARXIV_HOST + eprint.get();
         } else if (doi.isPresent()) {
             url = INSPIRE_DOI_HOST + doi.get();
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 7233c998ae3..62761551e11 100644
--- a/src/main/java/org/jabref/logic/importer/fetcher/IacrEprintFetcher.java
+++ b/src/main/java/org/jabref/logic/importer/fetcher/IacrEprintFetcher.java
@@ -6,7 +6,6 @@
 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;
@@ -23,13 +22,21 @@ public class IacrEprintFetcher implements FulltextFetcher, IdBasedFetcher {
 
     public static final String NAME = "IACR eprints";
 
-    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 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/";
-    private static final String VERSION_URL_PREFIX = "https://eprint.iacr.org/archive/versions/";
+    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 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/";
+    private static final String VERSION_URL_PREFIX =
+        "https://eprint.iacr.org/archive/versions/";
 
     private final ImportFormatPreferences prefs;
 
@@ -38,14 +45,22 @@ public IacrEprintFetcher(ImportFormatPreferences prefs) {
     }
 
     @Override
-    public Optional<BibEntry> performSearchById(String identifier) throws FetcherException {
-        String identifierWithoutLettersAndSpaces = WITHOUT_LETTERS_SPACE.matcher(identifier).replaceAll(" ").trim();
+    public Optional<BibEntry> performSearchById(String identifier)
+        throws FetcherException {
+        String identifierWithoutLettersAndSpaces = WITHOUT_LETTERS_SPACE
+            .matcher(identifier)
+            .replaceAll(" ")
+            .trim();
 
         if (!IDENTIFIER_PREDICATE.test(identifierWithoutLettersAndSpaces)) {
-            throw new FetcherException(Localization.lang("Invalid identifier: '%0'.", identifier));
+            throw new FetcherException(
+                Localization.lang("Invalid identifier: '%0'.", identifier)
+            );
         }
 
-        Optional<BibEntry> entry = createEntryFromIacrCitation(identifierWithoutLettersAndSpaces);
+        Optional<BibEntry> entry = createEntryFromIacrCitation(
+            identifierWithoutLettersAndSpaces
+        );
 
         if (entry.isPresent()) {
             setAdditionalFields(entry.get(), identifierWithoutLettersAndSpaces);
@@ -54,21 +69,33 @@ public Optional<BibEntry> performSearchById(String identifier) throws FetcherExc
         return entry;
     }
 
-    private Optional<BibEntry> createEntryFromIacrCitation(String validIdentifier) throws FetcherException {
-        String bibtexCitationHtml = getHtml(CITATION_URL_PREFIX + validIdentifier);
+    private Optional<BibEntry> createEntryFromIacrCitation(
+        String validIdentifier
+    ) throws FetcherException {
+        String bibtexCitationHtml = getHtml(
+            CITATION_URL_PREFIX + validIdentifier
+        );
         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
+            );
         }
     }
 
-    private void setAdditionalFields(BibEntry entry, String identifier) throws FetcherException {
+    private void setAdditionalFields(BibEntry entry, String identifier)
+        throws FetcherException {
         String entryUrl = DESCRIPTION_URL_PREFIX + identifier;
         String descriptiveHtml = getHtml(entryUrl);
 
@@ -85,21 +112,37 @@ private void setAdditionalFields(BibEntry entry, String identifier) throws Fetch
         }
     }
 
-    private String getVersion(String identifier, String versionHtml) throws FetcherException {
-        String startOfVersionString = "<li><a href=\"/archive/" + identifier + "/";
-        String version = getRequiredValueBetween(startOfVersionString, "\">", versionHtml);
+    private String getVersion(String identifier, String versionHtml)
+        throws FetcherException {
+        String startOfVersionString =
+            "<li><a href=\"/archive/" + identifier + "/";
+        String version = getRequiredValueBetween(
+            startOfVersionString,
+            "\">",
+            versionHtml
+        );
         return version;
     }
 
     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 startOfHistoryString =
+            "<dt>History</dt>\n      \n      \n      <dd>";
+        String dateStringAsInHtml = getRequiredValueBetween(
+            startOfHistoryString,
+            ":",
+            descriptiveHtml
+        );
         return dateStringAsInHtml;
     }
 
@@ -108,25 +151,40 @@ private String getHtml(String url) throws FetcherException {
             URLDownload download = new URLDownload(url);
             return download.asString();
         } catch (IOException e) {
-            throw new FetcherException(Localization.lang("Could not retrieve entry data from '%0'.", url), e);
+            throw new FetcherException(
+                Localization.lang(
+                    "Could not retrieve entry data from '%0'.",
+                    url
+                ),
+                e
+            );
         }
     }
 
-    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;
         }
     }
 
-    private boolean isFromOrAfterYear2000(BibEntry entry) throws FetcherException {
+    private boolean isFromOrAfterYear2000(BibEntry entry)
+        throws FetcherException {
         Optional<String> yearField = entry.getField(StandardField.YEAR);
         if (yearField.isPresent()) {
             return Integer.parseInt(yearField.get()) > 2000;
         }
-        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")
+        );
     }
 
     @Override
@@ -135,18 +193,26 @@ public String getName() {
     }
 
     @Override
-    public Optional<URL> findFullText(BibEntry entry) throws IOException, FetcherException {
+    public Optional<URL> findFullText(BibEntry entry)
+        throws IOException, FetcherException {
         Objects.requireNonNull(entry);
 
         Optional<String> urlField = entry.getField(StandardField.URL);
         if (urlField.isPresent()) {
             String descriptiveHtml = getHtml(urlField.get());
-            String startOfFulltextLink = "<a class=\"btn btn-sm btn-outline-dark\"";
-            String fulltextLinkAsInHtml = getRequiredValueBetween(startOfFulltextLink, ".pdf", descriptiveHtml);
+            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,
             // getRequiredValueBetween refuses to match across the line break.
-            fulltextLinkAsInHtml = fulltextLinkAsInHtml.replaceFirst(".*href=\"/", "").trim();
-            String fulltextLink = FULLTEXT_URL_PREFIX + fulltextLinkAsInHtml + ".pdf";
+            fulltextLinkAsInHtml =
+                fulltextLinkAsInHtml.replaceFirst(".*href=\"/", "").trim();
+            String fulltextLink =
+                FULLTEXT_URL_PREFIX + fulltextLinkAsInHtml + ".pdf";
             return Optional.of(new URL(fulltextLink));
         }
         return Optional.empty();
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 11f85d12304..4eb0b451b6d 100644
--- a/src/main/java/org/jabref/logic/importer/fetcher/IssnFetcher.java
+++ b/src/main/java/org/jabref/logic/importer/fetcher/IssnFetcher.java
@@ -3,7 +3,6 @@
 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;
@@ -26,11 +25,18 @@ public IssnFetcher() {
     }
 
     @Override
-    public List<BibEntry> performSearch(BibEntry entry) throws FetcherException {
+    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();
     }
@@ -41,12 +47,22 @@ 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));
+    public Optional<BibEntry> performSearchById(String identifier)
+        throws FetcherException {
+        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);
+    private BibEntry journalInformationToBibEntry(
+        JournalInformation journalInfo,
+        String 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 279edc6594a..28bd3b9f12e 100644
--- a/src/main/java/org/jabref/logic/importer/fetcher/JournalInformationFetcher.java
+++ b/src/main/java/org/jabref/logic/importer/fetcher/JournalInformationFetcher.java
@@ -7,21 +7,18 @@
 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.HttpResponse;
 import kong.unirest.JsonNode;
 import kong.unirest.Unirest;
 import kong.unirest.json.JSONArray;
 import kong.unirest.json.JSONException;
 import kong.unirest.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;
 
@@ -29,18 +26,26 @@
  * Fetches journal information from the JabRef Web API
  */
 public class JournalInformationFetcher implements WebFetcher {
+
     public static final String NAME = "Journal Information";
-    private static final Logger LOGGER = LoggerFactory.getLogger(JournalInformationFetcher.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(
+        JournalInformationFetcher.class
+    );
     // Uses JabRef Online APIs
     private static final String API_URL = "https://jabref.org/api";
-    private static final Pattern QUOTES_BRACKET_PATTERN = Pattern.compile("[\"\\[\\]]");
+    private static final Pattern QUOTES_BRACKET_PATTERN = Pattern.compile(
+        "[\"\\[\\]]"
+    );
 
     @Override
     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 = "";
 
@@ -50,24 +55,28 @@ public Optional<JournalInformation> getJournalInformation(String issnString, Str
             LOGGER.warn(Localization.lang("Incorrect ISSN format"));
         }
 
-        Optional<JournalInformation> journalInformationOptional = Optional.empty();
+        Optional<JournalInformation> journalInformationOptional =
+            Optional.empty();
 
         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();
-            journalInformationOptional = Optional.of(parseResponse(responseJsonObject));
+            journalInformationOptional =
+                Optional.of(parseResponse(responseJsonObject));
         }
 
         return journalInformationOptional;
     }
 
-    private JournalInformation parseResponse(JSONObject responseJsonObject) throws FetcherException {
+    private JournalInformation parseResponse(JSONObject responseJsonObject)
+        throws FetcherException {
         String title = "";
         String publisher = "";
         String coverageStartYear = "";
@@ -82,11 +91,14 @@ private JournalInformation parseResponse(JSONObject responseJsonObject) throws F
         List<Pair<Integer, Double>> snipArray = new ArrayList<>();
         List<Pair<Integer, Double>> docsThisYear = new ArrayList<>();
         List<Pair<Integer, Double>> docsPrevious3Years = new ArrayList<>();
-        List<Pair<Integer, Double>> citableDocsPrevious3Years = new ArrayList<>();
+        List<Pair<Integer, Double>> citableDocsPrevious3Years =
+            new ArrayList<>();
         List<Pair<Integer, Double>> citesOutgoing = new ArrayList<>();
         List<Pair<Integer, Double>> citesOutgoingPerDoc = new ArrayList<>();
-        List<Pair<Integer, Double>> citesIncomingByRecentlyPublished = new ArrayList<>();
-        List<Pair<Integer, Double>> citesIncomingPerDocByRecentlyPublished = new ArrayList<>();
+        List<Pair<Integer, Double>> citesIncomingByRecentlyPublished =
+            new ArrayList<>();
+        List<Pair<Integer, Double>> citesIncomingPerDocByRecentlyPublished =
+            new ArrayList<>();
 
         try {
             if (responseJsonObject.has("errors")) {
@@ -96,7 +108,9 @@ private JournalInformation parseResponse(JSONObject responseJsonObject) throws F
                     String errorMessage = error.optString("message", "");
                     LOGGER.error("Error accessing catalog: {}", errorMessage);
                 }
-                throw new FetcherException(Localization.lang("Error accessing catalog"));
+                throw new FetcherException(
+                    Localization.lang("Error accessing catalog")
+                );
             }
 
             if (responseJsonObject.has("data")) {
@@ -106,95 +120,137 @@ private JournalInformation parseResponse(JSONObject responseJsonObject) throws F
 
                     title = journalData.optString("name", "");
                     publisher = journalData.optString("publisher", "");
-                    coverageStartYear = journalData.optString("coverageStartYear", "");
-                    coverageEndYear = journalData.optString("coverageEndYear", "");
+                    coverageStartYear =
+                        journalData.optString("coverageStartYear", "");
+                    coverageEndYear =
+                        journalData.optString("coverageEndYear", "");
                     scimagoId = journalData.optString("scimagoId", "");
                     country = journalData.optString("country", "");
                     issn = getConcatenatedString(journalData, "issn");
                     subjectArea = getConcatenatedString(journalData, "areas");
-                    categories = getConcatenatedString(journalData, "categories");
+                    categories =
+                        getConcatenatedString(journalData, "categories");
                     hIndex = journalData.optString("hIndex", "");
 
-                    JSONArray citationInfo = journalData.optJSONArray("citationInfo");
+                    JSONArray citationInfo = journalData.optJSONArray(
+                        "citationInfo"
+                    );
                     if (citationInfo != null) {
-                        docsThisYear = parseCitationInfo(citationInfo, "docsThisYear");
-                        docsPrevious3Years = parseCitationInfo(citationInfo, "docsPrevious3Years");
-                        citableDocsPrevious3Years = parseCitationInfo(citationInfo, "citableDocsPrevious3Years");
-                        citesOutgoing = parseCitationInfo(citationInfo, "citesOutgoing");
-                        citesOutgoingPerDoc = parseCitationInfo(citationInfo, "citesOutgoingPerDoc");
-                        citesIncomingByRecentlyPublished = parseCitationInfo(citationInfo, "citesIncomingByRecentlyPublished");
-                        citesIncomingPerDocByRecentlyPublished = parseCitationInfo(citationInfo, "citesIncomingPerDocByRecentlyPublished");
+                        docsThisYear =
+                            parseCitationInfo(citationInfo, "docsThisYear");
+                        docsPrevious3Years =
+                            parseCitationInfo(
+                                citationInfo,
+                                "docsPrevious3Years"
+                            );
+                        citableDocsPrevious3Years =
+                            parseCitationInfo(
+                                citationInfo,
+                                "citableDocsPrevious3Years"
+                            );
+                        citesOutgoing =
+                            parseCitationInfo(citationInfo, "citesOutgoing");
+                        citesOutgoingPerDoc =
+                            parseCitationInfo(
+                                citationInfo,
+                                "citesOutgoingPerDoc"
+                            );
+                        citesIncomingByRecentlyPublished =
+                            parseCitationInfo(
+                                citationInfo,
+                                "citesIncomingByRecentlyPublished"
+                            );
+                        citesIncomingPerDocByRecentlyPublished =
+                            parseCitationInfo(
+                                citationInfo,
+                                "citesIncomingPerDocByRecentlyPublished"
+                            );
                         sjrArray = parseCitationInfo(citationInfo, "sjrIndex");
-                        snipArray = parseCitationInfo(citationInfo, "snipIndex");
+                        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);
         }
 
         return new JournalInformation(
-                title,
-                publisher,
-                coverageStartYear,
-                coverageEndYear,
-                subjectArea,
-                country,
-                categories,
-                scimagoId,
-                hIndex,
-                issn,
-                sjrArray,
-                snipArray,
-                docsThisYear,
-                docsPrevious3Years,
-                citableDocsPrevious3Years,
-                citesOutgoing,
-                citesOutgoingPerDoc,
-                citesIncomingByRecentlyPublished,
-                citesIncomingPerDocByRecentlyPublished
+            title,
+            publisher,
+            coverageStartYear,
+            coverageEndYear,
+            subjectArea,
+            country,
+            categories,
+            scimagoId,
+            hIndex,
+            issn,
+            sjrArray,
+            snipArray,
+            docsThisYear,
+            docsPrevious3Years,
+            citableDocsPrevious3Years,
+            citesOutgoing,
+            citesOutgoingPerDoc,
+            citesIncomingByRecentlyPublished,
+            citesIncomingPerDocByRecentlyPublished
         );
     }
 
-    private static String getConcatenatedString(JSONObject jsonObject, String key) {
+    private static String getConcatenatedString(
+        JSONObject jsonObject,
+        String key
+    ) {
         JSONArray jsonArray = jsonObject.optJSONArray(key);
         if (jsonArray != null) {
-            return QUOTES_BRACKET_PATTERN.matcher(jsonArray.join(", ")).replaceAll("");
+            return QUOTES_BRACKET_PATTERN
+                .matcher(jsonArray.join(", "))
+                .replaceAll("");
         } else {
             return "";
         }
     }
 
     private JSONObject buildPostData(String issn, String journalName) {
-        String query = """
-                query GetJournal($issn: String, $name: String) {
-                  journal(issn: $issn, name: $name) {
-                    id
-                    name
-                    issn
-                    scimagoId
-                    country
-                    publisher
-                    areas
-                    categories
-                    citationInfo {
-                      year
-                      docsThisYear
-                      docsPrevious3Years
-                      citableDocsPrevious3Years
-                      citesOutgoing
-                      citesOutgoingPerDoc
-                      citesIncomingByRecentlyPublished
-                      citesIncomingPerDocByRecentlyPublished
-                      sjrIndex
-                    }
-                    hIndex
-                  }
-                }""";
+        String query =
+            """
+            query GetJournal($issn: String, $name: String) {
+              journal(issn: $issn, name: $name) {
+                id
+                name
+                issn
+                scimagoId
+                country
+                publisher
+                areas
+                categories
+                citationInfo {
+                  year
+                  docsThisYear
+                  docsPrevious3Years
+                  citableDocsPrevious3Years
+                  citesOutgoing
+                  citesOutgoingPerDoc
+                  citesIncomingByRecentlyPublished
+                  citesIncomingPerDocByRecentlyPublished
+                  sjrIndex
+                }
+                hIndex
+              }
+            }""";
 
         JSONObject postData = new JSONObject();
         postData.put("query", query);
@@ -208,7 +264,10 @@ query GetJournal($issn: String, $name: String) {
         return postData;
     }
 
-    private List<Pair<Integer, Double>> parseCitationInfo(JSONArray jsonArray, String key) {
+    private List<Pair<Integer, Double>> parseCitationInfo(
+        JSONArray jsonArray,
+        String key
+    ) {
         List<Pair<Integer, Double>> parsedArray = new ArrayList<>();
         Set<Integer> yearSet = new HashSet<>();
 
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 4a168c70134..addfdf241f9 100644
--- a/src/main/java/org/jabref/logic/importer/fetcher/JstorFetcher.java
+++ b/src/main/java/org/jabref/logic/importer/fetcher/JstorFetcher.java
@@ -11,7 +11,8 @@
 import java.util.List;
 import java.util.Optional;
 import java.util.stream.Collectors;
-
+import org.apache.http.client.utils.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;
@@ -24,9 +25,6 @@
 import org.jabref.logic.net.URLDownload;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.field.StandardField;
-
-import org.apache.http.client.utils.URIBuilder;
-import org.apache.lucene.queryparser.flexible.core.nodes.QueryNode;
 import org.jsoup.Jsoup;
 import org.jsoup.nodes.Document;
 import org.jsoup.nodes.Element;
@@ -34,7 +32,8 @@
 /**
  * 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";
@@ -48,9 +47,15 @@ public JstorFetcher(ImportFormatPreferences importFormatPreferences) {
     }
 
     @Override
-    public URL getURLForQuery(QueryNode luceneQuery) throws URISyntaxException, MalformedURLException, FetcherException {
+    public URL getURLForQuery(QueryNode luceneQuery)
+        throws URISyntaxException, MalformedURLException, FetcherException {
         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();
     }
 
@@ -80,7 +85,10 @@ public Parser getParser() {
         return inputStream -> {
             BibtexParser parser = new BibtexParser(importFormatPreferences);
             String text = new BufferedReader(
-                    new InputStreamReader(inputStream, StandardCharsets.UTF_8)).lines().collect(Collectors.joining());
+                new InputStreamReader(inputStream, StandardCharsets.UTF_8)
+            )
+                .lines()
+                .collect(Collectors.joining());
 
             // does the input stream contain bibtex ?
             if (text.startsWith("@")) {
@@ -92,16 +100,26 @@ public Parser getParser() {
                 Document doc = Jsoup.parse(inputStream, null, HOST);
 
                 StringBuilder stringBuilder = new StringBuilder();
-                List<Element> elements = doc.body().getElementsByClass("cite-this-item");
+                List<Element> elements = doc
+                    .body()
+                    .getElementsByClass("cite-this-item");
                 for (Element element : elements) {
-                    String id = element.attr("href").replace("citation/info/", "");
+                    String id = element
+                        .attr("href")
+                        .replace("citation/info/", "");
 
                     String data = new URLDownload(CITE_HOST + id).asString();
                     stringBuilder.append(data);
                 }
-                entries = new ArrayList<>(parser.parseEntries(stringBuilder.toString()));
+                entries =
+                    new ArrayList<>(
+                        parser.parseEntries(stringBuilder.toString())
+                    );
             } catch (IOException e) {
-                throw new ParseException("Could not download data from jstor.org", e);
+                throw new ParseException(
+                    "Could not download data from jstor.org",
+                    e
+                );
             }
             return entries;
         };
@@ -118,7 +136,8 @@ public Optional<URL> findFullText(BibEntry entry) throws IOException {
             return Optional.empty();
         }
 
-        String page = new URLDownload(entry.getField(StandardField.URL).get()).asString();
+        String page = new URLDownload(entry.getField(StandardField.URL).get())
+            .asString();
 
         Document doc = Jsoup.parse(page);
 
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 87c4045f94b..d67b9beeb3c 100644
--- a/src/main/java/org/jabref/logic/importer/fetcher/LOBIDFetcher.java
+++ b/src/main/java/org/jabref/logic/importer/fetcher/LOBIDFetcher.java
@@ -11,7 +11,10 @@
 import java.util.Optional;
 import java.util.stream.Collectors;
 import java.util.stream.IntStream;
-
+import kong.unirest.json.JSONArray;
+import kong.unirest.json.JSONObject;
+import org.apache.http.client.utils.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.PagedSearchBasedParserFetcher;
@@ -23,11 +26,6 @@
 import org.jabref.model.entry.field.StandardField;
 import org.jabref.model.entry.types.EntryType;
 import org.jabref.model.entry.types.StandardEntryType;
-
-import kong.unirest.json.JSONArray;
-import kong.unirest.json.JSONObject;
-import org.apache.http.client.utils.URIBuilder;
-import org.apache.lucene.queryparser.flexible.core.nodes.QueryNode;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -40,7 +38,9 @@ public class LOBIDFetcher implements PagedSearchBasedParserFetcher {
 
     public static final String FETCHER_NAME = "LOBID";
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(LOBIDFetcher.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(
+        LOBIDFetcher.class
+    );
 
     private static final String API_URL = "https://lobid.org/resources/search";
 
@@ -58,10 +58,19 @@ public LOBIDFetcher(ImporterPreferences importerPreferences) {
      * @return URL
      */
     @Override
-    public URL getURLForQuery(QueryNode luceneQuery, int pageNumber) throws URISyntaxException, MalformedURLException, FetcherException {
+    public URL getURLForQuery(QueryNode luceneQuery, int pageNumber)
+        throws URISyntaxException, MalformedURLException, FetcherException {
         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())); // page size
         uriBuilder.addParameter("format", "json"); // response format
         return uriBuilder.build().toURL();
@@ -70,7 +79,11 @@ 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<>();
@@ -96,10 +109,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);
         }
@@ -117,7 +131,10 @@ private BibEntry parseJSONtoBibtex(JSONObject jsonEntry) {
         entry.setField(StandardField.ISBN, isbn);
 
         // parent resource
-        String bibliographicCitation = jsonEntry.optString("bibliographicCitation", "");
+        String bibliographicCitation = jsonEntry.optString(
+            "bibliographicCitation",
+            ""
+        );
         String[] bibSplit = bibliographicCitation.split("/");
         String parentResource = "";
         if (bibSplit.length > 0) {
@@ -125,31 +142,53 @@ private BibEntry parseJSONtoBibtex(JSONObject jsonEntry) {
             entry.setField(nametype, parentResource);
         }
 
-        entry.setField(StandardField.ISSN, getFirstArrayElement(jsonEntry, "issn"));
+        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.EDITION, getFirstArrayElement(jsonEntry, "edition"));
+        entry.setField(
+            StandardField.ABSTRACT,
+            getFirstArrayElement(jsonEntry, "note")
+        );
+        entry.setField(
+            StandardField.TITLEADDON,
+            getFirstArrayElement(jsonEntry, "otherTitleInformation")
+        );
+        entry.setField(
+            StandardField.EDITION,
+            getFirstArrayElement(jsonEntry, "edition")
+        );
 
         // authors
         JSONArray authors = jsonEntry.optJSONArray("contribution");
         if (authors != null) {
             List<String> authorNames = getAuthorNames(authors);
             if (!authors.isEmpty()) {
-                entry.setField(StandardField.AUTHOR, String.join(" and ", authorNames));
+                entry.setField(
+                    StandardField.AUTHOR,
+                    String.join(" and ", authorNames)
+                );
             }
         }
 
         // 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);
-                });
+        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);
+            });
 
         // url
         JSONObject describedBy = jsonEntry.optJSONObject("describedBy");
@@ -160,40 +199,53 @@ 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();
-            entry.setField(StandardField.LANGUAGE, String.join(" and ", languageList));
+            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();
-            entry.setField(StandardField.KEYWORDS, String.join(", ", keywordList));
+            List<String> keywordList = IntStream
+                .range(0, keywordArray.length())
+                .mapToObj(keywordArray::optString)
+                .filter(keyword -> !keyword.isEmpty())
+                .toList();
+            entry.setField(
+                StandardField.KEYWORDS,
+                String.join(", ", keywordList)
+            );
         }
 
         return entry;
     }
 
     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();
+        return IntStream
+            .range(0, authors.length())
+            .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("");
+    private static String getFirstArrayElement(
+        JSONObject jsonEntry,
+        String key
+    ) {
+        return Optional
+            .ofNullable(jsonEntry.optJSONArray(key))
+            .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 caa236c8edc..59fb93750b7 100644
--- a/src/main/java/org/jabref/logic/importer/fetcher/LibraryOfCongress.java
+++ b/src/main/java/org/jabref/logic/importer/fetcher/LibraryOfCongress.java
@@ -3,15 +3,13 @@
 import java.net.MalformedURLException;
 import java.net.URISyntaxException;
 import java.net.URL;
-
+import org.apache.http.client.utils.URIBuilder;
 import org.jabref.logic.importer.FetcherException;
 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.http.client.utils.URIBuilder;
-
 /**
  * Fetcher for the Library of Congress Control Number (LCCN) using https://lccn.loc.gov/
  */
@@ -29,8 +27,11 @@ public String getName() {
     }
 
     @Override
-    public URL getUrlForIdentifier(String identifier) throws URISyntaxException, MalformedURLException, FetcherException {
-        URIBuilder uriBuilder = new URIBuilder("https://lccn.loc.gov/" + identifier + "/mods");
+    public URL getUrlForIdentifier(String identifier)
+        throws URISyntaxException, MalformedURLException, FetcherException {
+        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 e1b795c1062..a4bc20c37ac 100644
--- a/src/main/java/org/jabref/logic/importer/fetcher/MathSciNet.java
+++ b/src/main/java/org/jabref/logic/importer/fetcher/MathSciNet.java
@@ -10,7 +10,11 @@
 import java.util.Objects;
 import java.util.Optional;
 import java.util.stream.Collectors;
-
+import kong.unirest.json.JSONArray;
+import kong.unirest.json.JSONException;
+import kong.unirest.json.JSONObject;
+import org.apache.http.client.utils.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;
@@ -30,12 +34,6 @@
 import org.jabref.model.entry.field.StandardField;
 import org.jabref.model.entry.field.UnknownField;
 import org.jabref.model.util.DummyFileUpdateMonitor;
-
-import kong.unirest.json.JSONArray;
-import kong.unirest.json.JSONException;
-import kong.unirest.json.JSONObject;
-import org.apache.http.client.utils.URIBuilder;
-import org.apache.lucene.queryparser.flexible.core.nodes.QueryNode;
 import org.jbibtex.TokenMgrException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -43,8 +41,15 @@
 /**
  * Fetches data from the MathSciNet (http://www.ams.org/mathscinet)
  */
-public class MathSciNet implements SearchBasedParserFetcher, EntryBasedParserFetcher, IdBasedParserFetcher {
-    private static final Logger LOGGER = LoggerFactory.getLogger(MathSciNet.class);
+public class MathSciNet
+    implements
+        SearchBasedParserFetcher,
+        EntryBasedParserFetcher,
+        IdBasedParserFetcher {
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(
+        MathSciNet.class
+    );
     private final ImportFormatPreferences preferences;
 
     public MathSciNet(ImportFormatPreferences preferences) {
@@ -61,19 +66,36 @@ 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 {
-        Optional<String> mrNumberInEntry = entry.getField(StandardField.MR_NUMBER);
+    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.addParameter("author", entry.getFieldOrAlias(StandardField.AUTHOR).orElse(""));
-        uriBuilder.addParameter("title", entry.getFieldOrAlias(StandardField.TITLE).orElse(""));
-        uriBuilder.addParameter("journal", entry.getFieldOrAlias(StandardField.JOURNAL).orElse(""));
-        uriBuilder.addParameter("year", entry.getFieldOrAlias(StandardField.YEAR).orElse(""));
+        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("")
+        );
+        uriBuilder.addParameter(
+            "journal",
+            entry.getFieldOrAlias(StandardField.JOURNAL).orElse("")
+        );
+        uriBuilder.addParameter(
+            "year",
+            entry.getFieldOrAlias(StandardField.YEAR).orElse("")
+        );
         uriBuilder.addParameter("firstPage", "");
         uriBuilder.addParameter("lastPage", "");
 
@@ -81,10 +103,18 @@ public URL getURLForEntry(BibEntry entry) throws URISyntaxException, MalformedUR
     }
 
     @Override
-    public URL getURLForQuery(QueryNode luceneQuery) throws URISyntaxException, MalformedURLException, FetcherException {
-        URIBuilder uriBuilder = new URIBuilder("https://mathscinet.ams.org/mathscinet/publications-search");
+    public URL getURLForQuery(QueryNode luceneQuery)
+        throws URISyntaxException, MalformedURLException, FetcherException {
+        URIBuilder uriBuilder = new URIBuilder(
+            "https://mathscinet.ams.org/mathscinet/publications-search"
+        );
         uriBuilder.addParameter("pg7", "ALLF"); // search all fields
-        uriBuilder.addParameter("s7", new DefaultQueryTransformer().transformLuceneQuery(luceneQuery).orElse("")); // query
+        uriBuilder.addParameter(
+            "s7",
+            new DefaultQueryTransformer()
+                .transformLuceneQuery(luceneQuery)
+                .orElse("")
+        ); // query
         uriBuilder.addParameter("r", "1"); // start index
         uriBuilder.addParameter("extend", "1"); // should return up to 100 items (instead of default 10)
         uriBuilder.addParameter("fmt", "bibtex"); // BibTeX format
@@ -93,8 +123,11 @@ public URL getURLForQuery(QueryNode luceneQuery) throws URISyntaxException, Malf
     }
 
     @Override
-    public URL getUrlForIdentifier(String identifier) throws URISyntaxException, MalformedURLException, FetcherException {
-        URIBuilder uriBuilder = new URIBuilder("https://mathscinet.ams.org/mathscinet/publications-search");
+    public URL getUrlForIdentifier(String identifier)
+        throws URISyntaxException, MalformedURLException, FetcherException {
+        URIBuilder uriBuilder = new URIBuilder(
+            "https://mathscinet.ams.org/mathscinet/publications-search"
+        );
         uriBuilder.addParameter("pg1", "MR"); // search MR number
         uriBuilder.addParameter("s1", identifier); // identifier
         uriBuilder.addParameter("fmt", "bibtex"); // BibTeX format
@@ -105,17 +138,28 @@ 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<>();
             try {
                 JSONObject jsonResponse = new JSONObject(response);
-                JSONArray entriesArray = jsonResponse.getJSONObject("all").getJSONArray("results");
+                JSONArray entriesArray = jsonResponse
+                    .getJSONObject("all")
+                    .getJSONArray("results");
 
-                BibtexParser bibtexParser = new BibtexParser(preferences, new DummyFileUpdateMonitor());
+                BibtexParser bibtexParser = new BibtexParser(
+                    preferences,
+                    new DummyFileUpdateMonitor()
+                );
 
                 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));
                 }
             } catch (JSONException | TokenMgrException e) {
@@ -128,14 +172,23 @@ public Parser getParser() {
 
     @Override
     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 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 DoiCleanup().cleanup(entry);
-        new FieldFormatterCleanup(StandardField.URL, new ClearFormatter()).cleanup(entry);
+        new FieldFormatterCleanup(StandardField.URL, new ClearFormatter())
+            .cleanup(entry);
 
         // Remove comments: MathSciNet prepends a <pre> html tag
         entry.setCommentsBeforeEntry("");
     }
 }
-
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 900122f2594..58e30d7db2b 100644
--- a/src/main/java/org/jabref/logic/importer/fetcher/MedlineFetcher.java
+++ b/src/main/java/org/jabref/logic/importer/fetcher/MedlineFetcher.java
@@ -12,12 +12,12 @@
 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.http.client.utils.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,9 +34,6 @@
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.field.StandardField;
 import org.jabref.model.entry.field.UnknownField;
-
-import org.apache.http.client.utils.URIBuilder;
-import org.apache.lucene.queryparser.flexible.core.nodes.QueryNode;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -45,12 +42,18 @@
  * The MedlineFetcher fetches the entries from the PubMed database.
  * See <a href="https://docs.jabref.org/collect/import-using-online-bibliographic-database#medline-pubmed">docs.jabref.org</a> for a detailed documentation of the available fields.
  */
-public class MedlineFetcher implements IdBasedParserFetcher, SearchBasedFetcher {
-    private static final Logger LOGGER = LoggerFactory.getLogger(MedlineFetcher.class);
+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;
 
@@ -61,7 +64,8 @@ public class MedlineFetcher implements IdBasedParserFetcher, SearchBasedFetcher
      *
      * @see <a href="https://www.ncbi.nlm.nih.gov/books/NBK25500/">www.ncbi.nlm.nih.gov/books/NBK25500/</a>
      */
-    private List<String> getPubMedIdsFromQuery(String query) throws FetcherException {
+    private List<String> getPubMedIdsFromQuery(String query)
+        throws FetcherException {
         boolean fetchIDs = false;
         boolean firstOccurrenceOfCount = false;
         List<String> idList = new ArrayList<>();
@@ -69,10 +73,11 @@ private List<String> getPubMedIdsFromQuery(String query) throws FetcherException
             URL ncbi = createSearchUrl(query);
 
             XMLInputFactory inputFactory = XMLInputFactory.newFactory();
-            XMLStreamReader streamReader = inputFactory.createXMLStreamReader(ncbi.openStream());
+            XMLStreamReader streamReader = inputFactory.createXMLStreamReader(
+                ncbi.openStream()
+            );
 
-            fetchLoop:
-            while (streamReader.hasNext()) {
+            fetchLoop:while (streamReader.hasNext()) {
                 int event = streamReader.getEventType();
 
                 switch (event) {
@@ -81,14 +86,16 @@ private List<String> getPubMedIdsFromQuery(String query) throws FetcherException
                             firstOccurrenceOfCount = true;
                         }
 
-                        if ("IdList".equals(streamReader.getName().toString())) {
+                        if (
+                            "IdList".equals(streamReader.getName().toString())
+                        ) {
                             fetchIDs = true;
                         }
                         break;
-
                     case XMLStreamConstants.CHARACTERS:
                         if (firstOccurrenceOfCount) {
-                            numberOfResultsFound = Integer.parseInt(streamReader.getText());
+                            numberOfResultsFound =
+                                Integer.parseInt(streamReader.getText());
                             firstOccurrenceOfCount = false;
                         }
 
@@ -96,10 +103,11 @@ private List<String> getPubMedIdsFromQuery(String query) throws FetcherException
                             idList.add(streamReader.getText());
                         }
                         break;
-
                     case XMLStreamConstants.END_ELEMENT:
                         // Everything relevant is listed before the IdList. So we break the loop right after the IdList tag closes.
-                        if ("IdList".equals(streamReader.getName().toString())) {
+                        if (
+                            "IdList".equals(streamReader.getName().toString())
+                        ) {
                             break fetchLoop;
                         }
                 }
@@ -108,10 +116,17 @@ 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"),
-                    e);
+            throw new FetcherException(
+                "Error while parsing ID list",
+                Localization.lang("Error while parsing ID list"),
+                e
+            );
         }
     }
 
@@ -126,7 +141,8 @@ public Optional<HelpFile> getHelpPage() {
     }
 
     @Override
-    public URL getUrlForIdentifier(String identifier) throws URISyntaxException, MalformedURLException, FetcherException {
+    public URL getUrlForIdentifier(String identifier)
+        throws URISyntaxException, MalformedURLException, FetcherException {
         URIBuilder uriBuilder = new URIBuilder(ID_URL);
         uriBuilder.addParameter("db", "pubmed");
         uriBuilder.addParameter("retmode", "xml");
@@ -141,15 +157,36 @@ public Parser getParser() {
 
     @Override
     public void doPostCleanup(BibEntry 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("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(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 {
+    private URL createSearchUrl(String query)
+        throws URISyntaxException, MalformedURLException {
         URIBuilder uriBuilder = new URIBuilder(SEARCH_URL);
         uriBuilder.addParameter("db", "pubmed");
         uriBuilder.addParameter("sort", "relevance");
@@ -165,13 +202,21 @@ private URL createSearchUrl(String query) throws URISyntaxException, MalformedUR
      * @param ids A list of IDs to search for.
      * @return Will return an empty list on error.
      */
-    private List<BibEntry> fetchMedline(List<String> ids) throws FetcherException {
+    private List<BibEntry> fetchMedline(List<String> ids)
+        throws FetcherException {
         try {
             // 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,19 +224,28 @@ 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
+            );
         }
     }
 
     @Override
-    public List<BibEntry> performSearch(QueryNode luceneQuery) throws FetcherException {
+    public List<BibEntry> performSearch(QueryNode luceneQuery)
+        throws FetcherException {
         List<BibEntry> entryList;
         MedlineQueryTransformer transformer = new MedlineQueryTransformer();
-        Optional<String> transformedQuery = transformer.transformLuceneQuery(luceneQuery);
+        Optional<String> transformedQuery = transformer.transformLuceneQuery(
+            luceneQuery
+        );
 
         if (transformedQuery.isEmpty() || transformedQuery.get().isBlank()) {
             return Collections.emptyList();
@@ -205,7 +259,9 @@ public List<BibEntry> performSearch(QueryNode luceneQuery) throws FetcherExcepti
             }
             if (numberOfResultsFound > NUMBER_TO_FETCH) {
                 LOGGER.info(
-                        numberOfResultsFound + " results found. Only 50 relevant results will be fetched by default.");
+                    numberOfResultsFound +
+                    " results found. Only 50 relevant results will be fetched by default."
+                );
             }
 
             // pass the list of ids to fetchMedline to download them. like a id fetcher for mutliple ids
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 22d457e9c1c..1ca48661192 100644
--- a/src/main/java/org/jabref/logic/importer/fetcher/Medra.java
+++ b/src/main/java/org/jabref/logic/importer/fetcher/Medra.java
@@ -6,7 +6,9 @@
 import java.util.Collections;
 import java.util.Optional;
 import java.util.stream.IntStream;
-
+import kong.unirest.json.JSONArray;
+import kong.unirest.json.JSONException;
+import kong.unirest.json.JSONObject;
 import org.jabref.logic.cleanup.DoiCleanup;
 import org.jabref.logic.importer.FetcherException;
 import org.jabref.logic.importer.IdBasedParserFetcher;
@@ -22,10 +24,6 @@
 import org.jabref.model.entry.types.EntryType;
 import org.jabref.model.entry.types.StandardEntryType;
 
-import kong.unirest.json.JSONArray;
-import kong.unirest.json.JSONException;
-import kong.unirest.json.JSONObject;
-
 /**
  * A class for fetching DOIs from Medra
  *
@@ -55,30 +53,44 @@ public Parser getParser() {
 
     private BibEntry jsonItemToBibEntry(JSONObject item) throws ParseException {
         try {
-
             return new BibEntry(convertType(item.getString("type")))
-                    .withField(StandardField.TITLE, item.getString("title"))
-                    .withField(StandardField.AUTHOR, toAuthors(item.optJSONArray("author")))
-                    .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(""))
-                    .withField(StandardField.DOI, item.getString("DOI"))
-                    .withField(StandardField.PAGES, item.optString("page"))
-                    .withField(StandardField.ISSN, item.optString("ISSN"))
-                    .withField(StandardField.JOURNAL, item.optString("container-title"))
-                    .withField(StandardField.PUBLISHER, item.optString("publisher"))
-                    .withField(StandardField.URL, item.optString("URL"))
-                    .withField(StandardField.VOLUME, item.optString("volume"));
+                .withField(StandardField.TITLE, item.getString("title"))
+                .withField(
+                    StandardField.AUTHOR,
+                    toAuthors(item.optJSONArray("author"))
+                )
+                .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("")
+                )
+                .withField(StandardField.DOI, item.getString("DOI"))
+                .withField(StandardField.PAGES, item.optString("page"))
+                .withField(StandardField.ISSN, item.optString("ISSN"))
+                .withField(
+                    StandardField.JOURNAL,
+                    item.optString("container-title")
+                )
+                .withField(StandardField.PUBLISHER, item.optString("publisher"))
+                .withField(StandardField.URL, item.optString("URL"))
+                .withField(StandardField.VOLUME, item.optString("volume"));
         } catch (JSONException exception) {
-            throw new ParseException("mEdRA API JSON format has changed", exception);
+            throw new ParseException(
+                "mEdRA API JSON format has changed",
+                exception
+            );
         }
     }
 
     private EntryType convertType(String type) {
-        return "article-journal".equals(type) ? StandardEntryType.Article : StandardEntryType.Misc;
+        return "article-journal".equals(type)
+            ? StandardEntryType.Article
+            : StandardEntryType.Misc;
     }
 
     private String toAuthors(JSONArray authors) {
@@ -86,13 +98,22 @@ private String toAuthors(JSONArray authors) {
             return "";
         }
         // 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();
+        return IntStream
+            .range(0, authors.length())
+            .mapToObj(authors::getJSONObject)
+            .map(author ->
+                author.has("literal")
+                    ? new Author(author.getString("literal"), "", "", "", "") // quickly route through the literal string
+                    : new Author(
+                        author.optString("given", ""),
+                        "",
+                        "",
+                        author.optString("family", ""),
+                        ""
+                    )
+            )
+            .collect(AuthorList.collect())
+            .getAsFirstLastNamesWithAnd();
     }
 
     @Override
@@ -103,7 +124,8 @@ public URLDownload getUrlDownload(URL url) {
     }
 
     @Override
-    public URL getUrlForIdentifier(String identifier) throws URISyntaxException, MalformedURLException, FetcherException {
+    public URL getUrlForIdentifier(String identifier)
+        throws URISyntaxException, MalformedURLException, FetcherException {
         return new URL(API_URL + "/" + identifier);
     }
 
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 2773612c972..2ad21c60968 100644
--- a/src/main/java/org/jabref/logic/importer/fetcher/MrDLibFetcher.java
+++ b/src/main/java/org/jabref/logic/importer/fetcher/MrDLibFetcher.java
@@ -7,7 +7,7 @@
 import java.util.Calendar;
 import java.util.List;
 import java.util.Optional;
-
+import org.apache.http.client.utils.URIBuilder;
 import org.jabref.logic.importer.EntryBasedFetcher;
 import org.jabref.logic.importer.FetcherException;
 import org.jabref.logic.importer.ParserResult;
@@ -19,8 +19,6 @@
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.field.StandardField;
 import org.jabref.preferences.MrDlibPreferences;
-
-import org.apache.http.client.utils.URIBuilder;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -28,11 +26,15 @@
  * This class is responsible for getting the recommendations from Mr. DLib
  */
 public class MrDLibFetcher implements EntryBasedFetcher {
-    private static final Logger LOGGER = LoggerFactory.getLogger(MrDLibFetcher.class);
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(
+        MrDLibFetcher.class
+    );
     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;
@@ -40,7 +42,11 @@ public class MrDLibFetcher implements EntryBasedFetcher {
     private String recommendationSetId;
     private final MrDlibPreferences preferences;
 
-    public MrDLibFetcher(String language, Version version, MrDlibPreferences preferences) {
+    public MrDLibFetcher(
+        String language,
+        Version version,
+        MrDlibPreferences preferences
+    ) {
         LANGUAGE = language;
         VERSION = version;
         this.preferences = preferences;
@@ -52,7 +58,8 @@ public String getName() {
     }
 
     @Override
-    public List<BibEntry> performSearch(BibEntry entry) throws FetcherException {
+    public List<BibEntry> performSearch(BibEntry entry)
+        throws FetcherException {
         Optional<String> title = entry.getFieldLatexFree(StandardField.TITLE);
         if (title.isPresent()) {
             String response = makeServerRequest(title.get());
@@ -95,9 +102,12 @@ public String getDescription() {
      * @param queryByTitle the query holds the title of the selected entry. Used to make a query to the MDL Server
      * @return Returns the server response. This is an XML document as a String.
      */
-    private String makeServerRequest(String queryByTitle) throws FetcherException {
+    private String makeServerRequest(String queryByTitle)
+        throws FetcherException {
         try {
-            URLDownload urlDownload = new URLDownload(constructQuery(queryByTitle));
+            URLDownload urlDownload = new URLDownload(
+                constructQuery(queryByTitle)
+            );
             String response = urlDownload.asString();
 
             // Conversion of < and >
@@ -121,7 +131,9 @@ private String constructQuery(String queryWithTitle) {
         URIBuilder builder = new URIBuilder();
         builder.setScheme("http");
         builder.setHost(MDL_URL);
-        builder.setPath("/v2/documents/" + queryWithTitle + "/related_documents");
+        builder.setPath(
+            "/v2/documents/" + queryWithTitle + "/related_documents"
+        );
         builder.addParameter("partner_id", MDL_JABREF_PARTNER_ID);
         builder.addParameter("app_id", "jabref_desktop");
         builder.addParameter("app_version", VERSION.getFullVersion());
@@ -133,7 +145,10 @@ private String constructQuery(String queryWithTitle) {
             builder.addParameter("os", System.getProperty("os.name"));
         }
         if (preferences.shouldSendTimezone()) {
-            builder.addParameter("timezone", Calendar.getInstance().getTimeZone().getID());
+            builder.addParameter(
+                "timezone",
+                Calendar.getInstance().getTimeZone().getID()
+            );
         }
 
         try {
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 b7f91437772..ba05a680cb7 100644
--- a/src/main/java/org/jabref/logic/importer/fetcher/OpenAccessDoi.java
+++ b/src/main/java/org/jabref/logic/importer/fetcher/OpenAccessDoi.java
@@ -5,16 +5,14 @@
 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 kong.unirest.HttpResponse;
 import kong.unirest.JsonNode;
 import kong.unirest.Unirest;
 import kong.unirest.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 org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -24,7 +22,10 @@
  * API is documented at http://unpaywall.org/api/v2
  */
 public class OpenAccessDoi implements FulltextFetcher {
-    private static final Logger LOGGER = LoggerFactory.getLogger(FulltextFetcher.class);
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(
+        FulltextFetcher.class
+    );
 
     private static final String API_URL = "https://api.oadoi.org/v2/";
 
@@ -32,8 +33,9 @@ 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.isPresent()) {
             return Optional.empty();
@@ -52,25 +54,30 @@ 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(new URL(url));
-                           } catch (MalformedURLException e) {
-                               LOGGER.debug("Could not determine URL to fetch full text from", e);
-                               return Optional.empty();
-                           }
-                       });
+        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(new URL(url));
+                } 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 ca9236a3950..31611b7857e 100644
--- a/src/main/java/org/jabref/logic/importer/fetcher/ResearchGate.java
+++ b/src/main/java/org/jabref/logic/importer/fetcher/ResearchGate.java
@@ -10,7 +10,8 @@
 import java.util.Objects;
 import java.util.Optional;
 import java.util.stream.Collectors;
-
+import org.apache.http.client.utils.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;
@@ -25,9 +26,6 @@
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.field.StandardField;
 import org.jabref.model.entry.identifier.DOI;
-
-import org.apache.http.client.utils.URIBuilder;
-import org.apache.lucene.queryparser.flexible.core.nodes.QueryNode;
 import org.jsoup.Connection;
 import org.jsoup.Jsoup;
 import org.jsoup.nodes.Document;
@@ -35,14 +33,20 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-public class ResearchGate implements FulltextFetcher, EntryBasedFetcher, SearchBasedFetcher {
+public class ResearchGate
+    implements FulltextFetcher, EntryBasedFetcher, SearchBasedFetcher {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(ResearchGate.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(
+        ResearchGate.class
+    );
     private static final String HOST = "https://www.researchgate.net/";
-    private static final String GOOGLE_SEARCH = "https://www.google.com/search?q=";
+    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 =
+        "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 final ImportFormatPreferences formatPreferences;
 
     public ResearchGate(ImportFormatPreferences importFormatPreferences) {
@@ -60,7 +64,8 @@ public ResearchGate(ImportFormatPreferences importFormatPreferences) {
      * @throws FetcherException if the ResearchGate refuses to serve the page
      */
     @Override
-    public Optional<URL> findFullText(BibEntry entry) throws IOException, FetcherException {
+    public Optional<URL> findFullText(BibEntry entry)
+        throws IOException, FetcherException {
         Objects.requireNonNull(entry);
 
         Document html;
@@ -71,7 +76,10 @@ public Optional<URL> findFullText(BibEntry entry) throws IOException, FetcherExc
             return Optional.empty();
         }
         Elements eLink = html.getElementsByTag("section");
-        String link = eLink.select("a[href^=https]").select("a[href$=.pdf]").attr("href");
+        String link = eLink
+            .select("a[href^=https]")
+            .select("a[href$=.pdf]")
+            .attr("href");
         LOGGER.debug("PDF link: {}", link);
 
         if (link.contains("researchgate.net")) {
@@ -80,10 +88,13 @@ public Optional<URL> findFullText(BibEntry entry) throws IOException, FetcherExc
         return Optional.empty();
     }
 
-    private Document getHTML(BibEntry entry) throws FetcherException, IOException {
+    private Document getHTML(BibEntry entry)
+        throws FetcherException, IOException {
         // DOI search
         Optional<String> title = entry.getField(StandardField.TITLE);
-        Optional<DOI> doi = entry.getField(StandardField.DOI).flatMap(DOI::parse);
+        Optional<DOI> doi = entry
+            .getField(StandardField.DOI)
+            .flatMap(DOI::parse);
 
         // Retrieve PDF link
         Optional<String> linkForSearch;
@@ -93,11 +104,11 @@ private Document getHTML(BibEntry entry) throws FetcherException, IOException {
             if (linkForSearch.isPresent()) {
                 Connection connection = Jsoup.connect(linkForSearch.get());
                 return connection
-                        .cookieStore(connection.cookieStore())
-                        .userAgent(URLDownload.USER_AGENT)
-                        .referrer("www.google.com")
-                        .ignoreHttpErrors(true)
-                        .get();
+                    .cookieStore(connection.cookieStore())
+                    .userAgent(URLDownload.USER_AGENT)
+                    .referrer("www.google.com")
+                    .ignoreHttpErrors(true)
+                    .get();
             }
         }
         if (doi.isPresent()) {
@@ -107,16 +118,17 @@ private Document getHTML(BibEntry entry) throws FetcherException, IOException {
             if (linkForSearch.isPresent()) {
                 Connection connection = Jsoup.connect(linkForSearch.get());
                 return connection
-                        .cookieStore(connection.cookieStore())
-                        .userAgent(URLDownload.USER_AGENT)
-                        .ignoreHttpErrors(true)
-                        .get();
+                    .cookieStore(connection.cookieStore())
+                    .userAgent(URLDownload.USER_AGENT)
+                    .ignoreHttpErrors(true)
+                    .get();
             }
         }
         throw new FetcherException("Could not find a pdf");
     }
 
-    Optional<String> getURLByString(String query) throws IOException, NullPointerException {
+    Optional<String> getURLByString(String query)
+        throws IOException, NullPointerException {
         URIBuilder source;
         String link;
         try {
@@ -126,15 +138,19 @@ Optional<String> getURLByString(String query) throws IOException, NullPointerExc
 
             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("?"));
             }
@@ -145,7 +161,8 @@ Optional<String> getURLByString(String query) throws IOException, NullPointerExc
         return Optional.of(link);
     }
 
-    Optional<String> getURLByDoi(DOI doi) throws IOException, NullPointerException {
+    Optional<String> getURLByDoi(DOI doi)
+        throws IOException, NullPointerException {
         String link;
         try {
             URIBuilder source = new URIBuilder(SEARCH);
@@ -155,13 +172,16 @@ 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();
+                .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();
         }
@@ -179,16 +199,20 @@ Optional<String> getURLByDoi(DOI doi) throws IOException, NullPointerException {
      * @throws URISyntaxException from {@link URIBuilder}'s build() method
      * @throws IOException        from {@link Connection}'s get() method
      */
-    private Document getPage(QueryNode luceneQuery) throws URISyntaxException, IOException {
-        String query = new DefaultQueryTransformer().transformLuceneQuery(luceneQuery).orElse("");
+    private Document getPage(QueryNode luceneQuery)
+        throws URISyntaxException, IOException {
+        String query = new DefaultQueryTransformer()
+            .transformLuceneQuery(luceneQuery)
+            .orElse("");
         URIBuilder source = new URIBuilder(SEARCH);
         source.addParameter("type", "publication");
         source.addParameter("query", query);
-        return Jsoup.connect(source.build().toString())
-                    .userAgent(URLDownload.USER_AGENT)
-                    .referrer("www.google.com")
-                    .ignoreHttpErrors(true)
-                    .get();
+        return Jsoup
+            .connect(source.build().toString())
+            .userAgent(URLDownload.USER_AGENT)
+            .referrer("www.google.com")
+            .ignoreHttpErrors(true)
+            .get();
     }
 
     @Override
@@ -204,27 +228,44 @@ public TrustLevel getTrustLevel() {
      * @throws FetcherException if the ResearchGate refuses to serve the page
      */
     @Override
-    public List<BibEntry> performSearch(QueryNode luceneQuery) throws FetcherException {
+    public List<BibEntry> performSearch(QueryNode luceneQuery)
+        throws FetcherException {
         Document html;
         try {
             html = getPage(luceneQuery);
             // ResearchGate's server blocks when too many request are made
-            if (!html.getElementsByClass("nova-legacy-v-publication-item__title").hasText()) {
+            if (
+                !html
+                    .getElementsByClass("nova-legacy-v-publication-item__title")
+                    .hasText()
+            ) {
                 throw new FetcherException("ResearchGate server unavailable");
             }
         } catch (URISyntaxException | IOException e) {
             throw new FetcherException("URL is not correct", e);
         }
 
-        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();
+        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<BibEntry> list = new ArrayList<>();
         for (String bib : urls) {
@@ -263,7 +304,8 @@ public String getName() {
      * @throws FetcherException if the ResearchGate refuses to serve the page
      */
     @Override
-    public List<BibEntry> performSearch(BibEntry entry) throws FetcherException {
+    public List<BibEntry> performSearch(BibEntry entry)
+        throws FetcherException {
         Optional<String> title = entry.getTitle();
         if (title.isEmpty()) {
             return new ArrayList<>();
@@ -271,4 +313,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 d846b346ccd..5d111088af0 100644
--- a/src/main/java/org/jabref/logic/importer/fetcher/RfcFetcher.java
+++ b/src/main/java/org/jabref/logic/importer/fetcher/RfcFetcher.java
@@ -5,7 +5,7 @@
 import java.net.URL;
 import java.util.Locale;
 import java.util.Optional;
-
+import org.apache.http.client.utils.URIBuilder;
 import org.jabref.logic.help.HelpFile;
 import org.jabref.logic.importer.FetcherException;
 import org.jabref.logic.importer.IdBasedParserFetcher;
@@ -13,8 +13,6 @@
 import org.jabref.logic.importer.Parser;
 import org.jabref.logic.importer.fileformat.BibtexParser;
 
-import org.apache.http.client.utils.URIBuilder;
-
 /*
  * https://datatracker.ietf.org
  * IETF (Internet Engineering Task Force) datatracker contains data about the documents,
@@ -22,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) {
@@ -46,14 +44,22 @@ public Optional<HelpFile> getHelpPage() {
      * @return the URL of the RFC resource
      */
     @Override
-    public URL getUrlForIdentifier(String identifier) throws URISyntaxException, MalformedURLException, FetcherException {
+    public URL getUrlForIdentifier(String identifier)
+        throws URISyntaxException, MalformedURLException, FetcherException {
         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 0f6b810c6ac..d2b609e6f8e 100644
--- a/src/main/java/org/jabref/logic/importer/fetcher/ScholarArchiveFetcher.java
+++ b/src/main/java/org/jabref/logic/importer/fetcher/ScholarArchiveFetcher.java
@@ -1,5 +1,6 @@
 package org.jabref.logic.importer.fetcher;
 
+import jakarta.ws.rs.core.MediaType;
 import java.net.MalformedURLException;
 import java.net.URISyntaxException;
 import java.net.URL;
@@ -7,7 +8,11 @@
 import java.util.List;
 import java.util.Optional;
 import java.util.stream.IntStream;
-
+import kong.unirest.json.JSONArray;
+import kong.unirest.json.JSONException;
+import kong.unirest.json.JSONObject;
+import org.apache.http.client.utils.URIBuilder;
+import org.apache.lucene.queryparser.flexible.core.nodes.QueryNode;
 import org.jabref.logic.importer.FetcherException;
 import org.jabref.logic.importer.PagedSearchBasedParserFetcher;
 import org.jabref.logic.importer.ParseException;
@@ -20,13 +25,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 kong.unirest.json.JSONArray;
-import kong.unirest.json.JSONException;
-import kong.unirest.json.JSONObject;
-import org.apache.http.client.utils.URIBuilder;
-import org.apache.lucene.queryparser.flexible.core.nodes.QueryNode;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -34,7 +32,9 @@ public class ScholarArchiveFetcher implements PagedSearchBasedParserFetcher {
 
     public static final String FETCHER_NAME = "ScholarArchive";
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(ScholarArchiveFetcher.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(
+        ScholarArchiveFetcher.class
+    );
 
     private static final String API_URL = "https://scholar.archive.org/search";
 
@@ -46,10 +46,19 @@ public class ScholarArchiveFetcher implements PagedSearchBasedParserFetcher {
      * @return URL
      */
     @Override
-    public URL getURLForQuery(QueryNode luceneQuery, int pageNumber) throws URISyntaxException, MalformedURLException, FetcherException {
+    public URL getURLForQuery(QueryNode luceneQuery, int pageNumber)
+        throws URISyntaxException, MalformedURLException, FetcherException {
         URIBuilder uriBuilder = new URIBuilder(API_URL);
-        uriBuilder.addParameter("q", new ScholarArchiveQueryTransformer().transformLuceneQuery(luceneQuery).orElse(""));
-        uriBuilder.addParameter("from", String.valueOf(getPageSize() * pageNumber));
+        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");
 
@@ -92,19 +101,25 @@ public String getName() {
         return FETCHER_NAME;
     }
 
-    private BibEntry parseJSONtoBibtex(JSONObject jsonEntry) throws ParseException {
+    private BibEntry parseJSONtoBibtex(JSONObject jsonEntry)
+        throws ParseException {
         try {
             BibEntry entry = new BibEntry();
             EntryType entryType = StandardEntryType.InCollection;
             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");
@@ -117,14 +132,29 @@ private BibEntry parseJSONtoBibtex(JSONObject jsonEntry) throws ParseException {
             entry.setType(entryType);
 
             entry.setField(StandardField.TITLE, biblio.optString("title"));
-            entry.setField(StandardField.JOURNAL, biblio.optString("container_name"));
+            entry.setField(
+                StandardField.JOURNAL,
+                biblio.optString("container_name")
+            );
             entry.setField(StandardField.DOI, biblio.optString("doi"));
             entry.setField(StandardField.ISSUE, biblio.optString("issue"));
-            entry.setField(StandardField.LANGUAGE, biblio.optString("lang_code"));
-            entry.setField(StandardField.PUBLISHER, biblio.optString("publisher"));
-
-            entry.setField(StandardField.YEAR, String.valueOf(biblio.optInt("release_year")));
-            entry.setField(StandardField.VOLUME, String.valueOf(biblio.optInt("volume_int")));
+            entry.setField(
+                StandardField.LANGUAGE,
+                biblio.optString("lang_code")
+            );
+            entry.setField(
+                StandardField.PUBLISHER,
+                biblio.optString("publisher")
+            );
+
+            entry.setField(
+                StandardField.YEAR,
+                String.valueOf(biblio.optInt("release_year"))
+            );
+            entry.setField(
+                StandardField.VOLUME,
+                String.valueOf(biblio.optInt("volume_int"))
+            );
             entry.setField(StandardField.ABSTRACT, foundAbstract);
             entry.setField(StandardField.URL, url);
 
@@ -138,8 +168,13 @@ private BibEntry parseJSONtoBibtex(JSONObject jsonEntry) throws ParseException {
                 for (int i = 0; i < authors.length(); i++) {
                     authorList.add(authors.getString(i));
                 }
-                AuthorList parsedAuthors = AuthorList.parse(String.join(" and ", authorList));
-                entry.setField(StandardField.AUTHOR, parsedAuthors.getAsLastFirstNamesWithAnd(false));
+                AuthorList parsedAuthors = AuthorList.parse(
+                    String.join(" and ", authorList)
+                );
+                entry.setField(
+                    StandardField.AUTHOR,
+                    parsedAuthors.getAsLastFirstNamesWithAnd(false)
+                );
             }
 
             if (biblio.has("issns")) {
@@ -152,7 +187,10 @@ private BibEntry parseJSONtoBibtex(JSONObject jsonEntry) throws ParseException {
             }
             return entry;
         } catch (JSONException exception) {
-            throw new ParseException("ScholarArchive API JSON format has changed", exception);
+            throw new ParseException(
+                "ScholarArchive API JSON format has changed",
+                exception
+            );
         }
     }
 }
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 8b555e2da2f..67106648ee6 100644
--- a/src/main/java/org/jabref/logic/importer/fetcher/ScienceDirect.java
+++ b/src/main/java/org/jabref/logic/importer/fetcher/ScienceDirect.java
@@ -6,15 +6,6 @@
 import java.util.Objects;
 import java.util.Optional;
 import java.util.stream.Collectors;
-
-import org.jabref.logic.importer.FulltextFetcher;
-import org.jabref.logic.importer.ImporterPreferences;
-import org.jabref.logic.net.URLDownload;
-import org.jabref.logic.util.BuildInfo;
-import org.jabref.model.entry.BibEntry;
-import org.jabref.model.entry.field.StandardField;
-import org.jabref.model.entry.identifier.DOI;
-
 import kong.unirest.HttpResponse;
 import kong.unirest.JsonNode;
 import kong.unirest.Unirest;
@@ -22,6 +13,13 @@
 import kong.unirest.json.JSONArray;
 import kong.unirest.json.JSONException;
 import kong.unirest.json.JSONObject;
+import org.jabref.logic.importer.FulltextFetcher;
+import org.jabref.logic.importer.ImporterPreferences;
+import org.jabref.logic.net.URLDownload;
+import org.jabref.logic.util.BuildInfo;
+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.Node;
@@ -34,9 +32,13 @@
  * See <a href="https://dev.elsevier.com/">https://dev.elsevier.com/</a>.
  */
 public class ScienceDirect implements FulltextFetcher, CustomizableKeyFetcher {
-    private static final Logger LOGGER = LoggerFactory.getLogger(ScienceDirect.class);
 
-    private static final String API_URL = "https://api.elsevier.com/content/article/doi/";
+    private static final Logger LOGGER = LoggerFactory.getLogger(
+        ScienceDirect.class
+    );
+
+    private static final String API_URL =
+        "https://api.elsevier.com/content/article/doi/";
     private static final String API_KEY = new BuildInfo().scienceDirectApiKey;
     private static final String FETCHER_NAME = "ScienceDirect";
 
@@ -50,7 +52,9 @@ public ScienceDirect(ImporterPreferences importerPreferences) {
     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()) {
             // Full text fetching works only if a DOI is present
             return Optional.empty();
@@ -61,14 +65,18 @@ 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");
+        Elements metaLinks = html.getElementsByAttributeValue(
+            "name",
+            "citation_pdf_url"
+        );
         if (!metaLinks.isEmpty()) {
             String link = metaLinks.first().attr("content");
             return Optional.of(new URL(link));
@@ -79,18 +87,18 @@ public Optional<URL> findFullText(BibEntry entry) throws IOException {
         // 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();
+            .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");
@@ -103,24 +111,46 @@ public Optional<URL> findFullText(BibEntry entry) throws IOException {
         if (pdfDownload.has("linkToPdf")) {
             String linkToPdf = pdfDownload.getString("linkToPdf");
             URL url = new URL(urlFromDoi);
-            fullLinkToPdf = String.format("%s://%s%s", url.getProtocol(), url.getAuthority(), linkToPdf);
+            fullLinkToPdf =
+                String.format(
+                    "%s://%s%s",
+                    url.getProtocol(),
+                    url.getAuthority(),
+                    linkToPdf
+                );
         } else if (pdfDownload.has("urlMetadata")) {
             JSONObject urlMetadata = pdfDownload.getJSONObject("urlMetadata");
-            JSONObject queryParamsObject = urlMetadata.getJSONObject("queryParams");
-            String queryParameters = queryParamsObject.keySet().stream()
-                                                      .map(key -> String.format("%s=%s", key, queryParamsObject.getString(key)))
-                                                      .collect(Collectors.joining("&"));
-            fullLinkToPdf = String.format("https://www.sciencedirect.com/%s/%s%s?%s",
+            JSONObject queryParamsObject = urlMetadata.getJSONObject(
+                "queryParams"
+            );
+            String queryParameters = queryParamsObject
+                .keySet()
+                .stream()
+                .map(key ->
+                    String.format(
+                        "%s=%s",
+                        key,
+                        queryParamsObject.getString(key)
+                    )
+                )
+                .collect(Collectors.joining("&"));
+            fullLinkToPdf =
+                String.format(
+                    "https://www.sciencedirect.com/%s/%s%s?%s",
                     urlMetadata.getString("path"),
                     urlMetadata.getString("pii"),
                     urlMetadata.getString("pdfExtension"),
-                    queryParameters);
+                    queryParameters
+                );
         } else {
             LOGGER.debug("No suitable data in JSON information");
             return Optional.empty();
         }
 
-        LOGGER.info("Fulltext PDF found at ScienceDirect at {}.", fullLinkToPdf);
+        LOGGER.info(
+            "Fulltext PDF found at ScienceDirect at {}.",
+            fullLinkToPdf
+        );
         try {
             return Optional.of(new URL(fullLinkToPdf));
         } catch (MalformedURLException e) {
@@ -138,15 +168,20 @@ 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 cde8ae98ece..1317e356866 100644
--- a/src/main/java/org/jabref/logic/importer/fetcher/SemanticScholar.java
+++ b/src/main/java/org/jabref/logic/importer/fetcher/SemanticScholar.java
@@ -11,7 +11,11 @@
 import java.util.Optional;
 import java.util.stream.Collectors;
 import java.util.stream.IntStream;
-
+import kong.unirest.json.JSONArray;
+import kong.unirest.json.JSONException;
+import kong.unirest.json.JSONObject;
+import org.apache.http.client.utils.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,24 +31,27 @@
 import org.jabref.model.entry.identifier.ArXivIdentifier;
 import org.jabref.model.entry.identifier.DOI;
 import org.jabref.model.entry.types.StandardEntryType;
-
-import kong.unirest.json.JSONArray;
-import kong.unirest.json.JSONException;
-import kong.unirest.json.JSONObject;
-import org.apache.http.client.utils.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;
 
-public class SemanticScholar implements FulltextFetcher, PagedSearchBasedParserFetcher, EntryBasedFetcher, CustomizableKeyFetcher {
+public class SemanticScholar
+    implements
+        FulltextFetcher,
+        PagedSearchBasedParserFetcher,
+        EntryBasedFetcher,
+        CustomizableKeyFetcher {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(SemanticScholar.class);
+    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_ID_SEARCH =
+        "https://api.semanticscholar.org/v1/paper/";
+    private static final String SOURCE_WEB_SEARCH =
+        "https://api.semanticscholar.org/graph/v1/paper/search?";
     private final ImporterPreferences importerPreferences;
 
     public SemanticScholar(ImporterPreferences importerPreferences) {
@@ -62,42 +69,53 @@ public SemanticScholar(ImporterPreferences importerPreferences) {
      * @throws FetcherException if the received page differs from what was expected
      */
     @Override
-    public Optional<URL> findFullText(BibEntry entry) throws IOException, FetcherException {
+    public Optional<URL> findFullText(BibEntry entry)
+        throws IOException, FetcherException {
         Objects.requireNonNull(entry);
 
-        Optional<DOI> doi = entry.getField(StandardField.DOI).flatMap(DOI::parse);
-        Optional<ArXivIdentifier> arXiv = entry.getField(StandardField.EPRINT).flatMap(ArXivIdentifier::parse);
+        Optional<DOI> doi = entry
+            .getField(StandardField.DOI)
+            .flatMap(DOI::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)
-                                        .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)
+                    .referrer("https://www.google.com")
+                    .ignoreHttpErrors(true);
+                importerPreferences
+                    .getApiKey(getName())
+                    .ifPresent(key -> jsoupRequest.header("x-api-key", key));
                 html = jsoupRequest.get();
-            } catch (
-                    IOException e) {
+            } catch (IOException e) {
                 LOGGER.info("Error for pdf lookup with DOI");
             }
         }
-        if (arXiv.isPresent() && entry.getField(StandardField.EPRINT).isPresent()) {
+        if (
+            arXiv.isPresent() &&
+            entry.getField(StandardField.EPRINT).isPresent()
+        ) {
             // Check if entry is a match
             String arXivString = entry.getField(StandardField.EPRINT).get();
             if (!arXivString.startsWith("arXiv:")) {
                 arXivString = "arXiv:" + arXivString;
             }
             String source = SOURCE_ID_SEARCH + arXivString;
-            var jsoupRequest = Jsoup.connect(getURLBySource(source))
-                                    .userAgent(URLDownload.USER_AGENT)
-                                    .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)
+                .referrer("https://www.google.com")
+                .ignoreHttpErrors(true);
+            importerPreferences
+                .getApiKey(getName())
+                .ifPresent(key -> jsoupRequest.header("x-api-key", key));
             html = jsoupRequest.get();
         }
         if (html == null) {
@@ -107,10 +125,13 @@ public Optional<URL> findFullText(BibEntry entry) throws IOException, FetcherExc
         // Retrieve PDF link from button on the webpage
         // First checked is a drop-down menu, as it has the correct URL if present
         // Else take the primary button
-        Elements metaLinks = html.getElementsByClass("flex-item alternate-sources__dropdown");
+        Elements metaLinks = html.getElementsByClass(
+            "flex-item alternate-sources__dropdown"
+        );
         String link = metaLinks.select("a").attr("href");
         if (link.length() < 10) {
-            metaLinks = html.getElementsByClass("flex-paper-actions__button--primary");
+            metaLinks =
+                html.getElementsByClass("flex-paper-actions__button--primary");
             link = metaLinks.select("a").attr("href");
         }
         if (link.isBlank()) {
@@ -136,13 +157,30 @@ String getURLBySource(String source) throws IOException, FetcherException {
     }
 
     @Override
-    public URL getURLForQuery(QueryNode luceneQuery, int pageNumber) throws URISyntaxException, MalformedURLException, FetcherException {
+    public URL getURLForQuery(QueryNode luceneQuery, int pageNumber)
+        throws URISyntaxException, MalformedURLException, FetcherException {
         URIBuilder uriBuilder = new URIBuilder(SOURCE_WEB_SEARCH);
-        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(
+            "query",
+            new DefaultQueryTransformer()
+                .transformLuceneQuery(luceneQuery)
+                .orElse("")
+        );
+        uriBuilder.addParameter(
+            "offset",
+            String.valueOf(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"
+        );
         LOGGER.debug("URL for query: {}", uriBuilder.build().toURL());
         return uriBuilder.build().toURL();
     }
@@ -153,7 +191,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()) {
@@ -164,7 +201,11 @@ public Parser getParser() {
             if (total == 0) {
                 return Collections.emptyList();
             } else if (response.has("next")) {
-                total = Math.min(total, response.getInt("next") - response.getInt("offset"));
+                total =
+                    Math.min(
+                        total,
+                        response.getInt("next") - response.getInt("offset")
+                    );
             }
 
             // Response contains a list
@@ -196,22 +237,33 @@ 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,
-                    IntStream.range(0, item.optJSONArray("authors").length())
-                             .mapToObj(item.optJSONArray("authors")::getJSONObject)
-                             .map(author -> author.has("name") ? author.getString("name") : "")
-                             .collect(Collectors.joining(" and ")));
+            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 "))
+            );
 
             JSONObject externalIds = item.optJSONObject("externalIds");
             entry.setField(StandardField.DOI, externalIds.optString("DOI"));
             if (externalIds.has("ArXiv")) {
-                entry.setField(StandardField.EPRINT, externalIds.getString("ArXiv"));
+                entry.setField(
+                    StandardField.EPRINT,
+                    externalIds.getString("ArXiv")
+                );
                 entry.setField(StandardField.EPRINTTYPE, "arXiv");
             }
             entry.setField(StandardField.PMID, externalIds.optString("PubMed"));
             return entry;
         } catch (JSONException exception) {
-            throw new ParseException("SemanticScholar API JSON format has changed", exception);
+            throw new ParseException(
+                "SemanticScholar API JSON format has changed",
+                exception
+            );
         }
     }
 
@@ -233,7 +285,8 @@ public String getName() {
      * @throws FetcherException if an error linked to the Fetcher applies
      */
     @Override
-    public List<BibEntry> performSearch(BibEntry entry) throws FetcherException {
+    public List<BibEntry> performSearch(BibEntry entry)
+        throws FetcherException {
         Optional<String> title = entry.getTitle();
         if (title.isEmpty()) {
             return new ArrayList<>();
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 c2acb59c04a..7e55369bdca 100644
--- a/src/main/java/org/jabref/logic/importer/fetcher/SpringerFetcher.java
+++ b/src/main/java/org/jabref/logic/importer/fetcher/SpringerFetcher.java
@@ -9,7 +9,10 @@
 import java.util.List;
 import java.util.Optional;
 import java.util.stream.Collectors;
-
+import kong.unirest.json.JSONArray;
+import kong.unirest.json.JSONObject;
+import org.apache.http.client.utils.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.ImporterPreferences;
@@ -24,11 +27,6 @@
 import org.jabref.model.entry.field.Field;
 import org.jabref.model.entry.field.StandardField;
 import org.jabref.model.entry.types.StandardEntryType;
-
-import kong.unirest.json.JSONArray;
-import kong.unirest.json.JSONObject;
-import org.apache.http.client.utils.URIBuilder;
-import org.apache.lucene.queryparser.flexible.core.nodes.QueryNode;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -37,16 +35,21 @@
  *
  * @see <a href="https://dev.springernature.com/">API documentation</a> for more details
  */
-public class SpringerFetcher implements PagedSearchBasedParserFetcher, CustomizableKeyFetcher {
+public class SpringerFetcher
+    implements PagedSearchBasedParserFetcher, CustomizableKeyFetcher {
 
     public static final String FETCHER_NAME = "Springer";
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(SpringerFetcher.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(
+        SpringerFetcher.class
+    );
 
-    private static final String API_URL = "https://api.springernature.com/meta/v1/json";
+    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;
 
@@ -60,10 +63,19 @@ public SpringerFetcher(ImporterPreferences importerPreferences) {
      * @param springerJsonEntry the JSONObject from search results
      * @return the converted BibEntry
      */
-    public static BibEntry parseSpringerJSONtoBibtex(JSONObject springerJsonEntry) {
+    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;
@@ -87,12 +99,17 @@ public static BibEntry parseSpringerJSONtoBibtex(JSONObject springerJsonEntry) {
             List<String> authorList = new ArrayList<>();
             for (int i = 0; i < authors.length(); i++) {
                 if (authors.getJSONObject(i).has("creator")) {
-                    authorList.add(authors.getJSONObject(i).getString("creator"));
+                    authorList.add(
+                        authors.getJSONObject(i).getString("creator")
+                    );
                 } else {
                     LOGGER.info("Empty author name.");
                 }
             }
-            entry.setField(StandardField.AUTHOR, String.join(" and ", authorList));
+            entry.setField(
+                StandardField.AUTHOR,
+                String.join(" and ", authorList)
+            );
         } else {
             LOGGER.info("No author found.");
         }
@@ -108,33 +125,60 @@ 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"));
+                entry.setField(
+                    StandardField.PAGES,
+                    springerJsonEntry.getString("startingPage")
+                );
             }
         }
 
         // Journal
         if (springerJsonEntry.has("publicationName")) {
-            entry.setField(nametype, springerJsonEntry.getString("publicationName"));
+            entry.setField(
+                nametype,
+                springerJsonEntry.getString("publicationName")
+            );
         }
 
         // Online file
         if (springerJsonEntry.has("url")) {
             JSONArray urls = springerJsonEntry.optJSONArray("url");
             if (urls == null) {
-                entry.setField(StandardField.URL, springerJsonEntry.optString("url"));
+                entry.setField(
+                    StandardField.URL,
+                    springerJsonEntry.optString("url")
+                );
             } else {
                 urls.forEach(data -> {
                     JSONObject url = (JSONObject) data;
                     if (url.optString("format").equalsIgnoreCase("pdf")) {
                         try {
-                            entry.addFile(new LinkedFile(new URL(url.optString("value")), "PDF"));
+                            entry.addFile(
+                                new LinkedFile(
+                                    new URL(url.optString("value")),
+                                    "PDF"
+                                )
+                            );
                         } catch (MalformedURLException e) {
-                            LOGGER.info("Malformed URL: {}", url.optString("value"));
+                            LOGGER.info(
+                                "Malformed URL: {}",
+                                url.optString("value")
+                            );
                         }
                     }
                 });
@@ -147,16 +191,23 @@ public static BibEntry parseSpringerJSONtoBibtex(JSONObject springerJsonEntry) {
             entry.setField(StandardField.DATE, date); // For biblatex
             String[] dateparts = date.split("-");
             entry.setField(StandardField.YEAR, dateparts[0]);
-            Optional<Month> month = Month.getMonthByNumber(Integer.parseInt(dateparts[1]));
+            Optional<Month> month = Month.getMonthByNumber(
+                Integer.parseInt(dateparts[1])
+            );
             month.ifPresent(entry::setMonth);
         }
 
         // 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;
     }
@@ -184,23 +235,44 @@ public String getTestUrl() {
      * @return URL
      */
     @Override
-    public URL getURLForQuery(QueryNode luceneQuery, int pageNumber) throws URISyntaxException, MalformedURLException, FetcherException {
-
+    public URL getURLForQuery(QueryNode luceneQuery, int pageNumber)
+        throws URISyntaxException, MalformedURLException, FetcherException {
         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();
     }
 
-    private String constructComplexQueryString(ComplexSearchQuery complexSearchQuery) {
+    private String constructComplexQueryString(
+        ComplexSearchQuery complexSearchQuery
+    ) {
         List<String> searchTerms = new ArrayList<>();
-        complexSearchQuery.getAuthors().forEach(author -> searchTerms.add("name:" + author));
-        complexSearchQuery.getTitlePhrases().forEach(title -> searchTerms.add("title:" + title));
-        complexSearchQuery.getJournal().ifPresent(journal -> searchTerms.add("journal:" + journal));
+        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
-        complexSearchQuery.getSingleYear().ifPresent(year -> searchTerms.add("date:" + year + "*"));
+        complexSearchQuery
+            .getSingleYear()
+            .ifPresent(year -> searchTerms.add("date:" + year + "*"));
         searchTerms.addAll(complexSearchQuery.getDefaultFieldPhrases());
         return String.join(" AND ", searchTerms);
     }
@@ -208,7 +280,11 @@ 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 57ad994c78d..290ca114aa5 100644
--- a/src/main/java/org/jabref/logic/importer/fetcher/SpringerLink.java
+++ b/src/main/java/org/jabref/logic/importer/fetcher/SpringerLink.java
@@ -4,19 +4,17 @@
 import java.net.URL;
 import java.util.Objects;
 import java.util.Optional;
-
+import kong.unirest.HttpResponse;
+import kong.unirest.JsonNode;
+import kong.unirest.Unirest;
+import kong.unirest.UnirestException;
+import kong.unirest.json.JSONObject;
 import org.jabref.logic.importer.FulltextFetcher;
 import org.jabref.logic.importer.ImporterPreferences;
 import org.jabref.logic.util.BuildInfo;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.field.StandardField;
 import org.jabref.model.entry.identifier.DOI;
-
-import kong.unirest.HttpResponse;
-import kong.unirest.JsonNode;
-import kong.unirest.Unirest;
-import kong.unirest.UnirestException;
-import kong.unirest.json.JSONObject;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -26,11 +24,15 @@
  * Uses Springer API, see <a href="https://dev.springer.com">https://dev.springer.com</a>
  */
 public class SpringerLink implements FulltextFetcher, CustomizableKeyFetcher {
+
     public static final String FETCHER_NAME = "Springer";
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(SpringerLink.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(
+        SpringerLink.class
+    );
 
-    private static final String API_URL = "https://api.springer.com/meta/v1/json";
+    private static final String API_URL =
+        "https://api.springer.com/meta/v1/json";
     private static final String API_KEY = new BuildInfo().springerNatureAPIKey;
     private static final String CONTENT_HOST = "link.springer.com";
 
@@ -45,24 +47,42 @@ public Optional<URL> findFullText(BibEntry entry) throws IOException {
         Objects.requireNonNull(entry);
 
         // Try unique DOI first
-        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();
         }
         // Available in catalog?
         try {
-            HttpResponse<JsonNode> jsonResponse = Unirest.get(API_URL)
-                                                         .queryString("api_key", importerPreferences.getApiKey(getName()).orElse(API_KEY))
-                                                         .queryString("q", String.format("doi:%s", doi.get().getDOI()))
-                                                         .asJson();
+            HttpResponse<JsonNode> jsonResponse = Unirest
+                .get(API_URL)
+                .queryString(
+                    "api_key",
+                    importerPreferences.getApiKey(getName()).orElse(API_KEY)
+                )
+                .queryString("q", String.format("doi:%s", doi.get().getDOI()))
+                .asJson();
             if (jsonResponse.getBody() != null) {
                 JSONObject json = jsonResponse.getBody().getObject();
-                int results = json.getJSONArray("result").getJSONObject(0).getInt("total");
+                int results = json
+                    .getJSONArray("result")
+                    .getJSONObject(0)
+                    .getInt("total");
 
                 if (results > 0) {
                     LOGGER.info("Fulltext PDF found @ Springer.");
-                    return Optional.of(new URL("http", CONTENT_HOST, String.format("/content/pdf/%s.pdf", doi.get().getDOI())));
+                    return Optional.of(
+                        new URL(
+                            "http",
+                            CONTENT_HOST,
+                            String.format(
+                                "/content/pdf/%s.pdf",
+                                doi.get().getDOI()
+                            )
+                        )
+                    );
                 }
             }
         } catch (UnirestException 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 04bde616060..02c9ca94d05 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,6 @@
 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;
@@ -31,7 +30,8 @@ public Optional<HelpFile> getHelpPage() {
     }
 
     @Override
-    public Optional<BibEntry> performSearchById(String identifier) throws FetcherException {
+    public Optional<BibEntry> performSearchById(String identifier)
+        throws FetcherException {
         if (StringUtil.isBlank(identifier)) {
             return Optional.empty();
         }
@@ -39,7 +39,9 @@ public Optional<BibEntry> performSearchById(String identifier) throws FetcherExc
         BibEntry entry = new BibEntry();
         entry.setField(StandardField.TITLE, identifier);
 
-        Optional<DOI> doi = WebFetchers.getIdFetcherForIdentifier(DOI.class).findIdentifier(entry);
+        Optional<DOI> doi = WebFetchers
+            .getIdFetcherForIdentifier(DOI.class)
+            .findIdentifier(entry);
         if (doi.isEmpty()) {
             return Optional.empty();
         }
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 f1b0b5fb32c..598a5335c93 100644
--- a/src/main/java/org/jabref/logic/importer/fetcher/ZbMATH.java
+++ b/src/main/java/org/jabref/logic/importer/fetcher/ZbMATH.java
@@ -6,7 +6,12 @@
 import java.util.Objects;
 import java.util.Optional;
 import java.util.stream.Collectors;
-
+import kong.unirest.HttpResponse;
+import kong.unirest.JsonNode;
+import kong.unirest.Unirest;
+import kong.unirest.json.JSONArray;
+import org.apache.http.client.utils.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.RemoveBracesFormatter;
@@ -24,17 +29,14 @@
 import org.jabref.model.entry.field.StandardField;
 import org.jabref.model.entry.field.UnknownField;
 
-import kong.unirest.HttpResponse;
-import kong.unirest.JsonNode;
-import kong.unirest.Unirest;
-import kong.unirest.json.JSONArray;
-import org.apache.http.client.utils.URIBuilder;
-import org.apache.lucene.queryparser.flexible.core.nodes.QueryNode;
-
 /**
  * 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,31 +50,51 @@ public String getName() {
     }
 
     @Override
-    public URL getURLForEntry(BibEntry entry) throws URISyntaxException, MalformedURLException, FetcherException {
-        Optional<String> zblidInEntry = entry.getField(StandardField.ZBL_NUMBER);
+    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
             return getUrlForIdentifier(zblidInEntry.get());
         }
 
-        URIBuilder uriBuilder = new URIBuilder("https://zbmath.org/citationmatching/match");
+        URIBuilder uriBuilder = new URIBuilder(
+            "https://zbmath.org/citationmatching/match"
+        );
         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.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));
+        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));
 
         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.getLastFirst(false))
-                                                 .collect(Collectors.joining(";"));
+            AuthorList authors = AuthorList.parse(
+                entry.getFieldOrAlias(StandardField.AUTHOR).get()
+            );
+            String authorsWithSemicolon = authors
+                .getAuthors()
+                .stream()
+                .map(author -> author.getLastFirst(false))
+                .collect(Collectors.joining(";"));
             uriBuilder.addParameter("a", authorsWithSemicolon);
         }
 
@@ -82,17 +104,15 @@ 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,17 +124,28 @@ public URL getURLForEntry(BibEntry entry) throws URISyntaxException, MalformedUR
     }
 
     @Override
-    public URL getURLForQuery(QueryNode luceneQuery) throws URISyntaxException, MalformedURLException, FetcherException {
-        URIBuilder uriBuilder = new URIBuilder("https://zbmath.org/bibtexoutput/");
-        uriBuilder.addParameter("q", new ZbMathQueryTransformer().transformLuceneQuery(luceneQuery).orElse("")); // search all fields
+    public URL getURLForQuery(QueryNode luceneQuery)
+        throws URISyntaxException, MalformedURLException, FetcherException {
+        URIBuilder uriBuilder = new URIBuilder(
+            "https://zbmath.org/bibtexoutput/"
+        );
+        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)
         return uriBuilder.build().toURL();
     }
 
     @Override
-    public URL getUrlForIdentifier(String identifier) throws URISyntaxException, MalformedURLException, FetcherException {
-        URIBuilder uriBuilder = new URIBuilder("https://zbmath.org/bibtexoutput/");
+    public URL getUrlForIdentifier(String identifier)
+        throws URISyntaxException, MalformedURLException, FetcherException {
+        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);
         uriBuilder.addParameter("start", "0"); // start index
@@ -129,9 +160,22 @@ public Parser getParser() {
 
     @Override
     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 RemoveBracesFormatter()).cleanup(entry);
-        new FieldFormatterCleanup(StandardField.TITLE, new RemoveBracesFormatter()).cleanup(entry);
+        new MoveFieldCleanup(
+            new UnknownField("msc2010"),
+            StandardField.KEYWORDS
+        )
+            .cleanup(entry);
+        new MoveFieldCleanup(AMSField.FJOURNAL, StandardField.JOURNAL)
+            .cleanup(entry);
+        new FieldFormatterCleanup(
+            StandardField.JOURNAL,
+            new RemoveBracesFormatter()
+        )
+            .cleanup(entry);
+        new FieldFormatterCleanup(
+            StandardField.TITLE,
+            new RemoveBracesFormatter()
+        )
+            .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 ef7454a897a..1ad6e7c9b14 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
@@ -7,7 +7,10 @@
 import java.util.List;
 import java.util.stream.IntStream;
 import java.util.stream.Stream;
-
+import kong.unirest.json.JSONArray;
+import kong.unirest.json.JSONException;
+import kong.unirest.json.JSONObject;
+import org.apache.http.client.utils.URIBuilder;
 import org.jabref.logic.importer.FetcherException;
 import org.jabref.logic.importer.ImportFormatPreferences;
 import org.jabref.logic.importer.ParseException;
@@ -19,18 +22,17 @@
 import org.jabref.model.entry.types.StandardEntryType;
 import org.jabref.model.strings.StringUtil;
 
-import kong.unirest.json.JSONArray;
-import kong.unirest.json.JSONException;
-import kong.unirest.json.JSONObject;
-import org.apache.http.client.utils.URIBuilder;
-
 /**
  * Fetcher for ISBN using <a href="https://doi-to-bibtex-converter.herokuapp.com">doi-to-bibtex-converter.herokuapp</a>.
  */
 public class DoiToBibtexConverterComIsbnFetcher extends AbstractIsbnFetcher {
-    private static final String BASE_URL = "https://doi-to-bibtex-converter.herokuapp.com";
 
-    public DoiToBibtexConverterComIsbnFetcher(ImportFormatPreferences importFormatPreferences) {
+    private static final String BASE_URL =
+        "https://doi-to-bibtex-converter.herokuapp.com";
+
+    public DoiToBibtexConverterComIsbnFetcher(
+        ImportFormatPreferences importFormatPreferences
+    ) {
         super(importFormatPreferences);
     }
 
@@ -40,14 +42,15 @@ public String getName() {
     }
 
     @Override
-    public URL getUrlForIdentifier(String identifier) throws URISyntaxException, MalformedURLException, FetcherException {
+    public URL getUrlForIdentifier(String identifier)
+        throws URISyntaxException, MalformedURLException, FetcherException {
         this.ensureThatIsbnIsValid(identifier);
         return new URIBuilder(BASE_URL)
-                .setPathSegments("getInfo.php")
-                .setParameter("query", identifier)
-                .setParameter("format", "json")
-                .build()
-                .toURL();
+            .setPathSegments("getInfo.php")
+            .setParameter("query", identifier)
+            .setParameter("format", "json")
+            .build()
+            .toURL();
     }
 
     @Override
@@ -69,8 +72,7 @@ public Parser getParser() {
     }
 
     @Override
-    public void doPostCleanup(BibEntry entry) {
-    }
+    public void doPostCleanup(BibEntry entry) {}
 
     private BibEntry jsonItemToBibEntry(JSONObject item) throws ParseException {
         try {
@@ -78,31 +80,60 @@ private BibEntry jsonItemToBibEntry(JSONObject item) throws ParseException {
             var type = getElementFromJSONArrayByKey(data, "type");
 
             BibEntry entry = new BibEntry(evaluateBibEntryTypeFromString(type));
-            entry.setField(StandardField.AUTHOR, getElementFromJSONArrayByKey(data, "author"));
-            entry.setField(StandardField.PAGES, getElementFromJSONArrayByKey(data, "pagecount"));
-            entry.setField(StandardField.ISBN, getElementFromJSONArrayByKey(data, "isbn"));
-            entry.setField(StandardField.TITLE, getElementFromJSONArrayByKey(data, "title"));
-            entry.setField(StandardField.YEAR, getElementFromJSONArrayByKey(data, "year"));
-            entry.setField(StandardField.MONTH, getElementFromJSONArrayByKey(data, "month"));
-            entry.setField(StandardField.DAY, getElementFromJSONArrayByKey(data, "day"));
+            entry.setField(
+                StandardField.AUTHOR,
+                getElementFromJSONArrayByKey(data, "author")
+            );
+            entry.setField(
+                StandardField.PAGES,
+                getElementFromJSONArrayByKey(data, "pagecount")
+            );
+            entry.setField(
+                StandardField.ISBN,
+                getElementFromJSONArrayByKey(data, "isbn")
+            );
+            entry.setField(
+                StandardField.TITLE,
+                getElementFromJSONArrayByKey(data, "title")
+            );
+            entry.setField(
+                StandardField.YEAR,
+                getElementFromJSONArrayByKey(data, "year")
+            );
+            entry.setField(
+                StandardField.MONTH,
+                getElementFromJSONArrayByKey(data, "month")
+            );
+            entry.setField(
+                StandardField.DAY,
+                getElementFromJSONArrayByKey(data, "day")
+            );
             return entry;
         } catch (JSONException exception) {
-            throw new ParseException("CrossRef API JSON format has changed", exception);
+            throw new ParseException(
+                "CrossRef API JSON format has changed",
+                exception
+            );
         }
     }
 
-    private String getElementFromJSONArrayByKey(JSONArray jsonArray, String key) {
-        return IntStream.range(0, jsonArray.length())
-                        .mapToObj(jsonArray::getJSONObject)
-                        .map(obj -> obj.getString(key))
-                        .findFirst()
-                        .orElse("");
+    private String getElementFromJSONArrayByKey(
+        JSONArray jsonArray,
+        String key
+    ) {
+        return IntStream
+            .range(0, jsonArray.length())
+            .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);
+        return Stream
+            .of(StandardEntryType.values())
+            .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 9abc3314aa8..7a277df678c 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
@@ -3,7 +3,7 @@
 import java.net.MalformedURLException;
 import java.net.URISyntaxException;
 import java.net.URL;
-
+import org.apache.http.client.utils.URIBuilder;
 import org.jabref.logic.cleanup.FieldFormatterCleanup;
 import org.jabref.logic.formatter.bibtexfields.NormalizeNamesFormatter;
 import org.jabref.logic.formatter.bibtexfields.NormalizePagesFormatter;
@@ -13,13 +13,13 @@
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.field.StandardField;
 
-import org.apache.http.client.utils.URIBuilder;
-
 /**
  * Fetcher for ISBN using <a href="https://www.ebook.de">https://www.ebook.de</a>.
  */
 public class EbookDeIsbnFetcher extends AbstractIsbnFetcher {
-    private static final String BASE_URL = "https://www.ebook.de/de/tools/isbn2bibtex";
+
+    private static final String BASE_URL =
+        "https://www.ebook.de/de/tools/isbn2bibtex";
 
     public EbookDeIsbnFetcher(ImportFormatPreferences importFormatPreferences) {
         super(importFormatPreferences);
@@ -31,12 +31,13 @@ public String getName() {
     }
 
     @Override
-    public URL getUrlForIdentifier(String identifier) throws URISyntaxException, MalformedURLException, FetcherException {
+    public URL getUrlForIdentifier(String identifier)
+        throws URISyntaxException, MalformedURLException, FetcherException {
         this.ensureThatIsbnIsValid(identifier);
         return new URIBuilder(BASE_URL)
-                .addParameter("isbn", identifier)
-                .build()
-                .toURL();
+            .addParameter("isbn", identifier)
+            .build()
+            .toURL();
     }
 
     @Override
@@ -46,9 +47,23 @@ public void doPostCleanup(BibEntry entry) {
         // 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);
+        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 c449320075d..e043de9a009 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
@@ -7,7 +7,6 @@
 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,7 +18,6 @@
 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;
 
@@ -31,15 +29,20 @@
  */
 public class IsbnFetcher implements EntryBasedFetcher, IdBasedFetcher {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(IsbnFetcher.class);
-    private static final Pattern NEWLINE_SPACE_PATTERN = Pattern.compile("\\n|\\r\\n|\\s");
+    private static final Logger LOGGER = LoggerFactory.getLogger(
+        IsbnFetcher.class
+    );
+    private static final Pattern NEWLINE_SPACE_PATTERN = Pattern.compile(
+        "\\n|\\r\\n|\\s"
+    );
     protected final ImportFormatPreferences importFormatPreferences;
     private final List<AbstractIsbnFetcher> retryIsbnFetcher;
     private final GvkFetcher gvkIbsnFetcher;
 
     public IsbnFetcher(ImportFormatPreferences importFormatPreferences) {
         this.importFormatPreferences = importFormatPreferences;
-        OpenLibraryIsbnFetcher openLibraryIsbnFetcher = new OpenLibraryIsbnFetcher(importFormatPreferences);
+        OpenLibraryIsbnFetcher openLibraryIsbnFetcher =
+            new OpenLibraryIsbnFetcher(importFormatPreferences);
         this.gvkIbsnFetcher = new GvkFetcher(importFormatPreferences);
         this.retryIsbnFetcher = new ArrayList<>();
         this.addRetryFetcher(openLibraryIsbnFetcher);
@@ -56,14 +59,18 @@ public Optional<HelpFile> getHelpPage() {
     }
 
     @Override
-    public Optional<BibEntry> performSearchById(String identifier) throws FetcherException {
+    public Optional<BibEntry> performSearchById(String identifier)
+        throws FetcherException {
         Optional<BibEntry> bibEntry = Optional.empty();
 
         try {
             identifier = removeNewlinesAndSpacesFromIdentifier(identifier);
             Optional<ISBN> isbn = ISBN.parse(identifier);
             if (isbn.isPresent()) {
-                bibEntry = gvkIbsnFetcher.performSearchById(isbn.get().getNormalized());
+                bibEntry =
+                    gvkIbsnFetcher.performSearchById(
+                        isbn.get().getNormalized()
+                    );
             }
         } catch (FetcherException ex) {
             LOGGER.debug("Got a fetcher exception for IBSN search", ex);
@@ -72,12 +79,19 @@ public Optional<BibEntry> performSearchById(String identifier) throws FetcherExc
             }
         } finally {
             // 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();
+            Iterator<AbstractIsbnFetcher> iterator =
+                retryIsbnFetcher.iterator();
             while (bibEntry.isEmpty() && iterator.hasNext()) {
-                LOGGER.debug("Trying using the alternate ISBN fetchers to find an entry.");
+                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);
             }
         }
@@ -90,7 +104,8 @@ public Optional<BibEntry> performSearchById(String identifier) throws FetcherExc
     }
 
     @Override
-    public List<BibEntry> performSearch(BibEntry entry) throws FetcherException {
+    public List<BibEntry> performSearch(BibEntry entry)
+        throws FetcherException {
         Optional<String> isbn = entry.getField(StandardField.ISBN);
         if (isbn.isPresent()) {
             return OptionalUtil.toList(performSearchById(isbn.get()));
@@ -100,7 +115,10 @@ public List<BibEntry> performSearch(BibEntry entry) throws FetcherException {
     }
 
     public IsbnFetcher addRetryFetcher(AbstractIsbnFetcher retryFetcher) {
-        Objects.requireNonNull(retryFetcher, "Please provide a valid isbn fetcher.");
+        Objects.requireNonNull(
+            retryFetcher,
+            "Please provide a valid isbn fetcher."
+        );
         retryIsbnFetcher.add(retryFetcher);
         return this;
     }
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 192cc979d71..ab2716ccc2f 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
@@ -9,7 +9,12 @@
 import java.util.stream.Collectors;
 import java.util.stream.IntStream;
 import java.util.stream.Stream;
-
+import kong.unirest.JsonNode;
+import kong.unirest.Unirest;
+import kong.unirest.json.JSONArray;
+import kong.unirest.json.JSONException;
+import kong.unirest.json.JSONObject;
+import org.apache.http.client.utils.URIBuilder;
 import org.jabref.logic.importer.AuthorListParser;
 import org.jabref.logic.importer.FetcherException;
 import org.jabref.logic.importer.ImportFormatPreferences;
@@ -24,13 +29,6 @@
 import org.jabref.model.entry.field.StandardField;
 import org.jabref.model.entry.types.StandardEntryType;
 import org.jabref.model.strings.StringUtil;
-
-import kong.unirest.JsonNode;
-import kong.unirest.Unirest;
-import kong.unirest.json.JSONArray;
-import kong.unirest.json.JSONException;
-import kong.unirest.json.JSONObject;
-import org.apache.http.client.utils.URIBuilder;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -40,10 +38,14 @@
  */
 public class OpenLibraryIsbnFetcher extends AbstractIsbnFetcher {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(OpenLibraryIsbnFetcher.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(
+        OpenLibraryIsbnFetcher.class
+    );
     private static final String BASE_URL = "https://openlibrary.org";
 
-    public OpenLibraryIsbnFetcher(ImportFormatPreferences importFormatPreferences) {
+    public OpenLibraryIsbnFetcher(
+        ImportFormatPreferences importFormatPreferences
+    ) {
         super(importFormatPreferences);
     }
 
@@ -53,12 +55,13 @@ public String getName() {
     }
 
     @Override
-    public URL getUrlForIdentifier(String identifier) throws URISyntaxException, MalformedURLException, FetcherException {
+    public URL getUrlForIdentifier(String identifier)
+        throws URISyntaxException, MalformedURLException, FetcherException {
         this.ensureThatIsbnIsValid(identifier);
         return new URIBuilder(BASE_URL)
-                .setPathSegments("isbn", identifier + ".json")
-                .build()
-                .toURL();
+            .setPathSegments("isbn", identifier + ".json")
+            .build()
+            .toURL();
     }
 
     @Override
@@ -80,8 +83,7 @@ public Parser getParser() {
     }
 
     @Override
-    public void doPostCleanup(BibEntry entry) {
-    }
+    public void doPostCleanup(BibEntry entry) {}
 
     private BibEntry jsonItemToBibEntry(JSONObject item) throws ParseException {
         try {
@@ -92,25 +94,49 @@ private BibEntry jsonItemToBibEntry(JSONObject item) throws ParseException {
                 authors = fromWorksToAuthors(works);
             }
             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)))
-                            .orElse(""));
-            entry.setField(StandardField.TITLE,
-                    Optional.ofNullable(item.optString("full_title", null))
-                            .or(() -> Optional.ofNullable(item.optString("title", null)))
-                            .orElse(""));
+            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))
+                    )
+                    .orElse("")
+            );
+            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))
-                            .orElse(""));
+            entry.setField(
+                StandardField.PUBLISHER,
+                Optional
+                    .ofNullable(item.optJSONArray("publishers"))
+                    .map(array -> array.getString(0))
+                    .orElse("")
+            );
             return entry;
         } catch (JSONException exception) {
-            throw new ParseException("CrossRef API JSON format has changed", exception);
+            throw new ParseException(
+                "CrossRef API JSON format has changed",
+                exception
+            );
         }
     }
 
@@ -118,21 +144,27 @@ private String toAuthors(JSONArray authors) {
         if (authors == null) {
             return "";
         }
-        return IntStream.range(0, authors.length())
-                        .mapToObj(authors::getJSONObject)
-                        .map(authorObject -> toAuthor(authorObject.getString("key")))
-                        .collect(AuthorList.collect())
-                        .getAsLastFirstNamesWithAnd(false);
+        return IntStream
+            .range(0, authors.length())
+            .mapToObj(authors::getJSONObject)
+            .map(authorObject -> toAuthor(authorObject.getString("key")))
+            .collect(AuthorList.collect())
+            .getAsLastFirstNamesWithAnd(false);
     }
 
     private Author toAuthor(String key) {
-        JsonNode authorResponse = Unirest.get(BASE_URL + key + ".json").asJson().getBody();
+        JsonNode authorResponse = Unirest
+            .get(BASE_URL + key + ".json")
+            .asJson()
+            .getBody();
         if (authorResponse == null) {
             LOGGER.warn("Could not parse author");
             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);
@@ -147,12 +179,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,8 +196,11 @@ private Stream<Author> fromWorkToAuthors(String link) {
             return Stream.empty();
         }
 
-        return IntStream.range(0, authors.length())
-                        .mapToObj(authors::getJSONObject)
-                        .map(authorObject -> toAuthor(authorObject.getJSONObject("author").getString("key")));
+        return IntStream
+            .range(0, authors.length())
+            .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 0dad489964e..79d090b740f 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
@@ -3,15 +3,13 @@
 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;
 
@@ -20,8 +18,11 @@
  * Otherwise, a single instance QueryTransformer can be used.
  */
 public abstract class AbstractQueryTransformer {
+
     public static final String NO_EXPLICIT_FIELD = "default";
-    private static final Logger LOGGER = LoggerFactory.getLogger(AbstractQueryTransformer.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(
+        AbstractQueryTransformer.class
+    );
 
     // These can be used for filtering in post processing
     protected int startYear = Integer.MAX_VALUE;
@@ -40,10 +41,12 @@ private 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();
         }
@@ -117,7 +120,8 @@ protected String handleDoi(String term) {
     private Optional<String> transform(ModifierQueryNode query) {
         ModifierQueryNode.Modifier modifier = query.getModifier();
         if (modifier == ModifierQueryNode.Modifier.MOD_NOT) {
-            return transform(query.getChild()).map(s -> getLogicalNotOperator() + s);
+            return transform(query.getChild())
+                .map(s -> getLogicalNotOperator() + s);
         } else {
             return transform(query.getChild());
         }
@@ -194,15 +198,27 @@ protected String createKeyValuePair(String fieldAsString, String term) {
         return createKeyValuePair(fieldAsString, term, ":");
     }
 
-    protected String createKeyValuePair(String fieldAsString, String term, String separator) {
-        return String.format("%s%s%s", fieldAsString, separator, StringUtil.quoteStringIfSpaceIsContained(term));
+    protected String createKeyValuePair(
+        String fieldAsString,
+        String term,
+        String separator
+    ) {
+        return String.format(
+            "%s%s%s",
+            fieldAsString,
+            separator,
+            StringUtil.quoteStringIfSpaceIsContained(term)
+        );
     }
 
     /**
      * Return a string representation of the provided field
      * If it is not supported return an empty optional.
      */
-    protected Optional<String> handleOtherField(String fieldAsString, String term) {
+    protected Optional<String> handleOtherField(
+        String fieldAsString,
+        String term
+    ) {
         return Optional.of(createKeyValuePair(fieldAsString, term));
     }
 
@@ -216,7 +232,10 @@ private Optional<String> transform(QueryNode query) {
         } else if (query instanceof ModifierQueryNode) {
             return transform((ModifierQueryNode) query);
         } else {
-            LOGGER.error("Unsupported case when transforming the query:\n {}", query);
+            LOGGER.error(
+                "Unsupported case when transforming the query:\n {}",
+                query
+            );
             return Optional.empty();
         }
     }
diff --git a/src/main/java/org/jabref/logic/importer/fetcher/transformers/ArXivQueryTransformer.java b/src/main/java/org/jabref/logic/importer/fetcher/transformers/ArXivQueryTransformer.java
index d37c555f833..21bcb4eca61 100644
--- a/src/main/java/org/jabref/logic/importer/fetcher/transformers/ArXivQueryTransformer.java
+++ b/src/main/java/org/jabref/logic/importer/fetcher/transformers/ArXivQueryTransformer.java
@@ -2,7 +2,9 @@
 
 import java.util.Optional;
 
-public class ArXivQueryTransformer extends YearRangeByFilteringQueryTransformer {
+public class ArXivQueryTransformer
+    extends YearRangeByFilteringQueryTransformer {
+
     @Override
     protected String getLogicalAndOperator() {
         return " AND ";
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 626bb0240f3..0d8754e97e1 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
@@ -2,11 +2,9 @@
 
 import java.util.Calendar;
 import java.util.Optional;
-
-import org.jabref.model.strings.StringUtil;
-
 import kong.unirest.json.JSONArray;
 import kong.unirest.json.JSONObject;
+import org.jabref.model.strings.StringUtil;
 
 public class CiteSeerQueryTransformer extends AbstractQueryTransformer {
 
@@ -67,15 +65,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;
     }
 
     /**
@@ -83,7 +81,10 @@ protected String handleYearRange(String yearRange) {
      * except "must_have_pdf" as FullTextFetcher is not yet implemented for CiteSeer
      */
     @Override
-    protected Optional<String> handleOtherField(String fieldAsString, String term) {
+    protected Optional<String> handleOtherField(
+        String fieldAsString,
+        String term
+    ) {
         return switch (fieldAsString) {
             case "page" -> handlePage(term);
             case "pageSize" -> handlePageSize(term);
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 e58f2a01254..9baee11b1b3 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 0c7878c5935..32ae19dfa69 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,15 +1,18 @@
 package org.jabref.logic.importer.fetcher.transformers;
 
 import org.jabref.model.strings.StringUtil;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 /**
  * DBLP does not support explicit year field search, thus we extend YearAndYearRangeByFilteringQueryTransformer
  */
-public class DBLPQueryTransformer extends YearAndYearRangeByFilteringQueryTransformer {
-    private static final Logger LOGGER = LoggerFactory.getLogger(DBLPQueryTransformer.class);
+public class DBLPQueryTransformer
+    extends YearAndYearRangeByFilteringQueryTransformer {
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(
+        DBLPQueryTransformer.class
+    );
 
     @Override
     protected String getLogicalAndOperator() {
diff --git a/src/main/java/org/jabref/logic/importer/fetcher/transformers/DefaultQueryTransformer.java b/src/main/java/org/jabref/logic/importer/fetcher/transformers/DefaultQueryTransformer.java
index 40f2064e62d..8dc4d6c5cb0 100644
--- a/src/main/java/org/jabref/logic/importer/fetcher/transformers/DefaultQueryTransformer.java
+++ b/src/main/java/org/jabref/logic/importer/fetcher/transformers/DefaultQueryTransformer.java
@@ -5,7 +5,8 @@
 /**
  * Default query transformer without any boolean operators
  */
-public class DefaultQueryTransformer extends YearAndYearRangeByFilteringQueryTransformer {
+public class DefaultQueryTransformer
+    extends YearAndYearRangeByFilteringQueryTransformer {
 
     @Override
     protected String getLogicalAndOperator() {
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 7b649a89078..955b1222bdf 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,12 +1,14 @@
 package org.jabref.logic.importer.fetcher.transformers;
 
 import java.util.Optional;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 public class GVKQueryTransformer extends YearRangeByFilteringQueryTransformer {
-    private static final Logger LOGGER = LoggerFactory.getLogger(GVKQueryTransformer.class);
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(
+        GVKQueryTransformer.class
+    );
 
     @Override
     protected String getLogicalAndOperator() {
@@ -55,7 +57,12 @@ protected Optional<String> handleUnFieldedTerm(String term) {
     }
 
     @Override
-    protected Optional<String> handleOtherField(String fieldAsString, String term) {
-        return Optional.of(createKeyValuePair("pica." + fieldAsString, term, "="));
+    protected Optional<String> handleOtherField(
+        String fieldAsString,
+        String term
+    ) {
+        return Optional.of(
+            createKeyValuePair("pica." + fieldAsString, term, "=")
+        );
     }
 }
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 a5015a82fab..0dcf97844ff 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
@@ -3,18 +3,24 @@
 import java.util.List;
 import java.util.Objects;
 import java.util.Optional;
-
 import org.jabref.model.strings.StringUtil;
 
 /**
  * Needs to be instantiated for each new query
  */
 public class IEEEQueryTransformer extends YearRangeByFilteringQueryTransformer {
+
     /**
      * Returns words ignored by the engine. Need to be removed when querying for them.
      * See ADR-0022
      */
-    private static final List<String> STOP_WORDS = List.of("a", "and", "for", "or", "with");
+    private static final List<String> STOP_WORDS = List.of(
+        "a",
+        "and",
+        "for",
+        "or",
+        "with"
+    );
 
     // 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
@@ -60,7 +66,10 @@ protected String handleYear(String year) {
     }
 
     @Override
-    protected Optional<String> handleOtherField(String fieldAsString, String term) {
+    protected Optional<String> handleOtherField(
+        String fieldAsString,
+        String term
+    ) {
         return switch (fieldAsString) {
             case "article_number" -> handleArticleNumber(term);
             default -> super.handleOtherField(fieldAsString, term);
@@ -81,10 +90,14 @@ private Optional<String> handleArticleNumber(String term) {
     }
 
     public Optional<String> getJournal() {
-        return Objects.isNull(journal) ? Optional.empty() : Optional.of(journal);
+        return Objects.isNull(journal)
+            ? Optional.empty()
+            : Optional.of(journal);
     }
 
     public Optional<String> getArticleNumber() {
-        return Objects.isNull(articleNumber) ? Optional.empty() : Optional.of(articleNumber);
+        return Objects.isNull(articleNumber)
+            ? Optional.empty()
+            : Optional.of(articleNumber);
     }
 }
diff --git a/src/main/java/org/jabref/logic/importer/fetcher/transformers/JstorQueryTransformer.java b/src/main/java/org/jabref/logic/importer/fetcher/transformers/JstorQueryTransformer.java
index 05c4b9b6ff1..6c5ef4edfe5 100644
--- a/src/main/java/org/jabref/logic/importer/fetcher/transformers/JstorQueryTransformer.java
+++ b/src/main/java/org/jabref/logic/importer/fetcher/transformers/JstorQueryTransformer.java
@@ -1,6 +1,7 @@
 package org.jabref.logic.importer.fetcher.transformers;
 
 public class JstorQueryTransformer extends AbstractQueryTransformer {
+
     @Override
     protected String getLogicalAndOperator() {
         return " AND ";
@@ -42,6 +43,12 @@ protected String handleYearRange(String yearRange) {
         if (endYear == Integer.MAX_VALUE) {
             return yearRange;
         }
-        return "sd:" + Integer.toString(startYear) + getLogicalAndOperator() + "ed:" + Integer.toString(endYear);
+        return (
+            "sd:" +
+            Integer.toString(startYear) +
+            getLogicalAndOperator() +
+            "ed:" +
+            Integer.toString(endYear)
+        );
     }
 }
diff --git a/src/main/java/org/jabref/logic/importer/fetcher/transformers/MedlineQueryTransformer.java b/src/main/java/org/jabref/logic/importer/fetcher/transformers/MedlineQueryTransformer.java
index 155b08b89d2..8c5513621c8 100644
--- a/src/main/java/org/jabref/logic/importer/fetcher/transformers/MedlineQueryTransformer.java
+++ b/src/main/java/org/jabref/logic/importer/fetcher/transformers/MedlineQueryTransformer.java
@@ -49,6 +49,11 @@ protected String handleYearRange(String yearRange) {
         if (endYear == Integer.MAX_VALUE) {
             return yearRange;
         }
-        return Integer.toString(startYear) + ":" + Integer.toString(endYear) + "[dp]";
+        return (
+            Integer.toString(startYear) +
+            ":" +
+            Integer.toString(endYear) +
+            "[dp]"
+        );
     }
 }
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 18f84521901..01788233ac8 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 a1556d5cbac..4627292d116 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,6 +1,8 @@
 package org.jabref.logic.importer.fetcher.transformers;
 
-public class ScholarQueryTransformer extends YearAndYearRangeByFilteringQueryTransformer {
+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
     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 fe348bf3acd..3797a1ea0cc 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/fetcher/transformers/YearRangeByFilteringQueryTransformer.java b/src/main/java/org/jabref/logic/importer/fetcher/transformers/YearRangeByFilteringQueryTransformer.java
index 40480dc4d13..14237f3496a 100644
--- a/src/main/java/org/jabref/logic/importer/fetcher/transformers/YearRangeByFilteringQueryTransformer.java
+++ b/src/main/java/org/jabref/logic/importer/fetcher/transformers/YearRangeByFilteringQueryTransformer.java
@@ -6,14 +6,19 @@
  * This is a query transformer for a fetcher, which does not support server-side filtering by year-range (e.g., only publications between 1999 and 2002).
  * Thus, JabRef (as client) filters for year ranges on client-side.
  */
-public abstract class YearRangeByFilteringQueryTransformer extends AbstractQueryTransformer {
+public abstract class YearRangeByFilteringQueryTransformer
+    extends AbstractQueryTransformer {
 
     public Optional<Integer> getStartYear() {
-        return startYear == Integer.MAX_VALUE ? Optional.empty() : Optional.of(startYear);
+        return startYear == Integer.MAX_VALUE
+            ? Optional.empty()
+            : Optional.of(startYear);
     }
 
     public Optional<Integer> getEndYear() {
-        return endYear == Integer.MIN_VALUE ? Optional.empty() : Optional.of(endYear);
+        return endYear == Integer.MIN_VALUE
+            ? Optional.empty()
+            : Optional.of(endYear);
     }
 
     /**
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 f0956cb5450..bf2498ddf3c 100644
--- a/src/main/java/org/jabref/logic/importer/fileformat/ACMPortalParser.java
+++ b/src/main/java/org/jabref/logic/importer/fileformat/ACMPortalParser.java
@@ -1,5 +1,11 @@
 package org.jabref.logic.importer.fileformat;
 
+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 java.io.IOException;
 import java.io.InputStream;
 import java.net.CookieHandler;
@@ -13,7 +19,7 @@
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
-
+import org.apache.http.client.utils.URIBuilder;
 import org.jabref.logic.importer.FetcherException;
 import org.jabref.logic.importer.ParseException;
 import org.jabref.logic.importer.Parser;
@@ -23,14 +29,6 @@
 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.http.client.utils.URIBuilder;
 import org.jsoup.Jsoup;
 import org.jsoup.nodes.Document;
 import org.jsoup.nodes.Element;
@@ -39,7 +37,8 @@
 public class ACMPortalParser implements Parser {
 
     private static final String HOST = "https://dl.acm.org";
-    private static final String DOI_URL = "https://dl.acm.org/action/exportCiteProcCitation";
+    private static final String DOI_URL =
+        "https://dl.acm.org/action/exportCiteProcCitation";
 
     /**
      * Parse the DOI of the ACM Portal search result page and obtain the corresponding BibEntry
@@ -48,10 +47,12 @@ public class ACMPortalParser implements Parser {
      * @return BibEntry List
      */
     @Override
-    public List<BibEntry> parseEntries(InputStream stream) throws ParseException {
+    public List<BibEntry> parseEntries(InputStream stream)
+        throws ParseException {
         List<BibEntry> bibEntries;
         try {
-            bibEntries = getBibEntriesFromDoiList(this.parseDoiSearchPage(stream));
+            bibEntries =
+                getBibEntriesFromDoiList(this.parseDoiSearchPage(stream));
         } catch (FetcherException e) {
             throw new ParseException(e);
         }
@@ -64,12 +65,15 @@ public List<BibEntry> parseEntries(InputStream stream) throws ParseException {
      * @param stream html stream
      * @return DOI list
      */
-    public List<String> parseDoiSearchPage(InputStream stream) throws ParseException {
+    public List<String> parseDoiSearchPage(InputStream stream)
+        throws ParseException {
         List<String> doiList = new ArrayList<>();
 
         try {
             Document doc = Jsoup.parse(stream, null, HOST);
-            Elements doiHrefs = doc.select("div.issue-item__content-right > h5 > span > a");
+            Elements doiHrefs = doc.select(
+                "div.issue-item__content-right > h5 > span > a"
+            );
 
             for (Element elem : doiHrefs) {
                 String fullSegment = elem.attr("href");
@@ -89,23 +93,39 @@ public List<String> parseDoiSearchPage(InputStream stream) throws ParseException
      * @param doiList DOI List
      * @return BibEntry List
      */
-    public List<BibEntry> getBibEntriesFromDoiList(List<String> doiList) throws FetcherException {
+    public List<BibEntry> getBibEntriesFromDoiList(List<String> doiList)
+        throws FetcherException {
         List<BibEntry> bibEntries = new ArrayList<>();
         CookieHandler.setDefault(new CookieManager());
-        try (InputStream stream = new URLDownload(getUrlFromDoiList(doiList)).asInputStream()) {
-            String jsonString = new String((stream.readAllBytes()), StandardCharsets.UTF_8);
+        try (
+            InputStream stream = new URLDownload(getUrlFromDoiList(doiList))
+                .asInputStream()
+        ) {
+            String jsonString = new String(
+                (stream.readAllBytes()),
+                StandardCharsets.UTF_8
+            );
 
             JsonElement jsonElement = JsonParser.parseString(jsonString);
             if (jsonElement.isJsonObject()) {
-                JsonArray items = jsonElement.getAsJsonObject().getAsJsonArray("items");
+                JsonArray items = jsonElement
+                    .getAsJsonObject()
+                    .getAsJsonArray("items");
                 for (JsonElement item : items) {
-                    for (Map.Entry<String, JsonElement> entry : item.getAsJsonObject().entrySet()) {
-                        bibEntries.add(parseBibEntry(entry.getValue().toString()));
+                    for (Map.Entry<String, JsonElement> entry : item
+                        .getAsJsonObject()
+                        .entrySet()) {
+                        bibEntries.add(
+                            parseBibEntry(entry.getValue().toString())
+                        );
                     }
                 }
             }
         } catch (IOException | URISyntaxException e) {
-            throw new FetcherException("A network error occurred while fetching from ", e);
+            throw new FetcherException(
+                "A network error occurred while fetching from ",
+                e
+            );
         }
 
         return bibEntries;
@@ -117,7 +137,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 +151,17 @@ 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;
     }
@@ -143,80 +173,140 @@ private StandardEntryType typeStrToEnum(String typeStr) {
      * @return BibEntry parsed from query result
      */
     public BibEntry parseBibEntry(String jsonStr) {
-        JsonObject jsonObject = JsonParser.parseString(jsonStr).getAsJsonObject();
+        JsonObject jsonObject = JsonParser
+            .parseString(jsonStr)
+            .getAsJsonObject();
         BibEntry bibEntry = new BibEntry();
         if (jsonObject.has("type")) {
-            bibEntry.setType(typeStrToEnum(jsonObject.get("type").getAsString()));
+            bibEntry.setType(
+                typeStrToEnum(jsonObject.get("type").getAsString())
+            );
         }
 
         if (jsonObject.has("author")) {
             JsonArray authors = jsonObject.getAsJsonArray("author");
-            bibEntry.setField(StandardField.AUTHOR, getAuthorsLastFirst(authors));
+            bibEntry.setField(
+                StandardField.AUTHOR,
+                getAuthorsLastFirst(authors)
+            );
         }
 
         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());
+                    bibEntry.setField(
+                        dateField[i],
+                        dateArray.get(i).getAsString()
+                    );
                 }
             }
         }
 
         if (jsonObject.has("abstract")) {
-            bibEntry.setField(StandardField.ABSTRACT, jsonObject.get("abstract").getAsString());
+            bibEntry.setField(
+                StandardField.ABSTRACT,
+                jsonObject.get("abstract").getAsString()
+            );
         }
 
         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")) {
-            bibEntry.setField(StandardField.DOI, jsonObject.get("DOI").getAsString());
+            bibEntry.setField(
+                StandardField.DOI,
+                jsonObject.get("DOI").getAsString()
+            );
         }
 
         if (jsonObject.has("event-place")) {
-            bibEntry.setField(StandardField.LOCATION, jsonObject.get("event-place").getAsString());
+            bibEntry.setField(
+                StandardField.LOCATION,
+                jsonObject.get("event-place").getAsString()
+            );
         }
 
         if (jsonObject.has("ISBN")) {
-            bibEntry.setField(StandardField.ISBN, jsonObject.get("ISBN").getAsString());
+            bibEntry.setField(
+                StandardField.ISBN,
+                jsonObject.get("ISBN").getAsString()
+            );
         }
 
         if (jsonObject.has("keyword")) {
-            String[] keywords = jsonObject.get("keyword").getAsString().split(", ");
-            String sortedKeywords = Arrays.stream(keywords).sorted().collect(Collectors.joining(", "));
+            String[] keywords = jsonObject
+                .get("keyword")
+                .getAsString()
+                .split(", ");
+            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")) {
-            bibEntry.setField(StandardField.PAGES, jsonObject.get("page").getAsString());
+            bibEntry.setField(
+                StandardField.PAGES,
+                jsonObject.get("page").getAsString()
+            );
         }
 
         if (jsonObject.has("publisher")) {
-            bibEntry.setField(StandardField.PUBLISHER, jsonObject.get("publisher").getAsString());
+            bibEntry.setField(
+                StandardField.PUBLISHER,
+                jsonObject.get("publisher").getAsString()
+            );
         }
 
         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")) {
-            bibEntry.setField(StandardField.TITLE, jsonObject.get("title").getAsString());
+            bibEntry.setField(
+                StandardField.TITLE,
+                jsonObject.get("title").getAsString()
+            );
         }
 
         if (jsonObject.has("URL")) {
-            bibEntry.setField(StandardField.URL, jsonObject.get("URL").getAsString());
+            bibEntry.setField(
+                StandardField.URL,
+                jsonObject.get("URL").getAsString()
+            );
         }
 
         return bibEntry;
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 482e184a40f..43fcf4872c1 100644
--- a/src/main/java/org/jabref/logic/importer/fileformat/BiblioscapeImporter.java
+++ b/src/main/java/org/jabref/logic/importer/fileformat/BiblioscapeImporter.java
@@ -8,7 +8,6 @@
 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.util.StandardFileType;
@@ -38,8 +37,10 @@ public StandardFileType getFileType() {
 
     @Override
     public String getDescription() {
-        return "Imports a Biblioscape Tag File.\n" +
-                "Several Biblioscape field types are ignored. Others are only included in the BibTeX field \"comment\".";
+        return (
+            "Imports a Biblioscape Tag File.\n" +
+            "Several Biblioscape field types are ignored. Others are only included in the BibTeX field \"comment\"."
+        );
     }
 
     @Override
@@ -49,7 +50,8 @@ public boolean isRecognizedFormat(BufferedReader reader) {
     }
 
     @Override
-    public ParserResult importDatabase(BufferedReader reader) throws IOException {
+    public ParserResult importDatabase(BufferedReader reader)
+        throws IOException {
         List<BibEntry> bibItems = new ArrayList<>();
         String line;
         Map<Field, String> hm = new HashMap<>();
@@ -70,116 +72,121 @@ public ParserResult importDatabase(BufferedReader reader) throws IOException {
                 String titleTI = null;
                 List<String> comments = new ArrayList<>();
                 // add item
-                for (Map.Entry<String, StringBuilder> entry : lines.entrySet()) {
+                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();
-                    } else if ("UR".equals(entry.getKey()) || "AT".equals(entry.getKey())) {
+                        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"))
@@ -189,7 +196,11 @@ public ParserResult importDatabase(BufferedReader reader) throws IOException {
 
                 EntryType bibtexType = BibEntry.DEFAULT_TYPE;
                 // to find type, first check TW, then RT
-                for (int i = 1; (i >= 0) && BibEntry.DEFAULT_TYPE.equals(bibtexType); --i) {
+                for (
+                    int i = 1;
+                    (i >= 0) && BibEntry.DEFAULT_TYPE.equals(bibtexType);
+                    --i
+                ) {
                     if (type[i] == null) {
                         continue;
                     }
@@ -208,8 +219,9 @@ 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 +255,19 @@ 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,8 +284,11 @@ public ParserResult importDatabase(BufferedReader reader) throws IOException {
                 continue;
             }
             // new key
-            if (line.startsWith("--") && (line.length() >= 7)
-                    && "-- ".equals(line.substring(4, 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);
                 continue;
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 b3c17bc49ad..da8c0f082da 100644
--- a/src/main/java/org/jabref/logic/importer/fileformat/BibtexImporter.java
+++ b/src/main/java/org/jabref/logic/importer/fileformat/BibtexImporter.java
@@ -12,7 +12,6 @@
 import java.nio.file.Path;
 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;
@@ -20,7 +19,6 @@
 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;
 
@@ -29,7 +27,9 @@
  */
 public class BibtexImporter extends Importer {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(BibtexImporter.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(
+        BibtexImporter.class
+    );
 
     // Signature written at the top of the .bib file in earlier versions.
     private static final String SIGNATURE = "This file was created with JabRef";
@@ -37,7 +37,10 @@ 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;
     }
@@ -62,14 +65,29 @@ 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;
         }
@@ -83,7 +101,8 @@ public static Charset getEncoding(Path filePath) throws IOException {
      * Determines the encoding of the supplied BibTeX file. If a JabRef encoding information is present, this information is used.
      * If there is none present, {@link com.ibm.icu.text.CharsetDetector#CharsetDetector()} is used.
      */
-    private static EncodingResult getEncodingResult(Path filePath) throws IOException {
+    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
         // which character encoding is used.
 
@@ -93,7 +112,9 @@ private static EncodingResult getEncodingResult(Path filePath) throws IOExceptio
 
         Charset detectedCharset;
         try (InputStream inputStream = Files.newInputStream(filePath)) {
-            BufferedInputStream bufferedInputStream = new BufferedInputStream(inputStream);
+            BufferedInputStream bufferedInputStream = new BufferedInputStream(
+                inputStream
+            );
             bufferedInputStream.mark(8192);
             detectedCharset = getCharset(bufferedInputStream);
             bufferedInputStream.reset();
@@ -102,7 +123,12 @@ private static EncodingResult getEncodingResult(Path filePath) throws IOExceptio
 
         Charset encoding;
         boolean encodingExplicitlySupplied;
-        try (BufferedReader reader = Files.newBufferedReader(filePath, detectedCharset)) {
+        try (
+            BufferedReader reader = Files.newBufferedReader(
+                filePath,
+                detectedCharset
+            )
+        ) {
             Optional<Charset> suppliedEncoding = getSuppliedEncoding(reader);
             LOGGER.debug("Supplied encoding: {}", suppliedEncoding);
             encodingExplicitlySupplied = suppliedEncoding.isPresent();
@@ -111,20 +137,27 @@ private static EncodingResult getEncodingResult(Path filePath) throws IOExceptio
             encoding = suppliedEncoding.orElse(detectedCharset);
             LOGGER.debug("Encoding used to read the file: {}", encoding);
         }
-        EncodingResult result = new EncodingResult(encoding, encodingExplicitlySupplied);
+        EncodingResult result = new EncodingResult(
+            encoding,
+            encodingExplicitlySupplied
+        );
         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
      * reader manually to the metadata
      */
     @Override
-    public ParserResult importDatabase(BufferedReader reader) throws IOException {
-        return new BibtexParser(importFormatPreferences, fileMonitor).parse(reader);
+    public ParserResult importDatabase(BufferedReader reader)
+        throws IOException {
+        return new BibtexParser(importFormatPreferences, fileMonitor)
+            .parse(reader);
     }
 
     @Override
@@ -145,7 +178,9 @@ public String getDescription() {
     /**
      * Searches the file for "Encoding: myEncoding" and returns the found supplied encoding.
      */
-    private static Optional<Charset> getSuppliedEncoding(BufferedReader reader) {
+    private static Optional<Charset> getSuppliedEncoding(
+        BufferedReader reader
+    ) {
         try {
             String line;
             while ((line = reader.readLine()) != null) {
@@ -168,9 +203,16 @@ private static Optional<Charset> getSuppliedEncoding(BufferedReader reader) {
                     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());
+                        encoding =
+                            line.substring(
+                                SaveConfiguration.ENCODING_PREFIX.length()
+                            );
                     }
 
                     return Optional.of(Charset.forName(encoding));
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 a609d68ca8d..d614e1f8eca 100644
--- a/src/main/java/org/jabref/logic/importer/fileformat/BibtexParser.java
+++ b/src/main/java/org/jabref/logic/importer/fileformat/BibtexParser.java
@@ -17,7 +17,6 @@
 import java.util.Optional;
 import java.util.Set;
 import java.util.regex.Pattern;
-
 import org.jabref.logic.bibtex.FieldContentFormatter;
 import org.jabref.logic.bibtex.FieldWriter;
 import org.jabref.logic.exporter.BibtexDatabaseWriter;
@@ -43,7 +42,6 @@
 import org.jabref.model.metadata.MetaData;
 import org.jabref.model.util.DummyFileUpdateMonitor;
 import org.jabref.model.util.FileUpdateMonitor;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -67,7 +65,10 @@
  * Opposite class: {@link org.jabref.logic.exporter.BibDatabaseWriter}
  */
 public class BibtexParser implements Parser {
-    private static final Logger LOGGER = LoggerFactory.getLogger(BibtexParser.class);
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(
+        BibtexParser.class
+    );
 
     private static final Integer LOOKAHEAD = 1024;
     private final FieldContentFormatter fieldContentFormatter;
@@ -81,9 +82,16 @@ public class BibtexParser implements Parser {
     private ParserResult parserResult;
     private final MetaDataParser metaDataParser;
 
-    public BibtexParser(ImportFormatPreferences importFormatPreferences, FileUpdateMonitor fileMonitor) {
-        this.importFormatPreferences = Objects.requireNonNull(importFormatPreferences);
-        this.fieldContentFormatter = new FieldContentFormatter(importFormatPreferences.fieldPreferences());
+    public BibtexParser(
+        ImportFormatPreferences importFormatPreferences,
+        FileUpdateMonitor fileMonitor
+    ) {
+        this.importFormatPreferences =
+            Objects.requireNonNull(importFormatPreferences);
+        this.fieldContentFormatter =
+            new FieldContentFormatter(
+                importFormatPreferences.fieldPreferences()
+            );
         this.metaDataParser = new MetaDataParser(fileMonitor);
     }
 
@@ -98,8 +106,12 @@ 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();
         }
@@ -107,7 +119,8 @@ public static Optional<BibEntry> singleFromString(String bibtexString, ImportFor
     }
 
     @Override
-    public List<BibEntry> parseEntries(InputStream inputStream) throws ParseException {
+    public List<BibEntry> parseEntries(InputStream inputStream)
+        throws ParseException {
         Reader reader;
         try {
             reader = Importer.getReader(inputStream);
@@ -117,7 +130,8 @@ public List<BibEntry> parseEntries(InputStream inputStream) throws ParseExceptio
         }
     }
 
-    public Optional<BibEntry> parseSingleEntry(String bibtexString) throws ParseException {
+    public Optional<BibEntry> parseSingleEntry(String bibtexString)
+        throws ParseException {
         return parseEntries(bibtexString).stream().findFirst();
     }
 
@@ -155,7 +169,11 @@ private String determineNewLineSeparator() throws IOException {
             currentChar = pushbackReader.read();
             stringWriter.append((char) currentChar);
             i++;
-        } while ((i < BibtexParser.LOOKAHEAD) && (currentChar != '\r') && (currentChar != '\n'));
+        } while (
+            (i < BibtexParser.LOOKAHEAD) &&
+            (currentChar != '\r') &&
+            (currentChar != '\n')
+        );
         if (currentChar == '\r') {
             newLineSeparator = "\r\n";
         } else if (currentChar == '\n') {
@@ -228,9 +246,14 @@ private ParserResult parseFileContent() throws IOException {
         }
 
         try {
-            parserResult.setMetaData(metaDataParser.parse(
+            parserResult.setMetaData(
+                metaDataParser.parse(
                     meta,
-                    importFormatPreferences.bibEntryPreferences().getKeywordSeparator()));
+                    importFormatPreferences
+                        .bibEntryPreferences()
+                        .getKeywordSeparator()
+                )
+            );
         } catch (ParseException exception) {
             parserResult.addException(exception);
         }
@@ -245,8 +268,14 @@ 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
         // 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()
+            );
         }
     }
 
@@ -263,19 +292,26 @@ private void parseAndAddEntry(String type) {
             // remove first newline
             // this is appended by JabRef during writing automatically
             if (commentsAndEntryTypeDefinition.startsWith("\r\n")) {
-                commentsAndEntryTypeDefinition = commentsAndEntryTypeDefinition.substring(2);
+                commentsAndEntryTypeDefinition =
+                    commentsAndEntryTypeDefinition.substring(2);
             } else if (commentsAndEntryTypeDefinition.startsWith("\n")) {
-                commentsAndEntryTypeDefinition = commentsAndEntryTypeDefinition.substring(1);
+                commentsAndEntryTypeDefinition =
+                    commentsAndEntryTypeDefinition.substring(1);
             }
 
             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);
@@ -284,8 +320,14 @@ private void parseAndAddEntry(String type) {
             // 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.")
+            );
         }
     }
 
@@ -302,7 +344,14 @@ private void parseJabRefComment(Map<String, String> meta) {
         }
 
         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());
 
@@ -319,15 +368,29 @@ 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);
+            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
@@ -341,7 +404,11 @@ private void parseBibtexString() throws IOException {
         try {
             database.addString(bibtexString);
         } catch (KeyCollisionException ex) {
-            parserResult.addWarning(Localization.lang("Duplicate string name") + ": " + bibtexString.getName());
+            parserResult.addWarning(
+                Localization.lang("Duplicate string name") +
+                ": " +
+                bibtexString.getName()
+            );
         }
     }
 
@@ -387,9 +454,11 @@ 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);
@@ -507,9 +576,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 {
@@ -603,7 +670,9 @@ private BibEntry parseEntry(String entryType) throws IOException {
     }
 
     private void parseField(BibEntry entry) throws IOException {
-        Field field = FieldFactory.parseField(parseTextToken().toLowerCase(Locale.ROOT));
+        Field field = FieldFactory.parseField(
+            parseTextToken().toLowerCase(Locale.ROOT)
+        );
 
         skipWhitespace();
         consume('=');
@@ -619,11 +688,21 @@ private void parseField(BibEntry entry) throws IOException {
                 // at least one online database exports bibtex likes to do that, making
                 // it inconvenient
                 // for users if JabRef did not accept it.
-                if (field.getProperties().contains(FieldProperty.PERSON_NAMES)) {
-                    entry.setField(field, entry.getField(field).get() + " and " + content);
+                if (
+                    field.getProperties().contains(FieldProperty.PERSON_NAMES)
+                ) {
+                    entry.setField(
+                        field,
+                        entry.getField(field).get() + " and " + content
+                    );
                 } else if (StandardField.KEYWORDS == field) {
                     // multiple keywords fields should be combined to one
-                    entry.addKeyword(content, importFormatPreferences.bibEntryPreferences().getKeywordSeparator());
+                    entry.addKeyword(
+                        content,
+                        importFormatPreferences
+                            .bibEntryPreferences()
+                            .getKeywordSeparator()
+                    );
                 }
             } else {
                 entry.setField(field, content);
@@ -636,9 +715,15 @@ private String parseFieldContent(Field field) throws IOException {
         StringBuilder value = new StringBuilder();
         int character;
 
-        while (((character = peek()) != ',') && (character != '}') && (character != ')')) {
+        while (
+            ((character = peek()) != ',') &&
+            (character != '}') &&
+            (character != ')')
+        ) {
             if (eof) {
-                throw new IOException("Error in line " + line + ": EOF in mid-string");
+                throw new IOException(
+                    "Error in line " + line + ": EOF in mid-string"
+                );
             }
             if (character == '"') {
                 StringBuilder text = parseQuotedFieldExactly();
@@ -660,10 +745,18 @@ private String parseFieldContent(Field field) throws IOException {
             } 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();
         }
@@ -683,7 +776,10 @@ 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);
@@ -708,8 +804,12 @@ private String fixKey() throws IOException {
             currentChar = (char) read();
             key.append(currentChar);
             lookaheadUsed++;
-        } while ((currentChar != ',') && (currentChar != '\n') && (currentChar != '=')
-                && (lookaheadUsed < BibtexParser.LOOKAHEAD));
+        } while (
+            (currentChar != ',') &&
+            (currentChar != '\n') &&
+            (currentChar != '=') &&
+            (lookaheadUsed < BibtexParser.LOOKAHEAD)
+        );
 
         // Consumed a char too much, back into reader and remove from key:
         unread(currentChar);
@@ -749,23 +849,34 @@ 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:
-
                 // No more lookahead, give up:
                 unreadBuffer(key);
                 return "";
@@ -816,8 +927,12 @@ 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)) {
@@ -835,8 +950,15 @@ 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."
+                    );
                 }
             }
         }
@@ -852,7 +974,9 @@ private String parseBracketedText() throws IOException {
         while (!((isClosingBracketNext()) && (brackets == 0))) {
             int character = read();
             if (isEOFCharacter(character)) {
-                throw new IOException("Error in line " + line + ": EOF in mid-string");
+                throw new IOException(
+                    "Error in line " + line + ": EOF in mid-string"
+                );
             } else if ((character == '{') || (character == '(')) {
                 brackets++;
             } else if ((character == '}') || (character == ')')) {
@@ -867,7 +991,10 @@ private String parseBracketedText() throws IOException {
             if (Character.isWhitespace((char) character)) {
                 String whitespacesReduced = skipAndRecordWhitespace(character);
 
-                if (!(whitespacesReduced.isEmpty()) && !"\n\t".equals(whitespacesReduced)) { // &&
+                if (
+                    !(whitespacesReduced.isEmpty()) &&
+                    !"\n\t".equals(whitespacesReduced)
+                ) { // &&
                     whitespacesReduced = whitespacesReduced.replace("\t", ""); // Remove tabulators.
                     value.append(whitespacesReduced);
                 } else {
@@ -921,7 +1048,11 @@ private StringBuilder parseBracketedFieldContent() throws IOException {
                     // 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.
-                    if ((nextTwoCharacters[0] == ',') && ((nextTwoCharacters[1] == OS.NEWLINE.charAt(0)) || (nextTwoCharacters[1] == '\n'))) {
+                    if (
+                        (nextTwoCharacters[0] == ',') &&
+                        ((nextTwoCharacters[1] == OS.NEWLINE.charAt(0)) ||
+                            (nextTwoCharacters[1] == '\n'))
+                    ) {
                         // We hit '\}\r` or `\}\n`
                         // Heuristics: Unwanted escaping of }
                         //
@@ -943,7 +1074,9 @@ private StringBuilder parseBracketedFieldContent() throws IOException {
             if (isClosingBracket && (brackets == 0)) {
                 return value;
             } else if (isEOFCharacter(character)) {
-                throw new IOException("Error in line " + line + ": EOF in mid-string");
+                throw new IOException(
+                    "Error in line " + line + ": EOF in mid-string"
+                );
             } else if ((character == '{') && (!isEscapeSymbol(lastCharacter))) {
                 brackets++;
             } else if (isClosingBracket) {
@@ -970,7 +1103,9 @@ private StringBuilder parseQuotedFieldExactly() throws IOException {
         while (!((peek() == '"') && (brackets == 0))) {
             int j = read();
             if (isEOFCharacter(j)) {
-                throw new IOException("Error in line " + line + ": EOF in mid-string");
+                throw new IOException(
+                    "Error in line " + line + ": EOF in mid-string"
+                );
             } else if (j == '{') {
                 brackets++;
             } else if (j == '}') {
@@ -989,7 +1124,13 @@ 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
+            );
         }
     }
 
@@ -997,7 +1138,9 @@ private boolean consumeUncritically(char expected) throws IOException {
         int character;
         do {
             character = read();
-        } while ((character != expected) && (character != -1) && (character != 65535));
+        } while (
+            (character != expected) && (character != -1) && (character != 65535)
+        );
 
         if (isEOFCharacter(character)) {
             eof = true;
@@ -1007,14 +1150,23 @@ private boolean consumeUncritically(char expected) throws IOException {
         return character == expected;
     }
 
-    private void consume(char firstOption, char secondOption) throws IOException {
+    private void consume(char firstOption, char secondOption)
+        throws IOException {
         // Consumes one of the two, doesn't care which appears.
 
         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 a69d2c41991..bdd3faf75e7 100644
--- a/src/main/java/org/jabref/logic/importer/fileformat/CffImporter.java
+++ b/src/main/java/org/jabref/logic/importer/fileformat/CffImporter.java
@@ -1,5 +1,9 @@
 package org.jabref.logic.importer.fileformat;
 
+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 java.io.BufferedReader;
 import java.io.IOException;
 import java.util.ArrayList;
@@ -7,7 +11,6 @@
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
-
 import org.jabref.logic.importer.Importer;
 import org.jabref.logic.importer.ParserResult;
 import org.jabref.logic.util.StandardFileType;
@@ -20,11 +23,6 @@
 import org.jabref.model.entry.field.UnknownField;
 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;
-
 public class CffImporter extends Importer {
 
     @Override
@@ -49,6 +47,7 @@ public String getDescription() {
 
     // POJO classes for yaml data
     private static class CffFormat {
+
         private final HashMap<String, String> values = new HashMap<>();
 
         @JsonProperty("authors")
@@ -57,8 +56,7 @@ private static class CffFormat {
         @JsonProperty("identifiers")
         private List<CffIdentifier> ids;
 
-        public CffFormat() {
-        }
+        public CffFormat() {}
 
         @JsonAnySetter
         private void setValues(String key, String value) {
@@ -67,10 +65,10 @@ private void setValues(String key, String value) {
     }
 
     private static class CffAuthor {
+
         private final HashMap<String, String> values = new HashMap<>();
 
-        public CffAuthor() {
-        }
+        public CffAuthor() {}
 
         @JsonAnySetter
         private void setValues(String key, String value) {
@@ -79,17 +77,19 @@ 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() {}
     }
 
     @Override
-    public ParserResult importDatabase(BufferedReader reader) throws IOException {
+    public ParserResult importDatabase(BufferedReader reader)
+        throws IOException {
         ObjectMapper mapper = new ObjectMapper(new YAMLFactory());
         CffFormat citation = mapper.readValue(reader, CffFormat.class);
         HashMap<Field, String> entryMap = new HashMap<>();
@@ -99,32 +99,49 @@ public ParserResult importDatabase(BufferedReader reader) throws IOException {
         HashMap<String, Field> fieldMap = getFieldMappings();
         for (Map.Entry<String, String> property : citation.values.entrySet()) {
             if (fieldMap.containsKey(property.getKey())) {
-                entryMap.put(fieldMap.get(property.getKey()), property.getValue());
+                entryMap.put(
+                    fieldMap.get(property.getKey()),
+                    property.getValue()
+                );
             } else if ("type".equals(property.getKey())) {
                 if ("dataset".equals(property.getValue())) {
                     entryType = StandardEntryType.Dataset;
                 }
             } else if (getUnmappedFields().contains(property.getKey())) {
-                entryMap.put(new UnknownField(property.getKey()), property.getValue());
+                entryMap.put(
+                    new UnknownField(property.getKey()),
+                    property.getValue()
+                );
             }
         }
 
         // Translate CFF author format to JabRef author format
-        String authorStr = citation.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();
+        String authorStr = citation.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();
         entryMap.put(StandardField.AUTHOR, authorStr);
 
         // 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))
-                            .collect(Collectors.toList());
+        if (
+            (entryMap.get(StandardField.DOI) == null) && (citation.ids != null)
+        ) {
+            List<CffIdentifier> doiIds = citation.ids
+                .stream()
+                .filter(id -> "doi".equals(id.type))
+                .collect(Collectors.toList());
             if (doiIds.size() == 1) {
                 entryMap.put(StandardField.DOI, doiIds.get(0).value);
             }
@@ -132,18 +149,20 @@ 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)
-                                           .collect(Collectors.toList());
+            List<String> swhIds = citation.ids
+                .stream()
+                .filter(id -> "swh".equals(id.type))
+                .map(id -> id.value)
+                .collect(Collectors.toList());
 
             if (swhIds.size() == 1) {
                 entryMap.put(BiblatexSoftwareField.SWHID, swhIds.get(0));
             } 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]))
-                                               .collect(Collectors.toList());
+                List<String> relSwhIds = swhIds
+                    .stream()
+                    .filter(id -> id.split(":").length > 3) // quick filter for invalid swhids
+                    .filter(id -> "rel".equals(id.split(":")[2]))
+                    .collect(Collectors.toList());
                 if (relSwhIds.size() == 1) {
                     entryMap.put(BiblatexSoftwareField.SWHID, relSwhIds.get(0));
                 }
@@ -160,8 +179,8 @@ public ParserResult importDatabase(BufferedReader reader) throws IOException {
     }
 
     @Override
-    public boolean isRecognizedFormat(BufferedReader reader) throws IOException {
-
+    public boolean isRecognizedFormat(BufferedReader reader)
+        throws IOException {
         ObjectMapper mapper = new ObjectMapper(new YAMLFactory());
         CffFormat citation;
 
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 17a173d1ce0..cf295015a7b 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,8 @@
 package org.jabref.logic.importer.fileformat;
 
+import jakarta.xml.bind.JAXBContext;
+import jakarta.xml.bind.JAXBException;
+import jakarta.xml.bind.Unmarshaller;
 import java.io.BufferedInputStream;
 import java.io.BufferedReader;
 import java.io.FileInputStream;
@@ -26,11 +29,9 @@
 import java.util.stream.Collectors;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipInputStream;
-
 import javax.xml.stream.XMLInputFactory;
 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;
@@ -51,21 +52,22 @@
 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.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 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 final HtmlToLatexFormatter htmlToLatexFormatter = new HtmlToLatexFormatter();
-    private final NormalizePagesFormatter pagesFormatter = new NormalizePagesFormatter();
+    private static final EnumSet<QuotationTypeMapping> QUOTATION_TYPES =
+        EnumSet.allOf(QuotationTypeMapping.class);
+    private final HtmlToLatexFormatter htmlToLatexFormatter =
+        new HtmlToLatexFormatter();
+    private final NormalizePagesFormatter pagesFormatter =
+        new NormalizePagesFormatter();
 
     private final Map<String, Author> knownPersons = new HashMap<>();
     private final Map<String, Keyword> knownKeywords = new HashMap<>();
@@ -113,7 +115,8 @@ public String getDescription() {
     }
 
     @Override
-    public boolean isRecognizedFormat(BufferedReader reader) throws IOException {
+    public boolean isRecognizedFormat(BufferedReader reader)
+        throws IOException {
         Objects.requireNonNull(reader);
         return false;
     }
@@ -124,7 +127,9 @@ public boolean isRecognizedFormat(Path filePath) throws IOException {
             String str;
             int i = 0;
             while (((str = reader.readLine()) != null) && (i < 50)) {
-                if (str.toLowerCase(Locale.ROOT).contains("citaviexchangedata")) {
+                if (
+                    str.toLowerCase(Locale.ROOT).contains("citaviexchangedata")
+                ) {
                     return true;
                 }
                 i++;
@@ -143,7 +148,9 @@ public ParserResult importDatabase(Path filePath) throws IOException {
 
                 return new ParserResult(bibEntries);
             } else {
-                return ParserResult.fromErrorMessage("File does not start with xml tag.");
+                return ParserResult.fromErrorMessage(
+                    "File does not start with xml tag."
+                );
             }
         } catch (JAXBException | XMLStreamException e) {
             LOGGER.debug("could not parse document", e);
@@ -174,14 +181,17 @@ private List<BibEntry> parseDataList(CitaviExchangeData data) {
             this.refIdWithKeywords = buildKeywordList(refKeywords.getOnetoN());
         }
         if (refPublishers != null) {
-            this.refIdWithPublishers = buildPublisherList(refPublishers.getOnetoN());
+            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;
     }
@@ -190,46 +200,84 @@ private BibEntry parseData(CitaviExchangeData.References.Reference data) {
         BibEntry entry = new BibEntry();
 
         entry.setType(getType(data));
-        Optional.ofNullable(data.getTitle())
-                .ifPresent(value -> entry.setField(StandardField.TITLE, clean(value)));
-        Optional.ofNullable(data.getAbstract())
-                .ifPresent(value -> entry.setField(StandardField.ABSTRACT, clean(value)));
-        Optional.ofNullable(data.getYear())
-                .ifPresent(value -> entry.setField(StandardField.YEAR, clean(value)));
-        Optional.ofNullable(data.getDoi())
-                .ifPresent(value -> entry.setField(StandardField.DOI, clean(value)));
-        Optional.ofNullable(data.getIsbn())
-                .ifPresent(value -> entry.setField(StandardField.ISBN, clean(value)));
+        Optional
+            .ofNullable(data.getTitle())
+            .ifPresent(value ->
+                entry.setField(StandardField.TITLE, clean(value))
+            );
+        Optional
+            .ofNullable(data.getAbstract())
+            .ifPresent(value ->
+                entry.setField(StandardField.ABSTRACT, clean(value))
+            );
+        Optional
+            .ofNullable(data.getYear())
+            .ifPresent(value -> entry.setField(StandardField.YEAR, clean(value))
+            );
+        Optional
+            .ofNullable(data.getDoi())
+            .ifPresent(value -> entry.setField(StandardField.DOI, clean(value))
+            );
+        Optional
+            .ofNullable(data.getIsbn())
+            .ifPresent(value -> entry.setField(StandardField.ISBN, clean(value))
+            );
 
         String pages = clean(getPages(data));
         // Cleans also unicode minus signs
         pages = pagesFormatter.format(pages);
         entry.setField(StandardField.PAGES, pages);
 
-        Optional.ofNullable(data.getVolume())
-                .ifPresent(value -> entry.setField(StandardField.VOLUME, clean(value)));
-        Optional.ofNullable(getAuthorName(data))
-                .ifPresent(value -> entry.setField(StandardField.AUTHOR, clean(value)));
-        Optional.ofNullable(getEditorName(data))
-                .ifPresent(value -> entry.setField(StandardField.EDITOR, clean(value)));
-        Optional.ofNullable(getKeywords(data))
-                .ifPresent(value -> entry.setField(StandardField.KEYWORDS, clean(value)));
-        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")));
+        Optional
+            .ofNullable(data.getVolume())
+            .ifPresent(value ->
+                entry.setField(StandardField.VOLUME, clean(value))
+            );
+        Optional
+            .ofNullable(getAuthorName(data))
+            .ifPresent(value ->
+                entry.setField(StandardField.AUTHOR, clean(value))
+            );
+        Optional
+            .ofNullable(getEditorName(data))
+            .ifPresent(value ->
+                entry.setField(StandardField.EDITOR, clean(value))
+            );
+        Optional
+            .ofNullable(getKeywords(data))
+            .ifPresent(value ->
+                entry.setField(StandardField.KEYWORDS, clean(value))
+            );
+        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")
+                )
+            );
         return entry;
     }
 
     private EntryType getType(CitaviExchangeData.References.Reference data) {
-        return Optional.ofNullable(data.getReferenceType())
-                       .map(CitaviXmlImporter::convertRefNameToType)
-                       .orElse(StandardEntryType.Article);
+        return Optional
+            .ofNullable(data.getReferenceType())
+            .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;
@@ -243,9 +291,13 @@ private String getPages(CitaviExchangeData.References.Reference data) {
         String tmpStr = "";
         if ((data.getPageCount() != null) && (data.getPageRange() == null)) {
             tmpStr = data.getPageCount();
-        } else if ((data.getPageCount() == null) && (data.getPageRange() != null)) {
+        } else if (
+            (data.getPageCount() == null) && (data.getPageRange() != null)
+        ) {
             tmpStr = data.getPageRange();
-        } else if ((data.getPageCount() == null) && (data.getPageRange() == null)) {
+        } else if (
+            (data.getPageCount() == null) && (data.getPageRange() == null)
+        ) {
             return tmpStr;
         }
         int count = 0;
@@ -276,7 +328,9 @@ private Map<String, String> buildPersonList(List<String> authorsOrEditors) {
 
         for (String idStringsWithSemicolon : authorsOrEditors) {
             String refId = idStringsWithSemicolon.substring(0, UUID_LENGTH);
-            String rest = idStringsWithSemicolon.substring(UUID_SEMICOLON_OFFSET_INDEX);
+            String rest = idStringsWithSemicolon.substring(
+                UUID_SEMICOLON_OFFSET_INDEX
+            );
 
             String[] personIds = rest.split(";");
 
@@ -284,13 +338,32 @@ private Map<String, String> buildPersonList(List<String> authorsOrEditors) {
 
             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);
-                });
+                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;
@@ -301,7 +374,9 @@ private Map<String, String> buildKeywordList(List<String> keywordsList) {
 
         for (String idStringsWithSemicolon : keywordsList) {
             String refId = idStringsWithSemicolon.substring(0, UUID_LENGTH);
-            String rest = idStringsWithSemicolon.substring(UUID_SEMICOLON_OFFSET_INDEX);
+            String rest = idStringsWithSemicolon.substring(
+                UUID_SEMICOLON_OFFSET_INDEX
+            );
 
             String[] keywordIds = rest.split(";");
 
@@ -309,10 +384,20 @@ 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));
             }
 
@@ -323,12 +408,16 @@ private Map<String, String> buildKeywordList(List<String> keywordsList) {
         return refToKeywords;
     }
 
-    private Map<String, String> buildPublisherList(List<String> publishersList) {
+    private Map<String, String> buildPublisherList(
+        List<String> publishersList
+    ) {
         Map<String, String> refToPublishers = new HashMap<>();
 
         for (String idStringsWithSemicolon : publishersList) {
             String refId = idStringsWithSemicolon.substring(0, UUID_LENGTH);
-            String rest = idStringsWithSemicolon.substring(UUID_SEMICOLON_OFFSET_INDEX);
+            String rest = idStringsWithSemicolon.substring(
+                UUID_SEMICOLON_OFFSET_INDEX
+            );
 
             String[] publisherIds = rest.split(";");
 
@@ -336,10 +425,23 @@ 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));
             }
 
@@ -370,27 +472,50 @@ private String getPublisher(CitaviExchangeData.References.Reference data) {
         return this.refIdWithPublishers.get(data.getId());
     }
 
-    private String getKnowledgeItem(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());
-            quotationTypeDesc.ifPresent(qt -> comment.add(String.format("quotation type: %s", qt)));
-
-            Optional<Short> quotationIndex = Optional.of(knowledgeItem.getQuotationIndex());
-            quotationIndex.ifPresent(index -> comment.add(String.format("quotation index: %d", index)));
+            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(String.format("quotation type: %s", qt))
+            );
+
+            Optional<Short> quotationIndex = Optional.of(
+                knowledgeItem.getQuotationIndex()
+            );
+            quotationIndex.ifPresent(index ->
+                comment.add(String.format("quotation index: %d", index))
+            );
         }
         return comment.toString();
     }
@@ -403,22 +528,26 @@ 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();
         }
     }
 
-    private Object unmarshallRoot(BufferedReader reader) throws XMLStreamException, JAXBException {
+    private Object unmarshallRoot(BufferedReader reader)
+        throws XMLStreamException, JAXBException {
         initUnmarshaller();
 
-        XMLStreamReader xmlStreamReader = xmlInputFactory.createXMLStreamReader(reader);
+        XMLStreamReader xmlStreamReader = xmlInputFactory.createXMLStreamReader(
+            reader
+        );
 
         // Go to the root element
         while (!xmlStreamReader.isStartElement()) {
@@ -429,17 +558,25 @@ private Object unmarshallRoot(BufferedReader reader) throws XMLStreamException,
     }
 
     @Override
-    public ParserResult importDatabase(BufferedReader reader) throws IOException {
+    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);
         }
@@ -447,7 +584,9 @@ public List<BibEntry> parseEntries(InputStream inputStream) {
     }
 
     private BufferedReader getReaderFromZip(Path filePath) throws IOException {
-        ZipInputStream zis = new ZipInputStream(new FileInputStream(filePath.toFile()));
+        ZipInputStream zis = new ZipInputStream(
+            new FileInputStream(filePath.toFile())
+        );
         ZipEntry zipEntry = zis.getNextEntry();
 
         Path newFile = Files.createTempFile("citavicontent", ".xml");
@@ -460,7 +599,10 @@ private BufferedReader getReaderFromZip(Path filePath) throws IOException {
 
         zis.closeEntry();
 
-        InputStream stream = Files.newInputStream(newFile, StandardOpenOption.READ);
+        InputStream stream = Files.newInputStream(
+            newFile,
+            StandardOpenOption.READ
+        );
 
         // check and delete the utf-8 BOM bytes
         InputStream newStream = checkForUtf8BOMAndDiscardIfAny(stream);
@@ -468,14 +610,25 @@ private BufferedReader getReaderFromZip(Path filePath) throws IOException {
         // clean up the temp file
         Files.delete(newFile);
 
-        return new BufferedReader(new InputStreamReader(newStream, StandardCharsets.UTF_8));
+        return new BufferedReader(
+            new InputStreamReader(newStream, StandardCharsets.UTF_8)
+        );
     }
 
-    private static InputStream checkForUtf8BOMAndDiscardIfAny(InputStream inputStream) throws IOException {
-        PushbackInputStream pushbackInputStream = new PushbackInputStream(new BufferedInputStream(inputStream), 3);
+    private static InputStream checkForUtf8BOMAndDiscardIfAny(
+        InputStream inputStream
+    ) throws IOException {
+        PushbackInputStream pushbackInputStream = new PushbackInputStream(
+            new BufferedInputStream(inputStream),
+            3
+        );
         byte[] bom = new byte[3];
         if (pushbackInputStream.read(bom) != -1) {
-            if (!((bom[0] == (byte) 0xEF) && (bom[1] == (byte) 0xBB) && (bom[2] == (byte) 0xBF))) {
+            if (
+                !((bom[0] == (byte) 0xEF) &&
+                    (bom[1] == (byte) 0xBB) &&
+                    (bom[2] == (byte) 0xBF))
+            ) {
                 pushbackInputStream.unread(bom);
             }
         }
@@ -483,9 +636,10 @@ private static InputStream checkForUtf8BOMAndDiscardIfAny(InputStream inputStrea
     }
 
     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 3f76207d33e..52f15fde8f4 100644
--- a/src/main/java/org/jabref/logic/importer/fileformat/CiteSeerParser.java
+++ b/src/main/java/org/jabref/logic/importer/fileformat/CiteSeerParser.java
@@ -5,19 +5,18 @@
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Optional;
-
+import kong.unirest.json.JSONArray;
+import kong.unirest.json.JSONObject;
 import org.jabref.logic.importer.AuthorListParser;
 import org.jabref.logic.importer.ParseException;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.field.StandardField;
 import org.jabref.model.strings.StringUtil;
 
-import kong.unirest.json.JSONArray;
-import kong.unirest.json.JSONObject;
-
 public class CiteSeerParser {
 
-    public List<BibEntry> parseCiteSeerResponse(JSONArray jsonResponse) throws ParseException {
+    public List<BibEntry> parseCiteSeerResponse(JSONArray jsonResponse)
+        throws ParseException {
         List<BibEntry> response = new ArrayList<>();
         CookieHandler.setDefault(new CookieManager());
         for (int i = 0; i < jsonResponse.length(); ++i) {
@@ -40,9 +39,18 @@ private BibEntry parseBibEntry(JSONObject jsonObj) {
         bibEntry.setField(StandardField.TITLE, jsonObj.optString("title"));
         bibEntry.setField(StandardField.VENUE, jsonObj.optString("venue"));
         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.PUBLISHER,
+            jsonObj.optString("publisher")
+        );
+        bibEntry.setField(
+            StandardField.ABSTRACT,
+            jsonObj.optString("abstract")
+        );
+        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 +64,15 @@ 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);
+        authorsStringBuilder.append(
+            authorsArray.getString(authorsArray.length() - 1)
+        );
+        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 9ef111039e8..0e1dfe9ce03 100644
--- a/src/main/java/org/jabref/logic/importer/fileformat/CoinsParser.java
+++ b/src/main/java/org/jabref/logic/importer/fileformat/CoinsParser.java
@@ -9,7 +9,6 @@
 import java.util.regex.Matcher;
 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.util.OS;
@@ -34,8 +33,11 @@ public class CoinsParser implements Parser {
     private final Pattern AUTHOR = Pattern.compile("&amp;rft.au=([^&]+)");
 
     @Override
-    public List<BibEntry> parseEntries(InputStream inputStream) throws ParseException {
-        String data = new BufferedReader(new InputStreamReader(inputStream)).lines().collect(Collectors.joining(OS.NEWLINE));
+    public List<BibEntry> parseEntries(InputStream inputStream)
+        throws ParseException {
+        String data = new BufferedReader(new InputStreamReader(inputStream))
+            .lines()
+            .collect(Collectors.joining(OS.NEWLINE));
         BibEntry entry = new BibEntry();
 
         appendData(data, entry, DOI, StandardField.DOI);
@@ -70,7 +72,12 @@ public List<BibEntry> parseEntries(InputStream inputStream) throws ParseExceptio
         return Collections.singletonList(entry);
     }
 
-    private void appendData(String data, BibEntry entry, Pattern pattern, Field field) {
+    private void appendData(
+        String data,
+        BibEntry entry,
+        Pattern pattern,
+        Field field
+    ) {
         Matcher matcher = pattern.matcher(data);
         if (matcher.find()) {
             entry.setField(field, matcher.group(1));
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 d771ac42787..af961fef17e 100644
--- a/src/main/java/org/jabref/logic/importer/fileformat/CopacImporter.java
+++ b/src/main/java/org/jabref/logic/importer/fileformat/CopacImporter.java
@@ -6,7 +6,6 @@
 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.util.StandardFileType;
@@ -47,7 +46,8 @@ public String getDescription() {
     }
 
     @Override
-    public boolean isRecognizedFormat(BufferedReader reader) throws IOException {
+    public boolean isRecognizedFormat(BufferedReader reader)
+        throws IOException {
         String str;
         while ((str = reader.readLine()) != null) {
             if (CopacImporter.COPAC_PATTERN.matcher(str).find()) {
@@ -57,7 +57,12 @@ public boolean isRecognizedFormat(BufferedReader reader) throws IOException {
         return false;
     }
 
-    private static void setOrAppend(BibEntry b, Field field, String value, String separator) {
+    private static void setOrAppend(
+        BibEntry b,
+        Field field,
+        String value,
+        String separator
+    ) {
         if (b.hasField(field) && b.getField(field).isPresent()) {
             b.setField(field, b.getField(field).get() + separator + value);
         } else {
@@ -66,7 +71,8 @@ private static void setOrAppend(BibEntry b, Field field, String value, String se
     }
 
     @Override
-    public ParserResult importDatabase(BufferedReader reader) throws IOException {
+    public ParserResult importDatabase(BufferedReader reader)
+        throws IOException {
         Objects.requireNonNull(reader);
 
         List<String> entries = new LinkedList<>();
@@ -117,28 +123,75 @@ public ParserResult importDatabase(BufferedReader reader) throws IOException {
                 String code = line.substring(0, 4);
 
                 switch (code) {
-                    case "TI- " ->
-                            setOrAppend(b, StandardField.TITLE, line.substring(4).trim(), ", ");
-                    case "AU- " ->
-                            setOrAppend(b, StandardField.AUTHOR, line.substring(4).trim(), " and ");
-                    case "PY- " ->
-                            setOrAppend(b, StandardField.YEAR, line.substring(4).trim(), ", ");
-                    case "PU- " ->
-                            setOrAppend(b, StandardField.PUBLISHER, line.substring(4).trim(), ", ");
-                    case "SE- " ->
-                            setOrAppend(b, StandardField.SERIES, line.substring(4).trim(), ", ");
-                    case "IS- " ->
-                            setOrAppend(b, StandardField.ISBN, line.substring(4).trim(), ", ");
-                    case "KW- " ->
-                            setOrAppend(b, StandardField.KEYWORDS, line.substring(4).trim(), ", ");
-                    case "NT- " ->
-                            setOrAppend(b, StandardField.NOTE, line.substring(4).trim(), ", ");
-                    case "PD- " ->
-                            setOrAppend(b, new UnknownField("physicaldimensions"), line.substring(4).trim(), ", ");
-                    case "DT- " ->
-                            setOrAppend(b, new UnknownField("documenttype"), line.substring(4).trim(), ", ");
-                    default ->
-                            setOrAppend(b, FieldFactory.parseField(StandardEntryType.Book, line.substring(0, 2)), line.substring(4).trim(), ", ");
+                    case "TI- " -> setOrAppend(
+                        b,
+                        StandardField.TITLE,
+                        line.substring(4).trim(),
+                        ", "
+                    );
+                    case "AU- " -> setOrAppend(
+                        b,
+                        StandardField.AUTHOR,
+                        line.substring(4).trim(),
+                        " and "
+                    );
+                    case "PY- " -> setOrAppend(
+                        b,
+                        StandardField.YEAR,
+                        line.substring(4).trim(),
+                        ", "
+                    );
+                    case "PU- " -> setOrAppend(
+                        b,
+                        StandardField.PUBLISHER,
+                        line.substring(4).trim(),
+                        ", "
+                    );
+                    case "SE- " -> setOrAppend(
+                        b,
+                        StandardField.SERIES,
+                        line.substring(4).trim(),
+                        ", "
+                    );
+                    case "IS- " -> setOrAppend(
+                        b,
+                        StandardField.ISBN,
+                        line.substring(4).trim(),
+                        ", "
+                    );
+                    case "KW- " -> setOrAppend(
+                        b,
+                        StandardField.KEYWORDS,
+                        line.substring(4).trim(),
+                        ", "
+                    );
+                    case "NT- " -> setOrAppend(
+                        b,
+                        StandardField.NOTE,
+                        line.substring(4).trim(),
+                        ", "
+                    );
+                    case "PD- " -> setOrAppend(
+                        b,
+                        new UnknownField("physicaldimensions"),
+                        line.substring(4).trim(),
+                        ", "
+                    );
+                    case "DT- " -> setOrAppend(
+                        b,
+                        new UnknownField("documenttype"),
+                        line.substring(4).trim(),
+                        ", "
+                    );
+                    default -> 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 392074470aa..96ef3dc838e 100644
--- a/src/main/java/org/jabref/logic/importer/fileformat/CustomImporter.java
+++ b/src/main/java/org/jabref/logic/importer/fileformat/CustomImporter.java
@@ -8,7 +8,6 @@
 import java.util.Arrays;
 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;
@@ -26,7 +25,8 @@ public class CustomImporter extends Importer {
 
     private final Importer importer;
 
-    public CustomImporter(String basePath, String className) throws ImportException {
+    public CustomImporter(String basePath, String className)
+        throws ImportException {
         this.basePath = Path.of(basePath);
         this.className = className;
         try {
@@ -37,8 +37,10 @@ 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})) {
+        throws IOException, ReflectiveOperationException {
+        try (
+            URLClassLoader cl = new URLClassLoader(new URL[] { basePathURL })
+        ) {
             Class<?> clazz = Class.forName(className, true, cl);
             return (Importer) clazz.getDeclaredConstructor().newInstance();
         }
@@ -66,7 +68,10 @@ 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
@@ -75,7 +80,8 @@ public boolean isRecognizedFormat(BufferedReader input) throws IOException {
     }
 
     @Override
-    public ParserResult importDatabase(BufferedReader input) throws IOException {
+    public ParserResult importDatabase(BufferedReader input)
+        throws IOException {
         return importer.importDatabase(input);
     }
 
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 b4f9fe0f1bc..0724dd63985 100644
--- a/src/main/java/org/jabref/logic/importer/fileformat/EndnoteImporter.java
+++ b/src/main/java/org/jabref/logic/importer/fileformat/EndnoteImporter.java
@@ -7,7 +7,6 @@
 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;
@@ -56,11 +55,15 @@ public String getDescription() {
     }
 
     @Override
-    public boolean isRecognizedFormat(BufferedReader reader) throws IOException {
+    public boolean isRecognizedFormat(BufferedReader reader)
+        throws IOException {
         // Our strategy is to look for the "%A *" line.
         String str;
         while ((str = reader.readLine()) != null) {
-            if (A_PATTERN.matcher(str).matches() || E_PATTERN.matcher(str).matches()) {
+            if (
+                A_PATTERN.matcher(str).matches() ||
+                E_PATTERN.matcher(str).matches()
+            ) {
                 return true;
             }
         }
@@ -68,7 +71,8 @@ public boolean isRecognizedFormat(BufferedReader reader) throws IOException {
     }
 
     @Override
-    public ParserResult importDatabase(BufferedReader reader) throws IOException {
+    public ParserResult importDatabase(BufferedReader reader)
+        throws IOException {
         List<BibEntry> bibitems = new ArrayList<>();
         StringBuilder sb = new StringBuilder();
         String str;
@@ -140,8 +144,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;
@@ -164,24 +167,22 @@ 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 "J" ->
-                        // "Alternate journal. Let's set it only if no journal
-                        // has been set with %B.
-                            hm.putIfAbsent(StandardField.JOURNAL, 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.
+                    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 */
@@ -195,15 +196,14 @@ public ParserResult importDatabase(BufferedReader reader) throws IOException {
                             hm.put(StandardField.PUBLISHER, val);
                         }
                     }
-                    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);
+                    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);
                     case "R" -> {
                         String doi = val;
                         if (doi.startsWith("doi:")) {
@@ -220,10 +220,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;
@@ -232,8 +230,10 @@ public ParserResult importDatabase(BufferedReader reader) throws IOException {
                             type = StandardEntryType.MastersThesis;
                         }
                     }
-                    case "F" ->
-                            hm.put(InternalField.KEY_FIELD, CitationKeyGenerator.cleanKey(val, ""));
+                    case "F" -> hm.put(
+                        InternalField.KEY_FIELD,
+                        CitationKeyGenerator.cleanKey(val, "")
+                    );
                 }
             }
 
@@ -252,7 +252,11 @@ 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 70fc60465f0..c0b08bab4f3 100644
--- a/src/main/java/org/jabref/logic/importer/fileformat/EndnoteXmlImporter.java
+++ b/src/main/java/org/jabref/logic/importer/fileformat/EndnoteXmlImporter.java
@@ -1,5 +1,6 @@
 package org.jabref.logic.importer.fileformat;
 
+import com.google.common.base.Joiner;
 import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.InputStream;
@@ -14,12 +15,10 @@
 import java.util.Locale;
 import java.util.Map;
 import java.util.Objects;
-
 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;
@@ -36,8 +35,6 @@
 import org.jabref.model.entry.types.IEEETranEntryType;
 import org.jabref.model.entry.types.StandardEntryType;
 import org.jabref.model.strings.StringUtil;
-
-import com.google.common.base.Joiner;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -48,7 +45,9 @@
  */
 public class EndnoteXmlImporter extends Importer implements Parser {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(EndnoteXmlImporter.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(
+        EndnoteXmlImporter.class
+    );
     private final ImportFormatPreferences preferences;
     private final XMLInputFactory xmlInputFactory;
 
@@ -87,7 +86,8 @@ public String getDescription() {
     }
 
     @Override
-    public boolean isRecognizedFormat(BufferedReader reader) throws IOException {
+    public boolean isRecognizedFormat(BufferedReader reader)
+        throws IOException {
         String str;
         int i = 0;
         while (((str = reader.readLine()) != null) && (i < 50)) {
@@ -101,20 +101,23 @@ public boolean isRecognizedFormat(BufferedReader reader) throws IOException {
     }
 
     @Override
-    public ParserResult importDatabase(BufferedReader input) throws IOException {
+    public ParserResult importDatabase(BufferedReader input)
+        throws IOException {
         Objects.requireNonNull(input);
 
         List<BibEntry> bibItems = new ArrayList<>();
 
         try {
-            XMLStreamReader reader = xmlInputFactory.createXMLStreamReader(input);
+            XMLStreamReader reader = xmlInputFactory.createXMLStreamReader(
+                input
+            );
 
             while (reader.hasNext()) {
                 reader.next();
                 if (isStartXMLEvent(reader)) {
                     String elementName = reader.getName().getLocalPart();
                     if ("record".equals(elementName)) {
-                         parseRecord(reader, bibItems, elementName);
+                        parseRecord(reader, bibItems, elementName);
                     }
                 }
             }
@@ -125,9 +128,11 @@ public ParserResult importDatabase(BufferedReader input) throws IOException {
         return new ParserResult(bibItems);
     }
 
-    private void parseRecord(XMLStreamReader reader, List<BibEntry> bibItems, String startElement)
-        throws XMLStreamException {
-
+    private void parseRecord(
+        XMLStreamReader reader,
+        List<BibEntry> bibItems,
+        String startElement
+    ) throws XMLStreamException {
         Map<Field, String> fields = new HashMap<>();
         EntryType entryType = StandardEntryType.Article;
 
@@ -150,50 +155,101 @@ private void parseRecord(XMLStreamReader reader, List<BibEntry> bibItems, String
                         handleTitles(reader, fields, elementName);
                     }
                     case "pages" -> {
-                        parseStyleContent(reader, fields, StandardField.PAGES, elementName);
+                        parseStyleContent(
+                            reader,
+                            fields,
+                            StandardField.PAGES,
+                            elementName
+                        );
                     }
                     case "volume" -> {
-                        parseStyleContent(reader, fields, StandardField.VOLUME, elementName);
+                        parseStyleContent(
+                            reader,
+                            fields,
+                            StandardField.VOLUME,
+                            elementName
+                        );
                     }
                     case "number" -> {
-                        parseStyleContent(reader, fields, StandardField.NUMBER, elementName);
+                        parseStyleContent(
+                            reader,
+                            fields,
+                            StandardField.NUMBER,
+                            elementName
+                        );
                     }
                     case "dates" -> {
                         parseYear(reader, fields);
                     }
                     case "notes" -> {
-                        parseStyleContent(reader, fields, StandardField.NOTE, elementName);
+                        parseStyleContent(
+                            reader,
+                            fields,
+                            StandardField.NOTE,
+                            elementName
+                        );
                     }
                     case "urls" -> {
-                       handleUrlList(reader, fields, linkedFiles);
+                        handleUrlList(reader, fields, linkedFiles);
                     }
                     case "keywords" -> {
                         handleKeywordsList(reader, keywordList, elementName);
                     }
                     case "abstract" -> {
-                        parseStyleContent(reader, fields, StandardField.ABSTRACT, elementName);
+                        parseStyleContent(
+                            reader,
+                            fields,
+                            StandardField.ABSTRACT,
+                            elementName
+                        );
                     }
                     case "isbn" -> {
-                        parseStyleContent(reader, fields, StandardField.ISBN, elementName);
+                        parseStyleContent(
+                            reader,
+                            fields,
+                            StandardField.ISBN,
+                            elementName
+                        );
                     }
                     case "electronic-resource-num" -> {
-                        parseStyleContent(reader, fields, StandardField.DOI, elementName);
+                        parseStyleContent(
+                            reader,
+                            fields,
+                            StandardField.DOI,
+                            elementName
+                        );
                     }
                     case "publisher" -> {
-                        parseStyleContent(reader, fields, StandardField.PUBLISHER, elementName);
+                        parseStyleContent(
+                            reader,
+                            fields,
+                            StandardField.PUBLISHER,
+                            elementName
+                        );
                     }
                     case "label" -> {
-                        parseStyleContent(reader, fields, new UnknownField("endnote-label"), elementName);
+                        parseStyleContent(
+                            reader,
+                            fields,
+                            new UnknownField("endnote-label"),
+                            elementName
+                        );
                     }
                 }
             }
-            if (isEndXMLEvent(reader) && reader.getName().getLocalPart().equals(startElement)) {
+            if (
+                isEndXMLEvent(reader) &&
+                reader.getName().getLocalPart().equals(startElement)
+            ) {
                 break;
             }
         }
 
         BibEntry entry = new BibEntry(entryType);
-        entry.putKeywords(keywordList, preferences.bibEntryPreferences().getKeywordSeparator());
+        entry.putKeywords(
+            keywordList,
+            preferences.bibEntryPreferences().getKeywordSeparator()
+        );
 
         entry.setField(fields);
         entry.setFiles(linkedFiles);
@@ -212,7 +268,11 @@ private static EntryType convertRefNameToType(String refName) {
         };
     }
 
-    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()) {
@@ -226,15 +286,18 @@ private void handleAuthorList(XMLStreamReader reader, Map<Field, String> fields,
                 }
             }
 
-            if (isEndXMLEvent(reader) && reader.getName().getLocalPart().equals(startElement)) {
+            if (
+                isEndXMLEvent(reader) &&
+                reader.getName().getLocalPart().equals(startElement)
+            ) {
                 break;
             }
         }
         fields.put(StandardField.AUTHOR, join(authorNames, " and "));
     }
 
-    private void parseAuthor(XMLStreamReader reader, List<String> authorNames) throws XMLStreamException {
-
+    private void parseAuthor(XMLStreamReader reader, List<String> authorNames)
+        throws XMLStreamException {
         while (reader.hasNext()) {
             reader.next();
             if (isStartXMLEvent(reader)) {
@@ -249,13 +312,21 @@ private void parseAuthor(XMLStreamReader reader, List<String> authorNames) throw
                 }
             }
 
-            if (isEndXMLEvent(reader) && "author".equals(reader.getName().getLocalPart())) {
+            if (
+                isEndXMLEvent(reader) &&
+                "author".equals(reader.getName().getLocalPart())
+            ) {
                 break;
             }
         }
     }
 
-    private void parseStyleContent(XMLStreamReader reader, Map<Field, String> fields, Field field, String elementName) throws XMLStreamException {
+    private void parseStyleContent(
+        XMLStreamReader reader,
+        Map<Field, String> fields,
+        Field field,
+        String elementName
+    ) throws XMLStreamException {
         while (reader.hasNext()) {
             reader.next();
             if (isStartXMLEvent(reader)) {
@@ -263,23 +334,42 @@ private void parseStyleContent(XMLStreamReader reader, Map<Field, String> fields
                 if ("style".equals(tag)) {
                     reader.next();
                     if (isCharacterXMLEvent(reader)) {
-                        if ("abstract".equals(elementName) || "electronic-resource-num".equals(elementName) || "notes".equals(elementName)) {
-                            putIfValueNotNull(fields, field, reader.getText().trim());
-                        } else if ("isbn".equals(elementName) || "secondary-title".equals(elementName)) {
-                            putIfValueNotNull(fields, field, clean(reader.getText()));
+                        if (
+                            "abstract".equals(elementName) ||
+                            "electronic-resource-num".equals(elementName) ||
+                            "notes".equals(elementName)
+                        ) {
+                            putIfValueNotNull(
+                                fields,
+                                field,
+                                reader.getText().trim()
+                            );
+                        } else if (
+                            "isbn".equals(elementName) ||
+                            "secondary-title".equals(elementName)
+                        ) {
+                            putIfValueNotNull(
+                                fields,
+                                field,
+                                clean(reader.getText())
+                            );
                         } else {
                             putIfValueNotNull(fields, field, reader.getText());
                         }
                     }
                 }
             }
-            if (isEndXMLEvent(reader) && reader.getName().getLocalPart().equals(elementName)) {
+            if (
+                isEndXMLEvent(reader) &&
+                reader.getName().getLocalPart().equals(elementName)
+            ) {
                 break;
             }
         }
     }
 
-    private void parseYear(XMLStreamReader reader, Map<Field, String> fields) throws XMLStreamException {
+    private void parseYear(XMLStreamReader reader, Map<Field, String> fields)
+        throws XMLStreamException {
         while (reader.hasNext()) {
             reader.next();
             if (isStartXMLEvent(reader)) {
@@ -288,20 +378,30 @@ private void parseYear(XMLStreamReader reader, Map<Field, String> fields) throws
                     case "style" -> {
                         reader.next();
                         if (isCharacterXMLEvent(reader)) {
-                            putIfValueNotNull(fields, StandardField.YEAR, reader.getText());
+                            putIfValueNotNull(
+                                fields,
+                                StandardField.YEAR,
+                                reader.getText()
+                            );
                         }
                     }
                 }
             }
 
-            if (isEndXMLEvent(reader) && "year".equals(reader.getName().getLocalPart())) {
+            if (
+                isEndXMLEvent(reader) &&
+                "year".equals(reader.getName().getLocalPart())
+            ) {
                 break;
             }
         }
     }
 
-    private void handleKeywordsList(XMLStreamReader reader, KeywordList keywordList, String startElement) throws XMLStreamException {
-
+    private void handleKeywordsList(
+        XMLStreamReader reader,
+        KeywordList keywordList,
+        String startElement
+    ) throws XMLStreamException {
         while (reader.hasNext()) {
             reader.next();
             if (isStartXMLEvent(reader)) {
@@ -312,14 +412,17 @@ private void handleKeywordsList(XMLStreamReader reader, KeywordList keywordList,
                     }
                 }
             }
-            if (isEndXMLEvent(reader) && reader.getName().getLocalPart().equals(startElement)) {
+            if (
+                isEndXMLEvent(reader) &&
+                reader.getName().getLocalPart().equals(startElement)
+            ) {
                 break;
             }
         }
     }
 
-    private void parseKeyword(XMLStreamReader reader, KeywordList keywordList) throws XMLStreamException {
-
+    private void parseKeyword(XMLStreamReader reader, KeywordList keywordList)
+        throws XMLStreamException {
         while (reader.hasNext()) {
             reader.next();
             if (isStartXMLEvent(reader)) {
@@ -336,14 +439,20 @@ private void parseKeyword(XMLStreamReader reader, KeywordList keywordList) throw
                 }
             }
 
-            if (isEndXMLEvent(reader) && "keyword".equals(reader.getName().getLocalPart())) {
+            if (
+                isEndXMLEvent(reader) &&
+                "keyword".equals(reader.getName().getLocalPart())
+            ) {
                 break;
             }
         }
     }
 
-    private void handleTitles(XMLStreamReader reader, Map<Field, String> fields, String startElement) throws XMLStreamException {
-
+    private void handleTitles(
+        XMLStreamReader reader,
+        Map<Field, String> fields,
+        String startElement
+    ) throws XMLStreamException {
         while (reader.hasNext()) {
             reader.next();
             if (isStartXMLEvent(reader)) {
@@ -359,30 +468,54 @@ private void handleTitles(XMLStreamReader reader, Map<Field, String> fields, Str
                                     reader.next();
                                     if (isCharacterXMLEvent(reader)) {
                                         if (reader.getText() != null) {
-                                            titleStyleContent.add((reader.getText()));
+                                            titleStyleContent.add(
+                                                (reader.getText())
+                                            );
                                         }
                                     }
                                 }
                             }
-                            if (isEndXMLEvent(reader) && reader.getName().getLocalPart().equals(elementName)) {
+                            if (
+                                isEndXMLEvent(reader) &&
+                                reader
+                                    .getName()
+                                    .getLocalPart()
+                                    .equals(elementName)
+                            ) {
                                 break;
                             }
                         }
-                        putIfValueNotNull(fields, StandardField.TITLE, clean(join(titleStyleContent, "")));
+                        putIfValueNotNull(
+                            fields,
+                            StandardField.TITLE,
+                            clean(join(titleStyleContent, ""))
+                        );
                     }
                     case "secondary-title" -> {
-                        parseStyleContent(reader, fields, StandardField.JOURNAL, elementName);
+                        parseStyleContent(
+                            reader,
+                            fields,
+                            StandardField.JOURNAL,
+                            elementName
+                        );
                     }
                 }
             }
 
-            if (isEndXMLEvent(reader) && reader.getName().getLocalPart().equals(startElement)) {
+            if (
+                isEndXMLEvent(reader) &&
+                reader.getName().getLocalPart().equals(startElement)
+            ) {
                 break;
             }
         }
     }
 
-    private void handleUrlList(XMLStreamReader reader, Map<Field, String> fields, List<LinkedFile> linkedFiles) throws XMLStreamException {
+    private void handleUrlList(
+        XMLStreamReader reader,
+        Map<Field, String> fields,
+        List<LinkedFile> linkedFiles
+    ) throws XMLStreamException {
         while (reader.hasNext()) {
             reader.next();
             if (isStartXMLEvent(reader)) {
@@ -397,14 +530,19 @@ private void handleUrlList(XMLStreamReader reader, Map<Field, String> fields, Li
                 }
             }
 
-            if (isEndXMLEvent(reader) && "urls".equals(reader.getName().getLocalPart())) {
+            if (
+                isEndXMLEvent(reader) &&
+                "urls".equals(reader.getName().getLocalPart())
+            ) {
                 break;
             }
         }
     }
 
-    private void parseRelatedUrls(XMLStreamReader reader, Map<Field, String> fields) throws XMLStreamException {
-
+    private void parseRelatedUrls(
+        XMLStreamReader reader,
+        Map<Field, String> fields
+    ) throws XMLStreamException {
         while (reader.hasNext()) {
             reader.next();
             if (isStartXMLEvent(reader)) {
@@ -412,7 +550,11 @@ private void parseRelatedUrls(XMLStreamReader reader, Map<Field, String> fields)
                 if ("style".equals(elementName)) {
                     reader.next();
                     if (isCharacterXMLEvent(reader)) {
-                        putIfValueNotNull(fields, StandardField.URL, reader.getText());
+                        putIfValueNotNull(
+                            fields,
+                            StandardField.URL,
+                            reader.getText()
+                        );
                     }
                 }
             } else if (isCharacterXMLEvent(reader)) {
@@ -422,14 +564,20 @@ private void parseRelatedUrls(XMLStreamReader reader, Map<Field, String> fields)
                 }
             }
 
-            if (isEndXMLEvent(reader) && "related-urls".equals(reader.getName().getLocalPart())) {
+            if (
+                isEndXMLEvent(reader) &&
+                "related-urls".equals(reader.getName().getLocalPart())
+            ) {
                 break;
             }
         }
     }
 
-    private void parsePdfUrls(XMLStreamReader reader, Map<Field, String> fields, List<LinkedFile> linkedFiles) throws XMLStreamException {
-
+    private void parsePdfUrls(
+        XMLStreamReader reader,
+        Map<Field, String> fields,
+        List<LinkedFile> linkedFiles
+    ) throws XMLStreamException {
         while (reader.hasNext()) {
             reader.next();
             if (isStartXMLEvent(reader)) {
@@ -442,10 +590,17 @@ private void parsePdfUrls(XMLStreamReader reader, Map<Field, String> fields, Lis
                             reader.next();
                             if (isCharacterXMLEvent(reader)) {
                                 try {
-                                    linkedFiles.add(new LinkedFile(new URL(reader.getText()), "PDF"));
-                                } catch (
-                                        MalformedURLException e) {
-                                    LOGGER.info("Unable to parse {}", reader.getText());
+                                    linkedFiles.add(
+                                        new LinkedFile(
+                                            new URL(reader.getText()),
+                                            "PDF"
+                                        )
+                                    );
+                                } catch (MalformedURLException e) {
+                                    LOGGER.info(
+                                        "Unable to parse {}",
+                                        reader.getText()
+                                    );
                                 }
                             }
                         }
@@ -454,25 +609,34 @@ private void parsePdfUrls(XMLStreamReader reader, Map<Field, String> fields, Lis
             }
             if (isCharacterXMLEvent(reader)) {
                 try {
-                    linkedFiles.add(new LinkedFile(new URL(reader.getText()), "PDF"));
-                } catch (
-                        MalformedURLException e) {
+                    linkedFiles.add(
+                        new LinkedFile(new URL(reader.getText()), "PDF")
+                    );
+                } catch (MalformedURLException e) {
                     LOGGER.info("Unable to parse {}", reader.getText());
                 }
             }
-            if (isEndXMLEvent(reader) && "pdf-urls".equals(reader.getName().getLocalPart())) {
+            if (
+                isEndXMLEvent(reader) &&
+                "pdf-urls".equals(reader.getName().getLocalPart())
+            ) {
                 break;
             }
         }
     }
 
     private String clean(String input) {
-        return StringUtil.unifyLineBreaks(input, " ")
-                         .trim()
-                         .replaceAll(" +", " ");
+        return StringUtil
+            .unifyLineBreaks(input, " ")
+            .trim()
+            .replaceAll(" +", " ");
     }
 
-    private void putIfValueNotNull(Map<Field, String> fields, Field field, String value) {
+    private void putIfValueNotNull(
+        Map<Field, String> fields,
+        Field field,
+        String value
+    ) {
         if (value != null) {
             fields.put(field, value);
         }
@@ -491,18 +655,19 @@ private boolean isEndXMLEvent(XMLStreamReader reader) {
     }
 
     @Override
-    public List<BibEntry> parseEntries(InputStream inputStream) throws ParseException {
+    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);
         }
         return Collections.emptyList();
     }
 }
-
-
-
-
-
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 e1b6b52fc75..75e351ae274 100644
--- a/src/main/java/org/jabref/logic/importer/fileformat/InspecImporter.java
+++ b/src/main/java/org/jabref/logic/importer/fileformat/InspecImporter.java
@@ -7,7 +7,6 @@
 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.util.StandardFileType;
@@ -24,7 +23,9 @@
  */
 public class InspecImporter extends Importer {
 
-    private static final Pattern INSPEC_PATTERN = Pattern.compile("Record.*INSPEC.*");
+    private static final Pattern INSPEC_PATTERN = Pattern.compile(
+        "Record.*INSPEC.*"
+    );
 
     @Override
     public String getName() {
@@ -42,7 +43,8 @@ public String getDescription() {
     }
 
     @Override
-    public boolean isRecognizedFormat(BufferedReader reader) throws IOException {
+    public boolean isRecognizedFormat(BufferedReader reader)
+        throws IOException {
         // Our strategy is to look for the "PY <year>" line.
         String str;
         while ((str = reader.readLine()) != null) {
@@ -54,7 +56,8 @@ public boolean isRecognizedFormat(BufferedReader reader) throws IOException {
     }
 
     @Override
-    public ParserResult importDatabase(BufferedReader reader) throws IOException {
+    public ParserResult importDatabase(BufferedReader reader)
+        throws IOException {
         List<BibEntry> bibitems = new ArrayList<>();
         StringBuilder sb = new StringBuilder();
         String str;
@@ -82,17 +85,16 @@ 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 "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);
+                    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);
                     case "SO" -> {
                         int m = frest.indexOf('.');
                         if (m >= 0) {
@@ -118,10 +120,14 @@ 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(" ", ""));
+                            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 47a1ef7967e..8bd0101fffd 100644
--- a/src/main/java/org/jabref/logic/importer/fileformat/IsiImporter.java
+++ b/src/main/java/org/jabref/logic/importer/fileformat/IsiImporter.java
@@ -11,7 +11,6 @@
 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;
@@ -24,7 +23,6 @@
 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;
 
@@ -45,12 +43,19 @@
  * </p>
  */
 public class IsiImporter extends Importer {
-    private static final Logger LOGGER = LoggerFactory.getLogger(IsiImporter.class);
-    private static final Pattern SUB_SUP_PATTERN = Pattern.compile("/(sub|sup)\\s+(.*?)\\s*/");
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(
+        IsiImporter.class
+    );
+    private static final Pattern SUB_SUP_PATTERN = Pattern.compile(
+        "/(sub|sup)\\s+(.*?)\\s*/"
+    );
 
     // 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);
@@ -76,7 +81,8 @@ public String getDescription() {
     }
 
     @Override
-    public boolean isRecognizedFormat(BufferedReader reader) throws IOException {
+    public boolean isRecognizedFormat(BufferedReader reader)
+        throws IOException {
         String str;
         int i = 0;
         while (((str = reader.readLine()) != null) && (i < 50)) {
@@ -97,11 +103,18 @@ 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)) {
-                Matcher m = IsiImporter.SUB_SUP_PATTERN.matcher(map.get(aSubsup));
+                Matcher m = IsiImporter.SUB_SUP_PATTERN.matcher(
+                    map.get(aSubsup)
+                );
                 StringBuilder sb = new StringBuilder();
 
                 while (m.find()) {
@@ -125,7 +138,11 @@ public static void processSubSup(Map<Field, String> map) {
     }
 
     private static void processCapitalization(Map<Field, String> map) {
-        Field[] subsup = {StandardField.TITLE, StandardField.JOURNAL, StandardField.PUBLISHER};
+        Field[] subsup = {
+            StandardField.TITLE,
+            StandardField.JOURNAL,
+            StandardField.PUBLISHER,
+        };
 
         for (Field aSubsup : subsup) {
             if (map.containsKey(aSubsup)) {
@@ -139,7 +156,8 @@ private static void processCapitalization(Map<Field, String> map) {
     }
 
     @Override
-    public ParserResult importDatabase(BufferedReader reader) throws IOException {
+    public ParserResult importDatabase(BufferedReader reader)
+        throws IOException {
         Objects.requireNonNull(reader);
 
         List<BibEntry> bibEntries = new ArrayList<>();
@@ -219,58 +237,66 @@ 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) {
-                            author = hm.get(StandardField.AUTHOR) + " and " + author;
+                            author =
+                                hm.get(StandardField.AUTHOR) + " and " + author;
                         }
                         hm.put(StandardField.AUTHOR, author);
                     }
-                    case "TI" ->
-                            hm.put(StandardField.TITLE, EOL_PATTERN.matcher(value).replaceAll(" "));
-                    case "SO", "JA" ->
-                            hm.put(StandardField.JOURNAL, EOL_PATTERN.matcher(value).replaceAll(" "));
+                    case "TI" -> hm.put(
+                        StandardField.TITLE,
+                        EOL_PATTERN.matcher(value).replaceAll(" ")
+                    );
+                    case "SO", "JA" -> hm.put(
+                        StandardField.JOURNAL,
+                        EOL_PATTERN.matcher(value).replaceAll(" ")
+                    );
                     case "ID", "KW" -> {
                         value = EOL_PATTERN.matcher(value).replaceAll(" ");
-                        String existingKeywords = hm.get(StandardField.KEYWORDS);
-                        if ((existingKeywords == null) || existingKeywords.contains(value)) {
+                        String existingKeywords = hm.get(
+                            StandardField.KEYWORDS
+                        );
+                        if (
+                            (existingKeywords == null) ||
+                            existingKeywords.contains(value)
+                        ) {
                             existingKeywords = value;
                         } else {
                             existingKeywords += ", " + value;
                         }
                         hm.put(StandardField.KEYWORDS, existingKeywords);
                     }
-                    case "AB" ->
-                            hm.put(StandardField.ABSTRACT, EOL_PATTERN.matcher(value).replaceAll(" "));
-                    case "BP", "BR", "SP" ->
-                            pages = value;
+                    case "AB" -> hm.put(
+                        StandardField.ABSTRACT,
+                        EOL_PATTERN.matcher(value).replaceAll(" ")
+                    );
+                    case "BP", "BR", "SP" -> pages = value;
                     case "EP" -> {
                         int detpos = value.indexOf(' ');
 
                         // tweak for IEEE Explore
-                        if ((detpos != -1) && !value.substring(0, detpos).trim().isEmpty()) {
+                        if (
+                            (detpos != -1) &&
+                            !value.substring(0, detpos).trim().isEmpty()
+                        ) {
                             value = value.substring(0, detpos);
                         }
                         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) {
@@ -280,17 +306,28 @@ 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());
+                    case "CR" -> 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);
@@ -343,7 +380,9 @@ private static String parsePages(String value) {
     static String parseMonth(String value) {
         String[] parts = value.split("\\s|\\-");
         for (String part1 : parts) {
-            Optional<Month> month = Month.getMonthByShortName(part1.toLowerCase(Locale.ROOT));
+            Optional<Month> month = Month.getMonthByShortName(
+                part1.toLowerCase(Locale.ROOT)
+            );
             if (month.isPresent()) {
                 return month.get().getJabRefFormat();
             }
@@ -358,8 +397,11 @@ 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 cc543ec2d37..4ca46ce002e 100644
--- a/src/main/java/org/jabref/logic/importer/fileformat/MarcXmlParser.java
+++ b/src/main/java/org/jabref/logic/importer/fileformat/MarcXmlParser.java
@@ -10,11 +10,9 @@
 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;
@@ -25,7 +23,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;
@@ -53,15 +50,23 @@
  * </ul>
  */
 public class MarcXmlParser implements Parser {
-    private static final Logger LOGGER = LoggerFactory.getLogger(MarcXmlParser.class);
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(
+        MarcXmlParser.class
+    );
 
     @Override
-    public List<BibEntry> parseEntries(InputStream inputStream) throws ParseException {
+    public List<BibEntry> parseEntries(InputStream inputStream)
+        throws ParseException {
         try {
-            DocumentBuilder documentBuilder = DocumentBuilderFactory.newInstance().newDocumentBuilder();
+            DocumentBuilder documentBuilder = DocumentBuilderFactory
+                .newInstance()
+                .newDocumentBuilder();
             Document content = documentBuilder.parse(inputStream);
             return this.parseEntries(content);
-        } catch (ParserConfigurationException | SAXException | IOException exception) {
+        } catch (
+            ParserConfigurationException | SAXException | IOException exception
+        ) {
             throw new ParseException(exception);
         }
     }
@@ -69,7 +74,9 @@ public List<BibEntry> parseEntries(InputStream inputStream) throws ParseExceptio
     private List<BibEntry> parseEntries(Document content) {
         List<BibEntry> result = new LinkedList<>();
 
-        Element root = (Element) content.getElementsByTagName("zs:searchRetrieveResponse").item(0);
+        Element root = (Element) content
+            .getElementsByTagName("zs:searchRetrieveResponse")
+            .item(0);
         Element srwrecords = getChild("zs:records", root);
         if (srwrecords == null) {
             // no records found, so return the empty list
@@ -98,7 +105,9 @@ private BibEntry parseEntry(Element element) {
 
             if ("020".equals(tag)) {
                 putIsbn(bibEntry, datafield);
-            } else if ("100".equals(tag) || "700".equals(tag) || "710".equals(tag)) {
+            } else if (
+                "100".equals(tag) || "700".equals(tag) || "710".equals(tag)
+            ) {
                 putPersonalName(bibEntry, datafield); // Author, Editor, Publisher
             } else if ("111".equals(tag)) {
                 // FixMe: Conference Information also in Subtitle (245) & Author (710)
@@ -125,7 +134,9 @@ private BibEntry parseEntry(Element element) {
                 putElectronicLocation(bibEntry, datafield);
             } else if ("966".equals(tag)) {
                 putDoi(bibEntry, datafield);
-            } else if (Integer.parseInt(tag) >= 546 && Integer.parseInt(tag) <= 599) {
+            } else if (
+                Integer.parseInt(tag) >= 546 && Integer.parseInt(tag) <= 599
+            ) {
                 // Notes
                 // FixMe: Some notes seem to have tags lower than 546
                 putNotes(bibEntry, datafield);
@@ -168,21 +179,22 @@ 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;
-                    });
+                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 {
@@ -190,7 +202,13 @@ 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);
                 }
@@ -272,7 +290,10 @@ private void putPublication(BibEntry bibEntry, Element datafield) {
                 } catch (DateTimeException exception) {
                     // cannot read date value, just copy it in plain text
                     LOGGER.info("Cannot parse date '{}'", strippedDate);
-                    bibEntry.setField(StandardField.DATE, StringUtil.stripBrackets(strippedDate));
+                    bibEntry.setField(
+                        StandardField.DATE,
+                        StringUtil.stripBrackets(strippedDate)
+                    );
                 }
             }
         }
@@ -281,8 +302,18 @@ 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);
         }
     }
@@ -326,9 +357,19 @@ 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);
             }
@@ -339,9 +380,14 @@ private void putKeywords(BibEntry bibEntry, Element datafield) {
         String keyword = getSubfield("a", datafield);
 
         if (StringUtil.isNotBlank(keyword)) {
-            Optional<String> keywords = bibEntry.getField(StandardField.KEYWORDS);
+            Optional<String> keywords = bibEntry.getField(
+                StandardField.KEYWORDS
+            );
             if (keywords.isPresent()) {
-                bibEntry.setField(StandardField.KEYWORDS, keywords.get() + ", " + keyword);
+                bibEntry.setField(
+                    StandardField.KEYWORDS,
+                    keywords.get() + ", " + keyword
+                );
             } else {
                 bibEntry.setField(StandardField.KEYWORDS, keyword);
             }
@@ -361,12 +407,30 @@ private void putIssue(BibEntry bibEntry, Element datafield) {
 
                 if (StringUtil.isNotBlank(value)) {
                     switch (key) {
-                        case "number" -> bibEntry.setField(StandardField.NUMBER, value);
-                        case "year" -> bibEntry.setField(StandardField.YEAR, value);
-                        case "pages" -> bibEntry.setField(StandardField.PAGES, value);
-                        case "volume" -> bibEntry.setField(StandardField.VOLUME, value);
-                        case "day" -> bibEntry.setField(StandardField.DAY, value);
-                        case "month" -> bibEntry.setField(StandardField.MONTH, value);
+                        case "number" -> bibEntry.setField(
+                            StandardField.NUMBER,
+                            value
+                        );
+                        case "year" -> bibEntry.setField(
+                            StandardField.YEAR,
+                            value
+                        );
+                        case "pages" -> bibEntry.setField(
+                            StandardField.PAGES,
+                            value
+                        );
+                        case "volume" -> bibEntry.setField(
+                            StandardField.VOLUME,
+                            value
+                        );
+                        case "day" -> bibEntry.setField(
+                            StandardField.DAY,
+                            value
+                        );
+                        case "month" -> bibEntry.setField(
+                            StandardField.MONTH,
+                            value
+                        );
                     }
                 }
             }
@@ -377,15 +441,24 @@ 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);
 
             if ("Volltext".equals(fulltext)) {
                 try {
-                    LinkedFile linkedFile = new LinkedFile(new URL(resource), "PDF");
-                    bibEntry.setField(StandardField.FILE, linkedFile.toString());
-                } catch (
-                        MalformedURLException e) {
+                    LinkedFile linkedFile = new LinkedFile(
+                        new URL(resource),
+                        "PDF"
+                    );
+                    bibEntry.setField(
+                        StandardField.FILE,
+                        linkedFile.toString()
+                    );
+                } catch (MalformedURLException e) {
                     LOGGER.info("Malformed URL: {}", resource);
                 }
             } else {
@@ -403,12 +476,19 @@ private void putElectronicLocation(BibEntry bibEntry, Element datafield) {
             String fulltext = getSubfield("3", datafield);
             String resource = getSubfield("u", datafield);
 
-            if ("Volltext".equals(fulltext) && StringUtil.isNotBlank(resource)) {
+            if (
+                "Volltext".equals(fulltext) && StringUtil.isNotBlank(resource)
+            ) {
                 try {
-                    LinkedFile linkedFile = new LinkedFile(new URL(resource), "PDF");
-                    bibEntry.setField(StandardField.FILE, linkedFile.toString());
-                } catch (
-                        MalformedURLException e) {
+                    LinkedFile linkedFile = new LinkedFile(
+                        new URL(resource),
+                        "PDF"
+                    );
+                    bibEntry.setField(
+                        StandardField.FILE,
+                        linkedFile.toString()
+                    );
+                } catch (MalformedURLException e) {
                     LOGGER.info("Malformed URL: {}", resource);
                 }
             } else {
@@ -419,26 +499,30 @@ private void putElectronicLocation(BibEntry bibEntry, Element datafield) {
 
     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)
+            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 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);
         }
@@ -459,7 +543,11 @@ 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 0cece860424..70552699189 100644
--- a/src/main/java/org/jabref/logic/importer/fileformat/MedlineImporter.java
+++ b/src/main/java/org/jabref/logic/importer/fileformat/MedlineImporter.java
@@ -13,12 +13,10 @@
 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;
@@ -39,7 +37,6 @@
 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;
 
@@ -50,7 +47,9 @@
  */
 public class MedlineImporter extends Importer implements Parser {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(MedlineImporter.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(
+        MedlineImporter.class
+    );
     private static final String KEYWORD_SEPARATOR = "; ";
 
     private static final Locale ENGLISH = Locale.ENGLISH;
@@ -65,7 +64,10 @@ public MedlineImporter() {
         xmlInputFactory.setProperty(XMLInputFactory.IS_COALESCING, true);
         // TODO: decide if necessary, if disabled MedlineImporterTestNbib fails
         xmlInputFactory.setProperty(XMLInputFactory.IS_NAMESPACE_AWARE, false);
-        xmlInputFactory.setProperty(XMLInputFactory.IS_SUPPORTING_EXTERNAL_ENTITIES, true);
+        xmlInputFactory.setProperty(
+            XMLInputFactory.IS_SUPPORTING_EXTERNAL_ENTITIES,
+            true
+        );
     }
 
     @Override
@@ -89,12 +91,15 @@ public String getDescription() {
     }
 
     @Override
-    public boolean isRecognizedFormat(BufferedReader reader) throws IOException {
+    public boolean isRecognizedFormat(BufferedReader reader)
+        throws IOException {
         String str;
         int i = 0;
         while (((str = reader.readLine()) != null) && (i < 50)) {
-            if (str.toLowerCase(ENGLISH).contains("<pubmedarticle>")
-                    || str.toLowerCase(ENGLISH).contains("<pubmedbookarticle>")) {
+            if (
+                str.toLowerCase(ENGLISH).contains("<pubmedarticle>") ||
+                str.toLowerCase(ENGLISH).contains("<pubmedbookarticle>")
+            ) {
                 return true;
             }
 
@@ -104,13 +109,16 @@ public boolean isRecognizedFormat(BufferedReader reader) throws IOException {
     }
 
     @Override
-    public ParserResult importDatabase(BufferedReader input) throws IOException {
+    public ParserResult importDatabase(BufferedReader input)
+        throws IOException {
         Objects.requireNonNull(input);
 
         List<BibEntry> bibItems = new ArrayList<>();
 
         try {
-            XMLStreamReader reader = xmlInputFactory.createXMLStreamReader(input);
+            XMLStreamReader reader = xmlInputFactory.createXMLStreamReader(
+                input
+            );
 
             while (reader.hasNext()) {
                 reader.next();
@@ -134,8 +142,11 @@ public ParserResult importDatabase(BufferedReader input) throws IOException {
         return new ParserResult(bibItems);
     }
 
-    private void parseBookArticle(XMLStreamReader reader, List<BibEntry> bibItems, String startElement)
-            throws XMLStreamException {
+    private void parseBookArticle(
+        XMLStreamReader reader,
+        List<BibEntry> bibItems,
+        String startElement
+    ) throws XMLStreamException {
         Map<Field, String> fields = new HashMap<>();
 
         while (reader.hasNext()) {
@@ -149,13 +160,20 @@ private void parseBookArticle(XMLStreamReader reader, List<BibEntry> bibItems, S
                     case "PublicationStatus" -> {
                         reader.next();
                         if (isCharacterXMLEvent(reader)) {
-                            putIfValueNotNull(fields, StandardField.PUBSTATE, reader.getText());
+                            putIfValueNotNull(
+                                fields,
+                                StandardField.PUBSTATE,
+                                reader.getText()
+                            );
                         }
                     }
                 }
             }
 
-            if (isEndXMLEvent(reader) && reader.getName().getLocalPart().equals(startElement)) {
+            if (
+                isEndXMLEvent(reader) &&
+                reader.getName().getLocalPart().equals(startElement)
+            ) {
                 break;
             }
         }
@@ -166,8 +184,11 @@ private void parseBookArticle(XMLStreamReader reader, List<BibEntry> bibItems, S
         bibItems.add(entry);
     }
 
-    private void parseBookDocument(XMLStreamReader reader, Map<Field, String> fields, String startElement)
-            throws XMLStreamException {
+    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<>();
         List<String> keywordList = new ArrayList<>();
@@ -221,26 +242,41 @@ private void parseBookDocument(XMLStreamReader reader, Map<Field, String> fields
                 }
             }
 
-            if (isEndXMLEvent(reader) && reader.getName().getLocalPart().equals(startElement)) {
+            if (
+                isEndXMLEvent(reader) &&
+                reader.getName().getLocalPart().equals(startElement)
+            ) {
                 break;
             }
         }
 
         // populate multiple occurrence fields
         if (!sectionTitleList.isEmpty()) {
-            fields.put(new UnknownField("sections"), String.join("; ", sectionTitleList));
+            fields.put(
+                new UnknownField("sections"),
+                String.join("; ", sectionTitleList)
+            );
         }
         addKeywords(fields, keywordList);
         if (!publicationTypeList.isEmpty()) {
-            fields.put(new UnknownField("pubtype"), String.join(", ", publicationTypeList));
+            fields.put(
+                new UnknownField("pubtype"),
+                String.join(", ", publicationTypeList)
+            );
         }
         if (!articleTitleList.isEmpty()) {
-            fields.put(new UnknownField("article"), String.join(", ", articleTitleList));
+            fields.put(
+                new UnknownField("article"),
+                String.join(", ", articleTitleList)
+            );
         }
     }
 
-    private void parseBookInformation(XMLStreamReader reader, Map<Field, String> fields, String startElement)
-            throws XMLStreamException {
+    private void parseBookInformation(
+        XMLStreamReader reader,
+        Map<Field, String> fields,
+        String startElement
+    ) throws XMLStreamException {
         List<String> isbnList = new ArrayList<>();
         List<String> titleList = new ArrayList<>();
 
@@ -252,13 +288,21 @@ private void parseBookInformation(XMLStreamReader reader, Map<Field, String> fie
                     case "PublisherName" -> {
                         reader.next();
                         if (isCharacterXMLEvent(reader)) {
-                            putIfValueNotNull(fields, StandardField.PUBLISHER, reader.getText());
+                            putIfValueNotNull(
+                                fields,
+                                StandardField.PUBLISHER,
+                                reader.getText()
+                            );
                         }
                     }
                     case "PublisherLocation" -> {
                         reader.next();
                         if (isCharacterXMLEvent(reader)) {
-                            putIfValueNotNull(fields, new UnknownField("publocation"), reader.getText());
+                            putIfValueNotNull(
+                                fields,
+                                new UnknownField("publocation"),
+                                reader.getText()
+                            );
                         }
                     }
                     case "BookTitle" -> {
@@ -273,29 +317,48 @@ private void parseBookInformation(XMLStreamReader reader, Map<Field, String> fie
                     case "Volume" -> {
                         reader.next();
                         if (isCharacterXMLEvent(reader)) {
-                            putIfValueNotNull(fields, StandardField.VOLUME, reader.getText());
+                            putIfValueNotNull(
+                                fields,
+                                StandardField.VOLUME,
+                                reader.getText()
+                            );
                         }
                     }
                     case "Edition" -> {
                         reader.next();
                         if (isCharacterXMLEvent(reader)) {
-                            putIfValueNotNull(fields, StandardField.EDITION, reader.getText());
+                            putIfValueNotNull(
+                                fields,
+                                StandardField.EDITION,
+                                reader.getText()
+                            );
                         }
                     }
                     case "Medium" -> {
                         reader.next();
                         if (isCharacterXMLEvent(reader)) {
-                            putIfValueNotNull(fields, new UnknownField("medium"), reader.getText());
+                            putIfValueNotNull(
+                                fields,
+                                new UnknownField("medium"),
+                                reader.getText()
+                            );
                         }
                     }
                     case "ReportNumber" -> {
                         reader.next();
                         if (isCharacterXMLEvent(reader)) {
-                            putIfValueNotNull(fields, new UnknownField("reportnumber"), reader.getText());
+                            putIfValueNotNull(
+                                fields,
+                                new UnknownField("reportnumber"),
+                                reader.getText()
+                            );
                         }
                     }
                     case "ELocationID" -> {
-                        String eidType = reader.getAttributeValue(null, "EIdType");
+                        String eidType = reader.getAttributeValue(
+                            null,
+                            "EIdType"
+                        );
                         reader.next();
                         if (isCharacterXMLEvent(reader)) {
                             handleElocationId(fields, reader, eidType);
@@ -310,7 +373,10 @@ private void parseBookInformation(XMLStreamReader reader, Map<Field, String> fie
                 }
             }
 
-            if (isEndXMLEvent(reader) && reader.getName().getLocalPart().equals(startElement)) {
+            if (
+                isEndXMLEvent(reader) &&
+                reader.getName().getLocalPart().equals(startElement)
+            ) {
                 break;
             }
         }
@@ -320,11 +386,19 @@ private void parseBookInformation(XMLStreamReader reader, Map<Field, String> fie
         }
 
         if (!titleList.isEmpty()) {
-            putIfValueNotNull(fields, StandardField.TITLE, String.join(" ", titleList));
+            putIfValueNotNull(
+                fields,
+                StandardField.TITLE,
+                String.join(" ", titleList)
+            );
         }
     }
 
-    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());
         }
@@ -333,7 +407,10 @@ 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()) {
@@ -354,7 +431,10 @@ private void parseSections(XMLStreamReader reader, List<String> sectionTitleList
                 }
             }
 
-            if (isEndXMLEvent(reader) && "Section".equals(reader.getName().getLocalPart())) {
+            if (
+                isEndXMLEvent(reader) &&
+                "Section".equals(reader.getName().getLocalPart())
+            ) {
                 if (sectionLevel == 0) {
                     break;
                 } else {
@@ -364,8 +444,11 @@ private void parseSections(XMLStreamReader reader, List<String> sectionTitleList
         }
     }
 
-    private void parseArticle(XMLStreamReader reader, List<BibEntry> bibItems, String startElement)
-            throws XMLStreamException {
+    private void parseArticle(
+        XMLStreamReader reader,
+        List<BibEntry> bibItems,
+        String startElement
+    ) throws XMLStreamException {
         Map<Field, String> fields = new HashMap<>();
 
         while (reader.hasNext()) {
@@ -382,7 +465,10 @@ private void parseArticle(XMLStreamReader reader, List<BibEntry> bibItems, Strin
                 }
             }
 
-            if (isEndXMLEvent(reader) && reader.getName().getLocalPart().equals(startElement)) {
+            if (
+                isEndXMLEvent(reader) &&
+                reader.getName().getLocalPart().equals(startElement)
+            ) {
                 break;
             }
         }
@@ -393,8 +479,11 @@ private void parseArticle(XMLStreamReader reader, List<BibEntry> bibItems, Strin
         bibItems.add(entry);
     }
 
-    private void parsePubmedData(XMLStreamReader reader, Map<Field, String> fields, String startElement)
-            throws XMLStreamException {
+    private void parsePubmedData(
+        XMLStreamReader reader,
+        Map<Field, String> fields,
+        String startElement
+    ) throws XMLStreamException {
         String publicationStatus = "";
         List<ArticleId> articleIdList = new ArrayList<>();
 
@@ -410,30 +499,45 @@ private void parsePubmedData(XMLStreamReader reader, Map<Field, String> fields,
                         }
                     }
                     case "ArticleId" -> {
-                        String idType = reader.getAttributeValue(null, "IdType");
+                        String idType = reader.getAttributeValue(
+                            null,
+                            "IdType"
+                        );
                         reader.next();
                         if (isCharacterXMLEvent(reader)) {
-                            articleIdList.add(new ArticleId(idType, reader.getText()));
+                            articleIdList.add(
+                                new ArticleId(idType, reader.getText())
+                            );
                         }
                     }
                 }
             }
 
-            if (isEndXMLEvent(reader) && reader.getName().getLocalPart().equals(startElement)) {
+            if (
+                isEndXMLEvent(reader) &&
+                reader.getName().getLocalPart().equals(startElement)
+            ) {
                 break;
             }
         }
 
         if (fields.get(new UnknownField("revised")) != null) {
-            putIfValueNotNull(fields, StandardField.PUBSTATE, publicationStatus);
+            putIfValueNotNull(
+                fields,
+                StandardField.PUBSTATE,
+                publicationStatus
+            );
             if (!articleIdList.isEmpty()) {
                 addArticleIdList(fields, articleIdList);
             }
         }
     }
 
-    private void parseMedlineCitation(XMLStreamReader reader, Map<Field, String> fields, String startElement)
-            throws XMLStreamException {
+    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<>();
         List<MeshHeading> meshHeadingList = new ArrayList<>();
@@ -462,13 +566,22 @@ private void parseMedlineCitation(XMLStreamReader reader, Map<Field, String> fie
                         parseArticleInformation(reader, fields);
                     }
                     case "PMID" -> {
-                        String versionStr = reader.getAttributeValue(null, "Version");
+                        String versionStr = reader.getAttributeValue(
+                            null,
+                            "Version"
+                        );
                         reader.next();
                         if (versionStr != null) {
                             int version = Integer.parseInt(versionStr);
-                            if (isCharacterXMLEvent(reader) && version > latestVersion) {
+                            if (
+                                isCharacterXMLEvent(reader) &&
+                                version > latestVersion
+                            ) {
                                 latestVersion = version;
-                                fields.put(StandardField.PMID, reader.getText());
+                                fields.put(
+                                    StandardField.PMID,
+                                    reader.getText()
+                                );
                             }
                         }
                     }
@@ -493,18 +606,31 @@ 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" -> {
-                        parsePersonalNameSubject(reader, personalNameSubjectList, elementName);
+                        parsePersonalNameSubject(
+                            reader,
+                            personalNameSubjectList,
+                            elementName
+                        );
                     }
                     case "OtherID" -> {
-                        String otherIdSource = reader.getAttributeValue(null, "Source");
+                        String otherIdSource = reader.getAttributeValue(
+                            null,
+                            "Source"
+                        );
                         reader.next();
                         if (isCharacterXMLEvent(reader)) {
                             String content = reader.getText();
-                            otherIdList.add(new OtherId(otherIdSource, content));
+                            otherIdList.add(
+                                new OtherId(otherIdSource, content)
+                            );
                         }
                     }
                     case "Keyword" -> {
@@ -520,7 +646,11 @@ private void parseMedlineCitation(XMLStreamReader reader, Map<Field, String> fie
                         }
                     }
                     case "Investigator" -> {
-                        parseInvestigator(reader, investigatorList, elementName);
+                        parseInvestigator(
+                            reader,
+                            investigatorList,
+                            elementName
+                        );
                     }
                     case "GeneralNote" -> {
                         reader.next();
@@ -531,28 +661,40 @@ private void parseMedlineCitation(XMLStreamReader reader, Map<Field, String> fie
                 }
             }
 
-            if (isEndXMLEvent(reader) && reader.getName().getLocalPart().equals(startElement)) {
+            if (
+                isEndXMLEvent(reader) &&
+                reader.getName().getLocalPart().equals(startElement)
+            ) {
                 break;
             }
         }
 
         // populate multiple occurrence fields
         if (!citationSubsets.isEmpty()) {
-            fields.put(new UnknownField("citation-subset"), String.join(", ", citationSubsets));
+            fields.put(
+                new UnknownField("citation-subset"),
+                String.join(", ", citationSubsets)
+            );
         }
         addMeshHeading(fields, meshHeadingList);
         addPersonalNames(fields, personalNameSubjectList);
         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)
-            throws XMLStreamException {
+    private void parseInvestigator(
+        XMLStreamReader reader,
+        List<Investigator> investigatorList,
+        String startElement
+    ) throws XMLStreamException {
         String lastName = "";
         String foreName = "";
         List<String> affiliationList = new ArrayList<>();
@@ -583,16 +725,24 @@ private void parseInvestigator(XMLStreamReader reader, List<Investigator> invest
                 }
             }
 
-            if (isEndXMLEvent(reader) && reader.getName().getLocalPart().equals(startElement)) {
+            if (
+                isEndXMLEvent(reader) &&
+                reader.getName().getLocalPart().equals(startElement)
+            ) {
                 break;
             }
         }
 
-        investigatorList.add(new Investigator(lastName, foreName, affiliationList));
+        investigatorList.add(
+            new Investigator(lastName, foreName, affiliationList)
+        );
     }
 
-    private void parsePersonalNameSubject(XMLStreamReader reader, List<PersonalNameSubject> personalNameSubjectList, String startElement)
-            throws XMLStreamException {
+    private void parsePersonalNameSubject(
+        XMLStreamReader reader,
+        List<PersonalNameSubject> personalNameSubjectList,
+        String startElement
+    ) throws XMLStreamException {
         String lastName = "";
         String foreName = "";
 
@@ -616,16 +766,24 @@ private void parsePersonalNameSubject(XMLStreamReader reader, List<PersonalNameS
                 }
             }
 
-            if (isEndXMLEvent(reader) && reader.getName().getLocalPart().equals(startElement)) {
+            if (
+                isEndXMLEvent(reader) &&
+                reader.getName().getLocalPart().equals(startElement)
+            ) {
                 break;
             }
         }
 
-        personalNameSubjectList.add(new PersonalNameSubject(lastName, foreName));
+        personalNameSubjectList.add(
+            new PersonalNameSubject(lastName, foreName)
+        );
     }
 
-    private void parseMeshHeading(XMLStreamReader reader, List<MeshHeading> meshHeadingList, String startElement)
-            throws XMLStreamException {
+    private void parseMeshHeading(
+        XMLStreamReader reader,
+        List<MeshHeading> meshHeadingList,
+        String startElement
+    ) throws XMLStreamException {
         String descriptorName = "";
         List<String> qualifierNames = new ArrayList<>();
 
@@ -649,7 +807,10 @@ private void parseMeshHeading(XMLStreamReader reader, List<MeshHeading> meshHead
                 }
             }
 
-            if (isEndXMLEvent(reader) && reader.getName().getLocalPart().equals(startElement)) {
+            if (
+                isEndXMLEvent(reader) &&
+                reader.getName().getLocalPart().equals(startElement)
+            ) {
                 break;
             }
         }
@@ -657,8 +818,11 @@ 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)
-            throws XMLStreamException {
+    private void parseGeneSymbolList(
+        XMLStreamReader reader,
+        Map<Field, String> fields,
+        String startElement
+    ) throws XMLStreamException {
         List<String> geneSymbols = new ArrayList<>();
 
         while (reader.hasNext()) {
@@ -673,18 +837,27 @@ private void parseGeneSymbolList(XMLStreamReader reader, Map<Field, String> fiel
                 }
             }
 
-            if (isEndXMLEvent(reader) && reader.getName().getLocalPart().equals(startElement)) {
+            if (
+                isEndXMLEvent(reader) &&
+                reader.getName().getLocalPart().equals(startElement)
+            ) {
                 break;
             }
         }
 
         if (!geneSymbols.isEmpty()) {
-            fields.put(new UnknownField("gene-symbols"), String.join(", ", geneSymbols));
+            fields.put(
+                new UnknownField("gene-symbols"),
+                String.join(", ", geneSymbols)
+            );
         }
     }
 
-    private void parseChemicalList(XMLStreamReader reader, Map<Field, String> fields, String startElement)
-            throws XMLStreamException {
+    private void parseChemicalList(
+        XMLStreamReader reader,
+        Map<Field, String> fields,
+        String startElement
+    ) throws XMLStreamException {
         List<String> chemicalNames = new ArrayList<>();
 
         while (reader.hasNext()) {
@@ -699,16 +872,25 @@ private void parseChemicalList(XMLStreamReader reader, Map<Field, String> fields
                 }
             }
 
-            if (isEndXMLEvent(reader) && reader.getName().getLocalPart().equals(startElement)) {
+            if (
+                isEndXMLEvent(reader) &&
+                reader.getName().getLocalPart().equals(startElement)
+            ) {
                 break;
             }
         }
 
-        fields.put(new UnknownField("chemicals"), String.join(", ", chemicalNames));
+        fields.put(
+            new UnknownField("chemicals"),
+            String.join(", ", chemicalNames)
+        );
     }
 
-    private void parseMedlineJournalInfo(XMLStreamReader reader, Map<Field, String> fields, String startElement)
-            throws XMLStreamException {
+    private void parseMedlineJournalInfo(
+        XMLStreamReader reader,
+        Map<Field, String> fields,
+        String startElement
+    ) throws XMLStreamException {
         while (reader.hasNext()) {
             reader.next();
             if (isStartXMLEvent(reader)) {
@@ -717,37 +899,59 @@ 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" -> {
                         reader.next();
                         if (isCharacterXMLEvent(reader)) {
-                            putIfValueNotNull(fields, new UnknownField("nlm-id"), reader.getText());
+                            putIfValueNotNull(
+                                fields,
+                                new UnknownField("nlm-id"),
+                                reader.getText()
+                            );
                         }
                     }
                     case "ISSNLinking" -> {
                         reader.next();
                         if (isCharacterXMLEvent(reader)) {
-                            putIfValueNotNull(fields, new UnknownField("issn-linking"), reader.getText());
+                            putIfValueNotNull(
+                                fields,
+                                new UnknownField("issn-linking"),
+                                reader.getText()
+                            );
                         }
                     }
                 }
             }
 
-            if (isEndXMLEvent(reader) && reader.getName().getLocalPart().equals(startElement)) {
+            if (
+                isEndXMLEvent(reader) &&
+                reader.getName().getLocalPart().equals(startElement)
+            ) {
                 break;
             }
         }
     }
 
-    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);
@@ -767,10 +971,18 @@ private void parseArticleInformation(XMLStreamReader reader, Map<Field, String>
                         addPagination(reader, fields, elementName);
                     }
                     case "ELocationID" -> {
-                        String eidType = reader.getAttributeValue(null, "EIdType");
-                        String validYN = reader.getAttributeValue(null, "ValidYN");
+                        String eidType = reader.getAttributeValue(
+                            null,
+                            "EIdType"
+                        );
+                        String validYN = reader.getAttributeValue(
+                            null,
+                            "ValidYN"
+                        );
                         reader.next();
-                        if (isCharacterXMLEvent(reader) && "Y".equals(validYN)) {
+                        if (
+                            isCharacterXMLEvent(reader) && "Y".equals(validYN)
+                        ) {
                             handleElocationId(fields, reader, eidType);
                         }
                     }
@@ -783,17 +995,26 @@ private void parseArticleInformation(XMLStreamReader reader, Map<Field, String>
                 }
             }
 
-            if (isEndXMLEvent(reader) && "Article".equals(reader.getName().getLocalPart())) {
+            if (
+                isEndXMLEvent(reader) &&
+                "Article".equals(reader.getName().getLocalPart())
+            ) {
                 break;
             }
         }
 
         if (!titleList.isEmpty()) {
-            fields.put(StandardField.TITLE, StringUtil.stripBrackets(String.join(" ", titleList)));
+            fields.put(
+                StandardField.TITLE,
+                StringUtil.stripBrackets(String.join(" ", titleList))
+            );
         }
     }
 
-    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)) {
@@ -802,25 +1023,41 @@ private void parseJournal(XMLStreamReader reader, Map<Field, String> fields) thr
                     case "Title" -> {
                         reader.next();
                         if (isCharacterXMLEvent(reader)) {
-                            putIfValueNotNull(fields, StandardField.JOURNAL, reader.getText());
+                            putIfValueNotNull(
+                                fields,
+                                StandardField.JOURNAL,
+                                reader.getText()
+                            );
                         }
                     }
                     case "ISSN" -> {
                         reader.next();
                         if (isCharacterXMLEvent(reader)) {
-                            putIfValueNotNull(fields, StandardField.ISSN, reader.getText());
+                            putIfValueNotNull(
+                                fields,
+                                StandardField.ISSN,
+                                reader.getText()
+                            );
                         }
                     }
                     case "Volume" -> {
                         reader.next();
                         if (isCharacterXMLEvent(reader)) {
-                            putIfValueNotNull(fields, StandardField.VOLUME, reader.getText());
+                            putIfValueNotNull(
+                                fields,
+                                StandardField.VOLUME,
+                                reader.getText()
+                            );
                         }
                     }
                     case "Issue" -> {
                         reader.next();
                         if (isCharacterXMLEvent(reader)) {
-                            putIfValueNotNull(fields, StandardField.ISSUE, reader.getText());
+                            putIfValueNotNull(
+                                fields,
+                                StandardField.ISSUE,
+                                reader.getText()
+                            );
                         }
                     }
                     case "PubDate" -> {
@@ -829,25 +1066,36 @@ private void parseJournal(XMLStreamReader reader, Map<Field, String> fields) thr
                 }
             }
 
-            if (isEndXMLEvent(reader) && "Journal".equals(reader.getName().getLocalPart())) {
+            if (
+                isEndXMLEvent(reader) &&
+                "Journal".equals(reader.getName().getLocalPart())
+            ) {
                 break;
             }
         }
     }
 
-    private void parseDate(XMLStreamReader reader, Map<Field, String> fields, String startElement)
-            throws XMLStreamException {
+    private void parseDate(
+        XMLStreamReader reader,
+        Map<Field, String> fields,
+        String startElement
+    ) throws XMLStreamException {
         Optional<String> year = Optional.empty();
         Optional<String> month = Optional.empty();
         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", ""
+            "DateCreated",
+            "created",
+            "DateCompleted",
+            "completed",
+            "DateRevised",
+            "revised",
+            "ContributionDate",
+            "contribution",
+            "PubDate",
+            ""
         );
 
         while (reader.hasNext()) {
@@ -876,29 +1124,51 @@ private void parseDate(XMLStreamReader reader, Map<Field, String> fields, String
                 }
             }
 
-            if (isEndXMLEvent(reader) && reader.getName().getLocalPart().equals(startElement)) {
+            if (
+                isEndXMLEvent(reader) &&
+                reader.getName().getLocalPart().equals(startElement)
+            ) {
                 break;
             }
         }
 
         Optional<Date> date = Date.parse(year, month, day);
         date.ifPresent(dateValue ->
-                fields.put(new UnknownField(dateFieldMap.get(startElement)), dateValue.getNormalized()));
+            fields.put(
+                new UnknownField(dateFieldMap.get(startElement)),
+                dateValue.getNormalized()
+            )
+        );
     }
 
-    private void addArticleIdList(Map<Field, String> fields, List<ArticleId> articleIdList) {
+    private void addArticleIdList(
+        Map<Field, String> fields,
+        List<ArticleId> articleIdList
+    ) {
         for (ArticleId id : articleIdList) {
             if (!id.idType().isBlank()) {
                 if ("pubmed".equals(id.idType())) {
-                    fields.computeIfAbsent(StandardField.PMID, k -> id.content());
+                    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()
+                    );
                 }
             }
         }
     }
 
-    private void addNotes(Map<Field, String> fields, List<String> generalNoteList) {
+    private void addNotes(
+        Map<Field, String> fields,
+        List<String> generalNoteList
+    ) {
         List<String> notes = new ArrayList<>();
 
         for (String note : generalNoteList) {
@@ -912,14 +1182,19 @@ private void addNotes(Map<Field, String> fields, List<String> generalNoteList) {
         }
     }
 
-    private void addInvestigators(Map<Field, String> fields, List<Investigator> investigatorList) {
+    private void addInvestigators(
+        Map<Field, String> fields,
+        List<Investigator> investigatorList
+    ) {
         List<String> investigatorNames = new ArrayList<>();
         List<String> affiliationInfos = new ArrayList<>();
 
         // add the investigators like the authors
         if (!investigatorList.isEmpty()) {
             for (Investigator investigator : investigatorList) {
-                StringBuilder result = new StringBuilder(investigator.lastName());
+                StringBuilder result = new StringBuilder(
+                    investigator.lastName()
+                );
                 if (!investigator.foreName().isBlank()) {
                     result.append(", ").append(investigator.foreName());
                 }
@@ -932,60 +1207,99 @@ private void addInvestigators(Map<Field, String> fields, List<Investigator> inve
             }
 
             if (!affiliationInfos.isEmpty()) {
-                fields.put(new UnknownField("affiliation"), String.join(", ", affiliationInfos));
+                fields.put(
+                    new UnknownField("affiliation"),
+                    String.join(", ", affiliationInfos)
+                );
             }
 
-            fields.put(new UnknownField("investigator"), String.join(" and ", investigatorNames));
+            fields.put(
+                new UnknownField("investigator"),
+                String.join(" and ", investigatorNames)
+            );
         }
     }
 
-    private void addKeywords(Map<Field, String> fields, List<String> keywordList) {
+    private void addKeywords(
+        Map<Field, String> fields,
+        List<String> keywordList
+    ) {
         // Check whether MeshHeadingList exists or not
         if (fields.get(StandardField.KEYWORDS) == null) {
-            fields.put(StandardField.KEYWORDS, String.join(KEYWORD_SEPARATOR, keywordList));
+            fields.put(
+                StandardField.KEYWORDS,
+                String.join(KEYWORD_SEPARATOR, keywordList)
+            );
         } else {
             if (!keywordList.isEmpty()) {
                 // if it exists, combine the MeshHeading with the keywords
                 String result = String.join("; ", keywordList);
-                result = fields.get(StandardField.KEYWORDS) + KEYWORD_SEPARATOR + result;
+                result =
+                    fields.get(StandardField.KEYWORDS) +
+                    KEYWORD_SEPARATOR +
+                    result;
                 fields.put(StandardField.KEYWORDS, result);
             }
         }
     }
 
-    private void addOtherId(Map<Field, String> fields, List<OtherId> otherIdList) {
+    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<>();
 
             if (!personalNameSubjectList.isEmpty()) {
                 for (PersonalNameSubject personalNameSubject : personalNameSubjectList) {
-                    StringBuilder result = new StringBuilder(personalNameSubject.lastName());
+                    StringBuilder result = new StringBuilder(
+                        personalNameSubject.lastName()
+                    );
                     if (!personalNameSubject.foreName().isBlank()) {
-                        result.append(", ").append(personalNameSubject.foreName());
+                        result
+                            .append(", ")
+                            .append(personalNameSubject.foreName());
                     }
                     personalNames.add(result.toString());
                 }
 
-                fields.put(StandardField.AUTHOR, String.join(" and ", personalNames));
+                fields.put(
+                    StandardField.AUTHOR,
+                    String.join(" and ", personalNames)
+                );
             }
         }
     }
 
-    private void addMeshHeading(Map<Field, String> fields, List<MeshHeading> meshHeadingList) {
+    private void addMeshHeading(
+        Map<Field, String> fields,
+        List<MeshHeading> meshHeadingList
+    ) {
         List<String> keywords = new ArrayList<>();
 
         if (!meshHeadingList.isEmpty()) {
             for (MeshHeading meshHeading : meshHeadingList) {
-                StringBuilder result = new StringBuilder(meshHeading.descriptorName());
+                StringBuilder result = new StringBuilder(
+                    meshHeading.descriptorName()
+                );
                 if (meshHeading.qualifierNames() != null) {
                     for (String qualifierName : meshHeading.qualifierNames()) {
                         result.append(", ").append(qualifierName);
@@ -994,11 +1308,18 @@ private void addMeshHeading(Map<Field, String> fields, List<MeshHeading> meshHea
                 keywords.add(result.toString());
             }
 
-            fields.put(StandardField.KEYWORDS, String.join(KEYWORD_SEPARATOR, keywords));
+            fields.put(
+                StandardField.KEYWORDS,
+                String.join(KEYWORD_SEPARATOR, keywords)
+            );
         }
     }
 
-    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)) {
@@ -1007,7 +1328,10 @@ private void addPubDate(XMLStreamReader reader, Map<Field, String> fields, Strin
                     case "MedlineDate" -> {
                         reader.next();
                         if (isCharacterXMLEvent(reader)) {
-                            fields.put(StandardField.YEAR, extractYear(reader.getText()));
+                            fields.put(
+                                StandardField.YEAR,
+                                extractYear(reader.getText())
+                            );
                         }
                     }
                     case "Year" -> {
@@ -1019,27 +1343,43 @@ private void addPubDate(XMLStreamReader reader, Map<Field, String> fields, Strin
                     case "Month" -> {
                         reader.next();
                         if (isCharacterXMLEvent(reader)) {
-                            Optional<Month> month = Month.parse(reader.getText());
-                            month.ifPresent(monthValue -> fields.put(StandardField.MONTH, monthValue.getJabRefFormat()));
+                            Optional<Month> month = Month.parse(
+                                reader.getText()
+                            );
+                            month.ifPresent(monthValue ->
+                                fields.put(
+                                    StandardField.MONTH,
+                                    monthValue.getJabRefFormat()
+                                )
+                            );
                         }
                     }
                     case "Season" -> {
                         reader.next();
                         if (isCharacterXMLEvent(reader)) {
-                            fields.put(new UnknownField("season"), reader.getText());
+                            fields.put(
+                                new UnknownField("season"),
+                                reader.getText()
+                            );
                         }
                     }
                 }
             }
 
-            if (isEndXMLEvent(reader) && reader.getName().getLocalPart().equals(startElement)) {
+            if (
+                isEndXMLEvent(reader) &&
+                reader.getName().getLocalPart().equals(startElement)
+            ) {
                 break;
             }
         }
     }
 
-    private void addAbstract(XMLStreamReader reader, Map<Field, String> fields, String startElement)
-            throws XMLStreamException {
+    private void addAbstract(
+        XMLStreamReader reader,
+        Map<Field, String> fields,
+        String startElement
+    ) throws XMLStreamException {
         List<String> abstractTextList = new ArrayList<>();
 
         while (reader.hasNext()) {
@@ -1050,22 +1390,36 @@ 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" -> {
-                        handleTextElement(reader, abstractTextList, elementName);
+                        handleTextElement(
+                            reader,
+                            abstractTextList,
+                            elementName
+                        );
                     }
                 }
             }
 
-            if (isEndXMLEvent(reader) && reader.getName().getLocalPart().equals(startElement)) {
+            if (
+                isEndXMLEvent(reader) &&
+                reader.getName().getLocalPart().equals(startElement)
+            ) {
                 break;
             }
         }
 
         if (!abstractTextList.isEmpty()) {
-            fields.put(StandardField.ABSTRACT, String.join(" ", abstractTextList));
+            fields.put(
+                StandardField.ABSTRACT,
+                String.join(" ", abstractTextList)
+            );
         }
     }
 
@@ -1074,8 +1428,11 @@ 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)
-            throws XMLStreamException {
+    private void handleTextElement(
+        XMLStreamReader reader,
+        List<String> textList,
+        String startElement
+    ) throws XMLStreamException {
         StringBuilder result = new StringBuilder();
 
         while (reader.hasNext()) {
@@ -1089,7 +1446,10 @@ private void handleTextElement(XMLStreamReader reader, List<String> textList, St
                     case "sup", "sub" -> {
                         reader.next();
                         if (isCharacterXMLEvent(reader)) {
-                            result.append("(").append(reader.getText()).append(")");
+                            result
+                                .append("(")
+                                .append(reader.getText())
+                                .append(")");
                         }
                     }
                 }
@@ -1097,7 +1457,10 @@ private void handleTextElement(XMLStreamReader reader, List<String> textList, St
                 result.append(reader.getText().trim()).append(" ");
             }
 
-            if (isEndXMLEvent(reader) && reader.getName().getLocalPart().equals(startElement)) {
+            if (
+                isEndXMLEvent(reader) &&
+                reader.getName().getLocalPart().equals(startElement)
+            ) {
                 break;
             }
         }
@@ -1105,8 +1468,11 @@ 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)
-            throws XMLStreamException {
+    private void addPagination(
+        XMLStreamReader reader,
+        Map<Field, String> fields,
+        String startElement
+    ) throws XMLStreamException {
         String startPage = "";
         String endPage = "";
 
@@ -1118,7 +1484,11 @@ 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" -> {
@@ -1126,7 +1496,11 @@ private void addPagination(XMLStreamReader reader, Map<Field, String> fields, St
                         if (isCharacterXMLEvent(reader)) {
                             // it could happen, that the article has only a start page
                             startPage = reader.getText() + endPage;
-                            putIfValueNotNull(fields, StandardField.PAGES, startPage);
+                            putIfValueNotNull(
+                                fields,
+                                StandardField.PAGES,
+                                startPage
+                            );
                         }
                     }
                     case "EndPage" -> {
@@ -1134,13 +1508,19 @@ 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)
+                            );
                         }
                     }
                 }
             }
 
-            if (isEndXMLEvent(reader) && reader.getName().getLocalPart().equals(startElement)) {
+            if (
+                isEndXMLEvent(reader) &&
+                reader.getName().getLocalPart().equals(startElement)
+            ) {
                 break;
             }
         }
@@ -1151,7 +1531,11 @@ 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()) {
@@ -1165,7 +1549,10 @@ private void handleAuthorList(XMLStreamReader reader, Map<Field, String> fields,
                 }
             }
 
-            if (isEndXMLEvent(reader) && reader.getName().getLocalPart().equals(startElement)) {
+            if (
+                isEndXMLEvent(reader) &&
+                reader.getName().getLocalPart().equals(startElement)
+            ) {
                 break;
             }
         }
@@ -1173,7 +1560,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<>();
 
@@ -1203,7 +1591,10 @@ private void parseAuthor(XMLStreamReader reader, List<String> authorNames) throw
                 }
             }
 
-            if (isEndXMLEvent(reader) && "Author".equals(reader.getName().getLocalPart())) {
+            if (
+                isEndXMLEvent(reader) &&
+                "Author".equals(reader.getName().getLocalPart())
+            ) {
                 break;
             }
         }
@@ -1216,7 +1607,11 @@ private void parseAuthor(XMLStreamReader reader, List<String> authorNames) throw
         }
     }
 
-    private void putIfValueNotNull(Map<Field, String> fields, Field field, String value) {
+    private void putIfValueNotNull(
+        Map<Field, String> fields,
+        Field field,
+        String value
+    ) {
         if (value != null) {
             fields.put(field, value);
         }
@@ -1236,7 +1631,9 @@ private String fixPageRange(String pageRange) {
         int lengthOfEndPage = endPage.length();
         int lengthOfStartPage = startPage.length();
         if (lengthOfEndPage < lengthOfStartPage) {
-            endPage = startPage.substring(0, lengthOfStartPage - lengthOfEndPage) + endPage;
+            endPage =
+                startPage.substring(0, lengthOfStartPage - lengthOfEndPage) +
+                endPage;
         }
         return startPage + "--" + endPage;
     }
@@ -1254,10 +1651,16 @@ private boolean isEndXMLEvent(XMLStreamReader reader) {
     }
 
     @Override
-    public List<BibEntry> parseEntries(InputStream inputStream) throws ParseException {
+    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 d18b4311237..6d4f869d128 100644
--- a/src/main/java/org/jabref/logic/importer/fileformat/MedlinePlainImporter.java
+++ b/src/main/java/org/jabref/logic/importer/fileformat/MedlinePlainImporter.java
@@ -8,7 +8,6 @@
 import java.util.Locale;
 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.util.OS;
@@ -31,8 +30,12 @@ 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 COMPLETE_DATE_PATTERN = Pattern.compile("\\d{8}");
+    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}"
+    );
 
     @Override
     public String getName() {
@@ -55,14 +58,17 @@ public String getId() {
     }
 
     @Override
-    public boolean isRecognizedFormat(BufferedReader reader) throws IOException {
-
+    public boolean isRecognizedFormat(BufferedReader reader)
+        throws IOException {
         // Our strategy is to look for the "PMID  - *", "PMC.*-.*", or "PMCR.*-.*" line
         // (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()
-                    || PMCR_PATTERN.matcher(str).find()) {
+            if (
+                PMID_PATTERN.matcher(str).find() ||
+                PMC_PATTERN.matcher(str).find() ||
+                PMCR_PATTERN.matcher(str).find()
+            ) {
                 return true;
             }
         }
@@ -70,14 +76,21 @@ public boolean isRecognizedFormat(BufferedReader reader) throws IOException {
     }
 
     @Override
-    public ParserResult importDatabase(BufferedReader reader) throws IOException {
+    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("-")) {
@@ -102,7 +115,12 @@ public ParserResult importDatabase(BufferedReader reader) throws IOException {
                         continue;
                     }
                     if (lines[j + 1].charAt(4) != '-') {
-                        if ((current.length() > 0) && !Character.isWhitespace(current.charAt(current.length() - 1))) {
+                        if (
+                            (current.length() > 0) &&
+                            !Character.isWhitespace(
+                                current.charAt(current.length() - 1)
+                            )
+                        ) {
                             current.append(' ');
                         }
                         current.append(lines[j + 1].trim());
@@ -177,24 +195,57 @@ public ParserResult importDatabase(BufferedReader reader) throws IOException {
                     }
                 }
 
-                if ("IRAD".equals(label) || "IR".equals(label) || "FIR".equals(label)) {
-                    String oldInvestigator = fieldConversionMap.get(new UnknownField("investigator"));
+                if (
+                    "IRAD".equals(label) ||
+                    "IR".equals(label) ||
+                    "FIR".equals(label)
+                ) {
+                    String oldInvestigator = fieldConversionMap.get(
+                        new UnknownField("investigator")
+                    );
                     if (oldInvestigator == null) {
-                        fieldConversionMap.put(new UnknownField("investigator"), value);
+                        fieldConversionMap.put(
+                            new UnknownField("investigator"),
+                            value
+                        );
                     } else {
-                        fieldConversionMap.put(new UnknownField("investigator"), oldInvestigator + ", " + value);
+                        fieldConversionMap.put(
+                            new UnknownField("investigator"),
+                            oldInvestigator + ", " + value
+                        );
                     }
                 } else if ("MH".equals(label) || "OT".equals(label)) {
-                    if (!fieldConversionMap.containsKey(StandardField.KEYWORDS)) {
+                    if (
+                        !fieldConversionMap.containsKey(StandardField.KEYWORDS)
+                    ) {
                         fieldConversionMap.put(StandardField.KEYWORDS, value);
                     } else {
-                        String kw = fieldConversionMap.get(StandardField.KEYWORDS);
-                        fieldConversionMap.put(StandardField.KEYWORDS, kw + ", " + value);
+                        String kw = fieldConversionMap.get(
+                            StandardField.KEYWORDS
+                        );
+                        fieldConversionMap.put(
+                            StandardField.KEYWORDS,
+                            kw + ", " + value
+                        );
                     }
-                } else if ("CON".equals(label) || "CIN".equals(label) || "EIN".equals(label) || "EFR".equals(label)
-                        || "CRI".equals(label) || "CRF".equals(label) || "PRIN".equals(label) || "PROF".equals(label)
-                        || "RPI".equals(label) || "RPF".equals(label) || "RIN".equals(label) || "ROF".equals(label)
-                        || "UIN".equals(label) || "UOF".equals(label) || "SPIN".equals(label) || "ORI".equals(label)) {
+                } else if (
+                    "CON".equals(label) ||
+                    "CIN".equals(label) ||
+                    "EIN".equals(label) ||
+                    "EFR".equals(label) ||
+                    "CRI".equals(label) ||
+                    "CRF".equals(label) ||
+                    "PRIN".equals(label) ||
+                    "PROF".equals(label) ||
+                    "RPI".equals(label) ||
+                    "RPF".equals(label) ||
+                    "RIN".equals(label) ||
+                    "ROF".equals(label) ||
+                    "UIN".equals(label) ||
+                    "UOF".equals(label) ||
+                    "SPIN".equals(label) ||
+                    "ORI".equals(label)
+                ) {
                     if (!comment.isEmpty()) {
                         comment = comment + "\n";
                     }
@@ -248,7 +299,11 @@ private EntryType addSourceType(String value, EntryType type) {
         }
     }
 
-    private void addStandardNumber(Map<Field, String> hm, String lab, String value) {
+    private void addStandardNumber(
+        Map<Field, String> hm,
+        String lab,
+        String value
+    ) {
         if ("IS".equals(lab)) {
             Field key = StandardField.ISSN;
             // it is possible to have two issn, one for electronic and for print
@@ -257,7 +312,10 @@ private void addStandardNumber(Map<Field, String> hm, String lab, String value)
             if (value.indexOf('(') > 0) {
                 int keyStart = value.indexOf('(');
                 int keyEnd = value.indexOf(')');
-                key = new UnknownField(value.substring(keyStart + 1, keyEnd) + "-" + key);
+                key =
+                    new UnknownField(
+                        value.substring(keyStart + 1, keyEnd) + "-" + key
+                    );
                 String numberValue = value.substring(0, keyStart - 1);
                 hm.put(key, numberValue);
             } else {
@@ -285,7 +343,11 @@ 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);
@@ -302,13 +364,22 @@ private void addIDs(Map<Field, String> hm, String lab, String value) {
         }
     }
 
-    private void addTitles(Map<Field, String> hm, String lab, String val, EntryType type) {
+    private void addTitles(
+        Map<Field, String> hm,
+        String lab,
+        String val,
+        EntryType type
+    ) {
         if ("TI".equals(lab)) {
             String oldVal = hm.get(StandardField.TITLE);
             if (oldVal == null) {
                 hm.put(StandardField.TITLE, val);
             } else {
-                if (oldVal.endsWith(":") || oldVal.endsWith(".") || oldVal.endsWith("?")) {
+                if (
+                    oldVal.endsWith(":") ||
+                    oldVal.endsWith(".") ||
+                    oldVal.endsWith("?")
+                ) {
                     hm.put(StandardField.TITLE, oldVal + " " + val);
                 } else {
                     hm.put(StandardField.TITLE, oldVal + ": " + val);
@@ -340,7 +411,9 @@ private void addAbstract(Map<Field, String> hm, String lab, String value) {
             if (value.contains("Copyright")) {
                 int copyrightIndex = value.lastIndexOf("Copyright");
                 // remove the copyright from the field since the name of the field is copyright
-                String copyrightInfo = value.substring(copyrightIndex).replace("Copyright ", "");
+                String copyrightInfo = value
+                    .substring(copyrightIndex)
+                    .replace("Copyright ", "");
                 hm.put(new UnknownField("copyright"), copyrightInfo);
                 abstractValue = value.substring(0, copyrightIndex);
             } else {
@@ -350,7 +423,10 @@ private void addAbstract(Map<Field, String> hm, String lab, String value) {
             if (oldAb == null) {
                 hm.put(StandardField.ABSTRACT, abstractValue);
             } else {
-                hm.put(StandardField.ABSTRACT, oldAb + OS.NEWLINE + abstractValue);
+                hm.put(
+                    StandardField.ABSTRACT,
+                    oldAb + OS.NEWLINE + abstractValue
+                );
             }
         } else if ("OAB".equals(lab) || "OABL".equals(lab)) {
             hm.put(new UnknownField("other-abstract"), value);
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 8eabc76cc7d..3d2d9a7fafa 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,6 @@
 package org.jabref.logic.importer.fileformat;
 
+import com.google.common.base.Joiner;
 import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.InputStream;
@@ -16,12 +17,10 @@
 import java.util.Set;
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;
-
 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;
@@ -38,8 +37,6 @@
 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;
 
@@ -50,14 +47,20 @@
  */
 public class ModsImporter extends Importer implements Parser {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(ModsImporter.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(
+        ModsImporter.class
+    );
     private static final Pattern MODS_PATTERN = Pattern.compile("<mods .*>");
 
     private final String keywordSeparator;
     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
@@ -67,16 +70,21 @@ public ModsImporter(ImportFormatPreferences importFormatPreferences) {
 
     @Override
     public boolean isRecognizedFormat(BufferedReader input) throws IOException {
-        return input.lines().anyMatch(line -> MODS_PATTERN.matcher(line).find());
+        return input
+            .lines()
+            .anyMatch(line -> MODS_PATTERN.matcher(line).find());
     }
 
     @Override
-    public ParserResult importDatabase(BufferedReader input) throws IOException {
+    public ParserResult importDatabase(BufferedReader input)
+        throws IOException {
         Objects.requireNonNull(input);
 
         List<BibEntry> bibItems = new ArrayList<>();
         try {
-            XMLStreamReader reader = xmlInputFactory.createXMLStreamReader(input);
+            XMLStreamReader reader = xmlInputFactory.createXMLStreamReader(
+                input
+            );
             parseModsCollection(bibItems, reader);
         } catch (XMLStreamException e) {
             LOGGER.debug("could not parse document", e);
@@ -86,10 +94,16 @@ 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())) {
+            if (
+                isStartXMLEvent(reader) &&
+                "mods".equals(reader.getName().getLocalPart())
+            ) {
                 BibEntry entry = new BibEntry();
                 Map<Field, String> fields = new HashMap<>();
 
@@ -106,7 +120,11 @@ 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<>();
@@ -122,13 +140,21 @@ private void parseModsGroup(Map<Field, String> fields, XMLStreamReader reader, B
                     case "abstract" -> {
                         reader.next();
                         if (isCharacterXMLEvent(reader)) {
-                            putIfValueNotNull(fields, StandardField.ABSTRACT, reader.getText());
+                            putIfValueNotNull(
+                                fields,
+                                StandardField.ABSTRACT,
+                                reader.getText()
+                            );
                         }
                     }
                     case "genre" -> {
                         reader.next();
                         if (isCharacterXMLEvent(reader)) {
-                            entry.setType(EntryTypeFactory.parse(mapGenre(reader.getText())));
+                            entry.setType(
+                                EntryTypeFactory.parse(
+                                    mapGenre(reader.getText())
+                                )
+                            );
                         }
                     }
                     case "language" -> {
@@ -141,7 +167,11 @@ private void parseModsGroup(Map<Field, String> fields, XMLStreamReader reader, B
                         String type = reader.getAttributeValue(null, "type");
                         reader.next();
                         if (isCharacterXMLEvent(reader)) {
-                            parseIdentifier(fields, new Identifier(type, reader.getText()), entry);
+                            parseIdentifier(
+                                fields,
+                                new Identifier(type, reader.getText()),
+                                entry
+                            );
                         }
                     }
                     case "note" -> {
@@ -171,13 +201,21 @@ private void parseModsGroup(Map<Field, String> fields, XMLStreamReader reader, B
                 }
             }
 
-            if (isEndXMLEvent(reader) && "mods".equals(reader.getName().getLocalPart())) {
+            if (
+                isEndXMLEvent(reader) &&
+                "mods".equals(reader.getName().getLocalPart())
+            ) {
                 break;
             }
         }
 
         putIfListIsNotEmpty(fields, notes, StandardField.NOTE, ", ");
-        putIfListIsNotEmpty(fields, keywords, StandardField.KEYWORDS, this.keywordSeparator);
+        putIfListIsNotEmpty(
+            fields,
+            keywords,
+            StandardField.KEYWORDS,
+            this.keywordSeparator
+        );
         putIfListIsNotEmpty(fields, authors, StandardField.AUTHOR, " and ");
     }
 
@@ -187,7 +225,10 @@ 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)) {
@@ -195,7 +236,11 @@ private void parseRelatedItem(XMLStreamReader reader, Map<Field, String> fields)
                     case "title" -> {
                         reader.next();
                         if (isCharacterXMLEvent(reader)) {
-                            putIfValueNotNull(fields, StandardField.JOURNAL, reader.getText());
+                            putIfValueNotNull(
+                                fields,
+                                StandardField.JOURNAL,
+                                reader.getText()
+                            );
                         }
                     }
                     case "detail" -> {
@@ -207,13 +252,19 @@ private void parseRelatedItem(XMLStreamReader reader, Map<Field, String> fields)
                 }
             }
 
-            if (isEndXMLEvent(reader) && "relatedItem".equals(reader.getName().getLocalPart())) {
+            if (
+                isEndXMLEvent(reader) &&
+                "relatedItem".equals(reader.getName().getLocalPart())
+            ) {
                 break;
             }
         }
     }
 
-    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 = "";
@@ -243,7 +294,10 @@ private void handleExtent(XMLStreamReader reader, Map<Field, String> fields) thr
                 }
             }
 
-            if (isEndXMLEvent(reader) && "extent".equals(reader.getName().getLocalPart())) {
+            if (
+                isEndXMLEvent(reader) &&
+                "extent".equals(reader.getName().getLocalPart())
+            ) {
                 break;
             }
         }
@@ -260,7 +314,10 @@ private void handleExtent(XMLStreamReader reader, Map<Field, String> fields) thr
         }
     }
 
-    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");
 
@@ -268,21 +325,34 @@ private void handleDetail(XMLStreamReader reader, Map<Field, String> fields) thr
             reader.next();
 
             if (isStartXMLEvent(reader)) {
-                if (detailElementSet.contains(reader.getName().getLocalPart())) {
+                if (
+                    detailElementSet.contains(reader.getName().getLocalPart())
+                ) {
                     reader.next();
                     if (isCharacterXMLEvent(reader)) {
-                        putIfValueNotNull(fields, FieldFactory.parseField(type), reader.getText());
+                        putIfValueNotNull(
+                            fields,
+                            FieldFactory.parseField(type),
+                            reader.getText()
+                        );
                     }
                 }
             }
 
-            if (isEndXMLEvent(reader) && "detail".equals(reader.getName().getLocalPart())) {
+            if (
+                isEndXMLEvent(reader) &&
+                "detail".equals(reader.getName().getLocalPart())
+            ) {
                 break;
             }
         }
     }
 
-    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()) {
@@ -292,7 +362,11 @@ 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");
@@ -303,7 +377,10 @@ private void parseName(XMLStreamReader reader, Map<Field, String> fields, List<S
                 }
             }
 
-            if (isEndXMLEvent(reader) && "name".equals(reader.getName().getLocalPart())) {
+            if (
+                isEndXMLEvent(reader) &&
+                "name".equals(reader.getName().getLocalPart())
+            ) {
                 break;
             }
         }
@@ -311,7 +388,10 @@ 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()) {
@@ -323,28 +403,46 @@ 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" -> {
                         reader.next();
                         if (isCharacterXMLEvent(reader)) {
-                            appendIfValueNotNullOrBlank(places, reader.getText());
+                            appendIfValueNotNullOrBlank(
+                                places,
+                                reader.getText()
+                            );
                         }
                     }
                     case "publisher" -> {
                         reader.next();
                         if (isCharacterXMLEvent(reader)) {
-                            putIfValueNotNull(fields, StandardField.PUBLISHER, reader.getText());
+                            putIfValueNotNull(
+                                fields,
+                                StandardField.PUBLISHER,
+                                reader.getText()
+                            );
                         }
                     }
                     case "edition" -> {
                         reader.next();
                         if (isCharacterXMLEvent(reader)) {
-                            putIfValueNotNull(fields, StandardField.EDITION, reader.getText());
+                            putIfValueNotNull(
+                                fields,
+                                StandardField.EDITION,
+                                reader.getText()
+                            );
                         }
                     }
-                    case "dateIssued", "dateCreated", "dateCaptured", "dateModified" -> {
+                    case "dateIssued",
+                        "dateCreated",
+                        "dateCaptured",
+                        "dateModified" -> {
                         reader.next();
                         if (isCharacterXMLEvent(reader)) {
                             putDate(fields, elementName, reader.getText());
@@ -353,7 +451,10 @@ private void parseOriginInfo(XMLStreamReader reader, Map<Field, String> fields)
                 }
             }
 
-            if (isEndXMLEvent(reader) && "originInfo".equals(reader.getName().getLocalPart())) {
+            if (
+                isEndXMLEvent(reader) &&
+                "originInfo".equals(reader.getName().getLocalPart())
+            ) {
                 break;
             }
         }
@@ -361,7 +462,11 @@ 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();
 
@@ -376,25 +481,39 @@ private void parseSubject(XMLStreamReader reader, Map<Field, String> fields, Lis
                     case "city" -> {
                         reader.next();
                         if (isCharacterXMLEvent(reader)) {
-                            putIfValueNotNull(fields, new UnknownField("city"), reader.getText());
+                            putIfValueNotNull(
+                                fields,
+                                new UnknownField("city"),
+                                reader.getText()
+                            );
                         }
                     }
                     case "country" -> {
                         reader.next();
                         if (isCharacterXMLEvent(reader)) {
-                            putIfValueNotNull(fields, new UnknownField("country"), reader.getText());
+                            putIfValueNotNull(
+                                fields,
+                                new UnknownField("country"),
+                                reader.getText()
+                            );
                         }
                     }
                 }
             }
 
-            if (isEndXMLEvent(reader) && "subject".equals(reader.getName().getLocalPart())) {
+            if (
+                isEndXMLEvent(reader) &&
+                "subject".equals(reader.getName().getLocalPart())
+            ) {
                 break;
             }
         }
     }
 
-    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();
@@ -403,12 +522,18 @@ private void parseRecordInfo(XMLStreamReader reader, Map<Field, String> fields)
             reader.next();
 
             if (isStartXMLEvent(reader)) {
-                if (RecordInfo.elementNameSet.contains(reader.getName().getLocalPart())) {
+                if (
+                    RecordInfo.elementNameSet.contains(
+                        reader.getName().getLocalPart()
+                    )
+                ) {
                     reader.next();
                     if (isCharacterXMLEvent(reader)) {
                         recordContents.add(0, reader.getText());
                     }
-                } else if ("languageTerm".equals(reader.getName().getLocalPart())) {
+                } else if (
+                    "languageTerm".equals(reader.getName().getLocalPart())
+                ) {
                     reader.next();
                     if (isCharacterXMLEvent(reader)) {
                         languages.add(reader.getText());
@@ -416,52 +541,86 @@ private void parseRecordInfo(XMLStreamReader reader, Map<Field, String> fields)
                 }
             }
 
-            if (isEndXMLEvent(reader) && "recordInfo".equals(reader.getName().getLocalPart())) {
+            if (
+                isEndXMLEvent(reader) &&
+                "recordInfo".equals(reader.getName().getLocalPart())
+            ) {
                 break;
             }
         }
 
         for (String recordContent : recordContents) {
-            putIfValueNotNull(fields, new UnknownField("source"), recordContent);
+            putIfValueNotNull(
+                fields,
+                new UnknownField("source"),
+                recordContent
+            );
         }
         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();
 
-            if (isStartXMLEvent(reader) && "languageTerm".equals(reader.getName().getLocalPart())) {
+            if (
+                isStartXMLEvent(reader) &&
+                "languageTerm".equals(reader.getName().getLocalPart())
+            ) {
                 reader.next();
                 if (isCharacterXMLEvent(reader)) {
-                    putIfValueNotNull(fields, StandardField.LANGUAGE, reader.getText());
+                    putIfValueNotNull(
+                        fields,
+                        StandardField.LANGUAGE,
+                        reader.getText()
+                    );
                 }
             }
 
-            if (isEndXMLEvent(reader) && "language".equals(reader.getName().getLocalPart())) {
+            if (
+                isEndXMLEvent(reader) &&
+                "language".equals(reader.getName().getLocalPart())
+            ) {
                 break;
             }
         }
     }
 
-    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();
 
-            if (isStartXMLEvent(reader) && "title".equals(reader.getName().getLocalPart())) {
+            if (
+                isStartXMLEvent(reader) &&
+                "title".equals(reader.getName().getLocalPart())
+            ) {
                 reader.next();
                 if (isCharacterXMLEvent(reader)) {
-                    putIfValueNotNull(fields, StandardField.TITLE, reader.getText());
+                    putIfValueNotNull(
+                        fields,
+                        StandardField.TITLE,
+                        reader.getText()
+                    );
                 }
             }
 
-            if (isEndXMLEvent(reader) && "titleInfo".equals(reader.getName().getLocalPart())) {
+            if (
+                isEndXMLEvent(reader) &&
+                "titleInfo".equals(reader.getName().getLocalPart())
+            ) {
                 break;
             }
         }
     }
 
-    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<>();
 
@@ -469,7 +628,9 @@ private void parseLocationAndUrl(XMLStreamReader reader, Map<Field, String> fiel
             reader.next();
 
             if (isStartXMLEvent(reader)) {
-                if ("physicalLocation".equals(reader.getName().getLocalPart())) {
+                if (
+                    "physicalLocation".equals(reader.getName().getLocalPart())
+                ) {
                     reader.next();
                     if (isCharacterXMLEvent(reader)) {
                         locations.add(reader.getText());
@@ -482,7 +643,10 @@ private void parseLocationAndUrl(XMLStreamReader reader, Map<Field, String> fiel
                 }
             }
 
-            if (isEndXMLEvent(reader) && "location".equals(reader.getName().getLocalPart())) {
+            if (
+                isEndXMLEvent(reader) &&
+                "location".equals(reader.getName().getLocalPart())
+            ) {
                 break;
             }
         }
@@ -496,59 +660,108 @@ private String mapGenre(String genre) {
             case "conference publication" -> "proceedings";
             case "database" -> "dataset";
             case "yearbook", "handbook" -> "book";
-            case "law report or digest", "technical report", "reporting" -> "report";
+            case "law report or digest",
+                "technical report",
+                "reporting" -> "report";
             default -> genre;
         };
     }
 
-    private void parseIdentifier(Map<Field, String> fields, Identifier identifier, BibEntry entry) {
+    private void parseIdentifier(
+        Map<Field, String> fields,
+        Identifier identifier,
+        BibEntry entry
+    ) {
         String type = identifier.type();
         if ("citekey".equals(type) && entry.getCitationKey().isEmpty()) {
             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()
+            );
         }
     }
 
-    private void putDate(Map<Field, String> fields, String elementName, String date) {
+    private void putDate(
+        Map<Field, String> fields,
+        String elementName,
+        String date
+    ) {
         if (date != null) {
             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)
-                            .ifPresent(year -> fields.put(StandardField.YEAR, year.toString()));
+                    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
-                    fields.computeIfAbsent(StandardField.YEAR, k -> date.substring(0, 4));
+                    fields.computeIfAbsent(
+                        StandardField.YEAR,
+                        k -> date.substring(0, 4)
+                    );
                     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)));
+            fields.put(
+                key,
+                list.stream().collect(Collectors.joining(separator))
+            );
         }
     }
 
-    private void handleAuthorsInNamePart(List<Name> names, List<String> authors) {
+    private void handleAuthorsInNamePart(
+        List<Name> names,
+        List<String> authors
+    ) {
         List<String> foreName = new ArrayList<>();
         String familyName = "";
         String author = "";
@@ -588,7 +801,11 @@ private void handleAuthorsInNamePart(List<Name> names, List<String> authors) {
         }
     }
 
-    private void putIfValueNotNull(Map<Field, String> fields, Field field, String value) {
+    private void putIfValueNotNull(
+        Map<Field, String> fields,
+        Field field,
+        String value
+    ) {
         if (value != null) {
             fields.put(field, value);
         }
@@ -628,9 +845,16 @@ public String getDescription() {
     }
 
     @Override
-    public List<BibEntry> parseEntries(InputStream inputStream) throws ParseException {
+    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 0be10285662..63e5c3ba1a7 100644
--- a/src/main/java/org/jabref/logic/importer/fileformat/MrDLibImporter.java
+++ b/src/main/java/org/jabref/logic/importer/fileformat/MrDLibImporter.java
@@ -9,16 +9,14 @@
 import java.util.Iterator;
 import java.util.List;
 import java.util.stream.Collectors;
-
+import kong.unirest.json.JSONException;
+import kong.unirest.json.JSONObject;
 import org.jabref.logic.importer.Importer;
 import org.jabref.logic.importer.ParserResult;
 import org.jabref.logic.util.StandardFileType;
 import org.jabref.model.database.BibDatabase;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.field.StandardField;
-
-import kong.unirest.json.JSONException;
-import kong.unirest.json.JSONObject;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -27,7 +25,9 @@
  */
 public class MrDLibImporter extends Importer {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(MrDLibImporter.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(
+        MrDLibImporter.class
+    );
     public ParserResult parserResult;
     private String recommendationsHeading;
     private String recommendationsDescription;
@@ -49,7 +49,8 @@ public boolean isRecognizedFormat(BufferedReader input) throws IOException {
     }
 
     @Override
-    public ParserResult importDatabase(BufferedReader input) throws IOException {
+    public ParserResult importDatabase(BufferedReader input)
+        throws IOException {
         parse(input);
         return parserResult;
     }
@@ -117,7 +118,9 @@ private void parse(BufferedReader input) throws IOException {
         List<RankedBibEntry> rankedBibEntries = new ArrayList<>();
 
         // Get recommendations from response and populate bib entries
-        JSONObject recommendationsJson = recommendationSetJson.getJSONObject("recommendations");
+        JSONObject recommendationsJson = recommendationSetJson.getJSONObject(
+            "recommendations"
+        );
         Iterator<String> keys = recommendationsJson.keys();
         while (keys.hasNext()) {
             String key = keys.next();
@@ -126,9 +129,17 @@ private void parse(BufferedReader input) throws IOException {
         }
 
         // Sort bib entries according to rank
-        rankedBibEntries.sort((RankedBibEntry rankedBibEntry1,
-                               RankedBibEntry rankedBibEntry2) -> rankedBibEntry1.rank.compareTo(rankedBibEntry2.rank));
-        List<BibEntry> bibEntries = rankedBibEntries.stream().map(e -> e.entry).collect(Collectors.toList());
+        rankedBibEntries.sort(
+                (
+                    RankedBibEntry rankedBibEntry1,
+                    RankedBibEntry rankedBibEntry2
+                ) ->
+            rankedBibEntry1.rank.compareTo(rankedBibEntry2.rank)
+        );
+        List<BibEntry> bibEntries = rankedBibEntries
+            .stream()
+            .map(e -> e.entry)
+            .collect(Collectors.toList());
 
         bibDatabase.insertEntries(bibEntries);
         parserResult = new ParserResult(bibDatabase);
@@ -136,7 +147,10 @@ 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();
     }
 
     /**
@@ -149,12 +163,33 @@ 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);
@@ -166,7 +201,10 @@ private RankedBibEntry populateBibEntry(JSONObject recommendation) {
         return new RankedBibEntry(current, rank);
     }
 
-    private Boolean isRecommendationFieldPresent(JSONObject recommendation, String field) {
+    private Boolean isRecommendationFieldPresent(
+        JSONObject recommendation,
+        String field
+    ) {
         return recommendation.has(field) && !recommendation.isNull(field);
     }
 
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 31863a621eb..8a3e99294c7 100644
--- a/src/main/java/org/jabref/logic/importer/fileformat/MsBibImporter.java
+++ b/src/main/java/org/jabref/logic/importer/fileformat/MsBibImporter.java
@@ -3,16 +3,13 @@
 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.msbib.MSBibDatabase;
 import org.jabref.logic.util.StandardFileType;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.w3c.dom.Document;
@@ -26,12 +23,17 @@
  */
 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 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";
 
     @Override
-    public boolean isRecognizedFormat(BufferedReader reader) throws IOException {
+    public boolean isRecognizedFormat(BufferedReader reader)
+        throws IOException {
         Objects.requireNonNull(reader);
 
         /*
@@ -41,33 +43,45 @@ public boolean isRecognizedFormat(BufferedReader reader) throws IOException {
          */
         Document docin;
         try {
-            DocumentBuilder dbuild = makeSafeDocBuilderFactory(DocumentBuilderFactory.newInstance()).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;
+            DocumentBuilder dbuild = makeSafeDocBuilderFactory(
+                DocumentBuilderFactory.newInstance()
+            )
+                .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;
+                    }
                 }
-            });
+            );
 
             docin = dbuild.parse(new InputSource(reader));
         } catch (Exception e) {
             return false;
         }
-        return (docin == null) || docin.getDocumentElement().getTagName().contains("Sources");
+        return (
+            (docin == null) ||
+            docin.getDocumentElement().getTagName().contains("Sources")
+        );
     }
 
     @Override
-    public ParserResult importDatabase(BufferedReader reader) throws IOException {
+    public ParserResult importDatabase(BufferedReader reader)
+        throws IOException {
         Objects.requireNonNull(reader);
 
         MSBibDatabase dbase = new MSBibDatabase();
@@ -96,7 +110,9 @@ public String getDescription() {
      * @param dBuild | DocumentBuilderFactory to be made XXE safe.
      * @return If supported, XXE safe DocumentBuilderFactory. Else, returns original builder given
      */
-    private DocumentBuilderFactory makeSafeDocBuilderFactory(DocumentBuilderFactory dBuild) {
+    private DocumentBuilderFactory makeSafeDocBuilderFactory(
+        DocumentBuilderFactory dBuild
+    ) {
         String feature = null;
 
         try {
@@ -109,7 +125,11 @@ private DocumentBuilderFactory makeSafeDocBuilderFactory(DocumentBuilderFactory
             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 bcea23f0489..a27456b7ce2 100644
--- a/src/main/java/org/jabref/logic/importer/fileformat/OvidImporter.java
+++ b/src/main/java/org/jabref/logic/importer/fileformat/OvidImporter.java
@@ -8,7 +8,6 @@
 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.util.StandardFileType;
@@ -27,23 +26,30 @@
  */
 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]+)");
+        "([ \\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, ]+)");
+        "(.+)\\(([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, ]+)");
+        "\\(([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);
+    private static final Pattern OVID_PATTERN = Pattern.compile(
+        OVID_PATTERN_STRING
+    );
 
     private static final int MAX_ITEMS = 50;
 
@@ -63,7 +69,8 @@ public String getDescription() {
     }
 
     @Override
-    public boolean isRecognizedFormat(BufferedReader reader) throws IOException {
+    public boolean isRecognizedFormat(BufferedReader reader)
+        throws IOException {
         String str;
         int i = 0;
         while (((str = reader.readLine()) != null) && (i < MAX_ITEMS)) {
@@ -76,7 +83,8 @@ public boolean isRecognizedFormat(BufferedReader reader) throws IOException {
     }
 
     @Override
-    public ParserResult importDatabase(BufferedReader reader) throws IOException {
+    public ParserResult importDatabase(BufferedReader reader)
+        throws IOException {
         List<BibEntry> bibitems = new ArrayList<>();
         StringBuilder sb = new StringBuilder();
         String line;
@@ -99,9 +107,10 @@ public ParserResult importDatabase(BufferedReader reader) throws IOException {
                 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");
+                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:
@@ -120,32 +129,60 @@ public ParserResult importDatabase(BufferedReader reader) throws IOException {
                     h.put(new UnknownField("chaptertitle"), content);
                 } else if (fieldName.startsWith("Source")) {
                     Matcher matcher;
-                    if ((matcher = OvidImporter.OVID_SOURCE_PATTERN.matcher(content)).find()) {
+                    if (
+                        (matcher =
+                                OvidImporter.OVID_SOURCE_PATTERN.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.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()) {
-                        h.put(StandardField.EDITOR, matcher.group(1).replace(" (Ed)", ""));
+                    } 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));
                         h.put(StandardField.PAGES, matcher.group(4));
                         h.put(StandardField.ADDRESS, matcher.group(5));
                         h.put(StandardField.PUBLISHER, matcher.group(6));
-                    } else if ((matcher = OvidImporter.BOOK_PATTERN.matcher(content)).find()) {
+                    } else if (
+                        (matcher =
+                                OvidImporter.BOOK_PATTERN.matcher(
+                                    content
+                                )).find()
+                    ) {
                         h.put(StandardField.YEAR, matcher.group(1));
                         h.put(StandardField.PAGES, matcher.group(2));
                         h.put(StandardField.ADDRESS, matcher.group(3));
@@ -153,7 +190,10 @@ public ParserResult importDatabase(BufferedReader reader) throws IOException {
                     }
                     // Add double hyphens to page ranges:
                     if (h.get(StandardField.PAGES) != null) {
-                        h.put(StandardField.PAGES, h.get(StandardField.PAGES).replace("-", "--"));
+                        h.put(
+                            StandardField.PAGES,
+                            h.get(StandardField.PAGES).replace("-", "--")
+                        );
                     }
                 } else if ("Abstract".equals(fieldName)) {
                     h.put(StandardField.ABSTRACT, content);
@@ -196,13 +236,21 @@ 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":
-                h.put(StandardField.TITLE, h.remove(new UnknownField("chaptertitle")));
+                h.put(
+                    StandardField.TITLE,
+                    h.remove(new UnknownField("chaptertitle"))
+                );
             }
             BibEntry b = new BibEntry(entryType);
             b.setField(h);
@@ -222,7 +270,10 @@ public ParserResult importDatabase(BufferedReader reader) throws IOException {
     private static String fixNames(String content) {
         String names;
         if (content.indexOf(';') > 0) { // LN FN; [LN FN;]*
-            names = content.replaceAll("[^\\.A-Za-z,;\\- ]", "").replace(";", " and");
+            names =
+                content
+                    .replaceAll("[^\\.A-Za-z,;\\- ]", "")
+                    .replace(";", " and");
         } else if (content.indexOf("  ") > 0) {
             String[] sNames = content.split(" {2}");
             StringBuilder sb = new StringBuilder();
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 3d2e4f7aa86..bf5aaa2a49e 100644
--- a/src/main/java/org/jabref/logic/importer/fileformat/PdfContentImporter.java
+++ b/src/main/java/org/jabref/logic/importer/fileformat/PdfContentImporter.java
@@ -1,5 +1,6 @@
 package org.jabref.logic.importer.fileformat;
 
+import com.google.common.base.Strings;
 import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.StringWriter;
@@ -10,7 +11,8 @@
 import java.util.Optional;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
-
+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;
@@ -25,10 +27,6 @@
 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;
-
 /**
  * PdfContentImporter parses data of the first page of the PDF and creates a BibTeX entry.
  * <p>
@@ -37,7 +35,9 @@
  */
 public class PdfContentImporter extends Importer {
 
-    private static final Pattern YEAR_EXTRACT_PATTERN = Pattern.compile("\\d{4}");
+    private static final Pattern YEAR_EXTRACT_PATTERN = Pattern.compile(
+        "\\d{4}"
+    );
     // input lines into several lines
     private String[] lines;
     // current index in lines
@@ -91,7 +91,10 @@ private String streamlineNames(String names) {
                     if (posAnd >= 0) {
                         String nameBefore = curName.substring(0, posAnd);
                         // cannot be first name as "," is contained in the string
-                        res = res.concat(" and ").concat(removeNonLettersAtEnd(nameBefore));
+                        res =
+                            res
+                                .concat(" and ")
+                                .concat(removeNonLettersAtEnd(nameBefore));
                         curName = curName.substring(posAnd + 5);
                     }
                 }
@@ -133,7 +136,10 @@ 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
                             // do NOT finish name
@@ -150,15 +156,18 @@ private String streamlineNames(String names) {
                         } else {
                             res = res.concat(" and ");
                         }
-                        if ("et".equalsIgnoreCase(splitNames[i]) && (splitNames.length > (i + 1))
-                                && "al.".equalsIgnoreCase(splitNames[i + 1])) {
+                        if (
+                            "et".equalsIgnoreCase(splitNames[i]) &&
+                            (splitNames.length > (i + 1)) &&
+                            "al.".equalsIgnoreCase(splitNames[i + 1])
+                        ) {
                             res = res.concat("others");
                             break;
                         } else {
                             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);
@@ -176,38 +185,56 @@ public boolean isRecognizedFormat(BufferedReader input) throws IOException {
     }
 
     @Override
-    public ParserResult importDatabase(BufferedReader reader) throws IOException {
+    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
     public ParserResult importDatabase(String data) throws IOException {
         Objects.requireNonNull(data);
-        throw new UnsupportedOperationException("PdfContentImporter does not support importDatabase(String data)."
-                + "Instead use importDatabase(Path filePath, Charset defaultEncoding).");
+        throw new UnsupportedOperationException(
+            "PdfContentImporter does not support importDatabase(String data)." +
+            "Instead use importDatabase(Path filePath, Charset defaultEncoding)."
+        );
     }
 
     @Override
     public ParserResult importDatabase(Path filePath) {
         final ArrayList<BibEntry> result = new ArrayList<>(1);
-        try (PDDocument document = new XmpUtilReader().loadWithAutomaticDecryption(filePath)) {
+        try (
+            PDDocument document = new XmpUtilReader()
+                .loadWithAutomaticDecryption(filePath)
+        ) {
             String firstPageContents = getFirstPageContents(document);
-            Optional<BibEntry> entry = getEntryFromPDFContent(firstPageContents, OS.NEWLINE);
+            Optional<BibEntry> entry = getEntryFromPDFContent(
+                firstPageContents,
+                OS.NEWLINE
+            );
             entry.ifPresent(result::add);
         } catch (EncryptedPdfsNotSupportedException e) {
-            return ParserResult.fromErrorMessage(Localization.lang("Decryption not supported."));
+            return ParserResult.fromErrorMessage(
+                Localization.lang("Decryption not supported.")
+            );
         } catch (IOException exception) {
             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);
     }
 
     // make this method package visible so we can test it
-    Optional<BibEntry> getEntryFromPDFContent(String firstpageContents, String lineSeparator) {
+    Optional<BibEntry> getEntryFromPDFContent(
+        String firstpageContents,
+        String lineSeparator
+    ) {
         // idea: split[] contains the different lines
         // blocks are separated by empty lines
         // treat each block
@@ -217,7 +244,10 @@ 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);
 
@@ -286,7 +316,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++;
         }
@@ -296,28 +326,48 @@ 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
                 // whereas we need linebreak as separator
-                while ((lineIndex < lines.length) && !"".equals(lines[lineIndex])) {
-                    curString = curString.concat(lines[lineIndex]).concat(System.lineSeparator());
+                while (
+                    (lineIndex < lines.length) && !"".equals(lines[lineIndex])
+                ) {
+                    curString =
+                        curString
+                            .concat(lines[lineIndex])
+                            .concat(System.lineSeparator());
                     lineIndex++;
                 }
                 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 = "";
                 } else {
-                    curString = curString.substring("Keywords".length() + 1).trim();
+                    curString =
+                        curString.substring("Keywords".length() + 1).trim();
                 }
                 lineIndex++;
                 fillCurStringWithNonEmptyLines();
@@ -424,7 +474,9 @@ Optional<BibEntry> getEntryFromPDFContent(String firstpageContents, String lineS
                             // before the price, the ISSN is stated
                             // skip that
                             pos -= 2;
-                            while ((pos >= 0) && (curString.charAt(pos) != ' ')) {
+                            while (
+                                (pos >= 0) && (curString.charAt(pos) != ' ')
+                            ) {
                                 pos--;
                             }
                             if (pos > 0) {
@@ -483,7 +535,8 @@ Optional<BibEntry> getEntryFromPDFContent(String firstpageContents, String lineS
         return Optional.of(entry);
     }
 
-    private String getFirstPageContents(PDDocument document) throws IOException {
+    private String getFirstPageContents(PDDocument document)
+        throws IOException {
         PDFTextStripper stripper = new PDFTextStripper();
 
         stripper.setStartPage(1);
@@ -516,7 +569,9 @@ private void extractYear() {
      * proceed to next non-empty line
      */
     private void proceedToNextNonEmptyLine() {
-        while ((lineIndex < lines.length) && lines[lineIndex].trim().isEmpty()) {
+        while (
+            (lineIndex < lines.length) && lines[lineIndex].trim().isEmpty()
+        ) {
             lineIndex++;
         }
     }
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 57b94653d62..91687f22857 100644
--- a/src/main/java/org/jabref/logic/importer/fileformat/PdfEmbeddedBibFileImporter.java
+++ b/src/main/java/org/jabref/logic/importer/fileformat/PdfEmbeddedBibFileImporter.java
@@ -7,7 +7,15 @@
 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,16 +27,6 @@
 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;
-
 /**
  * PdfEmbeddedBibFileImporter imports an embedded Bib-File from the PDF.
  */
@@ -36,7 +34,9 @@ public class PdfEmbeddedBibFileImporter extends Importer {
 
     private final BibtexParser bibtexParser;
 
-    public PdfEmbeddedBibFileImporter(ImportFormatPreferences importFormatPreferences) {
+    public PdfEmbeddedBibFileImporter(
+        ImportFormatPreferences importFormatPreferences
+    ) {
         bibtexParser = new BibtexParser(importFormatPreferences);
     }
 
@@ -46,25 +46,35 @@ public boolean isRecognizedFormat(BufferedReader input) throws IOException {
     }
 
     @Override
-    public ParserResult importDatabase(BufferedReader reader) throws IOException {
+    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
     public ParserResult importDatabase(Path filePath) {
-        try (PDDocument document = new XmpUtilReader().loadWithAutomaticDecryption(filePath)) {
+        try (
+            PDDocument document = new XmpUtilReader()
+                .loadWithAutomaticDecryption(filePath)
+        ) {
             return new ParserResult(getEmbeddedBibFileEntries(document));
         } catch (EncryptedPdfsNotSupportedException e) {
-            return ParserResult.fromErrorMessage(Localization.lang("Decryption not supported."));
+            return ParserResult.fromErrorMessage(
+                Localization.lang("Decryption not supported.")
+            );
         } catch (IOException | ParseException e) {
             return ParserResult.fromError(e);
         }
@@ -75,21 +85,31 @@ public ParserResult importDatabase(Path filePath) {
      * 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();
+        PDDocumentNameDictionary nameDictionary = document
+            .getDocumentCatalog()
+            .getNames();
         if (nameDictionary != null) {
-            PDEmbeddedFilesNameTreeNode efTree = nameDictionary.getEmbeddedFiles();
+            PDEmbeddedFilesNameTreeNode efTree =
+                nameDictionary.getEmbeddedFiles();
             if (efTree != null) {
-                Map<String, PDComplexFileSpecification> names = efTree.getNames();
+                Map<String, PDComplexFileSpecification> names =
+                    efTree.getNames();
                 if (names != null) {
                     allParsedEntries.addAll(extractAndParseFiles(names));
                 } else {
-                    List<PDNameTreeNode<PDComplexFileSpecification>> kids = efTree.getKids();
+                    List<PDNameTreeNode<PDComplexFileSpecification>> kids =
+                        efTree.getKids();
                     if (kids != null) {
-                        for (PDNameTreeNode<PDComplexFileSpecification> node : kids) {
+                        for (PDNameTreeNode<
+                            PDComplexFileSpecification
+                        > node : kids) {
                             names = node.getNames();
-                            allParsedEntries.addAll(extractAndParseFiles(names));
+                            allParsedEntries.addAll(
+                                extractAndParseFiles(names)
+                            );
                         }
                     }
                 }
@@ -98,33 +118,49 @@ private List<BibEntry> getEmbeddedBibFileEntries(PDDocument document) throws IOE
         // extract files from annotations
         for (PDPage page : document.getPages()) {
             for (PDAnnotation annotation : page.getAnnotations()) {
-                if (annotation instanceof PDAnnotationFileAttachment annotationFileAttachment) {
-                    PDComplexFileSpecification fileSpec = (PDComplexFileSpecification) annotationFileAttachment.getFile();
-                    allParsedEntries.addAll(extractAndParseFile(getEmbeddedFile(fileSpec)));
+                if (
+                    annotation instanceof
+                    PDAnnotationFileAttachment annotationFileAttachment
+                ) {
+                    PDComplexFileSpecification fileSpec =
+                        (PDComplexFileSpecification) annotationFileAttachment.getFile();
+                    allParsedEntries.addAll(
+                        extractAndParseFile(getEmbeddedFile(fileSpec))
+                    );
                 }
             }
         }
         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()) {
+        for (Map.Entry<
+            String,
+            PDComplexFileSpecification
+        > entry : names.entrySet()) {
             String filename = entry.getKey();
             FileUtil.getFileExtension(filename);
             if (FileUtil.isBibFile(Path.of(filename))) {
                 PDComplexFileSpecification fileSpec = entry.getValue();
-                allParsedEntries.addAll(extractAndParseFile(getEmbeddedFile(fileSpec)));
+                allParsedEntries.addAll(
+                    extractAndParseFile(getEmbeddedFile(fileSpec))
+                );
             }
         }
         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());
     }
 
-    private static PDEmbeddedFile getEmbeddedFile(PDComplexFileSpecification fileSpec) {
+    private static PDEmbeddedFile getEmbeddedFile(
+        PDComplexFileSpecification fileSpec
+    ) {
         // search for the first available alternative of the embedded file
         PDEmbeddedFile embeddedFile = null;
         if (fileSpec != null) {
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 98893d3941e..de4ddc44512 100644
--- a/src/main/java/org/jabref/logic/importer/fileformat/PdfGrobidImporter.java
+++ b/src/main/java/org/jabref/logic/importer/fileformat/PdfGrobidImporter.java
@@ -6,7 +6,6 @@
 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;
@@ -25,7 +24,8 @@ public class PdfGrobidImporter extends Importer {
     private final ImportFormatPreferences importFormatPreferences;
 
     public PdfGrobidImporter(ImportFormatPreferences importFormatPreferences) {
-        this.grobidService = new GrobidService(importFormatPreferences.grobidPreferences());
+        this.grobidService =
+            new GrobidService(importFormatPreferences.grobidPreferences());
         this.importFormatPreferences = importFormatPreferences;
     }
 
@@ -40,27 +40,37 @@ public StandardFileType getFileType() {
     }
 
     @Override
-    public ParserResult importDatabase(BufferedReader reader) throws IOException {
+    public ParserResult importDatabase(BufferedReader reader)
+        throws IOException {
         Objects.requireNonNull(reader);
         throw new UnsupportedOperationException(
-                "PdfGrobidImporter does not support importDatabase(BufferedReader reader)."
-                        + "Instead use importDatabase(Path filePath, Charset defaultEncoding).");
+            "PdfGrobidImporter 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(
-                "PdfGrobidImporter does not support importDatabase(String data)."
-                        + "Instead use importDatabase(Path filePath, Charset defaultEncoding).");
+            "PdfGrobidImporter does not support importDatabase(String data)." +
+            "Instead use importDatabase(Path filePath, Charset defaultEncoding)."
+        );
     }
 
     @Override
     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")));
+            List<BibEntry> result = grobidService.processPDF(
+                filePath,
+                importFormatPreferences
+            );
+            result.forEach(entry ->
+                entry.addFile(
+                    new LinkedFile("", filePath.toAbsolutePath(), "PDF")
+                )
+            );
             return new ParserResult(result);
         } catch (Exception exception) {
             return ParserResult.fromError(exception);
@@ -68,7 +78,8 @@ public ParserResult importDatabase(Path filePath) {
     }
 
     @Override
-    public boolean isRecognizedFormat(BufferedReader reader) throws IOException {
+    public boolean isRecognizedFormat(BufferedReader reader)
+        throws IOException {
         Objects.requireNonNull(reader);
         return false;
     }
@@ -81,7 +92,9 @@ public boolean isRecognizedFormat(BufferedReader reader) throws IOException {
     public boolean isRecognizedFormat(Path filePath) throws IOException {
         Objects.requireNonNull(filePath);
         Optional<String> extension = FileUtil.getFileExtension(filePath);
-        return extension.filter(s -> getFileType().getExtensions().contains(s)).isPresent();
+        return extension
+            .filter(s -> getFileType().getExtensions().contains(s))
+            .isPresent();
     }
 
     @Override
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 48207887061..77bdbfd2c8c 100644
--- a/src/main/java/org/jabref/logic/importer/fileformat/PdfMergeMetadataImporter.java
+++ b/src/main/java/org/jabref/logic/importer/fileformat/PdfMergeMetadataImporter.java
@@ -9,7 +9,6 @@
 import java.util.Objects;
 import java.util.Optional;
 import java.util.Set;
-
 import org.jabref.logic.importer.EntryBasedFetcher;
 import org.jabref.logic.importer.FetcherException;
 import org.jabref.logic.importer.ImportFormatPreferences;
@@ -25,7 +24,6 @@
 import org.jabref.model.entry.field.Field;
 import org.jabref.model.entry.field.StandardField;
 import org.jabref.preferences.FilePreferences;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -34,20 +32,32 @@
  */
 public class PdfMergeMetadataImporter extends Importer {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(PdfMergeMetadataImporter.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(
+        PdfMergeMetadataImporter.class
+    );
 
     private final List<Importer> metadataImporters;
     private final ImportFormatPreferences importFormatPreferences;
 
-    public PdfMergeMetadataImporter(ImportFormatPreferences importFormatPreferences) {
+    public PdfMergeMetadataImporter(
+        ImportFormatPreferences importFormatPreferences
+    ) {
         this.importFormatPreferences = importFormatPreferences;
         this.metadataImporters = new ArrayList<>();
-        this.metadataImporters.add(new PdfVerbatimBibTextImporter(importFormatPreferences));
-        this.metadataImporters.add(new PdfEmbeddedBibFileImporter(importFormatPreferences));
+        this.metadataImporters.add(
+                new PdfVerbatimBibTextImporter(importFormatPreferences)
+            );
+        this.metadataImporters.add(
+                new PdfEmbeddedBibFileImporter(importFormatPreferences)
+            );
         if (importFormatPreferences.grobidPreferences().isGrobidEnabled()) {
-            this.metadataImporters.add(new PdfGrobidImporter(importFormatPreferences));
+            this.metadataImporters.add(
+                    new PdfGrobidImporter(importFormatPreferences)
+                );
         }
-        this.metadataImporters.add(new PdfXmpImporter(importFormatPreferences.xmpPreferences()));
+        this.metadataImporters.add(
+                new PdfXmpImporter(importFormatPreferences.xmpPreferences())
+            );
         this.metadataImporters.add(new PdfContentImporter());
     }
 
@@ -57,17 +67,22 @@ public boolean isRecognizedFormat(BufferedReader input) throws IOException {
     }
 
     @Override
-    public ParserResult importDatabase(BufferedReader reader) throws IOException {
+    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
@@ -75,7 +90,10 @@ 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;
             }
@@ -88,19 +106,34 @@ 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 EbookDeIsbnFetcher(importFormatPreferences))
+                        // .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
+                    );
                 }
             }
         }
@@ -111,11 +144,18 @@ public ParserResult importDatabase(Path filePath) throws IOException {
                 entry.setType(candidate.getType());
             }
             Set<Field> presentFields = entry.getFields();
-            for (Map.Entry<Field, String> fieldEntry : candidate.getFieldMap().entrySet()) {
+            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.
                 // 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
@@ -125,7 +165,9 @@ public ParserResult importDatabase(Path filePath) throws IOException {
             }
         }
 
-        entry.addFile(new LinkedFile("", filePath, StandardFileType.PDF.getName()));
+        entry.addFile(
+            new LinkedFile("", filePath, StandardFileType.PDF.getName())
+        );
         return new ParserResult(List.of(entry));
     }
 
@@ -144,22 +186,34 @@ public String getDescription() {
         return "PdfMergeMetadataImporter imports metadata from a PDF using multiple strategies and merging 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;
         }
 
         @Override
-        public List<BibEntry> performSearch(BibEntry entry) throws FetcherException {
+        public List<BibEntry> performSearch(BibEntry entry)
+            throws FetcherException {
             for (LinkedFile file : entry.getFiles()) {
-                Optional<Path> filePath = file.findIn(databaseContext, filePreferences);
+                Optional<Path> filePath = file.findIn(
+                    databaseContext,
+                    filePreferences
+                );
                 if (filePath.isPresent()) {
                     try {
                         ParserResult result = importDatabase(filePath.get());
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 67feff964b7..a0bf792f131 100644
--- a/src/main/java/org/jabref/logic/importer/fileformat/PdfVerbatimBibTextImporter.java
+++ b/src/main/java/org/jabref/logic/importer/fileformat/PdfVerbatimBibTextImporter.java
@@ -6,7 +6,8 @@
 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,9 +19,6 @@
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.LinkedFile;
 
-import org.apache.pdfbox.pdmodel.PDDocument;
-import org.apache.pdfbox.text.PDFTextStripper;
-
 /**
  * This importer imports a verbatim BibTeX entry from the first page of the PDF.
  */
@@ -28,7 +26,9 @@ public class PdfVerbatimBibTextImporter extends Importer {
 
     private final ImportFormatPreferences importFormatPreferences;
 
-    public PdfVerbatimBibTextImporter(ImportFormatPreferences importFormatPreferences) {
+    public PdfVerbatimBibTextImporter(
+        ImportFormatPreferences importFormatPreferences
+    ) {
         this.importFormatPreferences = importFormatPreferences;
     }
 
@@ -38,38 +38,51 @@ public boolean isRecognizedFormat(BufferedReader input) throws IOException {
     }
 
     @Override
-    public ParserResult importDatabase(BufferedReader reader) throws IOException {
+    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
     public ParserResult importDatabase(Path filePath) {
         List<BibEntry> result;
-        try (PDDocument document = new XmpUtilReader().loadWithAutomaticDecryption(filePath)) {
+        try (
+            PDDocument document = new XmpUtilReader()
+                .loadWithAutomaticDecryption(filePath)
+        ) {
             String firstPageContents = getFirstPageContents(document);
             BibtexParser parser = new BibtexParser(importFormatPreferences);
             result = parser.parseEntries(firstPageContents);
         } catch (EncryptedPdfsNotSupportedException e) {
-            return ParserResult.fromErrorMessage(Localization.lang("Decryption not supported."));
+            return ParserResult.fromErrorMessage(
+                Localization.lang("Decryption not supported.")
+            );
         } catch (IOException | ParseException e) {
             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);
     }
 
-    private String getFirstPageContents(PDDocument document) throws IOException {
+    private String getFirstPageContents(PDDocument document)
+        throws IOException {
         PDFTextStripper stripper = new PDFTextStripper();
 
         stripper.setStartPage(1);
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 0b8fe47c3dc..4cc20836b53 100644
--- a/src/main/java/org/jabref/logic/importer/fileformat/PdfXmpImporter.java
+++ b/src/main/java/org/jabref/logic/importer/fileformat/PdfXmpImporter.java
@@ -4,7 +4,6 @@
 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;
@@ -35,33 +34,39 @@ public StandardFileType getFileType() {
     }
 
     @Override
-    public ParserResult importDatabase(BufferedReader reader) throws IOException {
+    public ParserResult importDatabase(BufferedReader reader)
+        throws IOException {
         Objects.requireNonNull(reader);
         throw new UnsupportedOperationException(
-                "PdfXmpImporter does not support importDatabase(BufferedReader reader)."
-                        + "Instead use importDatabase(Path filePath, Charset defaultEncoding).");
+            "PdfXmpImporter 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(
-                "PdfXmpImporter does not support importDatabase(String data)."
-                        + "Instead use importDatabase(Path filePath, Charset defaultEncoding).");
+            "PdfXmpImporter does not support importDatabase(String data)." +
+            "Instead use importDatabase(Path filePath, Charset defaultEncoding)."
+        );
     }
 
     @Override
     public ParserResult importDatabase(Path filePath) {
         Objects.requireNonNull(filePath);
         try {
-            return new ParserResult(new XmpUtilReader().readXmp(filePath, xmpPreferences));
+            return new ParserResult(
+                new XmpUtilReader().readXmp(filePath, xmpPreferences)
+            );
         } catch (IOException exception) {
             return ParserResult.fromError(exception);
         }
     }
 
     @Override
-    public boolean isRecognizedFormat(BufferedReader reader) throws IOException {
+    public boolean isRecognizedFormat(BufferedReader reader)
+        throws IOException {
         Objects.requireNonNull(reader);
         return false;
     }
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 61679778d5d..fb74767071a 100644
--- a/src/main/java/org/jabref/logic/importer/fileformat/PicaXmlParser.java
+++ b/src/main/java/org/jabref/logic/importer/fileformat/PicaXmlParser.java
@@ -4,11 +4,9 @@
 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 +15,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;
@@ -27,18 +24,23 @@
 import org.xml.sax.SAXException;
 
 public class PicaXmlParser implements Parser {
-    private static final Logger LOGGER = LoggerFactory.getLogger(PicaXmlParser.class);
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(
+        PicaXmlParser.class
+    );
 
     @Override
-    public List<BibEntry> parseEntries(InputStream inputStream) throws ParseException {
+    public List<BibEntry> parseEntries(InputStream inputStream)
+        throws ParseException {
         try {
-            DocumentBuilder dbuild = DocumentBuilderFactory.newInstance().newDocumentBuilder();
+            DocumentBuilder dbuild = DocumentBuilderFactory
+                .newInstance()
+                .newDocumentBuilder();
             Document content = dbuild.parse(inputStream);
             return this.parseEntries(content);
         } catch (
-                ParserConfigurationException |
-                SAXException |
-                IOException exception) {
+            ParserConfigurationException | SAXException | IOException exception
+        ) {
             throw new ParseException(exception);
         }
     }
@@ -49,7 +51,9 @@ private List<BibEntry> parseEntries(Document content) {
         // used for creating test cases
         // XMLUtil.printDocument(content);
 
-        Element root = (Element) content.getElementsByTagName("zs:searchRetrieveResponse").item(0);
+        Element root = (Element) content
+            .getElementsByTagName("zs:searchRetrieveResponse")
+            .item(0);
         Element srwrecords = getChild("zs:records", root);
         if (srwrecords == null) {
             // no records found -> return empty list
@@ -290,7 +294,9 @@ private BibEntry parseEntry(Element e) {
             }
 
             // Wenn eine Verlagsdiss vorliegt
-            if (entryType.equals(StandardEntryType.PhdThesis) && (isbn != null)) {
+            if (
+                entryType.equals(StandardEntryType.PhdThesis) && (isbn != null)
+            ) {
                 entryType = StandardEntryType.Book;
             }
 
@@ -309,8 +315,12 @@ 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);
             }
         }
@@ -378,7 +388,8 @@ private BibEntry parseEntry(Element e) {
             // 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))));
+                Character.toString(Character.toUpperCase(subtitle.charAt(0)))
+            );
             if (subtitle.length() > 1) {
                 newSubtitle.append(subtitle.substring(1));
             }
@@ -432,7 +443,9 @@ private BibEntry parseEntry(Element e) {
 
         if ("article".equals(entryType.getName()) && (journal != null)) {
             result.setField(StandardField.JOURNAL, journal);
-        } else if ("incollection".equals(entryType.getName()) && (booktitle != null)) {
+        } else if (
+            "incollection".equals(entryType.getName()) && (booktitle != null)
+        ) {
             result.setField(StandardField.BOOKTITLE, booktitle);
         }
 
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 bdaaf19ad0e..b61398c30f7 100644
--- a/src/main/java/org/jabref/logic/importer/fileformat/RepecNepImporter.java
+++ b/src/main/java/org/jabref/logic/importer/fileformat/RepecNepImporter.java
@@ -7,7 +7,6 @@
 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;
@@ -17,7 +16,6 @@
 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;
 
@@ -140,9 +138,17 @@
  */
 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 Logger LOGGER = LoggerFactory.getLogger(
+        RepecNepImporter.class
+    );
+
+    private static final Collection<String> RECOGNIZED_FIELDS = Arrays.asList(
+        "Keywords",
+        "JEL",
+        "Date",
+        "URL",
+        "By"
+    );
     private final ImportFormatPreferences importFormatPreferences;
     private int line;
     private String lastLine = "";
@@ -174,7 +180,8 @@ public String getDescription() {
     }
 
     @Override
-    public boolean isRecognizedFormat(BufferedReader reader) throws IOException {
+    public boolean isRecognizedFormat(BufferedReader reader)
+        throws IOException {
         // read the first couple of lines
         // NEP message usually contain the String 'NEP: New Economics Papers'
         // or, they are from nep.repec.org
@@ -184,14 +191,17 @@ 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) {
         boolean result = this.lastLine.indexOf(':') >= 1;
         if (result) {
-            String possibleKeyword = this.lastLine.substring(0, this.lastLine.indexOf(':'));
+            String possibleKeyword =
+                this.lastLine.substring(0, this.lastLine.indexOf(':'));
             result = keywords.contains(possibleKeyword);
         }
         return result;
@@ -220,8 +230,17 @@ 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();
@@ -232,7 +251,8 @@ private String readMultipleLines(BufferedReader in) throws IOException {
      *
      * @throws IOException in case of error
      */
-    private void parseTitleString(BibEntry be, BufferedReader in) throws IOException {
+    private void parseTitleString(BibEntry be, BufferedReader in)
+        throws IOException {
         // skip article number
         this.lastLine = this.lastLine.substring(this.lastLine.indexOf('.') + 1);
         be.setField(StandardField.TITLE, readMultipleLines(in));
@@ -243,24 +263,36 @@ private void parseTitleString(BibEntry be, BufferedReader in) throws IOException
      *
      * @throws IOException in case of error
      */
-    private void parseAuthors(BibEntry be, BufferedReader in) throws IOException {
+    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();
             boolean institutionDone;
             if (this.lastLine.indexOf('(') >= 0) {
-                author = this.lastLine.substring(0, this.lastLine.indexOf('(')).trim();
+                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;
@@ -269,8 +301,15 @@ 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);
             }
 
@@ -278,7 +317,10 @@ 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()
+                );
             }
         }
 
@@ -295,7 +337,8 @@ private void parseAuthors(BibEntry be, BufferedReader in) throws IOException {
      *
      * @throws IOException in case of error
      */
-    private void parseAbstract(BibEntry be, BufferedReader in) throws IOException {
+    private void parseAbstract(BibEntry be, BufferedReader in)
+        throws IOException {
         String theabstract = readMultipleLines(in);
 
         if (!theabstract.isEmpty()) {
@@ -307,27 +350,44 @@ 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()) {
             readLine(in);
         }
 
         // read other fields
-        while ((this.lastLine != null) && !isStartOfWorkingPaper() && (startsWithKeyword(RepecNepImporter.RECOGNIZED_FIELDS) || "".equals(this.lastLine))) {
+        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();
+            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),
-                        importFormatPreferences.bibEntryPreferences().getKeywordSeparator());
+                be.addKeywords(
+                    Arrays.asList(keywords),
+                    importFormatPreferences
+                        .bibEntryPreferences()
+                        .getKeywordSeparator()
+                );
             } else if ("JEL".equals(keyword)) {
                 // parse JEL field
                 be.setField(new UnknownField("jel"), readMultipleLines(in));
@@ -359,11 +419,16 @@ 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
-    public ParserResult importDatabase(BufferedReader reader) throws IOException {
+    public ParserResult importDatabase(BufferedReader reader)
+        throws IOException {
         Objects.requireNonNull(reader);
 
         List<BibEntry> bibitems = new ArrayList<>();
@@ -373,11 +438,13 @@ public ParserResult importDatabase(BufferedReader reader) throws IOException {
             readLine(reader); // skip header and editor information
             while (this.lastLine != null) {
                 if (this.lastLine.startsWith("-----------------------------")) {
-                    this.inOverviewSection = this.preLine.startsWith("In this issue we have");
+                    this.inOverviewSection =
+                        this.preLine.startsWith("In this issue we have");
                 }
                 if (isStartOfWorkingPaper()) {
                     BibEntry be = new BibEntry(StandardEntryType.TechReport);
-                    paperNoStr = this.lastLine.substring(0, this.lastLine.indexOf('.'));
+                    paperNoStr =
+                        this.lastLine.substring(0, this.lastLine.indexOf('.'));
                     parseTitleString(be, reader);
                     if (startsWithKeyword(RepecNepImporter.RECOGNIZED_FIELDS)) {
                         parseAdditionalFields(be, false, reader);
@@ -386,7 +453,9 @@ public ParserResult importDatabase(BufferedReader reader) throws IOException {
                         parseAuthors(be, reader);
                         readLine(reader); // skip empty line
                     }
-                    if (!startsWithKeyword(RepecNepImporter.RECOGNIZED_FIELDS)) {
+                    if (
+                        !startsWithKeyword(RepecNepImporter.RECOGNIZED_FIELDS)
+                    ) {
                         parseAbstract(be, reader);
                     }
                     parseAdditionalFields(be, true, reader);
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 b219fc25660..612fa6ed4b8 100644
--- a/src/main/java/org/jabref/logic/importer/fileformat/RisImporter.java
+++ b/src/main/java/org/jabref/logic/importer/fileformat/RisImporter.java
@@ -12,7 +12,6 @@
 import java.util.Map;
 import java.util.Optional;
 import java.util.regex.Pattern;
-
 import org.jabref.logic.importer.Importer;
 import org.jabref.logic.importer.ParserResult;
 import org.jabref.logic.util.OS;
@@ -30,8 +29,11 @@
 
 public class RisImporter extends Importer {
 
-    private static final Pattern RECOGNIZED_FORMAT_PATTERN = Pattern.compile("TY {2}- .*");
-    private static final DateTimeFormatter YEAR_FORMATTER = DateTimeFormatter.ofPattern("yyyy");
+    private static final Pattern RECOGNIZED_FORMAT_PATTERN = Pattern.compile(
+        "TY {2}- .*"
+    );
+    private static final DateTimeFormatter YEAR_FORMATTER =
+        DateTimeFormatter.ofPattern("yyyy");
 
     @Override
     public String getName() {
@@ -49,20 +51,30 @@ public String getDescription() {
     }
 
     @Override
-    public boolean isRecognizedFormat(BufferedReader reader) throws IOException {
+    public boolean isRecognizedFormat(BufferedReader reader)
+        throws IOException {
         // Our strategy is to look for the "TY  - *" line.
-        return reader.lines().anyMatch(line -> RECOGNIZED_FORMAT_PATTERN.matcher(line).find());
+        return reader
+            .lines()
+            .anyMatch(line -> RECOGNIZED_FORMAT_PATTERN.matcher(line).find());
     }
 
     @Override
-    public ParserResult importDatabase(BufferedReader reader) throws IOException {
+    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("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");
@@ -88,9 +100,17 @@ 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))
-                                && !Character.isWhitespace(lines[j + 1].charAt(0))) {
+                    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(' ');
                         }
                         current.append(lines[j + 1]);
@@ -108,7 +128,9 @@ public ParserResult importDatabase(BufferedReader reader) throws IOException {
                     if ("TY".equals(tag)) {
                         if ("BOOK".equals(value)) {
                             type = StandardEntryType.Book;
-                        } else if ("JOUR".equals(value) || "MGZN".equals(value)) {
+                        } else if (
+                            "JOUR".equals(value) || "MGZN".equals(value)
+                        ) {
                             type = StandardEntryType.Article;
                         } else if ("THES".equals(value)) {
                             type = StandardEntryType.PhdThesis;
@@ -130,24 +152,53 @@ public ParserResult importDatabase(BufferedReader reader) throws IOException {
                         if (oldVal == null) {
                             fields.put(StandardField.TITLE, value);
                         } else {
-                            if (oldVal.endsWith(":") || oldVal.endsWith(".") || oldVal.endsWith("?")) {
-                                fields.put(StandardField.TITLE, oldVal + " " + value);
+                            if (
+                                oldVal.endsWith(":") ||
+                                oldVal.endsWith(".") ||
+                                oldVal.endsWith("?")
+                            ) {
+                                fields.put(
+                                    StandardField.TITLE,
+                                    oldVal + " " + value
+                                );
                             } else {
-                                fields.put(StandardField.TITLE, oldVal + ": " + value);
+                                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)) {
+                    } else if (
+                        "JO".equals(tag) || "J1".equals(tag) || "JF".equals(tag)
+                    ) {
                         // if this field appears then this should be the journal title
                         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 {
@@ -171,7 +222,12 @@ 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;
@@ -181,7 +237,9 @@ public ParserResult importDatabase(BufferedReader reader) throws IOException {
                         } else {
                             fields.put(StandardField.PUBLISHER, value);
                         }
-                    } else if ("AD".equals(tag) || "CY".equals(tag) || "PP".equals(tag)) {
+                    } else if (
+                        "AD".equals(tag) || "CY".equals(tag) || "PP".equals(tag)
+                    ) {
                         fields.put(StandardField.ADDRESS, value);
                     } else if ("EP".equals(tag)) {
                         endPage = value;
@@ -199,11 +257,19 @@ public ParserResult importDatabase(BufferedReader reader) throws IOException {
                         if (oldAb == null) {
                             fields.put(StandardField.ABSTRACT, value);
                         } else if (!oldAb.equals(value) && !value.isEmpty()) {
-                            fields.put(StandardField.ABSTRACT, oldAb + OS.NEWLINE + value);
+                            fields.put(
+                                StandardField.ABSTRACT,
+                                oldAb + OS.NEWLINE + value
+                            );
                         }
-                    } else if ("UR".equals(tag) || "L2".equals(tag) || "LK".equals(tag)) {
+                    } 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 year = value.substring(0, 4);
 
@@ -220,11 +286,16 @@ public ParserResult importDatabase(BufferedReader reader) throws IOException {
                     } else if ("KW".equals(tag)) {
                         if (fields.containsKey(StandardField.KEYWORDS)) {
                             String kw = fields.get(StandardField.KEYWORDS);
-                            fields.put(StandardField.KEYWORDS, kw + ", " + value);
+                            fields.put(
+                                StandardField.KEYWORDS,
+                                kw + ", " + value
+                            );
                         } else {
                             fields.put(StandardField.KEYWORDS, value);
                         }
-                    } else if ("U1".equals(tag) || "U2".equals(tag) || "N1".equals(tag)) {
+                    } else if (
+                        "U1".equals(tag) || "U2".equals(tag) || "N1".equals(tag)
+                    ) {
                         if (!comment.isEmpty()) {
                             comment = comment + OS.NEWLINE;
                         }
@@ -242,7 +313,6 @@ public ParserResult importDatabase(BufferedReader reader) throws IOException {
                         fields.put(StandardField.EPRINTTYPE, "pubmed");
                     } else if ("TA".equals(tag)) {
                         fields.put(StandardField.TRANSLATOR, value);
-
                         // fields for which there is no direct mapping in the bibtext standard
                     } else if ("AV".equals(tag)) {
                         fields.put(new UnknownField("archive_location"), value);
@@ -251,7 +321,10 @@ public ParserResult importDatabase(BufferedReader reader) throws IOException {
                     } else if ("DB".equals(tag)) {
                         fields.put(new UnknownField("archive"), value);
                     } else if ("NV".equals(tag)) {
-                        fields.put(new UnknownField("number-of-volumes"), value);
+                        fields.put(
+                            new UnknownField("number-of-volumes"),
+                            value
+                        );
                     } else if ("OP".equals(tag)) {
                         fields.put(new UnknownField("original-title"), value);
                     } else if ("RI".equals(tag)) {
@@ -296,7 +369,11 @@ 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 one here
             // type is set in the loop above
@@ -309,8 +386,8 @@ public ParserResult importDatabase(BufferedReader reader) throws IOException {
         return new ParserResult(bibitems);
     }
 
-  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/SilverPlatterImporter.java b/src/main/java/org/jabref/logic/importer/fileformat/SilverPlatterImporter.java
index e47ef3650ab..2372fbdcb7e 100644
--- a/src/main/java/org/jabref/logic/importer/fileformat/SilverPlatterImporter.java
+++ b/src/main/java/org/jabref/logic/importer/fileformat/SilverPlatterImporter.java
@@ -8,7 +8,6 @@
 import java.util.Locale;
 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.util.StandardFileType;
@@ -25,7 +24,9 @@
  */
 public class SilverPlatterImporter extends Importer {
 
-    private static final Pattern START_PATTERN = Pattern.compile("Record.*INSPEC.*");
+    private static final Pattern START_PATTERN = Pattern.compile(
+        "Record.*INSPEC.*"
+    );
 
     @Override
     public String getName() {
@@ -43,7 +44,8 @@ public String getDescription() {
     }
 
     @Override
-    public boolean isRecognizedFormat(BufferedReader reader) throws IOException {
+    public boolean isRecognizedFormat(BufferedReader reader)
+        throws IOException {
         // This format is very similar to Inspec, so we have a two-fold strategy:
         // If we see the flag signaling that it is an Inspec file, return false.
         // This flag should appear above the first entry and prevent us from
@@ -62,7 +64,8 @@ public boolean isRecognizedFormat(BufferedReader reader) throws IOException {
     }
 
     @Override
-    public ParserResult importDatabase(BufferedReader reader) throws IOException {
+    public ParserResult importDatabase(BufferedReader reader)
+        throws IOException {
         List<BibEntry> bibitems = new ArrayList<>();
         boolean isChapter = false;
         String str;
@@ -90,24 +93,37 @@ public ParserResult importDatabase(BufferedReader reader) throws IOException {
                 String f3 = field.substring(0, 2);
                 String frest = field.substring(5);
                 switch (f3) {
-                    case "TI" ->
-                            h.put(StandardField.TITLE, frest);
+                    case "TI" -> h.put(StandardField.TITLE, frest);
                     case "AU" -> {
                         if (frest.trim().endsWith("(ed)")) {
                             String ed = frest.trim();
                             ed = ed.substring(0, ed.length() - 4);
-                            h.put(StandardField.EDITOR,
-                                    AuthorList.fixAuthorLastNameFirst(ed.replace(",-", ", ").replace(";", " and ")));
+                            h.put(
+                                StandardField.EDITOR,
+                                AuthorList.fixAuthorLastNameFirst(
+                                    ed.replace(",-", ", ").replace(";", " and ")
+                                )
+                            );
                         } else {
-                            h.put(StandardField.AUTHOR,
-                                    AuthorList.fixAuthorLastNameFirst(frest.replace(",-", ", ").replace(";", " and ")));
+                            h.put(
+                                StandardField.AUTHOR,
+                                AuthorList.fixAuthorLastNameFirst(
+                                    frest
+                                        .replace(",-", ", ")
+                                        .replace(";", " and ")
+                                )
+                            );
                         }
                     }
-                    case "AB" ->
-                            h.put(StandardField.ABSTRACT, frest);
+                    case "AB" -> h.put(StandardField.ABSTRACT, frest);
                     case "DE" -> {
-                        String kw = frest.replace("-;", ",").toLowerCase(Locale.ROOT);
-                        h.put(StandardField.KEYWORDS, kw.substring(0, kw.length() - 1));
+                        String kw = frest
+                            .replace("-;", ",")
+                            .toLowerCase(Locale.ROOT);
+                        h.put(
+                            StandardField.KEYWORDS,
+                            kw.substring(0, kw.length() - 1)
+                        );
                     }
                     case "SO" -> {
                         int m = frest.indexOf('.');
@@ -126,8 +142,19 @@ public ParserResult importDatabase(BufferedReader reader) throws IOException {
                                 if (m >= 0) {
                                     String pg = frest.substring(m + 1).trim();
                                     h.put(StandardField.PAGES, pg);
-                                    h.put(StandardField.VOLUME, frest.substring(1, issueIndex).trim());
-                                    h.put(StandardField.ISSUE, frest.substring(issueIndex + 1, endIssueIndex).trim());
+                                    h.put(
+                                        StandardField.VOLUME,
+                                        frest.substring(1, issueIndex).trim()
+                                    );
+                                    h.put(
+                                        StandardField.ISSUE,
+                                        frest
+                                            .substring(
+                                                issueIndex + 1,
+                                                endIssueIndex
+                                            )
+                                            .trim()
+                                    );
                                 }
                             }
                         }
@@ -136,7 +163,10 @@ public ParserResult importDatabase(BufferedReader reader) throws IOException {
                         int m = frest.indexOf(':');
                         if (m >= 0) {
                             String jr = frest.substring(0, m);
-                            h.put(StandardField.PUBLISHER, jr.replace("-", " ").trim());
+                            h.put(
+                                StandardField.PUBLISHER,
+                                jr.replace("-", " ").trim()
+                            );
                             frest = frest.substring(m);
                             m = frest.indexOf(", ");
                             if ((m + 2) < frest.length()) {
@@ -144,31 +174,37 @@ public ParserResult importDatabase(BufferedReader reader) throws IOException {
                                 try {
                                     Integer.parseInt(yr);
                                     h.put(StandardField.YEAR, yr);
-                                } catch (
-                                        NumberFormatException ex) {
+                                } catch (NumberFormatException ex) {
                                     // Let's assume that this wasn't a number, since it
                                     // couldn't be parsed as an integer.
                                 }
                             }
                         }
                     }
-                    case "AF" ->
-                            h.put(StandardField.SCHOOL, frest.trim());
+                    case "AF" -> h.put(StandardField.SCHOOL, frest.trim());
                     case "DT" -> {
                         frest = frest.trim();
                         if ("Monograph".equals(frest)) {
                             type = StandardEntryType.Book;
                         } else if (frest.startsWith("Dissertation")) {
                             type = StandardEntryType.PhdThesis;
-                        } else if (frest.toLowerCase(Locale.ROOT).contains(StandardField.JOURNAL.getName())) {
+                        } else if (
+                            frest
+                                .toLowerCase(Locale.ROOT)
+                                .contains(StandardField.JOURNAL.getName())
+                        ) {
                             type = StandardEntryType.Article;
-                        } else if ("Contribution".equals(frest) || "Chapter".equals(frest)) {
+                        } else if (
+                            "Contribution".equals(frest) ||
+                            "Chapter".equals(frest)
+                        ) {
                             type = StandardEntryType.InCollection;
                             // This entry type contains page numbers and booktitle in the
                             // title field.
                             isChapter = true;
                         } else {
-                            type = EntryTypeFactory.parse(frest.replace(" ", ""));
+                            type =
+                                EntryTypeFactory.parse(frest.replace(" ", ""));
                         }
                     }
                 }
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 3a8be1b9b63..f7ae9a1b8da 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 64ea31e6206..6b33484cb42 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
@@ -3,8 +3,7 @@
 import java.util.List;
 
 public record Investigator(
-        String lastName,
-        String foreName,
-        List<String> affiliationList
-) {
-}
+    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 a78f65f9727..9bf8ad84831 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 4429436c332..658ed36ed0b 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 bda9c6aefff..dd2667ef477 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 5c2fc3b26c2..a9a6acf21cb 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 90ef2c267ba..1968c0bbb55 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 f7cb6d5d68f..f36b503aba9 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,18 +4,15 @@
 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"
+        "recordContentSource",
+        "recordCreationDate",
+        "recordChangeDate",
+        "recordIdentifier",
+        "recordOrigin",
+        "descriptionStandard",
+        "recordInfoNote"
     );
 
     public RecordInfo() {
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 df69c725ce1..adb7d856d55 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
@@ -7,7 +7,14 @@
 
 // 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
-@jakarta.xml.bind.annotation.XmlSchema(namespace = "http://www.loc.gov/mods/v3", xmlns = {
-        @jakarta.xml.bind.annotation.XmlNs(prefix = "mods", namespaceURI = "http://www.loc.gov/mods/v3")}, elementFormDefault = jakarta.xml.bind.annotation.XmlNsForm.QUALIFIED)
+@jakarta.xml.bind.annotation.XmlSchema(
+    namespace = "http://www.loc.gov/mods/v3",
+    xmlns = {
+        @jakarta.xml.bind.annotation.XmlNs(
+            prefix = "mods",
+            namespaceURI = "http://www.loc.gov/mods/v3"
+        ),
+    },
+    elementFormDefault = jakarta.xml.bind.annotation.XmlNsForm.QUALIFIED
+)
 package org.jabref.logic.importer.fileformat.mods;
-
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 4b2804bb976..931ea3c7964 100644
--- a/src/main/java/org/jabref/logic/importer/util/FileFieldParser.java
+++ b/src/main/java/org/jabref/logic/importer/util/FileFieldParser.java
@@ -6,14 +6,15 @@
 import java.nio.file.Path;
 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);
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(
+        FileFieldParser.class
+    );
 
     private final String value;
 
@@ -87,7 +88,9 @@ public List<LinkedFile> parse() {
                 // Check if we are entering an XML special character construct such
                 // as "&#44;", because we need to know in order to ignore the semicolon.
                 charactersOfCurrentElement.append(c);
-                if ((value.length() > (i + 1)) && (value.charAt(i + 1) == '#')) {
+                if (
+                    (value.length() > (i + 1)) && (value.charAt(i + 1) == '#')
+                ) {
                     inXmlChar = true;
                 }
             } else if (!escaped && inXmlChar && (c == ';')) {
@@ -95,8 +98,10 @@ public List<LinkedFile> parse() {
                 charactersOfCurrentElement.append(c);
                 inXmlChar = false;
             } else if (!escaped && (c == ':')) {
-                if ((linkedFileData.size() == 1) && // we already parsed the description
-                        (charactersOfCurrentElement.length() == 1)) { // we parsed one character
+                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
@@ -149,10 +154,16 @@ static LinkedFile convert(List<String> entry) {
         LinkedFile field = null;
         if (LinkedFile.isOnlineLink(entry.get(1))) {
             try {
-                field = new LinkedFile(entry.get(0), new URL(entry.get(1)), entry.get(2));
+                field =
+                    new LinkedFile(
+                        entry.get(0),
+                        new URL(entry.get(1)),
+                        entry.get(2)
+                    );
             } catch (MalformedURLException e) {
                 // in case the URL is malformed, store it nevertheless
-                field = new LinkedFile(entry.get(0), entry.get(1), entry.get(2));
+                field =
+                    new LinkedFile(entry.get(0), entry.get(1), entry.get(2));
             }
         }
 
@@ -169,16 +180,27 @@ static LinkedFile convert(List<String> entry) {
                     field = new LinkedFile(entry.get(0), path, entry.get(2));
                 } catch (InvalidPathException e) {
                     // Ignored
-                    LOGGER.debug("Invalid path object, continueing with string", e);
+                    LOGGER.debug(
+                        "Invalid path object, continueing with string",
+                        e
+                    );
                     field = new LinkedFile(entry.get(0), pathStr, entry.get(2));
                 }
             }
         }
 
         // 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 514e43d0513..44280185e14 100644
--- a/src/main/java/org/jabref/logic/importer/util/GrobidService.java
+++ b/src/main/java/org/jabref/logic/importer/util/GrobidService.java
@@ -5,13 +5,11 @@
 import java.nio.file.Path;
 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;
 
@@ -28,7 +26,10 @@
 public class GrobidService {
 
     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) {
@@ -45,7 +46,9 @@ public int getCode() {
     public GrobidService(GrobidPreferences grobidPreferences) {
         this.grobidPreferences = grobidPreferences;
         if (!grobidPreferences.isGrobidEnabled()) {
-            throw new UnsupportedOperationException("Grobid was used but not enabled.");
+            throw new UnsupportedOperationException(
+                "Grobid was used but not enabled."
+            );
         }
     }
 
@@ -55,37 +58,67 @@ 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();
 
-        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.");
+        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);
+        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();
 
-        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.");
+        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."
+            );
         }
 
         BibtexParser parser = new BibtexParser(importFormatPreferences);
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 642aadf1453..6a6ae5baf81 100644
--- a/src/main/java/org/jabref/logic/importer/util/GroupsParser.java
+++ b/src/main/java/org/jabref/logic/importer/util/GroupsParser.java
@@ -5,7 +5,6 @@
 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;
@@ -31,7 +30,6 @@
 import org.jabref.model.search.rules.SearchRules.SearchFlags;
 import org.jabref.model.strings.StringUtil;
 import org.jabref.model.util.FileUpdateMonitor;
-
 import org.slf4j.LoggerFactory;
 
 /**
@@ -39,13 +37,18 @@
  */
 public class GroupsParser {
 
-    private static final org.slf4j.Logger LOGGER = LoggerFactory.getLogger(GroupsParser.class);
+    private static final org.slf4j.Logger LOGGER = LoggerFactory.getLogger(
+        GroupsParser.class
+    );
 
-    private GroupsParser() {
-    }
+    private GroupsParser() {}
 
-    public static GroupTreeNode importGroups(List<String> orderedData, Character keywordSeparator, FileUpdateMonitor fileMonitor, MetaData metaData)
-            throws ParseException {
+    public static GroupTreeNode importGroups(
+        List<String> orderedData,
+        Character keywordSeparator,
+        FileUpdateMonitor fileMonitor,
+        MetaData metaData
+    ) throws ParseException {
         try {
             GroupTreeNode cursor = null;
             GroupTreeNode root = null;
@@ -58,10 +61,17 @@ public static GroupTreeNode importGroups(List<String> orderedData, Character key
 
                 int spaceIndex = string.indexOf(' ');
                 if (spaceIndex <= 0) {
-                    throw new ParseException("Expected \"" + string + "\" to contain whitespace");
+                    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
@@ -69,7 +79,10 @@ public static GroupTreeNode importGroups(List<String> orderedData, Character key
                     root = cursor;
                 } else {
                     // insert at desired location
-                    while ((level <= cursor.getLevel()) && (cursor.getParent().isPresent())) {
+                    while (
+                        (level <= cursor.getLevel()) &&
+                        (cursor.getParent().isPresent())
+                    ) {
                         cursor = cursor.getParent().get();
                     }
                     cursor.addChild(newNode);
@@ -78,9 +91,12 @@ 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."),
-                    e);
+            throw new ParseException(
+                Localization.lang(
+                    "Group tree could not be parsed. If you save the BibTeX library, all groups will be lost."
+                ),
+                e
+            );
         }
     }
 
@@ -91,27 +107,49 @@ 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)
-            throws ParseException {
+    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);
         }
-        if (s.startsWith(MetadataSerializationConfiguration.ALL_ENTRIES_GROUP_ID)) {
+        if (
+            s.startsWith(
+                MetadataSerializationConfiguration.ALL_ENTRIES_GROUP_ID
+            )
+        ) {
             return allEntriesGroupFromString(s);
         }
         if (s.startsWith(MetadataSerializationConfiguration.SEARCH_GROUP_ID)) {
             return searchGroupFromString(s);
         }
-        if (s.startsWith(MetadataSerializationConfiguration.EXPLICIT_GROUP_ID)) {
+        if (
+            s.startsWith(MetadataSerializationConfiguration.EXPLICIT_GROUP_ID)
+        ) {
             return explicitGroupFromString(s, keywordSeparator);
         }
-        if (s.startsWith(MetadataSerializationConfiguration.LEGACY_EXPLICIT_GROUP_ID)) {
+        if (
+            s.startsWith(
+                MetadataSerializationConfiguration.LEGACY_EXPLICIT_GROUP_ID
+            )
+        ) {
             return legacyExplicitGroupFromString(s, keywordSeparator);
         }
-        if (s.startsWith(MetadataSerializationConfiguration.AUTOMATIC_PERSONS_GROUP_ID)) {
+        if (
+            s.startsWith(
+                MetadataSerializationConfiguration.AUTOMATIC_PERSONS_GROUP_ID
+            )
+        ) {
             return automaticPersonsGroupFromString(s);
         }
-        if (s.startsWith(MetadataSerializationConfiguration.AUTOMATIC_KEYWORD_GROUP_ID)) {
+        if (
+            s.startsWith(
+                MetadataSerializationConfiguration.AUTOMATIC_KEYWORD_GROUP_ID
+            )
+        ) {
             return automaticKeywordGroupFromString(s);
         }
         if (s.startsWith(MetadataSerializationConfiguration.TEX_GROUP_ID)) {
@@ -121,23 +159,55 @@ 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;
             }
@@ -146,34 +216,100 @@ 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 + "\".");
+    private static AbstractGroup automaticPersonsGroupFromString(
+        String string
+    ) {
+        if (
+            !string.startsWith(
+                MetadataSerializationConfiguration.AUTOMATIC_PERSONS_GROUP_ID
+            )
+        ) {
+            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));
-        AutomaticPersonsGroup newGroup = new AutomaticPersonsGroup(name, context, field);
+        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;
     }
 
-    private static AbstractGroup automaticKeywordGroupFromString(String string) {
-        if (!string.startsWith(MetadataSerializationConfiguration.AUTOMATIC_KEYWORD_GROUP_ID)) {
-            throw new IllegalArgumentException("KeywordGroup cannot be created from \"" + string + "\".");
+    private static AbstractGroup automaticKeywordGroupFromString(
+        String string
+    ) {
+        if (
+            !string.startsWith(
+                MetadataSerializationConfiguration.AUTOMATIC_KEYWORD_GROUP_ID
+            )
+        ) {
+            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 +319,102 @@ 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 {
-        if (!s.startsWith(MetadataSerializationConfiguration.KEYWORD_GROUP_ID)) {
-            throw new IllegalArgumentException("KeywordGroup cannot be created from \"" + s + "\".");
+    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 + "\"."
+            );
         }
-        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);
+            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 {
-        if (!input.startsWith(MetadataSerializationConfiguration.EXPLICIT_GROUP_ID)) {
-            throw new IllegalArgumentException("ExplicitGroup cannot be created from \"" + input + "\".");
+    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 + "\"."
+            );
         }
-        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 +422,38 @@ private static ExplicitGroup explicitGroupFromString(String input, Character key
         }
     }
 
-    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 + "\".");
+    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 + "\"."
+            );
         }
-        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) {
@@ -248,16 +467,28 @@ private static ExplicitGroup legacyExplicitGroupFromString(String input, Charact
      *  ExplicitGroup:GroupName\;0\;Key1\;Key2\;;
      * This method exists for backwards compatibility.
      */
-    private static void addLegacyEntryKeys(QuotedStringTokenizer tok, ExplicitGroup group) {
+    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 + "\".");
+        if (
+            !s.startsWith(
+                MetadataSerializationConfiguration.ALL_ENTRIES_GROUP_ID
+            )
+        ) {
+            throw new IllegalArgumentException(
+                "AllEntriesGroup cannot be created from \"" + s + "\"."
+            );
         }
         return DefaultGroupsFactory.getAllEntriesGroup();
     }
@@ -269,14 +500,27 @@ private static AbstractGroup allEntriesGroupFromString(String s) {
      */
     private static AbstractGroup searchGroupFromString(String s) {
         if (!s.startsWith(MetadataSerializationConfiguration.SEARCH_GROUP_ID)) {
-            throw new IllegalArgumentException("SearchGroup cannot be created from \"" + s + "\".");
+            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(SearchRules.SearchFlags.CASE_SENSITIVE);
@@ -286,14 +530,20 @@ 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;
     }
 
-    private static void addGroupDetails(QuotedStringTokenizer tokenizer, AbstractGroup group) {
+    private static void addGroupDetails(
+        QuotedStringTokenizer tokenizer,
+        AbstractGroup group
+    ) {
         if (tokenizer.hasMoreTokens()) {
             group.setExpanded(Integer.parseInt(tokenizer.nextToken()) == 1);
             group.setColor(tokenizer.nextToken());
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 f6ca61e7b55..1ecdb95ced1 100644
--- a/src/main/java/org/jabref/logic/importer/util/IdentifierParser.java
+++ b/src/main/java/org/jabref/logic/importer/util/IdentifierParser.java
@@ -2,7 +2,6 @@
 
 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;
@@ -15,6 +14,7 @@
 import org.jabref.model.strings.StringUtil;
 
 public class IdentifierParser {
+
     private final BibEntry entry;
 
     public IdentifierParser(BibEntry entry) {
@@ -43,8 +43,12 @@ public Optional<? extends Identifier> parse(Field field) {
     }
 
     private Optional<? extends Identifier> parseEprint(String eprint) {
-        Optional<String> eprintTypeOpt = entry.getField(StandardField.EPRINTTYPE);
-        Optional<String> archivePrefixOpt = entry.getField(StandardField.ARCHIVEPREFIX);
+        Optional<String> eprintTypeOpt = entry.getField(
+            StandardField.EPRINTTYPE
+        );
+        Optional<String> archivePrefixOpt = entry.getField(
+            StandardField.ARCHIVEPREFIX
+        );
 
         String eprintType = eprintTypeOpt.or(() -> archivePrefixOpt).orElse("");
         if ("arxiv".equalsIgnoreCase(eprintType)) {
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 cfa8d352c9e..4222805178b 100644
--- a/src/main/java/org/jabref/logic/importer/util/JsonReader.java
+++ b/src/main/java/org/jabref/logic/importer/util/JsonReader.java
@@ -3,12 +3,10 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.nio.charset.StandardCharsets;
-
-import org.jabref.logic.importer.ParseException;
-
 import kong.unirest.json.JSONArray;
 import kong.unirest.json.JSONException;
 import kong.unirest.json.JSONObject;
+import org.jabref.logic.importer.ParseException;
 
 /**
  * Converts an {@link InputStream} into a {@link JSONObject}.
@@ -20,9 +18,13 @@ public class JsonReader {
      *
      * @return A {@link JSONObject}. An empty JSON object is returned in the case an empty stream is passed.
      */
-    public static JSONObject toJsonObject(InputStream inputStream) throws ParseException {
+    public static JSONObject toJsonObject(InputStream inputStream)
+        throws ParseException {
         try {
-            String inputStr = new String((inputStream.readAllBytes()), StandardCharsets.UTF_8);
+            String inputStr = new String(
+                (inputStream.readAllBytes()),
+                StandardCharsets.UTF_8
+            );
             // Fallback: in case an empty stream was passed, return an empty JSON object
             if (inputStr.isBlank()) {
                 return new JSONObject();
@@ -33,9 +35,13 @@ public static JSONObject toJsonObject(InputStream inputStream) throws ParseExcep
         }
     }
 
-    public static JSONArray toJsonArray(InputStream stream) throws ParseException {
+    public static JSONArray toJsonArray(InputStream stream)
+        throws ParseException {
         try {
-            String inpStr = new String((stream.readAllBytes()), StandardCharsets.UTF_8);
+            String inpStr = new String(
+                (stream.readAllBytes()),
+                StandardCharsets.UTF_8
+            );
             if (inpStr.isBlank()) {
                 return new JSONArray();
             }
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 039acf47155..8da30f7d0ec 100644
--- a/src/main/java/org/jabref/logic/importer/util/MathMLParser.java
+++ b/src/main/java/org/jabref/logic/importer/util/MathMLParser.java
@@ -6,7 +6,6 @@
 import java.net.URISyntaxException;
 import java.net.URL;
 import java.util.Objects;
-
 import javax.xml.stream.XMLStreamException;
 import javax.xml.stream.XMLStreamReader;
 import javax.xml.transform.Result;
@@ -16,13 +15,16 @@
 import javax.xml.transform.TransformerFactory;
 import javax.xml.transform.stream.StreamResult;
 import javax.xml.transform.stream.StreamSource;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 public class MathMLParser {
-    private static final Logger LOGGER = LoggerFactory.getLogger(MathMLParser.class);
-    private static final String XSLT_FILE_PATH = "/xslt/mathml_latex/mmltex.xsl";
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(
+        MathMLParser.class
+    );
+    private static final String XSLT_FILE_PATH =
+        "/xslt/mathml_latex/mmltex.xsl";
 
     /**
      * Parses the MathML element into its corresponding
@@ -43,10 +45,16 @@ public static String parse(XMLStreamReader reader) {
             Source xmlSource = new StreamSource(new StringReader(xmlContent));
 
             URL xsltResource = MathMLParser.class.getResource(XSLT_FILE_PATH);
-            Source xsltSource = new StreamSource(Objects.requireNonNull(xsltResource).openStream(), xsltResource.toURI().toASCIIString());
+            Source xsltSource = new StreamSource(
+                Objects.requireNonNull(xsltResource).openStream(),
+                xsltResource.toURI().toASCIIString()
+            );
 
-            TransformerFactory transformerFactory = TransformerFactory.newInstance();
-            Transformer transformer = transformerFactory.newTransformer(xsltSource);
+            TransformerFactory transformerFactory =
+                TransformerFactory.newInstance();
+            Transformer transformer = transformerFactory.newTransformer(
+                xsltSource
+            );
 
             StringWriter writer = new StringWriter();
             Result result = new StreamResult(writer);
@@ -66,4 +74,3 @@ public static String parse(XMLStreamReader reader) {
         return latexResult;
     }
 }
-
diff --git a/src/main/java/org/jabref/logic/importer/util/MediaTypes.java b/src/main/java/org/jabref/logic/importer/util/MediaTypes.java
index 2edfc03cf29..54b47e0fbaa 100644
--- a/src/main/java/org/jabref/logic/importer/util/MediaTypes.java
+++ b/src/main/java/org/jabref/logic/importer/util/MediaTypes.java
@@ -4,6 +4,8 @@
  * Stores MediaTypes required by JabRef (which are not availble in used libraries)
  */
 public class MediaTypes {
+
     public static final String APPLICATION_BIBTEX = "application/x-bibtex";
-    public static final String CITATIONSTYLES_JSON = "application/vnd.citationstyles.csl+json";
+    public static final String CITATIONSTYLES_JSON =
+        "application/vnd.citationstyles.csl+json";
 }
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 b5b733f7973..a792fe6fbc8 100644
--- a/src/main/java/org/jabref/logic/importer/util/MetaDataParser.java
+++ b/src/main/java/org/jabref/logic/importer/util/MetaDataParser.java
@@ -12,7 +12,6 @@
 import java.util.Map;
 import java.util.Optional;
 import java.util.regex.Pattern;
-
 import org.jabref.logic.cleanup.FieldFormatterCleanups;
 import org.jabref.logic.importer.ParseException;
 import org.jabref.model.database.BibDatabaseMode;
@@ -26,7 +25,6 @@
 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;
 
@@ -35,10 +33,14 @@
  */
 public class MetaDataParser {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(MetaDataParser.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(
+        MetaDataParser.class
+    );
     private static FileUpdateMonitor fileMonitor;
 
-    private static final Pattern SINGLE_BACKSLASH = Pattern.compile("[^\\\\]\\\\[^\\\\]");
+    private static final Pattern SINGLE_BACKSLASH = Pattern.compile(
+        "[^\\\\]\\\\[^\\\\]"
+    );
 
     public MetaDataParser(FileUpdateMonitor fileMonitor) {
         MetaDataParser.fileMonitor = fileMonitor;
@@ -53,66 +55,127 @@ public static Optional<BibEntryType> parseCustomEntryType(String comment) {
         String fieldsDescription = rest.substring(indexEndOfName + 2);
 
         int indexEndOfRequiredFields = fieldsDescription.indexOf(']');
-        int indexEndOfOptionalFields = fieldsDescription.indexOf(']', indexEndOfRequiredFields + 1);
-        if ((indexEndOfRequiredFields < 4) || (indexEndOfOptionalFields < (indexEndOfRequiredFields + 6))) {
+        int indexEndOfOptionalFields = fieldsDescription.indexOf(
+            ']',
+            indexEndOfRequiredFields + 1
+        );
+        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);
+        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));
+            .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));
         return Optional.of(entryTypeBuilder.build());
     }
 
     /**
      * 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);
     }
 
     /**
      * Parses the data map and changes the given {@link MetaData} instance respectively.
      */
-    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 {
         List<String> defaultCiteKeyPattern = new ArrayList<>();
-        Map<EntryType, List<String>> nonDefaultCiteKeyPatterns = new HashMap<>();
+        Map<EntryType, List<String>> nonDefaultCiteKeyPatterns =
+            new HashMap<>();
 
         // 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());
+        List<Map.Entry<String, String>> entryList = new ArrayList<>(
+            data.entrySet()
+        );
         entryList.sort(groupsLast());
 
         for (Map.Entry<String, String> entry : entryList) {
             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, Collections.singletonList(getSingleItem(values)));
-            } else if (entry.getKey().startsWith(MetaData.SELECTOR_META_PREFIX)) {
+                EntryType entryType = EntryTypeFactory.parse(
+                    entry
+                        .getKey()
+                        .substring(MetaData.PREFIX_KEYPATTERN.length())
+                );
+                nonDefaultCiteKeyPatterns.put(
+                    entryType,
+                    Collections.singletonList(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)));
+                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 + '-')) {
+                metaData.setDefaultFileDirectory(
+                    parseDirectory(entry.getValue())
+                );
+            } else if (
+                entry.getKey().startsWith(MetaData.FILE_DIRECTORY + '-')
+            ) {
                 // The user name starts directly after FILE_DIRECTORY + '-'
-                String user = entry.getKey().substring(MetaData.FILE_DIRECTORY.length() + 1);
-                metaData.setUserFileDirectory(user, parseDirectory(entry.getValue()));
-            } else if (entry.getKey().startsWith(MetaData.FILE_DIRECTORY_LATEX)) {
+                String user = entry
+                    .getKey()
+                    .substring(MetaData.FILE_DIRECTORY.length() + 1);
+                metaData.setUserFileDirectory(
+                    user,
+                    parseDirectory(entry.getValue())
+                );
+            } else if (
+                entry.getKey().startsWith(MetaData.FILE_DIRECTORY_LATEX)
+            ) {
                 // The user name starts directly after FILE_DIRECTORY_LATEX" + '-'
-                String user = entry.getKey().substring(MetaData.FILE_DIRECTORY_LATEX.length() + 1);
-                Path path = Path.of(parseDirectory(entry.getValue())).normalize();
+                String user = entry
+                    .getKey()
+                    .substring(MetaData.FILE_DIRECTORY_LATEX.length() + 1);
+                Path path = Path
+                    .of(parseDirectory(entry.getValue()))
+                    .normalize();
                 metaData.setLatexFileDirectory(user, path);
             } else if (entry.getKey().equals(MetaData.SAVE_ACTIONS)) {
                 metaData.setSaveActions(FieldFormatterCleanups.parse(values));
             } else if (entry.getKey().equals(MetaData.DATABASE_TYPE)) {
                 metaData.setMode(BibDatabaseMode.parse(getSingleItem(values)));
             } else if (entry.getKey().equals(MetaData.KEYPATTERNDEFAULT)) {
-                defaultCiteKeyPattern = Collections.singletonList(getSingleItem(values));
+                defaultCiteKeyPattern =
+                    Collections.singletonList(getSingleItem(values));
             } else if (entry.getKey().equals(MetaData.PROTECTED_FLAG_META)) {
                 if (Boolean.parseBoolean(getSingleItem(values))) {
                     metaData.markAsProtected();
@@ -121,8 +184,18 @@ 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.VERSION_DB_STRUCT)) {
                 metaData.setVersionDBStructure(getSingleItem(values));
             } else {
@@ -131,8 +204,14 @@ public MetaData parse(MetaData metaData, Map<String, String> data, Character key
             }
         }
 
-        if (!defaultCiteKeyPattern.isEmpty() || !nonDefaultCiteKeyPatterns.isEmpty()) {
-            metaData.setCiteKeyPattern(defaultCiteKeyPattern, nonDefaultCiteKeyPatterns);
+        if (
+            !defaultCiteKeyPattern.isEmpty() ||
+            !nonDefaultCiteKeyPatterns.isEmpty()
+        ) {
+            metaData.setCiteKeyPattern(
+                defaultCiteKeyPattern,
+                nonDefaultCiteKeyPatterns
+            );
         }
 
         return metaData;
@@ -149,11 +228,14 @@ public MetaData parse(MetaData metaData, Map<String, String> data, Character key
      * @param value the raw value (as stored in the .bib file)
      */
     static String parseDirectory(String value) {
-        value = StringUtil.removeStringAtTheEnd(value, MetaData.SEPARATOR_STRING);
+        value =
+            StringUtil.removeStringAtTheEnd(value, MetaData.SEPARATOR_STRING);
         if (value.contains("\\\\\\\\")) {
             // This is an escaped Windows UNC path
             return value.replace("\\\\", "\\");
-        } else if (value.contains("\\\\") && !SINGLE_BACKSLASH.matcher(value).find()) {
+        } else if (
+            value.contains("\\\\") && !SINGLE_BACKSLASH.matcher(value).find()
+        ) {
             // All backslashes escaped
             return value.replace("\\\\", "\\");
         } else {
@@ -163,19 +245,28 @@ 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;
     }
 
     /**
      * Returns the first item in the list.
      * If the specified list does not contain exactly one item, then a {@link ParseException} will be thrown.
      */
-    private static String getSingleItem(List<String> value) throws ParseException {
+    private static String getSingleItem(List<String> value)
+        throws ParseException {
         if (value.size() == 1) {
             return value.get(0);
         } else {
-            throw new ParseException("Expected a single item but received " + value);
+            throw new ParseException(
+                "Expected a single item but received " + value
+            );
         }
     }
 
@@ -191,7 +282,10 @@ private static List<String> getAsList(String value) throws ParseException {
             }
         } catch (IOException ex) {
             LOGGER.error("Weird error while parsing meta data.", ex);
-            throw new ParseException("Weird error while parsing meta data.", ex);
+            throw new ParseException(
+                "Weird error while parsing meta data.",
+                ex
+            );
         }
         return orderedValue;
     }
@@ -199,7 +293,8 @@ private static List<String> getAsList(String value) throws ParseException {
     /**
      * Reads the next unit. Units are delimited by ';' (MetaData.SEPARATOR_CHARACTER).
      */
-    private static Optional<String> getNextUnit(Reader reader) throws IOException {
+    private static Optional<String> getNextUnit(Reader reader)
+        throws IOException {
         int c;
         boolean escape = false;
         StringBuilder res = new StringBuilder();
@@ -208,7 +303,10 @@ private static Optional<String> getNextUnit(Reader reader) throws IOException {
                 // 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("\\");
                 }
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 f18ed4e5ac0..b56762a3bb9 100644
--- a/src/main/java/org/jabref/logic/importer/util/ShortDOIService.java
+++ b/src/main/java/org/jabref/logic/importer/util/ShortDOIService.java
@@ -5,14 +5,12 @@
 import java.net.URI;
 import java.net.URISyntaxException;
 import java.net.URL;
-
-import org.jabref.logic.importer.ParseException;
-import org.jabref.logic.net.URLDownload;
-import org.jabref.model.entry.identifier.DOI;
-
 import kong.unirest.json.JSONException;
 import kong.unirest.json.JSONObject;
 import org.apache.http.client.utils.URIBuilder;
+import org.jabref.logic.importer.ParseException;
+import org.jabref.logic.net.URLDownload;
+import org.jabref.model.entry.identifier.DOI;
 
 /**
  * Class for obtaining shortened DOI names. See <a href="https://shortdoi.org">https://shortdoi.org</a>.
@@ -35,7 +33,6 @@ public DOI getShortDOI(DOI doi) throws ShortDOIServiceException {
     }
 
     private JSONObject makeRequest(DOI doi) throws ShortDOIServiceException {
-
         URIBuilder uriBuilder = null;
         URL url = null;
 
@@ -53,7 +50,9 @@ private JSONObject makeRequest(DOI doi) throws ShortDOIServiceException {
         URLDownload urlDownload = new URLDownload(url);
 
         try {
-            JSONObject resultAsJSON = JsonReader.toJsonObject(urlDownload.asInputStream());
+            JSONObject resultAsJSON = JsonReader.toJsonObject(
+                urlDownload.asInputStream()
+            );
             if (resultAsJSON.isEmpty()) {
                 throw new ShortDOIServiceException("Cannot get short DOI");
             }
diff --git a/src/main/java/org/jabref/logic/importer/util/ShortDOIServiceException.java b/src/main/java/org/jabref/logic/importer/util/ShortDOIServiceException.java
index dbcc9e0206f..7007ae0860a 100644
--- a/src/main/java/org/jabref/logic/importer/util/ShortDOIServiceException.java
+++ b/src/main/java/org/jabref/logic/importer/util/ShortDOIServiceException.java
@@ -3,6 +3,7 @@
 import org.jabref.logic.JabRefException;
 
 public class ShortDOIServiceException extends JabRefException {
+
     public ShortDOIServiceException(String message) {
         super(message);
     }
@@ -15,7 +16,11 @@ public ShortDOIServiceException(String message, String localizedMessage) {
         super(message, localizedMessage);
     }
 
-    public ShortDOIServiceException(String message, String localizedMessage, Throwable cause) {
+    public ShortDOIServiceException(
+        String message,
+        String localizedMessage,
+        Throwable cause
+    ) {
         super(message, localizedMessage, cause);
     }
 
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 10037d79a51..b921ea248a3 100644
--- a/src/main/java/org/jabref/logic/importer/util/StaxParser.java
+++ b/src/main/java/org/jabref/logic/importer/util/StaxParser.java
@@ -14,9 +14,13 @@ public class StaxParser {
      * @param reader the stream reader
      * @return Returns the inner XML content
      */
-    public static String getXMLContent(XMLStreamReader reader) throws XMLStreamException {
+    public static String getXMLContent(XMLStreamReader reader)
+        throws XMLStreamException {
         // skip over START DOCUMENT event
-        while (reader.getEventType() == XMLStreamConstants.START_DOCUMENT && reader.hasNext()) {
+        while (
+            reader.getEventType() == XMLStreamConstants.START_DOCUMENT &&
+            reader.hasNext()
+        ) {
             reader.next();
         }
 
@@ -60,7 +64,10 @@ 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));
             }
         }
@@ -68,26 +75,36 @@ public static String getXMLContent(XMLStreamReader reader) throws XMLStreamExcep
         return content.toString().trim();
     }
 
-    private static String getXMLStartTag(XMLStreamReader reader, boolean addNamespaceURI) {
+    private static String getXMLStartTag(
+        XMLStreamReader reader,
+        boolean addNamespaceURI
+    ) {
         StringBuilder startTag = new StringBuilder();
 
         String prefix = reader.getPrefix();
 
-        startTag.append("<")
-                .append(prefix != null && !prefix.isBlank() ? prefix + ":" : "")
-                .append(reader.getName().getLocalPart());
+        startTag
+            .append("<")
+            .append(prefix != null && !prefix.isBlank() ? prefix + ":" : "")
+            .append(reader.getName().getLocalPart());
 
         String namespaceURI = reader.getNamespaceURI();
         if (addNamespaceURI && namespaceURI != null) {
-            startTag.append(" xmlns")
-                    .append(prefix != null && !prefix.isBlank() ? ":" + prefix : "")
-                    .append("=\"")
-                    .append(namespaceURI)
-                    .append("\"");
+            startTag
+                .append(" xmlns")
+                .append(prefix != null && !prefix.isBlank() ? ":" + prefix : "")
+                .append("=\"")
+                .append(namespaceURI)
+                .append("\"");
         }
 
         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()) {
@@ -102,10 +119,11 @@ private static String getXMLEndTag(XMLStreamReader reader) {
         StringBuilder endTag = new StringBuilder();
         String prefix = reader.getPrefix();
 
-        endTag.append("</")
-              .append(prefix != null && !prefix.isBlank() ? prefix + ":" : "")
-              .append(reader.getName().getLocalPart())
-              .append(">");
+        endTag
+            .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 4072b35b8b9..12dcf196103 100644
--- a/src/main/java/org/jabref/logic/integrity/ASCIICharacterChecker.java
+++ b/src/main/java/org/jabref/logic/integrity/ASCIICharacterChecker.java
@@ -1,15 +1,13 @@
 package org.jabref.logic.integrity;
 
+import com.google.common.base.CharMatcher;
 import java.util.ArrayList;
 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;
 
-import com.google.common.base.CharMatcher;
-
 public class ASCIICharacterChecker implements EntryChecker {
 
     /**
@@ -19,10 +17,17 @@ public class ASCIICharacterChecker implements EntryChecker {
     public List<IntegrityMessage> check(BibEntry entry) {
         List<IntegrityMessage> results = new ArrayList<>();
         for (Map.Entry<Field, String> field : entry.getFieldMap().entrySet()) {
-            boolean asciiOnly = CharMatcher.ascii().matchesAllOf(field.getValue());
+            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 0c456ad5ba9..fe0e760aa0f 100644
--- a/src/main/java/org/jabref/logic/integrity/AbbreviationChecker.java
+++ b/src/main/java/org/jabref/logic/integrity/AbbreviationChecker.java
@@ -4,7 +4,6 @@
 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;
@@ -16,7 +15,9 @@ public class AbbreviationChecker implements EntryChecker {
     private final JournalAbbreviationRepository abbreviationRepository;
     private final Set<Field> fields = FieldFactory.getBookNameFields();
 
-    public AbbreviationChecker(JournalAbbreviationRepository abbreviationRepository) {
+    public AbbreviationChecker(
+        JournalAbbreviationRepository abbreviationRepository
+    ) {
         this.abbreviationRepository = abbreviationRepository;
     }
 
@@ -25,8 +26,17 @@ public List<IntegrityMessage> check(BibEntry entry) {
         List<IntegrityMessage> messages = new ArrayList<>();
         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)));
+            value
+                .filter(abbreviationRepository::isAbbreviatedName)
+                .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 ac8f4cb6748..3d665681fba 100644
--- a/src/main/java/org/jabref/logic/integrity/AmpersandChecker.java
+++ b/src/main/java/org/jabref/logic/integrity/AmpersandChecker.java
@@ -1,20 +1,17 @@
 package org.jabref.logic.integrity;
 
+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;
-
 import javafx.util.Pair;
-
 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.FieldProperty;
 
-import com.google.common.base.CharMatcher;
-
 /**
  * Checks if the BibEntry contains unescaped ampersands.
  * This is done in nonverbatim fields. Similar to {@link HTMLCharacterChecker}
@@ -22,26 +19,46 @@
  * The {@link LatexIntegrityChecker} is not able to check unescaped ampersands. Therefore, this separate checker is required.
  */
 public class AmpersandChecker implements EntryChecker {
+
     // matches for an & preceded by any number of \
-    private static final Pattern BACKSLASH_PRECEDED_AMPERSAND = Pattern.compile("\\\\*&");
+    private static final Pattern BACKSLASH_PRECEDED_AMPERSAND = Pattern.compile(
+        "\\\\*&"
+    );
 
     @Override
     public List<IntegrityMessage> check(BibEntry entry) {
-        return entry.getFieldMap().entrySet().stream()
-                    .filter(field -> !field.getKey().getProperties().contains(FieldProperty.VERBATIM))
-                    // 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();
+        return entry
+            .getFieldMap()
+            .entrySet()
+            .stream()
+            .filter(field ->
+                !field.getKey().getProperties().contains(FieldProperty.VERBATIM)
+            )
+            // 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 567094d868e..4848c135717 100644
--- a/src/main/java/org/jabref/logic/integrity/BibStringChecker.java
+++ b/src/main/java/org/jabref/logic/integrity/BibStringChecker.java
@@ -5,7 +5,6 @@
 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;
@@ -18,7 +17,12 @@
 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);
+    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) {
@@ -27,7 +31,9 @@ public List<IntegrityMessage> check(BibEntry entry) {
         Map<Field, String> fields = entry.getFieldMap();
 
         for (Map.Entry<Field, String> field : fields.entrySet()) {
-            if (!field.getKey().getProperties().contains(FieldProperty.VERBATIM)) {
+            if (
+                !field.getKey().getProperties().contains(FieldProperty.VERBATIM)
+            ) {
                 Matcher hashMatcher = UNESCAPED_HASH.matcher(field.getValue());
                 int hashCount = 0;
                 while (hashMatcher.find()) {
@@ -35,8 +41,13 @@ 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 b83e3039e93..8f9c721d007 100644
--- a/src/main/java/org/jabref/logic/integrity/BibTeXEntryTypeChecker.java
+++ b/src/main/java/org/jabref/logic/integrity/BibTeXEntryTypeChecker.java
@@ -2,7 +2,6 @@
 
 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;
@@ -12,6 +11,7 @@
  * BibTeX mode only checker
  */
 public class BibTeXEntryTypeChecker implements EntryChecker {
+
     /**
      * Will check if the current library uses any entry types from another mode.
      * For example it will warn the user if he uses entry types defined for Biblatex inside a BibTeX library.
@@ -20,7 +20,14 @@ 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 3ed8b36a6e7..b0ff5d545a5 100644
--- a/src/main/java/org/jabref/logic/integrity/BooktitleChecker.java
+++ b/src/main/java/org/jabref/logic/integrity/BooktitleChecker.java
@@ -2,7 +2,6 @@
 
 import java.util.Locale;
 import java.util.Optional;
-
 import org.jabref.logic.l10n.Localization;
 import org.jabref.model.strings.StringUtil;
 
@@ -15,7 +14,9 @@ public Optional<String> checkValue(String value) {
         }
 
         if (value.toLowerCase(Locale.ENGLISH).endsWith("conference on")) {
-            return Optional.of(Localization.lang("booktitle ends with 'conference on'"));
+            return Optional.of(
+                Localization.lang("booktitle ends with 'conference on'")
+            );
         }
 
         return Optional.empty();
diff --git a/src/main/java/org/jabref/logic/integrity/BracesCorrector.java b/src/main/java/org/jabref/logic/integrity/BracesCorrector.java
index 691287c72cc..a1f4d17b9c2 100644
--- a/src/main/java/org/jabref/logic/integrity/BracesCorrector.java
+++ b/src/main/java/org/jabref/logic/integrity/BracesCorrector.java
@@ -5,7 +5,9 @@
 
 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 +17,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 bff56b03770..aa475954955 100644
--- a/src/main/java/org/jabref/logic/integrity/BracketChecker.java
+++ b/src/main/java/org/jabref/logic/integrity/BracketChecker.java
@@ -1,7 +1,6 @@
 package org.jabref.logic.integrity;
 
 import java.util.Optional;
-
 import org.jabref.logic.l10n.Localization;
 import org.jabref.model.strings.StringUtil;
 
@@ -20,7 +19,9 @@ public Optional<String> checkValue(String value) {
                 counter++;
             } else if (a == '}') {
                 if (counter == 0) {
-                    return Optional.of(Localization.lang("unexpected closing curly bracket"));
+                    return Optional.of(
+                        Localization.lang("unexpected closing curly bracket")
+                    );
                 } else {
                     counter--;
                 }
@@ -28,7 +29,9 @@ public Optional<String> checkValue(String value) {
         }
 
         if (counter > 0) {
-            return Optional.of(Localization.lang("unexpected opening curly bracket"));
+            return Optional.of(
+                Localization.lang("unexpected opening curly bracket")
+            );
         }
 
         return Optional.empty();
diff --git a/src/main/java/org/jabref/logic/integrity/CitationKeyChecker.java b/src/main/java/org/jabref/logic/integrity/CitationKeyChecker.java
index 931bdd1a52e..bd89bbbe715 100644
--- a/src/main/java/org/jabref/logic/integrity/CitationKeyChecker.java
+++ b/src/main/java/org/jabref/logic/integrity/CitationKeyChecker.java
@@ -3,7 +3,6 @@
 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;
@@ -26,8 +25,15 @@ 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 47d7bff811a..9b05824579f 100644
--- a/src/main/java/org/jabref/logic/integrity/CitationKeyDeviationChecker.java
+++ b/src/main/java/org/jabref/logic/integrity/CitationKeyDeviationChecker.java
@@ -4,7 +4,6 @@
 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;
@@ -17,9 +16,13 @@ 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);
+        this.citationKeyPatternPreferences =
+            Objects.requireNonNull(citationKeyPatternPreferences);
     }
 
     @Override
@@ -32,11 +35,22 @@ 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 ae222225e26..b9912249c2f 100644
--- a/src/main/java/org/jabref/logic/integrity/CitationKeyDuplicationChecker.java
+++ b/src/main/java/org/jabref/logic/integrity/CitationKeyDuplicationChecker.java
@@ -4,7 +4,6 @@
 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;
@@ -25,10 +24,17 @@ public List<IntegrityMessage> check(BibEntry entry) {
             return Collections.emptyList();
         }
 
-        boolean isDuplicate = database.isDuplicateCitationKeyExisting(citeKey.get());
+        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 0f03cccce63..bef3cb1b5a6 100644
--- a/src/main/java/org/jabref/logic/integrity/DatabaseChecker.java
+++ b/src/main/java/org/jabref/logic/integrity/DatabaseChecker.java
@@ -1,7 +1,6 @@
 package org.jabref.logic.integrity;
 
 import java.util.List;
-
 import org.jabref.model.database.BibDatabase;
 
 @FunctionalInterface
diff --git a/src/main/java/org/jabref/logic/integrity/DateChecker.java b/src/main/java/org/jabref/logic/integrity/DateChecker.java
index 83f0077b8aa..8d634f57507 100644
--- a/src/main/java/org/jabref/logic/integrity/DateChecker.java
+++ b/src/main/java/org/jabref/logic/integrity/DateChecker.java
@@ -1,7 +1,6 @@
 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;
diff --git a/src/main/java/org/jabref/logic/integrity/DoiDuplicationChecker.java b/src/main/java/org/jabref/logic/integrity/DoiDuplicationChecker.java
index 41dfcdfba1a..dc644c00392 100644
--- a/src/main/java/org/jabref/logic/integrity/DoiDuplicationChecker.java
+++ b/src/main/java/org/jabref/logic/integrity/DoiDuplicationChecker.java
@@ -1,35 +1,48 @@
 package org.jabref.logic.integrity;
 
+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;
-
 import javafx.collections.ObservableList;
-
 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.jabref.model.entry.identifier.DOI;
 
-import com.google.common.collect.BiMap;
-import com.google.common.collect.HashBiMap;
-
 public class DoiDuplicationChecker implements DatabaseChecker {
 
     @Override
     public List<IntegrityMessage> check(BibDatabase database) {
         ObservableList<BibEntry> bibEntries = database.getEntries();
-        BiMap<DOI, List<BibEntry>> duplicateMap = HashBiMap.create(bibEntries.size());
+        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());
+        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());
     }
 }
diff --git a/src/main/java/org/jabref/logic/integrity/DoiValidityChecker.java b/src/main/java/org/jabref/logic/integrity/DoiValidityChecker.java
index a78c8b4d0ea..5c7249f593a 100644
--- a/src/main/java/org/jabref/logic/integrity/DoiValidityChecker.java
+++ b/src/main/java/org/jabref/logic/integrity/DoiValidityChecker.java
@@ -1,12 +1,12 @@
 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;
 
 public class DoiValidityChecker implements ValueChecker {
+
     @Override
     public Optional<String> checkValue(String value) {
         if (StringUtil.isBlank(value)) {
diff --git a/src/main/java/org/jabref/logic/integrity/EditionChecker.java b/src/main/java/org/jabref/logic/integrity/EditionChecker.java
index 697ca38e85c..0bc8c857e4b 100644
--- a/src/main/java/org/jabref/logic/integrity/EditionChecker.java
+++ b/src/main/java/org/jabref/logic/integrity/EditionChecker.java
@@ -4,17 +4,21 @@
 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> ONLY_NUMERALS = Pattern.compile("[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";
 
     private final BibDatabaseContext bibDatabaseContextEdition;
@@ -22,8 +26,12 @@ public class EditionChecker implements ValueChecker {
     // Allow integers in 'edition' field in BibTeX mode --> see GeneralTab.fml
     private final boolean allowIntegerEdition;
 
-    public EditionChecker(BibDatabaseContext bibDatabaseContext, boolean allowIntegerEdition) {
-        this.bibDatabaseContextEdition = Objects.requireNonNull(bibDatabaseContext);
+    public EditionChecker(
+        BibDatabaseContext bibDatabaseContext,
+        boolean allowIntegerEdition
+    ) {
+        this.bibDatabaseContextEdition =
+            Objects.requireNonNull(bibDatabaseContext);
         this.allowIntegerEdition = allowIntegerEdition;
     }
 
@@ -41,25 +49,41 @@ public Optional<String> checkValue(String value) {
         }
 
         if (value.equals(FIRST_EDITION)) {
-            return Optional.of(Localization.lang("edition of book reported as just 1"));
+            return Optional.of(
+                Localization.lang("edition of book reported as just 1")
+            );
         }
 
         if (bibDatabaseContextEdition.isBiblatexMode()) {
             if (!ONLY_NUMERALS_OR_LITERALS.test(value.trim())) {
-                return Optional.of(Localization.lang("should contain an integer or a literal"));
+                return Optional.of(
+                    Localization.lang("should contain an integer or a literal")
+                );
             }
         } else {
             if (ONLY_NUMERALS.test(value) && (!allowIntegerEdition)) {
-                return Optional.of(Localization.lang("no integer as values for edition allowed"));
+                return Optional.of(
+                    Localization.lang(
+                        "no integer as values for edition allowed"
+                    )
+                );
             }
         }
-        if (!isFirstCharDigit(value) && !FIRST_LETTER_CAPITALIZED.test(value.trim())) {
-            return Optional.of(Localization.lang("should have the first letter capitalized"));
+        if (
+            !isFirstCharDigit(value) &&
+            !FIRST_LETTER_CAPITALIZED.test(value.trim())
+        ) {
+            return Optional.of(
+                Localization.lang("should have the first letter capitalized")
+            );
         }
         return Optional.empty();
     }
 
     boolean isFirstCharDigit(String input) {
-        return !StringUtil.isNullOrEmpty(input) && Character.isDigit(input.charAt(0));
+        return (
+            !StringUtil.isNullOrEmpty(input) &&
+            Character.isDigit(input.charAt(0))
+        );
     }
 }
diff --git a/src/main/java/org/jabref/logic/integrity/EntryChecker.java b/src/main/java/org/jabref/logic/integrity/EntryChecker.java
index bcbe0e79769..adec7aa2eed 100644
--- a/src/main/java/org/jabref/logic/integrity/EntryChecker.java
+++ b/src/main/java/org/jabref/logic/integrity/EntryChecker.java
@@ -1,7 +1,6 @@
 package org.jabref.logic.integrity;
 
 import java.util.List;
-
 import org.jabref.model.entry.BibEntry;
 
 @FunctionalInterface
diff --git a/src/main/java/org/jabref/logic/integrity/EntryLinkChecker.java b/src/main/java/org/jabref/logic/integrity/EntryLinkChecker.java
index ccf64cd858b..f7222c79045 100644
--- a/src/main/java/org/jabref/logic/integrity/EntryLinkChecker.java
+++ b/src/main/java/org/jabref/logic/integrity/EntryLinkChecker.java
@@ -6,7 +6,6 @@
 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;
@@ -27,17 +26,36 @@ public List<IntegrityMessage> check(BibEntry entry) {
         for (Entry<Field, String> field : entry.getFieldMap().entrySet()) {
             Set<FieldProperty> properties = field.getKey().getProperties();
             if (properties.contains(FieldProperty.SINGLE_ENTRY_LINK)) {
-                if (database.getEntryByCitationKey(field.getValue()).isEmpty()) {
-                    result.add(new IntegrityMessage(Localization.lang("Referenced citation key does not exist"), entry,
-                            field.getKey()));
+                if (
+                    database.getEntryByCitationKey(field.getValue()).isEmpty()
+                ) {
+                    result.add(
+                        new IntegrityMessage(
+                            Localization.lang(
+                                "Referenced citation key does not exist"
+                            ),
+                            entry,
+                            field.getKey()
+                        )
+                    );
                 }
             } else if (properties.contains(FieldProperty.MULTIPLE_ENTRY_LINK)) {
-                List<String> keys = new ArrayList<>(Arrays.asList(field.getValue().split(",")));
+                List<String> keys = new ArrayList<>(
+                    Arrays.asList(field.getValue().split(","))
+                );
                 for (String key : keys) {
                     if (database.getEntryByCitationKey(key).isEmpty()) {
-                        result.add(new IntegrityMessage(
-                                Localization.lang("Referenced citation key does not exist") + ": " + key, entry,
-                                field.getKey()));
+                        result.add(
+                            new IntegrityMessage(
+                                Localization.lang(
+                                    "Referenced citation key does not exist"
+                                ) +
+                                ": " +
+                                key,
+                                entry,
+                                field.getKey()
+                            )
+                        );
                     }
                 }
             }
diff --git a/src/main/java/org/jabref/logic/integrity/FieldChecker.java b/src/main/java/org/jabref/logic/integrity/FieldChecker.java
index fa809a884cb..ffb65331ec6 100644
--- a/src/main/java/org/jabref/logic/integrity/FieldChecker.java
+++ b/src/main/java/org/jabref/logic/integrity/FieldChecker.java
@@ -4,7 +4,6 @@
 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;
@@ -14,6 +13,7 @@
  * The "proxy" is configured using the field to handle and the value checker to apply.
  */
 public class FieldChecker implements EntryChecker {
+
     protected final Field field;
     private final ValueChecker checker;
 
@@ -29,6 +29,10 @@ 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 0ed0bb82d10..0b8ee241c42 100644
--- a/src/main/java/org/jabref/logic/integrity/FieldCheckers.java
+++ b/src/main/java/org/jabref/logic/integrity/FieldCheckers.java
@@ -1,9 +1,10 @@
 package org.jabref.logic.integrity;
 
+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;
-
 import org.jabref.logic.journals.JournalAbbreviationRepository;
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.entry.field.Field;
@@ -12,41 +13,78 @@
 import org.jabref.model.entry.field.StandardField;
 import org.jabref.preferences.FilePreferences;
 
-import com.google.common.collect.ArrayListMultimap;
-import com.google.common.collect.Multimap;
-
 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) {
-        ArrayListMultimap<Field, ValueChecker> fieldCheckers = ArrayListMultimap.create(50, 10);
+    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()) {
             fieldCheckers.put(field, new PersonNamesChecker(databaseContext));
         }
         fieldCheckers.put(StandardField.BOOKTITLE, new BooktitleChecker());
         fieldCheckers.put(StandardField.TITLE, new BracketChecker());
-        fieldCheckers.put(StandardField.TITLE, new TitleChecker(databaseContext));
+        fieldCheckers.put(
+            StandardField.TITLE,
+            new TitleChecker(databaseContext)
+        );
         fieldCheckers.put(StandardField.DOI, new DoiValidityChecker());
-        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.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());
         fieldCheckers.put(StandardField.ISSN, new ISSNChecker());
-        fieldCheckers.put(StandardField.MONTH, new MonthChecker(databaseContext));
-        fieldCheckers.put(StandardField.MONTHFILED, new MonthChecker(databaseContext));
+        fieldCheckers.put(
+            StandardField.MONTH,
+            new MonthChecker(databaseContext)
+        );
+        fieldCheckers.put(
+            StandardField.MONTHFILED,
+            new MonthChecker(databaseContext)
+        );
         fieldCheckers.put(StandardField.NOTE, new NoteChecker(databaseContext));
-        fieldCheckers.put(StandardField.PAGES, new PagesChecker(databaseContext));
+        fieldCheckers.put(
+            StandardField.PAGES,
+            new PagesChecker(databaseContext)
+        );
         fieldCheckers.put(StandardField.URL, new UrlChecker());
         fieldCheckers.put(StandardField.YEAR, new YearChecker());
         fieldCheckers.put(StandardField.KEY, new ValidCitationKeyChecker());
-        fieldCheckers.put(InternalField.KEY_FIELD, new ValidCitationKeyChecker());
+        fieldCheckers.put(
+            InternalField.KEY_FIELD,
+            new ValidCitationKeyChecker()
+        );
 
         if (databaseContext.isBiblatexMode()) {
             fieldCheckers.put(StandardField.DATE, new DateChecker());
@@ -60,14 +98,13 @@ private static Multimap<Field, ValueChecker> getAllMap(BibDatabaseContext databa
 
     public List<FieldChecker> getAll() {
         return fieldChecker
-                .entries()
-                .stream()
-                .map(pair -> new FieldChecker(pair.getKey(), pair.getValue()))
-                .collect(Collectors.toList());
+            .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 70d4fc6a568..6893112e27e 100644
--- a/src/main/java/org/jabref/logic/integrity/FileChecker.java
+++ b/src/main/java/org/jabref/logic/integrity/FileChecker.java
@@ -5,7 +5,6 @@
 import java.util.List;
 import java.util.Optional;
 import java.util.stream.Collectors;
-
 import org.jabref.logic.importer.util.FileFieldParser;
 import org.jabref.logic.l10n.Localization;
 import org.jabref.model.database.BibDatabaseContext;
@@ -18,7 +17,10 @@ public class FileChecker implements ValueChecker {
     private final BibDatabaseContext context;
     private final FilePreferences filePreferences;
 
-    public FileChecker(BibDatabaseContext context, FilePreferences filePreferences) {
+    public FileChecker(
+        BibDatabaseContext context,
+        FilePreferences filePreferences
+    ) {
         this.context = context;
         this.filePreferences = filePreferences;
     }
@@ -30,14 +32,19 @@ public Optional<String> checkValue(String value) {
         }
 
         List<LinkedFile> linkedFiles = FileFieldParser
-                .parse(value).stream()
-                .filter(file -> !file.isOnlineLink())
-                .collect(Collectors.toList());
+            .parse(value)
+            .stream()
+            .filter(file -> !file.isOnlineLink())
+            .collect(Collectors.toList());
 
         for (LinkedFile file : linkedFiles) {
             Optional<Path> linkedFile = file.findIn(context, filePreferences);
             if ((!linkedFile.isPresent()) || !Files.exists(linkedFile.get())) {
-                return Optional.of(Localization.lang("link should refer to a correct file path"));
+                return Optional.of(
+                    Localization.lang(
+                        "link should refer to a correct file path"
+                    )
+                );
             }
         }
 
diff --git a/src/main/java/org/jabref/logic/integrity/HTMLCharacterChecker.java b/src/main/java/org/jabref/logic/integrity/HTMLCharacterChecker.java
index 874a9c79c8d..ed9c6e8013c 100644
--- a/src/main/java/org/jabref/logic/integrity/HTMLCharacterChecker.java
+++ b/src/main/java/org/jabref/logic/integrity/HTMLCharacterChecker.java
@@ -2,7 +2,6 @@
 
 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;
@@ -11,15 +10,31 @@
  * Checks, if there are any HTML encoded characters in nonverbatim fields.
  */
 public class HTMLCharacterChecker implements EntryChecker {
+
     // Detect any HTML encoded character
-    private static final Pattern HTML_CHARACTER_PATTERN = Pattern.compile("&[#\\p{Alnum}]+;");
+    private static final Pattern HTML_CHARACTER_PATTERN = Pattern.compile(
+        "&[#\\p{Alnum}]+;"
+    );
 
     @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();
+        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();
     }
 }
diff --git a/src/main/java/org/jabref/logic/integrity/HowPublishedChecker.java b/src/main/java/org/jabref/logic/integrity/HowPublishedChecker.java
index 75e358732fa..b3cbaa7cea9 100644
--- a/src/main/java/org/jabref/logic/integrity/HowPublishedChecker.java
+++ b/src/main/java/org/jabref/logic/integrity/HowPublishedChecker.java
@@ -4,14 +4,15 @@
 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;
 
@@ -32,8 +33,13 @@ public Optional<String> checkValue(String value) {
         }
 
         // BibTeX
-        if (!databaseContext.isBiblatexMode() && !FIRST_LETTER_CAPITALIZED.test(value.trim())) {
-            return Optional.of(Localization.lang("should have the first letter capitalized"));
+        if (
+            !databaseContext.isBiblatexMode() &&
+            !FIRST_LETTER_CAPITALIZED.test(value.trim())
+        ) {
+            return Optional.of(
+                Localization.lang("should have the first letter capitalized")
+            );
         }
 
         return Optional.empty();
diff --git a/src/main/java/org/jabref/logic/integrity/ISBNChecker.java b/src/main/java/org/jabref/logic/integrity/ISBNChecker.java
index c774dc9148a..8821d2ca291 100644
--- a/src/main/java/org/jabref/logic/integrity/ISBNChecker.java
+++ b/src/main/java/org/jabref/logic/integrity/ISBNChecker.java
@@ -1,7 +1,6 @@
 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;
diff --git a/src/main/java/org/jabref/logic/integrity/ISSNChecker.java b/src/main/java/org/jabref/logic/integrity/ISSNChecker.java
index f7205d195b5..8ef2c61be76 100644
--- a/src/main/java/org/jabref/logic/integrity/ISSNChecker.java
+++ b/src/main/java/org/jabref/logic/integrity/ISSNChecker.java
@@ -1,7 +1,6 @@
 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;
diff --git a/src/main/java/org/jabref/logic/integrity/IntegrityCheck.java b/src/main/java/org/jabref/logic/integrity/IntegrityCheck.java
index 1a4207c98c1..91b55b57c5a 100644
--- a/src/main/java/org/jabref/logic/integrity/IntegrityCheck.java
+++ b/src/main/java/org/jabref/logic/integrity/IntegrityCheck.java
@@ -3,7 +3,6 @@
 import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 import java.util.List;
-
 import org.jabref.logic.citationkeypattern.CitationKeyPatternPreferences;
 import org.jabref.logic.journals.JournalAbbreviationRepository;
 import org.jabref.model.database.BibDatabase;
@@ -18,37 +17,62 @@ public class IntegrityCheck {
     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,
+        fieldCheckers =
+            new FieldCheckers(
+                bibDatabaseContext,
                 filePreferences,
                 journalAbbreviationRepository,
-                allowIntegerEdition);
+                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)
-                ));
+        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(
+            entryCheckers.addAll(
+                List.of(
                     new ASCIICharacterChecker(),
                     new NoBibtexFieldChecker(),
-                    new BibTeXEntryTypeChecker())
+                    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 84eb082c455..9041992d0f0 100644
--- a/src/main/java/org/jabref/logic/integrity/IntegrityMessage.java
+++ b/src/main/java/org/jabref/logic/integrity/IntegrityMessage.java
@@ -1,11 +1,11 @@
 package org.jabref.logic.integrity;
 
 import java.util.Objects;
-
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.field.Field;
 
 public final class IntegrityMessage implements Cloneable {
+
     private final BibEntry entry;
     private final Field field;
     private final String message;
@@ -18,7 +18,14 @@ public IntegrityMessage(String message, BibEntry entry, Field field) {
 
     @Override
     public String toString() {
-        return "[" + getEntry().getCitationKey().orElse("") + "] in " + field.getDisplayName() + ": " + getMessage();
+        return (
+            "[" +
+            getEntry().getCitationKey().orElse("") +
+            "] in " +
+            field.getDisplayName() +
+            ": " +
+            getMessage()
+        );
     }
 
     public String getMessage() {
@@ -47,9 +54,11 @@ public boolean equals(Object o) {
             return false;
         }
         IntegrityMessage that = (IntegrityMessage) o;
-        return Objects.equals(entry, that.entry) &&
-                Objects.equals(field, that.field) &&
-                Objects.equals(message, that.message);
+        return (
+            Objects.equals(entry, that.entry) &&
+            Objects.equals(field, that.field) &&
+            Objects.equals(message, that.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 88269b27dd7..deba08f63b2 100644
--- a/src/main/java/org/jabref/logic/integrity/JournalInAbbreviationListChecker.java
+++ b/src/main/java/org/jabref/logic/integrity/JournalInAbbreviationListChecker.java
@@ -4,7 +4,6 @@
 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;
@@ -15,9 +14,13 @@ 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);
+        this.abbreviationRepository =
+            Objects.requireNonNull(abbreviationRepository);
     }
 
     @Override
@@ -29,7 +32,13 @@ 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 41d8c57b70b..d25b22226b5 100644
--- a/src/main/java/org/jabref/logic/integrity/LatexIntegrityChecker.java
+++ b/src/main/java/org/jabref/logic/integrity/LatexIntegrityChecker.java
@@ -1,5 +1,7 @@
 package org.jabref.logic.integrity;
 
+import static uk.ac.ed.ph.snuggletex.definitions.Globals.TEXT_MODE_ONLY;
+
 import java.io.IOException;
 import java.text.MessageFormat;
 import java.util.HashSet;
@@ -8,14 +10,11 @@
 import java.util.ResourceBundle;
 import java.util.Set;
 import java.util.stream.Stream;
-
 import javafx.util.Pair;
-
 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.FieldProperty;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import uk.ac.ed.ph.snuggletex.ErrorCode;
@@ -27,8 +26,6 @@
 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;
-
 /**
  * Similar check to {@link HTMLCharacterChecker}.
  * Here, we use <a href="https://github.com/davemckain/snuggletex">SnuggleTeX</a>, in the {@link HTMLCharacterChecker}, it is searched for HTML characters.
@@ -37,20 +34,57 @@
  */
 public class LatexIntegrityChecker implements EntryChecker {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(SnuggleSession.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(
+        SnuggleSession.class
+    );
     private static final SnuggleEngine ENGINE = new SnuggleEngine();
     private static final SnuggleSession SESSION;
-    private static final ResourceBundle ERROR_MESSAGES = ENGINE.getPackages().get(0).getErrorMessageBundle();
+    private static final ResourceBundle ERROR_MESSAGES = ENGINE
+        .getPackages()
+        .get(0)
+        .getErrorMessageBundle();
     private static final Set<ErrorCode> EXCLUDED_ERRORS = new HashSet<>();
 
     static {
         SnugglePackage snugglePackage = ENGINE.getPackages().get(0);
-        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("textbar", false, 0, TEXT_MODE_ONLY, null, null, null);
+        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(
+            "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);
@@ -61,18 +95,41 @@ public class LatexIntegrityChecker implements EntryChecker {
 
     @Override
     public List<IntegrityMessage> check(BibEntry entry) {
-        return entry.getFieldMap().entrySet().stream()
-                    .filter(field -> !field.getKey().getProperties().contains(FieldProperty.VERBATIM))
-                    .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();
+        return entry
+            .getFieldMap()
+            .entrySet()
+            .stream()
+            .filter(field ->
+                !field.getKey().getProperties().contains(FieldProperty.VERBATIM)
+            )
+            .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 {
@@ -91,9 +148,18 @@ private static Stream<Pair<Field, InputError>> getUnescapedAmpersandsWithCount(M
         return Stream.of(new Pair<>(entry.getKey(), error));
     }
 
-    public static String errorMessageFormatHelper(ErrorCode snuggleTexErrorCode, Object... arguments) {
-        String snuggletexMessagePattern = LatexIntegrityChecker.ERROR_MESSAGES.getString(snuggleTexErrorCode.getName());
-        String snuggletexErrorMessage = MessageFormat.format(snuggletexMessagePattern, arguments);
+    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 f3b34b8f901..40c92839f2b 100644
--- a/src/main/java/org/jabref/logic/integrity/MonthChecker.java
+++ b/src/main/java/org/jabref/logic/integrity/MonthChecker.java
@@ -4,23 +4,26 @@
 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> 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();
+        .compile(
+            "#jan#|#feb#|#mar#|#apr#|#may#|#jun#|#jul#|#aug#|#sep#|#oct#|#nov#|#dec#"
+        )
+        .asPredicate();
 
     private final BibDatabaseContext bibDatabaseContextMonth;
 
     public MonthChecker(BibDatabaseContext bibDatabaseContext) {
-        this.bibDatabaseContextMonth = Objects.requireNonNull(bibDatabaseContext);
+        this.bibDatabaseContextMonth =
+            Objects.requireNonNull(bibDatabaseContext);
     }
 
     /**
@@ -38,13 +41,21 @@ public Optional<String> checkValue(String value) {
         }
 
         // biblatex
-        if (bibDatabaseContextMonth.isBiblatexMode()
-                && !(ONLY_AN_INTEGER.test(value.trim()) || MONTH_NORMALIZED.test(value.trim()))) {
-            return Optional.of(Localization.lang("should be an integer or normalized"));
+        if (
+            bibDatabaseContextMonth.isBiblatexMode() &&
+            !(ONLY_AN_INTEGER.test(value.trim()) ||
+                MONTH_NORMALIZED.test(value.trim()))
+        ) {
+            return Optional.of(
+                Localization.lang("should be an integer or normalized")
+            );
         }
 
         // BibTeX
-        if (!bibDatabaseContextMonth.isBiblatexMode() && !MONTH_NORMALIZED.test(value.trim())) {
+        if (
+            !bibDatabaseContextMonth.isBiblatexMode() &&
+            !MONTH_NORMALIZED.test(value.trim())
+        ) {
             return Optional.of(Localization.lang("should be normalized"));
         }
 
diff --git a/src/main/java/org/jabref/logic/integrity/NoBibtexFieldChecker.java b/src/main/java/org/jabref/logic/integrity/NoBibtexFieldChecker.java
index feb29ad750d..791fe6995d2 100644
--- a/src/main/java/org/jabref/logic/integrity/NoBibtexFieldChecker.java
+++ b/src/main/java/org/jabref/logic/integrity/NoBibtexFieldChecker.java
@@ -3,7 +3,6 @@
 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;
@@ -18,24 +17,37 @@
 public class NoBibtexFieldChecker implements EntryChecker {
 
     private Set<Field> getAllBiblatexOnlyFields() {
-        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());
+        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());
     }
 
     @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());
+        return entry
+            .getFields()
+            .stream()
+            .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 db80442d1e9..d4e837c70ec 100644
--- a/src/main/java/org/jabref/logic/integrity/NoteChecker.java
+++ b/src/main/java/org/jabref/logic/integrity/NoteChecker.java
@@ -4,19 +4,21 @@
 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;
 
     public NoteChecker(BibDatabaseContext bibDatabaseContext) {
-        this.bibDatabaseContextEdition = Objects.requireNonNull(bibDatabaseContext);
+        this.bibDatabaseContextEdition =
+            Objects.requireNonNull(bibDatabaseContext);
     }
 
     /**
@@ -32,8 +34,13 @@ public Optional<String> checkValue(String value) {
         }
 
         // BibTeX
-        if (!bibDatabaseContextEdition.isBiblatexMode() && !FIRST_LETTER_CAPITALIZED.test(value.trim())) {
-            return Optional.of(Localization.lang("should have the first letter capitalized"));
+        if (
+            !bibDatabaseContextEdition.isBiblatexMode() &&
+            !FIRST_LETTER_CAPITALIZED.test(value.trim())
+        ) {
+            return Optional.of(
+                Localization.lang("should have the first letter capitalized")
+            );
         }
 
         return Optional.empty();
diff --git a/src/main/java/org/jabref/logic/integrity/PagesChecker.java b/src/main/java/org/jabref/logic/integrity/PagesChecker.java
index d21caa310ff..fb139e5be33 100644
--- a/src/main/java/org/jabref/logic/integrity/PagesChecker.java
+++ b/src/main/java/org/jabref/logic/integrity/PagesChecker.java
@@ -4,37 +4,39 @@
 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
+    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;
 
     public PagesChecker(BibDatabaseContext databaseContext) {
         if (databaseContext.isBiblatexMode()) {
-            isValidPageNumber = Pattern.compile(PAGES_EXP_BIBLATEX).asPredicate();
+            isValidPageNumber =
+                Pattern.compile(PAGES_EXP_BIBLATEX).asPredicate();
         } else {
             isValidPageNumber = Pattern.compile(PAGES_EXP_BIBTEX).asPredicate();
         }
@@ -55,10 +57,15 @@ public Optional<String> checkValue(String value) {
             return Optional.empty();
         }
 
-        if (Arrays.stream(value.split(","))
+        if (
+            Arrays
+                .stream(value.split(","))
                 .map(String::trim)
-                .anyMatch(pageRange -> !isValidPageNumber.test(pageRange))) {
-            return Optional.of(Localization.lang("should contain a valid page number range"));
+                .anyMatch(pageRange -> !isValidPageNumber.test(pageRange))
+        ) {
+            return Optional.of(
+                Localization.lang("should contain a valid page number range")
+            );
         }
         return Optional.empty();
     }
diff --git a/src/main/java/org/jabref/logic/integrity/PersonNamesChecker.java b/src/main/java/org/jabref/logic/integrity/PersonNamesChecker.java
index 59c39fea13e..999b7685414 100644
--- a/src/main/java/org/jabref/logic/integrity/PersonNamesChecker.java
+++ b/src/main/java/org/jabref/logic/integrity/PersonNamesChecker.java
@@ -2,7 +2,6 @@
 
 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;
@@ -25,9 +24,15 @@ 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"));
         }
 
@@ -37,9 +42,16 @@ public Optional<String> checkValue(String value) {
         //  Last, First and ...
         //  First Last and ...
         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()));
+        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.empty();
diff --git a/src/main/java/org/jabref/logic/integrity/TitleChecker.java b/src/main/java/org/jabref/logic/integrity/TitleChecker.java
index 824c8673f46..55f0c7bf818 100644
--- a/src/main/java/org/jabref/logic/integrity/TitleChecker.java
+++ b/src/main/java/org/jabref/logic/integrity/TitleChecker.java
@@ -3,16 +3,21 @@
 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 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 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 final BibDatabaseContext databaseContext;
 
@@ -40,15 +45,23 @@ 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);
+        String[] splitTitle = DELIMITERS.split(
+            valueOnlySpacesWithinCurlyBraces
+        );
         for (String subTitle : splitTitle) {
             subTitle = subTitle.trim();
             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 a22663e53bf..570facb33b5 100644
--- a/src/main/java/org/jabref/logic/integrity/TypeChecker.java
+++ b/src/main/java/org/jabref/logic/integrity/TypeChecker.java
@@ -3,7 +3,6 @@
 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;
@@ -19,8 +18,15 @@ 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 534b99cd47f..938097ff15d 100644
--- a/src/main/java/org/jabref/logic/integrity/UTF8Checker.java
+++ b/src/main/java/org/jabref/logic/integrity/UTF8Checker.java
@@ -8,12 +8,12 @@
 import java.util.ArrayList;
 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;
 
     /**
@@ -39,10 +39,17 @@ public UTF8Checker(Charset charset) {
     public List<IntegrityMessage> check(BibEntry entry) {
         List<IntegrityMessage> results = new ArrayList<>();
         for (Map.Entry<Field, String> field : entry.getFieldMap().entrySet()) {
-            boolean utfOnly = UTF8EncodingChecker(field.getValue().getBytes(charset));
+            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/UrlChecker.java b/src/main/java/org/jabref/logic/integrity/UrlChecker.java
index 8d99968ac96..8fc47a76b99 100644
--- a/src/main/java/org/jabref/logic/integrity/UrlChecker.java
+++ b/src/main/java/org/jabref/logic/integrity/UrlChecker.java
@@ -1,7 +1,6 @@
 package org.jabref.logic.integrity;
 
 import java.util.Optional;
-
 import org.jabref.logic.l10n.Localization;
 import org.jabref.model.strings.StringUtil;
 
@@ -14,7 +13,10 @@ 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 e23fcb2b41e..f034699f988 100644
--- a/src/main/java/org/jabref/logic/integrity/ValidCitationKeyChecker.java
+++ b/src/main/java/org/jabref/logic/integrity/ValidCitationKeyChecker.java
@@ -1,7 +1,6 @@
 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;
diff --git a/src/main/java/org/jabref/logic/integrity/YearChecker.java b/src/main/java/org/jabref/logic/integrity/YearChecker.java
index 3dc98f75d2d..8c9112a3c99 100644
--- a/src/main/java/org/jabref/logic/integrity/YearChecker.java
+++ b/src/main/java/org/jabref/logic/integrity/YearChecker.java
@@ -3,15 +3,17 @@
 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 = "[(){},.;!?<>%&$]";
 
     /**
@@ -28,11 +30,19 @@ public Optional<String> checkValue(String value) {
         }
 
         if (!CONTAINS_FOUR_DIGIT.test(value.trim())) {
-            return Optional.of(Localization.lang("should contain a four digit number"));
+            return Optional.of(
+                Localization.lang("should contain a four digit number")
+            );
         }
 
-        if (!ENDS_WITH_FOUR_DIGIT.test(value.replaceAll(PUNCTUATION_MARKS, ""))) {
-            return Optional.of(Localization.lang("last four nonpunctuation characters should be numerals"));
+        if (
+            !ENDS_WITH_FOUR_DIGIT.test(value.replaceAll(PUNCTUATION_MARKS, ""))
+        ) {
+            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 a207cc20431..87c83b1f84d 100644
--- a/src/main/java/org/jabref/logic/journals/Abbreviation.java
+++ b/src/main/java/org/jabref/logic/journals/Abbreviation.java
@@ -18,19 +18,31 @@ public Abbreviation(String name, String abbreviation) {
         this(name, abbreviation, "");
     }
 
-    public Abbreviation(String name, String abbreviation, String shortestUniqueAbbreviation) {
-        this(name,
-                abbreviation,
-                // "L. N." becomes "L  N ", we need to remove the double spaces inbetween
-                abbreviation.replace(".", " ").replace("  ", " ").trim(),
-                shortestUniqueAbbreviation.trim());
+    public Abbreviation(
+        String name,
+        String abbreviation,
+        String shortestUniqueAbbreviation
+    ) {
+        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();
-        this.shortestUniqueAbbreviation = shortestUniqueAbbreviation.trim().intern();
+        this.shortestUniqueAbbreviation =
+            shortestUniqueAbbreviation.trim().intern();
     }
 
     public String getName() {
@@ -49,7 +61,10 @@ 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() {
@@ -63,20 +78,27 @@ public int compareTo(Abbreviation toCompare) {
             return nameComparison;
         }
 
-        int abbreviationComparison = getAbbreviation().compareTo(toCompare.getAbbreviation());
+        int abbreviationComparison = getAbbreviation()
+            .compareTo(toCompare.getAbbreviation());
         if (abbreviationComparison != 0) {
             return abbreviationComparison;
         }
 
-        return getShortestUniqueAbbreviation().compareTo(toCompare.getShortestUniqueAbbreviation());
+        return getShortestUniqueAbbreviation()
+            .compareTo(toCompare.getShortestUniqueAbbreviation());
     }
 
     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 +109,13 @@ public String getNext(String current) {
 
     @Override
     public String toString() {
-        return String.format("Abbreviation{name=%s, abbreviation=%s, dotlessAbbreviation=%s, shortestUniqueAbbreviation=%s}",
-                this.name,
-                this.abbreviation,
-                this.dotlessAbbreviation,
-                this.shortestUniqueAbbreviation);
+        return String.format(
+            "Abbreviation{name=%s, abbreviation=%s, dotlessAbbreviation=%s, shortestUniqueAbbreviation=%s}",
+            this.name,
+            this.abbreviation,
+            this.dotlessAbbreviation,
+            this.shortestUniqueAbbreviation
+        );
     }
 
     @Override
@@ -103,11 +127,20 @@ 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
     public int hashCode() {
-        return Objects.hash(getName(), getAbbreviation(), getShortestUniqueAbbreviation());
+        return Objects.hash(
+            getName(),
+            getAbbreviation(),
+            getShortestUniqueAbbreviation()
+        );
     }
 }
diff --git a/src/main/java/org/jabref/logic/journals/AbbreviationFormat.java b/src/main/java/org/jabref/logic/journals/AbbreviationFormat.java
index 21734cad692..56e4e1eb3a5 100644
--- a/src/main/java/org/jabref/logic/journals/AbbreviationFormat.java
+++ b/src/main/java/org/jabref/logic/journals/AbbreviationFormat.java
@@ -8,17 +8,17 @@ 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()
-                .setIgnoreEmptyLines(true)
-                .setDelimiter(delimiter)
-                .setEscape(ESCAPE)
-                .setQuote(QUOTE)
-                .setTrim(true)
-                .build();
+        return CSVFormat.DEFAULT
+            .builder()
+            .setIgnoreEmptyLines(true)
+            .setDelimiter(delimiter)
+            .setEscape(ESCAPE)
+            .setQuote(QUOTE)
+            .setTrim(true)
+            .build();
     }
 
     public static CSVFormat getCSVFormatWithDefaultDilimeter() {
diff --git a/src/main/java/org/jabref/logic/journals/AbbreviationParser.java b/src/main/java/org/jabref/logic/journals/AbbreviationParser.java
index 291016c1259..3bcf80de366 100644
--- a/src/main/java/org/jabref/logic/journals/AbbreviationParser.java
+++ b/src/main/java/org/jabref/logic/journals/AbbreviationParser.java
@@ -8,7 +8,6 @@
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.LinkedHashSet;
-
 import org.apache.commons.csv.CSVParser;
 import org.apache.commons.csv.CSVRecord;
 
@@ -16,11 +15,13 @@
  * Reads abbreviation files (CSV format) into a list of Abbreviations.
  */
 public class AbbreviationParser {
-    private static final Character[] DELIMITERS = {';', ','};
+
+    private static final Character[] DELIMITERS = { ';', ',' };
     private static final char NO_DELIMITER = '\0'; // empty char
 
     // Ensures ordering while preventing duplicates
-    private final LinkedHashSet<Abbreviation> abbreviations = new LinkedHashSet<>();
+    private final LinkedHashSet<Abbreviation> abbreviations =
+        new LinkedHashSet<>();
 
     /*
      * Read the given file, which should contain a list of journal names and their abbreviations. Each line should be
@@ -32,34 +33,53 @@ 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) : "";
-                String shortestUniqueAbbreviation = csvRecord.size() > 2 ? csvRecord.get(2) : "";
+                String abbreviation = csvRecord.size() > 1
+                    ? csvRecord.get(1)
+                    : "";
+                String shortestUniqueAbbreviation = csvRecord.size() > 2
+                    ? csvRecord.get(2)
+                    : "";
 
                 // Check name and abbreviation
                 if (name.isEmpty() || abbreviation.isEmpty()) {
                     return;
                 }
 
-                Abbreviation abbreviationToAdd = new Abbreviation(name, abbreviation, shortestUniqueAbbreviation);
+                Abbreviation abbreviationToAdd = new Abbreviation(
+                    name,
+                    abbreviation,
+                    shortestUniqueAbbreviation
+                );
                 abbreviations.add(abbreviationToAdd);
             }
         }
     }
 
     private char detectDelimiter(Path file) throws IOException {
-        try (BufferedReader reader = Files.newBufferedReader(file, StandardCharsets.UTF_8)) {
+        try (
+            BufferedReader reader = Files.newBufferedReader(
+                file,
+                StandardCharsets.UTF_8
+            )
+        ) {
             String line = reader.readLine();
 
             if (line == null) {
                 return NO_DELIMITER;
             }
-            return Arrays.stream(DELIMITERS)
-                         .filter(s -> line.contains(s.toString()))
-                         .findFirst()
-                         .orElse(NO_DELIMITER);
+            return Arrays
+                .stream(DELIMITERS)
+                .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 e60954c521b..f90adf4f131 100644
--- a/src/main/java/org/jabref/logic/journals/AbbreviationWriter.java
+++ b/src/main/java/org/jabref/logic/journals/AbbreviationWriter.java
@@ -6,7 +6,6 @@
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.List;
-
 import org.apache.commons.csv.CSVPrinter;
 
 /**
@@ -14,8 +13,7 @@
  */
 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 +22,32 @@ 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());
+                    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 e75eb1405e7..f9e4bd052cf 100644
--- a/src/main/java/org/jabref/logic/journals/JournalAbbreviationLoader.java
+++ b/src/main/java/org/jabref/logic/journals/JournalAbbreviationLoader.java
@@ -7,7 +7,6 @@
 import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -22,22 +21,34 @@
  */
 public class JournalAbbreviationLoader {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(JournalAbbreviationLoader.class);
+    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");
+                LOGGER.warn(
+                    "There is no journal-list.mv. We use a default journal list"
+                );
                 repository = new JournalAbbreviationRepository();
             } else {
                 Path tempDir = Files.createTempDirectory("jabref-journal");
@@ -53,16 +64,23 @@ public static JournalAbbreviationRepository loadRepository(JournalAbbreviationPr
         }
 
         // Read external lists
-        List<String> lists = journalAbbreviationPreferences.getExternalJournalLists();
+        List<String> lists =
+            journalAbbreviationPreferences.getExternalJournalLists();
         // might produce NPE in tests
         if (lists != null && !(lists.isEmpty())) {
             // reversing ensures that the latest lists overwrites the former one
             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);
+                    LOGGER.error(
+                        "Cannot read external journal list file {}",
+                        filename,
+                        e
+                    );
                 }
             }
         }
@@ -70,6 +88,8 @@ public static JournalAbbreviationRepository loadRepository(JournalAbbreviationPr
     }
 
     public static JournalAbbreviationRepository loadBuiltInRepository() {
-        return loadRepository(new JournalAbbreviationPreferences(Collections.emptyList(), true));
+        return loadRepository(
+            new JournalAbbreviationPreferences(Collections.emptyList(), true)
+        );
     }
 }
diff --git a/src/main/java/org/jabref/logic/journals/JournalAbbreviationPreferences.java b/src/main/java/org/jabref/logic/journals/JournalAbbreviationPreferences.java
index fb256bbe8ab..1c2f7704a33 100644
--- a/src/main/java/org/jabref/logic/journals/JournalAbbreviationPreferences.java
+++ b/src/main/java/org/jabref/logic/journals/JournalAbbreviationPreferences.java
@@ -1,7 +1,6 @@
 package org.jabref.logic.journals;
 
 import java.util.List;
-
 import javafx.beans.property.BooleanProperty;
 import javafx.beans.property.SimpleBooleanProperty;
 import javafx.collections.FXCollections;
@@ -12,9 +11,12 @@ public class JournalAbbreviationPreferences {
     private final ObservableList<String> externalJournalLists;
     private final BooleanProperty useFJournalField;
 
-    public JournalAbbreviationPreferences(List<String> externalJournalLists,
-                                          boolean useFJournalField) {
-        this.externalJournalLists = FXCollections.observableArrayList(externalJournalLists);
+    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 bfc8053d488..3bd1681a123 100644
--- a/src/main/java/org/jabref/logic/journals/JournalAbbreviationRepository.java
+++ b/src/main/java/org/jabref/logic/journals/JournalAbbreviationRepository.java
@@ -10,7 +10,6 @@
 import java.util.TreeSet;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
-
 import org.h2.mvstore.MVMap;
 import org.h2.mvstore.MVStore;
 
@@ -18,12 +17,17 @@
  * A repository for all journal abbreviations, including add and find methods.
  */
 public class JournalAbbreviationRepository {
+
     static final Pattern QUESTION_MARK = Pattern.compile("\\?");
 
-    private final Map<String, Abbreviation> fullToAbbreviationObject = new HashMap<>();
-    private final Map<String, Abbreviation> abbreviationToAbbreviationObject = new HashMap<>();
-    private final Map<String, Abbreviation> dotlessToAbbreviationObject = new HashMap<>();
-    private final Map<String, Abbreviation> shortestUniqueToAbbreviationObject = new HashMap<>();
+    private final Map<String, Abbreviation> fullToAbbreviationObject =
+        new HashMap<>();
+    private final Map<String, Abbreviation> abbreviationToAbbreviationObject =
+        new HashMap<>();
+    private final Map<String, Abbreviation> dotlessToAbbreviationObject =
+        new HashMap<>();
+    private final Map<String, Abbreviation> shortestUniqueToAbbreviationObject =
+        new HashMap<>();
     private final TreeSet<Abbreviation> customAbbreviations = new TreeSet<>();
 
     /**
@@ -31,20 +35,35 @@ 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();
+                String shortestUniqueAbbreviation =
+                    abbreviation.getShortestUniqueAbbreviation();
                 Abbreviation newAbbreviation = new Abbreviation(
-                        name,
-                        abbrevationString,
-                        shortestUniqueAbbreviation
+                    name,
+                    abbrevationString,
+                    shortestUniqueAbbreviation
                 );
                 fullToAbbreviationObject.put(name, newAbbreviation);
-                abbreviationToAbbreviationObject.put(abbrevationString, newAbbreviation);
-                dotlessToAbbreviationObject.put(newAbbreviation.getDotlessAbbreviation(), newAbbreviation);
-                shortestUniqueToAbbreviationObject.put(shortestUniqueAbbreviation, newAbbreviation);
+                abbreviationToAbbreviationObject.put(
+                    abbrevationString,
+                    newAbbreviation
+                );
+                dotlessToAbbreviationObject.put(
+                    newAbbreviation.getDotlessAbbreviation(),
+                    newAbbreviation
+                );
+                shortestUniqueToAbbreviationObject.put(
+                    shortestUniqueAbbreviation,
+                    newAbbreviation
+                );
             });
         }
     }
@@ -54,9 +73,9 @@ public JournalAbbreviationRepository(Path journalList) {
      */
     public JournalAbbreviationRepository() {
         Abbreviation newAbbreviation = new Abbreviation(
-                "Demonstration",
-                "Demo",
-                "Dem"
+            "Demonstration",
+            "Demo",
+            "Dem"
         );
         fullToAbbreviationObject.put("Demonstration", newAbbreviation);
         abbreviationToAbbreviationObject.put("Demo", newAbbreviation);
@@ -65,20 +84,27 @@ public JournalAbbreviationRepository() {
     }
 
     private static boolean isMatched(String name, Abbreviation abbreviation) {
-        return name.equalsIgnoreCase(abbreviation.getName())
-                || name.equalsIgnoreCase(abbreviation.getAbbreviation())
-                || name.equalsIgnoreCase(abbreviation.getDotlessAbbreviation())
-                || name.equalsIgnoreCase(abbreviation.getShortestUniqueAbbreviation());
+        return (
+            name.equalsIgnoreCase(abbreviation.getName()) ||
+            name.equalsIgnoreCase(abbreviation.getAbbreviation()) ||
+            name.equalsIgnoreCase(abbreviation.getDotlessAbbreviation()) ||
+            name.equalsIgnoreCase(abbreviation.getShortestUniqueAbbreviation())
+        );
     }
 
-    private static boolean isMatchedAbbreviated(String name, Abbreviation abbreviation) {
+    private static boolean isMatchedAbbreviated(
+        String name,
+        Abbreviation abbreviation
+    ) {
         boolean isExpanded = name.equalsIgnoreCase(abbreviation.getName());
         if (isExpanded) {
             return false;
         }
-        return name.equalsIgnoreCase(abbreviation.getAbbreviation())
-                || name.equalsIgnoreCase(abbreviation.getDotlessAbbreviation())
-                || name.equalsIgnoreCase(abbreviation.getShortestUniqueAbbreviation());
+        return (
+            name.equalsIgnoreCase(abbreviation.getAbbreviation()) ||
+            name.equalsIgnoreCase(abbreviation.getDotlessAbbreviation()) ||
+            name.equalsIgnoreCase(abbreviation.getShortestUniqueAbbreviation())
+        );
     }
 
     /**
@@ -89,12 +115,18 @@ public boolean isKnownName(String journalName) {
         if (QUESTION_MARK.matcher(journalName).find()) {
             return false;
         }
-        String journal = journalName.trim().replaceAll(Matcher.quoteReplacement("\\&"), "&");
-        return customAbbreviations.stream().anyMatch(abbreviation -> isMatched(journal, abbreviation))
-                || fullToAbbreviationObject.containsKey(journal)
-                || abbreviationToAbbreviationObject.containsKey(journal)
-                || dotlessToAbbreviationObject.containsKey(journal)
-                || shortestUniqueToAbbreviationObject.containsKey(journal);
+        String journal = journalName
+            .trim()
+            .replaceAll(Matcher.quoteReplacement("\\&"), "&");
+        return (
+            customAbbreviations
+                .stream()
+                .anyMatch(abbreviation -> isMatched(journal, abbreviation)) ||
+            fullToAbbreviationObject.containsKey(journal) ||
+            abbreviationToAbbreviationObject.containsKey(journal) ||
+            dotlessToAbbreviationObject.containsKey(journal) ||
+            shortestUniqueToAbbreviationObject.containsKey(journal)
+        );
     }
 
     /**
@@ -105,11 +137,19 @@ public boolean isAbbreviatedName(String journalName) {
         if (QUESTION_MARK.matcher(journalName).find()) {
             return false;
         }
-        String journal = journalName.trim().replaceAll(Matcher.quoteReplacement("\\&"), "&");
-        return customAbbreviations.stream().anyMatch(abbreviation -> isMatchedAbbreviated(journal, abbreviation))
-                || abbreviationToAbbreviationObject.containsKey(journal)
-                || dotlessToAbbreviationObject.containsKey(journal)
-                || shortestUniqueToAbbreviationObject.containsKey(journal);
+        String journal = journalName
+            .trim()
+            .replaceAll(Matcher.quoteReplacement("\\&"), "&");
+        return (
+            customAbbreviations
+                .stream()
+                .anyMatch(abbreviation ->
+                    isMatchedAbbreviated(journal, abbreviation)
+                ) ||
+            abbreviationToAbbreviationObject.containsKey(journal) ||
+            dotlessToAbbreviationObject.containsKey(journal) ||
+            shortestUniqueToAbbreviationObject.containsKey(journal)
+        );
     }
 
     /**
@@ -119,19 +159,33 @@ public boolean isAbbreviatedName(String journalName) {
      */
     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();
+        String journal = input
+            .trim()
+            .replaceAll(Matcher.quoteReplacement("\\&"), "&");
+
+        Optional<Abbreviation> customAbbreviation = customAbbreviations
+            .stream()
+            .filter(abbreviation -> isMatched(journal, abbreviation))
+            .findFirst();
         if (customAbbreviation.isPresent()) {
             return customAbbreviation;
         }
 
-        return Optional.ofNullable(fullToAbbreviationObject.get(journal))
-                .or(() -> Optional.ofNullable(abbreviationToAbbreviationObject.get(journal)))
-                .or(() -> Optional.ofNullable(dotlessToAbbreviationObject.get(journal)))
-                .or(() -> Optional.ofNullable(shortestUniqueToAbbreviationObject.get(journal)));
+        return Optional
+            .ofNullable(fullToAbbreviationObject.get(journal))
+            .or(() ->
+                Optional.ofNullable(
+                    abbreviationToAbbreviationObject.get(journal)
+                )
+            )
+            .or(() ->
+                Optional.ofNullable(dotlessToAbbreviationObject.get(journal))
+            )
+            .or(() ->
+                Optional.ofNullable(
+                    shortestUniqueToAbbreviationObject.get(journal)
+                )
+            );
     }
 
     public void addCustomAbbreviation(Abbreviation abbreviation) {
@@ -147,7 +201,9 @@ public Collection<Abbreviation> getCustomAbbreviations() {
         return customAbbreviations;
     }
 
-    public void addCustomAbbreviations(Collection<Abbreviation> abbreviationsToAdd) {
+    public void addCustomAbbreviations(
+        Collection<Abbreviation> abbreviationsToAdd
+    ) {
         abbreviationsToAdd.forEach(this::addCustomAbbreviation);
     }
 
diff --git a/src/main/java/org/jabref/logic/journals/JournalInformation.java b/src/main/java/org/jabref/logic/journals/JournalInformation.java
index 406735325c8..eed4b2bfbf4 100644
--- a/src/main/java/org/jabref/logic/journals/JournalInformation.java
+++ b/src/main/java/org/jabref/logic/journals/JournalInformation.java
@@ -1,28 +1,26 @@
 package org.jabref.logic.journals;
 
 import java.util.List;
-
 import javafx.util.Pair;
 
 public record JournalInformation(
-        String title,
-        String publisher,
-        String coverageStartYear,
-        String coverageEndYear,
-        String subjectArea,
-        String country,
-        String categories,
-        String scimagoId,
-        String hIndex,
-        String issn,
-        List<Pair<Integer, Double>> sjrArray,
-        List<Pair<Integer, Double>> snipArray,
-        List<Pair<Integer, Double>> docsThisYear,
-        List<Pair<Integer, Double>> docsPrevious3Years,
-        List<Pair<Integer, Double>> citableDocsPrevious3Years,
-        List<Pair<Integer, Double>> citesOutgoing,
-        List<Pair<Integer, Double>> citesOutgoingPerDoc,
-        List<Pair<Integer, Double>> citesIncomingByRecentlyPublished,
-        List<Pair<Integer, Double>> citesIncomingPerDocByRecentlyPublished
-) {
-}
+    String title,
+    String publisher,
+    String coverageStartYear,
+    String coverageEndYear,
+    String subjectArea,
+    String country,
+    String categories,
+    String scimagoId,
+    String hIndex,
+    String issn,
+    List<Pair<Integer, Double>> sjrArray,
+    List<Pair<Integer, Double>> snipArray,
+    List<Pair<Integer, Double>> docsThisYear,
+    List<Pair<Integer, Double>> docsPrevious3Years,
+    List<Pair<Integer, Double>> citableDocsPrevious3Years,
+    List<Pair<Integer, Double>> citesOutgoing,
+    List<Pair<Integer, Double>> citesOutgoingPerDoc,
+    List<Pair<Integer, Double>> citesIncomingByRecentlyPublished,
+    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 ac5efb19b54..1aedec669a8 100644
--- a/src/main/java/org/jabref/logic/l10n/Encodings.java
+++ b/src/main/java/org/jabref/logic/l10n/Encodings.java
@@ -8,17 +8,24 @@ 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/Localization.java b/src/main/java/org/jabref/logic/l10n/Localization.java
index 75a2c7e91e2..b1df49d77ee 100644
--- a/src/main/java/org/jabref/logic/l10n/Localization.java
+++ b/src/main/java/org/jabref/logic/l10n/Localization.java
@@ -13,9 +13,7 @@
 import java.util.ResourceBundle;
 import java.util.Set;
 import java.util.stream.Collectors;
-
 import org.jabref.architecture.AllowedToUseStandardStreams;
-
 import org.slf4j.LoggerFactory;
 
 /**
@@ -33,14 +31,16 @@
  * 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
@@ -51,10 +51,15 @@ private Localization() {
      */
     public static String lang(String key, Object... params) {
         if (localizedMessages == null) {
-            System.err.println("Messages are not initialized before accessing key: " + key);
+            System.err.println(
+                "Messages are not initialized before accessing key: " + key
+            );
             setLanguage(Language.ENGLISH);
         }
-        var stringParams = Arrays.stream(params).map(Object::toString).toArray(String[]::new);
+        var stringParams = Arrays
+            .stream(params)
+            .map(Object::toString)
+            .toArray(String[]::new);
         return lookup(localizedMessages, key, stringParams);
     }
 
@@ -65,16 +70,28 @@ public static String lang(String key, Object... params) {
      * @param language Language identifier like "en", "de", etc.
      */
     public static void setLanguage(Language language) {
-        Optional<Locale> knownLanguage = Language.convertToSupportedLocale(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;
         }
         // avoid reinitialization of the language bundles
         final Locale langLocale = knownLanguage.get();
-        if ((locale != null) && locale.equals(langLocale) && locale.equals(defaultLocale)) {
+        if (
+            (locale != null) &&
+            locale.equals(langLocale) &&
+            locale.equals(defaultLocale)
+        ) {
             return;
         }
         locale = langLocale;
@@ -84,7 +101,14 @@ 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 " + locale + ", switching to full english language", ex);
+            LoggerFactory
+                .getLogger(Localization.class)
+                .warn(
+                    "Could not find bundles for language " +
+                    locale +
+                    ", switching to full english language",
+                    ex
+                );
             setLanguage(Language.ENGLISH);
         }
     }
@@ -110,8 +134,14 @@ public static LocalizationBundle getMessages() {
      * @param locale Localization to use.
      */
     private static void createResourceBundles(Locale locale) {
-        ResourceBundle messages = ResourceBundle.getBundle(RESOURCE_PREFIX, locale);
-        Objects.requireNonNull(messages, "Could not load " + RESOURCE_PREFIX + " resource.");
+        ResourceBundle messages = ResourceBundle.getBundle(
+            RESOURCE_PREFIX,
+            locale
+        );
+        Objects.requireNonNull(
+            messages,
+            "Could not load " + RESOURCE_PREFIX + " resource."
+        );
         localizedMessages = new LocalizationBundle(createLookupMap(messages));
     }
 
@@ -121,14 +151,23 @@ private static void createResourceBundles(Locale locale) {
      * @param baseBundle JabRef language bundle with keys and values for translations.
      * @return Lookup map for the baseBundle.
      */
-    private static Map<String, String> createLookupMap(ResourceBundle baseBundle) {
-        final ArrayList<String> baseKeys = Collections.list(baseBundle.getKeys());
-        return new HashMap<>(baseKeys.stream().collect(
-                Collectors.toMap(
+    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)
-        ));
+                        baseBundle::getString
+                    )
+                )
+        );
     }
 
     /**
@@ -140,15 +179,28 @@ private static Map<String, String> createLookupMap(ResourceBundle baseBundle) {
      * @param params The parameters that should be inserted into the message
      * @return The final message with replaced parameters.
      */
-    private static String lookup(LocalizationBundle bundle, String key, String... params) {
+    private static String lookup(
+        LocalizationBundle bundle,
+        String key,
+        String... params
+    ) {
         Objects.requireNonNull(key);
 
-        String translation = bundle.containsKey(key) ? bundle.getString(key) : "";
+        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();
+        return new LocalizationKeyParams(translation, params)
+            .replacePlaceholders();
     }
 
     /**
@@ -165,8 +217,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 +237,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 c58a32bc53d..ca02fc7987f 100644
--- a/src/main/java/org/jabref/logic/l10n/LocalizationKey.java
+++ b/src/main/java/org/jabref/logic/l10n/LocalizationKey.java
@@ -17,7 +17,8 @@ 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
+        this.escapedPropertyKey =
+            key
                 .replace("\n", "\\n")
                 .replace(" ", "\\ ")
                 .replace("#", "\\#")
diff --git a/src/main/java/org/jabref/logic/l10n/LocalizationKeyParams.java b/src/main/java/org/jabref/logic/l10n/LocalizationKeyParams.java
index 64647355cc4..2ada6c0690a 100644
--- a/src/main/java/org/jabref/logic/l10n/LocalizationKeyParams.java
+++ b/src/main/java/org/jabref/logic/l10n/LocalizationKeyParams.java
@@ -13,7 +13,9 @@ public LocalizationKeyParams(String key, String... params) {
         this.key = LocalizationKey.fromKey(key);
         this.params = Arrays.asList(params);
         if (this.params.size() > 10) {
-            throw new IllegalStateException("Translations can only have at most 10 parameters");
+            throw new IllegalStateException(
+                "Translations can only have at most 10 parameters"
+            );
         }
     }
 
@@ -22,7 +24,11 @@ public String replacePlaceholders() {
 
         for (int i = 0; i < params.size(); i++) {
             String param = params.get(i);
-            translation = translation.replaceAll("%" + i, Matcher.quoteReplacement(param));
+            translation =
+                translation.replaceAll(
+                    "%" + i,
+                    Matcher.quoteReplacement(param)
+                );
         }
 
         return translation;
diff --git a/src/main/java/org/jabref/logic/l10n/LocalizationLocator.java b/src/main/java/org/jabref/logic/l10n/LocalizationLocator.java
index 90034e8440a..42e57be0512 100644
--- a/src/main/java/org/jabref/logic/l10n/LocalizationLocator.java
+++ b/src/main/java/org/jabref/logic/l10n/LocalizationLocator.java
@@ -1,10 +1,10 @@
 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) {
         return Localization.getMessages();
diff --git a/src/main/java/org/jabref/logic/layout/AbstractParamLayoutFormatter.java b/src/main/java/org/jabref/logic/layout/AbstractParamLayoutFormatter.java
index bbd1344ddf9..3b4b99fefc7 100644
--- a/src/main/java/org/jabref/logic/layout/AbstractParamLayoutFormatter.java
+++ b/src/main/java/org/jabref/logic/layout/AbstractParamLayoutFormatter.java
@@ -7,12 +7,12 @@
  * This is an abstract implementation of ParamLayoutFormatter, which provides some
  * functionality for the handling of argument strings.
  */
-public abstract class AbstractParamLayoutFormatter implements ParamLayoutFormatter {
+public abstract class AbstractParamLayoutFormatter
+    implements ParamLayoutFormatter {
 
     private static final char SEPARATOR = ',';
 
-    protected AbstractParamLayoutFormatter() {
-    }
+    protected AbstractParamLayoutFormatter() {}
 
     /**
      * Parse an argument string and return the parts of the argument. The parts are
@@ -26,7 +26,10 @@ protected static List<String> parseArgument(String arg) {
         StringBuilder current = new StringBuilder();
         boolean escaped = false;
         for (int i = 0; i < arg.length(); i++) {
-            if ((arg.charAt(i) == AbstractParamLayoutFormatter.SEPARATOR) && !escaped) {
+            if (
+                (arg.charAt(i) == AbstractParamLayoutFormatter.SEPARATOR) &&
+                !escaped
+            ) {
                 parts.add(current.toString());
                 current = new StringBuilder();
             } else if (arg.charAt(i) == '\\') {
diff --git a/src/main/java/org/jabref/logic/layout/Layout.java b/src/main/java/org/jabref/logic/layout/Layout.java
index 65587b1f81b..22f50f3a315 100644
--- a/src/main/java/org/jabref/logic/layout/Layout.java
+++ b/src/main/java/org/jabref/logic/layout/Layout.java
@@ -5,12 +5,10 @@
 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;
 
@@ -22,10 +20,12 @@ 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,16 +49,23 @@ 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,
+                            le =
+                                new LayoutEntry(
+                                    blockEntries,
+                                    parsedEntry.i == LayoutHelper.IS_FIELD_END
+                                        ? LayoutHelper.IS_FIELD_START
+                                        : LayoutHelper.IS_GROUP_START,
                                     fileDirForDatabase,
                                     layoutPreferences,
-                                    abbreviationRepository);
+                                    abbreviationRepository
+                                );
                             tmpEntries.add(le);
                             blockEntries = null;
                         } else {
                             LOGGER.debug(blockStart + '\n' + parsedEntry.s);
-                            LOGGER.warn("Nested field/group entries are not implemented!");
+                            LOGGER.warn(
+                                "Nested field/group entries are not implemented!"
+                            );
                             Thread.dumpStack();
                         }
                     }
@@ -68,7 +75,14 @@ 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);
             }
@@ -88,7 +102,10 @@ public void setPostFormatter(LayoutFormatter formatter) {
     }
 
     public String getText() {
-        return layoutEntries.stream().map(LayoutEntry::getText).collect(Collectors.joining("\n"));
+        return layoutEntries
+            .stream()
+            .map(LayoutEntry::getText)
+            .collect(Collectors.joining("\n"));
     }
 
     /**
@@ -121,7 +138,10 @@ public String doLayout(BibEntry bibtex, BibDatabase database) {
      * string references will be replaced by the strings' contents. Even
      * recursive string references are resolved.
      */
-    public String doLayout(BibDatabaseContext databaseContext, Charset encoding) {
+    public String doLayout(
+        BibDatabaseContext databaseContext,
+        Charset encoding
+    ) {
         StringBuilder sb = new StringBuilder(100);
         String fieldText;
 
diff --git a/src/main/java/org/jabref/logic/layout/LayoutEntry.java b/src/main/java/org/jabref/logic/layout/LayoutEntry.java
index b739393a982..9170bbbbc4d 100644
--- a/src/main/java/org/jabref/logic/layout/LayoutEntry.java
+++ b/src/main/java/org/jabref/logic/layout/LayoutEntry.java
@@ -9,7 +9,6 @@
 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,12 +91,14 @@
 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;
 
 class LayoutEntry {
-    private static final Logger LOGGER = LoggerFactory.getLogger(LayoutEntry.class);
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(
+        LayoutEntry.class
+    );
 
     private List<LayoutFormatter> option;
     // Formatter to be run after other formatters:
@@ -112,36 +113,45 @@ 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.get(0).s;
@@ -154,7 +164,10 @@ public LayoutEntry(List<StringInt> parsedEntries,
         type = layoutType;
         text = blockEnd;
         List<StringInt> blockEntries = null;
-        for (StringInt parsedEntry : parsedEntries.subList(1, parsedEntries.size() - 1)) {
+        for (StringInt parsedEntry : parsedEntries.subList(
+            1,
+            parsedEntries.size() - 1
+        )) {
             switch (parsedEntry.i) {
                 case LayoutHelper.IS_FIELD_START:
                 case LayoutHelper.IS_GROUP_START:
@@ -165,13 +178,23 @@ 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 {
-                        LOGGER.warn("Nested field entries are not implemented!");
+                        LOGGER.warn(
+                            "Nested field entries are not implemented!"
+                        );
                     }
                     break;
                 case LayoutHelper.IS_LAYOUT_TEXT:
@@ -183,7 +206,14 @@ 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 +235,12 @@ 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 +259,12 @@ 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,16 +276,26 @@ 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("'" + InternalField.OBSOLETE_TYPE_HEADER
-                    + "' is an obsolete name for the entry type. Please update your layout to use '"
-                    + InternalField.TYPE_HEADER + "' instead.");
+            LOGGER.warn(
+                "'" +
+                InternalField.OBSOLETE_TYPE_HEADER +
+                "' is an obsolete name for the entry type. Please update your layout to use '" +
+                InternalField.TYPE_HEADER +
+                "' instead."
+            );
             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
         }
 
@@ -263,18 +313,31 @@ private String handleOptionField(BibEntry bibtex, BibDatabase database) {
         return fieldEntry;
     }
 
-    private String handleFieldOrGroupStart(BibEntry bibtex, BibDatabase database) {
+    private String handleFieldOrGroupStart(
+        BibEntry bibtex,
+        BibDatabase database
+    ) {
         Optional<String> field;
         boolean negated = false;
         if (type == LayoutHelper.IS_GROUP_START) {
-            field = bibtex.getResolvedFieldOrAlias(FieldFactory.parseField(text), database);
+            field =
+                bibtex.getResolvedFieldOrAlias(
+                    FieldFactory.parseField(text),
+                    database
+                );
         } else if (text.matches(".*(;|(\\&+)).*")) {
             // split the strings along &, && or ; for AND formatter
             String[] parts = text.split("\\s*(;|(\\&+))\\s*");
             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;
                 }
@@ -285,15 +348,24 @@ 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) {
@@ -308,7 +380,13 @@ private String handleFieldOrGroupStart(BibEntry bibtex, BibDatabase database) {
 
                 if (fieldText == null) {
                     if ((i + 1) < layoutEntries.size()) {
-                        if (layoutEntries.get(i + 1).doLayout(bibtex, database).trim().isEmpty()) {
+                        if (
+                            layoutEntries
+                                .get(i + 1)
+                                .doLayout(bibtex, database)
+                                .trim()
+                                .isEmpty()
+                        ) {
                             i++;
                             previousSkipped = true;
                             continue;
@@ -320,8 +398,11 @@ private String handleFieldOrGroupStart(BibEntry bibtex, BibDatabase database) {
                     if (previousSkipped) {
                         int eol = 0;
 
-                        while ((eol < fieldText.length())
-                                && ((fieldText.charAt(eol) == '\n') || (fieldText.charAt(eol) == '\r'))) {
+                        while (
+                            (eol < fieldText.length()) &&
+                            ((fieldText.charAt(eol) == '\n') ||
+                                (fieldText.charAt(eol) == '\r'))
+                        ) {
                             eol++;
                         }
 
@@ -345,24 +426,32 @@ private String handleFieldOrGroupStart(BibEntry bibtex, BibDatabase database) {
      *
      * @param databaseContext Bibtex Database
      */
-    public String doLayout(BibDatabaseContext databaseContext, Charset encoding) {
+    public String doLayout(
+        BibDatabaseContext databaseContext,
+        Charset encoding
+    ) {
         switch (type) {
             case LayoutHelper.IS_LAYOUT_TEXT:
                 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());
+                String field = BibDatabase.getText(
+                    text,
+                    databaseContext.getDatabase()
+                );
                 if (option != null) {
                     for (LayoutFormatter anOption : option) {
                         field = anOption.format(field);
@@ -374,14 +463,15 @@ public String doLayout(BibDatabaseContext databaseContext, Charset encoding) {
                 }
 
                 return field;
-
             case LayoutHelper.IS_ENCODING_NAME:
                 return encoding.displayName();
-
             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;
         }
@@ -411,9 +501,11 @@ private void doOptionField(String s) {
     private LayoutFormatter getLayoutFormatterByName(String name) {
         return switch (name) {
             // For backward compatibility
-            case "HTMLToLatexFormatter", "HtmlToLatex" -> new HtmlToLatexFormatter();
+            case "HTMLToLatexFormatter",
+                "HtmlToLatex" -> new HtmlToLatexFormatter();
             // For backward compatibility
-            case "UnicodeToLatexFormatter", "UnicodeToLatex" -> new UnicodeToLatexFormatter();
+            case "UnicodeToLatexFormatter",
+                "UnicodeToLatex" -> new UnicodeToLatexFormatter();
             case "OOPreFormatter" -> new OOPreFormatter();
             case "AuthorAbbreviator" -> new AuthorAbbreviator();
             case "AuthorAndToSemicolonReplacer" -> new AuthorAndToSemicolonReplacer();
@@ -454,10 +546,13 @@ private LayoutFormatter getLayoutFormatterByName(String name) {
             case "HTMLParagraphs" -> new HTMLParagraphs();
             case "Iso690FormatDate" -> new Iso690FormatDate();
             case "Iso690NamesAuthors" -> new Iso690NamesAuthors();
-            case "JournalAbbreviator" -> new JournalAbbreviator(abbreviationRepository);
+            case "JournalAbbreviator" -> new JournalAbbreviator(
+                abbreviationRepository
+            );
             case "LastPage" -> new LastPage();
-// For backward compatibility
-            case "FormatChars", "LatexToUnicode" -> new LatexToUnicodeFormatter();
+            // For backward compatibility
+            case "FormatChars",
+                "LatexToUnicode" -> new LatexToUnicodeFormatter();
             case "NameFormatter" -> new NameFormatter();
             case "NoSpaceBetweenAbbreviations" -> new NoSpaceBetweenAbbreviations();
             case "Ordinal" -> new Ordinal();
@@ -473,14 +568,20 @@ private LayoutFormatter getLayoutFormatterByName(String name) {
             case "ToUpperCase" -> new ToUpperCase();
             case "XMLChars" -> new XMLChars();
             case "Default" -> new Default();
-            case "FileLink" -> new FileLink(fileDirForDatabase, preferences.getMainFileDirectory());
+            case "FileLink" -> new FileLink(
+                fileDirForDatabase,
+                preferences.getMainFileDirectory()
+            );
             case "Number" -> new Number();
             case "RisAuthors" -> new RisAuthors();
             case "Authors" -> new Authors();
             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();
@@ -495,13 +596,18 @@ 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());
+        List<LayoutFormatter> results = new ArrayList<>(
+            formatterStrings.size()
+        );
+        Map<String, String> userNameFormatter = NameFormatter.getNameFormatters(
+            preferences.getNameFormatterPreferences()
+        );
         for (List<String> strings : formatterStrings) {
             String nameFormatterName = strings.get(0).trim();
 
             // Check if this is a name formatter defined by this export filter:
-            Optional<String> contents = preferences.getCustomExportNameFormatter(nameFormatterName);
+            Optional<String> contents =
+                preferences.getCustomExportNameFormatter(nameFormatterName);
             if (contents.isPresent()) {
                 NameFormatter nf = new NameFormatter();
                 nf.setParameter(contents.get());
@@ -510,10 +616,16 @@ private List<LayoutFormatter> getOptionalLayout(String formatterName) {
             }
 
             // Try to load from formatters in formatter folder
-            LayoutFormatter formatter = getLayoutFormatterByName(nameFormatterName);
+            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);
@@ -521,7 +633,9 @@ private List<LayoutFormatter> getOptionalLayout(String formatterName) {
             }
 
             // Then check whether this is a user defined formatter
-            String formatterParameter = userNameFormatter.get(nameFormatterName);
+            String formatterParameter = userNameFormatter.get(
+                nameFormatterName
+            );
             if (formatterParameter != null) {
                 NameFormatter nf = new NameFormatter();
                 nf.setParameter(formatterParameter);
@@ -549,7 +663,10 @@ public static List<List<String>> parseMethodsCalls(String calls) {
             int start = i;
             if (Character.isJavaIdentifierStart(c[i])) {
                 i++;
-                while ((i < c.length) && (Character.isJavaIdentifierPart(c[i]) || (c[i] == '.'))) {
+                while (
+                    (i < c.length) &&
+                    (Character.isJavaIdentifierPart(c[i]) || (c[i] == '.'))
+                ) {
                     i++;
                 }
                 if ((i < c.length) && (c[i] == '(')) {
@@ -569,8 +686,13 @@ public static List<List<String>> parseMethodsCalls(String calls) {
                             int startParam = i;
                             i++;
                             boolean escaped = false;
-                            while (((i + 1) < c.length)
-                                    && !(!escaped && (c[i] == '"') && (c[i + 1] == ')') && (bracelevel == 0))) {
+                            while (
+                                ((i + 1) < c.length) &&
+                                !(!escaped &&
+                                    (c[i] == '"') &&
+                                    (c[i + 1] == ')') &&
+                                    (bracelevel == 0))
+                            ) {
                                 if (c[i] == '\\') {
                                     escaped = !escaped;
                                 } else if (c[i] == '(') {
@@ -591,7 +713,10 @@ public static List<List<String>> parseMethodsCalls(String calls) {
 
                             int startParam = i;
 
-                            while ((i < c.length) && (!((c[i] == ')') && (bracelevel == 0)))) {
+                            while (
+                                (i < c.length) &&
+                                (!((c[i] == ')') && (bracelevel == 0)))
+                            ) {
                                 if (c[i] == '(') {
                                     bracelevel++;
                                 } else if (c[i] == ')') {
diff --git a/src/main/java/org/jabref/logic/layout/LayoutFormatter.java b/src/main/java/org/jabref/logic/layout/LayoutFormatter.java
index 25b701b3d12..cc7b2241265 100644
--- a/src/main/java/org/jabref/logic/layout/LayoutFormatter.java
+++ b/src/main/java/org/jabref/logic/layout/LayoutFormatter.java
@@ -11,7 +11,6 @@
  */
 @FunctionalInterface
 public interface LayoutFormatter {
-
     /**
      * Failure Mode:
      * <p>
diff --git a/src/main/java/org/jabref/logic/layout/LayoutFormatterPreferences.java b/src/main/java/org/jabref/logic/layout/LayoutFormatterPreferences.java
index b2177cbd543..76818b2e9b7 100644
--- a/src/main/java/org/jabref/logic/layout/LayoutFormatterPreferences.java
+++ b/src/main/java/org/jabref/logic/layout/LayoutFormatterPreferences.java
@@ -3,19 +3,20 @@
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Optional;
-
 import javafx.beans.property.StringProperty;
-
 import org.jabref.logic.layout.format.NameFormatterPreferences;
 
 public class LayoutFormatterPreferences {
 
     private final NameFormatterPreferences nameFormatterPreferences;
     private final StringProperty mainFileDirectoryProperty;
-    private final Map<String, String> customExportNameFormatters = new HashMap<>();
+    private final Map<String, String> customExportNameFormatters =
+        new HashMap<>();
 
-    public LayoutFormatterPreferences(NameFormatterPreferences nameFormatterPreferences,
-                                      StringProperty mainFileDirectoryProperty) {
+    public LayoutFormatterPreferences(
+        NameFormatterPreferences nameFormatterPreferences,
+        StringProperty mainFileDirectoryProperty
+    ) {
         this.nameFormatterPreferences = nameFormatterPreferences;
         this.mainFileDirectoryProperty = mainFileDirectoryProperty;
     }
@@ -29,14 +30,19 @@ public String getMainFileDirectory() {
     }
 
     public Optional<String> getCustomExportNameFormatter(String formatterName) {
-        return Optional.ofNullable(customExportNameFormatters.get(formatterName));
+        return Optional.ofNullable(
+            customExportNameFormatters.get(formatterName)
+        );
     }
 
     public void clearCustomExportNameFormatters() {
         customExportNameFormatters.clear();
     }
 
-    public void putCustomExportNameFormatter(String formatterName, String contents) {
+    public void putCustomExportNameFormatter(
+        String formatterName,
+        String contents
+    ) {
         customExportNameFormatters.put(formatterName, contents);
     }
 }
diff --git a/src/main/java/org/jabref/logic/layout/LayoutHelper.java b/src/main/java/org/jabref/logic/layout/LayoutHelper.java
index 0a01c49dac5..1796a557485 100644
--- a/src/main/java/org/jabref/logic/layout/LayoutHelper.java
+++ b/src/main/java/org/jabref/logic/layout/LayoutHelper.java
@@ -9,7 +9,6 @@
 import java.util.List;
 import java.util.Locale;
 import java.util.Objects;
-
 import org.jabref.logic.journals.JournalAbbreviationRepository;
 
 /**
@@ -44,19 +43,23 @@ 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));
         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,14 +67,23 @@ 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)
-                    || (parsedEntry.i == LayoutHelper.IS_GROUP_END)) {
+            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);
             }
         }
 
-        return new Layout(parsedEntries, fileDirForDatabase, preferences, abbreviationRepository);
+        return new Layout(
+            parsedEntries,
+            fileDirForDatabase,
+            preferences,
+            abbreviationRepository
+        );
     }
 
     public static String getCurrentGroup() {
@@ -101,7 +113,9 @@ private void doBracketedField(final int field) throws IOException {
             if ((currentCharacter == '{') || (currentCharacter == '}')) {
                 if (currentCharacter == '}') {
                     if (buffer != null) {
-                        parsedEntries.add(new StringInt(buffer.toString(), field));
+                        parsedEntries.add(
+                            new StringInt(buffer.toString(), field)
+                        );
                         return;
                     }
                 } else {
@@ -141,12 +155,19 @@ private void doBracketedOptionField() throws IOException {
                         tmp = buffer.toString() + '\n' + option;
                     }
 
-                    parsedEntries.add(new StringInt(tmp, LayoutHelper.IS_OPTION_FIELD));
+                    parsedEntries.add(
+                        new StringInt(tmp, LayoutHelper.IS_OPTION_FIELD)
+                    );
                 }
 
                 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
@@ -161,14 +182,18 @@ private void doBracketedOptionField() throws IOException {
                         // bracketed option must be followed by an (optionally empty) parameter
                         // 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();
+                        String parameter = buffer == null
+                            ? " "
+                            : buffer.toString();
                         if (option == null) {
                             tmp = parameter;
                         } else {
                             tmp = parameter + '\n' + option;
                         }
 
-                        parsedEntries.add(new StringInt(tmp, LayoutHelper.IS_OPTION_FIELD));
+                        parsedEntries.add(
+                            new StringInt(tmp, LayoutHelper.IS_OPTION_FIELD)
+                        );
 
                         return;
                     }
@@ -219,7 +244,12 @@ 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 +257,12 @@ 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;
                 }
@@ -242,7 +277,7 @@ private void parse() throws IOException {
                     buffer = new StringBuilder(100);
                 }
 
-                if ((c != '\\') || escaped) /* (previous == '\\'))) */ {
+                if ((c != '\\') || escaped) /* (previous == '\\'))) */{
                     buffer.append((char) c);
                 }
 
@@ -272,13 +307,18 @@ 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)) {
@@ -307,13 +347,17 @@ private void parseField() throws IOException {
                     // Print the name of the database BIB file.
                     // This is only supported in begin/end layouts, not in
                     // entry layouts.
-                    parsedEntries.add(new StringInt(name, LayoutHelper.IS_FILENAME));
+                    parsedEntries.add(
+                        new StringInt(name, LayoutHelper.IS_FILENAME)
+                    );
                     return;
                 } else if ("filepath".equalsIgnoreCase(name)) {
                     // Print the full path of the database BIB file.
                     // This is only supported in begin/end layouts, not in
                     // entry layouts.
-                    parsedEntries.add(new StringInt(name, LayoutHelper.IS_FILEPATH));
+                    parsedEntries.add(
+                        new StringInt(name, LayoutHelper.IS_FILEPATH)
+                    );
                     return;
                 } else if ("end".equalsIgnoreCase(name)) {
                     // get field name
@@ -327,12 +371,16 @@ private void parseField() throws IOException {
                     // Print the name of the current encoding used for export.
                     // This is only supported in begin/end layouts, not in
                     // entry layouts.
-                    parsedEntries.add(new StringInt(name, LayoutHelper.IS_ENCODING_NAME));
+                    parsedEntries.add(
+                        new StringInt(name, LayoutHelper.IS_ENCODING_NAME)
+                    );
                     return;
                 }
 
                 // for all other cases -> simple command
-                parsedEntries.add(new StringInt(name, LayoutHelper.IS_SIMPLE_COMMAND));
+                parsedEntries.add(
+                    new StringInt(name, LayoutHelper.IS_SIMPLE_COMMAND)
+                );
 
                 return;
             } else {
diff --git a/src/main/java/org/jabref/logic/layout/ParamLayoutFormatter.java b/src/main/java/org/jabref/logic/layout/ParamLayoutFormatter.java
index 7e439544cda..18e4a998d29 100644
--- a/src/main/java/org/jabref/logic/layout/ParamLayoutFormatter.java
+++ b/src/main/java/org/jabref/logic/layout/ParamLayoutFormatter.java
@@ -10,7 +10,6 @@
  * invoked without the setArgument() method being called first.
  */
 public interface ParamLayoutFormatter extends LayoutFormatter {
-
     /**
      * Method for setting the argument of this formatter.
      *
diff --git a/src/main/java/org/jabref/logic/layout/TextBasedPreviewLayout.java b/src/main/java/org/jabref/logic/layout/TextBasedPreviewLayout.java
index 80bdd02aa2d..7dc3eba7948 100644
--- a/src/main/java/org/jabref/logic/layout/TextBasedPreviewLayout.java
+++ b/src/main/java/org/jabref/logic/layout/TextBasedPreviewLayout.java
@@ -2,13 +2,11 @@
 
 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;
 
@@ -16,15 +14,22 @@
  * Implements the preview based JabRef's <a href="https://docs.jabref.org/import-export/export/customexports">Custom export filters</a>.
  */
 public class TextBasedPreviewLayout implements PreviewLayout {
+
     public static final String NAME = "PREVIEW";
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(TextBasedPreviewLayout.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(
+        TextBasedPreviewLayout.class
+    );
     private Layout layout;
     private String text;
     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,14 +44,23 @@ 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);
         }
     }
 
     @Override
-    public String generatePreview(BibEntry entry, BibDatabaseContext databaseContext) {
+    public String generatePreview(
+        BibEntry entry,
+        BibDatabaseContext databaseContext
+    ) {
         if (layout != null) {
             return layout.doLayout(entry, databaseContext.getDatabase());
         } else {
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 dfa1b9d155c..55cef87f3bb 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("; ");
+        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();
                 }
-                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/AuthorFirstFirstCommas.java b/src/main/java/org/jabref/logic/layout/format/AuthorFirstFirstCommas.java
index f2e7a272c8f..d0a70f5bcbb 100644
--- a/src/main/java/org/jabref/logic/layout/format/AuthorFirstFirstCommas.java
+++ b/src/main/java/org/jabref/logic/layout/format/AuthorFirstFirstCommas.java
@@ -15,6 +15,10 @@ public class AuthorFirstFirstCommas implements LayoutFormatter {
 
     @Override
     public String format(String fieldText) {
-        return AuthorList.fixAuthorFirstNameFirstCommas(fieldText, false, false);
+        return AuthorList.fixAuthorFirstNameFirstCommas(
+            fieldText,
+            false,
+            false
+        );
     }
 }
diff --git a/src/main/java/org/jabref/logic/layout/format/AuthorFirstLastCommas.java b/src/main/java/org/jabref/logic/layout/format/AuthorFirstLastCommas.java
index 48365852525..b7a17712567 100644
--- a/src/main/java/org/jabref/logic/layout/format/AuthorFirstLastCommas.java
+++ b/src/main/java/org/jabref/logic/layout/format/AuthorFirstLastCommas.java
@@ -15,6 +15,10 @@ public class AuthorFirstLastCommas implements LayoutFormatter {
 
     @Override
     public String format(String fieldText) {
-        return AuthorList.fixAuthorFirstNameFirstCommas(fieldText, false, false);
+        return AuthorList.fixAuthorFirstNameFirstCommas(
+            fieldText,
+            false,
+            false
+        );
     }
 }
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 5692470fac3..98a4c06e565 100644
--- a/src/main/java/org/jabref/logic/layout/format/Authors.java
+++ b/src/main/java/org/jabref/logic/layout/format/Authors.java
@@ -4,7 +4,6 @@
 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;
@@ -110,7 +109,9 @@ public void setArgument(String arg) {
     }
 
     private void handleArgument(String key, String value) {
-        if (Authors.AUTHOR_ORDER.contains(key.trim().toLowerCase(Locale.ROOT))) {
+        if (
+            Authors.AUTHOR_ORDER.contains(key.trim().toLowerCase(Locale.ROOT))
+        ) {
             if (comp(key, "FirstFirst")) {
                 flMode = Authors.FIRST_FIRST;
             } else if (comp(key, "LastFirst")) {
@@ -118,7 +119,9 @@ private void handleArgument(String key, String value) {
             } else if (comp(key, "LastFirstFirstFirst")) {
                 flMode = Authors.LF_FF;
             }
-        } else if (Authors.AUTHOR_ABRV.contains(key.trim().toLowerCase(Locale.ROOT))) {
+        } else if (
+            Authors.AUTHOR_ABRV.contains(key.trim().toLowerCase(Locale.ROOT))
+        ) {
             if (comp(key, "FullName")) {
                 abbreviate = false;
             } else if (comp(key, "Initials")) {
@@ -136,7 +139,9 @@ private void handleArgument(String key, String value) {
                 abbreviate = true;
                 abbrSpaces = false;
             }
-        } else if (Authors.AUTHOR_PUNC.contains(key.trim().toLowerCase(Locale.ROOT))) {
+        } else if (
+            Authors.AUTHOR_PUNC.contains(key.trim().toLowerCase(Locale.ROOT))
+        ) {
             if (comp(key, "FullPunc")) {
                 abbrDots = true;
                 lastFirstSeparator = ", ";
@@ -150,7 +155,12 @@ 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 +241,12 @@ 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);
@@ -240,11 +255,19 @@ public String format(String fieldText) {
                 }
             }
         } else {
-            for (int i = 0; i < Math.min(al.getNumberOfAuthors() - 1, authorNumberEtAl); i++) {
+            for (
+                int i = 0;
+                i < Math.min(al.getNumberOfAuthors() - 1, authorNumberEtAl);
+                i++
+            ) {
                 if (i > 0) {
                     sb.append(separator);
                 }
-                addSingleName(sb, al.getAuthor(i), flMode == Authors.FIRST_FIRST);
+                addSingleName(
+                    sb,
+                    al.getAuthor(i),
+                    flMode == Authors.FIRST_FIRST
+                );
             }
             sb.append(etAlString);
         }
@@ -254,10 +277,16 @@ public String format(String fieldText) {
 
     private void addSingleName(StringBuilder sb, Author a, boolean firstFirst) {
         StringBuilder lastNameSB = new StringBuilder();
-        a.getVon().filter(von -> !von.isEmpty()).ifPresent(von -> lastNameSB.append(von).append(' '));
+        a
+            .getVon()
+            .filter(von -> !von.isEmpty())
+            .ifPresent(von -> lastNameSB.append(von).append(' '));
         a.getLast().ifPresent(lastNameSB::append);
         String jrSeparator = " ";
-        a.getJr().filter(jr -> !jr.isEmpty()).ifPresent(jr -> lastNameSB.append(jrSeparator).append(jr));
+        a
+            .getJr()
+            .filter(jr -> !jr.isEmpty())
+            .ifPresent(jr -> lastNameSB.append(jrSeparator).append(jr));
 
         String firstNameResult = "";
         if (a.getFirst().isPresent()) {
@@ -271,9 +300,11 @@ private void addSingleName(StringBuilder sb, Author a, boolean firstFirst) {
                     firstNameResult = a.getFirst().get();
                     int index = firstNameResult.indexOf(' ');
                     if (index >= 0) {
-                        firstNameResult = firstNameResult.substring(0, index + 1);
+                        firstNameResult =
+                            firstNameResult.substring(0, index + 1);
                         if (abbr.length() > 3) {
-                            firstNameResult = firstNameResult + abbr.substring(3);
+                            firstNameResult =
+                                firstNameResult + abbr.substring(3);
                         }
                     }
                 }
@@ -295,7 +326,10 @@ private void addSingleName(StringBuilder sb, Author a, boolean firstFirst) {
             sb.append(firstNameResult).append(firstFirstSeparator);
             sb.append(lastNameSB);
         } else {
-            sb.append(lastNameSB).append(lastFirstSeparator).append(firstNameResult);
+            sb
+                .append(lastNameSB)
+                .append(lastFirstSeparator)
+                .append(firstNameResult);
         }
     }
 }
diff --git a/src/main/java/org/jabref/logic/layout/format/CSLType.java b/src/main/java/org/jabref/logic/layout/format/CSLType.java
index aac863567fe..ba1c0c22424 100644
--- a/src/main/java/org/jabref/logic/layout/format/CSLType.java
+++ b/src/main/java/org/jabref/logic/layout/format/CSLType.java
@@ -14,7 +14,6 @@ public String format(String value) {
             case Report, TechReport -> "report";
             case Thesis, MastersThesis, PhdThesis -> "thesis";
             case WWW, Online -> "webpage";
-
             default -> "no-type";
         };
     }
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 f54ca3a8939..44ddd220e2a 100644
--- a/src/main/java/org/jabref/logic/layout/format/CompositeFormat.java
+++ b/src/main/java/org/jabref/logic/layout/format/CompositeFormat.java
@@ -3,7 +3,6 @@
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
-
 import org.jabref.logic.layout.LayoutFormatter;
 
 /**
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 85bd7e0d950..c37063bd4e8 100644
--- a/src/main/java/org/jabref/logic/layout/format/CreateBibORDFAuthors.java
+++ b/src/main/java/org/jabref/logic/layout/format/CreateBibORDFAuthors.java
@@ -33,12 +33,24 @@ public String format(String fieldText) {
         return sb.toString();
     }
 
-    private static void singleAuthor(StringBuilder sb, String author, int position) {
+    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:position>").append(position).append("</bibo:position>\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/CreateDocBook4Authors.java b/src/main/java/org/jabref/logic/layout/format/CreateDocBook4Authors.java
index c873c8fbd24..b6efacd3fcc 100644
--- a/src/main/java/org/jabref/logic/layout/format/CreateDocBook4Authors.java
+++ b/src/main/java/org/jabref/logic/layout/format/CreateDocBook4Authors.java
@@ -14,7 +14,12 @@ public String format(String fieldText) {
         StringBuilder sb = new StringBuilder(100);
         AuthorList al = AuthorList.parse(fieldText);
         DocBookAuthorFormatter formatter = new DocBookAuthorFormatter();
-        formatter.addBody(sb, al, StandardField.AUTHOR.getName(), DocBookVersion.DOCBOOK_4);
+        formatter.addBody(
+            sb,
+            al,
+            StandardField.AUTHOR.getName(),
+            DocBookVersion.DOCBOOK_4
+        );
         return sb.toString();
     }
 }
diff --git a/src/main/java/org/jabref/logic/layout/format/CreateDocBook4Editors.java b/src/main/java/org/jabref/logic/layout/format/CreateDocBook4Editors.java
index 36b03c3937a..7c834849379 100644
--- a/src/main/java/org/jabref/logic/layout/format/CreateDocBook4Editors.java
+++ b/src/main/java/org/jabref/logic/layout/format/CreateDocBook4Editors.java
@@ -15,7 +15,12 @@ public String format(String fieldText) {
         StringBuilder sb = new StringBuilder(100);
         AuthorList al = AuthorList.parse(fieldText);
         DocBookAuthorFormatter formatter = new DocBookAuthorFormatter();
-        formatter.addBody(sb, al, StandardField.EDITOR.getName(), DocBookVersion.DOCBOOK_4);
+        formatter.addBody(
+            sb,
+            al,
+            StandardField.EDITOR.getName(),
+            DocBookVersion.DOCBOOK_4
+        );
         return sb.toString();
     }
 }
diff --git a/src/main/java/org/jabref/logic/layout/format/CreateDocBook5Authors.java b/src/main/java/org/jabref/logic/layout/format/CreateDocBook5Authors.java
index f5b17b62987..4154f3d3b3a 100644
--- a/src/main/java/org/jabref/logic/layout/format/CreateDocBook5Authors.java
+++ b/src/main/java/org/jabref/logic/layout/format/CreateDocBook5Authors.java
@@ -15,7 +15,12 @@ public String format(String fieldText) {
         AuthorList al = AuthorList.parse(fieldText);
 
         DocBookAuthorFormatter authorFormatter = new DocBookAuthorFormatter();
-        authorFormatter.addBody(sb, al, StandardField.AUTHOR.getName(), DocBookVersion.DOCBOOK_5);
+        authorFormatter.addBody(
+            sb,
+            al,
+            StandardField.AUTHOR.getName(),
+            DocBookVersion.DOCBOOK_5
+        );
         return sb.toString();
     }
 }
diff --git a/src/main/java/org/jabref/logic/layout/format/CreateDocBook5Editors.java b/src/main/java/org/jabref/logic/layout/format/CreateDocBook5Editors.java
index c98e256d733..4205be58ff6 100644
--- a/src/main/java/org/jabref/logic/layout/format/CreateDocBook5Editors.java
+++ b/src/main/java/org/jabref/logic/layout/format/CreateDocBook5Editors.java
@@ -15,7 +15,12 @@ public String format(String fieldText) {
         StringBuilder sb = new StringBuilder(100);
         AuthorList al = AuthorList.parse(fieldText);
         DocBookAuthorFormatter formatter = new DocBookAuthorFormatter();
-        formatter.addBody(sb, al, StandardField.EDITOR.getName(), DocBookVersion.DOCBOOK_5);
+        formatter.addBody(
+            sb,
+            al,
+            StandardField.EDITOR.getName(),
+            DocBookVersion.DOCBOOK_5
+        );
         return sb.toString();
     }
 }
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 6388ec67770..491f63c6306 100644
--- a/src/main/java/org/jabref/logic/layout/format/CurrentDate.java
+++ b/src/main/java/org/jabref/logic/layout/format/CurrentDate.java
@@ -2,7 +2,6 @@
 
 import java.time.ZonedDateTime;
 import java.time.format.DateTimeFormatter;
-
 import org.jabref.logic.layout.LayoutFormatter;
 
 /**
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 0ae0483c698..57f15b61690 100644
--- a/src/main/java/org/jabref/logic/layout/format/DOICheck.java
+++ b/src/main/java/org/jabref/logic/layout/format/DOICheck.java
@@ -9,6 +9,7 @@
  * Will prepend "http://doi.org/" if only DOI and not an URL is given.
  */
 public class DOICheck implements LayoutFormatter {
+
     @Override
     public String format(String fieldText) {
         if (fieldText == null) {
diff --git a/src/main/java/org/jabref/logic/layout/format/DOIStrip.java b/src/main/java/org/jabref/logic/layout/format/DOIStrip.java
index 0aaa27c5f9a..5ca19897e05 100644
--- a/src/main/java/org/jabref/logic/layout/format/DOIStrip.java
+++ b/src/main/java/org/jabref/logic/layout/format/DOIStrip.java
@@ -7,6 +7,7 @@
  * Will strip any prefixes from the Doi field, in order to output only the Doi number
  */
 public class DOIStrip implements LayoutFormatter {
+
     @Override
     public String format(String fieldText) {
         if (fieldText == null) {
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 e53a3f7dd95..3967dcdcea4 100644
--- a/src/main/java/org/jabref/logic/layout/format/DateFormatter.java
+++ b/src/main/java/org/jabref/logic/layout/format/DateFormatter.java
@@ -2,7 +2,6 @@
 
 import java.time.LocalDate;
 import java.time.format.DateTimeFormatter;
-
 import org.jabref.logic.layout.ParamLayoutFormatter;
 
 public class DateFormatter implements ParamLayoutFormatter {
@@ -12,7 +11,10 @@ public class DateFormatter implements ParamLayoutFormatter {
     @Override
     public String format(String fieldText) {
         DateTimeFormatter formatter = DateTimeFormatter.ofPattern(formatString);
-        LocalDate date = LocalDate.parse(fieldText, DateTimeFormatter.ISO_LOCAL_DATE);
+        LocalDate date = LocalDate.parse(
+            fieldText,
+            DateTimeFormatter.ISO_LOCAL_DATE
+        );
         return date.format(formatter);
     }
 
diff --git a/src/main/java/org/jabref/logic/layout/format/Default.java b/src/main/java/org/jabref/logic/layout/format/Default.java
index 3467c378c95..4e3b0863cb4 100644
--- a/src/main/java/org/jabref/logic/layout/format/Default.java
+++ b/src/main/java/org/jabref/logic/layout/format/Default.java
@@ -17,6 +17,8 @@ public void setArgument(String arg) {
 
     @Override
     public String format(String fieldText) {
-        return (fieldText == null) || fieldText.isEmpty() ? defValue : fieldText;
+        return (fieldText == null) || fieldText.isEmpty()
+            ? defValue
+            : fieldText;
     }
 }
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 01bdfe29c46..7b43adfcee8 100644
--- a/src/main/java/org/jabref/logic/layout/format/DocBookAuthorFormatter.java
+++ b/src/main/java/org/jabref/logic/layout/format/DocBookAuthorFormatter.java
@@ -13,26 +13,52 @@ public class DocBookAuthorFormatter {
     /**
      * @param tagName Editor or author field/tag
      */
-    public void addBody(StringBuilder sb, AuthorList al, String tagName, DocBookVersion version) {
+    public void addBody(
+        StringBuilder sb,
+        AuthorList al,
+        String tagName,
+        DocBookVersion version
+    ) {
         for (int i = 0; i < al.getNumberOfAuthors(); i++) {
             sb.append('<').append(tagName).append('>');
             if (version == DocBookVersion.DOCBOOK_5) {
                 sb.append("<personname>");
             }
             Author a = al.getAuthor(i);
-            a.getFirst().filter(first -> !first.isEmpty()).ifPresent(first -> sb.append("<firstname>")
-                                                                                .append(XML_CHARS.format(first)).append("</firstname>"));
-            a.getVon().filter(von -> !von.isEmpty()).ifPresent(von -> sb.append("<othername>")
-                                                                        .append(XML_CHARS.format(von)).append("</othername>"));
-            a.getLast().filter(last -> !last.isEmpty()).ifPresent(last -> {
-                sb.append("<surname>").append(XML_CHARS.format(last));
-                a.getJr().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
+                .getFirst()
+                .filter(first -> !first.isEmpty())
+                .ifPresent(first ->
+                    sb
+                        .append("<firstname>")
+                        .append(XML_CHARS.format(first))
+                        .append("</firstname>")
+                );
+            a
+                .getVon()
+                .filter(von -> !von.isEmpty())
+                .ifPresent(von ->
+                    sb
+                        .append("<othername>")
+                        .append(XML_CHARS.format(von))
+                        .append("</othername>")
+                );
+            a
+                .getLast()
+                .filter(last -> !last.isEmpty())
+                .ifPresent(last -> {
+                    sb.append("<surname>").append(XML_CHARS.format(last));
+                    a
+                        .getJr()
+                        .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/DocBookVersion.java b/src/main/java/org/jabref/logic/layout/format/DocBookVersion.java
index 9b435717f07..63bfa72ab11 100644
--- a/src/main/java/org/jabref/logic/layout/format/DocBookVersion.java
+++ b/src/main/java/org/jabref/logic/layout/format/DocBookVersion.java
@@ -2,5 +2,5 @@
 
 public enum DocBookVersion {
     DOCBOOK_4,
-    DOCBOOK_5
+    DOCBOOK_5,
 }
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 73bd58e7e76..575e0956fcf 100644
--- a/src/main/java/org/jabref/logic/layout/format/FileLink.java
+++ b/src/main/java/org/jabref/logic/layout/format/FileLink.java
@@ -3,7 +3,6 @@
 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;
@@ -58,9 +57,10 @@ 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 a95560baeff..40f8ec9d433 100644
--- a/src/main/java/org/jabref/logic/layout/format/HTMLChars.java
+++ b/src/main/java/org/jabref/logic/layout/format/HTMLChars.java
@@ -2,7 +2,6 @@
 
 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;
@@ -12,16 +11,18 @@
  */
 public class HTMLChars implements LayoutFormatter {
 
-    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;
 
     @Override
     public String format(String inField) {
         int i;
-        String field = inField.replaceAll("&|\\\\&", "&amp;") // Replace & and \& 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("\\$([^$]*)\\$", "\\{$1\\}"); // Replace $...$ with {...} to simplify conversion
+        String field = inField
+            .replaceAll("&|\\\\&", "&amp;") // Replace & and \& 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("\\$([^$]*)\\$", "\\{$1\\}"); // Replace $...$ with {...} to simplify conversion
 
         StringBuilder sb = new StringBuilder();
         StringBuilder currentCommand = null;
@@ -47,16 +48,22 @@ public String format(String inField) {
                 currentCommand = new StringBuilder();
             } else if (!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) {
                     sb.append(c);
                 } else {
                     currentCommand.append(c);
-                    testCharCom:
-                    if ((currentCommand.length() == 1)
-                            && StringUtil.SPECIAL_COMMAND_CHARS.contains(currentCommand.toString())) {
+                    testCharCom:if (
+                        (currentCommand.length() == 1) &&
+                        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)) {
@@ -76,7 +83,9 @@ public String format(String inField) {
                         }
                         String result = HTML_CHARS.get(command + commandBody);
 
-                        sb.append(Objects.requireNonNullElse(result, commandBody));
+                        sb.append(
+                            Objects.requireNonNullElse(result, commandBody)
+                        );
 
                         incommand = false;
                         escaped = false;
@@ -89,14 +98,18 @@ public String format(String inField) {
                              * then keep
                              * the text of the parameter intact.
                              */
-                            sb.append(Objects.requireNonNullElse(result, command));
+                            sb.append(
+                                Objects.requireNonNullElse(result, command)
+                            );
                         }
                     }
                 }
             } else {
                 if (!incommand) {
                     sb.append(c);
-                } else if (Character.isWhitespace(c) || (c == '{') || (c == '}')) {
+                } else if (
+                    Character.isWhitespace(c) || (c == '{') || (c == '}')
+                ) {
                     String command = currentCommand.toString();
 
                     // Test if we are dealing with a formatting
@@ -106,7 +119,14 @@ public String format(String inField) {
                     if (!tag.isEmpty()) {
                         String part = StringUtil.getPart(field, 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 argument = StringUtil.getPart(field, i, true);
                         i += argument.length();
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 e14028519bd..38376d8e549 100644
--- a/src/main/java/org/jabref/logic/layout/format/HTMLParagraphs.java
+++ b/src/main/java/org/jabref/logic/layout/format/HTMLParagraphs.java
@@ -2,7 +2,6 @@
 
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
-
 import org.jabref.logic.layout.LayoutFormatter;
 
 /**
@@ -11,7 +10,9 @@
  */
 public class HTMLParagraphs implements LayoutFormatter {
 
-    private static final Pattern BEFORE_NEW_LINES_PATTERN = Pattern.compile("(.*?)\\n\\s*\\n");
+    private static final Pattern BEFORE_NEW_LINES_PATTERN = Pattern.compile(
+        "(.*?)\\n\\s*\\n"
+    );
 
     @Override
     public String format(String fieldText) {
@@ -25,7 +26,9 @@ public String format(String fieldText) {
             return trimmedFieldText;
         }
 
-        Matcher m = HTMLParagraphs.BEFORE_NEW_LINES_PATTERN.matcher(trimmedFieldText);
+        Matcher m = HTMLParagraphs.BEFORE_NEW_LINES_PATTERN.matcher(
+            trimmedFieldText
+        );
         StringBuilder s = new StringBuilder();
         while (m.find()) {
             String middle = m.group(1).trim();
diff --git a/src/main/java/org/jabref/logic/layout/format/HayagrivaType.java b/src/main/java/org/jabref/logic/layout/format/HayagrivaType.java
index cbe30bf06d5..26e086976dd 100644
--- a/src/main/java/org/jabref/logic/layout/format/HayagrivaType.java
+++ b/src/main/java/org/jabref/logic/layout/format/HayagrivaType.java
@@ -16,7 +16,6 @@ public String format(String value) {
             case WWW, Online -> "web";
             case Proceedings -> "proceedings";
             case Reference -> "reference";
-
             default -> "Misc";
         };
     }
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 7d276074cd1..a0b3fb7d6a8 100644
--- a/src/main/java/org/jabref/logic/layout/format/IfPlural.java
+++ b/src/main/java/org/jabref/logic/layout/format/IfPlural.java
@@ -1,7 +1,6 @@
 package org.jabref.logic.layout.format;
 
 import java.util.List;
-
 import org.jabref.logic.layout.AbstractParamLayoutFormatter;
 
 /**
@@ -33,7 +32,9 @@ public void setArgument(String arg) {
 
     @Override
     public String format(String fieldText) {
-        if ((fieldText == null) || fieldText.isEmpty() || (pluralText == null)) {
+        if (
+            (fieldText == null) || fieldText.isEmpty() || (pluralText == null)
+        ) {
             return ""; // TODO: argument missing or invalid. Print an error message here?
         }
         if (fieldText.matches(".*\\sand\\s.*")) {
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 cf1f05ddae2..2c2f3f3881e 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,12 @@ 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 c68d1bc65b2..b324ac95926 100644
--- a/src/main/java/org/jabref/logic/layout/format/Iso690NamesAuthors.java
+++ b/src/main/java/org/jabref/logic/layout/format/Iso690NamesAuthors.java
@@ -1,7 +1,6 @@
 package org.jabref.logic.layout.format;
 
 import java.util.Locale;
-
 import org.jabref.logic.layout.LayoutFormatter;
 import org.jabref.model.strings.StringUtil;
 
@@ -45,7 +44,10 @@ 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);
@@ -55,7 +57,10 @@ public String format(String s) {
                     // 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 b1dc46b7aba..8c7ffbb4a66 100644
--- a/src/main/java/org/jabref/logic/layout/format/JournalAbbreviator.java
+++ b/src/main/java/org/jabref/logic/layout/format/JournalAbbreviator.java
@@ -1,7 +1,6 @@
 package org.jabref.logic.layout.format;
 
 import java.util.Objects;
-
 import org.jabref.logic.journals.JournalAbbreviationRepository;
 import org.jabref.logic.layout.LayoutFormatter;
 
diff --git a/src/main/java/org/jabref/logic/layout/format/LatexToUnicodeFormatter.java b/src/main/java/org/jabref/logic/layout/format/LatexToUnicodeFormatter.java
index d0d40370cd3..e9c28e7d84f 100644
--- a/src/main/java/org/jabref/logic/layout/format/LatexToUnicodeFormatter.java
+++ b/src/main/java/org/jabref/logic/layout/format/LatexToUnicodeFormatter.java
@@ -9,7 +9,9 @@
  * This formatter converts LaTeX character sequences their equivalent unicode characters,
  * and removes other LaTeX commands without handling them.
  */
-public class LatexToUnicodeFormatter extends Formatter implements LayoutFormatter {
+public class LatexToUnicodeFormatter
+    extends Formatter
+    implements LayoutFormatter {
 
     @Override
     public String getName() {
@@ -28,7 +30,9 @@ public String format(String inField) {
 
     @Override
     public String getDescription() {
-        return Localization.lang("Converts LaTeX encoding to Unicode characters.");
+        return Localization.lang(
+            "Converts LaTeX encoding to Unicode characters."
+        );
     }
 
     @Override
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 39accb95b8c..4cda3466ffa 100644
--- a/src/main/java/org/jabref/logic/layout/format/MarkdownFormatter.java
+++ b/src/main/java/org/jabref/logic/layout/format/MarkdownFormatter.java
@@ -1,13 +1,11 @@
 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 java.util.Objects;
+import org.jabref.logic.layout.LayoutFormatter;
 
 public class MarkdownFormatter implements LayoutFormatter {
 
@@ -22,7 +20,10 @@ 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 e8812235435..7e57044cf61 100644
--- a/src/main/java/org/jabref/logic/layout/format/NameFormatter.java
+++ b/src/main/java/org/jabref/logic/layout/format/NameFormatter.java
@@ -4,7 +4,6 @@
 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;
@@ -74,11 +73,16 @@
  */
 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;
 
-    private static String format(String toFormat, AuthorList al, String[] formats) {
+    private static String format(
+        String toFormat,
+        AuthorList al,
+        String[] formats
+    ) {
         StringBuilder sb = new StringBuilder();
 
         int n = al.getNumberOfAuthors();
@@ -86,7 +90,9 @@ private static String format(String toFormat, AuthorList al, String[] formats) {
         for (int i = 1; i <= al.getNumberOfAuthors(); i++) {
             for (int j = 1; j < formats.length; j += 2) {
                 if ("*".equals(formats[j])) {
-                    sb.append(BstNameFormatter.formatName(toFormat, i, formats[j + 1]));
+                    sb.append(
+                        BstNameFormatter.formatName(toFormat, i, formats[j + 1])
+                    );
                     break;
                 } else {
                     String[] range = formats[j].split("\\.\\.");
@@ -112,7 +118,13 @@ private static String format(String toFormat, AuthorList al, String[] formats) {
                     }
 
                     if ((s <= i) && (i <= e)) {
-                        sb.append(BstNameFormatter.formatName(toFormat, i, formats[j + 1]));
+                        sb.append(
+                            BstNameFormatter.formatName(
+                                toFormat,
+                                i,
+                                formats[j + 1]
+                            )
+                        );
                         break;
                     }
                 }
@@ -143,7 +155,9 @@ public String format(String toFormat, String inParameters) {
             if ("*".equals(formatString[0])) {
                 return format(toFormat, al, formatString);
             } else {
-                if (al.getNumberOfAuthors() <= Integer.parseInt(formatString[0])) {
+                if (
+                    al.getNumberOfAuthors() <= Integer.parseInt(formatString[0])
+                ) {
                     return format(toFormat, al, formatString);
                 }
             }
@@ -160,7 +174,9 @@ public void setParameter(String parameter) {
         this.parameter = parameter;
     }
 
-    public static Map<String, String> getNameFormatters(NameFormatterPreferences prefs) {
+    public static Map<String, String> getNameFormatters(
+        NameFormatterPreferences prefs
+    ) {
         Objects.requireNonNull(prefs);
 
         Map<String, String> result = new HashMap<>();
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 09f614f04e9..7f7ef390bd8 100644
--- a/src/main/java/org/jabref/logic/layout/format/NameFormatterPreferences.java
+++ b/src/main/java/org/jabref/logic/layout/format/NameFormatterPreferences.java
@@ -1,7 +1,6 @@
 package org.jabref.logic.layout.format;
 
 import java.util.List;
-
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableList;
 
@@ -10,9 +9,14 @@ public class NameFormatterPreferences {
     private final ObservableList<String> nameFormatterKey;
     private final ObservableList<String> nameFormatterValue;
 
-    public NameFormatterPreferences(List<String> nameFormatterKey, List<String> nameFormatterValue) {
-        this.nameFormatterKey = FXCollections.observableArrayList(nameFormatterKey);
-        this.nameFormatterValue = FXCollections.observableArrayList(nameFormatterValue);
+    public NameFormatterPreferences(
+        List<String> nameFormatterKey,
+        List<String> nameFormatterValue
+    ) {
+        this.nameFormatterKey =
+            FXCollections.observableArrayList(nameFormatterKey);
+        this.nameFormatterValue =
+            FXCollections.observableArrayList(nameFormatterValue);
     }
 
     public ObservableList<String> getNameFormatterKey() {
diff --git a/src/main/java/org/jabref/logic/layout/format/NotFoundFormatter.java b/src/main/java/org/jabref/logic/layout/format/NotFoundFormatter.java
index e53b71296d9..481d88f7736 100644
--- a/src/main/java/org/jabref/logic/layout/format/NotFoundFormatter.java
+++ b/src/main/java/org/jabref/logic/layout/format/NotFoundFormatter.java
@@ -21,6 +21,11 @@ public String getNotFound() {
 
     @Override
     public String format(String fieldText) {
-        return '[' + Localization.lang("Formatter not found: %0", notFound) + "] " + fieldText;
+        return (
+            '[' +
+            Localization.lang("Formatter not found: %0", notFound) +
+            "] " +
+            fieldText
+        );
     }
 }
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 645dcae4236..c5deb7f279b 100644
--- a/src/main/java/org/jabref/logic/layout/format/Ordinal.java
+++ b/src/main/java/org/jabref/logic/layout/format/Ordinal.java
@@ -2,7 +2,6 @@
 
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
-
 import org.jabref.logic.layout.LayoutFormatter;
 
 /**
@@ -24,12 +23,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 48e30d5167e..a28ee5bb661 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;
 
@@ -25,7 +24,9 @@
  */
 public class RTFChars implements LayoutFormatter {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(LayoutFormatter.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(
+        LayoutFormatter.class
+    );
 
     private static final RtfCharMap RTF_CHARS = new RtfCharMap();
 
@@ -47,15 +48,20 @@ public String format(String field) {
                 currentCommand = new StringBuilder();
             } else if (!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) {
                     // Else we are in a command, and should not keep the letter.
                     currentCommand.append(c);
-                    testCharCom:
-                    if ((currentCommand.length() == 1)
-                            && StringUtil.SPECIAL_COMMAND_CHARS.contains(currentCommand.toString())) {
+                    testCharCom:if (
+                        (currentCommand.length() == 1) &&
+                        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)) {
@@ -87,8 +93,10 @@ public String format(String field) {
                     sb.append(c);
                 }
             } else {
-                testContent:
-                if (!incommand || (!Character.isWhitespace(c) && (c != '{') && (c != '}'))) {
+                testContent:if (
+                    !incommand ||
+                    (!Character.isWhitespace(c) && (c != '{') && (c != '}'))
+                ) {
                     sb.append(c);
                 } else {
                     assert incommand;
@@ -116,16 +124,25 @@ public String format(String field) {
                         break testContent;
                     }
 
-                    if (((c == '{') || (c == ' ')) && (currentCommand.length() > 0)) {
+                    if (
+                        ((c == '{') || (c == ' ')) &&
+                        (currentCommand.length() > 0)
+                    ) {
                         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)
-                                || "it".equals(command)) {
+                        if (
+                            "em".equals(command) ||
+                            "emph".equals(command) ||
+                            "textit".equals(command) ||
+                            "it".equals(command)
+                        ) {
                             StringInt part = getPart(field, i, c == '{');
                             i += part.i;
                             sb.append("{\\i ").append(part.s).append('}');
-                        } else if ("textbf".equals(command) || "bf".equals(command)) {
+                        } else if (
+                            "textbf".equals(command) || "bf".equals(command)
+                        ) {
                             StringInt part = getPart(field, i, c == '{');
                             i += part.i;
                             sb.append("{\\b ").append(part.s).append('}');
@@ -152,12 +169,19 @@ public String format(String field) {
             if (c < 128) {
                 sb.append(c);
             } else {
-                sb.append("\\u").append((long) c).append(transformSpecialCharacter(c));
+                sb
+                    .append("\\u")
+                    .append((long) c)
+                    .append(transformSpecialCharacter(c));
             }
         }
 
-        return sb.toString().replace("---", "{\\emdash}").replace("--", "{\\endash}").replace("``", "{\\ldblquote}")
-                 .replace("''", "{\\rdblquote}");
+        return sb
+            .toString()
+            .replace("---", "{\\emdash}")
+            .replace("--", "{\\endash}")
+            .replace("``", "{\\ldblquote}")
+            .replace("''", "{\\rdblquote}");
     }
 
     /**
@@ -166,13 +190,16 @@ public String format(String field) {
      * @param commandNestedInBraces true if the command is nested in braces (\emph{xy}), false if spaces are sued (\emph xy)
      * @return a tuple of number of added characters and the extracted part
      */
-    private StringInt getPart(String text, int i, boolean commandNestedInBraces) {
+    private StringInt getPart(
+        String text,
+        int i,
+        boolean commandNestedInBraces
+    ) {
         char c;
         int count = 0;
         int icount = i;
         StringBuilder part = new StringBuilder();
-        loop:
-        while ((count >= 0) && (icount < text.length())) {
+        loop:while ((count >= 0) && (icount < text.length())) {
             icount++;
             c = text.charAt(icount);
             switch (c) {
@@ -205,16 +232,24 @@ private StringInt getPart(String text, int i, boolean commandNestedInBraces) {
      * @return returns the basic character of the given unicode
      */
     private String transformSpecialCharacter(long c) {
-        if (((192 <= c) && (c <= 197)) || (c == 256) || (c == 258) || (c == 260)) {
+        if (
+            ((192 <= c) && (c <= 197)) || (c == 256) || (c == 258) || (c == 260)
+        ) {
             return "A";
         }
-        if (((224 <= c) && (c <= 229)) || (c == 257) || (c == 259) || (c == 261)) {
+        if (
+            ((224 <= c) && (c <= 229)) || (c == 257) || (c == 259) || (c == 261)
+        ) {
             return "a";
         }
-        if ((199 == c) || (262 == c) || (264 == c) || (266 == c) || (268 == c)) {
+        if (
+            (199 == c) || (262 == c) || (264 == c) || (266 == c) || (268 == c)
+        ) {
             return "C";
         }
-        if ((231 == c) || (263 == c) || (265 == c) || (267 == c) || (269 == c)) {
+        if (
+            (231 == c) || (263 == c) || (265 == c) || (267 == c) || (269 == c)
+        ) {
             return "c";
         }
         if ((208 == c) || (272 == c)) {
@@ -223,16 +258,34 @@ 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)) {
+        if (
+            ((284 == c) || (286 == c)) || (288 == c) || (290 == c) || (330 == c)
+        ) {
             return "G";
         }
-        if ((285 == c) || (287 == c) || (289 == c) || (291 == c) || (331 == c)) {
+        if (
+            (285 == c) || (287 == c) || (289 == c) || (291 == c) || (331 == c)
+        ) {
             return "g";
         }
         if ((292 == c) || (294 == c)) {
@@ -241,10 +294,23 @@ 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)) {
+        if (
+            ((236 <= c) && (c <= 239)) ||
+            (297 == c) ||
+            (299 == c) ||
+            (301 == c) ||
+            (303 == c)
+        ) {
             return "i";
         }
         if (308 == c) {
@@ -271,10 +337,14 @@ private String transformSpecialCharacter(long c) {
         if ((241 == c) || (324 == c) || (326 == c) || (328 == c)) {
             return "n";
         }
-        if (((210 <= c) && (c <= 214)) || (c == 216) || (332 == c) || (334 == c)) {
+        if (
+            ((210 <= c) && (c <= 214)) || (c == 216) || (332 == c) || (334 == c)
+        ) {
             return "O";
         }
-        if (((242 <= c) && (c <= 248) && (247 != c)) || (333 == c) || (335 == c)) {
+        if (
+            ((242 <= c) && (c <= 248) && (247 != c)) || (333 == c) || (335 == c)
+        ) {
             return "o";
         }
         if ((340 == c) || (342 == c) || (344 == c)) {
@@ -295,10 +365,24 @@ 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/RemoveBrackets.java b/src/main/java/org/jabref/logic/layout/format/RemoveBrackets.java
index 6c634e9243a..c69c9ad9ade 100644
--- a/src/main/java/org/jabref/logic/layout/format/RemoveBrackets.java
+++ b/src/main/java/org/jabref/logic/layout/format/RemoveBrackets.java
@@ -10,6 +10,7 @@
  * </example>
  */
 public class RemoveBrackets implements LayoutFormatter {
+
     @Override
     public String format(String fieldText) {
         StringBuilder builder = new StringBuilder(fieldText.length());
diff --git a/src/main/java/org/jabref/logic/layout/format/RemoveBracketsAddComma.java b/src/main/java/org/jabref/logic/layout/format/RemoveBracketsAddComma.java
index 516bd758074..20d25733c28 100644
--- a/src/main/java/org/jabref/logic/layout/format/RemoveBracketsAddComma.java
+++ b/src/main/java/org/jabref/logic/layout/format/RemoveBracketsAddComma.java
@@ -6,6 +6,7 @@
  * Remove brackets formatter.
  */
 public class RemoveBracketsAddComma implements LayoutFormatter {
+
     @Override
     public String format(String fieldText) {
         StringBuilder builder = new StringBuilder(fieldText.length());
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 f84d21efca2..cde2a8f8f96 100644
--- a/src/main/java/org/jabref/logic/layout/format/RemoveLatexCommandsFormatter.java
+++ b/src/main/java/org/jabref/logic/layout/format/RemoveLatexCommandsFormatter.java
@@ -13,7 +13,11 @@ 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('\\');
@@ -25,14 +29,26 @@ public String format(String field) {
                 escaped = true;
                 incommand = true;
                 currentCommand = new StringBuilder();
-            } else if (!incommand && ((currentCharacter == '{') || (currentCharacter == '}'))) {
+            } 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())) {
+                    if (
+                        (currentCommand.length() == 1) &&
+                        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,17 +65,29 @@ 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 != '{')) {
+                    if (
+                        !Character.isWhitespace(currentCharacter) &&
+                        (currentCharacter != '{')
+                    ) {
                         // do not append the opening brace of a command parameter
                         // do not append the whitespace character
                         cleanedField.append(currentCharacter);
                     }
                     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/RemoveTilde.java b/src/main/java/org/jabref/logic/layout/format/RemoveTilde.java
index 58575ae143c..ed2e551758c 100644
--- a/src/main/java/org/jabref/logic/layout/format/RemoveTilde.java
+++ b/src/main/java/org/jabref/logic/layout/format/RemoveTilde.java
@@ -8,6 +8,7 @@
  * Useful for formatting Latex code.
  */
 public class RemoveTilde implements LayoutFormatter {
+
     @Override
     public String format(String fieldText) {
         StringBuilder result = new StringBuilder(fieldText.length());
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 dfbf1a1a90d..ba5fe59f052 100644
--- a/src/main/java/org/jabref/logic/layout/format/Replace.java
+++ b/src/main/java/org/jabref/logic/layout/format/Replace.java
@@ -1,7 +1,6 @@
 package org.jabref.logic.layout.format;
 
 import java.util.List;
-
 import org.jabref.logic.layout.AbstractParamLayoutFormatter;
 
 /**
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 1d2db81c090..687b1efe503 100644
--- a/src/main/java/org/jabref/logic/layout/format/ReplaceUnicodeLigaturesFormatter.java
+++ b/src/main/java/org/jabref/logic/layout/format/ReplaceUnicodeLigaturesFormatter.java
@@ -3,13 +3,14 @@
 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;
 
-public class ReplaceUnicodeLigaturesFormatter extends Formatter implements LayoutFormatter {
+public class ReplaceUnicodeLigaturesFormatter
+    extends Formatter
+    implements LayoutFormatter {
 
     private final Map<Pattern, String> ligaturesMap;
 
@@ -42,7 +43,9 @@ public String format(String fieldText) {
 
     @Override
     public String getDescription() {
-        return Localization.lang("Replaces Unicode ligatures with their expanded form");
+        return Localization.lang(
+            "Replaces Unicode ligatures with their expanded form"
+        );
     }
 
     @Override
diff --git a/src/main/java/org/jabref/logic/layout/format/ReplaceWithEscapedDoubleQuotes.java b/src/main/java/org/jabref/logic/layout/format/ReplaceWithEscapedDoubleQuotes.java
index 059d9b0337c..ccb038afb19 100644
--- a/src/main/java/org/jabref/logic/layout/format/ReplaceWithEscapedDoubleQuotes.java
+++ b/src/main/java/org/jabref/logic/layout/format/ReplaceWithEscapedDoubleQuotes.java
@@ -3,6 +3,7 @@
 import org.jabref.logic.layout.LayoutFormatter;
 
 public class ReplaceWithEscapedDoubleQuotes implements LayoutFormatter {
+
     @Override
     public String format(String fieldText) {
         StringBuilder builder = new StringBuilder(fieldText.length());
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 02927f9d5bb..889de018e60 100644
--- a/src/main/java/org/jabref/logic/layout/format/RisMonth.java
+++ b/src/main/java/org/jabref/logic/layout/format/RisMonth.java
@@ -2,7 +2,6 @@
 
 import java.util.Locale;
 import java.util.Optional;
-
 import org.jabref.logic.layout.LayoutFormatter;
 import org.jabref.model.entry.Month;
 
@@ -15,6 +14,8 @@ public String format(String month) {
         }
 
         Optional<Month> parsedMonth = Month.getMonthByShortName(month);
-        return parsedMonth.map(Month::getTwoDigitNumber).orElse(month.toLowerCase(Locale.ROOT));
+        return parsedMonth
+            .map(Month::getTwoDigitNumber)
+            .orElse(month.toLowerCase(Locale.ROOT));
     }
 }
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 63bef135801..c1cd58bcc0c 100644
--- a/src/main/java/org/jabref/logic/layout/format/ShortMonthFormatter.java
+++ b/src/main/java/org/jabref/logic/layout/format/ShortMonthFormatter.java
@@ -1,7 +1,6 @@
 package org.jabref.logic.layout.format;
 
 import java.util.Optional;
-
 import org.jabref.logic.layout.LayoutFormatter;
 import org.jabref.model.entry.Month;
 
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 8dc61700ddf..74894b5eb53 100644
--- a/src/main/java/org/jabref/logic/layout/format/ToLowerCase.java
+++ b/src/main/java/org/jabref/logic/layout/format/ToLowerCase.java
@@ -1,7 +1,6 @@
 package org.jabref.logic.layout.format;
 
 import java.util.Locale;
-
 import org.jabref.logic.layout.LayoutFormatter;
 
 /**
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 419eef5f118..c0c75ffa856 100644
--- a/src/main/java/org/jabref/logic/layout/format/ToUpperCase.java
+++ b/src/main/java/org/jabref/logic/layout/format/ToUpperCase.java
@@ -1,7 +1,6 @@
 package org.jabref.logic.layout.format;
 
 import java.util.Locale;
-
 import org.jabref.logic.layout.LayoutFormatter;
 
 /**
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 10152395390..b5027bea311 100644
--- a/src/main/java/org/jabref/logic/layout/format/WrapContent.java
+++ b/src/main/java/org/jabref/logic/layout/format/WrapContent.java
@@ -1,7 +1,6 @@
 package org.jabref.logic.layout.format;
 
 import java.util.List;
-
 import org.jabref.logic.layout.AbstractParamLayoutFormatter;
 
 /**
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 cab5f0d13c8..fd0486fc0db 100644
--- a/src/main/java/org/jabref/logic/layout/format/WrapFileLinks.java
+++ b/src/main/java/org/jabref/logic/layout/format/WrapFileLinks.java
@@ -6,7 +6,6 @@
 import java.util.HashMap;
 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;
@@ -185,7 +184,10 @@ public String format(String field) {
         int piv = 1; // counter for relevant iterations
         for (LinkedFile flEntry : fileList) {
             // Use this entry if we don't discriminate on types, or if the type fits:
-            if ((fileType == null) || flEntry.getFileType().equalsIgnoreCase(fileType)) {
+            if (
+                (fileType == null) ||
+                flEntry.getFileType().equalsIgnoreCase(fileType)
+            ) {
                 for (FormatEntry entry : format) {
                     switch (entry.getType()) {
                         case STRING:
@@ -197,19 +199,22 @@ public String format(String field) {
                         case FILE_PATH:
                             List<Path> dirs;
                             if (fileDirectories.isEmpty()) {
-                                dirs = Collections.singletonList(Path.of(mainFileDirectory));
+                                dirs =
+                                    Collections.singletonList(
+                                        Path.of(mainFileDirectory)
+                                    );
                             } else {
                                 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;
                         case RELATIVE_FILE_PATH:
-
                             /*
                              * Stumbled over this while investigating
                              *
@@ -219,8 +224,11 @@ public String format(String field) {
 
                             break;
                         case FILE_EXTENSION:
-                            FileUtil.getFileExtension(flEntry.getLink())
-                                      .ifPresent(extension -> sb.append(replaceStrings(extension)));
+                            FileUtil
+                                .getFileExtension(flEntry.getLink())
+                                .ifPresent(extension ->
+                                    sb.append(replaceStrings(extension))
+                                );
                             break;
                         case FILE_TYPE:
                             sb.append(replaceStrings(flEntry.getFileType()));
@@ -242,7 +250,10 @@ public String format(String field) {
 
     private String replaceStrings(String text) {
         String result = text;
-        for (Map.Entry<String, String> stringStringEntry : replacements.entrySet()) {
+        for (Map.Entry<
+            String,
+            String
+        > stringStringEntry : replacements.entrySet()) {
             String to = stringStringEntry.getValue();
             result = result.replaceAll(stringStringEntry.getKey(), to);
         }
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 b7c9f9136e0..63c5e5af626 100644
--- a/src/main/java/org/jabref/logic/layout/format/XMLChars.java
+++ b/src/main/java/org/jabref/logic/layout/format/XMLChars.java
@@ -2,7 +2,6 @@
 
 import java.util.HashMap;
 import java.util.Map;
-
 import org.jabref.logic.layout.LayoutFormatter;
 import org.jabref.logic.util.strings.XmlCharsMap;
 
@@ -13,7 +12,8 @@ public class XMLChars implements LayoutFormatter {
 
     private static final XmlCharsMap XML_CHARS = new XmlCharsMap();
 
-    private static final Map<String, String> ASCII_TO_XML_CHARS = new HashMap<>();
+    private static final Map<String, String> ASCII_TO_XML_CHARS =
+        new HashMap<>();
 
     private boolean[] forceReplace;
 
@@ -65,7 +65,7 @@ private String restFormat(String toFormat) {
                 forceReplace[i] = true;
             }
             forceReplace[32] = false;
-            for (int i : new int[] {44, 45, 63, 64, 94, 95, 96, 124}) {
+            for (int i : new int[] { 44, 45, 63, 64, 94, 95, 96, 124 }) {
                 forceReplace[i] = true;
             }
         }
diff --git a/src/main/java/org/jabref/logic/logging/LogMessages.java b/src/main/java/org/jabref/logic/logging/LogMessages.java
index 102c9c39db7..e5b204c9f24 100644
--- a/src/main/java/org/jabref/logic/logging/LogMessages.java
+++ b/src/main/java/org/jabref/logic/logging/LogMessages.java
@@ -2,7 +2,6 @@
 
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableList;
-
 import org.tinylog.core.LogEntry;
 
 /**
@@ -13,10 +12,10 @@ public class LogMessages {
 
     private static LogMessages instance = new LogMessages();
 
-    private final ObservableList<LogEntry> messages = FXCollections.observableArrayList();
+    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 6881252d8d0..a27a7313fce 100644
--- a/src/main/java/org/jabref/logic/msbib/BibTeXConverter.java
+++ b/src/main/java/org/jabref/logic/msbib/BibTeXConverter.java
@@ -7,7 +7,6 @@
 import java.util.regex.Matcher;
 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;
@@ -19,8 +18,7 @@ public class BibTeXConverter {
 
     private static final String MSBIB_PREFIX = "msbib-";
 
-    private BibTeXConverter() {
-    }
+    private BibTeXConverter() {}
 
     /**
      * Converts an {@link MSBibEntry} to a {@link BibEntry} for import
@@ -32,7 +30,9 @@ public static BibEntry convert(MSBibEntry entry) {
         BibEntry result;
         Map<Field, String> fieldValues = new HashMap<>();
 
-        EntryType bibTexEntryType = MSBibMapping.getBiblatexEntryType(entry.getType());
+        EntryType bibTexEntryType = MSBibMapping.getBiblatexEntryType(
+            entry.getType()
+        );
         result = new BibEntry(bibTexEntryType);
 
         // add String fields
@@ -40,7 +40,10 @@ public static BibEntry convert(MSBibEntry entry) {
             String msField = field.getKey();
             String value = field.getValue();
 
-            if ((value != null) && (MSBibMapping.getBibTeXField(msField) != null)) {
+            if (
+                (value != null) &&
+                (MSBibMapping.getBibTeXField(msField) != null)
+            ) {
                 fieldValues.put(MSBibMapping.getBibTeXField(msField), value);
             }
         }
@@ -48,24 +51,71 @@ public static BibEntry convert(MSBibEntry entry) {
         // Value must be converted
         if (fieldValues.containsKey(StandardField.LANGUAGE)) {
             int lcid = Integer.valueOf(fieldValues.get(StandardField.LANGUAGE));
-            fieldValues.put(StandardField.LANGUAGE, MSBibMapping.getLanguage(lcid));
+            fieldValues.put(
+                StandardField.LANGUAGE,
+                MSBibMapping.getLanguage(lcid)
+            );
         }
 
         addAuthor(fieldValues, StandardField.AUTHOR, entry.authors);
         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 + "composer"), entry.composers);
-        addAuthor(fieldValues, new UnknownField(MSBIB_PREFIX + "conductor"), entry.conductors);
-        addAuthor(fieldValues, new UnknownField(MSBIB_PREFIX + "performer"), entry.performers);
-        addAuthor(fieldValues, new UnknownField(MSBIB_PREFIX + "writer"), entry.writers);
-        addAuthor(fieldValues, new UnknownField(MSBIB_PREFIX + "director"), entry.directors);
-        addAuthor(fieldValues, new UnknownField(MSBIB_PREFIX + "compiler"), entry.compilers);
-        addAuthor(fieldValues, new UnknownField(MSBIB_PREFIX + "interviewer"), entry.interviewers);
-        addAuthor(fieldValues, new UnknownField(MSBIB_PREFIX + "interviewee"), entry.interviewees);
-        addAuthor(fieldValues, new UnknownField(MSBIB_PREFIX + "inventor"), entry.inventors);
-        addAuthor(fieldValues, new UnknownField(MSBIB_PREFIX + "counsel"), entry.counsels);
+        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
+        );
+        addAuthor(
+            fieldValues,
+            new UnknownField(MSBIB_PREFIX + "writer"),
+            entry.writers
+        );
+        addAuthor(
+            fieldValues,
+            new UnknownField(MSBIB_PREFIX + "director"),
+            entry.directors
+        );
+        addAuthor(
+            fieldValues,
+            new UnknownField(MSBIB_PREFIX + "compiler"),
+            entry.compilers
+        );
+        addAuthor(
+            fieldValues,
+            new UnknownField(MSBIB_PREFIX + "interviewer"),
+            entry.interviewers
+        );
+        addAuthor(
+            fieldValues,
+            new UnknownField(MSBIB_PREFIX + "interviewee"),
+            entry.interviewees
+        );
+        addAuthor(
+            fieldValues,
+            new UnknownField(MSBIB_PREFIX + "inventor"),
+            entry.inventors
+        );
+        addAuthor(
+            fieldValues,
+            new UnknownField(MSBIB_PREFIX + "counsel"),
+            entry.counsels
+        );
 
         if (entry.pages != null) {
             fieldValues.put(StandardField.PAGES, entry.pages.toString("--"));
@@ -82,7 +132,10 @@ public static BibEntry convert(MSBibEntry entry) {
         }
 
         if (entry.dateAccessed != null) {
-            fieldValues.put(new UnknownField(MSBIB_PREFIX + "accessed"), entry.dateAccessed);
+            fieldValues.put(
+                new UnknownField(MSBIB_PREFIX + "accessed"),
+                entry.dateAccessed
+            );
         }
 
         if (entry.journalName != null) {
@@ -102,16 +155,28 @@ public static BibEntry convert(MSBibEntry entry) {
         return result;
     }
 
-    private static void addAuthor(Map<Field, String> map, Field field, List<MsBibAuthor> authors) {
+    private static void addAuthor(
+        Map<Field, String> map,
+        Field field,
+        List<MsBibAuthor> authors
+    ) {
         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()) {
@@ -119,14 +184,27 @@ private static void parseSingleStandardNumber(String type, Field field, String s
         }
     }
 
-    private static void parseStandardNumber(String standardNum, Map<Field, String> map) {
+    private static void parseStandardNumber(
+        String standardNum,
+        Map<Field, String> map
+    ) {
         if (standardNum == null) {
             return;
         }
         parseSingleStandardNumber("ISBN", StandardField.ISBN, standardNum, map);
         parseSingleStandardNumber("ISSN", StandardField.ISSN, standardNum, map);
-        parseSingleStandardNumber("LCCN", new UnknownField("lccn"), standardNum, map);
-        parseSingleStandardNumber("MRN", StandardField.MR_NUMBER, standardNum, map);
+        parseSingleStandardNumber(
+            "LCCN",
+            new UnknownField("lccn"),
+            standardNum,
+            map
+        );
+        parseSingleStandardNumber(
+            "MRN",
+            StandardField.MR_NUMBER,
+            standardNum,
+            map
+        );
         parseSingleStandardNumber("DOI", StandardField.DOI, standardNum, map);
     }
 }
diff --git a/src/main/java/org/jabref/logic/msbib/MSBibConverter.java b/src/main/java/org/jabref/logic/msbib/MSBibConverter.java
index d39e7bee602..831001f42c8 100644
--- a/src/main/java/org/jabref/logic/msbib/MSBibConverter.java
+++ b/src/main/java/org/jabref/logic/msbib/MSBibConverter.java
@@ -2,7 +2,6 @@
 
 import java.util.ArrayList;
 import java.util.List;
-
 import org.jabref.model.entry.Author;
 import org.jabref.model.entry.AuthorList;
 import org.jabref.model.entry.BibEntry;
@@ -18,8 +17,7 @@ public class MSBibConverter {
     private static final String MSBIB_PREFIX = "msbib-";
     private static final String BIBTEX_PREFIX = "BIBTEX_";
 
-    private MSBibConverter() {
-    }
+    private MSBibConverter() {}
 
     public static MSBibEntry convert(BibEntry entry) {
         MSBibEntry result = new MSBibEntry();
@@ -27,7 +25,9 @@ public static MSBibEntry convert(BibEntry entry) {
         // memorize original type
         result.fields.put(BIBTEX_PREFIX + "Entry", entry.getType().getName());
         // define new type
-        String msBibType = MSBibMapping.getMSBibEntryType(entry.getType()).name();
+        String msBibType = MSBibMapping
+            .getMSBibEntryType(entry.getType())
+            .name();
         result.fields.put("SourceType", msBibType);
 
         for (Field field : entry.getFields()) {
@@ -39,59 +39,92 @@ 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.URLDATE).ifPresent(acessed -> result.dateAccessed = acessed);
+        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);
 
         // TODO: currently this can never happen
         if ("SoundRecording".equals(msBibType)) {
-            result.albumTitle = entry.getFieldLatexFree(StandardField.TITLE).orElse(null);
+            result.albumTitle =
+                entry.getFieldLatexFree(StandardField.TITLE).orElse(null);
         }
 
         // TODO: currently this can never happen
         if ("Interview".equals(msBibType)) {
-            result.broadcastTitle = entry.getFieldLatexFree(StandardField.TITLE).orElse(null);
+            result.broadcastTitle =
+                entry.getFieldLatexFree(StandardField.TITLE).orElse(null);
         }
 
-        result.number = entry.getFieldLatexFree(StandardField.NUMBER).orElse(null);
+        result.number =
+            entry.getFieldLatexFree(StandardField.NUMBER).orElse(null);
 
         if (entry.getType().equals(IEEETranEntryType.Patent)) {
-            result.patentNumber = entry.getFieldLatexFree(StandardField.NUMBER).orElse(null);
+            result.patentNumber =
+                entry.getFieldLatexFree(StandardField.NUMBER).orElse(null);
             result.number = null;
         }
 
-        result.day = entry.getFieldOrAliasLatexFree(StandardField.DAY).orElse(null);
+        result.day =
+            entry.getFieldOrAliasLatexFree(StandardField.DAY).orElse(null);
         result.month = entry.getMonth().map(Month::getFullName).orElse(null);
 
         if (!entry.getFieldLatexFree(StandardField.YEAR).isPresent()) {
-            result.year = entry.getFieldOrAliasLatexFree(StandardField.YEAR).orElse(null);
+            result.year =
+                entry.getFieldOrAliasLatexFree(StandardField.YEAR).orElse(null);
         }
-        result.journalName = entry.getFieldOrAliasLatexFree(StandardField.JOURNAL).orElse(null);
+        result.journalName =
+            entry.getFieldOrAliasLatexFree(StandardField.JOURNAL).orElse(null);
 
         // Value must be converted
-        entry.getFieldLatexFree(StandardField.LANGUAGE)
-             .ifPresent(lang -> result.fields.put("LCID", String.valueOf(MSBibMapping.getLCID(lang))));
+        entry
+            .getFieldLatexFree(StandardField.LANGUAGE)
+            .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()) {
             result.standardNumber = null;
         }
 
-        result.address = entry.getFieldOrAliasLatexFree(StandardField.ADDRESS).orElse(null);
+        result.address =
+            entry.getFieldOrAliasLatexFree(StandardField.ADDRESS).orElse(null);
 
         if (entry.getFieldLatexFree(StandardField.TYPE).isPresent()) {
-            result.thesisType = entry.getFieldLatexFree(StandardField.TYPE).get();
+            result.thesisType =
+                entry.getFieldLatexFree(StandardField.TYPE).get();
         } else {
             if (entry.getType().equals(StandardEntryType.TechReport)) {
                 result.thesisType = "Tech. rep.";
-            } else if (entry.getType().equals(StandardEntryType.MastersThesis)) {
+            } else if (
+                entry.getType().equals(StandardEntryType.MastersThesis)
+            ) {
                 result.thesisType = "Master's thesis";
             } else if (entry.getType().equals(StandardEntryType.PhdThesis)) {
                 result.thesisType = "Ph.D. dissertation";
@@ -101,27 +134,60 @@ public static MSBibEntry convert(BibEntry entry) {
         }
 
         // TODO: currently this can never happen
-        if ("InternetSite".equals(msBibType) || "DocumentFromInternetSite".equals(msBibType)) {
-            result.internetSiteTitle = entry.getFieldLatexFree(StandardField.TITLE).orElse(null);
+        if (
+            "InternetSite".equals(msBibType) ||
+            "DocumentFromInternetSite".equals(msBibType)
+        ) {
+            result.internetSiteTitle =
+                entry.getFieldLatexFree(StandardField.TITLE).orElse(null);
         }
 
         // TODO: currently only Misc can happen
-        if ("ElectronicSource".equals(msBibType) || "Art".equals(msBibType) || "Misc".equals(msBibType)) {
-            result.publicationTitle = entry.getFieldLatexFree(StandardField.TITLE).orElse(null);
+        if (
+            "ElectronicSource".equals(msBibType) ||
+            "Art".equals(msBibType) ||
+            "Misc".equals(msBibType)
+        ) {
+            result.publicationTitle =
+                entry.getFieldLatexFree(StandardField.TITLE).orElse(null);
         }
 
         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;
     }
 
-    private static List<MsBibAuthor> getAuthors(BibEntry entry, String authors, Field field) {
+    private static List<MsBibAuthor> getAuthors(
+        BibEntry entry,
+        String authors,
+        Field field
+    ) {
         List<MsBibAuthor> result = new ArrayList<>();
         boolean corporate = false;
         // Only one corporate author is supported
diff --git a/src/main/java/org/jabref/logic/msbib/MSBibDatabase.java b/src/main/java/org/jabref/logic/msbib/MSBibDatabase.java
index f2040674fef..ca0d0a9ced2 100644
--- a/src/main/java/org/jabref/logic/msbib/MSBibDatabase.java
+++ b/src/main/java/org/jabref/logic/msbib/MSBibDatabase.java
@@ -7,14 +7,11 @@
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
-
 import javax.xml.parsers.DocumentBuilder;
 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;
@@ -31,10 +28,13 @@
  */
 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);
+    private static final Logger LOGGER = LoggerFactory.getLogger(
+        MSBibDatabase.class
+    );
 
     private Set<MSBibEntry> entries;
 
@@ -55,7 +55,10 @@ public MSBibDatabase() {
      */
     public MSBibDatabase(BibDatabase database, List<BibEntry> entries) {
         if (entries == null) {
-            var resolvedEntries = database.resolveForStrings(database.getEntries(), false);
+            var resolvedEntries = database.resolveForStrings(
+                database.getEntries(),
+                false
+            );
             addEntriesForExport(resolvedEntries);
         } else {
             var resolvedEntries = database.resolveForStrings(entries, false);
@@ -72,7 +75,8 @@ public List<BibEntry> importEntriesFromXml(BufferedReader reader) {
         entries = new HashSet<>();
         Document inputDocument;
         try {
-            DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
+            DocumentBuilderFactory factory =
+                DocumentBuilderFactory.newInstance();
             factory.setNamespaceAware(true);
             DocumentBuilder documentBuilder = factory.newDocumentBuilder();
             inputDocument = documentBuilder.parse(new InputSource(reader));
@@ -80,7 +84,10 @@ public List<BibEntry> importEntriesFromXml(BufferedReader reader) {
             LOGGER.warn("Could not parse document", e);
             return Collections.emptyList();
         }
-        NodeList rootList = inputDocument.getElementsByTagNameNS("*", "Sources");
+        NodeList rootList = inputDocument.getElementsByTagNameNS(
+            "*",
+            "Sources"
+        );
         if (rootList.getLength() == 0) {
             rootList = inputDocument.getElementsByTagNameNS("*", "Sources");
         }
@@ -89,7 +96,8 @@ public List<BibEntry> importEntriesFromXml(BufferedReader reader) {
             return bibitems;
         }
 
-        NodeList sourceList = ((Element) rootList.item(0)).getElementsByTagNameNS("*", "Source");
+        NodeList sourceList =
+            ((Element) rootList.item(0)).getElementsByTagNameNS("*", "Source");
         for (int i = 0; i < sourceList.getLength(); i++) {
             MSBibEntry entry = new MSBibEntry((Element) sourceList.item(i));
             entries.add(entry);
@@ -115,15 +123,26 @@ private void addEntriesForExport(List<BibEntry> entriesToAdd) {
     public Document getDomForExport() {
         Document document = null;
         try {
-            DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
+            DocumentBuilderFactory factory =
+                DocumentBuilderFactory.newInstance();
             factory.setNamespaceAware(true);
             DocumentBuilder documentBuilder = factory.newDocumentBuilder();
             document = documentBuilder.newDocument();
 
-            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);
+            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.setAttribute("SelectedStyle", "");
 
             for (MSBibEntry entry : entries) {
diff --git a/src/main/java/org/jabref/logic/msbib/MSBibEntry.java b/src/main/java/org/jabref/logic/msbib/MSBibEntry.java
index 28618a6f60e..7ca2bea7de5 100644
--- a/src/main/java/org/jabref/logic/msbib/MSBibEntry.java
+++ b/src/main/java/org/jabref/logic/msbib/MSBibEntry.java
@@ -7,13 +7,11 @@
 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;
@@ -75,7 +73,9 @@ class MSBibEntry {
      *  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
@@ -135,7 +135,10 @@ private void populateFromXml(Element entry) {
         if (city != null) {
             addressBuffer.append(city);
         }
-        if (((state != null) && !state.isEmpty()) && ((city != null) && !city.isEmpty())) {
+        if (
+            ((state != null) && !state.isEmpty()) &&
+            ((city != null) && !city.isEmpty())
+        ) {
             addressBuffer.append(",").append(' ');
             addressBuffer.append(state);
         }
@@ -153,17 +156,22 @@ private void populateFromXml(Element entry) {
         }
         journalName = getXmlElementTextContent("JournalName", entry);
         month = getXmlElementTextContent("Month", entry);
-        internetSiteTitle = getXmlElementTextContent("InternetSiteTitle", entry);
+        internetSiteTitle =
+            getXmlElementTextContent("InternetSiteTitle", entry);
 
         String monthAccessed = getXmlElementTextContent("MonthAccessed", 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);
+        parsedDateAcessed
+            .map(Date::getNormalized)
+            .ifPresent(date -> dateAccessed = date);
 
         NodeList nodeLst = entry.getElementsByTagNameNS("*", "Author");
         if (nodeLst.getLength() > 0) {
@@ -195,20 +203,28 @@ private List<MsBibAuthor> getSpecificAuthors(String type, Element authors) {
         if (nodeLst.getLength() <= 0) {
             return result;
         }
-        nodeLst = ((Element) nodeLst.item(0)).getElementsByTagNameNS("*", "NameList");
+        nodeLst =
+            ((Element) nodeLst.item(0)).getElementsByTagNameNS("*", "NameList");
         if (nodeLst.getLength() <= 0) {
             return result;
         }
-        NodeList person = ((Element) nodeLst.item(0)).getElementsByTagNameNS("*", "Person");
+        NodeList person =
+            ((Element) nodeLst.item(0)).getElementsByTagNameNS("*", "Person");
         if (person.getLength() <= 0) {
             return result;
         }
 
         result = new LinkedList<>();
         for (int i = 0; i < person.getLength(); i++) {
-            NodeList firstName = ((Element) person.item(i)).getElementsByTagNameNS("*", "First");
-            NodeList lastName = ((Element) person.item(i)).getElementsByTagNameNS("*", "Last");
-            NodeList middleName = ((Element) person.item(i)).getElementsByTagNameNS("*", "Middle");
+            NodeList firstName =
+                ((Element) person.item(i)).getElementsByTagNameNS("*", "First");
+            NodeList lastName =
+                ((Element) person.item(i)).getElementsByTagNameNS("*", "Last");
+            NodeList middleName =
+                ((Element) person.item(i)).getElementsByTagNameNS(
+                        "*",
+                        "Middle"
+                    );
 
             StringBuilder sb = new StringBuilder();
 
@@ -240,15 +256,23 @@ 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);
@@ -295,35 +319,65 @@ public Element getEntryDom(Document document) {
         return rootNode;
     }
 
-    private void addField(Document document, Element parent, String name, String value) {
+    private void addField(
+        Document document,
+        Element parent,
+        String name,
+        String value
+    ) {
         if (value == null) {
             return;
         }
-        Element elem = document.createElementNS(MSBibDatabase.NAMESPACE, MSBibDatabase.PREFIX + name);
-        elem.appendChild(document.createTextNode(StringUtil.stripNonValidXMLCharacters(value)));
+        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);
-
-        Optional<MsBibAuthor> personName = authorsLst.stream().filter(MsBibAuthor::isCorporate)
-                                                     .findFirst();
+        Element authorTop = document.createElementNS(
+            MSBibDatabase.NAMESPACE,
+            MSBibDatabase.PREFIX + entryName
+        );
+
+        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.getFirstLast());
             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());
@@ -336,27 +390,48 @@ 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) {
+    private void addAddress(
+        Document document,
+        Element parent,
+        String addressToSplit
+    ) {
         if (addressToSplit == null) {
             return;
         }
 
         Matcher matcher = ADDRESS_PATTERN.matcher(addressToSplit);
 
-        if (addressToSplit.contains(",") && matcher.matches() && (matcher.groupCount() >= 3)) {
+        if (
+            addressToSplit.contains(",") &&
+            matcher.matches() &&
+            (matcher.groupCount() >= 3)
+        ) {
             addField(document, parent, "City", matcher.group(1));
             addField(document, parent, "StateProvince", matcher.group(2));
             addField(document, parent, "CountryRegion", matcher.group(3));
diff --git a/src/main/java/org/jabref/logic/msbib/MSBibEntryType.java b/src/main/java/org/jabref/logic/msbib/MSBibEntryType.java
index d4672dd5b0c..e903ee4e28d 100644
--- a/src/main/java/org/jabref/logic/msbib/MSBibEntryType.java
+++ b/src/main/java/org/jabref/logic/msbib/MSBibEntryType.java
@@ -26,5 +26,5 @@ public enum MSBibEntryType {
     Patent,
     ElectronicSource,
     Case,
-    Misc
+    Misc,
 }
diff --git a/src/main/java/org/jabref/logic/msbib/MSBibMapping.java b/src/main/java/org/jabref/logic/msbib/MSBibMapping.java
index d5abe4dbc15..6ae6fdd033a 100644
--- a/src/main/java/org/jabref/logic/msbib/MSBibMapping.java
+++ b/src/main/java/org/jabref/logic/msbib/MSBibMapping.java
@@ -1,8 +1,9 @@
 package org.jabref.logic.msbib;
 
+import com.google.common.collect.BiMap;
+import com.google.common.collect.HashBiMap;
 import java.util.HashMap;
 import java.util.Map;
-
 import org.jabref.model.entry.field.Field;
 import org.jabref.model.entry.field.InternalField;
 import org.jabref.model.entry.field.StandardField;
@@ -11,9 +12,6 @@
 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;
-
 /**
  * Mapping between Msbib and biblatex All Fields: <a href = "https://msdn.microsoft.com/de-de/library/office/documentformat.openxml.bibliography">List
  * of all MSBib fields</a>
@@ -23,10 +21,12 @@ public class MSBibMapping {
     private static final String BIBTEX_PREFIX = "BIBTEX_";
     private static final String MSBIB_PREFIX = "msbib-";
 
-    private static final BiMap<Field, String> BIBLATEX_TO_MS_BIB = HashBiMap.create();
+    private static final BiMap<Field, String> BIBLATEX_TO_MS_BIB =
+        HashBiMap.create();
 
     // see https://learn.microsoft.com/en-us/openspecs/office_standards/ms-oe376/6c085406-a698-4e12-9d4d-c3b0ee3dbc4a
-    private static final BiMap<String, Integer> LANG_TO_LCID = HashBiMap.create();
+    private static final BiMap<String, Integer> LANG_TO_LCID =
+        HashBiMap.create();
 
     static {
         LANG_TO_LCID.put("basque", 1609);
@@ -88,40 +88,120 @@ public class MSBibMapping {
         // BibTeX/Biblatex only fields
 
         BIBLATEX_TO_MS_BIB.put(StandardField.SERIES, BIBTEX_PREFIX + "Series");
-        BIBLATEX_TO_MS_BIB.put(StandardField.ABSTRACT, BIBTEX_PREFIX + "Abstract");
-        BIBLATEX_TO_MS_BIB.put(StandardField.KEYWORDS, BIBTEX_PREFIX + "KeyWords");
-        BIBLATEX_TO_MS_BIB.put(StandardField.CROSSREF, BIBTEX_PREFIX + "CrossRef");
-        BIBLATEX_TO_MS_BIB.put(StandardField.HOWPUBLISHED, BIBTEX_PREFIX + "HowPublished");
-        BIBLATEX_TO_MS_BIB.put(StandardField.PUBSTATE, BIBTEX_PREFIX + "Pubstate");
-        BIBLATEX_TO_MS_BIB.put(new UnknownField("affiliation"), BIBTEX_PREFIX + "Affiliation");
-        BIBLATEX_TO_MS_BIB.put(new UnknownField("contents"), BIBTEX_PREFIX + "Contents");
-        BIBLATEX_TO_MS_BIB.put(new UnknownField("copyright"), BIBTEX_PREFIX + "Copyright");
-        BIBLATEX_TO_MS_BIB.put(new UnknownField("price"), BIBTEX_PREFIX + "Price");
-        BIBLATEX_TO_MS_BIB.put(new UnknownField("size"), BIBTEX_PREFIX + "Size");
-        BIBLATEX_TO_MS_BIB.put(new UnknownField("intype"), BIBTEX_PREFIX + "InType");
-        BIBLATEX_TO_MS_BIB.put(new UnknownField("paper"), BIBTEX_PREFIX + "Paper");
+        BIBLATEX_TO_MS_BIB.put(
+            StandardField.ABSTRACT,
+            BIBTEX_PREFIX + "Abstract"
+        );
+        BIBLATEX_TO_MS_BIB.put(
+            StandardField.KEYWORDS,
+            BIBTEX_PREFIX + "KeyWords"
+        );
+        BIBLATEX_TO_MS_BIB.put(
+            StandardField.CROSSREF,
+            BIBTEX_PREFIX + "CrossRef"
+        );
+        BIBLATEX_TO_MS_BIB.put(
+            StandardField.HOWPUBLISHED,
+            BIBTEX_PREFIX + "HowPublished"
+        );
+        BIBLATEX_TO_MS_BIB.put(
+            StandardField.PUBSTATE,
+            BIBTEX_PREFIX + "Pubstate"
+        );
+        BIBLATEX_TO_MS_BIB.put(
+            new UnknownField("affiliation"),
+            BIBTEX_PREFIX + "Affiliation"
+        );
+        BIBLATEX_TO_MS_BIB.put(
+            new UnknownField("contents"),
+            BIBTEX_PREFIX + "Contents"
+        );
+        BIBLATEX_TO_MS_BIB.put(
+            new UnknownField("copyright"),
+            BIBTEX_PREFIX + "Copyright"
+        );
+        BIBLATEX_TO_MS_BIB.put(
+            new UnknownField("price"),
+            BIBTEX_PREFIX + "Price"
+        );
+        BIBLATEX_TO_MS_BIB.put(
+            new UnknownField("size"),
+            BIBTEX_PREFIX + "Size"
+        );
+        BIBLATEX_TO_MS_BIB.put(
+            new UnknownField("intype"),
+            BIBTEX_PREFIX + "InType"
+        );
+        BIBLATEX_TO_MS_BIB.put(
+            new UnknownField("paper"),
+            BIBTEX_PREFIX + "Paper"
+        );
         BIBLATEX_TO_MS_BIB.put(StandardField.KEY, BIBTEX_PREFIX + "Key");
 
         // MSBib only fields
-        BIBLATEX_TO_MS_BIB.put(new UnknownField(MSBIB_PREFIX + "periodical"), "PeriodicalTitle");
-        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 + "theater"), "Theater");
-        BIBLATEX_TO_MS_BIB.put(new UnknownField(MSBIB_PREFIX + "distributor"), "Distributor");
-        BIBLATEX_TO_MS_BIB.put(new UnknownField(MSBIB_PREFIX + "broadcaster"), "Broadcaster");
-        BIBLATEX_TO_MS_BIB.put(new UnknownField(MSBIB_PREFIX + "station"), "Station");
-        BIBLATEX_TO_MS_BIB.put(new UnknownField(MSBIB_PREFIX + StandardField.TYPE), "Type");
-        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 + "periodical"),
+            "PeriodicalTitle"
+        );
+        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 + "theater"),
+            "Theater"
+        );
+        BIBLATEX_TO_MS_BIB.put(
+            new UnknownField(MSBIB_PREFIX + "distributor"),
+            "Distributor"
+        );
+        BIBLATEX_TO_MS_BIB.put(
+            new UnknownField(MSBIB_PREFIX + "broadcaster"),
+            "Broadcaster"
+        );
+        BIBLATEX_TO_MS_BIB.put(
+            new UnknownField(MSBIB_PREFIX + "station"),
+            "Station"
+        );
+        BIBLATEX_TO_MS_BIB.put(
+            new UnknownField(MSBIB_PREFIX + StandardField.TYPE),
+            "Type"
+        );
+        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"
+        );
     }
 
-    private MSBibMapping() {
-    }
+    private MSBibMapping() {}
 
     public static EntryType getBiblatexEntryType(String msbibType) {
         Map<String, EntryType> entryTypeMapping = new HashMap<>();
@@ -129,8 +209,14 @@ public static EntryType getBiblatexEntryType(String msbibType) {
         entryTypeMapping.put("Book", StandardEntryType.Book);
         entryTypeMapping.put("BookSection", StandardEntryType.Book);
         entryTypeMapping.put("JournalArticle", StandardEntryType.Article);
-        entryTypeMapping.put("ArticleInAPeriodical", IEEETranEntryType.Periodical);
-        entryTypeMapping.put("ConferenceProceedings", StandardEntryType.InProceedings);
+        entryTypeMapping.put(
+            "ArticleInAPeriodical",
+            IEEETranEntryType.Periodical
+        );
+        entryTypeMapping.put(
+            "ConferenceProceedings",
+            StandardEntryType.InProceedings
+        );
         entryTypeMapping.put("Report", StandardEntryType.TechReport);
         entryTypeMapping.put("Patent", IEEETranEntryType.Patent);
         entryTypeMapping.put("InternetSite", StandardEntryType.Online);
@@ -142,23 +228,65 @@ public static MSBibEntryType getMSBibEntryType(EntryType bibtexType) {
         Map<EntryType, MSBibEntryType> entryTypeMapping = new HashMap<>();
 
         entryTypeMapping.put(StandardEntryType.Book, MSBibEntryType.Book);
-        entryTypeMapping.put(StandardEntryType.InBook, MSBibEntryType.BookSection);
-        entryTypeMapping.put(StandardEntryType.Booklet, MSBibEntryType.BookSection);
-        entryTypeMapping.put(StandardEntryType.InCollection, MSBibEntryType.BookSection);
-        entryTypeMapping.put(StandardEntryType.Article, MSBibEntryType.JournalArticle);
-        entryTypeMapping.put(StandardEntryType.InProceedings, MSBibEntryType.ConferenceProceedings);
-        entryTypeMapping.put(StandardEntryType.Conference, MSBibEntryType.ConferenceProceedings);
-        entryTypeMapping.put(StandardEntryType.Proceedings, MSBibEntryType.ConferenceProceedings);
-        entryTypeMapping.put(StandardEntryType.Collection, MSBibEntryType.ConferenceProceedings);
-        entryTypeMapping.put(StandardEntryType.TechReport, MSBibEntryType.Report);
+        entryTypeMapping.put(
+            StandardEntryType.InBook,
+            MSBibEntryType.BookSection
+        );
+        entryTypeMapping.put(
+            StandardEntryType.Booklet,
+            MSBibEntryType.BookSection
+        );
+        entryTypeMapping.put(
+            StandardEntryType.InCollection,
+            MSBibEntryType.BookSection
+        );
+        entryTypeMapping.put(
+            StandardEntryType.Article,
+            MSBibEntryType.JournalArticle
+        );
+        entryTypeMapping.put(
+            StandardEntryType.InProceedings,
+            MSBibEntryType.ConferenceProceedings
+        );
+        entryTypeMapping.put(
+            StandardEntryType.Conference,
+            MSBibEntryType.ConferenceProceedings
+        );
+        entryTypeMapping.put(
+            StandardEntryType.Proceedings,
+            MSBibEntryType.ConferenceProceedings
+        );
+        entryTypeMapping.put(
+            StandardEntryType.Collection,
+            MSBibEntryType.ConferenceProceedings
+        );
+        entryTypeMapping.put(
+            StandardEntryType.TechReport,
+            MSBibEntryType.Report
+        );
         entryTypeMapping.put(StandardEntryType.Manual, MSBibEntryType.Report);
-        entryTypeMapping.put(StandardEntryType.MastersThesis, MSBibEntryType.Report);
-        entryTypeMapping.put(StandardEntryType.PhdThesis, MSBibEntryType.Report);
-        entryTypeMapping.put(StandardEntryType.Unpublished, MSBibEntryType.Report);
+        entryTypeMapping.put(
+            StandardEntryType.MastersThesis,
+            MSBibEntryType.Report
+        );
+        entryTypeMapping.put(
+            StandardEntryType.PhdThesis,
+            MSBibEntryType.Report
+        );
+        entryTypeMapping.put(
+            StandardEntryType.Unpublished,
+            MSBibEntryType.Report
+        );
         entryTypeMapping.put(IEEETranEntryType.Patent, MSBibEntryType.Patent);
         entryTypeMapping.put(StandardEntryType.Misc, MSBibEntryType.Misc);
-        entryTypeMapping.put(IEEETranEntryType.Electronic, MSBibEntryType.ElectronicSource);
-        entryTypeMapping.put(StandardEntryType.Online, MSBibEntryType.InternetSite);
+        entryTypeMapping.put(
+            IEEETranEntryType.Electronic,
+            MSBibEntryType.ElectronicSource
+        );
+        entryTypeMapping.put(
+            StandardEntryType.Online,
+            MSBibEntryType.InternetSite
+        );
 
         return entryTypeMapping.getOrDefault(bibtexType, MSBibEntryType.Misc);
     }
diff --git a/src/main/java/org/jabref/logic/msbib/MsBibAuthor.java b/src/main/java/org/jabref/logic/msbib/MsBibAuthor.java
index 1c1bd488390..44818373de7 100644
--- a/src/main/java/org/jabref/logic/msbib/MsBibAuthor.java
+++ b/src/main/java/org/jabref/logic/msbib/MsBibAuthor.java
@@ -13,16 +13,17 @@ public MsBibAuthor(Author author) {
         this.author = author;
 
         StringBuilder sb = new StringBuilder();
-        author.getFirst().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
+            .getFirst()
+            .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 54daca52fd9..617668ccb1e 100644
--- a/src/main/java/org/jabref/logic/msbib/PageNumbers.java
+++ b/src/main/java/org/jabref/logic/msbib/PageNumbers.java
@@ -2,13 +2,15 @@
 
 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;
 
 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;
 
@@ -34,8 +36,12 @@ public Element getDOMrepresentation(Document document) {
         if (freeform == null) {
             Element tmpStart = document.createElement("start");
             Element tmpEnd = document.createElement("end");
-            tmpStart.appendChild(document.createTextNode(String.valueOf(this.start)));
-            tmpEnd.appendChild(document.createTextNode(String.valueOf(this.end)));
+            tmpStart.appendChild(
+                document.createTextNode(String.valueOf(this.start))
+            );
+            tmpEnd.appendChild(
+                document.createTextNode(String.valueOf(this.end))
+            );
             result.appendChild(tmpStart);
             result.appendChild(tmpEnd);
         } else {
diff --git a/src/main/java/org/jabref/logic/net/ProgressInputStream.java b/src/main/java/org/jabref/logic/net/ProgressInputStream.java
index d114cbbe6cb..06bf645f28d 100644
--- a/src/main/java/org/jabref/logic/net/ProgressInputStream.java
+++ b/src/main/java/org/jabref/logic/net/ProgressInputStream.java
@@ -3,7 +3,6 @@
 import java.io.FilterInputStream;
 import java.io.IOException;
 import java.io.InputStream;
-
 import javafx.beans.property.LongProperty;
 import javafx.beans.property.SimpleLongProperty;
 
diff --git a/src/main/java/org/jabref/logic/net/ProxyAuthenticator.java b/src/main/java/org/jabref/logic/net/ProxyAuthenticator.java
index f6e3496e8ce..4b4e961e9b3 100644
--- a/src/main/java/org/jabref/logic/net/ProxyAuthenticator.java
+++ b/src/main/java/org/jabref/logic/net/ProxyAuthenticator.java
@@ -14,7 +14,10 @@ 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 dc5311ab139..fda6e7eb859 100644
--- a/src/main/java/org/jabref/logic/net/ProxyPreferences.java
+++ b/src/main/java/org/jabref/logic/net/ProxyPreferences.java
@@ -1,7 +1,6 @@
 package org.jabref.logic.net;
 
 import java.util.Objects;
-
 import javafx.beans.property.BooleanProperty;
 import javafx.beans.property.SimpleBooleanProperty;
 import javafx.beans.property.SimpleStringProperty;
@@ -17,13 +16,15 @@ 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);
@@ -128,24 +129,33 @@ public boolean equals(Object o) {
         }
 
         ProxyPreferences other = (ProxyPreferences) o;
-        return Objects.equals(useProxy.getValue(), other.useProxy.getValue())
-                && Objects.equals(hostname.getValue(), other.hostname.getValue())
-                && Objects.equals(port.getValue(), other.port.getValue())
-                && Objects.equals(useAuthentication.getValue(), other.useAuthentication.getValue())
-                && Objects.equals(username.getValue(), other.username.getValue())
-                && Objects.equals(password.getValue(), other.password.getValue())
-                && Objects.equals(persistPassword.getValue(), other.persistPassword.getValue());
+        return (
+            Objects.equals(useProxy.getValue(), other.useProxy.getValue()) &&
+            Objects.equals(hostname.getValue(), other.hostname.getValue()) &&
+            Objects.equals(port.getValue(), other.port.getValue()) &&
+            Objects.equals(
+                useAuthentication.getValue(),
+                other.useAuthentication.getValue()
+            ) &&
+            Objects.equals(username.getValue(), other.username.getValue()) &&
+            Objects.equals(password.getValue(), other.password.getValue()) &&
+            Objects.equals(
+                persistPassword.getValue(),
+                other.persistPassword.getValue()
+            )
+        );
     }
 
     @Override
     public int hashCode() {
         return Objects.hash(
-                useProxy.getValue(),
-                hostname.getValue(),
-                port.getValue(),
-                useAuthentication.getValue(),
-                username.getValue(),
-                password.getValue(),
-                persistPassword.getValue());
+            useProxy.getValue(),
+            hostname.getValue(),
+            port.getValue(),
+            useAuthentication.getValue(),
+            username.getValue(),
+            password.getValue(),
+            persistPassword.getValue()
+        );
     }
 }
diff --git a/src/main/java/org/jabref/logic/net/ProxyRegisterer.java b/src/main/java/org/jabref/logic/net/ProxyRegisterer.java
index 344f4fd412f..eab0853a330 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()) {
@@ -17,10 +16,16 @@ public static void register(ProxyPreferences proxyPrefs) {
             // 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());
+                System.setProperty(
+                    "http.proxyPassword",
+                    proxyPrefs.getPassword()
+                );
 
                 System.setProperty("https.proxyUser", proxyPrefs.getUsername());
-                System.setProperty("https.proxyPassword", proxyPrefs.getPassword());
+                System.setProperty(
+                    "https.proxyPassword",
+                    proxyPrefs.getPassword()
+                );
             } else {
                 System.clearProperty("http.proxyUser");
                 System.clearProperty("http.proxyPassword");
diff --git a/src/main/java/org/jabref/logic/net/URLDownload.java b/src/main/java/org/jabref/logic/net/URLDownload.java
index e357b621ac0..d290c7c291f 100644
--- a/src/main/java/org/jabref/logic/net/URLDownload.java
+++ b/src/main/java/org/jabref/logic/net/URLDownload.java
@@ -32,22 +32,19 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
-
 import javax.net.ssl.HostnameVerifier;
 import javax.net.ssl.HttpsURLConnection;
 import javax.net.ssl.SSLContext;
 import javax.net.ssl.SSLSocketFactory;
 import javax.net.ssl.TrustManager;
 import javax.net.ssl.X509TrustManager;
-
-import org.jabref.logic.importer.FetcherClientException;
-import org.jabref.logic.importer.FetcherServerException;
-import org.jabref.logic.util.io.FileUtil;
-
 import kong.unirest.Unirest;
 import kong.unirest.UnirestException;
 import kong.unirest.apache.ApacheClient;
 import org.apache.http.client.config.RequestConfig;
+import org.jabref.logic.importer.FetcherClientException;
+import org.jabref.logic.importer.FetcherServerException;
+import org.jabref.logic.util.io.FileUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -67,9 +64,14 @@
  */
 public class URLDownload {
 
-    public static final String USER_AGENT = "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/108.0.0.0 Safari/537.36";
-    private static final Logger LOGGER = LoggerFactory.getLogger(URLDownload.class);
-    private static final Duration DEFAULT_CONNECT_TIMEOUT = Duration.ofSeconds(30);
+    public static final String USER_AGENT =
+        "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/108.0.0.0 Safari/537.36";
+    private static final Logger LOGGER = LoggerFactory.getLogger(
+        URLDownload.class
+    );
+    private static final Duration DEFAULT_CONNECT_TIMEOUT = Duration.ofSeconds(
+        30
+    );
 
     private final URL source;
     private final Map<String, String> parameters = new HashMap<>();
@@ -110,32 +112,43 @@ public static void bypassSSLVerification() {
         LOGGER.warn("Fix SSL exceptions by accepting ALL certificates");
 
         // Create a trust manager that does not validate certificate chains
-        TrustManager[] trustAllCerts = {new X509TrustManager() {
-            @Override
-            public void checkClientTrusted(X509Certificate[] chain, String authType) {
-            }
-
-            @Override
-            public void checkServerTrusted(X509Certificate[] chain, String authType) {
-            }
-
-            @Override
-            public X509Certificate[] getAcceptedIssuers() {
-                return new X509Certificate[0];
-            }
-        }};
+        TrustManager[] trustAllCerts = {
+            new X509TrustManager() {
+                @Override
+                public void checkClientTrusted(
+                    X509Certificate[] chain,
+                    String authType
+                ) {}
+
+                @Override
+                public void checkServerTrusted(
+                    X509Certificate[] chain,
+                    String authType
+                ) {}
+
+                @Override
+                public X509Certificate[] getAcceptedIssuers() {
+                    return new X509Certificate[0];
+                }
+            },
+        };
 
         try {
             // Install all-trusting trust manager
             SSLContext context = SSLContext.getInstance("TLS");
             context.init(null, trustAllCerts, new SecureRandom());
-            HttpsURLConnection.setDefaultSSLSocketFactory(context.getSocketFactory());
+            HttpsURLConnection.setDefaultSSLSocketFactory(
+                context.getSocketFactory()
+            );
 
             // Install all-trusting host verifier
             HostnameVerifier allHostsValid = (hostname, session) -> true;
             HttpsURLConnection.setDefaultHostnameVerifier(allHostsValid);
         } catch (Exception e) {
-            LOGGER.error("A problem occurred when bypassing SSL verification", e);
+            LOGGER.error(
+                "A problem occurred when bypassing SSL verification",
+                e
+            );
         }
     }
 
@@ -144,7 +157,10 @@ public X509Certificate[] getAcceptedIssuers() {
      * @param socketFactory trust manager
      * @param verifier host verifier
      */
-    public static void setSSLVerification(SSLSocketFactory socketFactory, HostnameVerifier verifier) {
+    public static void setSSLVerification(
+        SSLSocketFactory socketFactory,
+        HostnameVerifier verifier
+    ) {
         try {
             HttpsURLConnection.setDefaultSSLSocketFactory(socketFactory);
             HttpsURLConnection.setDefaultHostnameVerifier(verifier);
@@ -158,12 +174,23 @@ public URL getSource() {
     }
 
     public String getMimeType() {
-        Unirest.config().setDefaultHeader("User-Agent", "Mozilla/5.0 (Windows; U; WindowsNT 5.1; en-US; rv1.8.1.6) Gecko/20070725 Firefox/2.0.0.6");
+        Unirest
+            .config()
+            .setDefaultHeader(
+                "User-Agent",
+                "Mozilla/5.0 (Windows; U; WindowsNT 5.1; en-US; rv1.8.1.6) Gecko/20070725 Firefox/2.0.0.6"
+            );
 
         String contentType;
         // Try to use HEAD request to avoid downloading the whole file
         try {
-            contentType = Unirest.head(source.toString()).asString().getHeaders().get("Content-Type").get(0);
+            contentType =
+                Unirest
+                    .head(source.toString())
+                    .asString()
+                    .getHeaders()
+                    .get("Content-Type")
+                    .get(0);
             if ((contentType != null) && !contentType.isEmpty()) {
                 return contentType;
             }
@@ -173,7 +200,13 @@ public String getMimeType() {
 
         // Use GET request as alternative if no HEAD request is available
         try {
-            contentType = Unirest.get(source.toString()).asString().getHeaders().get("Content-Type").get(0);
+            contentType =
+                Unirest
+                    .get(source.toString())
+                    .asString()
+                    .getHeaders()
+                    .get("Content-Type")
+                    .get(0);
             if ((contentType != null) && !contentType.isEmpty()) {
                 return contentType;
             }
@@ -183,7 +216,8 @@ public String getMimeType() {
 
         // Try to resolve local URIs
         try {
-            URLConnection connection = new URL(source.toString()).openConnection();
+            URLConnection connection = new URL(source.toString())
+                .openConnection();
 
             contentType = connection.getContentType();
             if ((contentType != null) && !contentType.isEmpty()) {
@@ -203,12 +237,18 @@ public String getMimeType() {
      * @return the status code of the response
      */
     public boolean canBeReached() throws UnirestException {
-
         // Set a custom Apache Client Builder to be able to allow circular redirects, otherwise downloads from springer might not work
-        Unirest.config().httpClient(new ApacheClient.Builder()
-                                    .withRequestConfig((c, r) -> RequestConfig.custom()
-                                                       .setCircularRedirectsAllowed(true)
-                                                       .build()));
+        Unirest
+            .config()
+            .httpClient(
+                new ApacheClient.Builder()
+                    .withRequestConfig((c, r) ->
+                        RequestConfig
+                            .custom()
+                            .setCircularRedirectsAllowed(true)
+                            .build()
+                    )
+            );
 
         Unirest.config().setDefaultHeader("User-Agent", USER_AGENT);
 
@@ -265,7 +305,8 @@ public String asString(Charset encoding) throws IOException {
      * @param existingConnection an existing connection
      * @return the downloaded string
      */
-    public static String asString(URLConnection existingConnection) throws IOException {
+    public static String asString(URLConnection existingConnection)
+        throws IOException {
         return asString(StandardCharsets.UTF_8, existingConnection);
     }
 
@@ -276,10 +317,14 @@ public static String asString(URLConnection existingConnection) throws IOExcepti
      * @param connection an existing connection
      * @return the downloaded string
      */
-    public static String asString(Charset encoding, URLConnection connection) throws IOException {
-
-        try (InputStream input = new BufferedInputStream(connection.getInputStream());
-             Writer output = new StringWriter()) {
+    public static String asString(Charset encoding, URLConnection connection)
+        throws IOException {
+        try (
+            InputStream input = new BufferedInputStream(
+                connection.getInputStream()
+            );
+            Writer output = new StringWriter()
+        ) {
             copy(input, output, encoding);
             return output.toString();
         }
@@ -307,7 +352,11 @@ public List<HttpCookie> getCookieFromUrl() throws IOException {
      * @param destination the destination file path.
      */
     public void toFile(Path destination) throws IOException {
-        try (InputStream input = new BufferedInputStream(this.openConnection().getInputStream())) {
+        try (
+            InputStream input = new BufferedInputStream(
+                this.openConnection().getInputStream()
+            )
+        ) {
             Files.copy(input, destination, StandardCopyOption.REPLACE_EXISTING);
         } catch (IOException e) {
             LOGGER.warn("Could not copy input", e);
@@ -319,14 +368,30 @@ public void toFile(Path destination) throws IOException {
      * Takes the web resource as the source for a monitored input stream.
      */
     public ProgressInputStream asInputStream() throws IOException {
-        HttpURLConnection urlConnection = (HttpURLConnection) this.openConnection();
-
-        if ((urlConnection.getResponseCode() == HttpURLConnection.HTTP_NOT_FOUND) || (urlConnection.getResponseCode() == HttpURLConnection.HTTP_BAD_REQUEST)) {
-            LOGGER.error("Response message {} returned for url {}", urlConnection.getResponseMessage(), urlConnection.getURL());
-            return new ProgressInputStream(new ByteArrayInputStream(new byte[0]), 0);
+        HttpURLConnection urlConnection =
+            (HttpURLConnection) this.openConnection();
+
+        if (
+            (urlConnection.getResponseCode() ==
+                HttpURLConnection.HTTP_NOT_FOUND) ||
+            (urlConnection.getResponseCode() ==
+                HttpURLConnection.HTTP_BAD_REQUEST)
+        ) {
+            LOGGER.error(
+                "Response message {} returned for url {}",
+                urlConnection.getResponseMessage(),
+                urlConnection.getURL()
+            );
+            return new ProgressInputStream(
+                new ByteArrayInputStream(new byte[0]),
+                0
+            );
         }
         long fileSize = urlConnection.getContentLengthLong();
-        return new ProgressInputStream(new BufferedInputStream(urlConnection.getInputStream()), fileSize);
+        return new ProgressInputStream(
+            new BufferedInputStream(urlConnection.getInputStream()),
+            fileSize
+        );
     }
 
     /**
@@ -339,9 +404,14 @@ public Path toTemporaryFile() throws IOException {
         String sourcePath = source.getPath();
 
         // Take everything after the last '/' as name + extension
-        String fileNameWithExtension = sourcePath.substring(sourcePath.lastIndexOf('/') + 1);
-        String fileName = "jabref-" + FileUtil.getBaseName(fileNameWithExtension);
-        String extension = "." + FileUtil.getFileExtension(fileNameWithExtension).orElse("tmp");
+        String fileNameWithExtension = sourcePath.substring(
+            sourcePath.lastIndexOf('/') + 1
+        );
+        String fileName =
+            "jabref-" + FileUtil.getBaseName(fileNameWithExtension);
+        String extension =
+            "." +
+            FileUtil.getFileExtension(fileNameWithExtension).orElse("tmp");
 
         // Create temporary file and download to it
         Path file = Files.createTempFile(fileName, extension);
@@ -356,7 +426,8 @@ public String toString() {
         return "URLDownload{" + "source=" + this.source + '}';
     }
 
-    private static void copy(InputStream in, Writer out, Charset encoding) throws IOException {
+    private static void copy(InputStream in, Writer out, Charset encoding)
+        throws IOException {
         Reader r = new InputStreamReader(in, encoding);
         try (BufferedReader read = new BufferedReader(r)) {
             String line;
@@ -381,7 +452,11 @@ public URLConnection openConnection() throws IOException {
         }
         if (!this.postData.isEmpty()) {
             connection.setDoOutput(true);
-            try (DataOutputStream wr = new DataOutputStream(connection.getOutputStream())) {
+            try (
+                DataOutputStream wr = new DataOutputStream(
+                    connection.getOutputStream()
+                )
+            ) {
                 wr.writeBytes(this.postData);
             }
         }
@@ -390,19 +465,29 @@ public URLConnection openConnection() throws IOException {
             // normally, 3xx is redirect
             int status = lConnection.getResponseCode();
 
-            if ((status == HttpURLConnection.HTTP_MOVED_TEMP)
-                || (status == HttpURLConnection.HTTP_MOVED_PERM)
-                || (status == HttpURLConnection.HTTP_SEE_OTHER)) {
+            if (
+                (status == HttpURLConnection.HTTP_MOVED_TEMP) ||
+                (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
                 connection = new URLDownload(newUrl).openConnection();
             }
             if ((status >= 400) && (status < 500)) {
-                throw new IOException(new FetcherClientException("Encountered HTTP Status code " + status));
+                throw new IOException(
+                    new FetcherClientException(
+                        "Encountered HTTP Status code " + status
+                    )
+                );
             }
             if (status >= 500) {
-                throw new IOException(new FetcherServerException("Encountered HTTP Status Code " + status));
+                throw new IOException(
+                    new FetcherServerException(
+                        "Encountered HTTP Status Code " + status
+                    )
+                );
             }
         }
         // this does network i/o: GET + read returned headers
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 d2229b87850..8324dc533b9 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,6 @@
 package org.jabref.logic.net.ssl;
 
+import com.google.common.hash.Hashing;
 import java.io.FileInputStream;
 import java.io.FileNotFoundException;
 import java.nio.file.Path;
@@ -11,13 +12,14 @@
 import java.time.ZoneId;
 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);
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(
+        SSLCertificate.class
+    );
 
     private final String sha256Thumbprint;
     private final String serialNumber;
@@ -27,7 +29,15 @@ 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;
@@ -68,15 +78,28 @@ public String getSHA256Thumbprint() {
         return sha256Thumbprint;
     }
 
-    public static Optional<SSLCertificate> fromX509(X509Certificate x509Certificate) {
+    public static Optional<SSLCertificate> fromX509(
+        X509Certificate x509Certificate
+    ) {
         Objects.requireNonNull(x509Certificate);
         try {
-            return Optional.of(new SSLCertificate(x509Certificate.getEncoded(), x509Certificate.getSerialNumber().toString(),
+            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()),
+                    LocalDate.ofInstant(
+                        x509Certificate.getNotBefore().toInstant(),
+                        ZoneId.systemDefault()
+                    ),
+                    LocalDate.ofInstant(
+                        x509Certificate.getNotAfter().toInstant(),
+                        ZoneId.systemDefault()
+                    ),
                     x509Certificate.getSigAlgName(),
-                    x509Certificate.getVersion()));
+                    x509Certificate.getVersion()
+                )
+            );
         } catch (CertificateEncodingException e) {
             LOGGER.warn("Error while encoding certificate", e);
         }
@@ -86,8 +109,13 @@ public static Optional<SSLCertificate> fromX509(X509Certificate x509Certificate)
     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())));
+            CertificateFactory certificateFactory =
+                CertificateFactory.getInstance("X509");
+            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/SSLPreferences.java b/src/main/java/org/jabref/logic/net/ssl/SSLPreferences.java
index 4489127f356..9a2eaea2ae2 100644
--- a/src/main/java/org/jabref/logic/net/ssl/SSLPreferences.java
+++ b/src/main/java/org/jabref/logic/net/ssl/SSLPreferences.java
@@ -4,6 +4,7 @@
 import javafx.beans.property.StringProperty;
 
 public class SSLPreferences {
+
     private final StringProperty truststorePath;
 
     public SSLPreferences(String truststorePath) {
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 d88bb64fba8..8d526e552cb 100644
--- a/src/main/java/org/jabref/logic/net/ssl/TrustStoreManager.java
+++ b/src/main/java/org/jabref/logic/net/ssl/TrustStoreManager.java
@@ -18,19 +18,19 @@
 import java.util.Objects;
 import java.util.Optional;
 import java.util.stream.Collectors;
-
 import javax.net.ssl.HttpsURLConnection;
 import javax.net.ssl.SSLContext;
 import javax.net.ssl.TrustManager;
 import javax.net.ssl.TrustManagerFactory;
 import javax.net.ssl.X509TrustManager;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 public class TrustStoreManager {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(TrustStoreManager.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(
+        TrustStoreManager.class
+    );
     private static final String STORE_PASSWORD = "changeit";
 
     private final Path storePath;
@@ -42,9 +42,21 @@ public TrustStoreManager(Path storePath) {
         createTruststoreFileIfNotExist(storePath);
         try {
             store = KeyStore.getInstance(KeyStore.getDefaultType());
-            store.load(new FileInputStream(storePath.toFile()), STORE_PASSWORD.toCharArray());
-        } catch (CertificateException | IOException | NoSuchAlgorithmException | KeyStoreException e) {
-            LOGGER.warn("Error while loading trust store from: {}", storePath.toAbsolutePath(), e);
+            store.load(
+                new FileInputStream(storePath.toFile()),
+                STORE_PASSWORD.toCharArray()
+            );
+        } catch (
+            CertificateException
+            | IOException
+            | NoSuchAlgorithmException
+            | KeyStoreException e
+        ) {
+            LOGGER.warn(
+                "Error while loading trust store from: {}",
+                storePath.toAbsolutePath(),
+                e
+            );
         }
     }
 
@@ -53,10 +65,20 @@ public void addCertificate(String alias, Path certPath) {
         Objects.requireNonNull(certPath);
 
         try {
-            CertificateFactory certificateFactory = CertificateFactory.getInstance("X509");
-            store.setCertificateEntry(alias, certificateFactory.generateCertificate(new FileInputStream(certPath.toFile())));
+            CertificateFactory certificateFactory =
+                CertificateFactory.getInstance("X509");
+            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);
+            LOGGER.warn(
+                "Error while adding a new certificate to the truststore: {}",
+                alias,
+                e
+            );
         }
     }
 
@@ -65,7 +87,11 @@ public void deleteCertificate(String alias) {
         try {
             store.deleteEntry(alias);
         } catch (KeyStoreException e) {
-            LOGGER.warn("Error while deleting certificate entry with alias: {}", alias, e);
+            LOGGER.warn(
+                "Error while deleting certificate entry with alias: {}",
+                alias,
+                e
+            );
         }
     }
 
@@ -74,7 +100,11 @@ public boolean certificateExists(String alias) {
         try {
             return store.isCertificateEntry(alias);
         } catch (KeyStoreException e) {
-            LOGGER.warn("Error while checking certificate existence: {}", alias, e);
+            LOGGER.warn(
+                "Error while checking certificate existence: {}",
+                alias,
+                e
+            );
         }
         return false;
     }
@@ -99,8 +129,16 @@ public int certsCount() {
 
     public void flush() {
         try {
-            store.store(Files.newOutputStream(storePath), STORE_PASSWORD.toCharArray());
-        } catch (KeyStoreException | IOException | NoSuchAlgorithmException | CertificateException e) {
+            store.store(
+                Files.newOutputStream(storePath),
+                STORE_PASSWORD.toCharArray()
+            );
+        } catch (
+            KeyStoreException
+            | IOException
+            | NoSuchAlgorithmException
+            | CertificateException e
+        ) {
             LOGGER.warn("Error while flushing trust store", e);
         }
     }
@@ -116,24 +154,32 @@ private Boolean isCustomCertificate(String alias) {
      * Deletes all custom certificates, Custom certificates are certificates with alias that ends with {@code [custom]}
      */
     public void clearCustomCertificates() {
-        aliases().stream().filter(this::isCustomCertificate).forEach(this::deleteCertificate);
+        aliases()
+            .stream()
+            .filter(this::isCustomCertificate)
+            .forEach(this::deleteCertificate);
         flush();
     }
 
     public List<SSLCertificate> getCustomCertificates() {
-        return aliases().stream()
-                        .filter(this::isCustomCertificate)
-                        .map(this::getCertificate)
-                        .map(SSLCertificate::fromX509)
-                        .flatMap(Optional::stream)
-                        .collect(Collectors.toList());
+        return aliases()
+            .stream()
+            .filter(this::isCustomCertificate)
+            .map(this::getCertificate)
+            .map(SSLCertificate::fromX509)
+            .flatMap(Optional::stream)
+            .collect(Collectors.toList());
     }
 
     public X509Certificate getCertificate(String alias) {
         try {
             return (X509Certificate) store.getCertificate(alias);
         } catch (KeyStoreException e) {
-            LOGGER.warn("Error while getting certificate of alias: {}", alias, e);
+            LOGGER.warn(
+                "Error while getting certificate of alias: {}",
+                alias,
+                e
+            );
         }
         return null;
     }
@@ -148,14 +194,22 @@ public static void createTruststoreFileIfNotExist(Path storePath) {
         try {
             LOGGER.debug("Trust store path: {}", storePath.toAbsolutePath());
             if (Files.notExists(storePath)) {
-                Path storeResourcePath = Path.of(TrustStoreManager.class.getResource("/ssl/truststore.jks").toURI());
+                Path storeResourcePath = Path.of(
+                    TrustStoreManager.class.getResource("/ssl/truststore.jks")
+                        .toURI()
+                );
                 Files.createDirectories(storePath.getParent());
                 Files.copy(storeResourcePath, 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) {
@@ -166,21 +220,25 @@ public static void createTruststoreFileIfNotExist(Path storePath) {
     }
 
     // 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");
@@ -192,7 +250,9 @@ private static X509TrustManager getJabRefTrustManager(Path myStorePath) throws K
 
     private static X509TrustManager findDefaultTrustManager(KeyStore keyStore)
         throws NoSuchAlgorithmException, KeyStoreException {
-        TrustManagerFactory tmf = TrustManagerFactory.getInstance(TrustManagerFactory.getDefaultAlgorithm());
+        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()) {
@@ -203,8 +263,10 @@ 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() {
@@ -214,7 +276,10 @@ 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) {
@@ -224,7 +289,10 @@ 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);
@@ -232,14 +300,17 @@ public void checkClientTrusted(X509Certificate[] chain, String authType) throws
         };
     }
 
-    private static void setSystemTrustManager(X509TrustManager mergedTrustManager)
-        throws NoSuchAlgorithmException, KeyManagementException {
+    private static void setSystemTrustManager(
+        X509TrustManager mergedTrustManager
+    ) throws NoSuchAlgorithmException, KeyManagementException {
         SSLContext sslContext = SSLContext.getInstance("TLS");
-        sslContext.init(null, new TrustManager[] {mergedTrustManager}, null);
+        sslContext.init(null, new TrustManager[] { mergedTrustManager }, null);
 
         // You don't have to set this as the default context,
         // it depends on the library you're using.
         SSLContext.setDefault(sslContext);
-        HttpsURLConnection.setDefaultSSLSocketFactory(sslContext.getSocketFactory());
+        HttpsURLConnection.setDefaultSSLSocketFactory(
+            sslContext.getSocketFactory()
+        );
     }
 }
diff --git a/src/main/java/org/jabref/logic/openoffice/OpenOfficeFileSearch.java b/src/main/java/org/jabref/logic/openoffice/OpenOfficeFileSearch.java
index c20124f943d..fa5d1b96127 100644
--- a/src/main/java/org/jabref/logic/openoffice/OpenOfficeFileSearch.java
+++ b/src/main/java/org/jabref/logic/openoffice/OpenOfficeFileSearch.java
@@ -12,15 +12,16 @@
 import java.util.function.BiPredicate;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
-
 import org.jabref.logic.util.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);
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(
+        OpenOfficeFileSearch.class
+    );
 
     /**
      * Detects existing installation of OpenOffice and LibreOffice.
@@ -30,30 +31,63 @@ 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()).collect(Collectors.toList());
+            return programDirs
+                .stream()
+                .filter(dir ->
+                    FileUtil
+                        .find(OpenOfficePreferences.WINDOWS_EXECUTABLE, dir)
+                        .isPresent()
+                )
+                .collect(Collectors.toList());
         } else if (OS.OS_X) {
             List<Path> programDirs = findOSXOpenOfficeDirs();
-            return programDirs.stream().filter(dir -> FileUtil.find(OpenOfficePreferences.OSX_EXECUTABLE, dir).isPresent()).collect(Collectors.toList());
+            return programDirs
+                .stream()
+                .filter(dir ->
+                    FileUtil
+                        .find(OpenOfficePreferences.OSX_EXECUTABLE, dir)
+                        .isPresent()
+                )
+                .collect(Collectors.toList());
         } else if (OS.LINUX) {
             List<Path> programDirs = findLinuxOpenOfficeDirs();
-            return programDirs.stream().filter(dir -> FileUtil.find(OpenOfficePreferences.LINUX_EXECUTABLE, dir).isPresent()).collect(Collectors.toList());
+            return programDirs
+                .stream()
+                .filter(dir ->
+                    FileUtil
+                        .find(OpenOfficePreferences.LINUX_EXECUTABLE, dir)
+                        .isPresent()
+                )
+                .collect(Collectors.toList());
         }
         return new ArrayList<>(0);
     }
 
-    private static List<Path> findOpenOfficeDirectories(List<Path> programDirectories) {
+    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"));
+            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();
-            }
-        }).collect(Collectors.toList());
+        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();
+                }
+            })
+            .collect(Collectors.toList());
     }
 
     private static List<Path> findWindowsOpenOfficeDirs() {
@@ -75,13 +109,19 @@ private static List<Path> findWindowsOpenOfficeDirs() {
     }
 
     private static List<Path> findOSXOpenOfficeDirs() {
-        List<Path> sourceList = Collections.singletonList(Path.of("/Applications"));
+        List<Path> sourceList = Collections.singletonList(
+            Path.of("/Applications")
+        );
 
         return findOpenOfficeDirectories(sourceList);
     }
 
     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 22fbcbf885a..e17ee9adf75 100644
--- a/src/main/java/org/jabref/logic/openoffice/OpenOfficePreferences.java
+++ b/src/main/java/org/jabref/logic/openoffice/OpenOfficePreferences.java
@@ -1,7 +1,6 @@
 package org.jabref.logic.openoffice;
 
 import java.util.List;
-
 import javafx.beans.property.BooleanProperty;
 import javafx.beans.property.SimpleBooleanProperty;
 import javafx.beans.property.SimpleStringProperty;
@@ -11,14 +10,18 @@
 
 public class OpenOfficePreferences {
 
-    public static final String DEFAULT_WIN_EXEC_PATH = "C:\\Program Files\\LibreOffice 5\\program";
+    public static final String DEFAULT_WIN_EXEC_PATH =
+        "C:\\Program Files\\LibreOffice 5\\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";
-    public static final String DEFAULT_LINUX_FLATPAK_EXEC_PATH = "/app/bin/soffice";
+    public static final String DEFAULT_LINUX_EXEC_PATH =
+        "/usr/lib/libreoffice/program/soffice";
+    public static final String DEFAULT_LINUX_FLATPAK_EXEC_PATH =
+        "/app/bin/soffice";
     public static final String LINUX_EXECUTABLE = "soffice";
 
     private final StringProperty executablePath;
@@ -27,11 +30,13 @@ public class OpenOfficePreferences {
     private final ObservableList<String> externalStyles;
     private final StringProperty currentStyle;
 
-    public OpenOfficePreferences(String executablePath,
-                                 boolean useAllDatabases,
-                                 boolean syncWhenCiting,
-                                 List<String> externalStyles,
-                                 String currentStyle) {
+    public OpenOfficePreferences(
+        String executablePath,
+        boolean useAllDatabases,
+        boolean syncWhenCiting,
+        List<String> externalStyles,
+        String currentStyle
+    ) {
         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/action/EditInsert.java b/src/main/java/org/jabref/logic/openoffice/action/EditInsert.java
index 9c171553a4b..e5ba5dc03ac 100644
--- a/src/main/java/org/jabref/logic/openoffice/action/EditInsert.java
+++ b/src/main/java/org/jabref/logic/openoffice/action/EditInsert.java
@@ -1,10 +1,15 @@
 package org.jabref.logic.openoffice.action;
 
+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;
-
 import org.jabref.logic.openoffice.frontend.OOFrontend;
 import org.jabref.logic.openoffice.frontend.UpdateCitationMarkers;
 import org.jabref.logic.openoffice.style.OOBibStyle;
@@ -22,17 +27,9 @@
 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;
-
 public class EditInsert {
 
-    private EditInsert() {
-    }
+    private EditInsert() {}
 
     /**
      * In insertEntry we receive BibEntry values from the GUI.
@@ -44,7 +41,9 @@ 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,26 +52,27 @@ 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,
-                                           OOBibStyle style,
-                                           CitationType citationType,
-                                           String pageInfo)
-            throws
-            NoDocumentException,
-            NotRemoveableException,
-            WrappedTargetException,
-            PropertyVetoException,
-            CreationException,
-            IllegalTypeException {
-
-        List<String> citationKeys = OOListUtil.map(entries, EditInsert::insertEntryGetCitationKey);
+    public static void insertCitationGroup(
+        XTextDocument doc,
+        OOFrontend frontend,
+        XTextCursor cursor,
+        List<BibEntry> entries,
+        BibDatabase database,
+        OOBibStyle style,
+        CitationType citationType,
+        String pageInfo
+    )
+        throws NoDocumentException, NotRemoveableException, WrappedTargetException, PropertyVetoException, CreationException, IllegalTypeException {
+        List<String> citationKeys = OOListUtil.map(
+            entries,
+            EditInsert::insertEntryGetCitationKey
+        );
 
         final int totalEntries = entries.size();
-        List<Optional<OOText>> pageInfos = OODataModel.fakePageInfos(pageInfo, totalEntries);
+        List<Optional<OOText>> pageInfos = OODataModel.fakePageInfos(
+            pageInfo,
+            totalEntries
+        );
 
         List<CitationMarkerEntry> citations = new ArrayList<>(totalEntries);
         for (int i = 0; i < totalEntries; i++) {
@@ -87,9 +87,12 @@ public static void insertCitationGroup(XTextDocument doc,
         if (style.isNumberEntries()) {
             citeText = OOText.fromString("[-]"); // A dash only. Only refresh later.
         } else {
-            citeText = style.createCitationMarker(citations,
+            citeText =
+                style.createCitationMarker(
+                    citations,
                     citationType.inParenthesis(),
-                    NonUniqueCitationMarker.FORGIVEN);
+                    NonUniqueCitationMarker.FORGIVEN
+                );
         }
 
         if (StringUtil.isBlank(OOText.toString(citeText))) {
@@ -98,15 +101,18 @@ public static void insertCitationGroup(XTextDocument doc,
 
         try {
             UnoScreenRefresh.lockControllers(doc);
-            UpdateCitationMarkers.createAndFillCitationGroup(frontend,
-                    doc,
-                    citationKeys,
-                    pageInfos,
-                    citationType,
-                    citeText,
-                    cursor,
-                    style,
-                    true /* insertSpaceAfter */);
+            UpdateCitationMarkers.createAndFillCitationGroup(
+                frontend,
+                doc,
+                citationKeys,
+                pageInfos,
+                citationType,
+                citeText,
+                cursor,
+                style,
+                true
+                /* insertSpaceAfter */
+            );
         } finally {
             UnoScreenRefresh.unlockControllers(doc);
         }
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 66360dd62c8..5236743c619 100644
--- a/src/main/java/org/jabref/logic/openoffice/action/EditMerge.java
+++ b/src/main/java/org/jabref/logic/openoffice/action/EditMerge.java
@@ -1,11 +1,17 @@
 package org.jabref.logic.openoffice.action;
 
+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.List;
 import java.util.Objects;
 import java.util.Optional;
 import java.util.stream.Collectors;
-
 import org.jabref.logic.openoffice.frontend.OOFrontend;
 import org.jabref.logic.openoffice.frontend.UpdateCitationMarkers;
 import org.jabref.logic.openoffice.style.OOBibStyle;
@@ -18,71 +24,70 @@
 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;
 
 public class EditMerge {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(EditMerge.class);
+    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, OOBibStyle style)
-            throws
-            CreationException,
-            IllegalArgumentException,
-            IllegalTypeException,
-            NoDocumentException,
-            NotRemoveableException,
-            PropertyVetoException,
-            WrappedTargetException {
-
+    public static boolean mergeCitationGroups(
+        XTextDocument doc,
+        OOFrontend frontend,
+        OOBibStyle style
+    )
+        throws CreationException, IllegalArgumentException, IllegalTypeException, NoDocumentException, NotRemoveableException, PropertyVetoException, WrappedTargetException {
         boolean madeModifications;
 
         try {
             UnoScreenRefresh.lockControllers(doc);
 
-            List<JoinableGroupData> joinableGroups = EditMerge.scan(doc, frontend);
+            List<JoinableGroupData> joinableGroups = EditMerge.scan(
+                doc,
+                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.get(0).citationType;
-                List<Optional<OOText>> pageInfos = frontend.backend.combinePageInfos(groups);
+                List<Optional<OOText>> pageInfos =
+                    frontend.backend.combinePageInfos(groups);
 
                 frontend.removeCitationGroups(groups, doc);
                 XTextCursor textCursor = joinableGroupData.groupCursor;
                 textCursor.setString(""); // Also remove the spaces between.
 
-                List<String> citationKeys = OOListUtil.map(newCitations, Citation::getCitationKey);
+                List<String> citationKeys = OOListUtil.map(
+                    newCitations,
+                    Citation::getCitationKey
+                );
 
                 /* insertSpaceAfter: no, it is already there (or could be) */
                 boolean insertSpaceAfter = false;
-                UpdateCitationMarkers.createAndFillCitationGroup(frontend,
-                        doc,
-                        citationKeys,
-                        pageInfos,
-                        citationType,
-                        OOText.fromString("tmp"),
-                        textCursor,
-                        style,
-                        insertSpaceAfter);
+                UpdateCitationMarkers.createAndFillCitationGroup(
+                    frontend,
+                    doc,
+                    citationKeys,
+                    pageInfos,
+                    citationType,
+                    OOText.fromString("tmp"),
+                    textCursor,
+                    style,
+                    insertSpaceAfter
+                );
             }
 
             madeModifications = !joinableGroups.isEmpty();
@@ -94,6 +99,7 @@ public static boolean mergeCitationGroups(XTextDocument doc, OOFrontend frontend
     }
 
     private static class JoinableGroupData {
+
         /**
          * A list of consecutive citation groups only separated by spaces.
          */
@@ -152,7 +158,11 @@ 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;
         }
@@ -178,17 +188,21 @@ private static boolean checkAddToGroup(ScanState state, CitationGroup group, XTe
             }
 
             // Sanity check: the current range should start later than the previous.
-            int textOrder = UnoTextRange.compareStarts(state.prevRange, currentRange);
+            int textOrder = UnoTextRange.compareStarts(
+                state.prevRange,
+                currentRange
+            );
             if (textOrder != -1) {
-                String msg =
-                        String.format("MergeCitationGroups:"
-                                        + " \"%s\" supposed to be followed by \"%s\","
-                                        + " but %s",
-                                state.prevRange.getString(),
-                                currentRange.getString(),
-                                (textOrder == 0
-                                        ? "they start at the same position"
-                                        : "the start of the latter precedes the start of the first"));
+                String msg = String.format(
+                    "MergeCitationGroups:" +
+                    " \"%s\" supposed to be followed by \"%s\"," +
+                    " but %s",
+                    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;
             }
@@ -202,8 +216,16 @@ private static boolean checkAddToGroup(ScanState state, CitationGroup group, XTe
         Objects.requireNonNull(state.currentGroupCursor);
 
         // assume: currentGroupCursor.getEnd() == cursorBetween.getEnd()
-        if (UnoTextRange.compareEnds(state.cursorBetween, state.currentGroupCursor) != 0) {
-            LOGGER.warn("MergeCitationGroups: cursorBetween.end != currentGroupCursor.end");
+        if (
+            UnoTextRange.compareEnds(
+                state.cursorBetween,
+                state.currentGroupCursor
+            ) !=
+            0
+        ) {
+            LOGGER.warn(
+                "MergeCitationGroups: cursorBetween.end != currentGroupCursor.end"
+            );
             throw new IllegalStateException("MergeCitationGroups failed");
         }
 
@@ -213,17 +235,25 @@ private static boolean checkAddToGroup(ScanState state, CitationGroup group, XTe
          */
         XTextRange rangeStart = currentRange.getStart();
         boolean couldExpand = true;
-        XTextCursor thisCharCursor =
-                currentRange.getText().createTextCursorByRange(state.cursorBetween.getEnd());
-
-        while (couldExpand && (UnoTextRange.compareEnds(state.cursorBetween, rangeStart) < 0)) {
+        XTextCursor thisCharCursor = currentRange
+            .getText()
+            .createTextCursorByRange(state.cursorBetween.getEnd());
+
+        while (
+            couldExpand &&
+            (UnoTextRange.compareEnds(state.cursorBetween, rangeStart) < 0)
+        ) {
             //
             // Check that we only walk through inline whitespace.
             //
             couldExpand = thisCharCursor.goRight((short) 1, true);
             String thisChar = thisCharCursor.getString();
             thisCharCursor.collapseToEnd();
-            if (thisChar.isEmpty() || "\n".equals(thisChar) || !thisChar.trim().isEmpty()) {
+            if (
+                thisChar.isEmpty() ||
+                "\n".equals(thisChar) ||
+                !thisChar.trim().isEmpty()
+            ) {
                 couldExpand = false;
                 if (!thisChar.isEmpty()) {
                     thisCharCursor.goLeft((short) 1, false);
@@ -234,8 +264,16 @@ private static boolean checkAddToGroup(ScanState state, CitationGroup group, XTe
             state.currentGroupCursor.goRight((short) 1, true);
 
             // These two should move in sync:
-            if (UnoTextRange.compareEnds(state.cursorBetween, state.currentGroupCursor) != 0) {
-                LOGGER.warn("MergeCitationGroups: cursorBetween.end != currentGroupCursor.end (during expand)");
+            if (
+                UnoTextRange.compareEnds(
+                    state.cursorBetween,
+                    state.currentGroupCursor
+                ) !=
+                0
+            ) {
+                LOGGER.warn(
+                    "MergeCitationGroups: cursorBetween.end != currentGroupCursor.end (during expand)"
+                );
                 throw new IllegalStateException("MergeCitationGroups failed");
             }
         }
@@ -246,7 +284,11 @@ 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);
@@ -260,19 +302,33 @@ private static void addToCurrentGroup(ScanState state, CitationGroup group, XTex
 
         // Set up cursorBetween to start at currentRange.getEnd()
         XTextRange rangeEnd = currentRange.getEnd();
-        state.cursorBetween = currentRange.getText().createTextCursorByRange(rangeEnd);
+        state.cursorBetween =
+            currentRange.getText().createTextCursorByRange(rangeEnd);
 
         // 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
-        state.currentGroupCursor.goRight((short) (currentRange.getString().length()), true);
-
-        if (UnoTextRange.compareEnds(state.cursorBetween, state.currentGroupCursor) != 0) {
-            LOGGER.warn("MergeCitationGroups: cursorBetween.end != currentGroupCursor.end");
+        state.currentGroupCursor.goRight(
+            (short) (currentRange.getString().length()),
+            true
+        );
+
+        if (
+            UnoTextRange.compareEnds(
+                state.cursorBetween,
+                state.currentGroupCursor
+            ) !=
+            0
+        ) {
+            LOGGER.warn(
+                "MergeCitationGroups: cursorBetween.end != currentGroupCursor.end"
+            );
             throw new IllegalStateException("MergeCitationGroups failed");
         }
 
@@ -284,13 +340,18 @@ 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 {
+    private static List<JoinableGroupData> scan(
+        XTextDocument doc,
+        OOFrontend frontend
+    ) 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;
         }
@@ -298,8 +359,9 @@ 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.
@@ -311,12 +373,18 @@ private static List<JoinableGroupData> scan(XTextDocument doc, OOFrontend fronte
              *
              * Can it start a new group?
              */
-            boolean canStartGroup = group.citationType == CitationType.AUTHORYEAR_PAR;
+            boolean canStartGroup =
+                group.citationType == CitationType.AUTHORYEAR_PAR;
 
             if (!addToGroup) {
                 // close currentGroup
                 if (state.currentGroup.size() > 1) {
-                    result.add(new JoinableGroupData(state.currentGroup, state.currentGroupCursor));
+                    result.add(
+                        new JoinableGroupData(
+                            state.currentGroup,
+                            state.currentGroupCursor
+                        )
+                    );
                 }
                 // Start a new, empty group
                 state.reset();
@@ -329,7 +397,12 @@ private static List<JoinableGroupData> scan(XTextDocument doc, OOFrontend fronte
 
         // close currentGroup
         if (state.currentGroup.size() > 1) {
-            result.add(new JoinableGroupData(state.currentGroup, state.currentGroupCursor));
+            result.add(
+                new JoinableGroupData(
+                    state.currentGroup,
+                    state.currentGroupCursor
+                )
+            );
         }
         return result;
     }
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 5f087001d02..a06c119833e 100644
--- a/src/main/java/org/jabref/logic/openoffice/action/EditSeparate.java
+++ b/src/main/java/org/jabref/logic/openoffice/action/EditSeparate.java
@@ -1,7 +1,13 @@
 package org.jabref.logic.openoffice.action;
 
+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.List;
-
 import org.jabref.logic.openoffice.frontend.OOFrontend;
 import org.jabref.logic.openoffice.frontend.UpdateCitationMarkers;
 import org.jabref.logic.openoffice.style.OOBibStyle;
@@ -14,32 +20,17 @@
 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.WrappedTargetException;
-import com.sun.star.text.XTextCursor;
-import com.sun.star.text.XTextDocument;
-import com.sun.star.text.XTextRange;
-
 public class EditSeparate {
 
-    private EditSeparate() {
-    }
-
-    public static boolean separateCitations(XTextDocument doc,
-                                            OOFrontend frontend,
-                                            List<BibDatabase> databases,
-                                            OOBibStyle style)
-            throws
-            CreationException,
-            IllegalTypeException,
-            NoDocumentException,
-            NotRemoveableException,
-            PropertyVetoException,
-            WrappedTargetException,
-            com.sun.star.lang.IllegalArgumentException {
+    private EditSeparate() {}
 
+    public static boolean separateCitations(
+        XTextDocument doc,
+        OOFrontend frontend,
+        List<BibDatabase> databases,
+        OOBibStyle style
+    )
+        throws CreationException, IllegalTypeException, NoDocumentException, NotRemoveableException, PropertyVetoException, WrappedTargetException, com.sun.star.lang.IllegalArgumentException {
         boolean madeModifications = false;
 
         // To reduce surprises in JabRef52 mode, impose localOrder to
@@ -47,18 +38,23 @@ public static boolean separateCitations(XTextDocument doc,
         // style changed since refresh this is the last on the screen
         // as well.
         frontend.citationGroups.lookupCitations(databases);
-        frontend.citationGroups.imposeLocalOrder(OOProcess.comparatorForMulticite(style));
+        frontend.citationGroups.imposeLocalOrder(
+            OOProcess.comparatorForMulticite(style)
+        );
 
-        List<CitationGroup> groups = frontend.citationGroups.getCitationGroupsUnordered();
+        List<CitationGroup> groups =
+            frontend.citationGroups.getCitationGroupsUnordered();
 
         try {
             UnoScreenRefresh.lockControllers(doc);
 
             for (CitationGroup group : groups) {
                 XTextRange range1 = frontend
-                        .getMarkRange(doc, group)
-                        .orElseThrow(IllegalStateException::new);
-                XTextCursor textCursor = range1.getText().createTextCursorByRange(range1);
+                    .getMarkRange(doc, group)
+                    .orElseThrow(IllegalStateException::new);
+                XTextCursor textCursor = range1
+                    .getText()
+                    .createTextCursorByRange(range1);
 
                 List<Citation> citations = group.citationsInStorageOrder;
                 if (citations.size() <= 1) {
@@ -74,15 +70,17 @@ public static boolean separateCitations(XTextDocument doc,
                     boolean insertSpaceAfter = i != last;
                     Citation citation = citations.get(i);
 
-                    UpdateCitationMarkers.createAndFillCitationGroup(frontend,
-                            doc,
-                            List.of(citation.citationKey),
-                            List.of(citation.getPageInfo()),
-                            group.citationType,
-                            OOText.fromString(citation.citationKey),
-                            textCursor,
-                            style,
-                            insertSpaceAfter);
+                    UpdateCitationMarkers.createAndFillCitationGroup(
+                        frontend,
+                        doc,
+                        List.of(citation.citationKey),
+                        List.of(citation.getPageInfo()),
+                        group.citationType,
+                        OOText.fromString(citation.citationKey),
+                        textCursor,
+                        style,
+                        insertSpaceAfter
+                    );
 
                     textCursor.collapseToEnd();
                 }
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 4bdc11a7f71..0728e5fb4c9 100644
--- a/src/main/java/org/jabref/logic/openoffice/action/ExportCited.java
+++ b/src/main/java/org/jabref/logic/openoffice/action/ExportCited.java
@@ -1,10 +1,11 @@
 package org.jabref.logic.openoffice.action;
 
+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;
-
 import org.jabref.logic.openoffice.frontend.OOFrontend;
 import org.jabref.model.database.BibDatabase;
 import org.jabref.model.entry.BibEntry;
@@ -13,22 +14,22 @@
 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;
-
 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) {
+        GenerateDatabaseResult(
+            List<String> unresolvedKeys,
+            BibDatabase newDatabase
+        ) {
             this.unresolvedKeys = unresolvedKeys;
             this.newDatabase = newDatabase;
         }
@@ -41,13 +42,13 @@ 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();
+        CitedKeys citationKeys =
+            frontend.citationGroups.getCitedKeysUnordered();
         citationKeys.lookupInDatabases(databases);
 
         List<String> unresolvedKeys = new ArrayList<>();
@@ -61,7 +62,10 @@ public static GenerateDatabaseResult generateDatabase(XTextDocument doc, List<Bi
                 unresolvedKeys.add(citation.citationKey);
             } else {
                 BibEntry entry = citation.getLookupResult().get().entry;
-                BibDatabase loopDatabase = citation.getLookupResult().get().database;
+                BibDatabase loopDatabase = citation
+                    .getLookupResult()
+                    .get()
+                    .database;
 
                 // If entry found
                 BibEntry clonedEntry = (BibEntry) entry.clone();
@@ -71,17 +75,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);
-                            }
-                        });
+                    .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);
+                        }
+                    });
             }
         }
 
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 ccb5eef1e47..9365993dc74 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,29 @@
 package org.jabref.logic.openoffice.action;
 
-import java.util.List;
-
-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;
+import org.jabref.logic.openoffice.frontend.OOFrontend;
+import org.jabref.model.openoffice.CitationEntry;
+import org.jabref.model.openoffice.uno.NoDocumentException;
 
 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 {
+    public static void applyCitationEntries(
+        XTextDocument doc,
+        List<CitationEntry> citationEntries
+    )
+        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 f5222c47ec0..90911236186 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 com.sun.star.lang.WrappedTargetException;
+import com.sun.star.text.XTextDocument;
 import java.util.List;
-
 import org.jabref.logic.openoffice.frontend.OOFrontend;
 import org.jabref.logic.openoffice.frontend.UpdateBibliography;
 import org.jabref.logic.openoffice.frontend.UpdateCitationMarkers;
@@ -13,37 +14,34 @@
 import org.jabref.model.openoffice.uno.NoDocumentException;
 import org.jabref.model.openoffice.uno.UnoScreenRefresh;
 
-import com.sun.star.lang.WrappedTargetException;
-import com.sun.star.text.XTextDocument;
-
 /**
  * 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,
-                                               OOBibStyle style,
-                                               FunctionalTextViewCursor fcursor,
-                                               boolean doUpdateBibliography,
-                                               boolean alwaysAddCitedOnPages)
-            throws
-            CreationException,
-            NoDocumentException,
-            WrappedTargetException,
-            com.sun.star.lang.IllegalArgumentException {
-
+    private static List<String> updateDocument(
+        XTextDocument doc,
+        OOFrontend frontend,
+        List<BibDatabase> databases,
+        OOBibStyle style,
+        FunctionalTextViewCursor fcursor,
+        boolean doUpdateBibliography,
+        boolean alwaysAddCitedOnPages
+    )
+        throws CreationException, NoDocumentException, WrappedTargetException, com.sun.star.lang.IllegalArgumentException {
         final boolean useLockControllers = true;
 
         frontend.imposeGlobalOrder(doc, fcursor);
-        OOProcess.produceCitationMarkers(frontend.citationGroups, databases, style);
+        OOProcess.produceCitationMarkers(
+            frontend.citationGroups,
+            databases,
+            style
+        );
 
         try {
             if (useLockControllers) {
@@ -53,16 +51,20 @@ private static List<String> updateDocument(XTextDocument doc,
             UpdateCitationMarkers.applyNewCitationMarkers(doc, frontend, style);
 
             if (doUpdateBibliography) {
-                UpdateBibliography.rebuildBibTextSection(doc,
-                        frontend,
-                        frontend.citationGroups.getBibliography().get(),
-                        style,
-                        alwaysAddCitedOnPages);
+                UpdateBibliography.rebuildBibTextSection(
+                    doc,
+                    frontend,
+                    frontend.citationGroups.getBibliography().get(),
+                    style,
+                    alwaysAddCitedOnPages
+                );
             }
 
             return frontend.citationGroups.getUnresolvedKeys();
         } finally {
-            if (useLockControllers && UnoScreenRefresh.hasControllersLocked(doc)) {
+            if (
+                useLockControllers && UnoScreenRefresh.hasControllersLocked(doc)
+            ) {
                 UnoScreenRefresh.unlockControllers(doc);
             }
         }
@@ -91,41 +93,43 @@ public SyncOptions setAlwaysAddCitedOnPages(boolean value) {
         }
     }
 
-    public static List<String> synchronizeDocument(XTextDocument doc,
-                                                   OOFrontend frontend,
-                                                   OOBibStyle style,
-                                                   FunctionalTextViewCursor fcursor,
-                                                   SyncOptions syncOptions)
-            throws
-            CreationException,
-            NoDocumentException,
-            WrappedTargetException,
-            com.sun.star.lang.IllegalArgumentException {
-
-        return Update.updateDocument(doc,
-                frontend,
-                syncOptions.databases,
-                style,
-                fcursor,
-                syncOptions.updateBibliography,
-                syncOptions.alwaysAddCitedOnPages);
+    public static List<String> synchronizeDocument(
+        XTextDocument doc,
+        OOFrontend frontend,
+        OOBibStyle style,
+        FunctionalTextViewCursor fcursor,
+        SyncOptions syncOptions
+    )
+        throws CreationException, NoDocumentException, WrappedTargetException, com.sun.star.lang.IllegalArgumentException {
+        return Update.updateDocument(
+            doc,
+            frontend,
+            syncOptions.databases,
+            style,
+            fcursor,
+            syncOptions.updateBibliography,
+            syncOptions.alwaysAddCitedOnPages
+        );
     }
 
     /**
      * Reread document before sync
      */
-    public static List<String> resyncDocument(XTextDocument doc,
-                                              OOBibStyle style,
-                                              FunctionalTextViewCursor fcursor,
-                                              SyncOptions syncOptions)
-            throws
-            CreationException,
-            NoDocumentException,
-            WrappedTargetException,
-            com.sun.star.lang.IllegalArgumentException {
-
+    public static List<String> resyncDocument(
+        XTextDocument doc,
+        OOBibStyle style,
+        FunctionalTextViewCursor fcursor,
+        SyncOptions syncOptions
+    )
+        throws CreationException, NoDocumentException, WrappedTargetException, com.sun.star.lang.IllegalArgumentException {
         OOFrontend frontend = new OOFrontend(doc);
 
-        return Update.synchronizeDocument(doc, frontend, style, fcursor, syncOptions);
+        return Update.synchronizeDocument(
+            doc,
+            frontend,
+            style,
+            fcursor,
+            syncOptions
+        );
     }
 }
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 0769a7f9b5b..eb59a417fd9 100644
--- a/src/main/java/org/jabref/logic/openoffice/backend/Backend52.java
+++ b/src/main/java/org/jabref/logic/openoffice/backend/Backend52.java
@@ -1,5 +1,12 @@
 package org.jabref.logic.openoffice.backend;
 
+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.HashSet;
@@ -9,7 +16,6 @@
 import java.util.Optional;
 import java.util.Set;
 import java.util.stream.Collectors;
-
 import org.jabref.model.openoffice.CitationEntry;
 import org.jabref.model.openoffice.backend.NamedRange;
 import org.jabref.model.openoffice.backend.NamedRangeManager;
@@ -25,14 +31,6 @@
 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;
 
@@ -40,7 +38,10 @@
  * 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.
  */
 public class Backend52 {
-    private static final Logger LOGGER = LoggerFactory.getLogger(Backend52.class);
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(
+        Backend52.class
+    );
     public final OODataModel dataModel;
     private final NamedRangeManager citationStorageManager;
     private final Map<CitationGroupId, NamedRange> cgidToNamedRange;
@@ -58,8 +59,7 @@ public Backend52() {
      * Note: the names returned are in arbitrary order.
      */
     public List<String> getJabRefReferenceMarkNames(XTextDocument doc)
-            throws
-            NoDocumentException {
+        throws NoDocumentException {
         List<String> allNames = this.citationStorageManager.getUsedNames(doc);
         return Codec52.filterIsJabRefReferenceMarkName(allNames);
     }
@@ -69,17 +69,18 @@ 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();
+        List<String> jabrefPropertyNames = UnoUserDefinedProperty
+            .getListOfNames(doc)
+            .stream()
+            .filter(Codec52::isJabRefReferenceMarkName)
+            .toList();
         for (String pn : jabrefPropertyNames) {
             if (!citationGroupNamesSet.contains(pn)) {
                 pageInfoThrash.add(pn);
@@ -92,21 +93,27 @@ private List<String> findUnusedJabrefPropertyNames(XTextDocument doc,
      * @return Optional.empty if all is OK, message text otherwise.
      */
     public Optional<String> healthReport(XTextDocument doc)
-            throws
-            NoDocumentException {
+        throws NoDocumentException {
         List<String> pageInfoThrash =
-                this.findUnusedJabrefPropertyNames(doc, this.getJabRefReferenceMarkNames(doc));
+            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.get(citations.size() - 1).setPageInfo(pageInfo);
@@ -124,32 +131,38 @@ private static Optional<OOText> getPageInfoFromData(CitationGroup group) {
     /**
      * @param markName Reference mark name
      */
-    public CitationGroup readCitationGroupFromDocumentOrThrow(XTextDocument doc, String markName)
-            throws
-            WrappedTargetException,
-            NoDocumentException {
-
-        Codec52.ParsedMarkName parsed = Codec52.parseMarkName(markName).orElseThrow(IllegalArgumentException::new);
-
-        List<Citation> citations = parsed.citationKeys.stream()
-                                                       .map(Citation::new)
-                                                       .collect(Collectors.toList());
-
-        Optional<OOText> pageInfo = UnoUserDefinedProperty.getStringValue(doc, markName)
-                                                           .map(OOText::fromString);
+    public CitationGroup readCitationGroupFromDocumentOrThrow(
+        XTextDocument doc,
+        String markName
+    ) throws WrappedTargetException, NoDocumentException {
+        Codec52.ParsedMarkName parsed = Codec52
+            .parseMarkName(markName)
+            .orElseThrow(IllegalArgumentException::new);
+
+        List<Citation> citations = parsed.citationKeys
+            .stream()
+            .map(Citation::new)
+            .collect(Collectors.toList());
+
+        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,20 +177,15 @@ 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()) {
             throw new IllegalArgumentException();
@@ -192,15 +200,19 @@ public CitationGroup createCitationGroup(XTextDocument doc,
             Citation cit = new Citation(citationKeys.get(i));
             citations.add(cit);
 
-            Optional<OOText> pageInfo = PageInfo.normalizePageInfo(pageInfos.get(i));
+            Optional<OOText> pageInfo = PageInfo.normalizePageInfo(
+                pageInfos.get(i)
+            );
             switch (dataModel) {
                 case JabRef52:
                     if (i == last) {
                         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;
@@ -208,7 +220,9 @@ 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"
+                    );
             }
         }
 
@@ -217,9 +231,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);
 
@@ -227,33 +243,49 @@ 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:
-                Optional<OOText> pageInfo = PageInfo.normalizePageInfo(pageInfos.get(last));
+                Optional<OOText> pageInfo = PageInfo.normalizePageInfo(
+                    pageInfos.get(last)
+                );
 
                 if (pageInfo.isPresent()) {
                     String pageInfoString = OOText.toString(pageInfo.get());
-                    UnoUserDefinedProperty.setStringProperty(doc, markName, pageInfoString);
+                    UnoUserDefinedProperty.setStringProperty(
+                        doc,
+                        markName,
+                        pageInfoString
+                    );
                 } else {
                     // 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"
+                );
         }
     }
 
@@ -262,56 +294,70 @@ 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;
                 }
-                return OODataModel.fakePageInfos(singlePageInfo, totalCitations);
-
+                return OODataModel.fakePageInfos(
+                    singlePageInfo,
+                    totalCitations
+                );
             case JabRef60:
-                return joinableGroup.stream()
-                                     .flatMap(group -> (group.citationsInStorageOrder.stream()
-                                                                                     .map(Citation::getPageInfo)))
-                                     .collect(Collectors.toList());
+                return joinableGroup
+                    .stream()
+                    .flatMap(group ->
+                        (group.citationsInStorageOrder
+                                .stream()
+                                .map(Citation::getPageInfo))
+                    )
+                    .collect(Collectors.toList());
             default:
                 throw new IllegalArgumentException("unhandled dataModel here");
         }
     }
 
-    public List<Optional<OOText>> combinePageInfos(List<CitationGroup> joinableGroup) {
+    public List<Optional<OOText>> combinePageInfos(
+        List<CitationGroup> joinableGroup
+    ) {
         return combinePageInfosCommon(this.dataModel, joinableGroup);
     }
 
     private NamedRange getNamedRangeOrThrow(CitationGroup group) {
         NamedRange namedRange = this.cgidToNamedRange.get(group.groupId);
         if (namedRange == null) {
-            throw new IllegalStateException("getNamedRange: could not lookup namedRange");
+            throw new IllegalStateException(
+                "getNamedRange: could not lookup namedRange"
+            );
         }
         return namedRange;
     }
 
     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,11 +368,10 @@ 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 {
-
+    public Optional<XTextRange> getMarkRange(
+        CitationGroup group,
+        XTextDocument doc
+    ) throws NoDocumentException, WrappedTargetException {
         NamedRange namedRange = getNamedRangeOrThrow(group);
         return namedRange.getMarkRange(doc);
     }
@@ -334,10 +379,10 @@ 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,12 +390,10 @@ 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 {
-
+    public XTextCursor getFillCursorForCitationGroup(
+        CitationGroup group,
+        XTextDocument doc
+    ) throws NoDocumentException, WrappedTargetException, CreationException {
         NamedRange namedRange = getNamedRangeOrThrow(group);
         return namedRange.getFillCursor(doc);
     }
@@ -358,73 +401,94 @@ public XTextCursor getFillCursorForCitationGroup(CitationGroup group, XTextDocum
     /**
      * To be called after getFillCursorForCitationGroup
      */
-    public void cleanFillCursorForCitationGroup(CitationGroup group, XTextDocument doc)
-            throws
-            NoDocumentException,
-            WrappedTargetException {
+    public void cleanFillCursorForCitationGroup(
+        CitationGroup group,
+        XTextDocument doc
+    ) throws NoDocumentException, WrappedTargetException {
         NamedRange namedRange = getNamedRangeOrThrow(group);
         namedRange.cleanFillCursor(doc);
     }
 
-    public List<CitationEntry> getCitationEntries(XTextDocument doc, CitationGroups citationGroups)
-            throws
-            WrappedTargetException,
-            NoDocumentException {
-
+    public List<CitationEntry> getCitationEntries(
+        XTextDocument doc,
+        CitationGroups citationGroups
+    ) 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)
+                    XTextCursor cursor =
+                        this.getRawCursorForCitationGroup(group, doc)
                             .orElseThrow(IllegalStateException::new);
-                    String context = GetContext.getCursorStringWithContext(cursor, 30, 30, true);
+                    String context = GetContext.getCursorStringWithContext(
+                        cursor,
+                        30,
+                        30,
+                        true
+                    );
                     Optional<String> pageInfo = group.numberOfCitations() > 0
-                            ? (getPageInfoFromData(group)
-                            .map(e -> OOText.toString(e)))
-                            : Optional.empty();
-                    CitationEntry entry = new CitationEntry(name, context, pageInfo);
+                        ? (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 ");
+                throw new IllegalStateException(
+                    "getCitationEntries: unhandled dataModel "
+                );
         }
     }
 
     /**
      * Only applies to storage. Citation markers are not changed.
      */
-    public void applyCitationEntries(XTextDocument doc, List<CitationEntry> citationEntries)
-            throws
-            PropertyVetoException,
-            IllegalTypeException,
-            IllegalArgumentException,
-            WrappedTargetException {
-
+    public void applyCitationEntries(
+        XTextDocument doc,
+        List<CitationEntry> citationEntries
+    )
+        throws PropertyVetoException, IllegalTypeException, IllegalArgumentException, WrappedTargetException {
         switch (dataModel) {
             case JabRef52:
                 for (CitationEntry entry : citationEntries) {
-                    Optional<OOText> pageInfo = entry.getPageInfo().map(OOText::fromString);
+                    Optional<OOText> pageInfo = entry
+                        .getPageInfo()
+                        .map(OOText::fromString);
                     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 ");
+                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 5d567539799..989c40e730d 100644
--- a/src/main/java/org/jabref/logic/openoffice/backend/Codec52.java
+++ b/src/main/java/org/jabref/logic/openoffice/backend/Codec52.java
@@ -8,7 +8,6 @@
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;
-
 import org.jabref.model.openoffice.style.CitationType;
 
 /**
@@ -17,19 +16,20 @@
  * - pageInfo does not appear here. It is not encoded in the mark name.
  */
 class Codec52 {
+
     private static final String BIB_CITATION = "JR_cite";
     private static final Pattern CITE_PATTERN =
-            // Pattern.compile(BIB_CITATION + "(\\d*)_(\\d*)_(.*)");
-            // citationType is always "1" "2" or "3"
-            Pattern.compile(BIB_CITATION + "(\\d*)_([123])_(.*)");
+        // Pattern.compile(BIB_CITATION + "(\\d*)_(\\d*)_(.*)");
+        // 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.
      */
     public static class ParsedMarkName {
+
         /**
          * "", "0", "1" ...
          */
@@ -43,7 +43,11 @@ public static class ParsedMarkName {
          */
         public final List<String> citationKeys;
 
-        ParsedMarkName(String index, CitationType citationType, List<String> citationKeys) {
+        ParsedMarkName(
+            String index,
+            CitationType citationType,
+            List<String> citationKeys
+        ) {
             Objects.requireNonNull(index);
             Objects.requireNonNull(citationKeys);
             this.index = index;
@@ -60,7 +64,9 @@ private static CitationType citationTypeFromInt(int code) {
             case 1 -> CitationType.AUTHORYEAR_PAR;
             case 2 -> CitationType.AUTHORYEAR_INTEXT;
             case 3 -> CitationType.INVISIBLE_CIT;
-            default -> throw new IllegalArgumentException("Invalid CitationType code");
+            default -> throw new IllegalArgumentException(
+                "Invalid CitationType code"
+            );
         };
     }
 
@@ -83,17 +89,24 @@ 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);
 
         int index = 0;
         int citTypeCode = citationTypeToInt(citationType);
         String name = BIB_CITATION + '_' + citTypeCode + '_' + citationKeysPart;
         while (usedNames.contains(name)) {
-            name = BIB_CITATION + index + '_' + citTypeCode + '_' + citationKeysPart;
+            name =
+                BIB_CITATION +
+                index +
+                '_' +
+                citTypeCode +
+                '_' +
+                citationKeysPart;
             index++;
         }
         return name;
@@ -114,7 +127,9 @@ public static Optional<ParsedMarkName> parseMarkName(String refMarkName) {
         String index = citeMatcher.group(1);
         int citTypeCode = Integer.parseInt(citeMatcher.group(2));
         CitationType citationType = citationTypeFromInt(citTypeCode);
-        return Optional.of(new Codec52.ParsedMarkName(index, citationType, keys));
+        return Optional.of(
+            new Codec52.ParsedMarkName(index, citationType, keys)
+        );
     }
 
     /**
@@ -129,9 +144,12 @@ public static boolean isJabRefReferenceMarkName(String name) {
      *
      * @param names The list to be filtered.
      */
-    public static List<String> filterIsJabRefReferenceMarkName(List<String> names) {
-        return names.stream()
-                     .filter(Codec52::isJabRefReferenceMarkName)
-                     .collect(Collectors.toList());
+    public static List<String> filterIsJabRefReferenceMarkName(
+        List<String> names
+    ) {
+        return names
+            .stream()
+            .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 cad4ca6a640..9c31796e1fc 100644
--- a/src/main/java/org/jabref/logic/openoffice/backend/GetContext.java
+++ b/src/main/java/org/jabref/logic/openoffice/backend/GetContext.java
@@ -9,10 +9,11 @@
  */
 public class GetContext {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(GetContext.class);
+    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,11 +24,12 @@ 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();
 
         // extend cursor range left
@@ -37,8 +39,10 @@ public static String getCursorStringWithContext(XTextCursor cursor,
                 cursor.goLeft((short) 1, true);
                 // If we are close to charBefore and see a space, then cut here. Might avoid cutting
                 // a word in half.
-                if ((i >= (charBefore - flex))
-                        && Character.isWhitespace(cursor.getString().charAt(0))) {
+                if (
+                    (i >= (charBefore - flex)) &&
+                    Character.isWhitespace(cursor.getString().charAt(0))
+                ) {
                     break;
                 }
             } catch (IndexOutOfBoundsException ex) {
@@ -55,7 +59,11 @@ public static String getCursorStringWithContext(XTextCursor cursor,
                 cursor.goRight((short) 1, true);
                 if (i >= ((charAfter + lengthWithBefore) - flex)) {
                     String strNow = cursor.getString();
-                    if (Character.isWhitespace(strNow.charAt(strNow.length() - 1))) {
+                    if (
+                        Character.isWhitespace(
+                            strNow.charAt(strNow.length() - 1)
+                        )
+                    ) {
                         break;
                     }
                 }
@@ -66,9 +74,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 37ad5499da5..2eba2e25707 100644
--- a/src/main/java/org/jabref/logic/openoffice/backend/NamedRangeManagerReferenceMark.java
+++ b/src/main/java/org/jabref/logic/openoffice/backend/NamedRangeManagerReferenceMark.java
@@ -1,46 +1,48 @@
 package org.jabref.logic.openoffice.backend;
 
+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;
-
 import org.jabref.model.openoffice.backend.NamedRange;
 import org.jabref.model.openoffice.backend.NamedRangeManager;
 import org.jabref.model.openoffice.uno.CreationException;
 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;
-
 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 {
+        throws NoDocumentException {
         return UnoReferenceMark.getListOfNames(doc);
     }
 
     @Override
-    public Optional<NamedRange> getNamedRangeFromDocument(XTextDocument doc, String refMarkName)
-            throws
-            NoDocumentException,
-            WrappedTargetException {
+    public Optional<NamedRange> getNamedRangeFromDocument(
+        XTextDocument doc,
+        String refMarkName
+    ) throws NoDocumentException, WrappedTargetException {
         return NamedRangeReferenceMark
-                .getFromDocument(doc, refMarkName)
-                .map(x -> x);
+            .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 377dd060805..5d4bbce3d84 100644
--- a/src/main/java/org/jabref/logic/openoffice/backend/NamedRangeReferenceMark.java
+++ b/src/main/java/org/jabref/logic/openoffice/backend/NamedRangeReferenceMark.java
@@ -1,19 +1,17 @@
 package org.jabref.logic.openoffice.backend;
 
-import java.util.Optional;
-
-import org.jabref.model.openoffice.backend.NamedRange;
-import org.jabref.model.openoffice.uno.CreationException;
-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 java.util.Optional;
+import org.jabref.model.openoffice.backend.NamedRange;
+import org.jabref.model.openoffice.uno.CreationException;
+import org.jabref.model.openoffice.uno.NoDocumentException;
+import org.jabref.model.openoffice.uno.UnoCursor;
+import org.jabref.model.openoffice.uno.UnoReferenceMark;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -22,16 +20,17 @@ 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);
+    private static final Logger LOGGER = LoggerFactory.getLogger(
+        NamedRangeReferenceMark.class
+    );
 
     /**
      * reference mark name
@@ -57,7 +56,10 @@ String getId() {
      * @param numSpaces Number of spaces to insert.
      * @return a new cursor, covering the just-inserted spaces.
      */
-    private static XTextCursor safeInsertSpacesBetweenReferenceMarks(XTextRange position, int numSpaces) {
+    private 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());
@@ -73,36 +75,41 @@ private static XTextCursor safeInsertSpacesBetweenReferenceMarks(XTextRange posi
         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();
 
-        XTextCursor cursor = safeInsertSpacesBetweenReferenceMarks(position.getEnd(), 2);
+        XTextCursor cursor = safeInsertSpacesBetweenReferenceMarks(
+            position.getEnd(),
+            2
+        );
 
         // cursors before the first and after the last space
-        XTextCursor cursorBefore = cursor.getText().createTextCursorByRange(cursor.getStart());
-        XTextCursor cursorAfter = cursor.getText().createTextCursorByRange(cursor.getEnd());
+        XTextCursor cursorBefore = cursor
+            .getText()
+            .createTextCursorByRange(cursor.getStart());
+        XTextCursor cursorAfter = cursor
+            .getText()
+            .createTextCursorByRange(cursor.getEnd());
 
         cursor.collapseToStart();
         cursor.goRight((short) 1, false);
         // now we are between two spaces
 
         final String left = NamedRangeReferenceMark.REFERENCE_MARK_LEFT_BRACKET;
-        final String right = NamedRangeReferenceMark.REFERENCE_MARK_RIGHT_BRACKET;
-        String bracketedContent = withoutBrackets
-                ? ""
-                : left + right;
+        final String right =
+            NamedRangeReferenceMark.REFERENCE_MARK_RIGHT_BRACKET;
+        String bracketedContent = withoutBrackets ? "" : left + right;
 
         cursor.getText().insertString(cursor, bracketedContent, true);
 
-        UnoReferenceMark.create(doc, refMarkName, cursor, true /* absorb */);
+        UnoReferenceMark.create(doc, refMarkName, cursor, true/* absorb */);
 
         // eat the first inserted space
         cursorBefore.goRight((short) 1, true);
@@ -114,27 +121,33 @@ private static void createReprInDocument(XTextDocument doc,
         }
     }
 
-    static NamedRangeReferenceMark create(XTextDocument doc,
-                                          String refMarkName,
-                                          XTextCursor position,
-                                          boolean insertSpaceAfter,
-                                          boolean withoutBrackets)
-            throws
-            CreationException {
-
-        createReprInDocument(doc, refMarkName, position, insertSpaceAfter, withoutBrackets);
+    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);
     }
 
     /**
      * @return Optional.empty if there is no corresponding range.
      */
-    static Optional<NamedRangeReferenceMark> getFromDocument(XTextDocument doc, String refMarkName)
-            throws
-            NoDocumentException,
-            WrappedTargetException {
-        return UnoReferenceMark.getAnchor(doc, refMarkName)
-                                .map(e -> new NamedRangeReferenceMark(refMarkName));
+    static Optional<NamedRangeReferenceMark> getFromDocument(
+        XTextDocument doc,
+        String refMarkName
+    ) throws NoDocumentException, WrappedTargetException {
+        return UnoReferenceMark
+            .getAnchor(doc, refMarkName)
+            .map(e -> new NamedRangeReferenceMark(refMarkName));
     }
 
     /**
@@ -144,9 +157,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());
     }
 
@@ -160,9 +171,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);
     }
@@ -174,19 +183,19 @@ public Optional<XTextRange> getMarkRange(XTextDocument doc)
      */
     @Override
     public Optional<XTextCursor> getRawCursor(XTextDocument doc)
-            throws
-            NoDocumentException,
-            WrappedTargetException {
-
+        throws NoDocumentException, WrappedTargetException {
         String name = this.getRangeName();
 
-        Optional<XTextContent> markAsTextContent = UnoReferenceMark.getAsTextContent(doc, name);
+        Optional<XTextContent> markAsTextContent =
+            UnoReferenceMark.getAsTextContent(doc, name);
 
         if (markAsTextContent.isEmpty()) {
             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();
@@ -199,11 +208,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();
 
         final boolean debugThisFun = false;
@@ -211,16 +216,27 @@ public XTextCursor getFillCursor(XTextDocument doc)
         XTextCursor full = null;
         String fullText = null;
         for (int i = 1; i <= 2; i++) {
-            Optional<XTextContent> markAsTextContent = UnoReferenceMark.getAsTextContent(doc, name);
+            Optional<XTextContent> markAsTextContent =
+                UnoReferenceMark.getAsTextContent(doc, name);
 
             if (markAsTextContent.isEmpty()) {
-                String msg = String.format("getFillCursor: markAsTextContent(%s).isEmpty (attempt %d)", name, i);
+                String msg = String.format(
+                    "getFillCursor: markAsTextContent(%s).isEmpty (attempt %d)",
+                    name,
+                    i
+                );
                 throw new IllegalStateException(msg);
             }
 
-            full = UnoCursor.getTextCursorOfTextContentAnchor(markAsTextContent.get()).orElse(null);
+            full =
+                UnoCursor
+                    .getTextCursorOfTextContentAnchor(markAsTextContent.get())
+                    .orElse(null);
             if (full == null) {
-                String msg = String.format("getFillCursor: full == null (attempt %d)", i);
+                String msg = String.format(
+                    "getFillCursor: full == null (attempt %d)",
+                    i
+                );
                 throw new IllegalStateException(msg);
             }
 
@@ -229,12 +245,18 @@ 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)
                 if (i == 2) {
-                    String msg = String.format("getFillCursor: (fullText.length() < 2) (attempt %d)", i);
+                    String msg = String.format(
+                        "getFillCursor: (fullText.length() < 2) (attempt %d)",
+                        i
+                    );
                     throw new IllegalStateException(msg);
                 }
                 // too short, recreate
@@ -245,20 +267,32 @@ public XTextCursor getFillCursor(XTextDocument doc)
 
                 final boolean insertSpaceAfter = false;
                 final boolean withoutBrackets = false;
-                createReprInDocument(doc, name, full, insertSpaceAfter, withoutBrackets);
+                createReprInDocument(
+                    doc,
+                    name,
+                    full,
+                    insertSpaceAfter,
+                    withoutBrackets
+                );
             }
         }
 
         if (full == null) {
-            throw new IllegalStateException("getFillCursorFor: full == null (after loop)");
+            throw new IllegalStateException(
+                "getFillCursorFor: full == null (after loop)"
+            );
         }
         if (fullText == null) {
-            throw new IllegalStateException("getFillCursor: fullText == null (after loop)");
+            throw new IllegalStateException(
+                "getFillCursor: fullText == null (after loop)"
+            );
         }
 
         fullText = full.getString();
         if (fullText.length() < 2) {
-            throw new IllegalStateException("getFillCursor: fullText.length() < 2 (after loop)'%n");
+            throw new IllegalStateException(
+                "getFillCursor: fullText.length() < 2 (after loop)'%n"
+            );
         }
         XTextCursor beta = full.getText().createTextCursorByRange(full);
         beta.collapseToStart();
@@ -267,12 +301,16 @@ public XTextCursor getFillCursor(XTextDocument doc)
         LOGGER.debug("getFillCursor: beta(1) covers '{}'", beta.getString());
 
         final String left = NamedRangeReferenceMark.REFERENCE_MARK_LEFT_BRACKET;
-        final String right = NamedRangeReferenceMark.REFERENCE_MARK_RIGHT_BRACKET;
+        final String right =
+            NamedRangeReferenceMark.REFERENCE_MARK_RIGHT_BRACKET;
         final short rightLength = (short) right.length();
         if (fullText.startsWith(left) && fullText.endsWith(right)) {
             beta.setString("");
         } else {
-            LOGGER.debug("getFillCursor: recreating brackets for '{}'", fullText);
+            LOGGER.debug(
+                "getFillCursor: recreating brackets for '{}'",
+                fullText
+            );
 
             // we have at least two characters inside
             XTextCursor alpha = full.getText().createTextCursorByRange(full);
@@ -287,41 +325,64 @@ public XTextCursor getFillCursor(XTextDocument doc)
             String paddingy = "y";
             String paddingz = "z";
             beta.setString(paddingx + left + paddingy + right + paddingz);
-            LOGGER.debug("getFillCursor: beta(2) covers '{}'", beta.getString());
+            LOGGER.debug(
+                "getFillCursor: beta(2) covers '{}'",
+                beta.getString()
+            );
 
             // move beta to before the right bracket
             beta.collapseToEnd();
             beta.goLeft((short) (rightLength + 1), false);
             // remove middle padding
             beta.goLeft((short) 1, true);
-            LOGGER.debug("getFillCursor: beta(3) covers '{}'", beta.getString());
+            LOGGER.debug(
+                "getFillCursor: beta(3) covers '{}'",
+                beta.getString()
+            );
 
             // only drop paddingy later: beta.setString("");
 
             // drop the initial character and paddingx
             alpha.collapseToStart();
             alpha.goRight((short) (1 + 1), true);
-            LOGGER.debug("getFillCursor: alpha(4) covers '{}'", alpha.getString());
+            LOGGER.debug(
+                "getFillCursor: alpha(4) covers '{}'",
+                alpha.getString()
+            );
 
             alpha.setString("");
             // drop the last character and paddingz
             omega.collapseToEnd();
             omega.goLeft((short) (1 + 1), true);
-            LOGGER.debug("getFillCursor: omega(5) covers '{}'", omega.getString());
+            LOGGER.debug(
+                "getFillCursor: omega(5) covers '{}'",
+                omega.getString()
+            );
 
             omega.setString("");
 
             // drop paddingy now
-            LOGGER.debug("getFillCursor: beta(6) covers '{}'", beta.getString());
+            LOGGER.debug(
+                "getFillCursor: beta(6) covers '{}'",
+                beta.getString()
+            );
 
             beta.setString("");
             // should be OK now.
             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
+                );
             }
         }
 
@@ -345,9 +406,12 @@ public static void checkFillCursor(XTextCursor cursor) {
         if (leftLength > 0) {
             alpha.goLeft(leftLength, true);
             if (!left.equals(alpha.getString())) {
-                String msg = String.format("checkFillCursor:"
-                                + " ('%s') is not prefixed with REFERENCE_MARK_LEFT_BRACKET, has '%s'",
-                        cursor.getString(), alpha.getString());
+                String msg = String.format(
+                    "checkFillCursor:" +
+                    " ('%s') is not prefixed with REFERENCE_MARK_LEFT_BRACKET, has '%s'",
+                    cursor.getString(),
+                    alpha.getString()
+                );
                 throw new IllegalStateException(msg);
             }
         }
@@ -357,9 +421,12 @@ public static void checkFillCursor(XTextCursor cursor) {
         if (rightLength > 0) {
             omega.goRight(rightLength, true);
             if (!right.equals(omega.getString())) {
-                String msg = String.format("checkFillCursor:"
-                                + " ('%s') is not followed by REFERENCE_MARK_RIGHT_BRACKET, has '%s'",
-                        cursor.getString(), omega.getString());
+                String msg = String.format(
+                    "checkFillCursor:" +
+                    " ('%s') is not followed by REFERENCE_MARK_RIGHT_BRACKET, has '%s'",
+                    cursor.getString(),
+                    omega.getString()
+                );
                 throw new IllegalStateException(msg);
             }
         }
@@ -372,10 +439,7 @@ 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;
@@ -385,18 +449,25 @@ public void cleanFillCursor(XTextDocument doc)
 
         String name = this.getRangeName();
 
-        XTextCursor full = this.getRawCursor(doc).orElseThrow(IllegalStateException::new);
+        XTextCursor full =
+            this.getRawCursor(doc).orElseThrow(IllegalStateException::new);
         final String fullText = full.getString();
 
         final String left = REFERENCE_MARK_LEFT_BRACKET;
         if (!fullText.startsWith(left)) {
-            String msg = String.format("cleanFillCursor: (%s) does not start with REFERENCE_MARK_LEFT_BRACKET", name);
+            String msg = String.format(
+                "cleanFillCursor: (%s) does not start with REFERENCE_MARK_LEFT_BRACKET",
+                name
+            );
             throw new IllegalStateException(msg);
         }
 
         final String right = REFERENCE_MARK_RIGHT_BRACKET;
         if (!fullText.endsWith(right)) {
-            String msg = String.format("cleanFillCursor: (%s) does not end with REFERENCE_MARK_RIGHT_BRACKET", name);
+            String msg = String.format(
+                "cleanFillCursor: (%s) does not end with REFERENCE_MARK_RIGHT_BRACKET",
+                name
+            );
             throw new IllegalStateException(msg);
         }
 
@@ -409,13 +480,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 7858e9230ad..9271cf099da 100644
--- a/src/main/java/org/jabref/logic/openoffice/frontend/OOFrontend.java
+++ b/src/main/java/org/jabref/logic/openoffice/frontend/OOFrontend.java
@@ -1,5 +1,12 @@
 package org.jabref.logic.openoffice.frontend;
 
+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;
@@ -7,7 +14,6 @@
 import java.util.Objects;
 import java.util.Optional;
 import java.util.stream.Collectors;
-
 import org.jabref.logic.JabRefException;
 import org.jabref.logic.l10n.Localization;
 import org.jabref.logic.openoffice.backend.Backend52;
@@ -33,32 +39,26 @@
 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;
-
 public class OOFrontend {
 
     public final Backend52 backend;
     public final CitationGroups citationGroups;
 
     public OOFrontend(XTextDocument doc)
-            throws
-            NoDocumentException,
-            WrappedTargetException {
-
+        throws NoDocumentException, WrappedTargetException {
         // TODO: dataModel should come from looking at the document and preferences.
         this.backend = new Backend52();
 
         // Get the citationGroupNames
-        List<String> citationGroupNames = this.backend.getJabRefReferenceMarkNames(doc);
+        List<String> citationGroupNames =
+            this.backend.getJabRefReferenceMarkNames(doc);
 
         Map<CitationGroupId, CitationGroup> citationGroups =
-                readCitationGroupsFromDocument(this.backend, doc, citationGroupNames);
+            readCitationGroupsFromDocument(
+                this.backend,
+                doc,
+                citationGroupNames
+            );
         this.citationGroups = new CitationGroups(citationGroups);
     }
 
@@ -67,22 +67,24 @@ public OODataModel getDataModel() {
     }
 
     public Optional<String> healthReport(XTextDocument doc)
-            throws
-            NoDocumentException {
+        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) {
-            CitationGroup group = backend.readCitationGroupFromDocumentOrThrow(doc, name);
+            CitationGroup group = backend.readCitationGroupFromDocumentOrThrow(
+                doc,
+                name
+            );
             citationGroups.put(group.groupId, group);
         }
         return citationGroups;
@@ -99,16 +101,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)
+            XTextRange range =
+                this.getMarkRange(doc, group)
                     .orElseThrow(IllegalStateException::new);
             sortables.add(new RangeSortEntry<>(range, 0, group));
         }
@@ -132,17 +132,19 @@ private List<RangeSortable<CitationGroup>> createVisualSortInput(XTextDocument d
 
         // Sort within partitions
         RangeSort.RangePartitions<RangeSortEntry<CitationGroup>> partitions =
-                RangeSort.partitionAndSortRanges(sortables);
+            RangeSort.partitionAndSortRanges(sortables);
 
         // build final list
         List<RangeSortEntry<CitationGroup>> result = new ArrayList<>();
-        for (List<RangeSortEntry<CitationGroup>> partition : partitions.getPartitions()) {
+        for (List<
+            RangeSortEntry<CitationGroup>
+        > partition : partitions.getPartitions()) {
             int indexInPartition = 0;
             for (RangeSortEntry<CitationGroup> sortable : partition) {
                 sortable.setIndexInPosition(indexInPartition++);
                 if (mapFootnotesToFootnoteMarks) {
                     Optional<XTextRange> footnoteMarkRange =
-                            UnoTextRange.getFootnoteMarkRange(sortable.getRange());
+                        UnoTextRange.getFootnoteMarkRange(sortable.getRange());
                     // Adjust range if we are inside a footnote:
                     footnoteMarkRange.ifPresent(sortable::setRange);
                 }
@@ -156,20 +158,26 @@ 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 {
-
-        List<RangeSortable<CitationGroup>> sortables = createVisualSortInput(doc, mapFootnotesToFootnoteMarks);
-
-        List<RangeSortable<CitationGroup>> sorted = RangeSortVisual.visualSort(sortables, doc, fcursor);
-
-        return sorted.stream()
-                      .map(RangeSortable::getContent)
-                      .collect(Collectors.toList());
+    private List<CitationGroup> getVisuallySortedCitationGroups(
+        XTextDocument doc,
+        boolean mapFootnotesToFootnoteMarks,
+        FunctionalTextViewCursor fcursor
+    ) throws WrappedTargetException, NoDocumentException {
+        List<RangeSortable<CitationGroup>> sortables = createVisualSortInput(
+            doc,
+            mapFootnotesToFootnoteMarks
+        );
+
+        List<RangeSortable<CitationGroup>> sorted = RangeSortVisual.visualSort(
+            sortables,
+            doc,
+            fcursor
+        );
+
+        return sorted
+            .stream()
+            .map(RangeSortable::getContent)
+            .collect(Collectors.toList());
     }
 
     /**
@@ -177,17 +185,21 @@ 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 =
-                createVisualSortInput(doc, mapFootnotesToFootnoteMarks);
-
-        return sortables.stream().map(RangeSortable::getContent).collect(Collectors.toList());
+        List<RangeSortable<CitationGroup>> sortables = createVisualSortInput(
+            doc,
+            mapFootnotesToFootnoteMarks
+        );
+
+        return sortables
+            .stream()
+            .map(RangeSortable::getContent)
+            .collect(Collectors.toList());
     }
 
     /**
@@ -200,30 +212,29 @@ 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");
+            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,21 +244,16 @@ 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 {
-
+    public void removeCitationGroups(
+        List<CitationGroup> citationGroups,
+        XTextDocument doc
+    )
+        throws WrappedTargetException, NoDocumentException, NotRemoveableException {
         for (CitationGroup group : citationGroups) {
             removeCitationGroup(group, doc);
         }
@@ -258,82 +264,95 @@ 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 {
+    public Optional<XTextRange> getMarkRange(
+        XTextDocument doc,
+        CitationGroup group
+    ) throws NoDocumentException, WrappedTargetException {
         return backend.getMarkRange(group, doc);
     }
 
-    public XTextCursor getFillCursorForCitationGroup(XTextDocument doc, CitationGroup group)
-            throws
-            NoDocumentException,
-            WrappedTargetException,
-            CreationException {
+    public XTextCursor getFillCursorForCitationGroup(
+        XTextDocument doc,
+        CitationGroup group
+    ) throws NoDocumentException, WrappedTargetException, CreationException {
         return backend.getFillCursorForCitationGroup(group, doc);
     }
 
     /**
      * Remove brackets added by getFillCursorForCitationGroup.
      */
-    public void cleanFillCursorForCitationGroup(XTextDocument doc, CitationGroup group)
-            throws
-            NoDocumentException,
-            WrappedTargetException {
-
+    public void cleanFillCursorForCitationGroup(
+        XTextDocument doc,
+        CitationGroup group
+    ) throws NoDocumentException, WrappedTargetException {
         backend.cleanFillCursorForCitationGroup(group, doc);
     }
 
     /**
      * @return A RangeForOverlapCheck for each citation group. result.size() == nRefMarks
      */
-    public List<RangeForOverlapCheck<CitationGroupId>> citationRanges(XTextDocument doc)
-            throws
-            NoDocumentException,
-            WrappedTargetException {
-
-        List<RangeForOverlapCheck<CitationGroupId>> result =
-                new ArrayList<>(citationGroups.numberOfCitationGroups());
+    public List<RangeForOverlapCheck<CitationGroupId>> citationRanges(
+        XTextDocument doc
+    ) 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,
+            result.add(
+                new RangeForOverlapCheck<>(
+                    range,
                     group.groupId,
                     RangeForOverlapCheck.REFERENCE_MARK_KIND,
-                    description));
+                    description
+                )
+            );
         }
         return result;
     }
 
-    public List<RangeForOverlapCheck<CitationGroupId>> bibliographyRanges(XTextDocument doc)
-            throws
-            NoDocumentException,
-            WrappedTargetException {
-
+    public List<RangeForOverlapCheck<CitationGroupId>> bibliographyRanges(
+        XTextDocument doc
+    ) throws NoDocumentException, WrappedTargetException {
         List<RangeForOverlapCheck<CitationGroupId>> result = new ArrayList<>();
 
-        Optional<XTextRange> range = UpdateBibliography.getBibliographyRange(doc);
+        Optional<XTextRange> range = UpdateBibliography.getBibliographyRange(
+            doc
+        );
         if (range.isPresent()) {
             String description = "bibliography";
-            result.add(new RangeForOverlapCheck<>(range.get(),
+            result.add(
+                new RangeForOverlapCheck<>(
+                    range.get(),
                     new CitationGroupId("bibliography"),
                     RangeForOverlapCheck.BIBLIOGRAPHY_MARK_KIND,
-                    description));
+                    description
+                )
+            );
         }
         return result;
     }
 
-    public List<RangeForOverlapCheck<CitationGroupId>> viewCursorRanges(XTextDocument doc) {
+    public List<RangeForOverlapCheck<CitationGroupId>> viewCursorRanges(
+        XTextDocument doc
+    ) {
         List<RangeForOverlapCheck<CitationGroupId>> result = new ArrayList<>();
 
         Optional<XTextRange> range = UnoCursor.getViewCursor(doc).map(e -> e);
         if (range.isPresent()) {
             String description = "cursor";
-            result.add(new RangeForOverlapCheck<>(range.get(),
+            result.add(
+                new RangeForOverlapCheck<>(
+                    range.get(),
                     new CitationGroupId("cursor"),
                     RangeForOverlapCheck.CURSOR_MARK_KIND,
-                    description));
+                    description
+                )
+            );
         }
         return result;
     }
@@ -343,55 +362,77 @@ 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.
 
         List<RangeForOverlapCheck<CitationGroupId>> result = new ArrayList<>();
-        RangeSort.RangePartitions<RangeForOverlapCheck<CitationGroupId>> partitions =
-                RangeSort.partitionRanges(citationRanges);
+        RangeSort.RangePartitions<
+            RangeForOverlapCheck<CitationGroupId>
+        > partitions = RangeSort.partitionRanges(citationRanges);
 
         // 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.
-        for (List<RangeForOverlapCheck<CitationGroupId>> partition : partitions.getPartitions()) {
+        for (List<
+            RangeForOverlapCheck<CitationGroupId>
+        > partition : partitions.getPartitions()) {
             if (partition.isEmpty()) {
                 continue;
             }
-            RangeForOverlapCheck<CitationGroupId> citationRange = partition.get(0);
+            RangeForOverlapCheck<CitationGroupId> citationRange = partition.get(
+                0
+            );
 
-            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(),
+            result.add(
+                new RangeForOverlapCheck<>(
+                    footnoteMarkRange.get(),
                     citationRange.idWithinKind,
                     RangeForOverlapCheck.FOOTNOTE_MARK_KIND,
-                    "FootnoteMark for " + citationRange.format()));
+                    "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 -> String.format("'%s'", v.format()))
-                                                                     .collect(Collectors.joining(", "));
+        for (RangeOverlap<
+            RangeForOverlapCheck<CitationGroupId>
+        > overlap : overlaps) {
+            String listOfRanges = overlap.valuesForOverlappingRanges
+                .stream()
+                .map(v -> String.format("'%s'", v.format()))
+                .collect(Collectors.joining(", "));
             msg.append(
-                    switch (overlap.kind) {
-                        case EQUAL_RANGE -> Localization.lang("Found identical ranges");
-                        case OVERLAP -> Localization.lang("Found overlapping ranges");
-                        case TOUCH -> Localization.lang("Found touching ranges");
-                    });
+                switch (overlap.kind) {
+                    case EQUAL_RANGE -> Localization.lang(
+                        "Found identical ranges"
+                    );
+                    case OVERLAP -> Localization.lang(
+                        "Found overlapping ranges"
+                    );
+                    case TOUCH -> Localization.lang("Found touching ranges");
+                }
+            );
             msg.append(": ");
             msg.append(listOfRanges);
             msg.append("\n");
@@ -406,15 +447,13 @@ 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 {
-
-        List<RangeForOverlapCheck<CitationGroupId>> citationRanges = citationRanges(doc);
+    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<>();
 
         // ranges.addAll(userRanges);
@@ -423,31 +462,36 @@ 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 {
-
-        List<RangeForOverlapCheck<CitationGroupId>> citationRanges = citationRanges(doc);
+    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<>();
         ranges.addAll(userRanges);
         ranges.addAll(bibliographyRanges(doc));
@@ -455,13 +499,22 @@ 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 +535,33 @@ 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 {
+    public void applyCitationEntries(
+        XTextDocument doc,
+        List<CitationEntry> citationEntries
+    )
+        throws PropertyVetoException, IllegalTypeException, IllegalArgumentException, WrappedTargetException {
         this.backend.applyCitationEntries(doc, citationEntries);
     }
 
-    public void imposeGlobalOrder(XTextDocument doc, FunctionalTextViewCursor fcursor)
-            throws
-            WrappedTargetException,
-            NoDocumentException {
-
+    public void imposeGlobalOrder(
+        XTextDocument doc,
+        FunctionalTextViewCursor fcursor
+    ) throws WrappedTargetException, NoDocumentException {
         boolean mapFootnotesToFootnoteMarks = true;
         List<CitationGroup> sortedCitationGroups =
-                getVisuallySortedCitationGroups(doc, mapFootnotesToFootnoteMarks, fcursor);
-        List<CitationGroupId> sortedCitationGroupIds = OOListUtil.map(sortedCitationGroups, group -> group.groupId);
+            getVisuallySortedCitationGroups(
+                doc,
+                mapFootnotesToFootnoteMarks,
+                fcursor
+            );
+        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 914195bd243..10857ced851 100644
--- a/src/main/java/org/jabref/logic/openoffice/frontend/RangeForOverlapCheck.java
+++ b/src/main/java/org/jabref/logic/openoffice/frontend/RangeForOverlapCheck.java
@@ -1,8 +1,7 @@
 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.
@@ -13,10 +12,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;
 
@@ -24,7 +23,12 @@ public class RangeForOverlapCheck<T> implements RangeHolder {
     public final T idWithinKind;
     private final String description;
 
-    public RangeForOverlapCheck(XTextRange range, T idWithinKind, int kind, String description) {
+    public RangeForOverlapCheck(
+        XTextRange range,
+        T idWithinKind,
+        int kind,
+        String description
+    ) {
         this.range = range;
         this.kind = kind;
         this.idWithinKind = idWithinKind;
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 99e71e13725..05201ba1293 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,10 @@
 package org.jabref.logic.openoffice.frontend;
 
+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.Optional;
-
 import org.jabref.logic.openoffice.style.OOBibStyle;
 import org.jabref.logic.openoffice.style.OOFormatBibliography;
 import org.jabref.model.openoffice.ootext.OOText;
@@ -12,46 +15,37 @@
 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;
-
 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,
-                                             OOBibStyle style,
-                                             boolean alwaysAddCitedOnPages)
-            throws
-            WrappedTargetException,
-            CreationException,
-            NoDocumentException {
-
+    public static void rebuildBibTextSection(
+        XTextDocument doc,
+        OOFrontend frontend,
+        CitedKeys bibliography,
+        OOBibStyle style,
+        boolean alwaysAddCitedOnPages
+    ) throws WrappedTargetException, CreationException, NoDocumentException {
         clearBibTextSectionContent2(doc);
 
-        populateBibTextSection(doc,
-                frontend,
-                bibliography,
-                style,
-                alwaysAddCitedOnPages);
+        populateBibTextSection(
+            doc,
+            frontend,
+            bibliography,
+            style,
+            alwaysAddCitedOnPages
+        );
     }
 
     /**
@@ -60,9 +54,7 @@ public static void rebuildBibTextSection(XTextDocument doc,
      * Only called from `clearBibTextSectionContent2`
      */
     private static void createBibTextSection2(XTextDocument doc)
-            throws
-            CreationException {
-
+        throws CreationException {
         // Always creating at the end of the document.
         // Alternatively, we could receive a cursor.
         XTextCursor textCursor = doc.getText().createTextCursor();
@@ -76,18 +68,16 @@ 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);
         if (sectionRange.isEmpty()) {
             createBibTextSection2(doc);
         } else {
             // Clear it
-            XTextCursor cursor = doc.getText().createTextCursorByRange(sectionRange.get());
+            XTextCursor cursor = doc
+                .getText()
+                .createTextCursorByRange(sectionRange.get());
             cursor.setString("");
         }
     }
@@ -97,33 +87,38 @@ 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,
-                                               OOBibStyle style,
-                                               boolean alwaysAddCitedOnPages)
-            throws
-            CreationException,
-            IllegalArgumentException,
-            NoDocumentException,
-            WrappedTargetException {
-
-        XTextRange sectionRange = getBibliographyRange(doc).orElseThrow(IllegalStateException::new);
-
-        XTextCursor cursor = doc.getText().createTextCursorByRange(sectionRange);
+    private static void populateBibTextSection(
+        XTextDocument doc,
+        OOFrontend frontend,
+        CitedKeys bibliography,
+        OOBibStyle style,
+        boolean alwaysAddCitedOnPages
+    )
+        throws CreationException, IllegalArgumentException, NoDocumentException, WrappedTargetException {
+        XTextRange sectionRange = getBibliographyRange(doc)
+            .orElseThrow(IllegalStateException::new);
+
+        XTextCursor cursor = doc
+            .getText()
+            .createTextCursorByRange(sectionRange);
 
         // 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();
 
         // remove the initial empty paragraph from the section.
-        sectionRange = getBibliographyRange(doc).orElseThrow(IllegalStateException::new);
-        XTextCursor initialParagraph = doc.getText().createTextCursorByRange(sectionRange);
+        sectionRange =
+            getBibliographyRange(doc).orElseThrow(IllegalStateException::new);
+        XTextCursor initialParagraph = doc
+            .getText()
+            .createTextCursorByRange(sectionRange);
         initialParagraph.collapseToStart();
         initialParagraph.goRight((short) 1, true);
         initialParagraph.setString("");
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 3993afdf9a0..6a08733b096 100644
--- a/src/main/java/org/jabref/logic/openoffice/frontend/UpdateCitationMarkers.java
+++ b/src/main/java/org/jabref/logic/openoffice/frontend/UpdateCitationMarkers.java
@@ -1,9 +1,14 @@
 package org.jabref.logic.openoffice.frontend;
 
+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.List;
 import java.util.Objects;
 import java.util.Optional;
-
 import org.jabref.logic.openoffice.style.OOBibStyle;
 import org.jabref.model.openoffice.ootext.OOText;
 import org.jabref.model.openoffice.ootext.OOTextIntoOO;
@@ -12,22 +17,16 @@
 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;
 
 public class UpdateCitationMarkers {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(UpdateCitationMarkers.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(
+        UpdateCitationMarkers.class
+    );
 
-    private UpdateCitationMarkers() {
-    }
+    private UpdateCitationMarkers() {}
 
     /**
      * Visit each reference mark in referenceMarkNames, overwrite its text content.
@@ -36,12 +35,11 @@ private UpdateCitationMarkers() {
      *
      * @param style    Bibliography style to use.
      */
-    public static void applyNewCitationMarkers(XTextDocument doc, OOFrontend frontend, OOBibStyle style)
-            throws
-            NoDocumentException,
-            CreationException,
-            WrappedTargetException {
-
+    public static void applyNewCitationMarkers(
+        XTextDocument doc,
+        OOFrontend frontend,
+        OOBibStyle style
+    ) throws NoDocumentException, CreationException, WrappedTargetException {
         CitationGroups citationGroups = frontend.citationGroups;
 
         for (CitationGroup group : citationGroups.getCitationGroupsUnordered()) {
@@ -49,29 +47,38 @@ public static void applyNewCitationMarkers(XTextDocument doc, OOFrontend fronten
             Optional<OOText> marker = group.getCitationMarker();
 
             if (marker.isEmpty()) {
-                LOGGER.warn("applyNewCitationMarkers: no marker for {}",
-                        group.groupId.citationGroupIdAsString());
+                LOGGER.warn(
+                    "applyNewCitationMarkers: no marker for {}",
+                    group.groupId.citationGroupIdAsString()
+                );
                 continue;
             }
 
             if (withText && marker.isPresent()) {
-                XTextCursor cursor = frontend.getFillCursorForCitationGroup(doc, group);
-                fillCitationMarkInCursor(doc, cursor, marker.get(), withText, style);
+                XTextCursor cursor = frontend.getFillCursorForCitationGroup(
+                    doc,
+                    group
+                );
+                fillCitationMarkInCursor(
+                    doc,
+                    cursor,
+                    marker.get(),
+                    withText,
+                    style
+                );
                 frontend.cleanFillCursorForCitationGroup(doc, group);
             }
         }
     }
 
-    public static void fillCitationMarkInCursor(XTextDocument doc,
-                                                XTextCursor cursor,
-                                                OOText citationText,
-                                                boolean withText,
-                                                OOBibStyle style)
-            throws
-            WrappedTargetException,
-            CreationException,
-            IllegalArgumentException {
-
+    public static void fillCitationMarkInCursor(
+        XTextDocument doc,
+        XTextCursor cursor,
+        OOText citationText,
+        boolean withText,
+        OOBibStyle style
+    )
+        throws WrappedTargetException, CreationException, IllegalArgumentException {
         Objects.requireNonNull(cursor);
         Objects.requireNonNull(citationText);
         Objects.requireNonNull(style);
@@ -80,7 +87,8 @@ public static void fillCitationMarkInCursor(XTextDocument doc,
             OOText citationText2 = style.decorateCitationMarker(citationText);
             // inject a ZERO_WIDTH_SPACE to hold the initial character format
             final String ZERO_WIDTH_SPACE = "\u200b";
-            citationText2 = OOText.fromString(ZERO_WIDTH_SPACE + citationText2.toString());
+            citationText2 =
+                OOText.fromString(ZERO_WIDTH_SPACE + citationText2.toString());
             OOTextIntoOO.write(doc, cursor, citationText2);
         } else {
             cursor.setString("");
@@ -95,41 +103,48 @@ 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,
-                                                  OOBibStyle 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,
+        OOBibStyle 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");
+            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);
+            XTextCursor fillCursor = frontend.getFillCursorForCitationGroup(
+                doc,
+                group
+            );
+
+            UpdateCitationMarkers.fillCitationMarkInCursor(
+                doc,
+                fillCursor,
+                citationText,
+                withText,
+                style
+            );
 
             frontend.cleanFillCursorForCitationGroup(doc, group);
         }
diff --git a/src/main/java/org/jabref/logic/openoffice/style/OOBibStyle.java b/src/main/java/org/jabref/logic/openoffice/style/OOBibStyle.java
index d0e5fa605ab..b4837a125e4 100644
--- a/src/main/java/org/jabref/logic/openoffice/style/OOBibStyle.java
+++ b/src/main/java/org/jabref/logic/openoffice/style/OOBibStyle.java
@@ -18,7 +18,6 @@
 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,7 +35,6 @@
 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;
 
@@ -58,12 +56,15 @@
 public class OOBibStyle implements Comparable<OOBibStyle> {
 
     public static final String ITALIC_ET_AL = "ItalicEtAl";
-    public static final String MULTI_CITE_CHRONOLOGICAL = "MultiCiteChronological";
+    public static final String MULTI_CITE_CHRONOLOGICAL =
+        "MultiCiteChronological";
     public static final String MINIMUM_GROUPING_COUNT = "MinimumGroupingCount";
     public static final String ET_AL_STRING = "EtAlString";
     public static final String MAX_AUTHORS_FIRST = "MaxAuthorsFirst";
-    public static final String REFERENCE_HEADER_PARAGRAPH_FORMAT = "ReferenceHeaderParagraphFormat";
-    public static final String REFERENCE_PARAGRAPH_FORMAT = "ReferenceParagraphFormat";
+    public static final String REFERENCE_HEADER_PARAGRAPH_FORMAT =
+        "ReferenceHeaderParagraphFormat";
+    public static final String REFERENCE_PARAGRAPH_FORMAT =
+        "ReferenceParagraphFormat";
 
     public static final String TITLE = "Title";
     public static final String UNDEFINED_CITATION_MARKER = "??";
@@ -82,24 +83,34 @@ public class OOBibStyle implements Comparable<OOBibStyle> {
     private static final String SUPERSCRIPT_CITATIONS = "SuperscriptCitations";
     private static final String BOLD_CITATIONS = "BoldCitations";
     private static final String ITALIC_CITATIONS = "ItalicCitations";
-    private static final String CITATION_CHARACTER_FORMAT = "CitationCharacterFormat";
+    private static final String CITATION_CHARACTER_FORMAT =
+        "CitationCharacterFormat";
     private static final String FORMAT_CITATIONS = "FormatCitations";
-    private static final String GROUPED_NUMBERS_SEPARATOR = "GroupedNumbersSeparator";
+    private static final String GROUPED_NUMBERS_SEPARATOR =
+        "GroupedNumbersSeparator";
 
     // These two can do what ItalicCitations, BoldCitations,
     // SuperscriptCitations and SubscriptCitations were supposed to do,
     // as well as underline smallcaps and strikeout.
-    private static final String CITATION_GROUP_MARKUP_BEFORE = "CitationGroupMarkupBefore";
-    private static final String CITATION_GROUP_MARKUP_AFTER = "CitationGroupMarkupAfter";
-
-    private static final String AUTHORS_PART_MARKUP_BEFORE = "AuthorsPartMarkupBefore";
-    private static final String AUTHORS_PART_MARKUP_AFTER = "AuthorsPartMarkupAfter";
-
-    private static final String AUTHOR_NAMES_LIST_MARKUP_BEFORE = "AuthorNamesListMarkupBefore";
-    private static final String AUTHOR_NAMES_LIST_MARKUP_AFTER = "AuthorNamesListMarkupAfter";
-
-    private static final String AUTHOR_NAME_MARKUP_BEFORE = "AuthorNameMarkupBefore";
-    private static final String AUTHOR_NAME_MARKUP_AFTER = "AuthorNameMarkupAfter";
+    private static final String CITATION_GROUP_MARKUP_BEFORE =
+        "CitationGroupMarkupBefore";
+    private static final String CITATION_GROUP_MARKUP_AFTER =
+        "CitationGroupMarkupAfter";
+
+    private static final String AUTHORS_PART_MARKUP_BEFORE =
+        "AuthorsPartMarkupBefore";
+    private static final String AUTHORS_PART_MARKUP_AFTER =
+        "AuthorsPartMarkupAfter";
+
+    private static final String AUTHOR_NAMES_LIST_MARKUP_BEFORE =
+        "AuthorNamesListMarkupBefore";
+    private static final String AUTHOR_NAMES_LIST_MARKUP_AFTER =
+        "AuthorNamesListMarkupAfter";
+
+    private static final String AUTHOR_NAME_MARKUP_BEFORE =
+        "AuthorNameMarkupBefore";
+    private static final String AUTHOR_NAME_MARKUP_AFTER =
+        "AuthorNameMarkupAfter";
 
     private static final String PAGE_INFO_SEPARATOR = "PageInfoSeparator";
     private static final String CITATION_SEPARATOR = "CitationSeparator";
@@ -114,14 +125,17 @@ public class OOBibStyle implements Comparable<OOBibStyle> {
     private static final String SORT_ALGORITHM = "SortAlgorithm";
     private static final String OXFORD_COMMA = "OxfordComma";
     private static final String YEAR_SEPARATOR = "YearSeparator";
-    private static final String AUTHOR_LAST_SEPARATOR_IN_TEXT = "AuthorLastSeparatorInText";
+    private static final String AUTHOR_LAST_SEPARATOR_IN_TEXT =
+        "AuthorLastSeparatorInText";
     private static final String AUTHOR_LAST_SEPARATOR = "AuthorLastSeparator";
 
     private static final String AUTHOR_SEPARATOR = "AuthorSeparator";
 
     private static final Pattern QUOTED = Pattern.compile("\".*\"");
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(OOBibStyle.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(
+        OOBibStyle.class
+    );
     private final SortedSet<String> journals = new TreeSet<>();
     // Formatter to be run on fields before they are used as part of citation marker:
     private final LayoutFormatter fieldFormatter = new OOPreFormatter();
@@ -141,7 +155,11 @@ public class OOBibStyle implements Comparable<OOBibStyle> {
     private String localCopy;
     private boolean isDefaultLayoutPresent;
 
-    public OOBibStyle(Path styleFile, LayoutFormatterPreferences layoutPreferences, JournalAbbreviationRepository abbreviationRepository) throws IOException {
+    public OOBibStyle(
+        Path styleFile,
+        LayoutFormatterPreferences layoutPreferences,
+        JournalAbbreviationRepository abbreviationRepository
+    ) throws IOException {
         this.layoutPreferences = Objects.requireNonNull(layoutPreferences);
         this.abbreviationRepository = abbreviationRepository;
         this.styleFile = Objects.requireNonNull(styleFile);
@@ -151,7 +169,11 @@ public OOBibStyle(Path styleFile, LayoutFormatterPreferences layoutPreferences,
         path = styleFile.toAbsolutePath().toString();
     }
 
-    public OOBibStyle(String resourcePath, LayoutFormatterPreferences layoutPreferences, JournalAbbreviationRepository abbreviationRepository) throws IOException {
+    public OOBibStyle(
+        String resourcePath,
+        LayoutFormatterPreferences layoutPreferences,
+        JournalAbbreviationRepository abbreviationRepository
+    ) throws IOException {
         this.layoutPreferences = Objects.requireNonNull(layoutPreferences);
         this.abbreviationRepository = abbreviationRepository;
 
@@ -178,7 +200,13 @@ 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, "");
@@ -238,7 +266,12 @@ public Set<String> getJournals() {
     private void initialize(InputStream stream) throws IOException {
         Objects.requireNonNull(stream);
 
-        try (Reader reader = new InputStreamReader(stream, StandardCharsets.UTF_8)) {
+        try (
+            Reader reader = new InputStreamReader(
+                stream,
+                StandardCharsets.UTF_8
+            )
+        ) {
             readFormatFile(reader);
         }
     }
@@ -263,7 +296,8 @@ public void ensureUpToDate() throws IOException {
      */
     private void reload() throws IOException {
         if (styleFile != null) {
-            this.styleFileModificationTime = Files.getLastModifiedTime(styleFile).toMillis();
+            this.styleFileModificationTime =
+                Files.getLastModifiedTime(styleFile).toMillis();
             try (InputStream stream = Files.newInputStream(styleFile)) {
                 initialize(stream);
             }
@@ -281,7 +315,10 @@ 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;
             }
@@ -289,7 +326,6 @@ private boolean isUpToDate() {
     }
 
     private void readFormatFile(Reader input) throws IOException {
-
         // First read all the contents of the file:
         StringBuilder stringBuilder = new StringBuilder();
         int chr;
@@ -384,10 +420,18 @@ 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 && OOBibStyle.DEFAULT_MARK.equals(typeName)) {
+                if (
+                    !isDefaultLayoutPresent &&
+                    OOBibStyle.DEFAULT_MARK.equals(typeName)
+                ) {
                     isDefaultLayoutPresent = true;
                     defaultBibLayout = layout;
                 } else {
@@ -409,7 +453,10 @@ private void handlePropertiesLine(String line, Map<String, Object> map) {
         if ((index > 0) && (index <= (line.length() - 1))) {
             String propertyName = line.substring(0, index).trim();
             String value = line.substring(index + 1);
-            if ((value.trim().length() > 1) && QUOTED.matcher(value.trim()).matches()) {
+            if (
+                (value.trim().length() > 1) &&
+                QUOTED.matcher(value.trim()).matches()
+            ) {
                 value = value.trim().substring(1, value.trim().length() - 1);
             }
             Object toSet = value;
@@ -553,10 +600,12 @@ public boolean equals(Object object) {
             return true;
         }
         if (object instanceof OOBibStyle otherStyle) {
-            return Objects.equals(path, otherStyle.path)
-                    && Objects.equals(name, otherStyle.name)
-                    && Objects.equals(citProperties, otherStyle.citProperties)
-                    && Objects.equals(properties, otherStyle.properties);
+            return (
+                Objects.equals(path, otherStyle.path) &&
+                Objects.equals(name, otherStyle.name) &&
+                Objects.equals(citProperties, otherStyle.citProperties) &&
+                Objects.equals(properties, otherStyle.properties)
+            );
         }
         return false;
     }
@@ -572,7 +621,7 @@ enum BibStyleMode {
         PROPERTIES,
         CITATION,
         NAME,
-        JOURNALS
+        JOURNALS,
     }
 
     /** The String to represent authors that are not mentioned,
@@ -672,32 +721,49 @@ protected void setDefaultBibLayout(Layout layout) {
      *
      * @return The text for the citation.
      */
-    public OOText getNumCitationMarker2(List<CitationMarkerNumericEntry> entries) {
+    public OOText getNumCitationMarker2(
+        List<CitationMarkerNumericEntry> entries
+    ) {
         final int minGroupingCount = this.getMinimumGroupingCount();
-        return OOBibStyleGetNumCitationMarker.getNumCitationMarker2(this,
-                                                                    entries,
-                                                                    minGroupingCount);
+        return OOBibStyleGetNumCitationMarker.getNumCitationMarker2(
+            this,
+            entries,
+            minGroupingCount
+        );
     }
 
     /**
      * For some tests we need to override minGroupingCount.
      */
-    public OOText getNumCitationMarker2(List<CitationMarkerNumericEntry> entries,
-                                        int minGroupingCount) {
-        return OOBibStyleGetNumCitationMarker.getNumCitationMarker2(this,
-                                                                    entries,
-                                                                    minGroupingCount);
+    public OOText getNumCitationMarker2(
+        List<CitationMarkerNumericEntry> entries,
+        int minGroupingCount
+    ) {
+        return OOBibStyleGetNumCitationMarker.getNumCitationMarker2(
+            this,
+            entries,
+            minGroupingCount
+        );
     }
 
     /**
      * Format a number-based bibliography label for the given number.
      */
-    public OOText getNumCitationMarkerForBibliography(CitationMarkerNumericBibEntry entry) {
-        return OOBibStyleGetNumCitationMarker.getNumCitationMarkerForBibliography(this, entry);
+    public OOText getNumCitationMarkerForBibliography(
+        CitationMarkerNumericBibEntry entry
+    ) {
+        return OOBibStyleGetNumCitationMarker.getNumCitationMarkerForBibliography(
+            this,
+            entry
+        );
     }
 
     public OOText getNormalizedCitationMarker(CitationMarkerNormEntry entry) {
-        return OOBibStyleGetCitationMarker.getNormalizedCitationMarker(this, entry, Optional.empty());
+        return OOBibStyleGetCitationMarker.getNormalizedCitationMarker(
+            this,
+            entry,
+            Optional.empty()
+        );
     }
 
     /**
@@ -731,13 +797,17 @@ 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 OOBibStyleGetCitationMarker.createCitationMarker(this,
-                                                                citationMarkerEntries,
-                                                                inParenthesis,
-                                                                nonUniqueCitationMarkerHandling);
+    public OOText createCitationMarker(
+        List<CitationMarkerEntry> citationMarkerEntries,
+        boolean inParenthesis,
+        NonUniqueCitationMarker nonUniqueCitationMarkerHandling
+    ) {
+        return OOBibStyleGetCitationMarker.createCitationMarker(
+            this,
+            citationMarkerEntries,
+            inParenthesis,
+            nonUniqueCitationMarkerHandling
+        );
     }
 
     /**
@@ -835,7 +905,8 @@ public boolean getItalicEtAl() {
      *  non-empty field will be used.
      */
     protected OrFields getAuthorFieldNames() {
-        String authorFieldNamesString = this.getStringCitProperty(OOBibStyle.AUTHOR_FIELD);
+        String authorFieldNamesString =
+            this.getStringCitProperty(OOBibStyle.AUTHOR_FIELD);
         return FieldFactory.parseOrFields(authorFieldNamesString);
     }
 
@@ -843,7 +914,8 @@ protected OrFields getAuthorFieldNames() {
      *  @return Field containing year, with fallback fields.
      */
     protected OrFields getYearFieldNames() {
-        String yearFieldNamesString = this.getStringCitProperty(OOBibStyle.YEAR_FIELD);
+        String yearFieldNamesString =
+            this.getStringCitProperty(OOBibStyle.YEAR_FIELD);
         return FieldFactory.parseOrFields(yearFieldNamesString);
     }
 
@@ -854,8 +926,12 @@ protected String getAuthorLastSeparator() {
 
     /* As getAuthorLastSeparator, for in-text citation. */
     protected String getAuthorLastSeparatorInTextWithFallBack() {
-        String preferred = getStringCitProperty(OOBibStyle.AUTHOR_LAST_SEPARATOR_IN_TEXT);
-        String fallback = getStringCitProperty(OOBibStyle.AUTHOR_LAST_SEPARATOR);
+        String preferred = getStringCitProperty(
+            OOBibStyle.AUTHOR_LAST_SEPARATOR_IN_TEXT
+        );
+        String fallback = getStringCitProperty(
+            OOBibStyle.AUTHOR_LAST_SEPARATOR
+        );
         return Objects.requireNonNullElse(preferred, fallback);
     }
 
@@ -906,7 +982,10 @@ private String getBracketBeforeInList() {
     }
 
     public String getBracketBeforeInListWithFallBack() {
-        return Objects.requireNonNullElse(getBracketBeforeInList(), getBracketBefore());
+        return Objects.requireNonNullElse(
+            getBracketBeforeInList(),
+            getBracketBefore()
+        );
     }
 
     /** Closing parenthesis after citation marker in the bibliography */
@@ -915,7 +994,10 @@ private String getBracketAfterInList() {
     }
 
     String getBracketAfterInListWithFallBack() {
-        return Objects.requireNonNullElse(getBracketAfterInList(), getBracketAfter());
+        return Objects.requireNonNullElse(
+            getBracketAfterInList(),
+            getBracketAfter()
+        );
     }
 
     public OOText getFormattedBibliographyTitle() {
@@ -923,7 +1005,7 @@ public OOText getFormattedBibliographyTitle() {
         OOText title = style.getReferenceHeaderText();
         String parStyle = style.getReferenceHeaderParagraphFormat();
         return parStyle == null
-                ? OOFormat.paragraph(title)
-                : OOFormat.paragraph(title, parStyle);
+            ? OOFormat.paragraph(title)
+            : OOFormat.paragraph(title, parStyle);
     }
 }
diff --git a/src/main/java/org/jabref/logic/openoffice/style/OOBibStyleGetCitationMarker.java b/src/main/java/org/jabref/logic/openoffice/style/OOBibStyleGetCitationMarker.java
index 278b05d9595..44b8a33f054 100644
--- a/src/main/java/org/jabref/logic/openoffice/style/OOBibStyleGetCitationMarker.java
+++ b/src/main/java/org/jabref/logic/openoffice/style/OOBibStyleGetCitationMarker.java
@@ -5,7 +5,6 @@
 import java.util.List;
 import java.util.Objects;
 import java.util.Optional;
-
 import org.jabref.model.database.BibDatabase;
 import org.jabref.model.entry.Author;
 import org.jabref.model.entry.AuthorList;
@@ -22,8 +21,7 @@
 
 class OOBibStyleGetCitationMarker {
 
-    private OOBibStyleGetCitationMarker() {
-    }
+    private OOBibStyleGetCitationMarker() {}
 
     /**
      * Look up the nth author and return the "proper" last name for
@@ -55,9 +53,11 @@ private static String getAuthorLastName(AuthorList authorList, int number) {
     }
 
     private static String markupAuthorName(OOBibStyle style, String name) {
-        return style.getAuthorNameMarkupBefore()
-                + name
-                + style.getAuthorNameMarkupAfter();
+        return (
+            style.getAuthorNameMarkupBefore() +
+            name +
+            style.getAuthorNameMarkupAfter()
+        );
     }
 
     /**
@@ -86,11 +86,12 @@ private static String markupAuthorName(OOBibStyle 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(OOBibStyle style,
-                                           AuthorList authorList,
-                                           int maxAuthors,
-                                           String andString) {
-
+    private static String formatAuthorList(
+        OOBibStyle style,
+        AuthorList authorList,
+        int maxAuthors,
+        String andString
+    ) {
         Objects.requireNonNull(authorList);
 
         // Apparently maxAuthorsBeforeEtAl is always 1 for in-text citations.
@@ -132,20 +133,24 @@ private static String formatAuthorList(OOBibStyle style,
 
         // To reduce ambiguity, throw on unexpected values of maxAuthors
         if (maxAuthors == 0 && nAuthors != 0) {
-            throw new IllegalArgumentException("maxAuthors = 0 in formatAuthorList");
+            throw new IllegalArgumentException(
+                "maxAuthors = 0 in formatAuthorList"
+            );
         }
         if (maxAuthors < -1) {
-            throw new IllegalArgumentException("maxAuthors < -1 in formatAuthorList");
+            throw new IllegalArgumentException(
+                "maxAuthors < -1 in formatAuthorList"
+            );
         }
 
         // 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);
+            ? 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());
@@ -211,8 +216,10 @@ private static String formatAuthorList(OOBibStyle style,
      * not to split up the content.
      */
     private static class FieldAndContent {
+
         Field field;
         String content;
+
         FieldAndContent(Field field, String content) {
             this.field = field;
             this.content = content;
@@ -224,18 +231,26 @@ 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(BibEntry entry,
-                                                                       BibDatabase database,
-                                                                       OrFields fields) {
+    private static Optional<FieldAndContent> getRawCitationMarkerField(
+        BibEntry entry,
+        BibDatabase database,
+        OrFields fields
+    ) {
         Objects.requireNonNull(entry, "Entry cannot be null");
         Objects.requireNonNull(database, "database cannot be null");
 
-        for (Field field : fields.getFields() /* FieldFactory.parseOrFields(fields)*/) {
-            Optional<String> optionalContent = entry.getResolvedFieldOrAlias(field, database);
-            final boolean foundSomething = optionalContent.isPresent()
-                                            && !optionalContent.get().trim().isEmpty();
+        for (Field field : fields.getFields()/* FieldFactory.parseOrFields(fields)*/) {
+            Optional<String> optionalContent = entry.getResolvedFieldOrAlias(
+                field,
+                database
+            );
+            final boolean foundSomething =
+                optionalContent.isPresent() &&
+                !optionalContent.get().trim().isEmpty();
             if (foundSomething) {
-                return Optional.of(new FieldAndContent(field, optionalContent.get()));
+                return Optional.of(
+                    new FieldAndContent(field, optionalContent.get())
+                );
             }
         }
         return Optional.empty();
@@ -263,9 +278,11 @@ private static Optional<FieldAndContent> getRawCitationMarkerField(BibEntry entr
      *
      *
      */
-    private static String getCitationMarkerField(OOBibStyle style,
-                                                 CitationLookupResult db,
-                                                 OrFields fields) {
+    private static String getCitationMarkerField(
+        OOBibStyle style,
+        CitationLookupResult db,
+        OrFields fields
+    ) {
         Objects.requireNonNull(db);
 
         Optional<FieldAndContent> optionalFieldAndContent =
@@ -277,32 +294,44 @@ private static String getCitationMarkerField(OOBibStyle style,
         }
 
         FieldAndContent fieldAndContent = optionalFieldAndContent.get();
-        String result = style.getFieldFormatter().format(fieldAndContent.content);
+        String result = style
+            .getFieldFormatter()
+            .format(fieldAndContent.content);
 
         // If the field we found is mentioned in authorFieldNames and
         // content has a pair of braces around it, we add a pair of
         // 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;
     }
 
-    private static AuthorList getAuthorList(OOBibStyle style, CitationLookupResult db) {
+    private static AuthorList getAuthorList(
+        OOBibStyle style,
+        CitationLookupResult db
+    ) {
         // The bibtex fields providing author names, e.g. "author" or
         // "editor".
         OrFields authorFieldNames = style.getAuthorFieldNames();
 
-        String authorListAsString = getCitationMarkerField(style, db, authorFieldNames);
+        String authorListAsString = getCitationMarkerField(
+            style,
+            db,
+            authorFieldNames
+        );
         return AuthorList.parse(authorListAsString);
     }
 
     private enum AuthorYearMarkerPurpose {
         IN_PARENTHESIS,
         IN_TEXT,
-        NORMALIZED
+        NORMALIZED,
     }
 
     /**
@@ -311,17 +340,23 @@ private enum AuthorYearMarkerPurpose {
      *
      * If entry is unresolved, return 0.
      */
-    private static int calculateNAuthorsToEmit(OOBibStyle style, CitationMarkerEntry entry) {
+    private static int calculateNAuthorsToEmit(
+        OOBibStyle style,
+        CitationMarkerEntry entry
+    ) {
         if (entry.getLookupResult().isEmpty()) {
             // unresolved
             return 0;
         }
 
         int maxAuthors = entry.getIsFirstAppearanceOfSource()
-                          ? style.getMaxAuthorsFirst()
-                          : style.getMaxAuthors();
+            ? style.getMaxAuthorsFirst()
+            : style.getMaxAuthors();
 
-        AuthorList authorList = getAuthorList(style, entry.getLookupResult().get());
+        AuthorList authorList = getAuthorList(
+            style,
+            entry.getLookupResult().get()
+        );
         int nAuthors = authorList.getNumberOfAuthors();
 
         if (maxAuthors == -1) {
@@ -367,19 +402,21 @@ private static int calculateNAuthorsToEmit(OOBibStyle style, CitationMarkerEntry
      * @return The formatted citation.
      *
      */
-    private static OOText getAuthorYearParenthesisMarker2(OOBibStyle style,
-                                                          AuthorYearMarkerPurpose purpose,
-                                                          List<CitationMarkerEntry> entries,
-                                                          boolean[] startsNewGroup,
-                                                          Optional<Integer> maxAuthorsOverride) {
-
-        boolean inParenthesis = purpose == AuthorYearMarkerPurpose.IN_PARENTHESIS
-                                 || purpose == AuthorYearMarkerPurpose.NORMALIZED;
+    private static OOText getAuthorYearParenthesisMarker2(
+        OOBibStyle style,
+        AuthorYearMarkerPurpose purpose,
+        List<CitationMarkerEntry> entries,
+        boolean[] startsNewGroup,
+        Optional<Integer> maxAuthorsOverride
+    ) {
+        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();
+            ? style.getYearSeparator()
+            : style.getYearSeparatorInText();
 
         // The opening parenthesis.
         String startBrace = style.getBracketBefore();
@@ -395,8 +432,8 @@ private static OOText getAuthorYearParenthesisMarker2(OOBibStyle style,
 
         // The String to add between the two last author names, e.g. " & ".
         String andString = inParenthesis
-                            ? style.getAuthorLastSeparator()
-                            : style.getAuthorLastSeparatorInTextWithFallBack();
+            ? style.getAuthorLastSeparator()
+            : style.getAuthorLastSeparatorInTextWithFallBack();
 
         String pageInfoSeparator = style.getPageInfoSeparator();
         String uniquefierSeparator = style.getUniquefierSeparator();
@@ -411,7 +448,8 @@ private static OOText getAuthorYearParenthesisMarker2(OOBibStyle style,
         for (int j = 0; j < entries.size(); j++) {
             CitationMarkerEntry entry = entries.get(j);
             boolean startingNewGroup = startsNewGroup[j];
-            boolean endingAGroup = (j + 1 == entries.size()) || startsNewGroup[j + 1];
+            boolean endingAGroup =
+                (j + 1 == entries.size()) || startsNewGroup[j + 1];
 
             if (!startingNewGroup) {
                 // Just add our uniqueLetter
@@ -434,8 +472,9 @@ private static OOText getAuthorYearParenthesisMarker2(OOBibStyle 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()));
@@ -444,7 +483,9 @@ private static OOText getAuthorYearParenthesisMarker2(OOBibStyle style,
 
             final boolean isUnresolved = entry.getLookupResult().isEmpty();
             if (isUnresolved) {
-                stringBuilder.append(String.format("Unresolved(%s)", entry.getCitationKey()));
+                stringBuilder.append(
+                    String.format("Unresolved(%s)", entry.getCitationKey())
+                );
                 if (purpose != AuthorYearMarkerPurpose.NORMALIZED) {
                     stringBuilder.append(pageInfoPart);
                 }
@@ -452,15 +493,20 @@ private static OOText getAuthorYearParenthesisMarker2(OOBibStyle style,
                 CitationLookupResult db = entry.getLookupResult().get();
 
                 int maxAuthors = purpose == AuthorYearMarkerPurpose.NORMALIZED
-                                  ? style.getMaxAuthors()
-                                  : calculateNAuthorsToEmit(style, entry);
+                    ? style.getMaxAuthors()
+                    : calculateNAuthorsToEmit(style, entry);
 
                 if (maxAuthorsOverride.isPresent()) {
                     maxAuthors = maxAuthorsOverride.get();
                 }
 
                 AuthorList authorList = getAuthorList(style, db);
-                String authorString = formatAuthorList(style, authorList, maxAuthors, andString);
+                String authorString = formatAuthorList(
+                    style,
+                    authorList,
+                    maxAuthors,
+                    andString
+                );
                 stringBuilder.append(authorString);
                 stringBuilder.append(yearSep);
 
@@ -485,7 +531,7 @@ private static OOText getAuthorYearParenthesisMarker2(OOBibStyle style,
                 }
 
                 if (!inParenthesis && endingAGroup) {
-                    stringBuilder.append(endBrace);  // parenthesis after year
+                    stringBuilder.append(endBrace); // parenthesis after year
                 }
             }
         } // for j
@@ -500,7 +546,8 @@ private static OOText getAuthorYearParenthesisMarker2(OOBibStyle style,
     /**
      * Add / override methods for the purpose of creating a normalized citation marker.
      */
-    private static class CitationMarkerNormEntryWrap implements CitationMarkerEntry {
+    private static class CitationMarkerNormEntryWrap
+        implements CitationMarkerEntry {
 
         CitationMarkerNormEntry inner;
 
@@ -544,28 +591,36 @@ public boolean getIsFirstAppearanceOfSource() {
      *
      * Note: now includes some markup.
      */
-    static OOText getNormalizedCitationMarker(OOBibStyle style,
-                                              CitationMarkerNormEntry normEntry,
-                                              Optional<Integer> maxAuthorsOverride) {
-        boolean[] startsNewGroup = {true};
+    static OOText getNormalizedCitationMarker(
+        OOBibStyle 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(OOBibStyle style,
-                                 List<CitationMarkerEntry> citationMarkerEntries,
-                                 Optional<Integer> maxAuthorsOverride) {
-
-        List<OOText> normalizedMarkers = new ArrayList<>(citationMarkerEntries.size());
+    private static List<OOText> getNormalizedCitationMarkers(
+        OOBibStyle 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;
@@ -600,12 +655,12 @@ static OOText getNormalizedCitationMarker(OOBibStyle style,
      *             Note: only consecutive citations are checked.
      *
      */
-    public static OOText
-    createCitationMarker(OOBibStyle style,
-                         List<CitationMarkerEntry> citationMarkerEntries,
-                         boolean inParenthesis,
-                         NonUniqueCitationMarker nonUniqueCitationMarkerHandling) {
-
+    public static OOText createCitationMarker(
+        OOBibStyle style,
+        List<CitationMarkerEntry> citationMarkerEntries,
+        boolean inParenthesis,
+        NonUniqueCitationMarker nonUniqueCitationMarkerHandling
+    ) {
         final int nEntries = citationMarkerEntries.size();
 
         // Original:
@@ -623,9 +678,11 @@ static OOText getNormalizedCitationMarker(OOBibStyle 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];
@@ -638,7 +695,8 @@ static OOText getNormalizedCitationMarker(OOBibStyle style,
         }
 
         boolean[] startsNewGroup = new boolean[nEntries];
-        List<CitationMarkerEntry> filteredCitationMarkerEntries = new ArrayList<>(nEntries);
+        List<CitationMarkerEntry> filteredCitationMarkerEntries =
+            new ArrayList<>(nEntries);
         int i_out = 0;
 
         if (nEntries > 0) {
@@ -658,7 +716,7 @@ static OOText getNormalizedCitationMarker(OOBibStyle style,
             final boolean isUnresolved2 = ce2.getLookupResult().isEmpty();
 
             boolean startingNewGroup;
-            boolean sameAsPrev; /* true indicates ce2 may be omitted from output */
+            boolean sameAsPrev;/* true indicates ce2 may be omitted from output */
             if (isUnresolved2) {
                 startingNewGroup = true;
                 sameAsPrev = false; // keep it visible
@@ -677,12 +735,16 @@ static OOText getNormalizedCitationMarker(OOBibStyle style,
 
                     // nAuthorsToEmitRevised[i-1] may have been indirectly increased,
                     // we have to check that too.
-                    if (!isFirst1 &&
+                    if (
+                        !isFirst1 &&
                         !isFirst2 &&
-                        (nAuthorsToEmitRevised[i - 1] == nAuthorsToEmit[i - 1])) {
+                        (nAuthorsToEmitRevised[i - 1] == nAuthorsToEmit[i - 1])
+                    ) {
                         // we can rely on normalizedMarkers
                         nAuthorsShownInhibitsJoin = false;
-                    } else if (style.getMaxAuthors() == style.getMaxAuthorsFirst()) {
+                    } else if (
+                        style.getMaxAuthors() == style.getMaxAuthorsFirst()
+                    ) {
                         // we can rely on normalizedMarkers
                         nAuthorsShownInhibitsJoin = false;
                     } else {
@@ -696,58 +758,80 @@ static OOText getNormalizedCitationMarker(OOBibStyle style,
                         } else {
                             // prevShown >= need
                             // Check with extended normalizedMarkers.
-                            OOText nmx1 =
-                                getNormalizedCitationMarker(style, ce1, Optional.of(prevShown));
-                            OOText nmx2 =
-                                getNormalizedCitationMarker(style, ce2, Optional.of(prevShown));
+                            OOText nmx1 = getNormalizedCitationMarker(
+                                style,
+                                ce1,
+                                Optional.of(prevShown)
+                            );
+                            OOText nmx2 = 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());
-                Optional<OOText> pageInfo1 = PageInfo.normalizePageInfo(ce1.getPageInfo());
-                final boolean bothPageInfosAreEmpty = pageInfo2.isEmpty() && pageInfo1.isEmpty();
+                Optional<OOText> pageInfo2 = PageInfo.normalizePageInfo(
+                    ce2.getPageInfo()
+                );
+                Optional<OOText> pageInfo1 = PageInfo.normalizePageInfo(
+                    ce1.getPageInfo()
+                );
+                final boolean bothPageInfosAreEmpty =
+                    pageInfo2.isEmpty() && pageInfo1.isEmpty();
                 final boolean pageInfosDiffer = !pageInfo2.equals(pageInfo1);
 
                 Optional<String> ul2 = ce2.getUniqueLetter();
                 Optional<String> ul1 = ce1.getUniqueLetter();
-                final boolean uniqueLetterPresenceChanged = ul2.isPresent() != ul1.isPresent();
+                final boolean uniqueLetterPresenceChanged =
+                    ul2.isPresent() != ul1.isPresent();
                 final boolean uniqueLettersDiffer = !ul2.equals(ul1);
 
-                final boolean uniqueLetterDoesNotMakeUnique = citationKeysDiffer
-                                                               && !normalizedMarkersDiffer
-                                                               && !uniqueLettersDiffer;
-
-                if (uniqueLetterDoesNotMakeUnique &&
-                        nonUniqueCitationMarkerHandling == NonUniqueCitationMarker.THROWS) {
-                    throw new IllegalArgumentException("different citation keys,"
-                                                       + " but same normalizedMarker and uniqueLetter");
+                final boolean uniqueLetterDoesNotMakeUnique =
+                    citationKeysDiffer &&
+                    !normalizedMarkersDiffer &&
+                    !uniqueLettersDiffer;
+
+                if (
+                    uniqueLetterDoesNotMakeUnique &&
+                    nonUniqueCitationMarkerHandling ==
+                        NonUniqueCitationMarker.THROWS
+                ) {
+                    throw new IllegalArgumentException(
+                        "different citation keys," +
+                        " but same normalizedMarker and uniqueLetter"
+                    );
                 }
 
                 final boolean pageInfoInhibitsJoin = bothPageInfosAreEmpty
-                                                      ? false
-                                                      : (citationKeysDiffer || pageInfosDiffer);
+                    ? 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) {
@@ -757,12 +841,14 @@ static OOText getNormalizedCitationMarker(OOBibStyle 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/OOBibStyleGetNumCitationMarker.java b/src/main/java/org/jabref/logic/openoffice/style/OOBibStyleGetNumCitationMarker.java
index 2d5aa14272b..0e56d49dcfa 100644
--- a/src/main/java/org/jabref/logic/openoffice/style/OOBibStyleGetNumCitationMarker.java
+++ b/src/main/java/org/jabref/logic/openoffice/style/OOBibStyleGetNumCitationMarker.java
@@ -3,7 +3,6 @@
 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;
@@ -13,16 +12,17 @@
 class OOBibStyleGetNumCitationMarker {
 
     // The number encoding "this entry is unresolved"
-    public final static int UNRESOLVED_ENTRY_NUMBER = 0;
+    public static final int UNRESOLVED_ENTRY_NUMBER = 0;
 
-    private OOBibStyleGetNumCitationMarker() {
-    }
+    private OOBibStyleGetNumCitationMarker() {}
 
     /**
      * 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 +45,10 @@ 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(OOBibStyle style,
-                                                             CitationMarkerNumericBibEntry entry) {
+    public static OOText getNumCitationMarkerForBibliography(
+        OOBibStyle style,
+        CitationMarkerNumericBibEntry entry
+    ) {
         // prefer BRACKET_BEFORE_IN_LIST and BRACKET_AFTER_IN_LIST
         String bracketBefore = style.getBracketBeforeInListWithFallBack();
         String bracketAfter = style.getBracketAfterInListWithFallBack();
@@ -54,9 +56,12 @@ public static OOText getNumCitationMarkerForBibliography(OOBibStyle style,
         stringBuilder.append(style.getCitationGroupMarkupBefore());
         stringBuilder.append(bracketBefore);
         final Optional<Integer> current = entry.getNumber();
-        stringBuilder.append(current.isPresent()
-                  ? String.valueOf(current.get())
-                  : (OOBibStyle.UNDEFINED_CITATION_MARKER + entry.getCitationKey()));
+        stringBuilder.append(
+            current.isPresent()
+                ? String.valueOf(current.get())
+                : (OOBibStyle.UNDEFINED_CITATION_MARKER +
+                    entry.getCitationKey())
+        );
         stringBuilder.append(bracketAfter);
         stringBuilder.append(style.getCitationGroupMarkupAfter());
         return OOText.fromString(stringBuilder.toString());
@@ -85,11 +90,12 @@ public static OOText getNumCitationMarkerForBibliography(OOBibStyle style,
      *     without repetition.
      *
      */
-    private static void emitBlock(List<CitationMarkerNumericEntry> block,
-                                  OOBibStyle style,
-                                  int minGroupingCount,
-                                  StringBuilder stringBuilder) {
-
+    private static void emitBlock(
+        List<CitationMarkerNumericEntry> block,
+        OOBibStyle style,
+        int minGroupingCount,
+        StringBuilder stringBuilder
+    ) {
         final int blockSize = block.size();
         if (blockSize == 0) {
             throw new IllegalArgumentException("The block is empty");
@@ -99,9 +105,12 @@ private static void emitBlock(List<CitationMarkerNumericEntry> block,
             // Add single entry:
             CitationMarkerNumericEntry entry = block.get(0);
             final Optional<Integer> num = entry.getNumber();
-            stringBuilder.append(num.isEmpty()
-                                 ? (OOBibStyle.UNDEFINED_CITATION_MARKER + entry.getCitationKey())
-                                 : String.valueOf(num.get()));
+            stringBuilder.append(
+                num.isEmpty()
+                    ? (OOBibStyle.UNDEFINED_CITATION_MARKER +
+                        entry.getCitationKey())
+                    : String.valueOf(num.get())
+            );
             // Emit pageInfo
             Optional<OOText> pageInfo = entry.getPageInfo();
             if (pageInfo.isPresent()) {
@@ -117,16 +126,26 @@ 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++) {
-                if ((block.get(j).getNumber().get() - block.get(j - 1).getNumber().get()) != 1) {
-                    throw new IllegalArgumentException("Numbers are not consecutive");
+                if (
+                    (block.get(j).getNumber().get() -
+                        block.get(j - 1).getNumber().get()) !=
+                    1
+                ) {
+                    throw new IllegalArgumentException(
+                        "Numbers are not consecutive"
+                    );
                 }
             }
 
@@ -138,7 +157,9 @@ private static void emitBlock(List<CitationMarkerNumericEntry> block,
                 int first = block.get(0).getNumber().get();
                 int last = block.get(blockSize - 1).getNumber().get();
                 if (last != (first + blockSize - 1)) {
-                    throw new IllegalArgumentException("blockSize and length of num range differ");
+                    throw new IllegalArgumentException(
+                        "blockSize and length of num range differ"
+                    );
                 }
 
                 // Emit: "first-last"
@@ -181,10 +202,11 @@ private static void emitBlock(List<CitationMarkerNumericEntry> block,
      * @return The text for the citation.
      *
      */
-    public static OOText getNumCitationMarker2(OOBibStyle style,
-                                               List<CitationMarkerNumericEntry> entries,
-                                               int minGroupingCount) {
-
+    public static OOText getNumCitationMarker2(
+        OOBibStyle style,
+        List<CitationMarkerNumericEntry> entries,
+        int minGroupingCount
+    ) {
         final boolean joinIsDisabled = minGroupingCount <= 0;
         final int nCitations = entries.size();
 
@@ -192,8 +214,13 @@ public static OOText getNumCitationMarker2(OOBibStyle style,
         final String bracketAfter = style.getBracketAfter();
 
         // Sort a copy of entries
-        List<CitationMarkerNumericEntry> sorted = OOListUtil.map(entries, e -> e);
-        sorted.sort(OOBibStyleGetNumCitationMarker::compareCitationMarkerNumericEntry);
+        List<CitationMarkerNumericEntry> sorted = OOListUtil.map(
+            entries,
+            e -> e
+        );
+        sorted.sort(
+            OOBibStyleGetNumCitationMarker::compareCitationMarkerNumericEntry
+        );
 
         // "["
         StringBuilder stringBuilder = new StringBuilder(bracketBefore);
@@ -216,23 +243,36 @@ public static OOText getNumCitationMarker2(OOBibStyle style,
 
         for (int i = 0; i < nCitations; i++) {
             final CitationMarkerNumericEntry current = sorted.get(i);
-            if (current.getNumber().isPresent() && current.getNumber().get() < 0) {
-                throw new IllegalArgumentException("getNumCitationMarker2: found negative number");
+            if (
+                current.getNumber().isPresent() && current.getNumber().get() < 0
+            ) {
+                throw new IllegalArgumentException(
+                    "getNumCitationMarker2: found negative number"
+                );
             }
 
             if (currentBlock.isEmpty()) {
                 currentBlock.add(current);
             } else {
-                CitationMarkerNumericEntry prev = currentBlock.get(currentBlock.size() - 1);
-                if (current.getNumber().isEmpty() || prev.getNumber().isEmpty()) {
+                CitationMarkerNumericEntry prev = currentBlock.get(
+                    currentBlock.size() - 1
+                );
+                if (
+                    current.getNumber().isEmpty() || prev.getNumber().isEmpty()
+                ) {
                     nextBlock.add(current); // do not join if not found
                 } else if (joinIsDisabled) {
                     nextBlock.add(current); // join disabled
-                } else if (compareCitationMarkerNumericEntry(current, prev) == 0) {
+                } 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())) {
+                } else if (
+                    (current.getNumber().get() ==
+                        (prev.getNumber().get() + 1)) &&
+                    (prev.getPageInfo().isEmpty()) &&
+                    (current.getPageInfo().isEmpty())
+                ) {
                     // Just two consecutive numbers without pageInfo: join
                     currentBlock.add(current);
                 } else {
@@ -254,7 +294,9 @@ public static OOText getNumCitationMarker2(OOBibStyle style,
         }
 
         if (!nextBlock.isEmpty()) {
-            throw new IllegalStateException("impossible: (nextBlock.size() != 0) after loop");
+            throw new IllegalStateException(
+                "impossible: (nextBlock.size() != 0) after loop"
+            );
         }
 
         if (!currentBlock.isEmpty()) {
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 d45eab65b7e..640032ca5eb 100644
--- a/src/main/java/org/jabref/logic/openoffice/style/OOFormatBibliography.java
+++ b/src/main/java/org/jabref/logic/openoffice/style/OOFormatBibliography.java
@@ -3,7 +3,6 @@
 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;
@@ -20,37 +19,49 @@
 import org.jabref.model.openoffice.style.CitedKeys;
 
 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,
-                                            OOBibStyle style,
-                                            boolean alwaysAddCitedOnPages) {
-
+    public static OOText formatBibliography(
+        CitationGroups citationGroups,
+        CitedKeys bibliography,
+        OOBibStyle 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,
-                                                OOBibStyle style,
-                                                boolean alwaysAddCitedOnPages) {
-
+    public static OOText formatBibliographyBody(
+        CitationGroups citationGroups,
+        CitedKeys bibliography,
+        OOBibStyle 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,26 +71,34 @@ public static OOText formatBibliographyBody(CitationGroups citationGroups,
     /**
      * @return A paragraph. Includes label and "Cited on pages".
      */
-    public static OOText formatBibliographyEntry(CitationGroups citationGroups,
-                                                 CitedKey citedKey,
-                                                 OOBibStyle style,
-                                                 boolean alwaysAddCitedOnPages) {
+    public static OOText formatBibliographyEntry(
+        CitationGroups citationGroups,
+        CitedKey citedKey,
+        OOBibStyle style,
+        boolean alwaysAddCitedOnPages
+    ) {
         StringBuilder stringBuilder = new StringBuilder();
 
         // insert marker "[1]"
         if (style.isNumberEntries()) {
-            stringBuilder.append(style.getNumCitationMarkerForBibliography(citedKey).toString());
+            stringBuilder.append(
+                style.getNumCitationMarkerForBibliography(citedKey).toString()
+            );
         } else {
             // !style.isNumberEntries() : emit no prefix
             // Note: We might want [citationKey] prefix for style.isCitationKeyCiteMarkers();
         }
 
         // Add entry body
-        stringBuilder.append(formatBibliographyEntryBody(citedKey, style).toString());
+        stringBuilder.append(
+            formatBibliographyEntryBody(citedKey, style).toString()
+        );
 
         // Add "Cited on pages"
         if (citedKey.getLookupResult().isEmpty() || alwaysAddCitedOnPages) {
-            stringBuilder.append(formatCitedOnPages(citationGroups, citedKey).toString());
+            stringBuilder.append(
+                formatCitedOnPages(citationGroups, citedKey).toString()
+            );
         }
 
         // Add paragraph
@@ -91,20 +110,27 @@ public static OOText formatBibliographyEntry(CitationGroups citationGroups,
     /**
      * @return just the body of a bibliography entry. No label, "Cited on pages" or paragraph.
      */
-    public static OOText formatBibliographyEntryBody(CitedKey citedKey, OOBibStyle style) {
+    public static OOText formatBibliographyEntryBody(
+        CitedKey citedKey,
+        OOBibStyle style
+    ) {
         if (citedKey.getLookupResult().isEmpty()) {
             // Unresolved entry
-            return OOText.fromString(String.format("Unresolved(%s)", citedKey.citationKey));
+            return OOText.fromString(
+                String.format("Unresolved(%s)", citedKey.citationKey)
+            );
         } else {
             // Resolved entry, use the layout engine
             BibEntry bibentry = citedKey.getLookupResult().get().entry;
             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,11 +144,12 @@ public static OOText formatBibliographyEntryBody(CitedKey citedKey, OOBibStyle s
      *
      * @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);
 
@@ -134,7 +161,9 @@ private static OOText formatFullReferenceOfBibEntry(Layout layout,
         }
 
         // Do the layout for this entry:
-        OOText formattedText = OOText.fromString(layout.doLayout(entry, database));
+        OOText formattedText = OOText.fromString(
+            layout.doLayout(entry, database)
+        );
 
         // Afterwards, reset the old value:
         if (oldUniqVal.isPresent()) {
@@ -154,21 +183,31 @@ private static OOText formatFullReferenceOfBibEntry(Layout layout,
      * - The links are created as references that show page numbers of the reference marks.
      *   - We do not control the text shown, that is provided by OpenOffice.
      */
-    private static OOText formatCitedOnPages(CitationGroups citationGroups, CitedKey citedKey) {
-        if (!citationGroups.citationGroupsProvideReferenceMarkNameForLinking()) {
+    private static OOText formatCitedOnPages(
+        CitationGroups citationGroups,
+        CitedKey citedKey
+    ) {
+        if (
+            !citationGroups.citationGroupsProvideReferenceMarkNameForLinking()
+        ) {
             return OOText.fromString("");
         }
 
         StringBuilder stringBuilder = new StringBuilder();
 
-        final String prefix = String.format(" (%s: ", Localization.lang("Cited on pages"));
+        final String prefix = String.format(
+            " (%s: ",
+            Localization.lang("Cited on pages")
+        );
         final String suffix = ")";
         stringBuilder.append(prefix);
 
         List<CitationGroup> filteredList = new ArrayList<>();
         for (CitationPath path : citedKey.getCitationPaths()) {
             CitationGroupId groupId = path.group;
-            Optional<CitationGroup> group = citationGroups.getCitationGroup(groupId);
+            Optional<CitationGroup> group = citationGroups.getCitationGroup(
+                groupId
+            );
             if (group.isEmpty()) {
                 throw new IllegalStateException();
             }
@@ -177,18 +216,26 @@ 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);
-            });
+            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);
-            OOText xref = OOFormat.formatReferenceToPageNumberOfReferenceMark(markName);
+            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 caeaf8cce2a..9b1a3d5940a 100644
--- a/src/main/java/org/jabref/logic/openoffice/style/OOPreFormatter.java
+++ b/src/main/java/org/jabref/logic/openoffice/style/OOPreFormatter.java
@@ -2,7 +2,6 @@
 
 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;
@@ -12,14 +11,16 @@
  */
 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,17 +46,23 @@ 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 == '%')
-                    || StringUtil.SPECIAL_COMMAND_CHARS.contains(String.valueOf(c))) {
+            } else if (
+                Character.isLetter(c) ||
+                (c == '%') ||
+                StringUtil.SPECIAL_COMMAND_CHARS.contains(String.valueOf(c))
+            ) {
                 escaped = false;
 
                 if (!incommand) {
                     sb.append(c);
                 } else {
                     currentCommand.append(c);
-                    testCharCom:
-                    if ((currentCommand.length() == 1)
-                            && StringUtil.SPECIAL_COMMAND_CHARS.contains(currentCommand.toString())) {
+                    testCharCom:if (
+                        (currentCommand.length() == 1) &&
+                        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)) {
@@ -67,13 +74,19 @@ public String format(String field) {
                         c = finalResult.charAt(i);
                         String combody;
                         if (c == '{') {
-                            String part = StringUtil.getPart(finalResult, i, false);
+                            String part = StringUtil.getPart(
+                                finalResult,
+                                i,
+                                false
+                            );
                             i += part.length();
                             combody = part;
                         } else {
                             combody = finalResult.substring(i, i + 1);
                         }
-                        String result = OOPreFormatter.CHARS.get(command + combody);
+                        String result = OOPreFormatter.CHARS.get(
+                            command + combody
+                        );
 
                         if (result != null) {
                             sb.append(result);
@@ -87,7 +100,9 @@ public String format(String field) {
                             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.
-                            sb.append(Objects.requireNonNullElse(result, command));
+                            sb.append(
+                                Objects.requireNonNullElse(result, command)
+                            );
                         }
                     }
                 }
@@ -96,7 +111,9 @@ public String format(String field) {
 
                 if (!incommand) {
                     sb.append(c);
-                } else if (Character.isWhitespace(c) || (c == '{') || (c == '}')) {
+                } else if (
+                    Character.isWhitespace(c) || (c == '{') || (c == '}')
+                ) {
                     String command = currentCommand.toString();
 
                     // Test if we are dealing with a formatting command. If so, handle.
@@ -104,13 +121,22 @@ 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);
+                        String result = OOPreFormatter.CHARS.get(
+                            command + argument
+                        );
                         // 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 == '}') {
@@ -148,16 +174,16 @@ 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
+            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 6e64bdbc8bf..8dd94ec1256 100644
--- a/src/main/java/org/jabref/logic/openoffice/style/OOProcess.java
+++ b/src/main/java/org/jabref/logic/openoffice/style/OOProcess.java
@@ -2,7 +2,6 @@
 
 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;
@@ -12,23 +11,28 @@
 
 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);
     }
 
@@ -41,7 +45,9 @@ private static Comparator<BibEntry> makeYearAuthorTitleComparator() {
      *
      *  Yes, they are always sorted one way or another.
      */
-    public static Comparator<BibEntry> comparatorForMulticite(OOBibStyle style) {
+    public static Comparator<BibEntry> comparatorForMulticite(
+        OOBibStyle style
+    ) {
         if (style.getMultiCiteChronological()) {
             return OOProcess.YEAR_AUTHOR_TITLE_COMPARATOR;
         } else {
@@ -53,9 +59,15 @@ public static Comparator<BibEntry> comparatorForMulticite(OOBibStyle style) {
      *  Fill citationGroups.bibliography and cgs.citationGroupsUnordered//CitationMarker
      *  according to style.
      */
-    public static void produceCitationMarkers(CitationGroups citationGroups, List<BibDatabase> databases, OOBibStyle style) {
+    public static void produceCitationMarkers(
+        CitationGroups citationGroups,
+        List<BibDatabase> databases,
+        OOBibStyle 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);
@@ -63,11 +75,20 @@ public static void produceCitationMarkers(CitationGroups citationGroups, List<Bi
 
         // fill CitationGroup.citationMarker
         if (style.isCitationKeyCiteMarkers()) {
-            OOProcessCitationKeyMarkers.produceCitationMarkers(citationGroups, style);
+            OOProcessCitationKeyMarkers.produceCitationMarkers(
+                citationGroups,
+                style
+            );
         } else if (style.isNumberEntries()) {
-            OOProcessNumericMarkers.produceCitationMarkers(citationGroups, style);
+            OOProcessNumericMarkers.produceCitationMarkers(
+                citationGroups,
+                style
+            );
         } else {
-            OOProcessAuthorYearMarkers.produceCitationMarkers(citationGroups, style);
+            OOProcessAuthorYearMarkers.produceCitationMarkers(
+                citationGroups,
+                style
+            );
         }
     }
 }
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 3e960e7e165..eb232786898 100644
--- a/src/main/java/org/jabref/logic/openoffice/style/OOProcessAuthorYearMarkers.java
+++ b/src/main/java/org/jabref/logic/openoffice/style/OOProcessAuthorYearMarkers.java
@@ -7,7 +7,6 @@
 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;
@@ -21,15 +20,19 @@
 
 class OOProcessAuthorYearMarkers {
 
-    private OOProcessAuthorYearMarkers() {
-    }
+    private OOProcessAuthorYearMarkers() {}
 
     /**
      *  Fills {@code sortedCitedKeys//normCitMarker}
      */
-    private static void createNormalizedCitationMarkers(CitedKeys sortedCitedKeys, OOBibStyle style) {
+    private static void createNormalizedCitationMarkers(
+        CitedKeys sortedCitedKeys,
+        OOBibStyle style
+    ) {
         for (CitedKey ck : sortedCitedKeys.values()) {
-            ck.setNormalizedCitationMarker(Optional.of(style.getNormalizedCitationMarker(ck)));
+            ck.setNormalizedCitationMarker(
+                Optional.of(style.getNormalizedCitationMarker(ck))
+            );
         }
     }
 
@@ -48,7 +51,10 @@ private static void createNormalizedCitationMarkers(CitedKeys sortedCitedKeys, O
      *
      *  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().
         //
@@ -57,10 +63,15 @@ private static void createUniqueLetters(CitedKeys sortedCitedKeys, CitationGroup
         //
         Map<String, List<String>> normCitMarkerToClachingKeys = new HashMap<>();
         for (CitedKey citedKey : sortedCitedKeys.values()) {
-            String normCitMarker = OOText.toString(citedKey.getNormalizedCitationMarker().get());
+            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);
             }
@@ -86,7 +97,9 @@ private static void createUniqueLetters(CitedKeys sortedCitedKeys, CitationGroup
             int nextUniqueLetter = 'a';
             for (String citationKey : clashingKeys) {
                 String uniqueLetter = String.valueOf((char) nextUniqueLetter);
-                sortedCitedKeys.get(citationKey).setUniqueLetter(Optional.of(uniqueLetter));
+                sortedCitedKeys
+                    .get(citationKey)
+                    .setUniqueLetter(Optional.of(uniqueLetter));
                 nextUniqueLetter++;
             }
         }
@@ -105,7 +118,9 @@ private static void createUniqueLetters(CitedKeys sortedCitedKeys, CitationGroup
      *
      * Preconditions: globalOrder, localOrder
      */
-    private static void setIsFirstAppearanceOfSourceInCitations(CitationGroups citationGroups) {
+    private static void setIsFirstAppearanceOfSourceInCitations(
+        CitationGroups citationGroups
+    ) {
         Set<String> seenBefore = new HashSet<>();
         for (CitationGroup group : citationGroups.getCitationGroupsInGlobalOrder()) {
             for (Citation cit : group.getCitationsInLocalOrder()) {
@@ -126,29 +141,42 @@ private static void setIsFirstAppearanceOfSourceInCitations(CitationGroups citat
      *
      * @param style              Bibliography style.
      */
-    static void produceCitationMarkers(CitationGroups citationGroups, OOBibStyle style) {
+    static void produceCitationMarkers(
+        CitationGroups citationGroups,
+        OOBibStyle style
+    ) {
         assert !style.isCitationKeyCiteMarkers();
         assert !style.isNumberEntries();
         // Citations in (Au1, Au2 2000) form
 
-        CitedKeys citedKeys = citationGroups.getCitedKeysSortedInOrderOfAppearance();
+        CitedKeys citedKeys =
+            citationGroups.getCitedKeysSortedInOrderOfAppearance();
 
         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);
 
         for (CitationGroup group : citationGroups.getCitationGroupsInGlobalOrder()) {
-            final boolean inParenthesis = group.citationType == CitationType.AUTHORYEAR_PAR;
-            final NonUniqueCitationMarker strictlyUnique = NonUniqueCitationMarker.THROWS;
+            final boolean inParenthesis =
+                group.citationType == CitationType.AUTHORYEAR_PAR;
+            final NonUniqueCitationMarker strictlyUnique =
+                NonUniqueCitationMarker.THROWS;
 
             List<Citation> cits = group.getCitationsInLocalOrder();
-            List<CitationMarkerEntry> citationMarkerEntries = OOListUtil.map(cits, e -> e);
-            OOText citMarker = style.createCitationMarker(citationMarkerEntries,
-                                                          inParenthesis,
-                                                          strictlyUnique);
+            List<CitationMarkerEntry> citationMarkerEntries = OOListUtil.map(
+                cits,
+                e -> e
+            );
+            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 df4454f2a0c..46b9209017b 100644
--- a/src/main/java/org/jabref/logic/openoffice/style/OOProcessCitationKeyMarkers.java
+++ b/src/main/java/org/jabref/logic/openoffice/style/OOProcessCitationKeyMarkers.java
@@ -1,7 +1,6 @@
 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;
@@ -10,23 +9,33 @@
 
 class OOProcessCitationKeyMarkers {
 
-    private OOProcessCitationKeyMarkers() {
-    }
+    private OOProcessCitationKeyMarkers() {}
 
     /**
      *  Produce citation markers for the case when the citation
      *  markers are the citation keys themselves, separated by commas.
      */
-    static void produceCitationMarkers(CitationGroups citationGroups, OOBibStyle style) {
+    static void produceCitationMarkers(
+        CitationGroups citationGroups,
+        OOBibStyle 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 8ca01617b67..6d9dd4810c9 100644
--- a/src/main/java/org/jabref/logic/openoffice/style/OOProcessNumericMarkers.java
+++ b/src/main/java/org/jabref/logic/openoffice/style/OOProcessNumericMarkers.java
@@ -2,7 +2,6 @@
 
 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;
@@ -11,8 +10,7 @@
 
 class OOProcessNumericMarkers {
 
-    private OOProcessNumericMarkers() {
-    }
+    private OOProcessNumericMarkers() {}
 
     /**
      * Produce citation markers for the case of numbered citations
@@ -22,17 +20,25 @@ private OOProcessNumericMarkers() {
      * Numbering is according to first appearance.
      * Assumes global order and local order are already applied.
      */
-    static void produceCitationMarkers(CitationGroups citationGroups, OOBibStyle style) {
+    static void produceCitationMarkers(
+        CitationGroups citationGroups,
+        OOBibStyle style
+    ) {
         assert style.isNumberEntries();
 
         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 ad7bad0e9cc..e6dbfeaaa0b 100644
--- a/src/main/java/org/jabref/logic/openoffice/style/StyleLoader.java
+++ b/src/main/java/org/jabref/logic/openoffice/style/StyleLoader.java
@@ -7,24 +7,28 @@
 import java.util.Arrays;
 import java.util.List;
 import java.util.Objects;
-
 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);
+    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;
@@ -35,12 +39,17 @@ public class StyleLoader {
     private final List<OOBibStyle> internalStyles = new ArrayList<>();
     private final List<OOBibStyle> externalStyles = new ArrayList<>();
 
-    public StyleLoader(OpenOfficePreferences openOfficePreferences,
-                       LayoutFormatterPreferences formatterPreferences,
-                       JournalAbbreviationRepository abbreviationRepository) {
-        this.openOfficePreferences = Objects.requireNonNull(openOfficePreferences);
-        this.layoutFormatterPreferences = Objects.requireNonNull(formatterPreferences);
-        this.abbreviationRepository = Objects.requireNonNull(abbreviationRepository);
+    public StyleLoader(
+        OpenOfficePreferences openOfficePreferences,
+        LayoutFormatterPreferences formatterPreferences,
+        JournalAbbreviationRepository abbreviationRepository
+    ) {
+        this.openOfficePreferences =
+            Objects.requireNonNull(openOfficePreferences);
+        this.layoutFormatterPreferences =
+            Objects.requireNonNull(formatterPreferences);
+        this.abbreviationRepository =
+            Objects.requireNonNull(abbreviationRepository);
         loadInternalStyles();
         loadExternalStyles();
     }
@@ -60,9 +69,16 @@ public List<OOBibStyle> getStyles() {
     public boolean addStyleIfValid(String filename) {
         Objects.requireNonNull(filename);
         try {
-            OOBibStyle newStyle = new OOBibStyle(Path.of(filename), layoutFormatterPreferences, abbreviationRepository);
+            OOBibStyle newStyle = new OOBibStyle(
+                Path.of(filename),
+                layoutFormatterPreferences,
+                abbreviationRepository
+            );
             if (externalStyles.contains(newStyle)) {
-                LOGGER.info("External style file {} already existing.", filename);
+                LOGGER.info(
+                    "External style file {} already existing.",
+                    filename
+                );
             } else if (newStyle.isValid()) {
                 externalStyles.add(newStyle);
                 storeExternalStyles();
@@ -85,7 +101,11 @@ private void loadExternalStyles() {
         List<String> lists = openOfficePreferences.getExternalStyles();
         for (String filename : lists) {
             try {
-                OOBibStyle style = new OOBibStyle(Path.of(filename), layoutFormatterPreferences, abbreviationRepository);
+                OOBibStyle style = new OOBibStyle(
+                    Path.of(filename),
+                    layoutFormatterPreferences,
+                    abbreviationRepository
+                );
                 if (style.isValid()) { // Problem!
                     externalStyles.add(style);
                 } else {
@@ -95,7 +115,11 @@ private void loadExternalStyles() {
                 // The file couldn't be found... should we tell anyone?
                 LOGGER.info("Cannot find external style file {}", filename);
             } catch (IOException e) {
-                LOGGER.info("Problem reading external style file {}", filename, e);
+                LOGGER.info(
+                    "Problem reading external style file {}",
+                    filename,
+                    e
+                );
             }
         }
     }
@@ -104,9 +128,19 @@ private void loadInternalStyles() {
         internalStyles.clear();
         for (String filename : internalStyleFiles) {
             try {
-                internalStyles.add(new OOBibStyle(filename, layoutFormatterPreferences, abbreviationRepository));
+                internalStyles.add(
+                    new OOBibStyle(
+                        filename,
+                        layoutFormatterPreferences,
+                        abbreviationRepository
+                    )
+                );
             } catch (IOException e) {
-                LOGGER.info("Problem reading internal style file {}", filename, e);
+                LOGGER.info(
+                    "Problem reading internal style file {}",
+                    filename,
+                    e
+                );
             }
         }
     }
diff --git a/src/main/java/org/jabref/logic/pdf/AnnotationImporter.java b/src/main/java/org/jabref/logic/pdf/AnnotationImporter.java
index 647bde6d181..62ef4866e14 100644
--- a/src/main/java/org/jabref/logic/pdf/AnnotationImporter.java
+++ b/src/main/java/org/jabref/logic/pdf/AnnotationImporter.java
@@ -2,10 +2,8 @@
 
 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 5f22139593c..4ac720ff829 100644
--- a/src/main/java/org/jabref/logic/pdf/EntryAnnotationImporter.java
+++ b/src/main/java/org/jabref/logic/pdf/EntryAnnotationImporter.java
@@ -5,7 +5,6 @@
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
-
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.LinkedFile;
@@ -32,9 +31,14 @@ public EntryAnnotationImporter(BibEntry entry) {
      * @return a list of file parsed files
      */
     private List<LinkedFile> getFilteredFileList() {
-        return entry.getFiles().stream()
-                    .filter(parsedFileField -> "pdf".equalsIgnoreCase(parsedFileField.getFileType()))
-                    .filter(parsedFileField -> !parsedFileField.isOnlineLink()).collect(Collectors.toList());
+        return entry
+            .getFiles()
+            .stream()
+            .filter(parsedFileField ->
+                "pdf".equalsIgnoreCase(parsedFileField.getFileType())
+            )
+            .filter(parsedFileField -> !parsedFileField.isOnlineLink())
+            .collect(Collectors.toList());
     }
 
     /**
@@ -43,14 +47,20 @@ 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()
         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 51904e45e92..e47361a22d7 100644
--- a/src/main/java/org/jabref/logic/pdf/FileAnnotationCache.java
+++ b/src/main/java/org/jabref/logic/pdf/FileAnnotationCache.java
@@ -1,43 +1,63 @@
 package org.jabref.logic.pdf;
 
+import com.google.common.cache.CacheBuilder;
+import com.google.common.cache.CacheLoader;
+import com.google.common.cache.LoadingCache;
 import java.nio.file.Path;
 import java.util.List;
 import java.util.Map;
-
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.pdf.FileAnnotation;
 import org.jabref.preferences.FilePreferences;
-
-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;
 
 public class FileAnnotationCache {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(FileAnnotation.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(
+        FileAnnotation.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;
+    private LoadingCache<
+        BibEntry,
+        Map<Path, List<FileAnnotation>>
+    > annotationCache;
 
     /**
      * 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);
-            }
-        });
+    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
+                                );
+                        }
+                    }
+                );
     }
 
     /**
@@ -47,12 +67,22 @@ 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(String.format("Loading Bibentry '%s' from cache.", entry.getCitationKey().orElse(entry.getId())));
+        LOGGER.debug(
+            String.format(
+                "Loading Bibentry '%s' from cache.",
+                entry.getCitationKey().orElse(entry.getId())
+            )
+        );
         return annotationCache.getUnchecked(entry);
     }
 
     public void remove(BibEntry entry) {
-        LOGGER.debug(String.format("Deleted Bibentry '%s' from cache.", entry.getCitationKey().orElse(entry.getId())));
+        LOGGER.debug(
+            String.format(
+                "Deleted Bibentry '%s' from cache.",
+                entry.getCitationKey().orElse(entry.getId())
+            )
+        );
         annotationCache.invalidate(entry);
     }
 }
diff --git a/src/main/java/org/jabref/logic/pdf/PdfAnnotationImporter.java b/src/main/java/org/jabref/logic/pdf/PdfAnnotationImporter.java
index b5ed05dd896..22ab01d7d9b 100644
--- a/src/main/java/org/jabref/logic/pdf/PdfAnnotationImporter.java
+++ b/src/main/java/org/jabref/logic/pdf/PdfAnnotationImporter.java
@@ -10,10 +10,6 @@
 import java.util.Locale;
 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;
@@ -21,12 +17,16 @@
 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;
 
 public class PdfAnnotationImporter implements AnnotationImporter {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(PdfAnnotationImporter.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(
+        PdfAnnotationImporter.class
+    );
 
     /**
      * Imports the comments from a pdf specified by its path
@@ -44,18 +44,34 @@ public List<FileAnnotation> importAnnotations(final Path path) {
         List<FileAnnotation> annotationsList = new LinkedList<>();
         try (PDDocument document = Loader.loadPDF(path.toFile())) {
             PDPageTree pdfPages = document.getDocumentCatalog().getPages();
-            for (int pageIndex = 0; pageIndex < pdfPages.getCount(); pageIndex++) {
+            for (
+                int pageIndex = 0;
+                pageIndex < pdfPages.getCount();
+                pageIndex++
+            ) {
                 PDPage page = pdfPages.get(pageIndex);
                 for (PDAnnotation annotation : page.getAnnotations()) {
                     if (!isSupportedAnnotationType(annotation)) {
                         continue;
                     }
 
-                    if (FileAnnotationType.isMarkedFileAnnotationType(annotation.getSubtype())) {
-                        annotationsList.add(createMarkedAnnotations(pageIndex, page, annotation));
+                    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);
                         }
                     }
@@ -71,43 +87,88 @@ private boolean isSupportedAnnotationType(PDAnnotation annotation) {
         if (annotation.getSubtype() == null) {
             return false;
         }
-        if ("Link".equals(annotation.getSubtype()) || "Widget".equals(annotation.getSubtype())) {
-            LOGGER.debug(annotation.getSubtype() + " is excluded from the supported file annotations");
+        if (
+            "Link".equals(annotation.getSubtype()) ||
+            "Widget".equals(annotation.getSubtype())
+        ) {
+            LOGGER.debug(
+                annotation.getSubtype() +
+                " is excluded from the supported file annotations"
+            );
             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(String.format("Could not parse the FileAnnotation %s into any known FileAnnotationType. It was %s!", annotation, annotation.getSubtype()));
+            LOGGER.debug(
+                String.format(
+                    "Could not parse the FileAnnotation %s into any known FileAnnotationType. It was %s!",
+                    annotation,
+                    annotation.getSubtype()
+                )
+            );
         }
         return true;
     }
 
-    private FileAnnotation createMarkedAnnotations(int pageIndex, PDPage page, PDAnnotation annotation) {
+    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()) {
+            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"));
-                annotation.setContents(new TextExtractor(page, boundingBoxes).extractMarkedText());
+                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!");
+                annotation.setContents(
+                    "JabRef: Could not extract any marked text!"
+                );
             }
         }
 
         // Marked text that has a sticky note on it should be linked to the sticky note
-        return new FileAnnotation(annotation, pageIndex + 1, annotationBelongingToMarking);
+        return new FileAnnotation(
+            annotation,
+            pageIndex + 1,
+            annotationBelongingToMarking
+        );
     }
 
     private boolean validatePath(Path path) {
         Objects.requireNonNull(path);
 
         if (!path.toString().toLowerCase(Locale.ROOT).endsWith(".pdf")) {
-            LOGGER.warn(String.format("File '%s' does not end with .pdf!", path));
+            LOGGER.warn(
+                String.format("File '%s' does not end with .pdf!", path)
+            );
             return false;
         }
 
diff --git a/src/main/java/org/jabref/logic/pdf/TextExtractor.java b/src/main/java/org/jabref/logic/pdf/TextExtractor.java
index 089a5dfbc30..082fb063ce6 100644
--- a/src/main/java/org/jabref/logic/pdf/TextExtractor.java
+++ b/src/main/java/org/jabref/logic/pdf/TextExtractor.java
@@ -3,20 +3,20 @@
 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;
 
 /**
  * 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;
@@ -44,12 +44,22 @@ public String extractMarkedText() throws IOException {
 
         // 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"));
+                markedText =
+                    markedText.concat(
+                        stripperByArea.getTextForRegion("markedRegion")
+                    );
             } catch (IllegalArgumentException e) {
                 throw new IOException("Cannot read annotation coordinates!", e);
             }
@@ -58,7 +68,10 @@ public String extractMarkedText() throws IOException {
         return markedText.trim();
     }
 
-    private Rectangle2D calculateSegmentBoundingBox(COSArray quadsArray, int segmentPointer) {
+    private Rectangle2D calculateSegmentBoundingBox(
+        COSArray quadsArray,
+        int segmentPointer
+    ) {
         // Extract coordinate values
         float upperLeftX = toFloat(quadsArray.get(segmentPointer));
         float upperLeftY = toFloat(quadsArray.get(segmentPointer + 1));
@@ -84,6 +97,8 @@ private float toFloat(Object cosNumber) {
         if (cosNumber instanceof COSInteger) {
             return ((COSInteger) cosNumber).floatValue();
         }
-        throw new IllegalArgumentException("The number type of the annotation is not supported!");
+        throw new IllegalArgumentException(
+            "The number type of the annotation is not supported!"
+        );
     }
 }
diff --git a/src/main/java/org/jabref/logic/pdf/search/indexing/DocumentReader.java b/src/main/java/org/jabref/logic/pdf/search/indexing/DocumentReader.java
index e2e1c0f5b7e..a6966f5e15d 100644
--- a/src/main/java/org/jabref/logic/pdf/search/indexing/DocumentReader.java
+++ b/src/main/java/org/jabref/logic/pdf/search/indexing/DocumentReader.java
@@ -1,5 +1,11 @@
 package org.jabref.logic.pdf.search.indexing;
 
+import static org.jabref.model.pdf.search.SearchFieldConstants.ANNOTATIONS;
+import static org.jabref.model.pdf.search.SearchFieldConstants.CONTENT;
+import static org.jabref.model.pdf.search.SearchFieldConstants.MODIFIED;
+import static org.jabref.model.pdf.search.SearchFieldConstants.PAGE_NUMBER;
+import static org.jabref.model.pdf.search.SearchFieldConstants.PATH;
+
 import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
@@ -10,14 +16,6 @@
 import java.util.concurrent.TimeUnit;
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;
-
-import org.jabref.gui.LibraryTab;
-import org.jabref.model.database.BibDatabaseContext;
-import org.jabref.model.entry.BibEntry;
-import org.jabref.model.entry.LinkedFile;
-import org.jabref.model.strings.StringUtil;
-import org.jabref.preferences.FilePreferences;
-
 import org.apache.lucene.document.Document;
 import org.apache.lucene.document.Field;
 import org.apache.lucene.document.StringField;
@@ -27,24 +25,29 @@
 import org.apache.pdfbox.pdmodel.PDPage;
 import org.apache.pdfbox.pdmodel.interactive.annotation.PDAnnotation;
 import org.apache.pdfbox.text.PDFTextStripper;
+import org.jabref.gui.LibraryTab;
+import org.jabref.model.database.BibDatabaseContext;
+import org.jabref.model.entry.BibEntry;
+import org.jabref.model.entry.LinkedFile;
+import org.jabref.model.strings.StringUtil;
+import org.jabref.preferences.FilePreferences;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import static org.jabref.model.pdf.search.SearchFieldConstants.ANNOTATIONS;
-import static org.jabref.model.pdf.search.SearchFieldConstants.CONTENT;
-import static org.jabref.model.pdf.search.SearchFieldConstants.MODIFIED;
-import static org.jabref.model.pdf.search.SearchFieldConstants.PAGE_NUMBER;
-import static org.jabref.model.pdf.search.SearchFieldConstants.PATH;
-
 /**
  * Utility class for reading the data from LinkedFiles of a BibEntry for Lucene.
  */
 public final class DocumentReader {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(LibraryTab.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(
+        LibraryTab.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 HYPHEN_LINEBREAK_PATTERN = Pattern.compile(
+        "\\-\n"
+    );
+    private static final Pattern LINEBREAK_WITHOUT_PERIOD_PATTERN =
+        Pattern.compile("([^\\\\.])\\n");
 
     private final BibEntry entry;
     private final FilePreferences filePreferences;
@@ -57,7 +60,9 @@ public final class DocumentReader {
     public DocumentReader(BibEntry bibEntry, FilePreferences filePreferences) {
         this.filePreferences = filePreferences;
         if (bibEntry.getFiles().isEmpty()) {
-            throw new IllegalStateException("There are no linked PDF files to this BibEntry!");
+            throw new IllegalStateException(
+                "There are no linked PDF files to this BibEntry!"
+            );
         }
 
         this.entry = bibEntry;
@@ -68,7 +73,10 @@ public DocumentReader(BibEntry bibEntry, FilePreferences filePreferences) {
      *
      * @return An Optional of a Lucene Document with the (meta)data. Can be empty if there is a problem reading the LinkedFile.
      */
-    public Optional<List<Document>> readLinkedPdf(BibDatabaseContext databaseContext, LinkedFile pdf) {
+    public Optional<List<Document>> readLinkedPdf(
+        BibDatabaseContext databaseContext,
+        LinkedFile pdf
+    ) {
         Optional<Path> pdfPath = pdf.findIn(databaseContext, filePreferences);
         if (pdfPath.isPresent()) {
             return Optional.of(readPdfContents(pdf, pdfPath.get()));
@@ -82,30 +90,50 @@ public Optional<List<Document>> readLinkedPdf(BibDatabaseContext databaseContext
      * @return A List of Documents with the (meta)data. Can be empty if there is a problem reading the LinkedFile.
      */
     public List<Document> readLinkedPdfs(BibDatabaseContext databaseContext) {
-        return entry.getFiles().stream()
-                    .map(pdf -> readLinkedPdf(databaseContext, pdf))
-                    .filter(Optional::isPresent)
-                    .map(Optional::get)
-                    .flatMap(List::stream)
-                    .collect(Collectors.toList());
+        return entry
+            .getFiles()
+            .stream()
+            .map(pdf -> readLinkedPdf(databaseContext, pdf))
+            .filter(Optional::isPresent)
+            .map(Optional::get)
+            .flatMap(List::stream)
+            .collect(Collectors.toList());
     }
 
-    private List<Document> readPdfContents(LinkedFile pdf, Path resolvedPdfPath) {
+    private List<Document> readPdfContents(
+        LinkedFile pdf,
+        Path resolvedPdfPath
+    ) {
         List<Document> pages = new ArrayList<>();
-        try (PDDocument pdfDocument = Loader.loadPDF(resolvedPdfPath.toFile())) {
-                for (int pageNumber = 0; pageNumber < pdfDocument.getNumberOfPages(); pageNumber++) {
-                    Document newDocument = new Document();
-                    addIdentifiers(newDocument, pdf.getLink());
-                    addMetaData(newDocument, resolvedPdfPath, pageNumber);
-                    try {
-                        addContentIfNotEmpty(pdfDocument, newDocument, pageNumber);
-                    } catch (IOException e) {
-                        LOGGER.warn("Could not read page {} of  {}", pageNumber, resolvedPdfPath.toAbsolutePath(), e);
-                    }
-                    pages.add(newDocument);
+        try (
+            PDDocument pdfDocument = Loader.loadPDF(resolvedPdfPath.toFile())
+        ) {
+            for (
+                int pageNumber = 0;
+                pageNumber < pdfDocument.getNumberOfPages();
+                pageNumber++
+            ) {
+                Document newDocument = new Document();
+                addIdentifiers(newDocument, pdf.getLink());
+                addMetaData(newDocument, resolvedPdfPath, pageNumber);
+                try {
+                    addContentIfNotEmpty(pdfDocument, newDocument, pageNumber);
+                } catch (IOException e) {
+                    LOGGER.warn(
+                        "Could not read page {} of  {}",
+                        pageNumber,
+                        resolvedPdfPath.toAbsolutePath(),
+                        e
+                    );
                 }
+                pages.add(newDocument);
+            }
         } catch (IOException e) {
-            LOGGER.warn("Could not read {}", resolvedPdfPath.toAbsolutePath(), e);
+            LOGGER.warn(
+                "Could not read {}",
+                resolvedPdfPath.toAbsolutePath(),
+                e
+            );
         }
         if (pages.isEmpty()) {
             Document newDocument = new Document();
@@ -116,17 +144,34 @@ private List<Document> readPdfContents(LinkedFile pdf, Path resolvedPdfPath) {
         return pages;
     }
 
-    private void addMetaData(Document newDocument, Path resolvedPdfPath, int pageNumber) {
+    private void addMetaData(
+        Document newDocument,
+        Path resolvedPdfPath,
+        int pageNumber
+    ) {
         try {
-            BasicFileAttributes attributes = Files.readAttributes(resolvedPdfPath, BasicFileAttributes.class);
-            addStringField(newDocument, MODIFIED, String.valueOf(attributes.lastModifiedTime().to(TimeUnit.SECONDS)));
+            BasicFileAttributes attributes = Files.readAttributes(
+                resolvedPdfPath,
+                BasicFileAttributes.class
+            );
+            addStringField(
+                newDocument,
+                MODIFIED,
+                String.valueOf(
+                    attributes.lastModifiedTime().to(TimeUnit.SECONDS)
+                )
+            );
         } catch (IOException e) {
             LOGGER.error("Could not read timestamp for {}", resolvedPdfPath, e);
         }
         addStringField(newDocument, PAGE_NUMBER, String.valueOf(pageNumber));
     }
 
-    private void addStringField(Document newDocument, String field, String value) {
+    private void addStringField(
+        Document newDocument,
+        String field,
+        String value
+    ) {
         if (!isValidField(value)) {
             return;
         }
@@ -138,11 +183,19 @@ private boolean isValidField(String value) {
     }
 
     public static String mergeLines(String text) {
-        String mergedHyphenNewlines = HYPHEN_LINEBREAK_PATTERN.matcher(text).replaceAll("");
-        return LINEBREAK_WITHOUT_PERIOD_PATTERN.matcher(mergedHyphenNewlines).replaceAll("$1 ");
+        String mergedHyphenNewlines = HYPHEN_LINEBREAK_PATTERN
+            .matcher(text)
+            .replaceAll("");
+        return LINEBREAK_WITHOUT_PERIOD_PATTERN
+            .matcher(mergedHyphenNewlines)
+            .replaceAll("$1 ");
     }
 
-    private void addContentIfNotEmpty(PDDocument pdfDocument, Document newDocument, int pageNumber) throws IOException {
+    private void addContentIfNotEmpty(
+        PDDocument pdfDocument,
+        Document newDocument,
+        int pageNumber
+    ) throws IOException {
         PDFTextStripper pdfTextStripper = new PDFTextStripper();
         pdfTextStripper.setLineSeparator("\n");
         pdfTextStripper.setStartPage(pageNumber);
@@ -150,12 +203,25 @@ private void addContentIfNotEmpty(PDDocument pdfDocument, Document newDocument,
 
         String pdfContent = pdfTextStripper.getText(pdfDocument);
         if (StringUtil.isNotBlank(pdfContent)) {
-            newDocument.add(new TextField(CONTENT, mergeLines(pdfContent), Field.Store.YES));
+            newDocument.add(
+                new TextField(CONTENT, mergeLines(pdfContent), Field.Store.YES)
+            );
         }
         PDPage page = pdfDocument.getPage(pageNumber);
-        List<String> annotations = page.getAnnotations().stream().filter(annotation -> annotation.getContents() != null).map(PDAnnotation::getContents).collect(Collectors.toList());
+        List<String> annotations = page
+            .getAnnotations()
+            .stream()
+            .filter(annotation -> annotation.getContents() != null)
+            .map(PDAnnotation::getContents)
+            .collect(Collectors.toList());
         if (!annotations.isEmpty()) {
-            newDocument.add(new TextField(ANNOTATIONS, annotations.stream().collect(Collectors.joining("\n")), Field.Store.YES));
+            newDocument.add(
+                new TextField(
+                    ANNOTATIONS,
+                    annotations.stream().collect(Collectors.joining("\n")),
+                    Field.Store.YES
+                )
+            );
         }
     }
 
diff --git a/src/main/java/org/jabref/logic/pdf/search/indexing/IndexingTaskManager.java b/src/main/java/org/jabref/logic/pdf/search/indexing/IndexingTaskManager.java
index ba8bc5e5d12..581f40f4ed7 100644
--- a/src/main/java/org/jabref/logic/pdf/search/indexing/IndexingTaskManager.java
+++ b/src/main/java/org/jabref/logic/pdf/search/indexing/IndexingTaskManager.java
@@ -4,7 +4,6 @@
 import java.util.Queue;
 import java.util.Set;
 import java.util.concurrent.ConcurrentLinkedQueue;
-
 import org.jabref.gui.util.BackgroundTask;
 import org.jabref.gui.util.DefaultTaskExecutor;
 import org.jabref.gui.util.TaskExecutor;
@@ -55,8 +54,17 @@ protected Void call() throws Exception {
 
     private void updateProgress() {
         DefaultTaskExecutor.runInJavaFXThread(() -> {
-            updateMessage(Localization.lang("%0 of %1 linked files added to the index", numOfIndexedFiles, numOfIndexedFiles + taskQueue.size()));
-            updateProgress(numOfIndexedFiles, numOfIndexedFiles + taskQueue.size());
+            updateMessage(
+                Localization.lang(
+                    "%0 of %1 linked files added to the index",
+                    numOfIndexedFiles,
+                    numOfIndexedFiles + taskQueue.size()
+                )
+            );
+            updateProgress(
+                numOfIndexedFiles,
+                numOfIndexedFiles + taskQueue.size()
+            );
         });
     }
 
@@ -89,11 +97,16 @@ public void createIndex(PdfIndexer indexer) {
         enqueueTask(indexer::createIndex);
     }
 
-    public void updateIndex(PdfIndexer indexer, BibDatabaseContext databaseContext) {
+    public void updateIndex(
+        PdfIndexer indexer,
+        BibDatabaseContext databaseContext
+    ) {
         Set<String> pathsToRemove = indexer.getListOfFilePaths();
         for (BibEntry entry : databaseContext.getEntries()) {
             for (LinkedFile file : entry.getFiles()) {
-                enqueueTask(() -> indexer.addToIndex(entry, file, databaseContext));
+                enqueueTask(() ->
+                    indexer.addToIndex(entry, file, databaseContext)
+                );
                 pathsToRemove.remove(file.getLink());
             }
         }
@@ -102,17 +115,30 @@ public void updateIndex(PdfIndexer indexer, BibDatabaseContext databaseContext)
         }
     }
 
-    public void addToIndex(PdfIndexer indexer, BibEntry entry, BibDatabaseContext databaseContext) {
+    public void addToIndex(
+        PdfIndexer indexer,
+        BibEntry entry,
+        BibDatabaseContext databaseContext
+    ) {
         addToIndex(indexer, entry, entry.getFiles(), databaseContext);
     }
 
-    public void addToIndex(PdfIndexer indexer, BibEntry entry, List<LinkedFile> linkedFiles, BibDatabaseContext databaseContext) {
+    public void addToIndex(
+        PdfIndexer indexer,
+        BibEntry entry,
+        List<LinkedFile> linkedFiles,
+        BibDatabaseContext databaseContext
+    ) {
         for (LinkedFile file : linkedFiles) {
             enqueueTask(() -> indexer.addToIndex(entry, file, databaseContext));
         }
     }
 
-    public void removeFromIndex(PdfIndexer indexer, BibEntry entry, List<LinkedFile> linkedFiles) {
+    public void removeFromIndex(
+        PdfIndexer indexer,
+        BibEntry entry,
+        List<LinkedFile> linkedFiles
+    ) {
         for (LinkedFile file : linkedFiles) {
             enqueueTask(() -> indexer.removeFromIndex(file.getLink()));
         }
@@ -123,6 +149,8 @@ public void removeFromIndex(PdfIndexer indexer, BibEntry entry) {
     }
 
     public void updateDatabaseName(String name) {
-        DefaultTaskExecutor.runInJavaFXThread(() -> this.titleProperty().set(Localization.lang("Indexing for %0", name)));
+        DefaultTaskExecutor.runInJavaFXThread(() ->
+            this.titleProperty().set(Localization.lang("Indexing for %0", name))
+        );
     }
 }
diff --git a/src/main/java/org/jabref/logic/pdf/search/indexing/PdfIndexer.java b/src/main/java/org/jabref/logic/pdf/search/indexing/PdfIndexer.java
index d10a6c0221a..daaa9a5dd16 100644
--- a/src/main/java/org/jabref/logic/pdf/search/indexing/PdfIndexer.java
+++ b/src/main/java/org/jabref/logic/pdf/search/indexing/PdfIndexer.java
@@ -9,16 +9,6 @@
 import java.util.Optional;
 import java.util.Set;
 import java.util.concurrent.TimeUnit;
-
-import org.jabref.gui.LibraryTab;
-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.pdf.search.EnglishStemAnalyzer;
-import org.jabref.model.pdf.search.SearchFieldConstants;
-import org.jabref.preferences.FilePreferences;
-
 import org.apache.lucene.document.Document;
 import org.apache.lucene.index.DirectoryReader;
 import org.apache.lucene.index.IndexNotFoundException;
@@ -33,6 +23,14 @@
 import org.apache.lucene.search.TopDocs;
 import org.apache.lucene.store.Directory;
 import org.apache.lucene.store.NIOFSDirectory;
+import org.jabref.gui.LibraryTab;
+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.pdf.search.EnglishStemAnalyzer;
+import org.jabref.model.pdf.search.SearchFieldConstants;
+import org.jabref.preferences.FilePreferences;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -41,20 +39,31 @@
  */
 public class PdfIndexer {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(LibraryTab.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(
+        LibraryTab.class
+    );
 
     private final Directory directoryToIndex;
     private BibDatabaseContext databaseContext;
 
     private final FilePreferences filePreferences;
 
-    public PdfIndexer(Directory indexDirectory, FilePreferences filePreferences) {
+    public PdfIndexer(
+        Directory indexDirectory,
+        FilePreferences filePreferences
+    ) {
         this.directoryToIndex = indexDirectory;
         this.filePreferences = filePreferences;
     }
 
-    public static PdfIndexer of(BibDatabaseContext databaseContext, FilePreferences filePreferences) throws IOException {
-        return new PdfIndexer(new NIOFSDirectory(databaseContext.getFulltextIndexPath()), filePreferences);
+    public static PdfIndexer of(
+        BibDatabaseContext databaseContext,
+        FilePreferences filePreferences
+    ) throws IOException {
+        return new PdfIndexer(
+            new NIOFSDirectory(databaseContext.getFulltextIndexPath()),
+            filePreferences
+        );
     }
 
     /**
@@ -63,7 +72,13 @@ public static PdfIndexer of(BibDatabaseContext databaseContext, FilePreferences
      */
     public void createIndex() {
         // Create new index by creating IndexWriter but not writing anything.
-        try (IndexWriter indexWriter = new IndexWriter(directoryToIndex, new IndexWriterConfig(new EnglishStemAnalyzer()).setOpenMode(IndexWriterConfig.OpenMode.CREATE))) {
+        try (
+            IndexWriter indexWriter = new IndexWriter(
+                directoryToIndex,
+                new IndexWriterConfig(new EnglishStemAnalyzer())
+                    .setOpenMode(IndexWriterConfig.OpenMode.CREATE)
+            )
+        ) {
             // empty comment for checkstyle
         } catch (IOException e) {
             LOGGER.warn("Could not create new Index!", e);
@@ -92,7 +107,11 @@ public void addToIndex(BibEntry entry, BibDatabaseContext databaseContext) {
      * @param entry a bibtex entry to link the pdf files to
      * @param databaseContext the associated BibDatabaseContext
      */
-    public void addToIndex(BibEntry entry, List<LinkedFile> linkedFiles, BibDatabaseContext databaseContext) {
+    public void addToIndex(
+        BibEntry entry,
+        List<LinkedFile> linkedFiles,
+        BibDatabaseContext databaseContext
+    ) {
         for (LinkedFile linkedFile : linkedFiles) {
             addToIndex(entry, linkedFile, databaseContext);
         }
@@ -104,7 +123,11 @@ public void addToIndex(BibEntry entry, List<LinkedFile> linkedFiles, BibDatabase
      * @param entry a bibtex entry
      * @param linkedFile the link to the pdf files
      */
-    public void addToIndex(BibEntry entry, LinkedFile linkedFile, BibDatabaseContext databaseContext) {
+    public void addToIndex(
+        BibEntry entry,
+        LinkedFile linkedFile,
+        BibDatabaseContext databaseContext
+    ) {
         if (databaseContext != null) {
             this.databaseContext = databaseContext;
         }
@@ -119,11 +142,16 @@ public void addToIndex(BibEntry entry, LinkedFile linkedFile, BibDatabaseContext
      * @param linkedFilePath the path to the file to be removed
      */
     public void removeFromIndex(String linkedFilePath) {
-        try (IndexWriter indexWriter = new IndexWriter(
+        try (
+            IndexWriter indexWriter = new IndexWriter(
                 directoryToIndex,
-                new IndexWriterConfig(
-                        new EnglishStemAnalyzer()).setOpenMode(IndexWriterConfig.OpenMode.CREATE_OR_APPEND))) {
-            indexWriter.deleteDocuments(new Term(SearchFieldConstants.PATH, linkedFilePath));
+                new IndexWriterConfig(new EnglishStemAnalyzer())
+                    .setOpenMode(IndexWriterConfig.OpenMode.CREATE_OR_APPEND)
+            )
+        ) {
+            indexWriter.deleteDocuments(
+                new Term(SearchFieldConstants.PATH, linkedFilePath)
+            );
             indexWriter.commit();
         } catch (IOException e) {
             LOGGER.warn("Could not initialize the IndexWriter!", e);
@@ -171,10 +199,16 @@ public void flushIndex() {
      * @param linkedFile the file to write to the index
      */
     private void addToIndex(BibEntry entry, LinkedFile linkedFile) {
-        if (linkedFile.isOnlineLink() || !StandardFileType.PDF.getName().equals(linkedFile.getFileType())) {
+        if (
+            linkedFile.isOnlineLink() ||
+            !StandardFileType.PDF.getName().equals(linkedFile.getFileType())
+        ) {
             return;
         }
-        Optional<Path> resolvedPath = linkedFile.findIn(databaseContext, filePreferences);
+        Optional<Path> resolvedPath = linkedFile.findIn(
+            databaseContext,
+            filePreferences
+        );
         if (resolvedPath.isEmpty()) {
             LOGGER.debug("Could not find {}", linkedFile.getLink());
             return;
@@ -184,16 +218,28 @@ private void addToIndex(BibEntry entry, LinkedFile linkedFile) {
             // Check if a document with this path is already in the index
             try (IndexReader reader = DirectoryReader.open(directoryToIndex)) {
                 IndexSearcher searcher = new IndexSearcher(reader);
-                TermQuery query = new TermQuery(new Term(SearchFieldConstants.PATH, linkedFile.getLink()));
+                TermQuery query = new TermQuery(
+                    new Term(SearchFieldConstants.PATH, linkedFile.getLink())
+                );
                 TopDocs topDocs = searcher.search(query, 1);
                 // If a document was found, check if is less current than the one in the FS
                 if (topDocs.scoreDocs.length > 0) {
                     Document doc = reader.document(topDocs.scoreDocs[0].doc);
-                    long indexModificationTime = Long.parseLong(doc.getField(SearchFieldConstants.MODIFIED).stringValue());
+                    long indexModificationTime = Long.parseLong(
+                        doc
+                            .getField(SearchFieldConstants.MODIFIED)
+                            .stringValue()
+                    );
 
-                    BasicFileAttributes attributes = Files.readAttributes(resolvedPath.get(), BasicFileAttributes.class);
+                    BasicFileAttributes attributes = Files.readAttributes(
+                        resolvedPath.get(),
+                        BasicFileAttributes.class
+                    );
 
-                    if (indexModificationTime >= attributes.lastModifiedTime().to(TimeUnit.SECONDS)) {
+                    if (
+                        indexModificationTime >=
+                        attributes.lastModifiedTime().to(TimeUnit.SECONDS)
+                    ) {
                         return;
                     }
                 }
@@ -201,17 +247,31 @@ private void addToIndex(BibEntry entry, LinkedFile linkedFile) {
                 // if there is no index yet, don't need to check anything!
             }
             // If no document was found, add the new one
-            Optional<List<Document>> pages = new DocumentReader(entry, filePreferences).readLinkedPdf(this.databaseContext, linkedFile);
+            Optional<List<Document>> pages = new DocumentReader(
+                entry,
+                filePreferences
+            )
+                .readLinkedPdf(this.databaseContext, linkedFile);
             if (pages.isPresent()) {
-                try (IndexWriter indexWriter = new IndexWriter(directoryToIndex,
-                                                               new IndexWriterConfig(
-                                                                                     new EnglishStemAnalyzer()).setOpenMode(IndexWriterConfig.OpenMode.CREATE_OR_APPEND))) {
+                try (
+                    IndexWriter indexWriter = new IndexWriter(
+                        directoryToIndex,
+                        new IndexWriterConfig(new EnglishStemAnalyzer())
+                            .setOpenMode(
+                                IndexWriterConfig.OpenMode.CREATE_OR_APPEND
+                            )
+                    )
+                ) {
                     indexWriter.addDocuments(pages.get());
                     indexWriter.commit();
                 }
             }
         } catch (IOException e) {
-            LOGGER.warn("Could not add the document {} to the index!", linkedFile.getLink(), e);
+            LOGGER.warn(
+                "Could not add the document {} to the index!",
+                linkedFile.getLink(),
+                e
+            );
         }
     }
 
@@ -228,7 +288,9 @@ public Set<String> getListOfFilePaths() {
             TopDocs allDocs = searcher.search(query, Integer.MAX_VALUE);
             for (ScoreDoc scoreDoc : allDocs.scoreDocs) {
                 Document doc = reader.document(scoreDoc.doc);
-                paths.add(doc.getField(SearchFieldConstants.PATH).stringValue());
+                paths.add(
+                    doc.getField(SearchFieldConstants.PATH).stringValue()
+                );
             }
         } catch (IOException e) {
             return paths;
diff --git a/src/main/java/org/jabref/logic/pdf/search/retrieval/PdfSearcher.java b/src/main/java/org/jabref/logic/pdf/search/retrieval/PdfSearcher.java
index 2fd7e54e5b0..79630af9f0a 100644
--- a/src/main/java/org/jabref/logic/pdf/search/retrieval/PdfSearcher.java
+++ b/src/main/java/org/jabref/logic/pdf/search/retrieval/PdfSearcher.java
@@ -1,17 +1,11 @@
 package org.jabref.logic.pdf.search.retrieval;
 
+import static org.jabref.model.pdf.search.SearchFieldConstants.PDF_FIELDS;
+
 import java.io.IOException;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Objects;
-
-import org.jabref.gui.LibraryTab;
-import org.jabref.model.database.BibDatabaseContext;
-import org.jabref.model.pdf.search.EnglishStemAnalyzer;
-import org.jabref.model.pdf.search.PdfSearchResults;
-import org.jabref.model.pdf.search.SearchResult;
-import org.jabref.model.strings.StringUtil;
-
 import org.apache.lucene.index.DirectoryReader;
 import org.apache.lucene.index.IndexReader;
 import org.apache.lucene.queryparser.classic.MultiFieldQueryParser;
@@ -22,14 +16,20 @@
 import org.apache.lucene.search.TopDocs;
 import org.apache.lucene.store.Directory;
 import org.apache.lucene.store.NIOFSDirectory;
+import org.jabref.gui.LibraryTab;
+import org.jabref.model.database.BibDatabaseContext;
+import org.jabref.model.pdf.search.EnglishStemAnalyzer;
+import org.jabref.model.pdf.search.PdfSearchResults;
+import org.jabref.model.pdf.search.SearchResult;
+import org.jabref.model.strings.StringUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import static org.jabref.model.pdf.search.SearchFieldConstants.PDF_FIELDS;
-
 public final class PdfSearcher {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(LibraryTab.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(
+        LibraryTab.class
+    );
 
     private final Directory indexDirectory;
 
@@ -37,8 +37,11 @@ private PdfSearcher(Directory indexDirectory) {
         this.indexDirectory = indexDirectory;
     }
 
-    public static PdfSearcher of(BibDatabaseContext databaseContext) throws IOException {
-        return new PdfSearcher(new NIOFSDirectory(databaseContext.getFulltextIndexPath()));
+    public static PdfSearcher of(BibDatabaseContext databaseContext)
+        throws IOException {
+        return new PdfSearcher(
+            new NIOFSDirectory(databaseContext.getFulltextIndexPath())
+        );
     }
 
     /**
@@ -48,32 +51,54 @@ public static PdfSearcher of(BibDatabaseContext databaseContext) throws IOExcept
      * @param maxHits      number of maximum search results, must be positive
      * @return a result set of all documents that have matches in any fields
      */
-    public PdfSearchResults search(final String searchString, final int maxHits)
-        throws IOException {
-        if (StringUtil.isBlank(Objects.requireNonNull(searchString, "The search string was null!"))) {
+    public PdfSearchResults search(
+        final String searchString,
+        final int maxHits
+    ) throws IOException {
+        if (
+            StringUtil.isBlank(
+                Objects.requireNonNull(
+                    searchString,
+                    "The search string was null!"
+                )
+            )
+        ) {
             return new PdfSearchResults();
         }
         if (maxHits <= 0) {
-            throw new IllegalArgumentException("Must be called with at least 1 maxHits, was" + maxHits);
+            throw new IllegalArgumentException(
+                "Must be called with at least 1 maxHits, was" + maxHits
+            );
         }
 
         List<SearchResult> resultDocs = new LinkedList<>();
 
         if (!DirectoryReader.indexExists(indexDirectory)) {
-            LOGGER.debug("Index directory {} does not yet exist", indexDirectory);
+            LOGGER.debug(
+                "Index directory {} does not yet exist",
+                indexDirectory
+            );
             return new PdfSearchResults();
         }
 
         try (IndexReader reader = DirectoryReader.open(indexDirectory)) {
             IndexSearcher searcher = new IndexSearcher(reader);
-            Query query = new MultiFieldQueryParser(PDF_FIELDS, new EnglishStemAnalyzer()).parse(searchString);
+            Query query = new MultiFieldQueryParser(
+                PDF_FIELDS,
+                new EnglishStemAnalyzer()
+            )
+                .parse(searchString);
             TopDocs results = searcher.search(query, maxHits);
             for (ScoreDoc scoreDoc : results.scoreDocs) {
                 resultDocs.add(new SearchResult(searcher, query, scoreDoc));
             }
             return new PdfSearchResults(resultDocs);
         } catch (ParseException e) {
-            LOGGER.warn("Could not parse query: '{}'!\n{}", searchString, e.getMessage());
+            LOGGER.warn(
+                "Could not parse query: '{}'!\n{}",
+                searchString,
+                e.getMessage()
+            );
             return new PdfSearchResults();
         }
     }
diff --git a/src/main/java/org/jabref/logic/preferences/DOIPreferences.java b/src/main/java/org/jabref/logic/preferences/DOIPreferences.java
index fe5a0af238a..0b60ff968d0 100644
--- a/src/main/java/org/jabref/logic/preferences/DOIPreferences.java
+++ b/src/main/java/org/jabref/logic/preferences/DOIPreferences.java
@@ -6,6 +6,7 @@
 import javafx.beans.property.StringProperty;
 
 public class DOIPreferences {
+
     private BooleanProperty useCustom;
     private final StringProperty defaultBaseURI;
 
diff --git a/src/main/java/org/jabref/logic/preferences/FetcherApiKey.java b/src/main/java/org/jabref/logic/preferences/FetcherApiKey.java
index e982dd0e58f..61fa741992b 100644
--- a/src/main/java/org/jabref/logic/preferences/FetcherApiKey.java
+++ b/src/main/java/org/jabref/logic/preferences/FetcherApiKey.java
@@ -6,6 +6,7 @@
 import javafx.beans.property.StringProperty;
 
 public class FetcherApiKey {
+
     private final StringProperty name;
     private final BooleanProperty use;
     private final StringProperty key;
diff --git a/src/main/java/org/jabref/logic/preferences/OwnerPreferences.java b/src/main/java/org/jabref/logic/preferences/OwnerPreferences.java
index d411dbddfb1..e8ef88f8df3 100644
--- a/src/main/java/org/jabref/logic/preferences/OwnerPreferences.java
+++ b/src/main/java/org/jabref/logic/preferences/OwnerPreferences.java
@@ -6,13 +6,16 @@
 import javafx.beans.property.StringProperty;
 
 public class OwnerPreferences {
+
     private final BooleanProperty useOwner;
     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 a8d676cbc0f..0d6c63b3e0c 100644
--- a/src/main/java/org/jabref/logic/preferences/TimestampPreferences.java
+++ b/src/main/java/org/jabref/logic/preferences/TimestampPreferences.java
@@ -3,13 +3,12 @@
 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;
 
 public class TimestampPreferences {
+
     private final BooleanProperty addCreationDate;
     private final BooleanProperty addModificationDate;
 
@@ -18,7 +17,13 @@ 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,9 @@ 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 de3f327782c..d78079ce836 100644
--- a/src/main/java/org/jabref/logic/preview/PreviewLayout.java
+++ b/src/main/java/org/jabref/logic/preview/PreviewLayout.java
@@ -1,7 +1,6 @@
 package org.jabref.logic.preview;
 
 import java.util.Locale;
-
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.entry.BibEntry;
 
@@ -9,7 +8,6 @@
  * Used for displaying a rendered entry in the UI. Due to historical reasons, "rendering" is called "layout".
  */
 public interface PreviewLayout {
-
     String generatePreview(BibEntry entry, BibDatabaseContext databaseContext);
 
     String getDisplayName();
@@ -17,6 +15,8 @@ public interface PreviewLayout {
     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 4b4c09347e5..1b531bdc2db 100644
--- a/src/main/java/org/jabref/logic/protectedterms/ProtectedTermsList.java
+++ b/src/main/java/org/jabref/logic/protectedterms/ProtectedTermsList.java
@@ -8,15 +8,15 @@
 import java.nio.file.StandardOpenOption;
 import java.util.List;
 import java.util.Objects;
-
 import org.jabref.logic.util.OS;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 public class ProtectedTermsList implements Comparable<ProtectedTermsList> {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(ProtectedTermsList.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(
+        ProtectedTermsList.class
+    );
 
     private String description;
     private final List<String> termsList;
@@ -24,14 +24,23 @@ 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);
         this.internalList = internalList;
     }
 
-    public ProtectedTermsList(String description, List<String> termList, String location) {
+    public ProtectedTermsList(
+        String description,
+        List<String> termList,
+        String location
+    ) {
         this(description, termList, location, false);
     }
 
@@ -86,8 +95,13 @@ 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 +117,10 @@ 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 9f74b266ead..7dbc2c0b23f 100644
--- a/src/main/java/org/jabref/logic/protectedterms/ProtectedTermsLoader.java
+++ b/src/main/java/org/jabref/logic/protectedterms/ProtectedTermsLoader.java
@@ -10,25 +10,38 @@
 import java.util.Objects;
 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<>();
+    private static final Map<String, Supplier<String>> INTERNAL_LISTS =
+        new HashMap<>();
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(ProtectedTermsLoader.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(
+        ProtectedTermsLoader.class
+    );
 
     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,28 +58,61 @@ 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);
+                LOGGER.warn(
+                    "Protected terms resource '{}' is no longer available.",
+                    filename
+                );
             }
         }
         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));
+                if (
+                    !preferences
+                        .getEnabledInternalTermLists()
+                        .contains(filename)
+                ) {
+                    mainList.add(
+                        readProtectedTermsListFromResource(
+                            filename,
+                            INTERNAL_LISTS.get(filename).get(),
+                            false
+                        )
+                    );
                 }
             } else {
-                LOGGER.warn("Protected terms resource '{}' is no longer available.", filename);
+                LOGGER.warn(
+                    "Protected terms resource '{}' is no longer available.",
+                    filename
+                );
             }
         }
 
         // Check if any new internal lists have emerged
         for (String filename : INTERNAL_LISTS.keySet()) {
-            if (!preferences.getEnabledInternalTermLists().contains(filename)
-                    && !preferences.getDisabledInternalTermLists().contains(filename)) {
+            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
+                );
             }
         }
 
@@ -82,13 +128,18 @@ public void update(ProtectedTermsPreferences preferences) {
 
         for (String filename : preferences.getDisabledExternalTermLists()) {
             if (!preferences.getEnabledExternalTermLists().contains(filename)) {
-                mainList.add(readProtectedTermsListFromFile(Path.of(filename), false));
+                mainList.add(
+                    readProtectedTermsListFromFile(Path.of(filename), false)
+                );
             }
         }
     }
 
     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);
@@ -112,17 +163,32 @@ public List<String> getProtectedTerms() {
         return new ArrayList<>(result);
     }
 
-    public void addProtectedTermsListFromFile(String fileName, boolean enabled) {
-        mainList.add(readProtectedTermsListFromFile(Path.of(fileName), enabled));
+    public void addProtectedTermsListFromFile(
+        String fileName,
+        boolean enabled
+    ) {
+        mainList.add(
+            readProtectedTermsListFromFile(Path.of(fileName), 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);
     }
 
-    public static ProtectedTermsList readProtectedTermsListFromFile(Path path, boolean enabled) {
+    public static ProtectedTermsList readProtectedTermsListFromFile(
+        Path path,
+        boolean enabled
+    ) {
         LOGGER.debug("Reading term list from file {}", path);
         ProtectedTermsParser parser = new ProtectedTermsParser();
         parser.readTermsFromFile(Objects.requireNonNull(path));
@@ -134,17 +200,28 @@ 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);
         return resultingList;
     }
 
-    public ProtectedTermsList addNewProtectedTermsList(String newDescription, String newLocation) {
+    public ProtectedTermsList addNewProtectedTermsList(
+        String newDescription,
+        String newLocation
+    ) {
         return addNewProtectedTermsList(newDescription, newLocation, true);
     }
 }
diff --git a/src/main/java/org/jabref/logic/protectedterms/ProtectedTermsParser.java b/src/main/java/org/jabref/logic/protectedterms/ProtectedTermsParser.java
index e0e9a54dc33..884973a27ad 100644
--- a/src/main/java/org/jabref/logic/protectedterms/ProtectedTermsParser.java
+++ b/src/main/java/org/jabref/logic/protectedterms/ProtectedTermsParser.java
@@ -10,9 +10,7 @@
 import java.util.Objects;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
-
 import org.jabref.logic.l10n.Localization;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -21,16 +19,31 @@
  */
 public class ProtectedTermsParser {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(ProtectedTermsParser.class);
+    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) {
+    public void readTermsFromResource(
+        String resourceFileName,
+        String descriptionString
+    ) {
         try {
-            Path path = Path.of(Objects.requireNonNull(ProtectedTermsLoader.class.getResource(Objects.requireNonNull(resourceFileName))).toURI());
+            Path path = Path.of(
+                Objects
+                    .requireNonNull(
+                        ProtectedTermsLoader.class.getResource(
+                                Objects.requireNonNull(resourceFileName)
+                            )
+                    )
+                    .toURI()
+            );
             readTermsList(path);
             description = descriptionString;
             location = resourceFileName;
@@ -50,7 +63,12 @@ private void readTermsList(Path path) {
             return;
         }
         try (Stream<String> lines = Files.lines(path, StandardCharsets.UTF_8)) {
-            this.terms.addAll(lines.map(this::setDescription).filter(Objects::nonNull).collect(Collectors.toList()));
+            this.terms.addAll(
+                    lines
+                        .map(this::setDescription)
+                        .filter(Objects::nonNull)
+                        .collect(Collectors.toList())
+                );
         } catch (IOException e) {
             LOGGER.warn("Could not read terms from file {}", path, e);
         }
@@ -69,8 +87,16 @@ private String setDescription(String line) {
         return line;
     }
 
-    public ProtectedTermsList getProtectTermsList(boolean enabled, boolean internal) {
-        ProtectedTermsList termList = new ProtectedTermsList(description, terms, location, internal);
+    public ProtectedTermsList getProtectTermsList(
+        boolean enabled,
+        boolean 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 0efc19a524c..9c315bafad6 100644
--- a/src/main/java/org/jabref/logic/protectedterms/ProtectedTermsPreferences.java
+++ b/src/main/java/org/jabref/logic/protectedterms/ProtectedTermsPreferences.java
@@ -1,7 +1,6 @@
 package org.jabref.logic.protectedterms;
 
 import java.util.List;
-
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableList;
 
@@ -12,14 +11,20 @@ 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) {
-        this.enabledInternalTermLists = FXCollections.observableArrayList(enabledInternalTermLists);
-        this.disabledInternalTermLists = FXCollections.observableArrayList(disabledInternalTermLists);
-        this.enabledExternalTermLists = FXCollections.observableArrayList(enabledExternalTermLists);
-        this.disabledExternalTermLists = FXCollections.observableArrayList(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.enabledExternalTermLists =
+            FXCollections.observableArrayList(enabledExternalTermLists);
+        this.disabledExternalTermLists =
+            FXCollections.observableArrayList(disabledExternalTermLists);
     }
 
     public ObservableList<String> getEnabledInternalTermLists() {
diff --git a/src/main/java/org/jabref/logic/remote/Protocol.java b/src/main/java/org/jabref/logic/remote/Protocol.java
index eb610e17ec7..affc3e18ff3 100644
--- a/src/main/java/org/jabref/logic/remote/Protocol.java
+++ b/src/main/java/org/jabref/logic/remote/Protocol.java
@@ -7,9 +7,7 @@
 import java.net.URLDecoder;
 import java.net.URLEncoder;
 import java.nio.charset.StandardCharsets;
-
 import javafx.util.Pair;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -18,9 +16,12 @@
  * Every message is terminated with '\0'.
  */
 public class Protocol implements AutoCloseable {
+
     public static final String IDENTIFIER = "jabref";
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(Protocol.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(
+        Protocol.class
+    );
 
     private final Socket socket;
     private final ObjectOutputStream out;
@@ -39,7 +40,8 @@ public void sendMessage(RemoteMessage type) throws IOException {
         out.flush();
     }
 
-    public void sendMessage(RemoteMessage type, Object argument) 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)
@@ -47,7 +49,8 @@ public void sendMessage(RemoteMessage type, Object argument) throws IOException
         if (type == RemoteMessage.SEND_COMMAND_LINE_ARGUMENTS) {
             String[] encodedArgs = ((String[]) argument).clone();
             for (int i = 0; i < encodedArgs.length; i++) {
-                encodedArgs[i] = URLEncoder.encode(encodedArgs[i], StandardCharsets.UTF_8);
+                encodedArgs[i] =
+                    URLEncoder.encode(encodedArgs[i], StandardCharsets.UTF_8);
             }
             out.writeObject(encodedArgs);
         } else {
@@ -67,12 +70,19 @@ 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);
diff --git a/src/main/java/org/jabref/logic/remote/RemoteMessage.java b/src/main/java/org/jabref/logic/remote/RemoteMessage.java
index 7bb78a7a27d..199c45fb774 100644
--- a/src/main/java/org/jabref/logic/remote/RemoteMessage.java
+++ b/src/main/java/org/jabref/logic/remote/RemoteMessage.java
@@ -16,5 +16,5 @@ public enum RemoteMessage {
     /**
      * Request server to identify itself. No message content.
      */
-    PING
+    PING,
 }
diff --git a/src/main/java/org/jabref/logic/remote/RemotePreferences.java b/src/main/java/org/jabref/logic/remote/RemotePreferences.java
index 5d06d28261b..24a00d2caee 100644
--- a/src/main/java/org/jabref/logic/remote/RemotePreferences.java
+++ b/src/main/java/org/jabref/logic/remote/RemotePreferences.java
@@ -2,7 +2,6 @@
 
 import java.net.InetAddress;
 import java.net.UnknownHostException;
-
 import javafx.beans.property.BooleanProperty;
 import javafx.beans.property.IntegerProperty;
 import javafx.beans.property.SimpleBooleanProperty;
diff --git a/src/main/java/org/jabref/logic/remote/RemoteUtil.java b/src/main/java/org/jabref/logic/remote/RemoteUtil.java
index 66e3a543c65..67edd521e4c 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 6844547eef0..0cde9817898 100644
--- a/src/main/java/org/jabref/logic/remote/client/RemoteClient.java
+++ b/src/main/java/org/jabref/logic/remote/client/RemoteClient.java
@@ -3,20 +3,19 @@
 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;
 
 public class RemoteClient {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(RemoteClient.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(
+        RemoteClient.class
+    );
 
     private static final int TIMEOUT = 1000;
     private final int port;
@@ -30,11 +29,17 @@ 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;
             }
@@ -52,11 +57,19 @@ public boolean ping() {
      */
     public boolean sendCommandLineArguments(String[] args) {
         try (Protocol protocol = openNewConnection()) {
-            protocol.sendMessage(RemoteMessage.SEND_COMMAND_LINE_ARGUMENTS, args);
+            protocol.sendMessage(
+                RemoteMessage.SEND_COMMAND_LINE_ARGUMENTS,
+                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;
         }
     }
@@ -64,7 +77,10 @@ public boolean sendCommandLineArguments(String[] args) {
     private Protocol openNewConnection() throws IOException {
         Socket socket = new Socket();
         socket.setSoTimeout(TIMEOUT);
-        socket.connect(new InetSocketAddress(RemotePreferences.getIpAddress(), port), TIMEOUT);
+        socket.connect(
+            new InetSocketAddress(RemotePreferences.getIpAddress(), port),
+            TIMEOUT
+        );
         return new Protocol(socket);
     }
 }
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 bfa0e8829da..a959c311d5e 100644
--- a/src/main/java/org/jabref/logic/remote/server/RemoteListenerServer.java
+++ b/src/main/java/org/jabref/logic/remote/server/RemoteListenerServer.java
@@ -4,18 +4,18 @@
 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;
 
 public class RemoteListenerServer implements Runnable {
-    private static final Logger LOGGER = LoggerFactory.getLogger(RemoteListenerServer.class);
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(
+        RemoteListenerServer.class
+    );
 
     private static final int BACKLOG = 1;
 
@@ -24,8 +24,10 @@ public class RemoteListenerServer implements Runnable {
     private final RemoteMessageHandler messageHandler;
     private final ServerSocket serverSocket;
 
-    public RemoteListenerServer(RemoteMessageHandler messageHandler, int port) throws IOException {
-        this.serverSocket = new ServerSocket(port, BACKLOG, RemotePreferences.getIpAddress());
+    public RemoteListenerServer(RemoteMessageHandler messageHandler, int port)
+        throws IOException {
+        this.serverSocket =
+            new ServerSocket(port, BACKLOG, RemotePreferences.getIpAddress());
         this.messageHandler = messageHandler;
     }
 
@@ -37,8 +39,13 @@ public void run() {
                     socket.setSoTimeout(TIMEOUT);
 
                     try (Protocol protocol = new Protocol(socket)) {
-                        Pair<RemoteMessage, Object> input = protocol.receiveMessage();
-                        handleMessage(protocol, input.getKey(), input.getValue());
+                        Pair<RemoteMessage, Object> input =
+                            protocol.receiveMessage();
+                        handleMessage(
+                            protocol,
+                            input.getKey(),
+                            input.getValue()
+                        );
                     }
                 } catch (SocketException ex) {
                     return;
@@ -51,7 +58,11 @@ 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);
@@ -61,7 +72,10 @@ 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 2cc5483e150..60b1e492449 100644
--- a/src/main/java/org/jabref/logic/remote/server/RemoteListenerServerManager.java
+++ b/src/main/java/org/jabref/logic/remote/server/RemoteListenerServerManager.java
@@ -2,9 +2,7 @@
 
 import java.io.IOException;
 import java.net.BindException;
-
 import org.jabref.gui.JabRefExecutorService;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -18,7 +16,9 @@
  */
 public class RemoteListenerServerManager implements AutoCloseable {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(RemoteListenerServerManager.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(
+        RemoteListenerServerManager.class
+    );
 
     private RemoteListenerServerThread remoteServerThread;
 
@@ -39,10 +39,14 @@ public void open(RemoteMessageHandler messageHandler, int port) {
         }
 
         try {
-            remoteServerThread = new RemoteListenerServerThread(messageHandler, port);
+            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);
@@ -57,13 +61,18 @@ public boolean isOpen() {
     public void start() {
         if (isOpen() && isNotStartedBefore()) {
             // threads can only be started when in state NEW
-            JabRefExecutorService.INSTANCE.startRemoteThread(remoteServerThread);
+            JabRefExecutorService.INSTANCE.startRemoteThread(
+                remoteServerThread
+            );
         }
     }
 
     public boolean isNotStartedBefore() {
         // threads can only be started when in state NEW
-        return (remoteServerThread == null) || (remoteServerThread.getState() == Thread.State.NEW);
+        return (
+            (remoteServerThread == null) ||
+            (remoteServerThread.getState() == Thread.State.NEW)
+        );
     }
 
     public void openAndStart(RemoteMessageHandler messageHandler, int port) {
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 431a45b0727..431b85241bb 100644
--- a/src/main/java/org/jabref/logic/remote/server/RemoteListenerServerThread.java
+++ b/src/main/java/org/jabref/logic/remote/server/RemoteListenerServerThread.java
@@ -1,7 +1,6 @@
 package org.jabref.logic.remote.server;
 
 import java.io.IOException;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -10,11 +9,16 @@
  */
 public class RemoteListenerServerThread extends Thread {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(RemoteListenerServerThread.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(
+        RemoteListenerServerThread.class
+    );
 
     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/remote/server/RemoteMessageHandler.java b/src/main/java/org/jabref/logic/remote/server/RemoteMessageHandler.java
index a90a35e953f..398046563aa 100644
--- a/src/main/java/org/jabref/logic/remote/server/RemoteMessageHandler.java
+++ b/src/main/java/org/jabref/logic/remote/server/RemoteMessageHandler.java
@@ -2,6 +2,5 @@
 
 @FunctionalInterface
 public interface RemoteMessageHandler {
-
     void handleCommandLineArguments(String[] message);
 }
diff --git a/src/main/java/org/jabref/logic/search/DatabaseSearcher.java b/src/main/java/org/jabref/logic/search/DatabaseSearcher.java
index 422d8d4d35c..eae2b950a93 100644
--- a/src/main/java/org/jabref/logic/search/DatabaseSearcher.java
+++ b/src/main/java/org/jabref/logic/search/DatabaseSearcher.java
@@ -4,17 +4,17 @@
 import java.util.List;
 import java.util.Objects;
 import java.util.stream.Collectors;
-
 import org.jabref.model.database.BibDatabase;
 import org.jabref.model.database.BibDatabases;
 import org.jabref.model.entry.BibEntry;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 public class DatabaseSearcher {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(DatabaseSearcher.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(
+        DatabaseSearcher.class
+    );
     private final SearchQuery query;
 
     private final BibDatabase database;
@@ -32,7 +32,11 @@ public List<BibEntry> getMatches() {
             return Collections.emptyList();
         }
 
-        List<BibEntry> matchEntries = database.getEntries().stream().filter(query::isMatch).collect(Collectors.toList());
+        List<BibEntry> matchEntries = database
+            .getEntries()
+            .stream()
+            .filter(query::isMatch)
+            .collect(Collectors.toList());
         return BibDatabases.purgeEmptyEntries(matchEntries);
     }
 }
diff --git a/src/main/java/org/jabref/logic/search/SearchQuery.java b/src/main/java/org/jabref/logic/search/SearchQuery.java
index 4dc9fd40a58..ef369fb9890 100644
--- a/src/main/java/org/jabref/logic/search/SearchQuery.java
+++ b/src/main/java/org/jabref/logic/search/SearchQuery.java
@@ -8,7 +8,6 @@
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
-
 import org.jabref.logic.l10n.Localization;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.search.SearchMatcher;
@@ -39,14 +38,17 @@ String format(String regex) {
         JAVASCRIPT {
             @Override
             String format(String regex) {
-                return JAVASCRIPT_ESCAPED_CHARS_PATTERN.matcher(regex).replaceAll("\\\\$0");
+                return JAVASCRIPT_ESCAPED_CHARS_PATTERN
+                    .matcher(regex)
+                    .replaceAll("\\\\$0");
             }
         };
 
         /**
          * 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.
@@ -61,7 +63,10 @@ String format(String regex) {
     private EnumSet<SearchRules.SearchFlags> searchFlags;
     private final SearchRule rule;
 
-    public SearchQuery(String query, EnumSet<SearchRules.SearchFlags> searchFlags) {
+    public SearchQuery(
+        String query,
+        EnumSet<SearchRules.SearchFlags> searchFlags
+    ) {
         this.query = Objects.requireNonNull(query);
         this.searchFlags = searchFlags;
         this.rule = SearchRules.getSearchRuleByQuery(query, searchFlags);
@@ -69,7 +74,12 @@ public SearchQuery(String query, EnumSet<SearchRules.SearchFlags> searchFlags) {
 
     @Override
     public String toString() {
-        return String.format("\"%s\" (%s, %s)", getQuery(), getCaseSensitiveDescription(), getRegularExpressionDescription());
+        return String.format(
+            "\"%s\" (%s, %s)",
+            getQuery(),
+            getCaseSensitiveDescription(),
+            getRegularExpressionDescription()
+        );
     }
 
     @Override
@@ -102,10 +112,12 @@ private String getRegularExpressionDescription() {
     }
 
     public String localize() {
-        return String.format("\"%s\" (%s, %s)",
-                getQuery(),
-                getLocalizedCaseSensitiveDescription(),
-                getLocalizedRegularExpressionDescription());
+        return String.format(
+            "\"%s\" (%s, %s)",
+            getQuery(),
+            getLocalizedCaseSensitiveDescription(),
+            getLocalizedRegularExpressionDescription()
+        );
     }
 
     private String getLocalizedCaseSensitiveDescription() {
@@ -182,12 +194,16 @@ private Optional<Pattern> joinWordsToPattern(EscapeMode escapeMode) {
             // Reformat string when we are looking for a literal match
             joiner = joiner.map(escapeMode::format);
         }
-        String searchPattern = joiner.collect(Collectors.joining(")|(", "(", ")"));
+        String searchPattern = joiner.collect(
+            Collectors.joining(")|(", "(", ")")
+        );
 
         if (searchFlags.contains(SearchRules.SearchFlags.CASE_SENSITIVE)) {
             return Optional.of(Pattern.compile(searchPattern));
         } else {
-            return Optional.of(Pattern.compile(searchPattern, Pattern.CASE_INSENSITIVE));
+            return Optional.of(
+                Pattern.compile(searchPattern, Pattern.CASE_INSENSITIVE)
+            );
         }
     }
 
diff --git a/src/main/java/org/jabref/logic/shared/DBMSConnection.java b/src/main/java/org/jabref/logic/shared/DBMSConnection.java
index a37f1d9532d..ebf2aa2ab9a 100644
--- a/src/main/java/org/jabref/logic/shared/DBMSConnection.java
+++ b/src/main/java/org/jabref/logic/shared/DBMSConnection.java
@@ -5,21 +5,22 @@
 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);
+    private static final Logger LOGGER = LoggerFactory.getLogger(
+        DBMSConnection.class
+    );
 
     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();
         }
@@ -30,11 +31,20 @@ public DBMSConnection(DBMSConnectionProperties connectionProperties) throws SQLE
             // 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();
-            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: " + e.getMessage() + " - Error code: " + e.getErrorCode());
+            LOGGER.error(
+                "Could not connect to database: " +
+                e.getMessage() +
+                " - Error code: " +
+                e.getErrorCode()
+            );
             throw e;
         }
     }
@@ -61,7 +71,12 @@ public static Set<DBMSType> getAvailableDBMSTypes() {
                 dbmsTypes.add(dbms);
             } catch (ClassNotFoundException e) {
                 // In case that the driver is not available do not perform tests for this system.
-                LOGGER.info(Localization.lang("%0 driver not available.", dbms.toString()));
+                LOGGER.info(
+                    Localization.lang(
+                        "%0 driver not available.",
+                        dbms.toString()
+                    )
+                );
             }
         }
         return dbmsTypes;
diff --git a/src/main/java/org/jabref/logic/shared/DBMSConnectionProperties.java b/src/main/java/org/jabref/logic/shared/DBMSConnectionProperties.java
index c41c19d6167..d86d074361c 100644
--- a/src/main/java/org/jabref/logic/shared/DBMSConnectionProperties.java
+++ b/src/main/java/org/jabref/logic/shared/DBMSConnectionProperties.java
@@ -5,10 +5,8 @@
 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;
 
@@ -17,7 +15,9 @@
  */
 public class DBMSConnectionProperties implements DatabaseConnectionProperties {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(DBMSConnectionProperties.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(
+        DBMSConnectionProperties.class
+    );
 
     private DBMSType type;
     private String host;
@@ -37,25 +37,42 @@ public class DBMSConnectionProperties implements DatabaseConnectionProperties {
      */
     public DBMSConnectionProperties(SharedDatabasePreferences prefs) {
         if (prefs.getType().isPresent()) {
-            Optional<DBMSType> dbmsType = DBMSType.fromString(prefs.getType().get());
+            Optional<DBMSType> dbmsType = DBMSType.fromString(
+                prefs.getType().get()
+            );
             if (dbmsType.isPresent()) {
                 this.type = dbmsType.get();
             }
         }
 
         prefs.getHost().ifPresent(theHost -> this.host = theHost);
-        prefs.getPort().ifPresent(thePort -> this.port = Integer.parseInt(thePort));
+        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
+            .getKeyStoreFile()
+            .ifPresent(theKeystore -> this.keyStore = theKeystore);
+        prefs
+            .getServerTimezone()
+            .ifPresent(theServerTimezone ->
+                this.serverTimezone = theServerTimezone
+            );
         this.useSSL = prefs.isUseSSL();
 
         if (prefs.getUser().isPresent()) {
             this.user = prefs.getUser().get();
             if (prefs.getPassword().isPresent()) {
                 try {
-                    this.password = new Password(prefs.getPassword().get().toCharArray(), prefs.getUser().get()).decrypt();
-                } catch (UnsupportedEncodingException | GeneralSecurityException e) {
+                    this.password =
+                        new Password(
+                            prefs.getPassword().get().toCharArray(),
+                            prefs.getUser().get()
+                        )
+                            .decrypt();
+                } catch (
+                    UnsupportedEncodingException | GeneralSecurityException e
+                ) {
                     LOGGER.error("Could not decrypt password", e);
                 }
             }
@@ -67,8 +84,18 @@ 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) {
+    DBMSConnectionProperties(
+        DBMSType type,
+        String host,
+        int port,
+        String database,
+        String user,
+        String password,
+        boolean useSSL,
+        boolean allowPublicKeyRetrieval,
+        String serverTimezone,
+        String keyStore
+    ) {
         this.type = type;
         this.host = host;
         this.port = port;
@@ -146,7 +173,10 @@ public Properties asProperties() {
             props.setProperty("useSSL", Boolean.toString(useSSL));
         }
         if (allowPublicKeyRetrieval) {
-            props.setProperty("allowPublicKeyRetrieval", Boolean.toString(allowPublicKeyRetrieval));
+            props.setProperty(
+                "allowPublicKeyRetrieval",
+                Boolean.toString(allowPublicKeyRetrieval)
+            );
         }
         return props;
     }
@@ -169,14 +199,19 @@ public boolean equals(Object obj) {
             return false;
         }
         DBMSConnectionProperties properties = (DBMSConnectionProperties) obj;
-        return Objects.equals(type, properties.getType())
-                && this.host.equalsIgnoreCase(properties.getHost())
-                && Objects.equals(port, properties.getPort())
-                && Objects.equals(database, properties.getDatabase())
-                && Objects.equals(user, properties.getUser())
-                && Objects.equals(useSSL, properties.isUseSSL())
-                && Objects.equals(allowPublicKeyRetrieval, properties.isAllowPublicKeyRetrieval())
-                && Objects.equals(serverTimezone, properties.getServerTimezone());
+        return (
+            Objects.equals(type, properties.getType()) &&
+            this.host.equalsIgnoreCase(properties.getHost()) &&
+            Objects.equals(port, properties.getPort()) &&
+            Objects.equals(database, properties.getDatabase()) &&
+            Objects.equals(user, properties.getUser()) &&
+            Objects.equals(useSSL, properties.isUseSSL()) &&
+            Objects.equals(
+                allowPublicKeyRetrieval,
+                properties.isAllowPublicKeyRetrieval()
+            ) &&
+            Objects.equals(serverTimezone, properties.getServerTimezone())
+        );
     }
 
     @Override
@@ -186,11 +221,13 @@ public int hashCode() {
 
     @Override
     public boolean isValid() {
-        return Objects.nonNull(type)
-                && Objects.nonNull(host)
-                && Objects.nonNull(port)
-                && Objects.nonNull(database)
-                && Objects.nonNull(user)
-                && Objects.nonNull(password);
+        return (
+            Objects.nonNull(type) &&
+            Objects.nonNull(host) &&
+            Objects.nonNull(port) &&
+            Objects.nonNull(database) &&
+            Objects.nonNull(user) &&
+            Objects.nonNull(password)
+        );
     }
 }
diff --git a/src/main/java/org/jabref/logic/shared/DBMSConnectionPropertiesBuilder.java b/src/main/java/org/jabref/logic/shared/DBMSConnectionPropertiesBuilder.java
index 3547358dee8..b4024b4dc6a 100644
--- a/src/main/java/org/jabref/logic/shared/DBMSConnectionPropertiesBuilder.java
+++ b/src/main/java/org/jabref/logic/shared/DBMSConnectionPropertiesBuilder.java
@@ -1,6 +1,7 @@
 package org.jabref.logic.shared;
 
 public class DBMSConnectionPropertiesBuilder {
+
     private DBMSType type;
     private String host;
     private int port = -1;
@@ -47,12 +48,16 @@ public DBMSConnectionPropertiesBuilder setUseSSL(boolean useSSL) {
         return this;
     }
 
-    public DBMSConnectionPropertiesBuilder setAllowPublicKeyRetrieval(boolean allowPublicKeyRetrieval) {
+    public DBMSConnectionPropertiesBuilder setAllowPublicKeyRetrieval(
+        boolean allowPublicKeyRetrieval
+    ) {
         this.allowPublicKeyRetrieval = allowPublicKeyRetrieval;
         return this;
     }
 
-    public DBMSConnectionPropertiesBuilder setServerTimezone(String serverTimezone) {
+    public DBMSConnectionPropertiesBuilder setServerTimezone(
+        String serverTimezone
+    ) {
         this.serverTimezone = serverTimezone;
         return this;
     }
@@ -66,6 +71,17 @@ public DBMSConnectionProperties createDBMSConnectionProperties() {
         if (port == -1) {
             port = type.getDefaultPort();
         }
-        return new DBMSConnectionProperties(type, host, port, database, user, password, useSSL, allowPublicKeyRetrieval, serverTimezone, keyStore);
+        return new DBMSConnectionProperties(
+            type,
+            host,
+            port,
+            database,
+            user,
+            password,
+            useSSL,
+            allowPublicKeyRetrieval,
+            serverTimezone,
+            keyStore
+        );
     }
 }
diff --git a/src/main/java/org/jabref/logic/shared/DBMSProcessor.java b/src/main/java/org/jabref/logic/shared/DBMSProcessor.java
index cb5c1de9ddc..019336ce625 100644
--- a/src/main/java/org/jabref/logic/shared/DBMSProcessor.java
+++ b/src/main/java/org/jabref/logic/shared/DBMSProcessor.java
@@ -1,5 +1,6 @@
 package org.jabref.logic.shared;
 
+import com.google.common.collect.Lists;
 import java.sql.Connection;
 import java.sql.DatabaseMetaData;
 import java.sql.PreparedStatement;
@@ -17,7 +18,6 @@
 import java.util.Set;
 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;
@@ -26,8 +26,6 @@
 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;
 
@@ -38,7 +36,9 @@ public abstract class DBMSProcessor {
 
     public static final String PROCESSOR_ID = UUID.randomUUID().toString();
 
-    protected static final Logger LOGGER = LoggerFactory.getLogger(DBMSProcessor.class);
+    protected static final Logger LOGGER = LoggerFactory.getLogger(
+        DBMSProcessor.class
+    );
 
     protected final Connection connection;
 
@@ -62,13 +62,18 @@ 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;
                 }
             }
         } else {
-            databasePassesIntegrityCheck = checkTableAvailability("ENTRY", "FIELD", "METADATA");
+            databasePassesIntegrityCheck =
+                checkTableAvailability("ENTRY", "FIELD", "METADATA");
         }
         return databasePassesIntegrityCheck;
     }
@@ -80,13 +85,14 @@ public boolean checkBaseIntegrity() throws SQLException {
      */
     public boolean databaseIsAtMostJabRef35() throws SQLException {
         return checkTableAvailability(
-                "ENTRIES",
-                "ENTRY_GROUP",
-                "ENTRY_TYPES",
-                "GROUPS",
-                "GROUP_TYPES",
-                "JABREF_DATABASE",
-                "STRINGS"); // old tables
+            "ENTRIES",
+            "ENTRY_GROUP",
+            "ENTRY_TYPES",
+            "GROUPS",
+            "GROUP_TYPES",
+            "JABREF_DATABASE",
+            "STRINGS"
+        ); // old tables
     }
 
     /**
@@ -95,7 +101,8 @@ public boolean databaseIsAtMostJabRef35() throws SQLException {
      * @param tableNames Table names to be checked
      * @return <code>true</code> if <b>all</b> given tables are present, else <code>false</code>.
      */
-    protected boolean checkTableAvailability(String... tableNames) throws SQLException {
+    protected boolean checkTableAvailability(String... tableNames)
+        throws SQLException {
         List<String> requiredTables = new ArrayList<>();
         for (String name : tableNames) {
             requiredTables.add(name.toUpperCase(Locale.ENGLISH));
@@ -103,9 +110,18 @@ 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);
+                String tableName = databaseMetaDataResultSet
+                    .getString("TABLE_NAME")
+                    .toUpperCase(Locale.ROOT);
                 requiredTables.remove(tableName); // Remove matching tables to check requiredTables for emptiness
             }
             return requiredTables.isEmpty();
@@ -164,7 +180,9 @@ public void insertEntry(BibEntry bibEntry) {
      * @param bibEntries List of {@link BibEntry} to be inserted
      */
     public void insertEntries(List<BibEntry> bibEntries) {
-        List<BibEntry> notYetExistingEntries = getNotYetExistingEntries(bibEntries);
+        List<BibEntry> notYetExistingEntries = getNotYetExistingEntries(
+            bibEntries
+        );
         if (notYetExistingEntries.isEmpty()) {
             return;
         }
@@ -179,27 +197,40 @@ public void insertEntries(List<BibEntry> bibEntries) {
      */
     protected void insertIntoEntryTable(List<BibEntry> bibEntries) {
         StringBuilder insertIntoEntryQuery = new StringBuilder()
-                .append("INSERT INTO ")
-                .append(escape_Table("ENTRY"))
-                .append("(")
-                .append(escape("TYPE"))
-                .append(") VALUES(?)");
+            .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"})) {
+        insertIntoEntryQuery.append(
+            ", (?)".repeat(Math.max(0, (bibEntries.size() - 1)))
+        );
+
+        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.setString(
+                    i + 1,
+                    bibEntries.get(i).getType().getName()
+                );
             }
             preparedEntryStatement.executeUpdate();
 
-            try (ResultSet generatedKeys = preparedEntryStatement.getGeneratedKeys()) {
+            try (
+                ResultSet generatedKeys = preparedEntryStatement.getGeneratedKeys()
+            ) {
                 // 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();
-                    bibEntry.getSharedBibEntryData().setSharedID(generatedKeys.getInt(1));
+                    bibEntry
+                        .getSharedBibEntryData()
+                        .setSharedID(generatedKeys.getInt(1));
                 }
                 if (generatedKeys.next()) {
                     LOGGER.error("Error: Some shared IDs left unassigned");
@@ -218,19 +249,23 @@ 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)) {
+            try (
+                ResultSet resultSet = connection
+                    .createStatement()
+                    .executeQuery(selectQuery)
+            ) {
                 while (resultSet.next()) {
                     int id = resultSet.getInt("SHARED_ID");
                     remoteIds.add(id);
@@ -239,9 +274,12 @@ 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 +291,21 @@ 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());
+            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(?, ?, ?)");
+                .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();
@@ -276,15 +316,49 @@ 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())) {
+            insertFieldQuery.append(
+                ", (?, ?, ?)".repeat(Math.max(0, (numFields - 1)))
+            );
+            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 entryIndex = 0;
+                    entryIndex < fields.size();
+                    entryIndex++
+                ) {
+                    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;
                     }
                 }
@@ -301,11 +375,14 @@ protected void insertIntoFieldTable(List<BibEntry> bibEntries) {
      * @param localBibEntry {@link BibEntry} affected by changes
      * @throws SQLException in case of error
      */
-    public void updateEntry(BibEntry localBibEntry) throws OfflineLockException, SQLException {
+    public void updateEntry(BibEntry localBibEntry)
+        throws OfflineLockException, SQLException {
         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 +394,40 @@ 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 +446,32 @@ 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();
             }
         }
@@ -380,7 +481,8 @@ private void removeSharedFieldsByDifference(BibEntry localBibEntry, BibEntry sha
      * Helping method. Inserts a key-value pair into FIELD table for every field if not existing. Otherwise only an
      * update is performed.
      */
-    private void insertOrUpdateFields(BibEntry localBibEntry) throws SQLException {
+    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!
             Optional<String> valueOptional = localBibEntry.getField(field);
@@ -389,53 +491,86 @@ private void insertOrUpdateFields(BibEntry localBibEntry) throws SQLException {
                 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());
-
-                try (ResultSet selectFieldResultSet = preparedSelectFieldStatement.executeQuery()) {
+                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.setString(
+                                2,
+                                field.getName()
+                            );
+                            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());
-                            preparedFieldStatement.setString(2, field.getName());
+                        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();
                         }
@@ -456,17 +591,24 @@ public void removeEntries(List<BibEntry> bibEntries) {
             return;
         }
         StringBuilder query = new StringBuilder()
-                .append("DELETE FROM ")
-                .append(escape_Table("ENTRY"))
-                .append(" WHERE ")
-                .append(escape("SHARED_ID"))
-                .append(" IN (");
+            .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())) {
+        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) {
@@ -479,7 +621,9 @@ public void removeEntries(List<BibEntry> bibEntries) {
      * @return instance of {@link BibEntry}
      */
     public Optional<BibEntry> getSharedEntry(int sharedID) {
-        List<BibEntry> sharedEntries = getSharedEntries(Collections.singletonList(sharedID));
+        List<BibEntry> sharedEntries = getSharedEntries(
+            Collections.singletonList(sharedID)
+        );
         if (sharedEntries.isEmpty()) {
             return Optional.empty();
         } else {
@@ -493,7 +637,9 @@ public Optional<BibEntry> getSharedEntry(int sharedID) {
      *
      * @param sharedIDs the list of Ids to filter. If list is empty, then no filter is applied
      */
-    public List<BibEntry> partitionAndGetSharedEntries(List<Integer> sharedIDs) {
+    public List<BibEntry> partitionAndGetSharedEntries(
+        List<Integer> sharedIDs
+    ) {
         List<List<Integer>> partitions = Lists.partition(sharedIDs, 500);
         List<BibEntry> result = new ArrayList<>();
 
@@ -514,37 +660,62 @@ public List<BibEntry> getSharedEntries(List<Integer> sharedIDs) {
         List<BibEntry> sharedEntries = new ArrayList<>();
 
         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"));
+        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"));
 
         if (!sharedIDs.isEmpty()) {
-            query.append(" where ")
-                 .append(escape("SHARED_ID")).append(" in (")
-                 .append("?, ".repeat(sharedIDs.size() - 1))
-                 .append("?)");
+            query
+                .append(" where ")
+                .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())) {
+        try (
+            PreparedStatement preparedStatement = connection.prepareStatement(
+                query.toString()
+            )
+        ) {
             for (int i = 0; i < sharedIDs.size(); i++) {
                 preparedStatement.setInt(i + 1, sharedIDs.get(i));
             }
 
-            try (ResultSet selectEntryResultSet = preparedStatement.executeQuery()) {
+            try (
+                ResultSet selectEntryResultSet = preparedStatement.executeQuery()
+            ) {
                 BibEntry bibEntry = null;
                 int lastId = -1;
                 while (selectEntryResultSet.next()) {
@@ -552,9 +723,19 @@ 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 +743,13 @@ 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 +771,22 @@ 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");
-
-        try (ResultSet selectEntryResultSet = connection.createStatement().executeQuery(selectEntryQuery)) {
+        String selectEntryQuery =
+            "SELECT * FROM " +
+            escape_Table("ENTRY") +
+            " ORDER BY " +
+            escape("SHARED_ID");
+
+        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,9 +801,16 @@ 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"));
+                data.put(
+                    resultSet.getString("KEY"),
+                    resultSet.getString("VALUE")
+                );
             }
         } catch (SQLException e) {
             LOGGER.error("SQL Error", e);
@@ -622,33 +824,42 @@ public Map<String, String> getSharedMetaData() {
      *
      * @param data JabRef meta data as map
      */
-    public void setSharedMetaData(Map<String, String> data) throws SQLException {
+    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(" = ?");
+            .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(?, ?)");
+            .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();
@@ -665,7 +876,9 @@ public void setSharedMetaData(Map<String, String> data) throws SQLException {
     /**
      * Returns a new instance of the abstract type {@link DBMSProcessor}
      */
-    public static DBMSProcessor getProcessorInstance(DatabaseConnection connection) {
+    public static DBMSProcessor getProcessorInstance(
+        DatabaseConnection connection
+    ) {
         DBMSType type = connection.getProperties().getType();
         if (type == DBMSType.MYSQL) {
             return new MySQLProcessor(connection);
@@ -686,7 +899,9 @@ 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 3a3d6658877..3e8e3bf72ca 100644
--- a/src/main/java/org/jabref/logic/shared/DBMSSynchronizer.java
+++ b/src/main/java/org/jabref/logic/shared/DBMSSynchronizer.java
@@ -1,5 +1,7 @@
 package org.jabref.logic.shared;
 
+import com.google.common.eventbus.EventBus;
+import com.google.common.eventbus.Subscribe;
 import java.sql.Connection;
 import java.sql.SQLException;
 import java.util.ArrayList;
@@ -9,7 +11,6 @@
 import java.util.Optional;
 import java.util.Set;
 import java.util.stream.Collectors;
-
 import org.jabref.logic.citationkeypattern.GlobalCitationKeyPattern;
 import org.jabref.logic.exporter.BibDatabaseWriter;
 import org.jabref.logic.exporter.MetaDataSerializer;
@@ -30,9 +31,6 @@
 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;
 
@@ -42,7 +40,9 @@
  */
 public class DBMSSynchronizer implements DatabaseSynchronizer {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(DBMSSynchronizer.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(
+        DBMSSynchronizer.class
+    );
 
     private DBMSProcessor dbmsProcessor;
     private String dbName;
@@ -56,15 +56,20 @@ public class DBMSSynchronizer implements DatabaseSynchronizer {
     private final FileUpdateMonitor fileMonitor;
     private Optional<BibEntry> lastEntryChanged;
 
-    public DBMSSynchronizer(BibDatabaseContext bibDatabaseContext, Character keywordSeparator,
-                            GlobalCitationKeyPattern globalCiteKeyPattern, FileUpdateMonitor fileMonitor) {
+    public DBMSSynchronizer(
+        BibDatabaseContext bibDatabaseContext,
+        Character keywordSeparator,
+        GlobalCitationKeyPattern globalCiteKeyPattern,
+        FileUpdateMonitor fileMonitor
+    ) {
         this.bibDatabaseContext = Objects.requireNonNull(bibDatabaseContext);
         this.bibDatabase = bibDatabaseContext.getDatabase();
         this.metaData = bibDatabaseContext.getMetaData();
         this.fileMonitor = fileMonitor;
         this.eventBus = new EventBus();
         this.keywordSeparator = keywordSeparator;
-        this.globalCiteKeyPattern = Objects.requireNonNull(globalCiteKeyPattern);
+        this.globalCiteKeyPattern =
+            Objects.requireNonNull(globalCiteKeyPattern);
         this.lastEntryChanged = Optional.empty();
     }
 
@@ -93,7 +98,12 @@ 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()) {
+        if (
+            isPresentLocalBibEntry(bibEntry) &&
+            isEventSourceAccepted(event) &&
+            checkCurrentConnection() &&
+            !event.isFilteredOut()
+        ) {
             synchronizeLocalMetaData();
             pullWithLastEntry();
             synchronizeSharedEntry(bibEntry);
@@ -125,7 +135,10 @@ public void listen(EntriesRemovedEvent event) {
     @Subscribe
     public void listen(MetaDataChangedEvent event) {
         if (checkCurrentConnection()) {
-            synchronizeSharedMetaData(event.getMetaData(), globalCiteKeyPattern);
+            synchronizeSharedMetaData(
+                event.getMetaData(),
+                globalCiteKeyPattern
+            );
             synchronizeLocalDatabase();
             applyMetaData();
             dbmsProcessor.notifyClients();
@@ -172,35 +185,74 @@ public void synchronizeLocalDatabase() {
         }
 
         List<BibEntry> localEntries = bibDatabase.getEntries();
-        Map<Integer, Integer> idVersionMap = dbmsProcessor.getSharedIDVersionMapping();
+        Map<Integer, Integer> idVersionMap =
+            dbmsProcessor.getSharedIDVersionMapping();
 
         // remove old entries locally
         removeNotSharedEntries(localEntries, idVersionMap.keySet());
         List<Integer> entriesToInsertIntoLocalDatabase = new ArrayList<>();
         // compare versions and update local entry if needed
-        for (Map.Entry<Integer, Integer> idVersionEntry : idVersionMap.entrySet()) {
+        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)
-                                      );
+                            localEntry
+                                .getFields()
+                                .stream()
+                                .filter(field ->
+                                    !sharedEntry.get().hasField(field)
+                                )
+                                .forEach(field ->
+                                    localEntry.clearField(
+                                        field,
+                                        EntriesEventSource.SHARED
+                                    )
+                                );
                         }
                     }
                 }
@@ -212,7 +264,12 @@ 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
+            );
         }
     }
 
@@ -222,15 +279,25 @@ public void synchronizeLocalDatabase() {
      * @param localEntries List of {@link BibEntry} the entries should be removed from
      * @param sharedIDs    Set of all IDs which are present on shared database
      */
-    private void removeNotSharedEntries(List<BibEntry> localEntries, Set<Integer> sharedIDs) {
-        List<BibEntry> entriesToRemove =
-                localEntries.stream()
-                            .filter(localEntry -> !sharedIDs.contains(localEntry.getSharedBibEntryData().getSharedID()))
-                            .collect(Collectors.toList());
+    private void removeNotSharedEntries(
+        List<BibEntry> localEntries,
+        Set<Integer> sharedIDs
+    ) {
+        List<BibEntry> entriesToRemove = localEntries
+            .stream()
+            .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
-            bibDatabase.removeEntries(entriesToRemove, EntriesEventSource.SHARED);
+            bibDatabase.removeEntries(
+                entriesToRemove,
+                EntriesEventSource.SHARED
+            );
         }
     }
 
@@ -246,7 +313,13 @@ public void synchronizeSharedEntry(BibEntry bibEntry) {
             BibDatabaseWriter.applySaveActions(bibEntry, metaData); // 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);
         }
@@ -263,7 +336,11 @@ public void synchronizeLocalMetaData() {
         try {
             metaData.setEventPropagation(false);
             MetaDataParser parser = new MetaDataParser(fileMonitor);
-            parser.parse(metaData, dbmsProcessor.getSharedMetaData(), keywordSeparator);
+            parser.parse(
+                metaData,
+                dbmsProcessor.getSharedMetaData(),
+                keywordSeparator
+            );
             metaData.setEventPropagation(true);
         } catch (ParseException e) {
             LOGGER.error("Parse error", e);
@@ -273,12 +350,20 @@ public void synchronizeLocalMetaData() {
     /**
      * Synchronizes all shared meta data.
      */
-    private void synchronizeSharedMetaData(MetaData data, GlobalCitationKeyPattern globalCiteKeyPattern) {
+    private void synchronizeSharedMetaData(
+        MetaData data,
+        GlobalCitationKeyPattern 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);
         }
@@ -294,11 +379,21 @@ public void applyMetaData() {
         for (BibEntry bibEntry : bibDatabase.getEntries()) {
             try {
                 // synchronize only if changes were present
-                if (!BibDatabaseWriter.applySaveActions(bibEntry, metaData).isEmpty()) {
+                if (
+                    !BibDatabaseWriter
+                        .applySaveActions(bibEntry, metaData)
+                        .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);
             }
@@ -338,7 +433,10 @@ public void pullLastEntryChanges() {
      * Synchronizes local BibEntries and pulls remaining last entry changes
      */
     private void pullWithLastEntry() {
-        if (!lastEntryChanged.isEmpty() && isPresentLocalBibEntry(lastEntryChanged.get())) {
+        if (
+            !lastEntryChanged.isEmpty() &&
+            isPresentLocalBibEntry(lastEntryChanged.get())
+        ) {
             synchronizeSharedEntry(lastEntryChanged.get());
         }
         lastEntryChanged = Optional.empty();
@@ -373,11 +471,15 @@ 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 3896cf188b4..ebdec682a65 100644
--- a/src/main/java/org/jabref/logic/shared/DBMSType.java
+++ b/src/main/java/org/jabref/logic/shared/DBMSType.java
@@ -7,16 +7,31 @@
  * Enumerates all supported database systems (DBMS) by JabRef.
  */
 public enum DBMSType {
-    POSTGRESQL("PostgreSQL", "org.postgresql.Driver", "jdbc:postgresql://%s:%d/%s", 5432),
+    POSTGRESQL(
+        "PostgreSQL",
+        "org.postgresql.Driver",
+        "jdbc:postgresql://%s:%d/%s",
+        5432
+    ),
     MYSQL("MySQL", "org.mariadb.jdbc.Driver", "jdbc:mariadb://%s:%d/%s", 3306),
-    ORACLE("Oracle", "oracle.jdbc.driver.OracleDriver", "jdbc:oracle:thin:@%s:%d/%s", 1521);
+    ORACLE(
+        "Oracle",
+        "oracle.jdbc.driver.OracleDriver",
+        "jdbc:oracle:thin:@%s:%d/%s",
+        1521
+    );
 
     private final String type;
     private final String driverPath;
     private final String urlPattern;
     private final int defaultPort;
 
-    private DBMSType(String type, String driverPath, String urlPattern, int defaultPort) {
+    private DBMSType(
+        String type,
+        String driverPath,
+        String urlPattern,
+        int defaultPort
+    ) {
         this.type = type;
         this.driverPath = driverPath;
         this.urlPattern = urlPattern;
@@ -24,7 +39,10 @@ private DBMSType(String type, String driverPath, String urlPattern, int defaultP
     }
 
     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/DatabaseConnection.java b/src/main/java/org/jabref/logic/shared/DatabaseConnection.java
index 265d534a9a3..34dd984d516 100644
--- a/src/main/java/org/jabref/logic/shared/DatabaseConnection.java
+++ b/src/main/java/org/jabref/logic/shared/DatabaseConnection.java
@@ -3,7 +3,6 @@
 import java.sql.Connection;
 
 public interface DatabaseConnection {
-
     DatabaseConnectionProperties getProperties();
 
     Connection getConnection();
diff --git a/src/main/java/org/jabref/logic/shared/DatabaseConnectionProperties.java b/src/main/java/org/jabref/logic/shared/DatabaseConnectionProperties.java
index 6c3d44313a9..57fb4492065 100644
--- a/src/main/java/org/jabref/logic/shared/DatabaseConnectionProperties.java
+++ b/src/main/java/org/jabref/logic/shared/DatabaseConnectionProperties.java
@@ -1,7 +1,6 @@
 package org.jabref.logic.shared;
 
 public interface DatabaseConnectionProperties {
-
     DBMSType getType();
 
     String getDatabase();
diff --git a/src/main/java/org/jabref/logic/shared/DatabaseLocation.java b/src/main/java/org/jabref/logic/shared/DatabaseLocation.java
index 736594fc69a..1906b653e8d 100644
--- a/src/main/java/org/jabref/logic/shared/DatabaseLocation.java
+++ b/src/main/java/org/jabref/logic/shared/DatabaseLocation.java
@@ -7,5 +7,5 @@
  */
 public enum DatabaseLocation {
     LOCAL,
-    SHARED
+    SHARED,
 }
diff --git a/src/main/java/org/jabref/logic/shared/DatabaseSynchronizer.java b/src/main/java/org/jabref/logic/shared/DatabaseSynchronizer.java
index 1d30d31bfc6..009c2355684 100644
--- a/src/main/java/org/jabref/logic/shared/DatabaseSynchronizer.java
+++ b/src/main/java/org/jabref/logic/shared/DatabaseSynchronizer.java
@@ -3,7 +3,6 @@
 import org.jabref.model.entry.BibEntry;
 
 public interface DatabaseSynchronizer {
-
     String getDBName();
 
     void pullChanges();
@@ -12,7 +11,8 @@ public interface DatabaseSynchronizer {
 
     void registerListener(Object listener);
 
-    void openSharedDatabase(DatabaseConnection connection) throws DatabaseNotSupportedException;
+    void openSharedDatabase(DatabaseConnection connection)
+        throws DatabaseNotSupportedException;
 
     void synchronizeSharedEntry(BibEntry bibEntry);
 
diff --git a/src/main/java/org/jabref/logic/shared/MySQLProcessor.java b/src/main/java/org/jabref/logic/shared/MySQLProcessor.java
index 906fbaf50e8..314a8254cd0 100644
--- a/src/main/java/org/jabref/logic/shared/MySQLProcessor.java
+++ b/src/main/java/org/jabref/logic/shared/MySQLProcessor.java
@@ -2,7 +2,6 @@
 
 import java.sql.SQLException;
 import java.util.Map;
-
 import org.jabref.model.metadata.MetaData;
 
 /**
@@ -24,29 +23,39 @@ public MySQLProcessor(DatabaseConnection connection) {
      */
     @Override
     public void setUp() throws SQLException {
-        connection.createStatement().executeUpdate(
+        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)");
+                "`SHARED_ID` INT(11) NOT NULL PRIMARY KEY AUTO_INCREMENT, " +
+                "`TYPE` VARCHAR(255) NOT NULL, " +
+                "`VERSION` INT(11) DEFAULT 1)"
+            );
 
-        connection.createStatement().executeUpdate(
+        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)");
+                "`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(
+        connection
+            .createStatement()
+            .executeUpdate(
                 "CREATE TABLE IF NOT EXISTS `JABREF_METADATA` (" +
-                        "`KEY` varchar(255) NOT NULL," +
-                        "`VALUE` text NOT NULL)");
+                "`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,15 +65,39 @@ 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();
             }
 
-            metadata.put(MetaData.VERSION_DB_STRUCT, CURRENT_VERSION_DB_STRUCT.toString());
+            metadata.put(
+                MetaData.VERSION_DB_STRUCT,
+                CURRENT_VERSION_DB_STRUCT.toString()
+            );
             setSharedMetaData(metadata);
         }
     }
diff --git a/src/main/java/org/jabref/logic/shared/OracleProcessor.java b/src/main/java/org/jabref/logic/shared/OracleProcessor.java
index 3221a211808..d66fb72351a 100644
--- a/src/main/java/org/jabref/logic/shared/OracleProcessor.java
+++ b/src/main/java/org/jabref/logic/shared/OracleProcessor.java
@@ -9,16 +9,14 @@
 import java.util.Map;
 import java.util.Properties;
 import java.util.stream.Collectors;
-
+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 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 +42,52 @@ public OracleProcessor(DatabaseConnection connection) {
      */
     @Override
     public void setUp() throws SQLException {
-        connection.createStatement().executeUpdate(
+        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(
+                "\"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(
+                "\"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)");
+                "\"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!");
             }
@@ -83,7 +97,10 @@ public void setUp() throws SQLException {
 
         if (VERSION_DB_STRUCT_DEFAULT < CURRENT_VERSION_DB_STRUCT) {
             // We can to migrate from old table in new table
-            metadata.put(MetaData.VERSION_DB_STRUCT, CURRENT_VERSION_DB_STRUCT.toString());
+            metadata.put(
+                MetaData.VERSION_DB_STRUCT,
+                CURRENT_VERSION_DB_STRUCT.toString()
+            );
             setSharedMetaData(metadata);
         }
     }
@@ -112,23 +129,32 @@ public void startNotificationListener(DBMSSynchronizer dbmsSynchronizer) {
 
             Properties properties = new Properties();
             properties.setProperty(OracleConnection.DCN_NOTIFY_ROWIDS, "true");
-            properties.setProperty(OracleConnection.DCN_QUERY_CHANGE_NOTIFICATION, "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);
+                ((OracleStatement) statement).setDatabaseChangeRegistration(
+                        databaseChangeRegistration
+                    );
                 StringBuilder selectQuery = new StringBuilder()
-                        .append("SELECT 1 FROM ")
-                        .append(escape_Table("ENTRY"))
-                        .append(", ")
-                        .append(escape_Table("METADATA"));
+                    .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());
             }
         } catch (SQLException e) {
-            LOGGER.error("SQL Error during starting the notification listener", e);
+            LOGGER.error(
+                "SQL Error during starting the notification listener",
+                e
+            );
         }
     }
 
@@ -137,21 +163,31 @@ protected void insertIntoEntryTable(List<BibEntry> entries) {
         try {
             for (BibEntry entry : entries) {
                 String insertIntoEntryQuery =
-                        "INSERT INTO " +
-                                escape_Table("ENTRY") +
-                                "(" +
-                                escape("TYPE") +
-                                ") VALUES(?)";
-
-                try (PreparedStatement preparedEntryStatement = connection.prepareStatement(insertIntoEntryQuery,
-                        new String[]{"SHARED_ID"})) {
-
-                    preparedEntryStatement.setString(1, entry.getType().getName());
+                    "INSERT INTO " +
+                    escape_Table("ENTRY") +
+                    "(" +
+                    escape("TYPE") +
+                    ") VALUES(?)";
+
+                try (
+                    PreparedStatement preparedEntryStatement = connection.prepareStatement(
+                        insertIntoEntryQuery,
+                        new String[] { "SHARED_ID" }
+                    )
+                ) {
+                    preparedEntryStatement.setString(
+                        1,
+                        entry.getType().getName()
+                    );
                     preparedEntryStatement.executeUpdate();
 
-                    try (ResultSet generatedKeys = preparedEntryStatement.getGeneratedKeys()) {
+                    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 +202,69 @@ 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());
+            List<List<Field>> fields = bibEntries
+                .stream()
+                .map(entry -> new ArrayList<>(entry.getFields()))
+                .collect(Collectors.toList());
             StringBuilder insertFieldQuery = new StringBuilder()
-                    .append("INSERT ALL");
+                .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 entryIndex = 0;
+                    entryIndex < fields.size();
+                    entryIndex++
+                ) {
+                    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;
                     }
                 }
@@ -207,10 +278,15 @@ protected void insertIntoFieldTable(List<BibEntry> bibEntries) {
     @Override
     public void stopNotificationListener() {
         try {
-            oracleConnection.unregisterDatabaseChangeNotification(databaseChangeRegistration);
+            oracleConnection.unregisterDatabaseChangeNotification(
+                databaseChangeRegistration
+            );
             oracleConnection.close();
         } catch (SQLException e) {
-            LOGGER.error("SQL Error during stopping the notification listener", e);
+            LOGGER.error(
+                "SQL Error during stopping the notification listener",
+                e
+            );
         }
     }
 
diff --git a/src/main/java/org/jabref/logic/shared/PostgreSQLProcessor.java b/src/main/java/org/jabref/logic/shared/PostgreSQLProcessor.java
index 91b7b2c517b..5459bfbe0c3 100644
--- a/src/main/java/org/jabref/logic/shared/PostgreSQLProcessor.java
+++ b/src/main/java/org/jabref/logic/shared/PostgreSQLProcessor.java
@@ -6,12 +6,10 @@
 import java.sql.Statement;
 import java.util.List;
 import java.util.Map;
-
 import org.jabref.gui.JabRefExecutorService;
 import org.jabref.logic.shared.listener.PostgresSQLNotificationListener;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.metadata.MetaData;
-
 import org.postgresql.PGConnection;
 
 /**
@@ -35,38 +33,64 @@ public PostgreSQLProcessor(DatabaseConnection connection) {
      */
     @Override
     public void setUp() throws SQLException {
-
-        if (CURRENT_VERSION_DB_STRUCT == 1 && checkTableAvailability("ENTRY", "FIELD", "METADATA")) {
+        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 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)"
+            );
 
         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!");
             }
@@ -76,16 +100,43 @@ 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 (VERSION_DB_STRUCT_DEFAULT == 0 && CURRENT_VERSION_DB_STRUCT == 1) {
+            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();
             }
 
-            metadata.put(MetaData.VERSION_DB_STRUCT, String.valueOf(CURRENT_VERSION_DB_STRUCT));
+            metadata.put(
+                MetaData.VERSION_DB_STRUCT,
+                String.valueOf(CURRENT_VERSION_DB_STRUCT)
+            );
             setSharedMetaData(metadata);
         }
     }
@@ -93,26 +144,39 @@ 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(?)");
+            .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)) {
+        insertIntoEntryQuery.append(
+            ", (?)".repeat(Math.max(0, bibEntries.size() - 1))
+        );
+        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.setString(
+                    i + 1,
+                    bibEntries.get(i).getType().getName()
+                );
             }
             preparedEntryStatement.executeUpdate();
 
-            try (ResultSet generatedKeys = preparedEntryStatement.getGeneratedKeys()) {
+            try (
+                ResultSet generatedKeys = preparedEntryStatement.getGeneratedKeys()
+            ) {
                 // 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();
-                    bibEntry.getSharedBibEntryData().setSharedID(generatedKeys.getInt(1));
+                    bibEntry
+                        .getSharedBibEntryData()
+                        .setSharedID(generatedKeys.getInt(1));
                 }
                 if (generatedKeys.next()) {
                     LOGGER.error("Some shared IDs left unassigned");
@@ -147,10 +211,17 @@ public void startNotificationListener(DBMSSynchronizer dbmsSynchronizer) {
             // 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);
+            listener =
+                new PostgresSQLNotificationListener(
+                    dbmsSynchronizer,
+                    pgConnection
+                );
             JabRefExecutorService.INSTANCE.execute(listener);
         } catch (SQLException e) {
-            LOGGER.error("SQL Error during starting the notification listener", e);
+            LOGGER.error(
+                "SQL Error during starting the notification listener",
+                e
+            );
         }
     }
 
@@ -160,14 +231,19 @@ public void stopNotificationListener() {
             listener.stop();
             connection.close();
         } catch (SQLException e) {
-            LOGGER.error("SQL Error during stopping the notification listener", e);
+            LOGGER.error(
+                "SQL Error during stopping the notification listener",
+                e
+            );
         }
     }
 
     @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 6972e60e90d..d00c15dab1b 100644
--- a/src/main/java/org/jabref/logic/shared/event/SharedEntriesNotPresentEvent.java
+++ b/src/main/java/org/jabref/logic/shared/event/SharedEntriesNotPresentEvent.java
@@ -1,7 +1,6 @@
 package org.jabref.logic.shared.event;
 
 import java.util.List;
-
 import org.jabref.model.entry.BibEntry;
 
 /**
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 ffced9d8af3..498ce0e25b2 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,11 @@ 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/exception/OfflineLockException.java b/src/main/java/org/jabref/logic/shared/exception/OfflineLockException.java
index 0b91566a9ab..a1b5f4fdf1f 100644
--- a/src/main/java/org/jabref/logic/shared/exception/OfflineLockException.java
+++ b/src/main/java/org/jabref/logic/shared/exception/OfflineLockException.java
@@ -11,7 +11,10 @@ public class OfflineLockException extends Exception {
     private final BibEntry localBibEntry;
     private final BibEntry sharedBibEntry;
 
-    public OfflineLockException(BibEntry localBibEntry, BibEntry sharedBibEntry) {
+    public OfflineLockException(
+        BibEntry localBibEntry,
+        BibEntry sharedBibEntry
+    ) {
         super("Local BibEntry data is not up-to-date.");
         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 51aec6ddaaa..4f365bd7b5b 100644
--- a/src/main/java/org/jabref/logic/shared/listener/OracleNotificationListener.java
+++ b/src/main/java/org/jabref/logic/shared/listener/OracleNotificationListener.java
@@ -1,9 +1,8 @@
 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 96b8b7ccaf6..955df72e8f1 100644
--- a/src/main/java/org/jabref/logic/shared/listener/PostgresSQLNotificationListener.java
+++ b/src/main/java/org/jabref/logic/shared/listener/PostgresSQLNotificationListener.java
@@ -1,10 +1,8 @@
 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;
@@ -15,13 +13,18 @@
  */
 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;
     }
@@ -32,11 +35,16 @@ public void run() {
         try {
             // noinspection InfiniteLoopStatement
             while (!stop) {
-                PGNotification notifications[] = pgConnection.getNotifications();
+                PGNotification notifications[] =
+                    pgConnection.getNotifications();
 
                 if (notifications != null) {
                     for (PGNotification notification : notifications) {
-                        if (!notification.getName().equals(DBMSProcessor.PROCESSOR_ID)) {
+                        if (
+                            !notification
+                                .getName()
+                                .equals(DBMSProcessor.PROCESSOR_ID)
+                        ) {
                             dbmsSynchronizer.pullChanges();
                         }
                     }
@@ -46,7 +54,10 @@ public void run() {
                 Thread.sleep(500);
             }
         } catch (SQLException | InterruptedException exception) {
-            LOGGER.error("Error while listening for updates to PostgresSQL", exception);
+            LOGGER.error(
+                "Error while listening for updates to PostgresSQL",
+                exception
+            );
         }
     }
 
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 4b1a14fe1c9..38bcf13495c 100644
--- a/src/main/java/org/jabref/logic/shared/prefs/SharedDatabasePreferences.java
+++ b/src/main/java/org/jabref/logic/shared/prefs/SharedDatabasePreferences.java
@@ -5,16 +5,16 @@
 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);
+    private static final Logger LOGGER = LoggerFactory.getLogger(
+        SharedDatabasePreferences.class
+    );
 
     private static final String DEFAULT_NODE = "default";
     private static final String PREFERENCES_PATH_NAME = "/org/jabref-shared";
@@ -24,13 +24,19 @@ public class SharedDatabasePreferences {
     private static final String SHARED_DATABASE_PORT = "sharedDatabasePort";
     private static final String SHARED_DATABASE_NAME = "sharedDatabaseName";
     private static final String SHARED_DATABASE_USER = "sharedDatabaseUser";
-    private static final String SHARED_DATABASE_PASSWORD = "sharedDatabasePassword";
+    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_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_AUTOSAVE =
+        "sharedDatabaseAutosave";
+    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";
 
     // This {@link Preferences} is used only for things which should not appear in real JabRefPreferences due to security reasons.
     private final Preferences internalPrefs;
@@ -40,7 +46,11 @@ public SharedDatabasePreferences() {
     }
 
     public SharedDatabasePreferences(String sharedDatabaseID) {
-        internalPrefs = Preferences.userRoot().node(PREFERENCES_PATH_NAME).node(sharedDatabaseID);
+        internalPrefs =
+            Preferences
+                .userRoot()
+                .node(PREFERENCES_PATH_NAME)
+                .node(sharedDatabaseID);
     }
 
     public Optional<String> getType() {
@@ -76,7 +86,10 @@ public Optional<String> getServerTimezone() {
     }
 
     public boolean getRememberPassword() {
-        return internalPrefs.getBoolean(SHARED_DATABASE_REMEMBER_PASSWORD, false);
+        return internalPrefs.getBoolean(
+            SHARED_DATABASE_REMEMBER_PASSWORD,
+            false
+        );
     }
 
     public Optional<String> getFolder() {
@@ -116,7 +129,10 @@ public void setPassword(String password) {
     }
 
     public void setRememberPassword(boolean rememberPassword) {
-        internalPrefs.putBoolean(SHARED_DATABASE_REMEMBER_PASSWORD, rememberPassword);
+        internalPrefs.putBoolean(
+            SHARED_DATABASE_REMEMBER_PASSWORD,
+            rememberPassword
+        );
     }
 
     public void setFolder(String folder) {
@@ -155,7 +171,9 @@ public static void clearAll() throws BackingStoreException {
         Preferences.userRoot().node(PREFERENCES_PATH_NAME).clear();
     }
 
-    public void putAllDBMSConnectionProperties(DatabaseConnectionProperties properties) {
+    public void putAllDBMSConnectionProperties(
+        DatabaseConnectionProperties properties
+    ) {
         assert (properties.isValid());
 
         setType(properties.getType().toString());
@@ -168,9 +186,18 @@ public void putAllDBMSConnectionProperties(DatabaseConnectionProperties properti
         setServerTimezone(properties.getServerTimezone());
 
         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);
+            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 7d858e5b8f6..00a31148b98 100644
--- a/src/main/java/org/jabref/logic/shared/security/Password.java
+++ b/src/main/java/org/jabref/logic/shared/security/Password.java
@@ -7,7 +7,6 @@
 import java.security.NoSuchAlgorithmException;
 import java.util.Arrays;
 import java.util.Base64;
-
 import javax.crypto.Cipher;
 import javax.crypto.NoSuchPaddingException;
 import javax.crypto.spec.IvParameterSpec;
@@ -27,14 +26,17 @@ 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");
+        this.secretKey =
+            new SecretKeySpec(get128BitHash(key.getBytes()), "AES");
         this.ivSpec = new IvParameterSpec("ThisIsA128BitKey".getBytes());
     }
 
@@ -43,9 +45,13 @@ public Password(String phrase, String key) throws NoSuchAlgorithmException, NoSu
      *
      * @return Encrypted phrase/password
      */
-    public String encrypt() throws GeneralSecurityException, UnsupportedEncodingException {
+    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
+        );
     }
 
     /**
@@ -53,15 +59,20 @@ public String encrypt() throws GeneralSecurityException, UnsupportedEncodingExce
      *
      * @return Decrypted phrase/password
      */
-    public String decrypt() throws GeneralSecurityException, UnsupportedEncodingException {
+    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
+        );
     }
 
     /**
      * Returns a 128 bit hash using SHA-256.
      */
-    private byte[] get128BitHash(byte[] byteArrayToHash) throws NoSuchAlgorithmException {
+    private byte[] get128BitHash(byte[] byteArrayToHash)
+        throws NoSuchAlgorithmException {
         MessageDigest messageDigest = MessageDigest.getInstance("SHA-256");
         messageDigest.update(byteArrayToHash);
         return Arrays.copyOf(messageDigest.digest(), 16); // return 128 bit
diff --git a/src/main/java/org/jabref/logic/texparser/DefaultLatexParser.java b/src/main/java/org/jabref/logic/texparser/DefaultLatexParser.java
index d5e6264c0b0..db19a3705b7 100644
--- a/src/main/java/org/jabref/logic/texparser/DefaultLatexParser.java
+++ b/src/main/java/org/jabref/logic/texparser/DefaultLatexParser.java
@@ -15,15 +15,15 @@
 import java.util.List;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
-
 import org.jabref.model.texparser.LatexParserResult;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 public class DefaultLatexParser implements LatexParser {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(DefaultLatexParser.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(
+        DefaultLatexParser.class
+    );
     private static final String TEX_EXT = ".tex";
     private static final String BIB_EXT = ".bib";
 
@@ -32,22 +32,35 @@ 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(
-            String.format("\\\\(%s)\\*?(?:\\[(?:[^\\]]*)\\]){0,2}\\{(?<%s>[^\\}]*)\\}(?:\\{[^\\}]*\\})?",
-                    String.join("|", CITE_COMMANDS), CITE_GROUP));
+        String.format(
+            "\\\\(%s)\\*?(?:\\[(?:[^\\]]*)\\]){0,2}\\{(?<%s>[^\\}]*)\\}(?:\\{[^\\}]*\\})?",
+            String.join("|", CITE_COMMANDS),
+            CITE_GROUP
+        )
+    );
 
     private static final String BIBLIOGRAPHY_GROUP = "bib";
     private static final Pattern BIBLIOGRAPHY_PATTERN = Pattern.compile(
-            String.format("\\\\(?:bibliography|addbibresource)\\{(?<%s>[^\\}]*)\\}", BIBLIOGRAPHY_GROUP));
+        String.format(
+            "\\\\(?:bibliography|addbibresource)\\{(?<%s>[^\\}]*)\\}",
+            BIBLIOGRAPHY_GROUP
+        )
+    );
 
     private static final String INCLUDE_GROUP = "file";
     private static final Pattern INCLUDE_PATTERN = Pattern.compile(
-            String.format("\\\\(?:include|input)\\{(?<%s>[^\\}]*)\\}", INCLUDE_GROUP));
+        String.format(
+            "\\\\(?:include|input)\\{(?<%s>[^\\}]*)\\}",
+            INCLUDE_GROUP
+        )
+    );
 
     private final LatexParserResult latexParserResult;
 
@@ -82,10 +95,18 @@ public LatexParserResult parse(List<Path> latexFiles) {
             }
 
             try (
-                    InputStream inputStream = Files.newInputStream(file);
-                    Reader reader = new InputStreamReader(inputStream, StandardCharsets.UTF_8);
-                    LineNumberReader lineNumberReader = new LineNumberReader(reader)) {
-                for (String line = lineNumberReader.readLine(); line != null; line = lineNumberReader.readLine()) {
+                InputStream inputStream = Files.newInputStream(file);
+                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;
@@ -122,7 +143,14 @@ private void matchCitation(Path file, int lineNumber, String 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
+                );
             }
         }
     }
@@ -134,12 +162,17 @@ private void matchBibFile(Path file, String line) {
         Matcher bibliographyMatch = BIBLIOGRAPHY_PATTERN.matcher(line);
 
         while (bibliographyMatch.find()) {
-            for (String bibString : bibliographyMatch.group(BIBLIOGRAPHY_GROUP).split(",")) {
+            for (String bibString : bibliographyMatch
+                .group(BIBLIOGRAPHY_GROUP)
+                .split(",")) {
                 bibString = bibString.trim();
-                Path bibFile = file.getParent().resolve(
+                Path bibFile = file
+                    .getParent()
+                    .resolve(
                         bibString.endsWith(BIB_EXT)
-                                ? bibString
-                                : String.format("%s%s", bibString, BIB_EXT));
+                            ? bibString
+                            : String.format("%s%s", bibString, BIB_EXT)
+                    );
 
                 if (bibFile.toFile().exists()) {
                     latexParserResult.addBibFile(file, bibFile);
@@ -151,16 +184,23 @@ private void matchBibFile(Path file, String line) {
     /**
      * Find inputs and includes along a specific line and store them for parsing later.
      */
-    private void matchNestedFile(Path texFile, List<Path> texFiles, List<Path> referencedFiles, String line) {
+    private void matchNestedFile(
+        Path texFile,
+        List<Path> texFiles,
+        List<Path> referencedFiles,
+        String line
+    ) {
         Matcher includeMatch = INCLUDE_PATTERN.matcher(line);
 
         while (includeMatch.find()) {
             String filenamePassedToInclude = includeMatch.group(INCLUDE_GROUP);
             String texFileName = filenamePassedToInclude.endsWith(TEX_EXT)
-                    ? filenamePassedToInclude
-                    : String.format("%s%s", filenamePassedToInclude, TEX_EXT);
+                ? filenamePassedToInclude
+                : String.format("%s%s", filenamePassedToInclude, TEX_EXT);
             Path nestedFile = texFile.getParent().resolve(texFileName);
-            if (nestedFile.toFile().exists() && !texFiles.contains(nestedFile)) {
+            if (
+                nestedFile.toFile().exists() && !texFiles.contains(nestedFile)
+            ) {
                 referencedFiles.add(nestedFile);
             }
         }
diff --git a/src/main/java/org/jabref/logic/texparser/LatexParser.java b/src/main/java/org/jabref/logic/texparser/LatexParser.java
index 9c64ff9a810..b972d0ed211 100644
--- a/src/main/java/org/jabref/logic/texparser/LatexParser.java
+++ b/src/main/java/org/jabref/logic/texparser/LatexParser.java
@@ -2,14 +2,12 @@
 
 import java.nio.file.Path;
 import java.util.List;
-
 import org.jabref.model.texparser.LatexParserResult;
 
 /**
  * Parses a LaTeX file
  */
 public interface LatexParser {
-
     /**
      * For testing purposes.
      *
diff --git a/src/main/java/org/jabref/logic/texparser/TexBibEntriesResolver.java b/src/main/java/org/jabref/logic/texparser/TexBibEntriesResolver.java
index 50bbbb495e1..871af144114 100644
--- a/src/main/java/org/jabref/logic/texparser/TexBibEntriesResolver.java
+++ b/src/main/java/org/jabref/logic/texparser/TexBibEntriesResolver.java
@@ -7,7 +7,6 @@
 import java.util.function.Function;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
-
 import org.jabref.logic.importer.ImportFormatPreferences;
 import org.jabref.logic.importer.OpenDatabase;
 import org.jabref.logic.importer.ParserResult;
@@ -18,20 +17,26 @@
 import org.jabref.model.texparser.LatexParserResult;
 import org.jabref.model.util.FileUpdateMonitor;
 import org.jabref.preferences.LibraryPreferences;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 public class TexBibEntriesResolver {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(TexBibEntriesResolver.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(
+        TexBibEntriesResolver.class
+    );
 
     private final BibDatabase masterDatabase;
     private final LibraryPreferences libraryPreferences;
     private final ImportFormatPreferences importFormatPreferences;
     private final FileUpdateMonitor fileMonitor;
 
-    public TexBibEntriesResolver(BibDatabase masterDatabase, LibraryPreferences libraryPreferences, ImportFormatPreferences importFormatPreferences, FileUpdateMonitor fileMonitor) {
+    public TexBibEntriesResolver(
+        BibDatabase masterDatabase,
+        LibraryPreferences libraryPreferences,
+        ImportFormatPreferences importFormatPreferences,
+        FileUpdateMonitor fileMonitor
+    ) {
         this.masterDatabase = masterDatabase;
         this.libraryPreferences = libraryPreferences;
         this.importFormatPreferences = importFormatPreferences;
@@ -41,24 +46,50 @@ public TexBibEntriesResolver(BibDatabase masterDatabase, LibraryPreferences libr
     /**
      * Resolve all BibTeX entries and check if they are in the given database.
      */
-    public LatexBibEntriesResolverResult resolve(LatexParserResult latexParserResult) {
-        LatexBibEntriesResolverResult resolverResult = new LatexBibEntriesResolverResult(latexParserResult);
+    public LatexBibEntriesResolverResult resolve(
+        LatexParserResult latexParserResult
+    ) {
+        LatexBibEntriesResolverResult resolverResult =
+            new LatexBibEntriesResolverResult(latexParserResult);
 
         // Preload databases from BIB files.
-        Map<Path, BibDatabase> bibDatabases = resolverResult.getBibFiles().values().stream().distinct().collect(Collectors.toMap(
-                Function.identity(), path -> {
-                    try {
-                        return OpenDatabase.loadDatabase(path, importFormatPreferences, fileMonitor).getDatabase();
-                    } catch (IOException e) {
-                        LOGGER.error("Error opening file '{}'", path, e);
-                        return ParserResult.fromError(e).getDatabase();
+        Map<Path, BibDatabase> bibDatabases = resolverResult
+            .getBibFiles()
+            .values()
+            .stream()
+            .distinct()
+            .collect(
+                Collectors.toMap(
+                    Function.identity(),
+                    path -> {
+                        try {
+                            return OpenDatabase
+                                .loadDatabase(
+                                    path,
+                                    importFormatPreferences,
+                                    fileMonitor
+                                )
+                                .getDatabase();
+                        } catch (IOException e) {
+                            LOGGER.error("Error opening file '{}'", path, e);
+                            return ParserResult.fromError(e).getDatabase();
+                        }
                     }
-                }));
+                )
+            );
 
         // Get all pairs Entry<String entryKey, Citation>.
-        Stream<Map.Entry<String, Citation>> citationsStream = latexParserResult.getCitations().entries().stream().distinct();
-
-        Set<BibEntry> newEntries = citationsStream.flatMap(mapEntry -> apply(mapEntry, latexParserResult, bibDatabases)).collect(Collectors.toSet());
+        Stream<Map.Entry<String, Citation>> citationsStream = latexParserResult
+            .getCitations()
+            .entries()
+            .stream()
+            .distinct();
+
+        Set<BibEntry> newEntries = citationsStream
+            .flatMap(mapEntry ->
+                apply(mapEntry, latexParserResult, bibDatabases)
+            )
+            .collect(Collectors.toSet());
 
         // Add all new entries to the newEntries set.
         resolverResult.getNewEntries().addAll(newEntries);
@@ -66,19 +97,60 @@ public LatexBibEntriesResolverResult resolve(LatexParserResult latexParserResult
         return resolverResult;
     }
 
-    private Stream<? extends BibEntry> apply(Map.Entry<String, Citation> mapEntry, LatexParserResult latexParserResult, Map<Path, BibDatabase> bibDatabases) {
-        return latexParserResult.getBibFiles().get(mapEntry.getValue().getPath()).stream().distinct().flatMap(bibFile ->
+    private Stream<? extends BibEntry> apply(
+        Map.Entry<String, Citation> mapEntry,
+        LatexParserResult latexParserResult,
+        Map<Path, BibDatabase> bibDatabases
+    ) {
+        return latexParserResult
+            .getBibFiles()
+            .get(mapEntry.getValue().getPath())
+            .stream()
+            .distinct()
+            .flatMap(bibFile ->
                 // Get a specific entry from an entryKey and a BIB file.
-                bibDatabases.get(bibFile).getEntriesByCitationKey(mapEntry.getKey()).stream().distinct()
-                            // 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, bibFile, bibDatabases)));
+                bibDatabases
+                    .get(bibFile)
+                    .getEntriesByCitationKey(mapEntry.getKey())
+                    .stream()
+                    .distinct()
+                    // 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, bibFile, bibDatabases)
+                    )
+            );
     }
 
-    private BibEntry addCrossReferencingData(BibEntry entry, Path bibFile, Map<Path, BibDatabase> bibDatabases) {
-        bibDatabases.get(bibFile).getReferencedEntry(entry).ifPresent(refEntry ->
-                refEntry.getFields().forEach(field -> entry.getFieldMap().putIfAbsent(field, refEntry.getFieldOrAlias(field).orElse(""))));
+    private BibEntry addCrossReferencingData(
+        BibEntry entry,
+        Path bibFile,
+        Map<Path, BibDatabase> bibDatabases
+    ) {
+        bibDatabases
+            .get(bibFile)
+            .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/undo/AddUndoableActionEvent.java b/src/main/java/org/jabref/logic/undo/AddUndoableActionEvent.java
index c55f3ca0209..26d5a884a9c 100644
--- a/src/main/java/org/jabref/logic/undo/AddUndoableActionEvent.java
+++ b/src/main/java/org/jabref/logic/undo/AddUndoableActionEvent.java
@@ -5,7 +5,12 @@
  */
 public class AddUndoableActionEvent extends UndoChangeEvent {
 
-    public AddUndoableActionEvent(boolean canUndo, String undoDescription, boolean canRedo, String redoDescription) {
+    public AddUndoableActionEvent(
+        boolean canUndo,
+        String undoDescription,
+        boolean canRedo,
+        String redoDescription
+    ) {
         super(canUndo, undoDescription, canRedo, redoDescription);
     }
 }
diff --git a/src/main/java/org/jabref/logic/undo/UndoChangeEvent.java b/src/main/java/org/jabref/logic/undo/UndoChangeEvent.java
index 890cdb59d2d..f5fce19cedc 100644
--- a/src/main/java/org/jabref/logic/undo/UndoChangeEvent.java
+++ b/src/main/java/org/jabref/logic/undo/UndoChangeEvent.java
@@ -10,7 +10,12 @@ public class UndoChangeEvent {
     private final boolean canRedo;
     private final String redoDescription;
 
-    public UndoChangeEvent(boolean canUndo, String undoDescription, boolean canRedo, String redoDescription) {
+    public UndoChangeEvent(
+        boolean canUndo,
+        String undoDescription,
+        boolean canRedo,
+        String redoDescription
+    ) {
         this.canUndo = canUndo;
         this.undoDescription = undoDescription;
         this.canRedo = canRedo;
diff --git a/src/main/java/org/jabref/logic/undo/UndoRedoEvent.java b/src/main/java/org/jabref/logic/undo/UndoRedoEvent.java
index b2097a81bb5..b2defe4f813 100644
--- a/src/main/java/org/jabref/logic/undo/UndoRedoEvent.java
+++ b/src/main/java/org/jabref/logic/undo/UndoRedoEvent.java
@@ -5,7 +5,12 @@
  */
 public class UndoRedoEvent extends UndoChangeEvent {
 
-    public UndoRedoEvent(boolean canUndo, String undoDescription, boolean canRedo, String redoDescription) {
+    public UndoRedoEvent(
+        boolean canUndo,
+        String undoDescription,
+        boolean canRedo,
+        String redoDescription
+    ) {
         super(canUndo, undoDescription, canRedo, redoDescription);
     }
 }
diff --git a/src/main/java/org/jabref/logic/util/BackupFileType.java b/src/main/java/org/jabref/logic/util/BackupFileType.java
index b24cc3faeb8..89e9330d7bf 100644
--- a/src/main/java/org/jabref/logic/util/BackupFileType.java
+++ b/src/main/java/org/jabref/logic/util/BackupFileType.java
@@ -4,7 +4,6 @@
 import java.util.List;
 
 public enum BackupFileType implements FileType {
-
     // Used at BackupManager
     BACKUP("Backup", "bak"),
 
diff --git a/src/main/java/org/jabref/logic/util/BuildInfo.java b/src/main/java/org/jabref/logic/util/BuildInfo.java
index 245e90b1d2e..503a80a2357 100644
--- a/src/main/java/org/jabref/logic/util/BuildInfo.java
+++ b/src/main/java/org/jabref/logic/util/BuildInfo.java
@@ -12,10 +12,19 @@ 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 = 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 final Version version;
     public final String maintainers;
@@ -38,7 +47,12 @@ 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);
                 }
             }
@@ -49,21 +63,54 @@ public BuildInfo(String path) {
         version = Version.parse(properties.getProperty("version"));
         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");
-        ieeeAPIKey = BuildInfo.getValue(properties, "ieeeAPIKey", "5jv3wyt4tt2bwcwv7jjk7pc3");
-        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");
+        azureInstrumentationKey =
+            BuildInfo.getValue(properties, "azureInstrumentationKey", "");
+        springerNatureAPIKey =
+            BuildInfo.getValue(
+                properties,
+                "springerNatureAPIKey",
+                "118d90a519d0fc2a01ee9715400054d4"
+            );
+        astrophysicsDataSystemAPIKey =
+            BuildInfo.getValue(
+                properties,
+                "astrophysicsDataSystemAPIKey",
+                "tAhPRKADc6cC26mZUnAoBt3MAjCvKbuCZsB4lI3c"
+            );
+        ieeeAPIKey =
+            BuildInfo.getValue(
+                properties,
+                "ieeeAPIKey",
+                "5jv3wyt4tt2bwcwv7jjk7pc3"
+            );
+        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"
+            );
     }
 
-    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("");
+    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("");
         if (!"".equals(result)) {
             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 9160fba7938..d24c5b38e37 100644
--- a/src/main/java/org/jabref/logic/util/CoarseChangeFilter.java
+++ b/src/main/java/org/jabref/logic/util/CoarseChangeFilter.java
@@ -1,16 +1,14 @@
 package org.jabref.logic.util;
 
+import com.google.common.eventbus.EventBus;
+import com.google.common.eventbus.Subscribe;
 import java.util.Optional;
-
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.database.event.BibDatabaseContextChangedEvent;
 import org.jabref.model.entry.BibEntry;
 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;
-
 /**
  * Filters change events and only relays major changes.
  */
@@ -36,11 +34,17 @@ public CoarseChangeFilter(BibDatabaseContext bibDatabaseContext) {
     public synchronized void listen(BibDatabaseContextChangedEvent event) {
         if (event instanceof FieldChangedEvent fieldChange) {
             // If editing has started
-            boolean isNewEdit = lastFieldChanged.isEmpty() || lastEntryChanged.isEmpty();
+            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 isEditChanged = !isNewEdit && (isChangedField || isChangedEntry);
+            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)
             boolean isMajorChange = fieldChange.getMajorCharacterChange() > 1;
 
diff --git a/src/main/java/org/jabref/logic/util/DelayTaskThrottler.java b/src/main/java/org/jabref/logic/util/DelayTaskThrottler.java
index 4a5e7422edb..210ff6e4228 100644
--- a/src/main/java/org/jabref/logic/util/DelayTaskThrottler.java
+++ b/src/main/java/org/jabref/logic/util/DelayTaskThrottler.java
@@ -5,9 +5,7 @@
 import java.util.concurrent.ScheduledFuture;
 import java.util.concurrent.ScheduledThreadPoolExecutor;
 import java.util.concurrent.TimeUnit;
-
 import org.jabref.gui.JabRefExecutorService;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -21,7 +19,9 @@
  */
 public class DelayTaskThrottler {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(DelayTaskThrottler.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(
+        DelayTaskThrottler.class
+    );
 
     private final ScheduledThreadPoolExecutor executor;
 
@@ -44,7 +44,8 @@ public ScheduledFuture<?> schedule(Runnable command) {
             cancel();
         }
         try {
-            scheduledTask = executor.schedule(command, delay, TimeUnit.MILLISECONDS);
+            scheduledTask =
+                executor.schedule(command, delay, TimeUnit.MILLISECONDS);
         } catch (RejectedExecutionException e) {
             LOGGER.debug("Rejecting while another process is already running.");
         }
@@ -56,7 +57,8 @@ public <T> ScheduledFuture<?> scheduleTask(Callable<?> command) {
             cancel();
         }
         try {
-            scheduledTask = executor.schedule(command, delay, TimeUnit.MILLISECONDS);
+            scheduledTask =
+                executor.schedule(command, delay, TimeUnit.MILLISECONDS);
         } catch (RejectedExecutionException e) {
             LOGGER.debug("Rejecting while another process is already running.");
         }
diff --git a/src/main/java/org/jabref/logic/util/ExternalLinkCreator.java b/src/main/java/org/jabref/logic/util/ExternalLinkCreator.java
index 8e98318b544..82a6387fa63 100644
--- a/src/main/java/org/jabref/logic/util/ExternalLinkCreator.java
+++ b/src/main/java/org/jabref/logic/util/ExternalLinkCreator.java
@@ -2,14 +2,14 @@
 
 import java.net.URISyntaxException;
 import java.util.Optional;
-
+import org.apache.http.client.utils.URIBuilder;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.field.StandardField;
 
-import org.apache.http.client.utils.URIBuilder;
-
 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,19 @@ 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/FileType.java b/src/main/java/org/jabref/logic/util/FileType.java
index c054d54d7bc..b572da67dc1 100644
--- a/src/main/java/org/jabref/logic/util/FileType.java
+++ b/src/main/java/org/jabref/logic/util/FileType.java
@@ -7,11 +7,11 @@
  * Interface for {@link StandardFileType} which allows us to extend the underlying enum with own filetypes for custom exporters
  */
 public interface FileType {
-
     default List<String> getExtensionsWithAsteriskAndDot() {
-        return getExtensions().stream()
-                              .map(extension -> "*." + extension)
-                              .collect(Collectors.toList());
+        return getExtensions()
+            .stream()
+            .map(extension -> "*." + extension)
+            .collect(Collectors.toList());
     }
 
     List<String> getExtensions();
diff --git a/src/main/java/org/jabref/logic/util/MetadataSerializationConfiguration.java b/src/main/java/org/jabref/logic/util/MetadataSerializationConfiguration.java
index 8ca88821f12..9ceebadcc5b 100644
--- a/src/main/java/org/jabref/logic/util/MetadataSerializationConfiguration.java
+++ b/src/main/java/org/jabref/logic/util/MetadataSerializationConfiguration.java
@@ -13,6 +13,7 @@
  * Specifies how metadata is read and written.
  */
 public class MetadataSerializationConfiguration {
+
     /**
      * Character used for quoting in the string representation.
      */
@@ -51,18 +52,19 @@ public class MetadataSerializationConfiguration {
     /**
      * Identifier for {@link AutomaticPersonsGroup}.
      */
-    public static final String AUTOMATIC_PERSONS_GROUP_ID = "AutomaticPersonsGroup:";
+    public static final String AUTOMATIC_PERSONS_GROUP_ID =
+        "AutomaticPersonsGroup:";
 
     /**
      * Identifier for {@link AutomaticKeywordGroup}.
      */
-    public static final String AUTOMATIC_KEYWORD_GROUP_ID = "AutomaticKeywordGroup:";
+    public static final String AUTOMATIC_KEYWORD_GROUP_ID =
+        "AutomaticKeywordGroup:";
 
     /**
      * Identifier for {@link TexGroup}.
      */
     public static final String TEX_GROUP_ID = "TexGroup:";
 
-    private MetadataSerializationConfiguration() {
-    }
+    private MetadataSerializationConfiguration() {}
 }
diff --git a/src/main/java/org/jabref/logic/util/OS.java b/src/main/java/org/jabref/logic/util/OS.java
index 6c951ce4aa6..55ae3fad5d0 100644
--- a/src/main/java/org/jabref/logic/util/OS.java
+++ b/src/main/java/org/jabref/logic/util/OS.java
@@ -1,16 +1,14 @@
 package org.jabref.logic.util;
 
+import com.github.javakeyring.BackendNotSupportedException;
+import com.github.javakeyring.Keyring;
+import com.github.javakeyring.PasswordAccessException;
 import java.util.Locale;
-
 import org.jabref.gui.desktop.os.DefaultDesktop;
 import org.jabref.gui.desktop.os.Linux;
 import org.jabref.gui.desktop.os.NativeDesktop;
 import org.jabref.gui.desktop.os.OSX;
 import org.jabref.gui.desktop.os.Windows;
-
-import com.github.javakeyring.BackendNotSupportedException;
-import com.github.javakeyring.Keyring;
-import com.github.javakeyring.PasswordAccessException;
 import org.slf4j.LoggerFactory;
 
 /**
@@ -19,6 +17,7 @@
  * For OS-specific actions see {@link org.jabref.gui.desktop.JabRefDesktop} and {@link org.jabref.gui.desktop.os.NativeDesktop}.
  */
 public class OS {
+
     // No LOGGER may be initialized directly
     // Otherwise, org.jabref.cli.Launcher.addLogToDisk will fail, because tinylog's properties are frozen
 
@@ -28,14 +27,15 @@ public class OS {
     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");
 
-    private OS() {
-    }
+    private OS() {}
 
     public static NativeDesktop getNativeDesktop() {
         if (WINDOWS) {
@@ -51,18 +51,28 @@ public static NativeDesktop getNativeDesktop() {
     public static boolean isKeyringAvailable() {
         try (Keyring keyring = Keyring.create()) {
             keyring.setPassword("JabRef", "keyringTest", "keyringTest");
-            if (!"keyringTest".equals(keyring.getPassword("JabRef", "keyringTest"))) {
+            if (
+                !"keyringTest".equals(
+                        keyring.getPassword("JabRef", "keyringTest")
+                    )
+            ) {
                 return false;
             }
             keyring.deletePassword("JabRef", "keyringTest");
         } catch (BackendNotSupportedException ex) {
-            LoggerFactory.getLogger(OS.class).warn("Credential store not supported.");
+            LoggerFactory
+                .getLogger(OS.class)
+                .warn("Credential store not supported.");
             return false;
         } catch (PasswordAccessException ex) {
-            LoggerFactory.getLogger(OS.class).warn("Password storage in credential store failed.");
+            LoggerFactory
+                .getLogger(OS.class)
+                .warn("Password storage in credential store failed.");
             return false;
         } catch (Exception ex) {
-            LoggerFactory.getLogger(OS.class).warn("Connection to credential store failed");
+            LoggerFactory
+                .getLogger(OS.class)
+                .warn("Connection to credential store failed");
             return false;
         }
         return true;
diff --git a/src/main/java/org/jabref/logic/util/StandardFileType.java b/src/main/java/org/jabref/logic/util/StandardFileType.java
index d71f5b50dec..8ceb8b5bb78 100644
--- a/src/main/java/org/jabref/logic/util/StandardFileType.java
+++ b/src/main/java/org/jabref/logic/util/StandardFileType.java
@@ -2,14 +2,12 @@
 
 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"),
@@ -47,9 +45,6 @@ public enum StandardFileType implements FileType {
     CITAVI("Citavi", "ctv6bak", "ctv5bak"),
     MARKDOWN("Markdown", "md");
 
-
-
-
     private final List<String> extensions;
     private final String name;
 
@@ -71,9 +66,14 @@ 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(),
-                                   new UnknownFileType(extensions));
+        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 a7f80218992..5b13ffce0b0 100644
--- a/src/main/java/org/jabref/logic/util/TestEntry.java
+++ b/src/main/java/org/jabref/logic/util/TestEntry.java
@@ -1,20 +1,21 @@
 package org.jabref.logic.util;
 
 import java.util.Arrays;
-
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.field.StandardField;
 import org.jabref.model.entry.types.StandardEntryType;
 
 public class TestEntry {
 
-    private TestEntry() {
-    }
+    private TestEntry() {}
 
     public static BibEntry getTestEntry() {
         BibEntry entry = new BibEntry(StandardEntryType.Article);
         entry.setCitationKey("Smith2016");
-        entry.setField(StandardField.AUTHOR, "Smith, Bill and Jones, Bob and Williams, Jeff");
+        entry.setField(
+            StandardField.AUTHOR,
+            "Smith, Bill and Jones, Bob and Williams, Jeff"
+        );
         entry.setField(StandardField.EDITOR, "Taylor, Phil");
         entry.setField(StandardField.TITLE, "Title of the test entry");
         entry.setField(StandardField.NUMBER, "3");
@@ -29,13 +30,21 @@ public static BibEntry getTestEntry() {
         entry.setField(StandardField.ADDRESS, "Trondheim");
         entry.setField(StandardField.URL, "https://github.com/JabRef");
         entry.setField(StandardField.DOI, "10.1001/bla.blubb");
-        entry.setField(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.");
-        entry.setField(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 " +
-                "proident, sunt in culpa qui officia deserunt mollit anim id est laborum.");
-        entry.putKeywords(Arrays.asList("KeyWord1", "KeyWord2", "KeyWord3", "Keyword4"), ';');
+        entry.setField(
+            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."
+        );
+        entry.setField(
+            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 " +
+            "proident, sunt in culpa qui officia deserunt mollit anim id est laborum."
+        );
+        entry.putKeywords(
+            Arrays.asList("KeyWord1", "KeyWord2", "KeyWord3", "Keyword4"),
+            ';'
+        );
 
         return entry;
     }
@@ -43,7 +52,10 @@ public static BibEntry getTestEntry() {
     public static BibEntry getTestEntryBook() {
         BibEntry entry = new BibEntry(StandardEntryType.Book);
         entry.setCitationKey("Harrer2018");
-        entry.setField(StandardField.AUTHOR, "Simon Harrer and Jörg Lenhard and Linus Dietz");
+        entry.setField(
+            StandardField.AUTHOR,
+            "Simon Harrer and Jörg Lenhard and Linus Dietz"
+        );
         entry.setField(StandardField.EDITOR, "Andrea Steward");
         entry.setField(StandardField.TITLE, "Java by Comparison");
         entry.setField(StandardField.YEAR, "2018");
diff --git a/src/main/java/org/jabref/logic/util/UnknownFileType.java b/src/main/java/org/jabref/logic/util/UnknownFileType.java
index a2b7453d261..cf5a0bd603c 100644
--- a/src/main/java/org/jabref/logic/util/UnknownFileType.java
+++ b/src/main/java/org/jabref/logic/util/UnknownFileType.java
@@ -13,7 +13,8 @@ public class UnknownFileType implements FileType {
     public UnknownFileType(String... extensions) {
         for (int i = 0; i < extensions.length; i++) {
             if (extensions[i].contains(".")) {
-                extensions[i] = extensions[i].substring(extensions[i].indexOf('.') + 1);
+                extensions[i] =
+                    extensions[i].substring(extensions[i].indexOf('.') + 1);
             }
             extensions[i] = extensions[i].toLowerCase(Locale.ROOT);
         }
diff --git a/src/main/java/org/jabref/logic/util/UpdateField.java b/src/main/java/org/jabref/logic/util/UpdateField.java
index 93ab1b74ce7..69e89c0666a 100644
--- a/src/main/java/org/jabref/logic/util/UpdateField.java
+++ b/src/main/java/org/jabref/logic/util/UpdateField.java
@@ -2,7 +2,6 @@
 
 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;
@@ -12,22 +11,34 @@
 
 public class UpdateField {
 
-    private UpdateField() {
-    }
+    private UpdateField() {}
 
     /**
      * Updating a field will result in the entry being reformatted on save
      */
-    public static Optional<FieldChange> updateField(BibEntry be, Field field, String newValue) {
+    public static Optional<FieldChange> updateField(
+        BibEntry be,
+        Field field,
+        String newValue
+    ) {
         return updateField(be, field, newValue, false);
     }
 
     /**
      * 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);
+        Optional<FieldChange> fieldChange = updateField(
+            be,
+            field,
+            newValue,
+            false
+        );
         be.setChanged(changed);
         return fieldChange;
     }
@@ -37,13 +48,20 @@ 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 (
+                (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
                 // Clear the field
                 be.clearField(field);
@@ -69,7 +87,13 @@ 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 +109,11 @@ 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,8 +127,16 @@ public static void setAutomaticFields(Collection<BibEntry> entries, OwnerPrefere
         String timestamp = timestampPreferences.now();
 
         for (BibEntry curEntry : entries) {
-            boolean setOwner = globalSetOwner && (overwriteOwner || (!curEntry.hasField(StandardField.OWNER)));
-            setAutomaticFields(curEntry, setOwner, defaultOwner, setTimeStamp, timestamp);
+            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 f94472fc17c..c18e9446c1c 100644
--- a/src/main/java/org/jabref/logic/util/Version.java
+++ b/src/main/java/org/jabref/logic/util/Version.java
@@ -11,7 +11,6 @@
 import java.util.Optional;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
-
 import kong.unirest.json.JSONArray;
 import kong.unirest.json.JSONObject;
 import org.slf4j.Logger;
@@ -22,14 +21,20 @@
  */
 public class Version {
 
-    public static final String JABREF_DOWNLOAD_URL = "https://downloads.jabref.org";
+    public static final String JABREF_DOWNLOAD_URL =
+        "https://downloads.jabref.org";
 
     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 +47,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,8 +62,12 @@ 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) || "".equals(version) || version.equals(BuildInfo.UNKNOWN_VERSION)
-                || "${version}".equals(version)) {
+        if (
+            (version == null) ||
+            "".equals(version) ||
+            version.equals(BuildInfo.UNKNOWN_VERSION) ||
+            "${version}".equals(version)
+        ) {
             return UNKNOWN_VERSION;
         }
 
@@ -76,18 +84,27 @@ public static Version parse(String version) {
                 parsedVersion.major = Integer.parseInt(matcher.group("major"));
 
                 String minorString = matcher.group("minor");
-                parsedVersion.minor = minorString == null ? 0 : Integer.parseInt(minorString);
+                parsedVersion.minor =
+                    minorString == null ? 0 : Integer.parseInt(minorString);
 
                 String patchString = matcher.group("patch");
-                parsedVersion.patch = patchString == null ? 0 : Integer.parseInt(patchString);
+                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;
+                parsedVersion.isDevelopmentVersion =
+                    matcher.group("dev") != null;
             } catch (NumberFormatException e) {
                 getLogger().warn("Invalid version string used: {}", version, e);
                 return UNKNOWN_VERSION;
@@ -106,14 +123,23 @@ 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) new URL(JABREF_GITHUB_RELEASES).openConnection();
+        HttpURLConnection connection = (HttpURLConnection) new URL(
+            JABREF_GITHUB_RELEASES
+        )
+            .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();
@@ -130,7 +156,9 @@ public boolean isNewerThan(Version otherVersion) {
             return false;
         } else if (this.getFullVersion().equals(BuildInfo.UNKNOWN_VERSION)) {
             return false;
-        } else if (otherVersion.getFullVersion().equals(BuildInfo.UNKNOWN_VERSION)) {
+        } else if (
+            otherVersion.getFullVersion().equals(BuildInfo.UNKNOWN_VERSION)
+        ) {
             return false;
         }
 
@@ -147,15 +175,30 @@ public boolean isNewerThan(Version otherVersion) {
                     return true;
                 } else if (this.getPatch() == otherVersion.getPatch()) {
                     // if the patch numbers are equal compare the development stages
-                    if (this.developmentStage.isMoreStableThan(otherVersion.developmentStage)) {
+                    if (
+                        this.developmentStage.isMoreStableThan(
+                                otherVersion.developmentStage
+                            )
+                    ) {
                         return true;
-                    } else if (this.developmentStage == otherVersion.developmentStage) {
+                    } else if (
+                        this.developmentStage == otherVersion.developmentStage
+                    ) {
                         // if the development stage are equal compare the development number
-                        if (this.getDevelopmentNum() > otherVersion.getDevelopmentNum()) {
+                        if (
+                            this.getDevelopmentNum() >
+                            otherVersion.getDevelopmentNum()
+                        ) {
                             return true;
-                        } else if (this.getDevelopmentNum() == otherVersion.getDevelopmentNum()) {
+                        } else if (
+                            this.getDevelopmentNum() ==
+                            otherVersion.getDevelopmentNum()
+                        ) {
                             // if the stage is equal check if this version is in development and the other is not
-                            return !this.isDevelopmentVersion && otherVersion.isDevelopmentVersion;
+                            return (
+                                !this.isDevelopmentVersion &&
+                                otherVersion.isDevelopmentVersion
+                            );
                         }
                     }
                 }
@@ -169,11 +212,16 @@ public boolean isNewerThan(Version otherVersion) {
      *
      * @return The version this one should be updated to, or an empty Optional
      */
-    public Optional<Version> shouldBeUpdatedTo(List<Version> availableVersions) {
+    public Optional<Version> shouldBeUpdatedTo(
+        List<Version> availableVersions
+    ) {
         Optional<Version> newerVersion = Optional.empty();
         for (Version version : availableVersions) {
-            if (this.shouldBeUpdatedTo(version)
-                    && (!newerVersion.isPresent() || version.isNewerThan(newerVersion.get()))) {
+            if (
+                this.shouldBeUpdatedTo(version) &&
+                (!newerVersion.isPresent() ||
+                    version.isNewerThan(newerVersion.get()))
+            ) {
                 newerVersion = Optional.of(version);
             }
         }
@@ -187,8 +235,10 @@ public Optional<Version> shouldBeUpdatedTo(List<Version> availableVersions) {
      */
     public boolean shouldBeUpdatedTo(Version otherVersion) {
         // 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) {
+        if (
+            developmentStage == Version.DevelopmentStage.STABLE &&
+            otherVersion.developmentStage != Version.DevelopmentStage.STABLE
+        ) {
             return false;
         }
 
@@ -228,23 +278,19 @@ public String getChangelogUrl() {
             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());
+                .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");
diff --git a/src/main/java/org/jabref/logic/util/WebViewStore.java b/src/main/java/org/jabref/logic/util/WebViewStore.java
index 9015196ee73..3c79e53e67d 100644
--- a/src/main/java/org/jabref/logic/util/WebViewStore.java
+++ b/src/main/java/org/jabref/logic/util/WebViewStore.java
@@ -2,10 +2,8 @@
 
 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;
 
@@ -13,8 +11,11 @@
  * 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 Logger LOGGER = LoggerFactory.getLogger(
+        WebViewStore.class
+    );
+    private static final Queue<WebView> WEB_VIEWS = new ArrayDeque<>();
     private static boolean isInitialized = false;
     private static Configuration config;
 
@@ -73,9 +74,9 @@ public static boolean hasMore() {
     }
 
     public record Configuration(
-            int numberOfPreloadedInstances,
-            int minimumNumberOfInstances) {
-
+        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 94c2b620ec9..87f2ba671bf 100644
--- a/src/main/java/org/jabref/logic/util/io/AutoLinkPreferences.java
+++ b/src/main/java/org/jabref/logic/util/io/AutoLinkPreferences.java
@@ -13,7 +13,7 @@ public class AutoLinkPreferences {
     public enum CitationKeyDependency {
         START, // Filenames starting with the citation key
         EXACT, // Filenames exactly matching the citation key
-        REGEX // Filenames matching a regular expression pattern
+        REGEX, // Filenames matching a regular expression pattern
     }
 
     private final ObjectProperty<CitationKeyDependency> citationKeyDependency;
@@ -21,11 +21,14 @@ public enum CitationKeyDependency {
     private final BooleanProperty askAutoNamingPdfs;
     private final ReadOnlyObjectProperty<Character> keywordSeparator;
 
-    public AutoLinkPreferences(CitationKeyDependency citationKeyDependency,
-                               String regularExpression,
-                               boolean askAutoNamingPdfs,
-                               ObjectProperty<Character> keywordSeparatorProperty) {
-        this.citationKeyDependency = new SimpleObjectProperty<>(citationKeyDependency);
+    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);
         this.keywordSeparator = keywordSeparatorProperty;
@@ -34,11 +37,14 @@ public AutoLinkPreferences(CitationKeyDependency citationKeyDependency,
     /**
      * For testing purpose
      */
-    public AutoLinkPreferences(CitationKeyDependency citationKeyDependency,
-                               String regularExpression,
-                               boolean askAutoNamingPdfs,
-                               Character keywordSeparator) {
-        this.citationKeyDependency = new SimpleObjectProperty<>(citationKeyDependency);
+    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);
         this.keywordSeparator = new SimpleObjectProperty<>(keywordSeparator);
@@ -48,11 +54,15 @@ public CitationKeyDependency getCitationKeyDependency() {
         return citationKeyDependency.getValue();
     }
 
-    public ObjectProperty<CitationKeyDependency> citationKeyDependencyProperty() {
+    public ObjectProperty<
+        CitationKeyDependency
+    > citationKeyDependencyProperty() {
         return citationKeyDependency;
     }
 
-    public void setCitationKeyDependency(CitationKeyDependency citationKeyDependency) {
+    public void setCitationKeyDependency(
+        CitationKeyDependency citationKeyDependency
+    ) {
         this.citationKeyDependency.set(citationKeyDependency);
     }
 
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 bea88213b6f..1a111f9add3 100644
--- a/src/main/java/org/jabref/logic/util/io/BackupFileUtil.java
+++ b/src/main/java/org/jabref/logic/util/io/BackupFileUtil.java
@@ -8,19 +8,18 @@
 import java.time.format.DateTimeFormatter;
 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 static final Logger LOGGER = LoggerFactory.getLogger(
+        BackupFileUtil.class
+    );
 
-    private BackupFileUtil() {
-    }
+    private BackupFileUtil() {}
 
     /**
      * Determines the path of the backup file (using the given extension)
@@ -39,9 +38,15 @@ private BackupFileUtil() {
      * </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().get(0);
-        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 +54,29 @@ 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().get(0);
@@ -73,14 +92,17 @@ public static Optional<Path> getPathOfLatestExistingBackupFile(Path targetFile,
         }
 
         // Search the directory for the latest file
-        final String prefix = getUniqueFilePrefix(targetFile) + "--" + targetFile.getFileName();
+        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 3e8064eaaed..fcb9bb0f585 100644
--- a/src/main/java/org/jabref/logic/util/io/CitationKeyBasedFileFinder.java
+++ b/src/main/java/org/jabref/logic/util/io/CitationKeyBasedFileFinder.java
@@ -16,7 +16,6 @@
 import java.util.function.BiPredicate;
 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;
@@ -30,7 +29,11 @@ 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);
 
@@ -43,7 +46,10 @@ public List<Path> findAssociatedFiles(BibEntry entry, List<Path> directories, Li
         List<Path> result = new ArrayList<>();
 
         // First scan directories
-        Set<Path> filesWithExtension = findFilesByExtension(directories, extensions);
+        Set<Path> filesWithExtension = findFilesByExtension(
+            directories,
+            extensions
+        );
 
         // Now look for keys
         for (Path file : filesWithExtension) {
@@ -65,12 +71,16 @@ public List<Path> findAssociatedFiles(BibEntry entry, List<Path> directories, Li
     }
 
     private boolean matches(String filename, String citeKey) {
-        boolean startsWithKey = filename.startsWith(FileNameCleaner.cleanFileName(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
             char charAfterKey = filename.charAt(citeKey.length());
-            return !CitationKeyGenerator.APPENDIX_CHARACTERS.contains(Character.toString(charAfterKey));
+            return !CitationKeyGenerator.APPENDIX_CHARACTERS.contains(
+                Character.toString(charAfterKey)
+            );
         }
         return false;
     }
@@ -78,16 +88,30 @@ 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 4f816ef624d..047d5769f57 100644
--- a/src/main/java/org/jabref/logic/util/io/DatabaseFileLookup.java
+++ b/src/main/java/org/jabref/logic/util/io/DatabaseFileLookup.java
@@ -9,7 +9,6 @@
 import java.util.Optional;
 import java.util.Set;
 import java.util.stream.Collectors;
-
 import org.jabref.model.database.BibDatabase;
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.entry.BibEntry;
@@ -31,15 +30,21 @@ public class DatabaseFileLookup {
     /**
      * Creates an instance by passing a {@link BibDatabase} which will be used for the searches.
      */
-    public DatabaseFileLookup(BibDatabaseContext databaseContext, FilePreferences filePreferences) {
+    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));
         }
-        this.pathOfDatabase = databaseContext.getDatabasePath().orElse(Path.of(""));
+        this.pathOfDatabase =
+            databaseContext.getDatabasePath().orElse(Path.of(""));
     }
 
     /**
@@ -62,12 +67,14 @@ public boolean lookupDatabase(Path pathname) {
     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());
+        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());
     }
 
     /**
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 e449b796e0c..1036bc4bbc5 100644
--- a/src/main/java/org/jabref/logic/util/io/FileFinder.java
+++ b/src/main/java/org/jabref/logic/util/io/FileFinder.java
@@ -3,11 +3,9 @@
 import java.io.IOException;
 import java.nio.file.Path;
 import java.util.List;
-
 import org.jabref.model.entry.BibEntry;
 
 public interface FileFinder {
-
     /**
      * Finds all files in the given directories that are probably associated with the given entries and have one of the passed extensions.
      *
@@ -15,5 +13,9 @@ 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 de46e3dbbd0..69b27a94c7b 100644
--- a/src/main/java/org/jabref/logic/util/io/FileFinders.java
+++ b/src/main/java/org/jabref/logic/util/io/FileFinders.java
@@ -1,17 +1,20 @@
 package org.jabref.logic.util.io;
 
 public class FileFinders {
+
     /**
      * Creates a preconfigurated file finder based on the given AutoLink preferences.
      */
-    public static FileFinder constructFromConfiguration(AutoLinkPreferences autoLinkPreferences) {
+    public static FileFinder constructFromConfiguration(
+        AutoLinkPreferences autoLinkPreferences
+    ) {
         return switch (autoLinkPreferences.getCitationKeyDependency()) {
-            case START ->
-                    new CitationKeyBasedFileFinder(false);
-            case EXACT ->
-                    new CitationKeyBasedFileFinder(true);
-            case REGEX ->
-                    new RegExpBasedFileFinder(autoLinkPreferences.getRegularExpression(), autoLinkPreferences.getKeywordSeparator());
+            case START -> new CitationKeyBasedFileFinder(false);
+            case EXACT -> new CitationKeyBasedFileFinder(true);
+            case REGEX -> 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 4281c36306e..33d1120949f 100644
--- a/src/main/java/org/jabref/logic/util/io/FileHistory.java
+++ b/src/main/java/org/jabref/logic/util/io/FileHistory.java
@@ -3,7 +3,6 @@
 import java.nio.file.Path;
 import java.util.ArrayList;
 import java.util.List;
-
 import javafx.collections.ModifiableObservableListBase;
 
 public class FileHistory extends ModifiableObservableListBase<Path> {
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 b2ffdf82b8a..213e31e8689 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 032a396dec8..d0fe5c77b7c 100644
--- a/src/main/java/org/jabref/logic/util/io/FileNameUniqueness.java
+++ b/src/main/java/org/jabref/logic/util/io/FileNameUniqueness.java
@@ -7,12 +7,14 @@
 import java.util.Optional;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
-
 import org.jabref.gui.DialogService;
 import org.jabref.logic.l10n.Localization;
 
 public class FileNameUniqueness {
-    private static final Pattern DUPLICATE_MARK_PATTERN = Pattern.compile("(.*) \\(\\d+\\)");
+
+    private static final Pattern DUPLICATE_MARK_PATTERN = Pattern.compile(
+        "(.*) \\(\\d+\\)"
+    );
 
     /**
      * Returns a file name such that it does not match any existing files in targetDirectory
@@ -21,8 +23,13 @@ public class FileNameUniqueness {
      * @param fileName        Suggested name for the file
      * @return a file name such that it does not match any existing files in targetDirectory
      */
-    public static String getNonOverWritingFileName(Path targetDirectory, String fileName) {
-        Optional<String> extensionOptional = FileUtil.getFileExtension(fileName);
+    public static String getNonOverWritingFileName(
+        Path targetDirectory,
+        String fileName
+    ) {
+        Optional<String> extensionOptional = FileUtil.getFileExtension(
+            fileName
+        );
 
         // the suffix include the '.' , if extension is present Eg: ".pdf"
         String extensionSuffix;
@@ -30,7 +37,8 @@ public static String getNonOverWritingFileName(Path targetDirectory, String file
 
         if (extensionOptional.isPresent()) {
             extensionSuffix = '.' + extensionOptional.get();
-            fileNameWithoutExtension = fileName.substring(0, fileName.lastIndexOf('.'));
+            fileNameWithoutExtension =
+                fileName.substring(0, fileName.lastIndexOf('.'));
         } else {
             extensionSuffix = "";
             fileNameWithoutExtension = fileName;
@@ -40,9 +48,12 @@ 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++;
         }
 
@@ -60,17 +71,25 @@ 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, DialogService dialogService) throws IOException {
-
+    public static boolean isDuplicatedFile(
+        Path directory,
+        Path fileName,
+        DialogService dialogService
+    ) throws IOException {
         Objects.requireNonNull(directory);
         Objects.requireNonNull(fileName);
         Objects.requireNonNull(dialogService);
 
         String extensionSuffix = FileUtil.getFileExtension(fileName).orElse("");
-        extensionSuffix = "".equals(extensionSuffix) ? extensionSuffix : "." + extensionSuffix;
+        extensionSuffix =
+            "".equals(extensionSuffix)
+                ? extensionSuffix
+                : "." + extensionSuffix;
         String newFilename = FileUtil.getBaseName(fileName) + extensionSuffix;
 
-        String fileNameWithoutDuplicated = eraseDuplicateMarks(FileUtil.getBaseName(fileName));
+        String fileNameWithoutDuplicated = eraseDuplicateMarks(
+            FileUtil.getBaseName(fileName)
+        );
         String originalFileName = fileNameWithoutDuplicated + extensionSuffix;
 
         if (newFilename.equals(originalFileName)) {
@@ -82,18 +101,38 @@ public static boolean isDuplicatedFile(Path directory, Path fileName, DialogServ
         int counter = 1;
 
         while (Files.exists(originalFile)) {
-            if (com.google.common.io.Files.equal(originalFile.toFile(), duplicateFile.toFile())) {
+            if (
+                com.google.common.io.Files.equal(
+                    originalFile.toFile(),
+                    duplicateFile.toFile()
+                )
+            ) {
                 if (duplicateFile.toFile().delete()) {
-                    dialogService.notify(Localization.lang("File '%1' is a duplicate of '%0'. Keeping '%0'", originalFileName, fileName));
+                    dialogService.notify(
+                        Localization.lang(
+                            "File '%1' is a duplicate of '%0'. Keeping '%0'",
+                            originalFileName,
+                            fileName
+                        )
+                    );
                 } else {
-                    dialogService.notify(Localization.lang("File '%1' is a duplicate of '%0'. Keeping both due to deletion error", originalFileName, fileName));
+                    dialogService.notify(
+                        Localization.lang(
+                            "File '%1' is a duplicate of '%0'. Keeping both due to deletion error",
+                            originalFileName,
+                            fileName
+                        )
+                    );
                 }
                 return true;
             }
 
-            originalFileName = fileNameWithoutDuplicated +
-                    " (" + counter + ")"
-                    + extensionSuffix;
+            originalFileName =
+                fileNameWithoutDuplicated +
+                " (" +
+                counter +
+                ")" +
+                extensionSuffix;
             counter++;
 
             if (newFilename.equals(originalFileName)) {
@@ -115,6 +154,8 @@ public static boolean isDuplicatedFile(Path directory, Path fileName, DialogServ
      */
     public static String eraseDuplicateMarks(String fileName) {
         Matcher m = DUPLICATE_MARK_PATTERN.matcher(fileName);
-        return m.find() ? fileName.substring(0, fileName.lastIndexOf('(') - 1) : fileName;
+        return m.find()
+            ? fileName.substring(0, fileName.lastIndexOf('(') - 1)
+            : fileName;
     }
 }
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 05a2a4746c6..377d591ceef 100644
--- a/src/main/java/org/jabref/logic/util/io/FileUtil.java
+++ b/src/main/java/org/jabref/logic/util/io/FileUtil.java
@@ -21,14 +21,12 @@
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
-
 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.preferences.FilePreferences;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -39,10 +37,15 @@
  */
 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);
+    private static final Logger LOGGER = LoggerFactory.getLogger(
+        FileUtil.class
+    );
 
     /**
      * MUST ALWAYS BE A SORTED ARRAY because it is used in a binary search
@@ -58,10 +61,10 @@ public class FileUtil {
             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).
@@ -71,7 +74,12 @@ private FileUtil() {
     public static Optional<String> getFileExtension(String fileName) {
         int dotPosition = fileName.lastIndexOf('.');
         if ((dotPosition > 0) && (dotPosition < (fileName.length() - 1))) {
-            return Optional.of(fileName.substring(dotPosition + 1).trim().toLowerCase(Locale.ROOT));
+            return Optional.of(
+                fileName
+                    .substring(dotPosition + 1)
+                    .trim()
+                    .toLowerCase(Locale.ROOT)
+            );
         } else {
             return Optional.empty();
         }
@@ -90,7 +98,9 @@ public static Optional<String> getFileExtension(Path file) {
      * Returns the name part of a file name (i.e., everything in front of last ".").
      */
     public static String getBaseName(String fileNameWithExtension) {
-        return com.google.common.io.Files.getNameWithoutExtension(fileNameWithExtension);
+        return com.google.common.io.Files.getNameWithoutExtension(
+            fileNameWithExtension
+        );
     }
 
     /**
@@ -112,8 +122,19 @@ 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(String.format("Truncated the too long filename '%s' (%d characters) to '%s'.", fileName, fileName.length(), shortName));
+            String shortName = nameWithoutExtension.substring(
+                0,
+                MAXIMUM_FILE_NAME_LENGTH -
+                extension.map(s -> s.length() + 1).orElse(0)
+            );
+            LOGGER.info(
+                String.format(
+                    "Truncated the too long filename '%s' (%d characters) to '%s'.",
+                    fileName,
+                    fileName.length(),
+                    shortName
+                )
+            );
             return extension.map(s -> shortName + "." + s).orElse(shortName);
         }
 
@@ -140,15 +161,22 @@ public static Path addExtension(Path path, String extension) {
      * @param paths List of paths as Strings
      * @param comparePath The to be tested path
      */
-    public static Optional<String> getUniquePathDirectory(List<String> paths, Path comparePath) {
+    public static Optional<String> getUniquePathDirectory(
+        List<String> paths,
+        Path comparePath
+    ) {
         String fileName = comparePath.getFileName().toString();
 
         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)));
+        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)));
     }
 
     /**
@@ -157,10 +185,14 @@ public static Optional<String> getUniquePathDirectory(List<String> paths, Path c
      * @param paths List of paths as Strings
      * @param comparePath The to be shortened path
      */
-    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));
+    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));
     }
 
     /**
@@ -173,12 +205,16 @@ public static List<String> uniquePathSubstrings(List<String> paths) {
         List<Deque<String>> stackList = new ArrayList<>(paths.size());
         // prepare data structures
         for (String path : paths) {
-            List<String> directories = Arrays.asList(path.split(Pattern.quote(File.separator)));
+            List<String> directories = Arrays.asList(
+                path.split(Pattern.quote(File.separator))
+            );
             Deque<String> stack = new ArrayDeque<>(directories.reversed());
             stackList.add(stack);
         }
 
-        List<String> pathSubstrings = new ArrayList<>(Collections.nCopies(paths.size(), ""));
+        List<String> pathSubstrings = new ArrayList<>(
+            Collections.nCopies(paths.size(), "")
+        );
 
         // compute the shortest folder substrings
         while (!stackList.stream().allMatch(Deque::isEmpty)) {
@@ -192,7 +228,10 @@ public static List<String> uniquePathSubstrings(List<String> paths) {
                     pathSubstrings.set(i, stringFromDeque);
                 } else if (!stack.isEmpty()) {
                     String stringFromStack = stack.pop();
-                    pathSubstrings.set(i, stringFromStack + File.separator + tempPathString);
+                    pathSubstrings.set(
+                        i,
+                        stringFromStack + File.separator + tempPathString
+                    );
                 }
             }
 
@@ -214,20 +253,31 @@ 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.");
             return false;
         }
         if (Files.exists(pathToDestinationFile) && !replaceExisting) {
-            LOGGER.error("Path to the destination file exists but the file shouldn't be replaced.");
+            LOGGER.error(
+                "Path to the destination file exists but the file shouldn't be replaced."
+            );
             return false;
         }
         try {
             // Preserve Hard Links with OpenOption defaults included for clarity
-            Files.write(pathToDestinationFile, Files.readAllBytes(pathToSourceFile),
-                        StandardOpenOption.CREATE, StandardOpenOption.WRITE, StandardOpenOption.TRUNCATE_EXISTING);
+            Files.write(
+                pathToDestinationFile,
+                Files.readAllBytes(pathToSourceFile),
+                StandardOpenOption.CREATE,
+                StandardOpenOption.WRITE,
+                StandardOpenOption.TRUNCATE_EXISTING
+            );
             return true;
         } catch (IOException e) {
             LOGGER.error("Copying Files failed.", e);
@@ -265,14 +315,18 @@ public static Path relativize(Path file, List<Path> directories) {
      * @param fileDirs list of directories to try for expansion
      * @return list of files. May be empty
      */
-    public static List<Path> getListOfLinkedFiles(List<BibEntry> bes, List<Path> fileDirs) {
+    public static List<Path> getListOfLinkedFiles(
+        List<BibEntry> bes,
+        List<Path> fileDirs
+    ) {
         Objects.requireNonNull(bes);
         Objects.requireNonNull(fileDirs);
 
-        return bes.stream()
-                  .flatMap(entry -> entry.getFiles().stream())
-                  .flatMap(file -> file.findIn(fileDirs).stream())
-                  .collect(Collectors.toList());
+        return bes
+            .stream()
+            .flatMap(entry -> entry.getFiles().stream())
+            .flatMap(file -> file.findIn(fileDirs).stream())
+            .collect(Collectors.toList());
     }
 
     /**
@@ -283,8 +337,17 @@ 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) {
-        String targetName = BracketedPattern.expandBrackets(fileNamePattern, ';', entry, database);
+    public static String createFileNameFromPattern(
+        BibDatabase database,
+        BibEntry entry,
+        String fileNamePattern
+    ) {
+        String targetName = BracketedPattern.expandBrackets(
+            fileNamePattern,
+            ';',
+            entry,
+            database
+        );
 
         if (targetName.isEmpty()) {
             targetName = entry.getCitationKey().orElse("default");
@@ -303,8 +366,17 @@ 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;
@@ -323,21 +395,36 @@ public static String createDirNameFromPattern(BibDatabase database, BibEntry ent
      * @param rootDirectory the rootDirectory that will be searched
      * @return the path to the first file that matches the defined conditions
      */
-    public static Optional<Path> findSingleFileRecursively(String filename, Path rootDirectory) {
+    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 " + filename + " inside the directory " + rootDirectory);
+            LOGGER.error(
+                "Error trying to locate the file " +
+                filename +
+                " inside the directory " +
+                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));
+        return find(
+            fileName,
+            databaseContext.getFileDirectories(filePreferences)
+        );
     }
 
     /**
@@ -358,9 +445,10 @@ public static Optional<Path> find(String fileName, List<Path> directories) {
             }
         }
 
-        return directories.stream()
-                          .flatMap(directory -> find(fileName, directory).stream())
-                          .findFirst();
+        return directories
+            .stream()
+            .flatMap(directory -> find(fileName, directory).stream())
+            .findFirst();
     }
 
     /**
@@ -412,7 +500,10 @@ public static Optional<Path> find(String fileName, Path directory) {
      * @param directories the directories that will be searched
      * @return a list including all found paths to files that match the defined conditions
      */
-    public static List<Path> findListOfFiles(String filename, List<Path> directories) {
+    public static List<Path> findListOfFiles(
+        String filename,
+        List<Path> directories
+    ) {
         List<Path> files = new ArrayList<>();
         for (Path dir : directories) {
             FileUtil.find(filename, dir).ifPresent(files::add);
@@ -425,8 +516,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('\\', '/');
     }
 
     /**
@@ -447,14 +537,23 @@ 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) {
-        return databaseContext.getDatabasePath().map(Path::getParent).orElse(workingDirectory);
+    public static Path getInitialDirectory(
+        BibDatabaseContext databaseContext,
+        Path workingDirectory
+    ) {
+        return databaseContext
+            .getDatabasePath()
+            .map(Path::getParent)
+            .orElse(workingDirectory);
     }
 
     /**
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 01bcbbf0ba8..1072450ebb0 100644
--- a/src/main/java/org/jabref/logic/util/io/RegExpBasedFileFinder.java
+++ b/src/main/java/org/jabref/logic/util/io/RegExpBasedFileFinder.java
@@ -16,7 +16,6 @@
 import java.util.regex.PatternSyntaxException;
 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;
@@ -25,7 +24,9 @@ class RegExpBasedFileFinder implements FileFinder {
 
     private static final String EXT_MARKER = "__EXTENSION__";
 
-    private static final Pattern ESCAPE_PATTERN = Pattern.compile("([^\\\\])\\\\([^\\\\])");
+    private static final Pattern ESCAPE_PATTERN = Pattern.compile(
+        "([^\\\\])\\\\([^\\\\])"
+    );
 
     private final String regExp;
     private final Character keywordDelimiter;
@@ -43,24 +44,48 @@ 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);
+        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);
+        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);
+        Function<String, String> bracketToFileNameRegex = expandBracket.andThen(
+            RegExpBasedFileFinder::toFileNameRegex
+        );
 
-        String expandedBracketAsFileNameRegex = BracketedPattern.expandBrackets(filePart, bracketToFileNameRegex);
+        String expandedBracketAsFileNameRegex = BracketedPattern.expandBrackets(
+            filePart,
+            bracketToFileNameRegex
+        );
 
         String fileNamePattern = expandedBracketAsFileNameRegex
-                .replaceAll(EXT_MARKER, extensionRegExp) // Replace the extension marker
-                .replaceAll("\\\\\\\\", "\\\\");
+            .replaceAll(EXT_MARKER, extensionRegExp) // Replace the extension marker
+            .replaceAll("\\\\\\\\", "\\\\");
         try {
-            return Pattern.compile('^' + fileNamePattern + '$', Pattern.CASE_INSENSITIVE);
+            return Pattern.compile(
+                '^' + fileNamePattern + '$',
+                Pattern.CASE_INSENSITIVE
+            );
         } catch (PatternSyntaxException e) {
-            throw new IOException(String.format("There is a syntax error in the regular expression %s used to search for files", fileNamePattern), e);
+            throw new IOException(
+                String.format(
+                    "There is a syntax error in the regular expression %s used to search for files",
+                    fileNamePattern
+                ),
+                e
+            );
         }
     }
 
@@ -72,8 +97,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 +116,11 @@ 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 +155,11 @@ 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 +171,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 +219,51 @@ 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));
+                    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();
@@ -201,9 +272,21 @@ 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)) {
+        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
+            )
+        ) {
             resultFiles.addAll(pathStream.collect(Collectors.toList()));
         } catch (UncheckedIOException uncheckedIOException) {
             // Previously, an empty list were returned here on both IOException and UncheckedIOException
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 b6126914de3..b4415484aba 100644
--- a/src/main/java/org/jabref/logic/util/io/XMLUtil.java
+++ b/src/main/java/org/jabref/logic/util/io/XMLUtil.java
@@ -6,16 +6,13 @@
 import java.util.List;
 import java.util.Optional;
 import java.util.RandomAccess;
-
 import javax.xml.transform.OutputKeys;
 import javax.xml.transform.Transformer;
 import javax.xml.transform.TransformerException;
 import javax.xml.transform.TransformerFactory;
 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;
@@ -29,10 +26,10 @@
  */
 @AllowedToUseStandardStreams("Used for debugging only")
 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.
@@ -53,7 +50,9 @@ public static void printDocument(Document doc) {
     }
 
     public static List<Node> asList(NodeList n) {
-        return n.getLength() == 0 ? Collections.emptyList() : new NodeListWrapper(n);
+        return n.getLength() == 0
+            ? Collections.emptyList()
+            : new NodeListWrapper(n);
     }
 
     /**
@@ -81,9 +80,14 @@ public static Optional<String> getNodeContent(Node item, String nodeName) {
      * For example,
      * <item attributeName="content" />
      */
-    public static Optional<String> getAttributeContent(Node item, String attributeName) {
+    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);
     }
 
     /**
@@ -116,7 +120,9 @@ 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>.
-    private static final class NodeListWrapper extends AbstractList<Node> implements RandomAccess {
+    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 86973053a09..04cc3990e9b 100644
--- a/src/main/java/org/jabref/logic/util/strings/HTMLUnicodeConversionMaps.java
+++ b/src/main/java/org/jabref/logic/util/strings/HTMLUnicodeConversionMaps.java
@@ -9,13 +9,19 @@ public class HTMLUnicodeConversionMaps {
     // 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<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<>();
-    public static final Map<Integer, String> NUMERICAL_LATEX_CONVERSION_MAP = new HashMap<>();
-    public static final Map<String, String> UNICODE_LATEX_CONVERSION_MAP = new HashMap<>();
-    public static final Map<String, String> LATEX_HTML_CONVERSION_MAP = new HashMap<>();
-    public static final Map<String, String> LATEX_UNICODE_CONVERSION_MAP = new HashMap<>();
+    public static final Map<String, String> UNICODE_ESCAPED_ACCENTS =
+        new HashMap<>();
+    public static final Map<Integer, String> NUMERICAL_LATEX_CONVERSION_MAP =
+        new HashMap<>();
+    public static final Map<String, String> UNICODE_LATEX_CONVERSION_MAP =
+        new HashMap<>();
+    public static final Map<String, String> LATEX_HTML_CONVERSION_MAP =
+        new HashMap<>();
+    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
@@ -27,830 +33,820 @@ public class HTMLUnicodeConversionMaps {
     // 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
-
-            /* 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,
+        { "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
+        /* 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
+        /* 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
+        { "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
+        { "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
+        /* 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'
+        { "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,
+        { "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
+        { "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'
+        { "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'
+        { "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
-
-            /* 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
+        /* 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
+        /* 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
     };
 
     // 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 {
@@ -858,29 +854,60 @@ public class HTMLUnicodeConversionMaps {
             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] + ";");
+                } 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])));
-                        UNICODE_LATEX_CONVERSION_MAP.put(unicodeSymbol, aConversionList[2]);
+                        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);
+                            LATEX_UNICODE_CONVERSION_MAP.put(
+                                strippedLaTeX,
+                                unicodeSymbol
+                            );
                         }
                     }
                 }
             }
         }
         for (String[] anAccentList : ACCENT_LIST) {
-            ESCAPED_ACCENTS.put(Integer.decode(anAccentList[0]), anAccentList[1]);
-            UNICODE_ESCAPED_ACCENTS.put(anAccentList[1],
-                    String.valueOf(Character.toChars(Integer.decode(anAccentList[0]))));
+            ESCAPED_ACCENTS.put(
+                Integer.decode(anAccentList[0]),
+                anAccentList[1]
+            );
+            UNICODE_ESCAPED_ACCENTS.put(
+                anAccentList[1],
+                String.valueOf(
+                    Character.toChars(Integer.decode(anAccentList[0]))
+                )
+            );
         }
         // Manually added values which are killed by cleanLaTeX
         LATEX_HTML_CONVERSION_MAP.put("$", "&dollar;");
@@ -899,8 +926,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/QuotedStringTokenizer.java b/src/main/java/org/jabref/logic/util/strings/QuotedStringTokenizer.java
index 340713f5bc3..2c97c5cc6a6 100644
--- a/src/main/java/org/jabref/logic/util/strings/QuotedStringTokenizer.java
+++ b/src/main/java/org/jabref/logic/util/strings/QuotedStringTokenizer.java
@@ -17,13 +17,19 @@ public class QuotedStringTokenizer {
      * @param delimiters     The delimiter characters.
      * @param quoteCharacter The quoting character. Every character (including, but not limited to, delimiters) that is preceded by this character is not treated as a delimiter, but as a token component.
      */
-    public QuotedStringTokenizer(String content, String delimiters, char quoteCharacter) {
+    public QuotedStringTokenizer(
+        String content,
+        String delimiters,
+        char quoteCharacter
+    ) {
         this.content = content;
         this.delimiters = delimiters;
         quoteChar = quoteCharacter;
         contentLength = this.content.length();
         // skip leading delimiters
-        while (isDelimiter(this.content.charAt(index)) && index < contentLength) {
+        while (
+            isDelimiter(this.content.charAt(index)) && index < contentLength
+        ) {
             ++index;
         }
     }
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 bdde7c1fd49..f3e47c9043d 100644
--- a/src/main/java/org/jabref/logic/util/strings/StringManipulator.java
+++ b/src/main/java/org/jabref/logic/util/strings/StringManipulator.java
@@ -6,10 +6,11 @@
 import org.jabref.model.util.ResultingStringState;
 
 public class StringManipulator {
+
     private enum LetterCase {
         UPPER,
         LOWER,
-        CAPITALIZED
+        CAPITALIZED,
     }
 
     enum Direction {
@@ -32,24 +33,45 @@ enum Direction {
      *
      * @return              The resulting text and caret position.
      */
-    private static ResultingStringState setWordCase(String text, int caretPosition, LetterCase targetCase) {
-        int nextWordBoundary = getNextWordBoundary(caretPosition, text, Direction.NEXT);
+    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,
-                text.substring(0, wordStartPosition) + result + text.substring(nextWordBoundary));
+            nextWordBoundary,
+            text.substring(0, wordStartPosition) +
+            result +
+            text.substring(nextWordBoundary)
+        );
     }
 
     /**
@@ -61,18 +83,30 @@ 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);
+        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));
+                caretPosition,
+                text.substring(0, caretPosition) +
+                text.substring(nextWordBoundary)
+            );
             case PREVIOUS -> new ResultingStringState(
-                    nextWordBoundary,
-                    text.substring(0, nextWordBoundary) + text.substring(caretPosition));
+                nextWordBoundary,
+                text.substring(0, nextWordBoundary) +
+                text.substring(caretPosition)
+            );
         };
     }
 
@@ -85,27 +119,41 @@ static ResultingStringState deleteUntilWordBoundary(int caretPosition, String te
      *
      * @return              The position of the next whitespace after a word
      */
-    static int getNextWordBoundary(int caretPosition, String text, Direction direction) {
+    static int getNextWordBoundary(
+        int caretPosition,
+        String text,
+        Direction direction
+    ) {
         int i = caretPosition;
 
         if (direction == Direction.PREVIOUS) {
             // Swallow whitespaces
-            while (i > 0 && Character.isWhitespace((text.charAt(i + direction.OFFSET)))) {
+            while (
+                i > 0 &&
+                Character.isWhitespace((text.charAt(i + direction.OFFSET)))
+            ) {
                 i += direction.OFFSET;
             }
 
             // Read next word
-            while (i > 0 && !Character.isWhitespace(text.charAt(i + direction.OFFSET))) {
+            while (
+                i > 0 &&
+                !Character.isWhitespace(text.charAt(i + direction.OFFSET))
+            ) {
                 i += direction.OFFSET;
             }
         } else if (direction == Direction.NEXT) {
             // Swallow whitespaces
-            while (i < text.length() && Character.isWhitespace(text.charAt(i))) {
+            while (
+                i < text.length() && Character.isWhitespace(text.charAt(i))
+            ) {
                 i += direction.OFFSET;
             }
 
             // Read next word
-            while (i < text.length() && !Character.isWhitespace((text.charAt(i)))) {
+            while (
+                i < text.length() && !Character.isWhitespace((text.charAt(i)))
+            ) {
                 i += direction.OFFSET;
             }
         }
@@ -121,7 +169,10 @@ static int getNextWordBoundary(int caretPosition, String text, Direction directi
      *
      * @return String       The resulting text and caret position.
      */
-    public static ResultingStringState capitalize(int caretPosition, String text) {
+    public static ResultingStringState capitalize(
+        int caretPosition,
+        String text
+    ) {
         return setWordCase(text, caretPosition, LetterCase.CAPITALIZED);
     }
 
@@ -133,7 +184,10 @@ public static ResultingStringState capitalize(int caretPosition, String text) {
      *
      * @return String       The resulting text and caret position.
      */
-    public static ResultingStringState uppercase(int caretPosition, String text) {
+    public static ResultingStringState uppercase(
+        int caretPosition,
+        String text
+    ) {
         return setWordCase(text, caretPosition, LetterCase.UPPER);
     }
 
@@ -145,7 +199,10 @@ public static ResultingStringState uppercase(int caretPosition, String text) {
      *
      * @return String       The resulting text and caret position.
      */
-    public static ResultingStringState lowercase(int caretPosition, String text) {
+    public static ResultingStringState lowercase(
+        int caretPosition,
+        String text
+    ) {
         return setWordCase(text, caretPosition, LetterCase.LOWER);
     }
 
@@ -157,7 +214,10 @@ public static ResultingStringState lowercase(int caretPosition, String text) {
      *
      * @return String       The resulting text and caret position.
      */
-    public static ResultingStringState killWord(int caretPosition, String text) {
+    public static ResultingStringState killWord(
+        int caretPosition,
+        String text
+    ) {
         return deleteUntilWordBoundary(caretPosition, text, Direction.NEXT);
     }
 
@@ -169,7 +229,10 @@ public static ResultingStringState killWord(int caretPosition, String text) {
      *
      * @return String       The resulting text and caret position.
      */
-    public static ResultingStringState backwardKillWord(int caretPosition, String text) {
+    public static ResultingStringState backwardKillWord(
+        int caretPosition,
+        String text
+    ) {
         return deleteUntilWordBoundary(caretPosition, text, Direction.PREVIOUS);
     }
 }
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 2b83e2b9a8d..9b12075f70e 100644
--- a/src/main/java/org/jabref/logic/util/strings/StringSimilarity.java
+++ b/src/main/java/org/jabref/logic/util/strings/StringSimilarity.java
@@ -1,10 +1,10 @@
 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
     private final int METRIC_THRESHOLD = 4;
@@ -22,6 +22,9 @@ 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/util/strings/XmlCharsMap.java b/src/main/java/org/jabref/logic/util/strings/XmlCharsMap.java
index 2b0a00734fb..acc2f502c0d 100644
--- a/src/main/java/org/jabref/logic/util/strings/XmlCharsMap.java
+++ b/src/main/java/org/jabref/logic/util/strings/XmlCharsMap.java
@@ -3,6 +3,7 @@
 import java.util.HashMap;
 
 public class XmlCharsMap extends HashMap<String, String> {
+
     public XmlCharsMap() {
         put("\\{\\\\\\\"\\{a\\}\\}", "&#x00E4;");
         put("\\{\\\\\\\"\\{A\\}\\}", "&#x00C4;");
diff --git a/src/main/java/org/jabref/logic/xmp/DocumentInformationExtractor.java b/src/main/java/org/jabref/logic/xmp/DocumentInformationExtractor.java
index 9c6ce27e82f..af6c6834267 100644
--- a/src/main/java/org/jabref/logic/xmp/DocumentInformationExtractor.java
+++ b/src/main/java/org/jabref/logic/xmp/DocumentInformationExtractor.java
@@ -2,7 +2,10 @@
 
 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,18 +13,15 @@
 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;
-
 public class DocumentInformationExtractor {
 
     private final PDDocumentInformation documentInformation;
 
     private final BibEntry bibEntry;
 
-    public DocumentInformationExtractor(PDDocumentInformation documentInformation) {
+    public DocumentInformationExtractor(
+        PDDocumentInformation documentInformation
+    ) {
         this.documentInformation = documentInformation;
 
         this.bibEntry = new BibEntry();
diff --git a/src/main/java/org/jabref/logic/xmp/DublinCoreExtractor.java b/src/main/java/org/jabref/logic/xmp/DublinCoreExtractor.java
index 8df2f2ed770..9b4c763abe4 100644
--- a/src/main/java/org/jabref/logic/xmp/DublinCoreExtractor.java
+++ b/src/main/java/org/jabref/logic/xmp/DublinCoreExtractor.java
@@ -8,7 +8,9 @@
 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.TypedBibEntry;
 import org.jabref.logic.formatter.casechanger.UnprotectTermsFormatter;
 import org.jabref.model.database.BibDatabase;
@@ -24,10 +26,6 @@
 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;
 
@@ -40,20 +38,27 @@ public class DublinCoreExtractor {
     public static final String DC_RIGHTS = "rights";
     public static final String DC_SOURCE = "source";
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(DublinCoreExtractor.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(
+        DublinCoreExtractor.class
+    );
 
     private final DublinCoreSchema dcSchema;
     private final XmpPreferences xmpPreferences;
 
     private final BibEntry bibEntry;
 
-    private final UnprotectTermsFormatter unprotectTermsFormatter = new UnprotectTermsFormatter();
+    private final UnprotectTermsFormatter unprotectTermsFormatter =
+        new UnprotectTermsFormatter();
 
     /**
      * @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;
@@ -65,7 +70,10 @@ public DublinCoreExtractor(DublinCoreSchema dcSchema, XmpPreferences xmpPreferen
     private void extractEditor() {
         List<String> contributors = dcSchema.getContributors();
         if ((contributors != null) && !contributors.isEmpty()) {
-            bibEntry.setField(StandardField.EDITOR, String.join(" and ", contributors));
+            bibEntry.setField(
+                StandardField.EDITOR,
+                String.join(" and ", contributors)
+            );
         }
     }
 
@@ -75,7 +83,10 @@ 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)
+            );
         }
     }
 
@@ -86,12 +97,27 @@ private void extractDate() {
         List<String> dates = dcSchema.getUnqualifiedSequenceValueList("date");
         if ((dates != null) && !dates.isEmpty()) {
             String date = dates.get(0).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)));
-                    });
+            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)
+                            )
+                        );
+                });
         }
     }
 
@@ -126,7 +152,10 @@ private void extractDOI() {
     private void extractPublisher() {
         List<String> publishers = dcSchema.getPublishers();
         if ((publishers != null) && !publishers.isEmpty()) {
-            bibEntry.setField(StandardField.PUBLISHER, String.join(" and ", publishers));
+            bibEntry.setField(
+                StandardField.PUBLISHER,
+                String.join(" and ", publishers)
+            );
         }
     }
 
@@ -160,9 +189,10 @@ private void extractBibTexFields() {
         };
         List<String> relationships = dcSchema.getRelations();
         if (relationships != null) {
-            relationships.stream()
-                         .filter(isBibTeXElement)
-                         .forEach(splitBibTeXElement);
+            relationships
+                .stream()
+                .filter(isBibTeXElement)
+                .forEach(splitBibTeXElement);
         }
     }
 
@@ -174,7 +204,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);
@@ -197,7 +227,10 @@ private void extractSource() {
     private void extractSubject() {
         List<String> subjects = dcSchema.getSubjects();
         if ((subjects != null) && !subjects.isEmpty()) {
-            bibEntry.addKeywords(subjects, xmpPreferences.getKeywordSeparator());
+            bibEntry.addKeywords(
+                subjects,
+                xmpPreferences.getKeywordSeparator()
+            );
         }
     }
 
@@ -317,8 +350,11 @@ private void fillCreator(String creators) {
      * BibTeX: year, month; DC: 'dc:date'
      */
     private void fillDate() {
-        bibEntry.getFieldOrAlias(StandardField.DATE)
-                .ifPresent(publicationDate -> dcSchema.addUnqualifiedSequenceValue("date", publicationDate));
+        bibEntry
+            .getFieldOrAlias(StandardField.DATE)
+            .ifPresent(publicationDate ->
+                dcSchema.addUnqualifiedSequenceValue("date", publicationDate)
+            );
     }
 
     /**
@@ -346,7 +382,9 @@ private void fillPublisher(String publisher) {
      * BibTeX: keywords; DC: 'dc:subject'
      */
     private void fillKeywords(String value) {
-        String[] keywords = value.split(xmpPreferences.getKeywordSeparator().toString());
+        String[] keywords = value.split(
+            xmpPreferences.getKeywordSeparator().toString()
+        );
         for (String keyword : keywords) {
             dcSchema.addSubject(keyword.trim());
         }
@@ -370,8 +408,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);
     }
 
     /**
@@ -404,7 +441,10 @@ private void fillCustomField(Field field) {
      */
     private void fillType() {
         // BibTeX: entry type; DC: 'dc:type'
-        TypedBibEntry typedEntry = new TypedBibEntry(bibEntry, BibDatabaseMode.BIBTEX);
+        TypedBibEntry typedEntry = new TypedBibEntry(
+            bibEntry,
+            BibDatabaseMode.BIBTEX
+        );
         String typeForDisplay = typedEntry.getTypeForDisplay();
         if (!typeForDisplay.isEmpty()) {
             dcSchema.addType(typeForDisplay);
@@ -421,36 +461,35 @@ private void fillType() {
      */
     public void fillDublinCoreSchema() {
         // Query privacy filter settings
-        boolean useXmpPrivacyFilter = xmpPreferences.shouldUseXmpPrivacyFilter();
+        boolean useXmpPrivacyFilter =
+            xmpPreferences.shouldUseXmpPrivacyFilter();
 
-        SortedSet<Field> fields = new TreeSet<>(Comparator.comparing(Field::getName));
+        SortedSet<Field> fields = new TreeSet<>(
+            Comparator.comparing(Field::getName)
+        );
         fields.addAll(bibEntry.getFields());
         for (Field field : fields) {
-            if (useXmpPrivacyFilter && xmpPreferences.getXmpPrivacyFilter().contains(field)) {
+            if (
+                useXmpPrivacyFilter &&
+                xmpPreferences.getXmpPrivacyFilter().contains(field)
+            ) {
                 continue;
             }
 
-            String value = unprotectTermsFormatter.format(bibEntry.getField(field).get());
+            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 +499,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 136bb06e2f1..ebd56c03d8b 100644
--- a/src/main/java/org/jabref/logic/xmp/XmpPreferences.java
+++ b/src/main/java/org/jabref/logic/xmp/XmpPreferences.java
@@ -1,13 +1,11 @@
 package org.jabref.logic.xmp;
 
 import java.util.Set;
-
 import javafx.beans.property.BooleanProperty;
 import javafx.beans.property.ObjectProperty;
 import javafx.beans.property.SimpleBooleanProperty;
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableSet;
-
 import org.jabref.model.entry.field.Field;
 
 public class XmpPreferences {
@@ -16,8 +14,13 @@ public class XmpPreferences {
     private final ObservableSet<Field> xmpPrivacyFilter;
     private final ObjectProperty<Character> keywordSeparator;
 
-    public XmpPreferences(boolean useXmpPrivacyFilter, Set<Field> xmpPrivacyFilter, ObjectProperty<Character> keywordSeparator) {
-        this.useXmpPrivacyFilter = new SimpleBooleanProperty(useXmpPrivacyFilter);
+    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 a5e4d009d32..a491b8a763b 100644
--- a/src/main/java/org/jabref/logic/xmp/XmpUtilReader.java
+++ b/src/main/java/org/jabref/logic/xmp/XmpUtilReader.java
@@ -7,11 +7,6 @@
 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,19 +14,27 @@
 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;
 
 public class XmpUtilReader {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(XmpUtilReader.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(
+        XmpUtilReader.class
+    );
 
     private static final String START_TAG = "<rdf:Description";
     private static final String END_TAG = "</rdf:Description>";
 
     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
     }
 
     /**
@@ -58,8 +61,7 @@ public List<XMPMetadata> readRawXmp(Path path) throws IOException {
      *                     the operation.
      */
     public List<BibEntry> readXmp(Path path, XmpPreferences xmpPreferences)
-            throws IOException {
-
+        throws IOException {
         List<BibEntry> result = new LinkedList<>();
 
         try (PDDocument document = loadWithAutomaticDecryption(path)) {
@@ -68,24 +70,37 @@ 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());
-                        Optional<BibEntry> entry = dcExtractor.extractBibtexEntry();
+                        DublinCoreExtractor dcExtractor =
+                            new DublinCoreExtractor(
+                                dcSchema,
+                                xmpPreferences,
+                                new BibEntry()
+                            );
+                        Optional<BibEntry> entry =
+                            dcExtractor.extractBibtexEntry();
                         entry.ifPresent(result::add);
                     }
                 }
             }
             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);
+                PDDocumentInformation documentInformation =
+                    document.getDocumentInformation();
+                DocumentInformationExtractor diExtractor =
+                    new DocumentInformationExtractor(documentInformation);
                 Optional<BibEntry> entry = diExtractor.extractBibtexEntry();
                 entry.ifPresent(result::add);
             }
         }
 
-        result.forEach(entry -> entry.addFile(new LinkedFile("", path.toAbsolutePath(), "PDF")));
+        result.forEach(entry ->
+            entry.addFile(new LinkedFile("", path.toAbsolutePath(), "PDF"))
+        );
         return result;
     }
 
@@ -112,14 +127,20 @@ 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,9 +148,16 @@ 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.warn("Problem parsing XMP schema. Continuing with other schemas.", ex);
+                LOGGER.warn(
+                    "Problem parsing XMP schema. Continuing with other schemas.",
+                    ex
+                );
             }
         }
         return metaList;
@@ -141,7 +169,8 @@ private List<XMPMetadata> getXmpMetadata(PDDocument document) {
      * @param path The path to load.
      * @throws IOException from the underlying @link PDDocument#load(File)
      */
-    public PDDocument loadWithAutomaticDecryption(Path path) throws IOException {
+    public PDDocument loadWithAutomaticDecryption(Path path)
+        throws IOException {
         // try to load the document
         // also uses an empty string as default password
         return Loader.loadPDF(path.toFile());
diff --git a/src/main/java/org/jabref/logic/xmp/XmpUtilShared.java b/src/main/java/org/jabref/logic/xmp/XmpUtilShared.java
index 4957a11cfab..085bef1abbf 100644
--- a/src/main/java/org/jabref/logic/xmp/XmpUtilShared.java
+++ b/src/main/java/org/jabref/logic/xmp/XmpUtilShared.java
@@ -4,11 +4,9 @@
 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;
 
@@ -18,12 +16,14 @@
  */
 public class XmpUtilShared {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(XmpUtilShared.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(
+        XmpUtilShared.class
+    );
 
-    private XmpUtilShared() {
-    }
+    private XmpUtilShared() {}
 
-    protected static XMPMetadata parseXmpMetadata(InputStream is) throws IOException {
+    protected static XMPMetadata parseXmpMetadata(InputStream is)
+        throws IOException {
         XMPMetadata meta;
         try {
             DomXmpParser parser = new DomXmpParser();
@@ -45,15 +45,22 @@ protected static XMPMetadata parseXmpMetadata(InputStream is) throws IOException
      * @param path the path to the PDF.
      * @return whether a BibEntry was found in the given PDF.
      */
-    public static boolean hasMetadata(Path path, XmpPreferences xmpPreferences) {
+    public static boolean hasMetadata(
+        Path path,
+        XmpPreferences xmpPreferences
+    ) {
         try {
-            List<BibEntry> bibEntries = new XmpUtilReader().readXmp(path, xmpPreferences);
+            List<BibEntry> bibEntries = new XmpUtilReader()
+                .readXmp(path, xmpPreferences);
             return !bibEntries.isEmpty();
         } catch (EncryptedPdfsNotSupportedException ex) {
             LOGGER.info("Encryption not supported by XMPUtil");
             return false;
         } catch (IOException e) {
-            XmpUtilShared.LOGGER.debug("No metadata was found. Path: {}", path.toString());
+            XmpUtilShared.LOGGER.debug(
+                "No metadata was found. Path: {}",
+                path.toString()
+            );
             return false;
         }
     }
diff --git a/src/main/java/org/jabref/logic/xmp/XmpUtilWriter.java b/src/main/java/org/jabref/logic/xmp/XmpUtilWriter.java
index 023d2a66954..3a27a017faa 100644
--- a/src/main/java/org/jabref/logic/xmp/XmpUtilWriter.java
+++ b/src/main/java/org/jabref/logic/xmp/XmpUtilWriter.java
@@ -11,18 +11,7 @@
 import java.util.List;
 import java.util.function.Predicate;
 import java.util.stream.Collectors;
-
 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;
@@ -31,6 +20,14 @@
 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;
 
@@ -44,9 +41,12 @@ public class XmpUtilWriter {
 
     private static final String XMP_BEGIN_END_TAG = "?xpacket";
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(XmpUtilWriter.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(
+        XmpUtilWriter.class
+    );
 
-    private final UnprotectTermsFormatter unprotectTermsFormatter = new UnprotectTermsFormatter();
+    private final UnprotectTermsFormatter unprotectTermsFormatter =
+        new UnprotectTermsFormatter();
     private final XmpPreferences xmpPreferences;
 
     public XmpUtilWriter(XmpPreferences xmpPreferences) {
@@ -72,9 +72,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 +86,11 @@ 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,9 +101,12 @@ 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) {
-        DublinCoreExtractor dcExtractor = new DublinCoreExtractor(dcSchema, xmpPreferences, entry);
+    private void writeToDCSchema(DublinCoreSchema dcSchema, BibEntry entry) {
+        DublinCoreExtractor dcExtractor = new DublinCoreExtractor(
+            dcSchema,
+            xmpPreferences,
+            entry
+        );
         dcExtractor.fillDublinCoreSchema();
     }
 
@@ -117,11 +120,11 @@ 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)
-        throws IOException, TransformerException {
-
+    private void writeDublinCore(
+        PDDocument document,
+        List<BibEntry> entries,
+        BibDatabase database
+    ) throws IOException, TransformerException {
         List<BibEntry> resolvedEntries;
         if (database == null) {
             resolvedEntries = entries;
@@ -137,7 +140,8 @@ private void writeDublinCore(PDDocument document,
             meta = XMPMetadata.createXMPMetadata();
         } else {
             try {
-                meta = XmpUtilShared.parseXmpMetadata(metaRaw.createInputStream());
+                meta =
+                    XmpUtilShared.parseXmpMetadata(metaRaw.createInputStream());
                 // In case, that the pdf file has no namespace definition for xmp,
                 // but metadata in a different format, the parser throws an exception
                 // Creating an empty xmp metadata element solves this problem
@@ -150,7 +154,10 @@ 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);
         }
 
@@ -182,10 +189,16 @@ private String generateXmpStringWithXmpDeclaration(List<BibEntry> entries) {
             serializer.serialize(meta, os, true);
             return os.toString(StandardCharsets.UTF_8);
         } catch (TransformerException e) {
-            LOGGER.warn("Transformation into XMP not possible: " + e.getMessage(), e);
+            LOGGER.warn(
+                "Transformation into XMP not possible: " + e.getMessage(),
+                e
+            );
             return "";
         } catch (UnsupportedEncodingException e) {
-            LOGGER.warn("Unsupported encoding to UTF-8 of bib entries in XMP metadata.", e);
+            LOGGER.warn(
+                "Unsupported encoding to UTF-8 of bib entries in XMP metadata.",
+                e
+            );
             return "";
         } catch (IOException e) {
             LOGGER.warn("IO Exception thrown by closing the output stream.", e);
@@ -203,14 +216,17 @@ private String generateXmpStringWithXmpDeclaration(List<BibEntry> entries) {
      * @return  If something goes wrong (e.g. an exception is thrown), the method returns an empty string,
      *          otherwise it returns the xmp metadata without metadata description as a string in dublin core format.
      */
-    public String generateXmpStringWithoutXmpDeclaration(List<BibEntry> entries) {
+    public String generateXmpStringWithoutXmpDeclaration(
+        List<BibEntry> entries
+    ) {
         String xmpContent = generateXmpStringWithXmpDeclaration(entries);
         // remove the <?xpacket *> tags to enable the usage of the CTAN package xmpincl
         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()));
+        return Arrays
+            .stream(xmpContent.split(System.lineSeparator()))
+            .filter(isBeginOrEndTag.negate())
+            .collect(Collectors.joining(System.lineSeparator()));
     }
 
     /**
@@ -227,15 +243,21 @@ 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);
 
-        boolean useXmpPrivacyFilter = xmpPreferences.shouldUseXmpPrivacyFilter();
+        boolean useXmpPrivacyFilter =
+            xmpPreferences.shouldUseXmpPrivacyFilter();
         for (Field field : resolvedEntry.getFields()) {
-            if (useXmpPrivacyFilter && xmpPreferences.getXmpPrivacyFilter().contains(field)) {
+            if (
+                useXmpPrivacyFilter &&
+                xmpPreferences.getXmpPrivacyFilter().contains(field)
+            ) {
                 // erase field instead of adding it
                 if (StandardField.AUTHOR == field) {
                     di.setAuthor(null);
@@ -252,7 +274,9 @@ private void writeDocumentInformation(PDDocument document,
             }
 
             // LaTeX content is removed from the string for "standard" fields in the PDF
-            String value = unprotectTermsFormatter.format(resolvedEntry.getField(field).get());
+            String value = unprotectTermsFormatter.format(
+                resolvedEntry.getField(field).get()
+            );
 
             if (StandardField.AUTHOR == field) {
                 di.setAuthor(value);
@@ -264,10 +288,16 @@ private void writeDocumentInformation(PDDocument document,
                 di.setSubject(value);
             } else {
                 // We hit the case of an PDF-unsupported field --> write it directly
-                di.setCustomMetadataValue("bibtex/" + field, resolvedEntry.getField(field).get());
+                di.setCustomMetadataValue(
+                    "bibtex/" + field,
+                    resolvedEntry.getField(field).get()
+                );
             }
         }
-        di.setCustomMetadataValue("bibtex/entrytype", resolvedEntry.getType().getDisplayName());
+        di.setCustomMetadataValue(
+            "bibtex/entrytype",
+            resolvedEntry.getType().getDisplayName()
+        );
     }
 
     /**
@@ -289,10 +319,11 @@ 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)
-        throws IOException, TransformerException {
+    public void writeXmp(
+        Path path,
+        List<BibEntry> bibtexEntries,
+        BibDatabase database
+    ) throws IOException, TransformerException {
         List<BibEntry> resolvedEntries;
         if (database == null) {
             resolvedEntries = bibtexEntries;
@@ -311,7 +342,11 @@ public void writeXmp(Path path,
 
             // Write schemas (PDDocumentInformation and DublinCoreSchema) to the document metadata
             if (!resolvedEntries.isEmpty()) {
-                writeDocumentInformation(document, resolvedEntries.get(0), null);
+                writeDocumentInformation(
+                    document,
+                    resolvedEntries.get(0),
+                    null
+                );
                 writeDublinCore(document, resolvedEntries, null);
             }
 
@@ -321,13 +356,19 @@ 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);
     }
 
-    private BibEntry getDefaultOrDatabaseEntry(BibEntry defaultEntry, BibDatabase database) {
+    private BibEntry getDefaultOrDatabaseEntry(
+        BibEntry defaultEntry,
+        BibDatabase database
+    ) {
         if (database == null) {
             return defaultEntry;
         } else {
diff --git a/src/main/java/org/jabref/migrations/ConvertLegacyExplicitGroups.java b/src/main/java/org/jabref/migrations/ConvertLegacyExplicitGroups.java
index 1b174abd162..d73341c1446 100644
--- a/src/main/java/org/jabref/migrations/ConvertLegacyExplicitGroups.java
+++ b/src/main/java/org/jabref/migrations/ConvertLegacyExplicitGroups.java
@@ -3,7 +3,6 @@
 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;
@@ -22,9 +21,13 @@ 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);
                 }
             }
@@ -32,7 +35,9 @@ public void performMigration(ParserResult parserResult) {
         }
     }
 
-    private List<ExplicitGroup> getExplicitGroupsWithLegacyKeys(GroupTreeNode node) {
+    private List<ExplicitGroup> getExplicitGroupsWithLegacyKeys(
+        GroupTreeNode node
+    ) {
         Objects.requireNonNull(node);
         List<ExplicitGroup> findings = new ArrayList<>();
 
@@ -43,7 +48,11 @@ 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 74832a8ca60..767cf1c08bd 100644
--- a/src/main/java/org/jabref/migrations/ConvertMarkingToGroups.java
+++ b/src/main/java/org/jabref/migrations/ConvertMarkingToGroups.java
@@ -1,5 +1,7 @@
 package org.jabref.migrations;
 
+import com.google.common.collect.Multimap;
+import com.google.common.collect.MultimapBuilder;
 import java.util.Collection;
 import java.util.List;
 import java.util.Map;
@@ -7,9 +9,7 @@
 import java.util.Optional;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
-
 import javafx.collections.ObservableList;
-
 import org.jabref.logic.groups.DefaultGroupsFactory;
 import org.jabref.logic.importer.ParserResult;
 import org.jabref.logic.l10n.Localization;
@@ -19,38 +19,57 @@
 import org.jabref.model.groups.GroupHierarchyType;
 import org.jabref.model.groups.GroupTreeNode;
 
-import com.google.common.collect.Multimap;
-import com.google.common.collect.MultimapBuilder;
-
 /**
  * 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.
  */
 public class ConvertMarkingToGroups implements PostOpenMigration {
 
-    private static final Pattern MARKING_PATTERN = Pattern.compile("\\[(.*):(\\d+)\\]");
+    private static final Pattern MARKING_PATTERN = Pattern.compile(
+        "\\[(.*):(\\d+)\\]"
+    );
 
     @Override
     public void performMigration(ParserResult parserResult) {
         Objects.requireNonNull(parserResult);
 
-        ObservableList<BibEntry> entries = parserResult.getDatabase().getEntries();
+        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, ','));
-
-            for (Map.Entry<String, Collection<BibEntry>> marking : markings.asMap().entrySet()) {
+                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, ','));
+                    new ExplicitGroup(
+                        markingName,
+                        GroupHierarchyType.INCLUDING,
+                        ','
+                    )
+                );
                 markingGroup.addEntriesToGroup(markingMatchedEntries);
             }
 
             if (!parserResult.getMetaData().getGroups().isPresent()) {
-                parserResult.getMetaData().setGroups(GroupTreeNode.fromGroup(DefaultGroupsFactory.getAllEntriesGroup()));
+                parserResult
+                    .getMetaData()
+                    .setGroups(
+                        GroupTreeNode.fromGroup(
+                            DefaultGroupsFactory.getAllEntriesGroup()
+                        )
+                    );
             }
             GroupTreeNode root = parserResult.getMetaData().getGroups().get();
             root.addChild(markingRoot, 0);
@@ -63,11 +82,18 @@ public void performMigration(ParserResult parserResult) {
     /**
      * Looks for markings (such as __markedentry = {[Nicolas:6]}) in the given list of entries.
      */
-    private Multimap<String, BibEntry> getMarkingWithEntries(List<BibEntry> entries) {
-        Multimap<String, BibEntry> markings = MultimapBuilder.treeKeys().linkedListValues().build();
+    private Multimap<String, BibEntry> getMarkingWithEntries(
+        List<BibEntry> entries
+    ) {
+        Multimap<String, BibEntry> markings = MultimapBuilder
+            .treeKeys()
+            .linkedListValues()
+            .build();
 
         for (BibEntry entry : entries) {
-            Optional<String> marking = entry.getField(InternalField.MARKED_INTERNAL);
+            Optional<String> marking = entry.getField(
+                InternalField.MARKED_INTERNAL
+            );
             if (!marking.isPresent()) {
                 continue;
             }
@@ -87,6 +113,7 @@ private Multimap<String, BibEntry> getMarkingWithEntries(List<BibEntry> entries)
     }
 
     private void clearMarkings(List<BibEntry> entries) {
-        entries.forEach(entry -> entry.clearField(InternalField.MARKED_INTERNAL));
+        entries.forEach(entry -> entry.clearField(InternalField.MARKED_INTERNAL)
+        );
     }
 }
diff --git a/src/main/java/org/jabref/migrations/CustomEntryTypePreferenceMigration.java b/src/main/java/org/jabref/migrations/CustomEntryTypePreferenceMigration.java
index e2973ea207a..1d4a5b1fe7d 100644
--- a/src/main/java/org/jabref/migrations/CustomEntryTypePreferenceMigration.java
+++ b/src/main/java/org/jabref/migrations/CustomEntryTypePreferenceMigration.java
@@ -4,7 +4,6 @@
 import java.util.List;
 import java.util.Optional;
 import java.util.stream.Collectors;
-
 import org.jabref.model.database.BibDatabaseMode;
 import org.jabref.model.entry.BibEntryType;
 import org.jabref.model.entry.BibEntryTypeBuilder;
@@ -21,18 +20,22 @@ 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,
-                                           JabRefPreferences preferences,
-                                           BibEntryTypesManager entryTypesManager) {
+    static void upgradeStoredBibEntryTypes(
+        BibDatabaseMode defaultBibDatabaseMode,
+        JabRefPreferences preferences,
+        BibEntryTypesManager entryTypesManager
+    ) {
         List<BibEntryType> storedOldTypes = new ArrayList<>();
 
         int number = 0;
         Optional<BibEntryType> type;
         while ((type = getBibEntryType(number, preferences)).isPresent()) {
-            entryTypesManager.addCustomOrModifiedType(type.get(), defaultBibDatabaseMode);
+            entryTypesManager.addCustomOrModifiedType(
+                type.get(),
+                defaultBibDatabaseMode
+            );
             storedOldTypes.add(type.get());
             number++;
         }
@@ -45,7 +48,10 @@ static void upgradeStoredBibEntryTypes(BibDatabaseMode defaultBibDatabaseMode,
      * <p>
      * (old implementation which has been copied)
      */
-    private static Optional<BibEntryType> getBibEntryType(int number, JabRefPreferences preferences) {
+    private static Optional<BibEntryType> getBibEntryType(
+        int number,
+        JabRefPreferences preferences
+    ) {
         String nr = String.valueOf(number);
         String name = preferences.get(CUSTOM_TYPE_NAME + nr);
         if (name == null) {
@@ -53,22 +59,45 @@ private static Optional<BibEntryType> getBibEntryType(int number, JabRefPreferen
         }
         List<String> req = preferences.getStringList(CUSTOM_TYPE_REQ + nr);
         List<String> opt = preferences.getStringList(CUSTOM_TYPE_OPT + nr);
-        List<String> priOpt = preferences.getStringList(CUSTOM_TYPE_PRIOPT + 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.toList()));
+            .withType(EntryTypeFactory.parse(name))
+            .withRequiredFields(
+                req
+                    .stream()
+                    .map(FieldFactory::parseOrFields)
+                    .collect(Collectors.toList())
+            );
         if (priOpt.isEmpty()) {
-            entryTypeBuilder = entryTypeBuilder
-                    .withImportantFields(opt.stream().map(FieldFactory::parseField).collect(Collectors.toSet()));
+            entryTypeBuilder =
+                entryTypeBuilder.withImportantFields(
+                    opt
+                        .stream()
+                        .map(FieldFactory::parseField)
+                        .collect(Collectors.toSet())
+                );
             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.toSet()))
-                    .withDetailFields(secondary.stream().map(FieldFactory::parseField).collect(Collectors.toSet()));
+            entryTypeBuilder =
+                entryTypeBuilder
+                    .withImportantFields(
+                        priOpt
+                            .stream()
+                            .map(FieldFactory::parseField)
+                            .collect(Collectors.toSet())
+                    )
+                    .withDetailFields(
+                        secondary
+                            .stream()
+                            .map(FieldFactory::parseField)
+                            .collect(Collectors.toSet())
+                    );
             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 10f8c3fb5a8..078defb6666 100644
--- a/src/main/java/org/jabref/migrations/MergeReviewIntoCommentMigration.java
+++ b/src/main/java/org/jabref/migrations/MergeReviewIntoCommentMigration.java
@@ -3,46 +3,63 @@
 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;
 
 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());
+        return parserResult
+            .getDatabase()
+            .getEntries()
+            .stream()
+            .anyMatch(bibEntry ->
+                bibEntry.getField(StandardField.REVIEW).isPresent()
+            );
     }
 
     public void performMigration(ParserResult parserResult) {
         /* This migration only handles the non-conflicting entries.
          * For the other see this.performConflictingMigration().
          */
-        List<BibEntry> entries = Objects.requireNonNull(parserResult).getDatabase().getEntries();
+        List<BibEntry> entries = Objects
+            .requireNonNull(parserResult)
+            .getDatabase()
+            .getEntries();
 
-        entries.stream()
-               .filter(MergeReviewIntoCommentMigration::hasReviewField)
-               .filter(entry -> !MergeReviewIntoCommentMigration.hasCommentField(entry))
-               .forEach(entry -> migrate(entry, parserResult));
+        entries
+            .stream()
+            .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();
+        List<BibEntry> entries = Objects
+            .requireNonNull(parserResult)
+            .getDatabase()
+            .getEntries();
 
-        return entries.stream()
-                      .filter(MergeReviewIntoCommentMigration::hasReviewField)
-                      .filter(MergeReviewIntoCommentMigration::hasCommentField)
-                      .collect(Collectors.toList());
+        return entries
+            .stream()
+            .filter(MergeReviewIntoCommentMigration::hasReviewField)
+            .filter(MergeReviewIntoCommentMigration::hasCommentField)
+            .collect(Collectors.toList());
     }
 
     public void performConflictingMigration(ParserResult parserResult) {
-        collectConflicts(parserResult).forEach(entry -> migrate(entry, parserResult));
+        collectConflicts(parserResult)
+            .forEach(entry -> migrate(entry, parserResult));
     }
 
     private static boolean hasCommentField(BibEntry entry) {
@@ -55,15 +72,31 @@ private static boolean hasReviewField(BibEntry entry) {
 
     private String mergeCommentFieldIfPresent(BibEntry entry, String review) {
         if (entry.getField(StandardField.COMMENT).isPresent()) {
-            LOGGER.info(String.format("Both Comment and Review fields are present in %s! Merging them into the comment field.", entry.getAuthorTitleYear(150)));
-            return String.format("%s\n%s:\n%s", entry.getField(StandardField.COMMENT).get().trim(), Localization.lang("Review"), review.trim());
+            LOGGER.info(
+                String.format(
+                    "Both Comment and Review fields are present in %s! Merging them into the comment field.",
+                    entry.getAuthorTitleYear(150)
+                )
+            );
+            return String.format(
+                "%s\n%s:\n%s",
+                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.wasChangedOnMigration();
         }
     }
diff --git a/src/main/java/org/jabref/migrations/PreferencesMigrations.java b/src/main/java/org/jabref/migrations/PreferencesMigrations.java
index b9a1d6efae3..31642168b9b 100644
--- a/src/main/java/org/jabref/migrations/PreferencesMigrations.java
+++ b/src/main/java/org/jabref/migrations/PreferencesMigrations.java
@@ -1,5 +1,6 @@
 package org.jabref.migrations;
 
+import com.github.javakeyring.Keyring;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.EnumSet;
@@ -13,9 +14,7 @@
 import java.util.prefs.BackingStoreException;
 import java.util.prefs.Preferences;
 import java.util.stream.Collectors;
-
 import javafx.scene.control.TableColumn;
-
 import org.jabref.gui.maintable.ColumnPreferences;
 import org.jabref.gui.maintable.MainTableColumnModel;
 import org.jabref.logic.citationkeypattern.GlobalCitationKeyPattern;
@@ -29,22 +28,24 @@
 import org.jabref.model.strings.StringUtil;
 import org.jabref.preferences.CleanupPreferences;
 import org.jabref.preferences.JabRefPreferences;
-
-import com.github.javakeyring.Keyring;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 public class PreferencesMigrations {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(PreferencesMigrations.class);
+    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(JabRefPreferences preferences, BibEntryTypesManager entryTypesManager) {
+    public static void runMigrations(
+        JabRefPreferences preferences,
+        BibEntryTypesManager entryTypesManager
+    ) {
         Preferences mainPrefsNode = Preferences.userRoot().node("/org/jabref");
 
         upgradePrefsToOrgJabRef(mainPrefsNode);
@@ -52,7 +53,11 @@ public static void runMigrations(JabRefPreferences preferences, BibEntryTypesMan
         upgradeFaultyEncodingStrings(preferences);
         upgradeLabelPatternToCitationKeyPattern(preferences, mainPrefsNode);
         upgradeImportFileAndDirePatterns(preferences, mainPrefsNode);
-        upgradeStoredBibEntryTypes(preferences, mainPrefsNode, entryTypesManager);
+        upgradeStoredBibEntryTypes(
+            preferences,
+            mainPrefsNode,
+            entryTypesManager
+        );
         upgradeKeyBindingsToJavaFX(preferences);
         addCrossRefRelatedFieldsForAutoComplete(preferences);
         upgradePreviewStyle(preferences);
@@ -73,11 +78,18 @@ private static void upgradePrefsToOrgJabRef(Preferences mainPrefsNode) {
         try {
             if (mainPrefsNode.childrenNames().length != 0) {
                 // skip further processing as prefs already have been migrated
-                LOGGER.debug("New prefs node already exists with content - skipping migration");
+                LOGGER.debug(
+                    "New prefs node already exists with content - skipping migration"
+                );
             } else {
-                if (mainPrefsNode.parent().parent().nodeExists("net/sf/jabref")) {
+                if (
+                    mainPrefsNode.parent().parent().nodeExists("net/sf/jabref")
+                ) {
                     LOGGER.info("Migrating old preferences.");
-                    Preferences oldNode = mainPrefsNode.parent().parent().node("net/sf/jabref");
+                    Preferences oldNode = mainPrefsNode
+                        .parent()
+                        .parent()
+                        .node("net/sf/jabref");
                     copyPrefsRecursively(oldNode, mainPrefsNode);
                 }
             }
@@ -86,7 +98,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")) {
@@ -134,7 +147,10 @@ private static void upgradeFaultyEncodingStrings(JabRefPreferences prefs) {
         encodingMap.put("EUC_JP", "EUC-JP");
 
         if (encodingMap.containsKey(defaultEncoding)) {
-            prefs.put(JabRefPreferences.DEFAULT_ENCODING, encodingMap.get(defaultEncoding));
+            prefs.put(
+                JabRefPreferences.DEFAULT_ENCODING,
+                encodingMap.get(defaultEncoding)
+            );
         }
     }
 
@@ -145,24 +161,68 @@ private static void upgradeFaultyEncodingStrings(JabRefPreferences prefs) {
      * exist
      */
     private static void upgradeSortOrder(JabRefPreferences prefs) {
-        if (prefs.get(JabRefPreferences.EXPORT_IN_SPECIFIED_ORDER, null) == null) {
+        if (
+            prefs.get(JabRefPreferences.EXPORT_IN_SPECIFIED_ORDER, null) == null
+        ) {
             if (prefs.getBoolean("exportInStandardOrder", false)) {
-                prefs.putBoolean(JabRefPreferences.EXPORT_IN_SPECIFIED_ORDER, true);
-                prefs.put(JabRefPreferences.EXPORT_PRIMARY_SORT_FIELD, StandardField.AUTHOR.getName());
-                prefs.put(JabRefPreferences.EXPORT_SECONDARY_SORT_FIELD, StandardField.EDITOR.getName());
-                prefs.put(JabRefPreferences.EXPORT_TERTIARY_SORT_FIELD, StandardField.YEAR.getName());
-                prefs.putBoolean(JabRefPreferences.EXPORT_PRIMARY_SORT_DESCENDING, false);
-                prefs.putBoolean(JabRefPreferences.EXPORT_SECONDARY_SORT_DESCENDING, false);
-                prefs.putBoolean(JabRefPreferences.EXPORT_TERTIARY_SORT_DESCENDING, false);
+                prefs.putBoolean(
+                    JabRefPreferences.EXPORT_IN_SPECIFIED_ORDER,
+                    true
+                );
+                prefs.put(
+                    JabRefPreferences.EXPORT_PRIMARY_SORT_FIELD,
+                    StandardField.AUTHOR.getName()
+                );
+                prefs.put(
+                    JabRefPreferences.EXPORT_SECONDARY_SORT_FIELD,
+                    StandardField.EDITOR.getName()
+                );
+                prefs.put(
+                    JabRefPreferences.EXPORT_TERTIARY_SORT_FIELD,
+                    StandardField.YEAR.getName()
+                );
+                prefs.putBoolean(
+                    JabRefPreferences.EXPORT_PRIMARY_SORT_DESCENDING,
+                    false
+                );
+                prefs.putBoolean(
+                    JabRefPreferences.EXPORT_SECONDARY_SORT_DESCENDING,
+                    false
+                );
+                prefs.putBoolean(
+                    JabRefPreferences.EXPORT_TERTIARY_SORT_DESCENDING,
+                    false
+                );
             } else if (prefs.getBoolean("exportInTitleOrder", false)) {
                 // exportInTitleOrder => title, author, editor
-                prefs.putBoolean(JabRefPreferences.EXPORT_IN_SPECIFIED_ORDER, true);
-                prefs.put(JabRefPreferences.EXPORT_PRIMARY_SORT_FIELD, StandardField.TITLE.getName());
-                prefs.put(JabRefPreferences.EXPORT_SECONDARY_SORT_FIELD, StandardField.AUTHOR.getName());
-                prefs.put(JabRefPreferences.EXPORT_TERTIARY_SORT_FIELD, StandardField.EDITOR.getName());
-                prefs.putBoolean(JabRefPreferences.EXPORT_PRIMARY_SORT_DESCENDING, false);
-                prefs.putBoolean(JabRefPreferences.EXPORT_SECONDARY_SORT_DESCENDING, false);
-                prefs.putBoolean(JabRefPreferences.EXPORT_TERTIARY_SORT_DESCENDING, false);
+                prefs.putBoolean(
+                    JabRefPreferences.EXPORT_IN_SPECIFIED_ORDER,
+                    true
+                );
+                prefs.put(
+                    JabRefPreferences.EXPORT_PRIMARY_SORT_FIELD,
+                    StandardField.TITLE.getName()
+                );
+                prefs.put(
+                    JabRefPreferences.EXPORT_SECONDARY_SORT_FIELD,
+                    StandardField.AUTHOR.getName()
+                );
+                prefs.put(
+                    JabRefPreferences.EXPORT_TERTIARY_SORT_FIELD,
+                    StandardField.EDITOR.getName()
+                );
+                prefs.putBoolean(
+                    JabRefPreferences.EXPORT_PRIMARY_SORT_DESCENDING,
+                    false
+                );
+                prefs.putBoolean(
+                    JabRefPreferences.EXPORT_SECONDARY_SORT_DESCENDING,
+                    false
+                );
+                prefs.putBoolean(
+                    JabRefPreferences.EXPORT_TERTIARY_SORT_DESCENDING,
+                    false
+                );
             }
         }
     }
@@ -170,17 +230,28 @@ private static void upgradeSortOrder(JabRefPreferences prefs) {
     /**
      * Migrate all customized entry types from versions <=3.7
      */
-    private static void upgradeStoredBibEntryTypes(JabRefPreferences prefs, Preferences mainPrefsNode, BibEntryTypesManager entryTypesManager) {
+    private static void upgradeStoredBibEntryTypes(
+        JabRefPreferences prefs,
+        Preferences mainPrefsNode,
+        BibEntryTypesManager entryTypesManager
+    ) {
         try {
-            if (mainPrefsNode.nodeExists(JabRefPreferences.CUSTOMIZED_BIBTEX_TYPES) ||
-                    mainPrefsNode.nodeExists(JabRefPreferences.CUSTOMIZED_BIBLATEX_TYPES)) {
+            if (
+                mainPrefsNode.nodeExists(
+                    JabRefPreferences.CUSTOMIZED_BIBTEX_TYPES
+                ) ||
+                mainPrefsNode.nodeExists(
+                    JabRefPreferences.CUSTOMIZED_BIBLATEX_TYPES
+                )
+            ) {
                 // skip further processing as prefs already have been migrated
             } else {
                 LOGGER.info("Migrating old custom entry types.");
                 CustomEntryTypePreferenceMigration.upgradeStoredBibEntryTypes(
-                        prefs.getLibraryPreferences().getDefaultBibDatabaseMode(),
-                        prefs,
-                        entryTypesManager);
+                    prefs.getLibraryPreferences().getDefaultBibDatabaseMode(),
+                    prefs,
+                    entryTypesManager
+                );
             }
         } catch (BackingStoreException ex) {
             LOGGER.error("Migrating old custom entry types failed.", ex);
@@ -192,7 +263,10 @@ private static void upgradeStoredBibEntryTypes(JabRefPreferences prefs, Preferen
      * <p>
      * Introduced in <a href="https://github.com/JabRef/jabref/pull/1704">#1704</a>
      */
-    private static void upgradeLabelPatternToCitationKeyPattern(JabRefPreferences prefs, Preferences mainPrefsNode) {
+    private static void upgradeLabelPatternToCitationKeyPattern(
+        JabRefPreferences 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";
@@ -202,12 +276,20 @@ private static void upgradeLabelPatternToCitationKeyPattern(JabRefPreferences pr
 
         try {
             // Migrate default pattern
-            if (mainPrefsNode.get(V3_6_DEFAULT_BIBTEX_KEYPATTERN, null) == null) {
+            if (
+                mainPrefsNode.get(V3_6_DEFAULT_BIBTEX_KEYPATTERN, null) == null
+            ) {
                 // Check whether old defaultLabelPattern is set
-                String oldDefault = mainPrefsNode.get(V3_3_DEFAULT_LABELPATTERN, null);
+                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
@@ -217,11 +299,20 @@ private static void upgradeLabelPatternToCitationKeyPattern(JabRefPreferences pr
 
             // Migrate type specific patterns
             if (mainPrefsNode.nodeExists(V3_3_LOGIC_LABELPATTERN)) {
-                migrateTypedKeyPrefs(prefs, mainPrefsNode.node(V3_3_LOGIC_LABELPATTERN));
+                migrateTypedKeyPrefs(
+                    prefs,
+                    mainPrefsNode.node(V3_3_LOGIC_LABELPATTERN)
+                );
             } else if (mainPrefsNode.nodeExists(V3_0_LOGIC_LABELPATTERN)) {
-                migrateTypedKeyPrefs(prefs, mainPrefsNode.node(V3_0_LOGIC_LABELPATTERN));
+                migrateTypedKeyPrefs(
+                    prefs,
+                    mainPrefsNode.node(V3_0_LOGIC_LABELPATTERN)
+                );
             } else if (mainPrefsNode.nodeExists(LEGACY_LABELPATTERN)) {
-                migrateTypedKeyPrefs(prefs, mainPrefsNode.node(LEGACY_LABELPATTERN));
+                migrateTypedKeyPrefs(
+                    prefs,
+                    mainPrefsNode.node(LEGACY_LABELPATTERN)
+                );
             }
         } catch (BackingStoreException e) {
             LOGGER.error("Migrating old bibtexKeyPatterns failed.", e);
@@ -231,48 +322,99 @@ private static void upgradeLabelPatternToCitationKeyPattern(JabRefPreferences pr
     /**
      * Migrate Import File Name and Directory name Patterns from versions <=4.0 to new BracketedPatterns
      */
-    private static void migrateFileImportPattern(String oldStylePattern, String newStylePattern,
-                                                 JabRefPreferences prefs, Preferences mainPrefsNode) {
-        String preferenceFileNamePattern = mainPrefsNode.get(JabRefPreferences.IMPORT_FILENAMEPATTERN, null);
-
-        if ((preferenceFileNamePattern != null) &&
-                oldStylePattern.equals(preferenceFileNamePattern)) {
+    private static void migrateFileImportPattern(
+        String oldStylePattern,
+        String newStylePattern,
+        JabRefPreferences prefs,
+        Preferences mainPrefsNode
+    ) {
+        String preferenceFileNamePattern = mainPrefsNode.get(
+            JabRefPreferences.IMPORT_FILENAMEPATTERN,
+            null
+        );
+
+        if (
+            (preferenceFileNamePattern != null) &&
+            oldStylePattern.equals(preferenceFileNamePattern)
+        ) {
             // Upgrade the old-style File Name pattern to new one:
-            mainPrefsNode.put(JabRefPreferences.IMPORT_FILENAMEPATTERN, newStylePattern);
-            LOGGER.info("migrated old style " + JabRefPreferences.IMPORT_FILENAMEPATTERN +
-                    " value \"" + oldStylePattern + "\" to new value \"" +
-                    newStylePattern + "\" in the preference file");
+            mainPrefsNode.put(
+                JabRefPreferences.IMPORT_FILENAMEPATTERN,
+                newStylePattern
+            );
+            LOGGER.info(
+                "migrated old style " +
+                JabRefPreferences.IMPORT_FILENAMEPATTERN +
+                " value \"" +
+                oldStylePattern +
+                "\" to new value \"" +
+                newStylePattern +
+                "\" in the preference file"
+            );
 
             if (prefs.hasKey(JabRefPreferences.IMPORT_FILENAMEPATTERN)) {
                 // Update also the key in the current application settings, if necessary:
-                String fileNamePattern = prefs.get(JabRefPreferences.IMPORT_FILENAMEPATTERN);
+                String fileNamePattern = prefs.get(
+                    JabRefPreferences.IMPORT_FILENAMEPATTERN
+                );
                 if (oldStylePattern.equals(fileNamePattern)) {
-                    prefs.put(JabRefPreferences.IMPORT_FILENAMEPATTERN, newStylePattern);
-                    LOGGER.info("migrated old style " + JabRefPreferences.IMPORT_FILENAMEPATTERN +
-                            " value \"" + oldStylePattern + "\" to new value \"" +
-                            newStylePattern + "\" in the running application");
+                    prefs.put(
+                        JabRefPreferences.IMPORT_FILENAMEPATTERN,
+                        newStylePattern
+                    );
+                    LOGGER.info(
+                        "migrated old style " +
+                        JabRefPreferences.IMPORT_FILENAMEPATTERN +
+                        " value \"" +
+                        oldStylePattern +
+                        "\" to new value \"" +
+                        newStylePattern +
+                        "\" in the running application"
+                    );
                 }
             }
         }
     }
 
-    static void upgradeImportFileAndDirePatterns(JabRefPreferences prefs, Preferences mainPrefsNode) {
+    static void upgradeImportFileAndDirePatterns(
+        JabRefPreferences prefs,
+        Preferences mainPrefsNode
+    ) {
         // Migrate Import patterns
         // Check for prefs node for Version <= 4.0
-        if (mainPrefsNode.get(JabRefPreferences.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[] oldDisplayStylePattern = new String[]{"bibtexkey", "bibtexkey - title"};
+        if (
+            mainPrefsNode.get(JabRefPreferences.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[] 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
@@ -294,23 +436,39 @@ private static void upgradeKeyBindingsToJavaFX(JabRefPreferences prefs) {
         prefs.putStringList(JabRefPreferences.BINDINGS, keys);
     }
 
-    private static void addCrossRefRelatedFieldsForAutoComplete(JabRefPreferences prefs) {
+    private static void addCrossRefRelatedFieldsForAutoComplete(
+        JabRefPreferences prefs
+    ) {
         // LinkedHashSet because we want to retain the order and add new fields to the end
-        Set<String> keys = new LinkedHashSet<>(prefs.getStringList(JabRefPreferences.AUTOCOMPLETER_COMPLETE_FIELDS));
+        Set<String> keys = new LinkedHashSet<>(
+            prefs.getStringList(JabRefPreferences.AUTOCOMPLETER_COMPLETE_FIELDS)
+        );
         keys.add("crossref");
         keys.add("related");
         keys.add("entryset");
-        prefs.putStringList(JabRefPreferences.AUTOCOMPLETER_COMPLETE_FIELDS, new ArrayList<>(keys));
+        prefs.putStringList(
+            JabRefPreferences.AUTOCOMPLETER_COMPLETE_FIELDS,
+            new ArrayList<>(keys)
+        );
     }
 
-    private static void migrateTypedKeyPrefs(JabRefPreferences prefs, Preferences oldPatternPrefs)
-            throws BackingStoreException {
-        LOGGER.info("Found old Bibtex Key patterns which will be migrated to new version.");
-
-        GlobalCitationKeyPattern keyPattern = GlobalCitationKeyPattern.fromPattern(
-                prefs.get(JabRefPreferences.DEFAULT_CITATION_KEY_PATTERN));
+    private static void migrateTypedKeyPrefs(
+        JabRefPreferences prefs,
+        Preferences oldPatternPrefs
+    ) throws BackingStoreException {
+        LOGGER.info(
+            "Found old Bibtex Key patterns which will be migrated to new version."
+        );
+
+        GlobalCitationKeyPattern keyPattern =
+            GlobalCitationKeyPattern.fromPattern(
+                prefs.get(JabRefPreferences.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,10 +484,23 @@ private static void migrateTypedKeyPrefs(JabRefPreferences prefs, Preferences ol
      */
     protected static void upgradePreviewStyle(JabRefPreferences prefs) {
         String currentPreviewStyle = prefs.get(JabRefPreferences.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[HTMLChars]{\\comment} \\end{comment}")
-                                                  .replace("\\format[HTMLChars]{\\comment}", "\\format[Markdown,HTMLChars]{\\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[HTMLChars]{\\comment} \\end{comment}"
+            )
+            .replace(
+                "\\format[HTMLChars]{\\comment}",
+                "\\format[Markdown,HTMLChars]{\\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(JabRefPreferences.PREVIEW_STYLE, migratedStyle);
     }
 
@@ -347,33 +518,53 @@ protected static void upgradePreviewStyle(JabRefPreferences prefs) {
      * Since 5.1: mainTableColumnNames, mainTableColumnWidths, mainTableColumnSortTypes, mainTableColumnSortOrder
      */
     static void upgradeColumnPreferences(JabRefPreferences preferences) {
-        List<String> columnNames = preferences.getStringList(JabRefPreferences.COLUMN_NAMES);
-        List<Double> columnWidths = preferences.getStringList(JabRefPreferences.COLUMN_WIDTHS)
-                                               .stream()
-                                               .map(string -> {
-                                                   try {
-                                                       return Double.parseDouble(string);
-                                                   } catch (NumberFormatException e) {
-                                                       return ColumnPreferences.DEFAULT_COLUMN_WIDTH;
-                                                   }
-                                               }).toList();
+        List<String> columnNames = preferences.getStringList(
+            JabRefPreferences.COLUMN_NAMES
+        );
+        List<Double> columnWidths = preferences
+            .getStringList(JabRefPreferences.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;
-
-        if (!columnNames.isEmpty() && columnNames.stream().noneMatch(name -> name.contains(normalFieldTypeString))) {
+        String normalFieldTypeString =
+            MainTableColumnModel.Type.NORMALFIELD.getName() +
+            MainTableColumnModel.COLUMNS_QUALIFIER_DELIMITER;
+
+        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));
-            columns.add(new MainTableColumnModel(MainTableColumnModel.Type.LINKED_IDENTIFIER));
+            columns.add(
+                new MainTableColumnModel(MainTableColumnModel.Type.GROUPS)
+            );
+            columns.add(
+                new MainTableColumnModel(MainTableColumnModel.Type.FILES)
+            );
+            columns.add(
+                new MainTableColumnModel(
+                    MainTableColumnModel.Type.LINKED_IDENTIFIER
+                )
+            );
 
             for (int i = 0; i < columnNames.size(); i++) {
                 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);
@@ -382,24 +573,33 @@ static void upgradeColumnPreferences(JabRefPreferences preferences) {
                 columns.add(new MainTableColumnModel(type, name, columnWidth));
             }
 
-            preferences.putStringList(JabRefPreferences.COLUMN_NAMES,
-                    columns.stream()
-                           .map(MainTableColumnModel::getName)
-                           .collect(Collectors.toList()));
-
-            preferences.putStringList(JabRefPreferences.COLUMN_WIDTHS,
-                    columns.stream()
-                           .map(MainTableColumnModel::getWidth)
-                           .map(Double::intValue)
-                           .map(Object::toString)
-                           .collect(Collectors.toList()));
+            preferences.putStringList(
+                JabRefPreferences.COLUMN_NAMES,
+                columns
+                    .stream()
+                    .map(MainTableColumnModel::getName)
+                    .collect(Collectors.toList())
+            );
+
+            preferences.putStringList(
+                JabRefPreferences.COLUMN_WIDTHS,
+                columns
+                    .stream()
+                    .map(MainTableColumnModel::getWidth)
+                    .map(Double::intValue)
+                    .map(Object::toString)
+                    .collect(Collectors.toList())
+            );
 
             // ASCENDING by default
-            preferences.putStringList(JabRefPreferences.COLUMN_SORT_TYPES,
-                    columns.stream()
-                           .map(MainTableColumnModel::getSortType)
-                           .map(TableColumn.SortType::toString)
-                           .collect(Collectors.toList()));
+            preferences.putStringList(
+                JabRefPreferences.COLUMN_SORT_TYPES,
+                columns
+                    .stream()
+                    .map(MainTableColumnModel::getSortType)
+                    .map(TableColumn.SortType::toString)
+                    .collect(Collectors.toList())
+            );
         }
     }
 
@@ -415,13 +615,27 @@ static void changeColumnVariableNamesFor51(JabRefPreferences preferences) {
         final String V5_1_COLUMN_SORT_TYPES = "mainTableColumnSortTypes";
         final String V5_1_COLUMN_SORT_ORDER = "mainTableColumnSortOrder";
 
-        List<String> oldColumnNames = preferences.getStringList(V5_0_COLUMN_NAMES);
+        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)
+            );
         }
     }
 
@@ -431,22 +645,33 @@ static void changeColumnVariableNamesFor51(JabRefPreferences preferences) {
      * variable contents if they are unreadable, so former versions of JabRef would automatically create preferences
      * they can deal with.
      */
-    static void restoreVariablesForBackwardCompatibility(JabRefPreferences preferences) {
-        List<String> oldColumnNames = preferences.getStringList(JabRefPreferences.COLUMN_NAMES);
-        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());
+    static void restoreVariablesForBackwardCompatibility(
+        JabRefPreferences preferences
+    ) {
+        List<String> oldColumnNames = preferences.getStringList(
+            JabRefPreferences.COLUMN_NAMES
+        );
+        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);
 
-            List<String> fieldColumnWidths = new ArrayList<>(Collections.emptyList());
+            List<String> fieldColumnWidths = new ArrayList<>(
+                Collections.emptyList()
+            );
             for (int i = 0; i < fieldColumnNames.size(); i++) {
                 fieldColumnWidths.add("100");
             }
@@ -460,8 +685,12 @@ static void restoreVariablesForBackwardCompatibility(JabRefPreferences preferenc
         try {
             // some versions stored the font size as double to the **same** key
             // since the preference store is type-safe, we need to add this workaround
-            String fontSizeAsString = preferences.get(JabRefPreferences.MAIN_FONT_SIZE);
-            int fontSizeAsInt = (int) Math.round(Double.parseDouble(fontSizeAsString));
+            String fontSizeAsString = preferences.get(
+                JabRefPreferences.MAIN_FONT_SIZE
+            );
+            int fontSizeAsInt = (int) Math.round(
+                Double.parseDouble(fontSizeAsString)
+            );
             preferences.putInt(JabRefPreferences.MAIN_FONT_SIZE, fontSizeAsInt);
         } catch (ClassCastException e) {
             // already an integer
@@ -497,11 +726,16 @@ private static void upgradeCleanups(JabRefPreferences prefs) {
 
         final String V5_8_CLEANUP_FIELD_FORMATTERS = "CleanUpFormatters";
         final String V6_0_CLEANUP_FIELD_FORMATTERS = "CleanUpFormatters";
-        final String V6_0_CLEANUP_FIELD_FORMATTERS_ENABLED = "CleanUpFormattersEnabled";
+        final String V6_0_CLEANUP_FIELD_FORMATTERS_ENABLED =
+            "CleanUpFormattersEnabled";
 
         List<String> activeJobs = new ArrayList<>();
-        for (CleanupPreferences.CleanupStep action : EnumSet.allOf(CleanupPreferences.CleanupStep.class)) {
-            Optional<String> job = prefs.getAsOptional(V5_8_CLEANUP + action.name());
+        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
@@ -511,16 +745,32 @@ private static void upgradeCleanups(JabRefPreferences prefs) {
             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"));
-        if (formatterCleanups.size() >= 2
-                && (formatterCleanups.get(0).equals(FieldFormatterCleanups.ENABLED)
-                || formatterCleanups.get(0).equals(FieldFormatterCleanups.DISABLED))) {
-            prefs.putBoolean(V6_0_CLEANUP_FIELD_FORMATTERS_ENABLED, formatterCleanups.get(0).equals(FieldFormatterCleanups.ENABLED)
+        List<String> formatterCleanups = List.of(
+            StringUtil
+                .unifyLineBreaks(prefs.get(V5_8_CLEANUP_FIELD_FORMATTERS), "\n")
+                .split("\n")
+        );
+        if (
+            formatterCleanups.size() >= 2 &&
+            (formatterCleanups.get(0).equals(FieldFormatterCleanups.ENABLED) ||
+                formatterCleanups
+                    .get(0)
+                    .equals(FieldFormatterCleanups.DISABLED))
+        ) {
+            prefs.putBoolean(
+                V6_0_CLEANUP_FIELD_FORMATTERS_ENABLED,
+                formatterCleanups.get(0).equals(FieldFormatterCleanups.ENABLED)
                     ? Boolean.TRUE
-                    : Boolean.FALSE);
-
-            prefs.put(V6_0_CLEANUP_FIELD_FORMATTERS, String.join(OS.NEWLINE, formatterCleanups.subList(1, formatterCleanups.size() - 1)));
+                    : Boolean.FALSE
+            );
+
+            prefs.put(
+                V6_0_CLEANUP_FIELD_FORMATTERS,
+                String.join(
+                    OS.NEWLINE,
+                    formatterCleanups.subList(1, formatterCleanups.size() - 1)
+                )
+            );
         }
     }
 
@@ -528,16 +778,25 @@ static void moveApiKeysToKeyring(JabRefPreferences preferences) {
         final String V5_9_FETCHER_CUSTOM_KEY_NAMES = "fetcherCustomKeyNames";
         final String V5_9_FETCHER_CUSTOM_KEYS = "fetcherCustomKeys";
 
-        List<String> names = preferences.getStringList(V5_9_FETCHER_CUSTOM_KEY_NAMES);
+        List<String> names = preferences.getStringList(
+            V5_9_FETCHER_CUSTOM_KEY_NAMES
+        );
         List<String> keys = preferences.getStringList(V5_9_FETCHER_CUSTOM_KEYS);
 
         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(
+                    keyring.setPassword(
+                        "org.jabref.customapikeys",
+                        names.get(i),
+                        new Password(
                             keys.get(i),
-                            preferences.getInternalPreferences().getUserAndHost())
-                            .encrypt());
+                            preferences
+                                .getInternalPreferences()
+                                .getUserAndHost()
+                        )
+                            .encrypt()
+                    );
                 }
                 preferences.deleteKey(V5_9_FETCHER_CUSTOM_KEYS);
             } catch (Exception ex) {
diff --git a/src/main/java/org/jabref/migrations/SpecialFieldsToSeparateFields.java b/src/main/java/org/jabref/migrations/SpecialFieldsToSeparateFields.java
index 06f18823e22..110685b3d82 100644
--- a/src/main/java/org/jabref/migrations/SpecialFieldsToSeparateFields.java
+++ b/src/main/java/org/jabref/migrations/SpecialFieldsToSeparateFields.java
@@ -6,7 +6,6 @@
 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;
@@ -15,17 +14,25 @@
 import org.jabref.model.entry.field.SpecialFieldValue;
 
 public class SpecialFieldsToSeparateFields implements PostOpenMigration {
+
     private final KeywordList possibleKeywordsToMigrate;
     private final Character keywordDelimiter;
-    private final Map<String, SpecialField> migrationTable = getMigrationTable();
+    private final Map<String, SpecialField> migrationTable =
+        getMigrationTable();
 
     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()));
+        List<SpecialFieldValue> specialFieldValues = Arrays.asList(
+            SpecialFieldValue.values()
+        );
+        possibleKeywordsToMigrate =
+            new KeywordList(
+                specialFieldValues
+                    .stream()
+                    .map(SpecialFieldValue::getKeyword)
+                    .filter(Optional::isPresent)
+                    .map(Optional::get)
+                    .collect(Collectors.toList())
+            );
         this.keywordDelimiter = keywordDelimiter;
     }
 
@@ -36,8 +43,14 @@ public void performMigration(ParserResult parserResult) {
 
     private void migrateEntry(BibEntry entry) {
         for (Keyword keyword : possibleKeywordsToMigrate) {
-            if (entry.getKeywords(keywordDelimiter).contains(keyword) && migrationTable.containsKey(keyword.get())) {
-                entry.setField(migrationTable.get(keyword.get()), 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 7b0a3625254..89199b0fa9d 100644
--- a/src/main/java/org/jabref/model/ChainNode.java
+++ b/src/main/java/org/jabref/model/ChainNode.java
@@ -44,7 +44,9 @@ 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 +91,9 @@ 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);
@@ -111,7 +115,9 @@ public void moveTo(T target) {
 
         // 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 02d4fd593e4..6191b2fa193 100644
--- a/src/main/java/org/jabref/model/FieldChange.java
+++ b/src/main/java/org/jabref/model/FieldChange.java
@@ -1,7 +1,6 @@
 package org.jabref.model;
 
 import java.util.Objects;
-
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.field.Field;
 
@@ -15,7 +14,12 @@ public class FieldChange {
     private final String oldValue;
     private final String newValue;
 
-    public FieldChange(BibEntry entry, Field field, String oldValue, String newValue) {
+    public FieldChange(
+        BibEntry entry,
+        Field field,
+        String oldValue,
+        String newValue
+    ) {
         this.entry = Objects.requireNonNull(entry);
         this.field = Objects.requireNonNull(field);
         this.oldValue = oldValue;
@@ -81,7 +85,16 @@ 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 fcf0b8ab26e..c64dee84e26 100644
--- a/src/main/java/org/jabref/model/TreeNode.java
+++ b/src/main/java/org/jabref/model/TreeNode.java
@@ -7,7 +7,6 @@
 import java.util.Optional;
 import java.util.function.Consumer;
 import java.util.function.Predicate;
-
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableList;
 
@@ -59,7 +58,9 @@ 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"
+            );
         }
     }
 
@@ -114,8 +115,14 @@ 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();
     }
 
     /**
@@ -274,7 +281,9 @@ protected void setParent(T parent) {
      * or an empty Optional if the index does not point to a child
      */
     public Optional<T> getChildAt(int index) {
-        return childIndexExists(index) ? Optional.of(children.get(index)) : Optional.empty();
+        return childIndexExists(index)
+            ? Optional.of(children.get(index))
+            : Optional.empty();
     }
 
     /**
@@ -468,7 +477,9 @@ 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);
@@ -506,7 +517,10 @@ public void moveAllChildrenTo(T target, int targetIndex) {
      * @param recursive  if true the whole subtree is sorted
      * @throws NullPointerException if the comparator is null
      */
-    public void sortChildren(Comparator<? super T> comparator, boolean recursive) {
+    public void sortChildren(
+        Comparator<? super T> comparator,
+        boolean recursive
+    ) {
         Objects.requireNonNull(comparator);
 
         if (this.isLeaf()) {
@@ -550,7 +564,9 @@ public void moveTo(T target, int targetIndex) {
 
         // 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/database/BibDatabase.java b/src/main/java/org/jabref/model/database/BibDatabase.java
index d8ab4556482..3b26965ade4 100644
--- a/src/main/java/org/jabref/model/database/BibDatabase.java
+++ b/src/main/java/org/jabref/model/database/BibDatabase.java
@@ -1,5 +1,7 @@
 package org.jabref.model.database;
 
+import com.google.common.eventbus.EventBus;
+import com.google.common.eventbus.Subscribe;
 import java.math.BigInteger;
 import java.security.SecureRandom;
 import java.util.ArrayList;
@@ -17,10 +19,8 @@
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;
-
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableList;
-
 import org.jabref.logic.bibtex.FieldWriter;
 import org.jabref.model.database.event.EntriesAddedEvent;
 import org.jabref.model.database.event.EntriesRemovedEvent;
@@ -34,9 +34,6 @@
 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;
 
@@ -45,13 +42,20 @@
  */
 public class BibDatabase {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(BibDatabase.class);
-    private static final Pattern RESOLVE_CONTENT_PATTERN = Pattern.compile(".*#[^#]+#.*");
+    private static final Logger LOGGER = LoggerFactory.getLogger(
+        BibDatabase.class
+    );
+    private static final Pattern RESOLVE_CONTENT_PATTERN = Pattern.compile(
+        ".*#[^#]+#.*"
+    );
 
     /**
      * State attributes
      */
-    private final ObservableList<BibEntry> entries = FXCollections.synchronizedObservableList(FXCollections.observableArrayList(BibEntry::getObservables));
+    private final ObservableList<BibEntry> entries =
+        FXCollections.synchronizedObservableList(
+            FXCollections.observableArrayList(BibEntry::getObservables)
+        );
     private Map<String, BibtexString> bibtexStrings = new ConcurrentHashMap<>();
 
     private final EventBus eventBus = new EventBus();
@@ -136,12 +140,16 @@ public ObservableList<BibEntry> getEntries() {
      * @return set of fieldnames, that are visible
      */
     public Set<Field> getAllVisibleFields() {
-        Set<Field> allFields = new TreeSet<>(Comparator.comparing(Field::getName));
+        Set<Field> allFields = new TreeSet<>(
+            Comparator.comparing(Field::getName)
+        );
         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());
     }
 
     /**
@@ -166,11 +174,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;
     }
@@ -185,7 +195,10 @@ public synchronized void insertEntry(BibEntry entry) {
      * @param entry       entry to insert
      * @param eventSource source the event is sent from
      */
-    public synchronized void insertEntry(BibEntry entry, EntriesEventSource eventSource) {
+    public synchronized void insertEntry(
+        BibEntry entry,
+        EntriesEventSource eventSource
+    ) {
         insertEntries(Collections.singletonList(entry), eventSource);
     }
 
@@ -197,7 +210,10 @@ 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);
@@ -205,7 +221,13 @@ public synchronized void insertEntries(List<BibEntry> newEntries, EntriesEventSo
         if (newEntries.isEmpty()) {
             eventBus.post(new EntriesAddedEvent(newEntries, eventSource));
         } else {
-            eventBus.post(new EntriesAddedEvent(newEntries, newEntries.get(0), eventSource));
+            eventBus.post(
+                new EntriesAddedEvent(
+                    newEntries,
+                    newEntries.get(0),
+                    eventSource
+                )
+            );
         }
         entries.addAll(newEntries);
     }
@@ -214,7 +236,10 @@ public synchronized void removeEntry(BibEntry bibEntry) {
         removeEntries(Collections.singletonList(bibEntry));
     }
 
-    public synchronized void removeEntry(BibEntry bibEntry, EntriesEventSource eventSource) {
+    public synchronized void removeEntry(
+        BibEntry bibEntry,
+        EntriesEventSource eventSource
+    ) {
         removeEntries(Collections.singletonList(bibEntry), eventSource);
     }
 
@@ -235,14 +260,19 @@ 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<>();
         for (BibEntry entry : toBeDeleted) {
             ids.add(entry.getId());
         }
-        boolean anyRemoved = entries.removeIf(entry -> ids.contains(entry.getId()));
+        boolean anyRemoved = entries.removeIf(entry ->
+            ids.contains(entry.getId())
+        );
         if (anyRemoved) {
             eventBus.post(new EntriesRemovedEvent(toBeDeleted, eventSource));
         }
@@ -270,11 +300,15 @@ public synchronized void setPreamble(String preamble) {
     /**
      * Inserts a Bibtex String.
      */
-    public synchronized void addString(BibtexString string) throws KeyCollisionException {
+    public synchronized void addString(BibtexString string)
+        throws KeyCollisionException {
         String id = string.getId();
 
         if (hasStringByName(string.getName())) {
-            throw new KeyCollisionException("A string with that label already exists", id);
+            throw new KeyCollisionException(
+                "A string with that label already exists",
+                id
+            );
         }
 
         if (bibtexStrings.containsKey(id)) {
@@ -329,7 +363,10 @@ 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();
     }
 
     /**
@@ -359,7 +396,10 @@ public void copyPreamble(BibDatabase database) {
      * Returns true if a string with the given label already exists.
      */
     public synchronized boolean hasStringByName(String label) {
-        return bibtexStrings.values().stream().anyMatch(value -> value.getName().equals(label));
+        return bibtexStrings
+            .values()
+            .stream()
+            .anyMatch(value -> value.getName().equals(label));
     }
 
     /**
@@ -367,14 +407,19 @@ public synchronized boolean hasStringByName(String label) {
      * if possible.
      */
     public String resolveForStrings(String content) {
-        Objects.requireNonNull(content, "Content for resolveForStrings must not be null.");
+        Objects.requireNonNull(
+            content,
+            "Content for resolveForStrings must not be null."
+        );
         return resolveContent(content, new HashSet<>(), new HashSet<>());
     }
 
     /**
      * Get all strings used in the entries.
      */
-    public Collection<BibtexString> getUsedStrings(Collection<BibEntry> entries) {
+    public Collection<BibtexString> getUsedStrings(
+        Collection<BibEntry> entries
+    ) {
         List<BibtexString> result = new ArrayList<>();
         Set<String> allUsedIds = new HashSet<>();
 
@@ -407,7 +452,10 @@ public Collection<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());
@@ -439,8 +487,13 @@ public BibEntry resolveForStrings(BibEntry entry, boolean inPlace) {
             resultingEntry = (BibEntry) entry.clone();
         }
 
-        for (Map.Entry<Field, String> field : resultingEntry.getFieldMap().entrySet()) {
-            resultingEntry.setField(field.getKey(), this.resolveForStrings(field.getValue()));
+        for (Map.Entry<Field, String> field : resultingEntry
+            .getFieldMap()
+            .entrySet()) {
+            resultingEntry.setField(
+                field.getKey(),
+                this.resolveForStrings(field.getValue())
+            );
         }
         return resultingEntry;
     }
@@ -451,7 +504,11 @@ public BibEntry resolveForStrings(BibEntry entry, boolean inPlace) {
      * care not to follow a circular reference pattern.
      * If the string is undefined, returns null.
      */
-    private String resolveString(String label, Set<String> usedIds, Set<String> allUsedIds) {
+    private String resolveString(
+        String label,
+        Set<String> usedIds,
+        Set<String> allUsedIds
+    ) {
         Objects.requireNonNull(label);
         Objects.requireNonNull(usedIds);
         Objects.requireNonNull(allUsedIds);
@@ -463,7 +520,9 @@ private String resolveString(String label, Set<String> usedIds, Set<String> allU
                 // circular reference, and have to stop to avoid
                 // infinite recursion.
                 if (usedIds.contains(string.getId())) {
-                    LOGGER.info("Stopped due to circular reference in strings: " + label);
+                    LOGGER.info(
+                        "Stopped due to circular reference in strings: " + label
+                    );
                     return label;
                 }
                 // If not, log this string's ID now.
@@ -491,24 +550,42 @@ private String resolveString(String label, Set<String> usedIds, Set<String> allU
         return month.map(Month::getFullName).orElse(null);
     }
 
-    private String resolveContent(String result, Set<String> usedIds, Set<String> allUsedIds) {
+    private String resolveContent(
+        String result,
+        Set<String> usedIds,
+        Set<String> allUsedIds
+    ) {
         String res = result;
         if (RESOLVE_CONTENT_PATTERN.matcher(res).matches()) {
             StringBuilder newRes = new StringBuilder();
             int piv = 0;
             int next;
-            while ((next = res.indexOf(FieldWriter.BIBTEX_STRING_START_END_SYMBOL, piv)) >= 0) {
+            while (
+                (next =
+                        res.indexOf(
+                            FieldWriter.BIBTEX_STRING_START_END_SYMBOL,
+                            piv
+                        )) >=
+                0
+            ) {
                 // We found the next string ref. Append the text
                 // up to it.
                 if (next > 0) {
                     newRes.append(res, piv, next);
                 }
-                int stringEnd = res.indexOf(FieldWriter.BIBTEX_STRING_START_END_SYMBOL, next + 1);
+                int stringEnd = res.indexOf(
+                    FieldWriter.BIBTEX_STRING_START_END_SYMBOL,
+                    next + 1
+                );
                 if (stringEnd >= 0) {
                     // We found the boundaries of the string ref,
                     // now resolve that one.
                     String refLabel = res.substring(next + 1, stringEnd);
-                    String resolved = resolveString(refLabel, usedIds, allUsedIds);
+                    String resolved = resolveString(
+                        refLabel,
+                        usedIds,
+                        allUsedIds
+                    );
 
                     if (resolved == null) {
                         // Could not resolve string. Display the #
@@ -579,7 +656,9 @@ private void relayEntryChangeEvent(FieldChangedEvent event) {
     }
 
     public Optional<BibEntry> getReferencedEntry(BibEntry entry) {
-        return entry.getField(StandardField.CROSSREF).flatMap(this::getEntryByCitationKey);
+        return entry
+            .getField(StandardField.CROSSREF)
+            .flatMap(this::getEntryByCitationKey);
     }
 
     public Optional<String> getSharedDatabaseID() {
@@ -604,7 +683,8 @@ public void clearSharedDatabaseID() {
      * @return The generated sharedDatabaseID
      */
     public String generateSharedDatabaseID() {
-        this.sharedDatabaseID = new BigInteger(128, new SecureRandom()).toString(32);
+        this.sharedDatabaseID =
+            new BigInteger(128, new SecureRandom()).toString(32);
         return this.sharedDatabaseID;
     }
 
@@ -612,10 +692,11 @@ public String generateSharedDatabaseID() {
      * Returns the number of occurrences of the given citation key in this database.
      */
     public long getNumberOfCitationKeyOccurrences(String key) {
-        return entries.stream()
-                      .flatMap(entry -> entry.getCitationKey().stream())
-                      .filter(key::equals)
-                      .count();
+        return entries
+            .stream()
+            .flatMap(entry -> entry.getCitationKey().stream())
+            .filter(key::equals)
+            .count();
     }
 
     /**
diff --git a/src/main/java/org/jabref/model/database/BibDatabaseContext.java b/src/main/java/org/jabref/model/database/BibDatabaseContext.java
index 12d67a71a2f..9c8904d7f8a 100644
--- a/src/main/java/org/jabref/model/database/BibDatabaseContext.java
+++ b/src/main/java/org/jabref/model/database/BibDatabaseContext.java
@@ -7,7 +7,6 @@
 import java.util.Objects;
 import java.util.Optional;
 import java.util.stream.Collectors;
-
 import org.jabref.architecture.AllowedToUseLogic;
 import org.jabref.gui.LibraryTab;
 import org.jabref.logic.crawler.Crawler;
@@ -20,7 +19,6 @@
 import org.jabref.model.metadata.MetaData;
 import org.jabref.model.study.Study;
 import org.jabref.preferences.FilePreferences;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -37,7 +35,9 @@
 @AllowedToUseLogic("because it needs access to shared database features")
 public class BibDatabaseContext {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(LibraryTab.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(
+        LibraryTab.class
+    );
 
     private final BibDatabase database;
     private MetaData metaData;
@@ -65,11 +65,20 @@ public BibDatabaseContext(BibDatabase database, MetaData metaData) {
         this.location = DatabaseLocation.LOCAL;
     }
 
-    public BibDatabaseContext(BibDatabase database, MetaData metaData, Path path) {
+    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;
@@ -125,9 +134,18 @@ 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);
     }
 
     /**
@@ -154,31 +172,47 @@ public List<Path> getFileDirectories(FilePreferences preferences) {
         List<Path> fileDirs = new ArrayList<>();
 
         // 1. Metadata user-specific directory
-        metaData.getUserFileDirectory(preferences.getUserAndHost())
-                .ifPresent(userFileDirectory -> fileDirs.add(getFileDirectoryPath(userFileDirectory)));
+        metaData
+            .getUserFileDirectory(preferences.getUserAndHost())
+            .ifPresent(userFileDirectory ->
+                fileDirs.add(getFileDirectoryPath(userFileDirectory))
+            );
 
         // 2. Metadata general directory
-        metaData.getDefaultFileDirectory()
-                .ifPresent(metaDataDirectory -> fileDirs.add(getFileDirectoryPath(metaDataDirectory)));
+        metaData
+            .getDefaultFileDirectory()
+            .ifPresent(metaDataDirectory ->
+                fileDirs.add(getFileDirectoryPath(metaDataDirectory))
+            );
 
         // 3. BIB file directory or Main file directory
         // fileDirs.isEmpty in the case, 1) no user-specific file directory and 2) no general file directory is set
         // (in the metadata of the bib file)
-        if (fileDirs.isEmpty() && preferences.shouldStoreFilesRelativeToBibFile()) {
-            getDatabasePath().ifPresent(dbPath -> {
-                Path parentPath = dbPath.getParent();
-                if (parentPath == null) {
-                    parentPath = Path.of(System.getProperty("user.dir"));
-                }
-                Objects.requireNonNull(parentPath, "BibTeX database parent path is null");
-                fileDirs.add(parentPath);
-            });
+        if (
+            fileDirs.isEmpty() &&
+            preferences.shouldStoreFilesRelativeToBibFile()
+        ) {
+            getDatabasePath()
+                .ifPresent(dbPath -> {
+                    Path parentPath = dbPath.getParent();
+                    if (parentPath == null) {
+                        parentPath = Path.of(System.getProperty("user.dir"));
+                    }
+                    Objects.requireNonNull(
+                        parentPath,
+                        "BibTeX database parent path is null"
+                    );
+                    fileDirs.add(parentPath);
+                });
         } else {
             // Main file directory
             preferences.getMainFileDirectory().ifPresent(fileDirs::add);
         }
 
-        return fileDirs.stream().map(Path::toAbsolutePath).collect(Collectors.toList());
+        return fileDirs
+            .stream()
+            .map(Path::toAbsolutePath)
+            .collect(Collectors.toList());
     }
 
     /**
@@ -187,9 +221,10 @@ 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();
     }
 
     private Path getFileDirectoryPath(String directoryName) {
@@ -198,7 +233,11 @@ private Path getFileDirectoryPath(String directoryName) {
         // the file path of this BIB file:
         Optional<Path> databaseFile = getDatabasePath();
         if (!directory.isAbsolute() && databaseFile.isPresent()) {
-            return databaseFile.get().getParent().resolve(directory).normalize();
+            return databaseFile
+                .get()
+                .getParent()
+                .resolve(directory)
+                .normalize();
         }
         return directory;
     }
@@ -225,7 +264,10 @@ public void convertToSharedDatabase(DatabaseSynchronizer dmbsSynchronizer) {
     }
 
     public void convertToLocalDatabase() {
-        if (Objects.nonNull(dbmsListener) && (location == DatabaseLocation.SHARED)) {
+        if (
+            Objects.nonNull(dbmsListener) &&
+            (location == DatabaseLocation.SHARED)
+        ) {
             dbmsListener.unregisterListener(dbmsSynchronizer);
             dbmsListener.shutdown();
         }
@@ -242,8 +284,15 @@ public Path getFulltextIndexPath() {
         Path indexPath;
 
         if (getDatabasePath().isPresent()) {
-            indexPath = appData.resolve(String.valueOf(this.getDatabasePath().get().hashCode()));
-            LOGGER.debug("Index path for {} is {}", getDatabasePath().get(), indexPath);
+            indexPath =
+                appData.resolve(
+                    String.valueOf(this.getDatabasePath().get().hashCode())
+                );
+            LOGGER.debug(
+                "Index path for {} is {}",
+                getDatabasePath().get(),
+                indexPath
+            );
             return indexPath;
         }
 
@@ -254,12 +303,19 @@ public Path getFulltextIndexPath() {
 
     @Override
     public String toString() {
-        return "BibDatabaseContext{" +
-                "metaData=" + metaData +
-                ", mode=" + getMode() +
-                ", databasePath=" + getDatabasePath() +
-                ", biblatexMode=" + isBiblatexMode() +
-                ", fulltextIndexPath=" + getFulltextIndexPath() +
-                '}';
+        return (
+            "BibDatabaseContext{" +
+            "metaData=" +
+            metaData +
+            ", mode=" +
+            getMode() +
+            ", databasePath=" +
+            getDatabasePath() +
+            ", biblatexMode=" +
+            isBiblatexMode() +
+            ", fulltextIndexPath=" +
+            getFulltextIndexPath() +
+            '}'
+        );
     }
 }
diff --git a/src/main/java/org/jabref/model/database/BibDatabaseModeDetection.java b/src/main/java/org/jabref/model/database/BibDatabaseModeDetection.java
index 3fa1f5745a5..f0c5c0eee50 100644
--- a/src/main/java/org/jabref/model/database/BibDatabaseModeDetection.java
+++ b/src/main/java/org/jabref/model/database/BibDatabaseModeDetection.java
@@ -1,15 +1,13 @@
 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;
 
 public class BibDatabaseModeDetection {
 
-    private BibDatabaseModeDetection() {
-    }
+    private BibDatabaseModeDetection() {}
 
     /**
      * Tries to infer the database type by examining a BibDatabase database.
@@ -24,7 +22,10 @@ private BibDatabaseModeDetection() {
      * @return the inferred database type
      */
     public static BibDatabaseMode inferMode(BibDatabase database) {
-        final Stream<EntryType> entryTypes = database.getEntries().stream().map(BibEntry::getType);
+        final Stream<EntryType> entryTypes = database
+            .getEntries()
+            .stream()
+            .map(BibEntry::getType);
 
         if (entryTypes.anyMatch(EntryTypeFactory::isExclusiveBiblatex)) {
             return BibDatabaseMode.BIBLATEX;
diff --git a/src/main/java/org/jabref/model/database/BibDatabases.java b/src/main/java/org/jabref/model/database/BibDatabases.java
index 750454c84d1..0004038abcf 100644
--- a/src/main/java/org/jabref/model/database/BibDatabases.java
+++ b/src/main/java/org/jabref/model/database/BibDatabases.java
@@ -3,22 +3,23 @@
 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
      * removes all entries that have no fields set. This is useful for rooting out
      * an unsucessful import (wrong format) that returns a number of empty entries.
      */
-    public static List<BibEntry> purgeEmptyEntries(Collection<BibEntry> entries) {
-        return entries.stream()
-                      .filter(entry -> !entry.getFields().isEmpty())
-                      .collect(Collectors.toList());
+    public static List<BibEntry> purgeEmptyEntries(
+        Collection<BibEntry> entries
+    ) {
+        return entries
+            .stream()
+            .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 d65b2764414..8f9f2a222ad 100644
--- a/src/main/java/org/jabref/model/database/KeyChangeListener.java
+++ b/src/main/java/org/jabref/model/database/KeyChangeListener.java
@@ -1,10 +1,10 @@
 package org.jabref.model.database;
 
+import com.google.common.eventbus.Subscribe;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Optional;
-
 import org.jabref.model.database.event.EntriesRemovedEvent;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.event.FieldChangedEvent;
@@ -13,8 +13,6 @@
 import org.jabref.model.entry.field.FieldProperty;
 import org.jabref.model.entry.field.InternalField;
 
-import com.google.common.eventbus.Subscribe;
-
 public class KeyChangeListener {
 
     private final BibDatabase database;
@@ -44,19 +42,45 @@ public void listen(EntriesRemovedEvent event) {
     private void updateEntryLinks(String newKey, String oldKey) {
         for (BibEntry entry : database.getEntries()) {
             for (Field field : FieldFactory.getKeyFields()) {
-                entry.getField(field).ifPresent(fieldContent -> {
-                    if (field.getProperties().contains(FieldProperty.SINGLE_ENTRY_LINK)) {
-                        replaceSingleKeyInField(newKey, oldKey, entry, field, fieldContent);
-                    } else { // MULTIPLE_ENTRY_LINK
-                        replaceKeyInMultiplesKeyField(newKey, oldKey, entry, field, fieldContent);
-                    }
-                });
+                entry
+                    .getField(field)
+                    .ifPresent(fieldContent -> {
+                        if (
+                            field
+                                .getProperties()
+                                .contains(FieldProperty.SINGLE_ENTRY_LINK)
+                        ) {
+                            replaceSingleKeyInField(
+                                newKey,
+                                oldKey,
+                                entry,
+                                field,
+                                fieldContent
+                            );
+                        } else { // MULTIPLE_ENTRY_LINK
+                            replaceKeyInMultiplesKeyField(
+                                newKey,
+                                oldKey,
+                                entry,
+                                field,
+                                fieldContent
+                            );
+                        }
+                    });
             }
         }
     }
 
-    private void replaceKeyInMultiplesKeyField(String newKey, String oldKey, BibEntry entry, Field field, String fieldContent) {
-        List<String> keys = new ArrayList<>(Arrays.asList(fieldContent.split(",")));
+    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) {
             if (newKey == null) {
@@ -68,7 +92,13 @@ 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/BibDatabaseContextChangedEvent.java b/src/main/java/org/jabref/model/database/event/BibDatabaseContextChangedEvent.java
index 9db98e10dbf..a5189a9b233 100644
--- a/src/main/java/org/jabref/model/database/event/BibDatabaseContextChangedEvent.java
+++ b/src/main/java/org/jabref/model/database/event/BibDatabaseContextChangedEvent.java
@@ -9,6 +9,7 @@
  * because all three inherit from this class.
  */
 public abstract class BibDatabaseContextChangedEvent {
+
     // If the event has been filtered out
     private boolean filteredOut;
 
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 c562e5cde9d..0935f6780e7 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 35e51ee5ed1..3a94aa92da2 100644
--- a/src/main/java/org/jabref/model/database/event/EntriesAddedEvent.java
+++ b/src/main/java/org/jabref/model/database/event/EntriesAddedEvent.java
@@ -1,7 +1,6 @@
 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;
@@ -21,7 +20,11 @@ public class EntriesAddedEvent extends EntriesEvent {
      * @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;
     }
@@ -30,7 +33,10 @@ public EntriesAddedEvent(List<BibEntry> bibEntries, BibEntry firstEntry, Entries
      * @param bibEntries <code>List</code> of <code>BibEntry</code> objects which are being added.
      * @param location   Location affected by this event
      */
-    public EntriesAddedEvent(List<BibEntry> bibEntries, EntriesEventSource location) {
+    public EntriesAddedEvent(
+        List<BibEntry> bibEntries,
+        EntriesEventSource location
+    ) {
         super(bibEntries, location);
         this.firstEntry = null;
     }
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 e252132f82a..8e23ec54002 100644
--- a/src/main/java/org/jabref/model/database/event/EntriesRemovedEvent.java
+++ b/src/main/java/org/jabref/model/database/event/EntriesRemovedEvent.java
@@ -1,7 +1,6 @@
 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;
@@ -24,7 +23,10 @@ public EntriesRemovedEvent(List<BibEntry> bibEntries) {
      * @param bibEntries <code>List</code> of <code>BibEntry</code> objects which are being removed.
      * @param location   Location affected by this event
      */
-    public EntriesRemovedEvent(List<BibEntry> bibEntries, EntriesEventSource location) {
+    public EntriesRemovedEvent(
+        List<BibEntry> bibEntries,
+        EntriesEventSource location
+    ) {
         super(bibEntries, location);
     }
 }
diff --git a/src/main/java/org/jabref/model/entry/Author.java b/src/main/java/org/jabref/model/entry/Author.java
index fd45ddb1e05..e0f235046a5 100644
--- a/src/main/java/org/jabref/model/entry/Author.java
+++ b/src/main/java/org/jabref/model/entry/Author.java
@@ -2,7 +2,6 @@
 
 import java.util.Objects;
 import java.util.Optional;
-
 import org.jabref.model.strings.LatexToUnicodeAdapter;
 import org.jabref.model.strings.StringUtil;
 
@@ -18,7 +17,13 @@ public class Author {
      * Example: <code>authors = {Oliver Kopp and others}</code>. This is then appearing as "Oliver Kopp et al.".
      * In the context of BibTeX key generation, this is "Kopp+" (<code>+</code> for "et al.") and not "KO".
      */
-    public static final Author OTHERS = new Author("", "", null, "others", null);
+    public static final Author OTHERS = new Author(
+        "",
+        "",
+        null,
+        "others",
+        null
+    );
 
     private final String firstPart;
     private final String firstAbbr;
@@ -36,7 +41,13 @@ public class Author {
      * @param last      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 jr        the junior part of the author's name (may consist of several tokens, like "Jr. III" in "Smith, Jr. III, John")
      */
-    public Author(String first, String firstabbr, String von, String last, String jr) {
+    public Author(
+        String first,
+        String firstabbr,
+        String von,
+        String last,
+        String jr
+    ) {
         firstPart = addDotIfAbbreviation(removeStartAndEndBraces(first));
         firstAbbr = removeStartAndEndBraces(firstabbr);
         vonPart = removeStartAndEndBraces(von);
@@ -49,8 +60,11 @@ 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 + ".";
         }
 
@@ -65,18 +79,24 @@ public static String addDotIfAbbreviation(String name) {
 
             if (currentChar == '.') {
                 // A.A. -> A. A.
-                if (((i + 1) < name.length()) && Character.isUpperCase(name.charAt(i + 1))) {
+                if (
+                    ((i + 1) < name.length()) &&
+                    Character.isUpperCase(name.charAt(i + 1))
+                ) {
                     sb.append(' ');
                 }
             }
 
-            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
                 continue;
@@ -105,12 +125,19 @@ 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;
@@ -145,11 +172,13 @@ public boolean equals(Object other) {
         }
 
         if (other instanceof Author that) {
-            return Objects.equals(firstPart, that.firstPart)
-                    && Objects.equals(firstAbbr, that.firstAbbr)
-                    && Objects.equals(vonPart, that.vonPart)
-                    && Objects.equals(lastPart, that.lastPart)
-                    && Objects.equals(jrPart, that.jrPart);
+            return (
+                Objects.equals(firstPart, that.firstPart) &&
+                Objects.equals(firstAbbr, that.firstAbbr) &&
+                Objects.equals(vonPart, that.vonPart) &&
+                Objects.equals(lastPart, that.lastPart) &&
+                Objects.equals(jrPart, that.jrPart)
+            );
         }
 
         return false;
@@ -369,10 +398,18 @@ public String getNameForAlphabetization() {
      */
     public Author latexFree() {
         if (latexFreeAuthor == null) {
-            String first = getFirst().map(LatexToUnicodeAdapter::format).orElse(null);
-            String firstabbr = getFirstAbbr().map(LatexToUnicodeAdapter::format).orElse(null);
-            String von = getVon().map(LatexToUnicodeAdapter::format).orElse(null);
-            String last = getLast().map(LatexToUnicodeAdapter::format).orElse(null);
+            String first = getFirst()
+                .map(LatexToUnicodeAdapter::format)
+                .orElse(null);
+            String firstabbr = getFirstAbbr()
+                .map(LatexToUnicodeAdapter::format)
+                .orElse(null);
+            String von = getVon()
+                .map(LatexToUnicodeAdapter::format)
+                .orElse(null);
+            String last = getLast()
+                .map(LatexToUnicodeAdapter::format)
+                .orElse(null);
             String jr = getJr().map(LatexToUnicodeAdapter::format).orElse(null);
             latexFreeAuthor = new Author(first, firstabbr, von, last, jr);
             latexFreeAuthor.latexFreeAuthor = latexFreeAuthor;
diff --git a/src/main/java/org/jabref/model/entry/AuthorList.java b/src/main/java/org/jabref/model/entry/AuthorList.java
index f35cf1b7549..84296df6731 100644
--- a/src/main/java/org/jabref/model/entry/AuthorList.java
+++ b/src/main/java/org/jabref/model/entry/AuthorList.java
@@ -8,7 +8,6 @@
 import java.util.function.Function;
 import java.util.stream.Collector;
 import java.util.stream.Collectors;
-
 import org.jabref.architecture.AllowedToUseLogic;
 import org.jabref.logic.importer.AuthorListParser;
 
@@ -117,7 +116,8 @@
 @AllowedToUseLogic("because it needs access to AuthorList parser")
 public class AuthorList {
 
-    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;
 
@@ -142,22 +142,37 @@ public static AuthorList of(Author... authors) {
     }
 
     public static Collector<Author, ?, AuthorList> collect() {
-        return Collectors.collectingAndThen(Collectors.toUnmodifiableList(), AuthorList::new);
+        return Collectors.collectingAndThen(
+            Collectors.toUnmodifiableList(),
+            AuthorList::new
+        );
     }
 
-    private static String andCoordinatedConjunction(List<Author> authors, Function<Author, String> style, boolean oxfordComma) {
-        var formattedAuthors = authors.stream().map(style).collect(Collectors.toUnmodifiableList());
+    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);
     }
 
-    private static String andCoordinatedConjunction(List<String> authors, boolean oxfordComma) {
+    private static String andCoordinatedConjunction(
+        List<String> authors,
+        boolean oxfordComma
+    ) {
         String lastDelimiter = oxfordComma ? ", and " : " and ";
         int lastIndex = authors.size() - 1;
         return switch (authors.size()) {
             case 0 -> "";
             case 1 -> authors.get(0);
             case 2 -> authors.get(0) + " 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);
         };
     }
 
@@ -186,8 +201,14 @@ public static AuthorList parse(final String authors) {
      *
      * @see AuthorList#getAsFirstLastNames
      */
-    public static String fixAuthorFirstNameFirstCommas(String authors, boolean abbreviate, boolean oxfordComma) {
-        return AuthorList.parse(authors).getAsFirstLastNames(abbreviate, oxfordComma);
+    public static String fixAuthorFirstNameFirstCommas(
+        String authors,
+        boolean abbreviate,
+        boolean oxfordComma
+    ) {
+        return AuthorList
+            .parse(authors)
+            .getAsFirstLastNames(abbreviate, oxfordComma);
     }
 
     /**
@@ -204,8 +225,14 @@ public static String fixAuthorFirstNameFirst(String authors) {
      *
      * @see AuthorList#getAsLastFirstNames
      */
-    public static String fixAuthorLastNameFirstCommas(String authors, boolean abbreviate, boolean oxfordComma) {
-        return AuthorList.parse(authors).getAsLastFirstNames(abbreviate, oxfordComma);
+    public static String fixAuthorLastNameFirstCommas(
+        String authors,
+        boolean abbreviate,
+        boolean oxfordComma
+    ) {
+        return AuthorList
+            .parse(authors)
+            .getAsLastFirstNames(abbreviate, oxfordComma);
     }
 
     /**
@@ -222,7 +249,10 @@ public static String fixAuthorLastNameFirst(String authors) {
      *
      * @see AuthorList#getAsLastFirstNamesWithAnd
      */
-    public static String fixAuthorLastNameFirst(String authors, boolean abbreviate) {
+    public static String fixAuthorLastNameFirst(
+        String authors,
+        boolean abbreviate
+    ) {
         return AuthorList.parse(authors).getAsLastFirstNamesWithAnd(abbreviate);
     }
 
@@ -231,7 +261,10 @@ public static String fixAuthorLastNameFirst(String authors, boolean abbreviate)
      *
      * @see AuthorList#getAsLastNames
      */
-    public static String fixAuthorLastNameOnlyCommas(String authors, boolean oxfordComma) {
+    public static String fixAuthorLastNameOnlyCommas(
+        String authors,
+        boolean oxfordComma
+    ) {
         return AuthorList.parse(authors).getAsLastNames(oxfordComma);
     }
 
@@ -295,9 +328,13 @@ 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;
@@ -320,7 +357,9 @@ public String getAsNatbib() {
         return switch (authors.size()) {
             case 0 -> "";
             case 1 -> authors.get(0).getLastOnly();
-            case 2 -> authors.get(0).getLastOnly() + " and " + authors.get(1).getLastOnly();
+            case 2 -> authors.get(0).getLastOnly() +
+            " and " +
+            authors.get(1).getLastOnly();
             default -> authors.get(0).getLastOnly() + " et al.";
         };
     }
@@ -341,7 +380,11 @@ public String getAsNatbib() {
      * Oxford comma.</a>
      */
     public String getAsLastNames(boolean oxfordComma) {
-        return andCoordinatedConjunction(getAuthors(), Author::getLastOnly, oxfordComma);
+        return andCoordinatedConjunction(
+            getAuthors(),
+            Author::getLastOnly,
+            oxfordComma
+        );
     }
 
     /**
@@ -363,7 +406,11 @@ public String getAsLastNames(boolean oxfordComma) {
      * Oxford comma.</a>
      */
     public String getAsLastFirstNames(boolean abbreviate, boolean oxfordComma) {
-        return andCoordinatedConjunction(getAuthors(), auth -> auth.getLastFirst(abbreviate), oxfordComma);
+        return andCoordinatedConjunction(
+            getAuthors(),
+            auth -> auth.getLastFirst(abbreviate),
+            oxfordComma
+        );
     }
 
     @Override
@@ -385,9 +432,10 @@ public String toString() {
      * @return formatted list of authors.
      */
     public String getAsLastFirstNamesWithAnd(boolean abbreviate) {
-        return getAuthors().stream()
-                           .map(author -> author.getLastFirst(abbreviate))
-                           .collect(Collectors.joining(" and "));
+        return getAuthors()
+            .stream()
+            .map(author -> author.getLastFirst(abbreviate))
+            .collect(Collectors.joining(" and "));
     }
 
     /**
@@ -399,13 +447,17 @@ public String getAsLastFirstFirstLastNamesWithAnd(boolean abbreviate) {
         return switch (authors.size()) {
             case 0 -> "";
             case 1 -> authors.get(0).getLastFirst(abbreviate);
-            default -> authors.stream()
-                              .skip(1)
-                              .map(author -> author.getFirstLast(abbreviate))
-                              .collect(Collectors.joining(
-                                      " and ",
-                                      authors.get(0).getLastFirst(abbreviate) + " and ",
-                                      ""));
+            default -> authors
+                .stream()
+                .skip(1)
+                .map(author -> author.getFirstLast(abbreviate))
+                .collect(
+                    Collectors.joining(
+                        " and ",
+                        authors.get(0).getLastFirst(abbreviate) + " and ",
+                        ""
+                    )
+                );
         };
     }
 
@@ -428,7 +480,11 @@ public String getAsLastFirstFirstLastNamesWithAnd(boolean abbreviate) {
      * Oxford comma.</a>
      */
     public String getAsFirstLastNames(boolean abbreviate, boolean oxfordComma) {
-        return andCoordinatedConjunction(getAuthors(), author -> author.getFirstLast(abbreviate), oxfordComma);
+        return andCoordinatedConjunction(
+            getAuthors(),
+            author -> author.getFirstLast(abbreviate),
+            oxfordComma
+        );
     }
 
     /**
@@ -468,9 +524,10 @@ public int hashCode() {
      * @return formatted list of authors.
      */
     public String getAsFirstLastNamesWithAnd() {
-        return getAuthors().stream()
-                           .map(author -> author.getFirstLast(false))
-                           .collect(Collectors.joining(" and "));
+        return getAuthors()
+            .stream()
+            .map(author -> author.getFirstLast(false))
+            .collect(Collectors.joining(" and "));
     }
 
     /**
@@ -483,8 +540,9 @@ public String getAsFirstLastNamesWithAnd() {
      * @return formatted list of authors
      */
     public String getForAlphabetization() {
-        return getAuthors().stream()
-                           .map(Author::getNameForAlphabetization)
-                           .collect(Collectors.joining(" and "));
+        return getAuthors()
+            .stream()
+            .map(Author::getNameForAlphabetization)
+            .collect(Collectors.joining(" and "));
     }
 }
diff --git a/src/main/java/org/jabref/model/entry/BibEntry.java b/src/main/java/org/jabref/model/entry/BibEntry.java
index c5590a1348a..7636ef304f9 100644
--- a/src/main/java/org/jabref/model/entry/BibEntry.java
+++ b/src/main/java/org/jabref/model/entry/BibEntry.java
@@ -1,5 +1,8 @@
 package org.jabref.model.entry;
 
+import com.google.common.eventbus.EventBus;
+import com.tobiasdiez.easybind.EasyBind;
+import com.tobiasdiez.easybind.optional.OptionalBinding;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
@@ -15,13 +18,11 @@
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.function.BiFunction;
 import java.util.stream.Collectors;
-
 import javafx.beans.Observable;
 import javafx.beans.property.ObjectProperty;
 import javafx.beans.property.SimpleObjectProperty;
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableMap;
-
 import org.jabref.architecture.AllowedToUseLogic;
 import org.jabref.logic.bibtex.FileFieldWriter;
 import org.jabref.logic.importer.util.FileFieldParser;
@@ -42,10 +43,6 @@
 import org.jabref.model.strings.LatexToUnicodeAdapter;
 import org.jabref.model.strings.StringUtil;
 import org.jabref.model.util.MultiKeyMap;
-
-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;
 
@@ -94,7 +91,9 @@
 public class BibEntry implements Cloneable {
 
     public static final EntryType DEFAULT_TYPE = StandardEntryType.Misc;
-    private static final Logger LOGGER = LoggerFactory.getLogger(BibEntry.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(
+        BibEntry.class
+    );
     private final SharedBibEntryData sharedBibEntryData;
 
     /**
@@ -105,20 +104,29 @@ public class BibEntry implements Cloneable {
     /**
      * Cache that stores latex free versions of fields.
      */
-    private final Map<Field, String> latexFreeFields = new ConcurrentHashMap<>();
+    private final Map<Field, String> latexFreeFields =
+        new ConcurrentHashMap<>();
 
     /**
      * 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();
 
     private String id;
 
-    private final ObjectProperty<EntryType> type = new SimpleObjectProperty<>(DEFAULT_TYPE);
+    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
@@ -157,7 +165,10 @@ public Optional<FieldChange> setMonth(Month parsedMonth) {
         return setField(StandardField.MONTH, parsedMonth.getJabRefFormat());
     }
 
-    public Optional<String> getResolvedFieldOrAlias(OrFields fields, BibDatabase database) {
+    public Optional<String> getResolvedFieldOrAlias(
+        OrFields fields,
+        BibDatabase database
+    ) {
         for (Field field : fields.getFields()) {
             Optional<String> value = getResolvedFieldOrAlias(field, database);
             if (value.isPresent()) {
@@ -175,24 +186,38 @@ 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);
             }
@@ -201,17 +226,30 @@ 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);
             }
@@ -223,9 +261,11 @@ 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();
             }
 
@@ -235,13 +275,22 @@ 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);
             }
@@ -253,9 +302,11 @@ 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();
             }
 
@@ -265,8 +316,12 @@ 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);
             }
@@ -275,8 +330,10 @@ 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();
             }
 
@@ -304,16 +361,37 @@ private Optional<Field> getSourceField(Field targetField, EntryType targetEntry,
      *                 The database of the bibtex entry.
      * @return The resolved field value or null if not found.
      */
-    public Optional<String> getResolvedFieldOrAlias(Field field, BibDatabase database) {
-        return genericGetResolvedFieldOrAlias(field, database, BibEntry::getFieldOrAlias);
-    }
-
-    public Optional<String> getResolvedFieldOrAliasLatexFree(Field field, BibDatabase database) {
-        return genericGetResolvedFieldOrAlias(field, database, BibEntry::getFieldOrAliasLatexFree);
-    }
-
-    private Optional<String> genericGetResolvedFieldOrAlias(Field field, BibDatabase database, BiFunction<BibEntry, Field, Optional<String>> getFieldOrAlias) {
-        if ((InternalField.TYPE_HEADER == field) || (InternalField.OBSOLETE_TYPE_HEADER == field)) {
+    public Optional<String> getResolvedFieldOrAlias(
+        Field field,
+        BibDatabase database
+    ) {
+        return genericGetResolvedFieldOrAlias(
+            field,
+            database,
+            BibEntry::getFieldOrAlias
+        );
+    }
+
+    public Optional<String> getResolvedFieldOrAliasLatexFree(
+        Field field,
+        BibDatabase database
+    ) {
+        return genericGetResolvedFieldOrAlias(
+            field,
+            database,
+            BibEntry::getFieldOrAliasLatexFree
+        );
+    }
+
+    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());
         }
 
@@ -329,17 +407,25 @@ private Optional<String> genericGetResolvedFieldOrAlias(Field field, BibDatabase
             if (referred.isPresent()) {
                 EntryType sourceEntry = referred.get().type.get();
                 EntryType targetEntry = type.get();
-                Optional<Field> sourceField = getSourceField(field, targetEntry, sourceEntry);
+                Optional<Field> sourceField = getSourceField(
+                    field,
+                    targetEntry,
+                    sourceEntry
+                );
 
                 if (sourceField.isPresent()) {
-                    result = getFieldOrAlias.apply(referred.get(), sourceField.get());
+                    result =
+                        getFieldOrAlias.apply(
+                            referred.get(),
+                            sourceField.get()
+                        );
                 }
             }
         }
 
-        return (database == null) || result.isEmpty() ?
-                result :
-                Optional.of(database.resolveForStrings(result.get()));
+        return (database == null) || result.isEmpty()
+            ? result
+            : Optional.of(database.resolveForStrings(result.get()));
     }
 
     /**
@@ -361,7 +447,14 @@ public void setId(String id) {
 
         String oldId = this.id;
 
-        eventBus.post(new FieldChangedEvent(this, InternalField.INTERNAL_ID_FIELD, id, oldId));
+        eventBus.post(
+            new FieldChangedEvent(
+                this,
+                InternalField.INTERNAL_ID_FIELD,
+                id,
+                oldId
+            )
+        );
         this.id = id;
         changed = true;
     }
@@ -417,7 +510,10 @@ public Optional<FieldChange> setType(EntryType type) {
      * Sets this entry's type and sets the changed flag to true <br>
      * If the new entry type equals the old entry type no changed flag is set.
      */
-    public Optional<FieldChange> setType(EntryType newType, EntriesEventSource eventSource) {
+    public Optional<FieldChange> setType(
+        EntryType newType,
+        EntriesEventSource eventSource
+    ) {
         Objects.requireNonNull(newType);
 
         EntryType oldType = type.get();
@@ -428,7 +524,12 @@ 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);
     }
@@ -460,7 +561,9 @@ public Optional<String> getFieldLatexFree(Field field) {
         } else {
             Optional<String> fieldValue = getField(field);
             if (fieldValue.isPresent()) {
-                String latexFreeValue = LatexToUnicodeAdapter.format(fieldValue.get()).intern();
+                String latexFreeValue = LatexToUnicodeAdapter
+                    .format(fieldValue.get())
+                    .intern();
                 latexFreeFields.put(field, latexFreeValue);
                 return Optional.of(latexFreeValue);
             } else {
@@ -485,7 +588,10 @@ 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()) {
@@ -502,15 +608,23 @@ 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));
+                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)) {
-            Optional<String> date = getFieldValue.apply(this, StandardField.DATE);
+        if (
+            (StandardField.YEAR == field) ||
+            (StandardField.MONTH == field) ||
+            (StandardField.DAY == field)
+        ) {
+            Optional<String> date = getFieldValue.apply(
+                this,
+                StandardField.DATE
+            );
             if (date.isEmpty()) {
                 return Optional.empty();
             }
@@ -521,7 +635,10 @@ private Optional<String> genericGetFieldOrAlias(Field field, BiFunction<BibEntry
                     return parsedDate.get().getYear().map(Object::toString);
                 }
                 if (StandardField.MONTH == field) {
-                    return parsedDate.get().getMonth().map(Month::getJabRefFormat);
+                    return parsedDate
+                        .get()
+                        .getMonth()
+                        .map(Month::getJabRefFormat);
                 }
                 if (StandardField.DAY == field) {
                     return parsedDate.get().getDay().map(Object::toString);
@@ -592,10 +709,17 @@ 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 must not be null");
-        Objects.requireNonNull(eventSource, "field eventSource must not be null");
+        Objects.requireNonNull(
+            eventSource,
+            "field eventSource must not be null"
+        );
 
         if (value.isEmpty()) {
             return clearField(field);
@@ -647,7 +771,10 @@ public Optional<FieldChange> clearField(Field field) {
      * @param field       the field to clear.
      * @param eventSource the source a new {@link FieldChangedEvent} should be posten from.
      */
-    public Optional<FieldChange> clearField(Field field, EntriesEventSource eventSource) {
+    public Optional<FieldChange> clearField(
+        Field field,
+        EntriesEventSource eventSource
+    ) {
         Optional<String> oldValue = getField(field);
         if (oldValue.isEmpty()) {
             return Optional.empty();
@@ -673,8 +800,15 @@ public Optional<FieldChange> clearField(Field field, EntriesEventSource eventSou
      *                 that no attempt will be made to follow crossrefs.
      * @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());
+    public boolean allFieldsPresent(
+        Collection<OrFields> fields,
+        BibDatabase database
+    ) {
+        return fields
+            .stream()
+            .allMatch(field ->
+                this.getResolvedFieldOrAlias(field, database).isPresent()
+            );
     }
 
     /**
@@ -684,7 +818,8 @@ public boolean allFieldsPresent(Collection<OrFields> fields, BibDatabase databas
     @Override
     public Object clone() {
         BibEntry clone = new BibEntry(type.getValue());
-        clone.fields = FXCollections.observableMap(new ConcurrentHashMap<>(fields));
+        clone.fields =
+            FXCollections.observableMap(new ConcurrentHashMap<>(fields));
         clone.commentsBeforeEntry = commentsBeforeEntry;
         clone.parsedSerialization = parsedSerialization;
         clone.changed = changed;
@@ -711,8 +846,11 @@ public String toString() {
      * 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)) {
@@ -778,12 +916,18 @@ public BibEntry withChanged(boolean changed) {
         return this;
     }
 
-    public Optional<FieldChange> putKeywords(List<String> keywords, Character delimiter) {
+    public Optional<FieldChange> putKeywords(
+        List<String> keywords,
+        Character delimiter
+    ) {
         Objects.requireNonNull(delimiter);
         return putKeywords(new KeywordList(keywords), delimiter);
     }
 
-    public Optional<FieldChange> putKeywords(KeywordList keywords, Character delimiter) {
+    public Optional<FieldChange> putKeywords(
+        KeywordList keywords,
+        Character delimiter
+    ) {
         Objects.requireNonNull(keywords);
         Optional<String> oldValue = this.getField(StandardField.KEYWORDS);
 
@@ -836,12 +980,23 @@ public KeywordList getKeywords(Character delimiter) {
         return getFieldAsKeywords(StandardField.KEYWORDS, 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());
+    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());
     }
 
-    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
@@ -859,9 +1014,11 @@ 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);
 
@@ -886,7 +1043,9 @@ public BibEntry withSharedBibEntryData(int sharedId, int version) {
         return this;
     }
 
-    public BibEntry withSharedBibEntryData(SharedBibEntryData sharedBibEntryData) {
+    public BibEntry withSharedBibEntryData(
+        SharedBibEntryData sharedBibEntryData
+    ) {
         sharedBibEntryData = sharedBibEntryData;
         return this;
     }
@@ -900,9 +1059,11 @@ public boolean equals(Object o) {
             return false;
         }
         BibEntry entry = (BibEntry) o;
-        return Objects.equals(type.getValue(), entry.type.getValue())
-                && Objects.equals(fields, entry.fields)
-                && Objects.equals(commentsBeforeEntry, entry.commentsBeforeEntry);
+        return (
+            Objects.equals(type.getValue(), entry.type.getValue()) &&
+            Objects.equals(fields, entry.fields) &&
+            Objects.equals(commentsBeforeEntry, entry.commentsBeforeEntry)
+        );
     }
 
     /**
@@ -972,12 +1133,19 @@ public BibEntry withUserComments(String commentsBeforeEntry) {
         return this;
     }
 
-    public List<ParsedEntryLink> getEntryLinkList(Field field, BibDatabase database) {
-        return getField(field).map(fieldValue -> EntryLinkList.parse(fieldValue, database))
-                              .orElse(Collections.emptyList());
+    public List<ParsedEntryLink> getEntryLinkList(
+        Field field,
+        BibDatabase database
+    ) {
+        return getField(field)
+            .map(fieldValue -> EntryLinkList.parse(fieldValue, database))
+            .orElse(Collections.emptyList());
     }
 
-    public Optional<FieldChange> setEntryLinkList(Field field, List<ParsedEntryLink> list) {
+    public Optional<FieldChange> setEntryLinkList(
+        Field field,
+        List<ParsedEntryLink> list
+    ) {
         return setField(field, EntryLinkList.serialize(list));
     }
 
@@ -990,24 +1158,32 @@ public Set<String> getFieldAsWords(Field field) {
             if (fieldValue == null) {
                 return Collections.emptySet();
             } else {
-                HashSet<String> words = new HashSet<>(StringUtil.getStringAsWords(fieldValue));
+                HashSet<String> words = new HashSet<>(
+                    StringUtil.getStringAsWords(fieldValue)
+                );
                 fieldsAsWords.put(field, words);
                 return words;
             }
         }
     }
 
-    public KeywordList getFieldAsKeywords(Field field, Character keywordSeparator) {
+    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());
+            .map(content -> KeywordList.parse(content, keywordSeparator))
+            .orElse(new KeywordList());
 
         if (field instanceof StandardField standardField) {
             fieldsAsKeywords.put(standardField, keywordSeparator, keywords);
@@ -1056,9 +1232,13 @@ public List<LinkedFile> getFiles() {
     }
 
     public void setDate(Date date) {
-        date.getYear().ifPresent(year -> setField(StandardField.YEAR, year.toString()));
+        date
+            .getYear()
+            .ifPresent(year -> setField(StandardField.YEAR, year.toString()));
         date.getMonth().ifPresent(this::setMonth);
-        date.getDay().ifPresent(day -> setField(StandardField.DAY, day.toString()));
+        date
+            .getDay()
+            .ifPresent(day -> setField(StandardField.DAY, day.toString()));
     }
 
     public Optional<Month> getMonth() {
@@ -1066,8 +1246,13 @@ public Optional<Month> getMonth() {
     }
 
     public OptionalBinding<String> getFieldBinding(Field field) {
-        if ((field == InternalField.TYPE_HEADER) || (field == InternalField.OBSOLETE_TYPE_HEADER)) {
-            return EasyBind.wrapNullable(type).mapOpt(EntryType::getDisplayName);
+        if (
+            (field == InternalField.TYPE_HEADER) ||
+            (field == InternalField.OBSOLETE_TYPE_HEADER)
+        ) {
+            return EasyBind
+                .wrapNullable(type)
+                .mapOpt(EntryType::getDisplayName);
         }
         return EasyBind.valueAt(fields, field);
     }
@@ -1096,7 +1281,7 @@ public ObservableMap<Field, String> getFieldsObservable() {
      * Returns a list of observables that represent the data of the entry.
      */
     public Observable[] getObservables() {
-        return new Observable[] {fields, type};
+        return new Observable[] { fields, type };
     }
 
     /**
@@ -1108,7 +1293,10 @@ public Observable[] getObservables() {
      * @param linkToDownloadedFile the link to the file, which was downloaded
      * @param downloadedFile the path to be added to the entry
      */
-    public void replaceDownloadedFile(String linkToDownloadedFile, LinkedFile downloadedFile) {
+    public void replaceDownloadedFile(
+        String linkToDownloadedFile,
+        LinkedFile downloadedFile
+    ) {
         List<LinkedFile> linkedFiles = this.getFiles();
 
         int oldFileIndex = -1;
@@ -1148,20 +1336,32 @@ public void mergeWith(BibEntry other) {
      * @param otherPrioritizedFields collection of Fields in which 'other' has a priority into final result
      */
     public void mergeWith(BibEntry other, Set<Field> otherPrioritizedFields) {
-        Set<Field> thisFields = new TreeSet<>(Comparator.comparing(Field::getName));
-        Set<Field> otherFields = new TreeSet<>(Comparator.comparing(Field::getName));
+        Set<Field> thisFields = new TreeSet<>(
+            Comparator.comparing(Field::getName)
+        );
+        Set<Field> otherFields = new TreeSet<>(
+            Comparator.comparing(Field::getName)
+        );
 
         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());
+        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())) {
+            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 4908aec875c..b6115900e98 100644
--- a/src/main/java/org/jabref/model/entry/BibEntryType.java
+++ b/src/main/java/org/jabref/model/entry/BibEntryType.java
@@ -6,7 +6,6 @@
 import java.util.Objects;
 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;
@@ -32,7 +31,11 @@ public class BibEntryType implements Comparable<BibEntryType> {
      * @param fields            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> fields, Collection<OrFields> requiredFields) {
+    public BibEntryType(
+        EntryType type,
+        Collection<BibField> fields,
+        Collection<OrFields> requiredFields
+    ) {
         this.type = Objects.requireNonNull(type);
         this.fields = new LinkedHashSet<>(fields);
         this.requiredFields = new LinkedHashSet<>(requiredFields);
@@ -43,14 +46,16 @@ public EntryType getType() {
     }
 
     public Set<BibField> getOptionalFields() {
-        return getAllBibFields().stream()
-                             .filter(field -> !isRequired(field.field()))
-                             .collect(Collectors.toCollection(LinkedHashSet::new));
+        return getAllBibFields()
+            .stream()
+            .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));
     }
 
     /**
@@ -72,28 +77,35 @@ public Set<BibField> getAllBibFields() {
     }
 
     public Set<Field> getAllFields() {
-        return fields.stream().map(BibField::field).collect(Collectors.toCollection(LinkedHashSet::new));
+        return fields
+            .stream()
+            .map(BibField::field)
+            .collect(Collectors.toCollection(LinkedHashSet::new));
     }
 
     public Set<Field> getPrimaryOptionalFields() {
-        return getOptionalFields().stream()
-                                  .filter(field -> field.priority() == FieldPriority.IMPORTANT)
-                                  .map(BibField::field)
-                                  .collect(Collectors.toCollection(LinkedHashSet::new));
+        return getOptionalFields()
+            .stream()
+            .filter(field -> field.priority() == FieldPriority.IMPORTANT)
+            .map(BibField::field)
+            .collect(Collectors.toCollection(LinkedHashSet::new));
     }
 
     public Set<Field> getSecondaryOptionalFields() {
-        return getOptionalFields().stream()
-                                  .filter(field -> field.priority() == FieldPriority.DETAIL)
-                                  .map(BibField::field)
-                                  .collect(Collectors.toCollection(LinkedHashSet::new));
+        return getOptionalFields()
+            .stream()
+            .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 Collections.emptySet();
         }
-        Set<Field> deprecatedFields = new LinkedHashSet<>(EntryConverter.FIELD_ALIASES_BIBTEX_TO_BIBLATEX.keySet());
+        Set<Field> deprecatedFields = new LinkedHashSet<>(
+            EntryConverter.FIELD_ALIASES_BIBTEX_TO_BIBLATEX.keySet()
+        );
 
         // Only the optional fields which are mapped to another BibLaTeX name should be shown as "deprecated"
         deprecatedFields.retainAll(getOptionalFieldsAndAliases());
@@ -106,9 +118,15 @@ public Set<Field> getDeprecatedFields(BibDatabaseMode mode) {
         return deprecatedFields;
     }
 
-    public Set<Field> getSecondaryOptionalNotDeprecatedFields(BibDatabaseMode mode) {
-        Set<Field> optionalFieldsNotPrimaryOrDeprecated = new LinkedHashSet<>(getSecondaryOptionalFields());
-        optionalFieldsNotPrimaryOrDeprecated.removeAll(getDeprecatedFields(mode));
+    public Set<Field> getSecondaryOptionalNotDeprecatedFields(
+        BibDatabaseMode mode
+    ) {
+        Set<Field> optionalFieldsNotPrimaryOrDeprecated = new LinkedHashSet<>(
+            getSecondaryOptionalFields()
+        );
+        optionalFieldsNotPrimaryOrDeprecated.removeAll(
+            getDeprecatedFields(mode)
+        );
         return optionalFieldsNotPrimaryOrDeprecated;
     }
 
@@ -116,10 +134,16 @@ public Set<Field> getSecondaryOptionalNotDeprecatedFields(BibDatabaseMode mode)
      * Get list of all optional fields of this entry and all fields being source for a BibTeX to BibLaTeX conversion.
      */
     private Set<Field> getOptionalFieldsAndAliases() {
-        Set<Field> optionalFieldsAndAliases = new LinkedHashSet<>(getOptionalFields().size());
+        Set<Field> optionalFieldsAndAliases = new LinkedHashSet<>(
+            getOptionalFields().size()
+        );
         for (BibField field : getOptionalFields()) {
             optionalFieldsAndAliases.add(field.field());
-            if (EntryConverter.FIELD_ALIASES_BIBTEX_TO_BIBLATEX.containsKey(field.field())) {
+            if (
+                EntryConverter.FIELD_ALIASES_BIBTEX_TO_BIBLATEX.containsKey(
+                    field.field()
+                )
+            ) {
                 optionalFieldsAndAliases.add(field.field());
             }
         }
@@ -135,9 +159,11 @@ public boolean equals(Object o) {
             return false;
         }
         BibEntryType that = (BibEntryType) o;
-        return type.equals(that.type) &&
-               Objects.equals(requiredFields, that.requiredFields) &&
-               Objects.equals(fields, that.fields);
+        return (
+            type.equals(that.type) &&
+            Objects.equals(requiredFields, that.requiredFields) &&
+            Objects.equals(fields, that.fields)
+        );
     }
 
     @Override
@@ -155,11 +181,16 @@ public int hashCode() {
      */
     @Override
     public String toString() {
-        return "BibEntryType{" +
-                "type=" + type +
-                ", allFields=" + fields +
-                ", requiredFields=" + requiredFields +
-                '}';
+        return (
+            "BibEntryType{" +
+            "type=" +
+            type +
+            ", allFields=" +
+            fields +
+            ", requiredFields=" +
+            requiredFields +
+            '}'
+        );
     }
 
     @Override
diff --git a/src/main/java/org/jabref/model/entry/BibEntryTypeBuilder.java b/src/main/java/org/jabref/model/entry/BibEntryTypeBuilder.java
index b8613157ac6..548495a9fc5 100644
--- a/src/main/java/org/jabref/model/entry/BibEntryTypeBuilder.java
+++ b/src/main/java/org/jabref/model/entry/BibEntryTypeBuilder.java
@@ -1,5 +1,6 @@
 package org.jabref.model.entry;
 
+import com.google.common.collect.Streams;
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.LinkedHashSet;
@@ -7,7 +8,6 @@
 import java.util.Set;
 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;
@@ -15,8 +15,6 @@
 import org.jabref.model.entry.types.EntryType;
 import org.jabref.model.entry.types.StandardEntryType;
 
-import com.google.common.collect.Streams;
-
 public class BibEntryTypeBuilder {
 
     private EntryType type = StandardEntryType.Misc;
@@ -29,12 +27,28 @@ public BibEntryTypeBuilder withType(EntryType type) {
     }
 
     public BibEntryTypeBuilder withImportantFields(Set<BibField> newFields) {
-        return withImportantFields(newFields.stream().map(BibField::field).collect(Collectors.toCollection(LinkedHashSet::new)));
+        return withImportantFields(
+            newFields
+                .stream()
+                .map(BibField::field)
+                .collect(Collectors.toCollection(LinkedHashSet::new))
+        );
     }
 
-    public BibEntryTypeBuilder withImportantFields(Collection<Field> newFields) {
-        this.fields = Streams.concat(fields.stream(), newFields.stream().map(field -> new BibField(field, FieldPriority.IMPORTANT)))
-                             .collect(Collectors.toCollection(LinkedHashSet::new));
+    public BibEntryTypeBuilder withImportantFields(
+        Collection<Field> newFields
+    ) {
+        this.fields =
+            Streams
+                .concat(
+                    fields.stream(),
+                    newFields
+                        .stream()
+                        .map(field ->
+                            new BibField(field, FieldPriority.IMPORTANT)
+                        )
+                )
+                .collect(Collectors.toCollection(LinkedHashSet::new));
         return this;
     }
 
@@ -43,8 +57,15 @@ public BibEntryTypeBuilder withImportantFields(Field... newFields) {
     }
 
     public BibEntryTypeBuilder withDetailFields(Collection<Field> newFields) {
-        this.fields = Streams.concat(fields.stream(), newFields.stream().map(field -> new BibField(field, FieldPriority.DETAIL)))
-                             .collect(Collectors.toCollection(LinkedHashSet::new));
+        this.fields =
+            Streams
+                .concat(
+                    fields.stream(),
+                    newFields
+                        .stream()
+                        .map(field -> new BibField(field, FieldPriority.DETAIL))
+                )
+                .collect(Collectors.toCollection(LinkedHashSet::new));
         return this;
     }
 
@@ -52,33 +73,60 @@ public BibEntryTypeBuilder withDetailFields(Field... fields) {
         return withDetailFields(Arrays.asList(fields));
     }
 
-    public BibEntryTypeBuilder withRequiredFields(Set<OrFields> requiredFields) {
+    public BibEntryTypeBuilder withRequiredFields(
+        Set<OrFields> requiredFields
+    ) {
         this.requiredFields = requiredFields;
         return this;
     }
 
     public BibEntryTypeBuilder withRequiredFields(Field... requiredFields) {
-        this.requiredFields = Arrays.stream(requiredFields).map(OrFields::new).collect(Collectors.toCollection(LinkedHashSet::new));
+        this.requiredFields =
+            Arrays
+                .stream(requiredFields)
+                .map(OrFields::new)
+                .collect(Collectors.toCollection(LinkedHashSet::new));
         return this;
     }
 
-    public BibEntryTypeBuilder withRequiredFields(OrFields first, Field... requiredFields) {
-        this.requiredFields = Stream.concat(Stream.of(first), Arrays.stream(requiredFields).map(OrFields::new)).collect(Collectors.toCollection(LinkedHashSet::new));
+    public BibEntryTypeBuilder withRequiredFields(
+        OrFields first,
+        Field... requiredFields
+    ) {
+        this.requiredFields =
+            Stream
+                .concat(
+                    Stream.of(first),
+                    Arrays.stream(requiredFields).map(OrFields::new)
+                )
+                .collect(Collectors.toCollection(LinkedHashSet::new));
         return this;
     }
 
-    public BibEntryTypeBuilder withRequiredFields(List<OrFields> first, Field... requiredFields) {
-        this.requiredFields = Stream.concat(first.stream(), Arrays.stream(requiredFields).map(OrFields::new)).collect(Collectors.toCollection(LinkedHashSet::new));
+    public BibEntryTypeBuilder withRequiredFields(
+        List<OrFields> first,
+        Field... requiredFields
+    ) {
+        this.requiredFields =
+            Stream
+                .concat(
+                    first.stream(),
+                    Arrays.stream(requiredFields).map(OrFields::new)
+                )
+                .collect(Collectors.toCollection(LinkedHashSet::new));
         return this;
     }
 
     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));
-        Set<BibField> allFields = Stream.concat(fields.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));
+        Set<BibField> allFields = Stream
+            .concat(fields.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 eb25ad23972..2363cc25c4b 100644
--- a/src/main/java/org/jabref/model/entry/BibEntryTypesManager.java
+++ b/src/main/java/org/jabref/model/entry/BibEntryTypesManager.java
@@ -8,7 +8,6 @@
 import java.util.function.Predicate;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
-
 import org.jabref.model.database.BibDatabaseMode;
 import org.jabref.model.entry.types.BiblatexAPAEntryTypeDefinitions;
 import org.jabref.model.entry.types.BiblatexEntryTypeDefinitions;
@@ -19,17 +18,30 @@
 import org.jabref.model.entry.types.IEEETranEntryTypeDefinitions;
 
 public class BibEntryTypesManager {
-    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()));
 
-    public BibEntryTypesManager() {
-    }
+    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())
+        );
+
+    public BibEntryTypesManager() {}
 
     private InternalEntryTypes getEntryTypes(BibDatabaseMode mode) {
         return switch (mode) {
@@ -52,23 +64,35 @@ public List<BibEntryType> getAllCustomTypes(BibDatabaseMode mode) {
     /**
      * Returns true if the type is a custom type, or if it is a standard type which has customized fields
      */
-    public boolean isCustomOrModifiedType(BibEntryType type, BibDatabaseMode mode) {
+    public boolean isCustomOrModifiedType(
+        BibEntryType type,
+        BibDatabaseMode mode
+    ) {
         return getEntryTypes(mode).isCustomOrModifiedType(type);
     }
 
     /**
      * 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);
     }
 
-    public void addCustomOrModifiedType(BibEntryType entryType, BibDatabaseMode mode) {
+    public void addCustomOrModifiedType(
+        BibEntryType entryType,
+        BibDatabaseMode mode
+    ) {
         getEntryTypes(mode).addCustomOrModifiedType(entryType);
     }
 
-    public void removeCustomOrModifiedEntryType(BibEntryType entryType, BibDatabaseMode mode) {
+    public void removeCustomOrModifiedEntryType(
+        BibEntryType entryType,
+        BibDatabaseMode mode
+    ) {
         getEntryTypes(mode).removeCustomOrModifiedEntryType(entryType);
     }
 
@@ -81,7 +105,9 @@ public Collection<BibEntryType> getAllTypes(BibDatabaseMode mode) {
     }
 
     public boolean isCustomType(EntryType type, BibDatabaseMode mode) {
-        return getAllCustomTypes(mode).stream().anyMatch(customType -> customType.getType().equals(type));
+        return getAllCustomTypes(mode)
+            .stream()
+            .anyMatch(customType -> customType.getType().equals(type));
     }
 
     /**
@@ -93,14 +119,23 @@ public Optional<BibEntryType> enrich(EntryType type, BibDatabaseMode mode) {
         return getEntryTypes(mode).enrich(type);
     }
 
-    public boolean isDifferentCustomOrModifiedType(BibEntryType type, BibDatabaseMode mode) {
-        Optional<BibEntryType> currentlyStoredType = enrich(type.getType(), mode);
+    public boolean isDifferentCustomOrModifiedType(
+        BibEntryType type,
+        BibDatabaseMode mode
+    ) {
+        Optional<BibEntryType> currentlyStoredType = enrich(
+            type.getType(),
+            mode
+        );
         if (currentlyStoredType.isEmpty()) {
             // new customization
             return true;
         } else {
             // different customization
-            return !EntryTypeFactory.nameAndFieldsAreEqual(type, currentlyStoredType.get());
+            return !EntryTypeFactory.nameAndFieldsAreEqual(
+                type,
+                currentlyStoredType.get()
+            );
         }
     }
 
@@ -108,7 +143,9 @@ public boolean isDifferentCustomOrModifiedType(BibEntryType type, BibDatabaseMod
      * This class is used to specify entry types for either BIBTEX and BIBLATEX.
      */
     private static class InternalEntryTypes {
-        private final SortedSet<BibEntryType> customOrModifiedType = new TreeSet<>();
+
+        private final SortedSet<BibEntryType> customOrModifiedType =
+            new TreeSet<>();
         private final SortedSet<BibEntryType> standardTypes;
 
         private InternalEntryTypes(List<BibEntryType> standardTypes) {
@@ -117,10 +154,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();
+            return customizedTypes
+                .stream()
+                .filter(bibEntryType ->
+                    standardTypes
+                        .stream()
+                        .noneMatch(item ->
+                            item.getType().equals(bibEntryType.getType())
+                        )
+                )
+                .toList();
         }
 
         /**
@@ -128,15 +171,17 @@ 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()) {
                 return enrichedType;
             } else {
-                return standardTypes.stream()
-                                    .filter(typeEquals(type))
-                                    .findFirst();
+                return standardTypes
+                    .stream()
+                    .filter(typeEquals(type))
+                    .findFirst();
             }
         }
 
@@ -158,14 +203,17 @@ private void clearAllCustomEntryTypes() {
         }
 
         private SortedSet<BibEntryType> getAllTypes() {
-            SortedSet<BibEntryType> allTypes = new TreeSet<>(customOrModifiedType);
+            SortedSet<BibEntryType> allTypes = new TreeSet<>(
+                customOrModifiedType
+            );
             allTypes.addAll(standardTypes);
             return allTypes;
         }
 
         private boolean isCustomOrModifiedType(BibEntryType entryType) {
-            return customOrModifiedType.stream()
-                                       .anyMatch(customizedType -> customizedType.equals(entryType));
+            return customOrModifiedType
+                .stream()
+                .anyMatch(customizedType -> customizedType.equals(entryType));
         }
     }
 }
diff --git a/src/main/java/org/jabref/model/entry/BibtexString.java b/src/main/java/org/jabref/model/entry/BibtexString.java
index d8e83fb6477..ffda7df2b0b 100644
--- a/src/main/java/org/jabref/model/entry/BibtexString.java
+++ b/src/main/java/org/jabref/model/entry/BibtexString.java
@@ -60,7 +60,10 @@ 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()) {
@@ -145,7 +148,10 @@ public String getUserComments() {
         if (parsedSerialization != null) {
             try {
                 // get the text before the string
-                String prolog = parsedSerialization.substring(0, parsedSerialization.indexOf('@'));
+                String prolog = parsedSerialization.substring(
+                    0,
+                    parsedSerialization.indexOf('@')
+                );
                 return prolog;
             } catch (StringIndexOutOfBoundsException ignore) {
                 // if this occurs a broken parsed serialization has been set, so just do nothing
@@ -176,15 +182,23 @@ 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
     public int hashCode() {
-        return Objects.hash(hasChanged, name, content, type, parsedSerialization);
+        return Objects.hash(
+            hasChanged,
+            name,
+            content,
+            type,
+            parsedSerialization
+        );
     }
 }
diff --git a/src/main/java/org/jabref/model/entry/CanonicalBibEntry.java b/src/main/java/org/jabref/model/entry/CanonicalBibEntry.java
index 6e0b8f19a80..3fa59c4765f 100644
--- a/src/main/java/org/jabref/model/entry/CanonicalBibEntry.java
+++ b/src/main/java/org/jabref/model/entry/CanonicalBibEntry.java
@@ -7,14 +7,12 @@
 import java.util.SortedSet;
 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.
@@ -36,7 +34,11 @@ public static String getCanonicalRepresentation(BibEntry entry) {
 
         // generate first line: type and citation key
         String citeKey = entry.getCitationKey().orElse("");
-        sb.append(String.format("@%s{%s,", entry.getType().getName(), citeKey)).append('\n');
+        sb
+            .append(
+                String.format("@%s{%s,", 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).
         Map<String, String> mapFieldToValue = new HashMap<>();
@@ -48,7 +50,9 @@ public static String getCanonicalRepresentation(BibEntry entry) {
             String fieldValue = field.getValue();
             // JabRef stores the key in the field KEY_FIELD, which must not be serialized
             if (!fieldName.equals(InternalField.KEY_FIELD)) {
-                String lowerCaseFieldName = fieldName.getName().toLowerCase(Locale.US);
+                String lowerCaseFieldName = fieldName
+                    .getName()
+                    .toLowerCase(Locale.US);
                 sortedFields.add(lowerCaseFieldName);
                 mapFieldToValue.put(lowerCaseFieldName, fieldValue);
             }
@@ -57,11 +61,21 @@ public static String getCanonicalRepresentation(BibEntry entry) {
         // generate field entries
         StringJoiner sj = new StringJoiner(",\n", "", "\n");
         for (String fieldName : sortedFields) {
-            String line = String.format("  %s = {%s}", fieldName, mapFieldToValue.get(fieldName));
+            String line = String.format(
+                "  %s = {%s}",
+                fieldName,
+                mapFieldToValue.get(fieldName)
+            );
             sj.add(line);
         }
 
-        sj.add(String.format("  _jabref_shared = {sharedId: %d, version: %d}", entry.getSharedBibEntryData().getSharedID(), entry.getSharedBibEntryData().getVersion()));
+        sj.add(
+            String.format(
+                "  _jabref_shared = {sharedId: %d, version: %d}",
+                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 8c127f6bf2f..d75c2628b45 100644
--- a/src/main/java/org/jabref/model/entry/Date.java
+++ b/src/main/java/org/jabref/model/entry/Date.java
@@ -13,57 +13,62 @@
 import java.util.Locale;
 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
-                "d.M.uuuu",                             // covers 15.1.2015
-                "uuuu.M.d",                             // covers 2015.1.15
-                "uuuu",                                 // covers 2015
-                "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);
+            "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
+            "d.M.uuuu", // covers 15.1.2015
+            "uuuu.M.d", // covers 2015.1.15
+            "uuuu", // covers 2015
+            "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)}.
@@ -72,10 +77,11 @@ 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;
@@ -123,77 +129,101 @@ 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
-        )) {
+        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
+            )
+        ) {
             try {
                 String[] strDates = dateString.split("/");
-                TemporalAccessor parsedDate = SIMPLE_DATE_FORMATS.parse(strDates[0].strip());
-                TemporalAccessor parsedEndDate = SIMPLE_DATE_FORMATS.parse(strDates[1].strip());
+                TemporalAccessor parsedDate = SIMPLE_DATE_FORMATS.parse(
+                    strDates[0].strip()
+                );
+                TemporalAccessor parsedEndDate = SIMPLE_DATE_FORMATS.parse(
+                    strDates[1].strip()
+                );
                 return Optional.of(new Date(parsedDate, parsedEndDate));
             } catch (DateTimeParseException e) {
                 LOGGER.debug("Invalid Date format for range", e);
                 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
-        )) {
+        } 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
+            )
+        ) {
             try {
                 String[] strDates = dateString.split(" / ");
-                TemporalAccessor parsedDate = SIMPLE_DATE_FORMATS.parse(strDates[0].strip());
-                TemporalAccessor parsedEndDate = SIMPLE_DATE_FORMATS.parse(strDates[1].strip());
+                TemporalAccessor parsedDate = SIMPLE_DATE_FORMATS.parse(
+                    strDates[0].strip()
+                );
+                TemporalAccessor parsedEndDate = SIMPLE_DATE_FORMATS.parse(
+                    strDates[1].strip()
+                );
                 return Optional.of(new Date(parsedDate, parsedEndDate));
             } catch (DateTimeParseException e) {
                 LOGGER.debug("Invalid Date format range", e);
                 return Optional.empty();
             }
-        } else if (dateString.matches(
+        } 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
-        )) {
+            )
+        ) {
             try {
                 String[] strDates = dateString.split("/");
-                TemporalAccessor parsedDate = parseDateWithEraIndicator(strDates[0]);
-                TemporalAccessor parsedEndDate = parseDateWithEraIndicator(strDates[1]);
+                TemporalAccessor parsedDate = parseDateWithEraIndicator(
+                    strDates[0]
+                );
+                TemporalAccessor parsedEndDate = parseDateWithEraIndicator(
+                    strDates[1]
+                );
                 return Optional.of(new Date(parsedDate, parsedEndDate));
             } catch (DateTimeParseException e) {
                 LOGGER.debug("Invalid Date format range", e);
                 return Optional.empty();
             }
-        } else if (dateString.matches(
+        } 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
-        )) {
+            )
+        ) {
             try {
                 String[] strDates = dateString.split(" / ");
-                TemporalAccessor parsedDate = parseDateWithEraIndicator(strDates[0]);
-                TemporalAccessor parsedEndDate = parseDateWithEraIndicator(strDates[1]);
+                TemporalAccessor parsedDate = parseDateWithEraIndicator(
+                    strDates[0]
+                );
+                TemporalAccessor parsedEndDate = parseDateWithEraIndicator(
+                    strDates[1]
+                );
                 return Optional.of(new Date(parsedDate, parsedEndDate));
             } catch (DateTimeParseException e) {
                 LOGGER.debug("Invalid Date format range", e);
@@ -214,12 +244,14 @@ public static Optional<Date> parse(String dateString) {
         }
 
         // handle the new date formats with era indicators
-        if (dateString.matches(
+        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} 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);
@@ -239,10 +271,14 @@ public static Optional<Date> parse(String dateString) {
         }
     }
 
-    public static Optional<Date> parse(Optional<String> yearValue,
-                                       Optional<String> monthValue,
-                                       Optional<String> dayValue) {
-        Optional<Year> year = yearValue.flatMap(Date::convertToInt).map(Year::of);
+    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);
 
@@ -250,9 +286,18 @@ public static Optional<Date> parse(Optional<String> yearValue,
             TemporalAccessor date;
             if (month.isPresent()) {
                 if (day.isPresent()) {
-                    date = LocalDate.of(year.get().getValue(), month.get().getNumber(), day.get());
+                    date =
+                        LocalDate.of(
+                            year.get().getValue(),
+                            month.get().getNumber(),
+                            day.get()
+                        );
                 } else {
-                    date = YearMonth.of(year.get().getValue(), month.get().getNumber());
+                    date =
+                        YearMonth.of(
+                            year.get().getValue(),
+                            month.get().getNumber()
+                        );
                 }
             } else {
                 date = year.get();
@@ -278,8 +323,12 @@ private static Optional<Integer> convertToInt(String value) {
      * @param dateString the string which contain era indicator to extract the date information
      * @return the date information with TemporalAccessor type
      */
-    private static TemporalAccessor parseDateWithEraIndicator(String dateString) {
-        String yearString = dateString.strip().substring(0, dateString.length() - 2);
+    private static TemporalAccessor parseDateWithEraIndicator(
+        String dateString
+    ) {
+        String yearString = dateString
+            .strip()
+            .substring(0, dateString.length() - 2);
 
         String[] parts = yearString.split("-");
         int year = Integer.parseInt(parts[0].strip());
@@ -332,13 +381,27 @@ 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
@@ -348,16 +411,24 @@ 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 0a6f6621dd9..3f53e95de2b 100644
--- a/src/main/java/org/jabref/model/entry/EntryConverter.java
+++ b/src/main/java/org/jabref/model/entry/EntryConverter.java
@@ -3,7 +3,6 @@
 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;
 
@@ -21,18 +20,43 @@ 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 +64,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 9b468f27e81..494b472edba 100644
--- a/src/main/java/org/jabref/model/entry/EntryLinkList.java
+++ b/src/main/java/org/jabref/model/entry/EntryLinkList.java
@@ -3,17 +3,18 @@
 import java.util.ArrayList;
 import java.util.List;
 import java.util.stream.Collectors;
-
 import org.jabref.model.database.BibDatabase;
 
 public class EntryLinkList {
 
     private static String SEPARATOR = ",";
 
-    private EntryLinkList() {
-    }
+    private EntryLinkList() {}
 
-    public static List<ParsedEntryLink> parse(String fieldValue, BibDatabase database) {
+    public static List<ParsedEntryLink> parse(
+        String fieldValue,
+        BibDatabase database
+    ) {
         List<ParsedEntryLink> result = new ArrayList<>();
         if ((fieldValue != null) && !fieldValue.isEmpty()) {
             String[] entries = fieldValue.split(SEPARATOR);
@@ -26,6 +27,12 @@ public static List<ParsedEntryLink> parse(String fieldValue, BibDatabase databas
     }
 
     public static String serialize(List<ParsedEntryLink> list) {
-        return String.join(SEPARATOR, list.stream().map(ParsedEntryLink::getKey).collect(Collectors.toList()));
+        return String.join(
+            SEPARATOR,
+            list
+                .stream()
+                .map(ParsedEntryLink::getKey)
+                .collect(Collectors.toList())
+        );
     }
 }
diff --git a/src/main/java/org/jabref/model/entry/IdGenerator.java b/src/main/java/org/jabref/model/entry/IdGenerator.java
index 4875daf8ac4..0a029321f47 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 d3df45becca..28f189163e7 100644
--- a/src/main/java/org/jabref/model/entry/Keyword.java
+++ b/src/main/java/org/jabref/model/entry/Keyword.java
@@ -4,7 +4,6 @@
 import java.util.Set;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
-
 import org.jabref.model.ChainNode;
 
 /**
@@ -46,9 +45,11 @@ public boolean equals(Object o) {
             return false;
         }
         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.getChild(), other.getChild());
+        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.getChild(), other.getChild())
+        );
     }
 
     @Override
@@ -79,9 +80,17 @@ 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("")
+        );
     }
 
     /**
@@ -96,10 +105,17 @@ public String get() {
      * E.g., calling {@link #getPathFromRootAsString(Character)} on the node "B" in "A > B > C" returns "A > B".
      */
     public String getPathFromRootAsString(Character hierarchicalDelimiter) {
-        return getParent()
-                .map(parent -> parent.getPathFromRootAsString(hierarchicalDelimiter) + " " + hierarchicalDelimiter + " ")
-                .orElse("")
-                + keyword;
+        return (
+            getParent()
+                .map(parent ->
+                    parent.getPathFromRootAsString(hierarchicalDelimiter) +
+                    " " +
+                    hierarchicalDelimiter +
+                    " "
+                )
+                .orElse("") +
+            keyword
+        );
     }
 
     /**
@@ -108,19 +124,25 @@ public String getPathFromRootAsString(Character hierarchicalDelimiter) {
      */
     public Set<Keyword> flatten() {
         return Stream
-                .concat(Stream.of(this),
-                        getChild().stream()
-                                  .flatMap(child -> child.flatten().stream()))
-                .collect(Collectors.toSet());
+            .concat(
+                Stream.of(this),
+                getChild().stream().flatMap(child -> child.flatten().stream())
+            )
+            .collect(Collectors.toSet());
     }
 
     /**
      * Returns all subchains starting at this node.
      * E.g., for the chain "A > B > C" the subchains {"A", "A > B", "A > B > C"} are returned.
      */
-    public Set<String> getAllSubchainsAsString(Character hierarchicalDelimiter) {
-        return flatten().stream()
-                        .map(subchain -> subchain.getPathFromRootAsString(hierarchicalDelimiter))
-                        .collect(Collectors.toSet());
+    public Set<String> getAllSubchainsAsString(
+        Character hierarchicalDelimiter
+    ) {
+        return flatten()
+            .stream()
+            .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 d54de57f977..96af7fae926 100644
--- a/src/main/java/org/jabref/model/entry/KeywordList.java
+++ b/src/main/java/org/jabref/model/entry/KeywordList.java
@@ -11,7 +11,6 @@
 import java.util.StringTokenizer;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
-
 import org.jabref.model.strings.StringUtil;
 
 /**
@@ -32,18 +31,32 @@ public KeywordList(Collection<Keyword> keywordChains) {
     }
 
     public KeywordList(List<String> keywordChains) {
-        this(keywordChains.stream().map(Keyword::new).collect(Collectors.toList()));
+        this(
+            keywordChains
+                .stream()
+                .map(Keyword::new)
+                .collect(Collectors.toList())
+        );
     }
 
     public KeywordList(String... keywordChains) {
-        this(Arrays.stream(keywordChains).map(Keyword::new).collect(Collectors.toList()));
+        this(
+            Arrays
+                .stream(keywordChains)
+                .map(Keyword::new)
+                .collect(Collectors.toList())
+        );
     }
 
     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();
         }
@@ -53,10 +66,15 @@ public static KeywordList parse(String keywordString, Character delimiter, Chara
 
         KeywordList keywordList = new KeywordList();
 
-        StringTokenizer tok = new StringTokenizer(keywordString, delimiter.toString());
+        StringTokenizer tok = new StringTokenizer(
+            keywordString,
+            delimiter.toString()
+        );
         while (tok.hasMoreTokens()) {
             String chain = tok.nextToken();
-            Keyword chainRoot = Keyword.of(chain.split(hierarchicalDelimiter.toString()));
+            Keyword chainRoot = Keyword.of(
+                chain.split(hierarchicalDelimiter.toString())
+            );
             keywordList.add(chainRoot);
         }
         return keywordList;
@@ -70,13 +88,24 @@ public static KeywordList parse(String keywordString, Character delimiter, Chara
      * @return an parsed list containing the keywordChains
      */
     public static KeywordList parse(String keywordString, Character delimiter) {
-        return parse(keywordString, delimiter, Keyword.DEFAULT_HIERARCHICAL_DELIMITER);
-    }
-
-    public static KeywordList merge(String keywordStringA, String keywordStringB, Character delimiter) {
+        return parse(
+            keywordString,
+            delimiter,
+            Keyword.DEFAULT_HIERARCHICAL_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);
     }
 
@@ -120,7 +149,10 @@ 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) {
@@ -182,7 +214,10 @@ public String toString() {
     }
 
     public Set<String> toStringList() {
-        return keywordChains.stream().map(Keyword::toString).collect(Collectors.toSet());
+        return keywordChains
+            .stream()
+            .map(Keyword::toString)
+            .collect(Collectors.toSet());
     }
 
     @Override
@@ -194,7 +229,10 @@ public boolean equals(Object o) {
             return false;
         }
         KeywordList keywords1 = (KeywordList) o;
-        return Objects.equals(new HashSet<>(keywordChains), new HashSet<>(keywords1.keywordChains));
+        return Objects.equals(
+            new HashSet<>(keywordChains),
+            new HashSet<>(keywords1.keywordChains)
+        );
     }
 
     @Override
diff --git a/src/main/java/org/jabref/model/entry/LinkedFile.java b/src/main/java/org/jabref/model/entry/LinkedFile.java
index e3c296f5c90..8f438624cbf 100644
--- a/src/main/java/org/jabref/model/entry/LinkedFile.java
+++ b/src/main/java/org/jabref/model/entry/LinkedFile.java
@@ -12,11 +12,9 @@
 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;
-
 import org.jabref.architecture.AllowedToUseLogic;
 import org.jabref.logic.util.io.FileUtil;
 import org.jabref.model.database.BibDatabaseContext;
@@ -29,10 +27,15 @@
 @AllowedToUseLogic("Uses FileUtil from logic")
 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(""), "");
+    private static final LinkedFile NULL_OBJECT = new LinkedFile(
+        "",
+        Path.of(""),
+        ""
+    );
 
     // We have to mark these properties as transient because they can't be serialized directly
     private transient StringProperty description = new SimpleStringProperty();
@@ -40,7 +43,11 @@ public class LinkedFile implements Serializable {
     private transient StringProperty fileType = 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)
+        );
     }
 
     /**
@@ -53,11 +60,19 @@ public LinkedFile(String description, String link, String fileType) {
     }
 
     public LinkedFile(URL link, String fileType) {
-        this("", Objects.requireNonNull(link).toString(), Objects.requireNonNull(fileType));
+        this(
+            "",
+            Objects.requireNonNull(link).toString(),
+            Objects.requireNonNull(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 StringProperty descriptionProperty() {
@@ -101,7 +116,7 @@ public void setLink(String link) {
     }
 
     public Observable[] getObservables() {
-        return new Observable[] {this.link, this.description, this.fileType};
+        return new Observable[] { this.link, this.description, this.fileType };
     }
 
     @Override
@@ -110,9 +125,11 @@ public boolean equals(Object o) {
             return true;
         }
         if (o instanceof LinkedFile that) {
-            return Objects.equals(description.get(), that.description.get())
-                    && Objects.equals(link.get(), that.link.get())
-                    && Objects.equals(fileType.get(), that.fileType.get());
+            return (
+                Objects.equals(description.get(), that.description.get()) &&
+                Objects.equals(link.get(), that.link.get()) &&
+                Objects.equals(fileType.get(), that.fileType.get())
+            );
         }
         return false;
     }
@@ -154,11 +171,19 @@ public int hashCode() {
 
     @Override
     public String toString() {
-        return "ParsedFileField{" +
-                "description='" + description.get() + '\'' +
-                ", link='" + link.get() + '\'' +
-                ", fileType='" + fileType.get() + '\'' +
-                '}';
+        return (
+            "ParsedFileField{" +
+            "description='" +
+            description.get() +
+            '\'' +
+            ", link='" +
+            link.get() +
+            '\'' +
+            ", fileType='" +
+            fileType.get() +
+            '\'' +
+            '}'
+        );
     }
 
     public boolean isEmpty() {
@@ -169,7 +194,10 @@ 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 85db2fd802d..5d093c7d170 100644
--- a/src/main/java/org/jabref/model/entry/Month.java
+++ b/src/main/java/org/jabref/model/entry/Month.java
@@ -1,7 +1,6 @@
 package org.jabref.model.entry;
 
 import java.util.Optional;
-
 import org.jabref.logic.bibtex.FieldWriter;
 import org.jabref.model.strings.StringUtil;
 
@@ -9,7 +8,6 @@
  * Represents a Month of the Year.
  */
 public enum Month {
-
     JANUARY("January", "jan", 1),
     FEBRUARY("February", "feb", 2),
     MARCH("March", "mar", 3),
@@ -176,7 +174,12 @@ public String getShortName() {
      * @return Month in JabRef format
      */
     public String getJabRefFormat() {
-        return String.format(FieldWriter.BIBTEX_STRING_START_END_SYMBOL + "%s" + FieldWriter.BIBTEX_STRING_START_END_SYMBOL, shortName);
+        return String.format(
+            FieldWriter.BIBTEX_STRING_START_END_SYMBOL +
+            "%s" +
+            FieldWriter.BIBTEX_STRING_START_END_SYMBOL,
+            shortName
+        );
     }
 
     /**
diff --git a/src/main/java/org/jabref/model/entry/ParsedEntryLink.java b/src/main/java/org/jabref/model/entry/ParsedEntryLink.java
index dd989692d95..88e6e68dd6e 100644
--- a/src/main/java/org/jabref/model/entry/ParsedEntryLink.java
+++ b/src/main/java/org/jabref/model/entry/ParsedEntryLink.java
@@ -2,7 +2,6 @@
 
 import java.util.Objects;
 import java.util.Optional;
-
 import org.jabref.model.database.BibDatabase;
 
 public class ParsedEntryLink {
@@ -49,7 +48,10 @@ public boolean equals(Object obj) {
             return false;
         }
         ParsedEntryLink other = (ParsedEntryLink) obj;
-        return Objects.equals(key, other.key) && Objects.equals(linkedEntry, other.linkedEntry);
+        return (
+            Objects.equals(key, other.key) &&
+            Objects.equals(linkedEntry, other.linkedEntry)
+        );
     }
 
     public BibDatabase getDatabase() {
diff --git a/src/main/java/org/jabref/model/entry/SharedBibEntryData.java b/src/main/java/org/jabref/model/entry/SharedBibEntryData.java
index 69c3c6bf976..0e2e6d5e318 100644
--- a/src/main/java/org/jabref/model/entry/SharedBibEntryData.java
+++ b/src/main/java/org/jabref/model/entry/SharedBibEntryData.java
@@ -40,10 +40,11 @@ public void setVersion(int version) {
 
     @Override
     public String toString() {
-        return MoreObjects.toStringHelper(this)
-                          .add("sharedID", sharedID)
-                          .add("version", version)
-                          .toString();
+        return MoreObjects
+            .toStringHelper(this)
+            .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 e44aa89ca9f..f1a55e67b8b 100644
--- a/src/main/java/org/jabref/model/entry/event/EntriesEvent.java
+++ b/src/main/java/org/jabref/model/entry/event/EntriesEvent.java
@@ -2,7 +2,6 @@
 
 import java.util.List;
 import java.util.Objects;
-
 import org.jabref.model.database.event.BibDatabaseContextChangedEvent;
 import org.jabref.model.entry.BibEntry;
 
@@ -25,7 +24,10 @@ public EntriesEvent(List<BibEntry> bibEntries) {
      * @param bibEntries List of BibEntry objects which are involved in this event
      * @param location   Location affected by this event
      */
-    public EntriesEvent(List<BibEntry> bibEntries, EntriesEventSource location) {
+    public EntriesEvent(
+        List<BibEntry> bibEntries,
+        EntriesEventSource location
+    ) {
         super();
         this.bibEntries = Objects.requireNonNull(bibEntries);
         this.location = Objects.requireNonNull(location);
diff --git a/src/main/java/org/jabref/model/entry/event/EntriesEventSource.java b/src/main/java/org/jabref/model/entry/event/EntriesEventSource.java
index 913fffcd2ab..127893fbf43 100644
--- a/src/main/java/org/jabref/model/entry/event/EntriesEventSource.java
+++ b/src/main/java/org/jabref/model/entry/event/EntriesEventSource.java
@@ -8,5 +8,5 @@ public enum EntriesEventSource {
     SHARED,
     UNDO,
     CLEANUP_TIMESTAMP,
-    SAVE_ACTION
+    SAVE_ACTION,
 }
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 d10928a16c9..499725b83ab 100644
--- a/src/main/java/org/jabref/model/entry/event/EntryChangedEvent.java
+++ b/src/main/java/org/jabref/model/entry/event/EntryChangedEvent.java
@@ -1,7 +1,6 @@
 package org.jabref.model.entry.event;
 
 import java.util.Collections;
-
 import org.jabref.model.entry.BibEntry;
 
 /**
diff --git a/src/main/java/org/jabref/model/entry/event/FieldAddedOrRemovedEvent.java b/src/main/java/org/jabref/model/entry/event/FieldAddedOrRemovedEvent.java
index 63306f6582d..ba736e9fea3 100644
--- a/src/main/java/org/jabref/model/entry/event/FieldAddedOrRemovedEvent.java
+++ b/src/main/java/org/jabref/model/entry/event/FieldAddedOrRemovedEvent.java
@@ -4,7 +4,10 @@
 
 public class FieldAddedOrRemovedEvent extends FieldChangedEvent {
 
-    public FieldAddedOrRemovedEvent(FieldChange fieldChange, EntriesEventSource location) {
+    public FieldAddedOrRemovedEvent(
+        FieldChange fieldChange,
+        EntriesEventSource location
+    ) {
         super(fieldChange, location);
     }
 }
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 c7d6255a813..8a16bd3d542 100644
--- a/src/main/java/org/jabref/model/entry/event/FieldChangedEvent.java
+++ b/src/main/java/org/jabref/model/entry/event/FieldChangedEvent.java
@@ -21,13 +21,19 @@ 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;
         this.oldValue = oldValue;
-        this.majorCharacterChange = computeMajorCharacterChange(oldValue, newValue);
+        this.majorCharacterChange =
+            computeMajorCharacterChange(oldValue, newValue);
     }
 
     /**
@@ -35,23 +41,33 @@ public FieldChangedEvent(BibEntry bibEntry, Field field, String newValue, String
      * @param field    Name of field which has been changed
      * @param newValue new field value
      */
-    public FieldChangedEvent(BibEntry bibEntry, Field field, String newValue, String oldValue) {
+    public FieldChangedEvent(
+        BibEntry bibEntry,
+        Field field,
+        String newValue,
+        String oldValue
+    ) {
         super(bibEntry);
         this.field = field;
         this.newValue = newValue;
         this.oldValue = oldValue;
-        this.majorCharacterChange = computeMajorCharacterChange(oldValue, newValue);
+        this.majorCharacterChange =
+            computeMajorCharacterChange(oldValue, newValue);
     }
 
     /**
      * @param location Location affected by this event
      */
-    public FieldChangedEvent(FieldChange fieldChange, EntriesEventSource location) {
+    public FieldChangedEvent(
+        FieldChange fieldChange,
+        EntriesEventSource location
+    ) {
         super(fieldChange.getEntry(), location);
         this.field = fieldChange.getField();
         this.newValue = fieldChange.getNewValue();
         this.oldValue = fieldChange.getOldValue();
-        this.majorCharacterChange = computeMajorCharacterChange(oldValue, newValue);
+        this.majorCharacterChange =
+            computeMajorCharacterChange(oldValue, newValue);
     }
 
     public FieldChangedEvent(FieldChange fieldChange) {
@@ -66,7 +82,10 @@ private int computeMajorCharacterChange(String oldValue, String newValue) {
             return newValue.length();
         } else if ((newValue == null) && (oldValue != null)) {
             return oldValue.length();
-        } else if ((oldValue.length() == newValue.length()) && !oldValue.equals(newValue)) {
+        } else if (
+            (oldValue.length() == newValue.length()) &&
+            !oldValue.equals(newValue)
+        ) {
             return newValue.length();
         } else {
             return Math.abs(newValue.length() - oldValue.length());
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 7115f042c4f..0934c83e353 100644
--- a/src/main/java/org/jabref/model/entry/field/AMSField.java
+++ b/src/main/java/org/jabref/model/entry/field/AMSField.java
@@ -6,7 +6,6 @@
 import java.util.Set;
 
 public enum AMSField implements Field {
-
     FJOURNAL("fjournal");
 
     private final String name;
@@ -25,7 +24,12 @@ public enum AMSField implements Field {
         this.properties = EnumSet.noneOf(FieldProperty.class);
     }
 
-    AMSField(String name, String displayName, FieldProperty first, FieldProperty... rest) {
+    AMSField(
+        String name,
+        String displayName,
+        FieldProperty first,
+        FieldProperty... rest
+    ) {
         this.name = name;
         this.displayName = displayName;
         this.properties = EnumSet.of(first, rest);
@@ -38,9 +42,10 @@ 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();
+        return Arrays
+            .stream(AMSField.values())
+            .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 1453e6fc32d..acfefe9a6d0 100644
--- a/src/main/java/org/jabref/model/entry/field/BibField.java
+++ b/src/main/java/org/jabref/model/entry/field/BibField.java
@@ -2,8 +2,8 @@
 
 import java.util.Objects;
 
-public record BibField(Field field, FieldPriority priority) implements Comparable<BibField> {
-
+public record BibField(Field field, FieldPriority priority)
+    implements Comparable<BibField> {
     @Override
     public boolean equals(Object o) {
         if (this == o) {
@@ -23,10 +23,14 @@ 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 f8f3103d94b..9c349fe9fe7 100644
--- a/src/main/java/org/jabref/model/entry/field/BiblatexApaField.java
+++ b/src/main/java/org/jabref/model/entry/field/BiblatexApaField.java
@@ -4,11 +4,9 @@
 import java.util.EnumSet;
 import java.util.Optional;
 import java.util.Set;
-
 import org.jabref.model.entry.types.BiblatexApaEntryType;
 
 public enum BiblatexApaField implements Field {
-
     AMENDMENT("amendment"),
     ARTICLE("article"),
     CITATION("citation"),
@@ -34,7 +32,12 @@ public enum BiblatexApaField implements Field {
         this.properties = EnumSet.noneOf(FieldProperty.class);
     }
 
-    BiblatexApaField(String name, String displayName, FieldProperty first, FieldProperty... rest) {
+    BiblatexApaField(
+        String name,
+        String displayName,
+        FieldProperty first,
+        FieldProperty... rest
+    ) {
         this.name = name;
         this.displayName = displayName;
         this.properties = EnumSet.of(first, rest);
@@ -50,9 +53,10 @@ public static <T> Optional<BiblatexApaField> fromName(T type, String name) {
         if (!(type instanceof BiblatexApaEntryType)) {
             return Optional.empty();
         }
-        return Arrays.stream(BiblatexApaField.values())
-                     .filter(field -> field.getName().equalsIgnoreCase(name))
-                     .findAny();
+        return Arrays
+            .stream(BiblatexApaField.values())
+            .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 b4cf3d1390a..0ca6ba2cfca 100644
--- a/src/main/java/org/jabref/model/entry/field/BiblatexSoftwareField.java
+++ b/src/main/java/org/jabref/model/entry/field/BiblatexSoftwareField.java
@@ -4,11 +4,9 @@
 import java.util.EnumSet;
 import java.util.Optional;
 import java.util.Set;
-
 import org.jabref.model.entry.types.BiblatexSoftwareEntryType;
 
 public enum BiblatexSoftwareField implements Field {
-
     HALID("hal_id"),
     HALVERSION("hal_version"),
     INTRODUCEDIN("introducedin"),
@@ -34,25 +32,38 @@ 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);
     }
 
-    BiblatexSoftwareField(String name, FieldProperty first, FieldProperty... rest) {
+    BiblatexSoftwareField(
+        String name,
+        FieldProperty first,
+        FieldProperty... rest
+    ) {
         this.name = name;
         this.displayName = null;
         this.properties = EnumSet.of(first, rest);
     }
 
-    public static <T> Optional<BiblatexSoftwareField> fromName(T type, String name) {
+    public static <T> Optional<BiblatexSoftwareField> fromName(
+        T type,
+        String name
+    ) {
         if (!(type instanceof BiblatexSoftwareEntryType)) {
             return Optional.empty();
         }
-        return Arrays.stream(BiblatexSoftwareField.values())
-                     .filter(field -> field.getName().equalsIgnoreCase(name))
-                     .findAny();
+        return Arrays
+            .stream(BiblatexSoftwareField.values())
+            .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 ec3055e493c..789a757502b 100644
--- a/src/main/java/org/jabref/model/entry/field/Field.java
+++ b/src/main/java/org/jabref/model/entry/field/Field.java
@@ -2,11 +2,9 @@
 
 import java.util.Optional;
 import java.util.Set;
-
 import org.jabref.model.strings.StringUtil;
 
 public interface Field {
-
     /**
      * properties contains mappings to tell the EntryEditor to add a specific function to this field,
      * for instance a dropdown for selecting the month for the month 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 645a1295221..1f3293f460b 100644
--- a/src/main/java/org/jabref/model/entry/field/FieldFactory.java
+++ b/src/main/java/org/jabref/model/entry/field/FieldFactory.java
@@ -12,7 +12,6 @@
 import java.util.TreeSet;
 import java.util.function.Predicate;
 import java.util.stream.Collectors;
-
 import org.jabref.model.entry.types.EntryType;
 import org.jabref.model.strings.StringUtil;
 import org.jabref.model.util.OptionalUtil;
@@ -31,91 +30,124 @@ 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));
+        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));
     }
 
     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));
     }
 
     public static List<Field> getNotTextFieldNames() {
-        return Arrays.asList(StandardField.DOI, StandardField.FILE, StandardField.URL, StandardField.URI, StandardField.ISBN, StandardField.ISSN, StandardField.MONTH, StandardField.DATE, StandardField.YEAR);
+        return Arrays.asList(
+            StandardField.DOI,
+            StandardField.FILE,
+            StandardField.URL,
+            StandardField.URI,
+            StandardField.ISBN,
+            StandardField.ISSN,
+            StandardField.MONTH,
+            StandardField.DATE,
+            StandardField.YEAR
+        );
     }
 
     public static List<Field> getIdentifierFieldNames() {
-        return Arrays.asList(StandardField.DOI, StandardField.EPRINT, StandardField.PMID);
+        return Arrays.asList(
+            StandardField.DOI,
+            StandardField.EPRINT,
+            StandardField.PMID
+        );
     }
 
     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 Set<OrFields> parseOrFieldsList(String fieldNames) {
-        return Arrays.stream(fieldNames.split(FieldFactory.DELIMITER))
-                     .filter(StringUtil::isNotBlank)
-                     .map(FieldFactory::parseOrFields)
-                     .collect(Collectors.toCollection(LinkedHashSet::new));
+        return Arrays
+            .stream(fieldNames.split(FieldFactory.DELIMITER))
+            .filter(StringUtil::isNotBlank)
+            .map(FieldFactory::parseOrFields)
+            .collect(Collectors.toCollection(LinkedHashSet::new));
     }
 
     public static Set<Field> parseFieldList(String fieldNames) {
-        return Arrays.stream(fieldNames.split(FieldFactory.DELIMITER))
-                     .filter(StringUtil::isNotBlank)
-                     .map(FieldFactory::parseField)
-                     .collect(Collectors.toCollection(LinkedHashSet::new));
+        return Arrays
+            .stream(fieldNames.split(FieldFactory.DELIMITER))
+            .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));
+        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));
     }
 
     /**
      * Type T is an entry type and is used to direct the mapping to the Java field class.
      * 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) {
+    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
         if (fieldName.startsWith("comment-")) {
             String username = fieldName.substring("comment-".length());
             return new UserSpecificCommentField(username);
         }
-        return OptionalUtil.<Field>orElse(
-              OptionalUtil.<Field>orElse(
-               OptionalUtil.<Field>orElse(
+        return 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(
+                                    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) {
@@ -123,7 +155,10 @@ public static Field parseField(String fieldName) {
     }
 
     public static Set<Field> getKeyFields() {
-        return getFieldsFiltered(field -> field.getProperties().contains(FieldProperty.SINGLE_ENTRY_LINK) || field.getProperties().contains(FieldProperty.MULTIPLE_ENTRY_LINK));
+        return getFieldsFiltered(field ->
+            field.getProperties().contains(FieldProperty.SINGLE_ENTRY_LINK) ||
+            field.getProperties().contains(FieldProperty.MULTIPLE_ENTRY_LINK)
+        );
     }
 
     public static boolean isInternalField(Field field) {
@@ -131,7 +166,9 @@ 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)
+        );
     }
 
     /**
@@ -140,9 +177,13 @@ public static Set<Field> getJournalNameFields() {
     public static Set<Field> getCommonFields() {
         EnumSet<StandardField> allFields = EnumSet.allOf(StandardField.class);
 
-        LinkedHashSet<Field> publicAndInternalFields = new LinkedHashSet<>(allFields.size() + 3);
+        LinkedHashSet<Field> publicAndInternalFields = new LinkedHashSet<>(
+            allFields.size() + 3
+        );
         publicAndInternalFields.add(InternalField.INTERNAL_ALL_FIELD);
-        publicAndInternalFields.add(InternalField.INTERNAL_ALL_TEXT_FIELDS_FIELD);
+        publicAndInternalFields.add(
+            InternalField.INTERNAL_ALL_TEXT_FIELDS_FIELD
+        );
         publicAndInternalFields.add(InternalField.KEY_FIELD);
         publicAndInternalFields.addAll(allFields);
 
@@ -153,7 +194,9 @@ public static Set<Field> getCommonFields() {
      * Returns a sorted Set of Fields (by {@link Field#getDisplayName} with all fields without internal ones
      */
     public static Set<Field> getAllFieldsWithOutInternal() {
-        Set<Field> fields = new TreeSet<>(Comparator.comparing(Field::getDisplayName));
+        Set<Field> fields = new TreeSet<>(
+            Comparator.comparing(Field::getDisplayName)
+        );
         fields.addAll(getAllFields());
         fields.removeAll(EnumSet.allOf(InternalField.class));
 
@@ -166,7 +209,9 @@ public static Set<Field> getAllFieldsWithOutInternal() {
     public static Set<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);
 
@@ -174,17 +219,22 @@ public static Set<Field> getStandardFieldsWithCitationKey() {
     }
 
     public static Set<Field> getBookNameFields() {
-        return getFieldsFiltered(field -> field.getProperties().contains(FieldProperty.BOOK_NAME));
+        return getFieldsFiltered(field ->
+            field.getProperties().contains(FieldProperty.BOOK_NAME)
+        );
     }
 
     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() {
@@ -206,14 +256,32 @@ 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: 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);
+    public static boolean isMultiLineField(
+        final Field field,
+        List<Field> nonWrappableFields
+    ) {
+        return (
+            field.getProperties().contains(FieldProperty.MULTILINE_TEXT) ||
+            nonWrappableFields.contains(field)
+        );
     }
 }
diff --git a/src/main/java/org/jabref/model/entry/field/FieldProperty.java b/src/main/java/org/jabref/model/entry/field/FieldProperty.java
index 19356f4dccb..0a9e737dd87 100644
--- a/src/main/java/org/jabref/model/entry/field/FieldProperty.java
+++ b/src/main/java/org/jabref/model/entry/field/FieldProperty.java
@@ -25,5 +25,5 @@ public enum FieldProperty {
     TYPE,
     VERBATIM,
     YES_NO,
-    COMMENT
+    COMMENT,
 }
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 da0a47274b6..65b583847ef 100644
--- a/src/main/java/org/jabref/model/entry/field/IEEEField.java
+++ b/src/main/java/org/jabref/model/entry/field/IEEEField.java
@@ -31,9 +31,10 @@ public enum IEEEField implements Field {
     }
 
     public static Optional<IEEEField> fromName(String name) {
-        return Arrays.stream(IEEEField.values())
-                     .filter(field -> field.getName().equalsIgnoreCase(name))
-                     .findAny();
+        return Arrays
+            .stream(IEEEField.values())
+            .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 26ccba31388..fc805873706 100644
--- a/src/main/java/org/jabref/model/entry/field/InternalField.java
+++ b/src/main/java/org/jabref/model/entry/field/InternalField.java
@@ -70,9 +70,10 @@ public static Optional<InternalField> fromName(String name) {
             return Optional.of(InternalField.KEY_FIELD);
         }
 
-        return Arrays.stream(InternalField.values())
-                     .filter(field -> field.getName().equalsIgnoreCase(name))
-                     .findAny();
+        return Arrays
+            .stream(InternalField.values())
+            .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 e0d24537be5..efbcf7a3f62 100644
--- a/src/main/java/org/jabref/model/entry/field/OrFields.java
+++ b/src/main/java/org/jabref/model/entry/field/OrFields.java
@@ -45,7 +45,9 @@ public boolean contains(Field field) {
 
     @Override
     public int compareTo(OrFields o) {
-        return FieldFactory.serializeOrFields(this).compareTo(FieldFactory.serializeOrFields(o));
+        return FieldFactory
+            .serializeOrFields(this)
+            .compareTo(FieldFactory.serializeOrFields(o));
     }
 
     public boolean hasExactlyOne() {
@@ -75,8 +77,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 e5103311f78..26fd7637a81 100644
--- a/src/main/java/org/jabref/model/entry/field/SpecialField.java
+++ b/src/main/java/org/jabref/model/entry/field/SpecialField.java
@@ -7,44 +7,39 @@
 import java.util.List;
 import java.util.Optional;
 import java.util.Set;
-
 import org.jabref.model.entry.KeywordList;
 
 public enum SpecialField implements Field {
-
-    PRINTED("printed",
-            SpecialFieldValue.PRINTED
+    PRINTED("printed", SpecialFieldValue.PRINTED),
+
+    PRIORITY(
+        "priority",
+        SpecialFieldValue.CLEAR_PRIORITY,
+        SpecialFieldValue.PRIORITY_HIGH,
+        SpecialFieldValue.PRIORITY_MEDIUM,
+        SpecialFieldValue.PRIORITY_LOW
     ),
 
-    PRIORITY("priority",
-            SpecialFieldValue.CLEAR_PRIORITY,
-            SpecialFieldValue.PRIORITY_HIGH,
-            SpecialFieldValue.PRIORITY_MEDIUM,
-            SpecialFieldValue.PRIORITY_LOW
-    ),
-
-    QUALITY("qualityassured",
-            SpecialFieldValue.QUALITY_ASSURED
-    ),
+    QUALITY("qualityassured", SpecialFieldValue.QUALITY_ASSURED),
 
-    RANKING("ranking",
-            SpecialFieldValue.CLEAR_RANK,
-            SpecialFieldValue.RANK_1,
-            SpecialFieldValue.RANK_2,
-            SpecialFieldValue.RANK_3,
-            SpecialFieldValue.RANK_4,
-            SpecialFieldValue.RANK_5
+    RANKING(
+        "ranking",
+        SpecialFieldValue.CLEAR_RANK,
+        SpecialFieldValue.RANK_1,
+        SpecialFieldValue.RANK_2,
+        SpecialFieldValue.RANK_3,
+        SpecialFieldValue.RANK_4,
+        SpecialFieldValue.RANK_5
     ),
 
-    READ_STATUS("readstatus",
-            SpecialFieldValue.CLEAR_READ_STATUS,
-            SpecialFieldValue.READ,
-            SpecialFieldValue.SKIMMED
+    READ_STATUS(
+        "readstatus",
+        SpecialFieldValue.CLEAR_READ_STATUS,
+        SpecialFieldValue.READ,
+        SpecialFieldValue.SKIMMED
     ),
 
-    RELEVANCE("relevance",
-            SpecialFieldValue.RELEVANT
-    );
+    RELEVANCE("relevance", SpecialFieldValue.RELEVANT);
 
     private final List<SpecialFieldValue> values;
     private final KeywordList keywords;
@@ -59,7 +54,9 @@ public enum SpecialField implements Field {
         for (SpecialFieldValue value : values) {
             this.values.add(value);
             value.getKeyword().ifPresent(keywords::add);
-            value.getFieldValue().ifPresent(fieldValue -> map.put(fieldValue, value));
+            value
+                .getFieldValue()
+                .ifPresent(fieldValue -> map.put(fieldValue, value));
         }
     }
 
@@ -72,9 +69,10 @@ public KeywordList getKeyWords() {
     }
 
     public static Optional<SpecialField> fromName(String name) {
-        return Arrays.stream(SpecialField.values())
-                     .filter(field -> field.getName().equalsIgnoreCase(name))
-                     .findAny();
+        return Arrays
+            .stream(SpecialField.values())
+            .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 6c3337b41f6..287b18be8c8 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,9 @@
 package org.jabref.model.entry.field;
 
 import java.util.Optional;
-
 import org.jabref.model.entry.Keyword;
 
 public enum SpecialFieldValue {
-
     PRINTED("printed"),
 
     CLEAR_PRIORITY(null),
@@ -45,7 +43,9 @@ public static SpecialFieldValue getRating(int ranking) {
             case 3 -> RANK_3;
             case 4 -> RANK_4;
             case 5 -> RANK_5;
-            default -> throw new UnsupportedOperationException(ranking + "is not a valid ranking");
+            default -> throw new UnsupportedOperationException(
+                ranking + "is not a valid ranking"
+            );
         };
     }
 
@@ -65,7 +65,9 @@ public int toRating() {
             case RANK_3 -> 3;
             case RANK_4 -> 4;
             case RANK_5 -> 5;
-            default -> throw new UnsupportedOperationException(this + "is not a valid ranking");
+            default -> throw new UnsupportedOperationException(
+                this + "is not a valid ranking"
+            );
         };
     }
 }
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 c286ca6ea3c..7d992447060 100644
--- a/src/main/java/org/jabref/model/entry/field/StandardField.java
+++ b/src/main/java/org/jabref/model/entry/field/StandardField.java
@@ -4,7 +4,6 @@
 import java.util.EnumSet;
 import java.util.Optional;
 import java.util.Set;
-
 import org.jabref.gui.fieldeditors.FieldNameLabel;
 
 /**
@@ -13,7 +12,6 @@
  * See {@link FieldNameLabel#getDescription(org.jabref.model.entry.field.Field)} for a description of each field.
  */
 public enum StandardField implements Field {
-
     ABSTRACT("abstract", FieldProperty.MULTILINE_TEXT),
     ADDENDUM("addendum"),
     ADDRESS("address"),
@@ -32,7 +30,12 @@ public enum StandardField implements Field {
     CHAPTER("chapter"),
     COMMENTATOR("commentator", FieldProperty.PERSON_NAMES),
     // Comments of users are handled at {@link org.jabref.model.entry.field.UserSpecificCommentField}
-    COMMENT("comment", FieldProperty.COMMENT, FieldProperty.MULTILINE_TEXT, FieldProperty.VERBATIM),
+    COMMENT(
+        "comment",
+        FieldProperty.COMMENT,
+        FieldProperty.MULTILINE_TEXT,
+        FieldProperty.VERBATIM
+    ),
     CROSSREF("crossref", FieldProperty.SINGLE_ENTRY_LINK),
     DATE("date", FieldProperty.DATE),
     DAY("day"),
@@ -138,7 +141,12 @@ public enum StandardField implements Field {
     CREATIONDATE("creationdate", FieldProperty.DATE),
     MODIFICATIONDATE("modificationdate", FieldProperty.DATE);
 
-    public static Set<Field> AUTOMATIC_FIELDS = Set.of(OWNER, TIMESTAMP, CREATIONDATE, MODIFICATIONDATE);
+    public static Set<Field> AUTOMATIC_FIELDS = Set.of(
+        OWNER,
+        TIMESTAMP,
+        CREATIONDATE,
+        MODIFICATIONDATE
+    );
 
     private final String name;
     private final String displayName;
@@ -156,7 +164,12 @@ public enum StandardField implements Field {
         this.properties = EnumSet.noneOf(FieldProperty.class);
     }
 
-    StandardField(String name, String displayName, FieldProperty first, FieldProperty... rest) {
+    StandardField(
+        String name,
+        String displayName,
+        FieldProperty first,
+        FieldProperty... rest
+    ) {
         this.name = name;
         this.displayName = displayName;
         this.properties = EnumSet.of(first, rest);
@@ -169,9 +182,10 @@ public enum StandardField implements Field {
     }
 
     public static Optional<StandardField> fromName(String name) {
-        return Arrays.stream(StandardField.values())
-                     .filter(field -> field.getName().equalsIgnoreCase(name))
-                     .findAny();
+        return Arrays
+            .stream(StandardField.values())
+            .filter(field -> field.getName().equalsIgnoreCase(name))
+            .findAny();
     }
 
     @Override
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 a18779d3dc8..648b5e08e0c 100644
--- a/src/main/java/org/jabref/model/entry/field/UnknownField.java
+++ b/src/main/java/org/jabref/model/entry/field/UnknownField.java
@@ -4,10 +4,10 @@
 import java.util.Locale;
 import java.util.Objects;
 import java.util.Set;
-
 import org.jabref.model.strings.StringUtil;
 
 public class UnknownField implements Field {
+
     private String name;
     private final Set<FieldProperty> properties;
     private final String displayName;
@@ -22,18 +22,30 @@ public UnknownField(String name, String displayName) {
         this.properties = EnumSet.noneOf(FieldProperty.class);
     }
 
-    public UnknownField(String name, FieldProperty first, FieldProperty... rest) {
+    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);
     }
 
     public static UnknownField fromDisplayName(String displayName) {
-        return new UnknownField(displayName.toLowerCase(Locale.ROOT), displayName);
+        return new UnknownField(
+            displayName.toLowerCase(Locale.ROOT),
+            displayName
+        );
     }
 
     @Override
@@ -79,8 +91,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 56e45b7d11a..f68fe173a40 100644
--- a/src/main/java/org/jabref/model/entry/field/UserSpecificCommentField.java
+++ b/src/main/java/org/jabref/model/entry/field/UserSpecificCommentField.java
@@ -5,7 +5,12 @@
 import java.util.Set;
 
 public class UserSpecificCommentField implements Field {
-    private static final Set<FieldProperty> PROPERTIES = EnumSet.of(FieldProperty.COMMENT, FieldProperty.MULTILINE_TEXT, FieldProperty.VERBATIM);
+
+    private static final Set<FieldProperty> PROPERTIES = EnumSet.of(
+        FieldProperty.COMMENT,
+        FieldProperty.MULTILINE_TEXT,
+        FieldProperty.VERBATIM
+    );
     private final String name;
 
     public UserSpecificCommentField(String username) {
@@ -46,8 +51,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/ARK.java b/src/main/java/org/jabref/model/entry/identifier/ARK.java
index b3ebf895779..e8a049cbc2f 100644
--- a/src/main/java/org/jabref/model/entry/identifier/ARK.java
+++ b/src/main/java/org/jabref/model/entry/identifier/ARK.java
@@ -16,6 +16,7 @@
  * </p>
  */
 public class ARK extends EprintIdentifier {
+
     private final String ark;
 
     private ARK(String ark) {
@@ -35,6 +36,8 @@ public String getNormalized() {
 
     @Override
     public Optional<URI> getExternalURI() {
-        return Optional.of(URI.create("https://n2t.net/ark:/" + getNormalized()));
+        return Optional.of(
+            URI.create("https://n2t.net/ark:/" + getNormalized())
+        );
     }
 }
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 01a9e74270f..66ab6b89095 100644
--- a/src/main/java/org/jabref/model/entry/identifier/ArXivIdentifier.java
+++ b/src/main/java/org/jabref/model/entry/identifier/ArXivIdentifier.java
@@ -6,9 +6,7 @@
 import java.util.Optional;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
-
 import org.jabref.model.strings.StringUtil;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -16,9 +14,13 @@
  * Identifier for the arXiv. See https://arxiv.org/help/arxiv_identifier
  */
 public class ArXivIdentifier extends EprintIdentifier {
-    private static final Logger LOGGER = LoggerFactory.getLogger(ArXivIdentifier.class);
 
-    private static final String ARXIV_PREFIX = "http(s)?://arxiv.org/(abs|pdf)/|arxiv|arXiv";
+    private static final Logger LOGGER = LoggerFactory.getLogger(
+        ArXivIdentifier.class
+    );
+
+    private static final String ARXIV_PREFIX =
+        "http(s)?://arxiv.org/(abs|pdf)/|arxiv|arXiv";
     private final String identifier;
     private final String classification;
     private final String version;
@@ -39,13 +41,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);
@@ -54,7 +64,9 @@ public static Optional<ArXivIdentifier> parse(String value) {
         return Optional.empty();
     }
 
-    private static Optional<ArXivIdentifier> getArXivIdentifier(Matcher matcher) {
+    private static Optional<ArXivIdentifier> getArXivIdentifier(
+        Matcher matcher
+    ) {
         String id = matcher.group("id");
         String classification = matcher.group("classification");
         if (classification == null) {
@@ -93,10 +105,16 @@ public Optional<DOI> inferDOI() {
 
     @Override
     public String toString() {
-        return "ArXivIdentifier{" +
-                "identifier='" + identifier + '\'' +
-                ", classification='" + classification + '\'' +
-                '}';
+        return (
+            "ArXivIdentifier{" +
+            "identifier='" +
+            identifier +
+            '\'' +
+            ", classification='" +
+            classification +
+            '\'' +
+            '}'
+        );
     }
 
     @Override
@@ -109,8 +127,10 @@ 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
@@ -134,7 +154,9 @@ public String getNormalizedWithoutVersion() {
     @Override
     public Optional<URI> getExternalURI() {
         try {
-            return Optional.of(new URI("https://arxiv.org/abs/" + getNormalized()));
+            return Optional.of(
+                new URI("https://arxiv.org/abs/" + getNormalized())
+            );
         } catch (URISyntaxException e) {
             return Optional.empty();
         }
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 b2fc250b739..c7611eabc9e 100644
--- a/src/main/java/org/jabref/model/entry/identifier/DOI.java
+++ b/src/main/java/org/jabref/model/entry/identifier/DOI.java
@@ -9,97 +9,126 @@
 import java.util.Optional;
 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");
+    public static final URI AGENCY_RESOLVER = URI.create(
+        "https://doi.org/doiRA"
+    );
     public static final URI RESOLVER = URI.create("https://doi.org/");
 
     private static final Logger LOGGER = LoggerFactory.getLogger(DOI.class);
 
     // 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;
+    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
-            + "[^\\x00-\\x7F]" // strips off all non-ASCII characters
-            + "]";
+    private static final String CHARS_TO_REMOVE =
+        "[\\s+" +
+        "[^\\x00-\\x7F]" + // strips off all non-ASCII characters
+        // remove white space characters, i.e, \t, \n, \x0B, \f, \r . + is a greedy quantifier
+        "]";
 
     // DOI
     private final String doi;
@@ -124,9 +153,12 @@ public DOI(String doi) {
             try {
                 // decodes path segment
                 URI url = new URI(trimmedDoi);
-                trimmedDoi = url.getScheme() + "://" + url.getHost() + url.getPath();
+                trimmedDoi =
+                    url.getScheme() + "://" + url.getHost() + url.getPath();
             } catch (URISyntaxException e) {
-                throw new IllegalArgumentException(doi + " is not a valid HTTP DOI/Short DOI.");
+                throw new IllegalArgumentException(
+                    doi + " is not a valid HTTP DOI/Short DOI."
+                );
             }
         }
 
@@ -143,12 +175,16 @@ public DOI(String doi) {
                 isShortDoi = true;
             } else {
                 // Shortcut DOI without the "10/" as in "doi.org/d8dn"
-                Matcher shortcutDoiMatcher = EXACT_SHORT_DOI_SHORTCUT.matcher(trimmedDoi);
+                Matcher shortcutDoiMatcher = EXACT_SHORT_DOI_SHORTCUT.matcher(
+                    trimmedDoi
+                );
                 if (shortcutDoiMatcher.find()) {
                     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."
+                    );
                 }
             }
         }
@@ -223,9 +259,7 @@ public static Optional<DOI> findInText(String text) {
 
     @Override
     public String toString() {
-        return "DOI{" +
-                "doi='" + doi + '\'' +
-                '}';
+        return "DOI{" + "doi='" + doi + '\'' + '}';
     }
 
     /**
@@ -264,7 +298,12 @@ public Optional<URI> getExternalURIWithCustomBase(String customBase) {
 
     private Optional<URI> getExternalURIFromBase(URI base) {
         try {
-            URI uri = new URI(base.getScheme(), base.getHost(), "/" + doi, null);
+            URI uri = new URI(
+                base.getScheme(),
+                base.getHost(),
+                "/" + doi,
+                null
+            );
             return Optional.of(uri);
         } catch (URISyntaxException e) {
             // should never happen
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 962f3459de7..b61a16f70a6 100644
--- a/src/main/java/org/jabref/model/entry/identifier/ISBN.java
+++ b/src/main/java/org/jabref/model/entry/identifier/ISBN.java
@@ -7,18 +7,20 @@
 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 ISBN implements Identifier {
 
-    private static final Pattern ISBN_PATTERN = Pattern.compile("^(\\d{9}[\\dxX]|\\d{13})$");
+    private static final Pattern ISBN_PATTERN = Pattern.compile(
+        "^(\\d{9}[\\dxX]|\\d{13})$"
+    );
 
     private final String isbnString;
 
     public ISBN(String isbnString) {
-        this.isbnString = Objects.requireNonNull(isbnString).trim().replace("-", "");
+        this.isbnString =
+            Objects.requireNonNull(isbnString).trim().replace("-", "");
     }
 
     public static Optional<ISBN> parse(String input) {
@@ -102,7 +104,9 @@ public String getNormalized() {
     @Override
     public Optional<URI> getExternalURI() {
         try {
-            return Optional.of(new URI("https://www.worldcat.org/isbn/" + isbnString));
+            return Optional.of(
+                new URI("https://www.worldcat.org/isbn/" + isbnString)
+            );
         } catch (URISyntaxException e) {
             return Optional.empty();
         }
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 7050a74687c..37bffc5eeeb 100644
--- a/src/main/java/org/jabref/model/entry/identifier/ISSN.java
+++ b/src/main/java/org/jabref/model/entry/identifier/ISSN.java
@@ -5,14 +5,17 @@
 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]$");
-    private static final Pattern ISSN_PATTERN_NODASH = Pattern.compile("^(\\d{4})(\\d{3}[\\dxX])$");
+    private static final Pattern ISSN_PATTERN = Pattern.compile(
+        "^\\d{4}-\\d{3}[\\dxX]$"
+    );
+    private static final Pattern ISSN_PATTERN_NODASH = Pattern.compile(
+        "^(\\d{4})(\\d{3}[\\dxX])$"
+    );
 
     private final String issnString;
 
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 c385b9316ab..e69ef965f46 100644
--- a/src/main/java/org/jabref/model/entry/identifier/IacrEprint.java
+++ b/src/main/java/org/jabref/model/entry/identifier/IacrEprint.java
@@ -6,16 +6,17 @@
 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;
-
 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);
+    private static final Logger LOGGER = LoggerFactory.getLogger(
+        IacrEprint.class
+    );
 
     private static final String IACR_EPRINT_EXP = "\\d{4}\\/\\d{3,5}";
     private final String iacrEprint;
@@ -26,17 +27,22 @@ public class IacrEprint implements Identifier {
         String trimmedId = iacrEprint.trim();
 
         if (matchesExcepted(trimmedId)) {
-            Matcher matcher = Pattern.compile(IACR_EPRINT_EXP).matcher(trimmedId);
+            Matcher matcher = Pattern
+                .compile(IACR_EPRINT_EXP)
+                .matcher(trimmedId);
             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
         );
     }
 
@@ -62,7 +68,12 @@ public Field getDefaultField() {
     @Override
     public Optional<URI> getExternalURI() {
         try {
-            URI uri = new URI(RESOLVER.getScheme(), RESOLVER.getHost(), "/" + iacrEprint, null);
+            URI uri = new URI(
+                RESOLVER.getScheme(),
+                RESOLVER.getHost(),
+                "/" + iacrEprint,
+                null
+            );
             return Optional.of(uri);
         } catch (URISyntaxException e) {
             // should never happen
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 3a921bfdf6c..20a24c9f19c 100644
--- a/src/main/java/org/jabref/model/entry/identifier/Identifier.java
+++ b/src/main/java/org/jabref/model/entry/identifier/Identifier.java
@@ -2,11 +2,9 @@
 
 import java.net.URI;
 import java.util.Optional;
-
 import org.jabref.model.entry.field.Field;
 
 public interface Identifier {
-
     /**
      * Returns the 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 0e8d14c160c..34b1ea9c876 100644
--- a/src/main/java/org/jabref/model/entry/identifier/MathSciNetId.java
+++ b/src/main/java/org/jabref/model/entry/identifier/MathSciNetId.java
@@ -4,7 +4,6 @@
 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;
@@ -22,7 +21,10 @@ 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
-        String identifier = StringUtil.tokenizeToList(mrNumberRaw, " (").get(0).trim();
+        String identifier = StringUtil
+            .tokenizeToList(mrNumberRaw, " (")
+            .get(0)
+            .trim();
         return Optional.of(new MathSciNetId(identifier));
     }
 
@@ -54,7 +56,11 @@ public String toString() {
     @Override
     public Optional<URI> getExternalURI() {
         try {
-            return Optional.of(new URI("https://www.ams.org/mathscinet-getitem?mr=" + identifier));
+            return Optional.of(
+                new URI(
+                    "https://www.ams.org/mathscinet-getitem?mr=" + identifier
+                )
+            );
         } catch (URISyntaxException e) {
             return Optional.empty();
         }
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 f5c0b89b0be..183625242ce 100644
--- a/src/main/java/org/jabref/model/entry/types/BiblatexAPAEntryTypeDefinitions.java
+++ b/src/main/java/org/jabref/model/entry/types/BiblatexAPAEntryTypeDefinitions.java
@@ -2,7 +2,6 @@
 
 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;
@@ -11,33 +10,81 @@
 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();
+        .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();
+        .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()
+    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)
+            .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();
+        .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)
+        .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);
+    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 6a1d8d3abe2..d02fbc6e8bc 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"),
@@ -29,8 +28,9 @@ public String getDisplayName() {
     }
 
     public static Optional<BiblatexApaEntryType> fromName(String name) {
-        return Arrays.stream(BiblatexApaEntryType.values())
-                     .filter(field -> field.getName().equalsIgnoreCase(name))
-                     .findAny();
+        return Arrays
+            .stream(BiblatexApaEntryType.values())
+            .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 87db17e110d..cbcaf001a42 100644
--- a/src/main/java/org/jabref/model/entry/types/BiblatexEntryTypeDefinitions.java
+++ b/src/main/java/org/jabref/model/entry/types/BiblatexEntryTypeDefinitions.java
@@ -2,7 +2,6 @@
 
 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;
@@ -16,432 +15,1340 @@
 public class BiblatexEntryTypeDefinitions {
 
     private static final BibEntryType ARTICLE = new BibEntryTypeBuilder()
-            .withType(StandardEntryType.Article)
-            .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.SUBTITLE,
-                    StandardField.TITLEADDON, StandardField.EDITOR, StandardField.EDITORA, StandardField.EDITORB, StandardField.EDITORC,
-                    StandardField.JOURNALSUBTITLE, StandardField.ISSUETITLE, StandardField.ISSUESUBTITLE, StandardField.LANGUAGE,
-                    StandardField.ORIGLANGUAGE, StandardField.SERIES, StandardField.VOLUME, StandardField.NUMBER, StandardField.EID,
-                    StandardField.ISSUE, StandardField.PAGES, StandardField.VERSION, StandardField.NOTE,
-                    StandardField.ISSN, StandardField.ADDENDUM, StandardField.PUBSTATE, StandardField.DOI, StandardField.EPRINT,
-                    StandardField.EPRINTCLASS, StandardField.EPRINTTYPE, StandardField.URL, StandardField.URLDATE)
-            .withRequiredFields(
-                    StandardField.AUTHOR, StandardField.TITLE, StandardField.JOURNALTITLE, StandardField.DATE)
-            .build();
+        .withType(StandardEntryType.Article)
+        .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.SUBTITLE,
+            StandardField.TITLEADDON,
+            StandardField.EDITOR,
+            StandardField.EDITORA,
+            StandardField.EDITORB,
+            StandardField.EDITORC,
+            StandardField.JOURNALSUBTITLE,
+            StandardField.ISSUETITLE,
+            StandardField.ISSUESUBTITLE,
+            StandardField.LANGUAGE,
+            StandardField.ORIGLANGUAGE,
+            StandardField.SERIES,
+            StandardField.VOLUME,
+            StandardField.NUMBER,
+            StandardField.EID,
+            StandardField.ISSUE,
+            StandardField.PAGES,
+            StandardField.VERSION,
+            StandardField.NOTE,
+            StandardField.ISSN,
+            StandardField.ADDENDUM,
+            StandardField.PUBSTATE,
+            StandardField.DOI,
+            StandardField.EPRINT,
+            StandardField.EPRINTCLASS,
+            StandardField.EPRINTTYPE,
+            StandardField.URL,
+            StandardField.URLDATE
+        )
+        .withRequiredFields(
+            StandardField.AUTHOR,
+            StandardField.TITLE,
+            StandardField.JOURNALTITLE,
+            StandardField.DATE
+        )
+        .build();
 
     private static final BibEntryType BOOK = new BibEntryTypeBuilder()
-            .withType(StandardEntryType.Book)
-            .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)
-            .withRequiredFields(StandardField.AUTHOR, StandardField.TITLE, StandardField.DATE)
-            .withDetailFields(StandardField.EDITOR, StandardField.EDITORA, StandardField.EDITORB, StandardField.EDITORC,
-                    StandardField.TRANSLATOR, StandardField.ANNOTATOR, StandardField.COMMENTATOR, StandardField.INTRODUCTION,
-                    StandardField.FOREWORD, StandardField.AFTERWORD, StandardField.SUBTITLE, StandardField.TITLEADDON,
-                    StandardField.MAINTITLE, StandardField.MAINSUBTITLE, StandardField.MAINTITLEADDON, StandardField.LANGUAGE,
-                    StandardField.ORIGLANGUAGE, StandardField.VOLUME, StandardField.PART, StandardField.EDITION, StandardField.VOLUMES,
-                    StandardField.SERIES, StandardField.NUMBER, StandardField.NOTE, StandardField.PUBLISHER, StandardField.LOCATION,
-                    StandardField.ISBN, StandardField.CHAPTER, StandardField.PAGES, StandardField.PAGETOTAL, StandardField.ADDENDUM,
-                    StandardField.PUBSTATE, StandardField.DOI, StandardField.EPRINT, StandardField.EPRINTCLASS, StandardField.EPRINTTYPE,
-                    StandardField.URL, StandardField.URLDATE)
-            .build();
+        .withType(StandardEntryType.Book)
+        .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
+        )
+        .withRequiredFields(
+            StandardField.AUTHOR,
+            StandardField.TITLE,
+            StandardField.DATE
+        )
+        .withDetailFields(
+            StandardField.EDITOR,
+            StandardField.EDITORA,
+            StandardField.EDITORB,
+            StandardField.EDITORC,
+            StandardField.TRANSLATOR,
+            StandardField.ANNOTATOR,
+            StandardField.COMMENTATOR,
+            StandardField.INTRODUCTION,
+            StandardField.FOREWORD,
+            StandardField.AFTERWORD,
+            StandardField.SUBTITLE,
+            StandardField.TITLEADDON,
+            StandardField.MAINTITLE,
+            StandardField.MAINSUBTITLE,
+            StandardField.MAINTITLEADDON,
+            StandardField.LANGUAGE,
+            StandardField.ORIGLANGUAGE,
+            StandardField.VOLUME,
+            StandardField.PART,
+            StandardField.EDITION,
+            StandardField.VOLUMES,
+            StandardField.SERIES,
+            StandardField.NUMBER,
+            StandardField.NOTE,
+            StandardField.PUBLISHER,
+            StandardField.LOCATION,
+            StandardField.ISBN,
+            StandardField.CHAPTER,
+            StandardField.PAGES,
+            StandardField.PAGETOTAL,
+            StandardField.ADDENDUM,
+            StandardField.PUBSTATE,
+            StandardField.DOI,
+            StandardField.EPRINT,
+            StandardField.EPRINTCLASS,
+            StandardField.EPRINTTYPE,
+            StandardField.URL,
+            StandardField.URLDATE
+        )
+        .build();
 
     private static final BibEntryType MVBOOK = new BibEntryTypeBuilder()
-            .withType(StandardEntryType.MvBook)
-            .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)
-            .withRequiredFields(StandardField.AUTHOR, StandardField.TITLE, StandardField.DATE)
-            .withDetailFields(StandardField.EDITOR, StandardField.EDITORA, StandardField.EDITORB, StandardField.EDITORC,
-                    StandardField.TRANSLATOR, StandardField.ANNOTATOR, StandardField.COMMENTATOR, StandardField.INTRODUCTION,
-                    StandardField.FOREWORD, StandardField.AFTERWORD, StandardField.SUBTITLE, StandardField.TITLEADDON,
-                    StandardField.LANGUAGE, StandardField.ORIGLANGUAGE, StandardField.EDITION, StandardField.VOLUMES, StandardField.SERIES,
-                    StandardField.NUMBER, StandardField.NOTE, StandardField.PUBLISHER, StandardField.LOCATION, StandardField.ISBN,
-                    StandardField.PAGETOTAL, StandardField.ADDENDUM, StandardField.PUBSTATE, StandardField.DOI, StandardField.EPRINT,
-                    StandardField.EPRINTCLASS, StandardField.EPRINTTYPE, StandardField.URL, StandardField.URLDATE)
-            .build();
+        .withType(StandardEntryType.MvBook)
+        .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
+        )
+        .withRequiredFields(
+            StandardField.AUTHOR,
+            StandardField.TITLE,
+            StandardField.DATE
+        )
+        .withDetailFields(
+            StandardField.EDITOR,
+            StandardField.EDITORA,
+            StandardField.EDITORB,
+            StandardField.EDITORC,
+            StandardField.TRANSLATOR,
+            StandardField.ANNOTATOR,
+            StandardField.COMMENTATOR,
+            StandardField.INTRODUCTION,
+            StandardField.FOREWORD,
+            StandardField.AFTERWORD,
+            StandardField.SUBTITLE,
+            StandardField.TITLEADDON,
+            StandardField.LANGUAGE,
+            StandardField.ORIGLANGUAGE,
+            StandardField.EDITION,
+            StandardField.VOLUMES,
+            StandardField.SERIES,
+            StandardField.NUMBER,
+            StandardField.NOTE,
+            StandardField.PUBLISHER,
+            StandardField.LOCATION,
+            StandardField.ISBN,
+            StandardField.PAGETOTAL,
+            StandardField.ADDENDUM,
+            StandardField.PUBSTATE,
+            StandardField.DOI,
+            StandardField.EPRINT,
+            StandardField.EPRINTCLASS,
+            StandardField.EPRINTTYPE,
+            StandardField.URL,
+            StandardField.URLDATE
+        )
+        .build();
 
     private static final BibEntryType INBOOK = new BibEntryTypeBuilder()
-            .withType(StandardEntryType.InBook)
-            .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)
-            .withRequiredFields(StandardField.AUTHOR, StandardField.TITLE, StandardField.BOOKTITLE, StandardField.DATE)
-            .withDetailFields(StandardField.BOOKAUTHOR, StandardField.EDITOR, StandardField.EDITORA, StandardField.EDITORB,
-                    StandardField.EDITORC, StandardField.TRANSLATOR, StandardField.ANNOTATOR, StandardField.COMMENTATOR,
-                    StandardField.INTRODUCTION, StandardField.FOREWORD, StandardField.AFTERWORD, StandardField.SUBTITLE,
-                    StandardField.TITLEADDON, StandardField.MAINTITLE, StandardField.MAINSUBTITLE, StandardField.MAINTITLEADDON,
-                    StandardField.BOOKSUBTITLE, StandardField.BOOKTITLEADDON, StandardField.LANGUAGE, StandardField.ORIGLANGUAGE,
-                    StandardField.VOLUME, StandardField.PART, StandardField.EDITION, StandardField.VOLUMES, StandardField.SERIES,
-                    StandardField.NUMBER, StandardField.NOTE, StandardField.PUBLISHER, StandardField.LOCATION, StandardField.ISBN,
-                    StandardField.CHAPTER, StandardField.PAGES, StandardField.ADDENDUM, StandardField.PUBSTATE, StandardField.DOI,
-                    StandardField.EPRINT, StandardField.EPRINTCLASS, StandardField.EPRINTTYPE, StandardField.URL, StandardField.URLDATE)
-            .build();
+        .withType(StandardEntryType.InBook)
+        .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
+        )
+        .withRequiredFields(
+            StandardField.AUTHOR,
+            StandardField.TITLE,
+            StandardField.BOOKTITLE,
+            StandardField.DATE
+        )
+        .withDetailFields(
+            StandardField.BOOKAUTHOR,
+            StandardField.EDITOR,
+            StandardField.EDITORA,
+            StandardField.EDITORB,
+            StandardField.EDITORC,
+            StandardField.TRANSLATOR,
+            StandardField.ANNOTATOR,
+            StandardField.COMMENTATOR,
+            StandardField.INTRODUCTION,
+            StandardField.FOREWORD,
+            StandardField.AFTERWORD,
+            StandardField.SUBTITLE,
+            StandardField.TITLEADDON,
+            StandardField.MAINTITLE,
+            StandardField.MAINSUBTITLE,
+            StandardField.MAINTITLEADDON,
+            StandardField.BOOKSUBTITLE,
+            StandardField.BOOKTITLEADDON,
+            StandardField.LANGUAGE,
+            StandardField.ORIGLANGUAGE,
+            StandardField.VOLUME,
+            StandardField.PART,
+            StandardField.EDITION,
+            StandardField.VOLUMES,
+            StandardField.SERIES,
+            StandardField.NUMBER,
+            StandardField.NOTE,
+            StandardField.PUBLISHER,
+            StandardField.LOCATION,
+            StandardField.ISBN,
+            StandardField.CHAPTER,
+            StandardField.PAGES,
+            StandardField.ADDENDUM,
+            StandardField.PUBSTATE,
+            StandardField.DOI,
+            StandardField.EPRINT,
+            StandardField.EPRINTCLASS,
+            StandardField.EPRINTTYPE,
+            StandardField.URL,
+            StandardField.URLDATE
+        )
+        .build();
 
     private static final BibEntryType BOOKINBOOK = new BibEntryTypeBuilder()
-            .withType(StandardEntryType.BookInBook)
-            .withImportantFields(INBOOK.getPrimaryOptionalFields())
-            .withDetailFields(INBOOK.getSecondaryOptionalFields())
-            .withRequiredFields(INBOOK.getRequiredFields())
-            .build();
+        .withType(StandardEntryType.BookInBook)
+        .withImportantFields(INBOOK.getPrimaryOptionalFields())
+        .withDetailFields(INBOOK.getSecondaryOptionalFields())
+        .withRequiredFields(INBOOK.getRequiredFields())
+        .build();
 
     private static final BibEntryType SUPPBOOK = new BibEntryTypeBuilder()
-            .withType(StandardEntryType.SuppBook)
-            .withImportantFields(INBOOK.getPrimaryOptionalFields())
-            .withDetailFields(INBOOK.getSecondaryOptionalFields())
-            .withRequiredFields(INBOOK.getRequiredFields())
-            .build();
+        .withType(StandardEntryType.SuppBook)
+        .withImportantFields(INBOOK.getPrimaryOptionalFields())
+        .withDetailFields(INBOOK.getSecondaryOptionalFields())
+        .withRequiredFields(INBOOK.getRequiredFields())
+        .build();
 
     private static final BibEntryType BOOKLET = new BibEntryTypeBuilder()
-            .withType(StandardEntryType.Booklet)
-            .withImportantFields(StandardField.SUBTITLE, StandardField.TITLEADDON, StandardField.HOWPUBLISHED,
-                    StandardField.CHAPTER, StandardField.PAGES, StandardField.DOI, StandardField.EPRINT, StandardField.EPRINTCLASS,
-                    StandardField.EPRINTTYPE, StandardField.URL, StandardField.URLDATE)
-            .withRequiredFields(new OrFields(StandardField.AUTHOR, StandardField.EDITOR), StandardField.TITLE, StandardField.DATE)
-            .withDetailFields(StandardField.SUBTITLE, StandardField.TITLEADDON, StandardField.LANGUAGE, StandardField.HOWPUBLISHED,
-                    StandardField.TYPE, StandardField.NOTE, StandardField.LOCATION, StandardField.CHAPTER, StandardField.PAGES,
-                    StandardField.PAGETOTAL, StandardField.ADDENDUM, StandardField.PUBSTATE, StandardField.DOI, StandardField.EPRINT,
-                    StandardField.EPRINTCLASS, StandardField.EPRINTTYPE, StandardField.URL, StandardField.URLDATE)
-            .build();
+        .withType(StandardEntryType.Booklet)
+        .withImportantFields(
+            StandardField.SUBTITLE,
+            StandardField.TITLEADDON,
+            StandardField.HOWPUBLISHED,
+            StandardField.CHAPTER,
+            StandardField.PAGES,
+            StandardField.DOI,
+            StandardField.EPRINT,
+            StandardField.EPRINTCLASS,
+            StandardField.EPRINTTYPE,
+            StandardField.URL,
+            StandardField.URLDATE
+        )
+        .withRequiredFields(
+            new OrFields(StandardField.AUTHOR, StandardField.EDITOR),
+            StandardField.TITLE,
+            StandardField.DATE
+        )
+        .withDetailFields(
+            StandardField.SUBTITLE,
+            StandardField.TITLEADDON,
+            StandardField.LANGUAGE,
+            StandardField.HOWPUBLISHED,
+            StandardField.TYPE,
+            StandardField.NOTE,
+            StandardField.LOCATION,
+            StandardField.CHAPTER,
+            StandardField.PAGES,
+            StandardField.PAGETOTAL,
+            StandardField.ADDENDUM,
+            StandardField.PUBSTATE,
+            StandardField.DOI,
+            StandardField.EPRINT,
+            StandardField.EPRINTCLASS,
+            StandardField.EPRINTTYPE,
+            StandardField.URL,
+            StandardField.URLDATE
+        )
+        .build();
 
     private static final BibEntryType COLLECTION = new BibEntryTypeBuilder()
-            .withType(StandardEntryType.Collection)
-            .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)
-            .withRequiredFields(StandardField.EDITOR, StandardField.TITLE, StandardField.DATE)
-            .withDetailFields(StandardField.EDITORA, StandardField.EDITORB, StandardField.EDITORC, StandardField.TRANSLATOR,
-                    StandardField.ANNOTATOR, StandardField.COMMENTATOR, StandardField.INTRODUCTION, StandardField.FOREWORD,
-                    StandardField.AFTERWORD, StandardField.SUBTITLE, StandardField.TITLEADDON, StandardField.MAINTITLE,
-                    StandardField.MAINSUBTITLE, StandardField.MAINTITLEADDON, StandardField.LANGUAGE, StandardField.ORIGLANGUAGE,
-                    StandardField.VOLUME, StandardField.PART, StandardField.EDITION, StandardField.VOLUMES, StandardField.SERIES,
-                    StandardField.NUMBER, StandardField.NOTE, StandardField.PUBLISHER, StandardField.LOCATION, StandardField.ISBN,
-                    StandardField.CHAPTER, StandardField.PAGES, StandardField.PAGETOTAL, StandardField.ADDENDUM, StandardField.PUBSTATE,
-                    StandardField.DOI, StandardField.EPRINT, StandardField.EPRINTCLASS, StandardField.EPRINTTYPE, StandardField.URL,
-                    StandardField.URLDATE)
-            .build();
+        .withType(StandardEntryType.Collection)
+        .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
+        )
+        .withRequiredFields(
+            StandardField.EDITOR,
+            StandardField.TITLE,
+            StandardField.DATE
+        )
+        .withDetailFields(
+            StandardField.EDITORA,
+            StandardField.EDITORB,
+            StandardField.EDITORC,
+            StandardField.TRANSLATOR,
+            StandardField.ANNOTATOR,
+            StandardField.COMMENTATOR,
+            StandardField.INTRODUCTION,
+            StandardField.FOREWORD,
+            StandardField.AFTERWORD,
+            StandardField.SUBTITLE,
+            StandardField.TITLEADDON,
+            StandardField.MAINTITLE,
+            StandardField.MAINSUBTITLE,
+            StandardField.MAINTITLEADDON,
+            StandardField.LANGUAGE,
+            StandardField.ORIGLANGUAGE,
+            StandardField.VOLUME,
+            StandardField.PART,
+            StandardField.EDITION,
+            StandardField.VOLUMES,
+            StandardField.SERIES,
+            StandardField.NUMBER,
+            StandardField.NOTE,
+            StandardField.PUBLISHER,
+            StandardField.LOCATION,
+            StandardField.ISBN,
+            StandardField.CHAPTER,
+            StandardField.PAGES,
+            StandardField.PAGETOTAL,
+            StandardField.ADDENDUM,
+            StandardField.PUBSTATE,
+            StandardField.DOI,
+            StandardField.EPRINT,
+            StandardField.EPRINTCLASS,
+            StandardField.EPRINTTYPE,
+            StandardField.URL,
+            StandardField.URLDATE
+        )
+        .build();
 
     private static final BibEntryType MVCOLLECTION = new BibEntryTypeBuilder()
-            .withType(StandardEntryType.MvCollection)
-            .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)
-            .withRequiredFields(StandardField.EDITOR, StandardField.TITLE, StandardField.DATE)
-            .withDetailFields(StandardField.EDITORA, StandardField.EDITORB, StandardField.EDITORC, StandardField.TRANSLATOR,
-                    StandardField.ANNOTATOR, StandardField.COMMENTATOR, StandardField.INTRODUCTION, StandardField.FOREWORD,
-                    StandardField.AFTERWORD, StandardField.SUBTITLE, StandardField.TITLEADDON, StandardField.LANGUAGE,
-                    StandardField.ORIGLANGUAGE, StandardField.EDITION, StandardField.VOLUMES, StandardField.SERIES, StandardField.NUMBER,
-                    StandardField.NOTE, StandardField.PUBLISHER, StandardField.LOCATION, StandardField.ISBN, StandardField.PAGETOTAL,
-                    StandardField.ADDENDUM, StandardField.PUBSTATE, StandardField.DOI, StandardField.EPRINT, StandardField.EPRINTCLASS,
-                    StandardField.EPRINTTYPE, StandardField.URL, StandardField.URLDATE)
-            .build();
+        .withType(StandardEntryType.MvCollection)
+        .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
+        )
+        .withRequiredFields(
+            StandardField.EDITOR,
+            StandardField.TITLE,
+            StandardField.DATE
+        )
+        .withDetailFields(
+            StandardField.EDITORA,
+            StandardField.EDITORB,
+            StandardField.EDITORC,
+            StandardField.TRANSLATOR,
+            StandardField.ANNOTATOR,
+            StandardField.COMMENTATOR,
+            StandardField.INTRODUCTION,
+            StandardField.FOREWORD,
+            StandardField.AFTERWORD,
+            StandardField.SUBTITLE,
+            StandardField.TITLEADDON,
+            StandardField.LANGUAGE,
+            StandardField.ORIGLANGUAGE,
+            StandardField.EDITION,
+            StandardField.VOLUMES,
+            StandardField.SERIES,
+            StandardField.NUMBER,
+            StandardField.NOTE,
+            StandardField.PUBLISHER,
+            StandardField.LOCATION,
+            StandardField.ISBN,
+            StandardField.PAGETOTAL,
+            StandardField.ADDENDUM,
+            StandardField.PUBSTATE,
+            StandardField.DOI,
+            StandardField.EPRINT,
+            StandardField.EPRINTCLASS,
+            StandardField.EPRINTTYPE,
+            StandardField.URL,
+            StandardField.URLDATE
+        )
+        .build();
 
     private static final BibEntryType INCOLLECTION = new BibEntryTypeBuilder()
-            .withType(StandardEntryType.InCollection)
-            .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)
-            .withRequiredFields(StandardField.AUTHOR, StandardField.TITLE, StandardField.BOOKTITLE, StandardField.DATE)
-            .withDetailFields(StandardField.EDITOR, StandardField.EDITORA, StandardField.EDITORB, StandardField.EDITORC,
-                    StandardField.TRANSLATOR, StandardField.ANNOTATOR, StandardField.COMMENTATOR, StandardField.INTRODUCTION,
-                    StandardField.FOREWORD, StandardField.AFTERWORD, StandardField.SUBTITLE, StandardField.TITLEADDON,
-                    StandardField.MAINTITLE, StandardField.MAINSUBTITLE, StandardField.MAINTITLEADDON, StandardField.BOOKSUBTITLE,
-                    StandardField.BOOKTITLEADDON, StandardField.LANGUAGE, StandardField.ORIGLANGUAGE, StandardField.VOLUME,
-                    StandardField.PART, StandardField.EDITION, StandardField.VOLUMES, StandardField.SERIES, StandardField.NUMBER,
-                    StandardField.NOTE, StandardField.PUBLISHER, StandardField.LOCATION, StandardField.ISBN, StandardField.CHAPTER,
-                    StandardField.PAGES, StandardField.ADDENDUM, StandardField.PUBSTATE, StandardField.DOI, StandardField.EPRINT,
-                    StandardField.EPRINTCLASS, StandardField.EPRINTTYPE, StandardField.URL, StandardField.URLDATE)
-            .build();
+        .withType(StandardEntryType.InCollection)
+        .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
+        )
+        .withRequiredFields(
+            StandardField.AUTHOR,
+            StandardField.TITLE,
+            StandardField.BOOKTITLE,
+            StandardField.DATE
+        )
+        .withDetailFields(
+            StandardField.EDITOR,
+            StandardField.EDITORA,
+            StandardField.EDITORB,
+            StandardField.EDITORC,
+            StandardField.TRANSLATOR,
+            StandardField.ANNOTATOR,
+            StandardField.COMMENTATOR,
+            StandardField.INTRODUCTION,
+            StandardField.FOREWORD,
+            StandardField.AFTERWORD,
+            StandardField.SUBTITLE,
+            StandardField.TITLEADDON,
+            StandardField.MAINTITLE,
+            StandardField.MAINSUBTITLE,
+            StandardField.MAINTITLEADDON,
+            StandardField.BOOKSUBTITLE,
+            StandardField.BOOKTITLEADDON,
+            StandardField.LANGUAGE,
+            StandardField.ORIGLANGUAGE,
+            StandardField.VOLUME,
+            StandardField.PART,
+            StandardField.EDITION,
+            StandardField.VOLUMES,
+            StandardField.SERIES,
+            StandardField.NUMBER,
+            StandardField.NOTE,
+            StandardField.PUBLISHER,
+            StandardField.LOCATION,
+            StandardField.ISBN,
+            StandardField.CHAPTER,
+            StandardField.PAGES,
+            StandardField.ADDENDUM,
+            StandardField.PUBSTATE,
+            StandardField.DOI,
+            StandardField.EPRINT,
+            StandardField.EPRINTCLASS,
+            StandardField.EPRINTTYPE,
+            StandardField.URL,
+            StandardField.URLDATE
+        )
+        .build();
 
     private static final BibEntryType SUPPCOLLECTION = new BibEntryTypeBuilder()
-            .withType(StandardEntryType.SuppCollection)
-            .withImportantFields(INCOLLECTION.getPrimaryOptionalFields())
-            .withDetailFields(INCOLLECTION.getSecondaryOptionalFields())
-            .withRequiredFields(INCOLLECTION.getRequiredFields())
-            .build();
+        .withType(StandardEntryType.SuppCollection)
+        .withImportantFields(INCOLLECTION.getPrimaryOptionalFields())
+        .withDetailFields(INCOLLECTION.getSecondaryOptionalFields())
+        .withRequiredFields(INCOLLECTION.getRequiredFields())
+        .build();
 
     private static final BibEntryType MANUAL = new BibEntryTypeBuilder()
-            .withType(StandardEntryType.Manual)
-            .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)
-            .withRequiredFields(new OrFields(StandardField.AUTHOR, StandardField.EDITOR), StandardField.TITLE, StandardField.DATE)
-            .withDetailFields(StandardField.SUBTITLE, StandardField.TITLEADDON, StandardField.LANGUAGE, StandardField.EDITION,
-                    StandardField.TYPE, StandardField.SERIES, StandardField.NUMBER, StandardField.VERSION, StandardField.NOTE,
-                    StandardField.ORGANIZATION, StandardField.PUBLISHER, StandardField.LOCATION, StandardField.ISBN, StandardField.CHAPTER,
-                    StandardField.PAGES, StandardField.PAGETOTAL, StandardField.ADDENDUM, StandardField.PUBSTATE, StandardField.DOI,
-                    StandardField.EPRINT, StandardField.EPRINTCLASS, StandardField.EPRINTTYPE, StandardField.URL, StandardField.URLDATE)
-            .build();
+        .withType(StandardEntryType.Manual)
+        .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
+        )
+        .withRequiredFields(
+            new OrFields(StandardField.AUTHOR, StandardField.EDITOR),
+            StandardField.TITLE,
+            StandardField.DATE
+        )
+        .withDetailFields(
+            StandardField.SUBTITLE,
+            StandardField.TITLEADDON,
+            StandardField.LANGUAGE,
+            StandardField.EDITION,
+            StandardField.TYPE,
+            StandardField.SERIES,
+            StandardField.NUMBER,
+            StandardField.VERSION,
+            StandardField.NOTE,
+            StandardField.ORGANIZATION,
+            StandardField.PUBLISHER,
+            StandardField.LOCATION,
+            StandardField.ISBN,
+            StandardField.CHAPTER,
+            StandardField.PAGES,
+            StandardField.PAGETOTAL,
+            StandardField.ADDENDUM,
+            StandardField.PUBSTATE,
+            StandardField.DOI,
+            StandardField.EPRINT,
+            StandardField.EPRINTCLASS,
+            StandardField.EPRINTTYPE,
+            StandardField.URL,
+            StandardField.URLDATE
+        )
+        .build();
 
     private static final BibEntryType MISC = new BibEntryTypeBuilder()
-            .withType(StandardEntryType.Misc)
-            .withImportantFields(
-                    StandardField.SUBTITLE, StandardField.TITLEADDON, StandardField.HOWPUBLISHED, StandardField.LOCATION, StandardField.DOI,
-                    StandardField.EPRINT, StandardField.EPRINTCLASS, StandardField.EPRINTTYPE, StandardField.URL, StandardField.URLDATE)
-            .withRequiredFields(new OrFields(StandardField.AUTHOR, StandardField.EDITOR), StandardField.TITLE, StandardField.DATE)
-            .withDetailFields(StandardField.SUBTITLE, StandardField.TITLEADDON, StandardField.LANGUAGE, StandardField.HOWPUBLISHED,
-                    StandardField.TYPE, StandardField.VERSION, StandardField.NOTE, StandardField.ORGANIZATION, StandardField.LOCATION,
-                    StandardField.ADDENDUM, StandardField.PUBSTATE, StandardField.DOI, StandardField.EPRINT,
-                    StandardField.EPRINTCLASS, StandardField.EPRINTTYPE, StandardField.URL, StandardField.URLDATE)
-            .build();
+        .withType(StandardEntryType.Misc)
+        .withImportantFields(
+            StandardField.SUBTITLE,
+            StandardField.TITLEADDON,
+            StandardField.HOWPUBLISHED,
+            StandardField.LOCATION,
+            StandardField.DOI,
+            StandardField.EPRINT,
+            StandardField.EPRINTCLASS,
+            StandardField.EPRINTTYPE,
+            StandardField.URL,
+            StandardField.URLDATE
+        )
+        .withRequiredFields(
+            new OrFields(StandardField.AUTHOR, StandardField.EDITOR),
+            StandardField.TITLE,
+            StandardField.DATE
+        )
+        .withDetailFields(
+            StandardField.SUBTITLE,
+            StandardField.TITLEADDON,
+            StandardField.LANGUAGE,
+            StandardField.HOWPUBLISHED,
+            StandardField.TYPE,
+            StandardField.VERSION,
+            StandardField.NOTE,
+            StandardField.ORGANIZATION,
+            StandardField.LOCATION,
+            StandardField.ADDENDUM,
+            StandardField.PUBSTATE,
+            StandardField.DOI,
+            StandardField.EPRINT,
+            StandardField.EPRINTCLASS,
+            StandardField.EPRINTTYPE,
+            StandardField.URL,
+            StandardField.URLDATE
+        )
+        .build();
 
     private static final BibEntryType ONLINE = new BibEntryTypeBuilder()
-            .withType(StandardEntryType.Online)
-            .withImportantFields(
-                    StandardField.SUBTITLE, StandardField.TITLEADDON, StandardField.NOTE, StandardField.ORGANIZATION, StandardField.URLDATE)
-            .withRequiredFields(new OrFields(StandardField.AUTHOR, StandardField.EDITOR), StandardField.TITLE, StandardField.DATE, StandardField.URL)
-            .withDetailFields(StandardField.SUBTITLE, StandardField.TITLEADDON, StandardField.LANGUAGE, StandardField.VERSION,
-                    StandardField.NOTE, StandardField.ORGANIZATION, StandardField.ADDENDUM, StandardField.PUBSTATE,
-                    StandardField.URLDATE)
-            .build();
+        .withType(StandardEntryType.Online)
+        .withImportantFields(
+            StandardField.SUBTITLE,
+            StandardField.TITLEADDON,
+            StandardField.NOTE,
+            StandardField.ORGANIZATION,
+            StandardField.URLDATE
+        )
+        .withRequiredFields(
+            new OrFields(StandardField.AUTHOR, StandardField.EDITOR),
+            StandardField.TITLE,
+            StandardField.DATE,
+            StandardField.URL
+        )
+        .withDetailFields(
+            StandardField.SUBTITLE,
+            StandardField.TITLEADDON,
+            StandardField.LANGUAGE,
+            StandardField.VERSION,
+            StandardField.NOTE,
+            StandardField.ORGANIZATION,
+            StandardField.ADDENDUM,
+            StandardField.PUBSTATE,
+            StandardField.URLDATE
+        )
+        .build();
 
     private static final BibEntryType PATENT = new BibEntryTypeBuilder()
-            .withType(IEEETranEntryType.Patent)
-            .withImportantFields(StandardField.HOLDER,
-                    StandardField.SUBTITLE, StandardField.TITLEADDON, StandardField.DOI, StandardField.EPRINT, StandardField.EPRINTCLASS,
-                    StandardField.EPRINTTYPE, StandardField.URL, StandardField.URLDATE)
-            .withRequiredFields(StandardField.AUTHOR, StandardField.TITLE, StandardField.NUMBER, StandardField.DATE)
-            .withDetailFields(StandardField.HOLDER, StandardField.SUBTITLE, StandardField.TITLEADDON, StandardField.TYPE,
-                    StandardField.VERSION, StandardField.LOCATION, StandardField.NOTE, StandardField.ADDENDUM,
-                    StandardField.PUBSTATE, StandardField.DOI, StandardField.EPRINT, StandardField.EPRINTCLASS, StandardField.EPRINTTYPE,
-                    StandardField.URL, StandardField.URLDATE)
-            .build();
+        .withType(IEEETranEntryType.Patent)
+        .withImportantFields(
+            StandardField.HOLDER,
+            StandardField.SUBTITLE,
+            StandardField.TITLEADDON,
+            StandardField.DOI,
+            StandardField.EPRINT,
+            StandardField.EPRINTCLASS,
+            StandardField.EPRINTTYPE,
+            StandardField.URL,
+            StandardField.URLDATE
+        )
+        .withRequiredFields(
+            StandardField.AUTHOR,
+            StandardField.TITLE,
+            StandardField.NUMBER,
+            StandardField.DATE
+        )
+        .withDetailFields(
+            StandardField.HOLDER,
+            StandardField.SUBTITLE,
+            StandardField.TITLEADDON,
+            StandardField.TYPE,
+            StandardField.VERSION,
+            StandardField.LOCATION,
+            StandardField.NOTE,
+            StandardField.ADDENDUM,
+            StandardField.PUBSTATE,
+            StandardField.DOI,
+            StandardField.EPRINT,
+            StandardField.EPRINTCLASS,
+            StandardField.EPRINTTYPE,
+            StandardField.URL,
+            StandardField.URLDATE
+        )
+        .build();
 
     private static final BibEntryType PERIODICAL = new BibEntryTypeBuilder()
-            .withType(IEEETranEntryType.Periodical)
-            .withImportantFields(
-                    StandardField.SUBTITLE, StandardField.ISSUETITLE, StandardField.ISSUESUBTITLE, StandardField.ISSN, StandardField.DOI,
-                    StandardField.EPRINT, StandardField.EPRINTCLASS, StandardField.EPRINTTYPE, StandardField.URL, StandardField.URLDATE)
-            .withRequiredFields(StandardField.EDITOR, StandardField.TITLE, StandardField.DATE)
-            .withDetailFields(StandardField.EDITORA, StandardField.EDITORB, StandardField.EDITORC, StandardField.SUBTITLE,
-                    StandardField.ISSUETITLE, StandardField.ISSUESUBTITLE, StandardField.LANGUAGE, StandardField.SERIES,
-                    StandardField.VOLUME, StandardField.NUMBER, StandardField.ISSUE, StandardField.NOTE,
-                    StandardField.ISSN, StandardField.ADDENDUM, StandardField.PUBSTATE, StandardField.DOI, StandardField.EPRINT,
-                    StandardField.EPRINTCLASS, StandardField.EPRINTTYPE, StandardField.URL, StandardField.URLDATE)
-            .build();
+        .withType(IEEETranEntryType.Periodical)
+        .withImportantFields(
+            StandardField.SUBTITLE,
+            StandardField.ISSUETITLE,
+            StandardField.ISSUESUBTITLE,
+            StandardField.ISSN,
+            StandardField.DOI,
+            StandardField.EPRINT,
+            StandardField.EPRINTCLASS,
+            StandardField.EPRINTTYPE,
+            StandardField.URL,
+            StandardField.URLDATE
+        )
+        .withRequiredFields(
+            StandardField.EDITOR,
+            StandardField.TITLE,
+            StandardField.DATE
+        )
+        .withDetailFields(
+            StandardField.EDITORA,
+            StandardField.EDITORB,
+            StandardField.EDITORC,
+            StandardField.SUBTITLE,
+            StandardField.ISSUETITLE,
+            StandardField.ISSUESUBTITLE,
+            StandardField.LANGUAGE,
+            StandardField.SERIES,
+            StandardField.VOLUME,
+            StandardField.NUMBER,
+            StandardField.ISSUE,
+            StandardField.NOTE,
+            StandardField.ISSN,
+            StandardField.ADDENDUM,
+            StandardField.PUBSTATE,
+            StandardField.DOI,
+            StandardField.EPRINT,
+            StandardField.EPRINTCLASS,
+            StandardField.EPRINTTYPE,
+            StandardField.URL,
+            StandardField.URLDATE
+        )
+        .build();
 
     private static final BibEntryType SUPPPERIODICAL = new BibEntryTypeBuilder()
-            .withType(StandardEntryType.SuppPeriodical)
-            .withImportantFields(ARTICLE.getPrimaryOptionalFields())
-            .withDetailFields(ARTICLE.getSecondaryOptionalFields())
-            .withRequiredFields(ARTICLE.getRequiredFields())
-            .build();
+        .withType(StandardEntryType.SuppPeriodical)
+        .withImportantFields(ARTICLE.getPrimaryOptionalFields())
+        .withDetailFields(ARTICLE.getSecondaryOptionalFields())
+        .withRequiredFields(ARTICLE.getRequiredFields())
+        .build();
 
     private static final BibEntryType PROCEEDINGS = new BibEntryTypeBuilder()
-            .withType(StandardEntryType.Proceedings)
-            .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)
-            .withRequiredFields(StandardField.TITLE, StandardField.DATE)
-            .withDetailFields(StandardField.EDITOR, StandardField.SUBTITLE, StandardField.TITLEADDON, StandardField.MAINTITLE,
-                    StandardField.MAINSUBTITLE, StandardField.MAINTITLEADDON, StandardField.EVENTTITLE, StandardField.EVENTTITLEADDON,
-                    StandardField.EVENTDATE, StandardField.VENUE, StandardField.LANGUAGE, StandardField.VOLUME, StandardField.PART,
-                    StandardField.VOLUMES, StandardField.SERIES, StandardField.NUMBER, StandardField.NOTE, StandardField.ORGANIZATION,
-                    StandardField.PUBLISHER, StandardField.LOCATION, StandardField.ISBN,
-                    StandardField.CHAPTER, StandardField.PAGES, StandardField.PAGETOTAL, StandardField.ADDENDUM, StandardField.PUBSTATE,
-                    StandardField.DOI, StandardField.EPRINT, StandardField.EPRINTCLASS, StandardField.EPRINTTYPE, StandardField.URL,
-                    StandardField.URLDATE)
-            .build();
+        .withType(StandardEntryType.Proceedings)
+        .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
+        )
+        .withRequiredFields(StandardField.TITLE, StandardField.DATE)
+        .withDetailFields(
+            StandardField.EDITOR,
+            StandardField.SUBTITLE,
+            StandardField.TITLEADDON,
+            StandardField.MAINTITLE,
+            StandardField.MAINSUBTITLE,
+            StandardField.MAINTITLEADDON,
+            StandardField.EVENTTITLE,
+            StandardField.EVENTTITLEADDON,
+            StandardField.EVENTDATE,
+            StandardField.VENUE,
+            StandardField.LANGUAGE,
+            StandardField.VOLUME,
+            StandardField.PART,
+            StandardField.VOLUMES,
+            StandardField.SERIES,
+            StandardField.NUMBER,
+            StandardField.NOTE,
+            StandardField.ORGANIZATION,
+            StandardField.PUBLISHER,
+            StandardField.LOCATION,
+            StandardField.ISBN,
+            StandardField.CHAPTER,
+            StandardField.PAGES,
+            StandardField.PAGETOTAL,
+            StandardField.ADDENDUM,
+            StandardField.PUBSTATE,
+            StandardField.DOI,
+            StandardField.EPRINT,
+            StandardField.EPRINTCLASS,
+            StandardField.EPRINTTYPE,
+            StandardField.URL,
+            StandardField.URLDATE
+        )
+        .build();
 
     private static final BibEntryType MVPROCEEDINGS = new BibEntryTypeBuilder()
-            .withType(StandardEntryType.MvProceedings)
-            .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)
-            .withRequiredFields(StandardField.TITLE, StandardField.DATE)
-            .withDetailFields(StandardField.EDITOR, StandardField.SUBTITLE, StandardField.TITLEADDON, StandardField.EVENTTITLE,
-                    StandardField.EVENTTITLEADDON, StandardField.EVENTDATE, StandardField.VENUE, StandardField.LANGUAGE,
-                    StandardField.VOLUMES, StandardField.SERIES, StandardField.NUMBER, StandardField.NOTE, StandardField.ORGANIZATION,
-                    StandardField.PUBLISHER, StandardField.LOCATION, StandardField.ISBN, StandardField.PAGETOTAL,
-                    StandardField.ADDENDUM, StandardField.PUBSTATE, StandardField.DOI, StandardField.EPRINT, StandardField.EPRINTCLASS,
-                    StandardField.EPRINTTYPE, StandardField.URL,
-                    StandardField.URLDATE)
-            .build();
+        .withType(StandardEntryType.MvProceedings)
+        .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
+        )
+        .withRequiredFields(StandardField.TITLE, StandardField.DATE)
+        .withDetailFields(
+            StandardField.EDITOR,
+            StandardField.SUBTITLE,
+            StandardField.TITLEADDON,
+            StandardField.EVENTTITLE,
+            StandardField.EVENTTITLEADDON,
+            StandardField.EVENTDATE,
+            StandardField.VENUE,
+            StandardField.LANGUAGE,
+            StandardField.VOLUMES,
+            StandardField.SERIES,
+            StandardField.NUMBER,
+            StandardField.NOTE,
+            StandardField.ORGANIZATION,
+            StandardField.PUBLISHER,
+            StandardField.LOCATION,
+            StandardField.ISBN,
+            StandardField.PAGETOTAL,
+            StandardField.ADDENDUM,
+            StandardField.PUBSTATE,
+            StandardField.DOI,
+            StandardField.EPRINT,
+            StandardField.EPRINTCLASS,
+            StandardField.EPRINTTYPE,
+            StandardField.URL,
+            StandardField.URLDATE
+        )
+        .build();
 
     private static final BibEntryType INPROCEEDINGS = new BibEntryTypeBuilder()
-            .withType(StandardEntryType.InProceedings)
-            .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)
-            .withRequiredFields(StandardField.AUTHOR, StandardField.TITLE, StandardField.BOOKTITLE, StandardField.DATE)
-            .withDetailFields(StandardField.EDITOR, StandardField.SUBTITLE, StandardField.TITLEADDON, StandardField.MAINTITLE,
-                    StandardField.MAINSUBTITLE, StandardField.MAINTITLEADDON, StandardField.BOOKSUBTITLE, StandardField.BOOKTITLEADDON,
-                    StandardField.EVENTTITLE, StandardField.EVENTTITLEADDON, StandardField.EVENTDATE, StandardField.VENUE,
-                    StandardField.LANGUAGE, StandardField.VOLUME, StandardField.PART, StandardField.VOLUMES, StandardField.SERIES,
-                    StandardField.NUMBER, StandardField.NOTE, StandardField.ORGANIZATION, StandardField.PUBLISHER, StandardField.LOCATION,
-                    StandardField.ISBN, StandardField.CHAPTER, StandardField.PAGES, StandardField.ADDENDUM,
-                    StandardField.PUBSTATE, StandardField.DOI, StandardField.EPRINT, StandardField.EPRINTCLASS, StandardField.EPRINTTYPE,
-                    StandardField.URL, StandardField.URLDATE)
-            .build();
+        .withType(StandardEntryType.InProceedings)
+        .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
+        )
+        .withRequiredFields(
+            StandardField.AUTHOR,
+            StandardField.TITLE,
+            StandardField.BOOKTITLE,
+            StandardField.DATE
+        )
+        .withDetailFields(
+            StandardField.EDITOR,
+            StandardField.SUBTITLE,
+            StandardField.TITLEADDON,
+            StandardField.MAINTITLE,
+            StandardField.MAINSUBTITLE,
+            StandardField.MAINTITLEADDON,
+            StandardField.BOOKSUBTITLE,
+            StandardField.BOOKTITLEADDON,
+            StandardField.EVENTTITLE,
+            StandardField.EVENTTITLEADDON,
+            StandardField.EVENTDATE,
+            StandardField.VENUE,
+            StandardField.LANGUAGE,
+            StandardField.VOLUME,
+            StandardField.PART,
+            StandardField.VOLUMES,
+            StandardField.SERIES,
+            StandardField.NUMBER,
+            StandardField.NOTE,
+            StandardField.ORGANIZATION,
+            StandardField.PUBLISHER,
+            StandardField.LOCATION,
+            StandardField.ISBN,
+            StandardField.CHAPTER,
+            StandardField.PAGES,
+            StandardField.ADDENDUM,
+            StandardField.PUBSTATE,
+            StandardField.DOI,
+            StandardField.EPRINT,
+            StandardField.EPRINTCLASS,
+            StandardField.EPRINTTYPE,
+            StandardField.URL,
+            StandardField.URLDATE
+        )
+        .build();
 
     private static final BibEntryType REFERENCE = new BibEntryTypeBuilder()
-            .withType(StandardEntryType.Reference)
-            .withImportantFields(COLLECTION.getPrimaryOptionalFields())
-            .withDetailFields(COLLECTION.getSecondaryOptionalFields())
-            .withRequiredFields(COLLECTION.getRequiredFields())
-            .build();
+        .withType(StandardEntryType.Reference)
+        .withImportantFields(COLLECTION.getPrimaryOptionalFields())
+        .withDetailFields(COLLECTION.getSecondaryOptionalFields())
+        .withRequiredFields(COLLECTION.getRequiredFields())
+        .build();
 
     private static final BibEntryType MVREFERENCE = new BibEntryTypeBuilder()
-            .withType(StandardEntryType.MvReference)
-            .withImportantFields(MVCOLLECTION.getPrimaryOptionalFields())
-            .withDetailFields(MVCOLLECTION.getSecondaryOptionalFields())
-            .withRequiredFields(MVCOLLECTION.getRequiredFields())
-            .build();
+        .withType(StandardEntryType.MvReference)
+        .withImportantFields(MVCOLLECTION.getPrimaryOptionalFields())
+        .withDetailFields(MVCOLLECTION.getSecondaryOptionalFields())
+        .withRequiredFields(MVCOLLECTION.getRequiredFields())
+        .build();
 
     private static final BibEntryType INREFERENCE = new BibEntryTypeBuilder()
-            .withType(StandardEntryType.InReference)
-            .withImportantFields(INCOLLECTION.getPrimaryOptionalFields())
-            .withDetailFields(INCOLLECTION.getSecondaryOptionalFields())
-            .withRequiredFields(INCOLLECTION.getRequiredFields())
-            .build();
+        .withType(StandardEntryType.InReference)
+        .withImportantFields(INCOLLECTION.getPrimaryOptionalFields())
+        .withDetailFields(INCOLLECTION.getSecondaryOptionalFields())
+        .withRequiredFields(INCOLLECTION.getRequiredFields())
+        .build();
 
     private static final BibEntryType REPORT = new BibEntryTypeBuilder()
-            .withType(StandardEntryType.Report)
-            .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)
-            .withRequiredFields(StandardField.AUTHOR, StandardField.TITLE, StandardField.TYPE, StandardField.INSTITUTION, StandardField.DATE)
-            .withDetailFields(StandardField.SUBTITLE, StandardField.TITLEADDON, StandardField.LANGUAGE, StandardField.NUMBER,
-                    StandardField.VERSION, StandardField.NOTE, StandardField.LOCATION, StandardField.ISRN,
-                    StandardField.CHAPTER, StandardField.PAGES, StandardField.PAGETOTAL, StandardField.ADDENDUM, StandardField.PUBSTATE,
-                    StandardField.DOI, StandardField.EPRINT, StandardField.EPRINTCLASS, StandardField.EPRINTTYPE, StandardField.URL,
-                    StandardField.URLDATE)
-            .build();
+        .withType(StandardEntryType.Report)
+        .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
+        )
+        .withRequiredFields(
+            StandardField.AUTHOR,
+            StandardField.TITLE,
+            StandardField.TYPE,
+            StandardField.INSTITUTION,
+            StandardField.DATE
+        )
+        .withDetailFields(
+            StandardField.SUBTITLE,
+            StandardField.TITLEADDON,
+            StandardField.LANGUAGE,
+            StandardField.NUMBER,
+            StandardField.VERSION,
+            StandardField.NOTE,
+            StandardField.LOCATION,
+            StandardField.ISRN,
+            StandardField.CHAPTER,
+            StandardField.PAGES,
+            StandardField.PAGETOTAL,
+            StandardField.ADDENDUM,
+            StandardField.PUBSTATE,
+            StandardField.DOI,
+            StandardField.EPRINT,
+            StandardField.EPRINTCLASS,
+            StandardField.EPRINTTYPE,
+            StandardField.URL,
+            StandardField.URLDATE
+        )
+        .build();
 
     private static final BibEntryType SET = new BibEntryTypeBuilder()
-            .withType(StandardEntryType.Set)
-            .withRequiredFields(StandardField.ENTRYSET, StandardField.CROSSREF)
-            .build();
+        .withType(StandardEntryType.Set)
+        .withRequiredFields(StandardField.ENTRYSET, StandardField.CROSSREF)
+        .build();
 
     private static final BibEntryType THESIS = new BibEntryTypeBuilder()
-            .withType(StandardEntryType.Thesis)
-            .withImportantFields(StandardField.SUBTITLE, StandardField.TITLEADDON, StandardField.CHAPTER,
-                    StandardField.PAGES, StandardField.PAGETOTAL, StandardField.DOI, StandardField.EPRINT, StandardField.EPRINTCLASS,
-                    StandardField.EPRINTTYPE, StandardField.URL, StandardField.URLDATE)
-            .withRequiredFields(StandardField.AUTHOR, StandardField.TITLE, StandardField.TYPE, StandardField.INSTITUTION, StandardField.DATE)
-            .withDetailFields(StandardField.SUBTITLE, StandardField.TITLEADDON, StandardField.LANGUAGE, StandardField.NOTE,
-                    StandardField.LOCATION, StandardField.ISBN, StandardField.CHAPTER, StandardField.PAGES,
-                    StandardField.PAGETOTAL, StandardField.ADDENDUM, StandardField.PUBSTATE, StandardField.DOI, StandardField.EPRINT,
-                    StandardField.EPRINTCLASS, StandardField.EPRINTTYPE, StandardField.URL, StandardField.URLDATE)
-            .build();
+        .withType(StandardEntryType.Thesis)
+        .withImportantFields(
+            StandardField.SUBTITLE,
+            StandardField.TITLEADDON,
+            StandardField.CHAPTER,
+            StandardField.PAGES,
+            StandardField.PAGETOTAL,
+            StandardField.DOI,
+            StandardField.EPRINT,
+            StandardField.EPRINTCLASS,
+            StandardField.EPRINTTYPE,
+            StandardField.URL,
+            StandardField.URLDATE
+        )
+        .withRequiredFields(
+            StandardField.AUTHOR,
+            StandardField.TITLE,
+            StandardField.TYPE,
+            StandardField.INSTITUTION,
+            StandardField.DATE
+        )
+        .withDetailFields(
+            StandardField.SUBTITLE,
+            StandardField.TITLEADDON,
+            StandardField.LANGUAGE,
+            StandardField.NOTE,
+            StandardField.LOCATION,
+            StandardField.ISBN,
+            StandardField.CHAPTER,
+            StandardField.PAGES,
+            StandardField.PAGETOTAL,
+            StandardField.ADDENDUM,
+            StandardField.PUBSTATE,
+            StandardField.DOI,
+            StandardField.EPRINT,
+            StandardField.EPRINTCLASS,
+            StandardField.EPRINTTYPE,
+            StandardField.URL,
+            StandardField.URLDATE
+        )
+        .build();
 
     private static final BibEntryType UNPUBLISHED = new BibEntryTypeBuilder()
-            .withType(StandardEntryType.Unpublished)
-            .withImportantFields(StandardField.SUBTITLE, StandardField.TITLEADDON, StandardField.HOWPUBLISHED,
-                    StandardField.PUBSTATE, StandardField.URL, StandardField.URLDATE)
-            .withRequiredFields(StandardField.AUTHOR, StandardField.TITLE, StandardField.DATE)
-            .withDetailFields(StandardField.SUBTITLE, StandardField.TITLEADDON, StandardField.LANGUAGE, StandardField.HOWPUBLISHED,
-                    StandardField.NOTE, StandardField.LOCATION, StandardField.ADDENDUM, StandardField.PUBSTATE, StandardField.EVENTTITLE,
-                    StandardField.EVENTDATE, StandardField.VENUE, StandardField.URL, StandardField.URLDATE)
-            .build();
+        .withType(StandardEntryType.Unpublished)
+        .withImportantFields(
+            StandardField.SUBTITLE,
+            StandardField.TITLEADDON,
+            StandardField.HOWPUBLISHED,
+            StandardField.PUBSTATE,
+            StandardField.URL,
+            StandardField.URLDATE
+        )
+        .withRequiredFields(
+            StandardField.AUTHOR,
+            StandardField.TITLE,
+            StandardField.DATE
+        )
+        .withDetailFields(
+            StandardField.SUBTITLE,
+            StandardField.TITLEADDON,
+            StandardField.LANGUAGE,
+            StandardField.HOWPUBLISHED,
+            StandardField.NOTE,
+            StandardField.LOCATION,
+            StandardField.ADDENDUM,
+            StandardField.PUBSTATE,
+            StandardField.EVENTTITLE,
+            StandardField.EVENTDATE,
+            StandardField.VENUE,
+            StandardField.URL,
+            StandardField.URLDATE
+        )
+        .build();
 
     private static final BibEntryType CONFERENCE = new BibEntryTypeBuilder()
-            .withType(StandardEntryType.Conference)
-            .withImportantFields(INPROCEEDINGS.getPrimaryOptionalFields())
-            .withDetailFields(INPROCEEDINGS.getSecondaryOptionalFields())
-            .withRequiredFields(INPROCEEDINGS.getRequiredFields())
-            .build();
+        .withType(StandardEntryType.Conference)
+        .withImportantFields(INPROCEEDINGS.getPrimaryOptionalFields())
+        .withDetailFields(INPROCEEDINGS.getSecondaryOptionalFields())
+        .withRequiredFields(INPROCEEDINGS.getRequiredFields())
+        .build();
 
     private static final BibEntryType ELECTRONIC = new BibEntryTypeBuilder()
-            .withType(IEEETranEntryType.Electronic)
-            .withImportantFields(ONLINE.getPrimaryOptionalFields())
-            .withDetailFields(ONLINE.getSecondaryOptionalFields())
-            .withRequiredFields(ONLINE.getRequiredFields())
-            .build();
+        .withType(IEEETranEntryType.Electronic)
+        .withImportantFields(ONLINE.getPrimaryOptionalFields())
+        .withDetailFields(ONLINE.getSecondaryOptionalFields())
+        .withRequiredFields(ONLINE.getRequiredFields())
+        .build();
 
     private static final BibEntryType MASTERSTHESIS = new BibEntryTypeBuilder()
-            .withType(StandardEntryType.MastersThesis)
-            .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)
-            .withRequiredFields(StandardField.AUTHOR, StandardField.TITLE, StandardField.INSTITUTION, StandardField.DATE)
-            .withDetailFields(StandardField.TYPE, StandardField.SUBTITLE, StandardField.TITLEADDON, StandardField.LANGUAGE, StandardField.NOTE,
-                    StandardField.LOCATION, StandardField.ISBN, StandardField.CHAPTER, StandardField.PAGES,
-                    StandardField.PAGETOTAL, StandardField.ADDENDUM, StandardField.PUBSTATE, StandardField.DOI, StandardField.EPRINT,
-                    StandardField.EPRINTCLASS, StandardField.EPRINTTYPE, StandardField.URL, StandardField.URLDATE)
-            .build();
+        .withType(StandardEntryType.MastersThesis)
+        .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
+        )
+        .withRequiredFields(
+            StandardField.AUTHOR,
+            StandardField.TITLE,
+            StandardField.INSTITUTION,
+            StandardField.DATE
+        )
+        .withDetailFields(
+            StandardField.TYPE,
+            StandardField.SUBTITLE,
+            StandardField.TITLEADDON,
+            StandardField.LANGUAGE,
+            StandardField.NOTE,
+            StandardField.LOCATION,
+            StandardField.ISBN,
+            StandardField.CHAPTER,
+            StandardField.PAGES,
+            StandardField.PAGETOTAL,
+            StandardField.ADDENDUM,
+            StandardField.PUBSTATE,
+            StandardField.DOI,
+            StandardField.EPRINT,
+            StandardField.EPRINTCLASS,
+            StandardField.EPRINTTYPE,
+            StandardField.URL,
+            StandardField.URLDATE
+        )
+        .build();
 
     private static final BibEntryType PHDTHESIS = new BibEntryTypeBuilder()
-            .withType(StandardEntryType.PhdThesis)
-            .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)
-            .withRequiredFields(StandardField.AUTHOR, StandardField.TITLE, StandardField.INSTITUTION, StandardField.DATE)
-            .withDetailFields(StandardField.TYPE, StandardField.SUBTITLE, StandardField.TITLEADDON, StandardField.LANGUAGE, StandardField.NOTE,
-                    StandardField.LOCATION, StandardField.ISBN, StandardField.CHAPTER, StandardField.PAGES,
-                    StandardField.PAGETOTAL, StandardField.ADDENDUM, StandardField.PUBSTATE, StandardField.DOI, StandardField.EPRINT,
-                    StandardField.EPRINTCLASS, StandardField.EPRINTTYPE, StandardField.URL, StandardField.URLDATE)
-            .build();
+        .withType(StandardEntryType.PhdThesis)
+        .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
+        )
+        .withRequiredFields(
+            StandardField.AUTHOR,
+            StandardField.TITLE,
+            StandardField.INSTITUTION,
+            StandardField.DATE
+        )
+        .withDetailFields(
+            StandardField.TYPE,
+            StandardField.SUBTITLE,
+            StandardField.TITLEADDON,
+            StandardField.LANGUAGE,
+            StandardField.NOTE,
+            StandardField.LOCATION,
+            StandardField.ISBN,
+            StandardField.CHAPTER,
+            StandardField.PAGES,
+            StandardField.PAGETOTAL,
+            StandardField.ADDENDUM,
+            StandardField.PUBSTATE,
+            StandardField.DOI,
+            StandardField.EPRINT,
+            StandardField.EPRINTCLASS,
+            StandardField.EPRINTTYPE,
+            StandardField.URL,
+            StandardField.URLDATE
+        )
+        .build();
 
     private static final BibEntryType TECHREPORT = new BibEntryTypeBuilder()
-            .withType(StandardEntryType.TechReport)
-            .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)
-            .withRequiredFields(StandardField.AUTHOR, StandardField.TITLE, StandardField.INSTITUTION, StandardField.DATE)
-            .withDetailFields(StandardField.TYPE, StandardField.SUBTITLE, StandardField.TITLEADDON, StandardField.LANGUAGE,
-                    StandardField.NUMBER, StandardField.VERSION, StandardField.NOTE, StandardField.LOCATION,
-                    StandardField.ISRN, StandardField.CHAPTER, StandardField.PAGES, StandardField.PAGETOTAL, StandardField.ADDENDUM,
-                    StandardField.PUBSTATE, StandardField.DOI, StandardField.EPRINT, StandardField.EPRINTCLASS, StandardField.EPRINTTYPE,
-                    StandardField.URL, StandardField.URLDATE)
-            .build();
+        .withType(StandardEntryType.TechReport)
+        .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
+        )
+        .withRequiredFields(
+            StandardField.AUTHOR,
+            StandardField.TITLE,
+            StandardField.INSTITUTION,
+            StandardField.DATE
+        )
+        .withDetailFields(
+            StandardField.TYPE,
+            StandardField.SUBTITLE,
+            StandardField.TITLEADDON,
+            StandardField.LANGUAGE,
+            StandardField.NUMBER,
+            StandardField.VERSION,
+            StandardField.NOTE,
+            StandardField.LOCATION,
+            StandardField.ISRN,
+            StandardField.CHAPTER,
+            StandardField.PAGES,
+            StandardField.PAGETOTAL,
+            StandardField.ADDENDUM,
+            StandardField.PUBSTATE,
+            StandardField.DOI,
+            StandardField.EPRINT,
+            StandardField.EPRINTCLASS,
+            StandardField.EPRINTTYPE,
+            StandardField.URL,
+            StandardField.URLDATE
+        )
+        .build();
 
     private static final BibEntryType WWW = new BibEntryTypeBuilder()
-            .withType(StandardEntryType.WWW)
-            .withImportantFields(ONLINE.getPrimaryOptionalFields())
-            .withDetailFields(ONLINE.getSecondaryOptionalFields())
-            .withRequiredFields(ONLINE.getRequiredFields())
-            .build();
+        .withType(StandardEntryType.WWW)
+        .withImportantFields(ONLINE.getPrimaryOptionalFields())
+        .withDetailFields(ONLINE.getSecondaryOptionalFields())
+        .withRequiredFields(ONLINE.getRequiredFields())
+        .build();
 
     private static final BibEntryType SOFTWARE = new BibEntryTypeBuilder()
-            .withType(StandardEntryType.Software)
-            .withImportantFields(
-                    StandardField.SUBTITLE, StandardField.TITLEADDON, StandardField.HOWPUBLISHED, StandardField.LOCATION, StandardField.DOI,
-                    StandardField.EPRINT, StandardField.EPRINTCLASS, StandardField.EPRINTTYPE, StandardField.URL, StandardField.URLDATE)
-            .withRequiredFields(new OrFields(StandardField.AUTHOR, StandardField.EDITOR), StandardField.TITLE, StandardField.DATE)
-            .withDetailFields(StandardField.SUBTITLE, StandardField.TITLEADDON, StandardField.LANGUAGE, StandardField.HOWPUBLISHED,
-                    StandardField.TYPE, StandardField.VERSION, StandardField.NOTE, StandardField.ORGANIZATION, StandardField.LOCATION,
-                    StandardField.ADDENDUM, StandardField.PUBSTATE, StandardField.DOI, StandardField.EPRINT,
-                    StandardField.EPRINTCLASS, StandardField.EPRINTTYPE, StandardField.URL, StandardField.URLDATE)
-            .build();
+        .withType(StandardEntryType.Software)
+        .withImportantFields(
+            StandardField.SUBTITLE,
+            StandardField.TITLEADDON,
+            StandardField.HOWPUBLISHED,
+            StandardField.LOCATION,
+            StandardField.DOI,
+            StandardField.EPRINT,
+            StandardField.EPRINTCLASS,
+            StandardField.EPRINTTYPE,
+            StandardField.URL,
+            StandardField.URLDATE
+        )
+        .withRequiredFields(
+            new OrFields(StandardField.AUTHOR, StandardField.EDITOR),
+            StandardField.TITLE,
+            StandardField.DATE
+        )
+        .withDetailFields(
+            StandardField.SUBTITLE,
+            StandardField.TITLEADDON,
+            StandardField.LANGUAGE,
+            StandardField.HOWPUBLISHED,
+            StandardField.TYPE,
+            StandardField.VERSION,
+            StandardField.NOTE,
+            StandardField.ORGANIZATION,
+            StandardField.LOCATION,
+            StandardField.ADDENDUM,
+            StandardField.PUBSTATE,
+            StandardField.DOI,
+            StandardField.EPRINT,
+            StandardField.EPRINTCLASS,
+            StandardField.EPRINTTYPE,
+            StandardField.URL,
+            StandardField.URLDATE
+        )
+        .build();
 
     private static final BibEntryType DATASET = new BibEntryTypeBuilder()
-            .withType(StandardEntryType.Dataset)
-            .withImportantFields(
-                    StandardField.SUBTITLE, StandardField.TITLEADDON, StandardField.HOWPUBLISHED, StandardField.LOCATION, StandardField.DOI,
-                    StandardField.EPRINT, StandardField.EPRINTCLASS, StandardField.EPRINTTYPE, StandardField.URL, StandardField.URLDATE)
-            .withRequiredFields(new OrFields(StandardField.AUTHOR, StandardField.EDITOR), StandardField.TITLE, StandardField.DATE)
-            .withDetailFields(StandardField.SUBTITLE, StandardField.TITLEADDON, StandardField.LANGUAGE, StandardField.EDITION, StandardField.HOWPUBLISHED,
-                    StandardField.TYPE, StandardField.VERSION, StandardField.NOTE, StandardField.ORGANIZATION, StandardField.LOCATION,
-                    StandardField.ADDENDUM, StandardField.PUBSTATE, StandardField.DOI, StandardField.EPRINT,
-                    StandardField.EPRINTCLASS, StandardField.EPRINTTYPE, StandardField.URL, StandardField.URLDATE)
-            .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);
+        .withType(StandardEntryType.Dataset)
+        .withImportantFields(
+            StandardField.SUBTITLE,
+            StandardField.TITLEADDON,
+            StandardField.HOWPUBLISHED,
+            StandardField.LOCATION,
+            StandardField.DOI,
+            StandardField.EPRINT,
+            StandardField.EPRINTCLASS,
+            StandardField.EPRINTTYPE,
+            StandardField.URL,
+            StandardField.URLDATE
+        )
+        .withRequiredFields(
+            new OrFields(StandardField.AUTHOR, StandardField.EDITOR),
+            StandardField.TITLE,
+            StandardField.DATE
+        )
+        .withDetailFields(
+            StandardField.SUBTITLE,
+            StandardField.TITLEADDON,
+            StandardField.LANGUAGE,
+            StandardField.EDITION,
+            StandardField.HOWPUBLISHED,
+            StandardField.TYPE,
+            StandardField.VERSION,
+            StandardField.NOTE,
+            StandardField.ORGANIZATION,
+            StandardField.LOCATION,
+            StandardField.ADDENDUM,
+            StandardField.PUBSTATE,
+            StandardField.DOI,
+            StandardField.EPRINT,
+            StandardField.EPRINTCLASS,
+            StandardField.EPRINTTYPE,
+            StandardField.URL,
+            StandardField.URLDATE
+        )
+        .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 041c48e592a..c1752be1d49 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"),
@@ -18,9 +17,10 @@ public enum BiblatexSoftwareEntryType implements EntryType {
     }
 
     public static Optional<BiblatexSoftwareEntryType> fromName(String name) {
-        return Arrays.stream(BiblatexSoftwareEntryType.values())
-                     .filter(field -> field.getName().equalsIgnoreCase(name))
-                     .findAny();
+        return Arrays
+            .stream(BiblatexSoftwareEntryType.values())
+            .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 6a2e7f0851e..31f172e2160 100644
--- a/src/main/java/org/jabref/model/entry/types/BiblatexSoftwareEntryTypeDefinitions.java
+++ b/src/main/java/org/jabref/model/entry/types/BiblatexSoftwareEntryTypeDefinitions.java
@@ -2,7 +2,6 @@
 
 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;
@@ -10,45 +9,168 @@
 import org.jabref.model.entry.field.StandardField;
 
 public class BiblatexSoftwareEntryTypeDefinitions {
+
     private static final BibEntryType SOFTWARE = new BibEntryTypeBuilder()
-            .withType(StandardEntryType.Software)
-            .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)
-            .withRequiredFields(new OrFields(StandardField.AUTHOR, StandardField.EDITOR), StandardField.TITLE, StandardField.URL, StandardField.VERSION, StandardField.YEAR)
-            .build();
+        .withType(StandardEntryType.Software)
+        .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
+        )
+        .withRequiredFields(
+            new OrFields(StandardField.AUTHOR, StandardField.EDITOR),
+            StandardField.TITLE,
+            StandardField.URL,
+            StandardField.VERSION,
+            StandardField.YEAR
+        )
+        .build();
 
-    private static final BibEntryType SOFTWAREVERSION = new BibEntryTypeBuilder()
+    private static final BibEntryType SOFTWAREVERSION =
+        new BibEntryTypeBuilder()
             .withType(BiblatexSoftwareEntryType.SoftwareVersion)
-            .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)
-            .withRequiredFields(new OrFields(StandardField.AUTHOR, StandardField.EDITOR), StandardField.TITLE, StandardField.URL, StandardField.YEAR, StandardField.VERSION)
-            .withDetailFields(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)
-            .withRequiredFields(new OrFields(StandardField.AUTHOR, StandardField.EDITOR), StandardField.TITLE, StandardField.URL, StandardField.YEAR)
+            .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
+            )
+            .withRequiredFields(
+                new OrFields(StandardField.AUTHOR, StandardField.EDITOR),
+                StandardField.TITLE,
+                StandardField.URL,
+                StandardField.YEAR,
+                StandardField.VERSION
+            )
+            .withDetailFields(
+                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
+            )
+            .withRequiredFields(
+                new OrFields(StandardField.AUTHOR, StandardField.EDITOR),
+                StandardField.TITLE,
+                StandardField.URL,
+                StandardField.YEAR
+            )
             .build();
     private static final BibEntryType SOFTWAREMODULE = new BibEntryTypeBuilder()
-            .withType(BiblatexSoftwareEntryType.SoftwareModule)
-            .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)
-            .withRequiredFields(StandardField.AUTHOR, StandardField.SUBTITLE, StandardField.URL, StandardField.YEAR)
-            .build();
+        .withType(BiblatexSoftwareEntryType.SoftwareModule)
+        .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
+        )
+        .withRequiredFields(
+            StandardField.AUTHOR,
+            StandardField.SUBTITLE,
+            StandardField.URL,
+            StandardField.YEAR
+        )
+        .build();
 
     private static final BibEntryType CODEFRAGMENT = new BibEntryTypeBuilder()
-            .withType(BiblatexSoftwareEntryType.CodeFragment)
-            .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)
-            .withRequiredFields(StandardField.URL)
-            .build();
+        .withType(BiblatexSoftwareEntryType.CodeFragment)
+        .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
+        )
+        .withRequiredFields(StandardField.URL)
+        .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 594301642b7..15dff1cfeba 100644
--- a/src/main/java/org/jabref/model/entry/types/BibtexEntryTypeDefinitions.java
+++ b/src/main/java/org/jabref/model/entry/types/BibtexEntryTypeDefinitions.java
@@ -2,7 +2,6 @@
 
 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;
@@ -13,6 +12,7 @@
  * The BibLaTeX entry types are defined at {@link BiblatexEntryTypeDefinitions}.
  */
 public class BibtexEntryTypeDefinitions {
+
     /**
      * An article from a journal or magazine.
      * <p>
@@ -20,10 +20,22 @@ public class BibtexEntryTypeDefinitions {
      * 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();
+        .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.
@@ -32,10 +44,24 @@ public class BibtexEntryTypeDefinitions {
      * 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();
+        .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.
@@ -44,10 +70,17 @@ public class BibtexEntryTypeDefinitions {
      * 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();
+        .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.
@@ -56,10 +89,26 @@ public class BibtexEntryTypeDefinitions {
      * 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();
+        .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.
@@ -68,10 +117,28 @@ public class BibtexEntryTypeDefinitions {
      * Optional fields: volume or number, series, type, address, edition, month, note.
      */
     private static final BibEntryType INBOOK = new BibEntryTypeBuilder()
-            .withType(StandardEntryType.InBook)
-            .withRequiredFields(Arrays.asList(new OrFields(StandardField.CHAPTER, StandardField.PAGES), new OrFields(StandardField.AUTHOR, StandardField.EDITOR)), StandardField.TITLE, StandardField.PUBLISHER, StandardField.YEAR)
-            .withImportantFields(StandardField.VOLUME, StandardField.NUMBER, StandardField.SERIES, StandardField.TYPE, StandardField.ADDRESS, StandardField.EDITION, StandardField.MONTH, StandardField.ISBN, StandardField.NOTE)
-            .build();
+        .withType(StandardEntryType.InBook)
+        .withRequiredFields(
+            Arrays.asList(
+                new OrFields(StandardField.CHAPTER, StandardField.PAGES),
+                new OrFields(StandardField.AUTHOR, StandardField.EDITOR)
+            ),
+            StandardField.TITLE,
+            StandardField.PUBLISHER,
+            StandardField.YEAR
+        )
+        .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.
@@ -79,10 +146,29 @@ public class BibtexEntryTypeDefinitions {
      * 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();
+        .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.
@@ -91,18 +177,46 @@ public class BibtexEntryTypeDefinitions {
      * 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();
+        .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.
@@ -111,10 +225,20 @@ public class BibtexEntryTypeDefinitions {
      * 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();
+        .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.
@@ -123,9 +247,16 @@ public class BibtexEntryTypeDefinitions {
      * 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();
+        .withType(StandardEntryType.Misc)
+        .withImportantFields(
+            StandardField.AUTHOR,
+            StandardField.TITLE,
+            StandardField.HOWPUBLISHED,
+            StandardField.MONTH,
+            StandardField.YEAR,
+            StandardField.NOTE
+        )
+        .build();
 
     /**
      * A PhD thesis.
@@ -134,10 +265,20 @@ public class BibtexEntryTypeDefinitions {
      * 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();
+        .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.
@@ -146,10 +287,21 @@ public class BibtexEntryTypeDefinitions {
      * 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();
+        .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.
@@ -158,10 +310,21 @@ public class BibtexEntryTypeDefinitions {
      * 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();
+        .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.
@@ -170,16 +333,39 @@ public class BibtexEntryTypeDefinitions {
      * 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();
+        .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/EntryType.java b/src/main/java/org/jabref/model/entry/types/EntryType.java
index 1a40be9a9ae..b4b7627284a 100644
--- a/src/main/java/org/jabref/model/entry/types/EntryType.java
+++ b/src/main/java/org/jabref/model/entry/types/EntryType.java
@@ -1,7 +1,6 @@
 package org.jabref.model.entry.types;
 
 public interface EntryType {
-
     /**
      * Returns the tag name of the entry type.
      */
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 ae879fabafb..f35e7616b15 100644
--- a/src/main/java/org/jabref/model/entry/types/EntryTypeFactory.java
+++ b/src/main/java/org/jabref/model/entry/types/EntryTypeFactory.java
@@ -5,13 +5,11 @@
 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
@@ -19,16 +17,30 @@ private EntryTypeFactory() {
      *
      * @return returns true if the two compared entry types have the same name and equal required and optional fields
      */
-    public static boolean nameAndFieldsAreEqual(BibEntryType type1, BibEntryType type2) {
+    public static boolean nameAndFieldsAreEqual(
+        BibEntryType type1,
+        BibEntryType type2
+    ) {
         if ((type1 == null) && (type2 == null)) {
             return true;
         } else if ((type1 == null) || (type2 == null)) {
             return false;
         } else {
-            return Objects.equals(type1.getType(), type2.getType())
-                    && Objects.equals(type1.getRequiredFields(), type2.getRequiredFields())
-                    && Objects.equals(type1.getOptionalFields(), type2.getOptionalFields())
-                    && Objects.equals(type1.getSecondaryOptionalFields(), type2.getSecondaryOptionalFields());
+            return (
+                Objects.equals(type1.getType(), type2.getType()) &&
+                Objects.equals(
+                    type1.getRequiredFields(),
+                    type2.getRequiredFields()
+                ) &&
+                Objects.equals(
+                    type1.getOptionalFields(),
+                    type2.getOptionalFields()
+                ) &&
+                Objects.equals(
+                    type1.getSecondaryOptionalFields(),
+                    type2.getSecondaryOptionalFields()
+                )
+            );
         }
     }
 
@@ -37,20 +49,38 @@ 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(BiblatexSoftwareEntryType.values())
+        );
         types.addAll(Arrays.<EntryType>asList(BiblatexApaEntryType.values()));
-        types.addAll(Arrays.<EntryType>asList(SystematicLiteratureReviewStudyEntryType.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 4c3305ded22..1dfc12abade 100644
--- a/src/main/java/org/jabref/model/entry/types/IEEETranEntryType.java
+++ b/src/main/java/org/jabref/model/entry/types/IEEETranEntryType.java
@@ -18,9 +18,10 @@ public enum IEEETranEntryType implements EntryType {
     }
 
     public static Optional<IEEETranEntryType> fromName(String name) {
-        return Arrays.stream(IEEETranEntryType.values())
-                     .filter(field -> field.getName().equalsIgnoreCase(name))
-                     .findAny();
+        return Arrays
+            .stream(IEEETranEntryType.values())
+            .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 600c9f67bdb..eb2740d48e6 100644
--- a/src/main/java/org/jabref/model/entry/types/IEEETranEntryTypeDefinitions.java
+++ b/src/main/java/org/jabref/model/entry/types/IEEETranEntryTypeDefinitions.java
@@ -2,7 +2,6 @@
 
 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;
@@ -17,6 +16,7 @@
  * Electronic, IEEETranBSTCTL, Periodical, Patent, Standard
  */
 public class IEEETranEntryTypeDefinitions {
+
     /**
      * Electronic entry type for internet references
      * <p>
@@ -24,21 +24,41 @@ public class IEEETranEntryTypeDefinitions {
      * 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();
+        .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();
+        .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.
@@ -47,10 +67,20 @@ public class IEEETranEntryTypeDefinitions {
      * 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();
+        .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.
@@ -59,12 +89,28 @@ public class IEEETranEntryTypeDefinitions {
      * 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.NUMBER, StandardField.DAY, StandardField.DAYFILED, StandardField.MONTH,
-                    StandardField.MONTHFILED, StandardField.NOTE, StandardField.URL)
-            .build();
+        .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.NUMBER,
+            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.
@@ -73,15 +119,33 @@ public class IEEETranEntryTypeDefinitions {
      * 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();
+        .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 1d9bd4be112..b842878ada7 100644
--- a/src/main/java/org/jabref/model/entry/types/SystematicLiteratureReviewStudyEntryType.java
+++ b/src/main/java/org/jabref/model/entry/types/SystematicLiteratureReviewStudyEntryType.java
@@ -15,10 +15,13 @@ public enum SystematicLiteratureReviewStudyEntryType implements EntryType {
         this.displayName = displayName;
     }
 
-    public static Optional<SystematicLiteratureReviewStudyEntryType> fromName(String name) {
-        return Arrays.stream(SystematicLiteratureReviewStudyEntryType.values())
-                     .filter(field -> field.getName().equalsIgnoreCase(name))
-                     .findAny();
+    public static Optional<SystematicLiteratureReviewStudyEntryType> fromName(
+        String name
+    ) {
+        return Arrays
+            .stream(SystematicLiteratureReviewStudyEntryType.values())
+            .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 5d1bf665bfe..df27f02427d 100644
--- a/src/main/java/org/jabref/model/entry/types/SystematicLiteratureReviewStudyEntryTypeDefinitions.java
+++ b/src/main/java/org/jabref/model/entry/types/SystematicLiteratureReviewStudyEntryTypeDefinitions.java
@@ -2,7 +2,6 @@
 
 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;
@@ -22,9 +21,14 @@ public class SystematicLiteratureReviewStudyEntryTypeDefinitions {
      * </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();
+        .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,8 +38,11 @@ public class SystematicLiteratureReviewStudyEntryTypeDefinitions {
      * <li>Optional fields:</li>
      * </ul>
      */
-    private static final BibEntryType SEARCH_QUERY_ENTRY = new BibEntryTypeBuilder()
-            .withType(SystematicLiteratureReviewStudyEntryType.SEARCH_QUERY_ENTRY)
+    private static final BibEntryType SEARCH_QUERY_ENTRY =
+        new BibEntryTypeBuilder()
+            .withType(
+                SystematicLiteratureReviewStudyEntryType.SEARCH_QUERY_ENTRY
+            )
             .withRequiredFields(new UnknownField("query"))
             .build();
 
@@ -48,13 +55,19 @@ public class SystematicLiteratureReviewStudyEntryTypeDefinitions {
      * </ul>
      */
     private static final BibEntryType LIBRARY_ENTRY = new BibEntryTypeBuilder()
-            .withType(SystematicLiteratureReviewStudyEntryType.STUDY_ENTRY)
-            .withRequiredFields(new UnknownField("name"), new UnknownField("enabled"))
-            .withImportantFields(StandardField.COMMENT)
-            .build();
+        .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 6b9d8682d1c..90e89f81d70 100644
--- a/src/main/java/org/jabref/model/entry/types/UnknownEntryType.java
+++ b/src/main/java/org/jabref/model/entry/types/UnknownEntryType.java
@@ -2,10 +2,10 @@
 
 import java.util.Locale;
 import java.util.Objects;
-
 import org.jabref.model.strings.StringUtil;
 
 public class UnknownEntryType implements EntryType {
+
     private final String name;
 
     public UnknownEntryType(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 e61d3b30e52..8d270543509 100644
--- a/src/main/java/org/jabref/model/groups/AbstractGroup.java
+++ b/src/main/java/org/jabref/model/groups/AbstractGroup.java
@@ -3,11 +3,9 @@
 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;
-
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.search.SearchMatcher;
 import org.jabref.model.strings.StringUtil;
@@ -37,14 +35,23 @@ 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,8 +63,11 @@ 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)
-                && Objects.equals(this.context, that.context);
+        return (
+            Objects.equals(this.name.getValue(), that.name.getValue()) &&
+            Objects.equals(this.description, that.description) &&
+            Objects.equals(this.context, that.context)
+        );
     }
 
     @Override
diff --git a/src/main/java/org/jabref/model/groups/AllEntriesGroup.java b/src/main/java/org/jabref/model/groups/AllEntriesGroup.java
index 320b3306ce8..c84a9582f7f 100644
--- a/src/main/java/org/jabref/model/groups/AllEntriesGroup.java
+++ b/src/main/java/org/jabref/model/groups/AllEntriesGroup.java
@@ -1,7 +1,6 @@
 package org.jabref.model.groups;
 
 import java.util.Objects;
-
 import org.jabref.model.entry.BibEntry;
 
 /**
@@ -20,7 +19,10 @@ public AbstractGroup deepCopy() {
 
     @Override
     public boolean equals(Object o) {
-        return o instanceof AllEntriesGroup aeg && Objects.equals(aeg.getName(), getName());
+        return (
+            o instanceof AllEntriesGroup aeg &&
+            Objects.equals(aeg.getName(), getName())
+        );
     }
 
     @Override
diff --git a/src/main/java/org/jabref/model/groups/AutomaticGroup.java b/src/main/java/org/jabref/model/groups/AutomaticGroup.java
index 026ce74f76f..191407b1384 100644
--- a/src/main/java/org/jabref/model/groups/AutomaticGroup.java
+++ b/src/main/java/org/jabref/model/groups/AutomaticGroup.java
@@ -1,13 +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;
 
 public abstract class AutomaticGroup extends AbstractGroup {
+
     public AutomaticGroup(String name, GroupHierarchyType context) {
         super(name, context);
     }
@@ -24,10 +23,13 @@ public boolean isDynamic() {
 
     public abstract Set<GroupTreeNode> createSubgroups(BibEntry entry);
 
-    public ObservableList<GroupTreeNode> createSubgroups(ObservableList<BibEntry> entries) {
+    public ObservableList<GroupTreeNode> createSubgroups(
+        ObservableList<BibEntry> entries
+    ) {
         // 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));
+        return entries
+            .stream()
+            .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 06dfcd983c1..70ce9495159 100644
--- a/src/main/java/org/jabref/model/groups/AutomaticKeywordGroup.java
+++ b/src/main/java/org/jabref/model/groups/AutomaticKeywordGroup.java
@@ -3,7 +3,6 @@
 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;
@@ -16,7 +15,13 @@ public class AutomaticKeywordGroup extends AutomaticGroup {
     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,13 @@ 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 +60,10 @@ 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
@@ -60,26 +73,32 @@ public int hashCode() {
 
     @Override
     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());
+        KeywordList keywordList = entry.getFieldAsKeywords(
+            field,
+            keywordDelimiter
+        );
+        return keywordList
+            .stream()
+            .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);
+            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 bd31c03a674..0beb7d4044a 100644
--- a/src/main/java/org/jabref/model/groups/AutomaticPersonsGroup.java
+++ b/src/main/java/org/jabref/model/groups/AutomaticPersonsGroup.java
@@ -3,7 +3,6 @@
 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;
 
@@ -11,7 +10,11 @@ public class AutomaticPersonsGroup extends AutomaticGroup {
 
     private final Field field;
 
-    public AutomaticPersonsGroup(String name, GroupHierarchyType context, Field field) {
+    public AutomaticPersonsGroup(
+        String name,
+        GroupHierarchyType context,
+        Field field
+    ) {
         super(name, context);
         this.field = field;
     }
@@ -35,16 +38,28 @@ public int hashCode() {
 
     @Override
     public AbstractGroup deepCopy() {
-        return new AutomaticPersonsGroup(this.name.getValue(), this.context, this.field);
+        return new AutomaticPersonsGroup(
+            this.name.getValue(),
+            this.context,
+            this.field
+        );
     }
 
     @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 53a01bc519d..5f16c0a4c06 100644
--- a/src/main/java/org/jabref/model/groups/ExplicitGroup.java
+++ b/src/main/java/org/jabref/model/groups/ExplicitGroup.java
@@ -4,7 +4,6 @@
 import java.util.Collections;
 import java.util.List;
 import java.util.Objects;
-
 import org.jabref.model.entry.field.StandardField;
 
 /**
@@ -21,8 +20,20 @@ public class ExplicitGroup extends WordKeywordGroup {
      */
     private final List<String> legacyEntryKeys = new ArrayList<>();
 
-    public ExplicitGroup(String name, GroupHierarchyType context, Character keywordSeparator) {
-        super(name, context, StandardField.GROUPS, name, true, keywordSeparator, true);
+    public ExplicitGroup(
+        String name,
+        GroupHierarchyType context,
+        Character keywordSeparator
+    ) {
+        super(
+            name,
+            context,
+            StandardField.GROUPS,
+            name,
+            true,
+            keywordSeparator,
+            true
+        );
     }
 
     public void addLegacyEntryKey(String key) {
@@ -31,7 +42,11 @@ 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;
     }
@@ -45,13 +60,18 @@ public boolean equals(Object o) {
             return false;
         }
         ExplicitGroup other = (ExplicitGroup) o;
-        return Objects.equals(getName(), other.getName())
-                && Objects.equals(getHierarchicalContext(), other.getHierarchicalContext())
-                && Objects.equals(getIconName(), other.getIconName())
-                && Objects.equals(getDescription(), other.getDescription())
-                && Objects.equals(getColor(), other.getColor())
-                && Objects.equals(isExpanded(), other.isExpanded())
-                && Objects.equals(getLegacyEntryKeys(), other.getLegacyEntryKeys());
+        return (
+            Objects.equals(getName(), other.getName()) &&
+            Objects.equals(
+                getHierarchicalContext(),
+                other.getHierarchicalContext()
+            ) &&
+            Objects.equals(getIconName(), other.getIconName()) &&
+            Objects.equals(getDescription(), other.getDescription()) &&
+            Objects.equals(getColor(), other.getColor()) &&
+            Objects.equals(isExpanded(), other.isExpanded()) &&
+            Objects.equals(getLegacyEntryKeys(), other.getLegacyEntryKeys())
+        );
     }
 
     public void clearLegacyEntryKeys() {
@@ -64,7 +84,15 @@ 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 8bd75be26db..7b95a4b84a3 100644
--- a/src/main/java/org/jabref/model/groups/GroupEntryChanger.java
+++ b/src/main/java/org/jabref/model/groups/GroupEntryChanger.java
@@ -3,7 +3,6 @@
 import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
-
 import org.jabref.model.FieldChange;
 import org.jabref.model.entry.BibEntry;
 
@@ -12,7 +11,6 @@
  * This functionality is encoded in this interface.
  */
 public interface GroupEntryChanger {
-
     /**
      * Adds the specified entries to this group.
      *
diff --git a/src/main/java/org/jabref/model/groups/GroupHierarchyType.java b/src/main/java/org/jabref/model/groups/GroupHierarchyType.java
index 63755975d5c..fd255cbd85c 100644
--- a/src/main/java/org/jabref/model/groups/GroupHierarchyType.java
+++ b/src/main/java/org/jabref/model/groups/GroupHierarchyType.java
@@ -1,7 +1,6 @@
 package org.jabref.model.groups;
 
 public enum GroupHierarchyType {
-
     /**
      * Group's contents are independent of its hierarchical position.
      */
diff --git a/src/main/java/org/jabref/model/groups/GroupTreeNode.java b/src/main/java/org/jabref/model/groups/GroupTreeNode.java
index efe4d233fee..deac1716df7 100644
--- a/src/main/java/org/jabref/model/groups/GroupTreeNode.java
+++ b/src/main/java/org/jabref/model/groups/GroupTreeNode.java
@@ -7,7 +7,6 @@
 import java.util.Objects;
 import java.util.Optional;
 import java.util.stream.Collectors;
-
 import org.jabref.model.FieldChange;
 import org.jabref.model.TreeNode;
 import org.jabref.model.database.BibDatabase;
@@ -66,17 +65,27 @@ 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();
         group = 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));
@@ -103,16 +112,27 @@ private SearchMatcher getSearchMatcher(GroupHierarchyType originalContext) {
             return group;
         }
         MatcherSet searchRule = MatcherSets.build(
-                context == GroupHierarchyType.REFINING ? MatcherSets.MatcherType.AND : MatcherSets.MatcherType.OR);
+            context == GroupHierarchyType.REFINING
+                ? MatcherSets.MatcherType.AND
+                : MatcherSets.MatcherType.OR
+        );
         searchRule.addRule(group);
-        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));
+            searchRule.addRule(
+                getParent().get().getSearchMatcher(originalContext)
+            );
         }
         return searchRule;
     }
@@ -126,8 +146,10 @@ public boolean equals(Object o) {
             return false;
         }
         GroupTreeNode that = (GroupTreeNode) o;
-        return Objects.equals(group, that.group) &&
-                Objects.equals(getChildren(), that.getChildren());
+        return (
+            Objects.equals(group, that.group) &&
+            Objects.equals(getChildren(), that.getChildren())
+        );
     }
 
     @Override
@@ -135,7 +157,10 @@ public int hashCode() {
         return Objects.hash(group);
     }
 
-    public List<GroupTreeNode> getContainingGroups(List<BibEntry> entries, boolean requireAll) {
+    public List<GroupTreeNode> getContainingGroups(
+        List<BibEntry> entries,
+        boolean requireAll
+    ) {
         List<GroupTreeNode> groups = new ArrayList<>();
 
         // Add myself if I contain the entries
@@ -220,9 +245,10 @@ 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());
     }
 
     /**
@@ -248,17 +274,16 @@ public boolean matches(BibEntry entry) {
      * The name of the root is not included.
      */
     public String getPath() {
-        return getPathFromRoot().stream()
-                                .skip(1) // Skip root
-                                .map(GroupTreeNode::getName)
-                                .collect(Collectors.joining(PATH_DELIMITER));
+        return getPathFromRoot()
+            .stream()
+            .skip(1) // Skip root
+            .map(GroupTreeNode::getName)
+            .collect(Collectors.joining(PATH_DELIMITER));
     }
 
     @Override
     public String toString() {
-        return "GroupTreeNode{" +
-                "group=" + group +
-                '}';
+        return "GroupTreeNode{" + "group=" + group + '}';
     }
 
     /**
@@ -270,9 +295,10 @@ 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();
+                .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 22511e2e049..638ae43893e 100644
--- a/src/main/java/org/jabref/model/groups/KeywordGroup.java
+++ b/src/main/java/org/jabref/model/groups/KeywordGroup.java
@@ -1,18 +1,24 @@
 package org.jabref.model.groups;
 
 import java.util.Objects;
-
 import org.jabref.model.entry.field.Field;
 
 /**
  * Matches entries based on a search phrase relative to the content in a specified field.
  */
 public abstract class KeywordGroup extends AbstractGroup {
+
     protected final Field searchField;
     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 +54,20 @@ 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 8fa6fff938c..541dc9ab525 100644
--- a/src/main/java/org/jabref/model/groups/LastNameGroup.java
+++ b/src/main/java/org/jabref/model/groups/LastNameGroup.java
@@ -4,7 +4,6 @@
 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;
@@ -15,28 +14,52 @@
  * 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) {
-        super(groupName, context, searchField, LatexToUnicodeAdapter.format(lastName), true);
+
+    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::getLast)
-                       .flatMap(Optional::stream)
-                       .collect(Collectors.toList());
+    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::getLast)
+            .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 dc603ffa8e5..ed57ecf6103 100644
--- a/src/main/java/org/jabref/model/groups/RegexKeywordGroup.java
+++ b/src/main/java/org/jabref/model/groups/RegexKeywordGroup.java
@@ -3,7 +3,6 @@
 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;
 
@@ -11,23 +10,38 @@
  * Matches entries if the content of a given field is matched by a regular expression.
  */
 public class RegexKeywordGroup extends KeywordGroup {
+
     private 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);
+    private static Pattern compilePattern(
+        String searchExpression,
+        boolean caseSensitive
+    ) {
+        return caseSensitive
+            ? Pattern.compile("\\b" + searchExpression + "\\b")
+            : Pattern.compile(
+                "\\b" + searchExpression + "\\b",
+                Pattern.CASE_INSENSITIVE
+            );
     }
 
     @Override
     public boolean contains(BibEntry entry) {
         Optional<String> content = entry.getField(searchField);
-        return content.map(value -> pattern.matcher(value).find()).orElse(false);
+        return content
+            .map(value -> pattern.matcher(value).find())
+            .orElse(false);
     }
 
     @Override
@@ -39,25 +53,34 @@ public boolean equals(Object o) {
             return false;
         }
         RegexKeywordGroup other = (RegexKeywordGroup) o;
-        return getName().equals(other.getName())
-                && (getHierarchicalContext() == other.getHierarchicalContext())
-                && searchField.equals(other.searchField)
-                && searchExpression.equals(other.searchExpression)
-                && (caseSensitive == other.caseSensitive);
+        return (
+            getName().equals(other.getName()) &&
+            (getHierarchicalContext() == other.getHierarchicalContext()) &&
+            searchField.equals(other.searchField) &&
+            searchExpression.equals(other.searchExpression) &&
+            (caseSensitive == other.caseSensitive)
+        );
     }
 
     @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 c1df365bef2..67a08556cbe 100644
--- a/src/main/java/org/jabref/model/groups/SearchGroup.java
+++ b/src/main/java/org/jabref/model/groups/SearchGroup.java
@@ -2,11 +2,9 @@
 
 import java.util.EnumSet;
 import java.util.Objects;
-
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.search.GroupSearchQuery;
 import org.jabref.model.search.rules.SearchRules.SearchFlags;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -16,10 +14,17 @@
  */
 public class SearchGroup extends AbstractGroup {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(SearchGroup.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(
+        SearchGroup.class
+    );
     private final GroupSearchQuery 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 GroupSearchQuery(searchExpression, searchFlags);
     }
@@ -37,10 +42,18 @@ public boolean equals(Object o) {
             return false;
         }
         SearchGroup other = (SearchGroup) o;
-        return Objects.equals(getName(), other.getName())
-               && Objects.equals(getHierarchicalContext(), other.getHierarchicalContext())
-               && Objects.equals(getSearchExpression(), other.getSearchExpression())
-               && Objects.equals(getSearchFlags(), other.getSearchFlags());
+        return (
+            Objects.equals(getName(), other.getName()) &&
+            Objects.equals(
+                getHierarchicalContext(),
+                other.getHierarchicalContext()
+            ) &&
+            Objects.equals(
+                getSearchExpression(),
+                other.getSearchExpression()
+            ) &&
+            Objects.equals(getSearchFlags(), other.getSearchFlags())
+        );
     }
 
     @Override
@@ -55,19 +68,45 @@ public EnumSet<SearchFlags> getSearchFlags() {
     @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
@@ -77,6 +116,11 @@ 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 8d22c0a1d7f..013d3784cb1 100644
--- a/src/main/java/org/jabref/model/groups/TexGroup.java
+++ b/src/main/java/org/jabref/model/groups/TexGroup.java
@@ -7,7 +7,6 @@
 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,14 +16,15 @@
 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;
 
 @AllowedToUseLogic("because it needs access to aux parser")
 public class TexGroup extends AbstractGroup implements FileUpdateListener {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(TexGroup.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(
+        TexGroup.class
+    );
 
     private final Path filePath;
     private Set<String> keysUsedInAux;
@@ -33,7 +33,15 @@ 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 +50,63 @@ 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 group = new TexGroup(name, context, filePath, auxParser, fileMonitor, metaData);
+    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() {
@@ -68,7 +120,10 @@ public boolean contains(BibEntry entry) {
             keysUsedInAux = auxResult.getUniqueKeys();
         }
 
-        return entry.getCitationKey().map(keysUsedInAux::contains).orElse(false);
+        return entry
+            .getCitationKey()
+            .map(keysUsedInAux::contains)
+            .orElse(false);
     }
 
     @Override
@@ -79,7 +134,14 @@ 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 +166,19 @@ 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 +208,9 @@ 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 32fe044cff5..4b6b48a0ba5 100644
--- a/src/main/java/org/jabref/model/groups/WordKeywordGroup.java
+++ b/src/main/java/org/jabref/model/groups/WordKeywordGroup.java
@@ -7,7 +7,6 @@
 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;
@@ -21,17 +20,24 @@
 /**
  * Matches entries if a given field contains a specified word.
  */
-public class WordKeywordGroup extends KeywordGroup implements GroupEntryChanger {
+public class WordKeywordGroup
+    extends KeywordGroup
+    implements GroupEntryChanger {
 
     protected final Character keywordSeparator;
     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;
         this.onlySplitWordsAtSeparator = onlySplitWordsAtSeparator;
 
@@ -46,7 +52,10 @@ 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;
@@ -55,7 +64,10 @@ private static boolean containsCaseInsensitive(Set<String> searchIn, Collection<
         return true;
     }
 
-    private static boolean containsCaseInsensitive(Set<String> searchIn, String searchFor) {
+    private static boolean containsCaseInsensitive(
+        Set<String> searchIn,
+        String searchFor
+    ) {
         for (String word : searchIn) {
             if (word.equalsIgnoreCase(searchFor)) {
                 return true;
@@ -72,7 +84,10 @@ public List<FieldChange> add(Collection<BibEntry> entriesToAdd) {
         for (BibEntry entry : new ArrayList<>(entriesToAdd)) {
             if (!contains(entry)) {
                 String oldContent = entry.getField(searchField).orElse("");
-                KeywordList wordlist = KeywordList.parse(oldContent, keywordSeparator);
+                KeywordList wordlist = KeywordList.parse(
+                    oldContent,
+                    keywordSeparator
+                );
                 wordlist.add(searchExpression);
                 String newContent = wordlist.getAsString(keywordSeparator);
                 entry.setField(searchField, newContent).ifPresent(changes::add);
@@ -88,7 +103,10 @@ public List<FieldChange> remove(List<BibEntry> entriesToRemove) {
         for (BibEntry entry : new ArrayList<>(entriesToRemove)) {
             if (contains(entry)) {
                 String oldContent = entry.getField(searchField).orElse("");
-                KeywordList wordlist = KeywordList.parse(oldContent, keywordSeparator);
+                KeywordList wordlist = KeywordList.parse(
+                    oldContent,
+                    keywordSeparator
+                );
                 wordlist.remove(searchExpression);
                 String newContent = wordlist.getAsString(keywordSeparator);
                 entry.setField(searchField, newContent).ifPresent(changes::add);
@@ -106,13 +124,21 @@ public boolean equals(Object o) {
             return false;
         }
         WordKeywordGroup other = (WordKeywordGroup) o;
-        return Objects.equals(getName(), other.getName())
-                && Objects.equals(getHierarchicalContext(), other.getHierarchicalContext())
-                && Objects.equals(searchField, other.searchField)
-                && Objects.equals(searchExpression, other.searchExpression)
-                && Objects.equals(caseSensitive, other.caseSensitive)
-                && Objects.equals(keywordSeparator, other.keywordSeparator)
-                && Objects.equals(onlySplitWordsAtSeparator, other.onlySplitWordsAtSeparator);
+        return (
+            Objects.equals(getName(), other.getName()) &&
+            Objects.equals(
+                getHierarchicalContext(),
+                other.getHierarchicalContext()
+            ) &&
+            Objects.equals(searchField, other.searchField) &&
+            Objects.equals(searchExpression, other.searchExpression) &&
+            Objects.equals(caseSensitive, other.caseSensitive) &&
+            Objects.equals(keywordSeparator, other.keywordSeparator) &&
+            Objects.equals(
+                onlySplitWordsAtSeparator,
+                other.onlySplitWordsAtSeparator
+            )
+        );
     }
 
     @Override
@@ -122,19 +148,28 @@ 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(),
-                getHierarchicalContext(),
-                searchField,
-                searchExpression,
-                caseSensitive,
-                keywordSeparator,
-                onlySplitWordsAtSeparator);
+        return Objects.hash(
+            getName(),
+            getHierarchicalContext(),
+            searchField,
+            searchExpression,
+            caseSensitive,
+            keywordSeparator,
+            onlySplitWordsAtSeparator
+        );
     }
 
     interface SearchStrategy {
@@ -142,10 +177,12 @@ interface SearchStrategy {
     }
 
     class StringSearchStrategy implements SearchStrategy {
+
         Set<String> searchWords;
 
         StringSearchStrategy() {
-            searchWords = new HashSet<>(StringUtil.getStringAsWords(searchExpression));
+            searchWords =
+                new HashSet<>(StringUtil.getStringAsWords(searchExpression));
         }
 
         @Override
@@ -164,16 +201,19 @@ 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));
         }
     }
 
@@ -187,7 +227,10 @@ class KeywordListSearchStrategy implements SearchStrategy {
 
         @Override
         public boolean contains(BibEntry entry) {
-            KeywordList fieldValue = entry.getFieldAsKeywords(searchField, keywordSeparator);
+            KeywordList fieldValue = entry.getFieldAsKeywords(
+                searchField,
+                keywordSeparator
+            );
             return ListUtil.allMatch(searchWords, fieldValue::contains);
         }
     }
diff --git a/src/main/java/org/jabref/model/metadata/ContentSelector.java b/src/main/java/org/jabref/model/metadata/ContentSelector.java
index d2c633f6396..8911d7f3a86 100644
--- a/src/main/java/org/jabref/model/metadata/ContentSelector.java
+++ b/src/main/java/org/jabref/model/metadata/ContentSelector.java
@@ -4,7 +4,6 @@
 import java.util.Collections;
 import java.util.List;
 import java.util.Objects;
-
 import org.jabref.model.entry.field.Field;
 
 public class ContentSelector {
@@ -31,8 +30,10 @@ 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 93c85250ae9..089fff1041a 100644
--- a/src/main/java/org/jabref/model/metadata/ContentSelectors.java
+++ b/src/main/java/org/jabref/model/metadata/ContentSelectors.java
@@ -5,7 +5,6 @@
 import java.util.Collections;
 import java.util.List;
 import java.util.Objects;
-
 import org.jabref.model.entry.field.Field;
 
 public class ContentSelectors {
@@ -89,9 +88,13 @@ public int hashCode() {
 
     @Override
     public String toString() {
-        return "ContentSelectors{" +
-                "contentSelectors=" + contentSelectors +
-                ", fieldsWithSelectors=" + getFieldsWithSelectors() +
-                '}';
+        return (
+            "ContentSelectors{" +
+            "contentSelectors=" +
+            contentSelectors +
+            ", fieldsWithSelectors=" +
+            getFieldsWithSelectors() +
+            '}'
+        );
     }
 }
diff --git a/src/main/java/org/jabref/model/metadata/MetaData.java b/src/main/java/org/jabref/model/metadata/MetaData.java
index faf537a59ef..cd27c29d96b 100644
--- a/src/main/java/org/jabref/model/metadata/MetaData.java
+++ b/src/main/java/org/jabref/model/metadata/MetaData.java
@@ -1,5 +1,8 @@
 package org.jabref.model.metadata;
 
+import com.google.common.eventbus.EventBus;
+import com.tobiasdiez.easybind.optional.OptionalBinding;
+import com.tobiasdiez.easybind.optional.OptionalWrapper;
 import java.nio.charset.Charset;
 import java.nio.file.Path;
 import java.util.Collections;
@@ -8,10 +11,8 @@
 import java.util.Map;
 import java.util.Objects;
 import java.util.Optional;
-
 import javafx.beans.property.ObjectProperty;
 import javafx.beans.property.SimpleObjectProperty;
-
 import org.jabref.architecture.AllowedToUseLogic;
 import org.jabref.logic.citationkeypattern.AbstractCitationKeyPattern;
 import org.jabref.logic.citationkeypattern.DatabaseCitationKeyPattern;
@@ -24,10 +25,6 @@
 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;
 
@@ -51,16 +48,22 @@ public class MetaData {
 
     public static final char ESCAPE_CHARACTER = '\\';
     public static final char SEPARATOR_CHARACTER = ';';
-    public static final String SEPARATOR_STRING = String.valueOf(SEPARATOR_CHARACTER);
+    public static final String SEPARATOR_STRING = String.valueOf(
+        SEPARATOR_CHARACTER
+    );
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(MetaData.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(
+        MetaData.class
+    );
 
     private final EventBus eventBus = new EventBus();
     private final Map<EntryType, String> citeKeyPatterns = new HashMap<>(); // <BibType, Pattern>
     private final Map<String, String> userFileDirectory = new HashMap<>(); // <User, FilePath>
     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 ObjectProperty<GroupTreeNode> groupsRoot =
+        new SimpleObjectProperty<>(null);
+    private final OptionalBinding<GroupTreeNode> groupsRootBinding =
+        new OptionalWrapper<>(groupsRoot);
     private Charset encoding;
     private SaveOrder saveOrder;
     private String defaultCiteKeyPattern;
@@ -104,8 +107,12 @@ public OptionalBinding<GroupTreeNode> groupsBinding() {
     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 ->
+            groupsRootBinding.invalidate()
+        );
+        root.subscribeToDescendantChanged(groupTreeNode ->
+            eventBus.post(new GroupUpdatedEvent(this))
+        );
         eventBus.post(new GroupUpdatedEvent(this));
         postChange();
     }
@@ -113,9 +120,12 @@ public void setGroups(GroupTreeNode root) {
     /**
      * @return the stored label patterns
      */
-    public AbstractCitationKeyPattern getCiteKeyPattern(GlobalCitationKeyPattern globalPattern) {
+    public AbstractCitationKeyPattern getCiteKeyPattern(
+        GlobalCitationKeyPattern globalPattern
+    ) {
         Objects.requireNonNull(globalPattern);
-        AbstractCitationKeyPattern bibtexKeyPattern = new DatabaseCitationKeyPattern(globalPattern);
+        AbstractCitationKeyPattern bibtexKeyPattern =
+            new DatabaseCitationKeyPattern(globalPattern);
 
         // Add stored key patterns
         citeKeyPatterns.forEach(bibtexKeyPattern::addCitationKeyPattern);
@@ -133,16 +143,23 @@ public void setCiteKeyPattern(AbstractCitationKeyPattern bibtexKeyPattern) {
         Objects.requireNonNull(bibtexKeyPattern);
 
         List<String> defaultValue = bibtexKeyPattern.getDefaultValue();
-        Map<EntryType, List<String>> nonDefaultPatterns = bibtexKeyPattern.getPatterns();
+        Map<EntryType, List<String>> nonDefaultPatterns =
+            bibtexKeyPattern.getPatterns();
         setCiteKeyPattern(defaultValue, nonDefaultPatterns);
     }
 
-    public void setCiteKeyPattern(List<String> defaultValue, Map<EntryType, List<String>> nonDefaultPatterns) {
+    public void setCiteKeyPattern(
+        List<String> defaultValue,
+        Map<EntryType, List<String>> nonDefaultPatterns
+    ) {
         // Remove all patterns from metadata
         citeKeyPatterns.clear();
 
         // Set new value if it is not a default value
-        for (Map.Entry<EntryType, List<String>> pattern : nonDefaultPatterns.entrySet()) {
+        for (Map.Entry<
+            EntryType,
+            List<String>
+        > pattern : nonDefaultPatterns.entrySet()) {
             citeKeyPatterns.put(pattern.getKey(), pattern.getValue().get(0));
         }
 
@@ -237,7 +254,10 @@ public void clearDefaultFileDirectory() {
     }
 
     public void setUserFileDirectory(String user, String path) {
-        userFileDirectory.put(Objects.requireNonNull(user), Objects.requireNonNull(path));
+        userFileDirectory.put(
+            Objects.requireNonNull(user),
+            Objects.requireNonNull(path)
+        );
         postChange();
     }
 
@@ -251,7 +271,10 @@ public Optional<Path> getLatexFileDirectory(String user) {
     }
 
     public void setLatexFileDirectory(String user, Path path) {
-        laTexFileDirectory.put(Objects.requireNonNull(user), Objects.requireNonNull(path));
+        laTexFileDirectory.put(
+            Objects.requireNonNull(user),
+            Objects.requireNonNull(path)
+        );
         postChange();
     }
 
@@ -312,7 +335,9 @@ public boolean getEncodingExplicitlySupplied() {
     /**
      * Sets the indication whether the encoding was set using "% Encoding: ..." or whether it was detected "magically"
      */
-    public void setEncodingExplicitlySupplied(boolean encodingExplicitlySupplied) {
+    public void setEncodingExplicitlySupplied(
+        boolean encodingExplicitlySupplied
+    ) {
         this.encodingExplicitlySupplied = encodingExplicitlySupplied;
     }
 
@@ -371,30 +396,88 @@ public boolean equals(Object o) {
             return false;
         }
         MetaData metaData = (MetaData) o;
-        return (isProtected == metaData.isProtected)
-                && Objects.equals(groupsRoot.getValue(), metaData.groupsRoot.getValue())
-                && Objects.equals(encoding, metaData.encoding)
-                && Objects.equals(encodingExplicitlySupplied, metaData.encodingExplicitlySupplied)
-                && Objects.equals(saveOrder, metaData.saveOrder)
-                && Objects.equals(citeKeyPatterns, metaData.citeKeyPatterns)
-                && Objects.equals(userFileDirectory, metaData.userFileDirectory)
-                && Objects.equals(laTexFileDirectory, metaData.laTexFileDirectory)
-                && Objects.equals(defaultCiteKeyPattern, metaData.defaultCiteKeyPattern)
-                && Objects.equals(saveActions, metaData.saveActions)
-                && (mode == metaData.mode)
-                && Objects.equals(defaultFileDirectory, metaData.defaultFileDirectory)
-                && Objects.equals(contentSelectors, metaData.contentSelectors)
-                && Objects.equals(versionDBStructure, metaData.versionDBStructure);
+        return (
+            (isProtected == metaData.isProtected) &&
+            Objects.equals(
+                groupsRoot.getValue(),
+                metaData.groupsRoot.getValue()
+            ) &&
+            Objects.equals(encoding, metaData.encoding) &&
+            Objects.equals(
+                encodingExplicitlySupplied,
+                metaData.encodingExplicitlySupplied
+            ) &&
+            Objects.equals(saveOrder, metaData.saveOrder) &&
+            Objects.equals(citeKeyPatterns, metaData.citeKeyPatterns) &&
+            Objects.equals(userFileDirectory, metaData.userFileDirectory) &&
+            Objects.equals(laTexFileDirectory, metaData.laTexFileDirectory) &&
+            Objects.equals(
+                defaultCiteKeyPattern,
+                metaData.defaultCiteKeyPattern
+            ) &&
+            Objects.equals(saveActions, metaData.saveActions) &&
+            (mode == metaData.mode) &&
+            Objects.equals(
+                defaultFileDirectory,
+                metaData.defaultFileDirectory
+            ) &&
+            Objects.equals(contentSelectors, metaData.contentSelectors) &&
+            Objects.equals(versionDBStructure, metaData.versionDBStructure)
+        );
     }
 
     @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 8186a2514c3..7f546833b3f 100644
--- a/src/main/java/org/jabref/model/metadata/SaveOrder.java
+++ b/src/main/java/org/jabref/model/metadata/SaveOrder.java
@@ -3,10 +3,8 @@
 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;
 
@@ -23,7 +21,9 @@
  */
 public class SaveOrder {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(SaveOrder.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(
+        SaveOrder.class
+    );
 
     private final OrderType orderType;
     private final List<SortCriterion> sortCriteria;
@@ -45,7 +45,10 @@ private SaveOrder(List<String> data) {
             orderType = OrderType.valueOf(data.get(0).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.get(0));
+                LOGGER.warn(
+                    "Could not parse sort order: {} - trying to parse the sort criteria",
+                    data.get(0)
+                );
                 orderType = OrderType.SPECIFIED;
             } else {
                 LOGGER.warn("Could not parse sort order: {}", data.get(0));
@@ -58,7 +61,12 @@ 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 +93,10 @@ 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 +108,14 @@ public int hashCode() {
 
     @Override
     public String toString() {
-        return "SaveOrderConfig{" + "orderType=" + orderType.toString() +
-                ", sortCriteria=" + sortCriteria +
-                '}';
+        return (
+            "SaveOrderConfig{" +
+            "orderType=" +
+            orderType.toString() +
+            ", sortCriteria=" +
+            sortCriteria +
+            '}'
+        );
     }
 
     /**
@@ -147,9 +162,15 @@ 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 +182,10 @@ 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 +210,10 @@ 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 4b5cafc6b9c..0f66fdd714a 100644
--- a/src/main/java/org/jabref/model/metadata/SelfContainedSaveOrder.java
+++ b/src/main/java/org/jabref/model/metadata/SelfContainedSaveOrder.java
@@ -1,7 +1,6 @@
 package org.jabref.model.metadata;
 
 import java.util.List;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -12,13 +11,20 @@
  */
 public class SelfContainedSaveOrder extends SaveOrder {
 
-    public static final Logger LOGGER = LoggerFactory.getLogger(SelfContainedSaveOrder.class);
+    public static final Logger LOGGER = LoggerFactory.getLogger(
+        SelfContainedSaveOrder.class
+    );
 
-    public SelfContainedSaveOrder(OrderType orderType, List<SortCriterion> sortCriteria) {
+    public SelfContainedSaveOrder(
+        OrderType orderType,
+        List<SortCriterion> sortCriteria
+    ) {
         super(orderType, sortCriteria);
         if (orderType == OrderType.TABLE) {
             LOGGER.debug("TABLE with sort criteria {}", sortCriteria);
-            throw new IllegalArgumentException("TABLE might require external lookup.");
+            throw new IllegalArgumentException(
+                "TABLE might require external lookup."
+            );
         }
     }
 
@@ -31,11 +37,20 @@ public static SelfContainedSaveOrder of(SaveOrder saveOrder) {
         if (saveOrder instanceof SelfContainedSaveOrder order) {
             return order;
         }
-        if ((saveOrder.getOrderType() == OrderType.TABLE) && (!saveOrder.getSortCriteria().isEmpty())) {
+        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());
+            return new SelfContainedSaveOrder(
+                OrderType.SPECIFIED,
+                saveOrder.getSortCriteria()
+            );
         }
-        return new SelfContainedSaveOrder(saveOrder.getOrderType(), saveOrder.getSortCriteria());
+        return new SelfContainedSaveOrder(
+            saveOrder.getOrderType(),
+            saveOrder.getSortCriteria()
+        );
     }
 }
diff --git a/src/main/java/org/jabref/model/openoffice/CitationEntry.java b/src/main/java/org/jabref/model/openoffice/CitationEntry.java
index a662563b0b2..036ee5dead4 100644
--- a/src/main/java/org/jabref/model/openoffice/CitationEntry.java
+++ b/src/main/java/org/jabref/model/openoffice/CitationEntry.java
@@ -17,7 +17,11 @@ public CitationEntry(String refMarkName, String context, String pageInfo) {
         this(refMarkName, context, Optional.ofNullable(pageInfo));
     }
 
-    public CitationEntry(String refMarkName, String context, Optional<String> pageInfo) {
+    public CitationEntry(
+        String refMarkName,
+        String context,
+        Optional<String> pageInfo
+    ) {
         this.refMarkName = refMarkName;
         this.context = context;
         this.pageInfo = pageInfo;
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 57fba4dc272..90aa4290435 100644
--- a/src/main/java/org/jabref/model/openoffice/backend/NamedRange.java
+++ b/src/main/java/org/jabref/model/openoffice/backend/NamedRange.java
@@ -1,14 +1,12 @@
 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 java.util.Optional;
+import org.jabref.model.openoffice.uno.CreationException;
+import org.jabref.model.openoffice.uno.NoDocumentException;
 
 /**
  * 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).
@@ -16,24 +14,19 @@
  * Note: currently only implemented for refence marks (in NamedRangeReferenceMark and NamedRangeManagerReferenceMark).
  */
 public interface NamedRange {
-
     String getRangeName();
 
     /**
      * @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 +34,17 @@ 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;
+        throws NoDocumentException, WrappedTargetException;
 
     /**
      * Note: create is in NamedRangeManager
      */
     void removeFromDocument(XTextDocument doc)
-            throws
-            WrappedTargetException,
-            NoDocumentException;
+        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 25a82b4ad19..f85eff39ac6 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,26 @@
 package org.jabref.model.openoffice.backend;
 
+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;
-
 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;
-
 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;
+    Optional<NamedRange> getNamedRangeFromDocument(
+        XTextDocument doc,
+        String markName
+    ) 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 14f5822de4f..502e91de9f4 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,11 @@ 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(String.format("<span lang=\"%s\">", locale) + ootext.toString() + "</span>");
+        return OOText.fromString(
+            String.format("<span lang=\"%s\">", locale) +
+            ootext.toString() +
+            "</span>"
+        );
     }
 
     /**
@@ -42,9 +45,11 @@ 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(String.format("<span oo:CharStyleName=\"%s\">", charStyle)
-                + ootext.toString()
-                + "</span>");
+        return OOText.fromString(
+            String.format("<span oo:CharStyleName=\"%s\">", charStyle) +
+            ootext.toString() +
+            "</span>"
+        );
     }
 
     /**
@@ -54,7 +59,10 @@ public static OOText paragraph(OOText ootext, String paraStyle) {
         if (StringUtil.isNullOrEmpty(paraStyle)) {
             return paragraph(ootext);
         }
-        String startTag = String.format("<p oo:ParaStyleName=\"%s\">", paraStyle);
+        String startTag = String.format(
+            "<p oo:ParaStyleName=\"%s\">",
+            paraStyle
+        );
         return OOText.fromString(startTag + ootext.toString() + "</p>");
     }
 
@@ -68,8 +76,13 @@ 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 = String.format("<oo:referenceToPageNumberOfReferenceMark target=\"%s\">", referenceMarkName);
+    public static OOText formatReferenceToPageNumberOfReferenceMark(
+        String referenceMarkName
+    ) {
+        String string = String.format(
+            "<oo:referenceToPageNumberOfReferenceMark target=\"%s\">",
+            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 2f6fb39f0b6..6bb1268936a 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;
@@ -42,6 +22,24 @@
 import com.sun.star.text.XText;
 import com.sun.star.text.XTextCursor;
 import com.sun.star.text.XTextDocument;
+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 org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -51,7 +49,9 @@
 @AllowedToUseAwt("Requires AWT for changing document properties")
 public class OOTextIntoOO {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(OOTextIntoOO.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(
+        OOTextIntoOO.class
+    );
 
     /**
      * "ParaStyleName" is an OpenOffice Property name.
@@ -78,25 +78,34 @@ public class OOTextIntoOO {
     private static final byte SUBSCRIPT_HEIGHT = (byte) 58;
 
     private static final String TAG_NAME_REGEXP =
-            "(?:b|i|em|tt|smallcaps|sup|sub|u|s|p|span|oo:referenceToPageNumberOfReferenceMark)";
+        "(?:b|i|em|tt|smallcaps|sup|sub|u|s|p|span|oo:referenceToPageNumberOfReferenceMark)";
 
     private static final String ATTRIBUTE_NAME_REGEXP =
-            "(?:oo:ParaStyleName|oo:CharStyleName|lang|style|target)";
+        "(?:oo:ParaStyleName|oo:CharStyleName|lang|style|target)";
 
     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 + ")*)"
-                    + ">");
-
-    private static final Pattern ATTRIBUTE_PATTERN =
-            Pattern.compile("\\s+(" + ATTRIBUTE_NAME_REGEXP + ")=" + ATTRIBUTE_VALUE_REGEXP);
-
-    private OOTextIntoOO() {
-    }
+    private static final Pattern HTML_TAG = 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() {}
 
     /**
      * Insert a text with formatting indicated by HTML-like tags, into a text at the position given by a cursor.
@@ -128,11 +137,11 @@ private OOTextIntoOO() {
      * @param position The cursor giving the insert location. Not modified.
      * @param ootext   The marked-up text to insert.
      */
-    public static void write(XTextDocument doc, XTextCursor position, OOText ootext)
-            throws
-            WrappedTargetException,
-            CreationException {
-
+    public static void write(
+        XTextDocument doc,
+        XTextCursor position,
+        OOText ootext
+    ) throws WrappedTargetException, CreationException {
         Objects.requireNonNull(doc);
         Objects.requireNonNull(ootext);
         Objects.requireNonNull(position);
@@ -167,7 +176,9 @@ public static void write(XTextDocument doc, XTextCursor position, OOText ootext)
             Objects.requireNonNull(tagName);
 
             // Attibutes parsed into (name,value) pairs.
-            List<OOPair<String, String>> attributes = parseAttributes(attributeListPart);
+            List<OOPair<String, String>> attributes = parseAttributes(
+                attributeListPart
+            );
 
             // Handle tags:
             switch (tagName) {
@@ -193,11 +204,15 @@ public static void write(XTextDocument doc, XTextCursor position, OOText ootext)
                     expectEnd.push("/" + tagName);
                     break;
                 case "u":
-                    formatStack.pushLayer(setCharUnderline(FontUnderline.SINGLE));
+                    formatStack.pushLayer(
+                        setCharUnderline(FontUnderline.SINGLE)
+                    );
                     expectEnd.push("/" + tagName);
                     break;
                 case "s":
-                    formatStack.pushLayer(setCharStrikeout(FontStrikeout.SINGLE));
+                    formatStack.pushLayer(
+                        setCharStrikeout(FontStrikeout.SINGLE)
+                    );
                     expectEnd.push("/" + tagName);
                     break;
                 case "/p":
@@ -217,12 +232,23 @@ public static void write(XTextDocument doc, XTextCursor position, OOText ootext)
                                 } else {
                                     if (setParagraphStyle(cursor, value)) {
                                         // Presumably tested already:
-                                        LOGGER.debug(String.format("oo:ParaStyleName=\"%s\" failed", value));
+                                        LOGGER.debug(
+                                            String.format(
+                                                "oo:ParaStyleName=\"%s\" failed",
+                                                value
+                                            )
+                                        );
                                     }
                                 }
                                 break;
                             default:
-                                LOGGER.warn(String.format("Unexpected attribute '%s' for <%s>", key, tagName));
+                                LOGGER.warn(
+                                    String.format(
+                                        "Unexpected attribute '%s' for <%s>",
+                                        key,
+                                        tagName
+                                    )
+                                );
                                 break;
                         }
                     }
@@ -232,8 +258,18 @@ 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(String.format("Unexpected attribute '%s' for <%s>", key, tagName));
+                            case "target" -> UnoCrossRef.insertReferenceToPageNumberOfReferenceMark(
+                                doc,
+                                value,
+                                cursor
+                            );
+                            default -> LOGGER.warn(
+                                String.format(
+                                    "Unexpected attribute '%s' for <%s>",
+                                    key,
+                                    tagName
+                                )
+                            );
                         }
                     }
                     break;
@@ -248,23 +284,35 @@ public static void write(XTextDocument doc, XTextCursor position, OOText ootext)
                         String key = pair.a;
                         String value = pair.b;
                         switch (key) {
-                            case "oo:CharStyleName" ->
-                                    // <span oo:CharStyleName="Standard">
-                                    settings.addAll(setCharStyleName(value));
-                            case "lang" ->
-                                    // <span lang="zxx">
-                                    // <span lang="en-US">
-                                    settings.addAll(setCharLocale(value));
+                            case "oo:CharStyleName" -> // <span oo:CharStyleName="Standard">
+                            settings.addAll(setCharStyleName(value));
+                            case "lang" -> // <span lang="zxx">
+                            // <span lang="en-US">
+                            settings.addAll(setCharLocale(value));
                             case "style" -> {
                                 // HTML-style small-caps
                                 if ("font-variant: small-caps".equals(value)) {
-                                    settings.addAll(setCharCaseMap(CaseMap.SMALLCAPS));
+                                    settings.addAll(
+                                        setCharCaseMap(CaseMap.SMALLCAPS)
+                                    );
                                     break;
                                 }
-                                LOGGER.warn(String.format("Unexpected value %s for attribute '%s' for <%s>",
-                                        value, key, tagName));
+                                LOGGER.warn(
+                                    String.format(
+                                        "Unexpected value %s for attribute '%s' for <%s>",
+                                        value,
+                                        key,
+                                        tagName
+                                    )
+                                );
                             }
-                            default -> LOGGER.warn(String.format("Unexpected attribute '%s' for <%s>", key, tagName));
+                            default -> LOGGER.warn(
+                                String.format(
+                                    "Unexpected attribute '%s' for <%s>",
+                                    key,
+                                    tagName
+                                )
+                            );
                         }
                     }
                     formatStack.pushLayer(settings);
@@ -283,14 +331,20 @@ public static void write(XTextDocument doc, XTextCursor position, OOText ootext)
                     formatStack.popLayer();
                     String expected = expectEnd.pop();
                     if (!tagName.equals(expected)) {
-                        LOGGER.warn(String.format("expected '<%s>', found '<%s>' after '%s'",
+                        LOGGER.warn(
+                            String.format(
+                                "expected '<%s>', found '<%s>' after '%s'",
                                 expected,
                                 tagName,
-                                currentSubstring));
+                                currentSubstring
+                            )
+                        );
                     }
                     break;
                 default:
-                    LOGGER.warn(String.format("ignoring unknown tag '<%s>'", tagName));
+                    LOGGER.warn(
+                        String.format("ignoring unknown tag '<%s>'", tagName)
+                    );
                     break;
             }
 
@@ -308,7 +362,12 @@ public static void write(XTextDocument doc, XTextCursor position, OOText ootext)
             for (String s : expectEnd) {
                 rest.insert(0, String.format("<%s>", s));
             }
-            LOGGER.warn(String.format("OOTextIntoOO.write: expectEnd stack is not empty at the end: %s%n", rest));
+            LOGGER.warn(
+                String.format(
+                    "OOTextIntoOO.write: expectEnd stack is not empty at the end: %s%n",
+                    rest
+                )
+            );
         }
     }
 
@@ -318,18 +377,26 @@ public static void write(XTextDocument doc, XTextCursor position, OOText ootext)
      * In particular, when filling the bibliography title and body.
      */
     public static void removeDirectFormatting(XTextCursor cursor) {
-        XMultiPropertyStates mpss = UnoCast.cast(XMultiPropertyStates.class, cursor).get();
+        XMultiPropertyStates mpss = UnoCast
+            .cast(XMultiPropertyStates.class, cursor)
+            .get();
 
-        XPropertySet propertySet = UnoCast.cast(XPropertySet.class, cursor).get();
-        XPropertyState xPropertyState = UnoCast.cast(XPropertyState.class, cursor).get();
+        XPropertySet propertySet = UnoCast
+            .cast(XPropertySet.class, cursor)
+            .get();
+        XPropertyState xPropertyState = UnoCast
+            .cast(XPropertyState.class, cursor)
+            .get();
 
         try {
             // 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);
         }
 
@@ -343,15 +410,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();
@@ -367,12 +436,20 @@ public static void removeDirectFormatting(XTextCursor cursor) {
                     continue;
                 }
             } catch (UnknownPropertyException ex) {
-                throw new IllegalStateException("Unexpected UnknownPropertyException", ex);
+                throw new IllegalStateException(
+                    "Unexpected UnknownPropertyException",
+                    ex
+                );
             }
             if (knownToFail.contains(p.Name)) {
                 continue;
             }
-            LOGGER.warn(String.format("OOTextIntoOO.removeDirectFormatting failed on '%s'", p.Name));
+            LOGGER.warn(
+                String.format(
+                    "OOTextIntoOO.removeDirectFormatting failed on '%s'",
+                    p.Name
+                )
+            );
         }
     }
 
@@ -391,35 +468,31 @@ static class MyPropertyStack {
          *
          */
         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 Bold */
-                "CharWeight",
-
-                /* Used for Italic */
-                "CharPosture",
-
-                /* 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 lang="zxx", to silence spellchecker. */
-                "CharLocale",
-
-                /* Used for CitationCharacterFormat.  */
-                "CharStyleName",
-
-                /* Used for <smallcaps> and <span style="font-variant: small-caps"> */
-                "CharCaseMap");
+            /* Used for SuperScript, SubScript.
+             *
+             * These three are interdependent: changing one may change others.
+             */
+            "CharEscapement",
+            "CharEscapementHeight",
+            "CharAutoEscapement",
+            /* used for Bold */
+            "CharWeight",
+            /* Used for Italic */
+            "CharPosture",
+            /* 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 lang="zxx", to silence spellchecker. */
+            "CharLocale",
+            /* Used for CitationCharacterFormat.  */
+            "CharStyleName",
+            /* Used for <smallcaps> and <span style="font-variant: small-caps"> */
+            "CharCaseMap"
+        );
 
         /**
          * The number of properties actually controlled.
@@ -442,7 +515,9 @@ static class MyPropertyStack {
         final Deque<ArrayList<Optional<Object>>> layers;
 
         MyPropertyStack(XTextCursor cursor) {
-            XPropertySet propertySet = UnoCast.cast(XPropertySet.class, cursor).get();
+            XPropertySet propertySet = UnoCast
+                .cast(XPropertySet.class, cursor)
+                .get();
             XPropertySetInfo propertySetInfo = propertySet.getPropertySetInfo();
 
             // On creation, initialize the property name -- index mapping.
@@ -462,7 +537,10 @@ static class MyPropertyStack {
             this.goodSize = nextIndex;
 
             this.goodNames = new String[goodSize];
-            for (Map.Entry<String, Integer> entry : goodNameToIndex.entrySet()) {
+            for (Map.Entry<
+                String,
+                Integer
+            > entry : goodNameToIndex.entrySet()) {
                 goodNames[entry.getValue()] = entry.getKey();
             }
 
@@ -473,18 +551,27 @@ static class MyPropertyStack {
             }
 
             // Get the initial state of the properties and add the first layer.
-            XMultiPropertyStates mpss = UnoCast.cast(XMultiPropertyStates.class, cursor).get();
+            XMultiPropertyStates mpss = UnoCast
+                .cast(XMultiPropertyStates.class, cursor)
+                .get();
             PropertyState[] propertyStates;
             try {
                 propertyStates = mpss.getPropertyStates(goodNames);
             } catch (UnknownPropertyException ex) {
-                throw new IllegalStateException("Caught unexpected UnknownPropertyException", ex);
+                throw new IllegalStateException(
+                    "Caught unexpected UnknownPropertyException",
+                    ex
+                );
             }
 
-            XMultiPropertySet mps = UnoCast.cast(XMultiPropertySet.class, cursor).get();
+            XMultiPropertySet mps = UnoCast
+                .cast(XMultiPropertySet.class, cursor)
+                .get();
             Object[] initialValues = mps.getPropertyValues(goodNames);
 
-            ArrayList<Optional<Object>> initialValuesOpt = new ArrayList<>(goodSize);
+            ArrayList<Optional<Object>> initialValuesOpt = new ArrayList<>(
+                goodSize
+            );
 
             for (int i = 0; i < goodSize; i++) {
                 if (propertyStates[i] == PropertyState.DIRECT_VALUE) {
@@ -510,7 +597,12 @@ void pushLayer(List<OOPair<String, Object>> settings) {
                 String name = pair.a;
                 Integer index = goodNameToIndex.get(name);
                 if (index == null) {
-                    LOGGER.warn(String.format("pushLayer: '%s' is not in goodNameToIndex", name));
+                    LOGGER.warn(
+                        String.format(
+                            "pushLayer: '%s' is not in goodNameToIndex",
+                            name
+                        )
+                    );
                     continue;
                 }
                 Object newValue = pair.b;
@@ -536,8 +628,12 @@ void popLayer() {
          * The idea is to minimize the number of calls to OpenOffice.
          */
         void apply(XTextCursor cursor) {
-            XMultiPropertySet mps = UnoCast.cast(XMultiPropertySet.class, cursor).get();
-            XMultiPropertyStates mpss = UnoCast.cast(XMultiPropertyStates.class, cursor).get();
+            XMultiPropertySet mps = UnoCast
+                .cast(XMultiPropertySet.class, cursor)
+                .get();
+            XMultiPropertyStates mpss = UnoCast
+                .cast(XMultiPropertyStates.class, cursor)
+                .get();
             ArrayList<Optional<Object>> topLayer = layers.peek();
             try {
                 // select values to be set
@@ -559,7 +655,10 @@ void apply(XTextCursor cursor) {
                 mpss.setPropertiesToDefault(delNamesArray);
                 mps.setPropertyValues(namesArray, values.toArray());
             } catch (UnknownPropertyException ex) {
-                LOGGER.warn("UnknownPropertyException in MyPropertyStack.apply", ex);
+                LOGGER.warn(
+                    "UnknownPropertyException in MyPropertyStack.apply",
+                    ex
+                );
             } catch (PropertyVetoException ex) {
                 LOGGER.warn("PropertyVetoException in MyPropertyStack.apply");
             } catch (WrappedTargetException ex) {
@@ -581,7 +680,9 @@ Optional<Object> getPropertyValue(String name) {
     /**
      * Parse HTML-like attributes to a list of (name,value) pairs.
      */
-    private static List<OOPair<String, String>> parseAttributes(String attributes) {
+    private static List<OOPair<String, String>> parseAttributes(
+        String attributes
+    ) {
         List<OOPair<String, String>> res = new ArrayList<>();
         if (attributes == null) {
             return res;
@@ -598,14 +699,19 @@ 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 {
-        XPropertyState xPropertyState = UnoCast.cast(XPropertyState.class, cursor).get();
+    private static boolean isPropertyDefault(
+        XTextCursor cursor,
+        String propertyName
+    ) 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;
     }
@@ -620,7 +726,9 @@ private static List<OOPair<String, Object>> setCharWeight(float value) {
         return settings;
     }
 
-    private static List<OOPair<String, Object>> setCharPosture(FontSlant value) {
+    private static List<OOPair<String, Object>> setCharPosture(
+        FontSlant value
+    ) {
         List<OOPair<String, Object>> settings = new ArrayList<>();
         settings.add(new OOPair<>("CharPosture", value));
         return settings;
@@ -669,7 +777,9 @@ private static List<OOPair<String, Object>> setCharLocale(Locale value) {
      */
     private static List<OOPair<String, Object>> setCharLocale(String value) {
         if (StringUtil.isNullOrEmpty(value)) {
-            throw new java.lang.IllegalArgumentException("setCharLocale \"\" or null");
+            throw new java.lang.IllegalArgumentException(
+                "setCharLocale \"\" or null"
+            );
         }
         String[] parts = value.split("-");
         String language = parts.length > 0 ? parts[0] : "";
@@ -684,26 +794,33 @@ 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);
+            .getPropertyValue(CHAR_ESCAPEMENT)
+            .map(e -> (short) e);
 
         Optional<Byte> oldHeight = formatStack
-                .getPropertyValue(CHAR_ESCAPEMENT_HEIGHT)
-                .map(e -> (byte) e);
+            .getPropertyValue(CHAR_ESCAPEMENT_HEIGHT)
+            .map(e -> (byte) e);
 
         if (relative && (value.isPresent() || height.isPresent())) {
-            double oldHeightFloat = oldHeight.orElse(CHAR_ESCAPEMENT_HEIGHT_DEFAULT) * 0.01;
-            double oldValueFloat = oldValue.orElse(CHAR_ESCAPEMENT_VALUE_DEFAULT);
+            double oldHeightFloat =
+                oldHeight.orElse(CHAR_ESCAPEMENT_HEIGHT_DEFAULT) * 0.01;
+            double oldValueFloat = oldValue.orElse(
+                CHAR_ESCAPEMENT_VALUE_DEFAULT
+            );
             double heightFloat = height.orElse(CHAR_ESCAPEMENT_HEIGHT_DEFAULT);
             double valueFloat = value.orElse(CHAR_ESCAPEMENT_VALUE_DEFAULT);
             byte newHeight = (byte) Math.round(heightFloat * oldHeightFloat);
-            short newValue = (short) Math.round(valueFloat * oldHeightFloat + oldValueFloat);
+            short newValue = (short) Math.round(
+                valueFloat * oldHeightFloat + oldValueFloat
+            );
             if (value.isPresent()) {
                 settings.add(new OOPair<>(CHAR_ESCAPEMENT, newValue));
             }
@@ -715,54 +832,80 @@ private static List<OOPair<String, Object>> setCharEscapement(Optional<Short> va
                 settings.add(new OOPair<>(CHAR_ESCAPEMENT, value.get()));
             }
             if (height.isPresent()) {
-                settings.add(new OOPair<>(CHAR_ESCAPEMENT_HEIGHT, height.get()));
+                settings.add(
+                    new OOPair<>(CHAR_ESCAPEMENT_HEIGHT, height.get())
+                );
             }
         }
         return settings;
     }
 
-    private static List<OOPair<String, Object>> setSubScript(MyPropertyStack formatStack) {
-        return setCharEscapement(Optional.of(SUBSCRIPT_VALUE),
-                Optional.of(SUBSCRIPT_HEIGHT),
-                true,
-                formatStack);
+    private static List<OOPair<String, Object>> setSubScript(
+        MyPropertyStack 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);
+    private static List<OOPair<String, Object>> setSuperScript(
+        MyPropertyStack formatStack
+    ) {
+        return setCharEscapement(
+            Optional.of(SUPERSCRIPT_VALUE),
+            Optional.of(SUPERSCRIPT_HEIGHT),
+            true,
+            formatStack
+        );
     }
 
     /**
      * @return true on failure
      */
-    public static boolean setParagraphStyle(XTextCursor cursor, String paragraphStyle) {
+    public static boolean setParagraphStyle(
+        XTextCursor cursor,
+        String paragraphStyle
+    ) {
         final boolean FAIL = true;
         final boolean PASS = false;
 
-        XParagraphCursor paragraphCursor = UnoCast.cast(XParagraphCursor.class, cursor).get();
-        XPropertySet propertySet = UnoCast.cast(XPropertySet.class, paragraphCursor).get();
+        XParagraphCursor paragraphCursor = UnoCast
+            .cast(XParagraphCursor.class, cursor)
+            .get();
+        XPropertySet propertySet = UnoCast
+            .cast(XPropertySet.class, paragraphCursor)
+            .get();
         try {
             propertySet.setPropertyValue(PARA_STYLE_NAME, paragraphStyle);
             return PASS;
-        } catch (UnknownPropertyException
-                | PropertyVetoException
-                | com.sun.star.lang.IllegalArgumentException
-                | WrappedTargetException ex) {
+        } catch (
+            UnknownPropertyException
+            | PropertyVetoException
+            | com.sun.star.lang.IllegalArgumentException
+            | WrappedTargetException ex
+        ) {
             return FAIL;
         }
     }
 
     private static void insertParagraphBreak(XText text, XTextCursor cursor) {
         try {
-            text.insertControlCharacter(cursor, ControlCharacter.PARAGRAPH_BREAK, true);
+            text.insertControlCharacter(
+                cursor,
+                ControlCharacter.PARAGRAPH_BREAK,
+                true
+            );
         } catch (com.sun.star.lang.IllegalArgumentException ex) {
             // 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 12c340376c3..54a6361cca5 100644
--- a/src/main/java/org/jabref/model/openoffice/rangesort/FunctionalTextViewCursor.java
+++ b/src/main/java/org/jabref/model/openoffice/rangesort/FunctionalTextViewCursor.java
@@ -1,17 +1,15 @@
 package org.jabref.model.openoffice.rangesort;
 
+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 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;
-
 /*
  * 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
@@ -52,9 +50,11 @@ 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;
@@ -68,17 +68,27 @@ private FunctionalTextViewCursor(XTextRange initialPosition,
      * On failure the constructor restores the selection. On success, the caller may want to call
      * instance.restore() after finished using the cursor.
      */
-    public static OOResult<FunctionalTextViewCursor, String> get(XTextDocument doc) {
+    public static OOResult<FunctionalTextViewCursor, String> get(
+        XTextDocument doc
+    ) {
         Objects.requireNonNull(doc);
 
         XTextRange initialPosition = null;
-        XServiceInfo initialSelection = UnoSelection.getSelectionAsXServiceInfo(doc).orElse(null);
+        XServiceInfo initialSelection = UnoSelection
+            .getSelectionAsXServiceInfo(doc)
+            .orElse(null);
         XTextViewCursor viewCursor = UnoCursor.getViewCursor(doc).orElse(null);
         if (viewCursor != null) {
             try {
                 initialPosition = UnoCursor.createTextCursorByRange(viewCursor);
                 viewCursor.getStart();
-                return OOResult.ok(new FunctionalTextViewCursor(initialPosition, initialSelection, viewCursor));
+                return OOResult.ok(
+                    new FunctionalTextViewCursor(
+                        initialPosition,
+                        initialSelection,
+                        viewCursor
+                    )
+                );
             } catch (com.sun.star.uno.RuntimeException ex) {
                 // bad cursor
                 viewCursor = null;
@@ -87,10 +97,14 @@ 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)) {
+        } else if (
+            Arrays
+                .stream(initialSelection.getSupportedServiceNames())
+                .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();
@@ -108,23 +122,33 @@ public static OOResult<FunctionalTextViewCursor, String> get(XTextDocument doc)
             viewCursor.getStart();
         } catch (com.sun.star.uno.RuntimeException ex) {
             restore(doc, initialPosition, initialSelection);
-            String errorMessage = "The view cursor failed the functionality test";
+            String errorMessage =
+                "The view cursor failed the functionality test";
             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);
+            XTextViewCursor viewCursor = UnoCursor
+                .getViewCursor(doc)
+                .orElse(null);
             if (viewCursor != null) {
                 viewCursor.gotoRange(initialPosition, false);
                 return;
@@ -137,6 +161,10 @@ private static void restore(XTextDocument doc,
 
     /* Restore initial state of viewCursor (possibly by restoring selection) if possible. */
     public void restore(XTextDocument doc) {
-        FunctionalTextViewCursor.restore(doc, initialPosition, initialSelection);
+        FunctionalTextViewCursor.restore(
+            doc,
+            initialPosition,
+            initialSelection
+        );
     }
 }
diff --git a/src/main/java/org/jabref/model/openoffice/rangesort/RangeOverlap.java b/src/main/java/org/jabref/model/openoffice/rangesort/RangeOverlap.java
index 1f4f3ae0ed4..331fbd18335 100644
--- a/src/main/java/org/jabref/model/openoffice/rangesort/RangeOverlap.java
+++ b/src/main/java/org/jabref/model/openoffice/rangesort/RangeOverlap.java
@@ -6,10 +6,14 @@
  * Used in reporting range overlaps.
  */
 public class RangeOverlap<V> {
+
     public final RangeOverlapKind kind;
     public final List<V> valuesForOverlappingRanges;
 
-    public RangeOverlap(RangeOverlapKind kind, List<V> valuesForOverlappingRanges) {
+    public RangeOverlap(
+        RangeOverlapKind kind,
+        List<V> valuesForOverlappingRanges
+    ) {
         this.kind = kind;
         this.valuesForOverlappingRanges = valuesForOverlappingRanges;
     }
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 8108befdbd3..fab56e2df6f 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,18 @@
 package org.jabref.model.openoffice.rangesort;
 
+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;
-
 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;
-
 public class RangeOverlapBetween {
 
-    private RangeOverlapBetween() {
-    }
+    private RangeOverlapBetween() {}
 
     /**
      * Check for any overlap between two sets of XTextRange values.
@@ -24,12 +21,12 @@ 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<>();
 
         if (fewHolders.isEmpty()) {
@@ -40,13 +37,19 @@ List<RangeOverlap<V>> findFirst(XTextDocument doc,
          * Cache all we need to know about fewHolders. We are trying to minimize the number of calls
          * to LO.
          */
-        List<OOTuple3<XText, XTextRangeCompare, V>> fewTuples = new ArrayList<>(fewHolders.size());
+        List<OOTuple3<XText, XTextRangeCompare, V>> fewTuples = new ArrayList<>(
+            fewHolders.size()
+        );
 
         for (V aHolder : fewHolders) {
             XText aText = aHolder.getRange().getText();
-            fewTuples.add(new OOTuple3<>(aText,
+            fewTuples.add(
+                new OOTuple3<>(
+                    aText,
                     UnoCast.cast(XTextRangeCompare.class, aText).get(),
-                    aHolder));
+                    aHolder
+                )
+            );
         }
 
         /*
@@ -66,30 +69,54 @@ List<RangeOverlap<V>> findFirst(XTextDocument doc,
                 if (aText != bText) {
                     continue;
                 }
-                int abEndToStart = UnoTextRange.compareStartsUnsafe(cmp, aRange.getEnd(), bRangeStart);
-                if (abEndToStart < 0 || (!includeTouching && (abEndToStart == 0))) {
+                int abEndToStart = UnoTextRange.compareStartsUnsafe(
+                    cmp,
+                    aRange.getEnd(),
+                    bRangeStart
+                );
+                if (
+                    abEndToStart < 0 ||
+                    (!includeTouching && (abEndToStart == 0))
+                ) {
                     continue;
                 }
-                int baEndToStart = UnoTextRange.compareStartsUnsafe(cmp, bRangeEnd, aRange.getStart());
-                if (baEndToStart < 0 || (!includeTouching && (baEndToStart == 0))) {
+                int baEndToStart = UnoTextRange.compareStartsUnsafe(
+                    cmp,
+                    bRangeEnd,
+                    aRange.getStart()
+                );
+                if (
+                    baEndToStart < 0 ||
+                    (!includeTouching && (baEndToStart == 0))
+                ) {
                     continue;
                 }
 
-                boolean equal = UnoTextRange.compareStartsThenEndsUnsafe(cmp, aRange, bRange) == 0;
+                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 ?
                 //
                 // 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);
                 valuesForOverlappingRanges.add(bHolder);
 
-                result.add(new RangeOverlap<>(kind, valuesForOverlappingRanges));
+                result.add(
+                    new RangeOverlap<>(kind, valuesForOverlappingRanges)
+                );
                 return result;
             }
         }
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 1098a85a87f..46c8f08816e 100644
--- a/src/main/java/org/jabref/model/openoffice/rangesort/RangeOverlapKind.java
+++ b/src/main/java/org/jabref/model/openoffice/rangesort/RangeOverlapKind.java
@@ -1,7 +1,6 @@
 package org.jabref.model.openoffice.rangesort;
 
 public enum RangeOverlapKind {
-
     /**
      * The ranges share a boundary
      */
@@ -15,6 +14,5 @@ public enum RangeOverlapKind {
     /**
      * They cover the same XTextRange
      */
-    EQUAL_RANGE
+    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 249f9484534..b74fb7a7526 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,16 @@
 package org.jabref.model.openoffice.rangesort;
 
+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;
-
 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;
-
 public class RangeOverlapWithin {
 
-    private RangeOverlapWithin() {
-    }
+    private RangeOverlapWithin() {}
 
     /**
      * Report identical, overlapping or touching ranges between elements of rangeHolders.
@@ -26,13 +23,16 @@ 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) {
-
-        RangeSort.RangePartitions<V> partitions = RangeSort.partitionAndSortRanges(rangeHolders);
+    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);
 
         return findOverlappingRanges(partitions, reportAtMost, includeTouching);
     }
@@ -45,10 +45,13 @@ 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 +60,12 @@ List<RangeOverlap<V>> findOverlappingRanges(RangeSort.RangePartitions<V> input,
             if (partition.isEmpty()) {
                 continue;
             }
-            XTextRangeCompare cmp = UnoCast.cast(XTextRangeCompare.class,
-                    partition.get(0).getRange().getText()).get();
+            XTextRangeCompare cmp = UnoCast
+                .cast(
+                    XTextRangeCompare.class,
+                    partition.get(0).getRange().getText()
+                )
+                .get();
 
             for (int i = 0; i < (partition.size() - 1); i++) {
                 V aHolder = partition.get(i);
@@ -67,22 +74,35 @@ List<RangeOverlap<V>> findOverlappingRanges(RangeSort.RangePartitions<V> input,
                 XTextRange bRange = bHolder.getRange();
 
                 // check equal values
-                int cmpResult = UnoTextRange.compareStartsThenEndsUnsafe(cmp, aRange, bRange);
+                int cmpResult = UnoTextRange.compareStartsThenEndsUnsafe(
+                    cmp,
+                    aRange,
+                    bRange
+                );
                 if (cmpResult == 0) {
                     List<V> aValues = new ArrayList<>();
                     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++;
                     }
-                    result.add(new RangeOverlap<>(RangeOverlapKind.EQUAL_RANGE, aValues));
+                    result.add(
+                        new RangeOverlap<>(
+                            RangeOverlapKind.EQUAL_RANGE,
+                            aValues
+                        )
+                    );
                     if (atMost > 0 && result.size() >= atMost) {
                         return result;
                     }
@@ -91,16 +111,25 @@ 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 9657f90a212..e1006cdf035 100644
--- a/src/main/java/org/jabref/model/openoffice/rangesort/RangeSort.java
+++ b/src/main/java/org/jabref/model/openoffice/rangesort/RangeSort.java
@@ -1,37 +1,37 @@
 package org.jabref.model.openoffice.rangesort;
 
+import com.sun.star.text.XText;
+import com.sun.star.text.XTextRangeCompare;
 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.
      * <p>
      * Note: since we only look at the ranges, this comparison is generally not consistent with `equals` on the RangeHolders. Probably should not be used for key comparison in {@code TreeMap<RangeHolder>} or {@code Set<RangeHolder>}
      */
-    private static class HolderComparatorWithinPartition implements Comparator<RangeHolder> {
+    private static class HolderComparatorWithinPartition
+        implements Comparator<RangeHolder> {
 
         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);
         }
 
         /**
@@ -39,7 +39,11 @@ private static class HolderComparatorWithinPartition implements Comparator<Range
          */
         @Override
         public int compare(RangeHolder a, RangeHolder b) {
-            return UnoTextRange.compareStartsThenEndsUnsafe(cmp, a.getRange(), b.getRange());
+            return UnoTextRange.compareStartsThenEndsUnsafe(
+                cmp,
+                a.getRange(),
+                b.getRange()
+            );
         }
     }
 
@@ -48,7 +52,9 @@ public int compare(RangeHolder a, RangeHolder b) {
      * <p>
      * Note: RangeHolder.getRange() is called many times.
      */
-    public static <V extends RangeHolder> void sortWithinPartition(List<V> rangeHolders) {
+    public static <V extends RangeHolder> void sortWithinPartition(
+        List<V> rangeHolders
+    ) {
         if (rangeHolders.isEmpty()) {
             return;
         }
@@ -60,6 +66,7 @@ public static <V extends RangeHolder> void sortWithinPartition(List<V> rangeHold
      * Represent a partitioning of RangeHolders by XText
      */
     public static class RangePartitions<V extends RangeHolder> {
+
         private final Map<XText, List<V>> partitions;
 
         public RangePartitions() {
@@ -68,7 +75,10 @@ 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);
         }
 
@@ -80,7 +90,9 @@ public List<List<V>> getPartitions() {
     /**
      * Partition RangeHolders by the corresponding XText.
      */
-    public static <V extends RangeHolder> RangePartitions<V> partitionRanges(List<V> holders) {
+    public static <V extends RangeHolder> RangePartitions<V> partitionRanges(
+        List<V> holders
+    ) {
         RangePartitions<V> result = new RangePartitions<>();
         for (V holder : holders) {
             result.add(holder);
@@ -91,7 +103,9 @@ 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 45692ed1703..3ed329f3733 100644
--- a/src/main/java/org/jabref/model/openoffice/rangesort/RangeSortVisual.java
+++ b/src/main/java/org/jabref/model/openoffice/rangesort/RangeSortVisual.java
@@ -1,14 +1,12 @@
 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 java.util.ArrayList;
+import java.util.List;
+import org.jabref.model.openoffice.uno.UnoScreenRefresh;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -21,10 +19,11 @@
  */
 public class RangeSortVisual {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(RangeSortVisual.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(
+        RangeSortVisual.class
+    );
 
-    private RangeSortVisual() {
-    }
+    private RangeSortVisual() {}
 
     /**
      * Sort the input {@code inputs} visually.
@@ -33,12 +32,14 @@ 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);
         }
@@ -55,12 +56,17 @@ public static <T> List<RangeSortable<T>> visualSort(List<RangeSortable<T>> input
         fcursor.restore(doc);
 
         // order by position
-        ArrayList<ComparableMark<RangeSortable<T>>> comparableMarks = new ArrayList<>(inputSize);
+        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),
+            comparableMarks.add(
+                new ComparableMark<>(
+                    positions.get(i),
                     input.getIndexInPosition(),
-                    input));
+                    input
+                )
+            );
         }
         comparableMarks.sort(RangeSortVisual::compareTopToBottomLeftToRight);
 
@@ -71,7 +77,9 @@ public static <T> List<RangeSortable<T>> visualSort(List<RangeSortable<T>> input
         }
 
         if (result.size() != inputSize) {
-            throw new IllegalStateException("visualSort: result.size() != inputSize");
+            throw new IllegalStateException(
+                "visualSort: result.size() != inputSize"
+            );
         }
 
         return result;
@@ -89,12 +97,18 @@ public static <T> List<RangeSortable<T>> visualSort(List<RangeSortable<T>> input
      * @param range  Location.
      * @param cursor To get the position, we need az XTextViewCursor. It will be moved to the range.
      */
-    private static Point findPositionOfTextRange(XTextRange range, XTextViewCursor cursor) {
+    private static Point findPositionOfTextRange(
+        XTextRange range,
+        XTextViewCursor cursor
+    ) {
         cursor.gotoRange(range, false);
         return cursor.getPosition();
     }
 
-    private static <T> int compareTopToBottomLeftToRight(ComparableMark<T> a, ComparableMark<T> b) {
+    private static <T> int compareTopToBottomLeftToRight(
+        ComparableMark<T> a,
+        ComparableMark<T> b
+    ) {
         if (a.position.Y != b.position.Y) {
             return a.position.Y - b.position.Y;
         }
diff --git a/src/main/java/org/jabref/model/openoffice/rangesort/RangeSortable.java b/src/main/java/org/jabref/model/openoffice/rangesort/RangeSortable.java
index 15482f0a3e6..b80b84b019d 100644
--- a/src/main/java/org/jabref/model/openoffice/rangesort/RangeSortable.java
+++ b/src/main/java/org/jabref/model/openoffice/rangesort/RangeSortable.java
@@ -6,7 +6,6 @@
  * This is what {@code visualSort} needs in its input.
  */
 public interface RangeSortable<T> extends RangeHolder {
-
     /**
      * The XTextRange
      * <p>
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 54bfb937572..89f0071c177 100644
--- a/src/main/java/org/jabref/model/openoffice/style/Citation.java
+++ b/src/main/java/org/jabref/model/openoffice/style/Citation.java
@@ -2,13 +2,14 @@
 
 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 {
+public class Citation
+    implements
+        ComparableCitation, CitationMarkerEntry, CitationMarkerNumericEntry {
 
     /**
      * key in database
@@ -69,18 +70,25 @@ public Optional<BibEntry> getBibEntry() {
         return db.map(citationLookupResult -> citationLookupResult.entry);
     }
 
-    public static Optional<CitationLookupResult> lookup(BibDatabase database, String key) {
+    public static Optional<CitationLookupResult> lookup(
+        BibDatabase database,
+        String key
+    ) {
         return database
-                .getEntryByCitationKey(key)
-                .map(bibEntry -> new CitationLookupResult(bibEntry, 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();
+    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();
     }
 
     public void lookupInDatabases(List<BibDatabase> databases) {
@@ -121,9 +129,13 @@ public void setUniqueLetter(Optional<String> uniqueLetter) {
     }
 
     public void setPageInfo(Optional<OOText> pageInfo) {
-        Optional<OOText> normalizedPageInfo = PageInfo.normalizePageInfo(pageInfo);
+        Optional<OOText> normalizedPageInfo = PageInfo.normalizePageInfo(
+            pageInfo
+        );
         if (!normalizedPageInfo.equals(pageInfo)) {
-            throw new IllegalArgumentException("setPageInfo argument is not normalized");
+            throw new IllegalArgumentException(
+                "setPageInfo argument is not normalized"
+            );
         }
         this.pageInfo = normalizedPageInfo;
     }
@@ -135,7 +147,9 @@ public void setIsFirstAppearanceOfSource(boolean value) {
     /*
      * Setters for CitationGroups.distribute()
      */
-    public static void setLookupResult(OOPair<Citation, Optional<CitationLookupResult>> pair) {
+    public static void setLookupResult(
+        OOPair<Citation, Optional<CitationLookupResult>> pair
+    ) {
         Citation citation = pair.a;
         citation.db = pair.b;
     }
@@ -145,7 +159,9 @@ public static void setNumber(OOPair<Citation, Optional<Integer>> pair) {
         citation.number = pair.b;
     }
 
-    public static void setUniqueLetter(OOPair<Citation, Optional<String>> pair) {
+    public static void setUniqueLetter(
+        OOPair<Citation, Optional<String>> pair
+    ) {
         Citation citation = pair.a;
         citation.uniqueLetter = pair.b;
     }
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 4fbb62d94a5..7ea971e895e 100644
--- a/src/main/java/org/jabref/model/openoffice/style/CitationGroup.java
+++ b/src/main/java/org/jabref/model/openoffice/style/CitationGroup.java
@@ -4,7 +4,6 @@
 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;
@@ -55,16 +54,20 @@ 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;
-        this.citationsInStorageOrder = Collections.unmodifiableList(citationsInStorageOrder);
-        this.localOrder = OOListUtil.makeIndices(citationsInStorageOrder.size());
+        this.citationsInStorageOrder =
+            Collections.unmodifiableList(citationsInStorageOrder);
+        this.localOrder =
+            OOListUtil.makeIndices(citationsInStorageOrder.size());
         this.referenceMarkNameForLinking = referenceMarkNameForLinking;
         this.indexInGlobalOrder = Optional.empty();
         this.citationMarker = Optional.empty();
@@ -92,8 +95,11 @@ 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);
@@ -132,7 +138,9 @@ public Optional<String> getReferenceMarkNameForLinking() {
         return referenceMarkNameForLinking;
     }
 
-    public void setReferenceMarkNameForLinking(Optional<String> referenceMarkNameForLinking) {
+    public void setReferenceMarkNameForLinking(
+        Optional<String> referenceMarkNameForLinking
+    ) {
         this.referenceMarkNameForLinking = referenceMarkNameForLinking;
     }
 
diff --git a/src/main/java/org/jabref/model/openoffice/style/CitationGroupId.java b/src/main/java/org/jabref/model/openoffice/style/CitationGroupId.java
index 6c271b12267..75fe000093b 100644
--- a/src/main/java/org/jabref/model/openoffice/style/CitationGroupId.java
+++ b/src/main/java/org/jabref/model/openoffice/style/CitationGroupId.java
@@ -4,6 +4,7 @@
  * Identifies a citation group in a document.
  */
 public class CitationGroupId {
+
     String groupId;
 
     public CitationGroupId(String groupId) {
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 7ffe943dad6..e2c6073e32a 100644
--- a/src/main/java/org/jabref/model/openoffice/style/CitationGroups.java
+++ b/src/main/java/org/jabref/model/openoffice/style/CitationGroups.java
@@ -8,12 +8,10 @@
 import java.util.Objects;
 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;
 
@@ -24,7 +22,9 @@
  */
 public class CitationGroups {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(CitationGroups.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(
+        CitationGroups.class
+    );
 
     private final Map<CitationGroupId, CitationGroup> citationGroupsUnordered;
 
@@ -55,17 +55,22 @@ 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);
             if (group == null) {
-                LOGGER.warn("CitationGroups.distributeToCitations: group missing");
+                LOGGER.warn(
+                    "CitationGroups.distributeToCitations: group missing"
+                );
                 continue;
             }
-            Citation cit = group.citationsInStorageOrder.get(p.storageIndexInGroup);
+            Citation cit = group.citationsInStorageOrder.get(
+                p.storageIndexInGroup
+            );
             fun.accept(new OOPair<>(cit, value));
         }
     }
@@ -85,7 +90,6 @@ public void lookupCitations(List<BibDatabase> databases) {
         CitedKeys cks = getCitedKeysUnordered();
         cks.lookupInDatabases(databases);
         cks.distributeLookupResults(this);
-
         // (2) lookup each citation directly
         //
         // CitationDatabaseLookupResult for the same citation key may be a different object:
@@ -110,7 +114,9 @@ public List<CitationGroup> getCitationGroupsUnordered() {
      */
     public List<CitationGroup> getCitationGroupsInGlobalOrder() {
         if (globalOrder.isEmpty()) {
-            throw new IllegalStateException("getCitationGroupsInGlobalOrder: not ordered yet");
+            throw new IllegalStateException(
+                "getCitationGroupsInGlobalOrder: not ordered yet"
+            );
         }
         return OOListUtil.map(globalOrder.get(), citationGroupsUnordered::get);
     }
@@ -123,14 +129,18 @@ 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);
 
         // Propagate to each CitationGroup
         for (int i = 0; i < globalOrder.size(); i++) {
             CitationGroupId groupId = globalOrder.get(i);
-            citationGroupsUnordered.get(groupId).setIndexInGlobalOrder(Optional.of(i));
+            citationGroupsUnordered
+                .get(groupId)
+                .setIndexInGlobalOrder(Optional.of(i));
         }
     }
 
@@ -156,7 +166,10 @@ public CitedKeys getCitedKeysUnordered() {
             int storageIndexInGroup = 0;
             for (Citation cit : group.citationsInStorageOrder) {
                 String key = cit.citationKey;
-                CitationPath path = new CitationPath(group.groupId, storageIndexInGroup);
+                CitationPath path = new CitationPath(
+                    group.groupId,
+                    storageIndexInGroup
+                );
                 if (res.containsKey(key)) {
                     res.get(key).addPath(path, cit);
                 } else {
@@ -173,7 +186,9 @@ public CitedKeys getCitedKeysUnordered() {
      */
     public CitedKeys getCitedKeysSortedInOrderOfAppearance() {
         if (!hasGlobalOrder()) {
-            throw new IllegalStateException("getSortedCitedKeys: no globalOrder");
+            throw new IllegalStateException(
+                "getSortedCitedKeys: no globalOrder"
+            );
         }
         LinkedHashMap<String, CitedKey> res = new LinkedHashMap<>();
         for (CitationGroup group : getCitationGroupsInGlobalOrder()) {
@@ -212,8 +227,10 @@ 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();
@@ -224,9 +241,13 @@ public void createNumberedBibliographySortedInOrderOfAppearance() {
     /**
      * precondition: database lookup already performed (otherwise we just sort citation keys)
      */
-    public void createPlainBibliographySortedByComparator(Comparator<BibEntry> entryComparator) {
+    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);
@@ -236,9 +257,13 @@ public void createPlainBibliographySortedByComparator(Comparator<BibEntry> entry
     /**
      * precondition: database lookup already performed (otherwise we just sort citation keys)
      */
-    public void createNumberedBibliographySortedByComparator(Comparator<BibEntry> entryComparator) {
+    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 c82177a7e69..4bfa5ef903d 100644
--- a/src/main/java/org/jabref/model/openoffice/style/CitationLookupResult.java
+++ b/src/main/java/org/jabref/model/openoffice/style/CitationLookupResult.java
@@ -1,7 +1,6 @@
 package org.jabref.model.openoffice.style;
 
 import java.util.Objects;
-
 import org.jabref.model.database.BibDatabase;
 import org.jabref.model.entry.BibEntry;
 
@@ -35,7 +34,10 @@ 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 18bbe5588b3..148df941150 100644
--- a/src/main/java/org/jabref/model/openoffice/style/CitationMarkerEntry.java
+++ b/src/main/java/org/jabref/model/openoffice/style/CitationMarkerEntry.java
@@ -1,14 +1,12 @@
 package org.jabref.model.openoffice.style;
 
 import java.util.Optional;
-
 import org.jabref.model.openoffice.ootext.OOText;
 
 /**
  * This is what we need for createCitationMarker to produce author-year citation markers.
  */
 public interface CitationMarkerEntry extends CitationMarkerNormEntry {
-
     /**
      * uniqueLetter or Optional.empty() if not needed.
      */
diff --git a/src/main/java/org/jabref/model/openoffice/style/CitationMarkerNormEntry.java b/src/main/java/org/jabref/model/openoffice/style/CitationMarkerNormEntry.java
index 1489dede932..25cc7454792 100644
--- a/src/main/java/org/jabref/model/openoffice/style/CitationMarkerNormEntry.java
+++ b/src/main/java/org/jabref/model/openoffice/style/CitationMarkerNormEntry.java
@@ -6,7 +6,6 @@
  * This is what we need to produce normalized author-year citation markers.
  */
 public interface CitationMarkerNormEntry {
-
     /**
      * Citation key. This is what we usually get from the document.
      * <p>
diff --git a/src/main/java/org/jabref/model/openoffice/style/CitationMarkerNumericBibEntry.java b/src/main/java/org/jabref/model/openoffice/style/CitationMarkerNumericBibEntry.java
index 398282113b8..b94a09ac172 100644
--- a/src/main/java/org/jabref/model/openoffice/style/CitationMarkerNumericBibEntry.java
+++ b/src/main/java/org/jabref/model/openoffice/style/CitationMarkerNumericBibEntry.java
@@ -6,7 +6,6 @@
  * This is for the numeric bibliography labels.
  */
 public interface CitationMarkerNumericBibEntry {
-
     /**
      * For unresolved citation we show the citation key.
      */
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 9c0c6081489..1ce89dd295e 100644
--- a/src/main/java/org/jabref/model/openoffice/style/CitationMarkerNumericEntry.java
+++ b/src/main/java/org/jabref/model/openoffice/style/CitationMarkerNumericEntry.java
@@ -1,14 +1,12 @@
 package org.jabref.model.openoffice.style;
 
 import java.util.Optional;
-
 import org.jabref.model.openoffice.ootext.OOText;
 
 /**
  * This is what we need for numeric citation markers.
  */
 public interface CitationMarkerNumericEntry {
-
     String getCitationKey();
 
     /**
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 55c1d7c50ed..f4a6af61b35 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 8920e5a3933..2cb6444b795 100644
--- a/src/main/java/org/jabref/model/openoffice/style/CitedKey.java
+++ b/src/main/java/org/jabref/model/openoffice/style/CitedKey.java
@@ -3,7 +3,6 @@
 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;
@@ -13,7 +12,8 @@
  * <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
+public class CitedKey
+    implements
         ComparableCitedKey,
         CitationMarkerNormEntry,
         CitationMarkerNumericBibEntry {
@@ -24,7 +24,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;
@@ -101,13 +101,19 @@ void addPath(CitationPath path, Citation cit) {
 
         // Check consistency
         if (!cit.getLookupResult().equals(this.db)) {
-            throw new IllegalStateException("CitedKey.addPath: mismatch on cit.db");
+            throw new IllegalStateException(
+                "CitedKey.addPath: mismatch on cit.db"
+            );
         }
         if (!cit.getNumber().equals(this.number)) {
-            throw new IllegalStateException("CitedKey.addPath: mismatch on cit.number");
+            throw new IllegalStateException(
+                "CitedKey.addPath: mismatch on cit.number"
+            );
         }
         if (!cit.getUniqueLetter().equals(this.uniqueLetter)) {
-            throw new IllegalStateException("CitedKey.addPath: mismatch on cit.uniqueLetter");
+            throw new IllegalStateException(
+                "CitedKey.addPath: mismatch on cit.uniqueLetter"
+            );
         }
     }
 
@@ -119,7 +125,11 @@ void lookupInDatabases(List<BibDatabase> databases) {
     }
 
     void distributeLookupResult(CitationGroups citationGroups) {
-        citationGroups.distributeToCitations(where, Citation::setLookupResult, db);
+        citationGroups.distributeToCitations(
+            where,
+            Citation::setLookupResult,
+            db
+        );
     }
 
     /*
@@ -127,10 +137,18 @@ void distributeLookupResult(CitationGroups citationGroups) {
      */
 
     void distributeNumber(CitationGroups citationGroups) {
-        citationGroups.distributeToCitations(where, Citation::setNumber, number);
+        citationGroups.distributeToCitations(
+            where,
+            Citation::setNumber,
+            number
+        );
     }
 
     void distributeUniqueLetter(CitationGroups citationGroups) {
-        citationGroups.distributeToCitations(where, Citation::setUniqueLetter, uniqueLetter);
+        citationGroups.distributeToCitations(
+            where,
+            Citation::setUniqueLetter,
+            uniqueLetter
+        );
     }
 }
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 a5afedede80..5786460744a 100644
--- a/src/main/java/org/jabref/model/openoffice/style/CitedKeys.java
+++ b/src/main/java/org/jabref/model/openoffice/style/CitedKeys.java
@@ -5,7 +5,6 @@
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Optional;
-
 import org.jabref.model.database.BibDatabase;
 import org.jabref.model.entry.BibEntry;
 
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 42a7e5869ba..35892d96c37 100644
--- a/src/main/java/org/jabref/model/openoffice/style/ComparableCitation.java
+++ b/src/main/java/org/jabref/model/openoffice/style/ComparableCitation.java
@@ -1,7 +1,6 @@
 package org.jabref.model.openoffice.style;
 
 import java.util.Optional;
-
 import org.jabref.model.openoffice.ootext.OOText;
 
 /**
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 23b3ffaba78..f1c7f7658b2 100644
--- a/src/main/java/org/jabref/model/openoffice/style/ComparableCitedKey.java
+++ b/src/main/java/org/jabref/model/openoffice/style/ComparableCitedKey.java
@@ -1,16 +1,13 @@
 package org.jabref.model.openoffice.style;
 
 import java.util.Optional;
-
 import org.jabref.model.entry.BibEntry;
 
 /**
  * This is what we need to sort bibliography entries.
  */
 public interface ComparableCitedKey {
-
     String getCitationKey();
 
     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 1d27674ba1d..7204bfd7a50 100644
--- a/src/main/java/org/jabref/model/openoffice/style/CompareCitation.java
+++ b/src/main/java/org/jabref/model/openoffice/style/CompareCitation.java
@@ -1,7 +1,6 @@
 package org.jabref.model.openoffice.style;
 
 import java.util.Comparator;
-
 import org.jabref.model.entry.BibEntry;
 
 /*
@@ -12,8 +11,12 @@ public class CompareCitation implements Comparator<ComparableCitation> {
 
     private final CompareCitedKey citedKeyComparator;
 
-    CompareCitation(Comparator<BibEntry> entryComparator, boolean unresolvedComesFirst) {
-        this.citedKeyComparator = new CompareCitedKey(entryComparator, unresolvedComesFirst);
+    CompareCitation(
+        Comparator<BibEntry> entryComparator,
+        boolean unresolvedComesFirst
+    ) {
+        this.citedKeyComparator =
+            new CompareCitedKey(entryComparator, unresolvedComesFirst);
     }
 
     public int compare(ComparableCitation a, ComparableCitation b) {
@@ -26,5 +29,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 e8a99e6980b..443a9b823ed 100644
--- a/src/main/java/org/jabref/model/openoffice/style/CompareCitedKey.java
+++ b/src/main/java/org/jabref/model/openoffice/style/CompareCitedKey.java
@@ -2,7 +2,6 @@
 
 import java.util.Comparator;
 import java.util.Optional;
-
 import org.jabref.model.entry.BibEntry;
 
 /*
@@ -14,7 +13,10 @@ public class CompareCitedKey implements Comparator<ComparableCitedKey> {
     Comparator<BibEntry> entryComparator;
     boolean unresolvedComesFirst;
 
-    CompareCitedKey(Comparator<BibEntry> entryComparator, boolean unresolvedComesFirst) {
+    CompareCitedKey(
+        Comparator<BibEntry> entryComparator,
+        boolean unresolvedComesFirst
+    ) {
         this.entryComparator = entryComparator;
         this.unresolvedComesFirst = unresolvedComesFirst;
     }
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 e633f7a9c70..1a54e26d346 100644
--- a/src/main/java/org/jabref/model/openoffice/style/NonUniqueCitationMarker.java
+++ b/src/main/java/org/jabref/model/openoffice/style/NonUniqueCitationMarker.java
@@ -4,7 +4,6 @@
  * What should createCitationMarker do if it discovers that uniqueLetters provided are not sufficient for unique presentation?
  */
 public enum NonUniqueCitationMarker {
-
     /**
      * Give an insufficient representation anyway.
      */
@@ -13,6 +12,5 @@ public enum NonUniqueCitationMarker {
     /**
      * Throw an exception
      */
-    THROWS
+    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 470edc1694d..0f9f6f083ce 100644
--- a/src/main/java/org/jabref/model/openoffice/style/OODataModel.java
+++ b/src/main/java/org/jabref/model/openoffice/style/OODataModel.java
@@ -3,14 +3,12 @@
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Optional;
-
 import org.jabref.model.openoffice.ootext.OOText;
 
 /**
  * What is the data stored?
  */
 public enum OODataModel {
-
     /**
      * JabRef52: pageInfo belongs to CitationGroup, not Citation.
      */
@@ -25,14 +23,19 @@ public enum OODataModel {
      * @param pageInfo Nullable.
      * @return JabRef60 style pageInfo list with pageInfo in the last slot.
      */
-    public static List<Optional<OOText>> fakePageInfos(String pageInfo, int nCitations) {
+    public static List<Optional<OOText>> fakePageInfos(
+        String pageInfo,
+        int nCitations
+    ) {
         List<Optional<OOText>> pageInfos = new ArrayList<>(nCitations);
         for (int i = 0; i < nCitations; i++) {
             pageInfos.add(Optional.empty());
         }
         if (pageInfo != null) {
             final int last = nCitations - 1;
-            Optional<OOText> optionalPageInfo = Optional.ofNullable(OOText.fromString(pageInfo));
+            Optional<OOText> optionalPageInfo = Optional.ofNullable(
+                OOText.fromString(pageInfo)
+            );
             pageInfos.set(last, PageInfo.normalizePageInfo(optionalPageInfo));
         }
         return pageInfos;
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 7fd56293d73..4ee4a4be69c 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,23 @@
 package org.jabref.model.openoffice.style;
 
 import java.util.Optional;
-
 import org.jabref.model.openoffice.ootext.OOText;
 
 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()))) {
+    public static Optional<OOText> normalizePageInfo(
+        Optional<OOText> optionalText
+    ) {
+        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 5f4f5ea40d7..76c130c2fdd 100644
--- a/src/main/java/org/jabref/model/openoffice/uno/UnoBookmark.java
+++ b/src/main/java/org/jabref/model/openoffice/uno/UnoBookmark.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.XNamed;
@@ -11,24 +9,26 @@
 import com.sun.star.text.XTextContent;
 import com.sun.star.text.XTextDocument;
 import com.sun.star.text.XTextRange;
+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 {
-
-        XBookmarksSupplier supplier = UnoCast.cast(XBookmarksSupplier.class, doc).get();
+        throws NoDocumentException {
+        XBookmarksSupplier supplier = UnoCast
+            .cast(XBookmarksSupplier.class, doc)
+            .get();
         try {
             return supplier.getBookmarks();
         } catch (DisposedException ex) {
-            throw new NoDocumentException("UnoBookmark.getNameAccess failed with" + ex);
+            throw new NoDocumentException(
+                "UnoBookmark.getNameAccess failed with" + ex
+            );
         }
     }
 
@@ -38,13 +38,14 @@ public static XNameAccess getNameAccess(XTextDocument doc)
      * @param name The name of the bookmark to find.
      * @return The XTextRange for the bookmark, or Optional.empty().
      */
-    public static Optional<XTextRange> getAnchor(XTextDocument doc, String name)
-            throws
-            WrappedTargetException,
-            NoDocumentException {
-
+    public static Optional<XTextRange> getAnchor(
+        XTextDocument doc,
+        String name
+    ) throws WrappedTargetException, NoDocumentException {
         XNameAccess nameAccess = getNameAccess(doc);
-        return UnoNameAccess.getTextContentByName(nameAccess, name).map(XTextContent::getAnchor);
+        return UnoNameAccess
+            .getTextContentByName(nameAccess, name)
+            .map(XTextContent::getAnchor);
     }
 
     /**
@@ -58,24 +59,33 @@ 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(XTextDocument doc, String name, XTextRange range, boolean absorb)
-            throws
-            CreationException {
-        return UnoNamed.insertNamedTextContent(doc, "com.sun.star.text.Bookmark", name, range, absorb);
+    public static XNamed create(
+        XTextDocument doc,
+        String name,
+        XTextRange range,
+        boolean absorb
+    ) throws CreationException {
+        return UnoNamed.insertNamedTextContent(
+            doc,
+            "com.sun.star.text.Bookmark",
+            name,
+            range,
+            absorb
+        );
     }
 
     /**
      * 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);
 
         if (marks.hasByName(name)) {
-            Optional<XTextContent> mark = UnoNameAccess.getTextContentByName(marks, name);
+            Optional<XTextContent> mark = UnoNameAccess.getTextContentByName(
+                marks,
+                name
+            );
             if (mark.isEmpty()) {
                 return;
             }
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 3234e4d130a..10485fb6539 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,11 @@
 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(...))
@@ -15,6 +13,8 @@ private UnoCast() {
      * @return A reference to the requested UNO interface type if available, otherwise Optional.empty()
      */
     public static <T> Optional<T> cast(Class<T> zInterface, Object object) {
-        return Optional.ofNullable(UnoRuntime.queryInterface(zInterface, object));
+        return Optional.ofNullable(
+            UnoRuntime.queryInterface(zInterface, object)
+        );
     }
 }
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 7df6d7dc04c..6776cd287f9 100644
--- a/src/main/java/org/jabref/model/openoffice/uno/UnoCrossRef.java
+++ b/src/main/java/org/jabref/model/openoffice/uno/UnoCrossRef.java
@@ -14,8 +14,7 @@
 
 public class UnoCrossRef {
 
-    private UnoCrossRef() {
-    }
+    private UnoCrossRef() {}
 
     /**
      * Update TextFields, etc. We use it to refresh cross-references in the document.
@@ -31,21 +30,24 @@ 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();
+        XMultiServiceFactory msf = UnoCast
+            .cast(XMultiServiceFactory.class, doc)
+            .get();
         // Create a 'GetReference' text field to refer to the reference mark we just inserted,
         // and get it's XPropertySet interface
         XPropertySet xFieldProps;
         try {
             String name = "com.sun.star.text.textfield.GetReference";
-            xFieldProps = UnoCast.cast(XPropertySet.class, msf.createInstance(name)).get();
+            xFieldProps =
+                UnoCast
+                    .cast(XPropertySet.class, msf.createInstance(name))
+                    .get();
         } catch (com.sun.star.uno.Exception e) {
             throw new CreationException(e.getMessage());
         }
@@ -54,34 +56,54 @@ 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);
+            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
-        XTextContent xRefContent = UnoCast.cast(XTextContent.class, xFieldProps).get();
+        XTextContent xRefContent = UnoCast
+            .cast(XTextContent.class, xFieldProps)
+            .get();
 
         // Insert the text field
         cursor.getText().insertTextContent(cursor.getEnd(), xRefContent, false);
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 2bca7a1ff19..709f748ab12 100644
--- a/src/main/java/org/jabref/model/openoffice/uno/UnoCursor.java
+++ b/src/main/java/org/jabref/model/openoffice/uno/UnoCursor.java
@@ -1,26 +1,25 @@
 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;
 import com.sun.star.text.XTextRange;
 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);
+        return UnoTextDocument
+            .getCurrentController(doc)
+            .flatMap(e -> UnoCast.cast(XTextViewCursorSupplier.class, e))
+            .map(XTextViewCursorSupplier::getViewCursor);
     }
 
     /**
@@ -28,7 +27,9 @@ public static Optional<XTextViewCursor> getViewCursor(XTextDocument doc) {
      *
      * @return Optional.empty if mark is null, otherwise cursor.
      */
-    public static Optional<XTextCursor> getTextCursorOfTextContentAnchor(XTextContent mark) {
+    public static Optional<XTextCursor> getTextCursorOfTextContentAnchor(
+        XTextContent mark
+    ) {
         if (mark == null) {
             return Optional.empty();
         }
@@ -36,7 +37,9 @@ public static Optional<XTextCursor> getTextCursorOfTextContentAnchor(XTextConten
         if (markAnchor == null) {
             return Optional.empty();
         }
-        return Optional.of(markAnchor.getText().createTextCursorByRange(markAnchor));
+        return Optional.of(
+            markAnchor.getText().createTextCursorByRange(markAnchor)
+        );
     }
 
     public static XTextCursor createTextCursorByRange(XTextRange range) {
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 1250d56d923..107129039fb 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,22 @@
 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 {
+    public static Optional<XTextContent> getTextContentByName(
+        XNameAccess nameAccess,
+        String name
+    ) 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 d3bf46668d1..48ff251c146 100644
--- a/src/main/java/org/jabref/model/openoffice/uno/UnoNamed.java
+++ b/src/main/java/org/jabref/model/openoffice/uno/UnoNamed.java
@@ -8,8 +8,7 @@
 
 public class UnoNamed {
 
-    private UnoNamed() {
-    }
+    private UnoNamed() {}
 
     /**
      * Insert a new instance of a service at the provided cursor position.
@@ -22,15 +21,16 @@ private UnoNamed() {
      * @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.
      * @return The XNamed interface, in case we need to check the actual name.
      */
-    static XNamed insertNamedTextContent(XTextDocument doc,
-                                         String service,
-                                         String name,
-                                         XTextRange range,
-                                         boolean absorb)
-            throws
-            CreationException {
-
-        XMultiServiceFactory msf = UnoCast.cast(XMultiServiceFactory.class, doc).get();
+    static XNamed insertNamedTextContent(
+        XTextDocument doc,
+        String service,
+        String name,
+        XTextRange range,
+        boolean absorb
+    ) throws CreationException {
+        XMultiServiceFactory msf = UnoCast
+            .cast(XMultiServiceFactory.class, doc)
+            .get();
 
         Object xObject;
         try {
@@ -39,13 +39,19 @@ static XNamed insertNamedTextContent(XTextDocument doc,
             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(name);
 
         // get XTextContent interface
-        XTextContent xTextContent = UnoCast.cast(XTextContent.class, xObject)
-                                            .orElseThrow(() -> new IllegalArgumentException("Service is not an XTextContent"));
+        XTextContent xTextContent = UnoCast
+            .cast(XTextContent.class, xObject)
+            .orElseThrow(() ->
+                new IllegalArgumentException("Service is not an XTextContent")
+            );
         range.getText().insertTextContent(range, xTextContent, 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 bca3d90ab6c..24894ebc0d2 100644
--- a/src/main/java/org/jabref/model/openoffice/uno/UnoProperties.java
+++ b/src/main/java/org/jabref/model/openoffice/uno/UnoProperties.java
@@ -1,48 +1,58 @@
 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;
 import com.sun.star.beans.XPropertySet;
 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) {
+    public static Optional<XPropertySet> asPropertySet(
+        XPropertyContainer propertyContainer
+    ) {
         return UnoCast.cast(XPropertySet.class, propertyContainer);
     }
 
-    public static Optional<XPropertySetInfo> getPropertySetInfo(XPropertySet propertySet) {
-        return Optional.ofNullable(propertySet)
-                        .flatMap(e -> Optional.ofNullable(e.getPropertySetInfo()));
+    public static Optional<XPropertySetInfo> getPropertySetInfo(
+        XPropertySet propertySet
+    ) {
+        return Optional
+            .ofNullable(propertySet)
+            .flatMap(e -> Optional.ofNullable(e.getPropertySetInfo()));
     }
 
-    public static Optional<XPropertySetInfo> getPropertySetInfo(XPropertyContainer propertyContainer) {
-        return Optional.ofNullable(propertyContainer).flatMap(UnoProperties::getPropertySetInfo);
+    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) {
+    public static List<String> getPropertyNames(
+        XPropertySetInfo propertySetInfo
+    ) {
         return getPropertyNames(propertySetInfo.getProperties());
     }
 
@@ -50,15 +60,18 @@ public static List<String> getPropertyNames(XPropertySet propertySet) {
         return getPropertyNames(propertySet.getPropertySetInfo());
     }
 
-    public static List<String> getPropertyNames(XPropertyContainer propertyContainer) {
+    public static List<String> getPropertyNames(
+        XPropertyContainer propertyContainer
+    ) {
         return asPropertySet(propertyContainer)
-                .map(UnoProperties::getPropertyNames)
-                .orElse(new ArrayList<>());
+            .map(UnoProperties::getPropertyNames)
+            .orElse(new ArrayList<>());
     }
 
-    public static Optional<Object> getValueAsObject(XPropertySet propertySet, String property)
-            throws
-            WrappedTargetException {
+    public static Optional<Object> getValueAsObject(
+        XPropertySet propertySet,
+        String property
+    ) throws WrappedTargetException {
         Objects.requireNonNull(propertySet);
         Objects.requireNonNull(property);
         try {
@@ -68,9 +81,10 @@ 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 3793ce7a079..59d99282eb8 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;
@@ -10,6 +8,7 @@
 import com.sun.star.document.XRedlinesSupplier;
 import com.sun.star.lang.WrappedTargetException;
 import com.sun.star.text.XTextDocument;
+import java.util.Optional;
 
 /**
  * Change tracking and Redlines
@@ -17,9 +16,7 @@
 public class UnoRedlines {
 
     public static boolean getRecordChanges(XTextDocument doc)
-            throws
-            WrappedTargetException {
-
+        throws WrappedTargetException {
         // https://wiki.openoffice.org/wiki/Documentation/DevGuide/Text/Settings
         // "Properties of com.sun.star.text.TextDocument"
 
@@ -28,11 +25,15 @@ 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'"
+            );
         }
     }
 
-    private static Optional<XRedlinesSupplier> getRedlinesSupplier(XTextDocument doc) {
+    private static Optional<XRedlinesSupplier> getRedlinesSupplier(
+        XTextDocument doc
+    ) {
         return UnoCast.cast(XRedlinesSupplier.class, doc);
     }
 
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 12e36fae46a..cd1d0e8520d 100644
--- a/src/main/java/org/jabref/model/openoffice/uno/UnoReferenceMark.java
+++ b/src/main/java/org/jabref/model/openoffice/uno/UnoReferenceMark.java
@@ -1,10 +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 com.sun.star.container.NoSuchElementException;
 import com.sun.star.container.XNameAccess;
 import com.sun.star.container.XNamed;
@@ -14,11 +9,14 @@
 import com.sun.star.text.XTextContent;
 import com.sun.star.text.XTextDocument;
 import com.sun.star.text.XTextRange;
+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
@@ -26,15 +24,17 @@ private UnoReferenceMark() {
      *                             Note: also used by `isDocumentConnectionMissing` to test if we have a working connection.
      */
     public static XNameAccess getNameAccess(XTextDocument doc)
-            throws
-            NoDocumentException {
-
-        XReferenceMarksSupplier supplier = UnoCast.cast(XReferenceMarksSupplier.class, doc).get();
+        throws NoDocumentException {
+        XReferenceMarksSupplier supplier = UnoCast
+            .cast(XReferenceMarksSupplier.class, doc)
+            .get();
 
         try {
             return supplier.getReferenceMarks();
         } catch (DisposedException ex) {
-            throw new NoDocumentException("UnoReferenceMarks.getNameAccess failed with" + ex);
+            throw new NoDocumentException(
+                "UnoReferenceMarks.getNameAccess failed with" + ex
+            );
         }
     }
 
@@ -44,8 +44,7 @@ public static XNameAccess getNameAccess(XTextDocument doc)
      * Empty list for nothing.
      */
     public static List<String> getListOfNames(XTextDocument doc)
-            throws NoDocumentException {
-
+        throws NoDocumentException {
         XNameAccess nameAccess = UnoReferenceMark.getNameAccess(doc);
         String[] names = nameAccess.getElementNames();
         if (names == null) {
@@ -60,14 +59,14 @@ 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);
 
         if (xReferenceMarks.hasByName(name)) {
-            Optional<XTextContent> mark = UnoNameAccess.getTextContentByName(xReferenceMarks, name);
+            Optional<XTextContent> mark = UnoNameAccess.getTextContentByName(
+                xReferenceMarks,
+                name
+            );
             if (mark.isEmpty()) {
                 return;
             }
@@ -82,11 +81,10 @@ 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 {
-
+    public static Optional<XTextContent> getAsTextContent(
+        XTextDocument doc,
+        String name
+    ) throws NoDocumentException, WrappedTargetException {
         XNameAccess nameAccess = UnoReferenceMark.getNameAccess(doc);
         return UnoNameAccess.getTextContentByName(nameAccess, name);
     }
@@ -94,12 +92,13 @@ 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);
+    public static Optional<XTextRange> getAnchor(
+        XTextDocument doc,
+        String name
+    ) throws NoDocumentException, WrappedTargetException {
+        return UnoReferenceMark
+            .getAsTextContent(doc, name)
+            .map(XTextContent::getAnchor);
     }
 
     /**
@@ -112,9 +111,18 @@ public static Optional<XTextRange> getAnchor(XTextDocument doc, String name)
      * @param name  For the reference mark.
      * @param range Cursor marking the location or range for the reference mark.
      */
-    public static XNamed create(XTextDocument doc, String name, XTextRange range, boolean absorb)
-            throws
-            CreationException {
-        return UnoNamed.insertNamedTextContent(doc, "com.sun.star.text.ReferenceMark", name, range, absorb);
+    public static XNamed create(
+        XTextDocument doc,
+        String name,
+        XTextRange range,
+        boolean absorb
+    ) throws CreationException {
+        return UnoNamed.insertNamedTextContent(
+            doc,
+            "com.sun.star.text.ReferenceMark",
+            name,
+            range,
+            absorb
+        );
     }
 }
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 6de0afe5ad6..63d29f0aeef 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 a6e581cfce1..a2ed001a659 100644
--- a/src/main/java/org/jabref/model/openoffice/uno/UnoSelection.java
+++ b/src/main/java/org/jabref/model/openoffice/uno/UnoSelection.java
@@ -1,12 +1,11 @@
 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 java.util.Objects;
+import java.util.Optional;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -15,24 +14,36 @@
  */
 public class UnoSelection {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(UnoSelection.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(
+        UnoSelection.class
+    );
 
-    private UnoSelection() {
-    }
+    private UnoSelection() {}
 
-    private static Optional<XSelectionSupplier> getSelectionSupplier(XTextDocument doc) {
+    private static Optional<XSelectionSupplier> getSelectionSupplier(
+        XTextDocument doc
+    ) {
         if (doc == null) {
             LOGGER.warn("UnoSelection.getSelectionSupplier: doc is null");
             return Optional.empty();
         }
-        Optional<XController> controller = UnoTextDocument.getCurrentController(doc);
+        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;
@@ -56,7 +67,9 @@ private static Optional<XSelectionSupplier> getSelectionSupplier(XTextDocument d
      * <p>
      * With cursor selecting an inserted image: *** XSelectionSupplier is OK *** Object initialSelection is OK *** xserviceinfo is OK *** xserviceinfo.getImplementationName: "SwXTextGraphicObject" "com.sun.star.text.BaseFrame" "com.sun.star.text.TextContent" "com.sun.star.document.LinkTarget" "com.sun.star.text.TextGraphicObject"
      */
-    public static Optional<XServiceInfo> getSelectionAsXServiceInfo(XTextDocument doc) {
+    public static Optional<XServiceInfo> getSelectionAsXServiceInfo(
+        XTextDocument doc
+    ) {
         Objects.requireNonNull(doc);
         Optional<XSelectionSupplier> supplier = getSelectionSupplier(doc);
         if (supplier.isEmpty()) {
@@ -67,7 +80,10 @@ public static Optional<XServiceInfo> getSelectionAsXServiceInfo(XTextDocument do
         if (selection == null) {
             return Optional.empty();
         }
-        Optional<XServiceInfo> result = UnoCast.cast(XServiceInfo.class, selection);
+        Optional<XServiceInfo> result = UnoCast.cast(
+            XServiceInfo.class,
+            selection
+        );
         if (result.isEmpty()) {
             LOGGER.warn("cast to XServiceInfo returned empty");
             return Optional.empty();
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 5aba2010aac..221e8a94f4c 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;
@@ -9,6 +7,7 @@
 import com.sun.star.style.XStyle;
 import com.sun.star.style.XStyleFamiliesSupplier;
 import com.sun.star.text.XTextDocument;
+import java.util.Optional;
 
 /**
  * Styles in the document.
@@ -18,20 +17,30 @@ public class UnoStyle {
     public static final String CHARACTER_STYLES = "CharacterStyles";
     public static final String PARAGRAPH_STYLES = "ParagraphStyles";
 
-    private UnoStyle() {
-    }
-
-    private static Optional<XStyle> getStyleFromFamily(XTextDocument doc, String familyName, String styleName)
-            throws
-            WrappedTargetException {
+    private UnoStyle() {}
 
-        XStyleFamiliesSupplier fss = UnoCast.cast(XStyleFamiliesSupplier.class, doc).get();
-        XNameAccess families = UnoCast.cast(XNameAccess.class, fss.getStyleFamilies()).get();
+    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();
         XNameContainer xFamily;
         try {
-            xFamily = UnoCast.cast(XNameContainer.class, families.getByName(familyName)).get();
+            xFamily =
+                UnoCast
+                    .cast(XNameContainer.class, families.getByName(familyName))
+                    .get();
         } catch (NoSuchElementException ex) {
-            String msg = String.format("Style family name '%s' is not recognized", familyName);
+            String msg = String.format(
+                "Style family name '%s' is not recognized",
+                familyName
+            );
             throw new java.lang.IllegalArgumentException(msg, ex);
         }
 
@@ -43,35 +52,39 @@ private static Optional<XStyle> getStyleFromFamily(XTextDocument doc, String fam
         }
     }
 
-    public static Optional<XStyle> getParagraphStyle(XTextDocument doc, String styleName)
-            throws
-            WrappedTargetException {
+    public static Optional<XStyle> getParagraphStyle(
+        XTextDocument doc,
+        String styleName
+    ) throws WrappedTargetException {
         return getStyleFromFamily(doc, PARAGRAPH_STYLES, styleName);
     }
 
-    public static Optional<XStyle> getCharacterStyle(XTextDocument doc, String styleName)
-            throws
-            WrappedTargetException {
+    public static Optional<XStyle> getCharacterStyle(
+        XTextDocument doc,
+        String styleName
+    ) 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 {
+    public static Optional<String> getInternalNameOfParagraphStyle(
+        XTextDocument doc,
+        String name
+    ) throws WrappedTargetException {
         return getInternalNameOfStyle(doc, PARAGRAPH_STYLES, name);
     }
 
-    public static Optional<String> getInternalNameOfCharacterStyle(XTextDocument doc, String name)
-            throws
-            WrappedTargetException {
+    public static Optional<String> getInternalNameOfCharacterStyle(
+        XTextDocument doc,
+        String name
+    ) 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 200f7be55df..2ad2d0d1496 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 java.util.Optional;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 public class UnoTextDocument {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(UnoTextDocument.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(
+        UnoTextDocument.class
+    );
 
-    private UnoTextDocument() {
-    }
+    private UnoTextDocument() {}
 
     /**
      * @return True if we cannot reach the current document.
@@ -37,7 +37,9 @@ public static boolean isDocumentConnectionMissing(XTextDocument doc) {
         return missing;
     }
 
-    public static Optional<XController> getCurrentController(XTextDocument doc) {
+    public static Optional<XController> getCurrentController(
+        XTextDocument doc
+    ) {
         if (doc == null) {
             return Optional.empty();
         }
@@ -54,18 +56,25 @@ public static Optional<XController> getCurrentController(XTextDocument doc) {
      * @return The title or Optional.empty()
      */
     public static Optional<String> getFrameTitle(XTextDocument doc) {
-        Optional<XFrame> frame = getCurrentController(doc).map(XController::getFrame);
+        Optional<XFrame> frame = getCurrentController(doc)
+            .map(XController::getFrame);
         if (frame.isEmpty()) {
             return Optional.empty();
         }
 
-        Optional<XPropertySet> propertySet = UnoCast.cast(XPropertySet.class, frame.get());
+        Optional<XPropertySet> propertySet = UnoCast.cast(
+            XPropertySet.class,
+            frame.get()
+        );
         if (propertySet.isEmpty()) {
             return Optional.empty();
         }
 
         try {
-            Optional<Object> frameTitleObj = UnoProperties.getValueAsObject(propertySet.get(), "Title");
+            Optional<Object> frameTitleObj = UnoProperties.getValueAsObject(
+                propertySet.get(),
+                "Title"
+            );
             if (frameTitleObj.isEmpty()) {
                 return Optional.empty();
             }
@@ -77,10 +86,12 @@ 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);
+    static Optional<XDocumentProperties> getDocumentProperties(
+        XTextDocument doc
+    ) {
+        return Optional
+            .ofNullable(doc)
+            .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 883ab8de1fc..167f8f20719 100644
--- a/src/main/java/org/jabref/model/openoffice/uno/UnoTextRange.java
+++ b/src/main/java/org/jabref/model/openoffice/uno/UnoTextRange.java
@@ -1,24 +1,27 @@
 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.
      * <p>
      * Returns Optional.empty if not in a footnote.
      */
-    public static Optional<XTextRange> getFootnoteMarkRange(XTextRange original) {
-        Optional<XFootnote> footer = UnoCast.cast(XFootnote.class, original.getText());
+    public static Optional<XTextRange> getFootnoteMarkRange(
+        XTextRange original
+    ) {
+        Optional<XFootnote> footer = UnoCast.cast(
+            XFootnote.class,
+            original.getText()
+        );
         // If we are inside a footnote,
         // find the linking footnote marker:
         // The footnote's anchor gives the correct position in the text:
@@ -36,15 +39,23 @@ public static boolean comparables(XTextRange a, XTextRange b) {
      * @return follows java conventions
      * 1 if  (a &gt; b); (-1) if (a &lt; b)
      */
-    public static int compareStartsUnsafe(XTextRangeCompare compare, XTextRange a, XTextRange b) {
+    public static int compareStartsUnsafe(
+        XTextRangeCompare compare,
+        XTextRange a,
+        XTextRange b
+    ) {
         return -1 * compare.compareRegionStarts(a, b);
     }
 
     public static int compareStarts(XTextRange a, XTextRange b) {
         if (!comparables(a, b)) {
-            throw new java.lang.IllegalArgumentException("compareStarts: got incomparable regions");
+            throw new java.lang.IllegalArgumentException(
+                "compareStarts: got incomparable regions"
+            );
         }
-        final XTextRangeCompare compare = UnoCast.cast(XTextRangeCompare.class, a.getText()).get();
+        final XTextRangeCompare compare = UnoCast
+            .cast(XTextRangeCompare.class, a.getText())
+            .get();
         return compareStartsUnsafe(compare, a, b);
     }
 
@@ -54,16 +65,24 @@ public static int compareStarts(XTextRange a, XTextRange b) {
      */
     public static int compareEnds(XTextRange a, XTextRange b) {
         if (!comparables(a, b)) {
-            throw new java.lang.IllegalArgumentException("compareEnds: got incomparable regions");
+            throw new java.lang.IllegalArgumentException(
+                "compareEnds: got incomparable regions"
+            );
         }
-        final XTextRangeCompare compare = UnoCast.cast(XTextRangeCompare.class, a.getText()).get();
+        final XTextRangeCompare compare = UnoCast
+            .cast(XTextRangeCompare.class, a.getText())
+            .get();
         return -1 * compare.compareRegionEnds(a, 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,9 +92,13 @@ 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();
+        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 1717795cfa7..d4286a2bac0 100644
--- a/src/main/java/org/jabref/model/openoffice/uno/UnoTextSection.java
+++ b/src/main/java/org/jabref/model/openoffice/uno/UnoTextSection.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.XNamed;
@@ -13,6 +11,7 @@
 import com.sun.star.text.XTextSection;
 import com.sun.star.text.XTextSectionsSupplier;
 import com.sun.star.uno.Any;
+import java.util.Optional;
 
 public class UnoTextSection {
 
@@ -20,27 +19,31 @@ public class UnoTextSection {
      * @return An XNameAccess to find sections by name.
      */
     public static XNameAccess getNameAccess(XTextDocument doc)
-            throws
-            NoDocumentException {
-
-        XTextSectionsSupplier supplier = UnoCast.cast(XTextSectionsSupplier.class, doc).get();
+        throws NoDocumentException {
+        XTextSectionsSupplier supplier = UnoCast
+            .cast(XTextSectionsSupplier.class, doc)
+            .get();
         try {
             return supplier.getTextSections();
         } catch (DisposedException ex) {
-            throw new NoDocumentException("UnoTextSection.getNameAccess failed with" + ex);
+            throw new NoDocumentException(
+                "UnoTextSection.getNameAccess failed with" + ex
+            );
         }
     }
 
     /**
      * Get an XTextSection by name.
      */
-    public static Optional<XTextSection> getByName(XTextDocument doc, String name)
-            throws
-            WrappedTargetException,
-            NoDocumentException {
+    public static Optional<XTextSection> getByName(
+        XTextDocument doc,
+        String name
+    ) 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();
         }
@@ -52,13 +55,14 @@ public static Optional<XTextSection> getByName(XTextDocument doc, String name)
      * @param name The name of the section to find.
      * @return The XTextRange for the section, or Optional.empty().
      */
-    public static Optional<XTextRange> getAnchor(XTextDocument doc, String name)
-            throws
-            WrappedTargetException,
-            NoDocumentException {
-
+    public static Optional<XTextRange> getAnchor(
+        XTextDocument doc,
+        String name
+    ) throws WrappedTargetException, NoDocumentException {
         XNameAccess nameAccess = getNameAccess(doc);
-        return UnoNameAccess.getTextContentByName(nameAccess, name).map(XTextContent::getAnchor);
+        return UnoNameAccess
+            .getTextContentByName(nameAccess, name)
+            .map(XTextContent::getAnchor);
     }
 
     /**
@@ -69,11 +73,18 @@ public static Optional<XTextRange> getAnchor(XTextDocument doc, String name)
      *              <p>
      *              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(XTextDocument doc, String name, XTextRange range, boolean absorb)
-            throws
-            CreationException {
-
-        return UnoNamed.insertNamedTextContent(doc, "com.sun.star.text.TextSection", name, range, absorb);
+    public static XNamed create(
+        XTextDocument doc,
+        String name,
+        XTextRange range,
+        boolean absorb
+    ) throws CreationException {
+        return UnoNamed.insertNamedTextContent(
+            doc,
+            "com.sun.star.text.TextSection",
+            name,
+            range,
+            absorb
+        );
     }
 }
-
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 9de5e149130..4ae87fffef6 100644
--- a/src/main/java/org/jabref/model/openoffice/uno/UnoUndo.java
+++ b/src/main/java/org/jabref/model/openoffice/uno/UnoUndo.java
@@ -1,31 +1,31 @@
 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);
+        return UnoCast
+            .cast(XUndoManagerSupplier.class, doc)
+            .map(XUndoManagerSupplier::getUndoManager);
     }
 
     /**
      * Each call to enterUndoContext must be paired by a call to leaveUndoContext, otherwise, the document's undo stack is left in an inconsistent state.
      */
     public static void enterUndoContext(XTextDocument doc, String title) {
-        getXUndoManager(doc).ifPresent(undoManager -> undoManager.enterUndoContext(title));
+        getXUndoManager(doc)
+            .ifPresent(undoManager -> undoManager.enterUndoContext(title));
     }
 
     public static void leaveUndoContext(XTextDocument doc) {
@@ -34,7 +34,9 @@ public static void leaveUndoContext(XTextDocument doc) {
             try {
                 undoManager.get().leaveUndoContext();
             } catch (InvalidStateException ex) {
-                throw new IllegalStateException("leaveUndoContext reported InvalidStateException");
+                throw new IllegalStateException(
+                    "leaveUndoContext reported InvalidStateException"
+                );
             }
         }
     }
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 3b6abb75b8e..aba35f8b2b4 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,6 +14,10 @@
 import com.sun.star.text.XTextDocument;
 import com.sun.star.uno.Any;
 import com.sun.star.uno.Type;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Objects;
+import java.util.Optional;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -29,19 +28,25 @@
  */
 public class UnoUserDefinedProperty {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(UnoUserDefinedProperty.class);
+    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);
+    public static Optional<XPropertyContainer> getPropertyContainer(
+        XTextDocument doc
+    ) {
+        return UnoTextDocument
+            .getDocumentProperties(doc)
+            .map(XDocumentProperties::getUserDefinedProperties);
     }
 
     public static List<String> getListOfNames(XTextDocument doc) {
-        return UnoUserDefinedProperty.getPropertyContainer(doc)
-                                      .map(UnoProperties::getPropertyNames)
-                                      .orElse(new ArrayList<>());
+        return UnoUserDefinedProperty
+            .getPropertyContainer(doc)
+            .map(UnoProperties::getPropertyNames)
+            .orElse(new ArrayList<>());
     }
 
     /**
@@ -49,16 +54,23 @@ public static List<String> getListOfNames(XTextDocument doc) {
      * @return The value of the property or Optional.empty()
      * 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);
+    public static Optional<String> getStringValue(
+        XTextDocument doc,
+        String property
+    ) 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();
+            String value = propertySet
+                .get()
+                .getPropertyValue(property)
+                .toString();
             return Optional.ofNullable(value);
         } catch (UnknownPropertyException ex) {
             return Optional.empty();
@@ -69,27 +81,36 @@ public static Optional<String> getStringValue(XTextDocument doc, String property
      * @param property Name of a custom document property in the current document. Created if does not exist yet.
      * @param value    The value to be stored.
      */
-    public static void setStringProperty(XTextDocument doc, String property, String value)
-            throws
-            IllegalTypeException,
-            PropertyVetoException,
-            WrappedTargetException {
-
+    public static void setStringProperty(
+        XTextDocument doc,
+        String property,
+        String value
+    )
+        throws IllegalTypeException, PropertyVetoException, WrappedTargetException {
         Objects.requireNonNull(property);
         Objects.requireNonNull(value);
 
-        Optional<XPropertyContainer> container = UnoUserDefinedProperty.getPropertyContainer(doc);
+        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);
+        Optional<XPropertySet> propertySet = container.flatMap(
+            UnoProperties::asPropertySet
+        );
         if (propertySet.isEmpty()) {
-            throw new java.lang.IllegalArgumentException("asPropertySet failed");
+            throw new java.lang.IllegalArgumentException(
+                "asPropertySet failed"
+            );
         }
 
-        XPropertySetInfo propertySetInfo = propertySet.get().getPropertySetInfo();
+        XPropertySetInfo propertySetInfo = propertySet
+            .get()
+            .getPropertySetInfo();
 
         if (propertySetInfo.hasPropertyByName(property)) {
             try {
@@ -101,9 +122,17 @@ 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"
+            );
         }
     }
 
@@ -113,22 +142,27 @@ public static void setStringProperty(XTextDocument doc, String property, String
      *                 Logs warning if does not exist.
      */
     public static void remove(XTextDocument doc, String property)
-            throws
-            NotRemoveableException {
-
+        throws NotRemoveableException {
         Objects.requireNonNull(property);
 
-        Optional<XPropertyContainer> container = UnoUserDefinedProperty.getPropertyContainer(doc);
+        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(String.format("UnoUserDefinedProperty.remove(%s) This property was not there to remove",
-                    property));
+            LOGGER.warn(
+                String.format(
+                    "UnoUserDefinedProperty.remove(%s) This property was not there to remove",
+                    property
+                )
+            );
         }
     }
 
@@ -138,15 +172,16 @@ 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);
+        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/OOListUtil.java b/src/main/java/org/jabref/model/openoffice/util/OOListUtil.java
index c61b81655a7..ecc363628c3 100644
--- a/src/main/java/org/jabref/model/openoffice/util/OOListUtil.java
+++ b/src/main/java/org/jabref/model/openoffice/util/OOListUtil.java
@@ -16,13 +16,19 @@ public static <T, U> List<U> map(List<T> list, Function<T, U> fun) {
      * Integers 0..(len-1)
      */
     public static List<Integer> makeIndices(int len) {
-        return Stream.iterate(0, i -> i + 1).limit(len).collect(Collectors.toList());
+        return Stream
+            .iterate(0, i -> i + 1)
+            .limit(len)
+            .collect(Collectors.toList());
     }
 
     /**
      * Return indices so that list.get(indices.get(i)) is sorted.
      */
-    public static <T extends U, U> List<Integer> order(List<T> list, Comparator<U> comparator) {
+    public static <T extends U, U> List<Integer> order(
+        List<T> list,
+        Comparator<U> comparator
+    ) {
         List<Integer> indices = makeIndices(list.size());
         indices.sort((a, b) -> comparator.compare(list.get(a), list.get(b)));
         return indices;
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 006c33e942e..e7ef2cdecd7 100644
--- a/src/main/java/org/jabref/model/openoffice/util/OOPair.java
+++ b/src/main/java/org/jabref/model/openoffice/util/OOPair.java
@@ -1,6 +1,7 @@
 package org.jabref.model.openoffice.util;
 
 public class OOPair<A, B> {
+
     public final A a;
     public final B b;
 
@@ -9,4 +10,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 afbdeaf617e..da07f5263c8 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 cff3079efa1..df3e48c1aff 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 5de68f8697c..1b9e958b5c5 100644
--- a/src/main/java/org/jabref/model/openoffice/util/OOVoidResult.java
+++ b/src/main/java/org/jabref/model/openoffice/util/OOVoidResult.java
@@ -8,6 +8,7 @@
  * error cannot be null
  */
 public class OOVoidResult<E> {
+
     private final Optional<E> error;
 
     private OOVoidResult(Optional<E> error) {
@@ -49,4 +50,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 f31955b1acc..c80a1a47475 100644
--- a/src/main/java/org/jabref/model/pdf/FileAnnotation.java
+++ b/src/main/java/org/jabref/model/pdf/FileAnnotation.java
@@ -5,18 +5,21 @@
 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 Logger LOGGER = LoggerFactory.getLogger(
+        FileAnnotation.class
+    );
+
+    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 DATE_TIME_STRING_WITH_TIME_ZONE =
+        "^D:\\d{14}.+";
     private static final String ANNOTATION_DATE_FORMAT = "yyyyMMddHHmmss";
 
     private final String author;
@@ -35,8 +38,14 @@ 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 +61,14 @@ 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),
-                extractModifiedTime(annotation.getModifiedDate()),
-                pageNumber, annotation.getContents(), FileAnnotationType.parse(annotation), Optional.empty());
+        this(
+            annotation.getCOSObject().getString(COSName.T),
+            extractModifiedTime(annotation.getModifiedDate()),
+            pageNumber,
+            annotation.getContents(),
+            FileAnnotationType.parse(annotation),
+            Optional.empty()
+        );
     }
 
     /**
@@ -65,9 +79,19 @@ 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 +112,17 @@ 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(String.format("Expected a parseable date string! However, this text could not be parsed: '%s'", dateTimeString));
+            LOGGER.info(
+                String.format(
+                    "Expected a parseable date string! However, this text could not be parsed: '%s'",
+                    dateTimeString
+                )
+            );
             return LocalDateTime.now();
         }
     }
@@ -116,7 +148,12 @@ 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;
     }
@@ -136,17 +173,29 @@ public boolean equals(Object other) {
         }
 
         FileAnnotation that = (FileAnnotation) other;
-        return Objects.equals(this.annotationType, that.annotationType)
-                && Objects.equals(this.author, that.author)
-                && Objects.equals(this.content, that.content)
-                && Objects.equals(this.page, that.page)
-                && Objects.equals(this.linkedFileAnnotation, that.linkedFileAnnotation)
-                && Objects.equals(this.timeModified, that.timeModified);
+        return (
+            Objects.equals(this.annotationType, that.annotationType) &&
+            Objects.equals(this.author, that.author) &&
+            Objects.equals(this.content, that.content) &&
+            Objects.equals(this.page, that.page) &&
+            Objects.equals(
+                this.linkedFileAnnotation,
+                that.linkedFileAnnotation
+            ) &&
+            Objects.equals(this.timeModified, that.timeModified)
+        );
     }
 
     @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 502b036ed2e..a9c5a10beeb 100644
--- a/src/main/java/org/jabref/model/pdf/FileAnnotationType.java
+++ b/src/main/java/org/jabref/model/pdf/FileAnnotationType.java
@@ -1,7 +1,6 @@
 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;
@@ -26,7 +25,9 @@ public enum FileAnnotationType {
     UNKNOWN("Unknown", false),
     NONE("None", false);
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(FileAnnotationType.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(
+        FileAnnotationType.class
+    );
 
     private final String name;
     private final boolean linkedFileAnnotationType;
@@ -45,9 +46,16 @@ public enum FileAnnotationType {
      */
     public static FileAnnotationType parse(PDAnnotation annotation) {
         try {
-            return FileAnnotationType.valueOf(annotation.getSubtype().toUpperCase(Locale.ROOT));
+            return FileAnnotationType.valueOf(
+                annotation.getSubtype().toUpperCase(Locale.ROOT)
+            );
         } catch (IllegalArgumentException e) {
-            LOGGER.info(String.format("FileAnnotationType %s is not supported and was converted into 'Unknown'!", annotation.getSubtype()));
+            LOGGER.info(
+                String.format(
+                    "FileAnnotationType %s is not supported and was converted into 'Unknown'!",
+                    annotation.getSubtype()
+                )
+            );
             return UNKNOWN;
         }
     }
@@ -60,7 +68,10 @@ 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/pdf/search/EnglishStemAnalyzer.java b/src/main/java/org/jabref/model/pdf/search/EnglishStemAnalyzer.java
index 1dcccbb6583..5bee3154605 100644
--- a/src/main/java/org/jabref/model/pdf/search/EnglishStemAnalyzer.java
+++ b/src/main/java/org/jabref/model/pdf/search/EnglishStemAnalyzer.java
@@ -22,4 +22,3 @@ protected TokenStreamComponents createComponents(String fieldName) {
         return new TokenStreamComponents(source, filter);
     }
 }
-
diff --git a/src/main/java/org/jabref/model/pdf/search/PdfSearchResults.java b/src/main/java/org/jabref/model/pdf/search/PdfSearchResults.java
index db38bfe9548..d43b37f1f60 100644
--- a/src/main/java/org/jabref/model/pdf/search/PdfSearchResults.java
+++ b/src/main/java/org/jabref/model/pdf/search/PdfSearchResults.java
@@ -19,7 +19,9 @@ public PdfSearchResults() {
 
     public List<SearchResult> getSortedByScore() {
         List<SearchResult> sortedList = new ArrayList<>(searchResults);
-        sortedList.sort((searchResult, t1) -> Float.compare(searchResult.getLuceneScore(), t1.getLuceneScore()));
+        sortedList.sort((searchResult, t1) ->
+            Float.compare(searchResult.getLuceneScore(), t1.getLuceneScore())
+        );
         return Collections.unmodifiableList(sortedList);
     }
 
diff --git a/src/main/java/org/jabref/model/pdf/search/SearchFieldConstants.java b/src/main/java/org/jabref/model/pdf/search/SearchFieldConstants.java
index b4fa07c5d34..768a16811ad 100644
--- a/src/main/java/org/jabref/model/pdf/search/SearchFieldConstants.java
+++ b/src/main/java/org/jabref/model/pdf/search/SearchFieldConstants.java
@@ -8,7 +8,13 @@ public class SearchFieldConstants {
     public static final String ANNOTATIONS = "annotations";
     public static final String MODIFIED = "modified";
 
-    public static final String[] PDF_FIELDS = new String[]{PATH, CONTENT, PAGE_NUMBER, MODIFIED, ANNOTATIONS};
+    public static final String[] PDF_FIELDS = new String[] {
+        PATH,
+        CONTENT,
+        PAGE_NUMBER,
+        MODIFIED,
+        ANNOTATIONS,
+    };
 
     public static final String VERSION = "95";
 }
diff --git a/src/main/java/org/jabref/model/pdf/search/SearchResult.java b/src/main/java/org/jabref/model/pdf/search/SearchResult.java
index 7a79191e94c..de61dff3500 100644
--- a/src/main/java/org/jabref/model/pdf/search/SearchResult.java
+++ b/src/main/java/org/jabref/model/pdf/search/SearchResult.java
@@ -1,12 +1,15 @@
 package org.jabref.model.pdf.search;
 
+import static org.jabref.model.pdf.search.SearchFieldConstants.ANNOTATIONS;
+import static org.jabref.model.pdf.search.SearchFieldConstants.CONTENT;
+import static org.jabref.model.pdf.search.SearchFieldConstants.MODIFIED;
+import static org.jabref.model.pdf.search.SearchFieldConstants.PAGE_NUMBER;
+import static org.jabref.model.pdf.search.SearchFieldConstants.PATH;
+
 import java.io.IOException;
 import java.util.Arrays;
 import java.util.List;
 import java.util.stream.Collectors;
-
-import org.jabref.model.entry.BibEntry;
-
 import org.apache.lucene.analysis.TokenStream;
 import org.apache.lucene.index.IndexableField;
 import org.apache.lucene.search.IndexSearcher;
@@ -17,12 +20,7 @@
 import org.apache.lucene.search.highlight.QueryScorer;
 import org.apache.lucene.search.highlight.SimpleHTMLFormatter;
 import org.apache.lucene.search.highlight.TextFragment;
-
-import static org.jabref.model.pdf.search.SearchFieldConstants.ANNOTATIONS;
-import static org.jabref.model.pdf.search.SearchFieldConstants.CONTENT;
-import static org.jabref.model.pdf.search.SearchFieldConstants.MODIFIED;
-import static org.jabref.model.pdf.search.SearchFieldConstants.PAGE_NUMBER;
-import static org.jabref.model.pdf.search.SearchFieldConstants.PATH;
+import org.jabref.model.entry.BibEntry;
 
 public final class SearchResult {
 
@@ -35,34 +33,70 @@ public final class SearchResult {
     private List<String> contentResultStringsHtml;
     private List<String> annotationsResultStringsHtml;
 
-    public SearchResult(IndexSearcher searcher, Query query, ScoreDoc scoreDoc) throws IOException {
+    public SearchResult(IndexSearcher searcher, Query query, ScoreDoc scoreDoc)
+        throws IOException {
         this.path = getFieldContents(searcher, scoreDoc, PATH);
-        this.pageNumber = Integer.parseInt(getFieldContents(searcher, scoreDoc, PAGE_NUMBER));
-        this.modified = Long.parseLong(getFieldContents(searcher, scoreDoc, MODIFIED));
+        this.pageNumber =
+            Integer.parseInt(getFieldContents(searcher, scoreDoc, PAGE_NUMBER));
+        this.modified =
+            Long.parseLong(getFieldContents(searcher, scoreDoc, MODIFIED));
         this.luceneScore = scoreDoc.score;
 
         String content = getFieldContents(searcher, scoreDoc, CONTENT);
         String annotations = getFieldContents(searcher, scoreDoc, ANNOTATIONS);
 
-        Highlighter highlighter = new Highlighter(new SimpleHTMLFormatter("<b>", "</b>"), new QueryScorer(query));
-
-        try (TokenStream contentStream = new EnglishStemAnalyzer().tokenStream(CONTENT, content)) {
-            TextFragment[] frags = highlighter.getBestTextFragments(contentStream, content, true, 10);
-            this.contentResultStringsHtml = Arrays.stream(frags).map(TextFragment::toString).collect(Collectors.toList());
+        Highlighter highlighter = new Highlighter(
+            new SimpleHTMLFormatter("<b>", "</b>"),
+            new QueryScorer(query)
+        );
+
+        try (
+            TokenStream contentStream = new EnglishStemAnalyzer()
+                .tokenStream(CONTENT, content)
+        ) {
+            TextFragment[] frags = highlighter.getBestTextFragments(
+                contentStream,
+                content,
+                true,
+                10
+            );
+            this.contentResultStringsHtml =
+                Arrays
+                    .stream(frags)
+                    .map(TextFragment::toString)
+                    .collect(Collectors.toList());
         } catch (InvalidTokenOffsetsException e) {
             this.contentResultStringsHtml = List.of();
         }
 
-        try (TokenStream annotationStream = new EnglishStemAnalyzer().tokenStream(ANNOTATIONS, annotations)) {
-            TextFragment[] frags = highlighter.getBestTextFragments(annotationStream, annotations, true, 10);
-            this.annotationsResultStringsHtml = Arrays.stream(frags).map(TextFragment::toString).collect(Collectors.toList());
+        try (
+            TokenStream annotationStream = new EnglishStemAnalyzer()
+                .tokenStream(ANNOTATIONS, annotations)
+        ) {
+            TextFragment[] frags = highlighter.getBestTextFragments(
+                annotationStream,
+                annotations,
+                true,
+                10
+            );
+            this.annotationsResultStringsHtml =
+                Arrays
+                    .stream(frags)
+                    .map(TextFragment::toString)
+                    .collect(Collectors.toList());
         } catch (InvalidTokenOffsetsException e) {
             this.annotationsResultStringsHtml = List.of();
         }
     }
 
-    private String getFieldContents(IndexSearcher searcher, ScoreDoc scoreDoc, String field) throws IOException {
-        IndexableField indexableField = searcher.doc(scoreDoc.doc).getField(field);
+    private String getFieldContents(
+        IndexSearcher searcher,
+        ScoreDoc scoreDoc,
+        String field
+    ) throws IOException {
+        IndexableField indexableField = searcher
+            .doc(scoreDoc.doc)
+            .getField(field);
         if (indexableField == null) {
             return "";
         }
@@ -70,7 +104,10 @@ private String getFieldContents(IndexSearcher searcher, ScoreDoc scoreDoc, Strin
     }
 
     public boolean isResultFor(BibEntry entry) {
-        return entry.getFiles().stream().anyMatch(linkedFile -> path.equals(linkedFile.getLink()));
+        return entry
+            .getFiles()
+            .stream()
+            .anyMatch(linkedFile -> path.equals(linkedFile.getLink()));
     }
 
     public String getPath() {
diff --git a/src/main/java/org/jabref/model/schema/DublinCoreSchemaCustom.java b/src/main/java/org/jabref/model/schema/DublinCoreSchemaCustom.java
index e4d4cfe3215..9fe032a8696 100644
--- a/src/main/java/org/jabref/model/schema/DublinCoreSchemaCustom.java
+++ b/src/main/java/org/jabref/model/schema/DublinCoreSchemaCustom.java
@@ -3,7 +3,6 @@
 import java.util.List;
 import java.util.Objects;
 import java.util.stream.Collectors;
-
 import org.apache.commons.lang3.reflect.FieldUtils;
 import org.apache.xmpbox.XMPMetadata;
 import org.apache.xmpbox.schema.DublinCoreSchema;
@@ -18,25 +17,42 @@
  *  A DublinCoreSchema extension Class.
  *  In case anyone intends to alter standard behaviour.
  */
-@StructuredType(preferedPrefix = "dc", namespace = "http://purl.org/dc/elements/1.1/")
+@StructuredType(
+    preferedPrefix = "dc",
+    namespace = "http://purl.org/dc/elements/1.1/"
+)
 public class DublinCoreSchemaCustom extends DublinCoreSchema {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(DublinCoreSchemaCustom.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(
+        DublinCoreSchemaCustom.class
+    );
 
     public DublinCoreSchemaCustom(XMPMetadata metadata) {
         super(metadata);
     }
 
-    public static DublinCoreSchema copyDublinCoreSchema(DublinCoreSchema dcSchema) {
+    public static DublinCoreSchema copyDublinCoreSchema(
+        DublinCoreSchema dcSchema
+    ) {
         if (Objects.isNull(dcSchema)) {
             return null;
         }
 
         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);
@@ -54,10 +70,10 @@ public List<String> getUnqualifiedSequenceValueList(String seqName) {
         if (abstractProperty instanceof ArrayProperty) {
             if ("date".equals(seqName)) {
                 return ((ArrayProperty) abstractProperty).getContainer()
-                        .getAllProperties()
-                        .stream()
-                        .map(field -> (String) ((DateType) field).getRawValue())
-                        .collect(Collectors.toList());
+                    .getAllProperties()
+                    .stream()
+                    .map(field -> (String) ((DateType) field).getRawValue())
+                    .collect(Collectors.toList());
             }
             return ((ArrayProperty) abstractProperty).getElementsAsString();
         }
diff --git a/src/main/java/org/jabref/model/search/GroupSearchQuery.java b/src/main/java/org/jabref/model/search/GroupSearchQuery.java
index 90056d9b0f7..7ebd8b0c814 100644
--- a/src/main/java/org/jabref/model/search/GroupSearchQuery.java
+++ b/src/main/java/org/jabref/model/search/GroupSearchQuery.java
@@ -2,7 +2,6 @@
 
 import java.util.EnumSet;
 import java.util.Objects;
-
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.search.rules.SearchRule;
 import org.jabref.model.search.rules.SearchRules;
@@ -22,8 +21,12 @@ public GroupSearchQuery(String query, EnumSet<SearchFlags> searchFlags) {
 
     @Override
     public String toString() {
-        return String.format("\"%s\" (%s, %s)", query, getCaseSensitiveDescription(),
-                getRegularExpressionDescription());
+        return String.format(
+            "\"%s\" (%s, %s)",
+            query,
+            getCaseSensitiveDescription(),
+            getRegularExpressionDescription()
+        );
     }
 
     @Override
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 81839607ad0..667323cc753 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 46043c86551..a1331eddc31 100644
--- a/src/main/java/org/jabref/model/search/matchers/MatcherSet.java
+++ b/src/main/java/org/jabref/model/search/matchers/MatcherSet.java
@@ -3,7 +3,6 @@
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
-
 import org.jabref.model.search.SearchMatcher;
 
 public abstract class MatcherSet implements SearchMatcher {
diff --git a/src/main/java/org/jabref/model/search/matchers/MatcherSets.java b/src/main/java/org/jabref/model/search/matchers/MatcherSets.java
index 369db6f9faf..717eb67ec5b 100644
--- a/src/main/java/org/jabref/model/search/matchers/MatcherSets.java
+++ b/src/main/java/org/jabref/model/search/matchers/MatcherSets.java
@@ -4,7 +4,7 @@ public class MatcherSets {
 
     public enum MatcherType {
         AND,
-        OR
+        OR,
     }
 
     public static MatcherSet build(MatcherType ruleSet) {
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 09be8c7f86e..a7b6dafda79 100644
--- a/src/main/java/org/jabref/model/search/matchers/NotMatcher.java
+++ b/src/main/java/org/jabref/model/search/matchers/NotMatcher.java
@@ -1,7 +1,6 @@
 package org.jabref.model.search.matchers;
 
 import java.util.Objects;
-
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.search.SearchMatcher;
 
diff --git a/src/main/java/org/jabref/model/search/rules/ContainsBasedSearchRule.java b/src/main/java/org/jabref/model/search/rules/ContainsBasedSearchRule.java
index 618d1771b95..2bbe269831a 100644
--- a/src/main/java/org/jabref/model/search/rules/ContainsBasedSearchRule.java
+++ b/src/main/java/org/jabref/model/search/rules/ContainsBasedSearchRule.java
@@ -4,7 +4,6 @@
 import java.util.Iterator;
 import java.util.List;
 import java.util.Locale;
-
 import org.jabref.architecture.AllowedToUseLogic;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.field.Field;
@@ -33,17 +32,23 @@ public boolean applyRule(String query, BibEntry bibEntry) {
             searchString = searchString.toLowerCase(Locale.ROOT);
         }
 
-        List<String> unmatchedWords = new SentenceAnalyzer(searchString).getWords();
+        List<String> unmatchedWords = new SentenceAnalyzer(searchString)
+            .getWords();
 
         for (Field fieldKey : bibEntry.getFields()) {
-            String formattedFieldContent = StringUtil.stripAccents(bibEntry.getFieldLatexFree(fieldKey).get());
+            String formattedFieldContent = StringUtil.stripAccents(
+                bibEntry.getFieldLatexFree(fieldKey).get()
+            );
             if (!searchFlags.contains(SearchRules.SearchFlags.CASE_SENSITIVE)) {
-                formattedFieldContent = formattedFieldContent.toLowerCase(Locale.ROOT);
+                formattedFieldContent =
+                    formattedFieldContent.toLowerCase(Locale.ROOT);
             }
 
             Iterator<String> unmatchedWordsIterator = unmatchedWords.iterator();
             while (unmatchedWordsIterator.hasNext()) {
-                String word = StringUtil.stripAccents(unmatchedWordsIterator.next());
+                String word = StringUtil.stripAccents(
+                    unmatchedWordsIterator.next()
+                );
                 if (formattedFieldContent.contains(word)) {
                     unmatchedWordsIterator.remove();
                 }
diff --git a/src/main/java/org/jabref/model/search/rules/FullTextSearchRule.java b/src/main/java/org/jabref/model/search/rules/FullTextSearchRule.java
index 27cfbf65b8b..d4dc3016b7d 100644
--- a/src/main/java/org/jabref/model/search/rules/FullTextSearchRule.java
+++ b/src/main/java/org/jabref/model/search/rules/FullTextSearchRule.java
@@ -5,7 +5,6 @@
 import java.util.EnumSet;
 import java.util.List;
 import java.util.stream.Collectors;
-
 import org.jabref.architecture.AllowedToUseLogic;
 import org.jabref.gui.Globals;
 import org.jabref.logic.pdf.search.retrieval.PdfSearcher;
@@ -13,7 +12,6 @@
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.pdf.search.PdfSearchResults;
 import org.jabref.model.pdf.search.SearchResult;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -25,7 +23,9 @@
 @AllowedToUseLogic("Because access to the lucene index is needed")
 public abstract class FullTextSearchRule implements SearchRule {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(FullTextSearchRule.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(
+        FullTextSearchRule.class
+    );
 
     protected final EnumSet<SearchRules.SearchFlags> searchFlags;
 
@@ -47,8 +47,14 @@ public EnumSet<SearchRules.SearchFlags> getSearchFlags() {
     }
 
     @Override
-    public PdfSearchResults getFulltextResults(String query, BibEntry bibEntry) {
-        if (!searchFlags.contains(SearchRules.SearchFlags.FULLTEXT) || databaseContext == null) {
+    public PdfSearchResults getFulltextResults(
+        String query,
+        BibEntry bibEntry
+    ) {
+        if (
+            !searchFlags.contains(SearchRules.SearchFlags.FULLTEXT) ||
+            databaseContext == null
+        ) {
             return new PdfSearchResults();
         }
 
@@ -64,8 +70,11 @@ public PdfSearchResults getFulltextResults(String query, BibEntry bibEntry) {
             }
         }
 
-        return new PdfSearchResults(lastSearchResults.stream()
-                                                     .filter(searchResult -> searchResult.isResultFor(bibEntry))
-                                                     .collect(Collectors.toList()));
+        return new PdfSearchResults(
+            lastSearchResults
+                .stream()
+                .filter(searchResult -> searchResult.isResultFor(bibEntry))
+                .collect(Collectors.toList())
+        );
     }
 }
diff --git a/src/main/java/org/jabref/model/search/rules/GrammarBasedSearchRule.java b/src/main/java/org/jabref/model/search/rules/GrammarBasedSearchRule.java
index fd281a11a0f..a0c1557c45f 100644
--- a/src/main/java/org/jabref/model/search/rules/GrammarBasedSearchRule.java
+++ b/src/main/java/org/jabref/model/search/rules/GrammarBasedSearchRule.java
@@ -11,7 +11,14 @@
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;
-
+import org.antlr.v4.runtime.ANTLRInputStream;
+import org.antlr.v4.runtime.BailErrorStrategy;
+import org.antlr.v4.runtime.BaseErrorListener;
+import org.antlr.v4.runtime.CommonTokenStream;
+import org.antlr.v4.runtime.RecognitionException;
+import org.antlr.v4.runtime.Recognizer;
+import org.antlr.v4.runtime.misc.ParseCancellationException;
+import org.antlr.v4.runtime.tree.ParseTree;
 import org.jabref.architecture.AllowedToUseLogic;
 import org.jabref.gui.Globals;
 import org.jabref.logic.pdf.search.retrieval.PdfSearcher;
@@ -27,15 +34,6 @@
 import org.jabref.search.SearchBaseVisitor;
 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.BaseErrorListener;
-import org.antlr.v4.runtime.CommonTokenStream;
-import org.antlr.v4.runtime.RecognitionException;
-import org.antlr.v4.runtime.Recognizer;
-import org.antlr.v4.runtime.misc.ParseCancellationException;
-import org.antlr.v4.runtime.tree.ParseTree;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -47,7 +45,9 @@
 @AllowedToUseLogic("Because access to the lucene index is needed")
 public class GrammarBasedSearchRule implements SearchRule {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(GrammarBasedSearchRule.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(
+        GrammarBasedSearchRule.class
+    );
 
     private final EnumSet<SearchFlags> searchFlags;
 
@@ -59,23 +59,36 @@ public class GrammarBasedSearchRule implements SearchRule {
 
     public static class ThrowingErrorListener extends BaseErrorListener {
 
-        public static final ThrowingErrorListener INSTANCE = new ThrowingErrorListener();
+        public static final ThrowingErrorListener INSTANCE =
+            new ThrowingErrorListener();
 
         @Override
-        public void syntaxError(Recognizer<?, ?> recognizer, Object offendingSymbol,
-                                int line, int charPositionInLine, String msg, RecognitionException e)
-                throws ParseCancellationException {
-            throw new ParseCancellationException("line " + line + ":" + charPositionInLine + " " + msg);
+        public void syntaxError(
+            Recognizer<?, ?> recognizer,
+            Object offendingSymbol,
+            int line,
+            int charPositionInLine,
+            String msg,
+            RecognitionException e
+        ) throws ParseCancellationException {
+            throw new ParseCancellationException(
+                "line " + line + ":" + charPositionInLine + " " + msg
+            );
         }
     }
 
-    public GrammarBasedSearchRule(EnumSet<SearchFlags> searchFlags) throws RecognitionException {
+    public GrammarBasedSearchRule(EnumSet<SearchFlags> searchFlags)
+        throws RecognitionException {
         this.searchFlags = searchFlags;
         databaseContext = Globals.stateManager.getActiveDatabase().orElse(null);
     }
 
-    public static boolean isValid(EnumSet<SearchFlags> searchFlags, String query) {
-        return new GrammarBasedSearchRule(searchFlags).validateSearchStrings(query);
+    public static boolean isValid(
+        EnumSet<SearchFlags> searchFlags,
+        String query
+    ) {
+        return new GrammarBasedSearchRule(searchFlags)
+            .validateSearchStrings(query);
     }
 
     public ParseTree getTree() {
@@ -101,7 +114,10 @@ private void init(String query) throws ParseCancellationException {
         tree = parser.start();
         this.query = query;
 
-        if (!searchFlags.contains(SearchRules.SearchFlags.FULLTEXT) || (databaseContext == null)) {
+        if (
+            !searchFlags.contains(SearchRules.SearchFlags.FULLTEXT) ||
+            (databaseContext == null)
+        ) {
             return;
         }
         try {
@@ -124,8 +140,16 @@ public boolean applyRule(String query, BibEntry bibEntry) {
     }
 
     @Override
-    public PdfSearchResults getFulltextResults(String query, BibEntry bibEntry) {
-        return new PdfSearchResults(searchResults.stream().filter(searchResult -> searchResult.isResultFor(bibEntry)).collect(Collectors.toList()));
+    public PdfSearchResults getFulltextResults(
+        String query,
+        BibEntry bibEntry
+    ) {
+        return new PdfSearchResults(
+            searchResults
+                .stream()
+                .filter(searchResult -> searchResult.isResultFor(bibEntry))
+                .collect(Collectors.toList())
+        );
     }
 
     @Override
@@ -144,12 +168,16 @@ public EnumSet<SearchFlags> getSearchFlags() {
     }
 
     public enum ComparisonOperator {
-        EXACT, CONTAINS, DOES_NOT_CONTAIN;
+        EXACT,
+        CONTAINS,
+        DOES_NOT_CONTAIN;
 
         public static ComparisonOperator build(String value) {
             if ("CONTAINS".equalsIgnoreCase(value) || "=".equals(value)) {
                 return CONTAINS;
-            } else if ("MATCHES".equalsIgnoreCase(value) || "==".equals(value)) {
+            } else if (
+                "MATCHES".equalsIgnoreCase(value) || "==".equals(value)
+            ) {
                 return EXACT;
             } else {
                 return DOES_NOT_CONTAIN;
@@ -163,23 +191,56 @@ public static class Comparator {
         private final Pattern fieldPattern;
         private final Pattern valuePattern;
 
-        public Comparator(String field, String value, ComparisonOperator operator, EnumSet<SearchFlags> searchFlags) {
+        public Comparator(
+            String field,
+            String value,
+            ComparisonOperator operator,
+            EnumSet<SearchFlags> searchFlags
+        ) {
             this.operator = operator;
 
-            int option = searchFlags.contains(SearchRules.SearchFlags.CASE_SENSITIVE) ? 0 : Pattern.CASE_INSENSITIVE;
-            this.fieldPattern = Pattern.compile(searchFlags.contains(SearchRules.SearchFlags.REGULAR_EXPRESSION) ? StringUtil.stripAccents(field) : "\\Q" + StringUtil.stripAccents(field) + "\\E", option);
-            this.valuePattern = Pattern.compile(searchFlags.contains(SearchRules.SearchFlags.REGULAR_EXPRESSION) ? StringUtil.stripAccents(value) : "\\Q" + StringUtil.stripAccents(value) + "\\E", option);
+            int option = searchFlags.contains(
+                    SearchRules.SearchFlags.CASE_SENSITIVE
+                )
+                ? 0
+                : Pattern.CASE_INSENSITIVE;
+            this.fieldPattern =
+                Pattern.compile(
+                    searchFlags.contains(
+                            SearchRules.SearchFlags.REGULAR_EXPRESSION
+                        )
+                        ? StringUtil.stripAccents(field)
+                        : "\\Q" + StringUtil.stripAccents(field) + "\\E",
+                    option
+                );
+            this.valuePattern =
+                Pattern.compile(
+                    searchFlags.contains(
+                            SearchRules.SearchFlags.REGULAR_EXPRESSION
+                        )
+                        ? StringUtil.stripAccents(value)
+                        : "\\Q" + StringUtil.stripAccents(value) + "\\E",
+                    option
+                );
         }
 
         public boolean compare(BibEntry entry) {
             // special case for searching for entrytype=phdthesis
-            if (fieldPattern.matcher(InternalField.TYPE_HEADER.getName()).matches()) {
+            if (
+                fieldPattern
+                    .matcher(InternalField.TYPE_HEADER.getName())
+                    .matches()
+            ) {
                 return matchFieldValue(entry.getType().getName());
             }
 
             // special case for searching a single keyword
             if (fieldPattern.matcher("anykeyword").matches()) {
-                return entry.getKeywords(',').stream().map(Keyword::toString).anyMatch(this::matchFieldValue);
+                return entry
+                    .getKeywords(',')
+                    .stream()
+                    .map(Keyword::toString)
+                    .anyMatch(this::matchFieldValue);
             }
 
             // specification of fieldsKeys to search is done in the search expression itself
@@ -188,20 +249,31 @@ public boolean compare(BibEntry entry) {
             // special case for searching allfields=cat and title=dog
             if (!fieldPattern.matcher("anyfield").matches()) {
                 // Filter out the requested fields
-                fieldsKeys = fieldsKeys.stream().filter(matchFieldKey()).collect(Collectors.toSet());
+                fieldsKeys =
+                    fieldsKeys
+                        .stream()
+                        .filter(matchFieldKey())
+                        .collect(Collectors.toSet());
             }
 
             for (Field field : fieldsKeys) {
                 Optional<String> fieldValue = entry.getFieldLatexFree(field);
                 if (fieldValue.isPresent()) {
-                    if (matchFieldValue(StringUtil.stripAccents(fieldValue.get()))) {
+                    if (
+                        matchFieldValue(
+                            StringUtil.stripAccents(fieldValue.get())
+                        )
+                    ) {
                         return true;
                     }
                 }
             }
 
             // special case of asdf!=whatever and entry does not contain asdf
-            return fieldsKeys.isEmpty() && (operator == ComparisonOperator.DOES_NOT_CONTAIN);
+            return (
+                fieldsKeys.isEmpty() &&
+                (operator == ComparisonOperator.DOES_NOT_CONTAIN)
+            );
         }
 
         private Predicate<Field> matchFieldKey() {
@@ -231,13 +303,21 @@ static class BibtexSearchVisitor extends SearchBaseVisitor<Boolean> {
 
         private final BibEntry entry;
 
-        public BibtexSearchVisitor(EnumSet<SearchFlags> searchFlags, BibEntry bibEntry) {
+        public BibtexSearchVisitor(
+            EnumSet<SearchFlags> searchFlags,
+            BibEntry bibEntry
+        ) {
             this.searchFlags = searchFlags;
             this.entry = bibEntry;
         }
 
-        public boolean comparison(String field, ComparisonOperator operator, String value) {
-            return new Comparator(field, value, operator, searchFlags).compare(entry);
+        public boolean comparison(
+            String field,
+            ComparisonOperator operator,
+            String value
+        ) {
+            return new Comparator(field, value, operator, searchFlags)
+                .compare(entry);
         }
 
         @Override
@@ -253,26 +333,39 @@ public Boolean visitComparison(SearchParser.ComparisonContext context) {
                 right = right.substring(1, right.length() - 1);
             }
 
-            Optional<SearchParser.NameContext> fieldDescriptor = Optional.ofNullable(context.left);
+            Optional<SearchParser.NameContext> fieldDescriptor =
+                Optional.ofNullable(context.left);
             if (fieldDescriptor.isPresent()) {
-                return comparison(fieldDescriptor.get().getText(), ComparisonOperator.build(context.operator.getText()), right);
+                return comparison(
+                    fieldDescriptor.get().getText(),
+                    ComparisonOperator.build(context.operator.getText()),
+                    right
+                );
             } else {
-                return SearchRules.getSearchRule(searchFlags).applyRule(right, entry);
+                return SearchRules
+                    .getSearchRule(searchFlags)
+                    .applyRule(right, entry);
             }
         }
 
         @Override
-        public Boolean visitUnaryExpression(SearchParser.UnaryExpressionContext ctx) {
+        public Boolean visitUnaryExpression(
+            SearchParser.UnaryExpressionContext ctx
+        ) {
             return !visit(ctx.expression()); // negate
         }
 
         @Override
-        public Boolean visitParenExpression(SearchParser.ParenExpressionContext ctx) {
+        public Boolean visitParenExpression(
+            SearchParser.ParenExpressionContext ctx
+        ) {
             return visit(ctx.expression()); // ignore parenthesis
         }
 
         @Override
-        public Boolean visitBinaryExpression(SearchParser.BinaryExpressionContext ctx) {
+        public Boolean visitBinaryExpression(
+            SearchParser.BinaryExpressionContext ctx
+        ) {
             if ("AND".equalsIgnoreCase(ctx.operator.getText())) {
                 return visit(ctx.left) && visit(ctx.right); // and
             } else {
diff --git a/src/main/java/org/jabref/model/search/rules/RegexBasedSearchRule.java b/src/main/java/org/jabref/model/search/rules/RegexBasedSearchRule.java
index 3454c0f68dc..3dafcf31173 100644
--- a/src/main/java/org/jabref/model/search/rules/RegexBasedSearchRule.java
+++ b/src/main/java/org/jabref/model/search/rules/RegexBasedSearchRule.java
@@ -5,13 +5,11 @@
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import java.util.regex.PatternSyntaxException;
-
 import org.jabref.architecture.AllowedToUseLogic;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.field.Field;
 import org.jabref.model.search.rules.SearchRules.SearchFlags;
 import org.jabref.model.strings.StringUtil;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -21,7 +19,9 @@
 @AllowedToUseLogic("Because access to the lucene index is needed")
 public class RegexBasedSearchRule extends FullTextSearchRule {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(RegexBasedSearchRule.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(
+        RegexBasedSearchRule.class
+    );
 
     public RegexBasedSearchRule(EnumSet<SearchFlags> searchFlags) {
         super(searchFlags);
@@ -30,7 +30,12 @@ public RegexBasedSearchRule(EnumSet<SearchFlags> searchFlags) {
     @Override
     public boolean validateSearchStrings(String query) {
         try {
-            Pattern.compile(query, searchFlags.contains(SearchRules.SearchFlags.CASE_SENSITIVE) ? 0 : Pattern.CASE_INSENSITIVE);
+            Pattern.compile(
+                query,
+                searchFlags.contains(SearchRules.SearchFlags.CASE_SENSITIVE)
+                    ? 0
+                    : Pattern.CASE_INSENSITIVE
+            );
         } catch (PatternSyntaxException ex) {
             return false;
         }
@@ -41,7 +46,13 @@ public boolean validateSearchStrings(String query) {
     public boolean applyRule(String query, BibEntry bibEntry) {
         Pattern pattern;
         try {
-            pattern = Pattern.compile(StringUtil.stripAccents(query), searchFlags.contains(SearchRules.SearchFlags.CASE_SENSITIVE) ? 0 : Pattern.CASE_INSENSITIVE);
+            pattern =
+                Pattern.compile(
+                    StringUtil.stripAccents(query),
+                    searchFlags.contains(SearchRules.SearchFlags.CASE_SENSITIVE)
+                        ? 0
+                        : Pattern.CASE_INSENSITIVE
+                );
         } catch (PatternSyntaxException ex) {
             LOGGER.debug("Could not compile regex {}", query, ex);
             return false;
@@ -50,7 +61,9 @@ public boolean applyRule(String query, BibEntry bibEntry) {
         for (Field field : bibEntry.getFields()) {
             Optional<String> fieldOptional = bibEntry.getField(field);
             if (fieldOptional.isPresent()) {
-                String fieldContentNoBrackets = StringUtil.stripAccents(bibEntry.getFieldLatexFree(field).get());
+                String fieldContentNoBrackets = StringUtil.stripAccents(
+                    bibEntry.getFieldLatexFree(field).get()
+                );
                 Matcher m = pattern.matcher(fieldContentNoBrackets);
                 if (m.find()) {
                     return true;
diff --git a/src/main/java/org/jabref/model/search/rules/SearchRule.java b/src/main/java/org/jabref/model/search/rules/SearchRule.java
index 1be2b05b342..f6927a45b36 100644
--- a/src/main/java/org/jabref/model/search/rules/SearchRule.java
+++ b/src/main/java/org/jabref/model/search/rules/SearchRule.java
@@ -4,7 +4,6 @@
 import org.jabref.model.pdf.search.PdfSearchResults;
 
 public interface SearchRule {
-
     boolean applyRule(String query, BibEntry bibEntry);
 
     PdfSearchResults getFulltextResults(String query, BibEntry bibEntry);
diff --git a/src/main/java/org/jabref/model/search/rules/SearchRules.java b/src/main/java/org/jabref/model/search/rules/SearchRules.java
index ba28e66b133..02b4649f3ab 100644
--- a/src/main/java/org/jabref/model/search/rules/SearchRules.java
+++ b/src/main/java/org/jabref/model/search/rules/SearchRules.java
@@ -8,15 +8,19 @@
  */
 public class SearchRules {
 
-    private static final Pattern SIMPLE_EXPRESSION = Pattern.compile("[^\\p{Punct}]*");
+    private static final Pattern SIMPLE_EXPRESSION = Pattern.compile(
+        "[^\\p{Punct}]*"
+    );
 
-    private SearchRules() {
-    }
+    private SearchRules() {}
 
     /**
      * Returns the appropriate search rule that fits best to the given parameter.
      */
-    public static SearchRule getSearchRuleByQuery(String query, EnumSet<SearchFlags> searchFlags) {
+    public static SearchRule getSearchRuleByQuery(
+        String query,
+        EnumSet<SearchFlags> searchFlags
+    ) {
         if (isSimpleQuery(query)) {
             return new ContainsBasedSearchRule(searchFlags);
         }
@@ -44,6 +48,9 @@ static SearchRule getSearchRule(EnumSet<SearchFlags> searchFlags) {
     }
 
     public enum SearchFlags {
-        CASE_SENSITIVE, REGULAR_EXPRESSION, FULLTEXT, KEEP_SEARCH_STRING
+        CASE_SENSITIVE,
+        REGULAR_EXPRESSION,
+        FULLTEXT,
+        KEEP_SEARCH_STRING,
     }
 }
diff --git a/src/main/java/org/jabref/model/strings/LatexToUnicodeAdapter.java b/src/main/java/org/jabref/model/strings/LatexToUnicodeAdapter.java
index 01c4c304ef2..0a0b9fc3225 100644
--- a/src/main/java/org/jabref/model/strings/LatexToUnicodeAdapter.java
+++ b/src/main/java/org/jabref/model/strings/LatexToUnicodeAdapter.java
@@ -1,23 +1,25 @@
 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
  */
 public class LatexToUnicodeAdapter {
 
-    private static final Pattern UNDERSCORE_MATCHER = Pattern.compile("_(?!\\{)");
+    private static final Pattern UNDERSCORE_MATCHER = Pattern.compile(
+        "_(?!\\{)"
+    );
 
     private static final String REPLACEMENT_CHAR = "\uFFFD";
 
-    private static final Pattern UNDERSCORE_PLACEHOLDER_MATCHER = Pattern.compile(REPLACEMENT_CHAR);
+    private static final Pattern UNDERSCORE_PLACEHOLDER_MATCHER =
+        Pattern.compile(REPLACEMENT_CHAR);
 
     /**
      * Attempts to resolve all LaTeX in the String.
@@ -27,7 +29,8 @@ public class LatexToUnicodeAdapter {
      */
     public static String format(String inField) {
         Objects.requireNonNull(inField);
-        return parse(inField).orElse(Normalizer.normalize(inField, Normalizer.Form.NFC));
+        return parse(inField)
+            .orElse(Normalizer.normalize(inField, Normalizer.Form.NFC));
     }
 
     /**
@@ -38,12 +41,16 @@ public static String format(String inField) {
      */
     public static Optional<String> parse(String inField) {
         Objects.requireNonNull(inField);
-        String toFormat = UNDERSCORE_MATCHER.matcher(inField).replaceAll(REPLACEMENT_CHAR);
+        String toFormat = UNDERSCORE_MATCHER
+            .matcher(inField)
+            .replaceAll(REPLACEMENT_CHAR);
         var parsingResult = LaTeX2Unicode.parse(toFormat);
         if (parsingResult instanceof Parsed.Success) {
             String text = parsingResult.get().value();
             toFormat = Normalizer.normalize(text, Normalizer.Form.NFC);
-            return Optional.of(UNDERSCORE_PLACEHOLDER_MATCHER.matcher(toFormat).replaceAll("_"));
+            return Optional.of(
+                UNDERSCORE_PLACEHOLDER_MATCHER.matcher(toFormat).replaceAll("_")
+            );
         }
         return Optional.empty();
     }
diff --git a/src/main/java/org/jabref/model/strings/StringUtil.java b/src/main/java/org/jabref/model/strings/StringUtil.java
index c85521a5f71..54a5d7c3255 100644
--- a/src/main/java/org/jabref/model/strings/StringUtil.java
+++ b/src/main/java/org/jabref/model/strings/StringUtil.java
@@ -1,5 +1,6 @@
 package org.jabref.model.strings;
 
+import com.google.common.base.CharMatcher;
 import java.text.Normalizer;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -10,22 +11,24 @@
 import java.util.StringTokenizer;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
-
+import org.apache.commons.lang3.StringUtils;
 import org.jabref.architecture.ApacheCommonsLang3Allowed;
 import org.jabref.logic.bibtex.FieldWriter;
 
-import com.google.common.base.CharMatcher;
-import org.apache.commons.lang3.StringUtils;
-
 @ApacheCommonsLang3Allowed("There is no equivalent in Google's Guava")
 public class StringUtil {
 
     // Non-letters which are used to denote accents in LaTeX-commands, e.g., in {\"{a}}
     public static final String SPECIAL_COMMAND_CHARS = "\"`^~'=.|";
     // contains all possible line breaks, not omitting any break such as "\\n"
-    private static final Pattern LINE_BREAKS = Pattern.compile("\\r\\n|\\r|\\n");
-    private static final Pattern BRACED_TITLE_CAPITAL_PATTERN = Pattern.compile("\\{[A-Z]+\\}");
-    private static final UnicodeToReadableCharMap UNICODE_CHAR_MAP = new UnicodeToReadableCharMap();
+    private static final Pattern LINE_BREAKS = Pattern.compile(
+        "\\r\\n|\\r|\\n"
+    );
+    private static final Pattern BRACED_TITLE_CAPITAL_PATTERN = Pattern.compile(
+        "\\{[A-Z]+\\}"
+    );
+    private static final UnicodeToReadableCharMap UNICODE_CHAR_MAP =
+        new UnicodeToReadableCharMap();
 
     public static String booleanToBinaryString(boolean expression) {
         return expression ? "1" : "0";
@@ -39,7 +42,11 @@ public static String booleanToBinaryString(boolean expression) {
      * @param quoteChar The quoting character.
      * @return A String with every special character (including the quoting character itself) quoted.
      */
-    public static String quote(String toQuote, String specials, char quoteChar) {
+    public static String quote(
+        String toQuote,
+        String specials,
+        char quoteChar
+    ) {
         if (toQuote == null) {
             return "";
         }
@@ -65,7 +72,11 @@ public static String quote(String toQuote, String specials, char quoteChar) {
     /**
      * Creates a substring from a text
      */
-    public static String getPart(String text, int startIndex, boolean terminateOnEndBraceOnly) {
+    public static String getPart(
+        String text,
+        int startIndex,
+        boolean terminateOnEndBraceOnly
+    ) {
         char c;
         int count = 0;
 
@@ -73,14 +84,21 @@ public static String getPart(String text, int startIndex, boolean terminateOnEnd
 
         // advance to first char and skip whitespace
         int index = startIndex + 1;
-        while ((index < text.length()) && Character.isWhitespace(text.charAt(index))) {
+        while (
+            (index < text.length()) &&
+            Character.isWhitespace(text.charAt(index))
+        ) {
             index++;
         }
 
         // then grab whatever is the first token (counting braces)
         while (index < text.length()) {
             c = text.charAt(index);
-            if (!terminateOnEndBraceOnly && (count == 0) && Character.isWhitespace(c)) {
+            if (
+                !terminateOnEndBraceOnly &&
+                (count == 0) &&
+                Character.isWhitespace(c)
+            ) {
                 // end argument and leave whitespace for further processing
                 break;
             }
@@ -121,7 +139,12 @@ public static String shaveString(String toShave) {
      *
      * @param to        Excluding strings[to]
      */
-    public static String join(String[] strings, String separator, int from, int to) {
+    public static String join(
+        String[] strings,
+        String separator,
+        int from,
+        int to
+    ) {
         if ((strings.length == 0) || (from >= to)) {
             return "";
         }
@@ -150,12 +173,19 @@ public static String stripBrackets(String toStrip) {
      * extends the filename with a default Extension, if no Extension '.x' could
      * be found
      */
-    public static String getCorrectFileName(String orgName, String defaultExtension) {
+    public static String getCorrectFileName(
+        String orgName,
+        String defaultExtension
+    ) {
         if (orgName == null) {
             return "";
         }
 
-        if (orgName.toLowerCase(Locale.ROOT).endsWith("." + defaultExtension.toLowerCase(Locale.ROOT))) {
+        if (
+            orgName
+                .toLowerCase(Locale.ROOT)
+                .endsWith("." + defaultExtension.toLowerCase(Locale.ROOT))
+        ) {
             return orgName;
         }
 
@@ -180,7 +210,12 @@ 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);
+        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);
@@ -191,7 +226,9 @@ public static String wrap(String in, int wrapAmount, String newline) {
                 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
-                String line = CharMatcher.whitespace().trimTrailingFrom(lines[i]);
+                String line = CharMatcher
+                    .whitespace()
+                    .trimTrailingFrom(lines[i]);
                 addWrappedLine(result, line, wrapAmount, newline);
             }
         }
@@ -206,7 +243,12 @@ 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:
@@ -307,19 +349,30 @@ public static String putBracesAroundCapitals(String s) {
                 inBrace++;
             } else if (c == '}') {
                 inBrace--;
-            } else if (!escaped && (c == FieldWriter.BIBTEX_STRING_START_END_SYMBOL)) {
+            } else if (
+                !escaped && (c == FieldWriter.BIBTEX_STRING_START_END_SYMBOL)
+            ) {
                 inString = !inString;
             }
 
             // See if we should start bracing:
-            if ((inBrace == 0) && !isBracing && !inString && Character.isLetter((char) c)
-                    && Character.isUpperCase((char) c)) {
+            if (
+                (inBrace == 0) &&
+                !isBracing &&
+                !inString &&
+                Character.isLetter((char) c) &&
+                Character.isUpperCase((char) c)
+            ) {
                 buf.append('{');
                 isBracing = true;
             }
 
             // See if we should close a brace set:
-            if (isBracing && !(Character.isLetter((char) c) && Character.isUpperCase((char) c))) {
+            if (
+                isBracing &&
+                !(Character.isLetter((char) c) &&
+                    Character.isUpperCase((char) c))
+            ) {
                 buf.append('}');
                 isBracing = false;
             }
@@ -349,7 +402,10 @@ public static String putBracesAroundCapitals(String s) {
     public static String removeBracesAroundCapitals(String s) {
         String current = s;
         String previous = s;
-        while ((current = removeSingleBracesAroundCapitals(current)).length() < previous.length()) {
+        while (
+            (current = removeSingleBracesAroundCapitals(current)).length() <
+            previous.length()
+        ) {
             previous = current;
         }
         return current;
@@ -368,7 +424,10 @@ private static String removeSingleBracesAroundCapitals(String s) {
         StringBuilder buf = new StringBuilder();
         while (mcr.find()) {
             String replaceStr = mcr.group();
-            mcr.appendReplacement(buf, replaceStr.substring(1, replaceStr.length() - 1));
+            mcr.appendReplacement(
+                buf,
+                replaceStr.substring(1, replaceStr.length() - 1)
+            );
         }
         mcr.appendTail(buf);
         return buf.toString();
@@ -404,7 +463,10 @@ public static boolean isInCurlyBrackets(String toCheck) {
         if ((toCheck == null) || toCheck.isEmpty()) {
             return false;
         } else {
-            if ((toCheck.charAt(0) == '{') && (toCheck.charAt(toCheck.length() - 1) == '}')) {
+            if (
+                (toCheck.charAt(0) == '{') &&
+                (toCheck.charAt(toCheck.length() - 1) == '}')
+            ) {
                 for (char c : toCheck.toCharArray()) {
                     if (c == '{') {
                         if (brackets == 0) {
@@ -426,7 +488,10 @@ public static boolean isInSquareBrackets(String toCheck) {
         if ((toCheck == null) || toCheck.isEmpty()) {
             return false; // In case of null or empty string
         } else {
-            return (toCheck.charAt(0) == '[') && (toCheck.charAt(toCheck.length() - 1) == ']');
+            return (
+                (toCheck.charAt(0) == '[') &&
+                (toCheck.charAt(toCheck.length() - 1) == ']')
+            );
         }
     }
 
@@ -434,7 +499,10 @@ public static boolean isInCitationMarks(String toCheck) {
         if ((toCheck == null) || (toCheck.length() <= 1)) {
             return false; // In case of null, empty string, or a single citation mark
         } else {
-            return (toCheck.charAt(0) == '"') && (toCheck.charAt(toCheck.length() - 1) == '"');
+            return (
+                (toCheck.charAt(0) == '"') &&
+                (toCheck.charAt(toCheck.length() - 1) == '"')
+            );
         }
     }
 
@@ -453,12 +521,20 @@ 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);
         }
 
         int ival = 0;
-        for (; ; ival *= 10) {
+        for (;; ival *= 10) {
             ival += '0' - ch;
             if (++idx == end) {
                 return sign ? ival : -ival;
@@ -483,12 +559,20 @@ 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();
         }
 
         int ival = 0;
-        for (; ; ival *= 10) {
+        for (;; ival *= 10) {
             ival += '0' - ch;
             if (++idx == end) {
                 return Optional.of(sign ? ival : -ival);
@@ -521,8 +605,13 @@ public static String stripNonValidXMLCharacters(String in) {
 
         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 >= 0xE000) && (current <= 0xFFFD))) {
+            if (
+                (current == 0x9) ||
+                (current == 0xA) ||
+                (current == 0xD) ||
+                ((current >= 0x20) && (current <= 0xD7FF)) ||
+                ((current >= 0xE000) && (current <= 0xFFFD))
+            ) {
                 out.append(current);
             }
         }
@@ -570,8 +659,15 @@ public static String replaceSpecialCharacters(String s) {
          * Hence, if someone debugs issues in the `UNICODE_CHAR_MAP`, they will expect NFC.
          * A more holistic approach should likely start with the <a href="http://unicode.org/reports/tr15/#Compatibility_Equivalence_Figure">compatibility equivalence</a>. */
         String result = Normalizer.normalize(s, Normalizer.Form.NFC);
-        for (Map.Entry<String, String> chrAndReplace : UNICODE_CHAR_MAP.entrySet()) {
-            result = result.replace(chrAndReplace.getKey(), chrAndReplace.getValue());
+        for (Map.Entry<
+            String,
+            String
+        > chrAndReplace : UNICODE_CHAR_MAP.entrySet()) {
+            result =
+                result.replace(
+                    chrAndReplace.getKey(),
+                    chrAndReplace.getValue()
+                );
         }
         return result;
     }
@@ -672,7 +768,9 @@ public static String unquote(String toUnquote, char quoteChar) {
         return result.toString();
     }
 
-    @ApacheCommonsLang3Allowed("No Guava equivalent existing - see https://stackoverflow.com/q/3322152/873282 for a list of other implementations")
+    @ApacheCommonsLang3Allowed(
+        "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);
     }
@@ -682,8 +780,10 @@ public static String stripAccents(String searchQuery) {
      */
     public static String capitalizeFirst(String toCapitalize) {
         if (toCapitalize.length() > 1) {
-            return toCapitalize.substring(0, 1).toUpperCase(Locale.ROOT)
-                    + toCapitalize.substring(1).toLowerCase(Locale.ROOT);
+            return (
+                toCapitalize.substring(0, 1).toUpperCase(Locale.ROOT) +
+                toCapitalize.substring(1).toLowerCase(Locale.ROOT)
+            );
         } else {
             return toCapitalize.toUpperCase(Locale.ROOT);
         }
@@ -705,21 +805,31 @@ public static List<String> getStringAsWords(String 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+");
+        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));
     }
 
-    @ApacheCommonsLang3Allowed("No direct Guava equivalent existing - see https://stackoverflow.com/q/16560635/873282")
+    @ApacheCommonsLang3Allowed(
+        "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);
     }
 
-    public static String substringBetween(String str, String open, String close) {
+    public static String substringBetween(
+        String str,
+        String open,
+        String close
+    ) {
         return StringUtils.substringBetween(str, open, close);
     }
 
     public static String ignoreCurlyBracket(String title) {
-        return isNotBlank(title) ? title.replace("{", "").replace("}", "") : title;
+        return isNotBlank(title)
+            ? title.replace("{", "").replace("}", "")
+            : title;
     }
 
     /**
@@ -746,8 +856,13 @@ public static boolean containsWhitespace(String s) {
         return s.chars().anyMatch(Character::isWhitespace);
     }
 
-    @ApacheCommonsLang3Allowed("No Guava equivalent existing - see https://stackoverflow.com/a/23825984")
-    public static String removeStringAtTheEnd(String string, String stringToBeRemoved) {
+    @ApacheCommonsLang3Allowed(
+        "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/strings/UnicodeToReadableCharMap.java b/src/main/java/org/jabref/model/strings/UnicodeToReadableCharMap.java
index 3e720b900ee..69bedf0d83f 100644
--- a/src/main/java/org/jabref/model/strings/UnicodeToReadableCharMap.java
+++ b/src/main/java/org/jabref/model/strings/UnicodeToReadableCharMap.java
@@ -3,6 +3,7 @@
 import java.util.HashMap;
 
 public class UnicodeToReadableCharMap extends HashMap<String, String> {
+
     public UnicodeToReadableCharMap() {
         put("\u00C0", "A");
         put("\u00C1", "A");
@@ -253,7 +254,6 @@ public UnicodeToReadableCharMap() {
 
         put("\u0178", "Y");
         put("\u00FE", ""); // thorn character
-
         // UNICODE_CHARS.put("\u0100", "");
     }
 }
diff --git a/src/main/java/org/jabref/model/study/FetchResult.java b/src/main/java/org/jabref/model/study/FetchResult.java
index 80637feb4ab..9ca71a26537 100644
--- a/src/main/java/org/jabref/model/study/FetchResult.java
+++ b/src/main/java/org/jabref/model/study/FetchResult.java
@@ -6,6 +6,7 @@
  * Represents the result of fetching the results for a query for a specific library
  */
 public class FetchResult {
+
     private final String fetcherName;
     private final BibDatabase fetchResult;
 
diff --git a/src/main/java/org/jabref/model/study/QueryResult.java b/src/main/java/org/jabref/model/study/QueryResult.java
index 2976b5224fe..f82264af88a 100644
--- a/src/main/java/org/jabref/model/study/QueryResult.java
+++ b/src/main/java/org/jabref/model/study/QueryResult.java
@@ -6,6 +6,7 @@
  * Represents the result of fetching the results from all active fetchers for a specific query.
  */
 public class QueryResult {
+
     private final String query;
     private final List<FetchResult> resultsPerLibrary;
 
diff --git a/src/main/java/org/jabref/model/study/Study.java b/src/main/java/org/jabref/model/study/Study.java
index 5f0b1648f7f..8d1522ce6c1 100644
--- a/src/main/java/org/jabref/model/study/Study.java
+++ b/src/main/java/org/jabref/model/study/Study.java
@@ -1,13 +1,11 @@
 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 java.util.List;
+import java.util.Objects;
+import org.jabref.logic.crawler.StudyYamlParser;
 
 /**
  * This class represents a scientific study.
@@ -16,10 +14,13 @@
  *
  * The file is parsed using by {@link StudyYamlParser}
  */
-@JsonPropertyOrder({"authors", "title", "research-questions", "queries", "databases"})
+@JsonPropertyOrder(
+    { "authors", "title", "research-questions", "queries", "databases" }
+)
 // The user might add arbitrary content to the YAML
 @JsonIgnoreProperties(ignoreUnknown = true)
 public class Study {
+
     private List<String> authors;
 
     private String title;
@@ -31,7 +32,13 @@ 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 +49,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 +93,21 @@ 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 +121,13 @@ 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 +135,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 dc035d558b1..8a7fe68eada 100644
--- a/src/main/java/org/jabref/model/study/StudyDatabase.java
+++ b/src/main/java/org/jabref/model/study/StudyDatabase.java
@@ -4,6 +4,7 @@
  * data model for the view {@link org.jabref.gui.slr.StudyCatalogItem}
  */
 public class StudyDatabase {
+
     private String name;
     private boolean enabled;
 
@@ -50,7 +51,9 @@ public boolean equals(Object o) {
         if (isEnabled() != that.isEnabled()) {
             return false;
         }
-        return getName() != null ? getName().equals(that.getName()) : that.getName() == null;
+        return getName() != null
+            ? getName().equals(that.getName())
+            : that.getName() == null;
     }
 
     @Override
@@ -62,9 +65,14 @@ 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 940d842eb66..d4801d6202a 100644
--- a/src/main/java/org/jabref/model/study/StudyQuery.java
+++ b/src/main/java/org/jabref/model/study/StudyQuery.java
@@ -1,6 +1,7 @@
 package org.jabref.model.study;
 
 public class StudyQuery {
+
     private String query;
 
     public StudyQuery(String query) {
@@ -10,8 +11,7 @@ public StudyQuery(String query) {
     /**
      * Used for Jackson deserialization
      */
-    public StudyQuery() {
-    }
+    public StudyQuery() {}
 
     public String getQuery() {
         return query;
@@ -32,7 +32,9 @@ public boolean equals(Object o) {
 
         StudyQuery that = (StudyQuery) o;
 
-        return getQuery() != null ? getQuery().equals(that.getQuery()) : that.getQuery() == null;
+        return getQuery() != null
+            ? getQuery().equals(that.getQuery())
+            : that.getQuery() == null;
     }
 
     @Override
@@ -42,8 +44,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 690ee2fcbc9..9334434aa94 100644
--- a/src/main/java/org/jabref/model/texparser/Citation.java
+++ b/src/main/java/org/jabref/model/texparser/Citation.java
@@ -16,13 +16,23 @@ public class Citation {
     private final int colEnd;
     private final String lineText;
 
-    public Citation(Path path, int line, int colStart, int colEnd, String lineText) {
+    public Citation(
+        Path path,
+        int line,
+        int colStart,
+        int colEnd,
+        String lineText
+    ) {
         if (line <= 0) {
-            throw new IllegalArgumentException("Line has to be greater than 0.");
+            throw new IllegalArgumentException(
+                "Line has to be greater than 0."
+            );
         }
 
         if (colStart < 0 || colEnd > lineText.length()) {
-            throw new IllegalArgumentException("Citation has to be between 0 and line length.");
+            throw new IllegalArgumentException(
+                "Citation has to be between 0 and line length."
+            );
         }
 
         this.path = Objects.requireNonNull(path);
@@ -59,26 +69,33 @@ public String getContext() {
         int center = (colStart + colEnd) / 2;
         int lineLength = lineText.length();
 
-        int start = Math.max(0, center + CONTEXT_WIDTH / 2 < lineLength
+        int start = Math.max(
+            0,
+            center + CONTEXT_WIDTH / 2 < lineLength
                 ? center - CONTEXT_WIDTH / 2
-                : lineLength - CONTEXT_WIDTH);
+                : lineLength - CONTEXT_WIDTH
+        );
         int end = Math.min(lineLength, start + CONTEXT_WIDTH);
 
         // Add three dots when the string does not contain all the line.
-        return String.format("%s%s%s",
-                start > 0 ? "..." : "",
-                lineText.substring(start, end).trim(),
-                end < lineLength ? "..." : "");
+        return String.format(
+            "%s%s%s",
+            start > 0 ? "..." : "",
+            lineText.substring(start, end).trim(),
+            end < lineLength ? "..." : ""
+        );
     }
 
     @Override
     public String toString() {
-        return String.format("Citation{path=%s, line=%s, colStart=%s, colEnd=%s, lineText='%s'}",
-                this.path,
-                this.line,
-                this.colStart,
-                this.colEnd,
-                this.lineText);
+        return String.format(
+            "Citation{path=%s, line=%s, colStart=%s, colEnd=%s, lineText='%s'}",
+            this.path,
+            this.line,
+            this.colStart,
+            this.colEnd,
+            this.lineText
+        );
     }
 
     @Override
@@ -93,11 +110,13 @@ public boolean equals(Object obj) {
 
         Citation that = (Citation) obj;
 
-        return Objects.equals(path, that.path)
-                && Objects.equals(line, that.line)
-                && Objects.equals(colStart, that.colStart)
-                && Objects.equals(colEnd, that.colEnd)
-                && Objects.equals(lineText, that.lineText);
+        return (
+            Objects.equals(path, that.path) &&
+            Objects.equals(line, that.line) &&
+            Objects.equals(colStart, that.colStart) &&
+            Objects.equals(colEnd, that.colEnd) &&
+            Objects.equals(lineText, that.lineText)
+        );
     }
 
     @Override
diff --git a/src/main/java/org/jabref/model/texparser/LatexBibEntriesResolverResult.java b/src/main/java/org/jabref/model/texparser/LatexBibEntriesResolverResult.java
index e545a6f4840..f56cbe0c5d2 100644
--- a/src/main/java/org/jabref/model/texparser/LatexBibEntriesResolverResult.java
+++ b/src/main/java/org/jabref/model/texparser/LatexBibEntriesResolverResult.java
@@ -1,14 +1,12 @@
 package org.jabref.model.texparser;
 
+import com.google.common.collect.Multimap;
 import java.nio.file.Path;
 import java.util.HashSet;
 import java.util.Objects;
 import java.util.Set;
-
 import org.jabref.model.entry.BibEntry;
 
-import com.google.common.collect.Multimap;
-
 public class LatexBibEntriesResolverResult {
 
     private final LatexParserResult latexParserResult;
@@ -47,9 +45,11 @@ public Multimap<String, Citation> getCitations() {
 
     @Override
     public String toString() {
-        return String.format("TexBibEntriesResolverResult{texParserResult=%s, newEntries=%s}",
-                this.latexParserResult,
-                this.newEntries);
+        return String.format(
+            "TexBibEntriesResolverResult{texParserResult=%s, newEntries=%s}",
+            this.latexParserResult,
+            this.newEntries
+        );
     }
 
     @Override
@@ -62,10 +62,13 @@ public boolean equals(Object obj) {
             return false;
         }
 
-        LatexBibEntriesResolverResult that = (LatexBibEntriesResolverResult) obj;
+        LatexBibEntriesResolverResult that =
+            (LatexBibEntriesResolverResult) obj;
 
-        return Objects.equals(latexParserResult, that.latexParserResult)
-                && Objects.equals(newEntries, that.newEntries);
+        return (
+            Objects.equals(latexParserResult, that.latexParserResult) &&
+            Objects.equals(newEntries, that.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 848fd7383e6..27921033d60 100644
--- a/src/main/java/org/jabref/model/texparser/LatexParserResult.java
+++ b/src/main/java/org/jabref/model/texparser/LatexParserResult.java
@@ -1,5 +1,7 @@
 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;
@@ -7,12 +9,8 @@
 import java.util.List;
 import java.util.Objects;
 import java.util.Set;
-
 import org.jabref.model.entry.BibEntry;
 
-import com.google.common.collect.HashMultimap;
-import com.google.common.collect.Multimap;
-
 public class LatexParserResult {
 
     private final List<Path> fileList;
@@ -63,7 +61,10 @@ public Collection<Citation> getCitationsByKey(String key) {
      * Return a collection of citations using a BibEntry as reference.
      */
     public Collection<Citation> getCitationsByKey(BibEntry entry) {
-        return entry.getCitationKey().map(this::getCitationsByKey).orElse(Collections.emptyList());
+        return entry
+            .getCitationKey()
+            .map(this::getCitationsByKey)
+            .orElse(Collections.emptyList());
     }
 
     /**
@@ -87,18 +88,27 @@ public void addBibFile(Path file, Path bibFile) {
     /**
      * Add a citation to the citations multimap.
      */
-    public void addKey(String key, Path file, int lineNumber, int start, int end, String line) {
+    public void addKey(
+        String key,
+        Path file,
+        int lineNumber,
+        int start,
+        int end,
+        String line
+    ) {
         Citation citation = new Citation(file, lineNumber, start, end, line);
         citations.put(key, citation);
     }
 
     @Override
     public String toString() {
-        return String.format("TexParserResult{fileList=%s, nestedFiles=%s, bibFiles=%s, citations=%s}",
-                this.fileList,
-                this.nestedFiles,
-                this.bibFiles,
-                this.citations);
+        return String.format(
+            "TexParserResult{fileList=%s, nestedFiles=%s, bibFiles=%s, citations=%s}",
+            this.fileList,
+            this.nestedFiles,
+            this.bibFiles,
+            this.citations
+        );
     }
 
     @Override
@@ -113,10 +123,12 @@ public boolean equals(Object obj) {
 
         LatexParserResult that = (LatexParserResult) obj;
 
-        return Objects.equals(fileList, that.fileList)
-                && Objects.equals(nestedFiles, that.nestedFiles)
-                && Objects.equals(bibFiles, that.bibFiles)
-                && Objects.equals(citations, that.citations);
+        return (
+            Objects.equals(fileList, that.fileList) &&
+            Objects.equals(nestedFiles, that.nestedFiles) &&
+            Objects.equals(bibFiles, that.bibFiles) &&
+            Objects.equals(citations, that.citations)
+        );
     }
 
     @Override
diff --git a/src/main/java/org/jabref/model/util/FileUpdateListener.java b/src/main/java/org/jabref/model/util/FileUpdateListener.java
index b4f812d5aab..b086ca27a6c 100644
--- a/src/main/java/org/jabref/model/util/FileUpdateListener.java
+++ b/src/main/java/org/jabref/model/util/FileUpdateListener.java
@@ -1,7 +1,6 @@
 package org.jabref.model.util;
 
 public interface FileUpdateListener {
-
     /**
      * The file has been updated. A new call will not result until the file has been modified again.
      */
diff --git a/src/main/java/org/jabref/model/util/FileUpdateMonitor.java b/src/main/java/org/jabref/model/util/FileUpdateMonitor.java
index 9575bf3a8d5..f895ec5eee8 100644
--- a/src/main/java/org/jabref/model/util/FileUpdateMonitor.java
+++ b/src/main/java/org/jabref/model/util/FileUpdateMonitor.java
@@ -10,7 +10,8 @@ public interface FileUpdateMonitor {
      * @param file The file to monitor.
      * @throws IOException if the file does not exist.
      */
-    void addListenerForFile(Path file, FileUpdateListener listener) throws IOException;
+    void addListenerForFile(Path file, FileUpdateListener listener)
+        throws IOException;
 
     /**
      * Removes a listener from the monitor.
diff --git a/src/main/java/org/jabref/model/util/ListUtil.java b/src/main/java/org/jabref/model/util/ListUtil.java
index 9f9589b05ab..38d15538dde 100644
--- a/src/main/java/org/jabref/model/util/ListUtil.java
+++ b/src/main/java/org/jabref/model/util/ListUtil.java
@@ -10,7 +10,10 @@ public class ListUtil {
     /**
      * Equivalent to list.stream().anyMatch but with slightly better performance (especially for small lists).
      */
-    public static <T> boolean anyMatch(Iterable<T> list, Predicate<T> predicate) {
+    public static <T> boolean anyMatch(
+        Iterable<T> list,
+        Predicate<T> predicate
+    ) {
         for (T element : list) {
             if (predicate.test(element)) {
                 return true;
@@ -22,7 +25,10 @@ public static <T> boolean anyMatch(Iterable<T> list, Predicate<T> predicate) {
     /**
      * Equivalent to list.stream().allMatch but with slightly better performance (especially for small lists).
      */
-    public static <T> boolean allMatch(Iterable<T> list, Predicate<T> predicate) {
+    public static <T> boolean allMatch(
+        Iterable<T> list,
+        Predicate<T> predicate
+    ) {
         for (T element : list) {
             if (!predicate.test(element)) {
                 return false;
diff --git a/src/main/java/org/jabref/model/util/MultiKeyMap.java b/src/main/java/org/jabref/model/util/MultiKeyMap.java
index f732724a26f..ab273dd52d0 100644
--- a/src/main/java/org/jabref/model/util/MultiKeyMap.java
+++ b/src/main/java/org/jabref/model/util/MultiKeyMap.java
@@ -6,6 +6,7 @@
 import java.util.Optional;
 
 public class MultiKeyMap<K1 extends Enum<K1>, K2, V> {
+
     private final EnumMap<K1, Map<K2, V>> map;
 
     public MultiKeyMap(Class<K1> keyType) {
diff --git a/src/main/java/org/jabref/model/util/OptionalUtil.java b/src/main/java/org/jabref/model/util/OptionalUtil.java
index 98034401791..156de9abaab 100644
--- a/src/main/java/org/jabref/model/util/OptionalUtil.java
+++ b/src/main/java/org/jabref/model/util/OptionalUtil.java
@@ -12,7 +12,11 @@
 
 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.isPresent()) {
             return !right.isPresent();
         } else {
@@ -43,15 +47,26 @@ 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) {
-        return value.stream().flatMap(element -> mapper.apply(element).stream());
+    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());
     }
 
-    public static <T> Boolean isPresentAnd(Optional<T> value, Predicate<T> check) {
+    public static <T> Boolean isPresentAnd(
+        Optional<T> value,
+        Predicate<T> check
+    ) {
         return value.isPresent() && check.test(value.get());
     }
 
@@ -59,15 +74,24 @@ 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()));
+            return Optional.ofNullable(
+                combine.apply(valueOne.get(), valueTwo.get())
+            );
         } else {
             return Optional.empty();
         }
     }
 
-    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/ResultingStringState.java b/src/main/java/org/jabref/model/util/ResultingStringState.java
index fc248cf7f8e..b6198723c34 100644
--- a/src/main/java/org/jabref/model/util/ResultingStringState.java
+++ b/src/main/java/org/jabref/model/util/ResultingStringState.java
@@ -1,6 +1,7 @@
 package org.jabref.model.util;
 
 public class ResultingStringState {
+
     public final int caretPosition;
     public final String text;
 
diff --git a/src/main/java/org/jabref/model/util/TreeCollector.java b/src/main/java/org/jabref/model/util/TreeCollector.java
index 8b1045d89eb..f2e6d4ea323 100644
--- a/src/main/java/org/jabref/model/util/TreeCollector.java
+++ b/src/main/java/org/jabref/model/util/TreeCollector.java
@@ -11,10 +11,8 @@
 import java.util.function.Function;
 import java.util.function.Supplier;
 import java.util.stream.Collector;
-
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableList;
-
 import org.jabref.model.TreeNode;
 
 /**
@@ -22,7 +20,8 @@
  * Nodes with a common parent are added as direct children.
  * For example, the list { A > A1, A > A2, B } is transformed into the forest { A > A1, A2, B}.
  */
-public class TreeCollector<T> implements Collector<T, ObservableList<T>, ObservableList<T>> {
+public class TreeCollector<T>
+    implements Collector<T, ObservableList<T>, ObservableList<T>> {
 
     private Function<T, List<T>> getChildren;
     private BiConsumer<T, T> addChild;
@@ -33,17 +32,24 @@ 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
@@ -56,9 +62,9 @@ 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();
+                .stream()
+                .filter(item -> equivalence.test(item, newItem))
+                .findFirst();
             if (sameItemInTree.isPresent()) {
                 for (T child : new ArrayList<>(getChildren.apply(newItem))) {
                     merge(sameItemInTree.get(), child);
@@ -71,9 +77,10 @@ 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();
+            .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
             for (T child : new ArrayList<>(getChildren.apply(node))) {
@@ -101,6 +108,9 @@ public Function<ObservableList<T>, ObservableList<T>> finisher() {
 
     @Override
     public Set<Characteristics> characteristics() {
-        return EnumSet.of(Characteristics.UNORDERED, Characteristics.IDENTITY_FINISH);
+        return EnumSet.of(
+            Characteristics.UNORDERED,
+            Characteristics.IDENTITY_FINISH
+        );
     }
 }
diff --git a/src/main/java/org/jabref/preferences/BibEntryPreferences.java b/src/main/java/org/jabref/preferences/BibEntryPreferences.java
index 0fb17bb413f..09190e93a4f 100644
--- a/src/main/java/org/jabref/preferences/BibEntryPreferences.java
+++ b/src/main/java/org/jabref/preferences/BibEntryPreferences.java
@@ -4,6 +4,7 @@
 import javafx.beans.property.SimpleObjectProperty;
 
 public class BibEntryPreferences {
+
     private final ObjectProperty<Character> keywordSeparator;
 
     public BibEntryPreferences(Character keywordSeparator) {
diff --git a/src/main/java/org/jabref/preferences/CleanupPreferences.java b/src/main/java/org/jabref/preferences/CleanupPreferences.java
index cf3b24491fa..5fb7547aa6c 100644
--- a/src/main/java/org/jabref/preferences/CleanupPreferences.java
+++ b/src/main/java/org/jabref/preferences/CleanupPreferences.java
@@ -3,12 +3,10 @@
 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 org.jabref.logic.cleanup.FieldFormatterCleanups;
 
 public class CleanupPreferences {
@@ -28,9 +26,13 @@ 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);
+        this.fieldFormatterCleanups =
+            new SimpleObjectProperty<>(formatterCleanups);
     }
 
     public EnumSet<CleanupStep> getActiveJobs() {
@@ -66,11 +68,15 @@ public FieldFormatterCleanups getFieldFormatterCleanups() {
         return fieldFormatterCleanups.get();
     }
 
-    protected ObjectProperty<FieldFormatterCleanups> fieldFormatterCleanupsProperty() {
+    protected ObjectProperty<
+        FieldFormatterCleanups
+    > fieldFormatterCleanupsProperty() {
         return fieldFormatterCleanups;
     }
 
-    public void setFieldFormatterCleanups(FieldFormatterCleanups fieldFormatters) {
+    public void setFieldFormatterCleanups(
+        FieldFormatterCleanups fieldFormatters
+    ) {
         fieldFormatterCleanups.setValue(fieldFormatters);
     }
 
@@ -101,6 +107,6 @@ public enum CleanupStep {
         DO_NOT_CONVERT_TIMESTAMP,
         MOVE_PDF,
         FIX_FILE_LINKS,
-        CLEAN_UP_ISSN
+        CLEAN_UP_ISSN,
     }
 }
diff --git a/src/main/java/org/jabref/preferences/ExportPreferences.java b/src/main/java/org/jabref/preferences/ExportPreferences.java
index 1e653f45c8a..20bd576852f 100644
--- a/src/main/java/org/jabref/preferences/ExportPreferences.java
+++ b/src/main/java/org/jabref/preferences/ExportPreferences.java
@@ -2,14 +2,12 @@
 
 import java.nio.file.Path;
 import java.util.List;
-
 import javafx.beans.property.ObjectProperty;
 import javafx.beans.property.SimpleObjectProperty;
 import javafx.beans.property.SimpleStringProperty;
 import javafx.beans.property.StringProperty;
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableList;
-
 import org.jabref.logic.exporter.TemplateExporter;
 import org.jabref.model.metadata.SaveOrder;
 
@@ -20,12 +18,16 @@ public class ExportPreferences {
     private final ObjectProperty<SaveOrder> exportSaveOrder;
     private final ObservableList<TemplateExporter> customExporters;
 
-    public ExportPreferences(String lastExportExtension,
-                             Path exportWorkingDirectory,
-                             SaveOrder exportSaveOrder,
-                             List<TemplateExporter> customExporters) {
-        this.lastExportExtension = new SimpleStringProperty(lastExportExtension);
-        this.exportWorkingDirectory = new SimpleObjectProperty<>(exportWorkingDirectory);
+    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);
         this.customExporters = FXCollections.observableList(customExporters);
     }
diff --git a/src/main/java/org/jabref/preferences/ExternalApplicationsPreferences.java b/src/main/java/org/jabref/preferences/ExternalApplicationsPreferences.java
index 45670b68a28..f0d879054fc 100644
--- a/src/main/java/org/jabref/preferences/ExternalApplicationsPreferences.java
+++ b/src/main/java/org/jabref/preferences/ExternalApplicationsPreferences.java
@@ -19,24 +19,29 @@ public class ExternalApplicationsPreferences {
     private final StringProperty customFileBrowserCommand;
     private final StringProperty kindleEmail;
 
-    public ExternalApplicationsPreferences(String eMailSubject,
-                                           boolean shouldAutoOpenEmailAttachmentsFolder,
-                                           String citeCommand,
-                                           String defaultCiteCommand,
-                                           boolean useCustomTerminal,
-                                           String customTerminalCommand,
-                                           boolean useCustomFileBrowser,
-                                           String customFileBrowserCommand,
-                                           String kindleEmail) {
-
+    public ExternalApplicationsPreferences(
+        String eMailSubject,
+        boolean shouldAutoOpenEmailAttachmentsFolder,
+        String citeCommand,
+        String defaultCiteCommand,
+        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 SimpleStringProperty(citeCommand);
         this.defaultCiteCommand = new SimpleStringProperty(defaultCiteCommand);
         this.useCustomTerminal = new SimpleBooleanProperty(useCustomTerminal);
-        this.customTerminalCommand = new SimpleStringProperty(customTerminalCommand);
-        this.useCustomFileBrowser = new SimpleBooleanProperty(useCustomFileBrowser);
-        this.customFileBrowserCommand = new SimpleStringProperty(customFileBrowserCommand);
+        this.customTerminalCommand =
+            new SimpleStringProperty(customTerminalCommand);
+        this.useCustomFileBrowser =
+            new SimpleBooleanProperty(useCustomFileBrowser);
+        this.customFileBrowserCommand =
+            new SimpleStringProperty(customFileBrowserCommand);
         this.kindleEmail = new SimpleStringProperty(kindleEmail);
     }
 
@@ -60,8 +65,12 @@ public BooleanProperty autoOpenEmailAttachmentsFolderProperty() {
         return shouldAutoOpenEmailAttachmentsFolder;
     }
 
-    public void setAutoOpenEmailAttachmentsFolder(boolean shouldAutoOpenEmailAttachmentsFolder) {
-        this.shouldAutoOpenEmailAttachmentsFolder.set(shouldAutoOpenEmailAttachmentsFolder);
+    public void setAutoOpenEmailAttachmentsFolder(
+        boolean shouldAutoOpenEmailAttachmentsFolder
+    ) {
+        this.shouldAutoOpenEmailAttachmentsFolder.set(
+                shouldAutoOpenEmailAttachmentsFolder
+            );
     }
 
     public String getCiteCommand() {
diff --git a/src/main/java/org/jabref/preferences/FilePreferences.java b/src/main/java/org/jabref/preferences/FilePreferences.java
index e937943fcca..6a2b626032f 100644
--- a/src/main/java/org/jabref/preferences/FilePreferences.java
+++ b/src/main/java/org/jabref/preferences/FilePreferences.java
@@ -5,7 +5,6 @@
 import java.util.Optional;
 import java.util.Set;
 import java.util.TreeSet;
-
 import javafx.beans.property.BooleanProperty;
 import javafx.beans.property.ObjectProperty;
 import javafx.beans.property.SimpleBooleanProperty;
@@ -14,7 +13,6 @@
 import javafx.beans.property.StringProperty;
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableSet;
-
 import org.jabref.gui.externalfiletype.ExternalFileType;
 import org.jabref.model.strings.StringUtil;
 
@@ -23,31 +21,46 @@
  */
 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();
-    private final BooleanProperty storeFilesRelativeToBibFile = new SimpleBooleanProperty();
+    private final SimpleStringProperty mainFileDirectory =
+        new SimpleStringProperty();
+    private final BooleanProperty storeFilesRelativeToBibFile =
+        new SimpleBooleanProperty();
     private final StringProperty fileNamePattern = new SimpleStringProperty();
-    private final StringProperty fileDirectoryPattern = new SimpleStringProperty();
-    private final BooleanProperty downloadLinkedFiles = new SimpleBooleanProperty();
-    private final BooleanProperty fulltextIndexLinkedFiles = new SimpleBooleanProperty();
-    private final ObjectProperty<Path> workingDirectory = new SimpleObjectProperty<>();
-    private final ObservableSet<ExternalFileType> externalFileTypes = FXCollections.observableSet(new TreeSet<>(Comparator.comparing(ExternalFileType::getName)));
+    private final StringProperty fileDirectoryPattern =
+        new SimpleStringProperty();
+    private final BooleanProperty downloadLinkedFiles =
+        new SimpleBooleanProperty();
+    private final BooleanProperty fulltextIndexLinkedFiles =
+        new SimpleBooleanProperty();
+    private final ObjectProperty<Path> workingDirectory =
+        new SimpleObjectProperty<>();
+    private final ObservableSet<ExternalFileType> externalFileTypes =
+        FXCollections.observableSet(
+            new TreeSet<>(Comparator.comparing(ExternalFileType::getName))
+        );
     private final BooleanProperty createBackup = new SimpleBooleanProperty();
-    private final ObjectProperty<Path> backupDirectory = new SimpleObjectProperty<>();
-
-    public FilePreferences(String userAndHost,
-                           String mainFileDirectory,
-                           boolean storeFilesRelativeToBibFile,
-                           String fileNamePattern,
-                           String fileDirectoryPattern,
-                           boolean downloadLinkedFiles,
-                           boolean fulltextIndexLinkedFiles,
-                           Path workingDirectory,
-                           Set<ExternalFileType> externalFileTypes,
-                           boolean createBackup,
-                           Path backupDirectory) {
+    private final ObjectProperty<Path> backupDirectory =
+        new SimpleObjectProperty<>();
+
+    public FilePreferences(
+        String userAndHost,
+        String mainFileDirectory,
+        boolean storeFilesRelativeToBibFile,
+        String fileNamePattern,
+        String fileDirectoryPattern,
+        boolean downloadLinkedFiles,
+        boolean fulltextIndexLinkedFiles,
+        Path workingDirectory,
+        Set<ExternalFileType> externalFileTypes,
+        boolean createBackup,
+        Path backupDirectory
+    ) {
         this.userAndHost.setValue(userAndHost);
         this.mainFileDirectory.setValue(mainFileDirectory);
         this.storeFilesRelativeToBibFile.setValue(storeFilesRelativeToBibFile);
@@ -89,7 +102,9 @@ public BooleanProperty storeFilesRelativeToBibFileProperty() {
         return storeFilesRelativeToBibFile;
     }
 
-    public void setStoreFilesRelativeToBibFile(boolean shouldStoreFilesRelativeToBibFile) {
+    public void setStoreFilesRelativeToBibFile(
+        boolean shouldStoreFilesRelativeToBibFile
+    ) {
         this.storeFilesRelativeToBibFile.set(shouldStoreFilesRelativeToBibFile);
     }
 
@@ -137,7 +152,9 @@ public BooleanProperty fulltextIndexLinkedFilesProperty() {
         return fulltextIndexLinkedFiles;
     }
 
-    public void setFulltextIndexLinkedFiles(boolean shouldFulltextIndexLinkedFiles) {
+    public void setFulltextIndexLinkedFiles(
+        boolean shouldFulltextIndexLinkedFiles
+    ) {
         this.fulltextIndexLinkedFiles.set(shouldFulltextIndexLinkedFiles);
     }
 
diff --git a/src/main/java/org/jabref/preferences/GuiPreferences.java b/src/main/java/org/jabref/preferences/GuiPreferences.java
index 06a948741a1..01cf4e010f3 100644
--- a/src/main/java/org/jabref/preferences/GuiPreferences.java
+++ b/src/main/java/org/jabref/preferences/GuiPreferences.java
@@ -2,7 +2,6 @@
 
 import java.nio.file.Path;
 import java.util.List;
-
 import javafx.beans.property.BooleanProperty;
 import javafx.beans.property.DoubleProperty;
 import javafx.beans.property.ObjectProperty;
@@ -13,11 +12,11 @@
 import javafx.beans.property.StringProperty;
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableList;
-
 import org.jabref.gui.mergeentries.DiffMode;
 import org.jabref.logic.util.io.FileHistory;
 
 public class GuiPreferences {
+
     private final DoubleProperty positionX;
     private final DoubleProperty positionY;
     private final DoubleProperty sizeX;
@@ -40,39 +39,47 @@ public class GuiPreferences {
     private final BooleanProperty mergeShowChangedFieldsOnly;
     private final DoubleProperty sidePaneWidth;
 
-    public GuiPreferences(double positionX,
-                          double positionY,
-                          double sizeX,
-                          double sizeY,
-                          boolean windowMaximised,
-                          boolean windowFullScreen,
-                          List<String> lastFilesOpened,
-                          Path lastFocusedFile,
-                          FileHistory fileHistory,
-                          String lastSelectedIdBasedFetcher,
-                          DiffMode mergeDiffMode,
-                          boolean mergeShouldShowDiff,
-                          boolean mergeShouldShowUnifiedDiff,
-                          boolean mergeHighlightWords,
-                          double sidePaneWidth,
-                          boolean mergeShowChangedFieldsOnly) {
+    public GuiPreferences(
+        double positionX,
+        double positionY,
+        double sizeX,
+        double sizeY,
+        boolean windowMaximised,
+        boolean windowFullScreen,
+        List<String> lastFilesOpened,
+        Path lastFocusedFile,
+        FileHistory fileHistory,
+        String lastSelectedIdBasedFetcher,
+        DiffMode mergeDiffMode,
+        boolean mergeShouldShowDiff,
+        boolean mergeShouldShowUnifiedDiff,
+        boolean mergeHighlightWords,
+        double sidePaneWidth,
+        boolean mergeShowChangedFieldsOnly
+    ) {
         this.positionX = new SimpleDoubleProperty(positionX);
         this.positionY = new SimpleDoubleProperty(positionY);
         this.sizeX = new SimpleDoubleProperty(sizeX);
         this.sizeY = new SimpleDoubleProperty(sizeY);
         this.windowMaximised = new SimpleBooleanProperty(windowMaximised);
         this.windowFullScreen = new SimpleBooleanProperty(windowFullScreen);
-        this.lastFilesOpened = FXCollections.observableArrayList(lastFilesOpened);
+        this.lastFilesOpened =
+            FXCollections.observableArrayList(lastFilesOpened);
         this.lastFocusedFile = new SimpleObjectProperty<>(lastFocusedFile);
-        this.lastSelectedIdBasedFetcher = new SimpleStringProperty(lastSelectedIdBasedFetcher);
+        this.lastSelectedIdBasedFetcher =
+            new SimpleStringProperty(lastSelectedIdBasedFetcher);
         this.mergeDiffMode = new SimpleObjectProperty<>(mergeDiffMode);
-        this.mergeShouldShowDiff = new SimpleBooleanProperty(mergeShouldShowDiff);
-        this.mergeShouldShowUnifiedDiff = new SimpleBooleanProperty(mergeShouldShowUnifiedDiff);
-        this.mergeHighlightWords = new SimpleBooleanProperty(mergeHighlightWords);
+        this.mergeShouldShowDiff =
+            new SimpleBooleanProperty(mergeShouldShowDiff);
+        this.mergeShouldShowUnifiedDiff =
+            new SimpleBooleanProperty(mergeShouldShowUnifiedDiff);
+        this.mergeHighlightWords =
+            new SimpleBooleanProperty(mergeHighlightWords);
 
         this.sidePaneWidth = new SimpleDoubleProperty(sidePaneWidth);
         this.fileHistory = fileHistory;
-        this.mergeShowChangedFieldsOnly = new SimpleBooleanProperty(mergeShowChangedFieldsOnly);
+        this.mergeShowChangedFieldsOnly =
+            new SimpleBooleanProperty(mergeShowChangedFieldsOnly);
     }
 
     public double getPositionX() {
@@ -179,7 +186,9 @@ public StringProperty lastSelectedIdBasedFetcherProperty() {
         return lastSelectedIdBasedFetcher;
     }
 
-    public void setLastSelectedIdBasedFetcher(String lastSelectedIdBasedFetcher) {
+    public void setLastSelectedIdBasedFetcher(
+        String lastSelectedIdBasedFetcher
+    ) {
         this.lastSelectedIdBasedFetcher.set(lastSelectedIdBasedFetcher);
     }
 
@@ -215,7 +224,9 @@ public BooleanProperty mergeShouldShowUnifiedDiffProperty() {
         return mergeShouldShowUnifiedDiff;
     }
 
-    public void setMergeShouldShowUnifiedDiff(boolean mergeShouldShowUnifiedDiff) {
+    public void setMergeShouldShowUnifiedDiff(
+        boolean mergeShouldShowUnifiedDiff
+    ) {
         this.mergeShouldShowUnifiedDiff.set(mergeShouldShowUnifiedDiff);
     }
 
diff --git a/src/main/java/org/jabref/preferences/InternalPreferences.java b/src/main/java/org/jabref/preferences/InternalPreferences.java
index 0276dc88ca0..17fb1480d2e 100644
--- a/src/main/java/org/jabref/preferences/InternalPreferences.java
+++ b/src/main/java/org/jabref/preferences/InternalPreferences.java
@@ -1,14 +1,12 @@
 package org.jabref.preferences;
 
 import java.nio.file.Path;
-
 import javafx.beans.property.BooleanProperty;
 import javafx.beans.property.ObjectProperty;
 import javafx.beans.property.SimpleBooleanProperty;
 import javafx.beans.property.SimpleObjectProperty;
 import javafx.beans.property.SimpleStringProperty;
 import javafx.beans.property.StringProperty;
-
 import org.jabref.logic.util.Version;
 
 public class InternalPreferences {
@@ -19,11 +17,13 @@ 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/preferences/JabRefPreferences.java b/src/main/java/org/jabref/preferences/JabRefPreferences.java
index e76d61223ff..51c002b2ce6 100644
--- a/src/main/java/org/jabref/preferences/JabRefPreferences.java
+++ b/src/main/java/org/jabref/preferences/JabRefPreferences.java
@@ -1,5 +1,9 @@
 package org.jabref.preferences;
 
+import com.github.javakeyring.Keyring;
+import com.github.javakeyring.PasswordAccessException;
+import com.tobiasdiez.easybind.EasyBind;
+import jakarta.inject.Singleton;
 import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
@@ -30,13 +34,11 @@
 import java.util.prefs.Preferences;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
-
 import javafx.beans.InvalidationListener;
 import javafx.collections.ListChangeListener;
 import javafx.collections.ObservableList;
 import javafx.collections.SetChangeListener;
 import javafx.scene.control.TableColumn.SortType;
-
 import org.jabref.gui.Globals;
 import org.jabref.gui.autocompleter.AutoCompleteFirstNameMode;
 import org.jabref.gui.autocompleter.AutoCompletePreferences;
@@ -119,11 +121,6 @@
 import org.jabref.model.metadata.SelfContainedSaveOrder;
 import org.jabref.model.search.rules.SearchRules;
 import org.jabref.model.strings.StringUtil;
-
-import com.github.javakeyring.Keyring;
-import com.github.javakeyring.PasswordAccessException;
-import com.tobiasdiez.easybind.EasyBind;
-import jakarta.inject.Singleton;
 import org.jvnet.hk2.annotations.Service;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -144,7 +141,8 @@ public class JabRefPreferences implements PreferencesService {
 
     // Push to application preferences
     public static final String PUSH_EMACS_PATH = "emacsPath";
-    public static final String PUSH_EMACS_ADDITIONAL_PARAMETERS = "emacsParameters";
+    public static final String PUSH_EMACS_ADDITIONAL_PARAMETERS =
+        "emacsParameters";
     public static final String PUSH_LYXPIPE = "lyxpipe";
     public static final String PUSH_TEXSTUDIO_PATH = "TeXstudioPath";
     public static final String PUSH_WINEDT_PATH = "winEdtPath";
@@ -171,16 +169,22 @@ public class JabRefPreferences implements PreferencesService {
     public static final String WINDOW_MAXIMISED = "windowMaximised";
     public static final String WINDOW_FULLSCREEN = "windowFullscreen";
 
-    public static final String REFORMAT_FILE_ON_SAVE_AND_EXPORT = "reformatFileOnSaveAndExport";
-    public static final String EXPORT_IN_ORIGINAL_ORDER = "exportInOriginalOrder";
-    public static final String EXPORT_IN_SPECIFIED_ORDER = "exportInSpecifiedOrder";
+    public static final String REFORMAT_FILE_ON_SAVE_AND_EXPORT =
+        "reformatFileOnSaveAndExport";
+    public static final String EXPORT_IN_ORIGINAL_ORDER =
+        "exportInOriginalOrder";
+    public static final String EXPORT_IN_SPECIFIED_ORDER =
+        "exportInSpecifiedOrder";
 
     public static final String EXPORT_PRIMARY_SORT_FIELD = "exportPriSort";
-    public static final String EXPORT_PRIMARY_SORT_DESCENDING = "exportPriDescending";
+    public static final String EXPORT_PRIMARY_SORT_DESCENDING =
+        "exportPriDescending";
     public static final String EXPORT_SECONDARY_SORT_FIELD = "exportSecSort";
-    public static final String EXPORT_SECONDARY_SORT_DESCENDING = "exportSecDescending";
+    public static final String EXPORT_SECONDARY_SORT_DESCENDING =
+        "exportSecDescending";
     public static final String EXPORT_TERTIARY_SORT_FIELD = "exportTerSort";
-    public static final String EXPORT_TERTIARY_SORT_DESCENDING = "exportTerDescending";
+    public static final String EXPORT_TERTIARY_SORT_DESCENDING =
+        "exportTerDescending";
     public static final String NEWLINE = "newline";
 
     // Variable names have changed to ensure backward compatibility with pre 5.0 releases of JabRef
@@ -190,12 +194,17 @@ public class JabRefPreferences implements PreferencesService {
     public static final String COLUMN_SORT_TYPES = "mainTableColumnSortTypes";
     public static final String COLUMN_SORT_ORDER = "mainTableColumnSortOrder";
 
-    public static final String SEARCH_DIALOG_COLUMN_WIDTHS = "searchTableColumnWidths";
-    public static final String SEARCH_DIALOG_COLUMN_SORT_TYPES = "searchDialogColumnSortTypes";
-    public static final String SEARCH_DIALOG_COLUMN_SORT_ORDER = "searchDalogColumnSortOrder";
-
-    public static final String SIDE_PANE_COMPONENT_PREFERRED_POSITIONS = "sidePaneComponentPreferredPositions";
-    public static final String SIDE_PANE_COMPONENT_NAMES = "sidePaneComponentNames";
+    public static final String SEARCH_DIALOG_COLUMN_WIDTHS =
+        "searchTableColumnWidths";
+    public static final String SEARCH_DIALOG_COLUMN_SORT_TYPES =
+        "searchDialogColumnSortTypes";
+    public static final String SEARCH_DIALOG_COLUMN_SORT_ORDER =
+        "searchDalogColumnSortOrder";
+
+    public static final String SIDE_PANE_COMPONENT_PREFERRED_POSITIONS =
+        "sidePaneComponentPreferredPositions";
+    public static final String SIDE_PANE_COMPONENT_NAMES =
+        "sidePaneComponentNames";
     public static final String XMP_PRIVACY_FILTERS = "xmpPrivacyFilters";
     public static final String USE_XMP_PRIVACY_FILTER = "useXmpPrivacyFilter";
     public static final String DEFAULT_SHOW_SOURCE = "defaultShowSource";
@@ -209,9 +218,11 @@ public class JabRefPreferences implements PreferencesService {
     public static final String OPEN_LAST_EDITED = "openLastEdited";
     public static final String LAST_FOCUSED = "lastFocused";
     public static final String AUTO_OPEN_FORM = "autoOpenForm";
-    public static final String IMPORT_WORKING_DIRECTORY = "importWorkingDirectory";
+    public static final String IMPORT_WORKING_DIRECTORY =
+        "importWorkingDirectory";
     public static final String LAST_USED_EXPORT = "lastUsedExport";
-    public static final String EXPORT_WORKING_DIRECTORY = "exportWorkingDirectory";
+    public static final String EXPORT_WORKING_DIRECTORY =
+        "exportWorkingDirectory";
     public static final String WORKING_DIRECTORY = "workingDirectory";
     public static final String BACKUP_DIRECTORY = "backupDirectory";
     public static final String CREATE_BACKUP = "createBackup";
@@ -220,7 +231,8 @@ public class JabRefPreferences implements PreferencesService {
     public static final String AUTO_ASSIGN_GROUP = "autoAssignGroup";
     public static final String DISPLAY_GROUP_COUNT = "displayGroupCount";
     public static final String EXTRA_FILE_COLUMNS = "extraFileColumns";
-    public static final String OVERRIDE_DEFAULT_FONT_SIZE = "overrideDefaultFontSize";
+    public static final String OVERRIDE_DEFAULT_FONT_SIZE =
+        "overrideDefaultFontSize";
     public static final String MAIN_FONT_SIZE = "mainFontSize";
 
     public static final String RECENT_DATABASES = "recentDatabases";
@@ -243,27 +255,35 @@ public class JabRefPreferences implements PreferencesService {
     public static final String ADD_CREATION_DATE = "addCreationDate";
     public static final String ADD_MODIFICATION_DATE = "addModificationDate";
 
-    public static final String WARN_ABOUT_DUPLICATES_IN_INSPECTION = "warnAboutDuplicatesInInspection";
+    public static final String WARN_ABOUT_DUPLICATES_IN_INSPECTION =
+        "warnAboutDuplicatesInInspection";
     public static final String NON_WRAPPABLE_FIELDS = "nonWrappableFields";
-    public static final String RESOLVE_STRINGS_FOR_FIELDS = "resolveStringsForFields";
+    public static final String RESOLVE_STRINGS_FOR_FIELDS =
+        "resolveStringsForFields";
     public static final String DO_NOT_RESOLVE_STRINGS = "doNotResolveStrings";
 
     // 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_HIGHLIGHT_WORDS = "mergeEntriesHighlightWords";
+    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_HIGHLIGHT_WORDS =
+        "mergeEntriesHighlightWords";
 
-
-    public static final String MERGE_SHOW_ONLY_CHANGED_FIELDS = "mergeShowOnlyChangedFields";
+    public static final String MERGE_SHOW_ONLY_CHANGED_FIELDS =
+        "mergeShowOnlyChangedFields";
 
     public static final String CUSTOM_EXPORT_FORMAT = "customExportFormat";
     public static final String CUSTOM_IMPORT_FORMAT = "customImportFormat";
     public static final String KEY_PATTERN_REGEX = "KeyPatternRegex";
-    public static final String KEY_PATTERN_REPLACEMENT = "KeyPatternReplacement";
+    public static final String KEY_PATTERN_REPLACEMENT =
+        "KeyPatternReplacement";
     public static final String CONSOLE_COMMAND = "consoleCommand";
-    public static final String USE_DEFAULT_CONSOLE_APPLICATION = "useDefaultConsoleApplication";
-    public static final String USE_DEFAULT_FILE_BROWSER_APPLICATION = "userDefaultFileBrowserApplication";
+    public static final String USE_DEFAULT_CONSOLE_APPLICATION =
+        "useDefaultConsoleApplication";
+    public static final String USE_DEFAULT_FILE_BROWSER_APPLICATION =
+        "userDefaultFileBrowserApplication";
     public static final String FILE_BROWSER_COMMAND = "fileBrowserCommand";
     public static final String MAIN_FILE_DIRECTORY = "fileDirectory";
 
@@ -284,10 +304,13 @@ public class JabRefPreferences implements PreferencesService {
 
     public static final String JOURNAL_POPUP = "journalPopup";
 
-    public static final String DEFAULT_CITATION_KEY_PATTERN = "defaultBibtexKeyPattern";
-    public static final String UNWANTED_CITATION_KEY_CHARACTERS = "defaultUnwantedBibtexKeyCharacters";
+    public static final String DEFAULT_CITATION_KEY_PATTERN =
+        "defaultBibtexKeyPattern";
+    public static final String UNWANTED_CITATION_KEY_CHARACTERS =
+        "defaultUnwantedBibtexKeyCharacters";
     public static final String CONFIRM_DELETE = "confirmDelete";
-    public static final String WARN_BEFORE_OVERWRITING_KEY = "warnBeforeOverwritingKey";
+    public static final String WARN_BEFORE_OVERWRITING_KEY =
+        "warnBeforeOverwritingKey";
     public static final String AVOID_OVERWRITING_KEY = "avoidOverwritingKey";
     public static final String AUTOLINK_EXACT_KEY_ONLY = "autolinkExactKeyOnly";
     public static final String AUTOLINK_FILES_ENABLED = "autoLinkFilesEnabled";
@@ -295,16 +318,22 @@ public class JabRefPreferences implements PreferencesService {
 
     public static final String CITE_COMMAND = "citeCommand";
 
-    public static final String GENERATE_KEYS_BEFORE_SAVING = "generateKeysBeforeSaving";
+    public static final String GENERATE_KEYS_BEFORE_SAVING =
+        "generateKeysBeforeSaving";
     public static final String EMAIL_SUBJECT = "emailSubject";
     public static final String KINDLE_EMAIL = "kindleEmail";
-    public static final String OPEN_FOLDERS_OF_ATTACHED_FILES = "openFoldersOfAttachedFiles";
-    public static final String KEY_GEN_ALWAYS_ADD_LETTER = "keyGenAlwaysAddLetter";
+    public static final String OPEN_FOLDERS_OF_ATTACHED_FILES =
+        "openFoldersOfAttachedFiles";
+    public static final String KEY_GEN_ALWAYS_ADD_LETTER =
+        "keyGenAlwaysAddLetter";
     public static final String KEY_GEN_FIRST_LETTER_A = "keyGenFirstLetterA";
-    public static final String ALLOW_INTEGER_EDITION_BIBTEX = "allowIntegerEditionBibtex";
+    public static final String ALLOW_INTEGER_EDITION_BIBTEX =
+        "allowIntegerEditionBibtex";
     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";
+    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
     public static final String STORE_RELATIVE_TO_BIB = "bibLocAsPrimaryDir";
     public static final String SELECTED_FETCHER_INDEX = "selectedFetcherIndex";
@@ -312,9 +341,11 @@ public class JabRefPreferences implements PreferencesService {
     public static final String GROUP_SIDEPANE_VISIBLE = "groupSidepaneVisible";
     public static final String CUSTOM_TAB_NAME = "customTabName_";
     public static final String CUSTOM_TAB_FIELDS = "customTabFields_";
-    public static final String ASK_AUTO_NAMING_PDFS_AGAIN = "AskAutoNamingPDFsAgain";
+    public static final String ASK_AUTO_NAMING_PDFS_AGAIN =
+        "AskAutoNamingPDFsAgain";
     public static final String CLEANUP_JOBS = "CleanUpJobs";
-    public static final String CLEANUP_FIELD_FORMATTERS_ENABLED = "CleanUpFormattersEnabled";
+    public static final String CLEANUP_FIELD_FORMATTERS_ENABLED =
+        "CleanUpFormattersEnabled";
     public static final String CLEANUP_FIELD_FORMATTERS = "CleanUpFormatters";
     public static final String IMPORT_FILENAMEPATTERN = "importFileNamePattern";
     public static final String IMPORT_FILEDIRPATTERN = "importFileDirPattern";
@@ -327,7 +358,8 @@ public class JabRefPreferences implements PreferencesService {
     public static final String SEND_LANGUAGE_DATA = "sendLanguageData";
     public static final String SEND_OS_DATA = "sendOSData";
     public static final String SEND_TIMEZONE_DATA = "sendTimezoneData";
-    public static final String VALIDATE_IN_ENTRY_EDITOR = "validateInEntryEditor";
+    public static final String VALIDATE_IN_ENTRY_EDITOR =
+        "validateInEntryEditor";
     public static final String SHOW_SCITE_TAB = "showSciteTab";
 
     /**
@@ -337,7 +369,8 @@ public class JabRefPreferences implements PreferencesService {
     public static final String OO_SHOW_PANEL = "showOOPanel";
     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";
+    public static final String OO_BIBLIOGRAPHY_STYLE_FILE =
+        "ooBibliographyStyleFile";
     public static final String OO_EXTERNAL_STYLE_FILES = "ooExternalStyleFiles";
 
     // Special field preferences
@@ -346,8 +379,10 @@ public class JabRefPreferences implements PreferencesService {
     // Prefs node for CitationKeyPatterns
     public static final String CITATION_KEY_PATTERNS_NODE = "bibtexkeypatterns";
     // Prefs node for customized entry types
-    public static final String CUSTOMIZED_BIBTEX_TYPES = "customizedBibtexTypes";
-    public static final String CUSTOMIZED_BIBLATEX_TYPES = "customizedBiblatexTypes";
+    public static final String CUSTOMIZED_BIBTEX_TYPES =
+        "customizedBibtexTypes";
+    public static final String CUSTOMIZED_BIBLATEX_TYPES =
+        "customizedBiblatexTypes";
     // Version
     public static final String VERSION_IGNORED_UPDATE = "versionIgnoreUpdate";
     public static final String VERSION_CHECK_ENABLED = "versionCheck";
@@ -355,7 +390,8 @@ public class JabRefPreferences implements PreferencesService {
     public static final String BINDINGS = "bindings";
 
     // AutcompleteFields - public because needed for pref migration
-    public static final String AUTOCOMPLETER_COMPLETE_FIELDS = "autoCompleteFields";
+    public static final String AUTOCOMPLETER_COMPLETE_FIELDS =
+        "autoCompleteFields";
 
     // Id Entry Generator Preferences
     public static final String ID_ENTRY_GENERATOR = "idEntryGenerator";
@@ -376,22 +412,27 @@ public class JabRefPreferences implements PreferencesService {
     private static final String PROXY_PORT = "proxyPort";
     private static final String PROXY_HOSTNAME = "proxyHostname";
     private static final String PROXY_USE = "useProxy";
-    private static final String PROXY_USE_AUTHENTICATION = "useProxyAuthentication";
+    private static final String PROXY_USE_AUTHENTICATION =
+        "useProxyAuthentication";
     private static final String PROXY_USERNAME = "proxyUsername";
     private static final String PROXY_PASSWORD = "proxyPassword";
     private static final String PROXY_PERSIST_PASSWORD = "persistPassword";
 
     // Web search
-    private static final String FETCHER_CUSTOM_KEY_NAMES = "fetcherCustomKeyNames";
-    private static final String FETCHER_CUSTOM_KEY_USES = "fetcherCustomKeyUses";
-    private static final String FETCHER_CUSTOM_KEY_PERSIST = "fetcherCustomKeyPersist";
+    private static final String FETCHER_CUSTOM_KEY_NAMES =
+        "fetcherCustomKeyNames";
+    private static final String FETCHER_CUSTOM_KEY_USES =
+        "fetcherCustomKeyUses";
+    private static final String FETCHER_CUSTOM_KEY_PERSIST =
+        "fetcherCustomKeyPersist";
 
     // SSL
     private static final String TRUSTSTORE_PATH = "truststorePath";
 
     // Auto completion
     private static final String AUTO_COMPLETE = "autoComplete";
-    private static final String AUTOCOMPLETER_FIRSTNAME_MODE = "autoCompFirstNameMode";
+    private static final String AUTOCOMPLETER_FIRSTNAME_MODE =
+        "autoCompFirstNameMode";
     private static final String AUTOCOMPLETER_LAST_FIRST = "autoCompLF";
     private static final String AUTOCOMPLETER_FIRST_LAST = "autoCompFF";
 
@@ -405,20 +446,28 @@ public class JabRefPreferences implements PreferencesService {
 
     // Telemetry collection
     private static final String COLLECT_TELEMETRY = "collectTelemetry";
-    private static final String ALREADY_ASKED_TO_COLLECT_TELEMETRY = "askedCollectTelemetry";
-    private static final String PROTECTED_TERMS_ENABLED_EXTERNAL = "protectedTermsEnabledExternal";
-    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 ALREADY_ASKED_TO_COLLECT_TELEMETRY =
+        "askedCollectTelemetry";
+    private static final String PROTECTED_TERMS_ENABLED_EXTERNAL =
+        "protectedTermsEnabledExternal";
+    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";
 
     // GroupViewMode
-    private static final String GROUP_INTERSECT_UNION_VIEW_MODE = "groupIntersectUnionViewModes";
-    private static final String DEFAULT_HIERARCHICAL_CONTEXT = "defaultHierarchicalContext";
+    private static final String GROUP_INTERSECT_UNION_VIEW_MODE =
+        "groupIntersectUnionViewModes";
+    private static final String DEFAULT_HIERARCHICAL_CONTEXT =
+        "defaultHierarchicalContext";
 
     // Dialog states
     private static final String PREFS_EXPORT_PATH = "prefsExportPath";
     private static final String DOWNLOAD_LINKED_FILES = "downloadLinkedFiles";
-    private static final String FULLTEXT_INDEX_LINKED_FILES = "fulltextIndexLinkedFiles";
+    private static final String FULLTEXT_INDEX_LINKED_FILES =
+        "fulltextIndexLinkedFiles";
 
     // Helper string
     private static final String USER_HOME = System.getProperty("user.home");
@@ -432,8 +481,12 @@ public class JabRefPreferences implements PreferencesService {
     private static final String USE_REMOTE_SERVER = "useRemoteServer";
     private static final String REMOTE_SERVER_PORT = "remoteServerPort";
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(JabRefPreferences.class);
-    private static final Preferences PREFS_NODE = Preferences.userRoot().node("/org/jabref");
+    private static final Logger LOGGER = LoggerFactory.getLogger(
+        JabRefPreferences.class
+    );
+    private static final Preferences PREFS_NODE = Preferences
+        .userRoot()
+        .node("/org/jabref");
 
     // The only instance of this class:
     private static JabRefPreferences singleton;
@@ -496,7 +549,11 @@ private JabRefPreferences() {
                 importPreferences(Path.of("jabref.xml"));
             }
         } catch (JabRefException e) {
-            LOGGER.warn("Could not import preferences from jabref.xml: " + e.getMessage(), e);
+            LOGGER.warn(
+                "Could not import preferences from jabref.xml: " +
+                e.getMessage(),
+                e
+            );
         }
 
         // load user preferences
@@ -516,23 +573,46 @@ private JabRefPreferences() {
         defaults.put(SEARCH_KEEP_GLOBAL_WINDOW_ON_TOP, Boolean.TRUE);
         defaults.put(SEARCH_WINDOW_HEIGHT, 176.0);
         defaults.put(SEARCH_WINDOW_WIDTH, 600.0);
-        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);
         defaults.put(GROBID_ENABLED, Boolean.FALSE);
         defaults.put(GROBID_OPT_OUT, Boolean.FALSE);
         defaults.put(GROBID_URL, "http://grobid.jabref.org:8070");
 
-        defaults.put(JOURNAL_POPUP, EntryEditorPreferences.JournalPopupEnabled.FIRST_START.toString());
+        defaults.put(
+            JOURNAL_POPUP,
+            EntryEditorPreferences.JournalPopupEnabled.FIRST_START.toString()
+        );
 
-        defaults.put(PUSH_TEXMAKER_PATH, OS.getNativeDesktop().detectProgramPath("texmaker", "Texmaker"));
-        defaults.put(PUSH_WINEDT_PATH, OS.getNativeDesktop().detectProgramPath("WinEdt", "WinEdt Team\\WinEdt"));
-        defaults.put(PUSH_TEXSTUDIO_PATH, OS.getNativeDesktop().detectProgramPath("texstudio", "TeXstudio"));
-        defaults.put(PUSH_SUBLIME_TEXT_PATH, OS.getNativeDesktop().detectProgramPath("subl", "Sublime"));
+        defaults.put(
+            PUSH_TEXMAKER_PATH,
+            OS.getNativeDesktop().detectProgramPath("texmaker", "Texmaker")
+        );
+        defaults.put(
+            PUSH_WINEDT_PATH,
+            OS
+                .getNativeDesktop()
+                .detectProgramPath("WinEdt", "WinEdt Team\\WinEdt")
+        );
+        defaults.put(
+            PUSH_TEXSTUDIO_PATH,
+            OS.getNativeDesktop().detectProgramPath("texstudio", "TeXstudio")
+        );
+        defaults.put(
+            PUSH_SUBLIME_TEXT_PATH,
+            OS.getNativeDesktop().detectProgramPath("subl", "Sublime")
+        );
         defaults.put(PUSH_LYXPIPE, USER_HOME + File.separator + ".lyx/lyxpipe");
         defaults.put(PUSH_VIM, "vim");
         defaults.put(PUSH_VIM_SERVER, "vim");
@@ -574,9 +654,14 @@ private JabRefPreferences() {
         defaults.put(PROXY_PERSIST_PASSWORD, Boolean.FALSE);
 
         // SSL
-        defaults.put(TRUSTSTORE_PATH, OS.getNativeDesktop()
-                                        .getSslDirectory()
-                                        .resolve("truststore.jks").toString());
+        defaults.put(
+            TRUSTSTORE_PATH,
+            OS
+                .getNativeDesktop()
+                .getSslDirectory()
+                .resolve("truststore.jks")
+                .toString()
+        );
 
         defaults.put(POS_X, 0);
         defaults.put(POS_Y, 0);
@@ -601,9 +686,15 @@ private JabRefPreferences() {
         defaults.put(EXPORT_IN_SPECIFIED_ORDER, Boolean.FALSE);
 
         // export order: if EXPORT_IN_SPECIFIED_ORDER, then use following criteria
-        defaults.put(EXPORT_PRIMARY_SORT_FIELD, InternalField.KEY_FIELD.getName());
+        defaults.put(
+            EXPORT_PRIMARY_SORT_FIELD,
+            InternalField.KEY_FIELD.getName()
+        );
         defaults.put(EXPORT_PRIMARY_SORT_DESCENDING, Boolean.FALSE);
-        defaults.put(EXPORT_SECONDARY_SORT_FIELD, StandardField.AUTHOR.getName());
+        defaults.put(
+            EXPORT_SECONDARY_SORT_FIELD,
+            StandardField.AUTHOR.getName()
+        );
         defaults.put(EXPORT_SECONDARY_SORT_DESCENDING, Boolean.FALSE);
         defaults.put(EXPORT_TERTIARY_SORT_FIELD, StandardField.TITLE.getName());
         defaults.put(EXPORT_TERTIARY_SORT_DESCENDING, Boolean.FALSE);
@@ -613,10 +704,16 @@ private JabRefPreferences() {
         defaults.put(SIDE_PANE_COMPONENT_NAMES, "");
         defaults.put(SIDE_PANE_COMPONENT_PREFERRED_POSITIONS, "");
 
-        defaults.put(COLUMN_NAMES, "groups;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,
+            "groups;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, "28;28;28;75;300;470;60;130;50;50;50");
 
-        defaults.put(XMP_PRIVACY_FILTERS, "pdf;timestamp;keywords;owner;note;review");
+        defaults.put(
+            XMP_PRIVACY_FILTERS,
+            "pdf;timestamp;keywords;owner;note;review"
+        );
         defaults.put(USE_XMP_PRIVACY_FILTER, Boolean.FALSE);
         defaults.put(WORKING_DIRECTORY, USER_HOME);
         defaults.put(EXPORT_WORKING_DIRECTORY, USER_HOME);
@@ -647,14 +744,26 @@ private JabRefPreferences() {
         defaults.put(SEND_TIMEZONE_DATA, Boolean.FALSE);
         defaults.put(VALIDATE_IN_ENTRY_EDITOR, Boolean.TRUE);
         defaults.put(AUTO_COMPLETE, Boolean.FALSE);
-        defaults.put(AUTOCOMPLETER_FIRSTNAME_MODE, AutoCompleteFirstNameMode.BOTH.name());
+        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_COMPLETE_FIELDS,
+            "author;editor;title;journal;publisher;keywords;crossref;related;entryset"
+        );
         defaults.put(AUTO_ASSIGN_GROUP, Boolean.TRUE);
         defaults.put(DISPLAY_GROUP_COUNT, Boolean.TRUE);
-        defaults.put(GROUP_INTERSECT_UNION_VIEW_MODE, GroupViewMode.INTERSECTION.name());
-        defaults.put(DEFAULT_HIERARCHICAL_CONTEXT, GroupHierarchyType.INDEPENDENT.name());
+        defaults.put(
+            GROUP_INTERSECT_UNION_VIEW_MODE,
+            GroupViewMode.INTERSECTION.name()
+        );
+        defaults.put(
+            DEFAULT_HIERARCHICAL_CONTEXT,
+            GroupHierarchyType.INDEPENDENT.name()
+        );
         defaults.put(KEYWORD_SEPARATOR, ", ");
         defaults.put(DEFAULT_ENCODING, StandardCharsets.UTF_8.name());
         defaults.put(DEFAULT_OWNER, System.getProperty("user.name"));
@@ -663,29 +772,47 @@ private JabRefPreferences() {
 
         defaults.put(EXTRA_FILE_COLUMNS, 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, "");
 
         // OpenOffice/LibreOffice
         if (OS.WINDOWS) {
-            defaults.put(OO_EXECUTABLE_PATH, OpenOfficePreferences.DEFAULT_WIN_EXEC_PATH);
+            defaults.put(
+                OO_EXECUTABLE_PATH,
+                OpenOfficePreferences.DEFAULT_WIN_EXEC_PATH
+            );
         } else if (OS.OS_X) {
-            defaults.put(OO_EXECUTABLE_PATH, OpenOfficePreferences.DEFAULT_OSX_EXEC_PATH);
+            defaults.put(
+                OO_EXECUTABLE_PATH,
+                OpenOfficePreferences.DEFAULT_OSX_EXEC_PATH
+            );
         } else { // Linux
-            defaults.put(OO_EXECUTABLE_PATH, OpenOfficePreferences.DEFAULT_LINUX_EXEC_PATH);
+            defaults.put(
+                OO_EXECUTABLE_PATH,
+                OpenOfficePreferences.DEFAULT_LINUX_EXEC_PATH
+            );
         }
 
         defaults.put(OO_SYNC_WHEN_CITING, Boolean.TRUE);
         defaults.put(OO_SHOW_PANEL, Boolean.FALSE);
         defaults.put(OO_USE_ALL_OPEN_BASES, Boolean.TRUE);
-        defaults.put(OO_BIBLIOGRAPHY_STYLE_FILE, StyleLoader.DEFAULT_AUTHORYEAR_STYLE_PATH);
+        defaults.put(
+            OO_BIBLIOGRAPHY_STYLE_FILE,
+            StyleLoader.DEFAULT_AUTHORYEAR_STYLE_PATH
+        );
         defaults.put(OO_EXTERNAL_STYLE_FILES, "");
 
         defaults.put(SPECIALFIELDSENABLED, Boolean.TRUE);
 
-        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);
 
@@ -696,7 +823,10 @@ private JabRefPreferences() {
         defaults.put(CONFIRM_DELETE, 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);
@@ -741,12 +871,26 @@ private JabRefPreferences() {
         defaults.put(ALREADY_ASKED_TO_COLLECT_TELEMETRY, 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]);
+        defaults.put(
+            IMPORT_FILENAMEPATTERN,
+            FilePreferences.DEFAULT_FILENAME_PATTERNS[1]
+        );
         // Default empty String to be backwards compatible
         defaults.put(IMPORT_FILEDIRPATTERN, "");
         // Download files by default
@@ -761,8 +905,14 @@ private JabRefPreferences() {
         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(FILE_BROWSER_COMMAND, "explorer.exe /select, \"%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, "");
             defaults.put(FILE_BROWSER_COMMAND, "");
@@ -776,25 +926,27 @@ private JabRefPreferences() {
         defaults.put(CYCLE_PREVIEW, "Preview;" + CitationStyle.DEFAULT);
         defaults.put(CYCLE_PREVIEW_POS, 0);
         defaults.put(PREVIEW_AS_TAB, 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[HTMLChars]{\\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[HTMLChars]{\\comment}\\end{comment}__NEWLINE__" +
+            "</font>__NEWLINE__"
+        );
 
         // set default theme
         defaults.put(THEME, Theme.BASE_CSS);
@@ -805,15 +957,25 @@ private JabRefPreferences() {
     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:
-        defaults.put(CUSTOM_TAB_FIELDS + "_def1", StandardField.ABSTRACT.getName());
+        defaults.put(
+            CUSTOM_TAB_FIELDS + "_def1",
+            StandardField.ABSTRACT.getName()
+        );
         defaults.put(CUSTOM_TAB_NAME + "_def1", Localization.lang("Abstract"));
 
         // Entry editor tab 2: Comments Field - used for research comments, etc.
-        defaults.put(CUSTOM_TAB_FIELDS + "_def2", StandardField.COMMENT.getName());
+        defaults.put(
+            CUSTOM_TAB_FIELDS + "_def2",
+            StandardField.COMMENT.getName()
+        );
         defaults.put(CUSTOM_TAB_NAME + "_def2", Localization.lang("Comments"));
 
         defaults.put(EMAIL_SUBJECT, Localization.lang("References"));
@@ -836,7 +998,12 @@ public static JabRefPreferences getInstance() {
     //*************************************************************************************************************
 
     private 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()));
     }
 
     private static List<String> convertStringToList(String toConvert) {
@@ -857,7 +1024,8 @@ private static List<String> convertStringToList(String toConvert) {
         return result;
     }
 
-    private static Optional<String> getNextUnit(Reader data) throws IOException {
+    private static Optional<String> getNextUnit(Reader data)
+        throws IOException {
         // character last read
         // -1 if end of stream
         // initialization necessary, because of Java compiler
@@ -1022,7 +1190,9 @@ 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();
     }
 
@@ -1050,7 +1220,11 @@ 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 {
@@ -1077,7 +1251,10 @@ 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));
         }
@@ -1141,9 +1318,10 @@ public void exportPreferences(Path path) throws JabRefException {
             prefs.exportSubtree(os);
         } catch (BackingStoreException | IOException ex) {
             throw new JabRefException(
-                    "Could not export preferences",
-                    Localization.lang("Could not export preferences"),
-                    ex);
+                "Could not export preferences",
+                Localization.lang("Could not export preferences"),
+                ex
+            );
         }
     }
 
@@ -1159,9 +1337,10 @@ public void importPreferences(Path file) throws JabRefException {
             Preferences.importPreferences(is);
         } catch (InvalidPreferencesFormatException | IOException ex) {
             throw new JabRefException(
-                    "Could not import preferences",
-                    Localization.lang("Could not import preferences"),
-                    ex);
+                "Could not import preferences",
+                Localization.lang("Could not import preferences"),
+                ex
+            );
         }
     }
 
@@ -1172,17 +1351,23 @@ public void importPreferences(Path file) throws JabRefException {
     @Override
     public LayoutFormatterPreferences getLayoutFormatterPreferences() {
         return new LayoutFormatterPreferences(
-                getNameFormatterPreferences(),
-                getFilePreferences().mainFileDirectoryProperty());
+            getNameFormatterPreferences(),
+            getFilePreferences().mainFileDirectoryProperty()
+        );
     }
 
     @Override
     public KeyBindingRepository getKeyBindingRepository() {
-        return new KeyBindingRepository(getStringList(BIND_NAMES), getStringList(BINDINGS));
+        return new KeyBindingRepository(
+            getStringList(BIND_NAMES),
+            getStringList(BINDINGS)
+        );
     }
 
     @Override
-    public void storeKeyBindingRepository(KeyBindingRepository keyBindingRepository) {
+    public void storeKeyBindingRepository(
+        KeyBindingRepository keyBindingRepository
+    ) {
         putStringList(BIND_NAMES, keyBindingRepository.getBindNames());
         putStringList(BINDINGS, keyBindingRepository.getBindings());
     }
@@ -1193,14 +1378,25 @@ public JournalAbbreviationPreferences getJournalAbbreviationPreferences() {
             return journalAbbreviationPreferences;
         }
 
-        journalAbbreviationPreferences = new 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(),
-                (obs, oldValue, newValue) -> putBoolean(USE_AMS_FJOURNAL, newValue));
+                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;
     }
@@ -1212,19 +1408,34 @@ public JournalAbbreviationPreferences getJournalAbbreviationPreferences() {
     @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;
     }
 
-    private List<BibEntryType> getBibEntryTypes(BibDatabaseMode bibDatabaseMode) {
+    private List<BibEntryType> getBibEntryTypes(
+        BibDatabaseMode bibDatabaseMode
+    ) {
         List<BibEntryType> storedEntryTypes = new ArrayList<>();
-        Preferences prefsNode = getPrefsNodeForCustomizedEntryTypes(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));
+            Arrays
+                .stream(prefsNode.keys())
+                .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);
         }
@@ -1248,21 +1459,39 @@ private void clearBibEntryTypes(BibDatabaseMode mode) {
     }
 
     @Override
-    public void storeCustomEntryTypesRepository(BibEntryTypesManager entryTypesManager) {
+    public void storeCustomEntryTypesRepository(
+        BibEntryTypesManager entryTypesManager
+    ) {
         clearAllBibEntryTypes();
-        storeBibEntryTypes(entryTypesManager.getAllTypes(BibDatabaseMode.BIBTEX), BibDatabaseMode.BIBTEX);
-        storeBibEntryTypes(entryTypesManager.getAllTypes(BibDatabaseMode.BIBLATEX), BibDatabaseMode.BIBLATEX);
+        storeBibEntryTypes(
+            entryTypesManager.getAllTypes(BibDatabaseMode.BIBTEX),
+            BibDatabaseMode.BIBTEX
+        );
+        storeBibEntryTypes(
+            entryTypesManager.getAllTypes(BibDatabaseMode.BIBLATEX),
+            BibDatabaseMode.BIBLATEX
+        );
     }
 
-    private void storeBibEntryTypes(Collection<BibEntryType> bibEntryTypes, BibDatabaseMode bibDatabaseMode) {
-        Preferences prefsNode = getPrefsNodeForCustomizedEntryTypes(bibDatabaseMode);
+    private void storeBibEntryTypes(
+        Collection<BibEntryType> bibEntryTypes,
+        BibDatabaseMode bibDatabaseMode
+    ) {
+        Preferences prefsNode = getPrefsNodeForCustomizedEntryTypes(
+            bibDatabaseMode
+        );
 
         try {
             // clear old custom types
             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) {
@@ -1270,10 +1499,12 @@ private void storeBibEntryTypes(Collection<BibEntryType> bibEntryTypes, BibDatab
         }
     }
 
-    private static Preferences getPrefsNodeForCustomizedEntryTypes(BibDatabaseMode mode) {
+    private static Preferences getPrefsNodeForCustomizedEntryTypes(
+        BibDatabaseMode mode
+    ) {
         return mode == BibDatabaseMode.BIBTEX
-                ? PREFS_NODE.node(CUSTOMIZED_BIBTEX_TYPES)
-                : PREFS_NODE.node(CUSTOMIZED_BIBLATEX_TYPES);
+            ? PREFS_NODE.node(CUSTOMIZED_BIBTEX_TYPES)
+            : PREFS_NODE.node(CUSTOMIZED_BIBLATEX_TYPES);
     }
 
     //*************************************************************************************************************
@@ -1286,19 +1517,43 @@ public OpenOfficePreferences getOpenOfficePreferences() {
             return openOfficePreferences;
         }
 
-        openOfficePreferences = new OpenOfficePreferences(
+        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));
+                get(OO_BIBLIOGRAPHY_STYLE_FILE)
+            );
 
-        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.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.currentStyleProperty(), (obs, oldValue, newValue) -> put(OO_BIBLIOGRAPHY_STYLE_FILE, newValue));
+        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.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.currentStyleProperty(),
+            (obs, oldValue, newValue) ->
+                put(OO_BIBLIOGRAPHY_STYLE_FILE, newValue)
+        );
 
         return openOfficePreferences;
     }
@@ -1309,14 +1564,32 @@ public LibraryPreferences getLibraryPreferences() {
             return libraryPreferences;
         }
 
-        libraryPreferences = new LibraryPreferences(
-                getBoolean(BIBLATEX_DEFAULT_MODE) ? BibDatabaseMode.BIBLATEX : BibDatabaseMode.BIBTEX,
+        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));
+                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;
     }
@@ -1327,14 +1600,22 @@ public TelemetryPreferences getTelemetryPreferences() {
             return telemetryPreferences;
         }
 
-        telemetryPreferences = new TelemetryPreferences(
+        telemetryPreferences =
+            new TelemetryPreferences(
                 getBoolean(COLLECT_TELEMETRY),
                 !getBoolean(ALREADY_ASKED_TO_COLLECT_TELEMETRY), // mind the !
                 getTelemetryUserId()
-        );
+            );
 
-        EasyBind.listen(telemetryPreferences.collectTelemetryProperty(), (obs, oldValue, newValue) -> putBoolean(COLLECT_TELEMETRY, newValue));
-        EasyBind.listen(telemetryPreferences.askToCollectTelemetryProperty(), (obs, oldValue, newValue) -> putBoolean(ALREADY_ASKED_TO_COLLECT_TELEMETRY, !newValue));
+        EasyBind.listen(
+            telemetryPreferences.collectTelemetryProperty(),
+            (obs, oldValue, newValue) -> putBoolean(COLLECT_TELEMETRY, newValue)
+        );
+        EasyBind.listen(
+            telemetryPreferences.askToCollectTelemetryProperty(),
+            (obs, oldValue, newValue) ->
+                putBoolean(ALREADY_ASKED_TO_COLLECT_TELEMETRY, !newValue)
+        );
 
         return telemetryPreferences;
     }
@@ -1356,12 +1637,21 @@ public DOIPreferences getDOIPreferences() {
             return doiPreferences;
         }
 
-        doiPreferences = new DOIPreferences(
+        doiPreferences =
+            new DOIPreferences(
                 getBoolean(USE_CUSTOM_DOI_URI),
-                get(BASE_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;
     }
@@ -1372,20 +1662,31 @@ public OwnerPreferences getOwnerPreferences() {
             return ownerPreferences;
         }
 
-        ownerPreferences = new OwnerPreferences(
+        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;
-            filePreferences = null;
-            internalPreferences = null;
-        });
-        EasyBind.listen(ownerPreferences.overwriteOwnerProperty(), (obs, oldValue, newValue) -> putBoolean(OVERWRITE_OWNER, newValue));
+                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;
+                filePreferences = null;
+                internalPreferences = null;
+            }
+        );
+        EasyBind.listen(
+            ownerPreferences.overwriteOwnerProperty(),
+            (obs, oldValue, newValue) -> putBoolean(OVERWRITE_OWNER, newValue)
+        );
 
         return ownerPreferences;
     }
@@ -1396,15 +1697,24 @@ public TimestampPreferences getTimestampPreferences() {
             return timestampPreferences;
         }
 
-        timestampPreferences = new 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));
+                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;
     }
@@ -1415,17 +1725,33 @@ public GroupsPreferences getGroupsPreferences() {
             return groupsPreferences;
         }
 
-        groupsPreferences = new GroupsPreferences(
+        groupsPreferences =
+            new GroupsPreferences(
                 GroupViewMode.valueOf(get(GROUP_INTERSECT_UNION_VIEW_MODE)),
                 getBoolean(AUTO_ASSIGN_GROUP),
                 getBoolean(DISPLAY_GROUP_COUNT),
                 GroupHierarchyType.valueOf(get(DEFAULT_HIERARCHICAL_CONTEXT))
-        );
+            );
 
-        EasyBind.listen(groupsPreferences.groupViewModeProperty(), (obs, oldValue, newValue) -> put(GROUP_INTERSECT_UNION_VIEW_MODE, newValue.name()));
-        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()));
+        EasyBind.listen(
+            groupsPreferences.groupViewModeProperty(),
+            (obs, oldValue, newValue) ->
+                put(GROUP_INTERSECT_UNION_VIEW_MODE, newValue.name())
+        );
+        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;
     }
@@ -1440,7 +1766,8 @@ public EntryEditorPreferences getEntryEditorPreferences() {
             return entryEditorPreferences;
         }
 
-        entryEditorPreferences = new EntryEditorPreferences(
+        entryEditorPreferences =
+            new EntryEditorPreferences(
                 getEntryEditorTabs(),
                 getDefaultEntryEditorTabs(),
                 getBoolean(AUTO_OPEN_FORM),
@@ -1451,21 +1778,64 @@ public EntryEditorPreferences getEntryEditorPreferences() {
                 getBoolean(ALLOW_INTEGER_EDITION_BIBTEX),
                 getDouble(ENTRY_EDITOR_HEIGHT),
                 getBoolean(AUTOLINK_FILES_ENABLED),
-                EntryEditorPreferences.JournalPopupEnabled.fromString(get(JOURNAL_POPUP)),
-                getBoolean(SHOW_SCITE_TAB));
-
-        EasyBind.listen(entryEditorPreferences.entryEditorTabs(), (obs, oldValue, newValue) -> storeEntryEditorTabs(newValue));
+                EntryEditorPreferences.JournalPopupEnabled.fromString(
+                    get(JOURNAL_POPUP)
+                ),
+                getBoolean(SHOW_SCITE_TAB)
+            );
+
+        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.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.shouldOpenOnNewEntryProperty(),
+            (obs, oldValue, newValue) -> putBoolean(AUTO_OPEN_FORM, newValue)
+        );
+        EasyBind.listen(
+            entryEditorPreferences.shouldShowRecommendationsTabProperty(),
+            (obs, oldValue, newValue) ->
+                putBoolean(SHOW_RECOMMENDATIONS, 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)
+        );
 
         return entryEditorPreferences;
     }
@@ -1487,7 +1857,10 @@ private Map<String, Set<Field>> getEntryEditorTabs() {
         }
 
         for (int i = 0; i < tabNames.size(); i++) {
-            tabs.put(tabNames.get(i), FieldFactory.parseFieldList(tabFields.get(i)));
+            tabs.put(
+                tabNames.get(i),
+                FieldFactory.parseFieldList(tabFields.get(i))
+            );
         }
         return tabs;
     }
@@ -1499,11 +1872,18 @@ 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]);
@@ -1522,14 +1902,28 @@ private Map<String, Set<Field>> getDefaultEntryEditorTabs() {
         int defNumber = 0;
         while (true) {
             // Saved as 'CUSTOMTABNAME_def{number}' and seperated by ';'
-            String name = (String) defaults.get(CUSTOM_TAB_NAME + "_def" + defNumber);
-            String fields = (String) defaults.get(CUSTOM_TAB_FIELDS + "_def" + defNumber);
-
-            if (StringUtil.isNullOrEmpty(name) || StringUtil.isNullOrEmpty(fields)) {
+            String name = (String) defaults.get(
+                CUSTOM_TAB_NAME + "_def" + defNumber
+            );
+            String fields = (String) defaults.get(
+                CUSTOM_TAB_FIELDS + "_def" + defNumber
+            );
+
+            if (
+                StringUtil.isNullOrEmpty(name) ||
+                StringUtil.isNullOrEmpty(fields)
+            ) {
                 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;
@@ -1545,12 +1939,20 @@ public RemotePreferences getRemotePreferences() {
             return remotePreferences;
         }
 
-        remotePreferences = new RemotePreferences(
+        remotePreferences =
+            new RemotePreferences(
                 getInt(REMOTE_SERVER_PORT),
-                getBoolean(USE_REMOTE_SERVER));
+                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;
     }
@@ -1561,31 +1963,55 @@ public ProxyPreferences getProxyPreferences() {
             return proxyPreferences;
         }
 
-        proxyPreferences = new 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");
+                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;
     }
@@ -1594,11 +2020,14 @@ private String getProxyPassword() {
         if (getBoolean(PROXY_PERSIST_PASSWORD)) {
             try (final Keyring keyring = Keyring.create()) {
                 return new Password(
-                        keyring.getPassword("org.jabref", "proxy"),
-                        getInternalPreferences().getUserAndHost())
-                        .decrypt();
+                    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");
+                LOGGER.warn(
+                    "JabRef uses proxy password from key store but no password is stored"
+                );
             } catch (Exception ex) {
                 LOGGER.warn("JabRef could not open the key store");
             }
@@ -1612,10 +2041,15 @@ private void setProxyPassword(String password) {
                 if (StringUtil.isBlank(password)) {
                     keyring.deletePassword("org.jabref", "proxy");
                 } else {
-                    keyring.setPassword("org.jabref", "proxy", new Password(
+                    keyring.setPassword(
+                        "org.jabref",
+                        "proxy",
+                        new Password(
                             password.trim(),
-                            getInternalPreferences().getUserAndHost())
-                            .encrypt());
+                            getInternalPreferences().getUserAndHost()
+                        )
+                            .encrypt()
+                    );
                 }
             } catch (Exception ex) {
                 LOGGER.warn("Unable to open key store", ex);
@@ -1629,9 +2063,7 @@ public SSLPreferences getSSLPreferences() {
             return sslPreferences;
         }
 
-        sslPreferences = new SSLPreferences(
-                get(TRUSTSTORE_PATH)
-        );
+        sslPreferences = new SSLPreferences(get(TRUSTSTORE_PATH));
 
         return sslPreferences;
     }
@@ -1641,27 +2073,37 @@ public SSLPreferences getSSLPreferences() {
     //*************************************************************************************************************
 
     private GlobalCitationKeyPattern getGlobalCitationKeyPattern() {
-        GlobalCitationKeyPattern citationKeyPattern = GlobalCitationKeyPattern.fromPattern(get(DEFAULT_CITATION_KEY_PATTERN));
+        GlobalCitationKeyPattern citationKeyPattern =
+            GlobalCitationKeyPattern.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);
+        } catch (BackingStoreException ex) {
+            LOGGER.info(
+                "BackingStoreException in JabRefPreferences.getKeyPattern",
+                ex
+            );
         }
 
         return citationKeyPattern;
     }
 
     // public for use in PreferenceMigrations
-    public void storeGlobalCitationKeyPattern(GlobalCitationKeyPattern pattern) {
-        if ((pattern.getDefaultValue() == null)
-                || pattern.getDefaultValue().isEmpty()) {
+    public void storeGlobalCitationKeyPattern(
+        GlobalCitationKeyPattern pattern
+    ) {
+        if (
+            (pattern.getDefaultValue() == null) ||
+            pattern.getDefaultValue().isEmpty()
+        ) {
             put(DEFAULT_CITATION_KEY_PATTERN, "");
         } else {
             put(DEFAULT_CITATION_KEY_PATTERN, pattern.getDefaultValue().get(0));
@@ -1671,15 +2113,20 @@ public void storeGlobalCitationKeyPattern(GlobalCitationKeyPattern pattern) {
         Preferences preferences = PREFS_NODE.node(CITATION_KEY_PATTERNS_NODE);
         try {
             preferences.clear(); // We remove all old entries.
-        } catch (
-                BackingStoreException ex) {
-            LOGGER.info("BackingStoreException in JabRefPreferences::putKeyPattern", ex);
+        } catch (BackingStoreException ex) {
+            LOGGER.info(
+                "BackingStoreException in JabRefPreferences::putKeyPattern",
+                ex
+            );
         }
 
         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).get(0));
+                preferences.put(
+                    entryType.getName(),
+                    pattern.getValue(entryType).get(0)
+                );
             }
         }
     }
@@ -1687,7 +2134,8 @@ public void storeGlobalCitationKeyPattern(GlobalCitationKeyPattern pattern) {
     private void clearCitationKeyPatterns() throws BackingStoreException {
         Preferences preferences = PREFS_NODE.node(CITATION_KEY_PATTERNS_NODE);
         preferences.clear();
-        getCitationKeyPatternPreferences().setKeyPattern(getGlobalCitationKeyPattern());
+        getCitationKeyPatternPreferences()
+            .setKeyPattern(getGlobalCitationKeyPattern());
     }
 
     @Override
@@ -1696,7 +2144,8 @@ public CitationKeyPatternPreferences getCitationKeyPatternPreferences() {
             return citationKeyPatternPreferences;
         }
 
-        citationKeyPatternPreferences = new CitationKeyPatternPreferences(
+        citationKeyPatternPreferences =
+            new CitationKeyPatternPreferences(
                 getBoolean(AVOID_OVERWRITING_KEY),
                 getBoolean(WARN_BEFORE_OVERWRITING_KEY),
                 getBoolean(GENERATE_KEYS_BEFORE_SAVING),
@@ -1706,33 +2155,62 @@ public CitationKeyPatternPreferences getCitationKeyPatternPreferences() {
                 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(),
-                (obs, oldValue, newValue) -> putBoolean(WARN_BEFORE_OVERWRITING_KEY, newValue));
-        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(),
-                (obs, oldValue, newValue) -> put(KEY_PATTERN_REGEX, newValue));
-        EasyBind.listen(citationKeyPatternPreferences.keyPatternReplacementProperty(),
-                (obs, oldValue, newValue) -> put(KEY_PATTERN_REPLACEMENT, newValue));
-        EasyBind.listen(citationKeyPatternPreferences.unwantedCharactersProperty(),
-                (obs, oldValue, newValue) -> put(UNWANTED_CITATION_KEY_CHARACTERS, newValue));
-        EasyBind.listen(citationKeyPatternPreferences.keyPatternProperty(),
-                (obs, oldValue, newValue) -> storeGlobalCitationKeyPattern(newValue));
+                getBibEntryPreferences().keywordSeparatorProperty()
+            );
+
+        EasyBind.listen(
+            citationKeyPatternPreferences.shouldAvoidOverwriteCiteKeyProperty(),
+            (obs, oldValue, newValue) ->
+                putBoolean(AVOID_OVERWRITING_KEY, newValue)
+        );
+        EasyBind.listen(
+            citationKeyPatternPreferences.shouldWarnBeforeOverwriteCiteKeyProperty(),
+            (obs, oldValue, newValue) ->
+                putBoolean(WARN_BEFORE_OVERWRITING_KEY, newValue)
+        );
+        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(),
+            (obs, oldValue, newValue) -> put(KEY_PATTERN_REGEX, newValue)
+        );
+        EasyBind.listen(
+            citationKeyPatternPreferences.keyPatternReplacementProperty(),
+            (obs, oldValue, newValue) -> put(KEY_PATTERN_REPLACEMENT, newValue)
+        );
+        EasyBind.listen(
+            citationKeyPatternPreferences.unwantedCharactersProperty(),
+            (obs, oldValue, newValue) ->
+                put(UNWANTED_CITATION_KEY_CHARACTERS, newValue)
+        );
+        EasyBind.listen(
+            citationKeyPatternPreferences.keyPatternProperty(),
+            (obs, oldValue, newValue) -> storeGlobalCitationKeyPattern(newValue)
+        );
 
         return citationKeyPatternPreferences;
     }
 
     private CitationKeyPatternPreferences.KeySuffix getKeySuffix() {
         CitationKeyPatternPreferences.KeySuffix keySuffix =
-                CitationKeyPatternPreferences.KeySuffix.SECOND_WITH_B;
+            CitationKeyPatternPreferences.KeySuffix.SECOND_WITH_B;
         if (getBoolean(KEY_GEN_ALWAYS_ADD_LETTER)) {
             keySuffix = CitationKeyPatternPreferences.KeySuffix.ALWAYS;
         } else if (getBoolean(KEY_GEN_FIRST_LETTER_A)) {
@@ -1754,43 +2232,72 @@ public PushToApplicationPreferences getPushToApplicationPreferences() {
         Map<String, String> applicationCommands = new HashMap<>();
         applicationCommands.put(PushToApplications.EMACS, get(PUSH_EMACS_PATH));
         applicationCommands.put(PushToApplications.LYX, get(PUSH_LYXPIPE));
-        applicationCommands.put(PushToApplications.TEXMAKER, get(PUSH_TEXMAKER_PATH));
-        applicationCommands.put(PushToApplications.TEXSTUDIO, get(PUSH_TEXSTUDIO_PATH));
+        applicationCommands.put(
+            PushToApplications.TEXMAKER,
+            get(PUSH_TEXMAKER_PATH)
+        );
+        applicationCommands.put(
+            PushToApplications.TEXSTUDIO,
+            get(PUSH_TEXSTUDIO_PATH)
+        );
         applicationCommands.put(PushToApplications.VIM, get(PUSH_VIM));
-        applicationCommands.put(PushToApplications.WIN_EDT, get(PUSH_WINEDT_PATH));
-        applicationCommands.put(PushToApplications.SUBLIME_TEXT, get(PUSH_SUBLIME_TEXT_PATH));
+        applicationCommands.put(
+            PushToApplications.WIN_EDT,
+            get(PUSH_WINEDT_PATH)
+        );
+        applicationCommands.put(
+            PushToApplications.SUBLIME_TEXT,
+            get(PUSH_SUBLIME_TEXT_PATH)
+        );
 
-        pushToApplicationPreferences = new PushToApplicationPreferences(
+        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));
+        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.VIM ->
-                        put(PUSH_VIM, value);
-                case PushToApplications.WIN_EDT ->
-                        put(PUSH_WINEDT_PATH, value);
-                case PushToApplications.SUBLIME_TEXT ->
-                        put(PUSH_SUBLIME_TEXT_PATH, value);
+                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.VIM -> put(PUSH_VIM, value);
+                case PushToApplications.WIN_EDT -> put(PUSH_WINEDT_PATH, value);
+                case PushToApplications.SUBLIME_TEXT -> put(
+                    PUSH_SUBLIME_TEXT_PATH,
+                    value
+                );
             }
         });
     }
@@ -1801,7 +2308,8 @@ public ExternalApplicationsPreferences getExternalApplicationsPreferences() {
             return externalApplicationsPreferences;
         }
 
-        externalApplicationsPreferences = new ExternalApplicationsPreferences(
+        externalApplicationsPreferences =
+            new ExternalApplicationsPreferences(
                 get(EMAIL_SUBJECT),
                 getBoolean(OPEN_FOLDERS_OF_ATTACHED_FILES),
                 get(CITE_COMMAND),
@@ -1810,24 +2318,44 @@ public ExternalApplicationsPreferences getExternalApplicationsPreferences() {
                 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(),
-                (obs, oldValue, newValue) -> putBoolean(OPEN_FOLDERS_OF_ATTACHED_FILES, newValue));
-        EasyBind.listen(externalApplicationsPreferences.citeCommandProperty(),
-                (obs, oldValue, newValue) -> put(CITE_COMMAND, newValue));
-        EasyBind.listen(externalApplicationsPreferences.useCustomTerminalProperty(),
-                (obs, oldValue, newValue) -> putBoolean(USE_DEFAULT_CONSOLE_APPLICATION, !newValue)); // mind the !
-        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(),
-                (obs, oldValue, newValue) -> put(FILE_BROWSER_COMMAND, newValue));
-        EasyBind.listen(externalApplicationsPreferences.kindleEmailProperty(),
-                (obs, oldValue, newValue) -> put(KINDLE_EMAIL, newValue));
+                get(KINDLE_EMAIL)
+            );
+
+        EasyBind.listen(
+            externalApplicationsPreferences.eMailSubjectProperty(),
+            (obs, oldValue, newValue) -> put(EMAIL_SUBJECT, newValue)
+        );
+        EasyBind.listen(
+            externalApplicationsPreferences.autoOpenEmailAttachmentsFolderProperty(),
+            (obs, oldValue, newValue) ->
+                putBoolean(OPEN_FOLDERS_OF_ATTACHED_FILES, newValue)
+        );
+        EasyBind.listen(
+            externalApplicationsPreferences.citeCommandProperty(),
+            (obs, oldValue, newValue) -> put(CITE_COMMAND, newValue)
+        );
+        EasyBind.listen(
+            externalApplicationsPreferences.useCustomTerminalProperty(),
+            (obs, oldValue, newValue) ->
+                putBoolean(USE_DEFAULT_CONSOLE_APPLICATION, !newValue)
+        ); // mind the !
+        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(),
+            (obs, oldValue, newValue) -> put(FILE_BROWSER_COMMAND, newValue)
+        );
+        EasyBind.listen(
+            externalApplicationsPreferences.kindleEmailProperty(),
+            (obs, oldValue, newValue) -> put(KINDLE_EMAIL, newValue)
+        );
 
         return externalApplicationsPreferences;
     }
@@ -1842,15 +2370,22 @@ public MainTablePreferences getMainTablePreferences() {
             return mainTablePreferences;
         }
 
-        mainTablePreferences = new MainTablePreferences(
+        mainTablePreferences =
+            new MainTablePreferences(
                 getMainTableColumnPreferences(),
                 getBoolean(AUTO_RESIZE_MODE),
-                getBoolean(EXTRA_FILE_COLUMNS));
+                getBoolean(EXTRA_FILE_COLUMNS)
+            );
 
-        EasyBind.listen(mainTablePreferences.resizeColumnsToFitProperty(),
-                (obs, oldValue, newValue) -> putBoolean(AUTO_RESIZE_MODE, newValue));
-        EasyBind.listen(mainTablePreferences.extraFileColumnsEnabledProperty(),
-                (obs, oldValue, newValue) -> putBoolean(EXTRA_FILE_COLUMNS, newValue));
+        EasyBind.listen(
+            mainTablePreferences.resizeColumnsToFitProperty(),
+            (obs, oldValue, newValue) -> putBoolean(AUTO_RESIZE_MODE, newValue)
+        );
+        EasyBind.listen(
+            mainTablePreferences.extraFileColumnsEnabledProperty(),
+            (obs, oldValue, newValue) ->
+                putBoolean(EXTRA_FILE_COLUMNS, newValue)
+        );
 
         return mainTablePreferences;
     }
@@ -1861,17 +2396,50 @@ public ColumnPreferences getMainTableColumnPreferences() {
             return mainTableColumnPreferences;
         }
 
-        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)));
+        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
+                        )
+                    )
+            );
 
         return mainTableColumnPreferences;
     }
@@ -1882,45 +2450,88 @@ 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);
-        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)));
+        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
+                        )
+                    )
+            );
 
         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();
+            .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<SortType> columnSortTypes = getStringList(sortTypeList)
-                .stream()
-                .map(SortType::valueOf).toList();
+            .stream()
+            .map(SortType::valueOf)
+            .toList();
 
         List<MainTableColumnModel> columns = new ArrayList<>();
         for (int i = 0; i < columnNames.size(); i++) {
-            MainTableColumnModel columnModel = MainTableColumnModel.parse(columnNames.get(i));
+            MainTableColumnModel columnModel = MainTableColumnModel.parse(
+                columnNames.get(i)
+            );
 
             if (i < columnWidths.size()) {
                 columnModel.widthProperty().setValue(columnWidths.get(i));
@@ -1935,37 +2546,61 @@ 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();
+    private static List<String> getColumnNamesAsStringList(
+        ColumnPreferences columnPreferences
+    ) {
+        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();
+    private static List<String> getColumnWidthsAsStringList(
+        ColumnPreferences columnPreferences
+    ) {
+        return columnPreferences
+            .getColumns()
+            .stream()
+            .map(column -> column.widthProperty().getValue().toString())
+            .toList();
     }
 
-    private static List<String> getColumnSortTypesAsStringList(ColumnPreferences columnPreferences) {
-        return columnPreferences.getColumns().stream()
-                                .map(column -> column.sortTypeProperty().getValue().toString())
-                                .toList();
+    private static List<String> getColumnSortTypesAsStringList(
+        ColumnPreferences columnPreferences
+    ) {
+        return columnPreferences
+            .getColumns()
+            .stream()
+            .map(column -> column.sortTypeProperty().getValue().toString())
+            .toList();
     }
 
-    private static List<String> getColumnSortOrderAsStringList(ColumnPreferences columnPreferences) {
-        return columnPreferences.getColumnSortOrder().stream()
-                                .map(MainTableColumnModel::getName)
-                                .collect(Collectors.toList());
+    private static List<String> getColumnSortOrderAsStringList(
+        ColumnPreferences columnPreferences
+    ) {
+        return columnPreferences
+            .getColumnSortOrder()
+            .stream()
+            .map(MainTableColumnModel::getName)
+            .collect(Collectors.toList());
     }
 
     //*************************************************************************************************************
@@ -1978,19 +2613,36 @@ public NameDisplayPreferences getNameDisplayPreferences() {
             return nameDisplayPreferences;
         }
 
-        nameDisplayPreferences = new NameDisplayPreferences(
+        nameDisplayPreferences =
+            new NameDisplayPreferences(
                 getNameDisplayStyle(),
-                getNameAbbreviationStyle());
-
-        EasyBind.listen(nameDisplayPreferences.displayStyleProperty(), (obs, oldValue, newValue) -> {
-            putBoolean(NAMES_NATBIB, newValue == DisplayStyle.NATBIB);
-            putBoolean(NAMES_AS_IS, newValue == DisplayStyle.AS_IS);
-            putBoolean(NAMES_FIRST_LAST, newValue == DisplayStyle.FIRSTNAME_LASTNAME);
-        });
-        EasyBind.listen(nameDisplayPreferences.abbreviationStyleProperty(), (obs, oldValue, newValue) -> {
-            putBoolean(ABBR_AUTHOR_NAMES, newValue == AbbreviationStyle.FULL);
-            putBoolean(NAMES_LAST_ONLY, newValue == AbbreviationStyle.LASTNAME_ONLY);
-        });
+                getNameAbbreviationStyle()
+            );
+
+        EasyBind.listen(
+            nameDisplayPreferences.displayStyleProperty(),
+            (obs, oldValue, newValue) -> {
+                putBoolean(NAMES_NATBIB, newValue == DisplayStyle.NATBIB);
+                putBoolean(NAMES_AS_IS, newValue == DisplayStyle.AS_IS);
+                putBoolean(
+                    NAMES_FIRST_LAST,
+                    newValue == DisplayStyle.FIRSTNAME_LASTNAME
+                );
+            }
+        );
+        EasyBind.listen(
+            nameDisplayPreferences.abbreviationStyleProperty(),
+            (obs, oldValue, newValue) -> {
+                putBoolean(
+                    ABBR_AUTHOR_NAMES,
+                    newValue == AbbreviationStyle.FULL
+                );
+                putBoolean(
+                    NAMES_LAST_ONLY,
+                    newValue == AbbreviationStyle.LASTNAME_ONLY
+                );
+            }
+        );
 
         return nameDisplayPreferences;
     }
@@ -2027,11 +2679,14 @@ 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;
     }
@@ -2046,30 +2701,47 @@ public InternalPreferences getInternalPreferences() {
             return internalPreferences;
         }
 
-        internalPreferences = new InternalPreferences(
+        internalPreferences =
+            new InternalPreferences(
                 Version.parse(get(VERSION_IGNORED_UPDATE)),
                 getBoolean(VERSION_CHECK_ENABLED),
-                getPath(PREFS_EXPORT_PATH, OS.getNativeDesktop().getDefaultFileChooserDirectory()),
+                getPath(
+                    PREFS_EXPORT_PATH,
+                    OS.getNativeDesktop().getDefaultFileChooserDirectory()
+                ),
                 getUserAndHost(),
-                getBoolean(MEMORY_STICK_MODE));
-
-        EasyBind.listen(internalPreferences.ignoredVersionProperty(),
-                (obs, oldValue, newValue) -> put(VERSION_IGNORED_UPDATE, newValue.toString()));
-        EasyBind.listen(internalPreferences.versionCheckEnabledProperty(),
-                (obs, oldValue, newValue) -> putBoolean(VERSION_CHECK_ENABLED, newValue));
-        EasyBind.listen(internalPreferences.lastPreferencesExportPathProperty(),
-                (obs, oldValue, newValue) -> put(PREFS_EXPORT_PATH, newValue.toString()));
+                getBoolean(MEMORY_STICK_MODE)
+            );
+
+        EasyBind.listen(
+            internalPreferences.ignoredVersionProperty(),
+            (obs, oldValue, newValue) ->
+                put(VERSION_IGNORED_UPDATE, newValue.toString())
+        );
+        EasyBind.listen(
+            internalPreferences.versionCheckEnabledProperty(),
+            (obs, oldValue, newValue) ->
+                putBoolean(VERSION_CHECK_ENABLED, newValue)
+        );
+        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");
+        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");
+                    }
                 }
             }
-        });
+        );
 
         return internalPreferences;
     }
@@ -2078,7 +2750,8 @@ private String getUserAndHost() {
         if (StringUtil.isNotBlank(userAndHost)) {
             return userAndHost;
         }
-        userAndHost = get(DEFAULT_OWNER) + '-' + OS.getNativeDesktop().getHostName();
+        userAndHost =
+            get(DEFAULT_OWNER) + '-' + OS.getNativeDesktop().getHostName();
         return userAndHost;
     }
 
@@ -2092,7 +2765,8 @@ public WorkspacePreferences getWorkspacePreferences() {
             return workspacePreferences;
         }
 
-        workspacePreferences = new WorkspacePreferences(
+        workspacePreferences =
+            new WorkspacePreferences(
                 getLanguage(),
                 getBoolean(OVERRIDE_DEFAULT_FONT_SIZE),
                 getInt(MAIN_FONT_SIZE),
@@ -2102,31 +2776,64 @@ public WorkspacePreferences getWorkspacePreferences() {
                 getBoolean(OPEN_LAST_EDITED),
                 getBoolean(SHOW_ADVANCED_HINTS),
                 getBoolean(WARN_ABOUT_DUPLICATES_IN_INSPECTION),
-                getBoolean(CONFIRM_DELETE));
-
-        EasyBind.listen(workspacePreferences.languageProperty(), (obs, oldValue, newValue) -> {
-            put(LANGUAGE, newValue.getId());
-            if (oldValue != newValue) {
-                setLanguageDependentDefaultValues();
-                Localization.setLanguage(newValue);
+                getBoolean(CONFIRM_DELETE)
+            );
+
+        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));
+        );
+        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)
+        );
         return workspacePreferences;
     }
 
     private Language getLanguage() {
-        return Stream.of(Language.values())
-                     .filter(language -> language.getId().equalsIgnoreCase(get(LANGUAGE)))
-                     .findFirst()
-                     .orElse(Language.ENGLISH);
+        return Stream
+            .of(Language.values())
+            .filter(language -> language.getId().equalsIgnoreCase(get(LANGUAGE))
+            )
+            .findFirst()
+            .orElse(Language.ENGLISH);
     }
 
     @Override
@@ -2135,20 +2842,46 @@ public FieldPreferences getFieldPreferences() {
             return fieldPreferences;
         }
 
-        fieldPreferences = new 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())));
+                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;
     }
@@ -2163,9 +2896,14 @@ public FilePreferences getFilePreferences() {
             return filePreferences;
         }
 
-        filePreferences = new FilePreferences(
+        filePreferences =
+            new FilePreferences(
                 getInternalPreferences().getUserAndHost(),
-                getPath(MAIN_FILE_DIRECTORY, OS.getNativeDesktop().getDefaultFileChooserDirectory()).toString(),
+                getPath(
+                    MAIN_FILE_DIRECTORY,
+                    OS.getNativeDesktop().getDefaultFileChooserDirectory()
+                )
+                    .toString(),
                 getBoolean(STORE_RELATIVE_TO_BIB),
                 get(IMPORT_FILENAMEPATTERN),
                 get(IMPORT_FILEDIRPATTERN),
@@ -2175,19 +2913,64 @@ public FilePreferences getFilePreferences() {
                 ExternalFileTypes.fromString(get(EXTERNAL_FILE_TYPES)),
                 getBoolean(CREATE_BACKUP),
                 // We choose the data directory, because a ".bak" file should survive cache cleanups
-                getPath(BACKUP_DIRECTORY, OS.getNativeDesktop().getBackupDirectory()));
-
-        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()));
-        filePreferences.getExternalFileTypes().addListener((SetChangeListener<ExternalFileType>) c ->
-                put(EXTERNAL_FILE_TYPES, ExternalFileTypes.toStringList(filePreferences.getExternalFileTypes())));
-        EasyBind.listen(filePreferences.createBackupProperty(), (obs, oldValue, newValue) -> putBoolean(CREATE_BACKUP, newValue));
-        EasyBind.listen(filePreferences.backupDirectoryProperty(), (obs, oldValue, newValue) -> put(BACKUP_DIRECTORY, newValue.toString()));
+                getPath(
+                    BACKUP_DIRECTORY,
+                    OS.getNativeDesktop().getBackupDirectory()
+                )
+            );
+
+        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())
+        );
+        filePreferences
+            .getExternalFileTypes()
+            .addListener(
+                (SetChangeListener<ExternalFileType>) c ->
+                    put(
+                        EXTERNAL_FILE_TYPES,
+                        ExternalFileTypes.toStringList(
+                            filePreferences.getExternalFileTypes()
+                        )
+                    )
+            );
+        EasyBind.listen(
+            filePreferences.createBackupProperty(),
+            (obs, oldValue, newValue) -> putBoolean(CREATE_BACKUP, newValue)
+        );
+        EasyBind.listen(
+            filePreferences.backupDirectoryProperty(),
+            (obs, oldValue, newValue) ->
+                put(BACKUP_DIRECTORY, newValue.toString())
+        );
 
         return filePreferences;
     }
@@ -2198,32 +2981,51 @@ public AutoLinkPreferences getAutoLinkPreferences() {
             return autoLinkPreferences;
         }
 
-        autoLinkPreferences = new 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(),
-                (obs, oldValue, newValue) -> putBoolean(ASK_AUTO_NAMING_PDFS_AGAIN, newValue));
-        EasyBind.listen(autoLinkPreferences.regularExpressionProperty(),
-                (obs, oldValue, newValue) -> put(AUTOLINK_REG_EXP_SEARCH_EXPRESSION_KEY, newValue));
+                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(),
+            (obs, oldValue, newValue) ->
+                put(AUTOLINK_REG_EXP_SEARCH_EXPRESSION_KEY, newValue)
+        );
 
         return autoLinkPreferences;
     }
 
     private AutoLinkPreferences.CitationKeyDependency getAutoLinkKeyDependency() {
         AutoLinkPreferences.CitationKeyDependency citationKeyDependency =
-                AutoLinkPreferences.CitationKeyDependency.START; // default
+            AutoLinkPreferences.CitationKeyDependency.START; // default
         if (getBoolean(AUTOLINK_EXACT_KEY_ONLY)) {
-            citationKeyDependency = AutoLinkPreferences.CitationKeyDependency.EXACT;
+            citationKeyDependency =
+                AutoLinkPreferences.CitationKeyDependency.EXACT;
         } else if (getBoolean(AUTOLINK_USE_REG_EXP_SEARCH_KEY)) {
-            citationKeyDependency = AutoLinkPreferences.CitationKeyDependency.REGEX;
+            citationKeyDependency =
+                AutoLinkPreferences.CitationKeyDependency.REGEX;
         }
         return citationKeyDependency;
     }
@@ -2238,16 +3040,35 @@ public ExportPreferences getExportPreferences() {
             return exportPreferences;
         }
 
-        exportPreferences = new ExportPreferences(
+        exportPreferences =
+            new ExportPreferences(
                 get(LAST_USED_EXPORT),
                 Path.of(get(EXPORT_WORKING_DIRECTORY)),
                 getExportSaveOrder(),
-                getCustomExportFormats());
+                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()));
+        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;
     }
@@ -2256,43 +3077,85 @@ private 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().get(0).field.getName());
-            putBoolean(EXPORT_PRIMARY_SORT_DESCENDING, saveOrder.getSortCriteria().get(0).descending);
+            put(
+                EXPORT_PRIMARY_SORT_FIELD,
+                saveOrder.getSortCriteria().get(0).field.getName()
+            );
+            putBoolean(
+                EXPORT_PRIMARY_SORT_DESCENDING,
+                saveOrder.getSortCriteria().get(0).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);
+            put(
+                EXPORT_SECONDARY_SORT_FIELD,
+                saveOrder.getSortCriteria().get(1).field.getName()
+            );
+            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);
+            put(
+                EXPORT_TERTIARY_SORT_FIELD,
+                saveOrder.getSortCriteria().get(2).field.getName()
+            );
+            putBoolean(
+                EXPORT_TERTIARY_SORT_DESCENDING,
+                saveOrder.getSortCriteria().get(2).descending
+            );
         } else {
             put(EXPORT_TERTIARY_SORT_FIELD, "");
             putBoolean(EXPORT_TERTIARY_SORT_DESCENDING, false);
@@ -2303,39 +3166,51 @@ private void storeExportSaveOrder(SaveOrder saveOrder) {
      * For the export configuration, generates the SelfContainedSaveOrder having the reference to TABLE resolved.
      */
     public SelfContainedSaveOrder getSelfContainedTableSaveOrder() {
-        List<MainTableColumnModel> sortOrder = getMainTableColumnPreferences().getColumnSortOrder();
+        List<MainTableColumnModel> sortOrder = getMainTableColumnPreferences()
+            .getColumnSortOrder();
         return new SelfContainedSaveOrder(
-                SaveOrder.OrderType.SPECIFIED,
-                sortOrder.stream().flatMap(model -> model.getSortCriteria().stream()).toList());
+            SaveOrder.OrderType.SPECIFIED,
+            sortOrder
+                .stream()
+                .flatMap(model -> model.getSortCriteria().stream())
+                .toList()
+        );
     }
 
     @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()
+        );
     }
 
     private List<TemplateExporter> getCustomExportFormats() {
-        LayoutFormatterPreferences layoutPreferences = getLayoutFormatterPreferences();
-        SelfContainedSaveConfiguration saveConfiguration = getSelfContainedExportConfiguration();
+        LayoutFormatterPreferences layoutPreferences =
+            getLayoutFormatterPreferences();
+        SelfContainedSaveConfiguration saveConfiguration =
+            getSelfContainedExportConfiguration();
         List<TemplateExporter> formats = new ArrayList<>();
 
         for (String toImport : getSeries(CUSTOM_EXPORT_FORMAT)) {
             List<String> formatData = convertStringToList(toImport);
             TemplateExporter format = new TemplateExporter(
-                    formatData.get(EXPORTER_NAME_INDEX),
-                    formatData.get(EXPORTER_FILENAME_INDEX),
-                    formatData.get(EXPORTER_EXTENSION_INDEX),
-                    layoutPreferences,
-                    saveConfiguration.getSelfContainedSaveOrder());
+                formatData.get(EXPORTER_NAME_INDEX),
+                formatData.get(EXPORTER_FILENAME_INDEX),
+                formatData.get(EXPORTER_EXTENSION_INDEX),
+                layoutPreferences,
+                saveConfiguration.getSelfContainedSaveOrder()
+            );
             format.setCustomExport(true);
             formats.add(format);
         }
@@ -2348,10 +3223,19 @@ private void storeCustomExportFormats(List<TemplateExporter> exporters) {
         } else {
             for (int i = 0; i < exporters.size(); i++) {
                 List<String> exporterData = new ArrayList<>();
-                exporterData.add(EXPORTER_NAME_INDEX, exporters.get(i).getName());
-                exporterData.add(EXPORTER_FILENAME_INDEX, exporters.get(i).getLayoutFileName());
+                exporterData.add(
+                    EXPORTER_NAME_INDEX,
+                    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().get(0));
+                exporterData.add(
+                    EXPORTER_EXTENSION_INDEX,
+                    exporters.get(i).getFileType().getExtensions().get(0)
+                );
                 putStringList(CUSTOM_EXPORT_FORMAT + i, exporterData);
             }
             purgeSeries(CUSTOM_EXPORT_FORMAT, exporters.size());
@@ -2371,17 +3255,37 @@ public PreviewPreferences getPreviewPreferences() {
         String style = get(PREVIEW_STYLE);
         List<PreviewLayout> layouts = getPreviewLayouts(style);
 
-        this.previewPreferences = new PreviewPreferences(
+        this.previewPreferences =
+            new PreviewPreferences(
                 layouts,
                 getPreviewCyclePosition(layouts),
-                new TextBasedPreviewLayout(style, getLayoutFormatterPreferences(), Globals.journalAbbreviationRepository),
+                new TextBasedPreviewLayout(
+                    style,
+                    getLayoutFormatterPreferences(),
+                    Globals.journalAbbreviationRepository
+                ),
                 (String) defaults.get(PREVIEW_STYLE),
-                getBoolean(PREVIEW_AS_TAB));
-
-        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));
+                getBoolean(PREVIEW_AS_TAB)
+            );
+
+        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)
+        );
 
         return this.previewPreferences;
     }
@@ -2394,29 +3298,49 @@ private List<PreviewLayout> getPreviewLayouts(String style) {
             cycle.add("Preview");
         }
 
-        return cycle.stream()
-                    .map(layout -> {
-                        if (CitationStyle.isCitationStyleFile(layout)) {
-                            return CitationStyle.createCitationStyleFromFile(layout)
-                                                .map(file -> (PreviewLayout) new CitationStylePreviewLayout(file, Globals.entryTypesManager))
-                                                .orElse(null);
-                        } else {
-                            return new TextBasedPreviewLayout(style, getLayoutFormatterPreferences(), Globals.journalAbbreviationRepository);
-                        }
-                    })
-                    .filter(Objects::nonNull)
-                    .collect(Collectors.toList());
+        return cycle
+            .stream()
+            .map(layout -> {
+                if (CitationStyle.isCitationStyleFile(layout)) {
+                    return CitationStyle
+                        .createCitationStyleFromFile(layout)
+                        .map(file ->
+                            (PreviewLayout) new CitationStylePreviewLayout(
+                                file,
+                                Globals.entryTypesManager
+                            )
+                        )
+                        .orElse(null);
+                } else {
+                    return new TextBasedPreviewLayout(
+                        style,
+                        getLayoutFormatterPreferences(),
+                        Globals.journalAbbreviationRepository
+                    );
+                }
+            })
+            .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())
+    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())
         );
     }
 
@@ -2439,16 +3363,32 @@ public SidePanePreferences getSidePanePreferences() {
             return sidePanePreferences;
         }
 
-        sidePanePreferences = new 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));
+                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;
     }
@@ -2468,41 +3408,69 @@ private Set<SidePaneType> getVisibleSidePanes() {
     }
 
     private void storeVisibleSidePanes(Set<SidePaneType> visiblePanes) {
-        putBoolean(WEB_SEARCH_VISIBLE, visiblePanes.contains(SidePaneType.WEB_SEARCH));
-        putBoolean(GROUP_SIDEPANE_VISIBLE, visiblePanes.contains(SidePaneType.GROUPS));
-        putBoolean(OO_SHOW_PANEL, visiblePanes.contains(SidePaneType.OPEN_OFFICE));
+        putBoolean(
+            WEB_SEARCH_VISIBLE,
+            visiblePanes.contains(SidePaneType.WEB_SEARCH)
+        );
+        putBoolean(
+            GROUP_SIDEPANE_VISIBLE,
+            visiblePanes.contains(SidePaneType.GROUPS)
+        );
+        putBoolean(
+            OO_SHOW_PANEL,
+            visiblePanes.contains(SidePaneType.OPEN_OFFICE)
+        );
     }
 
     private Map<SidePaneType, Integer> getSidePanePreferredPositions() {
         Map<SidePaneType, Integer> preferredPositions = new HashMap<>();
 
         List<String> componentNames = getStringList(SIDE_PANE_COMPONENT_NAMES);
-        List<String> componentPositions = getStringList(SIDE_PANE_COMPONENT_PREFERRED_POSITIONS);
+        List<String> componentPositions = getStringList(
+            SIDE_PANE_COMPONENT_PREFERRED_POSITIONS
+        );
 
         for (int i = 0; i < componentNames.size(); ++i) {
             String name = componentNames.get(i);
             try {
                 SidePaneType type = Enum.valueOf(SidePaneType.class, name);
-                preferredPositions.put(type, Integer.parseInt(componentPositions.get(i)));
+                preferredPositions.put(
+                    type,
+                    Integer.parseInt(componentPositions.get(i))
+                );
             } catch (NumberFormatException e) {
-                LOGGER.debug("Invalid number format for side pane component '" + name + "'", e);
+                LOGGER.debug(
+                    "Invalid number format for side pane component '" +
+                    name +
+                    "'",
+                    e
+                );
             } catch (IllegalArgumentException e) {
-                LOGGER.debug("Following component is not a side pane: '" + name + "'", e);
+                LOGGER.debug(
+                    "Following component is not a side pane: '" + name + "'",
+                    e
+                );
             }
         }
 
         return preferredPositions;
     }
 
-    private void storeSidePanePreferredPositions(Map<SidePaneType, Integer> preferredPositions) {
+    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> positions = preferredPositions.values().stream()
-                                                   .map(integer -> Integer.toString(integer))
-                                                   .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());
 
         putStringList(SIDE_PANE_COMPONENT_NAMES, names);
         putStringList(SIDE_PANE_COMPONENT_PREFERRED_POSITIONS, positions);
@@ -2518,20 +3486,55 @@ 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;
     }
@@ -2539,20 +3542,31 @@ public CleanupPreferences getCleanupPreferences() {
     @Override
     public CleanupPreferences getDefaultCleanupPreset() {
         return new CleanupPreferences(
-                getDefaultCleanupJobs(),
-                new FieldFormatterCleanups(
-                        (Boolean) defaults.get(CLEANUP_FIELD_FORMATTERS_ENABLED),
-                        FieldFormatterCleanups.parse((String) defaults.get(CLEANUP_FIELD_FORMATTERS))));
+            getDefaultCleanupJobs(),
+            new FieldFormatterCleanups(
+                (Boolean) defaults.get(CLEANUP_FIELD_FORMATTERS_ENABLED),
+                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(
+    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));
+                CleanupPreferences.CleanupStep.CONVERT_TO_BIBTEX
+            )
+        );
         return activeJobs;
     }
 
@@ -2566,7 +3580,8 @@ public GuiPreferences getGuiPreferences() {
             return guiPreferences;
         }
 
-        guiPreferences = new GuiPreferences(
+        guiPreferences =
+            new GuiPreferences(
                 getDouble(POS_X),
                 getDouble(POS_Y),
                 getDouble(SIZE_X),
@@ -2582,51 +3597,120 @@ public GuiPreferences getGuiPreferences() {
                 getBoolean(MERGE_ENTRIES_SHOULD_SHOW_UNIFIED_DIFF),
                 getBoolean(MERGE_ENTRIES_HIGHLIGHT_WORDS),
                 getDouble(SIDE_PANE_WIDTH),
-                getBoolean(MERGE_SHOW_ONLY_CHANGED_FIELDS));
-
-        EasyBind.listen(guiPreferences.positionXProperty(), (obs, oldValue, newValue) -> putDouble(POS_X, newValue.doubleValue()));
-        EasyBind.listen(guiPreferences.positionYProperty(), (obs, oldValue, newValue) -> putDouble(POS_Y, newValue.doubleValue()));
-        EasyBind.listen(guiPreferences.sizeXProperty(), (obs, oldValue, newValue) -> putDouble(SIZE_X, newValue.doubleValue()));
-        EasyBind.listen(guiPreferences.sizeYProperty(), (obs, oldValue, newValue) -> putDouble(SIZE_Y, newValue.doubleValue()));
-        EasyBind.listen(guiPreferences.windowMaximisedProperty(), (obs, oldValue, newValue) -> putBoolean(WINDOW_MAXIMISED, newValue));
-        EasyBind.listen(guiPreferences.windowFullScreenProperty(), (obs, oldValue, newValue) -> putBoolean(WINDOW_FULLSCREEN, newValue));
-        guiPreferences.getLastFilesOpened().addListener((ListChangeListener<String>) change -> {
-            if (change.getList().isEmpty()) {
-                prefs.remove(LAST_EDITED);
-            } else {
-                putStringList(LAST_EDITED, guiPreferences.getLastFilesOpened());
-            }
-        });
-        EasyBind.listen(guiPreferences.lastFocusedFileProperty(), (obs, oldValue, newValue) -> {
-            if (newValue != null) {
-                put(LAST_FOCUSED, newValue.toAbsolutePath().toString());
-            } else {
-                remove(LAST_FOCUSED);
+                getBoolean(MERGE_SHOW_ONLY_CHANGED_FIELDS)
+            );
+
+        EasyBind.listen(
+            guiPreferences.positionXProperty(),
+            (obs, oldValue, newValue) ->
+                putDouble(POS_X, newValue.doubleValue())
+        );
+        EasyBind.listen(
+            guiPreferences.positionYProperty(),
+            (obs, oldValue, newValue) ->
+                putDouble(POS_Y, newValue.doubleValue())
+        );
+        EasyBind.listen(
+            guiPreferences.sizeXProperty(),
+            (obs, oldValue, newValue) ->
+                putDouble(SIZE_X, newValue.doubleValue())
+        );
+        EasyBind.listen(
+            guiPreferences.sizeYProperty(),
+            (obs, oldValue, newValue) ->
+                putDouble(SIZE_Y, newValue.doubleValue())
+        );
+        EasyBind.listen(
+            guiPreferences.windowMaximisedProperty(),
+            (obs, oldValue, newValue) -> putBoolean(WINDOW_MAXIMISED, newValue)
+        );
+        EasyBind.listen(
+            guiPreferences.windowFullScreenProperty(),
+            (obs, oldValue, newValue) -> putBoolean(WINDOW_FULLSCREEN, newValue)
+        );
+        guiPreferences
+            .getLastFilesOpened()
+            .addListener(
+                (ListChangeListener<String>) change -> {
+                    if (change.getList().isEmpty()) {
+                        prefs.remove(LAST_EDITED);
+                    } else {
+                        putStringList(
+                            LAST_EDITED,
+                            guiPreferences.getLastFilesOpened()
+                        );
+                    }
+                }
+            );
+        EasyBind.listen(
+            guiPreferences.lastFocusedFileProperty(),
+            (obs, oldValue, newValue) -> {
+                if (newValue != null) {
+                    put(LAST_FOCUSED, newValue.toAbsolutePath().toString());
+                } else {
+                    remove(LAST_FOCUSED);
+                }
             }
-        });
-        guiPreferences.getFileHistory().addListener((InvalidationListener) change -> storeFileHistory(guiPreferences.getFileHistory()));
-        EasyBind.listen(guiPreferences.lastSelectedIdBasedFetcherProperty(), (obs, oldValue, newValue) -> put(ID_ENTRY_GENERATOR, newValue));
-        EasyBind.listen(guiPreferences.mergeDiffModeProperty(), (obs, oldValue, newValue) -> put(MERGE_ENTRIES_DIFF_MODE, newValue.name()));
-        EasyBind.listen(guiPreferences.mergeShouldShowDiffProperty(), (obs, oldValue, newValue) -> putBoolean(MERGE_ENTRIES_SHOULD_SHOW_DIFF, newValue));
-        EasyBind.listen(guiPreferences.mergeShouldShowUnifiedDiffProperty(), (obs, oldValue, newValue) -> putBoolean(MERGE_ENTRIES_SHOULD_SHOW_UNIFIED_DIFF, newValue));
-        EasyBind.listen(guiPreferences.mergeHighlightWordsProperty(), (obs, oldValue, newValue) -> putBoolean(MERGE_ENTRIES_HIGHLIGHT_WORDS, newValue));
-        EasyBind.listen(guiPreferences.sidePaneWidthProperty(), (obs, oldValue, newValue) -> putDouble(SIDE_PANE_WIDTH, newValue.doubleValue()));
-        EasyBind.listen(guiPreferences.mergeShowChangedFieldOnlyProperty(), (obs, oldValue, newValue) -> putBoolean(MERGE_SHOW_ONLY_CHANGED_FIELDS, newValue));
+        );
+        guiPreferences
+            .getFileHistory()
+            .addListener(
+                (InvalidationListener) change ->
+                    storeFileHistory(guiPreferences.getFileHistory())
+            );
+        EasyBind.listen(
+            guiPreferences.lastSelectedIdBasedFetcherProperty(),
+            (obs, oldValue, newValue) -> put(ID_ENTRY_GENERATOR, newValue)
+        );
+        EasyBind.listen(
+            guiPreferences.mergeDiffModeProperty(),
+            (obs, oldValue, newValue) ->
+                put(MERGE_ENTRIES_DIFF_MODE, newValue.name())
+        );
+        EasyBind.listen(
+            guiPreferences.mergeShouldShowDiffProperty(),
+            (obs, oldValue, newValue) ->
+                putBoolean(MERGE_ENTRIES_SHOULD_SHOW_DIFF, newValue)
+        );
+        EasyBind.listen(
+            guiPreferences.mergeShouldShowUnifiedDiffProperty(),
+            (obs, oldValue, newValue) ->
+                putBoolean(MERGE_ENTRIES_SHOULD_SHOW_UNIFIED_DIFF, newValue)
+        );
+        EasyBind.listen(
+            guiPreferences.mergeHighlightWordsProperty(),
+            (obs, oldValue, newValue) ->
+                putBoolean(MERGE_ENTRIES_HIGHLIGHT_WORDS, newValue)
+        );
+        EasyBind.listen(
+            guiPreferences.sidePaneWidthProperty(),
+            (obs, oldValue, newValue) ->
+                putDouble(SIDE_PANE_WIDTH, newValue.doubleValue())
+        );
+        EasyBind.listen(
+            guiPreferences.mergeShowChangedFieldOnlyProperty(),
+            (obs, oldValue, newValue) ->
+                putBoolean(MERGE_SHOW_ONLY_CHANGED_FIELDS, newValue)
+        );
 
         return guiPreferences;
     }
 
     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()
+        );
     }
 
     //*************************************************************************************************************
@@ -2641,13 +3725,18 @@ public SearchPreferences getSearchPreferences() {
 
         SearchDisplayMode searchDisplayMode;
         try {
-            searchDisplayMode = SearchDisplayMode.valueOf(get(SEARCH_DISPLAY_MODE));
+            searchDisplayMode =
+                SearchDisplayMode.valueOf(get(SEARCH_DISPLAY_MODE));
         } catch (IllegalArgumentException ex) {
             // Should only occur when the searchmode is set directly via preferences.put and the enum was not used
-            searchDisplayMode = SearchDisplayMode.valueOf((String) defaults.get(SEARCH_DISPLAY_MODE));
+            searchDisplayMode =
+                SearchDisplayMode.valueOf(
+                    (String) defaults.get(SEARCH_DISPLAY_MODE)
+                );
         }
 
-        searchPreferences = new SearchPreferences(
+        searchPreferences =
+            new SearchPreferences(
                 searchDisplayMode,
                 getBoolean(SEARCH_CASE_SENSITIVE),
                 getBoolean(SEARCH_REG_EXP),
@@ -2655,18 +3744,79 @@ public SearchPreferences getSearchPreferences() {
                 getBoolean(SEARCH_KEEP_SEARCH_STRING),
                 getBoolean(SEARCH_KEEP_GLOBAL_WINDOW_ON_TOP),
                 getDouble(SEARCH_WINDOW_HEIGHT),
-                getDouble(SEARCH_WINDOW_WIDTH));
-
-        EasyBind.listen(searchPreferences.searchDisplayModeProperty(), (obs, oldValue, newValue) -> put(SEARCH_DISPLAY_MODE, Objects.requireNonNull(searchPreferences.getSearchDisplayMode()).toString()));
-        searchPreferences.getObservableSearchFlags().addListener((SetChangeListener<SearchRules.SearchFlags>) c -> {
-            putBoolean(SEARCH_CASE_SENSITIVE, searchPreferences.getObservableSearchFlags().contains(SearchRules.SearchFlags.CASE_SENSITIVE));
-            putBoolean(SEARCH_REG_EXP, searchPreferences.getObservableSearchFlags().contains(SearchRules.SearchFlags.REGULAR_EXPRESSION));
-            putBoolean(SEARCH_FULLTEXT, searchPreferences.getObservableSearchFlags().contains(SearchRules.SearchFlags.FULLTEXT));
-            putBoolean(SEARCH_KEEP_SEARCH_STRING, searchPreferences.getObservableSearchFlags().contains(SearchRules.SearchFlags.KEEP_SEARCH_STRING));
-        });
-        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()));
+                getDouble(SEARCH_WINDOW_WIDTH)
+            );
+
+        EasyBind.listen(
+            searchPreferences.searchDisplayModeProperty(),
+            (obs, oldValue, newValue) ->
+                put(
+                    SEARCH_DISPLAY_MODE,
+                    Objects
+                        .requireNonNull(
+                            searchPreferences.getSearchDisplayMode()
+                        )
+                        .toString()
+                )
+        );
+        searchPreferences
+            .getObservableSearchFlags()
+            .addListener(
+                (SetChangeListener<SearchRules.SearchFlags>) c -> {
+                    putBoolean(
+                        SEARCH_CASE_SENSITIVE,
+                        searchPreferences
+                            .getObservableSearchFlags()
+                            .contains(SearchRules.SearchFlags.CASE_SENSITIVE)
+                    );
+                    putBoolean(
+                        SEARCH_REG_EXP,
+                        searchPreferences
+                            .getObservableSearchFlags()
+                            .contains(
+                                SearchRules.SearchFlags.REGULAR_EXPRESSION
+                            )
+                    );
+                    putBoolean(
+                        SEARCH_FULLTEXT,
+                        searchPreferences
+                            .getObservableSearchFlags()
+                            .contains(SearchRules.SearchFlags.FULLTEXT)
+                    );
+                    putBoolean(
+                        SEARCH_KEEP_SEARCH_STRING,
+                        searchPreferences
+                            .getObservableSearchFlags()
+                            .contains(
+                                SearchRules.SearchFlags.KEEP_SEARCH_STRING
+                            )
+                    );
+                }
+            );
+        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()
+                )
+        );
 
         return searchPreferences;
     }
@@ -2677,17 +3827,34 @@ public XmpPreferences getXmpPreferences() {
             return xmpPreferences;
         }
 
-        xmpPreferences = new XmpPreferences(
+        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(),
-                (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())));
+                getStringList(XMP_PRIVACY_FILTERS)
+                    .stream()
+                    .map(FieldFactory::parseField)
+                    .collect(Collectors.toSet()),
+                getBibEntryPreferences().keywordSeparatorProperty()
+            );
+
+        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())
+                    )
+            );
 
         return xmpPreferences;
     }
@@ -2698,14 +3865,30 @@ public NameFormatterPreferences getNameFormatterPreferences() {
             return nameFormatterPreferences;
         }
 
-        nameFormatterPreferences = new 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()));
+                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;
     }
@@ -2716,38 +3899,70 @@ public AutoCompletePreferences getAutoCompletePreferences() {
             return autoCompletePreferences;
         }
 
-        AutoCompletePreferences.NameFormat nameFormat = AutoCompletePreferences.NameFormat.BOTH;
+        AutoCompletePreferences.NameFormat nameFormat =
+            AutoCompletePreferences.NameFormat.BOTH;
         if (getBoolean(AUTOCOMPLETER_LAST_FIRST)) {
             nameFormat = AutoCompletePreferences.NameFormat.LAST_FIRST;
         } else if (getBoolean(AUTOCOMPLETER_FIRST_LAST)) {
             nameFormat = AutoCompletePreferences.NameFormat.FIRST_LAST;
         }
 
-        autoCompletePreferences = new AutoCompletePreferences(
+        autoCompletePreferences =
+            new AutoCompletePreferences(
                 getBoolean(AUTO_COMPLETE),
-                AutoCompleteFirstNameMode.parse(get(AUTOCOMPLETER_FIRSTNAME_MODE)),
+                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);
+                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;
     }
@@ -2758,9 +3973,14 @@ public SpecialFieldsPreferences getSpecialFieldsPreferences() {
             return specialFieldsPreferences;
         }
 
-        specialFieldsPreferences = new SpecialFieldsPreferences(getBoolean(SPECIALFIELDSENABLED));
+        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;
     }
@@ -2771,16 +3991,33 @@ public MrDlibPreferences getMrDlibPreferences() {
             return mrDlibPreferences;
         }
 
-        mrDlibPreferences = new MrDlibPreferences(
+        mrDlibPreferences =
+            new MrDlibPreferences(
                 getBoolean(ACCEPT_RECOMMENDATIONS),
                 getBoolean(SEND_LANGUAGE_DATA),
                 getBoolean(SEND_OS_DATA),
-                getBoolean(SEND_TIMEZONE_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));
+        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;
     }
@@ -2791,21 +4028,50 @@ public ProtectedTermsPreferences getProtectedTermsPreferences() {
             return protectedTermsPreferences;
         }
 
-        protectedTermsPreferences = new 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
+            .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;
     }
@@ -2820,7 +4086,8 @@ public ImporterPreferences getImporterPreferences() {
             return importerPreferences;
         }
 
-        importerPreferences = new ImporterPreferences(
+        importerPreferences =
+            new ImporterPreferences(
                 getBoolean(IMPORTERS_ENABLED),
                 getBoolean(GENERATE_KEY_ON_IMPORT),
                 Path.of(get(IMPORT_WORKING_DIRECTORY)),
@@ -2828,16 +4095,56 @@ public ImporterPreferences getImporterPreferences() {
                 getCustomImportFormats(),
                 getFetcherKeys(),
                 getBoolean(FETCHER_CUSTOM_KEY_PERSIST),
-                getStringList(SEARCH_CATALOGS));
+                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()));
+        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;
     }
@@ -2850,13 +4157,27 @@ private Set<CustomImporter> getCustomImportFormats() {
             try {
                 if (importerString.size() == 2) {
                     // New format: basePath, className
-                    importers.add(new CustomImporter(importerString.get(0), importerString.get(1)));
+                    importers.add(
+                        new CustomImporter(
+                            importerString.get(0),
+                            importerString.get(1)
+                        )
+                    );
                 } else {
                     // Old format: name, cliId, className, basePath
-                    importers.add(new CustomImporter(importerString.get(3), importerString.get(2)));
+                    importers.add(
+                        new CustomImporter(
+                            importerString.get(3),
+                            importerString.get(2)
+                        )
+                    );
                 }
             } catch (Exception e) {
-                LOGGER.warn("Could not load {} from preferences. Will ignore.", importerString.get(0), e);
+                LOGGER.warn(
+                    "Could not load {} from preferences. Will ignore.",
+                    importerString.get(0),
+                    e
+                );
             }
         }
 
@@ -2865,9 +4186,14 @@ private Set<CustomImporter> getCustomImportFormats() {
 
     private void storeCustomImportFormats(Set<CustomImporter> importers) {
         purgeSeries(CUSTOM_IMPORT_FORMAT, 0);
-        CustomImporter[] importersArray = importers.toArray(new CustomImporter[0]);
+        CustomImporter[] importersArray = importers.toArray(
+            new CustomImporter[0]
+        );
         for (int i = 0; i < importersArray.length; i++) {
-            putStringList(CUSTOM_IMPORT_FORMAT + i, importersArray[i].getAsStringList());
+            putStringList(
+                CUSTOM_IMPORT_FORMAT + i,
+                importersArray[i].getAsStringList()
+            );
         }
     }
 
@@ -2879,11 +4205,14 @@ private Set<FetcherApiKey> getFetcherKeys() {
         List<String> keys = getFetcherKeysFromKeyring(names);
 
         for (int i = 0; i < names.size(); i++) {
-            fetcherApiKeys.add(new FetcherApiKey(
+            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) : ""));
+                    i < keys.size() ? keys.get(i) : ""
+                )
+            );
         }
 
         return fetcherApiKeys;
@@ -2895,10 +4224,16 @@ 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("");
@@ -2932,20 +4267,31 @@ private void storeFetcherKeys(Set<FetcherApiKey> fetcherApiKeys) {
         }
     }
 
-    private void storeFetcherKeysToKeyring(List<String> names, List<String> keys) {
+    private void storeFetcherKeysToKeyring(
+        List<String> names,
+        List<String> keys
+    ) {
         try (final Keyring keyring = Keyring.create()) {
             for (int i = 0; i < names.size(); i++) {
                 if (StringUtil.isNullOrEmpty(keys.get(i))) {
                     try {
-                        keyring.deletePassword("org.jabref.customapikeys", names.get(i));
+                        keyring.deletePassword(
+                            "org.jabref.customapikeys",
+                            names.get(i)
+                        );
                     } catch (PasswordAccessException ex) {
                         // Already removed
                     }
                 } else {
-                    keyring.setPassword("org.jabref.customapikeys", names.get(i), new Password(
+                    keyring.setPassword(
+                        "org.jabref.customapikeys",
+                        names.get(i),
+                        new Password(
                             keys.get(i),
-                            getInternalPreferences().getUserAndHost())
-                            .encrypt());
+                            getInternalPreferences().getUserAndHost()
+                        )
+                            .encrypt()
+                    );
                 }
             }
         } catch (Exception ex) {
@@ -2970,14 +4316,25 @@ public GrobidPreferences getGrobidPreferences() {
             return grobidPreferences;
         }
 
-        grobidPreferences = new GrobidPreferences(
+        grobidPreferences =
+            new GrobidPreferences(
                 getBoolean(GROBID_ENABLED),
                 getBoolean(GROBID_OPT_OUT),
-                get(GROBID_URL));
+                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;
     }
@@ -2985,11 +4342,12 @@ public GrobidPreferences getGrobidPreferences() {
     @Override
     public ImportFormatPreferences getImportFormatPreferences() {
         return new ImportFormatPreferences(
-                getBibEntryPreferences(),
-                getCitationKeyPatternPreferences(),
-                getFieldPreferences(),
-                getXmpPreferences(),
-                getDOIPreferences(),
-                getGrobidPreferences());
+            getBibEntryPreferences(),
+            getCitationKeyPatternPreferences(),
+            getFieldPreferences(),
+            getXmpPreferences(),
+            getDOIPreferences(),
+            getGrobidPreferences()
+        );
     }
 }
diff --git a/src/main/java/org/jabref/preferences/LibraryPreferences.java b/src/main/java/org/jabref/preferences/LibraryPreferences.java
index 6ccb51e6697..2068da27d73 100644
--- a/src/main/java/org/jabref/preferences/LibraryPreferences.java
+++ b/src/main/java/org/jabref/preferences/LibraryPreferences.java
@@ -4,7 +4,6 @@
 import javafx.beans.property.ObjectProperty;
 import javafx.beans.property.SimpleBooleanProperty;
 import javafx.beans.property.SimpleObjectProperty;
-
 import org.jabref.model.database.BibDatabaseMode;
 
 public class LibraryPreferences {
@@ -13,11 +12,15 @@ public class LibraryPreferences {
     private final BooleanProperty alwaysReformatOnSave;
     private final BooleanProperty autoSave;
 
-    public LibraryPreferences(BibDatabaseMode defaultBibDatabaseMode,
-                              boolean alwaysReformatOnSave,
-                              boolean autoSave) {
-        this.defaultBibDatabaseMode = new SimpleObjectProperty<>(defaultBibDatabaseMode);
-        this.alwaysReformatOnSave = new SimpleBooleanProperty(alwaysReformatOnSave);
+    public LibraryPreferences(
+        BibDatabaseMode defaultBibDatabaseMode,
+        boolean alwaysReformatOnSave,
+        boolean autoSave
+    ) {
+        this.defaultBibDatabaseMode =
+            new SimpleObjectProperty<>(defaultBibDatabaseMode);
+        this.alwaysReformatOnSave =
+            new SimpleBooleanProperty(alwaysReformatOnSave);
         this.autoSave = new SimpleBooleanProperty(autoSave);
     }
 
@@ -29,7 +32,9 @@ public ObjectProperty<BibDatabaseMode> defaultBibDatabaseModeProperty() {
         return defaultBibDatabaseMode;
     }
 
-    public void setDefaultBibDatabaseMode(BibDatabaseMode defaultBibDatabaseMode) {
+    public void setDefaultBibDatabaseMode(
+        BibDatabaseMode defaultBibDatabaseMode
+    ) {
         this.defaultBibDatabaseMode.set(defaultBibDatabaseMode);
     }
 
diff --git a/src/main/java/org/jabref/preferences/MrDlibPreferences.java b/src/main/java/org/jabref/preferences/MrDlibPreferences.java
index fd6a0b4cc4a..5fca1959e99 100644
--- a/src/main/java/org/jabref/preferences/MrDlibPreferences.java
+++ b/src/main/java/org/jabref/preferences/MrDlibPreferences.java
@@ -10,8 +10,14 @@ public class MrDlibPreferences {
     private final BooleanProperty sendOs;
     private final BooleanProperty sendTimezone;
 
-    public MrDlibPreferences(boolean acceptRecommendations, boolean shouldSendLanguage, boolean shouldSendOs, boolean shouldSendTimezone) {
-        this.acceptRecommendations = new SimpleBooleanProperty(acceptRecommendations);
+    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);
         this.sendTimezone = new SimpleBooleanProperty(shouldSendTimezone);
diff --git a/src/main/java/org/jabref/preferences/PreferenceServiceFactory.java b/src/main/java/org/jabref/preferences/PreferenceServiceFactory.java
index 15d323c4caf..fc9e99987dd 100644
--- a/src/main/java/org/jabref/preferences/PreferenceServiceFactory.java
+++ b/src/main/java/org/jabref/preferences/PreferenceServiceFactory.java
@@ -3,12 +3,12 @@
 import org.glassfish.hk2.api.Factory;
 
 public class PreferenceServiceFactory implements Factory<PreferencesService> {
+
     @Override
     public PreferencesService provide() {
         return JabRefPreferences.getInstance();
     }
 
     @Override
-    public void dispose(PreferencesService instance) {
-    }
+    public void dispose(PreferencesService instance) {}
 }
diff --git a/src/main/java/org/jabref/preferences/PreferencesFilter.java b/src/main/java/org/jabref/preferences/PreferencesFilter.java
index c1ba40ac9e3..82994e880ca 100644
--- a/src/main/java/org/jabref/preferences/PreferencesFilter.java
+++ b/src/main/java/org/jabref/preferences/PreferencesFilter.java
@@ -19,23 +19,35 @@ public List<PreferenceOption> getPreferenceOptions() {
         Map<String, Object> defaults = new HashMap<>(preferences.getDefaults());
         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());
+        return prefs
+            .entrySet()
+            .stream()
+            .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());
+        return getPreferenceOptions()
+            .stream()
+            .filter(PreferenceOption::isChanged)
+            .sorted()
+            .collect(Collectors.toList());
     }
 
     public enum PreferenceType {
-        BOOLEAN, INTEGER, STRING
+        BOOLEAN,
+        INTEGER,
+        STRING,
     }
 
-    public static class PreferenceOption implements Comparable<PreferenceOption> {
+    public static class PreferenceOption
+        implements Comparable<PreferenceOption> {
 
         private final String key;
         private final Object value;
@@ -48,8 +60,13 @@ public PreferenceOption(String key, Object value, Object defaultValue) {
             this.defaultValue = Optional.ofNullable(defaultValue);
             this.type = Objects.requireNonNull(getType(value));
 
-            if ((defaultValue != null) && !Objects.equals(this.type, getType(defaultValue))) {
-                throw new IllegalStateException("types must match between default value and value");
+            if (
+                (defaultValue != null) &&
+                !Objects.equals(this.type, getType(defaultValue))
+            ) {
+                throw new IllegalStateException(
+                    "types must match between default value and value"
+                );
             }
         }
 
@@ -73,7 +90,13 @@ public boolean isChanged() {
 
         @Override
         public String toString() {
-            return String.format("%s: %s=%s (%s)", type, key, value, defaultValue.orElse("NULL"));
+            return String.format(
+                "%s: %s=%s (%s)",
+                type,
+                key,
+                value,
+                defaultValue.orElse("NULL")
+            );
         }
 
         public String getKey() {
diff --git a/src/main/java/org/jabref/preferences/PreferencesService.java b/src/main/java/org/jabref/preferences/PreferencesService.java
index a03123740d6..4d222269b35 100644
--- a/src/main/java/org/jabref/preferences/PreferencesService.java
+++ b/src/main/java/org/jabref/preferences/PreferencesService.java
@@ -3,7 +3,6 @@
 import java.nio.file.Path;
 import java.util.Map;
 import java.util.prefs.BackingStoreException;
-
 import org.jabref.gui.autocompleter.AutoCompletePreferences;
 import org.jabref.gui.entryeditor.EntryEditorPreferences;
 import org.jabref.gui.groups.GroupsPreferences;
@@ -33,12 +32,10 @@
 import org.jabref.logic.util.io.AutoLinkPreferences;
 import org.jabref.logic.xmp.XmpPreferences;
 import org.jabref.model.entry.BibEntryTypesManager;
-
 import org.jvnet.hk2.annotations.Contract;
 
 @Contract
 public interface PreferencesService {
-
     void clear() throws BackingStoreException;
 
     void deleteKey(String key) throws IllegalArgumentException;
@@ -80,7 +77,9 @@ public interface PreferencesService {
 
     BibEntryTypesManager getCustomEntryTypesRepository();
 
-    void storeCustomEntryTypesRepository(BibEntryTypesManager entryTypesManager);
+    void storeCustomEntryTypesRepository(
+        BibEntryTypesManager entryTypesManager
+    );
 
     CleanupPreferences getCleanupPreferences();
 
diff --git a/src/main/java/org/jabref/preferences/PreviewPreferences.java b/src/main/java/org/jabref/preferences/PreviewPreferences.java
index 87b8a30831e..70826b082c3 100644
--- a/src/main/java/org/jabref/preferences/PreviewPreferences.java
+++ b/src/main/java/org/jabref/preferences/PreviewPreferences.java
@@ -1,7 +1,6 @@
 package org.jabref.preferences;
 
 import java.util.List;
-
 import javafx.beans.property.BooleanProperty;
 import javafx.beans.property.IntegerProperty;
 import javafx.beans.property.ObjectProperty;
@@ -12,7 +11,6 @@
 import javafx.beans.property.StringProperty;
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableList;
-
 import org.jabref.logic.layout.TextBasedPreviewLayout;
 import org.jabref.logic.preview.PreviewLayout;
 
@@ -24,16 +22,22 @@ public class PreviewPreferences {
     private final StringProperty defaultCustomPreviewLayout;
     private final BooleanProperty showPreviewAsExtraTab;
 
-    public PreviewPreferences(List<PreviewLayout> layoutCycle,
-                              int layoutCyclePosition,
-                              TextBasedPreviewLayout customPreviewLayout,
-                              String defaultCustomPreviewLayout,
-                              boolean showPreviewAsExtraTab) {
+    public PreviewPreferences(
+        List<PreviewLayout> layoutCycle,
+        int layoutCyclePosition,
+        TextBasedPreviewLayout customPreviewLayout,
+        String defaultCustomPreviewLayout,
+        boolean showPreviewAsExtraTab
+    ) {
         this.layoutCycle = FXCollections.observableArrayList(layoutCycle);
-        this.layoutCyclePosition = new SimpleIntegerProperty(layoutCyclePosition);
-        this.customPreviewLayout = new SimpleObjectProperty<>(customPreviewLayout);
-        this.defaultCustomPreviewLayout = new SimpleStringProperty(defaultCustomPreviewLayout);
-        this.showPreviewAsExtraTab = new SimpleBooleanProperty(showPreviewAsExtraTab);
+        this.layoutCyclePosition =
+            new SimpleIntegerProperty(layoutCyclePosition);
+        this.customPreviewLayout =
+            new SimpleObjectProperty<>(customPreviewLayout);
+        this.defaultCustomPreviewLayout =
+            new SimpleStringProperty(defaultCustomPreviewLayout);
+        this.showPreviewAsExtraTab =
+            new SimpleBooleanProperty(showPreviewAsExtraTab);
     }
 
     public ObservableList<PreviewLayout> getLayoutCycle() {
@@ -56,14 +60,18 @@ public void setLayoutCyclePosition(int position) {
             while (previewCyclePosition < 0) {
                 previewCyclePosition += layoutCycle.size();
             }
-            this.layoutCyclePosition.setValue(previewCyclePosition % layoutCycle.size());
+            this.layoutCyclePosition.setValue(
+                    previewCyclePosition % layoutCycle.size()
+                );
         }
     }
 
     public PreviewLayout getSelectedPreviewLayout() {
-        if (layoutCycle.size() <= 0
-                || layoutCyclePosition.getValue() < 0
-                || layoutCyclePosition.getValue() >= layoutCycle.size()) {
+        if (
+            layoutCycle.size() <= 0 ||
+            layoutCyclePosition.getValue() < 0 ||
+            layoutCyclePosition.getValue() >= layoutCycle.size()
+        ) {
             return getCustomPreviewLayout();
         } else {
             return layoutCycle.get(layoutCyclePosition.getValue());
@@ -74,7 +82,9 @@ public TextBasedPreviewLayout getCustomPreviewLayout() {
         return customPreviewLayout.getValue();
     }
 
-    public ObjectProperty<TextBasedPreviewLayout> customPreviewLayoutProperty() {
+    public ObjectProperty<
+        TextBasedPreviewLayout
+    > customPreviewLayoutProperty() {
         return customPreviewLayout;
     }
 
diff --git a/src/main/java/org/jabref/preferences/PushToApplicationPreferences.java b/src/main/java/org/jabref/preferences/PushToApplicationPreferences.java
index 61c559a8b3d..19c9befebd1 100644
--- a/src/main/java/org/jabref/preferences/PushToApplicationPreferences.java
+++ b/src/main/java/org/jabref/preferences/PushToApplicationPreferences.java
@@ -1,7 +1,6 @@
 package org.jabref.preferences;
 
 import java.util.Map;
-
 import javafx.beans.property.MapProperty;
 import javafx.beans.property.SimpleMapProperty;
 import javafx.beans.property.SimpleStringProperty;
@@ -9,17 +8,22 @@
 import javafx.collections.FXCollections;
 
 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) {
-        this.activeApplicationName = new SimpleStringProperty(activeApplicationName);
-        this.commandPaths = new SimpleMapProperty<>(FXCollections.observableMap(commandPaths));
+    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);
         this.vimServer = new SimpleStringProperty(vimServer);
     }
diff --git a/src/main/java/org/jabref/preferences/SearchPreferences.java b/src/main/java/org/jabref/preferences/SearchPreferences.java
index a4fdbf9cb53..735a782d904 100644
--- a/src/main/java/org/jabref/preferences/SearchPreferences.java
+++ b/src/main/java/org/jabref/preferences/SearchPreferences.java
@@ -1,7 +1,6 @@
 package org.jabref.preferences;
 
 import java.util.EnumSet;
-
 import javafx.beans.property.BooleanProperty;
 import javafx.beans.property.DoubleProperty;
 import javafx.beans.property.ObjectProperty;
@@ -10,7 +9,6 @@
 import javafx.beans.property.SimpleObjectProperty;
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableSet;
-
 import org.jabref.gui.search.SearchDisplayMode;
 import org.jabref.model.search.rules.SearchRules.SearchFlags;
 
@@ -20,14 +18,25 @@ public class SearchPreferences {
     private final ObservableSet<SearchFlags> searchFlags;
     private final BooleanProperty keepWindowOnTop;
 
-    private final DoubleProperty searchWindowHeight = new SimpleDoubleProperty();
+    private final DoubleProperty searchWindowHeight =
+        new SimpleDoubleProperty();
     private final DoubleProperty searchWindowWidth = new SimpleDoubleProperty();
 
-    public SearchPreferences(SearchDisplayMode searchDisplayMode, boolean isCaseSensitive, boolean isRegularExpression, boolean isFulltext, boolean isKeepSearchString, boolean keepWindowOnTop, double searchWindowHeight, double searchWindowWidth) {
+    public SearchPreferences(
+        SearchDisplayMode searchDisplayMode,
+        boolean isCaseSensitive,
+        boolean isRegularExpression,
+        boolean isFulltext,
+        boolean isKeepSearchString,
+        boolean keepWindowOnTop,
+        double searchWindowHeight,
+        double searchWindowWidth
+    ) {
         this.searchDisplayMode = new SimpleObjectProperty<>(searchDisplayMode);
         this.keepWindowOnTop = new SimpleBooleanProperty(keepWindowOnTop);
 
-        searchFlags = FXCollections.observableSet(EnumSet.noneOf(SearchFlags.class));
+        searchFlags =
+            FXCollections.observableSet(EnumSet.noneOf(SearchFlags.class));
         if (isCaseSensitive) {
             searchFlags.add(SearchFlags.CASE_SENSITIVE);
         }
@@ -45,7 +54,11 @@ public SearchPreferences(SearchDisplayMode searchDisplayMode, boolean isCaseSens
         this.setSearchWindowWidth(searchWindowWidth);
     }
 
-    public SearchPreferences(SearchDisplayMode searchDisplayMode, EnumSet<SearchFlags> searchFlags, boolean keepWindowOnTop) {
+    public SearchPreferences(
+        SearchDisplayMode searchDisplayMode,
+        EnumSet<SearchFlags> searchFlags,
+        boolean keepWindowOnTop
+    ) {
         this.searchDisplayMode = new SimpleObjectProperty<>(searchDisplayMode);
         this.keepWindowOnTop = new SimpleBooleanProperty(keepWindowOnTop);
 
diff --git a/src/main/java/org/jabref/preferences/SidePanePreferences.java b/src/main/java/org/jabref/preferences/SidePanePreferences.java
index 0cdbc3b52b2..6396c24914c 100644
--- a/src/main/java/org/jabref/preferences/SidePanePreferences.java
+++ b/src/main/java/org/jabref/preferences/SidePanePreferences.java
@@ -2,26 +2,29 @@
 
 import java.util.Map;
 import java.util.Set;
-
 import javafx.beans.property.IntegerProperty;
 import javafx.beans.property.SimpleIntegerProperty;
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableMap;
 import javafx.collections.ObservableSet;
-
 import org.jabref.gui.sidepane.SidePaneType;
 
 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);
+        this.preferredPositions =
+            FXCollections.observableMap(preferredPositions);
+        this.webSearchFetcherSelected =
+            new SimpleIntegerProperty(webSearchFetcherSelected);
     }
 
     public ObservableSet<SidePaneType> visiblePanes() {
diff --git a/src/main/java/org/jabref/preferences/TelemetryPreferences.java b/src/main/java/org/jabref/preferences/TelemetryPreferences.java
index 4573aba3a4e..9a760fbb26b 100644
--- a/src/main/java/org/jabref/preferences/TelemetryPreferences.java
+++ b/src/main/java/org/jabref/preferences/TelemetryPreferences.java
@@ -6,15 +6,20 @@
 import javafx.beans.property.StringProperty;
 
 public class TelemetryPreferences {
+
     private final BooleanProperty collectTelemetry;
     private final BooleanProperty askToCollectTelemetry;
     private final StringProperty userId;
 
-    public TelemetryPreferences(boolean shouldCollectTelemetry,
-                                boolean shouldAskToCollectTelemetry,
-                                String userId) {
-        this.collectTelemetry = new SimpleBooleanProperty(shouldCollectTelemetry);
-        this.askToCollectTelemetry = new SimpleBooleanProperty(shouldAskToCollectTelemetry);
+    public TelemetryPreferences(
+        boolean shouldCollectTelemetry,
+        boolean shouldAskToCollectTelemetry,
+        String userId
+    ) {
+        this.collectTelemetry =
+            new SimpleBooleanProperty(shouldCollectTelemetry);
+        this.askToCollectTelemetry =
+            new SimpleBooleanProperty(shouldAskToCollectTelemetry);
         this.userId = new SimpleStringProperty(userId);
     }
 
diff --git a/src/main/java/org/jabref/preferences/WorkspacePreferences.java b/src/main/java/org/jabref/preferences/WorkspacePreferences.java
index 5dfdd7379ac..4640732adf2 100644
--- a/src/main/java/org/jabref/preferences/WorkspacePreferences.java
+++ b/src/main/java/org/jabref/preferences/WorkspacePreferences.java
@@ -6,11 +6,11 @@
 import javafx.beans.property.SimpleBooleanProperty;
 import javafx.beans.property.SimpleIntegerProperty;
 import javafx.beans.property.SimpleObjectProperty;
-
 import org.jabref.gui.theme.Theme;
 import org.jabref.logic.l10n.Language;
 
 public class WorkspacePreferences {
+
     private final ObjectProperty<Language> language;
     private final BooleanProperty shouldOverrideDefaultFontSize;
     private final IntegerProperty mainFontSize;
@@ -22,25 +22,30 @@ public class WorkspacePreferences {
     private final BooleanProperty warnAboutDuplicatesInInspection;
     private final BooleanProperty confirmDelete;
 
-    public WorkspacePreferences(Language language,
-                                boolean shouldOverrideDefaultFontSize,
-                                int mainFontSize,
-                                int defaultFontSize,
-                                Theme theme,
-                                boolean themeSyncOs,
-                                boolean shouldOpenLastEdited,
-                                boolean showAdvancedHints,
-                                boolean warnAboutDuplicatesInInspection,
-                                boolean confirmDelete) {
+    public WorkspacePreferences(
+        Language language,
+        boolean shouldOverrideDefaultFontSize,
+        int mainFontSize,
+        int defaultFontSize,
+        Theme theme,
+        boolean themeSyncOs,
+        boolean shouldOpenLastEdited,
+        boolean showAdvancedHints,
+        boolean warnAboutDuplicatesInInspection,
+        boolean confirmDelete
+    ) {
         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.shouldOpenLastEdited =
+            new SimpleBooleanProperty(shouldOpenLastEdited);
         this.showAdvancedHints = new SimpleBooleanProperty(showAdvancedHints);
-        this.warnAboutDuplicatesInInspection = new SimpleBooleanProperty(warnAboutDuplicatesInInspection);
+        this.warnAboutDuplicatesInInspection =
+            new SimpleBooleanProperty(warnAboutDuplicatesInInspection);
         this.confirmDelete = new SimpleBooleanProperty(confirmDelete);
     }
 
@@ -140,8 +145,12 @@ public BooleanProperty warnAboutDuplicatesInInspectionProperty() {
         return warnAboutDuplicatesInInspection;
     }
 
-    public void setWarnAboutDuplicatesInInspection(boolean warnAboutDuplicatesInInspection) {
-        this.warnAboutDuplicatesInInspection.set(warnAboutDuplicatesInInspection);
+    public void setWarnAboutDuplicatesInInspection(
+        boolean warnAboutDuplicatesInInspection
+    ) {
+        this.warnAboutDuplicatesInInspection.set(
+                warnAboutDuplicatesInInspection
+            );
     }
 
     public boolean shouldConfirmDelete() {
diff --git a/src/main/resources/csl-styles b/src/main/resources/csl-styles
index 5bea241e5a2..010b77c19b0 160000
--- a/src/main/resources/csl-styles
+++ b/src/main/resources/csl-styles
@@ -1 +1 @@
-Subproject commit 5bea241e5a2acacc29b947e21539be9cbe79c8bd
+Subproject commit 010b77c19b0928db4cc046258d6797a937e0f460
diff --git a/src/test/java/org/jabref/IconsPropertiesTest.java b/src/test/java/org/jabref/IconsPropertiesTest.java
index c330ca4a1fe..b42d308ce0b 100644
--- a/src/test/java/org/jabref/IconsPropertiesTest.java
+++ b/src/test/java/org/jabref/IconsPropertiesTest.java
@@ -1,5 +1,9 @@
 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 java.io.IOException;
 import java.io.Reader;
 import java.nio.file.Files;
@@ -10,34 +14,47 @@
 import java.util.Properties;
 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;
-
 public class IconsPropertiesTest {
 
     @Test
-    public void testExistenceOfIconImagesReferencedFromIconsProperties() throws IOException {
+    public void testExistenceOfIconImagesReferencedFromIconsProperties()
+        throws IOException {
         String folder = "src/main/resources/images/external";
         String iconsProperties = "Icons.properties";
-        String iconsPropertiesPath = "src/main/resources/images/" + iconsProperties;
+        String iconsPropertiesPath =
+            "src/main/resources/images/" + iconsProperties;
 
         // load properties
         Properties properties = new Properties();
-        try (Reader reader = Files.newBufferedReader(Path.of(iconsPropertiesPath))) {
+        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 +64,15 @@ public void testExistenceOfIconImagesReferencedFromIconsProperties() throws IOEx
         }
 
         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/MainArchitectureTest.java b/src/test/java/org/jabref/architecture/MainArchitectureTest.java
index b7aff2a46f9..883892f8edb 100644
--- a/src/test/java/org/jabref/architecture/MainArchitectureTest.java
+++ b/src/test/java/org/jabref/architecture/MainArchitectureTest.java
@@ -1,15 +1,14 @@
 package org.jabref.architecture;
 
-import java.nio.file.Paths;
+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.junit.AnalyzeClasses;
 import com.tngtech.archunit.junit.ArchIgnore;
 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 java.nio.file.Paths;
 
 /**
  * This class checks JabRef's shipped classes for architecture quality
@@ -17,7 +16,8 @@
 @AnalyzeClasses(packages = "org.jabref")
 class MainArchitectureTest {
 
-    public static final String CLASS_ORG_JABREF_GLOBALS = "org.jabref.gui.Globals";
+    public static final String CLASS_ORG_JABREF_GLOBALS =
+        "org.jabref.gui.Globals";
     private static final String PACKAGE_JAVAX_SWING = "javax.swing..";
     private static final String PACKAGE_JAVA_AWT = "java.awt..";
     private static final String PACKAGE_ORG_JABREF_GUI = "org.jabref.gui..";
@@ -27,110 +27,190 @@ class MainArchitectureTest {
 
     @ArchTest
     public static void doNotUseApacheCommonsLang3(JavaClasses classes) {
-        noClasses().that().areNotAnnotatedWith(ApacheCommonsLang3Allowed.class)
-                   .should().accessClassesThat().resideInAPackage("org.apache.commons.lang3")
-                   .check(classes);
+        noClasses()
+            .that()
+            .areNotAnnotatedWith(ApacheCommonsLang3Allowed.class)
+            .should()
+            .accessClassesThat()
+            .resideInAPackage("org.apache.commons.lang3")
+            .check(classes);
     }
 
     @ArchTest
     public static 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 static void doNotUseAssertJ(JavaClasses classes) {
-        noClasses().should().accessClassesThat().resideInAPackage("org.assertj..")
-                   .check(classes);
+        noClasses()
+            .should()
+            .accessClassesThat()
+            .resideInAPackage("org.assertj..")
+            .check(classes);
     }
 
     @ArchTest
     public static 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 static 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
     @ArchIgnore
     // Fails currently
     public static void respectLayeredArchitecture(JavaClasses 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
-                             .layer("Preferences").definedBy("org.jabref.preferences..")
-                             .layer("Styletester").definedBy("org.jabref.styletester..")
-
-                             .whereLayer("Gui").mayOnlyBeAccessedByLayers("Preferences", "Cli") // TODO: Remove preferences here
-                             .whereLayer("Logic").mayOnlyBeAccessedByLayers("Gui", "Cli", "Model", "Migrations", "Preferences")
-                             .whereLayer("Model").mayOnlyBeAccessedByLayers("Gui", "Logic", "Migrations", "Cli", "Preferences")
-                             .whereLayer("Cli").mayNotBeAccessedByAnyLayer()
-                             .whereLayer("Migrations").mayOnlyBeAccessedByLayers("Logic")
-                             .whereLayer("Preferences").mayOnlyBeAccessedByLayers("Gui", "Logic", "Migrations", "Styletester", "Cli") // TODO: Remove logic here
-
-                             .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
+            .layer("Preferences")
+            .definedBy("org.jabref.preferences..")
+            .layer("Styletester")
+            .definedBy("org.jabref.styletester..")
+            .whereLayer("Gui")
+            .mayOnlyBeAccessedByLayers("Preferences", "Cli") // TODO: Remove preferences here
+            .whereLayer("Logic")
+            .mayOnlyBeAccessedByLayers(
+                "Gui",
+                "Cli",
+                "Model",
+                "Migrations",
+                "Preferences"
+            )
+            .whereLayer("Model")
+            .mayOnlyBeAccessedByLayers(
+                "Gui",
+                "Logic",
+                "Migrations",
+                "Cli",
+                "Preferences"
+            )
+            .whereLayer("Cli")
+            .mayNotBeAccessedByAnyLayer()
+            .whereLayer("Migrations")
+            .mayOnlyBeAccessedByLayers("Logic")
+            .whereLayer("Preferences")
+            .mayOnlyBeAccessedByLayers(
+                "Gui",
+                "Logic",
+                "Migrations",
+                "Styletester",
+                "Cli"
+            ) // TODO: Remove logic here
+            .check(classes);
     }
 
     @ArchTest
     public static 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 static void restrictUsagesInModel(JavaClasses 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)
-                   .orShould().dependOnClassesThat().haveFullyQualifiedName(CLASS_ORG_JABREF_GLOBALS)
-                   .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)
+            .orShould()
+            .dependOnClassesThat()
+            .haveFullyQualifiedName(CLASS_ORG_JABREF_GLOBALS)
+            .check(classes);
     }
 
     @ArchTest
     public static void restrictUsagesInLogic(JavaClasses classes) {
-        noClasses().that().resideInAPackage(PACKAGE_ORG_JABREF_LOGIC)
-                   .and().areNotAnnotatedWith(AllowedToUseSwing.class)
-                   .should().dependOnClassesThat().resideInAPackage(PACKAGE_JAVAX_SWING)
-                   .orShould().dependOnClassesThat().haveFullyQualifiedName(CLASS_ORG_JABREF_GLOBALS)
-                   .check(classes);
+        noClasses()
+            .that()
+            .resideInAPackage(PACKAGE_ORG_JABREF_LOGIC)
+            .and()
+            .areNotAnnotatedWith(AllowedToUseSwing.class)
+            .should()
+            .dependOnClassesThat()
+            .resideInAPackage(PACKAGE_JAVAX_SWING)
+            .orShould()
+            .dependOnClassesThat()
+            .haveFullyQualifiedName(CLASS_ORG_JABREF_GLOBALS)
+            .check(classes);
     }
 
     @ArchTest
     public static 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/architecture/TestArchitectureTest.java b/src/test/java/org/jabref/architecture/TestArchitectureTest.java
index 81f73e5a117..543c5b38d0e 100644
--- a/src/test/java/org/jabref/architecture/TestArchitectureTest.java
+++ b/src/test/java/org/jabref/architecture/TestArchitectureTest.java
@@ -1,59 +1,125 @@
 package org.jabref.architecture;
 
+import static com.tngtech.archunit.lang.syntax.ArchRuleDefinition.classes;
+import static com.tngtech.archunit.lang.syntax.ArchRuleDefinition.noClasses;
+import static org.jabref.architecture.MainArchitectureTest.CLASS_ORG_JABREF_GLOBALS;
+
 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;
-import static org.jabref.architecture.MainArchitectureTest.CLASS_ORG_JABREF_GLOBALS;
-
 /**
  * This class checks JabRef's test classes for architecture quality
  */
-@AnalyzeClasses(packages = "org.jabref", importOptions = ImportOption.OnlyIncludeTests.class)
+@AnalyzeClasses(
+    packages = "org.jabref",
+    importOptions = ImportOption.OnlyIncludeTests.class
+)
 public class TestArchitectureTest {
 
-    private static final String CLASS_ORG_JABREF_PREFERENCES = "org.jabref.preferences.JabRefPreferences";
+    private static final String CLASS_ORG_JABREF_PREFERENCES =
+        "org.jabref.preferences.JabRefPreferences";
 
     @ArchTest
     public void testsAreIndependent(JavaClasses classes) {
-        noClasses().that().doNotHaveSimpleName("EntryEditorTest")
-                   .and().doNotHaveSimpleName("LinkedFileViewModelTest")
-                   .and().doNotHaveSimpleName("JabRefPreferencesTest")
-                   .and().doNotHaveSimpleName("PreferencesMigrationsTest")
-                   .and().doNotHaveSimpleName("SaveDatabaseActionTest")
-                   .and().doNotHaveSimpleName("UpdateTimestampListenerTest")
-                   .and().doNotHaveFullyQualifiedName("org.jabref.benchmarks.Benchmarks")
-                   .and().doNotHaveFullyQualifiedName("org.jabref.testutils.interactive.styletester.StyleTesterMain")
-                   .should().dependOnClassesThat().haveFullyQualifiedName(CLASS_ORG_JABREF_GLOBALS)
-                   .orShould().dependOnClassesThat().haveFullyQualifiedName(CLASS_ORG_JABREF_PREFERENCES)
-                   .check(classes);
+        noClasses()
+            .that()
+            .doNotHaveSimpleName("EntryEditorTest")
+            .and()
+            .doNotHaveSimpleName("LinkedFileViewModelTest")
+            .and()
+            .doNotHaveSimpleName("JabRefPreferencesTest")
+            .and()
+            .doNotHaveSimpleName("PreferencesMigrationsTest")
+            .and()
+            .doNotHaveSimpleName("SaveDatabaseActionTest")
+            .and()
+            .doNotHaveSimpleName("UpdateTimestampListenerTest")
+            .and()
+            .doNotHaveFullyQualifiedName("org.jabref.benchmarks.Benchmarks")
+            .and()
+            .doNotHaveFullyQualifiedName(
+                "org.jabref.testutils.interactive.styletester.StyleTesterMain"
+            )
+            .should()
+            .dependOnClassesThat()
+            .haveFullyQualifiedName(CLASS_ORG_JABREF_GLOBALS)
+            .orShould()
+            .dependOnClassesThat()
+            .haveFullyQualifiedName(CLASS_ORG_JABREF_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.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.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/cli/ArgumentProcessorTest.java b/src/test/java/org/jabref/cli/ArgumentProcessorTest.java
index 55c9520b30a..c5aa2eaf18d 100644
--- a/src/test/java/org/jabref/cli/ArgumentProcessorTest.java
+++ b/src/test/java/org/jabref/cli/ArgumentProcessorTest.java
@@ -1,13 +1,15 @@
 package org.jabref.cli;
 
+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;
-
 import javafx.collections.FXCollections;
-
 import org.jabref.cli.ArgumentProcessor.Mode;
 import org.jabref.logic.bibtex.BibEntryAssert;
 import org.jabref.logic.exporter.BibDatabaseWriter;
@@ -25,50 +27,77 @@
 import org.jabref.preferences.ExportPreferences;
 import org.jabref.preferences.PreferencesService;
 import org.jabref.preferences.SearchPreferences;
-
 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;
-
 class ArgumentProcessorTest {
 
-    private final PreferencesService preferencesService = mock(PreferencesService.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);
-
-    @BeforeEach()
+    private final PreferencesService preferencesService = mock(
+        PreferencesService.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
+    );
+
+    @BeforeEach
     void setup() {
-        when(importerPreferences.getCustomImporters()).thenReturn(FXCollections.emptyObservableSet());
-
-        when(preferencesService.getImporterPreferences()).thenReturn(importerPreferences);
-        when(preferencesService.getImportFormatPreferences()).thenReturn(importFormatPreferences);
-        when(preferencesService.getSearchPreferences()).thenReturn(
-                new SearchPreferences(null, EnumSet.noneOf(SearchRules.SearchFlags.class), false)
-        );
+        when(importerPreferences.getCustomImporters())
+            .thenReturn(FXCollections.emptyObservableSet());
+
+        when(preferencesService.getImporterPreferences())
+            .thenReturn(importerPreferences);
+        when(preferencesService.getImportFormatPreferences())
+            .thenReturn(importFormatPreferences);
+        when(preferencesService.getSearchPreferences())
+            .thenReturn(
+                new SearchPreferences(
+                    null,
+                    EnumSet.noneOf(SearchRules.SearchFlags.class),
+                    false
+                )
+            );
     }
 
     @Test
     void testAuxImport(@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);
+        List<String> args = List.of(
+            "--nogui",
+            "--debug",
+            "--aux",
+            auxFile + "," + outputBibFile,
+            originBib
+        );
 
         ArgumentProcessor processor = new ArgumentProcessor(
-                args.toArray(String[]::new),
-                Mode.INITIAL_START,
-                preferencesService,
-                mock(FileUpdateMonitor.class),
-                entryTypesManager);
+            args.toArray(String[]::new),
+            Mode.INITIAL_START,
+            preferencesService,
+            mock(FileUpdateMonitor.class),
+            entryTypesManager
+        );
         processor.processArguments();
 
         assertTrue(Files.exists(outputBib));
@@ -76,28 +105,52 @@ void testAuxImport(@TempDir Path tempDir) throws Exception {
 
     @Test
     void testExportMatches(@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()
+            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);
+        List<String> args = List.of(
+            "-n",
+            "--debug",
+            "--exportMatches",
+            "Author=Einstein," + outputBibFile,
+            originBibFile
+        );
 
         ArgumentProcessor processor = new ArgumentProcessor(
-                args.toArray(String[]::new),
-                Mode.INITIAL_START,
-                preferencesService,
-                mock(FileUpdateMonitor.class),
-                entryTypesManager);
+            args.toArray(String[]::new),
+            Mode.INITIAL_START,
+            preferencesService,
+            mock(FileUpdateMonitor.class),
+            entryTypesManager
+        );
         processor.processArguments();
 
         assertTrue(Files.exists(outputBib));
@@ -105,31 +158,63 @@ void testExportMatches(@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());
+    void convertBibtexToTablerefsabsbib(@TempDir Path tempDir)
+        throws Exception {
+        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());
-        when(preferencesService.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(preferencesService.getSelfContainedExportConfiguration()).thenReturn(selfContainedSaveConfiguration);
-
-        List<String> args = List.of("-n", "-i", originBibFile + ",bibtex", "-o", outputHtmlFile + ",tablerefsabsbib");
+        SaveOrder saveOrder = new SaveOrder(
+            SaveOrder.OrderType.TABLE,
+            List.of()
+        );
+        ExportPreferences exportPreferences = new ExportPreferences(
+            ".html",
+            tempDir,
+            saveOrder,
+            List.of()
+        );
+        when(preferencesService.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(preferencesService.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,
-                preferencesService,
-                mock(FileUpdateMonitor.class),
-                entryTypesManager);
+            args.toArray(String[]::new),
+            Mode.INITIAL_START,
+            preferencesService,
+            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 d746bffea9a..be8720cfc64 100644
--- a/src/test/java/org/jabref/cli/AuxCommandLineTest.java
+++ b/src/test/java/org/jabref/cli/AuxCommandLineTest.java
@@ -1,5 +1,9 @@
 package org.jabref.cli;
 
+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;
@@ -7,38 +11,45 @@
 import java.net.URISyntaxException;
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Path;
-
 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;
-
 public class AuxCommandLineTest {
 
     private ImportFormatPreferences importFormatPreferences;
 
     @BeforeEach
     public void setUp() throws Exception {
-        importFormatPreferences = mock(ImportFormatPreferences.class, Answers.RETURNS_DEEP_STUBS);
+        importFormatPreferences =
+            mock(ImportFormatPreferences.class, Answers.RETURNS_DEEP_STUBS);
     }
 
     @Test
     public 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)) {
-            ParserResult result = new BibtexParser(importFormatPreferences).parse(originalReader);
-
-            AuxCommandLine auxCommandLine = new AuxCommandLine(auxFile.getAbsolutePath(), result.getDatabase());
+        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
+            )
+        ) {
+            ParserResult result = new BibtexParser(importFormatPreferences)
+                .parse(originalReader);
+
+            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 dfcd8478cd7..c01c9a1e639 100644
--- a/src/test/java/org/jabref/cli/JabRefCLITest.java
+++ b/src/test/java/org/jabref/cli/JabRefCLITest.java
@@ -1,165 +1,225 @@
 package org.jabref.cli;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
 import java.util.Collections;
 import java.util.List;
-
 import javafx.util.Pair;
-
 import org.junit.jupiter.api.Test;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-
 class JabRefCLITest {
 
     private final String bibtex = "@article{test, title=\"test title\"}";
 
     @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 wrapStringList() {
-        List<String> given = List.of("html", "simplehtml", "docbook5", "docbook4", "din1505", "bibordf", "tablerefs", "listrefs",
-                "tablerefsabsbib", "harvard", "iso690rtf", "iso690txt", "endnote", "oocsv", "ris", "misq", "yaml", "bibtexml", "oocalc", "ods",
-                "MSBib", "mods", "xmp", "pdf", "bib");
-        String expected = """
-                Available export formats: html, simplehtml, docbook5, docbook4, din1505, bibordf, tablerefs,
-                listrefs, tablerefsabsbib, harvard, iso690rtf, iso690txt, endnote, oocsv, ris, misq, yaml, bibtexml,
-                oocalc, ods, MSBib, mods, xmp, pdf, bib""";
-
-        assertEquals(expected, "Available export formats: " + JabRefCLI.wrapStringList(given, 26));
+        List<String> given = List.of(
+            "html",
+            "simplehtml",
+            "docbook5",
+            "docbook4",
+            "din1505",
+            "bibordf",
+            "tablerefs",
+            "listrefs",
+            "tablerefsabsbib",
+            "harvard",
+            "iso690rtf",
+            "iso690txt",
+            "endnote",
+            "oocsv",
+            "ris",
+            "misq",
+            "yaml",
+            "bibtexml",
+            "oocalc",
+            "ods",
+            "MSBib",
+            "mods",
+            "xmp",
+            "pdf",
+            "bib"
+        );
+        String expected =
+            """
+            Available export formats: html, simplehtml, docbook5, docbook4, din1505, bibordf, tablerefs,
+            listrefs, tablerefsabsbib, harvard, iso690rtf, iso690txt, endnote, oocsv, ris, misq, yaml, bibtexml,
+            oocalc, ods, MSBib, mods, xmp, pdf, bib""";
+
+        assertEquals(
+            expected,
+            "Available export formats: " + JabRefCLI.wrapStringList(given, 26)
+        );
     }
 
     @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 = """
-                Apple   : Slice
-                Bread   : Loaf
-                Paper   : Sheet
-                Country : County
-                """;
+            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
+            """;
 
         assertEquals(expected, JabRefCLI.alignStringTable(given));
     }
diff --git a/src/test/java/org/jabref/gui/UpdateTimestampListenerTest.java b/src/test/java/org/jabref/gui/UpdateTimestampListenerTest.java
index ec0b99431dc..0181269d7bc 100644
--- a/src/test/java/org/jabref/gui/UpdateTimestampListenerTest.java
+++ b/src/test/java/org/jabref/gui/UpdateTimestampListenerTest.java
@@ -1,21 +1,19 @@
 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 java.util.Optional;
 import org.jabref.logic.preferences.TimestampPreferences;
 import org.jabref.model.database.BibDatabase;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.field.StandardField;
 import org.jabref.model.entry.field.UnknownField;
 import org.jabref.preferences.PreferencesService;
-
 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;
-
 class UpdateTimestampListenerTest {
 
     private BibDatabase database;
@@ -37,7 +35,8 @@ void setUp() {
         preferencesMock = mock(PreferencesService.class);
         timestampPreferencesMock = mock(TimestampPreferences.class);
 
-        when(preferencesMock.getTimestampPreferences()).thenReturn(timestampPreferencesMock);
+        when(preferencesMock.getTimestampPreferences())
+            .thenReturn(timestampPreferencesMock);
     }
 
     @Test
@@ -45,17 +44,26 @@ void updateTimestampEnabled() {
         final boolean includeTimestamp = true;
 
         when(timestampPreferencesMock.now()).thenReturn(newDate);
-        when(timestampPreferencesMock.shouldAddModificationDate()).thenReturn(includeTimestamp);
+        when(timestampPreferencesMock.shouldAddModificationDate())
+            .thenReturn(includeTimestamp);
 
         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
@@ -63,16 +71,25 @@ void updateTimestampDisabled() {
         final boolean includeTimestamp = false;
 
         when(timestampPreferencesMock.now()).thenReturn(newDate);
-        when(timestampPreferencesMock.shouldAddModificationDate()).thenReturn(includeTimestamp);
+        when(timestampPreferencesMock.shouldAddModificationDate())
+            .thenReturn(includeTimestamp);
 
         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 e4acf04061d..fb439a5b7a7 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;
-
 public class AppendPersonNamesStrategyTest {
 
     @Test
@@ -15,12 +15,11 @@ void testWithoutParam() {
     }
 
     @ParameterizedTest(name = "separationBySpace={0}, expectedResult={1}")
-    @CsvSource({
-            "TRUE, ' '",
-            "FALSE, ' and '",
-    })
+    @CsvSource({ "TRUE, ' '", "FALSE, ' and '" })
     void testWithParam(boolean separationBySpace, String expectedResult) {
-        AppendPersonNamesStrategy strategy = new AppendPersonNamesStrategy(separationBySpace);
+        AppendPersonNamesStrategy strategy = new AppendPersonNamesStrategy(
+            separationBySpace
+        );
         assertEquals(expectedResult, strategy.getDelimiter());
     }
 }
diff --git a/src/test/java/org/jabref/gui/autocompleter/AutoCompleterUtil.java b/src/test/java/org/jabref/gui/autocompleter/AutoCompleterUtil.java
index c6cf7fce048..2d632cbaee3 100644
--- a/src/test/java/org/jabref/gui/autocompleter/AutoCompleterUtil.java
+++ b/src/test/java/org/jabref/gui/autocompleter/AutoCompleterUtil.java
@@ -3,7 +3,10 @@
 import org.controlsfx.control.textfield.AutoCompletionBinding;
 
 public class AutoCompleterUtil {
-    public static AutoCompletionBinding.ISuggestionRequest getRequest(String text) {
+
+    public static AutoCompletionBinding.ISuggestionRequest getRequest(
+        String text
+    ) {
         return new AutoCompletionBinding.ISuggestionRequest() {
             @Override
             public boolean isCancelled() {
diff --git a/src/test/java/org/jabref/gui/autocompleter/BibEntrySuggestionProviderTest.java b/src/test/java/org/jabref/gui/autocompleter/BibEntrySuggestionProviderTest.java
index 7b641e987dd..ff18a7025f8 100644
--- a/src/test/java/org/jabref/gui/autocompleter/BibEntrySuggestionProviderTest.java
+++ b/src/test/java/org/jabref/gui/autocompleter/BibEntrySuggestionProviderTest.java
@@ -1,19 +1,17 @@
 package org.jabref.gui.autocompleter;
 
+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;
-
 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;
-
 class BibEntrySuggestionProviderTest {
 
     private BibEntrySuggestionProvider autoCompleter;
@@ -27,7 +25,9 @@ void setUp() throws Exception {
 
     @Test
     void completeWithoutAddingAnythingReturnsNothing() {
-        Collection<BibEntry> result = autoCompleter.provideSuggestions(getRequest("test"));
+        Collection<BibEntry> result = autoCompleter.provideSuggestions(
+            getRequest("test")
+        );
         assertEquals(Collections.emptyList(), result);
     }
 
@@ -36,7 +36,9 @@ void completeAfterAddingEmptyEntryReturnsNothing() {
         BibEntry entry = new BibEntry();
         database.insertEntry(entry);
 
-        Collection<BibEntry> result = autoCompleter.provideSuggestions(getRequest("test"));
+        Collection<BibEntry> result = autoCompleter.provideSuggestions(
+            getRequest("test")
+        );
         assertEquals(Collections.emptyList(), result);
     }
 
@@ -46,7 +48,9 @@ void completeKeyReturnsKey() {
         entry.setCitationKey("testKey");
         database.insertEntry(entry);
 
-        Collection<BibEntry> result = autoCompleter.provideSuggestions(getRequest("testKey"));
+        Collection<BibEntry> result = autoCompleter.provideSuggestions(
+            getRequest("testKey")
+        );
         assertEquals(Collections.singletonList(entry), result);
     }
 
@@ -56,7 +60,9 @@ void completeBeginningOfKeyReturnsKey() {
         entry.setCitationKey("testKey");
         database.insertEntry(entry);
 
-        Collection<BibEntry> result = autoCompleter.provideSuggestions(getRequest("test"));
+        Collection<BibEntry> result = autoCompleter.provideSuggestions(
+            getRequest("test")
+        );
         assertEquals(Collections.singletonList(entry), result);
     }
 
@@ -66,7 +72,9 @@ void completeLowercaseKeyReturnsKey() {
         entry.setCitationKey("testKey");
         database.insertEntry(entry);
 
-        Collection<BibEntry> result = autoCompleter.provideSuggestions(getRequest("testkey"));
+        Collection<BibEntry> result = autoCompleter.provideSuggestions(
+            getRequest("testkey")
+        );
         assertEquals(Collections.singletonList(entry), result);
     }
 
@@ -76,7 +84,10 @@ void completeNullThrowsException() {
         entry.setCitationKey("testKey");
         database.insertEntry(entry);
 
-        assertThrows(NullPointerException.class, () -> autoCompleter.provideSuggestions(getRequest(null)));
+        assertThrows(
+            NullPointerException.class,
+            () -> autoCompleter.provideSuggestions(getRequest(null))
+        );
     }
 
     @Test
@@ -85,7 +96,9 @@ void completeEmptyStringReturnsNothing() {
         entry.setCitationKey("testKey");
         database.insertEntry(entry);
 
-        Collection<BibEntry> result = autoCompleter.provideSuggestions(getRequest(""));
+        Collection<BibEntry> result = autoCompleter.provideSuggestions(
+            getRequest("")
+        );
         assertEquals(Collections.emptyList(), result);
     }
 
@@ -98,7 +111,9 @@ void completeReturnsMultipleResults() {
         entryTwo.setCitationKey("testKeyTwo");
         database.insertEntry(entryTwo);
 
-        Collection<BibEntry> result = autoCompleter.provideSuggestions(getRequest("testKey"));
+        Collection<BibEntry> result = autoCompleter.provideSuggestions(
+            getRequest("testKey")
+        );
         assertEquals(Arrays.asList(entryTwo, entryOne), result);
     }
 
@@ -108,7 +123,9 @@ void completeShortKeyReturnsKey() {
         entry.setCitationKey("key");
         database.insertEntry(entry);
 
-        Collection<BibEntry> result = autoCompleter.provideSuggestions(getRequest("k"));
+        Collection<BibEntry> result = autoCompleter.provideSuggestions(
+            getRequest("k")
+        );
         assertEquals(Collections.singletonList(entry), result);
     }
 }
diff --git a/src/test/java/org/jabref/gui/autocompleter/ContentSelectorSuggestionProviderTest.java b/src/test/java/org/jabref/gui/autocompleter/ContentSelectorSuggestionProviderTest.java
index efa4139f4e3..28d6e3e5834 100644
--- a/src/test/java/org/jabref/gui/autocompleter/ContentSelectorSuggestionProviderTest.java
+++ b/src/test/java/org/jabref/gui/autocompleter/ContentSelectorSuggestionProviderTest.java
@@ -1,52 +1,71 @@
 package org.jabref.gui.autocompleter;
 
+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;
-
 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;
-
 public class ContentSelectorSuggestionProviderTest {
 
     private ContentSelectorSuggestionProvider autoCompleter;
 
     @Test
     void completeWithoutAddingAnythingReturnsNothing() {
-        SuggestionProvider<String> suggestionProvider = new EmptySuggestionProvider();
-        autoCompleter = new ContentSelectorSuggestionProvider(suggestionProvider, Collections.emptyList());
+        SuggestionProvider<String> suggestionProvider =
+            new EmptySuggestionProvider();
+        autoCompleter =
+            new ContentSelectorSuggestionProvider(
+                suggestionProvider,
+                Collections.emptyList()
+            );
 
         Collection<String> expected = Collections.emptyList();
-        Collection<String> result = autoCompleter.provideSuggestions(getRequest("test"));
+        Collection<String> result = autoCompleter.provideSuggestions(
+            getRequest("test")
+        );
 
         assertEquals(expected, result);
     }
 
     @Test
     void completeKeywordReturnsKeyword() {
-        SuggestionProvider<String> suggestionProvider = new EmptySuggestionProvider();
-        autoCompleter = new ContentSelectorSuggestionProvider(suggestionProvider, Collections.singletonList("test"));
+        SuggestionProvider<String> suggestionProvider =
+            new EmptySuggestionProvider();
+        autoCompleter =
+            new ContentSelectorSuggestionProvider(
+                suggestionProvider,
+                Collections.singletonList("test")
+            );
 
         Collection<String> expected = Collections.singletonList("test");
-        Collection<String> result = autoCompleter.provideSuggestions(getRequest("test"));
+        Collection<String> result = autoCompleter.provideSuggestions(
+            getRequest("test")
+        );
 
         assertEquals(expected, result);
     }
 
     @Test
     void completeBeginningOfKeywordReturnsKeyword() {
-        SuggestionProvider<String> suggestionProvider = new EmptySuggestionProvider();
-        autoCompleter = new ContentSelectorSuggestionProvider(suggestionProvider, Collections.singletonList("test"));
+        SuggestionProvider<String> suggestionProvider =
+            new EmptySuggestionProvider();
+        autoCompleter =
+            new ContentSelectorSuggestionProvider(
+                suggestionProvider,
+                Collections.singletonList("test")
+            );
 
         Collection<String> expected = Collections.singletonList("test");
-        Collection<String> result = autoCompleter.provideSuggestions(getRequest("te"));
+        Collection<String> result = autoCompleter.provideSuggestions(
+            getRequest("te")
+        );
 
         assertEquals(expected, result);
     }
@@ -58,38 +77,62 @@ 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"));
+        Collection<String> result = autoCompleter.provideSuggestions(
+            getRequest("test")
+        );
 
         assertEquals(expected, result);
     }
 
     @Test
     void completeUppercaseBeginningOfNameReturnsName() {
-        SuggestionProvider<String> suggestionProvider = new EmptySuggestionProvider();
-        autoCompleter = new ContentSelectorSuggestionProvider(suggestionProvider, Collections.singletonList("test"));
+        SuggestionProvider<String> suggestionProvider =
+            new EmptySuggestionProvider();
+        autoCompleter =
+            new ContentSelectorSuggestionProvider(
+                suggestionProvider,
+                Collections.singletonList("test")
+            );
 
         Collection<String> expected = Collections.singletonList("test");
-        Collection<String> result = autoCompleter.provideSuggestions(getRequest("TE"));
+        Collection<String> result = autoCompleter.provideSuggestions(
+            getRequest("TE")
+        );
 
         assertEquals(expected, result);
     }
 
     @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"));
+        SuggestionProvider<String> suggestionProvider =
+            new EmptySuggestionProvider();
+        autoCompleter =
+            new ContentSelectorSuggestionProvider(
+                suggestionProvider,
+                Collections.singletonList("test")
+            );
 
         Collection<String> expected = Collections.emptyList();
-        Collection<String> result = autoCompleter.provideSuggestions(getRequest(""));
+        Collection<String> result = autoCompleter.provideSuggestions(
+            getRequest("")
+        );
 
         assertEquals(expected, result);
     }
@@ -101,11 +144,18 @@ 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"));
+        Collection<String> result = autoCompleter.provideSuggestions(
+            getRequest("test")
+        );
 
         assertEquals(expected, result);
     }
@@ -118,11 +168,23 @@ void completeReturnsKeywordsInAlphabeticalOrder() {
         bibEntry.addKeyword("testc", ',');
         database.insertEntry(bibEntry);
 
-        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"));
+        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")
+        );
 
         assertEquals(expected, result);
     }
diff --git a/src/test/java/org/jabref/gui/autocompleter/DefaultAutoCompleterTest.java b/src/test/java/org/jabref/gui/autocompleter/DefaultAutoCompleterTest.java
index 767eff82374..6957c0d9828 100644
--- a/src/test/java/org/jabref/gui/autocompleter/DefaultAutoCompleterTest.java
+++ b/src/test/java/org/jabref/gui/autocompleter/DefaultAutoCompleterTest.java
@@ -1,20 +1,18 @@
 package org.jabref.gui.autocompleter;
 
+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;
-
 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;
-
 class DefaultAutoCompleterTest {
 
     private WordSuggestionProvider autoCompleter;
@@ -23,17 +21,23 @@ class DefaultAutoCompleterTest {
     @BeforeEach
     void setUp() throws Exception {
         database = new BibDatabase();
-        autoCompleter = new WordSuggestionProvider(StandardField.TITLE, database);
+        autoCompleter =
+            new WordSuggestionProvider(StandardField.TITLE, database);
     }
 
     @Test
     void initAutoCompleterWithNullFieldThrowsException() {
-        assertThrows(NullPointerException.class, () -> new WordSuggestionProvider(null, database));
+        assertThrows(
+            NullPointerException.class,
+            () -> new WordSuggestionProvider(null, database)
+        );
     }
 
     @Test
     void completeWithoutAddingAnythingReturnsNothing() {
-        Collection<String> result = autoCompleter.provideSuggestions(getRequest("test"));
+        Collection<String> result = autoCompleter.provideSuggestions(
+            getRequest("test")
+        );
         assertEquals(Collections.emptyList(), result);
     }
 
@@ -42,7 +46,9 @@ void completeAfterAddingEmptyEntryReturnsNothing() {
         BibEntry entry = new BibEntry();
         database.insertEntry(entry);
 
-        Collection<String> result = autoCompleter.provideSuggestions(getRequest("test"));
+        Collection<String> result = autoCompleter.provideSuggestions(
+            getRequest("test")
+        );
         assertEquals(Collections.emptyList(), result);
     }
 
@@ -52,7 +58,9 @@ void completeAfterAddingEntryWithoutFieldReturnsNothing() {
         entry.setField(StandardField.AUTHOR, "testAuthor");
         database.insertEntry(entry);
 
-        Collection<String> result = autoCompleter.provideSuggestions(getRequest("test"));
+        Collection<String> result = autoCompleter.provideSuggestions(
+            getRequest("test")
+        );
         assertEquals(Collections.emptyList(), result);
     }
 
@@ -62,7 +70,9 @@ void completeValueReturnsValue() {
         entry.setField(StandardField.TITLE, "testValue");
         database.insertEntry(entry);
 
-        Collection<String> result = autoCompleter.provideSuggestions(getRequest("testValue"));
+        Collection<String> result = autoCompleter.provideSuggestions(
+            getRequest("testValue")
+        );
         assertEquals(Arrays.asList("testValue"), result);
     }
 
@@ -72,7 +82,9 @@ void completeBeginningOfValueReturnsValue() {
         entry.setField(StandardField.TITLE, "testValue");
         database.insertEntry(entry);
 
-        Collection<String> result = autoCompleter.provideSuggestions(getRequest("test"));
+        Collection<String> result = autoCompleter.provideSuggestions(
+            getRequest("test")
+        );
         assertEquals(Arrays.asList("testValue"), result);
     }
 
@@ -82,7 +94,9 @@ void completeLowercaseValueReturnsValue() {
         entry.setField(StandardField.TITLE, "testValue");
         database.insertEntry(entry);
 
-        Collection<String> result = autoCompleter.provideSuggestions(getRequest("testvalue"));
+        Collection<String> result = autoCompleter.provideSuggestions(
+            getRequest("testvalue")
+        );
         assertEquals(Arrays.asList("testValue"), result);
     }
 
@@ -92,7 +106,10 @@ 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
@@ -101,7 +118,9 @@ void completeEmptyStringReturnsNothing() {
         entry.setField(StandardField.TITLE, "testKey");
         database.insertEntry(entry);
 
-        Collection<String> result = autoCompleter.provideSuggestions(getRequest(""));
+        Collection<String> result = autoCompleter.provideSuggestions(
+            getRequest("")
+        );
         assertEquals(Collections.emptyList(), result);
     }
 
@@ -114,7 +133,9 @@ void completeReturnsMultipleResults() {
         entryTwo.setField(StandardField.TITLE, "testValueTwo");
         database.insertEntry(entryTwo);
 
-        Collection<String> result = autoCompleter.provideSuggestions(getRequest("testValue"));
+        Collection<String> result = autoCompleter.provideSuggestions(
+            getRequest("testValue")
+        );
         assertEquals(Arrays.asList("testValueOne", "testValueTwo"), result);
     }
 
@@ -124,7 +145,9 @@ void completeShortStringReturnsValue() {
         entry.setField(StandardField.TITLE, "val");
         database.insertEntry(entry);
 
-        Collection<String> result = autoCompleter.provideSuggestions(getRequest("va"));
+        Collection<String> result = autoCompleter.provideSuggestions(
+            getRequest("va")
+        );
         assertEquals(Collections.singletonList("val"), result);
     }
 
@@ -134,7 +157,9 @@ void completeBeginnigOfSecondWordReturnsWord() {
         entry.setField(StandardField.TITLE, "test value");
         database.insertEntry(entry);
 
-        Collection<String> result = autoCompleter.provideSuggestions(getRequest("val"));
+        Collection<String> result = autoCompleter.provideSuggestions(
+            getRequest("val")
+        );
         assertEquals(Collections.singletonList("value"), result);
     }
 
@@ -144,7 +169,9 @@ void completePartOfWordReturnsValue() {
         entry.setField(StandardField.TITLE, "test value");
         database.insertEntry(entry);
 
-        Collection<String> result = autoCompleter.provideSuggestions(getRequest("lue"));
+        Collection<String> result = autoCompleter.provideSuggestions(
+            getRequest("lue")
+        );
         assertEquals(Collections.singletonList("value"), result);
     }
 }
diff --git a/src/test/java/org/jabref/gui/autocompleter/FieldValueSuggestionProviderTest.java b/src/test/java/org/jabref/gui/autocompleter/FieldValueSuggestionProviderTest.java
index e4baeeb3405..462947d30f2 100644
--- a/src/test/java/org/jabref/gui/autocompleter/FieldValueSuggestionProviderTest.java
+++ b/src/test/java/org/jabref/gui/autocompleter/FieldValueSuggestionProviderTest.java
@@ -1,27 +1,24 @@
 package org.jabref.gui.autocompleter;
 
+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;
-
 import javafx.collections.FXCollections;
-
 import org.jabref.logic.journals.JournalAbbreviationRepository;
 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;
-
 class FieldValueSuggestionProviderTest {
 
     private FieldValueSuggestionProvider autoCompleter;
@@ -30,17 +27,23 @@ class FieldValueSuggestionProviderTest {
     @BeforeEach
     void setUp() {
         database = new BibDatabase();
-        autoCompleter = new FieldValueSuggestionProvider(StandardField.TITLE, database);
+        autoCompleter =
+            new FieldValueSuggestionProvider(StandardField.TITLE, database);
     }
 
     @Test
     void initAutoCompleterWithNullFieldThrowsException() {
-        assertThrows(NullPointerException.class, () -> new FieldValueSuggestionProvider(null, new BibDatabase()));
+        assertThrows(
+            NullPointerException.class,
+            () -> new FieldValueSuggestionProvider(null, new BibDatabase())
+        );
     }
 
     @Test
     void completeWithoutAddingAnythingReturnsNothing() {
-        Collection<String> result = autoCompleter.provideSuggestions(getRequest("test"));
+        Collection<String> result = autoCompleter.provideSuggestions(
+            getRequest("test")
+        );
         assertEquals(Collections.emptyList(), result);
     }
 
@@ -49,7 +52,9 @@ void completeAfterAddingEmptyEntryReturnsNothing() {
         BibEntry entry = new BibEntry();
         database.insertEntry(entry);
 
-        Collection<String> result = autoCompleter.provideSuggestions(getRequest("test"));
+        Collection<String> result = autoCompleter.provideSuggestions(
+            getRequest("test")
+        );
         assertEquals(Collections.emptyList(), result);
     }
 
@@ -59,24 +64,41 @@ void completeAfterAddingEntryWithoutFieldReturnsNothing() {
         entry.setField(StandardField.AUTHOR, "testAuthor");
         database.insertEntry(entry);
 
-        Collection<String> result = autoCompleter.provideSuggestions(getRequest("test"));
+        Collection<String> result = autoCompleter.provideSuggestions(
+            getRequest("test")
+        );
         assertEquals(Collections.emptyList(), result);
     }
 
     @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);
-
-        SuggestionProvider<String> autoCompleter = (SuggestionProvider<String>) suggestionProviders.getForField(StandardField.TITLE);
+        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
+        );
+
+        SuggestionProvider<String> autoCompleter = (SuggestionProvider<
+                String
+            >) suggestionProviders.getForField(StandardField.TITLE);
 
         BibEntry entry = new BibEntry();
         entry.setField(StandardField.TITLE, "testValue");
         database.insertEntry(entry);
 
-        Collection<String> result = autoCompleter.provideSuggestions(getRequest("testValue"));
+        Collection<String> result = autoCompleter.provideSuggestions(
+            getRequest("testValue")
+        );
         assertEquals(Collections.emptyList(), result);
     }
 
@@ -86,7 +108,9 @@ void completeValueReturnsValue() {
         entry.setField(StandardField.TITLE, "testValue");
         database.insertEntry(entry);
 
-        Collection<String> result = autoCompleter.provideSuggestions(getRequest("testValue"));
+        Collection<String> result = autoCompleter.provideSuggestions(
+            getRequest("testValue")
+        );
         assertEquals(List.of("testValue"), result);
     }
 
@@ -96,7 +120,9 @@ void completeBeginnigOfValueReturnsValue() {
         entry.setField(StandardField.TITLE, "testValue");
         database.insertEntry(entry);
 
-        Collection<String> result = autoCompleter.provideSuggestions(getRequest("test"));
+        Collection<String> result = autoCompleter.provideSuggestions(
+            getRequest("test")
+        );
         assertEquals(List.of("testValue"), result);
     }
 
@@ -106,7 +132,9 @@ void completeLowercaseValueReturnsValue() {
         entry.setField(StandardField.TITLE, "testValue");
         database.insertEntry(entry);
 
-        Collection<String> result = autoCompleter.provideSuggestions(getRequest("testvalue"));
+        Collection<String> result = autoCompleter.provideSuggestions(
+            getRequest("testvalue")
+        );
         assertEquals(List.of("testValue"), result);
     }
 
@@ -116,7 +144,10 @@ 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
@@ -125,7 +156,9 @@ void completeEmptyStringReturnsNothing() {
         entry.setField(StandardField.TITLE, "testKey");
         database.insertEntry(entry);
 
-        Collection<String> result = autoCompleter.provideSuggestions(getRequest(""));
+        Collection<String> result = autoCompleter.provideSuggestions(
+            getRequest("")
+        );
         assertEquals(Collections.emptyList(), result);
     }
 
@@ -138,7 +171,9 @@ void completeReturnsMultipleResults() {
         entryTwo.setField(StandardField.TITLE, "testValueTwo");
         database.insertEntry(entryTwo);
 
-        Collection<String> result = autoCompleter.provideSuggestions(getRequest("testValue"));
+        Collection<String> result = autoCompleter.provideSuggestions(
+            getRequest("testValue")
+        );
         assertEquals(Arrays.asList("testValueOne", "testValueTwo"), result);
     }
 
@@ -148,7 +183,9 @@ void completeShortStringReturnsFieldValue() {
         entry.setField(StandardField.TITLE, "val");
         database.insertEntry(entry);
 
-        Collection<String> result = autoCompleter.provideSuggestions(getRequest("va"));
+        Collection<String> result = autoCompleter.provideSuggestions(
+            getRequest("va")
+        );
         assertEquals(Collections.singletonList("val"), result);
     }
 
@@ -158,7 +195,9 @@ void completeBeginnigOfSecondWordReturnsWholeFieldValue() {
         entry.setField(StandardField.TITLE, "test value");
         database.insertEntry(entry);
 
-        Collection<String> result = autoCompleter.provideSuggestions(getRequest("val"));
+        Collection<String> result = autoCompleter.provideSuggestions(
+            getRequest("val")
+        );
         assertEquals(Collections.singletonList("test value"), result);
     }
 
@@ -168,7 +207,9 @@ void completePartOfWordReturnsWholeFieldValue() {
         entry.setField(StandardField.TITLE, "test value");
         database.insertEntry(entry);
 
-        Collection<String> result = autoCompleter.provideSuggestions(getRequest("lue"));
+        Collection<String> result = autoCompleter.provideSuggestions(
+            getRequest("lue")
+        );
         assertEquals(Collections.singletonList("test value"), result);
     }
 
@@ -178,7 +219,9 @@ void completeReturnsWholeFieldValue() {
         entry.setField(StandardField.TITLE, "test value");
         database.insertEntry(entry);
 
-        Collection<String> result = autoCompleter.provideSuggestions(getRequest("te"));
+        Collection<String> result = autoCompleter.provideSuggestions(
+            getRequest("te")
+        );
         assertEquals(Collections.singletonList("test value"), result);
     }
 }
diff --git a/src/test/java/org/jabref/gui/autocompleter/PersonNameStringConverterTest.java b/src/test/java/org/jabref/gui/autocompleter/PersonNameStringConverterTest.java
index e1fdff0f8b1..c8323980f86 100644
--- a/src/test/java/org/jabref/gui/autocompleter/PersonNameStringConverterTest.java
+++ b/src/test/java/org/jabref/gui/autocompleter/PersonNameStringConverterTest.java
@@ -1,15 +1,13 @@
 package org.jabref.gui.autocompleter;
 
-import java.util.Collections;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
+import java.util.Collections;
 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;
-
 public class PersonNameStringConverterTest {
 
     /** The author. **/
@@ -21,53 +19,71 @@ void setUp() {
         author = new Author("Joseph M.", "J. M.", "", "Reagle", "Jr.");
     }
 
-    @ParameterizedTest(name = "autoCompFF={0}, autoCompLF={1}, autoCompleteFirstNameMode={2}, expectedResult={3}")
-    @CsvSource({
+    @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'"
-    })
-    void testToStringWithoutAutoCompletePreferences(boolean autoCompFF, boolean autoCompLF, AutoCompleteFirstNameMode autoCompleteFirstNameMode, String expectedResult) {
-        PersonNameStringConverter converter = new PersonNameStringConverter(autoCompFF, autoCompLF, autoCompleteFirstNameMode);
+            "FALSE, FALSE, BOTH, 'Reagle'",
+        }
+    )
+    void testToStringWithoutAutoCompletePreferences(
+        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}")
-    @CsvSource({
+    @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.'"
-    })
-    void testToStringWithAutoCompletePreferences(boolean shouldAutoComplete,
-                                                 AutoCompleteFirstNameMode firstNameMode,
-                                                 AutoCompletePreferences.NameFormat nameFormat,
-                                                 String expectedResult) {
+            "TRUE, BOTH, BOTH, 'Reagle, Jr., J. M.'",
+        }
+    )
+    void testToStringWithAutoCompletePreferences(
+        boolean shouldAutoComplete,
+        AutoCompleteFirstNameMode firstNameMode,
+        AutoCompletePreferences.NameFormat nameFormat,
+        String expectedResult
+    ) {
         AutoCompletePreferences preferences = new AutoCompletePreferences(
-                shouldAutoComplete,
-                firstNameMode,
-                nameFormat,
-                Collections.emptySet());
-        PersonNameStringConverter converter = new PersonNameStringConverter(preferences);
+            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 980868f7306..3fd5b13cf7b 100644
--- a/src/test/java/org/jabref/gui/autocompleter/PersonNameSuggestionProviderTest.java
+++ b/src/test/java/org/jabref/gui/autocompleter/PersonNameSuggestionProviderTest.java
@@ -1,25 +1,29 @@
 package org.jabref.gui.autocompleter;
 
+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;
-
 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;
-
 class PersonNameSuggestionProviderTest {
 
-    private final Author vassilisKostakos = new Author("Vassilis", "V.", "", "Kostakos", "");
+    private final Author vassilisKostakos = new Author(
+        "Vassilis",
+        "V.",
+        "",
+        "Kostakos",
+        ""
+    );
     private PersonNameSuggestionProvider autoCompleter;
     private BibEntry entry;
     private BibDatabase database;
@@ -27,7 +31,8 @@ class PersonNameSuggestionProviderTest {
     @BeforeEach
     void setUp() throws Exception {
         database = new BibDatabase();
-        autoCompleter = new PersonNameSuggestionProvider(StandardField.AUTHOR, database);
+        autoCompleter =
+            new PersonNameSuggestionProvider(StandardField.AUTHOR, database);
 
         entry = new BibEntry();
         entry.setField(StandardField.AUTHOR, "Vassilis Kostakos");
@@ -35,12 +40,21 @@ 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
     void completeWithoutAddingAnythingReturnsNothing() {
-        Collection<Author> result = autoCompleter.provideSuggestions(getRequest("test"));
+        Collection<Author> result = autoCompleter.provideSuggestions(
+            getRequest("test")
+        );
         assertEquals(Collections.emptyList(), result);
     }
 
@@ -49,7 +63,9 @@ void completeAfterAddingEmptyEntryReturnsNothing() {
         BibEntry entry = new BibEntry();
         database.insertEntry(entry);
 
-        Collection<Author> result = autoCompleter.provideSuggestions(getRequest("test"));
+        Collection<Author> result = autoCompleter.provideSuggestions(
+            getRequest("test")
+        );
         assertEquals(Collections.emptyList(), result);
     }
 
@@ -59,7 +75,9 @@ void completeAfterAddingEntryWithoutFieldReturnsNothing() {
         entry.setField(StandardField.TITLE, "testTitle");
         database.insertEntry(entry);
 
-        Collection<Author> result = autoCompleter.provideSuggestions(getRequest("test"));
+        Collection<Author> result = autoCompleter.provideSuggestions(
+            getRequest("test")
+        );
         assertEquals(Collections.emptyList(), result);
     }
 
@@ -67,7 +85,9 @@ void completeAfterAddingEntryWithoutFieldReturnsNothing() {
     void completeNameReturnsName() {
         database.insertEntry(entry);
 
-        Collection<Author> result = autoCompleter.provideSuggestions(getRequest("Kostakos"));
+        Collection<Author> result = autoCompleter.provideSuggestions(
+            getRequest("Kostakos")
+        );
         assertEquals(Collections.singletonList(vassilisKostakos), result);
     }
 
@@ -75,7 +95,9 @@ void completeNameReturnsName() {
     void completeBeginningOfNameReturnsName() {
         database.insertEntry(entry);
 
-        Collection<Author> result = autoCompleter.provideSuggestions(getRequest("Kosta"));
+        Collection<Author> result = autoCompleter.provideSuggestions(
+            getRequest("Kosta")
+        );
         assertEquals(Collections.singletonList(vassilisKostakos), result);
     }
 
@@ -83,20 +105,27 @@ void completeBeginningOfNameReturnsName() {
     void completeLowercaseBeginningOfNameReturnsName() {
         database.insertEntry(entry);
 
-        Collection<Author> result = autoCompleter.provideSuggestions(getRequest("kosta"));
+        Collection<Author> result = autoCompleter.provideSuggestions(
+            getRequest("kosta")
+        );
         assertEquals(Collections.singletonList(vassilisKostakos), result);
     }
 
     @Test
     void completeNullThrowsException() {
-        assertThrows(NullPointerException.class, () -> autoCompleter.provideSuggestions(getRequest(null)));
+        assertThrows(
+            NullPointerException.class,
+            () -> autoCompleter.provideSuggestions(getRequest(null))
+        );
     }
 
     @Test
     void completeEmptyStringReturnsNothing() {
         database.insertEntry(entry);
 
-        Collection<Author> result = autoCompleter.provideSuggestions(getRequest(""));
+        Collection<Author> result = autoCompleter.provideSuggestions(
+            getRequest("")
+        );
         assertEquals(Collections.emptyList(), result);
     }
 
@@ -108,7 +137,9 @@ void completeReturnsMultipleResults() {
         database.insertEntry(entryTwo);
         Author authorTwo = new Author("", "", "", "Kosta", "");
 
-        Collection<Author> result = autoCompleter.provideSuggestions(getRequest("Ko"));
+        Collection<Author> result = autoCompleter.provideSuggestions(
+            getRequest("Ko")
+        );
         assertEquals(Arrays.asList(authorTwo, vassilisKostakos), result);
     }
 
@@ -116,7 +147,9 @@ void completeReturnsMultipleResults() {
     void completePartOfNameReturnsName() {
         database.insertEntry(entry);
 
-        Collection<Author> result = autoCompleter.provideSuggestions(getRequest("osta"));
+        Collection<Author> result = autoCompleter.provideSuggestions(
+            getRequest("osta")
+        );
         assertEquals(Collections.singletonList(vassilisKostakos), result);
     }
 
@@ -124,7 +157,9 @@ void completePartOfNameReturnsName() {
     void completeBeginningOfFirstNameReturnsName() {
         database.insertEntry(entry);
 
-        Collection<Author> result = autoCompleter.provideSuggestions(getRequest("Vas"));
+        Collection<Author> result = autoCompleter.provideSuggestions(
+            getRequest("Vas")
+        );
         assertEquals(Collections.singletonList(vassilisKostakos), result);
     }
 
@@ -135,7 +170,9 @@ void completeBeginningOfFirstNameReturnsNameWithJr() {
         database.insertEntry(entry);
         Author author = new Author("Joseph M.", "J. M.", "", "Reagle", "Jr.");
 
-        Collection<Author> result = autoCompleter.provideSuggestions(getRequest("Jos"));
+        Collection<Author> result = autoCompleter.provideSuggestions(
+            getRequest("Jos")
+        );
         assertEquals(Collections.singletonList(author), result);
     }
 
@@ -146,7 +183,9 @@ void completeBeginningOfFirstNameReturnsNameWithVon() {
         database.insertEntry(entry);
         Author author = new Author("Eric", "E.", "von", "Hippel", "");
 
-        Collection<Author> result = autoCompleter.provideSuggestions(getRequest("Eric"));
+        Collection<Author> result = autoCompleter.provideSuggestions(
+            getRequest("Eric")
+        );
         assertEquals(Collections.singletonList(author), result);
     }
 
@@ -157,7 +196,9 @@ void completeBeginningOfLastNameReturnsNameWithUmlauts() {
         database.insertEntry(entry);
         Author author = new Author("Honig", "H.", "", "Bär", "");
 
-        Collection<Author> result = autoCompleter.provideSuggestions(getRequest("Bä"));
+        Collection<Author> result = autoCompleter.provideSuggestions(
+            getRequest("Bä")
+        );
         assertEquals(Collections.singletonList(author), result);
     }
 
@@ -168,7 +209,9 @@ void completeVonReturnsName() {
         database.insertEntry(entry);
         Author author = new Author("Eric", "E.", "von", "Hippel", "");
 
-        Collection<Author> result = autoCompleter.provideSuggestions(getRequest("von"));
+        Collection<Author> result = autoCompleter.provideSuggestions(
+            getRequest("von")
+        );
         assertEquals(Collections.singletonList(author), result);
     }
 
@@ -178,7 +221,9 @@ void completeBeginningOfFullNameReturnsName() {
         entry.setField(StandardField.AUTHOR, "Vassilis Kostakos");
         database.insertEntry(entry);
 
-        Collection<Author> result = autoCompleter.provideSuggestions(getRequest("Kostakos, Va"));
+        Collection<Author> result = autoCompleter.provideSuggestions(
+            getRequest("Kostakos, Va")
+        );
         assertEquals(Collections.singletonList(vassilisKostakos), result);
     }
 }
diff --git a/src/test/java/org/jabref/gui/autocompleter/SuggestionProvidersTest.java b/src/test/java/org/jabref/gui/autocompleter/SuggestionProvidersTest.java
index 247ee476fd8..5e49640445f 100644
--- a/src/test/java/org/jabref/gui/autocompleter/SuggestionProvidersTest.java
+++ b/src/test/java/org/jabref/gui/autocompleter/SuggestionProvidersTest.java
@@ -1,24 +1,22 @@
 package org.jabref.gui.autocompleter;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.mockito.Mockito.mock;
+
 import java.util.Set;
 import java.util.stream.Stream;
-
 import org.jabref.logic.journals.JournalAbbreviationRepository;
 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.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;
-
 class SuggestionProvidersTest {
 
     private SuggestionProviders suggestionProviders;
@@ -26,44 +24,74 @@ class SuggestionProvidersTest {
     @BeforeEach
     public 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(
+        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);
+                completeFields
+            );
+        this.suggestionProviders =
+            new SuggestionProviders(
+                database,
+                abbreviationRepository,
+                autoCompletePreferences
+            );
     }
 
     private static Stream<Arguments> getTestPairs() {
         return Stream.of(
-                // a person
-                Arguments.of(PersonNameSuggestionProvider.class, StandardField.AUTHOR),
-
-                // a single entry field
-                Arguments.of(BibEntrySuggestionProvider.class, StandardField.XREF),
-
-                // multi entry fieldg
-                Arguments.of(JournalsSuggestionProvider.class, StandardField.JOURNAL),
-
-                // TODO: We should offer pre-configured publishers
-                Arguments.of(JournalsSuggestionProvider.class, StandardField.PUBLISHER),
-
-                // TODO: Auto completion should be aware of possible values of special fields
-                Arguments.of(WordSuggestionProvider.class, SpecialField.PRINTED)
+            // a person
+            Arguments.of(
+                PersonNameSuggestionProvider.class,
+                StandardField.AUTHOR
+            ),
+            // a single entry field
+            Arguments.of(BibEntrySuggestionProvider.class, StandardField.XREF),
+            // multi entry fieldg
+            Arguments.of(
+                JournalsSuggestionProvider.class,
+                StandardField.JOURNAL
+            ),
+            // TODO: We should offer pre-configured publishers
+            Arguments.of(
+                JournalsSuggestionProvider.class,
+                StandardField.PUBLISHER
+            ),
+            // TODO: Auto completion should be aware of possible values of special fields
+            Arguments.of(WordSuggestionProvider.class, SpecialField.PRINTED)
         );
     }
 
     @ParameterizedTest
     @MethodSource("getTestPairs")
-    public void testAppropriateCompleterReturned(Class<SuggestionProvider<BibEntry>> expected, Field field) {
-        assertEquals(expected, suggestionProviders.getForField(field).getClass());
+    public void testAppropriateCompleterReturned(
+        Class<SuggestionProvider<BibEntry>> expected,
+        Field field
+    ) {
+        assertEquals(
+            expected,
+            suggestionProviders.getForField(field).getClass()
+        );
     }
 
     @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 a1ee0b8031e..a1b2b0c8ec8 100644
--- a/src/test/java/org/jabref/gui/autosaveandbackup/BackupManagerDiscardedTest.java
+++ b/src/test/java/org/jabref/gui/autosaveandbackup/BackupManagerDiscardedTest.java
@@ -1,11 +1,14 @@
 package org.jabref.gui.autosaveandbackup;
 
+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;
-
 import org.jabref.gui.LibraryTab;
 import org.jabref.logic.exporter.AtomicFileWriter;
 import org.jabref.logic.exporter.BibDatabaseWriter;
@@ -19,16 +22,11 @@
 import org.jabref.model.entry.field.StandardField;
 import org.jabref.model.metadata.SaveOrder;
 import org.jabref.preferences.PreferencesService;
-
 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;
-
 /**
  * Test for "discarded" flag
  */
@@ -53,39 +51,67 @@ public 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);
-        preferencesService = mock(PreferencesService.class, Answers.RETURNS_DEEP_STUBS);
+        saveConfiguration =
+            new SelfContainedSaveConfiguration(
+                SaveOrder.getDefaultSaveOrder(),
+                false,
+                BibDatabaseWriter.SaveType.WITH_JABREF_META_DATA,
+                false
+            );
+        preferencesService =
+            mock(PreferencesService.class, Answers.RETURNS_DEEP_STUBS);
 
         saveDatabase();
 
-        backupManager = new BackupManager(mock(LibraryTab.class), bibDatabaseContext, bibEntryTypesManager, preferencesService);
+        backupManager =
+            new BackupManager(
+                mock(LibraryTab.class),
+                bibDatabaseContext,
+                bibEntryTypesManager,
+                preferencesService
+            );
 
         makeBackup();
     }
 
     private void saveDatabase() throws IOException {
-        try (Writer writer = new AtomicFileWriter(testBib, StandardCharsets.UTF_8, false)) {
-            BibWriter bibWriter = new BibWriter(writer, bibDatabaseContext.getDatabase().getNewLineSeparator());
+        try (
+            Writer writer = new AtomicFileWriter(
+                testBib,
+                StandardCharsets.UTF_8,
+                false
+            )
+        ) {
+            BibWriter bibWriter = new BibWriter(
+                writer,
+                bibDatabaseContext.getDatabase().getNewLineSeparator()
+            );
             new BibtexDatabaseWriter(
-                    bibWriter,
-                    saveConfiguration,
-                    preferencesService.getFieldPreferences(),
-                    preferencesService.getCitationKeyPatternPreferences(),
-                    bibEntryTypesManager)
-                    .saveDatabase(bibDatabaseContext);
+                bibWriter,
+                saveConfiguration,
+                preferencesService.getFieldPreferences(),
+                preferencesService.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
-    public void noDiscardingAChangeLeadsToNewerBackupBeReported() throws Exception {
+    public void noDiscardingAChangeLeadsToNewerBackupBeReported()
+        throws Exception {
         databaseModification();
         makeBackup();
         assertTrue(BackupManager.backupFileDiffers(testBib, backupDir));
@@ -100,7 +126,8 @@ public void noDiscardingASavedChange() throws Exception {
     }
 
     @Test
-    public void discardingAChangeLeadsToNewerBackupToBeIgnored() throws Exception {
+    public void discardingAChangeLeadsToNewerBackupToBeIgnored()
+        throws Exception {
         databaseModification();
         makeBackup();
         backupManager.discardBackup(backupDir);
diff --git a/src/test/java/org/jabref/gui/autosaveandbackup/BackupManagerTest.java b/src/test/java/org/jabref/gui/autosaveandbackup/BackupManagerTest.java
index c1a0caf267d..970e9a28916 100644
--- a/src/test/java/org/jabref/gui/autosaveandbackup/BackupManagerTest.java
+++ b/src/test/java/org/jabref/gui/autosaveandbackup/BackupManagerTest.java
@@ -1,5 +1,12 @@
 package org.jabref.gui.autosaveandbackup;
 
+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;
@@ -7,7 +14,6 @@
 import java.util.Collections;
 import java.util.List;
 import java.util.Optional;
-
 import org.jabref.gui.LibraryTab;
 import org.jabref.logic.util.BackupFileType;
 import org.jabref.logic.util.OS;
@@ -20,19 +26,11 @@
 import org.jabref.model.metadata.event.MetaDataChangedEvent;
 import org.jabref.preferences.FilePreferences;
 import org.jabref.preferences.PreferencesService;
-
 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;
-
 public class BackupManagerTest {
 
     Path backupDir;
@@ -46,7 +44,10 @@ void setup(@TempDir Path tempDir) {
     public void backupFileNameIsCorrectlyGeneratedInAppDataDirectory() {
         Path bibPath = Path.of("tmp", "test.bib");
         backupDir = OS.getNativeDesktop().getBackupDirectory();
-        Path bakPath = BackupManager.getBackupPathForNewBackup(bibPath, backupDir);
+        Path bakPath = BackupManager.getBackupPathForNewBackup(
+            bibPath,
+            backupDir
+        );
 
         // Pattern is "27182d3c--test.bib--", but the hashing is implemented differently on Linux than on Windows
         assertNotEquals("", bakPath);
@@ -54,50 +55,93 @@ public void backupFileNameIsCorrectlyGeneratedInAppDataDirectory() {
 
     @Test
     public void backupFileIsEqualForNonExistingBackup() throws Exception {
-        Path originalFile = Path.of(BackupManagerTest.class.getResource("no-autosave.bib").toURI());
+        Path originalFile = Path.of(
+            BackupManagerTest.class.getResource("no-autosave.bib").toURI()
+        );
         assertFalse(BackupManager.backupFileDiffers(originalFile, backupDir));
     }
 
     @Test
     public 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 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
+        );
         Files.copy(source, target, StandardCopyOption.REPLACE_EXISTING);
 
-        Path originalFile = Path.of(BackupManagerTest.class.getResource("no-changes.bib").toURI());
+        Path originalFile = Path.of(
+            BackupManagerTest.class.getResource("no-changes.bib").toURI()
+        );
         assertFalse(BackupManager.backupFileDiffers(originalFile, backupDir));
     }
 
     @Test
     public 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 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
+        );
         Files.copy(source, target, StandardCopyOption.REPLACE_EXISTING);
 
-        Path originalFile = Path.of(BackupManagerTest.class.getResource("changes.bib").toURI());
+        Path originalFile = Path.of(
+            BackupManagerTest.class.getResource("changes.bib").toURI()
+        );
         assertTrue(BackupManager.backupFileDiffers(originalFile, backupDir));
     }
 
     @Test
-    public 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());
+    public 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()
+        );
 
         // Prepare test: Create backup files on "right" path
         // most recent file does not have any changes
-        Path target = BackupFileUtil.getPathForNewBackupFileAndCreateDirectory(noChangesBib, BackupFileType.BACKUP, backupDir);
-        Files.copy(noChangesBibBak, target, StandardCopyOption.REPLACE_EXISTING);
+        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);
+            Files.copy(
+                changesBibBak,
+                target,
+                StandardCopyOption.REPLACE_EXISTING
+            );
         }
 
         Path originalFile = noChangesBib;
@@ -106,10 +150,18 @@ public void correctBackupFileDeterminedForMultipleBakFiles() throws Exception {
 
     @Test
     public 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 target = BackupFileUtil.getPathForNewBackupFileAndCreateDirectory(changesBib, BackupFileType.BACKUP, backupDir);
+        Path changesBib = Path.of(
+            BackupManagerTest.class.getResource("changes.bib").toURI()
+        );
+        Path changesBibBak = Path.of(
+            BackupManagerTest.class.getResource("changes.bib.bak").toURI()
+        );
+
+        Path target = BackupFileUtil.getPathForNewBackupFileAndCreateDirectory(
+            changesBib,
+            BackupFileType.BACKUP,
+            backupDir
+        );
         Files.copy(changesBibBak, target, StandardCopyOption.REPLACE_EXISTING);
 
         assertTrue(BackupManager.backupFileDiffers(changesBib, backupDir));
@@ -117,10 +169,18 @@ public void bakFileWithNewerTimeStampLeadsToDiff() throws Exception {
 
     @Test
     public 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 target = BackupFileUtil.getPathForNewBackupFileAndCreateDirectory(changesBib, BackupFileType.BACKUP, backupDir);
+        Path changesBib = Path.of(
+            BackupManagerTest.class.getResource("changes.bib").toURI()
+        );
+        Path changesBibBak = Path.of(
+            BackupManagerTest.class.getResource("changes.bib.bak").toURI()
+        );
+
+        Path target = BackupFileUtil.getPathForNewBackupFileAndCreateDirectory(
+            changesBib,
+            BackupFileType.BACKUP,
+            backupDir
+        );
         Files.copy(changesBibBak, target, StandardCopyOption.REPLACE_EXISTING);
 
         // Make .bak file very old
@@ -130,23 +190,28 @@ public void bakFileWithOlderTimeStampDoesNotLeadToDiff() throws Exception {
     }
 
     @Test
-    public void shouldNotCreateABackup(@TempDir Path customDir) throws Exception {
+    public void shouldNotCreateABackup(@TempDir Path customDir)
+        throws Exception {
         Path backupDir = customDir.resolve("subBackupDir");
         Files.createDirectories(backupDir);
 
         var database = new BibDatabaseContext(new BibDatabase());
         database.setDatabasePath(customDir.resolve("Bibfile.bib"));
 
-        var preferences = mock(PreferencesService.class, Answers.RETURNS_DEEP_STUBS);
+        var preferences = mock(
+            PreferencesService.class,
+            Answers.RETURNS_DEEP_STUBS
+        );
         var filePreferences = mock(FilePreferences.class);
         when(preferences.getFilePreferences()).thenReturn(filePreferences);
         when(filePreferences.getBackupDirectory()).thenReturn(backupDir);
 
         BackupManager manager = BackupManager.start(
-                mock(LibraryTab.class),
-                database,
-                mock(BibEntryTypesManager.class, Answers.RETURNS_DEEP_STUBS),
-                preferences);
+            mock(LibraryTab.class),
+            database,
+            mock(BibEntryTypesManager.class, Answers.RETURNS_DEEP_STUBS),
+            preferences
+        );
         manager.listen(new MetaDataChangedEvent(new MetaData()));
 
         BackupManager.shutdown(database, backupDir, false);
@@ -163,20 +228,26 @@ public void shouldCreateABackup(@TempDir Path customDir) throws Exception {
         var database = new BibDatabaseContext(new BibDatabase());
         database.setDatabasePath(customDir.resolve("Bibfile.bib"));
 
-        var preferences = mock(PreferencesService.class, Answers.RETURNS_DEEP_STUBS);
+        var preferences = mock(
+            PreferencesService.class,
+            Answers.RETURNS_DEEP_STUBS
+        );
         var filePreferences = mock(FilePreferences.class);
         when(preferences.getFilePreferences()).thenReturn(filePreferences);
         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);
+            mock(LibraryTab.class),
+            database,
+            mock(BibEntryTypesManager.class, Answers.RETURNS_DEEP_STUBS),
+            preferences
+        );
         manager.listen(new MetaDataChangedEvent(new MetaData()));
 
-        Optional<Path> fullBackupPath = manager.determineBackupPathForNewBackup(backupDir);
+        Optional<Path> fullBackupPath = manager.determineBackupPathForNewBackup(
+            backupDir
+        );
         fullBackupPath.ifPresent(manager::performBackup);
         manager.listen(new GroupUpdatedEvent(new MetaData()));
 
diff --git a/src/test/java/org/jabref/gui/commonfxcontrols/SaveOrderPanelViewModelTest.java b/src/test/java/org/jabref/gui/commonfxcontrols/SaveOrderPanelViewModelTest.java
index 0bc69329a33..59cb20238b8 100644
--- a/src/test/java/org/jabref/gui/commonfxcontrols/SaveOrderPanelViewModelTest.java
+++ b/src/test/java/org/jabref/gui/commonfxcontrols/SaveOrderPanelViewModelTest.java
@@ -1,27 +1,39 @@
 package org.jabref.gui.commonfxcontrols;
 
-import java.util.List;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
+import java.util.List;
 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;
-
 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 +44,59 @@ 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 91fcd8492d0..a521151db03 100644
--- a/src/test/java/org/jabref/gui/documentviewer/PdfDocumentViewModelTest.java
+++ b/src/test/java/org/jabref/gui/documentviewer/PdfDocumentViewModelTest.java
@@ -1,28 +1,29 @@
 package org.jabref.gui.documentviewer;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
 import java.io.IOException;
 import java.nio.file.Path;
-
 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;
-
 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 d5fe209a3a0..2adf207a919 100644
--- a/src/test/java/org/jabref/gui/edit/CopyMoreActionTest.java
+++ b/src/test/java/org/jabref/gui/edit/CopyMoreActionTest.java
@@ -1,12 +1,17 @@
 package org.jabref.gui.edit;
 
+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;
-
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableList;
-
 import org.jabref.gui.ClipBoardManager;
 import org.jabref.gui.DialogService;
 import org.jabref.gui.JabRefDialogService;
@@ -20,23 +25,21 @@
 import org.jabref.model.entry.field.StandardField;
 import org.jabref.model.entry.types.StandardEntryType;
 import org.jabref.preferences.PreferencesService;
-
 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;
-
 public class CopyMoreActionTest {
 
     private final DialogService dialogService = spy(DialogService.class);
-    private final ClipBoardManager clipBoardManager = mock(ClipBoardManager.class);
-    private final PreferencesService preferencesService = mock(PreferencesService.class);
-    private final JournalAbbreviationRepository abbreviationRepository = mock(JournalAbbreviationRepository.class);
+    private final ClipBoardManager clipBoardManager = mock(
+        ClipBoardManager.class
+    );
+    private final PreferencesService preferencesService = mock(
+        PreferencesService.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<>();
@@ -48,12 +51,19 @@ public class CopyMoreActionTest {
     @BeforeEach
     public 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")
+        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")
+                .withField(
+                    StandardField.SUBTITLE,
+                    "cognitive biases and software development"
+                )
                 .withCitationKey("abc");
         titles.add(title);
         keys.add("abc");
@@ -63,8 +73,17 @@ public void setUp() {
     @Test
     public void testExecuteOnFail() {
         when(stateManager.getActiveDatabase()).thenReturn(Optional.empty());
-        when(stateManager.getSelectedEntries()).thenReturn(FXCollections.emptyObservableList());
-        copyMoreAction = new CopyMoreAction(StandardActions.COPY_TITLE, dialogService, stateManager, clipBoardManager, preferencesService, abbreviationRepository);
+        when(stateManager.getSelectedEntries())
+            .thenReturn(FXCollections.emptyObservableList());
+        copyMoreAction =
+            new CopyMoreAction(
+                StandardActions.COPY_TITLE,
+                dialogService,
+                stateManager,
+                clipBoardManager,
+                preferencesService,
+                abbreviationRepository
+            );
         copyMoreAction.execute();
 
         verify(clipBoardManager, times(0)).setContent(any(String.class));
@@ -75,149 +94,301 @@ public void testExecuteOnFail() {
     public void testExecuteCopyTitleWithNoTitle() {
         BibEntry entryWithNoTitle = (BibEntry) entry.clone();
         entryWithNoTitle.clearField(StandardField.TITLE);
-        ObservableList<BibEntry> entriesWithNoTitles = FXCollections.observableArrayList(entryWithNoTitle);
-        BibDatabaseContext databaseContext = new BibDatabaseContext(new BibDatabase(entriesWithNoTitles));
-
-        when(stateManager.getActiveDatabase()).thenReturn(Optional.ofNullable(databaseContext));
+        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, preferencesService, abbreviationRepository);
+        copyMoreAction =
+            new CopyMoreAction(
+                StandardActions.COPY_TITLE,
+                dialogService,
+                stateManager,
+                clipBoardManager,
+                preferencesService,
+                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
     public void testExecuteCopyTitleOnPartialSuccess() {
         BibEntry entryWithNoTitle = (BibEntry) entry.clone();
         entryWithNoTitle.clearField(StandardField.TITLE);
-        ObservableList<BibEntry> mixedEntries = FXCollections.observableArrayList(entryWithNoTitle, entry);
-        BibDatabaseContext databaseContext = new BibDatabaseContext(new BibDatabase(mixedEntries));
-
-        when(stateManager.getActiveDatabase()).thenReturn(Optional.ofNullable(databaseContext));
+        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, preferencesService, abbreviationRepository);
+        copyMoreAction =
+            new CopyMoreAction(
+                StandardActions.COPY_TITLE,
+                dialogService,
+                stateManager,
+                clipBoardManager,
+                preferencesService,
+                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
     public void testExecuteCopyTitleOnSuccess() {
-        ObservableList<BibEntry> entriesWithTitles = FXCollections.observableArrayList(entry);
-        BibDatabaseContext databaseContext = new BibDatabaseContext(new BibDatabase(entriesWithTitles));
-
-        when(stateManager.getActiveDatabase()).thenReturn(Optional.ofNullable(databaseContext));
+        ObservableList<BibEntry> entriesWithTitles =
+            FXCollections.observableArrayList(entry);
+        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, preferencesService, abbreviationRepository);
+        copyMoreAction =
+            new CopyMoreAction(
+                StandardActions.COPY_TITLE,
+                dialogService,
+                stateManager,
+                clipBoardManager,
+                preferencesService,
+                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
     public void testExecuteCopyKeyWithNoKey() {
         BibEntry entryWithNoKey = (BibEntry) entry.clone();
         entryWithNoKey.clearCiteKey();
-        ObservableList<BibEntry> entriesWithNoKeys = FXCollections.observableArrayList(entryWithNoKey);
-        BibDatabaseContext databaseContext = new BibDatabaseContext(new BibDatabase(entriesWithNoKeys));
-
-        when(stateManager.getActiveDatabase()).thenReturn(Optional.ofNullable(databaseContext));
+        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, preferencesService, abbreviationRepository);
+        copyMoreAction =
+            new CopyMoreAction(
+                StandardActions.COPY_KEY,
+                dialogService,
+                stateManager,
+                clipBoardManager,
+                preferencesService,
+                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
     public void testExecuteCopyKeyOnPartialSuccess() {
         BibEntry entryWithNoKey = (BibEntry) entry.clone();
         entryWithNoKey.clearCiteKey();
-        ObservableList<BibEntry> mixedEntries = FXCollections.observableArrayList(entryWithNoKey, entry);
-        BibDatabaseContext databaseContext = new BibDatabaseContext(new BibDatabase(mixedEntries));
-
-        when(stateManager.getActiveDatabase()).thenReturn(Optional.ofNullable(databaseContext));
+        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, preferencesService, abbreviationRepository);
+        copyMoreAction =
+            new CopyMoreAction(
+                StandardActions.COPY_KEY,
+                dialogService,
+                stateManager,
+                clipBoardManager,
+                preferencesService,
+                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
     public void testExecuteCopyKeyOnSuccess() {
-        ObservableList<BibEntry> entriesWithKeys = FXCollections.observableArrayList(entry);
-        BibDatabaseContext databaseContext = new BibDatabaseContext(new BibDatabase(entriesWithKeys));
-
-        when(stateManager.getActiveDatabase()).thenReturn(Optional.ofNullable(databaseContext));
+        ObservableList<BibEntry> entriesWithKeys =
+            FXCollections.observableArrayList(entry);
+        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, preferencesService, abbreviationRepository);
+        copyMoreAction =
+            new CopyMoreAction(
+                StandardActions.COPY_KEY,
+                dialogService,
+                stateManager,
+                clipBoardManager,
+                preferencesService,
+                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
     public void testExecuteCopyDoiWithNoDoi() {
         BibEntry entryWithNoDoi = (BibEntry) entry.clone();
         entryWithNoDoi.clearField(StandardField.DOI);
-        ObservableList<BibEntry> entriesWithNoDois = FXCollections.observableArrayList(entryWithNoDoi);
-        BibDatabaseContext databaseContext = new BibDatabaseContext(new BibDatabase(entriesWithNoDois));
-
-        when(stateManager.getActiveDatabase()).thenReturn(Optional.ofNullable(databaseContext));
+        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, preferencesService, abbreviationRepository);
+        copyMoreAction =
+            new CopyMoreAction(
+                StandardActions.COPY_DOI,
+                dialogService,
+                stateManager,
+                clipBoardManager,
+                preferencesService,
+                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
     public void testExecuteCopyDoiOnPartialSuccess() {
         BibEntry entryWithNoDoi = (BibEntry) entry.clone();
         entryWithNoDoi.clearField(StandardField.DOI);
-        ObservableList<BibEntry> mixedEntries = FXCollections.observableArrayList(entryWithNoDoi, entry);
-        BibDatabaseContext databaseContext = new BibDatabaseContext(new BibDatabase(mixedEntries));
-
-        when(stateManager.getActiveDatabase()).thenReturn(Optional.ofNullable(databaseContext));
+        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, preferencesService, abbreviationRepository);
+        copyMoreAction =
+            new CopyMoreAction(
+                StandardActions.COPY_DOI,
+                dialogService,
+                stateManager,
+                clipBoardManager,
+                preferencesService,
+                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
     public void testExecuteCopyDoiOnSuccess() {
-        ObservableList<BibEntry> entriesWithDois = FXCollections.observableArrayList(entry);
-        BibDatabaseContext databaseContext = new BibDatabaseContext(new BibDatabase(entriesWithDois));
-
-        when(stateManager.getActiveDatabase()).thenReturn(Optional.ofNullable(databaseContext));
+        ObservableList<BibEntry> entriesWithDois =
+            FXCollections.observableArrayList(entry);
+        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, preferencesService, abbreviationRepository);
+        copyMoreAction =
+            new CopyMoreAction(
+                StandardActions.COPY_DOI,
+                dialogService,
+                stateManager,
+                clipBoardManager,
+                preferencesService,
+                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 75a1a176597..c3f931e3777 100644
--- a/src/test/java/org/jabref/gui/edit/CopyOrMoveFieldContentTabViewModelTest.java
+++ b/src/test/java/org/jabref/gui/edit/CopyOrMoveFieldContentTabViewModelTest.java
@@ -1,21 +1,20 @@
 package org.jabref.gui.edit;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.mockito.Mockito.mock;
+
 import java.util.List;
 import java.util.Optional;
-
 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;
-
 public class CopyOrMoveFieldContentTabViewModelTest {
+
     CopyOrMoveFieldContentTabViewModel copyOrMoveFieldContentTabViewModel;
     BibEntry entryA;
     BibEntry entryB;
@@ -26,35 +25,63 @@ public class CopyOrMoveFieldContentTabViewModelTest {
 
     @BeforeEach
     void setup() {
-        entryA = new BibEntry(BibEntry.DEFAULT_TYPE)
+        entryA =
+            new BibEntry(BibEntry.DEFAULT_TYPE)
                 .withField(StandardField.YEAR, "2015")
                 .withField(StandardField.DATE, "2014");
 
-        entryB = new BibEntry(BibEntry.DEFAULT_TYPE)
+        entryB =
+            new BibEntry(BibEntry.DEFAULT_TYPE)
                 .withField(StandardField.DATE, "1998");
         bibDatabase = new BibDatabase();
-        copyOrMoveFieldContentTabViewModel = newTwoFieldsViewModel(entryA, entryB);
+        copyOrMoveFieldContentTabViewModel =
+            newTwoFieldsViewModel(entryA, entryB);
     }
 
     @Test
     void copyValueDoesNotCopyBlankValues() {
-        CopyOrMoveFieldContentTabViewModel copyOrMoveFieldContentTabViewModel = newTwoFieldsViewModel(entryA, entryB);
-
-        copyOrMoveFieldContentTabViewModel.fromFieldProperty().set(StandardField.YEAR);
-        copyOrMoveFieldContentTabViewModel.toFieldProperty().set(StandardField.DATE);
-        copyOrMoveFieldContentTabViewModel.overwriteFieldContentProperty().set(true);
+        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
     void swapValuesShouldNotSwapFieldValuesIfOneOfTheValuesIsBlank() {
-        copyOrMoveFieldContentTabViewModel.fromFieldProperty().set(StandardField.YEAR);
-        copyOrMoveFieldContentTabViewModel.toFieldProperty().set(StandardField.DATE);
-        copyOrMoveFieldContentTabViewModel.overwriteFieldContentProperty().set(true);
+        copyOrMoveFieldContentTabViewModel
+            .fromFieldProperty()
+            .set(StandardField.YEAR);
+        copyOrMoveFieldContentTabViewModel
+            .toFieldProperty()
+            .set(StandardField.DATE);
+        copyOrMoveFieldContentTabViewModel
+            .overwriteFieldContentProperty()
+            .set(true);
 
         copyOrMoveFieldContentTabViewModel.swapValues();
 
@@ -64,22 +91,39 @@ void swapValuesShouldNotSwapFieldValuesIfOneOfTheValuesIsBlank() {
 
     @Test
     void swapValuesShouldSwapFieldValuesIfBothValuesAreNotBlank() {
-        copyOrMoveFieldContentTabViewModel.fromFieldProperty().set(StandardField.YEAR);
-        copyOrMoveFieldContentTabViewModel.toFieldProperty().set(StandardField.DATE);
-        copyOrMoveFieldContentTabViewModel.overwriteFieldContentProperty().set(true);
+        copyOrMoveFieldContentTabViewModel
+            .fromFieldProperty()
+            .set(StandardField.YEAR);
+        copyOrMoveFieldContentTabViewModel
+            .toFieldProperty()
+            .set(StandardField.DATE);
+        copyOrMoveFieldContentTabViewModel
+            .overwriteFieldContentProperty()
+            .set(true);
 
         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
     void moveValueShouldNotMoveValueIfToFieldIsNotBlankAndOverwriteIsNotEnabled() {
-        copyOrMoveFieldContentTabViewModel.fromFieldProperty().set(StandardField.YEAR);
-        copyOrMoveFieldContentTabViewModel.toFieldProperty().set(StandardField.DATE);
-        copyOrMoveFieldContentTabViewModel.overwriteFieldContentProperty().set(false);
+        copyOrMoveFieldContentTabViewModel
+            .fromFieldProperty()
+            .set(StandardField.YEAR);
+        copyOrMoveFieldContentTabViewModel
+            .toFieldProperty()
+            .set(StandardField.DATE);
+        copyOrMoveFieldContentTabViewModel
+            .overwriteFieldContentProperty()
+            .set(false);
 
         copyOrMoveFieldContentTabViewModel.moveValue();
 
@@ -89,9 +133,15 @@ void moveValueShouldNotMoveValueIfToFieldIsNotBlankAndOverwriteIsNotEnabled() {
 
     @Test
     void moveValueShouldMoveValueIfOverwriteIsEnabled() {
-        copyOrMoveFieldContentTabViewModel.fromFieldProperty().set(StandardField.DATE);
-        copyOrMoveFieldContentTabViewModel.toFieldProperty().set(StandardField.YEAR);
-        copyOrMoveFieldContentTabViewModel.overwriteFieldContentProperty().set(true);
+        copyOrMoveFieldContentTabViewModel
+            .fromFieldProperty()
+            .set(StandardField.DATE);
+        copyOrMoveFieldContentTabViewModel
+            .toFieldProperty()
+            .set(StandardField.YEAR);
+        copyOrMoveFieldContentTabViewModel
+            .overwriteFieldContentProperty()
+            .set(true);
 
         copyOrMoveFieldContentTabViewModel.moveValue();
 
@@ -99,7 +149,13 @@ void moveValueShouldMoveValueIfOverwriteIsEnabled() {
         assertEquals(Optional.empty(), entryB.getField(StandardField.DATE));
     }
 
-    private CopyOrMoveFieldContentTabViewModel newTwoFieldsViewModel(BibEntry... selectedEntries) {
-        return new CopyOrMoveFieldContentTabViewModel(List.of(selectedEntries), bibDatabase, stateManager);
+    private CopyOrMoveFieldContentTabViewModel newTwoFieldsViewModel(
+        BibEntry... selectedEntries
+    ) {
+        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 1221580762a..c0f7a7d7b63 100644
--- a/src/test/java/org/jabref/gui/edit/EditFieldContentTabViewModelTest.java
+++ b/src/test/java/org/jabref/gui/edit/EditFieldContentTabViewModelTest.java
@@ -1,22 +1,21 @@
 package org.jabref.gui.edit;
 
+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;
-
 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;
-
 public class EditFieldContentTabViewModelTest {
+
     EditFieldContentViewModel editFieldContentViewModel;
     BibEntry entryA;
     BibEntry entryB;
@@ -27,21 +26,30 @@ public class EditFieldContentTabViewModelTest {
 
     @BeforeEach
     void setup() {
-        entryA = new BibEntry(BibEntry.DEFAULT_TYPE)
+        entryA =
+            new BibEntry(BibEntry.DEFAULT_TYPE)
                 .withField(StandardField.YEAR, "2015")
                 .withField(StandardField.DATE, "2014");
 
-        entryB = new BibEntry(BibEntry.DEFAULT_TYPE)
+        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
     void clearSelectedFieldShouldClearFieldContentEvenWhenOverwriteFieldContentIsNotEnabled() {
-        editFieldContentViewModel.selectedFieldProperty().set(StandardField.YEAR);
+        editFieldContentViewModel
+            .selectedFieldProperty()
+            .set(StandardField.YEAR);
         editFieldContentViewModel.overwriteFieldContentProperty().set(false);
         editFieldContentViewModel.clearSelectedField();
 
@@ -50,7 +58,9 @@ void clearSelectedFieldShouldClearFieldContentEvenWhenOverwriteFieldContentIsNot
 
     @Test
     void clearSelectedFieldShouldDoNothingWhenFieldDoesntExistOrIsEmpty() {
-        editFieldContentViewModel.selectedFieldProperty().set(StandardField.FILE);
+        editFieldContentViewModel
+            .selectedFieldProperty()
+            .set(StandardField.FILE);
         editFieldContentViewModel.clearSelectedField();
 
         assertEquals(Optional.empty(), entryA.getField(StandardField.FILE));
@@ -59,7 +69,9 @@ void clearSelectedFieldShouldDoNothingWhenFieldDoesntExistOrIsEmpty() {
     @Test
     void setFieldValueShouldNotDoAnythingIfOverwriteFieldContentIsNotEnabled() {
         editFieldContentViewModel.overwriteFieldContentProperty().set(false);
-        editFieldContentViewModel.selectedFieldProperty().set(StandardField.YEAR);
+        editFieldContentViewModel
+            .selectedFieldProperty()
+            .set(StandardField.YEAR);
         editFieldContentViewModel.fieldValueProperty().set("2001");
         editFieldContentViewModel.setFieldValue();
 
@@ -69,7 +81,9 @@ void setFieldValueShouldNotDoAnythingIfOverwriteFieldContentIsNotEnabled() {
     @Test
     void setFieldValueShouldSetFieldValueIfOverwriteFieldContentIsEnabled() {
         editFieldContentViewModel.overwriteFieldContentProperty().set(true);
-        editFieldContentViewModel.selectedFieldProperty().set(StandardField.YEAR);
+        editFieldContentViewModel
+            .selectedFieldProperty()
+            .set(StandardField.YEAR);
         editFieldContentViewModel.fieldValueProperty().set("2001");
         editFieldContentViewModel.setFieldValue();
 
@@ -79,7 +93,9 @@ void setFieldValueShouldSetFieldValueIfOverwriteFieldContentIsEnabled() {
     @Test
     void setFieldValueShouldSetFieldValueIfFieldContentIsEmpty() {
         editFieldContentViewModel.overwriteFieldContentProperty().set(false);
-        editFieldContentViewModel.selectedFieldProperty().set(StandardField.YEAR);
+        editFieldContentViewModel
+            .selectedFieldProperty()
+            .set(StandardField.YEAR);
         editFieldContentViewModel.fieldValueProperty().set("2001");
         editFieldContentViewModel.setFieldValue();
 
@@ -89,7 +105,9 @@ void setFieldValueShouldSetFieldValueIfFieldContentIsEmpty() {
     @Test
     void appendToFieldValueShouldDoNothingIfOverwriteFieldContentIsNotEnabled() {
         editFieldContentViewModel.overwriteFieldContentProperty().set(false);
-        editFieldContentViewModel.selectedFieldProperty().set(StandardField.YEAR);
+        editFieldContentViewModel
+            .selectedFieldProperty()
+            .set(StandardField.YEAR);
         editFieldContentViewModel.fieldValueProperty().set("0");
         editFieldContentViewModel.appendToFieldValue();
 
@@ -99,7 +117,9 @@ void appendToFieldValueShouldDoNothingIfOverwriteFieldContentIsNotEnabled() {
     @Test
     void appendToFieldValueShouldAppendFieldValueIfOverwriteFieldContentIsEnabled() {
         editFieldContentViewModel.overwriteFieldContentProperty().set(true);
-        editFieldContentViewModel.selectedFieldProperty().set(StandardField.YEAR);
+        editFieldContentViewModel
+            .selectedFieldProperty()
+            .set(StandardField.YEAR);
         editFieldContentViewModel.fieldValueProperty().set("0");
         editFieldContentViewModel.appendToFieldValue();
 
diff --git a/src/test/java/org/jabref/gui/edit/ManageKeywordsViewModelTest.java b/src/test/java/org/jabref/gui/edit/ManageKeywordsViewModelTest.java
index 39e9ffab57b..2b65c61990c 100644
--- a/src/test/java/org/jabref/gui/edit/ManageKeywordsViewModelTest.java
+++ b/src/test/java/org/jabref/gui/edit/ManageKeywordsViewModelTest.java
@@ -1,82 +1,139 @@
 package org.jabref.gui.edit;
 
+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;
-
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableList;
-
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.field.StandardField;
 import org.jabref.model.entry.types.StandardEntryType;
 import org.jabref.preferences.BibEntryPreferences;
-
 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;
-
 public class ManageKeywordsViewModelTest {
 
-    private final BibEntryPreferences bibEntryPreferences = mock(BibEntryPreferences.class);
+    private final BibEntryPreferences bibEntryPreferences = mock(
+        BibEntryPreferences.class
+    );
     private ManageKeywordsViewModel keywordsViewModel;
 
     @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");
+            .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");
+            .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);
 
         when(bibEntryPreferences.getKeywordSeparator()).thenReturn(',');
 
-        keywordsViewModel = new ManageKeywordsViewModel(bibEntryPreferences, entries);
+        keywordsViewModel =
+            new ManageKeywordsViewModel(bibEntryPreferences, entries);
     }
 
     @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");
-
-        assertEquals(FXCollections.observableList(expectedKeywordsList), addedKeywords);
+        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
+        );
     }
 
     @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");
+        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"
+        );
 
         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 bf5a246e97f..ae2eac63ac9 100644
--- a/src/test/java/org/jabref/gui/edit/RenameFieldViewModelTest.java
+++ b/src/test/java/org/jabref/gui/edit/RenameFieldViewModelTest.java
@@ -1,8 +1,10 @@
 package org.jabref.gui.edit;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.mockito.Mockito.mock;
+
 import java.util.List;
 import java.util.Optional;
-
 import org.jabref.gui.StateManager;
 import org.jabref.gui.edit.automaticfiededitor.renamefield.RenameFieldViewModel;
 import org.jabref.model.database.BibDatabase;
@@ -11,14 +13,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;
-
 public class RenameFieldViewModelTest {
+
     RenameFieldViewModel renameFieldViewModel;
     BibEntry entryA;
     BibEntry entryB;
@@ -29,18 +28,25 @@ public class RenameFieldViewModelTest {
 
     @BeforeEach
     void setup() {
-        entryA = new BibEntry(BibEntry.DEFAULT_TYPE)
+        entryA =
+            new BibEntry(BibEntry.DEFAULT_TYPE)
                 .withField(StandardField.YEAR, "2015")
                 .withField(StandardField.DATE, "2014")
                 .withField(StandardField.AUTHOR, "Doe");
 
-        entryB = new BibEntry(BibEntry.DEFAULT_TYPE)
+        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
@@ -49,10 +55,16 @@ void renameFieldShouldRenameFieldIfItExist() {
         renameFieldViewModel.setNewFieldName("ETAD");
         renameFieldViewModel.renameField();
 
-        assertEquals(Optional.of("2014"), entryA.getField(FieldFactory.parseField("ETAD")));
+        assertEquals(
+            Optional.of("2014"),
+            entryA.getField(FieldFactory.parseField("ETAD"))
+        );
         assertEquals(Optional.empty(), entryA.getField(StandardField.DATE));
 
-        assertEquals(Optional.of("1998"), entryB.getField(FieldFactory.parseField("ETAD")));
+        assertEquals(
+            Optional.of("1998"),
+            entryB.getField(FieldFactory.parseField("ETAD"))
+        );
         assertEquals(Optional.empty(), entryB.getField(StandardField.DATE));
     }
 
@@ -64,10 +76,16 @@ void renameFieldShouldDoNothingIfFieldDoNotExist() {
         renameFieldViewModel.renameField();
 
         assertEquals(Optional.empty(), entryA.getField(toRenameField));
-        assertEquals(Optional.empty(), entryA.getField(new UnknownField("new_field_name")));
+        assertEquals(
+            Optional.empty(),
+            entryA.getField(new UnknownField("new_field_name"))
+        );
 
         assertEquals(Optional.empty(), entryB.getField(toRenameField));
-        assertEquals(Optional.empty(), entryB.getField(new UnknownField("new_field_name")));
+        assertEquals(
+            Optional.empty(),
+            entryB.getField(new UnknownField("new_field_name"))
+        );
     }
 
     @Test
@@ -77,10 +95,19 @@ void renameFieldShouldNotDoAnythingIfTheNewFieldNameIsEmpty() {
         renameFieldViewModel.renameField();
 
         assertEquals(Optional.of("Doe"), entryA.getField(StandardField.AUTHOR));
-        assertEquals(Optional.empty(), entryA.getField(FieldFactory.parseField("")));
-
-        assertEquals(Optional.of("Eddie"), entryB.getField(StandardField.AUTHOR));
-        assertEquals(Optional.empty(), entryB.getField(FieldFactory.parseField("")));
+        assertEquals(
+            Optional.empty(),
+            entryA.getField(FieldFactory.parseField(""))
+        );
+
+        assertEquals(
+            Optional.of("Eddie"),
+            entryB.getField(StandardField.AUTHOR)
+        );
+        assertEquals(
+            Optional.empty(),
+            entryB.getField(FieldFactory.parseField(""))
+        );
     }
 
     @Test
@@ -90,10 +117,19 @@ void renameFieldShouldNotDoAnythingIfTheNewFieldNameHasWhitespaceCharacters() {
         renameFieldViewModel.renameField();
 
         assertEquals(Optional.of("Doe"), entryA.getField(StandardField.AUTHOR));
-        assertEquals(Optional.empty(), entryA.getField(FieldFactory.parseField("Hello, World")));
-
-        assertEquals(Optional.of("Eddie"), entryB.getField(StandardField.AUTHOR));
-        assertEquals(Optional.empty(), entryB.getField(FieldFactory.parseField("Hello, World")));
+        assertEquals(
+            Optional.empty(),
+            entryA.getField(FieldFactory.parseField("Hello, World"))
+        );
+
+        assertEquals(
+            Optional.of("Eddie"),
+            entryB.getField(StandardField.AUTHOR)
+        );
+        assertEquals(
+            Optional.empty(),
+            entryB.getField(FieldFactory.parseField("Hello, World"))
+        );
     }
 
     @Test
diff --git a/src/test/java/org/jabref/gui/edit/ReplaceStringViewModelTest.java b/src/test/java/org/jabref/gui/edit/ReplaceStringViewModelTest.java
index 758e3a8241b..52dff6da386 100644
--- a/src/test/java/org/jabref/gui/edit/ReplaceStringViewModelTest.java
+++ b/src/test/java/org/jabref/gui/edit/ReplaceStringViewModelTest.java
@@ -1,25 +1,22 @@
 package org.jabref.gui.edit;
 
+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;
-
 import javafx.beans.property.SimpleBooleanProperty;
 import javafx.beans.property.SimpleStringProperty;
-
 import org.jabref.gui.LibraryTab;
 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.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;
-
 public class ReplaceStringViewModelTest {
 
     private final LibraryTab libraryTab = mock(LibraryTab.class);
@@ -28,19 +25,34 @@ public 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)");
+            .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,31 +61,49 @@ void setUp() {
         viewModel = new ReplaceStringViewModel(libraryTab);
     }
 
-    @ParameterizedTest(name = "findString={0}, replaceString={1}, fieldString={2}, selectOnly={3}, allFieldReplace={4}, expectedResult={5}")
-    @CsvSource({
+    @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
-    })
-    void testReplace(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));
-        viewModel.selectOnlyProperty().bind(new SimpleBooleanProperty(selectOnly));
-        viewModel.allFieldReplaceProperty().bind(new SimpleBooleanProperty(allFieldReplace));
+            "' ', ',', date, TRUE, FALSE, 1", // replace space with comma in DATE field
+        }
+    )
+    void testReplace(
+        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));
+        viewModel
+            .selectOnlyProperty()
+            .bind(new SimpleBooleanProperty(selectOnly));
+        viewModel
+            .allFieldReplaceProperty()
+            .bind(new SimpleBooleanProperty(allFieldReplace));
         assertEquals(expectedResult, viewModel.replace());
     }
 }
diff --git a/src/test/java/org/jabref/gui/entryeditor/CommentsTabTest.java b/src/test/java/org/jabref/gui/entryeditor/CommentsTabTest.java
index 1d255cf7536..0a76fa7af92 100644
--- a/src/test/java/org/jabref/gui/entryeditor/CommentsTabTest.java
+++ b/src/test/java/org/jabref/gui/entryeditor/CommentsTabTest.java
@@ -1,10 +1,14 @@
 package org.jabref.gui.entryeditor;
 
+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.Set;
-
 import javax.swing.undo.UndoManager;
-
 import org.jabref.gui.DialogService;
 import org.jabref.gui.StateManager;
 import org.jabref.gui.autocompleter.SuggestionProviders;
@@ -24,7 +28,6 @@
 import org.jabref.model.entry.types.StandardEntryType;
 import org.jabref.preferences.PreferencesService;
 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;
@@ -32,12 +35,6 @@
 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;
-
 @GUITest
 @ExtendWith(ApplicationExtension.class)
 class CommentsTabTest {
@@ -48,26 +45,37 @@ class CommentsTabTest {
 
     @Mock
     private BibEntryTypesManager entryTypesManager;
+
     @Mock
     private BibDatabaseContext databaseContext;
+
     @Mock
     private SuggestionProviders suggestionProviders;
+
     @Mock
     private UndoManager undoManager;
+
     @Mock
     private DialogService dialogService;
+
     @Mock
     private PreferencesService preferences;
+
     @Mock
     private StateManager stateManager;
+
     @Mock
     private ThemeManager themeManager;
+
     @Mock
     private TaskExecutor taskExecutor;
+
     @Mock
     private JournalAbbreviationRepository journalAbbreviationRepository;
+
     @Mock
     private IndexingTaskManager indexingTaskManager;
+
     @Mock
     private OwnerPreferences ownerPreferences;
 
@@ -79,9 +87,11 @@ void setUp() {
         when(ownerPreferences.getDefaultOwner()).thenReturn(ownerName);
         when(databaseContext.getMode()).thenReturn(BibDatabaseMode.BIBLATEX);
         BibEntryType entryTypeMock = mock(BibEntryType.class);
-        when(entryTypesManager.enrich(any(), any())).thenReturn(Optional.of(entryTypeMock));
+        when(entryTypesManager.enrich(any(), any()))
+            .thenReturn(Optional.of(entryTypeMock));
 
-        commentsTab = new CommentsTab(
+        commentsTab =
+            new CommentsTab(
                 preferences,
                 databaseContext,
                 suggestionProviders,
@@ -92,16 +102,17 @@ void setUp() {
                 indexingTaskManager,
                 taskExecutor,
                 journalAbbreviationRepository
-        );
+            );
     }
 
     @Test
     void testDetermineFieldsToShowWorksForASingleUser() {
-        final UserSpecificCommentField ownerComment = new UserSpecificCommentField(ownerName);
+        final UserSpecificCommentField ownerComment =
+            new UserSpecificCommentField(ownerName);
 
         BibEntry entry = new BibEntry(StandardEntryType.Book)
-                .withField(StandardField.COMMENT, "Standard comment text")
-                .withField(ownerComment, "User-specific comment text");
+            .withField(StandardField.COMMENT, "Standard comment text")
+            .withField(ownerComment, "User-specific comment text");
 
         Set<Field> fields = commentsTab.determineFieldsToShow(entry);
 
@@ -110,23 +121,32 @@ void testDetermineFieldsToShowWorksForASingleUser() {
 
     @Test
     void testDetermineFieldsToShowWorksForMultipleUsers() {
-        final UserSpecificCommentField ownerComment = new UserSpecificCommentField(ownerName);
-        final UserSpecificCommentField otherUsersComment = new UserSpecificCommentField("other-user-id");
+        final UserSpecificCommentField ownerComment =
+            new UserSpecificCommentField(ownerName);
+        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");
+            .withField(StandardField.COMMENT, "Standard comment text")
+            .withField(ownerComment, "User-specific comment text")
+            .withField(otherUsersComment, "other-user-id comment text");
 
         Set<Field> fields = commentsTab.determineFieldsToShow(entry);
 
-        assertEquals(Set.of(StandardField.COMMENT, ownerComment, otherUsersComment), fields);
+        assertEquals(
+            Set.of(StandardField.COMMENT, ownerComment, otherUsersComment),
+            fields
+        );
     }
 
     @Test
     public void testDifferentiateCaseInUserName() {
         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 b1eb7af5675..f59f4aeedf2 100644
--- a/src/test/java/org/jabref/gui/entryeditor/SciteTabTest.java
+++ b/src/test/java/org/jabref/gui/entryeditor/SciteTabTest.java
@@ -1,12 +1,14 @@
 package org.jabref.gui.entryeditor;
 
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
 import org.jabref.gui.DialogService;
 import org.jabref.gui.util.TaskExecutor;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.field.StandardField;
 import org.jabref.preferences.PreferencesService;
 import org.jabref.testutils.category.GUITest;
-
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -16,9 +18,6 @@
 import org.mockito.MockitoAnnotations;
 import org.testfx.framework.junit5.ApplicationExtension;
 
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
-
 @GUITest
 @ExtendWith(ApplicationExtension.class)
 public class SciteTabTest {
@@ -27,17 +26,23 @@ public class SciteTabTest {
 
     @Mock
     private PreferencesService preferencesService;
+
     @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(preferencesService.getEntryEditorPreferences()).thenReturn(entryEditorPreferences);
+        when(preferencesService.getEntryEditorPreferences())
+            .thenReturn(entryEditorPreferences);
     }
 
     @Test
@@ -61,8 +66,7 @@ public void testBindNullEntry() {
     @Test
     public void testBindEntry() {
         var tab = new SciteTab(preferencesService, 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 0b6c8349efc..b0d7366827a 100644
--- a/src/test/java/org/jabref/gui/entryeditor/SciteTabViewModelTest.java
+++ b/src/test/java/org/jabref/gui/entryeditor/SciteTabViewModelTest.java
@@ -1,36 +1,39 @@
 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 java.util.Optional;
+import kong.unirest.json.JSONObject;
 import org.jabref.gui.util.TaskExecutor;
 import org.jabref.logic.importer.FetcherException;
 import org.jabref.model.entry.identifier.DOI;
 import org.jabref.preferences.PreferencesService;
-
-import kong.unirest.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;
-
 public class SciteTabViewModelTest {
 
     @Mock
     private PreferencesService preferencesService;
+
     @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(preferencesService.getEntryEditorPreferences()).thenReturn(entryEditorPreferences);
+        when(preferencesService.getEntryEditorPreferences())
+            .thenReturn(entryEditorPreferences);
     }
 
     @Test
diff --git a/src/test/java/org/jabref/gui/entryeditor/SourceTabTest.java b/src/test/java/org/jabref/gui/entryeditor/SourceTabTest.java
index f9f41a73ab4..cf86dd3900f 100644
--- a/src/test/java/org/jabref/gui/entryeditor/SourceTabTest.java
+++ b/src/test/java/org/jabref/gui/entryeditor/SourceTabTest.java
@@ -1,14 +1,16 @@
 package org.jabref.gui.entryeditor;
 
-import java.util.Collections;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
 
+import java.util.Collections;
 import javafx.collections.FXCollections;
 import javafx.scene.Scene;
 import javafx.scene.control.Label;
 import javafx.scene.control.Tab;
 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;
@@ -22,8 +24,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;
@@ -31,9 +31,6 @@
 import org.testfx.framework.junit5.ApplicationExtension;
 import org.testfx.framework.junit5.Start;
 
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
-
 @GUITest
 @ExtendWith(ApplicationExtension.class)
 class SourceTabTest {
@@ -47,16 +44,30 @@ class SourceTabTest {
     @Start
     public void onStart(Stage stage) {
         area = new CodeArea();
-        area.appendText("some example\n text to go here\n across a couple of \n lines....");
+        area.appendText(
+            "some example\n text to go here\n across a couple of \n lines...."
+        );
         StateManager stateManager = mock(StateManager.class);
-        when(stateManager.activeSearchQueryProperty()).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(',');
+        when(stateManager.activeSearchQueryProperty())
+            .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(
+        sourceTab =
+            new SourceTab(
                 new BibDatabaseContext(),
                 new CountingUndoManager(),
                 fieldPreferences,
@@ -65,12 +76,14 @@ public void onStart(Stage stage) {
                 mock(DialogService.class),
                 stateManager,
                 mock(BibEntryTypesManager.class),
-                keyBindingRepository);
-        pane = new TabPane(
+                keyBindingRepository
+            );
+        pane =
+            new TabPane(
                 new Tab("main area", area),
                 new Tab("other tab", new Label("some text")),
                 sourceTab
-        );
+            );
         scene = new Scene(pane);
         this.stage = stage;
 
@@ -97,7 +110,9 @@ void switchingFromSourceTabDoesNotThrowException(FxRobot robot) {
         // Switch to different tab & update entry
         robot.interact(() -> pane.getSelectionModel().select(1));
         robot.interact(() -> stage.setWidth(600));
-        robot.interact(() -> entry.setField(new UnknownField("test"), "new value"));
+        robot.interact(() ->
+            entry.setField(new UnknownField("test"), "new value")
+        );
 
         // No exception should be thrown
         robot.interrupt(100);
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 91a3e8eead4..e7765235b6a 100644
--- a/src/test/java/org/jabref/gui/entryeditor/fileannotationtab/FileAnnotationViewModelTest.java
+++ b/src/test/java/org/jabref/gui/entryeditor/fileannotationtab/FileAnnotationViewModelTest.java
@@ -1,16 +1,14 @@
 package org.jabref.gui.entryeditor.fileannotationtab;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
 import java.time.LocalDateTime;
 import java.util.Optional;
-
 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;
-
 public class FileAnnotationViewModelTest {
 
     private FileAnnotationViewModel annotationViewModel;
@@ -19,15 +17,39 @@ public class FileAnnotationViewModelTest {
     @BeforeEach
     void setup() {
         String content = "This is content";
-        String marking = String.format("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.");
-
-        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 = String.format(
+            "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."
+        );
+
+        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 +74,25 @@ public void retrieveCorrectContent() {
 
     @Test
     public void retrieveCorrectContentWithoutLinkedFileAnnotation() {
-        String expectedMarking = String.format("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.");
-
-        assertEquals(expectedMarking, annotationViewModelWithoutFileAnnotation.getContent());
+        String expectedMarking = String.format(
+            "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."
+        );
+
+        assertEquals(
+            expectedMarking,
+            annotationViewModelWithoutFileAnnotation.getContent()
+        );
     }
 
     @Test
     public void removeOnlyLineBreaksNotPrecededByPeriodOrColon() {
-        String expectedMarking = String.format("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.");
+        String expectedMarking = String.format(
+            "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."
+        );
 
         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 973247fe8f0..7d0e891e60f 100644
--- a/src/test/java/org/jabref/gui/exporter/ExportToClipboardActionTest.java
+++ b/src/test/java/org/jabref/gui/exporter/ExportToClipboardActionTest.java
@@ -1,13 +1,20 @@
 package org.jabref.gui.exporter;
 
+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;
-
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableList;
-
 import org.jabref.gui.ClipBoardManager;
 import org.jabref.gui.DialogService;
 import org.jabref.gui.StateManager;
@@ -27,27 +34,24 @@
 import org.jabref.preferences.FilePreferences;
 import org.jabref.preferences.LibraryPreferences;
 import org.jabref.preferences.PreferencesService;
-
 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;
-
 public class ExportToClipboardActionTest {
 
     private ExportToClipboardAction exportToClipboardAction;
     private final DialogService dialogService = spy(DialogService.class);
-    private final ClipBoardManager clipBoardManager = mock(ClipBoardManager.class);
-    private final BibDatabaseContext databaseContext = mock(BibDatabaseContext.class);
-    private final PreferencesService preferences = mock(PreferencesService.class, Answers.RETURNS_DEEP_STUBS);
+    private final ClipBoardManager clipBoardManager = mock(
+        ClipBoardManager.class
+    );
+    private final BibDatabaseContext databaseContext = mock(
+        BibDatabaseContext.class
+    );
+    private final PreferencesService preferences = mock(
+        PreferencesService.class,
+        Answers.RETURNS_DEEP_STUBS
+    );
     private final StateManager stateManager = mock(StateManager.class);
 
     private TaskExecutor taskExecutor;
@@ -56,61 +60,116 @@ public class ExportToClipboardActionTest {
     @BeforeEach
     public 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");
+            .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.getXmpPreferences()).thenReturn(mock(XmpPreferences.class));
-        exportToClipboardAction = new ExportToClipboardAction(dialogService, stateManager, clipBoardManager, taskExecutor, preferences);
+        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
+            );
     }
 
     @Test
     public void testExecuteIfNoSelectedEntries() {
-        when(stateManager.getSelectedEntries()).thenReturn(FXCollections.emptyObservableList());
+        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
     public void testExecuteOnSuccess() {
-        Exporter selectedExporter = new Exporter("html", "HTML", StandardFileType.HTML) {
+        Exporter selectedExporter = new Exporter(
+            "html",
+            "HTML",
+            StandardFileType.HTML
+        ) {
             @Override
-            public void export(BibDatabaseContext databaseContext, Path file, List<BibEntry> entries) {
-            }
+            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);
+        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.getLibraryPreferences())
+            .thenReturn(libraryPreferences);
+        when(preferences.getExportPreferences().getLastExportExtension())
+            .thenReturn("HTML");
+        when(preferences.getSelfContainedExportConfiguration().getSaveOrder())
+            .thenReturn(SaveOrder.getDefaultSaveOrder());
         when(stateManager.getSelectedEntries()).thenReturn(selectedEntries);
-        when(stateManager.getActiveDatabase()).thenReturn(Optional.ofNullable(databaseContext));
+        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(
+        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));
+                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 5752fc7afa7..5bf0c334f4b 100644
--- a/src/test/java/org/jabref/gui/exporter/SaveDatabaseActionTest.java
+++ b/src/test/java/org/jabref/gui/exporter/SaveDatabaseActionTest.java
@@ -1,5 +1,15 @@
 package org.jabref.gui.exporter;
 
+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;
@@ -7,9 +17,7 @@
 import java.util.List;
 import java.util.Optional;
 import java.util.stream.Collectors;
-
 import javafx.collections.FXCollections;
-
 import org.jabref.gui.DialogService;
 import org.jabref.gui.JabRefFrame;
 import org.jabref.gui.LibraryTab;
@@ -32,23 +40,13 @@
 import org.jabref.preferences.FilePreferences;
 import org.jabref.preferences.JabRefPreferences;
 import org.jabref.preferences.LibraryPreferences;
-
 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;
-
 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);
@@ -62,16 +60,29 @@ class SaveDatabaseActionTest {
     public void setUp() {
         when(libraryTab.frame()).thenReturn(jabRefFrame);
         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));
+        when(preferences.getExportPreferences())
+            .thenReturn(mock(ExportPreferences.class));
         when(jabRefFrame.getDialogService()).thenReturn(dialogService);
-        saveDatabaseAction = spy(new SaveDatabaseAction(libraryTab, dialogService, preferences, mock(BibEntryTypesManager.class)));
+        saveDatabaseAction =
+            spy(
+                new SaveDatabaseAction(
+                    libraryTab,
+                    dialogService,
+                    preferences,
+                    mock(BibEntryTypesManager.class)
+                )
+            );
     }
 
     @Test
     public 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();
@@ -81,7 +92,10 @@ public void saveAsShouldSetWorkingDirectory() {
 
     @Test
     public 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();
@@ -93,16 +107,21 @@ public void saveAsShouldNotSetWorkingDirectoryIfNotSelected() {
     public void saveShouldShowSaveAsIfDatabaseNotSelected() {
         when(dbContext.getDatabasePath()).thenReturn(Optional.empty());
         when(dbContext.getLocation()).thenReturn(DatabaseLocation.LOCAL);
-        when(preferences.getBoolean(JabRefPreferences.LOCAL_AUTO_SAVE)).thenReturn(false);
-        when(dialogService.showFileSaveDialog(any())).thenReturn(Optional.of(file));
+        when(preferences.getBoolean(JabRefPreferences.LOCAL_AUTO_SAVE))
+            .thenReturn(false);
+        when(dialogService.showFileSaveDialog(any()))
+            .thenReturn(Optional.of(file));
         doReturn(true).when(saveDatabaseAction).saveAs(any(), any());
 
         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,44 +131,73 @@ 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.getSaveOrder()).thenReturn(SaveOrder.getDefaultSaveOrder());
-        GlobalCitationKeyPattern emptyGlobalCitationKeyPattern = GlobalCitationKeyPattern.fromPattern("");
-        when(metaData.getCiteKeyPattern(any(GlobalCitationKeyPattern.class))).thenReturn(emptyGlobalCitationKeyPattern);
+        when(
+            saveConfiguration.withSaveType(
+                any(BibDatabaseWriter.SaveType.class)
+            )
+        )
+            .thenReturn(saveConfiguration);
+        when(saveConfiguration.getSaveOrder())
+            .thenReturn(SaveOrder.getDefaultSaveOrder());
+        GlobalCitationKeyPattern emptyGlobalCitationKeyPattern =
+            GlobalCitationKeyPattern.fromPattern("");
+        when(metaData.getCiteKeyPattern(any(GlobalCitationKeyPattern.class)))
+            .thenReturn(emptyGlobalCitationKeyPattern);
         when(dbContext.getDatabasePath()).thenReturn(Optional.of(file));
         when(dbContext.getLocation()).thenReturn(DatabaseLocation.LOCAL);
         when(dbContext.getDatabase()).thenReturn(database);
         when(dbContext.getMetaData()).thenReturn(metaData);
         when(dbContext.getEntries()).thenReturn(database.getEntries());
-        when(preferences.getBoolean(JabRefPreferences.LOCAL_AUTO_SAVE)).thenReturn(false);
+        when(preferences.getBoolean(JabRefPreferences.LOCAL_AUTO_SAVE))
+            .thenReturn(false);
         when(preferences.getFieldPreferences()).thenReturn(fieldPreferences);
-        when(preferences.getCitationKeyPatternPreferences()).thenReturn(mock(CitationKeyPatternPreferences.class));
-        when(preferences.getCitationKeyPatternPreferences().getKeyPattern()).thenReturn(emptyGlobalCitationKeyPattern);
-        when(preferences.getFieldPreferences().getNonWrappableFields()).thenReturn(FXCollections.emptyObservableList());
-        when(preferences.getLibraryPreferences()).thenReturn(mock(LibraryPreferences.class));
+        when(preferences.getCitationKeyPatternPreferences())
+            .thenReturn(mock(CitationKeyPatternPreferences.class));
+        when(preferences.getCitationKeyPatternPreferences().getKeyPattern())
+            .thenReturn(emptyGlobalCitationKeyPattern);
+        when(preferences.getFieldPreferences().getNonWrappableFields())
+            .thenReturn(FXCollections.emptyObservableList());
+        when(preferences.getLibraryPreferences())
+            .thenReturn(mock(LibraryPreferences.class));
         when(libraryTab.frame()).thenReturn(jabRefFrame);
         when(libraryTab.getBibDatabaseContext()).thenReturn(dbContext);
-        when(libraryTab.getUndoManager()).thenReturn(mock(CountingUndoManager.class));
+        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;
     }
 
     @Test
     public void saveKeepsChangedFlag() throws Exception {
-        BibEntry firstEntry = new BibEntry().withField(StandardField.AUTHOR, "first");
+        BibEntry firstEntry = new BibEntry()
+            .withField(StandardField.AUTHOR, "first");
         firstEntry.setChanged(true);
-        BibEntry secondEntry = new BibEntry().withField(StandardField.AUTHOR, "second");
+        BibEntry secondEntry = new BibEntry()
+            .withField(StandardField.AUTHOR, "second");
         secondEntry.setChanged(true);
-        BibDatabase database = new BibDatabase(List.of(firstEntry, secondEntry));
+        BibDatabase database = new BibDatabase(
+            List.of(firstEntry, secondEntry)
+        );
 
         saveDatabaseAction = createSaveDatabaseActionForBibDatabase(database);
         saveDatabaseAction.save();
 
-        assertEquals(database
-                        .getEntries().stream()
-                        .map(BibEntry::hasChanged).filter(changed -> false).collect(Collectors.toList()),
-                Collections.emptyList());
+        assertEquals(
+            database
+                .getEntries()
+                .stream()
+                .map(BibEntry::hasChanged)
+                .filter(changed -> false)
+                .collect(Collectors.toList()),
+            Collections.emptyList()
+        );
     }
 
     @Test
diff --git a/src/test/java/org/jabref/gui/externalfiles/AutoSetFileLinksUtilTest.java b/src/test/java/org/jabref/gui/externalfiles/AutoSetFileLinksUtilTest.java
index b429b879454..72cce5d5cf5 100644
--- a/src/test/java/org/jabref/gui/externalfiles/AutoSetFileLinksUtilTest.java
+++ b/src/test/java/org/jabref/gui/externalfiles/AutoSetFileLinksUtilTest.java
@@ -1,13 +1,16 @@
 package org.jabref.gui.externalfiles;
 
+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;
-
 import javafx.collections.FXCollections;
-
 import org.jabref.gui.externalfiletype.ExternalFileTypes;
 import org.jabref.logic.util.io.AutoLinkPreferences;
 import org.jabref.model.database.BibDatabaseContext;
@@ -15,25 +18,22 @@
 import org.jabref.model.entry.LinkedFile;
 import org.jabref.model.entry.types.StandardEntryType;
 import org.jabref.preferences.FilePreferences;
-
 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;
-
 public class AutoSetFileLinksUtilTest {
 
     private final FilePreferences filePreferences = mock(FilePreferences.class);
     private final AutoLinkPreferences autoLinkPrefs = new AutoLinkPreferences(
-            AutoLinkPreferences.CitationKeyDependency.START,
-            "",
-            false,
-            ';');
-    private final BibDatabaseContext databaseContext = mock(BibDatabaseContext.class);
+        AutoLinkPreferences.CitationKeyDependency.START,
+        "",
+        false,
+        ';'
+    );
+    private final BibDatabaseContext databaseContext = mock(
+        BibDatabaseContext.class
+    );
     private final BibEntry entry = new BibEntry(StandardEntryType.Article);
     private Path path = null;
 
@@ -43,22 +43,41 @@ public void setUp(@TempDir Path folder) throws Exception {
         Files.createFile(path);
         entry.setCitationKey("CiteKey");
         when(filePreferences.getExternalFileTypes())
-                .thenReturn(FXCollections.observableSet(new TreeSet<>(ExternalFileTypes.getDefaultExternalFileTypes())));
+            .thenReturn(
+                FXCollections.observableSet(
+                    new TreeSet<>(
+                        ExternalFileTypes.getDefaultExternalFileTypes()
+                    )
+                )
+            );
     }
 
     @Test
     public void testFindAssociatedNotLinkedFilesSuccess() 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, 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,
+            filePreferences,
+            autoLinkPrefs
+        );
         List<LinkedFile> actual = util.findAssociatedNotLinkedFiles(entry);
         assertEquals(expected, actual);
     }
 
     @Test
-    public void testFindAssociatedNotLinkedFilesForEmptySearchDir() throws Exception {
-        when(filePreferences.shouldStoreFilesRelativeToBibFile()).thenReturn(false);
-        AutoSetFileLinksUtil util = new AutoSetFileLinksUtil(databaseContext, filePreferences, autoLinkPrefs);
+    public void testFindAssociatedNotLinkedFilesForEmptySearchDir()
+        throws Exception {
+        when(filePreferences.shouldStoreFilesRelativeToBibFile())
+            .thenReturn(false);
+        AutoSetFileLinksUtil util = new AutoSetFileLinksUtil(
+            databaseContext,
+            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 9af4b1364bb..4183901be89 100755
--- a/src/test/java/org/jabref/gui/externalfiles/FileFilterUtilsTest.java
+++ b/src/test/java/org/jabref/gui/externalfiles/FileFilterUtilsTest.java
@@ -1,5 +1,8 @@
 package org.jabref.gui.externalfiles;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
+
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.attribute.FileTime;
@@ -9,15 +12,11 @@
 import java.util.List;
 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.assertNotEquals;
-
 public class FileFilterUtilsTest {
 
     private final FileFilterUtils fileFilterUtils = new FileFilterUtils();
@@ -25,56 +24,85 @@ public class FileFilterUtilsTest {
 
     @Test
     public void isDuringLastDayNegativeTest() {
-        assertEquals(fileFilterUtils.isDuringLastDay(time.minusHours(24)), false);
+        assertEquals(
+            fileFilterUtils.isDuringLastDay(time.minusHours(24)),
+            false
+        );
     }
 
     @Test
     public void isDuringLastDayPositiveTest() {
-        assertEquals(fileFilterUtils.isDuringLastDay(time.minusHours(23)), true);
+        assertEquals(
+            fileFilterUtils.isDuringLastDay(time.minusHours(23)),
+            true
+        );
     }
 
     @Test
     public void isDuringLastWeekNegativeTest() {
-        assertEquals(fileFilterUtils.isDuringLastWeek(time.minusDays(7)), false);
+        assertEquals(
+            fileFilterUtils.isDuringLastWeek(time.minusDays(7)),
+            false
+        );
     }
 
     @Test
     public void isDuringLastWeekPositiveTest() {
-        assertEquals(fileFilterUtils.isDuringLastWeek(time.minusDays(6).minusHours(23)), true);
+        assertEquals(
+            fileFilterUtils.isDuringLastWeek(time.minusDays(6).minusHours(23)),
+            true
+        );
     }
 
     @Test
     public void isDuringLastMonthNegativeTest() {
-        assertEquals(fileFilterUtils.isDuringLastMonth(time.minusDays(30)), false);
+        assertEquals(
+            fileFilterUtils.isDuringLastMonth(time.minusDays(30)),
+            false
+        );
     }
 
     @Test
     public void isDuringLastMonthPositiveTest() {
-        assertEquals(fileFilterUtils.isDuringLastMonth(time.minusDays(29).minusHours(23)), true);
+        assertEquals(
+            fileFilterUtils.isDuringLastMonth(
+                time.minusDays(29).minusHours(23)
+            ),
+            true
+        );
     }
 
     @Test
     public void isDuringLastYearNegativeTest() {
-        assertEquals(fileFilterUtils.isDuringLastYear(time.minusDays(365)), false);
+        assertEquals(
+            fileFilterUtils.isDuringLastYear(time.minusDays(365)),
+            false
+        );
     }
 
     @Test
     public void isDuringLastYearPositiveTest() {
-        assertEquals(fileFilterUtils.isDuringLastYear(time.minusDays(364).minusHours(23)), true);
+        assertEquals(
+            fileFilterUtils.isDuringLastYear(
+                time.minusDays(364).minusHours(23)
+            ),
+            true
+        );
     }
 
     @Nested
     class SortingTests {
 
         private final List<Path> files = new ArrayList<>();
-        private final List<String> expectedSortByDateAscending = new ArrayList<>();
-        private final List<String> expectedSortByDateDescending = new ArrayList<>();
+        private final List<String> expectedSortByDateAscending =
+            new ArrayList<>();
+        private final List<String> expectedSortByDateDescending =
+            new ArrayList<>();
         private final List<String> wrongOrder = new ArrayList<>();
 
         /* Initialize the directory and files used in the sorting tests, and change their last edited dates. */
         @BeforeEach
         public void setUp(@TempDir Path tempDir) throws Exception {
-
             Path firstPath = tempDir.resolve("firstFile.pdf");
             Path secondPath = tempDir.resolve("secondFile.pdf");
             Path thirdPath = tempDir.resolve("thirdFile.pdf");
@@ -157,6 +185,7 @@ public void testSortByDateDescendingNegativeTest() {
 
     @Nested
     class filteringTests {
+
         private final List<Path> files = new ArrayList<>();
         private final List<Path> targetFiles = new ArrayList<>();
         private final Set<String> ignoreFileSet = new HashSet<>();
diff --git a/src/test/java/org/jabref/gui/externalfiles/GitIgnoreFileFilterTest.java b/src/test/java/org/jabref/gui/externalfiles/GitIgnoreFileFilterTest.java
index 2504ffb55b7..7e4f48a9c9f 100644
--- a/src/test/java/org/jabref/gui/externalfiles/GitIgnoreFileFilterTest.java
+++ b/src/test/java/org/jabref/gui/externalfiles/GitIgnoreFileFilterTest.java
@@ -1,49 +1,62 @@
 package org.jabref.gui.externalfiles;
 
+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;
-
 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;
-
 class GitIgnoreFileFilterTest {
 
     @Test
     public void checkSimpleGitIgnore(@TempDir Path dir) throws Exception {
-        Files.writeString(dir.resolve(".gitignore"), """
-                *.png
-                """);
+        Files.writeString(
+            dir.resolve(".gitignore"),
+            """
+            *.png
+            """
+        );
         GitIgnoreFileFilter gitIgnoreFileFilter = new GitIgnoreFileFilter(dir);
         assertFalse(gitIgnoreFileFilter.accept(dir.resolve("test.png")));
     }
 
     @Test
-    public void checkSimpleGitIgnoreWithAllowing(@TempDir Path dir) throws Exception {
-        Files.writeString(dir.resolve(".gitignore"), """
-                !*.png
-                """);
+    public void checkSimpleGitIgnoreWithAllowing(@TempDir Path dir)
+        throws Exception {
+        Files.writeString(
+            dir.resolve(".gitignore"),
+            """
+            !*.png
+            """
+        );
         GitIgnoreFileFilter gitIgnoreFileFilter = new GitIgnoreFileFilter(dir);
         assertTrue(gitIgnoreFileFilter.accept(dir.resolve("test.png")));
     }
 
     @Test
-    public void checkSimpleGitIgnoreWithOverwritingDefs(@TempDir Path dir) throws Exception {
-        Files.writeString(dir.resolve(".gitignore"), """
-                !*.png
-                *.png
-                """);
+    public void checkSimpleGitIgnoreWithOverwritingDefs(@TempDir Path dir)
+        throws Exception {
+        Files.writeString(
+            dir.resolve(".gitignore"),
+            """
+            !*.png
+            *.png
+            """
+        );
         GitIgnoreFileFilter gitIgnoreFileFilter = new GitIgnoreFileFilter(dir);
         assertFalse(gitIgnoreFileFilter.accept(dir.resolve("test.png")));
     }
 
     @Test
     public void checkDirectoryGitIgnore(@TempDir Path dir) throws Exception {
-        Files.writeString(dir.resolve(".gitignore"), """
-                **/*.png
-                """);
+        Files.writeString(
+            dir.resolve(".gitignore"),
+            """
+            **/*.png
+            """
+        );
         GitIgnoreFileFilter gitIgnoreFileFilter = new GitIgnoreFileFilter(dir);
         assertFalse(gitIgnoreFileFilter.accept(dir.resolve("test.png")));
     }
diff --git a/src/test/java/org/jabref/gui/externalfiles/ImportHandlerTest.java b/src/test/java/org/jabref/gui/externalfiles/ImportHandlerTest.java
index 2e973ac5a23..16411d36a13 100644
--- a/src/test/java/org/jabref/gui/externalfiles/ImportHandlerTest.java
+++ b/src/test/java/org/jabref/gui/externalfiles/ImportHandlerTest.java
@@ -1,9 +1,14 @@
 package org.jabref.gui.externalfiles;
 
-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.ArgumentMatchers.any;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
 
+import java.util.List;
 import javax.swing.undo.UndoManager;
-
 import org.jabref.gui.DialogService;
 import org.jabref.gui.StateManager;
 import org.jabref.gui.duplicationFinder.DuplicateResolverDialog;
@@ -19,7 +24,6 @@
 import org.jabref.model.util.DummyFileUpdateMonitor;
 import org.jabref.preferences.FilePreferences;
 import org.jabref.preferences.PreferencesService;
-
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.mockito.Answers;
@@ -27,22 +31,15 @@
 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;
-
 class ImportHandlerTest {
 
-
     private ImportHandler importHandler;
     private BibDatabaseContext bibDatabaseContext;
     private BibEntry testEntry;
 
     @Mock
     private PreferencesService preferencesService;
+
     @Mock
     private DuplicateCheck duplicateCheck;
 
@@ -50,16 +47,22 @@ class ImportHandlerTest {
     void setUp() {
         MockitoAnnotations.initMocks(this);
 
-        ImportFormatPreferences importFormatPreferences = mock(ImportFormatPreferences.class, Answers.RETURNS_DEEP_STUBS);
-        when(preferencesService.getImportFormatPreferences()).thenReturn(importFormatPreferences);
-        when(preferencesService.getFilePreferences()).thenReturn(mock(FilePreferences.class));
+        ImportFormatPreferences importFormatPreferences = mock(
+            ImportFormatPreferences.class,
+            Answers.RETURNS_DEEP_STUBS
+        );
+        when(preferencesService.getImportFormatPreferences())
+            .thenReturn(importFormatPreferences);
+        when(preferencesService.getFilePreferences())
+            .thenReturn(mock(FilePreferences.class));
 
         bibDatabaseContext = mock(BibDatabaseContext.class);
         BibDatabase bibDatabase = new BibDatabase();
         when(bibDatabaseContext.getMode()).thenReturn(BibDatabaseMode.BIBTEX);
         when(bibDatabaseContext.getDatabase()).thenReturn(bibDatabase);
         when(duplicateCheck.isDuplicate(any(), any(), any())).thenReturn(false);
-        importHandler = new ImportHandler(
+        importHandler =
+            new ImportHandler(
                 bibDatabaseContext,
                 preferencesService,
                 new DummyFileUpdateMonitor(),
@@ -67,81 +70,114 @@ void setUp() {
                 mock(StateManager.class),
                 mock(DialogService.class),
                 new CurrentThreadTaskExecutor()
-                );
+            );
 
-        testEntry = new BibEntry(StandardEntryType.Article)
+        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
+        );
 
         PreferencesService preferencesService = mock(PreferencesService.class);
-        when(preferencesService.getImportFormatPreferences()).thenReturn(importFormatPreferences);
-        when(preferencesService.getFilePreferences()).thenReturn(mock(FilePreferences.class));
+        when(preferencesService.getImportFormatPreferences())
+            .thenReturn(importFormatPreferences);
+        when(preferencesService.getFilePreferences())
+            .thenReturn(mock(FilePreferences.class));
 
         ImportHandler importHandler = new ImportHandler(
-                mock(BibDatabaseContext.class),
-                preferencesService,
-                new DummyFileUpdateMonitor(),
-                mock(UndoManager.class),
-                mock(StateManager.class),
-                mock(DialogService.class),
-                new CurrentThreadTaskExecutor());
-
-        List<BibEntry> bibEntries = importHandler.handleBibTeXData("""
-                @InProceedings{Wen2013,
-                  library          = {Tagungen\\2013\\KWTK45\\},
-                }
-                """);
+            mock(BibDatabaseContext.class),
+            preferencesService,
+            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\\");
+            .withCitationKey("Wen2013")
+            .withField(StandardField.LIBRARY, "Tagungen\\2013\\KWTK45\\");
 
         assertEquals(List.of(expected), bibEntries.stream().toList());
     }
 
     @Test
     void cleanUpEntryTest() {
-        BibEntry entry = new BibEntry().withField(StandardField.AUTHOR, "Clear Author");
-        BibEntry cleanedEntry = importHandler.cleanUpEntry(bibDatabaseContext, entry);
-        assertEquals(new BibEntry().withField(StandardField.AUTHOR, "Clear Author"), cleanedEntry);
+        BibEntry entry = new BibEntry()
+            .withField(StandardField.AUTHOR, "Clear Author");
+        BibEntry cleanedEntry = importHandler.cleanUpEntry(
+            bibDatabaseContext,
+            entry
+        );
+        assertEquals(
+            new BibEntry().withField(StandardField.AUTHOR, "Clear Author"),
+            cleanedEntry
+        );
     }
 
     @Test
     void findDuplicateTest() {
         // Assume there is no duplicate initially
-        assertTrue(importHandler.findDuplicate(bibDatabaseContext, testEntry).isEmpty());
+        assertTrue(
+            importHandler.findDuplicate(bibDatabaseContext, testEntry).isEmpty()
+        );
     }
 
     @Test
     void handleDuplicatesKeepRightTest() {
         // Arrange
         BibEntry duplicateEntry = new BibEntry(StandardEntryType.Article)
-                .withCitationKey("Duplicate2023")
-                .withField(StandardField.AUTHOR, "Duplicate Author");
+            .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,
-                preferencesService,
-                new DummyFileUpdateMonitor(),
-                mock(UndoManager.class),
-                mock(StateManager.class),
-                mock(DialogService.class),
-                new CurrentThreadTaskExecutor()
-        ));
+        DuplicateDecisionResult decisionResult = new DuplicateDecisionResult(
+            DuplicateResolverDialog.DuplicateResolverResult.KEEP_RIGHT,
+            null
+        );
+        importHandler =
+            Mockito.spy(
+                new ImportHandler(
+                    bibDatabaseContext,
+                    preferencesService,
+                    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, bibDatabaseContext);
+        Mockito
+            .doReturn(decisionResult)
+            .when(importHandler)
+            .getDuplicateDecision(
+                testEntry,
+                duplicateEntry,
+                bibDatabaseContext
+            );
 
         // Act
-        BibEntry result = importHandler.handleDuplicates(bibDatabaseContext, testEntry, duplicateEntry).get();
+        BibEntry result = importHandler
+            .handleDuplicates(bibDatabaseContext, testEntry, duplicateEntry)
+            .get();
 
         // Assert that the duplicate entry was removed from the database
         assertFalse(bibDatabase.getEntries().contains(duplicateEntry));
@@ -153,27 +189,42 @@ void handleDuplicatesKeepRightTest() {
     void handleDuplicatesKeepBothTest() {
         // Arrange
         BibEntry duplicateEntry = new BibEntry(StandardEntryType.Article)
-                .withCitationKey("Duplicate2023")
-                .withField(StandardField.AUTHOR, "Duplicate Author");
+            .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,
-                preferencesService,
-                new DummyFileUpdateMonitor(),
-                mock(UndoManager.class),
-                mock(StateManager.class),
-                mock(DialogService.class),
-                new CurrentThreadTaskExecutor()
-        ));
+        DuplicateDecisionResult decisionResult = new DuplicateDecisionResult(
+            DuplicateResolverDialog.DuplicateResolverResult.KEEP_BOTH,
+            null
+        );
+        importHandler =
+            Mockito.spy(
+                new ImportHandler(
+                    bibDatabaseContext,
+                    preferencesService,
+                    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, bibDatabaseContext);
+        Mockito
+            .doReturn(decisionResult)
+            .when(importHandler)
+            .getDuplicateDecision(
+                testEntry,
+                duplicateEntry,
+                bibDatabaseContext
+            );
 
         // Act
-        BibEntry result = importHandler.handleDuplicates(bibDatabaseContext, testEntry, duplicateEntry).get();
+        BibEntry result = importHandler
+            .handleDuplicates(bibDatabaseContext, testEntry, duplicateEntry)
+            .get();
 
         // Assert
         assertTrue(bibDatabase.getEntries().contains(duplicateEntry)); // Assert that the duplicate entry is still in the database
@@ -184,35 +235,49 @@ void handleDuplicatesKeepBothTest() {
     void handleDuplicatesKeepMergeTest() {
         // Arrange
         BibEntry duplicateEntry = new BibEntry(StandardEntryType.Article)
-                .withCitationKey("Duplicate2023")
-                .withField(StandardField.AUTHOR, "Duplicate Author");
+            .withCitationKey("Duplicate2023")
+            .withField(StandardField.AUTHOR, "Duplicate Author");
 
         BibEntry mergedEntry = new BibEntry(StandardEntryType.Article)
-                .withCitationKey("Merged2023")
-                .withField(StandardField.AUTHOR, "Merged Author");
+            .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,
-                preferencesService,
-                new DummyFileUpdateMonitor(),
-                mock(UndoManager.class),
-                mock(StateManager.class),
-                mock(DialogService.class),
-                new CurrentThreadTaskExecutor()
-        ));
+        DuplicateDecisionResult decisionResult = new DuplicateDecisionResult(
+            DuplicateResolverDialog.DuplicateResolverResult.KEEP_MERGE,
+            mergedEntry
+        );
+        importHandler =
+            Mockito.spy(
+                new ImportHandler(
+                    bibDatabaseContext,
+                    preferencesService,
+                    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, bibDatabaseContext);
+        Mockito
+            .doReturn(decisionResult)
+            .when(importHandler)
+            .getDuplicateDecision(
+                testEntry,
+                duplicateEntry,
+                bibDatabaseContext
+            );
 
         // Act
-        BibEntry result = importHandler.handleDuplicates(bibDatabaseContext, testEntry, duplicateEntry)
-                                       .orElseGet(() -> {
-                                           // create and return a default BibEntry or do other computations
-                                           return new BibEntry();
-                                       });
+        BibEntry result = importHandler
+            .handleDuplicates(bibDatabaseContext, testEntry, duplicateEntry)
+            .orElseGet(() -> {
+                // create and return a default BibEntry or do other computations
+                return new BibEntry();
+            });
 
         // Assert
         assertFalse(bibDatabase.getEntries().contains(duplicateEntry)); // Assert that the duplicate entry was removed from the database
diff --git a/src/test/java/org/jabref/gui/externalfiles/UnlinkedFilesCrawlerTest.java b/src/test/java/org/jabref/gui/externalfiles/UnlinkedFilesCrawlerTest.java
index 534894b59ce..b1fcc0bc524 100644
--- a/src/test/java/org/jabref/gui/externalfiles/UnlinkedFilesCrawlerTest.java
+++ b/src/test/java/org/jabref/gui/externalfiles/UnlinkedFilesCrawlerTest.java
@@ -1,47 +1,62 @@
 package org.jabref.gui.externalfiles;
 
+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;
-
 import org.jabref.gui.util.FileNodeViewModel;
 import org.jabref.logic.util.StandardFileType;
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.preferences.FilePreferences;
-
 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;
-
 class UnlinkedFilesCrawlerTest {
 
     @Test
     public void minimalGitIgnore(@TempDir Path testRoot) throws Exception {
-        Files.writeString(testRoot.resolve(".gitignore"), """
-                *.png
-                """);
+        Files.writeString(
+            testRoot.resolve(".gitignore"),
+            """
+            *.png
+            """
+        );
         Path subDir = testRoot.resolve("subdir");
         Files.createDirectories(subDir);
         Files.createFile(subDir.resolve("test.png"));
 
-        UnlinkedPDFFileFilter unlinkedPDFFileFilter = mock(UnlinkedPDFFileFilter.class);
+        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);
     }
 
     @Test
-    public void excludingTheCurrentLibraryTest(@TempDir Path testRoot) throws IOException {
+    public void excludingTheCurrentLibraryTest(@TempDir Path testRoot)
+        throws IOException {
         // Adding 3 files one of which is the database file
         Files.createFile(testRoot.resolve("unlinkedPdf.pdf"));
         Files.createFile(testRoot.resolve("another-unlinkedPdf.pdf"));
@@ -52,11 +67,30 @@ public void excludingTheCurrentLibraryTest(@TempDir Path testRoot) throws IOExce
         databaseContext.setDatabasePath(databasePath);
 
         FilePreferences filePreferences = mock(FilePreferences.class);
-        Filter<Path> fileExtensionFilter = new FileExtensionViewModel(StandardFileType.ANY_FILE, filePreferences).dirFilter();
-        UnlinkedPDFFileFilter unlinkedPdfFileFilter = new UnlinkedPDFFileFilter(fileExtensionFilter, databaseContext, filePreferences);
+        Filter<Path> fileExtensionFilter = new FileExtensionViewModel(
+            StandardFileType.ANY_FILE,
+            filePreferences
+        )
+            .dirFilter();
+        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 8ca169a8fe4..80bf8434d03 100644
--- a/src/test/java/org/jabref/gui/externalfiletype/ExternalFileTypesTest.java
+++ b/src/test/java/org/jabref/gui/externalfiletype/ExternalFileTypesTest.java
@@ -1,96 +1,136 @@
 package org.jabref.gui.externalfiletype;
 
+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;
-
 import javafx.collections.FXCollections;
-
 import org.jabref.gui.icon.IconTheme;
 import org.jabref.model.entry.LinkedFile;
 import org.jabref.preferences.FilePreferences;
-
 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;
-
 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";
+        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 FilePreferences filePreferences = mock(FilePreferences.class);
 
     @BeforeEach
     void setUp() {
-        when(filePreferences.getExternalFileTypes()).thenReturn(FXCollections.observableSet(TEST_LIST));
+        when(filePreferences.getExternalFileTypes())
+            .thenReturn(FXCollections.observableSet(TEST_LIST));
     }
 
     @Test
     void getExternalFileTypeByName() {
-        assertEquals(Optional.of(StandardExternalFileType.PDF), ExternalFileTypes.getExternalFileTypeByName("PDF", filePreferences));
+        assertEquals(
+            Optional.of(StandardExternalFileType.PDF),
+            ExternalFileTypes.getExternalFileTypeByName("PDF", filePreferences)
+        );
     }
 
     @Test
     void getExternalFileTypeByExt() {
-        assertEquals(Optional.of(StandardExternalFileType.URL), ExternalFileTypes.getExternalFileTypeByExt("html", filePreferences));
+        assertEquals(
+            Optional.of(StandardExternalFileType.URL),
+            ExternalFileTypes.getExternalFileTypeByExt("html", filePreferences)
+        );
     }
 
     @Test
     void isExternalFileTypeByExt() {
-        assertTrue(ExternalFileTypes.isExternalFileTypeByExt("html", filePreferences));
-        assertFalse(ExternalFileTypes.isExternalFileTypeByExt("tst", filePreferences));
+        assertTrue(
+            ExternalFileTypes.isExternalFileTypeByExt("html", filePreferences)
+        );
+        assertFalse(
+            ExternalFileTypes.isExternalFileTypeByExt("tst", filePreferences)
+        );
     }
 
     @Test
     void getExternalFileTypeForName() {
-        assertEquals(Optional.of(StandardExternalFileType.JPG), ExternalFileTypes.getExternalFileTypeForName("testfile.jpg", filePreferences));
+        assertEquals(
+            Optional.of(StandardExternalFileType.JPG),
+            ExternalFileTypes.getExternalFileTypeForName(
+                "testfile.jpg",
+                filePreferences
+            )
+        );
     }
 
     @Test
     void getExternalFileTypeByMimeType() {
-        assertEquals(Optional.of(StandardExternalFileType.TXT), ExternalFileTypes.getExternalFileTypeByMimeType("text/plain", filePreferences));
+        assertEquals(
+            Optional.of(StandardExternalFileType.TXT),
+            ExternalFileTypes.getExternalFileTypeByMimeType(
+                "text/plain",
+                filePreferences
+            )
+        );
     }
 
     @Test
     void getExternalFileTypeByFile() {
         Path testfile = Path.of("testfile.txt");
-        assertEquals(Optional.of(StandardExternalFileType.TXT), ExternalFileTypes.getExternalFileTypeByFile(testfile, filePreferences));
+        assertEquals(
+            Optional.of(StandardExternalFileType.TXT),
+            ExternalFileTypes.getExternalFileTypeByFile(
+                testfile,
+                filePreferences
+            )
+        );
     }
 
     @Test
     void getExternalFileTypeByLinkedFile() {
-        LinkedFile testfile = new LinkedFile("A testfile", "https://testserver.com/testfile.pdf", "PDF");
-        assertEquals(Optional.of(StandardExternalFileType.PDF), ExternalFileTypes.getExternalFileTypeByLinkedFile(testfile, false, filePreferences));
+        LinkedFile testfile = new LinkedFile(
+            "A testfile",
+            "https://testserver.com/testfile.pdf",
+            "PDF"
+        );
+        assertEquals(
+            Optional.of(StandardExternalFileType.PDF),
+            ExternalFileTypes.getExternalFileTypeByLinkedFile(
+                testfile,
+                false,
+                filePreferences
+            )
+        );
     }
 
     @Test
@@ -102,7 +142,9 @@ void toStringList() {
 
     @Test
     void fromString() {
-        Set<ExternalFileType> testList = ExternalFileTypes.fromString(TEST_STRINGLIST);
+        Set<ExternalFileType> testList = ExternalFileTypes.fromString(
+            TEST_STRINGLIST
+        );
 
         assertEquals(TEST_LIST, testList);
     }
@@ -110,13 +152,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()));
+            "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 20839979607..aeb5d5a57c1 100644
--- a/src/test/java/org/jabref/gui/fieldeditors/LinkedFileViewModelTest.java
+++ b/src/test/java/org/jabref/gui/fieldeditors/LinkedFileViewModelTest.java
@@ -1,5 +1,19 @@
 package org.jabref.gui.fieldeditors;
 
+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.verifyNoInteractions;
+import static org.mockito.Mockito.when;
+
 import java.io.IOException;
 import java.net.CookieHandler;
 import java.net.CookieManager;
@@ -13,11 +27,9 @@
 import java.util.List;
 import java.util.Optional;
 import java.util.TreeSet;
-
 import javafx.collections.FXCollections;
 import javafx.scene.control.Alert.AlertType;
 import javafx.scene.control.ButtonType;
-
 import org.jabref.gui.DialogService;
 import org.jabref.gui.externalfiletype.ExternalFileType;
 import org.jabref.gui.externalfiletype.ExternalFileTypes;
@@ -34,27 +46,12 @@
 import org.jabref.preferences.FilePreferences;
 import org.jabref.preferences.PreferencesService;
 import org.jabref.testutils.category.FetcherTest;
-
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.Assertions;
 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.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.verifyNoInteractions;
-import static org.mockito.Mockito.when;
-
 class LinkedFileViewModelTest {
 
     private Path tempFile;
@@ -64,21 +61,30 @@ class LinkedFileViewModelTest {
     private TaskExecutor taskExecutor;
     private DialogService dialogService;
     private final FilePreferences filePreferences = mock(FilePreferences.class);
-    private final PreferencesService preferences = mock(PreferencesService.class);
+    private final PreferencesService preferences = mock(
+        PreferencesService.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(filePreferences.getExternalFileTypes()).thenReturn(FXCollections.observableSet(new TreeSet<>(ExternalFileTypes.getDefaultExternalFileTypes())));
+        when(filePreferences.getExternalFileTypes())
+            .thenReturn(
+                FXCollections.observableSet(
+                    new TreeSet<>(
+                        ExternalFileTypes.getDefaultExternalFileTypes()
+                    )
+                )
+            );
         when(preferences.getFilePreferences()).thenReturn(filePreferences);
-        when(preferences.getXmpPreferences()).thenReturn(mock(XmpPreferences.class));
+        when(preferences.getXmpPreferences())
+            .thenReturn(mock(XmpPreferences.class));
         tempFile = tempFolder.resolve("temporaryFile");
         Files.createFile(tempFile);
 
@@ -101,9 +107,18 @@ void tearDown() {
     void deleteWhenFilePathNotPresentReturnsTrue() {
         // 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);
@@ -113,15 +128,26 @@ void deleteWhenFilePathNotPresentReturnsTrue() {
     @Test
     void deleteWhenRemoveChosenReturnsTrueButDoesNotDeletesFile() {
         linkedFile = new LinkedFile("", tempFile, "");
-        when(dialogService.showCustomButtonDialogAndWait(
+        when(
+            dialogService.showCustomButtonDialogAndWait(
                 any(AlertType.class),
                 anyString(),
                 anyString(),
                 any(ButtonType.class),
                 any(ButtonType.class),
-                any(ButtonType.class))).thenAnswer(invocation -> Optional.of(invocation.getArgument(3))); // first vararg - remove button
-
-        LinkedFileViewModel viewModel = new LinkedFileViewModel(linkedFile, entry, databaseContext, taskExecutor, dialogService, preferences);
+                any(ButtonType.class)
+            )
+        )
+            .thenAnswer(invocation -> Optional.of(invocation.getArgument(3))); // first vararg - remove button
+
+        LinkedFileViewModel viewModel = new LinkedFileViewModel(
+            linkedFile,
+            entry,
+            databaseContext,
+            taskExecutor,
+            dialogService,
+            preferences
+        );
         boolean removed = viewModel.delete();
 
         assertTrue(removed);
@@ -131,15 +157,26 @@ void deleteWhenRemoveChosenReturnsTrueButDoesNotDeletesFile() {
     @Test
     void deleteWhenDeleteChosenReturnsTrueAndDeletesFile() {
         linkedFile = new LinkedFile("", tempFile, "");
-        when(dialogService.showCustomButtonDialogAndWait(
+        when(
+            dialogService.showCustomButtonDialogAndWait(
                 any(AlertType.class),
                 anyString(),
                 anyString(),
                 any(ButtonType.class),
                 any(ButtonType.class),
-                any(ButtonType.class))).thenAnswer(invocation -> Optional.of(invocation.getArgument(4))); // second vararg - delete button
-
-        LinkedFileViewModel viewModel = new LinkedFileViewModel(linkedFile, entry, databaseContext, taskExecutor, dialogService, preferences);
+                any(ButtonType.class)
+            )
+        )
+            .thenAnswer(invocation -> Optional.of(invocation.getArgument(4))); // second vararg - delete button
+
+        LinkedFileViewModel viewModel = new LinkedFileViewModel(
+            linkedFile,
+            entry,
+            databaseContext,
+            taskExecutor,
+            dialogService,
+            preferences
+        );
         boolean removed = viewModel.delete();
 
         assertTrue(removed);
@@ -149,15 +186,26 @@ void deleteWhenDeleteChosenReturnsTrueAndDeletesFile() {
     @Test
     void deleteMissingFileReturnsTrue() {
         linkedFile = new LinkedFile("", Path.of("!!nonexistent file!!"), "");
-        when(dialogService.showCustomButtonDialogAndWait(
+        when(
+            dialogService.showCustomButtonDialogAndWait(
                 any(AlertType.class),
                 anyString(),
                 anyString(),
                 any(ButtonType.class),
                 any(ButtonType.class),
-                any(ButtonType.class))).thenAnswer(invocation -> Optional.of(invocation.getArgument(4))); // second vararg - delete button
-
-        LinkedFileViewModel viewModel = new LinkedFileViewModel(linkedFile, entry, databaseContext, taskExecutor, dialogService, preferences);
+                any(ButtonType.class)
+            )
+        )
+            .thenAnswer(invocation -> Optional.of(invocation.getArgument(4))); // second vararg - delete button
+
+        LinkedFileViewModel viewModel = new LinkedFileViewModel(
+            linkedFile,
+            entry,
+            databaseContext,
+            taskExecutor,
+            dialogService,
+            preferences
+        );
         boolean removed = viewModel.delete();
 
         assertTrue(removed);
@@ -166,15 +214,26 @@ void deleteMissingFileReturnsTrue() {
     @Test
     void deleteWhenDialogCancelledReturnsFalseAndDoesNotRemoveFile() {
         linkedFile = new LinkedFile("desc", tempFile, "pdf");
-        when(dialogService.showCustomButtonDialogAndWait(
+        when(
+            dialogService.showCustomButtonDialogAndWait(
                 any(AlertType.class),
                 anyString(),
                 anyString(),
                 any(ButtonType.class),
                 any(ButtonType.class),
-                any(ButtonType.class))).thenAnswer(invocation -> Optional.of(invocation.getArgument(5))); // third vararg - cancel button
-
-        LinkedFileViewModel viewModel = new LinkedFileViewModel(linkedFile, entry, databaseContext, taskExecutor, dialogService, preferences);
+                any(ButtonType.class)
+            )
+        )
+            .thenAnswer(invocation -> Optional.of(invocation.getArgument(5))); // third vararg - cancel button
+
+        LinkedFileViewModel viewModel = new LinkedFileViewModel(
+            linkedFile,
+            entry,
+            databaseContext,
+            taskExecutor,
+            dialogService,
+            preferences
+        );
         boolean removed = viewModel.delete();
 
         assertFalse(removed);
@@ -183,54 +242,91 @@ void deleteWhenDialogCancelledReturnsFalseAndDoesNotRemoveFile() {
 
     @Test
     void downloadHtmlFileCausesWarningDisplay() throws MalformedURLException {
-        when(filePreferences.shouldStoreFilesRelativeToBibFile()).thenReturn(true);
+        when(filePreferences.shouldStoreFilesRelativeToBibFile())
+            .thenReturn(true);
         when(filePreferences.getFileNamePattern()).thenReturn("[citationkey]");
-        when(filePreferences.getFileDirectoryPattern()).thenReturn("[entrytype]");
+        when(filePreferences.getFileDirectoryPattern())
+            .thenReturn("[entrytype]");
         databaseContext.setDatabasePath(tempFile);
 
         URL url = new URL("https://www.google.com/");
         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();
 
-        verify(dialogService, atLeastOnce()).notify("Downloaded website as an HTML file.");
+        verify(dialogService, atLeastOnce())
+            .notify("Downloaded website as an HTML file.");
     }
 
     @FetcherTest
     @Test
     void downloadOfFileReplacesLink(@TempDir Path tempFolder) throws Exception {
-        linkedFile = new LinkedFile(new URL("http://arxiv.org/pdf/1207.0408v1"), "");
+        linkedFile =
+            new LinkedFile(new URL("http://arxiv.org/pdf/1207.0408v1"), "");
         entry.setFiles(new ArrayList<>(List.of(linkedFile)));
 
         databaseContext = mock(BibDatabaseContext.class);
-        when(databaseContext.getFirstExistingFileDir(any())).thenReturn(Optional.of(tempFolder));
+        when(databaseContext.getFirstExistingFileDir(any()))
+            .thenReturn(Optional.of(tempFolder));
 
         when(filePreferences.getFileNamePattern()).thenReturn("[citationkey]");
         when(filePreferences.getFileDirectoryPattern()).thenReturn("");
 
-        LinkedFileViewModel viewModel = new LinkedFileViewModel(linkedFile, entry, databaseContext, new CurrentThreadTaskExecutor(), dialogService, preferences);
+        LinkedFileViewModel viewModel = new LinkedFileViewModel(
+            linkedFile,
+            entry,
+            databaseContext,
+            new CurrentThreadTaskExecutor(),
+            dialogService,
+            preferences
+        );
         viewModel.download();
 
-        assertEquals(List.of(new LinkedFile("", tempFolder.resolve("asdf.pdf"), "PDF")), entry.getFiles());
+        assertEquals(
+            List.of(new LinkedFile("", tempFolder.resolve("asdf.pdf"), "PDF")),
+            entry.getFiles()
+        );
     }
 
     @FetcherTest
     @Test
     void downloadDoesNotOverwriteFileTypeExtension() throws Exception {
-        linkedFile = new LinkedFile(new URL("http://arxiv.org/pdf/1207.0408v1"), "");
+        linkedFile =
+            new LinkedFile(new URL("http://arxiv.org/pdf/1207.0408v1"), "");
 
         databaseContext = mock(BibDatabaseContext.class);
         when(filePreferences.getFileNamePattern()).thenReturn("[citationkey]");
         when(filePreferences.getFileDirectoryPattern()).thenReturn("");
 
-        LinkedFileViewModel viewModel = new LinkedFileViewModel(linkedFile, entry, databaseContext, new CurrentThreadTaskExecutor(), dialogService, preferences);
-
-        BackgroundTask<Path> task = viewModel.prepareDownloadTask(tempFile.getParent(), new URLDownload("http://arxiv.org/pdf/1207.0408v1"));
+        LinkedFileViewModel viewModel = new LinkedFileViewModel(
+            linkedFile,
+            entry,
+            databaseContext,
+            new CurrentThreadTaskExecutor(),
+            dialogService,
+            preferences
+        );
+
+        BackgroundTask<Path> task = viewModel.prepareDownloadTask(
+            tempFile.getParent(),
+            new URLDownload("http://arxiv.org/pdf/1207.0408v1")
+        );
         task.onSuccess(destination -> {
-            LinkedFile newLinkedFile = LinkedFilesEditorViewModel.fromFile(destination, Collections.singletonList(tempFile.getParent()), filePreferences);
+            LinkedFile newLinkedFile = LinkedFilesEditorViewModel.fromFile(
+                destination,
+                Collections.singletonList(tempFile.getParent()),
+                filePreferences
+            );
             assertEquals("asdf.pdf", newLinkedFile.getLink());
             assertEquals("PDF", newLinkedFile.getFileType());
         });
@@ -246,19 +342,28 @@ void downloadHtmlWhenLinkedFilePointsToHtml() throws MalformedURLException {
         String fileType = StandardExternalFileType.URL.getName();
         linkedFile = new LinkedFile(new URL(url), fileType);
 
-        when(filePreferences.shouldStoreFilesRelativeToBibFile()).thenReturn(true);
+        when(filePreferences.shouldStoreFilesRelativeToBibFile())
+            .thenReturn(true);
         when(filePreferences.getFileNamePattern()).thenReturn("[citationkey]");
-        when(filePreferences.getFileDirectoryPattern()).thenReturn("[entrytype]");
+        when(filePreferences.getFileDirectoryPattern())
+            .thenReturn("[entrytype]");
 
         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
+        );
 
         viewModel.download();
 
         List<LinkedFile> linkedFiles = entry.getFiles();
 
-        for (LinkedFile file: linkedFiles) {
+        for (LinkedFile file : linkedFiles) {
             if ("Misc/asdf.html".equalsIgnoreCase(file.getLink())) {
                 assertEquals("URL", file.getFileType());
                 return;
@@ -274,9 +379,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());
     }
 
@@ -286,9 +399,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());
     }
 
@@ -298,10 +419,19 @@ void isNotSamePathWithPattern() {
         linkedFile = new LinkedFile("desc", tempFile, "pdf");
         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(filePreferences.getFileDirectoryPattern())
+            .thenReturn("[entrytype]");
+        when(databaseContext.getFirstExistingFileDir(filePreferences))
+            .thenReturn(Optional.of(tempFile.getParent()));
+
+        LinkedFileViewModel viewModel = new LinkedFileViewModel(
+            linkedFile,
+            entry,
+            databaseContext,
+            taskExecutor,
+            dialogService,
+            preferences
+        );
         assertFalse(viewModel.isGeneratedPathSameAsOriginal());
     }
 
@@ -311,36 +441,65 @@ void isSamePathWithPattern() throws IOException {
         linkedFile = new LinkedFile("desc", tempFile, "pdf");
         databaseContext = mock(BibDatabaseContext.class);
         when(filePreferences.getFileNamePattern()).thenReturn("[citationkey]");
-        when(filePreferences.getFileDirectoryPattern()).thenReturn("[entrytype]");
-        when(databaseContext.getFirstExistingFileDir(filePreferences)).thenReturn(Optional.of(tempFile.getParent()));
-
-        LinkedFileHandler fileHandler = new LinkedFileHandler(linkedFile, entry, databaseContext, filePreferences);
+        when(filePreferences.getFileDirectoryPattern())
+            .thenReturn("[entrytype]");
+        when(databaseContext.getFirstExistingFileDir(filePreferences))
+            .thenReturn(Optional.of(tempFile.getParent()));
+
+        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", filePreferences);
+        Optional<ExternalFileType> test =
+            ExternalFileTypes.getExternalFileTypeByMimeType(
+                "text/html; charset=UTF-8",
+                filePreferences
+            );
         String actual = test.get().toString();
         assertEquals("URL", actual);
     }
 
     @Test
     @FetcherTest
-    void downloadPdfFileWhenLinkedFilePointsToPdfUrl() throws MalformedURLException {
-        linkedFile = new LinkedFile(new URL("http://arxiv.org/pdf/1207.0408v1"), "pdf");
+    void downloadPdfFileWhenLinkedFilePointsToPdfUrl()
+        throws MalformedURLException {
+        linkedFile =
+            new LinkedFile(new URL("http://arxiv.org/pdf/1207.0408v1"), "pdf");
         // Needed Mockito stubbing methods to run test
-        when(filePreferences.shouldStoreFilesRelativeToBibFile()).thenReturn(true);
+        when(filePreferences.shouldStoreFilesRelativeToBibFile())
+            .thenReturn(true);
         when(filePreferences.getFileNamePattern()).thenReturn("[citationkey]");
-        when(filePreferences.getFileDirectoryPattern()).thenReturn("[entrytype]");
+        when(filePreferences.getFileDirectoryPattern())
+            .thenReturn("[entrytype]");
 
         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
+        );
         viewModel.download();
 
         // Loop through downloaded files to check for filetype='pdf'
diff --git a/src/test/java/org/jabref/gui/fieldeditors/LinkedFilesEditorViewModelTest.java b/src/test/java/org/jabref/gui/fieldeditors/LinkedFilesEditorViewModelTest.java
index 584fdcdadf0..07d38740622 100644
--- a/src/test/java/org/jabref/gui/fieldeditors/LinkedFilesEditorViewModelTest.java
+++ b/src/test/java/org/jabref/gui/fieldeditors/LinkedFilesEditorViewModelTest.java
@@ -1,13 +1,15 @@
 package org.jabref.gui.fieldeditors;
 
+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;
-
 import javafx.collections.FXCollections;
-
+import javax.swing.undo.UndoManager;
 import org.jabref.gui.DialogService;
 import org.jabref.gui.autocompleter.EmptySuggestionProvider;
 import org.jabref.gui.externalfiletype.StandardExternalFileType;
@@ -19,38 +21,59 @@
 import org.jabref.preferences.FilePreferences;
 import org.jabref.preferences.PreferencesService;
 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;
-
 @FetcherTest("Downloads a PDF file")
 class LinkedFilesEditorViewModelTest {
+
     private LinkedFilesEditorViewModel viewModel;
-    private final PreferencesService preferencesService = mock(PreferencesService.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 PreferencesService preferencesService = mock(
+        PreferencesService.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);
 
     @Test
     void urlFieldShouldDownloadFile(@TempDir Path tempDir) {
-        when(preferencesService.getFilePreferences()).thenReturn(filePreferences);
-        when(filePreferences.getExternalFileTypes()).thenReturn(FXCollections.observableSet(StandardExternalFileType.values()));
+        when(preferencesService.getFilePreferences())
+            .thenReturn(filePreferences);
+        when(filePreferences.getExternalFileTypes())
+            .thenReturn(
+                FXCollections.observableSet(StandardExternalFileType.values())
+            );
         when(filePreferences.getFileNamePattern()).thenReturn("[bibtexkey]");
         when(filePreferences.getFileDirectoryPattern()).thenReturn("");
-        when(bibDatabaseContext.getFirstExistingFileDir(any())).thenReturn(Optional.of(tempDir));
+        when(bibDatabaseContext.getFirstExistingFileDir(any()))
+            .thenReturn(Optional.of(tempDir));
 
-        viewModel = new LinkedFilesEditorViewModel(StandardField.FILE, new EmptySuggestionProvider(), mock(DialogService.class), bibDatabaseContext,
-                           new CurrentThreadTaskExecutor(), mock(FieldCheckers.class), preferencesService, undoManager);
+        viewModel =
+            new LinkedFilesEditorViewModel(
+                StandardField.FILE,
+                new EmptySuggestionProvider(),
+                mock(DialogService.class),
+                bibDatabaseContext,
+                new CurrentThreadTaskExecutor(),
+                mock(FieldCheckers.class),
+                preferencesService,
+                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/GroupDialogViewModelTest.java b/src/test/java/org/jabref/gui/groups/GroupDialogViewModelTest.java
index 6022ef4d7c5..5572aca3836 100644
--- a/src/test/java/org/jabref/gui/groups/GroupDialogViewModelTest.java
+++ b/src/test/java/org/jabref/gui/groups/GroupDialogViewModelTest.java
@@ -1,9 +1,15 @@
 package org.jabref.gui.groups;
 
+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;
-
 import org.jabref.gui.DialogService;
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.groups.AbstractGroup;
@@ -13,28 +19,24 @@
 import org.jabref.preferences.BibEntryPreferences;
 import org.jabref.preferences.FilePreferences;
 import org.jabref.preferences.PreferencesService;
-
 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;
-
 class GroupDialogViewModelTest {
 
     private GroupDialogViewModel viewModel;
     private Path temporaryFolder;
     private BibDatabaseContext bibDatabaseContext;
     private final MetaData metaData = mock(MetaData.class);
-    private final GroupsPreferences groupsPreferences = mock(GroupsPreferences.class);
+    private final GroupsPreferences groupsPreferences = mock(
+        GroupsPreferences.class
+    );
     private final DialogService dialogService = mock(DialogService.class);
     private final AbstractGroup group = mock(AbstractGroup.class);
-    private final PreferencesService preferencesService = mock(PreferencesService.class);
+    private final PreferencesService preferencesService = mock(
+        PreferencesService.class
+    );
 
     @BeforeEach
     void setUp(@TempDir Path temporaryFolder) {
@@ -43,15 +45,27 @@ void setUp(@TempDir Path temporaryFolder) {
 
         when(group.getName()).thenReturn("Group");
 
-        when(preferencesService.getBibEntryPreferences()).thenReturn(mock(BibEntryPreferences.class));
-        when(preferencesService.getBibEntryPreferences().getKeywordSeparator()).thenReturn(',');
-        when(preferencesService.getFilePreferences()).thenReturn(mock(FilePreferences.class));
-        when(preferencesService.getFilePreferences().getUserAndHost()).thenReturn("MockedUser-mockedhost");
-        when(preferencesService.getGroupsPreferences()).thenReturn(groupsPreferences);
+        when(preferencesService.getBibEntryPreferences())
+            .thenReturn(mock(BibEntryPreferences.class));
+        when(preferencesService.getBibEntryPreferences().getKeywordSeparator())
+            .thenReturn(',');
+        when(preferencesService.getFilePreferences())
+            .thenReturn(mock(FilePreferences.class));
+        when(preferencesService.getFilePreferences().getUserAndHost())
+            .thenReturn("MockedUser-mockedhost");
+        when(preferencesService.getGroupsPreferences())
+            .thenReturn(groupsPreferences);
 
         bibDatabaseContext.setMetaData(metaData);
 
-        viewModel = new GroupDialogViewModel(dialogService, bibDatabaseContext, preferencesService, group, new DummyFileUpdateMonitor());
+        viewModel =
+            new GroupDialogViewModel(
+                dialogService,
+                bibDatabaseContext,
+                preferencesService,
+                group,
+                new DummyFileUpdateMonitor()
+            );
     }
 
     @Test
@@ -59,7 +73,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());
@@ -67,7 +82,9 @@ void validateExistingAbsolutePath() throws Exception {
 
     @Test
     void validateNonExistingAbsolutePath() {
-        var notAnAuxFile = temporaryFolder.resolve("notanauxfile.aux").toAbsolutePath();
+        var notAnAuxFile = temporaryFolder
+            .resolve("notanauxfile.aux")
+            .toAbsolutePath();
         viewModel.texGroupFilePathProperty().setValue(notAnAuxFile.toString());
         assertFalse(viewModel.texGroupFilePathValidatonStatus().isValid());
     }
@@ -78,7 +95,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());
@@ -88,17 +106,43 @@ void validateExistingRelativePath() throws Exception {
     void testHierarchicalContextFromGroup() throws Exception {
         GroupHierarchyType groupHierarchyType = GroupHierarchyType.INCLUDING;
         when(group.getHierarchicalContext()).thenReturn(groupHierarchyType);
-        viewModel = new GroupDialogViewModel(dialogService, bibDatabaseContext, preferencesService, group, new DummyFileUpdateMonitor());
-
-        assertEquals(groupHierarchyType, viewModel.groupHierarchySelectedProperty().getValue());
+        viewModel =
+            new GroupDialogViewModel(
+                dialogService,
+                bibDatabaseContext,
+                preferencesService,
+                group,
+                new DummyFileUpdateMonitor()
+            );
+
+        assertEquals(
+            groupHierarchyType,
+            viewModel.groupHierarchySelectedProperty().getValue()
+        );
     }
 
     @Test
     void testDefaultHierarchicalContext() throws Exception {
-        GroupHierarchyType defaultHierarchicalContext = GroupHierarchyType.REFINING;
-        when(preferencesService.getGroupsPreferences().getDefaultHierarchicalContext()).thenReturn(defaultHierarchicalContext);
-        viewModel = new GroupDialogViewModel(dialogService, bibDatabaseContext, preferencesService, null, new DummyFileUpdateMonitor());
-
-        assertEquals(defaultHierarchicalContext, viewModel.groupHierarchySelectedProperty().getValue());
+        GroupHierarchyType defaultHierarchicalContext =
+            GroupHierarchyType.REFINING;
+        when(
+            preferencesService
+                .getGroupsPreferences()
+                .getDefaultHierarchicalContext()
+        )
+            .thenReturn(defaultHierarchicalContext);
+        viewModel =
+            new GroupDialogViewModel(
+                dialogService,
+                bibDatabaseContext,
+                preferencesService,
+                null,
+                new DummyFileUpdateMonitor()
+            );
+
+        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 f05b398d285..80b4b7a6418 100644
--- a/src/test/java/org/jabref/gui/groups/GroupNodeViewModelTest.java
+++ b/src/test/java/org/jabref/gui/groups/GroupNodeViewModelTest.java
@@ -1,10 +1,13 @@
 package org.jabref.gui.groups;
 
-import java.util.Arrays;
+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 javafx.collections.FXCollections;
 import javafx.collections.ObservableList;
-
 import org.jabref.gui.StateManager;
 import org.jabref.gui.util.CurrentThreadTaskExecutor;
 import org.jabref.gui.util.CustomLocalDragboard;
@@ -20,15 +23,9 @@
 import org.jabref.model.groups.GroupTreeNode;
 import org.jabref.model.groups.WordKeywordGroup;
 import org.jabref.preferences.PreferencesService;
-
 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;
-
 class GroupNodeViewModelTest {
 
     private StateManager stateManager;
@@ -40,25 +37,48 @@ class GroupNodeViewModelTest {
     @BeforeEach
     void setUp() {
         stateManager = mock(StateManager.class);
-        when(stateManager.getSelectedEntries()).thenReturn(FXCollections.emptyObservableList());
+        when(stateManager.getSelectedEntries())
+            .thenReturn(FXCollections.emptyObservableList());
         databaseContext = new BibDatabaseContext();
         taskExecutor = new CurrentThreadTaskExecutor();
         preferencesService = mock(PreferencesService.class);
-        when(preferencesService.getGroupsPreferences()).thenReturn(new GroupsPreferences(
-                GroupViewMode.UNION,
-                true,
-                true,
-                GroupHierarchyType.INDEPENDENT
-        ));
-
-        viewModel = getViewModelForGroup(
-                new WordKeywordGroup("Test group", GroupHierarchyType.INDEPENDENT, StandardField.TITLE, "search", true, ',', false));
+        when(preferencesService.getGroupsPreferences())
+            .thenReturn(
+                new GroupsPreferences(
+                    GroupViewMode.UNION,
+                    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));
+            new WordKeywordGroup(
+                "\\beta",
+                GroupHierarchyType.INDEPENDENT,
+                StandardField.TITLE,
+                "search",
+                true,
+                ',',
+                false
+            )
+        );
         assertEquals("β", viewModel.getDisplayName());
     }
 
@@ -74,21 +94,88 @@ void isMatchedIfContainsPartOfSearchString() {
 
     @Test
     void treeOfAutomaticKeywordGroupIsCombined() {
-        BibEntry entryOne = new BibEntry().withField(StandardField.KEYWORDS, "A > B > B1, A > C");
-        BibEntry entryTwo = new BibEntry().withField(StandardField.KEYWORDS, "A > D, E");
-        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, ',', '>');
+        BibEntry entryOne = new BibEntry()
+            .withField(StandardField.KEYWORDS, "A > B > B1, A > C");
+        BibEntry entryTwo = new BibEntry()
+            .withField(StandardField.KEYWORDS, "A > D, E");
+        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,
+            ',',
+            '>'
+        );
         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);
@@ -96,90 +183,297 @@ 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));
-
-        groupCViewModel.draggedOn(groupAViewModel, DroppingMouseLocation.BOTTOM);
-
-        assertEquals(Arrays.asList(groupAViewModel, groupCViewModel, groupBViewModel), rootViewModel.getChildren());
+        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()
+        );
     }
 
     @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));
-
-        groupAViewModel.draggedOn(groupBViewModel, DroppingMouseLocation.BOTTOM);
-
-        assertEquals(Arrays.asList(groupBViewModel, groupAViewModel, groupCViewModel), rootViewModel.getChildren());
+        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()
+        );
     }
 
     @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
     void entriesAreAddedCorrectly() {
         String groupName = "group";
-        ExplicitGroup group = new ExplicitGroup(groupName, GroupHierarchyType.INDEPENDENT, ',');
+        ExplicitGroup group = new ExplicitGroup(
+            groupName,
+            GroupHierarchyType.INDEPENDENT,
+            ','
+        );
         BibEntry entry = new BibEntry();
         databaseContext.getDatabase().insertEntry(entry);
 
-        GroupNodeViewModel model = new GroupNodeViewModel(databaseContext, stateManager, taskExecutor, group, new CustomLocalDragboard(), preferencesService);
+        GroupNodeViewModel model = new GroupNodeViewModel(
+            databaseContext,
+            stateManager,
+            taskExecutor,
+            group,
+            new CustomLocalDragboard(),
+            preferencesService
+        );
         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(), preferencesService);
+        return new GroupNodeViewModel(
+            databaseContext,
+            stateManager,
+            taskExecutor,
+            group,
+            new CustomLocalDragboard(),
+            preferencesService
+        );
     }
 
     private GroupNodeViewModel getViewModelForGroup(GroupTreeNode group) {
-        return new GroupNodeViewModel(databaseContext, stateManager, taskExecutor, group, new CustomLocalDragboard(), preferencesService);
+        return new GroupNodeViewModel(
+            databaseContext,
+            stateManager,
+            taskExecutor,
+            group,
+            new CustomLocalDragboard(),
+            preferencesService
+        );
     }
 }
diff --git a/src/test/java/org/jabref/gui/groups/GroupTreeViewModelTest.java b/src/test/java/org/jabref/gui/groups/GroupTreeViewModelTest.java
index bdfe4b85bee..7741c7637f5 100644
--- a/src/test/java/org/jabref/gui/groups/GroupTreeViewModelTest.java
+++ b/src/test/java/org/jabref/gui/groups/GroupTreeViewModelTest.java
@@ -1,7 +1,12 @@
 package org.jabref.gui.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 static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
 
+import java.util.Optional;
 import org.jabref.gui.DialogService;
 import org.jabref.gui.StateManager;
 import org.jabref.gui.util.CurrentThreadTaskExecutor;
@@ -16,17 +21,10 @@
 import org.jabref.model.groups.GroupHierarchyType;
 import org.jabref.model.groups.WordKeywordGroup;
 import org.jabref.preferences.PreferencesService;
-
 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;
-
 class GroupTreeViewModelTest {
 
     private StateManager stateManager;
@@ -40,37 +38,74 @@ class GroupTreeViewModelTest {
     void setUp() {
         databaseContext = new BibDatabaseContext();
         stateManager = new StateManager();
-        stateManager.activeDatabaseProperty().setValue(Optional.of(databaseContext));
+        stateManager
+            .activeDatabaseProperty()
+            .setValue(Optional.of(databaseContext));
         taskExecutor = new CurrentThreadTaskExecutor();
         preferencesService = mock(PreferencesService.class);
         dialogService = mock(DialogService.class, Answers.RETURNS_DEEP_STUBS);
 
-        when(preferencesService.getGroupsPreferences()).thenReturn(new GroupsPreferences(
-                GroupViewMode.UNION,
-                true,
-                true,
-                GroupHierarchyType.INDEPENDENT));
-        groupTree = new GroupTreeViewModel(stateManager, mock(DialogService.class), preferencesService, taskExecutor, new CustomLocalDragboard());
+        when(preferencesService.getGroupsPreferences())
+            .thenReturn(
+                new GroupsPreferences(
+                    GroupViewMode.UNION,
+                    true,
+                    true,
+                    GroupHierarchyType.INDEPENDENT
+                )
+            );
+        groupTree =
+            new GroupTreeViewModel(
+                stateManager,
+                mock(DialogService.class),
+                preferencesService,
+                taskExecutor,
+                new CustomLocalDragboard()
+            );
     }
 
     @Test
     void rootGroupIsAllEntriesByDefault() {
         AllEntriesGroup allEntriesGroup = new AllEntriesGroup("All entries");
-        assertEquals(new GroupNodeViewModel(databaseContext, stateManager, taskExecutor, allEntriesGroup, new CustomLocalDragboard(), preferencesService), groupTree.rootGroupProperty().getValue());
+        assertEquals(
+            new GroupNodeViewModel(
+                databaseContext,
+                stateManager,
+                taskExecutor,
+                allEntriesGroup,
+                new CustomLocalDragboard(),
+                preferencesService
+            ),
+            groupTree.rootGroupProperty().getValue()
+        );
     }
 
     @Test
     void rootGroupIsSelectedByDefault() {
-        assertEquals(groupTree.rootGroupProperty().get().getGroupNode(), stateManager.getSelectedGroup(databaseContext).get(0));
+        assertEquals(
+            groupTree.rootGroupProperty().get().getGroupNode(),
+            stateManager.getSelectedGroup(databaseContext).get(0)
+        );
     }
 
     @Test
     void explicitGroupsAreRemovedFromEntriesOnDelete() {
-        ExplicitGroup group = new ExplicitGroup("group", GroupHierarchyType.INDEPENDENT, ',');
+        ExplicitGroup group = new ExplicitGroup(
+            "group",
+            GroupHierarchyType.INDEPENDENT,
+            ','
+        );
         BibEntry entry = new BibEntry();
         databaseContext.getDatabase().insertEntry(entry);
 
-        GroupNodeViewModel model = new GroupNodeViewModel(databaseContext, stateManager, taskExecutor, group, new CustomLocalDragboard(), preferencesService);
+        GroupNodeViewModel model = new GroupNodeViewModel(
+            databaseContext,
+            stateManager,
+            taskExecutor,
+            group,
+            new CustomLocalDragboard(),
+            preferencesService
+        );
         model.addEntriesToGroup(databaseContext.getEntries());
         groupTree.removeGroupsAndSubGroupsFromEntries(model);
 
@@ -80,11 +115,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(), preferencesService);
+        GroupNodeViewModel model = new GroupNodeViewModel(
+            databaseContext,
+            stateManager,
+            taskExecutor,
+            group,
+            new CustomLocalDragboard(),
+            preferencesService
+        );
         model.addEntriesToGroup(databaseContext.getEntries());
         groupTree.removeGroupsAndSubGroupsFromEntries(model);
 
@@ -93,48 +143,128 @@ void keywordGroupsAreNotRemovedFromEntriesOnDelete() {
 
     @Test
     void shouldNotShowDialogWhenGroupNameChanges() {
-        AbstractGroup oldGroup = new ExplicitGroup("group", GroupHierarchyType.INDEPENDENT, ',');
-        AbstractGroup newGroup = new ExplicitGroup("newGroupName", GroupHierarchyType.INDEPENDENT, ',');
+        AbstractGroup oldGroup = new ExplicitGroup(
+            "group",
+            GroupHierarchyType.INDEPENDENT,
+            ','
+        );
+        AbstractGroup newGroup = new ExplicitGroup(
+            "newGroupName",
+            GroupHierarchyType.INDEPENDENT,
+            ','
+        );
         BibEntry entry = new BibEntry();
         databaseContext.getDatabase().insertEntry(entry);
 
-        GroupTreeViewModel model = new GroupTreeViewModel(stateManager, dialogService, preferencesService, taskExecutor, new CustomLocalDragboard());
+        GroupTreeViewModel model = new GroupTreeViewModel(
+            stateManager,
+            dialogService,
+            preferencesService,
+            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, preferencesService, taskExecutor, new CustomLocalDragboard());
+        GroupTreeViewModel model = new GroupTreeViewModel(
+            stateManager,
+            dialogService,
+            preferencesService,
+            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, preferencesService, taskExecutor, new CustomLocalDragboard());
+        GroupTreeViewModel model = new GroupTreeViewModel(
+            stateManager,
+            dialogService,
+            preferencesService,
+            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, preferencesService, taskExecutor, new CustomLocalDragboard());
+        GroupTreeViewModel model = new GroupTreeViewModel(
+            stateManager,
+            dialogService,
+            preferencesService,
+            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 079bb6c1388..e6777203f6f 100644
--- a/src/test/java/org/jabref/gui/importer/NewEntryActionTest.java
+++ b/src/test/java/org/jabref/gui/importer/NewEntryActionTest.java
@@ -1,5 +1,12 @@
 package org.jabref.gui.importer;
 
+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 org.jabref.gui.DialogService;
 import org.jabref.gui.EntryTypeView;
 import org.jabref.gui.JabRefFrame;
@@ -10,31 +17,32 @@
 import org.jabref.model.entry.types.EntryType;
 import org.jabref.model.entry.types.StandardEntryType;
 import org.jabref.preferences.PreferencesService;
-
 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;
-
 public class NewEntryActionTest {
 
     private NewEntryAction newEntryAction;
     private LibraryTab libraryTab = mock(LibraryTab.class);
     private JabRefFrame jabRefFrame = mock(JabRefFrame.class);
     private DialogService dialogService = spy(DialogService.class);
-    private PreferencesService preferencesService = mock(PreferencesService.class);
+    private PreferencesService preferencesService = mock(
+        PreferencesService.class
+    );
     private StateManager stateManager = mock(StateManager.class);
 
     @BeforeEach
     public void setUp() {
         when(jabRefFrame.getCurrentLibraryTab()).thenReturn(libraryTab);
-        when(stateManager.activeDatabaseProperty()).thenReturn(OptionalObjectProperty.empty());
-        newEntryAction = new NewEntryAction(jabRefFrame, dialogService, preferencesService, stateManager);
+        when(stateManager.activeDatabaseProperty())
+            .thenReturn(OptionalObjectProperty.empty());
+        newEntryAction =
+            new NewEntryAction(
+                jabRefFrame,
+                dialogService,
+                preferencesService,
+                stateManager
+            );
     }
 
     @Test
@@ -43,13 +51,21 @@ public void testExecuteIfNoBasePanel() {
 
         newEntryAction.execute();
         verify(libraryTab, times(0)).insertEntry(any(BibEntry.class));
-        verify(dialogService, times(0)).showCustomDialogAndWait(any(EntryTypeView.class));
+        verify(dialogService, times(0))
+            .showCustomDialogAndWait(any(EntryTypeView.class));
     }
 
     @Test
     public void testExecuteOnSuccessWithFixedType() {
         EntryType type = StandardEntryType.Article;
-        newEntryAction = new NewEntryAction(jabRefFrame, type, dialogService, preferencesService, stateManager);
+        newEntryAction =
+            new NewEntryAction(
+                jabRefFrame,
+                type,
+                dialogService,
+                preferencesService,
+                stateManager
+            );
         when(jabRefFrame.getBasePanelCount()).thenReturn(1);
 
         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 4c1d900b1c0..85f06873103 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.preferences.PreferencesService;
-
 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 PreferencesService preferencesService;
@@ -21,82 +20,120 @@ class WebSearchPaneViewModelTest {
 
     @BeforeEach
     void setUp() {
-        preferencesService = Mockito.mock(PreferencesService.class, RETURNS_DEEP_STUBS);
+        preferencesService =
+            Mockito.mock(PreferencesService.class, RETURNS_DEEP_STUBS);
         dialogService = Mockito.mock(DialogService.class);
         stateManager = Mockito.mock(StateManager.class);
 
-        viewModel = new WebSearchPaneViewModel(preferencesService, dialogService, stateManager);
+        viewModel =
+            new WebSearchPaneViewModel(
+                preferencesService,
+                dialogService,
+                stateManager
+            );
     }
 
     @Test
     void queryConsistingOfASingleAndIsNotValid() {
         viewModel.queryProperty().setValue("AND");
-        assertFalse(viewModel.queryValidationStatus().validProperty().getValue());
+        assertFalse(
+            viewModel.queryValidationStatus().validProperty().getValue()
+        );
     }
 
     @Test
     void falseQueryValidationStatus() {
         viewModel.queryProperty().setValue("Miami !Beach AND OR Blue");
-        assertFalse(viewModel.queryValidationStatus().validProperty().getValue());
+        assertFalse(
+            viewModel.queryValidationStatus().validProperty().getValue()
+        );
     }
 
-     @Test
-     void correctQueryValidationStatus() {
-        viewModel.queryProperty().setValue("Miami AND Beach OR Houston AND Texas");
-        assertTrue(viewModel.queryValidationStatus().validProperty().getValue());
+    @Test
+    void correctQueryValidationStatus() {
+        viewModel
+            .queryProperty()
+            .setValue("Miami AND Beach OR Houston AND Texas");
+        assertTrue(
+            viewModel.queryValidationStatus().validProperty().getValue()
+        );
     }
 
     @Test
     void notFalseQueryValidationStatus() {
         viewModel.queryProperty().setValue("Miami !Beach AND OR Blue");
-        assertTrue(viewModel.queryValidationStatus().validProperty().not().getValue());
+        assertTrue(
+            viewModel.queryValidationStatus().validProperty().not().getValue()
+        );
     }
 
     @Test
     void notCorrectQueryValidationStatus() {
-        viewModel.queryProperty().setValue("Miami AND Beach OR Houston AND Texas");
-        assertFalse(viewModel.queryValidationStatus().validProperty().not().getValue());
+        viewModel
+            .queryProperty()
+            .setValue("Miami AND Beach OR Houston AND Texas");
+        assertFalse(
+            viewModel.queryValidationStatus().validProperty().not().getValue()
+        );
     }
 
     @Test
     void queryConsistingOfDOIIsValid() {
         viewModel.queryProperty().setValue("10.1007/JHEP02(2023)082");
-        assertTrue(viewModel.queryValidationStatus().validProperty().getValue());
+        assertTrue(
+            viewModel.queryValidationStatus().validProperty().getValue()
+        );
     }
 
     @Test
     void canExtractDOIFromQueryText() {
-        viewModel.queryProperty().setValue("this is the DOI: 10.1007/JHEP02(2023)082, other text");
-        assertTrue(viewModel.queryValidationStatus().validProperty().getValue());
+        viewModel
+            .queryProperty()
+            .setValue("this is the DOI: 10.1007/JHEP02(2023)082, other text");
+        assertTrue(
+            viewModel.queryValidationStatus().validProperty().getValue()
+        );
     }
 
     @Test
     void queryConsistingOfInvalidDOIIsInvalid() {
         viewModel.queryProperty().setValue("101.1007/JHEP02(2023)082");
-        assertFalse(viewModel.queryValidationStatus().validProperty().getValue());
+        assertFalse(
+            viewModel.queryValidationStatus().validProperty().getValue()
+        );
     }
 
     @Test
     void queryConsistingOfISBNIsValid() {
         viewModel.queryProperty().setValue("9780134685991");
-        assertTrue(viewModel.queryValidationStatus().validProperty().getValue());
+        assertTrue(
+            viewModel.queryValidationStatus().validProperty().getValue()
+        );
     }
 
     @Test
     void canExtractISBNFromQueryText() {
         viewModel.queryProperty().setValue(";:isbn (9780134685991), text2");
-        assertTrue(viewModel.queryValidationStatus().validProperty().getValue());
+        assertTrue(
+            viewModel.queryValidationStatus().validProperty().getValue()
+        );
     }
 
     @Test
     void queryConsistingOfArXivIdIsValid() {
         viewModel.queryProperty().setValue("arXiv:2110.02957");
-        assertTrue(viewModel.queryValidationStatus().validProperty().getValue());
+        assertTrue(
+            viewModel.queryValidationStatus().validProperty().getValue()
+        );
     }
 
     @Test
     void canExtractArXivIdFromQueryText() {
-        viewModel.queryProperty().setValue("this query contains an ArXiv identifier 2110.02957");
-        assertTrue(viewModel.queryValidationStatus().validProperty().getValue());
+        viewModel
+            .queryProperty()
+            .setValue("this query contains an ArXiv identifier 2110.02957");
+        assertTrue(
+            viewModel.queryValidationStatus().validProperty().getValue()
+        );
     }
 }
diff --git a/src/test/java/org/jabref/gui/keyboard/KeyBindingsTabModelTest.java b/src/test/java/org/jabref/gui/keyboard/KeyBindingsTabModelTest.java
index 2eb8da4ea63..11a23fbd03b 100644
--- a/src/test/java/org/jabref/gui/keyboard/KeyBindingsTabModelTest.java
+++ b/src/test/java/org/jabref/gui/keyboard/KeyBindingsTabModelTest.java
@@ -1,27 +1,24 @@
 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 java.util.Optional;
 import javafx.scene.input.KeyCode;
 import javafx.scene.input.KeyCombination;
 import javafx.scene.input.KeyEvent;
-
 import org.jabref.gui.DialogService;
 import org.jabref.gui.preferences.keybindings.KeyBindingViewModel;
 import org.jabref.gui.preferences.keybindings.KeyBindingsTabViewModel;
 import org.jabref.logic.util.OS;
 import org.jabref.preferences.PreferencesService;
-
 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;
-
 /**
  * Test class for the keybindings dialog view model
  */
@@ -33,64 +30,163 @@ class KeyBindingsTabModelTest {
     @BeforeEach
     void setUp() {
         keyBindingRepository = new KeyBindingRepository();
-        model = new KeyBindingsTabViewModel(keyBindingRepository, mock(DialogService.class), mock(PreferencesService.class));
+        model =
+            new KeyBindingsTabViewModel(
+                keyBindingRepository,
+                mock(DialogService.class),
+                mock(PreferencesService.class)
+            );
     }
 
     @Test
     void testInvalidKeyBindingIsNotSaved() {
         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 testSpecialKeysValidKeyBindingIsSaved() {
         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(keyBindingRepository.get(KeyBinding.IMPORT_INTO_NEW_DATABASE).get());
+        KeyCombination combination = KeyCombination.keyCombination(
+            keyBindingRepository.get(KeyBinding.IMPORT_INTO_NEW_DATABASE).get()
+        );
 
-        assertTrue(KeyBindingRepository.checkKeyCombinationEquality(combination, shortcutKeyEvent));
+        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 testKeyBindingCategory() {
-        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());
+        assertNull(
+            model.selectedKeyBindingProperty().get().get().getKeyBinding()
+        );
     }
 
     @Test
     void testRandomNewKeyKeyBindingInRepository() {
         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(keyBindingRepository.get(KeyBinding.CLEANUP).get());
-
-        assertTrue(KeyBindingRepository.checkKeyCombinationEquality(combination, shortcutKeyEvent));
-
-        assertFalse(KeyBindingRepository.checkKeyCombinationEquality(KeyCombination.valueOf(KeyBinding.CLEANUP.getDefaultKeyBinding()), shortcutKeyEvent));
+        KeyCombination combination = KeyCombination.keyCombination(
+            keyBindingRepository.get(KeyBinding.CLEANUP).get()
+        );
+
+        assertTrue(
+            KeyBindingRepository.checkKeyCombinationEquality(
+                combination,
+                shortcutKeyEvent
+            )
+        );
+
+        assertFalse(
+            KeyBindingRepository.checkKeyCombinationEquality(
+                KeyCombination.valueOf(
+                    KeyBinding.CLEANUP.getDefaultKeyBinding()
+                ),
+                shortcutKeyEvent
+            )
+        );
     }
 
     @Test
@@ -98,27 +194,64 @@ void testSaveNewKeyBindingsToPreferences() {
         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 testSaveNewSpecialKeysKeyBindingsToPreferences() {
         setKeyBindingViewModel(KeyBinding.ABBREVIATE);
-        KeyEvent shortcutKeyEvent = new KeyEvent(KeyEvent.KEY_PRESSED, "F1", "F1", KeyCode.F1, true, false, false,
-                false);
-
-        assertFalse(keyBindingRepository.checkKeyCombinationEquality(KeyBinding.ABBREVIATE, shortcutKeyEvent));
+        KeyEvent shortcutKeyEvent = new KeyEvent(
+            KeyEvent.KEY_PRESSED,
+            "F1",
+            "F1",
+            KeyCode.F1,
+            true,
+            false,
+            false,
+            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
@@ -126,58 +259,133 @@ void testSetAllKeyBindingsToDefault() {
         assumeFalse(OS.OS_X);
 
         setKeyBindingViewModel(KeyBinding.ABBREVIATE);
-        KeyEvent shortcutKeyEvent = new KeyEvent(KeyEvent.KEY_PRESSED, "C", "C", KeyCode.C, true, true, true, false);
-
-        assertFalse(keyBindingRepository.checkKeyCombinationEquality(KeyBinding.ABBREVIATE, shortcutKeyEvent));
+        KeyEvent shortcutKeyEvent = new KeyEvent(
+            KeyEvent.KEY_PRESSED,
+            "C",
+            "C",
+            KeyCode.C,
+            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
+            )
+        );
 
         keyBindingRepository.resetToDefault();
         model.storeSettings();
 
-        assertFalse(keyBindingRepository.checkKeyCombinationEquality(KeyBinding.ABBREVIATE, shortcutKeyEvent));
+        assertFalse(
+            keyBindingRepository.checkKeyCombinationEquality(
+                KeyBinding.ABBREVIATE,
+                shortcutKeyEvent
+            )
+        );
     }
 
     @Test
     void testCloseEntryEditorCloseEntryKeybinding() {
-        KeyBindingViewModel viewModel = setKeyBindingViewModel(KeyBinding.CLOSE);
+        KeyBindingViewModel viewModel = setKeyBindingViewModel(
+            KeyBinding.CLOSE
+        );
         model.selectedKeyBindingProperty().set(Optional.of(viewModel));
-        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());
+        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
     void testSetSingleKeyBindingToDefault() {
         assumeFalse(OS.OS_X);
 
-        KeyBindingViewModel viewModel = setKeyBindingViewModel(KeyBinding.ABBREVIATE);
+        KeyBindingViewModel viewModel = setKeyBindingViewModel(
+            KeyBinding.ABBREVIATE
+        );
         model.selectedKeyBindingProperty().set(Optional.of(viewModel));
-        KeyEvent shortcutKeyEvent = new KeyEvent(KeyEvent.KEY_PRESSED, "C", "C", KeyCode.C, true, true, true, false);
-
-        assertFalse(keyBindingRepository.checkKeyCombinationEquality(KeyBinding.ABBREVIATE, shortcutKeyEvent));
+        KeyEvent shortcutKeyEvent = new KeyEvent(
+            KeyEvent.KEY_PRESSED,
+            "C",
+            "C",
+            KeyCode.C,
+            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
+            )
+        );
 
         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 7280c3e33e1..4edb789604a 100644
--- a/src/test/java/org/jabref/gui/libraryproperties/constants/ConstantsPropertiesViewModelTest.java
+++ b/src/test/java/org/jabref/gui/libraryproperties/constants/ConstantsPropertiesViewModelTest.java
@@ -1,22 +1,19 @@
 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 java.util.List;
 import javafx.beans.property.StringProperty;
-
 import org.jabref.gui.DialogService;
 import org.jabref.model.database.BibDatabase;
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.entry.BibtexString;
 import org.jabref.preferences.FilePreferences;
-
 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;
-
 class ConstantsPropertiesViewModelTest {
 
     private DialogService service;
@@ -28,23 +25,37 @@ void setUp() {
         filePreferences = mock(FilePreferences.class);
     }
 
-    @DisplayName("Check that the list of strings is sorted according to their keys")
+    @DisplayName(
+        "Check that the list of strings is sorted according to their keys"
+    )
     @Test
     void testStringsListPropertySorting() {
-        BibtexString string1 = new BibtexString("TSE", "Transactions on Software Engineering");
-        BibtexString string2 = new BibtexString("ICSE", "International Conference on Software Engineering");
+        BibtexString string1 = new BibtexString(
+            "TSE",
+            "Transactions 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, filePreferences);
+        ConstantsPropertiesViewModel model = new ConstantsPropertiesViewModel(
+            context,
+            service,
+            filePreferences
+        );
         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);
     }
@@ -56,17 +67,33 @@ void testStringsListPropertyResorting() {
         BibDatabaseContext context = new BibDatabaseContext(db);
         List<String> expected = List.of("ICSE", "TSE");
 
-        ConstantsPropertiesViewModel model = new ConstantsPropertiesViewModel(context, service, filePreferences);
+        ConstantsPropertiesViewModel model = new ConstantsPropertiesViewModel(
+            context,
+            service,
+            filePreferences
+        );
         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(
+                "TSE",
+                "Transactions 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);
     }
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 05dfbf152b9..9aee44f10de 100644
--- a/src/test/java/org/jabref/gui/libraryproperties/contentselectors/ContentSelectorViewModelTest.java
+++ b/src/test/java/org/jabref/gui/libraryproperties/contentselectors/ContentSelectorViewModelTest.java
@@ -1,45 +1,50 @@
 package org.jabref.gui.libraryproperties.contentselectors;
 
+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;
-
 import javafx.beans.property.ListProperty;
 import javafx.beans.property.SimpleListProperty;
 import javafx.collections.FXCollections;
-
 import org.jabref.gui.DialogService;
 import org.jabref.logic.l10n.Localization;
 import org.jabref.model.database.BibDatabaseContext;
 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.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;
-
 public 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);
+        StandardField.AUTHOR,
+        StandardField.JOURNAL,
+        StandardField.KEYWORDS,
+        StandardField.PUBLISHER
+    );
     private ContentSelectorViewModel viewModel;
     private BibDatabaseContext databaseContext;
 
     @BeforeEach
     void setUp() {
         databaseContext = new BibDatabaseContext();
-        viewModel = new ContentSelectorViewModel(databaseContext, dialogService);
+        viewModel =
+            new ContentSelectorViewModel(databaseContext, dialogService);
         viewModel.setValues();
     }
 
     @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);
@@ -50,7 +55,8 @@ void addsNewKeyword() {
         addKeyword(StandardField.KEYWORDS, "test");
 
         ListProperty<String> expected = new SimpleListProperty<>(
-                FXCollections.observableArrayList("test"));
+            FXCollections.observableArrayList("test")
+        );
         ListProperty<String> result = viewModel.getKeywordsBackingList();
 
         assertEquals(expected, result);
@@ -62,7 +68,8 @@ void addsKeywordOnlyIfUnique() {
         addKeyword(StandardField.KEYWORDS, "test");
 
         ListProperty<String> expected = new SimpleListProperty<>(
-                FXCollections.observableArrayList("test"));
+            FXCollections.observableArrayList("test")
+        );
         ListProperty<String> result = viewModel.getKeywordsBackingList();
 
         assertEquals(expected, result);
@@ -73,7 +80,9 @@ 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);
@@ -85,7 +94,9 @@ 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);
     }
@@ -96,7 +107,9 @@ 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);
@@ -108,7 +121,8 @@ void displaysKeywordsInAlphabeticalOrder() {
         addKeyword(StandardField.KEYWORDS, "test2");
 
         ListProperty<String> expected = new SimpleListProperty<>(
-                FXCollections.observableArrayList("test1", "test2"));
+            FXCollections.observableArrayList("test1", "test2")
+        );
         ListProperty<String> result = viewModel.getKeywordsBackingList();
 
         assertEquals(expected, result);
@@ -122,42 +136,64 @@ 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);
     }
 
     private void addKeyword(Field field, String keyword) {
-        when(dialogService.showInputDialogAndWait(
-                Localization.lang("Add new keyword"), Localization.lang("Keyword:")))
-                .thenReturn(Optional.of(keyword));
+        when(
+            dialogService.showInputDialogAndWait(
+                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)))
-                .thenReturn(true);
+        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);
     }
 
     private void addField(Field field) {
-        when(dialogService.showInputDialogAndWait(
-                Localization.lang("Add new field name"), Localization.lang("Field name")))
-                .thenReturn(Optional.of(field.getDisplayName()));
+        when(
+            dialogService.showInputDialogAndWait(
+                Localization.lang("Add new field name"),
+                Localization.lang("Field name")
+            )
+        )
+            .thenReturn(Optional.of(field.getDisplayName()));
 
         viewModel.showInputFieldNameDialog();
     }
 
     private void removeField(Field field) {
-        when(dialogService.showConfirmationDialogAndWait(
+        when(
+            dialogService.showConfirmationDialogAndWait(
                 Localization.lang("Remove field name"),
-                Localization.lang("Are you sure you want to remove field name: \"%0\"?", field.getDisplayName())))
-                .thenReturn(true);
+                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/maintable/MainTableColumnModelTest.java b/src/test/java/org/jabref/gui/maintable/MainTableColumnModelTest.java
index a344886401a..2f597823090 100644
--- a/src/test/java/org/jabref/gui/maintable/MainTableColumnModelTest.java
+++ b/src/test/java/org/jabref/gui/maintable/MainTableColumnModelTest.java
@@ -1,56 +1,70 @@
 package org.jabref.gui.maintable;
 
-import org.junit.jupiter.api.Test;
-
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
+import org.junit.jupiter.api.Test;
+
 public class MainTableColumnModelTest {
 
     private static String testName = "field:author";
-    private static MainTableColumnModel.Type testType = MainTableColumnModel.Type.NORMALFIELD;
+    private static MainTableColumnModel.Type testType =
+        MainTableColumnModel.Type.NORMALFIELD;
     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;
 
     @Test
     public void mainTableColumnModelParserRetrievesCorrectType() {
-        MainTableColumnModel testColumnModel = MainTableColumnModel.parse(testQualifier);
+        MainTableColumnModel testColumnModel = MainTableColumnModel.parse(
+            testQualifier
+        );
 
         assertEquals(testColumnModel.getType(), testType);
     }
 
     @Test
     public void mainTableColumnModelParserRetrievesCorrectQualifier() {
-        MainTableColumnModel testColumnModel = MainTableColumnModel.parse(testQualifier);
+        MainTableColumnModel testColumnModel = MainTableColumnModel.parse(
+            testQualifier
+        );
 
         assertEquals(testColumnModel.getQualifier(), testQualifier);
     }
 
     @Test
     public void fullMainTableColumnModelParserRetrievesCorrectType() {
-        MainTableColumnModel testColumnModel = MainTableColumnModel.parse(testName);
+        MainTableColumnModel testColumnModel = MainTableColumnModel.parse(
+            testName
+        );
 
         assertEquals(testColumnModel.getType(), testType);
     }
 
     @Test
     public void fullMainTableColumnModelParserRetrievesCorrectQualifier() {
-        MainTableColumnModel testColumnModel = MainTableColumnModel.parse(testName);
+        MainTableColumnModel testColumnModel = MainTableColumnModel.parse(
+            testName
+        );
 
         assertEquals(testColumnModel.getQualifier(), testQualifier);
     }
 
     @Test
     public void typeOnlyMainTableColumnModelParserRetrievesCorrectType() {
-        MainTableColumnModel testColumnModel = MainTableColumnModel.parse(testTypeOnlyName);
+        MainTableColumnModel testColumnModel = MainTableColumnModel.parse(
+            testTypeOnlyName
+        );
 
         assertEquals(testColumnModel.getType(), testTypeOnlyType);
     }
 
     @Test
     public void typeOnlyMainTableColumnModelParserRetrievesCorrectQualifier() {
-        MainTableColumnModel testColumnModel = MainTableColumnModel.parse(testTypeOnlyName);
+        MainTableColumnModel testColumnModel = MainTableColumnModel.parse(
+            testTypeOnlyName
+        );
 
         assertEquals(testColumnModel.getQualifier(), "");
     }
diff --git a/src/test/java/org/jabref/gui/maintable/MainTableDataModelTest.java b/src/test/java/org/jabref/gui/maintable/MainTableDataModelTest.java
index 3e9ddc469cb..661a58d1049 100644
--- a/src/test/java/org/jabref/gui/maintable/MainTableDataModelTest.java
+++ b/src/test/java/org/jabref/gui/maintable/MainTableDataModelTest.java
@@ -1,7 +1,10 @@
 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 java.util.List;
 import javafx.beans.InvalidationListener;
 import javafx.beans.binding.Bindings;
 import javafx.beans.property.IntegerProperty;
@@ -11,55 +14,93 @@
 import javafx.collections.ObservableList;
 import javafx.collections.transformation.FilteredList;
 import javafx.collections.transformation.SortedList;
-
 import org.jabref.logic.bibtex.comparator.EntryComparator;
 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;
-
 class MainTableDataModelTest {
 
     @Test
     void additionToObservableMapTriggersUpdate() {
         BibDatabaseContext bibDatabaseContext = new BibDatabaseContext();
-        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));
-        FilteredList<BibEntryTableViewModel> entriesFiltered = new FilteredList<>(entriesViewModel);
+        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
+                    )
+            );
+        FilteredList<BibEntryTableViewModel> entriesFiltered =
+            new FilteredList<>(entriesViewModel);
         IntegerProperty resultSize = new SimpleIntegerProperty();
         resultSize.bind(Bindings.size(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()));
+        SortedList<BibEntryTableViewModel> entriesFilteredAndSorted =
+            new SortedList<>(entriesFiltered);
+        EntryComparator entryComparator = new EntryComparator(
+            false,
+            false,
+            StandardField.AUTHOR
+        );
+        entriesFilteredAndSorted.setComparator((o1, o2) ->
+            entryComparator.compare(o1.getEntry(), o2.getEntry())
+        );
 
-        final boolean[] changed = {false};
+        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");
+        BibEntry bibEntryAuthorT = new BibEntry()
+            .withField(StandardField.AUTHOR, "T");
         entries.add(bibEntryAuthorT);
 
-        List<BibEntry> result = entriesFilteredAndSorted.stream().map(entry -> entry.getEntry()).toList();
+        List<BibEntry> result = entriesFilteredAndSorted
+            .stream()
+            .map(entry -> entry.getEntry())
+            .toList();
         assertEquals(List.of(bibEntryAuthorT), result);
 
         BibEntry bibEntryNothingToZ = new BibEntry();
         entries.add(bibEntryNothingToZ);
-        result = entriesFilteredAndSorted.stream().map(entry -> entry.getEntry()).toList();
+        result =
+            entriesFilteredAndSorted
+                .stream()
+                .map(entry -> entry.getEntry())
+                .toList();
         assertEquals(List.of(bibEntryNothingToZ, bibEntryAuthorT), result);
 
         changed[0] = false;
         bibEntryNothingToZ.setField(StandardField.AUTHOR, "Z");
         assertTrue(changed[0]);
-        result = entriesFilteredAndSorted.stream().map(entry -> entry.getEntry()).toList();
+        result =
+            entriesFilteredAndSorted
+                .stream()
+                .map(entry -> entry.getEntry())
+                .toList();
         assertEquals(List.of(bibEntryAuthorT, bibEntryNothingToZ), result);
     }
 }
diff --git a/src/test/java/org/jabref/gui/menus/FileHistoryMenuTest.java b/src/test/java/org/jabref/gui/menus/FileHistoryMenuTest.java
index ee1529cc512..38aa41d0052 100644
--- a/src/test/java/org/jabref/gui/menus/FileHistoryMenuTest.java
+++ b/src/test/java/org/jabref/gui/menus/FileHistoryMenuTest.java
@@ -1,42 +1,48 @@
 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 java.nio.file.Path;
 import org.jabref.gui.DialogService;
 import org.jabref.gui.importer.actions.OpenDatabaseAction;
 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;
-
 @ExtendWith(ApplicationExtension.class)
 public class FileHistoryMenuTest {
-    private static final String BIBTEX_LIBRARY_PATH = "src/test/resources/org/jabref/";
+
+    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 OpenDatabaseAction openDatabaseAction;
 
     @BeforeEach
     public void setUp() {
         openMocks(this);
-        fileHistoryMenu = new FileHistoryMenu(fileHistory, dialogService, openDatabaseAction);
+        fileHistoryMenu =
+            new FileHistoryMenu(fileHistory, dialogService, openDatabaseAction);
     }
 
     @Test
     void recentLibrariesAreCleared() {
-        fileHistoryMenu.newFile(Path.of(BIBTEX_LIBRARY_PATH.concat("bibtexFiles/test.bib")));
+        fileHistoryMenu.newFile(
+            Path.of(BIBTEX_LIBRARY_PATH.concat("bibtexFiles/test.bib"))
+        );
 
         fileHistoryMenu.clearLibrariesHistory();
         assertTrue(fileHistoryMenu.isDisable());
diff --git a/src/test/java/org/jabref/gui/mergeentries/DiffHighlightingTest.java b/src/test/java/org/jabref/gui/mergeentries/DiffHighlightingTest.java
index 9ed45408946..ee712fabe19 100644
--- a/src/test/java/org/jabref/gui/mergeentries/DiffHighlightingTest.java
+++ b/src/test/java/org/jabref/gui/mergeentries/DiffHighlightingTest.java
@@ -4,11 +4,8 @@
 import java.util.Collections;
 import java.util.List;
 import java.util.stream.Collectors;
-
 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;
@@ -23,155 +20,186 @@ 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 testGenerateDiffHighlightingBothNullThrowsNPE() {
-        Assertions.assertThrows(NullPointerException.class, () -> DiffHighlighting.generateDiffHighlighting(null, null, ""));
+        Assertions.assertThrows(
+            NullPointerException.class,
+            () -> DiffHighlighting.generateDiffHighlighting(null, null, "")
+        );
     }
 
     @Test
     void testNullSeparatorThrowsNPE() {
-        Assertions.assertThrows(NullPointerException.class, () -> DiffHighlighting.generateDiffHighlighting("", "", null));
+        Assertions.assertThrows(
+            NullPointerException.class,
+            () -> DiffHighlighting.generateDiffHighlighting("", "", null)
+        );
     }
 
     @Test
     void testGenerateDiffHighlightingNoDiff() {
         assertEquals(
-                Arrays.asList(
-                        DiffHighlighting.forUnchanged("f"),
-                        DiffHighlighting.forUnchanged("o"),
-                        DiffHighlighting.forUnchanged("o")
-                ),
-                DiffHighlighting.generateDiffHighlighting("foo", "foo", ""));
+            Arrays.asList(
+                DiffHighlighting.forUnchanged("f"),
+                DiffHighlighting.forUnchanged("o"),
+                DiffHighlighting.forUnchanged("o")
+            ),
+            DiffHighlighting.generateDiffHighlighting("foo", "foo", "")
+        );
     }
 
     @Test
     void testGenerateDiffHighlightingSingleWordAddTextWordDiff() {
         assertEquals(
-                Arrays.asList(
-                        DiffHighlighting.forRemoved("foo "),
-                        DiffHighlighting.forAdded("foobar")
-                ),
-                DiffHighlighting.generateDiffHighlighting("foo", "foobar", " "));
+            Arrays.asList(
+                DiffHighlighting.forRemoved("foo "),
+                DiffHighlighting.forAdded("foobar")
+            ),
+            DiffHighlighting.generateDiffHighlighting("foo", "foobar", " ")
+        );
     }
 
     @Test
     void testGenerateDiffHighlightingSingleWordAddTextCharacterDiff() {
         assertEquals(
-                Arrays.asList(
-                        DiffHighlighting.forUnchanged("f"),
-                        DiffHighlighting.forUnchanged("o"),
-                        DiffHighlighting.forUnchanged("o"),
-                        DiffHighlighting.forAdded("bar")
-                ),
-                DiffHighlighting.generateDiffHighlighting("foo", "foobar", ""));
+            Arrays.asList(
+                DiffHighlighting.forUnchanged("f"),
+                DiffHighlighting.forUnchanged("o"),
+                DiffHighlighting.forUnchanged("o"),
+                DiffHighlighting.forAdded("bar")
+            ),
+            DiffHighlighting.generateDiffHighlighting("foo", "foobar", "")
+        );
     }
 
     @Test
     void testGenerateDiffHighlightingSingleWordDeleteTextWordDiff() {
         assertEquals(
-                Arrays.asList(
-                        DiffHighlighting.forRemoved("foobar "),
-                        DiffHighlighting.forAdded("foo")
-                ),
-                DiffHighlighting.generateDiffHighlighting("foobar", "foo", " "));
+            Arrays.asList(
+                DiffHighlighting.forRemoved("foobar "),
+                DiffHighlighting.forAdded("foo")
+            ),
+            DiffHighlighting.generateDiffHighlighting("foobar", "foo", " ")
+        );
     }
 
     @Test
     void testGenerateDiffHighlightingSingleWordDeleteTextCharacterDiff() {
         assertEquals(
-                Arrays.asList(
-                        DiffHighlighting.forUnchanged("f"),
-                        DiffHighlighting.forUnchanged("o"),
-                        DiffHighlighting.forUnchanged("o"),
-                        DiffHighlighting.forRemoved("b"),
-                        DiffHighlighting.forRemoved("a"),
-                        DiffHighlighting.forRemoved("r")
-                ),
-                DiffHighlighting.generateDiffHighlighting("foobar", "foo", ""));
+            Arrays.asList(
+                DiffHighlighting.forUnchanged("f"),
+                DiffHighlighting.forUnchanged("o"),
+                DiffHighlighting.forUnchanged("o"),
+                DiffHighlighting.forRemoved("b"),
+                DiffHighlighting.forRemoved("a"),
+                DiffHighlighting.forRemoved("r")
+            ),
+            DiffHighlighting.generateDiffHighlighting("foobar", "foo", "")
+        );
     }
 
     @Test
     void generateSymmetricHighlightingSingleWordAddTextWordDiff() {
         assertEquals(
-                Collections.singletonList(DiffHighlighting.forChanged("foo ")),
-                DiffHighlighting.generateSymmetricHighlighting("foo", "foobar", " "));
+            Collections.singletonList(DiffHighlighting.forChanged("foo ")),
+            DiffHighlighting.generateSymmetricHighlighting("foo", "foobar", " ")
+        );
     }
 
     @Test
     void generateSymmetricHighlightingSingleWordAddTextCharacterDiff() {
         assertEquals(
-                Arrays.asList(
-                        DiffHighlighting.forUnchanged("f"),
-                        DiffHighlighting.forUnchanged("o"),
-                        DiffHighlighting.forUnchanged("o")
-                ),
-                DiffHighlighting.generateSymmetricHighlighting("foo", "foobar", ""));
+            Arrays.asList(
+                DiffHighlighting.forUnchanged("f"),
+                DiffHighlighting.forUnchanged("o"),
+                DiffHighlighting.forUnchanged("o")
+            ),
+            DiffHighlighting.generateSymmetricHighlighting("foo", "foobar", "")
+        );
     }
 
     @Test
     void generateSymmetricHighlightingSingleWordDeleteTextWordDiff() {
         assertEquals(
-                Collections.singletonList(DiffHighlighting.forChanged("foobar ")),
-                DiffHighlighting.generateSymmetricHighlighting("foobar", "foo", " "));
+            Collections.singletonList(DiffHighlighting.forChanged("foobar ")),
+            DiffHighlighting.generateSymmetricHighlighting("foobar", "foo", " ")
+        );
     }
 
     @Test
     void generateSymmetricHighlightingSingleWordDeleteTextCharacterDiff() {
         assertEquals(
-                Arrays.asList(
-                        DiffHighlighting.forUnchanged("f"),
-                        DiffHighlighting.forUnchanged("o"),
-                        DiffHighlighting.forUnchanged("o"),
-                        DiffHighlighting.forAdded("b"),
-                        DiffHighlighting.forAdded("a"),
-                        DiffHighlighting.forAdded("r")
-                ),
-                DiffHighlighting.generateSymmetricHighlighting("foobar", "foo", ""));
+            Arrays.asList(
+                DiffHighlighting.forUnchanged("f"),
+                DiffHighlighting.forUnchanged("o"),
+                DiffHighlighting.forUnchanged("o"),
+                DiffHighlighting.forAdded("b"),
+                DiffHighlighting.forAdded("a"),
+                DiffHighlighting.forAdded("r")
+            ),
+            DiffHighlighting.generateSymmetricHighlighting("foobar", "foo", "")
+        );
     }
 
     @Test
     void generateSymmetricHighlightingMultipleWordsDeleteTextCharacterDiff() {
         assertEquals(
-                Arrays.asList(
-                        DiffHighlighting.forUnchanged("f"),
-                        DiffHighlighting.forUnchanged("o"),
-                        DiffHighlighting.forUnchanged("o"),
-                        DiffHighlighting.forAdded("b"),
-                        DiffHighlighting.forAdded("a"),
-                        DiffHighlighting.forAdded("r"),
-                        DiffHighlighting.forUnchanged(" "),
-                        DiffHighlighting.forUnchanged("a"),
-                        DiffHighlighting.forUnchanged("n"),
-                        DiffHighlighting.forUnchanged("d"),
-                        DiffHighlighting.forUnchanged(" "),
-                        DiffHighlighting.forAdded("s"),
-                        DiffHighlighting.forAdded("o"),
-                        DiffHighlighting.forAdded("m"),
-                        DiffHighlighting.forAdded("e"),
-                        DiffHighlighting.forUnchanged("t"),
-                        DiffHighlighting.forUnchanged("h"),
-                        DiffHighlighting.forUnchanged("i"),
-                        DiffHighlighting.forUnchanged("n"),
-                        DiffHighlighting.forUnchanged("g")
-                ),
-                DiffHighlighting.generateSymmetricHighlighting("foobar and something", "foo and thing", ""));
+            Arrays.asList(
+                DiffHighlighting.forUnchanged("f"),
+                DiffHighlighting.forUnchanged("o"),
+                DiffHighlighting.forUnchanged("o"),
+                DiffHighlighting.forAdded("b"),
+                DiffHighlighting.forAdded("a"),
+                DiffHighlighting.forAdded("r"),
+                DiffHighlighting.forUnchanged(" "),
+                DiffHighlighting.forUnchanged("a"),
+                DiffHighlighting.forUnchanged("n"),
+                DiffHighlighting.forUnchanged("d"),
+                DiffHighlighting.forUnchanged(" "),
+                DiffHighlighting.forAdded("s"),
+                DiffHighlighting.forAdded("o"),
+                DiffHighlighting.forAdded("m"),
+                DiffHighlighting.forAdded("e"),
+                DiffHighlighting.forUnchanged("t"),
+                DiffHighlighting.forUnchanged("h"),
+                DiffHighlighting.forUnchanged("i"),
+                DiffHighlighting.forUnchanged("n"),
+                DiffHighlighting.forUnchanged("g")
+            ),
+            DiffHighlighting.generateSymmetricHighlighting(
+                "foobar and something",
+                "foo and thing",
+                ""
+            )
+        );
     }
 
     @Test
     void generateSymmetricHighlightingMultipleWordsDeleteTextWordDiff() {
         assertEquals(
-                Arrays.asList(
-                        DiffHighlighting.forUnchanged("foo "),
-                        DiffHighlighting.forAdded("bar "),
-                        DiffHighlighting.forUnchanged("and "),
-                        DiffHighlighting.forAdded("some "),
-                        DiffHighlighting.forUnchanged("thing ")
-                ),
-                DiffHighlighting.generateSymmetricHighlighting("foo bar and some thing", "foo and thing", " "));
+            Arrays.asList(
+                DiffHighlighting.forUnchanged("foo "),
+                DiffHighlighting.forAdded("bar "),
+                DiffHighlighting.forUnchanged("and "),
+                DiffHighlighting.forAdded("some "),
+                DiffHighlighting.forUnchanged("thing ")
+            ),
+            DiffHighlighting.generateSymmetricHighlighting(
+                "foo bar and some thing",
+                "foo and thing",
+                " "
+            )
+        );
     }
 }
diff --git a/src/test/java/org/jabref/gui/mergeentries/FieldRowViewModelTest.java b/src/test/java/org/jabref/gui/mergeentries/FieldRowViewModelTest.java
index a4802c8537a..88579d6812a 100644
--- a/src/test/java/org/jabref/gui/mergeentries/FieldRowViewModelTest.java
+++ b/src/test/java/org/jabref/gui/mergeentries/FieldRowViewModelTest.java
@@ -1,7 +1,13 @@
 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 java.util.Optional;
 import org.jabref.gui.mergeentries.newmergedialog.FieldRowViewModel;
 import org.jabref.gui.mergeentries.newmergedialog.fieldsmerger.FieldMergerFactory;
 import org.jabref.model.entry.BibEntry;
@@ -10,19 +16,11 @@
 import org.jabref.model.entry.field.StandardField;
 import org.jabref.model.entry.types.StandardEntryType;
 import org.jabref.preferences.BibEntryPreferences;
-
 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;
-
 public class FieldRowViewModelTest {
 
     BibEntry leftEntry;
@@ -38,23 +36,40 @@ public class FieldRowViewModelTest {
 
     @BeforeEach
     public void setup() throws ParseException {
-        leftEntry = new BibEntry(StandardEntryType.Article)
+        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.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.JOURNAL,
+                    "Electron Device Letters, IEEE"
+                )
                 .withField(StandardField.PUBLISHER, "IEEE")
                 .withField(StandardField.YEAR, "2012");
 
-        rightEntry = new BibEntry(StandardEntryType.Book)
+        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.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")
@@ -63,11 +78,21 @@ public void setup() throws ParseException {
                 .withField(StandardField.KEYWORDS, "a, b, c")
                 .withField(StandardField.YEAR, "2012");
 
-        extraEntry = new BibEntry(StandardEntryType.InProceedings)
+        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.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");
 
@@ -79,24 +104,42 @@ public void setup() throws ParseException {
 
     @Test
     public void selectNonEmptyValueShouldSelectLeftFieldValueIfItIsNotEmpty() {
-        var numberFieldViewModel = createViewModelForField(StandardField.NUMBER);
+        var numberFieldViewModel = createViewModelForField(
+            StandardField.NUMBER
+        );
         numberFieldViewModel.selectNonEmptyValue();
-        assertEquals(FieldRowViewModel.Selection.LEFT, numberFieldViewModel.getSelection());
-
-        var authorFieldViewModel = createViewModelForField(StandardField.AUTHOR);
+        assertEquals(
+            FieldRowViewModel.Selection.LEFT,
+            numberFieldViewModel.getSelection()
+        );
+
+        var authorFieldViewModel = createViewModelForField(
+            StandardField.AUTHOR
+        );
         authorFieldViewModel.selectNonEmptyValue();
-        assertEquals(FieldRowViewModel.Selection.LEFT, authorFieldViewModel.getSelection());
+        assertEquals(
+            FieldRowViewModel.Selection.LEFT,
+            authorFieldViewModel.getSelection()
+        );
     }
 
     @Test
     public void selectNonEmptyValueShouldSelectRightFieldValueIfLeftValueIsEmpty() {
         var monthFieldViewModel = createViewModelForField(StandardField.MONTH);
         monthFieldViewModel.selectNonEmptyValue();
-        assertEquals(FieldRowViewModel.Selection.RIGHT, monthFieldViewModel.getSelection());
-
-        var addressFieldViewModel = createViewModelForField(StandardField.ADDRESS);
+        assertEquals(
+            FieldRowViewModel.Selection.RIGHT,
+            monthFieldViewModel.getSelection()
+        );
+
+        var addressFieldViewModel = createViewModelForField(
+            StandardField.ADDRESS
+        );
         addressFieldViewModel.selectNonEmptyValue();
-        assertEquals(FieldRowViewModel.Selection.RIGHT, addressFieldViewModel.getSelection());
+        assertEquals(
+            FieldRowViewModel.Selection.RIGHT,
+            addressFieldViewModel.getSelection()
+        );
     }
 
     @Test
@@ -114,9 +157,17 @@ public 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."
+    )
     public 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());
     }
 
@@ -124,26 +175,50 @@ public void hasEqualLeftAndRightValuesShouldReturnTrueIfKeywordsAreEqual() {
     public void selectLeftValueShouldBeCorrect() {
         var monthFieldViewModel = createViewModelForField(StandardField.MONTH);
         monthFieldViewModel.selectLeftValue();
-        assertEquals(FieldRowViewModel.Selection.LEFT, monthFieldViewModel.getSelection());
-        assertEquals(Optional.of(""), Optional.ofNullable(monthFieldViewModel.getMergedFieldValue()));
+        assertEquals(
+            FieldRowViewModel.Selection.LEFT,
+            monthFieldViewModel.getSelection()
+        );
+        assertEquals(
+            Optional.of(""),
+            Optional.ofNullable(monthFieldViewModel.getMergedFieldValue())
+        );
 
         monthFieldViewModel.selectRightValue();
         monthFieldViewModel.selectLeftValue();
-        assertEquals(FieldRowViewModel.Selection.LEFT, monthFieldViewModel.getSelection());
-        assertEquals(Optional.of(""), Optional.of(monthFieldViewModel.getMergedFieldValue()));
+        assertEquals(
+            FieldRowViewModel.Selection.LEFT,
+            monthFieldViewModel.getSelection()
+        );
+        assertEquals(
+            Optional.of(""),
+            Optional.of(monthFieldViewModel.getMergedFieldValue())
+        );
     }
 
     @Test
     public 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(
+            FieldRowViewModel.Selection.RIGHT,
+            monthFieldViewModel.getSelection()
+        );
+        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(
+            FieldRowViewModel.Selection.RIGHT,
+            monthFieldViewModel.getSelection()
+        );
+        assertEquals(
+            rightEntry.getField(StandardField.MONTH),
+            Optional.of(monthFieldViewModel.getMergedFieldValue())
+        );
     }
 
     @Test
@@ -157,10 +232,14 @@ public void isFieldsMergedShouldReturnFalseIfLeftAndRightValuesAreNotEqual() {
         var monthFieldViewModel = createViewModelForField(StandardField.MONTH);
         assertFalse(monthFieldViewModel.isFieldsMerged());
 
-        var addressFieldViewModel = createViewModelForField(StandardField.ADDRESS);
+        var addressFieldViewModel = createViewModelForField(
+            StandardField.ADDRESS
+        );
         assertFalse(addressFieldViewModel.isFieldsMerged());
 
-        var authorFieldViewModel = createViewModelForField(StandardField.AUTHOR);
+        var authorFieldViewModel = createViewModelForField(
+            StandardField.AUTHOR
+        );
         assertFalse(authorFieldViewModel.isFieldsMerged());
     }
 
@@ -168,20 +247,29 @@ public void isFieldsMergedShouldReturnFalseIfLeftAndRightValuesAreNotEqual() {
     public void mergeFieldsShouldResultInLeftAndRightValuesBeingEqual() {
         var groupsField = createViewModelForField(StandardField.GROUPS);
         groupsField.mergeFields();
-        assertEquals(groupsField.getLeftFieldValue(), groupsField.getRightFieldValue());
+        assertEquals(
+            groupsField.getLeftFieldValue(),
+            groupsField.getRightFieldValue()
+        );
     }
 
     @Test
     public void mergeFieldsShouldBeCorrectEvenWhenOnOfTheValuesIsEmpty() {
         var keywordsField = createViewModelForField(StandardField.KEYWORDS);
         keywordsField.mergeFields();
-        assertEquals(keywordsField.getLeftFieldValue(), keywordsField.getRightFieldValue());
+        assertEquals(
+            keywordsField.getLeftFieldValue(),
+            keywordsField.getRightFieldValue()
+        );
     }
 
     @Test
     public void mergeFieldsShouldThrowUnsupportedOperationExceptionIfTheGivenFieldCanBeMerged() {
         var authorField = createViewModelForField(StandardField.AUTHOR);
-        assertThrows(UnsupportedOperationException.class, authorField::mergeFields);
+        assertThrows(
+            UnsupportedOperationException.class,
+            authorField::mergeFields
+        );
     }
 
     @Test
@@ -189,7 +277,10 @@ public void mergeFieldsShouldSelectLeftFieldValue() {
         var groupsField = createViewModelForField(StandardField.GROUPS);
         groupsField.mergeFields();
 
-        assertEquals(FieldRowViewModel.Selection.LEFT, groupsField.getSelection());
+        assertEquals(
+            FieldRowViewModel.Selection.LEFT,
+            groupsField.getSelection()
+        );
     }
 
     @Test
@@ -216,6 +307,12 @@ public void unmergeFieldsShouldDoNothingIfFieldsAreNotMerged() {
     }
 
     public FieldRowViewModel createViewModelForField(Field field) {
-        return new FieldRowViewModel(field, leftEntry, rightEntry, mergedEntry, fieldMergerFactory);
+        return new FieldRowViewModel(
+            field,
+            leftEntry,
+            rightEntry,
+            mergedEntry,
+            fieldMergerFactory
+        );
     }
 }
diff --git a/src/test/java/org/jabref/gui/mergeentries/GroupMergerTest.java b/src/test/java/org/jabref/gui/mergeentries/GroupMergerTest.java
index 4f1c6824062..9b5e848088f 100644
--- a/src/test/java/org/jabref/gui/mergeentries/GroupMergerTest.java
+++ b/src/test/java/org/jabref/gui/mergeentries/GroupMergerTest.java
@@ -1,16 +1,14 @@
 package org.jabref.gui.mergeentries;
 
-import java.util.stream.Stream;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
+import java.util.stream.Stream;
 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;
-
 public class GroupMergerTest {
 
     GroupMerger groupMerger;
@@ -22,20 +20,24 @@ void setup() {
 
     private static Stream<Arguments> mergeShouldMergeGroupsCorrectly() {
         return Stream.of(
-                Arguments.of("a", "b", "a, b"),
-                Arguments.of("a", "", "a"),
-                Arguments.of("", "", ""),
-                Arguments.of("", "b", "b"),
-                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", "a, b"),
+            Arguments.of("a", "", "a"),
+            Arguments.of("", "", ""),
+            Arguments.of("", "b", "b"),
+            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")
         );
     }
 
     @ParameterizedTest
     @MethodSource
-    public void mergeShouldMergeGroupsCorrectly(String groupsA, String groupsB, String expected) {
-     assertEquals(expected, groupMerger.merge(groupsA, groupsB));
+    public void mergeShouldMergeGroupsCorrectly(
+        String groupsA,
+        String groupsB,
+        String expected
+    ) {
+        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 929e0e56db0..6fc3a5c3d37 100644
--- a/src/test/java/org/jabref/gui/mergeentries/ThreeWayMergeCellViewModelTest.java
+++ b/src/test/java/org/jabref/gui/mergeentries/ThreeWayMergeCellViewModelTest.java
@@ -1,16 +1,14 @@
 package org.jabref.gui.mergeentries;
 
-import java.util.stream.Stream;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
+import java.util.stream.Stream;
 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;
-
 public class ThreeWayMergeCellViewModelTest {
 
     ThreeWayMergeCellViewModel viewModel;
@@ -22,50 +20,55 @@ void setup() {
 
     private static Stream<Arguments> testOddEvenLogic() {
         return Stream.of(
-                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(true, false, true, false),
+            Arguments.of(false, false, true, false),
+            Arguments.of(true, true, false, true),
+            Arguments.of(false, true, false, true)
         );
     }
 
     private static Stream<Arguments> isEvenShouldReturnTrueIfRowIndexIsEven() {
         return Stream.of(
-                Arguments.of(0, true),
-                Arguments.of(100, true),
-                Arguments.of(1, false),
-                Arguments.of(2, true),
-                Arguments.of(9999, false),
-                Arguments.of(Integer.MAX_VALUE, false)
+            Arguments.of(0, true),
+            Arguments.of(100, true),
+            Arguments.of(1, false),
+            Arguments.of(2, true),
+            Arguments.of(9999, false),
+            Arguments.of(Integer.MAX_VALUE, false)
         );
     }
 
     private static Stream<Arguments> isOddShouldReturnTrueIfRowIndexIsOdd() {
         return Stream.of(
-                Arguments.of(1, true),
-                Arguments.of(101, true),
-                Arguments.of(3, true),
-                Arguments.of(7777, true),
-                Arguments.of(9999, true),
-                Arguments.of(Integer.MAX_VALUE, true),
-                Arguments.of(0, false)
+            Arguments.of(1, true),
+            Arguments.of(101, true),
+            Arguments.of(3, true),
+            Arguments.of(7777, true),
+            Arguments.of(9999, true),
+            Arguments.of(Integer.MAX_VALUE, true),
+            Arguments.of(0, false)
         );
     }
 
     private static Stream<Arguments> getTextAndSetTextShouldBeConsistent() {
         return Stream.of(
-                Arguments.of(""),
-                Arguments.of("Hello"),
-                Arguments.of("World"),
-                Arguments.of("" + null),
-                Arguments.of("Hello, World"),
-                Arguments.of("عربي")
+            Arguments.of(""),
+            Arguments.of("Hello"),
+            Arguments.of("World"),
+            Arguments.of("" + null),
+            Arguments.of("Hello, World"),
+            Arguments.of("عربي")
         );
     }
 
     @ParameterizedTest
     @MethodSource
-    void testOddEvenLogic(boolean setIsOdd, boolean setIsEven, boolean expectedIsOdd, boolean expectedIsEven) {
+    void testOddEvenLogic(
+        boolean setIsOdd,
+        boolean setIsEven,
+        boolean expectedIsOdd,
+        boolean expectedIsEven
+    ) {
         viewModel.setOdd(setIsOdd);
         viewModel.setEven(setIsEven);
         assertEquals(expectedIsOdd, viewModel.isOdd());
@@ -74,15 +77,20 @@ void testOddEvenLogic(boolean setIsOdd, boolean setIsEven, boolean expectedIsOdd
 
     @ParameterizedTest
     @MethodSource
-    void isEvenShouldReturnTrueIfRowIndexIsEven(int rowIndex, boolean expected) {
-        ThreeWayMergeCellViewModel newViewModel = new ThreeWayMergeCellViewModel("", rowIndex);
+    void isEvenShouldReturnTrueIfRowIndexIsEven(
+        int rowIndex,
+        boolean expected
+    ) {
+        ThreeWayMergeCellViewModel newViewModel =
+            new ThreeWayMergeCellViewModel("", rowIndex);
         assertEquals(expected, newViewModel.isEven());
     }
 
     @ParameterizedTest
     @MethodSource
     void isOddShouldReturnTrueIfRowIndexIsOdd(int rowIndex, boolean expected) {
-        ThreeWayMergeCellViewModel newViewModel = new ThreeWayMergeCellViewModel("", rowIndex);
+        ThreeWayMergeCellViewModel newViewModel =
+            new ThreeWayMergeCellViewModel("", rowIndex);
         assertEquals(expected, newViewModel.isOdd());
     }
 
diff --git a/src/test/java/org/jabref/gui/mergeentries/ThreeWayMergeViewModelTest.java b/src/test/java/org/jabref/gui/mergeentries/ThreeWayMergeViewModelTest.java
index fed09e4e0dc..b0942bc0f73 100644
--- a/src/test/java/org/jabref/gui/mergeentries/ThreeWayMergeViewModelTest.java
+++ b/src/test/java/org/jabref/gui/mergeentries/ThreeWayMergeViewModelTest.java
@@ -1,8 +1,11 @@
 package org.jabref.gui.mergeentries;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+import com.google.common.collect.Comparators;
 import java.util.HashSet;
 import java.util.List;
-
 import org.jabref.gui.mergeentries.newmergedialog.ThreeWayMergeViewModel;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.field.Field;
@@ -11,14 +14,9 @@
 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;
-
 public class ThreeWayMergeViewModelTest {
 
     ThreeWayMergeViewModel viewModel;
@@ -28,30 +26,55 @@ public 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]}")
+        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")
+        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");
+        viewModel =
+            new ThreeWayMergeViewModel(leftEntry, rightEntry, "left", "right");
         visibleFields = viewModel.getVisibleFields();
     }
 
     @Test
     void getVisibleFieldsShouldReturnASortedListOfFieldsWithEntryTypeAtTheHeadOfTheList() {
-        List<String> names = visibleFields.stream().map(Field::getName).skip(1).toList();
+        List<String> names = visibleFields
+            .stream()
+            .map(Field::getName)
+            .skip(1)
+            .toList();
         Comparators.isInOrder(names, String::compareTo);
     }
 
     @Test
     void getVisibleFieldsShouldNotHaveDuplicates() {
-        assertEquals(new HashSet<>(visibleFields).size(), viewModel.numberOfVisibleFields());
+        assertEquals(
+            new HashSet<>(visibleFields).size(),
+            viewModel.numberOfVisibleFields()
+        );
     }
 
     @Test
@@ -61,8 +84,24 @@ 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 164015cbfdc..29d936ef09a 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,11 +1,12 @@
 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,16 +21,18 @@ class FileMergerTest {
      * @param fileB File String b
      */
     @ParameterizedTest
-    @CsvSource(textBlock = """
-                ,,,
-                FileA,FileA,
-                FileA,FileA,''
-                FileB, ,FileB
-                FileB,'',FileB
-                :A2012 -A.pdf:PDF;B2013 - B.pdf:PDF:,:A2012 -A.pdf:PDF,B2013 - B.pdf:PDF
-                :A2012 -A.pdf:;B2013 - B.pdf:PDF:,A2012 -A.pdf,B2013 - B.pdf:PDF
-                :A2012 -A.pdf:;:asdf:,A2012 -A.pdf,asdf
-            """)
+    @CsvSource(
+        textBlock = """
+            ,,,
+            FileA,FileA,
+            FileA,FileA,''
+            FileB, ,FileB
+            FileB,'',FileB
+            :A2012 -A.pdf:PDF;B2013 - B.pdf:PDF:,:A2012 -A.pdf:PDF,B2013 - B.pdf:PDF
+            :A2012 -A.pdf:;B2013 - B.pdf:PDF:,A2012 -A.pdf,B2013 - B.pdf:PDF
+            :A2012 -A.pdf:;:asdf:,A2012 -A.pdf,asdf
+        """
+    )
     void testMerge(String expect, String fileA, String fileB) {
         assertEquals(expect, fileMerger.merge(fileA, fileB));
     }
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 87f9ea5aeab..b82c6b9d5d3 100644
--- a/src/test/java/org/jabref/gui/preferences/journals/AbbreviationViewModelTest.java
+++ b/src/test/java/org/jabref/gui/preferences/journals/AbbreviationViewModelTest.java
@@ -1,44 +1,81 @@
 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 java.util.stream.Stream;
 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;
-
 class AbbreviationViewModelTest {
 
     @ParameterizedTest
     @MethodSource("provideContainsCaseIndependentContains")
-    void containsCaseIndependentContains(String searchTerm, AbbreviationViewModel abbreviation) {
+    void containsCaseIndependentContains(
+        String searchTerm,
+        AbbreviationViewModel abbreviation
+    ) {
         assertTrue(abbreviation.containsCaseIndependent(searchTerm));
     }
 
     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() {
+    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 433d736862d..d7943862bdf 100644
--- a/src/test/java/org/jabref/gui/preferences/journals/JournalAbbreviationsViewModelTabTest.java
+++ b/src/test/java/org/jabref/gui/preferences/journals/JournalAbbreviationsViewModelTabTest.java
@@ -1,5 +1,15 @@
 package org.jabref.gui.preferences.journals;
 
+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;
@@ -9,10 +19,8 @@
 import java.util.Optional;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
-
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableList;
-
 import org.jabref.gui.DialogService;
 import org.jabref.gui.util.CurrentThreadTaskExecutor;
 import org.jabref.gui.util.TaskExecutor;
@@ -20,48 +28,64 @@
 import org.jabref.logic.journals.JournalAbbreviationLoader;
 import org.jabref.logic.journals.JournalAbbreviationPreferences;
 import org.jabref.logic.journals.JournalAbbreviationRepository;
-
 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;
-
 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 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 final static TestAbbreviation ABBREVIATION_2 = new TestAbbreviation("Full2", "Abb2");
-    private final static 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 final static TestAbbreviation ABBREVIATION_4 = new TestAbbreviation("Full4", "Abb4");
-
-    private final static TestAbbreviation ABBREVIATION_5 = new TestAbbreviation("Full5", "Abb5");
-
-    private final static TestAbbreviation ABBREVIATION_6 = new TestAbbreviation("Full6", "Abb6");
+    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 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 static final TestAbbreviation ABBREVIATION_2 = new TestAbbreviation(
+        "Full2",
+        "Abb2"
+    );
+    private static final TestAbbreviation ABBREVIATION_2_OTHER_SHORT_UNIQUE =
+        new TestAbbreviation("Full2", "Abb2", "A2");
+
+    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 static final TestAbbreviation ABBREVIATION_4 = new TestAbbreviation(
+        "Full4",
+        "Abb4"
+    );
+
+    private static final TestAbbreviation ABBREVIATION_5 = new TestAbbreviation(
+        "Full5",
+        "Abb5"
+    );
+
+    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 +96,21 @@ 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;
+            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,47 +118,71 @@ 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"));
+    private static String csvListOfAbbreviations(
+        List<TestAbbreviation> testAbbreviations
+    ) {
+        return testAbbreviations
+            .stream()
+            .map(TestAbbreviation::toString)
+            .collect(Collectors.joining("\n"));
     }
 
-    private static String csvListOfAbbreviations(TestAbbreviation... testAbbreviations) {
-        return csvListOfAbbreviations(Arrays.stream(testAbbreviations).toList());
+    private static String csvListOfAbbreviations(
+        TestAbbreviation... testAbbreviations
+    ) {
+        return csvListOfAbbreviations(
+            Arrays.stream(testAbbreviations).toList()
+        );
     }
 
     private record CsvFileNameAndContent(String fileName, String content) {
-        CsvFileNameAndContent(String fileName, TestAbbreviation... testAbbreviations) {
+        CsvFileNameAndContent(
+            String fileName,
+            TestAbbreviation... testAbbreviations
+        ) {
             this(fileName, csvListOfAbbreviations(testAbbreviations));
         }
     }
 
     private record TestData(
-            List<CsvFileNameAndContent> csvFiles,
-            TestAbbreviation abbreviationToCheck,
-            List<String> finalContentsOfFile2,
-            List<String> finalContentsOfFile3
+        List<CsvFileNameAndContent> csvFiles,
+        TestAbbreviation abbreviationToCheck,
+        List<String> finalContentsOfFile2,
+        List<String> finalContentsOfFile3
     ) {
         /**
          * Note that we have a **different** ordering at the constructor, because Java generics have "type erasure"
          */
         public TestData(
-                List<CsvFileNameAndContent> csvFiles,
-                List<TestAbbreviation> finalContentsOfFile2,
-                List<TestAbbreviation> finalContentsOfFile3,
-                TestAbbreviation abbreviationToCheck
+            List<CsvFileNameAndContent> csvFiles,
+            List<TestAbbreviation> finalContentsOfFile2,
+            List<TestAbbreviation> finalContentsOfFile3,
+            TestAbbreviation abbreviationToCheck
         ) {
-            this(csvFiles,
-                    abbreviationToCheck,
-                    finalContentsOfFile2.stream().map(TestAbbreviation::toString).toList(),
-                    finalContentsOfFile3.stream().map(TestAbbreviation::toString).toList());
+            this(
+                csvFiles,
+                abbreviationToCheck,
+                finalContentsOfFile2
+                    .stream()
+                    .map(TestAbbreviation::toString)
+                    .toList(),
+                finalContentsOfFile3
+                    .stream()
+                    .map(TestAbbreviation::toString)
+                    .toList()
+            );
         }
     }
 
@@ -133,58 +190,163 @@ 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)
         // testfile_3 has 5 entries after de-duplication
         return Stream.of(
-                // No shortest unique abbreviations in files
-                // Shortest unique abbreviations in entries (being the same then the abbreviation)
-                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)),
-                        List.of(ABBREVIATION_0, ABBREVIATION_1, ABBREVIATION_2, ABBREVIATION_5),
-                        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),
-                        // without duplicates
-                        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),
-                                // 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)),
-                        // 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),
-                        // 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)
+            // No shortest unique abbreviations in files
+            // Shortest unique abbreviations in entries (being the same then the abbreviation)
+            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
+                    )
+                ),
+                List.of(
+                    ABBREVIATION_0,
+                    ABBREVIATION_1,
+                    ABBREVIATION_2,
+                    ABBREVIATION_5
+                ),
+                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
+                ),
+                // without duplicates
+                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
+                    ),
+                    // 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
+                    )
+                ),
+                // 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
+                ),
+                // 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
+            )
         );
     }
 
     @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);
-
-        emptyTestFile = createTestFile(new CsvFileNameAndContent("emptyTestFile.csv", ""));
+        viewModel =
+            new JournalAbbreviationsTabViewModel(
+                abbreviationPreferences,
+                dialogService,
+                taskExecutor,
+                repository
+            );
+
+        emptyTestFile =
+            createTestFile(new CsvFileNameAndContent("emptyTestFile.csv", ""));
     }
 
     @Test
@@ -195,14 +357,16 @@ void testInitialHasNoFilesAndNoAbbreviations() {
 
     @ParameterizedTest
     @MethodSource("provideTestFiles")
-    void testInitialWithSavedFilesIncrementsFilesCounter(TestData testData) throws IOException {
+    void testInitialWithSavedFilesIncrementsFilesCounter(TestData testData)
+        throws IOException {
         addFourTestFileToViewModelAndPreferences(testData);
         assertEquals(4, viewModel.journalFilesProperty().size());
     }
 
     @ParameterizedTest
     @MethodSource("provideTestFiles")
-    void testRemoveDuplicatesWhenReadingFiles(TestData testData) throws IOException {
+    void testRemoveDuplicatesWhenReadingFiles(TestData testData)
+        throws IOException {
         addFourTestFileToViewModelAndPreferences(testData);
         viewModel.selectLastJournalFile();
 
@@ -212,7 +376,8 @@ void testRemoveDuplicatesWhenReadingFiles(TestData testData) throws IOException
 
     @Test
     void addFileIncreasesCounterOfOpenFilesAndHasNoAbbreviations() {
-        when(dialogService.showFileSaveDialog(any())).thenReturn(Optional.of(emptyTestFile));
+        when(dialogService.showFileSaveDialog(any()))
+            .thenReturn(Optional.of(emptyTestFile));
         viewModel.addNewFile();
 
         assertEquals(1, viewModel.journalFilesProperty().size());
@@ -221,8 +386,10 @@ void addFileIncreasesCounterOfOpenFilesAndHasNoAbbreviations() {
 
     @ParameterizedTest
     @MethodSource("provideTestFiles")
-    void addDuplicatedFileResultsInErrorDialog(TestData testData) throws IOException {
-        when(dialogService.showFileSaveDialog(any())).thenReturn(Optional.of(createTestFile(testData.csvFiles.get(0))));
+    void addDuplicatedFileResultsInErrorDialog(TestData testData)
+        throws IOException {
+        when(dialogService.showFileSaveDialog(any()))
+            .thenReturn(Optional.of(createTestFile(testData.csvFiles.get(0))));
         viewModel.addNewFile();
         viewModel.addNewFile();
         verify(dialogService).showErrorDialogAndWait(anyString(), anyString());
@@ -230,8 +397,10 @@ void addDuplicatedFileResultsInErrorDialog(TestData testData) throws IOException
 
     @ParameterizedTest
     @MethodSource("provideTestFiles")
-    void testOpenDuplicatedFileResultsInAnException(TestData testData) throws IOException {
-        when(dialogService.showFileOpenDialog(any())).thenReturn(Optional.of(createTestFile(testData.csvFiles.get(0))));
+    void testOpenDuplicatedFileResultsInAnException(TestData testData)
+        throws IOException {
+        when(dialogService.showFileOpenDialog(any()))
+            .thenReturn(Optional.of(createTestFile(testData.csvFiles.get(0))));
         viewModel.openFile();
         viewModel.openFile();
         verify(dialogService).showErrorDialogAndWait(anyString(), anyString());
@@ -239,13 +408,17 @@ void testOpenDuplicatedFileResultsInAnException(TestData testData) throws IOExce
 
     @ParameterizedTest
     @MethodSource("provideTestFiles")
-    void testSelectLastJournalFileSwitchesFilesAndTheirAbbreviations(TestData testData) throws IOException {
-        when(dialogService.showFileSaveDialog(any())).thenReturn(Optional.of(emptyTestFile));
+    void testSelectLastJournalFileSwitchesFilesAndTheirAbbreviations(
+        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.get(0))));
+        when(dialogService.showFileSaveDialog(any()))
+            .thenReturn(Optional.of(createTestFile(testData.csvFiles.get(0))));
         viewModel.addNewFile();
         viewModel.selectLastJournalFile();
         assertEquals(1, viewModel.abbreviationsCountProperty().get());
@@ -253,21 +426,33 @@ void testSelectLastJournalFileSwitchesFilesAndTheirAbbreviations(TestData testDa
 
     @ParameterizedTest
     @MethodSource("provideTestFiles")
-    void testOpenValidFileContainsTheSpecificEntryAndEnoughAbbreviations(TestData testData) throws IOException {
-        when(dialogService.showFileSaveDialog(any())).thenReturn(Optional.of(createTestFile(testData.csvFiles.get(2))));
+    void testOpenValidFileContainsTheSpecificEntryAndEnoughAbbreviations(
+        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 testRemoveLastListSetsCurrentFileAndCurrentAbbreviationToNull(TestData testData) throws IOException {
-        when(dialogService.showFileSaveDialog(any())).thenReturn(Optional.of(createTestFile(testData.csvFiles.get(0))));
+    void testRemoveLastListSetsCurrentFileAndCurrentAbbreviationToNull(
+        TestData testData
+    ) throws IOException {
+        when(dialogService.showFileSaveDialog(any()))
+            .thenReturn(Optional.of(createTestFile(testData.csvFiles.get(0))));
         viewModel.addNewFile();
         viewModel.removeCurrentFile();
 
@@ -281,11 +466,15 @@ void testRemoveLastListSetsCurrentFileAndCurrentAbbreviationToNull(TestData test
     @MethodSource("provideTestFiles")
     void testMixedFileUsage(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));
+        viewModel
+            .currentFileProperty()
+            .set(viewModel.journalFilesProperty().get(1));
 
         // size of the list of journal files should be incremented by two
         assertEquals(2, viewModel.journalFilesProperty().size());
@@ -294,12 +483,21 @@ void testMixedFileUsage(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));
+        when(dialogService.showFileSaveDialog(any()))
+            .thenReturn(Optional.of(emptyTestFile));
         viewModel.addNewFile();
-        viewModel.currentFileProperty().set(viewModel.journalFilesProperty().get(2));
+        viewModel
+            .currentFileProperty()
+            .set(viewModel.journalFilesProperty().get(2));
 
         // size of the list of journal files should be incremented by one
         assertEquals(3, viewModel.journalFilesProperty().size());
@@ -308,9 +506,12 @@ void testMixedFileUsage(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));
+        viewModel
+            .currentFileProperty()
+            .set(viewModel.journalFilesProperty().get(3));
 
         // size of the list of journal files should have been incremented by one
         assertEquals(4, viewModel.journalFilesProperty().size());
@@ -319,36 +520,59 @@ void testMixedFileUsage(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
     void testBuiltInListsIncludeAllBuiltInAbbreviations() {
         viewModel.addBuiltInList();
         assertEquals(1, viewModel.journalFilesProperty().getSize());
-        viewModel.currentFileProperty().set(viewModel.journalFilesProperty().get(0));
-        ObservableList<Abbreviation> expected = FXCollections.observableArrayList(repository.getAllLoaded());
-        ObservableList<Abbreviation> actualAbbreviations = FXCollections
-                .observableArrayList(viewModel.abbreviationsProperty().stream()
-                                              .map(AbbreviationViewModel::getAbbreviationObject)
-                                              .collect(Collectors.toList()));
+        viewModel
+            .currentFileProperty()
+            .set(viewModel.journalFilesProperty().get(0));
+        ObservableList<Abbreviation> expected =
+            FXCollections.observableArrayList(repository.getAllLoaded());
+        ObservableList<Abbreviation> actualAbbreviations =
+            FXCollections.observableArrayList(
+                viewModel
+                    .abbreviationsProperty()
+                    .stream()
+                    .map(AbbreviationViewModel::getAbbreviationObject)
+                    .collect(Collectors.toList())
+            );
 
         assertEquals(expected, actualAbbreviations);
     }
 
     @ParameterizedTest
     @MethodSource("provideTestFiles")
-    void testCurrentFilePropertyChangeActiveFile(TestData testData) throws IOException {
+    void testCurrentFilePropertyChangeActiveFile(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();
 
-        AbbreviationsFileViewModel test1 = viewModel.journalFilesProperty().get(0);
-        AbbreviationsFileViewModel test3 = viewModel.journalFilesProperty().get(1);
-        AbbreviationsFileViewModel test4 = viewModel.journalFilesProperty().get(2);
-        AbbreviationsFileViewModel test5 = viewModel.journalFilesProperty().get(3);
+        AbbreviationsFileViewModel test1 = viewModel
+            .journalFilesProperty()
+            .get(0);
+        AbbreviationsFileViewModel test3 = viewModel
+            .journalFilesProperty()
+            .get(1);
+        AbbreviationsFileViewModel test4 = viewModel
+            .journalFilesProperty()
+            .get(2);
+        AbbreviationsFileViewModel test5 = viewModel
+            .journalFilesProperty()
+            .get(3);
 
         // test if the last opened file is active, but duplicated entry has been removed
         assertEquals(5, viewModel.abbreviationsProperty().size());
@@ -370,23 +594,36 @@ void testCurrentFilePropertyChangeActiveFile(TestData testData) throws IOExcepti
 
     @ParameterizedTest
     @MethodSource("provideTestFiles")
-    void testAddAbbreviationIncludesAbbreviationsInAbbreviationList(TestData testData) throws IOException {
-        when(dialogService.showFileSaveDialog(any())).thenReturn(Optional.of(createTestFile(testData.csvFiles.get(2))));
+    void testAddAbbreviationIncludesAbbreviationsInAbbreviationList(
+        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");
+        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 testAddDuplicatedAbbreviationResultsInException(TestData testData) throws IOException {
-        when(dialogService.showFileSaveDialog(any())).thenReturn(Optional.of(createTestFile(testData.csvFiles.get(1))));
+    void testAddDuplicatedAbbreviationResultsInException(TestData testData)
+        throws IOException {
+        when(dialogService.showFileSaveDialog(any()))
+            .thenReturn(Optional.of(createTestFile(testData.csvFiles.get(1))));
         viewModel.addNewFile();
         viewModel.selectLastJournalFile();
         viewModel.addAbbreviation(new Abbreviation("YetAnotherEntry", "YAE"));
@@ -396,44 +633,70 @@ void testAddDuplicatedAbbreviationResultsInException(TestData testData) throws I
 
     @Test
     void testEditSameAbbreviationWithNoChangeDoesNotResultInException() {
-        when(dialogService.showFileSaveDialog(any())).thenReturn(Optional.of(emptyTestFile));
+        when(dialogService.showFileSaveDialog(any()))
+            .thenReturn(Optional.of(emptyTestFile));
         viewModel.addNewFile();
         viewModel.selectLastJournalFile();
-        Abbreviation testAbbreviation = new Abbreviation("YetAnotherEntry", "YAE");
+        Abbreviation testAbbreviation = new Abbreviation(
+            "YetAnotherEntry",
+            "YAE"
+        );
         viewModel.addAbbreviation(testAbbreviation);
         viewModel.editAbbreviation(testAbbreviation);
 
-        assertTrue(viewModel.abbreviationsProperty().contains(new AbbreviationViewModel(testAbbreviation)));
+        assertTrue(
+            viewModel
+                .abbreviationsProperty()
+                .contains(new AbbreviationViewModel(testAbbreviation))
+        );
     }
 
     @ParameterizedTest
     @MethodSource("provideTestFiles")
-    void testEditAbbreviationIncludesNewAbbreviationInAbbreviationsList(TestData testData) throws IOException {
-        when(dialogService.showFileSaveDialog(any())).thenReturn(Optional.of(createTestFile(testData.csvFiles.get(2))));
+    void testEditAbbreviationIncludesNewAbbreviationInAbbreviationsList(
+        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();
-        Abbreviation testAbbreviation = new Abbreviation("YetAnotherEntry", "YAE");
+        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))
+        );
 
-        when(dialogService.showFileSaveDialog(any())).thenReturn(Optional.of(emptyTestFile));
+        when(dialogService.showFileSaveDialog(any()))
+            .thenReturn(Optional.of(emptyTestFile));
         viewModel.addNewFile();
         viewModel.selectLastJournalFile();
         // 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 testEditAbbreviationToExistingOneResultsInException(TestData testData) throws IOException {
-        when(dialogService.showFileSaveDialog(any())).thenReturn(Optional.of(createTestFile(testData.csvFiles.get(1))));
+    void testEditAbbreviationToExistingOneResultsInException(TestData testData)
+        throws IOException {
+        when(dialogService.showFileSaveDialog(any()))
+            .thenReturn(Optional.of(createTestFile(testData.csvFiles.get(1))));
         viewModel.addNewFile();
         viewModel.selectLastJournalFile();
         selectLastAbbreviation();
@@ -441,15 +704,19 @@ void testEditAbbreviationToExistingOneResultsInException(TestData testData) thro
         assertEquals(3, viewModel.abbreviationsProperty().size());
 
         viewModel.editAbbreviation(new Abbreviation("YetAnotherEntry", "YAE"));
-        viewModel.currentAbbreviationProperty().set(viewModel.abbreviationsProperty().get(1));
+        viewModel
+            .currentAbbreviationProperty()
+            .set(viewModel.abbreviationsProperty().get(1));
         viewModel.editAbbreviation(new Abbreviation("YetAnotherEntry", "YAE"));
         verify(dialogService).showErrorDialogAndWait(anyString(), anyString());
     }
 
     @ParameterizedTest
     @MethodSource("provideTestFiles")
-    void testEditAbbreviationToEmptyNameResultsInException(TestData testData) throws IOException {
-        when(dialogService.showFileSaveDialog(any())).thenReturn(Optional.of(createTestFile(testData.csvFiles.get(1))));
+    void testEditAbbreviationToEmptyNameResultsInException(TestData testData)
+        throws IOException {
+        when(dialogService.showFileSaveDialog(any()))
+            .thenReturn(Optional.of(createTestFile(testData.csvFiles.get(1))));
         viewModel.addNewFile();
         viewModel.selectLastJournalFile();
         selectLastAbbreviation();
@@ -462,8 +729,11 @@ void testEditAbbreviationToEmptyNameResultsInException(TestData testData) throws
 
     @ParameterizedTest
     @MethodSource("provideTestFiles")
-    void testEditAbbreviationToEmptyAbbreviationResultsInException(TestData testData) throws IOException {
-        when(dialogService.showFileSaveDialog(any())).thenReturn(Optional.of(createTestFile(testData.csvFiles.get(1))));
+    void testEditAbbreviationToEmptyAbbreviationResultsInException(
+        TestData testData
+    ) throws IOException {
+        when(dialogService.showFileSaveDialog(any()))
+            .thenReturn(Optional.of(createTestFile(testData.csvFiles.get(1))));
         viewModel.addNewFile();
         viewModel.selectLastJournalFile();
         selectLastAbbreviation();
@@ -476,35 +746,59 @@ void testEditAbbreviationToEmptyAbbreviationResultsInException(TestData testData
 
     @ParameterizedTest
     @MethodSource("provideTestFiles")
-    void testSaveAbbreviationsToFilesCreatesNewFilesWithWrittenAbbreviations(TestData testData) throws Exception {
+    void testSaveAbbreviationsToFilesCreatesNewFilesWithWrittenAbbreviations(
+        TestData testData
+    ) throws Exception {
         Path testFile2 = createTestFile(testData.csvFiles.get(2));
-        when(dialogService.showFileSaveDialog(any())).thenReturn(Optional.of(testFile2));
+        when(dialogService.showFileSaveDialog(any()))
+            .thenReturn(Optional.of(testFile2));
         viewModel.addNewFile();
         viewModel.selectLastJournalFile();
         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));
+        when(dialogService.showFileSaveDialog(any()))
+            .thenReturn(Optional.of(testFile3));
         viewModel.addNewFile();
         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();
 
-        List<String> actual = Files.readAllLines(testFile2, StandardCharsets.UTF_8);
+        List<String> actual = Files.readAllLines(
+            testFile2,
+            StandardCharsets.UTF_8
+        );
         assertEquals(testData.finalContentsOfFile2, actual);
 
         actual = Files.readAllLines(testFile3, StandardCharsets.UTF_8);
@@ -515,19 +809,27 @@ void testSaveAbbreviationsToFilesCreatesNewFilesWithWrittenAbbreviations(TestDat
      * 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 {
+    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();
     }
 
-    private Path createTestFile(CsvFileNameAndContent testFile) throws IOException {
+    private Path createTestFile(CsvFileNameAndContent testFile)
+        throws IOException {
         Path file = this.tempFolder.resolve(testFile.fileName);
         Files.writeString(file, testFile.content);
         return file;
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 54371690bd7..e5bb438f7e7 100644
--- a/src/test/java/org/jabref/gui/preferences/keybindings/KeyBindingViewModelTest.java
+++ b/src/test/java/org/jabref/gui/preferences/keybindings/KeyBindingViewModelTest.java
@@ -1,46 +1,77 @@
 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 java.util.Optional;
 import javafx.scene.input.KeyCode;
 import javafx.scene.input.KeyEvent;
-
 import org.jabref.gui.DialogService;
 import org.jabref.gui.keyboard.KeyBinding;
 import org.jabref.gui.keyboard.KeyBindingRepository;
 import org.jabref.preferences.PreferencesService;
-
 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;
-
 class KeyBindingViewModelTest {
 
-  @Test
-  void resetToDefault() {
-    // Set new key binding
-    KeyBindingRepository keyBindingRepository = new KeyBindingRepository();
-    KeyBindingsTabViewModel keyBindingsTabViewModel = new KeyBindingsTabViewModel(keyBindingRepository, mock(DialogService.class), mock(PreferencesService.class));
-    KeyBinding binding = KeyBinding.ABBREVIATE;
+    @Test
+    void resetToDefault() {
+        // Set new key binding
+        KeyBindingRepository keyBindingRepository = new KeyBindingRepository();
+        KeyBindingsTabViewModel keyBindingsTabViewModel =
+            new KeyBindingsTabViewModel(
+                keyBindingRepository,
+                mock(DialogService.class),
+                mock(PreferencesService.class)
+            );
+        KeyBinding binding = KeyBinding.ABBREVIATE;
 
-    KeyBindingViewModel viewModel = new KeyBindingViewModel(keyBindingRepository, binding, binding.getDefaultKeyBinding());
-    keyBindingsTabViewModel.selectedKeyBindingProperty().set(Optional.of(viewModel));
+        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();
+        keyBindingsTabViewModel.setNewBindingForCurrent(shortcutKeyEvent);
+        keyBindingsTabViewModel.storeSettings();
 
-    assertTrue(keyBindingRepository.checkKeyCombinationEquality(KeyBinding.ABBREVIATE, shortcutKeyEvent));
+        assertTrue(
+            keyBindingRepository.checkKeyCombinationEquality(
+                KeyBinding.ABBREVIATE,
+                shortcutKeyEvent
+            )
+        );
 
-    // Reset to default
-    viewModel.resetToDefault();
+        // 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/CopyCitationActionTest.java b/src/test/java/org/jabref/gui/preview/CopyCitationActionTest.java
index b8e686d5387..62acdbfefed 100644
--- a/src/test/java/org/jabref/gui/preview/CopyCitationActionTest.java
+++ b/src/test/java/org/jabref/gui/preview/CopyCitationActionTest.java
@@ -1,44 +1,64 @@
 package org.jabref.gui.preview;
 
-import java.util.Arrays;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
+import java.util.Arrays;
 import javafx.scene.input.ClipboardContent;
-
 import org.jabref.logic.util.OS;
-
 import org.junit.jupiter.api.Test;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-
 class CopyCitationActionTest {
 
     @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 = CopyCitationAction.processPreview(Arrays.asList(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 = CopyCitationAction.processPreview(
+            Arrays.asList(citation, citation)
+        );
         String actual = clipboardContent.getString();
 
         assertEquals(expected, actual);
@@ -46,63 +66,103 @@ 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 = CopyCitationAction.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 = CopyCitationAction.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 = CopyCitationAction.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 = CopyCitationAction.processText(
+            Arrays.asList(citation, citation)
+        );
 
         String actual = textTransferable.getString();
         assertEquals(expected, actual);
@@ -110,29 +170,51 @@ 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 = CopyCitationAction.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 = CopyCitationAction.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 830cfff46b5..1579d551932 100644
--- a/src/test/java/org/jabref/gui/push/PushToEmacsTest.java
+++ b/src/test/java/org/jabref/gui/push/PushToEmacsTest.java
@@ -1,48 +1,61 @@
 package org.jabref.gui.push;
 
-import java.util.Map;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
 
+import java.util.Map;
 import javafx.beans.property.SimpleMapProperty;
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableMap;
-
 import org.jabref.gui.DialogService;
 import org.jabref.logic.util.OS;
 import org.jabref.preferences.ExternalApplicationsPreferences;
 import org.jabref.preferences.PreferencesService;
 import org.jabref.preferences.PushToApplicationPreferences;
-
 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;
-
 @Disabled("Needs running emacs daemon. Start emacs with --daemon")
 class PushToEmacsTest {
+
     PushToEmacs pushToEmacs;
 
     @BeforeEach
     public void setup() {
-        DialogService dialogService = mock(DialogService.class, Answers.RETURNS_DEEP_STUBS);
+        DialogService dialogService = mock(
+            DialogService.class,
+            Answers.RETURNS_DEEP_STUBS
+        );
         PreferencesService preferencesService = mock(PreferencesService.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(pushToApplicationPreferences.getEmacsArguments())
+            .thenReturn("-n -e");
 
-        when(preferencesService.getPushToApplicationPreferences()).thenReturn(pushToApplicationPreferences);
+        when(preferencesService.getPushToApplicationPreferences())
+            .thenReturn(pushToApplicationPreferences);
 
-        ExternalApplicationsPreferences externalApplicationsPreferences = mock(ExternalApplicationsPreferences.class);
-        when(externalApplicationsPreferences.getCiteCommand()).thenReturn("\\cite{key1,key2}");
-        when(preferencesService.getExternalApplicationsPreferences()).thenReturn(externalApplicationsPreferences);
+        ExternalApplicationsPreferences externalApplicationsPreferences = mock(
+            ExternalApplicationsPreferences.class
+        );
+        when(externalApplicationsPreferences.getCiteCommand())
+            .thenReturn("\\cite{key1,key2}");
+        when(preferencesService.getExternalApplicationsPreferences())
+            .thenReturn(externalApplicationsPreferences);
 
         pushToEmacs = new PushToEmacs(dialogService, preferencesService);
     }
diff --git a/src/test/java/org/jabref/gui/search/ContainsAndRegexBasedSearchRuleDescriberTest.java b/src/test/java/org/jabref/gui/search/ContainsAndRegexBasedSearchRuleDescriberTest.java
index bc3406ec43c..273464b31b5 100644
--- a/src/test/java/org/jabref/gui/search/ContainsAndRegexBasedSearchRuleDescriberTest.java
+++ b/src/test/java/org/jabref/gui/search/ContainsAndRegexBasedSearchRuleDescriberTest.java
@@ -2,17 +2,14 @@
 
 import java.util.EnumSet;
 import java.util.List;
-
 import javafx.scene.text.Text;
 import javafx.scene.text.TextFlow;
 import javafx.stage.Stage;
-
 import org.jabref.gui.search.rules.describer.ContainsAndRegexBasedSearchRuleDescriber;
 import org.jabref.gui.util.TooltipTextUtil;
 import org.jabref.model.search.rules.SearchRules;
 import org.jabref.model.search.rules.SearchRules.SearchFlags;
 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;
@@ -32,10 +29,17 @@ void onStart(Stage stage) {
     void testSimpleTerm() {
         String query = "test";
         List<Text> expectedTexts = List.of(
-                TooltipTextUtil.createText("This search contains entries in which any field contains the term "),
-                TooltipTextUtil.createText("test", TooltipTextUtil.TextType.BOLD),
-                TooltipTextUtil.createText(" (case insensitive). "));
-        TextFlow description = new ContainsAndRegexBasedSearchRuleDescriber(EnumSet.noneOf(SearchFlags.class), query).getDescription();
+            TooltipTextUtil.createText(
+                "This search contains entries in which any field contains the term "
+            ),
+            TooltipTextUtil.createText("test", TooltipTextUtil.TextType.BOLD),
+            TooltipTextUtil.createText(" (case insensitive). ")
+        );
+        TextFlow description = new ContainsAndRegexBasedSearchRuleDescriber(
+            EnumSet.noneOf(SearchFlags.class),
+            query
+        )
+            .getDescription();
 
         TextFlowEqualityHelper.assertEquals(expectedTexts, description);
     }
@@ -44,12 +48,19 @@ void testSimpleTerm() {
     void testNoAst() {
         String query = "a b";
         List<Text> expectedTexts = List.of(
-                TooltipTextUtil.createText("This search contains entries in which any field contains the term "),
-                TooltipTextUtil.createText("a", TooltipTextUtil.TextType.BOLD),
-                TooltipTextUtil.createText(" and "),
-                TooltipTextUtil.createText("b", TooltipTextUtil.TextType.BOLD),
-                TooltipTextUtil.createText(" (case insensitive). "));
-        TextFlow description = new ContainsAndRegexBasedSearchRuleDescriber(EnumSet.noneOf(SearchFlags.class), query).getDescription();
+            TooltipTextUtil.createText(
+                "This search contains entries in which any field contains the term "
+            ),
+            TooltipTextUtil.createText("a", TooltipTextUtil.TextType.BOLD),
+            TooltipTextUtil.createText(" and "),
+            TooltipTextUtil.createText("b", TooltipTextUtil.TextType.BOLD),
+            TooltipTextUtil.createText(" (case insensitive). ")
+        );
+        TextFlow description = new ContainsAndRegexBasedSearchRuleDescriber(
+            EnumSet.noneOf(SearchFlags.class),
+            query
+        )
+            .getDescription();
 
         TextFlowEqualityHelper.assertEquals(expectedTexts, description);
     }
@@ -58,12 +69,19 @@ void testNoAst() {
     void testNoAstRegex() {
         String query = "a b";
         List<Text> expectedTexts = List.of(
-                TooltipTextUtil.createText("This search contains entries in which any field contains the regular expression "),
-                TooltipTextUtil.createText("a", TooltipTextUtil.TextType.BOLD),
-                TooltipTextUtil.createText(" and "),
-                TooltipTextUtil.createText("b", TooltipTextUtil.TextType.BOLD),
-                TooltipTextUtil.createText(" (case insensitive). "));
-        TextFlow description = new ContainsAndRegexBasedSearchRuleDescriber(EnumSet.of(SearchRules.SearchFlags.REGULAR_EXPRESSION), query).getDescription();
+            TooltipTextUtil.createText(
+                "This search contains entries in which any field contains the regular expression "
+            ),
+            TooltipTextUtil.createText("a", TooltipTextUtil.TextType.BOLD),
+            TooltipTextUtil.createText(" and "),
+            TooltipTextUtil.createText("b", TooltipTextUtil.TextType.BOLD),
+            TooltipTextUtil.createText(" (case insensitive). ")
+        );
+        TextFlow description = new ContainsAndRegexBasedSearchRuleDescriber(
+            EnumSet.of(SearchRules.SearchFlags.REGULAR_EXPRESSION),
+            query
+        )
+            .getDescription();
 
         TextFlowEqualityHelper.assertEquals(expectedTexts, description);
     }
@@ -72,12 +90,22 @@ void testNoAstRegex() {
     void testNoAstRegexCaseSensitive() {
         String query = "a b";
         List<Text> expectedTexts = List.of(
-                TooltipTextUtil.createText("This search contains entries in which any field contains the regular expression "),
-                TooltipTextUtil.createText("a", TooltipTextUtil.TextType.BOLD),
-                TooltipTextUtil.createText(" and "),
-                TooltipTextUtil.createText("b", TooltipTextUtil.TextType.BOLD),
-                TooltipTextUtil.createText(" (case sensitive). "));
-        TextFlow description = new ContainsAndRegexBasedSearchRuleDescriber(EnumSet.of(SearchRules.SearchFlags.CASE_SENSITIVE, SearchRules.SearchFlags.REGULAR_EXPRESSION), query).getDescription();
+            TooltipTextUtil.createText(
+                "This search contains entries in which any field contains the regular expression "
+            ),
+            TooltipTextUtil.createText("a", TooltipTextUtil.TextType.BOLD),
+            TooltipTextUtil.createText(" and "),
+            TooltipTextUtil.createText("b", TooltipTextUtil.TextType.BOLD),
+            TooltipTextUtil.createText(" (case sensitive). ")
+        );
+        TextFlow description = new ContainsAndRegexBasedSearchRuleDescriber(
+            EnumSet.of(
+                SearchRules.SearchFlags.CASE_SENSITIVE,
+                SearchRules.SearchFlags.REGULAR_EXPRESSION
+            ),
+            query
+        )
+            .getDescription();
 
         TextFlowEqualityHelper.assertEquals(expectedTexts, description);
     }
@@ -86,12 +114,19 @@ void testNoAstRegexCaseSensitive() {
     void testNoAstCaseSensitive() {
         String query = "a b";
         List<Text> expectedTexts = List.of(
-                TooltipTextUtil.createText("This search contains entries in which any field contains the term "),
-                TooltipTextUtil.createText("a", TooltipTextUtil.TextType.BOLD),
-                TooltipTextUtil.createText(" and "),
-                TooltipTextUtil.createText("b", TooltipTextUtil.TextType.BOLD),
-                TooltipTextUtil.createText(" (case sensitive). "));
-        TextFlow description = new ContainsAndRegexBasedSearchRuleDescriber(EnumSet.of(SearchRules.SearchFlags.CASE_SENSITIVE), query).getDescription();
+            TooltipTextUtil.createText(
+                "This search contains entries in which any field contains the term "
+            ),
+            TooltipTextUtil.createText("a", TooltipTextUtil.TextType.BOLD),
+            TooltipTextUtil.createText(" and "),
+            TooltipTextUtil.createText("b", TooltipTextUtil.TextType.BOLD),
+            TooltipTextUtil.createText(" (case sensitive). ")
+        );
+        TextFlow description = new ContainsAndRegexBasedSearchRuleDescriber(
+            EnumSet.of(SearchRules.SearchFlags.CASE_SENSITIVE),
+            query
+        )
+            .getDescription();
 
         TextFlowEqualityHelper.assertEquals(expectedTexts, description);
     }
diff --git a/src/test/java/org/jabref/gui/search/GetLastSearchHistoryTest.java b/src/test/java/org/jabref/gui/search/GetLastSearchHistoryTest.java
index 390c9c81505..8ffc87c03f4 100644
--- a/src/test/java/org/jabref/gui/search/GetLastSearchHistoryTest.java
+++ b/src/test/java/org/jabref/gui/search/GetLastSearchHistoryTest.java
@@ -1,12 +1,9 @@
 package org.jabref.gui.search;
 
 import java.util.List;
-
 import javafx.stage.Stage;
-
 import org.jabref.gui.StateManager;
 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;
@@ -16,6 +13,7 @@
 @GUITest
 @ExtendWith(ApplicationExtension.class)
 public class GetLastSearchHistoryTest {
+
     @Start
     void onStart(Stage stage) {
         // Needed to init JavaFX thread
diff --git a/src/test/java/org/jabref/gui/search/GlobalSearchBarTest.java b/src/test/java/org/jabref/gui/search/GlobalSearchBarTest.java
index b702ec57e2d..d3ac7e1a5e5 100644
--- a/src/test/java/org/jabref/gui/search/GlobalSearchBarTest.java
+++ b/src/test/java/org/jabref/gui/search/GlobalSearchBarTest.java
@@ -1,13 +1,16 @@
 package org.jabref.gui.search;
 
+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.List;
-
 import javafx.scene.Scene;
 import javafx.scene.control.TextInputControl;
 import javafx.scene.layout.HBox;
 import javafx.stage.Stage;
-
 import org.jabref.gui.DialogService;
 import org.jabref.gui.JabRefFrame;
 import org.jabref.gui.StateManager;
@@ -18,7 +21,6 @@
 import org.jabref.preferences.PreferencesService;
 import org.jabref.preferences.SearchPreferences;
 import org.jabref.testutils.category.GUITest;
-
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.Answers;
@@ -26,14 +28,10 @@
 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.Mockito.mock;
-import static org.mockito.Mockito.when;
-
 @GUITest
 @ExtendWith(ApplicationExtension.class)
 public class GlobalSearchBarTest {
+
     private Stage stage;
     private Scene scene;
     private HBox hBox;
@@ -44,8 +42,12 @@ public class GlobalSearchBarTest {
     @Start
     public void onStart(Stage stage) {
         SearchPreferences searchPreferences = mock(SearchPreferences.class);
-        when(searchPreferences.getSearchFlags()).thenReturn(EnumSet.noneOf(SearchRules.SearchFlags.class));
-        PreferencesService prefs = mock(PreferencesService.class, Answers.RETURNS_DEEP_STUBS);
+        when(searchPreferences.getSearchFlags())
+            .thenReturn(EnumSet.noneOf(SearchRules.SearchFlags.class));
+        PreferencesService prefs = mock(
+            PreferencesService.class,
+            Answers.RETURNS_DEEP_STUBS
+        );
         when(prefs.getSearchPreferences()).thenReturn(searchPreferences);
 
         stateManager = new StateManager();
@@ -53,13 +55,14 @@ public void onStart(Stage stage) {
         stateManager.setActiveDatabase(new BibDatabaseContext());
 
         // Instantiate GlobalSearchBar class, so the change listener is registered
-        searchBar = new GlobalSearchBar(
+        searchBar =
+            new GlobalSearchBar(
                 mock(JabRefFrame.class),
                 stateManager,
                 prefs,
                 mock(CountingUndoManager.class),
                 mock(DialogService.class)
-        );
+            );
 
         hBox = new HBox(searchBar);
 
@@ -71,11 +74,14 @@ public void onStart(Stage stage) {
     }
 
     @Test
-    void recordingSearchQueriesOnFocusLostOnly(FxRobot robot) throws InterruptedException {
+    void recordingSearchQueriesOnFocusLostOnly(FxRobot robot)
+        throws InterruptedException {
         stateManager.clearSearchHistory();
         String searchQuery = "Smith";
         // Track the node, that the search query will be typed into
-        TextInputControl searchField = robot.lookup("#searchField").queryTextInputControl();
+        TextInputControl searchField = robot
+            .lookup("#searchField")
+            .queryTextInputControl();
 
         // The focus is on searchField node, as we click on the search box
         var searchFieldRoboto = robot.clickOn(searchField);
@@ -87,7 +93,10 @@ void recordingSearchQueriesOnFocusLostOnly(FxRobot robot) throws InterruptedExce
 
         // Set the focus to another node to trigger the listener and finally record the query.
         DefaultTaskExecutor.runAndWaitInJavaFXThread(hBox::requestFocus);
-        List<String> lastSearchHistory = stateManager.getWholeSearchHistory().stream().toList();
+        List<String> lastSearchHistory = stateManager
+            .getWholeSearchHistory()
+            .stream()
+            .toList();
 
         assertEquals(List.of("Smith"), lastSearchHistory);
     }
@@ -96,13 +105,18 @@ void recordingSearchQueriesOnFocusLostOnly(FxRobot robot) throws InterruptedExce
     void emptyQueryIsNotRecorded(FxRobot robot) {
         stateManager.clearSearchHistory();
         String searchQuery = "";
-        TextInputControl searchField = robot.lookup("#searchField").queryTextInputControl();
+        TextInputControl searchField = robot
+            .lookup("#searchField")
+            .queryTextInputControl();
 
         var searchFieldRoboto = robot.clickOn(searchField);
         searchFieldRoboto.write(searchQuery);
 
         DefaultTaskExecutor.runAndWaitInJavaFXThread(hBox::requestFocus);
-        List<String> lastSearchHistory = stateManager.getWholeSearchHistory().stream().toList();
+        List<String> lastSearchHistory = stateManager
+            .getWholeSearchHistory()
+            .stream()
+            .toList();
 
         assertEquals(List.of(), lastSearchHistory);
     }
diff --git a/src/test/java/org/jabref/gui/search/GrammarBasedSearchRuleDescriberTest.java b/src/test/java/org/jabref/gui/search/GrammarBasedSearchRuleDescriberTest.java
index ce2c4cc3a49..7fc9e353b26 100644
--- a/src/test/java/org/jabref/gui/search/GrammarBasedSearchRuleDescriberTest.java
+++ b/src/test/java/org/jabref/gui/search/GrammarBasedSearchRuleDescriberTest.java
@@ -1,27 +1,24 @@
 package org.jabref.gui.search;
 
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
 import java.util.Arrays;
 import java.util.EnumSet;
 import java.util.List;
-
 import javafx.scene.text.Text;
 import javafx.scene.text.TextFlow;
 import javafx.stage.Stage;
-
 import org.jabref.gui.search.rules.describer.GrammarBasedSearchRuleDescriber;
 import org.jabref.gui.util.TooltipTextUtil;
 import org.jabref.model.search.rules.GrammarBasedSearchRule;
 import org.jabref.model.search.rules.SearchRules;
 import org.jabref.model.search.rules.SearchRules.SearchFlags;
 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.assertTrue;
-
 @GUITest
 @ExtendWith(ApplicationExtension.class)
 class GrammarBasedSearchRuleDescriberTest {
@@ -32,20 +29,42 @@ void onStart(Stage stage) {
         stage.show();
     }
 
-    private TextFlow createDescription(String query, EnumSet<SearchFlags> searchFlags) {
-        GrammarBasedSearchRule grammarBasedSearchRule = new GrammarBasedSearchRule(searchFlags);
+    private TextFlow createDescription(
+        String query,
+        EnumSet<SearchFlags> searchFlags
+    ) {
+        GrammarBasedSearchRule grammarBasedSearchRule =
+            new GrammarBasedSearchRule(searchFlags);
         assertTrue(grammarBasedSearchRule.validateSearchStrings(query));
-        GrammarBasedSearchRuleDescriber describer = new GrammarBasedSearchRuleDescriber(searchFlags, grammarBasedSearchRule.getTree());
+        GrammarBasedSearchRuleDescriber describer =
+            new GrammarBasedSearchRuleDescriber(
+                searchFlags,
+                grammarBasedSearchRule.getTree()
+            );
         return describer.getDescription();
     }
 
     @Test
     void testSimpleQueryCaseSensitiveRegex() {
         String query = "a=b";
-        List<Text> expectedTexts = Arrays.asList(TooltipTextUtil.createText("This search contains entries in which "), TooltipTextUtil.createText("the field "), TooltipTextUtil.createText("a", TooltipTextUtil.TextType.BOLD),
-                TooltipTextUtil.createText(" contains the regular expression "), TooltipTextUtil.createText("b", TooltipTextUtil.TextType.BOLD), TooltipTextUtil.createText(". "),
-                TooltipTextUtil.createText("The search is case-sensitive."));
-        TextFlow description = createDescription(query, EnumSet.of(SearchRules.SearchFlags.CASE_SENSITIVE, SearchRules.SearchFlags.REGULAR_EXPRESSION));
+        List<Text> expectedTexts = Arrays.asList(
+            TooltipTextUtil.createText(
+                "This search contains entries in which "
+            ),
+            TooltipTextUtil.createText("the field "),
+            TooltipTextUtil.createText("a", TooltipTextUtil.TextType.BOLD),
+            TooltipTextUtil.createText(" contains the regular expression "),
+            TooltipTextUtil.createText("b", TooltipTextUtil.TextType.BOLD),
+            TooltipTextUtil.createText(". "),
+            TooltipTextUtil.createText("The search is case-sensitive.")
+        );
+        TextFlow description = createDescription(
+            query,
+            EnumSet.of(
+                SearchRules.SearchFlags.CASE_SENSITIVE,
+                SearchRules.SearchFlags.REGULAR_EXPRESSION
+            )
+        );
 
         TextFlowEqualityHelper.assertEquals(expectedTexts, description);
     }
@@ -53,10 +72,21 @@ void testSimpleQueryCaseSensitiveRegex() {
     @Test
     void testSimpleQueryCaseSensitive() {
         String query = "a=b";
-        List<Text> expectedTexts = Arrays.asList(TooltipTextUtil.createText("This search contains entries in which "), TooltipTextUtil.createText("the field "), TooltipTextUtil.createText("a", TooltipTextUtil.TextType.BOLD),
-                TooltipTextUtil.createText(" contains the term "), TooltipTextUtil.createText("b", TooltipTextUtil.TextType.BOLD), TooltipTextUtil.createText(". "),
-                TooltipTextUtil.createText("The search is case-sensitive."));
-        TextFlow description = createDescription(query, EnumSet.of(SearchRules.SearchFlags.CASE_SENSITIVE));
+        List<Text> expectedTexts = Arrays.asList(
+            TooltipTextUtil.createText(
+                "This search contains entries in which "
+            ),
+            TooltipTextUtil.createText("the field "),
+            TooltipTextUtil.createText("a", TooltipTextUtil.TextType.BOLD),
+            TooltipTextUtil.createText(" contains the term "),
+            TooltipTextUtil.createText("b", TooltipTextUtil.TextType.BOLD),
+            TooltipTextUtil.createText(". "),
+            TooltipTextUtil.createText("The search is case-sensitive.")
+        );
+        TextFlow description = createDescription(
+            query,
+            EnumSet.of(SearchRules.SearchFlags.CASE_SENSITIVE)
+        );
 
         TextFlowEqualityHelper.assertEquals(expectedTexts, description);
     }
@@ -64,10 +94,21 @@ void testSimpleQueryCaseSensitive() {
     @Test
     void testSimpleQuery() {
         String query = "a=b";
-        List<Text> expectedTexts = Arrays.asList(TooltipTextUtil.createText("This search contains entries in which "), TooltipTextUtil.createText("the field "), TooltipTextUtil.createText("a", TooltipTextUtil.TextType.BOLD),
-                TooltipTextUtil.createText(" contains the term "), TooltipTextUtil.createText("b", TooltipTextUtil.TextType.BOLD), TooltipTextUtil.createText(". "),
-                TooltipTextUtil.createText("The search is case-insensitive."));
-        TextFlow description = createDescription(query, EnumSet.noneOf(SearchFlags.class));
+        List<Text> expectedTexts = Arrays.asList(
+            TooltipTextUtil.createText(
+                "This search contains entries in which "
+            ),
+            TooltipTextUtil.createText("the field "),
+            TooltipTextUtil.createText("a", TooltipTextUtil.TextType.BOLD),
+            TooltipTextUtil.createText(" contains the term "),
+            TooltipTextUtil.createText("b", TooltipTextUtil.TextType.BOLD),
+            TooltipTextUtil.createText(". "),
+            TooltipTextUtil.createText("The search is case-insensitive.")
+        );
+        TextFlow description = createDescription(
+            query,
+            EnumSet.noneOf(SearchFlags.class)
+        );
 
         TextFlowEqualityHelper.assertEquals(expectedTexts, description);
     }
@@ -75,10 +116,21 @@ void testSimpleQuery() {
     @Test
     void testSimpleQueryRegex() {
         String query = "a=b";
-        List<Text> expectedTexts = Arrays.asList(TooltipTextUtil.createText("This search contains entries in which "), TooltipTextUtil.createText("the field "), TooltipTextUtil.createText("a", TooltipTextUtil.TextType.BOLD),
-                TooltipTextUtil.createText(" contains the regular expression "), TooltipTextUtil.createText("b", TooltipTextUtil.TextType.BOLD), TooltipTextUtil.createText(". "),
-                TooltipTextUtil.createText("The search is case-insensitive."));
-        TextFlow description = createDescription(query, EnumSet.of(SearchRules.SearchFlags.REGULAR_EXPRESSION));
+        List<Text> expectedTexts = Arrays.asList(
+            TooltipTextUtil.createText(
+                "This search contains entries in which "
+            ),
+            TooltipTextUtil.createText("the field "),
+            TooltipTextUtil.createText("a", TooltipTextUtil.TextType.BOLD),
+            TooltipTextUtil.createText(" contains the regular expression "),
+            TooltipTextUtil.createText("b", TooltipTextUtil.TextType.BOLD),
+            TooltipTextUtil.createText(". "),
+            TooltipTextUtil.createText("The search is case-insensitive.")
+        );
+        TextFlow description = createDescription(
+            query,
+            EnumSet.of(SearchRules.SearchFlags.REGULAR_EXPRESSION)
+        );
 
         TextFlowEqualityHelper.assertEquals(expectedTexts, description);
     }
@@ -86,11 +138,35 @@ void testSimpleQueryRegex() {
     @Test
     void testComplexQueryCaseSensitiveRegex() {
         String query = "not a=b and c=e or e=\"x\"";
-        List<Text> expectedTexts = Arrays.asList(TooltipTextUtil.createText("This search contains entries in which "), TooltipTextUtil.createText("not "), TooltipTextUtil.createText("the field "), TooltipTextUtil.createText("a", TooltipTextUtil.TextType.BOLD),
-                TooltipTextUtil.createText(" contains the regular expression "), TooltipTextUtil.createText("b", TooltipTextUtil.TextType.BOLD), TooltipTextUtil.createText(" and "), TooltipTextUtil.createText("the field "), TooltipTextUtil.createText("c", TooltipTextUtil.TextType.BOLD), TooltipTextUtil.createText(" contains the regular expression "),
-                TooltipTextUtil.createText("e", TooltipTextUtil.TextType.BOLD), TooltipTextUtil.createText(" or "), TooltipTextUtil.createText("the field "), TooltipTextUtil.createText("e", TooltipTextUtil.TextType.BOLD), TooltipTextUtil.createText(" contains the regular expression "),
-                TooltipTextUtil.createText("x", TooltipTextUtil.TextType.BOLD), TooltipTextUtil.createText(". "), TooltipTextUtil.createText("The search is case-sensitive."));
-        TextFlow description = createDescription(query, EnumSet.of(SearchRules.SearchFlags.CASE_SENSITIVE, SearchRules.SearchFlags.REGULAR_EXPRESSION));
+        List<Text> expectedTexts = Arrays.asList(
+            TooltipTextUtil.createText(
+                "This search contains entries in which "
+            ),
+            TooltipTextUtil.createText("not "),
+            TooltipTextUtil.createText("the field "),
+            TooltipTextUtil.createText("a", TooltipTextUtil.TextType.BOLD),
+            TooltipTextUtil.createText(" contains the regular expression "),
+            TooltipTextUtil.createText("b", TooltipTextUtil.TextType.BOLD),
+            TooltipTextUtil.createText(" and "),
+            TooltipTextUtil.createText("the field "),
+            TooltipTextUtil.createText("c", TooltipTextUtil.TextType.BOLD),
+            TooltipTextUtil.createText(" contains the regular expression "),
+            TooltipTextUtil.createText("e", TooltipTextUtil.TextType.BOLD),
+            TooltipTextUtil.createText(" or "),
+            TooltipTextUtil.createText("the field "),
+            TooltipTextUtil.createText("e", TooltipTextUtil.TextType.BOLD),
+            TooltipTextUtil.createText(" contains the regular expression "),
+            TooltipTextUtil.createText("x", TooltipTextUtil.TextType.BOLD),
+            TooltipTextUtil.createText(". "),
+            TooltipTextUtil.createText("The search is case-sensitive.")
+        );
+        TextFlow description = createDescription(
+            query,
+            EnumSet.of(
+                SearchRules.SearchFlags.CASE_SENSITIVE,
+                SearchRules.SearchFlags.REGULAR_EXPRESSION
+            )
+        );
 
         TextFlowEqualityHelper.assertEquals(expectedTexts, description);
     }
@@ -98,11 +174,32 @@ void testComplexQueryCaseSensitiveRegex() {
     @Test
     void testComplexQueryRegex() {
         String query = "not a=b and c=e or e=\"x\"";
-        List<Text> expectedTexts = Arrays.asList(TooltipTextUtil.createText("This search contains entries in which "), TooltipTextUtil.createText("not "), TooltipTextUtil.createText("the field "), TooltipTextUtil.createText("a", TooltipTextUtil.TextType.BOLD),
-                TooltipTextUtil.createText(" contains the regular expression "), TooltipTextUtil.createText("b", TooltipTextUtil.TextType.BOLD), TooltipTextUtil.createText(" and "), TooltipTextUtil.createText("the field "), TooltipTextUtil.createText("c", TooltipTextUtil.TextType.BOLD), TooltipTextUtil.createText(" contains the regular expression "),
-                TooltipTextUtil.createText("e", TooltipTextUtil.TextType.BOLD), TooltipTextUtil.createText(" or "), TooltipTextUtil.createText("the field "), TooltipTextUtil.createText("e", TooltipTextUtil.TextType.BOLD), TooltipTextUtil.createText(" contains the regular expression "),
-                TooltipTextUtil.createText("x", TooltipTextUtil.TextType.BOLD), TooltipTextUtil.createText(". "), TooltipTextUtil.createText("The search is case-insensitive."));
-        TextFlow description = createDescription(query, EnumSet.of(SearchRules.SearchFlags.REGULAR_EXPRESSION));
+        List<Text> expectedTexts = Arrays.asList(
+            TooltipTextUtil.createText(
+                "This search contains entries in which "
+            ),
+            TooltipTextUtil.createText("not "),
+            TooltipTextUtil.createText("the field "),
+            TooltipTextUtil.createText("a", TooltipTextUtil.TextType.BOLD),
+            TooltipTextUtil.createText(" contains the regular expression "),
+            TooltipTextUtil.createText("b", TooltipTextUtil.TextType.BOLD),
+            TooltipTextUtil.createText(" and "),
+            TooltipTextUtil.createText("the field "),
+            TooltipTextUtil.createText("c", TooltipTextUtil.TextType.BOLD),
+            TooltipTextUtil.createText(" contains the regular expression "),
+            TooltipTextUtil.createText("e", TooltipTextUtil.TextType.BOLD),
+            TooltipTextUtil.createText(" or "),
+            TooltipTextUtil.createText("the field "),
+            TooltipTextUtil.createText("e", TooltipTextUtil.TextType.BOLD),
+            TooltipTextUtil.createText(" contains the regular expression "),
+            TooltipTextUtil.createText("x", TooltipTextUtil.TextType.BOLD),
+            TooltipTextUtil.createText(". "),
+            TooltipTextUtil.createText("The search is case-insensitive.")
+        );
+        TextFlow description = createDescription(
+            query,
+            EnumSet.of(SearchRules.SearchFlags.REGULAR_EXPRESSION)
+        );
 
         TextFlowEqualityHelper.assertEquals(expectedTexts, description);
     }
@@ -110,10 +207,32 @@ void testComplexQueryRegex() {
     @Test
     void testComplexQueryCaseSensitive() {
         String query = "not a=b and c=e or e=\"x\"";
-        List<Text> expectedTexts = Arrays.asList(TooltipTextUtil.createText("This search contains entries in which "), TooltipTextUtil.createText("not "), TooltipTextUtil.createText("the field "), TooltipTextUtil.createText("a", TooltipTextUtil.TextType.BOLD),
-                TooltipTextUtil.createText(" contains the term "), TooltipTextUtil.createText("b", TooltipTextUtil.TextType.BOLD), TooltipTextUtil.createText(" and "), TooltipTextUtil.createText("the field "), TooltipTextUtil.createText("c", TooltipTextUtil.TextType.BOLD), TooltipTextUtil.createText(" contains the term "), TooltipTextUtil.createText("e", TooltipTextUtil.TextType.BOLD),
-                TooltipTextUtil.createText(" or "), TooltipTextUtil.createText("the field "), TooltipTextUtil.createText("e", TooltipTextUtil.TextType.BOLD), TooltipTextUtil.createText(" contains the term "), TooltipTextUtil.createText("x", TooltipTextUtil.TextType.BOLD), TooltipTextUtil.createText(". "), TooltipTextUtil.createText("The search is case-sensitive."));
-        TextFlow description = createDescription(query, EnumSet.of(SearchRules.SearchFlags.CASE_SENSITIVE));
+        List<Text> expectedTexts = Arrays.asList(
+            TooltipTextUtil.createText(
+                "This search contains entries in which "
+            ),
+            TooltipTextUtil.createText("not "),
+            TooltipTextUtil.createText("the field "),
+            TooltipTextUtil.createText("a", TooltipTextUtil.TextType.BOLD),
+            TooltipTextUtil.createText(" contains the term "),
+            TooltipTextUtil.createText("b", TooltipTextUtil.TextType.BOLD),
+            TooltipTextUtil.createText(" and "),
+            TooltipTextUtil.createText("the field "),
+            TooltipTextUtil.createText("c", TooltipTextUtil.TextType.BOLD),
+            TooltipTextUtil.createText(" contains the term "),
+            TooltipTextUtil.createText("e", TooltipTextUtil.TextType.BOLD),
+            TooltipTextUtil.createText(" or "),
+            TooltipTextUtil.createText("the field "),
+            TooltipTextUtil.createText("e", TooltipTextUtil.TextType.BOLD),
+            TooltipTextUtil.createText(" contains the term "),
+            TooltipTextUtil.createText("x", TooltipTextUtil.TextType.BOLD),
+            TooltipTextUtil.createText(". "),
+            TooltipTextUtil.createText("The search is case-sensitive.")
+        );
+        TextFlow description = createDescription(
+            query,
+            EnumSet.of(SearchRules.SearchFlags.CASE_SENSITIVE)
+        );
 
         TextFlowEqualityHelper.assertEquals(expectedTexts, description);
     }
@@ -121,10 +240,32 @@ void testComplexQueryCaseSensitive() {
     @Test
     void testComplexQuery() {
         String query = "not a=b and c=e or e=\"x\"";
-        List<Text> expectedTexts = Arrays.asList(TooltipTextUtil.createText("This search contains entries in which "), TooltipTextUtil.createText("not "), TooltipTextUtil.createText("the field "), TooltipTextUtil.createText("a", TooltipTextUtil.TextType.BOLD),
-                TooltipTextUtil.createText(" contains the term "), TooltipTextUtil.createText("b", TooltipTextUtil.TextType.BOLD), TooltipTextUtil.createText(" and "), TooltipTextUtil.createText("the field "), TooltipTextUtil.createText("c", TooltipTextUtil.TextType.BOLD), TooltipTextUtil.createText(" contains the term "), TooltipTextUtil.createText("e", TooltipTextUtil.TextType.BOLD),
-                TooltipTextUtil.createText(" or "), TooltipTextUtil.createText("the field "), TooltipTextUtil.createText("e", TooltipTextUtil.TextType.BOLD), TooltipTextUtil.createText(" contains the term "), TooltipTextUtil.createText("x", TooltipTextUtil.TextType.BOLD), TooltipTextUtil.createText(". "), TooltipTextUtil.createText("The search is case-insensitive."));
-        TextFlow description = createDescription(query, EnumSet.noneOf(SearchFlags.class));
+        List<Text> expectedTexts = Arrays.asList(
+            TooltipTextUtil.createText(
+                "This search contains entries in which "
+            ),
+            TooltipTextUtil.createText("not "),
+            TooltipTextUtil.createText("the field "),
+            TooltipTextUtil.createText("a", TooltipTextUtil.TextType.BOLD),
+            TooltipTextUtil.createText(" contains the term "),
+            TooltipTextUtil.createText("b", TooltipTextUtil.TextType.BOLD),
+            TooltipTextUtil.createText(" and "),
+            TooltipTextUtil.createText("the field "),
+            TooltipTextUtil.createText("c", TooltipTextUtil.TextType.BOLD),
+            TooltipTextUtil.createText(" contains the term "),
+            TooltipTextUtil.createText("e", TooltipTextUtil.TextType.BOLD),
+            TooltipTextUtil.createText(" or "),
+            TooltipTextUtil.createText("the field "),
+            TooltipTextUtil.createText("e", TooltipTextUtil.TextType.BOLD),
+            TooltipTextUtil.createText(" contains the term "),
+            TooltipTextUtil.createText("x", TooltipTextUtil.TextType.BOLD),
+            TooltipTextUtil.createText(". "),
+            TooltipTextUtil.createText("The search is case-insensitive.")
+        );
+        TextFlow description = createDescription(
+            query,
+            EnumSet.noneOf(SearchFlags.class)
+        );
 
         TextFlowEqualityHelper.assertEquals(expectedTexts, description);
     }
diff --git a/src/test/java/org/jabref/gui/search/TextFlowEqualityHelper.java b/src/test/java/org/jabref/gui/search/TextFlowEqualityHelper.java
index 15246db4681..51e3060557c 100644
--- a/src/test/java/org/jabref/gui/search/TextFlowEqualityHelper.java
+++ b/src/test/java/org/jabref/gui/search/TextFlowEqualityHelper.java
@@ -1,15 +1,16 @@
 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;
 
 public class TextFlowEqualityHelper {
 
-    public static void assertEquals(List<Text> expectedTexts, TextFlow description) {
+    public static void assertEquals(
+        List<Text> expectedTexts,
+        TextFlow description
+    ) {
         if (expectedTexts.size() != description.getChildren().size()) {
             Assertions.assertEquals(expectedTexts, description.getChildren());
             return;
@@ -20,14 +21,24 @@ public static void assertEquals(List<Text> expectedTexts, TextFlow description)
             // the strings contain not only the text but also the font and other properties
             // so comparing them compares the Text object as a whole
             // the equals method is not implemented...
-            if (!expectedText.toString().equals(description.getChildren().get(i).toString())) {
-                Assertions.assertEquals(expectedTexts, description.getChildren());
+            if (
+                !expectedText
+                    .toString()
+                    .equals(description.getChildren().get(i).toString())
+            ) {
+                Assertions.assertEquals(
+                    expectedTexts,
+                    description.getChildren()
+                );
                 return;
             }
         }
     }
 
-    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 27db78fe64d..5815041f189 100644
--- a/src/test/java/org/jabref/gui/sidepane/SidePaneViewModelTest.java
+++ b/src/test/java/org/jabref/gui/sidepane/SidePaneViewModelTest.java
@@ -1,14 +1,16 @@
 package org.jabref.gui.sidepane;
 
+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;
-
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableList;
-
+import javax.swing.undo.UndoManager;
 import org.jabref.gui.DialogService;
 import org.jabref.gui.LibraryTabContainer;
 import org.jabref.gui.StateManager;
@@ -20,23 +22,19 @@
 import org.jabref.model.util.FileUpdateMonitor;
 import org.jabref.preferences.PreferencesService;
 import org.jabref.preferences.SidePanePreferences;
-
 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;
-
 @ExtendWith(ApplicationExtension.class)
 class SidePaneViewModelTest {
 
     LibraryTabContainer tabContainer = mock(LibraryTabContainer.class);
     PreferencesService preferencesService = mock(PreferencesService.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);
@@ -44,23 +42,39 @@ class SidePaneViewModelTest {
     BibEntryTypesManager entryTypesManager = mock(BibEntryTypesManager.class);
     UndoManager undoManager = mock(UndoManager.class);
 
-    SidePanePreferences sidePanePreferences = new SidePanePreferences(new HashSet<>(), new HashMap<>(), 0);
-    ObservableList<SidePaneType> sidePaneComponents = FXCollections.observableArrayList();
+    SidePanePreferences sidePanePreferences = new SidePanePreferences(
+        new HashSet<>(),
+        new HashMap<>(),
+        0
+    );
+    ObservableList<SidePaneType> sidePaneComponents =
+        FXCollections.observableArrayList();
     SidePaneViewModel sidePaneViewModel;
 
     @BeforeEach
     void setUp() {
-        when(stateManager.getVisibleSidePaneComponents()).thenReturn(sidePaneComponents);
-        when(stateManager.getLocalDragboard()).thenReturn(mock(CustomLocalDragboard.class));
-        when(stateManager.activeDatabaseProperty()).thenReturn(OptionalObjectProperty.empty());
-        when(preferencesService.getSidePanePreferences()).thenReturn(sidePanePreferences);
-
-        sidePanePreferences.visiblePanes().addAll(EnumSet.allOf(SidePaneType.class));
+        when(stateManager.getVisibleSidePaneComponents())
+            .thenReturn(sidePaneComponents);
+        when(stateManager.getLocalDragboard())
+            .thenReturn(mock(CustomLocalDragboard.class));
+        when(stateManager.activeDatabaseProperty())
+            .thenReturn(OptionalObjectProperty.empty());
+        when(preferencesService.getSidePanePreferences())
+            .thenReturn(sidePanePreferences);
+
+        sidePanePreferences
+            .visiblePanes()
+            .addAll(EnumSet.allOf(SidePaneType.class));
         sidePanePreferences.getPreferredPositions().put(SidePaneType.GROUPS, 0);
-        sidePanePreferences.getPreferredPositions().put(SidePaneType.WEB_SEARCH, 1);
-        sidePanePreferences.getPreferredPositions().put(SidePaneType.OPEN_OFFICE, 2);
-
-        sidePaneViewModel = new SidePaneViewModel(
+        sidePanePreferences
+            .getPreferredPositions()
+            .put(SidePaneType.WEB_SEARCH, 1);
+        sidePanePreferences
+            .getPreferredPositions()
+            .put(SidePaneType.OPEN_OFFICE, 2);
+
+        sidePaneViewModel =
+            new SidePaneViewModel(
                 tabContainer,
                 preferencesService,
                 abbreviationRepository,
@@ -69,7 +83,8 @@ void setUp() {
                 dialogService,
                 fileUpdateMonitor,
                 entryTypesManager,
-                undoManager);
+                undoManager
+            );
     }
 
     @Test
@@ -105,10 +120,17 @@ void moveDownFromLastPosition() {
     @Test
     void sortByPreferredPositions() {
         sidePanePreferences.getPreferredPositions().put(SidePaneType.GROUPS, 2);
-        sidePanePreferences.getPreferredPositions().put(SidePaneType.OPEN_OFFICE, 0);
-
-        sidePaneComponents.sort(new SidePaneViewModel.PreferredIndexSort(sidePanePreferences));
-
-        assertTrue(sidePaneComponents.get(0) == SidePaneType.OPEN_OFFICE && sidePaneComponents.get(2) == SidePaneType.GROUPS);
+        sidePanePreferences
+            .getPreferredPositions()
+            .put(SidePaneType.OPEN_OFFICE, 0);
+
+        sidePaneComponents.sort(
+            new SidePaneViewModel.PreferredIndexSort(sidePanePreferences)
+        );
+
+        assertTrue(
+            sidePaneComponents.get(0) == 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 cc84f39e266..db89072ffc3 100644
--- a/src/test/java/org/jabref/gui/slr/ManageStudyDefinitionViewModelTest.java
+++ b/src/test/java/org/jabref/gui/slr/ManageStudyDefinitionViewModelTest.java
@@ -1,23 +1,22 @@
 package org.jabref.gui.slr;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.mockito.Mockito.mock;
+
 import java.nio.file.Path;
 import java.util.List;
-
 import org.jabref.gui.DialogService;
 import org.jabref.logic.importer.ImportFormatPreferences;
 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;
-
 class ManageStudyDefinitionViewModelTest {
+
     private ImportFormatPreferences importFormatPreferences;
     private ImporterPreferences importerPreferences;
     private DialogService dialogService;
@@ -25,18 +24,29 @@ class ManageStudyDefinitionViewModelTest {
     @BeforeEach
     void setUp() {
         // code taken from org.jabref.logic.importer.WebFetchersTest.setUp
-        importFormatPreferences = mock(ImportFormatPreferences.class, Answers.RETURNS_DEEP_STUBS);
-        importerPreferences = mock(ImporterPreferences.class, Answers.RETURNS_DEEP_STUBS);
+        importFormatPreferences =
+            mock(ImportFormatPreferences.class, Answers.RETURNS_DEEP_STUBS);
+        importerPreferences =
+            mock(ImporterPreferences.class, Answers.RETURNS_DEEP_STUBS);
         dialogService = mock(DialogService.class);
     }
 
     @Test
     public void emptyStudyConstructorFillsDatabasesCorrectly() {
-        ManageStudyDefinitionViewModel manageStudyDefinitionViewModel = new ManageStudyDefinitionViewModel(importFormatPreferences, importerPreferences, dialogService);
-        assertEquals(List.of(
+        ManageStudyDefinitionViewModel manageStudyDefinitionViewModel =
+            new ManageStudyDefinitionViewModel(
+                importFormatPreferences,
+                importerPreferences,
+                dialogService
+            );
+        assertEquals(
+            List.of(
                 new StudyCatalogItem("ACM Portal", true),
                 new StudyCatalogItem("ArXiv", false),
-                new StudyCatalogItem("Bibliotheksverbund Bayern (Experimental)", false),
+                new StudyCatalogItem(
+                    "Bibliotheksverbund Bayern (Experimental)",
+                    false
+                ),
                 new StudyCatalogItem("Biodiversity Heritage", false),
                 new StudyCatalogItem("CiteSeerX", false),
                 new StudyCatalogItem("Crossref", false),
@@ -55,16 +65,23 @@ public void emptyStudyConstructorFillsDatabasesCorrectly() {
                 new StudyCatalogItem("SemanticScholar", false),
                 new StudyCatalogItem("Springer", true),
                 new StudyCatalogItem("zbMATH", false)
-        ), manageStudyDefinitionViewModel.getCatalogs());
+            ),
+            manageStudyDefinitionViewModel.getCatalogs()
+        );
     }
 
     @Test
     public void studyConstructorFillsDatabasesCorrectly(@TempDir Path tempDir) {
-        ManageStudyDefinitionViewModel manageStudyDefinitionViewModel = getManageStudyDefinitionViewModel(tempDir);
-        assertEquals(List.of(
+        ManageStudyDefinitionViewModel manageStudyDefinitionViewModel =
+            getManageStudyDefinitionViewModel(tempDir);
+        assertEquals(
+            List.of(
                 new StudyCatalogItem("ACM Portal", true),
                 new StudyCatalogItem("ArXiv", false),
-                new StudyCatalogItem("Bibliotheksverbund Bayern (Experimental)", false),
+                new StudyCatalogItem(
+                    "Bibliotheksverbund Bayern (Experimental)",
+                    false
+                ),
                 new StudyCatalogItem("Biodiversity Heritage", false),
                 new StudyCatalogItem("CiteSeerX", false),
                 new StudyCatalogItem("Crossref", false),
@@ -83,24 +100,30 @@ public void studyConstructorFillsDatabasesCorrectly(@TempDir Path tempDir) {
                 new StudyCatalogItem("SemanticScholar", false),
                 new StudyCatalogItem("Springer", false),
                 new StudyCatalogItem("zbMATH", false)
-        ), manageStudyDefinitionViewModel.getCatalogs());
+            ),
+            manageStudyDefinitionViewModel.getCatalogs()
+        );
     }
 
-    private ManageStudyDefinitionViewModel getManageStudyDefinitionViewModel(Path tempDir) {
+    private ManageStudyDefinitionViewModel getManageStudyDefinitionViewModel(
+        Path tempDir
+    ) {
         List<StudyDatabase> databases = List.of(
-                new StudyDatabase("ACM Portal", true));
+            new StudyDatabase("ACM Portal", true)
+        );
         Study study = new Study(
-                List.of("Name"),
-                "title",
-                List.of("Q1"),
-                List.of(),
-                databases
+            List.of("Name"),
+            "title",
+            List.of("Q1"),
+            List.of(),
+            databases
         );
         return new ManageStudyDefinitionViewModel(
-                study,
-                tempDir,
-                importFormatPreferences,
-                importerPreferences,
-                dialogService);
+            study,
+            tempDir,
+            importFormatPreferences,
+            importerPreferences,
+            dialogService
+        );
     }
 }
diff --git a/src/test/java/org/jabref/gui/theme/ThemeManagerTest.java b/src/test/java/org/jabref/gui/theme/ThemeManagerTest.java
index f96308c18b8..147ef4964f6 100644
--- a/src/test/java/org/jabref/gui/theme/ThemeManagerTest.java
+++ b/src/test/java/org/jabref/gui/theme/ThemeManagerTest.java
@@ -1,22 +1,24 @@
 package org.jabref.gui.theme;
 
+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;
-
 import javafx.application.Platform;
 import javafx.collections.FXCollections;
 import javafx.scene.Parent;
 import javafx.scene.Scene;
 import javafx.scene.web.WebEngine;
-
 import org.jabref.gui.util.DefaultFileUpdateMonitor;
 import org.jabref.model.util.DummyFileUpdateMonitor;
 import org.jabref.preferences.WorkspacePreferences;
-
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Disabled;
@@ -26,20 +28,17 @@
 import org.mockito.Answers;
 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;
-
 @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 = """
-            /* Biblatex Source Code */
-            .code-area .text {
-                -fx-font-family: monospace;
-            }""";
+    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;
+        }""";
 
     private Path tempFolder;
 
@@ -52,17 +51,35 @@ void setUp(@TempDir Path tempFolder) {
     public 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);
-        when(workspacePreferences.getTheme()).thenReturn(new Theme(testCss.toString()));
-
-        ThemeManager themeManager = new ThemeManager(workspacePreferences, new DummyFileUpdateMonitor(), Runnable::run);
+        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
+        );
 
-        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");
+        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"
+        );
         assertEquals(TEST_CSS_DATA, cssLocationBeforeDeletion.get());
     }
 
@@ -72,19 +89,32 @@ public void customThemeAvailableEvenWhenDeleted() throws IOException {
          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);
-        when(workspacePreferences.getTheme()).thenReturn(new Theme(testCss.toString()));
+        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());
     }
 
@@ -98,24 +128,41 @@ public void customThemeAvailableEvenWhenDeleted() throws IOException {
      */
     @Disabled
     @Test
-    public void customThemeBecomesAvailableAfterFileIsCreated() throws IOException {
+    public void customThemeBecomesAvailableAfterFileIsCreated()
+        throws IOException {
         Path testCss = tempFolder.resolve("test.css");
-        WorkspacePreferences workspacePreferences = mock(WorkspacePreferences.class);
-        when(workspacePreferences.getTheme()).thenReturn(new Theme(testCss.toString()));
+        WorkspacePreferences workspacePreferences = mock(
+            WorkspacePreferences.class
+        );
+        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(),
-                "didn't expect additional stylesheet to be available because it didn't exist when theme was created");
+        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());
     }
 
@@ -126,71 +173,137 @@ public void largeCustomThemeNotHeldInMemory() throws IOException {
         Path largeCssTestFile = tempFolder.resolve("test.css");
         Files.createFile(largeCssTestFile);
         Files.writeString(largeCssTestFile, "/* ", StandardOpenOption.CREATE);
-        final String testString = "ALL WORK AND NO PLAY MAKES JACK A DULL BOY\n";
+        final String testString =
+            "ALL WORK AND NO PLAY MAKES JACK A DULL BOY\n";
         for (int i = 0; i <= (48000 / testString.length()); i++) {
-            Files.writeString(largeCssTestFile, testString, StandardOpenOption.APPEND);
+            Files.writeString(
+                largeCssTestFile,
+                testString,
+                StandardOpenOption.APPEND
+            );
         }
         Files.writeString(largeCssTestFile, " */", StandardOpenOption.APPEND);
-        WorkspacePreferences workspacePreferences = mock(WorkspacePreferences.class, Answers.RETURNS_DEEP_STUBS);
-        when(workspacePreferences.getTheme()).thenReturn(new Theme(largeCssTestFile.toString()));
+        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");
-
-        Files.move(largeCssTestFile, largeCssTestFile.resolveSibling("renamed.css"));
+        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(), "",
-                "didn't expect additional stylesheet after css was deleted");
-
-        Files.move(largeCssTestFile.resolveSibling("renamed.css"), largeCssTestFile);
+        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
     public void installThemeOnScene() throws IOException {
         Scene scene = mock(Scene.class);
-        when(scene.getStylesheets()).thenReturn(FXCollections.observableArrayList());
+        when(scene.getStylesheets())
+            .thenReturn(FXCollections.observableArrayList());
         when(scene.getRoot()).thenReturn(mock(Parent.class));
 
         Path testCss = tempFolder.resolve("reload.css");
         Files.writeString(testCss, TEST_CSS_CONTENT, StandardOpenOption.CREATE);
-        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);
+        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.installCss(scene);
 
         assertEquals(2, scene.getStylesheets().size());
-        assertTrue(scene.getStylesheets().contains(testCss.toUri().toURL().toExternalForm()));
+        assertTrue(
+            scene
+                .getStylesheets()
+                .contains(testCss.toUri().toURL().toExternalForm())
+        );
     }
 
     @Test
     public 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);
-        when(workspacePreferences.getTheme()).thenReturn(new Theme(testCss.toString()));
-
-        ThemeManager themeManager = new ThemeManager(workspacePreferences, new DummyFileUpdateMonitor(), Runnable::run);
-
-        CompletableFuture<String> webEngineStyleSheetLocation = new CompletableFuture<>();
+        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
+        );
+
+        CompletableFuture<String> webEngineStyleSheetLocation =
+            new CompletableFuture<>();
 
         Platform.runLater(() -> {
             WebEngine webEngine = new WebEngine();
             themeManager.installCss(webEngine);
 
-            webEngineStyleSheetLocation.complete(webEngine.getUserStyleSheetLocation());
+            webEngineStyleSheetLocation.complete(
+                webEngine.getUserStyleSheetLocation()
+            );
         });
 
         Assertions.assertDoesNotThrow(() -> {
@@ -203,34 +316,50 @@ public void installThemeOnWebEngine() throws IOException {
      * for the thread to start up and the changed css to reload.
      */
     @Test
-    public void liveReloadCssDataUrl() throws IOException, InterruptedException {
+    public 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);
-        when(workspacePreferences.getTheme()).thenReturn(new Theme(testCss.toString()));
+        WorkspacePreferences workspacePreferences = mock(
+            WorkspacePreferences.class,
+            Answers.RETURNS_DEEP_STUBS
+        );
+        when(workspacePreferences.getTheme())
+            .thenReturn(new Theme(testCss.toString()));
 
         final ThemeManager themeManager;
 
-        DefaultFileUpdateMonitor fileUpdateMonitor = new DefaultFileUpdateMonitor();
+        DefaultFileUpdateMonitor fileUpdateMonitor =
+            new DefaultFileUpdateMonitor();
         Thread thread = new Thread(fileUpdateMonitor);
         thread.start();
 
         // Wait for the watch service to start
         Thread.sleep(500);
 
-        themeManager = new ThemeManager(workspacePreferences, fileUpdateMonitor, Runnable::run);
+        themeManager =
+            new ThemeManager(
+                workspacePreferences,
+                fileUpdateMonitor,
+                Runnable::run
+            );
 
         Scene scene = mock(Scene.class);
-        when(scene.getStylesheets()).thenReturn(FXCollections.observableArrayList());
+        when(scene.getStylesheets())
+            .thenReturn(FXCollections.observableArrayList());
         when(scene.getRoot()).thenReturn(mock(Parent.class));
 
         themeManager.installCss(scene);
 
-        Files.writeString(testCss, """
-                /* And now for something slightly different */
-                .code-area .text {
-                    -fx-font-family: serif;
-                }""", StandardOpenOption.CREATE);
+        Files.writeString(
+            testCss,
+            """
+            /* And now for something slightly different */
+            .code-area .text {
+                -fx-font-family: serif;
+            }""",
+            StandardOpenOption.CREATE
+        );
 
         // Wait for the stylesheet to be reloaded
         Thread.sleep(500);
@@ -238,11 +367,18 @@ public void liveReloadCssDataUrl() throws IOException, InterruptedException {
         fileUpdateMonitor.shutdown();
         thread.join();
 
-        Optional<String> testCssLocation2 = themeManager.getActiveTheme().getAdditionalStylesheet().map(StyleSheet::getWebEngineStylesheet);
-        assertTrue(testCssLocation2.isPresent(), "expected custom theme location to be available");
+        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=",
-                testCssLocation2.get(),
-                "stylesheet embedded in data: url should have reloaded");
+            "data:text/css;charset=utf-8;base64,LyogQW5kIG5vdyBmb3Igc29tZXRoaW5nIHNsaWdodGx5IGRpZmZlcmVudCAqLwouY29kZS1hcmVhIC50ZXh0IHsKICAgIC1meC1mb250LWZhbWlseTogc2VyaWY7Cn0=",
+            testCssLocation2.get(),
+            "stylesheet embedded in data: url should have reloaded"
+        );
     }
 }
diff --git a/src/test/java/org/jabref/gui/theme/ThemeTest.java b/src/test/java/org/jabref/gui/theme/ThemeTest.java
index b568d33430a..6830defac32 100644
--- a/src/test/java/org/jabref/gui/theme/ThemeTest.java
+++ b/src/test/java/org/jabref/gui/theme/ThemeTest.java
@@ -1,20 +1,23 @@
 package org.jabref.gui.theme;
 
-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.assertTrue;
 
+import java.util.Optional;
+import org.junit.jupiter.api.Test;
+
 public class ThemeTest {
+
     @Test
     public void lightThemeUsedWhenPathIsBlank() {
         Theme theme = new Theme("");
 
         assertEquals(Theme.Type.DEFAULT, theme.getType());
-        assertEquals(Optional.empty(), theme.getAdditionalStylesheet(),
-                "didn't expect additional stylesheet to be available");
+        assertEquals(
+            Optional.empty(),
+            theme.getAdditionalStylesheet(),
+            "didn't expect additional stylesheet to be available"
+        );
     }
 
     @Test
@@ -22,8 +25,11 @@ public void lightThemeUsedWhenPathIsBaseCss() {
         Theme theme = new Theme("Base.css");
 
         assertEquals(Theme.Type.DEFAULT, theme.getType());
-        assertEquals(Optional.empty(), theme.getAdditionalStylesheet(),
-                "didn't expect additional stylesheet to be available");
+        assertEquals(
+            Optional.empty(),
+            theme.getAdditionalStylesheet(),
+            "didn't expect additional stylesheet to be available"
+        );
     }
 
     @Test
@@ -32,8 +38,16 @@ public void darkThemeUsedWhenPathIsDarkCss() {
 
         assertEquals(Theme.Type.EMBEDDED, theme.getType());
         assertTrue(theme.getAdditionalStylesheet().isPresent());
-        assertEquals("Dark.css", theme.getAdditionalStylesheet().get().getWatchPath().getFileName().toString(),
-                "expected dark theme stylesheet to be available");
+        assertEquals(
+            "Dark.css",
+            theme
+                .getAdditionalStylesheet()
+                .get()
+                .getWatchPath()
+                .getFileName()
+                .toString(),
+            "expected dark theme stylesheet to be available"
+        );
     }
 
     @Test
@@ -41,8 +55,11 @@ public void customThemeIgnoredIfDirectory() {
         Theme theme = new Theme(".");
 
         assertEquals(Theme.Type.DEFAULT, theme.getType());
-        assertEquals(Optional.empty(), theme.getAdditionalStylesheet(),
-                "didn't expect additional stylesheet to be available when location is a directory");
+        assertEquals(
+            Optional.empty(),
+            theme.getAdditionalStylesheet(),
+            "didn't expect additional stylesheet to be available when location is a directory"
+        );
     }
 
     @Test
@@ -50,8 +67,11 @@ public void customThemeIgnoredIfInvalidPath() {
         Theme theme = new Theme("\0\0\0");
 
         assertEquals(Theme.Type.DEFAULT, theme.getType());
-        assertEquals(Optional.empty(), theme.getAdditionalStylesheet(),
-                "didn't expect additional stylesheet when CSS location is just some null terminators!");
+        assertEquals(
+            Optional.empty(),
+            theme.getAdditionalStylesheet(),
+            "didn't expect additional stylesheet when CSS location is just some null terminators!"
+        );
     }
 
     @Test
@@ -60,6 +80,14 @@ public 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 a04489ac908..97de7aecaa6 100644
--- a/src/test/java/org/jabref/gui/util/ColorUtilTest.java
+++ b/src/test/java/org/jabref/gui/util/ColorUtilTest.java
@@ -1,16 +1,14 @@
 package org.jabref.gui.util;
 
-import java.util.stream.Stream;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
+import java.util.stream.Stream;
 import javafx.scene.paint.Color;
-
 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;
-
 public class ColorUtilTest {
 
     private static final Color C1 = Color.color(0.2, 0.4, 1);
@@ -35,11 +33,11 @@ public void toRGBACodeTest(Color color, String expected) {
 
     private static Stream<Arguments> provideToRGBACodeTest() {
         return Stream.of(
-                Arguments.of(C1, String.format("rgba(51,102,255,%f)", 1.0)),
-                Arguments.of(C2, String.format("rgba(255,255,255,%f)", 1.0)),
-                Arguments.of(C3, String.format("rgba(0,0,0,%f)", 0.0)),
-                Arguments.of(C4, String.format("rgba(255,255,255,%f)", 1.0)),
-                Arguments.of(C5, String.format("rgba(153,204,127,%f)", 0.3))
+            Arguments.of(C1, String.format("rgba(51,102,255,%f)", 1.0)),
+            Arguments.of(C2, String.format("rgba(255,255,255,%f)", 1.0)),
+            Arguments.of(C3, String.format("rgba(0,0,0,%f)", 0.0)),
+            Arguments.of(C4, String.format("rgba(255,255,255,%f)", 1.0)),
+            Arguments.of(C5, String.format("rgba(153,204,127,%f)", 0.3))
         );
     }
 
diff --git a/src/test/java/org/jabref/gui/util/ControlHelperTest.java b/src/test/java/org/jabref/gui/util/ControlHelperTest.java
index 1707604d04c..166b39339bd 100644
--- a/src/test/java/org/jabref/gui/util/ControlHelperTest.java
+++ b/src/test/java/org/jabref/gui/util/ControlHelperTest.java
@@ -1,59 +1,93 @@
 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;
-
 public 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)
+            () ->
+                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 008c8e53638..55dbf8fc69b 100644
--- a/src/test/java/org/jabref/gui/util/FileDialogConfigurationTest.java
+++ b/src/test/java/org/jabref/gui/util/FileDialogConfigurationTest.java
@@ -1,77 +1,116 @@
 package org.jabref.gui.util;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
 import java.nio.file.Path;
 import java.util.Optional;
 import java.util.stream.Collectors;
-
 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;
-
 class FileDialogConfigurationTest {
 
     @Test
     void testWithValidDirectoryString(@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 testWithValidDirectoryPath(@TempDir Path tempFolder) {
-        FileDialogConfiguration fileDialogConfiguration = new FileDialogConfiguration.Builder()
-                .withInitialDirectory(tempFolder).build();
-
-        assertEquals(Optional.of(tempFolder), fileDialogConfiguration.getInitialDirectory());
+        FileDialogConfiguration fileDialogConfiguration =
+            new FileDialogConfiguration.Builder()
+                .withInitialDirectory(tempFolder)
+                .build();
+
+        assertEquals(
+            Optional.of(tempFolder),
+            fileDialogConfiguration.getInitialDirectory()
+        );
     }
 
     @Test
     void testWithNullStringDirectory() {
-        FileDialogConfiguration fileDialogConfiguration = new FileDialogConfiguration.Builder()
-                .withInitialDirectory((String) null).build();
-
-        assertEquals(Optional.empty(), fileDialogConfiguration.getInitialDirectory());
+        FileDialogConfiguration fileDialogConfiguration =
+            new FileDialogConfiguration.Builder()
+                .withInitialDirectory((String) null)
+                .build();
+
+        assertEquals(
+            Optional.empty(),
+            fileDialogConfiguration.getInitialDirectory()
+        );
     }
 
     @Test
     void testWithNullPathDirectory() {
-        FileDialogConfiguration fileDialogConfiguration = new FileDialogConfiguration.Builder()
-                .withInitialDirectory((Path) null).build();
-
-        assertEquals(Optional.empty(), fileDialogConfiguration.getInitialDirectory());
+        FileDialogConfiguration fileDialogConfiguration =
+            new FileDialogConfiguration.Builder()
+                .withInitialDirectory((Path) null)
+                .build();
+
+        assertEquals(
+            Optional.empty(),
+            fileDialogConfiguration.getInitialDirectory()
+        );
     }
 
     @Test
     void testWithNonExistingDirectoryAndParentNull() {
         String tempFolder = "workingDirectory";
-        FileDialogConfiguration fileDialogConfiguration = new FileDialogConfiguration.Builder()
-                .withInitialDirectory(tempFolder).build();
-
-        assertEquals(Optional.empty(), fileDialogConfiguration.getInitialDirectory());
+        FileDialogConfiguration fileDialogConfiguration =
+            new FileDialogConfiguration.Builder()
+                .withInitialDirectory(tempFolder)
+                .build();
+
+        assertEquals(
+            Optional.empty(),
+            fileDialogConfiguration.getInitialDirectory()
+        );
     }
 
     @Test
     void testSingleExtension() {
-        FileDialogConfiguration fileDialogConfiguration = new FileDialogConfiguration.Builder()
-                .withDefaultExtension(StandardFileType.BIBTEX_DB).build();
-
-        FileChooser.ExtensionFilter filter = toFilter(String.format("%1s %2s", "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(
+            String.format("%1s %2s", "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()));
+    private FileChooser.ExtensionFilter toFilter(
+        String description,
+        FileType extension
+    ) {
+        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 5ec37c2ee0e..c116842a016 100644
--- a/src/test/java/org/jabref/gui/util/OpenConsoleActionTest.java
+++ b/src/test/java/org/jabref/gui/util/OpenConsoleActionTest.java
@@ -1,37 +1,42 @@
 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 java.util.Optional;
 import org.jabref.gui.OpenConsoleAction;
 import org.jabref.gui.StateManager;
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.preferences.PreferencesService;
-
 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;
-
 public class OpenConsoleActionTest {
 
     private final StateManager stateManager = mock(StateManager.class);
-    private final PreferencesService preferences = mock(PreferencesService.class);
+    private final PreferencesService preferences = mock(
+        PreferencesService.class
+    );
     private final BibDatabaseContext current = mock(BibDatabaseContext.class);
     private final BibDatabaseContext other = mock(BibDatabaseContext.class);
 
     @BeforeEach
     public void setup() {
-        when(stateManager.activeDatabaseProperty()).thenReturn(OptionalObjectProperty.empty());
+        when(stateManager.activeDatabaseProperty())
+            .thenReturn(OptionalObjectProperty.empty());
         when(stateManager.getActiveDatabase()).thenReturn(Optional.of(current));
     }
 
     @Test
     public void newActionGetsCurrentDatabase() {
-        OpenConsoleAction action = new OpenConsoleAction(stateManager, preferences, null);
+        OpenConsoleAction action = new OpenConsoleAction(
+            stateManager,
+            preferences,
+            null
+        );
         action.execute();
         verify(stateManager, times(1)).getActiveDatabase();
         verify(current, times(1)).getDatabasePath();
@@ -39,7 +44,12 @@ public void newActionGetsCurrentDatabase() {
 
     @Test
     public 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 +57,12 @@ public void newActionGetsSuppliedDatabase() {
 
     @Test
     public 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 343ed8d63b1..bd44b3c6bed 100644
--- a/src/test/java/org/jabref/gui/util/RecursiveTreeItemTest.java
+++ b/src/test/java/org/jabref/gui/util/RecursiveTreeItemTest.java
@@ -1,26 +1,25 @@
 package org.jabref.gui.util;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
 import java.util.Collections;
 import java.util.function.Predicate;
 import java.util.stream.Collectors;
-
 import javafx.beans.property.ObjectProperty;
 import javafx.beans.property.SimpleObjectProperty;
 import javafx.scene.control.TreeItem;
-
 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;
-
 class RecursiveTreeItemTest {
 
     private RecursiveTreeItem<TreeNodeTestData.TreeNodeMock> rootTreeItem;
     private TreeNodeTestData.TreeNodeMock root;
-    private ObjectProperty<Predicate<TreeNodeTestData.TreeNodeMock>> filterPredicate;
+    private ObjectProperty<
+        Predicate<TreeNodeTestData.TreeNodeMock>
+    > filterPredicate;
     private TreeNodeTestData.TreeNodeMock node;
 
     @BeforeEach
@@ -31,28 +30,61 @@ void setUp() throws Exception {
 
         filterPredicate = new SimpleObjectProperty<>();
 
-        rootTreeItem = new RecursiveTreeItem<>(root, TreeNode::getChildren, filterPredicate);
+        rootTreeItem =
+            new RecursiveTreeItem<>(
+                root,
+                TreeNode::getChildren,
+                filterPredicate
+            );
     }
 
     @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()));
+            root.getChildAt(1).get().getChildren(),
+            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),
-                rootTreeItem.getChildren().get(0).getChildren().stream().map(TreeItem::getValue).collect(Collectors.toList()));
+            Collections.singletonList(node.getParent().get()),
+            rootTreeItem
+                .getChildren()
+                .stream()
+                .map(TreeItem::getValue)
+                .collect(Collectors.toList())
+        );
+        assertEquals(
+            Collections.singletonList(node),
+            rootTreeItem
+                .getChildren()
+                .get(0)
+                .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 a181178c1d3..6747a28e054 100644
--- a/src/test/java/org/jabref/gui/util/TooltipTextUtilTest.java
+++ b/src/test/java/org/jabref/gui/util/TooltipTextUtilTest.java
@@ -1,24 +1,24 @@
 package org.jabref.gui.util;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
 import java.util.ArrayList;
 import java.util.List;
-
 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;
-
 public class TooltipTextUtilTest {
 
     private String testText = "this is a test text";
 
     @Test
     public void retrieveCorrectTextStyleNormal() {
-        Text text = TooltipTextUtil.createText(testText, TooltipTextUtil.TextType.NORMAL);
+        Text text = TooltipTextUtil.createText(
+            testText,
+            TooltipTextUtil.TextType.NORMAL
+        );
         String textStyle = "Regular";
 
         assertEquals(textStyle, text.getFont().getStyle());
@@ -26,14 +26,20 @@ public void retrieveCorrectTextStyleNormal() {
 
     @Test
     public void stringRemainsTheSameAfterTransformationToNormal() {
-        Text text = TooltipTextUtil.createText(testText, TooltipTextUtil.TextType.NORMAL);
+        Text text = TooltipTextUtil.createText(
+            testText,
+            TooltipTextUtil.TextType.NORMAL
+        );
 
         assertEquals(testText, text.getText());
     }
 
     @Test
     public void retrieveCorrectTextStyleBold() {
-        Text text = TooltipTextUtil.createText(testText, TooltipTextUtil.TextType.BOLD);
+        Text text = TooltipTextUtil.createText(
+            testText,
+            TooltipTextUtil.TextType.BOLD
+        );
         String textStyle = "tooltip-text-bold";
 
         assertEquals(textStyle, text.getStyleClass().toString());
@@ -41,14 +47,20 @@ public void retrieveCorrectTextStyleBold() {
 
     @Test
     public void stringRemainsTheSameAfterTransformationToBold() {
-        Text text = TooltipTextUtil.createText(testText, TooltipTextUtil.TextType.BOLD);
+        Text text = TooltipTextUtil.createText(
+            testText,
+            TooltipTextUtil.TextType.BOLD
+        );
 
         assertEquals(testText, text.getText());
     }
 
     @Test
     public void retrieveCorrectTextStyleItalic() {
-        Text text = TooltipTextUtil.createText(testText, TooltipTextUtil.TextType.ITALIC);
+        Text text = TooltipTextUtil.createText(
+            testText,
+            TooltipTextUtil.TextType.ITALIC
+        );
         String textStyle = "tooltip-text-italic";
 
         assertEquals(textStyle, text.getStyleClass().toString());
@@ -56,21 +68,33 @@ public void retrieveCorrectTextStyleItalic() {
 
     @Test
     public void stringRemainsTheSameAfterTransformationToItalic() {
-        Text text = TooltipTextUtil.createText(testText, TooltipTextUtil.TextType.ITALIC);
+        Text text = TooltipTextUtil.createText(
+            testText,
+            TooltipTextUtil.TextType.ITALIC
+        );
 
         assertEquals(testText, text.getText());
     }
 
     @Test
     public void testCreateTextMonospaced() {
-        Text text = TooltipTextUtil.createText(testText, TooltipTextUtil.TextType.MONOSPACED);
-        assertEquals("tooltip-text-monospaced", text.getStyleClass().toString());
+        Text text = TooltipTextUtil.createText(
+            testText,
+            TooltipTextUtil.TextType.MONOSPACED
+        );
+        assertEquals(
+            "tooltip-text-monospaced",
+            text.getStyleClass().toString()
+        );
         assertEquals(testText, text.getText());
     }
 
     @Test
     public void retrieveCorrectStyleMonospaced() {
-        Text text = TooltipTextUtil.createText(testText, TooltipTextUtil.TextType.MONOSPACED);
+        Text text = TooltipTextUtil.createText(
+            testText,
+            TooltipTextUtil.TextType.MONOSPACED
+        );
         String textStyle = "tooltip-text-monospaced";
 
         assertEquals(textStyle, text.getStyleClass().toString());
@@ -78,14 +102,20 @@ public void retrieveCorrectStyleMonospaced() {
 
     @Test
     public void stringRemainsTheSameAfterTransformationToMonospaced() {
-        Text text = TooltipTextUtil.createText(testText, TooltipTextUtil.TextType.MONOSPACED);
+        Text text = TooltipTextUtil.createText(
+            testText,
+            TooltipTextUtil.TextType.MONOSPACED
+        );
 
         assertEquals(testText, text.getText());
     }
 
     @Test
     public void transformTextToHtmlStringBold() {
-        Text text = TooltipTextUtil.createText(testText, TooltipTextUtil.TextType.BOLD);
+        Text text = TooltipTextUtil.createText(
+            testText,
+            TooltipTextUtil.TextType.BOLD
+        );
         String htmlString = TooltipTextUtil.textToHtmlString(text);
         String expectedString = "<b>" + testText + "</b>";
 
@@ -94,7 +124,10 @@ public void transformTextToHtmlStringBold() {
 
     @Test
     public void transformTextToHtmlStringItalic() {
-        Text text = TooltipTextUtil.createText(testText, TooltipTextUtil.TextType.ITALIC);
+        Text text = TooltipTextUtil.createText(
+            testText,
+            TooltipTextUtil.TextType.ITALIC
+        );
         String htmlString = TooltipTextUtil.textToHtmlString(text);
         String expectedString = "<i>" + testText + "</i>";
 
@@ -103,7 +136,10 @@ public void transformTextToHtmlStringItalic() {
 
     @Test
     public void transformTextToHtmlStringMonospaced() {
-        Text text = TooltipTextUtil.createText(testText, TooltipTextUtil.TextType.MONOSPACED);
+        Text text = TooltipTextUtil.createText(
+            testText,
+            TooltipTextUtil.TextType.MONOSPACED
+        );
         String htmlString = TooltipTextUtil.textToHtmlString(text);
         String expectedString = "<tt>" + testText + "</tt>";
 
@@ -112,7 +148,10 @@ public void transformTextToHtmlStringMonospaced() {
 
     @Test
     public void transformTextToHtmlStringMonospacedBold() {
-        Text text = TooltipTextUtil.createText(testText, TooltipTextUtil.TextType.MONOSPACED);
+        Text text = TooltipTextUtil.createText(
+            testText,
+            TooltipTextUtil.TextType.MONOSPACED
+        );
         text.getStyleClass().add("tooltip-text-bold");
         String htmlString = TooltipTextUtil.textToHtmlString(text);
         String expectedString = "<b><tt>" + testText + "</tt></b>";
@@ -123,7 +162,10 @@ public void transformTextToHtmlStringMonospacedBold() {
     @Test
     public void transformTextToHtmlStringWithLinebreaks() {
         String testText = "this\nis a\ntest text";
-        Text text = TooltipTextUtil.createText(testText, TooltipTextUtil.TextType.NORMAL);
+        Text text = TooltipTextUtil.createText(
+            testText,
+            TooltipTextUtil.TextType.NORMAL
+        );
         String htmlString = TooltipTextUtil.textToHtmlString(text);
         String expectedString = "this<br>is a<br>test text";
 
@@ -133,44 +175,122 @@ public void transformTextToHtmlStringWithLinebreaks() {
     @Test
     public 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
     public 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));
-
-        assertTrue(TextFlowEqualityHelper.checkIfTextsEqualsExpectedTexts(expectedTextList, textList));
+        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
+            )
+        );
     }
 
     @Test
     public 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));
-
-        assertTrue(TextFlowEqualityHelper.checkIfTextsEqualsExpectedTexts(expectedTextList, textList));
+        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
+            )
+        );
     }
 
     @Test
     public 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("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
+            )
+        );
     }
 }
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 4f377051201..eb6bdbf1141 100644
--- a/src/test/java/org/jabref/gui/util/comparator/NumericFieldComparatorTest.java
+++ b/src/test/java/org/jabref/gui/util/comparator/NumericFieldComparatorTest.java
@@ -1,12 +1,13 @@
 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;
+
 public class NumericFieldComparatorTest {
 
-    private final NumericFieldComparator comparator = new NumericFieldComparator();
+    private final NumericFieldComparator comparator =
+        new NumericFieldComparator();
 
     @Test
     public void compareTwoNumericInputs() {
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 2ac2d37f539..d25efe5ea60 100644
--- a/src/test/java/org/jabref/gui/util/comparator/RankingFieldComparatorTest.java
+++ b/src/test/java/org/jabref/gui/util/comparator/RankingFieldComparatorTest.java
@@ -1,24 +1,28 @@
 package org.jabref.gui.util.comparator;
 
-import java.util.Optional;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
+import java.util.Optional;
 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;
-
 public class RankingFieldComparatorTest {
 
     private RankingFieldComparator comparator;
     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
     public 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 b62731b7b38..e129d63595f 100644
--- a/src/test/java/org/jabref/gui/util/comparator/SpecialFieldComparatorTest.java
+++ b/src/test/java/org/jabref/gui/util/comparator/SpecialFieldComparatorTest.java
@@ -1,24 +1,28 @@
 package org.jabref.gui.util.comparator;
 
-import java.util.Optional;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
+import java.util.Optional;
 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;
-
 public class SpecialFieldComparatorTest {
 
     private SpecialFieldComparator comparator;
     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
     public 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 1ec937d6daf..cb3f0b7c509 100644
--- a/src/test/java/org/jabref/http/server/LibrariesResourceTest.java
+++ b/src/test/java/org/jabref/http/server/LibrariesResourceTest.java
@@ -1,34 +1,47 @@
 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 java.util.EnumSet;
+import java.util.stream.Collectors;
 import org.glassfish.jersey.server.ResourceConfig;
 import org.junit.jupiter.api.Test;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-
 class LibrariesResourceTest extends ServerTest {
 
     @Override
     protected Application configure() {
-        ResourceConfig resourceConfig = new ResourceConfig(LibrariesResource.class);
+        ResourceConfig resourceConfig = new ResourceConfig(
+            LibrariesResource.class
+        );
         addPreferencesToResourceConfig(resourceConfig);
         return resourceConfig.getApplication();
     }
 
     @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("\",\"", "[\"", "\"]"));
-        assertEquals(expected, target("/libraries").request().get(String.class));
+        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 f4d43c12b77..f3295bd264c 100644
--- a/src/test/java/org/jabref/http/server/LibraryResourceTest.java
+++ b/src/test/java/org/jabref/http/server/LibraryResourceTest.java
@@ -1,18 +1,20 @@
 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,20 +22,30 @@ protected Application configure() {
 
     @Test
     void getJson() {
-        assertEquals("""
-                @Misc{Author2023test,
-                  author = {Demo Author},
-                  title  = {Demo Title},
-                  year   = {2023},
-                }
-
-                @Comment{jabref-meta: databaseType:bibtex;}
-                """, target("/libraries/" + TestBibFile.GENERAL_SERVER_TEST.id).request(JabrefMediaType.BIBTEX).get(String.class));
+        assertEquals(
+            """
+            @Misc{Author2023test,
+              author = {Demo Author},
+              title  = {Demo Title},
+              year   = {2023},
+            }
+
+            @Comment{jabref-meta: databaseType:bibtex;}
+            """,
+            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 657a340e7c3..835fa5cadae 100644
--- a/src/test/java/org/jabref/http/server/ServerTest.java
+++ b/src/test/java/org/jabref/http/server/ServerTest.java
@@ -1,28 +1,25 @@
 package org.jabref.http.server;
 
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+import com.google.gson.Gson;
 import java.util.EnumSet;
 import java.util.List;
 import java.util.stream.Collectors;
-
 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.preferences.BibEntryPreferences;
 import org.jabref.preferences.GuiPreferences;
 import org.jabref.preferences.PreferencesService;
-
-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;
-
 /**
  * Abstract test class to
  * <ul>
@@ -46,53 +43,79 @@ 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(preferencesService).to(PreferencesService.class).ranked(2);
+    protected void addPreferencesToResourceConfig(
+        ResourceConfig resourceConfig
+    ) {
+        resourceConfig.register(
+            new AbstractBinder() {
+                @Override
+                protected void configure() {
+                    bind(preferencesService)
+                        .to(PreferencesService.class)
+                        .ranked(2);
+                }
             }
-        });
+        );
     }
 
     protected void setAvailableLibraries(EnumSet<TestBibFile> files) {
-        when(guiPreferences.getLastFilesOpened()).thenReturn(
+        when(guiPreferences.getLastFilesOpened())
+            .thenReturn(
                 FXCollections.observableArrayList(
-                        files.stream()
-                             .map(file -> file.path.toString())
-                             .collect(Collectors.toList())));
+                    files
+                        .stream()
+                        .map(file -> file.path.toString())
+                        .collect(Collectors.toList())
+                )
+            );
     }
 
     private static void initializePreferencesService() {
         preferencesService = mock(PreferencesService.class);
 
-        ImportFormatPreferences importFormatPreferences = mock(ImportFormatPreferences.class);
-        when(preferencesService.getImportFormatPreferences()).thenReturn(importFormatPreferences);
-
-        BibEntryPreferences bibEntryPreferences = mock(BibEntryPreferences.class);
-        when(importFormatPreferences.bibEntryPreferences()).thenReturn(bibEntryPreferences);
+        ImportFormatPreferences importFormatPreferences = mock(
+            ImportFormatPreferences.class
+        );
+        when(preferencesService.getImportFormatPreferences())
+            .thenReturn(importFormatPreferences);
+
+        BibEntryPreferences bibEntryPreferences = mock(
+            BibEntryPreferences.class
+        );
+        when(importFormatPreferences.bibEntryPreferences())
+            .thenReturn(bibEntryPreferences);
         when(bibEntryPreferences.getKeywordSeparator()).thenReturn(',');
 
         FieldPreferences fieldWriterPreferences = mock(FieldPreferences.class);
-        when(preferencesService.getFieldPreferences()).thenReturn(fieldWriterPreferences);
+        when(preferencesService.getFieldPreferences())
+            .thenReturn(fieldWriterPreferences);
         when(fieldWriterPreferences.shouldResolveStrings()).thenReturn(false);
 
         // defaults are in {@link org.jabref.preferences.JabRefPreferences.NON_WRAPPABLE_FIELDS}
-        FieldPreferences fieldContentFormatterPreferences = new FieldPreferences(false, List.of(), List.of());
+        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);
 
         guiPreferences = mock(GuiPreferences.class);
         when(preferencesService.getGuiPreferences()).thenReturn(guiPreferences);
 
-        when(guiPreferences.getLastFilesOpened()).thenReturn(FXCollections.observableArrayList(TestBibFile.GENERAL_SERVER_TEST.path.toString()));
+        when(guiPreferences.getLastFilesOpened())
+            .thenReturn(
+                FXCollections.observableArrayList(
+                    TestBibFile.GENERAL_SERVER_TEST.path.toString()
+                )
+            );
     }
 }
diff --git a/src/test/java/org/jabref/http/server/TestBibFile.java b/src/test/java/org/jabref/http/server/TestBibFile.java
index 4897defde32..2906ea38493 100644
--- a/src/test/java/org/jabref/http/server/TestBibFile.java
+++ b/src/test/java/org/jabref/http/server/TestBibFile.java
@@ -1,11 +1,12 @@
 package org.jabref.http.server;
 
 import java.nio.file.Path;
-
 import org.jabref.logic.util.io.BackupFileUtil;
 
 public enum TestBibFile {
-    GENERAL_SERVER_TEST("src/test/resources/org/jabref/http/server/general-server-test.bib"),
+    GENERAL_SERVER_TEST(
+        "src/test/resources/org/jabref/http/server/general-server-test.bib"
+    ),
     JABREF_AUTHORS("src/test/resources/testbib/jabref-authors.bib");
 
     public final Path path;
@@ -13,6 +14,7 @@ public enum TestBibFile {
 
     TestBibFile(String locationInSource) {
         this.path = Path.of(locationInSource).toAbsolutePath();
-        this.id = path.getFileName() + "-" + BackupFileUtil.getUniqueFilePrefix(path);
+        this.id =
+            path.getFileName() + "-" + BackupFileUtil.getUniqueFilePrefix(path);
     }
 }
diff --git a/src/test/java/org/jabref/logic/TypedBibEntryTest.java b/src/test/java/org/jabref/logic/TypedBibEntryTest.java
index 683d636e7c2..1ea8cc14404 100644
--- a/src/test/java/org/jabref/logic/TypedBibEntryTest.java
+++ b/src/test/java/org/jabref/logic/TypedBibEntryTest.java
@@ -1,20 +1,20 @@
 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.model.database.BibDatabaseMode;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.BibEntryTypesManager;
 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;
-
 public class TypedBibEntryTest {
+
     private BibEntryTypesManager entryTypesManager;
 
     @BeforeEach
diff --git a/src/test/java/org/jabref/logic/auxparser/AuxParserTest.java b/src/test/java/org/jabref/logic/auxparser/AuxParserTest.java
index bbff99034ab..74a99e0c018 100644
--- a/src/test/java/org/jabref/logic/auxparser/AuxParserTest.java
+++ b/src/test/java/org/jabref/logic/auxparser/AuxParserTest.java
@@ -1,5 +1,10 @@
 package org.jabref.logic.auxparser;
 
+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;
@@ -8,29 +13,24 @@
 import java.nio.file.Path;
 import java.util.List;
 import java.util.Optional;
-
 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;
-
 class AuxParserTest {
+
     private ImportFormatPreferences importFormatPreferences;
 
     @BeforeEach
     void setUp() {
-        importFormatPreferences = mock(ImportFormatPreferences.class, Answers.RETURNS_DEEP_STUBS);
+        importFormatPreferences =
+            mock(ImportFormatPreferences.class, Answers.RETURNS_DEEP_STUBS);
     }
 
     @AfterEach
@@ -40,10 +40,19 @@ void tearDown() {
 
     @Test
     void testNormal() 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)) {
-            ParserResult result = new BibtexParser(importFormatPreferences).parse(originalReader);
+        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
+            )
+        ) {
+            ParserResult result = new BibtexParser(importFormatPreferences)
+                .parse(originalReader);
 
             AuxParser auxParser = new DefaultAuxParser(result.getDatabase());
             AuxParserResult auxResult = auxParser.parse(auxFile);
@@ -57,8 +66,12 @@ void testNormal() throws URISyntaxException, IOException {
             assertTrue(newEntries.get(1).hasChanged());
             assertEquals(2, auxResult.getResolvedKeysCount());
             assertEquals(2, auxResult.getFoundKeysInAux());
-            assertEquals(auxResult.getFoundKeysInAux() + auxResult.getCrossRefEntriesCount(),
-                    auxResult.getResolvedKeysCount() + auxResult.getUnresolvedKeysCount());
+            assertEquals(
+                auxResult.getFoundKeysInAux() +
+                auxResult.getCrossRefEntriesCount(),
+                auxResult.getResolvedKeysCount() +
+                auxResult.getUnresolvedKeysCount()
+            );
             assertEquals(0, auxResult.getCrossRefEntriesCount());
         }
     }
@@ -67,10 +80,19 @@ void testNormal() throws URISyntaxException, IOException {
     void testTwoArgMacro() throws URISyntaxException, IOException {
         // Result should be identical to that of testNormal
 
-        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)) {
-            ParserResult result = new BibtexParser(importFormatPreferences).parse(originalReader);
+        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
+            )
+        ) {
+            ParserResult result = new BibtexParser(importFormatPreferences)
+                .parse(originalReader);
 
             AuxParser auxParser = new DefaultAuxParser(result.getDatabase());
             AuxParserResult auxResult = auxParser.parse(auxFile);
@@ -84,18 +106,31 @@ void testTwoArgMacro() throws URISyntaxException, IOException {
             assertTrue(newEntries.get(1).hasChanged());
             assertEquals(2, auxResult.getResolvedKeysCount());
             assertEquals(2, auxResult.getFoundKeysInAux());
-            assertEquals(auxResult.getFoundKeysInAux() + auxResult.getCrossRefEntriesCount(),
-                    auxResult.getResolvedKeysCount() + auxResult.getUnresolvedKeysCount());
+            assertEquals(
+                auxResult.getFoundKeysInAux() +
+                auxResult.getCrossRefEntriesCount(),
+                auxResult.getResolvedKeysCount() +
+                auxResult.getUnresolvedKeysCount()
+            );
             assertEquals(0, auxResult.getCrossRefEntriesCount());
         }
     }
 
     @Test
     void testNotAllFound() 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)) {
-            ParserResult result = new BibtexParser(importFormatPreferences).parse(originalReader);
+        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
+            )
+        ) {
+            ParserResult result = new BibtexParser(importFormatPreferences)
+                .parse(originalReader);
 
             AuxParser auxParser = new DefaultAuxParser(result.getDatabase());
             AuxParserResult auxResult = auxParser.parse(auxFile);
@@ -106,34 +141,60 @@ void testNotAllFound() throws URISyntaxException, IOException {
             assertEquals(2, newDB.getEntries().size());
             assertEquals(2, auxResult.getResolvedKeysCount());
             assertEquals(3, auxResult.getFoundKeysInAux());
-            assertEquals(auxResult.getFoundKeysInAux() + auxResult.getCrossRefEntriesCount(),
-                    auxResult.getResolvedKeysCount() + auxResult.getUnresolvedKeysCount());
+            assertEquals(
+                auxResult.getFoundKeysInAux() +
+                auxResult.getCrossRefEntriesCount(),
+                auxResult.getResolvedKeysCount() +
+                auxResult.getUnresolvedKeysCount()
+            );
             assertEquals(0, auxResult.getCrossRefEntriesCount());
         }
     }
 
     @Test
-    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)) {
-            ParserResult result = new BibtexParser(importFormatPreferences).parse(originalReader);
+    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
+            )
+        ) {
+            ParserResult result = new BibtexParser(importFormatPreferences)
+                .parse(originalReader);
 
             AuxParser auxParser = new DefaultAuxParser(result.getDatabase());
             AuxParserResult auxResult = auxParser.parse(auxFile);
             BibDatabase db = auxResult.getGeneratedBibDatabase();
 
-            assertEquals(Optional.of("\"Maintained by \" # maintainer"), db.getPreamble());
+            assertEquals(
+                Optional.of("\"Maintained by \" # maintainer"),
+                db.getPreamble()
+            );
             assertEquals(1, db.getStringCount());
         }
     }
 
     @Test
     void testNestedAux() 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)) {
-            ParserResult result = new BibtexParser(importFormatPreferences).parse(originalReader);
+        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
+            )
+        ) {
+            ParserResult result = new BibtexParser(importFormatPreferences)
+                .parse(originalReader);
 
             AuxParser auxParser = new DefaultAuxParser(result.getDatabase());
             AuxParserResult auxResult = auxParser.parse(auxFile);
@@ -144,18 +205,31 @@ void testNestedAux() throws URISyntaxException, IOException {
             assertEquals(2, newDB.getEntries().size());
             assertEquals(2, auxResult.getResolvedKeysCount());
             assertEquals(2, auxResult.getFoundKeysInAux());
-            assertEquals(auxResult.getFoundKeysInAux() + auxResult.getCrossRefEntriesCount(),
-                    auxResult.getResolvedKeysCount() + auxResult.getUnresolvedKeysCount());
+            assertEquals(
+                auxResult.getFoundKeysInAux() +
+                auxResult.getCrossRefEntriesCount(),
+                auxResult.getResolvedKeysCount() +
+                auxResult.getUnresolvedKeysCount()
+            );
             assertEquals(0, auxResult.getCrossRefEntriesCount());
         }
     }
 
     @Test
     void testCrossRef() 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)) {
-            ParserResult result = new BibtexParser(importFormatPreferences).parse(originalReader);
+        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
+            )
+        ) {
+            ParserResult result = new BibtexParser(importFormatPreferences)
+                .parse(originalReader);
 
             AuxParser auxParser = new DefaultAuxParser(result.getDatabase());
             AuxParserResult auxResult = auxParser.parse(auxFile);
@@ -166,8 +240,12 @@ void testCrossRef() throws URISyntaxException, IOException {
             assertEquals(4, newDB.getEntries().size());
             assertEquals(3, auxResult.getResolvedKeysCount());
             assertEquals(4, auxResult.getFoundKeysInAux());
-            assertEquals(auxResult.getFoundKeysInAux() + auxResult.getCrossRefEntriesCount(),
-                    auxResult.getResolvedKeysCount() + auxResult.getUnresolvedKeysCount());
+            assertEquals(
+                auxResult.getFoundKeysInAux() +
+                auxResult.getCrossRefEntriesCount(),
+                auxResult.getResolvedKeysCount() +
+                auxResult.getUnresolvedKeysCount()
+            );
             assertEquals(1, auxResult.getCrossRefEntriesCount());
         }
     }
@@ -183,8 +261,11 @@ void testFileNotFound() {
         assertEquals(0, newDB.getEntries().size());
         assertEquals(0, auxResult.getResolvedKeysCount());
         assertEquals(0, auxResult.getFoundKeysInAux());
-        assertEquals(auxResult.getFoundKeysInAux() + auxResult.getCrossRefEntriesCount(),
-                auxResult.getResolvedKeysCount() + auxResult.getUnresolvedKeysCount());
+        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 735262acf78..f6207d070ac 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 55b9ed98560..dc68f22cd35 100644
--- a/src/test/java/org/jabref/logic/bibtex/BibEntryAssert.java
+++ b/src/test/java/org/jabref/logic/bibtex/BibEntryAssert.java
@@ -1,5 +1,8 @@
 package org.jabref.logic.bibtex;
 
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.mockito.Mockito.mock;
+
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
@@ -10,19 +13,14 @@
 import java.nio.file.Path;
 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 {
 
     /**
@@ -33,8 +31,11 @@ public class BibEntryAssert {
      * @param resourceName the resource to read
      * @param entry        the entry to compare with
      */
-    public static void assertEquals(Class<?> clazz, String resourceName, BibEntry entry)
-            throws IOException {
+    public static void assertEquals(
+        Class<?> clazz,
+        String resourceName,
+        BibEntry entry
+    ) throws IOException {
         assertNotNull(clazz);
         assertNotNull(resourceName);
         assertNotNull(entry);
@@ -51,8 +52,11 @@ public static void assertEquals(Class<?> clazz, String resourceName, BibEntry en
      * @param resourceName the resource to read
      * @param asIsEntries  a list containing a single entry to compare with
      */
-    public static void assertEquals(Class<?> clazz, String resourceName, List<BibEntry> asIsEntries)
-            throws IOException {
+    public static void assertEquals(
+        Class<?> clazz,
+        String resourceName,
+        List<BibEntry> asIsEntries
+    ) throws IOException {
         assertNotNull(clazz);
         assertNotNull(resourceName);
         assertNotNull(asIsEntries);
@@ -61,10 +65,15 @@ public static void assertEquals(Class<?> clazz, String resourceName, List<BibEnt
         }
     }
 
-    private static List<BibEntry> getListFromInputStream(InputStream is) throws IOException {
+    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));
+        try (
+            Reader reader = new InputStreamReader(is, StandardCharsets.UTF_8)
+        ) {
+            BibtexParser parser = new BibtexParser(
+                mock(ImportFormatPreferences.class, Answers.RETURNS_DEEP_STUBS)
+            );
             result = parser.parse(reader);
         }
         assertNotNull(result);
@@ -79,21 +88,30 @@ private static List<BibEntry> getListFromInputStream(InputStream is) throws IOEx
      * @param expectedInputStream the inputStream reading the entry from
      * @param actualEntries       a list containing a single entry to compare with
      */
-    public static void assertEquals(InputStream expectedInputStream, List<BibEntry> actualEntries)
-            throws IOException {
+    public static void assertEquals(
+        InputStream expectedInputStream,
+        List<BibEntry> actualEntries
+    ) throws IOException {
         assertNotNull(expectedInputStream);
         assertNotNull(actualEntries);
         // explicit reference of Assertions is needed here to disambiguate from the methods defined by this class
-        List<BibEntry> expectedEntries = getListFromInputStream(expectedInputStream);
+        List<BibEntry> expectedEntries = getListFromInputStream(
+            expectedInputStream
+        );
         Assertions.assertEquals(expectedEntries, actualEntries);
     }
 
-    public static void assertEquals(List<BibEntry> expectedEntries, InputStream actualInputStream)
-            throws IOException {
+    public static void assertEquals(
+        List<BibEntry> expectedEntries,
+        InputStream actualInputStream
+    ) throws IOException {
         assertNotNull(actualInputStream);
         assertNotNull(expectedEntries);
         // explicit reference of Assertions is needed here to disambiguate from the methods defined by this class
-        Assertions.assertEquals(expectedEntries, getListFromInputStream(actualInputStream));
+        Assertions.assertEquals(
+            expectedEntries,
+            getListFromInputStream(actualInputStream)
+        );
     }
 
     /**
@@ -104,7 +122,7 @@ public static void assertEquals(List<BibEntry> expectedEntries, InputStream actu
      * @param actual   the entry to compare with
      */
     public static void assertEquals(InputStream expected, BibEntry actual)
-            throws IOException {
+        throws IOException {
         assertEquals(expected, Collections.singletonList(actual));
     }
 
@@ -117,13 +135,23 @@ public static void assertEquals(InputStream expected, BibEntry actual)
      * @param importer     The fileformat you want to use to read the passed file to get the list of expected
      *                     BibEntries
      */
-    public static void assertEquals(InputStream expectedIs, Path fileToImport, Importer importer)
-            throws IOException {
-        assertEquals(getListFromInputStream(expectedIs), fileToImport, importer);
+    public static void assertEquals(
+        InputStream expectedIs,
+        Path fileToImport,
+        Importer importer
+    ) throws IOException {
+        assertEquals(
+            getListFromInputStream(expectedIs),
+            fileToImport,
+            importer
+        );
     }
 
-    public static void assertEquals(InputStream expectedIs, URL fileToImport, Importer importer)
-            throws URISyntaxException, IOException {
+    public static void assertEquals(
+        InputStream expectedIs,
+        URL fileToImport,
+        Importer importer
+    ) throws URISyntaxException, IOException {
         assertEquals(expectedIs, Path.of(fileToImport.toURI()), importer);
     }
 
@@ -136,16 +164,24 @@ public static void assertEquals(InputStream expectedIs, URL fileToImport, Import
      * @param importer     The fileformat you want to use to read the passed file to get the list of expected
      *                     BibEntries
      */
-    public static void assertEquals(List<BibEntry> expected, Path fileToImport, Importer importer)
-            throws IOException {
-        List<BibEntry> actualEntries = importer.importDatabase(fileToImport)
-                                               .getDatabase().getEntries();
+    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
         Assertions.assertEquals(expected, actualEntries);
     }
 
-    public static void assertEquals(List<BibEntry> expected, URL fileToImport, Importer importer)
-            throws URISyntaxException, IOException {
+    public static void assertEquals(
+        List<BibEntry> expected,
+        URL fileToImport,
+        Importer importer
+    ) throws URISyntaxException, IOException {
         assertEquals(expected, Path.of(fileToImport.toURI()), importer);
     }
 }
diff --git a/src/test/java/org/jabref/logic/bibtex/BibEntryWriterTest.java b/src/test/java/org/jabref/logic/bibtex/BibEntryWriterTest.java
index 69a9695bbd3..7b106dcab17 100644
--- a/src/test/java/org/jabref/logic/bibtex/BibEntryWriterTest.java
+++ b/src/test/java/org/jabref/logic/bibtex/BibEntryWriterTest.java
@@ -1,5 +1,10 @@
 package org.jabref.logic.bibtex;
 
+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;
@@ -9,7 +14,6 @@
 import java.util.List;
 import java.util.Set;
 import java.util.stream.Stream;
-
 import org.jabref.logic.exporter.BibWriter;
 import org.jabref.logic.importer.ImportFormatPreferences;
 import org.jabref.logic.importer.ParserResult;
@@ -25,7 +29,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;
@@ -33,11 +36,6 @@
 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;
-
 class BibEntryWriterTest {
 
     private static ImportFormatPreferences importFormatPreferences;
@@ -47,9 +45,18 @@ 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());
+        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()
+            );
     }
 
     @Test
@@ -57,7 +64,10 @@ void testSerialization() throws IOException {
         BibEntry entry = new BibEntry(StandardEntryType.Article);
         // set a required field
         entry.setField(StandardField.AUTHOR, "Foo Bar");
-        entry.setField(StandardField.JOURNAL, "International Journal of Something");
+        entry.setField(
+            StandardField.JOURNAL,
+            "International Journal of Something"
+        );
         // set an optional field
         entry.setField(StandardField.NUMBER, "1");
         entry.setField(StandardField.NOTE, "some note");
@@ -80,11 +90,12 @@ void testSerialization() throws IOException {
 
     @Test
     void writeOtherTypeTest() throws Exception {
-        String expected = """
-                @Other{test,
-                  comment = {testentry},
-                }
-                """.replace("\n", OS.NEWLINE);
+        String expected =
+            """
+            @Other{test,
+              comment = {testentry},
+            }
+            """.replace("\n", OS.NEWLINE);
 
         BibEntry entry = new BibEntry(new UnknownEntryType("other"));
         entry.setField(StandardField.COMMENT, "testentry");
@@ -97,16 +108,23 @@ void writeOtherTypeTest() throws Exception {
     @Test
     void writeEntryWithFile() throws Exception {
         BibEntry entry = new BibEntry(StandardEntryType.Article);
-        LinkedFile file = new LinkedFile("test", Path.of("/home/uers/test.pdf"), "PDF");
+        LinkedFile file = new LinkedFile(
+            "test",
+            Path.of("/home/uers/test.pdf"),
+            "PDF"
+        );
         entry.addFile(file);
 
         bibEntryWriter.write(entry, bibWriter, BibDatabaseMode.BIBTEX);
 
-        assertEquals("""
-                @Article{,
-                  file = {test:/home/uers/test.pdf:PDF},
-                }
-                """.replace("\n", OS.NEWLINE), stringWriter.toString());
+        assertEquals(
+            """
+            @Article{,
+              file = {test:/home/uers/test.pdf:PDF},
+            }
+            """.replace("\n", OS.NEWLINE),
+            stringWriter.toString()
+        );
     }
 
     @Test
@@ -114,7 +132,10 @@ void writeEntryWithOrField() throws Exception {
         BibEntry entry = new BibEntry(StandardEntryType.InBook);
         // set an required OR field (author/editor)
         entry.setField(StandardField.EDITOR, "Foo Bar");
-        entry.setField(StandardField.JOURNAL, "International Journal of Something");
+        entry.setField(
+            StandardField.JOURNAL,
+            "International Journal of Something"
+        );
         // set an optional field
         entry.setField(StandardField.NUMBER, "1");
         entry.setField(StandardField.NOTE, "some note");
@@ -141,7 +162,10 @@ void writeEntryWithOrFieldBothFieldsPresent() throws Exception {
         // set an required OR field with both fields(author/editor)
         entry.setField(StandardField.AUTHOR, "Foo Thor");
         entry.setField(StandardField.EDITOR, "Edi Bar");
-        entry.setField(StandardField.JOURNAL, "International Journal of Something");
+        entry.setField(
+            StandardField.JOURNAL,
+            "International Journal of Something"
+        );
         // set an optional field
         entry.setField(StandardField.NUMBER, "1");
         entry.setField(StandardField.NOTE, "some note");
@@ -165,11 +189,12 @@ void writeEntryWithOrFieldBothFieldsPresent() throws Exception {
 
     @Test
     void writeReallyUnknownTypeTest() throws Exception {
-        String expected = """
-                @Reallyunknowntype{test,
-                  comment = {testentry},
-                }
-                """.replace("\n", OS.NEWLINE);
+        String expected =
+            """
+            @Reallyunknowntype{test,
+              comment = {testentry},
+            }
+            """.replace("\n", OS.NEWLINE);
 
         BibEntry entry = new BibEntry();
         entry.setType(new UnknownEntryType("ReallyUnknownType"));
@@ -182,17 +207,19 @@ void writeReallyUnknownTypeTest() throws Exception {
 
     @Test
     void roundTripTest() throws IOException {
-        String bibtexEntry = """
-                @Article{test,
-                  Author                   = {Foo Bar},
-                  Journal                  = {International Journal of Something},
-                  Note                     = {some note},
-                  Number                   = {1}
-                }
-                """.replace("\n", OS.NEWLINE);
+        String bibtexEntry =
+            """
+            @Article{test,
+              Author                   = {Foo Bar},
+              Journal                  = {International Journal of Something},
+              Note                     = {some note},
+              Number                   = {1}
+            }
+            """.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));
         Collection<BibEntry> entries = result.getDatabase().getEntries();
         BibEntry entry = entries.iterator().next();
 
@@ -204,14 +231,16 @@ void roundTripTest() throws IOException {
 
     @Test
     void roundTripKeepsFilePathWithBackslashes() throws IOException {
-        String bibtexEntry = """
-                @Article{,
-                  file = {Tagungen\\2013\\KWTK45},
-                }
-                """.replace("\n", OS.NEWLINE);
+        String bibtexEntry =
+            """
+            @Article{,
+              file = {Tagungen\\2013\\KWTK45},
+            }
+            """.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));
         Collection<BibEntry> entries = result.getDatabase().getEntries();
         BibEntry entry = entries.iterator().next();
 
@@ -223,14 +252,16 @@ void roundTripKeepsFilePathWithBackslashes() throws IOException {
 
     @Test
     void roundTripKeepsEscapedCharacters() throws IOException {
-        String bibtexEntry = """
-                @Article{,
-                  demofield = {Tagungen\\2013\\KWTK45},
-                }
-                """.replace("\n", OS.NEWLINE);
+        String bibtexEntry =
+            """
+            @Article{,
+              demofield = {Tagungen\\2013\\KWTK45},
+            }
+            """.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));
         Collection<BibEntry> entries = result.getDatabase().getEntries();
         BibEntry entry = entries.iterator().next();
 
@@ -242,14 +273,16 @@ void roundTripKeepsEscapedCharacters() throws IOException {
 
     @Test
     void roundTripKeepsFilePathEndingWithBackslash() throws IOException {
-        String bibtexEntry = """
-                @Article{,
-                  file = {dir\\},
-                }
-                """.replace("\n", OS.NEWLINE);
+        String bibtexEntry =
+            """
+            @Article{,
+              file = {dir\\},
+            }
+            """.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));
         Collection<BibEntry> entries = result.getDatabase().getEntries();
         BibEntry entry = entries.iterator().next();
 
@@ -271,7 +304,8 @@ void roundTripWithPrependingNewlines() 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));
         Collection<BibEntry> entries = result.getDatabase().getEntries();
         BibEntry entry = entries.iterator().next();
 
@@ -293,7 +327,8 @@ void roundTripWithKeepsCRLFLineBreakStyle() 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));
         Collection<BibEntry> entries = result.getDatabase().getEntries();
         BibEntry entry = entries.iterator().next();
 
@@ -317,7 +352,8 @@ void roundTripWithKeepsLFLineBreakStyle() 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));
         Collection<BibEntry> entries = result.getDatabase().getEntries();
         BibEntry entry = entries.iterator().next();
 
@@ -343,7 +379,8 @@ void roundTripWithModification() 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));
         Collection<BibEntry> entries = result.getDatabase().getEntries();
         BibEntry entry = entries.iterator().next();
 
@@ -367,7 +404,8 @@ void roundTripWithModification() throws IOException {
     }
 
     @Test
-    void roundTripWithCamelCasingInTheOriginalEntryAndResultInLowerCase() throws IOException {
+    void roundTripWithCamelCasingInTheOriginalEntryAndResultInLowerCase()
+        throws IOException {
         // @formatter:off
         String bibtexEntry = """
                 @Article{test,
@@ -381,7 +419,8 @@ void roundTripWithCamelCasingInTheOriginalEntryAndResultInLowerCase() throws IOE
         // @formatter:on
 
         // read in bibtex string
-        ParserResult result = new BibtexParser(importFormatPreferences).parse(new StringReader(bibtexEntry));
+        ParserResult result = new BibtexParser(importFormatPreferences)
+            .parse(new StringReader(bibtexEntry));
         Collection<BibEntry> entries = result.getDatabase().getEntries();
         BibEntry entry = entries.iterator().next();
 
@@ -421,7 +460,8 @@ void testEntryTypeChange() throws IOException {
         // @formatter:on
 
         // read in bibtex string
-        ParserResult result = new BibtexParser(importFormatPreferences).parse(new StringReader(expected));
+        ParserResult result = new BibtexParser(importFormatPreferences)
+            .parse(new StringReader(expected));
         Collection<BibEntry> entries = result.getDatabase().getEntries();
         BibEntry entry = entries.iterator().next();
 
@@ -457,7 +497,8 @@ void roundTripWithAppendedNewlines() 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));
         Collection<BibEntry> entries = result.getDatabase().getEntries();
         BibEntry entry = entries.iterator().next();
 
@@ -467,7 +508,10 @@ void roundTripWithAppendedNewlines() throws IOException {
 
         // Only one appending newline is written by the writer
         // OS.NEWLINE is used, not the given one
-        assertEquals(bibtexEntry.substring(0, bibtexEntry.length() - 2) + OS.NEWLINE, actual);
+        assertEquals(
+            bibtexEntry.substring(0, bibtexEntry.length() - 2) + OS.NEWLINE,
+            actual
+        );
     }
 
     @Test
@@ -482,7 +526,8 @@ void roundTripNormalizesNewLines() 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));
         Collection<BibEntry> entries = result.getDatabase().getEntries();
         BibEntry entry = entries.iterator().next();
 
@@ -490,12 +535,19 @@ void roundTripNormalizesNewLines() throws IOException {
         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);
     }
 
@@ -521,7 +573,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));
         Collection<BibEntry> entries = result.getDatabase().getEntries();
         BibEntry entry = entries.iterator().next();
 
@@ -548,7 +601,8 @@ void monthFieldSpecialSyntax() 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));
         Collection<BibEntry> entries = result.getDatabase().getEntries();
         BibEntry entry = entries.iterator().next();
 
@@ -584,7 +638,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));
         Collection<BibEntry> entries = result.getDatabase().getEntries();
         BibEntry entry = entries.iterator().next();
 
@@ -593,21 +648,22 @@ void customTypeCanBewritten() throws IOException {
         // write out bibtex string
         bibEntryWriter.write(entry, bibWriter, BibDatabaseMode.BIBTEX);
 
-        String expected = """
-                @Reference{Broecker1984,
-                  date       = {1984},
-                  editor     = {Broecker, William L.},
-                  eprint     = {305515791},
-                  eprinttype = {scribd},
-                  isbn       = {0-517-55271-X},
-                  keywords   = {g:photography, p:positive, c:silver, m:albumen, c:pigment, m:carbon, g:reference, c:encyclopedia},
-                  location   = {NY},
-                  pagetotal  = {678},
-                  publisher  = {Crown},
-                  subtitle   = {Encyclopedia of Photography},
-                  title      = {International Center of Photography},
-                }
-                """.replace("\n", OS.NEWLINE);
+        String expected =
+            """
+            @Reference{Broecker1984,
+              date       = {1984},
+              editor     = {Broecker, William L.},
+              eprint     = {305515791},
+              eprinttype = {scribd},
+              isbn       = {0-517-55271-X},
+              keywords   = {g:photography, p:positive, c:silver, m:albumen, c:pigment, m:carbon, g:reference, c:encyclopedia},
+              location   = {NY},
+              pagetotal  = {678},
+              publisher  = {Crown},
+              subtitle   = {Encyclopedia of Photography},
+              title      = {International Center of Photography},
+            }
+            """.replace("\n", OS.NEWLINE);
 
         assertEquals(expected, stringWriter.toString());
     }
@@ -615,54 +671,60 @@ void customTypeCanBewritten() throws IOException {
     @Test
     void constantMonthApril() throws Exception {
         BibEntry entry = new BibEntry(StandardEntryType.Misc)
-                .withField(StandardField.MONTH, "#apr#");
+            .withField(StandardField.MONTH, "#apr#");
         // enable writing
         entry.setChanged(true);
 
         bibEntryWriter.write(entry, bibWriter, BibDatabaseMode.BIBTEX);
 
-        assertEquals("""
-                        @Misc{,
-                          month = apr,
-                        }
-                        """.replace("\n", OS.NEWLINE),
-                stringWriter.toString());
+        assertEquals(
+            """
+            @Misc{,
+              month = apr,
+            }
+            """.replace("\n", OS.NEWLINE),
+            stringWriter.toString()
+        );
     }
 
     @Test
     void monthApril() throws Exception {
         BibEntry entry = new BibEntry(StandardEntryType.Misc)
-                .withField(StandardField.MONTH, "apr");
+            .withField(StandardField.MONTH, "apr");
         // enable writing
         entry.setChanged(true);
 
         bibEntryWriter.write(entry, bibWriter, BibDatabaseMode.BIBTEX);
 
-        assertEquals("""
-                        @Misc{,
-                          month = {apr},
-                        }
-                        """.replace("\n", OS.NEWLINE),
-                stringWriter.toString());
+        assertEquals(
+            """
+            @Misc{,
+              month = {apr},
+            }
+            """.replace("\n", OS.NEWLINE),
+            stringWriter.toString()
+        );
     }
 
     @Test
     void filenameIsUnmodifiedDuringWrite() throws Exception {
         // source: https://github.com/JabRef/jabref/issues/7012#issuecomment-707788107
-        String bibtexEntry = """
-                    @Book{Hue17,
-                      author    = {Rudolf Huebener},
-                      date      = {2017},
-                      title     = {Leiter, Halbleiter, Supraleiter},
-                      doi       = {10.1007/978-3-662-53281-2},
-                      publisher = {Springer Berlin Heidelberg},
-                      file      = {:Hue17 - Leiter # Halbleiter # Supraleiter.pdf:PDF},
-                      timestamp = {2020.10.13},
-                }
-                """.replace("\n", OS.NEWLINE);
+        String bibtexEntry =
+            """
+                @Book{Hue17,
+                  author    = {Rudolf Huebener},
+                  date      = {2017},
+                  title     = {Leiter, Halbleiter, Supraleiter},
+                  doi       = {10.1007/978-3-662-53281-2},
+                  publisher = {Springer Berlin Heidelberg},
+                  file      = {:Hue17 - Leiter # Halbleiter # Supraleiter.pdf:PDF},
+                  timestamp = {2020.10.13},
+            }
+            """.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));
         Collection<BibEntry> entries = result.getDatabase().getEntries();
         BibEntry entry = entries.iterator().next();
 
@@ -684,7 +746,8 @@ void addFieldWithLongerLength() 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));
         Collection<BibEntry> entries = result.getDatabase().getEntries();
         BibEntry entry = entries.iterator().next();
 
@@ -714,9 +777,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());
     }
@@ -724,9 +791,15 @@ void doNotWriteEmptyFields() throws IOException {
     @Test
     void writeThrowsErrorIfFieldContainsUnbalancedBraces() {
         BibEntry entry = new BibEntry(StandardEntryType.Article);
-        entry.setField(StandardField.NOTE, "some text with unbalanced { braces");
+        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
@@ -744,7 +817,8 @@ void roundTripWithPrecedingCommentTest() 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));
         Collection<BibEntry> entries = result.getDatabase().getEntries();
         BibEntry entry = entries.iterator().next();
 
@@ -769,7 +843,8 @@ void roundTripWithPrecedingCommentAndModificationTest() 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));
         Collection<BibEntry> entries = result.getDatabase().getEntries();
         BibEntry entry = entries.iterator().next();
 
@@ -799,7 +874,10 @@ void alphabeticSerialization() throws IOException {
         BibEntry entry = new BibEntry(StandardEntryType.Article);
         // required fields
         entry.setField(StandardField.AUTHOR, "Foo Bar");
-        entry.setField(StandardField.JOURNALTITLE, "International Journal of Something");
+        entry.setField(
+            StandardField.JOURNALTITLE,
+            "International Journal of Something"
+        );
         entry.setField(StandardField.TITLE, "Title");
         entry.setField(StandardField.DATE, "2019-10-16");
         // optional fields
@@ -859,7 +937,10 @@ void testSerializeAll() 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
+        );
 
         // @formatter:off
         String expected1 = """
@@ -896,34 +977,53 @@ void testSerializeAll() throws IOException {
 
     static Stream<Arguments> testGetFormattedFieldNameData() {
         return Stream.of(
-                Arguments.of(" = ", "", 0),
-                Arguments.of("a = ", "a", 0),
-                Arguments.of("   = ", "", 2),
-                Arguments.of("a  = ", "a", 2),
-                Arguments.of("abc = ", "abc", 2),
-                Arguments.of("abcdef = ", "abcdef", 6)
+            Arguments.of(" = ", "", 0),
+            Arguments.of("a = ", "a", 0),
+            Arguments.of("   = ", "", 2),
+            Arguments.of("a  = ", "a", 2),
+            Arguments.of("abc = ", "abc", 2),
+            Arguments.of("abcdef = ", "abcdef", 6)
         );
     }
 
     @ParameterizedTest
     @MethodSource("testGetFormattedFieldNameData")
-    void testGetFormattedFieldName(String expected, String fieldName, int indent) {
+    void testGetFormattedFieldName(
+        String expected,
+        String fieldName,
+        int indent
+    ) {
         Field field = FieldFactory.parseField(fieldName);
-        assertEquals(expected, BibEntryWriter.getFormattedFieldName(field, indent));
+        assertEquals(
+            expected,
+            BibEntryWriter.getFormattedFieldName(field, indent)
+        );
     }
 
     static Stream<Arguments> testGetLengthOfLongestFieldNameData() {
         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(
+                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}"
+                    )
+            )
         );
     }
 
     @ParameterizedTest
     @MethodSource("testGetLengthOfLongestFieldNameData")
     void testGetLengthOfLongestFieldName(int expected, BibEntry entry) {
-        assertEquals(expected, BibEntryWriter.getLengthOfLongestFieldName(entry));
+        assertEquals(
+            expected,
+            BibEntryWriter.getLengthOfLongestFieldName(entry)
+        );
     }
 }
diff --git a/src/test/java/org/jabref/logic/bibtex/FieldContentFormatterTest.java b/src/test/java/org/jabref/logic/bibtex/FieldContentFormatterTest.java
index a6705425be5..502448ce336 100644
--- a/src/test/java/org/jabref/logic/bibtex/FieldContentFormatterTest.java
+++ b/src/test/java/org/jabref/logic/bibtex/FieldContentFormatterTest.java
@@ -1,31 +1,36 @@
 package org.jabref.logic.bibtex;
 
-import java.util.Collections;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
+import java.util.Collections;
 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;
-
 class FieldContentFormatterTest {
 
     private FieldContentFormatter parser;
 
     @BeforeEach
     void setUp() {
-        parser = new FieldContentFormatter(new FieldPreferences(
-                false,
-                Collections.emptyList(),
-                Collections.emptyList()));
+        parser =
+            new FieldContentFormatter(
+                new FieldPreferences(
+                    false,
+                    Collections.emptyList(),
+                    Collections.emptyList()
+                )
+            );
     }
 
     @Test
     void doesNotUnifyLineBreaks() {
         String original = "I\r\nunify\nline\rbreaks.";
-        String processed = parser.format(new StringBuilder(original), StandardField.ABSTRACT);
+        String processed = parser.format(
+            new StringBuilder(original),
+            StandardField.ABSTRACT
+        );
 
         // Normalization is done at org.jabref.logic.exporter.BibWriter, so no need to normalize here
         assertEquals(original, processed);
@@ -35,8 +40,14 @@ void doesNotUnifyLineBreaks() {
     void retainsWhitespaceForMultiLineFields() {
         String original = "I\nkeep\nline\nbreaks\nand\n\ttabs.";
 
-        String abstrakt = parser.format(new StringBuilder(original), StandardField.ABSTRACT);
-        String review = parser.format(new StringBuilder(original), StandardField.REVIEW);
+        String abstrakt = parser.format(
+            new StringBuilder(original),
+            StandardField.ABSTRACT
+        );
+        String review = parser.format(
+            new StringBuilder(original),
+            StandardField.REVIEW
+        );
 
         assertEquals(original, abstrakt);
         assertEquals(original, review);
@@ -44,11 +55,19 @@ void retainsWhitespaceForMultiLineFields() {
 
     @Test
     void removeWhitespaceFromNonMultiLineFields() {
-        String original = "I\nshould\nnot\ninclude\nadditional\nwhitespaces  \nor\n\ttabs.";
-        String expected = "I should not include additional whitespaces or tabs.";
+        String original =
+            "I\nshould\nnot\ninclude\nadditional\nwhitespaces  \nor\n\ttabs.";
+        String expected =
+            "I should not include additional whitespaces or tabs.";
 
-        String abstrakt = parser.format(new StringBuilder(original), StandardField.TITLE);
-        String any = parser.format(new StringBuilder(original), new UnknownField("anyotherfield"));
+        String abstrakt = parser.format(
+            new StringBuilder(original),
+            StandardField.TITLE
+        );
+        String any = parser.format(
+            new StringBuilder(original),
+            new UnknownField("anyotherfield")
+        );
 
         assertEquals(expected, abstrakt);
         assertEquals(expected, any);
diff --git a/src/test/java/org/jabref/logic/bibtex/FieldWriterTest.java b/src/test/java/org/jabref/logic/bibtex/FieldWriterTest.java
index d86fddb1b0f..57db7f124e5 100644
--- a/src/test/java/org/jabref/logic/bibtex/FieldWriterTest.java
+++ b/src/test/java/org/jabref/logic/bibtex/FieldWriterTest.java
@@ -1,64 +1,74 @@
 package org.jabref.logic.bibtex;
 
+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;
-
 import org.jabref.logic.util.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;
-
 class FieldWriterTest {
 
     private FieldWriter writer;
 
     public static Stream<Arguments> getMarkdowns() {
-        return Stream.of(Arguments.of("""
-                        # Changelog
-
-                        All notable changes to this project will be documented in this file.
-                        The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
-                        We refer to [GitHub issues](https://github.com/JabRef/jabref/issues) by using `#NUM`.
-                        In case, there is no issue present, the pull request implementing the feature is linked.
-
-                        Note that this project **does not** adhere to [Semantic Versioning](http://semver.org/).
-
-                        ## [Unreleased]"""),
-                // Source: https://github.com/JabRef/jabref/issues/7010#issue-720030293
-                Arguments.of(
-                        """
-                                #### Goal
-                                Lorem ipsum dolor sit amet, consectetur adipiscing elit,
-                                #### Achievement\s
-                                Lorem ipsum dolor sit amet, consectetur adipiscing elit,
-                                #### Method
-                                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")
-                );
+        return Stream.of(
+            Arguments.of(
+                """
+                # Changelog
+
+                All notable changes to this project will be documented in this file.
+                The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
+                We refer to [GitHub issues](https://github.com/JabRef/jabref/issues) by using `#NUM`.
+                In case, there is no issue present, the pull request implementing the feature is linked.
+
+                Note that this project **does not** adhere to [Semantic Versioning](http://semver.org/).
+
+                ## [Unreleased]"""
+            ),
+            // Source: https://github.com/JabRef/jabref/issues/7010#issue-720030293
+            Arguments.of(
+                """
+                #### Goal
+                Lorem ipsum dolor sit amet, consectetur adipiscing elit,
+                #### Achievement\s
+                Lorem ipsum dolor sit amet, consectetur adipiscing elit,
+                #### Method
+                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"
+            )
+        );
     }
 
     @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);
     }
 
     @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
         String expected = "{" + text + "}";
@@ -67,7 +77,8 @@ void noNormalizationOfNewlinesInAbstractField() throws Exception {
 
     @Test
     void preserveNewlineInAbstractField() throws Exception {
-        String text = "lorem ipsum lorem ipsum" + OS.NEWLINE + "lorem ipsum lorem ipsum";
+        String text =
+            "lorem ipsum lorem ipsum" + OS.NEWLINE + "lorem ipsum lorem ipsum";
 
         String result = writer.write(StandardField.ABSTRACT, text);
         String expected = "{" + text + "}";
@@ -77,7 +88,11 @@ 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 + "}";
@@ -87,7 +102,8 @@ void preserveMultipleNewlinesInAbstractField() throws Exception {
 
     @Test
     void preserveNewlineInReviewField() throws Exception {
-        String text = "lorem ipsum lorem ipsum" + OS.NEWLINE + "lorem ipsum lorem ipsum";
+        String text =
+            "lorem ipsum lorem ipsum" + OS.NEWLINE + "lorem ipsum lorem ipsum";
 
         String result = writer.write(StandardField.REVIEW, text);
         String expected = "{" + text + "}";
@@ -97,8 +113,10 @@ void preserveNewlineInReviewField() throws Exception {
 
     @Test
     void removeWhitespaceFromNonMultiLineFields() throws Exception {
-        String original = "I\nshould\nnot\ninclude\nadditional\nwhitespaces  \nor\n\ttabs.";
-        String expected = "{I should not include additional whitespaces or tabs.}";
+        String original =
+            "I\nshould\nnot\ninclude\nadditional\nwhitespaces  \nor\n\ttabs.";
+        String expected =
+            "{I should not include additional whitespaces or tabs.}";
 
         String title = writer.write(StandardField.TITLE, original);
         String any = writer.write(new UnknownField("anyotherfield"), original);
@@ -111,41 +129,61 @@ void removeWhitespaceFromNonMultiLineFields() 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
     void tolerateBalancedBrace() throws Exception {
-        String text = "Incorporating evolutionary {Measures into Conservation Prioritization}";
+        String text =
+            "Incorporating evolutionary {Measures into Conservation Prioritization}";
 
-        assertEquals("{" + text + "}", writer.write(new UnknownField("anyfield"), text));
+        assertEquals(
+            "{" + text + "}",
+            writer.write(new UnknownField("anyfield"), text)
+        );
     }
 
     @Test
     void tolerateEscapeCharacters() throws Exception {
-        String text = "Incorporating {\\O}evolutionary {Measures into Conservation Prioritization}";
+        String text =
+            "Incorporating {\\O}evolutionary {Measures into Conservation Prioritization}";
 
-        assertEquals("{" + text + "}", writer.write(new UnknownField("anyfield"), text));
+        assertEquals(
+            "{" + text + "}",
+            writer.write(new UnknownField("anyfield"), text)
+        );
     }
 
     @Test
     void hashEnclosedWordsGetRealStringsInMonthField() throws Exception {
         String text = "#jan# - #feb#";
-        assertEquals("jan # { - } # feb", writer.write(StandardField.MONTH, text));
+        assertEquals(
+            "jan # { - } # feb",
+            writer.write(StandardField.MONTH, text)
+        );
     }
 
     @ParameterizedTest
     @MethodSource("getMarkdowns")
     void keepHashSignInComment(String text) throws Exception {
         String writeResult = writer.write(StandardField.COMMENT, text);
-        String resultWithLfAsNewLineSeparator = StringUtil.unifyLineBreaks(writeResult, "\n");
+        String resultWithLfAsNewLineSeparator = StringUtil.unifyLineBreaks(
+            writeResult,
+            "\n"
+        );
         assertEquals("{" + text + "}", resultWithLfAsNewLineSeparator);
     }
 }
diff --git a/src/test/java/org/jabref/logic/bibtex/FileFieldWriterTest.java b/src/test/java/org/jabref/logic/bibtex/FileFieldWriterTest.java
index 34032fb7859..1fd0433c4d0 100644
--- a/src/test/java/org/jabref/logic/bibtex/FileFieldWriterTest.java
+++ b/src/test/java/org/jabref/logic/bibtex/FileFieldWriterTest.java
@@ -1,18 +1,16 @@
 package org.jabref.logic.bibtex;
 
+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;
-
 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;
-
 public class FileFieldWriterTest {
 
     @Test
@@ -37,10 +35,22 @@ public void testQuoteNull() {
 
     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" } }
+            )
         );
     }
 
@@ -52,7 +62,14 @@ public void testEncodeStringArray(String expected, String[][] values) {
 
     @Test
     public void testFileFieldWriterGetStringRepresentation() {
-        LinkedFile file = new LinkedFile("test", Path.of("X:\\Users\\abc.pdf"), "PDF");
-        assertEquals("test:X\\:/Users/abc.pdf:PDF", FileFieldWriter.getStringRepresentation(file));
+        LinkedFile file = new LinkedFile(
+            "test",
+            Path.of("X:\\Users\\abc.pdf"),
+            "PDF"
+        );
+        assertEquals(
+            "test:X\\:/Users/abc.pdf:PDF",
+            FileFieldWriter.getStringRepresentation(file)
+        );
     }
 }
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 ff22e801c87..0fec4d4be16 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,25 @@
 package org.jabref.logic.bibtex.comparator;
 
+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;
-
 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;
-
 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());
@@ -28,7 +29,8 @@ void compareOfEmptyDatabasesReportsNoDifferences() throws Exception {
 
     @Test
     void compareOfSameEntryReportsNoDifferences() throws Exception {
-        BibEntry entry = new BibEntry(BibEntry.DEFAULT_TYPE).withField(StandardField.TITLE, "test");
+        BibEntry entry = new BibEntry(BibEntry.DEFAULT_TYPE)
+            .withField(StandardField.TITLE, "test");
 
         BibDatabaseDiff diff = compareEntries(entry, entry);
 
@@ -36,9 +38,12 @@ 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");
+    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");
 
         BibDatabaseDiff diff = compareEntries(entryOne, entryTwo);
 
@@ -46,9 +51,12 @@ 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");
+    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");
 
         BibDatabaseDiff diff = compareEntries(entryOne, entryTwo);
 
@@ -56,9 +64,18 @@ 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");
+    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"
+            );
 
         BibDatabaseDiff diff = compareEntries(entryOne, entryTwo);
 
@@ -66,9 +83,15 @@ 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);
 
@@ -76,67 +99,143 @@ 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");
+    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");
 
         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().get(0).getOriginalEntry(), "there is another value as originalEntry");
-        assertNull(diff.getEntryDifferences().get(0).getNewEntry(), "newEntry is not null");
-        assertEquals(entryTwo, diff.getEntryDifferences().get(1).getNewEntry(), "there is another value as newEntry");
-        assertNull(diff.getEntryDifferences().get(1).getOriginalEntry(), "originalEntry is not null");
+        assertEquals(
+            2,
+            diff.getEntryDifferences().size(),
+            "incorrect amount of different entries"
+        );
+
+        assertEquals(
+            entryOne,
+            diff.getEntryDifferences().get(0).getOriginalEntry(),
+            "there is another value as originalEntry"
+        );
+        assertNull(
+            diff.getEntryDifferences().get(0).getNewEntry(),
+            "newEntry is not null"
+        );
+        assertEquals(
+            entryTwo,
+            diff.getEntryDifferences().get(1).getNewEntry(),
+            "there is another value as newEntry"
+        );
+        assertNull(
+            diff.getEntryDifferences().get(1).getOriginalEntry(),
+            "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)));
-
-        BibDatabaseDiff diff = BibDatabaseDiff.compare(databaseOne, databaseTwo);
+    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))
+        );
+
+        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().get(0).getOriginalEntry(), "there is another value as originalEntry");
-        assertNull(diff.getEntryDifferences().get(0).getNewEntry(), "newEntry is not null");
-        assertEquals(entryTwo, diff.getEntryDifferences().get(1).getNewEntry(), "there is another value as newEntry");
-        assertNull(diff.getEntryDifferences().get(1).getOriginalEntry(), "originalEntry is not null");
-        assertEquals(entryThree, diff.getEntryDifferences().get(2).getNewEntry(), "there is another value as newEntry [2]");
-        assertNull(diff.getEntryDifferences().get(2).getOriginalEntry(), "originalEntry is not null [2]");
+        assertEquals(
+            3,
+            diff.getEntryDifferences().size(),
+            "incorrect amount of different entries"
+        );
+
+        assertEquals(
+            entryOne,
+            diff.getEntryDifferences().get(0).getOriginalEntry(),
+            "there is another value as originalEntry"
+        );
+        assertNull(
+            diff.getEntryDifferences().get(0).getNewEntry(),
+            "newEntry is not null"
+        );
+        assertEquals(
+            entryTwo,
+            diff.getEntryDifferences().get(1).getNewEntry(),
+            "there is another value as newEntry"
+        );
+        assertNull(
+            diff.getEntryDifferences().get(1).getOriginalEntry(),
+            "originalEntry is not null"
+        );
+        assertEquals(
+            entryThree,
+            diff.getEntryDifferences().get(2).getNewEntry(),
+            "there is another value as newEntry [2]"
+        );
+        assertNull(
+            diff.getEntryDifferences().get(2).getOriginalEntry(),
+            "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");
+            .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");
+            .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().get(0).getOriginalEntry(), "there is another value as originalEntry");
-        assertEquals(entryTwo, diff.getEntryDifferences().get(0).getNewEntry(), "there is another value as newEntry");
+        assertEquals(
+            1,
+            diff.getEntryDifferences().size(),
+            "incorrect amount of different entries"
+        );
+
+        assertEquals(
+            entryOne,
+            diff.getEntryDifferences().get(0).getOriginalEntry(),
+            "there is another value as originalEntry"
+        );
+        assertEquals(
+            entryTwo,
+            diff.getEntryDifferences().get(0).getNewEntry(),
+            "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)));
+    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))
+        );
 
         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 28f8ed4d801..80ff5732dd6 100644
--- a/src/test/java/org/jabref/logic/bibtex/comparator/BibStringDiffTest.java
+++ b/src/test/java/org/jabref/logic/bibtex/comparator/BibStringDiffTest.java
@@ -1,14 +1,5 @@
 package org.jabref.logic.bibtex.comparator;
 
-import java.util.Collections;
-import java.util.List;
-
-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.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertNotEquals;
@@ -16,11 +7,21 @@
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
+import java.util.Collections;
+import java.util.List;
+import org.jabref.model.database.BibDatabase;
+import org.jabref.model.entry.BibtexString;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
 public 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() {
@@ -30,23 +31,44 @@ 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")));
-
-        List<BibStringDiff> result = BibStringDiff.compare(originalDataBase, newDataBase);
+        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);
     }
 
     @Test
     void equalTest() {
-        BibStringDiff other = new BibStringDiff(diff.getOriginalString(), diff.getNewString());
+        BibStringDiff other = new BibStringDiff(
+            diff.getOriginalString(),
+            diff.getNewString()
+        );
         assertEquals(diff, other);
         assertEquals(diff.hashCode(), other.hashCode());
     }
 
     @Test
     void notEqualTest() {
-        BibStringDiff other = new BibStringDiff(diff.getNewString(), diff.getOriginalString());
+        BibStringDiff other = new BibStringDiff(
+            diff.getNewString(),
+            diff.getOriginalString()
+        );
         assertNotEquals(diff, other);
         assertNotEquals(diff.hashCode(), other.hashCode());
     }
@@ -70,7 +92,10 @@ void compareToDifferentClassIsFalse() {
     @Test
     void testGetters() {
         BibtexString bsOne = new BibtexString("aKahle", "Kahle, Brewster");
-        BibtexString bsTwo = new BibtexString("iMIT", "Institute of Technology");
+        BibtexString bsTwo = new BibtexString(
+            "iMIT",
+            "Institute of Technology"
+        );
         BibStringDiff diff = new BibStringDiff(bsOne, bsTwo);
         assertEquals(diff.getOriginalString(), bsOne);
         assertEquals(diff.getNewString(), bsTwo);
@@ -81,45 +106,76 @@ void testCompareEmptyDatabases() {
         when(originalDataBase.hasNoStrings()).thenReturn(true);
         when(newDataBase.hasNoStrings()).thenReturn(true);
 
-        assertEquals(Collections.emptyList(), BibStringDiff.compare(originalDataBase, newDataBase));
+        assertEquals(
+            Collections.emptyList(),
+            BibStringDiff.compare(originalDataBase, newDataBase)
+        );
     }
 
     @Test
     void testCompareNameChange() {
-        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"));
+        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")
+        );
         assertEquals(List.of(expectedDiff), result);
     }
 
     @Test
     void testCompareNoDiff() {
-        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);
+        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);
     }
 
     @Test
     void testCompareRemovedString() {
-        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);
-        BibStringDiff expectedDiff = new BibStringDiff(new BibtexString("name", "content"), null);
+        List<BibStringDiff> result = BibStringDiff.compare(
+            originalDataBase,
+            newDataBase
+        );
+        BibStringDiff expectedDiff = new BibStringDiff(
+            new BibtexString("name", "content"),
+            null
+        );
         assertEquals(List.of(expectedDiff), result);
     }
 
     @Test
     void testCompareAddString() {
-        when(originalDataBase.getStringValues()).thenReturn(Collections.emptyList());
-        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"));
+        when(originalDataBase.getStringValues())
+            .thenReturn(Collections.emptyList());
+        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")
+        );
         assertEquals(List.of(expectedDiff), result);
     }
 }
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 e4bd1f9c5fe..64f2421e9a8 100644
--- a/src/test/java/org/jabref/logic/bibtex/comparator/BibtexStringComparatorTest.java
+++ b/src/test/java/org/jabref/logic/bibtex/comparator/BibtexStringComparatorTest.java
@@ -1,45 +1,91 @@
 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;
+
 public class BibtexStringComparatorTest {
 
-    private final BibtexStringComparator bsc1 = new BibtexStringComparator(false);
-    private final BibtexStringComparator bsc2 = new BibtexStringComparator(true);
+    private final BibtexStringComparator bsc1 = new BibtexStringComparator(
+        false
+    );
+    private final BibtexStringComparator bsc2 = new BibtexStringComparator(
+        true
+    );
 
     @Test
     public void test() {
-        BibtexString bs1 = new BibtexString("VLSI", "Very Large Scale Integration");
+        BibtexString bs1 = new BibtexString(
+            "VLSI",
+            "Very Large Scale Integration"
+        );
         BibtexString bs2 = new BibtexString("DSP", "Digital Signal Processing");
         BibtexString bs3 = new BibtexString("DSP", "Digital Signal Processing");
 
         // Same string
-        assertEquals(0, bsc1.compare(bs1, bs1), "Error when comparing the 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");
+        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#");
         // bs4 before bs1 if not considering that bs4 contains bs1
-        assertTrue(bsc1.compare(bs1, bs4) > 0, "bs1 does not lexicographically succeed bs4");
-        assertTrue(bsc1.compare(bs4, bs1) < 0, "bs4 does not lexicographically precede bs1");
+        assertTrue(
+            bsc1.compare(bs1, bs4) > 0,
+            "bs1 does not lexicographically succeed bs4"
+        );
+        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(bs4, bs1) > 0, "bs4 contains 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 5bf856aeeb7..c7fcfba584c 100644
--- a/src/test/java/org/jabref/logic/bibtex/comparator/CrossRefEntryComparatorTest.java
+++ b/src/test/java/org/jabref/logic/bibtex/comparator/CrossRefEntryComparatorTest.java
@@ -1,15 +1,15 @@
 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;
-
 public class CrossRefEntryComparatorTest {
+
     private CrossRefEntryComparator comparator;
 
     @BeforeEach
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 c8c44802d81..fada2fd0327 100644
--- a/src/test/java/org/jabref/logic/bibtex/comparator/EntryComparatorTest.java
+++ b/src/test/java/org/jabref/logic/bibtex/comparator/EntryComparatorTest.java
@@ -1,29 +1,36 @@
 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");
+            .withField(StandardField.AUTHOR, "Stephen King");
         BibEntry entry2 = new BibEntry()
-                .withField(StandardField.AUTHOR, "Henning Mankell");
-        EntryComparator entryComparator = new EntryComparator(false, false, StandardField.AUTHOR);
+            .withField(StandardField.AUTHOR, "Henning Mankell");
+        EntryComparator entryComparator = new EntryComparator(
+            false,
+            false,
+            StandardField.AUTHOR
+        );
 
         assertEquals(-2, entryComparator.compare(entry1, entry2));
     }
@@ -31,10 +38,14 @@ void compareAuthorFieldBiggerAscending() {
     @Test
     void bothEntriesHaveNotSetTheFieldToCompareAscending() {
         BibEntry entry1 = new BibEntry()
-                .withField(StandardField.BOOKTITLE, "Stark - The Dark Half (1989)");
+            .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);
+            .withField(StandardField.COMMENTATOR, "Some Commentator");
+        EntryComparator entryComparator = new EntryComparator(
+            false,
+            false,
+            StandardField.TITLE
+        );
 
         assertEquals(-1, entryComparator.compare(entry1, entry2));
     }
@@ -42,10 +53,14 @@ void bothEntriesHaveNotSetTheFieldToCompareAscending() {
     @Test
     void secondEntryHasNotSetFieldToCompareAscending() {
         BibEntry entry1 = new BibEntry()
-                .withField(StandardField.TITLE, "Stark - The Dark Half (1989)");
+            .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);
+            .withField(StandardField.COMMENTATOR, "Some Commentator");
+        EntryComparator entryComparator = new EntryComparator(
+            false,
+            false,
+            StandardField.TITLE
+        );
 
         assertEquals(1, entryComparator.compare(entry1, entry2));
     }
@@ -53,99 +68,151 @@ void secondEntryHasNotSetFieldToCompareAscending() {
     @Test
     void firstEntryHasNotSetFieldToCompareAscending() {
         BibEntry entry1 = new BibEntry()
-                .withField(StandardField.COMMENTATOR, "Some Commentator");
+            .withField(StandardField.COMMENTATOR, "Some Commentator");
         BibEntry entry2 = new BibEntry()
-                .withField(StandardField.TITLE, "Stark - The Dark Half (1989)");
+            .withField(StandardField.TITLE, "Stark - The Dark Half (1989)");
 
-        EntryComparator entryComparator = new EntryComparator(false, false, StandardField.TITLE);
+        EntryComparator entryComparator = new EntryComparator(
+            false,
+            false,
+            StandardField.TITLE
+        );
 
         assertEquals(-1, entryComparator.compare(entry1, entry2));
     }
 
     @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);
+        EntryComparator entryComparator = new EntryComparator(
+            false,
+            false,
+            StandardField.EDITION
+        );
 
         assertEquals(-1, entryComparator.compare(entry1, entry2));
     }
 
     @Test
     void compareObjectsByKeyAscending() {
-        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));
+        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)
+        );
     }
 
     @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(e1, e2)
+        );
+        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(" ");
-        assertEquals(1, new EntryComparator(false, false, InternalField.KEY_FIELD).compare(e1, e2));
-        assertEquals(-1, new EntryComparator(false, false, InternalField.KEY_FIELD).compare(e2, e1));
+        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)
+        );
     }
 
     @Test
     void compareWithCrLfFields() {
         BibEntry e1 = new BibEntry()
-                .withField(StandardField.COMMENT, "line1\r\n\r\nline3\r\n\r\nline5");
+            .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));
+            .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");
+            .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));
+            .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");
+            .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));
+            .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, "");
-        assertEquals(-1, new EntryComparator(true, false, InternalField.KEY_FIELD).compare(e1, e2));
+        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, "");
-        assertEquals(-1, new EntryComparator(true, false, StandardField.AUTHOR).compare(e1, e2));
+        BibEntry e2 = new BibEntry().withField(StandardField.AUTHOR, "");
+        assertEquals(
+            -1,
+            new EntryComparator(true, false, StandardField.AUTHOR)
+                .compare(e1, e2)
+        );
     }
 
     @Test
@@ -153,8 +220,10 @@ void withAuthorIsBeforeWithoutAuthorWhenSortingWithAuthor() {
         BibEntry e1 = new BibEntry()
             .withField(StandardField.AUTHOR, "Stephen King");
         BibEntry e2 = new BibEntry();
-        assertEquals(1, new EntryComparator(false, false, StandardField.AUTHOR).compare(e1, e2));
+        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 447f038fa74..f3fd23b6d4f 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 java.util.stream.Stream;
 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;
-
 public class FieldComparatorTest {
+
     @Test
     public 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 @@ public void compareMonthFieldIdentity() throws Exception {
     @Test
     public 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,21 +35,20 @@ public void compareMonthFieldEquality() throws Exception {
     @Test
     public 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));
     }
 
     @Test
     public 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");
+        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");
 
         assertEquals(1, comparator.compare(bigger, smaller));
     }
@@ -61,8 +56,7 @@ public void compareMonthFieldBiggerDescending() throws Exception {
     @Test
     public 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 +64,8 @@ public void compareYearFieldIdentity() throws Exception {
     @Test
     public 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,28 +73,29 @@ public void compareYearFieldEquality() throws Exception {
     @Test
     public 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));
     }
 
     @Test
     public 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");
+        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");
 
         assertEquals(1, comparator.compare(bigger, smaller));
     }
 
     @Test
     public void compareTypeFieldIdentity() throws Exception {
-        FieldComparator comparator = new FieldComparator(InternalField.TYPE_HEADER);
+        FieldComparator comparator = new FieldComparator(
+            InternalField.TYPE_HEADER
+        );
         BibEntry equal = new BibEntry(StandardEntryType.Article);
 
         assertEquals(0, comparator.compare(equal, equal));
@@ -110,7 +103,9 @@ public void compareTypeFieldIdentity() throws Exception {
 
     @Test
     public void compareTypeFieldEquality() throws Exception {
-        FieldComparator comparator = new FieldComparator(InternalField.TYPE_HEADER);
+        FieldComparator comparator = new FieldComparator(
+            InternalField.TYPE_HEADER
+        );
         BibEntry equal = new BibEntry(StandardEntryType.Article);
         equal.setId("1");
         BibEntry equal2 = new BibEntry(StandardEntryType.Article);
@@ -121,7 +116,9 @@ public void compareTypeFieldEquality() throws Exception {
 
     @Test
     public void compareTypeFieldBiggerAscending() throws Exception {
-        FieldComparator comparator = new FieldComparator(InternalField.TYPE_HEADER);
+        FieldComparator comparator = new FieldComparator(
+            InternalField.TYPE_HEADER
+        );
         BibEntry smaller = new BibEntry(StandardEntryType.Article);
         BibEntry bigger = new BibEntry(StandardEntryType.Book);
 
@@ -130,7 +127,10 @@ public void compareTypeFieldBiggerAscending() throws Exception {
 
     @Test
     public 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 +140,7 @@ public void compareTypeFieldBiggerDescending() throws Exception {
     @Test
     public 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 +148,9 @@ public void compareStringFieldsIdentity() throws Exception {
     @Test
     public void compareStringFieldsEquality() throws Exception {
         FieldComparator comparator = new FieldComparator(StandardField.TITLE);
-        BibEntry equal = new BibEntry()
-                .withField(StandardField.TITLE, "title");
+        BibEntry equal = new BibEntry().withField(StandardField.TITLE, "title");
         BibEntry equal2 = new BibEntry()
-                .withField(StandardField.TITLE, "title");
+            .withField(StandardField.TITLE, "title");
 
         assertEquals(0, comparator.compare(equal, equal2));
     }
@@ -160,73 +158,120 @@ public void compareStringFieldsEquality() throws Exception {
     @Test
     public 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));
     }
 
     @Test
     public 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");
+        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");
 
         assertEquals(1, comparator.compare(bigger, smaller));
     }
 
     @Test
     public void compareNumericFieldsBiggerDescending() throws Exception {
-        FieldComparator comparator = new FieldComparator(new OrFields(StandardField.PMID), true);
+        FieldComparator comparator = new FieldComparator(
+            new OrFields(StandardField.PMID),
+            true
+        );
         BibEntry smaller = new BibEntry()
-                .withField(StandardField.PMID, "234567");
+            .withField(StandardField.PMID, "234567");
         BibEntry bigger = new BibEntry()
-                .withField(StandardField.PMID, "123456");
+            .withField(StandardField.PMID, "123456");
 
         assertEquals(1, comparator.compare(bigger, smaller));
     }
 
     @Test
-    public void compareParsableWithNonParsableNumericFieldDescending() throws Exception {
-        FieldComparator comparator = new FieldComparator(new OrFields(StandardField.PMID), true);
+    public void compareParsableWithNonParsableNumericFieldDescending()
+        throws Exception {
+        FieldComparator comparator = new FieldComparator(
+            new OrFields(StandardField.PMID),
+            true
+        );
         BibEntry parsable = new BibEntry()
-                .withField(StandardField.PMID, "123456");
+            .withField(StandardField.PMID, "123456");
         BibEntry unparsable = new BibEntry()
-                .withField(StandardField.PMID, "abc##z");
+            .withField(StandardField.PMID, "abc##z");
 
         assertEquals(1, comparator.compare(parsable, unparsable));
     }
 
     @ParameterizedTest
     @MethodSource
-    public void compareNumericalValues(int comparisonResult, String id1, String id2, String message) {
+    public 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);
+        assertEquals(
+            comparisonResult,
+            comparator.compare(entry1, entry2),
+            message
+        );
     }
 
     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(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(
+                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(
+                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"
+            )
         );
     }
 
     @ParameterizedTest
     @MethodSource
-    public void nullTests(int comparisonResult, String firstValue, String secondValue) {
+    public void nullTests(
+        int comparisonResult,
+        String firstValue,
+        String secondValue
+    ) {
         FieldComparator comparator = new FieldComparator(StandardField.TITLE);
 
         BibEntry entry1 = new BibEntry();
@@ -244,10 +289,10 @@ public void nullTests(int comparisonResult, String firstValue, String secondValu
 
     private static Stream<Arguments> nullTests() {
         return Stream.of(
-                Arguments.of(0, null, null),
-                Arguments.of(0, "value", "value"),
-                Arguments.of(-1, null, "value"),
-                Arguments.of(1, "value", null)
+            Arguments.of(0, null, null),
+            Arguments.of(0, "value", "value"),
+            Arguments.of(-1, null, "value"),
+            Arguments.of(1, "value", null)
         );
     }
 
@@ -255,9 +300,9 @@ private static Stream<Arguments> nullTests() {
     public void compareAuthorField() throws Exception {
         FieldComparator comparator = new FieldComparator(StandardField.AUTHOR);
         BibEntry bigger = new BibEntry()
-                .withField(StandardField.AUTHOR, "Freund, Lucas");
+            .withField(StandardField.AUTHOR, "Freund, Lucas");
         BibEntry smaller = new BibEntry()
-                .withField(StandardField.AUTHOR, "Mustermann, Max");
+            .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 9fded7c7802..21350e93db9 100644
--- a/src/test/java/org/jabref/logic/bibtex/comparator/GroupDiffTest.java
+++ b/src/test/java/org/jabref/logic/bibtex/comparator/GroupDiffTest.java
@@ -1,20 +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 java.util.Optional;
 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;
-
 public class GroupDiffTest {
 
     private final MetaData originalMetaData = mock(MetaData.class);
@@ -23,11 +21,21 @@ public class GroupDiffTest {
 
     @BeforeEach
     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, ','));
-        parent.addSubgroup(new ExplicitGroup("ExplicitNode", GroupHierarchyType.REFINING, ','));
+        rootOriginal =
+            GroupTreeNode.fromGroup(new AllEntriesGroup("All entries"));
+        rootOriginal.addSubgroup(
+            new ExplicitGroup("ExplicitA", GroupHierarchyType.INCLUDING, ',')
+        );
+        GroupTreeNode parent = rootOriginal.addSubgroup(
+            new ExplicitGroup(
+                "ExplicitParent",
+                GroupHierarchyType.INDEPENDENT,
+                ','
+            )
+        );
+        parent.addSubgroup(
+            new ExplicitGroup("ExplicitNode", GroupHierarchyType.REFINING, ',')
+        );
     }
 
     @Test
@@ -35,30 +43,56 @@ void compareEmptyGroups() {
         when(originalMetaData.getGroups()).thenReturn(Optional.empty());
         when(newMetaData.getGroups()).thenReturn(Optional.empty());
 
-        assertEquals(Optional.empty(), GroupDiff.compare(originalMetaData, newMetaData));
+        assertEquals(
+            Optional.empty(),
+            GroupDiff.compare(originalMetaData, newMetaData)
+        );
     }
 
     @Test
     void compareGroupWithItself() {
-        when(originalMetaData.getGroups()).thenReturn(Optional.of(rootOriginal));
+        when(originalMetaData.getGroups())
+            .thenReturn(Optional.of(rootOriginal));
         when(newMetaData.getGroups()).thenReturn(Optional.of(rootOriginal));
 
-        assertEquals(Optional.empty(), GroupDiff.compare(originalMetaData, newMetaData));
+        assertEquals(
+            Optional.empty(),
+            GroupDiff.compare(originalMetaData, newMetaData)
+        );
     }
 
     @Test
     void compareWithChangedGroup() {
-        GroupTreeNode rootModified = GroupTreeNode.fromGroup(new AllEntriesGroup("All entries"));
-        rootModified.addSubgroup(new ExplicitGroup("ExplicitA", GroupHierarchyType.INCLUDING, ','));
-
-        when(originalMetaData.getGroups()).thenReturn(Optional.of(rootOriginal));
+        GroupTreeNode rootModified = GroupTreeNode.fromGroup(
+            new AllEntriesGroup("All entries")
+        );
+        rootModified.addSubgroup(
+            new ExplicitGroup("ExplicitA", GroupHierarchyType.INCLUDING, ',')
+        );
+
+        when(originalMetaData.getGroups())
+            .thenReturn(Optional.of(rootOriginal));
         when(newMetaData.getGroups()).thenReturn(Optional.of(rootModified));
 
-        Optional<GroupDiff> groupDiff = GroupDiff.compare(originalMetaData, newMetaData);
-
-        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());
+        Optional<GroupDiff> groupDiff = GroupDiff.compare(
+            originalMetaData,
+            newMetaData
+        );
+
+        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()
+        );
     }
 }
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 8e7e11473ce..b0c06348858 100644
--- a/src/test/java/org/jabref/logic/bibtex/comparator/MetaDataDiffTest.java
+++ b/src/test/java/org/jabref/logic/bibtex/comparator/MetaDataDiffTest.java
@@ -1,22 +1,26 @@
 package org.jabref.logic.bibtex.comparator;
 
-import java.util.Optional;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
+import java.util.Optional;
 import org.jabref.model.entry.field.StandardField;
 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;
-
 public class MetaDataDiffTest {
+
     @Test
-    public void compareWithSameContentSelectorsDoesNotReportAnyDiffs() throws Exception {
+    public void compareWithSameContentSelectorsDoesNotReportAnyDiffs()
+        throws Exception {
         MetaData one = new MetaData();
-        one.addContentSelector(new ContentSelector(StandardField.AUTHOR, "first", "second"));
+        one.addContentSelector(
+            new ContentSelector(StandardField.AUTHOR, "first", "second")
+        );
         MetaData two = new MetaData();
-        two.addContentSelector(new ContentSelector(StandardField.AUTHOR, "first", "second"));
+        two.addContentSelector(
+            new ContentSelector(StandardField.AUTHOR, "first", "second")
+        );
 
         assertEquals(Optional.empty(), MetaDataDiff.compare(one, two));
     }
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 b868a4e26bf..88c18a7e886 100644
--- a/src/test/java/org/jabref/logic/bibtex/comparator/PreambleDiffTest.java
+++ b/src/test/java/org/jabref/logic/bibtex/comparator/PreambleDiffTest.java
@@ -1,45 +1,59 @@
 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 java.util.Optional;
 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;
-
 public class PreambleDiffTest {
 
-    private final BibDatabaseContext originalDataBaseContext = mock(BibDatabaseContext.class);
-    private final BibDatabaseContext newDataBaseContext = mock(BibDatabaseContext.class);
+    private final BibDatabaseContext originalDataBaseContext = mock(
+        BibDatabaseContext.class
+    );
+    private final BibDatabaseContext newDataBaseContext = mock(
+        BibDatabaseContext.class
+    );
     private final BibDatabase originalDataBase = mock(BibDatabase.class);
     private final BibDatabase newDataBase = mock(BibDatabase.class);
 
     @BeforeEach
     void setUp() {
-        when(originalDataBaseContext.getDatabase()).thenReturn(originalDataBase);
+        when(originalDataBaseContext.getDatabase())
+            .thenReturn(originalDataBase);
         when(newDataBaseContext.getDatabase()).thenReturn(newDataBase);
     }
 
     @Test
     void compareSamePreambleTest() {
-        when(originalDataBase.getPreamble()).thenReturn(Optional.of("preamble"));
+        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
     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);
+        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
+        );
         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 1b63e26cbb3..028832c7008 100644
--- a/src/test/java/org/jabref/logic/bst/BstFunctionsTest.java
+++ b/src/test/java/org/jabref/logic/bst/BstFunctionsTest.java
@@ -1,9 +1,14 @@
 package org.jabref.logic.bst;
 
+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.util.Collections;
 import java.util.List;
 import java.util.Map;
-
+import org.antlr.v4.runtime.RecognitionException;
 import org.jabref.logic.bst.util.BstCaseChangersTest;
 import org.jabref.logic.bst.util.BstNameFormatterTest;
 import org.jabref.logic.bst.util.BstPurifierTest;
@@ -13,15 +18,8 @@
 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.assertNotNull;
-import static org.junit.jupiter.api.Assertions.assertThrows;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-
 /**
  * For additional tests see for
  * <ul>
@@ -33,23 +31,26 @@
  * </ul>
  */
 class BstFunctionsTest {
+
     @Test
     public void testCompareFunctions() throws RecognitionException {
-        BstVM vm = new BstVM("""
-                FUNCTION { test.compare } {
-                    #5  #5      =   % TRUE
-                    #1  #2      =   % FALSE
-                    #3  #4      <   % TRUE
-                    #4  #3      <   % FALSE
-                    #4  #4      <   % FALSE
-                    #3  #4      >   % FALSE
-                    #4  #3      >   % TRUE
-                    #4  #4      >   % FALSE
-                    "H" "H"     =   % TRUE
-                    "H" "Ha"    =   % FALSE
-                }
-                EXECUTE { test.compare }
-                """);
+        BstVM vm = new BstVM(
+            """
+            FUNCTION { test.compare } {
+                #5  #5      =   % TRUE
+                #1  #2      =   % FALSE
+                #3  #4      <   % TRUE
+                #4  #3      <   % FALSE
+                #4  #4      <   % FALSE
+                #3  #4      >   % FALSE
+                #4  #3      >   % TRUE
+                #4  #4      >   % FALSE
+                "H" "H"     =   % TRUE
+                "H" "Ha"    =   % FALSE
+            }
+            EXECUTE { test.compare }
+            """
+        );
 
         vm.render(Collections.emptyList());
 
@@ -68,13 +69,15 @@ public void testCompareFunctions() throws RecognitionException {
 
     @Test
     public void testArithmeticFunctions() throws RecognitionException {
-        BstVM vm = new BstVM("""
-                FUNCTION { test } {
-                    #1  #1  +   % 2
-                    #5  #2  -   % 3
-                }
-                EXECUTE { test }
-                """);
+        BstVM vm = new BstVM(
+            """
+            FUNCTION { test } {
+                #1  #1  +   % 2
+                #5  #2  -   % 3
+            }
+            EXECUTE { test }
+            """
+        );
 
         vm.render(Collections.emptyList());
 
@@ -84,34 +87,42 @@ public void testArithmeticFunctions() throws RecognitionException {
     }
 
     @Test
-    public void testArithmeticFunctionTypeMismatch() throws RecognitionException {
-        BstVM vm = new BstVM("""
-                FUNCTION { test } {
-                    #1  "HELLO" +   % Should throw exception
-                }
-                EXECUTE { test }
-                """);
-
-        assertThrows(BstVMException.class, () -> vm.render(Collections.emptyList()));
+    public void testArithmeticFunctionTypeMismatch()
+        throws RecognitionException {
+        BstVM vm = new BstVM(
+            """
+            FUNCTION { test } {
+                #1  "HELLO" +   % Should throw exception
+            }
+            EXECUTE { test }
+            """
+        );
+
+        assertThrows(
+            BstVMException.class,
+            () -> vm.render(Collections.emptyList())
+        );
     }
 
     @Test
     public void testStringOperations() throws RecognitionException {
         // Test for concat (*) and add.period
-        BstVM vm = new BstVM("""
-                FUNCTION { test } {
-                    "H" "ello"      *           % Hello
-                    "Johnny"        add.period$ % Johnny.
-                    "Johnny."       add.period$ % Johnny.
-                    "Johnny!"       add.period$ % Johnny!
-                    "Johnny?"       add.period$ % Johnny?
-                    "Johnny} }}}"   add.period$ % Johnny.}
-                    "Johnny!}"      add.period$ % Johnny!}
-                    "Johnny?}"      add.period$ % Johnny?}
-                    "Johnny.}"      add.period$ % Johnny.}
-                }
-                EXECUTE { test }
-                """);
+        BstVM vm = new BstVM(
+            """
+            FUNCTION { test } {
+                "H" "ello"      *           % Hello
+                "Johnny"        add.period$ % Johnny.
+                "Johnny."       add.period$ % Johnny.
+                "Johnny!"       add.period$ % Johnny!
+                "Johnny?"       add.period$ % Johnny?
+                "Johnny} }}}"   add.period$ % Johnny.}
+                "Johnny!}"      add.period$ % Johnny!}
+                "Johnny?}"      add.period$ % Johnny?}
+                "Johnny.}"      add.period$ % Johnny.}
+            }
+            EXECUTE { test }
+            """
+        );
 
         vm.render(Collections.emptyList());
 
@@ -129,39 +140,44 @@ public void testStringOperations() throws RecognitionException {
 
     @Test
     public void testMissing() throws RecognitionException {
-        BstVM vm = new BstVM("""
-                ENTRY { title } { } { }
-                FUNCTION { presort } { cite$ 'sort.key$ := }
-                ITERATE { presort }
-                READ
-                SORT
-                FUNCTION { test } { title missing$ cite$ }
-                ITERATE { test }
-                """);
+        BstVM vm = new BstVM(
+            """
+            ENTRY { title } { } { }
+            FUNCTION { presort } { cite$ 'sort.key$ := }
+            ITERATE { presort }
+            READ
+            SORT
+            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"));
+            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
     public void testNumNames() throws RecognitionException {
-        BstVM vm = new BstVM("""
-                FUNCTION { test } {
-                    "Johnny Foo { and } Mary Bar" num.names$
-                    "Johnny Foo and Mary Bar" num.names$
-                }
-                EXECUTE { test }
-                """);
+        BstVM vm = new BstVM(
+            """
+            FUNCTION { test } {
+                "Johnny Foo { and } Mary Bar" num.names$
+                "Johnny Foo and Mary Bar" num.names$
+            }
+            EXECUTE { test }
+            """
+        );
 
         vm.render(Collections.emptyList());
 
@@ -172,19 +188,21 @@ public void testNumNames() throws RecognitionException {
 
     @Test
     public void testSubstring() throws RecognitionException {
-        BstVM vm = new BstVM("""
-                FUNCTION { test } {
-                    "123456789" #2  #1          substring$  % 2
-                    "123456789" #4  global.max$ substring$  % 456789
-                    "123456789" #1  #9          substring$  % 123456789
-                    "123456789" #1  #10         substring$  % 123456789
-                    "123456789" #1  #99         substring$  % 123456789
-                    "123456789" #-7 #3          substring$  % 123
-                    "123456789" #-1 #1          substring$  % 9
-                    "123456789" #-1 #3          substring$  % 789
-                    "123456789" #-2 #2          substring$  % 78
-                } EXECUTE { test }
-                """);
+        BstVM vm = new BstVM(
+            """
+            FUNCTION { test } {
+                "123456789" #2  #1          substring$  % 2
+                "123456789" #4  global.max$ substring$  % 456789
+                "123456789" #1  #9          substring$  % 123456789
+                "123456789" #1  #10         substring$  % 123456789
+                "123456789" #1  #99         substring$  % 123456789
+                "123456789" #-7 #3          substring$  % 123
+                "123456789" #-1 #1          substring$  % 9
+                "123456789" #-1 #3          substring$  % 789
+                "123456789" #-2 #2          substring$  % 78
+            } EXECUTE { test }
+            """
+        );
 
         vm.render(Collections.emptyList());
 
@@ -202,20 +220,24 @@ public void testSubstring() throws RecognitionException {
 
     @Test
     public void testEmpty() throws RecognitionException {
-        BstVM vm = new BstVM("""
-                ENTRY { title } { } { }
-                READ
-                STRINGS { s }
-                FUNCTION { test } {
-                    s empty$          % TRUE
-                    "" empty$         % TRUE
-                    "   " empty$      % TRUE
-                    title empty$      % TRUE
-                    " HALLO " empty$  % FALSE
-                }
-                ITERATE { test }
-                """);
-        List<BibEntry> testEntry = List.of(new BibEntry(StandardEntryType.Article));
+        BstVM vm = new BstVM(
+            """
+            ENTRY { title } { } { }
+            READ
+            STRINGS { s }
+            FUNCTION { test } {
+                s empty$          % TRUE
+                "" empty$         % TRUE
+                "   " empty$      % TRUE
+                title empty$      % TRUE
+                " HALLO " empty$  % FALSE
+            }
+            ITERATE { test }
+            """
+        );
+        List<BibEntry> testEntry = List.of(
+            new BibEntry(StandardEntryType.Article)
+        );
 
         vm.render(testEntry);
 
@@ -229,66 +251,84 @@ public void testEmpty() throws RecognitionException {
 
     @Test
     public void testFormatNameStatic() throws RecognitionException {
-        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 }
-                """);
+        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 }
+            """
+        );
         List<BibEntry> v = Collections.emptyList();
 
         vm.render(v);
 
-        assertEquals("de~la Vall{\\'e}e~Poussin, C.~L. X.~J?", vm.getStack().pop());
+        assertEquals(
+            "de~la Vall{\\'e}e~Poussin, C.~L. X.~J?",
+            vm.getStack().pop()
+        );
         assertEquals(0, vm.getStack().size());
     }
 
     @Test
     public void testFormatNameInEntries() throws RecognitionException {
-        BstVM vm = new BstVM("""
-                ENTRY { author } { } { }
-                FUNCTION { presort } { cite$ 'sort.key$ := }
-                ITERATE { presort }
-                READ
-                SORT
-                FUNCTION { format }{ author #2 "{vv~}{ll}{, jj}{, f}?" format.name$ }
-                ITERATE { format }
-                """);
+        BstVM vm = new BstVM(
+            """
+            ENTRY { author } { } { }
+            FUNCTION { presort } { cite$ 'sort.key$ := }
+            ITERATE { presort }
+            READ
+            SORT
+            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"));
+            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);
 
-        assertEquals("de~la Vall{\\'e}e~Poussin, C.~L. X.~J?", vm.getStack().pop());
+        assertEquals(
+            "de~la Vall{\\'e}e~Poussin, C.~L. X.~J?",
+            vm.getStack().pop()
+        );
         assertEquals("Annabi, H?", vm.getStack().pop());
         assertEquals(0, vm.getStack().size());
     }
 
     @Test
     public void testChangeCase() throws RecognitionException {
-        BstVM vm = new BstVM("""
-                STRINGS { title }
-                READ
-                FUNCTION { format.title } {
-                    duplicate$ empty$
-                        { pop$ "" }
-                        { "t" change.case$ }
-                    if$
-                }
-                FUNCTION { test } {
-                    "hello world" "u" change.case$ format.title
-                    "Hello World" format.title
-                    "" format.title
-                    "{A}{D}/{C}ycle: {I}{B}{M}'s {F}ramework for {A}pplication {D}evelopment and {C}ase" "u" change.case$ format.title
-                }
-                EXECUTE { test }
-                """);
+        BstVM vm = new BstVM(
+            """
+            STRINGS { title }
+            READ
+            FUNCTION { format.title } {
+                duplicate$ empty$
+                    { pop$ "" }
+                    { "t" change.case$ }
+                if$
+            }
+            FUNCTION { test } {
+                "hello world" "u" change.case$ format.title
+                "Hello World" format.title
+                "" format.title
+                "{A}{D}/{C}ycle: {I}{B}{M}'s {F}ramework for {A}pplication {D}evelopment and {C}ase" "u" change.case$ format.title
+            }
+            EXECUTE { test }
+            """
+        );
 
         vm.render(Collections.emptyList());
 
-        assertEquals("{A}{D}/{C}ycle: {I}{B}{M}'s {F}ramework for {A}pplication {D}evelopment and {C}ase",
-                vm.getStack().pop());
+        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());
         assertEquals("Hello world", vm.getStack().pop());
@@ -297,19 +337,21 @@ public void testChangeCase() throws RecognitionException {
 
     @Test
     public void testTextLength() throws RecognitionException {
-        BstVM vm = new BstVM("""
-                FUNCTION { test } {
-                    "hello world" text.length$                                  % 11
-                    "Hello {W}orld" text.length$                                % 11
-                    "" text.length$                                             % 0
-                    "{A}{D}/{Cycle}" text.length$                               % 8
-                    "{\\This is one character}" text.length$                    % 1
-                    "{\\This {is} {one} {c{h}}aracter as well}" text.length$    % 1
-                    "{\\And this too" text.length$                              % 1
-                    "These are {\\11}" text.length$                             % 11
-                }
-                EXECUTE { test }
-                """);
+        BstVM vm = new BstVM(
+            """
+            FUNCTION { test } {
+                "hello world" text.length$                                  % 11
+                "Hello {W}orld" text.length$                                % 11
+                "" text.length$                                             % 0
+                "{A}{D}/{Cycle}" text.length$                               % 8
+                "{\\This is one character}" text.length$                    % 1
+                "{\\This {is} {one} {c{h}}aracter as well}" text.length$    % 1
+                "{\\And this too" text.length$                              % 1
+                "These are {\\11}" text.length$                             % 11
+            }
+            EXECUTE { test }
+            """
+        );
 
         vm.render(Collections.emptyList());
 
@@ -326,10 +368,12 @@ public void testTextLength() throws RecognitionException {
 
     @Test
     public void testIntToStr() throws RecognitionException {
-        BstVM vm = new BstVM("""
-                FUNCTION { test } { #3 int.to.str$ #9999 int.to.str$ }
-                EXECUTE { test }
-                """);
+        BstVM vm = new BstVM(
+            """
+            FUNCTION { test } { #3 int.to.str$ #9999 int.to.str$ }
+            EXECUTE { test }
+            """
+        );
 
         vm.render(Collections.emptyList());
 
@@ -340,10 +384,12 @@ public void testIntToStr() throws RecognitionException {
 
     @Test
     public void testChrToInt() throws RecognitionException {
-        BstVM vm = new BstVM("""
-                FUNCTION { test } { "H" chr.to.int$ }
-                EXECUTE { test }
-                """);
+        BstVM vm = new BstVM(
+            """
+            FUNCTION { test } { "H" chr.to.int$ }
+            EXECUTE { test }
+            """
+        );
 
         vm.render(Collections.emptyList());
 
@@ -353,10 +399,12 @@ public void testChrToInt() throws RecognitionException {
 
     @Test
     public void testChrToIntIntToChr() throws RecognitionException {
-        BstVM vm = new BstVM("""
-                FUNCTION { test } { "H" chr.to.int$ int.to.chr$ }
-                EXECUTE {test}
-                """);
+        BstVM vm = new BstVM(
+            """
+            FUNCTION { test } { "H" chr.to.int$ int.to.chr$ }
+            EXECUTE {test}
+            """
+        );
 
         vm.render(Collections.emptyList());
 
@@ -366,19 +414,22 @@ public void testChrToIntIntToChr() throws RecognitionException {
 
     @Test
     public void testType() throws RecognitionException {
-        BstVM vm = new BstVM("""
-                ENTRY  { } { } { }
-                FUNCTION { presort } { cite$ 'sort.key$ := }
-                ITERATE { presort }
-                SORT
-                FUNCTION { test } { type$ }
-                ITERATE { test }
-                """);
+        BstVM vm = new BstVM(
+            """
+            ENTRY  { } { } { }
+            FUNCTION { presort } { cite$ 'sort.key$ := }
+            ITERATE { presort }
+            SORT
+            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"));
+            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);
 
@@ -391,37 +442,43 @@ public void testType() throws RecognitionException {
 
     @Test
     public void testCallType() throws RecognitionException {
-        BstVM vm = new BstVM("""
-                ENTRY { title } { } { }
-                FUNCTION { presort } { cite$ 'sort.key$ := }
-                ITERATE { presort }
-                READ
-                SORT
-                FUNCTION { inproceedings }{ "InProceedings called on " title * }
-                FUNCTION { book }{ "Book called on " title * }
-                ITERATE { call.type$ }
-                """);
+        BstVM vm = new BstVM(
+            """
+            ENTRY { title } { } { }
+            FUNCTION { presort } { cite$ 'sort.key$ := }
+            ITERATE { presort }
+            READ
+            SORT
+            FUNCTION { inproceedings }{ "InProceedings called on " title * }
+            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"));
+            BstVMTest.defaultTestEntry(),
+            new BibEntry(StandardEntryType.Book)
+                .withCitationKey("test")
+                .withField(StandardField.TITLE, "Test")
+        );
 
         vm.render(testEntries);
 
         assertEquals("Book called on Test", vm.getStack().pop());
         assertEquals(
-                "InProceedings called on Effective work practices for floss development: A model and propositions",
-                vm.getStack().pop());
+            "InProceedings called on Effective work practices for floss development: A model and propositions",
+            vm.getStack().pop()
+        );
         assertEquals(0, vm.getStack().size());
     }
 
     @Test
     public void testSwap() throws RecognitionException {
-        BstVM vm = new BstVM("""
-                FUNCTION { a } { #3 "Hallo" swap$ }
-                EXECUTE { a }
-                """);
+        BstVM vm = new BstVM(
+            """
+            FUNCTION { a } { #3 "Hallo" swap$ }
+            EXECUTE { a }
+            """
+        );
 
         List<BibEntry> v = Collections.emptyList();
         vm.render(v);
@@ -433,15 +490,18 @@ public void testSwap() throws RecognitionException {
 
     @Test
     void testAssignFunction() {
-        BstVM vm = new BstVM("""
-                INTEGERS { test.var }
-                FUNCTION { test.func } { #1 'test.var := }
-                EXECUTE { test.func }
-                """);
+        BstVM vm = new BstVM(
+            """
+            INTEGERS { test.var }
+            FUNCTION { test.func } { #1 'test.var := }
+            EXECUTE { test.func }
+            """
+        );
 
         vm.render(Collections.emptyList());
 
-        Map<String, BstFunctions.BstFunction> functions = vm.latestContext.functions();
+        Map<String, BstFunctions.BstFunction> functions =
+            vm.latestContext.functions();
         assertTrue(functions.containsKey("test.func"));
         assertNotNull(functions.get("test.func"));
         assertEquals(1, vm.latestContext.integers().get("test.var"));
@@ -449,15 +509,17 @@ void testAssignFunction() {
 
     @Test
     void testSimpleIf() {
-        BstVM vm = new BstVM("""
-                FUNCTION { path1 } { #1 }
-                FUNCTION { path0 } { #0 }
-                FUNCTION { test } {
-                    #1 path1 path0 if$
-                    #0 path1 path0 if$
-                }
-                EXECUTE { test }
-                """);
+        BstVM vm = new BstVM(
+            """
+            FUNCTION { path1 } { #1 }
+            FUNCTION { path0 } { #0 }
+            FUNCTION { test } {
+                #1 path1 path0 if$
+                #0 path1 path0 if$
+            }
+            EXECUTE { test }
+            """
+        );
 
         vm.render(Collections.emptyList());
 
@@ -468,20 +530,22 @@ void testSimpleIf() {
 
     @Test
     void testSimpleWhile() {
-        BstVM vm = new BstVM("""
-                INTEGERS { i }
-                FUNCTION { test } {
-                    #3 'i :=
-                    { i }
-                    {
-                        i
-                        i #1 -
-                        'i :=
-                    }
-                    while$
+        BstVM vm = new BstVM(
+            """
+            INTEGERS { i }
+            FUNCTION { test } {
+                #3 'i :=
+                { i }
+                {
+                    i
+                    i #1 -
+                    'i :=
                 }
-                EXECUTE { test }
-                """);
+                while$
+            }
+            EXECUTE { test }
+            """
+        );
 
         vm.render(Collections.emptyList());
 
@@ -493,41 +557,43 @@ void testSimpleWhile() {
 
     @Test
     public void testNestedControlFunctions() throws RecognitionException {
-        BstVM vm = new BstVM("""
-                STRINGS { t }
-                FUNCTION { not } { { #0 } { #1 } if$ }
-                FUNCTION { n.dashify } {
-                    "HELLO-WORLD" 't :=
-                    ""
-                    { t empty$ not }                                    % while
+        BstVM vm = new BstVM(
+            """
+            STRINGS { t }
+            FUNCTION { not } { { #0 } { #1 } if$ }
+            FUNCTION { n.dashify } {
+                "HELLO-WORLD" 't :=
+                ""
+                { t empty$ not }                                    % while
+                {
+                    t #1 #1 substring$ "-" =                        % if
                     {
-                        t #1 #1 substring$ "-" =                        % if
+                        t #1 #2 substring$ "--" = not               % if
                         {
-                            t #1 #2 substring$ "--" = not               % if
+                            "--" *
+                            t #2 global.max$ substring$ 't :=
+                        }
+                        {
+                            { t #1 #1 substring$ "-" = }            % while
                             {
-                                "--" *
+                                "-" *
                                 t #2 global.max$ substring$ 't :=
                             }
-                            {
-                                { t #1 #1 substring$ "-" = }            % while
-                                {
-                                    "-" *
-                                    t #2 global.max$ substring$ 't :=
-                                }
-                                while$
-                            }
-                           if$
-                        }
-                        {
-                            t #1 #1 substring$ *
-                            t #2 global.max$ substring$ 't :=
+                            while$
                         }
-                        if$
+                       if$
                     }
-                    while$
+                    {
+                        t #1 #1 substring$ *
+                        t #2 global.max$ substring$ 't :=
+                    }
+                    if$
                 }
-                EXECUTE { n.dashify }
-                """);
+                while$
+            }
+            EXECUTE { n.dashify }
+            """
+        );
         List<BibEntry> v = Collections.emptyList();
 
         vm.render(v);
@@ -538,24 +604,26 @@ public void testNestedControlFunctions() throws RecognitionException {
 
     @Test
     public void testLogic() throws RecognitionException {
-        BstVM vm = new BstVM("""
-                FUNCTION { not } { { #0 } { #1 } if$ }
-                FUNCTION { and } { 'skip$ { pop$ #0 } if$ }
-                FUNCTION { or } { { pop$ #1 } 'skip$ if$ }
-                FUNCTION { test } {
-                    #1 #1 and
-                    #0 #1 and
-                    #1 #0 and
-                    #0 #0 and
-                    #0 not
-                    #1 not
-                    #1 #1 or
-                    #0 #1 or
-                    #1 #0 or
-                    #0 #0 or
-                }
-                EXECUTE { test }
-                """);
+        BstVM vm = new BstVM(
+            """
+            FUNCTION { not } { { #0 } { #1 } if$ }
+            FUNCTION { and } { 'skip$ { pop$ #0 } if$ }
+            FUNCTION { or } { { pop$ #1 } 'skip$ if$ }
+            FUNCTION { test } {
+                #1 #1 and
+                #0 #1 and
+                #1 #0 and
+                #0 #0 and
+                #0 not
+                #1 not
+                #1 #1 or
+                #0 #1 or
+                #1 #0 or
+                #0 #0 or
+            }
+            EXECUTE { test }
+            """
+        );
 
         vm.render(Collections.emptyList());
 
@@ -578,61 +646,67 @@ public void testLogic() throws RecognitionException {
 
     @Test
     public void testWidth() throws RecognitionException {
-        BstVM vm = new BstVM("""
-                ENTRY { address author title type } { } { label }
-                STRINGS { longest.label }
-                INTEGERS { number.label longest.label.width }
-                FUNCTION { initialize.longest.label } {
-                    "" 'longest.label :=
-                    #1 'number.label :=
-                    #0 'longest.label.width :=
-                }
-                FUNCTION {longest.label.pass} {
-                    number.label int.to.str$ 'label :=
-                    number.label #1 + 'number.label :=
-                    label width$ longest.label.width >
-                        {
-                            label 'longest.label :=
-                            label width$ 'longest.label.width :=
-                        }
-                        'skip$
-                    if$
-                }
-                EXECUTE { initialize.longest.label }
-                ITERATE { longest.label.pass }
-                FUNCTION { begin.bib } {
-                    preamble$ empty$
-                        'skip$
-                        { preamble$ write$ newline$ }
-                    if$
-                    "\\begin{thebibliography}{"  longest.label  * "}" *
-                }
-                EXECUTE {begin.bib}
-                """);
+        BstVM vm = new BstVM(
+            """
+            ENTRY { address author title type } { } { label }
+            STRINGS { longest.label }
+            INTEGERS { number.label longest.label.width }
+            FUNCTION { initialize.longest.label } {
+                "" 'longest.label :=
+                #1 'number.label :=
+                #0 'longest.label.width :=
+            }
+            FUNCTION {longest.label.pass} {
+                number.label int.to.str$ 'label :=
+                number.label #1 + 'number.label :=
+                label width$ longest.label.width >
+                    {
+                        label 'longest.label :=
+                        label width$ 'longest.label.width :=
+                    }
+                    'skip$
+                if$
+            }
+            EXECUTE { initialize.longest.label }
+            ITERATE { longest.label.pass }
+            FUNCTION { begin.bib } {
+                preamble$ empty$
+                    'skip$
+                    { preamble$ write$ newline$ }
+                if$
+                "\\begin{thebibliography}{"  longest.label  * "}" *
+            }
+            EXECUTE {begin.bib}
+            """
+        );
 
         List<BibEntry> testEntries = List.of(BstVMTest.defaultTestEntry());
 
         vm.render(testEntries);
 
-        assertTrue(vm.latestContext.integers().containsKey("longest.label.width"));
+        assertTrue(
+            vm.latestContext.integers().containsKey("longest.label.width")
+        );
         assertEquals("\\begin{thebibliography}{1}", vm.getStack().pop());
     }
 
     @Test
     public void testDuplicateEmptyPopSwapIf() throws RecognitionException {
-        BstVM vm = new BstVM("""
-                FUNCTION { emphasize } {
-                    duplicate$ empty$
-                        { pop$ "" }
-                        { "{\\em " swap$ * "}" * }
-                    if$
-                }
-                FUNCTION { test } {
-                    "" emphasize
-                    "Hello" emphasize
-                }
-                EXECUTE { test }
-                """);
+        BstVM vm = new BstVM(
+            """
+            FUNCTION { emphasize } {
+                duplicate$ empty$
+                    { pop$ "" }
+                    { "{\\em " swap$ * "}" * }
+                if$
+            }
+            FUNCTION { test } {
+                "" emphasize
+                "Hello" emphasize
+            }
+            EXECUTE { test }
+            """
+        );
 
         vm.render(Collections.emptyList());
 
@@ -643,18 +717,20 @@ public void testDuplicateEmptyPopSwapIf() throws RecognitionException {
 
     @Test
     public void testPreambleWriteNewlineQuote() {
-        BstVM vm = new BstVM("""
-                FUNCTION { test } {
-                    preamble$
-                    write$
-                    newline$
-                    "hello"
-                    write$
-                    quote$ "quoted" * quote$ *
-                    write$
-                }
-                EXECUTE { test }
-                """);
+        BstVM vm = new BstVM(
+            """
+            FUNCTION { test } {
+                preamble$
+                write$
+                newline$
+                "hello"
+                write$
+                quote$ "quoted" * quote$ *
+                write$
+            }
+            EXECUTE { test }
+            """
+        );
 
         BibDatabase testDatabase = new BibDatabase();
         testDatabase.setPreamble("A Preamble");
diff --git a/src/test/java/org/jabref/logic/bst/BstPreviewLayoutTest.java b/src/test/java/org/jabref/logic/bst/BstPreviewLayoutTest.java
index f65b8f0f0a8..9b453077cf1 100644
--- a/src/test/java/org/jabref/logic/bst/BstPreviewLayoutTest.java
+++ b/src/test/java/org/jabref/logic/bst/BstPreviewLayoutTest.java
@@ -1,67 +1,108 @@
 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 java.nio.file.Path;
 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;
-
 class BstPreviewLayoutTest {
 
-    private final BibDatabaseContext bibDatabaseContext = new BibDatabaseContext();
+    private final BibDatabaseContext bibDatabaseContext =
+        new BibDatabaseContext();
 
     @Test
     public 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);
+        String preview = bstPreviewLayout.generatePreview(
+            entry,
+            bibDatabaseContext
+        );
         assertEquals("O. Kopp. Thoughts on development.", preview);
     }
 
     @Test
     public 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);
+        String preview = bstPreviewLayout.generatePreview(
+            entry,
+            bibDatabaseContext
+        );
         assertEquals("O. Kopp. Thoughts on development, May.", preview);
     }
 
     @Test
-    public 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);
+    public 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
+        );
     }
 
     @Test
-    public 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);
+    public 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
+        );
     }
 
     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.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.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.AUTHOR, "Tobias Diez")
+            .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.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"
+            );
     }
 }
diff --git a/src/test/java/org/jabref/logic/bst/BstVMTest.java b/src/test/java/org/jabref/logic/bst/BstVMTest.java
index 52a36b987d0..27b5aafead4 100644
--- a/src/test/java/org/jabref/logic/bst/BstVMTest.java
+++ b/src/test/java/org/jabref/logic/bst/BstVMTest.java
@@ -1,61 +1,77 @@
 package org.jabref.logic.bst;
 
+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;
-
+import org.antlr.v4.runtime.RecognitionException;
 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;
-
 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.YEAR, "2005")
-                .withField(StandardField.OWNER, "oezbek")
-                .withField(StandardField.TIMESTAMP, "2006.05.29")
-                .withField(StandardField.URL, "http://james.howison.name/publications.html");
+            .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.YEAR, "2005")
+            .withField(StandardField.OWNER, "oezbek")
+            .withField(StandardField.TIMESTAMP, "2006.05.29")
+            .withField(
+                StandardField.URL,
+                "http://james.howison.name/publications.html"
+            );
     }
 
     @Test
     public void testAbbrv() throws RecognitionException, IOException {
-        BstVM vm = new BstVM(Path.of("src/test/resources/org/jabref/logic/bst/abbrv.bst"));
+        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", ""));
+            expected.replaceAll("\\s", ""),
+            result.replaceAll("\\s", "")
+        );
     }
 
     @Test
     public void testSimple() throws RecognitionException {
-        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 }{
-                   #0 'before.all :=
-                   #1 'mid.sentence :=
-                   #2 'after.sentence :=
-                   #3 'after.block :=
-                }
-                STRINGS { s t }
-                READ
-                """);
+        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 }{
+               #0 'before.all :=
+               #1 'mid.sentence :=
+               #2 'after.sentence :=
+               #3 'after.block :=
+            }
+            STRINGS { s t }
+            READ
+            """
+        );
         List<BibEntry> testEntries = List.of(defaultTestEntry());
 
         vm.render(testEntries);
@@ -69,22 +85,25 @@ public void testSimple() throws RecognitionException {
 
     @Test
     public void testLabel() throws RecognitionException {
-        BstVM vm = new BstVM("""
-                ENTRY { title } {} { label }
-                FUNCTION { test } {
-                    label #0 =
-                    title 'label :=
-                    #5 label #6 pop$ }
-                READ
-                ITERATE { test }
-                """);
+        BstVM vm = new BstVM(
+            """
+            ENTRY { title } {} { label }
+            FUNCTION { test } {
+                label #0 =
+                title 'label :=
+                #5 label #6 pop$ }
+            READ
+            ITERATE { test }
+            """
+        );
         List<BibEntry> testEntries = List.of(defaultTestEntry());
 
         vm.render(testEntries);
 
         assertEquals(
-                "Effective work practices for floss development: A model and propositions",
-                vm.latestContext.stack().pop());
+            "Effective work practices for floss development: A model and propositions",
+            vm.latestContext.stack().pop()
+        );
     }
 
     @Test
@@ -107,17 +126,19 @@ public void testBuildIn() throws RecognitionException {
 
     @Test
     public void testVariables() throws RecognitionException {
-        BstVM vm = new BstVM("""
-                STRINGS { t }
-                FUNCTION { not } {
-                    { #0 } { #1 } if$
-                }
-                FUNCTION { n.dashify } {
-                    "HELLO-WORLD" 't :=
-                    t empty$ not
-                }
-                EXECUTE { n.dashify }
-                """);
+        BstVM vm = new BstVM(
+            """
+            STRINGS { t }
+            FUNCTION { not } {
+                { #0 } { #1 } if$
+            }
+            FUNCTION { n.dashify } {
+                "HELLO-WORLD" 't :=
+                t empty$ not
+            }
+            EXECUTE { n.dashify }
+            """
+        );
 
         vm.render(Collections.emptyList());
 
@@ -126,11 +147,13 @@ public void testVariables() throws RecognitionException {
 
     @Test
     public void testHypthenatedName() throws RecognitionException, IOException {
-        BstVM vm = new BstVM(Path.of("src/test/resources/org/jabref/logic/bst/abbrv.bst"));
+        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")
+            new BibEntry(StandardEntryType.Article)
+                .withCitationKey("canh05")
+                .withField(StandardField.AUTHOR, "Jean-Paul Sartre")
         );
 
         String result = vm.render(testEntries);
@@ -140,32 +163,34 @@ public void testHypthenatedName() throws RecognitionException, IOException {
 
     @Test
     void testAbbrevStyleChopWord() {
-        BstVM vm = new BstVM("""
-                STRINGS { s }
-                INTEGERS { len }
-
-                FUNCTION { chop.word }
-                {
-                    's :=
-                        'len :=
-                        s #1 len substring$ =
-                            { s len #1 + global.max$ substring$ }
-                        's
-                        if$
-                }
-
-                FUNCTION { test } {
-                    "A " #2
-                    "A Colorful Morning"
-                    chop.word
-
-                    "An " #3
-                    "A Colorful Morning"
-                    chop.word
-                }
-
-                EXECUTE { test }
-                """);
+        BstVM vm = new BstVM(
+            """
+            STRINGS { s }
+            INTEGERS { len }
+
+            FUNCTION { chop.word }
+            {
+                's :=
+                    'len :=
+                    s #1 len substring$ =
+                        { s len #1 + global.max$ substring$ }
+                    's
+                    if$
+            }
+
+            FUNCTION { test } {
+                "A " #2
+                "A Colorful Morning"
+                chop.word
+
+                "An " #3
+                "A Colorful Morning"
+                chop.word
+            }
+
+            EXECUTE { test }
+            """
+        );
 
         vm.render(Collections.emptyList());
 
@@ -176,42 +201,44 @@ void testAbbrevStyleChopWord() {
 
     @Test
     void testAbbrevStyleSortFormatTitle() {
-        BstVM vm = new BstVM("""
-                STRINGS { s t }
-                INTEGERS { len }
-                FUNCTION { sortify } {
-                    purify$
-                    "l" change.case$
-                }
-
-                FUNCTION { chop.word }
-                {
-                    's :=
-                        'len :=
-                        s #1 len substring$ =
-                            { s len #1 + global.max$ substring$ }
-                        's
-                        if$
-                }
-
-                FUNCTION { sort.format.title }
-                { 't :=
-                   "A " #2
-                    "An " #3
-                      "The " #4 t chop.word
-                    chop.word
-                   chop.word
-                  sortify
-                  #1 global.max$ substring$
-                }
-
-                FUNCTION { test } {
-                    "A Colorful Morning"
-                    sort.format.title
-                }
-
-                EXECUTE {test}
-                """);
+        BstVM vm = new BstVM(
+            """
+            STRINGS { s t }
+            INTEGERS { len }
+            FUNCTION { sortify } {
+                purify$
+                "l" change.case$
+            }
+
+            FUNCTION { chop.word }
+            {
+                's :=
+                    'len :=
+                    s #1 len substring$ =
+                        { s len #1 + global.max$ substring$ }
+                    's
+                    if$
+            }
+
+            FUNCTION { sort.format.title }
+            { 't :=
+               "A " #2
+                "An " #3
+                  "The " #4 t chop.word
+                chop.word
+               chop.word
+              sortify
+              #1 global.max$ substring$
+            }
+
+            FUNCTION { test } {
+                "A Colorful Morning"
+                sort.format.title
+            }
+
+            EXECUTE {test}
+            """
+        );
 
         vm.render(Collections.emptyList());
 
diff --git a/src/test/java/org/jabref/logic/bst/BstVMVisitorTest.java b/src/test/java/org/jabref/logic/bst/BstVMVisitorTest.java
index abbfd8aaf3f..915a4c769f1 100644
--- a/src/test/java/org/jabref/logic/bst/BstVMVisitorTest.java
+++ b/src/test/java/org/jabref/logic/bst/BstVMVisitorTest.java
@@ -1,28 +1,28 @@
 package org.jabref.logic.bst;
 
+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 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.jabref.model.entry.BibEntry;
+import org.jabref.model.entry.types.StandardEntryType;
 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;
-
 class BstVMVisitorTest {
 
     @Test
     public void testVisitStringsCommand() {
-        BstVM vm = new BstVM("STRINGS { test.string1 test.string2 test.string3 }");
+        BstVM vm = new BstVM(
+            "STRINGS { test.string1 test.string2 test.string3 }"
+        );
 
         vm.render(Collections.emptyList());
 
@@ -52,28 +52,34 @@ public void testVisitIntegersCommand() {
 
     @Test
     void testVisitFunctionCommand() {
-        BstVM vm = new BstVM("""
-                FUNCTION { test.func } { #1 'test.var := }
-                EXECUTE { test.func }
-                """);
+        BstVM vm = new BstVM(
+            """
+            FUNCTION { test.func } { #1 'test.var := }
+            EXECUTE { test.func }
+            """
+        );
 
         vm.render(Collections.emptyList());
 
-        Map<String, BstFunctions.BstFunction> functions = vm.latestContext.functions();
+        Map<String, BstFunctions.BstFunction> functions =
+            vm.latestContext.functions();
         assertTrue(functions.containsKey("test.func"));
         assertNotNull(functions.get("test.func"));
     }
 
     @Test
     void testVisitMacroCommand() {
-        BstVM vm = new BstVM("""
-                MACRO { jan } { "January" }
-                EXECUTE { jan }
-                """);
+        BstVM vm = new BstVM(
+            """
+            MACRO { jan } { "January" }
+            EXECUTE { jan }
+            """
+        );
 
         vm.render(Collections.emptyList());
 
-        Map<String, BstFunctions.BstFunction> functions = vm.latestContext.functions();
+        Map<String, BstFunctions.BstFunction> functions =
+            vm.latestContext.functions();
         assertTrue(functions.containsKey("jan"));
         assertNotNull(functions.get("jan"));
         assertEquals("January", vm.latestContext.stack().pop());
@@ -82,7 +88,9 @@ void testVisitMacroCommand() {
 
     @Test
     void testVisitEntryCommand() {
-        BstVM vm = new BstVM("ENTRY { address author title type } { variable } { label }");
+        BstVM vm = new BstVM(
+            "ENTRY { address author title type } { variable } { label }"
+        );
         List<BibEntry> testEntries = List.of(BstVMTest.defaultTestEntry());
 
         vm.render(testEntries);
@@ -99,31 +107,47 @@ void testVisitEntryCommand() {
 
     @Test
     void testVisitReadCommand() {
-        BstVM vm = new BstVM("""
-                ENTRY { author title booktitle year owner timestamp url } { } { }
-                READ
-                """);
+        BstVM vm = new BstVM(
+            """
+            ENTRY { author title booktitle year owner timestamp url } { } { }
+            READ
+            """
+        );
         List<BibEntry> testEntries = List.of(BstVMTest.defaultTestEntry());
 
         vm.render(testEntries);
 
         Map<String, String> fields = vm.latestContext.entries().get(0).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"));
-        assertEquals("http://james.howison.name/publications.html", fields.get("url"));
+        assertEquals(
+            "http://james.howison.name/publications.html",
+            fields.get("url")
+        );
     }
 
     @Test
     public void testVisitExecuteCommand() throws RecognitionException {
-        BstVM vm = new BstVM("""
-                INTEGERS { variable.a }
-                FUNCTION { init.state.consts } { #5 'variable.a := }
-                EXECUTE { init.state.consts }
-                """);
+        BstVM vm = new BstVM(
+            """
+            INTEGERS { variable.a }
+            FUNCTION { init.state.consts } { #5 'variable.a := }
+            EXECUTE { init.state.consts }
+            """
+        );
 
         vm.render(Collections.emptyList());
 
@@ -132,16 +156,18 @@ public void testVisitExecuteCommand() throws RecognitionException {
 
     @Test
     public void testVisitIterateCommand() throws RecognitionException {
-        BstVM vm = new BstVM("""
-                ENTRY { } { } { }
-                FUNCTION { test } { cite$ }
-                READ
-                ITERATE { test }
-                """);
+        BstVM vm = new BstVM(
+            """
+            ENTRY { } { } { }
+            FUNCTION { test } { cite$ }
+            READ
+            ITERATE { test }
+            """
+        );
         List<BibEntry> testEntries = List.of(
-                BstVMTest.defaultTestEntry(),
-                new BibEntry(StandardEntryType.Article)
-                        .withCitationKey("test"));
+            BstVMTest.defaultTestEntry(),
+            new BibEntry(StandardEntryType.Article).withCitationKey("test")
+        );
 
         vm.render(testEntries);
 
@@ -152,16 +178,18 @@ public void testVisitIterateCommand() throws RecognitionException {
 
     @Test
     public void testVisitReverseCommand() throws RecognitionException {
-        BstVM vm = new BstVM("""
-                ENTRY { } { } { }
-                FUNCTION { test } { cite$ }
-                READ
-                REVERSE { test }
-                """);
+        BstVM vm = new BstVM(
+            """
+            ENTRY { } { } { }
+            FUNCTION { test } { cite$ }
+            READ
+            REVERSE { test }
+            """
+        );
         List<BibEntry> testEntries = List.of(
-                BstVMTest.defaultTestEntry(),
-                new BibEntry(StandardEntryType.Article)
-                        .withCitationKey("test"));
+            BstVMTest.defaultTestEntry(),
+            new BibEntry(StandardEntryType.Article).withCitationKey("test")
+        );
 
         vm.render(testEntries);
 
@@ -172,44 +200,61 @@ public void testVisitReverseCommand() throws RecognitionException {
 
     @Test
     public void testVisitSortCommand() throws RecognitionException {
-        BstVM vm = new BstVM("""
-                ENTRY { } { } { }
-                FUNCTION { presort } { cite$ 'sort.key$ := }
-                ITERATE { presort }
-                SORT
-                """);
+        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"));
+            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);
 
         List<BstEntry> sortedEntries = vm.latestContext.entries();
-        assertEquals(Optional.of("a"), sortedEntries.get(0).entry.getCitationKey());
-        assertEquals(Optional.of("b"), sortedEntries.get(1).entry.getCitationKey());
-        assertEquals(Optional.of("c"), sortedEntries.get(2).entry.getCitationKey());
-        assertEquals(Optional.of("d"), sortedEntries.get(3).entry.getCitationKey());
+        assertEquals(
+            Optional.of("a"),
+            sortedEntries.get(0).entry.getCitationKey()
+        );
+        assertEquals(
+            Optional.of("b"),
+            sortedEntries.get(1).entry.getCitationKey()
+        );
+        assertEquals(
+            Optional.of("c"),
+            sortedEntries.get(2).entry.getCitationKey()
+        );
+        assertEquals(
+            Optional.of("d"),
+            sortedEntries.get(3).entry.getCitationKey()
+        );
     }
 
     @Test
     void testVisitIdentifier() {
-        BstVM vm = new BstVM("""
-                ENTRY { } { local.variable } { local.label }
-                READ
-                STRINGS { label }
-                INTEGERS { variable }
-                FUNCTION { test } {
-                    #1 'local.variable :=
-                    #2 'variable :=
-                    "TEST" 'local.label :=
-                    "TEST-GLOBAL" 'label :=
-                    local.label local.variable
-                    label variable
-                }
-                ITERATE { test }
-                """);
+        BstVM vm = new BstVM(
+            """
+            ENTRY { } { local.variable } { local.label }
+            READ
+            STRINGS { label }
+            INTEGERS { variable }
+            FUNCTION { test } {
+                #1 'local.variable :=
+                #2 'variable :=
+                "TEST" 'local.label :=
+                "TEST-GLOBAL" 'label :=
+                local.label local.variable
+                label variable
+            }
+            ITERATE { test }
+            """
+        );
         List<BibEntry> testEntries = List.of(BstVMTest.defaultTestEntry());
 
         vm.render(testEntries);
@@ -223,18 +268,20 @@ void testVisitIdentifier() {
 
     @Test
     void testVisitStackitem() {
-        BstVM vm = new BstVM("""
-                STRINGS { t }
-                FUNCTION { test2 } { #3 }
-                FUNCTION { test } {
-                    "HELLO"
-                    #1
-                    't
-                    { #2 }
-                    test2
-                }
-                EXECUTE { test }
-                """);
+        BstVM vm = new BstVM(
+            """
+            STRINGS { t }
+            FUNCTION { test2 } { #3 }
+            FUNCTION { test } {
+                "HELLO"
+                #1
+                't
+                { #2 }
+                test2
+            }
+            EXECUTE { test }
+            """
+        );
 
         vm.render(Collections.emptyList());
 
@@ -245,6 +292,5 @@ void testVisitStackitem() {
         assertEquals("HELLO", vm.getStack().pop());
         assertEquals(0, vm.getStack().size());
     }
-
     // stackitem
 }
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 3bf615093e4..06f60c88cfb 100644
--- a/src/test/java/org/jabref/logic/bst/util/BstCaseChangersTest.java
+++ b/src/test/java/org/jabref/logic/bst/util/BstCaseChangersTest.java
@@ -1,138 +1,198 @@
 package org.jabref.logic.bst.util;
 
-import java.util.stream.Stream;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
+import java.util.stream.Stream;
 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;
-
 public class BstCaseChangersTest {
 
     @ParameterizedTest
     @MethodSource("provideStringsForTitleLowers")
-    public void testChangeCaseTitleLowers(String expected, String toBeFormatted) {
-        assertEquals(expected, BstCaseChanger.changeCase(toBeFormatted, FormatMode.TITLE_LOWERS));
+    public void testChangeCaseTitleLowers(
+        String expected,
+        String toBeFormatted
+    ) {
+        assertEquals(
+            expected,
+            BstCaseChanger.changeCase(toBeFormatted, FormatMode.TITLE_LOWERS)
+        );
     }
 
     private static Stream<Arguments> provideStringsForTitleLowers() {
         return Stream.of(
-                Arguments.of("i", "i"),
-                Arguments.of("0i~ ", "0I~ "),
-                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("{\\'{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("hallo", "hallo"),
-                Arguments.of("Hallo", "HAllo"),
-                Arguments.of("Hallo world", "HAllo World"),
-                Arguments.of("Hallo world. how", "HAllo WORLD. HOW"),
-                Arguments.of("Hallo {WORLD}. how", "HAllo {WORLD}. HOW"),
-                Arguments.of("Hallo {\\world}. how", "HAllo {\\WORLD}. HOW"),
-
-                // testSpecialCharacters
-                Arguments.of("Hallo world: How", "HAllo WORLD: HOW"),
-                Arguments.of("Hallo world! how", "HAllo WORLD! HOW"),
-                Arguments.of("Hallo world? how", "HAllo WORLD? HOW"),
-                Arguments.of("Hallo world. how", "HAllo WORLD. HOW"),
-                Arguments.of("Hallo world, how", "HAllo WORLD, HOW"),
-                Arguments.of("Hallo world; how", "HAllo WORLD; HOW"),
-                Arguments.of("Hallo world- how", "HAllo WORLD- HOW"),
-
-                // 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("i", "i"),
+            Arguments.of("0i~ ", "0I~ "),
+            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("{\\'{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("hallo", "hallo"),
+            Arguments.of("Hallo", "HAllo"),
+            Arguments.of("Hallo world", "HAllo World"),
+            Arguments.of("Hallo world. how", "HAllo WORLD. HOW"),
+            Arguments.of("Hallo {WORLD}. how", "HAllo {WORLD}. HOW"),
+            Arguments.of("Hallo {\\world}. how", "HAllo {\\WORLD}. HOW"),
+            // testSpecialCharacters
+            Arguments.of("Hallo world: How", "HAllo WORLD: HOW"),
+            Arguments.of("Hallo world! how", "HAllo WORLD! HOW"),
+            Arguments.of("Hallo world? how", "HAllo WORLD? HOW"),
+            Arguments.of("Hallo world. how", "HAllo WORLD. HOW"),
+            Arguments.of("Hallo world, how", "HAllo WORLD, HOW"),
+            Arguments.of("Hallo world; how", "HAllo WORLD; HOW"),
+            Arguments.of("Hallo world- how", "HAllo WORLD- HOW"),
+            // 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"
+            )
         );
     }
 
     @ParameterizedTest
     @MethodSource("provideStringsForAllLowers")
     public void testChangeCaseAllLowers(String expected, String toBeFormatted) {
-        assertEquals(expected, BstCaseChanger.changeCase(toBeFormatted, FormatMode.ALL_LOWERS));
+        assertEquals(
+            expected,
+            BstCaseChanger.changeCase(toBeFormatted, FormatMode.ALL_LOWERS)
+        );
     }
 
     private static Stream<Arguments> provideStringsForAllLowers() {
         return Stream.of(
-                Arguments.of("i", "i"),
-                Arguments.of("0i~ ", "0I~ "),
-                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("{\\'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("hallo", "hallo"),
-                Arguments.of("hallo", "HAllo"),
-                Arguments.of("hallo world", "HAllo World"),
-                Arguments.of("hallo world. how", "HAllo WORLD. HOW"),
-                Arguments.of("hallo {worLD}. how", "HAllo {worLD}. HOW"),
-                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("i", "i"),
+            Arguments.of("0i~ ", "0I~ "),
+            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("{\\'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("hallo", "hallo"),
+            Arguments.of("hallo", "HAllo"),
+            Arguments.of("hallo world", "HAllo World"),
+            Arguments.of("hallo world. how", "HAllo WORLD. HOW"),
+            Arguments.of("hallo {worLD}. how", "HAllo {worLD}. HOW"),
+            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"
+            )
         );
     }
 
     @ParameterizedTest
     @MethodSource("provideStringsForAllUppers")
     public void testChangeCaseAllUppers(String expected, String toBeFormatted) {
-        assertEquals(expected, BstCaseChanger.changeCase(toBeFormatted, FormatMode.ALL_UPPERS));
+        assertEquals(
+            expected,
+            BstCaseChanger.changeCase(toBeFormatted, FormatMode.ALL_UPPERS)
+        );
     }
 
     private static Stream<Arguments> provideStringsForAllUppers() {
         return Stream.of(
-                Arguments.of("I", "i"),
-                Arguments.of("0I~ ", "0I~ "),
-                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("{\\'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("HALLO", "hallo"),
-                Arguments.of("HALLO", "HAllo"),
-                Arguments.of("HALLO WORLD", "HAllo World"),
-                Arguments.of("HALLO WORLD. HOW", "HAllo World. How"),
-                Arguments.of("HALLO {worLD}. HOW", "HAllo {worLD}. how"),
-                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("I", "i"),
+            Arguments.of("0I~ ", "0I~ "),
+            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("{\\'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("HALLO", "hallo"),
+            Arguments.of("HALLO", "HAllo"),
+            Arguments.of("HALLO WORLD", "HAllo World"),
+            Arguments.of("HALLO WORLD. HOW", "HAllo World. How"),
+            Arguments.of("HALLO {worLD}. HOW", "HAllo {worLD}. how"),
+            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"
+            )
         );
     }
 
     @ParameterizedTest
     @MethodSource("provideTitleCaseAllLowers")
     public void testTitleCaseAllLowers(String expected, String toBeFormatted) {
-        assertEquals(expected, BstCaseChanger.changeCase(toBeFormatted, FormatMode.ALL_LOWERS));
+        assertEquals(
+            expected,
+            BstCaseChanger.changeCase(toBeFormatted, FormatMode.ALL_LOWERS)
+        );
     }
 
     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}"),
-                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}")
+            // 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}"
+            ),
+            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}"
+            )
         );
     }
 
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 4912af099bf..ee7ad59c887 100644
--- a/src/test/java/org/jabref/logic/bst/util/BstNameFormatterTest.java
+++ b/src/test/java/org/jabref/logic/bst/util/BstNameFormatterTest.java
@@ -1,60 +1,116 @@
 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;
-
 public class BstNameFormatterTest {
 
     @Test
     public void testUmlautsFullNames() {
-        AuthorList list = AuthorList.parse("Charles Louis Xavier Joseph de la Vall{\\'e}e Poussin");
-
-        assertEquals("de~laVall{\\'e}e~PoussinCharles Louis Xavier~Joseph",
-                BstNameFormatter.formatName(list.getAuthor(0), "{vv}{ll}{jj}{ff}"));
+        AuthorList list = AuthorList.parse(
+            "Charles Louis Xavier Joseph de la Vall{\\'e}e Poussin"
+        );
+
+        assertEquals(
+            "de~laVall{\\'e}e~PoussinCharles Louis Xavier~Joseph",
+            BstNameFormatter.formatName(list.getAuthor(0), "{vv}{ll}{jj}{ff}")
+        );
     }
 
     @Test
     public void testUmlautsAbbreviations() {
-        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.",
-                BstNameFormatter.formatName(list.getAuthor(0), "{vv~}{ll}{, jj}{, f.}"));
+        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.",
+            BstNameFormatter.formatName(
+                list.getAuthor(0),
+                "{vv~}{ll}{, jj}{, f.}"
+            )
+        );
     }
 
     @Test
     public void testUmlautsAbbreviationsWithQuestionMark() {
-        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?",
-                BstNameFormatter.formatName(list.getAuthor(0), "{vv~}{ll}{, jj}{, f}?"));
+        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?",
+            BstNameFormatter.formatName(
+                list.getAuthor(0),
+                "{vv~}{ll}{, jj}{, f}?"
+            )
+        );
     }
 
     @Test
     public void testFormatName() {
-        AuthorList list = AuthorList.parse("Charles Louis Xavier Joseph de la Vall{\\'e}e Poussin");
-
-        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");
+        AuthorList list = AuthorList.parse(
+            "Charles Louis Xavier Joseph de la Vall{\\'e}e Poussin"
+        );
+
+        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("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",
-                "Paul {\\'E}mile Victor and and de la Cierva y Codorn{\\’\\i}u, Juan");
+        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"
+        );
     }
 
-    private void assertNameFormat(String string, String string2, int which, String format) {
-        assertEquals(string, BstNameFormatter.formatName(string2, which, format));
+    private void assertNameFormat(
+        String string,
+        String string2,
+        int which,
+        String format
+    ) {
+        assertEquals(
+            string,
+            BstNameFormatter.formatName(string2, which, format)
+        );
     }
 
     private void assertNameFormatC(String string, String string2) {
@@ -72,21 +128,42 @@ private void assertNameFormatA(String string, String string2) {
     @Test
     public 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
     public 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
     public void testConsumeToMatchingBrace() {
         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());
     }
 
@@ -107,6 +184,12 @@ public void testNumberOfChars() {
         assertEquals(6, BstNameFormatter.numberOfChars("Vall{\\'e}e", 6));
         assertEquals(6, BstNameFormatter.numberOfChars("Vall{\\'e}e", 7));
         assertEquals(8, BstNameFormatter.numberOfChars("Vall{e}e", -1));
-        assertEquals(6, BstNameFormatter.numberOfChars("Vall{\\'e this will be skipped}e", -1));
+        assertEquals(
+            6,
+            BstNameFormatter.numberOfChars(
+                "Vall{\\'e this will be skipped}e",
+                -1
+            )
+        );
     }
 }
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 295b735fd37..125d9a11dd5 100644
--- a/src/test/java/org/jabref/logic/bst/util/BstPurifierTest.java
+++ b/src/test/java/org/jabref/logic/bst/util/BstPurifierTest.java
@@ -1,13 +1,12 @@
 package org.jabref.logic.bst.util;
 
-import java.util.stream.Stream;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
+import java.util.stream.Stream;
 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;
-
 public class BstPurifierTest {
 
     @ParameterizedTest
@@ -18,15 +17,21 @@ public void testPurify(String expected, String toBePurified) {
 
     private static Stream<Arguments> provideTestStrings() {
         return Stream.of(
-                Arguments.of("i", "i"),
-                Arguments.of("0I  ", "0I~ "),
-                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("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("i", "i"),
+            Arguments.of("0I  ", "0I~ "),
+            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("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"
+            )
         );
     }
 }
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 cc857101822..6b8385c5078 100644
--- a/src/test/java/org/jabref/logic/bst/util/BstTextPrefixerTest.java
+++ b/src/test/java/org/jabref/logic/bst/util/BstTextPrefixerTest.java
@@ -1,9 +1,9 @@
 package org.jabref.logic.bst.util;
 
-import org.junit.jupiter.api.Test;
-
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
+import org.junit.jupiter.api.Test;
+
 public class BstTextPrefixerTest {
 
     @Test
@@ -13,13 +13,22 @@ public void testPrefix() {
         assertPrefix("Hi Hi", "Hi Hi ");
         assertPrefix("{\\oe}", "{\\oe}");
         assertPrefix("Hi {\\oe   }H", "Hi {\\oe   }Hi ");
-        assertPrefix("Jonat", "Jonathan Meyer and Charles Louis Xavier Joseph de la Vall{\\'e}e Poussin");
+        assertPrefix(
+            "Jonat",
+            "Jonathan Meyer and Charles Louis Xavier Joseph de la Vall{\\'e}e Poussin"
+        );
         assertPrefix("{\\'e}", "{\\'e}");
         assertPrefix("{\\'{E}}doua", "{\\'{E}}douard Masterly");
-        assertPrefix("Ulric", "Ulrich {\\\"{U}}nderwood and Ned {\\~N}et and Paul {\\={P}}ot");
+        assertPrefix(
+            "Ulric",
+            "Ulrich {\\\"{U}}nderwood and Ned {\\~N}et and Paul {\\={P}}ot"
+        );
     }
 
-    private static void assertPrefix(final String string, final String string2) {
+    private static void assertPrefix(
+        final String string,
+        final String string2
+    ) {
         assertEquals(string, BstTextPrefixer.textPrefix(5, string2));
     }
 }
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 30f2f6770e5..83497f91dac 100644
--- a/src/test/java/org/jabref/logic/bst/util/BstWidthCalculatorTest.java
+++ b/src/test/java/org/jabref/logic/bst/util/BstWidthCalculatorTest.java
@@ -1,13 +1,12 @@
 package org.jabref.logic.bst.util;
 
-import java.util.stream.Stream;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
+import java.util.stream.Stream;
 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;
-
 /**
  * How to create these test using Bibtex:
  * <p/>
@@ -45,15 +44,21 @@ public void testWidth(int i, String str) {
 
     private static Stream<Arguments> provideTestWidth() {
         return Stream.of(
-                Arguments.of(278, "i"),
-                Arguments.of(1639, "0I~ "),
-                Arguments.of(2612, "Hi Hi "),
-                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(7861, "{\\'{E}}douard Masterly"),
-                Arguments.of(30514, "Jonathan Meyer and Charles Louis Xavier Joseph de la Vall{\\'e}e Poussin")
+            Arguments.of(278, "i"),
+            Arguments.of(1639, "0I~ "),
+            Arguments.of(2612, "Hi Hi "),
+            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(7861, "{\\'{E}}douard Masterly"),
+            Arguments.of(
+                30514,
+                "Jonathan Meyer and Charles Louis Xavier Joseph de la Vall{\\'e}e Poussin"
+            )
         );
     }
 
@@ -65,11 +70,11 @@ public void testGetCharWidth(int i, Character c) {
 
     private static Stream<Arguments> provideTestGetCharWidth() {
         return Stream.of(
-                Arguments.of(500, '0'),
-                Arguments.of(361, 'I'),
-                Arguments.of(500, '~'),
-                Arguments.of(500, '}'),
-                Arguments.of(278, ' ')
+            Arguments.of(500, '0'),
+            Arguments.of(361, 'I'),
+            Arguments.of(500, '~'),
+            Arguments.of(500, '}'),
+            Arguments.of(278, ' ')
         );
     }
 }
diff --git a/src/test/java/org/jabref/logic/citationkeypattern/AbstractCitationKeyPatternTest.java b/src/test/java/org/jabref/logic/citationkeypattern/AbstractCitationKeyPatternTest.java
index a7774903e1c..6f849b57278 100644
--- a/src/test/java/org/jabref/logic/citationkeypattern/AbstractCitationKeyPatternTest.java
+++ b/src/test/java/org/jabref/logic/citationkeypattern/AbstractCitationKeyPatternTest.java
@@ -1,21 +1,23 @@
 package org.jabref.logic.citationkeypattern;
 
-import java.util.List;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.mockito.Mockito.mock;
 
+import java.util.List;
 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 AbstractCitationKeyPatternTest {
 
     @Test
     void AbstractCitationKeyPatternParse() throws Exception {
-        AbstractCitationKeyPattern pattern = mock(AbstractCitationKeyPattern.class, Mockito.CALLS_REAL_METHODS);
+        AbstractCitationKeyPattern pattern = mock(
+            AbstractCitationKeyPattern.class,
+            Mockito.CALLS_REAL_METHODS
+        );
 
         pattern.setDefaultValue("[field1]spacer1[field2]spacer2[field3]");
         List<String> expectedPattern = List.of(
@@ -37,7 +39,10 @@ void AbstractCitationKeyPatternParse() throws Exception {
 
     @Test
     void AbstractCitationKeyPatternParseEmptySpacer() throws Exception {
-        AbstractCitationKeyPattern pattern = mock(AbstractCitationKeyPattern.class, Mockito.CALLS_REAL_METHODS);
+        AbstractCitationKeyPattern pattern = mock(
+            AbstractCitationKeyPattern.class,
+            Mockito.CALLS_REAL_METHODS
+        );
 
         pattern.setDefaultValue("[field1][field2]spacer2[field3]");
         List<String> expectedPattern = List.of(
diff --git a/src/test/java/org/jabref/logic/citationkeypattern/BracketedPatternTest.java b/src/test/java/org/jabref/logic/citationkeypattern/BracketedPatternTest.java
index 6959dde3ce0..d1468dfe82e 100644
--- a/src/test/java/org/jabref/logic/citationkeypattern/BracketedPatternTest.java
+++ b/src/test/java/org/jabref/logic/citationkeypattern/BracketedPatternTest.java
@@ -1,14 +1,16 @@
 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.assertThrows;
 
+import java.util.stream.Stream;
 import org.jabref.model.database.BibDatabase;
 import org.jabref.model.entry.AuthorList;
 import org.jabref.model.entry.BibEntry;
 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,6 @@
 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.assertThrows;
-
 /**
  * Tests based on a BibEntry are contained in {@link CitationKeyGeneratorTest}
  */
@@ -34,21 +32,36 @@ class BracketedPatternTest {
 
     @BeforeEach
     void setUp() {
-        bibentry = new BibEntry().withField(StandardField.AUTHOR, "O. Kitsune")
-                                 .withField(StandardField.YEAR, "2017")
-                                 .withField(StandardField.PAGES, "213--216");
+        bibentry =
+            new BibEntry()
+                .withField(StandardField.AUTHOR, "O. Kitsune")
+                .withField(StandardField.YEAR, "2017")
+                .withField(StandardField.PAGES, "213--216");
 
-        dbentry = new BibEntry(StandardEntryType.Article)
+        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.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.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");
 
@@ -58,14 +71,30 @@ void setUp() {
 
     static Stream<Arguments> allAuthors() {
         return Stream.of(
-                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("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"
+            )
+        );
     }
 
     @ParameterizedTest
@@ -76,14 +105,27 @@ void allAuthors(String expected, AuthorList list) {
 
     static Stream<Arguments> authorsAlpha() {
         return Stream.of(
-                Arguments.of("A+", "Alexander Artemenko and others"),
-                Arguments.of("A+", "Aachen and others"),
-                Arguments.of("AB+", "Aachen and Berlin and others"),
-                Arguments.of("ABC+", "Aachen and Berlin and Chemnitz and others"),
-                Arguments.of("ABCD", "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("A+", "Alexander Artemenko and others"),
+            Arguments.of("A+", "Aachen and others"),
+            Arguments.of("AB+", "Aachen and Berlin and others"),
+            Arguments.of("ABC+", "Aachen and Berlin and Chemnitz and others"),
+            Arguments.of(
+                "ABCD",
+                "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"
+            )
+        );
     }
 
     @ParameterizedTest
@@ -97,22 +139,44 @@ void authorsAlpha(String expected, AuthorList list) {
      */
     static Stream<Arguments> oneAuthorPlusInitials() {
         return Stream.of(
-                Arguments.of("Aalst", "Wil van der Aalst"),
-                Arguments.of("AalstL", "Wil van der Aalst and Tammo van Lessen"),
-                Arguments.of("Newto", "I. Newton"),
-                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("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("Aalst", "Wil van der Aalst"),
+            Arguments.of("AalstL", "Wil van der Aalst and Tammo van Lessen"),
+            Arguments.of("Newto", "I. Newton"),
+            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("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"
+            )
+        );
     }
 
     @ParameterizedTest
@@ -123,20 +187,39 @@ void oneAuthorPlusInitials(String expected, AuthorList list) {
 
     static Stream<Arguments> authShort() {
         return Stream.of(
-                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("Aachen", "Aachen"),
-                Arguments.of("A+", "Aachen and others"),
-                Arguments.of("AB", "Aachen and Berlin"),
-                Arguments.of("AB+", "Aachen and Berlin and others"),
-                Arguments.of("ABC", "Aachen and Berlin and Chemnitz"),
-                Arguments.of("ABC+", "Aachen and Berlin and Chemnitz and others"),
-                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("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("Aachen", "Aachen"),
+            Arguments.of("A+", "Aachen and others"),
+            Arguments.of("AB", "Aachen and Berlin"),
+            Arguments.of("AB+", "Aachen and Berlin and others"),
+            Arguments.of("ABC", "Aachen and Berlin and Chemnitz"),
+            Arguments.of("ABC+", "Aachen and Berlin and Chemnitz and others"),
+            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"
+            )
+        );
     }
 
     @ParameterizedTest
@@ -147,20 +230,36 @@ void authIni1(String expected, AuthorList list) {
 
     static Stream<Arguments> authIni1() {
         return Stream.of(
-                Arguments.of("N", "Isaac Newton"),
-                Arguments.of("N", "Isaac Newton and James Maxwell"),
-                Arguments.of("N", "Isaac Newton and James Maxwell and Albert Einstein"),
-                Arguments.of("N", "Isaac Newton and James Maxwell and Albert Einstein and N. Bohr"),
-                Arguments.of("A", "Aachen"),
-                Arguments.of("A", "Aachen and others"),
-                Arguments.of("A", "Aachen and Berlin"),
-                Arguments.of("A", "Aachen and Berlin and others"),
-                Arguments.of("A", "Aachen and Berlin and Chemnitz"),
-                Arguments.of("A", "Aachen and Berlin and Chemnitz and others"),
-                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("N", "Isaac Newton"),
+            Arguments.of("N", "Isaac Newton and James Maxwell"),
+            Arguments.of(
+                "N",
+                "Isaac Newton and James Maxwell and Albert Einstein"
+            ),
+            Arguments.of(
+                "N",
+                "Isaac Newton and James Maxwell and Albert Einstein and N. Bohr"
+            ),
+            Arguments.of("A", "Aachen"),
+            Arguments.of("A", "Aachen and others"),
+            Arguments.of("A", "Aachen and Berlin"),
+            Arguments.of("A", "Aachen and Berlin and others"),
+            Arguments.of("A", "Aachen and Berlin and Chemnitz"),
+            Arguments.of("A", "Aachen and Berlin and Chemnitz and others"),
+            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"
+            )
+        );
     }
 
     @ParameterizedTest
@@ -171,21 +270,37 @@ void authIni2(String expected, AuthorList list) {
 
     static Stream<Arguments> authIni2() {
         return Stream.of(
-                Arguments.of("Ne", "Isaac Newton"),
-                Arguments.of("NM", "Isaac Newton and James Maxwell"),
-                Arguments.of("N+", "Isaac Newton and James Maxwell and Albert Einstein"),
-                Arguments.of("N+", "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"),
-                Arguments.of("A+", "Aachen and Berlin and others"),
-                Arguments.of("A+", "Aachen and Berlin and Chemnitz"),
-                Arguments.of("D+", "John Doe and Donald Smith and Will Wonder"),
-                Arguments.of("A+", "Aachen and Berlin and Chemnitz and others"),
-                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("Ne", "Isaac Newton"),
+            Arguments.of("NM", "Isaac Newton and James Maxwell"),
+            Arguments.of(
+                "N+",
+                "Isaac Newton and James Maxwell and Albert Einstein"
+            ),
+            Arguments.of(
+                "N+",
+                "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"),
+            Arguments.of("A+", "Aachen and Berlin and others"),
+            Arguments.of("A+", "Aachen and Berlin and Chemnitz"),
+            Arguments.of("D+", "John Doe and Donald Smith and Will Wonder"),
+            Arguments.of("A+", "Aachen and Berlin and Chemnitz and others"),
+            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"
+            )
+        );
     }
 
     @ParameterizedTest
@@ -196,20 +311,39 @@ void authIni4(String expected, AuthorList list) {
 
     static Stream<Arguments> authIni4() {
         return Stream.of(
-                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("Aach", "Aachen"),
-                Arguments.of("Aac+", "Aachen and others"),
-                Arguments.of("AaBe", "Aachen and Berlin"),
-                Arguments.of("AaB+", "Aachen and Berlin and others"),
-                Arguments.of("AaBC", "Aachen and Berlin and Chemnitz"),
-                Arguments.of("ABC+", "Aachen and Berlin and Chemnitz and others"),
-                Arguments.of("ABCD", "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("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("Aach", "Aachen"),
+            Arguments.of("Aac+", "Aachen and others"),
+            Arguments.of("AaBe", "Aachen and Berlin"),
+            Arguments.of("AaB+", "Aachen and Berlin and others"),
+            Arguments.of("AaBC", "Aachen and Berlin and Chemnitz"),
+            Arguments.of("ABC+", "Aachen and Berlin and Chemnitz and others"),
+            Arguments.of(
+                "ABCD",
+                "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"
+            )
+        );
     }
 
     @ParameterizedTest
@@ -220,20 +354,42 @@ void authEtAlDotDotEal(String expected, AuthorList list) {
 
     static Stream<Arguments> authEtAlDotDotEal() {
         return Stream.of(
-                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("Aachen", "Aachen"),
-                Arguments.of("Aachen.etal", "Aachen and others"),
-                Arguments.of("Aachen.Berlin", "Aachen and Berlin"),
-                Arguments.of("Aachen.etal", "Aachen and Berlin and others"),
-                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("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("Aachen", "Aachen"),
+            Arguments.of("Aachen.etal", "Aachen and others"),
+            Arguments.of("Aachen.Berlin", "Aachen and Berlin"),
+            Arguments.of("Aachen.etal", "Aachen and Berlin and others"),
+            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"
+            )
+        );
     }
 
     @ParameterizedTest
@@ -244,20 +400,42 @@ void authAuthEa(String expected, AuthorList list) {
 
     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("Aachen", "Aachen"),
-                Arguments.of("Aachen.ea", "Aachen and others"),
-                Arguments.of("Aachen.Berlin", "Aachen and Berlin"),
-                Arguments.of("Aachen.Berlin.ea", "Aachen and Berlin and others"),
-                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("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("Aachen", "Aachen"),
+            Arguments.of("Aachen.ea", "Aachen and others"),
+            Arguments.of("Aachen.Berlin", "Aachen and Berlin"),
+            Arguments.of("Aachen.Berlin.ea", "Aachen and Berlin and others"),
+            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"
+            )
+        );
     }
 
     @ParameterizedTest
@@ -267,7 +445,8 @@ void authShort(String expected, AuthorList list) {
     }
 
     @ParameterizedTest
-    @CsvSource({
+    @CsvSource(
+        {
             "'Newton', '[auth]', 'Isaac Newton'",
             "'Newton', '[authFirstFull]', 'Isaac Newton'",
             "'I', '[authForeIni]', 'Isaac Newton'",
@@ -283,33 +462,39 @@ void authShort(String expected, AuthorList list) {
             "'New', '[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 testAuthorFieldMarkers(String expectedCitationKey, String pattern, String author) {
-        BibEntry bibEntry = new BibEntry().withField(StandardField.AUTHOR, author);
+            "'EUASA', '[authors]', '{European Union Aviation Safety Agency}'",
+        }
+    )
+    void testAuthorFieldMarkers(
+        String expectedCitationKey,
+        String pattern,
+        String author
+    ) {
+        BibEntry bibEntry = new BibEntry()
+            .withField(StandardField.AUTHOR, author);
         BracketedPattern bracketedPattern = new BracketedPattern(pattern);
         assertEquals(expectedCitationKey, bracketedPattern.expand(bibEntry));
     }
 
     private static Stream<Arguments> expandBracketsWithFallback() {
         return Stream.of(
-                Arguments.of("auth", "[title:(auth)]"),
-                Arguments.of("auth2021", "[title:(auth[YEAR])]"),
-                Arguments.of("not2021", "[title:(not[YEAR])]"),
-                Arguments.of("", "[title:([YEAR)]"),
-                Arguments.of(")]", "[title:(YEAR])]"),
-                Arguments.of("2105.02891", "[title:([EPRINT:([YEAR])])]"),
-                Arguments.of("2021", "[title:([auth:([YEAR])])]")
+            Arguments.of("auth", "[title:(auth)]"),
+            Arguments.of("auth2021", "[title:(auth[YEAR])]"),
+            Arguments.of("not2021", "[title:(not[YEAR])]"),
+            Arguments.of("", "[title:([YEAR)]"),
+            Arguments.of(")]", "[title:(YEAR])]"),
+            Arguments.of("2105.02891", "[title:([EPRINT:([YEAR])])]"),
+            Arguments.of("2021", "[title:([auth:([YEAR])])]")
         );
     }
 
     @ParameterizedTest
-    @MethodSource()
+    @MethodSource
     void expandBracketsWithFallback(String expandResult, String pattern) {
         BibEntry bibEntry = new BibEntry()
-                .withField(StandardField.YEAR, "2021").withField(StandardField.EPRINT, "2105.02891");
+            .withField(StandardField.YEAR, "2021")
+            .withField(StandardField.EPRINT, "2105.02891");
         BracketedPattern bracketedPattern = new BracketedPattern(pattern);
 
         assertEquals(expandResult, bracketedPattern.expand(bibEntry));
@@ -317,15 +502,22 @@ void expandBracketsWithFallback(String expandResult, String pattern) {
 
     @Test
     void bibentryExpansionTest() {
-        BracketedPattern pattern = new BracketedPattern("[year]_[auth]_[firstpage]");
+        BracketedPattern pattern = new BracketedPattern(
+            "[year]_[auth]_[firstpage]"
+        );
         assertEquals("2017_Kitsune_213", pattern.expand(bibentry));
     }
 
     @Test
     void nullDatabaseExpansionTest() {
         BibDatabase another_database = null;
-        BracketedPattern pattern = new BracketedPattern("[year]_[auth]_[firstpage]");
-        assertEquals("2017_Kitsune_213", pattern.expand(bibentry, another_database));
+        BracketedPattern pattern = new BracketedPattern(
+            "[year]_[auth]_[firstpage]"
+        );
+        assertEquals(
+            "2017_Kitsune_213",
+            pattern.expand(bibentry, another_database)
+        );
     }
 
     @Test
@@ -339,7 +531,10 @@ void pureauthReturnsAuthorIfEditorIsAbsent() {
     void pureauthReturnsAuthorIfEditorIsPresent() {
         BibDatabase emptyDatabase = new BibDatabase();
         BracketedPattern pattern = new BracketedPattern("[pureauth]");
-        bibentry.setField(StandardField.EDITOR, "Editorlastname, Editorfirstname");
+        bibentry.setField(
+            StandardField.EDITOR,
+            "Editorlastname, Editorfirstname"
+        );
         assertEquals("Kitsune", pattern.expand(bibentry, emptyDatabase));
     }
 
@@ -356,15 +551,23 @@ void pureauthReturnsEmptyStringIfAuthorIsAbsentAndEditorIsPresent() {
         BibDatabase emptyDatabase = new BibDatabase();
         BracketedPattern pattern = new BracketedPattern("[pureauth]");
         bibentry.clearField(StandardField.AUTHOR);
-        bibentry.setField(StandardField.EDITOR, "Editorlastname, Editorfirstname");
+        bibentry.setField(
+            StandardField.EDITOR,
+            "Editorlastname, Editorfirstname"
+        );
         assertEquals("", pattern.expand(bibentry, emptyDatabase));
     }
 
     @Test
     void emptyDatabaseExpansionTest() {
         BibDatabase another_database = new BibDatabase();
-        BracketedPattern pattern = new BracketedPattern("[year]_[auth]_[firstpage]");
-        assertEquals("2017_Kitsune_213", pattern.expand(bibentry, another_database));
+        BracketedPattern pattern = new BracketedPattern(
+            "[year]_[auth]_[firstpage]"
+        );
+        assertEquals(
+            "2017_Kitsune_213",
+            pattern.expand(bibentry, another_database)
+        );
     }
 
     @Test
@@ -372,160 +575,312 @@ void databaseWithStringsExpansionTest() {
         BibDatabase another_database = new BibDatabase();
         BibtexString string = new BibtexString("sgr", "Saulius Gražulis");
         another_database.addString(string);
-        bibentry = new BibEntry()
+        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));
+        BracketedPattern pattern = new BracketedPattern(
+            "[year]_[auth]_[firstpage]"
+        );
+        assertEquals(
+            "2017_Gražulis_213",
+            pattern.expand(bibentry, another_database)
+        );
     }
 
     @Test
     void unbalancedBracketsExpandToSomething() {
-        BracketedPattern pattern = new BracketedPattern("[year]_[auth_[firstpage]");
+        BracketedPattern pattern = new BracketedPattern(
+            "[year]_[auth_[firstpage]"
+        );
         assertNotEquals("", pattern.expand(bibentry));
     }
 
     @Test
     void unbalancedLastBracketExpandsToSomething() {
-        BracketedPattern pattern = new BracketedPattern("[year]_[auth]_[firstpage");
+        BracketedPattern pattern = new BracketedPattern(
+            "[year]_[auth]_[firstpage"
+        );
         assertNotEquals("", pattern.expand(bibentry));
     }
 
     @Test
     void entryTypeExpansionTest() {
-        BracketedPattern pattern = new BracketedPattern("[entrytype]:[year]_[auth]_[pages]");
+        BracketedPattern pattern = new BracketedPattern(
+            "[entrytype]:[year]_[auth]_[pages]"
+        );
         assertEquals("Misc:2017_Kitsune_213--216", pattern.expand(bibentry));
     }
 
     @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));
     }
 
     @Test
     void suppliedBibentryBracketExpansionTest() {
         BibDatabase another_database = null;
-        BracketedPattern pattern = new BracketedPattern("[year]_[auth]_[firstpage]");
+        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");
-        assertEquals("2017_Gražulis_213", pattern.expand(another_bibentry, ';', another_database));
+            .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)
+        );
     }
 
     @Test
     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));
+        BracketedPattern pattern = new BracketedPattern(
+            "[year]_[auth]_[firstpage]"
+        );
+        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
     void unknownKeyExpandsToEmptyString() {
-        assertEquals("", BracketedPattern.expandBrackets("[unknownkey]", ';', dbentry, database));
+        assertEquals(
+            "",
+            BracketedPattern.expandBrackets(
+                "[unknownkey]",
+                ';',
+                dbentry,
+                database
+            )
+        );
     }
 
     @Test
     void emptyPatternAndEmptyModifierExpandsToEmptyString() {
-        assertEquals("", BracketedPattern.expandBrackets("[:]", ';', dbentry, database));
+        assertEquals(
+            "",
+            BracketedPattern.expandBrackets("[:]", ';', dbentry, database)
+        );
     }
 
     @Test
     void emptyPatternAndValidModifierExpandsToEmptyString() {
         Character separator = ';';
-        assertEquals("", BracketedPattern.expandBrackets("[:lower]", separator, dbentry, database));
+        assertEquals(
+            "",
+            BracketedPattern.expandBrackets(
+                "[:lower]",
+                separator,
+                dbentry,
+                database
+            )
+        );
     }
 
     @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",
-                BracketedPattern.expandBrackets("[author]", ';', dbentry, database));
+        assertEquals(
+            "Eric von Hippel and Georg von Krogh",
+            BracketedPattern.expandBrackets("[author]", ';', dbentry, database)
+        );
     }
 
     @Test
     void lowerFormatterWorksOnVonNamePrefixes() {
-        assertEquals("eric von hippel and georg von krogh",
-                BracketedPattern.expandBrackets("[author:lower]", ';', dbentry, database));
+        assertEquals(
+            "eric von hippel and georg von krogh",
+            BracketedPattern.expandBrackets(
+                "[author:lower]",
+                ';',
+                dbentry,
+                database
+            )
+        );
     }
 
     @Test
     void testResolvedFieldAndFormat() {
-        BibEntry child = new BibEntry().withField(StandardField.CROSSREF, "HipKro03");
+        BibEntry child = new BibEntry()
+            .withField(StandardField.CROSSREF, "HipKro03");
         database.insertEntry(child);
 
         Character separator = ';';
-        assertEquals("Eric von Hippel and Georg von Krogh",
-                BracketedPattern.expandBrackets("[author]", separator, child, database));
+        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("[:]", separator, child, database)
+        );
 
-        assertEquals("", BracketedPattern.expandBrackets("[:lower]", separator, child, database));
+        assertEquals(
+            "",
+            BracketedPattern.expandBrackets(
+                "[:lower]",
+                separator,
+                child,
+                database
+            )
+        );
 
-        assertEquals("eric von hippel and georg von krogh",
-                BracketedPattern.expandBrackets("[author:lower]", separator, child, database));
+        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 testResolvedParentNotInDatabase() {
         BibEntry child = new BibEntry()
-                .withField(StandardField.CROSSREF, "HipKro03");
+            .withField(StandardField.CROSSREF, "HipKro03");
         database.removeEntry(dbentry);
         database.insertEntry(child);
 
-        assertEquals("", BracketedPattern.expandBrackets("[author]", ';', child, database));
+        assertEquals(
+            "",
+            BracketedPattern.expandBrackets("[author]", ';', child, database)
+        );
     }
 
     @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 testEmptyBrackets() {
-        assertEquals("2003-Organization Science",
-                BracketedPattern.expandBrackets("[year][]-[journal]", ';', dbentry, database));
+        assertEquals(
+            "2003-Organization Science",
+            BracketedPattern.expandBrackets(
+                "[year][]-[journal]",
+                ';',
+                dbentry,
+                database
+            )
+        );
     }
 
     /**
@@ -533,136 +888,260 @@ void testEmptyBrackets() {
      */
     @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",
-                BracketedPattern.expandBrackets("[fulltitle:truncate]", ';', dbentry, database));
+        assertEquals(
+            "Open Source Software and the \"Private-Collective\" Innovation Model: Issues for Organization Science",
+            BracketedPattern.expandBrackets(
+                "[fulltitle:truncate]",
+                ';',
+                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));
+            .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");
+        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
     void expandBracketsEmptyStringFromEmptyBrackets() {
         BibEntry bibEntry = new BibEntry();
 
-        assertEquals("", BracketedPattern.expandBrackets("[]", null, bibEntry, null));
+        assertEquals(
+            "",
+            BracketedPattern.expandBrackets("[]", null, bibEntry, null)
+        );
     }
 
     @Test
     void expandBracketsInstitutionAbbreviationFromProvidedAbbreviation() {
         BibEntry bibEntry = new BibEntry()
-                .withField(StandardField.AUTHOR, "{European Union Aviation Safety Agency ({EUASABRACKET})}");
+            .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}");
+            .withField(
+                StandardField.AUTHOR,
+                "{European Union Aviation Safety Agency}"
+            );
 
-        assertEquals("EUASA", BracketedPattern.expandBrackets("[auth]", null, bibEntry, null));
+        assertEquals(
+            "EUASA",
+            BracketedPattern.expandBrackets("[auth]", null, bibEntry, null)
+        );
     }
 
     @Test
     void expandBracketsLastNameForAuthorStartingWithOnlyLastNameStartingWithLowerCase() {
         BibEntry bibEntry = new BibEntry()
-                .withField(StandardField.AUTHOR, "{eBay}");
+            .withField(StandardField.AUTHOR, "{eBay}");
 
-        assertEquals("eBay", BracketedPattern.expandBrackets("[auth]", null, bibEntry, null));
+        assertEquals(
+            "eBay",
+            BracketedPattern.expandBrackets("[auth]", null, bibEntry, null)
+        );
     }
 
     @Test
     void expandBracketsLastNameWithChineseCharacters() {
         BibEntry bibEntry = new BibEntry()
-                .withField(StandardField.AUTHOR, "杨秀群");
+            .withField(StandardField.AUTHOR, "杨秀群");
 
-        assertEquals("杨秀群", BracketedPattern.expandBrackets("[auth]", null, bibEntry, null));
+        assertEquals(
+            "杨秀群",
+            BracketedPattern.expandBrackets("[auth]", null, bibEntry, null)
+        );
     }
 
     @Test
     void expandBracketsUnmodifiedStringFromLongFirstPageNumber() {
         BibEntry bibEntry = new BibEntry()
-                .withField(StandardField.PAGES, "2325967120921344");
+            .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");
+            .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");
+            .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(
+            "",
+            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",
-                BracketedPattern.expandBrackets("[author]", ',', entry, database));
+        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));
+            "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
+            )
+        );
 
         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));
+            "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
+            )
+        );
     }
 
     @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));
+            .withField(
+                StandardField.JOURNAL,
+                "{ACS} Medicinal Chemistry Letters"
+            );
+        assertEquals(
+            "ACS Medicinal Chemistry Letters",
+            BracketedPattern.expandBrackets(
+                "[JOURNAL:unprotect_terms]",
+                null,
+                bibEntry,
+                null
+            )
+        );
     }
 
     @ParameterizedTest
-    @CsvSource({
+    @CsvSource(
+        {
             "'Newton', '[edtr]', 'Isaac Newton'",
             "'I', '[edtrForeIni]', 'Isaac Newton'",
             "'Newton', '[editors]', 'Isaac Newton'",
@@ -674,12 +1153,16 @@ void expandBracketsWithoutProtectiveBracesUsingUnprotectTermsModifier() {
             "'Newton', '[edtrshort]', 'Isaac Newton'",
             "'Newton', '[editorLast]', 'Isaac Newton'",
             "'I', '[editorLastForeIni]', 'Isaac Newton'",
-
-            "'EUASA', '[editors]', '{European Union Aviation Safety Agency}'"
-    })
-
-    void testEditorFieldMarkers(String expectedCitationKey, String pattern, String editor) {
-        BibEntry bibEntry = new BibEntry().withField(StandardField.EDITOR, editor);
+            "'EUASA', '[editors]', '{European Union Aviation Safety Agency}'",
+        }
+    )
+    void testEditorFieldMarkers(
+        String expectedCitationKey,
+        String pattern,
+        String editor
+    ) {
+        BibEntry bibEntry = new BibEntry()
+            .withField(StandardField.EDITOR, editor);
         BracketedPattern bracketedPattern = new BracketedPattern(pattern);
         assertEquals(expectedCitationKey, bracketedPattern.expand(bibEntry));
     }
diff --git a/src/test/java/org/jabref/logic/citationkeypattern/CitationKeyGeneratorTest.java b/src/test/java/org/jabref/logic/citationkeypattern/CitationKeyGeneratorTest.java
index 37a2f0c4a05..24f1b1ffa03 100644
--- a/src/test/java/org/jabref/logic/citationkeypattern/CitationKeyGeneratorTest.java
+++ b/src/test/java/org/jabref/logic/citationkeypattern/CitationKeyGeneratorTest.java
@@ -1,15 +1,18 @@
 package org.jabref.logic.citationkeypattern;
 
+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;
-
 import org.jabref.logic.importer.ImportFormatPreferences;
 import org.jabref.logic.importer.ParseException;
 import org.jabref.logic.importer.fileformat.BibtexParser;
 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,11 +21,6 @@
 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;
-
 /**
  * Tests whole citation key patterns such as <code>[authorsAlpha][year]</code>.
  * The concrete patterns such as <code>authorsAlpha</code> should better be tested at {@link BracketedPatternTest}.
@@ -33,34 +31,65 @@ 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_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 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 BibEntry AUTHOR_FIRSTNAME_FULL_LASTNAME_FULL_COUNT_2 =
+        createABibEntryAuthor("Isaac Newton and James Maxwell");
 
-    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 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 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 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_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 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_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]";
@@ -80,7 +109,8 @@ class CitationKeyGeneratorTest {
 
     @BeforeEach
     void setUp() {
-        importFormatPreferences = mock(ImportFormatPreferences.class, Answers.RETURNS_DEEP_STUBS);
+        importFormatPreferences =
+            mock(ImportFormatPreferences.class, Answers.RETURNS_DEEP_STUBS);
     }
 
     private static BibEntry createABibEntryAuthor(String author) {
@@ -91,9 +121,15 @@ static String generateKey(BibEntry entry, String pattern) {
         return generateKey(entry, pattern, new BibDatabase());
     }
 
-    static String generateKey(BibEntry entry, String pattern, BibDatabase database) {
-        GlobalCitationKeyPattern keyPattern = GlobalCitationKeyPattern.fromPattern(pattern);
-        CitationKeyPatternPreferences patternPreferences = new CitationKeyPatternPreferences(
+    static String generateKey(
+        BibEntry entry,
+        String pattern,
+        BibDatabase database
+    ) {
+        GlobalCitationKeyPattern keyPattern =
+            GlobalCitationKeyPattern.fromPattern(pattern);
+        CitationKeyPatternPreferences patternPreferences =
+            new CitationKeyPatternPreferences(
                 false,
                 false,
                 false,
@@ -103,116 +139,188 @@ static String generateKey(BibEntry entry, String pattern, BibDatabase database)
                 DEFAULT_UNWANTED_CHARACTERS,
                 keyPattern,
                 "",
-                ',');
+                ','
+            );
 
-        return new CitationKeyGenerator(keyPattern, database, patternPreferences).generateKey(entry);
+        return new CitationKeyGenerator(
+            keyPattern,
+            database,
+            patternPreferences
+        )
+            .generateKey(entry);
     }
 
     @Test
     void testAndInAuthorName() 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 testCrossrefAndInAuthorNames() {
         BibDatabase database = new BibDatabase();
-        BibEntry entry1 = new BibEntry().withField(StandardField.CROSSREF, "entry2");
+        BibEntry entry1 = new BibEntry()
+            .withField(StandardField.CROSSREF, "entry2");
         BibEntry entry2 = new BibEntry()
-                .withCitationKey("entry2")
-                .withField(StandardField.AUTHOR, "Simon Holland");
+            .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 testAndAuthorNames() 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 testCrossrefAndAuthorNames() {
         BibDatabase database = new BibDatabase();
         BibEntry entry1 = new BibEntry()
-                .withField(StandardField.CROSSREF, "entry2");
+            .withField(StandardField.CROSSREF, "entry2");
         BibEntry entry2 = new BibEntry()
-                .withCitationKey("entry2")
-                .withField(StandardField.AUTHOR, "Mari D. Herland and Mona-Iren Hauge and Ingeborg M. Helgeland");
+            .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 testSpecialLatexCharacterInAuthorName() 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));
+            "@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 = """
-            # see https://sourceforge.net/forum/message.php?msg_id=4498555
-            "@ARTICLE{kohn, author={Andreas Köning}, year={2000}}", "Koe",
-
-            # Accent ague: Á á Ć ć É é Í í Ĺ ĺ Ń ń Ó ó Ŕ ŕ Ś ś Ú ú Ý ý Ź ź
-            "@ARTICLE{kohn, author={Andreas Áöning}, year={2000}}", "Aoe",
-            "@ARTICLE{kohn, author={Andreas Éöning}, year={2000}}", "Eoe",
-            "@ARTICLE{kohn, author={Andreas Íöning}, year={2000}}", "Ioe",
-            "@ARTICLE{kohn, author={Andreas Ĺöning}, year={2000}}", "Loe",
-            "@ARTICLE{kohn, author={Andreas Ńöning}, year={2000}}", "Noe",
-            "@ARTICLE{kohn, author={Andreas Óöning}, year={2000}}", "Ooe",
-            "@ARTICLE{kohn, author={Andreas Ŕöning}, year={2000}}", "Roe",
-            "@ARTICLE{kohn, author={Andreas Śöning}, year={2000}}", "Soe",
-            "@ARTICLE{kohn, author={Andreas Úöning}, year={2000}}", "Uoe",
-            "@ARTICLE{kohn, author={Andreas Ýöning}, year={2000}}", "Yoe",
-            "@ARTICLE{kohn, author={Andreas Źöning}, year={2000}}", "Zoe",
-
-            # Accent grave: À È Ì Ò Ù
-            "@ARTICLE{kohn, author={Andreas Àöning}, year={2000}}", "Aoe",
-            "@ARTICLE{kohn, author={Andreas Èöning}, year={2000}}", "Eoe",
-            "@ARTICLE{kohn, author={Andreas Ìöning}, year={2000}}", "Ioe",
-            "@ARTICLE{kohn, author={Andreas Òöning}, year={2000}}", "Ooe",
-            "@ARTICLE{kohn, author={Andreas Ùöning}, year={2000}}", "Uoe",
-
-            # Special cases
-            "@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"
-            """
+    @CsvSource(
+        quoteCharacter = '"',
+        textBlock = """
+        # see https://sourceforge.net/forum/message.php?msg_id=4498555
+        "@ARTICLE{kohn, author={Andreas Köning}, year={2000}}", "Koe",
+
+        # Accent ague: Á á Ć ć É é Í í Ĺ ĺ Ń ń Ó ó Ŕ ŕ Ś ś Ú ú Ý ý Ź ź
+        "@ARTICLE{kohn, author={Andreas Áöning}, year={2000}}", "Aoe",
+        "@ARTICLE{kohn, author={Andreas Éöning}, year={2000}}", "Eoe",
+        "@ARTICLE{kohn, author={Andreas Íöning}, year={2000}}", "Ioe",
+        "@ARTICLE{kohn, author={Andreas Ĺöning}, year={2000}}", "Loe",
+        "@ARTICLE{kohn, author={Andreas Ńöning}, year={2000}}", "Noe",
+        "@ARTICLE{kohn, author={Andreas Óöning}, year={2000}}", "Ooe",
+        "@ARTICLE{kohn, author={Andreas Ŕöning}, year={2000}}", "Roe",
+        "@ARTICLE{kohn, author={Andreas Śöning}, year={2000}}", "Soe",
+        "@ARTICLE{kohn, author={Andreas Úöning}, year={2000}}", "Uoe",
+        "@ARTICLE{kohn, author={Andreas Ýöning}, year={2000}}", "Yoe",
+        "@ARTICLE{kohn, author={Andreas Źöning}, year={2000}}", "Zoe",
+
+        # Accent grave: À È Ì Ò Ù
+        "@ARTICLE{kohn, author={Andreas Àöning}, year={2000}}", "Aoe",
+        "@ARTICLE{kohn, author={Andreas Èöning}, year={2000}}", "Eoe",
+        "@ARTICLE{kohn, author={Andreas Ìöning}, year={2000}}", "Ioe",
+        "@ARTICLE{kohn, author={Andreas Òöning}, year={2000}}", "Ooe",
+        "@ARTICLE{kohn, author={Andreas Ùöning}, year={2000}}", "Uoe",
+
+        # Special cases
+        "@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 testMakeLabelAndCheckLegalKeys(String bibtexString, String expectedResult) throws ParseException {
-        Optional<BibEntry> bibEntry = BibtexParser.singleFromString(bibtexString, importFormatPreferences);
-        String citationKey = generateKey(bibEntry.orElse(null), "[auth3]", new BibDatabase());
+    void testMakeLabelAndCheckLegalKeys(
+        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);
+        String cleanedKey = CitationKeyGenerator.cleanKey(
+            citationKey,
+            DEFAULT_UNWANTED_CHARACTERS
+        );
 
         assertEquals(expectedResult, cleanedKey);
     }
 
     @Test
     void testFirstAuthor() {
-        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]"));
+        assertEquals(
+            "Koening",
+            generateKey(createABibEntryAuthor("K{\\\"o}ning"), "[auth]")
+        );
 
         assertEquals("", generateKey(createABibEntryAuthor(""), "[auth]"));
     }
@@ -220,10 +328,16 @@ void testFirstAuthor() {
     @Test
     void testUniversity() 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));
+            "@ARTICLE{kohn, author={{Link{\\\"{o}}ping University}}}",
+            importFormatPreferences
+        );
+        assertEquals(
+            "UniLinkoeping",
+            CitationKeyGenerator.cleanKey(
+                generateKey(entry.orElse(null), "[auth]", new BibDatabase()),
+                DEFAULT_UNWANTED_CHARACTERS
+            )
+        );
     }
 
     /**
@@ -241,160 +355,272 @@ void testUniversity() throws ParseException {
      * @see CitationKeyGenerator#cleanKey(String, String)
      */
     @ParameterizedTest(name = "accents={0}, expectedResult={1}")
-    @CsvSource(quoteCharacter = '"', textBlock = """
-            "ÀàÈèÌìÒòÙù  â Ĉ ĉ Ê ê Ĝ ĝ Ĥ ĥ Î î Ĵ ĵ Ô ô Ŝ ŝ Û û Ŵ ŵ Ŷ ŷ", "AaEeIiOoUuAaCcEeGgHhIiJjOoSsUuWwYy",
-            "ÄäËëÏïÖöÜüŸÿ", "AeaeEeIiOeoeUeueYy",
-            "ÅåŮů", "AaaaUu",
-            "Ç ç Ģ ģ Ķ ķ Ļ ļ Ņ ņ Ŗ ŗ Ş ş Ţ ţ", "CcGgKkLlNnRrSsTt",
-            "Ă ă Ĕ ĕ Ğ ğ Ĭ ĭ Ŏ ŏ Ŭ ŭ", "AaEeGgIiOoUu",
-            "Ċ ċ Ė ė Ġ ġ İ ı Ż ż", "CcEeGgIiZz",
-            "Ą ą Ę ę Į į Ǫ ǫ Ų ų", "AaEeIiOoUu", # O or Q? o or q?
-            "Ā ā Ē ē Ī ī Ō ō Ū ū Ȳ ȳ", "AaEeIiOoUuYy",
-            "Ǎ ǎ Č č Ď ď Ě ě Ǐ ǐ Ľ ľ Ň ň Ǒ ǒ Ř ř Š š Ť ť Ǔ ǔ Ž ž", "AaCcDdEeIiLlNnOoRrSsTtUuZz",
-            "ÃãẼẽĨĩÑñÕõŨũỸỹ", "AaEeIiNnOoUuYy",
-            "Ḍ ḍ Ḥ ḥ Ḷ ḷ Ḹ ḹ Ṃ ṃ Ṇ ṇ Ṛ ṛ Ṝ ṝ Ṣ ṣ Ṭ ṭ", "DdHhLlLlMmNnRrRrSsTt",
-            "À à È è Ì ì Ò ò Ù ù   Â â Ĉ ĉ Ê ê Ĝ ĝ Ĥ ĥ Î î Ĵ ĵ Ô ô Ŝ ŝ Û û Ŵ ŵ Ŷ ŷ  Ä ä Ë ë Ï ï Ö ö Ü ü Ÿ ÿ    ", "AaEeIiOoUuAaCcEeGgHhIiJjOoSsUuWwYyAeaeEeIiOeoeUeueYy",
-            "Ã ã Ẽ ẽ Ĩ ĩ Ñ ñ Õ õ Ũ ũ Ỹ ỹ   Ç ç Ģ ģ Ķ ķ Ļ ļ Ņ ņ Ŗ ŗ Ş ş Ţ ţ", "AaEeIiNnOoUuYyCcGgKkLlNnRrSsTt",
-            " Ǎ ǎ Č č Ď ď Ě ě Ǐ ǐ Ľ ľ Ň ň Ǒ ǒ Ř ř Š š Ť ť Ǔ ǔ Ž ž   ", "AaCcDdEeIiLlNnOoRrSsTtUuZz",
-            "Ā ā Ē ē Ī ī Ō ō Ū ū Ȳ ȳ", "AaEeIiOoUuYy",
-            "Ă ă Ĕ ĕ Ğ ğ Ĭ ĭ Ŏ ŏ Ŭ ŭ   ", "AaEeGgIiOoUu",
-            "Ả ả Ẻ ẻ Ỉ ỉ Ỏ ỏ Ủ ủ Ỷ ỷ", "AaEeIiOoUuYy",
-            "Ḛ ḛ Ḭ ḭ Ṵ ṵ", "EeIiUu",
-            "Ċ ċ Ė ė Ġ ġ İ ı Ż ż   Ą ą Ę ę Į į Ǫ ǫ Ų ų   ", "CcEeGgIiZzAaEeIiOoUu",
-            "Ḍ ḍ Ḥ ḥ Ḷ ḷ Ḹ ḹ Ṃ ṃ Ṇ ṇ Ṛ ṛ Ṝ ṝ Ṣ ṣ Ṭ ṭ   ", "DdHhLlLlMmNnRrRrSsTt"
-            """
+    @CsvSource(
+        quoteCharacter = '"',
+        textBlock = """
+        "ÀàÈèÌìÒòÙù  â Ĉ ĉ Ê ê Ĝ ĝ Ĥ ĥ Î î Ĵ ĵ Ô ô Ŝ ŝ Û û Ŵ ŵ Ŷ ŷ", "AaEeIiOoUuAaCcEeGgHhIiJjOoSsUuWwYy",
+        "ÄäËëÏïÖöÜüŸÿ", "AeaeEeIiOeoeUeueYy",
+        "ÅåŮů", "AaaaUu",
+        "Ç ç Ģ ģ Ķ ķ Ļ ļ Ņ ņ Ŗ ŗ Ş ş Ţ ţ", "CcGgKkLlNnRrSsTt",
+        "Ă ă Ĕ ĕ Ğ ğ Ĭ ĭ Ŏ ŏ Ŭ ŭ", "AaEeGgIiOoUu",
+        "Ċ ċ Ė ė Ġ ġ İ ı Ż ż", "CcEeGgIiZz",
+        "Ą ą Ę ę Į į Ǫ ǫ Ų ų", "AaEeIiOoUu", # O or Q? o or q?
+        "Ā ā Ē ē Ī ī Ō ō Ū ū Ȳ ȳ", "AaEeIiOoUuYy",
+        "Ǎ ǎ Č č Ď ď Ě ě Ǐ ǐ Ľ ľ Ň ň Ǒ ǒ Ř ř Š š Ť ť Ǔ ǔ Ž ž", "AaCcDdEeIiLlNnOoRrSsTtUuZz",
+        "ÃãẼẽĨĩÑñÕõŨũỸỹ", "AaEeIiNnOoUuYy",
+        "Ḍ ḍ Ḥ ḥ Ḷ ḷ Ḹ ḹ Ṃ ṃ Ṇ ṇ Ṛ ṛ Ṝ ṝ Ṣ ṣ Ṭ ṭ", "DdHhLlLlMmNnRrRrSsTt",
+        "À à È è Ì ì Ò ò Ù ù   Â â Ĉ ĉ Ê ê Ĝ ĝ Ĥ ĥ Î î Ĵ ĵ Ô ô Ŝ ŝ Û û Ŵ ŵ Ŷ ŷ  Ä ä Ë ë Ï ï Ö ö Ü ü Ÿ ÿ    ", "AaEeIiOoUuAaCcEeGgHhIiJjOoSsUuWwYyAeaeEeIiOeoeUeueYy",
+        "Ã ã Ẽ ẽ Ĩ ĩ Ñ ñ Õ õ Ũ ũ Ỹ ỹ   Ç ç Ģ ģ Ķ ķ Ļ ļ Ņ ņ Ŗ ŗ Ş ş Ţ ţ", "AaEeIiNnOoUuYyCcGgKkLlNnRrSsTt",
+        " Ǎ ǎ Č č Ď ď Ě ě Ǐ ǐ Ľ ľ Ň ň Ǒ ǒ Ř ř Š š Ť ť Ǔ ǔ Ž ž   ", "AaCcDdEeIiLlNnOoRrSsTtUuZz",
+        "Ā ā Ē ē Ī ī Ō ō Ū ū Ȳ ȳ", "AaEeIiOoUuYy",
+        "Ă ă Ĕ ĕ Ğ ğ Ĭ ĭ Ŏ ŏ Ŭ ŭ   ", "AaEeGgIiOoUu",
+        "Ả ả Ẻ ẻ Ỉ ỉ Ỏ ỏ Ủ ủ Ỷ ỷ", "AaEeIiOoUuYy",
+        "Ḛ ḛ Ḭ ḭ Ṵ ṵ", "EeIiUu",
+        "Ċ ċ Ė ė Ġ ġ İ ı Ż ż   Ą ą Ę ę Į į Ǫ ǫ Ų ų   ", "CcEeGgIiZzAaEeIiOoUu",
+        "Ḍ ḍ Ḥ ḥ Ḷ ḷ Ḹ ḹ Ṃ ṃ Ṇ ṇ Ṛ ṛ Ṝ ṝ Ṣ ṣ Ṭ ṭ   ", "DdHhLlLlMmNnRrRrSsTt"
+        """
     )
     void testCheckLegalKey(String accents, String expectedResult) {
-        assertEquals(expectedResult, CitationKeyGenerator.cleanKey(accents, DEFAULT_UNWANTED_CHARACTERS));
+        assertEquals(
+            expectedResult,
+            CitationKeyGenerator.cleanKey(accents, DEFAULT_UNWANTED_CHARACTERS)
+        );
     }
 
     @Test
     void testcrossrefUniversity() {
         BibDatabase database = new BibDatabase();
         BibEntry entry1 = new BibEntry()
-                .withField(StandardField.CROSSREF, "entry2");
+            .withField(StandardField.CROSSREF, "entry2");
         BibEntry entry2 = new BibEntry()
-                .withCitationKey("entry2")
-                .withField(StandardField.AUTHOR, "{Link{\\\"{o}}ping University}");
+            .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 testDepartment() 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));
+            "@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 testcrossrefDepartment() {
         BibDatabase database = new BibDatabase();
         BibEntry entry1 = new BibEntry()
-                .withField(StandardField.CROSSREF, "entry2");
+            .withField(StandardField.CROSSREF, "entry2");
         BibEntry entry2 = new BibEntry()
-                .withCitationKey("entry2")
-                .withField(StandardField.AUTHOR, "{Link{\\\"{o}}ping University, Department of Electrical Engineering}");
+            .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 testSchool() 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));
+            "@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 {
+    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));
+            "@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 {
+    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));
+            "@ARTICLE{null, author={{The School of Null}}}",
+            importFormatPreferences
+        );
+        assertEquals(
+            "SchoolNull",
+            CitationKeyGenerator.cleanKey(
+                generateKey(entry.orElse(null), "[auth]", new BibDatabase()),
+                DEFAULT_UNWANTED_CHARACTERS
+            )
+        );
     }
 
     @Test
     void testcrossrefSchool() {
         BibDatabase database = new BibDatabase();
         BibEntry entry1 = new BibEntry()
-                .withField(StandardField.CROSSREF, "entry2");
+            .withField(StandardField.CROSSREF, "entry2");
         BibEntry entry2 = new BibEntry()
-                .withCitationKey("entry2")
-                .withField(StandardField.AUTHOR, "{Link{\\\"{o}}ping University, School of Computer Engineering}");
+            .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 testInstituteOfTechnology() 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));
+            "@ARTICLE{kohn, author={{Massachusetts Institute of Technology}}}",
+            importFormatPreferences
+        );
+        assertEquals(
+            "MIT",
+            CitationKeyGenerator.cleanKey(
+                generateKey(entry.orElse(null), "[auth]", new BibDatabase()),
+                DEFAULT_UNWANTED_CHARACTERS
+            )
+        );
     }
 
     @Test
     void testcrossrefInstituteOfTechnology() {
         BibDatabase database = new BibDatabase();
         BibEntry entry1 = new BibEntry()
-                .withField(StandardField.CROSSREF, "entry2");
+            .withField(StandardField.CROSSREF, "entry2");
         BibEntry entry2 = new BibEntry()
-                .withCitationKey("entry2")
-                .withField(StandardField.AUTHOR, "{Massachusetts Institute of Technology}");
+            .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 testAuthIniN() {
         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("NME+", generateKey(AUTHOR_FIRSTNAME_INITIAL_LASTNAME_FULL_COUNT_5, "[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(
+            "NME+",
+            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(
+            "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 +633,18 @@ void testAuthIniNEmptyReturnsEmpty() {
      */
     @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 +660,24 @@ void testAuthEtAl() {
         // 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 +686,34 @@ void testAuthEtAl() {
     @Test
     void testAuthShort() {
         // 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_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(
+            "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
+            )
+        );
     }
 
     @Test
@@ -455,16 +726,61 @@ void testAuthShortEmptyReturnsEmpty() {
      */
     @Test
     void authNM() {
-        assertEquals("N", generateKey(AUTHOR_FIRSTNAME_INITIAL_LASTNAME_FULL_COUNT_1, String.format(AUTHNOFMTH, 1, 1)));
-        assertEquals("Max", generateKey(AUTHOR_FIRSTNAME_INITIAL_LASTNAME_FULL_COUNT_2, String.format(AUTHNOFMTH, 3, 2)));
-        assertEquals("New", generateKey(AUTHOR_FIRSTNAME_INITIAL_LASTNAME_FULL_COUNT_3, String.format(AUTHNOFMTH, 3, 1)));
-        assertEquals("Bo", generateKey(AUTHOR_FIRSTNAME_INITIAL_LASTNAME_FULL_COUNT_4, String.format(AUTHNOFMTH, 2, 4)));
-        assertEquals("Bohr", generateKey(AUTHOR_FIRSTNAME_INITIAL_LASTNAME_FULL_COUNT_5, String.format(AUTHNOFMTH, 6, 4)));
+        assertEquals(
+            "N",
+            generateKey(
+                AUTHOR_FIRSTNAME_INITIAL_LASTNAME_FULL_COUNT_1,
+                String.format(AUTHNOFMTH, 1, 1)
+            )
+        );
+        assertEquals(
+            "Max",
+            generateKey(
+                AUTHOR_FIRSTNAME_INITIAL_LASTNAME_FULL_COUNT_2,
+                String.format(AUTHNOFMTH, 3, 2)
+            )
+        );
+        assertEquals(
+            "New",
+            generateKey(
+                AUTHOR_FIRSTNAME_INITIAL_LASTNAME_FULL_COUNT_3,
+                String.format(AUTHNOFMTH, 3, 1)
+            )
+        );
+        assertEquals(
+            "Bo",
+            generateKey(
+                AUTHOR_FIRSTNAME_INITIAL_LASTNAME_FULL_COUNT_4,
+                String.format(AUTHNOFMTH, 2, 4)
+            )
+        );
+        assertEquals(
+            "Bohr",
+            generateKey(
+                AUTHOR_FIRSTNAME_INITIAL_LASTNAME_FULL_COUNT_5,
+                String.format(AUTHNOFMTH, 6, 4)
+            )
+        );
 
-        assertEquals("Aal", generateKey(AUTHOR_FIRSTNAME_FULL_LASTNAME_FULL_WITH_VAN_COUNT_1, String.format(AUTHNOFMTH, 3, 1)));
-        assertEquals("Less", generateKey(AUTHOR_FIRSTNAME_FULL_LASTNAME_FULL_WITH_VAN_COUNT_2, String.format(AUTHNOFMTH, 4, 2)));
+        assertEquals(
+            "Aal",
+            generateKey(
+                AUTHOR_FIRSTNAME_FULL_LASTNAME_FULL_WITH_VAN_COUNT_1,
+                String.format(AUTHNOFMTH, 3, 1)
+            )
+        );
+        assertEquals(
+            "Less",
+            generateKey(
+                AUTHOR_FIRSTNAME_FULL_LASTNAME_FULL_WITH_VAN_COUNT_2,
+                String.format(AUTHNOFMTH, 4, 2)
+            )
+        );
 
-        assertEquals("", generateKey(AUTHOR_EMPTY, String.format(AUTHNOFMTH, 2, 4)));
+        assertEquals(
+            "",
+            generateKey(AUTHOR_EMPTY, String.format(AUTHNOFMTH, 2, 4))
+        );
     }
 
     /**
@@ -472,10 +788,34 @@ void authNM() {
      */
     @Test
     void firstAuthorForenameInitials() {
-        assertEquals("I", generateKey(AUTHOR_FIRSTNAME_INITIAL_LASTNAME_FULL_COUNT_1, AUTHFOREINI));
-        assertEquals("I", generateKey(AUTHOR_FIRSTNAME_INITIAL_LASTNAME_FULL_COUNT_2, AUTHFOREINI));
-        assertEquals("I", generateKey(AUTHOR_FIRSTNAME_FULL_LASTNAME_FULL_COUNT_1, AUTHFOREINI));
-        assertEquals("I", generateKey(AUTHOR_FIRSTNAME_FULL_LASTNAME_FULL_COUNT_2, AUTHFOREINI));
+        assertEquals(
+            "I",
+            generateKey(
+                AUTHOR_FIRSTNAME_INITIAL_LASTNAME_FULL_COUNT_1,
+                AUTHFOREINI
+            )
+        );
+        assertEquals(
+            "I",
+            generateKey(
+                AUTHOR_FIRSTNAME_INITIAL_LASTNAME_FULL_COUNT_2,
+                AUTHFOREINI
+            )
+        );
+        assertEquals(
+            "I",
+            generateKey(
+                AUTHOR_FIRSTNAME_FULL_LASTNAME_FULL_COUNT_1,
+                AUTHFOREINI
+            )
+        );
+        assertEquals(
+            "I",
+            generateKey(
+                AUTHOR_FIRSTNAME_FULL_LASTNAME_FULL_COUNT_2,
+                AUTHFOREINI
+            )
+        );
     }
 
     /**
@@ -483,14 +823,38 @@ 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,21 +862,62 @@ void firstAuthorVonAndLastNoVonInName() {
      */
     @Test
     void testAllAuthors() {
-        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> testAuthorsAlpha() {
         return Stream.of(
-                Arguments.of("New", AUTHOR_FIRSTNAME_INITIAL_LASTNAME_FULL_COUNT_1, AUTHORSALPHA),
-                Arguments.of("NM", AUTHOR_FIRSTNAME_INITIAL_LASTNAME_FULL_COUNT_2, 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("NME+", AUTHOR_FIRSTNAME_INITIAL_LASTNAME_FULL_COUNT_5, AUTHORSALPHA),
-                Arguments.of("vdAal", AUTHOR_FIRSTNAME_FULL_LASTNAME_FULL_WITH_VAN_COUNT_1, AUTHORSALPHA),
-                Arguments.of("vdAvL", AUTHOR_FIRSTNAME_FULL_LASTNAME_FULL_WITH_VAN_COUNT_2, AUTHORSALPHA),
-                Arguments.of("NM+", AUTHOR_FIRSTNAME_FULL_LASTNAME_FULL_AND_OTHERS_COUNT_3, AUTHORSALPHA)
+            Arguments.of(
+                "New",
+                AUTHOR_FIRSTNAME_INITIAL_LASTNAME_FULL_COUNT_1,
+                AUTHORSALPHA
+            ),
+            Arguments.of(
+                "NM",
+                AUTHOR_FIRSTNAME_INITIAL_LASTNAME_FULL_COUNT_2,
+                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(
+                "NME+",
+                AUTHOR_FIRSTNAME_INITIAL_LASTNAME_FULL_COUNT_5,
+                AUTHORSALPHA
+            ),
+            Arguments.of(
+                "vdAal",
+                AUTHOR_FIRSTNAME_FULL_LASTNAME_FULL_WITH_VAN_COUNT_1,
+                AUTHORSALPHA
+            ),
+            Arguments.of(
+                "vdAvL",
+                AUTHOR_FIRSTNAME_FULL_LASTNAME_FULL_WITH_VAN_COUNT_2,
+                AUTHORSALPHA
+            ),
+            Arguments.of(
+                "NM+",
+                AUTHOR_FIRSTNAME_FULL_LASTNAME_FULL_AND_OTHERS_COUNT_3,
+                AUTHORSALPHA
+            )
         );
     }
 
@@ -527,14 +932,56 @@ void testAuthorsAlpha(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(
+            "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(
+            "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 +989,56 @@ 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(
+            "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(
+            "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 +1046,56 @@ 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(
+            "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(
+            "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 +1103,34 @@ void oneAuthorPlusIni() {
      */
     @Test
     void testNAuthors1() {
-        assertEquals("Newton", generateKey(AUTHOR_FIRSTNAME_INITIAL_LASTNAME_FULL_COUNT_1, String.format(AUTHORN, 1)));
-        assertEquals("NewtonEtAl", generateKey(AUTHOR_FIRSTNAME_INITIAL_LASTNAME_FULL_COUNT_2, String.format(AUTHORN, 1)));
-        assertEquals("NewtonEtAl", generateKey(AUTHOR_FIRSTNAME_INITIAL_LASTNAME_FULL_COUNT_3, String.format(AUTHORN, 1)));
-        assertEquals("NewtonEtAl", generateKey(AUTHOR_FIRSTNAME_INITIAL_LASTNAME_FULL_COUNT_4, String.format(AUTHORN, 1)));
+        assertEquals(
+            "Newton",
+            generateKey(
+                AUTHOR_FIRSTNAME_INITIAL_LASTNAME_FULL_COUNT_1,
+                String.format(AUTHORN, 1)
+            )
+        );
+        assertEquals(
+            "NewtonEtAl",
+            generateKey(
+                AUTHOR_FIRSTNAME_INITIAL_LASTNAME_FULL_COUNT_2,
+                String.format(AUTHORN, 1)
+            )
+        );
+        assertEquals(
+            "NewtonEtAl",
+            generateKey(
+                AUTHOR_FIRSTNAME_INITIAL_LASTNAME_FULL_COUNT_3,
+                String.format(AUTHORN, 1)
+            )
+        );
+        assertEquals(
+            "NewtonEtAl",
+            generateKey(
+                AUTHOR_FIRSTNAME_INITIAL_LASTNAME_FULL_COUNT_4,
+                String.format(AUTHORN, 1)
+            )
+        );
     }
 
     @Test
@@ -588,14 +1143,34 @@ void testNAuthors1EmptyReturnEmpty() {
      */
     @Test
     void testNAuthors3() {
-        assertEquals("Newton",
-                generateKey(AUTHOR_FIRSTNAME_INITIAL_LASTNAME_FULL_COUNT_1, String.format(AUTHORN, 3)));
-        assertEquals("NewtonMaxwell",
-                generateKey(AUTHOR_FIRSTNAME_INITIAL_LASTNAME_FULL_COUNT_2, String.format(AUTHORN, 3)));
-        assertEquals("NewtonMaxwellEinstein",
-                generateKey(AUTHOR_FIRSTNAME_INITIAL_LASTNAME_FULL_COUNT_3, String.format(AUTHORN, 3)));
-        assertEquals("NewtonMaxwellEinsteinEtAl",
-                generateKey(AUTHOR_FIRSTNAME_INITIAL_LASTNAME_FULL_COUNT_4, String.format(AUTHORN, 3)));
+        assertEquals(
+            "Newton",
+            generateKey(
+                AUTHOR_FIRSTNAME_INITIAL_LASTNAME_FULL_COUNT_1,
+                String.format(AUTHORN, 3)
+            )
+        );
+        assertEquals(
+            "NewtonMaxwell",
+            generateKey(
+                AUTHOR_FIRSTNAME_INITIAL_LASTNAME_FULL_COUNT_2,
+                String.format(AUTHORN, 3)
+            )
+        );
+        assertEquals(
+            "NewtonMaxwellEinstein",
+            generateKey(
+                AUTHOR_FIRSTNAME_INITIAL_LASTNAME_FULL_COUNT_3,
+                String.format(AUTHORN, 3)
+            )
+        );
+        assertEquals(
+            "NewtonMaxwellEinsteinEtAl",
+            generateKey(
+                AUTHOR_FIRSTNAME_INITIAL_LASTNAME_FULL_COUNT_4,
+                String.format(AUTHORN, 3)
+            )
+        );
     }
 
     @Test
@@ -612,7 +1187,10 @@ void testFirstPage() {
     @SuppressWarnings("ConstantConditions")
     @Test
     void testFirstPageNull() {
-        assertThrows(NullPointerException.class, () -> CitationKeyGenerator.firstPage(null));
+        assertThrows(
+            NullPointerException.class,
+            () -> CitationKeyGenerator.firstPage(null)
+        );
     }
 
     @Test
@@ -636,7 +1214,10 @@ void testPagePrefix() {
     @SuppressWarnings("ConstantConditions")
     @Test
     void testPagePrefixNull() {
-        assertThrows(NullPointerException.class, () -> CitationKeyGenerator.pagePrefix(null));
+        assertThrows(
+            NullPointerException.class,
+            () -> CitationKeyGenerator.pagePrefix(null)
+        );
     }
 
     @Test
@@ -655,7 +1236,10 @@ void testLastPage() {
     @SuppressWarnings("ConstantConditions")
     @Test
     void testLastPageNull() {
-        assertThrows(NullPointerException.class, () -> CitationKeyGenerator.lastPage(null));
+        assertThrows(
+            NullPointerException.class,
+            () -> CitationKeyGenerator.lastPage(null)
+        );
     }
 
     /**
@@ -665,30 +1249,76 @@ void testLastPageNull() {
     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,
+        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_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)));
+                    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 +1328,76 @@ 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 +1406,52 @@ 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",
-                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",
-                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(
+            "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",
+            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
+            )
+        );
     }
 
     /**
@@ -754,34 +1461,60 @@ void camel() {
     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",
-                CitationKeyGenerator.camelizeSignificantWordsInTitle(
-                        TITLE_STRING_ALL_LOWER_FIRST_WORD_IN_BRACKETS_TWO_SMALL_WORDS_SMALL_WORD_AFTER_COLON));
-        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",
-                CitationKeyGenerator.camelizeSignificantWordsInTitle(
-                        TITLE_STRING_CASED_TWO_SMALL_WORDS_SMALL_WORD_AT_THE_BEGINNING));
-        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",
-                CitationKeyGenerator.camelizeSignificantWordsInTitle(
-                        TITLE_STRING_CASED_FOUR_SMALL_WORDS_TWO_CONNECTED_WORDS));
+        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",
+            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",
+            CitationKeyGenerator.camelizeSignificantWordsInTitle(
+                TITLE_STRING_CASED_TWO_SMALL_WORDS_SMALL_WORD_AT_THE_BEGINNING
+            )
+        );
+        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",
+            CitationKeyGenerator.camelizeSignificantWordsInTitle(
+                TITLE_STRING_CASED_FOUR_SMALL_WORDS_TWO_CONNECTED_WORDS
+            )
+        );
     }
 
     @Test
     void keywordNKeywordsSeparatedBySpace() {
-        BibEntry entry = new BibEntry().withField(StandardField.KEYWORDS, "w1, w2a w2b, w3");
+        BibEntry entry = new BibEntry()
+            .withField(StandardField.KEYWORDS, "w1, w2a w2b, w3");
 
         assertEquals("w1", generateKey(entry, "[keyword1]"));
 
@@ -796,9 +1529,8 @@ void keywordNKeywordsSeparatedBySpace() {
     void crossrefkeywordNKeywordsSeparatedBySpace() {
         BibDatabase database = new BibDatabase();
         BibEntry entry1 = new BibEntry()
-                .withField(StandardField.CROSSREF, "entry2");
-        BibEntry entry2 = new BibEntry()
-                .withCitationKey("entry2");
+            .withField(StandardField.CROSSREF, "entry2");
+        BibEntry entry2 = new BibEntry().withCitationKey("entry2");
         database.insertEntry(entry2);
         database.insertEntry(entry1);
         entry2.setField(StandardField.KEYWORDS, "w1, w2a w2b, w3");
@@ -808,7 +1540,8 @@ void crossrefkeywordNKeywordsSeparatedBySpace() {
 
     @Test
     void keywordsNKeywordsSeparatedBySpace() {
-        BibEntry entry = new BibEntry().withField(StandardField.KEYWORDS, "w1, w2a w2b, w3");
+        BibEntry entry = new BibEntry()
+            .withField(StandardField.KEYWORDS, "w1, w2a w2b, w3");
 
         // all keywords
         assertEquals("w1w2aw2bw3", generateKey(entry, "[keywords]"));
@@ -824,10 +1557,10 @@ void keywordsNKeywordsSeparatedBySpace() {
     void crossrefkeywordsNKeywordsSeparatedBySpace() {
         BibDatabase database = new BibDatabase();
         BibEntry entry1 = new BibEntry()
-                .withField(StandardField.CROSSREF, "entry2");
+            .withField(StandardField.CROSSREF, "entry2");
         BibEntry entry2 = new BibEntry()
-                .withCitationKey("entry2")
-                .withField(StandardField.KEYWORDS, "w1, w2a w2b, w3");
+            .withCitationKey("entry2")
+            .withField(StandardField.KEYWORDS, "w1, w2a w2b, w3");
         database.insertEntry(entry2);
         database.insertEntry(entry1);
 
@@ -836,55 +1569,83 @@ void crossrefkeywordsNKeywordsSeparatedBySpace() {
 
     @Test
     void testCheckLegalKeyUnwantedCharacters() {
-        assertEquals("AAAA", CitationKeyGenerator.cleanKey("AA AA", DEFAULT_UNWANTED_CHARACTERS));
-        assertEquals("SPECIALCHARS", CitationKeyGenerator.cleanKey("SPECIAL CHARS#{\\\"}~,", DEFAULT_UNWANTED_CHARACTERS));
-        assertEquals("", CitationKeyGenerator.cleanKey("\n\t\r", DEFAULT_UNWANTED_CHARACTERS));
+        assertEquals(
+            "AAAA",
+            CitationKeyGenerator.cleanKey("AA AA", DEFAULT_UNWANTED_CHARACTERS)
+        );
+        assertEquals(
+            "SPECIALCHARS",
+            CitationKeyGenerator.cleanKey(
+                "SPECIAL CHARS#{\\\"}~,",
+                DEFAULT_UNWANTED_CHARACTERS
+            )
+        );
+        assertEquals(
+            "",
+            CitationKeyGenerator.cleanKey("\n\t\r", DEFAULT_UNWANTED_CHARACTERS)
+        );
     }
 
     @Test
     void testCheckLegalKeyNoUnwantedCharacters() {
         assertEquals("AAAA", CitationKeyGenerator.cleanKey("AA AA", ""));
-        assertEquals("SPECIALCHARS^", CitationKeyGenerator.cleanKey("SPECIAL CHARS#{\\\"}~,^", ""));
+        assertEquals(
+            "SPECIALCHARS^",
+            CitationKeyGenerator.cleanKey("SPECIAL CHARS#{\\\"}~,^", "")
+        );
         assertEquals("", CitationKeyGenerator.cleanKey("\n\t\r", ""));
     }
 
     @Test
     void testCheckLegalNullInNullOut() {
-        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 testApplyModifiers() {
-        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 testcrossrefShorttitle() {
         BibDatabase database = new BibDatabase();
         BibEntry entry1 = new BibEntry()
-                .withField(StandardField.CROSSREF, "entry2");
+            .withField(StandardField.CROSSREF, "entry2");
         BibEntry entry2 = new BibEntry()
-                .withCitationKey("entry2")
-                .withField(StandardField.TITLE, "Green Scheduling of Whatever");
+            .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 testcrossrefShorttitleInitials() {
         BibDatabase database = new BibDatabase();
         BibEntry entry1 = new BibEntry()
-                .withField(StandardField.CROSSREF, "entry2");
+            .withField(StandardField.CROSSREF, "entry2");
         BibEntry entry2 = new BibEntry()
-                .withCitationKey("entry2")
-                .withField(StandardField.TITLE, "Green Scheduling of Whatever");
+            .withCitationKey("entry2")
+            .withField(StandardField.TITLE, "Green Scheduling of Whatever");
         database.insertEntry(entry2);
         database.insertEntry(entry1);
 
@@ -893,128 +1654,213 @@ void testcrossrefShorttitleInitials() {
 
     @Test
     void generateKeyStripsColonFromTitle() {
-        BibEntry entry = new BibEntry().withField(StandardField.TITLE, "Green Scheduling of: Whatever");
-        assertEquals("GreenSchedulingOfWhatever", generateKey(entry, "[title]"));
+        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`");
-        assertEquals("GreenSchedulingofWhatever", generateKey(entry, "[title]"));
+        BibEntry entry = new BibEntry()
+            .withField(StandardField.TITLE, "Green Scheduling of `Whatever`");
+        assertEquals(
+            "GreenSchedulingofWhatever",
+            generateKey(entry, "[title]")
+        );
     }
 
     @Test
     void generateKeyWithOneModifier() {
-        BibEntry entry = new BibEntry().withField(StandardField.TITLE, "The Interesting Title");
-        assertEquals("theinterestingtitle", generateKey(entry, "[title:lower]"));
+        BibEntry entry = new BibEntry()
+            .withField(StandardField.TITLE, "The Interesting Title");
+        assertEquals(
+            "theinterestingtitle",
+            generateKey(entry, "[title:lower]")
+        );
     }
 
     @Test
     void generateKeyWithTwoModifiers() {
-        BibEntry entry = new BibEntry().withField(StandardField.TITLE, "The Interesting Title");
-        assertEquals("theinterestingtitle", generateKey(entry, "[title:lower:(_)]"));
+        BibEntry entry = new BibEntry()
+            .withField(StandardField.TITLE, "The Interesting Title");
+        assertEquals(
+            "theinterestingtitle",
+            generateKey(entry, "[title:lower:(_)]")
+        );
     }
 
     @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");
-        assertEquals("InterestingTitleLonger", generateKey(entry, "[shorttitle:capitalize]"));
+        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");
-        assertEquals("ATitlewithSomeoftheKeyWords", generateKey(entry, "[title:titlecase]"));
+        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");
-        assertEquals("InterestingTitleLonger", generateKey(entry, "[shorttitle:titlecase]"));
+        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");
-        assertEquals("Atitlewithsomeofthekeywords", generateKey(entry, "[title:sentencecase]"));
+        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");
-
-        assertEquals("NEWTON2019InterestingTitleLonger", generateKey(entry, "[auth:upper][year][shorttitle:capitalize]"));
+            .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]")
+        );
     }
 
     @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");
-
-        assertEquals("NewtonMaxwellEtAl_2019_TheInterestingTitleLongerThanThreeWords", generateKey(entry, "[authors2]_[year]_[title:capitalize]"));
+            .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]")
+        );
     }
 
     @Test
     void generateKeyWithMinusInCitationStyleOutsideAField() {
         BibEntry entry = new BibEntry()
-                .withField(StandardField.AUTHOR, AUTHOR_STRING_FIRSTNAME_FULL_LASTNAME_FULL_COUNT_1)
-                .withField(StandardField.YEAR, "2019");
+            .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]"));
     }
 
     @Test
     void generateKeyCorrectKeyLengthWithTruncateModifierAndUnicode() {
-        BibEntry bibEntry = new BibEntry().withField(StandardField.AUTHOR, "Gödel, Kurt");
+        BibEntry bibEntry = new BibEntry()
+            .withField(StandardField.AUTHOR, "Gödel, Kurt");
 
         assertEquals(2, generateKey(bibEntry, "[auth:truncate2]").length());
     }
 
     @Test
     void generateKeyCorrectKeyLengthWithAuthNofMthAndUnicode() {
-        BibEntry bibEntry = new BibEntry().withField(StandardField.AUTHOR, "Gödel, Kurt");
+        BibEntry bibEntry = new BibEntry()
+            .withField(StandardField.AUTHOR, "Gödel, Kurt");
 
         assertEquals(4, generateKey(bibEntry, "[auth4_1]").length());
     }
 
     @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]"));
     }
 
     @Test
     void generateKeyWithModifierContainingRegexCharacterClass() {
-        BibEntry bibEntry = new BibEntry().withField(StandardField.TITLE, "Wickedness Managing");
+        BibEntry bibEntry = new BibEntry()
+            .withField(StandardField.TITLE, "Wickedness Managing");
 
-        assertEquals("WM", generateKey(bibEntry, "[title:regex(\"[a-z]+\",\"\")]"));
+        assertEquals(
+            "WM",
+            generateKey(bibEntry, "[title:regex(\"[a-z]+\",\"\")]")
+        );
     }
 
     @Test
     void generateKeyDoesNotModifyTheKeyWithIncorrectRegexReplacement() {
         String pattern = "[title]";
-        GlobalCitationKeyPattern keyPattern = GlobalCitationKeyPattern.fromPattern(pattern);
-        CitationKeyPatternPreferences patternPreferences = new CitationKeyPatternPreferences(
+        GlobalCitationKeyPattern keyPattern =
+            GlobalCitationKeyPattern.fromPattern(pattern);
+        CitationKeyPatternPreferences patternPreferences =
+            new CitationKeyPatternPreferences(
                 false,
                 false,
                 false,
@@ -1024,18 +1870,31 @@ void generateKeyDoesNotModifyTheKeyWithIncorrectRegexReplacement() {
                 DEFAULT_UNWANTED_CHARACTERS,
                 keyPattern,
                 "",
-                ',');
-
-        BibEntry bibEntry = new BibEntry().withField(StandardField.TITLE, "Wickedness Managing");
-        assertEquals("WickednessManaging",
-                new CitationKeyGenerator(keyPattern, new BibDatabase(), patternPreferences).generateKey(bibEntry));
+                ','
+            );
+
+        BibEntry bibEntry = new BibEntry()
+            .withField(StandardField.TITLE, "Wickedness Managing");
+        assertEquals(
+            "WickednessManaging",
+            new CitationKeyGenerator(
+                keyPattern,
+                new BibDatabase(),
+                patternPreferences
+            )
+                .generateKey(bibEntry)
+        );
     }
 
     @Test
     void generateKeyWithFallbackField() {
-        BibEntry bibEntry = new BibEntry().withField(StandardField.YEAR, "2021");
+        BibEntry bibEntry = new BibEntry()
+            .withField(StandardField.YEAR, "2021");
 
-        assertEquals("2021", generateKey(bibEntry, "[title:([EPRINT:([YEAR])])]"));
+        assertEquals(
+            "2021",
+            generateKey(bibEntry, "[title:([EPRINT:([YEAR])])]")
+        );
     }
 
     @Test
@@ -1054,7 +1913,9 @@ void generateKeyWithLowercaseAuthorWithVonAndLastname() {
 
     @Test
     void generateKeyCorrectKeyWithAndOthersAtTheEnd() {
-        BibEntry entry = createABibEntryAuthor("Alexander Artemenko and others");
+        BibEntry entry = createABibEntryAuthor(
+            "Alexander Artemenko and others"
+        );
         entry.setField(StandardField.YEAR, "2019");
         assertEquals("Artemenko2019", generateKey(entry, "[auth][year]"));
     }
diff --git a/src/test/java/org/jabref/logic/citationkeypattern/MakeLabelWithDatabaseTest.java b/src/test/java/org/jabref/logic/citationkeypattern/MakeLabelWithDatabaseTest.java
index 202e06fcc3c..0ae5e69beb6 100644
--- a/src/test/java/org/jabref/logic/citationkeypattern/MakeLabelWithDatabaseTest.java
+++ b/src/test/java/org/jabref/logic/citationkeypattern/MakeLabelWithDatabaseTest.java
@@ -1,19 +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 java.util.Optional;
 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;
-
 @Execution(ExecutionMode.CONCURRENT)
 class MakeLabelWithDatabaseTest {
 
@@ -34,7 +32,8 @@ void setUp() {
         database.insertEntry(entry);
         pattern = GlobalCitationKeyPattern.fromPattern("[auth][year]");
         bibtexKeyPattern = new DatabaseCitationKeyPattern(pattern);
-        preferences = new CitationKeyPatternPreferences(
+        preferences =
+            new CitationKeyPatternPreferences(
                 false,
                 false,
                 false,
@@ -44,18 +43,24 @@ void setUp() {
                 DEFAULT_UNWANTED_CHARACTERS,
                 pattern,
                 "",
-                ',');
+                ','
+            );
     }
 
     @Test
     void generateDefaultKey() {
-        new CitationKeyGenerator(bibtexKeyPattern, database, preferences).generateAndSetKey(entry);
+        new CitationKeyGenerator(bibtexKeyPattern, database, preferences)
+            .generateAndSetKey(entry);
         assertEquals(Optional.of("Doe2016"), entry.getCitationKey());
     }
 
     @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,7 +71,8 @@ void generateDefaultKeyAlreadyExistsDuplicatesStartAtA() {
 
     @Test
     void generateDefaultKeyAlwaysLetter() {
-        preferences = new CitationKeyPatternPreferences(
+        preferences =
+            new CitationKeyPatternPreferences(
                 false,
                 false,
                 false,
@@ -76,15 +82,18 @@ void generateDefaultKeyAlwaysLetter() {
                 DEFAULT_UNWANTED_CHARACTERS,
                 pattern,
                 "",
-                ',');
+                ','
+            );
 
-        new CitationKeyGenerator(bibtexKeyPattern, database, preferences).generateAndSetKey(entry);
+        new CitationKeyGenerator(bibtexKeyPattern, database, preferences)
+            .generateAndSetKey(entry);
         assertEquals(Optional.of("Doe2016a"), entry.getCitationKey());
     }
 
     @Test
     void generateDefaultKeyAlwaysLetterAlreadyExistsDuplicatesStartAtB() {
-        preferences = new CitationKeyPatternPreferences(
+        preferences =
+            new CitationKeyPatternPreferences(
                 false,
                 false,
                 false,
@@ -94,9 +103,14 @@ void generateDefaultKeyAlwaysLetterAlreadyExistsDuplicatesStartAtB() {
                 DEFAULT_UNWANTED_CHARACTERS,
                 pattern,
                 "",
-                ',');
-
-        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");
@@ -107,7 +121,8 @@ void generateDefaultKeyAlwaysLetterAlreadyExistsDuplicatesStartAtB() {
 
     @Test
     void generateDefaultKeyStartDuplicatesAtB() {
-        preferences = new CitationKeyPatternPreferences(
+        preferences =
+            new CitationKeyPatternPreferences(
                 false,
                 false,
                 false,
@@ -117,15 +132,18 @@ void generateDefaultKeyStartDuplicatesAtB() {
                 DEFAULT_UNWANTED_CHARACTERS,
                 pattern,
                 "",
-                ',');
+                ','
+            );
 
-        new CitationKeyGenerator(bibtexKeyPattern, database, preferences).generateAndSetKey(entry);
+        new CitationKeyGenerator(bibtexKeyPattern, database, preferences)
+            .generateAndSetKey(entry);
         assertEquals(Optional.of("Doe2016"), entry.getCitationKey());
     }
 
     @Test
     void generateDefaultKeyAlreadyExistsDuplicatesStartAtB() {
-        preferences = new CitationKeyPatternPreferences(
+        preferences =
+            new CitationKeyPatternPreferences(
                 false,
                 false,
                 false,
@@ -135,9 +153,14 @@ void generateDefaultKeyAlreadyExistsDuplicatesStartAtB() {
                 DEFAULT_UNWANTED_CHARACTERS,
                 pattern,
                 "",
-                ',');
-
-        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");
@@ -149,7 +172,11 @@ 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 +195,11 @@ 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");
@@ -187,70 +218,80 @@ void generateDefaultKeyFirstTwoAlreadyExists() {
     @Test
     void generateKeyAuthLowerModified() {
         bibtexKeyPattern.setDefaultValue("[auth:lower][year]");
-        new CitationKeyGenerator(bibtexKeyPattern, database, preferences).generateAndSetKey(entry);
+        new CitationKeyGenerator(bibtexKeyPattern, database, preferences)
+            .generateAndSetKey(entry);
         assertEquals(Optional.of("doe2016"), entry.getCitationKey());
     }
 
     @Test
     void generateKeyAuthUpperModified() {
         bibtexKeyPattern.setDefaultValue("[auth:upper][year]");
-        new CitationKeyGenerator(bibtexKeyPattern, database, preferences).generateAndSetKey(entry);
+        new CitationKeyGenerator(bibtexKeyPattern, database, preferences)
+            .generateAndSetKey(entry);
         assertEquals(Optional.of("DOE2016"), entry.getCitationKey());
     }
 
     @Test
     void generateKeyAuthTitleCaseModified() {
         bibtexKeyPattern.setDefaultValue("[auth:title_case][year]");
-        new CitationKeyGenerator(bibtexKeyPattern, database, preferences).generateAndSetKey(entry);
+        new CitationKeyGenerator(bibtexKeyPattern, database, preferences)
+            .generateAndSetKey(entry);
         assertEquals(Optional.of("Doe2016"), entry.getCitationKey());
     }
 
     @Test
     void generateKeyAuthSentenceCaseModified() {
         bibtexKeyPattern.setDefaultValue("[auth:sentence_case][year]");
-        new CitationKeyGenerator(bibtexKeyPattern, database, preferences).generateAndSetKey(entry);
+        new CitationKeyGenerator(bibtexKeyPattern, database, preferences)
+            .generateAndSetKey(entry);
         assertEquals(Optional.of("Doe2016"), entry.getCitationKey());
     }
 
     @Test
     void generateKeyAuthCapitalizeModified() {
         bibtexKeyPattern.setDefaultValue("[auth:capitalize][year]");
-        new CitationKeyGenerator(bibtexKeyPattern, database, preferences).generateAndSetKey(entry);
+        new CitationKeyGenerator(bibtexKeyPattern, database, preferences)
+            .generateAndSetKey(entry);
         assertEquals(Optional.of("Doe2016"), entry.getCitationKey());
     }
 
     @Test
     void generateDefaultKeyFixedValue() {
         bibtexKeyPattern.setDefaultValue("[auth]Test[year]");
-        new CitationKeyGenerator(bibtexKeyPattern, database, preferences).generateAndSetKey(entry);
+        new CitationKeyGenerator(bibtexKeyPattern, database, preferences)
+            .generateAndSetKey(entry);
         assertEquals(Optional.of("DoeTest2016"), entry.getCitationKey());
     }
 
     @Test
     void generateKeyShortYear() {
         bibtexKeyPattern.setDefaultValue("[shortyear]");
-        new CitationKeyGenerator(bibtexKeyPattern, database, preferences).generateAndSetKey(entry);
+        new CitationKeyGenerator(bibtexKeyPattern, database, preferences)
+            .generateAndSetKey(entry);
         assertEquals(Optional.of("16"), entry.getCitationKey());
     }
 
     @Test
     void generateKeyAuthN() {
         bibtexKeyPattern.setDefaultValue("[auth2]");
-        new CitationKeyGenerator(bibtexKeyPattern, database, preferences).generateAndSetKey(entry);
+        new CitationKeyGenerator(bibtexKeyPattern, database, preferences)
+            .generateAndSetKey(entry);
         assertEquals(Optional.of("Do"), entry.getCitationKey());
     }
 
     @Test
     void generateKeyAuthNShortName() {
         bibtexKeyPattern.setDefaultValue("[auth10]");
-        new CitationKeyGenerator(bibtexKeyPattern, database, preferences).generateAndSetKey(entry);
+        new CitationKeyGenerator(bibtexKeyPattern, database, preferences)
+            .generateAndSetKey(entry);
         assertEquals(Optional.of("Doe"), entry.getCitationKey());
     }
 
     @Test
     void generateKeyEmptyField() {
         entry = new BibEntry();
-        new CitationKeyGenerator(bibtexKeyPattern, database, preferences).generateAndSetKey(entry);
+        new CitationKeyGenerator(bibtexKeyPattern, database, preferences)
+            .generateAndSetKey(entry);
         assertEquals(Optional.empty(), entry.getCitationKey());
     }
 
@@ -258,36 +299,49 @@ void generateKeyEmptyField() {
     void generateKeyEmptyFieldDefaultText() {
         bibtexKeyPattern.setDefaultValue("[author:(No Author Provided)]");
         entry.clearField(StandardField.AUTHOR);
-        new CitationKeyGenerator(bibtexKeyPattern, database, preferences).generateAndSetKey(entry);
+        new CitationKeyGenerator(bibtexKeyPattern, database, preferences)
+            .generateAndSetKey(entry);
         assertEquals(Optional.of("NoAuthorProvided"), entry.getCitationKey());
     }
 
     @Test
     void generateKeyEmptyFieldNoColonInDefaultText() {
-        bibtexKeyPattern.setDefaultValue("[author:(Problem:No Author Provided)]");
+        bibtexKeyPattern.setDefaultValue(
+            "[author:(Problem:No Author Provided)]"
+        );
         entry.clearField(StandardField.AUTHOR);
-        new CitationKeyGenerator(bibtexKeyPattern, database, preferences).generateAndSetKey(entry);
-        assertEquals(Optional.of("ProblemNoAuthorProvided"), entry.getCitationKey());
+        new CitationKeyGenerator(bibtexKeyPattern, database, preferences)
+            .generateAndSetKey(entry);
+        assertEquals(
+            Optional.of("ProblemNoAuthorProvided"),
+            entry.getCitationKey()
+        );
     }
 
     @Test
     void generateKeyTitle() {
         bibtexKeyPattern.setDefaultValue("[title]");
-        new CitationKeyGenerator(bibtexKeyPattern, database, preferences).generateAndSetKey(entry);
-        assertEquals(Optional.of("AnAwesomePaperonJabRef"), entry.getCitationKey());
+        new CitationKeyGenerator(bibtexKeyPattern, database, preferences)
+            .generateAndSetKey(entry);
+        assertEquals(
+            Optional.of("AnAwesomePaperonJabRef"),
+            entry.getCitationKey()
+        );
     }
 
     @Test
     void generateKeyTitleAbbr() {
         bibtexKeyPattern.setDefaultValue("[title:abbr]");
-        new CitationKeyGenerator(bibtexKeyPattern, database, preferences).generateAndSetKey(entry);
+        new CitationKeyGenerator(bibtexKeyPattern, database, preferences)
+            .generateAndSetKey(entry);
         assertEquals(Optional.of("AAPoJ"), entry.getCitationKey());
     }
 
     @Test
     void generateKeyShorttitle() {
         bibtexKeyPattern.setDefaultValue("[shorttitle]");
-        new CitationKeyGenerator(bibtexKeyPattern, database, preferences).generateAndSetKey(entry);
+        new CitationKeyGenerator(bibtexKeyPattern, database, preferences)
+            .generateAndSetKey(entry);
         assertEquals(Optional.of("awesomepaperJabRef"), entry.getCitationKey());
     }
 
@@ -295,7 +349,8 @@ void generateKeyShorttitle() {
     void generateKeyShorttitleLowerModified() {
         bibtexKeyPattern.setDefaultValue("[shorttitle:lower]");
         entry.setField(StandardField.TITLE, "An aweSOme Paper on JabRef");
-        new CitationKeyGenerator(bibtexKeyPattern, database, preferences).generateAndSetKey(entry);
+        new CitationKeyGenerator(bibtexKeyPattern, database, preferences)
+            .generateAndSetKey(entry);
         assertEquals(Optional.of("awesomepaperjabref"), entry.getCitationKey());
     }
 
@@ -303,7 +358,8 @@ void generateKeyShorttitleLowerModified() {
     void generateKeyShorttitleUpperModified() {
         bibtexKeyPattern.setDefaultValue("[shorttitle:upper]");
         entry.setField(StandardField.TITLE, "An aweSOme Paper on JabRef");
-        new CitationKeyGenerator(bibtexKeyPattern, database, preferences).generateAndSetKey(entry);
+        new CitationKeyGenerator(bibtexKeyPattern, database, preferences)
+            .generateAndSetKey(entry);
         assertEquals(Optional.of("AWESOMEPAPERJABREF"), entry.getCitationKey());
     }
 
@@ -311,7 +367,8 @@ void generateKeyShorttitleUpperModified() {
     void generateKeyShorttitleTitleCaseModified() {
         bibtexKeyPattern.setDefaultValue("[shorttitle:title_case]");
         entry.setField(StandardField.TITLE, "An aweSOme Paper on JabRef");
-        new CitationKeyGenerator(bibtexKeyPattern, database, preferences).generateAndSetKey(entry);
+        new CitationKeyGenerator(bibtexKeyPattern, database, preferences)
+            .generateAndSetKey(entry);
         assertEquals(Optional.of("AwesomePaperJabref"), entry.getCitationKey());
     }
 
@@ -319,7 +376,8 @@ void generateKeyShorttitleTitleCaseModified() {
     void generateKeyShorttitleSentenceCaseModified() {
         bibtexKeyPattern.setDefaultValue("[shorttitle:sentence_case]");
         entry.setField(StandardField.TITLE, "An aweSOme Paper on JabRef");
-        new CitationKeyGenerator(bibtexKeyPattern, database, preferences).generateAndSetKey(entry);
+        new CitationKeyGenerator(bibtexKeyPattern, database, preferences)
+            .generateAndSetKey(entry);
         assertEquals(Optional.of("Awesomepaperjabref"), entry.getCitationKey());
     }
 
@@ -327,14 +385,16 @@ void generateKeyShorttitleSentenceCaseModified() {
     void generateKeyShorttitleCapitalizeModified() {
         bibtexKeyPattern.setDefaultValue("[shorttitle:capitalize]");
         entry.setField(StandardField.TITLE, "An aweSOme Paper on JabRef");
-        new CitationKeyGenerator(bibtexKeyPattern, database, preferences).generateAndSetKey(entry);
+        new CitationKeyGenerator(bibtexKeyPattern, database, preferences)
+            .generateAndSetKey(entry);
         assertEquals(Optional.of("AwesomePaperJabref"), entry.getCitationKey());
     }
 
     @Test
     void generateKeyVeryshorttitle() {
         bibtexKeyPattern.setDefaultValue("[veryshorttitle]");
-        new CitationKeyGenerator(bibtexKeyPattern, database, preferences).generateAndSetKey(entry);
+        new CitationKeyGenerator(bibtexKeyPattern, database, preferences)
+            .generateAndSetKey(entry);
         assertEquals(Optional.of("awesome"), entry.getCitationKey());
     }
 
@@ -342,7 +402,8 @@ void generateKeyVeryshorttitle() {
     void generateKeyVeryshorttitleLowerModified() {
         bibtexKeyPattern.setDefaultValue("[veryshorttitle:lower]");
         entry.setField(StandardField.TITLE, "An aweSOme Paper on JabRef");
-        new CitationKeyGenerator(bibtexKeyPattern, database, preferences).generateAndSetKey(entry);
+        new CitationKeyGenerator(bibtexKeyPattern, database, preferences)
+            .generateAndSetKey(entry);
         assertEquals(Optional.of("awesome"), entry.getCitationKey());
     }
 
@@ -350,7 +411,8 @@ void generateKeyVeryshorttitleLowerModified() {
     void generateKeyVeryshorttitleUpperModified() {
         bibtexKeyPattern.setDefaultValue("[veryshorttitle:upper]");
         entry.setField(StandardField.TITLE, "An aweSOme Paper on JabRef");
-        new CitationKeyGenerator(bibtexKeyPattern, database, preferences).generateAndSetKey(entry);
+        new CitationKeyGenerator(bibtexKeyPattern, database, preferences)
+            .generateAndSetKey(entry);
         assertEquals(Optional.of("AWESOME"), entry.getCitationKey());
     }
 
@@ -358,7 +420,8 @@ void generateKeyVeryshorttitleUpperModified() {
     void generateKeyVeryshorttitleTitleCaseModified() {
         bibtexKeyPattern.setDefaultValue("[veryshorttitle:title_case]");
         entry.setField(StandardField.TITLE, "An aweSOme Paper on JabRef");
-        new CitationKeyGenerator(bibtexKeyPattern, database, preferences).generateAndSetKey(entry);
+        new CitationKeyGenerator(bibtexKeyPattern, database, preferences)
+            .generateAndSetKey(entry);
         assertEquals(Optional.of("Awesome"), entry.getCitationKey());
     }
 
@@ -366,7 +429,8 @@ void generateKeyVeryshorttitleTitleCaseModified() {
     void generateKeyVeryshorttitleSentenceCaseModified() {
         bibtexKeyPattern.setDefaultValue("[veryshorttitle:sentence_case]");
         entry.setField(StandardField.TITLE, "An aweSOme Paper on JabRef");
-        new CitationKeyGenerator(bibtexKeyPattern, database, preferences).generateAndSetKey(entry);
+        new CitationKeyGenerator(bibtexKeyPattern, database, preferences)
+            .generateAndSetKey(entry);
         assertEquals(Optional.of("Awesome"), entry.getCitationKey());
     }
 
@@ -374,59 +438,82 @@ void generateKeyVeryshorttitleSentenceCaseModified() {
     void generateKeyVeryshorttitleCapitalizeModified() {
         bibtexKeyPattern.setDefaultValue("[veryshorttitle:capitalize]");
         entry.setField(StandardField.TITLE, "An aweSOme Paper on JabRef");
-        new CitationKeyGenerator(bibtexKeyPattern, database, preferences).generateAndSetKey(entry);
+        new CitationKeyGenerator(bibtexKeyPattern, database, preferences)
+            .generateAndSetKey(entry);
         assertEquals(Optional.of("Awesome"), entry.getCitationKey());
     }
 
     @Test
     void generateKeyShorttitleINI() {
         bibtexKeyPattern.setDefaultValue("[shorttitleINI]");
-        new CitationKeyGenerator(bibtexKeyPattern, database, preferences).generateAndSetKey(entry);
+        new CitationKeyGenerator(bibtexKeyPattern, database, preferences)
+            .generateAndSetKey(entry);
         assertEquals(Optional.of("Aap"), entry.getCitationKey());
     }
 
     @Test
     void generateKeyCamel() {
         bibtexKeyPattern.setDefaultValue("[camel]");
-        new CitationKeyGenerator(bibtexKeyPattern, database, preferences).generateAndSetKey(entry);
-        assertEquals(Optional.of("AnAwesomePaperOnJabRef"), entry.getCitationKey());
+        new CitationKeyGenerator(bibtexKeyPattern, database, preferences)
+            .generateAndSetKey(entry);
+        assertEquals(
+            Optional.of("AnAwesomePaperOnJabRef"),
+            entry.getCitationKey()
+        );
     }
 
     @Test
     void generateKeyAuthNM() {
         bibtexKeyPattern.setDefaultValue("[auth4_3]");
-        entry.setField(StandardField.AUTHOR, "John Doe and Donald Smith and Will Wonder");
-        new CitationKeyGenerator(bibtexKeyPattern, database, preferences).generateAndSetKey(entry);
+        entry.setField(
+            StandardField.AUTHOR,
+            "John Doe and Donald Smith and Will Wonder"
+        );
+        new CitationKeyGenerator(bibtexKeyPattern, database, preferences)
+            .generateAndSetKey(entry);
         assertEquals(Optional.of("Wond"), entry.getCitationKey());
     }
 
     @Test
     void generateKeyAuthNMLargeN() {
         bibtexKeyPattern.setDefaultValue("[auth20_3]");
-        entry.setField(StandardField.AUTHOR, "John Doe and Donald Smith and Will Wonder");
-        new CitationKeyGenerator(bibtexKeyPattern, database, preferences).generateAndSetKey(entry);
+        entry.setField(
+            StandardField.AUTHOR,
+            "John Doe and Donald Smith and Will Wonder"
+        );
+        new CitationKeyGenerator(bibtexKeyPattern, database, preferences)
+            .generateAndSetKey(entry);
         assertEquals(Optional.of("Wonder"), entry.getCitationKey());
     }
 
     @Test
     void generateKeyAuthNMLargeM() {
         bibtexKeyPattern.setDefaultValue("[auth2_4]");
-        entry.setField(StandardField.AUTHOR, "John Doe and Donald Smith and Will Wonder");
-        new CitationKeyGenerator(bibtexKeyPattern, database, preferences).generateAndSetKey(entry);
+        entry.setField(
+            StandardField.AUTHOR,
+            "John Doe and Donald Smith and Will Wonder"
+        );
+        new CitationKeyGenerator(bibtexKeyPattern, database, preferences)
+            .generateAndSetKey(entry);
         assertEquals(Optional.empty(), entry.getCitationKey());
     }
 
     @Test
     void generateKeyAuthNMLargeMReallyReturnsEmptyString() {
         bibtexKeyPattern.setDefaultValue("[auth2_4][year]");
-        entry.setField(StandardField.AUTHOR, "John Doe and Donald Smith and Will Wonder");
-        new CitationKeyGenerator(bibtexKeyPattern, database, preferences).generateAndSetKey(entry);
+        entry.setField(
+            StandardField.AUTHOR,
+            "John Doe and Donald Smith and Will Wonder"
+        );
+        new CitationKeyGenerator(bibtexKeyPattern, database, preferences)
+            .generateAndSetKey(entry);
         assertEquals(Optional.of("2016"), entry.getCitationKey());
     }
 
     @Test
     void generateKeyRegExReplace() {
-        preferences = new CitationKeyPatternPreferences(
+        preferences =
+            new CitationKeyPatternPreferences(
                 false,
                 false,
                 false,
@@ -436,27 +523,40 @@ void generateKeyRegExReplace() {
                 DEFAULT_UNWANTED_CHARACTERS,
                 pattern,
                 "",
-                ',');
+                ','
+            );
 
         bibtexKeyPattern.setDefaultValue("[auth][year]");
-        entry.setField(StandardField.AUTHOR, "John Doe and Donald Smith and Will Wonder");
-        new CitationKeyGenerator(bibtexKeyPattern, database, preferences).generateAndSetKey(entry);
+        entry.setField(
+            StandardField.AUTHOR,
+            "John Doe and Donald Smith and Will Wonder"
+        );
+        new CitationKeyGenerator(bibtexKeyPattern, database, preferences)
+            .generateAndSetKey(entry);
         assertEquals(Optional.of("Doe3016"), entry.getCitationKey());
     }
 
     @Test
     void generateKeyAuthIni() {
         bibtexKeyPattern.setDefaultValue("[authIni2]");
-        entry.setField(StandardField.AUTHOR, "John Doe and Donald Smith and Will Wonder");
-        new CitationKeyGenerator(bibtexKeyPattern, database, preferences).generateAndSetKey(entry);
+        entry.setField(
+            StandardField.AUTHOR,
+            "John Doe and Donald Smith and Will Wonder"
+        );
+        new CitationKeyGenerator(bibtexKeyPattern, database, preferences)
+            .generateAndSetKey(entry);
         assertEquals(Optional.of("D+"), entry.getCitationKey());
     }
 
     @Test
     void generateKeyAuthIniMany() {
         bibtexKeyPattern.setDefaultValue("[authIni10]");
-        entry.setField(StandardField.AUTHOR, "John Doe and Donald Smith and Will Wonder");
-        new CitationKeyGenerator(bibtexKeyPattern, database, preferences).generateAndSetKey(entry);
+        entry.setField(
+            StandardField.AUTHOR,
+            "John Doe and Donald Smith and Will Wonder"
+        );
+        new CitationKeyGenerator(bibtexKeyPattern, database, preferences)
+            .generateAndSetKey(entry);
         assertEquals(Optional.of("DoeSmiWon"), entry.getCitationKey());
     }
 
@@ -464,49 +564,68 @@ void generateKeyAuthIniMany() {
     void generateKeyTitleRegexe() {
         bibtexKeyPattern.setDefaultValue("[title:regex(\" \",\"-\")]");
         entry.setField(StandardField.TITLE, "Please replace the spaces");
-        new CitationKeyGenerator(bibtexKeyPattern, database, preferences).generateAndSetKey(entry);
-        assertEquals(Optional.of("PleaseReplacetheSpaces"), entry.getCitationKey());
+        new CitationKeyGenerator(bibtexKeyPattern, database, preferences)
+            .generateAndSetKey(entry);
+        assertEquals(
+            Optional.of("PleaseReplacetheSpaces"),
+            entry.getCitationKey()
+        );
     }
 
     @Test
     void generateKeyTitleTitleCase() {
         bibtexKeyPattern.setDefaultValue("[title:title_case]");
-        new CitationKeyGenerator(bibtexKeyPattern, database, preferences).generateAndSetKey(entry);
-        assertEquals(Optional.of("AnAwesomePaperonJabref"), entry.getCitationKey());
+        new CitationKeyGenerator(bibtexKeyPattern, database, preferences)
+            .generateAndSetKey(entry);
+        assertEquals(
+            Optional.of("AnAwesomePaperonJabref"),
+            entry.getCitationKey()
+        );
     }
 
     @Test
     void generateKeyTitleCapitalize() {
         bibtexKeyPattern.setDefaultValue("[title:capitalize]");
-        new CitationKeyGenerator(bibtexKeyPattern, database, preferences).generateAndSetKey(entry);
-        assertEquals(Optional.of("AnAwesomePaperOnJabref"), entry.getCitationKey());
+        new CitationKeyGenerator(bibtexKeyPattern, database, preferences)
+            .generateAndSetKey(entry);
+        assertEquals(
+            Optional.of("AnAwesomePaperOnJabref"),
+            entry.getCitationKey()
+        );
     }
 
     @Test
     void generateKeyTitleSentenceCase() {
         bibtexKeyPattern.setDefaultValue("[title:sentence_case]");
-        new CitationKeyGenerator(bibtexKeyPattern, database, preferences).generateAndSetKey(entry);
-        assertEquals(Optional.of("Anawesomepaperonjabref"), entry.getCitationKey());
+        new CitationKeyGenerator(bibtexKeyPattern, database, preferences)
+            .generateAndSetKey(entry);
+        assertEquals(
+            Optional.of("Anawesomepaperonjabref"),
+            entry.getCitationKey()
+        );
     }
 
     @Test
     void generateKeyTitleTitleCaseAbbr() {
         bibtexKeyPattern.setDefaultValue("[title:title_case:abbr]");
-        new CitationKeyGenerator(bibtexKeyPattern, database, preferences).generateAndSetKey(entry);
+        new CitationKeyGenerator(bibtexKeyPattern, database, preferences)
+            .generateAndSetKey(entry);
         assertEquals(Optional.of("AAPoJ"), entry.getCitationKey());
     }
 
     @Test
     void generateKeyTitleCapitalizeAbbr() {
         bibtexKeyPattern.setDefaultValue("[title:capitalize:abbr]");
-        new CitationKeyGenerator(bibtexKeyPattern, database, preferences).generateAndSetKey(entry);
+        new CitationKeyGenerator(bibtexKeyPattern, database, preferences)
+            .generateAndSetKey(entry);
         assertEquals(Optional.of("AAPOJ"), entry.getCitationKey());
     }
 
     @Test
     void generateKeyTitleSentenceCaseAbbr() {
         bibtexKeyPattern.setDefaultValue("[title:sentence_case:abbr]");
-        new CitationKeyGenerator(bibtexKeyPattern, database, preferences).generateAndSetKey(entry);
+        new CitationKeyGenerator(bibtexKeyPattern, database, preferences)
+            .generateAndSetKey(entry);
         assertEquals(Optional.of("Aapoj"), entry.getCitationKey());
     }
 }
diff --git a/src/test/java/org/jabref/logic/citationkeypattern/MakeLabelWithoutDatabaseTest.java b/src/test/java/org/jabref/logic/citationkeypattern/MakeLabelWithoutDatabaseTest.java
index 18afa3b2dd0..0e190451052 100644
--- a/src/test/java/org/jabref/logic/citationkeypattern/MakeLabelWithoutDatabaseTest.java
+++ b/src/test/java/org/jabref/logic/citationkeypattern/MakeLabelWithoutDatabaseTest.java
@@ -1,20 +1,17 @@
 package org.jabref.logic.citationkeypattern;
 
-import java.util.Collections;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
+import java.util.Collections;
 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 {
 
@@ -22,9 +19,12 @@ class MakeLabelWithoutDatabaseTest {
 
     @BeforeEach
     void setUp() {
-        GlobalCitationKeyPattern keyPattern = new GlobalCitationKeyPattern(Collections.emptyList());
+        GlobalCitationKeyPattern keyPattern = new GlobalCitationKeyPattern(
+            Collections.emptyList()
+        );
         keyPattern.setDefaultValue("[auth]");
-        CitationKeyPatternPreferences patternPreferences = new CitationKeyPatternPreferences(
+        CitationKeyPatternPreferences patternPreferences =
+            new CitationKeyPatternPreferences(
                 false,
                 false,
                 false,
@@ -34,17 +34,23 @@ void setUp() {
                 CitationKeyGenerator.DEFAULT_UNWANTED_CHARACTERS,
                 keyPattern,
                 "",
-                new SimpleObjectProperty<>(','));
+                new SimpleObjectProperty<>(',')
+            );
 
-        citationKeyGenerator = new CitationKeyGenerator(keyPattern, new BibDatabase(), patternPreferences);
+        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");
+            .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);
@@ -53,9 +59,9 @@ 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");
+            .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 faff4fe5f48..590b6196b97 100644
--- a/src/test/java/org/jabref/logic/citationstyle/CitationStyleCacheTest.java
+++ b/src/test/java/org/jabref/logic/citationstyle/CitationStyleCacheTest.java
@@ -1,31 +1,29 @@
 package org.jabref.logic.citationstyle;
 
-import java.util.List;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
 
+import java.util.List;
 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;
-
 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 a6694088d99..4ef10bea3f2 100644
--- a/src/test/java/org/jabref/logic/citationstyle/CitationStyleGeneratorTest.java
+++ b/src/test/java/org/jabref/logic/citationstyle/CitationStyleGeneratorTest.java
@@ -1,8 +1,9 @@
 package org.jabref.logic.citationstyle;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
 import java.util.List;
 import java.util.stream.Stream;
-
 import org.jabref.logic.l10n.Localization;
 import org.jabref.logic.util.TestEntry;
 import org.jabref.model.database.BibDatabase;
@@ -12,48 +13,76 @@
 import org.jabref.model.entry.BibEntryTypesManager;
 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;
-
 class CitationStyleGeneratorTest {
 
-    private final BibEntryTypesManager bibEntryTypesManager = new BibEntryTypesManager();
+    private final BibEntryTypesManager bibEntryTypesManager =
+        new BibEntryTypesManager();
 
     @Test
     void testACMCitation() {
-        BibDatabaseContext context = new BibDatabaseContext(new BibDatabase(List.of(TestEntry.getTestEntry())));
+        BibDatabaseContext context = new BibDatabaseContext(
+            new BibDatabase(List.of(TestEntry.getTestEntry()))
+        );
         context.setMode(BibDatabaseMode.BIBLATEX);
         List<CitationStyle> styleList = CitationStyle.discoverCitationStyles();
-        CitationStyle style = styleList.stream().filter(e -> "ACM SIGGRAPH".equals(e.getTitle())).findAny().orElse(null);
-        String citation = CitationStyleGenerator.generateCitation(TestEntry.getTestEntry(), style.getSource(), CitationStyleOutputFormat.HTML, context, new BibEntryTypesManager());
+        CitationStyle style = styleList
+            .stream()
+            .filter(e -> "ACM SIGGRAPH".equals(e.getTitle()))
+            .findAny()
+            .orElse(null);
+        String citation = CitationStyleGenerator.generateCitation(
+            TestEntry.getTestEntry(),
+            style.getSource(),
+            CitationStyleOutputFormat.HTML,
+            context,
+            new BibEntryTypesManager()
+        );
 
         // 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);
     }
 
     @Test
     void testAPACitation() {
-        BibDatabaseContext context = new BibDatabaseContext(new BibDatabase(List.of(TestEntry.getTestEntry())));
+        BibDatabaseContext context = new BibDatabaseContext(
+            new BibDatabase(List.of(TestEntry.getTestEntry()))
+        );
         context.setMode(BibDatabaseMode.BIBLATEX);
         List<CitationStyle> styleList = CitationStyle.discoverCitationStyles();
-        CitationStyle style = styleList.stream().filter(e -> "American Psychological Association 7th edition".equals(e.getTitle())).findAny().orElse(null);
-        String citation = CitationStyleGenerator.generateCitation(TestEntry.getTestEntry(), style.getSource(), CitationStyleOutputFormat.HTML, context, new BibEntryTypesManager());
+        CitationStyle style = styleList
+            .stream()
+            .filter(e ->
+                "American Psychological Association 7th edition".equals(
+                        e.getTitle()
+                    )
+            )
+            .findAny()
+            .orElse(null);
+        String citation = CitationStyleGenerator.generateCitation(
+            TestEntry.getTestEntry(),
+            style.getSource(),
+            CitationStyleOutputFormat.HTML,
+            context,
+            new BibEntryTypesManager()
+        );
 
         // 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);
     }
@@ -64,10 +93,15 @@ void testIgnoreNewLine() {
         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.generateCitation(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.generateCitation(
+            entry,
+            CitationStyle.getDefault(),
+            bibEntryTypesManager
+        );
         assertEquals(expected, citation);
     }
 
@@ -77,43 +111,68 @@ void testIgnoreCarriageReturnNewLine() {
         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.generateCitation(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.generateCitation(
+            entry,
+            CitationStyle.getDefault(),
+            bibEntryTypesManager
+        );
         assertEquals(expected, citation);
     }
 
     @Test
     void testMissingCitationStyle() {
-        String expected = Localization.lang("Cannot generate preview based on selected citation style.");
-        String citation = CitationStyleGenerator.generateCitation(new BibEntry(), "faulty citation style", bibEntryTypesManager);
+        String expected = Localization.lang(
+            "Cannot generate preview based on selected citation style."
+        );
+        String citation = CitationStyleGenerator.generateCitation(
+            new BibEntry(),
+            "faulty citation style",
+            bibEntryTypesManager
+        );
         assertEquals(expected, citation);
     }
 
     @Test
     void testHtmlFormat() {
-        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";
 
         BibEntry entry = TestEntry.getTestEntry();
         String style = CitationStyle.getDefault().getSource();
         CitationStyleOutputFormat format = CitationStyleOutputFormat.HTML;
 
-        String actualCitation = CitationStyleGenerator.generateCitation(entry, style, format, new BibDatabaseContext(), bibEntryTypesManager);
+        String actualCitation = CitationStyleGenerator.generateCitation(
+            entry,
+            style,
+            format,
+            new BibDatabaseContext(),
+            bibEntryTypesManager
+        );
         assertEquals(expectedCitation, actualCitation);
     }
 
     @Test
     void testTextFormat() {
-        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";
 
         BibEntry entry = TestEntry.getTestEntry();
         String style = CitationStyle.getDefault().getSource();
         CitationStyleOutputFormat format = CitationStyleOutputFormat.TEXT;
 
-        String actualCitation = CitationStyleGenerator.generateCitation(entry, style, format, new BibDatabaseContext(new BibDatabase(List.of(entry))), bibEntryTypesManager);
+        String actualCitation = CitationStyleGenerator.generateCitation(
+            entry,
+            style,
+            format,
+            new BibDatabaseContext(new BibDatabase(List.of(entry))),
+            bibEntryTypesManager
+        );
         assertEquals(expectedCitation, actualCitation);
     }
 
@@ -124,466 +183,555 @@ void testHandleDiacritics() {
         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.generateCitation(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.generateCitation(
+            entry,
+            CitationStyle.getDefault(),
+            bibEntryTypesManager
+        );
         assertEquals(expected, citation);
     }
 
     @Test
     void testHandleAmpersand() {
-        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";
         BibEntry entry = TestEntry.getTestEntry();
-        entry.setField(StandardField.TITLE, "Famous quote: “&TitleTest&” - that is it");
+        entry.setField(
+            StandardField.TITLE,
+            "Famous quote: “&TitleTest&” - that is it"
+        );
         String style = CitationStyle.getDefault().getSource();
         CitationStyleOutputFormat format = CitationStyleOutputFormat.TEXT;
 
-        String actualCitation = CitationStyleGenerator.generateCitation(entry, style, format, new BibDatabaseContext(), bibEntryTypesManager);
+        String actualCitation = CitationStyleGenerator.generateCitation(
+            entry,
+            style,
+            format,
+            new BibDatabaseContext(),
+            bibEntryTypesManager
+        );
         assertEquals(expectedCitation, actualCitation);
     }
 
     @Test
     void testHandleCrossRefFields() {
         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");
+            .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)));
+            .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.generateCitation(firstEntry, style, CitationStyleOutputFormat.TEXT, bibDatabaseContext, bibEntryTypesManager);
+        String actualCitation = CitationStyleGenerator.generateCitation(
+            firstEntry,
+            style,
+            CitationStyleOutputFormat.TEXT,
+            bibDatabaseContext,
+            bibEntryTypesManager
+        );
         assertEquals(expectedCitation, actualCitation);
     }
 
     static Stream<Arguments> testCslMapping() {
         // if the default citation style changes this has to be modified
         return Stream.of(
-                Arguments.of(
-                        "[1]F. Last and J. Doe, no. 28.\n",
-                        BibDatabaseMode.BIBTEX,
-                        new BibEntry(StandardEntryType.Article)
-                                .withField(StandardField.AUTHOR, "Last, First and\nDoe, Jane")
-                                .withField(StandardField.NUMBER, "28"),
-                        "ieee.csl"),
-                Arguments.of(
-                        "[1]F. Last and J. Doe, no. 7.\n",
-                        BibDatabaseMode.BIBLATEX,
-                        new BibEntry(StandardEntryType.Article)
-                                .withField(StandardField.AUTHOR, "Last, First and\nDoe, Jane")
-                                .withField(StandardField.ISSUE, "7"),
-                        "ieee.csl"),
-                Arguments.of(
-                        "[1]F. Last and J. Doe, no. 28.\n",
-                        BibDatabaseMode.BIBLATEX,
-                        new BibEntry(StandardEntryType.Article)
-                                .withField(StandardField.AUTHOR, "Last, First and Doe, Jane")
-                                .withField(StandardField.NUMBER, "28"),
-                        "ieee.csl"),
-                Arguments.of(
-                        "[1]F. Last and J. Doe, no. 28.\n",
-                        BibDatabaseMode.BIBLATEX,
-                        new BibEntry(StandardEntryType.Article)
-                                .withField(StandardField.AUTHOR, "Last, First and\nDoe, Jane")
-                                .withField(StandardField.ISSUE, "7")
-                                .withField(StandardField.NUMBER, "28"),
-                        "ieee.csl"),
-                Arguments.of(
-                        "[1]F. Last and J. Doe, no. 7, Art. no. e0270533.\n",
-                        BibDatabaseMode.BIBLATEX,
-                        new BibEntry(StandardEntryType.Article)
-                                .withField(StandardField.AUTHOR, "Last, First and\nDoe, Jane")
-                                .withField(StandardField.ISSUE, "7")
-                                .withField(StandardField.EID, "e0270533"),
-                        "ieee.csl"),
-                         Arguments.of(
-                        "[1]F. Last and J. Doe, no. 33, pp. 7–8.\n",
-                        BibDatabaseMode.BIBLATEX,
-                        new BibEntry(StandardEntryType.Article)
-                                .withField(StandardField.AUTHOR, "Last, First and\nDoe, Jane")
-                                .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,
-                        new BibEntry(StandardEntryType.Article)
-                                .withField(StandardField.AUTHOR, "Foo, Bar")
-                                .withField(StandardField.JOURNAL, "Bib(La)TeX Journal")
-                                .withField(StandardField.NUMBER, "3number")
-                                .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.ISSUE, "9issue"),
-                        "apa.csl"),
-
-                Arguments.of(
-                        "Foo, B. (n.d.). volume + issue + pages. Bib(La)TeX Journal, 1(9), 45–67.\n",
-                        BibDatabaseMode.BIBTEX,
-                        new BibEntry(StandardEntryType.Article)
-                                .withField(StandardField.AUTHOR, "Foo, Bar")
-                                .withField(StandardField.JOURNAL, "Bib(La)TeX Journal")
-                                .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.ISSUE, "9"),
-                        "apa.csl"),
-
-                Arguments.of(
-                        "Foo, B. (n.d.). volume + pages. Bib(La)TeX Journal, 1, 45–67.\n",
-                        BibDatabaseMode.BIBTEX,
-                        new BibEntry(StandardEntryType.Article)
-                                .withField(StandardField.AUTHOR, "Foo, Bar")
-                                .withField(StandardField.JOURNAL, "Bib(La)TeX Journal")
-                                .withField(StandardField.PAGES, "45--67")
-                                .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,
-                        new BibEntry(StandardEntryType.Article)
-                                .withField(StandardField.AUTHOR, "Foo, Bar")
-                                .withField(StandardField.JOURNAL, "Bib(La)TeX Journal")
-                                .withField(StandardField.NUMBER, "3number")
-                                .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.
-                Arguments.of(
-                        "Foo, B. (n.d.). issue + pages. Bib(La)TeX Journal, 9, 45–67.\n",
-                        BibDatabaseMode.BIBTEX,
-                        new BibEntry(StandardEntryType.Article)
-                                .withField(StandardField.AUTHOR, "Foo, Bar")
-                                .withField(StandardField.JOURNAL, "Bib(La)TeX Journal")
-                                .withField(StandardField.PAGES, "45--67")
-                                .withField(StandardField.TITLE, "issue + pages")
-                                .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)
-                Arguments.of(
-                        "Foo, B. (n.d.). issue + number. Bib(La)TeX Journal, 3number.\n",
-                        BibDatabaseMode.BIBTEX,
-                        new BibEntry(StandardEntryType.Article)
-                                .withField(StandardField.AUTHOR, "Foo, Bar")
-                                .withField(StandardField.JOURNAL, "Bib(La)TeX Journal")
-                                .withField(StandardField.NUMBER, "3number")
-                                .withField(StandardField.TITLE, "issue + number")
-                                .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)
-                Arguments.of(
-                        "Foo, B. (n.d.). issue + number + pages. Bib(La)TeX Journal, 3number, 45–67.\n",
-                        BibDatabaseMode.BIBTEX,
-                        new BibEntry(StandardEntryType.Article)
-                                .withField(StandardField.AUTHOR, "Foo, Bar")
-                                .withField(StandardField.JOURNAL, "Bib(La)TeX Journal")
-                                .withField(StandardField.NUMBER, "3number")
-                                .withField(StandardField.PAGES, "45--67")
-                                .withField(StandardField.TITLE, "issue + number + pages")
-                                .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?
-                Arguments.of(
-                        "Foo, B. (n.d.). number + pages. Bib(La)TeX Journal, 3number, Article 777.\n",
-                        BibDatabaseMode.BIBTEX,
-                        new BibEntry(StandardEntryType.Article)
-                                .withField(StandardField.AUTHOR, "Foo, Bar")
-                                .withField(StandardField.JOURNAL, "Bib(La)TeX Journal")
-                                .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"),
-                        "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."
-                Arguments.of(
-                        "Foo, B. (n.d.). issue. Bib(La)TeX Journal, 9issue.\n",
-                        BibDatabaseMode.BIBTEX,
-                        new BibEntry(StandardEntryType.Article)
-                                .withField(StandardField.AUTHOR, "Foo, Bar")
-                                .withField(StandardField.JOURNAL, "Bib(La)TeX Journal")
-                                .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,
-                        new BibEntry(StandardEntryType.Article)
-                                .withField(StandardField.AUTHOR, "Foo, Bar")
-                                .withField(StandardField.JOURNAL, "Bib(La)TeX Journal")
-                                .withField(StandardField.NUMBER, "3number")
-                                .withField(StandardField.PAGES, "45--67")
-                                .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?
-                Arguments.of(
-                        "Foo, B. (n.d.). number + pages. BibTeX Journal, 3number, 777e23.\n",
-                        BibDatabaseMode.BIBTEX,
-                        new BibEntry(StandardEntryType.Article)
-                                .withField(StandardField.AUTHOR, "Foo, Bar")
-                                .withField(StandardField.JOURNAL, "BibTeX Journal")
-                                .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"),
-                        "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)
-                Arguments.of(
-                        "Foo, B. (n.d.). eid + issue + number + pages. BibTeX Journal, 3number, 45–67.\n",
-                        BibDatabaseMode.BIBTEX,
-                        new BibEntry(StandardEntryType.Article)
-                                .withField(StandardField.AUTHOR, "Foo, Bar")
-                                .withField(StandardField.JOURNAL, "BibTeX Journal")
-                                .withField(StandardField.NUMBER, "3number")
-                                .withField(StandardField.PAGES, "45--67")
-                                .withField(StandardField.TITLE, "eid + issue + number + pages")
-                                .withField(StandardField.EID, "6eid")
-                                .withField(StandardField.ISSUE, "9issue"),
-                        "apa.csl"),
-
-                /*
+            Arguments.of(
+                "[1]F. Last and J. Doe, no. 28.\n",
+                BibDatabaseMode.BIBTEX,
+                new BibEntry(StandardEntryType.Article)
+                    .withField(
+                        StandardField.AUTHOR,
+                        "Last, First and\nDoe, Jane"
+                    )
+                    .withField(StandardField.NUMBER, "28"),
+                "ieee.csl"
+            ),
+            Arguments.of(
+                "[1]F. Last and J. Doe, no. 7.\n",
+                BibDatabaseMode.BIBLATEX,
+                new BibEntry(StandardEntryType.Article)
+                    .withField(
+                        StandardField.AUTHOR,
+                        "Last, First and\nDoe, Jane"
+                    )
+                    .withField(StandardField.ISSUE, "7"),
+                "ieee.csl"
+            ),
+            Arguments.of(
+                "[1]F. Last and J. Doe, no. 28.\n",
+                BibDatabaseMode.BIBLATEX,
+                new BibEntry(StandardEntryType.Article)
+                    .withField(
+                        StandardField.AUTHOR,
+                        "Last, First and Doe, Jane"
+                    )
+                    .withField(StandardField.NUMBER, "28"),
+                "ieee.csl"
+            ),
+            Arguments.of(
+                "[1]F. Last and J. Doe, no. 28.\n",
+                BibDatabaseMode.BIBLATEX,
+                new BibEntry(StandardEntryType.Article)
+                    .withField(
+                        StandardField.AUTHOR,
+                        "Last, First and\nDoe, Jane"
+                    )
+                    .withField(StandardField.ISSUE, "7")
+                    .withField(StandardField.NUMBER, "28"),
+                "ieee.csl"
+            ),
+            Arguments.of(
+                "[1]F. Last and J. Doe, no. 7, Art. no. e0270533.\n",
+                BibDatabaseMode.BIBLATEX,
+                new BibEntry(StandardEntryType.Article)
+                    .withField(
+                        StandardField.AUTHOR,
+                        "Last, First and\nDoe, Jane"
+                    )
+                    .withField(StandardField.ISSUE, "7")
+                    .withField(StandardField.EID, "e0270533"),
+                "ieee.csl"
+            ),
+            Arguments.of(
+                "[1]F. Last and J. Doe, no. 33, pp. 7–8.\n",
+                BibDatabaseMode.BIBLATEX,
+                new BibEntry(StandardEntryType.Article)
+                    .withField(
+                        StandardField.AUTHOR,
+                        "Last, First and\nDoe, Jane"
+                    )
+                    .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,
+                new BibEntry(StandardEntryType.Article)
+                    .withField(StandardField.AUTHOR, "Foo, Bar")
+                    .withField(StandardField.JOURNAL, "Bib(La)TeX Journal")
+                    .withField(StandardField.NUMBER, "3number")
+                    .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.ISSUE, "9issue"),
+                "apa.csl"
+            ),
+            Arguments.of(
+                "Foo, B. (n.d.). volume + issue + pages. Bib(La)TeX Journal, 1(9), 45–67.\n",
+                BibDatabaseMode.BIBTEX,
+                new BibEntry(StandardEntryType.Article)
+                    .withField(StandardField.AUTHOR, "Foo, Bar")
+                    .withField(StandardField.JOURNAL, "Bib(La)TeX Journal")
+                    .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.ISSUE, "9"),
+                "apa.csl"
+            ),
+            Arguments.of(
+                "Foo, B. (n.d.). volume + pages. Bib(La)TeX Journal, 1, 45–67.\n",
+                BibDatabaseMode.BIBTEX,
+                new BibEntry(StandardEntryType.Article)
+                    .withField(StandardField.AUTHOR, "Foo, Bar")
+                    .withField(StandardField.JOURNAL, "Bib(La)TeX Journal")
+                    .withField(StandardField.PAGES, "45--67")
+                    .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,
+                new BibEntry(StandardEntryType.Article)
+                    .withField(StandardField.AUTHOR, "Foo, Bar")
+                    .withField(StandardField.JOURNAL, "Bib(La)TeX Journal")
+                    .withField(StandardField.NUMBER, "3number")
+                    .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.
+            Arguments.of(
+                "Foo, B. (n.d.). issue + pages. Bib(La)TeX Journal, 9, 45–67.\n",
+                BibDatabaseMode.BIBTEX,
+                new BibEntry(StandardEntryType.Article)
+                    .withField(StandardField.AUTHOR, "Foo, Bar")
+                    .withField(StandardField.JOURNAL, "Bib(La)TeX Journal")
+                    .withField(StandardField.PAGES, "45--67")
+                    .withField(StandardField.TITLE, "issue + pages")
+                    .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)
+            Arguments.of(
+                "Foo, B. (n.d.). issue + number. Bib(La)TeX Journal, 3number.\n",
+                BibDatabaseMode.BIBTEX,
+                new BibEntry(StandardEntryType.Article)
+                    .withField(StandardField.AUTHOR, "Foo, Bar")
+                    .withField(StandardField.JOURNAL, "Bib(La)TeX Journal")
+                    .withField(StandardField.NUMBER, "3number")
+                    .withField(StandardField.TITLE, "issue + number")
+                    .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)
+            Arguments.of(
+                "Foo, B. (n.d.). issue + number + pages. Bib(La)TeX Journal, 3number, 45–67.\n",
+                BibDatabaseMode.BIBTEX,
+                new BibEntry(StandardEntryType.Article)
+                    .withField(StandardField.AUTHOR, "Foo, Bar")
+                    .withField(StandardField.JOURNAL, "Bib(La)TeX Journal")
+                    .withField(StandardField.NUMBER, "3number")
+                    .withField(StandardField.PAGES, "45--67")
+                    .withField(StandardField.TITLE, "issue + number + pages")
+                    .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?
+            Arguments.of(
+                "Foo, B. (n.d.). number + pages. Bib(La)TeX Journal, 3number, Article 777.\n",
+                BibDatabaseMode.BIBTEX,
+                new BibEntry(StandardEntryType.Article)
+                    .withField(StandardField.AUTHOR, "Foo, Bar")
+                    .withField(StandardField.JOURNAL, "Bib(La)TeX Journal")
+                    .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"
+                    ),
+                "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."
+            Arguments.of(
+                "Foo, B. (n.d.). issue. Bib(La)TeX Journal, 9issue.\n",
+                BibDatabaseMode.BIBTEX,
+                new BibEntry(StandardEntryType.Article)
+                    .withField(StandardField.AUTHOR, "Foo, Bar")
+                    .withField(StandardField.JOURNAL, "Bib(La)TeX Journal")
+                    .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,
+                new BibEntry(StandardEntryType.Article)
+                    .withField(StandardField.AUTHOR, "Foo, Bar")
+                    .withField(StandardField.JOURNAL, "Bib(La)TeX Journal")
+                    .withField(StandardField.NUMBER, "3number")
+                    .withField(StandardField.PAGES, "45--67")
+                    .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?
+            Arguments.of(
+                "Foo, B. (n.d.). number + pages. BibTeX Journal, 3number, 777e23.\n",
+                BibDatabaseMode.BIBTEX,
+                new BibEntry(StandardEntryType.Article)
+                    .withField(StandardField.AUTHOR, "Foo, Bar")
+                    .withField(StandardField.JOURNAL, "BibTeX Journal")
+                    .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"
+                    ),
+                "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)
+            Arguments.of(
+                "Foo, B. (n.d.). eid + issue + number + pages. BibTeX Journal, 3number, 45–67.\n",
+                BibDatabaseMode.BIBTEX,
+                new BibEntry(StandardEntryType.Article)
+                    .withField(StandardField.AUTHOR, "Foo, Bar")
+                    .withField(StandardField.JOURNAL, "BibTeX Journal")
+                    .withField(StandardField.NUMBER, "3number")
+                    .withField(StandardField.PAGES, "45--67")
+                    .withField(
+                        StandardField.TITLE,
+                        "eid + issue + number + pages"
+                    )
+                    .withField(StandardField.EID, "6eid")
+                    .withField(StandardField.ISSUE, "9issue"),
+                "apa.csl"
+            ),
+            /*
                 Not rendering the "eid" field here, is correct. The "eid" field(= electronic identifier) does not exist in Bibtex standard.
                                  Since, for this entry, there is no pages field present and therefore no data will be overwritten, enabling the user to be able to move the data within the eid scala.annotation.meta.field to the pages scala.annotation.meta.field via cleanup action is something worth pursuing.
 
                 Not rendering the "issue" field here is correct. The "issue" field does not exist in Bibtex standard.
                         Since, for this entry, there is no number field present and therefore no data will be overwritten, 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.). eid + issue. BibTeX Journal, 9issue, Article 6eid.\n",
-                        BibDatabaseMode.BIBTEX,
-                        new BibEntry(StandardEntryType.Article)
-                                .withField(StandardField.AUTHOR, "Foo, Bar")
-                                .withField(StandardField.JOURNAL, "BibTeX Journal")
-                                .withField(StandardField.TITLE, "eid + issue")
-                                .withField(StandardField.COMMENT, "")
-                                .withField(StandardField.EID, "Article 6eid")
-                                .withField(StandardField.ISSUE, "9issue"),
-                        "apa.csl"),
-
-        /*
+            Arguments.of(
+                "Foo, B. (n.d.). eid + issue. BibTeX Journal, 9issue, Article 6eid.\n",
+                BibDatabaseMode.BIBTEX,
+                new BibEntry(StandardEntryType.Article)
+                    .withField(StandardField.AUTHOR, "Foo, Bar")
+                    .withField(StandardField.JOURNAL, "BibTeX Journal")
+                    .withField(StandardField.TITLE, "eid + issue")
+                    .withField(StandardField.COMMENT, "")
+                    .withField(StandardField.EID, "Article 6eid")
+                    .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 "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.EID, "6eid")
-                                .withField(StandardField.ISSUE, "9issue")
-                                .withField(StandardField.NUMBER, "3number")
-                                .withField(StandardField.PAGES, "45--67")
-                                .withField(StandardField.VOLUME, "1"),
-                        "apa.csl"),
-
-                // eid field will always be prefixed with article
-                Arguments.of(
-                        "Foo, B. (n.d.). volume + issue + pages + eid. Bib(La)TeX Journal, 1(9issue), Article 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 + pages + eid")
-                                .withField(StandardField.EID, "Article 6eid")
-                                .withField(StandardField.ISSUE, "9issue")
-                                .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,
-                        new BibEntry(StandardEntryType.Article)
-                                .withField(StandardField.AUTHOR, "Foo, Bar")
-                                .withField(StandardField.JOURNALTITLE, "Bib(La)TeX Journal")
-                                .withField(StandardField.TITLE, "volume + number + pages + eid")
-                                .withField(StandardField.EID, "6eid")
-                                .withField(StandardField.NUMBER, "3number")
-                                .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,
-                        new BibEntry(StandardEntryType.Article)
-                                .withField(StandardField.AUTHOR, "Foo, Bar")
-                                .withField(StandardField.JOURNALTITLE, "Bib(La)TeX Journal")
-                                .withField(StandardField.TITLE, "eid + issue")
-                                .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,
-                        new BibEntry(StandardEntryType.Article)
-                                .withField(StandardField.AUTHOR, "Foo, Bar")
-                                .withField(StandardField.JOURNALTITLE, "Bib(La)TeX Journal")
-                                .withField(StandardField.TITLE, "eid + issue + pages")
-                                .withField(StandardField.EID, "6eid")
-                                .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,
-                        new BibEntry(StandardEntryType.Article)
-                                .withField(StandardField.AUTHOR, "Foo, Bar")
-                                .withField(StandardField.JOURNALTITLE, "Bib(La)TeX Journal")
-                                .withField(StandardField.TITLE, "eid + issue + number")
-                                .withField(StandardField.EID, "Article 6eid")
-                                .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,
-                        new BibEntry(StandardEntryType.Article)
-                                .withField(StandardField.AUTHOR, "Foo, Bar")
-                                .withField(StandardField.JOURNALTITLE, "Bib(La)TeX Journal")
-                                .withField(StandardField.TITLE, "eid + issue + number + pages")
-                                .withField(StandardField.EID, "6eid")
-                                .withField(StandardField.ISSUE, "9issue")
-                                .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,
-                        new BibEntry(StandardEntryType.Article)
-                                .withField(StandardField.AUTHOR, "Foo, Bar")
-                                .withField(StandardField.JOURNALTITLE, "Bib(La)TeX Journal")
-                                .withField(StandardField.TITLE, "eid + pages")
-                                .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,
-                        new BibEntry(StandardEntryType.Article)
-                                .withField(StandardField.AUTHOR, "Foo, Bar")
-                                .withField(StandardField.JOURNALTITLE, "Bib(La)TeX Journal")
-                                .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,
-                        new BibEntry(StandardEntryType.Article)
-                                .withField(StandardField.AUTHOR, "Foo, Bar")
-                                .withField(StandardField.JOURNALTITLE, "Bib(La)TeX Journal")
-                                .withField(StandardField.TITLE, "volume + number + eid")
-                                .withField(StandardField.EID, "Article 6eid")
-                                .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,
-                        new BibEntry(StandardEntryType.Article)
-                                .withField(StandardField.AUTHOR, "Foo, Bar")
-                                .withField(StandardField.JOURNALTITLE, "Bib(La)TeX Journal")
-                                .withField(StandardField.TITLE, "volume + pages + eid")
-                                .withField(StandardField.EID, "6eid")
-                                .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,
-                        new BibEntry(StandardEntryType.Article)
-                                .withField(StandardField.AUTHOR, "Foo, Bar")
-                                .withField(StandardField.JOURNALTITLE, "Bib(La)TeX Journal")
-                                .withField(StandardField.TITLE, "eid + number")
-                                .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,
-                        new BibEntry(StandardEntryType.Article)
-                                .withField(StandardField.AUTHOR, "Foo, Bar")
-                                .withField(StandardField.JOURNALTITLE, "Bib(La)TeX Journal")
-                                .withField(StandardField.TITLE, "eid + number + pages")
-                                .withField(StandardField.EID, "6eid")
-                                .withField(StandardField.NUMBER, "3number")
-                                .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)
-                Arguments.of(
-                        "Foo, B. (n.d.). issue + number. Bib(La)TeX Journal, 3number.\n",
-                        BibDatabaseMode.BIBLATEX,
-                        new BibEntry(StandardEntryType.Article)
-                                .withField(StandardField.AUTHOR, "Foo, Bar")
-                                .withField(StandardField.JOURNALTITLE, "Bib(La)TeX Journal")
-                                .withField(StandardField.TITLE, "issue + number")
-                                .withField(StandardField.ISSUE, "9issue")
-                                .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)
-                Arguments.of(
-                        "Foo, B. (n.d.). issue + number + pages. Bib(La)TeX Journal, 3number, 45–67.\n",
-                        BibDatabaseMode.BIBLATEX,
-                        new BibEntry(StandardEntryType.Article)
-                                .withField(StandardField.AUTHOR, "Foo, Bar")
-                                .withField(StandardField.JOURNALTITLE, "Bib(La)TeX Journal")
-                                .withField(StandardField.TITLE, "issue + number + pages")
-                                .withField(StandardField.ISSUE, "9issue")
-                                .withField(StandardField.NUMBER, "3number")
-                                .withField(StandardField.PAGES, "45--67"),
-                        "apa.csl")
+            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.EID, "6eid")
+                    .withField(StandardField.ISSUE, "9issue")
+                    .withField(StandardField.NUMBER, "3number")
+                    .withField(StandardField.PAGES, "45--67")
+                    .withField(StandardField.VOLUME, "1"),
+                "apa.csl"
+            ),
+            // eid field will always be prefixed with article
+            Arguments.of(
+                "Foo, B. (n.d.). volume + issue + pages + eid. Bib(La)TeX Journal, 1(9issue), Article 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 + pages + eid"
+                    )
+                    .withField(StandardField.EID, "Article 6eid")
+                    .withField(StandardField.ISSUE, "9issue")
+                    .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,
+                new BibEntry(StandardEntryType.Article)
+                    .withField(StandardField.AUTHOR, "Foo, Bar")
+                    .withField(StandardField.JOURNALTITLE, "Bib(La)TeX Journal")
+                    .withField(
+                        StandardField.TITLE,
+                        "volume + number + pages + eid"
+                    )
+                    .withField(StandardField.EID, "6eid")
+                    .withField(StandardField.NUMBER, "3number")
+                    .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,
+                new BibEntry(StandardEntryType.Article)
+                    .withField(StandardField.AUTHOR, "Foo, Bar")
+                    .withField(StandardField.JOURNALTITLE, "Bib(La)TeX Journal")
+                    .withField(StandardField.TITLE, "eid + issue")
+                    .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,
+                new BibEntry(StandardEntryType.Article)
+                    .withField(StandardField.AUTHOR, "Foo, Bar")
+                    .withField(StandardField.JOURNALTITLE, "Bib(La)TeX Journal")
+                    .withField(StandardField.TITLE, "eid + issue + pages")
+                    .withField(StandardField.EID, "6eid")
+                    .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,
+                new BibEntry(StandardEntryType.Article)
+                    .withField(StandardField.AUTHOR, "Foo, Bar")
+                    .withField(StandardField.JOURNALTITLE, "Bib(La)TeX Journal")
+                    .withField(StandardField.TITLE, "eid + issue + number")
+                    .withField(StandardField.EID, "Article 6eid")
+                    .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,
+                new BibEntry(StandardEntryType.Article)
+                    .withField(StandardField.AUTHOR, "Foo, Bar")
+                    .withField(StandardField.JOURNALTITLE, "Bib(La)TeX Journal")
+                    .withField(
+                        StandardField.TITLE,
+                        "eid + issue + number + pages"
+                    )
+                    .withField(StandardField.EID, "6eid")
+                    .withField(StandardField.ISSUE, "9issue")
+                    .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,
+                new BibEntry(StandardEntryType.Article)
+                    .withField(StandardField.AUTHOR, "Foo, Bar")
+                    .withField(StandardField.JOURNALTITLE, "Bib(La)TeX Journal")
+                    .withField(StandardField.TITLE, "eid + pages")
+                    .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,
+                new BibEntry(StandardEntryType.Article)
+                    .withField(StandardField.AUTHOR, "Foo, Bar")
+                    .withField(StandardField.JOURNALTITLE, "Bib(La)TeX Journal")
+                    .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,
+                new BibEntry(StandardEntryType.Article)
+                    .withField(StandardField.AUTHOR, "Foo, Bar")
+                    .withField(StandardField.JOURNALTITLE, "Bib(La)TeX Journal")
+                    .withField(StandardField.TITLE, "volume + number + eid")
+                    .withField(StandardField.EID, "Article 6eid")
+                    .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,
+                new BibEntry(StandardEntryType.Article)
+                    .withField(StandardField.AUTHOR, "Foo, Bar")
+                    .withField(StandardField.JOURNALTITLE, "Bib(La)TeX Journal")
+                    .withField(StandardField.TITLE, "volume + pages + eid")
+                    .withField(StandardField.EID, "6eid")
+                    .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,
+                new BibEntry(StandardEntryType.Article)
+                    .withField(StandardField.AUTHOR, "Foo, Bar")
+                    .withField(StandardField.JOURNALTITLE, "Bib(La)TeX Journal")
+                    .withField(StandardField.TITLE, "eid + number")
+                    .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,
+                new BibEntry(StandardEntryType.Article)
+                    .withField(StandardField.AUTHOR, "Foo, Bar")
+                    .withField(StandardField.JOURNALTITLE, "Bib(La)TeX Journal")
+                    .withField(StandardField.TITLE, "eid + number + pages")
+                    .withField(StandardField.EID, "6eid")
+                    .withField(StandardField.NUMBER, "3number")
+                    .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)
+            Arguments.of(
+                "Foo, B. (n.d.). issue + number. Bib(La)TeX Journal, 3number.\n",
+                BibDatabaseMode.BIBLATEX,
+                new BibEntry(StandardEntryType.Article)
+                    .withField(StandardField.AUTHOR, "Foo, Bar")
+                    .withField(StandardField.JOURNALTITLE, "Bib(La)TeX Journal")
+                    .withField(StandardField.TITLE, "issue + number")
+                    .withField(StandardField.ISSUE, "9issue")
+                    .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)
+            Arguments.of(
+                "Foo, B. (n.d.). issue + number + pages. Bib(La)TeX Journal, 3number, 45–67.\n",
+                BibDatabaseMode.BIBLATEX,
+                new BibEntry(StandardEntryType.Article)
+                    .withField(StandardField.AUTHOR, "Foo, Bar")
+                    .withField(StandardField.JOURNALTITLE, "Bib(La)TeX Journal")
+                    .withField(StandardField.TITLE, "issue + number + pages")
+                    .withField(StandardField.ISSUE, "9issue")
+                    .withField(StandardField.NUMBER, "3number")
+                    .withField(StandardField.PAGES, "45--67"),
+                "apa.csl"
+            )
         );
     }
 
     @ParameterizedTest
     @MethodSource
-    void testCslMapping(String expected, BibDatabaseMode mode, BibEntry entry, String cslFileName) throws Exception {
-        BibDatabaseContext bibDatabaseContext = new BibDatabaseContext(new BibDatabase(List.of(entry)));
+    void testCslMapping(
+        String expected,
+        BibDatabaseMode mode,
+        BibEntry entry,
+        String cslFileName
+    ) throws Exception {
+        BibDatabaseContext bibDatabaseContext = new BibDatabaseContext(
+            new BibDatabase(List.of(entry))
+        );
         bibDatabaseContext.setMode(mode);
 
         String citation = CitationStyleGenerator.generateCitation(
-                entry,
-                CitationStyle.createCitationStyleFromFile(cslFileName).orElseThrow().getSource(),
-                CitationStyleOutputFormat.TEXT,
-                bibDatabaseContext,
-                bibEntryTypesManager);
+            entry,
+            CitationStyle
+                .createCitationStyleFromFile(cslFileName)
+                .orElseThrow()
+                .getSource(),
+            CitationStyleOutputFormat.TEXT,
+            bibDatabaseContext,
+            bibEntryTypesManager
+        );
         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 6bdbac10b98..c7000bc053f 100644
--- a/src/test/java/org/jabref/logic/citationstyle/CitationStyleTest.java
+++ b/src/test/java/org/jabref/logic/citationstyle/CitationStyleTest.java
@@ -1,18 +1,16 @@
 package org.jabref.logic.citationstyle;
 
-import java.util.List;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
 
+import java.util.List;
 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 static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
-
 class CitationStyleTest {
 
     @Test
@@ -22,16 +20,25 @@ void getDefault() throws Exception {
 
     @Test
     void testDefaultCitation() {
-        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.generateCitation(TestEntry.getTestEntry(), CitationStyle.getDefault().getSource(), CitationStyleOutputFormat.HTML, context, new BibEntryTypesManager());
+        String citation = CitationStyleGenerator.generateCitation(
+            TestEntry.getTestEntry(),
+            CitationStyle.getDefault().getSource(),
+            CitationStyleOutputFormat.HTML,
+            context,
+            new BibEntryTypesManager()
+        );
 
         // if the default citation style changes this has to be modified
-        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>
-                """;
+        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>
+            """;
 
         assertEquals(expected, citation);
     }
diff --git a/src/test/java/org/jabref/logic/citationstyle/JabRefItemDataProviderTest.java b/src/test/java/org/jabref/logic/citationstyle/JabRefItemDataProviderTest.java
index 33172c35434..138c44e4448 100644
--- a/src/test/java/org/jabref/logic/citationstyle/JabRefItemDataProviderTest.java
+++ b/src/test/java/org/jabref/logic/citationstyle/JabRefItemDataProviderTest.java
@@ -1,49 +1,67 @@
 package org.jabref.logic.citationstyle;
 
-import java.util.List;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
+import java.util.List;
 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;
-
 class JabRefItemDataProviderTest {
 
     @Test
     void toJsonOneEntry() {
-        BibDatabase bibDatabase = new BibDatabase(List.of(
+        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("""
-                        [{"id":"key","type":"article","author":[{"family":"Author","given":"Test"}]}]""",
-                jabRefItemDataProvider.toJson());
+                    .withCitationKey("key")
+                    .withField(StandardField.AUTHOR, "Test Author")
+            )
+        );
+        BibDatabaseContext bibDatabaseContext = new BibDatabaseContext(
+            bibDatabase
+        );
+        JabRefItemDataProvider jabRefItemDataProvider =
+            new JabRefItemDataProvider();
+        jabRefItemDataProvider.setData(
+            bibDatabaseContext,
+            new BibEntryTypesManager()
+        );
+        assertEquals(
+            """
+            [{"id":"key","type":"article","author":[{"family":"Author","given":"Test"}]}]""",
+            jabRefItemDataProvider.toJson()
+        );
     }
 
     @Test
     void toJsonTwoEntries() {
-        BibDatabase bibDatabase = new BibDatabase(List.of(
+        BibDatabase bibDatabase = new BibDatabase(
+            List.of(
                 new BibEntry()
-                        .withCitationKey("key")
-                        .withField(StandardField.AUTHOR, "Test Author"),
+                    .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("""
-                        [{"id":"key","type":"article","author":[{"family":"Author","given":"Test"}]},{"id":"key2","type":"article","author":[{"family":"Author","given":"Second"}]}]""",
-                jabRefItemDataProvider.toJson());
+                    .withCitationKey("key2")
+                    .withField(StandardField.AUTHOR, "Second Author")
+            )
+        );
+        BibDatabaseContext bibDatabaseContext = new BibDatabaseContext(
+            bibDatabase
+        );
+        JabRefItemDataProvider jabRefItemDataProvider =
+            new JabRefItemDataProvider();
+        jabRefItemDataProvider.setData(
+            bibDatabaseContext,
+            new BibEntryTypesManager()
+        );
+        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 c70156613f5..bc2dfc694be 100644
--- a/src/test/java/org/jabref/logic/cleanup/BibtexBiblatexRoundtripTest.java
+++ b/src/test/java/org/jabref/logic/cleanup/BibtexBiblatexRoundtripTest.java
@@ -1,26 +1,36 @@
 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")
+        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(
+                    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")
@@ -29,11 +39,21 @@ void setUp() {
                 .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")
+        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(
+                    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")
diff --git a/src/test/java/org/jabref/logic/cleanup/CleanupWorkerTest.java b/src/test/java/org/jabref/logic/cleanup/CleanupWorkerTest.java
index 9f75580446b..5e310896d34 100644
--- a/src/test/java/org/jabref/logic/cleanup/CleanupWorkerTest.java
+++ b/src/test/java/org/jabref/logic/cleanup/CleanupWorkerTest.java
@@ -1,5 +1,11 @@
 package org.jabref.logic.cleanup;
 
+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;
@@ -8,7 +14,6 @@
 import java.util.EnumSet;
 import java.util.List;
 import java.util.Optional;
-
 import org.jabref.logic.bibtex.FileFieldWriter;
 import org.jabref.logic.formatter.bibtexfields.HtmlToLatexFormatter;
 import org.jabref.logic.formatter.bibtexfields.LatexCleanupFormatter;
@@ -30,21 +35,16 @@
 import org.jabref.model.metadata.MetaData;
 import org.jabref.preferences.CleanupPreferences;
 import org.jabref.preferences.FilePreferences;
-
 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;
-
 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.
@@ -62,34 +62,55 @@ void setUp(@TempDir Path bibFolder) throws IOException {
 
         MetaData metaData = new MetaData();
         metaData.setDefaultFileDirectory(pdfPath.toAbsolutePath().toString());
-        BibDatabaseContext context = new BibDatabaseContext(new BibDatabase(), metaData);
+        BibDatabaseContext context = new BibDatabaseContext(
+            new BibDatabase(),
+            metaData
+        );
         Files.createFile(bibFolder.resolve("test.bib"));
         context.setDatabasePath(bibFolder.resolve("test.bib"));
 
-        FilePreferences fileDirPrefs = mock(FilePreferences.class, Answers.RETURNS_SMART_NULLS);
+        FilePreferences fileDirPrefs = mock(
+            FilePreferences.class,
+            Answers.RETURNS_SMART_NULLS
+        );
         // Search and store files relative to bib file overwrites all other dirs
         when(fileDirPrefs.shouldStoreFilesRelativeToBibFile()).thenReturn(true);
 
-        worker = new CleanupWorker(context, fileDirPrefs, mock(TimestampPreferences.class));
+        worker =
+            new CleanupWorker(
+                context,
+                fileDirPrefs,
+                mock(TimestampPreferences.class)
+            );
     }
 
     @Test
     void cleanupWithNullPresetThrowsException() {
-        assertThrows(NullPointerException.class, () -> worker.cleanup(null, new BibEntry()));
+        assertThrows(
+            NullPointerException.class,
+            () -> worker.cleanup(null, new BibEntry())
+        );
     }
 
     @Test
     void cleanupNullEntryThrowsException() {
-        assertThrows(NullPointerException.class, () -> worker.cleanup(emptyPreset, null));
+        assertThrows(
+            NullPointerException.class,
+            () -> worker.cleanup(emptyPreset, null)
+        );
     }
 
     @Test
-    void cleanupDoesNothingByDefault(@TempDir Path bibFolder) throws IOException {
+    void cleanupDoesNothingByDefault(@TempDir Path bibFolder)
+        throws IOException {
         BibEntry entry = new BibEntry();
         entry.setCitationKey("Toot");
         entry.setField(StandardField.PDF, "aPdfFile");
         entry.setField(new UnknownField("some"), "1st");
-        entry.setField(StandardField.DOI, "http://dx.doi.org/10.1016/0001-8708(80)90035-3");
+        entry.setField(
+            StandardField.DOI,
+            "http://dx.doi.org/10.1016/0001-8708(80)90035-3"
+        );
         entry.setField(StandardField.MONTH, "01");
         entry.setField(StandardField.PAGES, "1-2");
         entry.setField(StandardField.DATE, "01/1999");
@@ -97,12 +118,18 @@ 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);
         LinkedFile fileField = new LinkedFile("", path.toAbsolutePath(), "");
-        entry.setField(StandardField.FILE, FileFieldWriter.getStringRepresentation(fileField));
+        entry.setField(
+            StandardField.FILE,
+            FileFieldWriter.getStringRepresentation(fileField)
+        );
 
         List<FieldChange> changes = worker.cleanup(emptyPreset, entry);
         assertEquals(Collections.emptyList(), changes);
@@ -110,76 +137,140 @@ 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");
 
         worker.cleanup(preset, entry);
         assertEquals(Optional.empty(), entry.getField(StandardField.PDF));
-        assertEquals(Optional.of("aPdfFile:aPdfFile:PDF"), entry.getField(StandardField.FILE));
+        assertEquals(
+            Optional.of("aPdfFile:aPdfFile:PDF"),
+            entry.getField(StandardField.FILE)
+        );
     }
 
     @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");
 
         worker.cleanup(preset, entry);
         assertEquals(Optional.empty(), entry.getField(StandardField.PDF));
-        assertEquals(Optional.of("aPsFile:aPsFile:PostScript"), entry.getField(StandardField.FILE));
+        assertEquals(
+            Optional.of("aPsFile:aPsFile:PostScript"),
+            entry.getField(StandardField.FILE)
+        );
     }
 
     @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");
+        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");
+        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");
+        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");
+        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");
 
@@ -189,8 +280,17 @@ 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");
 
@@ -200,18 +300,32 @@ 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");
 
         worker.cleanup(preset, entry);
-        assertEquals(Optional.of("1999-01"), entry.getField(StandardField.DATE));
+        assertEquals(
+            Optional.of("1999-01"),
+            entry.getField(StandardField.DATE)
+        );
     }
 
     @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::");
 
@@ -220,67 +334,121 @@ void cleanupFixFileLinksMovesSingleDescriptionToLink() {
     }
 
     @Test
-    void cleanupMoveFilesMovesFileFromSubfolder(@TempDir Path bibFolder) throws IOException {
-        CleanupPreferences preset = new CleanupPreferences(CleanupPreferences.CleanupStep.MOVE_PDF);
+    void cleanupMoveFilesMovesFileFromSubfolder(@TempDir Path bibFolder)
+        throws IOException {
+        CleanupPreferences preset = new CleanupPreferences(
+            CleanupPreferences.CleanupStep.MOVE_PDF
+        );
 
         Path path = bibFolder.resolve("AnotherRandomlyNamedFolder");
         Files.createDirectory(path);
         Path tempFile = Files.createFile(path.resolve("test.pdf"));
         BibEntry entry = new BibEntry();
-        LinkedFile fileField = new LinkedFile("", tempFile.toAbsolutePath(), "");
-        entry.setField(StandardField.FILE, FileFieldWriter.getStringRepresentation(fileField));
+        LinkedFile fileField = new LinkedFile(
+            "",
+            tempFile.toAbsolutePath(),
+            ""
+        );
+        entry.setField(
+            StandardField.FILE,
+            FileFieldWriter.getStringRepresentation(fileField)
+        );
 
         worker.cleanup(preset, entry);
-        LinkedFile newFileField = new LinkedFile("", tempFile.getFileName(), "");
-        assertEquals(Optional.of(FileFieldWriter.getStringRepresentation(newFileField)), entry.getField(StandardField.FILE));
+        LinkedFile newFileField = new LinkedFile(
+            "",
+            tempFile.getFileName(),
+            ""
+        );
+        assertEquals(
+            Optional.of(FileFieldWriter.getStringRepresentation(newFileField)),
+            entry.getField(StandardField.FILE)
+        );
     }
 
     @Test
-    void cleanupRelativePathsConvertAbsoluteToRelativePath() throws IOException {
-        CleanupPreferences preset = new CleanupPreferences(CleanupPreferences.CleanupStep.MAKE_PATHS_RELATIVE);
+    void cleanupRelativePathsConvertAbsoluteToRelativePath()
+        throws IOException {
+        CleanupPreferences preset = new CleanupPreferences(
+            CleanupPreferences.CleanupStep.MAKE_PATHS_RELATIVE
+        );
 
         Path path = pdfPath.resolve("AnotherRandomlyNamedFile");
         Files.createFile(path);
         BibEntry entry = new BibEntry();
         LinkedFile fileField = new LinkedFile("", path.toAbsolutePath(), "");
-        entry.setField(StandardField.FILE, FileFieldWriter.getStringRepresentation(fileField));
+        entry.setField(
+            StandardField.FILE,
+            FileFieldWriter.getStringRepresentation(fileField)
+        );
 
         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));
+        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;");
 
         worker.cleanup(preset, entry);
-        assertEquals(Optional.of("{{$\\Epsilon$}}"), entry.getField(StandardField.TITLE));
+        assertEquals(
+            Optional.of("{{$\\Epsilon$}}"),
+            entry.getField(StandardField.TITLE)
+        );
     }
 
     @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");
 
@@ -291,55 +459,106 @@ void cleanupUnitsConvertsOneAmpereToLatex() {
     @Test
     void cleanupCasesAddsBracketAroundAluminiumGalliumArsenid() {
         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)))));
+            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)
+                    )
+                )
+            )
+        );
         BibEntry entry = new BibEntry();
         entry.setField(StandardField.TITLE, "AlGaAs");
 
         worker.cleanup(preset, entry);
-        assertEquals(Optional.of("{AlGaAs}"), entry.getField(StandardField.TITLE));
+        assertEquals(
+            Optional.of("{AlGaAs}"),
+            entry.getField(StandardField.TITLE)
+        );
     }
 
     @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$");
 
         worker.cleanup(preset, entry);
-        assertEquals(Optional.of("$\\alpha\\beta$"), entry.getField(StandardField.TITLE));
+        assertEquals(
+            Optional.of("$\\alpha\\beta$"),
+            entry.getField(StandardField.TITLE)
+        );
     }
 
     @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");
 
         worker.cleanup(preset, entry);
         assertEquals(Optional.empty(), entry.getField(StandardField.ADDRESS));
-        assertEquals(Optional.of("test"), entry.getField(StandardField.LOCATION));
+        assertEquals(
+            Optional.of("test"),
+            entry.getField(StandardField.LOCATION)
+        );
     }
 
     @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");
 
         worker.cleanup(preset, entry);
         assertEquals(Optional.empty(), entry.getField(StandardField.JOURNAL));
-        assertEquals(Optional.of("test"), entry.getField(StandardField.JOURNALTITLE));
+        assertEquals(
+            Optional.of("test"),
+            entry.getField(StandardField.JOURNALTITLE)
+        );
     }
 
     @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 2208a000130..8bf3d72df35 100644
--- a/src/test/java/org/jabref/logic/cleanup/ConvertToBiblatexCleanupTest.java
+++ b/src/test/java/org/jabref/logic/cleanup/ConvertToBiblatexCleanupTest.java
@@ -1,15 +1,13 @@
 package org.jabref.logic.cleanup;
 
-import java.util.Optional;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
+import java.util.Optional;
 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;
-
 public class ConvertToBiblatexCleanupTest {
 
     private ConvertToBiblatexCleanup worker;
@@ -29,7 +27,10 @@ public void cleanupMovesYearMonthToDate() {
 
         assertEquals(Optional.empty(), entry.getField(StandardField.YEAR));
         assertEquals(Optional.empty(), entry.getField(StandardField.MONTH));
-        assertEquals(Optional.of("2011-01"), entry.getField(StandardField.DATE));
+        assertEquals(
+            Optional.of("2011-01"),
+            entry.getField(StandardField.DATE)
+        );
     }
 
     @Test
@@ -43,7 +44,10 @@ public void cleanupWithDateAlreadyPresentAndDifferentFromYearDoesNothing() {
 
         assertEquals(Optional.of("2011"), entry.getField(StandardField.YEAR));
         assertEquals(Optional.of("#jan#"), entry.getField(StandardField.MONTH));
-        assertEquals(Optional.of("2012-01"), entry.getField(StandardField.DATE));
+        assertEquals(
+            Optional.of("2012-01"),
+            entry.getField(StandardField.DATE)
+        );
     }
 
     @Test
@@ -57,7 +61,10 @@ public void cleanupWithDateAlreadyPresentAndDifferentFromMonthDoesNothing() {
 
         assertEquals(Optional.of("2011"), entry.getField(StandardField.YEAR));
         assertEquals(Optional.of("#jan#"), entry.getField(StandardField.MONTH));
-        assertEquals(Optional.of("2011-02"), entry.getField(StandardField.DATE));
+        assertEquals(
+            Optional.of("2011-02"),
+            entry.getField(StandardField.DATE)
+        );
     }
 
     @Test
@@ -85,16 +92,23 @@ public void cleanupWithDateAlreadyPresentAndEqualsToYearAndMonth() {
 
         assertEquals(Optional.empty(), entry.getField(StandardField.YEAR));
         assertEquals(Optional.empty(), entry.getField(StandardField.MONTH));
-        assertEquals(Optional.of("2011-01"), entry.getField(StandardField.DATE));
+        assertEquals(
+            Optional.of("2011-01"),
+            entry.getField(StandardField.DATE)
+        );
     }
 
     @Test
     public void cleanupMovesJournalToJournaltitle() {
-        BibEntry entry = new BibEntry().withField(StandardField.JOURNAL, "Best of JabRef");
+        BibEntry entry = new BibEntry()
+            .withField(StandardField.JOURNAL, "Best of JabRef");
 
         worker.cleanup(entry);
 
         assertEquals(Optional.empty(), entry.getField(StandardField.JOURNAL));
-        assertEquals(Optional.of("Best of JabRef"), entry.getField(StandardField.JOURNALTITLE));
+        assertEquals(
+            Optional.of("Best of JabRef"),
+            entry.getField(StandardField.JOURNALTITLE)
+        );
     }
 }
diff --git a/src/test/java/org/jabref/logic/cleanup/ConvertToBibtexCleanupTest.java b/src/test/java/org/jabref/logic/cleanup/ConvertToBibtexCleanupTest.java
index 38259aaef2f..9c8fdced1b1 100644
--- a/src/test/java/org/jabref/logic/cleanup/ConvertToBibtexCleanupTest.java
+++ b/src/test/java/org/jabref/logic/cleanup/ConvertToBibtexCleanupTest.java
@@ -1,15 +1,13 @@
 package org.jabref.logic.cleanup;
 
-import java.util.Optional;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
+import java.util.Optional;
 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;
-
 public class ConvertToBibtexCleanupTest {
 
     private ConvertToBibtexCleanup worker;
@@ -21,7 +19,8 @@ public void setUp() {
 
     @Test
     public void cleanupMovesDateToYearAndMonth() {
-        BibEntry entry = new BibEntry().withField(StandardField.DATE, "2011-01");
+        BibEntry entry = new BibEntry()
+            .withField(StandardField.DATE, "2011-01");
 
         worker.cleanup(entry);
 
@@ -44,21 +43,33 @@ public void cleanupWithYearAlreadyPresentDoesNothing() {
 
     @Test
     public void cleanupMovesJournaltitleToJournal() {
-        BibEntry entry = new BibEntry().withField(StandardField.JOURNALTITLE, "Best of JabRef");
+        BibEntry entry = new BibEntry()
+            .withField(StandardField.JOURNALTITLE, "Best of JabRef");
 
         worker.cleanup(entry);
 
-        assertEquals(Optional.empty(), entry.getField(StandardField.JOURNALTITLE));
-        assertEquals(Optional.of("Best of JabRef"), entry.getField(StandardField.JOURNAL));
+        assertEquals(
+            Optional.empty(),
+            entry.getField(StandardField.JOURNALTITLE)
+        );
+        assertEquals(
+            Optional.of("Best of JabRef"),
+            entry.getField(StandardField.JOURNAL)
+        );
     }
 
     @Test
     public void cleanUpDoesntMoveFileField() {
-        String fileField = ":Ambriola2006 - On the Systematic Analysis of Natural Language Requirements with CIRCE.pdf:PDF";
-        BibEntry entry = new BibEntry().withField(StandardField.FILE, fileField);
+        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);
 
-        assertEquals(Optional.of(fileField), entry.getField(StandardField.FILE));
+        assertEquals(
+            Optional.of(fileField),
+            entry.getField(StandardField.FILE)
+        );
     }
 }
diff --git a/src/test/java/org/jabref/logic/cleanup/DoiCleanupTest.java b/src/test/java/org/jabref/logic/cleanup/DoiCleanupTest.java
index 10373808718..ae63b5150b0 100644
--- a/src/test/java/org/jabref/logic/cleanup/DoiCleanupTest.java
+++ b/src/test/java/org/jabref/logic/cleanup/DoiCleanupTest.java
@@ -1,17 +1,15 @@
 package org.jabref.logic.cleanup;
 
-import java.util.stream.Stream;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
+import java.util.stream.Stream;
 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;
-
 public class DoiCleanupTest {
 
     @ParameterizedTest
@@ -25,47 +23,86 @@ public void testChangeDoi(BibEntry expected, BibEntry doiInfoField) {
 
     private static Stream<Arguments> provideDoiForAllLowers() {
         UnknownField unknownField = new UnknownField("ee");
-        BibEntry doiResult = new BibEntry().withField(StandardField.DOI, "10.1145/2594455");
+        BibEntry doiResult = new BibEntry()
+            .withField(StandardField.DOI, "10.1145/2594455");
 
         return Stream.of(
-                // cleanup for Doi field only
-                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")),
-
-                // 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"),
-                        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")),
-
-                // cleanup with spaced Doi
-                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")),
-
-                // cleanup just ee field with URL
-                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")));
-            }
+            // cleanup for Doi field only
+            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")
+            ),
+            // 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"
+                    ),
+                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"
+                    )
+            ),
+            // cleanup with spaced Doi
+            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"
+                    )
+            ),
+            // cleanup just ee field with URL
+            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"
+                    )
+            )
+        );
+    }
 }
diff --git a/src/test/java/org/jabref/logic/cleanup/DoiDecodeCleanupTest.java b/src/test/java/org/jabref/logic/cleanup/DoiDecodeCleanupTest.java
index b07904b2719..2b66034374b 100644
--- a/src/test/java/org/jabref/logic/cleanup/DoiDecodeCleanupTest.java
+++ b/src/test/java/org/jabref/logic/cleanup/DoiDecodeCleanupTest.java
@@ -1,17 +1,15 @@
 package org.jabref.logic.cleanup;
 
-import java.util.stream.Stream;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
+import java.util.stream.Stream;
 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;
-
 public class DoiDecodeCleanupTest {
 
     @ParameterizedTest
@@ -25,42 +23,90 @@ public void testChangeDoi(BibEntry expected, BibEntry doiInfoField) {
 
     private static Stream<Arguments> provideDoiForAllLowers() {
         UnknownField unknownField = new UnknownField("ee");
-        BibEntry doiResult = new BibEntry().withField(StandardField.DOI, "10.18726/2018_3");
+        BibEntry doiResult = new BibEntry()
+            .withField(StandardField.DOI, "10.18726/2018_3");
 
         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")),
-
-                // 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")),
-
-                // 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"),
-                        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")),
-
-                // cleanup with spaced Doi
-                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")),
-
-                // cleanup just ee field with URL
-                Arguments.of(doiResult, new BibEntry()
-                        .withField(unknownField, "https://doi.org/10.18726/2018%7B%5Ctextunderscore%7D3"))
+            // cleanup for Doi field only
+            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"
+                    )
+            ),
+            // 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"
+                    ),
+                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"
+                    )
+            ),
+            // cleanup with spaced Doi
+            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"
+                    )
+            ),
+            // cleanup just ee field with URL
+            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 d27a98e59fa..8e0efa38b53 100644
--- a/src/test/java/org/jabref/logic/cleanup/EprintCleanupTest.java
+++ b/src/test/java/org/jabref/logic/cleanup/EprintCleanupTest.java
@@ -1,26 +1,25 @@
 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");
+            .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");
+            .withField(StandardField.EPRINT, "1502.05795")
+            .withField(StandardField.EPRINTCLASS, "math")
+            .withField(StandardField.EPRINTTYPE, "arxiv");
 
         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 27cbd8d322d..29766a952c0 100644
--- a/src/test/java/org/jabref/logic/cleanup/FieldFormatterCleanupTest.java
+++ b/src/test/java/org/jabref/logic/cleanup/FieldFormatterCleanupTest.java
@@ -1,8 +1,9 @@
 package org.jabref.logic.cleanup;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
 import java.util.HashMap;
 import java.util.Map;
-
 import org.jabref.logic.formatter.bibtexfields.UnicodeToLatexFormatter;
 import org.jabref.logic.formatter.casechanger.UpperCaseFormatter;
 import org.jabref.model.entry.BibEntry;
@@ -10,12 +11,9 @@
 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;
-
 public class FieldFormatterCleanupTest {
 
     private BibEntry entry;
@@ -39,56 +37,122 @@ public void setUp() {
 
     @Test
     public void testInternalAllField() 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
     public void testInternalAllTextFieldsField() 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.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.DOI), entry.getField(StandardField.DOI).get());
-        assertEquals(fieldMap.get(StandardField.ISSN), 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),
+            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.DOI),
+            entry.getField(StandardField.DOI).get()
+        );
+        assertEquals(
+            fieldMap.get(StandardField.ISSN),
+            entry.getField(StandardField.ISSN).get()
+        );
     }
 
     @Test
     public void testCleanupAllFieldsIgnoresKeyField() throws Exception {
-        FieldFormatterCleanup cleanup = new FieldFormatterCleanup(InternalField.INTERNAL_ALL_FIELD, new UnicodeToLatexFormatter());
+        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());
+        assertEquals(
+            "François-Marie Arouet",
+            entry.getField(InternalField.KEY_FIELD).get()
+        );
     }
 
     @Test
     public void testCleanupAllTextFieldsIgnoresKeyField() throws Exception {
-        FieldFormatterCleanup cleanup = new FieldFormatterCleanup(InternalField.INTERNAL_ALL_TEXT_FIELDS_FIELD, new UnicodeToLatexFormatter());
+        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());
+        assertEquals(
+            "François-Marie Arouet",
+            entry.getField(InternalField.KEY_FIELD).get()
+        );
     }
 
     @Test
     public void testCleanupKeyFieldCleansUpKeyField() throws Exception {
-        FieldFormatterCleanup cleanup = new FieldFormatterCleanup(InternalField.KEY_FIELD, new UnicodeToLatexFormatter());
+        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());
+        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 b6737e8c924..20d68b591a6 100644
--- a/src/test/java/org/jabref/logic/cleanup/FieldFormatterCleanupsTest.java
+++ b/src/test/java/org/jabref/logic/cleanup/FieldFormatterCleanupsTest.java
@@ -1,11 +1,12 @@
 package org.jabref.logic.cleanup;
 
+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 org.jabref.logic.formatter.IdentityFormatter;
 import org.jabref.logic.formatter.bibtexfields.EscapeAmpersandsFormatter;
 import org.jabref.logic.formatter.bibtexfields.EscapeDollarSignFormatter;
@@ -20,127 +21,245 @@
 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 static org.junit.jupiter.api.Assertions.assertEquals;
-
 public class FieldFormatterCleanupsTest {
 
     private BibEntry entry;
 
     @BeforeEach
     public void setUp() {
-        entry = new BibEntry(StandardEntryType.InProceedings)
+        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.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.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
     public void checkSimpleUseCase() {
-        FieldFormatterCleanups actions = new FieldFormatterCleanups(true, FieldFormatterCleanups.parse("title[identity]"));
-
-        FieldFormatterCleanup identityInTitle = new FieldFormatterCleanup(StandardField.TITLE, new IdentityFormatter());
-        assertEquals(Collections.singletonList(identityInTitle), actions.getConfiguredActions());
+        FieldFormatterCleanups actions = new FieldFormatterCleanups(
+            true,
+            FieldFormatterCleanups.parse("title[identity]")
+        );
+
+        FieldFormatterCleanup identityInTitle = new FieldFormatterCleanup(
+            StandardField.TITLE,
+            new IdentityFormatter()
+        );
+        assertEquals(
+            Collections.singletonList(identityInTitle),
+            actions.getConfiguredActions()
+        );
 
         actions.applySaveActions(entry);
 
-        assertEquals(Optional.of("Educational session 1"), entry.getField(StandardField.TITLE));
+        assertEquals(
+            Optional.of("Educational session 1"),
+            entry.getField(StandardField.TITLE)
+        );
     }
 
     @Test
     public void invalidSaveActionSting() {
-        FieldFormatterCleanups actions = new FieldFormatterCleanups(true, FieldFormatterCleanups.parse("title"));
+        FieldFormatterCleanups actions = new FieldFormatterCleanups(
+            true,
+            FieldFormatterCleanups.parse("title")
+        );
 
         assertEquals(Collections.emptyList(), actions.getConfiguredActions());
 
         actions.applySaveActions(entry);
 
-        assertEquals(Optional.of("Educational session 1"), entry.getField(StandardField.TITLE));
+        assertEquals(
+            Optional.of("Educational session 1"),
+            entry.getField(StandardField.TITLE)
+        );
     }
 
     @Test
     public void checkLowerCaseSaveAction() {
-        FieldFormatterCleanups actions = new FieldFormatterCleanups(true, FieldFormatterCleanups.parse("title[lower_case]"));
-
-        FieldFormatterCleanup lowerCaseTitle = new FieldFormatterCleanup(StandardField.TITLE, new LowerCaseFormatter());
-        assertEquals(Collections.singletonList(lowerCaseTitle), actions.getConfiguredActions());
+        FieldFormatterCleanups actions = new FieldFormatterCleanups(
+            true,
+            FieldFormatterCleanups.parse("title[lower_case]")
+        );
+
+        FieldFormatterCleanup lowerCaseTitle = new FieldFormatterCleanup(
+            StandardField.TITLE,
+            new LowerCaseFormatter()
+        );
+        assertEquals(
+            Collections.singletonList(lowerCaseTitle),
+            actions.getConfiguredActions()
+        );
 
         actions.applySaveActions(entry);
 
-        assertEquals(Optional.of("educational session 1"), entry.getField(StandardField.TITLE));
+        assertEquals(
+            Optional.of("educational session 1"),
+            entry.getField(StandardField.TITLE)
+        );
     }
 
     @Test
     public 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);
 
-        assertEquals(Optional.of("educational session 1"), entry.getField(StandardField.TITLE));
+        assertEquals(
+            Optional.of("educational session 1"),
+            entry.getField(StandardField.TITLE)
+        );
     }
 
     @Test
     public 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);
 
-        assertEquals(Optional.of("educational session 1"), entry.getField(StandardField.TITLE));
+        assertEquals(
+            Optional.of("educational session 1"),
+            entry.getField(StandardField.TITLE)
+        );
     }
 
     @Test
     public void checkMultipleSaveActions() {
-        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());
-        assertEquals(Arrays.asList(normalizePages, lowerCaseTitle), formatterCleanups);
+        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()
+        );
+        assertEquals(
+            Arrays.asList(normalizePages, lowerCaseTitle),
+            formatterCleanups
+        );
 
         actions.applySaveActions(entry);
 
-        assertEquals(Optional.of("educational session 1"), entry.getField(StandardField.TITLE));
+        assertEquals(
+            Optional.of("educational session 1"),
+            entry.getField(StandardField.TITLE)
+        );
         assertEquals(Optional.of("1--7"), entry.getField(StandardField.PAGES));
     }
 
     @Test
     public void checkMultipleSaveActionsWithMultipleFormatters() {
-        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);
+        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
+        );
 
         actions.applySaveActions(entry);
 
-        assertEquals(Optional.of("educational session 1"), entry.getField(StandardField.TITLE));
+        assertEquals(
+            Optional.of("educational session 1"),
+            entry.getField(StandardField.TITLE)
+        );
         assertEquals(Optional.of("1--7"), entry.getField(StandardField.PAGES));
     }
 
     @Test
     public 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));
@@ -148,7 +267,9 @@ public 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]
@@ -156,16 +277,50 @@ void parserKeepsSaveActions() {
                 publisher[escapeAmpersands,escapeDollarSign,escapeUnderscores,latex_cleanup]
                 journal[escapeAmpersands,escapeDollarSign,escapeUnderscores,latex_cleanup]
                 abstract[escapeAmpersands,escapeDollarSign,escapeUnderscores,latex_cleanup]
-                """);
+                """
+            );
 
         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)) {
-            expected.add(new FieldFormatterCleanup(field, new EscapeAmpersandsFormatter()));
-            expected.add(new FieldFormatterCleanup(field, new EscapeDollarSignFormatter()));
-            expected.add(new FieldFormatterCleanup(field, new EscapeUnderscoresFormatter()));
-            expected.add(new FieldFormatterCleanup(field, new LatexCleanupFormatter()));
+        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
+        )) {
+            expected.add(
+                new FieldFormatterCleanup(
+                    field,
+                    new EscapeAmpersandsFormatter()
+                )
+            );
+            expected.add(
+                new FieldFormatterCleanup(
+                    field,
+                    new EscapeDollarSignFormatter()
+                )
+            );
+            expected.add(
+                new FieldFormatterCleanup(
+                    field,
+                    new EscapeUnderscoresFormatter()
+                )
+            );
+            expected.add(
+                new FieldFormatterCleanup(field, new LatexCleanupFormatter())
+            );
         }
 
         assertEquals(expected, fieldFormatterCleanups);
@@ -173,103 +328,204 @@ 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())),
-                fieldFormatterCleanups);
+            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())
+            List.of(
+                new FieldFormatterCleanup(
+                    StandardField.TITLE,
+                    new EscapeUnderscoresFormatter()
                 ),
-                fieldFormatterCleanups);
+                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())
+            List.of(
+                new FieldFormatterCleanup(
+                    StandardField.TITLE,
+                    new EscapeAmpersandsFormatter()
+                ),
+                new FieldFormatterCleanup(
+                    StandardField.TITLE,
+                    new EscapeDollarSignFormatter()
                 ),
-                fieldFormatterCleanups);
+                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 LatexCleanupFormatter()),
-                        new FieldFormatterCleanup(StandardField.BOOKTITLE, new EscapeAmpersandsFormatter()),
-                        new FieldFormatterCleanup(StandardField.BOOKTITLE, new EscapeDollarSignFormatter())
+            List.of(
+                new FieldFormatterCleanup(
+                    StandardField.TITLE,
+                    new EscapeUnderscoresFormatter()
+                ),
+                new FieldFormatterCleanup(
+                    StandardField.TITLE,
+                    new LatexCleanupFormatter()
+                ),
+                new FieldFormatterCleanup(
+                    StandardField.BOOKTITLE,
+                    new EscapeAmpersandsFormatter()
                 ),
-                fieldFormatterCleanups);
+                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())
+            List.of(
+                new FieldFormatterCleanup(
+                    StandardField.PAGES,
+                    new NormalizePagesFormatter()
                 ),
-                fieldFormatterCleanups);
+                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.TITLE, new LatexCleanupFormatter()),
-                        new FieldFormatterCleanup(StandardField.BOOKTITLE, new EscapeAmpersandsFormatter()),
-                        new FieldFormatterCleanup(StandardField.BOOKTITLE, new EscapeDollarSignFormatter())
+            List.of(
+                new FieldFormatterCleanup(
+                    StandardField.PAGES,
+                    new NormalizePagesFormatter()
+                ),
+                new FieldFormatterCleanup(
+                    StandardField.TITLE,
+                    new EscapeUnderscoresFormatter()
+                ),
+                new FieldFormatterCleanup(
+                    StandardField.TITLE,
+                    new LatexCleanupFormatter()
                 ),
-                fieldFormatterCleanups);
+                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]
-                """);
+                """
+            );
 
         List<FieldFormatterCleanup> expected = new ArrayList<>(30);
-        for (Field field : List.of(StandardField.TITLE, StandardField.BOOKTITLE)) {
-            expected.add(new FieldFormatterCleanup(field, new EscapeAmpersandsFormatter()));
-            expected.add(new FieldFormatterCleanup(field, new EscapeUnderscoresFormatter()));
-            expected.add(new FieldFormatterCleanup(field, new LatexCleanupFormatter()));
+        for (Field field : List.of(
+            StandardField.TITLE,
+            StandardField.BOOKTITLE
+        )) {
+            expected.add(
+                new FieldFormatterCleanup(
+                    field,
+                    new EscapeAmpersandsFormatter()
+                )
+            );
+            expected.add(
+                new FieldFormatterCleanup(
+                    field,
+                    new EscapeUnderscoresFormatter()
+                )
+            );
+            expected.add(
+                new FieldFormatterCleanup(field, new LatexCleanupFormatter())
+            );
         }
 
         assertEquals(expected, fieldFormatterCleanups);
@@ -277,60 +533,114 @@ 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 LatexCleanupFormatter()),
-                        new FieldFormatterCleanup(StandardField.BOOKTITLE, new EscapeAmpersandsFormatter()),
-                        new FieldFormatterCleanup(StandardField.BOOKTITLE, new EscapeUnderscoresFormatter()),
-                        new FieldFormatterCleanup(StandardField.BOOKTITLE, new LatexCleanupFormatter())
+            List.of(
+                new FieldFormatterCleanup(
+                    StandardField.TITLE,
+                    new EscapeUnderscoresFormatter()
+                ),
+                new FieldFormatterCleanup(
+                    StandardField.TITLE,
+                    new LatexCleanupFormatter()
+                ),
+                new FieldFormatterCleanup(
+                    StandardField.BOOKTITLE,
+                    new EscapeAmpersandsFormatter()
                 ),
-                fieldFormatterCleanups);
+                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 LatexCleanupFormatter()),
-                        new FieldFormatterCleanup(StandardField.BOOKTITLE, new EscapeAmpersandsFormatter()),
-                        new FieldFormatterCleanup(StandardField.BOOKTITLE, new LatexCleanupFormatter())
+            List.of(
+                new FieldFormatterCleanup(
+                    StandardField.TITLE,
+                    new EscapeAmpersandsFormatter()
+                ),
+                new FieldFormatterCleanup(
+                    StandardField.TITLE,
+                    new EscapeUnderscoresFormatter()
+                ),
+                new FieldFormatterCleanup(
+                    StandardField.TITLE,
+                    new LatexCleanupFormatter()
                 ),
-                fieldFormatterCleanups);
+                new FieldFormatterCleanup(
+                    StandardField.BOOKTITLE,
+                    new EscapeAmpersandsFormatter()
+                ),
+                new FieldFormatterCleanup(
+                    StandardField.BOOKTITLE,
+                    new LatexCleanupFormatter()
+                )
+            ),
+            fieldFormatterCleanups
+        );
     }
 
     @Test
     void getMetaDataStringWorks() {
-        assertEquals("""
-                pages[normalize_page_numbers]
-                date[normalize_date]
-                month[normalize_month]
-                all-text-fields[replace_unicode_ligatures]
-                """, FieldFormatterCleanups.getMetaDataString(FieldFormatterCleanups.DEFAULT_SAVE_ACTIONS, "\n"));
+        assertEquals(
+            """
+            pages[normalize_page_numbers]
+            date[normalize_date]
+            month[normalize_month]
+            all-text-fields[replace_unicode_ligatures]
+            """,
+            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]
                 all-text-fields[replace_unicode_ligatures]
-                """));
+                """
+            )
+        );
     }
 
     @Test
     void formatterFromString() {
-        assertEquals(new ReplaceUnicodeLigaturesFormatter(), FieldFormatterCleanups.getFormatterFromString("replace_unicode_ligatures"));
+        assertEquals(
+            new ReplaceUnicodeLigaturesFormatter(),
+            FieldFormatterCleanups.getFormatterFromString(
+                "replace_unicode_ligatures"
+            )
+        );
     }
 }
diff --git a/src/test/java/org/jabref/logic/cleanup/ISSNCleanupTest.java b/src/test/java/org/jabref/logic/cleanup/ISSNCleanupTest.java
index f9745fdfcb9..2a373b4dd36 100644
--- a/src/test/java/org/jabref/logic/cleanup/ISSNCleanupTest.java
+++ b/src/test/java/org/jabref/logic/cleanup/ISSNCleanupTest.java
@@ -1,55 +1,67 @@
 package org.jabref.logic.cleanup;
 
-import java.util.Optional;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.mockito.Mockito.mock;
 
+import java.util.Optional;
 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.jabref.preferences.CleanupPreferences;
 import org.jabref.preferences.FilePreferences;
-
 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;
-
 public class ISSNCleanupTest {
 
     private CleanupWorker worker;
 
     @BeforeEach
     public void setUp() {
-        worker = new CleanupWorker(
+        worker =
+            new CleanupWorker(
                 mock(BibDatabaseContext.class),
                 mock(FilePreferences.class),
-                mock(TimestampPreferences.class));
+                mock(TimestampPreferences.class)
+            );
     }
 
     @Test
     public 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");
 
         worker.cleanup(preset, entry);
-        assertEquals(Optional.of("0123-4567"), entry.getField(StandardField.ISSN));
+        assertEquals(
+            Optional.of("0123-4567"),
+            entry.getField(StandardField.ISSN)
+        );
     }
 
     @Test
     public 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");
 
         worker.cleanup(preset, entry);
-        assertEquals(Optional.of("0123-4567"), entry.getField(StandardField.ISSN));
+        assertEquals(
+            Optional.of("0123-4567"),
+            entry.getField(StandardField.ISSN)
+        );
     }
 
     @Test
     public 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 a9f576d4447..f31910fbece 100644
--- a/src/test/java/org/jabref/logic/cleanup/MoveFilesCleanupTest.java
+++ b/src/test/java/org/jabref/logic/cleanup/MoveFilesCleanupTest.java
@@ -1,5 +1,11 @@
 package org.jabref.logic.cleanup;
 
+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;
@@ -7,7 +13,6 @@
 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.database.BibDatabase;
@@ -17,17 +22,10 @@
 import org.jabref.model.entry.field.StandardField;
 import org.jabref.model.metadata.MetaData;
 import org.jabref.preferences.FilePreferences;
-
 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;
-
 class MoveFilesCleanupTest {
 
     private Path defaultFileFolder;
@@ -50,7 +48,9 @@ void setUp(@TempDir Path bibFolder) throws IOException {
         Files.createFile(fileBefore);
 
         MetaData metaData = new MetaData();
-        metaData.setDefaultFileDirectory(defaultFileFolder.toAbsolutePath().toString());
+        metaData.setDefaultFileDirectory(
+            defaultFileFolder.toAbsolutePath().toString()
+        );
         databaseContext = new BibDatabaseContext(new BibDatabase(), metaData);
         Files.createFile(bibFolder.resolve("test.bib"));
         databaseContext.setDatabasePath(bibFolder.resolve("test.bib"));
@@ -59,11 +59,19 @@ void setUp(@TempDir Path bibFolder) throws IOException {
         entry.setCitationKey("Toot");
         entry.setField(StandardField.TITLE, "test title");
         entry.setField(StandardField.YEAR, "1989");
-        LinkedFile fileField = new LinkedFile("", fileBefore.toAbsolutePath(), "");
-        entry.setField(StandardField.FILE, FileFieldWriter.getStringRepresentation(fileField));
+        LinkedFile fileField = new LinkedFile(
+            "",
+            fileBefore.toAbsolutePath(),
+            ""
+        );
+        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,44 +82,70 @@ void movesFile() {
 
         Path fileAfter = defaultFileFolder.resolve("test.pdf");
         assertEquals(
-                Optional.of(FileFieldWriter.getStringRepresentation(new LinkedFile("", Path.of("test.pdf"), ""))),
-                entry.getField(StandardField.FILE));
+            Optional.of(
+                FileFieldWriter.getStringRepresentation(
+                    new LinkedFile("", Path.of("test.pdf"), "")
+                )
+            ),
+            entry.getField(StandardField.FILE)
+        );
         assertFalse(Files.exists(fileBefore));
         assertTrue(Files.exists(fileAfter));
     }
 
     @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(""), ""))));
+        LinkedFile fileField = new LinkedFile(
+            "",
+            fileBefore.toAbsolutePath(),
+            ""
+        );
+        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(""), "")))),
-                entry.getField(StandardField.FILE));
+            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));
     }
 
     @Test
     void movesFileWithFileDirPattern() {
-        when(filePreferences.getFileDirectoryPattern()).thenReturn("[entrytype]");
+        when(filePreferences.getFileDirectoryPattern())
+            .thenReturn("[entrytype]");
         cleanup.cleanup(entry);
 
         Path fileAfter = defaultFileFolder.resolve("Misc").resolve("test.pdf");
         assertEquals(
-                Optional.of(FileFieldWriter.getStringRepresentation(new LinkedFile("", Path.of("Misc/test.pdf"), ""))),
-                entry.getField(StandardField.FILE));
+            Optional.of(
+                FileFieldWriter.getStringRepresentation(
+                    new LinkedFile("", Path.of("Misc/test.pdf"), "")
+                )
+            ),
+            entry.getField(StandardField.FILE)
+        );
         assertFalse(Files.exists(fileBefore));
         assertTrue(Files.exists(fileAfter));
     }
@@ -123,21 +157,35 @@ void doesNotMoveFileWithEmptyFileDirPattern() {
 
         Path fileAfter = defaultFileFolder.resolve("test.pdf");
         assertEquals(
-                Optional.of(FileFieldWriter.getStringRepresentation(new LinkedFile("", Path.of("test.pdf"), ""))),
-                entry.getField(StandardField.FILE));
+            Optional.of(
+                FileFieldWriter.getStringRepresentation(
+                    new LinkedFile("", Path.of("test.pdf"), "")
+                )
+            ),
+            entry.getField(StandardField.FILE)
+        );
         assertFalse(Files.exists(fileBefore));
         assertTrue(Files.exists(fileAfter));
     }
 
     @Test
     void movesFileWithSubdirectoryPattern() {
-        when(filePreferences.getFileDirectoryPattern()).thenReturn("[entrytype]/[year]/[auth]");
+        when(filePreferences.getFileDirectoryPattern())
+            .thenReturn("[entrytype]/[year]/[auth]");
         cleanup.cleanup(entry);
 
-        Path fileAfter = defaultFileFolder.resolve("Misc").resolve("1989").resolve("test.pdf");
+        Path fileAfter = defaultFileFolder
+            .resolve("Misc")
+            .resolve("1989")
+            .resolve("test.pdf");
         assertEquals(
-                Optional.of(FileFieldWriter.getStringRepresentation(new LinkedFile("", Path.of("Misc/1989/test.pdf"), ""))),
-                entry.getField(StandardField.FILE));
+            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/RenamePdfCleanupTest.java b/src/test/java/org/jabref/logic/cleanup/RenamePdfCleanupTest.java
index 2ddfee970d5..e2406d95e6f 100644
--- a/src/test/java/org/jabref/logic/cleanup/RenamePdfCleanupTest.java
+++ b/src/test/java/org/jabref/logic/cleanup/RenamePdfCleanupTest.java
@@ -1,11 +1,14 @@
 package org.jabref.logic.cleanup;
 
+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;
-
 import org.jabref.logic.bibtex.FileFieldWriter;
 import org.jabref.model.database.BibDatabase;
 import org.jabref.model.database.BibDatabaseContext;
@@ -14,15 +17,10 @@
 import org.jabref.model.entry.field.StandardField;
 import org.jabref.model.metadata.MetaData;
 import org.jabref.preferences.FilePreferences;
-
 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;
-
 class RenamePdfCleanupTest {
 
     private BibEntry entry;
@@ -38,14 +36,18 @@ void setUp(@TempDir Path testFolder) {
         this.testFolder = testFolder;
         Path path = testFolder.resolve("test.bib");
         MetaData metaData = new MetaData();
-        BibDatabaseContext context = new BibDatabaseContext(new BibDatabase(), metaData);
+        BibDatabaseContext context = new BibDatabaseContext(
+            new BibDatabase(),
+            metaData
+        );
         context.setDatabasePath(path);
 
         entry = new BibEntry();
         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);
     }
 
@@ -53,18 +55,25 @@ void setUp(@TempDir Path testFolder) {
      * Test for #466
      */
     @Test
-    void cleanupRenamePdfRenamesFileEvenIfOnlyDifferenceIsCase() throws IOException {
+    void cleanupRenamePdfRenamesFileEvenIfOnlyDifferenceIsCase()
+        throws IOException {
         Path path = testFolder.resolve("toot.tmp");
         Files.createFile(path);
 
         LinkedFile fileField = new LinkedFile("", path.toAbsolutePath(), "");
-        entry.setField(StandardField.FILE, FileFieldWriter.getStringRepresentation(fileField));
+        entry.setField(
+            StandardField.FILE,
+            FileFieldWriter.getStringRepresentation(fileField)
+        );
 
         when(filePreferences.getFileNamePattern()).thenReturn("[citationkey]");
         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,37 +82,65 @@ void cleanupRenamePdfRenamesWithMultipleFiles() throws IOException {
         Files.createFile(path);
 
         entry.setField(StandardField.TITLE, "test title");
-        entry.setField(StandardField.FILE, FileFieldWriter.getStringRepresentation(
+        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]");
+                    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(
+        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));
+                        new LinkedFile(
+                            "",
+                            Path.of("Toot - test title.tmp"),
+                            ""
+                        ),
+                        new LinkedFile("", Path.of(""), "")
+                    )
+                )
+            ),
+            entry.getField(StandardField.FILE)
+        );
     }
 
     @Test
-    void cleanupRenamePdfRenamesFileStartingWithCitationKey() throws IOException {
+    void cleanupRenamePdfRenamesFileStartingWithCitationKey()
+        throws IOException {
         Path path = testFolder.resolve("Toot.tmp");
         Files.createFile(path);
 
         LinkedFile fileField = new LinkedFile("", path.toAbsolutePath(), "");
-        entry.setField(StandardField.FILE, FileFieldWriter.getStringRepresentation(fileField));
+        entry.setField(
+            StandardField.FILE,
+            FileFieldWriter.getStringRepresentation(fileField)
+        );
         entry.setField(StandardField.TITLE, "test title");
 
-        when(filePreferences.getFileNamePattern()).thenReturn("[citationkey] - [fulltitle]");
+        when(filePreferences.getFileNamePattern())
+            .thenReturn("[citationkey] - [fulltitle]");
         cleanup.cleanup(entry);
 
-        LinkedFile newFileField = new LinkedFile("", Path.of("Toot - test title.tmp"), "");
-        assertEquals(Optional.of(FileFieldWriter.getStringRepresentation(newFileField)), entry.getField(StandardField.FILE));
+        LinkedFile newFileField = new LinkedFile(
+            "",
+            Path.of("Toot - test title.tmp"),
+            ""
+        );
+        assertEquals(
+            Optional.of(FileFieldWriter.getStringRepresentation(newFileField)),
+            entry.getField(StandardField.FILE)
+        );
     }
 
     @Test
@@ -111,13 +148,24 @@ void cleanupRenamePdfRenamesFileInSameFolder() throws IOException {
         Path path = testFolder.resolve("Toot.pdf");
         Files.createFile(path);
         LinkedFile fileField = new LinkedFile("", Path.of("Toot.pdf"), "PDF");
-        entry.setField(StandardField.FILE, FileFieldWriter.getStringRepresentation(fileField));
+        entry.setField(
+            StandardField.FILE,
+            FileFieldWriter.getStringRepresentation(fileField)
+        );
         entry.setField(StandardField.TITLE, "test title");
 
-        when(filePreferences.getFileNamePattern()).thenReturn("[citationkey] - [fulltitle]");
+        when(filePreferences.getFileNamePattern())
+            .thenReturn("[citationkey] - [fulltitle]");
         cleanup.cleanup(entry);
 
-        LinkedFile newFileField = new LinkedFile("", Path.of("Toot - test title.pdf"), "PDF");
-        assertEquals(Optional.of(FileFieldWriter.getStringRepresentation(newFileField)), entry.getField(StandardField.FILE));
+        LinkedFile newFileField = new LinkedFile(
+            "",
+            Path.of("Toot - test title.pdf"),
+            "PDF"
+        );
+        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 67027811cf1..94c8b00d2b0 100644
--- a/src/test/java/org/jabref/logic/cleanup/TimeStampToCreationDateTest.java
+++ b/src/test/java/org/jabref/logic/cleanup/TimeStampToCreationDateTest.java
@@ -1,50 +1,68 @@
 package org.jabref.logic.cleanup;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
 import java.util.List;
 import java.util.stream.Stream;
-
 import org.jabref.logic.importer.ParserResult;
 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;
-
 class TimeStampToCreationDateTest {
 
-    private static final Field CUSTOM_TIME_STAMP_FIELD = new UnknownField("dateOfCreation");
+    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")
-                ),
-                Arguments.of(
-                        new BibEntry().withField(StandardField.CREATIONDATE, "2020-12-24T00:00:00"),
-                        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")
-                )
+            Arguments.of(
+                new BibEntry()
+                    .withField(
+                        StandardField.CREATIONDATE,
+                        "2018-09-10T00:00:00"
+                    ),
+                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")
+            ),
+            Arguments.of(
+                new BibEntry()
+                    .withField(
+                        StandardField.CREATIONDATE,
+                        "2020-12-31T00:00:00"
+                    ),
+                new BibEntry().withField(StandardField.TIMESTAMP, "2020-12-31")
+            )
         );
     }
 
@@ -53,27 +71,44 @@ public static Stream<Arguments> standardFieldToCreationDate() {
      */
     @ParameterizedTest
     @MethodSource("standardFieldToCreationDate")
-    public void withStandardFieldToCreationDate(BibEntry expected, BibEntry input) {
+    public void withStandardFieldToCreationDate(
+        BibEntry expected,
+        BibEntry input
+    ) {
         makeMockReturnStandardField();
-        TimeStampToCreationDate migrator = new TimeStampToCreationDate(timestampPreferences);
+        TimeStampToCreationDate migrator = new TimeStampToCreationDate(
+            timestampPreferences
+        );
         migrator.cleanup(input);
         assertEquals(expected, input);
     }
 
     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")
-                ),
-                Arguments.of(
-                        new BibEntry().withField(StandardField.CREATIONDATE, "2020-12-24T00:00:00"),
-                        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")
-                )
+            Arguments.of(
+                new BibEntry()
+                    .withField(
+                        StandardField.CREATIONDATE,
+                        "2018-09-10T00:00:00"
+                    ),
+                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")
+            ),
+            Arguments.of(
+                new BibEntry()
+                    .withField(
+                        StandardField.CREATIONDATE,
+                        "2020-12-31T00:00:00"
+                    ),
+                new BibEntry().withField(CUSTOM_TIME_STAMP_FIELD, "2020-12-31")
+            )
         );
     }
 
@@ -82,86 +117,140 @@ public static Stream<Arguments> customFieldToCreationDate() {
      */
     @ParameterizedTest
     @MethodSource("customFieldToCreationDate")
-    public void withCustomFieldToCreationDate(BibEntry expected, BibEntry input) {
+    public void withCustomFieldToCreationDate(
+        BibEntry expected,
+        BibEntry input
+    ) {
         makeMockReturnCustomField();
-        TimeStampToCreationDate migrator = new TimeStampToCreationDate(timestampPreferences);
+        TimeStampToCreationDate migrator = new TimeStampToCreationDate(
+            timestampPreferences
+        );
         migrator.cleanup(input);
         assertEquals(expected, input);
     }
 
-    public static Stream<Arguments> entriesMigratedToCreationDateFromDifferentFormats() {
+    public static Stream<
+        Arguments
+    > entriesMigratedToCreationDateFromDifferentFormats() {
         return Stream.of(
-                // M/y
-                Arguments.of(
-                        new BibEntry().withField(StandardField.CREATIONDATE, "2018-01-01T00:00:00"),
-                        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")
-                ),
-                Arguments.of(
-                        new BibEntry().withField(StandardField.CREATIONDATE, "2018-03-01T00:00:00"),
-                        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")
-                ),
-
-                // MMMM dd, yyyy
-                Arguments.of(
-                        new BibEntry().withField(StandardField.CREATIONDATE, "2018-01-02T00:00:00"),
-                        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")
-                ),
-
-                // dd-MM-yyyy
-                Arguments.of(
-                        new BibEntry().withField(StandardField.CREATIONDATE, "2018-01-02T00:00:00"),
-                        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")
-                ),
-
-                // d.M.uuuu
-                Arguments.of(
-                        new BibEntry().withField(StandardField.CREATIONDATE, "2018-01-02T00:00:00"),
-                        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")
-                ),
-
-                // uuuu.M.d
-                Arguments.of(
-                        new BibEntry().withField(StandardField.CREATIONDATE, "2018-01-02T00:00:00"),
-                        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")
-                ),
-
-                // MMM, uuuu
-                Arguments.of(
-                        new BibEntry().withField(StandardField.CREATIONDATE, "2018-01-01T00:00:00"),
-                        new BibEntry().withField(StandardField.TIMESTAMP, "Jan, 2018")
-                ));
+            // M/y
+            Arguments.of(
+                new BibEntry()
+                    .withField(
+                        StandardField.CREATIONDATE,
+                        "2018-01-01T00:00:00"
+                    ),
+                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")
+            ),
+            Arguments.of(
+                new BibEntry()
+                    .withField(
+                        StandardField.CREATIONDATE,
+                        "2018-03-01T00:00:00"
+                    ),
+                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")
+            ),
+            // MMMM dd, yyyy
+            Arguments.of(
+                new BibEntry()
+                    .withField(
+                        StandardField.CREATIONDATE,
+                        "2018-01-02T00:00:00"
+                    ),
+                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")
+            ),
+            // dd-MM-yyyy
+            Arguments.of(
+                new BibEntry()
+                    .withField(
+                        StandardField.CREATIONDATE,
+                        "2018-01-02T00:00:00"
+                    ),
+                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")
+            ),
+            // d.M.uuuu
+            Arguments.of(
+                new BibEntry()
+                    .withField(
+                        StandardField.CREATIONDATE,
+                        "2018-01-02T00:00:00"
+                    ),
+                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")
+            ),
+            // uuuu.M.d
+            Arguments.of(
+                new BibEntry()
+                    .withField(
+                        StandardField.CREATIONDATE,
+                        "2018-01-02T00:00:00"
+                    ),
+                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")
+            ),
+            // MMM, uuuu
+            Arguments.of(
+                new BibEntry()
+                    .withField(
+                        StandardField.CREATIONDATE,
+                        "2018-01-01T00:00:00"
+                    ),
+                new BibEntry().withField(StandardField.TIMESTAMP, "Jan, 2018")
+            )
+        );
     }
 
     /**
@@ -171,7 +260,9 @@ public static Stream<Arguments> entriesMigratedToCreationDateFromDifferentFormat
     @MethodSource("entriesMigratedToCreationDateFromDifferentFormats")
     public void withDifferentFormats(BibEntry expected, BibEntry input) {
         makeMockReturnStandardField();
-        TimeStampToCreationDate migrator = new TimeStampToCreationDate(timestampPreferences);
+        TimeStampToCreationDate migrator = new TimeStampToCreationDate(
+            timestampPreferences
+        );
         ParserResult parserResult = new ParserResult(List.of(input));
         migrator.cleanup(input);
         assertEquals(expected, input);
diff --git a/src/test/java/org/jabref/logic/cleanup/TimeStampToModificationDateTest.java b/src/test/java/org/jabref/logic/cleanup/TimeStampToModificationDateTest.java
index 79f3fbc8438..84a39220d3e 100644
--- a/src/test/java/org/jabref/logic/cleanup/TimeStampToModificationDateTest.java
+++ b/src/test/java/org/jabref/logic/cleanup/TimeStampToModificationDateTest.java
@@ -1,48 +1,66 @@
 package org.jabref.logic.cleanup;
 
-import java.util.stream.Stream;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
+import java.util.stream.Stream;
 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;
-
 class TimeStampToModificationDateTest {
 
-    private static Field customTimeStampField = new UnknownField("dateOfCreation");
+    private static Field customTimeStampField = new UnknownField(
+        "dateOfCreation"
+    );
 
-    private TimestampPreferences timestampPreferences = Mockito.mock(TimestampPreferences.class);
+    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")
-                ),
-                Arguments.of(
-                        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")
-                )
+            Arguments.of(
+                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")
+            ),
+            Arguments.of(
+                new BibEntry()
+                    .withField(
+                        StandardField.MODIFICATIONDATE,
+                        "2020-12-31T00:00:00"
+                    ),
+                new BibEntry().withField(StandardField.TIMESTAMP, "2020-12-31")
+            )
         );
     }
 
@@ -51,27 +69,44 @@ public static Stream<Arguments> standardFieldToModificationDate() {
      */
     @ParameterizedTest
     @MethodSource("standardFieldToModificationDate")
-    public void withStandardFieldToModificationDate(BibEntry expected, BibEntry input) {
+    public void withStandardFieldToModificationDate(
+        BibEntry expected,
+        BibEntry input
+    ) {
         makeMockReturnStandardField();
-        TimeStampToModificationDate migrator = new TimeStampToModificationDate(timestampPreferences);
+        TimeStampToModificationDate migrator = new TimeStampToModificationDate(
+            timestampPreferences
+        );
         migrator.cleanup(input);
         assertEquals(expected, 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")
-                ),
-                Arguments.of(
-                        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")
-                )
+            Arguments.of(
+                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")
+            ),
+            Arguments.of(
+                new BibEntry()
+                    .withField(
+                        StandardField.MODIFICATIONDATE,
+                        "2020-12-31T00:00:00"
+                    ),
+                new BibEntry().withField(customTimeStampField, "2020-12-31")
+            )
         );
     }
 
@@ -80,9 +115,14 @@ public static Stream<Arguments> customFieldToModificationDate() {
      */
     @ParameterizedTest
     @MethodSource("customFieldToModificationDate")
-    public void withCustomFieldToModificationDate(BibEntry expected, BibEntry input) {
+    public 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 0a75b64b359..664f2ecec1c 100644
--- a/src/test/java/org/jabref/logic/cleanup/URLCleanupTest.java
+++ b/src/test/java/org/jabref/logic/cleanup/URLCleanupTest.java
@@ -1,16 +1,14 @@
 package org.jabref.logic.cleanup;
 
-import java.util.stream.Stream;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
+import java.util.stream.Stream;
 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;
-
 public class URLCleanupTest {
 
     @ParameterizedTest
@@ -24,157 +22,232 @@ public void testChangeURL(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}")),
-
+                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")),
-
+                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}")),
-
+                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")),
-
+                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.")),
-
+                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")),
-
+                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")),
-
+                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")),
-
+                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")),
-
+                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")),
-
+                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())
+                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 3bb915cf568..2cdd204f88b 100644
--- a/src/test/java/org/jabref/logic/crawler/CrawlerTest.java
+++ b/src/test/java/org/jabref/logic/crawler/CrawlerTest.java
@@ -1,12 +1,16 @@
 package org.jabref.logic.crawler;
 
+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;
-
 import javafx.collections.FXCollections;
-
+import org.eclipse.jgit.api.Git;
 import org.jabref.logic.citationkeypattern.CitationKeyPatternPreferences;
 import org.jabref.logic.citationkeypattern.GlobalCitationKeyPattern;
 import org.jabref.logic.exporter.SaveConfiguration;
@@ -19,35 +23,38 @@
 import org.jabref.model.util.DummyFileUpdateMonitor;
 import org.jabref.preferences.PreferencesService;
 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;
-
 /**
  * Integration test of the components used for SLR support
  * Marked as FetcherTest as it calls fetcher
  */
 @FetcherTest
 class CrawlerTest {
+
     @TempDir
     Path tempRepositoryDirectory;
+
     ImportFormatPreferences importFormatPreferences;
     ImporterPreferences importerPreferences;
     SaveConfiguration saveConfiguration;
     BibEntryTypesManager entryTypesManager;
-    SlrGitHandler gitHandler = mock(SlrGitHandler.class, Answers.RETURNS_DEFAULTS);
+    SlrGitHandler gitHandler = mock(
+        SlrGitHandler.class,
+        Answers.RETURNS_DEFAULTS
+    );
     String hashCodeQuantum = String.valueOf("Quantum".hashCode());
-    String hashCodeCloudComputing = String.valueOf("Cloud Computing".hashCode());
+    String hashCodeCloudComputing = String.valueOf(
+        "Cloud Computing".hashCode()
+    );
 
-    PreferencesService preferencesService = mock(PreferencesService.class, Answers.RETURNS_DEEP_STUBS);
+    PreferencesService preferencesService = mock(
+        PreferencesService.class,
+        Answers.RETURNS_DEEP_STUBS
+    );
 
     /**
      * Set up mocks and copies the study definition file into the test repository
@@ -56,7 +63,8 @@ class CrawlerTest {
     public void setUp() throws Exception {
         setUpRepository();
 
-        CitationKeyPatternPreferences citationKeyPatternPreferences = new CitationKeyPatternPreferences(
+        CitationKeyPatternPreferences citationKeyPatternPreferences =
+            new CitationKeyPatternPreferences(
                 false,
                 false,
                 false,
@@ -66,60 +74,110 @@ public void setUp() throws Exception {
                 DEFAULT_UNWANTED_CHARACTERS,
                 GlobalCitationKeyPattern.fromPattern("[auth][year]"),
                 "",
-                ',');
+                ','
+            );
 
-        importFormatPreferences = mock(ImportFormatPreferences.class, Answers.RETURNS_DEEP_STUBS);
+        importFormatPreferences =
+            mock(ImportFormatPreferences.class, Answers.RETURNS_DEEP_STUBS);
         importerPreferences = mock(ImporterPreferences.class);
-        saveConfiguration = mock(SaveConfiguration.class, Answers.RETURNS_DEEP_STUBS);
-        when(saveConfiguration.getSaveOrder()).thenReturn(SaveOrder.getDefaultSaveOrder());
-        when(importerPreferences.getApiKeys()).thenReturn(FXCollections.emptyObservableSet());
-        when(importFormatPreferences.bibEntryPreferences().getKeywordSeparator()).thenReturn(',');
-
-        when(preferencesService.getCitationKeyPatternPreferences()).thenReturn(citationKeyPatternPreferences);
+        saveConfiguration =
+            mock(SaveConfiguration.class, Answers.RETURNS_DEEP_STUBS);
+        when(saveConfiguration.getSaveOrder())
+            .thenReturn(SaveOrder.getDefaultSaveOrder());
+        when(importerPreferences.getApiKeys())
+            .thenReturn(FXCollections.emptyObservableSet());
+        when(
+            importFormatPreferences.bibEntryPreferences().getKeywordSeparator()
+        )
+            .thenReturn(',');
+
+        when(preferencesService.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
     public void testWhetherAllFilesAreCreated() throws Exception {
-        Crawler testCrawler = new Crawler(getPathToStudyDefinitionFile(),
-                gitHandler,
-                preferencesService,
-                entryTypesManager,
-                new DummyFileUpdateMonitor());
+        Crawler testCrawler = new Crawler(
+            getPathToStudyDefinitionFile(),
+            gitHandler,
+            preferencesService,
+            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");
-        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(), "studyResult.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(), "studyResult.bib")
+            )
+        );
     }
 
     private Path getPathToStudyDefinitionFile() {
diff --git a/src/test/java/org/jabref/logic/crawler/StudyCatalogToFetcherConverterTest.java b/src/test/java/org/jabref/logic/crawler/StudyCatalogToFetcherConverterTest.java
index eb039b6815f..e62eeb1e757 100644
--- a/src/test/java/org/jabref/logic/crawler/StudyCatalogToFetcherConverterTest.java
+++ b/src/test/java/org/jabref/logic/crawler/StudyCatalogToFetcherConverterTest.java
@@ -1,12 +1,13 @@
 package org.jabref.logic.crawler;
 
+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;
-
 import javafx.collections.FXCollections;
-
 import org.jabref.logic.exporter.SaveConfiguration;
 import org.jabref.logic.git.SlrGitHandler;
 import org.jabref.logic.importer.ImportFormatPreferences;
@@ -17,31 +18,34 @@
 import org.jabref.model.metadata.SaveOrder;
 import org.jabref.model.util.DummyFileUpdateMonitor;
 import org.jabref.preferences.PreferencesService;
-
 import org.junit.jupiter.api.Assertions;
 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.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
-
 class StudyCatalogToFetcherConverterTest {
+
     SaveConfiguration saveConfiguration;
     PreferencesService preferencesService;
     BibEntryTypesManager entryTypesManager;
     SlrGitHandler gitHandler;
+
     @TempDir
     Path tempRepositoryDirectory;
 
     @BeforeEach
     void setUpMocks() {
-        preferencesService = mock(PreferencesService.class, Answers.RETURNS_DEEP_STUBS);
-        saveConfiguration = mock(SaveConfiguration.class, Answers.RETURNS_DEEP_STUBS);
-        when(saveConfiguration.getSaveOrder()).thenReturn(SaveOrder.getDefaultSaveOrder());
-        when(preferencesService.getBibEntryPreferences().getKeywordSeparator()).thenReturn(',');
-        when(preferencesService.getImporterPreferences().getApiKeys()).thenReturn(FXCollections.emptyObservableSet());
+        preferencesService =
+            mock(PreferencesService.class, Answers.RETURNS_DEEP_STUBS);
+        saveConfiguration =
+            mock(SaveConfiguration.class, Answers.RETURNS_DEEP_STUBS);
+        when(saveConfiguration.getSaveOrder())
+            .thenReturn(SaveOrder.getDefaultSaveOrder());
+        when(preferencesService.getBibEntryPreferences().getKeywordSeparator())
+            .thenReturn(',');
+        when(preferencesService.getImporterPreferences().getApiKeys())
+            .thenReturn(FXCollections.emptyObservableSet());
 
         entryTypesManager = new BibEntryTypesManager();
         gitHandler = mock(SlrGitHandler.class, Answers.RETURNS_DEFAULTS);
@@ -49,29 +53,40 @@ void setUpMocks() {
 
     @Test
     public 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,
-                preferencesService,
-                new DummyFileUpdateMonitor(),
-                entryTypesManager);
-        StudyCatalogToFetcherConverter converter = new StudyCatalogToFetcherConverter(
+            tempRepositoryDirectory,
+            gitHandler,
+            preferencesService,
+            new DummyFileUpdateMonitor(),
+            entryTypesManager
+        );
+        StudyCatalogToFetcherConverter converter =
+            new StudyCatalogToFetcherConverter(
                 studyRepository.getActiveLibraryEntries(),
                 mock(ImportFormatPreferences.class, Answers.RETURNS_DEEP_STUBS),
-                mock(ImporterPreferences.class, Answers.RETURNS_DEEP_STUBS));
+                mock(ImporterPreferences.class, Answers.RETURNS_DEEP_STUBS)
+            );
         List<SearchBasedFetcher> result = converter.getActiveFetchers();
 
         Assertions.assertEquals(
-                List.of("Springer", "ArXiv", "Medline/PubMed"),
-                result.stream().map(SearchBasedFetcher::getName).collect(Collectors.toList())
+            List.of("Springer", "ArXiv", "Medline/PubMed"),
+            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);
+    private void copyTestStudyDefinitionFileIntoDirectory(Path destination)
+        throws Exception {
+        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 5ca6c35200c..cc0a51f878f 100644
--- a/src/test/java/org/jabref/logic/crawler/StudyRepositoryTest.java
+++ b/src/test/java/org/jabref/logic/crawler/StudyRepositoryTest.java
@@ -1,5 +1,13 @@
 package org.jabref.logic.crawler;
 
+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;
@@ -7,9 +15,7 @@
 import java.util.ArrayList;
 import java.util.HashSet;
 import java.util.List;
-
 import javafx.collections.FXCollections;
-
 import org.jabref.logic.citationkeypattern.CitationKeyGenerator;
 import org.jabref.logic.citationkeypattern.CitationKeyPatternPreferences;
 import org.jabref.logic.citationkeypattern.GlobalCitationKeyPattern;
@@ -29,46 +35,53 @@
 import org.jabref.model.util.DummyFileUpdateMonitor;
 import org.jabref.preferences.LibraryPreferences;
 import org.jabref.preferences.PreferencesService;
-
 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;
-
 class StudyRepositoryTest {
-    private static final String NON_EXISTING_DIRECTORY = "nonExistingTestRepositoryDirectory";
+
+    private static final String NON_EXISTING_DIRECTORY =
+        "nonExistingTestRepositoryDirectory";
     CitationKeyPatternPreferences citationKeyPatternPreferences;
     PreferencesService preferencesService;
     LibraryPreferences libraryPreferences;
     ImportFormatPreferences importFormatPreferences;
     SaveConfiguration saveConfiguration;
     BibEntryTypesManager entryTypesManager;
+
     @TempDir
     Path tempRepositoryDirectory;
+
     StudyRepository studyRepository;
-    SlrGitHandler gitHandler = mock(SlrGitHandler.class, Answers.RETURNS_DEFAULTS);
+    SlrGitHandler gitHandler = mock(
+        SlrGitHandler.class,
+        Answers.RETURNS_DEFAULTS
+    );
     String hashCodeQuantum = String.valueOf("Quantum".hashCode());
-    String hashCodeCloudComputing = String.valueOf("Cloud Computing".hashCode());
-    String hashCodeSoftwareEngineering = String.valueOf("\"Software Engineering\"".hashCode());
+    String hashCodeCloudComputing = String.valueOf(
+        "Cloud Computing".hashCode()
+    );
+    String hashCodeSoftwareEngineering = String.valueOf(
+        "\"Software Engineering\"".hashCode()
+    );
 
     /**
      * Set up mocks
      */
     @BeforeEach
     public void setUpMocks() throws Exception {
-        libraryPreferences = mock(LibraryPreferences.class, Answers.RETURNS_DEEP_STUBS);
-        saveConfiguration = mock(SaveConfiguration.class, Answers.RETURNS_DEEP_STUBS);
-        importFormatPreferences = mock(ImportFormatPreferences.class, Answers.RETURNS_DEEP_STUBS);
-        preferencesService = mock(PreferencesService.class, Answers.RETURNS_DEEP_STUBS);
-        citationKeyPatternPreferences = new CitationKeyPatternPreferences(
+        libraryPreferences =
+            mock(LibraryPreferences.class, Answers.RETURNS_DEEP_STUBS);
+        saveConfiguration =
+            mock(SaveConfiguration.class, Answers.RETURNS_DEEP_STUBS);
+        importFormatPreferences =
+            mock(ImportFormatPreferences.class, Answers.RETURNS_DEEP_STUBS);
+        preferencesService =
+            mock(PreferencesService.class, Answers.RETURNS_DEEP_STUBS);
+        citationKeyPatternPreferences =
+            new CitationKeyPatternPreferences(
                 false,
                 false,
                 false,
@@ -78,26 +91,41 @@ public void setUpMocks() throws Exception {
                 DEFAULT_UNWANTED_CHARACTERS,
                 GlobalCitationKeyPattern.fromPattern("[auth][year]"),
                 "",
-                ',');
-        when(preferencesService.getCitationKeyPatternPreferences()).thenReturn(citationKeyPatternPreferences);
-        when(preferencesService.getImporterPreferences().getApiKeys()).thenReturn(FXCollections.emptyObservableSet());
-        when(importFormatPreferences.bibEntryPreferences().getKeywordSeparator()).thenReturn(',');
-        when(preferencesService.getImportFormatPreferences()).thenReturn(importFormatPreferences);
-        when(preferencesService.getTimestampPreferences().getTimestampField()).then(invocation -> StandardField.TIMESTAMP);
+                ','
+            );
+        when(preferencesService.getCitationKeyPatternPreferences())
+            .thenReturn(citationKeyPatternPreferences);
+        when(preferencesService.getImporterPreferences().getApiKeys())
+            .thenReturn(FXCollections.emptyObservableSet());
+        when(
+            importFormatPreferences.bibEntryPreferences().getKeywordSeparator()
+        )
+            .thenReturn(',');
+        when(preferencesService.getImportFormatPreferences())
+            .thenReturn(importFormatPreferences);
+        when(preferencesService.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,
-                preferencesService,
-                new DummyFileUpdateMonitor(),
-                entryTypesManager));
+        assertThrows(
+            IOException.class,
+            () ->
+                new StudyRepository(
+                    nonExistingRepositoryDirectory,
+                    gitHandler,
+                    preferencesService,
+                    new DummyFileUpdateMonitor(),
+                    entryTypesManager
+                )
+        );
     }
 
     /**
@@ -106,18 +134,111 @@ 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 +247,9 @@ 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 +259,24 @@ 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 +290,42 @@ 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(
+        studyRepository =
+            new StudyRepository(
                 tempRepositoryDirectory,
                 gitHandler,
                 preferencesService,
                 new DummyFileUpdateMonitor(),
-                entryTypesManager);
+                entryTypesManager
+            );
         return studyRepository;
     }
 
@@ -178,8 +333,12 @@ 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,29 +347,75 @@ 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 resultFileLocation = Path.of(queryDirectory.toString(), "ArXiv" + ".bib");
+        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);
-        resultFileLocation = Path.of(queryDirectory.toString(), "Springer" + ".bib");
+        FileUtil.copyFile(
+            Path.of(resultFile.toURI()),
+            resultFileLocation,
+            true
+        );
+        resultFileLocation =
+            Path.of(queryDirectory.toString(), "Springer" + ".bib");
         resultFile = this.getClass().getResource("SpringerQuantumMock.bib");
-        FileUtil.copyFile(Path.of(resultFile.toURI()), resultFileLocation, true);
+        FileUtil.copyFile(
+            Path.of(resultFile.toURI()),
+            resultFileLocation,
+            true
+        );
     }
 
     private BibDatabase getNonDuplicateBibEntryResult() {
-        BibDatabase mockResults = new BibDatabase(getSpringerCloudComputingMockResults());
-        DatabaseMerger merger = new DatabaseMerger(importFormatPreferences.bibEntryPreferences().getKeywordSeparator());
-        merger.merge(mockResults, new BibDatabase(getSpringerQuantumMockResults()));
-        merger.merge(mockResults, new BibDatabase(getArXivQuantumMockResults()));
+        BibDatabase mockResults = new BibDatabase(
+            getSpringerCloudComputingMockResults()
+        );
+        DatabaseMerger merger = new DatabaseMerger(
+            importFormatPreferences.bibEntryPreferences().getKeywordSeparator()
+        );
+        merger.merge(
+            mockResults,
+            new BibDatabase(getSpringerQuantumMockResults())
+        );
+        merger.merge(
+            mockResults,
+            new BibDatabase(getArXivQuantumMockResults())
+        );
         return mockResults;
     }
 
     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()))));
+        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())
+                )
+            )
+        );
         return List.of(resultQuantum, resultCloudComputing);
     }
 
@@ -224,19 +429,25 @@ 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");
+            .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");
+            .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");
+            .withCitationKey("Watrous")
+            .withField(StandardField.AUTHOR, "John Watrous")
+            .withField(StandardField.TITLE, "Quantum Computational Complexity");
         entry3.setType(StandardEntryType.Article);
 
         return List.of(entry1, entry2, entry3);
@@ -245,21 +456,33 @@ 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");
+            .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");
+            .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");
+            .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);
@@ -267,14 +490,26 @@ private List<BibEntry> getSpringerQuantumMockResults() {
 
     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?");
+            .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");
+            .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 db2fb4f45e0..7fd98b71487 100644
--- a/src/test/java/org/jabref/logic/crawler/StudyYamlParserTest.java
+++ b/src/test/java/org/jabref/logic/crawler/StudyYamlParserTest.java
@@ -1,21 +1,20 @@
 package org.jabref.logic.crawler;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
 import java.net.URL;
 import java.nio.file.Path;
 import java.util.List;
-
 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;
-
 class StudyYamlParserTest {
+
     @TempDir
     static Path testDirectory;
 
@@ -23,30 +22,66 @@ class StudyYamlParserTest {
 
     @BeforeEach
     void setupStudy() throws Exception {
-        Path destination = testDirectory.resolve(StudyRepository.STUDY_DEFINITION_FILE_NAME);
-        URL studyDefinition = StudyYamlParser.class.getResource(StudyRepository.STUDY_DEFINITION_FILE_NAME);
+        Path destination = testDirectory.resolve(
+            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
     public 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
     public 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);
     }
 
@@ -56,8 +91,10 @@ public void readsJabRef57StudySuccessfully() throws Exception {
         // 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"])
         // 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()));
+        URL studyDefinition =
+            StudyYamlParser.class.getResource("study-jabref-5.7.yml");
+        Study study = new StudyYamlParser()
+            .parseStudyYamlFile(Path.of(studyDefinition.toURI()));
         assertEquals(expectedStudy, study);
     }
 }
diff --git a/src/test/java/org/jabref/logic/database/DatabaseMergerTest.java b/src/test/java/org/jabref/logic/database/DatabaseMergerTest.java
index a7464dbaed5..c99217f6c82 100644
--- a/src/test/java/org/jabref/logic/database/DatabaseMergerTest.java
+++ b/src/test/java/org/jabref/logic/database/DatabaseMergerTest.java
@@ -1,8 +1,11 @@
 package org.jabref.logic.database;
 
+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;
-
 import org.jabref.logic.bibtex.comparator.BibtexStringComparator;
 import org.jabref.logic.importer.ImportFormatPreferences;
 import org.jabref.model.database.BibDatabase;
@@ -16,40 +19,52 @@
 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;
-
 class DatabaseMergerTest {
+
     private ImportFormatPreferences importFormatPreferences;
 
     @BeforeEach
     void setUp() {
-        importFormatPreferences = mock(ImportFormatPreferences.class, Answers.RETURNS_DEEP_STUBS);
-        when(importFormatPreferences.bibEntryPreferences().getKeywordSeparator()).thenReturn(',');
+        importFormatPreferences =
+            mock(ImportFormatPreferences.class, Answers.RETURNS_DEEP_STUBS);
+        when(
+            importFormatPreferences.bibEntryPreferences().getKeywordSeparator()
+        )
+            .thenReturn(',');
     }
 
     @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");
+            .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");
+            .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");
+            .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());
     }
@@ -58,29 +73,38 @@ void mergeAddsNonDuplicateEntries() {
     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");
+            .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");
+            .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");
+            .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");
+            .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());
     }
 
@@ -93,8 +117,14 @@ void mergeBibTexStringsWithSameNameAreImportedWithModifiedName() {
         BibtexString sourceString2 = new BibtexString("name", "content3");
 
         // The expected source BibTeXStrings after import (different name, different content)
-        BibtexString importedBibTeXString1 = new BibtexString("name_1", "content2");
-        BibtexString importedBibTeXString2 = new BibtexString("name_2", "content3");
+        BibtexString importedBibTeXString1 = new BibtexString(
+            "name_1",
+            "content2"
+        );
+        BibtexString importedBibTeXString2 = new BibtexString(
+            "name_2",
+            "content3"
+        );
 
         BibDatabase target = new BibDatabase();
         BibDatabase source1 = new BibDatabase();
@@ -103,17 +133,30 @@ 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,30 +175,53 @@ 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);
+        assertEquals(
+            List.of(targetString1, targetString2),
+            resultStringsSorted
+        );
     }
 
     @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")),
-                        new ContentSelector(StandardField.TITLE, List.of("Test Title")));
+        other.addContentSelector(
+            new ContentSelector(StandardField.TITLE, List.of("Test Title"))
+        );
+        List<ContentSelector> expectedContentSelectors = 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.getContentSelectorList());
@@ -163,30 +229,54 @@ void mergeMetaDataWithoutAllEntriesGroup() {
         // Assert that groups of other are children of root node of target
         assertEquals(targetRootGroup, target.getGroups().get());
         assertEquals(target.getGroups().get().getChildren().size(), 1);
-        assertEquals(otherRootGroup, target.getGroups().get().getChildren().get(0));
+        assertEquals(
+            otherRootGroup,
+            target.getGroups().get().getChildren().get(0)
+        );
     }
 
     @Test
     void mergeMetaDataWithAllEntriesGroup() {
         MetaData target = new MetaData();
-        target.addContentSelector(new ContentSelector(StandardField.AUTHOR, List.of("Test Author")));
-        GroupTreeNode targetRootGroup = new GroupTreeNode(new AllEntriesGroup("targetGroup"));
+        target.addContentSelector(
+            new ContentSelector(StandardField.AUTHOR, List.of("Test Author"))
+        );
+        GroupTreeNode targetRootGroup = new GroupTreeNode(
+            new AllEntriesGroup("targetGroup")
+        );
         target.setGroups(targetRootGroup);
         MetaData other = new MetaData();
-        GroupTreeNode otherRootGroup = new GroupTreeNode(new AllEntriesGroup("otherGroup"));
+        GroupTreeNode otherRootGroup = new GroupTreeNode(
+            new AllEntriesGroup("otherGroup")
+        );
         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")),
-                        new ContentSelector(StandardField.TITLE, List.of("Test Title")));
-        GroupTreeNode expectedImportedGroupNode = new GroupTreeNode(new ExplicitGroup("Imported unknown", GroupHierarchyType.INDEPENDENT, ';'));
+        other.addContentSelector(
+            new ContentSelector(StandardField.TITLE, List.of("Test Title"))
+        );
+        List<ContentSelector> expectedContentSelectors = 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,
+                ';'
+            )
+        );
 
-        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(target.getGroups().get().getChildren().size(), 1);
-        assertEquals(expectedImportedGroupNode, target.getGroups().get().getChildren().get(0));
+        assertEquals(
+            expectedImportedGroupNode,
+            target.getGroups().get().getChildren().get(0)
+        );
         assertEquals(expectedContentSelectors, target.getContentSelectorList());
     }
 }
diff --git a/src/test/java/org/jabref/logic/database/DuplicateCheckTest.java b/src/test/java/org/jabref/logic/database/DuplicateCheckTest.java
index 8c644ab40f2..20cb6d2bc33 100644
--- a/src/test/java/org/jabref/logic/database/DuplicateCheckTest.java
+++ b/src/test/java/org/jabref/logic/database/DuplicateCheckTest.java
@@ -1,14 +1,16 @@
 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 java.util.stream.Stream;
 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.field.StandardField;
 import org.jabref.model.entry.types.StandardEntryType;
-
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
@@ -16,10 +18,6 @@
 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;
-
 public class DuplicateCheckTest {
 
     private BibEntry simpleArticle;
@@ -30,35 +28,44 @@ public class DuplicateCheckTest {
 
     private static BibEntry getSimpleArticle() {
         return new BibEntry(StandardEntryType.Article)
-                .withField(StandardField.AUTHOR, "Single Author")
-                .withField(StandardField.TITLE, "A serious paper about something")
-                .withField(StandardField.YEAR, "2017");
+            .withField(StandardField.AUTHOR, "Single Author")
+            .withField(StandardField.TITLE, "A serious paper about something")
+            .withField(StandardField.YEAR, "2017");
     }
 
     private static BibEntry getSimpleIncollection() {
         return new BibEntry(StandardEntryType.InCollection)
-                .withField(StandardField.TITLE, "Innovation and Intellectual Property Rights")
-                .withField(StandardField.AUTHOR, "Ove Grandstrand")
-                .withField(StandardField.BOOKTITLE, "The Oxford Handbook of Innovation")
-                .withField(StandardField.PUBLISHER, "Oxford University Press")
-                .withField(StandardField.YEAR, "2004");
+            .withField(
+                StandardField.TITLE,
+                "Innovation and Intellectual Property Rights"
+            )
+            .withField(StandardField.AUTHOR, "Ove Grandstrand")
+            .withField(
+                StandardField.BOOKTITLE,
+                "The Oxford Handbook of Innovation"
+            )
+            .withField(StandardField.PUBLISHER, "Oxford University Press")
+            .withField(StandardField.YEAR, "2004");
     }
 
     private static BibEntry getSimpleInbook() {
         return new BibEntry(StandardEntryType.InBook)
-                .withField(StandardField.TITLE, "Alice in Wonderland")
-                .withField(StandardField.AUTHOR, "Charles Lutwidge Dodgson")
-                .withField(StandardField.CHAPTER, "Chapter One – Down the Rabbit Hole")
-                .withField(StandardField.LANGUAGE, "English")
-                .withField(StandardField.PUBLISHER, "Macmillan")
-                .withField(StandardField.YEAR, "1865");
+            .withField(StandardField.TITLE, "Alice in Wonderland")
+            .withField(StandardField.AUTHOR, "Charles Lutwidge Dodgson")
+            .withField(
+                StandardField.CHAPTER,
+                "Chapter One – Down the Rabbit Hole"
+            )
+            .withField(StandardField.LANGUAGE, "English")
+            .withField(StandardField.PUBLISHER, "Macmillan")
+            .withField(StandardField.YEAR, "1865");
     }
 
     private static BibEntry getUnrelatedArticle() {
         return new BibEntry(StandardEntryType.Article)
-                .withField(StandardField.AUTHOR, "Completely Different")
-                .withField(StandardField.TITLE, "Holy Moly Uffdada und Trallalla")
-                .withField(StandardField.YEAR, "1992");
+            .withField(StandardField.AUTHOR, "Completely Different")
+            .withField(StandardField.TITLE, "Holy Moly Uffdada und Trallalla")
+            .withField(StandardField.YEAR, "1992");
     }
 
     @BeforeEach
@@ -72,244 +79,287 @@ public void setUp() {
 
     @Test
     public void testDuplicateDetectionWithSameAuthor() {
-        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));
+        assertTrue(
+            duplicateChecker.isDuplicate(one, two, BibDatabaseMode.BIBTEX)
+        );
     }
 
     @Test
     public void testDuplicateDetectionWithDifferentAuthors() {
-        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));
+        assertFalse(
+            duplicateChecker.isDuplicate(one, two, BibDatabaseMode.BIBTEX)
+        );
     }
 
     @Test
     public void testDuplicateDetectionWithDifferentTypes() {
-        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));
+        assertFalse(
+            duplicateChecker.isDuplicate(one, two, BibDatabaseMode.BIBTEX)
+        );
     }
 
     @Test
     public void testDuplicateDetectionWithSameYearTitleJournal() {
         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.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");
+            .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);
+        assertTrue(
+            duplicateChecker.isDuplicate(one, two, BibDatabaseMode.BIBTEX)
+        );
+        assertEquals(
+            1.01,
+            DuplicateCheck.compareEntriesStrictly(one, two),
+            0.01
+        );
     }
 
     @Test
     public void testDuplicateDetectionWithDifferentJournal() {
         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.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");
+            .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);
+        assertTrue(
+            duplicateChecker.isDuplicate(one, two, BibDatabaseMode.BIBTEX)
+        );
+        assertEquals(
+            0.75,
+            DuplicateCheck.compareEntriesStrictly(one, two),
+            0.01
+        );
     }
 
     @Test
     public void testDuplicateDetectionWithDifferentVolume() {
         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");
+            .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));
+            .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
     public void testDuplicateDetectionWithDifferentTitleSameVolume() {
         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");
+            .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));
+            .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
     public void testDuplicateDetectionWithSamePages() {
         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");
+            .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));
+            .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
     public void testDuplicateDetectionWithSamePagesOneEntryNoVolume() {
         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");
+            .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));
+            .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
     public void testDuplicateDetectionDifferentVolumeNoJournal() {
         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");
+            .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));
+            .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
     public void testDuplicateDetectionDifferentTitleNoJournal() {
         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");
+            .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));
+            .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
     public void testDuplicateDetectionDifferentVolumeAllOthersEqual() {
         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");
+            .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));
+            .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
     public void testDuplicateDetectionDifferentVolumeDifferentJournalAllOthersEqual() {
         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");
+            .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));
+            .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)
+        );
     }
 
     @Test
     public void testWordCorrelation() {
-        String d1 = "Characterization of Calanus finmarchicus habitat in the North Sea";
-        String d2 = "Characterization of Calunus finmarchicus habitat in the North Sea";
-        String d3 = "Characterization of Calanus glacialissss habitat in the South Sea";
+        String d1 =
+            "Characterization of Calanus finmarchicus habitat in the North Sea";
+        String d2 =
+            "Characterization of Calunus finmarchicus habitat in the North Sea";
+        String d3 =
+            "Characterization of Calanus glacialissss habitat in the South Sea";
 
         assertEquals(1.0, (DuplicateCheck.correlateByWords(d1, d2)), 0.01);
         assertEquals(0.78, (DuplicateCheck.correlateByWords(d1, d3)), 0.01);
@@ -318,23 +368,47 @@ public void testWordCorrelation() {
 
     @Test
     public void twoUnrelatedEntriesAreNoDuplicates() {
-        assertFalse(duplicateChecker.isDuplicate(simpleArticle, unrelatedArticle, BibDatabaseMode.BIBTEX));
+        assertFalse(
+            duplicateChecker.isDuplicate(
+                simpleArticle,
+                unrelatedArticle,
+                BibDatabaseMode.BIBTEX
+            )
+        );
     }
 
     @Test
     public void twoUnrelatedEntriesWithDifferentDoisAreNoDuplicates() {
         simpleArticle.setField(StandardField.DOI, "10.1016/j.is.2004.02.002");
-        unrelatedArticle.setField(StandardField.DOI, "10.1016/j.is.2004.02.00X");
+        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
     public void twoUnrelatedEntriesWithEqualDoisAreDuplicates() {
         simpleArticle.setField(StandardField.DOI, "10.1016/j.is.2004.02.002");
-        unrelatedArticle.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
@@ -342,7 +416,13 @@ public 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
@@ -350,7 +430,13 @@ public 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
@@ -359,18 +445,33 @@ public 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
     public void twoEntriesWithDoiContainingUnderscoresAreNotEqual() {
         simpleArticle.setField(StandardField.DOI, "10.1016/j.is.2004.02.002");
         // An underscore in a DOI can indicate a totally different DOI
-        unrelatedArticle.setField(StandardField.DOI, "10.1016/j.is.2004.02.0_02");
+        unrelatedArticle.setField(
+            StandardField.DOI,
+            "10.1016/j.is.2004.02.0_02"
+        );
         BibEntry duplicateWithDifferentType = unrelatedArticle;
         duplicateWithDifferentType.setType(StandardEntryType.InCollection);
 
-        assertFalse(duplicateChecker.isDuplicate(simpleArticle, duplicateWithDifferentType, BibDatabaseMode.BIBTEX));
+        assertFalse(
+            duplicateChecker.isDuplicate(
+                simpleArticle,
+                duplicateWithDifferentType,
+                BibDatabaseMode.BIBTEX
+            )
+        );
     }
 
     @Test
@@ -380,170 +481,295 @@ public void twoEntriesWithSameISBNButDifferentTypesAreDuplicates() {
         BibEntry duplicateWithDifferentType = unrelatedArticle;
         duplicateWithDifferentType.setType(StandardEntryType.InCollection);
 
-        assertTrue(duplicateChecker.isDuplicate(simpleArticle, duplicateWithDifferentType, BibDatabaseMode.BIBTEX));
+        assertTrue(
+            duplicateChecker.isDuplicate(
+                simpleArticle,
+                duplicateWithDifferentType,
+                BibDatabaseMode.BIBTEX
+            )
+        );
     }
 
-    public static Stream<Arguments> twoEntriesWithDifferentSpecificFieldsAreNotDuplicates() {
+    public static Stream<
+        Arguments
+    > twoEntriesWithDifferentSpecificFieldsAreNotDuplicates() {
         return Stream.of(
-                // twoInbooksWithDifferentChaptersAreNotDuplicates
-                Arguments.of(getSimpleInbook(), StandardField.CHAPTER,
-                        "Chapter One – Down the Rabbit Hole",
-                        "Chapter Two – The Pool of Tears"),
-                // twoInbooksWithDifferentPagesAreNotDuplicates
-                Arguments.of(getSimpleInbook(), StandardField.PAGES, "1-20", "21-40"),
-                // twoIncollectionsWithDifferentChaptersAreNotDuplicates
-                Arguments.of(getSimpleIncollection(), StandardField.CHAPTER, "10", "9"),
-                // twoEntriesWithDifferentSpecificFieldsAreNotDuplicates
-                Arguments.of(getSimpleIncollection(), StandardField.PAGES, "1-20", "21-40")
+            // twoInbooksWithDifferentChaptersAreNotDuplicates
+            Arguments.of(
+                getSimpleInbook(),
+                StandardField.CHAPTER,
+                "Chapter One – Down the Rabbit Hole",
+                "Chapter Two – The Pool of Tears"
+            ),
+            // twoInbooksWithDifferentPagesAreNotDuplicates
+            Arguments.of(
+                getSimpleInbook(),
+                StandardField.PAGES,
+                "1-20",
+                "21-40"
+            ),
+            // twoIncollectionsWithDifferentChaptersAreNotDuplicates
+            Arguments.of(
+                getSimpleIncollection(),
+                StandardField.CHAPTER,
+                "10",
+                "9"
+            ),
+            // twoEntriesWithDifferentSpecificFieldsAreNotDuplicates
+            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) {
-        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));
+    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)
+        );
     }
 
     @Test
     public void inbookWithoutChapterCouldBeDuplicateOfInbookWithChapter() {
-        final BibEntry inbook2 = ((BibEntry) simpleInbook.clone()).withField(StandardField.CHAPTER, "");
-
-        assertTrue(duplicateChecker.isDuplicate(simpleInbook, inbook2, BibDatabaseMode.BIBTEX));
+        final BibEntry inbook2 =
+            ((BibEntry) simpleInbook.clone()).withField(
+                    StandardField.CHAPTER,
+                    ""
+                );
+
+        assertTrue(
+            duplicateChecker.isDuplicate(
+                simpleInbook,
+                inbook2,
+                BibDatabaseMode.BIBTEX
+            )
+        );
     }
 
     @Test
     public 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");
+            .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));
+            .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
     public 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");
+            .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));
+            .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
     public 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");
+            .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));
+            .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
     public 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");
+            .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));
+            .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");
-        assertTrue(duplicateChecker.isDuplicate(entryOne, entryTwo, BibDatabaseMode.BIBTEX));
+    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");
+        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");
-        assertTrue(duplicateChecker.isDuplicate(entryOne, entryTwo, BibDatabaseMode.BIBTEX));
+    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"
+            );
+        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");
-        assertTrue(duplicateChecker.isDuplicate(entryOne, entryTwo, BibDatabaseMode.BIBTEX));
+    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
+            )
+        );
     }
 
-    @Disabled("Book entries can have the same ISBN due to different chapters. The Test fails as crossref identifies both entries as the same.")
+    @Disabled(
+        "Book entries can have the same ISBN due to different chapters. The Test fails as crossref identifies both entries as the same."
+    )
     @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");
+            .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));
+            .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
+            )
+        );
     }
 }
diff --git a/src/test/java/org/jabref/logic/exporter/AtomicFileOutputStreamTest.java b/src/test/java/org/jabref/logic/exporter/AtomicFileOutputStreamTest.java
index 80086d77db9..2b4828231c9 100644
--- a/src/test/java/org/jabref/logic/exporter/AtomicFileOutputStreamTest.java
+++ b/src/test/java/org/jabref/logic/exporter/AtomicFileOutputStreamTest.java
@@ -1,35 +1,43 @@
 package org.jabref.logic.exporter;
 
+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 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 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;
-
 class AtomicFileOutputStreamTest {
 
     private static final String FIFTY_CHARS = Strings.repeat("1234567890", 5);
-    private static final String FIVE_THOUSAND_CHARS = Strings.repeat("A", 5_000);
+    private static final String FIVE_THOUSAND_CHARS = Strings.repeat(
+        "A",
+        5_000
+    );
 
     @Test
     public void normalSaveWorks(@TempDir Path tempDir) throws Exception {
         Path out = tempDir.resolve("normal-save.txt");
         Files.writeString(out, FIFTY_CHARS);
 
-        try (AtomicFileOutputStream atomicFileOutputStream = new AtomicFileOutputStream(out)) {
-            InputStream inputStream = new ByteArrayInputStream(FIVE_THOUSAND_CHARS.getBytes());
+        try (
+            AtomicFileOutputStream atomicFileOutputStream = new AtomicFileOutputStream(
+                out
+            )
+        ) {
+            InputStream inputStream = new ByteArrayInputStream(
+                FIVE_THOUSAND_CHARS.getBytes()
+            );
             inputStream.transferTo(atomicFileOutputStream);
         }
 
@@ -38,28 +46,48 @@ public void normalSaveWorks(@TempDir Path tempDir) throws Exception {
     }
 
     @Test
-    public void originalContentExistsAtWriteError(@TempDir Path tempDir) throws Exception {
+    public void originalContentExistsAtWriteError(@TempDir Path tempDir)
+        throws Exception {
         Path pathToTestFile = tempDir.resolve("error-during-save.txt");
         Files.writeString(pathToTestFile, FIFTY_CHARS);
 
         Path pathToTmpFile = tempDir.resolve("error-during-save.txt.tmp");
 
-        try (FileOutputStream outputStream = new FileOutputStream(pathToTmpFile.toFile())) {
+        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());
+                    // 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 be277db4e5b..d3918f60ce4 100644
--- a/src/test/java/org/jabref/logic/exporter/BibtexDatabaseWriterTest.java
+++ b/src/test/java/org/jabref/logic/exporter/BibtexDatabaseWriterTest.java
@@ -1,5 +1,10 @@
 package org.jabref.logic.exporter;
 
+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;
@@ -12,7 +17,6 @@
 import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
-
 import org.jabref.logic.bibtex.FieldPreferences;
 import org.jabref.logic.citationkeypattern.AbstractCitationKeyPattern;
 import org.jabref.logic.citationkeypattern.CitationKeyPatternPreferences;
@@ -51,17 +55,11 @@
 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;
-
 /**
  * Tests for reading can be found at {@link org.jabref.logic.importer.fileformat.BibtexImporterTest}
  */
@@ -81,9 +79,24 @@ public 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);
@@ -91,54 +104,84 @@ void setUp() {
         database = new BibDatabase();
         metaData = new MetaData();
         bibtexContext = new BibDatabaseContext(database, metaData);
-        importFormatPreferences = mock(ImportFormatPreferences.class, Answers.RETURNS_DEEP_STUBS);
-        when(importFormatPreferences.fieldPreferences()).thenReturn(fieldPreferences);
+        importFormatPreferences =
+            mock(ImportFormatPreferences.class, Answers.RETURNS_DEEP_STUBS);
+        when(importFormatPreferences.fieldPreferences())
+            .thenReturn(fieldPreferences);
     }
 
     private void initializeDatabaseWriter() {
-        databaseWriter = new BibtexDatabaseWriter(
+        databaseWriter =
+            new BibtexDatabaseWriter(
                 bibWriter,
                 saveConfiguration,
                 fieldPreferences,
                 citationKeyPatternPreferences,
-                entryTypesManager);
+                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
     void writeEncodingUsAsciiWhenSetInPreferencesAndHeader() throws Exception {
         metaData.setEncoding(StandardCharsets.US_ASCII);
 
-        databaseWriter.savePartOfDatabase(bibtexContext, Collections.emptyList());
+        databaseWriter.savePartOfDatabase(
+            bibtexContext,
+            Collections.emptyList()
+        );
 
-        assertEquals("% Encoding: US-ASCII" + OS.NEWLINE, stringWriter.toString());
+        assertEquals(
+            "% Encoding: US-ASCII" + OS.NEWLINE,
+            stringWriter.toString()
+        );
     }
 
     @Test
-    void writeEncodingWindows1252WhenSetInPreferencesAndHeader() throws Exception {
+    void writeEncodingWindows1252WhenSetInPreferencesAndHeader()
+        throws Exception {
         metaData.setEncoding(Charset.forName("windows-1252"));
 
-        databaseWriter.savePartOfDatabase(bibtexContext, Collections.emptyList());
+        databaseWriter.savePartOfDatabase(
+            bibtexContext,
+            Collections.emptyList()
+        );
 
-        assertEquals("% Encoding: windows-1252" + OS.NEWLINE, stringWriter.toString());
+        assertEquals(
+            "% Encoding: windows-1252" + OS.NEWLINE,
+            stringWriter.toString()
+        );
     }
 
     @Test
     void writePreamble() throws Exception {
         database.setPreamble("Test preamble");
 
-        databaseWriter.savePartOfDatabase(bibtexContext, Collections.emptyList());
+        databaseWriter.savePartOfDatabase(
+            bibtexContext,
+            Collections.emptyList()
+        );
 
-        assertEquals("@Preamble{Test preamble}" + OS.NEWLINE, stringWriter.toString());
+        assertEquals(
+            "@Preamble{Test preamble}" + OS.NEWLINE,
+            stringWriter.toString()
+        );
     }
 
     @Test
@@ -146,10 +189,19 @@ void writePreambleAndEncoding() throws Exception {
         metaData.setEncoding(StandardCharsets.US_ASCII);
         database.setPreamble("Test preamble");
 
-        databaseWriter.savePartOfDatabase(bibtexContext, Collections.emptyList());
+        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
@@ -158,11 +210,15 @@ void writeEntry() throws Exception {
         entry.setType(StandardEntryType.Article);
         database.insertEntry(entry);
 
-        databaseWriter.savePartOfDatabase(bibtexContext, Collections.singletonList(entry));
+        databaseWriter.savePartOfDatabase(
+            bibtexContext,
+            Collections.singletonList(entry)
+        );
 
-        assertEquals("@Article{," + OS.NEWLINE + "}"
-                        + OS.NEWLINE,
-                stringWriter.toString());
+        assertEquals(
+            "@Article{," + OS.NEWLINE + "}" + OS.NEWLINE,
+            stringWriter.toString()
+        );
     }
 
     @Test
@@ -172,28 +228,45 @@ void writeEntryWithDuplicateKeywords() throws Exception {
         entry.setField(StandardField.KEYWORDS, "asdf,asdf,asdf");
         database.insertEntry(entry);
 
-        databaseWriter.savePartOfDatabase(bibtexContext, Collections.singletonList(entry));
+        databaseWriter.savePartOfDatabase(
+            bibtexContext,
+            Collections.singletonList(entry)
+        );
 
-        assertEquals("@Article{," + OS.NEWLINE
-                     + "  keywords = {asdf,asdf,asdf}," + OS.NEWLINE
-                     + "}" + OS.NEWLINE,
-                stringWriter.toString());
+        assertEquals(
+            "@Article{," +
+            OS.NEWLINE +
+            "  keywords = {asdf,asdf,asdf}," +
+            OS.NEWLINE +
+            "}" +
+            OS.NEWLINE,
+            stringWriter.toString()
+        );
     }
 
     @Test
-    void putKeyWordsRemovesDuplicateKeywordsIsVisibleDuringWrite() throws Exception {
+    void putKeyWordsRemovesDuplicateKeywordsIsVisibleDuringWrite()
+        throws Exception {
         BibEntry entry = new BibEntry();
         entry.setType(StandardEntryType.Article);
         entry.putKeywords(List.of("asdf", "asdf", "asdf"), ',');
 
         database.insertEntry(entry);
 
-        databaseWriter.savePartOfDatabase(bibtexContext, Collections.singletonList(entry));
+        databaseWriter.savePartOfDatabase(
+            bibtexContext,
+            Collections.singletonList(entry)
+        );
 
-        assertEquals("@Article{," + OS.NEWLINE
-                     + "  keywords = {asdf}," + OS.NEWLINE
-                     + "}" + OS.NEWLINE,
-                stringWriter.toString());
+        assertEquals(
+            "@Article{," +
+            OS.NEWLINE +
+            "  keywords = {asdf}," +
+            OS.NEWLINE +
+            "}" +
+            OS.NEWLINE,
+            stringWriter.toString()
+        );
     }
 
     @Test
@@ -203,20 +276,31 @@ void writeEncodingAndEntry() throws Exception {
         database.insertEntry(entry);
         metaData.setEncoding(StandardCharsets.US_ASCII);
 
-        databaseWriter.savePartOfDatabase(bibtexContext, Collections.singletonList(entry));
+        databaseWriter.savePartOfDatabase(
+            bibtexContext,
+            Collections.singletonList(entry)
+        );
 
         assertEquals(
-                "% Encoding: US-ASCII" + OS.NEWLINE + OS.NEWLINE +
-                        "@Article{," + OS.NEWLINE + "}"
-                        + OS.NEWLINE,
-                stringWriter.toString());
+            "% Encoding: US-ASCII" +
+            OS.NEWLINE +
+            OS.NEWLINE +
+            "@Article{," +
+            OS.NEWLINE +
+            "}" +
+            OS.NEWLINE,
+            stringWriter.toString()
+        );
     }
 
     @Test
     void writeEpilogue() throws Exception {
         database.setEpilog("Test epilog");
 
-        databaseWriter.savePartOfDatabase(bibtexContext, Collections.emptyList());
+        databaseWriter.savePartOfDatabase(
+            bibtexContext,
+            Collections.emptyList()
+        );
 
         assertEquals("Test epilog" + OS.NEWLINE, stringWriter.toString());
     }
@@ -226,10 +310,19 @@ void writeEpilogueAndEncoding() throws Exception {
         database.setEpilog("Test epilog");
         metaData.setEncoding(StandardCharsets.US_ASCII);
 
-        databaseWriter.savePartOfDatabase(bibtexContext, Collections.emptyList());
+        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,10 +330,12 @@ void utf8EncodingWrittenIfExplicitlyDefined() throws Exception {
         metaData.setEncoding(StandardCharsets.UTF_8);
         metaData.setEncodingExplicitlySupplied(true);
 
-        databaseWriter.savePartOfDatabase(bibtexContext, Collections.emptyList());
+        databaseWriter.savePartOfDatabase(
+            bibtexContext,
+            Collections.emptyList()
+        );
 
-        assertEquals("% Encoding: UTF-8" + OS.NEWLINE,
-                stringWriter.toString());
+        assertEquals("% Encoding: UTF-8" + OS.NEWLINE, stringWriter.toString());
     }
 
     @Test
@@ -248,44 +343,73 @@ void utf8EncodingNotWrittenIfNotExplicitlyDefined() throws Exception {
         metaData.setEncoding(StandardCharsets.UTF_8);
         metaData.setEncodingExplicitlySupplied(false);
 
-        databaseWriter.savePartOfDatabase(bibtexContext, Collections.emptyList());
+        databaseWriter.savePartOfDatabase(
+            bibtexContext,
+            Collections.emptyList()
+        );
 
         assertEquals("", stringWriter.toString());
     }
 
     @Test
     void writeMetadata() throws Exception {
-        DatabaseCitationKeyPattern bibtexKeyPattern = new DatabaseCitationKeyPattern(mock(GlobalCitationKeyPattern.class));
+        DatabaseCitationKeyPattern bibtexKeyPattern =
+            new DatabaseCitationKeyPattern(
+                mock(GlobalCitationKeyPattern.class)
+            );
         bibtexKeyPattern.setDefaultValue("test");
         metaData.setCiteKeyPattern(bibtexKeyPattern);
 
-        databaseWriter.savePartOfDatabase(bibtexContext, Collections.emptyList());
+        databaseWriter.savePartOfDatabase(
+            bibtexContext,
+            Collections.emptyList()
+        );
 
-        assertEquals("@Comment{jabref-meta: keypatterndefault:test;}" + OS.NEWLINE,
-                stringWriter.toString());
+        assertEquals(
+            "@Comment{jabref-meta: keypatterndefault:test;}" + OS.NEWLINE,
+            stringWriter.toString()
+        );
     }
 
     @Test
     void writeMetadataAndEncoding() throws Exception {
-        DatabaseCitationKeyPattern bibtexKeyPattern = new DatabaseCitationKeyPattern(mock(GlobalCitationKeyPattern.class));
+        DatabaseCitationKeyPattern bibtexKeyPattern =
+            new DatabaseCitationKeyPattern(
+                mock(GlobalCitationKeyPattern.class)
+            );
         bibtexKeyPattern.setDefaultValue("test");
         metaData.setCiteKeyPattern(bibtexKeyPattern);
         metaData.setEncoding(StandardCharsets.US_ASCII);
 
-        databaseWriter.savePartOfDatabase(bibtexContext, Collections.emptyList());
+        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
     void writeGroups() throws Exception {
-        GroupTreeNode groupRoot = GroupTreeNode.fromGroup(new AllEntriesGroup(""));
-        groupRoot.addSubgroup(new ExplicitGroup("test", GroupHierarchyType.INCLUDING, ','));
+        GroupTreeNode groupRoot = GroupTreeNode.fromGroup(
+            new AllEntriesGroup("")
+        );
+        groupRoot.addSubgroup(
+            new ExplicitGroup("test", GroupHierarchyType.INCLUDING, ',')
+        );
         metaData.setGroups(groupRoot);
 
-        databaseWriter.savePartOfDatabase(bibtexContext, Collections.emptyList());
+        databaseWriter.savePartOfDatabase(
+            bibtexContext,
+            Collections.emptyList()
+        );
 
         // @formatter:off
         assertEquals("@Comment{jabref-meta: grouping:" + OS.NEWLINE
@@ -297,12 +421,21 @@ void writeGroups() throws Exception {
 
     @Test
     void writeGroupsAndEncoding() throws Exception {
-        GroupTreeNode groupRoot = GroupTreeNode.fromGroup(new AllEntriesGroup(""));
-        groupRoot.addChild(GroupTreeNode.fromGroup(new ExplicitGroup("test", GroupHierarchyType.INCLUDING, ',')));
+        GroupTreeNode groupRoot = GroupTreeNode.fromGroup(
+            new AllEntriesGroup("")
+        );
+        groupRoot.addChild(
+            GroupTreeNode.fromGroup(
+                new ExplicitGroup("test", GroupHierarchyType.INCLUDING, ',')
+            )
+        );
         metaData.setGroups(groupRoot);
         metaData.setEncoding(StandardCharsets.US_ASCII);
 
-        databaseWriter.savePartOfDatabase(bibtexContext, Collections.emptyList());
+        databaseWriter.savePartOfDatabase(
+            bibtexContext,
+            Collections.emptyList()
+        );
 
         // @formatter:off
         assertEquals(
@@ -319,9 +452,15 @@ void writeGroupsAndEncoding() throws Exception {
     void writeString() throws Exception {
         database.addString(new BibtexString("name", "content"));
 
-        databaseWriter.savePartOfDatabase(bibtexContext, Collections.emptyList());
+        databaseWriter.savePartOfDatabase(
+            bibtexContext,
+            Collections.emptyList()
+        );
 
-        assertEquals("@String{name = {content}}" + OS.NEWLINE, stringWriter.toString());
+        assertEquals(
+            "@String{name = {content}}" + OS.NEWLINE,
+            stringWriter.toString()
+        );
     }
 
     @Test
@@ -329,38 +468,60 @@ void writeStringAndEncoding() throws Exception {
         metaData.setEncoding(StandardCharsets.US_ASCII);
         database.addString(new BibtexString("name", "content"));
 
-        databaseWriter.savePartOfDatabase(bibtexContext, Collections.emptyList());
+        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
     void doNotWriteUtf8StringAndEncoding() throws Exception {
         database.addString(new BibtexString("name", "content"));
 
-        databaseWriter.savePartOfDatabase(bibtexContext, Collections.emptyList());
+        databaseWriter.savePartOfDatabase(
+            bibtexContext,
+            Collections.emptyList()
+        );
 
-        assertEquals("@String{name = {content}}" + OS.NEWLINE, stringWriter.toString());
+        assertEquals(
+            "@String{name = {content}}" + OS.NEWLINE,
+            stringWriter.toString()
+        );
     }
 
     @Test
-    void writeEntryWithCustomizedTypeAlsoWritesTypeDeclaration() throws Exception {
+    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)));
-        entryTypesManager.addCustomOrModifiedType(customizedBibType, BibDatabaseMode.BIBTEX);
+            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
         entry.setChanged(true);
@@ -369,55 +530,105 @@ void writeEntryWithCustomizedTypeAlsoWritesTypeDeclaration() throws Exception {
 
         databaseWriter.saveDatabase(bibtexContext);
 
-        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,
-                stringWriter.toString());
+        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,
+            stringWriter.toString()
+        );
     }
 
     @Test
     void writeCustomizedTypesInAlphabeticalOrder() throws Exception {
         EntryType customizedType = new UnknownEntryType("customizedType");
-        EntryType otherCustomizedType = new UnknownEntryType("otherCustomizedType");
+        EntryType otherCustomizedType = new UnknownEntryType(
+            "otherCustomizedType"
+        );
         BibEntryType customizedBibType = new BibEntryType(
-                customizedType,
-                Collections.singletonList(new BibField(StandardField.TITLE, FieldPriority.IMPORTANT)),
-                Collections.singletonList(new OrFields(StandardField.TITLE)));
+            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);
+            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);
         BibEntry otherEntry = new BibEntry(otherCustomizedType);
         database.insertEntry(otherEntry);
         database.insertEntry(entry);
         bibtexContext.setMode(BibDatabaseMode.BIBTEX);
 
-        databaseWriter.savePartOfDatabase(bibtexContext, List.of(entry, otherEntry));
+        databaseWriter.savePartOfDatabase(
+            bibtexContext,
+            List.of(entry, otherEntry)
+        );
 
         assertEquals(
-                "@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,
-                stringWriter.toString());
+            "@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,
+            stringWriter.toString()
+        );
     }
 
     @Test
     void roundtripWithArticleMonths() throws Exception {
-        Path testBibtexFile = Path.of("src/test/resources/testbib/articleWithMonths.bib");
+        Path testBibtexFile = Path.of(
+            "src/test/resources/testbib/articleWithMonths.bib"
+        );
         Charset encoding = StandardCharsets.UTF_8;
-        ParserResult result = new BibtexParser(importFormatPreferences).parse(Importer.getReader(testBibtexFile));
-
-        BibDatabaseContext context = new BibDatabaseContext(result.getDatabase(), result.getMetaData());
-
-        databaseWriter.savePartOfDatabase(context, result.getDatabase().getEntries());
-        assertEquals(Files.readString(testBibtexFile, encoding), stringWriter.toString());
+        ParserResult result = new BibtexParser(importFormatPreferences)
+            .parse(Importer.getReader(testBibtexFile));
+
+        BibDatabaseContext context = new BibDatabaseContext(
+            result.getDatabase(),
+            result.getMetaData()
+        );
+
+        databaseWriter.savePartOfDatabase(
+            context,
+            result.getDatabase().getEntries()
+        );
+        assertEquals(
+            Files.readString(testBibtexFile, encoding),
+            stringWriter.toString()
+        );
     }
 
     @Test
@@ -432,8 +643,12 @@ void roundtripUtf8EncodingHeaderRemoved() throws Exception {
                 "  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 +
@@ -443,219 +658,385 @@ void roundtripUtf8EncodingHeaderRemoved() throws Exception {
                 "  number  = {1}," + OS.NEWLINE +
                 "}" + OS.NEWLINE;
         // @formatter:on
-       assertEquals(expected, stringWriter.toString());
+        assertEquals(expected, stringWriter.toString());
     }
 
     @Test
     void roundtripWin1252HeaderKept(@TempDir Path bibFolder) throws Exception {
-        Path testFile = Path.of(BibtexImporterTest.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(
+            BibtexImporterTest.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());
+        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,
+                saveConfiguration,
+                fieldPreferences,
+                citationKeyPatternPreferences,
+                entryTypesManager
+            );
             databaseWriter.saveDatabase(context);
         }
 
-        assertEquals(Files.readString(testFile, charset), Files.readString(file, charset));
+        assertEquals(
+            Files.readString(testFile, charset),
+            Files.readString(file, charset)
+        );
     }
 
     @Test
     void roundtripUtf8HeaderKept(@TempDir Path bibFolder) throws Exception {
-        Path testFile = Path.of(BibtexImporterTest.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(
+            BibtexImporterTest.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());
+        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,
+                saveConfiguration,
+                fieldPreferences,
+                citationKeyPatternPreferences,
+                entryTypesManager
+            );
             databaseWriter.saveDatabase(context);
         }
 
-        assertEquals(Files.readString(testFile, charset), Files.readString(file, charset));
+        assertEquals(
+            Files.readString(testFile, charset),
+            Files.readString(file, charset)
+        );
     }
 
     @Test
-    void roundtripNotExplicitUtf8HeaderNotInsertedDuringWrite(@TempDir Path bibFolder) throws Exception {
-        Path testFile = Path.of(BibtexImporterTest.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(
+            BibtexImporterTest.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());
+        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,
+                saveConfiguration,
+                fieldPreferences,
+                citationKeyPatternPreferences,
+                entryTypesManager
+            );
             databaseWriter.saveDatabase(context);
         }
 
-        assertEquals(Files.readString(testFile, charset), Files.readString(file, charset));
+        assertEquals(
+            Files.readString(testFile, charset),
+            Files.readString(file, charset)
+        );
     }
 
     @Test
     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());
+        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());
+            bibWriter,
+            saveConfiguration,
+            fieldPreferences,
+            citationKeyPatternPreferences,
+            entryTypesManager
+        );
+        databaseWriter.savePartOfDatabase(
+            context,
+            result.getDatabase().getEntries()
+        );
+        assertEquals(
+            Files.readString(testBibtexFile, encoding),
+            stringWriter.toString()
+        );
     }
 
     @Test
     void roundtripWithUserComment() throws Exception {
-        Path testBibtexFile = Path.of("src/test/resources/testbib/bibWithUserComments.bib");
+        Path testBibtexFile = Path.of(
+            "src/test/resources/testbib/bibWithUserComments.bib"
+        );
         Charset encoding = StandardCharsets.UTF_8;
-        ParserResult result = new BibtexParser(importFormatPreferences).parse(Importer.getReader(testBibtexFile));
-
-        BibDatabaseContext context = new BibDatabaseContext(result.getDatabase(), result.getMetaData());
-
-        databaseWriter.savePartOfDatabase(context, result.getDatabase().getEntries());
-        assertEquals(Files.readString(testBibtexFile, encoding), stringWriter.toString());
+        ParserResult result = new BibtexParser(importFormatPreferences)
+            .parse(Importer.getReader(testBibtexFile));
+
+        BibDatabaseContext context = new BibDatabaseContext(
+            result.getDatabase(),
+            result.getMetaData()
+        );
+
+        databaseWriter.savePartOfDatabase(
+            context,
+            result.getDatabase().getEntries()
+        );
+        assertEquals(
+            Files.readString(testBibtexFile, encoding),
+            stringWriter.toString()
+        );
     }
 
     @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));
-
-        BibEntry entry = result.getDatabase().getEntryByCitationKey("1137631").get();
+        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(
+        databaseWriter =
+            new BibtexDatabaseWriter(
                 bibWriter,
                 saveConfiguration,
                 fieldPreferences,
                 citationKeyPatternPreferences,
-                entryTypesManager);
-        databaseWriter.savePartOfDatabase(context, result.getDatabase().getEntries());
+                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";
+    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";
 
         // read in bibtex string
-        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();
+        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(
+        databaseWriter =
+            new BibtexDatabaseWriter(
                 bibWriter,
                 saveConfiguration,
                 fieldPreferences,
                 citationKeyPatternPreferences,
-                entryTypesManager);
-        databaseWriter.savePartOfDatabase(context, result.getDatabase().getEntries());
+                entryTypesManager
+            );
+        databaseWriter.savePartOfDatabase(
+            context,
+            result.getDatabase().getEntries()
+        );
         assertEquals(bibEntry, stringWriter.toString());
     }
 
     @Test
     void roundtripWithUserCommentAndEntryChange() throws Exception {
-        Path testBibtexFile = Path.of("src/test/resources/testbib/bibWithUserComments.bib");
+        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();
+        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()
+        );
 
-        databaseWriter.savePartOfDatabase(context, result.getDatabase().getEntries());
-        assertEquals(Files.readString(Path.of("src/test/resources/testbib/bibWithUserCommentAndEntryChange.bib"), encoding), stringWriter.toString());
+        databaseWriter.savePartOfDatabase(
+            context,
+            result.getDatabase().getEntries()
+        );
+        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()
+        );
 
-        databaseWriter.savePartOfDatabase(context, result.getDatabase().getEntries());
+        databaseWriter.savePartOfDatabase(
+            context,
+            result.getDatabase().getEntries()
+        );
 
-        assertEquals(Files.readString(testBibtexFile, encoding), stringWriter.toString());
+        assertEquals(
+            Files.readString(testBibtexFile, encoding),
+            stringWriter.toString()
+        );
     }
 
     @Test
     void roundtripWithUnknownMetaData() throws Exception {
-        Path testBibtexFile = Path.of("src/test/resources/testbib/unknownMetaData.bib");
+        Path testBibtexFile = Path.of(
+            "src/test/resources/testbib/unknownMetaData.bib"
+        );
         Charset encoding = StandardCharsets.UTF_8;
-        ParserResult result = new BibtexParser(importFormatPreferences).parse(Importer.getReader(testBibtexFile));
-
-        BibDatabaseContext context = new BibDatabaseContext(result.getDatabase(), result.getMetaData());
-
-        databaseWriter.savePartOfDatabase(context, result.getDatabase().getEntries());
-        assertEquals(Files.readString(testBibtexFile, encoding), stringWriter.toString());
+        ParserResult result = new BibtexParser(importFormatPreferences)
+            .parse(Importer.getReader(testBibtexFile));
+
+        BibDatabaseContext context = new BibDatabaseContext(
+            result.getDatabase(),
+            result.getMetaData()
+        );
+
+        databaseWriter.savePartOfDatabase(
+            context,
+            result.getDatabase().getEntries()
+        );
+        assertEquals(
+            Files.readString(testBibtexFile, encoding),
+            stringWriter.toString()
+        );
     }
 
     @Test
@@ -667,26 +1048,47 @@ void writeSavedSerializationOfEntryIfUnchanged() throws Exception {
         entry.setChanged(false);
         database.insertEntry(entry);
 
-        databaseWriter.savePartOfDatabase(bibtexContext, Collections.singletonList(entry));
+        databaseWriter.savePartOfDatabase(
+            bibtexContext,
+            Collections.singletonList(entry)
+        );
 
-        assertEquals("presaved serialization" + OS.NEWLINE, stringWriter.toString());
+        assertEquals(
+            "presaved serialization" + OS.NEWLINE,
+            stringWriter.toString()
+        );
     }
 
     @Test
     void reformatEntryIfAskedToDoSo() throws Exception {
         BibEntry entry = new BibEntry(StandardEntryType.Article)
-                .withField(StandardField.AUTHOR, "Mr. author");
+            .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));
+        databaseWriter.savePartOfDatabase(
+            bibtexContext,
+            Collections.singletonList(entry)
+        );
 
-        assertEquals("@Article{," + OS.NEWLINE + "  author = {Mr. author}," + OS.NEWLINE + "}"
-                        + OS.NEWLINE,
-                stringWriter.toString());
+        assertEquals(
+            "@Article{," +
+            OS.NEWLINE +
+            "  author = {Mr. author}," +
+            OS.NEWLINE +
+            "}" +
+            OS.NEWLINE,
+            stringWriter.toString()
+        );
     }
 
     @Test
@@ -695,7 +1097,10 @@ void writeSavedSerializationOfStringIfUnchanged() throws Exception {
         string.setParsedSerialization("serialization");
         database.addString(string);
 
-        databaseWriter.savePartOfDatabase(bibtexContext, Collections.emptyList());
+        databaseWriter.savePartOfDatabase(
+            bibtexContext,
+            Collections.emptyList()
+        );
 
         assertEquals("serialization" + OS.NEWLINE, stringWriter.toString());
     }
@@ -706,141 +1111,240 @@ void reformatStringIfAskedToDoSo() throws Exception {
         string.setParsedSerialization("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());
+        databaseWriter.savePartOfDatabase(
+            bibtexContext,
+            Collections.emptyList()
+        );
 
-        assertEquals("@String{name = {content}}" + OS.NEWLINE, stringWriter.toString());
+        assertEquals(
+            "@String{name = {content}}" + OS.NEWLINE,
+            stringWriter.toString()
+        );
     }
 
     @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());
+        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());
+        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 {
-        AbstractCitationKeyPattern pattern = new DatabaseCitationKeyPattern(mock(GlobalCitationKeyPattern.class));
+        AbstractCitationKeyPattern pattern = new DatabaseCitationKeyPattern(
+            mock(GlobalCitationKeyPattern.class)
+        );
         pattern.setDefaultValue("test");
         pattern.addCitationKeyPattern(StandardEntryType.Article, "articleTest");
         metaData.setCiteKeyPattern(pattern);
 
-        databaseWriter.savePartOfDatabase(bibtexContext, Collections.emptyList());
+        databaseWriter.savePartOfDatabase(
+            bibtexContext,
+            Collections.emptyList()
+        );
 
-        assertEquals("@Comment{jabref-meta: keypattern_article:articleTest;}" + OS.NEWLINE
-                        + OS.NEWLINE + "@Comment{jabref-meta: keypatterndefault:test;}" + OS.NEWLINE,
-                stringWriter.toString());
+        assertEquals(
+            "@Comment{jabref-meta: keypattern_article:articleTest;}" +
+            OS.NEWLINE +
+            OS.NEWLINE +
+            "@Comment{jabref-meta: keypatterndefault:test;}" +
+            OS.NEWLINE,
+            stringWriter.toString()
+        );
     }
 
     @Test
     void writeBiblatexMode() throws Exception {
         metaData.setMode(BibDatabaseMode.BIBLATEX);
 
-        databaseWriter.savePartOfDatabase(bibtexContext, Collections.emptyList());
+        databaseWriter.savePartOfDatabase(
+            bibtexContext,
+            Collections.emptyList()
+        );
 
-        assertEquals("@Comment{jabref-meta: databaseType:biblatex;}" + OS.NEWLINE,
-                stringWriter.toString());
+        assertEquals(
+            "@Comment{jabref-meta: databaseType:biblatex;}" + OS.NEWLINE,
+            stringWriter.toString()
+        );
     }
 
     @Test
     void writeProtectedFlag() throws Exception {
         metaData.markAsProtected();
 
-        databaseWriter.savePartOfDatabase(bibtexContext, Collections.emptyList());
+        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
     void writeFileDirectories() throws Exception {
         metaData.setDefaultFileDirectory("\\Literature\\");
         metaData.setUserFileDirectory("defaultOwner-user", "D:\\Documents");
-        metaData.setLatexFileDirectory("defaultOwner-user", Path.of("D:\\Latex"));
+        metaData.setLatexFileDirectory(
+            "defaultOwner-user",
+            Path.of("D:\\Latex")
+        );
 
-        databaseWriter.savePartOfDatabase(bibtexContext, Collections.emptyList());
+        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);
+            .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);
+            .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);
+            .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,
-                stringWriter.toString());
+        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()
+        );
     }
 
     @Test
-    void writeEntriesInOriginalOrderWhenNoSaveOrderConfigIsSetInMetadata() throws Exception {
+    void writeEntriesInOriginalOrderWhenNoSaveOrderConfigIsSetInMetadata()
+        throws Exception {
         BibEntry firstEntry = new BibEntry();
         firstEntry.setType(StandardEntryType.Article);
         firstEntry.setField(StandardField.AUTHOR, "A");
@@ -862,20 +1366,35 @@ 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 +
-                        "}"
-                        + OS.NEWLINE,
-                stringWriter.toString());
+        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
@@ -886,15 +1405,21 @@ void trimFieldContents() throws IOException {
 
         databaseWriter.saveDatabase(bibtexContext);
 
-        assertEquals("@Article{," + OS.NEWLINE +
-                        "  note = {some note}," + OS.NEWLINE +
-                        "}" + OS.NEWLINE,
-                stringWriter.toString());
+        assertEquals(
+            "@Article{," +
+            OS.NEWLINE +
+            "  note = {some note}," +
+            OS.NEWLINE +
+            "}" +
+            OS.NEWLINE,
+            stringWriter.toString()
+        );
     }
 
     @Test
     void newlineAtEndOfAbstractFieldIsDeleted() throws Exception {
-        String text = "lorem ipsum lorem ipsum" + OS.NEWLINE + "lorem ipsum lorem ipsum";
+        String text =
+            "lorem ipsum lorem ipsum" + OS.NEWLINE + "lorem ipsum lorem ipsum";
 
         BibEntry entry = new BibEntry(StandardEntryType.Article);
         entry.setField(StandardField.ABSTRACT, text + OS.NEWLINE);
@@ -902,24 +1427,40 @@ void newlineAtEndOfAbstractFieldIsDeleted() throws Exception {
 
         databaseWriter.saveDatabase(bibtexContext);
 
-        assertEquals("@Article{," + OS.NEWLINE +
-                        "  abstract = {" + text + "}," + OS.NEWLINE +
-                        "}" + OS.NEWLINE,
-                stringWriter.toString());
+        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());
+        databaseWriter.savePartOfDatabase(
+            context,
+            firstParse.getDatabase().getEntries()
+        );
 
         assertEquals(commentEntry, stringWriter.toString());
     }
@@ -936,18 +1477,28 @@ void saveAlsoSavesSecondModification() throws Exception {
         // @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());
+        databaseWriter.savePartOfDatabase(
+            context,
+            firstParse.getDatabase().getEntries()
+        );
 
         // modify entry a second time
         entry.setField(StandardField.AUTHOR, "Test");
@@ -955,26 +1506,43 @@ void saveAlsoSavesSecondModification() throws Exception {
         // write a second time
         stringWriter = new StringWriter();
         bibWriter = new BibWriter(stringWriter, OS.NEWLINE);
-        databaseWriter = new BibtexDatabaseWriter(
+        databaseWriter =
+            new BibtexDatabaseWriter(
                 bibWriter,
                 saveConfiguration,
                 fieldPreferences,
                 citationKeyPatternPreferences,
-                entryTypesManager);
-        databaseWriter.savePartOfDatabase(context, firstParse.getDatabase().getEntries());
+                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 {
+    void saveReturnsToOriginalEntryWhenEntryIsFlaggedUnchanged()
+        throws Exception {
         // @formatter:off
         String bibtexEntry = "@Article{test," + OS.NEWLINE +
                 "  Author                   = {Foo Bar}," + OS.NEWLINE +
@@ -985,8 +1553,15 @@ void saveReturnsToOriginalEntryWhenEntryIsFlaggedUnchanged() throws Exception {
         // @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();
 
@@ -997,14 +1572,21 @@ void saveReturnsToOriginalEntryWhenEntryIsFlaggedUnchanged() throws Exception {
         entry.setChanged(false);
 
         // write entry
-        BibDatabaseContext context = new BibDatabaseContext(firstParse.getDatabase(), firstParse.getMetaData());
-        databaseWriter.savePartOfDatabase(context, firstParse.getDatabase().getEntries());
+        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 +
@@ -1015,17 +1597,30 @@ void saveReturnsToOriginalEntryWhenEntryIsFlaggedUnchangedEvenInThePresenceOfSav
         // @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());
+        databaseWriter.savePartOfDatabase(
+            context,
+            firstParse.getDatabase().getEntries()
+        );
 
         // modify entry a second time
         entry.setField(StandardField.AUTHOR, "Test");
@@ -1035,13 +1630,18 @@ void saveReturnsToOriginalEntryWhenEntryIsFlaggedUnchangedEvenInThePresenceOfSav
         // write a second time
         stringWriter = new StringWriter();
         bibWriter = new BibWriter(stringWriter, OS.NEWLINE);
-        databaseWriter = new BibtexDatabaseWriter(
+        databaseWriter =
+            new BibtexDatabaseWriter(
                 bibWriter,
                 saveConfiguration,
                 fieldPreferences,
                 citationKeyPatternPreferences,
-                entryTypesManager);
-        databaseWriter.savePartOfDatabase(context, firstParse.getDatabase().getEntries());
+                entryTypesManager
+            );
+        databaseWriter.savePartOfDatabase(
+            context,
+            firstParse.getDatabase().getEntries()
+        );
 
         // returns tu original entry, not to the last saved one
         assertEquals(bibtexEntry, stringWriter.toString());
diff --git a/src/test/java/org/jabref/logic/exporter/CsvExportFormatTest.java b/src/test/java/org/jabref/logic/exporter/CsvExportFormatTest.java
index 53342e7d7fa..952319cf8b3 100644
--- a/src/test/java/org/jabref/logic/exporter/CsvExportFormatTest.java
+++ b/src/test/java/org/jabref/logic/exporter/CsvExportFormatTest.java
@@ -1,26 +1,24 @@
 package org.jabref.logic.exporter;
 
+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;
-
 import org.jabref.logic.layout.LayoutFormatterPreferences;
 import org.jabref.logic.util.StandardFileType;
 import org.jabref.model.database.BibDatabaseContext;
 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;
-
 public class CsvExportFormatTest {
 
     public BibDatabaseContext databaseContext;
@@ -28,14 +26,19 @@ public class CsvExportFormatTest {
 
     @BeforeEach
     public void setUp() {
-        exportFormat = new TemplateExporter(
+        exportFormat =
+            new TemplateExporter(
                 "OpenOffice/LibreOffice CSV",
                 "oocsv",
                 "openoffice-csv",
                 "openoffice",
                 StandardFileType.CSV,
-                mock(LayoutFormatterPreferences.class, Answers.RETURNS_DEEP_STUBS),
-                SaveOrder.getDefaultSaveOrder());
+                mock(
+                    LayoutFormatterPreferences.class,
+                    Answers.RETURNS_DEEP_STUBS
+                ),
+                SaveOrder.getDefaultSaveOrder()
+            );
 
         databaseContext = new BibDatabaseContext();
     }
@@ -46,10 +49,12 @@ public void tearDown() {
     }
 
     @Test
-    public void testPerformExportForSingleAuthor(@TempDir Path testFolder) throws Exception {
+    public void testPerformExportForSingleAuthor(@TempDir Path testFolder)
+        throws Exception {
         Path path = testFolder.resolve("ThisIsARandomlyNamedFile");
 
-        BibEntry entry = new BibEntry().withField(StandardField.AUTHOR, "Someone, Van Something");
+        BibEntry entry = new BibEntry()
+            .withField(StandardField.AUTHOR, "Someone, Van Something");
         List<BibEntry> entries = List.of(entry);
 
         exportFormat.export(databaseContext, path, entries);
@@ -57,15 +62,21 @@ public void testPerformExportForSingleAuthor(@TempDir Path testFolder) throws Ex
         List<String> lines = Files.readAllLines(path);
         assertEquals(2, lines.size());
         assertEquals(
-                "10,\"\",\"\",\"Someone, Van Something\",\"\",\"\",,,\"\",\"\",,\"\",\"\",\"\",\"\",\"\",\"\",\"\",\"\",\"\",\"\",\"\",\"\",\"\",\"\",\"\",\"\",\"\",\"\",\"\",\"\"",
-                lines.get(1));
+            "10,\"\",\"\",\"Someone, Van Something\",\"\",\"\",,,\"\",\"\",,\"\",\"\",\"\",\"\",\"\",\"\",\"\",\"\",\"\",\"\",\"\",\"\",\"\",\"\",\"\",\"\",\"\",\"\",\"\",\"\"",
+            lines.get(1)
+        );
     }
 
     @Test
-    public void testPerformExportForMultipleAuthors(@TempDir Path testFolder) throws Exception {
+    public void testPerformExportForMultipleAuthors(@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);
@@ -73,15 +84,18 @@ public void testPerformExportForMultipleAuthors(@TempDir Path testFolder) throws
         List<String> lines = Files.readAllLines(path);
         assertEquals(2, lines.size());
         assertEquals(
-                "10,\"\",\"\",\"von Neumann, John; Smith, John; Black Brown, Peter\",\"\",\"\",,,\"\",\"\",,\"\",\"\",\"\",\"\",\"\",\"\",\"\",\"\",\"\",\"\",\"\",\"\",\"\",\"\",\"\",\"\",\"\",\"\",\"\",\"\"",
-                lines.get(1));
+            "10,\"\",\"\",\"von Neumann, John; Smith, John; Black Brown, Peter\",\"\",\"\",,,\"\",\"\",,\"\",\"\",\"\",\"\",\"\",\"\",\"\",\"\",\"\",\"\",\"\",\"\",\"\",\"\",\"\",\"\",\"\",\"\",\"\",\"\"",
+            lines.get(1)
+        );
     }
 
     @Test
-    public void testPerformExportForSingleEditor(@TempDir Path testFolder) throws Exception {
+    public void testPerformExportForSingleEditor(@TempDir Path testFolder)
+        throws Exception {
         Path path = testFolder.resolve("ThisIsARandomlyNamedFile");
         File tmpFile = path.toFile();
-        BibEntry entry = new BibEntry().withField(StandardField.EDITOR, "Someone, Van Something");
+        BibEntry entry = new BibEntry()
+            .withField(StandardField.EDITOR, "Someone, Van Something");
         List<BibEntry> entries = List.of(entry);
 
         exportFormat.export(databaseContext, tmpFile.toPath(), entries);
@@ -89,16 +103,21 @@ public void testPerformExportForSingleEditor(@TempDir Path testFolder) throws Ex
         List<String> lines = Files.readAllLines(tmpFile.toPath());
         assertEquals(2, lines.size());
         assertEquals(
-                "10,\"\",\"\",\"\",\"\",\"\",,,\"\",\"\",,\"\",\"\",\"\",\"\",\"\",\"\",\"\",\"Someone, Van Something\",\"\",\"\",\"\",\"\",\"\",\"\",\"\",\"\",\"\",\"\",\"\",\"\"",
-                lines.get(1));
+            "10,\"\",\"\",\"\",\"\",\"\",,,\"\",\"\",,\"\",\"\",\"\",\"\",\"\",\"\",\"\",\"Someone, Van Something\",\"\",\"\",\"\",\"\",\"\",\"\",\"\",\"\",\"\",\"\",\"\",\"\"",
+            lines.get(1)
+        );
     }
 
     @Test
-    public void testPerformExportForMultipleEditors(@TempDir Path testFolder) throws Exception {
+    public void testPerformExportForMultipleEditors(@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");
+            .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);
@@ -106,7 +125,8 @@ public void testPerformExportForMultipleEditors(@TempDir Path testFolder) throws
         List<String> lines = Files.readAllLines(tmpFile.toPath());
         assertEquals(2, lines.size());
         assertEquals(
-                "10,\"\",\"\",\"\",\"\",\"\",,,\"\",\"\",,\"\",\"\",\"\",\"\",\"\",\"\",\"\",\"von Neumann, John; Smith, John; Black Brown, Peter\",\"\",\"\",\"\",\"\",\"\",\"\",\"\",\"\",\"\",\"\",\"\",\"\"",
-                lines.get(1));
+            "10,\"\",\"\",\"\",\"\",\"\",,,\"\",\"\",,\"\",\"\",\"\",\"\",\"\",\"\",\"\",\"von Neumann, John; Smith, John; Black Brown, Peter\",\"\",\"\",\"\",\"\",\"\",\"\",\"\",\"\",\"\",\"\",\"\",\"\"",
+            lines.get(1)
+        );
     }
 }
diff --git a/src/test/java/org/jabref/logic/exporter/DocBook5ExporterTest.java b/src/test/java/org/jabref/logic/exporter/DocBook5ExporterTest.java
index 07877f9c255..d983ec3460d 100644
--- a/src/test/java/org/jabref/logic/exporter/DocBook5ExporterTest.java
+++ b/src/test/java/org/jabref/logic/exporter/DocBook5ExporterTest.java
@@ -1,5 +1,8 @@
 package org.jabref.logic.exporter;
 
+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;
@@ -8,7 +11,6 @@
 import java.time.LocalDate;
 import java.util.Collections;
 import java.util.List;
-
 import org.jabref.logic.layout.LayoutFormatterPreferences;
 import org.jabref.logic.util.StandardFileType;
 import org.jabref.model.database.BibDatabaseContext;
@@ -17,7 +19,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,9 +29,6 @@
 import org.xmlunit.diff.ElementSelectors;
 import org.xmlunit.matchers.CompareMatcher;
 
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.mockito.Mockito.mock;
-
 public class DocBook5ExporterTest {
 
     public BibDatabaseContext databaseContext;
@@ -42,31 +40,43 @@ public class DocBook5ExporterTest {
 
     @BeforeEach
     void setUp() throws URISyntaxException {
-        exporter = new TemplateExporter(
+        exporter =
+            new TemplateExporter(
                 "DocBook 5.1",
                 "docbook5",
                 "docbook5",
                 null,
                 StandardFileType.XML,
-                mock(LayoutFormatterPreferences.class, Answers.RETURNS_DEEP_STUBS),
-                SaveOrder.getDefaultSaveOrder());
+                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));
+            .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);
     }
 
     @Test
-    void testPerformExportForSingleEntry(@TempDir Path testFolder) throws Exception {
+    void testPerformExportForSingleEntry(@TempDir Path testFolder)
+        throws Exception {
         Path path = testFolder.resolve("ThisIsARandomlyNamedFile");
 
         exporter.export(databaseContext, path, entries);
@@ -74,8 +84,15 @@ void testPerformExportForSingleEntry(@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 23221d0311a..2989cfb98e4 100644
--- a/src/test/java/org/jabref/logic/exporter/DocbookExporterTest.java
+++ b/src/test/java/org/jabref/logic/exporter/DocbookExporterTest.java
@@ -1,27 +1,25 @@
 package org.jabref.logic.exporter;
 
+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;
-
 import org.jabref.logic.layout.LayoutFormatterPreferences;
 import org.jabref.logic.util.StandardFileType;
 import org.jabref.model.database.BibDatabaseContext;
 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;
-
 public class DocbookExporterTest {
 
     public BibDatabaseContext databaseContext = new BibDatabaseContext();
@@ -31,22 +29,31 @@ public class DocbookExporterTest {
 
     @BeforeEach
     public void setUp() {
-        exportFormat = new TemplateExporter(
+        exportFormat =
+            new TemplateExporter(
                 "DocBook 4",
                 "docbook4",
                 "docbook4",
                 null,
                 StandardFileType.XML,
-                mock(LayoutFormatterPreferences.class, Answers.RETURNS_DEEP_STUBS),
-                SaveOrder.getDefaultSaveOrder());
+                mock(
+                    LayoutFormatterPreferences.class,
+                    Answers.RETURNS_DEEP_STUBS
+                ),
+                SaveOrder.getDefaultSaveOrder()
+            );
     }
 
     @Test
-    public void testCorruptedTitleBraces(@TempDir Path testFolder) throws Exception {
+    public void testCorruptedTitleBraces(@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,15 +61,22 @@ public void testCorruptedTitleBraces(@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
-    public void testCorruptedTitleUnicode(@TempDir Path testFolder) throws Exception {
+    public void testCorruptedTitleUnicode(@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 +84,9 @@ public void testCorruptedTitleUnicode(@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 ef821bc6638..5ac56b04fb4 100644
--- a/src/test/java/org/jabref/logic/exporter/EmbeddedBibFilePdfExporterTest.java
+++ b/src/test/java/org/jabref/logic/exporter/EmbeddedBibFilePdfExporterTest.java
@@ -1,13 +1,19 @@
 package org.jabref.logic.exporter;
 
+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;
-
 import javafx.collections.FXCollections;
-
+import org.apache.pdfbox.pdmodel.PDDocument;
+import org.apache.pdfbox.pdmodel.PDPage;
 import org.jabref.logic.bibtex.FieldPreferences;
 import org.jabref.logic.importer.ImportFormatPreferences;
 import org.jabref.logic.importer.fileformat.PdfEmbeddedBibFileImporter;
@@ -22,9 +28,6 @@
 import org.jabref.model.entry.field.StandardField;
 import org.jabref.model.entry.types.StandardEntryType;
 import org.jabref.preferences.FilePreferences;
-
-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,19 +35,16 @@
 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;
-
 class EmbeddedBibFilePdfExporterTest {
 
-    @TempDir static Path tempDir;
+    @TempDir
+    static Path tempDir;
 
     private static BibEntry olly2018 = new BibEntry(StandardEntryType.Article);
     private static BibEntry toral2006 = new BibEntry(StandardEntryType.Article);
-    private static BibEntry vapnik2000 = new BibEntry(StandardEntryType.Article);
+    private static BibEntry vapnik2000 = new BibEntry(
+        StandardEntryType.Article
+    );
 
     private EmbeddedBibFilePdfExporter exporter;
 
@@ -76,22 +76,41 @@ private static void initBibEntries() throws IOException {
         olly2018.setField(StandardField.REVIEW, "review");
         olly2018.setField(StandardField.URL, "https://www.olly2018.edu");
 
-        LinkedFile linkedFile = createDefaultLinkedFile("existing.pdf", tempDir);
+        LinkedFile linkedFile = createDefaultLinkedFile(
+            "existing.pdf",
+            tempDir
+        );
         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.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.BOOKTITLE, "Proceedings of EACL");
         toral2006.setField(StandardField.PAGES, "56--61");
         toral2006.setField(StandardField.EPRINTTYPE, "asdf");
         toral2006.setField(StandardField.OWNER, "Ich");
         toral2006.setField(StandardField.URL, "www.url.de");
 
-        toral2006.setFiles(List.of(new LinkedFile("non-existing", "path/to/nowhere.pdf", "PDF")));
+        toral2006.setFiles(
+            List.of(
+                new LinkedFile("non-existing", "path/to/nowhere.pdf", "PDF")
+            )
+        );
 
         vapnik2000.setCitationKey("vapnik2000");
-        vapnik2000.setField(StandardField.TITLE, "The Nature of Statistical Learning Theory");
-        vapnik2000.setField(StandardField.PUBLISHER, "Springer Science + Business Media");
+        vapnik2000.setField(
+            StandardField.TITLE,
+            "The Nature of Statistical Learning Theory"
+        );
+        vapnik2000.setField(
+            StandardField.PUBLISHER,
+            "Springer Science + Business Media"
+        );
         vapnik2000.setField(StandardField.AUTHOR, "Vladimir N. Vapnik");
         vapnik2000.setField(StandardField.DOI, "10.1007/978-1-4757-3264-1");
         vapnik2000.setField(StandardField.OWNER, "Ich");
@@ -105,20 +124,32 @@ void setUp() throws IOException {
         abbreviationRepository = mock(JournalAbbreviationRepository.class);
 
         filePreferences = mock(FilePreferences.class);
-        when(filePreferences.getUserAndHost()).thenReturn(tempDir.toAbsolutePath().toString());
-        when(filePreferences.shouldStoreFilesRelativeToBibFile()).thenReturn(false);
+        when(filePreferences.getUserAndHost())
+            .thenReturn(tempDir.toAbsolutePath().toString());
+        when(filePreferences.shouldStoreFilesRelativeToBibFile())
+            .thenReturn(false);
 
         BibDatabaseMode bibDatabaseMode = BibDatabaseMode.BIBTEX;
         BibEntryTypesManager bibEntryTypesManager = new BibEntryTypesManager();
         FieldPreferences fieldPreferences = new FieldPreferences(
-                true,
-                List.of(StandardField.MONTH),
-                Collections.emptyList());
-
-        exporter = new EmbeddedBibFilePdfExporter(bibDatabaseMode, bibEntryTypesManager, fieldPreferences);
-
-        ImportFormatPreferences importFormatPreferences = mock(ImportFormatPreferences.class, Answers.RETURNS_DEEP_STUBS);
-        when(importFormatPreferences.fieldPreferences().getNonWrappableFields()).thenReturn(FXCollections.emptyObservableList());
+            true,
+            List.of(StandardField.MONTH),
+            Collections.emptyList()
+        );
+
+        exporter =
+            new EmbeddedBibFilePdfExporter(
+                bibDatabaseMode,
+                bibEntryTypesManager,
+                fieldPreferences
+            );
+
+        ImportFormatPreferences importFormatPreferences = mock(
+            ImportFormatPreferences.class,
+            Answers.RETURNS_DEEP_STUBS
+        );
+        when(importFormatPreferences.fieldPreferences().getNonWrappableFields())
+            .thenReturn(FXCollections.emptyObservableList());
         importer = new PdfEmbeddedBibFileImporter(importFormatPreferences);
 
         databaseContext = new BibDatabaseContext();
@@ -132,14 +163,34 @@ void setUp() throws IOException {
 
     @ParameterizedTest
     @MethodSource("provideBibEntriesWithValidPdfFileLinks")
-    void successfulExportToAllFilesOfEntry(BibEntry bibEntryWithValidPdfFileLink) throws Exception {
-        assertTrue(exporter.exportToAllFilesOfEntry(databaseContext, filePreferences, bibEntryWithValidPdfFileLink, List.of(olly2018), abbreviationRepository));
+    void successfulExportToAllFilesOfEntry(
+        BibEntry bibEntryWithValidPdfFileLink
+    ) throws Exception {
+        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,32 +204,60 @@ 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() {
-        return Stream.of(Arguments.of(tempDir.resolve("original.pdf").toAbsolutePath()));
+        return Stream.of(
+            Arguments.of(tempDir.resolve("original.pdf").toAbsolutePath())
+        );
     }
 
     public static Stream<Arguments> providePathsToValidPDFs() {
-        return Stream.of(Arguments.of(tempDir.resolve("existing.pdf").toAbsolutePath()));
+        return Stream.of(
+            Arguments.of(tempDir.resolve("existing.pdf").toAbsolutePath())
+        );
     }
 
-    public static Stream<Arguments> providePathsToInvalidPDFs() throws IOException {
-        LinkedFile existingFileThatIsNotLinked = createDefaultLinkedFile("notlinked.pdf", tempDir);
+    public static Stream<Arguments> providePathsToInvalidPDFs()
+        throws IOException {
+        LinkedFile existingFileThatIsNotLinked = createDefaultLinkedFile(
+            "notlinked.pdf",
+            tempDir
+        );
         return Stream.of(
-                Arguments.of(Path.of("")),
-                Arguments.of(tempDir.resolve("path/to/nowhere.pdf").toAbsolutePath()),
-                Arguments.of(Path.of(existingFileThatIsNotLinked.getLink())));
+            Arguments.of(Path.of("")),
+            Arguments.of(
+                tempDir.resolve("path/to/nowhere.pdf").toAbsolutePath()
+            ),
+            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());
@@ -192,18 +271,21 @@ private static LinkedFile createDefaultLinkedFile(String fileName, Path tempDir)
     @MethodSource("providePathToNewPDFs")
     public void testRoundtripExportImport(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");
+            .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);
 
         exporter.export(databaseContext, path, expectedEntries);
 
-        List<BibEntry> importedEntries = importer.importDatabase(path).getDatabase().getEntries();
+        List<BibEntry> importedEntries = importer
+            .importDatabase(path)
+            .getDatabase()
+            .getEntries();
 
         assertEquals(expectedEntries, importedEntries);
     }
diff --git a/src/test/java/org/jabref/logic/exporter/ExporterTest.java b/src/test/java/org/jabref/logic/exporter/ExporterTest.java
index b6e4c026e9b..5f02aa1b369 100644
--- a/src/test/java/org/jabref/logic/exporter/ExporterTest.java
+++ b/src/test/java/org/jabref/logic/exporter/ExporterTest.java
@@ -1,5 +1,10 @@
 package org.jabref.logic.exporter;
 
+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;
@@ -7,26 +12,18 @@
 import java.util.Collections;
 import java.util.List;
 import java.util.stream.Stream;
-
 import javafx.collections.FXCollections;
-
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.BibEntryTypesManager;
 import org.jabref.model.metadata.SaveOrder;
 import org.jabref.preferences.PreferencesService;
-
 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;
-
 public class ExporterTest {
 
     public BibDatabaseContext databaseContext;
@@ -39,24 +36,34 @@ public void setUp() {
     }
 
     private static Stream<Object[]> exportFormats() {
-        PreferencesService preferencesService = mock(PreferencesService.class, Answers.RETURNS_DEEP_STUBS);
-        when(preferencesService.getExportPreferences().getExportSaveOrder()).thenReturn(SaveOrder.getDefaultSaveOrder());
-        when(preferencesService.getExportPreferences().getCustomExporters()).thenReturn(FXCollections.emptyObservableList());
+        PreferencesService preferencesService = mock(
+            PreferencesService.class,
+            Answers.RETURNS_DEEP_STUBS
+        );
+        when(preferencesService.getExportPreferences().getExportSaveOrder())
+            .thenReturn(SaveOrder.getDefaultSaveOrder());
+        when(preferencesService.getExportPreferences().getCustomExporters())
+            .thenReturn(FXCollections.emptyObservableList());
 
         ExporterFactory exporterFactory = ExporterFactory.create(
-                preferencesService,
-                mock(BibEntryTypesManager.class));
+            preferencesService,
+            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")
-    public void testExportingEmptyDatabaseYieldsEmptyFile(Exporter exportFormat, String name, @TempDir Path testFolder) throws Exception {
+    public void testExportingEmptyDatabaseYieldsEmptyFile(
+        Exporter exportFormat,
+        String name,
+        @TempDir Path testFolder
+    ) throws Exception {
         Path tmpFile = testFolder.resolve("ARandomlyNamedFile");
         Files.createFile(tmpFile);
         exportFormat.export(databaseContext, tmpFile, entries);
@@ -65,11 +72,18 @@ public void testExportingEmptyDatabaseYieldsEmptyFile(Exporter exportFormat, Str
 
     @ParameterizedTest
     @MethodSource("exportFormats")
-    public void testExportingNullDatabaseThrowsNPE(Exporter exportFormat, String name, @TempDir Path testFolder) {
-        assertThrows(NullPointerException.class, () -> {
-            Path tmpFile = testFolder.resolve("ARandomlyNamedFile");
-            Files.createFile(tmpFile);
-            exportFormat.export(null, tmpFile, entries);
-        });
+    public void testExportingNullDatabaseThrowsNPE(
+        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 da190c5de0a..c16526df379 100644
--- a/src/test/java/org/jabref/logic/exporter/GroupSerializerTest.java
+++ b/src/test/java/org/jabref/logic/exporter/GroupSerializerTest.java
@@ -1,13 +1,13 @@
 package org.jabref.logic.exporter;
 
+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;
-
 import javafx.scene.paint.Color;
-
 import org.jabref.logic.auxparser.DefaultAuxParser;
 import org.jabref.model.database.BibDatabase;
 import org.jabref.model.entry.field.StandardField;
@@ -26,12 +26,9 @@
 import org.jabref.model.groups.WordKeywordGroup;
 import org.jabref.model.metadata.MetaData;
 import org.jabref.model.search.rules.SearchRules;
-
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-
 class GroupSerializerTest {
 
     private GroupSerializer groupSerializer;
@@ -44,83 +41,209 @@ void setUp() throws Exception {
     @Test
     void serializeSingleAllEntriesGroup() {
         AllEntriesGroup group = new AllEntriesGroup("");
-        List<String> serialization = groupSerializer.serializeTree(GroupTreeNode.fromGroup(group));
-        assertEquals(Collections.singletonList("0 AllEntriesGroup:"), serialization);
+        List<String> serialization = groupSerializer.serializeTree(
+            GroupTreeNode.fromGroup(group)
+        );
+        assertEquals(
+            Collections.singletonList("0 AllEntriesGroup:"),
+            serialization
+        );
     }
 
     @Test
     void serializeSingleExplicitGroup() {
-        ExplicitGroup group = new ExplicitGroup("myExplicitGroup", GroupHierarchyType.INDEPENDENT, ',');
-        List<String> serialization = groupSerializer.serializeTree(GroupTreeNode.fromGroup(group));
-        assertEquals(Collections.singletonList("0 StaticGroup:myExplicitGroup;0;1;;;;"), serialization);
+        ExplicitGroup group = new ExplicitGroup(
+            "myExplicitGroup",
+            GroupHierarchyType.INDEPENDENT,
+            ','
+        );
+        List<String> serialization = groupSerializer.serializeTree(
+            GroupTreeNode.fromGroup(group)
+        );
+        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);
+        List<String> serialization = groupSerializer.serializeTree(
+            GroupTreeNode.fromGroup(group)
+        );
+        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, ',');
-        List<String> serialization = groupSerializer.serializeTree(GroupTreeNode.fromGroup(group));
-        assertEquals(Collections.singletonList("0 StaticGroup:B{\\\\\"{o}}hmer;0;1;;;;"), serialization);
+        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
+        );
     }
 
     @Test
     void serializeSingleSimpleKeywordGroup() {
-        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);
+        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
+        );
     }
 
     @Test
     void serializeSingleRegexKeywordGroup() {
-        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);
+        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
+        );
     }
 
     @Test
     void serializeSingleSearchGroup() {
-        SearchGroup group = new SearchGroup("myExplicitGroup", GroupHierarchyType.INDEPENDENT, "author=harrer", EnumSet.of(SearchRules.SearchFlags.CASE_SENSITIVE, SearchRules.SearchFlags.REGULAR_EXPRESSION));
-        List<String> serialization = groupSerializer.serializeTree(GroupTreeNode.fromGroup(group));
-        assertEquals(Collections.singletonList("0 SearchGroup:myExplicitGroup;0;author=harrer;1;1;1;;;;"), serialization);
+        SearchGroup group = new SearchGroup(
+            "myExplicitGroup",
+            GroupHierarchyType.INDEPENDENT,
+            "author=harrer",
+            EnumSet.of(
+                SearchRules.SearchFlags.CASE_SENSITIVE,
+                SearchRules.SearchFlags.REGULAR_EXPRESSION
+            )
+        );
+        List<String> serialization = groupSerializer.serializeTree(
+            GroupTreeNode.fromGroup(group)
+        );
+        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(SearchRules.SearchFlags.CASE_SENSITIVE));
-        List<String> serialization = groupSerializer.serializeTree(GroupTreeNode.fromGroup(group));
-        assertEquals(Collections.singletonList("0 SearchGroup:myExplicitGroup;2;author=\"harrer\";1;0;1;;;;"), serialization);
+        SearchGroup group = new SearchGroup(
+            "myExplicitGroup",
+            GroupHierarchyType.INCLUDING,
+            "author=\"harrer\"",
+            EnumSet.of(SearchRules.SearchFlags.CASE_SENSITIVE)
+        );
+        List<String> serialization = groupSerializer.serializeTree(
+            GroupTreeNode.fromGroup(group)
+        );
+        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, ',', '>');
-        List<String> serialization = groupSerializer.serializeTree(GroupTreeNode.fromGroup(group));
-        assertEquals(Collections.singletonList("0 AutomaticKeywordGroup:myAutomaticGroup;0;keywords;,;>;1;;;;"), serialization);
+        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
+        );
     }
 
     @Test
     void serializeSingleAutomaticPersonGroup() {
-        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);
+        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
+        );
     }
 
     @Test
     void serializeSingleTexGroup() throws Exception {
-        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);
+        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
+        );
     }
 
     @Test
@@ -129,10 +252,10 @@ void getTreeAsStringInSimpleTree() throws Exception {
         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;;;;"
+            "0 AllEntriesGroup:",
+            "1 StaticGroup:ExplicitA;2;1;;;;",
+            "1 StaticGroup:ExplicitParent;0;1;;;;",
+            "2 StaticGroup:ExplicitNode;1;1;;;;"
         );
         assertEquals(expected, groupSerializer.serializeTree(root));
     }
@@ -143,20 +266,20 @@ void getTreeAsStringInComplexTree() throws Exception {
         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;;;;"
+            "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 0b6356906e9..260efd98c85 100644
--- a/src/test/java/org/jabref/logic/exporter/HayagrivaYamlExporterTest.java
+++ b/src/test/java/org/jabref/logic/exporter/HayagrivaYamlExporterTest.java
@@ -1,10 +1,12 @@
 package org.jabref.logic.exporter;
 
+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;
-
 import org.jabref.logic.layout.LayoutFormatterPreferences;
 import org.jabref.logic.util.StandardFileType;
 import org.jabref.model.database.BibDatabaseContext;
@@ -12,15 +14,11 @@
 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;
-
 public class HayagrivaYamlExporterTest {
 
     private static Exporter hayagrivaYamlExporter;
@@ -28,105 +26,133 @@ public class HayagrivaYamlExporterTest {
 
     @BeforeAll
     static void setUp() {
-        hayagrivaYamlExporter = new TemplateExporter(
+        hayagrivaYamlExporter =
+            new TemplateExporter(
                 "Hayagriva YAML",
                 "hayagrivayaml",
                 "hayagrivayaml",
                 null,
                 StandardFileType.YAML,
-                mock(LayoutFormatterPreferences.class, Answers.RETURNS_DEEP_STUBS),
+                mock(
+                    LayoutFormatterPreferences.class,
+                    Answers.RETURNS_DEEP_STUBS
+                ),
                 SaveOrder.getDefaultSaveOrder(),
-                BlankLineBehaviour.DELETE_BLANKS);
+                BlankLineBehaviour.DELETE_BLANKS
+            );
 
         databaseContext = new BibDatabaseContext();
     }
 
     @Test
-    public final void exportForNoEntriesWritesNothing(@TempDir Path tempFile) throws Exception {
+    public final void exportForNoEntriesWritesNothing(@TempDir Path tempFile)
+        throws Exception {
         Path file = tempFile.resolve("ThisIsARandomlyNamedFile");
         Files.createFile(file);
-        hayagrivaYamlExporter.export(databaseContext, tempFile, Collections.emptyList());
+        hayagrivaYamlExporter.export(
+            databaseContext,
+            tempFile,
+            Collections.emptyList()
+        );
         assertEquals(Collections.emptyList(), Files.readAllLines(file));
     }
 
     @Test
-    public final void exportsCorrectContent(@TempDir Path tempFile) throws Exception {
+    public 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");
+            .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));
+        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",
-                "---");
+            "---",
+            "test:",
+            "  type: article",
+            "  title: \"Test Title\"",
+            "  author:",
+            "    - Author, Test",
+            "  date: 2020-10-14",
+            "  url: http://example.com",
+            "---"
+        );
 
         assertEquals(expected, Files.readAllLines(file));
     }
 
     @Test
-    public final void exportsCorrectMultipleAuthors(@TempDir Path tempFile) throws Exception {
+    public 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");
+            .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));
+        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",
-                "---");
+            "---",
+            "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
-    public final void formatsContentCorrect(@TempDir Path tempFile) throws Exception {
+    public 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");
+            .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));
+        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",
-                "---");
+            "---",
+            "test:",
+            "  type: Misc",
+            "  title: \"Test Title\"",
+            "  author:",
+            "    - Author, Test",
+            "  date: 2020-10-14",
+            "  url: http://example.com",
+            "---"
+        );
 
         assertEquals(expected, Files.readAllLines(file));
     }
@@ -134,26 +160,31 @@ public final void formatsContentCorrect(@TempDir Path tempFile) throws Exception
     @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");
+            .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));
+        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",
-                "---");
+            "---",
+            "test:",
+            "  type: article",
+            "  title: \"細雪\"",
+            "  author:",
+            "    - 潤一郎, 谷崎",
+            "  date: 2020-10-14",
+            "  url: http://example.com",
+            "---"
+        );
 
         assertEquals(expected, Files.readAllLines(file));
     }
@@ -161,56 +192,67 @@ void passesModifiedCharset(@TempDir Path tempFile) throws Exception {
     @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");
+            .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));
+        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",
-                "---");
+            "---",
+            "test:",
+            "  type: article",
+            "  title: \"細雪\"",
+            "  author:",
+            "    - 潤一郎, 谷崎",
+            "  date: 2020-10-14",
+            "  url: http://example.com",
+            "---"
+        );
         assertEquals(expected, Files.readAllLines(file));
     }
 
     @Test
-    public final void exportsCorrectParentField(@TempDir Path tempFile) throws Exception {
+    public 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");
+            .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));
+        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",
-                "---");
+            "---",
+            "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 b684e84a2e4..b414f77e6c4 100644
--- a/src/test/java/org/jabref/logic/exporter/HtmlExportFormatTest.java
+++ b/src/test/java/org/jabref/logic/exporter/HtmlExportFormatTest.java
@@ -1,28 +1,27 @@
 package org.jabref.logic.exporter;
 
+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;
-
 import org.jabref.logic.layout.LayoutFormatterPreferences;
 import org.jabref.logic.util.StandardFileType;
 import org.jabref.model.database.BibDatabaseContext;
 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;
-
 public class HtmlExportFormatTest {
+
     public BibDatabaseContext databaseContext;
     public Charset charset;
     public List<BibEntry> entries;
@@ -30,13 +29,19 @@ public class HtmlExportFormatTest {
 
     @BeforeEach
     public void setUp() {
-        exportFormat = new TemplateExporter("HTML",
+        exportFormat =
+            new TemplateExporter(
+                "HTML",
                 "html",
                 "html",
                 null,
                 StandardFileType.HTML,
-                mock(LayoutFormatterPreferences.class, Answers.RETURNS_DEEP_STUBS),
-                SaveOrder.getDefaultSaveOrder());
+                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 f3c2ad9358e..d1a56a4ab04 100644
--- a/src/test/java/org/jabref/logic/exporter/MSBibExportFormatFilesTest.java
+++ b/src/test/java/org/jabref/logic/exporter/MSBibExportFormatFilesTest.java
@@ -1,5 +1,9 @@
 package org.jabref.logic.exporter;
 
+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;
@@ -9,13 +13,11 @@
 import java.util.List;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
-
 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;
@@ -24,10 +26,6 @@
 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;
-
 public class MSBibExportFormatFilesTest {
 
     private static Path resourceDir;
@@ -39,13 +37,22 @@ 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"))
-                         .collect(Collectors.toList())
-                         .stream();
+            return stream
+                .map(n -> n.getFileName().toString())
+                .filter(n -> n.endsWith(".bib"))
+                .filter(n -> n.startsWith("MsBib"))
+                .collect(Collectors.toList())
+                .stream();
         }
     }
 
@@ -56,7 +63,11 @@ 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}")
@@ -66,10 +77,15 @@ void testPerformExport(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));
@@ -78,9 +94,14 @@ void testPerformExport(String filename) throws IOException, SaveException {
         // The order of 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)
+        assertThat(
+            expected,
+            isSimilarTo(actual)
                 .ignoreWhitespace()
                 .normalizeWhitespace()
-                .withNodeMatcher(new DefaultNodeMatcher(ElementSelectors.byNameAndText)));
+                .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 ebff3f7815e..94910bb9c01 100644
--- a/src/test/java/org/jabref/logic/exporter/MetaDataSerializerTest.java
+++ b/src/test/java/org/jabref/logic/exporter/MetaDataSerializerTest.java
@@ -1,12 +1,13 @@
 package org.jabref.logic.exporter;
 
+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;
-
 import org.jabref.logic.citationkeypattern.GlobalCitationKeyPattern;
 import org.jabref.logic.cleanup.FieldFormatterCleanup;
 import org.jabref.logic.cleanup.FieldFormatterCleanups;
@@ -24,18 +25,17 @@
 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;
-
 public class MetaDataSerializerTest {
 
-    private static final EntryType CUSTOM_TYPE = new UnknownEntryType("customType");
+    private static final EntryType CUSTOM_TYPE = new UnknownEntryType(
+        "customType"
+    );
 
     private MetaData metaData;
     private GlobalCitationKeyPattern pattern;
@@ -45,60 +45,98 @@ public class MetaDataSerializerTest {
     public void setUp() {
         metaData = new MetaData();
         pattern = GlobalCitationKeyPattern.fromPattern("[auth][year]");
-        newCustomType = new BibEntryType(
+        newCustomType =
+            new BibEntryType(
                 CUSTOM_TYPE,
-                List.of(new BibField(StandardField.AUTHOR, FieldPriority.IMPORTANT)),
-                Collections.emptySet());
+                List.of(
+                    new BibField(StandardField.AUTHOR, FieldPriority.IMPORTANT)
+                ),
+                Collections.emptySet()
+            );
     }
 
     @Test
     public void serializeNewMetadataReturnsEmptyMap() {
-        assertEquals(Collections.emptyMap(), MetaDataSerializer.getSerializedStringMap(metaData, pattern));
+        assertEquals(
+            Collections.emptyMap(),
+            MetaDataSerializer.getSerializedStringMap(metaData, pattern)
+        );
     }
 
     @Test
     public 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
     public void serializeSingleContentSelectors() {
         List<String> values = List.of(
-                "approved",
-                "captured",
-                "received",
-                "status");
+            "approved",
+            "captured",
+            "received",
+            "status"
+        );
 
-        metaData.addContentSelector(new ContentSelector(StandardField.PUBSTATE, values));
+        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));
+        expectedSerialization.put(
+            "selector_pubstate",
+            "approved;captured;received;status;"
+        );
+        assertEquals(
+            expectedSerialization,
+            MetaDataSerializer.getSerializedStringMap(metaData, pattern)
+        );
     }
 
     @Test
     void testParsingEmptyOrFieldsReturnsEmptyCollections() {
-        String serialized = MetaDataSerializer.serializeCustomEntryTypes(newCustomType);
-        Optional<BibEntryType> type = MetaDataParser.parseCustomEntryType(serialized);
+        String serialized = MetaDataSerializer.serializeCustomEntryTypes(
+            newCustomType
+        );
+        Optional<BibEntryType> type = MetaDataParser.parseCustomEntryType(
+            serialized
+        );
         assertEquals(Collections.emptySet(), type.get().getRequiredFields());
     }
 
     @Test
     void testParsingEmptyOptionalFieldsFieldsReturnsEmptyCollections() {
-        newCustomType = new BibEntryType(
+        newCustomType =
+            new BibEntryType(
                 CUSTOM_TYPE,
                 Collections.emptySet(),
-                Collections.singleton(new OrFields(StandardField.AUTHOR)));
+                Collections.singleton(new OrFields(StandardField.AUTHOR))
+            );
 
-        String serialized = MetaDataSerializer.serializeCustomEntryTypes(newCustomType);
-        Optional<BibEntryType> type = MetaDataParser.parseCustomEntryType(serialized);
+        String serialized = MetaDataSerializer.serializeCustomEntryTypes(
+            newCustomType
+        );
+        Optional<BibEntryType> type = MetaDataParser.parseCustomEntryType(
+            serialized
+        );
         assertEquals(Collections.emptySet(), type.get().getOptionalFields());
     }
 
@@ -107,37 +145,54 @@ void testParsingEmptyOptionalFieldsFieldsReturnsEmptyCollections() {
      */
     public static Stream<Arguments> serializeCustomizedEntryType() {
         return Stream.of(
-                Arguments.of(
-                        new BibEntryTypeBuilder()
-                                .withType(new UnknownEntryType("test"))
-                                .withRequiredFields(StandardField.AUTHOR, StandardField.TITLE),
-                        "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]"
-                ),
-                Arguments.of(
-                        new BibEntryTypeBuilder()
-                                .withType(new UnknownEntryType("test"))
-                                .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[]"
-                )
+            Arguments.of(
+                new BibEntryTypeBuilder()
+                    .withType(new UnknownEntryType("test"))
+                    .withRequiredFields(
+                        StandardField.AUTHOR,
+                        StandardField.TITLE
+                    ),
+                "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]"
+            ),
+            Arguments.of(
+                new BibEntryTypeBuilder()
+                    .withType(new UnknownEntryType("test"))
+                    .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[]"
+            )
         );
     }
 
     @ParameterizedTest
     @MethodSource
-    void serializeCustomizedEntryType(BibEntryTypeBuilder bibEntryTypeBuilder, String expected) {
-        assertEquals(expected, MetaDataSerializer.serializeCustomEntryTypes(bibEntryTypeBuilder.build()));
+    void serializeCustomizedEntryType(
+        BibEntryTypeBuilder bibEntryTypeBuilder,
+        String expected
+    ) {
+        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 7fe416c513d..9c79f167f28 100644
--- a/src/test/java/org/jabref/logic/exporter/ModsExportFormatFilesTest.java
+++ b/src/test/java/org/jabref/logic/exporter/ModsExportFormatFilesTest.java
@@ -1,12 +1,15 @@
 package org.jabref.logic.exporter;
 
+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;
-
 import org.jabref.logic.bibtex.BibEntryAssert;
 import org.jabref.logic.importer.ImportFormatPreferences;
 import org.jabref.logic.importer.fileformat.BibtexImporter;
@@ -15,7 +18,6 @@
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.util.DummyFileUpdateMonitor;
 import org.jabref.preferences.BibEntryPreferences;
-
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.io.TempDir;
 import org.junit.jupiter.params.ParameterizedTest;
@@ -24,12 +26,11 @@
 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;
-
 public class ModsExportFormatFilesTest {
-    private static final Logger LOGGER = LoggerFactory.getLogger(ModsExportFormatFilesTest.class);
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(
+        ModsExportFormatFilesTest.class
+    );
     private static Path resourceDir;
 
     public Charset charset;
@@ -42,25 +43,48 @@ 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
     public void setUp(@TempDir Path testFolder) throws Exception {
-        ImportFormatPreferences importFormatPreferences = mock(ImportFormatPreferences.class, Answers.RETURNS_DEEP_STUBS);
-        when(importFormatPreferences.bibEntryPreferences()).thenReturn(mock(BibEntryPreferences.class));
-        when(importFormatPreferences.bibEntryPreferences().getKeywordSeparator()).thenReturn(',');
+        ImportFormatPreferences importFormatPreferences = mock(
+            ImportFormatPreferences.class,
+            Answers.RETURNS_DEEP_STUBS
+        );
+        when(importFormatPreferences.bibEntryPreferences())
+            .thenReturn(mock(BibEntryPreferences.class));
+        when(
+            importFormatPreferences.bibEntryPreferences().getKeywordSeparator()
+        )
+            .thenReturn(',');
 
         databaseContext = new BibDatabaseContext();
         charset = StandardCharsets.UTF_8;
         exporter = new ModsExporter();
-        bibtexImporter = new BibtexImporter(importFormatPreferences, new DummyFileUpdateMonitor());
+        bibtexImporter =
+            new BibtexImporter(
+                importFormatPreferences,
+                new DummyFileUpdateMonitor()
+            );
         modsImporter = new ModsImporter(importFormatPreferences);
 
         Path path = testFolder.resolve("ARandomlyNamedFile.tmp");
@@ -71,23 +95,39 @@ public void setUp(@TempDir Path testFolder) throws Exception {
     @ParameterizedTest
     @MethodSource("fileNames")
     public final void testPerformExport(String filename) throws Exception {
-        importFile = Path.of(ModsExportFormatFilesTest.class.getResource(filename).toURI());
+        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);
 
         assertEquals(
-                String.join("\n", Files.readAllLines(expectedFile)),
-                String.join("\n", Files.readAllLines(exportedFile)));
+            String.join("\n", Files.readAllLines(expectedFile)),
+            String.join("\n", Files.readAllLines(exportedFile))
+        );
     }
 
     @ParameterizedTest
     @MethodSource("fileNames")
-    public final void testExportAsModsAndThenImportAsMods(String filename) throws Exception {
-        importFile = Path.of(ModsExportFormatFilesTest.class.getResource(filename).toURI());
-        List<BibEntry> entries = bibtexImporter.importDatabase(importFile).getDatabase().getEntries();
+    public final void testExportAsModsAndThenImportAsMods(String filename)
+        throws Exception {
+        importFile =
+            Path.of(
+                ModsExportFormatFilesTest.class.getResource(filename).toURI()
+            );
+        List<BibEntry> entries = bibtexImporter
+            .importDatabase(importFile)
+            .getDatabase()
+            .getEntries();
 
         exporter.export(databaseContext, exportedFile, entries);
         BibEntryAssert.assertEquals(entries, exportedFile, modsImporter);
@@ -95,17 +135,27 @@ public final void testExportAsModsAndThenImportAsMods(String filename) throws Ex
 
     @ParameterizedTest
     @MethodSource("fileNames")
-    public final void testImportAsModsAndExportAsMods(String filename) throws Exception {
-        importFile = Path.of(ModsExportFormatFilesTest.class.getResource(filename).toURI());
+    public final void testImportAsModsAndExportAsMods(String filename)
+        throws Exception {
+        importFile =
+            Path.of(
+                ModsExportFormatFilesTest.class.getResource(filename).toURI()
+            );
         String xmlFileName = filename.replace(".bib", ".xml");
-        Path xmlFile = Path.of(ModsExportFormatFilesTest.class.getResource(xmlFileName).toURI());
+        Path xmlFile = Path.of(
+            ModsExportFormatFilesTest.class.getResource(xmlFileName).toURI()
+        );
 
-        List<BibEntry> entries = modsImporter.importDatabase(xmlFile).getDatabase().getEntries();
+        List<BibEntry> entries = modsImporter
+            .importDatabase(xmlFile)
+            .getDatabase()
+            .getEntries();
 
         exporter.export(databaseContext, exportedFile, entries);
 
         assertEquals(
-                String.join("\n", Files.readAllLines(xmlFile)),
-                String.join("\n", Files.readAllLines(exportedFile)));
+            String.join("\n", Files.readAllLines(xmlFile)),
+            String.join("\n", Files.readAllLines(exportedFile))
+        );
     }
 }
diff --git a/src/test/java/org/jabref/logic/exporter/ModsExportFormatTest.java b/src/test/java/org/jabref/logic/exporter/ModsExportFormatTest.java
index cf98c1764af..d80ada10f31 100644
--- a/src/test/java/org/jabref/logic/exporter/ModsExportFormatTest.java
+++ b/src/test/java/org/jabref/logic/exporter/ModsExportFormatTest.java
@@ -1,22 +1,20 @@
 package org.jabref.logic.exporter;
 
+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 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;
-
 public class ModsExportFormatTest {
 
     private ModsExporter modsExportFormat;
@@ -26,15 +24,28 @@ public class ModsExportFormatTest {
     public 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
-    public final void exportForNoEntriesWritesNothing(@TempDir Path tempFile) throws Exception {
+    public final void exportForNoEntriesWritesNothing(@TempDir Path tempFile)
+        throws Exception {
         Path file = tempFile.resolve("ThisIsARandomlyNamedFile");
         Files.createFile(file);
-        modsExportFormat.export(databaseContext, tempFile, Collections.emptyList());
+        modsExportFormat.export(
+            databaseContext,
+            tempFile,
+            Collections.emptyList()
+        );
         assertEquals(Collections.emptyList(), Files.readAllLines(file));
     }
 }
diff --git a/src/test/java/org/jabref/logic/exporter/MsBibExportFormatTest.java b/src/test/java/org/jabref/logic/exporter/MsBibExportFormatTest.java
index 7be464fc9a6..587aa0e3f01 100644
--- a/src/test/java/org/jabref/logic/exporter/MsBibExportFormatTest.java
+++ b/src/test/java/org/jabref/logic/exporter/MsBibExportFormatTest.java
@@ -1,20 +1,18 @@
 package org.jabref.logic.exporter;
 
+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;
-
 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;
-
 public class MsBibExportFormatTest {
 
     public BibDatabaseContext databaseContext;
@@ -27,7 +25,8 @@ public void setUp() throws Exception {
     }
 
     @Test
-    public final void testPerformExportWithNoEntry(@TempDir Path tempFile) throws IOException, SaveException {
+    public final void testPerformExportWithNoEntry(@TempDir Path tempFile)
+        throws IOException, SaveException {
         Path path = tempFile.resolve("ThisIsARandomlyNamedFile");
         Files.createFile(path);
         List<BibEntry> entries = Collections.emptyList();
diff --git a/src/test/java/org/jabref/logic/exporter/OpenOfficeDocumentCreatorTest.java b/src/test/java/org/jabref/logic/exporter/OpenOfficeDocumentCreatorTest.java
index 53c0d088a45..c7a6dc015f1 100644
--- a/src/test/java/org/jabref/logic/exporter/OpenOfficeDocumentCreatorTest.java
+++ b/src/test/java/org/jabref/logic/exporter/OpenOfficeDocumentCreatorTest.java
@@ -1,5 +1,7 @@
 package org.jabref.logic.exporter;
 
+import static org.hamcrest.MatcherAssert.assertThat;
+
 import java.io.FileInputStream;
 import java.io.IOException;
 import java.net.URISyntaxException;
@@ -12,12 +14,10 @@
 import java.util.List;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipInputStream;
-
 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,9 +26,8 @@
 import org.xmlunit.diff.ElementSelectors;
 import org.xmlunit.matchers.CompareMatcher;
 
-import static org.hamcrest.MatcherAssert.assertThat;
-
 public class OpenOfficeDocumentCreatorTest {
+
     public BibDatabaseContext databaseContext;
     public Charset charset;
     public List<BibEntry> entries;
@@ -38,7 +37,13 @@ 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,10 +52,16 @@ 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");
+        entry.setField(
+            StandardField.DOI,
+            "http://doi.acm.org/10.1145/820127.820136"
+        );
         entry.setField(StandardField.JOURNAL, "SIGCSE Bull.");
         entry.setField(StandardField.NUMBER, "4");
         entry.setField(StandardField.PAGES, "13--14");
@@ -62,7 +73,8 @@ void setUp() throws URISyntaxException {
     }
 
     @Test
-    void testPerformExportForSingleEntry(@TempDir Path testFolder) throws Exception {
+    void testPerformExportForSingleEntry(@TempDir Path testFolder)
+        throws Exception {
         Path zipPath = testFolder.resolve("OpenOfficeRandomNamedFile");
 
         exporter.export(databaseContext, zipPath, entries);
@@ -75,16 +87,28 @@ void testPerformExportForSingleEntry(@TempDir Path testFolder) throws Exception
         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 {
-        try (ZipInputStream zis = new ZipInputStream(new FileInputStream(zipFile.toFile()))) {
+    private static void unzipContentXml(Path zipFile, Path unzipFolder)
+        throws IOException {
+        try (
+            ZipInputStream zis = new ZipInputStream(
+                new FileInputStream(zipFile.toFile())
+            )
+        ) {
             ZipEntry zipEntry = zis.getNextEntry();
 
             while (zipEntry != null) {
@@ -98,7 +122,11 @@ private static void unzipContentXml(Path zipFile, Path unzipFolder) throws IOExc
                             Files.createDirectories(newPath.getParent());
                         }
                     }
-                    Files.copy(zis, newPath, StandardCopyOption.REPLACE_EXISTING);
+                    Files.copy(
+                        zis,
+                        newPath,
+                        StandardCopyOption.REPLACE_EXISTING
+                    );
                 }
 
                 zipEntry = zis.getNextEntry();
@@ -108,7 +136,8 @@ private static void unzipContentXml(Path zipFile, Path unzipFolder) throws IOExc
     }
 
     // protect zip slip attack: https://snyk.io/research/zip-slip-vulnerability
-    private static Path zipSlipProtect(ZipEntry zipEntry, Path targetDir) throws IOException {
+    private static Path zipSlipProtect(ZipEntry zipEntry, Path targetDir)
+        throws IOException {
         Path targetDirResolved = targetDir.resolve(zipEntry.getName());
         Path normalizePath = targetDirResolved.normalize();
         if (!normalizePath.startsWith(targetDir)) {
diff --git a/src/test/java/org/jabref/logic/exporter/XmpExporterTest.java b/src/test/java/org/jabref/logic/exporter/XmpExporterTest.java
index 05266a60aac..2a940fba07d 100644
--- a/src/test/java/org/jabref/logic/exporter/XmpExporterTest.java
+++ b/src/test/java/org/jabref/logic/exporter/XmpExporterTest.java
@@ -1,26 +1,23 @@
 package org.jabref.logic.exporter;
 
+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;
-
 import javafx.collections.FXCollections;
-
 import org.jabref.logic.xmp.XmpPreferences;
 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;
-
 public class XmpExporterTest {
 
     private Exporter exporter;
@@ -40,30 +37,36 @@ public void exportSingleEntry(@TempDir Path testFolder) throws Exception {
         BibEntry entry = new BibEntry();
         entry.setField(StandardField.AUTHOR, "Alan Turing");
 
-        exporter.export(databaseContext, file, Collections.singletonList(entry));
+        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 = """
-                  <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>
-                        <rdf:Seq>
-                          <rdf:li>Alan Turing</rdf:li>
-                        </rdf:Seq>
-                      </dc:creator>
-                      <dc:format>application/pdf</dc:format>
-                      <dc:type>
-                        <rdf:Bag>
-                          <rdf:li>Misc</rdf:li>
-                        </rdf:Bag>
-                      </dc:type>
-                    </rdf:Description>
-                  </rdf:RDF>
-                """.stripTrailing();
+        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>
+                    <rdf:Seq>
+                      <rdf:li>Alan Turing</rdf:li>
+                    </rdf:Seq>
+                  </dc:creator>
+                  <dc:format>application/pdf</dc:format>
+                  <dc:type>
+                    <rdf:Bag>
+                      <rdf:li>Misc</rdf:li>
+                    </rdf:Bag>
+                  </dc:type>
+                </rdf:Description>
+              </rdf:RDF>
+            """.stripTrailing();
         assertEquals(expected, actual);
     }
 
     @Test
-    public void writeMultipleEntriesInASingleFile(@TempDir Path testFolder) throws Exception {
+    public void writeMultipleEntriesInASingleFile(@TempDir Path testFolder)
+        throws Exception {
         Path file = testFolder.resolve("ThisIsARandomlyNamedFile");
         Files.createFile(file);
 
@@ -74,144 +77,178 @@ public void writeMultipleEntriesInASingleFile(@TempDir Path testFolder) throws E
         entryArmbrust.setField(StandardField.AUTHOR, "Michael Armbrust");
         entryArmbrust.setCitationKey("Armbrust2010");
 
-        exporter.export(databaseContext, file, Arrays.asList(entryTuring, entryArmbrust));
+        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 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>
-                          <rdf:Seq>
-                            <rdf:li>Alan Turing</rdf:li>
-                          </rdf:Seq>
-                        </dc:creator>
-                        <dc:format>application/pdf</dc:format>
-                        <dc:type>
-                          <rdf:Bag>
-                            <rdf:li>Misc</rdf:li>
-                          </rdf:Bag>
-                        </dc:type>
-                      </rdf:Description>
-                      <rdf:Description xmlns:dc="http://purl.org/dc/elements/1.1/" rdf:about="">
-                        <dc:creator>
-                          <rdf:Seq>
-                            <rdf:li>Michael Armbrust</rdf:li>
-                          </rdf:Seq>
-                        </dc:creator>
-                        <dc:relation>
-                          <rdf:Bag>
-                            <rdf:li>bibtex/citationkey/Armbrust2010</rdf:li>
-                          </rdf:Bag>
-                        </dc:relation>
-                        <dc:format>application/pdf</dc:format>
-                        <dc:type>
-                          <rdf:Bag>
-                            <rdf:li>Misc</rdf:li>
-                          </rdf:Bag>
-                        </dc:type>
-                      </rdf:Description>
-                    </rdf:RDF>
-                  """.stripTrailing();
+        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>
+                    <rdf:Seq>
+                      <rdf:li>Alan Turing</rdf:li>
+                    </rdf:Seq>
+                  </dc:creator>
+                  <dc:format>application/pdf</dc:format>
+                  <dc:type>
+                    <rdf:Bag>
+                      <rdf:li>Misc</rdf:li>
+                    </rdf:Bag>
+                  </dc:type>
+                </rdf:Description>
+                <rdf:Description xmlns:dc="http://purl.org/dc/elements/1.1/" rdf:about="">
+                  <dc:creator>
+                    <rdf:Seq>
+                      <rdf:li>Michael Armbrust</rdf:li>
+                    </rdf:Seq>
+                  </dc:creator>
+                  <dc:relation>
+                    <rdf:Bag>
+                      <rdf:li>bibtex/citationkey/Armbrust2010</rdf:li>
+                    </rdf:Bag>
+                  </dc:relation>
+                  <dc:format>application/pdf</dc:format>
+                  <dc:type>
+                    <rdf:Bag>
+                      <rdf:li>Misc</rdf:li>
+                    </rdf:Bag>
+                  </dc:type>
+                </rdf:Description>
+              </rdf:RDF>
+            """.stripTrailing();
         assertEquals(expected, actual);
     }
 
     @Test
-    public void writeMultipleEntriesInDifferentFiles(@TempDir Path testFolder) throws Exception {
+    public void writeMultipleEntriesInDifferentFiles(@TempDir Path testFolder)
+        throws Exception {
         // set path to the one where the exporter produces several files
-        Path file = testFolder.resolve(XmpExporter.XMP_SPLIT_DIRECTORY_INDICATOR);
+        Path file = testFolder.resolve(
+            XmpExporter.XMP_SPLIT_DIRECTORY_INDICATOR
+        );
         Files.createFile(file);
 
         BibEntry entryTuring = new BibEntry()
-                .withField(StandardField.AUTHOR, "Alan Turing");
+            .withField(StandardField.AUTHOR, "Alan Turing");
         BibEntry entryArmbrust = new BibEntry()
-                .withField(StandardField.AUTHOR, "Michael Armbrust")
-                .withCitationKey("Armbrust2010");
+            .withField(StandardField.AUTHOR, "Michael Armbrust")
+            .withCitationKey("Armbrust2010");
 
-        exporter.export(databaseContext, file, List.of(entryTuring, entryArmbrust));
+        exporter.export(
+            databaseContext,
+            file,
+            List.of(entryTuring, entryArmbrust)
+        );
 
         // Nothing written in given file
         List<String> lines = Files.readAllLines(file);
         assertEquals(Collections.emptyList(), lines);
 
         // turing contains the turing entry only
-        Path fileTuring = Path.of(file.getParent().toString(), entryTuring.getId() + "_null.xmp");
+        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 = """
-                <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>
-                      <rdf:Seq>
-                        <rdf:li>Alan Turing</rdf:li>
-                      </rdf:Seq>
-                    </dc:creator>
-                    <dc:format>application/pdf</dc:format>
-                    <dc:type>
-                      <rdf:Bag>
-                        <rdf:li>Misc</rdf:li>
-                      </rdf:Bag>
-                    </dc:type>
-                  </rdf:Description>
-                </rdf:RDF>
-              """.stripTrailing();
+        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>
+                    <rdf:Seq>
+                      <rdf:li>Alan Turing</rdf:li>
+                    </rdf:Seq>
+                  </dc:creator>
+                  <dc:format>application/pdf</dc:format>
+                  <dc:type>
+                    <rdf:Bag>
+                      <rdf:li>Misc</rdf:li>
+                    </rdf:Bag>
+                  </dc:type>
+                </rdf:Description>
+              </rdf:RDF>
+            """.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 = """
-                  <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>
-                        <rdf:Seq>
-                          <rdf:li>Michael Armbrust</rdf:li>
-                        </rdf:Seq>
-                      </dc:creator>
-                      <dc:relation>
-                        <rdf:Bag>
-                          <rdf:li>bibtex/citationkey/Armbrust2010</rdf:li>
-                        </rdf:Bag>
-                      </dc:relation>
-                      <dc:format>application/pdf</dc:format>
-                      <dc:type>
-                        <rdf:Bag>
-                          <rdf:li>Misc</rdf:li>
-                        </rdf:Bag>
-                      </dc:type>
-                    </rdf:Description>
-                  </rdf:RDF>
-                """.stripTrailing();
+        String actualArmbrust = String.join(
+            "\n",
+            Files.readAllLines(fileArmbrust)
+        );
+        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>
+                    <rdf:Seq>
+                      <rdf:li>Michael Armbrust</rdf:li>
+                    </rdf:Seq>
+                  </dc:creator>
+                  <dc:relation>
+                    <rdf:Bag>
+                      <rdf:li>bibtex/citationkey/Armbrust2010</rdf:li>
+                    </rdf:Bag>
+                  </dc:relation>
+                  <dc:format>application/pdf</dc:format>
+                  <dc:type>
+                    <rdf:Bag>
+                      <rdf:li>Misc</rdf:li>
+                    </rdf:Bag>
+                  </dc:type>
+                </rdf:Description>
+              </rdf:RDF>
+            """.stripTrailing();
         assertEquals(expectedArmbrust, actualArmbrust);
     }
 
     @Test
-    public void exportSingleEntryWithPrivacyFilter(@TempDir Path testFolder) throws Exception {
-        when(xmpPreferences.getXmpPrivacyFilter()).thenReturn(FXCollections.observableSet(Collections.singleton(StandardField.AUTHOR)));
+    public void exportSingleEntryWithPrivacyFilter(@TempDir Path testFolder)
+        throws Exception {
+        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");
+            .withField(StandardField.AUTHOR, "Alan Turing");
 
-        exporter.export(databaseContext, file, Collections.singletonList(entry));
+        exporter.export(
+            databaseContext,
+            file,
+            Collections.singletonList(entry)
+        );
 
         String actual = String.join("\n", Files.readAllLines(file));
-        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>
-                      <dc:type>
-                        <rdf:Bag>
-                          <rdf:li>Misc</rdf:li>
-                        </rdf:Bag>
-                      </dc:type>
-                    </rdf:Description>
-                  </rdf:RDF>
-                """.stripTrailing();
+        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>
+                  <dc:type>
+                    <rdf:Bag>
+                      <rdf:li>Misc</rdf:li>
+                    </rdf:Bag>
+                  </dc:type>
+                </rdf:Description>
+              </rdf:RDF>
+            """.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 afa5b3dad60..62caf8b5687 100644
--- a/src/test/java/org/jabref/logic/exporter/XmpPdfExporterTest.java
+++ b/src/test/java/org/jabref/logic/exporter/XmpPdfExporterTest.java
@@ -1,14 +1,23 @@
 package org.jabref.logic.exporter;
 
+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;
-
 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.cleanup.FieldFormatterCleanup;
 import org.jabref.logic.formatter.bibtexfields.NormalizeNamesFormatter;
 import org.jabref.logic.importer.ImportFormatPreferences;
@@ -24,12 +33,6 @@
 import org.jabref.model.entry.field.StandardField;
 import org.jabref.model.entry.types.StandardEntryType;
 import org.jabref.preferences.FilePreferences;
-
-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,19 +41,16 @@
 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;
-
 class XmpPdfExporterTest {
 
-    @TempDir static Path tempDir;
+    @TempDir
+    static Path tempDir;
 
     private static BibEntry olly2018 = new BibEntry(StandardEntryType.Article);
     private static BibEntry toral2006 = new BibEntry(StandardEntryType.Article);
-    private static BibEntry vapnik2000 = new BibEntry(StandardEntryType.Article);
+    private static BibEntry vapnik2000 = new BibEntry(
+        StandardEntryType.Article
+    );
 
     private XmpPdfExporter exporter;
     private PdfXmpImporter importer;
@@ -82,22 +82,41 @@ private static void initBibEntries() throws IOException {
         olly2018.setField(StandardField.REVIEW, "review");
         olly2018.setField(StandardField.URL, "https://www.olly2018.edu");
 
-        LinkedFile linkedFile = createDefaultLinkedFile("existing.pdf", tempDir);
+        LinkedFile linkedFile = createDefaultLinkedFile(
+            "existing.pdf",
+            tempDir
+        );
         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.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.BOOKTITLE, "Proceedings of EACL");
         toral2006.setField(StandardField.PAGES, "56--61");
         toral2006.setField(StandardField.EPRINTTYPE, "asdf");
         toral2006.setField(StandardField.OWNER, "Ich");
         toral2006.setField(StandardField.URL, "www.url.de");
 
-        toral2006.setFiles(List.of(new LinkedFile("non-existing", "path/to/nowhere.pdf", "PDF")));
+        toral2006.setFiles(
+            List.of(
+                new LinkedFile("non-existing", "path/to/nowhere.pdf", "PDF")
+            )
+        );
 
         vapnik2000.setCitationKey("vapnik2000");
-        vapnik2000.setField(StandardField.TITLE, "The Nature of Statistical Learning Theory");
-        vapnik2000.setField(StandardField.PUBLISHER, "Springer Science + Business Media");
+        vapnik2000.setField(
+            StandardField.TITLE,
+            "The Nature of Statistical Learning Theory"
+        );
+        vapnik2000.setField(
+            StandardField.PUBLISHER,
+            "Springer Science + Business Media"
+        );
         vapnik2000.setField(StandardField.AUTHOR, "Vapnik, Vladimir N.");
         vapnik2000.setField(StandardField.DOI, "10.1007/978-1-4757-3264-1");
         vapnik2000.setField(StandardField.OWNER, "Ich");
@@ -110,14 +129,25 @@ private static void initBibEntries() throws IOException {
     void setUp() throws IOException {
         abbreviationRepository = mock(JournalAbbreviationRepository.class);
         filePreferences = mock(FilePreferences.class);
-        when(filePreferences.getUserAndHost()).thenReturn(tempDir.toAbsolutePath().toString());
-        when(filePreferences.shouldStoreFilesRelativeToBibFile()).thenReturn(false);
-
-        xmpPreferences = new XmpPreferences(false, Collections.emptySet(), new SimpleObjectProperty<>(','));
+        when(filePreferences.getUserAndHost())
+            .thenReturn(tempDir.toAbsolutePath().toString());
+        when(filePreferences.shouldStoreFilesRelativeToBibFile())
+            .thenReturn(false);
+
+        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();
@@ -135,21 +165,48 @@ void reset() throws IOException {
         for (BibEntry entry : expectedEntries) {
             entry.clearField(StandardField.FILE);
         }
-        LinkedFile linkedFile = createDefaultLinkedFile("existing.pdf", tempDir);
+        LinkedFile linkedFile = createDefaultLinkedFile(
+            "existing.pdf",
+            tempDir
+        );
         olly2018.setFiles(List.of(linkedFile));
-        toral2006.setFiles(List.of(new LinkedFile("non-existing", "path/to/nowhere.pdf", "PDF")));
+        toral2006.setFiles(
+            List.of(
+                new LinkedFile("non-existing", "path/to/nowhere.pdf", "PDF")
+            )
+        );
     }
 
     @ParameterizedTest
     @MethodSource("provideBibEntriesWithValidPdfFileLinks")
-    void successfulExportToAllFilesOfEntry(BibEntry bibEntryWithValidPdfFileLink) throws Exception {
-        assertTrue(exporter.exportToAllFilesOfEntry(databaseContext, filePreferences, bibEntryWithValidPdfFileLink, List.of(olly2018), abbreviationRepository));
+    void successfulExportToAllFilesOfEntry(
+        BibEntry bibEntryWithValidPdfFileLink
+    ) throws Exception {
+        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() {
@@ -163,13 +220,27 @@ 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
@@ -179,19 +250,43 @@ public void testRoundtripExportImport(Path path) throws Exception {
             PDPage page = new PDPage();
             document.addPage(page);
 
-            try (PDPageContentStream contentStream = new PDPageContentStream(document, page)) {
+            try (
+                PDPageContentStream contentStream = new PDPageContentStream(
+                    document,
+                    page
+                )
+            ) {
                 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.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.endText();
             }
             document.save(path.toString());
         }
-        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));
+        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)
+        );
 
         List<BibEntry> expectedEntries = databaseContext.getEntries();
         for (BibEntry entry : expectedEntries) {
@@ -202,26 +297,44 @@ public void testRoundtripExportImport(Path path) throws Exception {
     }
 
     public static Stream<Arguments> providePathToNewPDFs() {
-        return Stream.of(Arguments.of(tempDir.resolve("original.pdf").toAbsolutePath()));
+        return Stream.of(
+            Arguments.of(tempDir.resolve("original.pdf").toAbsolutePath())
+        );
     }
 
     public static Stream<Arguments> providePathsToValidPDFs() {
-        return Stream.of(Arguments.of(tempDir.resolve("existing.pdf").toAbsolutePath()));
+        return Stream.of(
+            Arguments.of(tempDir.resolve("existing.pdf").toAbsolutePath())
+        );
     }
 
-    public static Stream<Arguments> providePathsToInvalidPDFs() throws IOException {
-        LinkedFile existingFileThatIsNotLinked = createDefaultLinkedFile("notlinked.pdf", tempDir);
+    public static Stream<Arguments> providePathsToInvalidPDFs()
+        throws IOException {
+        LinkedFile existingFileThatIsNotLinked = createDefaultLinkedFile(
+            "notlinked.pdf",
+            tempDir
+        );
         return Stream.of(
-                Arguments.of(Path.of("")),
-                Arguments.of(tempDir.resolve("path/to/nowhere.pdf").toAbsolutePath()),
-                Arguments.of(Path.of(existingFileThatIsNotLinked.getLink())));
+            Arguments.of(Path.of("")),
+            Arguments.of(
+                tempDir.resolve("path/to/nowhere.pdf").toAbsolutePath()
+            ),
+            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 {
         return createDefaultLinkedFile("", fileName, tempDir);
     }
 
-    private static LinkedFile createDefaultLinkedFile(String description, String fileName, Path tempDir) throws IOException {
+    private static LinkedFile createDefaultLinkedFile(
+        String description,
+        String fileName,
+        Path tempDir
+    ) throws IOException {
         Path pdfFile = tempDir.resolve(fileName);
         try (PDDocument pdf = new PDDocument()) {
             pdf.addPage(new PDPage());
diff --git a/src/test/java/org/jabref/logic/exporter/YamlExporterTest.java b/src/test/java/org/jabref/logic/exporter/YamlExporterTest.java
index db42e79dbbc..43414b40e2b 100644
--- a/src/test/java/org/jabref/logic/exporter/YamlExporterTest.java
+++ b/src/test/java/org/jabref/logic/exporter/YamlExporterTest.java
@@ -1,10 +1,12 @@
 package org.jabref.logic.exporter;
 
+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;
-
 import org.jabref.logic.layout.LayoutFormatterPreferences;
 import org.jabref.logic.util.StandardFileType;
 import org.jabref.model.database.BibDatabaseContext;
@@ -12,15 +14,11 @@
 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;
-
 public class YamlExporterTest {
 
     private static Exporter yamlExporter;
@@ -28,21 +26,27 @@ public class YamlExporterTest {
 
     @BeforeAll
     static void setUp() {
-        yamlExporter = new TemplateExporter(
+        yamlExporter =
+            new TemplateExporter(
                 "CSL YAML",
                 "yaml",
                 "yaml",
                 null,
                 StandardFileType.YAML,
-                mock(LayoutFormatterPreferences.class, Answers.RETURNS_DEEP_STUBS),
+                mock(
+                    LayoutFormatterPreferences.class,
+                    Answers.RETURNS_DEEP_STUBS
+                ),
                 SaveOrder.getDefaultSaveOrder(),
-                BlankLineBehaviour.DELETE_BLANKS);
+                BlankLineBehaviour.DELETE_BLANKS
+            );
 
         databaseContext = new BibDatabaseContext();
     }
 
     @Test
-    public final void exportForNoEntriesWritesNothing(@TempDir Path tempFile) throws Exception {
+    public final void exportForNoEntriesWritesNothing(@TempDir Path tempFile)
+        throws Exception {
         Path file = tempFile.resolve("ThisIsARandomlyNamedFile");
         Files.createFile(file);
         yamlExporter.export(databaseContext, tempFile, Collections.emptyList());
@@ -50,57 +54,69 @@ public final void exportForNoEntriesWritesNothing(@TempDir Path tempFile) throws
     }
 
     @Test
-    public final void exportsCorrectContent(@TempDir Path tempFile) throws Exception {
+    public 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");
+            .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));
+        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",
-                "---");
+            "---",
+            "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
-    public final void formatsContentCorrect(@TempDir Path tempFile) throws Exception {
+    public 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");
+            .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));
+        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",
-                "---");
+            "---",
+            "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));
     }
@@ -116,19 +132,24 @@ void passesModifiedCharset(@TempDir Path tempFile) throws Exception {
 
         Path file = tempFile.resolve("RandomFileName");
         Files.createFile(file);
-        yamlExporter.export(databaseContext, file, Collections.singletonList(entry));
+        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",
-                "---");
+            "---",
+            "references:",
+            "- id: test",
+            "  type: article",
+            "  author:",
+            "  - literal: \"谷崎 潤一郎\"",
+            "  title: \"細雪\"",
+            "  issued: 2020-10-14",
+            "  url: http://example.com",
+            "---"
+        );
 
         assertEquals(expected, Files.readAllLines(file));
     }
@@ -144,19 +165,24 @@ void passesModifiedCharsetNull(@TempDir Path tempFile) throws Exception {
 
         Path file = tempFile.resolve("RandomFileName");
         Files.createFile(file);
-        yamlExporter.export(databaseContext, file, Collections.singletonList(entry));
+        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",
-                "---");
+            "---",
+            "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 d93606c7a1f..8ebab2c54b4 100644
--- a/src/test/java/org/jabref/logic/formatter/FormatterTest.java
+++ b/src/test/java/org/jabref/logic/formatter/FormatterTest.java
@@ -1,36 +1,40 @@
 package org.jabref.logic.formatter;
 
+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;
-
 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;
-
 class FormatterTest {
 
     private static ProtectedTermsLoader protectedTermsLoader;
 
     @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 +44,21 @@ static void setUp() {
     @Test
     public 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 8fb9eadf959..b08622ff01a 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 e2003e25034..c4208c39323 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}
  */
@@ -70,7 +70,10 @@ public void formatDoesNotRemoveBracesInBrokenString() {
 
     @Test
     public void formatExample() {
-        assertEquals("{In CDMA}", formatter.format(formatter.getExampleInput()));
+        assertEquals(
+            "{In CDMA}",
+            formatter.format(formatter.getExampleInput())
+        );
     }
 
     @Test
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 822eb6f082b..acb7f435a1c 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,44 +19,63 @@ 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",
-                formatter.format("away.php?to=http%3A%2F%2Fwikipedia.org&a=snippet"));
+        assertEquals(
+            "http://wikipedia.org",
+            formatter.format("away.php?to=http%3A%2F%2Fwikipedia.org&a=snippet")
+        );
     }
 
     @Test
     void validUrlUnmodified() {
-        assertEquals("http://wikipedia.org", formatter.format("http://wikipedia.org"));
+        assertEquals(
+            "http://wikipedia.org",
+            formatter.format("http://wikipedia.org")
+        );
     }
 
     @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
     void urlencodedSlashesAreAlsoConverted() {
         // the caller has to pay attention that this does not happen
-        assertEquals("jabref.org/test/test", formatter.format("jabref.org/test%2Ftest"));
+        assertEquals(
+            "jabref.org/test/test",
+            formatter.format("jabref.org/test%2Ftest")
+        );
     }
 
     @Test
     void formatExample() {
-        assertEquals("http://www.focus.de/" +
-                        "gesundheit/ratgeber/herz/test/lebenserwartung-werden-sie-100-jahre-alt_aid_363828.html",
-                formatter.format(formatter.getExampleInput()));
+        assertEquals(
+            "http://www.focus.de/" +
+            "gesundheit/ratgeber/herz/test/lebenserwartung-werden-sie-100-jahre-alt_aid_363828.html",
+            formatter.format(formatter.getExampleInput())
+        );
     }
 
     @Test
     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")
+            "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 e1c759ac635..d3f4d4b527d 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 0f5258511f7..47a17496b0c 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;
@@ -26,16 +26,27 @@ void formatEscapesAmpersandsIfPresent() throws Exception {
 
     @Test
     void formatExample() {
-        assertEquals("Text \\& with \\&ampersands", formatter.format(formatter.getExampleInput()));
+        assertEquals(
+            "Text \\& with \\&ampersands",
+            formatter.format(formatter.getExampleInput())
+        );
     }
 
     @Test
-    void formatReturnsSameTextInNewUserDefinedLatexCommandIfNoAmpersandsPresent() throws Exception {
-        assertEquals("\\newcommand[1]{Lorem ipsum}", formatter.format("\\newcommand[1]{Lorem ipsum}"));
+    void formatReturnsSameTextInNewUserDefinedLatexCommandIfNoAmpersandsPresent()
+        throws Exception {
+        assertEquals(
+            "\\newcommand[1]{Lorem ipsum}",
+            formatter.format("\\newcommand[1]{Lorem ipsum}")
+        );
     }
 
     @Test
-    void formatReturnsSameTextInLatexCommandIfOneAmpersandPresent() throws Exception {
-        assertEquals("\\textbf{Lorem\\&ipsum}", formatter.format("\\textbf{Lorem\\&ipsum}"));
+    void formatReturnsSameTextInLatexCommandIfOneAmpersandPresent()
+        throws Exception {
+        assertEquals(
+            "\\textbf{Lorem\\&ipsum}",
+            formatter.format("\\textbf{Lorem\\&ipsum}")
+        );
     }
 }
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 55b4d543cc9..faa11d40ff3 100644
--- a/src/test/java/org/jabref/logic/formatter/bibtexfields/EscapeDollarSignFormatterTest.java
+++ b/src/test/java/org/jabref/logic/formatter/bibtexfields/EscapeDollarSignFormatterTest.java
@@ -1,29 +1,35 @@
 package org.jabref.logic.formatter.bibtexfields;
 
-import java.util.stream.Stream;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
+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;
-
 class EscapeDollarSignFormatterTest {
 
-    private EscapeDollarSignFormatter formatter = new EscapeDollarSignFormatter();
+    private EscapeDollarSignFormatter formatter =
+        new EscapeDollarSignFormatter();
 
     private static Stream<Arguments> correctlyFormats() {
         return Stream.of(
-                // formatReturnsSameTextIfNoDollarSignPresent
-                Arguments.of("Lorem ipsum", "Lorem ipsum"),
-                // formatEscapesDollarSignIfPresent
-                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: \\$\\$\\$"),
-                // mixed field
-                Arguments.of("Dollar sign: 1x: \\$ 2x: \\$\\$ 3x: \\$\\$\\$", "Dollar sign: 1x: $ 2x: $$ 3x: $$$")
+            // formatReturnsSameTextIfNoDollarSignPresent
+            Arguments.of("Lorem ipsum", "Lorem ipsum"),
+            // formatEscapesDollarSignIfPresent
+            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: \\$\\$\\$"
+            ),
+            // mixed field
+            Arguments.of(
+                "Dollar sign: 1x: \\$ 2x: \\$\\$ 3x: \\$\\$\\$",
+                "Dollar sign: 1x: $ 2x: $$ 3x: $$$"
+            )
         );
     }
 
@@ -35,6 +41,9 @@ void correctlyFormats(String expected, String input) throws Exception {
 
     @Test
     void formatExample() {
-        assertEquals("Text\\$with\\$dollar\\$sign", formatter.format(formatter.getExampleInput()));
+        assertEquals(
+            "Text\\$with\\$dollar\\$sign",
+            formatter.format(formatter.getExampleInput())
+        );
     }
 }
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 2c756e7eebf..3f08e933ee6 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;
@@ -26,6 +26,9 @@ void formatEscapesUnderscoresIfPresent() throws Exception {
 
     @Test
     void formatExample() {
-        assertEquals("Text\\_with\\_underscores", formatter.format(formatter.getExampleInput()));
+        assertEquals(
+            "Text\\_with\\_underscores",
+            formatter.format(formatter.getExampleInput())
+        );
     }
 }
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 3ecd073a917..fd2d296242e 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 @@ public void formatWithoutHtmlCharactersReturnsSameString() {
 
     @Test
     public void formatMultipleHtmlCharacters() {
-        assertEquals("{{\\aa}}{\\\"{a}}{\\\"{o}}", formatter.format("&aring;&auml;&ouml;"));
+        assertEquals(
+            "{{\\aa}}{\\\"{a}}{\\\"{o}}",
+            formatter.format("&aring;&auml;&ouml;")
+        );
     }
 
     @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 64f14737bb9..1a8f5d54a6a 100644
--- a/src/test/java/org/jabref/logic/formatter/bibtexfields/HtmlToUnicodeFormatterTest.java
+++ b/src/test/java/org/jabref/logic/formatter/bibtexfields/HtmlToUnicodeFormatterTest.java
@@ -1,30 +1,30 @@
 package org.jabref.logic.formatter.bibtexfields;
 
-import java.util.stream.Stream;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
+import java.util.stream.Stream;
 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;
-
 public class HtmlToUnicodeFormatterTest {
 
     private HtmlToUnicodeFormatter formatter;
 
     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 3c98058713e..a4aeccf6770 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;
@@ -18,9 +18,16 @@ void setUp() {
     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}",
-                formatter.format("A ${\\Delta}$${\\Sigma}$ modulator for {FPGA} {DSP}"));
+        assertEquals(
+            "\\textbf{VLSI} {DSP}",
+            formatter.format("\\textbf{VLSI} {DSP}")
+        );
+        assertEquals(
+            "A ${\\Delta\\Sigma}$ modulator for {FPGA DSP}",
+            formatter.format(
+                "A ${\\Delta}$${\\Sigma}$ modulator for {FPGA} {DSP}"
+            )
+        );
     }
 
     @Test
@@ -40,6 +47,9 @@ void escapePercentSignOnlnyOnceWithNumber() {
 
     @Test
     void formatExample() {
-        assertEquals("{VLSI DSP}", formatter.format(formatter.getExampleInput()));
+        assertEquals(
+            "{VLSI DSP}",
+            formatter.format(formatter.getExampleInput())
+        );
     }
 }
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 92ddc83ebf3..df1e016d419 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}
  */
@@ -134,6 +134,9 @@ public void formatDateDDdotMdotYYYY() {
 
     @Test
     public void formatExample() {
-        assertEquals("2003-11-29", formatter.format(formatter.getExampleInput()));
+        assertEquals(
+            "2003-11-29",
+            formatter.format(formatter.getExampleInput())
+        );
     }
 }
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 ace49c02398..be7af68262c 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,27 +19,42 @@ public void setUp() {
 
     @Test
     public 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
     public void formatExampleOfChangelog() {
-        assertEquals("Example -- illustrative", formatter.format("Example - illustrative"));
+        assertEquals(
+            "Example -- illustrative",
+            formatter.format("Example - illustrative")
+        );
     }
 
     @Test
     public void dashesWithinWordsAreKept() {
-        assertEquals("Example-illustrative", formatter.format("Example-illustrative"));
+        assertEquals(
+            "Example-illustrative",
+            formatter.format("Example-illustrative")
+        );
     }
 
     @Test
     public void dashesPreceededByASpaceAreKept() {
-        assertEquals("Example -illustrative", formatter.format("Example -illustrative"));
+        assertEquals(
+            "Example -illustrative",
+            formatter.format("Example -illustrative")
+        );
     }
 
     @Test
     public void dashesFollowedByASpaceAreKept() {
-        assertEquals("Example- illustrative", formatter.format("Example- illustrative"));
+        assertEquals(
+            "Example- illustrative",
+            formatter.format("Example- illustrative")
+        );
     }
 
     @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 32d196bcc2a..08195a81cca 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 c2f74c4d560..4aa69aea4d4 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}
  */
@@ -22,50 +22,92 @@ public void testNormalizeAuthorList() {
         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.; 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, 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(
+            "Ø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(
+            "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(
+            "Kolb, Stefan and Lenhard, J{\\\"o}rg and Wirtz, Guido",
+            formatter.format(
+                "Kolb, Stefan and J{\\\"o}rg Lenhard and Wirtz, Guido"
+            )
+        );
     }
 
     @Test
     public 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
     public 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
     public 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
     public 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
     public 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
@@ -95,89 +137,166 @@ public void initialsThenLast() {
 
     @Test
     public void lastThenJuniorThenFirst() {
-        assertEquals("Name, della, first", formatter.format("Name, della, first"));
+        assertEquals(
+            "Name, della, first",
+            formatter.format("Name, della, first")
+        );
     }
 
     @Test
     public void testConcatenationOfAuthorsWithCommas() {
-        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
     public void testOddCountOfCommas() {
-        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
     public void formatExample() {
-        assertEquals("Einstein, Albert and Turing, Alan", formatter.format(formatter.getExampleInput()));
+        assertEquals(
+            "Einstein, Albert and Turing, Alan",
+            formatter.format(formatter.getExampleInput())
+        );
     }
 
     @Test
     public void testNameAffixe() {
-        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
     public void testAvoidSpecialCharacter() {
-        assertEquals("Surname, {, First; Surname2, First2", formatter.format("Surname, {, First; Surname2, First2"));
+        assertEquals(
+            "Surname, {, First; Surname2, First2",
+            formatter.format("Surname, {, First; Surname2, First2")
+        );
     }
 
     @Test
     public void testAndInName() {
-        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
     public void testMultipleNameAffixes() {
-        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
     public void testCommaSeperatedNames() {
-        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
     public void testMultipleSpaces() {
-        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
     public void testAvoidPreposition() {
-        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
     public void testPreposition() {
-        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
     public void testOneCommaUntouched() {
-        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
     public void testAvoidNameAffixes() {
-        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
     public void testUpperCaseSensitiveList() {
-        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
     public void testSemiCorrectNamesWithSemicolon() {
-        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 e789d2002ec..8b470e78ff7 100644
--- a/src/test/java/org/jabref/logic/formatter/bibtexfields/NormalizePagesFormatterTest.java
+++ b/src/test/java/org/jabref/logic/formatter/bibtexfields/NormalizePagesFormatterTest.java
@@ -1,14 +1,13 @@
 package org.jabref.logic.formatter.bibtexfields;
 
-import java.util.stream.Stream;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
+import java.util.stream.Stream;
 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;
-
 /**
  * Tests in addition to the general tests from {@link org.jabref.logic.formatter.FormatterTest}
  */
@@ -23,87 +22,67 @@ public void setUp() {
 
     private static Stream<Arguments> tests() {
         return Stream.of(
-                // formatSinglePageResultsInNoChange
-                Arguments.of("1", "1"),
-
-                // formatPageNumbers
-                Arguments.of("1--2", "1-2"),
-
-                // endash
-                Arguments.of("1--2", "1\u20132"),
-
-                // emdash
-                Arguments.of("1--2", "1\u20142"),
-
-                // formatPageNumbersCommaSeparated
-                Arguments.of("1,2,3", "1,2,3"),
-
-                // formatPageNumbersPlusRange
-                Arguments.of("43+", "43+"),
-
-                // ignoreWhitespaceInPageNumbers
-                Arguments.of("1--2", "   1  - 2 "),
-
-                // removeWhitespaceSinglePage
-                Arguments.of("1", "   1  "),
-
-                // removeWhitespacePageRange
-                Arguments.of("1--2", "   1 -- 2  "),
-
-                // ignoreWhitespaceInPageNumbersWithDoubleDash
-                Arguments.of("43--103", "43 -- 103"),
-
-                // keepCorrectlyFormattedPageNumbers
-                Arguments.of("1--2", "1--2"),
-
-                // three dashes get two dashes
-                Arguments.of("1--2", "1---2"),
-
-                // formatPageNumbersRemoveUnexpectedLiterals
-                Arguments.of("1--2", "{1}-{2}"),
-
-                // formatPageNumbersRegexNotMatching
-                Arguments.of("12", "12"),
-
-                // special case, where -- is also put into
-                Arguments.of("some--text", "some-text"),
-                Arguments.of("pages 1--50", "pages 1-50"),
-                Arguments.of("--43", "-43"),
-
-                // keep arbitrary text
-                Arguments.of("some-text-with-dashes", "some-text-with-dashes"),
-                Arguments.of("{A}", "{A}"),
-                Arguments.of("43+", "43+"),
-                Arguments.of("Invalid", "Invalid"),
-
-                // doNotRemoveLetters
-                Arguments.of("R1--R50", "R1-R50"),
-
-                // replaceLongDashWithDoubleDash
-                Arguments.of("1--50", "1 \u2014 50"),
-
-                // removePagePrefix
-                Arguments.of("50", "p.50"),
-
-                // removePagesPrefix
-                Arguments.of("50", "pp.50"),
-
-                // keep &
-                Arguments.of("40&50", "40&50"),
-
-                // formatACMPages
-                // This appears in https://doi.org/10.1145/1658373.1658375
-                Arguments.of("2:1--2:33", "2:1-2:33"),
-
-                // keepFormattedACMPages
-                // This appears in https://doi.org/10.1145/1658373.1658375
-                Arguments.of("2:1--2:33", "2:1--2:33"),
-
-                // formatExample
-                Arguments.of("1--2", new NormalizePagesFormatter().getExampleInput()),
-
-                // replaceDashWithMinus
-                Arguments.of("R404--R405", "R404–R405"));
+            // formatSinglePageResultsInNoChange
+            Arguments.of("1", "1"),
+            // formatPageNumbers
+            Arguments.of("1--2", "1-2"),
+            // endash
+            Arguments.of("1--2", "1\u20132"),
+            // emdash
+            Arguments.of("1--2", "1\u20142"),
+            // formatPageNumbersCommaSeparated
+            Arguments.of("1,2,3", "1,2,3"),
+            // formatPageNumbersPlusRange
+            Arguments.of("43+", "43+"),
+            // ignoreWhitespaceInPageNumbers
+            Arguments.of("1--2", "   1  - 2 "),
+            // removeWhitespaceSinglePage
+            Arguments.of("1", "   1  "),
+            // removeWhitespacePageRange
+            Arguments.of("1--2", "   1 -- 2  "),
+            // ignoreWhitespaceInPageNumbersWithDoubleDash
+            Arguments.of("43--103", "43 -- 103"),
+            // keepCorrectlyFormattedPageNumbers
+            Arguments.of("1--2", "1--2"),
+            // three dashes get two dashes
+            Arguments.of("1--2", "1---2"),
+            // formatPageNumbersRemoveUnexpectedLiterals
+            Arguments.of("1--2", "{1}-{2}"),
+            // formatPageNumbersRegexNotMatching
+            Arguments.of("12", "12"),
+            // special case, where -- is also put into
+            Arguments.of("some--text", "some-text"),
+            Arguments.of("pages 1--50", "pages 1-50"),
+            Arguments.of("--43", "-43"),
+            // keep arbitrary text
+            Arguments.of("some-text-with-dashes", "some-text-with-dashes"),
+            Arguments.of("{A}", "{A}"),
+            Arguments.of("43+", "43+"),
+            Arguments.of("Invalid", "Invalid"),
+            // doNotRemoveLetters
+            Arguments.of("R1--R50", "R1-R50"),
+            // replaceLongDashWithDoubleDash
+            Arguments.of("1--50", "1 \u2014 50"),
+            // removePagePrefix
+            Arguments.of("50", "p.50"),
+            // removePagesPrefix
+            Arguments.of("50", "pp.50"),
+            // keep &
+            Arguments.of("40&50", "40&50"),
+            // formatACMPages
+            // This appears in https://doi.org/10.1145/1658373.1658375
+            Arguments.of("2:1--2:33", "2:1-2:33"),
+            // keepFormattedACMPages
+            // This appears in https://doi.org/10.1145/1658373.1658375
+            Arguments.of("2:1--2:33", "2:1--2:33"),
+            // formatExample
+            Arguments.of(
+                "1--2",
+                new NormalizePagesFormatter().getExampleInput()
+            ),
+            // replaceDashWithMinus
+            Arguments.of("R404--R405", "R404–R405")
+        );
     }
 
     @ParameterizedTest
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 6fffcf6ee30..e6fb3816c76 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}
  */
@@ -36,27 +36,33 @@ public void replaceSuperscriptsIgnoresCase() {
     @Test
     public 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 1st line\nand on 2nd line.",
+            "replace on 1\\textsuperscript{st} line\nand on 2\\textsuperscript{nd} line."
         );
     }
 
     @Test
     public void replaceAllSuperscripts() {
         expectCorrect(
-                "1st 2nd 3rd 4th",
-                "1\\textsuperscript{st} 2\\textsuperscript{nd} 3\\textsuperscript{rd} 4\\textsuperscript{th}"
+            "1st 2nd 3rd 4th",
+            "1\\textsuperscript{st} 2\\textsuperscript{nd} 3\\textsuperscript{rd} 4\\textsuperscript{th}"
         );
     }
 
     @Test
     public 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
     public void formatExample() {
-        assertEquals("11\\textsuperscript{th}", formatter.format(formatter.getExampleInput()));
+        assertEquals(
+            "11\\textsuperscript{th}",
+            formatter.format(formatter.getExampleInput())
+        );
     }
 
     private void expectCorrect(String input, String expected) {
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 8cd7b10ab5d..381644d1da8 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;
@@ -11,43 +11,70 @@ class RegexFormatterTest {
     @Test
     void spacesReplacedCorrectly() {
         formatter = new RegexFormatter("(\" \",\"-\")");
-        assertEquals("replace-all-spaces", formatter.format("replace all spaces"));
+        assertEquals(
+            "replace-all-spaces",
+            formatter.format("replace all spaces")
+        );
     }
 
     @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
     void formatExample() {
         formatter = new RegexFormatter("(\" \",\"-\")");
-        assertEquals("Please-replace-the-spaces", formatter.format(formatter.getExampleInput()));
+        assertEquals(
+            "Please-replace-the-spaces",
+            formatter.format(formatter.getExampleInput())
+        );
     }
 
     @Test
diff --git a/src/test/java/org/jabref/logic/formatter/bibtexfields/RemoveBracesFormatterTest.java b/src/test/java/org/jabref/logic/formatter/bibtexfields/RemoveBracesFormatterTest.java
index 45a418094bc..601bfdedc9e 100644
--- a/src/test/java/org/jabref/logic/formatter/bibtexfields/RemoveBracesFormatterTest.java
+++ b/src/test/java/org/jabref/logic/formatter/bibtexfields/RemoveBracesFormatterTest.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/RemoveDigitsFormatterTest.java b/src/test/java/org/jabref/logic/formatter/bibtexfields/RemoveDigitsFormatterTest.java
index 4eed8b2c31d..d8d2cba0a58 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;
-
 public class RemoveDigitsFormatterTest {
 
     private RemoveDigitsFormatter formatter;
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 a96b37ae1c6..a4c03a66372 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;
-
 public 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 f3a887838fe..28e7106aa55 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;
-
 public class RemoveNewlinesFormatterTest {
 
     private RemoveNewlinesFormatter formatter;
@@ -38,6 +37,9 @@ public void withoutNewLineUnmodified() {
     @Test
     public void removePlatformSpecificNewLine() {
         String newLine = String.format("%n");
-        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 b4b4d1e2461..945d16b3aeb 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;
-
 public class RemoveRedundantSpacesFormatterTest {
 
     private RemoveRedundantSpacesFormatter formatter;
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 cf902fdd3ee..bbd739fe583 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;
-
 public 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 ed1f6bcf5bd..36bb43f65b4 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;
-
 public class ReplaceWithEscapedDoubleQuotesTest {
 
     private ReplaceWithEscapedDoubleQuotes formatter;
@@ -18,17 +17,26 @@ public void setUp() {
 
     @Test
     public void replacingSingleDoubleQuote() {
-        assertEquals("single \"\"double quote", formatter.format("single \"double quote"));
+        assertEquals(
+            "single \"\"double quote",
+            formatter.format("single \"double quote")
+        );
     }
 
     @Test
     public void replacingMultipleDoubleQuote() {
-        assertEquals("multiple \"\"double\"\" quote", formatter.format("multiple \"double\" quote"));
+        assertEquals(
+            "multiple \"\"double\"\" quote",
+            formatter.format("multiple \"double\" quote")
+        );
     }
-    
+
     @Test
     public void replacingSingleDoubleQuoteHavingCommas() {
-        assertEquals("this \"\"is\"\", a test", formatter.format("this \"is\", a test"));
+        assertEquals(
+            "this \"\"is\"\", a test",
+            formatter.format("this \"is\", a test")
+        );
     }
 
     @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 15ea8081908..1b9788ee3e8 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 3154a1a91fb..295d9f6daf7 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;
-
 public class TrimWhitespaceFormatterTest {
 
     private TrimWhitespaceFormatter formatter;
@@ -54,6 +53,9 @@ public void removeSeparatorSpaces() {
     public void removeMixedWhitespaceChars() {
         assertEquals("whitespace", formatter.format(" \r\t\fwhitespace"));
         assertEquals("whitespace", formatter.format("whitespace \n \r"));
-        assertEquals("whitespace", formatter.format("   \f\t whitespace  \r \n"));
+        assertEquals(
+            "whitespace",
+            formatter.format("   \f\t whitespace  \r \n")
+        );
     }
 }
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 a4d7f3fa7cb..e4d9ff0c29b 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 2f43db8a4fe..137bd48e064 100644
--- a/src/test/java/org/jabref/logic/formatter/bibtexfields/UnicodeToLatexFormatterTest.java
+++ b/src/test/java/org/jabref/logic/formatter/bibtexfields/UnicodeToLatexFormatterTest.java
@@ -1,14 +1,13 @@
 package org.jabref.logic.formatter.bibtexfields;
 
-import java.util.stream.Stream;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
+import java.util.stream.Stream;
 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;
-
 class UnicodeToLatexFormatterTest {
 
     private UnicodeToLatexFormatter formatter;
@@ -20,15 +19,19 @@ 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("", ""), // 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()
+            )
+        );
     }
 
-    @ParameterizedTest()
+    @ParameterizedTest
     @MethodSource("testCases")
     void testFormat(String expectedResult, String input) {
         assertEquals(expectedResult, formatter.format(input));
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 292a79b7869..0e938883355 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 d662162c520..c887c6cc330 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}
  */
@@ -21,11 +21,15 @@ public void setUp() {
 
     @Test
     public void formatExample() {
-        assertEquals("I Have {a} Dream", formatter.format(formatter.getExampleInput()));
+        assertEquals(
+            "I Have {a} Dream",
+            formatter.format(formatter.getExampleInput())
+        );
     }
 
     @ParameterizedTest(name = "input={0}, formattedStr={1}")
-    @CsvSource(value = {
+    @CsvSource(
+        value = {
             "{}, {}", // {}
             "{upper, {upper", // unmatched braces
             "upper, Upper", // single word lower case
@@ -50,7 +54,8 @@ public void formatExample() {
             "{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 -
-    })
+        }
+    )
     public void testInputs(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 55eb22e6451..2b763b053ca 100644
--- a/src/test/java/org/jabref/logic/formatter/casechanger/LowerCaseFormatterTest.java
+++ b/src/test/java/org/jabref/logic/formatter/casechanger/LowerCaseFormatterTest.java
@@ -1,15 +1,14 @@
 package org.jabref.logic.formatter.casechanger;
 
-import java.util.stream.Stream;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
+import java.util.stream.Stream;
 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;
-
 /**
  * Tests in addition to the general tests from {@link org.jabref.logic.formatter.FormatterTest}
  */
@@ -30,15 +29,18 @@ public void test(String expected, String input) {
 
     private static Stream<Arguments> provideStringsForFormat() {
         return Stream.of(
-                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", "lower"),
+            Arguments.of("lower", "LOWER"),
+            Arguments.of("lower {UPPER}", "LOWER {UPPER}"),
+            Arguments.of("lower {U}pper", "LOWER {U}PPER")
         );
     }
 
     @Test
     public void formatExample() {
-        assertEquals("kde {Amarok}", formatter.format(formatter.getExampleInput()));
+        assertEquals(
+            "kde {Amarok}",
+            formatter.format(formatter.getExampleInput())
+        );
     }
 }
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 f0b5e71811b..218bfbf0525 100644
--- a/src/test/java/org/jabref/logic/formatter/casechanger/ProtectTermsFormatterTest.java
+++ b/src/test/java/org/jabref/logic/formatter/casechanger/ProtectTermsFormatterTest.java
@@ -1,15 +1,13 @@
 package org.jabref.logic.formatter.casechanger;
 
-import java.util.Collections;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
+import java.util.Collections;
 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;
-
 /**
  * Tests in addition to the general tests from {@link org.jabref.logic.formatter.FormatterTest}
  */
@@ -19,9 +17,17 @@ public class ProtectTermsFormatterTest {
 
     @BeforeEach
     public 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
@@ -41,7 +47,10 @@ public void testCaseSensitivity() {
 
     @Test
     public void formatExample() {
-        assertEquals("In {CDMA}", formatter.format(formatter.getExampleInput()));
+        assertEquals(
+            "In {CDMA}",
+            formatter.format(formatter.getExampleInput())
+        );
     }
 
     @Test
@@ -53,7 +62,9 @@ public void testCorrectOrderingOfTerms() {
     public void test() {
         assertEquals("{VLSI} {VLSI}", formatter.format("VLSI {VLSI}"));
         assertEquals("{BPEL}", formatter.format("{BPEL}"));
-        assertEquals("{Testing {BPEL} Engine Performance: A Survey}",
-                formatter.format("{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 38bea3eca23..3a64e1bb888 100644
--- a/src/test/java/org/jabref/logic/formatter/casechanger/SentenceCaseFormatterTest.java
+++ b/src/test/java/org/jabref/logic/formatter/casechanger/SentenceCaseFormatterTest.java
@@ -1,14 +1,13 @@
 package org.jabref.logic.formatter.casechanger;
 
-import java.util.stream.Stream;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
+import java.util.stream.Stream;
 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;
-
 /**
  * Tests in addition to the general tests from {@link org.jabref.logic.formatter.FormatterTest}
  */
@@ -23,23 +22,36 @@ public void setUp() {
 
     private static Stream<Arguments> testData() {
         return Stream.of(
-                Arguments.of("Upper first", "upper First"),
-                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",
-                        "Whose music? a sociology of musical language"),
-                Arguments.of("Bibliographic software. A comparison.",
-                        "bibliographic software. a comparison."),
-                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.",
-                        "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("I have {Aa} dream", new SentenceCaseFormatter().getExampleInput()));
+            Arguments.of("Upper first", "upper First"),
+            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",
+                "Whose music? a sociology of musical language"
+            ),
+            Arguments.of(
+                "Bibliographic software. A comparison.",
+                "bibliographic software. a comparison."
+            ),
+            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.",
+                "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(
+                "I have {Aa} dream",
+                new SentenceCaseFormatter().getExampleInput()
+            )
+        );
     }
 
     @ParameterizedTest
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 2538af947a2..ad719e866e7 100644
--- a/src/test/java/org/jabref/logic/formatter/casechanger/TitleCaseFormatterTest.java
+++ b/src/test/java/org/jabref/logic/formatter/casechanger/TitleCaseFormatterTest.java
@@ -1,14 +1,13 @@
 package org.jabref.logic.formatter.casechanger;
 
-import java.util.stream.Stream;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
+import java.util.stream.Stream;
 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;
-
 /**
  * Tests in addition to the general tests from {@link org.jabref.logic.formatter.FormatterTest}
  */
@@ -23,44 +22,79 @@ public void setUp() {
 
     private static Stream<Arguments> testData() {
         return Stream.of(
-                Arguments.of("Upper Each First", "upper each first"),
-                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",
-                        "an upper each of: the and first and"),
-                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",
-                        "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",
-                        "Two experiences designing for effective security"),
-                Arguments.of("Bibliographic Software. A Comparison.",
-                        "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",
-                        "--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",
-                        "--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",
-                        "kinetic studies on enzyme-catalyzed reactions: oxidation of glucose, decomposition of hydrogen peroxide and their combination"),
-                Arguments.of("{BPMN} Conformance in Open Source Engines",
-                        new TitleCaseFormatter().getExampleInput()));
+            Arguments.of("Upper Each First", "upper each first"),
+            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",
+                "an upper each of: the and first and"
+            ),
+            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",
+                "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",
+                "Two experiences designing for effective security"
+            ),
+            Arguments.of(
+                "Bibliographic Software. A Comparison.",
+                "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",
+                "--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",
+                "--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",
+                "kinetic studies on enzyme-catalyzed reactions: oxidation of glucose, decomposition of hydrogen peroxide and their combination"
+            ),
+            Arguments.of(
+                "{BPMN} Conformance in Open Source Engines",
+                new TitleCaseFormatter().getExampleInput()
+            )
+        );
     }
 
     @ParameterizedTest
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 5c7e0979789..0eb8a3b50a6 100644
--- a/src/test/java/org/jabref/logic/formatter/casechanger/UnprotectTermsFormatterTest.java
+++ b/src/test/java/org/jabref/logic/formatter/casechanger/UnprotectTermsFormatterTest.java
@@ -1,15 +1,14 @@
 package org.jabref.logic.formatter.casechanger;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
 import java.io.IOException;
 import java.util.stream.Stream;
-
 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;
-
 /**
  * Tests in addition to the general tests from {@link org.jabref.logic.formatter.FormatterTest}
  */
@@ -24,18 +23,31 @@ public void setUp() {
 
     private static Stream<Arguments> terms() throws IOException {
         return Stream.of(
-                Arguments.of("", ""),
-                Arguments.of("VLSI", "{VLSI}"),
-                Arguments.of("VLsI", "VLsI"),
-                Arguments.of("VLSI", "VLSI"),
-                Arguments.of("VLSI VLSI", "{VLSI} {VLSI}"),
-                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("In CDMA", new UnprotectTermsFormatter().getExampleInput()));
+            Arguments.of("", ""),
+            Arguments.of("VLSI", "{VLSI}"),
+            Arguments.of("VLsI", "VLsI"),
+            Arguments.of("VLSI", "VLSI"),
+            Arguments.of("VLSI VLSI", "{VLSI} {VLSI}"),
+            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(
+                "In CDMA",
+                new UnprotectTermsFormatter().getExampleInput()
+            )
+        );
     }
 
     @ParameterizedTest
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 c1397603348..13d0ba750d7 100644
--- a/src/test/java/org/jabref/logic/formatter/casechanger/UpperCaseFormatterTest.java
+++ b/src/test/java/org/jabref/logic/formatter/casechanger/UpperCaseFormatterTest.java
@@ -1,14 +1,13 @@
 package org.jabref.logic.formatter.casechanger;
 
-import java.util.stream.Stream;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
+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;
-
 /**
  * Tests in addition to the general tests from {@link org.jabref.logic.formatter.FormatterTest}
  */
@@ -24,18 +23,21 @@ public void upperCaseTest(String expectedFormat, String inputFormat) {
 
     private static Stream<Arguments> upperCaseTests() {
         return Stream.of(
-                Arguments.of("LOWER", "LOWER"),
-                Arguments.of("UPPER", "upper"),
-                Arguments.of("UPPER", "UPPER"),
-                Arguments.of("UPPER {lower}", "upper {lower}"),
-                Arguments.of("UPPER {l}OWER", "upper {l}ower"),
-                Arguments.of("1", "1"),
-                Arguments.of("!", "!")
+            Arguments.of("LOWER", "LOWER"),
+            Arguments.of("UPPER", "upper"),
+            Arguments.of("UPPER", "UPPER"),
+            Arguments.of("UPPER {lower}", "upper {lower}"),
+            Arguments.of("UPPER {l}OWER", "upper {l}ower"),
+            Arguments.of("1", "1"),
+            Arguments.of("!", "!")
         );
     }
 
     @Test
     public void formatExample() {
-        assertEquals("KDE {Amarok}", formatter.format(formatter.getExampleInput()));
+        assertEquals(
+            "KDE {Amarok}",
+            formatter.format(formatter.getExampleInput())
+        );
     }
 }
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 eccff6f9f15..bb23a6f2856 100644
--- a/src/test/java/org/jabref/logic/formatter/minifier/MinifyNameListFormatterTest.java
+++ b/src/test/java/org/jabref/logic/formatter/minifier/MinifyNameListFormatterTest.java
@@ -1,14 +1,13 @@
 package org.jabref.logic.formatter.minifier;
 
-import java.util.stream.Stream;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
+import java.util.stream.Stream;
 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;
-
 /**
  * Tests in addition to the general tests from {@link org.jabref.logic.formatter.FormatterTest}
  */
@@ -23,18 +22,36 @@ public void setUp() {
 
     @ParameterizedTest
     @MethodSource("provideAuthorNames")
-    void minifyAuthorNames(String expectedAuthorNames, String originalAuthorNames) {
-        assertEquals(expectedAuthorNames, formatter.format(originalAuthorNames));
+    void minifyAuthorNames(
+        String expectedAuthorNames,
+        String originalAuthorNames
+    ) {
+        assertEquals(
+            expectedAuthorNames,
+            formatter.format(originalAuthorNames)
+        );
     }
 
     private static Stream<Arguments> provideAuthorNames() {
         return Stream.of(
-                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", "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()
+            )
+        );
     }
 }
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 e6a5f50b1f3..ca778698686 100644
--- a/src/test/java/org/jabref/logic/formatter/minifier/TruncateFormatterTest.java
+++ b/src/test/java/org/jabref/logic/formatter/minifier/TruncateFormatterTest.java
@@ -1,14 +1,15 @@
 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}
  */
 public class TruncateFormatterTest {
+
     private final String TITLE = "A Title";
 
     @Test
diff --git a/src/test/java/org/jabref/logic/git/GitHandlerTest.java b/src/test/java/org/jabref/logic/git/GitHandlerTest.java
index d5dd4c694c3..30f45a5dd67 100644
--- a/src/test/java/org/jabref/logic/git/GitHandlerTest.java
+++ b/src/test/java/org/jabref/logic/git/GitHandlerTest.java
@@ -1,10 +1,11 @@
 package org.jabref.logic.git;
 
+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;
-
 import org.eclipse.jgit.api.Git;
 import org.eclipse.jgit.api.errors.GitAPIException;
 import org.eclipse.jgit.lib.AnyObjectId;
@@ -14,11 +15,11 @@
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.io.TempDir;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-
 class GitHandlerTest {
+
     @TempDir
     Path repositoryPath;
+
     private GitHandler gitHandler;
 
     @BeforeEach
@@ -43,9 +44,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 af4b13a1f1b..66f076ea12b 100644
--- a/src/test/java/org/jabref/logic/git/SlrGitHandlerTest.java
+++ b/src/test/java/org/jabref/logic/git/SlrGitHandlerTest.java
@@ -1,11 +1,12 @@
 package org.jabref.logic.git;
 
+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;
-
 import org.eclipse.jgit.api.errors.GitAPIException;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -13,13 +14,15 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-
 class SlrGitHandlerTest {
-    private static final Logger LOGGER = LoggerFactory.getLogger(SlrGitHandlerTest.class);
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(
+        SlrGitHandlerTest.class
+    );
 
     @TempDir
     Path repositoryPath;
+
     private SlrGitHandler gitHandler;
 
     @BeforeEach
@@ -30,41 +33,59 @@ public 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.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"
+        );
         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"));
-        assertEquals(expectedPatch, gitHandler.calculatePatchOfNewSearchResults("branch1"));
+        assertEquals(
+            expectedPatch,
+            gitHandler.calculatePatchOfNewSearchResults("branch1")
+        );
     }
 
     @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");
+        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");
+            "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 +97,21 @@ 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")));
+        gitHandler.appendLatestSearchResultsOntoCurrentBranch(
+            "TestMessage",
+            "branch2"
+        );
+
+        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 006c0383d0e..60d6d17463d 100644
--- a/src/test/java/org/jabref/logic/help/HelpFileTest.java
+++ b/src/test/java/org/jabref/logic/help/HelpFileTest.java
@@ -1,18 +1,16 @@
 package org.jabref.logic.help;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
 import java.io.IOException;
 import java.net.HttpURLConnection;
 import java.net.URL;
 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/";
@@ -27,6 +25,10 @@ void referToValidPage(HelpFile help) throws IOException {
         URL url = new URL(jabrefHelp + help.getPageName());
         HttpURLConnection http = (HttpURLConnection) url.openConnection();
         http.setRequestProperty("User-Agent", URLDownload.USER_AGENT);
-        assertEquals(200, http.getResponseCode(), "Wrong URL: " + url.toString());
+        assertEquals(
+            200,
+            http.getResponseCode(),
+            "Wrong URL: " + url.toString()
+        );
     }
 }
diff --git a/src/test/java/org/jabref/logic/importer/AuthorListParserTest.java b/src/test/java/org/jabref/logic/importer/AuthorListParserTest.java
index 42a3c18b378..c778c99311d 100644
--- a/src/test/java/org/jabref/logic/importer/AuthorListParserTest.java
+++ b/src/test/java/org/jabref/logic/importer/AuthorListParserTest.java
@@ -1,51 +1,101 @@
 package org.jabref.logic.importer;
 
-import java.util.stream.Stream;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
+import java.util.stream.Stream;
 import org.jabref.model.entry.Author;
 import org.jabref.model.entry.AuthorList;
-
 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;
-
 class AuthorListParserTest {
 
     AuthorListParser parser = new AuthorListParser();
 
     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)),
-                // parseAuthorWithFirstNameAbbreviationContainingUmlaut
-                Arguments.of("{\\OE}rjan Umlauts", new Author("{\\OE}rjan", "{\\OE}.", null, "Umlauts", null))
+            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)
+            ),
+            // parseAuthorWithFirstNameAbbreviationContainingUmlaut
+            Arguments.of(
+                "{\\OE}rjan Umlauts",
+                new Author("{\\OE}rjan", "{\\OE}.", null, "Umlauts", null)
+            )
         );
     }
 
     @ParameterizedTest
     @MethodSource
-    void parseSingleAuthorCorrectly(String authorsString, Author authorsParsed) {
+    void parseSingleAuthorCorrectly(
+        String authorsString,
+        Author authorsParsed
+    ) {
         assertEquals(AuthorList.of(authorsParsed), parser.parse(authorsString));
     }
 
     private static Stream<Arguments> parseMultipleCorrectly() {
         return Stream.of(
-                Arguments.of(
-                        AuthorList.of(
-                                new Author("Alexander", "A.", null, "Artemenko", null),
-                                Author.OTHERS
-                        ),
-                        "Alexander Artemenko and others")
+            Arguments.of(
+                AuthorList.of(
+                    new Author("Alexander", "A.", null, "Artemenko", null),
+                    Author.OTHERS
+                ),
+                "Alexander Artemenko and others"
+            )
         );
     }
 
diff --git a/src/test/java/org/jabref/logic/importer/BibDatabaseFilesTest.java b/src/test/java/org/jabref/logic/importer/BibDatabaseFilesTest.java
index e7301dcc905..1d06879317f 100644
--- a/src/test/java/org/jabref/logic/importer/BibDatabaseFilesTest.java
+++ b/src/test/java/org/jabref/logic/importer/BibDatabaseFilesTest.java
@@ -1,40 +1,53 @@
 package org.jabref.logic.importer;
 
+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;
-
 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;
-
 public class BibDatabaseFilesTest {
 
     private ImportFormatPreferences importFormatPreferences;
 
     @BeforeEach
     public void setUp() {
-        importFormatPreferences = mock(ImportFormatPreferences.class, Answers.RETURNS_DEEP_STUBS);
+        importFormatPreferences =
+            mock(ImportFormatPreferences.class, Answers.RETURNS_DEEP_STUBS);
     }
 
     @Test
     public 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)) {
-            ParserResult result = new BibtexParser(importFormatPreferences).parse(fr);
+        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(
+                "Patterson, David",
+                db.resolveForStrings("#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 e4990202d1e..8f6832d1e2c 100644
--- a/src/test/java/org/jabref/logic/importer/DatabaseFileLookupTest.java
+++ b/src/test/java/org/jabref/logic/importer/DatabaseFileLookupTest.java
@@ -1,20 +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 java.util.Collection;
 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;
-
 class DatabaseFileLookupTest {
 
     private BibDatabase database;
@@ -25,8 +23,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 a8aa3b7628d..b008591b881 100644
--- a/src/test/java/org/jabref/logic/importer/FulltextFetchersTest.java
+++ b/src/test/java/org/jabref/logic/importer/FulltextFetchersTest.java
@@ -1,22 +1,20 @@
 package org.jabref.logic.importer;
 
+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.URL;
 import java.util.Optional;
 import java.util.Set;
-
 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;
-
 @FetcherTest
 public class FulltextFetchersTest {
 
@@ -24,7 +22,9 @@ public class FulltextFetchersTest {
 
     @Test
     public void acceptPdfUrls() throws MalformedURLException {
-        URL pdfUrl = new URL("http://docs.oasis-open.org/wsbpel/2.0/OS/wsbpel-v2.0-OS.pdf");
+        URL pdfUrl = new URL(
+            "http://docs.oasis-open.org/wsbpel/2.0/OS/wsbpel-v2.0-OS.pdf"
+        );
         FulltextFetcher finder = e -> Optional.of(pdfUrl);
         FulltextFetchers fetcher = new FulltextFetchers(Set.of(finder));
         assertEquals(Optional.of(pdfUrl), fetcher.findFullTextPDF(entry));
@@ -32,7 +32,9 @@ public void acceptPdfUrls() throws MalformedURLException {
 
     @Test
     public void rejectNonPdfUrls() throws MalformedURLException {
-        URL pdfUrl = new URL("https://github.com/JabRef/jabref/blob/master/README.md");
+        URL pdfUrl = new URL(
+            "https://github.com/JabRef/jabref/blob/master/README.md"
+        );
         FulltextFetcher finder = e -> Optional.of(pdfUrl);
         FulltextFetchers fetcher = new FulltextFetchers(Set.of(finder));
 
@@ -41,7 +43,9 @@ public void rejectNonPdfUrls() throws MalformedURLException {
 
     @Test
     public void noTrustLevel() throws MalformedURLException {
-        URL pdfUrl = new URL("http://docs.oasis-open.org/wsbpel/2.0/OS/wsbpel-v2.0-OS.pdf");
+        URL pdfUrl = new URL(
+            "http://docs.oasis-open.org/wsbpel/2.0/OS/wsbpel-v2.0-OS.pdf"
+        );
         FulltextFetcher finder = e -> Optional.of(pdfUrl);
         FulltextFetchers fetcher = new FulltextFetchers(Set.of(finder));
 
@@ -52,15 +56,21 @@ public void noTrustLevel() throws MalformedURLException {
     public void higherTrustLevelWins() throws IOException, FetcherException {
         FulltextFetcher finderHigh = mock(FulltextFetcher.class);
         when(finderHigh.getTrustLevel()).thenReturn(TrustLevel.SOURCE);
-        final URL highUrl = new URL("http://docs.oasis-open.org/wsbpel/2.0/OS/wsbpel-v2.0-OS.pdf");
+        final URL highUrl = new URL(
+            "http://docs.oasis-open.org/wsbpel/2.0/OS/wsbpel-v2.0-OS.pdf"
+        );
         when(finderHigh.findFullText(entry)).thenReturn(Optional.of(highUrl));
 
         FulltextFetcher finderLow = mock(FulltextFetcher.class);
         when(finderLow.getTrustLevel()).thenReturn(TrustLevel.UNKNOWN);
-        final URL lowUrl = new URL("http://docs.oasis-open.org/opencsa/sca-bpel/sca-bpel-1.1-spec-cd-01.pdf");
+        final URL lowUrl = new URL(
+            "http://docs.oasis-open.org/opencsa/sca-bpel/sca-bpel-1.1-spec-cd-01.pdf"
+        );
         when(finderLow.findFullText(entry)).thenReturn(Optional.of(lowUrl));
 
-        FulltextFetchers fetcher = new FulltextFetchers(Set.of(finderLow, finderHigh));
+        FulltextFetchers fetcher = new FulltextFetchers(
+            Set.of(finderLow, finderHigh)
+        );
 
         // set an (arbitrary) DOI to the test entry to skip side effects inside the "findFullTextPDF" method
         entry.setField(StandardField.DOI, "10.5220/0007903201120130");
diff --git a/src/test/java/org/jabref/logic/importer/ImportDataTest.java b/src/test/java/org/jabref/logic/importer/ImportDataTest.java
index 5aa06c9be9c..6624c85469d 100644
--- a/src/test/java/org/jabref/logic/importer/ImportDataTest.java
+++ b/src/test/java/org/jabref/logic/importer/ImportDataTest.java
@@ -1,37 +1,70 @@
 package org.jabref.logic.importer;
 
+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;
-
 import org.junit.jupiter.api.Test;
 
-import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-
 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.
      */
     @Test
     void testTestingEnvironment() {
-        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.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_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.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");
+        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 14c447cfe0e..957e69c161a 100644
--- a/src/test/java/org/jabref/logic/importer/ImportFormatReaderIntegrationTest.java
+++ b/src/test/java/org/jabref/logic/importer/ImportFormatReaderIntegrationTest.java
@@ -1,71 +1,132 @@
 package org.jabref.logic.importer;
 
+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;
-
 import javafx.collections.FXCollections;
-
 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;
-
 class ImportFormatReaderIntegrationTest {
 
     private ImportFormatReader reader;
 
     @BeforeEach
     void setUp() {
-        ImporterPreferences importerPreferences = mock(ImporterPreferences.class, Answers.RETURNS_DEEP_STUBS);
-        when(importerPreferences.getCustomImporters()).thenReturn(FXCollections.emptyObservableSet());
-        reader = new ImportFormatReader(
+        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),
-                new DummyFileUpdateMonitor());
+                new DummyFileUpdateMonitor()
+            );
     }
 
     @ParameterizedTest
     @MethodSource("importFormats")
-    void testImportUnknownFormat(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());
-        assertEquals(count, unknownFormat.parserResult().getDatabase().getEntryCount());
+    void testImportUnknownFormat(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());
+        assertEquals(
+            count,
+            unknownFormat.parserResult().getDatabase().getEntryCount()
+        );
     }
 
     @ParameterizedTest
     @MethodSource("importFormats")
-    void testImportFormatFromFile(String resource, String format, int count) throws Exception {
-        Path file = Path.of(ImportFormatReaderIntegrationTest.class.getResource(resource).toURI());
-        assertEquals(count, reader.importFromFile(format, file).getDatabase().getEntries().size());
+    void testImportFormatFromFile(String resource, String format, int count)
+        throws Exception {
+        Path file = Path.of(
+            ImportFormatReaderIntegrationTest.class.getResource(resource)
+                .toURI()
+        );
+        assertEquals(
+            count,
+            reader
+                .importFromFile(format, file)
+                .getDatabase()
+                .getEntries()
+                .size()
+        );
     }
 
     @ParameterizedTest
     @MethodSource("importFormats")
-    void testImportUnknownFormatFromString(String resource, String format, int count) throws Exception {
-        Path file = Path.of(ImportFormatReaderIntegrationTest.class.getResource(resource).toURI());
+    void testImportUnknownFormatFromString(
+        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/SilverPlatterImporterTest1.txt", "silverplatter", 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/SilverPlatterImporterTest1.txt",
+                "silverplatter",
+                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 f05facf0dd0..0ebba1baa75 100644
--- a/src/test/java/org/jabref/logic/importer/ImportFormatReaderParameterlessTest.java
+++ b/src/test/java/org/jabref/logic/importer/ImportFormatReaderParameterlessTest.java
@@ -1,20 +1,17 @@
 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 java.nio.file.Path;
 import javafx.collections.FXCollections;
-
 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;
-
 class ImportFormatReaderParameterlessTest {
 
     private ImportFormatReader reader;
@@ -22,30 +19,61 @@ 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, 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,
+                fileMonitor
+            );
     }
 
     @Test
-    void importUnknownFormatThrowsExceptionIfNoMatchingImporterWasFound() throws Exception {
-        Path file = Path.of(ImportFormatReaderParameterlessTest.class.getResource("fileformat/emptyFile.xml").toURI());
-        assertThrows(ImportException.class, () -> reader.importUnknownFormat(file, fileMonitor));
+    void importUnknownFormatThrowsExceptionIfNoMatchingImporterWasFound()
+        throws Exception {
+        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
     void importUnknownFormatThrowsExceptionIfDataIsNull() {
-        assertThrows(NullPointerException.class, () -> reader.importUnknownFormat(null));
+        assertThrows(
+            NullPointerException.class,
+            () -> reader.importUnknownFormat(null)
+        );
     }
 
     @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 4db39bf1635..ef0cd60e5ad 100644
--- a/src/test/java/org/jabref/logic/importer/ImporterTest.java
+++ b/src/test/java/org/jabref/logic/importer/ImporterTest.java
@@ -1,9 +1,15 @@
 package org.jabref.logic.importer;
 
+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;
-
 import org.jabref.logic.importer.fileformat.BiblioscapeImporter;
 import org.jabref.logic.importer.fileformat.BibtexImporter;
 import org.jabref.logic.importer.fileformat.CitaviXmlImporter;
@@ -23,43 +29,55 @@
 import org.jabref.logic.importer.fileformat.SilverPlatterImporter;
 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;
-
 public class ImporterTest {
 
     @ParameterizedTest
     @MethodSource("instancesToTest")
-    public void isRecognizedFormatWithNullForBufferedReaderThrowsException(Importer format) {
-        assertThrows(NullPointerException.class, () -> format.isRecognizedFormat((BufferedReader) null));
+    public void isRecognizedFormatWithNullForBufferedReaderThrowsException(
+        Importer format
+    ) {
+        assertThrows(
+            NullPointerException.class,
+            () -> format.isRecognizedFormat((BufferedReader) null)
+        );
     }
 
     @ParameterizedTest
     @MethodSource("instancesToTest")
-    public void isRecognizedFormatWithNullForStringThrowsException(Importer format) {
-        assertThrows(NullPointerException.class, () -> format.isRecognizedFormat((String) null));
+    public void isRecognizedFormatWithNullForStringThrowsException(
+        Importer format
+    ) {
+        assertThrows(
+            NullPointerException.class,
+            () -> format.isRecognizedFormat((String) null)
+        );
     }
 
     @ParameterizedTest
     @MethodSource("instancesToTest")
-    public void importDatabaseWithNullForBufferedReaderThrowsException(Importer format) {
-        assertThrows(NullPointerException.class, () -> format.importDatabase((BufferedReader) null));
+    public void importDatabaseWithNullForBufferedReaderThrowsException(
+        Importer format
+    ) {
+        assertThrows(
+            NullPointerException.class,
+            () -> format.importDatabase((BufferedReader) null)
+        );
     }
 
     @ParameterizedTest
     @MethodSource("instancesToTest")
-    public void importDatabaseWithNullForStringThrowsException(Importer format) {
-        assertThrows(NullPointerException.class, () -> format.importDatabase((String) null));
+    public void importDatabaseWithNullForStringThrowsException(
+        Importer format
+    ) {
+        assertThrows(
+            NullPointerException.class,
+            () -> format.importDatabase((String) null)
+        );
     }
 
     @ParameterizedTest
@@ -89,7 +107,9 @@ public void getIdDoesNotContainWhitespace(Importer format) {
 
     @ParameterizedTest
     @MethodSource("instancesToTest")
-    public void getIdStripsSpecialCharactersAndConvertsToLowercase(Importer format) {
+    public void getIdStripsSpecialCharactersAndConvertsToLowercase(
+        Importer format
+    ) {
         Importer importer = mock(Importer.class, Mockito.CALLS_REAL_METHODS);
         when(importer.getName()).thenReturn("*Test-Importer");
         assertEquals("testimporter", importer.getId());
@@ -105,8 +125,14 @@ public static Stream<Importer> instancesToTest() {
         // all classes implementing {@link Importer}
         // sorted alphabetically
 
-        ImportFormatPreferences importFormatPreferences = mock(ImportFormatPreferences.class, Answers.RETURNS_DEEP_STUBS);
-        when(importFormatPreferences.bibEntryPreferences().getKeywordSeparator()).thenReturn(',');
+        ImportFormatPreferences importFormatPreferences = mock(
+            ImportFormatPreferences.class,
+            Answers.RETURNS_DEEP_STUBS
+        );
+        when(
+            importFormatPreferences.bibEntryPreferences().getKeywordSeparator()
+        )
+            .thenReturn(',');
         XmpPreferences xmpPreferences = mock(XmpPreferences.class);
         // @formatter:off
         return Stream.of(
diff --git a/src/test/java/org/jabref/logic/importer/OpenDatabaseTest.java b/src/test/java/org/jabref/logic/importer/OpenDatabaseTest.java
index c170b9e16a2..f027520a2a9 100644
--- a/src/test/java/org/jabref/logic/importer/OpenDatabaseTest.java
+++ b/src/test/java/org/jabref/logic/importer/OpenDatabaseTest.java
@@ -1,5 +1,8 @@
 package org.jabref.logic.importer;
 
+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;
@@ -7,21 +10,16 @@
 import java.nio.file.Path;
 import java.util.Collection;
 import java.util.Optional;
-
 import org.jabref.model.database.BibDatabase;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.field.StandardField;
 import org.jabref.model.util.DummyFileUpdateMonitor;
 import org.jabref.model.util.FileUpdateMonitor;
 import org.jabref.preferences.LibraryPreferences;
-
 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;
-
 class OpenDatabaseTest {
 
     private final Charset defaultEncoding = StandardCharsets.UTF_8;
@@ -35,71 +33,127 @@ class OpenDatabaseTest {
     private final FileUpdateMonitor fileMonitor = new DummyFileUpdateMonitor();
 
     OpenDatabaseTest() throws URISyntaxException {
-        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());
+        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()
+            );
     }
 
     @BeforeEach
     void setUp() {
-        libraryPreferences = mock(LibraryPreferences.class, Answers.RETURNS_DEEP_STUBS);
-        importFormatPreferences = mock(ImportFormatPreferences.class, Answers.RETURNS_DEEP_STUBS);
+        libraryPreferences =
+            mock(LibraryPreferences.class, Answers.RETURNS_DEEP_STUBS);
+        importFormatPreferences =
+            mock(ImportFormatPreferences.class, Answers.RETURNS_DEEP_STUBS);
     }
 
     @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,8 +161,15 @@ void entriesAreParsedHeaderAndSignature() throws IOException {
      */
     @Test
     void correctlyParseEncodingWithoutNewline() throws IOException {
-        ParserResult result = OpenDatabase.loadDatabase(bibEncodingWithoutNewline, importFormatPreferences, fileMonitor);
-        assertEquals(StandardCharsets.US_ASCII, result.getMetaData().getEncoding().get());
+        ParserResult result = OpenDatabase.loadDatabase(
+            bibEncodingWithoutNewline,
+            importFormatPreferences,
+            fileMonitor
+        );
+        assertEquals(
+            StandardCharsets.US_ASCII,
+            result.getMetaData().getEncoding().get()
+        );
 
         BibDatabase db = result.getDatabase();
         assertEquals(Optional.of("testPreamble"), db.getPreamble());
diff --git a/src/test/java/org/jabref/logic/importer/ParserResultTest.java b/src/test/java/org/jabref/logic/importer/ParserResultTest.java
index 4787583e113..703009e977e 100644
--- a/src/test/java/org/jabref/logic/importer/ParserResultTest.java
+++ b/src/test/java/org/jabref/logic/importer/ParserResultTest.java
@@ -1,15 +1,13 @@
 package org.jabref.logic.importer;
 
-import java.util.List;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
+import java.util.List;
 import org.jabref.model.database.BibDatabase;
 import org.jabref.model.entry.BibEntry;
-
 import org.junit.jupiter.api.Test;
 
-import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-
 class ParserResultTest {
 
     @Test
diff --git a/src/test/java/org/jabref/logic/importer/QueryParserTest.java b/src/test/java/org/jabref/logic/importer/QueryParserTest.java
index acb8c41a40c..c6cd1cc670f 100644
--- a/src/test/java/org/jabref/logic/importer/QueryParserTest.java
+++ b/src/test/java/org/jabref/logic/importer/QueryParserTest.java
@@ -1,74 +1,124 @@
 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;
-
 public class QueryParserTest {
+
     QueryParser parser = new QueryParser();
 
     @Test
     public 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
     public 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
     public 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
     public 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
     public 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);
     }
 
     @Test
     public void convertYearField() {
-        ComplexSearchQuery searchQuery = parser.parseQueryStringIntoComplexQuery("year:2015").get();
-        ComplexSearchQuery expectedQuery = ComplexSearchQuery.builder().singleYear(2015).build();
+        ComplexSearchQuery searchQuery = parser
+            .parseQueryStringIntoComplexQuery("year:2015")
+            .get();
+        ComplexSearchQuery expectedQuery = ComplexSearchQuery
+            .builder()
+            .singleYear(2015)
+            .build();
         assertEquals(expectedQuery, searchQuery);
     }
 
     @Test
     public void convertNumericallyFirstYearField() {
-        ComplexSearchQuery searchQuery = parser.parseQueryStringIntoComplexQuery("year:2015 year:2014").get();
-        ComplexSearchQuery expectedQuery = ComplexSearchQuery.builder().singleYear(2014).build();
+        ComplexSearchQuery searchQuery = parser
+            .parseQueryStringIntoComplexQuery("year:2015 year:2014")
+            .get();
+        ComplexSearchQuery expectedQuery = ComplexSearchQuery
+            .builder()
+            .singleYear(2014)
+            .build();
         assertEquals(expectedQuery, searchQuery);
     }
 
     @Test
     public 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
     public 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 b8abaf86b45..1e088468781 100644
--- a/src/test/java/org/jabref/logic/importer/WebFetchersTest.java
+++ b/src/test/java/org/jabref/logic/importer/WebFetchersTest.java
@@ -1,11 +1,16 @@
 package org.jabref.logic.importer;
 
+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 java.util.Collection;
 import java.util.HashSet;
 import java.util.Objects;
 import java.util.Set;
 import java.util.stream.Collectors;
-
 import org.jabref.logic.importer.fetcher.AbstractIsbnFetcher;
 import org.jabref.logic.importer.fetcher.CollectionOfComputerScienceBibliographiesFetcher;
 import org.jabref.logic.importer.fetcher.GoogleScholar;
@@ -19,54 +24,68 @@
 import org.jabref.logic.importer.fetcher.isbntobibtex.OpenLibraryIsbnFetcher;
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.preferences.FilePreferences;
-
-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;
-
 class WebFetchersTest {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(WebFetchersTest.class);
-    private static final Set<String> IGNORED_INACCESSIBLE_FETCHERS = Set.of("ArXivFetcher$ArXiv");
+    private static final Logger LOGGER = LoggerFactory.getLogger(
+        WebFetchersTest.class
+    );
+    private static final Set<String> IGNORED_INACCESSIBLE_FETCHERS = Set.of(
+        "ArXivFetcher$ArXiv"
+    );
 
     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() {
-        importFormatPreferences = mock(ImportFormatPreferences.class, Answers.RETURNS_DEEP_STUBS);
-        importerPreferences = mock(ImporterPreferences.class, Answers.RETURNS_DEEP_STUBS);
+        importFormatPreferences =
+            mock(ImportFormatPreferences.class, Answers.RETURNS_DEEP_STUBS);
+        importerPreferences =
+            mock(ImporterPreferences.class, Answers.RETURNS_DEEP_STUBS);
     }
 
     private Set<Class<?>> getIgnoredInaccessibleClasses() {
-        return IGNORED_INACCESSIBLE_FETCHERS.stream()
-                     .map(className -> "org.jabref.logic.importer.fetcher." + 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());
+        return IGNORED_INACCESSIBLE_FETCHERS
+            .stream()
+            .map(className -> "org.jabref.logic.importer.fetcher." + 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());
-            Set<Class<?>> expected = new HashSet<>(controlClasses.loadClasses());
+            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
             expected.removeAll(getIgnoredInaccessibleClasses());
@@ -84,7 +103,9 @@ void getIdBasedFetchersReturnsAllFetcherDerivingFromIdBasedFetcher() {
             // Remove the following, because they don't work at the moment
             expected.remove(JstorFetcher.class);
             expected.remove(GoogleScholar.class);
-            expected.remove(CollectionOfComputerScienceBibliographiesFetcher.class);
+            expected.remove(
+                CollectionOfComputerScienceBibliographiesFetcher.class
+            );
 
             assertEquals(expected, getClasses(idFetchers));
         }
@@ -93,14 +114,19 @@ void getIdBasedFetchersReturnsAllFetcherDerivingFromIdBasedFetcher() {
     @Test
     void getEntryBasedFetchersReturnsAllFetcherDerivingFromEntryBasedFetcher() {
         Set<EntryBasedFetcher> idFetchers = WebFetchers.getEntryBasedFetchers(
-                mock(ImporterPreferences.class),
-                importFormatPreferences,
-                mock(FilePreferences.class),
-                mock(BibDatabaseContext.class));
+            mock(ImporterPreferences.class),
+            importFormatPreferences,
+            mock(FilePreferences.class),
+            mock(BibDatabaseContext.class)
+        );
 
         try (ScanResult scanResult = classGraph.scan()) {
-            ClassInfoList controlClasses = scanResult.getClassesImplementing(EntryBasedFetcher.class.getCanonicalName());
-            Set<Class<?>> expected = new HashSet<>(controlClasses.loadClasses());
+            ClassInfoList controlClasses = scanResult.getClassesImplementing(
+                EntryBasedFetcher.class.getCanonicalName()
+            );
+            Set<Class<?>> expected = new HashSet<>(
+                controlClasses.loadClasses()
+            );
 
             expected.remove(EntryBasedParserFetcher.class);
             expected.remove(MrDLibFetcher.class);
@@ -110,10 +136,18 @@ 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());
-            Set<Class<?>> expected = new HashSet<>(controlClasses.loadClasses());
+            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
             expected.removeAll(getIgnoredInaccessibleClasses());
@@ -124,7 +158,9 @@ void getSearchBasedFetchersReturnsAllFetcherDerivingFromSearchBasedFetcher() {
             // Remove the following, because they don't work atm
             expected.remove(JstorFetcher.class);
             expected.remove(GoogleScholar.class);
-            expected.remove(CollectionOfComputerScienceBibliographiesFetcher.class);
+            expected.remove(
+                CollectionOfComputerScienceBibliographiesFetcher.class
+            );
 
             expected.remove(PagedSearchBasedParserFetcher.class);
             expected.remove(PagedSearchBasedFetcher.class);
@@ -138,11 +174,18 @@ 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());
-            Set<Class<?>> expected = new HashSet<>(controlClasses.loadClasses());
+            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
             expected.removeAll(getIgnoredInaccessibleClasses());
@@ -157,11 +200,17 @@ void getFullTextFetchersReturnsAllFetcherDerivingFromFullTextFetcher() {
 
     @Test
     void getIdFetchersReturnsAllFetcherDerivingFromIdFetcher() {
-        Set<IdFetcher<?>> idFetchers = WebFetchers.getIdFetchers(importFormatPreferences);
+        Set<IdFetcher<?>> idFetchers = WebFetchers.getIdFetchers(
+            importFormatPreferences
+        );
 
         try (ScanResult scanResult = classGraph.scan()) {
-            ClassInfoList controlClasses = scanResult.getClassesImplementing(IdFetcher.class.getCanonicalName());
-            Set<Class<?>> expected = new HashSet<>(controlClasses.loadClasses());
+            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
             expected.removeAll(getIgnoredInaccessibleClasses());
@@ -175,6 +224,9 @@ void getIdFetchersReturnsAllFetcherDerivingFromIdFetcher() {
     }
 
     private Set<? extends Class<?>> getClasses(Collection<?> objects) {
-        return objects.stream().map(Object::getClass).collect(Collectors.toSet());
+        return objects
+            .stream()
+            .map(Object::getClass)
+            .collect(Collectors.toSet());
     }
 }
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 6fe85359049..8c22cf7803e 100644
--- a/src/test/java/org/jabref/logic/importer/fetcher/ACMPortalFetcherTest.java
+++ b/src/test/java/org/jabref/logic/importer/fetcher/ACMPortalFetcherTest.java
@@ -1,29 +1,28 @@
 package org.jabref.logic.importer.fetcher;
 
+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;
-
+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;
-
 @FetcherTest
 class ACMPortalFetcherTest {
+
     ACMPortalFetcher fetcher;
 
     @BeforeEach
@@ -34,37 +33,64 @@ void setUp() {
     @Test
     void searchByQueryFindsEntry() throws Exception {
         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.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");
+            .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");
 
-        List<BibEntry> fetchedEntries = fetcher.performSearch("The relationship of code churn and architectural violations in the open source software JabRef");
+        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);
         }
-        assertEquals(Optional.of(searchEntry), fetchedEntries.stream().findFirst());
+        assertEquals(
+            Optional.of(searchEntry),
+            fetchedEntries.stream().findFirst()
+        );
     }
 
     @Test
-    void testGetURLForQuery() throws FetcherException, MalformedURLException, URISyntaxException, QueryNodeParseException {
+    void testGetURLForQuery()
+        throws FetcherException, MalformedURLException, URISyntaxException, QueryNodeParseException {
         String testQuery = "test query url";
         SyntaxParser parser = new StandardSyntaxParser();
-        URL url = fetcher.getURLForQuery(parser.parse(testQuery, NO_EXPLICIT_FIELD));
-        String expected = "https://dl.acm.org/action/doSearch?AllField=test+query+url";
+        URL url = fetcher.getURLForQuery(
+            parser.parse(testQuery, NO_EXPLICIT_FIELD)
+        );
+        String expected =
+            "https://dl.acm.org/action/doSearch?AllField=test+query+url";
         assertEquals(expected, url.toString());
     }
 
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 2552b5cc735..21021ce7f41 100644
--- a/src/test/java/org/jabref/logic/importer/fetcher/ACSTest.java
+++ b/src/test/java/org/jabref/logic/importer/fetcher/ACSTest.java
@@ -1,21 +1,20 @@
 package org.jabref.logic.importer.fetcher;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
 import java.io.IOException;
 import java.net.URL;
 import java.util.Optional;
-
 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.BeforeEach;
 import org.junit.jupiter.api.Test;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-
 @FetcherTest
 class ACSTest {
+
     private ACS finder;
     private BibEntry entry;
 
@@ -31,8 +30,12 @@ void findByDOI() throws IOException {
         entry.setField(StandardField.DOI, "10.1021/bk-2006-STYG.ch014");
 
         assertEquals(
-                Optional.of(new URL("https://pubs.acs.org/doi/pdf/10.1021/bk-2006-STYG.ch014")),
-                finder.findFullText(entry)
+            Optional.of(
+                new URL(
+                    "https://pubs.acs.org/doi/pdf/10.1021/bk-2006-STYG.ch014"
+                )
+            ),
+            finder.findFullText(entry)
         );
     }
 
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 72ec4e01f18..70d17bd6d48 100644
--- a/src/test/java/org/jabref/logic/importer/fetcher/AbstractIsbnFetcherTest.java
+++ b/src/test/java/org/jabref/logic/importer/fetcher/AbstractIsbnFetcherTest.java
@@ -1,16 +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 java.util.Optional;
 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;
-
 @FetcherTest
 public abstract class AbstractIsbnFetcherTest {
 
@@ -21,11 +19,14 @@ public abstract class AbstractIsbnFetcherTest {
 
     public abstract void authorsAreCorrectlyFormatted() throws Exception;
 
-    public abstract void searchByIdSuccessfulWithShortISBN() throws FetcherException;
+    public abstract void searchByIdSuccessfulWithShortISBN()
+        throws FetcherException;
 
     @Test
     public void searchByIdSuccessfulWithLongISBN() throws FetcherException {
-        Optional<BibEntry> fetchedEntry = fetcher.performSearchById("978-0321356680");
+        Optional<BibEntry> fetchedEntry = fetcher.performSearchById(
+            "978-0321356680"
+        );
         assertEquals(Optional.of(bibEntryEffectiveJava), fetchedEntry);
     }
 
@@ -37,16 +38,25 @@ public void searchByIdReturnsEmptyWithEmptyISBN() throws FetcherException {
 
     @Test
     public void searchByIdThrowsExceptionForShortInvalidISBN() {
-        assertThrows(FetcherException.class, () -> fetcher.performSearchById("123456789"));
+        assertThrows(
+            FetcherException.class,
+            () -> fetcher.performSearchById("123456789")
+        );
     }
 
     @Test
     public void searchByIdThrowsExceptionForLongInvalidISB() {
-        assertThrows(FetcherException.class, () -> fetcher.performSearchById("012345678910"));
+        assertThrows(
+            FetcherException.class,
+            () -> fetcher.performSearchById("012345678910")
+        );
     }
 
     @Test
     public void searchByIdThrowsExceptionForInvalidISBN() {
-        assertThrows(FetcherException.class, () -> fetcher.performSearchById("jabref-4-ever"));
+        assertThrows(
+            FetcherException.class,
+            () -> fetcher.performSearchById("jabref-4-ever")
+        );
     }
 }
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 0e545a15064..5f7d09e8507 100644
--- a/src/test/java/org/jabref/logic/importer/fetcher/ApsFetcherTest.java
+++ b/src/test/java/org/jabref/logic/importer/fetcher/ApsFetcherTest.java
@@ -1,17 +1,15 @@
 package org.jabref.logic.importer.fetcher;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
 import java.net.URL;
 import java.util.Optional;
-
 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;
-
 @FetcherTest
 class ApsFetcherTest {
 
@@ -24,25 +22,43 @@ void setUp() {
 
     @Test
     void findFullTextFromDoi() throws Exception {
-        BibEntry entry = new BibEntry().withField(StandardField.DOI, "10.1103/PhysRevLett.116.061102");
-        assertEquals(Optional.of(new URL("https://journals.aps.org/prl/pdf/10.1103/PhysRevLett.116.061102")), finder.findFullText(entry));
+        BibEntry entry = new BibEntry()
+            .withField(StandardField.DOI, "10.1103/PhysRevLett.116.061102");
+        assertEquals(
+            Optional.of(
+                new URL(
+                    "https://journals.aps.org/prl/pdf/10.1103/PhysRevLett.116.061102"
+                )
+            ),
+            finder.findFullText(entry)
+        );
     }
 
     @Test
     void findFullTextFromLowercaseDoi() throws Exception {
-        BibEntry entry = new BibEntry().withField(StandardField.DOI, "10.1103/physrevlett.124.029002");
-        assertEquals(Optional.of(new URL("https://journals.aps.org/prl/pdf/10.1103/PhysRevLett.124.029002")), finder.findFullText(entry));
+        BibEntry entry = new BibEntry()
+            .withField(StandardField.DOI, "10.1103/physrevlett.124.029002");
+        assertEquals(
+            Optional.of(
+                new URL(
+                    "https://journals.aps.org/prl/pdf/10.1103/PhysRevLett.124.029002"
+                )
+            ),
+            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 65d3c2bcfc9..b10d0176ad8 100644
--- a/src/test/java/org/jabref/logic/importer/fetcher/ArXivFetcherTest.java
+++ b/src/test/java/org/jabref/logic/importer/fetcher/ArXivFetcherTest.java
@@ -1,5 +1,12 @@
 package org.jabref.logic.importer.fetcher;
 
+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.util.Arrays;
@@ -8,9 +15,7 @@
 import java.util.Optional;
 import java.util.StringJoiner;
 import java.util.stream.Collectors;
-
 import javafx.collections.FXCollections;
-
 import org.jabref.logic.importer.FetcherException;
 import org.jabref.logic.importer.ImportCleanup;
 import org.jabref.logic.importer.ImportFormatPreferences;
@@ -24,7 +29,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.Assertions;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.BeforeEach;
@@ -33,15 +37,10 @@
 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;
-
 @FetcherTest
-class ArXivFetcherTest implements SearchBasedFetcherCapabilityTest, PagedSearchFetcherTest {
+class ArXivFetcherTest
+    implements SearchBasedFetcherCapabilityTest, PagedSearchFetcherTest {
+
     private static ImportFormatPreferences importFormatPreferences;
 
     private ArXivFetcher fetcher;
@@ -55,18 +54,27 @@ class ArXivFetcherTest implements SearchBasedFetcherCapabilityTest, PagedSearchF
 
     @BeforeAll
     static void setUp() {
-        importFormatPreferences = mock(ImportFormatPreferences.class, Answers.RETURNS_DEEP_STUBS);
-        when(importFormatPreferences.bibEntryPreferences().getKeywordSeparator()).thenReturn(',');
+        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(
+        when(importFormatPreferences.fieldPreferences().getNonWrappableFields())
+            .thenReturn(
+                FXCollections.observableArrayList(
+                    List.of(
                         StandardField.PDF,
                         StandardField.PS,
                         StandardField.URL,
                         StandardField.DOI,
                         StandardField.FILE,
                         StandardField.ISBN,
-                        StandardField.ISSN)));
+                        StandardField.ISSN
+                    )
+                )
+            );
     }
 
     @BeforeEach
@@ -75,45 +83,90 @@ void eachSetUp() {
         entry = new BibEntry();
 
         // A BibEntry with information only from ArXiv API
-        mainOriginalPaper = new BibEntry(StandardEntryType.Article)
+        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.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.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.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");
+                .withField(
+                    StandardField.KEYWORDS,
+                    "cs.IR, cs.AI, cs.DL, cs.LG"
+                );
 
-        mainResultPaper = new BibEntry(StandardEntryType.Article)
+        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.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.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.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")
+                //              .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(
+                    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.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");
 
         // Example of a robust result, with information from both ArXiv-assigned and user-assigned DOIs
         // FixMe: Test this BibEntry
-        completePaper = 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")
+        completePaper =
+            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")
@@ -122,31 +175,62 @@ void eachSetUp() {
                 .withField(StandardField.PAGES, "083005")
                 .withField(StandardField.PUBLISHER, "{IOP} Publishing")
                 .withField(StandardField.JOURNAL, "New Journal of Physics")
-                .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.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.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(
+                    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");
+                .withField(
+                    new UnknownField("copyright"),
+                    "arXiv.org perpetual, non-exclusive license"
+                );
 
-        sliceTheoremPaper = new BibEntry(StandardEntryType.Article)
+        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.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.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");
+                .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
@@ -155,14 +239,28 @@ 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
@@ -178,10 +276,15 @@ public PagedSearchBasedFetcher getPagedFetcher() {
     @Test
     @Override
     public void supportsAuthorSearch() throws FetcherException {
-        StringJoiner queryBuilder = new StringJoiner("\" AND author:\"", "author:\"", "\"");
+        StringJoiner queryBuilder = new StringJoiner(
+            "\" AND author:\"",
+            "author:\"",
+            "\""
+        );
         getInputTestAuthors().forEach(queryBuilder::add);
 
-        List<BibEntry> result = getFetcher().performSearch(queryBuilder.toString());
+        List<BibEntry> result = getFetcher()
+            .performSearch(queryBuilder.toString());
         ImportCleanup.targeting(BibDatabaseMode.BIBTEX).doPostCleanup(result);
 
         assertFalse(result.isEmpty());
@@ -189,16 +292,27 @@ public void supportsAuthorSearch() throws FetcherException {
             String author = bibEntry.getField(StandardField.AUTHOR).orElse("");
 
             // The co-authors differ, thus we check for the author present at all papers
-            getTestAuthors().forEach(expectedAuthor -> Assertions.assertTrue(author.contains(expectedAuthor.replace("\"", ""))));
+            getTestAuthors()
+                .forEach(expectedAuthor ->
+                    Assertions.assertTrue(
+                        author.contains(expectedAuthor.replace("\"", ""))
+                    )
+                );
         });
     }
 
     @Test
-    public void noSupportsAuthorSearchWithLastFirstName() throws FetcherException {
-        StringJoiner queryBuilder = new StringJoiner("\" AND author:\"", "author:\"", "\"");
+    public void noSupportsAuthorSearchWithLastFirstName()
+        throws FetcherException {
+        StringJoiner queryBuilder = new StringJoiner(
+            "\" AND author:\"",
+            "author:\"",
+            "\""
+        );
         getTestAuthors().forEach(queryBuilder::add);
 
-        List<BibEntry> result = getFetcher().performSearch(queryBuilder.toString());
+        List<BibEntry> result = getFetcher()
+            .performSearch(queryBuilder.toString());
         ImportCleanup.targeting(BibDatabaseMode.BIBTEX).doPostCleanup(result);
 
         assertEquals(List.of(), result);
@@ -211,27 +325,42 @@ void findFullTextForEmptyEntryResultsEmptyOptional() throws IOException {
 
     @Test
     void findFullTextRejectsNullParameter() {
-        assertThrows(NullPointerException.class, () -> fetcher.findFullText(null));
+        assertThrows(
+            NullPointerException.class,
+            () -> fetcher.findFullText(null)
+        );
     }
 
     @Test
     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");
+        entry.setField(
+            StandardField.TITLE,
+            "Pause Point Spectra in DNA Constant-Force Unzipping"
+        );
 
-        assertEquals(Optional.of(new URL("http://arxiv.org/pdf/cond-mat/0406246v1")), fetcher.findFullText(entry));
+        assertEquals(
+            Optional.of(new URL("http://arxiv.org/pdf/cond-mat/0406246v1")),
+            fetcher.findFullText(entry)
+        );
     }
 
     @Test
     void findFullTextByEprint() throws IOException {
         entry.setField(StandardField.EPRINT, "1603.06570");
-        assertEquals(Optional.of(new URL("http://arxiv.org/pdf/1603.06570v1")), fetcher.findFullText(entry));
+        assertEquals(
+            Optional.of(new URL("http://arxiv.org/pdf/1603.06570v1")),
+            fetcher.findFullText(entry)
+        );
     }
 
     @Test
     void findFullTextByEprintWithPrefix() throws IOException {
         entry.setField(StandardField.EPRINT, "arXiv:1603.06570");
-        assertEquals(Optional.of(new URL("http://arxiv.org/pdf/1603.06570v1")), fetcher.findFullText(entry));
+        assertEquals(
+            Optional.of(new URL("http://arxiv.org/pdf/1603.06570v1")),
+            fetcher.findFullText(entry)
+        );
     }
 
     @Test
@@ -239,53 +368,94 @@ void findFullTextByEprintWithUnknownDOI() throws IOException {
         entry.setField(StandardField.DOI, "10.1529/unknown");
         entry.setField(StandardField.EPRINT, "1603.06570");
 
-        assertEquals(Optional.of(new URL("http://arxiv.org/pdf/1603.06570v1")), fetcher.findFullText(entry));
+        assertEquals(
+            Optional.of(new URL("http://arxiv.org/pdf/1603.06570v1")),
+            fetcher.findFullText(entry)
+        );
     }
 
     @Test
     void findFullTextByTitle() throws IOException {
-        entry.setField(StandardField.TITLE, "Pause Point Spectra in DNA Constant-Force Unzipping");
+        entry.setField(
+            StandardField.TITLE,
+            "Pause Point Spectra in DNA Constant-Force Unzipping"
+        );
 
-        assertEquals(Optional.of(new URL("http://arxiv.org/pdf/cond-mat/0406246v1")), fetcher.findFullText(entry));
+        assertEquals(
+            Optional.of(new URL("http://arxiv.org/pdf/cond-mat/0406246v1")),
+            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(new URL("http://arxiv.org/pdf/2010.15942v3")), fetcher.findFullText(entry));
+        assertEquals(
+            Optional.of(new URL("http://arxiv.org/pdf/2010.15942v3")),
+            fetcher.findFullText(entry)
+        );
     }
 
     @Test
-    void findFullTextByTitleWithColonAndJournalWithoutEprint() throws IOException {
-        entry.setField(StandardField.TITLE, "Bayes-TrEx: a Bayesian Sampling Approach to Model Transparency by Example");
+    void findFullTextByTitleWithColonAndJournalWithoutEprint()
+        throws IOException {
+        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(new URL("http://arxiv.org/pdf/2002.10248v4")), fetcher.findFullText(entry));
+        assertEquals(
+            Optional.of(new URL("http://arxiv.org/pdf/2002.10248v4")),
+            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(new URL("http://arxiv.org/pdf/2002.10248v4")), fetcher.findFullText(entry));
+        assertEquals(
+            Optional.of(new URL("http://arxiv.org/pdf/2002.10248v4")),
+            fetcher.findFullText(entry)
+        );
     }
 
     @Test
     void findFullTextByTitleAndPartOfAuthor() throws IOException {
-        entry.setField(StandardField.TITLE, "Pause Point Spectra in DNA Constant-Force Unzipping");
+        entry.setField(
+            StandardField.TITLE,
+            "Pause Point Spectra in DNA Constant-Force Unzipping"
+        );
         entry.setField(StandardField.AUTHOR, "Weeks and Lucks");
 
-        assertEquals(Optional.of(new URL("http://arxiv.org/pdf/cond-mat/0406246v1")), fetcher.findFullText(entry));
+        assertEquals(
+            Optional.of(new URL("http://arxiv.org/pdf/cond-mat/0406246v1")),
+            fetcher.findFullText(entry)
+        );
     }
 
     @Test
-    void findFullTextByTitleWithCurlyBracketAndPartOfAuthor() throws IOException {
-        entry.setField(StandardField.TITLE, "Machine versus {Human} {Attention} in {Deep} {Reinforcement} {Learning} {Tasks}");
+    void findFullTextByTitleWithCurlyBracketAndPartOfAuthor()
+        throws IOException {
+        entry.setField(
+            StandardField.TITLE,
+            "Machine versus {Human} {Attention} in {Deep} {Reinforcement} {Learning} {Tasks}"
+        );
         entry.setField(StandardField.AUTHOR, "Zhang, Ruohan and Guo");
 
-        assertEquals(Optional.of(new URL("http://arxiv.org/pdf/2010.15942v3")), fetcher.findFullText(entry));
+        assertEquals(
+            Optional.of(new URL("http://arxiv.org/pdf/2010.15942v3")),
+            fetcher.findFullText(entry)
+        );
     }
 
     @Test
@@ -303,7 +473,10 @@ void notFindFullTextByUnknownId() throws IOException {
     @Test
     void findFullTextByDOINotAvailableInCatalog() throws IOException {
         entry.setField(StandardField.DOI, "10.1016/0370-2693(77)90015-6");
-        entry.setField(StandardField.TITLE, "Superspace formulation of supergravity");
+        entry.setField(
+            StandardField.TITLE,
+            "Superspace formulation of supergravity"
+        );
 
         assertEquals(Optional.empty(), fetcher.findFullText(entry));
     }
@@ -320,67 +493,109 @@ void findFullTextTrustLevel() {
 
     @Test
     void searchEntryByPartOfTitle() throws Exception {
-        assertEquals(Collections.singletonList(mainResultPaper),
-                fetcher.performSearch("title:\"the architecture of mr. dLib's\""));
+        assertEquals(
+            Collections.singletonList(mainResultPaper),
+            fetcher.performSearch("title:\"the architecture of mr. dLib's\"")
+        );
     }
 
     @Test
     void searchEntryByPartOfTitleWithAcuteAccent() throws Exception {
-        assertEquals(Collections.singletonList(sliceTheoremPaper),
-                fetcher.performSearch("title:\"slice theorem for Fréchet\""));
+        assertEquals(
+            Collections.singletonList(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.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"));
+            .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.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")
+        );
     }
 
     @Test
     void searchEntryByIdWith4DigitsAndVersion() throws Exception {
-        assertEquals(Optional.of(sliceTheoremPaper), fetcher.performSearchById("1405.2249v1"));
+        assertEquals(
+            Optional.of(sliceTheoremPaper),
+            fetcher.performSearchById("1405.2249v1")
+        );
     }
 
     @Test
     void searchEntryByIdWith4Digits() throws Exception {
-        assertEquals(Optional.of(sliceTheoremPaper), fetcher.performSearchById("1405.2249"));
+        assertEquals(
+            Optional.of(sliceTheoremPaper),
+            fetcher.performSearchById("1405.2249")
+        );
     }
 
     @Test
     void searchEntryByIdWith4DigitsAndPrefix() throws Exception {
-        assertEquals(Optional.of(sliceTheoremPaper), fetcher.performSearchById("arXiv:1405.2249"));
+        assertEquals(
+            Optional.of(sliceTheoremPaper),
+            fetcher.performSearchById("arXiv:1405.2249")
+        );
     }
 
     @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
@@ -392,7 +607,10 @@ void searchWithMalformedIdReturnsEmpty() throws Exception {
     void searchIdentifierForSlicePaper() throws Exception {
         sliceTheoremPaper.clearField(StandardField.EPRINT);
 
-        assertEquals(ArXivIdentifier.parse("1405.2249"), fetcher.findIdentifier(sliceTheoremPaper));
+        assertEquals(
+            ArXivIdentifier.parse("1405.2249"),
+            fetcher.findIdentifier(sliceTheoremPaper)
+        );
     }
 
     @Test
@@ -402,30 +620,39 @@ 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.
@@ -433,10 +660,16 @@ public void supportsYearRangeSearch() throws Exception {
      */
     @Test
     public 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));
+        assertTrue(
+            resultWithOutPhraseSearch.containsAll(resultWithPhraseSearch)
+        );
     }
 
     /**
@@ -446,150 +679,311 @@ public void supportsPhraseSearch() throws Exception {
     @Test
     public 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\"");
+            .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(Collections.singletonList(expected), resultWithPhraseSearch);
+        assertEquals(
+            Collections.singletonList(expected),
+            resultWithPhraseSearch
+        );
     }
 
     @Test
     public void supportsBooleanANDSearch() throws Exception {
         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.PAGES, "083005")
-                .withField(StandardField.PUBLISHER, "{IOP} Publishing")
-                .withField(StandardField.JOURNAL, "New Journal of Physics")
-                .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\"");
+            .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.PAGES, "083005")
+            .withField(StandardField.PUBLISHER, "{IOP} Publishing")
+            .withField(StandardField.JOURNAL, "New Journal of Physics")
+            .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(Collections.singletonList(expected), result);
     }
 
     @Test
-    public void retrievePureArxivEntryWhenAllDOIFetchingFails() throws FetcherException {
+    public 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");
-
-        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"));
-
-        ArXivFetcher modifiedArXivFetcher = Mockito.spy(new ArXivFetcher(importFormatPreferences, modifiedDoiFetcher));
-        assertEquals(Optional.of(expected), modifiedArXivFetcher.performSearchById("1701.00587"));
-    }
-
-    @Test
-    public void canReplicateArXivOnlySearchByPassingNullParameter() throws FetcherException {
+            .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")
+            );
+
+        ArXivFetcher modifiedArXivFetcher = Mockito.spy(
+            new ArXivFetcher(importFormatPreferences, modifiedDoiFetcher)
+        );
+        assertEquals(
+            Optional.of(expected),
+            modifiedArXivFetcher.performSearchById("1701.00587")
+        );
+    }
+
+    @Test
+    public 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");
-
-        ArXivFetcher modifiedArXivFetcher = new ArXivFetcher(importFormatPreferences, null);
-        assertEquals(Optional.of(expected), modifiedArXivFetcher.performSearchById("1701.00587"));
-    }
-
-    @Test
-    public void retrievePartialResultWhenCannotGetInformationFromUserAssignedDOI() throws FetcherException {
+            .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
+    public 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"));
-
-        ArXivFetcher modifiedArXivFetcher = Mockito.spy(new ArXivFetcher(importFormatPreferences, modifiedDoiFetcher));
-        assertEquals(Optional.of(expected), modifiedArXivFetcher.performSearchById("1701.00587"));
-    }
-
-    @Test
-    public void retrievePartialResultWhenCannotGetInformationFromArXivAssignedDOI() throws FetcherException {
+            .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")
+            );
+
+        ArXivFetcher modifiedArXivFetcher = Mockito.spy(
+            new ArXivFetcher(importFormatPreferences, modifiedDoiFetcher)
+        );
+        assertEquals(
+            Optional.of(expected),
+            modifiedArXivFetcher.performSearchById("1701.00587")
+        );
+    }
+
+    @Test
+    public 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.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"));
-
-        ArXivFetcher modifiedArXivFetcher = Mockito.spy(new ArXivFetcher(importFormatPreferences, modifiedDoiFetcher));
-        assertEquals(Optional.of(expected), modifiedArXivFetcher.performSearchById("1701.00587"));
+            .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")
+            .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")
+            );
+
+        ArXivFetcher modifiedArXivFetcher = Mockito.spy(
+            new ArXivFetcher(importFormatPreferences, modifiedDoiFetcher)
+        );
+        assertEquals(
+            Optional.of(expected),
+            modifiedArXivFetcher.performSearchById("1701.00587")
+        );
     }
 }
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 ad0fb840030..2e1e6943cf5 100644
--- a/src/test/java/org/jabref/logic/importer/fetcher/AstrophysicsDataSystemTest.java
+++ b/src/test/java/org/jabref/logic/importer/fetcher/AstrophysicsDataSystemTest.java
@@ -1,10 +1,14 @@
 package org.jabref.logic.importer.fetcher;
 
+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;
-
 import javafx.collections.FXCollections;
-
 import org.jabref.logic.importer.ImportFormatPreferences;
 import org.jabref.logic.importer.ImporterPreferences;
 import org.jabref.logic.importer.PagedSearchBasedFetcher;
@@ -13,17 +17,10 @@
 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;
-
 @FetcherTest
 public class AstrophysicsDataSystemTest implements PagedSearchFetcherTest {
 
@@ -37,35 +34,70 @@ public class AstrophysicsDataSystemTest implements PagedSearchFetcherTest {
 
     @BeforeEach
     public void setUp() throws Exception {
-        ImportFormatPreferences importFormatPreferences = mock(ImportFormatPreferences.class, Answers.RETURNS_DEEP_STUBS);
-        ImporterPreferences importerPreferences = mock(ImporterPreferences.class);
-        when(importerPreferences.getApiKeys()).thenReturn(FXCollections.emptyObservableSet());
+        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);
+        fetcher =
+            new AstrophysicsDataSystem(
+                importFormatPreferences,
+                importerPreferences
+            );
 
-        diezSliceTheoremEntry = new BibEntry(StandardEntryType.Article)
+        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.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.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.");
+                .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."
+                );
 
-        famaeyMcGaughEntry = new BibEntry(StandardEntryType.Article)
+        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.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, "#sep#")
@@ -76,65 +108,126 @@ public void setUp() throws Exception {
                 .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, 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");
+                .withField(
+                    StandardField.KEYWORDS,
+                    "astronomical observations, Newtonian limit, equations of motion, extragalactic astronomy, cosmology, theories of gravity, fundamental physics, astrophysics, 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"
+                );
 
-        sunWelchEntry = new BibEntry(StandardEntryType.Article)
+        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.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.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");
+                .withField(
+                    StandardField.URL,
+                    "https://ui.adsabs.harvard.edu/abs/2012NatMa..11...44S"
+                );
 
-        xiongSunEntry = new BibEntry(StandardEntryType.Article)
+        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.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.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.TITLE,
+                    "Multiyear On-Orbit Calibration and Performance of Terra MODIS Reflective Solar Bands"
+                )
                 .withField(StandardField.VOLUME, "45")
                 .withField(StandardField.YEAR, "2007")
                 .withField(StandardField.KEYWORDS, "Earth Science")
-                .withField(StandardField.URL, "https://ui.adsabs.harvard.edu/abs/2007ITGRS..45..879X");
+                .withField(
+                    StandardField.URL,
+                    "https://ui.adsabs.harvard.edu/abs/2007ITGRS..45..879X"
+                );
 
-        ingersollPollardEntry = new BibEntry(StandardEntryType.Article)
+        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.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, Lunar and Planetary Exploration; Planets, Earth Science, Earth Science")
+                .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, Lunar and Planetary Exploration; Planets, Earth Science, Earth Science"
+                )
                 .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.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");
+                .withField(
+                    StandardField.URL,
+                    "https://ui.adsabs.harvard.edu/abs/1982Icar...52...62I"
+                );
 
-        luceyPaulEntry = new BibEntry(StandardEntryType.Article)
+        luceyPaulEntry =
+            new BibEntry(StandardEntryType.Article)
                 .withCitationKey("2000JGR...10520297L")
-                .withField(StandardField.AUTHOR, "Lucey, Paul G. and Blewett, David T. and Jolliff, Bradley L.")
+                .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), Earth Science")
+                .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), Earth Science"
+                )
                 .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.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.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.");
+                .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."
+                );
     }
 
     @Test
@@ -144,7 +237,9 @@ public void testGetName() {
 
     @Test
     public void searchByQueryFindsEntry() throws Exception {
-        List<BibEntry> fetchedEntries = fetcher.performSearch("Diez slice theorem Lie");
+        List<BibEntry> fetchedEntries = fetcher.performSearch(
+            "Diez slice theorem Lie"
+        );
         assertFalse(fetchedEntries.isEmpty());
         assertTrue(fetchedEntries.contains(diezSliceTheoremEntry));
     }
@@ -152,8 +247,8 @@ public void searchByQueryFindsEntry() throws Exception {
     @Test
     public void searchByEntryFindsEntry() throws Exception {
         BibEntry searchEntry = new BibEntry()
-                .withField(StandardField.TITLE, "slice theorem")
-                .withField(StandardField.AUTHOR, "Diez");
+            .withField(StandardField.TITLE, "slice theorem")
+            .withField(StandardField.AUTHOR, "Diez");
 
         List<BibEntry> fetchedEntries = fetcher.performSearch(searchEntry);
 
@@ -164,8 +259,11 @@ public void searchByEntryFindsEntry() throws Exception {
 
     @Test
     public void testPerformSearchByFamaeyMcGaughEntry() throws Exception {
-        Optional<BibEntry> fetchedEntry = fetcher.performSearchById("10.12942/lrr-2012-10");
-        fetchedEntry.ifPresent(entry -> entry.clearField(StandardField.ABSTRACT)); // Remove abstract due to copyright
+        Optional<BibEntry> fetchedEntry = fetcher.performSearchById(
+            "10.12942/lrr-2012-10"
+        );
+        fetchedEntry.ifPresent(entry -> entry.clearField(StandardField.ABSTRACT)
+        ); // Remove abstract due to copyright
         assertEquals(Optional.of(famaeyMcGaughEntry), fetchedEntry);
     }
 
@@ -177,46 +275,77 @@ public void testPerformSearchByIdEmptyDOI() throws Exception {
 
     @Test
     public void testPerformSearchByIdInvalidDoi() throws Exception {
-        assertEquals(Optional.empty(), fetcher.performSearchById("this.doi.will.fail"));
+        assertEquals(
+            Optional.empty(),
+            fetcher.performSearchById("this.doi.will.fail")
+        );
     }
 
     @Test
     public void testPerformSearchBySunWelchEntry() throws Exception {
-        Optional<BibEntry> fetchedEntry = fetcher.performSearchById("10.1038/nmat3160");
-        fetchedEntry.ifPresent(entry -> entry.clearField(StandardField.ABSTRACT)); // Remove abstract due to copyright
+        Optional<BibEntry> fetchedEntry = fetcher.performSearchById(
+            "10.1038/nmat3160"
+        );
+        fetchedEntry.ifPresent(entry -> entry.clearField(StandardField.ABSTRACT)
+        ); // Remove abstract due to copyright
         assertEquals(Optional.of(sunWelchEntry), fetchedEntry);
     }
 
     @Test
     public void testPerformSearchByXiongSunEntry() throws Exception {
-        Optional<BibEntry> fetchedEntry = fetcher.performSearchById("10.1109/TGRS.2006.890567");
+        Optional<BibEntry> fetchedEntry = fetcher.performSearchById(
+            "10.1109/TGRS.2006.890567"
+        );
         assertEquals(Optional.of(xiongSunEntry), fetchedEntry);
     }
 
     @Test
     public void testPerformSearchByIngersollPollardEntry() throws Exception {
-        Optional<BibEntry> fetchedEntry = fetcher.performSearchById("10.1016/0019-1035(82)90169-5");
+        Optional<BibEntry> fetchedEntry = fetcher.performSearchById(
+            "10.1016/0019-1035(82)90169-5"
+        );
         assertEquals(Optional.of(ingersollPollardEntry), fetchedEntry);
     }
 
     @Test
     public void testPerformSearchByLuceyPaulEntry() throws Exception {
-        Optional<BibEntry> fetchedEntry = fetcher.performSearchById("2000JGR...10520297L");
+        Optional<BibEntry> fetchedEntry = fetcher.performSearchById(
+            "2000JGR...10520297L"
+        );
         assertEquals(Optional.of(luceyPaulEntry), fetchedEntry);
     }
 
     @Test
     public void performSearchByQueryPaged_searchLimitsSize() throws Exception {
         Page<BibEntry> page = fetcher.performSearchPaged("author:\"A\"", 0);
-        assertEquals(fetcher.getPageSize(), page.getSize(), "fetcher return wrong page size");
+        assertEquals(
+            fetcher.getPageSize(),
+            page.getSize(),
+            "fetcher return wrong page size"
+        );
     }
 
     @Test
-    public void performSearchByQueryPaged_invalidAuthorsReturnEmptyPages() throws Exception {
-        Page<BibEntry> page = fetcher.performSearchPaged("author:\"ThisAuthorWillNotBeFound\"", 0);
-        Page<BibEntry> page5 = fetcher.performSearchPaged("author:\"ThisAuthorWillNotBeFound\"", 5);
-        assertEquals(0, page.getSize(), "fetcher doesnt return empty pages for invalid author");
-        assertEquals(0, page5.getSize(), "fetcher doesnt return empty pages for invalid author");
+    public void performSearchByQueryPaged_invalidAuthorsReturnEmptyPages()
+        throws Exception {
+        Page<BibEntry> page = fetcher.performSearchPaged(
+            "author:\"ThisAuthorWillNotBeFound\"",
+            0
+        );
+        Page<BibEntry> page5 = fetcher.performSearchPaged(
+            "author:\"ThisAuthorWillNotBeFound\"",
+            5
+        );
+        assertEquals(
+            0,
+            page.getSize(),
+            "fetcher doesnt return empty pages for invalid author"
+        );
+        assertEquals(
+            0,
+            page5.getSize(),
+            "fetcher doesnt return empty pages for invalid author"
+        );
     }
 
     @Override
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 84936dd4e26..276eadfdae3 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 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;
-
 import javafx.collections.FXCollections;
-
+import kong.unirest.json.JSONObject;
 import org.jabref.logic.importer.FetcherException;
 import org.jabref.logic.importer.ImporterPreferences;
 import org.jabref.logic.util.BuildInfo;
@@ -12,21 +17,14 @@
 import org.jabref.model.entry.field.StandardField;
 import org.jabref.model.entry.types.StandardEntryType;
 import org.jabref.testutils.category.FetcherTest;
-
-import kong.unirest.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;
-
 @FetcherTest
 public class BiodiversityLibraryTest {
+
     private final String BASE_URL = "https://www.biodiversitylibrary.org/api3?";
     private final String RESPONSE_FORMAT = "&format=json";
     private final BuildInfo buildInfo = new BuildInfo();
@@ -35,8 +33,11 @@ public class BiodiversityLibraryTest {
 
     @BeforeEach
     void setUp() {
-        ImporterPreferences importerPreferences = mock(ImporterPreferences.class);
-        when(importerPreferences.getApiKeys()).thenReturn(FXCollections.emptyObservableSet());
+        ImporterPreferences importerPreferences = mock(
+            ImporterPreferences.class
+        );
+        when(importerPreferences.getApiKeys())
+            .thenReturn(FXCollections.emptyObservableSet());
         fetcher = new BiodiversityLibrary(importerPreferences);
     }
 
@@ -54,72 +55,100 @@ public void biodiversityHeritageApiKeyIsNotEmpty() {
     }
 
     @Test
-    public void baseURLConstruction() throws MalformedURLException, URISyntaxException {
+    public void baseURLConstruction()
+        throws MalformedURLException, URISyntaxException {
         String expected = fetcher
-                .getTestUrl()
-                .concat(buildInfo.biodiversityHeritageApiKey)
-                .concat(RESPONSE_FORMAT);
+            .getTestUrl()
+            .concat(buildInfo.biodiversityHeritageApiKey)
+            .concat(RESPONSE_FORMAT);
 
         assertEquals(expected, fetcher.getBaseURL().toString());
     }
 
     @ParameterizedTest
-    @ValueSource(strings = {"1234", "331", "121"})
-    public void getPartMetadaUrl(String id) throws MalformedURLException, URISyntaxException {
+    @ValueSource(strings = { "1234", "331", "121" })
+    public 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=");
-
-        assertEquals(expected.concat(id), fetcher.getPartMetadataURL(id).toString());
+            .getTestUrl()
+            .concat(buildInfo.biodiversityHeritageApiKey)
+            .concat(RESPONSE_FORMAT)
+            .concat("&op=GetPartMetadata&pages=f&names=f")
+            .concat("&id=");
+
+        assertEquals(
+            expected.concat(id),
+            fetcher.getPartMetadataURL(id).toString()
+        );
     }
 
     @ParameterizedTest
-    @ValueSource(strings = {"1234", "4321", "331"})
-    public void getItemMetadaUrl(String id) throws MalformedURLException, URISyntaxException {
+    @ValueSource(strings = { "1234", "4321", "331" })
+    public 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=");
-
-        assertEquals(expected.concat(id), fetcher.getItemMetadataURL(id).toString());
+            .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
     public void testPerformSearch() throws FetcherException {
         BibEntry expected = new BibEntry(StandardEntryType.Article)
-            .withField(StandardField.AUTHOR, "Clark, John L. (John Littner)  and Neill, David A. ")
+            .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.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)").get(0));
+        assertEquals(
+            expected,
+            fetcher.performSearch("Amanoa condorensis (Phyllanthaceae)").get(0)
+        );
     }
 
     @Test
     public 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}");
+        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");
+            .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",
@@ -138,16 +167,23 @@ public 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")
+                        }"""
+            );
+        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",
@@ -166,13 +202,24 @@ public 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) ")
+                        }"""
+            );
+        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,");
+                .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 eab59ad8192..d8e5b7363d9 100644
--- a/src/test/java/org/jabref/logic/importer/fetcher/BvbFetcherTest.java
+++ b/src/test/java/org/jabref/logic/importer/fetcher/BvbFetcherTest.java
@@ -1,24 +1,22 @@
 package org.jabref.logic.importer.fetcher;
 
+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;
-
+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.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.nodes.QueryNode;
-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 static org.junit.jupiter.api.Assertions.assertFalse;
-
 @FetcherTest
 public class BvbFetcherTest {
 
@@ -31,32 +29,48 @@ void testPerformTest() throws Exception {
         String searchquery = "effective java author:bloch";
         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()));
     }
 
     @BeforeEach
     public void setUp() {
         fetcher = new BvbFetcher();
 
-        bibEntryISBN9783960886402 = new BibEntry(StandardEntryType.Misc)
+        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.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")
-                .withField(StandardField.FILE, "ParsedFileField{description='', link='http://search.ebscohost.com/login.aspx?direct=true&scope=site&db=nlebk&db=nlabk&AN=1906353', fileType='PDF'}")
+                .withField(
+                    StandardField.EDITION,
+                    "3. Auflage, Übersetzung der englischsprachigen 3. Originalausgabe 2018"
+                )
+                .withField(
+                    StandardField.FILE,
+                    "ParsedFileField{description='', link='http://search.ebscohost.com/login.aspx?direct=true&scope=site&db=nlebk&db=nlabk&AN=1906353', fileType='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.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)}");
+                .withField(
+                    StandardField.PUBLISHER,
+                    "{dpunkt.verlag} and {Dpunkt. Verlag (Heidelberg)}"
+                );
 
-        bibEntryISBN0134685997 = new BibEntry(StandardEntryType.Misc)
+        bibEntryISBN0134685997 =
+            new BibEntry(StandardEntryType.Misc)
                 .withField(StandardField.TITLE, "Effective Java")
                 .withField(StandardField.YEAR, "2018")
                 .withField(StandardField.AUTHOR, "Bloch, Joshua")
@@ -70,28 +84,42 @@ public void setUp() {
 
     @Test
     public void testGetName() {
-        assertEquals("Bibliotheksverbund Bayern (Experimental)", fetcher.getName());
+        assertEquals(
+            "Bibliotheksverbund Bayern (Experimental)",
+            fetcher.getName()
+        );
     }
 
     @Test
     public void simpleSearchQueryURLCorrect() throws Exception {
         String query = "java jdk";
-        QueryNode luceneQuery = new StandardSyntaxParser().parse(query, NO_EXPLICIT_FIELD);
+        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+jdk&maximumRecords=30", url.toString());
+        assertEquals(
+            "http://bvbr.bib-bvb.de:5661/bvb01sru?version=1.1&recordSchema=marcxml&operation=searchRetrieve&query=java+jdk&maximumRecords=30",
+            url.toString()
+        );
     }
 
     @Test
     public void complexSearchQueryURLCorrect() throws Exception {
         String query = "title:jdk";
-        QueryNode luceneQuery = new StandardSyntaxParser().parse(query, NO_EXPLICIT_FIELD);
+        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
-    public void testPerformSearchMatchingMultipleEntries() throws FetcherException {
-        List<BibEntry> searchResult = fetcher.performSearch("effective java bloch");
+    public void testPerformSearchMatchingMultipleEntries()
+        throws FetcherException {
+        List<BibEntry> searchResult = fetcher.performSearch(
+            "effective java bloch"
+        );
         assertEquals(bibEntryISBN9783960886402, searchResult.get(0));
         assertEquals(bibEntryISBN0134685997, searchResult.get(1));
     }
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 790c1eee67f..9a91c0e26ed 100644
--- a/src/test/java/org/jabref/logic/importer/fetcher/CiteSeerTest.java
+++ b/src/test/java/org/jabref/logic/importer/fetcher/CiteSeerTest.java
@@ -1,24 +1,22 @@
 package org.jabref.logic.importer.fetcher;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+
 import java.io.IOException;
 import java.net.URL;
 import java.util.Collections;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Optional;
-
 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.Disabled;
 import org.junit.jupiter.api.Test;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertFalse;
-
 @FetcherTest
 class CiteSeerTest {
 
@@ -26,44 +24,69 @@ class CiteSeerTest {
 
     @Test
     void searchByQueryFindsEntryRigorousDerivation() throws Exception {
-        String title = "RIGOROUS DERIVATION FROM LANDAU-DE GENNES THEORY TO ERICKSEN-LESLIE THEORY";
+        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");
+            .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");
+        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");
+            .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");
+        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));
             }
@@ -72,14 +95,23 @@ 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"
+        );
         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;
@@ -89,17 +121,31 @@ 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(new URL("https://citeseerx.ist.psu.edu/document?repid=rep1&type=pdf&doi=c16e0888b17cb2c689e5dfa4e2be4fdffb23869e"));
+            .withField(
+                StandardField.DOI,
+                "c16e0888b17cb2c689e5dfa4e2be4fdffb23869e"
+            );
+        Optional<URL> expected = Optional.of(
+            new URL(
+                "https://citeseerx.ist.psu.edu/document?repid=rep1&type=pdf&doi=c16e0888b17cb2c689e5dfa4e2be4fdffb23869e"
+            )
+        );
         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(new URL("http://intl.psychosomaticmedicine.org/content/55/3/234.full.pdf"));
+            .withField(StandardField.DOI, "")
+            .withField(
+                StandardField.URL,
+                "http://intl.psychosomaticmedicine.org/content/55/3/234.full.pdf"
+            );
+        Optional<URL> expected = Optional.of(
+            new URL(
+                "http://intl.psychosomaticmedicine.org/content/55/3/234.full.pdf"
+            )
+        );
         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 c48e3119642..45f1e2ac72f 100644
--- a/src/test/java/org/jabref/logic/importer/fetcher/CollectionOfComputerScienceBibliographiesFetcherTest.java
+++ b/src/test/java/org/jabref/logic/importer/fetcher/CollectionOfComputerScienceBibliographiesFetcherTest.java
@@ -1,5 +1,9 @@
 package org.jabref.logic.importer.fetcher;
 
+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;
@@ -7,7 +11,8 @@
 import java.util.List;
 import java.util.Set;
 import java.util.stream.Collectors;
-
+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,98 +21,154 @@
 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;
-
 @Disabled("https://github.com/JabRef/jabref-issue-melting-pot/issues/259")
 @FetcherTest
 class CollectionOfComputerScienceBibliographiesFetcherTest {
+
     private CollectionOfComputerScienceBibliographiesFetcher fetcher;
 
     @BeforeEach
     public void setUp() {
-        ImportFormatPreferences importFormatPreferences = mock(ImportFormatPreferences.class, Answers.RETURNS_DEEP_STUBS);
-        when(importFormatPreferences.bibEntryPreferences().getKeywordSeparator()).thenReturn(',');
-        fetcher = new CollectionOfComputerScienceBibliographiesFetcher(importFormatPreferences);
+        ImportFormatPreferences importFormatPreferences = mock(
+            ImportFormatPreferences.class,
+            Answers.RETURNS_DEEP_STUBS
+        );
+        when(
+            importFormatPreferences.bibEntryPreferences().getKeywordSeparator()
+        )
+            .thenReturn(',');
+        fetcher =
+            new CollectionOfComputerScienceBibliographiesFetcher(
+                importFormatPreferences
+            );
     }
 
     @Test
     public void getNameReturnsCorrectName() {
-        assertEquals("Collection of Computer Science Bibliographies", fetcher.getName());
+        assertEquals(
+            "Collection of Computer Science Bibliographies",
+            fetcher.getName()
+        );
     }
 
     @Test
-    public void getUrlForQueryReturnsCorrectUrl() throws MalformedURLException, URISyntaxException, FetcherException, QueryNodeParseException {
+    public 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
-    public void performSearchReturnsMatchingMultipleEntries() throws FetcherException {
+    public 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");
+            .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()));
+        assertEquals(
+            Set.of(secondBibEntry),
+            searchResult
+                .stream()
+                .filter(bibEntry -> {
+                    String citeKey = bibEntry.getCitationKey().get();
+                    return citeKey.equals(
+                        secondBibEntry.getCitationKey().get()
+                    );
+                })
+                .collect(Collectors.toSet())
+        );
     }
 
     @Test
-    public void performSearchReturnsEmptyListForEmptySearch() throws FetcherException {
+    public void performSearchReturnsEmptyListForEmptySearch()
+        throws FetcherException {
         List<BibEntry> searchResult = fetcher.performSearch("");
         assertEquals(Collections.emptyList(), searchResult);
     }
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 79f529e91d8..b1ff7b2b73a 100644
--- a/src/test/java/org/jabref/logic/importer/fetcher/CollectionOfComputerScienceBibliographiesParserTest.java
+++ b/src/test/java/org/jabref/logic/importer/fetcher/CollectionOfComputerScienceBibliographiesParserTest.java
@@ -1,55 +1,91 @@
 package org.jabref.logic.importer.fetcher;
 
+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;
-
 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;
-
 @FetcherTest
 @Disabled
 public class CollectionOfComputerScienceBibliographiesParserTest {
 
     @Test
-    public void parseEntriesReturnsEmptyListIfXmlHasNoResults() throws Exception {
-        parseXmlAndCheckResults("collection_of_computer_science_bibliographies_empty_result.xml", Collections.emptyList());
+    public void parseEntriesReturnsEmptyListIfXmlHasNoResults()
+        throws Exception {
+        parseXmlAndCheckResults(
+            "collection_of_computer_science_bibliographies_empty_result.xml",
+            Collections.emptyList()
+        );
     }
 
-    @Disabled("Parse/fetcher remote side does not return anything valid for the link")
+    @Disabled(
+        "Parse/fetcher remote side does not return anything valid for the link"
+    )
     @Test
-    public void parseEntriesReturnsOneBibEntryInListIfXmlHasSingleResult() throws Exception {
-        parseXmlAndCheckResults("collection_of_computer_science_bibliographies_single_result.xml", Collections.singletonList("collection_of_computer_science_bibliographies_single_result.bib"));
+    public void parseEntriesReturnsOneBibEntryInListIfXmlHasSingleResult()
+        throws Exception {
+        parseXmlAndCheckResults(
+            "collection_of_computer_science_bibliographies_single_result.xml",
+            Collections.singletonList(
+                "collection_of_computer_science_bibliographies_single_result.bib"
+            )
+        );
     }
 
     @Test
-    public 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"));
+    public 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"
+            )
+        );
     }
 
-    private void parseXmlAndCheckResults(String xmlName, List<String> resourceNames) throws Exception {
-        ImportFormatPreferences importFormatPreferences = mock(ImportFormatPreferences.class, Answers.RETURNS_DEEP_STUBS);
-        when(importFormatPreferences.bibEntryPreferences().getKeywordSeparator()).thenReturn(',');
+    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 d171ed5d8e1..110ea4fb8ac 100644
--- a/src/test/java/org/jabref/logic/importer/fetcher/CompositeIdFetcherTest.java
+++ b/src/test/java/org/jabref/logic/importer/fetcher/CompositeIdFetcherTest.java
@@ -1,8 +1,11 @@
 package org.jabref.logic.importer.fetcher;
 
+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;
-
 import org.jabref.logic.importer.CompositeIdFetcher;
 import org.jabref.logic.importer.FetcherException;
 import org.jabref.logic.importer.ImportFormatPreferences;
@@ -12,7 +15,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,10 +22,6 @@
 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;
-
 /**
  * Tests the CompositeIdFetcher, for which Fetchers implementing the
  * IdBasedFetcher interface are a prerequisite. Excluding TitleFetcher.
@@ -33,34 +31,60 @@ class CompositeIdFetcherTest {
 
     private CompositeIdFetcher compositeIdFetcher;
 
-    public static Stream<Arguments> performSearchByIdReturnsCorrectEntryForIdentifier() {
+    public static Stream<
+        Arguments
+    > performSearchByIdReturnsCorrectEntryForIdentifier() {
         return Stream.of(
-                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.DATE, "2021-10-06")
-                                .withField(StandardField.YEAR, "2021")
-                                .withField(StandardField.MONTH, "aug")
-                                .withField(StandardField.NUMBER, "2")
-                                .withField(StandardField.VOLUME, "934")
-                                .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.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.EPRINTTYPE, "arXiv")
-                                .withField(StandardField.EPRINTCLASS, "astro-ph.GA")
-                                .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"
-                ),
-                /* disabled, because Iacr does not work
+            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.DATE, "2021-10-06")
+                    .withField(StandardField.YEAR, "2021")
+                    .withField(StandardField.MONTH, "aug")
+                    .withField(StandardField.NUMBER, "2")
+                    .withField(StandardField.VOLUME, "934")
+                    .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.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.EPRINTTYPE, "arXiv")
+                    .withField(StandardField.EPRINTCLASS, "astro-ph.GA")
+                    .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"
+            ),
+            /* disabled, because Iacr does not work
                 Arguments.arguments(
                         "performSearchByIdReturnsCorrectEntryForIacrEprintId",
                         new BibEntry(StandardEntryType.Misc)
@@ -76,53 +100,76 @@ public static Stream<Arguments> performSearchByIdReturnsCorrectEntryForIdentifie
                                 .withCitationKey("cryptoeprint:2017:1118"),
                         "2017/1118"
                 ), */
-                Arguments.arguments(
-                        "performSearchByIdReturnsCorrectEntryForIsbnId",
-                        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"),
-                        "9780134685991"
-                ),
-                Arguments.arguments(
-                        "performSearchByIdReturnsCorrectEntryForDoiId",
-                        new BibEntry(StandardEntryType.Book)
-                                .withField(StandardField.TITLE, "Java{\\textregistered} For Dummies{\\textregistered}")
-                                .withField(StandardField.PUBLISHER, "Wiley")
-                                .withField(StandardField.YEAR, "2011")
-                                .withField(StandardField.AUTHOR, "Barry Burd")
-                                .withField(StandardField.MONTH, "jul")
-                                .withField(StandardField.DOI, "10.1002/9781118257517")
-                                .withCitationKey("Burd_2011"),
-                        "10.1002/9781118257517"
-                )
+            Arguments.arguments(
+                "performSearchByIdReturnsCorrectEntryForIsbnId",
+                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"),
+                "9780134685991"
+            ),
+            Arguments.arguments(
+                "performSearchByIdReturnsCorrectEntryForDoiId",
+                new BibEntry(StandardEntryType.Book)
+                    .withField(
+                        StandardField.TITLE,
+                        "Java{\\textregistered} For Dummies{\\textregistered}"
+                    )
+                    .withField(StandardField.PUBLISHER, "Wiley")
+                    .withField(StandardField.YEAR, "2011")
+                    .withField(StandardField.AUTHOR, "Barry Burd")
+                    .withField(StandardField.MONTH, "jul")
+                    .withField(StandardField.DOI, "10.1002/9781118257517")
+                    .withCitationKey("Burd_2011"),
+                "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(',');
+        when(
+            importFormatPreferences.bibEntryPreferences().getKeywordSeparator()
+        )
+            .thenReturn(',');
         compositeIdFetcher = new CompositeIdFetcher(importFormatPreferences);
     }
 
     @ParameterizedTest
     @ValueSource(strings = "arZiv:2110.02957")
-    void performSearchByIdReturnsEmptyForInvalidId(String groundInvalidArXivId) throws FetcherException {
-        assertEquals(Optional.empty(), compositeIdFetcher.performSearchById(groundInvalidArXivId));
+    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 {
-        assertEquals(Optional.of(bibEntry), compositeIdFetcher.performSearchById(identifier));
+    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 5d00d34b356..9cf20a14455 100644
--- a/src/test/java/org/jabref/logic/importer/fetcher/CompositeSearchBasedFetcherTest.java
+++ b/src/test/java/org/jabref/logic/importer/fetcher/CompositeSearchBasedFetcherTest.java
@@ -1,14 +1,15 @@
 package org.jabref.logic.importer.fetcher;
 
+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;
-
 import javafx.collections.FXCollections;
-
 import org.jabref.logic.importer.FetcherException;
 import org.jabref.logic.importer.ImportCleanup;
 import org.jabref.logic.importer.ImportFormatPreferences;
@@ -18,7 +19,6 @@
 import org.jabref.model.entry.BibEntry;
 import org.jabref.support.DisabledOnCIServer;
 import org.jabref.testutils.category.FetcherTest;
-
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.params.ParameterizedTest;
@@ -28,27 +28,35 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
-
 @FetcherTest
 @DisabledOnCIServer("Produces to many requests on CI")
 public class CompositeSearchBasedFetcherTest {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(CompositeSearchBasedFetcherTest.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(
+        CompositeSearchBasedFetcherTest.class
+    );
 
-    private ImporterPreferences importerPreferences = mock(ImporterPreferences.class, Answers.RETURNS_DEEP_STUBS);
+    private ImporterPreferences importerPreferences = mock(
+        ImporterPreferences.class,
+        Answers.RETURNS_DEEP_STUBS
+    );
 
     @Test
     public void createCompositeFetcherWithNullSet() {
-        Assertions.assertThrows(IllegalArgumentException.class,
-                () -> new CompositeSearchBasedFetcher(null, importerPreferences, 0));
+        Assertions.assertThrows(
+            IllegalArgumentException.class,
+            () -> new CompositeSearchBasedFetcher(null, importerPreferences, 0)
+        );
     }
 
     @Test
     public 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");
 
@@ -57,27 +65,45 @@ public void performSearchWithoutFetchers() throws Exception {
 
     @ParameterizedTest(name = "Perform Search on empty query.")
     @MethodSource("performSearchParameters")
-    public void performSearchOnEmptyQuery(Set<SearchBasedFetcher> fetchers) throws Exception {
-        CompositeSearchBasedFetcher compositeFetcher = new CompositeSearchBasedFetcher(fetchers, importerPreferences, Integer.MAX_VALUE);
+    public void performSearchOnEmptyQuery(Set<SearchBasedFetcher> fetchers)
+        throws Exception {
+        CompositeSearchBasedFetcher compositeFetcher =
+            new CompositeSearchBasedFetcher(
+                fetchers,
+                importerPreferences,
+                Integer.MAX_VALUE
+            );
 
         List<BibEntry> queryResult = compositeFetcher.performSearch("");
 
         Assertions.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")
-    public void performSearchOnNonEmptyQuery(Set<SearchBasedFetcher> fetchers) throws Exception {
-        CompositeSearchBasedFetcher compositeFetcher = new CompositeSearchBasedFetcher(fetchers, importerPreferences, Integer.MAX_VALUE);
+    public void performSearchOnNonEmptyQuery(Set<SearchBasedFetcher> fetchers)
+        throws Exception {
+        CompositeSearchBasedFetcher compositeFetcher =
+            new CompositeSearchBasedFetcher(
+                fetchers,
+                importerPreferences,
+                Integer.MAX_VALUE
+            );
         ImportCleanup cleanup = ImportCleanup.targeting(BibDatabaseMode.BIBTEX);
 
-        List<BibEntry> compositeResult = compositeFetcher.performSearch("quantum");
+        List<BibEntry> compositeResult = compositeFetcher.performSearch(
+            "quantum"
+        );
         for (SearchBasedFetcher fetcher : fetchers) {
             try {
                 List<BibEntry> fetcherResult = fetcher.performSearch("quantum");
                 fetcherResult.forEach(cleanup::doPostCleanup);
-                Assertions.assertTrue(compositeResult.containsAll(fetcherResult));
+                Assertions.assertTrue(
+                    compositeResult.containsAll(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
@@ -94,25 +120,35 @@ public void performSearchOnNonEmptyQuery(Set<SearchBasedFetcher> fetchers) throw
      * @return A stream of Arguments wrapping set of fetchers.
      */
     static Stream<Arguments> performSearchParameters() {
-        ImportFormatPreferences importFormatPreferences = mock(ImportFormatPreferences.class, Answers.RETURNS_DEEP_STUBS);
-        ImporterPreferences importerPreferences = mock(ImporterPreferences.class);
-        when(importerPreferences.getApiKeys()).thenReturn(FXCollections.emptyObservableSet());
+        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));
+            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 a0bd0bfc64e..784ee7b1711 100644
--- a/src/test/java/org/jabref/logic/importer/fetcher/CrossRefTest.java
+++ b/src/test/java/org/jabref/logic/importer/fetcher/CrossRefTest.java
@@ -1,22 +1,20 @@
 package org.jabref.logic.importer.fetcher;
 
+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;
-
 import org.jabref.logic.importer.FetcherClientException;
 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.Test;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertThrows;
-
 @FetcherTest
 public class CrossRefTest {
 
@@ -28,10 +26,19 @@ public void setUp() throws Exception {
         fetcher = new CrossRef();
 
         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.TITLE,
+            "Service Interaction Patterns"
+        );
+        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.PUBLISHER,
+            "Springer Berlin Heidelberg"
+        );
         barrosEntry.setField(StandardField.DOI, "10.1007/11538394_20");
         barrosEntry.setField(StandardField.ISSN, "0302-9743");
         barrosEntry.setField(StandardField.PAGES, "302-318");
@@ -41,24 +48,54 @@ public void setUp() throws Exception {
     public 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
     public 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
     public 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 +109,28 @@ public void notFindIncompleteTitle() throws Exception {
     @Test
     public 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
     public 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,36 +138,73 @@ public void notAcceptTitleOverThreshold() throws Exception {
     @Test
     public 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
     public void findWithSubtitle() throws Exception {
         BibEntry entry = new BibEntry();
         // 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));
+        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)
+        );
     }
 
     @Test
     public void findByDOI() throws Exception {
-        assertEquals(Optional.of(barrosEntry), fetcher.performSearchById("10.1007/11538394_20"));
+        assertEquals(
+            Optional.of(barrosEntry),
+            fetcher.performSearchById("10.1007/11538394_20")
+        );
     }
 
     @Test
     public 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
     public 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());
+        assertEquals(
+            Optional.of(barrosEntry),
+            fetcher.performSearch(entry).stream().findFirst()
+        );
     }
 
     @Test
@@ -132,9 +219,15 @@ public void performSearchByIdFindsPaperWithoutTitle() throws Exception {
         entry.setField(StandardField.JOURNAL, "Indo-Iranian Journal");
         entry.setField(StandardField.NUMBER, "2");
         entry.setField(StandardField.PUBLISHER, "Brill");
-        entry.setField(StandardField.KEYWORDS, "Political Science and International Relations, Linguistics and Language, Philosophy");
+        entry.setField(
+            StandardField.KEYWORDS,
+            "Political Science and International Relations, Linguistics and Language, Philosophy"
+        );
 
-        assertEquals(Optional.of(entry), fetcher.performSearchById("10.1023/a:1003473214310"));
+        assertEquals(
+            Optional.of(entry),
+            fetcher.performSearchById("10.1023/a:1003473214310")
+        );
     }
 
     @Test
@@ -151,7 +244,11 @@ public void performSearchByEmptyQuery() throws Exception {
      * reveal fetching error on crossref performSearchById
      */
     @Test
-    public void testPerformSearchValidReturnNothingDOI() throws FetcherException {
-        assertThrows(FetcherClientException.class, () -> fetcher.performSearchById("10.1392/BC1.0"));
+    public void testPerformSearchValidReturnNothingDOI()
+        throws FetcherException {
+        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 5e051e48394..cb1b78bf4a4 100644
--- a/src/test/java/org/jabref/logic/importer/fetcher/DBLPFetcherTest.java
+++ b/src/test/java/org/jabref/logic/importer/fetcher/DBLPFetcherTest.java
@@ -1,8 +1,10 @@
 package org.jabref.logic.importer.fetcher;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.mockito.Mockito.mock;
+
 import java.util.Collections;
 import java.util.List;
-
 import org.jabref.logic.importer.FetcherException;
 import org.jabref.logic.importer.ImportFormatPreferences;
 import org.jabref.model.entry.BibEntry;
@@ -10,14 +12,10 @@
 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;
-
 @FetcherTest
 public class DBLPFetcherTest {
 
@@ -26,28 +24,45 @@ public class DBLPFetcherTest {
 
     @BeforeEach
     public 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,
-                "Process Engine Benchmarking with Betsy in the Context of {ISO/IEC} Quality Standards");
-        entry.setField(StandardField.AUTHOR, "Matthias Geiger and Simon Harrer and J{\\\"{o}}rg Lenhard");
+        entry.setField(
+            StandardField.TITLE,
+            "Process Engine Benchmarking with Betsy in the Context of {ISO/IEC} Quality Standards"
+        );
+        entry.setField(
+            StandardField.AUTHOR,
+            "Matthias Geiger and Simon Harrer and J{\\\"{o}}rg Lenhard"
+        );
         entry.setField(StandardField.JOURNAL, "Softwaretechnik-Trends");
         entry.setField(StandardField.VOLUME, "36");
         entry.setField(StandardField.NUMBER, "2");
         entry.setField(StandardField.YEAR, "2016");
-        entry.setField(StandardField.URL,
-                "http://pi.informatik.uni-siegen.de/stt/36_2/03_Technische_Beitraege/ZEUS2016/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(
+            StandardField.URL,
+            "http://pi.informatik.uni-siegen.de/stt/36_2/03_Technische_Beitraege/ZEUS2016/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"
+        );
     }
 
     @Test
     public 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";
+        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);
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 024e6e0dffb..105c39b1b8e 100644
--- a/src/test/java/org/jabref/logic/importer/fetcher/DOABFetcherTest.java
+++ b/src/test/java/org/jabref/logic/importer/fetcher/DOABFetcherTest.java
@@ -1,25 +1,24 @@
 package org.jabref.logic.importer.fetcher;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
 import java.util.List;
 import java.util.stream.Stream;
-
 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.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;
-
 @FetcherTest
 @DisabledOnCIServer("Disable on CI Server to not hit the API call limit")
 public class DOABFetcherTest {
+
     private final DOABFetcher fetcher = new DOABFetcher();
 
     @Test
@@ -29,84 +28,154 @@ public void testGetName() {
 
     public static Stream<Arguments> testPerformSearch() {
         return Stream.of(
-                Arguments.of(
-                        new BibEntry(StandardEntryType.Book)
-                                .withField(StandardField.AUTHOR, "David Pol")
-                                .withField(StandardField.TITLE, "I Open Fire")
-                                .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.LANGUAGE, "English")
-                                .withField(StandardField.KEYWORDS, "poetry, love, warfare")
-                                .withField(StandardField.PUBLISHER, "punctum books"),
-                        "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.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.LANGUAGE, "English")
-                                .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"
-                ),
-                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.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.LANGUAGE, "English")
-                                .withField(StandardField.KEYWORDS, "Religion")
-                                .withField(StandardField.PUBLISHER, "Brill"),
+            Arguments.of(
+                new BibEntry(StandardEntryType.Book)
+                    .withField(StandardField.AUTHOR, "David Pol")
+                    .withField(StandardField.TITLE, "I Open Fire")
+                    .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.LANGUAGE, "English")
+                    .withField(StandardField.KEYWORDS, "poetry, love, warfare")
+                    .withField(StandardField.PUBLISHER, "punctum books"),
+                "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.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.LANGUAGE, "English")
+                    .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"
+            ),
+            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"
-                ),
-                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.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.LANGUAGE, "English")
-                                .withField(StandardField.KEYWORDS, "UAV sensors, Environmental Monitoring, drones, unmanned aerial vehicles")
-                                .withField(StandardField.PUBLISHER, "MDPI - Multidisciplinary Digital Publishing Institute"),
+                    )
+                    .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.LANGUAGE, "English")
+                    .withField(StandardField.KEYWORDS, "Religion")
+                    .withField(StandardField.PUBLISHER, "Brill"),
+                "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"
-                ),
-                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.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.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")
-                                .withField(StandardField.PUBLISHER, "AOSIS"),
+                    )
+                    .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.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"
+            ),
+            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.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.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"
+                    )
+                    .withField(StandardField.PUBLISHER, "AOSIS"),
+                "The symbiosis between information system project complexity and information system project success"
+            )
         );
     }
 
     @ParameterizedTest
     @MethodSource
-    public void testPerformSearch(BibEntry expected, String query) throws FetcherException {
+    public void testPerformSearch(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
         entries.forEach(entry -> entry.clearField(StandardField.ABSTRACT));
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 1c7fec0b352..3c8b7c8c28c 100644
--- a/src/test/java/org/jabref/logic/importer/fetcher/DOAJFetcherTest.java
+++ b/src/test/java/org/jabref/logic/importer/fetcher/DOAJFetcherTest.java
@@ -1,25 +1,23 @@
 package org.jabref.logic.importer.fetcher;
 
+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;
-
+import kong.unirest.json.JSONObject;
+import org.apache.http.client.utils.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.json.JSONObject;
-import org.apache.http.client.utils.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;
-
 @FetcherTest
 class DOAJFetcherTest {
 
@@ -27,27 +25,51 @@ class DOAJFetcherTest {
 
     @BeforeEach
     void setUp() {
-        ImportFormatPreferences importFormatPreferences = mock(ImportFormatPreferences.class, Answers.RETURNS_DEEP_STUBS);
-        when(importFormatPreferences.bibEntryPreferences().getKeywordSeparator()).thenReturn(',');
+        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");
+            .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,16 +77,34 @@ void searchByQueryFindsEntry() throws Exception {
 
     @Test
     void testBibJSONConverter() {
-        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("2014"), bibEntry.getField(StandardField.YEAR));
+        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("2014"),
+            bibEntry.getField(StandardField.YEAR)
+        );
     }
 
     @Test
@@ -76,27 +116,39 @@ public void searchByEmptyQuery() throws Exception {
     void appendSingleWord() throws Exception {
         URIBuilder builder = new URIBuilder("http://example.com/test");
         DOAJFetcher.addPath(builder, "/example");
-        assertEquals("http://example.com/test/example", builder.build().toASCIIString());
+        assertEquals(
+            "http://example.com/test/example",
+            builder.build().toASCIIString()
+        );
     }
 
     @Test
     void appendSingleWordWithSlash() throws Exception {
         URIBuilder builder = new URIBuilder("http://example.com/test");
         DOAJFetcher.addPath(builder, "/example");
-        assertEquals("http://example.com/test/example", builder.build().toASCIIString());
+        assertEquals(
+            "http://example.com/test/example",
+            builder.build().toASCIIString()
+        );
     }
 
     @Test
     void appendSlash() throws Exception {
         URIBuilder builder = new URIBuilder("http://example.com/test");
         DOAJFetcher.addPath(builder, "/");
-        assertEquals("http://example.com/test", builder.build().toASCIIString());
+        assertEquals(
+            "http://example.com/test",
+            builder.build().toASCIIString()
+        );
     }
 
     @Test
     void appendTwoWords() throws Exception {
         URIBuilder builder = new URIBuilder("http://example.com/test");
         DOAJFetcher.addPath(builder, "example two");
-        assertEquals("http://example.com/test/example%20two", builder.build().toASCIIString());
+        assertEquals(
+            "http://example.com/test/example%20two",
+            builder.build().toASCIIString()
+        );
     }
 }
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 bd00f6d1627..5581ff454dc 100644
--- a/src/test/java/org/jabref/logic/importer/fetcher/DiVATest.java
+++ b/src/test/java/org/jabref/logic/importer/fetcher/DiVATest.java
@@ -1,22 +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 java.util.Optional;
 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;
-
 @FetcherTest
 public class DiVATest {
 
@@ -24,7 +22,10 @@ public class DiVATest {
 
     @BeforeEach
     public void setUp() {
-        fetcher = new DiVA(mock(ImportFormatPreferences.class, Answers.RETURNS_DEEP_STUBS));
+        fetcher =
+            new DiVA(
+                mock(ImportFormatPreferences.class, Answers.RETURNS_DEEP_STUBS)
+            );
     }
 
     @Test
@@ -38,18 +39,32 @@ public void testPerformSearchById() throws Exception {
         entry.setType(StandardEntryType.Article);
         entry.setCitationKey("Gustafsson260746");
         entry.setField(StandardField.AUTHOR, "Gustafsson, Oscar");
-        entry.setField(StandardField.INSTITUTION, "The Institute of Technology");
-        entry.setField(StandardField.JOURNAL,
-                "IEEE transactions on circuits and systems. 2, Analog and digital signal processing (Print)");
+        entry.setField(
+            StandardField.INSTITUTION,
+            "The Institute of Technology"
+        );
+        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.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"));
+        assertEquals(
+            Optional.of(entry),
+            fetcher.performSearchById("diva2:260746")
+        );
     }
 
     @Test
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 da157b42347..13dd74ef6f1 100644
--- a/src/test/java/org/jabref/logic/importer/fetcher/DoiFetcherTest.java
+++ b/src/test/java/org/jabref/logic/importer/fetcher/DoiFetcherTest.java
@@ -1,72 +1,106 @@
 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 java.util.Optional;
 import org.jabref.logic.importer.FetcherException;
 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.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;
-
 @FetcherTest
 public 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{\\textregistered} For Dummies{\\textregistered}")
-            .withField(StandardField.PUBLISHER, "Wiley")
-            .withField(StandardField.YEAR, "2011")
-            .withField(StandardField.AUTHOR, "Barry Burd")
-            .withField(StandardField.MONTH, "jul")
-            .withField(StandardField.DOI, "10.1002/9781118257517");
-    private final BibEntry bibEntryDecker2007 = new BibEntry(StandardEntryType.InProceedings)
-            .withCitationKey("Decker_2007")
-            .withField(StandardField.AUTHOR, "Gero Decker and Oliver Kopp and Frank Leymann and Mathias Weske")
-            .withField(StandardField.BOOKTITLE, "{IEEE} International Conference on Web Services ({ICWS} 2007)")
-            .withField(StandardField.MONTH, "jul")
-            .withField(StandardField.PUBLISHER, "{IEEE}")
-            .withField(StandardField.TITLE, "{BPEL}4Chor: 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, "L. Stenzel and A. L. C. Hayward and U. Schollwöck and F. Heidrich-Meisner")
-            .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.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{\\textregistered} For Dummies{\\textregistered}"
+        )
+        .withField(StandardField.PUBLISHER, "Wiley")
+        .withField(StandardField.YEAR, "2011")
+        .withField(StandardField.AUTHOR, "Barry Burd")
+        .withField(StandardField.MONTH, "jul")
+        .withField(StandardField.DOI, "10.1002/9781118257517");
+    private final BibEntry bibEntryDecker2007 = new BibEntry(
+        StandardEntryType.InProceedings
+    )
+        .withCitationKey("Decker_2007")
+        .withField(
+            StandardField.AUTHOR,
+            "Gero Decker and Oliver Kopp and Frank Leymann and Mathias Weske"
+        )
+        .withField(
+            StandardField.BOOKTITLE,
+            "{IEEE} International Conference on Web Services ({ICWS} 2007)"
+        )
+        .withField(StandardField.MONTH, "jul")
+        .withField(StandardField.PUBLISHER, "{IEEE}")
+        .withField(
+            StandardField.TITLE,
+            "{BPEL}4Chor: 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,
+            "L. Stenzel and A. L. C. Hayward and U. Schollwöck and F. Heidrich-Meisner"
+        )
+        .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.PUBLISHER, "American Physical Society ({APS})")
+        .withField(StandardField.PAGES, "023315")
+        .withField(StandardField.NUMBER, "2");
 
     @Test
     public void testGetName() {
@@ -75,51 +109,74 @@ public void testGetName() {
 
     @Test
     public void testPerformSearchBurd2011() throws FetcherException {
-        Optional<BibEntry> fetchedEntry = fetcher.performSearchById("10.1002/9781118257517");
+        Optional<BibEntry> fetchedEntry = fetcher.performSearchById(
+            "10.1002/9781118257517"
+        );
         assertEquals(Optional.of(bibEntryBurd2011), fetchedEntry);
     }
 
     @Test
     public void testPerformSearchDecker2007() throws FetcherException {
-        Optional<BibEntry> fetchedEntry = fetcher.performSearchById("10.1109/ICWS.2007.59");
+        Optional<BibEntry> fetchedEntry = fetcher.performSearchById(
+            "10.1109/ICWS.2007.59"
+        );
         assertEquals(Optional.of(bibEntryDecker2007), fetchedEntry);
     }
 
     @Test
     public void testPerformSearchIannarelli2019() throws FetcherException {
-        Optional<BibEntry> fetchedEntry = fetcher.performSearchById("10.3303/CET1977146");
+        Optional<BibEntry> fetchedEntry = fetcher.performSearchById(
+            "10.3303/CET1977146"
+        );
         assertEquals(Optional.of(bibEntryIannarelli2019), fetchedEntry);
     }
 
     @Test
     public void testPerformSearchEmptyDOI() {
-        assertThrows(FetcherException.class, () -> fetcher.performSearchById(""));
+        assertThrows(
+            FetcherException.class,
+            () -> fetcher.performSearchById("")
+        );
     }
 
     @Test
     public void testPerformSearchInvalidDOI() {
-        assertThrows(FetcherException.class, () -> fetcher.performSearchById("10.1002/9781118257517F"));
+        assertThrows(
+            FetcherException.class,
+            () -> fetcher.performSearchById("10.1002/9781118257517F")
+        );
     }
 
     @Test
     public void testPerformSearchInvalidDOIClientResultsinFetcherClientException() {
-        assertThrows(FetcherException.class, () -> fetcher.performSearchById("10.1002/9781118257517F"));
+        assertThrows(
+            FetcherException.class,
+            () -> fetcher.performSearchById("10.1002/9781118257517F")
+        );
     }
 
     @Test
     public void testPerformSearchInvalidDOIClientResultsinFetcherClientException2() {
-        assertThrows(FetcherException.class, () -> fetcher.performSearchById("10.1002/9781517F"));
+        assertThrows(
+            FetcherException.class,
+            () -> fetcher.performSearchById("10.1002/9781517F")
+        );
     }
 
     @Test
     public void testPerformSearchNonTrimmedDOI() 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);
     }
 
     @Test
-    public void testAPSJournalCopiesArticleIdToPageField() throws FetcherException {
-        Optional<BibEntry> fetchedEntry = fetcher.performSearchById("10.1103/physreva.102.023315");
+    public void testAPSJournalCopiesArticleIdToPageField()
+        throws FetcherException {
+        Optional<BibEntry> fetchedEntry = fetcher.performSearchById(
+            "10.1103/physreva.102.023315"
+        );
         assertEquals(Optional.of(bibEntryStenzel2020), 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 5ee602c8fa4..dd73a263d5f 100644
--- a/src/test/java/org/jabref/logic/importer/fetcher/DoiResolutionTest.java
+++ b/src/test/java/org/jabref/logic/importer/fetcher/DoiResolutionTest.java
@@ -1,22 +1,20 @@
 package org.jabref.logic.importer.fetcher;
 
+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.URL;
 import java.util.Optional;
-
 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;
-
 @FetcherTest
 class DoiResolutionTest {
 
@@ -35,8 +33,12 @@ void setup() {
     void linkWithPdfInTitleTag() throws IOException {
         entry.setField(StandardField.DOI, "10.1051/0004-6361/201527330");
         assertEquals(
-                Optional.of(new URL("https://www.aanda.org/articles/aa/pdf/2016/01/aa27330-15.pdf")),
-                finder.findFullText(entry)
+            Optional.of(
+                new URL(
+                    "https://www.aanda.org/articles/aa/pdf/2016/01/aa27330-15.pdf"
+                )
+            ),
+            finder.findFullText(entry)
         );
     }
 
@@ -44,13 +46,27 @@ void linkWithPdfInTitleTag() throws IOException {
     @Test
     void linkWithPdfStringLeadsToFulltext() throws IOException {
         entry.setField(StandardField.DOI, "10.1002/acr2.11101");
-        assertEquals(Optional.of(new URL("https://onlinelibrary.wiley.com/doi/pdf/10.1002/acr2.11101")), finder.findFullText(entry));
+        assertEquals(
+            Optional.of(
+                new URL(
+                    "https://onlinelibrary.wiley.com/doi/pdf/10.1002/acr2.11101"
+                )
+            ),
+            finder.findFullText(entry)
+        );
     }
 
     @Test
     void citationMetaTagLeadsToFulltext() throws IOException {
         entry.setField(StandardField.DOI, "10.1007/978-3-319-89963-3_28");
-        assertEquals(Optional.of(new URL("https://link.springer.com/content/pdf/10.1007/978-3-319-89963-3_28.pdf")), finder.findFullText(entry));
+        assertEquals(
+            Optional.of(
+                new URL(
+                    "https://link.springer.com/content/pdf/10.1007/978-3-319-89963-3_28.pdf"
+                )
+            ),
+            finder.findFullText(entry)
+        );
     }
 
     @Test
@@ -65,7 +81,14 @@ 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(new URL("https://link.springer.com/content/pdf/10.1007/978-3-319-62594-2_12.pdf")), finder.findFullText(entry));
+        assertEquals(
+            Optional.of(
+                new URL(
+                    "https://link.springer.com/content/pdf/10.1007/978-3-319-62594-2_12.pdf"
+                )
+            ),
+            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 7ac8d4e0216..17b65afb63c 100644
--- a/src/test/java/org/jabref/logic/importer/fetcher/FulltextFetcherTest.java
+++ b/src/test/java/org/jabref/logic/importer/fetcher/FulltextFetcherTest.java
@@ -1,37 +1,42 @@
 package org.jabref.logic.importer.fetcher;
 
+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;
-
 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;
-
 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
     @MethodSource("fetcherProvider")
     void findFullTextRejectsNullParameter(FulltextFetcher fetcher) {
-        assertThrows(NullPointerException.class, () -> fetcher.findFullText(null));
+        assertThrows(
+            NullPointerException.class,
+            () -> fetcher.findFullText(null)
+        );
     }
 
     @ParameterizedTest
     @MethodSource("fetcherProvider")
-    void findFullTextWithEmptyEntryFindsNothing(FulltextFetcher fetcher) throws Exception {
+    void findFullTextWithEmptyEntryFindsNothing(FulltextFetcher fetcher)
+        throws Exception {
         assertEquals(Optional.empty(), fetcher.findFullText(new BibEntry()));
     }
 }
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 4432e20a19b..27c0195eec4 100644
--- a/src/test/java/org/jabref/logic/importer/fetcher/GoogleScholarTest.java
+++ b/src/test/java/org/jabref/logic/importer/fetcher/GoogleScholarTest.java
@@ -1,11 +1,13 @@
 package org.jabref.logic.importer.fetcher;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.mockito.Mockito.mock;
+
 import java.io.IOException;
 import java.net.URL;
 import java.util.Collections;
 import java.util.List;
 import java.util.Optional;
-
 import org.jabref.logic.importer.FetcherException;
 import org.jabref.logic.importer.ImportFormatPreferences;
 import org.jabref.logic.importer.PagedSearchBasedFetcher;
@@ -15,41 +17,51 @@
 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;
-
 @FetcherTest
 @DisabledOnCIServer("CI server is blocked by Google")
-class GoogleScholarTest implements SearchBasedFetcherCapabilityTest, PagedSearchFetcherTest {
+class GoogleScholarTest
+    implements SearchBasedFetcherCapabilityTest, PagedSearchFetcherTest {
 
     private GoogleScholar finder;
     private BibEntry entry;
 
     @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 IOException, FetcherException {
-        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(new URL("https://www.uni-bamberg.de/fileadmin/uni/fakultaeten/wiai_lehrstuehle/praktische_informatik/Dateien/Publikationen/sose14-towards-application-portability-in-paas.pdf")),
-                finder.findFullText(entry)
+            Optional.of(
+                new URL(
+                    "https://www.uni-bamberg.de/fileadmin/uni/fakultaeten/wiai_lehrstuehle/praktische_informatik/Dateien/Publikationen/sose14-towards-application-portability-in-paas.pdf"
+                )
+            ),
+            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,20 +70,30 @@ 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.AUTHOR, "Geiger, Matthias and Wirtz, Guido");
+        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);
     }
 
     @Test
     void findManyEntries() throws FetcherException {
-        List<BibEntry> foundEntries = finder.performSearch("random test string");
+        List<BibEntry> foundEntries = finder.performSearch(
+            "random test string"
+        );
 
         assertEquals(20, foundEntries.size());
     }
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 99f5a815978..892e8e915ad 100644
--- a/src/test/java/org/jabref/logic/importer/fetcher/GrobidCitationFetcherTest.java
+++ b/src/test/java/org/jabref/logic/importer/fetcher/GrobidCitationFetcherTest.java
@@ -1,11 +1,17 @@
 package org.jabref.logic.importer.fetcher;
 
+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;
-
 import org.jabref.logic.importer.FetcherException;
 import org.jabref.logic.importer.ImportFormatPreferences;
 import org.jabref.logic.importer.ParseException;
@@ -14,125 +20,186 @@
 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;
-
 @FetcherTest
 public class GrobidCitationFetcherTest {
 
-    static ImportFormatPreferences importFormatPreferences = mock(ImportFormatPreferences.class, Answers.RETURNS_DEEP_STUBS);
+    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");
+        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("example1", example1AsBibEntry, example1),
+            Arguments.of("example2", example2AsBibEntry, example2),
+            Arguments.of("example3", example3AsBibEntry, example3),
+            Arguments.of("example4", example4AsBibEntry, example4)
         );
     }
 
     public static Stream<Arguments> provideInvalidInput() {
         return Stream.of(
-                Arguments.of("😋😋😋"),
-                Arguments.of("¦@#¦@#¦@#¦@#¦@#¦@#¦@°#¦@¦°¦@°")
+            Arguments.of("😋😋😋"),
+            Arguments.of("¦@#¦@#¦@#¦@#¦@#¦@#¦@°#¦@¦°¦@°")
         );
     }
 
     @ParameterizedTest(name = "{0}")
     @MethodSource("provideExamplesForCorrectResultTest")
-    public void grobidPerformSearchCorrectResultTest(String testName, BibEntry expectedBibEntry, String searchQuery) throws FetcherException {
-        List<BibEntry> entries = grobidCitationFetcher.performSearch(searchQuery);
+    public void grobidPerformSearchCorrectResultTest(
+        String testName,
+        BibEntry expectedBibEntry,
+        String searchQuery
+    ) throws FetcherException {
+        List<BibEntry> entries = grobidCitationFetcher.performSearch(
+            searchQuery
+        );
         assertEquals(List.of(expectedBibEntry), entries);
     }
 
     @Test
-    public 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);
+    public 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
+        );
     }
 
     @Test
-    public void grobidPerformSearchWithEmptyStringsTest() throws FetcherException {
-        List<BibEntry> entries = grobidCitationFetcher.performSearch("   \n   ");
+    public void grobidPerformSearchWithEmptyStringsTest()
+        throws FetcherException {
+        List<BibEntry> entries = grobidCitationFetcher.performSearch(
+            "   \n   "
+        );
         assertEquals(Collections.emptyList(), entries);
     }
 
     @ParameterizedTest
     @MethodSource("provideInvalidInput")
-    public void grobidPerformSearchWithInvalidDataTest(String invalidInput) throws FetcherException {
-        List<BibEntry> entries = grobidCitationFetcher.performSearch(invalidInput);
+    public void grobidPerformSearchWithInvalidDataTest(String invalidInput)
+        throws FetcherException {
+        List<BibEntry> entries = grobidCitationFetcher.performSearch(
+            invalidInput
+        );
         assertEquals(Collections.emptyList(), entries);
     }
 
     @Test
-    public void performSearchThrowsExceptionInCaseOfConnectionIssues() throws IOException, ParseException {
+    public 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 7ba45ee9aad..d69440ec30e 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,14 @@
 package org.jabref.logic.importer.fetcher;
 
+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;
-
+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,17 +17,10 @@
 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;
-
 @FetcherTest
 public class GvkFetcherTest {
 
@@ -32,23 +30,37 @@ public class GvkFetcherTest {
 
     @BeforeEach
     public void setUp() {
-        fetcher = new GvkFetcher(mock(ImportFormatPreferences.class, Answers.RETURNS_DEEP_STUBS));
+        fetcher =
+            new GvkFetcher(
+                mock(ImportFormatPreferences.class, Answers.RETURNS_DEEP_STUBS)
+            );
 
-        bibEntryPPN591166003 = new BibEntry(StandardEntryType.Book)
+        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.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.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]");
+                .withField(
+                    StandardField.SUBTITLE,
+                    "[revised and updated for JAVA SE 6]"
+                );
 
-        bibEntryPPN66391437X = new BibEntry(StandardEntryType.Book)
+        bibEntryPPN66391437X =
+            new BibEntry(StandardEntryType.Book)
                 .withField(StandardField.TITLE, "Effective unit testing")
                 .withField(StandardField.PUBLISHER, "Manning")
                 .withField(StandardField.YEAR, "2013")
@@ -57,7 +69,10 @@ public void setUp() {
                 .withField(StandardField.ISBN, "9781935182573")
                 .withField(StandardField.PAGETOTAL, "223")
                 .withField(new UnknownField("ppn_gvk"), "66391437X")
-                .withField(StandardField.SUBTITLE, "A guide for Java developers");
+                .withField(
+                    StandardField.SUBTITLE,
+                    "A guide for Java developers"
+                );
     }
 
     @Test
@@ -68,22 +83,33 @@ public void testGetName() {
     @Test
     public 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+and+pica.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+and+pica.all%3Djdk&maximumRecords=50&recordSchema=picaxml&sortKeys=Year%2C%2C1",
+            url.toString()
+        );
     }
 
     @Test
     public 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+and+pica.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+and+pica.tit%3Djdk&maximumRecords=50&recordSchema=picaxml&sortKeys=Year%2C%2C1",
+            url.toString()
+        );
     }
 
     @Test
-    public void testPerformSearchMatchingMultipleEntries() throws FetcherException {
-        List<BibEntry> searchResult = fetcher.performSearch("title:\"effective java\"");
+    public void testPerformSearchMatchingMultipleEntries()
+        throws FetcherException {
+        List<BibEntry> searchResult = fetcher.performSearch(
+            "title:\"effective java\""
+        );
         assertTrue(searchResult.contains(bibEntryPPN591166003));
         assertTrue(searchResult.contains(bibEntryPPN66391437X));
     }
@@ -91,13 +117,19 @@ public void testPerformSearchMatchingMultipleEntries() throws FetcherException {
     @Test
     public void testPerformSearch591166003() throws FetcherException {
         List<BibEntry> searchResult = fetcher.performSearch("ppn:591166003");
-        assertEquals(Collections.singletonList(bibEntryPPN591166003), searchResult);
+        assertEquals(
+            Collections.singletonList(bibEntryPPN591166003),
+            searchResult
+        );
     }
 
     @Test
     public void testPerformSearch66391437X() throws FetcherException {
         List<BibEntry> searchResult = fetcher.performSearch("ppn:66391437X");
-        assertEquals(Collections.singletonList(bibEntryPPN66391437X), searchResult);
+        assertEquals(
+            Collections.singletonList(bibEntryPPN66391437X),
+            searchResult
+        );
     }
 
     @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 965fde89a1a..16b171c33dd 100644
--- a/src/test/java/org/jabref/logic/importer/fetcher/IEEETest.java
+++ b/src/test/java/org/jabref/logic/importer/fetcher/IEEETest.java
@@ -1,12 +1,14 @@
 package org.jabref.logic.importer.fetcher;
 
+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.util.Collections;
 import java.util.List;
 import java.util.Optional;
-
 import javafx.collections.FXCollections;
-
 import org.jabref.logic.importer.ImportFormatPreferences;
 import org.jabref.logic.importer.ImporterPreferences;
 import org.jabref.logic.importer.PagedSearchBasedFetcher;
@@ -15,45 +17,67 @@
 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 static org.mockito.Mockito.when;
-
 @FetcherTest
-class IEEETest implements SearchBasedFetcherCapabilityTest, PagedSearchFetcherTest {
-
-    private 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");
+class IEEETest
+    implements SearchBasedFetcherCapabilityTest, PagedSearchFetcherTest {
+
+    private 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;
     private BibEntry entry;
 
     @BeforeEach
     void setUp() {
-        ImportFormatPreferences importFormatPreferences = mock(ImportFormatPreferences.class, Answers.RETURNS_DEEP_STUBS);
-        when(importFormatPreferences.bibEntryPreferences().getKeywordSeparator()).thenReturn(',');
+        ImportFormatPreferences importFormatPreferences = mock(
+            ImportFormatPreferences.class,
+            Answers.RETURNS_DEEP_STUBS
+        );
+        when(
+            importFormatPreferences.bibEntryPreferences().getKeywordSeparator()
+        )
+            .thenReturn(',');
 
-        ImporterPreferences importerPreferences = mock(ImporterPreferences.class);
-        when(importerPreferences.getApiKeys()).thenReturn(FXCollections.emptyObservableSet());
+        ImporterPreferences importerPreferences = mock(
+            ImporterPreferences.class
+        );
+        when(importerPreferences.getApiKeys())
+            .thenReturn(FXCollections.emptyObservableSet());
 
         fetcher = new IEEE(importFormatPreferences, importerPreferences);
         entry = new BibEntry();
@@ -62,42 +86,87 @@ void setUp() {
     @Test
     void findByDOI() throws Exception {
         entry.setField(StandardField.DOI, "10.1109/ACCESS.2016.2535486");
-        assertEquals(Optional.of(new URL("https://ieeexplore.ieee.org/ielx7/6287639/7419931/07421926.pdf?tp=&arnumber=7421926&isnumber=7419931&ref=")),
-                fetcher.findFullText(entry));
+        assertEquals(
+            Optional.of(
+                new URL(
+                    "https://ieeexplore.ieee.org/ielx7/6287639/7419931/07421926.pdf?tp=&arnumber=7421926&isnumber=7419931&ref="
+                )
+            ),
+            fetcher.findFullText(entry)
+        );
     }
 
     @Test
     void findByDocumentUrl() throws Exception {
-        entry.setField(StandardField.URL, "https://ieeexplore.ieee.org/document/7421926/");
-        assertEquals(Optional.of(new URL("https://ieeexplore.ieee.org/ielx7/6287639/7419931/07421926.pdf?tp=&arnumber=7421926&isnumber=7419931&ref=")),
-                fetcher.findFullText(entry));
+        entry.setField(
+            StandardField.URL,
+            "https://ieeexplore.ieee.org/document/7421926/"
+        );
+        assertEquals(
+            Optional.of(
+                new URL(
+                    "https://ieeexplore.ieee.org/ielx7/6287639/7419931/07421926.pdf?tp=&arnumber=7421926&isnumber=7419931&ref="
+                )
+            ),
+            fetcher.findFullText(entry)
+        );
     }
 
     @Test
     void findByURL() throws Exception {
-        entry.setField(StandardField.URL, "https://ieeexplore.ieee.org/stamp/stamp.jsp?tp=&arnumber=7421926&ref=");
-        assertEquals(Optional.of(new URL("https://ieeexplore.ieee.org/ielx7/6287639/7419931/07421926.pdf?tp=&arnumber=7421926&isnumber=7419931&ref=")),
-                fetcher.findFullText(entry));
+        entry.setField(
+            StandardField.URL,
+            "https://ieeexplore.ieee.org/stamp/stamp.jsp?tp=&arnumber=7421926&ref="
+        );
+        assertEquals(
+            Optional.of(
+                new URL(
+                    "https://ieeexplore.ieee.org/ielx7/6287639/7419931/07421926.pdf?tp=&arnumber=7421926&isnumber=7419931&ref="
+                )
+            ),
+            fetcher.findFullText(entry)
+        );
     }
 
     @Test
     void findByOldURL() throws Exception {
-        entry.setField(StandardField.URL, "https://ieeexplore.ieee.org/stamp/stamp.jsp?arnumber=7421926");
-        assertEquals(Optional.of(new URL("https://ieeexplore.ieee.org/ielx7/6287639/7419931/07421926.pdf?tp=&arnumber=7421926&isnumber=7419931&ref=")),
-                fetcher.findFullText(entry));
+        entry.setField(
+            StandardField.URL,
+            "https://ieeexplore.ieee.org/stamp/stamp.jsp?arnumber=7421926"
+        );
+        assertEquals(
+            Optional.of(
+                new URL(
+                    "https://ieeexplore.ieee.org/ielx7/6287639/7419931/07421926.pdf?tp=&arnumber=7421926&isnumber=7419931&ref="
+                )
+            ),
+            fetcher.findFullText(entry)
+        );
     }
 
     @Test
     void findByDOIButNotURL() throws Exception {
         entry.setField(StandardField.DOI, "10.1109/ACCESS.2016.2535486");
-        entry.setField(StandardField.URL, "http://dx.doi.org/10.1109/ACCESS.2016.2535486");
-        assertEquals(Optional.of(new URL("https://ieeexplore.ieee.org/ielx7/6287639/7419931/07421926.pdf?tp=&arnumber=7421926&isnumber=7419931&ref=")),
-                fetcher.findFullText(entry));
+        entry.setField(
+            StandardField.URL,
+            "http://dx.doi.org/10.1109/ACCESS.2016.2535486"
+        );
+        assertEquals(
+            Optional.of(
+                new URL(
+                    "https://ieeexplore.ieee.org/ielx7/6287639/7419931/07421926.pdf?tp=&arnumber=7421926&isnumber=7419931&ref="
+                )
+            ),
+            fetcher.findFullText(entry)
+        );
     }
 
     @Test
     void notFoundByURL() throws Exception {
-        entry.setField(StandardField.URL, "http://dx.doi.org/10.1109/ACCESS.2016.2535486");
+        entry.setField(
+            StandardField.URL,
+            "http://dx.doi.org/10.1109/ACCESS.2016.2535486"
+        );
         assertEquals(Optional.empty(), fetcher.findFullText(entry));
     }
 
@@ -110,38 +179,62 @@ 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)");
-
-        List<BibEntry> fetchedEntries = fetcher.performSearch("article_number:8801912"); // article number
-        fetchedEntries.forEach(entry -> entry.clearField(StandardField.ABSTRACT)); // Remove abstract due to copyright);
+            .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"
+        ); // article number
+        fetchedEntries.forEach(entry -> entry.clearField(StandardField.ABSTRACT)
+        ); // Remove abstract due to copyright);
         assertEquals(Collections.singletonList(expected), fetchedEntries);
     }
 
     @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));
+        fetchedEntries.forEach(entry -> entry.clearField(StandardField.ABSTRACT)
+        );
         assertEquals(Collections.singletonList(IGOR_NEWCOMERS), fetchedEntries);
     }
 
     @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));
+        fetchedEntries.forEach(entry -> entry.clearField(StandardField.ABSTRACT)
+        );
         assertEquals(Collections.singletonList(IGOR_NEWCOMERS), fetchedEntries);
     }
 
@@ -152,7 +245,12 @@ 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 9d73958d2bc..56335d2fe3b 100644
--- a/src/test/java/org/jabref/logic/importer/fetcher/INSPIREFetcherTest.java
+++ b/src/test/java/org/jabref/logic/importer/fetcher/INSPIREFetcherTest.java
@@ -1,22 +1,20 @@
 package org.jabref.logic.importer.fetcher;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.mockito.Mockito.mock;
+
 import java.util.Collections;
 import java.util.List;
-
 import org.jabref.logic.importer.ImportFormatPreferences;
 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.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;
-
 @FetcherTest
 class INSPIREFetcherTest {
 
@@ -24,57 +22,85 @@ 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");
-        List<BibEntry> fetchedEntries = fetcher.performSearch("Fréchet group actions field");
+            .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
     public 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");
-        List<BibEntry> fetchedEntries = fetcher.performSearch("\"hep-ph/9802379\"");
+            .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
     public 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");
+            .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/IacrEprintFetcherTest.java b/src/test/java/org/jabref/logic/importer/fetcher/IacrEprintFetcherTest.java
index 2eb837d2364..a93362fd962 100644
--- a/src/test/java/org/jabref/logic/importer/fetcher/IacrEprintFetcherTest.java
+++ b/src/test/java/org/jabref/logic/importer/fetcher/IacrEprintFetcherTest.java
@@ -1,5 +1,12 @@
 package org.jabref.logic.importer.fetcher;
 
+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;
@@ -8,7 +15,6 @@
 import java.util.List;
 import java.util.Optional;
 import java.util.stream.Stream;
-
 import org.jabref.logic.importer.FetcherException;
 import org.jabref.logic.importer.ImportFormatPreferences;
 import org.jabref.model.entry.BibEntry;
@@ -16,7 +22,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 +30,10 @@
 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;
-
 @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."
+)
 public class IacrEprintFetcherTest {
 
     private IacrEprintFetcher fetcher;
@@ -44,104 +44,199 @@ public class IacrEprintFetcherTest {
 
     @BeforeEach
     public void setUp() {
-        fetcher = new IacrEprintFetcher(mock(ImportFormatPreferences.class, Answers.RETURNS_DEEP_STUBS));
+        fetcher =
+            new IacrEprintFetcher(
+                mock(ImportFormatPreferences.class, Answers.RETURNS_DEEP_STUBS)
+            );
 
-        abram2017 = new BibEntry(StandardEntryType.Misc)
+        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.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.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)
+        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.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.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)
+        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.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.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)
+        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.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.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
     public void searchByIdWithValidId1() throws FetcherException {
-        Optional<BibEntry> fetchedEntry = fetcher.performSearchById("Report 2017/1118 ");
-        assertFalse(fetchedEntry.get().getField(StandardField.ABSTRACT).get().isEmpty());
+        Optional<BibEntry> fetchedEntry = fetcher.performSearchById(
+            "Report 2017/1118 "
+        );
+        assertFalse(
+            fetchedEntry.get().getField(StandardField.ABSTRACT).get().isEmpty()
+        );
         fetchedEntry.get().setField(StandardField.ABSTRACT, "dummy");
         assertEquals(Optional.of(abram2017), fetchedEntry);
     }
 
     @Test
     public void searchByIdWithValidId2() throws FetcherException {
-        Optional<BibEntry> fetchedEntry = fetcher.performSearchById("iacr ePrint 2016/119");
-        assertFalse(fetchedEntry.get().getField(StandardField.ABSTRACT).get().isEmpty());
+        Optional<BibEntry> fetchedEntry = fetcher.performSearchById(
+            "iacr ePrint 2016/119"
+        );
+        assertFalse(
+            fetchedEntry.get().getField(StandardField.ABSTRACT).get().isEmpty()
+        );
         fetchedEntry.get().setField(StandardField.ABSTRACT, "dummy");
         assertEquals(Optional.of(beierle2016), fetchedEntry);
     }
 
     @Test
-    public void searchByIdWithValidIdAndNonAsciiChars() throws FetcherException {
-        Optional<BibEntry> fetchedEntry = fetcher.performSearchById("some random 2017/1095 stuff around the id");
-        assertFalse(fetchedEntry.get().getField(StandardField.ABSTRACT).get().isEmpty());
+    public void searchByIdWithValidIdAndNonAsciiChars()
+        throws FetcherException {
+        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);
     }
 
     @Test
     public void searchByIdWithEmptyIdFails() {
-        assertThrows(FetcherException.class, () -> fetcher.performSearchById(""));
+        assertThrows(
+            FetcherException.class,
+            () -> fetcher.performSearchById("")
+        );
     }
 
     @Test
     public void searchByIdWithInvalidReportNumberFails() {
-        assertThrows(FetcherException.class, () -> fetcher.performSearchById("2016/1"));
+        assertThrows(
+            FetcherException.class,
+            () -> fetcher.performSearchById("2016/1")
+        );
     }
 
     @Test
     public void searchByIdWithInvalidYearFails() {
-        assertThrows(FetcherException.class, () -> fetcher.performSearchById("16/115"));
+        assertThrows(
+            FetcherException.class,
+            () -> fetcher.performSearchById("16/115")
+        );
     }
 
     @Test
     public void searchByIdWithInvalidIdFails() {
-        assertThrows(FetcherException.class, () -> fetcher.performSearchById("asdf"));
+        assertThrows(
+            FetcherException.class,
+            () -> fetcher.performSearchById("asdf")
+        );
     }
 
     @Test
     public void searchForNonexistentIdFails() {
-        assertThrows(FetcherException.class, () -> fetcher.performSearchById("2016/6425"));
+        assertThrows(
+            FetcherException.class,
+            () -> fetcher.performSearchById("2016/6425")
+        );
     }
 
     @Test
@@ -151,25 +246,51 @@ public void testGetName() {
 
     @Test
     public void searchByIdForWithdrawnPaperFails() {
-        assertThrows(FetcherException.class, () -> fetcher.performSearchById("1998/016"));
+        assertThrows(
+            FetcherException.class,
+            () -> fetcher.performSearchById("1998/016")
+        );
     }
 
     @Test
-    public void searchByIdWithOldHtmlFormatAndCheckDate() throws FetcherException {
+    public void searchByIdWithOldHtmlFormatAndCheckDate()
+        throws FetcherException {
         Optional<BibEntry> fetchedEntry = fetcher.performSearchById("1997/006");
-        assertEquals(Optional.of("1997-05-04"), fetchedEntry.get().getField(StandardField.DATE));
+        assertEquals(
+            Optional.of("1997-05-04"),
+            fetchedEntry.get().getField(StandardField.DATE)
+        );
     }
 
     @DisplayName("Get all entries with old HTML format (except withdrawn ones)")
     @ParameterizedTest(name = "Fetch for id: {0}")
     @MethodSource("allNonWithdrawnIdsWithOldHtmlFormat")
     @Disabled("Takes a lot of time - should only be called manually")
-    public void searchByIdWithOldHtmlFormatWithoutDateCheck(String id) throws FetcherException {
+    public 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());
-        assertTrue(fetchedEntry.get().getField(StandardField.DATE).get().length() == 10, "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());
+        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()
+        );
+        assertTrue(
+            fetchedEntry.get().getField(StandardField.DATE).get().length() ==
+            10,
+            "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 +324,22 @@ private static Stream<String> allNonWithdrawnIdsWithOldHtmlFormat() {
     @Test
     public 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
-    public void getFulltextWithoutVersion() throws FetcherException, IOException {
+    public 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
@@ -223,7 +353,13 @@ public void getFulltextWithoutUrl() throws FetcherException, IOException {
     @Test
     public void getFulltextWithNonIACRUrl() throws IOException {
         BibEntry abram2017WithNonIACRUrl = abram2017;
-        abram2017WithNonIACRUrl.setField(StandardField.URL, "https://example.com");
-        assertThrows(FetcherException.class, () -> fetcher.findFullText(abram2017WithNonIACRUrl));
+        abram2017WithNonIACRUrl.setField(
+            StandardField.URL,
+            "https://example.com"
+        );
+        assertThrows(
+            FetcherException.class,
+            () -> fetcher.findFullText(abram2017WithNonIACRUrl)
+        );
     }
 }
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 684e01ecc63..6438cb9e634 100644
--- a/src/test/java/org/jabref/logic/importer/fetcher/IssnFetcherTest.java
+++ b/src/test/java/org/jabref/logic/importer/fetcher/IssnFetcherTest.java
@@ -1,22 +1,20 @@
 package org.jabref.logic.importer.fetcher;
 
+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;
-
 import org.jabref.logic.importer.FetcherException;
 import org.jabref.logic.importer.ImportFormatPreferences;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.field.StandardField;
 import org.jabref.preferences.BibEntryPreferences;
 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;
-
 @FetcherTest
 class IssnFetcherTest {
 
@@ -25,15 +23,21 @@ class IssnFetcherTest {
 
     @BeforeEach
     void setUp() {
-        ImportFormatPreferences importPrefs = mock(ImportFormatPreferences.class);
+        ImportFormatPreferences importPrefs = mock(
+            ImportFormatPreferences.class
+        );
         BibEntryPreferences bibEntryPrefs = mock(BibEntryPreferences.class);
         when(importPrefs.bibEntryPreferences()).thenReturn(bibEntryPrefs);
 
         fetcher = new IssnFetcher();
 
-        bibEntry = new BibEntry()
+        bibEntry =
+            new BibEntry()
                 .withField(StandardField.ISSN, "15454509")
-                .withField(StandardField.JOURNALTITLE, "Annual Review of Biochemistry")
+                .withField(
+                    StandardField.JOURNALTITLE,
+                    "Annual Review of Biochemistry"
+                )
                 .withField(StandardField.PUBLISHER, "Annual Reviews Inc.");
     }
 
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 0bda1a9a216..94189329a0e 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,14 @@
 package org.jabref.logic.importer.fetcher;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.mockito.Mockito.mock;
+
 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 org.jabref.logic.importer.ImportFormatPreferences;
 import org.jabref.logic.importer.SearchBasedFetcher;
 import org.jabref.model.entry.BibEntry;
@@ -14,51 +16,72 @@
 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;
-
 @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 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");
+        .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");
+        .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);
     }
 
@@ -72,14 +95,27 @@ 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(new URL("https://www.jstor.org/stable/pdf/90002164.pdf")), url);
+        assertEquals(
+            Optional.of(
+                new URL("https://www.jstor.org/stable/pdf/90002164.pdf")
+            ),
+            url
+        );
     }
 
     @Override
@@ -100,16 +136,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 978dd23c096..e3e668a6cba 100644
--- a/src/test/java/org/jabref/logic/importer/fetcher/LOBIDFetcherTest.java
+++ b/src/test/java/org/jabref/logic/importer/fetcher/LOBIDFetcherTest.java
@@ -1,8 +1,10 @@
 package org.jabref.logic.importer.fetcher;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.mockito.Mockito.mock;
+
 import java.util.Collections;
 import java.util.List;
-
 import org.jabref.logic.importer.ImporterPreferences;
 import org.jabref.logic.importer.PagedSearchBasedFetcher;
 import org.jabref.logic.importer.SearchBasedFetcher;
@@ -10,16 +12,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.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;
-
 @FetcherTest
-class LOBIDFetcherTest implements SearchBasedFetcherCapabilityTest, PagedSearchFetcherTest {
+class LOBIDFetcherTest
+    implements SearchBasedFetcherCapabilityTest, PagedSearchFetcherTest {
 
     ImporterPreferences importerPreferences = mock(ImporterPreferences.class);
     LOBIDFetcher fetcher;
@@ -32,48 +31,83 @@ void setUp() {
     @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");
+            .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");
+            .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);
+            .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
+        );
     }
 
     @Test
@@ -83,9 +117,10 @@ void searchByEmptyQueryFindsNothing() throws Exception {
 
     @Test
     @Override
-    @Disabled("Results returned contain a few incorrect years. The majority are accurate")
-    public void supportsYearSearch() {
-    }
+    @Disabled(
+        "Results returned contain a few incorrect years. The majority are accurate"
+    )
+    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 b995165689b..25d9181ce87 100644
--- a/src/test/java/org/jabref/logic/importer/fetcher/LibraryOfCongressTest.java
+++ b/src/test/java/org/jabref/logic/importer/fetcher/LibraryOfCongressTest.java
@@ -1,7 +1,11 @@
 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 java.util.Optional;
 import org.jabref.logic.importer.FetcherClientException;
 import org.jabref.logic.importer.ImportFormatPreferences;
 import org.jabref.model.entry.BibEntry;
@@ -9,15 +13,9 @@
 import org.jabref.model.entry.field.UnknownField;
 import org.jabref.preferences.BibEntryPreferences;
 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;
-
 @FetcherTest
 public class LibraryOfCongressTest {
 
@@ -25,9 +23,15 @@ public class LibraryOfCongressTest {
 
     @BeforeEach
     public void setUp() {
-        ImportFormatPreferences importFormatPreferences = mock(ImportFormatPreferences.class);
-        when(importFormatPreferences.bibEntryPreferences()).thenReturn(mock(BibEntryPreferences.class));
-        when(importFormatPreferences.bibEntryPreferences().getKeywordSeparator()).thenReturn(',');
+        ImportFormatPreferences importFormatPreferences = mock(
+            ImportFormatPreferences.class
+        );
+        when(importFormatPreferences.bibEntryPreferences())
+            .thenReturn(mock(BibEntryPreferences.class));
+        when(
+            importFormatPreferences.bibEntryPreferences().getKeywordSeparator()
+        )
+            .thenReturn(',');
 
         fetcher = new LibraryOfCongress(importFormatPreferences);
     }
@@ -35,21 +39,30 @@ public void setUp() {
     @Test
     public 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");
+            .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"));
+        assertEquals(
+            Optional.of(expected),
+            fetcher.performSearchById("2010045158")
+        );
     }
 
     @Test
@@ -59,6 +72,9 @@ public void performSearchByEmptyId() throws Exception {
 
     @Test
     public void performSearchByInvalidId() {
-        assertThrows(FetcherClientException.class, () -> fetcher.performSearchById("xxx"));
+        assertThrows(
+            FetcherClientException.class,
+            () -> fetcher.performSearchById("xxx")
+        );
     }
 }
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 a4439ef9a67..32b39167a92 100644
--- a/src/test/java/org/jabref/logic/importer/fetcher/MathSciNetTest.java
+++ b/src/test/java/org/jabref/logic/importer/fetcher/MathSciNetTest.java
@@ -1,25 +1,23 @@
 package org.jabref.logic.importer.fetcher;
 
+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.util.Collections;
 import java.util.List;
 import java.util.Optional;
-
 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.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;
-
 @FetcherTest
 class MathSciNetTest {
 
@@ -28,23 +26,41 @@ class MathSciNetTest {
 
     @BeforeEach
     void setUp() throws Exception {
-        ImportFormatPreferences importFormatPreferences = mock(ImportFormatPreferences.class, Answers.RETURNS_DEEP_STUBS);
-        when(importFormatPreferences.bibEntryPreferences().getKeywordSeparator()).thenReturn(',');
+        ImportFormatPreferences importFormatPreferences = mock(
+            ImportFormatPreferences.class,
+            Answers.RETURNS_DEEP_STUBS
+        );
+        when(
+            importFormatPreferences.bibEntryPreferences().getKeywordSeparator()
+        )
+            .thenReturn(',');
 
         fetcher = new MathSciNet(importFormatPreferences);
 
         ratiuEntry = new BibEntry();
         ratiuEntry.setType(StandardEntryType.Article);
         ratiuEntry.setCitationKey("MR3537908");
-        ratiuEntry.setField(StandardField.AUTHOR, "Chechkin, Gregory A. and Ratiu, Tudor S. and Romanov, Maxim S. and Samokhin, Vyacheslav N.");
-        ratiuEntry.setField(StandardField.TITLE, "Existence and uniqueness theorems for the two-dimensional {E}ricksen-{L}eslie system");
-        ratiuEntry.setField(StandardField.JOURNAL, "Journal of Mathematical Fluid Mechanics");
+        ratiuEntry.setField(
+            StandardField.AUTHOR,
+            "Chechkin, Gregory A. and Ratiu, Tudor S. and Romanov, Maxim S. and Samokhin, Vyacheslav N."
+        );
+        ratiuEntry.setField(
+            StandardField.TITLE,
+            "Existence and uniqueness theorems for the two-dimensional {E}ricksen-{L}eslie system"
+        );
+        ratiuEntry.setField(
+            StandardField.JOURNAL,
+            "Journal of Mathematical Fluid Mechanics"
+        );
         ratiuEntry.setField(StandardField.VOLUME, "18");
         ratiuEntry.setField(StandardField.YEAR, "2016");
         ratiuEntry.setField(StandardField.NUMBER, "3");
         ratiuEntry.setField(StandardField.PAGES, "571--589");
         ratiuEntry.setField(StandardField.ISSN, "1422-6928,1422-6952");
-        ratiuEntry.setField(StandardField.KEYWORDS, "76A15 (35A01 35A02 35K61 82D30)");
+        ratiuEntry.setField(
+            StandardField.KEYWORDS,
+            "76A15 (35A01 35A02 35K61 82D30)"
+        );
         ratiuEntry.setField(StandardField.MR_NUMBER, "3537908");
         ratiuEntry.setField(StandardField.DOI, "10.1007/s00021-016-0250-0");
     }
@@ -61,7 +77,9 @@ void searchByEntryFindsEntry() throws Exception {
     }
 
     @Test
-    @DisabledOnCIServer("CI server has no subscription to MathSciNet and thus gets 401 response")
+    @DisabledOnCIServer(
+        "CI server has no subscription to MathSciNet and thus gets 401 response"
+    )
     void searchByIdInEntryFindsEntry() throws Exception {
         BibEntry searchEntry = new BibEntry();
         searchEntry.setField(StandardField.MR_NUMBER, "3537908");
@@ -71,15 +89,21 @@ void searchByIdInEntryFindsEntry() throws Exception {
     }
 
     @Test
-    @DisabledOnCIServer("CI server has no subscription to MathSciNet and thus gets 401 response")
+    @DisabledOnCIServer(
+        "CI server has no subscription to MathSciNet and thus gets 401 response"
+    )
     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());
         assertEquals(ratiuEntry, fetchedEntries.get(1));
     }
 
     @Test
-    @DisabledOnCIServer("CI server has no subscription to MathSciNet and thus gets 401 response")
+    @DisabledOnCIServer(
+        "CI server has no subscription to MathSciNet and thus gets 401 response"
+    )
     void searchByIdFindsEntry() throws Exception {
         Optional<BibEntry> fetchedEntry = fetcher.performSearchById("3537908");
         assertEquals(Optional.of(ratiuEntry), fetchedEntry);
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 65573de7c5e..b979d6a928c 100644
--- a/src/test/java/org/jabref/logic/importer/fetcher/MedlineFetcherTest.java
+++ b/src/test/java/org/jabref/logic/importer/fetcher/MedlineFetcherTest.java
@@ -1,23 +1,21 @@
 package org.jabref.logic.importer.fetcher;
 
+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;
-
 import org.jabref.logic.importer.FetcherClientException;
 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.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;
-
 @FetcherTest
 public class MedlineFetcherTest {
 
@@ -34,8 +32,12 @@ public 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")
+        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")
@@ -50,13 +52,23 @@ public void setUp() throws InterruptedException {
                 .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.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")
+        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")
@@ -64,8 +76,14 @@ public void setUp() throws InterruptedException {
                 .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(
+                    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")
@@ -77,9 +95,16 @@ public void setUp() throws InterruptedException {
                 .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")
+        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")
@@ -90,7 +115,10 @@ public void setUp() throws InterruptedException {
                 .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.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")
@@ -98,21 +126,37 @@ public void setUp() throws InterruptedException {
                 .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.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")
+        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.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")
@@ -121,7 +165,10 @@ public void setUp() throws InterruptedException {
                 .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.TITLE,
+                    "TOXOPLASMA AND VIRAL ANTIBODIES AMONG HIV PATIENTS AND INMATES IN CENTRAL JAVA, INDONESIA."
+                )
                 .withField(StandardField.VOLUME, "46")
                 .withField(StandardField.YEAR, "2015");
     }
@@ -176,26 +223,38 @@ public void testMultipleEntries() throws Exception {
 
     @Test
     public void testWithLuceneQueryAuthorDate() throws Exception {
-        List<BibEntry> entryList = fetcher.performSearch("author:vigmond AND year:2021");
+        List<BibEntry> entryList = fetcher.performSearch(
+            "author:vigmond AND year:2021"
+        );
         entryList.forEach(entry -> entry.clearField(StandardField.ABSTRACT)); // Remove abstract due to copyright);
         assertEquals(18, entryList.size());
     }
 
     @Test
     public void testWithLuceneQueryAuthorDateRange() throws Exception {
-        List<BibEntry> entryList = fetcher.performSearch("author:vigmond AND year-range:2020-2021");
+        List<BibEntry> entryList = fetcher.performSearch(
+            "author:vigmond AND year-range:2020-2021"
+        );
         entryList.forEach(entry -> entry.clearField(StandardField.ABSTRACT)); // Remove abstract due to copyright);
         assertEquals(28, entryList.size());
     }
 
     @Test
     public void testInvalidSearchTerm() 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
     public void testEmptyEntryList() throws Exception {
-        List<BibEntry> entryList = fetcher.performSearch("java is fantastic and awesome ");
+        List<BibEntry> entryList = fetcher.performSearch(
+            "java is fantastic and awesome "
+        );
         assertEquals(Collections.emptyList(), entryList);
     }
 
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 3d940312fa1..3d06819d640 100644
--- a/src/test/java/org/jabref/logic/importer/fetcher/MedraTest.java
+++ b/src/test/java/org/jabref/logic/importer/fetcher/MedraTest.java
@@ -1,23 +1,21 @@
 package org.jabref.logic.importer.fetcher;
 
+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;
-
 import org.jabref.logic.importer.FetcherClientException;
 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.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;
-
 @FetcherTest
 public class MedraTest {
 
@@ -25,49 +23,84 @@ public class MedraTest {
 
     private static Stream<Arguments> getDoiBibEntryPairs() {
         return Stream.of(
-                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.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",
-                        Optional.of(
-                                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"))),
-                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.ISSN, "03912639")
-                                        .withField(StandardField.YEAR, "1999")
-                                        .withField(StandardField.DOI, "10.1400/115378")
-                                        .withField(StandardField.JOURNAL, "Otto/Novecento : rivista quadrimestrale di critica e storia letteraria")
-                        ))
+            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.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",
+                Optional.of(
+                    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")
+                )
+            ),
+            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.ISSN, "03912639")
+                        .withField(StandardField.YEAR, "1999")
+                        .withField(StandardField.DOI, "10.1400/115378")
+                        .withField(
+                            StandardField.JOURNAL,
+                            "Otto/Novecento : rivista quadrimestrale di critica e storia letteraria"
+                        )
+                )
+            )
         );
     }
 
@@ -83,12 +116,18 @@ public void testPerformSearchEmptyDOI() throws FetcherException {
 
     @Test
     public void testPerformNonExistent() throws FetcherException {
-        assertThrows(FetcherClientException.class, () -> fetcher.performSearchById("10.1016/j.bjoms.2007.08.004"));
+        assertThrows(
+            FetcherClientException.class,
+            () -> fetcher.performSearchById("10.1016/j.bjoms.2007.08.004")
+        );
     }
 
     @ParameterizedTest
     @MethodSource("getDoiBibEntryPairs")
-    public void testDoiBibEntryPairs(String identifier, Optional<BibEntry> expected) throws FetcherException {
+    public void testDoiBibEntryPairs(
+        String identifier,
+        Optional<BibEntry> expected
+    ) throws FetcherException {
         Optional<BibEntry> fetchedEntry = fetcher.performSearchById(identifier);
         assertEquals(expected, fetchedEntry);
     }
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 830cc5f67b1..ad32e61619b 100644
--- a/src/test/java/org/jabref/logic/importer/fetcher/MrDLibFetcherTest.java
+++ b/src/test/java/org/jabref/logic/importer/fetcher/MrDLibFetcherTest.java
@@ -1,20 +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.assertFalse;
 
+import java.util.List;
 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.preferences.MrDlibPreferences;
 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;
-
 @FetcherTest
 public class MrDLibFetcherTest {
 
@@ -23,10 +21,11 @@ public class MrDLibFetcherTest {
     @BeforeEach
     public void setUp() {
         MrDlibPreferences mrDlibPreferences = new MrDlibPreferences(
-                true,
-                false,
-                false,
-                false);
+            true,
+            false,
+            false,
+            false
+        );
         fetcher = new MrDLibFetcher("", Version.parse(""), mrDlibPreferences);
     }
 
@@ -43,16 +42,31 @@ public void testPerformSearchForHornecker2006() throws FetcherException {
         BibEntry bibEntry = new BibEntry();
         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.AUTHOR,
+            "Hornecker, Eva and Buur, Jacob"
+        );
+        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.URL, "http://doi.acm.org/10.1145/1124772.1124838");
+        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");
 
         List<BibEntry> bibEntrys = fetcher.performSearch(bibEntry);
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 9fa8d7f361e..0c840846ee1 100644
--- a/src/test/java/org/jabref/logic/importer/fetcher/OpenAccessDoiTest.java
+++ b/src/test/java/org/jabref/logic/importer/fetcher/OpenAccessDoiTest.java
@@ -1,18 +1,16 @@
 package org.jabref.logic.importer.fetcher;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
 import java.io.IOException;
 import java.net.URL;
 import java.util.Optional;
-
 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;
-
 @FetcherTest
 class OpenAccessDoiTest {
 
@@ -28,7 +26,14 @@ void setUp() {
     @Test
     void findByDOI() throws IOException {
         entry.setField(StandardField.DOI, "10.1038/nature12373");
-        assertEquals(Optional.of(new URL("https://dash.harvard.edu/bitstream/1/12285462/1/Nanometer-Scale%20Thermometry.pdf")), finder.findFullText(entry));
+        assertEquals(
+            Optional.of(
+                new URL(
+                    "https://dash.harvard.edu/bitstream/1/12285462/1/Nanometer-Scale%20Thermometry.pdf"
+                )
+            ),
+            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 43902fe9fa2..3fe5b90623a 100644
--- a/src/test/java/org/jabref/logic/importer/fetcher/PagedSearchFetcherTest.java
+++ b/src/test/java/org/jabref/logic/importer/fetcher/PagedSearchFetcherTest.java
@@ -1,26 +1,26 @@
 package org.jabref.logic.importer.fetcher;
 
+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.assertFalse;
-
 /**
  * This interface provides general test methods for paged fetchers
  */
 public interface PagedSearchFetcherTest {
-
     /**
      * Ensure that different page return different entries
      */
     @Test
     default void pageSearchReturnsUniqueResultsPerPage() throws Exception {
         String query = "Software";
-        Page<BibEntry> firstPage = getPagedFetcher().performSearchPaged(query, 0);
-        Page<BibEntry> secondPage = getPagedFetcher().performSearchPaged(query, 1);
+        Page<BibEntry> firstPage = getPagedFetcher()
+            .performSearchPaged(query, 0);
+        Page<BibEntry> secondPage = getPagedFetcher()
+            .performSearchPaged(query, 1);
 
         for (BibEntry entry : firstPage.getContent()) {
             assertFalse(secondPage.getContent().contains(entry));
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 5c04b29d7ec..d433c596ea1 100644
--- a/src/test/java/org/jabref/logic/importer/fetcher/PicaXmlParserTest.java
+++ b/src/test/java/org/jabref/logic/importer/fetcher/PicaXmlParserTest.java
@@ -1,34 +1,44 @@
 package org.jabref.logic.importer.fetcher;
 
+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;
-
 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;
-
 @FetcherTest
 public class PicaXmlParserTest {
 
-    private void doTest(String xmlName, int expectedSize, List<String> resourceNames) throws Exception {
-        try (InputStream is = PicaXmlParserTest.class.getResourceAsStream(xmlName)) {
+    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);
             assertNotNull(entries);
             assertEquals(expectedSize, entries.size());
             int i = 0;
             for (String resourceName : resourceNames) {
-                BibEntryAssert.assertEquals(PicaXmlParserTest.class, resourceName, entries.get(i));
+                BibEntryAssert.assertEquals(
+                    PicaXmlParserTest.class,
+                    resourceName,
+                    entries.get(i)
+                );
                 i++;
             }
         }
@@ -36,32 +46,63 @@ private void doTest(String xmlName, int expectedSize, List<String> resourceNames
 
     @Test
     public void emptyResult() throws Exception {
-        doTest("gvk_empty_result_because_of_bad_query.xml", 0, Collections.emptyList());
+        doTest(
+            "gvk_empty_result_because_of_bad_query.xml",
+            0,
+            Collections.emptyList()
+        );
     }
 
     @Test
     public 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
     public void testGMP() throws Exception {
-        doTest("gvk_gmp.xml", 2, Arrays.asList("gvk_gmp.1.bib", "gvk_gmp.2.bib"));
+        doTest(
+            "gvk_gmp.xml",
+            2,
+            Arrays.asList("gvk_gmp.1.bib", "gvk_gmp.2.bib")
+        );
     }
 
     @Test
     public 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);
             assertEquals(5, entries.size());
 
-            assertEquals(Optional.empty(), entries.get(0).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.empty(),
+                entries.get(0).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)
+            );
         }
     }
 }
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 5fdccc287c6..6f628a674f2 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,16 @@
 package org.jabref.logic.importer.fetcher;
 
+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.URL;
 import java.util.List;
 import java.util.Optional;
-
+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,51 +19,57 @@
 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;
-
 @FetcherTest
 @DisabledOnCIServer("Blocked by Cloudflare")
 public 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;
 
     @BeforeEach
     public void setUp() {
-        fetcher = new ResearchGate(mock(ImportFormatPreferences.class, Answers.RETURNS_DEEP_STUBS));
+        fetcher =
+            new ResearchGate(
+                mock(ImportFormatPreferences.class, Answers.RETURNS_DEEP_STUBS)
+            );
         entry = new BibEntry(StandardEntryType.InProceedings);
         entry.setField(StandardField.DOI, "10.1109/CSAC.2005.42");
-        entry.setField(StandardField.TITLE, "Paranoid: a global secure file access control system");
+        entry.setField(
+            StandardField.TITLE,
+            "Paranoid: a global secure file access control system"
+        );
     }
 
     @Test
     @DisabledOnCIServer("CI server is unreliable")
     void fullTextFoundByDOI() throws IOException, FetcherException {
-        assertEquals(Optional.of(new URL(URL_PDF)), fetcher.findFullText(entry));
+        assertEquals(
+            Optional.of(new URL(URL_PDF)),
+            fetcher.findFullText(entry)
+        );
     }
 
     @Test
     @DisabledOnCIServer("CI server is unreliable")
     void fullTextNotFoundByDOI() throws IOException, FetcherException {
-        BibEntry entry2 = new BibEntry().withField(StandardField.DOI, "10.1021/bk-2006-WWW.ch014");
+        BibEntry entry2 = new BibEntry()
+            .withField(StandardField.DOI, "10.1021/bk-2006-WWW.ch014");
         assertEquals(Optional.empty(), fetcher.findFullText(entry2));
     }
 
     @Test
     void getDocumentByTitle() throws IOException, NullPointerException {
-        Optional<String> source = fetcher.getURLByString(entry.getTitle().get());
+        Optional<String> source = fetcher.getURLByString(
+            entry.getTitle().get()
+        );
         assertTrue(source.isPresent() && source.get().startsWith(URL_PAGE));
     }
 
@@ -75,67 +87,107 @@ 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");
+            .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);
-        assertEquals(Optional.of(master), fetcher.performSearch(queryNode).stream().findFirst());
+            .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());
+            .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}");
+            .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"))
+        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.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();
+                .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 ac5b57c5587..3ee75b5a5b0 100644
--- a/src/test/java/org/jabref/logic/importer/fetcher/RfcFetcherTest.java
+++ b/src/test/java/org/jabref/logic/importer/fetcher/RfcFetcherTest.java
@@ -1,7 +1,10 @@
 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 java.util.Optional;
 import org.jabref.logic.importer.FetcherClientException;
 import org.jabref.logic.importer.ImportFormatPreferences;
 import org.jabref.model.entry.BibEntry;
@@ -9,34 +12,40 @@
 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;
-
 @FetcherTest
 public class RfcFetcherTest {
 
-    private RfcFetcher fetcher = new RfcFetcher(mock(ImportFormatPreferences.class, Answers.RETURNS_DEEP_STUBS));
+    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.");
+        .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
     public void getNameReturnsEqualIdName() {
@@ -44,46 +53,83 @@ public void getNameReturnsEqualIdName() {
     }
 
     @Test
-    public void performSearchByIdFindsEntryWithDraftIdentifier() throws Exception {
+    public 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");
+            .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
-    @CsvSource({"rfc1945", "RFC1945", "1945"})
-    public void performSearchByIdFindsEntry(String identifier) throws Exception {
-        assertEquals(Optional.of(bibEntry), fetcher.performSearchById(identifier));
+    @CsvSource({ "rfc1945", "RFC1945", "1945" })
+    public void performSearchByIdFindsEntry(String identifier)
+        throws Exception {
+        assertEquals(
+            Optional.of(bibEntry),
+            fetcher.performSearchById(identifier)
+        );
     }
 
     @Test
-    public void performSearchByIdFindsNothingWithoutIdentifier() throws Exception {
+    public void performSearchByIdFindsNothingWithoutIdentifier()
+        throws Exception {
         assertEquals(Optional.empty(), fetcher.performSearchById(""));
     }
 
     @ParameterizedTest
-    @CsvSource({
+    @CsvSource(
+        {
             // syntactically valid identifier
             "draft-test-draft-spec",
             "RFC9999",
             // invalid identifier
-            "banana"})
-    public void performSearchByIdFindsNothingWithValidDraftIdentifier(String identifier) throws Exception {
-        assertThrows(FetcherClientException.class, () -> fetcher.performSearchById(identifier));
+            "banana",
+        }
+    )
+    public 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 0af2c4f0eb4..aa7f9a7b835 100644
--- a/src/test/java/org/jabref/logic/importer/fetcher/ScholarArchiveFetcherTest.java
+++ b/src/test/java/org/jabref/logic/importer/fetcher/ScholarArchiveFetcherTest.java
@@ -1,37 +1,49 @@
 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 java.util.List;
 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.Test;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-
 @FetcherTest
 public class ScholarArchiveFetcherTest {
+
     private ScholarArchiveFetcher fetcher;
     private BibEntry bibEntry;
 
     @BeforeEach
     public void setUp() {
         fetcher = new ScholarArchiveFetcher();
-        bibEntry = new BibEntry(StandardEntryType.InCollection)
-                .withField(StandardField.TITLE, "Query expansion using associated queries")
-                .withField(StandardField.AUTHOR, "Billerbeck, Bodo and Scholer, Falk and Williams, Hugh E. and Zobel, Justin")
+        bibEntry =
+            new BibEntry(StandardEntryType.InCollection)
+                .withField(
+                    StandardField.TITLE,
+                    "Query expansion using associated queries"
+                )
+                .withField(
+                    StandardField.AUTHOR,
+                    "Billerbeck, Bodo and Scholer, Falk and Williams, Hugh E. and Zobel, Justin"
+                )
                 .withField(StandardField.VOLUME, "0")
                 .withField(StandardField.DOI, "10.1145/956863.956866")
-                .withField(StandardField.JOURNAL, "Proceedings of the twelfth international conference on Information and knowledge management - CIKM '03")
+                .withField(
+                    StandardField.JOURNAL,
+                    "Proceedings of the twelfth international conference on Information and knowledge management - CIKM '03"
+                )
                 .withField(StandardField.PUBLISHER, "ACM Press")
                 .withField(StandardField.TYPE, "paper-conference")
                 .withField(StandardField.YEAR, "2003")
-                .withField(StandardField.URL, "https://web.archive.org/web/20170810164449/http://goanna.cs.rmit.edu.au/~jz/fulltext/cikm03.pdf");
+                .withField(
+                    StandardField.URL,
+                    "https://web.archive.org/web/20170810164449/http://goanna.cs.rmit.edu.au/~jz/fulltext/cikm03.pdf"
+                );
     }
 
     @Test
@@ -42,10 +54,11 @@ public void getNameReturnsCorrectName() {
     @Test
     public void performSearchReturnsExpectedResults() throws FetcherException {
         List<BibEntry> fetchedEntries = fetcher.performSearch("query");
-        fetchedEntries.forEach(entry -> entry.clearField(StandardField.ABSTRACT));
-        assertTrue(fetchedEntries.contains(bibEntry), "Found the following entries " + fetchedEntries);
+        fetchedEntries.forEach(entry -> entry.clearField(StandardField.ABSTRACT)
+        );
+        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 1348ef88a6a..cb82e53a469 100644
--- a/src/test/java/org/jabref/logic/importer/fetcher/ScienceDirectTest.java
+++ b/src/test/java/org/jabref/logic/importer/fetcher/ScienceDirectTest.java
@@ -1,34 +1,34 @@
 package org.jabref.logic.importer.fetcher;
 
+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.URL;
 import java.util.Optional;
-
 import javafx.collections.FXCollections;
-
 import org.jabref.logic.importer.ImporterPreferences;
 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.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;
-
 @FetcherTest
 class ScienceDirectTest {
 
-    private final ImporterPreferences importerPreferences = mock(ImporterPreferences.class);
+    private final ImporterPreferences importerPreferences = mock(
+        ImporterPreferences.class
+    );
     private ScienceDirect finder;
     private BibEntry entry;
 
     @BeforeEach
     void setUp() {
-        when(importerPreferences.getApiKeys()).thenReturn(FXCollections.emptyObservableSet());
+        when(importerPreferences.getApiKeys())
+            .thenReturn(FXCollections.emptyObservableSet());
         finder = new ScienceDirect(importerPreferences);
         entry = new BibEntry();
     }
@@ -39,8 +39,12 @@ void findByDoiOldPage() throws IOException {
         entry.setField(StandardField.DOI, "10.1016/j.jrmge.2015.08.004");
 
         assertEquals(
-                Optional.of(new URL("https://www.sciencedirect.com/science/article/pii/S1674775515001079/pdfft?md5=2b19b19a387cffbae237ca6a987279df&pid=1-s2.0-S1674775515001079-main.pdf")),
-                finder.findFullText(entry)
+            Optional.of(
+                new URL(
+                    "https://www.sciencedirect.com/science/article/pii/S1674775515001079/pdfft?md5=2b19b19a387cffbae237ca6a987279df&pid=1-s2.0-S1674775515001079-main.pdf"
+                )
+            ),
+            finder.findFullText(entry)
         );
     }
 
@@ -50,8 +54,12 @@ void findByDoiNewPage() throws IOException {
         entry.setField(StandardField.DOI, "10.1016/j.aasri.2014.09.002");
 
         assertEquals(
-                Optional.of(new URL("https://www.sciencedirect.com/science/article/pii/S2212671614001024/pdf?md5=4e2e9a369b4d5b3db5100aba599bef8b&pid=1-s2.0-S2212671614001024-main.pdf")),
-                finder.findFullText(entry)
+            Optional.of(
+                new URL(
+                    "https://www.sciencedirect.com/science/article/pii/S2212671614001024/pdf?md5=4e2e9a369b4d5b3db5100aba599bef8b&pid=1-s2.0-S2212671614001024-main.pdf"
+                )
+            ),
+            finder.findFullText(entry)
         );
     }
 
@@ -59,11 +67,18 @@ void findByDoiNewPage() throws IOException {
     @DisabledOnCIServer("CI server is blocked")
     void findByDoiWorksForBoneArticle() throws IOException {
         // The DOI is an example by a user taken from https://github.com/JabRef/jabref/issues/5860
-        entry.setField(StandardField.DOI, "https://doi.org/10.1016/j.bone.2020.115226");
+        entry.setField(
+            StandardField.DOI,
+            "https://doi.org/10.1016/j.bone.2020.115226"
+        );
 
         assertEquals(
-                Optional.of(new URL("https://www.sciencedirect.com/science/article/pii/S8756328220300065/pdfft?md5=0ad75ff155637dec358e5c9fb8b90afd&pid=1-s2.0-S8756328220300065-main.pdf")),
-                finder.findFullText(entry)
+            Optional.of(
+                new URL(
+                    "https://www.sciencedirect.com/science/article/pii/S8756328220300065/pdfft?md5=0ad75ff155637dec358e5c9fb8b90afd&pid=1-s2.0-S8756328220300065-main.pdf"
+                )
+            ),
+            finder.findFullText(entry)
         );
     }
 
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 a93f73bed17..ef5cddf528a 100644
--- a/src/test/java/org/jabref/logic/importer/fetcher/SearchBasedFetcherCapabilityTest.java
+++ b/src/test/java/org/jabref/logic/importer/fetcher/SearchBasedFetcherCapabilityTest.java
@@ -1,24 +1,22 @@
 package org.jabref.logic.importer.fetcher;
 
+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.Collections;
 import java.util.List;
 import java.util.Optional;
 import java.util.StringJoiner;
 import java.util.stream.Collectors;
-
 import org.jabref.logic.importer.ImportCleanup;
 import org.jabref.logic.importer.SearchBasedFetcher;
 import org.jabref.model.database.BibDatabaseMode;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.field.StandardField;
-
 import org.junit.jupiter.api.Assertions;
 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;
-
 /**
  * Defines the set of capability tests that each tests a given search capability, e.g. author based search.
  * The idea is to code the capabilities of a fetcher into Java code.
@@ -26,16 +24,20 @@
  * and b) the queries sent to the fetchers can be debugged directly without a route through to some fetcher code.
  */
 interface SearchBasedFetcherCapabilityTest {
-
     /**
      * Test whether the library API supports author field search.
      */
     @Test
     default void supportsAuthorSearch() throws Exception {
-        StringJoiner queryBuilder = new StringJoiner("\" AND author:\"", "author:\"", "\"");
+        StringJoiner queryBuilder = new StringJoiner(
+            "\" AND author:\"",
+            "author:\"",
+            "\""
+        );
         getTestAuthors().forEach(queryBuilder::add);
 
-        List<BibEntry> result = getFetcher().performSearch(queryBuilder.toString());
+        List<BibEntry> result = getFetcher()
+            .performSearch(queryBuilder.toString());
         ImportCleanup.targeting(BibDatabaseMode.BIBTEX).doPostCleanup(result);
 
         assertFalse(result.isEmpty());
@@ -43,7 +45,12 @@ default void supportsAuthorSearch() throws Exception {
             String author = bibEntry.getField(StandardField.AUTHOR).orElse("");
 
             // The co-authors differ, thus we check for the author present at all papers
-            getTestAuthors().forEach(expectedAuthor -> Assertions.assertTrue(author.contains(expectedAuthor.replace("\"", ""))));
+            getTestAuthors()
+                .forEach(expectedAuthor ->
+                    Assertions.assertTrue(
+                        author.contains(expectedAuthor.replace("\"", ""))
+                    )
+                );
         });
     }
 
@@ -52,16 +59,21 @@ default void supportsAuthorSearch() throws Exception {
      */
     @Test
     default void supportsYearSearch() throws Exception {
-        List<BibEntry> result = getFetcher().performSearch("year:" + getTestYear());
+        List<BibEntry> result = getFetcher()
+            .performSearch("year:" + getTestYear());
         ImportCleanup.targeting(BibDatabaseMode.BIBTEX).doPostCleanup(result);
-        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);
+        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
+        );
     }
 
     /**
@@ -71,14 +83,16 @@ default void supportsYearSearch() throws Exception {
     default void supportsYearRangeSearch() throws Exception {
         List<String> yearsInYearRange = List.of("2018", "2019", "2020");
 
-        List<BibEntry> result = getFetcher().performSearch("year-range:2018-2020");
+        List<BibEntry> result = getFetcher()
+            .performSearch("year-range:2018-2020");
         ImportCleanup.targeting(BibDatabaseMode.BIBTEX).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));
     }
@@ -91,13 +105,16 @@ default void supportsYearRangeSearch() throws Exception {
      */
     @Test
     default void supportsJournalSearch() throws Exception {
-        List<BibEntry> result = getFetcher().performSearch("journal:\"" + getTestJournal() + "\"");
+        List<BibEntry> result = getFetcher()
+            .performSearch("journal:\"" + getTestJournal() + "\"");
         ImportCleanup.targeting(BibDatabaseMode.BIBTEX).doPostCleanup(result);
 
         assertFalse(result.isEmpty());
         result.forEach(bibEntry -> {
             assertTrue(bibEntry.hasField(StandardField.JOURNAL));
-            String journal = bibEntry.getField(StandardField.JOURNAL).orElse("");
+            String journal = bibEntry
+                .getField(StandardField.JOURNAL)
+                .orElse("");
             assertTrue(journal.contains(getTestJournal().replace("\"", "")));
         });
     }
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 806f400009c..422c34b99c7 100644
--- a/src/test/java/org/jabref/logic/importer/fetcher/SemanticScholarTest.java
+++ b/src/test/java/org/jabref/logic/importer/fetcher/SemanticScholarTest.java
@@ -1,5 +1,8 @@
 package org.jabref.logic.importer.fetcher;
 
+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;
@@ -8,7 +11,9 @@
 import java.util.Collections;
 import java.util.List;
 import java.util.Optional;
-
+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,30 +22,40 @@
 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.Test;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.mockito.Mockito.mock;
-
 @FetcherTest
 public class SemanticScholarTest implements PagedSearchFetcherTest {
 
-    private static final String DOI = "10.23919/IFIPNetworking52078.2021.9472772";
-
-    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 static final String DOI =
+        "10.23919/IFIPNetworking52078.2021.9472772";
+
+    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 SemanticScholar fetcher;
     private BibEntry entry;
@@ -54,9 +69,13 @@ void setUp() {
     @Test
     void getDocument() throws IOException, FetcherException {
         String source = fetcher.getURLBySource(
-                String.format("https://api.semanticscholar.org/v1/paper/%s", DOI));
+            String.format("https://api.semanticscholar.org/v1/paper/%s", DOI)
+        );
 
-        assertEquals("https://www.semanticscholar.org/paper/7f7b38604a2c167f6d5fb1c5dffcbb127d0525c0", source);
+        assertEquals(
+            "https://www.semanticscholar.org/paper/7f7b38604a2c167f6d5fb1c5dffcbb127d0525c0",
+            source
+        );
     }
 
     @Test
@@ -64,8 +83,11 @@ void getDocument() throws IOException, FetcherException {
     void fullTextFindByDOI() throws Exception {
         entry.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)
         );
     }
 
@@ -73,15 +95,22 @@ void fullTextFindByDOI() throws Exception {
     @DisabledOnCIServer("CI server is unreliable")
     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
     @DisabledOnCIServer("CI server is unreliable")
     void fullTextSearchOnEmptyEntry() throws IOException, FetcherException {
-
         assertEquals(Optional.empty(), fetcher.findFullText(new BibEntry()));
     }
 
@@ -97,11 +126,13 @@ void fullTextNotFoundByDOI() throws IOException, FetcherException {
     @Test
     @DisabledOnCIServer("CI server is unreliable")
     void fullTextFindByArXiv() throws Exception {
-        entry = new BibEntry().withField(StandardField.EPRINT, "1407.3561")
-                              .withField(StandardField.ARCHIVEPREFIX, "arXiv");
+        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)
+            Optional.of(new URI("https://arxiv.org/pdf/1407.3561.pdf").toURL()),
+            fetcher.findFullText(entry)
         );
     }
 
@@ -121,41 +152,60 @@ 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+engineering&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+engineering&offset=0&limit=20&fields=paperId%2CexternalIds%2Curl%2Ctitle%2Cabstract%2Cvenue%2Cyear%2Cauthors",
+            url.toString()
+        );
     }
 
     @Test
     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");
+            .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));
+        fetchedEntries.forEach(entry -> entry.clearField(StandardField.ABSTRACT)
+        );
         assertEquals(Collections.singletonList(master), fetchedEntries);
     }
 
     @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));
+        fetchedEntries.forEach(entry -> entry.clearField(StandardField.ABSTRACT)
+        );
         assertEquals(Collections.singletonList(IGOR_NEWCOMERS), fetchedEntries);
     }
 
     @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));
+        fetchedEntries.forEach(entry -> entry.clearField(StandardField.ABSTRACT)
+        );
         assertEquals(Collections.singletonList(IGOR_NEWCOMERS), fetchedEntries);
     }
 
@@ -167,14 +217,29 @@ public void performSearchByEmptyQuery() throws Exception {
     @Test
     public 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");
-
-        entry.withField(StandardField.TITLE, "Formalising BPMN Service Interaction Patterns");
+            .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"
+            );
+
+        entry.withField(
+            StandardField.TITLE,
+            "Formalising BPMN Service Interaction Patterns"
+        );
         BibEntry actual = fetcher.performSearch(entry).get(0);
         // 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 275642794f3..823ac3ec7f7 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,15 @@
 package org.jabref.logic.importer.fetcher;
 
+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;
-
 import javafx.collections.FXCollections;
-
+import kong.unirest.json.JSONObject;
 import org.jabref.logic.importer.ImporterPreferences;
 import org.jabref.logic.importer.PagedSearchBasedFetcher;
 import org.jabref.logic.importer.SearchBasedFetcher;
@@ -13,141 +17,230 @@
 import org.jabref.model.entry.field.StandardField;
 import org.jabref.model.entry.types.StandardEntryType;
 import org.jabref.testutils.category.FetcherTest;
-
-import kong.unirest.json.JSONObject;
 import org.junit.jupiter.api.Assertions;
 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;
-
 @FetcherTest
-class SpringerFetcherTest implements SearchBasedFetcherCapabilityTest, PagedSearchFetcherTest {
+class SpringerFetcherTest
+    implements SearchBasedFetcherCapabilityTest, PagedSearchFetcherTest {
 
     ImporterPreferences importerPreferences = mock(ImporterPreferences.class);
     SpringerFetcher fetcher;
 
     @BeforeEach
     void setUp() {
-        when(importerPreferences.getApiKeys()).thenReturn(FXCollections.emptyObservableSet());
+        when(importerPreferences.getApiKeys())
+            .thenReturn(FXCollections.emptyObservableSet());
         fetcher = new SpringerFetcher(importerPreferences);
     }
 
     @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.");
+            .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.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.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.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.");
+            .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.");
+            .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.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.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.");
+            .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.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.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.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.");
+            .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);
+        List<BibEntry> fetchedEntries = fetcher.performSearch(
+            "JabRef Social Barriers Steinmacher"
+        );
+        assertEquals(
+            List.of(
+                articleTagThatIssue,
+                fourthArticle,
+                thirdArticle,
+                firstArticle,
+                secondArticle
+            ),
+            fetchedEntries
+        );
     }
 
     @Test
     void testSpringerJSONToBibtex() {
-        String jsonString = """
-                {\r
-                            "identifier":"doi:10.1007/BF01201962",\r
-                            "title":"Book reviews",\r
-                            "publicationName":"World Journal of Microbiology & Biotechnology",\r
-                            "issn":"1573-0972",\r
-                            "isbn":"",\r
-                            "doi":"10.1007/BF01201962",\r
-                            "publisher":"Springer",\r
-                            "publicationDate":"1992-09-01",\r
-                            "volume":"8",\r
-                            "number":"5",\r
-                            "startingPage":"550",\r
-                            "url":"http://dx.doi.org/10.1007/BF01201962","copyright":"©1992 Rapid Communications of Oxford Ltd."\r
-                        }""";
+        String jsonString =
+            """
+            {\r
+                        "identifier":"doi:10.1007/BF01201962",\r
+                        "title":"Book reviews",\r
+                        "publicationName":"World Journal of Microbiology & Biotechnology",\r
+                        "issn":"1573-0972",\r
+                        "isbn":"",\r
+                        "doi":"10.1007/BF01201962",\r
+                        "publisher":"Springer",\r
+                        "publicationDate":"1992-09-01",\r
+                        "volume":"8",\r
+                        "number":"5",\r
+                        "startingPage":"550",\r
+                        "url":"http://dx.doi.org/10.1007/BF01201962","copyright":"©1992 Rapid Communications of Oxford Ltd."\r
+                    }""";
 
         JSONObject jsonObject = new JSONObject(jsonString);
-        BibEntry bibEntry = SpringerFetcher.parseSpringerJSONtoBibtex(jsonObject);
-        assertEquals(Optional.of("1992"), bibEntry.getField(StandardField.YEAR));
+        BibEntry bibEntry = SpringerFetcher.parseSpringerJSONtoBibtex(
+            jsonObject
+        );
+        assertEquals(
+            Optional.of("1992"),
+            bibEntry.getField(StandardField.YEAR)
+        );
         assertEquals(Optional.of("5"), bibEntry.getField(StandardField.NUMBER));
-        assertEquals(Optional.of("#sep#"), bibEntry.getField(StandardField.MONTH));
-        assertEquals(Optional.of("10.1007/BF01201962"), bibEntry.getField(StandardField.DOI));
+        assertEquals(
+            Optional.of("#sep#"),
+            bibEntry.getField(StandardField.MONTH)
+        );
+        assertEquals(
+            Optional.of("10.1007/BF01201962"),
+            bibEntry.getField(StandardField.DOI)
+        );
         assertEquals(Optional.of("8"), bibEntry.getField(StandardField.VOLUME));
-        assertEquals(Optional.of("Springer"), bibEntry.getField(StandardField.PUBLISHER));
-        assertEquals(Optional.of("1992-09-01"), bibEntry.getField(StandardField.DATE));
+        assertEquals(
+            Optional.of("Springer"),
+            bibEntry.getField(StandardField.PUBLISHER)
+        );
+        assertEquals(
+            Optional.of("1992-09-01"),
+            bibEntry.getField(StandardField.DATE)
+        );
     }
 
     @Test
@@ -156,34 +249,50 @@ void searchByEmptyQueryFindsNothing() throws Exception {
     }
 
     @Test
-    @Disabled("Year search is currently broken, because the API returns mutliple years.")
+    @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
     public 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.");
-
-        List<BibEntry> resultPhrase = fetcher.performSearch("author:\"Redmiles David\"");
+            .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");
 
         // Phrase search should be a subset of the normal search result.
@@ -194,19 +303,29 @@ public void supportsPhraseSearch() throws Exception {
 
     @Test
     public 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> resultJustByAuthor = fetcher.performSearch(
+            "author:\"Redmiles, David\""
+        );
+        List<BibEntry> result = fetcher.performSearch(
+            "author:\"Redmiles, David\" AND journal:\"Computer Supported Cooperative Work\""
+        );
 
         Assertions.assertTrue(resultJustByAuthor.containsAll(result));
-        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")));
+        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"))
+            );
     }
 
     @Override
@@ -216,7 +335,11 @@ public SearchBasedFetcher getFetcher() {
 
     @Override
     public List<String> getTestAuthors() {
-        return List.of("Steinmacher, Igor", "Gerosa, Marco", "Conte, Tayana U.");
+        return List.of(
+            "Steinmacher, Igor",
+            "Gerosa, Marco",
+            "Conte, Tayana U."
+        );
     }
 
     @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 67663cc27e6..4f9e1449b66 100644
--- a/src/test/java/org/jabref/logic/importer/fetcher/SpringerLinkTest.java
+++ b/src/test/java/org/jabref/logic/importer/fetcher/SpringerLinkTest.java
@@ -1,42 +1,45 @@
 package org.jabref.logic.importer.fetcher;
 
+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.URL;
 import java.util.Optional;
-
 import javafx.collections.FXCollections;
-
 import org.jabref.logic.importer.ImporterPreferences;
 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.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;
-
 @FetcherTest
 public class SpringerLinkTest {
 
-    private final ImporterPreferences importerPreferences = mock(ImporterPreferences.class);
+    private final ImporterPreferences importerPreferences = mock(
+        ImporterPreferences.class
+    );
     private SpringerLink finder;
     private BibEntry entry;
 
     @BeforeEach
     public void setUp() {
-        when(importerPreferences.getApiKeys()).thenReturn(FXCollections.emptyObservableSet());
+        when(importerPreferences.getApiKeys())
+            .thenReturn(FXCollections.emptyObservableSet());
         finder = new SpringerLink(importerPreferences);
         entry = new BibEntry();
     }
 
     @Test
     public void rejectNullParameter() {
-        assertThrows(NullPointerException.class, () -> finder.findFullText(null));
+        assertThrows(
+            NullPointerException.class,
+            () -> finder.findFullText(null)
+        );
     }
 
     @Test
@@ -49,8 +52,13 @@ public void doiNotPresent() throws IOException {
     public void findByDOI() throws IOException {
         entry.setField(StandardField.DOI, "10.1186/s13677-015-0042-8");
         assertEquals(
-                Optional.of(new URL("http://link.springer.com/content/pdf/10.1186/s13677-015-0042-8.pdf")),
-                finder.findFullText(entry));
+            Optional.of(
+                new URL(
+                    "http://link.springer.com/content/pdf/10.1186/s13677-015-0042-8.pdf"
+                )
+            ),
+            finder.findFullText(entry)
+        );
     }
 
     @DisabledOnCIServer("Disable on CI Server to not hit the API call limit")
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 9a4d229c0e2..fcd134323a7 100644
--- a/src/test/java/org/jabref/logic/importer/fetcher/TitleFetcherTest.java
+++ b/src/test/java/org/jabref/logic/importer/fetcher/TitleFetcherTest.java
@@ -1,21 +1,19 @@
 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 java.util.Optional;
 import org.jabref.logic.importer.FetcherException;
 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.mockito.Mockito.mock;
-
 @FetcherTest
 public class TitleFetcherTest {
 
@@ -24,15 +22,27 @@ public class TitleFetcherTest {
 
     @BeforeEach
     public void setUp() {
-        fetcher = new TitleFetcher(mock(ImportFormatPreferences.class, Answers.RETURNS_DEEP_STUBS));
+        fetcher =
+            new TitleFetcher(
+                mock(ImportFormatPreferences.class, Answers.RETURNS_DEEP_STUBS)
+            );
 
         bibEntryBischof2009 = new BibEntry();
         bibEntryBischof2009.setType(StandardEntryType.InProceedings);
         bibEntryBischof2009.setCitationKey("Bischof_2009");
-        bibEntryBischof2009.setField(StandardField.AUTHOR, "Marc Bischof and Oliver Kopp and Tammo van Lessen and Frank Leymann");
-        bibEntryBischof2009.setField(StandardField.BOOKTITLE, "2009 35th Euromicro Conference on Software Engineering and Advanced Applications");
+        bibEntryBischof2009.setField(
+            StandardField.AUTHOR,
+            "Marc Bischof and Oliver Kopp and Tammo van Lessen and Frank Leymann"
+        );
+        bibEntryBischof2009.setField(
+            StandardField.BOOKTITLE,
+            "2009 35th Euromicro Conference on Software Engineering and Advanced Applications"
+        );
         bibEntryBischof2009.setField(StandardField.PUBLISHER, "{IEEE}");
-        bibEntryBischof2009.setField(StandardField.TITLE, "{BPELscript}: A Simplified Script Syntax for {WS}-{BPEL} 2.0");
+        bibEntryBischof2009.setField(
+            StandardField.TITLE,
+            "{BPELscript}: A Simplified Script Syntax for {WS}-{BPEL} 2.0"
+        );
         bibEntryBischof2009.setField(StandardField.YEAR, "2009");
         bibEntryBischof2009.setField(StandardField.MONTH, "aug");
         bibEntryBischof2009.setField(StandardField.DOI, "10.1109/seaa.2009.21");
@@ -45,7 +55,9 @@ public void testGetName() {
 
     @Test
     public void testPerformSearchKopp2007() 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);
     }
 
@@ -57,7 +69,9 @@ public void testPerformSearchEmptyTitle() throws FetcherException {
 
     @Test
     public void testPerformSearchInvalidTitle() 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 9128ed477e8..2f6bad455a9 100644
--- a/src/test/java/org/jabref/logic/importer/fetcher/ZbMATHTest.java
+++ b/src/test/java/org/jabref/logic/importer/fetcher/ZbMATHTest.java
@@ -1,33 +1,38 @@
 package org.jabref.logic.importer.fetcher;
 
+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;
-
 import org.jabref.logic.importer.ImportFormatPreferences;
 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.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;
-
 @FetcherTest
 class ZbMATHTest {
+
     private ZbMATH fetcher;
     private BibEntry donaldsonEntry;
 
     @BeforeEach
     void setUp() throws Exception {
-        ImportFormatPreferences importFormatPreferences = mock(ImportFormatPreferences.class, Answers.RETURNS_DEEP_STUBS);
-        when(importFormatPreferences.bibEntryPreferences().getKeywordSeparator()).thenReturn(',');
+        ImportFormatPreferences importFormatPreferences = mock(
+            ImportFormatPreferences.class,
+            Answers.RETURNS_DEEP_STUBS
+        );
+        when(
+            importFormatPreferences.bibEntryPreferences().getKeywordSeparator()
+        )
+            .thenReturn(',');
 
         fetcher = new ZbMATH(importFormatPreferences);
 
@@ -35,13 +40,22 @@ void setUp() throws Exception {
         donaldsonEntry.setType(StandardEntryType.Article);
         donaldsonEntry.setCitationKey("zbMATH03800580");
         donaldsonEntry.setField(StandardField.AUTHOR, "Donaldson, S. K.");
-        donaldsonEntry.setField(StandardField.JOURNAL, "Journal of Differential Geometry");
+        donaldsonEntry.setField(
+            StandardField.JOURNAL,
+            "Journal of Differential Geometry"
+        );
         donaldsonEntry.setField(StandardField.DOI, "10.4310/jdg/1214437665");
         donaldsonEntry.setField(StandardField.ISSN, "0022-040X");
         donaldsonEntry.setField(StandardField.LANGUAGE, "English");
-        donaldsonEntry.setField(StandardField.KEYWORDS, "57N13,57R10,53C05,58J99,57R65");
+        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");
@@ -56,14 +70,19 @@ void searchByQueryFindsEntry() throws Exception {
 
     @Test
     void searchByIdFindsEntry() throws Exception {
-        Optional<BibEntry> fetchedEntry = fetcher.performSearchById("0507.57010");
+        Optional<BibEntry> fetchedEntry = fetcher.performSearchById(
+            "0507.57010"
+        );
         assertEquals(Optional.of(donaldsonEntry), fetchedEntry);
     }
 
     @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 17f079edacd..eb3efc5d15b 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,7 +1,10 @@
 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 java.util.Optional;
 import org.jabref.logic.importer.FetcherClientException;
 import org.jabref.logic.importer.FetcherException;
 import org.jabref.logic.importer.ImportFormatPreferences;
@@ -10,37 +13,43 @@
 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;
-
 @Disabled("Page https://doi-to-bibtex-converter.herokuapp.com is down")
 @FetcherTest
-public class DoiToBibtexConverterComIsbnFetcherTest extends AbstractIsbnFetcherTest {
+public class DoiToBibtexConverterComIsbnFetcherTest
+    extends AbstractIsbnFetcherTest {
 
     @BeforeEach
     public void setUp() {
-        bibEntryEffectiveJava = new BibEntry(StandardEntryType.Book)
-                .withField(StandardField.TITLE, "Effective Java(TM) Programming Language Guide (2nd Edition) (The Java Series)")
+        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
     @Override
     public void testName() {
-        assertEquals("ISBN (doi-to-bibtex-converter.herokuapp.com)", fetcher.getName());
+        assertEquals(
+            "ISBN (doi-to-bibtex-converter.herokuapp.com)",
+            fetcher.getName()
+        );
     }
 
     @Test
@@ -61,29 +70,43 @@ public void searchByIdSuccessfulWithLongISBN() {
     @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");
-        Optional<BibEntry> fetchedEntry = fetcher.performSearchById("9783110702125");
+            .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
     public void testIsbnNeitherAvailable() {
-        assertThrows(FetcherClientException.class, () -> fetcher.performSearchById("9785646216541"));
+        assertThrows(
+            FetcherClientException.class,
+            () -> fetcher.performSearchById("9785646216541")
+        );
     }
 
     @Test
     public void searchByIdFailedWithLongISBN() {
-        assertThrows(FetcherClientException.class, () -> fetcher.performSearchById("9780321356680"));
+        assertThrows(
+            FetcherClientException.class,
+            () -> fetcher.performSearchById("9780321356680")
+        );
     }
 
     @Test
     public void searchByIdFailedWithShortISBN() throws FetcherException {
-        assertThrows(FetcherClientException.class, () -> fetcher.performSearchById("0321356683"));
+        assertThrows(
+            FetcherClientException.class,
+            () -> fetcher.performSearchById("0321356683")
+        );
     }
 }
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 842cae00daa..ef274a98811 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,7 +1,10 @@
 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 java.util.Optional;
 import org.jabref.logic.importer.FetcherClientException;
 import org.jabref.logic.importer.FetcherException;
 import org.jabref.logic.importer.ImportFormatPreferences;
@@ -11,23 +14,19 @@
 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;
-
 @Disabled
 @FetcherTest
 public class EbookDeIsbnFetcherTest extends AbstractIsbnFetcherTest {
 
     @BeforeEach
     public void setUp() {
-        bibEntryEffectiveJava = new BibEntry(StandardEntryType.Book)
+        bibEntryEffectiveJava =
+            new BibEntry(StandardEntryType.Book)
                 .withCitationKey("9780134685991")
                 .withField(StandardField.TITLE, "Effective Java")
                 .withField(StandardField.PUBLISHER, "Addison Wesley")
@@ -36,9 +35,15 @@ public void setUp() {
                 .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");
+                .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
@@ -50,14 +55,18 @@ public void testName() {
     @Test
     @Override
     public void searchByIdSuccessfulWithShortISBN() throws FetcherException {
-        Optional<BibEntry> fetchedEntry = fetcher.performSearchById("0134685997");
+        Optional<BibEntry> fetchedEntry = fetcher.performSearchById(
+            "0134685997"
+        );
         assertEquals(Optional.of(bibEntryEffectiveJava), fetchedEntry);
     }
 
     @Test
     @Override
     public void searchByIdSuccessfulWithLongISBN() throws FetcherException {
-        Optional<BibEntry> fetchedEntry = fetcher.performSearchById("9780134685991");
+        Optional<BibEntry> fetchedEntry = fetcher.performSearchById(
+            "9780134685991"
+        );
         assertEquals(Optional.of(bibEntryEffectiveJava), fetchedEntry);
     }
 
@@ -65,18 +74,29 @@ public void searchByIdSuccessfulWithLongISBN() throws FetcherException {
     @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");
+            .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");
+        Optional<BibEntry> fetchedEntry = fetcher.performSearchById(
+            "3662585855"
+        );
         assertEquals(Optional.of(bibEntry), fetchedEntry);
     }
 
@@ -86,6 +106,9 @@ public void authorsAreCorrectlyFormatted() throws Exception {
      */
     @Test
     public void searchForValidButNotFoundISBN() throws Exception {
-        assertThrows(FetcherClientException.class, () -> fetcher.performSearchById("3728128155"));
+        assertThrows(
+            FetcherClientException.class,
+            () -> fetcher.performSearchById("3728128155")
+        );
     }
 }
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 fbdd60630a7..0080c9925a1 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,7 +1,9 @@
 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 java.util.Optional;
 import org.jabref.logic.importer.FetcherException;
 import org.jabref.logic.importer.ImportFormatPreferences;
 import org.jabref.logic.importer.fetcher.AbstractIsbnFetcherTest;
@@ -10,43 +12,59 @@
 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;
-
 public class GVKIsbnFetcherTest extends AbstractIsbnFetcherTest {
 
     private BibEntry bibEntryEffectiveJavaLongISBN;
 
     @BeforeEach
     public void setUp() {
-        bibEntryEffectiveJava = new BibEntry(StandardEntryType.Book)
-                .withField(StandardField.TITLE, "Effective Java(TM) Programming Language Guide (2nd Edition) (The Java Series)")
+        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)
+        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.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));
+                .withField(
+                    StandardField.SUBTITLE,
+                    "[revised and updated for Java SE 6]"
+                );
+
+        fetcher =
+            new GvkFetcher(
+                mock(ImportFormatPreferences.class, Answers.RETURNS_DEEP_STUBS)
+            );
     }
 
     @Test
@@ -58,14 +76,18 @@ public void testName() {
     @Test
     @Override
     public void searchByIdSuccessfulWithShortISBN() throws FetcherException {
-        Optional<BibEntry> fetchedEntry = fetcher.performSearchById("0321356683");
+        Optional<BibEntry> fetchedEntry = fetcher.performSearchById(
+            "0321356683"
+        );
         assertEquals(Optional.of(bibEntryEffectiveJavaLongISBN), fetchedEntry);
     }
 
     @Test
     @Override
     public void searchByIdSuccessfulWithLongISBN() throws FetcherException {
-        Optional<BibEntry> fetchedEntry = fetcher.performSearchById("9780321356680");
+        Optional<BibEntry> fetchedEntry = fetcher.performSearchById(
+            "9780321356680"
+        );
         assertEquals(Optional.of(bibEntryEffectiveJavaLongISBN), fetchedEntry);
     }
 
@@ -73,21 +95,23 @@ public void searchByIdSuccessfulWithLongISBN() throws FetcherException {
     @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");
-
-        Optional<BibEntry> fetchedEntry = fetcher.performSearchById("9783110702125");
+            .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);
     }
 
@@ -95,14 +119,23 @@ public void authorsAreCorrectlyFormatted() throws Exception {
      * Checks whether the given ISBN is <emph>NOT</emph> available at any ISBN fetcher
      */
     @Test
-    public void testIsbnNeitherAvailableOnEbookDeNorOrViaOpenLibrary() throws Exception {
+    public void testIsbnNeitherAvailableOnEbookDeNorOrViaOpenLibrary()
+        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 testEResourceIsbnIsReturnedAsBoook() 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 d2afbfb2b00..861f7470913 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,9 +1,13 @@
 package org.jabref.logic.importer.fetcher.isbntobibtex;
 
+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;
-
 import org.jabref.logic.importer.FetcherException;
 import org.jabref.logic.importer.ImportFormatPreferences;
 import org.jabref.model.entry.BibEntry;
@@ -11,16 +15,10 @@
 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;
-
 @FetcherTest
 class IsbnFetcherTest {
 
@@ -29,15 +27,22 @@ class IsbnFetcherTest {
 
     @BeforeEach
     void setUp() {
-        fetcher = new IsbnFetcher(mock(ImportFormatPreferences.class, Answers.RETURNS_DEEP_STUBS));
+        fetcher =
+            new IsbnFetcher(
+                mock(ImportFormatPreferences.class, Answers.RETURNS_DEEP_STUBS)
+            );
 
-        bibEntry = new BibEntry(StandardEntryType.Book)
+        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.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")
@@ -51,13 +56,17 @@ void testName() {
 
     @Test
     void searchByIdSuccessfulWithShortISBN() throws FetcherException {
-        Optional<BibEntry> fetchedEntry = fetcher.performSearchById("0134685997");
+        Optional<BibEntry> fetchedEntry = fetcher.performSearchById(
+            "0134685997"
+        );
         assertEquals(Optional.of(bibEntry), fetchedEntry);
     }
 
     @Test
     void searchByIdSuccessfulWithLongISBN() throws FetcherException {
-        Optional<BibEntry> fetchedEntry = fetcher.performSearchById("9780134685991");
+        Optional<BibEntry> fetchedEntry = fetcher.performSearchById(
+            "9780134685991"
+        );
         assertEquals(Optional.of(bibEntry), fetchedEntry);
     }
 
@@ -69,22 +78,32 @@ void searchByIdReturnsEmptyWithEmptyISBN() throws FetcherException {
 
     @Test
     void searchByIdThrowsExceptionForShortInvalidISBN() {
-        assertThrows(FetcherException.class, () -> fetcher.performSearchById("123456789"));
+        assertThrows(
+            FetcherException.class,
+            () -> fetcher.performSearchById("123456789")
+        );
     }
 
     @Test
     void searchByIdThrowsExceptionForLongInvalidISB() {
-        assertThrows(FetcherException.class, () -> fetcher.performSearchById("012345678910"));
+        assertThrows(
+            FetcherException.class,
+            () -> fetcher.performSearchById("012345678910")
+        );
     }
 
     @Test
     void searchByIdThrowsExceptionForInvalidISBN() {
-        assertThrows(FetcherException.class, () -> fetcher.performSearchById("jabref-4-ever"));
+        assertThrows(
+            FetcherException.class,
+            () -> fetcher.performSearchById("jabref-4-ever")
+        );
     }
 
     @Test
     void searchByEntryWithISBNSuccessful() throws FetcherException {
-        BibEntry input = new BibEntry().withField(StandardField.ISBN, "0134685997");
+        BibEntry input = new BibEntry()
+            .withField(StandardField.ISBN, "0134685997");
 
         List<BibEntry> fetchedEntry = fetcher.performSearch(input);
         assertEquals(Collections.singletonList(bibEntry), fetchedEntry);
@@ -95,8 +114,11 @@ void searchByEntryWithISBNSuccessful() throws FetcherException {
      * not available on ebook.de. The fetcher should something as it falls back to OttoBib
      */
     @Test
-    void searchForIsbnAvailableAtOttoBibButNonOnEbookDe() throws FetcherException {
-        Optional<BibEntry> fetchedEntry = fetcher.performSearchById("3728128155");
+    void searchForIsbnAvailableAtOttoBibButNonOnEbookDe()
+        throws FetcherException {
+        Optional<BibEntry> fetchedEntry = fetcher.performSearchById(
+            "3728128155"
+        );
         assertNotEquals(Optional.empty(), fetchedEntry);
     }
 }
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 1253ebab464..6139494de62 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,7 +1,10 @@
 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 java.util.Optional;
 import org.jabref.logic.importer.FetcherClientException;
 import org.jabref.logic.importer.FetcherException;
 import org.jabref.logic.importer.ImportFormatPreferences;
@@ -9,28 +12,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;
-
 public class OpenLibraryIsbnFetcherTest extends AbstractIsbnFetcherTest {
 
     @BeforeEach
     public void setUp() {
-        bibEntryEffectiveJava = new BibEntry(StandardEntryType.Book)
-                .withField(StandardField.TITLE, "Effective Java(TM) Programming Language Guide (2nd Edition) (The Java Series)")
+        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
@@ -42,14 +47,18 @@ public void testName() {
     @Test
     @Override
     public void searchByIdSuccessfulWithShortISBN() throws FetcherException {
-        Optional<BibEntry> fetchedEntry = fetcher.performSearchById("0321356683");
+        Optional<BibEntry> fetchedEntry = fetcher.performSearchById(
+            "0321356683"
+        );
         assertEquals(Optional.of(bibEntryEffectiveJava), fetchedEntry);
     }
 
     @Test
     @Override
     public void searchByIdSuccessfulWithLongISBN() throws FetcherException {
-        Optional<BibEntry> fetchedEntry = fetcher.performSearchById("9780321356680");
+        Optional<BibEntry> fetchedEntry = fetcher.performSearchById(
+            "9780321356680"
+        );
         assertEquals(Optional.of(bibEntryEffectiveJava), fetchedEntry);
     }
 
@@ -57,13 +66,18 @@ public void searchByIdSuccessfulWithLongISBN() throws FetcherException {
     @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");
-        Optional<BibEntry> fetchedEntry = fetcher.performSearchById("9783110702125");
+            .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);
     }
 
@@ -71,9 +85,13 @@ public void authorsAreCorrectlyFormatted() throws Exception {
      * Checks whether the given ISBN is <emph>NOT</emph> available at any ISBN fetcher
      */
     @Test
-    public void testIsbnNeitherAvailableOnEbookDeNorOrViaOpenLibrary() throws Exception {
+    public void testIsbnNeitherAvailableOnEbookDeNorOrViaOpenLibrary()
+        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 e501ea694ae..9c87231b87c 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,13 +1,13 @@
 package org.jabref.logic.importer.fetcher.transformers;
 
-import java.util.Optional;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
+import java.util.Optional;
 import org.apache.lucene.queryparser.flexible.core.nodes.QueryNode;
 import org.apache.lucene.queryparser.flexible.standard.parser.StandardSyntaxParser;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-
-class ArXivQueryTransformerTest extends YearRangeByFilteringQueryTransformerTest<ArXivQueryTransformer> {
+class ArXivQueryTransformerTest
+    extends YearRangeByFilteringQueryTransformerTest<ArXivQueryTransformer> {
 
     @Override
     public ArXivQueryTransformer getTransformer() {
@@ -38,7 +38,8 @@ public String getTitlePrefix() {
     public void convertYearField() throws Exception {
         ArXivQueryTransformer transformer = getTransformer();
         String queryString = "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(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 f2ba8266284..ea531f7693f 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,26 +1,25 @@
 package org.jabref.logic.importer.fetcher.transformers;
 
+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;
-
-import org.jabref.logic.importer.FetcherException;
-import org.jabref.model.strings.StringUtil;
-
 import kong.unirest.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;
-
-class CiteSeerQueryTransformerTest extends InfixTransformerTest<CiteSeerQueryTransformer> {
+class CiteSeerQueryTransformerTest
+    extends InfixTransformerTest<CiteSeerQueryTransformer> {
 
     @Override
     protected CiteSeerQueryTransformer getTransformer() {
@@ -30,12 +29,17 @@ protected CiteSeerQueryTransformer getTransformer() {
     @Override
     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);
 
-        Optional<Integer> start = Optional.of(transformer.getJSONPayload().getInt("yearStart"));
-        Optional<Integer> end = Optional.of(transformer.getJSONPayload().getInt("yearEnd"));
+        Optional<Integer> start = Optional.of(
+            transformer.getJSONPayload().getInt("yearStart")
+        );
+        Optional<Integer> end = Optional.of(
+            transformer.getJSONPayload().getInt("yearEnd")
+        );
         assertEquals(Optional.of(2023), start);
         assertEquals(Optional.of(2023), end);
     }
@@ -43,12 +47,17 @@ public void convertYearField() throws Exception {
     @Override
     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);
 
-        Optional<Integer> start = Optional.of(transformer.getJSONPayload().getInt("yearStart"));
-        Optional<Integer> end = Optional.of(transformer.getJSONPayload().getInt("yearEnd"));
+        Optional<Integer> start = Optional.of(
+            transformer.getJSONPayload().getInt("yearStart")
+        );
+        Optional<Integer> end = Optional.of(
+            transformer.getJSONPayload().getInt("yearEnd")
+        );
         assertEquals(Optional.of(2019), start);
         assertEquals(Optional.of(2023), end);
     }
@@ -56,53 +65,83 @@ public void convertYearRangeField() throws Exception {
     @Test
     public 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);
 
-        Optional<Integer> page = Optional.of(transformer.getJSONPayload().getInt("page"));
+        Optional<Integer> page = Optional.of(
+            transformer.getJSONPayload().getInt("page")
+        );
         assertEquals(Optional.of(2), page);
     }
 
     @Test
     public 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);
 
-        Optional<Integer> pageSize = Optional.of(transformer.getJSONPayload().getInt("pageSize"));
+        Optional<Integer> pageSize = Optional.of(
+            transformer.getJSONPayload().getInt("pageSize")
+        );
         assertEquals(Optional.of(20), pageSize);
     }
 
     @Test
     public 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
     public 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);
+        String queryString =
+            "author:\"Wang Wei\" author:\"Zhang Pingwen\" author:\"Zhang Zhifei\"";
+        QueryNode luceneQuery = new StandardSyntaxParser()
+            .parse(queryString, AbstractQueryTransformer.NO_EXPLICIT_FIELD);
         CiteSeerQueryTransformer transformer = getTransformer();
         transformer.transformLuceneQuery(luceneQuery);
 
-        List<String> authorsActual = transformer.getJSONPayload().getJSONArray("author").toList();
-        List<String> authorsExpected = List.of("Wang Wei", "Zhang Pingwen", "Zhang Zhifei");
+        List<String> authorsActual = transformer
+            .getJSONPayload()
+            .getJSONArray("author")
+            .toList();
+        List<String> authorsExpected = List.of(
+            "Wang Wei",
+            "Zhang Pingwen",
+            "Zhang Zhifei"
+        );
         assertEquals(authorsExpected, authorsActual);
     }
 
-    private static Stream<Arguments> getJSONWithYearVariations() throws FetcherException {
-        String baseString = "title:Ericksen-Leslie page:1 pageSize:20 must_have_pdf:false sortBy:relevance";
+    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)
+            StringUtil.join(
+                new String[] { baseString, "year:2020" },
+                " ",
+                0,
+                2
+            ),
+            StringUtil.join(
+                new String[] { baseString, "year-range:2019-2023" },
+                " ",
+                0,
+                2
+            )
         );
 
         JSONObject expectedJson = new JSONObject();
@@ -116,25 +155,36 @@ private static Stream<Arguments> getJSONWithYearVariations() throws FetcherExcep
         withYearAndYearRange.forEach(requestStr -> {
             QueryNode luceneQuery = null;
             try {
-                luceneQuery = new StandardSyntaxParser().parse(requestStr, AbstractQueryTransformer.NO_EXPLICIT_FIELD);
+                luceneQuery =
+                    new StandardSyntaxParser()
+                        .parse(
+                            requestStr,
+                            AbstractQueryTransformer.NO_EXPLICIT_FIELD
+                        );
             } catch (QueryNodeParseException e) {
                 throw new RuntimeException(e);
             }
-            CiteSeerQueryTransformer transformer = new CiteSeerQueryTransformer();
+            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, 2020, 2020, jsonObjectIterator.next()),
+            Arguments.of(expectedJson, 2019, 2023, jsonObjectIterator.next())
         );
     }
 
     @ParameterizedTest
     @MethodSource("getJSONWithYearVariations")
-    public void compareJSONRequestsWithYearVariations(JSONObject expected, Integer yearStart, Integer yearEnd, JSONObject actual) throws Exception {
+    public 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 effd799f4bf..1a9ea9d9847 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,13 +1,15 @@
 package org.jabref.logic.importer.fetcher.transformers;
 
-import java.util.Optional;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
+import java.util.Optional;
 import org.apache.lucene.queryparser.flexible.core.nodes.QueryNode;
 import org.apache.lucene.queryparser.flexible.standard.parser.StandardSyntaxParser;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-
-class CollectionOfComputerScienceBibliographiesQueryTransformerTest extends InfixTransformerTest<CollectionOfComputerScienceBibliographiesQueryTransformer> {
+class CollectionOfComputerScienceBibliographiesQueryTransformerTest
+    extends InfixTransformerTest<
+        CollectionOfComputerScienceBibliographiesQueryTransformer
+    > {
 
     @Override
     public CollectionOfComputerScienceBibliographiesQueryTransformer getTransformer() {
@@ -37,16 +39,23 @@ public String getTitlePrefix() {
     @Override
     public void convertYearField() throws Exception {
         String queryString = "2018";
-        QueryNode luceneQuery = new StandardSyntaxParser().parse(queryString, AbstractQueryTransformer.NO_EXPLICIT_FIELD);
-        Optional<String> query = getTransformer().transformLuceneQuery(luceneQuery);
+        QueryNode luceneQuery = new StandardSyntaxParser()
+            .parse(queryString, AbstractQueryTransformer.NO_EXPLICIT_FIELD);
+        Optional<String> query = getTransformer()
+            .transformLuceneQuery(luceneQuery);
         assertEquals(Optional.of("year:2018"), query);
     }
 
     @Override
     public void convertYearRangeField() throws Exception {
         String queryString = "year-range:2018-2021";
-        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);
+        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 1801576f0b2..792a8498204 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,13 +1,13 @@
 package org.jabref.logic.importer.fetcher.transformers;
 
-import java.util.Optional;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
+import java.util.Optional;
 import org.apache.lucene.queryparser.flexible.core.nodes.QueryNode;
 import org.apache.lucene.queryparser.flexible.standard.parser.StandardSyntaxParser;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-
-class DBLPQueryTransformerTest extends InfixTransformerTest<DBLPQueryTransformer> {
+class DBLPQueryTransformerTest
+    extends InfixTransformerTest<DBLPQueryTransformer> {
 
     @Override
     public DBLPQueryTransformer getTransformer() {
@@ -37,8 +37,10 @@ public String getTitlePrefix() {
     @Override
     public void convertYearField() throws Exception {
         String queryString = "year:2015";
-        QueryNode luceneQuery = new StandardSyntaxParser().parse(queryString, AbstractQueryTransformer.NO_EXPLICIT_FIELD);
-        Optional<String> searchQuery = getTransformer().transformLuceneQuery(luceneQuery);
+        QueryNode luceneQuery = new StandardSyntaxParser()
+            .parse(queryString, AbstractQueryTransformer.NO_EXPLICIT_FIELD);
+        Optional<String> searchQuery = getTransformer()
+            .transformLuceneQuery(luceneQuery);
         Optional<String> expected = Optional.of("2015");
         assertEquals(expected, searchQuery);
     }
@@ -46,8 +48,10 @@ public void convertYearField() throws Exception {
     @Override
     public void convertYearRangeField() throws Exception {
         String queryString = "year-range:2012-2015";
-        QueryNode luceneQuery = new StandardSyntaxParser().parse(queryString, AbstractQueryTransformer.NO_EXPLICIT_FIELD);
-        Optional<String> searchQuery = getTransformer().transformLuceneQuery(luceneQuery);
+        QueryNode luceneQuery = new StandardSyntaxParser()
+            .parse(queryString, AbstractQueryTransformer.NO_EXPLICIT_FIELD);
+        Optional<String> searchQuery = getTransformer()
+            .transformLuceneQuery(luceneQuery);
         Optional<String> expected = Optional.of("2012|2013|2014|2015");
         assertEquals(expected, 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 70b4e4a5bfb..c6027238713 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,9 @@
 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 0f366ece141..af5c1db430e 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,14 +1,14 @@
 package org.jabref.logic.importer.fetcher.transformers;
 
-import java.util.Optional;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
+import java.util.Optional;
 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 static org.junit.jupiter.api.Assertions.assertEquals;
-
-class GVKQueryTransformerTest extends InfixTransformerTest<GVKQueryTransformer> {
+class GVKQueryTransformerTest
+    extends InfixTransformerTest<GVKQueryTransformer> {
 
     @Override
     public GVKQueryTransformer getTransformer() {
@@ -38,8 +38,10 @@ public String getTitlePrefix() {
     @Override
     public void convertYearField() throws Exception {
         String queryString = "year:2018";
-        QueryNode luceneQuery = new StandardSyntaxParser().parse(queryString, AbstractQueryTransformer.NO_EXPLICIT_FIELD);
-        Optional<String> query = getTransformer().transformLuceneQuery(luceneQuery);
+        QueryNode luceneQuery = new StandardSyntaxParser()
+            .parse(queryString, AbstractQueryTransformer.NO_EXPLICIT_FIELD);
+        Optional<String> query = getTransformer()
+            .transformLuceneQuery(luceneQuery);
 
         Optional<String> expected = Optional.of("ver:2018");
         assertEquals(expected, query);
@@ -47,6 +49,5 @@ public void convertYearField() throws Exception {
 
     @Disabled("Not supported by GVK")
     @Override
-    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 91f2fccce28..09f9cec7a04 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,17 +1,17 @@
 package org.jabref.logic.importer.fetcher.transformers;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
 import java.util.Optional;
 import java.util.stream.Stream;
-
 import org.apache.lucene.queryparser.flexible.core.nodes.QueryNode;
 import org.apache.lucene.queryparser.flexible.standard.parser.StandardSyntaxParser;
 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;
-
-class IEEEQueryTransformerTest extends InfixTransformerTest<IEEEQueryTransformer> {
+class IEEEQueryTransformerTest
+    extends InfixTransformerTest<IEEEQueryTransformer> {
 
     @Override
     public IEEEQueryTransformer getTransformer() {
@@ -43,7 +43,8 @@ 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());
@@ -57,7 +58,8 @@ 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());
@@ -69,7 +71,8 @@ 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());
@@ -78,17 +81,26 @@ 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")
-    public void testStopWordRemoval(String expected, String queryString) throws Exception {
-        QueryNode luceneQuery = new StandardSyntaxParser().parse(queryString, AbstractQueryTransformer.NO_EXPLICIT_FIELD);
-        Optional<String> result = getTransformer().transformLuceneQuery(luceneQuery);
+    public void testStopWordRemoval(String expected, String queryString)
+        throws Exception {
+        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 c27584fa1b8..e71b8da7e7a 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,13 +1,12 @@
 package org.jabref.logic.importer.fetcher.transformers;
 
-import java.util.Optional;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
+import java.util.Optional;
 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;
-
 /**
  * Test Interface for all transformers that use infix notation for their logical binary operators
  */
@@ -38,35 +37,49 @@ protected String getTitlePrefix() {
     @Test
     public void convertAuthorFieldPrefix() throws Exception {
         String queryString = "author:\"Igor Steinmacher\"";
-        QueryNode luceneQuery = new StandardSyntaxParser().parse(queryString, AbstractQueryTransformer.NO_EXPLICIT_FIELD);
-        Optional<String> searchQuery = getTransformer().transformLuceneQuery(luceneQuery);
-        Optional<String> expected = Optional.of(getAuthorPrefix() + "\"Igor Steinmacher\"");
+        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);
     }
 
     @Test
     public void convertUnFieldedTermPrefix() throws Exception {
         String queryString = "\"default value\"";
-        QueryNode luceneQuery = new StandardSyntaxParser().parse(queryString, AbstractQueryTransformer.NO_EXPLICIT_FIELD);
-        Optional<String> searchQuery = getTransformer().transformLuceneQuery(luceneQuery);
-        Optional<String> expected = Optional.of(getUnFieldedPrefix() + queryString);
+        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);
     }
 
     @Test
     public void convertExplicitUnFieldedTermPrefix() throws Exception {
         String queryString = "default:\"default value\"";
-        QueryNode luceneQuery = new StandardSyntaxParser().parse(queryString, AbstractQueryTransformer.NO_EXPLICIT_FIELD);
-        Optional<String> searchQuery = getTransformer().transformLuceneQuery(luceneQuery);
-        Optional<String> expected = Optional.of(getUnFieldedPrefix() + "\"default value\"");
+        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);
     }
 
     @Test
     public void convertJournalFieldPrefix() throws Exception {
         String queryString = "journal:Nature";
-        QueryNode luceneQuery = new StandardSyntaxParser().parse(queryString, AbstractQueryTransformer.NO_EXPLICIT_FIELD);
-        Optional<String> searchQuery = getTransformer().transformLuceneQuery(luceneQuery);
+        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);
     }
@@ -79,28 +92,65 @@ 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);
-        Optional<String> searchQuery = getTransformer().transformLuceneQuery(luceneQuery);
-        Optional<String> expected = Optional.of(getAuthorPrefix() + "\"Igor Steinmacher\"" + getTransformer().getLogicalAndOperator() + getAuthorPrefix() + "\"Christoph Treude\"");
+        String queryString =
+            "author:\"Igor Steinmacher\" author:\"Christoph Treude\"";
+        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\""
+        );
         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);
-        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");
+        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"
+        );
         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);
-        Optional<String> searchQuery = getTransformer().transformLuceneQuery(luceneQuery);
-        Optional<String> expected = Optional.of(getTransformer().getLogicalNotOperator() + "(" + getAuthorPrefix() + "\"Igor Steinmacher\"" + getTransformer().getLogicalOrOperator() + getAuthorPrefix() + "\"Christoph Treude\")");
+        String queryString =
+            "!(author:\"Igor Steinmacher\" OR author:\"Christoph Treude\")";
+        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\")"
+        );
         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 85a1db5c454..ac963c2a975 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,13 +1,13 @@
 package org.jabref.logic.importer.fetcher.transformers;
 
-import java.util.Optional;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
+import java.util.Optional;
 import org.apache.lucene.queryparser.flexible.core.nodes.QueryNode;
 import org.apache.lucene.queryparser.flexible.standard.parser.StandardSyntaxParser;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-
-class JstorQueryTransformerTest extends InfixTransformerTest<JstorQueryTransformer> {
+class JstorQueryTransformerTest
+    extends InfixTransformerTest<JstorQueryTransformer> {
 
     @Override
     public JstorQueryTransformer getTransformer() {
@@ -37,16 +37,20 @@ public String getTitlePrefix() {
     @Override
     public void convertYearField() throws Exception {
         String queryString = "year:2018";
-        QueryNode luceneQuery = new StandardSyntaxParser().parse(queryString, AbstractQueryTransformer.NO_EXPLICIT_FIELD);
-        Optional<String> query = getTransformer().transformLuceneQuery(luceneQuery);
+        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);
     }
 
     @Override
     public void convertYearRangeField() throws Exception {
         String queryString = "year-range:2018-2021";
-        QueryNode luceneQuery = new StandardSyntaxParser().parse(queryString, AbstractQueryTransformer.NO_EXPLICIT_FIELD);
-        Optional<String> query = getTransformer().transformLuceneQuery(luceneQuery);
+        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 069c356290c..5a778c49e26 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,9 @@
 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 fb53f80ba37..84e401ae6d3 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,13 +1,13 @@
 package org.jabref.logic.importer.fetcher.transformers;
 
-import java.util.Optional;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
+import java.util.Optional;
 import org.apache.lucene.queryparser.flexible.core.nodes.QueryNode;
 import org.apache.lucene.queryparser.flexible.standard.parser.StandardSyntaxParser;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-
-class SpringerQueryTransformerTest extends InfixTransformerTest<SpringerQueryTransformer> {
+class SpringerQueryTransformerTest
+    extends InfixTransformerTest<SpringerQueryTransformer> {
 
     @Override
     public String getAuthorPrefix() {
@@ -37,8 +37,10 @@ public String getTitlePrefix() {
     @Override
     public void convertYearField() throws Exception {
         String queryString = "year:2015";
-        QueryNode luceneQuery = new StandardSyntaxParser().parse(queryString, AbstractQueryTransformer.NO_EXPLICIT_FIELD);
-        Optional<String> searchQuery = getTransformer().transformLuceneQuery(luceneQuery);
+        QueryNode luceneQuery = new StandardSyntaxParser()
+            .parse(queryString, AbstractQueryTransformer.NO_EXPLICIT_FIELD);
+        Optional<String> searchQuery = getTransformer()
+            .transformLuceneQuery(luceneQuery);
 
         Optional<String> expected = Optional.of("date:2015*");
         assertEquals(expected, searchQuery);
@@ -47,10 +49,14 @@ public void convertYearField() throws Exception {
     @Override
     public void convertYearRangeField() throws Exception {
         String queryString = "year-range:2012-2015";
-        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*");
+        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*"
+        );
         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 31b3b2239a6..cc01ab89c21 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,17 +1,18 @@
 package org.jabref.logic.importer.fetcher.transformers;
 
-import java.util.Optional;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
+import java.util.Optional;
 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;
-
 /**
  * Test Interface for all transformers that use suffix notation for their logical binary operators
  */
-public abstract class SuffixTransformerTest<T extends AbstractQueryTransformer> {
+public abstract class SuffixTransformerTest<
+    T extends AbstractQueryTransformer
+> {
 
     protected abstract T getTransformer();
 
@@ -26,35 +27,49 @@ 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);
-        Optional<String> searchQuery = getTransformer().transformLuceneQuery(luceneQuery);
-        Optional<String> expected = Optional.of("\"Igor Steinmacher\"" + getAuthorSuffix());
+        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);
     }
 
     @Test
     public void convertUnFieldedTermSuffix() throws Exception {
         String queryString = "\"default value\"";
-        QueryNode luceneQuery = new StandardSyntaxParser().parse(queryString, AbstractQueryTransformer.NO_EXPLICIT_FIELD);
-        Optional<String> searchQuery = getTransformer().transformLuceneQuery(luceneQuery);
-        Optional<String> expected = Optional.of(queryString + getUnFieldedSuffix());
+        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);
     }
 
     @Test
     public void convertExplicitUnFieldedTermSuffix() throws Exception {
         String queryString = "default:\"default value\"";
-        QueryNode luceneQuery = new StandardSyntaxParser().parse(queryString, AbstractQueryTransformer.NO_EXPLICIT_FIELD);
-        Optional<String> searchQuery = getTransformer().transformLuceneQuery(luceneQuery);
-        Optional<String> expected = Optional.of("\"default value\"" + getUnFieldedSuffix());
+        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);
     }
 
     @Test
     public void convertJournalFieldSuffix() throws Exception {
         String queryString = "journal:Nature";
-        QueryNode luceneQuery = new StandardSyntaxParser().parse(queryString, AbstractQueryTransformer.NO_EXPLICIT_FIELD);
-        Optional<String> searchQuery = getTransformer().transformLuceneQuery(luceneQuery);
+        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);
     }
@@ -67,28 +82,66 @@ 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);
-        Optional<String> searchQuery = getTransformer().transformLuceneQuery(luceneQuery);
-        Optional<String> expected = Optional.of("\"Igor Steinmacher\"" + getAuthorSuffix() + getTransformer().getLogicalAndOperator() + "\"Christoph Treude\"" + getAuthorSuffix());
+        String queryString =
+            "author:\"Igor Steinmacher\" author:\"Christoph Treude\"";
+        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()
+        );
         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);
-        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());
+        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()
+        );
         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);
-        Optional<String> searchQuery = getTransformer().transformLuceneQuery(luceneQuery);
-        Optional<String> expected = Optional.of(getTransformer().getLogicalNotOperator() + "(" + "\"Igor Steinmacher\"" + getAuthorSuffix() + getTransformer().getLogicalOrOperator() + "\"Christoph Treude\")" + getAuthorSuffix());
+        String queryString =
+            "!(author:\"Igor Steinmacher\" OR author:\"Christoph Treude\")";
+        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()
+        );
         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 54bd9c12247..9b87f497eaa 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,18 +1,23 @@
 package org.jabref.logic.importer.fetcher.transformers;
 
-import java.util.Optional;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
+import java.util.Optional;
 import org.apache.lucene.queryparser.flexible.core.nodes.QueryNode;
 import org.apache.lucene.queryparser.flexible.standard.parser.StandardSyntaxParser;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
+public abstract class YearAndYearRangeByFilteringQueryTransformerTest<
+    T extends YearAndYearRangeByFilteringQueryTransformer
+>
+    extends YearRangeByFilteringQueryTransformerTest<T> {
 
-public abstract class YearAndYearRangeByFilteringQueryTransformerTest<T extends YearAndYearRangeByFilteringQueryTransformer> extends YearRangeByFilteringQueryTransformerTest<T> {
     @Override
     public void convertYearField() throws Exception {
-        YearAndYearRangeByFilteringQueryTransformer transformer = getTransformer();
+        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.of(""), query);
         assertEquals(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 b9410fa6c7b..de6e8f71c17 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,20 +1,23 @@
 package org.jabref.logic.importer.fetcher.transformers;
 
-import java.util.Optional;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
+import java.util.Optional;
 import org.apache.lucene.queryparser.flexible.core.nodes.QueryNode;
 import org.apache.lucene.queryparser.flexible.standard.parser.StandardSyntaxParser;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-
-public abstract class YearRangeByFilteringQueryTransformerTest<T extends YearRangeByFilteringQueryTransformer> extends InfixTransformerTest<T> {
+public abstract class YearRangeByFilteringQueryTransformerTest<
+    T extends YearRangeByFilteringQueryTransformer
+>
+    extends InfixTransformerTest<T> {
 
     @Override
     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 0b9cd9a88d1..c2dfe72f6ff 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,13 +1,13 @@
 package org.jabref.logic.importer.fetcher.transformers;
 
-import java.util.Optional;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
+import java.util.Optional;
 import org.apache.lucene.queryparser.flexible.core.nodes.QueryNode;
 import org.apache.lucene.queryparser.flexible.standard.parser.StandardSyntaxParser;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-
-class ZbMathQueryTransformerTest extends InfixTransformerTest<ZbMathQueryTransformer> {
+class ZbMathQueryTransformerTest
+    extends InfixTransformerTest<ZbMathQueryTransformer> {
 
     @Override
     public ZbMathQueryTransformer getTransformer() {
@@ -37,8 +37,10 @@ public String getTitlePrefix() {
     @Override
     public void convertYearField() throws Exception {
         String queryString = "year:2015";
-        QueryNode luceneQuery = new StandardSyntaxParser().parse(queryString, AbstractQueryTransformer.NO_EXPLICIT_FIELD);
-        Optional<String> searchQuery = getTransformer().transformLuceneQuery(luceneQuery);
+        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);
     }
@@ -46,8 +48,10 @@ public void convertYearField() throws Exception {
     @Override
     public void convertYearRangeField() throws Exception {
         String queryString = "year-range:2012-2015";
-        QueryNode luceneQuery = new StandardSyntaxParser().parse(queryString, AbstractQueryTransformer.NO_EXPLICIT_FIELD);
-        Optional<String> searchQuery = getTransformer().transformLuceneQuery(luceneQuery);
+        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 07dc0f82d10..a542f5f946b 100644
--- a/src/test/java/org/jabref/logic/importer/fileformat/ACMPortalParserTest.java
+++ b/src/test/java/org/jabref/logic/importer/fileformat/ACMPortalParserTest.java
@@ -1,5 +1,8 @@
 package org.jabref.logic.importer.fileformat;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+
 import java.io.IOException;
 import java.net.CookieHandler;
 import java.net.CookieManager;
@@ -9,7 +12,7 @@
 import java.util.Collections;
 import java.util.List;
 import java.util.Optional;
-
+import org.apache.http.client.utils.URIBuilder;
 import org.jabref.logic.importer.FetcherException;
 import org.jabref.logic.importer.ParseException;
 import org.jabref.logic.net.URLDownload;
@@ -17,80 +20,120 @@
 import org.jabref.model.entry.field.StandardField;
 import org.jabref.model.entry.types.StandardEntryType;
 import org.jabref.testutils.category.FetcherTest;
-
-import org.apache.http.client.utils.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;
-
 @FetcherTest
 public 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(
+        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"),
+                    .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")
-        );
+                    .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
     void testParseEntries() throws IOException, ParseException {
         CookieHandler.setDefault(new CookieManager());
-        List<BibEntry> bibEntries = parser.parseEntries(new URLDownload(searchUrl).asInputStream());
+        List<BibEntry> bibEntries = parser.parseEntries(
+            new URLDownload(searchUrl).asInputStream()
+        );
         for (BibEntry bibEntry : bibEntries) {
             bibEntry.clearField(StandardField.ABSTRACT);
         }
-        assertEquals(Optional.of(searchEntryList.get(0)), bibEntries.stream().findFirst());
+        assertEquals(
+            Optional.of(searchEntryList.get(0)),
+            bibEntries.stream().findFirst()
+        );
     }
 
     @Test
     void testParseDoiSearchPage() throws ParseException, IOException {
         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.get(0));
     }
 
     @Test
     void testGetBibEntriesFromDoiList() throws FetcherException {
-        List<String> testDoiList = List.of("10.1145/3129790.3129810", "10.1145/2950290");
-        List<BibEntry> bibEntries = parser.getBibEntriesFromDoiList(testDoiList);
+        List<String> testDoiList = List.of(
+            "10.1145/3129790.3129810",
+            "10.1145/2950290"
+        );
+        List<BibEntry> bibEntries = parser.getBibEntriesFromDoiList(
+            testDoiList
+        );
         for (BibEntry bibEntry : bibEntries) {
             bibEntry.clearField(StandardField.ABSTRACT);
         }
@@ -98,10 +141,15 @@ void testGetBibEntriesFromDoiList() throws FetcherException {
     }
 
     @Test
-    void testGetUrlFromDoiList() throws MalformedURLException, URISyntaxException {
-        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");
+    void testGetUrlFromDoiList()
+        throws MalformedURLException, URISyntaxException {
+        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);
         assertEquals(target, url.toString());
     }
@@ -115,34 +163,60 @@ void testParseBibEntry() {
 
     @Test
     void testParseBibEntryWithFamilyAuthorOnly() {
-        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\"}";
+        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.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.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");
+            .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);
     }
 
     @Test
-    void testNoEntryFound() throws URISyntaxException, IOException, ParseException {
+    void testNoEntryFound()
+        throws URISyntaxException, IOException, ParseException {
         CookieHandler.setDefault(new CookieManager());
-        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());
+        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/BiblioscapeImporterFilesTest.java b/src/test/java/org/jabref/logic/importer/fileformat/BiblioscapeImporterFilesTest.java
index db9ad71e613..a0a44d5b47e 100644
--- a/src/test/java/org/jabref/logic/importer/fileformat/BiblioscapeImporterFilesTest.java
+++ b/src/test/java/org/jabref/logic/importer/fileformat/BiblioscapeImporterFilesTest.java
@@ -3,7 +3,6 @@
 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;
 
@@ -12,20 +11,29 @@ public 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();
     }
 
     @ParameterizedTest
     @MethodSource("fileNames")
     public void testIsRecognizedFormat(String fileName) throws IOException {
-        ImporterTestEngine.testIsRecognizedFormat(new BiblioscapeImporter(), fileName);
+        ImporterTestEngine.testIsRecognizedFormat(
+            new BiblioscapeImporter(),
+            fileName
+        );
     }
 
     @ParameterizedTest
     @MethodSource("fileNames")
     public void testImportEntries(String fileName) throws Exception {
-        ImporterTestEngine.testImportEntries(new BiblioscapeImporter(), fileName, FILE_ENDING);
+        ImporterTestEngine.testImportEntries(
+            new BiblioscapeImporter(),
+            fileName,
+            FILE_ENDING
+        );
     }
 }
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 d83d80e5a0d..07dc83ee7ff 100644
--- a/src/test/java/org/jabref/logic/importer/fileformat/BiblioscapeImporterTest.java
+++ b/src/test/java/org/jabref/logic/importer/fileformat/BiblioscapeImporterTest.java
@@ -1,15 +1,13 @@
 package org.jabref.logic.importer.fileformat;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
 import java.nio.file.Path;
 import java.util.Collections;
-
 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;
-
 public class BiblioscapeImporterTest {
 
     private BiblioscapeImporter importer;
@@ -31,8 +29,11 @@ public void testsGetExtensions() {
 
     @Test
     public void testGetDescription() {
-        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,15 @@ public void testGetCLIID() {
 
     @Test
     public void testImportEntriesAbortion() 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 e0aaded5a0c..638e4358d66 100644
--- a/src/test/java/org/jabref/logic/importer/fileformat/BiblioscapeImporterTypesTest.java
+++ b/src/test/java/org/jabref/logic/importer/fileformat/BiblioscapeImporterTypesTest.java
@@ -6,12 +6,10 @@
 import java.util.Collections;
 import java.util.List;
 import java.util.stream.Stream;
-
 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.api.Assertions;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.Arguments;
@@ -21,26 +19,38 @@ class BiblioscapeImporterTypesTest {
 
     private static Stream<Arguments> types() {
         return Stream.of(
-                Arguments.of("journal", StandardEntryType.Article),
-                Arguments.of("book section", StandardEntryType.InBook),
-                Arguments.of("book", StandardEntryType.Book),
-                Arguments.of("conference", StandardEntryType.InProceedings),
-                Arguments.of("proceedings", StandardEntryType.InProceedings),
-                Arguments.of("report", StandardEntryType.TechReport),
-                Arguments.of("master thesis", StandardEntryType.MastersThesis),
-                Arguments.of("thesis", StandardEntryType.PhdThesis),
-                Arguments.of("master", StandardEntryType.Misc)
+            Arguments.of("journal", StandardEntryType.Article),
+            Arguments.of("book section", StandardEntryType.InBook),
+            Arguments.of("book", StandardEntryType.Book),
+            Arguments.of("conference", StandardEntryType.InProceedings),
+            Arguments.of("proceedings", StandardEntryType.InProceedings),
+            Arguments.of("report", StandardEntryType.TechReport),
+            Arguments.of("master thesis", StandardEntryType.MastersThesis),
+            Arguments.of("thesis", StandardEntryType.PhdThesis),
+            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 d95eb7382c9..66ebaaebd85 100644
--- a/src/test/java/org/jabref/logic/importer/fileformat/BibtexImporterTest.java
+++ b/src/test/java/org/jabref/logic/importer/fileformat/BibtexImporterTest.java
@@ -1,5 +1,10 @@
 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 static org.mockito.Mockito.mock;
+
 import java.io.IOException;
 import java.net.URISyntaxException;
 import java.nio.charset.Charset;
@@ -8,7 +13,6 @@
 import java.util.List;
 import java.util.Optional;
 import java.util.stream.Stream;
-
 import org.jabref.logic.importer.ImportFormatPreferences;
 import org.jabref.logic.importer.ParserResult;
 import org.jabref.logic.util.StandardFileType;
@@ -17,7 +21,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,11 +29,6 @@
 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;
-
 /**
  * This class tests the BibtexImporter.
  * <p>
@@ -43,70 +41,154 @@ public class BibtexImporterTest {
 
     @BeforeEach
     public 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
-    public void testIsRecognizedFormat() throws IOException, URISyntaxException {
-        Path file = Path.of(BibtexImporterTest.class.getResource("BibtexImporter.examples.bib").toURI());
+    public void testIsRecognizedFormat()
+        throws IOException, URISyntaxException {
+        Path file = Path.of(
+            BibtexImporterTest.class.getResource("BibtexImporter.examples.bib")
+                .toURI()
+        );
         assertTrue(importer.isRecognizedFormat(file));
     }
 
     @Test
     public void testImportEntries() throws IOException, URISyntaxException {
-        Path file = Path.of(BibtexImporterTest.class.getResource("BibtexImporter.examples.bib").toURI());
-        List<BibEntry> bibEntries = importer.importDatabase(file).getDatabase().getEntries();
+        Path file = Path.of(
+            BibtexImporterTest.class.getResource("BibtexImporter.examples.bib")
+                .toURI()
+        );
+        List<BibEntry> bibEntries = importer
+            .importDatabase(file)
+            .getDatabase()
+            .getEntries();
 
         assertEquals(4, bibEntries.size());
 
         for (BibEntry entry : bibEntries) {
             if ("aksin".equals(entry.getCitationKey().get())) {
                 assertEquals(
-                        Optional.of(
-                                "Aks{\\i}n, {\\\"O}zge and T{\\\"u}rkmen, Hayati and Artok, Levent and {\\c{C}}etinkaya, "
-                                        + "Bekir and Ni, Chaoying and B{\\\"u}y{\\\"u}kg{\\\"u}ng{\\\"o}r, Orhan and {\\\"O}zkal, Erhan"),
-                        entry.getField(StandardField.AUTHOR));
+                    Optional.of(
+                        "Aks{\\i}n, {\\\"O}zge and T{\\\"u}rkmen, Hayati and Artok, Levent and {\\c{C}}etinkaya, " +
+                        "Bekir and Ni, Chaoying and B{\\\"u}y{\\\"u}kg{\\\"u}ng{\\\"o}r, Orhan and {\\\"O}zkal, Erhan"
+                    ),
+                    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("#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("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));
+                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("#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(
+                        "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("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 "
-                                        + "each set member entry is needed only when using BibTeX as the backend"),
-                        entry.getField(StandardField.ANNOTATION));
+                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 " +
+                        "each set member entry is needed only when using BibTeX as the 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("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(
+                        "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"),
-                        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("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"),
-                        entry.getField(StandardField.TITLE));
-                assertEquals(Optional.of("http://d-nb.info/107601965X"), entry.getField(StandardField.URL));
-                assertEquals(Optional.of("2016"), entry.getField(StandardField.YEAR));
+                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"),
+                    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("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"
+                    ),
+                    entry.getField(StandardField.TITLE)
+                );
+                assertEquals(
+                    Optional.of("http://d-nb.info/107601965X"),
+                    entry.getField(StandardField.URL)
+                );
+                assertEquals(
+                    Optional.of("2016"),
+                    entry.getField(StandardField.YEAR)
+                );
             }
         }
     }
@@ -124,88 +206,167 @@ public void testsGetExtensions() {
     @Test
     public void testGetDescription() {
         assertEquals(
-                "This importer enables `--importToOpen someEntry.bib`",
-                importer.getDescription());
+            "This importer enables `--importToOpen someEntry.bib`",
+            importer.getDescription()
+        );
     }
 
     @Test
     public void testRecognizesDatabaseID() 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);
     }
 
     static Stream<Arguments> testParsingOfEncodedFileWithHeader() {
         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(StandardCharsets.UTF_16BE, "encoding-utf-16BE-with-header.bib"),
-                Arguments.of(StandardCharsets.UTF_16BE, "encoding-utf-16BE-without-header.bib")
+            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(
+                StandardCharsets.UTF_16BE,
+                "encoding-utf-16BE-with-header.bib"
+            ),
+            Arguments.of(
+                StandardCharsets.UTF_16BE,
+                "encoding-utf-16BE-without-header.bib"
+            )
         );
     }
 
     @ParameterizedTest
     @MethodSource
-    public void testParsingOfEncodedFileWithHeader(Charset charset, String fileName) throws Exception {
+    public void testParsingOfEncodedFileWithHeader(
+        Charset charset,
+        String fileName
+    ) throws Exception {
         ParserResult parserResult = importer.importDatabase(
-                Path.of(BibtexImporterTest.class.getResource(fileName).toURI()));
-        assertEquals(Optional.of(charset), parserResult.getMetaData().getEncoding());
+            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"})
-    public void testParsingOfWindows1252EncodedFileReadsDegreeCharacterCorrectly(String filename) throws Exception {
+    @CsvSource(
+        {
+            "encoding-windows-1252-with-header.bib",
+            "encoding-windows-1252-without-header.bib",
+        }
+    )
+    public void testParsingOfWindows1252EncodedFileReadsDegreeCharacterCorrectly(
+        String filename
+    ) throws Exception {
         ParserResult parserResult = importer.importDatabase(
-                Path.of(BibtexImporterTest.class.getResource(filename).toURI()));
+            Path.of(BibtexImporterTest.class.getResource(filename).toURI())
+        );
         assertEquals(
-                List.of(new BibEntry(StandardEntryType.Article).withField(StandardField.ABSTRACT, "25° C")),
-                parserResult.getDatabase().getEntries());
+            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"})
-    public void testParsingFilesReadsUmlautCharacterCorrectly(String filename) throws Exception {
+    @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",
+        }
+    )
+    public void testParsingFilesReadsUmlautCharacterCorrectly(String filename)
+        throws Exception {
         ParserResult parserResult = importer.importDatabase(
-                Path.of(BibtexImporterTest.class.getResource(filename).toURI()));
+            Path.of(BibtexImporterTest.class.getResource(filename).toURI())
+        );
         assertEquals(
-                List.of(new BibEntry(StandardEntryType.Article).withField(StandardField.TITLE, "Ü ist ein Umlaut")),
-                parserResult.getDatabase().getEntries());
+            List.of(
+                new BibEntry(StandardEntryType.Article)
+                    .withField(StandardField.TITLE, "Ü ist ein Umlaut")
+            ),
+            parserResult.getDatabase().getEntries()
+        );
     }
 
-    private static Stream<Arguments> encodingExplicitlySuppliedCorrectlyDetermined() {
+    private static Stream<
+        Arguments
+    > encodingExplicitlySuppliedCorrectlyDetermined() {
         return Stream.of(
-                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-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)
         );
     }
 
     @ParameterizedTest
     @MethodSource
-    public void encodingExplicitlySuppliedCorrectlyDetermined(String filename, boolean encodingExplicitlySupplied) throws Exception {
+    public void encodingExplicitlySuppliedCorrectlyDetermined(
+        String filename,
+        boolean encodingExplicitlySupplied
+    ) throws Exception {
         ParserResult parserResult = importer.importDatabase(
-                Path.of(BibtexImporterTest.class.getResource(filename).toURI()));
-        assertEquals(encodingExplicitlySupplied, parserResult.getMetaData().getEncodingExplicitlySupplied());
+            Path.of(BibtexImporterTest.class.getResource(filename).toURI())
+        );
+        assertEquals(
+            encodingExplicitlySupplied,
+            parserResult.getMetaData().getEncodingExplicitlySupplied()
+        );
     }
 
     @Test
     public void wrongEncodingSupplied() throws Exception {
         ParserResult parserResult = importer.importDatabase(
-                Path.of(BibtexImporterTest.class.getResource("encoding-windows-1252-but-utf-8-declared--decoding-fails.bib").toURI()));
+            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
         assertEquals(
-                List.of(new BibEntry(StandardEntryType.Article).withField(StandardField.AUTHOR, "Test�I. Last")),
-                parserResult.getDatabase().getEntries());
+            List.of(
+                new BibEntry(StandardEntryType.Article)
+                    .withField(StandardField.AUTHOR, "Test�I. Last")
+            ),
+            parserResult.getDatabase().getEntries()
+        );
     }
 
     @Test
     public void encodingNotSupplied() throws Exception {
         ParserResult parserResult = importer.importDatabase(
-                Path.of(BibtexImporterTest.class.getResource("encoding-utf-8-without-header.bib").toURI()));
+            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 bdfc7a8718c..7696a1bb57e 100644
--- a/src/test/java/org/jabref/logic/importer/fileformat/BibtexParserTest.java
+++ b/src/test/java/org/jabref/logic/importer/fileformat/BibtexParserTest.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 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;
@@ -11,9 +18,7 @@
 import java.util.Iterator;
 import java.util.List;
 import java.util.Optional;
-
 import javafx.collections.FXCollections;
-
 import org.jabref.logic.citationkeypattern.AbstractCitationKeyPattern;
 import org.jabref.logic.citationkeypattern.DatabaseCitationKeyPattern;
 import org.jabref.logic.citationkeypattern.GlobalCitationKeyPattern;
@@ -54,7 +59,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.Test;
 import org.junit.jupiter.api.function.Executable;
@@ -62,13 +66,6 @@
 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;
-
 /**
  * Tests for reading whole bib files can be found at {@link org.jabref.logic.importer.fileformat.BibtexImporterTest}
  * <p>
@@ -81,8 +78,12 @@ class BibtexParserTest {
 
     @BeforeEach
     void setUp() {
-        importFormatPreferences = mock(ImportFormatPreferences.class, Answers.RETURNS_DEEP_STUBS);
-        when(importFormatPreferences.bibEntryPreferences().getKeywordSeparator()).thenReturn(',');
+        importFormatPreferences =
+            mock(ImportFormatPreferences.class, Answers.RETURNS_DEEP_STUBS);
+        when(
+            importFormatPreferences.bibEntryPreferences().getKeywordSeparator()
+        )
+            .thenReturn(',');
         parser = new BibtexParser(importFormatPreferences);
     }
 
@@ -94,11 +95,12 @@ void parseWithNullThrowsNullPointerException() throws Exception {
 
     @Test
     void fromStringRecognizesEntry() throws ParseException {
-        List<BibEntry> result = parser
-                .parseEntries("@article{test,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");
+            .withCitationKey("test")
+            .withField(StandardField.AUTHOR, "Ed von Test");
         assertEquals(List.of(expected), result);
     }
 
@@ -110,66 +112,79 @@ 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(
-                """
-                        @article{canh05,  author = {Crowston, K. and Annabi, H.},
-                          title = {Title A}}
-                        """,
-                importFormatPreferences);
+            """
+            @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");
+            .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("""
-                        @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")));
+        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"))
+        );
     }
 
     @Test
     void singleFromStringReturnsEmptyFromEmptyString() throws ParseException {
-        Optional<BibEntry> parsed = BibtexParser.singleFromString("", importFormatPreferences);
+        Optional<BibEntry> parsed = BibtexParser.singleFromString(
+            "",
+            importFormatPreferences
+        );
         assertEquals(Optional.empty(), parsed);
     }
 
     @Test
-    void singleFromStringReturnsEmptyIfNoEntryRecognized() throws ParseException {
-        Optional<BibEntry> parsed = BibtexParser.singleFromString("@@article@@{{{{{{}", importFormatPreferences);
+    void singleFromStringReturnsEmptyIfNoEntryRecognized()
+        throws ParseException {
+        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}}"));
+        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");
+            .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\"}"));
+        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");
+            .withCitationKey("test")
+            .withField(StandardField.AUTHOR, "Ed von Test");
         assertEquals(List.of(expected), result.getDatabase().getEntries());
     }
 
@@ -177,207 +192,271 @@ void parseRecognizesFieldValuesInQuotationMarks() throws IOException {
     void parseRecognizesEntryOnlyWithKey() throws IOException {
         ParserResult result = parser.parse(new StringReader("@article{test}"));
         BibEntry expected = new BibEntry(StandardEntryType.Article)
-                .withCitationKey("test");
+            .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}}"));
+        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");
+            .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}}"));
+        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");
+            .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}}"));
+        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");
+            .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}}"));
+        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");
+            .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");
+            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})"));
+        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");
+            .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");
+            .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}}"));
+        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");
+            .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},}"));
+    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");
+            .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}}"));
+        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");
+            .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 entryWithComment = comment + "@article{test,author={Ed von T@st}}";
+        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");
+            .withField(InternalField.KEY_FIELD, "test")
+            .withField(StandardField.AUTHOR, "Ed von T@st");
         expected.setCommentsBeforeEntry(comment);
 
         ParserResult result = parser.parse(new StringReader(entryWithComment));
         List<BibEntry> parsed = result.getDatabase().getEntries();
 
         assertEquals(List.of(expected), parsed);
-        assertEquals(expected.getUserComments(), parsed.get(0).getUserComments());
+        assertEquals(
+            expected.getUserComments(),
+            parsed.get(0).getUserComments()
+        );
     }
 
     @Test
     void parseRecognizesMultipleEntries() throws IOException {
         ParserResult result = parser.parse(
-                new StringReader("""
-                        @article{canh05,  author = {Crowston, K. and Annabi, H.},
-                          title = {Title A}}
-                        @inProceedings{foo,  author={Norton Bar}}"""));
+            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"));
+            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.get(0).getParsedSerialization());
-        assertEquals(secondEntry, parsedEntries.get(1).getParsedSerialization());
+        assertEquals(
+            secondEntry,
+            parsedEntries.get(1).getParsedSerialization()
+        );
     }
 
     @Test
     void parseRecognizesMultipleEntriesOnSameLine() throws IOException {
-        ParserResult result = parser
-                .parse(new StringReader("@article{canh05}" + "@inProceedings{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"));
+            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}}"));
+            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");
+            .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}}"));
+            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");
+            .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}}"));
+            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");
+            .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
 
@@ -389,7 +468,9 @@ void parseRecognizesHeaderButIgnoresEncoding() throws IOException {
                   owner = {oezbek},
                   timestamp = {2006.05.29},
                   url = {http://james.howison.name/publications.html}
-                }))"""));
+                }))"""
+            )
+        );
 
         Collection<BibEntry> parsed = result.getDatabase().getEntries();
         BibEntry entry = parsed.iterator().next();
@@ -399,30 +480,55 @@ 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"),
-                entry.getField(StandardField.TITLE));
-        assertEquals(Optional.of("Hawaii International Conference On System Sciences (HICSS)"),
-                entry.getField(StandardField.BOOKTITLE));
+        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)"
+            ),
+            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("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)
+        );
     }
 
     @Test
     void parseRecognizesFormatedEntry() throws IOException {
         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},
-                          booktitle = {Hawaii International Conference On System Sciences (HICSS)},
-                          year = {2005},
-                          owner = {oezbek},
-                          timestamp = {2006.05.29},
-                          url = {http://james.howison.name/publications.html}
-                        }))"""));
+            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},
+                  booktitle = {Hawaii International Conference On System Sciences (HICSS)},
+                  year = {2005},
+                  owner = {oezbek},
+                  timestamp = {2006.05.29},
+                  url = {http://james.howison.name/publications.html}
+                }))"""
+            )
+        );
 
         Collection<BibEntry> parsed = result.getDatabase().getEntries();
         BibEntry entry = parsed.iterator().next();
@@ -431,59 +537,94 @@ void parseRecognizesFormatedEntry() 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"),
-                entry.getField(StandardField.TITLE));
-        assertEquals(Optional.of("Hawaii International Conference On System Sciences (HICSS)"),
-                entry.getField(StandardField.BOOKTITLE));
+        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)"
+            ),
+            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("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)
+        );
     }
 
     @Test
-    void parseRecognizesNumbersWithoutBracketsOrQuotationMarks() throws IOException {
-        ParserResult result = parser
-                .parse(new StringReader("@article{test,year = 2005}"));
+    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");
+            .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}}"));
+        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");
+            .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}}"));
+        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");
+            .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("""
-                        @misc{,
-                          test = {wired\\},
-                        }
-                        """));
+        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()
         );
     }
 
@@ -492,33 +633,39 @@ void parseRecognizesFinalSlashAsSlash() throws Exception {
      */
     @Test
     void parseFailsWithFinalSlashAsSlashWhenSingleLine() throws Exception {
-        ParserResult parserResult = parser.parse(new StringReader("@misc{, test = {wired\\}}"));
+        ParserResult parserResult = parser.parse(
+            new StringReader("@misc{, test = {wired\\}}")
+        );
         // In case JabRef was more relaxed, `assertFalse` would be provided here.
         assertTrue(parserResult.hasWarnings());
     }
 
     @Test
     void parseRecognizesDateFieldWithConcatenation() throws IOException {
-        ParserResult result = parser
-                .parse(new StringReader("@article{test,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#");
+            .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("""
-                          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)},
-                          year = {2005},
-                          owner = {oezbek},
-                          timestamp = {2006.05.29},
-                          url = {http://james.howison.name/publications.html}
-                        }))"""));
+            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)},
+                  year = {2005},
+                  owner = {oezbek},
+                  timestamp = {2006.05.29},
+                  url = {http://james.howison.name/publications.html}
+                }))"""
+            )
+        );
 
         Collection<BibEntry> parsed = result.getDatabase().getEntries();
 
@@ -527,36 +674,43 @@ void parseReturnsEmptyListIfNoEntryRecognized() throws IOException {
 
     @Test
     void parseReturnsEmptyListIfNoEntryExistent() throws IOException {
-        ParserResult result = parser
-                .parse(new StringReader("""
-                        This was created with JabRef 2.1 beta 2.
-                        Encoding: Cp1252
-                        """));
+        ParserResult result = parser.parse(
+            new StringReader(
+                """
+                This was created with JabRef 2.1 beta 2.
+                Encoding: Cp1252
+                """
+            )
+        );
         assertEquals(List.of(), result.getDatabase().getEntries());
     }
 
     @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");
+            .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}"));
+    void parseIgnoresAndWarnsAboutEntryWithUnmatchedOpenBracket()
+        throws IOException {
+        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}}")
+        );
 
         Collection<BibEntry> parsed = result.getDatabase().getEntries();
         BibEntry entry = parsed.iterator().next();
@@ -564,14 +718,18 @@ void parseAddsEscapedOpenBracketToFieldValue() throws IOException {
         assertEquals(1, parsed.size());
         assertEquals(StandardEntryType.Article, entry.getType());
         assertEquals(Optional.of("test"), entry.getCitationKey());
-        assertEquals(Optional.of("escaped \\{ bracket"), entry.getField(StandardField.REVIEW));
+        assertEquals(
+            Optional.of("escaped \\{ bracket"),
+            entry.getField(StandardField.REVIEW)
+        );
         assertFalse(result.hasWarnings());
     }
 
     @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}}")
+        );
 
         Collection<BibEntry> parsed = result.getDatabase().getEntries();
         BibEntry entry = parsed.iterator().next();
@@ -579,14 +737,21 @@ void parseAddsEscapedClosingBracketToFieldValue() throws IOException {
         assertEquals(1, parsed.size());
         assertEquals(StandardEntryType.Article, entry.getType());
         assertEquals(Optional.of("test"), entry.getCitationKey());
-        assertEquals(Optional.of("escaped \\} bracket"), entry.getField(StandardField.REVIEW));
+        assertEquals(
+            Optional.of("escaped \\} bracket"),
+            entry.getField(StandardField.REVIEW)
+        );
         assertFalse(result.hasWarnings());
     }
 
     @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();
 
@@ -596,49 +761,77 @@ void parseIgnoresAndWarnsAboutEntryWithUnmatchedOpenBracketInQuotationMarks() th
 
     @Test
     void parseIgnoresArbitraryContentAfterEntry() 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();
 
-        assertEquals(1, parsed.size(), "Size should be one, but was " + parsed.size());
-        assertEquals("}", result.getDatabase().getEpilog(), "Epilog should be preserved");
+        assertEquals(
+            1,
+            parsed.size(),
+            "Size should be one, but was " + parsed.size()
+        );
+        assertEquals(
+            "}",
+            result.getDatabase().getEpilog(),
+            "Epilog should be preserved"
+        );
     }
 
     @Test
-    void parseWarnsAboutUnmatchedContentInEntryWithoutComma() throws IOException {
-        ParserResult result = parser.parse(new StringReader("@article{test,author={author bracket } too much}"));
+    void parseWarnsAboutUnmatchedContentInEntryWithoutComma()
+        throws IOException {
+        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.get(0).getField(StandardField.AUTHOR));
+        assertEquals(
+            Optional.of("author bracket #too##much#"),
+            entries.get(0).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();
 
         assertTrue(result.hasWarnings(), "There should be warnings");
-        assertEquals(0, entries.size(), "Size should be zero, but was " + entries.size());
+        assertEquals(
+            0,
+            entries.size(),
+            "Size should be zero, but was " + entries.size()
+        );
     }
 
     @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.get(0).getField(StandardField.AUTHOR));
+        assertEquals(
+            Optional.of("author @ good"),
+            entries.get(0).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\"}")
+        );
 
         Collection<BibEntry> parsed = result.getDatabase().getEntries();
         BibEntry entry = parsed.iterator().next();
@@ -647,13 +840,18 @@ void parseRecognizesEntryWithAtSymbolInQuotationMarks() throws IOException {
         assertEquals(StandardEntryType.Article, entry.getType());
         assertEquals(Optional.of("test"), entry.getCitationKey());
         assertEquals(2, entry.getFields().size());
-        assertEquals(Optional.of("author @ good"), entry.getField(StandardField.AUTHOR));
+        assertEquals(
+            Optional.of("author @ good"),
+            entry.getField(StandardField.AUTHOR)
+        );
     }
 
     @Test
-    void parseRecognizesFieldsWithBracketsEnclosedInQuotationMarks() throws IOException {
-        ParserResult result = parser
-                .parse(new StringReader("@article{test,author=\"Test {Ed {von} Test}\"}"));
+    void parseRecognizesFieldsWithBracketsEnclosedInQuotationMarks()
+        throws IOException {
+        ParserResult result = parser.parse(
+            new StringReader("@article{test,author=\"Test {Ed {von} Test}\"}")
+        );
 
         Collection<BibEntry> parsed = result.getDatabase().getEntries();
         BibEntry entry = parsed.iterator().next();
@@ -662,14 +860,18 @@ void parseRecognizesFieldsWithBracketsEnclosedInQuotationMarks() throws IOExcept
         assertEquals(StandardEntryType.Article, entry.getType());
         assertEquals(Optional.of("test"), entry.getCitationKey());
         assertEquals(2, entry.getFields().size());
-        assertEquals(Optional.of("Test {Ed {von} Test}"), entry.getField(StandardField.AUTHOR));
+        assertEquals(
+            Optional.of("Test {Ed {von} Test}"),
+            entry.getField(StandardField.AUTHOR)
+        );
     }
 
     @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}\"}")
+        );
 
         Collection<BibEntry> parsed = result.getDatabase().getEntries();
         BibEntry entry = parsed.iterator().next();
@@ -678,13 +880,18 @@ void parseRecognizesFieldsWithEscapedQuotationMarks() throws IOException {
         assertEquals(StandardEntryType.Article, entry.getType());
         assertEquals(Optional.of("test"), entry.getCitationKey());
         assertEquals(2, entry.getFields().size());
-        assertEquals(Optional.of("Test {\" Test}"), entry.getField(StandardField.AUTHOR));
+        assertEquals(
+            Optional.of("Test {\" Test}"),
+            entry.getField(StandardField.AUTHOR)
+        );
     }
 
     @Test
-    void parseIgnoresAndWarnsAboutEntryWithFieldsThatAreNotSeperatedByComma() throws IOException {
-        ParserResult result = parser
-                .parse(new StringReader("@article{test,author={Ed von Test} year=2005}"));
+    void parseIgnoresAndWarnsAboutEntryWithFieldsThatAreNotSeperatedByComma()
+        throws IOException {
+        ParserResult result = parser.parse(
+            new StringReader("@article{test,author={Ed von Test} year=2005}")
+        );
 
         Collection<BibEntry> parsed = result.getDatabase().getEntries();
 
@@ -693,10 +900,14 @@ void parseIgnoresAndWarnsAboutEntryWithFieldsThatAreNotSeperatedByComma() throws
     }
 
     @Test
-    void parseIgnoresAndWarnsAboutCorruptedEntryButRecognizeOthers() throws IOException {
+    void parseIgnoresAndWarnsAboutCorruptedEntryButRecognizeOthers()
+        throws IOException {
         ParserResult result = parser.parse(
-                new StringReader(
-                        "@article{test,author={author missing bracket}" + "@article{test,author={Ed von Test}}"));
+            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();
@@ -705,14 +916,18 @@ void parseIgnoresAndWarnsAboutCorruptedEntryButRecognizeOthers() throws IOExcept
         assertEquals(StandardEntryType.Article, entry.getType());
         assertEquals(Optional.of("test"), entry.getCitationKey());
         assertEquals(2, entry.getFields().size());
-        assertEquals(Optional.of("Ed von Test"), entry.getField(StandardField.AUTHOR));
+        assertEquals(
+            Optional.of("Ed von Test"),
+            entry.getField(StandardField.AUTHOR)
+        );
         assertTrue(result.hasWarnings());
     }
 
     @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();
@@ -721,56 +936,84 @@ void parseRecognizesMonthFieldsWithFollowingComma() throws IOException {
         assertEquals(StandardEntryType.Article, entry.getType());
         assertEquals(Optional.of("test"), entry.getCitationKey());
         assertEquals(3, entry.getFields().size());
-        assertEquals(Optional.of("Ed von Test"), entry.getField(StandardField.AUTHOR));
+        assertEquals(
+            Optional.of("Ed von Test"),
+            entry.getField(StandardField.AUTHOR)
+        );
         assertEquals(Optional.of("8,"), entry.getField(StandardField.MONTH));
     }
 
     @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());
+        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());
+        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());
+        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());
+        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();
+        BibtexString string = result
+            .getDatabase()
+            .getStringValues()
+            .iterator()
+            .next();
 
         assertEquals(1, result.getDatabase().getStringCount());
         assertEquals("bourdieu", string.getName());
@@ -778,12 +1021,18 @@ void parseRecognizesString() throws IOException {
     }
 
     @Test
-    void parseSavesOneNewlineAfterStringInParsedSerialization() throws IOException {
+    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();
+        BibtexString parsedString = result
+            .getDatabase()
+            .getStringValues()
+            .iterator()
+            .next();
 
         assertEquals(1, result.getDatabase().getStringCount());
         assertEquals(string, parsedString.getParsedSerialization());
@@ -791,10 +1040,15 @@ 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();
+        BibtexString parsedString = result
+            .getDatabase()
+            .getStringValues()
+            .iterator()
+            .next();
 
         assertEquals(1, result.getDatabase().getStringCount());
         assertEquals("bourdieu", parsedString.getName());
@@ -803,10 +1057,15 @@ 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();
+        BibtexString parsedString = result
+            .getDatabase()
+            .getStringValues()
+            .iterator()
+            .next();
 
         assertEquals(1, result.getDatabase().getStringCount());
         assertEquals("bourdieu", parsedString.getName());
@@ -815,10 +1074,17 @@ 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();
+        Iterator<BibtexString> iterator = result
+            .getDatabase()
+            .getStringValues()
+            .iterator();
         BibtexString first = iterator.next();
         BibtexString second = iterator.next();
         // Sort them because we can't be sure about the order
@@ -838,12 +1104,25 @@ 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" + "}"));
+            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();
+        BibtexString parsedString = result
+            .getDatabase()
+            .getStringValues()
+            .iterator()
+            .next();
         Collection<BibEntry> parsedEntries = result.getDatabase().getEntries();
         BibEntry parsedEntry = parsedEntries.iterator().next();
 
@@ -852,19 +1131,45 @@ 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("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("2002"), parsedEntry.getField(StandardField.YEAR));
+        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("2002"),
+            parsedEntry.getField(StandardField.YEAR)
+        );
     }
 
     @Test
-    void parseWarnsAboutStringsWithSameNameAndOnlyKeepsOne() throws IOException {
-        ParserResult result = parser
-                .parse(new StringReader("@string{bourdieu = {Bourdieu, Pierre}}" + "@string{bourdieu = {Other}}"));
+    void parseWarnsAboutStringsWithSameNameAndOnlyKeepsOne()
+        throws IOException {
+        ParserResult result = parser.parse(
+            new StringReader(
+                "@string{bourdieu = {Bourdieu, Pierre}}" +
+                "@string{bourdieu = {Other}}"
+            )
+        );
 
         assertTrue(result.hasWarnings());
         assertEquals(1, result.getDatabase().getStringCount());
@@ -872,24 +1177,30 @@ 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(0, result.getDatabase().getEntries().size());
     }
 
     @Test
     void parseIgnoresUpercaseComments() 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 parseIgnoresCommentsBeforeEntry() 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();
@@ -898,13 +1209,20 @@ void parseIgnoresCommentsBeforeEntry() throws IOException {
         assertEquals(StandardEntryType.Article, parsedEntry.getType());
         assertEquals(Optional.of("test"), parsedEntry.getCitationKey());
         assertEquals(2, parsedEntry.getFields().size());
-        assertEquals(Optional.of("Ed von Test"), parsedEntry.getField(StandardField.AUTHOR));
+        assertEquals(
+            Optional.of("Ed von Test"),
+            parsedEntry.getField(StandardField.AUTHOR)
+        );
     }
 
     @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}"
+            )
+        );
 
         Collection<BibEntry> parsedEntries = result.getDatabase().getEntries();
         BibEntry parsedEntry = parsedEntries.iterator().next();
@@ -913,21 +1231,29 @@ void parseIgnoresCommentsAfterEntry() throws IOException {
         assertEquals(StandardEntryType.Article, parsedEntry.getType());
         assertEquals(Optional.of("test"), parsedEntry.getCitationKey());
         assertEquals(2, parsedEntry.getFields().size());
-        assertEquals(Optional.of("Ed von Test"), parsedEntry.getField(StandardField.AUTHOR));
+        assertEquals(
+            Optional.of("Ed von Test"),
+            parsedEntry.getField(StandardField.AUTHOR)
+        );
     }
 
     @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();
@@ -936,13 +1262,20 @@ void parseIgnoresTextBeforeEntry() throws IOException {
         assertEquals(StandardEntryType.Article, parsedEntry.getType());
         assertEquals(Optional.of("test"), parsedEntry.getCitationKey());
         assertEquals(2, parsedEntry.getFields().size());
-        assertEquals(Optional.of("Ed von Test"), parsedEntry.getField(StandardField.AUTHOR));
+        assertEquals(
+            Optional.of("Ed von Test"),
+            parsedEntry.getField(StandardField.AUTHOR)
+        );
     }
 
     @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();
@@ -951,95 +1284,151 @@ void parseIgnoresTextAfterEntry() throws IOException {
         assertEquals(StandardEntryType.Article, parsedEntry.getType());
         assertEquals(Optional.of("test"), parsedEntry.getCitationKey());
         assertEquals(2, parsedEntry.getFields().size());
-        assertEquals(Optional.of("Ed von Test"), parsedEntry.getField(StandardField.AUTHOR));
+        assertEquals(
+            Optional.of("Ed von Test"),
+            parsedEntry.getField(StandardField.AUTHOR)
+        );
     }
 
     @Test
     void parseConvertsNewlineToSpace() 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();
 
-        assertEquals(Optional.of("a b"), parsedEntry.getField(new UnknownField("a")));
+        assertEquals(
+            Optional.of("a b"),
+            parsedEntry.getField(new UnknownField("a"))
+        );
     }
 
     @Test
     void parseConvertsMultipleNewlinesToSpace() throws IOException {
-        ParserResult result = parser
-                .parse(new StringReader("@article{test,a = {a\n\nb}," + "b = {a\n \nb}," + "c = {a \n \n b}}"));
+        ParserResult result = parser.parse(
+            new StringReader(
+                "@article{test,a = {a\n\nb}," +
+                "b = {a\n \nb}," +
+                "c = {a \n \n b}}"
+            )
+        );
 
         Collection<BibEntry> parsedEntries = result.getDatabase().getEntries();
         BibEntry parsedEntry = parsedEntries.iterator().next();
 
-        assertEquals(Optional.of("a b"), parsedEntry.getField(new UnknownField("a")));
-        assertEquals(Optional.of("a b"), parsedEntry.getField(new UnknownField("b")));
-        assertEquals(Optional.of("a b"), parsedEntry.getField(new UnknownField("c")));
+        assertEquals(
+            Optional.of("a b"),
+            parsedEntry.getField(new UnknownField("a"))
+        );
+        assertEquals(
+            Optional.of("a b"),
+            parsedEntry.getField(new UnknownField("b"))
+        );
+        assertEquals(
+            Optional.of("a b"),
+            parsedEntry.getField(new UnknownField("c"))
+        );
     }
 
     @Test
     void parseConvertsTabToSpace() 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();
 
-        assertEquals(Optional.of("a b"), parsedEntry.getField(new UnknownField("a")));
+        assertEquals(
+            Optional.of("a b"),
+            parsedEntry.getField(new UnknownField("a"))
+        );
     }
 
     @Test
     void parseConvertsMultipleTabsToSpace() 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();
 
-        assertEquals(Optional.of("a b"), parsedEntry.getField(new UnknownField("a")));
-        assertEquals(Optional.of("a b"), parsedEntry.getField(new UnknownField("b")));
-        assertEquals(Optional.of("a b"), parsedEntry.getField(new UnknownField("c")));
+        assertEquals(
+            Optional.of("a b"),
+            parsedEntry.getField(new UnknownField("a"))
+        );
+        assertEquals(
+            Optional.of("a b"),
+            parsedEntry.getField(new UnknownField("b"))
+        );
+        assertEquals(
+            Optional.of("a b"),
+            parsedEntry.getField(new UnknownField("c"))
+        );
     }
 
     @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();
 
-        assertEquals(Optional.of("ups  sala"), parsedEntry.getField(StandardField.FILE));
+        assertEquals(
+            Optional.of("ups  sala"),
+            parsedEntry.getField(StandardField.FILE)
+        );
     }
 
     @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();
 
-        assertEquals(Optional.of("ups  \tsala"), parsedEntry.getField(StandardField.ABSTRACT));
+        assertEquals(
+            Optional.of("ups  \tsala"),
+            parsedEntry.getField(StandardField.ABSTRACT)
+        );
     }
 
     @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();
 
-        assertEquals(Optional.of("ups \nsala"), parsedEntry.getField(StandardField.ABSTRACT));
+        assertEquals(
+            Optional.of("ups \nsala"),
+            parsedEntry.getField(StandardField.ABSTRACT)
+        );
     }
 
     @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();
@@ -1048,7 +1437,10 @@ void parseHandlesAccentsCorrectly() throws IOException {
         assertEquals(1, parsedEntries.size());
         assertEquals(StandardEntryType.Article, parsedEntry.getType());
         assertEquals(Optional.of("test"), parsedEntry.getCitationKey());
-        assertEquals(Optional.of("H'{e}lne Fiaux"), parsedEntry.getField(StandardField.AUTHOR));
+        assertEquals(
+            Optional.of("H'{e}lne Fiaux"),
+            parsedEntry.getField(StandardField.AUTHOR)
+        );
     }
 
     /**
@@ -1056,27 +1448,42 @@ 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();
 
         assertFalse(result.hasWarnings());
-        assertEquals(Optional.of("some text and \\latex"), result.getDatabase().getPreamble());
+        assertEquals(
+            Optional.of("some text and \\latex"),
+            result.getDatabase().getPreamble()
+        );
         assertEquals(1, parsedEntries.size());
         assertEquals(StandardEntryType.Article, parsedEntry.getType());
         assertEquals(Optional.of("test"), parsedEntry.getCitationKey());
-        assertEquals(Optional.of("H'{e}lne Fiaux"), parsedEntry.getField(StandardField.AUTHOR));
+        assertEquals(
+            Optional.of("H'{e}lne Fiaux"),
+            parsedEntry.getField(StandardField.AUTHOR)
+        );
     }
 
     @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());
+        assertEquals(
+            Optional.of("some text and \\latex"),
+            result.getDatabase().getPreamble()
+        );
     }
 
     @Test
@@ -1092,37 +1499,55 @@ void parseSavesEntryInParsedSerialization() throws IOException {
     }
 
     @Test
-    void parseSavesOneNewlineAfterEntryInParsedSerialization() throws IOException {
+    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();
 
         assertEquals(1, parsedEntries.size());
-        assertEquals(testEntry + OS.NEWLINE, parsedEntry.getParsedSerialization());
+        assertEquals(
+            testEntry + OS.NEWLINE,
+            parsedEntry.getParsedSerialization()
+        );
     }
 
     @Test
-    void parseSavesAllButOneNewlinesBeforeEntryInParsedSerialization() throws IOException {
+    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();
 
         assertEquals(1, parsedEntries.size());
         // The first newline is removed, because JabRef interprets that always as block separator
-        assertEquals(OS.NEWLINE + OS.NEWLINE + testEntry, parsedEntry.getParsedSerialization());
+        assertEquals(
+            OS.NEWLINE + OS.NEWLINE + testEntry,
+            parsedEntry.getParsedSerialization()
+        );
     }
 
     @Test
-    void parseRemovesEncodingLineAndSeparatorInParsedSerialization() throws IOException {
+    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));
+            new StringReader(
+                SaveConfiguration.ENCODING_PREFIX +
+                OS.NEWLINE +
+                OS.NEWLINE +
+                OS.NEWLINE +
+                testEntry
+            )
+        );
 
         Collection<BibEntry> parsedEntries = result.getDatabase().getEntries();
         BibEntry parsedEntry = parsedEntries.iterator().next();
@@ -1134,11 +1559,19 @@ void parseRemovesEncodingLineAndSeparatorInParsedSerialization() throws IOExcept
     }
 
     @Test
-    void parseSavesNewlinesBetweenEntriesInParsedSerialization() throws IOException {
+    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();
@@ -1154,12 +1587,17 @@ void parseSavesNewlinesBetweenEntriesInParsedSerialization() throws IOException
         assertEquals(2, parsedEntries.size());
         assertEquals(testEntryOne + OS.NEWLINE, first.getParsedSerialization());
         // one newline is removed, because it is written by JabRef's block functionality
-        assertEquals(OS.NEWLINE + testEntryTwo, second.getParsedSerialization());
+        assertEquals(
+            OS.NEWLINE + testEntryTwo,
+            second.getParsedSerialization()
+        );
     }
 
     @Test
     void parseIgnoresWhitespaceInEpilogue() throws IOException {
-        ParserResult result = parser.parse(new StringReader("   " + OS.NEWLINE));
+        ParserResult result = parser.parse(
+            new StringReader("   " + OS.NEWLINE)
+        );
 
         assertEquals("", result.getDatabase().getEpilog());
     }
@@ -1167,93 +1605,167 @@ 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();
 
         assertEquals(1, parsedEntries.size());
-        assertEquals(testEntry + OS.NEWLINE, parsedEntry.getParsedSerialization());
+        assertEquals(
+            testEntry + OS.NEWLINE,
+            parsedEntry.getParsedSerialization()
+        );
         assertEquals("", result.getDatabase().getEpilog());
     }
 
     @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();
 
         assertEquals(1, parsedEntries.size());
-        assertEquals(testEntry + OS.NEWLINE, parsedEntry.getParsedSerialization());
+        assertEquals(
+            testEntry + OS.NEWLINE,
+            parsedEntry.getParsedSerialization()
+        );
         assertEquals("epilogue", result.getDatabase().getEpilog());
     }
 
     @Test
     void parseRecognizesSaveActionsAfterEntry() throws IOException {
         ParserResult parserResult = parser.parse(
-                new StringReader("""
-                        @InProceedings{6055279,
-                          Title                    = {Educational session 1},
-                          Booktitle                = {Custom Integrated Circuits Conference (CICC), 2011 IEEE},
-                          Year                     = {2011},
-                          Month                    = {Sept},
-                          Pages                    = {1-7},
-                          Abstract                 = {Start of the above-titled section of the conference proceedings record.},
-                          DOI                      = {10.1109/CICC.2011.6055279},
-                          ISSN                     = {0886-5930}
-                        }
-
-                        @comment{jabref-meta: saveActions:enabled;title[lower_case]}"""));
-
-        FieldFormatterCleanups saveActions = parserResult.getMetaData().getSaveActions().get();
+            new StringReader(
+                """
+                @InProceedings{6055279,
+                  Title                    = {Educational session 1},
+                  Booktitle                = {Custom Integrated Circuits Conference (CICC), 2011 IEEE},
+                  Year                     = {2011},
+                  Month                    = {Sept},
+                  Pages                    = {1-7},
+                  Abstract                 = {Start of the above-titled section of the conference proceedings record.},
+                  DOI                      = {10.1109/CICC.2011.6055279},
+                  ISSN                     = {0886-5930}
+                }
+
+                @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())),
-                saveActions.getConfiguredActions());
+        assertEquals(
+            List.of(
+                new FieldFormatterCleanup(
+                    StandardField.TITLE,
+                    new LowerCaseFormatter()
+                )
+            ),
+            saveActions.getConfiguredActions()
+        );
     }
 
     @Test
     void parserKeepsSaveActions() throws IOException {
         ParserResult parserResult = parser.parse(
-                new StringReader("""
-                        @InProceedings{6055279,
-                          Title                    = {Educational session 1},
-                          Booktitle                = {Custom Integrated Circuits Conference (CICC), 2011 IEEE},
-                          Year                     = {2011},
-                          Month                    = {Sept},
-                          Pages                    = {1-7},
-                          Abstract                 = {Start of the above-titled section of the conference proceedings record.},
-                          DOI                      = {10.1109/CICC.2011.6055279},
-                          ISSN                     = {0886-5930}
-                        }
-
-                        @Comment{jabref-meta: saveActions:enabled;
-                        month[normalize_month]
-                        pages[normalize_page_numbers]
-                        title[escapeAmpersands,escapeDollarSign,escapeUnderscores,latex_cleanup]
-                        booktitle[escapeAmpersands,escapeDollarSign,escapeUnderscores,latex_cleanup]
-                        publisher[escapeAmpersands,escapeDollarSign,escapeUnderscores,latex_cleanup]
-                        journal[escapeAmpersands,escapeDollarSign,escapeUnderscores,latex_cleanup]
-                        abstract[escapeAmpersands,escapeDollarSign,escapeUnderscores,latex_cleanup]
-                        ;}
-                        """));
-
-        FieldFormatterCleanups saveActions = parserResult.getMetaData().getSaveActions().get();
+            new StringReader(
+                """
+                @InProceedings{6055279,
+                  Title                    = {Educational session 1},
+                  Booktitle                = {Custom Integrated Circuits Conference (CICC), 2011 IEEE},
+                  Year                     = {2011},
+                  Month                    = {Sept},
+                  Pages                    = {1-7},
+                  Abstract                 = {Start of the above-titled section of the conference proceedings record.},
+                  DOI                      = {10.1109/CICC.2011.6055279},
+                  ISSN                     = {0886-5930}
+                }
+
+                @Comment{jabref-meta: saveActions:enabled;
+                month[normalize_month]
+                pages[normalize_page_numbers]
+                title[escapeAmpersands,escapeDollarSign,escapeUnderscores,latex_cleanup]
+                booktitle[escapeAmpersands,escapeDollarSign,escapeUnderscores,latex_cleanup]
+                publisher[escapeAmpersands,escapeDollarSign,escapeUnderscores,latex_cleanup]
+                journal[escapeAmpersands,escapeDollarSign,escapeUnderscores,latex_cleanup]
+                abstract[escapeAmpersands,escapeDollarSign,escapeUnderscores,latex_cleanup]
+                ;}
+                """
+            )
+        );
+
+        FieldFormatterCleanups saveActions = parserResult
+            .getMetaData()
+            .getSaveActions()
+            .get();
 
         assertTrue(saveActions.isEnabled());
 
         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)) {
-            expected.add(new FieldFormatterCleanup(field, new EscapeAmpersandsFormatter()));
-            expected.add(new FieldFormatterCleanup(field, new EscapeDollarSignFormatter()));
-            expected.add(new FieldFormatterCleanup(field, new EscapeUnderscoresFormatter()));
-            expected.add(new FieldFormatterCleanup(field, new LatexCleanupFormatter()));
+        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
+        )) {
+            expected.add(
+                new FieldFormatterCleanup(
+                    field,
+                    new EscapeAmpersandsFormatter()
+                )
+            );
+            expected.add(
+                new FieldFormatterCleanup(
+                    field,
+                    new EscapeDollarSignFormatter()
+                )
+            );
+            expected.add(
+                new FieldFormatterCleanup(
+                    field,
+                    new EscapeUnderscoresFormatter()
+                )
+            );
+            expected.add(
+                new FieldFormatterCleanup(field, new LatexCleanupFormatter())
+            );
         }
         assertEquals(expected, saveActions.getConfiguredActions());
     }
@@ -1261,95 +1773,149 @@ void parserKeepsSaveActions() throws IOException {
     @Test
     void parseRecognizesCRLFLineBreak() throws IOException {
         ParserResult result = parser.parse(
-                new StringReader("@InProceedings{6055279,\r\n" + "  Title                    = {Educational session 1},\r\n"
-                        + "  Booktitle                = {Custom Integrated Circuits Conference (CICC), 2011 IEEE},\r\n"
-                        + "  Year                     = {2011},\r\n" + "  Month                    = {Sept},\r\n"
-                        + "  Pages                    = {1-7},\r\n"
-                        + "  Abstract                 = {Start of the above-titled section of the conference proceedings record.},\r\n"
-                        + "  DOI                      = {10.1109/CICC.2011.6055279},\r\n"
-                        + "  ISSN                     = {0886-5930}\r\n" + "}\r\n"));
+            new StringReader(
+                "@InProceedings{6055279,\r\n" +
+                "  Title                    = {Educational session 1},\r\n" +
+                "  Booktitle                = {Custom Integrated Circuits Conference (CICC), 2011 IEEE},\r\n" +
+                "  Year                     = {2011},\r\n" +
+                "  Month                    = {Sept},\r\n" +
+                "  Pages                    = {1-7},\r\n" +
+                "  Abstract                 = {Start of the above-titled section of the conference proceedings record.},\r\n" +
+                "  DOI                      = {10.1109/CICC.2011.6055279},\r\n" +
+                "  ISSN                     = {0886-5930}\r\n" +
+                "}\r\n"
+            )
+        );
         assertEquals("\r\n", result.getDatabase().getNewLineSeparator());
     }
 
     @Test
     void parseRecognizesLFLineBreak() throws IOException {
         ParserResult result = parser.parse(
-                new StringReader("@InProceedings{6055279,\n" + "  Title                    = {Educational session 1},\n"
-                        + "  Booktitle                = {Custom Integrated Circuits Conference (CICC), 2011 IEEE},\n"
-                        + "  Year                     = {2011},\n" + "  Month                    = {Sept},\n"
-                        + "  Pages                    = {1-7},\n"
-                        + "  Abstract                 = {Start of the above-titled section of the conference proceedings record.},\n"
-                        + "  DOI                      = {10.1109/CICC.2011.6055279},\n"
-                        + "  ISSN                     = {0886-5930}\n" + "}\n"));
+            new StringReader(
+                "@InProceedings{6055279,\n" +
+                "  Title                    = {Educational session 1},\n" +
+                "  Booktitle                = {Custom Integrated Circuits Conference (CICC), 2011 IEEE},\n" +
+                "  Year                     = {2011},\n" +
+                "  Month                    = {Sept},\n" +
+                "  Pages                    = {1-7},\n" +
+                "  Abstract                 = {Start of the above-titled section of the conference proceedings record.},\n" +
+                "  DOI                      = {10.1109/CICC.2011.6055279},\n" +
+                "  ISSN                     = {0886-5930}\n" +
+                "}\n"
+            )
+        );
         assertEquals("\n", result.getDatabase().getNewLineSeparator());
     }
 
     @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();
+        FieldFormatterCleanups saveActions = parserResult
+            .getMetaData()
+            .getSaveActions()
+            .get();
 
         assertTrue(saveActions.isEnabled());
-        assertEquals(List.of(new FieldFormatterCleanup(StandardField.TITLE, new LowerCaseFormatter())),
-                saveActions.getConfiguredActions());
+        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]}"));
+            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)
-                ));
+            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());
+        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;}"));
+            new StringReader(
+                "@Comment{jabref-meta: saveOrderConfig:specified;author;false;year;true;abstract;false;}"
+            )
+        );
 
-        Optional<SaveOrder> saveOrderConfig = result.getMetaData().getSaveOrder();
+        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))),
-                saveOrderConfig.get());
+        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;}"
+            )
+        );
 
         GlobalCitationKeyPattern pattern = mock(GlobalCitationKeyPattern.class);
-        AbstractCitationKeyPattern bibtexKeyPattern = result.getMetaData().getCiteKeyPattern(pattern);
-        AbstractCitationKeyPattern expectedPattern = new DatabaseCitationKeyPattern(pattern);
+        AbstractCitationKeyPattern bibtexKeyPattern = result
+            .getMetaData()
+            .getCiteKeyPattern(pattern);
+        AbstractCitationKeyPattern expectedPattern =
+            new DatabaseCitationKeyPattern(pattern);
         expectedPattern.setDefaultValue("test");
-        expectedPattern.addCitationKeyPattern(StandardEntryType.Article, "articleTest");
+        expectedPattern.addCitationKeyPattern(
+            StandardEntryType.Article,
+            "articleTest"
+        );
 
         assertEquals(expectedPattern, bibtexKeyPattern);
     }
 
     @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();
 
@@ -1358,26 +1924,51 @@ void integrationTestBiblatexMode() throws IOException {
 
     @Test
     void integrationTestGroupTree() throws IOException, ParseException {
-        ParserResult result = parser.parse(new StringReader("""
+        ParserResult result = parser.parse(
+            new StringReader(
+                """
                 @comment{jabref-meta: groupsversion:3;}
                 @comment{jabref-meta: groupstree:
                 0 AllEntriesGroup:;
                 1 KeywordGroup:Fréchet\\;0\\;keywords\\;FrechetSpace\\;0\\;1\\;;
                 1 KeywordGroup:Invariant theory\\;0\\;keywords\\;GIT\\;0\\;0\\;;
-                1 ExplicitGroup:TestGroup\\;0\\;Key1\\;Key2\\;;}"""));
+                1 ExplicitGroup:TestGroup\\;0\\;Key1\\;Key2\\;;}"""
+            )
+        );
 
         GroupTreeNode root = result.getMetaData().getGroups().get();
 
         assertEquals(new AllEntriesGroup("All entries"), root.getGroup());
         assertEquals(3, root.getNumberOfChildren());
         assertEquals(
-                new RegexKeywordGroup("Fréchet", GroupHierarchyType.INDEPENDENT, StandardField.KEYWORDS, "FrechetSpace", false),
-                root.getChildren().get(0).getGroup());
+            new RegexKeywordGroup(
+                "Fréchet",
+                GroupHierarchyType.INDEPENDENT,
+                StandardField.KEYWORDS,
+                "FrechetSpace",
+                false
+            ),
+            root.getChildren().get(0).getGroup()
+        );
         assertEquals(
-                new WordKeywordGroup("Invariant theory", GroupHierarchyType.INDEPENDENT, StandardField.KEYWORDS, "GIT", false, ',', false),
-                root.getChildren().get(1).getGroup());
-        assertEquals(Arrays.asList("Key1", "Key2"),
-                ((ExplicitGroup) root.getChildren().get(2).getGroup()).getLegacyEntryKeys());
+            new WordKeywordGroup(
+                "Invariant theory",
+                GroupHierarchyType.INDEPENDENT,
+                StandardField.KEYWORDS,
+                "GIT",
+                false,
+                ',',
+                false
+            ),
+            root.getChildren().get(1).getGroup()
+        );
+        assertEquals(
+            Arrays.asList("Key1", "Key2"),
+            ((ExplicitGroup) root
+                    .getChildren()
+                    .get(2)
+                    .getGroup()).getLegacyEntryKeys()
+        );
     }
 
     /**
@@ -1385,33 +1976,47 @@ void integrationTestGroupTree() throws IOException, ParseException {
      */
     @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().get(0).getGroup()).getFilePath(),
-                Path.of("src/test/resources/org/jabref/model/groups/paper.aux"));
+        assertEquals(
+            ((TexGroup) root.getChildren().get(0).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());
     }
@@ -1419,7 +2024,10 @@ void integrationTestProtectedFlag() throws IOException {
     @Test
     void integrationTestContentSelectors() throws IOException {
         ParserResult result = parser.parse(
-                new StringReader("@Comment{jabref-meta: selector_pubstate:approved;captured;received;status;}"));
+            new StringReader(
+                "@Comment{jabref-meta: selector_pubstate:approved;captured;received;status;}"
+            )
+        );
 
         List<String> values = new ArrayList<>(4);
         values.add("approved");
@@ -1427,15 +2035,22 @@ 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 = """
-                @ReallyUnknownType{test,
-                 Comment                  = {testentry}
-                }""";
+        String bibtexEntry =
+            """
+            @ReallyUnknownType{test,
+             Comment                  = {testentry}
+            }""";
 
         Collection<BibEntry> entries = parser.parseEntries(bibtexEntry);
         BibEntry expectedEntry = new BibEntry();
@@ -1448,10 +2063,11 @@ void parseReallyUnknownType() throws Exception {
 
     @Test
     void parseOtherTypeTest() throws Exception {
-        String bibtexEntry = """
-                @Other{test,
-                 Comment                  = {testentry}
-                }""";
+        String bibtexEntry =
+            """
+            @Other{test,
+             Comment                  = {testentry}
+            }""";
 
         Collection<BibEntry> entries = parser.parseEntries(bibtexEntry);
         BibEntry expectedEntry = new BibEntry();
@@ -1466,12 +2082,18 @@ void parseOtherTypeTest() throws Exception {
     void parseRecognizesDatabaseID() throws Exception {
         String expectedDatabaseID = "q1w2e3r4t5z6";
         StringBuilder sharedDatabaseFileContent = new StringBuilder()
-                .append("\\% DBID: ").append(expectedDatabaseID)
-                .append(OS.NEWLINE)
-                .append("@Article{a}");
+            .append("\\% DBID: ")
+            .append(expectedDatabaseID)
+            .append(OS.NEWLINE)
+            .append("@Article{a}");
 
-        ParserResult parserResult = parser.parse(new StringReader(sharedDatabaseFileContent.toString()));
-        String actualDatabaseID = parserResult.getDatabase().getSharedDatabaseID().get();
+        ParserResult parserResult = parser.parse(
+            new StringReader(sharedDatabaseFileContent.toString())
+        );
+        String actualDatabaseID = parserResult
+            .getDatabase()
+            .getSharedDatabaseID()
+            .get();
 
         assertEquals(expectedDatabaseID, actualDatabaseID);
     }
@@ -1479,11 +2101,15 @@ void parseRecognizesDatabaseID() throws Exception {
     @Test
     void parseDoesNotRecognizeDatabaseIDasUserComment() throws Exception {
         StringBuilder sharedDatabaseFileContent = new StringBuilder()
-                .append("\\% Encoding: UTF-8").append(OS.NEWLINE)
-                .append("\\% DBID: q1w2e3r4t5z6").append(OS.NEWLINE)
-                .append("@Article{a}");
+            .append("\\% Encoding: UTF-8")
+            .append(OS.NEWLINE)
+            .append("\\% DBID: q1w2e3r4t5z6")
+            .append(OS.NEWLINE)
+            .append("@Article{a}");
 
-        ParserResult parserResult = parser.parse(new StringReader(sharedDatabaseFileContent.toString()));
+        ParserResult parserResult = parser.parse(
+            new StringReader(sharedDatabaseFileContent.toString())
+        );
         List<BibEntry> entries = parserResult.getDatabase().getEntries();
 
         assertEquals(1, entries.size());
@@ -1493,36 +2119,71 @@ 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;}"));
+            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(
+            "\\Literature\\",
+            result.getMetaData().getDefaultFileDirectory().get()
+        );
+        assertEquals(
+            "D:\\Documents",
+            result.getMetaData().getUserFileDirectory("defaultOwner-user").get()
+        );
+        assertEquals(
+            "D:\\Latex",
+            result
+                .getMetaData()
+                .getLatexFileDirectory("defaultOwner-user")
+                .get()
+                .toString()
+        );
     }
 
     @ParameterizedTest
-    @CsvSource({
+    @CsvSource(
+        {
             // 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 + "}"));
-        assertEquals(directory, result.getMetaData().getDefaultFileDirectory().get());
+            new StringReader(
+                "@comment{jabref-meta: fileDirectory:" + directory + "}"
+            )
+        );
+        assertEquals(
+            directory,
+            result.getMetaData().getDefaultFileDirectory().get()
+        );
     }
 
     @ParameterizedTest
-    @CsvSource({
+    @CsvSource(
+        {
             "C:\\temp\\test, C:\\\\temp\\\\test",
-            "\\\\servername\\path\\to\\file, \\\\\\\\servername\\\\path\\\\to\\\\file"})
-    void fileDirectoryWithDoubleEscapeIsRead(String expected, String provided) throws IOException {
+            "\\\\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 + "}"));
-        assertEquals(expected, result.getMetaData().getDefaultFileDirectory().get());
+            new StringReader(
+                "@comment{jabref-meta: fileDirectory: " + provided + "}"
+            )
+        );
+        assertEquals(
+            expected,
+            result.getMetaData().getDefaultFileDirectory().get()
+        );
     }
 
     @Test
@@ -1543,25 +2204,29 @@ void parseReturnsEntriesInSameOrder() throws IOException {
         third.setCitationKey("c");
         expected.add(third);
 
-        ParserResult result = parser
-                .parse(new StringReader("""
-                        @article{a}
-                        @article{b}
-                        @inProceedings{c}"""));
+        ParserResult result = parser.parse(
+            new StringReader(
+                """
+                @article{a}
+                @article{b}
+                @inProceedings{c}"""
+            )
+        );
 
         assertEquals(expected, result.getDatabase().getEntries());
     }
 
     @Test
     void parsePrecedingComment() throws IOException {
-        String bibtexEntry = """
-                % Some random comment that should stay here
-                @Article{test,
-                  Author                   = {Foo Bar},
-                  Journal                  = {International Journal of Something},
-                  Note                     = {some note},
-                  Number                   = {1}
-                }""";
+        String bibtexEntry =
+            """
+            % Some random comment that should stay here
+            @Article{test,
+              Author                   = {Foo Bar},
+              Journal                  = {International Journal of Something},
+              Note                     = {some note},
+              Number                   = {1}
+            }""";
 
         // read in bibtex string
         ParserResult result = parser.parse(new StringReader(bibtexEntry));
@@ -1572,19 +2237,23 @@ void parsePrecedingComment() throws IOException {
         assertEquals(Optional.of("test"), entry.getCitationKey());
         assertEquals(5, entry.getFields().size());
         assertTrue(entry.getFields().contains(StandardField.AUTHOR));
-        assertEquals(Optional.of("Foo Bar"), entry.getField(StandardField.AUTHOR));
+        assertEquals(
+            Optional.of("Foo Bar"),
+            entry.getField(StandardField.AUTHOR)
+        );
         assertEquals(bibtexEntry, entry.getParsedSerialization());
     }
 
     @Test
     void parseCommentAndEntryInOneLine() throws IOException {
-        String bibtexEntry = """
-                Some random comment that should stay here @Article{test,
-                  Author                   = {Foo Bar},
-                  Journal                  = {International Journal of Something},
-                  Note                     = {some note},
-                  Number                   = {1}
-                }""";
+        String bibtexEntry =
+            """
+            Some random comment that should stay here @Article{test,
+              Author                   = {Foo Bar},
+              Journal                  = {International Journal of Something},
+              Note                     = {some note},
+              Number                   = {1}
+            }""";
 
         // read in bibtex string
         ParserResult result = parser.parse(new StringReader(bibtexEntry));
@@ -1595,7 +2264,10 @@ void parseCommentAndEntryInOneLine() throws IOException {
         assertEquals(Optional.of("test"), entry.getCitationKey());
         assertEquals(5, entry.getFields().size());
         assertTrue(entry.getFields().contains(StandardField.AUTHOR));
-        assertEquals(Optional.of("Foo Bar"), entry.getField(StandardField.AUTHOR));
+        assertEquals(
+            Optional.of("Foo Bar"),
+            entry.getField(StandardField.AUTHOR)
+        );
         assertEquals(bibtexEntry, entry.getParsedSerialization());
     }
 
@@ -1604,10 +2276,14 @@ void preserveEncodingPrefixInsideEntry() throws ParseException {
         BibEntry expected = new BibEntry();
         expected.setType(StandardEntryType.Article);
         expected.setCitationKey("test");
-        expected.setField(StandardField.AUTHOR, SaveConfiguration.ENCODING_PREFIX);
+        expected.setField(
+            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);
     }
@@ -1623,14 +2299,15 @@ void parseBracketedComment() throws IOException {
 
     @Test
     void parseRegularCommentBeforeEntry() throws IOException {
-        String bibtexEntry = """
-                @Comment{someComment}
-                @Article{test,
-                  Author                   = {Foo Bar},
-                  Journal                  = {International Journal of Something},
-                  Note                     = {some note},
-                  Number                   = {1}
-                }""";
+        String bibtexEntry =
+            """
+            @Comment{someComment}
+            @Article{test,
+              Author                   = {Foo Bar},
+              Journal                  = {International Journal of Something},
+              Note                     = {some note},
+              Number                   = {1}
+            }""";
 
         ParserResult result = parser.parse(new StringReader(bibtexEntry));
         Collection<BibEntry> entries = result.getDatabase().getEntries();
@@ -1650,14 +2327,15 @@ void parseCommentWithoutBrackets() throws IOException {
 
     @Test
     void parseCommentWithoutBracketsBeforeEntry() throws IOException {
-        String bibtexEntry = """
-                @Comment someComment
-                @Article{test,
-                  Author                   = {Foo Bar},
-                  Journal                  = {International Journal of Something},
-                  Note                     = {some note},
-                  Number                   = {1}
-                }""";
+        String bibtexEntry =
+            """
+            @Comment someComment
+            @Article{test,
+              Author                   = {Foo Bar},
+              Journal                  = {International Journal of Something},
+              Note                     = {some note},
+              Number                   = {1}
+            }""";
 
         ParserResult result = parser.parse(new StringReader(bibtexEntry));
         Collection<BibEntry> entries = result.getDatabase().getEntries();
@@ -1668,16 +2346,17 @@ void parseCommentWithoutBracketsBeforeEntry() throws IOException {
 
     @Test
     void parseCommentContainingEntries() throws IOException {
-        String bibtexEntry = """
-                @Comment{@article{myarticle,}
-                @inproceedings{blabla, title={the proceedings of blabla}; }
-                }
-                @Article{test,
-                  Author                   = {Foo Bar},
-                  Journal                  = {International Journal of Something},
-                  Note                     = {some note},
-                  Number                   = {1}
-                }""";
+        String bibtexEntry =
+            """
+            @Comment{@article{myarticle,}
+            @inproceedings{blabla, title={the proceedings of blabla}; }
+            }
+            @Article{test,
+              Author                   = {Foo Bar},
+              Journal                  = {International Journal of Something},
+              Note                     = {some note},
+              Number                   = {1}
+            }""";
 
         ParserResult result = parser.parse(new StringReader(bibtexEntry));
         Collection<BibEntry> entries = result.getDatabase().getEntries();
@@ -1688,16 +2367,17 @@ void parseCommentContainingEntries() throws IOException {
 
     @Test
     void parseCommentContainingEntriesAndAtSymbols() throws IOException {
-        String bibtexEntry = """
-                @Comment{@article{myarticle,}
-                @inproceedings{blabla, title={the proceedings of bl@bl@}; }
-                }
-                @Article{test,
-                  Author                   = {Foo@Bar},
-                  Journal                  = {International Journal of Something},
-                  Note                     = {some note},
-                  Number                   = {1}
-                }""";
+        String bibtexEntry =
+            """
+            @Comment{@article{myarticle,}
+            @inproceedings{blabla, title={the proceedings of bl@bl@}; }
+            }
+            @Article{test,
+              Author                   = {Foo@Bar},
+              Journal                  = {International Journal of Something},
+              Note                     = {some note},
+              Number                   = {1}
+            }""";
 
         ParserResult result = parser.parse(new StringReader(bibtexEntry));
         Collection<BibEntry> entries = result.getDatabase().getEntries();
@@ -1724,60 +2404,81 @@ 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());
+        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());
+        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());
+        assertEquals(
+            new Date(2003, 2),
+            result.get().getPublicationDate().get()
+        );
     }
 
     @Test
     void parseYear() throws Exception {
-        Optional<BibEntry> result = parser.parseSingleEntry("@ARTICLE{HipKro03, year = {2003} }");
+        Optional<BibEntry> result = parser.parseSingleEntry(
+            "@ARTICLE{HipKro03, year = {2003} }"
+        );
 
         assertEquals(new Date(2003), result.get().getPublicationDate().get());
     }
 
     @Test
-    void parseEntryUsingStringConstantsForTwoAuthorsWithEtAsStringConstant() throws ParseException {
+    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 }");
+        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#");
+            .withCitationKey("m1")
+            .withField(StandardField.AUTHOR, "#kopp##et##kubovy#");
 
         assertEquals(List.of(expectedEntry), parsed);
     }
 
     @Test
-    void parseStringConstantsForTwoAuthorsHasCorrectBibTeXEntry() throws ParseException {
+    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 }");
+        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#");
+            .withCitationKey("m2")
+            .withField(StandardField.AUTHOR, "#kopp# and #kubovy#");
 
         assertEquals(List.of(expectedEntry), parsed);
     }
@@ -1785,59 +2486,76 @@ 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
     void textAprilIsParsedAsMonthApril() throws ParseException {
-        Optional<BibEntry> result = parser.parseSingleEntry("@Misc{m, month = \"apr\" }");
+        Optional<BibEntry> result = parser.parseSingleEntry(
+            "@Misc{m, month = \"apr\" }"
+        );
 
         assertEquals(Month.APRIL, result.get().getMonth().get());
     }
 
     @Test
     void textAprilIsDisplayedAsConstant() throws ParseException {
-        Optional<BibEntry> result = parser.parseSingleEntry("@Misc{m, month = \"apr\" }");
+        Optional<BibEntry> result = parser.parseSingleEntry(
+            "@Misc{m, month = \"apr\" }"
+        );
 
         assertEquals("apr", result.get().getField(StandardField.MONTH).get());
     }
 
     @Test
     void bibTeXConstantAprilIsParsedAsMonthApril() throws ParseException {
-        Optional<BibEntry> result = parser.parseSingleEntry("@Misc{m, month = apr }");
+        Optional<BibEntry> result = parser.parseSingleEntry(
+            "@Misc{m, month = apr }"
+        );
 
         assertEquals(Month.APRIL, result.get().getMonth().get());
     }
 
     @Test
     void bibTeXConstantAprilIsDisplayedAsConstant() throws ParseException {
-        Optional<BibEntry> result = parser.parseSingleEntry("@Misc{m, month = apr }");
+        Optional<BibEntry> result = parser.parseSingleEntry(
+            "@Misc{m, month = apr }"
+        );
 
         assertEquals("#apr#", result.get().getField(StandardField.MONTH).get());
     }
 
     @Test
-    void bibTeXConstantAprilIsParsedAsStringMonthAprilWhenReadingTheField() throws ParseException {
-        Optional<BibEntry> result = parser.parseSingleEntry("@Misc{m, month = apr }");
+    void bibTeXConstantAprilIsParsedAsStringMonthAprilWhenReadingTheField()
+        throws ParseException {
+        Optional<BibEntry> result = parser.parseSingleEntry(
+            "@Misc{m, month = apr }"
+        );
 
-        assertEquals(Optional.of("#apr#"), result.get().getField(StandardField.MONTH));
+        assertEquals(
+            Optional.of("#apr#"),
+            result.get().getField(StandardField.MONTH)
+        );
     }
 
     @Test
     void parseDuplicateKeywordsWithOnlyOneEntry() throws ParseException {
-        Optional<BibEntry> result = parser.parseSingleEntry("@Article{,\n"
-                + "Keywords={asdf,asdf,asdf},\n"
-                + "}\n"
-                + "");
+        Optional<BibEntry> result = parser.parseSingleEntry(
+            "@Article{,\n" + "Keywords={asdf,asdf,asdf},\n" + "}\n" + ""
+        );
 
         BibEntry expectedEntry = new BibEntry(StandardEntryType.Article)
-                .withField(StandardField.KEYWORDS, "asdf,asdf,asdf");
+            .withField(StandardField.KEYWORDS, "asdf,asdf,asdf");
 
         assertEquals(Optional.of(expectedEntry), result);
     }
@@ -1845,22 +2563,26 @@ void parseDuplicateKeywordsWithOnlyOneEntry() throws ParseException {
     @Test
     void parseDuplicateKeywordsWithTwoEntries() throws Exception {
         BibEntry expectedEntryFirst = new BibEntry(StandardEntryType.Article)
-                .withField(StandardField.KEYWORDS, "bbb")
-                .withCitationKey("Test2017");
+            .withField(StandardField.KEYWORDS, "bbb")
+            .withCitationKey("Test2017");
 
         BibEntry expectedEntrySecond = new BibEntry(StandardEntryType.Article)
-                .withField(StandardField.KEYWORDS, "asdf,asdf,asdf");
-
-        String entries = """
-                @Article{Test2017,
-                  keywords = {bbb},
-                }
-
-                @Article{,
-                  keywords = {asdf,asdf,asdf},
-                },
-                """;
+            .withField(StandardField.KEYWORDS, "asdf,asdf,asdf");
+
+        String entries =
+            """
+            @Article{Test2017,
+              keywords = {bbb},
+            }
+
+            @Article{,
+              keywords = {asdf,asdf,asdf},
+            },
+            """;
         ParserResult result = parser.parse(new StringReader(entries));
-        assertEquals(List.of(expectedEntryFirst, expectedEntrySecond), result.getDatabase().getEntries());
+        assertEquals(
+            List.of(expectedEntryFirst, expectedEntrySecond),
+            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 cc3e27cae1f..b7176d50c64 100644
--- a/src/test/java/org/jabref/logic/importer/fileformat/CffImporterTest.java
+++ b/src/test/java/org/jabref/logic/importer/fileformat/CffImporterTest.java
@@ -1,25 +1,23 @@
 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 java.io.IOException;
 import java.net.URISyntaxException;
 import java.nio.file.Path;
 import java.util.Arrays;
 import java.util.List;
-
 import org.jabref.logic.util.StandardFileType;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.field.BiblatexSoftwareField;
 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;
-import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-
 public class CffImporterTest {
 
     private CffImporter importer;
@@ -46,41 +44,70 @@ public void testsGetExtensions() {
 
     @Test
     public void testGetDescription() {
-        assertEquals("Importer for the CFF format. Is only used to cite software, one entry per file.",
-                importer.getDescription());
+        assertEquals(
+            "Importer for the CFF format. Is only used to cite software, one entry per file.",
+            importer.getDescription()
+        );
     }
 
     @Test
-    public void testIsRecognizedFormat() throws IOException, URISyntaxException {
-        Path file = Path.of(CffImporterTest.class.getResource("CffImporterTestValid.cff").toURI());
+    public void testIsRecognizedFormat()
+        throws IOException, URISyntaxException {
+        Path file = Path.of(
+            CffImporterTest.class.getResource("CffImporterTestValid.cff")
+                .toURI()
+        );
         assertTrue(importer.isRecognizedFormat(file));
     }
 
     @Test
-    public void testIsRecognizedFormatReject() throws IOException, URISyntaxException {
-        List<String> list = Arrays.asList("CffImporterTestInvalid1.cff", "CffImporterTestInvalid2.cff");
+    public void testIsRecognizedFormatReject()
+        throws IOException, URISyntaxException {
+        List<String> list = Arrays.asList(
+            "CffImporterTestInvalid1.cff",
+            "CffImporterTestInvalid2.cff"
+        );
 
         for (String string : list) {
-            Path file = Path.of(CffImporterTest.class.getResource(string).toURI());
+            Path file = Path.of(
+                CffImporterTest.class.getResource(string).toURI()
+            );
             assertFalse(importer.isRecognizedFormat(file));
         }
     }
 
     @Test
-    public void testImportEntriesBasic() throws IOException, URISyntaxException {
-        Path file = Path.of(CffImporterTest.class.getResource("CffImporterTestValid.cff").toURI());
-        List<BibEntry> bibEntries = importer.importDatabase(file).getDatabase().getEntries();
+    public void testImportEntriesBasic()
+        throws IOException, URISyntaxException {
+        Path file = Path.of(
+            CffImporterTest.class.getResource("CffImporterTestValid.cff")
+                .toURI()
+        );
+        List<BibEntry> bibEntries = importer
+            .importDatabase(file)
+            .getDatabase()
+            .getEntries();
         BibEntry entry = bibEntries.get(0);
 
-        BibEntry expected = getPopulatedEntry().withField(StandardField.AUTHOR, "Joe van Smith");
+        BibEntry expected = getPopulatedEntry()
+            .withField(StandardField.AUTHOR, "Joe van Smith");
 
         assertEquals(entry, expected);
     }
 
     @Test
-    public void testImportEntriesMultipleAuthors() throws IOException, URISyntaxException {
-        Path file = Path.of(CffImporterTest.class.getResource("CffImporterTestValidMultAuthors.cff").toURI());
-        List<BibEntry> bibEntries = importer.importDatabase(file).getDatabase().getEntries();
+    public void testImportEntriesMultipleAuthors()
+        throws IOException, URISyntaxException {
+        Path file = Path.of(
+            CffImporterTest.class.getResource(
+                    "CffImporterTestValidMultAuthors.cff"
+                )
+                .toURI()
+        );
+        List<BibEntry> bibEntries = importer
+            .importDatabase(file)
+            .getDatabase()
+            .getEntries();
         BibEntry entry = bibEntries.get(0);
 
         BibEntry expected = getPopulatedEntry();
@@ -89,31 +116,64 @@ public void testImportEntriesMultipleAuthors() throws IOException, URISyntaxExce
     }
 
     @Test
-    public void testImportEntriesSwhIdSelect1() throws IOException, URISyntaxException {
-        Path file = Path.of(CffImporterTest.class.getResource("CffImporterTestValidSwhIdSelect1.cff").toURI());
-        List<BibEntry> bibEntries = importer.importDatabase(file).getDatabase().getEntries();
+    public void testImportEntriesSwhIdSelect1()
+        throws IOException, URISyntaxException {
+        Path file = Path.of(
+            CffImporterTest.class.getResource(
+                    "CffImporterTestValidSwhIdSelect1.cff"
+                )
+                .toURI()
+        );
+        List<BibEntry> bibEntries = importer
+            .importDatabase(file)
+            .getDatabase()
+            .getEntries();
         BibEntry entry = bibEntries.get(0);
 
-        BibEntry expected = getPopulatedEntry().withField(BiblatexSoftwareField.SWHID, "swh:1:rel:22ece559cc7cc2364edc5e5593d63ae8bd229f9f");
+        BibEntry expected = getPopulatedEntry()
+            .withField(
+                BiblatexSoftwareField.SWHID,
+                "swh:1:rel:22ece559cc7cc2364edc5e5593d63ae8bd229f9f"
+            );
 
         assertEquals(entry, expected);
     }
 
     @Test
-    public void testImportEntriesSwhIdSelect2() throws IOException, URISyntaxException {
-        Path file = Path.of(CffImporterTest.class.getResource("CffImporterTestValidSwhIdSelect2.cff").toURI());
-        List<BibEntry> bibEntries = importer.importDatabase(file).getDatabase().getEntries();
+    public void testImportEntriesSwhIdSelect2()
+        throws IOException, URISyntaxException {
+        Path file = Path.of(
+            CffImporterTest.class.getResource(
+                    "CffImporterTestValidSwhIdSelect2.cff"
+                )
+                .toURI()
+        );
+        List<BibEntry> bibEntries = importer
+            .importDatabase(file)
+            .getDatabase()
+            .getEntries();
         BibEntry entry = bibEntries.get(0);
 
-        BibEntry expected = getPopulatedEntry().withField(BiblatexSoftwareField.SWHID, "swh:1:cnt:94a9ed024d3859793618152ea559a168bbcbb5e2");
+        BibEntry expected = getPopulatedEntry()
+            .withField(
+                BiblatexSoftwareField.SWHID,
+                "swh:1:cnt:94a9ed024d3859793618152ea559a168bbcbb5e2"
+            );
 
         assertEquals(entry, expected);
     }
 
     @Test
-    public void testImportEntriesDataset() throws IOException, URISyntaxException {
-        Path file = Path.of(CffImporterTest.class.getResource("CffImporterTestDataset.cff").toURI());
-        List<BibEntry> bibEntries = importer.importDatabase(file).getDatabase().getEntries();
+    public void testImportEntriesDataset()
+        throws IOException, URISyntaxException {
+        Path file = Path.of(
+            CffImporterTest.class.getResource("CffImporterTestDataset.cff")
+                .toURI()
+        );
+        List<BibEntry> bibEntries = importer
+            .importDatabase(file)
+            .getDatabase()
+            .getEntries();
         BibEntry entry = bibEntries.get(0);
 
         BibEntry expected = getPopulatedEntry();
@@ -123,9 +183,16 @@ public void testImportEntriesDataset() throws IOException, URISyntaxException {
     }
 
     @Test
-    public void testImportEntriesDoiSelect() throws IOException, URISyntaxException {
-        Path file = Path.of(CffImporterTest.class.getResource("CffImporterTestDoiSelect.cff").toURI());
-        List<BibEntry> bibEntries = importer.importDatabase(file).getDatabase().getEntries();
+    public void testImportEntriesDoiSelect()
+        throws IOException, URISyntaxException {
+        Path file = Path.of(
+            CffImporterTest.class.getResource("CffImporterTestDoiSelect.cff")
+                .toURI()
+        );
+        List<BibEntry> bibEntries = importer
+            .importDatabase(file)
+            .getDatabase()
+            .getEntries();
         BibEntry entry = bibEntries.get(0);
 
         BibEntry expected = getPopulatedEntry();
@@ -134,12 +201,22 @@ public void testImportEntriesDoiSelect() throws IOException, URISyntaxException
     }
 
     @Test
-    public void testImportEntriesUnknownFields() throws IOException, URISyntaxException {
-        Path file = Path.of(CffImporterTest.class.getResource("CffImporterTestUnknownFields.cff").toURI());
-        List<BibEntry> bibEntries = importer.importDatabase(file).getDatabase().getEntries();
+    public void testImportEntriesUnknownFields()
+        throws IOException, URISyntaxException {
+        Path file = Path.of(
+            CffImporterTest.class.getResource(
+                    "CffImporterTestUnknownFields.cff"
+                )
+                .toURI()
+        );
+        List<BibEntry> bibEntries = importer
+            .importDatabase(file)
+            .getDatabase()
+            .getEntries();
         BibEntry entry = bibEntries.get(0);
 
-        BibEntry expected = getPopulatedEntry().withField(new UnknownField("commit"), "10ad");
+        BibEntry expected = getPopulatedEntry()
+            .withField(new UnknownField("commit"), "10ad");
 
         assertEquals(entry, expected);
     }
@@ -148,7 +225,10 @@ public BibEntry getPopulatedEntry() {
         BibEntry entry = new BibEntry();
         entry.setType(StandardEntryType.Software);
 
-        entry.setField(StandardField.AUTHOR, "Joe van Smith and Bob Jones, Jr.");
+        entry.setField(
+            StandardField.AUTHOR,
+            "Joe van Smith and Bob Jones, Jr."
+        );
         entry.setField(StandardField.TITLE, "Test");
         entry.setField(StandardField.URL, "www.google.com");
         entry.setField(BiblatexSoftwareField.REPOSITORY, "www.github.com");
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 4f59c86b0d5..ff25a94e91f 100644
--- a/src/test/java/org/jabref/logic/importer/fileformat/CitaviXmlImporterFilesTest.java
+++ b/src/test/java/org/jabref/logic/importer/fileformat/CitaviXmlImporterFilesTest.java
@@ -3,7 +3,6 @@
 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;
 
@@ -13,12 +12,15 @@ public class CitaviXmlImporterFilesTest {
     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();
     }
 
     private static Stream<String> invalidFileNames() throws IOException {
-        Predicate<String> fileName = name -> !name.startsWith("CitaviXmlImporterTest");
+        Predicate<String> fileName = name ->
+            !name.startsWith("CitaviXmlImporterTest");
         return ImporterTestEngine.getTestFiles(fileName).stream();
     }
 
@@ -31,12 +33,19 @@ void testIsRecognizedFormat(String fileName) throws IOException {
     @ParameterizedTest
     @MethodSource("invalidFileNames")
     void testIsNotRecognizedFormat(String fileName) throws IOException {
-        ImporterTestEngine.testIsNotRecognizedFormat(citaviXmlImporter, fileName);
+        ImporterTestEngine.testIsNotRecognizedFormat(
+            citaviXmlImporter,
+            fileName
+        );
     }
 
     @ParameterizedTest
     @MethodSource("fileNames")
     void testImportEntries(String fileName) throws Exception {
-        ImporterTestEngine.testImportEntries(citaviXmlImporter, fileName, FILE_ENDING);
+        ImporterTestEngine.testImportEntries(
+            citaviXmlImporter,
+            fileName,
+            FILE_ENDING
+        );
     }
 }
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 ab8ddd6e1e6..985c9430ce7 100644
--- a/src/test/java/org/jabref/logic/importer/fileformat/CitaviXmlImporterTest.java
+++ b/src/test/java/org/jabref/logic/importer/fileformat/CitaviXmlImporterTest.java
@@ -1,22 +1,22 @@
 package org.jabref.logic.importer.fileformat;
 
-import java.util.stream.Stream;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
+import java.util.stream.Stream;
 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;
-
 class CitaviXmlImporterTest {
 
     CitaviXmlImporter citaviXmlImporter = new CitaviXmlImporter();
 
     public static Stream<Arguments> cleanUpText() {
         return Stream.of(
-                Arguments.of("no action", "no action"),
-                Arguments.of("\\{action\\}", "{action}"),
-                Arguments.of("\\}", "}"));
+            Arguments.of("no action", "no action"),
+            Arguments.of("\\{action\\}", "{action}"),
+            Arguments.of("\\}", "}")
+        );
     }
 
     @ParameterizedTest
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 c35b0c4c901..5d9793e8f74 100644
--- a/src/test/java/org/jabref/logic/importer/fileformat/CopacImporterFilesTest.java
+++ b/src/test/java/org/jabref/logic/importer/fileformat/CopacImporterFilesTest.java
@@ -3,7 +3,6 @@
 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;
 
@@ -12,31 +11,42 @@ public 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();
     }
 
     private static Stream<String> nonCopacfileNames() throws IOException {
-        Predicate<String> fileName = name -> !name.startsWith("CopacImporterTest");
+        Predicate<String> fileName = name ->
+            !name.startsWith("CopacImporterTest");
         return ImporterTestEngine.getTestFiles(fileName).stream();
     }
 
     @ParameterizedTest
     @MethodSource("fileNames")
     public void testIsRecognizedFormat(String fileName) throws IOException {
-        ImporterTestEngine.testIsRecognizedFormat(new CopacImporter(), fileName);
+        ImporterTestEngine.testIsRecognizedFormat(
+            new CopacImporter(),
+            fileName
+        );
     }
 
     @ParameterizedTest
     @MethodSource("nonCopacfileNames")
     public void testIsNotRecognizedFormat(String fileName) throws IOException {
-        ImporterTestEngine.testIsNotRecognizedFormat(new CopacImporter(), fileName);
+        ImporterTestEngine.testIsNotRecognizedFormat(
+            new CopacImporter(),
+            fileName
+        );
     }
 
     @ParameterizedTest
     @MethodSource("fileNames")
     public void testImportEntries(String fileName) throws Exception {
-        ImporterTestEngine.testImportEntries(new CopacImporter(), fileName, FILE_ENDING);
+        ImporterTestEngine.testImportEntries(
+            new CopacImporter(),
+            fileName,
+            FILE_ENDING
+        );
     }
 }
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 3ecf3760a49..15ddc00baf5 100644
--- a/src/test/java/org/jabref/logic/importer/fileformat/CopacImporterTest.java
+++ b/src/test/java/org/jabref/logic/importer/fileformat/CopacImporterTest.java
@@ -1,17 +1,15 @@
 package org.jabref.logic.importer.fileformat;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
 import java.nio.file.Path;
 import java.util.Collections;
 import java.util.List;
-
 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;
-
 public class CopacImporterTest {
 
     private CopacImporter importer;
@@ -33,8 +31,13 @@ public void testGetDescription() {
 
     @Test
     public void testImportEmptyEntries() throws Exception {
-        Path path = Path.of(CopacImporterTest.class.getResource("Empty.txt").toURI());
-        List<BibEntry> entries = importer.importDatabase(path).getDatabase().getEntries();
+        Path path = Path.of(
+            CopacImporterTest.class.getResource("Empty.txt").toURI()
+        );
+        List<BibEntry> entries = importer
+            .importDatabase(path)
+            .getDatabase()
+            .getEntries();
         assertEquals(Collections.emptyList(), entries);
     }
 }
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 52108a8097d..0b9e6e4b7e4 100644
--- a/src/test/java/org/jabref/logic/importer/fileformat/CustomImporterTest.java
+++ b/src/test/java/org/jabref/logic/importer/fileformat/CustomImporterTest.java
@@ -1,16 +1,14 @@
 package org.jabref.logic.importer.fileformat;
 
+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;
-
 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;
-
 public class CustomImporterTest {
 
     private CustomImporter importer;
@@ -32,19 +30,31 @@ public void testGetId() {
 
     @Test
     public void testGetClassName() {
-        assertEquals("org.jabref.logic.importer.fileformat.CopacImporter", importer.getClassName());
+        assertEquals(
+            "org.jabref.logic.importer.fileformat.CopacImporter",
+            importer.getClassName()
+        );
     }
 
     @Test
     public void testGetBasePath() {
-        assertEquals(Path.of("src/main/java/org/jabref/logic/importer/fileformat/CopacImporter.java"),
-                importer.getBasePath());
+        assertEquals(
+            Path.of(
+                "src/main/java/org/jabref/logic/importer/fileformat/CopacImporter.java"
+            ),
+            importer.getBasePath()
+        );
     }
 
     @Test
     public void testGetAsStringList() {
-        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
@@ -67,7 +77,10 @@ public void testCompareToSmaller() throws Exception {
 
     @Test
     public void testCompareToEven() throws Exception {
-        assertEquals(0, importer.compareTo(asCustomImporter(new CopacImporter())));
+        assertEquals(
+            0,
+            importer.compareTo(asCustomImporter(new CopacImporter()))
+        );
     }
 
     @Test
@@ -78,15 +91,20 @@ public void testToString() {
     @Test
     public void testClassicConstructor() throws Exception {
         CustomImporter customImporter = new CustomImporter(
-                "src/main/java/org/jabref/logic/importer/fileformat/CopacImporter.java",
-                "org.jabref.logic.importer.fileformat.CopacImporter");
+            "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 {
+    private CustomImporter asCustomImporter(Importer importer)
+        throws Exception {
         return new CustomImporter(
-                "src/main/java/org/jabref/logic/importer/fileformat/" + importer.getName() + "Importer.java",
-                importer.getClass().getName());
+            "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 19fc7c8e63e..a26eb2b045f 100644
--- a/src/test/java/org/jabref/logic/importer/fileformat/EndnoteImporterTest.java
+++ b/src/test/java/org/jabref/logic/importer/fileformat/EndnoteImporterTest.java
@@ -1,5 +1,9 @@
 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 java.io.BufferedReader;
 import java.io.IOException;
 import java.io.StringReader;
@@ -8,19 +12,13 @@
 import java.util.Arrays;
 import java.util.List;
 import java.util.Optional;
-
 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;
-
 public class EndnoteImporterTest {
 
     private EndnoteImporter importer;
@@ -47,110 +45,219 @@ public void testsGetExtensions() {
 
     @Test
     public void testGetDescription() {
-        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
-    public void testIsRecognizedFormat() throws IOException, URISyntaxException {
-        List<String> list = Arrays.asList("Endnote.pattern.A.enw", "Endnote.pattern.E.enw", "Endnote.book.example.enw");
+    public void testIsRecognizedFormat()
+        throws IOException, URISyntaxException {
+        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());
+            Path file = Path.of(
+                EndnoteImporterTest.class.getResource(string).toURI()
+            );
             assertTrue(importer.isRecognizedFormat(file));
         }
     }
 
     @Test
-    public void testIsRecognizedFormatReject() 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");
+    public void testIsRecognizedFormatReject()
+        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"
+        );
 
         for (String string : list) {
-            Path file = Path.of(EndnoteImporterTest.class.getResource(string).toURI());
+            Path file = Path.of(
+                EndnoteImporterTest.class.getResource(string).toURI()
+            );
             assertFalse(importer.isRecognizedFormat(file));
         }
     }
 
     @Test
     public void testImportEntries0() throws IOException, URISyntaxException {
-        Path file = Path.of(EndnoteImporterTest.class.getResource("Endnote.entries.enw").toURI());
-        List<BibEntry> bibEntries = importer.importDatabase(file).getDatabase().getEntries();
+        Path file = Path.of(
+            EndnoteImporterTest.class.getResource("Endnote.entries.enw").toURI()
+        );
+        List<BibEntry> bibEntries = importer
+            .importDatabase(file)
+            .getDatabase()
+            .getEntries();
 
         assertEquals(5, bibEntries.size());
 
         BibEntry first = bibEntries.get(0);
         assertEquals(StandardEntryType.Misc, first.getType());
-        assertEquals(Optional.of("testA0 and testA1"), first.getField(StandardField.AUTHOR));
-        assertEquals(Optional.of("testE0 and testE1"), first.getField(StandardField.EDITOR));
+        assertEquals(
+            Optional.of("testA0 and testA1"),
+            first.getField(StandardField.AUTHOR)
+        );
+        assertEquals(
+            Optional.of("testE0 and testE1"),
+            first.getField(StandardField.EDITOR)
+        );
         assertEquals(Optional.of("testT"), first.getField(StandardField.TITLE));
 
         BibEntry second = bibEntries.get(1);
         assertEquals(StandardEntryType.Misc, second.getType());
-        assertEquals(Optional.of("testC"), second.getField(StandardField.ADDRESS));
-        assertEquals(Optional.of("testB2"), second.getField(StandardField.BOOKTITLE));
+        assertEquals(
+            Optional.of("testC"),
+            second.getField(StandardField.ADDRESS)
+        );
+        assertEquals(
+            Optional.of("testB2"),
+            second.getField(StandardField.BOOKTITLE)
+        );
         assertEquals(Optional.of("test8"), second.getField(StandardField.DATE));
-        assertEquals(Optional.of("test7"), second.getField(StandardField.EDITION));
-        assertEquals(Optional.of("testJ"), second.getField(StandardField.JOURNAL));
+        assertEquals(
+            Optional.of("test7"),
+            second.getField(StandardField.EDITION)
+        );
+        assertEquals(
+            Optional.of("testJ"),
+            second.getField(StandardField.JOURNAL)
+        );
         assertEquals(Optional.of("testD"), second.getField(StandardField.YEAR));
 
         BibEntry third = bibEntries.get(2);
         assertEquals(StandardEntryType.Article, third.getType());
-        assertEquals(Optional.of("testB0"), third.getField(StandardField.JOURNAL));
+        assertEquals(
+            Optional.of("testB0"),
+            third.getField(StandardField.JOURNAL)
+        );
 
         BibEntry fourth = bibEntries.get(3);
         assertEquals(StandardEntryType.Book, fourth.getType());
-        assertEquals(Optional.of("testI0"), fourth.getField(StandardField.PUBLISHER));
-        assertEquals(Optional.of("testB1"), fourth.getField(StandardField.SERIES));
+        assertEquals(
+            Optional.of("testI0"),
+            fourth.getField(StandardField.PUBLISHER)
+        );
+        assertEquals(
+            Optional.of("testB1"),
+            fourth.getField(StandardField.SERIES)
+        );
 
         BibEntry fifth = bibEntries.get(4);
         assertEquals(StandardEntryType.MastersThesis, fifth.getType());
-        assertEquals(Optional.of("testX"), fifth.getField(StandardField.ABSTRACT));
+        assertEquals(
+            Optional.of("testX"),
+            fifth.getField(StandardField.ABSTRACT)
+        );
         assertEquals(Optional.of("testF"), fifth.getCitationKey());
         assertEquals(Optional.of("testR"), fifth.getField(StandardField.DOI));
-        assertEquals(Optional.of("testK"), fifth.getField(StandardField.KEYWORDS));
+        assertEquals(
+            Optional.of("testK"),
+            fifth.getField(StandardField.KEYWORDS)
+        );
         assertEquals(Optional.of("testO1"), fifth.getField(StandardField.NOTE));
-        assertEquals(Optional.of("testN"), fifth.getField(StandardField.NUMBER));
+        assertEquals(
+            Optional.of("testN"),
+            fifth.getField(StandardField.NUMBER)
+        );
         assertEquals(Optional.of("testP"), fifth.getField(StandardField.PAGES));
-        assertEquals(Optional.of("testI1"), fifth.getField(StandardField.SCHOOL));
+        assertEquals(
+            Optional.of("testI1"),
+            fifth.getField(StandardField.SCHOOL)
+        );
         assertEquals(Optional.of("testU"), fifth.getField(StandardField.URL));
-        assertEquals(Optional.of("testV"), fifth.getField(StandardField.VOLUME));
+        assertEquals(
+            Optional.of("testV"),
+            fifth.getField(StandardField.VOLUME)
+        );
     }
 
     @Test
     public void testImportEntries1() 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();
+        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();
 
         BibEntry entry = bibEntries.get(0);
 
         assertEquals(1, bibEntries.size());
         assertEquals(StandardEntryType.Misc, entry.getType());
-        assertEquals(Optional.of("testA"), entry.getField(StandardField.AUTHOR));
-        assertEquals(Optional.of("testE0, testE1"), entry.getField(StandardField.EDITOR));
+        assertEquals(
+            Optional.of("testA"),
+            entry.getField(StandardField.AUTHOR)
+        );
+        assertEquals(
+            Optional.of("testE0, testE1"),
+            entry.getField(StandardField.EDITOR)
+        );
         assertEquals(Optional.of("testO"), entry.getField(StandardField.PAGES));
     }
 
     @Test
-    public void testImportEntriesBookExample() throws IOException, URISyntaxException {
-        Path file = Path.of(EndnoteImporterTest.class.getResource("Endnote.book.example.enw").toURI());
-        List<BibEntry> bibEntries = importer.importDatabase(file).getDatabase().getEntries();
+    public void testImportEntriesBookExample()
+        throws IOException, URISyntaxException {
+        Path file = Path.of(
+            EndnoteImporterTest.class.getResource("Endnote.book.example.enw")
+                .toURI()
+        );
+        List<BibEntry> bibEntries = importer
+            .importDatabase(file)
+            .getDatabase()
+            .getEntries();
 
         BibEntry entry = bibEntries.get(0);
 
         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("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"),
-                entry.getField(StandardField.TITLE));
-        assertEquals(Optional.of("http://d-nb.info/107601965X"), entry.getField(StandardField.URL));
+        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("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"
+            ),
+            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 ec3e816ae03..2aa556f67b6 100644
--- a/src/test/java/org/jabref/logic/importer/fileformat/EndnoteXmlImporterFilesTest.java
+++ b/src/test/java/org/jabref/logic/importer/fileformat/EndnoteXmlImporterFilesTest.java
@@ -1,55 +1,70 @@
 package org.jabref.logic.importer.fileformat;
 
+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;
-
 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;
-
 public class EndnoteXmlImporterFilesTest {
 
     private static final String FILE_ENDING = ".xml";
     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();
     }
 
     private static Stream<String> invalidFileNames() throws IOException {
-        Predicate<String> fileName = name -> !name.startsWith("EndnoteXmlImporterTest");
+        Predicate<String> fileName = name ->
+            !name.startsWith("EndnoteXmlImporterTest");
         return ImporterTestEngine.getTestFiles(fileName).stream();
     }
 
     @BeforeEach
     void setUp() {
-        importFormatPreferences = mock(ImportFormatPreferences.class, Answers.RETURNS_DEEP_STUBS);
-        when(importFormatPreferences.bibEntryPreferences().getKeywordSeparator()).thenReturn(';');
+        importFormatPreferences =
+            mock(ImportFormatPreferences.class, Answers.RETURNS_DEEP_STUBS);
+        when(
+            importFormatPreferences.bibEntryPreferences().getKeywordSeparator()
+        )
+            .thenReturn(';');
     }
 
     @ParameterizedTest
     @MethodSource("fileNames")
     void testIsRecognizedFormat(String fileName) throws IOException {
-        ImporterTestEngine.testIsRecognizedFormat(new EndnoteXmlImporter(importFormatPreferences), fileName);
+        ImporterTestEngine.testIsRecognizedFormat(
+            new EndnoteXmlImporter(importFormatPreferences),
+            fileName
+        );
     }
 
     @ParameterizedTest
     @MethodSource("invalidFileNames")
     void testIsNotRecognizedFormat(String fileName) throws IOException {
-        ImporterTestEngine.testIsNotRecognizedFormat(new EndnoteXmlImporter(importFormatPreferences), fileName);
+        ImporterTestEngine.testIsNotRecognizedFormat(
+            new EndnoteXmlImporter(importFormatPreferences),
+            fileName
+        );
     }
 
     @ParameterizedTest
     @MethodSource("fileNames")
     void testImportEntries(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 9d24b9c96d7..e71203cc1d7 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,7 @@
 package org.jabref.logic.importer.fileformat;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
 import java.io.IOException;
 import java.net.URISyntaxException;
 import java.nio.file.Files;
@@ -10,64 +12,83 @@
 import java.util.function.Predicate;
 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 org.junit.jupiter.api.Assertions;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-
 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())
-                    .filter(fileNamePredicate)
-                    .collect(Collectors.toList());
+                .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 {
         Assertions.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 {
         Assertions.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);
+        List<BibEntry> entries = parserResult.getDatabase().getEntries();
+        BibEntryAssert.assertEquals(
+            ImporterTestEngine.class,
+            fileName.replaceAll(fileType, ".bib"),
+            entries
+        );
     }
 
     private static Path getPath(String fileName) throws IOException {
         try {
-            return Path.of(ImporterTestEngine.class.getResource(fileName).toURI());
+            return Path.of(
+                ImporterTestEngine.class.getResource(fileName).toURI()
+            );
         } catch (URISyntaxException e) {
             throw new IOException(e);
         }
     }
 
-    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 60de76aff26..94544203e44 100644
--- a/src/test/java/org/jabref/logic/importer/fileformat/InspecImporterTest.java
+++ b/src/test/java/org/jabref/logic/importer/fileformat/InspecImporterTest.java
@@ -1,5 +1,7 @@
 package org.jabref.logic.importer.fileformat;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
 import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.StringReader;
@@ -8,34 +10,32 @@
 import java.util.List;
 import java.util.function.Predicate;
 import java.util.stream.Stream;
-
 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;
-
 public class InspecImporterTest {
 
     private static final String FILE_ENDING = ".txt";
     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();
     }
 
     private static Stream<String> nonInspecfileNames() throws IOException {
-        Predicate<String> fileName = name -> !name.startsWith("InspecImportTest");
+        Predicate<String> fileName = name ->
+            !name.startsWith("InspecImportTest");
         return ImporterTestEngine.getTestFiles(fileName).stream();
     }
 
@@ -46,20 +46,26 @@ public void setUp() throws Exception {
 
     @ParameterizedTest
     @MethodSource("fileNames")
-    public void testIsRecognizedFormatAccept(String fileName) throws IOException {
+    public void testIsRecognizedFormatAccept(String fileName)
+        throws IOException {
         ImporterTestEngine.testIsRecognizedFormat(importer, fileName);
     }
 
     @ParameterizedTest
     @MethodSource("nonInspecfileNames")
-    public void testIsRecognizedFormatReject(String fileName) throws IOException {
+    public void testIsRecognizedFormatReject(String fileName)
+        throws IOException {
         ImporterTestEngine.testIsNotRecognizedFormat(importer, fileName);
     }
 
     @Test
-    public void testCompleteBibtexEntryOnJournalPaperImport() throws IOException, URISyntaxException {
+    public void testCompleteBibtexEntryOnJournalPaperImport()
+        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,36 +74,55 @@ public void testCompleteBibtexEntryOnJournalPaperImport() throws IOException, UR
         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
     public 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");
 
-        try (BufferedReader reader = new BufferedReader(new StringReader(testInput))) {
-            List<BibEntry> entries = importer.importDatabase(reader).getDatabase().getEntries();
+        try (
+            BufferedReader reader = new BufferedReader(
+                new StringReader(testInput)
+            )
+        ) {
+            List<BibEntry> entries = importer
+                .importDatabase(reader)
+                .getDatabase()
+                .getEntries();
             assertEquals(Collections.singletonList(expectedEntry), entries);
         }
     }
 
     @Test
     public 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");
 
-        try (BufferedReader reader = new BufferedReader(new StringReader(testInput))) {
-            List<BibEntry> entries = importer.importDatabase(reader).getDatabase().getEntries();
+        try (
+            BufferedReader reader = new BufferedReader(
+                new StringReader(testInput)
+            )
+        ) {
+            List<BibEntry> entries = importer
+                .importDatabase(reader)
+                .getDatabase()
+                .getEntries();
             assertEquals(1, entries.size());
             BibEntry entry = entries.get(0);
             assertEquals(expectedEntry, entry);
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 1739ac4ee28..a69d5e5e7da 100644
--- a/src/test/java/org/jabref/logic/importer/fileformat/IsiImporterTest.java
+++ b/src/test/java/org/jabref/logic/importer/fileformat/IsiImporterTest.java
@@ -1,5 +1,7 @@
 package org.jabref.logic.importer.fileformat;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
 import java.io.IOException;
 import java.net.URISyntaxException;
 import java.nio.file.Path;
@@ -8,7 +10,6 @@
 import java.util.Optional;
 import java.util.function.Predicate;
 import java.util.stream.Stream;
-
 import org.jabref.logic.util.StandardFileType;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.Month;
@@ -16,27 +17,26 @@
 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;
-
 public class IsiImporterTest {
 
     private static final String FILE_ENDING = ".isi";
     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();
     }
 
     private static Stream<String> invalidFileNames() throws IOException {
-        Predicate<String> fileName = name -> !name.startsWith("IsiImporterTest");
+        Predicate<String> fileName = name ->
+            !name.startsWith("IsiImporterTest");
         return ImporterTestEngine.getTestFiles(fileName).stream();
     }
 
@@ -62,19 +62,23 @@ public void testsGetExtensions() {
 
     @Test
     public void testGetDescription() {
-        assertEquals("Importer for the ISI Web of Science, INSPEC and Medline format.",
-                importer.getDescription());
+        assertEquals(
+            "Importer for the ISI Web of Science, INSPEC and Medline format.",
+            importer.getDescription()
+        );
     }
 
     @ParameterizedTest
     @MethodSource("fileNames")
-    public void testIsRecognizedFormatAccepted(String fileName) throws IOException {
+    public void testIsRecognizedFormatAccepted(String fileName)
+        throws IOException {
         ImporterTestEngine.testIsRecognizedFormat(importer, fileName);
     }
 
     @ParameterizedTest
     @MethodSource("invalidFileNames")
-    public void testIsRecognizedFormatRejected(String fileName) throws IOException {
+    public void testIsRecognizedFormatRejected(String fileName)
+        throws IOException {
         ImporterTestEngine.testIsNotRecognizedFormat(importer, fileName);
     }
 
@@ -125,52 +129,98 @@ public void testProcessSubSup() {
 
     @Test
     public void testImportEntries1() throws IOException, URISyntaxException {
-        Path file = Path.of(IsiImporterTest.class.getResource("IsiImporterTest1.isi").toURI());
-        List<BibEntry> entries = importer.importDatabase(file).getDatabase().getEntries();
+        Path file = Path.of(
+            IsiImporterTest.class.getResource("IsiImporterTest1.isi").toURI()
+        );
+        List<BibEntry> entries = importer
+            .importDatabase(file)
+            .getDatabase()
+            .getEntries();
         BibEntry entry = entries.get(0);
 
         assertEquals(1, entries.size());
-        assertEquals(Optional.of("Optical properties of MgO doped LiNbO$_3$ single crystals"),
-                entry.getField(StandardField.TITLE));
         assertEquals(
-                Optional.of(
-                        "James Brown and James Marc Brown and Brown, J. M. and Brown, J. and Brown, J. M. and Brown, J."),
-                entry.getField(StandardField.AUTHOR));
+            Optional.of(
+                "Optical properties of MgO doped LiNbO$_3$ single crystals"
+            ),
+            entry.getField(StandardField.TITLE)
+        );
+        assertEquals(
+            Optional.of(
+                "James Brown and James Marc Brown and Brown, J. M. and Brown, J. and Brown, J. M. and Brown, J."
+            ),
+            entry.getField(StandardField.AUTHOR)
+        );
         assertEquals(StandardEntryType.Article, entry.getType());
-        assertEquals(Optional.of("Optical Materials"), entry.getField(StandardField.JOURNAL));
+        assertEquals(
+            Optional.of("Optical Materials"),
+            entry.getField(StandardField.JOURNAL)
+        );
         assertEquals(Optional.of("2006"), entry.getField(StandardField.YEAR));
         assertEquals(Optional.of("28"), entry.getField(StandardField.VOLUME));
         assertEquals(Optional.of("5"), entry.getField(StandardField.NUMBER));
-        assertEquals(Optional.of("467--72"), entry.getField(StandardField.PAGES));
+        assertEquals(
+            Optional.of("467--72"),
+            entry.getField(StandardField.PAGES)
+        );
     }
 
     @Test
     public void testImportEntries2() throws IOException, URISyntaxException {
-        Path file = Path.of(IsiImporterTest.class.getResource("IsiImporterTest2.isi").toURI());
-        List<BibEntry> entries = importer.importDatabase(file).getDatabase().getEntries();
+        Path file = Path.of(
+            IsiImporterTest.class.getResource("IsiImporterTest2.isi").toURI()
+        );
+        List<BibEntry> entries = importer
+            .importDatabase(file)
+            .getDatabase()
+            .getEntries();
         BibEntry entry = entries.get(0);
 
         assertEquals(3, entries.size());
-        assertEquals(Optional.of("Optical properties of MgO doped LiNbO$_3$ single crystals"),
-                entry.getField(StandardField.TITLE));
+        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));
+        assertEquals(
+            Optional.of("Optical Materials"),
+            entry.getField(StandardField.JOURNAL)
+        );
         assertEquals(Optional.of("2006"), entry.getField(StandardField.YEAR));
         assertEquals(Optional.of("28"), entry.getField(StandardField.VOLUME));
         assertEquals(Optional.of("5"), entry.getField(StandardField.NUMBER));
-        assertEquals(Optional.of("467-72"), entry.getField(StandardField.PAGES));
+        assertEquals(
+            Optional.of("467-72"),
+            entry.getField(StandardField.PAGES)
+        );
     }
 
     @Test
-    public void testImportEntriesINSPEC() throws IOException, URISyntaxException {
-        Path file = Path.of(IsiImporterTest.class.getResource("IsiImporterTestInspec.isi").toURI());
-        List<BibEntry> entries = importer.importDatabase(file).getDatabase().getEntries();
+    public void testImportEntriesINSPEC()
+        throws IOException, URISyntaxException {
+        Path file = Path.of(
+            IsiImporterTest.class.getResource("IsiImporterTestInspec.isi")
+                .toURI()
+        );
+        List<BibEntry> entries = importer
+            .importDatabase(file)
+            .getDatabase()
+            .getEntries();
 
         BibEntry first = entries.get(0);
         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;
@@ -178,55 +228,93 @@ public void testImportEntriesINSPEC() throws IOException, URISyntaxException {
 
         assertEquals(2, entries.size());
         assertEquals(
-                Optional.of(
-                        "Second harmonic generation of continuous wave ultraviolet light and production of beta -BaB$_2$O$_4$ optical waveguides"),
-                first.getField(StandardField.TITLE));
+            Optional.of(
+                "Second harmonic generation of continuous wave ultraviolet light and production of beta -BaB$_2$O$_4$ optical waveguides"
+            ),
+            first.getField(StandardField.TITLE)
+        );
         assertEquals(StandardEntryType.Article, first.getType());
 
-        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(
+                "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));
         assertEquals(Optional.of(Month.JULY), first.getMonth());
         assertEquals(Optional.of("89"), first.getField(StandardField.VOLUME));
         assertEquals(Optional.of("4"), first.getField(StandardField.NUMBER));
-        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"),
-                second.getField(StandardField.TITLE));
+            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"
+            ),
+            second.getField(StandardField.TITLE)
+        );
         assertEquals(StandardEntryType.Article, second.getType());
     }
 
     @Test
     public void testImportEntriesWOS() throws IOException, URISyntaxException {
-        Path file = Path.of(IsiImporterTest.class.getResource("IsiImporterTestWOS.isi").toURI());
-        List<BibEntry> entries = importer.importDatabase(file).getDatabase().getEntries();
+        Path file = Path.of(
+            IsiImporterTest.class.getResource("IsiImporterTestWOS.isi").toURI()
+        );
+        List<BibEntry> entries = importer
+            .importDatabase(file)
+            .getDatabase()
+            .getEntries();
 
         BibEntry first = entries.get(0);
         BibEntry second = entries.get(1);
 
         assertEquals(2, entries.size());
 
-        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"),
-                second.getField(StandardField.TITLE));
+        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"
+            ),
+            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
     public void testIsiAuthorsConvert() {
         assertEquals(
-                "James Brown and James Marc Brown and Brown, J. M. and Brown, J. and Brown, J. M. and Brown, J.",
-                IsiImporter.isiAuthorsConvert(
-                        "James Brown and James Marc Brown and Brown, J.M. and Brown, J. and Brown, J.M. and Brown, J."));
+            "James Brown and James Marc Brown and Brown, J. M. and Brown, J. and Brown, J. M. and Brown, J.",
+            IsiImporter.isiAuthorsConvert(
+                "James Brown and James Marc Brown and Brown, J.M. and Brown, J. and Brown, J.M. and Brown, J."
+            )
+        );
 
         assertEquals(
-                "Joffe, Hadine and Hall, Janet E. and Gruber, Staci and Sarmiento, Ingrid A. and Cohen, Lee S. and Yurgelun-Todd, Deborah and Martin, Kathryn A.",
-                IsiImporter.isiAuthorsConvert(
-                        "Joffe, Hadine; Hall, Janet E; Gruber, Staci; Sarmiento, Ingrid A; Cohen, Lee S; Yurgelun-Todd, Deborah; Martin, Kathryn A"));
+            "Joffe, Hadine and Hall, Janet E. and Gruber, Staci and Sarmiento, Ingrid A. and Cohen, Lee S. and Yurgelun-Todd, Deborah and Martin, Kathryn A.",
+            IsiImporter.isiAuthorsConvert(
+                "Joffe, Hadine; Hall, Janet E; Gruber, Staci; Sarmiento, Ingrid A; Cohen, Lee S; Yurgelun-Todd, Deborah; Martin, Kathryn A"
+            )
+        );
     }
 
     @Test
@@ -243,105 +331,208 @@ public void testMonthConvert() {
 
     @Test
     public void testIsiAuthorConvert() {
-        assertEquals("James Brown", IsiImporter.isiAuthorConvert("James Brown"));
-        assertEquals("James Marc Brown", IsiImporter.isiAuthorConvert("James Marc Brown"));
-        assertEquals("Brown, J. M.", IsiImporter.isiAuthorConvert("Brown, J.M."));
+        assertEquals(
+            "James Brown",
+            IsiImporter.isiAuthorConvert("James Brown")
+        );
+        assertEquals(
+            "James Marc Brown",
+            IsiImporter.isiAuthorConvert("James Marc Brown")
+        );
+        assertEquals(
+            "Brown, J. M.",
+            IsiImporter.isiAuthorConvert("Brown, J.M.")
+        );
         assertEquals("Brown, J.", IsiImporter.isiAuthorConvert("Brown, J."));
         assertEquals("Brown, J. M.", IsiImporter.isiAuthorConvert("Brown, JM"));
         assertEquals("Brown, J.", IsiImporter.isiAuthorConvert("Brown, J"));
-        assertEquals("Brown, James", IsiImporter.isiAuthorConvert("Brown, James"));
-        assertEquals("Hall, Janet E.", IsiImporter.isiAuthorConvert("Hall, Janet E"));
+        assertEquals(
+            "Brown, James",
+            IsiImporter.isiAuthorConvert("Brown, James")
+        );
+        assertEquals(
+            "Hall, Janet E.",
+            IsiImporter.isiAuthorConvert("Hall, Janet E")
+        );
         assertEquals("", IsiImporter.isiAuthorConvert(""));
     }
 
     @Test
     public void testImportIEEEExport() throws IOException, URISyntaxException {
-        Path file = Path.of(IsiImporterTest.class.getResource("IEEEImport1.txt").toURI());
-        List<BibEntry> entries = importer.importDatabase(file).getDatabase().getEntries();
+        Path file = Path.of(
+            IsiImporterTest.class.getResource("IEEEImport1.txt").toURI()
+        );
+        List<BibEntry> entries = importer
+            .importDatabase(file)
+            .getDatabase()
+            .getEntries();
         BibEntry entry = entries.get(0);
 
         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"),
-                entry.getField(StandardField.TITLE));
+        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("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("2006"), entry.getField(StandardField.YEAR));
-        assertEquals(Optional.of("Perceptual grouping, street extraction, urban remote sensing"),
-                entry.getField(StandardField.KEYWORDS));
-        assertEquals(Optional.of("Lorem ipsum abstract"), entry.getField(StandardField.ABSTRACT));
+        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
     public void testIEEEImport() throws IOException, URISyntaxException {
-        Path file = Path.of(IsiImporterTest.class.getResource("IEEEImport1.txt").toURI());
-        List<BibEntry> entries = importer.importDatabase(file).getDatabase().getEntries();
+        Path file = Path.of(
+            IsiImporterTest.class.getResource("IEEEImport1.txt").toURI()
+        );
+        List<BibEntry> entries = importer
+            .importDatabase(file)
+            .getDatabase()
+            .getEntries();
         BibEntry entry = entries.get(0);
 
         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"),
-                entry.getField(StandardField.TITLE));
+            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("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("2006"), entry.getField(StandardField.YEAR));
-        assertEquals(Optional.of("Perceptual grouping, street extraction, urban remote sensing"),
-                entry.getField(StandardField.KEYWORDS));
-        assertEquals(Optional.of("Lorem ipsum abstract"), entry.getField(StandardField.ABSTRACT));
+        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
-    public void testImportEntriesMedline() throws IOException, URISyntaxException {
-        Path file = Path.of(IsiImporterTest.class.getResource("IsiImporterTestMedline.isi").toURI());
-        List<BibEntry> entries = importer.importDatabase(file).getDatabase().getEntries();
+    public void testImportEntriesMedline()
+        throws IOException, URISyntaxException {
+        Path file = Path.of(
+            IsiImporterTest.class.getResource("IsiImporterTestMedline.isi")
+                .toURI()
+        );
+        List<BibEntry> entries = importer
+            .importDatabase(file)
+            .getDatabase()
+            .getEntries();
 
         BibEntry first = entries.get(0);
         BibEntry second = entries.get(1);
 
         assertEquals(2, entries.size());
         assertEquals(
-                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));
+            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)
+        );
         assertEquals(Optional.of("2006"), first.getField(StandardField.YEAR));
         assertEquals(Optional.empty(), first.getField(StandardField.MONTH));
         assertEquals(Optional.of("12"), first.getField(StandardField.VOLUME));
         assertEquals(Optional.of("20"), first.getField(StandardField.NUMBER));
-        assertEquals(Optional.of("2457--71"), first.getField(StandardField.PAGES));
+        assertEquals(
+            Optional.of("2457--71"),
+            first.getField(StandardField.PAGES)
+        );
         assertEquals(StandardEntryType.Article, first.getType());
         assertEquals(
-                Optional.of(
-                        "Estrogen therapy selectively enhances prefrontal cognitive processes: a randomized, double-blind, placebo-controlled study with functional magnetic resonance imaging in perimenopausal and recently postmenopausal women."),
-                second.getField(StandardField.TITLE));
+            Optional.of(
+                "Estrogen therapy selectively enhances prefrontal cognitive processes: a randomized, double-blind, placebo-controlled study with functional magnetic resonance imaging in perimenopausal and recently postmenopausal women."
+            ),
+            second.getField(StandardField.TITLE)
+        );
         assertEquals(
-                Optional.of(
-                        "Joffe, Hadine and Hall, Janet E. and Gruber, Staci and Sarmiento, Ingrid A. and Cohen, Lee S. and Yurgelun-Todd, Deborah and Martin, Kathryn A."),
-                second.getField(StandardField.AUTHOR));
+            Optional.of(
+                "Joffe, Hadine and Hall, Janet E. and Gruber, Staci and Sarmiento, Ingrid A. and Cohen, Lee S. and Yurgelun-Todd, Deborah and Martin, Kathryn A."
+            ),
+            second.getField(StandardField.AUTHOR)
+        );
         assertEquals(Optional.of("2006"), second.getField(StandardField.YEAR));
         assertEquals(Optional.of(Month.MAY), second.getMonth());
         assertEquals(Optional.of("13"), second.getField(StandardField.VOLUME));
         assertEquals(Optional.of("3"), second.getField(StandardField.NUMBER));
-        assertEquals(Optional.of("411--22"), second.getField(StandardField.PAGES));
+        assertEquals(
+            Optional.of("411--22"),
+            second.getField(StandardField.PAGES)
+        );
         assertEquals(StandardEntryType.Article, second.getType());
     }
 
     @Test
-    public void testImportEntriesEmpty() throws IOException, URISyntaxException {
-        Path file = Path.of(IsiImporterTest.class.getResource("IsiImporterTestEmpty.isi").toURI());
-
-        List<BibEntry> entries = importer.importDatabase(file).getDatabase().getEntries();
+    public void testImportEntriesEmpty()
+        throws IOException, URISyntaxException {
+        Path file = Path.of(
+            IsiImporterTest.class.getResource("IsiImporterTestEmpty.isi")
+                .toURI()
+        );
+
+        List<BibEntry> entries = importer
+            .importDatabase(file)
+            .getDatabase()
+            .getEntries();
 
         assertEquals(1, entries.size());
     }
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 18425acde19..62a2d2721da 100644
--- a/src/test/java/org/jabref/logic/importer/fileformat/MarcXmlParserTest.java
+++ b/src/test/java/org/jabref/logic/importer/fileformat/MarcXmlParserTest.java
@@ -1,35 +1,42 @@
 package org.jabref.logic.importer.fileformat;
 
+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;
-
 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;
-
 public 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();
     }
 
     private void doTest(String xmlName, String bibName) throws Exception {
-        try (InputStream is = MarcXmlParserTest.class.getResourceAsStream(xmlName)) {
+        try (
+            InputStream is = MarcXmlParserTest.class.getResourceAsStream(
+                    xmlName
+                )
+        ) {
             MarcXmlParser parser = new MarcXmlParser();
             List<BibEntry> entries = parser.parseEntries(is);
             assertNotNull(entries);
-            BibEntryAssert.assertEquals(MarcXmlParserTest.class, bibName, entries.get(0));
+            BibEntryAssert.assertEquals(
+                MarcXmlParserTest.class,
+                bibName,
+                entries.get(0)
+            );
         }
     }
 
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 949f02a9ab9..320154468fa 100644
--- a/src/test/java/org/jabref/logic/importer/fileformat/MedlineImporterFilesTest.java
+++ b/src/test/java/org/jabref/logic/importer/fileformat/MedlineImporterFilesTest.java
@@ -3,7 +3,6 @@
 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;
 
@@ -14,43 +13,60 @@ public 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();
     }
 
     private static Stream<String> invalidFileNames() throws IOException {
-        Predicate<String> fileName = name -> !name.startsWith("MedlineImporterTest");
+        Predicate<String> fileName = name ->
+            !name.startsWith("MedlineImporterTest");
         return ImporterTestEngine.getTestFiles(fileName).stream();
     }
 
     @ParameterizedTest
     @MethodSource("fileNames")
     public void testIsRecognizedFormat(String fileName) throws IOException {
-        ImporterTestEngine.testIsRecognizedFormat(new MedlineImporter(), fileName);
+        ImporterTestEngine.testIsRecognizedFormat(
+            new MedlineImporter(),
+            fileName
+        );
     }
 
     @ParameterizedTest
     @MethodSource("invalidFileNames")
     public void testIsNotRecognizedFormat(String fileName) throws IOException {
-        ImporterTestEngine.testIsNotRecognizedFormat(new MedlineImporter(), fileName);
+        ImporterTestEngine.testIsNotRecognizedFormat(
+            new MedlineImporter(),
+            fileName
+        );
     }
 
     @ParameterizedTest
     @MethodSource("fileNames")
     public void testImportEntries(String fileName) throws Exception {
-        ImporterTestEngine.testImportEntries(new MedlineImporter(), fileName, FILE_ENDING);
+        ImporterTestEngine.testImportEntries(
+            new MedlineImporter(),
+            fileName,
+            FILE_ENDING
+        );
     }
 
     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();
     }
 
     @ParameterizedTest
     @MethodSource("malformedFileNames")
     public void testImportMalfomedFiles(String fileName) throws IOException {
-        ImporterTestEngine.testImportMalformedFiles(new MedlineImporter(), fileName);
+        ImporterTestEngine.testImportMalformedFiles(
+            new MedlineImporter(),
+            fileName
+        );
     }
 }
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 79044243f87..7cf445f442f 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>
@@ -43,6 +42,9 @@ public void testsGetExtensions() {
 
     @Test
     public void testGetDescription() {
-        assertEquals("Importer for the Medline format.", importer.getDescription());
+        assertEquals(
+            "Importer for the Medline format.",
+            importer.getDescription()
+        );
     }
 }
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 bc25e3359eb..61547cfb4e1 100644
--- a/src/test/java/org/jabref/logic/importer/fileformat/MedlinePlainImporterTest.java
+++ b/src/test/java/org/jabref/logic/importer/fileformat/MedlinePlainImporterTest.java
@@ -1,5 +1,11 @@
 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.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
 import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.InputStream;
@@ -12,33 +18,26 @@
 import java.util.Optional;
 import java.util.function.Predicate;
 import java.util.stream.Stream;
-
 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.api.function.Executable;
 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.assertNotNull;
-import static org.junit.jupiter.api.Assertions.assertThrows;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-
 class MedlinePlainImporterTest {
 
     private static final String FILE_ENDING = ".txt";
     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();
     }
 
@@ -58,7 +57,10 @@ void testsGetExtensions() {
 
     @Test
     void testGetDescription() {
-        assertEquals("Importer for the MedlinePlain format.", importer.getDescription());
+        assertEquals(
+            "Importer for the MedlinePlain format.",
+            importer.getDescription()
+        );
     }
 
     @ParameterizedTest
@@ -73,34 +75,55 @@ void doesNotRecognizeEmptyFiles() throws IOException {
     }
 
     @Test
-    void testImportMultipleEntriesInSingleFile() throws IOException, URISyntaxException {
-        Path inputFile = Path.of(MedlinePlainImporter.class.getResource("MedlinePlainImporterTestMultipleEntries.txt").toURI());
-
-        List<BibEntry> entries = importer.importDatabase(inputFile).getDatabase()
-                                         .getEntries();
+    void testImportMultipleEntriesInSingleFile()
+        throws IOException, URISyntaxException {
+        Path inputFile = Path.of(
+            MedlinePlainImporter.class.getResource(
+                    "MedlinePlainImporterTestMultipleEntries.txt"
+                )
+                .toURI()
+        );
+
+        List<BibEntry> entries = importer
+            .importDatabase(inputFile)
+            .getDatabase()
+            .getEntries();
         BibEntry testEntry = entries.get(0);
 
         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(
-                        "From danger and motherhood to health and beauty: health advice for the factory girl in early twentieth-century Britain."),
-                testEntry.getField(StandardField.TITLE));
+            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."
+            ),
+            testEntry.getField(StandardField.TITLE)
+        );
 
         testEntry = entries.get(1);
         assertEquals(StandardEntryType.Conference, testEntry.getType());
-        assertEquals(Optional.of("06"), testEntry.getField(StandardField.MONTH));
-        assertEquals(Optional.empty(), testEntry.getField(StandardField.AUTHOR));
+        assertEquals(
+            Optional.of("06"),
+            testEntry.getField(StandardField.MONTH)
+        );
+        assertEquals(
+            Optional.empty(),
+            testEntry.getField(StandardField.AUTHOR)
+        );
         assertEquals(Optional.empty(), testEntry.getField(StandardField.TITLE));
 
         testEntry = entries.get(2);
         assertEquals(StandardEntryType.Book, testEntry.getType());
         assertEquals(
-                Optional.of(
-                        "This is a Testtitle: This title should be appended: This title should also be appended. Another append to the Title? LastTitle"),
-                testEntry.getField(StandardField.TITLE));
+            Optional.of(
+                "This is a Testtitle: This title should be appended: This title should also be appended. Another append to the Title? LastTitle"
+            ),
+            testEntry.getField(StandardField.TITLE)
+        );
 
         testEntry = entries.get(3);
         assertEquals(StandardEntryType.TechReport, testEntry.getType());
@@ -108,7 +131,10 @@ void testImportMultipleEntriesInSingleFile() throws IOException, URISyntaxExcept
 
         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);
         expectedEntry5.setField(StandardField.KEYWORDS, "Female");
@@ -122,16 +148,24 @@ void testImportMultipleEntriesInSingleFile() throws IOException, URISyntaxExcept
 
     @Test
     void testEmptyFileImport() throws IOException {
-        List<BibEntry> emptyEntries = importer.importDatabase(readerForString("")).getDatabase().getEntries();
+        List<BibEntry> emptyEntries = importer
+            .importDatabase(readerForString(""))
+            .getDatabase()
+            .getEntries();
 
         assertEquals(Collections.emptyList(), emptyEntries);
     }
 
     @Test
-    void testImportSingleEntriesInSingleFiles() throws IOException, URISyntaxException {
-        List<String> testFiles = Arrays.asList("MedlinePlainImporterTestCompleteEntry",
-                "MedlinePlainImporterTestMultiAbstract", "MedlinePlainImporterTestMultiTitle",
-                "MedlinePlainImporterTestDOI", "MedlinePlainImporterTestInproceeding");
+    void testImportSingleEntriesInSingleFiles()
+        throws IOException, URISyntaxException {
+        List<String> testFiles = Arrays.asList(
+            "MedlinePlainImporterTestCompleteEntry",
+            "MedlinePlainImporterTestMultiAbstract",
+            "MedlinePlainImporterTestMultiTitle",
+            "MedlinePlainImporterTestDOI",
+            "MedlinePlainImporterTestInproceeding"
+        );
 
         for (String testFile : testFiles) {
             String medlineFile = testFile + ".txt";
@@ -140,12 +174,23 @@ void testImportSingleEntriesInSingleFiles() throws IOException, URISyntaxExcepti
         }
     }
 
-    private void assertImportOfMedlineFileEqualsBibtexFile(String medlineFile, String bibtexFile)
-            throws IOException, URISyntaxException {
-        Path file = Path.of(MedlinePlainImporter.class.getResource(medlineFile).toURI());
-
-        try (InputStream nis = MedlinePlainImporter.class.getResourceAsStream(bibtexFile)) {
-            List<BibEntry> entries = importer.importDatabase(file).getDatabase().getEntries();
+    private void assertImportOfMedlineFileEqualsBibtexFile(
+        String medlineFile,
+        String bibtexFile
+    ) throws IOException, URISyntaxException {
+        Path file = Path.of(
+            MedlinePlainImporter.class.getResource(medlineFile).toURI()
+        );
+
+        try (
+            InputStream nis = MedlinePlainImporter.class.getResourceAsStream(
+                    bibtexFile
+                )
+        ) {
+            List<BibEntry> entries = importer
+                .importDatabase(file)
+                .getDatabase()
+                .getEntries();
             assertNotNull(entries);
             assertEquals(1, entries.size());
             BibEntryAssert.assertEquals(nis, entries.get(0));
@@ -154,58 +199,165 @@ private void assertImportOfMedlineFileEqualsBibtexFile(String medlineFile, Strin
 
     @Test
     void testMultiLineComments() throws IOException {
-        try (BufferedReader reader = readerForString("PMID-22664220" + "\n" + "CON - Comment1" + "\n" + "CIN - Comment2"
-                + "\n" + "EIN - Comment3" + "\n" + "EFR - Comment4" + "\n" + "CRI - Comment5" + "\n" + "CRF - Comment6"
-                + "\n" + "PRIN- Comment7" + "\n" + "PROF- Comment8" + "\n" + "RPI - Comment9" + "\n" + "RPF - Comment10"
-                + "\n" + "RIN - Comment11" + "\n" + "ROF - Comment12" + "\n" + "UIN - Comment13" + "\n"
-                + "UOF - Comment14" + "\n" + "SPIN- Comment15" + "\n" + "ORI - Comment16")) {
-            List<BibEntry> actualEntries = importer.importDatabase(reader).getDatabase().getEntries();
+        try (
+            BufferedReader reader = readerForString(
+                "PMID-22664220" +
+                "\n" +
+                "CON - Comment1" +
+                "\n" +
+                "CIN - Comment2" +
+                "\n" +
+                "EIN - Comment3" +
+                "\n" +
+                "EFR - Comment4" +
+                "\n" +
+                "CRI - Comment5" +
+                "\n" +
+                "CRF - Comment6" +
+                "\n" +
+                "PRIN- Comment7" +
+                "\n" +
+                "PROF- Comment8" +
+                "\n" +
+                "RPI - Comment9" +
+                "\n" +
+                "RPF - Comment10" +
+                "\n" +
+                "RIN - Comment11" +
+                "\n" +
+                "ROF - Comment12" +
+                "\n" +
+                "UIN - Comment13" +
+                "\n" +
+                "UOF - Comment14" +
+                "\n" +
+                "SPIN- Comment15" +
+                "\n" +
+                "ORI - Comment16"
+            )
+        ) {
+            List<BibEntry> actualEntries = importer
+                .importDatabase(reader)
+                .getDatabase()
+                .getEntries();
             BibEntry expectedEntry = new BibEntry();
 
-            expectedEntry.setField(StandardField.COMMENT,
-                    "Comment1" + "\n" + "Comment2" + "\n" + "Comment3" + "\n" + "Comment4" + "\n" + "Comment5" + "\n"
-                            + "Comment6" + "\n" + "Comment7" + "\n" + "Comment8" + "\n" + "Comment9" + "\n"
-                            + "Comment10" + "\n" + "Comment11" + "\n" + "Comment12" + "\n" + "Comment13" + "\n"
-                            + "Comment14" + "\n" + "Comment15" + "\n" + "Comment16");
-            assertEquals(Collections.singletonList(expectedEntry), actualEntries);
+            expectedEntry.setField(
+                StandardField.COMMENT,
+                "Comment1" +
+                "\n" +
+                "Comment2" +
+                "\n" +
+                "Comment3" +
+                "\n" +
+                "Comment4" +
+                "\n" +
+                "Comment5" +
+                "\n" +
+                "Comment6" +
+                "\n" +
+                "Comment7" +
+                "\n" +
+                "Comment8" +
+                "\n" +
+                "Comment9" +
+                "\n" +
+                "Comment10" +
+                "\n" +
+                "Comment11" +
+                "\n" +
+                "Comment12" +
+                "\n" +
+                "Comment13" +
+                "\n" +
+                "Comment14" +
+                "\n" +
+                "Comment15" +
+                "\n" +
+                "Comment16"
+            );
+            assertEquals(
+                Collections.singletonList(expectedEntry),
+                actualEntries
+            );
         }
     }
 
     @Test
     void testKeyWords() throws IOException {
-        try (BufferedReader reader = readerForString("PMID-22664795" + "\n" + "MH  - Female" + "\n" + "OT  - Male")) {
-            List<BibEntry> actualEntries = importer.importDatabase(reader).getDatabase().getEntries();
+        try (
+            BufferedReader reader = readerForString(
+                "PMID-22664795" + "\n" + "MH  - Female" + "\n" + "OT  - Male"
+            )
+        ) {
+            List<BibEntry> actualEntries = importer
+                .importDatabase(reader)
+                .getDatabase()
+                .getEntries();
 
             BibEntry expectedEntry = new BibEntry();
             expectedEntry.setField(StandardField.KEYWORDS, "Female, Male");
 
-            assertEquals(Collections.singletonList(expectedEntry), actualEntries);
+            assertEquals(
+                Collections.singletonList(expectedEntry),
+                actualEntries
+            );
         }
     }
 
     @Test
     void testWithNbibFile() throws IOException, URISyntaxException {
-        Path file = Path.of(MedlinePlainImporter.class.getResource("NbibImporterTest.nbib").toURI());
-
-        List<BibEntry> entries = importer.importDatabase(file).getDatabase().getEntries();
-
-        BibEntryAssert.assertEquals(MedlinePlainImporter.class, "NbibImporterTest.bib", entries);
+        Path file = Path.of(
+            MedlinePlainImporter.class.getResource("NbibImporterTest.nbib")
+                .toURI()
+        );
+
+        List<BibEntry> entries = importer
+            .importDatabase(file)
+            .getDatabase()
+            .getEntries();
+
+        BibEntryAssert.assertEquals(
+            MedlinePlainImporter.class,
+            "NbibImporterTest.bib",
+            entries
+        );
     }
 
     @Test
     void testWithMultipleEntries() throws IOException, URISyntaxException {
-        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);
+        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
+        );
     }
 
     @Test
     void testInvalidFormat() throws URISyntaxException, IOException {
-        Path file = Path.of(MedlinePlainImporter.class.getResource("MedlinePlainImporterTestInvalidFormat.xml").toURI());
-
-        List<BibEntry> entries = importer.importDatabase(file).getDatabase().getEntries();
+        Path file = Path.of(
+            MedlinePlainImporter.class.getResource(
+                    "MedlinePlainImporterTestInvalidFormat.xml"
+                )
+                .toURI()
+        );
+
+        List<BibEntry> entries = importer
+            .importDatabase(file)
+            .getDatabase()
+            .getEntries();
 
         assertEquals(Collections.emptyList(), entries);
     }
@@ -222,16 +374,35 @@ void testNullReader() throws IOException {
 
     @Test
     void testAllArticleTypes() throws IOException {
-        try (BufferedReader reader = readerForString("PMID-22664795" + "\n" + "MH  - Female\n" + "PT  - journal article"
-                + "\n" + "PT  - classical article" + "\n" + "PT  - corrected and republished article" + "\n"
-                + "PT  - introductory journal article" + "\n" + "PT  - newspaper article")) {
-            List<BibEntry> actualEntries = importer.importDatabase(reader).getDatabase().getEntries();
+        try (
+            BufferedReader reader = readerForString(
+                "PMID-22664795" +
+                "\n" +
+                "MH  - Female\n" +
+                "PT  - journal article" +
+                "\n" +
+                "PT  - classical article" +
+                "\n" +
+                "PT  - corrected and republished article" +
+                "\n" +
+                "PT  - introductory journal article" +
+                "\n" +
+                "PT  - newspaper article"
+            )
+        ) {
+            List<BibEntry> actualEntries = importer
+                .importDatabase(reader)
+                .getDatabase()
+                .getEntries();
 
             BibEntry expectedEntry = new BibEntry();
             expectedEntry.setType(StandardEntryType.Article);
             expectedEntry.setField(StandardField.KEYWORDS, "Female");
 
-            assertEquals(Collections.singletonList(expectedEntry), actualEntries);
+            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 879e62469fc..41e804b78d6 100644
--- a/src/test/java/org/jabref/logic/importer/fileformat/ModsImporterFilesTest.java
+++ b/src/test/java/org/jabref/logic/importer/fileformat/ModsImporterFilesTest.java
@@ -1,44 +1,54 @@
 package org.jabref.logic.importer.fileformat;
 
+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;
-
 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;
-
 class ModsImporterFilesTest {
 
     private static final String FILE_ENDING = ".xml";
     private ImportFormatPreferences importFormatPreferences;
 
     private static Stream<String> fileNames() throws IOException {
-        Predicate<String> fileName = name -> name.startsWith("MODS") && name.endsWith(FILE_ENDING);
+        Predicate<String> fileName = name ->
+            name.startsWith("MODS") && name.endsWith(FILE_ENDING);
         return ImporterTestEngine.getTestFiles(fileName).stream();
     }
 
     @BeforeEach
     void setUp() {
-        importFormatPreferences = mock(ImportFormatPreferences.class, Answers.RETURNS_DEEP_STUBS);
-        when(importFormatPreferences.bibEntryPreferences().getKeywordSeparator()).thenReturn(',');
+        importFormatPreferences =
+            mock(ImportFormatPreferences.class, Answers.RETURNS_DEEP_STUBS);
+        when(
+            importFormatPreferences.bibEntryPreferences().getKeywordSeparator()
+        )
+            .thenReturn(',');
     }
 
     @ParameterizedTest
     @MethodSource("fileNames")
     void testIsRecognizedFormat(String fileName) throws IOException {
-        ImporterTestEngine.testIsRecognizedFormat(new ModsImporter(importFormatPreferences), fileName);
+        ImporterTestEngine.testIsRecognizedFormat(
+            new ModsImporter(importFormatPreferences),
+            fileName
+        );
     }
 
     @ParameterizedTest
     @MethodSource("fileNames")
     void testImportEntries(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 4c6568d4fe0..d2a4613aa8d 100644
--- a/src/test/java/org/jabref/logic/importer/fileformat/MrDLibImporterTest.java
+++ b/src/test/java/org/jabref/logic/importer/fileformat/MrDLibImporterTest.java
@@ -1,21 +1,19 @@
 package org.jabref.logic.importer.fileformat;
 
+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;
-
 import org.jabref.logic.importer.ParserResult;
 import org.jabref.logic.util.StandardFileType;
 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;
-
 public class MrDLibImporterTest {
 
     private MrDLibImporter importer;
@@ -24,13 +22,17 @@ public class MrDLibImporterTest {
     @BeforeEach
     public 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));
     }
 
     @Test
     public void testGetDescription() {
-        assertEquals("Takes valid JSON documents from the Mr. DLib API and parses them into a BibEntry", importer.getDescription());
+        assertEquals(
+            "Takes valid JSON documents from the Mr. DLib API and parses them into a BibEntry",
+            importer.getDescription()
+        );
     }
 
     @Test
@@ -49,8 +51,10 @@ public void testImportDatabaseIsYearSetCorrectly() throws IOException {
 
         List<BibEntry> resultList = parserResult.getDatabase().getEntries();
 
-        assertEquals("2006",
-                resultList.get(0).getFieldLatexFree(StandardField.YEAR).get());
+        assertEquals(
+            "2006",
+            resultList.get(0).getFieldLatexFree(StandardField.YEAR).get()
+        );
     }
 
     @Test
@@ -59,8 +63,10 @@ public void testImportDatabaseIsTitleSetCorrectly() 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",
-                resultList.get(0).getFieldLatexFree(StandardField.TITLE).get());
+        assertEquals(
+            "The protection of rural lands with the spatial development strategy on the case of Hrastnik commune",
+            resultList.get(0).getFieldLatexFree(StandardField.TITLE).get()
+        );
     }
 
     @Test
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 2562c524858..82f21613e8e 100644
--- a/src/test/java/org/jabref/logic/importer/fileformat/MsBibImporterFilesTest.java
+++ b/src/test/java/org/jabref/logic/importer/fileformat/MsBibImporterFilesTest.java
@@ -3,7 +3,6 @@
 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;
 
@@ -12,8 +11,8 @@ public 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();
     }
 
@@ -25,18 +24,28 @@ private static Stream<String> invalidFileNames() throws IOException {
     @ParameterizedTest
     @MethodSource("fileNames")
     public void testIsRecognizedFormat(String fileName) throws IOException {
-        ImporterTestEngine.testIsRecognizedFormat(new MsBibImporter(), fileName);
+        ImporterTestEngine.testIsRecognizedFormat(
+            new MsBibImporter(),
+            fileName
+        );
     }
 
     @ParameterizedTest
     @MethodSource("invalidFileNames")
     public void testIsNotRecognizedFormat(String fileName) throws IOException {
-        ImporterTestEngine.testIsNotRecognizedFormat(new MsBibImporter(), fileName);
+        ImporterTestEngine.testIsNotRecognizedFormat(
+            new MsBibImporter(),
+            fileName
+        );
     }
 
     @ParameterizedTest
     @MethodSource("fileNames")
     public void testImportEntries(String fileName) throws Exception {
-        ImporterTestEngine.testImportEntries(new MsBibImporter(), fileName, FILE_ENDING);
+        ImporterTestEngine.testImportEntries(
+            new MsBibImporter(),
+            fileName,
+            FILE_ENDING
+        );
     }
 }
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 c87c3d77cc0..d938b6a8e27 100644
--- a/src/test/java/org/jabref/logic/importer/fileformat/MsBibImporterTest.java
+++ b/src/test/java/org/jabref/logic/importer/fileformat/MsBibImporterTest.java
@@ -1,20 +1,18 @@
 package org.jabref.logic.importer.fileformat;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+
 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 org.jabref.logic.util.StandardFileType;
 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;
-
 public class MsBibImporterTest {
 
     @Test
@@ -26,14 +24,22 @@ public void testsGetExtensions() {
     @Test
     public void testGetDescription() {
         MsBibImporter importer = new MsBibImporter();
-        assertEquals("Importer for the MS Office 2007 XML bibliography format.", importer.getDescription());
+        assertEquals(
+            "Importer for the MS Office 2007 XML bibliography format.",
+            importer.getDescription()
+        );
     }
 
     @Test
     public final void testIsNotRecognizedFormat() throws Exception {
         MsBibImporter testImporter = new MsBibImporter();
-        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(testImporter.isRecognizedFormat(file));
@@ -41,18 +47,30 @@ public final void testIsNotRecognizedFormat() throws Exception {
     }
 
     @Test
-    public final void testImportEntriesEmpty() throws IOException, URISyntaxException {
+    public final void testImportEntriesEmpty()
+        throws IOException, URISyntaxException {
         MsBibImporter testImporter = new MsBibImporter();
-        Path file = Path.of(MsBibImporter.class.getResource("EmptyMsBib_Test.xml").toURI());
-        List<BibEntry> entries = testImporter.importDatabase(file).getDatabase().getEntries();
+        Path file = Path.of(
+            MsBibImporter.class.getResource("EmptyMsBib_Test.xml").toURI()
+        );
+        List<BibEntry> entries = testImporter
+            .importDatabase(file)
+            .getDatabase()
+            .getEntries();
         assertEquals(Collections.emptyList(), entries);
     }
 
     @Test
-    public final void testImportEntriesNotRecognizedFormat() throws IOException, URISyntaxException {
+    public final void testImportEntriesNotRecognizedFormat()
+        throws IOException, URISyntaxException {
         MsBibImporter testImporter = new MsBibImporter();
-        Path file = Path.of(MsBibImporter.class.getResource("CopacImporterTest1.txt").toURI());
-        List<BibEntry> entries = testImporter.importDatabase(file).getDatabase().getEntries();
+        Path file = Path.of(
+            MsBibImporter.class.getResource("CopacImporterTest1.txt").toURI()
+        );
+        List<BibEntry> entries = testImporter
+            .importDatabase(file)
+            .getDatabase()
+            .getEntries();
         assertEquals(0, entries.size());
     }
 
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 a948ecf75b0..58382a98f2b 100644
--- a/src/test/java/org/jabref/logic/importer/fileformat/OvidImporterTest.java
+++ b/src/test/java/org/jabref/logic/importer/fileformat/OvidImporterTest.java
@@ -1,5 +1,8 @@
 package org.jabref.logic.importer.fileformat;
 
+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;
@@ -9,31 +12,27 @@
 import java.util.Optional;
 import java.util.function.Predicate;
 import java.util.stream.Stream;
-
 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.field.UnknownField;
 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 static org.junit.jupiter.api.Assertions.assertNotNull;
-
 public class OvidImporterTest {
 
     private static final String FILE_ENDING = ".txt";
     private OvidImporter importer;
 
     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();
     }
 
@@ -69,91 +68,166 @@ public void testGetDescription() {
 
     @ParameterizedTest
     @MethodSource("fileNames")
-    public void testIsRecognizedFormatAccept(String fileName) throws IOException, URISyntaxException {
+    public void testIsRecognizedFormatAccept(String fileName)
+        throws IOException, URISyntaxException {
         ImporterTestEngine.testIsRecognizedFormat(importer, fileName);
     }
 
     @ParameterizedTest
     @MethodSource("invalidFileNames")
-    public void testIsRecognizedFormatRejected(String fileName) throws IOException, URISyntaxException {
+    public void testIsRecognizedFormatRejected(String fileName)
+        throws IOException, URISyntaxException {
         ImporterTestEngine.testIsNotRecognizedFormat(importer, fileName);
     }
 
     @Test
     public void testImportEmpty() throws IOException, URISyntaxException {
-        Path file = Path.of(OvidImporter.class.getResource("Empty.txt").toURI());
-        List<BibEntry> entries = importer.importDatabase(file).getDatabase().getEntries();
+        Path file = Path.of(
+            OvidImporter.class.getResource("Empty.txt").toURI()
+        );
+        List<BibEntry> entries = importer
+            .importDatabase(file)
+            .getDatabase()
+            .getEntries();
         assertEquals(Collections.emptyList(), entries);
     }
 
     @Test
     public void testImportEntries1() throws IOException, URISyntaxException {
-        Path file = Path.of(OvidImporter.class.getResource("OvidImporterTest1.txt").toURI());
-        List<BibEntry> entries = importer.importDatabase(file).getDatabase().getEntries();
+        Path file = Path.of(
+            OvidImporter.class.getResource("OvidImporterTest1.txt").toURI()
+        );
+        List<BibEntry> entries = importer
+            .importDatabase(file)
+            .getDatabase()
+            .getEntries();
         assertEquals(5, entries.size());
 
         BibEntry entry = entries.get(0);
         assertEquals(StandardEntryType.Misc, entry.getType());
-        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")));
+        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"))
+        );
 
         entry = entries.get(1);
         assertEquals(StandardEntryType.InProceedings, entry.getType());
         assertEquals(Optional.of("Max"), entry.getField(StandardField.EDITOR));
-        assertEquals(Optional.of("Max the Editor"), entry.getField(StandardField.TITLE));
-        assertEquals(Optional.of("Very Long Title"), entry.getField(StandardField.JOURNAL));
+        assertEquals(
+            Optional.of("Max the Editor"),
+            entry.getField(StandardField.TITLE)
+        );
+        assertEquals(
+            Optional.of("Very Long Title"),
+            entry.getField(StandardField.JOURNAL)
+        );
         assertEquals(Optional.of("28"), entry.getField(StandardField.VOLUME));
         assertEquals(Optional.of("2"), entry.getField(StandardField.ISSUE));
         assertEquals(Optional.of("2015"), entry.getField(StandardField.YEAR));
-        assertEquals(Optional.of("103--106"), entry.getField(StandardField.PAGES));
+        assertEquals(
+            Optional.of("103--106"),
+            entry.getField(StandardField.PAGES)
+        );
 
         entry = entries.get(2);
         assertEquals(StandardEntryType.InCollection, entry.getType());
         assertEquals(Optional.of("Max"), entry.getField(StandardField.AUTHOR));
         assertEquals(Optional.of("Test"), entry.getField(StandardField.TITLE));
-        assertEquals(Optional.of("Very Long Title"), entry.getField(StandardField.JOURNAL));
+        assertEquals(
+            Optional.of("Very Long Title"),
+            entry.getField(StandardField.JOURNAL)
+        );
         assertEquals(Optional.of("28"), entry.getField(StandardField.VOLUME));
         assertEquals(Optional.of("2"), entry.getField(StandardField.ISSUE));
         assertEquals(Optional.of("April"), entry.getField(StandardField.MONTH));
         assertEquals(Optional.of("2015"), entry.getField(StandardField.YEAR));
-        assertEquals(Optional.of("103--106"), entry.getField(StandardField.PAGES));
+        assertEquals(
+            Optional.of("103--106"),
+            entry.getField(StandardField.PAGES)
+        );
 
         entry = entries.get(3);
         assertEquals(StandardEntryType.Book, entry.getType());
         assertEquals(Optional.of("Max"), entry.getField(StandardField.AUTHOR));
         assertEquals(Optional.of("2015"), entry.getField(StandardField.YEAR));
-        assertEquals(Optional.of("Editor"), entry.getField(StandardField.EDITOR));
-        assertEquals(Optional.of("Very Long Title"), entry.getField(StandardField.BOOKTITLE));
-        assertEquals(Optional.of("103--106"), entry.getField(StandardField.PAGES));
-        assertEquals(Optional.of("Address"), entry.getField(StandardField.ADDRESS));
-        assertEquals(Optional.of("Publisher"), entry.getField(StandardField.PUBLISHER));
+        assertEquals(
+            Optional.of("Editor"),
+            entry.getField(StandardField.EDITOR)
+        );
+        assertEquals(
+            Optional.of("Very Long Title"),
+            entry.getField(StandardField.BOOKTITLE)
+        );
+        assertEquals(
+            Optional.of("103--106"),
+            entry.getField(StandardField.PAGES)
+        );
+        assertEquals(
+            Optional.of("Address"),
+            entry.getField(StandardField.ADDRESS)
+        );
+        assertEquals(
+            Optional.of("Publisher"),
+            entry.getField(StandardField.PUBLISHER)
+        );
 
         entry = entries.get(4);
         assertEquals(StandardEntryType.Article, entry.getType());
         assertEquals(Optional.of("2014"), entry.getField(StandardField.YEAR));
         assertEquals(Optional.of("58"), entry.getField(StandardField.PAGES));
-        assertEquals(Optional.of("Test"), entry.getField(StandardField.ADDRESS));
+        assertEquals(
+            Optional.of("Test"),
+            entry.getField(StandardField.ADDRESS)
+        );
         assertEquals(Optional.empty(), entry.getField(StandardField.TITLE));
-        assertEquals(Optional.of("TestPublisher"), entry.getField(StandardField.PUBLISHER));
+        assertEquals(
+            Optional.of("TestPublisher"),
+            entry.getField(StandardField.PUBLISHER)
+        );
     }
 
     @Test
     public void testImportEntries2() throws IOException, URISyntaxException {
-        Path file = Path.of(OvidImporter.class.getResource("OvidImporterTest2Invalid.txt").toURI());
-        List<BibEntry> entries = importer.importDatabase(file).getDatabase().getEntries();
+        Path file = Path.of(
+            OvidImporter.class.getResource("OvidImporterTest2Invalid.txt")
+                .toURI()
+        );
+        List<BibEntry> entries = importer
+            .importDatabase(file)
+            .getDatabase()
+            .getEntries();
         assertEquals(Collections.emptyList(), entries);
     }
 
     @Test
-    public void testImportSingleEntries() throws IOException, URISyntaxException {
-
+    public void testImportSingleEntries()
+        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.get(0));
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 39033ed6f68..c76ce9f3558 100644
--- a/src/test/java/org/jabref/logic/importer/fileformat/PdfContentImporterFilesTest.java
+++ b/src/test/java/org/jabref/logic/importer/fileformat/PdfContentImporterFilesTest.java
@@ -3,7 +3,6 @@
 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;
@@ -13,21 +12,28 @@ 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();
     }
 
     @ParameterizedTest
     @MethodSource("fileNames")
     void testIsRecognizedFormat(String fileName) throws IOException {
-        ImporterTestEngine.testIsRecognizedFormat(new PdfContentImporter(), fileName);
+        ImporterTestEngine.testIsRecognizedFormat(
+            new PdfContentImporter(),
+            fileName
+        );
     }
 
     @ParameterizedTest
     @MethodSource("fileNames")
     @Disabled("bib file does not contain linked file")
     void testImportEntries(String fileName) throws Exception {
-        ImporterTestEngine.testImportEntries(new PdfContentImporter(), fileName, FILE_ENDING);
+        ImporterTestEngine.testImportEntries(
+            new PdfContentImporter(),
+            fileName,
+            FILE_ENDING
+        );
     }
 }
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 e290c52b2a1..415084820ca 100644
--- a/src/test/java/org/jabref/logic/importer/fileformat/PdfContentImporterTest.java
+++ b/src/test/java/org/jabref/logic/importer/fileformat/PdfContentImporterTest.java
@@ -1,21 +1,19 @@
 package org.jabref.logic.importer.fileformat;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
 import java.nio.file.Path;
 import java.util.Collections;
 import java.util.List;
 import java.util.Optional;
-
 import org.jabref.logic.util.StandardFileType;
 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.BeforeEach;
 import org.junit.jupiter.api.Test;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-
 class PdfContentImporterTest {
 
     private PdfContentImporter importer;
@@ -32,28 +30,47 @@ void testsGetExtensions() {
 
     @Test
     void testGetDescription() {
-        assertEquals("PdfContentImporter parses data of the first page of the PDF and creates a BibTeX entry. Currently, Springer and IEEE formats are supported.",
-                     importer.getDescription());
+        assertEquals(
+            "PdfContentImporter parses data of the first page of the PDF and creates a BibTeX entry. Currently, Springer and IEEE formats are supported.",
+            importer.getDescription()
+        );
     }
 
     @Test
     void doesNotHandleEncryptedPdfs() throws Exception {
-        Path file = Path.of(PdfContentImporter.class.getResource("/pdfs/encrypted.pdf").toURI());
-        List<BibEntry> result = importer.importDatabase(file).getDatabase().getEntries();
+        Path file = Path.of(
+            PdfContentImporter.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(PdfContentImporter.class.getResource("/pdfs/minimal.pdf").toURI());
-        List<BibEntry> result = importer.importDatabase(file).getDatabase().getEntries();
+        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);
         expected.setField(StandardField.AUTHOR, "1 ");
         expected.setField(StandardField.TITLE, "Hello World");
-        expected.setFiles(Collections.singletonList(new LinkedFile("", file.toAbsolutePath(), "PDF")));
-
-        List<BibEntry> resultSecondImport = importer.importDatabase(file).getDatabase().getEntries();
+        expected.setFiles(
+            Collections.singletonList(
+                new LinkedFile("", file.toAbsolutePath(), "PDF")
+            )
+        );
+
+        List<BibEntry> resultSecondImport = importer
+            .importDatabase(file)
+            .getDatabase()
+            .getEntries();
         assertEquals(Collections.singletonList(expected), result);
         assertEquals(Collections.singletonList(expected), resultSecondImport);
     }
@@ -61,48 +78,69 @@ void importTwiceWorksAsExpected() throws Exception {
     @Test
     void testParsingEditorWithoutPagesorSeriesInformation() {
         BibEntry entry = new BibEntry(StandardEntryType.InProceedings);
-        entry.setField(StandardField.AUTHOR, "Anke Lüdeling and Merja Kytö (Eds.)");
+        entry.setField(
+            StandardField.AUTHOR,
+            "Anke Lüdeling and Merja Kytö (Eds.)"
+        );
         entry.setField(StandardField.EDITOR, "Anke Lüdeling and Merja Kytö");
         entry.setField(StandardField.PUBLISHER, "Springer");
-        entry.setField(StandardField.TITLE, "Corpus Linguistics – An International Handbook – Lüdeling, Anke, Kytö, Merja (Eds.)");
-
-        String firstPageContents = "Corpus Linguistics – An International Handbook – Lüdeling, Anke,\n" +
-                                   "Kytö, Merja (Eds.)\n" +
-                                   "\n" +
-                                   "Anke Lüdeling, Merja Kytö (Eds.)\n" +
-                                   "\n" +
-                                   "VOLUME 2\n" +
-                                   "\n" +
-                                   "This handbook provides an up-to-date survey of the field of corpus linguistics, a Handbücher zur Sprach- und\n" +
-                                   "field whose methodology has revolutionized much of the empirical work done in Kommunikationswissenschaft / Handbooks\n" +
-                                   "\n" +
-                                   "of Linguistics and Communication Science\n" +
-                                   "most fields of linguistic study over the past decade. (HSK) 29/2\n" +
-                                   "\n" +
-                                   "vii, 578 pages\n" +
-                                   "Corpus linguistics investigates human language by starting out from large\n";
-
-        assertEquals(Optional.of(entry), importer.getEntryFromPDFContent(firstPageContents, "\n"));
+        entry.setField(
+            StandardField.TITLE,
+            "Corpus Linguistics – An International Handbook – Lüdeling, Anke, Kytö, Merja (Eds.)"
+        );
+
+        String firstPageContents =
+            "Corpus Linguistics – An International Handbook – Lüdeling, Anke,\n" +
+            "Kytö, Merja (Eds.)\n" +
+            "\n" +
+            "Anke Lüdeling, Merja Kytö (Eds.)\n" +
+            "\n" +
+            "VOLUME 2\n" +
+            "\n" +
+            "This handbook provides an up-to-date survey of the field of corpus linguistics, a Handbücher zur Sprach- und\n" +
+            "field whose methodology has revolutionized much of the empirical work done in Kommunikationswissenschaft / Handbooks\n" +
+            "\n" +
+            "of Linguistics and Communication Science\n" +
+            "most fields of linguistic study over the past decade. (HSK) 29/2\n" +
+            "\n" +
+            "vii, 578 pages\n" +
+            "Corpus linguistics investigates human language by starting out from large\n";
+
+        assertEquals(
+            Optional.of(entry),
+            importer.getEntryFromPDFContent(firstPageContents, "\n")
+        );
     }
 
     @Test
     void testParsingWithoutActualDOINumber() {
         BibEntry entry = new BibEntry(StandardEntryType.InProceedings);
-        entry.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)\n"
-                                   + "Citation for published version\n"
-                                   + "Smith, Lucy Anna (2014) Mortality in the Ornamental Fish Retail Sector: an Analysis of Stock\n"
-                                   + "Losses and Stakeholder Opinions.\n"
-                                   + "DOI\n\n\n"
-                                   + "Link to record in KAR\n"
-                                   + "http://kar.kent.ac.uk/51043/\n"
-                                   + "Document Version\n"
-                                   + "UNSPECIFIED\n"
-                                   + "Master of Research (MRes) thesis, University of Kent,.";
-
-        assertEquals(Optional.of(entry), importer.getEntryFromPDFContent(firstPageContents, "\n"));
+        entry
+            .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)\n" +
+            "Citation for published version\n" +
+            "Smith, Lucy Anna (2014) Mortality in the Ornamental Fish Retail Sector: an Analysis of Stock\n" +
+            "Losses and Stakeholder Opinions.\n" +
+            "DOI\n\n\n" +
+            "Link to record in KAR\n" +
+            "http://kar.kent.ac.uk/51043/\n" +
+            "Document Version\n" +
+            "UNSPECIFIED\n" +
+            "Master of Research (MRes) thesis, University of Kent,.";
+
+        assertEquals(
+            Optional.of(entry),
+            importer.getEntryFromPDFContent(firstPageContents, "\n")
+        );
     }
 }
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 bdd841c54bc..6a2facf234f 100644
--- a/src/test/java/org/jabref/logic/importer/fileformat/PdfEmbeddedBibFileImporterTest.java
+++ b/src/test/java/org/jabref/logic/importer/fileformat/PdfEmbeddedBibFileImporterTest.java
@@ -1,33 +1,34 @@
 package org.jabref.logic.importer.fileformat;
 
+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;
-
 import javafx.collections.FXCollections;
-
 import org.jabref.logic.importer.ImportFormatPreferences;
 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.mockito.Answers;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
-
 class PdfEmbeddedBibFileImporterTest {
 
     private PdfEmbeddedBibFileImporter importer;
 
     @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);
     }
 
@@ -38,21 +39,37 @@ void testsGetExtensions() {
 
     @Test
     void testGetDescription() {
-        assertEquals("PdfEmbeddedBibFileImporter imports an embedded Bib-File from the PDF.",
-                     importer.getDescription());
+        assertEquals(
+            "PdfEmbeddedBibFileImporter imports an embedded Bib-File from the PDF.",
+            importer.getDescription()
+        );
     }
 
     @Test
     void doesNotHandleEncryptedPdfs() throws Exception {
-        Path file = Path.of(PdfEmbeddedBibFileImporter.class.getResource("/pdfs/encrypted.pdf").toURI());
-        List<BibEntry> result = importer.importDatabase(file).getDatabase().getEntries();
+        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());
-        List<BibEntry> result = importer.importDatabase(file).getDatabase().getEntries();
+        Path file = Path.of(
+            PdfEmbeddedBibFileImporterTest.class.getResource(
+                    "mixedMetadata.pdf"
+                )
+                .toURI()
+        );
+        List<BibEntry> result = importer
+            .importDatabase(file)
+            .getDatabase()
+            .getEntries();
 
         BibEntry expected = new BibEntry(StandardEntryType.Misc);
         expected.setCitationKey("jabreftext2021");
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 07975a31f87..d238e6455b1 100644
--- a/src/test/java/org/jabref/logic/importer/fileformat/PdfGrobidImporterTest.java
+++ b/src/test/java/org/jabref/logic/importer/fileformat/PdfGrobidImporterTest.java
@@ -1,28 +1,26 @@
 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 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;
-
 import org.jabref.logic.importer.ImportFormatPreferences;
 import org.jabref.logic.importer.fetcher.GrobidPreferences;
 import org.jabref.logic.util.StandardFileType;
 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 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;
-
 @FetcherTest
 public class PdfGrobidImporterTest {
 
@@ -30,13 +28,24 @@ public class PdfGrobidImporterTest {
 
     @BeforeEach
     public 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.bibEntryPreferences().getKeywordSeparator()).thenReturn(',');
-        when(importFormatPreferences.grobidPreferences()).thenReturn(grobidPreferences);
+        when(grobidPreferences.getGrobidURL())
+            .thenReturn("http://grobid.jabref.org:8070");
+
+        ImportFormatPreferences importFormatPreferences = mock(
+            ImportFormatPreferences.class,
+            Answers.RETURNS_DEEP_STUBS
+        );
+        when(
+            importFormatPreferences.bibEntryPreferences().getKeywordSeparator()
+        )
+            .thenReturn(',');
+        when(importFormatPreferences.grobidPreferences())
+            .thenReturn(grobidPreferences);
 
         importer = new PdfGrobidImporter(importFormatPreferences);
     }
@@ -48,25 +57,45 @@ public void testsGetExtensions() {
 
     @Test
     public void testImportEntries() throws URISyntaxException {
-        Path file = Path.of(PdfGrobidImporterTest.class.getResource("LNCS-minimal.pdf").toURI());
-        List<BibEntry> bibEntries = importer.importDatabase(file).getDatabase().getEntries();
+        Path file = Path.of(
+            PdfGrobidImporterTest.class.getResource("LNCS-minimal.pdf").toURI()
+        );
+        List<BibEntry> bibEntries = importer
+            .importDatabase(file)
+            .getDatabase()
+            .getEntries();
 
         assertEquals(1, bibEntries.size());
 
         BibEntry be0 = bibEntries.get(0);
-        assertEquals(Optional.of("Lastname, Firstname"), be0.getField(StandardField.AUTHOR));
-        assertEquals(Optional.of("Paper Title"), be0.getField(StandardField.TITLE));
+        assertEquals(
+            Optional.of("Lastname, Firstname"),
+            be0.getField(StandardField.AUTHOR)
+        );
+        assertEquals(
+            Optional.of("Paper Title"),
+            be0.getField(StandardField.TITLE)
+        );
     }
 
     @Test
-    public void testIsRecognizedFormat() throws IOException, URISyntaxException {
-        Path file = Path.of(PdfGrobidImporterTest.class.getResource("annotated.pdf").toURI());
+    public void testIsRecognizedFormat()
+        throws IOException, URISyntaxException {
+        Path file = Path.of(
+            PdfGrobidImporterTest.class.getResource("annotated.pdf").toURI()
+        );
         assertTrue(importer.isRecognizedFormat(file));
     }
 
     @Test
-    public void testIsRecognizedFormatReject() throws IOException, URISyntaxException {
-        Path file = Path.of(PdfGrobidImporterTest.class.getResource("BibtexImporter.examples.bib").toURI());
+    public void testIsRecognizedFormatReject()
+        throws IOException, URISyntaxException {
+        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 c66f2b01a9d..4255b132bf6 100644
--- a/src/test/java/org/jabref/logic/importer/fileformat/PdfMergeMetadataImporterTest.java
+++ b/src/test/java/org/jabref/logic/importer/fileformat/PdfMergeMetadataImporterTest.java
@@ -1,11 +1,13 @@
 package org.jabref.logic.importer.fileformat;
 
+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;
-
 import javafx.collections.FXCollections;
-
 import org.jabref.logic.importer.ImportFormatPreferences;
 import org.jabref.logic.importer.fetcher.GrobidPreferences;
 import org.jabref.logic.util.StandardFileType;
@@ -15,16 +17,11 @@
 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;
-
 @FetcherTest
 class PdfMergeMetadataImporterTest {
 
@@ -32,13 +29,22 @@ 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());
-        when(importFormatPreferences.grobidPreferences()).thenReturn(grobidPreferences);
+        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());
+        when(importFormatPreferences.grobidPreferences())
+            .thenReturn(grobidPreferences);
 
         importer = new PdfMergeMetadataImporter(importFormatPreferences);
     }
@@ -50,22 +56,36 @@ void testsGetExtensions() {
 
     @Test
     void testGetDescription() {
-        assertEquals("PdfMergeMetadataImporter imports metadata from a PDF using multiple strategies and merging the result.",
-                     importer.getDescription());
+        assertEquals(
+            "PdfMergeMetadataImporter imports metadata from a PDF using multiple strategies and merging the result.",
+            importer.getDescription()
+        );
     }
 
     @Test
     void doesNotHandleEncryptedPdfs() throws Exception {
-        Path file = Path.of(PdfMergeMetadataImporter.class.getResource("/pdfs/encrypted.pdf").toURI());
-        List<BibEntry> result = importer.importDatabase(file).getDatabase().getEntries();
+        Path file = Path.of(
+            PdfMergeMetadataImporter.class.getResource("/pdfs/encrypted.pdf")
+                .toURI()
+        );
+        List<BibEntry> result = importer
+            .importDatabase(file)
+            .getDatabase()
+            .getEntries();
         assertEquals(Collections.emptyList(), result);
     }
 
     @Test
     @Disabled("Switch from ottobib to OpenLibraryFetcher changed the results")
     void importWorksAsExpected() throws Exception {
-        Path file = Path.of(PdfMergeMetadataImporterTest.class.getResource("mixedMetadata.pdf").toURI());
-        List<BibEntry> result = importer.importDatabase(file).getDatabase().getEntries();
+        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)
         BibEntry expected = new BibEntry(StandardEntryType.Book);
@@ -81,7 +101,10 @@ 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");
@@ -91,7 +114,15 @@ 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 c7adc53f8d5..540dfaeef88 100644
--- a/src/test/java/org/jabref/logic/importer/fileformat/PdfVerbatimBibTextImporterTest.java
+++ b/src/test/java/org/jabref/logic/importer/fileformat/PdfVerbatimBibTextImporterTest.java
@@ -1,34 +1,35 @@
 package org.jabref.logic.importer.fileformat;
 
+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;
-
 import javafx.collections.FXCollections;
-
 import org.jabref.logic.importer.ImportFormatPreferences;
 import org.jabref.logic.util.StandardFileType;
 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.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;
-
 class PdfVerbatimBibTextImporterTest {
 
     private PdfVerbatimBibTextImporter importer;
 
     @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);
     }
 
@@ -39,21 +40,37 @@ void testsGetExtensions() {
 
     @Test
     void testGetDescription() {
-        assertEquals("PdfVerbatimBibTextImporter imports a verbatim BibTeX entry from the first page of the PDF.",
-                     importer.getDescription());
+        assertEquals(
+            "PdfVerbatimBibTextImporter imports a verbatim BibTeX entry from the first page of the PDF.",
+            importer.getDescription()
+        );
     }
 
     @Test
     void doesNotHandleEncryptedPdfs() throws Exception {
-        Path file = Path.of(PdfVerbatimBibTextImporter.class.getResource("/pdfs/encrypted.pdf").toURI());
-        List<BibEntry> result = importer.importDatabase(file).getDatabase().getEntries();
+        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());
-        List<BibEntry> result = importer.importDatabase(file).getDatabase().getEntries();
+        Path file = Path.of(
+            PdfVerbatimBibTextImporterTest.class.getResource(
+                    "mixedMetadata.pdf"
+                )
+                .toURI()
+        );
+        List<BibEntry> result = importer
+            .importDatabase(file)
+            .getDatabase()
+            .getEntries();
 
         BibEntry expected = new BibEntry(StandardEntryType.Article);
         expected.setCitationKey("jabreftest2021");
@@ -63,9 +80,16 @@ 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 b6a530ff29f..286912256ae 100644
--- a/src/test/java/org/jabref/logic/importer/fileformat/PdfXmpImporterTest.java
+++ b/src/test/java/org/jabref/logic/importer/fileformat/PdfXmpImporterTest.java
@@ -1,5 +1,9 @@
 package org.jabref.logic.importer.fileformat;
 
+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;
@@ -7,23 +11,17 @@
 import java.util.Optional;
 import java.util.function.Predicate;
 import java.util.stream.Stream;
-
 import org.jabref.logic.importer.ParserResult;
 import org.jabref.logic.util.StandardFileType;
 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;
-
 public class PdfXmpImporterTest {
 
     private PdfXmpImporter importer;
@@ -50,40 +48,65 @@ public void testsGetExtensions() {
 
     @Test
     public void testGetDescription() {
-        assertEquals("Wraps the XMPUtility function to be used as an Importer.", importer.getDescription());
+        assertEquals(
+            "Wraps the XMPUtility function to be used as an Importer.",
+            importer.getDescription()
+        );
     }
 
-    @Disabled("XMP reader prints warnings to the logger when parsing does not work")
+    @Disabled(
+        "XMP reader prints warnings to the logger when parsing does not work"
+    )
     @Test
     public void importEncryptedFileReturnsError() throws URISyntaxException {
-        Path file = Path.of(PdfXmpImporterTest.class.getResource("/pdfs/encrypted.pdf").toURI());
+        Path file = Path.of(
+            PdfXmpImporterTest.class.getResource("/pdfs/encrypted.pdf").toURI()
+        );
         ParserResult result = importer.importDatabase(file);
         assertTrue(result.hasWarnings());
     }
 
     @Test
     public void testImportEntries() throws URISyntaxException {
-        Path file = Path.of(PdfXmpImporterTest.class.getResource("annotated.pdf").toURI());
-        List<BibEntry> bibEntries = importer.importDatabase(file).getDatabase().getEntries();
+        Path file = Path.of(
+            PdfXmpImporterTest.class.getResource("annotated.pdf").toURI()
+        );
+        List<BibEntry> bibEntries = importer
+            .importDatabase(file)
+            .getDatabase()
+            .getEntries();
 
         assertEquals(1, bibEntries.size());
 
         BibEntry be0 = bibEntries.get(0);
-        assertEquals(Optional.of("how to annotate a pdf"), be0.getField(StandardField.ABSTRACT));
+        assertEquals(
+            Optional.of("how to annotate a pdf"),
+            be0.getField(StandardField.ABSTRACT)
+        );
         assertEquals(Optional.of("Chris"), be0.getField(StandardField.AUTHOR));
-        assertEquals(Optional.of("pdf, annotation"), be0.getField(StandardField.KEYWORDS));
-        assertEquals(Optional.of("The best Pdf ever"), be0.getField(StandardField.TITLE));
+        assertEquals(
+            Optional.of("pdf, annotation"),
+            be0.getField(StandardField.KEYWORDS)
+        );
+        assertEquals(
+            Optional.of("The best Pdf ever"),
+            be0.getField(StandardField.TITLE)
+        );
     }
 
     @Test
-    public void testIsRecognizedFormat() throws IOException, URISyntaxException {
-        Path file = Path.of(PdfXmpImporterTest.class.getResource("annotated.pdf").toURI());
+    public void testIsRecognizedFormat()
+        throws IOException, URISyntaxException {
+        Path file = Path.of(
+            PdfXmpImporterTest.class.getResource("annotated.pdf").toURI()
+        );
         assertTrue(importer.isRecognizedFormat(file));
     }
 
     @ParameterizedTest
     @MethodSource("invalidFileNames")
-    public void testIsRecognizedFormatReject(String fileName) throws IOException, URISyntaxException {
+    public void testIsRecognizedFormatReject(String fileName)
+        throws IOException, URISyntaxException {
         ImporterTestEngine.testIsNotRecognizedFormat(importer, fileName);
     }
 
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 cf7e9158f79..80dbbabb524 100644
--- a/src/test/java/org/jabref/logic/importer/fileformat/RISImporterFilesTest.java
+++ b/src/test/java/org/jabref/logic/importer/fileformat/RISImporterFilesTest.java
@@ -3,7 +3,6 @@
 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;
 
@@ -12,7 +11,8 @@ 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();
     }
 
@@ -25,6 +25,10 @@ void testIsRecognizedFormat(String fileName) throws IOException {
     @ParameterizedTest
     @MethodSource("fileNames")
     void testImportEntries(String fileName) throws Exception {
-        ImporterTestEngine.testImportEntries(new RisImporter(), fileName, FILE_ENDING);
+        ImporterTestEngine.testImportEntries(
+            new RisImporter(),
+            fileName,
+            FILE_ENDING
+        );
     }
 }
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 11ad5bb9782..08a08f9c77d 100644
--- a/src/test/java/org/jabref/logic/importer/fileformat/RISImporterTest.java
+++ b/src/test/java/org/jabref/logic/importer/fileformat/RISImporterTest.java
@@ -1,17 +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 java.io.IOException;
 import java.net.URISyntaxException;
 import java.nio.file.Path;
-
 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 static org.junit.jupiter.api.Assertions.assertFalse;
-
 public class RISImporterTest {
 
     private RisImporter importer;
@@ -38,12 +36,19 @@ public void testsGetExtensions() {
 
     @Test
     public void testGetDescription() {
-        assertEquals("Imports a Biblioscape Tag File.", importer.getDescription());
+        assertEquals(
+            "Imports a Biblioscape Tag File.",
+            importer.getDescription()
+        );
     }
 
     @Test
-    public void testIfNotRecognizedFormat() throws IOException, URISyntaxException {
-        Path file = Path.of(RISImporterTest.class.getResource("RisImporterCorrupted.ris").toURI());
+    public void testIfNotRecognizedFormat()
+        throws IOException, URISyntaxException {
+        Path file = Path.of(
+            RISImporterTest.class.getResource("RisImporterCorrupted.ris")
+                .toURI()
+        );
         assertFalse(importer.isRecognizedFormat(file));
     }
 }
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 5130e8913fa..8f07a39d2e5 100644
--- a/src/test/java/org/jabref/logic/importer/fileformat/RepecNepImporterTest.java
+++ b/src/test/java/org/jabref/logic/importer/fileformat/RepecNepImporterTest.java
@@ -1,22 +1,20 @@
 package org.jabref.logic.importer.fileformat;
 
+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.util.function.Predicate;
 import java.util.stream.Stream;
-
 import org.jabref.logic.importer.ImportFormatPreferences;
 import org.jabref.logic.util.StandardFileType;
-
 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 org.mockito.Answers;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
-
 public class RepecNepImporterTest {
 
     private static final String FILE_ENDING = ".txt";
@@ -25,15 +23,21 @@ public class RepecNepImporterTest {
 
     @BeforeEach
     public void setUp() {
-        ImportFormatPreferences importFormatPreferences = mock(ImportFormatPreferences.class, Answers.RETURNS_DEEP_STUBS);
-        when(importFormatPreferences.bibEntryPreferences().getKeywordSeparator()).thenReturn(',');
+        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();
     }
 
@@ -57,7 +61,11 @@ public void testIsNotRecognizedFormat(String fileName) throws IOException {
     @ParameterizedTest
     @MethodSource("fileNames")
     public void testImportEntries(String fileName) throws Exception {
-        ImporterTestEngine.testImportEntries(testImporter, fileName, FILE_ENDING);
+        ImporterTestEngine.testImportEntries(
+            testImporter,
+            fileName,
+            FILE_ENDING
+        );
     }
 
     @Test
@@ -77,7 +85,9 @@ public void testGetExtension() {
 
     @Test
     public final void testGetDescription() {
-        assertEquals("Imports a New Economics Papers-Message from the REPEC-NEP Service.",
-                testImporter.getDescription());
+        assertEquals(
+            "Imports a New Economics Papers-Message from the REPEC-NEP Service.",
+            testImporter.getDescription()
+        );
     }
 }
diff --git a/src/test/java/org/jabref/logic/importer/fileformat/SilverPlatterImporterTest.java b/src/test/java/org/jabref/logic/importer/fileformat/SilverPlatterImporterTest.java
index 5fdee2d9235..052fa378b2e 100644
--- a/src/test/java/org/jabref/logic/importer/fileformat/SilverPlatterImporterTest.java
+++ b/src/test/java/org/jabref/logic/importer/fileformat/SilverPlatterImporterTest.java
@@ -1,19 +1,17 @@
 package org.jabref.logic.importer.fileformat;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
 import java.io.IOException;
 import java.util.function.Predicate;
 import java.util.stream.Stream;
-
 import org.jabref.logic.importer.Importer;
 import org.jabref.logic.util.StandardFileType;
-
 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;
-
 class SilverPlatterImporterTest {
 
     private static final String FILE_ENDING = ".txt";
@@ -26,12 +24,15 @@ void setUp() throws Exception {
     }
 
     private static Stream<String> fileNames() throws IOException {
-        Predicate<String> fileName = name -> name.startsWith("SilverPlatterImporterTest") && name.endsWith(FILE_ENDING);
+        Predicate<String> fileName = name ->
+            name.startsWith("SilverPlatterImporterTest") &&
+            name.endsWith(FILE_ENDING);
         return ImporterTestEngine.getTestFiles(fileName).stream();
     }
 
     private static Stream<String> invalidFileNames() throws IOException {
-        Predicate<String> fileName = name -> !name.startsWith("SilverPlatterImporterTest");
+        Predicate<String> fileName = name ->
+            !name.startsWith("SilverPlatterImporterTest");
         return ImporterTestEngine.getTestFiles(fileName).stream();
     }
 
@@ -50,16 +51,26 @@ void testIsNotRecognizedFormat(String fileName) throws IOException {
     @ParameterizedTest
     @MethodSource("fileNames")
     void testImportEntries(String fileName) throws Exception {
-        ImporterTestEngine.testImportEntries(testImporter, fileName, FILE_ENDING);
+        ImporterTestEngine.testImportEntries(
+            testImporter,
+            fileName,
+            FILE_ENDING
+        );
     }
 
     @Test
     void testsGetExtensions() {
-        assertEquals(StandardFileType.SILVER_PLATTER, testImporter.getFileType());
+        assertEquals(
+            StandardFileType.SILVER_PLATTER,
+            testImporter.getFileType()
+        );
     }
 
     @Test
     void testGetDescription() {
-        assertEquals("Imports a SilverPlatter exported file.", testImporter.getDescription());
+        assertEquals(
+            "Imports a SilverPlatter exported file.",
+            testImporter.getDescription()
+        );
     }
 }
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 73a391fa355..6a610ae41e9 100644
--- a/src/test/java/org/jabref/logic/importer/util/FileFieldParserTest.java
+++ b/src/test/java/org/jabref/logic/importer/util/FileFieldParserTest.java
@@ -1,32 +1,46 @@
 package org.jabref.logic.importer.util;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
 import java.net.URL;
 import java.nio.file.Path;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 import java.util.stream.Stream;
-
 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;
-
 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"
+                )
+            ),
+            Arguments.of(
+                new LinkedFile(
+                    "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")
+                List.of(
+                    "arXiv Fulltext PDF",
+                    "https\\://arxiv.org/pdf/1109.0517.pdf",
+                    "application/pdf"
                 )
+            )
         );
     }
 
@@ -39,151 +53,198 @@ public void check(LinkedFile expected, List<String> input) {
 
     private static Stream<Arguments> stringsToParseTest() throws Exception {
         return Stream.of(
-                // null string
-                Arguments.of(
-                        Collections.emptyList(),
-                        null
+            // null string
+            Arguments.of(Collections.emptyList(), null),
+            // empty string
+            Arguments.of(Collections.emptyList(), ""),
+            // correct input
+            Arguments.of(
+                Collections.singletonList(
+                    new LinkedFile("Desc", Path.of("File.PDF"), "PDF")
                 ),
-
-                // empty string
-                Arguments.of(
-                        Collections.emptyList(),
-                        ""
+                "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"
+                    )
                 ),
-
-                // correct input
-                Arguments.of(
-                        Collections.singletonList(new LinkedFile("Desc", Path.of("File.PDF"), "PDF")),
-                        "Desc:File.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(
+                        new URL("http://arxiv.org/pdf/2010.08497v1"),
+                        "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"
+                ":http\\://arxiv.org/pdf/2010.08497v1:PDF"
+            ),
+            // parseFaultyOnlineInput
+            Arguments.of(
+                Collections.singletonList(
+                    new LinkedFile(
+                        "",
+                        "htt://arxiv.org/pdf/2010.08497v1",
+                        "PDF"
+                    )
                 ),
-
-                // parseCorrectOnlineInput
-                Arguments.of(
-                        Collections.singletonList(new LinkedFile(new URL("http://arxiv.org/pdf/2010.08497v1"), "PDF")),
-                        ":http\\://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"
+                    )
                 ),
-
-                // parseFaultyOnlineInput
-                Arguments.of(
-                        Collections.singletonList(new LinkedFile("", "htt://arxiv.org/pdf/2010.08497v1", "PDF")),
-                        ":htt\\://arxiv.org/pdf/2010.08497v1: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")
                 ),
-
-                // 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"
+                ":wei2005ahp.pdf:PDF"
+            ),
+            // interpretLinkAsOnlyMandatoryField: single
+            Arguments.of(
+                Collections.singletonList(
+                    new LinkedFile("", Path.of("wei2005ahp.pdf"), "")
                 ),
-
-                // ignoreMissingDescription
-                Arguments.of(
-                        Collections.singletonList(new LinkedFile("", Path.of("wei2005ahp.pdf"), "PDF")),
-                        ":wei2005ahp.pdf:PDF"
+                "wei2005ahp.pdf"
+            ),
+            // interpretLinkAsOnlyMandatoryField: multiple
+            Arguments.of(
+                List.of(
+                    new LinkedFile("", Path.of("wei2005ahp.pdf"), ""),
+                    new LinkedFile("", Path.of("other.pdf"), "")
                 ),
-
-                // interpretLinkAsOnlyMandatoryField: single
-                Arguments.of(
-                        Collections.singletonList(new LinkedFile("", Path.of("wei2005ahp.pdf"), "")),
-                        "wei2005ahp.pdf"
+                "wei2005ahp.pdf;other.pdf"
+            ),
+            // escapedCharactersInDescription
+            Arguments.of(
+                Collections.singletonList(
+                    new LinkedFile("test:;", Path.of("wei2005ahp.pdf"), "PDF")
                 ),
-
-                // interpretLinkAsOnlyMandatoryField: multiple
-                Arguments.of(
-                        List.of(
-                                new LinkedFile("", Path.of("wei2005ahp.pdf"), ""),
-                                new LinkedFile("", Path.of("other.pdf"), "")
-                        ),
-                        "wei2005ahp.pdf;other.pdf"
+                "test\\:\\;:wei2005ahp.pdf:PDF"
+            ),
+            // handleXmlCharacters
+            Arguments.of(
+                Collections.singletonList(
+                    new LinkedFile(
+                        "test&#44;st:;",
+                        Path.of("wei2005ahp.pdf"),
+                        "PDF"
+                    )
                 ),
-
-                // escapedCharactersInDescription
-                Arguments.of(
-                        Collections.singletonList(new LinkedFile("test:;", Path.of("wei2005ahp.pdf"), "PDF")),
-                        "test\\:\\;:wei2005ahp.pdf:PDF"
+                "test&#44\\;st\\:\\;:wei2005ahp.pdf:PDF"
+            ),
+            // handleEscapedFilePath
+            Arguments.of(
+                Collections.singletonList(
+                    new LinkedFile("desc", Path.of("C:\\test.pdf"), "PDF")
                 ),
-
-                // handleXmlCharacters
-                Arguments.of(
-                        Collections.singletonList(new LinkedFile("test&#44;st:;", Path.of("wei2005ahp.pdf"), "PDF")),
-                        "test&#44\\;st\\:\\;:wei2005ahp.pdf:PDF"
+                "desc:C\\:\\\\test.pdf:PDF"
+            ),
+            // handleNonEscapedFilePath
+            Arguments.of(
+                Collections.singletonList(
+                    new LinkedFile("desc", Path.of("C:\\test.pdf"), "PDF")
                 ),
-
-                // handleEscapedFilePath
-                Arguments.of(
-                        Collections.singletonList(new LinkedFile("desc", Path.of("C:\\test.pdf"), "PDF")),
-                        "desc: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"
+                    )
                 ),
-
-                // handleNonEscapedFilePath
-                Arguments.of(
-                        Collections.singletonList(new LinkedFile("desc", Path.of("C:\\test.pdf"), "PDF")),
-                        "desc:C:\\test.pdf:PDF"
+                "Boyd2012.pdf:C\\:\\\\Users\\\\Literature_database\\\\Boyd2012.pdf:PDF"
+            ),
+            // subsetOfFieldsResultsInFileLink: description only
+            Arguments.of(
+                Collections.singletonList(
+                    new LinkedFile("", Path.of("file.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"
+                "file.pdf::"
+            ),
+            // subsetOfFieldsResultsInFileLink: file only
+            Arguments.of(
+                Collections.singletonList(
+                    new LinkedFile("", Path.of("file.pdf"), "")
                 ),
-
-                // subsetOfFieldsResultsInFileLink: description 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"), "")
                 ),
-
-                // subsetOfFieldsResultsInFileLink: file 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")
                 ),
-
-                // subsetOfFieldsResultsInFileLink: type only
-                Arguments.of(
-                        Collections.singletonList(new LinkedFile("", Path.of("file.pdf"), "")),
-                        "::file.pdf"
+                "desc:file.pdf:PDF:asdf"
+            ),
+            // www inside filename
+            Arguments.of(
+                Collections.singletonList(
+                    new LinkedFile("", Path.of("/home/www.google.de.pdf"), "")
                 ),
-
-                // tooManySeparators
-                Arguments.of(
-                        Collections.singletonList(new LinkedFile("desc", Path.of("file.pdf"), "PDF")),
-                        "desc:file.pdf:PDF:asdf"
+                ":/home/www.google.de.pdf"
+            ),
+            // url
+            Arguments.of(
+                Collections.singletonList(
+                    new LinkedFile(new URL("https://books.google.de/"), "")
                 ),
-
-                // www inside filename
-                Arguments.of(
-                        Collections.singletonList(new LinkedFile("", Path.of("/home/www.google.de.pdf"), "")),
-                        ":/home/www.google.de.pdf"
+                "https://books.google.de/"
+            ),
+            // url with www
+            Arguments.of(
+                Collections.singletonList(
+                    new LinkedFile(new URL("https://www.google.de/"), "")
                 ),
-
-                // url
-                Arguments.of(
-                         Collections.singletonList(new LinkedFile(new URL("https://books.google.de/"), "")),
-                         "https://books.google.de/"
+                "https://www.google.de/"
+            ),
+            // url as file
+            Arguments.of(
+                Collections.singletonList(
+                    new LinkedFile(
+                        "",
+                        new URL("http://ceur-ws.org/Vol-438"),
+                        "URL"
+                    )
                 ),
-
-                // url with www
-                Arguments.of(
-                             Collections.singletonList(new LinkedFile(new URL("https://www.google.de/"), "")),
-                             "https://www.google.de/"
+                ":http\\://ceur-ws.org/Vol-438:URL"
+            ),
+            // url as file with desc
+            Arguments.of(
+                Collections.singletonList(
+                    new LinkedFile(
+                        "desc",
+                        new URL("http://ceur-ws.org/Vol-438"),
+                        "URL"
+                    )
                 ),
-
-                // url as file
-                Arguments.of(
-                             Collections.singletonList(new LinkedFile("", new URL("http://ceur-ws.org/Vol-438"), "URL")),
-                             ":http\\://ceur-ws.org/Vol-438:URL"
-                ),
-                // url as file with desc
-                Arguments.of(
-                             Collections.singletonList(new LinkedFile("desc", new URL("http://ceur-ws.org/Vol-438"), "URL")),
-                             "desc:http\\://ceur-ws.org/Vol-438:URL"
-               )
+                "desc:http\\://ceur-ws.org/Vol-438:URL"
+            )
         );
     }
 
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 2fa969bd8b9..a23dc088b4a 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,17 @@
 package org.jabref.logic.importer.util;
 
+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.Optional;
-
 import org.jabref.logic.importer.ImportFormatPreferences;
 import org.jabref.logic.importer.ParseException;
 import org.jabref.logic.importer.fetcher.GrobidPreferences;
@@ -14,18 +20,10 @@
 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;
-
 @FetcherTest
 public class GrobidServiceTest {
 
@@ -34,69 +32,110 @@ public class GrobidServiceTest {
 
     @BeforeAll
     public static void setup() {
-        importFormatPreferences = mock(ImportFormatPreferences.class, Answers.RETURNS_DEEP_STUBS);
-        when(importFormatPreferences.bibEntryPreferences().getKeywordSeparator()).thenReturn(',');
+        importFormatPreferences =
+            mock(ImportFormatPreferences.class, Answers.RETURNS_DEEP_STUBS);
+        when(
+            importFormatPreferences.bibEntryPreferences().getKeywordSeparator()
+        )
+            .thenReturn(',');
 
         GrobidPreferences grobidPreferences = new GrobidPreferences(
-                true,
-                false,
-                "http://grobid.jabref.org:8070");
+            true,
+            false,
+            "http://grobid.jabref.org:8070"
+        );
         grobidService = new GrobidService(grobidPreferences);
     }
 
     @Test
     public 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);
+            .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
     public 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
     public 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
     public void failsWhenGrobidDisabled() {
-        GrobidPreferences importSettingsWithGrobidDisabled = new GrobidPreferences(
+        GrobidPreferences importSettingsWithGrobidDisabled =
+            new GrobidPreferences(
                 false,
                 false,
-                "http://grobid.jabref.org:8070");
-        assertThrows(UnsupportedOperationException.class, () -> new GrobidService(importSettingsWithGrobidDisabled));
+                "http://grobid.jabref.org:8070"
+            );
+        assertThrows(
+            UnsupportedOperationException.class,
+            () -> new GrobidService(importSettingsWithGrobidDisabled)
+        );
     }
 
     @Test
-    public void processPdfTest() throws IOException, ParseException, URISyntaxException {
-        Path file = Path.of(PdfGrobidImporterTest.class.getResource("LNCS-minimal.pdf").toURI());
-        List<BibEntry> response = grobidService.processPDF(file, importFormatPreferences);
+    public void processPdfTest()
+        throws IOException, ParseException, URISyntaxException {
+        Path file = Path.of(
+            PdfGrobidImporterTest.class.getResource("LNCS-minimal.pdf").toURI()
+        );
+        List<BibEntry> response = grobidService.processPDF(
+            file,
+            importFormatPreferences
+        );
         assertEquals(1, response.size());
         BibEntry be0 = response.get(0);
-        assertEquals(Optional.of("Lastname, Firstname"), be0.getField(StandardField.AUTHOR));
+        assertEquals(
+            Optional.of("Lastname, Firstname"),
+            be0.getField(StandardField.AUTHOR)
+        );
         // assertEquals(Optional.of("Paper Title"), be0.getField(StandardField.TITLE));
         // assertEquals(Optional.of("2014-10-05"), be0.getField(StandardField.DATE));
     }
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 061295491a5..128f82d01d3 100644
--- a/src/test/java/org/jabref/logic/importer/util/GroupsParserTest.java
+++ b/src/test/java/org/jabref/logic/importer/util/GroupsParserTest.java
@@ -1,12 +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 java.nio.file.Path;
 import java.util.Arrays;
 import java.util.EnumSet;
 import java.util.List;
-
 import javafx.scene.paint.Color;
-
 import org.jabref.logic.auxparser.DefaultAuxParser;
 import org.jabref.logic.importer.ParseException;
 import org.jabref.model.database.BibDatabase;
@@ -24,14 +25,11 @@
 import org.jabref.model.search.rules.SearchRules;
 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;
-
 class GroupsParserTest {
+
     private FileUpdateMonitor fileMonitor;
     private MetaData metaData;
 
@@ -43,37 +41,82 @@ 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);
+    void fromStringParsesExplicitGroupWithEscapedCharacterInName()
+        throws Exception {
+        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));
+    void fromStringThrowsParseExceptionForNotEscapedGroupName()
+        throws Exception {
+        assertThrows(
+            ParseException.class,
+            () ->
+                GroupsParser.fromString(
+                    "ExplicitGroup:slit\\\\;0\\;mertsch_slit2_2007\\;;",
+                    ',',
+                    fileMonitor,
+                    metaData
+                )
+        );
     }
 
     @Test
     void testImportSubGroups() 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
@@ -81,63 +124,145 @@ void testImportSubGroups() throws Exception {
         //  Level 1 Name: 3
 
         GroupTreeNode rootNode = new GroupTreeNode(
-                new ExplicitGroup("All entries", GroupHierarchyType.INDEPENDENT, ','));
+            new ExplicitGroup(
+                "All entries",
+                GroupHierarchyType.INDEPENDENT,
+                ','
+            )
+        );
 
-        AbstractGroup firstSubGrpLvl1 = new ExplicitGroup("1", GroupHierarchyType.INDEPENDENT, ',');
+        AbstractGroup firstSubGrpLvl1 = new ExplicitGroup(
+            "1",
+            GroupHierarchyType.INDEPENDENT,
+            ','
+        );
         rootNode.addSubgroup(firstSubGrpLvl1);
 
-        AbstractGroup subLvl2 = new ExplicitGroup("2", GroupHierarchyType.INDEPENDENT, ',');
+        AbstractGroup subLvl2 = new ExplicitGroup(
+            "2",
+            GroupHierarchyType.INDEPENDENT,
+            ','
+        );
         rootNode.getFirstChild().ifPresent(c -> c.addSubgroup(subLvl2));
 
-        AbstractGroup thirdSubGrpLvl1 = new ExplicitGroup("3", GroupHierarchyType.INDEPENDENT, ',');
+        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, ',');
+    void fromStringParsesExplicitGroupWithIconAndDescription()
+        throws Exception {
+        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(SearchRules.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(SearchRules.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 50030b02e91..1fb536dd76b 100644
--- a/src/test/java/org/jabref/logic/importer/util/JsonReaderTest.java
+++ b/src/test/java/org/jabref/logic/importer/util/JsonReaderTest.java
@@ -1,49 +1,64 @@
 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 java.io.ByteArrayInputStream;
 import kong.unirest.json.JSONObject;
+import org.jabref.logic.importer.ParseException;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-
 class JsonReaderTest {
 
     @Test
     void nullStreamThrowsNullPointerException() {
-        Assertions.assertThrows(NullPointerException.class, () -> {
-            JsonReader.toJsonObject(null);
-        });
+        Assertions.assertThrows(
+            NullPointerException.class,
+            () -> {
+                JsonReader.toJsonObject(null);
+            }
+        );
     }
 
     @Test
     void invalidJsonThrowsParserException() {
-        Assertions.assertThrows(ParseException.class, () -> {
-            JsonReader.toJsonObject(new ByteArrayInputStream("invalid JSON".getBytes()));
-        });
+        Assertions.assertThrows(
+            ParseException.class,
+            () -> {
+                JsonReader.toJsonObject(
+                    new ByteArrayInputStream("invalid JSON".getBytes())
+                );
+            }
+        );
     }
 
     @Test
     void emptyStringResultsInEmptyObject() throws Exception {
-        JSONObject result = JsonReader.toJsonObject(new ByteArrayInputStream("".getBytes()));
+        JSONObject result = JsonReader.toJsonObject(
+            new ByteArrayInputStream("".getBytes())
+        );
         assertEquals("{}", result.toString());
     }
 
     @Test
     void arrayThrowsParserException() {
         // Reason: We expect a JSON object, not a JSON array
-        Assertions.assertThrows(ParseException.class, () -> {
-            JsonReader.toJsonObject(new ByteArrayInputStream("[]".getBytes()));
-        });
+        Assertions.assertThrows(
+            ParseException.class,
+            () -> {
+                JsonReader.toJsonObject(
+                    new ByteArrayInputStream("[]".getBytes())
+                );
+            }
+        );
     }
 
     @Test
     void exampleJsonResultsInSameJson() throws Exception {
         String input = "{\"name\":\"test\"}";
-        JSONObject result = JsonReader.toJsonObject(new ByteArrayInputStream(input.getBytes()));
+        JSONObject result = JsonReader.toJsonObject(
+            new ByteArrayInputStream(input.getBytes())
+        );
         assertEquals(input, result.toString());
     }
 }
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 f8866cf9c05..3ade8302a07 100644
--- a/src/test/java/org/jabref/logic/importer/util/MathMLParserTest.java
+++ b/src/test/java/org/jabref/logic/importer/util/MathMLParserTest.java
@@ -1,20 +1,19 @@
 package org.jabref.logic.importer.util;
 
+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;
-
 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;
-
 class MathMLParserTest {
+
     private static XMLInputFactory xmlInputFactory;
 
     @BeforeAll
@@ -25,96 +24,109 @@ public static void setUp() {
 
     @ParameterizedTest
     @MethodSource("tests")
-    void parserConvertsMathMLIntoLatex(String expected, String input) throws XMLStreamException {
-        XMLStreamReader reader = xmlInputFactory.createXMLStreamReader(new StringReader(input));
+    void parserConvertsMathMLIntoLatex(String expected, String input)
+        throws XMLStreamException {
+        XMLStreamReader reader = xmlInputFactory.createXMLStreamReader(
+            new StringReader(input)
+        );
         assertEquals(expected, MathMLParser.parse(reader));
     }
 
     private static Stream<Arguments> tests() {
         return Stream.of(
-                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>
-                                        <matrixrow>
-                                            <cn> 0 </cn> <cn> 1 </cn> <cn> 0 </cn>
-                                        </matrixrow>
-                                        <matrixrow>
-                                            <cn> 0 </cn> <cn> 0 </cn> <cn> 1 </cn>
-                                        </matrixrow>
-                                        <matrixrow>
-                                            <cn> 1 </cn> <cn> 0 </cn> <cn> 0 </cn>
-                                        </matrixrow>
-                                    </matrix>
-                                </math>
-                                """),
-                Arguments.of("${\\eta }_{p}^{2}$",
-                        """
-                                <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("<Unsupported MathML expression>",
-                        """
-                                <mml:math xmlns=http://www.w3.org/1998/Math/MathML>
-                                    <mml:mrow>
-                                        <mml:msubsup>
-                                            <mml:mi>η</abc>
-                                        </mml:msubsup>
-                                    </mml:mrow>
-                                </mml:math>
-                                """),
-                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>
-                                        <mo>&#x222B;</mo>
-                                        <mi>a</mi>
-                                        <mi>b</mi>
-                                    </munderover>
-                                    <mfenced separators=''>
-                                        <mn>5</mn>
-                                        <mi>x</mi>
-                                        <mo>+</mo>
-                                        <mn>2</mn>
-                                        <mi>sin</mi>
-                                        <mfenced separators=''>
-                                            <mi>x</mi>
-                                        </mfenced>
-                                    </mfenced>
-                                    <mi>dx</mi>
-                                </math>
-                                """),
-                Arguments.of("$\\stackrel{\\to }{v}=\\left({v}_{1},{v}_{2},{v}_{3}\\right)$",
-                        """
-                                <math xmlns="http://www.w3.org/1998/Math/MathML">
-                                    <mover>
-                                        <mi>v</mi>
-                                        <mo>&#x2192;</mo>
-                                    </mover>
-                                    <mo>=</mo>
-                                    <mfenced>
-                                        <msub>
-                                            <mi>v</mi>
-                                            <mn>1</mn>
-                                        </msub>
-                                        <msub>
-                                            <mi>v</mi>
-                                            <mn>2</mn>
-                                        </msub>
-                                        <msub>
-                                            <mi>v</mi>
-                                            <mn>3</mn>
-                                        </msub>
-                                    </mfenced>
-                                </math>
-                                """)
+            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>
+                        <matrixrow>
+                            <cn> 0 </cn> <cn> 1 </cn> <cn> 0 </cn>
+                        </matrixrow>
+                        <matrixrow>
+                            <cn> 0 </cn> <cn> 0 </cn> <cn> 1 </cn>
+                        </matrixrow>
+                        <matrixrow>
+                            <cn> 1 </cn> <cn> 0 </cn> <cn> 0 </cn>
+                        </matrixrow>
+                    </matrix>
+                </math>
+                """
+            ),
+            Arguments.of(
+                "${\\eta }_{p}^{2}$",
+                """
+                <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(
+                "<Unsupported MathML expression>",
+                """
+                <mml:math xmlns=http://www.w3.org/1998/Math/MathML>
+                    <mml:mrow>
+                        <mml:msubsup>
+                            <mml:mi>η</abc>
+                        </mml:msubsup>
+                    </mml:mrow>
+                </mml:math>
+                """
+            ),
+            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>
+                        <mo>&#x222B;</mo>
+                        <mi>a</mi>
+                        <mi>b</mi>
+                    </munderover>
+                    <mfenced separators=''>
+                        <mn>5</mn>
+                        <mi>x</mi>
+                        <mo>+</mo>
+                        <mn>2</mn>
+                        <mi>sin</mi>
+                        <mfenced separators=''>
+                            <mi>x</mi>
+                        </mfenced>
+                    </mfenced>
+                    <mi>dx</mi>
+                </math>
+                """
+            ),
+            Arguments.of(
+                "$\\stackrel{\\to }{v}=\\left({v}_{1},{v}_{2},{v}_{3}\\right)$",
+                """
+                <math xmlns="http://www.w3.org/1998/Math/MathML">
+                    <mover>
+                        <mi>v</mi>
+                        <mo>&#x2192;</mo>
+                    </mover>
+                    <mo>=</mo>
+                    <mfenced>
+                        <msub>
+                            <mi>v</mi>
+                            <mn>1</mn>
+                        </msub>
+                        <msub>
+                            <mi>v</mi>
+                            <mn>2</mn>
+                        </msub>
+                        <msub>
+                            <mi>v</mi>
+                            <mn>3</mn>
+                        </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 251b3d10279..f311072c214 100644
--- a/src/test/java/org/jabref/logic/importer/util/MetaDataParserTest.java
+++ b/src/test/java/org/jabref/logic/importer/util/MetaDataParserTest.java
@@ -1,24 +1,23 @@
 package org.jabref.logic.importer.util;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
 import java.util.Optional;
 import java.util.stream.Stream;
-
 import org.jabref.logic.exporter.MetaDataSerializerTest;
 import org.jabref.model.entry.BibEntryTypeBuilder;
 import org.jabref.model.entry.field.UnknownField;
 import org.jabref.model.entry.types.UnknownEntryType;
-
 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;
-
 public class MetaDataParserTest {
 
     @ParameterizedTest
-    @CsvSource({
+    @CsvSource(
+        {
             "C:\\temp\\test,                 C:\\temp\\test",
             "\\\\servername\\path\\to\\file, \\\\\\\\servername\\\\path\\\\to\\\\file",
             "\\\\servername\\path\\to\\file, \\\\servername\\path\\to\\file",
@@ -26,7 +25,8 @@ public class MetaDataParserTest {
             ".\\pdfs,                        .\\pdfs,",
             ".\\pdfs,                        .\\\\pdfs,",
             ".,                              .",
-    })
+        }
+    )
     void parseDirectory(String expected, String input) {
         assertEquals(expected, MetaDataParser.parseDirectory(input));
     }
@@ -36,24 +36,33 @@ void parseDirectory(String expected, String input) {
      */
     public static Stream<Arguments> parseCustomizedEntryType() {
         return Stream.of(
-                Arguments.of(
-                        new BibEntryTypeBuilder()
-                                .withType(new UnknownEntryType("test"))
-                                .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[]"
-                )
+            Arguments.of(
+                new BibEntryTypeBuilder()
+                    .withType(new UnknownEntryType("test"))
+                    .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[]"
+            )
         );
     }
 
     @ParameterizedTest
     @MethodSource
     void parseCustomizedEntryType(BibEntryTypeBuilder expected, String source) {
-        assertEquals(Optional.of(expected.build()), MetaDataParser.parseCustomEntryType(source));
+        assertEquals(
+            Optional.of(expected.build()),
+            MetaDataParser.parseCustomEntryType(source)
+        );
     }
 }
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 26ea4706030..3a543f72eea 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 {
 
@@ -30,7 +29,11 @@ void getShortDOI() throws ShortDOIServiceException {
     }
 
     @Test
-    void shouldThrowExceptionWhenDOIWasNotFound() throws ShortDOIServiceException {
-        assertThrows(ShortDOIServiceException.class, () -> sut.getShortDOI(notExistingDoi));
+    void shouldThrowExceptionWhenDOIWasNotFound()
+        throws ShortDOIServiceException {
+        assertThrows(
+            ShortDOIServiceException.class,
+            () -> sut.getShortDOI(notExistingDoi)
+        );
     }
 }
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 54c07d74e54..d20e5fea67a 100644
--- a/src/test/java/org/jabref/logic/importer/util/StaxParserTest.java
+++ b/src/test/java/org/jabref/logic/importer/util/StaxParserTest.java
@@ -1,20 +1,19 @@
 package org.jabref.logic.importer.util;
 
+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;
-
 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;
-
 class StaxParserTest {
+
     private static XMLInputFactory xmlInputFactory;
 
     @BeforeAll
@@ -25,67 +24,82 @@ public static void setUp() {
 
     @ParameterizedTest
     @MethodSource("tests")
-    void getsCompleteXMLContent(String expected, String input) throws XMLStreamException {
-        XMLStreamReader reader = xmlInputFactory.createXMLStreamReader(new StringReader(input));
+    void getsCompleteXMLContent(String expected, String input)
+        throws XMLStreamException {
+        XMLStreamReader reader = xmlInputFactory.createXMLStreamReader(
+            new StringReader(input)
+        );
         assertEquals(expected, StaxParser.getXMLContent(reader));
     }
 
     private static Stream<Arguments> tests() {
         return Stream.of(
-                Arguments.of("<ForeName xmlns=\"\" attr=\"1\">Alan</ForeName>",
-                        """
-                                <ForeName 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>",
-                        """
-                                <ForeName attr="1">
-                                    Alan
-                                    <ForeName attr="5">MiddleName</ForeName>
-                                </ForeName>
-                                <LastName attr="2">Grant</LastName>
-                                """),
-                Arguments.of("<PubDate xmlns=\"\"><Year>2020</Year><Month>Jul</Month><Day>24</Day></PubDate>",
-                        """
-                                <PubDate>
-                                    <Year>2020</Year>
-                                    <Month>Jul</Month>
-                                    <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>",
-                        """
-                                <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("<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>
-                                    <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(
+                "<ForeName xmlns=\"\" attr=\"1\">Alan</ForeName>",
+                """
+                <ForeName 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>",
+                """
+                <ForeName attr="1">
+                    Alan
+                    <ForeName attr="5">MiddleName</ForeName>
+                </ForeName>
+                <LastName attr="2">Grant</LastName>
+                """
+            ),
+            Arguments.of(
+                "<PubDate xmlns=\"\"><Year>2020</Year><Month>Jul</Month><Day>24</Day></PubDate>",
+                """
+                <PubDate>
+                    <Year>2020</Year>
+                    <Month>Jul</Month>
+                    <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>",
+                """
+                <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(
+                "<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>
+                    <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>
+                """
+            )
         );
     }
 }
diff --git a/src/test/java/org/jabref/logic/integrity/ASCIICharacterCheckerTest.java b/src/test/java/org/jabref/logic/integrity/ASCIICharacterCheckerTest.java
index 09efadebe2d..43fd1081dbc 100644
--- a/src/test/java/org/jabref/logic/integrity/ASCIICharacterCheckerTest.java
+++ b/src/test/java/org/jabref/logic/integrity/ASCIICharacterCheckerTest.java
@@ -1,15 +1,13 @@
 package org.jabref.logic.integrity;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
 import java.util.Collections;
 import java.util.List;
-
 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;
-
 public class ASCIICharacterCheckerTest {
 
     private final ASCIICharacterChecker checker = new ASCIICharacterChecker();
@@ -24,13 +22,31 @@ 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 +63,15 @@ 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 1969a2e03da..d042c1deaae 100644
--- a/src/test/java/org/jabref/logic/integrity/AbbreviationCheckerTest.java
+++ b/src/test/java/org/jabref/logic/integrity/AbbreviationCheckerTest.java
@@ -1,20 +1,18 @@
 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 java.util.Collections;
 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.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;
-
 class AbbreviationCheckerTest {
 
     private JournalAbbreviationRepository abbreviationRepository;
@@ -23,8 +21,11 @@ class AbbreviationCheckerTest {
 
     @BeforeEach
     void setUp() {
-        abbreviationRepository = JournalAbbreviationLoader.loadBuiltInRepository();
-        abbreviationRepository.addCustomAbbreviation(new Abbreviation("Test Journal", "T. J."));
+        abbreviationRepository =
+            JournalAbbreviationLoader.loadBuiltInRepository();
+        abbreviationRepository.addCustomAbbreviation(
+            new Abbreviation("Test Journal", "T. J.")
+        );
         entry = new BibEntry(StandardEntryType.InProceedings);
         checker = new AbbreviationChecker(abbreviationRepository);
     }
@@ -38,7 +39,9 @@ void checkEntryComplainsAboutAbbreviatedJournalName() {
     @Test
     void checkEntryDoesNotComplainAboutJournalNameThatHasSameAbbreviation() {
         entry.setField(StandardField.BOOKTITLE, "Journal");
-        abbreviationRepository.addCustomAbbreviation(new Abbreviation("Journal", "Journal"));
+        abbreviationRepository.addCustomAbbreviation(
+            new Abbreviation("Journal", "Journal")
+        );
         assertEquals(Collections.emptyList(), checker.check(entry));
     }
 
@@ -55,13 +58,19 @@ 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 1e568793f70..cc5343f0b8e 100644
--- a/src/test/java/org/jabref/logic/integrity/AmpersandCheckerTest.java
+++ b/src/test/java/org/jabref/logic/integrity/AmpersandCheckerTest.java
@@ -1,18 +1,16 @@
 package org.jabref.logic.integrity;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
 import java.util.List;
 import java.util.stream.Stream;
-
 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;
-
 public class AmpersandCheckerTest {
 
     private final AmpersandChecker checker = new AmpersandChecker();
@@ -27,38 +25,81 @@ void acceptsAllowedInputs(Field field, String value) {
 
     private static Stream<Arguments> provideAcceptedInputs() {
         return Stream.of(
-                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.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.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.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"
+            )
         );
     }
 
     @ParameterizedTest
     @MethodSource("provideUnacceptedInputs")
-    void rejectsDisallowedInputs(String expectedMessage, Field field, String value) {
+    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"),
-
-                // 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 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"
+            ),
+            // 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!"
+            )
         );
     }
 }
diff --git a/src/test/java/org/jabref/logic/integrity/BibStringCheckerTest.java b/src/test/java/org/jabref/logic/integrity/BibStringCheckerTest.java
index 71c09f2e6a4..28e80a727cb 100644
--- a/src/test/java/org/jabref/logic/integrity/BibStringCheckerTest.java
+++ b/src/test/java/org/jabref/logic/integrity/BibStringCheckerTest.java
@@ -1,20 +1,18 @@
 package org.jabref.logic.integrity;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
 import java.util.Collections;
 import java.util.List;
 import java.util.stream.Stream;
-
 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;
-
 public class BibStringCheckerTest {
 
     private final BibStringChecker checker = new BibStringChecker();
@@ -22,28 +20,58 @@ public class BibStringCheckerTest {
 
     @ParameterizedTest
     @MethodSource("provideAcceptedInputs")
-    void acceptsAllowedInputs(List<IntegrityMessage> expected, Field field, String value) {
+    void acceptsAllowedInputs(
+        List<IntegrityMessage> expected,
+        Field field,
+        String value
+    ) {
         entry.setField(field, value);
         assertEquals(expected, checker.check(entry));
     }
 
     private static Stream<Arguments> provideAcceptedInputs() {
         return Stream.of(
-                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.TITLE,
+                "Not a single hash mark"
+            ),
+            Arguments.of(Collections.emptyList(), StandardField.MONTH, "#jan#"),
+            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 7ce09e1bd3a..c1512b00fb0 100644
--- a/src/test/java/org/jabref/logic/integrity/BooktitleCheckerTest.java
+++ b/src/test/java/org/jabref/logic/integrity/BooktitleCheckerTest.java
@@ -1,24 +1,33 @@
 package org.jabref.logic.integrity;
 
-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 java.util.Optional;
+import org.junit.jupiter.api.Test;
+
 public class BooktitleCheckerTest {
 
     private final BooktitleChecker checker = new BooktitleChecker();
 
     @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 245829abea3..4d22911288e 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;
+
 public class BracesCorrectorTest {
 
     @Test
@@ -44,6 +44,9 @@ public void inputWithMaskedBraces() {
 
     @Test
     public void inputWithMixedBraces() {
-        assertEquals("{b{anana\\\\\\}}}", BracesCorrector.apply("{b{anana\\\\\\}"));
+        assertEquals(
+            "{b{anana\\\\\\}}}",
+            BracesCorrector.apply("{b{anana\\\\\\}")
+        );
     }
 }
diff --git a/src/test/java/org/jabref/logic/integrity/BracketCheckerTest.java b/src/test/java/org/jabref/logic/integrity/BracketCheckerTest.java
index d49a6ac69ac..ea83a6ea5cf 100644
--- a/src/test/java/org/jabref/logic/integrity/BracketCheckerTest.java
+++ b/src/test/java/org/jabref/logic/integrity/BracketCheckerTest.java
@@ -1,12 +1,11 @@
 package org.jabref.logic.integrity;
 
-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 java.util.Optional;
+import org.junit.jupiter.api.Test;
+
 public class BracketCheckerTest {
 
     private final BracketChecker checker = new BracketChecker();
diff --git a/src/test/java/org/jabref/logic/integrity/CitationKeyCheckerTest.java b/src/test/java/org/jabref/logic/integrity/CitationKeyCheckerTest.java
index 44d0ce9e979..9ef36d03e18 100644
--- a/src/test/java/org/jabref/logic/integrity/CitationKeyCheckerTest.java
+++ b/src/test/java/org/jabref/logic/integrity/CitationKeyCheckerTest.java
@@ -1,51 +1,61 @@
 package org.jabref.logic.integrity;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
 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.field.StandardField;
-
 import org.junit.jupiter.api.Test;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-
 public class CitationKeyCheckerTest {
 
     private final CitationKeyChecker checker = new CitationKeyChecker();
 
     @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 731dbfac2ee..72930677fc4 100644
--- a/src/test/java/org/jabref/logic/integrity/CitationKeyDeviationCheckerTest.java
+++ b/src/test/java/org/jabref/logic/integrity/CitationKeyDeviationCheckerTest.java
@@ -1,8 +1,11 @@
 package org.jabref.logic.integrity;
 
+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 org.jabref.logic.citationkeypattern.AbstractCitationKeyPattern;
 import org.jabref.logic.citationkeypattern.CitationKeyPatternPreferences;
 import org.jabref.logic.citationkeypattern.GlobalCitationKeyPattern;
@@ -13,39 +16,57 @@
 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;
-
 public class CitationKeyDeviationCheckerTest {
 
-    private final BibDatabaseContext bibDatabaseContext = mock(BibDatabaseContext.class);
+    private final BibDatabaseContext bibDatabaseContext = mock(
+        BibDatabaseContext.class
+    );
     private final BibDatabase bibDatabase = mock(BibDatabase.class);
     private final MetaData metaData = mock(MetaData.class);
-    private final AbstractCitationKeyPattern abstractCitationKeyPattern = mock(AbstractCitationKeyPattern.class);
-    private final GlobalCitationKeyPattern globalCitationKeyPattern = mock(GlobalCitationKeyPattern.class);
-    private final CitationKeyPatternPreferences citationKeyPatternPreferences = mock(CitationKeyPatternPreferences.class);
-    private final CitationKeyDeviationChecker checker = new CitationKeyDeviationChecker(bibDatabaseContext, citationKeyPatternPreferences);
+    private final AbstractCitationKeyPattern abstractCitationKeyPattern = mock(
+        AbstractCitationKeyPattern.class
+    );
+    private final GlobalCitationKeyPattern globalCitationKeyPattern = mock(
+        GlobalCitationKeyPattern.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.getKeyPattern()).thenReturn(globalCitationKeyPattern);
-        when(metaData.getCiteKeyPattern(citationKeyPatternPreferences.getKeyPattern())).thenReturn(abstractCitationKeyPattern);
+        when(citationKeyPatternPreferences.getKeyPattern())
+            .thenReturn(globalCitationKeyPattern);
+        when(
+            metaData.getCiteKeyPattern(
+                citationKeyPatternPreferences.getKeyPattern()
+            )
+        )
+            .thenReturn(abstractCitationKeyPattern);
         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 b506e87194b..ebc653faa52 100644
--- a/src/test/java/org/jabref/logic/integrity/CitationKeyDuplicationCheckerTest.java
+++ b/src/test/java/org/jabref/logic/integrity/CitationKeyDuplicationCheckerTest.java
@@ -1,27 +1,27 @@
 package org.jabref.logic.integrity;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
 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.field.InternalField;
 import org.jabref.model.entry.field.StandardField;
-
 import org.junit.jupiter.api.Test;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-
 public 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);
+        CitationKeyDuplicationChecker checker =
+            new CitationKeyDuplicationChecker(bibDatabase);
 
         List<IntegrityMessage> expected = Collections.emptyList();
         assertEquals(expected, checker.check(entry));
@@ -29,17 +29,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);
+        CitationKeyDuplicationChecker checker =
+            new CitationKeyDuplicationChecker(bibDatabase);
 
         List<IntegrityMessage> expected = Collections.singletonList(
-                new IntegrityMessage(Localization.lang("Duplicate citation key"), entry, StandardField.KEY));
+            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 f8e2d8fbcd4..bd3aa7266e6 100644
--- a/src/test/java/org/jabref/logic/integrity/DateCheckerTest.java
+++ b/src/test/java/org/jabref/logic/integrity/DateCheckerTest.java
@@ -1,13 +1,12 @@
 package org.jabref.logic.integrity;
 
-import java.util.Optional;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
+import java.util.Optional;
 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;
-
 class DateCheckerTest {
 
     private final DateChecker checker = new DateChecker();
@@ -18,13 +17,37 @@ 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 5b877503674..bb595f3e0cd 100644
--- a/src/test/java/org/jabref/logic/integrity/DoiDuplicationCheckerTest.java
+++ b/src/test/java/org/jabref/logic/integrity/DoiDuplicationCheckerTest.java
@@ -1,46 +1,83 @@
 package org.jabref.logic.integrity;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
 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.field.StandardField;
-
 import org.junit.jupiter.api.Test;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-
 public class DoiDuplicationCheckerTest {
 
     private final DoiDuplicationChecker checker = new DoiDuplicationChecker();
     private String doiA = "10.1023/A:1022883727209";
     private String doiB = "10.1177/1461444811422887";
     private String doiC = "10.1145/2568225.2568315";
-    private BibEntry doiA_entry1 = new BibEntry().withField(StandardField.DOI, doiA);
-    private BibEntry doiA_entry2 = new BibEntry().withField(StandardField.DOI, doiA);
-    private BibEntry doiB_entry1 = new BibEntry().withField(StandardField.DOI, doiB);
-    private BibEntry doiB_entry2 = new BibEntry().withField(StandardField.DOI, doiB);
-    private BibEntry doiC_entry1 = new BibEntry().withField(StandardField.DOI, doiC);
+    private BibEntry doiA_entry1 = new BibEntry()
+        .withField(StandardField.DOI, doiA);
+    private BibEntry doiA_entry2 = new BibEntry()
+        .withField(StandardField.DOI, doiA);
+    private BibEntry doiB_entry1 = new BibEntry()
+        .withField(StandardField.DOI, doiB);
+    private BibEntry doiB_entry2 = new BibEntry()
+        .withField(StandardField.DOI, doiB);
+    private BibEntry doiC_entry1 = new BibEntry()
+        .withField(StandardField.DOI, doiC);
 
     @Test
     public void testOnePairDuplicateDOI() {
         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
     public void testMultiPairsDuplicateDOI() {
-        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 932e35eafdc..b77e29cc6e4 100644
--- a/src/test/java/org/jabref/logic/integrity/DoiValidityCheckerTest.java
+++ b/src/test/java/org/jabref/logic/integrity/DoiValidityCheckerTest.java
@@ -1,21 +1,23 @@
 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 java.util.Optional;
 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;
-
 class DoiValidityCheckerTest {
 
     private final DoiValidityChecker checker = new DoiValidityChecker();
 
     @Test
     void doiAcceptsValidInput() {
-        assertEquals(Optional.empty(), checker.checkValue("10.1023/A:1022883727209"));
+        assertEquals(
+            Optional.empty(),
+            checker.checkValue("10.1023/A:1022883727209")
+        );
     }
 
     @Test
@@ -30,7 +32,12 @@ 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,13 +46,22 @@ 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));
     }
 
     @ParameterizedTest
-    @ValueSource(strings = {"10.a1000/182", "10.1000a/182", "10.10a00/182"})
+    @ValueSource(strings = { "10.a1000/182", "10.1000a/182", "10.10a00/182" })
     void doiDoesNotAcceptInputWithTypoInSecondPart(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 e66c53ccd11..93d4bf8967c 100644
--- a/src/test/java/org/jabref/logic/integrity/EditionCheckerTest.java
+++ b/src/test/java/org/jabref/logic/integrity/EditionCheckerTest.java
@@ -1,112 +1,175 @@
 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 java.util.Optional;
 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;
-
 public 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
     void bibTexAcceptsOrdinalNumberInWordsWithCapitalFirstLetter() {
-        assertEquals(Optional.empty(), createBibtexEditionChecker(true).checkValue("Second"));
+        assertEquals(
+            Optional.empty(),
+            createBibtexEditionChecker(true).checkValue("Second")
+        );
     }
 
     @Test
     void bibTexDoesNotAcceptOrdinalNumberInWordsWithNonCapitalFirstLetter() {
-        assertNotEquals(Optional.empty(), createBibtexEditionChecker(true).checkValue("second"));
+        assertNotEquals(
+            Optional.empty(),
+            createBibtexEditionChecker(true).checkValue("second")
+        );
     }
 
     @Test
     void bibTexAcceptsIntegerInputInEdition() {
-        assertEquals(Optional.empty(), createBibtexEditionChecker(true).checkValue("2"));
+        assertEquals(
+            Optional.empty(),
+            createBibtexEditionChecker(true).checkValue("2")
+        );
     }
 
     @Test
     void bibTexAcceptsOrdinalNumberInNumbers() {
-        assertEquals(Optional.empty(), createBibtexEditionChecker(true).checkValue("2nd"));
+        assertEquals(
+            Optional.empty(),
+            createBibtexEditionChecker(true).checkValue("2nd")
+        );
     }
 
     @Test
     void bibTexEmptyValueAsInput() {
-        assertEquals(Optional.empty(), createBibtexEditionChecker(false).checkValue(""));
+        assertEquals(
+            Optional.empty(),
+            createBibtexEditionChecker(false).checkValue("")
+        );
     }
 
     @Test
     void bibTexNullValueAsInput() {
-        assertEquals(Optional.empty(), createBibtexEditionChecker(false).checkValue(null));
+        assertEquals(
+            Optional.empty(),
+            createBibtexEditionChecker(false).checkValue(null)
+        );
     }
 
     @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
     void bibLaTexAcceptsIntegerInputInEdition() {
-        assertEquals(Optional.empty(), createBiblatexEditionChecker(true).checkValue("2"));
+        assertEquals(
+            Optional.empty(),
+            createBiblatexEditionChecker(true).checkValue("2")
+        );
     }
 
     @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
     void bibLaTexDoesNotAcceptOrdinalNumberInNumbers() {
-        assertNotEquals(Optional.empty(), createBiblatexEditionChecker(true).checkValue("2nd"));
+        assertNotEquals(
+            Optional.empty(),
+            createBiblatexEditionChecker(true).checkValue("2nd")
+        );
     }
 
-    private EditionChecker createBibtexEditionChecker(Boolean allowIntegerEdition) {
+    private EditionChecker createBibtexEditionChecker(
+        Boolean allowIntegerEdition
+    ) {
         BibDatabaseContext bibtex = new BibDatabaseContext();
         bibtex.setMode(BibDatabaseMode.BIBTEX);
         return new EditionChecker(bibtex, allowIntegerEdition);
     }
 
-    private EditionChecker createBiblatexEditionChecker(Boolean allowIntegerEdition) {
+    private EditionChecker createBiblatexEditionChecker(
+        Boolean allowIntegerEdition
+    ) {
         BibDatabaseContext biblatex = new BibDatabaseContext();
         biblatex.setMode(BibDatabaseMode.BIBLATEX);
         return new EditionChecker(biblatex, allowIntegerEdition);
     }
 
-    private EditionChecker createSimpleEditionChecker(BibDatabaseContext bibDatabaseContextEdition, boolean allowIntegerEdition) {
-        return new EditionChecker(bibDatabaseContextEdition, 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 344751c2576..c975606daab 100644
--- a/src/test/java/org/jabref/logic/integrity/EntryLinkCheckerTest.java
+++ b/src/test/java/org/jabref/logic/integrity/EntryLinkCheckerTest.java
@@ -1,19 +1,17 @@
 package org.jabref.logic.integrity;
 
+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;
-
 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;
-
 class EntryLinkCheckerTest {
 
     private BibDatabase database;
@@ -30,7 +28,10 @@ void setUp() {
 
     @Test
     void testEntryLinkChecker() {
-        assertThrows(NullPointerException.class, () -> new EntryLinkChecker(null));
+        assertThrows(
+            NullPointerException.class,
+            () -> new EntryLinkChecker(null)
+        );
     }
 
     @Test
diff --git a/src/test/java/org/jabref/logic/integrity/HTMLCharacterCheckerTest.java b/src/test/java/org/jabref/logic/integrity/HTMLCharacterCheckerTest.java
index f185132a29c..fd27f5fc501 100644
--- a/src/test/java/org/jabref/logic/integrity/HTMLCharacterCheckerTest.java
+++ b/src/test/java/org/jabref/logic/integrity/HTMLCharacterCheckerTest.java
@@ -1,21 +1,19 @@
 package org.jabref.logic.integrity;
 
+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;
-
 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;
-
 public class HTMLCharacterCheckerTest {
 
     private final HTMLCharacterChecker checker = new HTMLCharacterChecker();
@@ -24,8 +22,8 @@ public class HTMLCharacterCheckerTest {
     @Test
     void testSettingNullThrowsNPE() {
         assertThrows(
-                NullPointerException.class,
-                () -> entry.setField(StandardField.AUTHOR, null)
+            NullPointerException.class,
+            () -> entry.setField(StandardField.AUTHOR, null)
         );
     }
 
@@ -49,26 +47,53 @@ 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));
+        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)
+        );
     }
 
     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.FILE, "one &amp; another.pdf"),
+            Arguments.of(
+                StandardField.URL,
+                "https://example.org?key=value&key2=value2"
+            )
         );
     }
 
diff --git a/src/test/java/org/jabref/logic/integrity/HowPublishedCheckerTest.java b/src/test/java/org/jabref/logic/integrity/HowPublishedCheckerTest.java
index cea5ae468a2..b38b573dfea 100644
--- a/src/test/java/org/jabref/logic/integrity/HowPublishedCheckerTest.java
+++ b/src/test/java/org/jabref/logic/integrity/HowPublishedCheckerTest.java
@@ -1,16 +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 java.util.Optional;
 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;
-
 public class HowPublishedCheckerTest {
 
     private HowPublishedChecker checker;
@@ -48,11 +46,17 @@ void bibTexAcceptsUrl() {
 
     @Test
     void bibLaTexAcceptsStringWithCapitalFirstLetter() {
-        assertEquals(Optional.empty(), checkerBiblatex.checkValue("Lorem ipsum"));
+        assertEquals(
+            Optional.empty(),
+            checkerBiblatex.checkValue("Lorem ipsum")
+        );
     }
 
     @Test
     void bibLaTexAcceptsStringWithLowercaseFirstLetter() {
-        assertEquals(Optional.empty(), checkerBiblatex.checkValue("lorem ipsum"));
+        assertEquals(
+            Optional.empty(),
+            checkerBiblatex.checkValue("lorem ipsum")
+        );
     }
 }
diff --git a/src/test/java/org/jabref/logic/integrity/ISBNCheckerTest.java b/src/test/java/org/jabref/logic/integrity/ISBNCheckerTest.java
index e4dca72548d..41d0a9054ca 100644
--- a/src/test/java/org/jabref/logic/integrity/ISBNCheckerTest.java
+++ b/src/test/java/org/jabref/logic/integrity/ISBNCheckerTest.java
@@ -1,18 +1,16 @@
 package org.jabref.logic.integrity;
 
+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;
-
 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;
-
 public class ISBNCheckerTest {
 
     private final ISBNChecker checker = new ISBNChecker();
@@ -29,7 +27,10 @@ void isbnAcceptsNumbersAndCharacters() {
 
     @Test
     void isbnDoesNotAcceptRandomInput() {
-        assertNotEquals(Optional.empty(), checker.checkValue("Some other stuff"));
+        assertNotEquals(
+            Optional.empty(),
+            checker.checkValue("Some other stuff")
+        );
     }
 
     @Test
@@ -45,9 +46,15 @@ public 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.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"
+            )
         );
     }
 }
diff --git a/src/test/java/org/jabref/logic/integrity/ISSNCheckerTest.java b/src/test/java/org/jabref/logic/integrity/ISSNCheckerTest.java
index f06dccfdfce..fef241244fd 100644
--- a/src/test/java/org/jabref/logic/integrity/ISSNCheckerTest.java
+++ b/src/test/java/org/jabref/logic/integrity/ISSNCheckerTest.java
@@ -1,18 +1,16 @@
 package org.jabref.logic.integrity;
 
+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;
-
 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;
-
 public class ISSNCheckerTest {
 
     private final ISSNChecker checker = new ISSNChecker();
@@ -29,7 +27,10 @@ void issnAcceptsNumbersAndCharacters() {
 
     @Test
     void issnDoesNotAcceptRandomInput() {
-        assertNotEquals(Optional.empty(), checker.checkValue("Some other stuff"));
+        assertNotEquals(
+            Optional.empty(),
+            checker.checkValue("Some other stuff")
+        );
     }
 
     @Test
@@ -45,14 +46,17 @@ void emptyIssnValue() {
     @ParameterizedTest
     @MethodSource("provideIncorrectFormatArguments")
     public 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 5a589970aba..a0644ac2535 100644
--- a/src/test/java/org/jabref/logic/integrity/IntegrityCheckTest.java
+++ b/src/test/java/org/jabref/logic/integrity/IntegrityCheckTest.java
@@ -1,5 +1,11 @@
 package org.jabref.logic.integrity;
 
+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.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
@@ -8,7 +14,6 @@
 import java.util.Optional;
 import java.util.UUID;
 import java.util.stream.Stream;
-
 import org.jabref.logic.citationkeypattern.CitationKeyGenerator;
 import org.jabref.logic.citationkeypattern.CitationKeyPatternPreferences;
 import org.jabref.logic.citationkeypattern.GlobalCitationKeyPattern;
@@ -25,19 +30,12 @@
 import org.jabref.model.entry.types.StandardEntryType;
 import org.jabref.model.metadata.MetaData;
 import org.jabref.preferences.FilePreferences;
-
 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;
-
 /**
  * This class tests the Integrity Checker as a whole.
  * Aspects are: selected fields, issues arising in a complete BibTeX entry, ... When testing a checker works with a certain input,
@@ -47,29 +45,67 @@ class IntegrityCheckTest {
 
     @Test
     void bibTexAcceptsStandardEntryType() {
-        assertCorrect(withMode(createContext(StandardField.TITLE, "sometitle", StandardEntryType.Article), BibDatabaseMode.BIBTEX));
+        assertCorrect(
+            withMode(
+                createContext(
+                    StandardField.TITLE,
+                    "sometitle",
+                    StandardEntryType.Article
+                ),
+                BibDatabaseMode.BIBTEX
+            )
+        );
     }
 
     @Test
     void bibTexDoesNotAcceptIEEETranEntryType() {
-        assertWrong(withMode(createContext(StandardField.TITLE, "sometitle", IEEETranEntryType.Patent), BibDatabaseMode.BIBTEX));
+        assertWrong(
+            withMode(
+                createContext(
+                    StandardField.TITLE,
+                    "sometitle",
+                    IEEETranEntryType.Patent
+                ),
+                BibDatabaseMode.BIBTEX
+            )
+        );
     }
 
     @Test
     void bibLaTexAcceptsIEEETranEntryType() {
-        assertCorrect((withMode(createContext(StandardField.TITLE, "sometitle", IEEETranEntryType.Patent), BibDatabaseMode.BIBLATEX)));
+        assertCorrect(
+            (withMode(
+                    createContext(
+                        StandardField.TITLE,
+                        "sometitle",
+                        IEEETranEntryType.Patent
+                    ),
+                    BibDatabaseMode.BIBLATEX
+                ))
+        );
     }
 
     @Test
     void bibLaTexAcceptsStandardEntryType() {
-        assertCorrect(withMode(createContext(StandardField.TITLE, "sometitle", StandardEntryType.Article), BibDatabaseMode.BIBLATEX));
+        assertCorrect(
+            withMode(
+                createContext(
+                    StandardField.TITLE,
+                    "sometitle",
+                    StandardEntryType.Article
+                ),
+                BibDatabaseMode.BIBLATEX
+            )
+        );
     }
 
     @ParameterizedTest
     @MethodSource("provideCorrectFormat")
     void authorNameChecksCorrectFormat(String input) {
         for (Field field : FieldFactory.getPersonNameFields()) {
-            assertCorrect(withMode(createContext(field, input), BibDatabaseMode.BIBLATEX));
+            assertCorrect(
+                withMode(createContext(field, input), BibDatabaseMode.BIBLATEX)
+            );
         }
     }
 
@@ -77,42 +113,72 @@ void authorNameChecksCorrectFormat(String input) {
     @MethodSource("provideIncorrectFormat")
     void authorNameChecksIncorrectFormat(String input) {
         for (Field field : FieldFactory.getPersonNameFields()) {
-            assertWrong(withMode(createContext(field, input), BibDatabaseMode.BIBLATEX));
+            assertWrong(
+                withMode(createContext(field, input), BibDatabaseMode.BIBLATEX)
+            );
         }
     }
 
     private static Stream<String> provideCorrectFormat() {
-        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> provideIncorrectFormat() {
-        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");
+        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"
+        );
     }
 
     @Test
     void testFileChecks() {
         MetaData metaData = mock(MetaData.class);
-        Mockito.when(metaData.getDefaultFileDirectory()).thenReturn(Optional.of("."));
-        Mockito.when(metaData.getUserFileDirectory(any(String.class))).thenReturn(Optional.empty());
+        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
-        Mockito.when(metaData.getMode()).thenReturn(Optional.of(BibDatabaseMode.BIBTEX));
+        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));
-        assertWrong(createContext(StandardField.FILE, ":asflakjfwofja:PDF", metaData));
+        assertCorrect(
+            createContext(StandardField.FILE, ":build.gradle:gradle", metaData)
+        );
+        assertCorrect(
+            createContext(
+                StandardField.FILE,
+                "description:build.gradle:gradle",
+                metaData
+            )
+        );
+        assertWrong(
+            createContext(StandardField.FILE, ":asflakjfwofja:PDF", metaData)
+        );
     }
 
     @Test
-    void fileCheckFindsFilesRelativeToBibFile(@TempDir Path testFolder) throws IOException {
+    void fileCheckFindsFilesRelativeToBibFile(@TempDir Path testFolder)
+        throws IOException {
         Path bibFile = testFolder.resolve("lit.bib");
         Files.createFile(bibFile);
         Path pdfFile = testFolder.resolve("file.pdf");
         Files.createFile(pdfFile);
 
-        BibDatabaseContext databaseContext = createContext(StandardField.FILE, ":file.pdf:PDF");
+        BibDatabaseContext databaseContext = createContext(
+            StandardField.FILE,
+            ":file.pdf:PDF"
+        );
         databaseContext.setDatabasePath(bibFile);
 
         assertCorrect(databaseContext);
@@ -136,26 +202,35 @@ void testEntryIsUnchangedAfterChecks() {
         bibDatabase.insertEntry(entry);
         BibDatabaseContext context = new BibDatabaseContext(bibDatabase);
 
-        new IntegrityCheck(context,
-                mock(FilePreferences.class),
-                createCitationKeyPatternPreferences(),
-                JournalAbbreviationLoader.loadBuiltInRepository(), false)
-                .check();
+        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);
+    private BibDatabaseContext createContext(
+        Field field,
+        String value,
+        EntryType type
+    ) {
+        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);
+    private BibDatabaseContext createContext(
+        Field field,
+        String value,
+        MetaData metaData
+    ) {
+        BibEntry entry = new BibEntry().withField(field, value);
         BibDatabase bibDatabase = new BibDatabase();
         bibDatabase.insertEntry(entry);
         return new BibDatabaseContext(bibDatabase, metaData);
@@ -168,40 +243,51 @@ private BibDatabaseContext createContext(Field field, String value) {
     }
 
     private void assertWrong(BibDatabaseContext context) {
-        List<IntegrityMessage> messages = new IntegrityCheck(context,
-                mock(FilePreferences.class),
-                createCitationKeyPatternPreferences(),
-                JournalAbbreviationLoader.loadBuiltInRepository(), false)
-                .check();
+        List<IntegrityMessage> messages = new IntegrityCheck(
+            context,
+            mock(FilePreferences.class),
+            createCitationKeyPatternPreferences(),
+            JournalAbbreviationLoader.loadBuiltInRepository(),
+            false
+        )
+            .check();
         assertNotEquals(Collections.emptyList(), messages);
     }
 
     private void assertCorrect(BibDatabaseContext context) {
         FilePreferences filePreferencesMock = mock(FilePreferences.class);
-        when(filePreferencesMock.shouldStoreFilesRelativeToBibFile()).thenReturn(true);
-        List<IntegrityMessage> messages = new IntegrityCheck(context,
-                filePreferencesMock,
-                createCitationKeyPatternPreferences(),
-                JournalAbbreviationLoader.loadBuiltInRepository(), false
-        ).check();
+        when(filePreferencesMock.shouldStoreFilesRelativeToBibFile())
+            .thenReturn(true);
+        List<IntegrityMessage> messages = new IntegrityCheck(
+            context,
+            filePreferencesMock,
+            createCitationKeyPatternPreferences(),
+            JournalAbbreviationLoader.loadBuiltInRepository(),
+            false
+        )
+            .check();
         assertEquals(Collections.emptyList(), messages);
     }
 
     private CitationKeyPatternPreferences createCitationKeyPatternPreferences() {
         return new CitationKeyPatternPreferences(
-                false,
-                false,
-                false,
-                CitationKeyPatternPreferences.KeySuffix.SECOND_WITH_B,
-                "",
-                "",
-                CitationKeyGenerator.DEFAULT_UNWANTED_CHARACTERS,
-                GlobalCitationKeyPattern.fromPattern("[auth][year]"),
-                "",
-                ',');
-    }
-
-    private BibDatabaseContext withMode(BibDatabaseContext context, BibDatabaseMode mode) {
+            false,
+            false,
+            false,
+            CitationKeyPatternPreferences.KeySuffix.SECOND_WITH_B,
+            "",
+            "",
+            CitationKeyGenerator.DEFAULT_UNWANTED_CHARACTERS,
+            GlobalCitationKeyPattern.fromPattern("[auth][year]"),
+            "",
+            ','
+        );
+    }
+
+    private BibDatabaseContext withMode(
+        BibDatabaseContext context,
+        BibDatabaseMode mode
+    ) {
         context.setMode(mode);
         return context;
     }
diff --git a/src/test/java/org/jabref/logic/integrity/JournalInAbbreviationListCheckerTest.java b/src/test/java/org/jabref/logic/integrity/JournalInAbbreviationListCheckerTest.java
index 775ca2dd7a9..382af138aef 100644
--- a/src/test/java/org/jabref/logic/integrity/JournalInAbbreviationListCheckerTest.java
+++ b/src/test/java/org/jabref/logic/integrity/JournalInAbbreviationListCheckerTest.java
@@ -1,19 +1,17 @@
 package org.jabref.logic.integrity;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
 import java.util.Collections;
 import java.util.List;
-
 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;
-
 public class JournalInAbbreviationListCheckerTest {
 
     private JournalInAbbreviationListChecker checker;
@@ -23,10 +21,21 @@ public class JournalInAbbreviationListCheckerTest {
 
     @BeforeEach
     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);
+        abbreviationRepository =
+            JournalAbbreviationLoader.loadBuiltInRepository();
+        abbreviationRepository.addCustomAbbreviation(
+            new Abbreviation("IEEE Software", "IEEE SW")
+        );
+        checker =
+            new JournalInAbbreviationListChecker(
+                StandardField.JOURNAL,
+                abbreviationRepository
+            );
+        checkerb =
+            new JournalInAbbreviationListChecker(
+                StandardField.JOURNALTITLE,
+                abbreviationRepository
+            );
         entry = new BibEntry();
     }
 
@@ -39,18 +48,45 @@ 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 36c6e592651..cad16c29a03 100644
--- a/src/test/java/org/jabref/logic/integrity/LatexIntegrityCheckerTest.java
+++ b/src/test/java/org/jabref/logic/integrity/LatexIntegrityCheckerTest.java
@@ -1,20 +1,18 @@
 package org.jabref.logic.integrity;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
 import java.util.List;
 import java.util.stream.Stream;
-
 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;
-
 public class LatexIntegrityCheckerTest {
 
     private final LatexIntegrityChecker checker = new LatexIntegrityChecker();
@@ -33,114 +31,166 @@ void acceptsAllowedInputs(Field field, String value) {
      */
     private static Stream<Arguments> provideAcceptedInputs() {
         return Stream.of(
-                // Basic text inputs
-                Arguments.of(StandardField.TITLE, "Simple Text"),
-
-                // Simple commands
-                Arguments.of(StandardField.TITLE, "\\section{X}"),
-                Arguments.of(StandardField.TITLE, "\\newline"),
-                Arguments.of(StandardField.TITLE, "\\par"),
-
-                // Text decorations
-                Arguments.of(StandardField.TITLE, "\\underline{Underlined}"),
-                Arguments.of(StandardField.TITLE, "\\texttt{Monospace}"),
-                Arguments.of(StandardField.TITLE, "\\textit{Italic}"),
-
-                // Special characters and symbols
-                Arguments.of(StandardField.TITLE, "Café"),
-                Arguments.of(StandardField.TITLE, "αβγδε"),
-                Arguments.of(StandardField.TITLE, "\\# \\$ \\% \\& \\{ \\} \\_ \\^ \\\\"),
-
-                // Fonts and sizes
-                Arguments.of(StandardField.TITLE, "\\tiny Tiny Text"),
-                Arguments.of(StandardField.TITLE, "\\small Small Text"),
-                Arguments.of(StandardField.TITLE, "\\large Large Text"),
-
-                // Verbatim and special characters
-                Arguments.of(StandardField.TITLE, "\\verb|Verbatim|"),
-                Arguments.of(StandardField.TITLE, "$\\widetilde{i}$"),
-                Arguments.of(StandardField.TITLE, "\\ldots"),
-
-                // Simple environments
-                Arguments.of(StandardField.TITLE, "\\begin{quote}Quoted Text\\end{quote}\n"),
-                Arguments.of(StandardField.TITLE, "\\begin{center}Centered Text\\end{center}\n"),
-
-                // Math environment inputs
-                Arguments.of(StandardField.TITLE, "$x + y = z$"),
-                Arguments.of(StandardField.TITLE, "\\(a^2 + b^2 = c^2\\)"),
-                Arguments.of(StandardField.TITLE, "\\[E = mc^2\\]"),
-                Arguments.of(StandardField.TITLE, "\\begin{math} V = I \\cdot R \\end{math}"),
-
-                // 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{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}"),
-
-                // 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} \\]"),
-
-                // 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}"),
-
-                // 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}"),
-
-                // Line breaks and spacing
-                Arguments.of(StandardField.TITLE, "First Line \\\\ Second Line"),
-                Arguments.of(StandardField.TITLE, "Some \\hspace{2cm} Space"),
-                // Currently Unsupported
-                // 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}"),
-
-                // 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}"),
-
-                // Citations and references
-                // Arguments.of(StandardField.TITLE, "\\cite{key}"),
-                // Arguments.of(StandardField.TITLE, "\\label{sec:intro}"),
-                // Arguments.of(StandardField.TITLE, "As shown in \\ref{fig:plot}"),
-
-                // Arguments.of(StandardField.TITLE, "\\input{chapter1.tex}"),
-                // Arguments.of(StandardField.TITLE, "Footnote\\footnote{This is a footnote}"),
-                // Arguments.of(StandardField.TITLE, "$\text{in math}$"),
-
-                // Comments should not raise any error, because they are not typeset using LaTeX
-                Arguments.of(StandardField.COMMENT, "\\undefinedCommand"),
-
-                // 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"),
-
-                // 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.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 ^^^ $")
+            // Basic text inputs
+            Arguments.of(StandardField.TITLE, "Simple Text"),
+            // Simple commands
+            Arguments.of(StandardField.TITLE, "\\section{X}"),
+            Arguments.of(StandardField.TITLE, "\\newline"),
+            Arguments.of(StandardField.TITLE, "\\par"),
+            // Text decorations
+            Arguments.of(StandardField.TITLE, "\\underline{Underlined}"),
+            Arguments.of(StandardField.TITLE, "\\texttt{Monospace}"),
+            Arguments.of(StandardField.TITLE, "\\textit{Italic}"),
+            // Special characters and symbols
+            Arguments.of(StandardField.TITLE, "Café"),
+            Arguments.of(StandardField.TITLE, "αβγδε"),
+            Arguments.of(
+                StandardField.TITLE,
+                "\\# \\$ \\% \\& \\{ \\} \\_ \\^ \\\\"
+            ),
+            // Fonts and sizes
+            Arguments.of(StandardField.TITLE, "\\tiny Tiny Text"),
+            Arguments.of(StandardField.TITLE, "\\small Small Text"),
+            Arguments.of(StandardField.TITLE, "\\large Large Text"),
+            // Verbatim and special characters
+            Arguments.of(StandardField.TITLE, "\\verb|Verbatim|"),
+            Arguments.of(StandardField.TITLE, "$\\widetilde{i}$"),
+            Arguments.of(StandardField.TITLE, "\\ldots"),
+            // Simple environments
+            Arguments.of(
+                StandardField.TITLE,
+                "\\begin{quote}Quoted Text\\end{quote}\n"
+            ),
+            Arguments.of(
+                StandardField.TITLE,
+                "\\begin{center}Centered Text\\end{center}\n"
+            ),
+            // Math environment inputs
+            Arguments.of(StandardField.TITLE, "$x + y = z$"),
+            Arguments.of(StandardField.TITLE, "\\(a^2 + b^2 = c^2\\)"),
+            Arguments.of(StandardField.TITLE, "\\[E = mc^2\\]"),
+            Arguments.of(
+                StandardField.TITLE,
+                "\\begin{math} V = I \\cdot R \\end{math}"
+            ),
+            // 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{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}"
+            ),
+            // 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} \\]"
+            ),
+            // 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}"
+            ),
+            // 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}"
+            ),
+            // Line breaks and spacing
+            Arguments.of(StandardField.TITLE, "First Line \\\\ Second Line"),
+            Arguments.of(StandardField.TITLE, "Some \\hspace{2cm} Space"),
+            // Currently Unsupported
+            // 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}"
+            ),
+            // 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}"),
+
+            // Citations and references
+            // Arguments.of(StandardField.TITLE, "\\cite{key}"),
+            // Arguments.of(StandardField.TITLE, "\\label{sec:intro}"),
+            // Arguments.of(StandardField.TITLE, "As shown in \\ref{fig:plot}"),
+
+            // Arguments.of(StandardField.TITLE, "\\input{chapter1.tex}"),
+            // Arguments.of(StandardField.TITLE, "Footnote\\footnote{This is a footnote}"),
+            // Arguments.of(StandardField.TITLE, "$\text{in math}$"),
+
+            // Comments should not raise any error, because they are not typeset using LaTeX
+            Arguments.of(StandardField.COMMENT, "\\undefinedCommand"),
+            // 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"
+            ),
+            // 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.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 ^^^ $"
+            )
         );
     }
 
     @ParameterizedTest
     @MethodSource("provideUnacceptedInputs")
-    void rejectsDisallowedInputs(String expectedMessage, Field field, String value) {
+    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)
+        );
     }
 
     /**
@@ -150,160 +200,373 @@ void rejectsDisallowedInputs(String expectedMessage, Field field, String value)
      */
     private static Stream<Arguments> provideUnacceptedInputs() {
         return Stream.of(
-
-                // ------------------------------------ LATEX PARSING/TOKENISATION ERRORS ------------------------------------
-                // TTEG00: Finished reading document before finding required terminator "{0}"
-                Arguments.of(LatexIntegrityChecker.errorMessageFormatHelper(CoreErrorCode.TTEG00, "}"), StandardField.ABSTRACT, "Unbalanced braces {"),
-
-                // TTEG01: Nothing following \
-                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’
-                // 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"),
-
-                // TTEG03: Delimiter {0} closing Math mode followed no matching opener
-                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
-                // 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$"),
-
-                // TTEM01: $ was ended by $$
-                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"),
-
-                // TTEM04: $ characters cannot be used inside math mode
-                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 "),
-
-                // 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"),
-
-                // TTEC01: Command \{0} cannot be used in {1} mode
-                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"),
-
-                // TTEC03: Could not find target for combining command \{0}
-                // Skipped
-
-                // TTEC04: Inappropriate target for combining command \{0}
-                // 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 }"),
-
-                // TTEE02: Undefined environment {0}
-                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}$"),
-
-                // TTEE04: Environment {0} was still open at end of input document
-                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}"),
-
-                // 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?
-                // Skipped
-
-                // TTEUC0: Input ended before name of new command was found
-                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}"),
-
-                // TTEUC2: Input ended before end of new command definition
-                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}"),
-
-                // TTEUC4: Command \{0} has not already been defined so cannot be renewed
-                // Skipped
-
-                // TTEUC5: Command \{0} already exists - use \renewcommand to redefine it
-                // 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}"),
-
-                // TTEUC8: Reserved command {0} cannot be redefined
-                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}"),
-
-                // TTEUE0: Expected to read name of new environment enclosed in braces
-                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}"),
-
-                // TTEUE2: Environment {0} has not already been defined so cannot be renewed
-                // Skipped
-
-                // 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 ------------------------------------
-                // 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}"),
-
-                // TFEM00: Ambiguous multiple use of \over at current level
-                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_$"),
-
-                // TFEM02: Double subscript/superscript token is ambiguous - use curly brackets
-                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)$"),
-
-                // TFEM04: \left had no following \right
-                Arguments.of(LatexIntegrityChecker.errorMessageFormatHelper(CoreErrorCode.TFEM04), StandardField.TITLE, "$\\left($")
-
-                // TFETB0: \hline must be the only token in table row
-                // Skipped
+            // ------------------------------------ LATEX PARSING/TOKENISATION ERRORS ------------------------------------
+            // TTEG00: Finished reading document before finding required terminator "{0}"
+            Arguments.of(
+                LatexIntegrityChecker.errorMessageFormatHelper(
+                    CoreErrorCode.TTEG00,
+                    "}"
+                ),
+                StandardField.ABSTRACT,
+                "Unbalanced braces {"
+            ),
+            // TTEG01: Nothing following \
+            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’
+            // 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"),
+
+            // TTEG03: Delimiter {0} closing Math mode followed no matching opener
+            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
+            // 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$"
+            ),
+            // TTEM01: $ was ended by $$
+            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"
+            ),
+            // TTEM04: $ characters cannot be used inside math mode
+            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 "
+            ),
+            // 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"
+            ),
+            // TTEC01: Command \{0} cannot be used in {1} mode
+            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"
+            ),
+            // TTEC03: Could not find target for combining command \{0}
+            // Skipped
+
+            // TTEC04: Inappropriate target for combining command \{0}
+            // 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 }"
+            ),
+            // TTEE02: Undefined environment {0}
+            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}$"
+            ),
+            // TTEE04: Environment {0} was still open at end of input document
+            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}"
+            ),
+            // 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?
+            // Skipped
+
+            // TTEUC0: Input ended before name of new command was found
+            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}"
+            ),
+            // TTEUC2: Input ended before end of new command definition
+            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}"
+            ),
+            // TTEUC4: Command \{0} has not already been defined so cannot be renewed
+            // Skipped
+
+            // TTEUC5: Command \{0} already exists - use \renewcommand to redefine it
+            // 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}"
+            ),
+            // TTEUC8: Reserved command {0} cannot be redefined
+            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}"
+            ),
+            // TTEUE0: Expected to read name of new environment enclosed in braces
+            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}"
+            ),
+            // TTEUE2: Environment {0} has not already been defined so cannot be renewed
+            // Skipped
+
+            // 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 ------------------------------------
+            // 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}"
+            ),
+            // TFEM00: Ambiguous multiple use of \over at current level
+            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_$"
+            ),
+            // TFEM02: Double subscript/superscript token is ambiguous - use curly brackets
+            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)$"
+            ),
+            // TFEM04: \left had no following \right
+            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 44c1603bb81..d20b0043240 100644
--- a/src/test/java/org/jabref/logic/integrity/MonthCheckerTest.java
+++ b/src/test/java/org/jabref/logic/integrity/MonthCheckerTest.java
@@ -1,16 +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 java.util.Optional;
 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;
-
 public class MonthCheckerTest {
 
     private MonthChecker checker;
@@ -68,7 +66,10 @@ void bibLaTexDoesNotAcceptThreeLetterAbbreviationsWithNoHashMarks() {
 
     @Test
     void bibLaTexDoesNotAcceptFullInput() {
-        assertNotEquals(Optional.empty(), checkerBiblatex.checkValue("January"));
+        assertNotEquals(
+            Optional.empty(),
+            checkerBiblatex.checkValue("January")
+        );
     }
 
     @Test
diff --git a/src/test/java/org/jabref/logic/integrity/NoBibTexFieldCheckerTest.java b/src/test/java/org/jabref/logic/integrity/NoBibTexFieldCheckerTest.java
index 46ade9e221e..85220b570c6 100644
--- a/src/test/java/org/jabref/logic/integrity/NoBibTexFieldCheckerTest.java
+++ b/src/test/java/org/jabref/logic/integrity/NoBibTexFieldCheckerTest.java
@@ -1,43 +1,40 @@
 package org.jabref.logic.integrity;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
 import java.util.Collections;
 import java.util.List;
 import java.util.stream.Stream;
-
 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;
-
 class NoBibTexFieldCheckerTest {
 
     private final NoBibtexFieldChecker checker = new NoBibtexFieldChecker();
 
     private static Stream<Field> nonBiblatexOnlyFields() {
         return Stream.of(
-                // arbitrary field
-                new UnknownField("fieldNameNotDefinedInThebiblatexManual"),
-                StandardField.ABSTRACT,
-                StandardField.COMMENT,
-                StandardField.DOI,
-                StandardField.URL,
-
-                // these fields are not recognized as biblatex only fields
-                StandardField.ADDRESS,
-                StandardField.INSTITUTION,
-                StandardField.JOURNAL,
-                StandardField.KEYWORDS,
-                StandardField.REVIEW
+            // arbitrary field
+            new UnknownField("fieldNameNotDefinedInThebiblatexManual"),
+            StandardField.ABSTRACT,
+            StandardField.COMMENT,
+            StandardField.DOI,
+            StandardField.URL,
+            // these fields are not recognized as biblatex only fields
+            StandardField.ADDRESS,
+            StandardField.INSTITUTION,
+            StandardField.JOURNAL,
+            StandardField.KEYWORDS,
+            StandardField.REVIEW
         );
     }
 
-    @ParameterizedTest()
+    @ParameterizedTest
     @MethodSource("nonBiblatexOnlyFields")
     void nonBiblatexOnlyField(Field field) {
         BibEntry entry = new BibEntry().withField(field, "test");
@@ -45,14 +42,14 @@ 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);
+        IntegrityMessage message = new IntegrityMessage(
+            "biblatex field only",
+            entry,
+            field
+        );
         List<IntegrityMessage> messages = checker.check(entry);
         assertEquals(Collections.singletonList(message), messages);
     }
diff --git a/src/test/java/org/jabref/logic/integrity/NoteCheckerTest.java b/src/test/java/org/jabref/logic/integrity/NoteCheckerTest.java
index ffd5781695b..2aabe0e3fd5 100644
--- a/src/test/java/org/jabref/logic/integrity/NoteCheckerTest.java
+++ b/src/test/java/org/jabref/logic/integrity/NoteCheckerTest.java
@@ -1,16 +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 java.util.Optional;
 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;
-
 public class NoteCheckerTest {
 
     private NoteChecker checker;
@@ -43,7 +41,10 @@ void bibTexDoesNotAcceptFirstLowercaseLetter() {
 
     @Test
     void bibLaTexAcceptsNoteWithFirstCapitalLetter() {
-        assertEquals(Optional.empty(), checkerBiblatex.checkValue("Lorem ipsum"));
+        assertEquals(
+            Optional.empty(),
+            checkerBiblatex.checkValue("Lorem ipsum")
+        );
     }
 
     @Test
@@ -53,6 +54,9 @@ void bibTexAcceptsUrl() {
 
     @Test
     void bibLaTexAcceptsFirstLowercaseLetter() {
-        assertEquals(Optional.empty(), checkerBiblatex.checkValue("lorem ipsum"));
+        assertEquals(
+            Optional.empty(),
+            checkerBiblatex.checkValue("lorem ipsum")
+        );
     }
 }
diff --git a/src/test/java/org/jabref/logic/integrity/PagesCheckerBiblatexTest.java b/src/test/java/org/jabref/logic/integrity/PagesCheckerBiblatexTest.java
index 13ffba0fb58..103c4596d41 100644
--- a/src/test/java/org/jabref/logic/integrity/PagesCheckerBiblatexTest.java
+++ b/src/test/java/org/jabref/logic/integrity/PagesCheckerBiblatexTest.java
@@ -1,18 +1,16 @@
 package org.jabref.logic.integrity;
 
+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;
-
 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;
-
 public class PagesCheckerBiblatexTest {
 
     private PagesChecker checker;
@@ -25,20 +23,21 @@ void setUp() {
     }
 
     public static Stream<String> bibtexAccepts() {
-        return Stream.of("",
-                // single dash
-                "1-2",
-                // double dash
-                "1--2",
-                // one page number
-                "12",
-                // Multiple numbers
-                "1,2,3",
-                // bibTexAcceptsNoSimpleRangeOfNumbers
-                "43+",
-                // bibTexAcceptsMorePageNumbersWithRangeOfNumbers
-                "7+,41--43,73"
-                );
+        return Stream.of(
+            "",
+            // single dash
+            "1-2",
+            // double dash
+            "1--2",
+            // one page number
+            "12",
+            // Multiple numbers
+            "1,2,3",
+            // bibTexAcceptsNoSimpleRangeOfNumbers
+            "43+",
+            // bibTexAcceptsMorePageNumbersWithRangeOfNumbers
+            "7+,41--43,73"
+        );
     }
 
     @ParameterizedTest
@@ -49,13 +48,13 @@ void bibtexAccepts(String source) {
 
     public static Stream<String> bibtexRejects() {
         return Stream.of(
-                // hex numbers forbidden
-                "777e23",
-                // bibTexDoesNotAcceptMorePageNumbersWithoutComma
-                "1 2",
-                // bibTexDoesNotAcceptBrackets
-                "{1}-{2}"
-                );
+            // hex numbers forbidden
+            "777e23",
+            // bibTexDoesNotAcceptMorePageNumbersWithoutComma
+            "1 2",
+            // bibTexDoesNotAcceptBrackets
+            "{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 d9cdac14197..c9afc4c9cad 100644
--- a/src/test/java/org/jabref/logic/integrity/PagesCheckerBibtexTest.java
+++ b/src/test/java/org/jabref/logic/integrity/PagesCheckerBibtexTest.java
@@ -1,18 +1,16 @@
 package org.jabref.logic.integrity;
 
+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;
-
 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;
-
 public class PagesCheckerBibtexTest {
 
     private PagesChecker checker;
@@ -25,18 +23,19 @@ void setUp() {
     }
 
     public static Stream<String> bibtexAccepts() {
-        return Stream.of("",
-                // double dash
-                "1--2",
-                // one page number
-                "12",
-                // Multiple numbers
-                "1,2,3",
-                // bibTexAcceptsNoSimpleRangeOfNumbers
-                "43+",
-                // bibTexAcceptsMorePageNumbersWithRangeOfNumbers
-                "7+,41--43,73"
-                );
+        return Stream.of(
+            "",
+            // double dash
+            "1--2",
+            // one page number
+            "12",
+            // Multiple numbers
+            "1,2,3",
+            // bibTexAcceptsNoSimpleRangeOfNumbers
+            "43+",
+            // bibTexAcceptsMorePageNumbersWithRangeOfNumbers
+            "7+,41--43,73"
+        );
     }
 
     @ParameterizedTest
@@ -47,15 +46,15 @@ void bibtexAccepts(String source) {
 
     public static Stream<String> bibtexRejects() {
         return Stream.of(
-                // hex numbers forbidden
-                "777e23",
-                // bibTexDoesNotAcceptRangeOfNumbersWithSingleDash
-                "1-2",
-                // bibTexDoesNotAcceptMorePageNumbersWithoutComma
-                "1 2",
-                // bibTexDoesNotAcceptBrackets
-                "{1}-{2}"
-                );
+            // hex numbers forbidden
+            "777e23",
+            // bibTexDoesNotAcceptRangeOfNumbersWithSingleDash
+            "1-2",
+            // bibTexDoesNotAcceptMorePageNumbersWithoutComma
+            "1 2",
+            // bibTexDoesNotAcceptBrackets
+            "{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 b64900e6122..f933ae41f72 100644
--- a/src/test/java/org/jabref/logic/integrity/PersonNamesCheckerTest.java
+++ b/src/test/java/org/jabref/logic/integrity/PersonNamesCheckerTest.java
@@ -1,19 +1,17 @@
 package org.jabref.logic.integrity;
 
+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;
-
 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;
-
 public class PersonNamesCheckerTest {
 
     private PersonNamesChecker checker;
@@ -37,25 +35,24 @@ public 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
-                "{JabRef} and Kolb, Stefan",
-
-                "hugo Para{\\~n}os"                 // tilde in 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
         );
     }
 
     @Test
     public void complainAboutPersonStringWithTwoManyCommas() {
-        assertEquals(Optional.of("Names are not in the standard BibTeX format."),
-                checker.checkValue("Test1, Test2, Test3, Test4, Test5, Test6"));
+        assertEquals(
+            Optional.of("Names are not in the standard BibTeX format."),
+            checker.checkValue("Test1, Test2, Test3, Test4, Test5, Test6")
+        );
     }
 
     @ParameterizedTest
@@ -72,18 +69,20 @@ public void authorNameInIncorrectFormatsShouldComplain(String input) {
 
     private static Stream<String> provideCorrectFormats() {
         return Stream.of(
-                "",
-                "Knuth",
-                "Donald E. Knuth and Kurt Cobain and A. Einstein");
+            "",
+            "Knuth",
+            "Donald E. Knuth and Kurt Cobain and A. Einstein"
+        );
     }
 
     private static Stream<String> provideIncorrectFormats() {
         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");
+            "   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"
+        );
     }
 }
diff --git a/src/test/java/org/jabref/logic/integrity/TitleCheckerTest.java b/src/test/java/org/jabref/logic/integrity/TitleCheckerTest.java
index 9e44e9d4215..43d5e67da47 100644
--- a/src/test/java/org/jabref/logic/integrity/TitleCheckerTest.java
+++ b/src/test/java/org/jabref/logic/integrity/TitleCheckerTest.java
@@ -1,23 +1,23 @@
 package org.jabref.logic.integrity;
 
+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;
-
 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;
-
 public class TitleCheckerTest {
+
     @Nested
     class BibTexChecker {
+
         private TitleChecker checker;
 
         @BeforeEach
@@ -31,48 +31,112 @@ public void setUp() {
         @MethodSource("validTitle")
         void titleShouldNotRaiseWarning(String message, String title) {
             assertEquals(Optional.empty(), checker.checkValue(title));
-            assertEquals(Optional.empty(), checker.checkValue(translatedTitle(title)));
+            assertEquals(
+                Optional.empty(),
+                checker.checkValue(translatedTitle(title))
+            );
         }
 
         @ParameterizedTest(name = "{index}. Title: \"{1}\" {0}")
         @MethodSource("invalidTitle")
         void titleShouldRaiseWarning(String message, String title) {
             assertNotEquals(Optional.empty(), checker.checkValue(title));
-            assertNotEquals(Optional.empty(), checker.checkValue(translatedTitle(title)));
+            assertNotEquals(
+                Optional.empty(),
+                checker.checkValue(translatedTitle(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("bibTexRemovesCapitalLetterInsideTitle ", "This is a {T}itle"),
-                    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(
+                    "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(
+                    "bibTexRemovesEverythingInBrackets ",
+                    "This is a {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"
+                )
             );
         }
     }
 
     @Nested
     class BibLaTexChecker {
+
         private TitleChecker checkerBiblatex;
 
         @BeforeEach
@@ -86,25 +150,70 @@ public void setUp() {
         @MethodSource("validTitle")
         void titleShouldNotRaiseWarning(String message, String title) {
             assertEquals(Optional.empty(), checkerBiblatex.checkValue(title));
-            assertEquals(Optional.empty(), checkerBiblatex.checkValue(translatedTitle(title)));
+            assertEquals(
+                Optional.empty(),
+                checkerBiblatex.checkValue(translatedTitle(title))
+            );
         }
 
         static Stream<Arguments> validTitle() {
             return Stream.of(
-                    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("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(
+                    "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(
+                    "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??"
+                )
             );
         }
     }
diff --git a/src/test/java/org/jabref/logic/integrity/TypeCheckerTest.java b/src/test/java/org/jabref/logic/integrity/TypeCheckerTest.java
index 38969eb0fcd..d14d46b38a5 100644
--- a/src/test/java/org/jabref/logic/integrity/TypeCheckerTest.java
+++ b/src/test/java/org/jabref/logic/integrity/TypeCheckerTest.java
@@ -1,16 +1,14 @@
 package org.jabref.logic.integrity;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
 import java.util.Collections;
 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 org.junit.jupiter.api.Test;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-
 public class TypeCheckerTest {
 
     private final TypeChecker checker = new TypeChecker();
@@ -27,6 +25,15 @@ 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 87b0857b7aa..e4fe61f9969 100644
--- a/src/test/java/org/jabref/logic/integrity/UTF8CheckerTest.java
+++ b/src/test/java/org/jabref/logic/integrity/UTF8CheckerTest.java
@@ -1,20 +1,18 @@
 package org.jabref.logic.integrity;
 
+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;
-
 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;
-
 public class UTF8CheckerTest {
 
     private static final Charset GBK = Charset.forName("GBK");
@@ -43,9 +41,21 @@ void fieldAcceptsUTF8() {
     @Test
     void fieldDoesNotAcceptUmlauts() throws UnsupportedEncodingException {
         UTF8Checker checker = new UTF8Checker(Charset.forName("GBK"));
-        String NonUTF8 = new String("你好，这条语句使用GBK字符集".getBytes(StandardCharsets.UTF_8), 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)
+        );
     }
 
     /**
@@ -57,8 +67,11 @@ 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)));
+        String NonUTF8 = new String(
+            "你好，这条语句使用GBK字符集".getBytes(StandardCharsets.UTF_8),
+            GBK
+        );
+        assertFalse(UTF8Checker.UTF8EncodingChecker(NonUTF8.getBytes(GBK)));
     }
 
     /**
@@ -67,7 +80,14 @@ 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/UrlCheckerTest.java b/src/test/java/org/jabref/logic/integrity/UrlCheckerTest.java
index 747e2babe41..62f9972061c 100644
--- a/src/test/java/org/jabref/logic/integrity/UrlCheckerTest.java
+++ b/src/test/java/org/jabref/logic/integrity/UrlCheckerTest.java
@@ -1,29 +1,39 @@
 package org.jabref.logic.integrity;
 
-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 java.util.Optional;
+import org.junit.jupiter.api.Test;
+
 public class UrlCheckerTest {
 
     private final UrlChecker checker = new UrlChecker();
 
     @Test
     void urlFieldAcceptsHttpAddress() {
-        assertEquals(Optional.empty(), checker.checkValue("http://www.google.com"));
+        assertEquals(
+            Optional.empty(),
+            checker.checkValue("http://www.google.com")
+        );
     }
 
     @Test
     void urlFieldAcceptsFullLocalPath() {
-        assertEquals(Optional.empty(), checker.checkValue("file://c:/asdf/asdf"));
+        assertEquals(
+            Optional.empty(),
+            checker.checkValue("file://c:/asdf/asdf")
+        );
     }
 
     @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 042672a4430..64d43ae0948 100644
--- a/src/test/java/org/jabref/logic/integrity/ValidCitationKeyCheckerTest.java
+++ b/src/test/java/org/jabref/logic/integrity/ValidCitationKeyCheckerTest.java
@@ -1,19 +1,18 @@
 package org.jabref.logic.integrity;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
 import java.util.Optional;
 import java.util.stream.Stream;
-
 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;
-
 public class ValidCitationKeyCheckerTest {
 
-    private final ValidCitationKeyChecker checker = new ValidCitationKeyChecker();
+    private final ValidCitationKeyChecker checker =
+        new ValidCitationKeyChecker();
 
     @ParameterizedTest
     @MethodSource("provideCitationKeys")
@@ -23,9 +22,15 @@ void citationKeyValidity(Optional optionalArgument, String citationKey) {
 
     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("empty citation key")),
+                ""
+            ),
+            Arguments.of(Optional.empty(), "Seaver2019"),
+            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 dcd68676def..0711ea3361e 100644
--- a/src/test/java/org/jabref/logic/integrity/YearCheckerTest.java
+++ b/src/test/java/org/jabref/logic/integrity/YearCheckerTest.java
@@ -1,12 +1,11 @@
 package org.jabref.logic.integrity;
 
-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 java.util.Optional;
+import org.junit.jupiter.api.Test;
+
 public class YearCheckerTest {
 
     private final YearChecker checker = new YearChecker();
@@ -43,7 +42,10 @@ void yearFieldRemovesBraceAndPercentageFromYear() {
 
     @Test
     void yearFieldRemovesSpecialCharactersFromYear() {
-        assertEquals(Optional.empty(), checker.checkValue("1986(){},.;!?<>%&$"));
+        assertEquals(
+            Optional.empty(),
+            checker.checkValue("1986(){},.;!?<>%&$")
+        );
     }
 
     @Test
@@ -83,7 +85,10 @@ void yearFieldDoesNotRemoveStringInsideBraceAndPercentage() {
 
     @Test
     void yearFieldDoesNotRemoveStringBeforeSpecialCharacters() {
-        assertNotEquals(Optional.empty(), checker.checkValue("1986a(){},.;!?<>%&$"));
+        assertNotEquals(
+            Optional.empty(),
+            checker.checkValue("1986a(){},.;!?<>%&$")
+        );
     }
 
     @Test
diff --git a/src/test/java/org/jabref/logic/journals/AbbreviationParserTest.java b/src/test/java/org/jabref/logic/journals/AbbreviationParserTest.java
index 3237b60588a..8e5ed4e90e8 100644
--- a/src/test/java/org/jabref/logic/journals/AbbreviationParserTest.java
+++ b/src/test/java/org/jabref/logic/journals/AbbreviationParserTest.java
@@ -1,23 +1,26 @@
 package org.jabref.logic.journals;
 
+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;
-
 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;
-
 public class AbbreviationParserTest {
 
     private Path csvFile;
     private final AbbreviationParser parser = new AbbreviationParser();
 
-    private final Abbreviation abbreviation = new Abbreviation("Long Name", "L.N.", "L.N.");
+    private final Abbreviation abbreviation = new Abbreviation(
+        "Long Name",
+        "L.N.",
+        "L.N."
+    );
 
     @BeforeEach
     void setup(@TempDir Path tempDir) {
@@ -28,7 +31,12 @@ void setup(@TempDir Path tempDir) {
     void testReadingFileFromCSVWithSemicolon() throws Exception {
         // String name, String abbreviation, String shortestUniqueAbbreviation
         String testAbbrev = "Long Name;L.N.;L.N.";
-        try (BufferedWriter writer = Files.newBufferedWriter(csvFile, StandardCharsets.UTF_8)) {
+        try (
+            BufferedWriter writer = Files.newBufferedWriter(
+                csvFile,
+                StandardCharsets.UTF_8
+            )
+        ) {
             writer.write(testAbbrev);
         }
         parser.readJournalListFromFile(csvFile);
@@ -38,7 +46,12 @@ void testReadingFileFromCSVWithSemicolon() throws Exception {
     @Test
     void testReadingFileFromCSVWithComma() throws Exception {
         String testAbbrev = "Long Name,L.N.,L.N.";
-        try (BufferedWriter writer = Files.newBufferedWriter(csvFile, StandardCharsets.UTF_8)) {
+        try (
+            BufferedWriter writer = Files.newBufferedWriter(
+                csvFile,
+                StandardCharsets.UTF_8
+            )
+        ) {
             writer.write(testAbbrev);
         }
         parser.readJournalListFromFile(csvFile);
diff --git a/src/test/java/org/jabref/logic/journals/AbbreviationTest.java b/src/test/java/org/jabref/logic/journals/AbbreviationTest.java
index 1f3ba7a8eab..9318de2efe5 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
@@ -19,7 +19,11 @@ void testAbbreviationsWithTrailingSpaces() {
 
     @Test
     void testAbbreviationsWithTrailingSpacesWithShortestUniqueAbbreviation() {
-        Abbreviation abbreviation = new Abbreviation("Long Name", "L. N.", "LN");
+        Abbreviation abbreviation = new Abbreviation(
+            "Long Name",
+            "L. N.",
+            "LN"
+        );
 
         assertEquals("Long Name", abbreviation.getName());
         assertEquals("L. N.", abbreviation.getAbbreviation());
@@ -34,12 +38,19 @@ void testAbbreviationsWithSemicolons() {
         assertEquals("Long Name", abbreviation.getName());
         assertEquals("L. N.;LN;M", abbreviation.getAbbreviation());
         assertEquals("L N ;LN;M", abbreviation.getDotlessAbbreviation());
-        assertEquals("L. N.;LN;M", abbreviation.getShortestUniqueAbbreviation());
+        assertEquals(
+            "L. N.;LN;M",
+            abbreviation.getShortestUniqueAbbreviation()
+        );
     }
 
     @Test
     void testAbbreviationsWithSemicolonsWithShortestUniqueAbbreviation() {
-        Abbreviation abbreviation = new Abbreviation("Long Name", "L. N.;LN;M", "LNLNM");
+        Abbreviation abbreviation = new Abbreviation(
+            "Long Name",
+            "L. N.;LN;M",
+            "LNLNM"
+        );
 
         assertEquals("Long Name", abbreviation.getName());
         assertEquals("L. N.;LN;M", abbreviation.getAbbreviation());
@@ -58,7 +69,11 @@ void testGetNextElement() {
 
     @Test
     void testGetNextElementWithShortestUniqueAbbreviation() {
-        Abbreviation abbreviation = new Abbreviation("Long Name", "L. N.", "LN");
+        Abbreviation abbreviation = new Abbreviation(
+            "Long Name",
+            "L. N.",
+            "LN"
+        );
 
         assertEquals("L. N.", abbreviation.getNext("Long Name"));
         assertEquals("L N", abbreviation.getNext("L. N."));
@@ -77,7 +92,11 @@ void testGetNextElementWithTrailingSpaces() {
 
     @Test
     void testGetNextElementWithTrailingSpacesWithShortestUniqueAbbreviation() {
-        Abbreviation abbreviation = new Abbreviation("Long Name", "L. N.", "LN");
+        Abbreviation abbreviation = new Abbreviation(
+            "Long Name",
+            "L. N.",
+            "LN"
+        );
 
         assertEquals("L. N.", abbreviation.getNext("Long Name"));
         assertEquals("L N", abbreviation.getNext("L. N."));
@@ -88,33 +107,54 @@ void testGetNextElementWithTrailingSpacesWithShortestUniqueAbbreviation() {
     @Test
     void testDefaultAndMedlineAbbreviationsAreSame() {
         Abbreviation abbreviation = new Abbreviation("Long Name", "L N");
-        assertEquals(abbreviation.getAbbreviation(), abbreviation.getDotlessAbbreviation());
+        assertEquals(
+            abbreviation.getAbbreviation(),
+            abbreviation.getDotlessAbbreviation()
+        );
     }
 
     @Test
     void testDefaultAndMedlineAbbreviationsAreSameWithShortestUniqueAbbreviation() {
         Abbreviation abbreviation = new Abbreviation("Long Name", "L N", "LN");
-        assertEquals(abbreviation.getAbbreviation(), abbreviation.getDotlessAbbreviation());
+        assertEquals(
+            abbreviation.getAbbreviation(),
+            abbreviation.getDotlessAbbreviation()
+        );
     }
 
     @Test
     void testDefaultAndShortestUniqueAbbreviationsAreSame() {
         Abbreviation abbreviation = new Abbreviation("Long Name", "L N");
-        assertEquals(abbreviation.getAbbreviation(), abbreviation.getShortestUniqueAbbreviation());
+        assertEquals(
+            abbreviation.getAbbreviation(),
+            abbreviation.getShortestUniqueAbbreviation()
+        );
     }
 
     @Test
     void testEquals() {
-      Abbreviation abbreviation = new Abbreviation("Long Name", "L N", "LN");
-      Abbreviation otherAbbreviation = new Abbreviation("Long Name", "L N", "LN");
-      assertEquals(abbreviation, otherAbbreviation);
-      assertNotEquals(abbreviation, "String");
+        Abbreviation abbreviation = new Abbreviation("Long Name", "L N", "LN");
+        Abbreviation otherAbbreviation = new Abbreviation(
+            "Long Name",
+            "L N",
+            "LN"
+        );
+        assertEquals(abbreviation, otherAbbreviation);
+        assertNotEquals(abbreviation, "String");
     }
 
     @Test
     void equalAbbrevationsWithFourComponentsAreAlsoCompareZero() {
-        Abbreviation abbreviation1 = new Abbreviation("Long Name", "L. N.", "LN");
-        Abbreviation abbreviation2 = new Abbreviation("Long Name", "L. N.", "LN");
+        Abbreviation abbreviation1 = new Abbreviation(
+            "Long Name",
+            "L. N.",
+            "LN"
+        );
+        Abbreviation abbreviation2 = new Abbreviation(
+            "Long Name",
+            "L. N.",
+            "LN"
+        );
         assertEquals(0, abbreviation1.compareTo(abbreviation2));
     }
 }
diff --git a/src/test/java/org/jabref/logic/journals/AbbreviationWriterTest.java b/src/test/java/org/jabref/logic/journals/AbbreviationWriterTest.java
index bf207b25da7..0887758a2e2 100644
--- a/src/test/java/org/jabref/logic/journals/AbbreviationWriterTest.java
+++ b/src/test/java/org/jabref/logic/journals/AbbreviationWriterTest.java
@@ -1,36 +1,34 @@
 package org.jabref.logic.journals;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.List;
-
 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;
-
 @Execution(ExecutionMode.CONCURRENT)
 class AbbreviationWriterTest {
 
     @Test
-    void shortestUniqueAbbreviationWrittenIfItDiffers(@TempDir Path tempDir) throws Exception {
+    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 075148c1f53..abade182bcb 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;
@@ -16,11 +16,17 @@ void setUp() {
 
     @Test
     void getNextAbbreviationAbbreviatesJournalTitle() {
-        assertEquals("2D Mater.", repository.getNextAbbreviation("2D Materials").get());
+        assertEquals(
+            "2D Mater.",
+            repository.getNextAbbreviation("2D Materials").get()
+        );
     }
 
     @Test
     void getNextAbbreviationConvertsAbbreviationToDotlessAbbreviation() {
-        assertEquals("2D Mater", repository.getNextAbbreviation("2D Mater.").get());
+        assertEquals(
+            "2D Mater",
+            repository.getNextAbbreviation("2D Mater.").get()
+        );
     }
 }
diff --git a/src/test/java/org/jabref/logic/journals/JournalAbbreviationRepositoryTest.java b/src/test/java/org/jabref/logic/journals/JournalAbbreviationRepositoryTest.java
index 442e9d3a3c1..96438ea59d1 100644
--- a/src/test/java/org/jabref/logic/journals/JournalAbbreviationRepositoryTest.java
+++ b/src/test/java/org/jabref/logic/journals/JournalAbbreviationRepositoryTest.java
@@ -1,9 +1,11 @@
 package org.jabref.logic.journals;
 
-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 java.util.Set;
 import javax.swing.undo.CompoundEdit;
-
 import org.jabref.architecture.AllowedToUseSwing;
 import org.jabref.gui.journals.AbbreviationType;
 import org.jabref.gui.journals.UndoableAbbreviator;
@@ -13,15 +15,12 @@
 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;
-
-@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;
@@ -42,22 +41,50 @@ void empty() {
 
     @Test
     void oneElement() {
-        repository.addCustomAbbreviation(new Abbreviation("Long Name", "L. N."));
+        repository.addCustomAbbreviation(
+            new Abbreviation("Long Name", "L. N.")
+        );
         assertEquals(1, repository.getCustomAbbreviations().size());
 
-        assertEquals("L. N.", repository.getDefaultAbbreviation("Long Name").orElse("WRONG"));
-        assertEquals("UNKNOWN", repository.getDefaultAbbreviation("?").orElse("UNKNOWN"));
+        assertEquals(
+            "L. N.",
+            repository.getDefaultAbbreviation("Long Name").orElse("WRONG")
+        );
+        assertEquals(
+            "UNKNOWN",
+            repository.getDefaultAbbreviation("?").orElse("UNKNOWN")
+        );
 
         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("UNKNOWN", repository.getShortestUniqueAbbreviation("?").orElse("UNKNOWN"));
-
-        assertEquals("L. N.", repository.getNextAbbreviation("Long Name").orElse("WRONG"));
-        assertEquals("L N", repository.getNextAbbreviation("L. N.").orElse("WRONG"));
-        assertEquals("Long Name", repository.getNextAbbreviation("L N").orElse("WRONG"));
-        assertEquals("UNKNOWN", repository.getNextAbbreviation("?").orElse("UNKNOWN"));
+        assertEquals(
+            "L. N.",
+            repository
+                .getShortestUniqueAbbreviation("Long Name")
+                .orElse("WRONG")
+        );
+        assertEquals(
+            "UNKNOWN",
+            repository.getShortestUniqueAbbreviation("?").orElse("UNKNOWN")
+        );
+
+        assertEquals(
+            "L. N.",
+            repository.getNextAbbreviation("Long Name").orElse("WRONG")
+        );
+        assertEquals(
+            "L N",
+            repository.getNextAbbreviation("L. N.").orElse("WRONG")
+        );
+        assertEquals(
+            "Long Name",
+            repository.getNextAbbreviation("L N").orElse("WRONG")
+        );
+        assertEquals(
+            "UNKNOWN",
+            repository.getNextAbbreviation("?").orElse("UNKNOWN")
+        );
 
         assertTrue(repository.isKnownName("Long Name"));
         assertTrue(repository.isKnownName("L. N."));
@@ -67,23 +94,54 @@ void oneElement() {
 
     @Test
     void oneElementWithShortestUniqueAbbreviation() {
-        repository.addCustomAbbreviation(new Abbreviation("Long Name", "L. N.", "LN"));
+        repository.addCustomAbbreviation(
+            new Abbreviation("Long Name", "L. N.", "LN")
+        );
         assertEquals(1, repository.getCustomAbbreviations().size());
 
-        assertEquals("L. N.", repository.getDefaultAbbreviation("Long Name").orElse("WRONG"));
-        assertEquals("UNKNOWN", repository.getDefaultAbbreviation("?").orElse("UNKNOWN"));
+        assertEquals(
+            "L. N.",
+            repository.getDefaultAbbreviation("Long Name").orElse("WRONG")
+        );
+        assertEquals(
+            "UNKNOWN",
+            repository.getDefaultAbbreviation("?").orElse("UNKNOWN")
+        );
 
         assertEquals("L N", repository.getDotless("Long Name").orElse("WRONG"));
         assertEquals("UNKNOWN", repository.getDotless("?").orElse("UNKNOWN"));
 
-        assertEquals("LN", repository.getShortestUniqueAbbreviation("Long Name").orElse("WRONG"));
-        assertEquals("UNKNOWN", repository.getShortestUniqueAbbreviation("?").orElse("UNKNOWN"));
-
-        assertEquals("L. N.", repository.getNextAbbreviation("Long Name").orElse("WRONG"));
-        assertEquals("L N", repository.getNextAbbreviation("L. N.").orElse("WRONG"));
-        assertEquals("LN", repository.getNextAbbreviation("L N").orElse("WRONG"));
-        assertEquals("Long Name", repository.getNextAbbreviation("LN").orElse("WRONG"));
-        assertEquals("UNKNOWN", repository.getNextAbbreviation("?").orElse("UNKNOWN"));
+        assertEquals(
+            "LN",
+            repository
+                .getShortestUniqueAbbreviation("Long Name")
+                .orElse("WRONG")
+        );
+        assertEquals(
+            "UNKNOWN",
+            repository.getShortestUniqueAbbreviation("?").orElse("UNKNOWN")
+        );
+
+        assertEquals(
+            "L. N.",
+            repository.getNextAbbreviation("Long Name").orElse("WRONG")
+        );
+        assertEquals(
+            "L N",
+            repository.getNextAbbreviation("L. N.").orElse("WRONG")
+        );
+        assertEquals(
+            "LN",
+            repository.getNextAbbreviation("L N").orElse("WRONG")
+        );
+        assertEquals(
+            "Long Name",
+            repository.getNextAbbreviation("LN").orElse("WRONG")
+        );
+        assertEquals(
+            "UNKNOWN",
+            repository.getNextAbbreviation("?").orElse("UNKNOWN")
+        );
 
         assertTrue(repository.isKnownName("Long Name"));
         assertTrue(repository.isKnownName("L. N."));
@@ -94,29 +152,45 @@ void oneElementWithShortestUniqueAbbreviation() {
 
     @Test
     void testDuplicates() {
-        repository.addCustomAbbreviation(new Abbreviation("Long Name", "L. N."));
-        repository.addCustomAbbreviation(new Abbreviation("Long Name", "L. N."));
+        repository.addCustomAbbreviation(
+            new Abbreviation("Long Name", "L. N.")
+        );
+        repository.addCustomAbbreviation(
+            new Abbreviation("Long Name", "L. N.")
+        );
         assertEquals(1, repository.getCustomAbbreviations().size());
     }
 
     @Test
     void testDuplicatesWithShortestUniqueAbbreviation() {
-        repository.addCustomAbbreviation(new Abbreviation("Long Name", "L. N.", "LN"));
-        repository.addCustomAbbreviation(new Abbreviation("Long Name", "L. N.", "LN"));
+        repository.addCustomAbbreviation(
+            new Abbreviation("Long Name", "L. N.", "LN")
+        );
+        repository.addCustomAbbreviation(
+            new Abbreviation("Long Name", "L. N.", "LN")
+        );
         assertEquals(1, repository.getCustomAbbreviations().size());
     }
 
     @Test
     void testDuplicatesIsoOnly() {
-        repository.addCustomAbbreviation(new Abbreviation("Old Long Name", "L. N."));
-        repository.addCustomAbbreviation(new Abbreviation("New Long Name", "L. N."));
+        repository.addCustomAbbreviation(
+            new Abbreviation("Old Long Name", "L. N.")
+        );
+        repository.addCustomAbbreviation(
+            new Abbreviation("New Long Name", "L. N.")
+        );
         assertEquals(2, repository.getCustomAbbreviations().size());
     }
 
     @Test
     void testDuplicatesIsoOnlyWithShortestUniqueAbbreviation() {
-        repository.addCustomAbbreviation(new Abbreviation("Old Long Name", "L. N.", "LN"));
-        repository.addCustomAbbreviation(new Abbreviation("New Long Name", "L. N.", "LN"));
+        repository.addCustomAbbreviation(
+            new Abbreviation("Old Long Name", "L. N.", "LN")
+        );
+        repository.addCustomAbbreviation(
+            new Abbreviation("New Long Name", "L. N.", "LN")
+        );
         assertEquals(2, repository.getCustomAbbreviations().size());
     }
 
@@ -124,152 +198,358 @@ void testDuplicatesIsoOnlyWithShortestUniqueAbbreviation() {
     void testDuplicateKeys() {
         Abbreviation abbreviationOne = new Abbreviation("Long Name", "L. N.");
         repository.addCustomAbbreviation(abbreviationOne);
-        assertEquals(Set.of(abbreviationOne), repository.getCustomAbbreviations());
-        assertEquals("L. N.", repository.getDefaultAbbreviation("Long Name").orElse("WRONG"));
+        assertEquals(
+            Set.of(abbreviationOne),
+            repository.getCustomAbbreviations()
+        );
+        assertEquals(
+            "L. N.",
+            repository.getDefaultAbbreviation("Long Name").orElse("WRONG")
+        );
 
         Abbreviation abbreviationTwo = new Abbreviation("Long Name", "LA. N.");
         repository.addCustomAbbreviation(abbreviationTwo);
-        assertEquals(Set.of(abbreviationOne, abbreviationTwo), repository.getCustomAbbreviations());
+        assertEquals(
+            Set.of(abbreviationOne, abbreviationTwo),
+            repository.getCustomAbbreviations()
+        );
 
         // Both abbreviations are kept in the repository
         // "L. N." is smaller than "LA. N.", therefore "L. N." is returned
-        assertEquals("L. N.", repository.getDefaultAbbreviation("Long Name").orElse("WRONG"));
+        assertEquals(
+            "L. N.",
+            repository.getDefaultAbbreviation("Long Name").orElse("WRONG")
+        );
     }
 
     @Test
     void testDuplicateKeysWithShortestUniqueAbbreviation() {
-        Abbreviation abbreviationOne = new Abbreviation("Long Name", "L. N.", "LN");
+        Abbreviation abbreviationOne = new Abbreviation(
+            "Long Name",
+            "L. N.",
+            "LN"
+        );
         repository.addCustomAbbreviation(abbreviationOne);
-        assertEquals(Set.of(abbreviationOne), repository.getCustomAbbreviations());
-        assertEquals("L. N.", repository.getDefaultAbbreviation("Long Name").orElse("WRONG"));
-        assertEquals("LN", repository.getShortestUniqueAbbreviation("Long Name").orElse("WRONG"));
-
-        Abbreviation abbreviationTwo = new Abbreviation("Long Name", "LA. N.", "LAN");
+        assertEquals(
+            Set.of(abbreviationOne),
+            repository.getCustomAbbreviations()
+        );
+        assertEquals(
+            "L. N.",
+            repository.getDefaultAbbreviation("Long Name").orElse("WRONG")
+        );
+        assertEquals(
+            "LN",
+            repository
+                .getShortestUniqueAbbreviation("Long Name")
+                .orElse("WRONG")
+        );
+
+        Abbreviation abbreviationTwo = new Abbreviation(
+            "Long Name",
+            "LA. N.",
+            "LAN"
+        );
         repository.addCustomAbbreviation(abbreviationTwo);
-        assertEquals(Set.of(abbreviationOne, abbreviationTwo), repository.getCustomAbbreviations());
+        assertEquals(
+            Set.of(abbreviationOne, abbreviationTwo),
+            repository.getCustomAbbreviations()
+        );
 
         // Both abbreviations are kept in the repository
         // "L. N." is smaller than "LA. N.", therefore "L. N." is returned
-        assertEquals("L. N.", repository.getDefaultAbbreviation("Long Name").orElse("WRONG"));
-        assertEquals("LN", repository.getShortestUniqueAbbreviation("Long Name").orElse("WRONG"));
+        assertEquals(
+            "L. N.",
+            repository.getDefaultAbbreviation("Long Name").orElse("WRONG")
+        );
+        assertEquals(
+            "LN",
+            repository
+                .getShortestUniqueAbbreviation("Long Name")
+                .orElse("WRONG")
+        );
     }
 
     @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 testAbbreviationsWithEscapedAmpersand() {
-        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(
+                "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()
+        );
     }
 
     @Test
     void testJournalAbbreviationWithEscapedAmpersand() {
-        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");
-        assertEquals(expectedAbbreviatedJournalEntry, entryWithEscapedAmpersandInJournal);
+        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");
+        assertEquals(
+            expectedAbbreviatedJournalEntry,
+            entryWithEscapedAmpersandInJournal
+        );
     }
 
     @Test
     void testJournalUnabbreviate() {
-        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");
+        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"
+            );
         assertEquals(expectedAbbreviatedJournalEntry, abbreviatedJournalEntry);
     }
 
     @Test
     void testJournalAbbreviateWithoutEscapedAmpersand() {
-        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);
+        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 testJournalAbbreviateWithEmptyFJournal() {
-        UndoableAbbreviator undoableAbbreviator = new UndoableAbbreviator(repository, AbbreviationType.DEFAULT, true);
-
-        BibEntry entryWithoutEscapedAmpersandInJournal = new BibEntry(StandardEntryType.Article)
-            .withField(StandardField.JOURNAL, "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);
+        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 testUnabbreviateWithJournalExistsAndFJournalNot() {
-        BibEntry abbreviatedJournalEntry = new BibEntry(StandardEntryType.Article)
+        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");
+        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 testUnabbreviateWithJournalExistsAndFJournalExists() {
-        BibEntry abbreviatedJournalEntry = new BibEntry(StandardEntryType.Article)
+        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");
+        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 testJournalDotlessAbbreviation() {
-        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 testJournalDotlessAbbreviationWithCurlyBraces() {
-        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 +558,22 @@ void testJournalDotlessAbbreviationWithCurlyBraces() {
      */
     @Test
     void testTitleEmbeddedWithCurlyBracesHavingNoChangesKeepsBraces() {
-        BibEntry abbreviatedJournalEntry = new BibEntry(StandardEntryType.InCollection)
-                .withField(StandardField.JOURNAL, "{The Visualization Handbook}");
-
-        undoableUnabbreviator.unabbreviate(bibDatabase, abbreviatedJournalEntry, StandardField.JOURNAL, new CompoundEdit());
-
-        BibEntry expectedAbbreviatedJournalEntry = 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()
+        );
+
+        BibEntry expectedAbbreviatedJournalEntry = new BibEntry(
+            StandardEntryType.InCollection
+        )
+            .withField(StandardField.JOURNAL, "{The Visualization Handbook}");
         assertEquals(expectedAbbreviatedJournalEntry, abbreviatedJournalEntry);
     }
 
@@ -293,25 +582,49 @@ void testTitleEmbeddedWithCurlyBracesHavingNoChangesKeepsBraces() {
      */
     @Test
     void testTitleWithNestedCurlyBracesHavingNoChangesKeepsBraces() {
-        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 testDotlessForPhysRevB() {
-        BibEntry abbreviatedJournalEntry = new BibEntry(StandardEntryType.Article)
-                .withField(StandardField.JOURNAL, "Phys Rev B");
-
-        undoableUnabbreviator.unabbreviate(bibDatabase, abbreviatedJournalEntry, StandardField.JOURNAL, new CompoundEdit());
-
-        BibEntry expectedAbbreviatedJournalEntry = new BibEntry(StandardEntryType.Article)
-                .withField(StandardField.JOURNAL, "Physical Review B");
+        BibEntry abbreviatedJournalEntry = new BibEntry(
+            StandardEntryType.Article
+        )
+            .withField(StandardField.JOURNAL, "Phys Rev B");
+
+        undoableUnabbreviator.unabbreviate(
+            bibDatabase,
+            abbreviatedJournalEntry,
+            StandardField.JOURNAL,
+            new CompoundEdit()
+        );
+
+        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 25a189b0b45..e6ba76c0421 100644
--- a/src/test/java/org/jabref/logic/journals/JournalInformationFetcherTest.java
+++ b/src/test/java/org/jabref/logic/journals/JournalInformationFetcherTest.java
@@ -1,25 +1,24 @@
 package org.jabref.logic.journals;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
 import java.util.List;
 import java.util.Optional;
-
 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;
-
 @FetcherTest
 class JournalInformationFetcherTest {
 
-    private final JournalInformationFetcher fetcher = new JournalInformationFetcher();
+    private final JournalInformationFetcher fetcher =
+        new JournalInformationFetcher();
 
-    private final JournalInformation journalInformation = new JournalInformation(
+    private final JournalInformation journalInformation =
+        new JournalInformation(
             "Annual Review of Biochemistry",
             "Annual Reviews Inc.",
             "",
@@ -30,16 +29,216 @@ class JournalInformationFetcherTest {
             "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(
+                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))
-    );
+            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
     public void getsName() {
@@ -48,56 +247,90 @@ public void getsName() {
 
     @Test
     public void getsJournalInfoValidISSN() throws FetcherException {
-        assertEquals(Optional.of(journalInformation), fetcher.getJournalInformation("1545-4509", ""));
+        assertEquals(
+            Optional.of(journalInformation),
+            fetcher.getJournalInformation("1545-4509", "")
+        );
     }
 
     @Test
     public 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
     public 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
-    public void getsJournalInfoValidISSNWithoutHyphen() throws FetcherException {
-        assertEquals(Optional.of(journalInformation), fetcher.getJournalInformation("15454509", ""));
+    public void getsJournalInfoValidISSNWithoutHyphen()
+        throws FetcherException {
+        assertEquals(
+            Optional.of(journalInformation),
+            fetcher.getJournalInformation("15454509", "")
+        );
     }
 
     @Test
     public void getsJournalInfoNonTrimmedISSN() throws FetcherException {
-        assertEquals(Optional.of(journalInformation), fetcher.getJournalInformation(" 1545-4509   ", ""));
+        assertEquals(
+            Optional.of(journalInformation),
+            fetcher.getJournalInformation(" 1545-4509   ", "")
+        );
     }
 
     @Test
     public void getJournalInfoExtraSpaceISSN() {
-        assertThrows(FetcherException.class, () -> fetcher.getJournalInformation("1545 - 4509", ""));
+        assertThrows(
+            FetcherException.class,
+            () -> fetcher.getJournalInformation("1545 - 4509", "")
+        );
     }
 
     @Test
     public void getJournalInfoEmptyISSN() {
-        assertThrows(FetcherException.class, () -> fetcher.getJournalInformation("", ""));
+        assertThrows(
+            FetcherException.class,
+            () -> fetcher.getJournalInformation("", "")
+        );
     }
 
     @Test
     public void getJournalInfoInvalidISSN() {
-        assertThrows(FetcherException.class, () -> fetcher.getJournalInformation("123-123", ""));
+        assertThrows(
+            FetcherException.class,
+            () -> fetcher.getJournalInformation("123-123", "")
+        );
     }
 
     @Test
     public void getJournalInfoInvalidISSNAndNoName() {
-        assertThrows(FetcherException.class, () -> fetcher.getJournalInformation("123-123", ""));
+        assertThrows(
+            FetcherException.class,
+            () -> fetcher.getJournalInformation("123-123", "")
+        );
     }
 
     @Test
     public void getJournalInfoNoISSNAndNoName() {
-        assertThrows(FetcherException.class, () -> fetcher.getJournalInformation("", ""));
+        assertThrows(
+            FetcherException.class,
+            () -> fetcher.getJournalInformation("", "")
+        );
     }
 
     @Test
     public void getJournalInfoNoISSNAndInvalidName() {
-        assertThrows(FetcherException.class, () -> fetcher.getJournalInformation("", "zzz"));
+        assertThrows(
+            FetcherException.class,
+            () -> fetcher.getJournalInformation("", "zzz")
+        );
     }
 }
diff --git a/src/test/java/org/jabref/logic/l10n/EncodingsTest.java b/src/test/java/org/jabref/logic/l10n/EncodingsTest.java
index ed737b77fde..bcd6a6f9fd3 100644
--- a/src/test/java/org/jabref/logic/l10n/EncodingsTest.java
+++ b/src/test/java/org/jabref/logic/l10n/EncodingsTest.java
@@ -1,11 +1,12 @@
 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;
+
 public class EncodingsTest {
+
     @Test
     public void charsetsShouldNotBeNull() {
         assertNotNull(Encodings.ENCODINGS);
diff --git a/src/test/java/org/jabref/logic/l10n/JavaLocalizationEntryParser.java b/src/test/java/org/jabref/logic/l10n/JavaLocalizationEntryParser.java
index 034b0697e15..dd482ece2c8 100644
--- a/src/test/java/org/jabref/logic/l10n/JavaLocalizationEntryParser.java
+++ b/src/test/java/org/jabref/logic/l10n/JavaLocalizationEntryParser.java
@@ -9,15 +9,39 @@ 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 ESCAPED_QUOTATION_SYMBOL = Pattern.compile("\\\\\"");
+    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) {
+    private static final Pattern QUOTATION_SYMBOL_PATTERN = Pattern.compile(
+        QUOTATION_PLACEHOLDER
+    );
+
+    public static List<String> getLanguageKeysInString(
+        String content,
+        LocalizationBundleForTest type
+    ) {
         List<String> parameters = getLocalizationParameter(content, type);
 
         List<String> result = new ArrayList<>();
@@ -27,15 +51,25 @@ public static List<String> getLanguageKeysInString(String content, LocalizationB
             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.");
+                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 +82,9 @@ 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 +102,17 @@ 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 803dec5df84..3f8f0480d8e 100644
--- a/src/test/java/org/jabref/logic/l10n/JavaLocalizationEntryParserTest.java
+++ b/src/test/java/org/jabref/logic/l10n/JavaLocalizationEntryParserTest.java
@@ -1,93 +1,152 @@
 package org.jabref.logic.l10n;
 
+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;
-
 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;
-
 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}"),
-
-                // " is kept unescaped
-                Arguments.of("Localization.lang(\"\\\"Hey\\\"\")", "\"Hey\""),
-
-                // \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(\"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'?\")",
-                        "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\\\"\");",
-                        "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(\"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}"
+            ),
+            // " is kept unescaped
+            Arguments.of("Localization.lang(\"\\\"Hey\\\"\")", "\"Hey\""),
+            // \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(\"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'?\")",
+                "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\\\"\");",
+                "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"
+            )
         );
     }
 
     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() {
         return Stream.of(
-                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(\"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\""
+            )
         );
     }
 
     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(\"Ends with a space \")",
+            // "\\n" in the *.java source file
+            "Localization.lang(\"Escaped newline\\\\nthere\")"
         );
     }
 
     @ParameterizedTest
     @MethodSource("singleLineChecks")
-    public void testLocalizationKeyParsing(String code, String expectedLanguageKeys) {
+    public void testLocalizationKeyParsing(
+        String code,
+        String expectedLanguageKeys
+    ) {
         testLocalizationKeyParsing(code, List.of(expectedLanguageKeys));
     }
 
     @ParameterizedTest
     @MethodSource("multiLineChecks")
-    public void testLocalizationKeyParsing(String code, List<String> expectedLanguageKeys) {
-        List<String> languageKeysInString = JavaLocalizationEntryParser.getLanguageKeysInString(code, LocalizationBundleForTest.LANG);
+    public void testLocalizationKeyParsing(
+        String code,
+        List<String> expectedLanguageKeys
+    ) {
+        List<String> languageKeysInString =
+            JavaLocalizationEntryParser.getLanguageKeysInString(
+                code,
+                LocalizationBundleForTest.LANG
+            );
         assertEquals(expectedLanguageKeys, languageKeysInString);
     }
 
     @ParameterizedTest
     @MethodSource("singleLineParameterChecks")
-    public void testLocalizationParameterParsing(String code, String expectedParameter) {
-        List<String> languageKeysInString = JavaLocalizationEntryParser.getLocalizationParameter(code, LocalizationBundleForTest.LANG);
+    public void testLocalizationParameterParsing(
+        String code,
+        String expectedParameter
+    ) {
+        List<String> languageKeysInString =
+            JavaLocalizationEntryParser.getLocalizationParameter(
+                code,
+                LocalizationBundleForTest.LANG
+            );
         assertEquals(List.of(expectedParameter), languageKeysInString);
     }
 
     @ParameterizedTest
     @MethodSource("causesRuntimeExceptions")
     public 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 c645611973d..1f3fc51190b 100644
--- a/src/test/java/org/jabref/logic/l10n/LanguageTest.java
+++ b/src/test/java/org/jabref/logic/l10n/LanguageTest.java
@@ -1,28 +1,36 @@
 package org.jabref.logic.l10n;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
 import java.util.Locale;
 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.assertThrows;
-
 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
     void convertToKnownLocaleNull() {
-        assertThrows(NullPointerException.class, () -> Language.convertToSupportedLocale(null));
+        assertThrows(
+            NullPointerException.class,
+            () -> Language.convertToSupportedLocale(null)
+        );
     }
 }
diff --git a/src/test/java/org/jabref/logic/l10n/LocalizationBundleForTest.java b/src/test/java/org/jabref/logic/l10n/LocalizationBundleForTest.java
index 77b55b211e2..f9bdb878188 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 d68f9b1f2ec..3e5ae5802ac 100644
--- a/src/test/java/org/jabref/logic/l10n/LocalizationConsistencyTest.java
+++ b/src/test/java/org/jabref/logic/l10n/LocalizationConsistencyTest.java
@@ -1,5 +1,9 @@
 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 java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
@@ -20,17 +24,12 @@
 import java.util.regex.Pattern;
 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 {
@@ -39,33 +38,61 @@ class LocalizationConsistencyTest {
     void allFilesMustBeInLanguages() throws IOException {
         String bundle = "JabRef";
         // e.g., "<bundle>_en.properties", where <bundle> is [JabRef, Menu]
-        Pattern propertiesFile = Pattern.compile(String.format("%s_.{2,}.properties", bundle));
+        Pattern propertiesFile = Pattern.compile(
+            String.format("%s_.{2,}.properties", 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
     void ensureNoDuplicates() {
         String bundle = "JabRef";
         for (Language lang : Language.values()) {
-            String propertyFilePath = String.format("/l10n/%s_%s.properties", bundle, lang.getId());
+            String propertyFilePath = String.format(
+                "/l10n/%s_%s.properties",
+                bundle,
+                lang.getId()
+            );
 
             // read in
-            DuplicationDetectionProperties properties = new DuplicationDetectionProperties();
-            try (InputStream is = LocalizationConsistencyTest.class.getResourceAsStream(propertyFilePath);
-                 InputStreamReader reader = new InputStreamReader(is, StandardCharsets.UTF_8)) {
+            DuplicationDetectionProperties properties =
+                new DuplicationDetectionProperties();
+            try (
+                InputStream is = LocalizationConsistencyTest.class.getResourceAsStream(
+                        propertyFilePath
+                    );
+                InputStreamReader reader = new InputStreamReader(
+                    is,
+                    StandardCharsets.UTF_8
+                )
+            ) {
                 properties.load(reader);
             } catch (IOException e) {
                 throw new RuntimeException(e);
@@ -73,16 +100,30 @@ 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(String.format("/l10n/%s_%s.properties", "JabRef", "en"));
+        Properties englishKeys = LocalizationParser.getProperties(
+            String.format("/l10n/%s_%s.properties", "JabRef", "en")
+        );
         for (Map.Entry<Object, Object> entry : englishKeys.entrySet()) {
-            String expectedKeyEqualsKey = String.format("%s=%s", entry.getKey(), entry.getKey().toString().replace("\n", "\\n"));
-            String actualKeyEqualsValue = String.format("%s=%s", entry.getKey(), entry.getValue().toString().replace("\n", "\\n"));
+            String expectedKeyEqualsKey = String.format(
+                "%s=%s",
+                entry.getKey(),
+                entry.getKey().toString().replace("\n", "\\n")
+            );
+            String actualKeyEqualsValue = String.format(
+                "%s=%s",
+                entry.getKey(),
+                entry.getValue().toString().replace("\n", "\\n")
+            );
             assertEquals(expectedKeyEqualsKey, actualKeyEqualsValue);
         }
     }
@@ -90,66 +131,106 @@ void keyValueShouldBeEqualForEnglishPropertiesMessages() {
     @Test
     void languageKeysShouldNotContainUnderscoresForSpaces() throws IOException {
         final List<LocalizationEntry> quotedEntries = LocalizationParser
-                .findLocalizationParametersStringsInJavaFiles(LocalizationBundleForTest.LANG)
+            .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()
-                .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 -> String.format("\n%s (%s)\n", key.getKey(), key.getPath()))
-                                .toList());
+                .map(key ->
+                    String.format("\n%s (%s)\n", key.getKey(), key.getPath())
+                )
+                .toList()
+        );
     }
 
     @Test
     void languageKeysShouldNotContainHtmlBrAndHtmlP() throws IOException {
         final List<LocalizationEntry> entriesWithHtml = LocalizationParser
-                .findLocalizationParametersStringsInJavaFiles(LocalizationBundleForTest.LANG)
+            .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()
-                .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 -> String.format("\n%s (%s)\n", key.getKey(), key.getPath()))
-                                .toList());
+                .map(key ->
+                    String.format("\n%s (%s)\n", key.getKey(), key.getPath())
+                )
+                .toList()
+        );
     }
 
     @Test
     void findMissingLocalizationKeys() throws IOException {
-        List<LocalizationEntry> missingKeys = new ArrayList<>(LocalizationParser.findMissingKeys(LocalizationBundleForTest.LANG));
-        assertEquals(Collections.emptyList(), missingKeys,
-                missingKeys.stream()
-                           .map(key -> LocalizationKey.fromKey(key.getKey()))
-                           .map(key -> String.format("%s=%s",
-                                   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
-
-                                           """,
-                                   "\n\n")));
+        List<LocalizationEntry> missingKeys = new ArrayList<>(
+            LocalizationParser.findMissingKeys(LocalizationBundleForTest.LANG)
+        );
+        assertEquals(
+            Collections.emptyList(),
+            missingKeys,
+            missingKeys
+                .stream()
+                .map(key -> LocalizationKey.fromKey(key.getKey()))
+                .map(key ->
+                    String.format(
+                        "%s=%s",
+                        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
+
+                        """,
+                        "\n\n"
+                    )
+                )
+        );
     }
 
     @Test
     void findObsoleteLocalizationKeys() throws IOException {
-        Set<String> obsoleteKeys = LocalizationParser.findObsolete(LocalizationBundleForTest.LANG);
-        assertEquals(Collections.emptySet(), obsoleteKeys,
-                obsoleteKeys.stream().collect(Collectors.joining("\n",
+        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",
                         """
 
-                                1. CHECK IF THE KEY IS REALLY NOT USED ANYMORE
-                                2. REMOVE THESE FROM THE ENGLISH LANGUAGE FILE
+                        1. CHECK IF THE KEY IS REALLY NOT USED ANYMORE
+                        2. REMOVE THESE FROM THE ENGLISH LANGUAGE FILE
 
-                                """))
+                        """
+                    )
+                )
         );
     }
 
@@ -159,14 +240,28 @@ void localizationParameterMustIncludeAString() throws IOException {
         // Localization.lang("test"), Localization.lang("test" + var), Localization.lang(var + "test")
         // TODO: Localization.lang(var1 + "test" + var2) not covered
         // Localization.lang("Problem downloading from %1", address)
-        Set<LocalizationEntry> keys = LocalizationParser.findLocalizationParametersStringsInJavaFiles(LocalizationBundleForTest.LANG);
+        Set<LocalizationEntry> keys =
+            LocalizationParser.findLocalizationParametersStringsInJavaFiles(
+                LocalizationBundleForTest.LANG
+            );
         for (LocalizationEntry e : keys) {
-            assertTrue(e.getKey().startsWith("\"") || e.getKey().endsWith("\""), "Illegal localization parameter found. Must include a String with potential concatenation or replacement parameters. Illegal parameter: Localization.lang(" + e.getKey());
+            assertTrue(
+                e.getKey().startsWith("\"") || e.getKey().endsWith("\""),
+                "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("\"") || e.getKey().endsWith("\""), "Illegal localization parameter found. Must include a String with potential concatenation or replacement parameters. Illegal parameter: Localization.lang(" + e.getKey());
+            assertTrue(
+                e.getKey().startsWith("\"") || e.getKey().endsWith("\""),
+                "Illegal localization parameter found. Must include a String with potential concatenation or replacement parameters. Illegal parameter: Localization.lang(" +
+                e.getKey()
+            );
         }
     }
 
@@ -177,7 +272,14 @@ 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));
     }
 
@@ -188,7 +290,10 @@ 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);
@@ -197,7 +302,8 @@ void languageCanBeLoaded(Language language) {
 
     private static class DuplicationDetectionProperties extends Properties {
 
-        @Serial private static final long serialVersionUID = 1L;
+        @Serial
+        private static final long serialVersionUID = 1L;
 
         private final List<String> duplicates = new ArrayList<>();
 
diff --git a/src/test/java/org/jabref/logic/l10n/LocalizationKeyParamsTest.java b/src/test/java/org/jabref/logic/l10n/LocalizationKeyParamsTest.java
index cd7fcd49964..1328501d30e 100644
--- a/src/test/java/org/jabref/logic/l10n/LocalizationKeyParamsTest.java
+++ b/src/test/java/org/jabref/logic/l10n/LocalizationKeyParamsTest.java
@@ -1,35 +1,75 @@
 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 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.assertThrows;
-
 public class LocalizationKeyParamsTest {
 
     @ParameterizedTest
     @MethodSource("provideTestData")
-    public void testReplacePlaceholders(String expected, LocalizationKeyParams input) {
+    public void testReplacePlaceholders(
+        String expected,
+        LocalizationKeyParams input
+    ) {
         assertEquals(expected, input.replacePlaceholders());
     }
 
     private static Stream<Arguments> provideTestData() {
         return Stream.of(
-                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(
+                "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")
+            )
         );
     }
 
     @Test
     public void testTooManyParams() {
-        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 e0d0bca52cb..741e9416ab2 100644
--- a/src/test/java/org/jabref/logic/l10n/LocalizationKeyTest.java
+++ b/src/test/java/org/jabref/logic/l10n/LocalizationKeyTest.java
@@ -1,39 +1,49 @@
 package org.jabref.logic.l10n;
 
-import java.util.stream.Stream;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
+import java.util.stream.Stream;
 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;
-
 class LocalizationKeyTest {
 
     private static Stream<Arguments> propertiesKeyTestCases() {
         return Stream.of(
-                // underscore is preserved
-                Arguments.of("test_with_underscore", "test_with_underscore"),
-
-                // 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.
-                Arguments.of("Copy\\ \\\\cite{citation\\ key}", "Copy \\\\cite{citation key}"),
-
-                // Java code: Newline follows\n
-                // String representation: "Newline follows\\n"
-                Arguments.of("Newline\\ follows\\n", "Newline follows\\n"),
-
-                // 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")
+            // underscore is preserved
+            Arguments.of("test_with_underscore", "test_with_underscore"),
+            // 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.
+            Arguments.of(
+                "Copy\\ \\\\cite{citation\\ key}",
+                "Copy \\\\cite{citation key}"
+            ),
+            // Java code: Newline follows\n
+            // String representation: "Newline follows\\n"
+            Arguments.of("Newline\\ follows\\n", "Newline follows\\n"),
+            // 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"
+            )
         );
     }
 
     @ParameterizedTest
     @MethodSource("propertiesKeyTestCases")
-    public void getPropertiesKeyReturnsCorrectValue(String expected, String input) {
-        assertEquals(expected, LocalizationKey.fromEscapedJavaString(input).getEscapedPropertiesKey());
+    public void getPropertiesKeyReturnsCorrectValue(
+        String expected,
+        String input
+    ) {
+        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 0fee3a33613..994b663798a 100644
--- a/src/test/java/org/jabref/logic/l10n/LocalizationParser.java
+++ b/src/test/java/org/jabref/logic/l10n/LocalizationParser.java
@@ -1,5 +1,6 @@
 package org.jabref.logic.l10n;
 
+import com.airhacks.afterburner.views.ViewLoader;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
@@ -20,21 +21,21 @@
 import java.util.TreeSet;
 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) {
@@ -45,12 +46,15 @@ public static SortedSet<LocalizationEntry> findMissingKeys(LocalizationBundleFor
         List<String> missingKeys = new ArrayList<>(keysInJavaFiles);
         missingKeys.removeAll(englishKeys);
 
-        return entries.stream()
-                      .filter(e -> missingKeys.contains(e.getKey()))
-                      .collect(Collectors.toCollection(TreeSet::new));
+        return entries
+            .stream()
+            .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");
@@ -58,12 +62,16 @@ public static SortedSet<String> findObsolete(LocalizationBundleForTest type) thr
             englishKeys = getKeysInPropertiesFile("/l10n/Menu_en.properties");
         }
         Set<String> keysInSourceFiles = findLocalizationEntriesInFiles(type)
-                .stream().map(LocalizationEntry::getKey).collect(Collectors.toSet());
+            .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 {
@@ -74,37 +82,44 @@ 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)
-                    .flatMap(path -> getLocalizationParametersInJavaFile(path, type).stream())
-                    .collect(Collectors.toSet());
+                .filter(LocalizationParser::isJavaFile)
+                .flatMap(path ->
+                    getLocalizationParametersInJavaFile(path, type).stream()
+                )
+                .collect(Collectors.toSet());
         } catch (UncheckedIOException ioe) {
             throw new IOException(ioe);
         }
     }
 
-    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)
-                    .flatMap(path -> getLanguageKeysInJavaFile(path, type).stream())
-                    .collect(Collectors.toSet());
+                .filter(LocalizationParser::isJavaFile)
+                .flatMap(path -> getLanguageKeysInJavaFile(path, type).stream())
+                .collect(Collectors.toSet());
         } catch (UncheckedIOException ioe) {
             throw new IOException(ioe);
         }
     }
 
-    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)
-                    .flatMap(path -> getLanguageKeysInFxmlFile(path, type).stream())
-                    .collect(Collectors.toSet());
+                .filter(LocalizationParser::isFxmlFile)
+                .flatMap(path -> getLanguageKeysInFxmlFile(path, type).stream())
+                .collect(Collectors.toSet());
         } catch (UncheckedIOException ioe) {
             throw new IOException(ioe);
         }
@@ -115,21 +130,31 @@ 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));
+        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));
     }
 
     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)) {
+        try (
+            InputStream is = LocalizationConsistencyTest.class.getResourceAsStream(
+                    path
+                );
+            InputStreamReader reader = new InputStreamReader(
+                is,
+                StandardCharsets.UTF_8
+            )
+        ) {
             properties.load(reader);
         } catch (IOException e) {
             throw new RuntimeException(e);
@@ -145,7 +170,10 @@ 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);
@@ -153,12 +181,17 @@ private static List<LocalizationEntry> getLanguageKeysInJavaFile(Path path, Loca
             throw new RuntimeException(exception);
         }
         String content = String.join("\n", lines);
-        return JavaLocalizationEntryParser.getLanguageKeysInString(content, type).stream()
-                                          .map(key -> new LocalizationEntry(path, key, type))
-                                          .collect(Collectors.toList());
+        return JavaLocalizationEntryParser
+            .getLanguageKeysInString(content, type)
+            .stream()
+            .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);
@@ -166,19 +199,27 @@ private static List<LocalizationEntry> getLocalizationParametersInJavaFile(Path
             throw new RuntimeException(exception);
         }
         String content = String.join("\n", lines);
-        return JavaLocalizationEntryParser.getLocalizationParameter(content, type).stream()
-                                          .map(key -> new LocalizationEntry(path, key, type))
-                                          .collect(Collectors.toList());
+        return JavaLocalizationEntryParser
+            .getLocalizationParameter(content, type)
+            .stream()
+            .map(key -> new LocalizationEntry(path, key, type))
+            .collect(Collectors.toList());
     }
 
     /**
      * Loads the fxml file and returns all used language resources.
      */
-    private static List<LocalizationEntry> getLanguageKeysInFxmlFile(Path path, LocalizationBundleForTest type) {
+    private static List<LocalizationEntry> getLanguageKeysInFxmlFile(
+        Path path,
+        LocalizationBundleForTest type
+    ) {
         List<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() {
@@ -200,7 +241,10 @@ public boolean containsKey(String key) {
         };
 
         try {
-            FXMLLoader loader = new FXMLLoader(path.toUri().toURL(), registerUsageResourceBundle);
+            FXMLLoader loader = new FXMLLoader(
+                path.toUri().toURL(),
+                registerUsageResourceBundle
+            );
             // We don't want to initialize controller
             loader.setControllerFactory(Mockito::mock);
 
@@ -213,9 +257,10 @@ public boolean containsKey(String key) {
             viewLoader.close();
         }
 
-        return result.stream()
-                     .map(key -> new LocalizationEntry(path, key, type))
-                     .collect(Collectors.toList());
+        return result
+            .stream()
+            .map(key -> new LocalizationEntry(path, key, type))
+            .collect(Collectors.toList());
     }
 
     private static void setStaticLoad(FXMLLoader loader) {
@@ -225,10 +270,20 @@ private static void setStaticLoad(FXMLLoader loader) {
         //   - 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 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 596139f8b5d..96539ed3ba7 100644
--- a/src/test/java/org/jabref/logic/l10n/LocalizationTest.java
+++ b/src/test/java/org/jabref/logic/l10n/LocalizationTest.java
@@ -1,13 +1,12 @@
 package org.jabref.logic.l10n;
 
-import java.util.Locale;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
+import java.util.Locale;
 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 LocalizationTest {
 
     private Locale locale;
@@ -45,13 +44,21 @@ void testKnownEnglishTranslationOfUndo() {
     @Test
     void testKnownGermanTranslation() {
         Localization.setLanguage(Language.GERMAN);
-        assertEquals("Zeige Einstellungen", Localization.lang("Show preferences"));
+        assertEquals(
+            "Zeige Einstellungen",
+            Localization.lang("Show preferences")
+        );
     }
 
     @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 5b910a2f2e8..824b568b6a1 100644
--- a/src/test/java/org/jabref/logic/layout/LayoutEntryTest.java
+++ b/src/test/java/org/jabref/logic/layout/LayoutEntryTest.java
@@ -1,20 +1,18 @@
 package org.jabref.logic.layout;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.mockito.Mockito.mock;
+
 import java.io.IOException;
 import java.io.StringReader;
-
 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;
-
 /**
  * The test class LayoutEntryTest test the net.sf.jabref.export.layout.LayoutEntry. Indirectly the
  * net.sf.jabref.export.layout.Layout is tested too.
@@ -37,33 +35,61 @@ public class LayoutEntryTest {
     @BeforeEach
     public 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");
+        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(
+            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(StandardField.URL, "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");
         mBTE.setField(StandardField.AUTHOR, "Chaudhuri, Avik");
-        mBTE.setField(StandardField.TITLE, "Language-based security on Android");
+        mBTE.setField(
+            StandardField.TITLE,
+            "Language-based security on Android"
+        );
         mBTE.setField(StandardField.ADDRESS, "New York, NY, USA");
         mBTE.setField(SpecialField.PRIORITY, "2");
         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();
+        StringReader sr = new StringReader(
+            layoutFile.replace("__NEWLINE__", "\n")
+        );
+        Layout layout = new LayoutHelper(
+            sr,
+            mock(LayoutFormatterPreferences.class),
+            mock(JournalAbbreviationRepository.class)
+        )
+            .getLayoutFromText();
 
         return layout.doLayout(entry, null);
     }
@@ -71,28 +97,81 @@ public String layout(String layoutFile, BibEntry entry) throws IOException {
     @Test
     public void testParseMethodCalls() {
         assertEquals(1, LayoutEntry.parseMethodsCalls("bla").size());
-        assertEquals("bla", (LayoutEntry.parseMethodsCalls("bla").get(0)).get(0));
+        assertEquals(
+            "bla",
+            (LayoutEntry.parseMethodsCalls("bla").get(0)).get(0)
+        );
 
         assertEquals(1, LayoutEntry.parseMethodsCalls("bla,").size());
-        assertEquals("bla", (LayoutEntry.parseMethodsCalls("bla,").get(0)).get(0));
+        assertEquals(
+            "bla",
+            (LayoutEntry.parseMethodsCalls("bla,").get(0)).get(0)
+        );
 
         assertEquals(1, LayoutEntry.parseMethodsCalls("_bla.bla.blub,").size());
-        assertEquals("_bla.bla.blub", (LayoutEntry.parseMethodsCalls("_bla.bla.blub,").get(0)).get(0));
+        assertEquals(
+            "_bla.bla.blub",
+            (LayoutEntry.parseMethodsCalls("_bla.bla.blub,").get(0)).get(0)
+        );
 
         assertEquals(2, LayoutEntry.parseMethodsCalls("bla,foo").size());
-        assertEquals("bla", (LayoutEntry.parseMethodsCalls("bla,foo").get(0)).get(0));
-        assertEquals("foo", (LayoutEntry.parseMethodsCalls("bla,foo").get(1)).get(0));
-
-        assertEquals(2, LayoutEntry.parseMethodsCalls("bla(\"test\"),foo(\"fark\")").size());
-        assertEquals("bla", (LayoutEntry.parseMethodsCalls("bla(\"test\"),foo(\"fark\")").get(0)).get(0));
-        assertEquals("foo", (LayoutEntry.parseMethodsCalls("bla(\"test\"),foo(\"fark\")").get(1)).get(0));
-        assertEquals("test", (LayoutEntry.parseMethodsCalls("bla(\"test\"),foo(\"fark\")").get(0)).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)").get(0)).get(0));
-        assertEquals("foo", (LayoutEntry.parseMethodsCalls("bla(test),foo(fark)").get(1)).get(0));
-        assertEquals("test", (LayoutEntry.parseMethodsCalls("bla(test),foo(fark)").get(0)).get(1));
-        assertEquals("fark", (LayoutEntry.parseMethodsCalls("bla(test),foo(fark)").get(1)).get(1));
+        assertEquals(
+            "bla",
+            (LayoutEntry.parseMethodsCalls("bla,foo").get(0)).get(0)
+        );
+        assertEquals(
+            "foo",
+            (LayoutEntry.parseMethodsCalls("bla,foo").get(1)).get(0)
+        );
+
+        assertEquals(
+            2,
+            LayoutEntry.parseMethodsCalls("bla(\"test\"),foo(\"fark\")").size()
+        );
+        assertEquals(
+            "bla",
+            (LayoutEntry
+                    .parseMethodsCalls("bla(\"test\"),foo(\"fark\")")
+                    .get(0)).get(0)
+        );
+        assertEquals(
+            "foo",
+            (LayoutEntry
+                    .parseMethodsCalls("bla(\"test\"),foo(\"fark\")")
+                    .get(1)).get(0)
+        );
+        assertEquals(
+            "test",
+            (LayoutEntry
+                    .parseMethodsCalls("bla(\"test\"),foo(\"fark\")")
+                    .get(0)).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)").get(0)).get(0)
+        );
+        assertEquals(
+            "foo",
+            (LayoutEntry.parseMethodsCalls("bla(test),foo(fark)").get(1)).get(0)
+        );
+        assertEquals(
+            "test",
+            (LayoutEntry.parseMethodsCalls("bla(test),foo(fark)").get(0)).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 dec5ab5d781..eae162e46df 100644
--- a/src/test/java/org/jabref/logic/layout/LayoutHelperTest.java
+++ b/src/test/java/org/jabref/logic/layout/LayoutHelperTest.java
@@ -1,40 +1,58 @@
 package org.jabref.logic.layout;
 
+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;
-
 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;
-
 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
     public 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
     public void unbalancedBeginEndIsParsed() throws Exception {
-        StringReader stringReader = new StringReader("\\begin{doi}, DOI: \\doi");
-        LayoutHelper layoutHelper = new LayoutHelper(stringReader, layoutFormatterPreferences, abbreviationRepository);
+        StringReader stringReader = new StringReader(
+            "\\begin{doi}, DOI: \\doi"
+        );
+        LayoutHelper layoutHelper = new LayoutHelper(
+            stringReader,
+            layoutFormatterPreferences,
+            abbreviationRepository
+        );
         Layout layout = layoutHelper.getLayoutFromText();
         assertNotNull(layout);
     }
 
     @Test
     public void minimalExampleWithDoiGetsParsed() throws Exception {
-        StringReader stringReader = new StringReader("\\begin{doi}, DOI: \\doi\\end{doi}");
-        LayoutHelper layoutHelper = new LayoutHelper(stringReader, layoutFormatterPreferences, abbreviationRepository);
+        StringReader stringReader = new StringReader(
+            "\\begin{doi}, DOI: \\doi\\end{doi}"
+        );
+        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 0e9134e4f52..f9f843563ea 100644
--- a/src/test/java/org/jabref/logic/layout/LayoutTest.java
+++ b/src/test/java/org/jabref/logic/layout/LayoutTest.java
@@ -1,12 +1,15 @@
 package org.jabref.logic.layout;
 
+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;
-
 import org.jabref.logic.journals.JournalAbbreviationRepository;
 import org.jabref.logic.layout.format.NameFormatterPreferences;
 import org.jabref.model.entry.BibEntry;
@@ -14,15 +17,10 @@
 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 org.mockito.Answers;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
-
 class LayoutTest {
 
     private LayoutFormatterPreferences layoutFormatterPreferences;
@@ -30,16 +28,28 @@ 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 {
-        StringReader layoutStringReader = new StringReader(layout.replace("__NEWLINE__", "\n"));
-
-        return new LayoutHelper(layoutStringReader, fileDirForDatabase, layoutFormatterPreferences, abbreviationRepository)
-                .getLayoutFromText()
-                .doLayout(entry, null);
+    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
+        )
+            .getLayoutFromText()
+            .doLayout(entry, null);
     }
 
     private String layout(String layout, BibEntry entry) throws IOException {
@@ -48,48 +58,63 @@ 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);
+        String actual = layout(
+            "\\begin{author}\\format[HTMLChars]{\\author}\\end{author}",
+            entry
+        );
 
         assertEquals("This<br>is<br>a<br>text", actual);
     }
 
     @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);
     }
@@ -97,41 +122,57 @@ void nameFormatter() throws IOException {
     @Test
     void HTMLCharsWithDotlessIAndTiled() throws IOException {
         BibEntry entry = new BibEntry(StandardEntryType.Article)
-                .withField(StandardField.ABSTRACT, "\\~{n} \\~n \\'i \\i \\i");
+            .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);
+            "<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>",
-                layoutText);
+            "<font face=\"arial\"><BR><BR><b>Abstract: </b> &ntilde; &ntilde; &iacute; &imath; &imath;</font>",
+            layoutText
+        );
     }
 
     @Test
     void beginConditionals() throws IOException {
         BibEntry entry = new BibEntry(StandardEntryType.Misc)
-                .withField(StandardField.AUTHOR, "Author");
+            .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);
 
         // ! (NOT)
-        layoutText = layout("\\begin{!year}\\format[HTMLChars]{(no year)}\\end{!year}", entry);
+        layoutText =
+            layout(
+                "\\begin{!year}\\format[HTMLChars]{(no year)}\\end{!year}",
+                entry
+            );
 
         assertEquals("(no year)", layoutText);
 
         // combined (!a&&b)
-        layoutText = layout(
+        layoutText =
+            layout(
                 "\\begin{!editor&&author}\\format[HTMLChars]{\\author}\\end{!editor&&author}" +
-                "\\begin{editor&&!author}\\format[HTMLChars]{\\editor} (eds.)\\end{editor&&!author}", entry);
+                "\\begin{editor&&!author}\\format[HTMLChars]{\\editor} (eds.)\\end{editor&&!author}",
+                entry
+            );
 
         assertEquals("Author", layoutText);
     }
@@ -142,21 +183,29 @@ void beginConditionals() throws IOException {
     @Test
     void wrapFileLinksExpandFile() throws IOException {
         BibEntry entry = new BibEntry(StandardEntryType.Article);
-        entry.addFile(new LinkedFile("Test file", Path.of("encrypted.pdf"), "PDF"));
+        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);
+            "\\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() + ")",
-                layoutText);
+            "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);
 
@@ -165,11 +214,22 @@ 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);
+        String layoutText = layout(
+            "\\begin{author}\\format[DCA]{\\author}\\end{author}",
+            entry
+        );
 
         assertEquals("JoeDoe and MaryJ", layoutText);
     }
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 10fd71c68c5..e8bb63169d7 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.
  */
@@ -17,9 +16,16 @@ public void testFormat() {
         LayoutFormatter b = new AuthorAbbreviator();
 
         assertEquals(b.format(""), a.format(""));
-        assertEquals(b.format("Someone, Van Something"), a.format("Someone, Van Something"));
+        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 317400fbad3..30fbade259e 100644
--- a/src/test/java/org/jabref/logic/layout/format/AuthorAndToSemicolonReplacerTest.java
+++ b/src/test/java/org/jabref/logic/layout/format/AuthorAndToSemicolonReplacerTest.java
@@ -1,24 +1,32 @@
 package org.jabref.logic.layout.format;
 
-import java.util.stream.Stream;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
+import java.util.stream.Stream;
 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;
-
 class AuthorAndToSemicolonReplacerTest {
 
     private static Stream<Arguments> data() {
         return Stream.of(
-                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("", ""),
+            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"
+            )
+        );
     }
 
     @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 0bdb1740918..716ac415769 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;
-
 public class AuthorAndsCommaReplacerTest {
 
     /**
@@ -19,14 +18,21 @@ public void testFormat() {
         assertEquals("", a.format(""));
 
         // Single Names don't change
-        assertEquals("Someone, Van Something", a.format("Someone, Van Something"));
+        assertEquals(
+            "Someone, Van Something",
+            a.format("Someone, Van Something")
+        );
 
         // Two names just an &
-        assertEquals("John von Neumann & Peter Black Brown",
-                a.format("John von Neumann and 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",
-                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")
+        );
     }
 }
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 9c2bcb40c2c..c5a38a30c42 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;
-
 public class AuthorAndsReplacerTest {
 
     /**
@@ -19,17 +18,26 @@ public void testFormat() {
         assertEquals("", a.format(""));
 
         // Single Names don't change
-        assertEquals("Someone, Van Something", a.format("Someone, Van Something"));
+        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("John von Neumann; John Smith & Peter Black Brown", a
-                .format("John von Neumann and John Smith and Peter Black Brown"));
+        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")
+        );
     }
 }
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 b4f6f544589..e96ad001b93 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;
-
 public class AuthorFirstAbbrLastCommasTest {
 
     @Test
@@ -19,14 +18,20 @@ public void testFormat() {
         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("John von Neumann and John Smith 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")
+        );
     }
 }
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 f35de4b55ac..21e9243ba17 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;
-
 public class AuthorFirstAbbrLastOxfordCommasTest {
 
     /**
@@ -22,14 +21,20 @@ public void testFormat() {
         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("John von Neumann and John Smith 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")
+        );
     }
 }
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 1972b6b781e..df6d5de0a99 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;
+
 public class AuthorFirstFirstCommasTest {
 
     /**
@@ -11,8 +11,12 @@ public class AuthorFirstFirstCommasTest {
      */
     @Test
     public void testFormat() {
-        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"));
+        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 d71647dd45e..1087adeb2c6 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;
+
 public class AuthorFirstFirstTest {
 
     /**
@@ -11,8 +11,12 @@ public class AuthorFirstFirstTest {
      */
     @Test
     public void testFormat() {
-        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"));
+        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 bdf0490a42f..dbc719dc9b1 100644
--- a/src/test/java/org/jabref/logic/layout/format/AuthorFirstLastCommasTest.java
+++ b/src/test/java/org/jabref/logic/layout/format/AuthorFirstLastCommasTest.java
@@ -1,15 +1,13 @@
 package org.jabref.logic.layout.format;
 
-import java.util.stream.Stream;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
+import java.util.stream.Stream;
 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;
-
 public class AuthorFirstLastCommasTest {
 
     LayoutFormatter authorFLCFormatter = new AuthorFirstLastCommas();
@@ -25,13 +23,28 @@ void paramLayoutFormatTest(String expectedString, String inputString) {
 
     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("", ""),
+            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"
+            )
         );
     }
 }
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 14c31580339..21fda5fc9ac 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;
-
 public class AuthorFirstLastOxfordCommasTest {
 
     /**
@@ -19,17 +18,26 @@ public void testFormat() {
         assertEquals("", a.format(""));
 
         // Single Names
-        assertEquals("Van Something Someone", a.format("Someone, Van Something"));
+        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("John von Neumann and John Smith 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")
+        );
     }
 }
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 937f7e0a71a..969ebc83693 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;
+
 public class AuthorLF_FFAbbrTest {
 
     /**
@@ -11,8 +11,12 @@ public class AuthorLF_FFAbbrTest {
      */
     @Test
     public void testFormat() {
-        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"));
+        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 c3bd13219bc..6e14f528f69 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;
+
 public class AuthorLF_FFTest {
 
     /**
@@ -11,8 +11,12 @@ public class AuthorLF_FFTest {
      */
     @Test
     public void testFormat() {
-        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"));
+        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 e49653a18c2..6f43aaa1404 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;
-
 public class AuthorLastFirstAbbrCommasTest {
 
     /**
@@ -22,14 +21,20 @@ public void testFormat() {
         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("John von Neumann and John Smith 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")
+        );
     }
 }
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 21a8e6a195d..481a2dab289 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;
-
 public class AuthorLastFirstAbbrOxfordCommasTest {
 
     /**
@@ -22,14 +21,20 @@ public void testFormat() {
         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("John von Neumann and John Smith 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")
+        );
     }
 }
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 c5c97e87bd8..423cedec55a 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.
  */
@@ -26,7 +26,10 @@ void testOneAuthorSimpleName() {
      */
     @Test
     void testOneAuthorCommonName() {
-        assertEquals("Lastname, N. M.", abbreviate("Lastname, Name Middlename"));
+        assertEquals(
+            "Lastname, N. M.",
+            abbreviate("Lastname, Name Middlename")
+        );
     }
 
     /**
@@ -36,7 +39,9 @@ void testOneAuthorCommonName() {
      */
     @Test
     void testTwoAuthorsCommonName() {
-        String result = abbreviate("Lastname, Name Middlename and Sobrenome, Nome Nomedomeio");
+        String result = abbreviate(
+            "Lastname, Name Middlename and Sobrenome, Nome Nomedomeio"
+        );
         String expectedResult = "Lastname, N. M. and Sobrenome, N. N.";
 
         assertEquals(expectedResult, result);
@@ -52,8 +57,12 @@ void testFormat() {
         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.",
-                abbreviate("von Neumann, John and Smith, John and Black Brown, Peter"));
+        assertEquals(
+            "von Neumann, J. and Smith, J. and Black Brown, P.",
+            abbreviate(
+                "von Neumann, John and Smith, John and Black Brown, Peter"
+            )
+        );
     }
 
     private String abbreviate(String name) {
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 35d262ccffd..64a06e08803 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;
-
 public class AuthorLastFirstCommasTest {
 
     /**
@@ -19,17 +18,26 @@ public void testFormat() {
         assertEquals("", a.format(""));
 
         // Single Names
-        assertEquals("Someone, Van Something", a.format("Van Something Someone"));
+        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("John von Neumann and John Smith 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")
+        );
     }
 }
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 e3beacbd4b4..9773589481f 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;
-
 public class AuthorLastFirstOxfordCommasTest {
 
     /**
@@ -19,17 +18,26 @@ public void testFormat() {
         assertEquals("", a.format(""));
 
         // Single Names
-        assertEquals("Someone, Van Something", a.format("Van Something Someone"));
+        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("John von Neumann and John Smith 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")
+        );
     }
 }
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 8d26609ee87..8ca9629cb2b 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;
-
 public class AuthorLastFirstTest {
 
     @Test
@@ -16,17 +15,26 @@ public void testFormat() {
         assertEquals("", a.format(""));
 
         // Single Names
-        assertEquals("Someone, Van Something", a.format("Van Something Someone"));
+        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("John von Neumann and John Smith 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")
+        );
     }
 }
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 164e4c667de..8609e5426d2 100644
--- a/src/test/java/org/jabref/logic/layout/format/AuthorNatBibTest.java
+++ b/src/test/java/org/jabref/logic/layout/format/AuthorNatBibTest.java
@@ -1,15 +1,13 @@
 package org.jabref.logic.layout.format;
 
-import java.util.stream.Stream;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
+import java.util.stream.Stream;
 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;
-
 public class AuthorNatBibTest {
 
     LayoutFormatter authorNatBibFormatter = new AuthorNatBib();
@@ -22,12 +20,17 @@ 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)}.
-                Arguments.of("von Neumann and Smith", "von Neumann,,John and John Smith"),
-                Arguments.of("von Neumann", "von Neumann, John")
+            // 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")
         );
     }
 }
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 22b5b82a565..242042fc498 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,20 @@
 package org.jabref.logic.layout.format;
 
-import java.util.stream.Stream;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
+import java.util.stream.Stream;
 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;
-
 public 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")
@@ -23,23 +24,41 @@ void paramLayoutFormatTest(String expectedString, String inputString) {
 
     @ParameterizedTest
     @MethodSource("formatTestsComposite")
-    void paramLayoutFormatTestComposite(String expectedString, String inputString) {
-        assertEquals(expectedString, authorOrgNatFormatterComposite.format(inputString));
+    void paramLayoutFormatTestComposite(
+        String expectedString,
+        String inputString
+    ) {
+        assertEquals(
+            expectedString,
+            authorOrgNatFormatterComposite.format(inputString)
+        );
     }
 
     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(
+                "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"
+            )
         );
     }
 
     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(
+                "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"
+            )
         );
     }
 }
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 8a3e22410c3..982fcfb4898 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,99 @@
 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;
-
 public class AuthorsTest {
 
     private ParamLayoutFormatter authorsLayoutFormatter = new Authors();
 
     @Test
     public void testStandardUsage() {
-        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
     public void testStandardUsageOne() {
         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
     public void testStandardUsageTwo() {
         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
     public void testStandardUsageThree() {
         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
     public void testStandardUsageFour() {
         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
     public void testStandardUsageFive() {
         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
     public void testStandardUsageSix() {
         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
     public void testSpecialEtAl() {
-        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"));
+        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"
+            )
+        );
     }
 
     @Test
@@ -73,115 +104,170 @@ public void testStandardUsageNull() {
     @Test
     public void testStandardOxford() {
         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
     public void testStandardOxfordFullName() {
         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
     public void testStandardCommaFullName() {
         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
     public void testStandardAmpFullName() {
         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
     public void testLastName() {
         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
     public void testMiddleInitial() {
         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
     public void testNoPeriod() {
         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
     public void testEtAl() {
         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
     public void testEtAlNotEnoughAuthors() {
         authorsLayoutFormatter.setArgument("2,1");
-        assertEquals("B. C. Bruce and C. K. von Manson",
-                authorsLayoutFormatter.format("Bruce, Bob Croydon and Charles Kermit von Manson"));
+        assertEquals(
+            "B. C. Bruce and C. K. von Manson",
+            authorsLayoutFormatter.format(
+                "Bruce, Bob Croydon and Charles Kermit von Manson"
+            )
+        );
     }
 
     @Test
     public void testEmptyEtAl() {
-        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"));
+        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"
+            )
+        );
     }
 
     @ParameterizedTest(name = "arg={0}, formattedStr={1}")
-    @CsvSource({
+    @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
-    })
+            "LastFirstFirstFirst, 'Bruce, B. C., C. Manson, J. Jumper and C. Chuckles'", // LastFirstFirstFirst
+        }
+    )
     public void testAuthorOrder(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({
+    @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
-    })
+            "InitialsNoSpace, 'B.C. Bruce, C. Manson, J. Jumper and C. Chuckles'", // InitialsNoSpace
+        }
+    )
     public void testAuthorABRV(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({
+    @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
-    })
+            "NoPeriod, 'B C Bruce, C Manson, J Jumper and C Chuckles'", // NoPeriod
+        }
+    )
     public void testAuthorPUNC(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({
+    @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
@@ -195,10 +281,13 @@ public void testAuthorPUNC(String arg, String expectedResult) {
             "'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
-    })
+        }
+    )
     public void testAuthorSEPARATORS(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 9b0c6d49a2f..273c31056bd 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;
-
 public class CompositeFormatTest {
 
     @Test
@@ -16,21 +15,37 @@ public void testEmptyComposite() {
 
     @Test
     public void testArrayComposite() {
-        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
     public void testDoubleComposite() {
-        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")),
-                f.format("John Flynn and Sabine Gartska"));
-        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"));
+        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"
+                )
+            ),
+            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 2c7fb18598c..1fb3c409827 100644
--- a/src/test/java/org/jabref/logic/layout/format/DOICheckTest.java
+++ b/src/test/java/org/jabref/logic/layout/format/DOICheckTest.java
@@ -1,15 +1,13 @@
 package org.jabref.logic.layout.format;
 
-import java.util.stream.Stream;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
+import java.util.stream.Stream;
 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;
-
 public class DOICheckTest {
 
     private LayoutFormatter layoutFormatter = new DOICheck();
@@ -22,17 +20,34 @@ void formatDOI(String formattedDOI, String originalDOI) {
 
     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.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("", ""),
+            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.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")
         );
     }
 }
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 b8576d4e783..5b69a89ec18 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,45 @@
 package org.jabref.logic.layout.format;
 
-import java.util.stream.Stream;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
+import java.util.stream.Stream;
 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;
-
 public class DOIStripTest {
 
-  LayoutFormatter layoutFormatter = new DOIStrip();
+    LayoutFormatter layoutFormatter = new DOIStrip();
 
-  @ParameterizedTest
-  @MethodSource("provideDOI")
-  public void testFormatDOIStrip(String formattedDOI, String originalDOI) {
-      assertEquals(formattedDOI, layoutFormatter.format(originalDOI));
-  }
+    @ParameterizedTest
+    @MethodSource("provideDOI")
+    public void testFormatDOIStrip(String formattedDOI, String originalDOI) {
+        assertEquals(formattedDOI, layoutFormatter.format(originalDOI));
+    }
 
-  private static Stream<Arguments> provideDOI() {
-    return Stream.of(
+    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.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 d5eda7aa69a..2432c4464d3 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;
-
 public class DateFormatterTest {
 
     private ParamLayoutFormatter formatter;
@@ -30,14 +29,20 @@ public void testRequestedFormat() {
     }
 
     @ParameterizedTest(name = "formatArg={0}, input={1}, formattedStr={2}")
-    @CsvSource({
+    @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
-    })
-    public void testOtherFormats(String formatArg, String input, String expectedResult) {
+        }
+    )
+    public void testOtherFormats(
+        String formatArg,
+        String input,
+        String expectedResult
+    ) {
         formatter.setArgument(formatArg);
         String formattedStr = formatter.format(input);
         assertEquals(expectedResult, formattedStr);
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 4414990c4fc..f3779fb0192 100644
--- a/src/test/java/org/jabref/logic/layout/format/DefaultTest.java
+++ b/src/test/java/org/jabref/logic/layout/format/DefaultTest.java
@@ -1,22 +1,24 @@
 package org.jabref.logic.layout.format;
 
-import java.util.stream.Stream;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
+import java.util.stream.Stream;
 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;
-
 public class DefaultTest {
 
     ParamLayoutFormatter paramLayoutFormatter = new Default();
 
     @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);
         }
@@ -25,12 +27,16 @@ void paramLayoutFormatTest(String expectedString, String inputString, String for
 
     private static Stream<Arguments> formatTests() {
         return Stream.of(
-                Arguments.of("Bob Bruce", "Bob Bruce", "DEFAULT TEXT"),
-                Arguments.of("DEFAULT TEXT", null, "DEFAULT TEXT"),
-                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("Bob Bruce", "Bob Bruce", "DEFAULT TEXT"),
+            Arguments.of("DEFAULT TEXT", null, "DEFAULT TEXT"),
+            Arguments.of("DEFAULT TEXT", "", "DEFAULT TEXT"),
+            Arguments.of(
+                "Bob Bruce and Jolly Jumper",
+                "Bob Bruce and Jolly Jumper",
+                ""
+            ),
+            Arguments.of("", null, ""),
+            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 8fca35e0b3a..52b885ed664 100644
--- a/src/test/java/org/jabref/logic/layout/format/EntryTypeFormatterTest.java
+++ b/src/test/java/org/jabref/logic/layout/format/EntryTypeFormatterTest.java
@@ -1,13 +1,12 @@
 package org.jabref.logic.layout.format;
 
-import java.util.stream.Stream;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
+import java.util.stream.Stream;
 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;
-
 public class EntryTypeFormatterTest {
 
     private EntryTypeFormatter formatter = new EntryTypeFormatter();
@@ -20,10 +19,10 @@ void testCorrectFormat(String expectedString, String inputString) {
 
     private static Stream<Arguments> formatTests() {
         return Stream.of(
-                Arguments.of("Article", "article"),
-                Arguments.of("Banana", "banana"),
-                Arguments.of("InBook", "inbook"),
-                Arguments.of("Aarticle", "aarticle")
+            Arguments.of("Article", "article"),
+            Arguments.of("Banana", "banana"),
+            Arguments.of("InBook", "inbook"),
+            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 c7cd3c46302..3265fa5dcf9 100644
--- a/src/test/java/org/jabref/logic/layout/format/FileLinkTest.java
+++ b/src/test/java/org/jabref/logic/layout/format/FileLinkTest.java
@@ -1,17 +1,15 @@
 package org.jabref.logic.layout.format;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
 import java.util.Collections;
 import java.util.stream.Stream;
-
 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;
-
 public class FileLinkTest {
 
     private ParamLayoutFormatter fileLinkLayoutFormatter;
@@ -23,22 +21,41 @@ public void setUp() throws Exception {
 
     @ParameterizedTest
     @MethodSource("provideFileLinks")
-    void formatFileLinks(String formattedFileLink, String originalFileLink, String desiredDocType) {
+    void formatFileLinks(
+        String formattedFileLink,
+        String originalFileLink,
+        String desiredDocType
+    ) {
         if (!desiredDocType.isEmpty()) {
             fileLinkLayoutFormatter.setArgument(desiredDocType);
         }
-        assertEquals(formattedFileLink, fileLinkLayoutFormatter.format(originalFileLink));
+        assertEquals(
+            formattedFileLink,
+            fileLinkLayoutFormatter.format(originalFileLink)
+        );
     }
 
     private static Stream<Arguments> provideFileLinks() {
         return Stream.of(
-                Arguments.of("", "", ""),
-                Arguments.of("", null, ""),
-                Arguments.of("test.pdf", "test.pdf", ""),
-                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("", "", ""),
+            Arguments.of("", null, ""),
+            Arguments.of("test.pdf", "test.pdf", ""),
+            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"
+            )
         );
     }
 }
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 efe7f669151..2f753358851 100644
--- a/src/test/java/org/jabref/logic/layout/format/FirstPageTest.java
+++ b/src/test/java/org/jabref/logic/layout/format/FirstPageTest.java
@@ -1,15 +1,13 @@
 package org.jabref.logic.layout.format;
 
-import java.util.stream.Stream;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
+import java.util.stream.Stream;
 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;
-
 public class FirstPageTest {
 
     private LayoutFormatter firstPageLayoutFormatter = new FirstPage();
@@ -17,16 +15,19 @@ public class FirstPageTest {
     @ParameterizedTest
     @MethodSource("providePages")
     void formatPages(String formattedFirstPage, String originalPages) {
-        assertEquals(formattedFirstPage, firstPageLayoutFormatter.format(originalPages));
+        assertEquals(
+            formattedFirstPage,
+            firstPageLayoutFormatter.format(originalPages)
+        );
     }
 
     private static Stream<Arguments> providePages() {
         return Stream.of(
-                Arguments.of("", ""),
-                Arguments.of("", null),
-                Arguments.of("345", "345"),
-                Arguments.of("345", "345-350"),
-                Arguments.of("345", "345--350")
+            Arguments.of("", ""),
+            Arguments.of("", null),
+            Arguments.of("345", "345"),
+            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 fd4a9c54b77..bf662755a52 100644
--- a/src/test/java/org/jabref/logic/layout/format/HTMLCharsTest.java
+++ b/src/test/java/org/jabref/logic/layout/format/HTMLCharsTest.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;
-
 public class HTMLCharsTest {
 
     private LayoutFormatter layout;
@@ -22,11 +21,16 @@ public void testBasicFormat() {
 
         assertEquals("hallo", layout.format("hallo"));
 
-        assertEquals("Réflexions sur le timing de la quantité",
-                layout.format("Réflexions sur le timing de la quantité"));
+        assertEquals(
+            "Réflexions sur le timing de la quantité",
+            layout.format("Réflexions sur le timing de la quantité")
+        );
 
         assertEquals("%%%", layout.format("\\%\\%\\%"));
-        assertEquals("People remember 10%, 20%…Oh Really?", layout.format("{{People remember 10\\%, 20\\%…Oh Really?}}"));
+        assertEquals(
+            "People remember 10%, 20%…Oh Really?",
+            layout.format("{{People remember 10\\%, 20\\%…Oh Really?}}")
+        );
 
         assertEquals("h&aacute;llo", layout.format("h\\'allo"));
 
@@ -43,7 +47,10 @@ public void testBasicFormat() {
 
         assertEquals("&Oogon;&imath;", layout.format("\\k{O}\\i"));
 
-        assertEquals("&ntilde; &ntilde; &iacute; &imath; &imath;", layout.format("\\~{n} \\~n \\'i \\i \\i"));
+        assertEquals(
+            "&ntilde; &ntilde; &iacute; &imath; &imath;",
+            layout.format("\\~{n} \\~n \\'i \\i \\i")
+        );
     }
 
     @Test
@@ -60,8 +67,14 @@ public void testLaTeXHighlighting() {
         assertEquals("<b>hallo</b>", layout.format("{\\textbf hallo}"));
         assertEquals("<b>hallo</b>", layout.format("{\\bf hallo}"));
 
-        assertEquals("<sup>hallo</sup>", layout.format("\\textsuperscript{hallo}"));
-        assertEquals("<sub>hallo</sub>", layout.format("\\textsubscript{hallo}"));
+        assertEquals(
+            "<sup>hallo</sup>",
+            layout.format("\\textsuperscript{hallo}")
+        );
+        assertEquals(
+            "<sub>hallo</sub>",
+            layout.format("\\textsubscript{hallo}")
+        );
 
         assertEquals("<u>hallo</u>", layout.format("\\underline{hallo}"));
         assertEquals("<s>hallo</s>", layout.format("\\sout{hallo}"));
@@ -72,8 +85,10 @@ public void testLaTeXHighlighting() {
     public void testEquations() {
         assertEquals("&dollar;", layout.format("\\$"));
         assertEquals("&sigma;", layout.format("$\\sigma$"));
-        assertEquals("A 32&nbsp;mA &Sigma;&Delta;-modulator",
-                layout.format("A 32~{mA} {$\\Sigma\\Delta$}-modulator"));
+        assertEquals(
+            "A 32&nbsp;mA &Sigma;&Delta;-modulator",
+            layout.format("A 32~{mA} {$\\Sigma\\Delta$}-modulator")
+        );
     }
 
     @Test
@@ -81,6 +96,7 @@ public void testNewLine() {
         assertEquals("a<br>b", layout.format("a\nb"));
         assertEquals("a<p>b", layout.format("a\n\nb"));
     }
+
     /*
      * Is missing a lot of test cases for the individual chars...
      */
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 26391ed935d..7dedbbfba71 100644
--- a/src/test/java/org/jabref/logic/layout/format/HTMLParagraphsTest.java
+++ b/src/test/java/org/jabref/logic/layout/format/HTMLParagraphsTest.java
@@ -1,15 +1,13 @@
 package org.jabref.logic.layout.format;
 
-import java.util.stream.Stream;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
+import java.util.stream.Stream;
 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;
-
 public class HTMLParagraphsTest {
 
     LayoutFormatter htmlFormatter = new HTMLParagraphs();
@@ -22,11 +20,17 @@ void testCorrectFormat(String expectedString, String inputString) {
 
     private static Stream<Arguments> htmlFormatTests() {
         return Stream.of(
-                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("", ""),
+            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"
+            )
         );
     }
 }
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 bb5dbbaceff..c6456bc2ea9 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;
-
 public 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 c7cf743dc22..49b55cbbf27 100644
--- a/src/test/java/org/jabref/logic/layout/format/LastPageTest.java
+++ b/src/test/java/org/jabref/logic/layout/format/LastPageTest.java
@@ -1,15 +1,13 @@
 package org.jabref.logic.layout.format;
 
-import java.util.stream.Stream;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
+import java.util.stream.Stream;
 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;
-
 public class LastPageTest {
 
     private LayoutFormatter lastPageLayoutFormatter = new LastPage();
@@ -17,17 +15,20 @@ public class LastPageTest {
     @ParameterizedTest
     @MethodSource("provideArguments")
     void formatLastPage(String formattedText, String originalText) {
-        assertEquals(formattedText, lastPageLayoutFormatter.format(originalText));
+        assertEquals(
+            formattedText,
+            lastPageLayoutFormatter.format(originalText)
+        );
     }
 
     private static Stream<Arguments> provideArguments() {
         return Stream.of(
-                Arguments.of("", ""),
-                Arguments.of("", null),
-                Arguments.of("345", "345"),
-                Arguments.of("350", "345-350"),
-                Arguments.of("350", "345--350"),
-                Arguments.of("", "--")
+            Arguments.of("", ""),
+            Arguments.of("", null),
+            Arguments.of("345", "345"),
+            Arguments.of("350", "345-350"),
+            Arguments.of("350", "345--350"),
+            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 f48963ff923..d670493e70e 100644
--- a/src/test/java/org/jabref/logic/layout/format/LatexToUnicodeFormatterTest.java
+++ b/src/test/java/org/jabref/logic/layout/format/LatexToUnicodeFormatterTest.java
@@ -1,10 +1,10 @@
 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 static org.junit.jupiter.api.Assertions.assertEquals;
-
 class LatexToUnicodeFormatterTest {
 
     final LatexToUnicodeFormatter formatter = new LatexToUnicodeFormatter();
@@ -28,7 +28,10 @@ void preserveUnknownCommand() {
     @Test
     void testFormatTextit() {
         // 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
@@ -43,7 +46,10 @@ void testEquationsSingleSymbol() {
 
     @Test
     void testEquationsMoreComplicatedFormatting() {
-        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
@@ -99,7 +105,9 @@ void testCombiningAccentsCase1() {
         assertEquals("ḩ", formatter.format("{\\c{h}}"));
     }
 
-    @Disabled("This is not a standard LaTeX command. It is debatable why we should convert this.")
+    @Disabled(
+        "This is not a standard LaTeX command. It is debatable why we should convert this."
+    )
     @Test
     void testCombiningAccentsCase2() {
         assertEquals("a͍", formatter.format("\\spreadlips{a}"));
@@ -155,12 +163,18 @@ void testApostrophC() {
 
     @Test
     void testPreservationOfSingleUnderscore() {
-        assertEquals("Lorem ipsum_lorem ipsum", formatter.format("Lorem ipsum_lorem ipsum"));
+        assertEquals(
+            "Lorem ipsum_lorem ipsum",
+            formatter.format("Lorem ipsum_lorem ipsum")
+        );
     }
 
     @Test
     void testConversionOfUnderscoreWithBraces() {
-        assertEquals("Lorem ipsum_(lorem ipsum)", formatter.format("Lorem ipsum_{lorem ipsum}"));
+        assertEquals(
+            "Lorem ipsum_(lorem ipsum)",
+            formatter.format("Lorem ipsum_{lorem ipsum}")
+        );
     }
 
     @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 e5e1f9281e6..e5e789fca9c 100644
--- a/src/test/java/org/jabref/logic/layout/format/MarkdownFormatterTest.java
+++ b/src/test/java/org/jabref/logic/layout/format/MarkdownFormatterTest.java
@@ -1,12 +1,12 @@
 package org.jabref.logic.layout.format;
 
-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 org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
 class MarkdownFormatterTest {
 
     private MarkdownFormatter markdownFormatter;
@@ -18,12 +18,19 @@ void setUp() {
 
     @Test
     void formatWhenFormattingPlainTextThenReturnsTextWrappedInParagraph() {
-        assertEquals("<p>Hello World</p>", markdownFormatter.format("Hello World"));
+        assertEquals(
+            "<p>Hello World</p>",
+            markdownFormatter.format("Hello World")
+        );
     }
 
     @Test
     void formatWhenFormattingComplexMarkupThenReturnsOnlyOneLine() {
-        assertFalse(markdownFormatter.format("Markup\n\n* list item one\n* list item 2\n\n rest").contains("\n"));
+        assertFalse(
+            markdownFormatter
+                .format("Markup\n\n* list item one\n* list item 2\n\n rest")
+                .contains("\n")
+        );
     }
 
     @Test
@@ -33,7 +40,13 @@ void formatWhenFormattingEmptyStringThenReturnsEmptyString() {
 
     @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()
+        );
     }
 }
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 5a4b1b6581b..47a6e27ce3e 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;
+
 public class NameFormatterTest {
 
     @Test
@@ -12,21 +12,45 @@ public void testFormatStringStringBibtexEntry() {
 
         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",
-                        "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",
-                        "1@*@{ll}, {ff}@@*@1@{ll} {ff}@2..-1@ and {ll}, {f}."));
+        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",
+                "1@*@{ll}, {ff}@@*@1@{ll} {ff}@2..-1@ and {ll}, {f}."
+            )
+        );
     }
 
     @Test
@@ -36,24 +60,45 @@ public void testFormat() {
         // 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));
+        assertEquals(
+            "Vandekamp Mary~Ann",
+            a.format("Mary Ann Vandekamp", formatString)
+        );
 
         // Two names
-        assertEquals("von Neumann John and Black~Brown, Peter",
-                a.format("John von Neumann and Black Brown, Peter", formatString));
+        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",
-                a.format("von Neumann, John and Smith, John and Black Brown, Peter", formatString));
-
-        assertEquals("von Neumann John, Smith, John and Black~Brown, Peter",
-                a.format("John von Neumann and John Smith and Black Brown, Peter", formatString));
+        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",
+            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 7c75e579b86..ab42fb02395 100644
--- a/src/test/java/org/jabref/logic/layout/format/NoSpaceBetweenAbbreviationsTest.java
+++ b/src/test/java/org/jabref/logic/layout/format/NoSpaceBetweenAbbreviationsTest.java
@@ -1,32 +1,40 @@
 package org.jabref.logic.layout.format;
 
-import java.util.stream.Stream;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
+import java.util.stream.Stream;
 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;
-
 public class NoSpaceBetweenAbbreviationsTest {
 
-    private LayoutFormatter nsbaLayoutFormatter = new NoSpaceBetweenAbbreviations();
+    private LayoutFormatter nsbaLayoutFormatter =
+        new NoSpaceBetweenAbbreviations();
 
     @ParameterizedTest
     @MethodSource("provideAbbreviations")
-    void formatAbbreviations(String formattedAbbreviation, String originalAbbreviation) {
-        assertEquals(formattedAbbreviation, nsbaLayoutFormatter.format(originalAbbreviation));
+    void formatAbbreviations(
+        String formattedAbbreviation,
+        String originalAbbreviation
+    ) {
+        assertEquals(
+            formattedAbbreviation,
+            nsbaLayoutFormatter.format(originalAbbreviation)
+        );
     }
 
     private static Stream<Arguments> provideAbbreviations() {
         return Stream.of(
-                Arguments.of("", ""),
-                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("", ""),
+            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"
+            )
         );
     }
 }
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 af73ab217be..eb456892a33 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;
+
 public class OrdinalTest {
 
     @Test
@@ -43,7 +43,10 @@ public void testAlreadyOrdinals() {
     public void testFullSentence() {
         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 3e65598c117..1ffa2cc3351 100644
--- a/src/test/java/org/jabref/logic/layout/format/RTFCharsTest.java
+++ b/src/test/java/org/jabref/logic/layout/format/RTFCharsTest.java
@@ -1,16 +1,16 @@
 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;
 
     @BeforeEach
@@ -29,8 +29,10 @@ void testBasicFormat() {
 
         assertEquals("hallo", formatter.format("hallo"));
 
-        assertEquals("R\\u233eflexions sur le timing de la quantit\\u233e",
-                formatter.format("Réflexions sur le timing de la quantité"));
+        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"));
         assertEquals("h\\'e1llo", formatter.format("h\\'allo"));
@@ -40,7 +42,12 @@ void testBasicFormat() {
     void testLaTeXHighlighting() {
         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,8 +58,12 @@ void testLaTeXHighlighting() {
 
     @Test
     void testComplicated() {
-        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 æ"));
+        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 æ"
+            )
+        );
     }
 
     @Test
@@ -62,35 +73,49 @@ void testComplicated2() {
 
     @Test
     void testComplicated3() {
-        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 testComplicated4() {
-        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" +
+        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."));
+                "  Ôtez ce vœu déçu."
+            )
+        );
     }
 
     @Test
     void testComplicated5() {
-        assertEquals("\\u193Arv\\u237izt\\u369?r\\u337? t\\u252?k\\u246orf\\u250ur\\u243og\\u233ep",
-                formatter.format("Árvíztűrő tükörfúrógép"));
+        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 testComplicated6() {
-        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"));
+        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")
+        );
     }
 
     @Test
@@ -133,7 +158,8 @@ void testSpecialCharacters() {
     }
 
     @ParameterizedTest(name = "specialChar={0}, formattedStr={1}")
-    @CsvSource({
+    @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
@@ -178,9 +204,13 @@ void testSpecialCharacters() {
             "œ, \\u339oe", // oe
             "Þ, \\u222TH", // TH
             "ß, \\u223ss", // ss
-            "¡, \\u161!" // !
-    })
-    public void testMoreSpecialCharacters(String specialChar, String expectedResult) {
+            "¡, \\u161!", // !
+        }
+    )
+    public void testMoreSpecialCharacters(
+        String specialChar,
+        String expectedResult
+    ) {
         String formattedStr = formatter.format(specialChar);
         assertEquals(expectedResult, formattedStr);
     }
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 666958bb44a..a69050eac4a 100644
--- a/src/test/java/org/jabref/logic/layout/format/RemoveBracketsAddCommaTest.java
+++ b/src/test/java/org/jabref/logic/layout/format/RemoveBracketsAddCommaTest.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 java.util.stream.Stream;
 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;
-
 public class RemoveBracketsAddCommaTest {
+
     private LayoutFormatter formatter;
 
     @BeforeEach
@@ -27,9 +26,9 @@ void formatTextWithBrackets(String formattedString, String originalString) {
 
     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}"),
+            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 000cc393d32..580c50a8252 100644
--- a/src/test/java/org/jabref/logic/layout/format/RemoveBracketsTest.java
+++ b/src/test/java/org/jabref/logic/layout/format/RemoveBracketsTest.java
@@ -1,13 +1,13 @@
 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;
-
 public class RemoveBracketsTest {
+
     private LayoutFormatter formatter;
 
     @BeforeEach
@@ -31,7 +31,8 @@ public void singleClosingBraceCorrectlyRemoved() throws Exception {
     }
 
     @Test
-    public void bracePairWithEscapedBackslashCorrectlyRemoved() throws Exception {
+    public void bracePairWithEscapedBackslashCorrectlyRemoved()
+        throws Exception {
         assertEquals("\\some text\\", formatter.format("\\{some text\\}"));
     }
 
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 9eab6df5985..bf65faa8d35 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,11 @@ public void escapedUnderscoreReplaces() {
 
     @Test
     public 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 17635c2b723..d0a5f96e181 100644
--- a/src/test/java/org/jabref/logic/layout/format/RemoveTildeTest.java
+++ b/src/test/java/org/jabref/logic/layout/format/RemoveTildeTest.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 java.util.stream.Stream;
 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;
-
 public class RemoveTildeTest {
+
     private LayoutFormatter formatter;
 
     @BeforeEach
@@ -27,14 +26,17 @@ void formatText(String formattedString, String originalString) {
 
     private static Stream<Arguments> provideArguments() {
         return Stream.of(
-                Arguments.of("", ""),
-                Arguments.of("simple", "simple"),
-                Arguments.of(" ", "~"),
-                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("", ""),
+            Arguments.of("simple", "simple"),
+            Arguments.of(" ", "~"),
+            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.")
         );
     }
 }
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 96e92bbac0b..8eea03afb0f 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;
+
 public class RemoveWhitespaceTest {
 
     @Test
@@ -29,6 +29,9 @@ public void testTab() {
 
     @Test
     public void testNewLineCombo() {
-        assertEquals("abcd EFG", new RemoveWhitespace().format("abcd\r E\nFG\r\n"));
+        assertEquals(
+            "abcd EFG",
+            new RemoveWhitespace().format("abcd\r E\nFG\r\n")
+        );
     }
 }
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 3d1eb4ebb9b..4aa5e2f88ff 100644
--- a/src/test/java/org/jabref/logic/layout/format/ReplaceTest.java
+++ b/src/test/java/org/jabref/logic/layout/format/ReplaceTest.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;
-
 public class ReplaceTest {
 
     @Test
@@ -39,13 +38,19 @@ public void testFormatEmpty() {
     @Test
     public void testNoArgumentSet() {
         ParamLayoutFormatter a = new Replace();
-        assertEquals("Bob Bruce and Jolly Jumper", a.format("Bob Bruce and Jolly Jumper"));
+        assertEquals(
+            "Bob Bruce and Jolly Jumper",
+            a.format("Bob Bruce and Jolly Jumper")
+        );
     }
 
     @Test
     public void testNoProperArgument() {
         ParamLayoutFormatter a = new Replace();
         a.setArgument("Eds.");
-        assertEquals("Bob Bruce and Jolly Jumper", a.format("Bob Bruce and Jolly Jumper"));
+        assertEquals(
+            "Bob Bruce and Jolly Jumper",
+            a.format("Bob Bruce and Jolly Jumper")
+        );
     }
 }
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 987fc22153c..3d978a46b0a 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;
-
 public 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 863683620fa..9dfd3a2d4d3 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.util.OS;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
+import org.jabref.logic.util.OS;
 import org.junit.jupiter.api.Test;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-
 public class RisKeywordsTest {
 
     @Test
@@ -25,12 +24,23 @@ public void testSingleKeyword() {
 
     @Test
     public void testTwoKeywords() {
-        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
     public void testMultipleKeywords() {
-        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 a323dcd1d2e..a835f9f1d0f 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;
-
 public class RisMonthTest {
 
     @Test
@@ -19,7 +19,8 @@ public void testNull() {
     }
 
     @ParameterizedTest(name = "input={0}, formattedStr={1}")
-    @CsvSource({
+    @CsvSource(
+        {
             "jan, 01", // jan
             "feb, 02", // feb
             "mar, 03", // mar
@@ -32,7 +33,8 @@ public void testNull() {
             "oct, 10", // oct
             "nov, 11", // nov
             "dec, 12", // dec
-    })
+        }
+    )
     public void testValidMonth(String input, String expectedResult) {
         String formattedStr = new RisMonth().format(input);
         assertEquals(expectedResult, formattedStr);
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 2b8ee803be5..064937cbc75 100644
--- a/src/test/java/org/jabref/logic/layout/format/ShortMonthFormatterTest.java
+++ b/src/test/java/org/jabref/logic/layout/format/ShortMonthFormatterTest.java
@@ -1,17 +1,15 @@
 package org.jabref.logic.layout.format;
 
-import java.util.stream.Stream;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
+import java.util.stream.Stream;
 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;
-
 public class ShortMonthFormatterTest {
 
     private LayoutFormatter formatter;
@@ -28,18 +26,21 @@ public void formatNullInput() {
 
     @ParameterizedTest
     @MethodSource("provideArguments")
-    public void formatDifferentInputs(String formattedString, String originalString) {
+    public void formatDifferentInputs(
+        String formattedString,
+        String originalString
+    ) {
         assertEquals(formattedString, formatter.format(originalString));
     }
 
     private static Stream<Arguments> provideArguments() {
         return Stream.of(
-                Arguments.of("jan", "jan"),
-                Arguments.of("jan", "January"),
-                Arguments.of("jan", "Januar"),
-                Arguments.of("jan", "01"),
-                Arguments.of("", "Invented Month"),
-                Arguments.of("", "")
+            Arguments.of("jan", "jan"),
+            Arguments.of("jan", "January"),
+            Arguments.of("jan", "Januar"),
+            Arguments.of("jan", "01"),
+            Arguments.of("", "Invented Month"),
+            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 1ab1455925c..1e6748bb739 100644
--- a/src/test/java/org/jabref/logic/layout/format/ToLowerCaseTest.java
+++ b/src/test/java/org/jabref/logic/layout/format/ToLowerCaseTest.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 static org.junit.jupiter.api.Assertions.assertNull;
 
+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.assertNull;
-
 public class ToLowerCaseTest {
 
     @Test
@@ -19,19 +18,22 @@ public void testNull() {
 
     @ParameterizedTest
     @MethodSource("provideArguments")
-    public void toLowerCaseWithDifferentInputs(String expectedString, String originalString) {
+    public void toLowerCaseWithDifferentInputs(
+        String expectedString,
+        String originalString
+    ) {
         assertEquals(expectedString, new ToLowerCase().format(originalString));
     }
 
     private static Stream<Arguments> provideArguments() {
         return Stream.of(
-                Arguments.of("", ""),
-                Arguments.of("abcd efg", "abcd efg"),
-                Arguments.of("abcd efg", "ABCD EFG"),
-                Arguments.of("abcd efg", "abCD eFg"),
-                Arguments.of("abcd123efg", "abCD123eFg"),
-                Arguments.of("hello!*#", "Hello!*#"),
-                Arguments.of("123*%&456", "123*%&456")
+            Arguments.of("", ""),
+            Arguments.of("abcd efg", "abcd efg"),
+            Arguments.of("abcd efg", "ABCD EFG"),
+            Arguments.of("abcd efg", "abCD eFg"),
+            Arguments.of("abcd123efg", "abCD123eFg"),
+            Arguments.of("hello!*#", "Hello!*#"),
+            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 4611ed276ed..771ebb265f7 100644
--- a/src/test/java/org/jabref/logic/layout/format/ToUpperCaseTest.java
+++ b/src/test/java/org/jabref/logic/layout/format/ToUpperCaseTest.java
@@ -1,13 +1,12 @@
 package org.jabref.logic.layout.format;
 
-import java.util.stream.Stream;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
+import java.util.stream.Stream;
 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;
-
 public class ToUpperCaseTest {
 
     ToUpperCase upperCase = new ToUpperCase();
@@ -20,11 +19,11 @@ void toUpperCaseTests(String expectedString, String inputString) {
 
     private static Stream<Arguments> toUpperCaseTests() {
         return Stream.of(
-                Arguments.of("", ""),
-                Arguments.of(null, null),
-                Arguments.of("ABCD EFG", "abcd efg"),
-                Arguments.of("ABCD EFG", "ABCD EFG"),
-                Arguments.of("ABCD EFG", "abCD eFg")
+            Arguments.of("", ""),
+            Arguments.of(null, null),
+            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 bb933c44b5c..3cf5bcb8f38 100644
--- a/src/test/java/org/jabref/logic/layout/format/WrapContentTest.java
+++ b/src/test/java/org/jabref/logic/layout/format/WrapContentTest.java
@@ -1,39 +1,57 @@
 package org.jabref.logic.layout.format;
 
-import java.util.stream.Stream;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
+import java.util.stream.Stream;
 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;
-
 public class WrapContentTest {
 
-    private ParamLayoutFormatter wrapContentParamLayoutFormatter = new WrapContent();
+    private ParamLayoutFormatter wrapContentParamLayoutFormatter =
+        new WrapContent();
 
     @ParameterizedTest
     @MethodSource("provideContent")
-    void formatContent(String formattedContent, String originalContent, String desiredFormat) {
+    void formatContent(
+        String formattedContent,
+        String originalContent,
+        String desiredFormat
+    ) {
         if (!desiredFormat.isEmpty()) {
             wrapContentParamLayoutFormatter.setArgument(desiredFormat);
         }
 
-        assertEquals(formattedContent, wrapContentParamLayoutFormatter.format(originalContent));
+        assertEquals(
+            formattedContent,
+            wrapContentParamLayoutFormatter.format(originalContent)
+        );
     }
 
     private static Stream<Arguments> provideContent() {
         return Stream.of(
-                Arguments.of("<Bob>", "Bob", "<,>"),
-                Arguments.of("Bob:", "Bob", ",:"),
-                Arguments.of("Content: Bob", "Bob", "Content: ,"),
-                Arguments.of("Name,Field,Bob,Author", "Bob", "Name\\,Field\\,,\\,Author"),
-                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>", "Bob", "<,>"),
+            Arguments.of("Bob:", "Bob", ",:"),
+            Arguments.of("Content: Bob", "Bob", "Content: ,"),
+            Arguments.of(
+                "Name,Field,Bob,Author",
+                "Bob",
+                "Name\\,Field\\,,\\,Author"
+            ),
+            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."
+            )
         );
     }
 }
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 faf60d71945..28b06c8ad57 100644
--- a/src/test/java/org/jabref/logic/layout/format/WrapFileLinksTest.java
+++ b/src/test/java/org/jabref/logic/layout/format/WrapFileLinksTest.java
@@ -1,16 +1,15 @@
 package org.jabref.logic.layout.format;
 
+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;
-
 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;
-
 class WrapFileLinksTest {
 
     private WrapFileLinks formatter;
@@ -32,7 +31,10 @@ void testNull() {
 
     @Test
     void testNoFormatSetNonEmptyString() {
-        assertThrows(NullPointerException.class, () -> formatter.format("test.pdf"));
+        assertThrows(
+            NullPointerException.class,
+            () -> formatter.format("test.pdf")
+        );
     }
 
     @Test
@@ -86,7 +88,10 @@ void testIterator() {
     @Test
     void testIteratorTwoItems() {
         formatter.setArgument("\\i\n");
-        assertEquals("1\n2\n", formatter.format("Test file:test.pdf:PDF;test2.pdf"));
+        assertEquals(
+            "1\n2\n",
+            formatter.format("Test file:test.pdf:PDF;test2.pdf")
+        );
     }
 
     @Test
@@ -97,23 +102,41 @@ void testEndingBracket() {
 
     @Test
     void testPath() 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(),
-                formatter.format("Preferences:encrypted.pdf:PDF"));
+        assertEquals(
+            new File("src/test/resources/pdfs/encrypted.pdf")
+                .getCanonicalPath(),
+            formatter.format("Preferences:encrypted.pdf:PDF")
+        );
     }
 
     @Test
     void testPathFallBackToGeneratedDir() throws IOException {
-        formatter = new WrapFileLinks(Collections.emptyList(), "src/test/resources/pdfs/");
+        formatter =
+            new WrapFileLinks(
+                Collections.emptyList(),
+                "src/test/resources/pdfs/"
+            );
         formatter.setArgument("\\p");
-        assertEquals(new File("src/test/resources/pdfs/encrypted.pdf").getCanonicalPath(),
-                formatter.format("Preferences:encrypted.pdf:PDF"));
+        assertEquals(
+            new File("src/test/resources/pdfs/encrypted.pdf")
+                .getCanonicalPath(),
+            formatter.format("Preferences:encrypted.pdf:PDF")
+        );
     }
 
     @Test
     void testPathReturnsRelativePathIfNotFound() {
-        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 db4d1b305a6..66a6ce33d33 100644
--- a/src/test/java/org/jabref/logic/msbib/MSBibConverterTest.java
+++ b/src/test/java/org/jabref/logic/msbib/MSBibConverterTest.java
@@ -1,34 +1,49 @@
 package org.jabref.logic.msbib;
 
-import java.util.Optional;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
+import java.util.Optional;
 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"
+        );
 
     private BibEntry entry;
 
@@ -37,6 +52,9 @@ void convert() {
         entry = BIB_ENTRY_TEST;
         MSBibConverter.convert(entry);
 
-        assertEquals(Optional.of("english"), entry.getField(StandardField.LANGUAGE));
+        assertEquals(
+            Optional.of("english"),
+            entry.getField(StandardField.LANGUAGE)
+        );
     }
 }
diff --git a/src/test/java/org/jabref/logic/msbib/MsBibAuthorTest.java b/src/test/java/org/jabref/logic/msbib/MsBibAuthorTest.java
index 3b09b26c7d9..c6387c41d69 100644
--- a/src/test/java/org/jabref/logic/msbib/MsBibAuthorTest.java
+++ b/src/test/java/org/jabref/logic/msbib/MsBibAuthorTest.java
@@ -1,23 +1,34 @@
 package org.jabref.logic.msbib;
 
-import org.jabref.model.entry.Author;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
+import org.jabref.model.entry.Author;
 import org.junit.jupiter.api.Test;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-
 public class MsBibAuthorTest {
 
     @Test
     public void testGetFirstName() {
-        Author author = new Author("Gustav Peter Johann", null, null, "Bach", null);
+        Author author = new Author(
+            "Gustav Peter Johann",
+            null,
+            null,
+            "Bach",
+            null
+        );
         MsBibAuthor msBibAuthor = new MsBibAuthor(author);
         assertEquals("Gustav", msBibAuthor.getFirstName());
     }
 
     @Test
     public void testGetMiddleName() {
-        Author author = new Author("Gustav Peter Johann", null, null, "Bach", null);
+        Author author = new Author(
+            "Gustav Peter Johann",
+            null,
+            null,
+            "Bach",
+            null
+        );
         MsBibAuthor msBibAuthor = new MsBibAuthor(author);
         assertEquals("Peter Johann", msBibAuthor.getMiddleName());
     }
@@ -38,7 +49,13 @@ public void testGetNoFirstName() {
 
     @Test
     public void testGetLastName() {
-        Author author = new Author("Gustav Peter Johann", null, null, "Bach", null);
+        Author author = new Author(
+            "Gustav Peter Johann",
+            null,
+            null,
+            "Bach",
+            null
+        );
         MsBibAuthor msBibAuthor = new MsBibAuthor(author);
         assertEquals("Bach", msBibAuthor.getLastName());
     }
diff --git a/src/test/java/org/jabref/logic/msbib/MsBibMappingTest.java b/src/test/java/org/jabref/logic/msbib/MsBibMappingTest.java
index c5884d8e43b..255b12b3876 100644
--- a/src/test/java/org/jabref/logic/msbib/MsBibMappingTest.java
+++ b/src/test/java/org/jabref/logic/msbib/MsBibMappingTest.java
@@ -1,10 +1,11 @@
 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;
+
 public class MsBibMappingTest {
+
     @Test
     public void testGetLanguage() {
         String lang = MSBibMapping.getLanguage(1609);
diff --git a/src/test/java/org/jabref/logic/net/MimeTypeDetectorTest.java b/src/test/java/org/jabref/logic/net/MimeTypeDetectorTest.java
index ccbe19b005c..16bdfaa3d59 100644
--- a/src/test/java/org/jabref/logic/net/MimeTypeDetectorTest.java
+++ b/src/test/java/org/jabref/logic/net/MimeTypeDetectorTest.java
@@ -1,5 +1,4 @@
 package org.jabref.logic.net;
-
 /*
  import com.github.tomakehurst.wiremock.WireMockServer;
  import org.junit.jupiter.api.AfterEach;
diff --git a/src/test/java/org/jabref/logic/net/ProxyTest.java b/src/test/java/org/jabref/logic/net/ProxyTest.java
index 6b6e844d1b6..d181614b1ca 100644
--- a/src/test/java/org/jabref/logic/net/ProxyTest.java
+++ b/src/test/java/org/jabref/logic/net/ProxyTest.java
@@ -1,42 +1,44 @@
 package org.jabref.logic.net;
 
-import org.junit.jupiter.api.Test;
-
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
+import org.junit.jupiter.api.Test;
+
 public class ProxyTest {
-   /**
-    * The test checks if ProxyPreference class is still able to store password and use it from memory,
-    * even though it's no longer stored in register.
-    */
-   @Test
-   public void testProxyPreferencesStorePassword() {
-       // 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);
+    /**
+     * The test checks if ProxyPreference class is still able to store password and use it from memory,
+     * even though it's no longer stored in register.
+     */
+    @Test
+    public void testProxyPreferencesStorePassword() {
+        // 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
+        );
 
-       // Check if mock data is stored in object memory and can be extracted
-       assertEquals(proxyPref.shouldUseProxy(), true);
-       assertEquals(proxyPref.getHostname(), hostname);
-       assertEquals(proxyPref.getPort(), port);
-       assertEquals(proxyPref.shouldUseAuthentication(), true);
-       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
+        assertEquals(proxyPref.shouldUseProxy(), true);
+        assertEquals(proxyPref.getHostname(), hostname);
+        assertEquals(proxyPref.getPort(), port);
+        assertEquals(proxyPref.shouldUseAuthentication(), true);
+        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 858bf839d35..e049a1212a7 100644
--- a/src/test/java/org/jabref/logic/net/URLDownloadTest.java
+++ b/src/test/java/org/jabref/logic/net/URLDownloadTest.java
@@ -1,44 +1,50 @@
 package org.jabref.logic.net;
 
+import static org.junit.jupiter.api.Assertions.assertInstanceOf;
+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.io.IOException;
 import java.net.MalformedURLException;
 import java.net.URL;
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Path;
-
+import kong.unirest.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 kong.unirest.UnirestException;
 import org.junit.jupiter.api.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import static org.junit.jupiter.api.Assertions.assertInstanceOf;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
-import static org.junit.jupiter.api.Assertions.assertThrows;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-
 @FetcherTest
 public class URLDownloadTest {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(URLDownloadTest.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(
+        URLDownloadTest.class
+    );
 
     @Test
     public void testStringDownloadWithSetEncoding() throws IOException {
         URLDownload dl = new URLDownload(new URL("http://www.google.com"));
 
-        assertTrue(dl.asString().contains("Google"), "google.com should contain google");
+        assertTrue(
+            dl.asString().contains("Google"),
+            "google.com should contain google"
+        );
     }
 
     @Test
     public void testStringDownload() throws IOException {
         URLDownload dl = new URLDownload(new URL("http://www.google.com"));
 
-        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
@@ -64,7 +70,8 @@ public void testDetermineMimeType() throws IOException {
     }
 
     @Test
-    public void downloadToTemporaryFilePathWithoutFileSavesAsTmpFile() throws IOException {
+    public void downloadToTemporaryFilePathWithoutFileSavesAsTmpFile()
+        throws IOException {
         URLDownload google = new URLDownload(new URL("http://www.google.com"));
 
         String path = google.toTemporaryFile().toString();
@@ -73,7 +80,9 @@ public void downloadToTemporaryFilePathWithoutFileSavesAsTmpFile() throws IOExce
 
     @Test
     public void downloadToTemporaryFileKeepsName() throws IOException {
-        URLDownload google = new URLDownload(new URL("https://github.com/JabRef/jabref/blob/main/LICENSE"));
+        URLDownload google = new URLDownload(
+            new URL("https://github.com/JabRef/jabref/blob/main/LICENSE")
+        );
 
         String path = google.toTemporaryFile().toString();
         assertTrue(path.contains("LICENSE"), path);
@@ -82,7 +91,11 @@ public void downloadToTemporaryFileKeepsName() throws IOException {
     @Test
     @DisabledOnCIServer("CI Server is apparently blocked")
     public void downloadOfFTPSucceeds() throws IOException {
-        URLDownload ftp = new URLDownload(new URL("ftp://ftp.informatik.uni-stuttgart.de/pub/library/ncstrl.ustuttgart_fi/INPROC-2016-15/INPROC-2016-15.pdf"));
+        URLDownload ftp = new URLDownload(
+            new URL(
+                "ftp://ftp.informatik.uni-stuttgart.de/pub/library/ncstrl.ustuttgart_fi/INPROC-2016-15/INPROC-2016-15.pdf"
+            )
+        );
 
         Path path = ftp.toTemporaryFile();
         assertNotNull(path);
@@ -113,33 +126,55 @@ public void testCheckConnectionSuccess() throws MalformedURLException {
 
     @Test
     public void testCheckConnectionFail() throws MalformedURLException {
-        URLDownload nonsense = new URLDownload(new URL("http://nonsenseadddress"));
+        URLDownload nonsense = new URLDownload(
+            new URL("http://nonsenseadddress")
+        );
 
         assertThrows(UnirestException.class, nonsense::canBeReached);
     }
 
     @Test
     public void connectTimeoutIsNeverNull() throws MalformedURLException {
-        URLDownload urlDownload = new URLDownload(new URL("http://www.example.com"));
-        assertNotNull(urlDownload.getConnectTimeout(), "there's a non-null default by the constructor");
+        URLDownload urlDownload = new URLDownload(
+            new URL("http://www.example.com")
+        );
+        assertNotNull(
+            urlDownload.getConnectTimeout(),
+            "there's a non-null default by the constructor"
+        );
 
         urlDownload.setConnectTimeout(null);
-        assertNotNull(urlDownload.getConnectTimeout(), "no null value can be set");
+        assertNotNull(
+            urlDownload.getConnectTimeout(),
+            "no null value can be set"
+        );
     }
 
     @Test
-    public void test503ErrorThrowsNestedIOExceptionWithFetcherServerException() throws Exception {
-        URLDownload urlDownload = new URLDownload(new URL("http://httpstat.us/503"));
-
-        Exception exception = assertThrows(IOException.class, urlDownload::asString);
+    public void test503ErrorThrowsNestedIOExceptionWithFetcherServerException()
+        throws Exception {
+        URLDownload urlDownload = new URLDownload(
+            new URL("http://httpstat.us/503")
+        );
+
+        Exception exception = assertThrows(
+            IOException.class,
+            urlDownload::asString
+        );
         assertInstanceOf(FetcherServerException.class, exception.getCause());
     }
 
     @Test
-    public void test429ErrorThrowsNestedIOExceptionWithFetcherServerException() throws Exception {
-        URLDownload urlDownload = new URLDownload(new URL("http://httpstat.us/429"));
-
-        Exception exception = assertThrows(IOException.class, urlDownload::asString);
+    public void test429ErrorThrowsNestedIOExceptionWithFetcherServerException()
+        throws Exception {
+        URLDownload urlDownload = new URLDownload(
+            new URL("http://httpstat.us/429")
+        );
+
+        Exception exception = assertThrows(
+            IOException.class,
+            urlDownload::asString
+        );
         assertInstanceOf(FetcherClientException.class, exception.getCause());
     }
 }
diff --git a/src/test/java/org/jabref/logic/net/URLUtilTest.java b/src/test/java/org/jabref/logic/net/URLUtilTest.java
index d69d7a1df7e..8547ad90299 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
@@ -16,50 +15,110 @@ void cleanGoogleSearchURL() throws Exception {
         assertEquals("", URLUtil.cleanGoogleSearchURL(""));
         assertEquals(" ", URLUtil.cleanGoogleSearchURL(" "));
         // no URL
-        assertEquals("this is no url!", URLUtil.cleanGoogleSearchURL("this is 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"));
+            "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"
+            )
+        );
         // 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"));
+            "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"
+            )
+        );
         // 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"));
+            "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"
+            )
+        );
         // 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"));
+            "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"
+            )
+        );
         // 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"));
+            "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"
+            )
+        );
         // 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"));
+            "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"
+            )
+        );
     }
 
     @Test
@@ -76,6 +135,8 @@ void isURLshouldRejectInvalidURL() {
 
     @Test
     void isURLshouldRejectEmbeddedURL() {
-        assertFalse(URLUtil.isURL("dblp computer science bibliography, http://dblp.org"));
+        assertFalse(
+            URLUtil.isURL("dblp computer science bibliography, http://dblp.org")
+        );
     }
 }
diff --git a/src/test/java/org/jabref/logic/openoffice/style/OOBibStyleTest.java b/src/test/java/org/jabref/logic/openoffice/style/OOBibStyleTest.java
index 0f76f68d714..58f4e37d87e 100644
--- a/src/test/java/org/jabref/logic/openoffice/style/OOBibStyleTest.java
+++ b/src/test/java/org/jabref/logic/openoffice/style/OOBibStyleTest.java
@@ -1,5 +1,11 @@
 package org.jabref.logic.openoffice.style;
 
+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;
@@ -12,7 +18,6 @@
 import java.util.Set;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
-
 import org.jabref.logic.journals.JournalAbbreviationRepository;
 import org.jabref.logic.layout.Layout;
 import org.jabref.logic.layout.LayoutFormatterPreferences;
@@ -26,23 +31,26 @@
 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;
-
 class OOBibStyleTest {
-    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 testAuthorYear() throws IOException {
-        OOBibStyle style = new OOBibStyle(StyleLoader.DEFAULT_AUTHORYEAR_STYLE_PATH, layoutFormatterPreferences, abbreviationRepository);
+        OOBibStyle style = new OOBibStyle(
+            StyleLoader.DEFAULT_AUTHORYEAR_STYLE_PATH,
+            layoutFormatterPreferences,
+            abbreviationRepository
+        );
         assertTrue(style.isValid());
         assertTrue(style.isInternalStyle());
         assertFalse(style.isCitationKeyCiteMarkers());
@@ -55,9 +63,18 @@ void testAuthorYear() throws IOException {
 
     @Test
     void testAuthorYearAsFile() throws URISyntaxException, IOException {
-        Path defFile = Path.of(OOBibStyleTest.class.getResource(StyleLoader.DEFAULT_AUTHORYEAR_STYLE_PATH).toURI());
+        Path defFile = Path.of(
+            OOBibStyleTest.class.getResource(
+                    StyleLoader.DEFAULT_AUTHORYEAR_STYLE_PATH
+                )
+                .toURI()
+        );
 
-        OOBibStyle style = new OOBibStyle(defFile, layoutFormatterPreferences, abbreviationRepository);
+        OOBibStyle style = new OOBibStyle(
+            defFile,
+            layoutFormatterPreferences,
+            abbreviationRepository
+        );
         assertTrue(style.isValid());
         assertFalse(style.isInternalStyle());
         assertFalse(style.isCitationKeyCiteMarkers());
@@ -71,9 +88,10 @@ void testAuthorYearAsFile() throws URISyntaxException, IOException {
     @Test
     void testNumerical() throws IOException {
         OOBibStyle style = new OOBibStyle(
-                StyleLoader.DEFAULT_NUMERICAL_STYLE_PATH,
-                layoutFormatterPreferences,
-                abbreviationRepository);
+            StyleLoader.DEFAULT_NUMERICAL_STYLE_PATH,
+            layoutFormatterPreferences,
+            abbreviationRepository
+        );
         assertTrue(style.isValid());
         assertFalse(style.isCitationKeyCiteMarkers());
         assertFalse(style.isBoldCitations());
@@ -86,73 +104,105 @@ void testNumerical() throws IOException {
     /*
      * begin helpers
      */
-    static String runGetNumCitationMarker2a(OOBibStyle style,
-                                            List<Integer> num, int minGroupingCount, boolean inList) {
-        return OOBibStyleTestHelper.runGetNumCitationMarker2a(style, num, minGroupingCount, inList);
+    static String runGetNumCitationMarker2a(
+        OOBibStyle style,
+        List<Integer> num,
+        int minGroupingCount,
+        boolean inList
+    ) {
+        return OOBibStyleTestHelper.runGetNumCitationMarker2a(
+            style,
+            num,
+            minGroupingCount,
+            inList
+        );
     }
 
-    static CitationMarkerNumericEntry numEntry(String key, int num, String pageInfoOrNull) {
+    static CitationMarkerNumericEntry numEntry(
+        String key,
+        int num,
+        String pageInfoOrNull
+    ) {
         return OOBibStyleTestHelper.numEntry(key, num, pageInfoOrNull);
     }
 
-    static CitationMarkerNumericBibEntry numBibEntry(String key, Optional<Integer> num) {
+    static CitationMarkerNumericBibEntry numBibEntry(
+        String key,
+        Optional<Integer> num
+    ) {
         return OOBibStyleTestHelper.numBibEntry(key, num);
     }
 
-    static String runGetNumCitationMarker2b(OOBibStyle style,
-                                            int minGroupingCount,
-                                            CitationMarkerNumericEntry... s) {
-        List<CitationMarkerNumericEntry> input = Stream.of(s).collect(Collectors.toList());
+    static String runGetNumCitationMarker2b(
+        OOBibStyle 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(OOBibStyle style,
-                                     List<BibEntry> entries,
-                                     Map<BibEntry, BibDatabase> entryDBMap,
-                                     boolean inParenthesis,
-                                     String[] uniquefiers,
-                                     Boolean[] isFirstAppearanceOfSource,
-                                     String[] pageInfo) {
-        return OOBibStyleTestHelper.getCitationMarker2(style,
-                entries,
-                entryDBMap,
-                inParenthesis,
-                uniquefiers,
-                isFirstAppearanceOfSource,
-                pageInfo);
-    }
-
-    static String getCitationMarker2b(OOBibStyle style,
-                                      List<BibEntry> entries,
-                                      Map<BibEntry, BibDatabase> entryDBMap,
-                                      boolean inParenthesis,
-                                      String[] uniquefiers,
-                                      Boolean[] isFirstAppearanceOfSource,
-                                      String[] pageInfo) {
-        return OOBibStyleTestHelper.getCitationMarker2b(style,
-                entries,
-                entryDBMap,
-                inParenthesis,
-                uniquefiers,
-                isFirstAppearanceOfSource,
-                pageInfo);
+    static String getCitationMarker2(
+        OOBibStyle style,
+        List<BibEntry> entries,
+        Map<BibEntry, BibDatabase> entryDBMap,
+        boolean inParenthesis,
+        String[] uniquefiers,
+        Boolean[] isFirstAppearanceOfSource,
+        String[] pageInfo
+    ) {
+        return OOBibStyleTestHelper.getCitationMarker2(
+            style,
+            entries,
+            entryDBMap,
+            inParenthesis,
+            uniquefiers,
+            isFirstAppearanceOfSource,
+            pageInfo
+        );
+    }
+
+    static String getCitationMarker2b(
+        OOBibStyle style,
+        List<BibEntry> entries,
+        Map<BibEntry, BibDatabase> entryDBMap,
+        boolean inParenthesis,
+        String[] uniquefiers,
+        Boolean[] isFirstAppearanceOfSource,
+        String[] pageInfo
+    ) {
+        return OOBibStyleTestHelper.getCitationMarker2b(
+            style,
+            entries,
+            entryDBMap,
+            inParenthesis,
+            uniquefiers,
+            isFirstAppearanceOfSource,
+            pageInfo
+        );
     }
 
     /*
@@ -162,15 +212,28 @@ static String getCitationMarker2b(OOBibStyle style,
     @Test
     void testGetNumCitationMarker() throws IOException {
         OOBibStyle style = new OOBibStyle(
-                StyleLoader.DEFAULT_NUMERICAL_STYLE_PATH,
-                layoutFormatterPreferences,
-                abbreviationRepository);
-        assertEquals("[1] ", runGetNumCitationMarker2a(style, List.of(1), -1, true));
+            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));
-        assertEquals("[1]", runGetNumCitationMarker2b(style, -1, numEntry("key", 1, null)));
+        assertEquals(
+            "[1]",
+            runGetNumCitationMarker2a(style, List.of(1), -1, false)
+        );
+        assertEquals(
+            "[1]",
+            runGetNumCitationMarker2b(style, -1, numEntry("key", 1, null))
+        );
 
-        assertEquals("[1] ", runGetNumCitationMarker2a(style, List.of(1), 0, true));
+        assertEquals(
+            "[1] ",
+            runGetNumCitationMarker2a(style, List.of(1), 0, true)
+        );
 
         CitationMarkerNumericEntry e2 = numEntry("key", 1, "pp. 55-56");
         assertTrue(e2.getPageInfo().isPresent());
@@ -182,64 +245,93 @@ void testGetNumCitationMarker() throws IOException {
     @Test
     void testGetNumCitationMarkerUndefined() throws IOException {
         OOBibStyle style = new OOBibStyle(
-                StyleLoader.DEFAULT_NUMERICAL_STYLE_PATH,
-                layoutFormatterPreferences,
-                abbreviationRepository);
+            StyleLoader.DEFAULT_NUMERICAL_STYLE_PATH,
+            layoutFormatterPreferences,
+            abbreviationRepository
+        );
 
         // unresolved citations look like [??key]
-        assertEquals("[" + OOBibStyle.UNDEFINED_CITATION_MARKER + "key" + "]",
-                runGetNumCitationMarker2b(style, 1,
-                        numEntry("key", 0, null)));
+        assertEquals(
+            "[" + OOBibStyle.UNDEFINED_CITATION_MARKER + "key" + "]",
+            runGetNumCitationMarker2b(style, 1, numEntry("key", 0, null))
+        );
 
         // pageInfo is shown for unresolved citations
-        assertEquals("[" + OOBibStyle.UNDEFINED_CITATION_MARKER + "key" + "; p1]",
-                runGetNumCitationMarker2b(style, 1,
-                        numEntry("key", 0, "p1")));
+        assertEquals(
+            "[" + OOBibStyle.UNDEFINED_CITATION_MARKER + "key" + "; p1]",
+            runGetNumCitationMarker2b(style, 1, numEntry("key", 0, "p1"))
+        );
 
         // unresolved citations sorted to the front
-        assertEquals("[" + OOBibStyle.UNDEFINED_CITATION_MARKER + "key" + "; 2-4]",
-                runGetNumCitationMarker2b(style, 1,
-                        numEntry("x4", 4, ""),
-                        numEntry("x2", 2, ""),
-                        numEntry("x3", 3, ""),
-                        numEntry("key", 0, "")));
-
-        assertEquals("[" + OOBibStyle.UNDEFINED_CITATION_MARKER + "key" + "; 1-3]",
-                runGetNumCitationMarker2b(style, 1,
-                        numEntry("x1", 1, ""),
-                        numEntry("x2", 2, ""),
-                        numEntry("y3", 3, ""),
-                        numEntry("key", 0, "")));
+        assertEquals(
+            "[" + OOBibStyle.UNDEFINED_CITATION_MARKER + "key" + "; 2-4]",
+            runGetNumCitationMarker2b(
+                style,
+                1,
+                numEntry("x4", 4, ""),
+                numEntry("x2", 2, ""),
+                numEntry("x3", 3, ""),
+                numEntry("key", 0, "")
+            )
+        );
+
+        assertEquals(
+            "[" + OOBibStyle.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("["
-                        + OOBibStyle.UNDEFINED_CITATION_MARKER + "x1" + "; "
-                        + OOBibStyle.UNDEFINED_CITATION_MARKER + "x2" + "; "
-                        + OOBibStyle.UNDEFINED_CITATION_MARKER + "x3" + "]",
-                runGetNumCitationMarker2b(style, 1,
-                        numEntry("x1", 0, ""),
-                        numEntry("x2", 0, ""),
-                        numEntry("x3", 0, "")));
+        assertEquals(
+            "[" +
+            OOBibStyle.UNDEFINED_CITATION_MARKER +
+            "x1" +
+            "; " +
+            OOBibStyle.UNDEFINED_CITATION_MARKER +
+            "x2" +
+            "; " +
+            OOBibStyle.UNDEFINED_CITATION_MARKER +
+            "x3" +
+            "]",
+            runGetNumCitationMarker2b(
+                style,
+                1,
+                numEntry("x1", 0, ""),
+                numEntry("x2", 0, ""),
+                numEntry("x3", 0, "")
+            )
+        );
 
         /*
          * BIBLIOGRAPHY
          */
         CitationMarkerNumericBibEntry x = numBibEntry("key", Optional.empty());
-        assertEquals("[" + OOBibStyle.UNDEFINED_CITATION_MARKER + "key" + "] ",
-                style.getNumCitationMarkerForBibliography(x).toString());
+        assertEquals(
+            "[" + OOBibStyle.UNDEFINED_CITATION_MARKER + "key" + "] ",
+            style.getNumCitationMarkerForBibliography(x).toString()
+        );
     }
 
     @Test
     void testGetCitProperty() throws IOException {
         OOBibStyle style = new OOBibStyle(
-                StyleLoader.DEFAULT_NUMERICAL_STYLE_PATH,
-                layoutFormatterPreferences,
-                abbreviationRepository);
+            StyleLoader.DEFAULT_NUMERICAL_STYLE_PATH,
+            layoutFormatterPreferences,
+            abbreviationRepository
+        );
         assertEquals(", ", style.getStringCitProperty("AuthorSeparator"));
 
         // old
         assertEquals(3, style.getIntCitProperty("MaxAuthors"));
-        assertTrue(style.getBooleanCitProperty(OOBibStyle.MULTI_CITE_CHRONOLOGICAL));
+        assertTrue(
+            style.getBooleanCitProperty(OOBibStyle.MULTI_CITE_CHRONOLOGICAL)
+        );
         // new
         assertEquals(3, style.getMaxAuthors());
         assertTrue(style.getMultiCiteChronological());
@@ -253,16 +345,26 @@ void testGetCitProperty() throws IOException {
     @Test
     void testGetCitationMarker() throws IOException {
         OOBibStyle style = new OOBibStyle(
-                StyleLoader.DEFAULT_NUMERICAL_STYLE_PATH,
-                layoutFormatterPreferences,
-                abbreviationRepository);
+            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");
+            .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,61 +375,95 @@ void testGetCitationMarker() 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,
-                        true,
-                        null,
-                        new Boolean[]{true},
-                        null));
+        assertEquals(
+            "[Boström, Wäyrynen, Bodén, Beznosov & Kruchten, 2006]",
+            getCitationMarker2(
+                style,
+                Collections.singletonList(entry),
+                entryDBMap,
+                true,
+                null,
+                new Boolean[] { true },
+                null
+            )
+        );
     }
 
     @Test
     void testLayout() throws IOException {
         OOBibStyle style = new OOBibStyle(
-                StyleLoader.DEFAULT_NUMERICAL_STYLE_PATH,
-                layoutFormatterPreferences,
-                abbreviationRepository);
+            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");
+            .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);
 
         Layout l = style.getReferenceFormat(new UnknownEntryType("default"));
         l.setPostFormatter(new OOPreFormatter());
         assertEquals(
-                "Boström, G.; Wäyrynen, J.; Bodén, M.; Beznosov, K. and Kruchten, P. (<b>2006</b>). <i>Extending XP practices to support security requirements engineering</i>,   : 11-18.",
-                l.doLayout(entry, database));
+            "Boström, G.; Wäyrynen, J.; Bodén, M.; Beznosov, K. and Kruchten, P. (<b>2006</b>). <i>Extending XP practices to support security requirements engineering</i>,   : 11-18.",
+            l.doLayout(entry, database)
+        );
 
         l = style.getReferenceFormat(StandardEntryType.InCollection);
         l.setPostFormatter(new OOPreFormatter());
         assertEquals(
-                "Boström, G.; Wäyrynen, J.; Bodén, M.; Beznosov, K. and Kruchten, P. (<b>2006</b>). <i>Extending XP practices to support security requirements engineering</i>. In:  (Ed.), <i>SESS '06: Proceedings of the 2006 international workshop on Software engineering for secure systems</i>, ACM.",
-                l.doLayout(entry, database));
+            "Boström, G.; Wäyrynen, J.; Bodén, M.; Beznosov, K. and Kruchten, P. (<b>2006</b>). <i>Extending XP practices to support security requirements engineering</i>. In:  (Ed.), <i>SESS '06: Proceedings of the 2006 international workshop on Software engineering for secure systems</i>, ACM.",
+            l.doLayout(entry, database)
+        );
     }
 
     @Test
     void testInstitutionAuthor() throws IOException {
         OOBibStyle style = new OOBibStyle(
-                StyleLoader.DEFAULT_NUMERICAL_STYLE_PATH,
-                layoutFormatterPreferences,
-                abbreviationRepository);
+            StyleLoader.DEFAULT_NUMERICAL_STYLE_PATH,
+            layoutFormatterPreferences,
+            abbreviationRepository
+        );
         BibDatabase database = new BibDatabase();
 
         Layout l = style.getReferenceFormat(StandardEntryType.Article);
@@ -339,16 +475,19 @@ void testInstitutionAuthor() 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>,  .",
-                l.doLayout(entry, database));
+        assertEquals(
+            "<b>JabRef Development Team</b> (<b>2016</b>). <i>JabRef Manual</i>,  .",
+            l.doLayout(entry, database)
+        );
     }
 
     @Test
     void testVonAuthor() throws IOException {
         OOBibStyle style = new OOBibStyle(
-                StyleLoader.DEFAULT_NUMERICAL_STYLE_PATH,
-                layoutFormatterPreferences,
-                abbreviationRepository);
+            StyleLoader.DEFAULT_NUMERICAL_STYLE_PATH,
+            layoutFormatterPreferences,
+            abbreviationRepository
+        );
         BibDatabase database = new BibDatabase();
 
         Layout l = style.getReferenceFormat(StandardEntryType.Article);
@@ -360,16 +499,19 @@ void testVonAuthor() 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>,  .",
-                l.doLayout(entry, database));
+        assertEquals(
+            "<b>von Beta, A.</b> (<b>2016</b>). <i>JabRef Manual</i>,  .",
+            l.doLayout(entry, database)
+        );
     }
 
     @Test
     void testInstitutionAuthorMarker() throws IOException {
         OOBibStyle style = new OOBibStyle(
-                StyleLoader.DEFAULT_NUMERICAL_STYLE_PATH,
-                layoutFormatterPreferences,
-                abbreviationRepository);
+            StyleLoader.DEFAULT_NUMERICAL_STYLE_PATH,
+            layoutFormatterPreferences,
+            abbreviationRepository
+        );
 
         Map<BibEntry, BibDatabase> entryDBMap = new HashMap<>();
         List<BibEntry> entries = new ArrayList<>();
@@ -385,17 +527,27 @@ void testInstitutionAuthorMarker() throws IOException {
         entries.add(entry);
         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 testVonAuthorMarker() throws IOException {
         OOBibStyle style = new OOBibStyle(
-                StyleLoader.DEFAULT_NUMERICAL_STYLE_PATH,
-                layoutFormatterPreferences,
-                abbreviationRepository);
+            StyleLoader.DEFAULT_NUMERICAL_STYLE_PATH,
+            layoutFormatterPreferences,
+            abbreviationRepository
+        );
 
         Map<BibEntry, BibDatabase> entryDBMap = new HashMap<>();
         List<BibEntry> entries = new ArrayList<>();
@@ -410,15 +562,27 @@ void testVonAuthorMarker() 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 testNullAuthorMarker() throws IOException {
         OOBibStyle style = new OOBibStyle(
-                StyleLoader.DEFAULT_NUMERICAL_STYLE_PATH,
-                layoutFormatterPreferences,
-                abbreviationRepository);
+            StyleLoader.DEFAULT_NUMERICAL_STYLE_PATH,
+            layoutFormatterPreferences,
+            abbreviationRepository
+        );
 
         Map<BibEntry, BibDatabase> entryDBMap = new HashMap<>();
         List<BibEntry> entries = new ArrayList<>();
@@ -431,15 +595,27 @@ void testNullAuthorMarker() 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 testNullYearMarker() throws IOException {
         OOBibStyle style = new OOBibStyle(
-                StyleLoader.DEFAULT_NUMERICAL_STYLE_PATH,
-                layoutFormatterPreferences,
-                abbreviationRepository);
+            StyleLoader.DEFAULT_NUMERICAL_STYLE_PATH,
+            layoutFormatterPreferences,
+            abbreviationRepository
+        );
 
         Map<BibEntry, BibDatabase> entryDBMap = new HashMap<>();
         List<BibEntry> entries = new ArrayList<>();
@@ -452,15 +628,27 @@ void testNullYearMarker() 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 testEmptyEntryMarker() throws IOException {
         OOBibStyle style = new OOBibStyle(
-                StyleLoader.DEFAULT_NUMERICAL_STYLE_PATH,
-                layoutFormatterPreferences,
-                abbreviationRepository);
+            StyleLoader.DEFAULT_NUMERICAL_STYLE_PATH,
+            layoutFormatterPreferences,
+            abbreviationRepository
+        );
 
         Map<BibEntry, BibDatabase> entryDBMap = new HashMap<>();
         List<BibEntry> entries = new ArrayList<>();
@@ -472,15 +660,27 @@ void testEmptyEntryMarker() 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 testGetCitationMarkerInParenthesisUniquefiers() throws IOException {
         OOBibStyle style = new OOBibStyle(
-                StyleLoader.DEFAULT_NUMERICAL_STYLE_PATH,
-                layoutFormatterPreferences,
-                abbreviationRepository);
+            StyleLoader.DEFAULT_NUMERICAL_STYLE_PATH,
+            layoutFormatterPreferences,
+            abbreviationRepository
+        );
 
         Map<BibEntry, BibDatabase> entryDBMap = new HashMap<>();
         List<BibEntry> entries = new ArrayList<>();
@@ -510,21 +710,39 @@ void testGetCitationMarkerInParenthesisUniquefiers() throws IOException {
             entryDBMap.put(entry, database);
         }
 
-        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},
-                        null));
+        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 },
+                null
+            )
+        );
     }
 
     @Test
     void testGetCitationMarkerInTextUniquefiers() throws IOException {
         OOBibStyle style = new OOBibStyle(
-                StyleLoader.DEFAULT_NUMERICAL_STYLE_PATH,
-                layoutFormatterPreferences,
-                abbreviationRepository);
+            StyleLoader.DEFAULT_NUMERICAL_STYLE_PATH,
+            layoutFormatterPreferences,
+            abbreviationRepository
+        );
 
         Map<BibEntry, BibDatabase> entryDBMap = new HashMap<>();
         List<BibEntry> entries = new ArrayList<>();
@@ -554,21 +772,40 @@ void testGetCitationMarkerInTextUniquefiers() throws IOException {
             entryDBMap.put(entry, database);
         }
 
-        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},
-                        null));
+        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 },
+                null
+            )
+        );
     }
 
     @Test
-    void testGetCitationMarkerInParenthesisUniquefiersThreeSameAuthor() throws IOException {
+    void testGetCitationMarkerInParenthesisUniquefiersThreeSameAuthor()
+        throws IOException {
         OOBibStyle style = new OOBibStyle(
-                StyleLoader.DEFAULT_NUMERICAL_STYLE_PATH,
-                layoutFormatterPreferences,
-                abbreviationRepository);
+            StyleLoader.DEFAULT_NUMERICAL_STYLE_PATH,
+            layoutFormatterPreferences,
+            abbreviationRepository
+        );
 
         Map<BibEntry, BibDatabase> entryDBMap = new HashMap<>();
         List<BibEntry> entries = new ArrayList<>();
@@ -599,19 +836,28 @@ void testGetCitationMarkerInParenthesisUniquefiersThreeSameAuthor() throws IOExc
             entryDBMap.put(entry, database);
         }
 
-        assertEquals("[Beta, 2000a,b,c]",
-                getCitationMarker2(style, entries, entryDBMap, true,
-                        new String[]{"a", "b", "c"},
-                        new Boolean[]{false, false, false},
-                        null));
+        assertEquals(
+            "[Beta, 2000a,b,c]",
+            getCitationMarker2(
+                style,
+                entries,
+                entryDBMap,
+                true,
+                new String[] { "a", "b", "c" },
+                new Boolean[] { false, false, false },
+                null
+            )
+        );
     }
 
     @Test
-    void testGetCitationMarkerInTextUniquefiersThreeSameAuthor() throws IOException {
+    void testGetCitationMarkerInTextUniquefiersThreeSameAuthor()
+        throws IOException {
         OOBibStyle style = new OOBibStyle(
-                StyleLoader.DEFAULT_NUMERICAL_STYLE_PATH,
-                layoutFormatterPreferences,
-                abbreviationRepository);
+            StyleLoader.DEFAULT_NUMERICAL_STYLE_PATH,
+            layoutFormatterPreferences,
+            abbreviationRepository
+        );
 
         Map<BibEntry, BibDatabase> entryDBMap = new HashMap<>();
         List<BibEntry> entries = new ArrayList<>();
@@ -642,100 +888,137 @@ void testGetCitationMarkerInTextUniquefiersThreeSameAuthor() 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},
-                        null));
+        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 testEquals() throws IOException {
         OOBibStyle style1 = new OOBibStyle(
-                StyleLoader.DEFAULT_NUMERICAL_STYLE_PATH,
-                layoutFormatterPreferences,
-                abbreviationRepository);
+            StyleLoader.DEFAULT_NUMERICAL_STYLE_PATH,
+            layoutFormatterPreferences,
+            abbreviationRepository
+        );
         OOBibStyle style2 = new OOBibStyle(
-                StyleLoader.DEFAULT_NUMERICAL_STYLE_PATH,
-                layoutFormatterPreferences,
-                abbreviationRepository);
+            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 testNotEquals() throws IOException {
         OOBibStyle style1 = new OOBibStyle(
-                StyleLoader.DEFAULT_NUMERICAL_STYLE_PATH,
-                layoutFormatterPreferences,
-                abbreviationRepository);
+            StyleLoader.DEFAULT_NUMERICAL_STYLE_PATH,
+            layoutFormatterPreferences,
+            abbreviationRepository
+        );
         OOBibStyle style2 = new OOBibStyle(
-                StyleLoader.DEFAULT_AUTHORYEAR_STYLE_PATH,
-                layoutFormatterPreferences,
-                abbreviationRepository);
+            StyleLoader.DEFAULT_AUTHORYEAR_STYLE_PATH,
+            layoutFormatterPreferences,
+            abbreviationRepository
+        );
         assertNotEquals(style1, style2);
     }
 
     @Test
     void testCompareToEqual() throws IOException {
         OOBibStyle style1 = new OOBibStyle(
-                StyleLoader.DEFAULT_NUMERICAL_STYLE_PATH,
-                layoutFormatterPreferences,
-                abbreviationRepository);
+            StyleLoader.DEFAULT_NUMERICAL_STYLE_PATH,
+            layoutFormatterPreferences,
+            abbreviationRepository
+        );
         OOBibStyle style2 = new OOBibStyle(
-                StyleLoader.DEFAULT_NUMERICAL_STYLE_PATH,
-                layoutFormatterPreferences,
-                abbreviationRepository);
+            StyleLoader.DEFAULT_NUMERICAL_STYLE_PATH,
+            layoutFormatterPreferences,
+            abbreviationRepository
+        );
         assertEquals(0, style1.compareTo(style2));
     }
 
     @Test
     void testCompareToNotEqual() throws IOException {
         OOBibStyle style1 = new OOBibStyle(
-                StyleLoader.DEFAULT_NUMERICAL_STYLE_PATH,
-                layoutFormatterPreferences,
-                abbreviationRepository);
+            StyleLoader.DEFAULT_NUMERICAL_STYLE_PATH,
+            layoutFormatterPreferences,
+            abbreviationRepository
+        );
         OOBibStyle style2 = new OOBibStyle(
-                StyleLoader.DEFAULT_AUTHORYEAR_STYLE_PATH,
-                layoutFormatterPreferences,
-                abbreviationRepository);
+            StyleLoader.DEFAULT_AUTHORYEAR_STYLE_PATH,
+            layoutFormatterPreferences,
+            abbreviationRepository
+        );
         assertTrue(style1.compareTo(style2) > 0);
         assertFalse(style2.compareTo(style1) > 0);
     }
 
     @Test
     void testEmptyStringPropertyAndOxfordComma() throws Exception {
-        OOBibStyle style = new OOBibStyle("test.jstyle", layoutFormatterPreferences, abbreviationRepository);
+        OOBibStyle style = new OOBibStyle(
+            "test.jstyle",
+            layoutFormatterPreferences,
+            abbreviationRepository
+        );
         Map<BibEntry, BibDatabase> entryDBMap = new HashMap<>();
         List<BibEntry> entries = new ArrayList<>();
         BibDatabase database = new BibDatabase();
 
         BibEntry entry = new BibEntry();
         entry.setType(StandardEntryType.Article);
-        entry.setField(StandardField.AUTHOR, "Alpha von Beta and Gamma Epsilon and Ypsilon Tau");
+        entry.setField(
+            StandardField.AUTHOR,
+            "Alpha von Beta and Gamma Epsilon and Ypsilon Tau"
+        );
         entry.setField(StandardField.TITLE, "JabRef Manual");
         entry.setField(StandardField.YEAR, "2016");
         entry.setCitationKey("a1");
         database.insertEntry(entry);
         entries.add(entry);
         entryDBMap.put(entry, database);
-        assertEquals("von Beta, Epsilon, & Tau, 2016",
-                getCitationMarker2(style, entries, entryDBMap, true, null, null, null));
+        assertEquals(
+            "von Beta, Epsilon, & Tau, 2016",
+            getCitationMarker2(
+                style,
+                entries,
+                entryDBMap,
+                true,
+                null,
+                null,
+                null
+            )
+        );
     }
 
     @Test
     void testIsValidWithDefaultSectionAtTheStart() throws Exception {
-        OOBibStyle style = new OOBibStyle("testWithDefaultAtFirstLIne.jstyle", layoutFormatterPreferences, abbreviationRepository);
+        OOBibStyle style = new OOBibStyle(
+            "testWithDefaultAtFirstLIne.jstyle",
+            layoutFormatterPreferences,
+            abbreviationRepository
+        );
         assertTrue(style.isValid());
     }
 
     @Test
     void testGetCitationMarkerJoinFirst() throws IOException {
         OOBibStyle style = new OOBibStyle(
-                StyleLoader.DEFAULT_NUMERICAL_STYLE_PATH,
-                layoutFormatterPreferences,
-                abbreviationRepository);
+            StyleLoader.DEFAULT_NUMERICAL_STYLE_PATH,
+            layoutFormatterPreferences,
+            abbreviationRepository
+        );
 
         // Question: What should happen if some sources are
         // marked as isFirstAppearanceOfSource?
@@ -743,46 +1026,52 @@ void testGetCitationMarkerJoinFirst() throws IOException {
 
         // 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");
+            .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");
+            .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");
+            .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();
@@ -794,27 +1083,54 @@ void testGetCitationMarkerJoinFirst() 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"
-                            + "; Boström, Wäyrynen, Bodén, Beznosov & NotKruchten, 2006c]",
-                    style.createCitationMarker(citationMarkerEntries,
-                            true,
-                            NonUniqueCitationMarker.THROWS).toString());
-
-            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());
+            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()
+            );
+
+            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()
+            );
         }
 
         // Without pageInfo, only the first is isFirstAppearanceOfSource.
@@ -822,21 +1138,42 @@ void testGetCitationMarkerJoinFirst() 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"
-                            + "; Boström et al., 2006c]",
-                    style.createCitationMarker(citationMarkerEntries,
-                            true,
-                            NonUniqueCitationMarker.THROWS).toString());
+            assertEquals(
+                "[Boström, Wäyrynen, Bodén, Beznosov & Kruchten, 2006a,b" +
+                "; Boström et al., 2006c]",
+                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
@@ -844,22 +1181,43 @@ void testGetCitationMarkerJoinFirst() 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"
-                            + "; Boström, Wäyrynen, Bodén, Beznosov & Kruchten, 2006b"
-                            + "; Boström et al., 2006c]",
-                    style.createCitationMarker(citationMarkerEntries,
-                            true,
-                            NonUniqueCitationMarker.THROWS).toString());
+            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()
+            );
         }
 
         // Without pageInfo, neither is isFirstAppearanceOfSource.
@@ -868,42 +1226,84 @@ void testGetCitationMarkerJoinFirst() 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"
-                            + "; Boström et al., 2006b; p1"
-                            + "; Boström et al., 2006c; p1]",
-                    style.createCitationMarker(citationMarkerEntries,
-                            true,
-                            NonUniqueCitationMarker.THROWS).toString());
+            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()
+            );
         }
 
         // With pageInfo: same entries with identical non-null pageInfo: collapsed.
@@ -911,44 +1311,91 @@ void testGetCitationMarkerJoinFirst() 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"
-                            + "; Boström et al., 2006a; p2"
-                            + "; Boström et al., 2006a]",
-                    style.createCitationMarker(citationMarkerEntries,
-                            true,
-                            NonUniqueCitationMarker.THROWS).toString());
+            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()
+            );
         }
     }
 }
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 06c01c853c4..1947b5fccb2 100644
--- a/src/test/java/org/jabref/logic/openoffice/style/OOBibStyleTestHelper.java
+++ b/src/test/java/org/jabref/logic/openoffice/style/OOBibStyleTestHelper.java
@@ -1,5 +1,7 @@
 package org.jabref.logic.openoffice.style;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
@@ -7,7 +9,6 @@
 import java.util.Optional;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
-
 import org.jabref.model.database.BibDatabase;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.openoffice.ootext.OOText;
@@ -19,26 +20,31 @@
 import org.jabref.model.openoffice.style.NonUniqueCitationMarker;
 import org.jabref.model.openoffice.style.PageInfo;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-
 class OOBibStyleTestHelper {
+
     /*
      * Minimal implementation for CitationMarkerNumericEntry
      */
-    static class CitationMarkerNumericEntryImpl implements CitationMarkerNumericEntry {
+    static class CitationMarkerNumericEntryImpl
+        implements CitationMarkerNumericEntry {
 
         /*
          * 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
+            this.num =
+                num == UNRESOLVED_ENTRY_NUMBER
                     ? Optional.empty()
                     : Optional.of(num);
             this.pageInfo = PageInfo.normalizePageInfo(pageInfo);
@@ -60,11 +66,16 @@ public Optional<OOText> getPageInfo() {
         }
     }
 
-    static class CitationMarkerNumericBibEntryImpl implements CitationMarkerNumericBibEntry {
+    static class CitationMarkerNumericBibEntryImpl
+        implements CitationMarkerNumericBibEntry {
+
         String key;
         Optional<Integer> number;
 
-        public CitationMarkerNumericBibEntryImpl(String key, Optional<Integer> number) {
+        public CitationMarkerNumericBibEntryImpl(
+            String key,
+            Optional<Integer> number
+        ) {
             this.key = key;
             this.number = number;
         }
@@ -80,7 +91,10 @@ public Optional<Integer> getNumber() {
         }
     }
 
-    static CitationMarkerNumericBibEntry numBibEntry(String key, Optional<Integer> number) {
+    static CitationMarkerNumericBibEntry numBibEntry(
+        String key,
+        Optional<Integer> number
+    ) {
         return new CitationMarkerNumericBibEntryImpl(key, number);
     }
 
@@ -89,41 +103,66 @@ static CitationMarkerNumericBibEntry numBibEntry(String key, Optional<Integer> n
      *
      * @param inList true means label for the bibliography
      */
-    static String runGetNumCitationMarker2a(OOBibStyle style,
-                                            List<Integer> num, int minGroupingCount, boolean inList) {
+    static String runGetNumCitationMarker2a(
+        OOBibStyle 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.get(0);
             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());
-            return style.getNumCitationMarker2(input, minGroupingCount).toString();
+            List<CitationMarkerNumericEntry> input = num
+                .stream()
+                .map(n ->
+                    new CitationMarkerNumericEntryImpl(
+                        "key" + n,
+                        n,
+                        Optional.empty()
+                    )
+                )
+                .collect(Collectors.toList());
+            return style
+                .getNumCitationMarker2(input, minGroupingCount)
+                .toString();
         }
     }
 
     /*
      * Unlike getNumCitationMarker, getNumCitationMarker2 can handle pageInfo.
      */
-    static CitationMarkerNumericEntry numEntry(String key, int num, String pageInfoOrNull) {
-        Optional<OOText> pageInfo = Optional.ofNullable(OOText.fromString(pageInfoOrNull));
+    static CitationMarkerNumericEntry numEntry(
+        String key,
+        int num,
+        String pageInfoOrNull
+    ) {
+        Optional<OOText> pageInfo = Optional.ofNullable(
+            OOText.fromString(pageInfoOrNull)
+        );
         return new CitationMarkerNumericEntryImpl(key, num, pageInfo);
     }
 
-    static String runGetNumCitationMarker2b(OOBibStyle style,
-                                            int minGroupingCount,
-                                            CitationMarkerNumericEntry... s) {
-        List<CitationMarkerNumericEntry> input = Stream.of(s).collect(Collectors.toList());
+    static String runGetNumCitationMarker2b(
+        OOBibStyle style,
+        int minGroupingCount,
+        CitationMarkerNumericEntry... s
+    ) {
+        List<CitationMarkerNumericEntry> input = Stream
+            .of(s)
+            .collect(Collectors.toList());
         OOText res = style.getNumCitationMarker2(input, minGroupingCount);
         return res.toString();
     }
@@ -135,19 +174,27 @@ static String runGetNumCitationMarker2b(OOBibStyle 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");
+            throw new IllegalArgumentException(
+                "entry.getCitationKey() is empty"
+            );
         }
         String citationKey = entry.getCitationKey().get();
         Citation result = new Citation(citationKey);
-        result.setLookupResult(Optional.of(new CitationLookupResult(entry, database)));
+        result.setLookupResult(
+            Optional.of(new CitationLookupResult(entry, database))
+        );
         result.setUniqueLetter(Optional.ofNullable(uniqueLetterQ));
-        Optional<OOText> pageInfo = Optional.ofNullable(OOText.fromString(pageInfoQ));
+        Optional<OOText> pageInfo = Optional.ofNullable(
+            OOText.fromString(pageInfoQ)
+        );
         result.setPageInfo(PageInfo.normalizePageInfo(pageInfo));
         result.setIsFirstAppearanceOfSource(isFirstAppearanceOfSource);
         return result;
@@ -157,14 +204,16 @@ static CitationMarkerEntry makeCitationMarkerEntry(BibEntry entry,
      * Similar to old API. pageInfo is new, and unlimAuthors is
      * replaced with isFirstAppearanceOfSource
      */
-    static String getCitationMarker2ab(OOBibStyle style,
-                                       List<BibEntry> entries,
-                                       Map<BibEntry, BibDatabase> entryDBMap,
-                                       boolean inParenthesis,
-                                       String[] uniquefiers,
-                                       Boolean[] isFirstAppearanceOfSource,
-                                       String[] pageInfo,
-                                       NonUniqueCitationMarker nonunique) {
+    static String getCitationMarker2ab(
+        OOBibStyle 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,50 +229,64 @@ static String getCitationMarker2ab(OOBibStyle style,
         List<CitationMarkerEntry> citationMarkerEntries = new ArrayList<>();
         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,
+        return style
+            .createCitationMarker(
+                citationMarkerEntries,
                 inParenthesis,
-                nonunique).toString();
+                nonunique
+            )
+            .toString();
     }
 
-    static String getCitationMarker2(OOBibStyle style,
-                                     List<BibEntry> entries,
-                                     Map<BibEntry, BibDatabase> entryDBMap,
-                                     boolean inParenthesis,
-                                     String[] uniquefiers,
-                                     Boolean[] isFirstAppearanceOfSource,
-                                     String[] pageInfo) {
-        return getCitationMarker2ab(style,
-                entries,
-                entryDBMap,
-                inParenthesis,
-                uniquefiers,
-                isFirstAppearanceOfSource,
-                pageInfo,
-                NonUniqueCitationMarker.THROWS);
+    static String getCitationMarker2(
+        OOBibStyle style,
+        List<BibEntry> entries,
+        Map<BibEntry, BibDatabase> entryDBMap,
+        boolean inParenthesis,
+        String[] uniquefiers,
+        Boolean[] isFirstAppearanceOfSource,
+        String[] pageInfo
+    ) {
+        return getCitationMarker2ab(
+            style,
+            entries,
+            entryDBMap,
+            inParenthesis,
+            uniquefiers,
+            isFirstAppearanceOfSource,
+            pageInfo,
+            NonUniqueCitationMarker.THROWS
+        );
     }
 
-    static String getCitationMarker2b(OOBibStyle style,
-                                      List<BibEntry> entries,
-                                      Map<BibEntry, BibDatabase> entryDBMap,
-                                      boolean inParenthesis,
-                                      String[] uniquefiers,
-                                      Boolean[] isFirstAppearanceOfSource,
-                                      String[] pageInfo) {
-        return getCitationMarker2ab(style,
-                entries,
-                entryDBMap,
-                inParenthesis,
-                uniquefiers,
-                isFirstAppearanceOfSource,
-                pageInfo,
-                NonUniqueCitationMarker.FORGIVEN);
+    static String getCitationMarker2b(
+        OOBibStyle style,
+        List<BibEntry> entries,
+        Map<BibEntry, BibDatabase> entryDBMap,
+        boolean inParenthesis,
+        String[] uniquefiers,
+        Boolean[] isFirstAppearanceOfSource,
+        String[] pageInfo
+    ) {
+        return getCitationMarker2ab(
+            style,
+            entries,
+            entryDBMap,
+            inParenthesis,
+            uniquefiers,
+            isFirstAppearanceOfSource,
+            pageInfo,
+            NonUniqueCitationMarker.FORGIVEN
+        );
     }
 
     /*
@@ -232,134 +295,234 @@ static String getCitationMarker2b(OOBibStyle style,
 
     static void testGetNumCitationMarkerExtra(OOBibStyle style) {
         // Identical numeric entries are joined.
-        assertEquals("[1; 2]", runGetNumCitationMarker2b(style, 3,
+        assertEquals(
+            "[1; 2]",
+            runGetNumCitationMarker2b(
+                style,
+                3,
                 numEntry("x1", 1, null),
                 numEntry("x2", 2, null),
                 numEntry("x1", 2, null),
-                numEntry("x2", 1, null)));
+                numEntry("x2", 1, null)
+            )
+        );
 
         // ... unless minGroupingCount <= 0
-        assertEquals("[1; 1; 2; 2]", runGetNumCitationMarker2b(style, 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)));
+                numEntry("x2", 1, null)
+            )
+        );
 
         // ... or have different pageInfos
-        assertEquals("[1; p1a; 1; p1b; 2; p2; 3]", runGetNumCitationMarker2b(style, 1,
+        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)));
+                numEntry("x3", 3, null)
+            )
+        );
 
         // Consecutive numbers can become a range ...
-        assertEquals("[1-3]", runGetNumCitationMarker2b(style, 1,
+        assertEquals(
+            "[1-3]",
+            runGetNumCitationMarker2b(
+                style,
+                1,
                 numEntry("x1", 1, null),
                 numEntry("x2", 2, null),
-                numEntry("x3", 3, null)));
+                numEntry("x3", 3, null)
+            )
+        );
 
         // ... unless minGroupingCount is too high
-        assertEquals("[1; 2; 3]", runGetNumCitationMarker2b(style, 4,
+        assertEquals(
+            "[1; 2; 3]",
+            runGetNumCitationMarker2b(
+                style,
+                4,
                 numEntry("x1", 1, null),
                 numEntry("x2", 2, null),
-                numEntry("x3", 3, null)));
+                numEntry("x3", 3, null)
+            )
+        );
 
         // ... or if minGroupingCount <= 0
-        assertEquals("[1; 2; 3]", runGetNumCitationMarker2b(style, 0,
+        assertEquals(
+            "[1; 2; 3]",
+            runGetNumCitationMarker2b(
+                style,
+                0,
                 numEntry("x1", 1, null),
                 numEntry("x2", 2, null),
-                numEntry("x3", 3, null)));
+                numEntry("x3", 3, null)
+            )
+        );
 
         // ... a pageInfo needs to be emitted
-        assertEquals("[1; p1; 2-3]", runGetNumCitationMarker2b(style, 1,
+        assertEquals(
+            "[1; p1; 2-3]",
+            runGetNumCitationMarker2b(
+                style,
+                1,
                 numEntry("x1", 1, "p1"),
                 numEntry("x2", 2, null),
-                numEntry("x3", 3, 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,
+        assertEquals(
+            "[1]",
+            runGetNumCitationMarker2b(
+                style,
+                1,
                 numEntry("x1", 1, ""),
                 numEntry("x1", 1, null),
-                numEntry("x1", 1, "  ")));
+                numEntry("x1", 1, "  ")
+            )
+        );
 
         // pageInfos are trimmed
-        assertEquals("[1; p1]", runGetNumCitationMarker2b(style, 1,
+        assertEquals(
+            "[1; p1]",
+            runGetNumCitationMarker2b(
+                style,
+                1,
                 numEntry("x1", 1, "p1"),
                 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,
+        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)));
+                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,
-                        numEntry("x12", 12, "px"),
-                        numEntry("x7", 7, "p7"),
-                        numEntry("x3", 3, "p3"),
-                        numEntry("x4", 4, "p4"),
-                        numEntry("x11", 11, "px"),
-                        numEntry("x10", 10, "px"),
-                        numEntry("x5", 5, "p5")));
+        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"),
+                numEntry("x4", 4, "p4"),
+                numEntry("x11", 11, "px"),
+                numEntry("x10", 10, "px"),
+                numEntry("x5", 5, "p5")
+            )
+        );
 
         // pageInfo sorting (for the same number)
-        assertEquals("[1; 1; a; 1; b]",
-                runGetNumCitationMarker2b(style, 1,
-                        numEntry("x1", 1, ""),
-                        numEntry("x1", 1, "b"),
-                        numEntry("x1", 1, "a")));
+        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,
-                        numEntry("x1", 1, "p20"),
-                        numEntry("x1", 1, "p9"),
-                        numEntry("x1", 1, "p100")));
-
-        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,
-                        numEntry("x1", 1, null),
-                        numEntry("x2", 2, null),
-                        numEntry("x3", 3, null)));
-
-        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,
-                        numEntry("x1", 1, null),
-                        numEntry("x12", 12, null),
-                        numEntry("x3", 3, null)));
-
-        assertEquals("[3-5; 7; 10-12]",
-                runGetNumCitationMarker2b(style, 1,
-                        numEntry("x12", 12, ""),
-                        numEntry("x7", 7, ""),
-                        numEntry("x3", 3, ""),
-                        numEntry("x4", 4, ""),
-                        numEntry("x11", 11, ""),
-                        numEntry("x10", 10, ""),
-                        numEntry("x5", 5, "")));
+        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,
+                numEntry("x1", 1, null),
+                numEntry("x2", 2, null),
+                numEntry("x3", 3, null)
+            )
+        );
+
+        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,
+                numEntry("x1", 1, null),
+                numEntry("x2", 2, null),
+                numEntry("x3", 3, null)
+            )
+        );
+
+        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,
+                numEntry("x12", 12, ""),
+                numEntry("x7", 7, ""),
+                numEntry("x3", 3, ""),
+                numEntry("x4", 4, ""),
+                numEntry("x11", 11, ""),
+                numEntry("x10", 10, ""),
+                numEntry("x5", 5, "")
+            )
+        );
     }
 }
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 0478089a8dc..8a371b9b753 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;
+
 public class OOPreFormatterTest {
 
     @Test
@@ -50,15 +50,36 @@ public void testFormatStripLatexCommands() {
 
     @Test
     public void testFormatting() {
-        assertEquals("<i>kkk</i>", new OOPreFormatter().format("\\textit{kkk}"));
+        assertEquals(
+            "<i>kkk</i>",
+            new OOPreFormatter().format("\\textit{kkk}")
+        );
         assertEquals("<i>kkk</i>", new OOPreFormatter().format("{\\it kkk}"));
         assertEquals("<i>kkk</i>", new OOPreFormatter().format("\\emph{kkk}"));
-        assertEquals("<b>kkk</b>", new OOPreFormatter().format("\\textbf{kkk}"));
-        assertEquals("<smallcaps>kkk</smallcaps>", new OOPreFormatter().format("\\textsc{kkk}"));
+        assertEquals(
+            "<b>kkk</b>",
+            new OOPreFormatter().format("\\textbf{kkk}")
+        );
+        assertEquals(
+            "<smallcaps>kkk</smallcaps>",
+            new OOPreFormatter().format("\\textsc{kkk}")
+        );
         assertEquals("<s>kkk</s>", new OOPreFormatter().format("\\sout{kkk}"));
-        assertEquals("<u>kkk</u>", new OOPreFormatter().format("\\underline{kkk}"));
-        assertEquals("<tt>kkk</tt>", new OOPreFormatter().format("\\texttt{kkk}"));
-        assertEquals("<sup>kkk</sup>", new OOPreFormatter().format("\\textsuperscript{kkk}"));
-        assertEquals("<sub>kkk</sub>", new OOPreFormatter().format("\\textsubscript{kkk}"));
+        assertEquals(
+            "<u>kkk</u>",
+            new OOPreFormatter().format("\\underline{kkk}")
+        );
+        assertEquals(
+            "<tt>kkk</tt>",
+            new OOPreFormatter().format("\\texttt{kkk}")
+        );
+        assertEquals(
+            "<sup>kkk</sup>",
+            new OOPreFormatter().format("\\textsuperscript{kkk}")
+        );
+        assertEquals(
+            "<sub>kkk</sub>",
+            new OOPreFormatter().format("\\textsubscript{kkk}")
+        );
     }
 }
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 38d8a359615..6e8a4e74570 100644
--- a/src/test/java/org/jabref/logic/openoffice/style/StyleLoaderTest.java
+++ b/src/test/java/org/jabref/logic/openoffice/style/StyleLoaderTest.java
@@ -1,28 +1,25 @@
 package org.jabref.logic.openoffice.style;
 
+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;
-
 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;
-
 public class StyleLoaderTest {
 
     private static final int NUMBER_OF_INTERNAL_STYLES = 2;
@@ -34,30 +31,64 @@ public class StyleLoaderTest {
 
     @BeforeEach
     public void setUp() {
-        preferences = mock(OpenOfficePreferences.class, Answers.RETURNS_DEEP_STUBS);
-        layoutPreferences = mock(LayoutFormatterPreferences.class, Answers.RETURNS_DEEP_STUBS);
+        preferences =
+            mock(OpenOfficePreferences.class, Answers.RETURNS_DEEP_STUBS);
+        layoutPreferences =
+            mock(LayoutFormatterPreferences.class, Answers.RETURNS_DEEP_STUBS);
         abbreviationRepository = mock(JournalAbbreviationRepository.class);
     }
 
     @Test
     public void throwNPEWithNullPreferences() {
-        assertThrows(NullPointerException.class, () -> loader = new StyleLoader(null, layoutPreferences, abbreviationRepository));
+        assertThrows(
+            NullPointerException.class,
+            () ->
+                loader =
+                    new StyleLoader(
+                        null,
+                        layoutPreferences,
+                        abbreviationRepository
+                    )
+        );
     }
 
     @Test
     public 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
     public 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
     public void testGetStylesWithEmptyExternal() {
         preferences.setExternalStyles(Collections.emptyList());
-        loader = new StyleLoader(preferences, layoutPreferences, abbreviationRepository);
+        loader =
+            new StyleLoader(
+                preferences,
+                layoutPreferences,
+                abbreviationRepository
+            );
 
         assertEquals(2, loader.getStyles().size());
     }
@@ -65,10 +96,22 @@ public void testGetStylesWithEmptyExternal() {
     @Test
     public void testAddStyleLeadsToOneMoreStyle() 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();
+        loader =
+            new StyleLoader(
+                preferences,
+                layoutPreferences,
+                abbreviationRepository
+            );
+
+        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());
     }
@@ -76,36 +119,79 @@ public void testAddStyleLeadsToOneMoreStyle() throws URISyntaxException {
     @Test
     public void testAddInvalidStyleLeadsToNoMoreStyle() {
         preferences.setExternalStyles(Collections.emptyList());
-        loader = new StyleLoader(preferences, layoutPreferences, abbreviationRepository);
+        loader =
+            new StyleLoader(
+                preferences,
+                layoutPreferences,
+                abbreviationRepository
+            );
         int beforeAdding = loader.getStyles().size();
-        loader.addStyleIfValid("DefinitelyNotAValidFileNameOrWeAreExtremelyUnlucky");
+        loader.addStyleIfValid(
+            "DefinitelyNotAValidFileNameOrWeAreExtremelyUnlucky"
+        );
         assertEquals(beforeAdding, loader.getStyles().size());
     }
 
     @Test
     public void testInitalizeWithOneExternalFile() throws URISyntaxException {
-        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);
+        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
     public void testInitalizeWithIncorrectExternalFile() {
-        preferences.setExternalStyles(Collections.singletonList("DefinitelyNotAValidFileNameOrWeAreExtremelyUnlucky"));
-
-        loader = new StyleLoader(preferences, layoutPreferences, abbreviationRepository);
+        preferences.setExternalStyles(
+            Collections.singletonList(
+                "DefinitelyNotAValidFileNameOrWeAreExtremelyUnlucky"
+            )
+        );
+
+        loader =
+            new StyleLoader(
+                preferences,
+                layoutPreferences,
+                abbreviationRepository
+            );
         assertEquals(NUMBER_OF_INTERNAL_STYLES, loader.getStyles().size());
     }
 
     @Test
-    public void testInitalizeWithOneExternalFileRemoveStyle() throws URISyntaxException {
-        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);
+    public void testInitalizeWithOneExternalFileRemoveStyle()
+        throws URISyntaxException {
+        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<OOBibStyle> toremove = new ArrayList<>();
         int beforeRemoving = loader.getStyles().size();
         for (OOBibStyle style : loader.getStyles()) {
@@ -121,12 +207,26 @@ public void testInitalizeWithOneExternalFileRemoveStyle() throws URISyntaxExcept
     }
 
     @Test
-    public void testInitalizeWithOneExternalFileRemoveStyleUpdatesPreferences() throws URISyntaxException {
-        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);
+    public void testInitalizeWithOneExternalFileRemoveStyleUpdatesPreferences()
+        throws URISyntaxException {
+        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<OOBibStyle> toremove = new ArrayList<>();
         for (OOBibStyle style : loader.getStyles()) {
             if (!style.isInternalStyle()) {
@@ -142,12 +242,25 @@ public void testInitalizeWithOneExternalFileRemoveStyleUpdatesPreferences() thro
     }
 
     @Test
-    public void testAddSameStyleTwiceLeadsToOneMoreStyle() throws URISyntaxException {
+    public void testAddSameStyleTwiceLeadsToOneMoreStyle()
+        throws URISyntaxException {
         preferences.setExternalStyles(Collections.emptyList());
-        loader = new StyleLoader(preferences, layoutPreferences, abbreviationRepository);
+        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());
@@ -155,45 +268,88 @@ public void testAddSameStyleTwiceLeadsToOneMoreStyle() throws URISyntaxException
 
     @Test
     public void testAddNullStyleThrowsNPE() {
-        loader = new StyleLoader(preferences, layoutPreferences, abbreviationRepository);
-        assertThrows(NullPointerException.class, () -> loader.addStyleIfValid(null));
+        loader =
+            new StyleLoader(
+                preferences,
+                layoutPreferences,
+                abbreviationRepository
+            );
+        assertThrows(
+            NullPointerException.class,
+            () -> loader.addStyleIfValid(null)
+        );
     }
 
     @Test
     public void testGetDefaultUsedStyleWhenEmpty() {
-        when(preferences.getCurrentStyle()).thenReturn(StyleLoader.DEFAULT_AUTHORYEAR_STYLE_PATH);
+        when(preferences.getCurrentStyle())
+            .thenReturn(StyleLoader.DEFAULT_AUTHORYEAR_STYLE_PATH);
         preferences.clearCurrentStyle();
-        loader = new StyleLoader(preferences, layoutPreferences, abbreviationRepository);
+        loader =
+            new StyleLoader(
+                preferences,
+                layoutPreferences,
+                abbreviationRepository
+            );
         OOBibStyle style = loader.getUsedStyle();
         assertTrue(style.isValid());
-        assertEquals(StyleLoader.DEFAULT_AUTHORYEAR_STYLE_PATH, style.getPath());
-        assertEquals(StyleLoader.DEFAULT_AUTHORYEAR_STYLE_PATH, preferences.getCurrentStyle());
+        assertEquals(
+            StyleLoader.DEFAULT_AUTHORYEAR_STYLE_PATH,
+            style.getPath()
+        );
+        assertEquals(
+            StyleLoader.DEFAULT_AUTHORYEAR_STYLE_PATH,
+            preferences.getCurrentStyle()
+        );
     }
 
     @Test
     public void testGetStoredUsedStyle() {
-        when(preferences.getCurrentStyle()).thenReturn(StyleLoader.DEFAULT_NUMERICAL_STYLE_PATH);
-        loader = new StyleLoader(preferences, layoutPreferences, abbreviationRepository);
+        when(preferences.getCurrentStyle())
+            .thenReturn(StyleLoader.DEFAULT_NUMERICAL_STYLE_PATH);
+        loader =
+            new StyleLoader(
+                preferences,
+                layoutPreferences,
+                abbreviationRepository
+            );
         OOBibStyle style = loader.getUsedStyle();
         assertTrue(style.isValid());
         assertEquals(StyleLoader.DEFAULT_NUMERICAL_STYLE_PATH, style.getPath());
-        assertEquals(StyleLoader.DEFAULT_NUMERICAL_STYLE_PATH, preferences.getCurrentStyle());
+        assertEquals(
+            StyleLoader.DEFAULT_NUMERICAL_STYLE_PATH,
+            preferences.getCurrentStyle()
+        );
     }
 
     @Test
     public void testGetDefaultUsedStyleWhenIncorrect() {
-        when(preferences.getCurrentStyle()).thenReturn("ljlkjlkjnljnvdlsjniuhwelfhuewfhlkuewhfuwhelu");
-        loader = new StyleLoader(preferences, layoutPreferences, abbreviationRepository);
+        when(preferences.getCurrentStyle())
+            .thenReturn("ljlkjlkjnljnvdlsjniuhwelfhuewfhlkuewhfuwhelu");
+        loader =
+            new StyleLoader(
+                preferences,
+                layoutPreferences,
+                abbreviationRepository
+            );
         OOBibStyle style = loader.getUsedStyle();
         assertTrue(style.isValid());
-        assertEquals(StyleLoader.DEFAULT_AUTHORYEAR_STYLE_PATH, style.getPath());
+        assertEquals(
+            StyleLoader.DEFAULT_AUTHORYEAR_STYLE_PATH,
+            style.getPath()
+        );
     }
 
     @Test
     public void testRemoveInternalStyleReturnsFalseAndDoNotRemove() {
         preferences.setExternalStyles(Collections.emptyList());
 
-        loader = new StyleLoader(preferences, layoutPreferences, abbreviationRepository);
+        loader =
+            new StyleLoader(
+                preferences,
+                layoutPreferences,
+                abbreviationRepository
+            );
         List<OOBibStyle> toremove = new ArrayList<>();
         for (OOBibStyle style : loader.getStyles()) {
             if (style.isInternalStyle()) {
diff --git a/src/test/java/org/jabref/logic/pdf/EntryAnnotationImporterTest.java b/src/test/java/org/jabref/logic/pdf/EntryAnnotationImporterTest.java
index d48982b4f53..fd00336cad4 100644
--- a/src/test/java/org/jabref/logic/pdf/EntryAnnotationImporterTest.java
+++ b/src/test/java/org/jabref/logic/pdf/EntryAnnotationImporterTest.java
@@ -1,43 +1,51 @@
 package org.jabref.logic.pdf;
 
+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;
-
 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.jabref.preferences.FilePreferences;
-
 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;
-
 public class EntryAnnotationImporterTest {
 
-    private final BibDatabaseContext databaseContext = mock(BibDatabaseContext.class);
+    private final BibDatabaseContext databaseContext = mock(
+        BibDatabaseContext.class
+    );
     private BibEntry entry;
 
     @BeforeEach
     public 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
     public void readEntryExampleThesis() {
         // given
         entry.setField(StandardField.FILE, ":thesis-example.pdf:PDF");
-        EntryAnnotationImporter entryAnnotationImporter = new EntryAnnotationImporter(entry);
+        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 7606bed8caf..92781cd9c12 100644
--- a/src/test/java/org/jabref/logic/pdf/PdfAnnotationImporterTest.java
+++ b/src/test/java/org/jabref/logic/pdf/PdfAnnotationImporterTest.java
@@ -1,146 +1,304 @@
 package org.jabref.logic.pdf;
 
+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;
-
 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;
-
 public class PdfAnnotationImporterTest {
 
     private final AnnotationImporter importer = new PdfAnnotationImporter();
 
     @Test
     public 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
     public 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
     public 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
     public 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
     public 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
     public 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
     public 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
     public 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
     public 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),
-                importer.importAnnotations(Path.of("src/test/resources/pdfs/minimal-popup.pdf")));
+        assertEquals(
+            Collections.singletonList(expected),
+            importer.importAnnotations(
+                Path.of("src/test/resources/pdfs/minimal-popup.pdf")
+            )
+        );
     }
 
     @Test
     public 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
     public 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
     public 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
     public 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
     public 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
     public 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
     public 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),
-                importer.importAnnotations(Path.of("src/test/resources/pdfs/minimal-polygon.pdf")));
+        assertEquals(
+            Collections.singletonList(expected),
+            importer.importAnnotations(
+                Path.of("src/test/resources/pdfs/minimal-polygon.pdf")
+            )
+        );
     }
 }
-
diff --git a/src/test/java/org/jabref/logic/pdf/search/indexing/DocumentReaderTest.java b/src/test/java/org/jabref/logic/pdf/search/indexing/DocumentReaderTest.java
index 982504c9938..dcaec3d701c 100644
--- a/src/test/java/org/jabref/logic/pdf/search/indexing/DocumentReaderTest.java
+++ b/src/test/java/org/jabref/logic/pdf/search/indexing/DocumentReaderTest.java
@@ -1,17 +1,19 @@
 package org.jabref.logic.pdf.search.indexing;
 
+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;
 import java.util.Optional;
 import java.util.stream.Stream;
-
+import org.apache.lucene.document.Document;
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.LinkedFile;
 import org.jabref.preferences.FilePreferences;
-
-import org.apache.lucene.document.Document;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.params.ParameterizedTest;
@@ -19,10 +21,6 @@
 import org.junit.jupiter.params.provider.MethodSource;
 import org.mockito.Mockito;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
-
 public class DocumentReaderTest {
 
     private BibDatabaseContext databaseContext;
@@ -31,21 +29,34 @@ public class DocumentReaderTest {
     @BeforeEach
     public void setup() {
         this.databaseContext = mock(BibDatabaseContext.class);
-        when(databaseContext.getFileDirectories(Mockito.any())).thenReturn(Collections.singletonList(Path.of("src/test/resources/pdfs")));
+        when(databaseContext.getFileDirectories(Mockito.any()))
+            .thenReturn(
+                Collections.singletonList(Path.of("src/test/resources/pdfs"))
+            );
         this.filePreferences = mock(FilePreferences.class);
         when(filePreferences.getUserAndHost()).thenReturn("testuser-testhost");
-        when(filePreferences.getMainFileDirectory()).thenReturn(Optional.empty());
-        when(filePreferences.shouldStoreFilesRelativeToBibFile()).thenReturn(true);
+        when(filePreferences.getMainFileDirectory())
+            .thenReturn(Optional.empty());
+        when(filePreferences.shouldStoreFilesRelativeToBibFile())
+            .thenReturn(true);
     }
 
     @Test
     public void unknownFileTestShouldReturnEmptyList() {
         // given
         BibEntry entry = new BibEntry();
-        entry.setFiles(Collections.singletonList(new LinkedFile("Wrong path", "NOT_PRESENT.pdf", "Type")));
+        entry.setFiles(
+            Collections.singletonList(
+                new LinkedFile("Wrong path", "NOT_PRESENT.pdf", "Type")
+            )
+        );
 
         // when
-        final List<Document> emptyDocumentList = new DocumentReader(entry, filePreferences).readLinkedPdfs(databaseContext);
+        final List<Document> emptyDocumentList = new DocumentReader(
+            entry,
+            filePreferences
+        )
+            .readLinkedPdfs(databaseContext);
 
         // then
         assertEquals(Collections.emptyList(), emptyDocumentList);
@@ -53,10 +64,19 @@ public void unknownFileTestShouldReturnEmptyList() {
 
     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("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(
+                "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(
+                "Longer texts often have both.",
+                "Longer te-\nxts often\nhave both."
+            ),
+            Arguments.of("No lines to break here", "No lines to break here")
         );
     }
 
diff --git a/src/test/java/org/jabref/logic/pdf/search/indexing/PdfIndexerTest.java b/src/test/java/org/jabref/logic/pdf/search/indexing/PdfIndexerTest.java
index 629bb293778..e83365a1d26 100644
--- a/src/test/java/org/jabref/logic/pdf/search/indexing/PdfIndexerTest.java
+++ b/src/test/java/org/jabref/logic/pdf/search/indexing/PdfIndexerTest.java
@@ -1,10 +1,16 @@
 package org.jabref.logic.pdf.search.indexing;
 
+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.Optional;
-
+import org.apache.lucene.index.DirectoryReader;
+import org.apache.lucene.index.IndexReader;
+import org.apache.lucene.store.NIOFSDirectory;
 import org.jabref.logic.util.StandardFileType;
 import org.jabref.model.database.BibDatabase;
 import org.jabref.model.database.BibDatabaseContext;
@@ -12,19 +18,11 @@
 import org.jabref.model.entry.LinkedFile;
 import org.jabref.model.entry.types.StandardEntryType;
 import org.jabref.preferences.FilePreferences;
-
-import org.apache.lucene.index.DirectoryReader;
-import org.apache.lucene.index.IndexReader;
-import org.apache.lucene.store.NIOFSDirectory;
 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;
-
 public class PdfIndexerTest {
 
     private PdfIndexer indexer;
@@ -37,8 +35,12 @@ public void setUp(@TempDir Path indexDir) throws IOException {
         this.database = new BibDatabase();
 
         this.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);
         when(context.getDatabase()).thenReturn(database);
         when(context.getEntries()).thenReturn(database.getEntries());
@@ -49,7 +51,15 @@ public void setUp(@TempDir Path indexDir) throws IOException {
     public 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()
+                )
+            )
+        );
         database.insertEntry(entry);
 
         // when
@@ -57,7 +67,11 @@ public void exampleThesisIndex() throws IOException {
         indexer.addToIndex(context);
 
         // then
-        try (IndexReader reader = DirectoryReader.open(new NIOFSDirectory(context.getFulltextIndexPath()))) {
+        try (
+            IndexReader reader = DirectoryReader.open(
+                new NIOFSDirectory(context.getFulltextIndexPath())
+            )
+        ) {
             assertEquals(33, reader.numDocs());
         }
     }
@@ -66,7 +80,15 @@ public void exampleThesisIndex() throws IOException {
     public 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()
+                )
+            )
+        );
         database.insertEntry(entry);
 
         // when
@@ -74,7 +96,11 @@ public void dontIndexNonPdf() throws IOException {
         indexer.addToIndex(context);
 
         // then
-        try (IndexReader reader = DirectoryReader.open(new NIOFSDirectory(context.getFulltextIndexPath()))) {
+        try (
+            IndexReader reader = DirectoryReader.open(
+                new NIOFSDirectory(context.getFulltextIndexPath())
+            )
+        ) {
             assertEquals(0, reader.numDocs());
         }
     }
@@ -83,7 +109,15 @@ public void dontIndexNonPdf() throws IOException {
     public 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()
+                )
+            )
+        );
         database.insertEntry(entry);
 
         // when
@@ -91,7 +125,11 @@ public void dontIndexOnlineLinks() throws IOException {
         indexer.addToIndex(context);
 
         // then
-        try (IndexReader reader = DirectoryReader.open(new NIOFSDirectory(context.getFulltextIndexPath()))) {
+        try (
+            IndexReader reader = DirectoryReader.open(
+                new NIOFSDirectory(context.getFulltextIndexPath())
+            )
+        ) {
             assertEquals(0, reader.numDocs());
         }
     }
@@ -101,7 +139,15 @@ public 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()
+                )
+            )
+        );
         database.insertEntry(entry);
 
         // when
@@ -109,7 +155,11 @@ public void exampleThesisIndexWithKey() throws IOException {
         indexer.addToIndex(context);
 
         // then
-        try (IndexReader reader = DirectoryReader.open(new NIOFSDirectory(context.getFulltextIndexPath()))) {
+        try (
+            IndexReader reader = DirectoryReader.open(
+                new NIOFSDirectory(context.getFulltextIndexPath())
+            )
+        ) {
             assertEquals(33, reader.numDocs());
         }
     }
@@ -118,7 +168,15 @@ public void exampleThesisIndexWithKey() throws IOException {
     public 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()
+                )
+            )
+        );
 
         database.insertEntry(entry);
 
@@ -127,7 +185,11 @@ public void metaDataIndex() throws IOException {
         indexer.addToIndex(context);
 
         // then
-        try (IndexReader reader = DirectoryReader.open(new NIOFSDirectory(context.getFulltextIndexPath()))) {
+        try (
+            IndexReader reader = DirectoryReader.open(
+                new NIOFSDirectory(context.getFulltextIndexPath())
+            )
+        ) {
             assertEquals(1, reader.numDocs());
         }
     }
@@ -137,13 +199,25 @@ public void testFlushIndex() 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()
+                )
+            )
+        );
         database.insertEntry(entry);
 
         indexer.createIndex();
         indexer.addToIndex(context);
         // index actually exists
-        try (IndexReader reader = DirectoryReader.open(new NIOFSDirectory(context.getFulltextIndexPath()))) {
+        try (
+            IndexReader reader = DirectoryReader.open(
+                new NIOFSDirectory(context.getFulltextIndexPath())
+            )
+        ) {
             assertEquals(33, reader.numDocs());
         }
 
@@ -151,7 +225,11 @@ public void testFlushIndex() throws IOException {
         indexer.flushIndex();
 
         // then
-        try (IndexReader reader = DirectoryReader.open(new NIOFSDirectory(context.getFulltextIndexPath()))) {
+        try (
+            IndexReader reader = DirectoryReader.open(
+                new NIOFSDirectory(context.getFulltextIndexPath())
+            )
+        ) {
             assertEquals(0, reader.numDocs());
         }
     }
@@ -161,27 +239,50 @@ public 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()
+                )
+            )
+        );
         database.insertEntry(exampleThesis);
         indexer.createIndex();
         indexer.addToIndex(context);
 
         // index with first entry
-        try (IndexReader reader = DirectoryReader.open(new NIOFSDirectory(context.getFulltextIndexPath()))) {
+        try (
+            IndexReader reader = DirectoryReader.open(
+                new NIOFSDirectory(context.getFulltextIndexPath())
+            )
+        ) {
             assertEquals(33, reader.numDocs());
         }
 
         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(metadata, null);
 
         // then
-        try (IndexReader reader = DirectoryReader.open(new NIOFSDirectory(context.getFulltextIndexPath()))) {
+        try (
+            IndexReader reader = DirectoryReader.open(
+                new NIOFSDirectory(context.getFulltextIndexPath())
+            )
+        ) {
             assertEquals(34, reader.numDocs());
         }
     }
 }
-
diff --git a/src/test/java/org/jabref/logic/pdf/search/retrieval/PdfSearcherTest.java b/src/test/java/org/jabref/logic/pdf/search/retrieval/PdfSearcherTest.java
index e005c271ff1..6f0a5eeca11 100644
--- a/src/test/java/org/jabref/logic/pdf/search/retrieval/PdfSearcherTest.java
+++ b/src/test/java/org/jabref/logic/pdf/search/retrieval/PdfSearcherTest.java
@@ -1,9 +1,14 @@
 package org.jabref.logic.pdf.search.retrieval;
 
+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.nio.file.Path;
 import java.util.Collections;
-
+import org.apache.lucene.queryparser.classic.ParseException;
 import org.jabref.logic.pdf.search.indexing.PdfIndexer;
 import org.jabref.logic.util.StandardFileType;
 import org.jabref.model.database.BibDatabase;
@@ -13,18 +18,11 @@
 import org.jabref.model.entry.types.StandardEntryType;
 import org.jabref.model.pdf.search.PdfSearchResults;
 import org.jabref.preferences.FilePreferences;
-
-import org.apache.lucene.queryparser.classic.ParseException;
 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.junit.jupiter.api.Assertions.assertThrows;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
-
 public class PdfSearcherTest {
 
     private PdfSearcher search;
@@ -35,21 +33,48 @@ public void setUp(@TempDir Path indexDir) throws IOException {
         // given
         BibDatabase database = new BibDatabase();
         BibDatabaseContext context = mock(BibDatabaseContext.class);
-        when(context.getFileDirectories(Mockito.any())).thenReturn(Collections.singletonList(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);
         when(context.getDatabase()).thenReturn(database);
         when(context.getEntries()).thenReturn(database.getEntries());
         BibEntry examplePdf = new BibEntry(StandardEntryType.Article);
-        examplePdf.setFiles(Collections.singletonList(new LinkedFile("Example Entry", "example.pdf", StandardFileType.PDF.getName())));
+        examplePdf.setFiles(
+            Collections.singletonList(
+                new LinkedFile(
+                    "Example Entry",
+                    "example.pdf",
+                    StandardFileType.PDF.getName()
+                )
+            )
+        );
         database.insertEntry(examplePdf);
 
         BibEntry metaDataEntry = new BibEntry(StandardEntryType.Article);
-        metaDataEntry.setFiles(Collections.singletonList(new LinkedFile("Metadata Entry", "metaData.pdf", StandardFileType.PDF.getName())));
+        metaDataEntry.setFiles(
+            Collections.singletonList(
+                new LinkedFile(
+                    "Metadata Entry",
+                    "metaData.pdf",
+                    StandardFileType.PDF.getName()
+                )
+            )
+        );
         metaDataEntry.setCitationKey("MetaData2017");
         database.insertEntry(metaDataEntry);
 
         BibEntry exampleThesis = new BibEntry(StandardEntryType.PhdThesis);
-        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()
+                )
+            )
+        );
         exampleThesis.setCitationKey("ExampleThesis");
         database.insertEntry(exampleThesis);
 
@@ -103,6 +128,9 @@ public void searchWithNullString() throws IOException {
 
     @Test
     public void searchForZeroResults() throws IOException {
-        assertThrows(IllegalArgumentException.class, () -> search.search("test", 0));
+        assertThrows(
+            IllegalArgumentException.class,
+            () -> search.search("test", 0)
+        );
     }
 }
diff --git a/src/test/java/org/jabref/logic/protectedterms/ProtectedTermsListTest.java b/src/test/java/org/jabref/logic/protectedterms/ProtectedTermsListTest.java
index 54109db5c86..f726b35ef4f 100644
--- a/src/test/java/org/jabref/logic/protectedterms/ProtectedTermsListTest.java
+++ b/src/test/java/org/jabref/logic/protectedterms/ProtectedTermsListTest.java
@@ -1,19 +1,18 @@
 package org.jabref.logic.protectedterms;
 
+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;
-
 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;
-
 public class ProtectedTermsListTest {
 
     private ProtectedTermsList internalList;
@@ -25,8 +24,19 @@ public 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 2b25939e788..fb92d645712 100644
--- a/src/test/java/org/jabref/logic/protectedterms/ProtectedTermsLoaderTest.java
+++ b/src/test/java/org/jabref/logic/protectedterms/ProtectedTermsLoaderTest.java
@@ -1,121 +1,186 @@
 package org.jabref.logic.protectedterms;
 
+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;
-
 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;
-
 class ProtectedTermsLoaderTest {
 
     private ProtectedTermsLoader loader;
 
     @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
     void testGetProtectedTerms() throws URISyntaxException {
-        List<ProtectedTermsList> backupList = new ArrayList<>(loader.getProtectedTermsLists());
+        List<ProtectedTermsList> backupList = new ArrayList<>(
+            loader.getProtectedTermsLists()
+        );
 
         for (ProtectedTermsList list : backupList) {
             loader.removeProtectedTermsList(list);
         }
         assertTrue(loader.getProtectedTermsLists().isEmpty());
-        String filename = Path.of(ProtectedTermsLoader.class.getResource("/org/jabref/logic/protectedterms/namedterms.terms")
-                                                            .toURI())
-                              .toFile().getPath();
+        String filename = Path
+            .of(
+                ProtectedTermsLoader.class.getResource(
+                        "/org/jabref/logic/protectedterms/namedterms.terms"
+                    )
+                    .toURI()
+            )
+            .toFile()
+            .getPath();
         loader.addProtectedTermsListFromFile(filename, true);
         assertEquals(List.of("Einstein"), loader.getProtectedTerms());
     }
 
     @Test
     void testAddProtectedTermsListFromFile() throws URISyntaxException {
-        String filename = Path.of(ProtectedTermsLoader.class.getResource("/org/jabref/logic/protectedterms/namedterms.terms")
-                                                            .toURI())
-                              .toFile().getPath();
-        assertEquals(ProtectedTermsLoader.getInternalLists().size(), loader.getProtectedTermsLists().size());
+        String filename = Path
+            .of(
+                ProtectedTermsLoader.class.getResource(
+                        "/org/jabref/logic/protectedterms/namedterms.terms"
+                    )
+                    .toURI()
+            )
+            .toFile()
+            .getPath();
+        assertEquals(
+            ProtectedTermsLoader.getInternalLists().size(),
+            loader.getProtectedTermsLists().size()
+        );
         loader.addProtectedTermsListFromFile(filename, false);
-        assertEquals(ProtectedTermsLoader.getInternalLists().size() + 1, loader.getProtectedTermsLists().size());
+        assertEquals(
+            ProtectedTermsLoader.getInternalLists().size() + 1,
+            loader.getProtectedTermsLists().size()
+        );
     }
 
     @Test
-    void testReadProtectedTermsListFromFileReadsDescription() throws URISyntaxException {
+    void testReadProtectedTermsListFromFileReadsDescription()
+        throws URISyntaxException {
         Path file = Path.of(
-                ProtectedTermsLoader.class.getResource("/org/jabref/logic/protectedterms/namedterms.terms")
-                                          .toURI());
+            ProtectedTermsLoader.class.getResource(
+                    "/org/jabref/logic/protectedterms/namedterms.terms"
+                )
+                .toURI()
+        );
 
-        ProtectedTermsList list = ProtectedTermsLoader.readProtectedTermsListFromFile(file, true);
+        ProtectedTermsList list =
+            ProtectedTermsLoader.readProtectedTermsListFromFile(file, true);
         assertEquals("Term list", list.getDescription());
     }
 
     @Test
-    void testReadProtectedTermsListFromFileDisabledWorks() throws URISyntaxException {
-        Path file = Path.of(ProtectedTermsLoader.class.getResource("/org/jabref/logic/protectedterms/namedterms.terms")
-                                                      .toURI());
+    void testReadProtectedTermsListFromFileDisabledWorks()
+        throws URISyntaxException {
+        Path file = Path.of(
+            ProtectedTermsLoader.class.getResource(
+                    "/org/jabref/logic/protectedterms/namedterms.terms"
+                )
+                .toURI()
+        );
 
-        ProtectedTermsList list = ProtectedTermsLoader.readProtectedTermsListFromFile(file, false);
+        ProtectedTermsList list =
+            ProtectedTermsLoader.readProtectedTermsListFromFile(file, false);
         assertFalse(list.isEnabled());
     }
 
     @Test
-    void testReadProtectedTermsListFromFileEnabledWorks() throws URISyntaxException {
-        Path file = Path.of(ProtectedTermsLoader.class.getResource("/org/jabref/logic/protectedterms/namedterms.terms")
-                                                      .toURI());
+    void testReadProtectedTermsListFromFileEnabledWorks()
+        throws URISyntaxException {
+        Path file = Path.of(
+            ProtectedTermsLoader.class.getResource(
+                    "/org/jabref/logic/protectedterms/namedterms.terms"
+                )
+                .toURI()
+        );
 
-        ProtectedTermsList list = ProtectedTermsLoader.readProtectedTermsListFromFile(file, true);
+        ProtectedTermsList list =
+            ProtectedTermsLoader.readProtectedTermsListFromFile(file, true);
         assertTrue(list.isEnabled());
     }
 
     @Test
-    void testReadProtectedTermsListFromFileIsNotInternalList() throws URISyntaxException {
-        Path file = Path.of(ProtectedTermsLoader.class.getResource("/org/jabref/logic/protectedterms/namedterms.terms")
-                                                      .toURI());
+    void testReadProtectedTermsListFromFileIsNotInternalList()
+        throws URISyntaxException {
+        Path file = Path.of(
+            ProtectedTermsLoader.class.getResource(
+                    "/org/jabref/logic/protectedterms/namedterms.terms"
+                )
+                .toURI()
+        );
 
-        ProtectedTermsList list = ProtectedTermsLoader.readProtectedTermsListFromFile(file, true);
+        ProtectedTermsList list =
+            ProtectedTermsLoader.readProtectedTermsListFromFile(file, true);
         assertFalse(list.isInternalList());
     }
 
     @Test
     void testReadProtectedTermsListFromFileNoDescriptionGivesDefaultDescription()
-            throws URISyntaxException {
+        throws URISyntaxException {
         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"),
-                list.getDescription());
+            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"
+            ),
+            list.getDescription()
+        );
     }
 
     @Test
     void testNewListsAreIncluded() {
-        ProtectedTermsLoader localLoader = new ProtectedTermsLoader(new ProtectedTermsPreferences(
+        ProtectedTermsLoader localLoader = new ProtectedTermsLoader(
+            new ProtectedTermsPreferences(
                 Collections.emptyList(),
                 Collections.emptyList(),
                 Collections.emptyList(),
-                Collections.emptyList()));
-        assertEquals(ProtectedTermsLoader.getInternalLists().size(), localLoader.getProtectedTermsLists().size());
+                Collections.emptyList()
+            )
+        );
+        assertEquals(
+            ProtectedTermsLoader.getInternalLists().size(),
+            localLoader.getProtectedTermsLists().size()
+        );
     }
 
     @Test
     void testNewListsAreEnabled() {
-        ProtectedTermsLoader localLoader = new ProtectedTermsLoader(new ProtectedTermsPreferences(
+        ProtectedTermsLoader localLoader = new ProtectedTermsLoader(
+            new ProtectedTermsPreferences(
                 Collections.emptyList(),
                 Collections.emptyList(),
                 Collections.emptyList(),
-                Collections.emptyList()));
+                Collections.emptyList()
+            )
+        );
         for (ProtectedTermsList list : localLoader.getProtectedTermsLists()) {
             assertTrue(list.isEnabled());
         }
@@ -123,11 +188,14 @@ void testNewListsAreEnabled() {
 
     @Test
     void testInitalizedAllInternalDisabled() {
-        ProtectedTermsLoader localLoader = new ProtectedTermsLoader(new ProtectedTermsPreferences(
+        ProtectedTermsLoader localLoader = new ProtectedTermsLoader(
+            new ProtectedTermsPreferences(
                 Collections.emptyList(),
                 Collections.emptyList(),
                 ProtectedTermsLoader.getInternalLists(),
-                Collections.emptyList()));
+                Collections.emptyList()
+            )
+        );
         for (ProtectedTermsList list : localLoader.getProtectedTermsLists()) {
             assertFalse(list.isEnabled());
         }
@@ -135,92 +203,138 @@ void testInitalizedAllInternalDisabled() {
 
     @Test
     void testUnknownExternalFileWillNotLoad() {
-        ProtectedTermsLoader localLoader = new ProtectedTermsLoader(new ProtectedTermsPreferences(
+        ProtectedTermsLoader localLoader = new ProtectedTermsLoader(
+            new ProtectedTermsPreferences(
                 ProtectedTermsLoader.getInternalLists(),
                 Collections.singletonList("someUnlikelyNameThatNeverWillExist"),
                 Collections.emptyList(),
-                Collections.emptyList()));
-        assertEquals(ProtectedTermsLoader.getInternalLists().size(), localLoader.getProtectedTermsLists().size());
+                Collections.emptyList()
+            )
+        );
+        assertEquals(
+            ProtectedTermsLoader.getInternalLists().size(),
+            localLoader.getProtectedTermsLists().size()
+        );
     }
 
     @Test
     void testAllDisabledNoWords() {
-        ProtectedTermsLoader localLoader = new ProtectedTermsLoader(new ProtectedTermsPreferences(
+        ProtectedTermsLoader localLoader = new ProtectedTermsLoader(
+            new ProtectedTermsPreferences(
                 Collections.emptyList(),
                 Collections.emptyList(),
                 ProtectedTermsLoader.getInternalLists(),
-                Collections.emptyList()));
+                Collections.emptyList()
+            )
+        );
         assertEquals(Collections.emptyList(), localLoader.getProtectedTerms());
     }
 
     @Test
     void testDoNotLoadTheSameInternalListTwice() {
         ProtectedTermsLoader localLoader = new ProtectedTermsLoader(
-                new ProtectedTermsPreferences(
-                        ProtectedTermsLoader.getInternalLists(),
-                        Collections.emptyList(),
-                        ProtectedTermsLoader.getInternalLists(),
-                        Collections.emptyList()));
-        assertEquals(ProtectedTermsLoader.getInternalLists().size(), localLoader.getProtectedTermsLists().size());
+            new ProtectedTermsPreferences(
+                ProtectedTermsLoader.getInternalLists(),
+                Collections.emptyList(),
+                ProtectedTermsLoader.getInternalLists(),
+                Collections.emptyList()
+            )
+        );
+        assertEquals(
+            ProtectedTermsLoader.getInternalLists().size(),
+            localLoader.getProtectedTermsLists().size()
+        );
     }
 
     @Test
     void testAddNewTermListAddsList(@TempDir Path tempDir) {
-        ProtectedTermsLoader localLoader = new ProtectedTermsLoader(new ProtectedTermsPreferences(
+        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());
+                Collections.emptyList()
+            )
+        );
+        localLoader.addNewProtectedTermsList(
+            "My new list",
+            tempDir.resolve("MyNewList.terms").toAbsolutePath().toString()
+        );
+        assertEquals(
+            ProtectedTermsLoader.getInternalLists().size() + 1,
+            localLoader.getProtectedTermsLists().size()
+        );
     }
 
     @Test
     void testAddNewTermListNewListInList(@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());
+            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 testRemoveTermList(@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());
+            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 testRemoveTermListReduceTheCount(@TempDir Path tempDir) {
-        ProtectedTermsLoader localLoader = new ProtectedTermsLoader(new ProtectedTermsPreferences(
+        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());
+                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 testAddNewTermListSetsCorrectDescription(@TempDir Path tempDir) {
-        ProtectedTermsLoader localLoader = new ProtectedTermsLoader(new ProtectedTermsPreferences(
+        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());
+                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/remote/RemoteCommunicationTest.java b/src/test/java/org/jabref/logic/remote/RemoteCommunicationTest.java
index bb2cdc8dc90..7064d02f88e 100644
--- a/src/test/java/org/jabref/logic/remote/RemoteCommunicationTest.java
+++ b/src/test/java/org/jabref/logic/remote/RemoteCommunicationTest.java
@@ -1,20 +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 java.io.IOException;
 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;
-
 /**
  * Tests for the case where the client and server are set-up correctly. Testing the exceptional cases happens in {@link
  * RemoteSetupTest}.
@@ -49,7 +47,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 +56,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 +65,10 @@ 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 +77,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/RemotePreferencesTest.java b/src/test/java/org/jabref/logic/remote/RemotePreferencesTest.java
index a1a5aab1a72..2e9a8c14a93 100644
--- a/src/test/java/org/jabref/logic/remote/RemotePreferencesTest.java
+++ b/src/test/java/org/jabref/logic/remote/RemotePreferencesTest.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;
+
 public class RemotePreferencesTest {
 
     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 8a76fe4c3ae..16b5089c9cd 100644
--- a/src/test/java/org/jabref/logic/remote/RemoteSetupTest.java
+++ b/src/test/java/org/jabref/logic/remote/RemoteSetupTest.java
@@ -1,28 +1,26 @@
 package org.jabref.logic.remote;
 
+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;
-
 import org.jabref.logic.remote.client.RemoteClient;
 import org.jabref.logic.remote.server.RemoteListenerServerManager;
 import org.jabref.logic.remote.server.RemoteMessageHandler;
 import org.jabref.logic.util.OS;
 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;
-
 @DisabledOnCIServer("Tests fails sporadically on CI server")
 class RemoteSetupTest {
 
@@ -36,13 +34,17 @@ void setUp() {
     @Test
     void testGoodCase() {
         final int port = 34567;
-        final String[] message = new String[]{"MYMESSAGE"};
+        final String[] message = new String[] { "MYMESSAGE" };
 
-        try (RemoteListenerServerManager server = new RemoteListenerServerManager()) {
+        try (
+            RemoteListenerServerManager server = new RemoteListenerServerManager()
+        ) {
             assertFalse(server.isOpen());
             server.openAndStart(messageHandler, port);
             assertTrue(server.isOpen());
-            assertTrue(new RemoteClient(port).sendCommandLineArguments(message));
+            assertTrue(
+                new RemoteClient(port).sendCommandLineArguments(message)
+            );
             verify(messageHandler).handleCommandLineArguments(message);
             server.stop();
             assertFalse(server.isOpen());
@@ -52,9 +54,11 @@ void testGoodCase() {
     @Test
     void testGoodCaseWithAllLifecycleMethods() {
         final int port = 34567;
-        final String[] message = new String[]{"MYMESSAGE"};
+        final String[] message = new String[] { "MYMESSAGE" };
 
-        try (RemoteListenerServerManager server = new RemoteListenerServerManager()) {
+        try (
+            RemoteListenerServerManager server = new RemoteListenerServerManager()
+        ) {
             assertFalse(server.isOpen());
             assertTrue(server.isNotStartedBefore());
             server.stop();
@@ -67,7 +71,9 @@ void testGoodCaseWithAllLifecycleMethods() {
             assertTrue(server.isOpen());
             assertFalse(server.isNotStartedBefore());
 
-            assertTrue(new RemoteClient(port).sendCommandLineArguments(message));
+            assertTrue(
+                new RemoteClient(port).sendCommandLineArguments(message)
+            );
             verify(messageHandler).handleCommandLineArguments(message);
             server.stop();
             assertFalse(server.isOpen());
@@ -84,11 +90,14 @@ void testPortAlreadyInUse() throws IOException {
         try (ServerSocket socket = new ServerSocket(port)) {
             assertTrue(socket.isBound());
 
-            try (RemoteListenerServerManager server = new RemoteListenerServerManager()) {
+            try (
+                RemoteListenerServerManager server = new RemoteListenerServerManager()
+            ) {
                 assertFalse(server.isOpen());
                 server.openAndStart(messageHandler, port);
                 assertFalse(server.isOpen());
-                verify(messageHandler, never()).handleCommandLineArguments(any());
+                verify(messageHandler, never())
+                    .handleCommandLineArguments(any());
             }
         }
     }
@@ -98,22 +107,30 @@ void testClientTimeout() {
         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
-    void pingReturnsFalseForWrongServerListening() throws IOException, InterruptedException {
+    void pingReturnsFalseForWrongServerListening()
+        throws IOException, InterruptedException {
         final int port = 34567;
 
         try (ServerSocket socket = new ServerSocket(port)) {
             // Setup dummy server always answering "whatever"
             new Thread(() -> {
-                try (Socket message = socket.accept(); OutputStream os = message.getOutputStream()) {
+                try (
+                    Socket message = socket.accept();
+                    OutputStream os = message.getOutputStream()
+                ) {
                     os.write("whatever".getBytes(StandardCharsets.UTF_8));
                 } catch (IOException e) {
                     // Ignored
                 }
-            }).start();
+            })
+                .start();
             Thread.sleep(100);
 
             assertFalse(new RemoteClient(port).ping());
@@ -121,7 +138,8 @@ void pingReturnsFalseForWrongServerListening() throws IOException, InterruptedEx
     }
 
     @Test
-    void pingReturnsFalseForNoServerListening() throws IOException, InterruptedException {
+    void pingReturnsFalseForNoServerListening()
+        throws IOException, InterruptedException {
         final int port = 34567;
 
         assertFalse(new RemoteClient(port).ping());
@@ -131,7 +149,9 @@ void pingReturnsFalseForNoServerListening() throws IOException, InterruptedExcep
     void pingReturnsTrueWhenServerIsRunning() {
         final int port = 34567;
 
-        try (RemoteListenerServerManager server = new RemoteListenerServerManager()) {
+        try (
+            RemoteListenerServerManager server = new RemoteListenerServerManager()
+        ) {
             server.openAndStart(messageHandler, port);
 
             assertTrue(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 963d2755e47..40f1b2d7547 100644
--- a/src/test/java/org/jabref/logic/remote/RemoteUtilTest.java
+++ b/src/test/java/org/jabref/logic/remote/RemoteUtilTest.java
@@ -1,33 +1,51 @@
 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;
+
 public class RemoteUtilTest {
 
     @Test
     public void rejectPortNumberBelowZero() {
-        assertFalse(RemoteUtil.isUserPort(-55), "Port number must be non negative.");
+        assertFalse(
+            RemoteUtil.isUserPort(-55),
+            "Port number must be non negative."
+        );
     }
 
     @Test
     public 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
     public void rejectPortsAbove16Bits() {
         // 2 ^ 16 - 1 => 65535
-        assertFalse(RemoteUtil.isUserPort(65536), "Port number should be below 65535.");
+        assertFalse(
+            RemoteUtil.isUserPort(65536),
+            "Port number should be below 65535."
+        );
     }
 
     @Test
     public 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 f276f9ddfaf..00c66d0c6c1 100644
--- a/src/test/java/org/jabref/logic/search/DatabaseSearcherTest.java
+++ b/src/test/java/org/jabref/logic/search/DatabaseSearcherTest.java
@@ -1,23 +1,27 @@
 package org.jabref.logic.search;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
 import java.util.Collections;
 import java.util.EnumSet;
 import java.util.List;
-
 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.jabref.model.search.rules.SearchRules;
-
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-
 public class DatabaseSearcherTest {
 
-    public static final SearchQuery INVALID_SEARCH_QUERY = new SearchQuery("\\asd123{}asdf", EnumSet.of(SearchRules.SearchFlags.CASE_SENSITIVE, SearchRules.SearchFlags.REGULAR_EXPRESSION));
+    public static final SearchQuery INVALID_SEARCH_QUERY = new SearchQuery(
+        "\\asd123{}asdf",
+        EnumSet.of(
+            SearchRules.SearchFlags.CASE_SENSITIVE,
+            SearchRules.SearchFlags.REGULAR_EXPRESSION
+        )
+    );
 
     private BibDatabase database;
 
@@ -28,20 +32,44 @@ public void setUp() {
 
     @Test
     public void testNoMatchesFromEmptyDatabase() {
-        List<BibEntry> matches = new DatabaseSearcher(new SearchQuery("whatever", EnumSet.of(SearchRules.SearchFlags.CASE_SENSITIVE, SearchRules.SearchFlags.REGULAR_EXPRESSION)), database).getMatches();
+        List<BibEntry> matches = new DatabaseSearcher(
+            new SearchQuery(
+                "whatever",
+                EnumSet.of(
+                    SearchRules.SearchFlags.CASE_SENSITIVE,
+                    SearchRules.SearchFlags.REGULAR_EXPRESSION
+                )
+            ),
+            database
+        )
+            .getMatches();
         assertEquals(Collections.emptyList(), matches);
     }
 
     @Test
     public void testNoMatchesFromEmptyDatabaseWithInvalidSearchExpression() {
-        List<BibEntry> matches = new DatabaseSearcher(INVALID_SEARCH_QUERY, database).getMatches();
+        List<BibEntry> matches = new DatabaseSearcher(
+            INVALID_SEARCH_QUERY,
+            database
+        )
+            .getMatches();
         assertEquals(Collections.emptyList(), matches);
     }
 
     @Test
     public void testGetDatabaseFromMatchesDatabaseWithEmptyEntries() {
         database.insertEntry(new BibEntry());
-        List<BibEntry> matches = new DatabaseSearcher(new SearchQuery("whatever", EnumSet.of(SearchRules.SearchFlags.CASE_SENSITIVE, SearchRules.SearchFlags.REGULAR_EXPRESSION)), database).getMatches();
+        List<BibEntry> matches = new DatabaseSearcher(
+            new SearchQuery(
+                "whatever",
+                EnumSet.of(
+                    SearchRules.SearchFlags.CASE_SENSITIVE,
+                    SearchRules.SearchFlags.REGULAR_EXPRESSION
+                )
+            ),
+            database
+        )
+            .getMatches();
         assertEquals(Collections.emptyList(), matches);
     }
 
@@ -50,7 +78,17 @@ public void testNoMatchesFromDatabaseWithArticleTypeEntry() {
         BibEntry entry = new BibEntry(StandardEntryType.Article);
         entry.setField(StandardField.AUTHOR, "harrer");
         database.insertEntry(entry);
-        List<BibEntry> matches = new DatabaseSearcher(new SearchQuery("whatever", EnumSet.of(SearchRules.SearchFlags.CASE_SENSITIVE, SearchRules.SearchFlags.REGULAR_EXPRESSION)), database).getMatches();
+        List<BibEntry> matches = new DatabaseSearcher(
+            new SearchQuery(
+                "whatever",
+                EnumSet.of(
+                    SearchRules.SearchFlags.CASE_SENSITIVE,
+                    SearchRules.SearchFlags.REGULAR_EXPRESSION
+                )
+            ),
+            database
+        )
+            .getMatches();
         assertEquals(Collections.emptyList(), matches);
     }
 
@@ -59,15 +97,34 @@ public void testCorrectMatchFromDatabaseWithArticleTypeEntry() {
         BibEntry entry = new BibEntry(StandardEntryType.Article);
         entry.setField(StandardField.AUTHOR, "harrer");
         database.insertEntry(entry);
-        List<BibEntry> matches = new DatabaseSearcher(new SearchQuery("harrer", EnumSet.of(SearchRules.SearchFlags.CASE_SENSITIVE, SearchRules.SearchFlags.REGULAR_EXPRESSION)), database).getMatches();
+        List<BibEntry> matches = new DatabaseSearcher(
+            new SearchQuery(
+                "harrer",
+                EnumSet.of(
+                    SearchRules.SearchFlags.CASE_SENSITIVE,
+                    SearchRules.SearchFlags.REGULAR_EXPRESSION
+                )
+            ),
+            database
+        )
+            .getMatches();
         assertEquals(Collections.singletonList(entry), matches);
     }
 
     @Test
     public void testNoMatchesFromEmptyDatabaseWithInvalidQuery() {
-        SearchQuery query = new SearchQuery("asdf[", EnumSet.of(SearchRules.SearchFlags.CASE_SENSITIVE, SearchRules.SearchFlags.REGULAR_EXPRESSION));
-
-        DatabaseSearcher databaseSearcher = new DatabaseSearcher(query, database);
+        SearchQuery query = new SearchQuery(
+            "asdf[",
+            EnumSet.of(
+                SearchRules.SearchFlags.CASE_SENSITIVE,
+                SearchRules.SearchFlags.REGULAR_EXPRESSION
+            )
+        );
+
+        DatabaseSearcher databaseSearcher = new DatabaseSearcher(
+            query,
+            database
+        );
 
         assertEquals(Collections.emptyList(), databaseSearcher.getMatches());
     }
@@ -78,8 +135,15 @@ public void testCorrectMatchFromDatabaseWithIncollectionTypeEntry() {
         entry.setField(StandardField.AUTHOR, "tonho");
         database.insertEntry(entry);
 
-        SearchQuery query = new SearchQuery("tonho", EnumSet.of(SearchRules.SearchFlags.CASE_SENSITIVE, SearchRules.SearchFlags.REGULAR_EXPRESSION));
-        List<BibEntry> matches = new DatabaseSearcher(query, database).getMatches();
+        SearchQuery query = new SearchQuery(
+            "tonho",
+            EnumSet.of(
+                SearchRules.SearchFlags.CASE_SENSITIVE,
+                SearchRules.SearchFlags.REGULAR_EXPRESSION
+            )
+        );
+        List<BibEntry> matches = new DatabaseSearcher(query, database)
+            .getMatches();
 
         assertEquals(Collections.singletonList(entry), matches);
     }
@@ -93,10 +157,22 @@ public void testNoMatchesFromDatabaseWithTwoEntries() {
         entry.setField(StandardField.AUTHOR, "tonho");
         database.insertEntry(entry);
 
-        SearchQuery query = new SearchQuery("tonho", EnumSet.of(SearchRules.SearchFlags.CASE_SENSITIVE, SearchRules.SearchFlags.REGULAR_EXPRESSION));
-        DatabaseSearcher databaseSearcher = new DatabaseSearcher(query, database);
-
-        assertEquals(Collections.singletonList(entry), databaseSearcher.getMatches());
+        SearchQuery query = new SearchQuery(
+            "tonho",
+            EnumSet.of(
+                SearchRules.SearchFlags.CASE_SENSITIVE,
+                SearchRules.SearchFlags.REGULAR_EXPRESSION
+            )
+        );
+        DatabaseSearcher databaseSearcher = new DatabaseSearcher(
+            query,
+            database
+        );
+
+        assertEquals(
+            Collections.singletonList(entry),
+            databaseSearcher.getMatches()
+        );
     }
 
     @Test
@@ -105,8 +181,17 @@ public void testNoMatchesFromDabaseWithIncollectionTypeEntry() {
         entry.setField(StandardField.AUTHOR, "tonho");
         database.insertEntry(entry);
 
-        SearchQuery query = new SearchQuery("asdf", EnumSet.of(SearchRules.SearchFlags.CASE_SENSITIVE, SearchRules.SearchFlags.REGULAR_EXPRESSION));
-        DatabaseSearcher databaseSearcher = new DatabaseSearcher(query, database);
+        SearchQuery query = new SearchQuery(
+            "asdf",
+            EnumSet.of(
+                SearchRules.SearchFlags.CASE_SENSITIVE,
+                SearchRules.SearchFlags.REGULAR_EXPRESSION
+            )
+        );
+        DatabaseSearcher databaseSearcher = new DatabaseSearcher(
+            query,
+            database
+        );
 
         assertEquals(Collections.emptyList(), databaseSearcher.getMatches());
     }
@@ -116,8 +201,17 @@ public void testNoMatchFromDatabaseWithEmptyEntry() {
         BibEntry entry = new BibEntry();
         database.insertEntry(entry);
 
-        SearchQuery query = new SearchQuery("tonho", EnumSet.of(SearchRules.SearchFlags.CASE_SENSITIVE, SearchRules.SearchFlags.REGULAR_EXPRESSION));
-        DatabaseSearcher databaseSearcher = new DatabaseSearcher(query, database);
+        SearchQuery query = new SearchQuery(
+            "tonho",
+            EnumSet.of(
+                SearchRules.SearchFlags.CASE_SENSITIVE,
+                SearchRules.SearchFlags.REGULAR_EXPRESSION
+            )
+        );
+        DatabaseSearcher databaseSearcher = new DatabaseSearcher(
+            query,
+            database
+        );
 
         assertEquals(Collections.emptyList(), databaseSearcher.getMatches());
     }
diff --git a/src/test/java/org/jabref/logic/search/SearchQueryTest.java b/src/test/java/org/jabref/logic/search/SearchQueryTest.java
index 4bf01fadb73..cb8684ce7e0 100644
--- a/src/test/java/org/jabref/logic/search/SearchQueryTest.java
+++ b/src/test/java/org/jabref/logic/search/SearchQueryTest.java
@@ -1,48 +1,105 @@
 package org.jabref.logic.search;
 
+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.EnumSet;
 import java.util.Optional;
 import java.util.regex.Pattern;
-
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.field.StandardField;
 import org.jabref.model.entry.types.StandardEntryType;
 import org.jabref.model.search.rules.SearchRules;
 import org.jabref.model.search.rules.SearchRules.SearchFlags;
-
 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;
-
 public class SearchQueryTest {
 
     @Test
     public void testToString() {
-        assertEquals("\"asdf\" (case sensitive, regular expression)", new SearchQuery("asdf", EnumSet.of(SearchRules.SearchFlags.CASE_SENSITIVE, SearchRules.SearchFlags.REGULAR_EXPRESSION)).toString());
-        assertEquals("\"asdf\" (case insensitive, plain text)", new SearchQuery("asdf", EnumSet.noneOf(SearchFlags.class)).toString());
+        assertEquals(
+            "\"asdf\" (case sensitive, regular expression)",
+            new SearchQuery(
+                "asdf",
+                EnumSet.of(
+                    SearchRules.SearchFlags.CASE_SENSITIVE,
+                    SearchRules.SearchFlags.REGULAR_EXPRESSION
+                )
+            )
+                .toString()
+        );
+        assertEquals(
+            "\"asdf\" (case insensitive, plain text)",
+            new SearchQuery("asdf", EnumSet.noneOf(SearchFlags.class))
+                .toString()
+        );
     }
 
     @Test
     public void testIsContainsBasedSearch() {
-        assertTrue(new SearchQuery("asdf", EnumSet.of(SearchRules.SearchFlags.CASE_SENSITIVE)).isContainsBasedSearch());
-        assertTrue(new SearchQuery("asdf", EnumSet.of(SearchRules.SearchFlags.CASE_SENSITIVE, SearchRules.SearchFlags.REGULAR_EXPRESSION)).isContainsBasedSearch());
-        assertFalse(new SearchQuery("author=asdf", EnumSet.of(SearchRules.SearchFlags.CASE_SENSITIVE)).isContainsBasedSearch());
+        assertTrue(
+            new SearchQuery(
+                "asdf",
+                EnumSet.of(SearchRules.SearchFlags.CASE_SENSITIVE)
+            )
+                .isContainsBasedSearch()
+        );
+        assertTrue(
+            new SearchQuery(
+                "asdf",
+                EnumSet.of(
+                    SearchRules.SearchFlags.CASE_SENSITIVE,
+                    SearchRules.SearchFlags.REGULAR_EXPRESSION
+                )
+            )
+                .isContainsBasedSearch()
+        );
+        assertFalse(
+            new SearchQuery(
+                "author=asdf",
+                EnumSet.of(SearchRules.SearchFlags.CASE_SENSITIVE)
+            )
+                .isContainsBasedSearch()
+        );
     }
 
     @Test
     public void testIsGrammarBasedSearch() {
-        assertFalse(new SearchQuery("asdf", EnumSet.of(SearchRules.SearchFlags.CASE_SENSITIVE)).isGrammarBasedSearch());
-        assertFalse(new SearchQuery("asdf", EnumSet.of(SearchRules.SearchFlags.CASE_SENSITIVE, SearchRules.SearchFlags.REGULAR_EXPRESSION)).isGrammarBasedSearch());
-        assertTrue(new SearchQuery("author=asdf", EnumSet.of(SearchRules.SearchFlags.CASE_SENSITIVE)).isGrammarBasedSearch());
+        assertFalse(
+            new SearchQuery(
+                "asdf",
+                EnumSet.of(SearchRules.SearchFlags.CASE_SENSITIVE)
+            )
+                .isGrammarBasedSearch()
+        );
+        assertFalse(
+            new SearchQuery(
+                "asdf",
+                EnumSet.of(
+                    SearchRules.SearchFlags.CASE_SENSITIVE,
+                    SearchRules.SearchFlags.REGULAR_EXPRESSION
+                )
+            )
+                .isGrammarBasedSearch()
+        );
+        assertTrue(
+            new SearchQuery(
+                "author=asdf",
+                EnumSet.of(SearchRules.SearchFlags.CASE_SENSITIVE)
+            )
+                .isGrammarBasedSearch()
+        );
     }
 
     @Test
     public void testGrammarSearch() {
         BibEntry entry = new BibEntry();
         entry.addKeyword("one two", ',');
-        SearchQuery searchQuery = new SearchQuery("keywords=\"one two\"", EnumSet.noneOf(SearchFlags.class));
+        SearchQuery searchQuery = new SearchQuery(
+            "keywords=\"one two\"",
+            EnumSet.noneOf(SearchFlags.class)
+        );
         assertTrue(searchQuery.isMatch(entry));
     }
 
@@ -50,7 +107,10 @@ public void testGrammarSearch() {
     public void testGrammarSearchFullEntryLastCharMissing() {
         BibEntry entry = new BibEntry();
         entry.setField(StandardField.TITLE, "systematic revie");
-        SearchQuery searchQuery = new SearchQuery("title=\"systematic review\"", EnumSet.noneOf(SearchFlags.class));
+        SearchQuery searchQuery = new SearchQuery(
+            "title=\"systematic review\"",
+            EnumSet.noneOf(SearchFlags.class)
+        );
         assertFalse(searchQuery.isMatch(entry));
     }
 
@@ -58,7 +118,10 @@ public void testGrammarSearchFullEntryLastCharMissing() {
     public void testGrammarSearchFullEntry() {
         BibEntry entry = new BibEntry();
         entry.setField(StandardField.TITLE, "systematic review");
-        SearchQuery searchQuery = new SearchQuery("title=\"systematic review\"", EnumSet.noneOf(SearchFlags.class));
+        SearchQuery searchQuery = new SearchQuery(
+            "title=\"systematic review\"",
+            EnumSet.noneOf(SearchFlags.class)
+        );
         assertTrue(searchQuery.isMatch(entry));
     }
 
@@ -67,7 +130,10 @@ public void testSearchingForOpenBraketInBooktitle() {
         BibEntry e = new BibEntry(StandardEntryType.InProceedings);
         e.setField(StandardField.BOOKTITLE, "Super Conference (SC)");
 
-        SearchQuery searchQuery = new SearchQuery("booktitle=\"(\"", EnumSet.noneOf(SearchFlags.class));
+        SearchQuery searchQuery = new SearchQuery(
+            "booktitle=\"(\"",
+            EnumSet.noneOf(SearchFlags.class)
+        );
         assertTrue(searchQuery.isMatch(e));
     }
 
@@ -76,7 +142,10 @@ public void testSearchMatchesSingleKeywordNotPart() {
         BibEntry e = new BibEntry(StandardEntryType.InProceedings);
         e.setField(StandardField.KEYWORDS, "banana, pineapple, orange");
 
-        SearchQuery searchQuery = new SearchQuery("anykeyword==apple", EnumSet.noneOf(SearchFlags.class));
+        SearchQuery searchQuery = new SearchQuery(
+            "anykeyword==apple",
+            EnumSet.noneOf(SearchFlags.class)
+        );
         assertFalse(searchQuery.isMatch(e));
     }
 
@@ -85,7 +154,10 @@ public void testSearchMatchesSingleKeyword() {
         BibEntry e = new BibEntry(StandardEntryType.InProceedings);
         e.setField(StandardField.KEYWORDS, "banana, pineapple, orange");
 
-        SearchQuery searchQuery = new SearchQuery("anykeyword==pineapple", EnumSet.noneOf(SearchFlags.class));
+        SearchQuery searchQuery = new SearchQuery(
+            "anykeyword==pineapple",
+            EnumSet.noneOf(SearchFlags.class)
+        );
         assertTrue(searchQuery.isMatch(e));
     }
 
@@ -95,7 +167,10 @@ public void testSearchAllFields() {
         e.setField(StandardField.TITLE, "Fruity features");
         e.setField(StandardField.KEYWORDS, "banana, pineapple, orange");
 
-        SearchQuery searchQuery = new SearchQuery("anyfield==\"fruity features\"", EnumSet.noneOf(SearchFlags.class));
+        SearchQuery searchQuery = new SearchQuery(
+            "anyfield==\"fruity features\"",
+            EnumSet.noneOf(SearchFlags.class)
+        );
         assertTrue(searchQuery.isMatch(e));
     }
 
@@ -105,7 +180,10 @@ public void testSearchAllFieldsNotForSpecificField() {
         e.setField(StandardField.TITLE, "Fruity features");
         e.setField(StandardField.KEYWORDS, "banana, pineapple, orange");
 
-        SearchQuery searchQuery = new SearchQuery("anyfield=fruit and keywords!=banana", EnumSet.noneOf(SearchFlags.class));
+        SearchQuery searchQuery = new SearchQuery(
+            "anyfield=fruit and keywords!=banana",
+            EnumSet.noneOf(SearchFlags.class)
+        );
         assertFalse(searchQuery.isMatch(e));
     }
 
@@ -115,7 +193,10 @@ public void testSearchAllFieldsAndSpecificField() {
         e.setField(StandardField.TITLE, "Fruity features");
         e.setField(StandardField.KEYWORDS, "banana, pineapple, orange");
 
-        SearchQuery searchQuery = new SearchQuery("anyfield=fruit and keywords=apple", EnumSet.noneOf(SearchFlags.class));
+        SearchQuery searchQuery = new SearchQuery(
+            "anyfield=fruit and keywords=apple",
+            EnumSet.noneOf(SearchFlags.class)
+        );
         assertTrue(searchQuery.isMatch(e));
     }
 
@@ -125,59 +206,164 @@ public void testIsMatch() {
         entry.setType(StandardEntryType.Article);
         entry.setField(StandardField.AUTHOR, "asdf");
 
-        assertFalse(new SearchQuery("BiblatexEntryType", EnumSet.of(SearchRules.SearchFlags.CASE_SENSITIVE, SearchRules.SearchFlags.REGULAR_EXPRESSION)).isMatch(entry));
-        assertTrue(new SearchQuery("asdf", EnumSet.of(SearchRules.SearchFlags.CASE_SENSITIVE, SearchRules.SearchFlags.REGULAR_EXPRESSION)).isMatch(entry));
-        assertTrue(new SearchQuery("author=asdf", EnumSet.of(SearchRules.SearchFlags.CASE_SENSITIVE, SearchRules.SearchFlags.REGULAR_EXPRESSION)).isMatch(entry));
+        assertFalse(
+            new SearchQuery(
+                "BiblatexEntryType",
+                EnumSet.of(
+                    SearchRules.SearchFlags.CASE_SENSITIVE,
+                    SearchRules.SearchFlags.REGULAR_EXPRESSION
+                )
+            )
+                .isMatch(entry)
+        );
+        assertTrue(
+            new SearchQuery(
+                "asdf",
+                EnumSet.of(
+                    SearchRules.SearchFlags.CASE_SENSITIVE,
+                    SearchRules.SearchFlags.REGULAR_EXPRESSION
+                )
+            )
+                .isMatch(entry)
+        );
+        assertTrue(
+            new SearchQuery(
+                "author=asdf",
+                EnumSet.of(
+                    SearchRules.SearchFlags.CASE_SENSITIVE,
+                    SearchRules.SearchFlags.REGULAR_EXPRESSION
+                )
+            )
+                .isMatch(entry)
+        );
     }
 
     @Test
     public void testIsValidQueryNotAsRegEx() {
-        assertTrue(new SearchQuery("asdf", EnumSet.of(SearchRules.SearchFlags.CASE_SENSITIVE)).isValid());
+        assertTrue(
+            new SearchQuery(
+                "asdf",
+                EnumSet.of(SearchRules.SearchFlags.CASE_SENSITIVE)
+            )
+                .isValid()
+        );
     }
 
     @Test
     public void testIsValidQueryContainsBracketNotAsRegEx() {
-        assertTrue(new SearchQuery("asdf[", EnumSet.of(SearchRules.SearchFlags.CASE_SENSITIVE)).isValid());
+        assertTrue(
+            new SearchQuery(
+                "asdf[",
+                EnumSet.of(SearchRules.SearchFlags.CASE_SENSITIVE)
+            )
+                .isValid()
+        );
     }
 
     @Test
     public void testIsNotValidQueryContainsBracketNotAsRegEx() {
-        assertTrue(new SearchQuery("asdf[", EnumSet.of(SearchRules.SearchFlags.CASE_SENSITIVE, SearchRules.SearchFlags.REGULAR_EXPRESSION)).isValid());
+        assertTrue(
+            new SearchQuery(
+                "asdf[",
+                EnumSet.of(
+                    SearchRules.SearchFlags.CASE_SENSITIVE,
+                    SearchRules.SearchFlags.REGULAR_EXPRESSION
+                )
+            )
+                .isValid()
+        );
     }
 
     @Test
     public void testIsValidQueryAsRegEx() {
-        assertTrue(new SearchQuery("asdf", EnumSet.of(SearchRules.SearchFlags.CASE_SENSITIVE, SearchRules.SearchFlags.REGULAR_EXPRESSION)).isValid());
+        assertTrue(
+            new SearchQuery(
+                "asdf",
+                EnumSet.of(
+                    SearchRules.SearchFlags.CASE_SENSITIVE,
+                    SearchRules.SearchFlags.REGULAR_EXPRESSION
+                )
+            )
+                .isValid()
+        );
     }
 
     @Test
     public void testIsValidQueryWithNumbersAsRegEx() {
-        assertTrue(new SearchQuery("123", EnumSet.of(SearchRules.SearchFlags.CASE_SENSITIVE, SearchRules.SearchFlags.REGULAR_EXPRESSION)).isValid());
+        assertTrue(
+            new SearchQuery(
+                "123",
+                EnumSet.of(
+                    SearchRules.SearchFlags.CASE_SENSITIVE,
+                    SearchRules.SearchFlags.REGULAR_EXPRESSION
+                )
+            )
+                .isValid()
+        );
     }
 
     @Test
     public void testIsValidQueryContainsBracketAsRegEx() {
-        assertTrue(new SearchQuery("asdf[", EnumSet.of(SearchRules.SearchFlags.CASE_SENSITIVE, SearchRules.SearchFlags.REGULAR_EXPRESSION)).isValid());
+        assertTrue(
+            new SearchQuery(
+                "asdf[",
+                EnumSet.of(
+                    SearchRules.SearchFlags.CASE_SENSITIVE,
+                    SearchRules.SearchFlags.REGULAR_EXPRESSION
+                )
+            )
+                .isValid()
+        );
     }
 
     @Test
     public void testIsValidQueryWithEqualSignAsRegEx() {
-        assertTrue(new SearchQuery("author=asdf", EnumSet.of(SearchRules.SearchFlags.CASE_SENSITIVE, SearchRules.SearchFlags.REGULAR_EXPRESSION)).isValid());
+        assertTrue(
+            new SearchQuery(
+                "author=asdf",
+                EnumSet.of(
+                    SearchRules.SearchFlags.CASE_SENSITIVE,
+                    SearchRules.SearchFlags.REGULAR_EXPRESSION
+                )
+            )
+                .isValid()
+        );
     }
 
     @Test
     public void testIsValidQueryWithNumbersAndEqualSignAsRegEx() {
-        assertTrue(new SearchQuery("author=123", EnumSet.of(SearchRules.SearchFlags.CASE_SENSITIVE, SearchRules.SearchFlags.REGULAR_EXPRESSION)).isValid());
+        assertTrue(
+            new SearchQuery(
+                "author=123",
+                EnumSet.of(
+                    SearchRules.SearchFlags.CASE_SENSITIVE,
+                    SearchRules.SearchFlags.REGULAR_EXPRESSION
+                )
+            )
+                .isValid()
+        );
     }
 
     @Test
     public void testIsValidQueryWithEqualSignNotAsRegEx() {
-        assertTrue(new SearchQuery("author=asdf", EnumSet.of(SearchRules.SearchFlags.CASE_SENSITIVE)).isValid());
+        assertTrue(
+            new SearchQuery(
+                "author=asdf",
+                EnumSet.of(SearchRules.SearchFlags.CASE_SENSITIVE)
+            )
+                .isValid()
+        );
     }
 
     @Test
     public void testIsValidQueryWithNumbersAndEqualSignNotAsRegEx() {
-        assertTrue(new SearchQuery("author=123", EnumSet.of(SearchRules.SearchFlags.CASE_SENSITIVE)).isValid());
+        assertTrue(
+            new SearchQuery(
+                "author=123",
+                EnumSet.of(SearchRules.SearchFlags.CASE_SENSITIVE)
+            )
+                .isValid()
+        );
     }
 
     @Test
@@ -187,57 +373,105 @@ public void isMatchedForNormalAndFieldBasedSearchMixed() {
         entry.setField(StandardField.AUTHOR, "asdf");
         entry.setField(StandardField.ABSTRACT, "text");
 
-        assertTrue(new SearchQuery("text AND author=asdf", EnumSet.of(SearchRules.SearchFlags.CASE_SENSITIVE, SearchRules.SearchFlags.REGULAR_EXPRESSION)).isMatch(entry));
+        assertTrue(
+            new SearchQuery(
+                "text AND author=asdf",
+                EnumSet.of(
+                    SearchRules.SearchFlags.CASE_SENSITIVE,
+                    SearchRules.SearchFlags.REGULAR_EXPRESSION
+                )
+            )
+                .isMatch(entry)
+        );
     }
 
     @Test
     public void testSimpleTerm() {
         String query = "progress";
 
-        SearchQuery result = new SearchQuery(query, EnumSet.noneOf(SearchFlags.class));
+        SearchQuery result = new SearchQuery(
+            query,
+            EnumSet.noneOf(SearchFlags.class)
+        );
         assertFalse(result.isGrammarBasedSearch());
     }
 
     @Test
     public void testGetPattern() {
         String query = "progress";
-        SearchQuery result = new SearchQuery(query, EnumSet.noneOf(SearchFlags.class));
+        SearchQuery result = new SearchQuery(
+            query,
+            EnumSet.noneOf(SearchFlags.class)
+        );
         Pattern pattern = Pattern.compile("(\\Qprogress\\E)");
         // We can't directly compare the pattern objects
-        assertEquals(Optional.of(pattern.toString()), result.getPatternForWords().map(Pattern::toString));
+        assertEquals(
+            Optional.of(pattern.toString()),
+            result.getPatternForWords().map(Pattern::toString)
+        );
     }
 
     @Test
     public void testGetRegexpPattern() {
         String queryText = "[a-c]\\d* \\d*";
-        SearchQuery regexQuery = new SearchQuery(queryText, EnumSet.of(SearchRules.SearchFlags.REGULAR_EXPRESSION));
+        SearchQuery regexQuery = new SearchQuery(
+            queryText,
+            EnumSet.of(SearchRules.SearchFlags.REGULAR_EXPRESSION)
+        );
         Pattern pattern = Pattern.compile("([a-c]\\d* \\d*)");
-        assertEquals(Optional.of(pattern.toString()), regexQuery.getPatternForWords().map(Pattern::toString));
+        assertEquals(
+            Optional.of(pattern.toString()),
+            regexQuery.getPatternForWords().map(Pattern::toString)
+        );
     }
 
     @Test
     public void testGetRegexpJavascriptPattern() {
         String queryText = "[a-c]\\d* \\d*";
-        SearchQuery regexQuery = new SearchQuery(queryText, EnumSet.of(SearchRules.SearchFlags.REGULAR_EXPRESSION));
+        SearchQuery regexQuery = new SearchQuery(
+            queryText,
+            EnumSet.of(SearchRules.SearchFlags.REGULAR_EXPRESSION)
+        );
         Pattern pattern = Pattern.compile("([a-c]\\d* \\d*)");
-        assertEquals(Optional.of(pattern.toString()), regexQuery.getJavaScriptPatternForWords().map(Pattern::toString));
+        assertEquals(
+            Optional.of(pattern.toString()),
+            regexQuery.getJavaScriptPatternForWords().map(Pattern::toString)
+        );
     }
 
     @Test
     public void testEscapingInPattern() {
         // first word contain all java special regex characters
         String queryText = "<([{\\\\^-=$!|]})?*+.> word1 word2.";
-        SearchQuery textQueryWithSpecialChars = new SearchQuery(queryText, EnumSet.noneOf(SearchFlags.class));
-        String pattern = "(\\Q<([{\\^-=$!|]})?*+.>\\E)|(\\Qword1\\E)|(\\Qword2.\\E)";
-        assertEquals(Optional.of(pattern), textQueryWithSpecialChars.getPatternForWords().map(Pattern::toString));
+        SearchQuery textQueryWithSpecialChars = new SearchQuery(
+            queryText,
+            EnumSet.noneOf(SearchFlags.class)
+        );
+        String pattern =
+            "(\\Q<([{\\^-=$!|]})?*+.>\\E)|(\\Qword1\\E)|(\\Qword2.\\E)";
+        assertEquals(
+            Optional.of(pattern),
+            textQueryWithSpecialChars
+                .getPatternForWords()
+                .map(Pattern::toString)
+        );
     }
 
     @Test
     public void testEscapingInJavascriptPattern() {
         // first word contain all javascript special regex characters that should be escaped individually in text based search
         String queryText = "([{\\\\^$|]})?*+./ word1 word2.";
-        SearchQuery textQueryWithSpecialChars = new SearchQuery(queryText, EnumSet.noneOf(SearchFlags.class));
-        String pattern = "(\\(\\[\\{\\\\\\^\\$\\|\\]\\}\\)\\?\\*\\+\\.\\/)|(word1)|(word2\\.)";
-        assertEquals(Optional.of(pattern), textQueryWithSpecialChars.getJavaScriptPatternForWords().map(Pattern::toString));
+        SearchQuery textQueryWithSpecialChars = new SearchQuery(
+            queryText,
+            EnumSet.noneOf(SearchFlags.class)
+        );
+        String pattern =
+            "(\\(\\[\\{\\\\\\^\\$\\|\\]\\}\\)\\?\\*\\+\\.\\/)|(word1)|(word2\\.)";
+        assertEquals(
+            Optional.of(pattern),
+            textQueryWithSpecialChars
+                .getJavaScriptPatternForWords()
+                .map(Pattern::toString)
+        );
     }
 }
diff --git a/src/test/java/org/jabref/logic/shared/ConnectorTest.java b/src/test/java/org/jabref/logic/shared/ConnectorTest.java
index fabcf68b1b1..f5d56d3ce99 100644
--- a/src/test/java/org/jabref/logic/shared/ConnectorTest.java
+++ b/src/test/java/org/jabref/logic/shared/ConnectorTest.java
@@ -1,7 +1,6 @@
 package org.jabref.logic.shared;
 
 import java.sql.SQLException;
-
 import org.jabref.logic.shared.exception.InvalidDBMSConnectionPropertiesException;
 import org.jabref.testutils.category.DatabaseTest;
 
@@ -11,21 +10,52 @@
 @DatabaseTest
 public class ConnectorTest {
 
-    public static DBMSConnection getTestDBMSConnection(DBMSType dbmsType) throws SQLException, InvalidDBMSConnectionPropertiesException {
-        DBMSConnectionProperties properties = getTestConnectionProperties(dbmsType);
+    public static DBMSConnection getTestDBMSConnection(DBMSType dbmsType)
+        throws SQLException, InvalidDBMSConnectionPropertiesException {
+        DBMSConnectionProperties properties = getTestConnectionProperties(
+            dbmsType
+        );
         return new DBMSConnection(properties);
     }
 
-    public static DBMSConnectionProperties getTestConnectionProperties(DBMSType dbmsType) {
+    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();
+                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 5f7e6e983b8..38d627527fb 100644
--- a/src/test/java/org/jabref/logic/shared/DBMSConnectionPropertiesTest.java
+++ b/src/test/java/org/jabref/logic/shared/DBMSConnectionPropertiesTest.java
@@ -1,20 +1,47 @@
 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();
-        assertEquals("jdbc:mariadb://localhost:3108/jabref", connectionProperties.getUrl());
+        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();
-        assertEquals("jdbc:oracle:thin:@localhost:3108/jabref", connectionProperties.getUrl());
+        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 208efc65334..9b170e55579 100644
--- a/src/test/java/org/jabref/logic/shared/DBMSConnectionTest.java
+++ b/src/test/java/org/jabref/logic/shared/DBMSConnectionTest.java
@@ -1,32 +1,36 @@
 package org.jabref.logic.shared;
 
-import java.sql.SQLException;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
+import java.sql.SQLException;
 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;
-
 @DatabaseTest
 public class DBMSConnectionTest {
 
     @ParameterizedTest
     @EnumSource(DBMSType.class)
-    public 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());
+    public 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()
+        );
     }
 }
diff --git a/src/test/java/org/jabref/logic/shared/DBMSProcessorTest.java b/src/test/java/org/jabref/logic/shared/DBMSProcessorTest.java
index e429134839c..f23eea96b2a 100644
--- a/src/test/java/org/jabref/logic/shared/DBMSProcessorTest.java
+++ b/src/test/java/org/jabref/logic/shared/DBMSProcessorTest.java
@@ -1,5 +1,11 @@
 package org.jabref.logic.shared;
 
+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;
@@ -10,7 +16,6 @@
 import java.util.Map;
 import java.util.Optional;
 import java.util.stream.Collectors;
-
 import org.jabref.logic.shared.exception.OfflineLockException;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.field.InternalField;
@@ -18,7 +23,6 @@
 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.Assertions;
 import org.junit.jupiter.api.BeforeEach;
@@ -26,12 +30,6 @@
 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.assertThrows;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-import static org.junit.jupiter.api.Assertions.fail;
-
 @DatabaseTest
 @Execution(ExecutionMode.SAME_THREAD)
 class DBMSProcessorTest {
@@ -44,7 +42,10 @@ class DBMSProcessorTest {
     public 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();
     }
@@ -77,21 +78,45 @@ void testInsertEntry() throws SQLException {
 
         Map<String, String> actualFieldMap = new HashMap<>();
 
-        try (ResultSet entryResultSet = selectFrom("ENTRY", dbmsConnection, dbmsProcessor)) {
+        try (
+            ResultSet entryResultSet = selectFrom(
+                "ENTRY",
+                dbmsConnection,
+                dbmsProcessor
+            )
+        ) {
             assertTrue(entryResultSet.next());
             assertEquals(1, entryResultSet.getInt("SHARED_ID"));
             assertEquals("inproceedings", entryResultSet.getString("TYPE"));
             assertEquals(1, entryResultSet.getInt("VERSION"));
             assertFalse(entryResultSet.next());
 
-            try (ResultSet fieldResultSet = selectFrom("FIELD", dbmsConnection, dbmsProcessor)) {
+            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);
     }
@@ -102,7 +127,13 @@ void testInsertEntryWithEmptyFields() throws SQLException {
 
         dbmsProcessor.insertEntry(expectedEntry);
 
-        try (ResultSet entryResultSet = selectFrom("ENTRY", dbmsConnection, dbmsProcessor)) {
+        try (
+            ResultSet entryResultSet = selectFrom(
+                "ENTRY",
+                dbmsConnection,
+                dbmsProcessor
+            )
+        ) {
             assertTrue(entryResultSet.next());
             assertEquals(1, entryResultSet.getInt("SHARED_ID"));
             assertEquals("article", entryResultSet.getString("TYPE"));
@@ -110,7 +141,13 @@ void testInsertEntryWithEmptyFields() throws SQLException {
             assertFalse(entryResultSet.next());
 
             // Adding an empty entry should not create an entry in field table, only in entry table
-            try (ResultSet fieldResultSet = selectFrom("FIELD", dbmsConnection, dbmsProcessor)) {
+            try (
+                ResultSet fieldResultSet = selectFrom(
+                    "FIELD",
+                    dbmsConnection,
+                    dbmsProcessor
+                )
+            ) {
                 assertFalse(fieldResultSet.next());
             }
         }
@@ -118,11 +155,20 @@ void testInsertEntryWithEmptyFields() 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.YEAR, "1994")
-                .withCitationKey("nanoproc1994");
+            .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");
     }
 
     @Test
@@ -136,7 +182,9 @@ void testUpdateEntry() 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 +198,9 @@ void testUpdateEmptyEntry() 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);
     }
 
@@ -164,7 +214,9 @@ void testGetEntriesByIdList() throws Exception {
         dbmsProcessor.insertEntry(firstEntry);
         dbmsProcessor.insertEntry(secondEntry);
 
-        List<BibEntry> sharedEntriesByIdList = dbmsProcessor.getSharedEntries(Arrays.asList(1, 2));
+        List<BibEntry> sharedEntriesByIdList = dbmsProcessor.getSharedEntries(
+            Arrays.asList(1, 2)
+        );
 
         assertEquals(List.of(firstEntry, secondEntry), sharedEntriesByIdList);
     }
@@ -179,7 +231,10 @@ void testUpdateNewerEntry() {
         bibEntry.getSharedBibEntryData().setVersion(0);
         bibEntry.setField(StandardField.YEAR, "1993");
 
-        assertThrows(OfflineLockException.class, () -> dbmsProcessor.updateEntry(bibEntry));
+        assertThrows(
+            OfflineLockException.class,
+            () -> dbmsProcessor.updateEntry(bibEntry)
+        );
     }
 
     @Test
@@ -191,8 +246,10 @@ void testUpdateEqualEntry() 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);
     }
@@ -206,7 +263,13 @@ void testRemoveAllEntries() throws SQLException {
         dbmsProcessor.insertEntry(secondEntry);
         dbmsProcessor.removeEntries(entriesToRemove);
 
-        try (ResultSet resultSet = selectFrom("ENTRY", dbmsConnection, dbmsProcessor)) {
+        try (
+            ResultSet resultSet = selectFrom(
+                "ENTRY",
+                dbmsConnection,
+                dbmsProcessor
+            )
+        ) {
             assertFalse(resultSet.next());
         }
     }
@@ -225,7 +288,13 @@ void testRemoveSomeEntries() throws SQLException {
         dbmsProcessor.insertEntry(thirdEntry);
         dbmsProcessor.removeEntries(entriesToRemove);
 
-        try (ResultSet entryResultSet = selectFrom("ENTRY", dbmsConnection, dbmsProcessor)) {
+        try (
+            ResultSet entryResultSet = selectFrom(
+                "ENTRY",
+                dbmsConnection,
+                dbmsProcessor
+            )
+        ) {
             assertTrue(entryResultSet.next());
             assertEquals(2, entryResultSet.getInt("SHARED_ID"));
             assertFalse(entryResultSet.next());
@@ -238,21 +307,36 @@ void testRemoveSingleEntry() throws SQLException {
         dbmsProcessor.insertEntry(entryToRemove);
         dbmsProcessor.removeEntries(Collections.singletonList(entryToRemove));
 
-        try (ResultSet entryResultSet = selectFrom("ENTRY", dbmsConnection, dbmsProcessor)) {
+        try (
+            ResultSet entryResultSet = selectFrom(
+                "ENTRY",
+                dbmsConnection,
+                dbmsProcessor
+            )
+        ) {
             assertFalse(entryResultSet.next());
         }
     }
 
     @Test
     void testRemoveEntriesOnNullThrows() {
-        assertThrows(NullPointerException.class, () -> dbmsProcessor.removeEntries(null));
+        assertThrows(
+            NullPointerException.class,
+            () -> dbmsProcessor.removeEntries(null)
+        );
     }
 
     @Test
     void testRemoveEmptyEntryList() throws SQLException {
         dbmsProcessor.removeEntries(Collections.emptyList());
 
-        try (ResultSet entryResultSet = selectFrom("ENTRY", dbmsConnection, dbmsProcessor)) {
+        try (
+            ResultSet entryResultSet = selectFrom(
+                "ENTRY",
+                dbmsConnection,
+                dbmsProcessor
+            )
+        ) {
             assertFalse(entryResultSet.next());
         }
     }
@@ -274,19 +358,24 @@ void testGetSharedEntry() {
 
         dbmsProcessor.insertEntry(expectedBibEntry);
 
-        Optional<BibEntry> actualBibEntryOptional = dbmsProcessor.getSharedEntry(expectedBibEntry.getSharedBibEntryData().getSharedID());
+        Optional<BibEntry> actualBibEntryOptional =
+            dbmsProcessor.getSharedEntry(
+                expectedBibEntry.getSharedBibEntryData().getSharedID()
+            );
 
         assertEquals(Optional.of(expectedBibEntry), actualBibEntryOptional);
     }
 
     @Test
     void testGetNotExistingSharedEntry() {
-        Optional<BibEntry> actualBibEntryOptional = dbmsProcessor.getSharedEntry(1);
+        Optional<BibEntry> actualBibEntryOptional =
+            dbmsProcessor.getSharedEntry(1);
         assertFalse(actualBibEntryOptional.isPresent());
     }
 
     @Test
-    void testGetSharedIDVersionMapping() throws OfflineLockException, SQLException {
+    void testGetSharedIDVersionMapping()
+        throws OfflineLockException, SQLException {
         BibEntry firstEntry = getBibEntryExample();
         BibEntry secondEntry = getBibEntryExample();
 
@@ -295,21 +384,48 @@ void testGetSharedIDVersionMapping() throws OfflineLockException, SQLException {
         dbmsProcessor.updateEntry(secondEntry);
 
         Map<Integer, Integer> expectedIDVersionMap = new HashMap<>();
-        expectedIDVersionMap.put(firstEntry.getSharedBibEntryData().getSharedID(), 1);
-        expectedIDVersionMap.put(secondEntry.getSharedBibEntryData().getSharedID(), 2);
-
-        Map<Integer, Integer> actualIDVersionMap = dbmsProcessor.getSharedIDVersionMapping();
+        expectedIDVersionMap.put(
+            firstEntry.getSharedBibEntryData().getSharedID(),
+            1
+        );
+        expectedIDVersionMap.put(
+            secondEntry.getSharedBibEntryData().getSharedID(),
+            2
+        );
+
+        Map<Integer, Integer> actualIDVersionMap =
+            dbmsProcessor.getSharedIDVersionMapping();
 
         assertEquals(expectedIDVersionMap, actualIDVersionMap);
     }
 
     @Test
     void testGetSharedMetaData() {
-        insertMetaData("databaseType", "bibtex;", dbmsConnection, dbmsProcessor);
+        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("VersionDBStructure", "1", 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();
         Map<String, String> actualMetaData = dbmsProcessor.getSharedMetaData();
@@ -332,8 +448,14 @@ 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("saveOrderConfig", "specified;author;false;title;false;year;true;");
+        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");
 
         return expectedMetaData;
@@ -341,44 +463,65 @@ private static Map<String, String> getMetaDataExample() {
 
     private static BibEntry getBibEntryExampleWithEmptyFields() {
         BibEntry bibEntry = new BibEntry()
-                .withField(StandardField.AUTHOR, "Author")
-                .withField(StandardField.TITLE, "")
-                .withField(StandardField.YEAR, "");
+            .withField(StandardField.AUTHOR, "Author")
+            .withField(StandardField.TITLE, "")
+            .withField(StandardField.YEAR, "");
         bibEntry.getSharedBibEntryData().setSharedID(1);
         return bibEntry;
     }
 
     private static BibEntry getBibEntryExample2() {
         return new BibEntry(StandardEntryType.InProceedings)
-                .withField(StandardField.AUTHOR, "Shelah, Saharon and Ziegler, Martin")
-                .withField(StandardField.TITLE, "Algebraically closed groups of large cardinality")
-                .withField(StandardField.JOURNAL, "The Journal of Symbolic Logic")
-                .withField(StandardField.YEAR, "1979")
-                .withCitationKey("algegrou1979");
+            .withField(
+                StandardField.AUTHOR,
+                "Shelah, Saharon and Ziegler, Martin"
+            )
+            .withField(
+                StandardField.TITLE,
+                "Algebraically closed groups of large cardinality"
+            )
+            .withField(StandardField.JOURNAL, "The Journal of Symbolic Logic")
+            .withField(StandardField.YEAR, "1979")
+            .withCitationKey("algegrou1979");
     }
 
     private static BibEntry getBibEntryExample3() {
         return new BibEntry(StandardEntryType.InProceedings)
-                .withField(StandardField.AUTHOR, "Hodges, Wilfrid and Shelah, Saharon")
-                .withField(StandardField.TITLE, "Infinite games and reduced products")
-                .withField(StandardField.JOURNAL, "Annals of Mathematical Logic")
-                .withField(StandardField.YEAR, "1981")
-                .withCitationKey("infigame1981");
+            .withField(
+                StandardField.AUTHOR,
+                "Hodges, Wilfrid and Shelah, Saharon"
+            )
+            .withField(
+                StandardField.TITLE,
+                "Infinite games and reduced products"
+            )
+            .withField(StandardField.JOURNAL, "Annals of Mathematical Logic")
+            .withField(StandardField.YEAR, "1981")
+            .withCitationKey("infigame1981");
     }
 
     @Test
     void testInsertMultipleEntries() 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);
 
         Map<Integer, Map<String, String>> actualFieldMap = new HashMap<>();
 
-        try (ResultSet entryResultSet = selectFrom("ENTRY", dbmsConnection, dbmsProcessor)) {
+        try (
+            ResultSet entryResultSet = selectFrom(
+                "ENTRY",
+                dbmsConnection,
+                dbmsProcessor
+            )
+        ) {
             assertTrue(entryResultSet.next());
             assertEquals(1, entryResultSet.getInt("SHARED_ID"));
             assertEquals("article", entryResultSet.getString("TYPE"));
@@ -401,32 +544,72 @@ void testInsertMultipleEntries() throws SQLException {
             assertEquals(1, entryResultSet.getInt("VERSION"));
             assertFalse(entryResultSet.next());
 
-            try (ResultSet fieldResultSet = selectFrom("FIELD", dbmsConnection, dbmsProcessor)) {
+            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"));
+                    if (
+                        actualFieldMap.containsKey(
+                            fieldResultSet.getInt("ENTRY_SHARED_ID")
+                        )
+                    ) {
+                        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,19 +618,43 @@ 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) {
+    private void insertMetaData(
+        String key,
+        String value,
+        DBMSConnection dbmsConnection,
+        DBMSProcessor dbmsProcessor
+    ) {
         Assertions.assertDoesNotThrow(() -> {
-            dbmsConnection.getConnection().createStatement().executeUpdate("INSERT INTO " + escape_Table("METADATA", dbmsProcessor) + "("
-                    + escape("KEY", dbmsProcessor) + ", " + escape("VALUE", dbmsProcessor) + ") VALUES("
-                    + escapeValue(key) + ", " + escapeValue(value) + ")");
+            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) {
+    private static String escape(
+        String expression,
+        DBMSProcessor dbmsProcessor
+    ) {
         return dbmsProcessor.escape(expression);
     }
 
-    private static String escape_Table(String expression, DBMSProcessor dbmsProcessor) {
+    private static String escape_Table(
+        String expression,
+        DBMSProcessor dbmsProcessor
+    ) {
         return dbmsProcessor.escape_Table(expression);
     }
 
diff --git a/src/test/java/org/jabref/logic/shared/DBMSSynchronizerTest.java b/src/test/java/org/jabref/logic/shared/DBMSSynchronizerTest.java
index a36db3efd7e..4fce410f20f 100644
--- a/src/test/java/org/jabref/logic/shared/DBMSSynchronizerTest.java
+++ b/src/test/java/org/jabref/logic/shared/DBMSSynchronizerTest.java
@@ -1,10 +1,12 @@
 package org.jabref.logic.shared;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
-
 import org.jabref.logic.citationkeypattern.GlobalCitationKeyPattern;
 import org.jabref.logic.cleanup.FieldFormatterCleanup;
 import org.jabref.logic.cleanup.FieldFormatterCleanups;
@@ -21,31 +23,28 @@
 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;
-
 @DatabaseTest
 @Execution(ExecutionMode.SAME_THREAD)
 public class DBMSSynchronizerTest {
 
     private DBMSSynchronizer dbmsSynchronizer;
     private BibDatabase bibDatabase;
-    private final GlobalCitationKeyPattern pattern = GlobalCitationKeyPattern.fromPattern("[auth][year]");
+    private final GlobalCitationKeyPattern pattern =
+        GlobalCitationKeyPattern.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);
+            .withField(StandardField.AUTHOR, "Wirthlin, Michael J" + index)
+            .withField(StandardField.TITLE, "The nano processor" + index);
         bibEntry.getSharedBibEntryData().setSharedID(index);
         return bibEntry;
     }
@@ -54,14 +53,21 @@ private BibEntry createExampleBibEntry(int index) {
     public void setup() throws Exception {
         this.dbmsType = TestManager.getDBMSTypeTestParameter();
         this.dbmsConnection = ConnectorTest.getTestDBMSConnection(dbmsType);
-        this.dbmsProcessor = DBMSProcessor.getProcessorInstance(this.dbmsConnection);
+        this.dbmsProcessor =
+            DBMSProcessor.getProcessorInstance(this.dbmsConnection);
         TestManager.clearTables(this.dbmsConnection);
         this.dbmsProcessor.setupSharedDatabase();
 
         bibDatabase = new BibDatabase();
         BibDatabaseContext context = new BibDatabaseContext(bibDatabase);
 
-        dbmsSynchronizer = new DBMSSynchronizer(context, ',', pattern, new DummyFileUpdateMonitor());
+        dbmsSynchronizer =
+            new DBMSSynchronizer(
+                context,
+                ',',
+                pattern,
+                new DummyFileUpdateMonitor()
+            );
         bibDatabase.registerListener(dbmsSynchronizer);
 
         dbmsSynchronizer.openSharedDatabase(dbmsConnection);
@@ -87,7 +93,8 @@ public void testEntryAddedEventListener() throws Exception {
     }
 
     @Test
-    public void twoLocalFieldChangesAreSynchronizedCorrectly() throws Exception {
+    public void twoLocalFieldChangesAreSynchronizedCorrectly()
+        throws Exception {
         BibEntry expectedEntry = createExampleBibEntry(1);
         expectedEntry.registerListener(dbmsSynchronizer);
 
@@ -100,21 +107,29 @@ public void twoLocalFieldChangesAreSynchronizedCorrectly() throws Exception {
     }
 
     @Test
-    public void oneLocalAndOneSharedFieldChangeIsSynchronizedCorrectly() throws Exception {
+    public void oneLocalAndOneSharedFieldChangeIsSynchronizedCorrectly()
+        throws Exception {
         BibEntry exampleBibEntry = createExampleBibEntry(1);
         exampleBibEntry.registerListener(dbmsSynchronizer);
 
         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");
+            .withField(StandardField.AUTHOR, "Brad L and Gilson");
 
-        assertEquals(Collections.singletonList(expectedBibEntry), actualEntries);
+        assertEquals(
+            Collections.singletonList(expectedBibEntry),
+            actualEntries
+        );
     }
 
     @Test
@@ -146,7 +161,8 @@ public void testMetaDataChangedEventListener() 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");
 
@@ -162,8 +178,12 @@ public void testInitializeDatabases() throws Exception {
     }
 
     @Test
-    public void testSynchronizeLocalDatabaseWithEntryRemoval() throws Exception {
-        List<BibEntry> expectedBibEntries = Arrays.asList(createExampleBibEntry(1), createExampleBibEntry(2));
+    public void testSynchronizeLocalDatabaseWithEntryRemoval()
+        throws Exception {
+        List<BibEntry> expectedBibEntries = Arrays.asList(
+            createExampleBibEntry(1),
+            createExampleBibEntry(2)
+        );
 
         dbmsProcessor.insertEntry(expectedBibEntries.get(0));
         dbmsProcessor.insertEntry(expectedBibEntries.get(1));
@@ -174,9 +194,12 @@ public void testSynchronizeLocalDatabaseWithEntryRemoval() throws Exception {
 
         assertEquals(expectedBibEntries, bibDatabase.getEntries());
 
-        dbmsProcessor.removeEntries(Collections.singletonList(expectedBibEntries.get(0)));
+        dbmsProcessor.removeEntries(
+            Collections.singletonList(expectedBibEntries.get(0))
+        );
 
-        expectedBibEntries = Collections.singletonList(expectedBibEntries.get(1));
+        expectedBibEntries =
+            Collections.singletonList(expectedBibEntries.get(1));
 
         dbmsSynchronizer.synchronizeLocalDatabase();
 
@@ -190,7 +213,7 @@ public void testSynchronizeLocalDatabaseWithEntryUpdate() throws Exception {
         assertEquals(List.of(bibEntry), bibDatabase.getEntries());
 
         BibEntry modifiedBibEntry = createExampleBibEntry(1)
-                .withField(new UnknownField("custom"), "custom value");
+            .withField(new UnknownField("custom"), "custom value");
         modifiedBibEntry.clearField(StandardField.TITLE);
         modifiedBibEntry.setType(StandardEntryType.Article);
 
@@ -199,7 +222,10 @@ public void testSynchronizeLocalDatabaseWithEntryUpdate() throws Exception {
         dbmsSynchronizer.synchronizeLocalDatabase();
 
         assertEquals(List.of(modifiedBibEntry), bibDatabase.getEntries());
-        assertEquals(List.of(modifiedBibEntry), dbmsProcessor.getSharedEntries());
+        assertEquals(
+            List.of(modifiedBibEntry),
+            dbmsProcessor.getSharedEntries()
+        );
     }
 
     @Test
@@ -209,14 +235,17 @@ public void updateEntryDoesNotModifyLocalDatabase() throws Exception {
         assertEquals(List.of(bibEntry), bibDatabase.getEntries());
 
         BibEntry modifiedBibEntry = createExampleBibEntry(1)
-                .withField(new UnknownField("custom"), "custom value");
+            .withField(new UnknownField("custom"), "custom value");
         modifiedBibEntry.clearField(StandardField.TITLE);
         modifiedBibEntry.setType(StandardEntryType.Article);
 
         dbmsProcessor.updateEntry(modifiedBibEntry);
 
         assertEquals(List.of(bibEntry), bibDatabase.getEntries());
-        assertEquals(List.of(modifiedBibEntry), dbmsProcessor.getSharedEntries());
+        assertEquals(
+            List.of(modifiedBibEntry),
+            dbmsProcessor.getSharedEntries()
+        );
     }
 
     @Test
@@ -225,11 +254,24 @@ public void testApplyMetaData() 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();
 
-        assertEquals("wirthlin, michael j1", bibEntry.getField(StandardField.AUTHOR).get());
+        assertEquals(
+            "wirthlin, michael j1",
+            bibEntry.getField(StandardField.AUTHOR).get()
+        );
     }
 }
diff --git a/src/test/java/org/jabref/logic/shared/DBMSTypeTest.java b/src/test/java/org/jabref/logic/shared/DBMSTypeTest.java
index 9b087519da1..224c21a4764 100644
--- a/src/test/java/org/jabref/logic/shared/DBMSTypeTest.java
+++ b/src/test/java/org/jabref/logic/shared/DBMSTypeTest.java
@@ -1,14 +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 java.util.Optional;
 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;
-
 @DatabaseTest
 public class DBMSTypeTest {
 
@@ -34,7 +32,10 @@ public void fromStringWorksForMySQL() {
 
     @Test
     public void fromStringWorksForPostgreSQL() {
-        assertEquals(Optional.of(DBMSType.POSTGRESQL), DBMSType.fromString("PostgreSQL"));
+        assertEquals(
+            Optional.of(DBMSType.POSTGRESQL),
+            DBMSType.fromString("PostgreSQL")
+        );
     }
 
     @Test
@@ -54,17 +55,26 @@ public void fromStringWorksForUnkownString() {
 
     @Test
     public void driverClassForMysqlIsCorrect() {
-        assertEquals("org.mariadb.jdbc.Driver", DBMSType.MYSQL.getDriverClassPath());
+        assertEquals(
+            "org.mariadb.jdbc.Driver",
+            DBMSType.MYSQL.getDriverClassPath()
+        );
     }
 
     @Test
     public void driverClassForOracleIsCorrect() {
-        assertEquals("oracle.jdbc.driver.OracleDriver", DBMSType.ORACLE.getDriverClassPath());
+        assertEquals(
+            "oracle.jdbc.driver.OracleDriver",
+            DBMSType.ORACLE.getDriverClassPath()
+        );
     }
 
     @Test
     public void driverClassForPostgresIsCorrect() {
-        assertEquals("org.postgresql.Driver", DBMSType.POSTGRESQL.getDriverClassPath());
+        assertEquals(
+            "org.postgresql.Driver",
+            DBMSType.POSTGRESQL.getDriverClassPath()
+        );
     }
 
     @Test
@@ -79,7 +89,10 @@ public void fromStringForOracleRturnsCorrectValue() {
 
     @Test
     public void fromStringForPostgresReturnsCorrectValue() {
-        assertEquals(DBMSType.POSTGRESQL, DBMSType.fromString("PostgreSQL").get());
+        assertEquals(
+            DBMSType.POSTGRESQL,
+            DBMSType.fromString("PostgreSQL").get()
+        );
     }
 
     @Test
@@ -89,17 +102,26 @@ public void fromStringFromInvalidStringReturnsOptionalEmpty() {
 
     @Test
     public 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
     public 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
     public 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 2846bb6688a..ceec3b2c0e7 100644
--- a/src/test/java/org/jabref/logic/shared/SynchronizationEventListenerTest.java
+++ b/src/test/java/org/jabref/logic/shared/SynchronizationEventListenerTest.java
@@ -1,11 +1,10 @@
 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 77008bef8e2..924ae510d5f 100644
--- a/src/test/java/org/jabref/logic/shared/SynchronizationSimulatorTest.java
+++ b/src/test/java/org/jabref/logic/shared/SynchronizationSimulatorTest.java
@@ -1,8 +1,13 @@
 package org.jabref.logic.shared;
 
+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 java.sql.SQLException;
 import java.util.List;
-
 import org.jabref.logic.citationkeypattern.GlobalCitationKeyPattern;
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.entry.BibEntry;
@@ -11,19 +16,12 @@
 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;
-
 @DatabaseTest
 @Execution(ExecutionMode.SAME_THREAD)
 public class SynchronizationSimulatorTest {
@@ -31,32 +29,63 @@ public class SynchronizationSimulatorTest {
     private BibDatabaseContext clientContextA;
     private BibDatabaseContext clientContextB;
     private SynchronizationEventListenerTest eventListenerB; // used to monitor occurring events
-    private final GlobalCitationKeyPattern pattern = GlobalCitationKeyPattern.fromPattern("[auth][year]");
+    private final GlobalCitationKeyPattern pattern =
+        GlobalCitationKeyPattern.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.YEAR, "199" + index)
-                .withCitationKey("nanoproc199" + 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
     public void setup() throws Exception {
-        DBMSConnection dbmsConnection = ConnectorTest.getTestDBMSConnection(TestManager.getDBMSTypeTestParameter());
+        DBMSConnection dbmsConnection = ConnectorTest.getTestDBMSConnection(
+            TestManager.getDBMSTypeTestParameter()
+        );
         TestManager.clearTables(dbmsConnection);
 
         clientContextA = new BibDatabaseContext();
-        DBMSSynchronizer synchronizerA = new DBMSSynchronizer(clientContextA, ',', pattern, new DummyFileUpdateMonitor());
+        DBMSSynchronizer synchronizerA = new DBMSSynchronizer(
+            clientContextA,
+            ',',
+            pattern,
+            new DummyFileUpdateMonitor()
+        );
         clientContextA.convertToSharedDatabase(synchronizerA);
         clientContextA.getDBMSSynchronizer().openSharedDatabase(dbmsConnection);
 
         clientContextB = new BibDatabaseContext();
-        DBMSSynchronizer synchronizerB = new DBMSSynchronizer(clientContextB, ',', pattern, new DummyFileUpdateMonitor());
+        DBMSSynchronizer synchronizerB = new DBMSSynchronizer(
+            clientContextB,
+            ',',
+            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);
     }
@@ -76,7 +105,10 @@ public 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
@@ -91,7 +123,10 @@ public void simulateEntryUpdateAndManualPull() throws Exception {
 
         clientContextB.getDBMSSynchronizer().pullChanges();
 
-        assertEquals(clientContextA.getDatabase().getEntries(), clientContextB.getDatabase().getEntries());
+        assertEquals(
+            clientContextA.getDatabase().getEntries(),
+            clientContextB.getDatabase().getEntries()
+        );
     }
 
     @Test
@@ -104,7 +139,10 @@ public 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);
@@ -125,7 +163,10 @@ public 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);
@@ -133,12 +174,18 @@ public void simulateUpdateOnNoLongerExistingEntry() throws Exception {
         assertFalse(clientContextB.getDatabase().getEntries().isEmpty());
         assertNull(eventListenerB.getSharedEntriesNotPresentEvent());
         // client B tries to update the entry
-        BibEntry bibEntryOfClientB = clientContextB.getDatabase().getEntries().get(0);
+        BibEntry bibEntryOfClientB = clientContextB
+            .getDatabase()
+            .getEntries()
+            .get(0);
         bibEntryOfClientB.setField(StandardField.YEAR, "2009");
 
         // 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
@@ -156,7 +203,10 @@ public void simulateEntryChangeConflicts() {
         assertFalse(clientContextB.getDatabase().getEntries().isEmpty());
         assertNull(eventListenerB.getUpdateRefusedEvent());
 
-        BibEntry bibEntryOfClientB = clientContextB.getDatabase().getEntries().get(0);
+        BibEntry bibEntryOfClientB = clientContextB
+            .getDatabase()
+            .getEntries()
+            .get(0);
         // B also tries to change something
         bibEntryOfClientB.setField(StandardField.YEAR, "2016");
 
diff --git a/src/test/java/org/jabref/logic/shared/TestManager.java b/src/test/java/org/jabref/logic/shared/TestManager.java
index 954bbccbb5c..46aa35256f5 100644
--- a/src/test/java/org/jabref/logic/shared/TestManager.java
+++ b/src/test/java/org/jabref/logic/shared/TestManager.java
@@ -13,40 +13,100 @@ public class TestManager {
      * Determine the DBMSType to test from the environment variable "DMBS". In case that variable is not set, use "PostgreSQL" as default
      */
     public static DBMSType getDBMSTypeTestParameter() {
-        return DBMSType.fromString(System.getenv("DBMS")).orElse(DBMSType.POSTGRESQL);
+        return DBMSType
+            .fromString(System.getenv("DBMS"))
+            .orElse(DBMSType.POSTGRESQL);
     }
 
-    public static void clearTables(DBMSConnection dbmsConnection) throws SQLException {
+    public static void clearTables(DBMSConnection dbmsConnection)
+        throws SQLException {
         Objects.requireNonNull(dbmsConnection);
         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 d315d0d1e88..baa90304d4e 100644
--- a/src/test/java/org/jabref/logic/shared/security/PasswordTest.java
+++ b/src/test/java/org/jabref/logic/shared/security/PasswordTest.java
@@ -1,17 +1,17 @@
 package org.jabref.logic.shared.security;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
+
 import java.io.UnsupportedEncodingException;
 import java.security.GeneralSecurityException;
-
 import org.junit.jupiter.api.Test;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertNotEquals;
-
 class PasswordTest {
 
     @Test
-    void passwordAESTest() throws GeneralSecurityException, UnsupportedEncodingException {
+    void passwordAESTest()
+        throws GeneralSecurityException, UnsupportedEncodingException {
         String phrase = "Password";
         Password password = new Password(phrase, "someKey");
         String encryptedPassword = password.encrypt();
@@ -19,7 +19,8 @@ void passwordAESTest() throws GeneralSecurityException, UnsupportedEncodingExcep
     }
 
     @Test
-    void passwordAsCharTest() throws GeneralSecurityException, UnsupportedEncodingException {
+    void passwordAsCharTest()
+        throws GeneralSecurityException, UnsupportedEncodingException {
         char[] charPhrase = "Password".toCharArray();
         Password charPassword = new Password(charPhrase, "someKey");
         String charEncryptedPassword = charPassword.encrypt();
diff --git a/src/test/java/org/jabref/logic/texparser/DefaultTexParserTest.java b/src/test/java/org/jabref/logic/texparser/DefaultTexParserTest.java
index ab41c9967e6..d90c46cb2bb 100644
--- a/src/test/java/org/jabref/logic/texparser/DefaultTexParserTest.java
+++ b/src/test/java/org/jabref/logic/texparser/DefaultTexParserTest.java
@@ -1,36 +1,43 @@
 package org.jabref.logic.texparser;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
 import java.net.URISyntaxException;
 import java.nio.file.Path;
 import java.util.Arrays;
-
 import org.jabref.model.texparser.LatexParserResult;
-
 import org.junit.jupiter.api.Test;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-
 public 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) {
-        LatexParserResult latexParserResult = new DefaultLatexParser().parse(citeString);
+        LatexParserResult latexParserResult = new DefaultLatexParser()
+            .parse(citeString);
         LatexParserResult expectedParserResult = new LatexParserResult();
 
-        expectedParserResult.addKey(key, Path.of(""), 1, 0, citeString.length(), citeString);
+        expectedParserResult.addKey(
+            key,
+            Path.of(""),
+            1,
+            0,
+            citeString.length(),
+            citeString
+        );
 
         assertEquals(expectedParserResult, latexParserResult);
     }
 
     private void testNonMatchCite(String citeString) {
-        LatexParserResult latexParserResult = new DefaultLatexParser().parse(citeString);
+        LatexParserResult latexParserResult = new DefaultLatexParser()
+            .parse(citeString);
         LatexParserResult expectedParserResult = new LatexParserResult();
 
         assertEquals(expectedParserResult, latexParserResult);
@@ -58,147 +65,375 @@ public void testCiteCommands() {
     public void testTwoCitationsSameLine() {
         String citeString = "\\citep{Einstein1920c} and \\citep{Einstein1920a}";
 
-        LatexParserResult latexParserResult = new DefaultLatexParser().parse(citeString);
+        LatexParserResult latexParserResult = new DefaultLatexParser()
+            .parse(citeString);
         LatexParserResult expectedParserResult = new LatexParserResult();
 
-        expectedParserResult.addKey(EINSTEIN_C, Path.of(""), 1, 0, 21, citeString);
-        expectedParserResult.addKey(EINSTEIN_A, Path.of(""), 1, 26, 47, citeString);
+        expectedParserResult.addKey(
+            EINSTEIN_C,
+            Path.of(""),
+            1,
+            0,
+            21,
+            citeString
+        );
+        expectedParserResult.addKey(
+            EINSTEIN_A,
+            Path.of(""),
+            1,
+            26,
+            47,
+            citeString
+        );
 
         assertEquals(expectedParserResult, latexParserResult);
     }
 
     @Test
     public void testFileEncodingUtf8() throws URISyntaxException {
-        Path texFile = Path.of(DefaultTexParserTest.class.getResource("utf-8.tex").toURI());
+        Path texFile = Path.of(
+            DefaultTexParserTest.class.getResource("utf-8.tex").toURI()
+        );
 
-        LatexParserResult parserResult = new DefaultLatexParser().parse(texFile);
+        LatexParserResult parserResult = new DefaultLatexParser()
+            .parse(texFile);
         LatexParserResult expectedParserResult = new LatexParserResult();
 
         expectedParserResult.getFileList().add(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);
     }
 
     @Test
     public void testFileEncodingIso88591() throws URISyntaxException {
-        Path texFile = Path.of(DefaultTexParserTest.class.getResource("iso-8859-1.tex").toURI());
+        Path texFile = Path.of(
+            DefaultTexParserTest.class.getResource("iso-8859-1.tex").toURI()
+        );
 
-        LatexParserResult parserResult = new DefaultLatexParser().parse(texFile);
+        LatexParserResult parserResult = new DefaultLatexParser()
+            .parse(texFile);
         LatexParserResult expectedParserResult = new LatexParserResult();
 
         expectedParserResult.getFileList().add(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}.");
+        expectedParserResult.addKey(
+            "anykey",
+            texFile,
+            1,
+            32,
+            45,
+            "Danach wir anschlie�end mittels \\cite{anykey}."
+        );
 
         assertEquals(expectedParserResult, parserResult);
     }
 
     @Test
     public void testFileEncodingIso885915() throws URISyntaxException {
-        Path texFile = Path.of(DefaultTexParserTest.class.getResource("iso-8859-15.tex").toURI());
+        Path texFile = Path.of(
+            DefaultTexParserTest.class.getResource("iso-8859-15.tex").toURI()
+        );
 
-        LatexParserResult parserResult = new DefaultLatexParser().parse(texFile);
+        LatexParserResult parserResult = new DefaultLatexParser()
+            .parse(texFile);
         LatexParserResult expectedParserResult = new LatexParserResult();
 
         expectedParserResult.getFileList().add(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}.");
+        expectedParserResult.addKey(
+            "anykey",
+            texFile,
+            1,
+            32,
+            45,
+            "Danach wir anschlie�end mittels \\cite{anykey}."
+        );
 
         assertEquals(expectedParserResult, parserResult);
     }
 
     @Test
     public void testFileEncodingForThreeFiles() throws URISyntaxException {
-        Path texFile = Path.of(DefaultTexParserTest.class.getResource("utf-8.tex").toURI());
-        Path texFile2 = Path.of(DefaultTexParserTest.class.getResource("iso-8859-1.tex").toURI());
-        Path texFile3 = Path.of(DefaultTexParserTest.class.getResource("iso-8859-15.tex").toURI());
+        Path texFile = Path.of(
+            DefaultTexParserTest.class.getResource("utf-8.tex").toURI()
+        );
+        Path texFile2 = Path.of(
+            DefaultTexParserTest.class.getResource("iso-8859-1.tex").toURI()
+        );
+        Path texFile3 = Path.of(
+            DefaultTexParserTest.class.getResource("iso-8859-15.tex").toURI()
+        );
 
         LatexParserResult parserResult = new DefaultLatexParser()
-                .parse(Arrays.asList(texFile, texFile2, texFile3));
+            .parse(Arrays.asList(texFile, texFile2, texFile3));
         LatexParserResult expectedParserResult = new LatexParserResult();
 
-        expectedParserResult.getFileList().addAll(Arrays.asList(texFile, texFile2, texFile3));
         expectedParserResult
-                .addKey("anykey", texFile, 1, 32, 45, "Danach wir anschließend mittels \\cite{anykey}.");
-        expectedParserResult
-                .addKey("anykey", texFile2, 1, 32, 45, "Danach wir anschlie�end mittels \\cite{anykey}.");
-        expectedParserResult
-                .addKey("anykey", texFile3, 1, 32, 45, "Danach wir anschlie�end mittels \\cite{anykey}.");
+            .getFileList()
+            .addAll(Arrays.asList(texFile, texFile2, texFile3));
+        expectedParserResult.addKey(
+            "anykey",
+            texFile,
+            1,
+            32,
+            45,
+            "Danach wir anschließend mittels \\cite{anykey}."
+        );
+        expectedParserResult.addKey(
+            "anykey",
+            texFile2,
+            1,
+            32,
+            45,
+            "Danach wir anschlie�end mittels \\cite{anykey}."
+        );
+        expectedParserResult.addKey(
+            "anykey",
+            texFile3,
+            1,
+            32,
+            45,
+            "Danach wir anschlie�end mittels \\cite{anykey}."
+        );
 
         assertEquals(expectedParserResult, parserResult);
     }
 
     @Test
     public void testSingleFile() throws URISyntaxException {
-        Path texFile = Path.of(DefaultTexParserTest.class.getResource("paper.tex").toURI());
+        Path texFile = Path.of(
+            DefaultTexParserTest.class.getResource("paper.tex").toURI()
+        );
 
-        LatexParserResult parserResult = new DefaultLatexParser().parse(texFile);
+        LatexParserResult parserResult = new DefaultLatexParser()
+            .parse(texFile);
         LatexParserResult expectedParserResult = new LatexParserResult();
 
         expectedParserResult.getFileList().add(texFile);
-        expectedParserResult.addBibFile(texFile, 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.addBibFile(
+            texFile,
+            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}"
+        );
 
         assertEquals(expectedParserResult, parserResult);
     }
 
     @Test
     public void testTwoFiles() throws URISyntaxException {
-        Path texFile = Path.of(DefaultTexParserTest.class.getResource("paper.tex").toURI());
-        Path texFile2 = Path.of(DefaultTexParserTest.class.getResource("paper2.tex").toURI());
+        Path texFile = Path.of(
+            DefaultTexParserTest.class.getResource("paper.tex").toURI()
+        );
+        Path texFile2 = Path.of(
+            DefaultTexParserTest.class.getResource("paper2.tex").toURI()
+        );
 
-        LatexParserResult parserResult = new DefaultLatexParser().parse(Arrays.asList(texFile, texFile2));
+        LatexParserResult parserResult = new DefaultLatexParser()
+            .parse(Arrays.asList(texFile, texFile2));
         LatexParserResult expectedParserResult = new LatexParserResult();
 
-        expectedParserResult.getFileList().addAll(Arrays.asList(texFile, texFile2));
-        expectedParserResult.addBibFile(texFile, texFile.getParent().resolve("origin.bib"));
-        expectedParserResult.addBibFile(texFile2, texFile2.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(DARWIN, texFile2, 4, 48, 65, "This is some content trying to cite a bib file: \\cite{Darwin1888}");
-        expectedParserResult.addKey(EINSTEIN, texFile2, 5, 48, 67, "This is some content trying to cite a bib file: \\cite{Einstein1920}");
-        expectedParserResult.addKey(NEWTON, texFile2, 6, 48, 65, "This is some content trying to cite a bib file: \\cite{Newton1999}");
+        expectedParserResult
+            .getFileList()
+            .addAll(Arrays.asList(texFile, texFile2));
+        expectedParserResult.addBibFile(
+            texFile,
+            texFile.getParent().resolve("origin.bib")
+        );
+        expectedParserResult.addBibFile(
+            texFile2,
+            texFile2.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(
+            DARWIN,
+            texFile2,
+            4,
+            48,
+            65,
+            "This is some content trying to cite a bib file: \\cite{Darwin1888}"
+        );
+        expectedParserResult.addKey(
+            EINSTEIN,
+            texFile2,
+            5,
+            48,
+            67,
+            "This is some content trying to cite a bib file: \\cite{Einstein1920}"
+        );
+        expectedParserResult.addKey(
+            NEWTON,
+            texFile2,
+            6,
+            48,
+            65,
+            "This is some content trying to cite a bib file: \\cite{Newton1999}"
+        );
 
         assertEquals(expectedParserResult, parserResult);
     }
 
     @Test
     public void testDuplicateFiles() throws URISyntaxException {
-        Path texFile = Path.of(DefaultTexParserTest.class.getResource("paper.tex").toURI());
+        Path texFile = Path.of(
+            DefaultTexParserTest.class.getResource("paper.tex").toURI()
+        );
 
-        LatexParserResult parserResult = new DefaultLatexParser().parse(Arrays.asList(texFile, texFile));
+        LatexParserResult parserResult = new DefaultLatexParser()
+            .parse(Arrays.asList(texFile, texFile));
         LatexParserResult expectedParserResult = new LatexParserResult();
 
-        expectedParserResult.getFileList().addAll(Arrays.asList(texFile, texFile));
-        expectedParserResult.addBibFile(texFile, 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
+            .getFileList()
+            .addAll(Arrays.asList(texFile, texFile));
+        expectedParserResult.addBibFile(
+            texFile,
+            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}"
+        );
 
         assertEquals(expectedParserResult, parserResult);
     }
 
     @Test
     public void testUnknownKey() throws URISyntaxException {
-        Path texFile = Path.of(DefaultTexParserTest.class.getResource("unknown_key.tex").toURI());
+        Path texFile = Path.of(
+            DefaultTexParserTest.class.getResource("unknown_key.tex").toURI()
+        );
 
-        LatexParserResult parserResult = new DefaultLatexParser().parse(texFile);
+        LatexParserResult parserResult = new DefaultLatexParser()
+            .parse(texFile);
         LatexParserResult expectedParserResult = new LatexParserResult();
 
         expectedParserResult.getFileList().add(texFile);
-        expectedParserResult.addBibFile(texFile, 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.addBibFile(
+            texFile,
+            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}"
+        );
 
         assertEquals(expectedParserResult, parserResult);
     }
@@ -207,7 +442,8 @@ public void testUnknownKey() throws URISyntaxException {
     public void testFileNotFound() {
         Path texFile = Path.of("file_not_found.tex");
 
-        LatexParserResult parserResult = new DefaultLatexParser().parse(texFile);
+        LatexParserResult parserResult = new DefaultLatexParser()
+            .parse(texFile);
         LatexParserResult expectedParserResult = new LatexParserResult();
 
         expectedParserResult.getFileList().add(texFile);
@@ -217,22 +453,68 @@ public void testFileNotFound() {
 
     @Test
     public void testNestedFiles() throws URISyntaxException {
-        Path texFile = Path.of(DefaultTexParserTest.class.getResource("nested.tex").toURI());
-        Path texFile2 = Path.of(DefaultTexParserTest.class.getResource("nested2.tex").toURI());
-        Path texFile3 = Path.of(DefaultTexParserTest.class.getResource("paper.tex").toURI());
+        Path texFile = Path.of(
+            DefaultTexParserTest.class.getResource("nested.tex").toURI()
+        );
+        Path texFile2 = Path.of(
+            DefaultTexParserTest.class.getResource("nested2.tex").toURI()
+        );
+        Path texFile3 = Path.of(
+            DefaultTexParserTest.class.getResource("paper.tex").toURI()
+        );
 
-        LatexParserResult parserResult = new DefaultLatexParser().parse(texFile);
+        LatexParserResult parserResult = new DefaultLatexParser()
+            .parse(texFile);
         LatexParserResult expectedParserResult = new LatexParserResult();
 
         expectedParserResult.getFileList().add(texFile);
-        expectedParserResult.getNestedFiles().addAll(Arrays.asList(texFile2, texFile3));
-        expectedParserResult.addBibFile(texFile, texFile.getParent().resolve("origin.bib"));
-        expectedParserResult.addBibFile(texFile2, texFile2.getParent().resolve("origin.bib"));
-        expectedParserResult.addBibFile(texFile3, texFile3.getParent().resolve("origin.bib"));
-        expectedParserResult.addKey(EINSTEIN, texFile3, 4, 0, 19, "\\cite{Einstein1920}");
-        expectedParserResult.addKey(DARWIN, texFile3, 5, 0, 17, "\\cite{Darwin1888}.");
-        expectedParserResult.addKey(EINSTEIN, texFile3, 6, 14, 33, "Einstein said \\cite{Einstein1920} that lorem impsum, consectetur adipiscing elit.");
-        expectedParserResult.addKey(DARWIN, texFile3, 7, 67, 84, "Nunc ultricies leo nec libero rhoncus, eu vehicula enim efficitur. \\cite{Darwin1888}");
+        expectedParserResult
+            .getNestedFiles()
+            .addAll(Arrays.asList(texFile2, texFile3));
+        expectedParserResult.addBibFile(
+            texFile,
+            texFile.getParent().resolve("origin.bib")
+        );
+        expectedParserResult.addBibFile(
+            texFile2,
+            texFile2.getParent().resolve("origin.bib")
+        );
+        expectedParserResult.addBibFile(
+            texFile3,
+            texFile3.getParent().resolve("origin.bib")
+        );
+        expectedParserResult.addKey(
+            EINSTEIN,
+            texFile3,
+            4,
+            0,
+            19,
+            "\\cite{Einstein1920}"
+        );
+        expectedParserResult.addKey(
+            DARWIN,
+            texFile3,
+            5,
+            0,
+            17,
+            "\\cite{Darwin1888}."
+        );
+        expectedParserResult.addKey(
+            EINSTEIN,
+            texFile3,
+            6,
+            14,
+            33,
+            "Einstein said \\cite{Einstein1920} that lorem impsum, consectetur adipiscing elit."
+        );
+        expectedParserResult.addKey(
+            DARWIN,
+            texFile3,
+            7,
+            67,
+            84,
+            "Nunc ultricies leo nec libero rhoncus, eu vehicula enim efficitur. \\cite{Darwin1888}"
+        );
 
         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 b4e6edb131f..8afcc086118 100644
--- a/src/test/java/org/jabref/logic/texparser/LatexParserTest.java
+++ b/src/test/java/org/jabref/logic/texparser/LatexParserTest.java
@@ -1,9 +1,11 @@
 package org.jabref.logic.texparser;
 
+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.Arrays;
-
 import org.jabref.logic.importer.ImportFormatPreferences;
 import org.jabref.model.database.BibDatabase;
 import org.jabref.model.entry.BibEntry;
@@ -14,21 +16,18 @@
 import org.jabref.model.util.DummyFileUpdateMonitor;
 import org.jabref.model.util.FileUpdateMonitor;
 import org.jabref.preferences.LibraryPreferences;
-
 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;
-
 public 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 LibraryPreferences libraryPreferences;
@@ -38,113 +37,260 @@ public class LatexParserTest {
 
     @BeforeEach
     void setUp() {
-        libraryPreferences = mock(LibraryPreferences.class, Answers.RETURNS_DEEP_STUBS);
-        importFormatPreferences = mock(ImportFormatPreferences.class, Answers.RETURNS_DEEP_STUBS);
+        libraryPreferences =
+            mock(LibraryPreferences.class, Answers.RETURNS_DEEP_STUBS);
+        importFormatPreferences =
+            mock(ImportFormatPreferences.class, Answers.RETURNS_DEEP_STUBS);
 
         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");
+            .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");
+            .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");
+            .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");
+            .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");
+            .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");
+            .withCitationKey(EINSTEIN_C)
+            .withField(StandardField.CROSSREF, "Einstein1920")
+            .withField(StandardField.PAGES, "25--33");
         database.insertEntry(einsteinC);
     }
 
     @Test
     public void testSameFileDifferentDatabases() throws URISyntaxException {
-        Path texFile = Path.of(LatexParserTest.class.getResource("paper.tex").toURI());
+        Path texFile = Path.of(
+            LatexParserTest.class.getResource("paper.tex").toURI()
+        );
 
-        LatexParserResult parserResult = new DefaultLatexParser().parse(texFile);
+        LatexParserResult parserResult = new DefaultLatexParser()
+            .parse(texFile);
         LatexParserResult expectedParserResult = new LatexParserResult();
 
         expectedParserResult.getFileList().add(texFile);
-        expectedParserResult.addBibFile(texFile, 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.addBibFile(
+            texFile,
+            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, libraryPreferences, importFormatPreferences, fileMonitor).resolve(parserResult);
-        LatexBibEntriesResolverResult expectedCrossingResult = new LatexBibEntriesResolverResult(expectedParserResult);
+        LatexBibEntriesResolverResult crossingResult =
+            new TexBibEntriesResolver(
+                database,
+                libraryPreferences,
+                importFormatPreferences,
+                fileMonitor
+            )
+                .resolve(parserResult);
+        LatexBibEntriesResolverResult expectedCrossingResult =
+            new LatexBibEntriesResolverResult(expectedParserResult);
 
         assertEquals(expectedCrossingResult, crossingResult);
 
-        LatexBibEntriesResolverResult crossingResult2 = new TexBibEntriesResolver(database2, libraryPreferences, importFormatPreferences, fileMonitor).resolve(parserResult);
-        LatexBibEntriesResolverResult expectedCrossingResult2 = new LatexBibEntriesResolverResult(expectedParserResult);
+        LatexBibEntriesResolverResult crossingResult2 =
+            new TexBibEntriesResolver(
+                database2,
+                libraryPreferences,
+                importFormatPreferences,
+                fileMonitor
+            )
+                .resolve(parserResult);
+        LatexBibEntriesResolverResult expectedCrossingResult2 =
+            new LatexBibEntriesResolverResult(expectedParserResult);
 
-        expectedCrossingResult2.addEntry(database.getEntryByCitationKey(EINSTEIN).get());
-        expectedCrossingResult2.addEntry(database.getEntryByCitationKey(DARWIN).get());
+        expectedCrossingResult2.addEntry(
+            database.getEntryByCitationKey(EINSTEIN).get()
+        );
+        expectedCrossingResult2.addEntry(
+            database.getEntryByCitationKey(DARWIN).get()
+        );
 
         assertEquals(expectedCrossingResult2, crossingResult2);
     }
 
     @Test
     public void testTwoFilesDifferentDatabases() throws URISyntaxException {
-        Path texFile = Path.of(LatexParserTest.class.getResource("paper.tex").toURI());
-        Path texFile2 = Path.of(LatexParserTest.class.getResource("paper2.tex").toURI());
+        Path texFile = Path.of(
+            LatexParserTest.class.getResource("paper.tex").toURI()
+        );
+        Path texFile2 = Path.of(
+            LatexParserTest.class.getResource("paper2.tex").toURI()
+        );
 
-        LatexParserResult parserResult = new DefaultLatexParser().parse(Arrays.asList(texFile, texFile2));
+        LatexParserResult parserResult = new DefaultLatexParser()
+            .parse(Arrays.asList(texFile, texFile2));
         LatexParserResult expectedParserResult = new LatexParserResult();
 
-        expectedParserResult.getFileList().addAll(Arrays.asList(texFile, texFile2));
-        expectedParserResult.addBibFile(texFile, texFile.getParent().resolve("origin.bib"));
-        expectedParserResult.addBibFile(texFile2, texFile2.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(DARWIN, texFile2, 4, 48, 65, "This is some content trying to cite a bib file: \\cite{Darwin1888}");
-        expectedParserResult.addKey(EINSTEIN, texFile2, 5, 48, 67, "This is some content trying to cite a bib file: \\cite{Einstein1920}");
-        expectedParserResult.addKey(NEWTON, texFile2, 6, 48, 65, "This is some content trying to cite a bib file: \\cite{Newton1999}");
+        expectedParserResult
+            .getFileList()
+            .addAll(Arrays.asList(texFile, texFile2));
+        expectedParserResult.addBibFile(
+            texFile,
+            texFile.getParent().resolve("origin.bib")
+        );
+        expectedParserResult.addBibFile(
+            texFile2,
+            texFile2.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(
+            DARWIN,
+            texFile2,
+            4,
+            48,
+            65,
+            "This is some content trying to cite a bib file: \\cite{Darwin1888}"
+        );
+        expectedParserResult.addKey(
+            EINSTEIN,
+            texFile2,
+            5,
+            48,
+            67,
+            "This is some content trying to cite a bib file: \\cite{Einstein1920}"
+        );
+        expectedParserResult.addKey(
+            NEWTON,
+            texFile2,
+            6,
+            48,
+            65,
+            "This is some content trying to cite a bib file: \\cite{Newton1999}"
+        );
 
-        LatexBibEntriesResolverResult crossingResult = new TexBibEntriesResolver(database, libraryPreferences, importFormatPreferences, fileMonitor).resolve(parserResult);
-        LatexBibEntriesResolverResult expectedCrossingResult = new LatexBibEntriesResolverResult(expectedParserResult);
+        LatexBibEntriesResolverResult crossingResult =
+            new TexBibEntriesResolver(
+                database,
+                libraryPreferences,
+                importFormatPreferences,
+                fileMonitor
+            )
+                .resolve(parserResult);
+        LatexBibEntriesResolverResult expectedCrossingResult =
+            new LatexBibEntriesResolverResult(expectedParserResult);
 
         assertEquals(expectedCrossingResult, crossingResult);
 
-        LatexBibEntriesResolverResult crossingResult2 = new TexBibEntriesResolver(database2, libraryPreferences, importFormatPreferences, fileMonitor).resolve(parserResult);
-        LatexBibEntriesResolverResult expectedCrossingResult2 = new LatexBibEntriesResolverResult(expectedParserResult);
+        LatexBibEntriesResolverResult crossingResult2 =
+            new TexBibEntriesResolver(
+                database2,
+                libraryPreferences,
+                importFormatPreferences,
+                fileMonitor
+            )
+                .resolve(parserResult);
+        LatexBibEntriesResolverResult expectedCrossingResult2 =
+            new LatexBibEntriesResolverResult(expectedParserResult);
 
-        expectedCrossingResult2.addEntry(database.getEntryByCitationKey(EINSTEIN).get());
-        expectedCrossingResult2.addEntry(database.getEntryByCitationKey(DARWIN).get());
+        expectedCrossingResult2.addEntry(
+            database.getEntryByCitationKey(EINSTEIN).get()
+        );
+        expectedCrossingResult2.addEntry(
+            database.getEntryByCitationKey(DARWIN).get()
+        );
 
         assertEquals(expectedCrossingResult2, crossingResult2);
     }
diff --git a/src/test/java/org/jabref/logic/texparser/TexBibEntriesResolverTest.java b/src/test/java/org/jabref/logic/texparser/TexBibEntriesResolverTest.java
index e7c5a943f04..d856ad22680 100644
--- a/src/test/java/org/jabref/logic/texparser/TexBibEntriesResolverTest.java
+++ b/src/test/java/org/jabref/logic/texparser/TexBibEntriesResolverTest.java
@@ -1,9 +1,11 @@
 package org.jabref.logic.texparser;
 
+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.Arrays;
-
 import org.jabref.logic.importer.ImportFormatPreferences;
 import org.jabref.model.database.BibDatabase;
 import org.jabref.model.entry.BibEntry;
@@ -14,21 +16,18 @@
 import org.jabref.model.util.DummyFileUpdateMonitor;
 import org.jabref.model.util.FileUpdateMonitor;
 import org.jabref.preferences.LibraryPreferences;
-
 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;
-
 public 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 LibraryPreferences libraryPreferences;
@@ -39,57 +38,72 @@ public class TexBibEntriesResolverTest {
 
     @BeforeEach
     void setUp() {
-        libraryPreferences = mock(LibraryPreferences.class, Answers.RETURNS_DEEP_STUBS);
-        importFormatPreferences = mock(ImportFormatPreferences.class, Answers.RETURNS_DEEP_STUBS);
+        libraryPreferences =
+            mock(LibraryPreferences.class, Answers.RETURNS_DEEP_STUBS);
+        importFormatPreferences =
+            mock(ImportFormatPreferences.class, Answers.RETURNS_DEEP_STUBS);
 
         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");
+            .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");
+            .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");
+            .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 einsteinA = new BibEntry(StandardEntryType.InBook)
-                .withCitationKey(EINSTEIN_A)
-                .withField(StandardField.CROSSREF, EINSTEIN)
-                .withField(StandardField.PAGES, "22--23");
+            .withCitationKey(EINSTEIN_A)
+            .withField(StandardField.CROSSREF, EINSTEIN)
+            .withField(StandardField.PAGES, "22--23");
         database2.insertEntry(einsteinA);
 
         BibEntry einsteinB = new BibEntry(StandardEntryType.InBook)
-                .withCitationKey(EINSTEIN_B)
-                .withField(StandardField.CROSSREF, "Einstein1921")
-                .withField(StandardField.PAGES, "22--23");
+            .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");
+            .withCitationKey(EINSTEIN_C)
+            .withField(StandardField.CROSSREF, EINSTEIN)
+            .withField(StandardField.PAGES, "25--33");
         database.insertEntry(einsteinC);
 
-        bibEntry = new BibEntry(StandardEntryType.InBook)
+        bibEntry =
+            new BibEntry(StandardEntryType.InBook)
                 .withCitationKey(EINSTEIN_A)
-                .withField(StandardField.TITLE, "Relativity: The special and general theory")
+                .withField(
+                    StandardField.TITLE,
+                    "Relativity: The special and general theory"
+                )
                 .withField(StandardField.PUBLISHER, "Penguin")
                 .withField(StandardField.YEAR, "1920")
                 .withField(StandardField.AUTHOR, "Einstein, Albert")
@@ -99,67 +113,136 @@ void setUp() {
 
     @Test
     public void testSingleFile() throws URISyntaxException {
-        Path texFile = Path.of(TexBibEntriesResolverTest.class.getResource("paper.tex").toURI());
-        LatexParserResult parserResult = new DefaultLatexParser().parse(texFile);
-
-        LatexBibEntriesResolverResult crossingResult = new TexBibEntriesResolver(database, libraryPreferences, importFormatPreferences, fileMonitor).resolve(parserResult);
-        LatexBibEntriesResolverResult expectedCrossingResult = new LatexBibEntriesResolverResult(parserResult);
+        Path texFile = Path.of(
+            TexBibEntriesResolverTest.class.getResource("paper.tex").toURI()
+        );
+        LatexParserResult parserResult = new DefaultLatexParser()
+            .parse(texFile);
+
+        LatexBibEntriesResolverResult crossingResult =
+            new TexBibEntriesResolver(
+                database,
+                libraryPreferences,
+                importFormatPreferences,
+                fileMonitor
+            )
+                .resolve(parserResult);
+        LatexBibEntriesResolverResult expectedCrossingResult =
+            new LatexBibEntriesResolverResult(parserResult);
 
         assertEquals(expectedCrossingResult, crossingResult);
     }
 
     @Test
     public void testTwoFiles() throws URISyntaxException {
-        Path texFile = Path.of(TexBibEntriesResolverTest.class.getResource("paper.tex").toURI());
-        Path texFile2 = Path.of(TexBibEntriesResolverTest.class.getResource("paper2.tex").toURI());
-        LatexParserResult parserResult = new DefaultLatexParser().parse(Arrays.asList(texFile, texFile2));
-
-        LatexBibEntriesResolverResult crossingResult = new TexBibEntriesResolver(database, libraryPreferences, importFormatPreferences, fileMonitor).resolve(parserResult);
-        LatexBibEntriesResolverResult expectedCrossingResult = new LatexBibEntriesResolverResult(parserResult);
+        Path texFile = Path.of(
+            TexBibEntriesResolverTest.class.getResource("paper.tex").toURI()
+        );
+        Path texFile2 = Path.of(
+            TexBibEntriesResolverTest.class.getResource("paper2.tex").toURI()
+        );
+        LatexParserResult parserResult = new DefaultLatexParser()
+            .parse(Arrays.asList(texFile, texFile2));
+
+        LatexBibEntriesResolverResult crossingResult =
+            new TexBibEntriesResolver(
+                database,
+                libraryPreferences,
+                importFormatPreferences,
+                fileMonitor
+            )
+                .resolve(parserResult);
+        LatexBibEntriesResolverResult expectedCrossingResult =
+            new LatexBibEntriesResolverResult(parserResult);
 
         assertEquals(expectedCrossingResult, crossingResult);
     }
 
     @Test
     public void testDuplicateFiles() throws URISyntaxException {
-        Path texFile = Path.of(TexBibEntriesResolverTest.class.getResource("paper.tex").toURI());
-        LatexParserResult parserResult = new DefaultLatexParser().parse(texFile);
-
-        LatexBibEntriesResolverResult crossingResult = new TexBibEntriesResolver(database, libraryPreferences, importFormatPreferences, fileMonitor).resolve(parserResult);
-        LatexBibEntriesResolverResult expectedCrossingResult = new LatexBibEntriesResolverResult(parserResult);
+        Path texFile = Path.of(
+            TexBibEntriesResolverTest.class.getResource("paper.tex").toURI()
+        );
+        LatexParserResult parserResult = new DefaultLatexParser()
+            .parse(texFile);
+
+        LatexBibEntriesResolverResult crossingResult =
+            new TexBibEntriesResolver(
+                database,
+                libraryPreferences,
+                importFormatPreferences,
+                fileMonitor
+            )
+                .resolve(parserResult);
+        LatexBibEntriesResolverResult expectedCrossingResult =
+            new LatexBibEntriesResolverResult(parserResult);
 
         assertEquals(expectedCrossingResult, crossingResult);
     }
 
     @Test
     public void testUnknownKey() throws URISyntaxException {
-        Path texFile = Path.of(TexBibEntriesResolverTest.class.getResource("unknown_key.tex").toURI());
-        LatexParserResult parserResult = new DefaultLatexParser().parse(texFile);
-
-        LatexBibEntriesResolverResult crossingResult = new TexBibEntriesResolver(database, libraryPreferences, importFormatPreferences, fileMonitor).resolve(parserResult);
-        LatexBibEntriesResolverResult expectedCrossingResult = new LatexBibEntriesResolverResult(parserResult);
+        Path texFile = Path.of(
+            TexBibEntriesResolverTest.class.getResource("unknown_key.tex")
+                .toURI()
+        );
+        LatexParserResult parserResult = new DefaultLatexParser()
+            .parse(texFile);
+
+        LatexBibEntriesResolverResult crossingResult =
+            new TexBibEntriesResolver(
+                database,
+                libraryPreferences,
+                importFormatPreferences,
+                fileMonitor
+            )
+                .resolve(parserResult);
+        LatexBibEntriesResolverResult expectedCrossingResult =
+            new LatexBibEntriesResolverResult(parserResult);
 
         assertEquals(expectedCrossingResult, crossingResult);
     }
 
     @Test
     public void testNestedFiles() throws URISyntaxException {
-        Path texFile = Path.of(TexBibEntriesResolverTest.class.getResource("nested.tex").toURI());
-        LatexParserResult parserResult = new DefaultLatexParser().parse(texFile);
-
-        LatexBibEntriesResolverResult crossingResult = new TexBibEntriesResolver(database, libraryPreferences, importFormatPreferences, fileMonitor).resolve(parserResult);
-        LatexBibEntriesResolverResult expectedCrossingResult = new LatexBibEntriesResolverResult(parserResult);
+        Path texFile = Path.of(
+            TexBibEntriesResolverTest.class.getResource("nested.tex").toURI()
+        );
+        LatexParserResult parserResult = new DefaultLatexParser()
+            .parse(texFile);
+
+        LatexBibEntriesResolverResult crossingResult =
+            new TexBibEntriesResolver(
+                database,
+                libraryPreferences,
+                importFormatPreferences,
+                fileMonitor
+            )
+                .resolve(parserResult);
+        LatexBibEntriesResolverResult expectedCrossingResult =
+            new LatexBibEntriesResolverResult(parserResult);
 
         assertEquals(expectedCrossingResult, crossingResult);
     }
 
     @Test
     public void testCrossRef() throws URISyntaxException {
-        Path texFile = Path.of(TexBibEntriesResolverTest.class.getResource("crossref.tex").toURI());
-        LatexParserResult parserResult = new DefaultLatexParser().parse(texFile);
-
-        LatexBibEntriesResolverResult crossingResult = new TexBibEntriesResolver(database, libraryPreferences, importFormatPreferences, fileMonitor).resolve(parserResult);
-        LatexBibEntriesResolverResult expectedCrossingResult = new LatexBibEntriesResolverResult(parserResult);
+        Path texFile = Path.of(
+            TexBibEntriesResolverTest.class.getResource("crossref.tex").toURI()
+        );
+        LatexParserResult parserResult = new DefaultLatexParser()
+            .parse(texFile);
+
+        LatexBibEntriesResolverResult crossingResult =
+            new TexBibEntriesResolver(
+                database,
+                libraryPreferences,
+                importFormatPreferences,
+                fileMonitor
+            )
+                .resolve(parserResult);
+        LatexBibEntriesResolverResult expectedCrossingResult =
+            new LatexBibEntriesResolverResult(parserResult);
 
         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 ed057a09344..ecf5ce4f517 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;
+
 public class BuildInfoTest {
 
     @Test
@@ -15,7 +15,9 @@ public void testDefaults() {
 
     @Test
     public void testFileImport() {
-        BuildInfo buildInfo = new BuildInfo("/org/jabref/util/build.properties");
+        BuildInfo buildInfo = new BuildInfo(
+            "/org/jabref/util/build.properties"
+        );
         assertEquals("42", buildInfo.version.getFullVersion());
     }
 
diff --git a/src/test/java/org/jabref/logic/util/DevelopmentStageTest.java b/src/test/java/org/jabref/logic/util/DevelopmentStageTest.java
index b2d33d2eed7..16a62edace3 100644
--- a/src/test/java/org/jabref/logic/util/DevelopmentStageTest.java
+++ b/src/test/java/org/jabref/logic/util/DevelopmentStageTest.java
@@ -1,35 +1,66 @@
 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;
+
 public class DevelopmentStageTest {
 
     @Test
     public void checkStabilityOrder() {
-        assertTrue(Version.DevelopmentStage.ALPHA.isMoreStableThan(Version.DevelopmentStage.UNKNOWN));
-        assertTrue(Version.DevelopmentStage.BETA.isMoreStableThan(Version.DevelopmentStage.ALPHA));
-        assertTrue(Version.DevelopmentStage.STABLE.isMoreStableThan(Version.DevelopmentStage.BETA));
+        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
     public void parseStages() {
-        assertEquals(Version.DevelopmentStage.ALPHA, Version.DevelopmentStage.parse("-alpha"));
-        assertEquals(Version.DevelopmentStage.BETA, Version.DevelopmentStage.parse("-beta"));
-        assertEquals(Version.DevelopmentStage.STABLE, Version.DevelopmentStage.parse(""));
+        assertEquals(
+            Version.DevelopmentStage.ALPHA,
+            Version.DevelopmentStage.parse("-alpha")
+        );
+        assertEquals(
+            Version.DevelopmentStage.BETA,
+            Version.DevelopmentStage.parse("-beta")
+        );
+        assertEquals(
+            Version.DevelopmentStage.STABLE,
+            Version.DevelopmentStage.parse("")
+        );
     }
 
     @Test
     public void parseNull() {
-        assertEquals(Version.DevelopmentStage.UNKNOWN, Version.DevelopmentStage.parse(null));
+        assertEquals(
+            Version.DevelopmentStage.UNKNOWN,
+            Version.DevelopmentStage.parse(null)
+        );
     }
 
     @Test
     public void parseUnknownString() {
-        assertEquals(Version.DevelopmentStage.UNKNOWN, Version.DevelopmentStage.parse("asdf"));
+        assertEquals(
+            Version.DevelopmentStage.UNKNOWN,
+            Version.DevelopmentStage.parse("asdf")
+        );
     }
 }
diff --git a/src/test/java/org/jabref/logic/util/ExternalLinkCreatorTest.java b/src/test/java/org/jabref/logic/util/ExternalLinkCreatorTest.java
index 736518e843d..8e28cd819d5 100644
--- a/src/test/java/org/jabref/logic/util/ExternalLinkCreatorTest.java
+++ b/src/test/java/org/jabref/logic/util/ExternalLinkCreatorTest.java
@@ -1,19 +1,17 @@
 package org.jabref.logic.util;
 
+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.URISyntaxException;
 import java.net.URL;
 import java.util.Optional;
-
 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;
-
 class ExternalLinkCreatorTest {
 
     /**
@@ -48,9 +46,15 @@ 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+bibliography+management"), url);
+        assertEquals(
+            Optional.of(
+                "https://www.shortscience.org/internalsearch?q=JabRef+bibliography+management"
+            ),
+            url
+        );
     }
 }
diff --git a/src/test/java/org/jabref/logic/util/FileNameCleanerTest.java b/src/test/java/org/jabref/logic/util/FileNameCleanerTest.java
index 14911166b4c..8ce76811f4d 100644
--- a/src/test/java/org/jabref/logic/util/FileNameCleanerTest.java
+++ b/src/test/java/org/jabref/logic/util/FileNameCleanerTest.java
@@ -1,36 +1,67 @@
 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;
-
 public class FileNameCleanerTest {
 
     @Test
     public void testCleanFileName() {
-        assertEquals("legalFilename.txt", FileNameCleaner.cleanFileName("legalFilename.txt"));
-        assertEquals("illegalFilename______.txt", FileNameCleaner.cleanFileName("illegalFilename/?*<>|.txt"));
-        assertEquals("illegalFileName_.txt", FileNameCleaner.cleanFileName("illegalFileName{.txt"));
+        assertEquals(
+            "legalFilename.txt",
+            FileNameCleaner.cleanFileName("legalFilename.txt")
+        );
+        assertEquals(
+            "illegalFilename______.txt",
+            FileNameCleaner.cleanFileName("illegalFilename/?*<>|.txt")
+        );
+        assertEquals(
+            "illegalFileName_.txt",
+            FileNameCleaner.cleanFileName("illegalFileName{.txt")
+        );
     }
 
     @Test
     public void testCleanDirectoryName() {
-        assertEquals("legalFilename.txt", FileNameCleaner.cleanDirectoryName("legalFilename.txt"));
-        assertEquals("subdir/legalFilename.txt", FileNameCleaner.cleanDirectoryName("subdir/legalFilename.txt"));
-        assertEquals("illegalFilename/_____.txt", FileNameCleaner.cleanDirectoryName("illegalFilename/?*<>|.txt"));
+        assertEquals(
+            "legalFilename.txt",
+            FileNameCleaner.cleanDirectoryName("legalFilename.txt")
+        );
+        assertEquals(
+            "subdir/legalFilename.txt",
+            FileNameCleaner.cleanDirectoryName("subdir/legalFilename.txt")
+        );
+        assertEquals(
+            "illegalFilename/_____.txt",
+            FileNameCleaner.cleanDirectoryName("illegalFilename/?*<>|.txt")
+        );
     }
 
     @Test
     public void testCleanDirectoryNameForWindows() {
-        assertEquals("legalFilename.txt", FileNameCleaner.cleanDirectoryName("legalFilename.txt"));
-        assertEquals("subdir\\legalFilename.txt", FileNameCleaner.cleanDirectoryName("subdir\\legalFilename.txt"));
-        assertEquals("illegalFilename\\_____.txt", FileNameCleaner.cleanDirectoryName("illegalFilename\\?*<>|.txt"));
+        assertEquals(
+            "legalFilename.txt",
+            FileNameCleaner.cleanDirectoryName("legalFilename.txt")
+        );
+        assertEquals(
+            "subdir\\legalFilename.txt",
+            FileNameCleaner.cleanDirectoryName("subdir\\legalFilename.txt")
+        );
+        assertEquals(
+            "illegalFilename\\_____.txt",
+            FileNameCleaner.cleanDirectoryName("illegalFilename\\?*<>|.txt")
+        );
     }
 
     @Test
     public void testCleanCurlyBracesAsWell() {
-        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 5012e054f75..e07920d04e0 100644
--- a/src/test/java/org/jabref/logic/util/UpdateFieldTest.java
+++ b/src/test/java/org/jabref/logic/util/UpdateFieldTest.java
@@ -1,25 +1,23 @@
 package org.jabref.logic.util;
 
+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;
-
 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;
-
 public class UpdateFieldTest {
 
     private BibEntry entry;
@@ -53,13 +51,21 @@ public void testUpdateFieldHasChanged() {
 
     @Test
     public void testUpdateFieldValidFieldChange() {
-        Optional<FieldChange> change = UpdateField.updateField(entry, StandardField.YEAR, "2016");
+        Optional<FieldChange> change = UpdateField.updateField(
+            entry,
+            StandardField.YEAR,
+            "2016"
+        );
         assertTrue(change.isPresent());
     }
 
     @Test
     public void testUpdateFieldCorrectFieldChangeContentsEmptyField() {
-        Optional<FieldChange> change = UpdateField.updateField(entry, StandardField.YEAR, "2016");
+        Optional<FieldChange> change = UpdateField.updateField(
+            entry,
+            StandardField.YEAR,
+            "2016"
+        );
         assertNull(change.get().getOldValue());
         assertEquals(StandardField.YEAR, change.get().getField());
         assertEquals("2016", change.get().getNewValue());
@@ -69,7 +75,11 @@ public void testUpdateFieldCorrectFieldChangeContentsEmptyField() {
     @Test
     public void testUpdateFieldCorrectFieldChangeContentsNonEmptyField() {
         entry.setField(StandardField.YEAR, "2015");
-        Optional<FieldChange> change = UpdateField.updateField(entry, StandardField.YEAR, "2016");
+        Optional<FieldChange> change = UpdateField.updateField(
+            entry,
+            StandardField.YEAR,
+            "2016"
+        );
         assertEquals("2015", change.get().getOldValue());
         assertEquals(StandardField.YEAR, change.get().getField());
         assertEquals("2016", change.get().getNewValue());
@@ -79,7 +89,11 @@ public void testUpdateFieldCorrectFieldChangeContentsNonEmptyField() {
     @Test
     public void testUpdateFieldSameValueNoChange() {
         entry.setField(StandardField.YEAR, "2016");
-        Optional<FieldChange> change = UpdateField.updateField(entry, StandardField.YEAR, "2016");
+        Optional<FieldChange> change = UpdateField.updateField(
+            entry,
+            StandardField.YEAR,
+            "2016"
+        );
         assertFalse(change.isPresent());
     }
 
@@ -107,20 +121,32 @@ public void testUpdateFieldSetEmptyToNullClears() {
     @Test
     public void testUpdateFieldSetToNullHasFieldChangeContents() {
         entry.setField(StandardField.YEAR, "2016");
-        Optional<FieldChange> change = UpdateField.updateField(entry, StandardField.YEAR, null);
+        Optional<FieldChange> change = UpdateField.updateField(
+            entry,
+            StandardField.YEAR,
+            null
+        );
         assertTrue(change.isPresent());
     }
 
     @Test
     public void testUpdateFieldSetRmptyToNullHasNoFieldChangeContents() {
-        Optional<FieldChange> change = UpdateField.updateField(entry, StandardField.YEAR, null);
+        Optional<FieldChange> change = UpdateField.updateField(
+            entry,
+            StandardField.YEAR,
+            null
+        );
         assertFalse(change.isPresent());
     }
 
     @Test
     public void testUpdateFieldSetToNullCorrectFieldChangeContents() {
         entry.setField(StandardField.YEAR, "2016");
-        Optional<FieldChange> change = UpdateField.updateField(entry, StandardField.YEAR, null);
+        Optional<FieldChange> change = UpdateField.updateField(
+            entry,
+            StandardField.YEAR,
+            null
+        );
         assertNull(change.get().getNewValue());
         assertEquals(StandardField.YEAR, change.get().getField());
         assertEquals("2016", change.get().getOldValue());
@@ -145,14 +171,24 @@ public void testUpdateFieldSameContentHasChanged() {
     @Test
     public void testUpdateFieldSameContentHasFieldChange() {
         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
     public void testUpdateFieldSameContentHasCorrectFieldChange() {
         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());
@@ -162,7 +198,11 @@ public void testUpdateFieldSameContentHasCorrectFieldChange() {
     @Test
     public void testUpdateNonDisplayableFieldUpdates() {
         assertFalse(entry.hasField(StandardField.YEAR));
-        UpdateField.updateNonDisplayableField(entry, StandardField.YEAR, "2016");
+        UpdateField.updateNonDisplayableField(
+            entry,
+            StandardField.YEAR,
+            "2016"
+        );
         assertTrue(entry.hasField(StandardField.YEAR));
         assertEquals(Optional.of("2016"), entry.getField(StandardField.YEAR));
     }
@@ -170,28 +210,51 @@ public void testUpdateNonDisplayableFieldUpdates() {
     @Test
     public void testUpdateNonDisplayableFieldHasNotChanged() {
         assertFalse(entry.hasChanged());
-        UpdateField.updateNonDisplayableField(entry, StandardField.YEAR, "2016");
+        UpdateField.updateNonDisplayableField(
+            entry,
+            StandardField.YEAR,
+            "2016"
+        );
         assertFalse(entry.hasChanged());
     }
 
     @Test
     public void emptyOwnerFieldNowPresentAfterAutomaticSet() {
-        assertEquals(Optional.empty(), entry.getField(StandardField.OWNER), "Owner is present");
+        assertEquals(
+            Optional.empty(),
+            entry.getField(StandardField.OWNER),
+            "Owner is present"
+        );
 
         OwnerPreferences ownerPreferences = createOwnerPreference(true, true);
         TimestampPreferences timestampPreferences = createTimestampPreference();
-        UpdateField.setAutomaticFields(List.of(entry), ownerPreferences, timestampPreferences);
-
-        assertEquals(Optional.of("testDefaultOwner"), entry.getField(StandardField.OWNER), "No owner exists");
+        UpdateField.setAutomaticFields(
+            List.of(entry),
+            ownerPreferences,
+            timestampPreferences
+        );
+
+        assertEquals(
+            Optional.of("testDefaultOwner"),
+            entry.getField(StandardField.OWNER),
+            "No owner exists"
+        );
     }
 
     @Test
     public void ownerAssignedCorrectlyAfterAutomaticSet() {
         OwnerPreferences ownerPreferences = createOwnerPreference(true, true);
         TimestampPreferences timestampPreferences = createTimestampPreference();
-        UpdateField.setAutomaticFields(List.of(entry), ownerPreferences, timestampPreferences);
-
-        assertEquals(Optional.of("testDefaultOwner"), entry.getField(StandardField.OWNER));
+        UpdateField.setAutomaticFields(
+            List.of(entry),
+            ownerPreferences,
+            timestampPreferences
+        );
+
+        assertEquals(
+            Optional.of("testDefaultOwner"),
+            entry.getField(StandardField.OWNER)
+        );
     }
 
     @Test
@@ -199,38 +262,73 @@ public void ownerIsNotResetAfterAutomaticSetIfOverwriteOwnerFalse() {
         String alreadySetOwner = "alreadySetOwner";
         entry.setField(StandardField.OWNER, alreadySetOwner);
 
-        assertEquals(Optional.of(alreadySetOwner), entry.getField(StandardField.OWNER));
+        assertEquals(
+            Optional.of(alreadySetOwner),
+            entry.getField(StandardField.OWNER)
+        );
 
         OwnerPreferences ownerPreferences = createOwnerPreference(true, false);
         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");
+        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"
+        );
     }
 
     @Test
     public 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();
-        UpdateField.setAutomaticFields(List.of(entry), ownerPreferences, timestampPreferences);
+        UpdateField.setAutomaticFields(
+            List.of(entry),
+            ownerPreferences,
+            timestampPreferences
+        );
 
         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
     public void creationDateAssignedCorrectlyAfterAutomaticSet() {
         OwnerPreferences ownerPreferences = createOwnerPreference(true, true);
         TimestampPreferences timestampPreferences = createTimestampPreference();
-        UpdateField.setAutomaticFields(List.of(entry), ownerPreferences, timestampPreferences);
+        UpdateField.setAutomaticFields(
+            List.of(entry),
+            ownerPreferences,
+            timestampPreferences
+        );
 
         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,21 +336,49 @@ public 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);
 
         OwnerPreferences ownerPreferences = createOwnerPreference(true, true);
         TimestampPreferences timestampPreferences = createTimestampPreference();
-        UpdateField.setAutomaticFields(bibs, ownerPreferences, timestampPreferences);
+        UpdateField.setAutomaticFields(
+            bibs,
+            ownerPreferences,
+            timestampPreferences
+        );
 
         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,25 +389,54 @@ public 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);
 
         OwnerPreferences ownerPreferences = createOwnerPreference(true, false);
         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");
+        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"
+        );
     }
 
-    private OwnerPreferences createOwnerPreference(boolean useOwner, boolean overwriteOwner) {
+    private OwnerPreferences createOwnerPreference(
+        boolean useOwner,
+        boolean overwriteOwner
+    ) {
         String defaultOwner = "testDefaultOwner";
         return new OwnerPreferences(useOwner, defaultOwner, overwriteOwner);
     }
 
     private TimestampPreferences createTimestampPreference() {
-        return new TimestampPreferences(true, true, true, StandardField.CREATIONDATE, "dd.mm.yyyy");
+        return new TimestampPreferences(
+            true,
+            true,
+            true,
+            StandardField.CREATIONDATE,
+            "dd.mm.yyyy"
+        );
     }
 }
diff --git a/src/test/java/org/jabref/logic/util/VersionTest.java b/src/test/java/org/jabref/logic/util/VersionTest.java
index 5e04e7d234a..9c747be65ba 100644
--- a/src/test/java/org/jabref/logic/util/VersionTest.java
+++ b/src/test/java/org/jabref/logic/util/VersionTest.java
@@ -1,20 +1,18 @@
 package org.jabref.logic.util;
 
+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;
-
 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;
-
 public class VersionTest {
 
     @Test
@@ -217,13 +215,19 @@ public void equalVersionsNotNewer() {
     @Test
     public 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
     public 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,40 @@ public 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
     public 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
     public 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
@@ -310,8 +332,14 @@ public void stableShouldNotBeUpdatedToBeta() {
     public void alphaShouldBeUpdatedToStables() {
         Version alpha = Version.parse("2.8-alpha");
         Version stable = Version.parse("2.8");
-        List<Version> availableVersions = Arrays.asList(Version.parse("2.8-beta"), stable);
-        assertEquals(Optional.of(stable), alpha.shouldBeUpdatedTo(availableVersions));
+        List<Version> availableVersions = Arrays.asList(
+            Version.parse("2.8-beta"),
+            stable
+        );
+        assertEquals(
+            Optional.of(stable),
+            alpha.shouldBeUpdatedTo(availableVersions)
+        );
     }
 
     @Test
@@ -330,6 +358,9 @@ public void ciSuffixShouldBeRemovedIfDateIsPresent() {
     @FetcherTest
     @DisabledOnCIServer("GitHub puts a low rate limit on unauthenticated calls")
     public void getAllAvailableVersionsReturnsSomething() throws Exception {
-        assertNotEquals(Collections.emptyList(), Version.getAllAvailableVersions());
+        assertNotEquals(
+            Collections.emptyList(),
+            Version.getAllAvailableVersions()
+        );
     }
 }
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 a5ad81b76d9..61031578098 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,13 @@
 package org.jabref.logic.util.io;
 
+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 org.jabref.logic.util.BackupFileType;
 import org.jabref.logic.util.OS;
-
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.io.TempDir;
@@ -14,9 +15,6 @@
 import org.mockito.MockedStatic;
 import org.mockito.Mockito;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertNotEquals;
-
 public class BackupFileUtilTest {
 
     Path backupDir;
@@ -29,14 +27,23 @@ void setup(@TempDir Path tempDir) {
     @Test
     void uniqueFilePrefix() {
         // We cannot test for a concrete hash code, because hashing implementation differs from environment to environment
-        assertNotEquals("", BackupFileUtil.getUniqueFilePrefix(Path.of("test.bib")));
+        assertNotEquals(
+            "",
+            BackupFileUtil.getUniqueFilePrefix(Path.of("test.bib"))
+        );
     }
 
     @Test
     void getPathOfBackupFileAndCreateDirectoryReturnsAppDirectoryInCaseOfNoError() {
         String start = OS.getNativeDesktop().getBackupDirectory().toString();
         backupDir = OS.getNativeDesktop().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,11 +51,26 @@ void getPathOfBackupFileAndCreateDirectoryReturnsAppDirectoryInCaseOfNoError() {
     @Test
     void getPathOfBackupFileAndCreateDirectoryReturnsSameDirectoryInCaseOfException() {
         backupDir = OS.getNativeDesktop().getBackupDirectory();
-        try (MockedStatic<Files> files = Mockito.mockStatic(Files.class, Answers.RETURNS_DEEP_STUBS)) {
-            files.when(() -> Files.createDirectories(OS.getNativeDesktop().getBackupDirectory()))
-                 .thenThrow(new IOException());
+        try (
+            MockedStatic<Files> files = Mockito.mockStatic(
+                Files.class,
+                Answers.RETURNS_DEEP_STUBS
+            )
+        ) {
+            files
+                .when(() ->
+                    Files.createDirectories(
+                        OS.getNativeDesktop().getBackupDirectory()
+                    )
+                )
+                .thenThrow(new IOException());
             Path testPath = Path.of("tmp", "test.bib");
-            Path result = BackupFileUtil.getPathForNewBackupFileAndCreateDirectory(testPath, BackupFileType.BACKUP, backupDir);
+            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 3f29211f4e0..9b50c888612 100644
--- a/src/test/java/org/jabref/logic/util/io/CitationKeyBasedFileFinderTest.java
+++ b/src/test/java/org/jabref/logic/util/io/CitationKeyBasedFileFinderTest.java
@@ -1,22 +1,20 @@
 package org.jabref.logic.util.io;
 
+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;
-
 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;
-
 class CitationKeyBasedFileFinderTest {
 
     private BibEntry entry;
@@ -33,7 +31,9 @@ void setUp(@TempDir Path temporaryFolder) throws IOException {
 
         rootDir = temporaryFolder;
 
-        Path subDir = Files.createDirectory(rootDir.resolve("Organization Science"));
+        Path subDir = Files.createDirectory(
+            rootDir.resolve("Organization Science")
+        );
         pdfsDir = Files.createDirectory(rootDir.resolve("pdfs"));
 
         Files.createFile(subDir.resolve("HipKro03 - Hello.pdf"));
@@ -53,7 +53,9 @@ void setUp(@TempDir Path temporaryFolder) throws IOException {
         Files.createFile(dirTest.resolve("foo.dat"));
 
         graphicsDir = Files.createDirectory(rootDir.resolve("graphicsDir"));
-        Path graphicsSubDir = Files.createDirectories(graphicsDir.resolve("subDir"));
+        Path graphicsSubDir = Files.createDirectories(
+            graphicsDir.resolve("subDir")
+        );
 
         jpgFile = Files.createFile(graphicsSubDir.resolve("HipKro03 test.jpg"));
         Files.createFile(graphicsSubDir.resolve("HipKro03 test.png"));
@@ -65,64 +67,103 @@ void findAssociatedFilesInSubDirectories() throws Exception {
         List<Path> dirs = Arrays.asList(graphicsDir, pdfsDir);
         FileFinder fileFinder = new CitationKeyBasedFileFinder(false);
 
-        List<Path> results = fileFinder.findAssociatedFiles(entry, dirs, extensions);
+        List<Path> results = fileFinder.findAssociatedFiles(
+            entry,
+            dirs,
+            extensions
+        );
 
         assertEquals(Arrays.asList(jpgFile, pdfFile), results);
     }
 
     @Test
-    void findAssociatedFilesIgnoresFilesStartingWithKeyButContinueWithText() throws Exception {
+    void findAssociatedFilesIgnoresFilesStartingWithKeyButContinueWithText()
+        throws Exception {
         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);
     }
 
     @Test
     void findAssociatedFilesFindsFilesStartingWithKey() throws Exception {
-        Path secondPdfFile = Files.createFile(pdfsDir.resolve("HipKro03_Hello second paper.pdf"));
+        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);
     }
 
     @Test
-    void findAssociatedFilesInNonExistingDirectoryFindsNothing() throws Exception {
+    void findAssociatedFilesInNonExistingDirectoryFindsNothing()
+        throws Exception {
         List<String> extensions = Arrays.asList("jpg", "pdf");
-        List<Path> dirs = Collections.singletonList(rootDir.resolve("asdfasdf/asdfasdf"));
-        CitationKeyBasedFileFinder fileFinder = new CitationKeyBasedFileFinder(false);
-
-        List<Path> results = fileFinder.findAssociatedFiles(entry, dirs, extensions);
+        List<Path> dirs = Collections.singletonList(
+            rootDir.resolve("asdfasdf/asdfasdf")
+        );
+        CitationKeyBasedFileFinder fileFinder = new CitationKeyBasedFileFinder(
+            false
+        );
+
+        List<Path> results = fileFinder.findAssociatedFiles(
+            entry,
+            dirs,
+            extensions
+        );
 
         assertEquals(Collections.emptyList(), results);
     }
 
     @Test
-    void findAssociatedFilesWithUnsafeCharactersStartWithSearch() throws Exception {
-        BibEntry entryWithUnsafeCitationKey = new BibEntry(StandardEntryType.Article);
+    void findAssociatedFilesWithUnsafeCharactersStartWithSearch()
+        throws Exception {
+        BibEntry entryWithUnsafeCitationKey = new BibEntry(
+            StandardEntryType.Article
+        );
         entryWithUnsafeCitationKey.setCitationKey("?test");
 
         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);
     }
 
     @Test
     void findAssociatedFilesWithUnsafeCharactersExactSearch() throws Exception {
-        BibEntry entryWithUnsafeCitationKey = new BibEntry(StandardEntryType.Article);
+        BibEntry entryWithUnsafeCitationKey = new BibEntry(
+            StandardEntryType.Article
+        );
         entryWithUnsafeCitationKey.setCitationKey("test:test/*test?");
 
-        Path testFile = Files.createFile(pdfsDir.resolve("test_test__test_.pdf"));
+        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 6d37300cfa3..b7f201e87a1 100644
--- a/src/test/java/org/jabref/logic/util/io/FileHistoryTest.java
+++ b/src/test/java/org/jabref/logic/util/io/FileHistoryTest.java
@@ -1,17 +1,17 @@
 package org.jabref.logic.util.io;
 
+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;
-
 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 FileHistoryTest {
+
     private FileHistory history;
 
     @BeforeEach
@@ -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 a54aadf58b4..1d98375acb7 100644
--- a/src/test/java/org/jabref/logic/util/io/FileNameUniquenessTest.java
+++ b/src/test/java/org/jabref/logic/util/io/FileNameUniquenessTest.java
@@ -1,51 +1,61 @@
 package org.jabref.logic.util.io;
 
+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 org.jabref.gui.DialogService;
-
 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;
-
 public class FileNameUniquenessTest {
 
     @TempDir
     protected Path tempDir;
 
     @Test
-    public void testGetNonOverWritingFileNameReturnsSameName() throws IOException {
+    public void testGetNonOverWritingFileNameReturnsSameName()
+        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);
     }
 
     @Test
-    public void testGetNonOverWritingFileNameReturnsUniqueNameOver1Conflict() throws IOException {
+    public void testGetNonOverWritingFileNameReturnsUniqueNameOver1Conflict()
+        throws IOException {
         Path dummyFilePath1 = tempDir.resolve("differentFile.txt");
 
         Files.createFile(dummyFilePath1);
 
-        String outputFileName = FileNameUniqueness.getNonOverWritingFileName(tempDir, "differentFile.txt");
+        String outputFileName = FileNameUniqueness.getNonOverWritingFileName(
+            tempDir,
+            "differentFile.txt"
+        );
         assertEquals("differentFile (1).txt", outputFileName);
     }
 
     @Test
-    public void testGetNonOverWritingFileNameReturnsUniqueNameOverNConflicts() throws IOException {
+    public void testGetNonOverWritingFileNameReturnsUniqueNameOverNConflicts()
+        throws IOException {
         Path dummyFilePath1 = tempDir.resolve("manyfiles.txt");
         Path dummyFilePath2 = tempDir.resolve("manyfiles (1).txt");
 
         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);
     }
 
@@ -56,7 +66,11 @@ public void testIsDuplicatedFileWithNoSimilarNames() throws IOException {
         Path filePath1 = tempDir.resolve(filename1);
         Files.createFile(filePath1);
 
-        boolean isDuplicate = FileNameUniqueness.isDuplicatedFile(tempDir, filePath1, dialogService);
+        boolean isDuplicate = FileNameUniqueness.isDuplicatedFile(
+            tempDir,
+            filePath1,
+            dialogService
+        );
         assertFalse(isDuplicate);
     }
 
@@ -70,19 +84,25 @@ public void testIsDuplicatedFileWithOneSimilarNames() throws IOException {
         Files.createFile(filePath1);
         Files.createFile(filePath2);
 
-        boolean isDuplicate = FileNameUniqueness.isDuplicatedFile(tempDir, filePath2, dialogService);
+        boolean isDuplicate = FileNameUniqueness.isDuplicatedFile(
+            tempDir,
+            filePath2,
+            dialogService
+        );
         assertTrue(isDuplicate);
     }
 
     @Test
-    public void testTaseDuplicateMarksReturnsOrignalFileName1() throws IOException {
+    public void testTaseDuplicateMarksReturnsOrignalFileName1()
+        throws IOException {
         String fileName1 = "abc def (1)";
         String fileName2 = FileNameUniqueness.eraseDuplicateMarks(fileName1);
         assertEquals("abc def", fileName2);
     }
 
     @Test
-    public void testTaseDuplicateMarksReturnsOrignalFileName2() throws IOException {
+    public void testTaseDuplicateMarksReturnsOrignalFileName2()
+        throws IOException {
         String fileName1 = "abc (def) gh (1)";
         String fileName2 = FileNameUniqueness.eraseDuplicateMarks(fileName1);
         assertEquals("abc (def) gh", fileName2);
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 b5bf3b8d5b4..036f00931c6 100644
--- a/src/test/java/org/jabref/logic/util/io/FileUtilTest.java
+++ b/src/test/java/org/jabref/logic/util/io/FileUtilTest.java
@@ -1,5 +1,10 @@
 package org.jabref.logic.util.io;
 
+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.io.IOException;
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
@@ -9,25 +14,19 @@
 import java.util.Optional;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
-
 import org.jabref.architecture.AllowedToUseLogic;
 import org.jabref.logic.util.OS;
 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 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.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertNotEquals;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-
 @AllowedToUseLogic("uses OS from logic package")
 class FileUtilTest {
+
     private final Path nonExistingTestPath = Path.of("nonExistingTestPath");
     private Path existingTestFile;
     private Path otherExistingTestFile;
@@ -41,23 +40,35 @@ 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"),
-                FileUtil.addExtension(Path.of("tmp", "demo.bib"), ".bak"));
+        assertEquals(
+            Path.of("tmp", "demo.bib.bak"),
+            FileUtil.addExtension(Path.of("tmp", "demo.bib"), ".bak")
+        );
     }
 
     @Test
@@ -67,8 +78,10 @@ void testGetLinkedFileNameDefaultFullTitle() {
         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
@@ -78,8 +91,10 @@ void testGetLinkedFileNameDefaultWithLowercaseTitle() {
         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 +104,10 @@ void testGetLinkedFileNameBibTeXKey() {
         entry.setCitationKey("1234");
         entry.setField(StandardField.TITLE, "mytitle");
 
-        assertEquals("1234",
-                FileUtil.createFileNameFromPattern(null, entry, fileNamePattern));
+        assertEquals(
+            "1234",
+            FileUtil.createFileNameFromPattern(null, entry, fileNamePattern)
+        );
     }
 
     @Test
@@ -100,7 +117,10 @@ void testGetLinkedFileNameNoPattern() {
         entry.setCitationKey("1234");
         entry.setField(StandardField.TITLE, "mytitle");
 
-        assertEquals("1234", FileUtil.createFileNameFromPattern(null, entry, fileNamePattern));
+        assertEquals(
+            "1234",
+            FileUtil.createFileNameFromPattern(null, entry, fileNamePattern)
+        );
     }
 
     @Test
@@ -109,7 +129,10 @@ void testGetDefaultFileNameNoPatternNoBibTeXKey() {
         BibEntry entry = new BibEntry();
         entry.setField(StandardField.TITLE, "mytitle");
 
-        assertEquals("default", FileUtil.createFileNameFromPattern(null, entry, fileNamePattern));
+        assertEquals(
+            "default",
+            FileUtil.createFileNameFromPattern(null, entry, fileNamePattern)
+        );
     }
 
     @Test
@@ -118,7 +141,10 @@ void testGetLinkedFileNameGetKeyIfEmptyField() {
         BibEntry entry = new BibEntry();
         entry.setCitationKey("1234");
 
-        assertEquals("1234", FileUtil.createFileNameFromPattern(null, entry, fileNamePattern));
+        assertEquals(
+            "1234",
+            FileUtil.createFileNameFromPattern(null, entry, fileNamePattern)
+        );
     }
 
     @Test
@@ -126,7 +152,10 @@ void testGetLinkedFileNameGetDefaultIfEmptyFieldNoKey() {
         String fileNamePattern = "[title]";
         BibEntry entry = new BibEntry();
 
-        assertEquals("default", FileUtil.createFileNameFromPattern(null, entry, fileNamePattern));
+        assertEquals(
+            "default",
+            FileUtil.createFileNameFromPattern(null, entry, fileNamePattern)
+        );
     }
 
     @Test
@@ -137,27 +166,44 @@ void testGetLinkedFileNameByYearAuthorFirstpage() {
         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
     void testGetFileExtensionSimpleFile() {
-        assertEquals("pdf", FileUtil.getFileExtension(Path.of("test.pdf")).get());
+        assertEquals(
+            "pdf",
+            FileUtil.getFileExtension(Path.of("test.pdf")).get()
+        );
     }
 
     @Test
     void testGetFileExtensionMultipleDotsFile() {
-        assertEquals("pdf", FileUtil.getFileExtension(Path.of("te.st.PdF")).get());
+        assertEquals(
+            "pdf",
+            FileUtil.getFileExtension(Path.of("te.st.PdF")).get()
+        );
     }
 
     @Test
     void testGetFileExtensionNoExtensionFile() {
-        assertFalse(FileUtil.getFileExtension(Path.of("JustTextNotASingleDot")).isPresent());
+        assertFalse(
+            FileUtil
+                .getFileExtension(Path.of("JustTextNotASingleDot"))
+                .isPresent()
+        );
     }
 
     @Test
     void testGetFileExtensionNoExtension2File() {
-        assertFalse(FileUtil.getFileExtension(Path.of(".StartsWithADotIsNotAnExtension")).isPresent());
+        assertFalse(
+            FileUtil
+                .getFileExtension(Path.of(".StartsWithADotIsNotAnExtension"))
+                .isPresent()
+        );
     }
 
     @Test
@@ -177,12 +223,18 @@ void getFileExtensionWithMultipleDotsString() {
 
     @Test
     void getFileExtensionWithNoDotReturnsEmptyExtension() {
-        assertEquals(Optional.empty(), FileUtil.getFileExtension("JustTextNotASingleDot"));
+        assertEquals(
+            Optional.empty(),
+            FileUtil.getFileExtension("JustTextNotASingleDot")
+        );
     }
 
     @Test
     void getFileExtensionWithDotAtStartReturnsEmptyExtension() {
-        assertEquals(Optional.empty(), FileUtil.getFileExtension(".StartsWithADotIsNotAnExtension"));
+        assertEquals(
+            Optional.empty(),
+            FileUtil.getFileExtension(".StartsWithADotIsNotAnExtension")
+        );
     }
 
     @Test
@@ -197,16 +249,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);
@@ -214,34 +270,60 @@ void uniquePathSubstrings() {
 
     @Test
     void testUniquePathFragmentWithSameSuffix() {
-        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 testUniquePathFragmentWithSameSuffixAndLongerName() {
-        List<String> dirs = List.of("/users/jabref/bibliography.bib", "/users/jabref/koppor-bibliography.bib");
-        assertEquals(Optional.of("koppor-bibliography.bib"), FileUtil.getUniquePathFragment(dirs, Path.of("/users/jabref/koppor-bibliography.bib")));
+        List<String> dirs = List.of(
+            "/users/jabref/bibliography.bib",
+            "/users/jabref/koppor-bibliography.bib"
+        );
+        assertEquals(
+            Optional.of("koppor-bibliography.bib"),
+            FileUtil.getUniquePathFragment(
+                dirs,
+                Path.of("/users/jabref/koppor-bibliography.bib")
+            )
+        );
     }
 
     @Test
     void testCopyFileFromEmptySourcePathToEmptyDestinationPathWithOverrideExistFile() {
-        assertFalse(FileUtil.copyFile(nonExistingTestPath, nonExistingTestPath, true));
+        assertFalse(
+            FileUtil.copyFile(nonExistingTestPath, nonExistingTestPath, true)
+        );
     }
 
     @Test
     void testCopyFileFromEmptySourcePathToEmptyDestinationPathWithoutOverrideExistFile() {
-        assertFalse(FileUtil.copyFile(nonExistingTestPath, nonExistingTestPath, false));
+        assertFalse(
+            FileUtil.copyFile(nonExistingTestPath, nonExistingTestPath, false)
+        );
     }
 
     @Test
     void testCopyFileFromEmptySourcePathToExistDestinationPathWithOverrideExistFile() {
-        assertFalse(FileUtil.copyFile(nonExistingTestPath, existingTestFile, true));
+        assertFalse(
+            FileUtil.copyFile(nonExistingTestPath, existingTestFile, true)
+        );
     }
 
     @Test
     void testCopyFileFromEmptySourcePathToExistDestinationPathWithoutOverrideExistFile() {
-        assertFalse(FileUtil.copyFile(nonExistingTestPath, existingTestFile, false));
+        assertFalse(
+            FileUtil.copyFile(nonExistingTestPath, existingTestFile, false)
+        );
     }
 
     @Test
@@ -251,17 +333,23 @@ void testCopyFileFromExistSourcePathToExistDestinationPathWithOverrideExistFile(
 
     @Test
     void testCopyFileFromExistSourcePathToExistDestinationPathWithoutOverrideExistFile() {
-        assertFalse(FileUtil.copyFile(existingTestFile, existingTestFile, false));
+        assertFalse(
+            FileUtil.copyFile(existingTestFile, existingTestFile, false)
+        );
     }
 
     @Test
     void testCopyFileFromExistSourcePathToOtherExistDestinationPathWithOverrideExistFile() {
-        assertTrue(FileUtil.copyFile(existingTestFile, otherExistingTestFile, true));
+        assertTrue(
+            FileUtil.copyFile(existingTestFile, otherExistingTestFile, true)
+        );
     }
 
     @Test
     void testCopyFileFromExistSourcePathToOtherExistDestinationPathWithoutOverrideExistFile() {
-        assertFalse(FileUtil.copyFile(existingTestFile, otherExistingTestFile, false));
+        assertFalse(
+            FileUtil.copyFile(existingTestFile, otherExistingTestFile, false)
+        );
     }
 
     @Test
@@ -271,7 +359,10 @@ void testCopyFileSuccessfulWithOverrideExistFile() 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
@@ -281,7 +372,10 @@ void testCopyFileSuccessfulWithoutOverrideExistFile() 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
@@ -296,16 +390,38 @@ 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";
-        assertEquals(longestValidFilename, FileUtil.getValidFileName(longerFilename));
+        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());
-        assertEquals(longestValidFilename, FileUtil.getValidFileName(longerFilename));
+        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)
+        );
     }
 
     @Test
@@ -317,7 +433,10 @@ void testGetLinkedDirNameDefaultFullTitle() {
         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
@@ -346,28 +465,40 @@ void testIsNotBibFile() throws IOException {
 
     @Test
     void testFindinPath() {
-        Optional<Path> resultPath1 = FileUtil.findSingleFileRecursively("existingTestFile.txt", rootDir);
+        Optional<Path> resultPath1 = FileUtil.findSingleFileRecursively(
+            "existingTestFile.txt",
+            rootDir
+        );
         assertEquals(resultPath1.get().toString(), existingTestFile.toString());
     }
 
     @Test
     void testFindInListOfPath() {
         // 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> paths = List.of(
+            existingTestFile,
+            otherExistingTestFile,
+            rootDir
+        );
         List<Path> resultPaths = List.of(existingTestFile);
-        List<Path> result = FileUtil.findListOfFiles("existingTestFile.txt", paths);
+        List<Path> result = FileUtil.findListOfFiles(
+            "existingTestFile.txt",
+            paths
+        );
         assertEquals(resultPaths, result);
     }
 
     @Test
     public void extractFileExtension() {
-        final String filePath = FileUtilTest.class.getResource("pdffile.pdf").getPath();
+        final String filePath =
+            FileUtilTest.class.getResource("pdffile.pdf").getPath();
         assertEquals(Optional.of("pdf"), FileUtil.getFileExtension(filePath));
     }
 
     @Test
     public 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));
     }
 
@@ -378,7 +509,7 @@ public void testFileNameEmpty() {
     }
 
     @ParameterizedTest
-    @ValueSource(strings = {"*", "?", ">", "\""})
+    @ValueSource(strings = { "*", "?", ">", "\"" })
     public void testFileNameIllegal(String fileName) {
         Path path = Path.of("/");
         assertEquals(Optional.empty(), FileUtil.find(fileName, path));
@@ -390,26 +521,38 @@ public void testFindsFileInDirectory(@TempDir Path temp) throws Exception {
         Files.createDirectories(firstFilePath);
         Path firstFile = Files.createFile(firstFilePath.resolve("test.pdf"));
 
-        assertEquals(Optional.of(firstFile), FileUtil.find("test.pdf", temp.resolve("files")));
+        assertEquals(
+            Optional.of(firstFile),
+            FileUtil.find("test.pdf", temp.resolve("files"))
+        );
     }
 
     @Test
-    public void testFindsFileStartingWithTheSameDirectory(@TempDir Path temp) throws Exception {
+    public void testFindsFileStartingWithTheSameDirectory(@TempDir Path temp)
+        throws Exception {
         Path firstFilePath = temp.resolve("files");
         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
-    public void testDoesNotFindsFileStartingWithTheSameDirectoryHasASubdirectory(@TempDir Path temp) throws Exception {
+    public void testDoesNotFindsFileStartingWithTheSameDirectoryHasASubdirectory(
+        @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() {
@@ -422,13 +565,13 @@ public void testCTemp() {
     }
 
     @ParameterizedTest
-    @ValueSource(strings = {"/mnt/tmp/test.pdf"})
+    @ValueSource(strings = { "/mnt/tmp/test.pdf" })
     public void legalPaths(String fileName) {
         assertFalse(FileUtil.detectBadFileName(fileName));
     }
 
     @ParameterizedTest
-    @ValueSource(strings = {"te{}mp.pdf"})
+    @ValueSource(strings = { "te{}mp.pdf" })
     public void illegalPaths(String fileName) {
         assertTrue(FileUtil.detectBadFileName(fileName));
     }
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 49faa6e3f4f..ba07352a326 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,33 @@
 package org.jabref.logic.util.io;
 
+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;
-
 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;
-
 class RegExpBasedFileFinderTest {
-    private static final List<String> PDF_EXTENSION = Collections.singletonList("pdf");
+
+    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"
-            );
+        "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;
 
@@ -35,15 +36,27 @@ void setUp(@TempDir Path tempDir) throws Exception {
         entry = new BibEntry();
         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.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.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.DOI, "http://dx.doi.org/10.1287/orsc.14.2.209.14992");
+        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 +71,20 @@ void setUp(@TempDir Path tempDir) throws Exception {
     @Test
     void testFindFiles() 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,52 +94,103 @@ void testFindFiles() throws Exception {
     @Test
     void testYearAuthFirstPageFindFiles() 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);
     }
 
     @Test
-    void findAssociatedFilesFindFileContainingBracketsFromBracketedExpression() throws Exception {
-        var bibEntry = new BibEntry().withField(StandardField.TITLE, "Regexp from [A-Z]");
-
-        RegExpBasedFileFinder fileFinder = new RegExpBasedFileFinder("[TITLE]\\\\.[extension]", ',');
-
-        List<Path> result = fileFinder.findAssociatedFiles(bibEntry, List.of(directory), PDF_EXTENSION);
-        List<Path> pdfFile = List.of(directory.resolve("Regexp from [A-Z].pdf"));
+    void findAssociatedFilesFindFileContainingBracketsFromBracketedExpression()
+        throws Exception {
+        var bibEntry = new BibEntry()
+            .withField(StandardField.TITLE, "Regexp from [A-Z]");
+
+        RegExpBasedFileFinder fileFinder = new RegExpBasedFileFinder(
+            "[TITLE]\\\\.[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);
     }
 
     @Test
-    void findAssociatedFilesFindCleanedFileFromBracketedExpression() throws Exception {
-        var bibEntry = new BibEntry().withField(StandardField.JOURNAL, "ACM/IEEE-CS");
-
-        RegExpBasedFileFinder fileFinder = new RegExpBasedFileFinder("[JOURNAL]\\\\.[extension]", ',');
-
-        List<Path> result = fileFinder.findAssociatedFiles(bibEntry, List.of(directory), PDF_EXTENSION);
+    void findAssociatedFilesFindCleanedFileFromBracketedExpression()
+        throws Exception {
+        var bibEntry = new BibEntry()
+            .withField(StandardField.JOURNAL, "ACM/IEEE-CS");
+
+        RegExpBasedFileFinder fileFinder = new RegExpBasedFileFinder(
+            "[JOURNAL]\\\\.[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 +198,29 @@ void findAssociatedFilesFindFileContainingParenthesizesFromBracketedExpression()
     @Test
     void testAuthorWithDiacritics() 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.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 +233,20 @@ void testFindFileInSubdirectory() 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 +259,17 @@ void testFindFileNonRecursive() 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 174b2de8238..bce3329bcf7 100644
--- a/src/test/java/org/jabref/logic/util/strings/StringLengthComparatorTest.java
+++ b/src/test/java/org/jabref/logic/util/strings/StringLengthComparatorTest.java
@@ -1,14 +1,13 @@
 package org.jabref.logic.util.strings;
 
-import java.util.stream.Stream;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
+import java.util.stream.Stream;
 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;
-
 public class StringLengthComparatorTest {
 
     private StringLengthComparator slc;
@@ -20,30 +19,32 @@ public void setUp() {
 
     @ParameterizedTest
     @MethodSource("tests")
-    void compareStringLength(int comparisonResult, String firstString, String secondString) {
+    void compareStringLength(
+        int comparisonResult,
+        String firstString,
+        String secondString
+    ) {
         assertEquals(comparisonResult, slc.compare(firstString, secondString));
     }
 
     private static Stream<Arguments> tests() {
         return Stream.of(
-                Arguments.of(-1, "AAA", "AA"),
-                Arguments.of(0, "AA", "AA"),
-                Arguments.of(1, "AA", "AAA"),
-
-                // empty strings
-                Arguments.of(-1, "A", ""),
-                Arguments.of(0, "", ""),
-                Arguments.of(1, "", "A"),
-
-                // backslash
-                Arguments.of(-1, "\\\\", "A"),
-                Arguments.of(0, "\\", "A"),
-                Arguments.of(0, "\\", "\\"),
-                Arguments.of(0, "A", "\\"),
-                Arguments.of(1, "A", "\\\\"),
-
-                // empty string + backslash
-                Arguments.of(-1, "\\", ""),
-                Arguments.of(1, "", "\\"));
+            Arguments.of(-1, "AAA", "AA"),
+            Arguments.of(0, "AA", "AA"),
+            Arguments.of(1, "AA", "AAA"),
+            // empty strings
+            Arguments.of(-1, "A", ""),
+            Arguments.of(0, "", ""),
+            Arguments.of(1, "", "A"),
+            // backslash
+            Arguments.of(-1, "\\\\", "A"),
+            Arguments.of(0, "\\", "A"),
+            Arguments.of(0, "\\", "\\"),
+            Arguments.of(0, "A", "\\"),
+            Arguments.of(1, "A", "\\\\"),
+            // empty string + backslash
+            Arguments.of(-1, "\\", ""),
+            Arguments.of(1, "", "\\")
+        );
     }
 }
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 fce0126c0b7..67ae1deda99 100644
--- a/src/test/java/org/jabref/logic/util/strings/StringManipulatorTest.java
+++ b/src/test/java/org/jabref/logic/util/strings/StringManipulatorTest.java
@@ -1,16 +1,14 @@
 package org.jabref.logic.util.strings;
 
-import java.util.stream.Stream;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
+import java.util.stream.Stream;
 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;
-
 public class StringManipulatorTest {
 
     @Test
@@ -18,7 +16,10 @@ public void testCapitalizePreservesNewlines() {
         int caretPosition = 5; // Position of the caret, between the two ll in the first hellO"
         String input = "hello\n\nhELLO";
         String expectedResult = "hello\n\nHello";
-        ResultingStringState textOutput = StringManipulator.capitalize(caretPosition, input);
+        ResultingStringState textOutput = StringManipulator.capitalize(
+            caretPosition,
+            input
+        );
         assertEquals(expectedResult, textOutput.text);
     }
 
@@ -27,7 +28,10 @@ public void testUppercasePreservesSpace() {
         int caretPosition = 3; // Position of the caret, between the two ll in the first hello
         String input = "hello hello";
         String expectedResult = "helLO hello";
-        ResultingStringState textOutput = StringManipulator.uppercase(caretPosition, input);
+        ResultingStringState textOutput = StringManipulator.uppercase(
+            caretPosition,
+            input
+        );
         assertEquals(expectedResult, textOutput.text);
     }
 
@@ -36,7 +40,10 @@ public void testUppercasePreservesNewlines() {
         int caretPosition = 3; // Position of the caret, between the two ll in the first hello
         String input = "hello\nhello";
         String expectedResult = "helLO\nhello";
-        ResultingStringState textOutput = StringManipulator.uppercase(caretPosition, input);
+        ResultingStringState textOutput = StringManipulator.uppercase(
+            caretPosition,
+            input
+        );
         assertEquals(expectedResult, textOutput.text);
     }
 
@@ -45,7 +52,10 @@ public void testUppercasePreservesTab() {
         int caretPosition = 3; // Position of the caret, between the two ll in the first hello
         String input = "hello\thello";
         String expectedResult = "helLO\thello";
-        ResultingStringState textOutput = StringManipulator.uppercase(caretPosition, input);
+        ResultingStringState textOutput = StringManipulator.uppercase(
+            caretPosition,
+            input
+        );
         assertEquals(expectedResult, textOutput.text);
     }
 
@@ -54,7 +64,10 @@ public void testUppercasePreservesDoubleSpace() {
         int caretPosition = 5; // Position of the caret, at the first space
         String input = "hello  hello";
         String expectedResult = "hello  HELLO";
-        ResultingStringState textOutput = StringManipulator.uppercase(caretPosition, input);
+        ResultingStringState textOutput = StringManipulator.uppercase(
+            caretPosition,
+            input
+        );
         assertEquals(expectedResult, textOutput.text);
     }
 
@@ -63,7 +76,10 @@ public void testUppercaseIgnoresTrailingWhitespace() {
         int caretPosition = 5; // First space
         String input = "hello  ";
         String expectedResult = "hello  ";
-        ResultingStringState textOutput = StringManipulator.uppercase(caretPosition, input);
+        ResultingStringState textOutput = StringManipulator.uppercase(
+            caretPosition,
+            input
+        );
         assertEquals(expectedResult, textOutput.text);
         // Expected caret position is right after the last space, which is index 7
         assertEquals(7, textOutput.caretPosition);
@@ -74,7 +90,10 @@ public void testKillWordTrimsTrailingWhitespace() {
         int caretPosition = 5; // First space
         String input = "hello  ";
         String expectedResult = "hello";
-        ResultingStringState textOutput = StringManipulator.killWord(caretPosition, input);
+        ResultingStringState textOutput = StringManipulator.killWord(
+            caretPosition,
+            input
+        );
         assertEquals(expectedResult, textOutput.text);
         assertEquals(caretPosition, textOutput.caretPosition);
     }
@@ -85,7 +104,10 @@ public void testBackwardsKillWordTrimsPreceedingWhitespace() {
         String input = "  hello";
         // One space should be preserved since we are deleting everything preceding the second space.
         String expectedResult = " hello";
-        ResultingStringState textOutput = StringManipulator.backwardKillWord(caretPosition, input);
+        ResultingStringState textOutput = StringManipulator.backwardKillWord(
+            caretPosition,
+            input
+        );
         assertEquals(expectedResult, textOutput.text);
         // The caret should have been moved to the start.
         assertEquals(0, textOutput.caretPosition);
@@ -96,7 +118,10 @@ public void testUppercasePreservesMixedSpaceNewLineTab() {
         int caretPosition = 5; // Position of the caret, after first hello
         String input = "hello \n\thello";
         String expectedResult = "hello \n\tHELLO";
-        ResultingStringState textOutput = StringManipulator.uppercase(caretPosition, input);
+        ResultingStringState textOutput = StringManipulator.uppercase(
+            caretPosition,
+            input
+        );
         assertEquals(expectedResult, textOutput.text);
     }
 
@@ -105,7 +130,10 @@ public void testLowercaseEditsTheNextWord() {
         int caretPosition = 5; // Position of the caret, right at the space
         String input = "hello HELLO";
         String expectedResult = "hello hello";
-        ResultingStringState textOutput = StringManipulator.lowercase(caretPosition, input);
+        ResultingStringState textOutput = StringManipulator.lowercase(
+            caretPosition,
+            input
+        );
         assertEquals(expectedResult, textOutput.text);
     }
 
@@ -114,7 +142,10 @@ public void testKillWordRemovesFromPositionUpToNextWord() {
         int caretPosition = 3; // Position of the caret, between the two "ll in the first hello"
         String input = "hello hello";
         String expectedResult = "hel hello";
-        ResultingStringState textOutput = StringManipulator.killWord(caretPosition, input);
+        ResultingStringState textOutput = StringManipulator.killWord(
+            caretPosition,
+            input
+        );
         assertEquals(expectedResult, textOutput.text);
     }
 
@@ -123,7 +154,10 @@ public void testKillWordRemovesNextWordIfPositionIsInSpace() {
         int caretPosition = 5; // Position of the caret, after the first hello"
         String input = "hello person";
         String expectedResult = "hello";
-        ResultingStringState textOutput = StringManipulator.killWord(caretPosition, input);
+        ResultingStringState textOutput = StringManipulator.killWord(
+            caretPosition,
+            input
+        );
         assertEquals(expectedResult, textOutput.text);
     }
 
@@ -133,25 +167,68 @@ public void testKillPreviousWord() {
         int expectedPosition = 6;
         String input = "hello person";
         String expectedResult = "hello rson";
-        ResultingStringState result = StringManipulator.backwardKillWord(caretPosition, input);
+        ResultingStringState result = StringManipulator.backwardKillWord(
+            caretPosition,
+            input
+        );
         assertEquals(expectedResult, result.text);
         assertEquals(expectedPosition, result.caretPosition);
     }
 
     @ParameterizedTest
     @MethodSource("wordBoundaryTestData")
-    void testGetNextWordBoundary(String text, int caretPosition, int expectedPosition, StringManipulator.Direction direction) {
-        int result = StringManipulator.getNextWordBoundary(caretPosition, text, direction);
+    void testGetNextWordBoundary(
+        String text,
+        int caretPosition,
+        int expectedPosition,
+        StringManipulator.Direction direction
+    ) {
+        int result = StringManipulator.getNextWordBoundary(
+            caretPosition,
+            text,
+            direction
+        );
         assertEquals(expectedPosition, result);
     }
 
     private static Stream<Arguments> wordBoundaryTestData() {
         return Stream.of(
-                Arguments.of("hello person", 3, 0, StringManipulator.Direction.PREVIOUS),
-                Arguments.of("hello person", 12, 6, StringManipulator.Direction.PREVIOUS),
-                Arguments.of("hello person", 0, 0, StringManipulator.Direction.PREVIOUS),
-                Arguments.of("hello person", 0, 5, StringManipulator.Direction.NEXT),
-                Arguments.of("hello person", 5, 12, StringManipulator.Direction.NEXT),
-                Arguments.of("hello person", 12, 12, StringManipulator.Direction.NEXT));
+            Arguments.of(
+                "hello person",
+                3,
+                0,
+                StringManipulator.Direction.PREVIOUS
+            ),
+            Arguments.of(
+                "hello person",
+                12,
+                6,
+                StringManipulator.Direction.PREVIOUS
+            ),
+            Arguments.of(
+                "hello person",
+                0,
+                0,
+                StringManipulator.Direction.PREVIOUS
+            ),
+            Arguments.of(
+                "hello person",
+                0,
+                5,
+                StringManipulator.Direction.NEXT
+            ),
+            Arguments.of(
+                "hello person",
+                5,
+                12,
+                StringManipulator.Direction.NEXT
+            ),
+            Arguments.of(
+                "hello person",
+                12,
+                12,
+                StringManipulator.Direction.NEXT
+            )
+        );
     }
 }
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 908727784a5..8278d50e8c1 100644
--- a/src/test/java/org/jabref/logic/util/strings/StringSimilarityTest.java
+++ b/src/test/java/org/jabref/logic/util/strings/StringSimilarityTest.java
@@ -1,16 +1,17 @@
 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;
-
 public class StringSimilarityTest {
 
     private StringSimilarity similarityChecker = new StringSimilarity();
 
     @ParameterizedTest(name = "a={0}, b={1}, result={2}")
-    @CsvSource({
+    @CsvSource(
+        {
             "'', '', true", // same empty strings
             "a, a, true", // same one-letter strings
             "a, '', true", // one string is empty and similarity < threshold (4)
@@ -22,9 +23,17 @@ public class StringSimilarityTest {
             "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)
-    })
-    public void testStringSimilarity(String a, String b, String expectedResult) {
-        assertEquals(Boolean.valueOf(expectedResult), similarityChecker.isSimilar(a, b));
+            "abcdef, a, false", // no empty string sand similarity > threshold (4)
+        }
+    )
+    public void testStringSimilarity(
+        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 074b4fbf34f..8b99337783e 100644
--- a/src/test/java/org/jabref/logic/xmp/XmpUtilReaderTest.java
+++ b/src/test/java/org/jabref/logic/xmp/XmpUtilReaderTest.java
@@ -1,5 +1,9 @@
 package org.jabref.logic.xmp;
 
+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;
@@ -7,24 +11,18 @@
 import java.util.Collections;
 import java.util.List;
 import java.util.Optional;
-
+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;
-
 class XmpUtilReaderTest {
 
     private XmpPreferences xmpPreferences;
@@ -42,23 +40,47 @@ 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()
+            );
     }
 
     /**
      * Tests reading of dublinCore metadata.
      */
     @Test
-    void testReadArticleDublinCoreReadRawXmp() throws IOException, URISyntaxException {
-        Path path = Path.of(XmpUtilShared.class.getResource("article_dublinCore_without_day.pdf").toURI());
+    void testReadArticleDublinCoreReadRawXmp()
+        throws IOException, URISyntaxException {
+        Path path = Path.of(
+            XmpUtilShared.class.getResource(
+                    "article_dublinCore_without_day.pdf"
+                )
+                .toURI()
+        );
         List<XMPMetadata> meta = xmpUtilReader.readRawXmp(path);
 
-        DublinCoreSchema dcSchema = DublinCoreSchemaCustom.copyDublinCoreSchema(meta.get(0).getDublinCoreSchema());
-        DublinCoreExtractor dcExtractor = new DublinCoreExtractor(dcSchema, xmpPreferences, new BibEntry());
+        DublinCoreSchema dcSchema = DublinCoreSchemaCustom.copyDublinCoreSchema(
+            meta.get(0).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());
-        List<BibEntry> expected = testImporter.importDatabase(bibFile).getDatabase().getEntries();
+        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()));
     }
@@ -67,30 +89,58 @@ void testReadArticleDublinCoreReadRawXmp() throws IOException, URISyntaxExceptio
      * Tests reading of dublinCore metadata.
      */
     @Test
-    void testReadArticleDublinCoreReadXmp() throws IOException, URISyntaxException {
-        Path pathPdf = Path.of(XmpUtilShared.class.getResource("article_dublinCore.pdf").toURI());
+    void testReadArticleDublinCoreReadXmp()
+        throws IOException, URISyntaxException {
+        Path pathPdf = Path.of(
+            XmpUtilShared.class.getResource("article_dublinCore.pdf").toURI()
+        );
         List<BibEntry> entries = xmpUtilReader.readXmp(pathPdf, xmpPreferences);
-        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"))
-        ));
+        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")
+                )
+            )
+        );
 
         assertEquals(expected, entries);
     }
 
     @Test
-    void testReadArticleDublinCoreReadXmpPartialDate() throws IOException, URISyntaxException {
-        Path pathPdf = Path.of(XmpUtilShared.class.getResource("article_dublinCore_partial_date.pdf").toURI());
+    void testReadArticleDublinCoreReadXmpPartialDate()
+        throws IOException, URISyntaxException {
+        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());
-        List<BibEntry> expected = testImporter.importDatabase(bibFile).getDatabase().getEntries();
-
-        expected.forEach(bibEntry -> bibEntry.setFiles(List.of(
-                new LinkedFile("", pathPdf.toAbsolutePath(), "PDF"))
-        ));
+        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"))
+            )
+        );
 
         assertEquals(expected, entries);
     }
@@ -100,7 +150,12 @@ void testReadArticleDublinCoreReadXmpPartialDate() throws IOException, URISyntax
      */
     @Test
     void testReadEmtpyMetadata() 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);
     }
 
@@ -109,15 +164,24 @@ void testReadEmtpyMetadata() throws IOException, URISyntaxException {
      */
     @Test
     void testReadPDMetadata() throws IOException, URISyntaxException {
-        Path pathPdf = Path.of(XmpUtilShared.class.getResource("PD_metadata.pdf").toURI());
+        Path pathPdf = Path.of(
+            XmpUtilShared.class.getResource("PD_metadata.pdf").toURI()
+        );
         List<BibEntry> entries = xmpUtilReader.readXmp(pathPdf, xmpPreferences);
 
-        Path bibFile = Path.of(XmpUtilShared.class.getResource("PD_metadata.bib").toURI());
-        List<BibEntry> expected = testImporter.importDatabase(bibFile).getDatabase().getEntries();
+        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);
     }
@@ -126,8 +190,15 @@ void testReadPDMetadata() throws IOException, URISyntaxException {
      * Tests an pdf file with metadata which has no description section.
      */
     @Test
-    void testReadNoDescriptionMetadata() throws IOException, URISyntaxException {
-        List<BibEntry> entries = xmpUtilReader.readXmp(Path.of(XmpUtilShared.class.getResource("no_description_metadata.pdf").toURI()), xmpPreferences);
+    void testReadNoDescriptionMetadata()
+        throws IOException, URISyntaxException {
+        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 d13a76001dc..8a95466e187 100644
--- a/src/test/java/org/jabref/logic/xmp/XmpUtilWriterTest.java
+++ b/src/test/java/org/jabref/logic/xmp/XmpUtilWriterTest.java
@@ -1,8 +1,16 @@
 package org.jabref.logic.xmp;
 
+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;
-
+import org.apache.pdfbox.pdmodel.PDDocument;
+import org.apache.pdfbox.pdmodel.PDPage;
 import org.jabref.logic.exporter.XmpExporterTest;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.Date;
@@ -10,20 +18,10 @@
 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;
-
 /**
  * This tests the writing to a PDF. If the creation of the RDF content should be checked, please head to {@link XmpExporterTest}
  */
@@ -33,47 +31,55 @@ class XmpUtilWriterTest {
     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");
+        .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");
+        .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
@@ -88,11 +94,14 @@ void setUp() {
      * Test for writing a PDF file with a single DublinCore metadata entry.
      */
     void singleEntryWorks(BibEntry entry) throws Exception {
-        Path pdfFile = this.createDefaultFile("JabRef_writeSingle.pdf", tempDir);
+        Path pdfFile =
+            this.createDefaultFile("JabRef_writeSingle.pdf", tempDir);
 
-        new XmpUtilWriter(xmpPreferences).writeXmp(pdfFile.toAbsolutePath(), entry, null);
+        new XmpUtilWriter(xmpPreferences)
+            .writeXmp(pdfFile.toAbsolutePath(), entry, null);
 
-        List<BibEntry> entriesWritten = new XmpUtilReader().readXmp(pdfFile, xmpPreferences);
+        List<BibEntry> entriesWritten = new XmpUtilReader()
+            .readXmp(pdfFile, xmpPreferences);
 
         BibEntry entryWritten = entriesWritten.get(0);
         entryWritten.clearField(StandardField.FILE);
@@ -120,8 +129,10 @@ void vapnik2000Works() throws Exception {
     void testWriteTwoBibEntries(@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);
+        new XmpUtilWriter(xmpPreferences)
+            .writeXmp(pdfFile.toAbsolutePath(), entries, null);
+        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,8 +146,10 @@ void testWriteTwoBibEntries(@TempDir Path tempDir) throws Exception {
     void testWriteThreeBibEntries(@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);
+        new XmpUtilWriter(xmpPreferences)
+            .writeXmp(pdfFile.toAbsolutePath(), entries, null);
+        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
@@ -147,27 +160,34 @@ void testWriteThreeBibEntries(@TempDir Path tempDir) throws Exception {
     }
 
     @Test
-    void proctingBracesAreRemovedAtTitle(@TempDir Path tempDir) throws Exception {
-        Path pdfFile = this.createDefaultFile("JabRef_writeBraces.pdf", tempDir);
+    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);
+            .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");
+            .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);
+        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);
+            .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,11 +196,14 @@ void proctingBracesAreKeptAtPages(@TempDir Path tempDir) throws Exception {
 
     @Test
     void doubleDashAtPageNumberIsKept(@TempDir Path tempDir) throws Exception {
-        Path pdfFile = this.createDefaultFile("JabRef_writeBraces.pdf", tempDir);
+        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);
+            .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));
 
@@ -190,8 +213,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));
@@ -201,7 +226,8 @@ void singleEntry(@TempDir Path tempDir) throws Exception {
     /**
      * Creates a temporary PDF-file with a single empty page.
      */
-    private Path createDefaultFile(String fileName, Path tempDir) throws Exception {
+    private Path createDefaultFile(String fileName, Path tempDir)
+        throws Exception {
         // create a default PDF
         Path pdfFile = tempDir.resolve(fileName);
         try (PDDocument pdf = new PDDocument()) {
diff --git a/src/test/java/org/jabref/migrations/ConvertLegacyExplicitGroupsTest.java b/src/test/java/org/jabref/migrations/ConvertLegacyExplicitGroupsTest.java
index 5a6b17e3bee..37bd8baac3a 100644
--- a/src/test/java/org/jabref/migrations/ConvertLegacyExplicitGroupsTest.java
+++ b/src/test/java/org/jabref/migrations/ConvertLegacyExplicitGroupsTest.java
@@ -1,8 +1,9 @@
 package org.jabref.migrations;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
 import java.util.Collections;
 import java.util.Optional;
-
 import org.jabref.logic.importer.ParserResult;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.field.StandardField;
@@ -10,12 +11,9 @@
 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;
-
 class ConvertLegacyExplicitGroupsTest {
 
     private PostOpenMigration action;
@@ -28,22 +26,30 @@ void setUp() throws Exception {
 
         entry = new BibEntry();
         entry.setCitationKey("Entry1");
-        group = new ExplicitGroup("TestGroup", GroupHierarchyType.INCLUDING, ',');
+        group =
+            new ExplicitGroup("TestGroup", GroupHierarchyType.INCLUDING, ',');
         group.addLegacyEntryKey("Entry1");
     }
 
     @Test
     void performActionWritesGroupMembershipInEntry() throws Exception {
-        ParserResult parserResult = generateParserResult(GroupTreeNode.fromGroup(group));
+        ParserResult parserResult = generateParserResult(
+            GroupTreeNode.fromGroup(group)
+        );
 
         action.performMigration(parserResult);
 
-        assertEquals(Optional.of("TestGroup"), entry.getField(StandardField.GROUPS));
+        assertEquals(
+            Optional.of("TestGroup"),
+            entry.getField(StandardField.GROUPS)
+        );
     }
 
     @Test
     void performActionClearsLegacyKeys() throws Exception {
-        ParserResult parserResult = generateParserResult(GroupTreeNode.fromGroup(group));
+        ParserResult parserResult = generateParserResult(
+            GroupTreeNode.fromGroup(group)
+        );
 
         action.performMigration(parserResult);
 
@@ -51,19 +57,27 @@ void performActionClearsLegacyKeys() throws Exception {
     }
 
     @Test
-    void performActionWritesGroupMembershipInEntryForComplexGroupTree() throws Exception {
+    void performActionWritesGroupMembershipInEntryForComplexGroupTree()
+        throws Exception {
         GroupTreeNode root = GroupTreeNode.fromGroup(new AllEntriesGroup(""));
-        root.addSubgroup(new ExplicitGroup("TestGroup2", GroupHierarchyType.INCLUDING, ','));
+        root.addSubgroup(
+            new ExplicitGroup("TestGroup2", GroupHierarchyType.INCLUDING, ',')
+        );
         root.addSubgroup(group);
         ParserResult parserResult = generateParserResult(root);
 
         action.performMigration(parserResult);
 
-        assertEquals(Optional.of("TestGroup"), entry.getField(StandardField.GROUPS));
+        assertEquals(
+            Optional.of("TestGroup"),
+            entry.getField(StandardField.GROUPS)
+        );
     }
 
     private ParserResult generateParserResult(GroupTreeNode groupRoot) {
-        ParserResult parserResult = new ParserResult(Collections.singletonList(entry));
+        ParserResult parserResult = new ParserResult(
+            Collections.singletonList(entry)
+        );
         parserResult.getMetaData().setGroups(groupRoot);
         return parserResult;
     }
diff --git a/src/test/java/org/jabref/migrations/ConvertMarkingToGroupsTest.java b/src/test/java/org/jabref/migrations/ConvertMarkingToGroupsTest.java
index 4a0942b77de..501e54d4a23 100644
--- a/src/test/java/org/jabref/migrations/ConvertMarkingToGroupsTest.java
+++ b/src/test/java/org/jabref/migrations/ConvertMarkingToGroupsTest.java
@@ -1,8 +1,9 @@
 package org.jabref.migrations;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
 import java.util.Collections;
 import java.util.Optional;
-
 import org.jabref.logic.groups.DefaultGroupsFactory;
 import org.jabref.logic.importer.ParserResult;
 import org.jabref.model.entry.BibEntry;
@@ -10,25 +11,37 @@
 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;
-
 class ConvertMarkingToGroupsTest {
+
     @Test
     void performMigrationForSingleEntry() {
         BibEntry entry = new BibEntry()
-                .withField(InternalField.MARKED_INTERNAL, "[Nicolas:6]");
-        ParserResult parserResult = new ParserResult(Collections.singleton(entry));
+            .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, ','));
-        markings.addSubgroup(new ExplicitGroup("Nicolas:6", GroupHierarchyType.INCLUDING, ','));
-
-        assertEquals(Optional.empty(), entry.getField(InternalField.MARKED_INTERNAL));
-        assertEquals(Optional.of(rootExpected), parserResult.getMetaData().getGroups());
+        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)
+        );
+        assertEquals(
+            Optional.of(rootExpected),
+            parserResult.getMetaData().getGroups()
+        );
     }
 }
diff --git a/src/test/java/org/jabref/migrations/MergeReviewIntoCommentActionMigrationTest.java b/src/test/java/org/jabref/migrations/MergeReviewIntoCommentActionMigrationTest.java
index 39d94ef7d52..08162b621da 100644
--- a/src/test/java/org/jabref/migrations/MergeReviewIntoCommentActionMigrationTest.java
+++ b/src/test/java/org/jabref/migrations/MergeReviewIntoCommentActionMigrationTest.java
@@ -1,18 +1,16 @@
 package org.jabref.migrations;
 
-import java.util.Collections;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
+import java.util.Collections;
 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;
-
 class MergeReviewIntoCommentActionMigrationTest {
 
     private MergeReviewIntoCommentMigration action;
@@ -28,62 +26,108 @@ public void setUp() {
 
     @Test
     public void noFields() {
-        ParserResult actualParserResult = new ParserResult(Collections.singletonList(entry));
+        ParserResult actualParserResult = new ParserResult(
+            Collections.singletonList(entry)
+        );
 
         action.performMigration(actualParserResult);
 
-        assertEquals(entry, actualParserResult.getDatabase().getEntryByCitationKey("Entry1").get());
+        assertEquals(
+            entry,
+            actualParserResult
+                .getDatabase()
+                .getEntryByCitationKey("Entry1")
+                .get()
+        );
     }
 
     @Test
     public void reviewField() {
         entry.setField(StandardField.REVIEW, "My Review");
-        ParserResult actualParserResult = new ParserResult(Collections.singletonList(entry));
+        ParserResult actualParserResult = new ParserResult(
+            Collections.singletonList(entry)
+        );
 
         expectedEntry.setField(StandardField.COMMENT, "My Review");
 
         action.performMigration(actualParserResult);
 
-        assertEquals(expectedEntry, actualParserResult.getDatabase().getEntryByCitationKey("Entry1").get());
+        assertEquals(
+            expectedEntry,
+            actualParserResult
+                .getDatabase()
+                .getEntryByCitationKey("Entry1")
+                .get()
+        );
     }
 
     @Test
     public void commentField() {
         entry.setField(StandardField.COMMENT, "My Comment");
-        ParserResult actualParserResult = new ParserResult(Collections.singletonList(entry));
+        ParserResult actualParserResult = new ParserResult(
+            Collections.singletonList(entry)
+        );
 
         action.performMigration(actualParserResult);
 
-        assertEquals(entry, actualParserResult.getDatabase().getEntryByCitationKey("Entry1").get());
+        assertEquals(
+            entry,
+            actualParserResult
+                .getDatabase()
+                .getEntryByCitationKey("Entry1")
+                .get()
+        );
     }
 
     @Test
     public void multiLineReviewField() {
-        String commentString = "My Review\n\nSecond Paragraph\n\nThird Paragraph";
+        String commentString =
+            "My Review\n\nSecond Paragraph\n\nThird Paragraph";
 
         entry.setField(StandardField.REVIEW, commentString);
-        ParserResult actualParserResult = new ParserResult(Collections.singletonList(entry));
+        ParserResult actualParserResult = new ParserResult(
+            Collections.singletonList(entry)
+        );
 
         expectedEntry.setField(StandardField.COMMENT, commentString);
 
         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."
+    )
     public void reviewAndCommentField() {
         entry.setField(StandardField.REVIEW, "My Review");
         entry.setField(StandardField.COMMENT, "My Comment");
 
-        ParserResult actualParserResult = new ParserResult(Collections.singletonList(entry));
+        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/PreferencesMigrationsTest.java b/src/test/java/org/jabref/migrations/PreferencesMigrationsTest.java
index 7146764d8c1..d86cc56e65b 100644
--- a/src/test/java/org/jabref/migrations/PreferencesMigrationsTest.java
+++ b/src/test/java/org/jabref/migrations/PreferencesMigrationsTest.java
@@ -1,35 +1,37 @@
 package org.jabref.migrations;
 
+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.github.javakeyring.Keyring;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
 import java.util.prefs.Preferences;
-
 import org.jabref.preferences.JabRefPreferences;
-
-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;
-
 class PreferencesMigrationsTest {
 
     private JabRefPreferences prefs;
     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() {
@@ -39,56 +41,82 @@ void setUp() {
 
     @Test
     void testOldStyleBibtexkeyPattern0() {
-        when(prefs.get(JabRefPreferences.IMPORT_FILENAMEPATTERN)).thenReturn(oldStylePatterns[0]);
-        when(mainPrefsNode.get(JabRefPreferences.IMPORT_FILENAMEPATTERN, null)).thenReturn(oldStylePatterns[0]);
-        when(prefs.hasKey(JabRefPreferences.IMPORT_FILENAMEPATTERN)).thenReturn(true);
-
-        PreferencesMigrations.upgradeImportFileAndDirePatterns(prefs, mainPrefsNode);
-
-        verify(prefs).put(JabRefPreferences.IMPORT_FILENAMEPATTERN, newStylePatterns[0]);
-        verify(mainPrefsNode).put(JabRefPreferences.IMPORT_FILENAMEPATTERN, newStylePatterns[0]);
+        when(prefs.get(JabRefPreferences.IMPORT_FILENAMEPATTERN))
+            .thenReturn(oldStylePatterns[0]);
+        when(mainPrefsNode.get(JabRefPreferences.IMPORT_FILENAMEPATTERN, null))
+            .thenReturn(oldStylePatterns[0]);
+        when(prefs.hasKey(JabRefPreferences.IMPORT_FILENAMEPATTERN))
+            .thenReturn(true);
+
+        PreferencesMigrations.upgradeImportFileAndDirePatterns(
+            prefs,
+            mainPrefsNode
+        );
+
+        verify(prefs)
+            .put(JabRefPreferences.IMPORT_FILENAMEPATTERN, newStylePatterns[0]);
+        verify(mainPrefsNode)
+            .put(JabRefPreferences.IMPORT_FILENAMEPATTERN, newStylePatterns[0]);
     }
 
     @Test
     void testOldStyleBibtexkeyPattern1() {
-        when(prefs.get(JabRefPreferences.IMPORT_FILENAMEPATTERN)).thenReturn(oldStylePatterns[1]);
-        when(mainPrefsNode.get(JabRefPreferences.IMPORT_FILENAMEPATTERN, null)).thenReturn(oldStylePatterns[1]);
-        when(prefs.hasKey(JabRefPreferences.IMPORT_FILENAMEPATTERN)).thenReturn(true);
-
-        PreferencesMigrations.upgradeImportFileAndDirePatterns(prefs, mainPrefsNode);
-
-        verify(prefs).put(JabRefPreferences.IMPORT_FILENAMEPATTERN, newStylePatterns[1]);
-        verify(mainPrefsNode).put(JabRefPreferences.IMPORT_FILENAMEPATTERN, newStylePatterns[1]);
+        when(prefs.get(JabRefPreferences.IMPORT_FILENAMEPATTERN))
+            .thenReturn(oldStylePatterns[1]);
+        when(mainPrefsNode.get(JabRefPreferences.IMPORT_FILENAMEPATTERN, null))
+            .thenReturn(oldStylePatterns[1]);
+        when(prefs.hasKey(JabRefPreferences.IMPORT_FILENAMEPATTERN))
+            .thenReturn(true);
+
+        PreferencesMigrations.upgradeImportFileAndDirePatterns(
+            prefs,
+            mainPrefsNode
+        );
+
+        verify(prefs)
+            .put(JabRefPreferences.IMPORT_FILENAMEPATTERN, newStylePatterns[1]);
+        verify(mainPrefsNode)
+            .put(JabRefPreferences.IMPORT_FILENAMEPATTERN, newStylePatterns[1]);
     }
 
     @Test
     void testArbitraryBibtexkeyPattern() {
         String arbitraryPattern = "[anyUserPrividedString]";
 
-        when(prefs.get(JabRefPreferences.IMPORT_FILENAMEPATTERN)).thenReturn(arbitraryPattern);
-        when(mainPrefsNode.get(JabRefPreferences.IMPORT_FILENAMEPATTERN, null)).thenReturn(arbitraryPattern);
+        when(prefs.get(JabRefPreferences.IMPORT_FILENAMEPATTERN))
+            .thenReturn(arbitraryPattern);
+        when(mainPrefsNode.get(JabRefPreferences.IMPORT_FILENAMEPATTERN, null))
+            .thenReturn(arbitraryPattern);
 
-        PreferencesMigrations.upgradeImportFileAndDirePatterns(prefs, mainPrefsNode);
+        PreferencesMigrations.upgradeImportFileAndDirePatterns(
+            prefs,
+            mainPrefsNode
+        );
 
-        verify(prefs, never()).put(JabRefPreferences.IMPORT_FILENAMEPATTERN, arbitraryPattern);
-        verify(mainPrefsNode, never()).put(JabRefPreferences.IMPORT_FILENAMEPATTERN, arbitraryPattern);
+        verify(prefs, never())
+            .put(JabRefPreferences.IMPORT_FILENAMEPATTERN, arbitraryPattern);
+        verify(mainPrefsNode, never())
+            .put(JabRefPreferences.IMPORT_FILENAMEPATTERN, arbitraryPattern);
     }
 
     @Test
     void testPreviewStyleReviewToComment() {
-        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]{\\comment} \\end{comment}__NEWLINE__"
-                + "\\begin{comment} Something: \\format[Markdown,HTMLChars]{\\comment} special \\end{comment}__NEWLINE__"
-                + "</font>__NEWLINE__";
-
-        when(prefs.get(JabRefPreferences.PREVIEW_STYLE)).thenReturn(oldPreviewStyle);
+        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]{\\comment} \\end{comment}__NEWLINE__" +
+            "\\begin{comment} Something: \\format[Markdown,HTMLChars]{\\comment} special \\end{comment}__NEWLINE__" +
+            "</font>__NEWLINE__";
+
+        when(prefs.get(JabRefPreferences.PREVIEW_STYLE))
+            .thenReturn(oldPreviewStyle);
 
         PreferencesMigrations.upgradePreviewStyle(prefs);
 
@@ -97,75 +125,196 @@ void testPreviewStyleReviewToComment() {
 
     @Test
     void testUpgradeColumnPreferencesAlreadyMigrated() {
-        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(prefs.getStringList(JabRefPreferences.COLUMN_NAMES)).thenReturn(columnNames);
-        when(prefs.getStringList(JabRefPreferences.COLUMN_WIDTHS)).thenReturn(columnWidths);
+        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(prefs.getStringList(JabRefPreferences.COLUMN_NAMES))
+            .thenReturn(columnNames);
+        when(prefs.getStringList(JabRefPreferences.COLUMN_WIDTHS))
+            .thenReturn(columnWidths);
 
         PreferencesMigrations.upgradeColumnPreferences(prefs);
 
         verify(prefs, never()).put(JabRefPreferences.COLUMN_NAMES, "anyString");
-        verify(prefs, never()).put(JabRefPreferences.COLUMN_WIDTHS, "anyString");
+        verify(prefs, never())
+            .put(JabRefPreferences.COLUMN_WIDTHS, "anyString");
     }
 
     @Test
     void testUpgradeColumnPreferencesFromWithoutTypes() {
-        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");
-
-        when(prefs.getStringList(JabRefPreferences.COLUMN_NAMES)).thenReturn(columnNames);
-        when(prefs.getStringList(JabRefPreferences.COLUMN_WIDTHS)).thenReturn(columnWidths);
+        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"
+        );
+
+        when(prefs.getStringList(JabRefPreferences.COLUMN_NAMES))
+            .thenReturn(columnNames);
+        when(prefs.getStringList(JabRefPreferences.COLUMN_WIDTHS))
+            .thenReturn(columnWidths);
 
         PreferencesMigrations.upgradeColumnPreferences(prefs);
 
-        verify(prefs).putStringList(JabRefPreferences.COLUMN_NAMES, updatedNames);
-        verify(prefs).putStringList(JabRefPreferences.COLUMN_WIDTHS, updatedWidths);
-        verify(prefs).putStringList(JabRefPreferences.COLUMN_SORT_TYPES, newSortTypes);
+        verify(prefs)
+            .putStringList(JabRefPreferences.COLUMN_NAMES, updatedNames);
+        verify(prefs)
+            .putStringList(JabRefPreferences.COLUMN_WIDTHS, updatedWidths);
+        verify(prefs)
+            .putStringList(JabRefPreferences.COLUMN_SORT_TYPES, newSortTypes);
     }
 
     @Test
     void testChangeColumnPreferencesVariableNamesFor51() {
-        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> 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
         when(prefs.getStringList("columnNames")).thenReturn(columnNames);
         when(prefs.getStringList("columnWidths")).thenReturn(columnWidths);
-        when(prefs.getStringList("mainTableColumnSortTypes")).thenReturn(columnNames);
-        when(prefs.getStringList("mainTableColumnSortOrder")).thenReturn(columnWidths);
-
-        when(prefs.getStringList(JabRefPreferences.COLUMN_NAMES)).thenReturn(Collections.emptyList());
-        when(prefs.getStringList(JabRefPreferences.COLUMN_WIDTHS)).thenReturn(Collections.emptyList());
-        when(prefs.getStringList(JabRefPreferences.COLUMN_SORT_TYPES)).thenReturn(Collections.emptyList());
-        when(prefs.getStringList(JabRefPreferences.COLUMN_SORT_ORDER)).thenReturn(Collections.emptyList());
+        when(prefs.getStringList("mainTableColumnSortTypes"))
+            .thenReturn(columnNames);
+        when(prefs.getStringList("mainTableColumnSortOrder"))
+            .thenReturn(columnWidths);
+
+        when(prefs.getStringList(JabRefPreferences.COLUMN_NAMES))
+            .thenReturn(Collections.emptyList());
+        when(prefs.getStringList(JabRefPreferences.COLUMN_WIDTHS))
+            .thenReturn(Collections.emptyList());
+        when(prefs.getStringList(JabRefPreferences.COLUMN_SORT_TYPES))
+            .thenReturn(Collections.emptyList());
+        when(prefs.getStringList(JabRefPreferences.COLUMN_SORT_ORDER))
+            .thenReturn(Collections.emptyList());
 
         PreferencesMigrations.changeColumnVariableNamesFor51(prefs);
 
-        verify(prefs).putStringList(JabRefPreferences.COLUMN_NAMES, columnNames);
-        verify(prefs).putStringList(JabRefPreferences.COLUMN_WIDTHS, columnWidths);
-        verify(prefs).putStringList(JabRefPreferences.COLUMN_NAMES, columnNames);
-        verify(prefs).putStringList(JabRefPreferences.COLUMN_WIDTHS, columnWidths);
+        verify(prefs)
+            .putStringList(JabRefPreferences.COLUMN_NAMES, columnNames);
+        verify(prefs)
+            .putStringList(JabRefPreferences.COLUMN_WIDTHS, columnWidths);
+        verify(prefs)
+            .putStringList(JabRefPreferences.COLUMN_NAMES, columnNames);
+        verify(prefs)
+            .putStringList(JabRefPreferences.COLUMN_WIDTHS, columnWidths);
     }
 
     @Test
     void testChangeColumnPreferencesVariableNamesBackwardsCompatibility() {
-        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> 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
         when(prefs.getStringList("columnNames")).thenReturn(columnNames);
         when(prefs.getStringList("columnWidths")).thenReturn(columnWidths);
-        when(prefs.getStringList("mainTableColumnSortTypes")).thenReturn(columnNames);
-        when(prefs.getStringList("mainTableColumnSortOrder")).thenReturn(columnWidths);
-
-        when(prefs.getStringList(JabRefPreferences.COLUMN_NAMES)).thenReturn(Collections.emptyList());
-        when(prefs.getStringList(JabRefPreferences.COLUMN_WIDTHS)).thenReturn(Collections.emptyList());
-        when(prefs.getStringList(JabRefPreferences.COLUMN_SORT_TYPES)).thenReturn(Collections.emptyList());
-        when(prefs.getStringList(JabRefPreferences.COLUMN_SORT_ORDER)).thenReturn(Collections.emptyList());
+        when(prefs.getStringList("mainTableColumnSortTypes"))
+            .thenReturn(columnNames);
+        when(prefs.getStringList("mainTableColumnSortOrder"))
+            .thenReturn(columnWidths);
+
+        when(prefs.getStringList(JabRefPreferences.COLUMN_NAMES))
+            .thenReturn(Collections.emptyList());
+        when(prefs.getStringList(JabRefPreferences.COLUMN_WIDTHS))
+            .thenReturn(Collections.emptyList());
+        when(prefs.getStringList(JabRefPreferences.COLUMN_SORT_TYPES))
+            .thenReturn(Collections.emptyList());
+        when(prefs.getStringList(JabRefPreferences.COLUMN_SORT_ORDER))
+            .thenReturn(Collections.emptyList());
 
         PreferencesMigrations.upgradeColumnPreferences(prefs);
 
@@ -177,11 +326,39 @@ void testChangeColumnPreferencesVariableNamesBackwardsCompatibility() {
 
     @Test
     void testRestoreColumnVariablesForBackwardCompatibility() {
-        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(prefs.getStringList(JabRefPreferences.COLUMN_NAMES)).thenReturn(updatedNames);
+        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(prefs.getStringList(JabRefPreferences.COLUMN_NAMES))
+            .thenReturn(updatedNames);
 
         when(prefs.get(JabRefPreferences.MAIN_FONT_SIZE)).thenReturn("11.2");
 
@@ -201,18 +378,41 @@ void testMoveApiKeysToKeyRing() throws Exception {
         final String V5_9_FETCHER_CUSTOM_KEYS = "fetcherCustomKeys";
         final Keyring keyring = mock(Keyring.class);
 
-        when(prefs.getStringList(V5_9_FETCHER_CUSTOM_KEY_NAMES)).thenReturn(List.of("FetcherA", "FetcherB", "FetcherC"));
-        when(prefs.getStringList(V5_9_FETCHER_CUSTOM_KEYS)).thenReturn(List.of("KeyA", "KeyB", "KeyC"));
-        when(prefs.getInternalPreferences().getUserAndHost()).thenReturn("user-host");
-
-        try (MockedStatic<Keyring> keyringFactory = Mockito.mockStatic(Keyring.class, Answers.RETURNS_DEEP_STUBS)) {
+        when(prefs.getStringList(V5_9_FETCHER_CUSTOM_KEY_NAMES))
+            .thenReturn(List.of("FetcherA", "FetcherB", "FetcherC"));
+        when(prefs.getStringList(V5_9_FETCHER_CUSTOM_KEYS))
+            .thenReturn(List.of("KeyA", "KeyB", "KeyC"));
+        when(prefs.getInternalPreferences().getUserAndHost())
+            .thenReturn("user-host");
+
+        try (
+            MockedStatic<Keyring> keyringFactory = Mockito.mockStatic(
+                Keyring.class,
+                Answers.RETURNS_DEEP_STUBS
+            )
+        ) {
             keyringFactory.when(Keyring::create).thenReturn(keyring);
 
             PreferencesMigrations.moveApiKeysToKeyring(prefs);
 
-            verify(keyring).setPassword(eq("org.jabref.customapikeys"), eq("FetcherA"), any());
-            verify(keyring).setPassword(eq("org.jabref.customapikeys"), eq("FetcherB"), any());
-            verify(keyring).setPassword(eq("org.jabref.customapikeys"), eq("FetcherC"), any());
+            verify(keyring)
+                .setPassword(
+                    eq("org.jabref.customapikeys"),
+                    eq("FetcherA"),
+                    any()
+                );
+            verify(keyring)
+                .setPassword(
+                    eq("org.jabref.customapikeys"),
+                    eq("FetcherB"),
+                    any()
+                );
+            verify(keyring)
+                .setPassword(
+                    eq("org.jabref.customapikeys"),
+                    eq("FetcherC"),
+                    any()
+                );
             verify(prefs).deleteKey(V5_9_FETCHER_CUSTOM_KEYS);
         }
     }
diff --git a/src/test/java/org/jabref/migrations/SpecialFieldsToSeparateFieldsTest.java b/src/test/java/org/jabref/migrations/SpecialFieldsToSeparateFieldsTest.java
index 3b62d531fe7..3f191bd4b97 100644
--- a/src/test/java/org/jabref/migrations/SpecialFieldsToSeparateFieldsTest.java
+++ b/src/test/java/org/jabref/migrations/SpecialFieldsToSeparateFieldsTest.java
@@ -1,104 +1,131 @@
 package org.jabref.migrations;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
 import java.util.List;
 import java.util.stream.Stream;
-
 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;
-
 class SpecialFieldsToSeparateFieldsTest {
 
     @ParameterizedTest
     @MethodSource("provideKeywordFieldPairs")
-    public void migrateToCorrectField(SpecialField field, String fieldInKeyword, BibEntry expected) {
-        BibEntry entry = new BibEntry().withField(StandardField.KEYWORDS, fieldInKeyword);
+    public void migrateToCorrectField(
+        SpecialField field,
+        String fieldInKeyword,
+        BibEntry expected
+    ) {
+        BibEntry entry = new BibEntry()
+            .withField(StandardField.KEYWORDS, fieldInKeyword);
 
-        new SpecialFieldsToSeparateFields(',').performMigration(new ParserResult(List.of(entry)));
+        new SpecialFieldsToSeparateFields(',')
+            .performMigration(new ParserResult(List.of(entry)));
 
         assertEquals(expected, entry);
     }
 
     @Test
     public 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)));
+        new SpecialFieldsToSeparateFields(',')
+            .performMigration(new ParserResult(List.of(entry)));
 
         assertEquals(expected, entry);
     }
 
     @Test
     public 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)));
+        new SpecialFieldsToSeparateFields(',')
+            .performMigration(new ParserResult(List.of(entry)));
 
         assertEquals(expected, entry);
     }
 
     @Test
     public 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)));
+        new SpecialFieldsToSeparateFields(',')
+            .performMigration(new ParserResult(List.of(entry)));
 
         assertEquals(expected, entry);
     }
 
     @Test
     public 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)));
+        new SpecialFieldsToSeparateFields(',')
+            .performMigration(new ParserResult(List.of(entry)));
 
         assertEquals(expected, entry);
     }
 
     private static Stream<Arguments> provideKeywordFieldPairs() {
         return Stream.of(
-                Arguments.of(
-                        SpecialField.PRINTED, "printed", new BibEntry().withField(SpecialField.PRINTED, "printed")
-                ),
-                Arguments.of(
-                        SpecialField.PRIORITY, "prio1", new BibEntry().withField(SpecialField.PRIORITY, "prio1")
-                ),
-                Arguments.of(
-                        SpecialField.QUALITY, "qualityAssured", new BibEntry().withField(SpecialField.QUALITY, "qualityAssured")
-                ),
-                Arguments.of(
-                        SpecialField.RANKING, "rank2", new BibEntry().withField(SpecialField.RANKING, "rank2")
-                ),
-                Arguments.of(
-                        SpecialField.READ_STATUS, "skimmed", new BibEntry().withField(SpecialField.READ_STATUS, "skimmed")
-                ),
-                Arguments.of(
-                        SpecialField.RELEVANCE, "relevant", new BibEntry().withField(SpecialField.RELEVANCE, "relevant")
-                )
+            Arguments.of(
+                SpecialField.PRINTED,
+                "printed",
+                new BibEntry().withField(SpecialField.PRINTED, "printed")
+            ),
+            Arguments.of(
+                SpecialField.PRIORITY,
+                "prio1",
+                new BibEntry().withField(SpecialField.PRIORITY, "prio1")
+            ),
+            Arguments.of(
+                SpecialField.QUALITY,
+                "qualityAssured",
+                new BibEntry().withField(SpecialField.QUALITY, "qualityAssured")
+            ),
+            Arguments.of(
+                SpecialField.RANKING,
+                "rank2",
+                new BibEntry().withField(SpecialField.RANKING, "rank2")
+            ),
+            Arguments.of(
+                SpecialField.READ_STATUS,
+                "skimmed",
+                new BibEntry().withField(SpecialField.READ_STATUS, "skimmed")
+            ),
+            Arguments.of(
+                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 1625a1ae652..fc2f1d4050a 100644
--- a/src/test/java/org/jabref/model/FieldChangeTest.java
+++ b/src/test/java/org/jabref/model/FieldChangeTest.java
@@ -1,57 +1,89 @@
 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");
+    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
     void fieldChangeOnNullFieldNotAllowed() {
-        assertThrows(NullPointerException.class, () -> new FieldChange(entry, null, "foo", "bar"));
+        assertThrows(
+            NullPointerException.class,
+            () -> new FieldChange(entry, null, "foo", "bar")
+        );
     }
 
     @Test
     void blankFieldChangeNotAllowed() {
-        assertThrows(NullPointerException.class, () -> new FieldChange(null, null, null, null));
+        assertThrows(
+            NullPointerException.class,
+            () -> new FieldChange(null, null, null, null)
+        );
     }
 
     @Test
     void equalFieldChange() {
-        FieldChange fcBlankNewValue = new FieldChange(entry, StandardField.DOI, "foo", null);
+        FieldChange fcBlankNewValue = new FieldChange(
+            entry,
+            StandardField.DOI,
+            "foo",
+            null
+        );
         assertNotEquals(fc, fcBlankNewValue);
     }
 
     @Test
     void selfEqualsFieldchangeSameParameters() {
-        FieldChange fcBlankNewValue = new FieldChange(entry, StandardField.DOI, "foo", "bar");
+        FieldChange fcBlankNewValue = new FieldChange(
+            entry,
+            StandardField.DOI,
+            "foo",
+            "bar"
+        );
         assertEquals(fc, fcBlankNewValue);
     }
 
     @Test
     void selfEqualsFieldchangeDifferentOldValue() {
-        FieldChange fcBlankNewValue = new FieldChange(entry, StandardField.DOI, null, "bar");
+        FieldChange fcBlankNewValue = new FieldChange(
+            entry,
+            StandardField.DOI,
+            null,
+            "bar"
+        );
         assertNotEquals(fc, fcBlankNewValue);
     }
 
     @Test
     void selfEqualsFieldchangeDifferentEntry() {
-        FieldChange fcBlankNewValue = new FieldChange(entryOther, StandardField.DOI, "foo", "bar");
+        FieldChange fcBlankNewValue = new FieldChange(
+            entryOther,
+            StandardField.DOI,
+            "foo",
+            "bar"
+        );
         assertNotEquals(fc, fcBlankNewValue);
     }
 
@@ -67,7 +99,12 @@ void fieldChangeEqualsItSelf() {
 
     @Test
     void differentFieldChangeIsNotEqual() {
-        FieldChange fcOther = new FieldChange(entryOther, StandardField.DOI, "fooX", "barX");
+        FieldChange fcOther = new FieldChange(
+            entryOther,
+            StandardField.DOI,
+            "fooX",
+            "barX"
+        );
         assertNotEquals(fc, fcOther);
     }
 }
diff --git a/src/test/java/org/jabref/model/TreeNodeTest.java b/src/test/java/org/jabref/model/TreeNodeTest.java
index da2a00f89fc..38b7e678c56 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,14 @@
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.verify;
 
+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;
+
 public class TreeNodeTest {
 
     Consumer<TreeNodeTestData.TreeNodeMock> subscriber;
@@ -28,18 +27,23 @@ public void setUp() {
 
     @Test
     public void constructorChecksThatClassImplementsCorrectInterface() {
-        assertThrows(UnsupportedOperationException.class, WrongTreeNodeImplementation::new);
+        assertThrows(
+            UnsupportedOperationException.class,
+            WrongTreeNodeImplementation::new
+        );
     }
 
     @Test
     public void constructorExceptsCorrectImplementation() {
-        TreeNodeTestData.TreeNodeMock treeNode = new TreeNodeTestData.TreeNodeMock();
+        TreeNodeTestData.TreeNodeMock treeNode =
+            new TreeNodeTestData.TreeNodeMock();
         assertNotNull(treeNode);
     }
 
     @Test
     public void newTreeNodeHasNoParentOrChildren() {
-        TreeNodeTestData.TreeNodeMock treeNode = new TreeNodeTestData.TreeNodeMock();
+        TreeNodeTestData.TreeNodeMock treeNode =
+            new TreeNodeTestData.TreeNodeMock();
         assertEquals(Optional.empty(), treeNode.getParent());
         assertEquals(Collections.emptyList(), treeNode.getChildren());
         assertNotNull(treeNode);
@@ -47,70 +51,100 @@ public void newTreeNodeHasNoParentOrChildren() {
 
     @Test
     public void getIndexedPathFromRootReturnsEmptyListForRoot() {
-        TreeNodeTestData.TreeNodeMock root = new TreeNodeTestData.TreeNodeMock();
+        TreeNodeTestData.TreeNodeMock root =
+            new TreeNodeTestData.TreeNodeMock();
         assertEquals(Collections.emptyList(), root.getIndexedPathFromRoot());
     }
 
     @Test
     public void getIndexedPathFromRootSimplePath() {
-        assertEquals(Arrays.asList(1, 0), TreeNodeTestData.getNodeInSimpleTree().getIndexedPathFromRoot());
+        assertEquals(
+            Arrays.asList(1, 0),
+            TreeNodeTestData.getNodeInSimpleTree().getIndexedPathFromRoot()
+        );
     }
 
     @Test
     public void getIndexedPathFromRootComplexPath() {
-        assertEquals(Arrays.asList(2, 1, 0), TreeNodeTestData.getNodeInComplexTree().getIndexedPathFromRoot());
+        assertEquals(
+            Arrays.asList(2, 1, 0),
+            TreeNodeTestData.getNodeInComplexTree().getIndexedPathFromRoot()
+        );
     }
 
     @Test
     public void getDescendantSimplePath() {
-        TreeNodeTestData.TreeNodeMock root = new TreeNodeTestData.TreeNodeMock();
-        TreeNodeTestData.TreeNodeMock node = TreeNodeTestData.getNodeInSimpleTree(root);
+        TreeNodeTestData.TreeNodeMock root =
+            new TreeNodeTestData.TreeNodeMock();
+        TreeNodeTestData.TreeNodeMock node =
+            TreeNodeTestData.getNodeInSimpleTree(root);
         assertEquals(node, root.getDescendant(Arrays.asList(1, 0)).get());
     }
 
     @Test
     public void getDescendantComplexPath() {
-        TreeNodeTestData.TreeNodeMock root = new TreeNodeTestData.TreeNodeMock();
-        TreeNodeTestData.TreeNodeMock node = TreeNodeTestData.getNodeInComplexTree(root);
+        TreeNodeTestData.TreeNodeMock root =
+            new TreeNodeTestData.TreeNodeMock();
+        TreeNodeTestData.TreeNodeMock node =
+            TreeNodeTestData.getNodeInComplexTree(root);
         assertEquals(node, root.getDescendant(Arrays.asList(2, 1, 0)).get());
     }
 
     @Test
     public void getDescendantNonExistentReturnsEmpty() {
-        TreeNodeTestData.TreeNodeMock root = new TreeNodeTestData.TreeNodeMock();
+        TreeNodeTestData.TreeNodeMock root =
+            new TreeNodeTestData.TreeNodeMock();
         TreeNodeTestData.getNodeInComplexTree(root);
-        assertEquals(Optional.empty(), root.getDescendant(Arrays.asList(1, 100, 0)));
+        assertEquals(
+            Optional.empty(),
+            root.getDescendant(Arrays.asList(1, 100, 0))
+        );
     }
 
     @Test
     public void getPositionInParentForRootThrowsException() {
-        TreeNodeTestData.TreeNodeMock root = new TreeNodeTestData.TreeNodeMock();
-        assertThrows(UnsupportedOperationException.class, root::getPositionInParent);
+        TreeNodeTestData.TreeNodeMock root =
+            new TreeNodeTestData.TreeNodeMock();
+        assertThrows(
+            UnsupportedOperationException.class,
+            root::getPositionInParent
+        );
     }
 
     @Test
     public void getPositionInParentSimpleTree() {
-        TreeNodeTestData.TreeNodeMock root = new TreeNodeTestData.TreeNodeMock();
-        TreeNodeTestData.TreeNodeMock node = TreeNodeTestData.getNodeAsChild(root);
+        TreeNodeTestData.TreeNodeMock root =
+            new TreeNodeTestData.TreeNodeMock();
+        TreeNodeTestData.TreeNodeMock node = TreeNodeTestData.getNodeAsChild(
+            root
+        );
         assertEquals(2, node.getPositionInParent());
     }
 
     @Test
     public void getIndexOfNonExistentChildReturnsEmpty() {
-        TreeNodeTestData.TreeNodeMock root = new TreeNodeTestData.TreeNodeMock();
-        assertEquals(Optional.empty(), root.getIndexOfChild(new TreeNodeTestData.TreeNodeMock()));
+        TreeNodeTestData.TreeNodeMock root =
+            new TreeNodeTestData.TreeNodeMock();
+        assertEquals(
+            Optional.empty(),
+            root.getIndexOfChild(new TreeNodeTestData.TreeNodeMock())
+        );
     }
 
     @Test
     public void getIndexOfChild() {
-        TreeNodeTestData.TreeNodeMock root = new TreeNodeTestData.TreeNodeMock();
-        TreeNodeTestData.TreeNodeMock node = TreeNodeTestData.getNodeAsChild(root);
+        TreeNodeTestData.TreeNodeMock root =
+            new TreeNodeTestData.TreeNodeMock();
+        TreeNodeTestData.TreeNodeMock node = TreeNodeTestData.getNodeAsChild(
+            root
+        );
         assertEquals((Integer) 2, root.getIndexOfChild(node).get());
     }
 
     @Test
     public void getLevelOfRoot() {
-        TreeNodeTestData.TreeNodeMock root = new TreeNodeTestData.TreeNodeMock();
+        TreeNodeTestData.TreeNodeMock root =
+            new TreeNodeTestData.TreeNodeMock();
         assertEquals(0, root.getLevel());
     }
 
@@ -126,47 +160,58 @@ public void getLevelInComplexTree() {
 
     @Test
     public void getChildCountInSimpleTree() {
-        TreeNodeTestData.TreeNodeMock root = new TreeNodeTestData.TreeNodeMock();
+        TreeNodeTestData.TreeNodeMock root =
+            new TreeNodeTestData.TreeNodeMock();
         TreeNodeTestData.getNodeInSimpleTree(root);
         assertEquals(2, root.getNumberOfChildren());
     }
 
     @Test
     public void getChildCountInComplexTree() {
-        TreeNodeTestData.TreeNodeMock root = new TreeNodeTestData.TreeNodeMock();
+        TreeNodeTestData.TreeNodeMock root =
+            new TreeNodeTestData.TreeNodeMock();
         TreeNodeTestData.getNodeInComplexTree(root);
         assertEquals(4, root.getNumberOfChildren());
     }
 
     @Test
     public void moveToAddsAsLastChildInSimpleTree() {
-        TreeNodeTestData.TreeNodeMock root = new TreeNodeTestData.TreeNodeMock();
-        TreeNodeTestData.TreeNodeMock node = TreeNodeTestData.getNodeInSimpleTree(root);
+        TreeNodeTestData.TreeNodeMock root =
+            new TreeNodeTestData.TreeNodeMock();
+        TreeNodeTestData.TreeNodeMock node =
+            TreeNodeTestData.getNodeInSimpleTree(root);
         node.moveTo(root);
         assertEquals((Integer) 2, root.getIndexOfChild(node).get());
     }
 
     @Test
     public void moveToAddsAsLastChildInComplexTree() {
-        TreeNodeTestData.TreeNodeMock root = new TreeNodeTestData.TreeNodeMock();
-        TreeNodeTestData.TreeNodeMock node = TreeNodeTestData.getNodeInComplexTree(root);
+        TreeNodeTestData.TreeNodeMock root =
+            new TreeNodeTestData.TreeNodeMock();
+        TreeNodeTestData.TreeNodeMock node =
+            TreeNodeTestData.getNodeInComplexTree(root);
         node.moveTo(root);
         assertEquals((Integer) 4, root.getIndexOfChild(node).get());
     }
 
     @Test
     public void moveToChangesParent() {
-        TreeNodeTestData.TreeNodeMock root = new TreeNodeTestData.TreeNodeMock();
-        TreeNodeTestData.TreeNodeMock node = TreeNodeTestData.getNodeInSimpleTree(root);
+        TreeNodeTestData.TreeNodeMock root =
+            new TreeNodeTestData.TreeNodeMock();
+        TreeNodeTestData.TreeNodeMock node =
+            TreeNodeTestData.getNodeInSimpleTree(root);
         node.moveTo(root);
         assertEquals(root, node.getParent().get());
     }
 
     @Test
     public void moveToInSameLevelAddsAtEnd() {
-        TreeNodeTestData.TreeNodeMock root = new TreeNodeTestData.TreeNodeMock();
-        TreeNodeTestData.TreeNodeMock child1 = new TreeNodeTestData.TreeNodeMock();
-        TreeNodeTestData.TreeNodeMock child2 = new TreeNodeTestData.TreeNodeMock();
+        TreeNodeTestData.TreeNodeMock root =
+            new TreeNodeTestData.TreeNodeMock();
+        TreeNodeTestData.TreeNodeMock child1 =
+            new TreeNodeTestData.TreeNodeMock();
+        TreeNodeTestData.TreeNodeMock child2 =
+            new TreeNodeTestData.TreeNodeMock();
         root.addChild(child1);
         root.addChild(child2);
 
@@ -177,10 +222,14 @@ public void moveToInSameLevelAddsAtEnd() {
 
     @Test
     public void moveToInSameLevelWhenNodeWasBeforeTargetIndex() {
-        TreeNodeTestData.TreeNodeMock root = new TreeNodeTestData.TreeNodeMock();
-        TreeNodeTestData.TreeNodeMock child1 = new TreeNodeTestData.TreeNodeMock();
-        TreeNodeTestData.TreeNodeMock child2 = new TreeNodeTestData.TreeNodeMock();
-        TreeNodeTestData.TreeNodeMock child3 = new TreeNodeTestData.TreeNodeMock();
+        TreeNodeTestData.TreeNodeMock root =
+            new TreeNodeTestData.TreeNodeMock();
+        TreeNodeTestData.TreeNodeMock child1 =
+            new TreeNodeTestData.TreeNodeMock();
+        TreeNodeTestData.TreeNodeMock child2 =
+            new TreeNodeTestData.TreeNodeMock();
+        TreeNodeTestData.TreeNodeMock child3 =
+            new TreeNodeTestData.TreeNodeMock();
         root.addChild(child1);
         root.addChild(child2);
         root.addChild(child3);
@@ -192,10 +241,14 @@ public void moveToInSameLevelWhenNodeWasBeforeTargetIndex() {
 
     @Test
     public void moveToInSameLevelWhenNodeWasAfterTargetIndex() {
-        TreeNodeTestData.TreeNodeMock root = new TreeNodeTestData.TreeNodeMock();
-        TreeNodeTestData.TreeNodeMock child1 = new TreeNodeTestData.TreeNodeMock();
-        TreeNodeTestData.TreeNodeMock child2 = new TreeNodeTestData.TreeNodeMock();
-        TreeNodeTestData.TreeNodeMock child3 = new TreeNodeTestData.TreeNodeMock();
+        TreeNodeTestData.TreeNodeMock root =
+            new TreeNodeTestData.TreeNodeMock();
+        TreeNodeTestData.TreeNodeMock child1 =
+            new TreeNodeTestData.TreeNodeMock();
+        TreeNodeTestData.TreeNodeMock child2 =
+            new TreeNodeTestData.TreeNodeMock();
+        TreeNodeTestData.TreeNodeMock child3 =
+            new TreeNodeTestData.TreeNodeMock();
         root.addChild(child1);
         root.addChild(child2);
         root.addChild(child3);
@@ -207,8 +260,10 @@ public void moveToInSameLevelWhenNodeWasAfterTargetIndex() {
 
     @Test
     public void getPathFromRootInSimpleTree() {
-        TreeNodeTestData.TreeNodeMock root = new TreeNodeTestData.TreeNodeMock();
-        TreeNodeTestData.TreeNodeMock node = TreeNodeTestData.getNodeInSimpleTree(root);
+        TreeNodeTestData.TreeNodeMock root =
+            new TreeNodeTestData.TreeNodeMock();
+        TreeNodeTestData.TreeNodeMock node =
+            TreeNodeTestData.getNodeInSimpleTree(root);
 
         List<TreeNodeTestData.TreeNodeMock> path = node.getPathFromRoot();
         assertEquals(3, path.size());
@@ -218,8 +273,10 @@ public void getPathFromRootInSimpleTree() {
 
     @Test
     public void getPathFromRootInComplexTree() {
-        TreeNodeTestData.TreeNodeMock root = new TreeNodeTestData.TreeNodeMock();
-        TreeNodeTestData.TreeNodeMock node = TreeNodeTestData.getNodeInComplexTree(root);
+        TreeNodeTestData.TreeNodeMock root =
+            new TreeNodeTestData.TreeNodeMock();
+        TreeNodeTestData.TreeNodeMock node =
+            TreeNodeTestData.getNodeInComplexTree(root);
 
         List<TreeNodeTestData.TreeNodeMock> path = node.getPathFromRoot();
         assertEquals(4, path.size());
@@ -229,11 +286,14 @@ public void getPathFromRootInComplexTree() {
 
     @Test
     public void getPreviousSiblingReturnsCorrect() {
-        TreeNodeTestData.TreeNodeMock root = new TreeNodeTestData.TreeNodeMock();
+        TreeNodeTestData.TreeNodeMock root =
+            new TreeNodeTestData.TreeNodeMock();
         root.addChild(new TreeNodeTestData.TreeNodeMock());
-        TreeNodeTestData.TreeNodeMock previous = new TreeNodeTestData.TreeNodeMock();
+        TreeNodeTestData.TreeNodeMock previous =
+            new TreeNodeTestData.TreeNodeMock();
         root.addChild(previous);
-        TreeNodeTestData.TreeNodeMock node = new TreeNodeTestData.TreeNodeMock();
+        TreeNodeTestData.TreeNodeMock node =
+            new TreeNodeTestData.TreeNodeMock();
         root.addChild(node);
         root.addChild(new TreeNodeTestData.TreeNodeMock());
 
@@ -242,25 +302,31 @@ public void getPreviousSiblingReturnsCorrect() {
 
     @Test
     public void getPreviousSiblingForRootReturnsEmpty() {
-        TreeNodeTestData.TreeNodeMock root = new TreeNodeTestData.TreeNodeMock();
+        TreeNodeTestData.TreeNodeMock root =
+            new TreeNodeTestData.TreeNodeMock();
         assertEquals(Optional.empty(), root.getPreviousSibling());
     }
 
     @Test
     public void getPreviousSiblingForNonexistentReturnsEmpty() {
-        TreeNodeTestData.TreeNodeMock root = new TreeNodeTestData.TreeNodeMock();
-        TreeNodeTestData.TreeNodeMock node = new TreeNodeTestData.TreeNodeMock();
+        TreeNodeTestData.TreeNodeMock root =
+            new TreeNodeTestData.TreeNodeMock();
+        TreeNodeTestData.TreeNodeMock node =
+            new TreeNodeTestData.TreeNodeMock();
         root.addChild(node);
         assertEquals(Optional.empty(), node.getPreviousSibling());
     }
 
     @Test
     public void getNextSiblingReturnsCorrect() {
-        TreeNodeTestData.TreeNodeMock root = new TreeNodeTestData.TreeNodeMock();
+        TreeNodeTestData.TreeNodeMock root =
+            new TreeNodeTestData.TreeNodeMock();
         root.addChild(new TreeNodeTestData.TreeNodeMock());
-        TreeNodeTestData.TreeNodeMock node = new TreeNodeTestData.TreeNodeMock();
+        TreeNodeTestData.TreeNodeMock node =
+            new TreeNodeTestData.TreeNodeMock();
         root.addChild(node);
-        TreeNodeTestData.TreeNodeMock next = new TreeNodeTestData.TreeNodeMock();
+        TreeNodeTestData.TreeNodeMock next =
+            new TreeNodeTestData.TreeNodeMock();
         root.addChild(next);
         root.addChild(new TreeNodeTestData.TreeNodeMock());
 
@@ -269,43 +335,54 @@ public void getNextSiblingReturnsCorrect() {
 
     @Test
     public void getNextSiblingForRootReturnsEmpty() {
-        TreeNodeTestData.TreeNodeMock root = new TreeNodeTestData.TreeNodeMock();
+        TreeNodeTestData.TreeNodeMock root =
+            new TreeNodeTestData.TreeNodeMock();
         assertEquals(Optional.empty(), root.getNextSibling());
     }
 
     @Test
     public void getNextSiblingForNonexistentReturnsEmpty() {
-        TreeNodeTestData.TreeNodeMock root = new TreeNodeTestData.TreeNodeMock();
-        TreeNodeTestData.TreeNodeMock node = new TreeNodeTestData.TreeNodeMock();
+        TreeNodeTestData.TreeNodeMock root =
+            new TreeNodeTestData.TreeNodeMock();
+        TreeNodeTestData.TreeNodeMock node =
+            new TreeNodeTestData.TreeNodeMock();
         root.addChild(node);
         assertEquals(Optional.empty(), node.getPreviousSibling());
     }
 
     @Test
     public void getParentReturnsCorrect() {
-        TreeNodeTestData.TreeNodeMock root = new TreeNodeTestData.TreeNodeMock();
-        TreeNodeTestData.TreeNodeMock node = TreeNodeTestData.getNodeAsChild(root);
+        TreeNodeTestData.TreeNodeMock root =
+            new TreeNodeTestData.TreeNodeMock();
+        TreeNodeTestData.TreeNodeMock node = TreeNodeTestData.getNodeAsChild(
+            root
+        );
 
         assertEquals(root, node.getParent().get());
     }
 
     @Test
     public void getParentForRootReturnsEmpty() {
-        TreeNodeTestData.TreeNodeMock root = new TreeNodeTestData.TreeNodeMock();
+        TreeNodeTestData.TreeNodeMock root =
+            new TreeNodeTestData.TreeNodeMock();
         assertEquals(Optional.empty(), root.getParent());
     }
 
     @Test
     public void getChildAtReturnsCorrect() {
-        TreeNodeTestData.TreeNodeMock root = new TreeNodeTestData.TreeNodeMock();
-        TreeNodeTestData.TreeNodeMock node = TreeNodeTestData.getNodeAsChild(root);
+        TreeNodeTestData.TreeNodeMock root =
+            new TreeNodeTestData.TreeNodeMock();
+        TreeNodeTestData.TreeNodeMock node = TreeNodeTestData.getNodeAsChild(
+            root
+        );
 
         assertEquals(node, root.getChildAt(2).get());
     }
 
     @Test
     public void getChildAtInvalidIndexReturnsEmpty() {
-        TreeNodeTestData.TreeNodeMock root = new TreeNodeTestData.TreeNodeMock();
+        TreeNodeTestData.TreeNodeMock root =
+            new TreeNodeTestData.TreeNodeMock();
         root.addChild(new TreeNodeTestData.TreeNodeMock());
         root.addChild(new TreeNodeTestData.TreeNodeMock());
         assertEquals(Optional.empty(), root.getChildAt(10));
@@ -313,7 +390,8 @@ public void getChildAtInvalidIndexReturnsEmpty() {
 
     @Test
     public void getRootReturnsTrueForRoot() {
-        TreeNodeTestData.TreeNodeMock root = new TreeNodeTestData.TreeNodeMock();
+        TreeNodeTestData.TreeNodeMock root =
+            new TreeNodeTestData.TreeNodeMock();
         assertTrue(root.isRoot());
     }
 
@@ -324,54 +402,68 @@ public void getRootReturnsFalseForChild() {
 
     @Test
     public void nodeIsAncestorOfItself() {
-        TreeNodeTestData.TreeNodeMock root = new TreeNodeTestData.TreeNodeMock();
+        TreeNodeTestData.TreeNodeMock root =
+            new TreeNodeTestData.TreeNodeMock();
         assertTrue(root.isAncestorOf(root));
     }
 
     @Test
     public void isAncestorOfInSimpleTree() {
-        TreeNodeTestData.TreeNodeMock root = new TreeNodeTestData.TreeNodeMock();
-        TreeNodeTestData.TreeNodeMock node = TreeNodeTestData.getNodeInSimpleTree(root);
+        TreeNodeTestData.TreeNodeMock root =
+            new TreeNodeTestData.TreeNodeMock();
+        TreeNodeTestData.TreeNodeMock node =
+            TreeNodeTestData.getNodeInSimpleTree(root);
         assertTrue(root.isAncestorOf(node));
     }
 
     @Test
     public void isAncestorOfInComplexTree() {
-        TreeNodeTestData.TreeNodeMock root = new TreeNodeTestData.TreeNodeMock();
-        TreeNodeTestData.TreeNodeMock node = TreeNodeTestData.getNodeInComplexTree(root);
+        TreeNodeTestData.TreeNodeMock root =
+            new TreeNodeTestData.TreeNodeMock();
+        TreeNodeTestData.TreeNodeMock node =
+            TreeNodeTestData.getNodeInComplexTree(root);
         assertTrue(root.isAncestorOf(node));
     }
 
     @Test
     public void getRootOfSingleNode() {
-        TreeNodeTestData.TreeNodeMock root = new TreeNodeTestData.TreeNodeMock();
+        TreeNodeTestData.TreeNodeMock root =
+            new TreeNodeTestData.TreeNodeMock();
         assertEquals(root, root.getRoot());
     }
 
     @Test
     public void getRootInSimpleTree() {
-        TreeNodeTestData.TreeNodeMock root = new TreeNodeTestData.TreeNodeMock();
-        TreeNodeTestData.TreeNodeMock node = TreeNodeTestData.getNodeInSimpleTree(root);
+        TreeNodeTestData.TreeNodeMock root =
+            new TreeNodeTestData.TreeNodeMock();
+        TreeNodeTestData.TreeNodeMock node =
+            TreeNodeTestData.getNodeInSimpleTree(root);
         assertEquals(root, node.getRoot());
     }
 
     @Test
     public void getRootInComplexTree() {
-        TreeNodeTestData.TreeNodeMock root = new TreeNodeTestData.TreeNodeMock();
-        TreeNodeTestData.TreeNodeMock node = TreeNodeTestData.getNodeInComplexTree(root);
+        TreeNodeTestData.TreeNodeMock root =
+            new TreeNodeTestData.TreeNodeMock();
+        TreeNodeTestData.TreeNodeMock node =
+            TreeNodeTestData.getNodeInComplexTree(root);
         assertEquals(root, node.getRoot());
     }
 
     @Test
     public void isLeafIsCorrectForRootWithoutChildren() {
-        TreeNodeTestData.TreeNodeMock root = new TreeNodeTestData.TreeNodeMock();
+        TreeNodeTestData.TreeNodeMock root =
+            new TreeNodeTestData.TreeNodeMock();
         assertTrue(root.isLeaf());
     }
 
     @Test
     public void removeFromParentSetsParentToEmpty() {
-        TreeNodeTestData.TreeNodeMock root = new TreeNodeTestData.TreeNodeMock();
-        TreeNodeTestData.TreeNodeMock node = TreeNodeTestData.getNodeAsChild(root);
+        TreeNodeTestData.TreeNodeMock root =
+            new TreeNodeTestData.TreeNodeMock();
+        TreeNodeTestData.TreeNodeMock node = TreeNodeTestData.getNodeAsChild(
+            root
+        );
 
         node.removeFromParent();
         assertEquals(Optional.empty(), node.getParent());
@@ -379,8 +471,11 @@ public void removeFromParentSetsParentToEmpty() {
 
     @Test
     public void removeFromParentRemovesNodeFromChildrenCollection() {
-        TreeNodeTestData.TreeNodeMock root = new TreeNodeTestData.TreeNodeMock();
-        TreeNodeTestData.TreeNodeMock node = TreeNodeTestData.getNodeAsChild(root);
+        TreeNodeTestData.TreeNodeMock root =
+            new TreeNodeTestData.TreeNodeMock();
+        TreeNodeTestData.TreeNodeMock node = TreeNodeTestData.getNodeAsChild(
+            root
+        );
 
         node.removeFromParent();
         assertFalse(root.getChildren().contains(node));
@@ -388,8 +483,11 @@ public void removeFromParentRemovesNodeFromChildrenCollection() {
 
     @Test
     public void removeAllChildrenSetsParentOfChildToEmpty() {
-        TreeNodeTestData.TreeNodeMock root = new TreeNodeTestData.TreeNodeMock();
-        TreeNodeTestData.TreeNodeMock node = TreeNodeTestData.getNodeAsChild(root);
+        TreeNodeTestData.TreeNodeMock root =
+            new TreeNodeTestData.TreeNodeMock();
+        TreeNodeTestData.TreeNodeMock node = TreeNodeTestData.getNodeAsChild(
+            root
+        );
 
         root.removeAllChildren();
         assertEquals(Optional.empty(), node.getParent());
@@ -397,7 +495,8 @@ public void removeAllChildrenSetsParentOfChildToEmpty() {
 
     @Test
     public void removeAllChildrenRemovesAllNodesFromChildrenCollection() {
-        TreeNodeTestData.TreeNodeMock root = new TreeNodeTestData.TreeNodeMock();
+        TreeNodeTestData.TreeNodeMock root =
+            new TreeNodeTestData.TreeNodeMock();
         TreeNodeTestData.getNodeAsChild(root);
 
         root.removeAllChildren();
@@ -406,8 +505,10 @@ public void removeAllChildrenRemovesAllNodesFromChildrenCollection() {
 
     @Test
     public void getFirstChildAtReturnsCorrect() {
-        TreeNodeTestData.TreeNodeMock root = new TreeNodeTestData.TreeNodeMock();
-        TreeNodeTestData.TreeNodeMock node = new TreeNodeTestData.TreeNodeMock();
+        TreeNodeTestData.TreeNodeMock root =
+            new TreeNodeTestData.TreeNodeMock();
+        TreeNodeTestData.TreeNodeMock node =
+            new TreeNodeTestData.TreeNodeMock();
         root.addChild(node);
 
         assertEquals(node, root.getFirstChild().get());
@@ -415,30 +516,41 @@ public void getFirstChildAtReturnsCorrect() {
 
     @Test
     public void getFirstChildAtLeafReturnsEmpty() {
-        TreeNodeTestData.TreeNodeMock root = new TreeNodeTestData.TreeNodeMock();
-        TreeNodeTestData.TreeNodeMock leaf = TreeNodeTestData.getNodeAsChild(root);
+        TreeNodeTestData.TreeNodeMock root =
+            new TreeNodeTestData.TreeNodeMock();
+        TreeNodeTestData.TreeNodeMock leaf = TreeNodeTestData.getNodeAsChild(
+            root
+        );
         assertEquals(Optional.empty(), leaf.getFirstChild());
     }
 
     @Test
     public void isNodeDescendantInFirstLevel() {
-        TreeNodeTestData.TreeNodeMock root = new TreeNodeTestData.TreeNodeMock();
-        TreeNodeTestData.TreeNodeMock child = TreeNodeTestData.getNodeAsChild(root);
+        TreeNodeTestData.TreeNodeMock root =
+            new TreeNodeTestData.TreeNodeMock();
+        TreeNodeTestData.TreeNodeMock child = TreeNodeTestData.getNodeAsChild(
+            root
+        );
         assertTrue(root.isNodeDescendant(child));
     }
 
     @Test
     public void isNodeDescendantInComplex() {
-        TreeNodeTestData.TreeNodeMock root = new TreeNodeTestData.TreeNodeMock();
-        TreeNodeTestData.TreeNodeMock descendant = TreeNodeTestData.getNodeInComplexTree(root);
+        TreeNodeTestData.TreeNodeMock root =
+            new TreeNodeTestData.TreeNodeMock();
+        TreeNodeTestData.TreeNodeMock descendant =
+            TreeNodeTestData.getNodeInComplexTree(root);
         assertTrue(root.isNodeDescendant(descendant));
     }
 
     @Test
     public void getChildrenReturnsAllChildren() {
-        TreeNodeTestData.TreeNodeMock root = new TreeNodeTestData.TreeNodeMock();
-        TreeNodeTestData.TreeNodeMock child1 = new TreeNodeTestData.TreeNodeMock();
-        TreeNodeTestData.TreeNodeMock child2 = new TreeNodeTestData.TreeNodeMock();
+        TreeNodeTestData.TreeNodeMock root =
+            new TreeNodeTestData.TreeNodeMock();
+        TreeNodeTestData.TreeNodeMock child1 =
+            new TreeNodeTestData.TreeNodeMock();
+        TreeNodeTestData.TreeNodeMock child2 =
+            new TreeNodeTestData.TreeNodeMock();
         root.addChild(child1);
         root.addChild(child2);
 
@@ -447,8 +559,11 @@ public void getChildrenReturnsAllChildren() {
 
     @Test
     public void removeChildSetsParentToEmpty() {
-        TreeNodeTestData.TreeNodeMock root = new TreeNodeTestData.TreeNodeMock();
-        TreeNodeTestData.TreeNodeMock node = TreeNodeTestData.getNodeAsChild(root);
+        TreeNodeTestData.TreeNodeMock root =
+            new TreeNodeTestData.TreeNodeMock();
+        TreeNodeTestData.TreeNodeMock node = TreeNodeTestData.getNodeAsChild(
+            root
+        );
 
         root.removeChild(node);
         assertEquals(Optional.empty(), node.getParent());
@@ -456,8 +571,11 @@ public void removeChildSetsParentToEmpty() {
 
     @Test
     public void removeChildRemovesNodeFromChildrenCollection() {
-        TreeNodeTestData.TreeNodeMock root = new TreeNodeTestData.TreeNodeMock();
-        TreeNodeTestData.TreeNodeMock node = TreeNodeTestData.getNodeAsChild(root);
+        TreeNodeTestData.TreeNodeMock root =
+            new TreeNodeTestData.TreeNodeMock();
+        TreeNodeTestData.TreeNodeMock node = TreeNodeTestData.getNodeAsChild(
+            root
+        );
 
         root.removeChild(node);
         assertFalse(root.getChildren().contains(node));
@@ -465,8 +583,11 @@ public void removeChildRemovesNodeFromChildrenCollection() {
 
     @Test
     public void removeChildIndexSetsParentToEmpty() {
-        TreeNodeTestData.TreeNodeMock root = new TreeNodeTestData.TreeNodeMock();
-        TreeNodeTestData.TreeNodeMock node = TreeNodeTestData.getNodeAsChild(root);
+        TreeNodeTestData.TreeNodeMock root =
+            new TreeNodeTestData.TreeNodeMock();
+        TreeNodeTestData.TreeNodeMock node = TreeNodeTestData.getNodeAsChild(
+            root
+        );
 
         root.removeChild(2);
         assertEquals(Optional.empty(), node.getParent());
@@ -474,8 +595,11 @@ public void removeChildIndexSetsParentToEmpty() {
 
     @Test
     public void removeChildIndexRemovesNodeFromChildrenCollection() {
-        TreeNodeTestData.TreeNodeMock root = new TreeNodeTestData.TreeNodeMock();
-        TreeNodeTestData.TreeNodeMock node = TreeNodeTestData.getNodeAsChild(root);
+        TreeNodeTestData.TreeNodeMock root =
+            new TreeNodeTestData.TreeNodeMock();
+        TreeNodeTestData.TreeNodeMock node = TreeNodeTestData.getNodeAsChild(
+            root
+        );
 
         root.removeChild(2);
         assertFalse(root.getChildren().contains(node));
@@ -483,18 +607,28 @@ public void removeChildIndexRemovesNodeFromChildrenCollection() {
 
     @Test
     public void addThrowsExceptionIfNodeHasParent() {
-        TreeNodeTestData.TreeNodeMock root = new TreeNodeTestData.TreeNodeMock();
-        TreeNodeTestData.TreeNodeMock node = TreeNodeTestData.getNodeAsChild(root);
-        assertThrows(UnsupportedOperationException.class, () -> root.addChild(node));
+        TreeNodeTestData.TreeNodeMock root =
+            new TreeNodeTestData.TreeNodeMock();
+        TreeNodeTestData.TreeNodeMock node = TreeNodeTestData.getNodeAsChild(
+            root
+        );
+        assertThrows(
+            UnsupportedOperationException.class,
+            () -> root.addChild(node)
+        );
     }
 
     @Test
     public void moveAllChildrenToAddsAtSpecifiedPosition() {
-        TreeNodeTestData.TreeNodeMock root = new TreeNodeTestData.TreeNodeMock();
-        TreeNodeTestData.TreeNodeMock node = new TreeNodeTestData.TreeNodeMock();
+        TreeNodeTestData.TreeNodeMock root =
+            new TreeNodeTestData.TreeNodeMock();
+        TreeNodeTestData.TreeNodeMock node =
+            new TreeNodeTestData.TreeNodeMock();
         root.addChild(node);
-        TreeNodeTestData.TreeNodeMock child1 = new TreeNodeTestData.TreeNodeMock();
-        TreeNodeTestData.TreeNodeMock child2 = new TreeNodeTestData.TreeNodeMock();
+        TreeNodeTestData.TreeNodeMock child1 =
+            new TreeNodeTestData.TreeNodeMock();
+        TreeNodeTestData.TreeNodeMock child2 =
+            new TreeNodeTestData.TreeNodeMock();
         node.addChild(child1);
         node.addChild(child2);
 
@@ -504,11 +638,15 @@ public void moveAllChildrenToAddsAtSpecifiedPosition() {
 
     @Test
     public void moveAllChildrenToChangesParent() {
-        TreeNodeTestData.TreeNodeMock root = new TreeNodeTestData.TreeNodeMock();
-        TreeNodeTestData.TreeNodeMock node = new TreeNodeTestData.TreeNodeMock();
+        TreeNodeTestData.TreeNodeMock root =
+            new TreeNodeTestData.TreeNodeMock();
+        TreeNodeTestData.TreeNodeMock node =
+            new TreeNodeTestData.TreeNodeMock();
         root.addChild(node);
-        TreeNodeTestData.TreeNodeMock child1 = new TreeNodeTestData.TreeNodeMock();
-        TreeNodeTestData.TreeNodeMock child2 = new TreeNodeTestData.TreeNodeMock();
+        TreeNodeTestData.TreeNodeMock child1 =
+            new TreeNodeTestData.TreeNodeMock();
+        TreeNodeTestData.TreeNodeMock child2 =
+            new TreeNodeTestData.TreeNodeMock();
         node.addChild(child1);
         node.addChild(child2);
 
@@ -519,56 +657,85 @@ public void moveAllChildrenToChangesParent() {
 
     @Test
     public void moveAllChildrenToDescendantThrowsException() {
-        TreeNodeTestData.TreeNodeMock root = new TreeNodeTestData.TreeNodeMock();
-        TreeNodeTestData.TreeNodeMock node = TreeNodeTestData.getNodeAsChild(root);
+        TreeNodeTestData.TreeNodeMock root =
+            new TreeNodeTestData.TreeNodeMock();
+        TreeNodeTestData.TreeNodeMock node = TreeNodeTestData.getNodeAsChild(
+            root
+        );
 
-        assertThrows(UnsupportedOperationException.class, () -> root.moveAllChildrenTo(node, 0));
+        assertThrows(
+            UnsupportedOperationException.class,
+            () -> root.moveAllChildrenTo(node, 0)
+        );
     }
 
     @Test
     public void sortChildrenSortsInFirstLevel() {
-        TreeNodeTestData.TreeNodeMock root = new TreeNodeTestData.TreeNodeMock();
-        TreeNodeTestData.TreeNodeMock child1 = new TreeNodeTestData.TreeNodeMock("a");
-        TreeNodeTestData.TreeNodeMock child2 = new TreeNodeTestData.TreeNodeMock("b");
-        TreeNodeTestData.TreeNodeMock child3 = new TreeNodeTestData.TreeNodeMock("c");
+        TreeNodeTestData.TreeNodeMock root =
+            new TreeNodeTestData.TreeNodeMock();
+        TreeNodeTestData.TreeNodeMock child1 =
+            new TreeNodeTestData.TreeNodeMock("a");
+        TreeNodeTestData.TreeNodeMock child2 =
+            new TreeNodeTestData.TreeNodeMock("b");
+        TreeNodeTestData.TreeNodeMock child3 =
+            new TreeNodeTestData.TreeNodeMock("c");
         root.addChild(child2);
         root.addChild(child3);
         root.addChild(child1);
 
-        root.sortChildren((o1, o2) -> o1.getName().compareToIgnoreCase(o2.getName()), false);
+        root.sortChildren(
+            (o1, o2) -> o1.getName().compareToIgnoreCase(o2.getName()),
+            false
+        );
         assertEquals(Arrays.asList(child1, child2, child3), root.getChildren());
     }
 
     @Test
     public void sortChildrenRecursiveSortsInDeeperLevel() {
-        TreeNodeTestData.TreeNodeMock root = new TreeNodeTestData.TreeNodeMock();
-        TreeNodeTestData.TreeNodeMock node = TreeNodeTestData.getNodeInSimpleTree(root);
-        TreeNodeTestData.TreeNodeMock child1 = new TreeNodeTestData.TreeNodeMock("a");
-        TreeNodeTestData.TreeNodeMock child2 = new TreeNodeTestData.TreeNodeMock("b");
-        TreeNodeTestData.TreeNodeMock child3 = new TreeNodeTestData.TreeNodeMock("c");
+        TreeNodeTestData.TreeNodeMock root =
+            new TreeNodeTestData.TreeNodeMock();
+        TreeNodeTestData.TreeNodeMock node =
+            TreeNodeTestData.getNodeInSimpleTree(root);
+        TreeNodeTestData.TreeNodeMock child1 =
+            new TreeNodeTestData.TreeNodeMock("a");
+        TreeNodeTestData.TreeNodeMock child2 =
+            new TreeNodeTestData.TreeNodeMock("b");
+        TreeNodeTestData.TreeNodeMock child3 =
+            new TreeNodeTestData.TreeNodeMock("c");
         node.addChild(child2);
         node.addChild(child3);
         node.addChild(child1);
 
-        root.sortChildren((o1, o2) -> o1.getName().compareToIgnoreCase(o2.getName()), true);
+        root.sortChildren(
+            (o1, o2) -> o1.getName().compareToIgnoreCase(o2.getName()),
+            true
+        );
         assertEquals(Arrays.asList(child1, child2, child3), node.getChildren());
     }
 
     @Test
     public void copySubtreeCopiesChildren() {
-        TreeNodeTestData.TreeNodeMock root = new TreeNodeTestData.TreeNodeMock();
-        TreeNodeTestData.TreeNodeMock node = TreeNodeTestData.getNodeAsChild(root);
+        TreeNodeTestData.TreeNodeMock root =
+            new TreeNodeTestData.TreeNodeMock();
+        TreeNodeTestData.TreeNodeMock node = TreeNodeTestData.getNodeAsChild(
+            root
+        );
 
         TreeNodeTestData.TreeNodeMock copiedRoot = root.copySubtree();
         assertEquals(Optional.empty(), copiedRoot.getParent());
         assertFalse(copiedRoot.getChildren().contains(node));
-        assertEquals(root.getNumberOfChildren(), copiedRoot.getNumberOfChildren());
+        assertEquals(
+            root.getNumberOfChildren(),
+            copiedRoot.getNumberOfChildren()
+        );
     }
 
     @Test
     public void addChildSomewhereInTreeInvokesChangeEvent() {
-        TreeNodeTestData.TreeNodeMock root = new TreeNodeTestData.TreeNodeMock();
-        TreeNodeTestData.TreeNodeMock node = TreeNodeTestData.getNodeInComplexTree(root);
+        TreeNodeTestData.TreeNodeMock root =
+            new TreeNodeTestData.TreeNodeMock();
+        TreeNodeTestData.TreeNodeMock node =
+            TreeNodeTestData.getNodeInComplexTree(root);
 
         root.subscribeToDescendantChanged(subscriber);
 
@@ -578,8 +745,10 @@ public void addChildSomewhereInTreeInvokesChangeEvent() {
 
     @Test
     public void moveNodeSomewhereInTreeInvokesChangeEvent() {
-        TreeNodeTestData.TreeNodeMock root = new TreeNodeTestData.TreeNodeMock();
-        TreeNodeTestData.TreeNodeMock node = TreeNodeTestData.getNodeInComplexTree(root);
+        TreeNodeTestData.TreeNodeMock root =
+            new TreeNodeTestData.TreeNodeMock();
+        TreeNodeTestData.TreeNodeMock node =
+            TreeNodeTestData.getNodeInComplexTree(root);
         TreeNodeTestData.TreeNodeMock oldParent = node.getParent().get();
 
         root.subscribeToDescendantChanged(subscriber);
@@ -591,9 +760,13 @@ public void moveNodeSomewhereInTreeInvokesChangeEvent() {
 
     @Test
     public void removeChildSomewhereInTreeInvokesChangeEvent() {
-        TreeNodeTestData.TreeNodeMock root = new TreeNodeTestData.TreeNodeMock();
-        TreeNodeTestData.TreeNodeMock node = TreeNodeTestData.getNodeInComplexTree(root);
-        TreeNodeTestData.TreeNodeMock child = node.addChild(new TreeNodeTestData.TreeNodeMock());
+        TreeNodeTestData.TreeNodeMock root =
+            new TreeNodeTestData.TreeNodeMock();
+        TreeNodeTestData.TreeNodeMock node =
+            TreeNodeTestData.getNodeInComplexTree(root);
+        TreeNodeTestData.TreeNodeMock child = node.addChild(
+            new TreeNodeTestData.TreeNodeMock()
+        );
 
         root.subscribeToDescendantChanged(subscriber);
 
@@ -603,8 +776,10 @@ public void removeChildSomewhereInTreeInvokesChangeEvent() {
 
     @Test
     public void removeChildIndexSomewhereInTreeInvokesChangeEvent() {
-        TreeNodeTestData.TreeNodeMock root = new TreeNodeTestData.TreeNodeMock();
-        TreeNodeTestData.TreeNodeMock node = TreeNodeTestData.getNodeInComplexTree(root);
+        TreeNodeTestData.TreeNodeMock root =
+            new TreeNodeTestData.TreeNodeMock();
+        TreeNodeTestData.TreeNodeMock node =
+            TreeNodeTestData.getNodeInComplexTree(root);
         node.addChild(new TreeNodeTestData.TreeNodeMock());
 
         root.subscribeToDescendantChanged(subscriber);
@@ -615,15 +790,29 @@ public void removeChildIndexSomewhereInTreeInvokesChangeEvent() {
 
     @Test
     public 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"));
-
-        assertEquals(Arrays.asList(root, node, childA), root.findChildrenSatisfying(treeNode -> "A".equals(treeNode.getName())));
-    }
-
-    private static class WrongTreeNodeImplementation extends TreeNode<TreeNodeTestData.TreeNodeMock> {
+        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")
+        );
+
+        assertEquals(
+            Arrays.asList(root, node, childA),
+            root.findChildrenSatisfying(treeNode ->
+                "A".equals(treeNode.getName())
+            )
+        );
+    }
+
+    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 0df7c6f3553..5fdfa3c14e1 100644
--- a/src/test/java/org/jabref/model/TreeNodeTestData.java
+++ b/src/test/java/org/jabref/model/TreeNodeTestData.java
@@ -1,6 +1,7 @@
 package org.jabref.model;
 
 public class TreeNodeTestData {
+
     /**
      * Gets the marked node in the following tree: Root A A (= parent) B (<-- this)
      */
@@ -86,9 +87,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 55e4fd2a744..0416a08994e 100644
--- a/src/test/java/org/jabref/model/database/BibDatabaseContextTest.java
+++ b/src/test/java/org/jabref/model/database/BibDatabaseContextTest.java
@@ -1,24 +1,22 @@
 package org.jabref.model.database;
 
+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;
 import java.util.Optional;
-
 import org.jabref.architecture.AllowedToUseLogic;
 import org.jabref.logic.util.OS;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.types.IEEETranEntryType;
 import org.jabref.model.metadata.MetaData;
 import org.jabref.preferences.FilePreferences;
-
 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;
-
 @AllowedToUseLogic("Needs access to OS class")
 class BibDatabaseContextTest {
 
@@ -37,7 +35,10 @@ void setUp() {
     void getFileDirectoriesWithEmptyDbParent() {
         BibDatabaseContext database = new BibDatabaseContext();
         database.setDatabasePath(Path.of("biblio.bib"));
-        assertEquals(Collections.singletonList(currentWorkingDir), database.getFileDirectories(fileDirPrefs));
+        assertEquals(
+            Collections.singletonList(currentWorkingDir),
+            database.getFileDirectories(fileDirPrefs)
+        );
     }
 
     @Test
@@ -46,7 +47,12 @@ void getFileDirectoriesWithRelativeDbParent() {
 
         BibDatabaseContext database = new BibDatabaseContext();
         database.setDatabasePath(file);
-        assertEquals(Collections.singletonList(currentWorkingDir.resolve(file.getParent())), database.getFileDirectories(fileDirPrefs));
+        assertEquals(
+            Collections.singletonList(
+                currentWorkingDir.resolve(file.getParent())
+            ),
+            database.getFileDirectories(fileDirPrefs)
+        );
     }
 
     @Test
@@ -55,7 +61,12 @@ void getFileDirectoriesWithRelativeDottedDbParent() {
 
         BibDatabaseContext database = new BibDatabaseContext();
         database.setDatabasePath(file);
-        assertEquals(Collections.singletonList(currentWorkingDir.resolve(file.getParent())), database.getFileDirectories(fileDirPrefs));
+        assertEquals(
+            Collections.singletonList(
+                currentWorkingDir.resolve(file.getParent())
+            ),
+            database.getFileDirectories(fileDirPrefs)
+        );
     }
 
     @Test
@@ -64,7 +75,12 @@ void getFileDirectoriesWithAbsoluteDbParent() {
 
         BibDatabaseContext database = new BibDatabaseContext();
         database.setDatabasePath(file);
-        assertEquals(Collections.singletonList(currentWorkingDir.resolve(file.getParent())), database.getFileDirectories(fileDirPrefs));
+        assertEquals(
+            Collections.singletonList(
+                currentWorkingDir.resolve(file.getParent())
+            ),
+            database.getFileDirectories(fileDirPrefs)
+        );
     }
 
     @Test
@@ -76,8 +92,10 @@ void getFileDirectoriesWithRelativeMetadata() {
         database.getMetaData().setDefaultFileDirectory("../Literature");
         // first directory is the metadata
         // the bib file location is not included, because only the library-configured directories should be searched and the fallback should be the global directory.
-        assertEquals(List.of(Path.of("/absolute/Literature").toAbsolutePath()),
-                database.getFileDirectories(fileDirPrefs));
+        assertEquals(
+            List.of(Path.of("/absolute/Literature").toAbsolutePath()),
+            database.getFileDirectories(fileDirPrefs)
+        );
     }
 
     @Test
@@ -89,24 +107,36 @@ void getFileDirectoriesWithMetadata() {
         database.getMetaData().setDefaultFileDirectory("Literature");
         // first directory is the metadata
         // the bib file location is not included, because only the library-configured directories should be searched and the fallback should be the global directory.
-        assertEquals(List.of(Path.of("/absolute/subdir/Literature").toAbsolutePath()),
-                database.getFileDirectories(fileDirPrefs));
+        assertEquals(
+            List.of(Path.of("/absolute/subdir/Literature").toAbsolutePath()),
+            database.getFileDirectories(fileDirPrefs)
+        );
     }
 
     @Test
     void getUserFileDirectoryIfAllAreEmpty() {
-        when(fileDirPrefs.shouldStoreFilesRelativeToBibFile()).thenReturn(false);
-        Path userDirJabRef = OS.getNativeDesktop().getDefaultFileChooserDirectory();
-
-        when(fileDirPrefs.getMainFileDirectory()).thenReturn(Optional.of(userDirJabRef));
+        when(fileDirPrefs.shouldStoreFilesRelativeToBibFile())
+            .thenReturn(false);
+        Path userDirJabRef = OS
+            .getNativeDesktop()
+            .getDefaultFileChooserDirectory();
+
+        when(fileDirPrefs.getMainFileDirectory())
+            .thenReturn(Optional.of(userDirJabRef));
         BibDatabaseContext database = new BibDatabaseContext();
         database.setDatabasePath(Path.of("biblio.bib"));
-        assertEquals(Collections.singletonList(userDirJabRef), database.getFileDirectories(fileDirPrefs));
+        assertEquals(
+            Collections.singletonList(userDirJabRef),
+            database.getFileDirectories(fileDirPrefs)
+        );
     }
 
     @Test
     void testTypeBasedOnDefaultBiblatex() {
-        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);
@@ -115,7 +145,10 @@ void testTypeBasedOnDefaultBiblatex() {
 
     @Test
     void testTypeBasedOnDefaultBibtex() {
-        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);
@@ -137,7 +170,10 @@ void testGetFullTextIndexPathWhenPathIsNull() {
         BibDatabaseContext bibDatabaseContext = new BibDatabaseContext();
         bibDatabaseContext.setDatabasePath(null);
 
-        Path expectedPath = OS.getNativeDesktop().getFulltextIndexBaseDirectory().resolve("unsaved");
+        Path expectedPath = OS
+            .getNativeDesktop()
+            .getFulltextIndexBaseDirectory()
+            .resolve("unsaved");
         Path actualPath = bibDatabaseContext.getFulltextIndexPath();
 
         assertEquals(expectedPath, actualPath);
@@ -150,7 +186,10 @@ void testGetFullTextIndexPathWhenPathIsNotNull() {
         BibDatabaseContext bibDatabaseContext = new BibDatabaseContext();
         bibDatabaseContext.setDatabasePath(existingPath);
 
-        Path expectedPath = OS.getNativeDesktop().getFulltextIndexBaseDirectory().resolve(existingPath.hashCode() + "");
+        Path expectedPath = OS
+            .getNativeDesktop()
+            .getFulltextIndexBaseDirectory()
+            .resolve(existingPath.hashCode() + "");
         Path actualPath = bibDatabaseContext.getFulltextIndexPath();
 
         assertEquals(expectedPath, actualPath);
diff --git a/src/test/java/org/jabref/model/database/BibDatabaseModeDetectionTest.java b/src/test/java/org/jabref/model/database/BibDatabaseModeDetectionTest.java
index 30937e8235e..0c0b087433a 100644
--- a/src/test/java/org/jabref/model/database/BibDatabaseModeDetectionTest.java
+++ b/src/test/java/org/jabref/model/database/BibDatabaseModeDetectionTest.java
@@ -1,27 +1,32 @@
 package org.jabref.model.database;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
 import java.util.Arrays;
 import java.util.List;
-
 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;
-
 public class BibDatabaseModeDetectionTest {
 
-    private static final EntryType UNKNOWN_TYPE = new UnknownEntryType("unknowntype");
+    private static final EntryType UNKNOWN_TYPE = new UnknownEntryType(
+        "unknowntype"
+    );
 
     @Test
     public void detectBiblatex() {
-        List<BibEntry> entries = Arrays.asList(new BibEntry(StandardEntryType.MvBook));
-
-        assertEquals(BibDatabaseMode.BIBLATEX, BibDatabaseModeDetection.inferMode(new BibDatabase(entries)));
+        List<BibEntry> entries = Arrays.asList(
+            new BibEntry(StandardEntryType.MvBook)
+        );
+
+        assertEquals(
+            BibDatabaseMode.BIBLATEX,
+            BibDatabaseModeDetection.inferMode(new BibDatabase(entries))
+        );
     }
 
     @Test
@@ -30,18 +35,27 @@ public 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
     public void detectMixedModeAsBiblatex() {
         BibEntry bibtex = new BibEntry(StandardEntryType.Article);
-        bibtex.setField(StandardField.JOURNAL, "IEEE Trans. Services Computing");
+        bibtex.setField(
+            StandardField.JOURNAL,
+            "IEEE Trans. Services Computing"
+        );
         BibEntry biblatex = new BibEntry(StandardEntryType.Article);
         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 +63,10 @@ public 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 +76,10 @@ public 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 +89,9 @@ public 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 28e9db06298..1673e6912e1 100644
--- a/src/test/java/org/jabref/model/database/BibDatabaseTest.java
+++ b/src/test/java/org/jabref/model/database/BibDatabaseTest.java
@@ -1,5 +1,11 @@
 package org.jabref.model.database;
 
+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;
@@ -9,27 +15,22 @@
 import java.util.List;
 import java.util.Optional;
 import java.util.Set;
-
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.BibtexString;
 import org.jabref.model.entry.field.StandardField;
 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;
-
 class BibDatabaseTest {
 
     private BibDatabase database;
-    private final BibtexString bibtexString = new BibtexString("DSP", "Digital Signal Processing");
+    private final BibtexString bibtexString = new BibtexString(
+        "DSP",
+        "Digital Signal Processing"
+    );
 
     @BeforeEach
     void setUp() {
@@ -107,12 +108,18 @@ void removeAllEntriesRemovesAllEntriesFromEntriesList() {
 
     @Test
     void insertNullEntryThrowsException() {
-        assertThrows(NullPointerException.class, () -> database.insertEntry(null));
+        assertThrows(
+            NullPointerException.class,
+            () -> database.insertEntry(null)
+        );
     }
 
     @Test
     void removeNullEntryThrowsException() {
-        assertThrows(NullPointerException.class, () -> database.removeEntry(null));
+        assertThrows(
+            NullPointerException.class,
+            () -> database.removeEntry(null)
+        );
     }
 
     @Test
@@ -230,42 +237,69 @@ void hasStringLabelFindsString() {
     void setSingleStringAsCollection() {
         List<BibtexString> strings = Arrays.asList(bibtexString);
         database.setStrings(strings);
-        assertEquals(Optional.of(bibtexString), database.getStringByName("DSP"));
+        assertEquals(
+            Optional.of(bibtexString),
+            database.getStringByName("DSP")
+        );
     }
 
     @Test
     void setStringAsCollectionWithUpdatedContentThrowsKeyCollisionException() {
         BibtexString newContent = new BibtexString("DSP", "ABCD");
         List<BibtexString> strings = Arrays.asList(bibtexString, newContent);
-        assertThrows(KeyCollisionException.class, () -> database.setStrings(strings));
+        assertThrows(
+            KeyCollisionException.class,
+            () -> database.setStrings(strings)
+        );
     }
 
     @Test
     void setStringAsCollectionWithNewContent() {
-        BibtexString vlsi = new BibtexString("VLSI", "Very Large Scale Integration");
+        BibtexString vlsi = new BibtexString(
+            "VLSI",
+            "Very Large Scale Integration"
+        );
         List<BibtexString> strings = Arrays.asList(bibtexString, vlsi);
         database.setStrings(strings);
-        assertEquals(Optional.of(bibtexString), database.getStringByName("DSP"));
+        assertEquals(
+            Optional.of(bibtexString),
+            database.getStringByName("DSP")
+        );
         assertEquals(Optional.of(vlsi), database.getStringByName("VLSI"));
     }
 
     @Test
     void addSameStringLabelTwiceThrowsKeyCollisionException() {
         database.addString(bibtexString);
-        final BibtexString finalString = new BibtexString("DSP", "Digital Signal Processor");
+        final BibtexString finalString = new BibtexString(
+            "DSP",
+            "Digital Signal Processor"
+        );
 
-        assertThrows(KeyCollisionException.class, () -> database.addString(finalString));
+        assertThrows(
+            KeyCollisionException.class,
+            () -> database.addString(finalString)
+        );
     }
 
     @Test
     void addSameStringIdTwiceThrowsKeyCollisionException() {
-        BibtexString string = new BibtexString("DSP", "Digital Signal Processing");
+        BibtexString string = new BibtexString(
+            "DSP",
+            "Digital Signal Processing"
+        );
         string.setId("duplicateid");
         database.addString(string);
-        final BibtexString finalString = new BibtexString("VLSI", "Very Large Scale Integration");
+        final BibtexString finalString = new BibtexString(
+            "VLSI",
+            "Very Large Scale Integration"
+        );
         finalString.setId("duplicateid");
 
-        assertThrows(KeyCollisionException.class, () -> database.addString(finalString));
+        assertThrows(
+            KeyCollisionException.class,
+            () -> database.addString(finalString)
+        );
     }
 
     @Test
@@ -274,7 +308,10 @@ void insertEntryPostsAddedEntryEvent() {
         EventListenerTest tel = new EventListenerTest();
         database.registerListener(tel);
         database.insertEntry(expectedEntry);
-        assertEquals(Collections.singletonList(expectedEntry), tel.getAddedEntries());
+        assertEquals(
+            Collections.singletonList(expectedEntry),
+            tel.getAddedEntries()
+        );
         assertEquals(expectedEntry, tel.getFirstInsertedEntry());
     }
 
@@ -286,7 +323,10 @@ void insertMultipleEntriesPostsAddedEntryEvent() {
         database.registerListener(tel);
         database.insertEntries(firstEntry, secondEntry);
         assertEquals(firstEntry, tel.getFirstInsertedEntry());
-        assertEquals(Arrays.asList(firstEntry, secondEntry), tel.getAddedEntries());
+        assertEquals(
+            Arrays.asList(firstEntry, secondEntry),
+            tel.getAddedEntries()
+        );
     }
 
     @Test
@@ -406,7 +446,9 @@ void getUsedStrings() {
         database.addString(tripleC);
         database.insertEntry(entry);
 
-        Set<BibtexString> usedStrings = new HashSet<>(database.getUsedStrings(Arrays.asList(entry)));
+        Set<BibtexString> usedStrings = new HashSet<>(
+            database.getUsedStrings(Arrays.asList(entry))
+        );
         assertEquals(stringSet, usedStrings);
     }
 
@@ -423,7 +465,9 @@ void getUsedStringsSingleString() {
         database.addString(tripleB);
         database.insertEntry(entry);
 
-        List<BibtexString> usedStrings = (List<BibtexString>) database.getUsedStrings(Arrays.asList(entry));
+        List<BibtexString> usedStrings = (List<
+                BibtexString
+            >) database.getUsedStrings(Arrays.asList(entry));
         assertEquals(strings, usedStrings);
     }
 
@@ -434,7 +478,9 @@ void getUsedStringsNoString() {
         BibtexString string = new BibtexString("AAA", "Some other text");
         database.addString(string);
         database.insertEntry(entry);
-        Collection<BibtexString> usedStrings = database.getUsedStrings(Arrays.asList(entry));
+        Collection<BibtexString> usedStrings = database.getUsedStrings(
+            Arrays.asList(entry)
+        );
         assertEquals(Collections.emptyList(), usedStrings);
     }
 
@@ -445,7 +491,10 @@ 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 deea1130357..ff5a7de6af3 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 a0cdc5b65e7..e5ad56df408 100644
--- a/src/test/java/org/jabref/model/database/KeyChangeListenerTest.java
+++ b/src/test/java/org/jabref/model/database/KeyChangeListenerTest.java
@@ -1,18 +1,16 @@
 package org.jabref.model.database;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
 import java.util.Arrays;
 import java.util.List;
 import java.util.Optional;
-
 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;
-
 public class KeyChangeListenerTest {
 
     private BibDatabase db;
@@ -47,23 +45,41 @@ public void setUp() {
 
     @Test
     public void testCrossrefChanged() {
-        assertEquals(Optional.of("Entry4"), entry1.getField(StandardField.CROSSREF));
+        assertEquals(
+            Optional.of("Entry4"),
+            entry1.getField(StandardField.CROSSREF)
+        );
         entry4.setCitationKey("Banana");
-        assertEquals(Optional.of("Banana"), entry1.getField(StandardField.CROSSREF));
+        assertEquals(
+            Optional.of("Banana"),
+            entry1.getField(StandardField.CROSSREF)
+        );
     }
 
     @Test
     public void testRelatedChanged() {
-        assertEquals(Optional.of("Entry1,Entry3"), entry2.getField(StandardField.RELATED));
+        assertEquals(
+            Optional.of("Entry1,Entry3"),
+            entry2.getField(StandardField.RELATED)
+        );
         entry1.setCitationKey("Banana");
-        assertEquals(Optional.of("Banana,Entry3"), entry2.getField(StandardField.RELATED));
+        assertEquals(
+            Optional.of("Banana,Entry3"),
+            entry2.getField(StandardField.RELATED)
+        );
     }
 
     @Test
     public void testRelatedChangedInSameEntry() {
-        assertEquals(Optional.of("Entry1,Entry2,Entry3"), entry3.getField(StandardField.RELATED));
+        assertEquals(
+            Optional.of("Entry1,Entry2,Entry3"),
+            entry3.getField(StandardField.RELATED)
+        );
         entry3.setCitationKey("Banana");
-        assertEquals(Optional.of("Entry1,Entry2,Banana"), entry3.getField(StandardField.RELATED));
+        assertEquals(
+            Optional.of("Entry1,Entry2,Banana"),
+            entry3.getField(StandardField.RELATED)
+        );
     }
 
     @Test
@@ -81,7 +97,10 @@ public void testCrossrefEntryRemoved() {
     @Test
     public void testRelatedEntryRemoved() {
         db.removeEntry(entry1);
-        assertEquals(Optional.of("Entry3"), entry2.getField(StandardField.RELATED));
+        assertEquals(
+            Optional.of("Entry3"),
+            entry2.getField(StandardField.RELATED)
+        );
     }
 
     @Test
diff --git a/src/test/java/org/jabref/model/entry/AuthorListTest.java b/src/test/java/org/jabref/model/entry/AuthorListTest.java
index 152bd3d80a8..89714327bec 100644
--- a/src/test/java/org/jabref/model/entry/AuthorListTest.java
+++ b/src/test/java/org/jabref/model/entry/AuthorListTest.java
@@ -1,11 +1,5 @@
 package org.jabref.model.entry;
 
-import java.util.Arrays;
-import java.util.Collections;
-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.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertNotEquals;
@@ -14,29 +8,73 @@
 import static org.junit.jupiter.api.Assertions.assertThrows;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.Optional;
+import org.junit.jupiter.api.Test;
+
 public class AuthorListTest {
 
     /*
     Examples are similar to page 4 in
     [BibTeXing by Oren Patashnik](https://ctan.org/tex-archive/biblio/bibtex/contrib/doc/)
     */
-    private static final Author MUHAMMAD_ALKHWARIZMI =
-            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 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 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 Author MUHAMMAD_ALKHWARIZMI = 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 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 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);
 
     public static int size(String bibtex) {
         return AuthorList.parse(bibtex).getNumberOfAuthors();
@@ -46,10 +84,16 @@ public static int size(String bibtex) {
     public void testFixAuthorNatbib() {
         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
@@ -59,44 +103,58 @@ public void getAsNatbibLatexFreeEmptyAuthorStringForEmptyInput() {
 
     @Test
     public void getAsNatbibLatexFreeUnicodeOneAuthorNameFromLatex() {
-        assertEquals("al-Khwārizmī",
-                ONE_AUTHOR_WITH_LATEX.latexFree().getAsNatbib());
+        assertEquals(
+            "al-Khwārizmī",
+            ONE_AUTHOR_WITH_LATEX.latexFree().getAsNatbib()
+        );
     }
 
     @Test
     public 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
     public 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
     public 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
     public void getAsNatbibLatexFreeUnicodeTwoInsitutionNameFromLatex() {
-        assertEquals("The Banū Mūsā brothers and The Banū Mūsā brothers",
-                TWO_INSTITUTIONS_WITH_LATEX.latexFree().getAsNatbib());
+        assertEquals(
+            "The Banū Mūsā brothers and The Banū Mūsā brothers",
+            TWO_INSTITUTIONS_WITH_LATEX.latexFree().getAsNatbib()
+        );
     }
 
     @Test
     public void getAsNatbibLatexFreeUnicodeMixedAuthorsFromLatex() {
-        assertEquals("The Banū Mūsā brothers and Böhm",
-                MIXED_AUTHOR_AND_INSTITUTION_WITH_LATEX.latexFree().getAsNatbib());
+        assertEquals(
+            "The Banū Mūsā brothers and Böhm",
+            MIXED_AUTHOR_AND_INSTITUTION_WITH_LATEX.latexFree().getAsNatbib()
+        );
     }
 
     @Test
     public void getAsNatbibLatexFreeOneInstitutionWithParanthesisAtStart() {
-        assertEquals("Łukasz Michał",
-                ONE_INSTITUTION_WITH_STARTING_PARANTHESIS.latexFree().getAsNatbib());
+        assertEquals(
+            "Łukasz Michał",
+            ONE_INSTITUTION_WITH_STARTING_PARANTHESIS.latexFree().getAsNatbib()
+        );
     }
 
     @Test
@@ -118,584 +176,1087 @@ public void parseCachesOneLatexFreeAuthor() {
     @Test
     public void testFixAuthorFirstNameFirstCommas() {
         // No Commas
-        assertEquals("", AuthorList.fixAuthorFirstNameFirstCommas("", true, false));
-        assertEquals("", AuthorList.fixAuthorFirstNameFirstCommas("", false, false));
+        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(
-                        "John von Neumann and John Smith and Black Brown, Peter", false, false));
-        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(
+            "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(
+                "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
+            )
+        );
         // Oxford Commas
-        assertEquals("", AuthorList.fixAuthorFirstNameFirstCommas("", true, true));
-        assertEquals("", AuthorList.fixAuthorFirstNameFirstCommas("", false, true));
+        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(
-                        "John von Neumann and John Smith and Black Brown, Peter", false, true));
-        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(
+            "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(
+                "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
     public void getAsFirstLastNamesLatexFreeEmptyAuthorStringForEmptyInputAbbreviate() {
-        assertEquals("", EMPTY_AUTHOR.latexFree().getAsFirstLastNames(true, false));
+        assertEquals(
+            "",
+            EMPTY_AUTHOR.latexFree().getAsFirstLastNames(true, false)
+        );
     }
 
     @Test
     public void getAsFirstLastNamesLatexFreeUnicodeOneAuthorNameFromLatexAbbreviate() {
-        assertEquals("M. al-Khwārizmī",
-                ONE_AUTHOR_WITH_LATEX.latexFree().getAsFirstLastNames(true, false));
+        assertEquals(
+            "M. al-Khwārizmī",
+            ONE_AUTHOR_WITH_LATEX.latexFree().getAsFirstLastNames(true, false)
+        );
     }
 
     @Test
     public void getAsFirstLastNamesLatexFreeUnicodeTwoAuthorNamesFromLatexAbbreviate() {
-        assertEquals("M. al-Khwārizmī and C. Böhm",
-                TWO_AUTHORS_WITH_LATEX.latexFree().getAsFirstLastNames(true, false));
+        assertEquals(
+            "M. al-Khwārizmī and C. Böhm",
+            TWO_AUTHORS_WITH_LATEX.latexFree().getAsFirstLastNames(true, false)
+        );
     }
 
     @Test
     public void getAsFirstLastNamesLatexFreeUnicodeTwoAuthorNamesFromLatexAbbreviateAndOxfordComma() {
-        assertEquals("M. al-Khwārizmī and C. Böhm",
-                TWO_AUTHORS_WITH_LATEX.latexFree().getAsFirstLastNames(true, true));
+        assertEquals(
+            "M. al-Khwārizmī and C. Böhm",
+            TWO_AUTHORS_WITH_LATEX.latexFree().getAsFirstLastNames(true, true)
+        );
     }
 
     @Test
     public void getAsFirstLastNamesLatexFreeThreeUnicodeAuthorsFromLatexAbbreviate() {
-        assertEquals("M. al-Khwārizmī, C. Böhm and K. Gödel",
-                THREE_AUTHORS_WITH_LATEX.latexFree().getAsFirstLastNames(true, false));
+        assertEquals(
+            "M. al-Khwārizmī, C. Böhm and K. Gödel",
+            THREE_AUTHORS_WITH_LATEX
+                .latexFree()
+                .getAsFirstLastNames(true, false)
+        );
     }
 
     @Test
     public void getAsFirstLastNamesLatexFreeThreeUnicodeAuthorsFromLatexAbbreviateAndOxfordComma() {
-        assertEquals("M. al-Khwārizmī, C. Böhm, and K. Gödel",
-                THREE_AUTHORS_WITH_LATEX.latexFree().getAsFirstLastNames(true, true));
+        assertEquals(
+            "M. al-Khwārizmī, C. Böhm, and K. Gödel",
+            THREE_AUTHORS_WITH_LATEX.latexFree().getAsFirstLastNames(true, true)
+        );
     }
 
     @Test
     public 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
     public void getAsFirstLastNamesLatexFreeUnicodeTwoInsitutionNameFromLatexAbbreviate() {
-        assertEquals("The Banū Mūsā brothers and The Banū Mūsā brothers",
-                TWO_INSTITUTIONS_WITH_LATEX.latexFree().getAsFirstLastNames(true, false));
+        assertEquals(
+            "The Banū Mūsā brothers and The Banū Mūsā brothers",
+            TWO_INSTITUTIONS_WITH_LATEX
+                .latexFree()
+                .getAsFirstLastNames(true, false)
+        );
     }
 
     @Test
     public 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
     public 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
     public void getAsFirstLastNamesLatexFreeEmptyAuthorStringForEmptyInput() {
-        assertEquals("", EMPTY_AUTHOR.latexFree().getAsFirstLastNames(false, false));
+        assertEquals(
+            "",
+            EMPTY_AUTHOR.latexFree().getAsFirstLastNames(false, false)
+        );
     }
 
     @Test
     public void getAsFirstLastNamesLatexFreeUnicodeOneAuthorNameFromLatex() {
-        assertEquals("Muḥammad al-Khwārizmī",
-                ONE_AUTHOR_WITH_LATEX.latexFree().getAsFirstLastNames(false, false));
+        assertEquals(
+            "Muḥammad al-Khwārizmī",
+            ONE_AUTHOR_WITH_LATEX.latexFree().getAsFirstLastNames(false, false)
+        );
     }
 
     @Test
     public void getAsFirstLastNamesLatexFreeUnicodeTwoAuthorNamesFromLatex() {
-        assertEquals("Muḥammad al-Khwārizmī and Corrado Böhm",
-                TWO_AUTHORS_WITH_LATEX.latexFree().getAsFirstLastNames(false, false));
+        assertEquals(
+            "Muḥammad al-Khwārizmī and Corrado Böhm",
+            TWO_AUTHORS_WITH_LATEX.latexFree().getAsFirstLastNames(false, false)
+        );
     }
 
     @Test
     public void getAsFirstLastNamesLatexFreeThreeUnicodeAuthorsFromLatex() {
-        assertEquals("Muḥammad al-Khwārizmī, Corrado Böhm and Kurt Gödel",
-                THREE_AUTHORS_WITH_LATEX.latexFree().getAsFirstLastNames(false, false));
+        assertEquals(
+            "Muḥammad al-Khwārizmī, Corrado Böhm and Kurt Gödel",
+            THREE_AUTHORS_WITH_LATEX
+                .latexFree()
+                .getAsFirstLastNames(false, false)
+        );
     }
 
     @Test
     public void getAsFirstLastNamesLatexFreeUnicodeOneInsitutionNameFromLatex() {
-        assertEquals("The Banū Mūsā brothers",
-                ONE_INSTITUTION_WITH_LATEX.latexFree().getAsFirstLastNames(false, false));
+        assertEquals(
+            "The Banū Mūsā brothers",
+            ONE_INSTITUTION_WITH_LATEX
+                .latexFree()
+                .getAsFirstLastNames(false, false)
+        );
     }
 
     @Test
     public void getAsFirstLastNamesLatexFreeUnicodeTwoInsitutionNameFromLatex() {
-        assertEquals("The Banū Mūsā brothers and The Banū Mūsā brothers",
-                TWO_INSTITUTIONS_WITH_LATEX.latexFree().getAsFirstLastNames(false, false));
+        assertEquals(
+            "The Banū Mūsā brothers and The Banū Mūsā brothers",
+            TWO_INSTITUTIONS_WITH_LATEX
+                .latexFree()
+                .getAsFirstLastNames(false, false)
+        );
     }
 
     @Test
     public 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
     public 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
     public void testFixAuthorFirstNameFirst() {
-        assertEquals("John Smith", AuthorList.fixAuthorFirstNameFirst("John Smith"));
+        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
     public void testFixAuthorLastNameFirstCommasNoComma() {
         // No commas before and
-        assertEquals("", AuthorList.fixAuthorLastNameFirstCommas("", true, false));
-        assertEquals("", AuthorList.fixAuthorLastNameFirstCommas("", false, false));
+        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 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);
+            "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.",
-                AuthorList.fixAuthorLastNameFirstCommas("John Peter von Neumann", true, false));
+        assertEquals(
+            "von Neumann, J. P.",
+            AuthorList.fixAuthorLastNameFirstCommas(
+                "John Peter von Neumann",
+                true,
+                false
+            )
+        );
     }
 
     @Test
     public void testFixAuthorLastNameFirstCommasOxfordComma() {
         // Oxford Commas
-        assertEquals("", AuthorList.fixAuthorLastNameFirstCommas("", true, true));
-        assertEquals("", AuthorList.fixAuthorLastNameFirstCommas("", false, true));
+        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);
+            "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(
-                        "John von Neumann and John Smith and Black Brown, Peter", false, true));
-        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, 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(
+                "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
     public void getAsLastFirstNamesLatexFreeEmptyAuthorStringForEmptyInputAbbr() {
-        assertEquals("", EMPTY_AUTHOR.latexFree().getAsLastFirstNames(true, false));
+        assertEquals(
+            "",
+            EMPTY_AUTHOR.latexFree().getAsLastFirstNames(true, false)
+        );
     }
 
     @Test
     public void getAsLastFirstNamesLatexFreeUnicodeOneAuthorNameFromLatexAbbr() {
-        assertEquals("al-Khwārizmī, M.",
-                ONE_AUTHOR_WITH_LATEX.latexFree().getAsLastFirstNames(true, false));
+        assertEquals(
+            "al-Khwārizmī, M.",
+            ONE_AUTHOR_WITH_LATEX.latexFree().getAsLastFirstNames(true, false)
+        );
     }
 
     @Test
     public void getAsLastFirstNamesLatexFreeUnicodeTwoAuthorNamesFromLatexAbbr() {
-        assertEquals("al-Khwārizmī, M. and Böhm, C.",
-                TWO_AUTHORS_WITH_LATEX.latexFree().getAsLastFirstNames(true, false));
+        assertEquals(
+            "al-Khwārizmī, M. and Böhm, C.",
+            TWO_AUTHORS_WITH_LATEX.latexFree().getAsLastFirstNames(true, false)
+        );
     }
 
     @Test
     public void getAsLastFirstNamesLatexFreeThreeUnicodeAuthorsFromLatexAbbr() {
-        assertEquals("al-Khwārizmī, M., Böhm, C. and Gödel, K.",
-                THREE_AUTHORS_WITH_LATEX.latexFree().getAsLastFirstNames(true, false));
+        assertEquals(
+            "al-Khwārizmī, M., Böhm, C. and Gödel, K.",
+            THREE_AUTHORS_WITH_LATEX
+                .latexFree()
+                .getAsLastFirstNames(true, false)
+        );
     }
 
     @Test
     public void getAsLastFirstNamesLatexFreeUnicodeOneInsitutionNameFromLatexAbbr() {
-        assertEquals("The Banū Mūsā brothers",
-                ONE_INSTITUTION_WITH_LATEX.latexFree().getAsLastFirstNames(true, false));
+        assertEquals(
+            "The Banū Mūsā brothers",
+            ONE_INSTITUTION_WITH_LATEX
+                .latexFree()
+                .getAsLastFirstNames(true, false)
+        );
     }
 
     @Test
     public void getAsLastFirstNamesLatexFreeUnicodeTwoInsitutionNameFromLatexAbbr() {
-        assertEquals("The Banū Mūsā brothers and The Banū Mūsā brothers",
-                TWO_INSTITUTIONS_WITH_LATEX.latexFree().getAsLastFirstNames(true, false));
+        assertEquals(
+            "The Banū Mūsā brothers and The Banū Mūsā brothers",
+            TWO_INSTITUTIONS_WITH_LATEX
+                .latexFree()
+                .getAsLastFirstNames(true, false)
+        );
     }
 
     @Test
     public 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
     public 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
     public void getAsLastFirstNamesLatexFreeEmptyAuthorStringForEmptyInput() {
-        assertEquals("", EMPTY_AUTHOR.latexFree().getAsLastFirstNames(false, false));
+        assertEquals(
+            "",
+            EMPTY_AUTHOR.latexFree().getAsLastFirstNames(false, false)
+        );
     }
 
     @Test
     public void getAsLastFirstNamesLatexFreeUnicodeOneAuthorNameFromLatex() {
-        assertEquals("al-Khwārizmī, Muḥammad",
-                ONE_AUTHOR_WITH_LATEX.latexFree().getAsLastFirstNames(false, false));
+        assertEquals(
+            "al-Khwārizmī, Muḥammad",
+            ONE_AUTHOR_WITH_LATEX.latexFree().getAsLastFirstNames(false, false)
+        );
     }
 
     @Test
     public void getAsLastFirstNamesLatexFreeUnicodeTwoAuthorNamesFromLatex() {
-        assertEquals("al-Khwārizmī, Muḥammad and Böhm, Corrado",
-                TWO_AUTHORS_WITH_LATEX.latexFree().getAsLastFirstNames(false, false));
+        assertEquals(
+            "al-Khwārizmī, Muḥammad and Böhm, Corrado",
+            TWO_AUTHORS_WITH_LATEX.latexFree().getAsLastFirstNames(false, false)
+        );
     }
 
     @Test
     public void getAsLastFirstNamesLatexFreeThreeUnicodeAuthorsFromLatex() {
-        assertEquals("al-Khwārizmī, Muḥammad, Böhm, Corrado and Gödel, Kurt",
-                THREE_AUTHORS_WITH_LATEX.latexFree().getAsLastFirstNames(false, false));
+        assertEquals(
+            "al-Khwārizmī, Muḥammad, Böhm, Corrado and Gödel, Kurt",
+            THREE_AUTHORS_WITH_LATEX
+                .latexFree()
+                .getAsLastFirstNames(false, false)
+        );
     }
 
     @Test
     public void getAsLastFirstNamesLatexFreeUnicodeOneInsitutionNameFromLatex() {
-        assertEquals("The Banū Mūsā brothers",
-                ONE_INSTITUTION_WITH_LATEX.latexFree().getAsLastFirstNames(false, false));
+        assertEquals(
+            "The Banū Mūsā brothers",
+            ONE_INSTITUTION_WITH_LATEX
+                .latexFree()
+                .getAsLastFirstNames(false, false)
+        );
     }
 
     @Test
     public void getAsLastFirstNamesLatexFreeUnicodeTwoInsitutionNameFromLatex() {
-        assertEquals("The Banū Mūsā brothers and The Banū Mūsā brothers",
-                TWO_INSTITUTIONS_WITH_LATEX.latexFree().getAsLastFirstNames(false, false));
+        assertEquals(
+            "The Banū Mūsā brothers and The Banū Mūsā brothers",
+            TWO_INSTITUTIONS_WITH_LATEX
+                .latexFree()
+                .getAsLastFirstNames(false, false)
+        );
     }
 
     @Test
     public 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
     public 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
     public void getAsLastFirstNamesLatexFreeEmptyAuthorStringForEmptyInputAbbrOxfordComma() {
-        assertEquals("", EMPTY_AUTHOR.latexFree().getAsLastFirstNames(true, true));
+        assertEquals(
+            "",
+            EMPTY_AUTHOR.latexFree().getAsLastFirstNames(true, true)
+        );
     }
 
     @Test
     public void getAsLastFirstNamesLatexFreeUnicodeOneAuthorNameFromLatexAbbrOxfordComma() {
-        assertEquals("al-Khwārizmī, M.",
-                ONE_AUTHOR_WITH_LATEX.latexFree().getAsLastFirstNames(true, true));
+        assertEquals(
+            "al-Khwārizmī, M.",
+            ONE_AUTHOR_WITH_LATEX.latexFree().getAsLastFirstNames(true, true)
+        );
     }
 
     @Test
     public void getAsLastFirstNamesLatexFreeUnicodeTwoAuthorNamesFromLatexAbbrOxfordComma() {
-        assertEquals("al-Khwārizmī, M. and Böhm, C.",
-                TWO_AUTHORS_WITH_LATEX.latexFree().getAsLastFirstNames(true, true));
+        assertEquals(
+            "al-Khwārizmī, M. and Böhm, C.",
+            TWO_AUTHORS_WITH_LATEX.latexFree().getAsLastFirstNames(true, true)
+        );
     }
 
     @Test
     public void getAsLastFirstNamesLatexFreeThreeUnicodeAuthorsFromLatexAbbrOxfordComma() {
-        assertEquals("al-Khwārizmī, M., Böhm, C., and Gödel, K.",
-                THREE_AUTHORS_WITH_LATEX.latexFree().getAsLastFirstNames(true, true));
+        assertEquals(
+            "al-Khwārizmī, M., Böhm, C., and Gödel, K.",
+            THREE_AUTHORS_WITH_LATEX.latexFree().getAsLastFirstNames(true, true)
+        );
     }
 
     @Test
     public void getAsLastFirstNamesLatexFreeUnicodeOneInsitutionNameFromLatexAbbrOxfordComma() {
-        assertEquals("The Banū Mūsā brothers",
-                ONE_INSTITUTION_WITH_LATEX.latexFree().getAsLastFirstNames(true, true));
+        assertEquals(
+            "The Banū Mūsā brothers",
+            ONE_INSTITUTION_WITH_LATEX
+                .latexFree()
+                .getAsLastFirstNames(true, true)
+        );
     }
 
     @Test
     public void getAsLastFirstNamesLatexFreeUnicodeTwoInsitutionNameFromLatexAbbrOxfordComma() {
-        assertEquals("The Banū Mūsā brothers and The Banū Mūsā brothers",
-                TWO_INSTITUTIONS_WITH_LATEX.latexFree().getAsLastFirstNames(true, true));
+        assertEquals(
+            "The Banū Mūsā brothers and The Banū Mūsā brothers",
+            TWO_INSTITUTIONS_WITH_LATEX
+                .latexFree()
+                .getAsLastFirstNames(true, true)
+        );
     }
 
     @Test
     public 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
     public 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
     public void getAsLastFirstNamesLatexFreeEmptyAuthorStringForEmptyInputOxfordComma() {
-        assertEquals("", EMPTY_AUTHOR.latexFree().getAsLastFirstNames(false, true));
+        assertEquals(
+            "",
+            EMPTY_AUTHOR.latexFree().getAsLastFirstNames(false, true)
+        );
     }
 
     @Test
     public void getAsLastFirstNamesLatexFreeUnicodeOneAuthorNameFromLatexOxfordComma() {
-        assertEquals("al-Khwārizmī, Muḥammad",
-                ONE_AUTHOR_WITH_LATEX.latexFree().getAsLastFirstNames(false, true));
+        assertEquals(
+            "al-Khwārizmī, Muḥammad",
+            ONE_AUTHOR_WITH_LATEX.latexFree().getAsLastFirstNames(false, true)
+        );
     }
 
     @Test
     public void getAsLastFirstNamesLatexFreeUnicodeTwoAuthorNamesFromLatexOxfordComma() {
-        assertEquals("al-Khwārizmī, Muḥammad and Böhm, Corrado",
-                TWO_AUTHORS_WITH_LATEX.latexFree().getAsLastFirstNames(false, true));
+        assertEquals(
+            "al-Khwārizmī, Muḥammad and Böhm, Corrado",
+            TWO_AUTHORS_WITH_LATEX.latexFree().getAsLastFirstNames(false, true)
+        );
     }
 
     @Test
     public void getAsLastFirstNamesLatexFreeThreeUnicodeAuthorsFromLatexOxfordComma() {
-        assertEquals("al-Khwārizmī, Muḥammad, Böhm, Corrado, and Gödel, Kurt",
-                THREE_AUTHORS_WITH_LATEX.latexFree().getAsLastFirstNames(false, true));
+        assertEquals(
+            "al-Khwārizmī, Muḥammad, Böhm, Corrado, and Gödel, Kurt",
+            THREE_AUTHORS_WITH_LATEX
+                .latexFree()
+                .getAsLastFirstNames(false, true)
+        );
     }
 
     @Test
     public void getAsLastFirstNamesLatexFreeUnicodeOneInsitutionNameFromLatexOxfordComma() {
-        assertEquals("The Banū Mūsā brothers",
-                ONE_INSTITUTION_WITH_LATEX.latexFree().getAsLastFirstNames(false, true));
+        assertEquals(
+            "The Banū Mūsā brothers",
+            ONE_INSTITUTION_WITH_LATEX
+                .latexFree()
+                .getAsLastFirstNames(false, true)
+        );
     }
 
     @Test
     public void getAsLastFirstNamesLatexFreeUnicodeTwoInsitutionNameFromLatexOxfordComma() {
-        assertEquals("The Banū Mūsā brothers and The Banū Mūsā brothers",
-                TWO_INSTITUTIONS_WITH_LATEX.latexFree().getAsLastFirstNames(false, true));
+        assertEquals(
+            "The Banū Mūsā brothers and The Banū Mūsā brothers",
+            TWO_INSTITUTIONS_WITH_LATEX
+                .latexFree()
+                .getAsLastFirstNames(false, true)
+        );
     }
 
     @Test
     public 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
     public 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
     public void testFixAuthorLastNameFirst() {
         // Test helper method
 
-        assertEquals("Smith, John", AuthorList.fixAuthorLastNameFirst("John Smith"));
+        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",
+            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.",
+            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.",
-                AuthorList.fixAuthorLastNameFirst(
-                        "John von Neumann and John Smith and Black Brown, Peter", true));
+        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
     public void testFixAuthorLastNameOnlyCommas() {
         // No comma before and
         assertEquals("", AuthorList.fixAuthorLastNameOnlyCommas("", false));
-        assertEquals("Smith", AuthorList.fixAuthorLastNameOnlyCommas("John Smith", false));
-        assertEquals("Smith", AuthorList.fixAuthorLastNameOnlyCommas("Smith, Jr, John", false));
+        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(
-                        "John von Neumann and John Smith and Black Brown, Peter", false));
+        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(
+            "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(
-                        "John von Neumann and John Smith and Black Brown, Peter", true));
+        assertEquals(
+            "von Neumann, Smith, and Black Brown",
+            AuthorList.fixAuthorLastNameOnlyCommas(
+                "John von Neumann and John Smith and Black Brown, Peter",
+                true
+            )
+        );
     }
 
     @Test
     public void getAsLastNamesLatexFreeUnicodeOneAuthorNameFromLatex() {
-        assertEquals("al-Khwārizmī", ONE_AUTHOR_WITH_LATEX.latexFree().getAsLastNames(false));
+        assertEquals(
+            "al-Khwārizmī",
+            ONE_AUTHOR_WITH_LATEX.latexFree().getAsLastNames(false)
+        );
     }
 
     @Test
     public 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
     public 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
     public 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
     public 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
     public 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
     public void getAsLastNamesLatexFreeUnicodeTwoInsitutionNameFromLatex() {
-        assertEquals("The Banū Mūsā brothers and The Banū Mūsā brothers",
-                TWO_INSTITUTIONS_WITH_LATEX.latexFree().getAsLastNames(false));
+        assertEquals(
+            "The Banū Mūsā brothers and The Banū Mūsā brothers",
+            TWO_INSTITUTIONS_WITH_LATEX.latexFree().getAsLastNames(false)
+        );
     }
 
     @Test
     public void getAsLastNamesLatexFreeUnicodeMixedAuthorsFromLatex() {
-        assertEquals("The Banū Mūsā brothers and Böhm",
-                MIXED_AUTHOR_AND_INSTITUTION_WITH_LATEX.latexFree().getAsLastNames(false));
+        assertEquals(
+            "The Banū Mūsā brothers and Böhm",
+            MIXED_AUTHOR_AND_INSTITUTION_WITH_LATEX
+                .latexFree()
+                .getAsLastNames(false)
+        );
     }
 
     @Test
     public void getAsLastNamesLatexFreeOneInstitutionWithParanthesisAtStart() {
-        assertEquals("Łukasz Michał",
-                ONE_INSTITUTION_WITH_STARTING_PARANTHESIS.latexFree().getAsLastNames(false));
+        assertEquals(
+            "Łukasz Michał",
+            ONE_INSTITUTION_WITH_STARTING_PARANTHESIS
+                .latexFree()
+                .getAsLastNames(false)
+        );
     }
 
     @Test
     public void testFixAuthorForAlphabetization() {
-        assertEquals("Smith, J.", AuthorList.fixAuthorForAlphabetization("John Smith"));
-        assertEquals("Neumann, J.", AuthorList.fixAuthorForAlphabetization("John von Neumann"));
-        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"));
+            "Smith, J.",
+            AuthorList.fixAuthorForAlphabetization("John Smith")
+        );
+        assertEquals(
+            "Neumann, J.",
+            AuthorList.fixAuthorForAlphabetization("John von Neumann")
+        );
+        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"
+            )
+        );
     }
 
     @Test
@@ -709,9 +1270,17 @@ public void testSize() {
         assertEquals(1, AuthorListTest.size("Bar, Jr., Foo"));
         assertEquals(1, AuthorListTest.size("Bar, Foo"));
         assertEquals(2, AuthorListTest.size("John Neumann and Foo Bar"));
-        assertEquals(2, AuthorListTest.size("John von Neumann and Bar, Jr, Foo"));
+        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++) {
@@ -733,7 +1302,9 @@ public void testGetEmptyAuthor() {
 
     @Test
     public void testGetAuthor() {
-        Author author = AuthorList.parse("John Smith and von Neumann, Jr, John").getAuthor(0);
+        Author author = AuthorList
+            .parse("John Smith and von Neumann, Jr, John")
+            .getAuthor(0);
         assertEquals(Optional.of("John"), author.getFirst());
         assertEquals(Optional.of("J."), author.getFirstAbbr());
         assertEquals("John Smith", author.getFirstLast(false));
@@ -754,7 +1325,10 @@ public void testGetAuthor() {
         assertEquals(Optional.empty(), author.getJr());
         assertEquals(Optional.empty(), author.getVon());
 
-        author = AuthorList.parse("John Smith and von Neumann, Jr, John").getAuthor(1);
+        author =
+            AuthorList
+                .parse("John Smith and von Neumann, Jr, John")
+                .getAuthor(1);
         assertEquals(Optional.of("John"), author.getFirst());
         assertEquals(Optional.of("J."), author.getFirstAbbr());
         assertEquals("John von Neumann, Jr", author.getFirstLast(false));
@@ -771,28 +1345,59 @@ public void testGetAuthor() {
     @Test
     public void testCompanyAuthor() {
         Author author = AuthorList.parse("{JabRef Developers}").getAuthor(0);
-        Author expected = new Author(null, null, null, "JabRef Developers", null);
+        Author expected = new Author(
+            null,
+            null,
+            null,
+            "JabRef Developers",
+            null
+        );
         assertEquals(expected, author);
     }
 
     @Test
     public void testCompanyAuthorAndPerson() {
-        Author company = new Author(null, null, null, "JabRef Developers", null);
+        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
     public void testCompanyAuthorWithLowerCaseWord() {
-        Author author = AuthorList.parse("{JabRef Developers on Fire}").getAuthor(0);
-        Author expected = new Author(null, null, null, "JabRef Developers on Fire", null);
+        Author author = AuthorList
+            .parse("{JabRef Developers on Fire}")
+            .getAuthor(0);
+        Author expected = new Author(
+            null,
+            null,
+            null,
+            "JabRef Developers on Fire",
+            null
+        );
         assertEquals(expected, author);
     }
 
     @Test
     public void testAbbreviationWithRelax() {
-        Author author = AuthorList.parse("{\\relax Ch}ristoph Cholera").getAuthor(0);
-        Author expected = new Author("{\\relax Ch}ristoph", "{\\relax Ch}.", null, "Cholera", null);
+        Author author = AuthorList
+            .parse("{\\relax Ch}ristoph Cholera")
+            .getAuthor(0);
+        Author expected = new Author(
+            "{\\relax Ch}ristoph",
+            "{\\relax Ch}.",
+            null,
+            "Cholera",
+            null
+        );
         assertEquals(expected, author);
     }
 
@@ -800,20 +1405,34 @@ public void testAbbreviationWithRelax() {
     public void testGetAuthorsNatbib() {
         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());
     }
 
@@ -821,23 +1440,45 @@ public void testGetAuthorsNatbib() {
     public void testGetAuthorsLastOnly() {
         // 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("John Smith").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("John Smith").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",
-                AuthorList.parse("John von Neumann and John Smith").getAsLastNames(false));
+        assertEquals(
+            "von Neumann and Smith",
+            AuthorList
+                .parse("John von Neumann and John Smith")
+                .getAsLastNames(false)
+        );
     }
 
     @Test
@@ -854,15 +1495,29 @@ public void testGetAuthorsLastFirstNoComma() {
         assertEquals("Smith, J.", al.getAsLastFirstNames(true, false));
 
         al = AuthorList.parse("John Smith and Black Brown, Peter");
-        assertEquals("Smith, John and Black Brown, Peter", al.getAsLastFirstNames(false, false));
-        assertEquals("Smith, J. and Black Brown, P.", al.getAsLastFirstNames(true, false));
-
-        al = AuthorList.parse("John von Neumann and John Smith and Black Brown, Peter");
+        assertEquals(
+            "Smith, John and Black Brown, Peter",
+            al.getAsLastFirstNames(false, false)
+        );
+        assertEquals(
+            "Smith, J. and Black Brown, P.",
+            al.getAsLastFirstNames(true, false)
+        );
+
+        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",
-                al.getAsLastFirstNames(false, false));
-        assertEquals("von Neumann, J., Smith, J. and Black Brown, P.", al.getAsLastFirstNames(true, false));
+        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)
+        );
 
         al = AuthorList.parse("John Peter von Neumann");
         assertEquals("von Neumann, J. P.", al.getAsLastFirstNames(true, false));
@@ -882,14 +1537,27 @@ public void testGetAuthorsLastFirstOxfordComma() {
         assertEquals("Smith, J.", al.getAsLastFirstNames(true, true));
 
         al = AuthorList.parse("John Smith and Black Brown, Peter");
-        assertEquals("Smith, John and Black Brown, Peter", al.getAsLastFirstNames(false, true));
-        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(
+            "Smith, John and Black Brown, Peter",
+            al.getAsLastFirstNames(false, true)
+        );
+        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)
+        );
 
         al = AuthorList.parse("John Peter von Neumann");
         assertEquals("von Neumann, J. P.", al.getAsLastFirstNames(true, true));
@@ -897,24 +1565,51 @@ public void testGetAuthorsLastFirstOxfordComma() {
 
     @Test
     public void testGetAuthorsLastFirstAnds() {
-        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
+        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));
+                .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, 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
@@ -934,81 +1629,175 @@ public void testGetAuthorsFirstFirst() {
         assertEquals("J. Smith", al.getAsFirstLastNames(true, true));
 
         al = AuthorList.parse("John Smith and Black Brown, Peter");
-        assertEquals("John Smith and Peter Black Brown", al.getAsFirstLastNames(false, false));
-        assertEquals("J. Smith and P. Black Brown", al.getAsFirstLastNames(true, false));
-        assertEquals("John Smith and Peter Black Brown", al.getAsFirstLastNames(false, true));
-        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 Smith and Peter Black Brown",
+            al.getAsFirstLastNames(false, false)
+        );
+        assertEquals(
+            "J. Smith and P. Black Brown",
+            al.getAsFirstLastNames(true, false)
+        );
+        assertEquals(
+            "John Smith and Peter Black Brown",
+            al.getAsFirstLastNames(false, true)
+        );
+        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)
+        );
 
         al = AuthorList.parse("John Peter von Neumann");
-        assertEquals("John Peter von Neumann", al.getAsFirstLastNames(false, false));
-        assertEquals("John Peter von Neumann", al.getAsFirstLastNames(false, true));
+        assertEquals(
+            "John Peter von Neumann",
+            al.getAsFirstLastNames(false, false)
+        );
+        assertEquals(
+            "John Peter von Neumann",
+            al.getAsFirstLastNames(false, true)
+        );
         assertEquals("J. P. von Neumann", al.getAsFirstLastNames(true, false));
         assertEquals("J. P. von Neumann", al.getAsFirstLastNames(true, true));
     }
 
     @Test
     public void testGetAuthorsFirstFirstAnds() {
-        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
+        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());
+                .getAsFirstLastNamesWithAnd()
+        );
+        assertEquals(
+            "First von Last, Jr. III",
+            AuthorList
+                .parse("von Last, Jr. III, First")
+                .getAsFirstLastNamesWithAnd()
+        );
     }
 
     @Test
     public void testGetAuthorsForAlphabetization() {
-        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
     public void testRemoveStartAndEndBraces() {
-        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("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(
+            "{A}bbb{c}",
+            AuthorList.parse("{A}bbb{c}").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)
+        );
     }
 
     @Test
     public void createCorrectInitials() {
-        assertEquals(Optional.of("J. G."),
-                AuthorList.parse("Hornberg, Johann Gottfried").getAuthor(0).getFirstAbbr());
+        assertEquals(
+            Optional.of("J. G."),
+            AuthorList
+                .parse("Hornberg, Johann Gottfried")
+                .getAuthor(0)
+                .getFirstAbbr()
+        );
     }
 
     @Test
     public void parseNameWithBracesAroundFirstName() throws Exception {
         // TODO: Be more intelligent and abbreviate the first name correctly
-        Author expected = new Author("Tse-tung", "{Tse-tung}.", null, "Mao", null);
-        assertEquals(AuthorList.of(expected), AuthorList.parse("{Tse-tung} Mao"));
+        Author expected = new Author(
+            "Tse-tung",
+            "{Tse-tung}.",
+            null,
+            "Mao",
+            null
+        );
+        assertEquals(
+            AuthorList.of(expected),
+            AuthorList.parse("{Tse-tung} Mao")
+        );
     }
 
     @Test
     public void parseNameWithBracesAroundLastName() throws Exception {
-        Author expected = new Author("Hans", "H.", null, "van den Bergen", null);
-        assertEquals(AuthorList.of(expected), AuthorList.parse("{van den Bergen}, Hans"));
+        Author expected = new Author(
+            "Hans",
+            "H.",
+            null,
+            "van den Bergen",
+            null
+        );
+        assertEquals(
+            AuthorList.of(expected),
+            AuthorList.parse("{van den Bergen}, Hans")
+        );
     }
 
     @Test
@@ -1019,71 +1808,144 @@ public void parseNameWithHyphenInFirstName() throws Exception {
 
     @Test
     public void parseNameWithHyphenInLastName() throws Exception {
-        Author expected = new Author("Firstname", "F.", null, "Bailey-Jones", null);
-        assertEquals(AuthorList.of(expected), AuthorList.parse("Firstname Bailey-Jones"));
+        Author expected = new Author(
+            "Firstname",
+            "F.",
+            null,
+            "Bailey-Jones",
+            null
+        );
+        assertEquals(
+            AuthorList.of(expected),
+            AuthorList.parse("Firstname Bailey-Jones")
+        );
     }
 
     @Test
     public void parseNameWithHyphenInLastNameWithInitials() throws Exception {
-        Author expected = new Author("E. S.", "E. S.", null, "El-{M}allah", null);
-        assertEquals(AuthorList.of(expected), AuthorList.parse("E. S. El-{M}allah"));
+        Author expected = new Author(
+            "E. S.",
+            "E. S.",
+            null,
+            "El-{M}allah",
+            null
+        );
+        assertEquals(
+            AuthorList.of(expected),
+            AuthorList.parse("E. S. El-{M}allah")
+        );
     }
 
     @Test
     public void parseNameWithHyphenInLastNameWithEscaped() throws Exception {
-        Author expected = new Author("E. S.", "E. S.", null, "{K}ent-{B}oswell", null);
-        assertEquals(AuthorList.of(expected), AuthorList.parse("E. S. {K}ent-{B}oswell"));
+        Author expected = new Author(
+            "E. S.",
+            "E. S.",
+            null,
+            "{K}ent-{B}oswell",
+            null
+        );
+        assertEquals(
+            AuthorList.of(expected),
+            AuthorList.parse("E. S. {K}ent-{B}oswell")
+        );
     }
 
     @Test
-    public void parseNameWithHyphenInLastNameWhenLastNameGivenFirst() throws Exception {
+    public void parseNameWithHyphenInLastNameWhenLastNameGivenFirst()
+        throws Exception {
         // TODO: Fix abbreviation to be "A."
         Author expected = new Author("ʿAbdallāh", "ʿ.", null, "al-Ṣāliḥ", null);
-        assertEquals(AuthorList.of(expected), AuthorList.parse("al-Ṣāliḥ, ʿAbdallāh"));
+        assertEquals(
+            AuthorList.of(expected),
+            AuthorList.parse("al-Ṣāliḥ, ʿAbdallāh")
+        );
     }
 
     @Test
     public void parseNameWithBraces() throws Exception {
         Author expected = new Author("H{e}lene", "H.", null, "Fiaux", null);
-        assertEquals(AuthorList.of(expected), AuthorList.parse("H{e}lene Fiaux"));
+        assertEquals(
+            AuthorList.of(expected),
+            AuthorList.parse("H{e}lene Fiaux")
+        );
     }
 
     @Test
-    public 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).getFirst().orElse(null));
+    public 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)
+                .getFirst()
+                .orElse(null)
+        );
     }
 
     @Test
-    public void parseFirstNameFromSecondAuthorMultipleAuthorsWithLatexNames() throws Exception {
-        assertEquals("Corrado",
-                AuthorList.parse("Mu{\\d{h}}ammad al-Khw{\\={a}}rizm{\\={i}} and Corrado B{\\\"o}hm")
-                          .getAuthor(1).getFirst().orElse(null));
+    public void parseFirstNameFromSecondAuthorMultipleAuthorsWithLatexNames()
+        throws Exception {
+        assertEquals(
+            "Corrado",
+            AuthorList
+                .parse(
+                    "Mu{\\d{h}}ammad al-Khw{\\={a}}rizm{\\={i}} and Corrado B{\\\"o}hm"
+                )
+                .getAuthor(1)
+                .getFirst()
+                .orElse(null)
+        );
     }
 
     @Test
-    public 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).getLast().orElse(null));
+    public 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)
+                .getLast()
+                .orElse(null)
+        );
     }
 
     @Test
-    public 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).getLast().orElse(null));
+    public 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)
+                .getLast()
+                .orElse(null)
+        );
     }
 
     @Test
     public 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).getLast().orElse(null));
+        assertEquals(
+            "The Ban\\={u} M\\={u}s\\={a} brothers",
+            AuthorList
+                .parse("{The Ban\\={u} M\\={u}s\\={a} brothers}")
+                .getAuthor(0)
+                .getLast()
+                .orElse(null)
+        );
     }
 
     @Test
-    public void parseRetrieveCachedAuthorListAfterGarbageCollection() throws Exception {
+    public void parseRetrieveCachedAuthorListAfterGarbageCollection()
+        throws Exception {
         final String uniqueAuthorName = "Osvaldo Iongi";
         AuthorList author = AuthorList.parse(uniqueAuthorName);
         System.gc();
@@ -1091,10 +1953,13 @@ public void parseRetrieveCachedAuthorListAfterGarbageCollection() throws Excepti
     }
 
     @Test
-    public void parseGarbageCollectAuthorListForUnreachableKey() throws Exception {
+    public void parseGarbageCollectAuthorListForUnreachableKey()
+        throws Exception {
         final String uniqueAuthorName = "Fleur Hornbach";
         // Note that "new String()" is needed, uniqueAuthorName is a reference to a String literal
-        AuthorList uniqueAuthor = AuthorList.parse(new String(uniqueAuthorName));
+        AuthorList uniqueAuthor = AuthorList.parse(
+            new String(uniqueAuthorName)
+        );
         System.gc();
         assertNotSame(uniqueAuthor, AuthorList.parse(uniqueAuthorName));
     }
@@ -1103,17 +1968,24 @@ public void parseGarbageCollectAuthorListForUnreachableKey() throws Exception {
     public void parseGarbageCollectUnreachableInstitution() throws Exception {
         final String uniqueInstitutionName = "{Unique LLC}";
         // Note that "new String()" is needed, uniqueAuthorName is a reference to a String literal
-        AuthorList uniqueInstitution = AuthorList.parse(new String(uniqueInstitutionName));
+        AuthorList uniqueInstitution = AuthorList.parse(
+            new String(uniqueInstitutionName)
+        );
         System.gc();
-        assertNotSame(uniqueInstitution, AuthorList.parse(uniqueInstitutionName));
+        assertNotSame(
+            uniqueInstitution,
+            AuthorList.parse(uniqueInstitutionName)
+        );
     }
 
     /**
      * This tests an unreachable key issue addressed in [#6552](https://github.com/JabRef/jabref/pull/6552). The test is incorrect BibTeX but is handled by the parser and common in practice.
      */
     @Test
-    public void parseCacheAuthorsWithTwoOrMoreCommasAndWithSpaceInAllParts() throws Exception {
-        final String uniqueAuthorsNames = "Basil Dankworth, Gianna Birdwhistle, Cosmo Berrycloth";
+    public void parseCacheAuthorsWithTwoOrMoreCommasAndWithSpaceInAllParts()
+        throws Exception {
+        final String uniqueAuthorsNames =
+            "Basil Dankworth, Gianna Birdwhistle, Cosmo Berrycloth";
         AuthorList uniqueAuthors = AuthorList.parse(uniqueAuthorsNames);
         System.gc();
         assertSame(uniqueAuthors, AuthorList.parse(uniqueAuthorsNames));
@@ -1123,7 +1995,8 @@ public void parseCacheAuthorsWithTwoOrMoreCommasAndWithSpaceInAllParts() throws
      * This tests an unreachable key issue addressed in [#6552](https://github.com/JabRef/jabref/pull/6552).
      */
     @Test
-    public void parseCacheAuthorsWithTwoOrMoreCommasAndWithoutSpaceInAllParts() throws Exception {
+    public void parseCacheAuthorsWithTwoOrMoreCommasAndWithoutSpaceInAllParts()
+        throws Exception {
         final String uniqueAuthorsNames = "Dankworth, Jr., Braelynn";
         AuthorList uniqueAuthors = AuthorList.parse(uniqueAuthorsNames);
         System.gc();
@@ -1135,17 +2008,56 @@ public void parseCacheAuthorsWithTwoOrMoreCommasAndWithoutSpaceInAllParts() thro
      */
     @Test
     public 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"));
-
-        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"));
-
-        expected = new Author("José María", "J. M.", null, "Rodriguez Fernandez", null);
-        assertEquals(AuthorList.of(expected), AuthorList.parse("Rodriguez Fernandez, José María"));
+        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")
+        );
+
+        expected =
+            new Author(
+                "José María",
+                "J. M.",
+                null,
+                "Rodriguez Fernandez",
+                null
+            );
+        assertEquals(
+            AuthorList.of(expected),
+            AuthorList.parse("Rodriguez Fernandez, José María")
+        );
     }
 
     @Test
@@ -1159,29 +2071,43 @@ public void equalsFalseDifferentOrder() {
 
     @Test
     public void equalsFalseWhenNotAuthorList() {
-        assertNotEquals(AuthorList.of(new Author(null, null, null, null, null)),
-                new Author(null, null, null, null, null));
+        assertNotEquals(
+            AuthorList.of(new Author(null, null, null, null, null)),
+            new Author(null, null, null, null, null)
+        );
     }
 
     @Test
     public void equalsTrueReflexive() {
-        AuthorList authorList = AuthorList.of(new Author(null, null, null, null, null));
+        AuthorList authorList = AuthorList.of(
+            new Author(null, null, null, null, null)
+        );
         assertEquals(authorList, authorList);
     }
 
     @Test
     public void equalsTrueSymmetric() {
-        AuthorList firstAuthorList = AuthorList.of(new Author("A", null, null, null, null));
-        AuthorList secondAuthorList = AuthorList.of(new Author("A", null, null, null, null));
+        AuthorList firstAuthorList = AuthorList.of(
+            new Author("A", null, null, null, null)
+        );
+        AuthorList secondAuthorList = AuthorList.of(
+            new Author("A", null, null, null, null)
+        );
         assertEquals(firstAuthorList, secondAuthorList);
         assertEquals(secondAuthorList, firstAuthorList);
     }
 
     @Test
     public void equalsTrueTransitive() {
-        AuthorList firstAuthorList = AuthorList.of(new Author("A", null, null, null, null));
-        AuthorList secondAuthorList = AuthorList.of(new Author("A", null, null, null, null));
-        AuthorList thirdAuthorList = AuthorList.of(new Author("A", null, null, null, null));
+        AuthorList firstAuthorList = AuthorList.of(
+            new Author("A", null, null, null, null)
+        );
+        AuthorList secondAuthorList = AuthorList.of(
+            new Author("A", null, null, null, null)
+        );
+        AuthorList thirdAuthorList = AuthorList.of(
+            new Author("A", null, null, null, null)
+        );
         assertEquals(firstAuthorList, secondAuthorList);
         assertEquals(secondAuthorList, thirdAuthorList);
         assertEquals(firstAuthorList, thirdAuthorList);
@@ -1189,8 +2115,12 @@ public void equalsTrueTransitive() {
 
     @Test
     public void equalsTrueConsistent() {
-        AuthorList firstAuthorList = AuthorList.of(new Author("A", null, null, null, null));
-        AuthorList secondAuthorList = AuthorList.of(new Author("A", null, null, null, null));
+        AuthorList firstAuthorList = AuthorList.of(
+            new Author("A", null, null, null, null)
+        );
+        AuthorList secondAuthorList = AuthorList.of(
+            new Author("A", null, null, null, null)
+        );
         assertEquals(firstAuthorList, secondAuthorList);
         assertEquals(firstAuthorList, secondAuthorList);
         assertEquals(firstAuthorList, secondAuthorList);
@@ -1198,31 +2128,47 @@ public void equalsTrueConsistent() {
 
     @Test
     public void equalsFalseForNull() {
-        assertNotEquals(null, AuthorList.of(new Author(null, null, null, null, null)));
+        assertNotEquals(
+            null,
+            AuthorList.of(new Author(null, null, null, null, null))
+        );
     }
 
     @Test
     public void hashCodeConsistent() {
-        AuthorList authorList = AuthorList.of(new Author(null, null, null, null, null));
+        AuthorList authorList = AuthorList.of(
+            new Author(null, null, null, null, null)
+        );
         assertEquals(authorList.hashCode(), authorList.hashCode());
     }
 
     @Test
     public void hashCodeNotConstant() {
-        AuthorList firstAuthorList = AuthorList.of(new Author("A", null, null, null, null));
-        AuthorList secondAuthorList = AuthorList.of(new Author("B", null, null, null, null));
-        assertNotEquals(firstAuthorList.hashCode(), secondAuthorList.hashCode());
+        AuthorList firstAuthorList = AuthorList.of(
+            new Author("A", null, null, null, null)
+        );
+        AuthorList secondAuthorList = AuthorList.of(
+            new Author("B", null, null, null, null)
+        );
+        assertNotEquals(
+            firstAuthorList.hashCode(),
+            secondAuthorList.hashCode()
+        );
     }
 
     @Test
     public void getAsLastFirstFirstLastNamesWithAndEmptyAuthor() {
-        assertEquals("",
-                EMPTY_AUTHOR.getAsLastFirstFirstLastNamesWithAnd(true));
+        assertEquals(
+            "",
+            EMPTY_AUTHOR.getAsLastFirstFirstLastNamesWithAnd(true)
+        );
     }
 
     @Test
     public void getAsLastFirstFirstLastNamesWithAndMultipleAuthors() {
-        assertEquals("al-Khw{\\={a}}rizm{\\={i}}, M. and C. B{\\\"o}hm and K. G{\\\"{o}}del",
-                THREE_AUTHORS_WITH_LATEX.getAsLastFirstFirstLastNamesWithAnd(true));
+        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 a1176bf2ac6..2a172b0e3e0 100644
--- a/src/test/java/org/jabref/model/entry/AuthorTest.java
+++ b/src/test/java/org/jabref/model/entry/AuthorTest.java
@@ -1,12 +1,12 @@
 package org.jabref.model.entry;
 
+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;
-
 class AuthorTest {
 
     @Test
@@ -24,11 +24,26 @@ 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));
     }
@@ -40,7 +55,7 @@ void addDotIfAbbreviationIfNameIsNullOrEmpty(String input) {
     }
 
     @ParameterizedTest
-    @ValueSource(strings = {"asdf", "a"})
+    @ValueSource(strings = { "asdf", "a" })
     void addDotIfAbbreviationLowerCaseLetters(String input) {
         assertEquals(input, Author.addDotIfAbbreviation(input));
     }
@@ -71,7 +86,7 @@ void addDotIfAbbreviationEndsWithDoubleAbbreviation() {
     }
 
     @ParameterizedTest
-    @ValueSource(strings = {"1", "1 23"})
+    @ValueSource(strings = { "1", "1 23" })
     void addDotIfAbbreviationIfStartsWithNumber(String input) {
         assertEquals(input, Author.addDotIfAbbreviation(input));
     }
diff --git a/src/test/java/org/jabref/model/entry/BibEntryTest.java b/src/test/java/org/jabref/model/entry/BibEntryTest.java
index b913030cc73..83535751392 100644
--- a/src/test/java/org/jabref/model/entry/BibEntryTest.java
+++ b/src/test/java/org/jabref/model/entry/BibEntryTest.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.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 java.net.URL;
 import java.nio.file.Path;
 import java.util.ArrayList;
@@ -10,7 +19,6 @@
 import java.util.Optional;
 import java.util.Set;
 import java.util.stream.Stream;
-
 import org.jabref.model.FieldChange;
 import org.jabref.model.database.BibDatabase;
 import org.jabref.model.entry.field.BibField;
@@ -22,23 +30,14 @@
 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;
-
 @Execution(CONCURRENT)
 class BibEntryTest {
+
     private BibEntry entry = new BibEntry();
 
     @Test
@@ -61,13 +60,22 @@ void setNullFieldThrowsNPE() {
     @Test
     void getFieldIsCaseInsensitive() throws Exception {
         entry.setField(new UnknownField("TeSt"), "value");
-        assertEquals(Optional.of("value"), entry.getField(new UnknownField("tEsT")));
+        assertEquals(
+            Optional.of("value"),
+            entry.getField(new UnknownField("tEsT"))
+        );
     }
 
     @Test
     void getFieldWorksWithBibFieldAsWell() throws Exception {
         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,8 +91,14 @@ void setFieldLeadsToAChangedEntry() throws Exception {
 
     @Test
     void setFieldWorksWithBibFieldAsWell() throws Exception {
-        entry.setField(new BibField(StandardField.AUTHOR, FieldPriority.IMPORTANT).field(), "value");
-        assertEquals(Optional.of("value"), entry.getField(StandardField.AUTHOR));
+        entry.setField(
+            new BibField(StandardField.AUTHOR, FieldPriority.IMPORTANT).field(),
+            "value"
+        );
+        assertEquals(
+            Optional.of("value"),
+            entry.getField(StandardField.AUTHOR)
+        );
     }
 
     @Test
@@ -100,8 +114,11 @@ void clonedBibEntryWithMiscTypeHasOriginalChangedFlag() throws Exception {
     }
 
     @Test
-    void clonedBibEntryWithBookTypeAndOneFieldHasOriginalChangedFlag() throws Exception {
-        entry = new BibEntry(StandardEntryType.Book).withField(StandardField.AUTHOR, "value");
+    void clonedBibEntryWithBookTypeAndOneFieldHasOriginalChangedFlag()
+        throws Exception {
+        entry =
+            new BibEntry(StandardEntryType.Book)
+                .withField(StandardField.AUTHOR, "value");
         BibEntry entryClone = (BibEntry) entry.clone();
         assertFalse(entryClone.hasChanged());
     }
@@ -158,93 +175,147 @@ void monthFieldCorrectlyReturnedForMonthMay() throws Exception {
     void getFieldOrAliasDateWithYearNumericalMonthString() {
         entry.setField(StandardField.YEAR, "2003");
         entry.setField(StandardField.MONTH, "3");
-        assertEquals(Optional.of("2003-03"), entry.getFieldOrAlias(StandardField.DATE));
+        assertEquals(
+            Optional.of("2003-03"),
+            entry.getFieldOrAlias(StandardField.DATE)
+        );
     }
 
     @Test
     void getFieldOrAliasDateWithYearAbbreviatedMonth() {
         entry.setField(StandardField.YEAR, "2003");
         entry.setField(StandardField.MONTH, "#mar#");
-        assertEquals(Optional.of("2003-03"), entry.getFieldOrAlias(StandardField.DATE));
+        assertEquals(
+            Optional.of("2003-03"),
+            entry.getFieldOrAlias(StandardField.DATE)
+        );
     }
 
     @Test
     void getFieldOrAliasDateWithYearAbbreviatedMonthString() {
         entry.setField(StandardField.YEAR, "2003");
         entry.setField(StandardField.MONTH, "mar");
-        assertEquals(Optional.of("2003-03"), entry.getFieldOrAlias(StandardField.DATE));
+        assertEquals(
+            Optional.of("2003-03"),
+            entry.getFieldOrAlias(StandardField.DATE)
+        );
     }
 
     @Test
     void getFieldOrAliasDateWithOnlyYear() {
         entry.setField(StandardField.YEAR, "2003");
-        assertEquals(Optional.of("2003"), entry.getFieldOrAlias(StandardField.DATE));
+        assertEquals(
+            Optional.of("2003"),
+            entry.getFieldOrAlias(StandardField.DATE)
+        );
     }
 
     @Test
     void getFieldOrAliasYearWithDateYYYY() {
         entry.setField(StandardField.DATE, "2003");
-        assertEquals(Optional.of("2003"), entry.getFieldOrAlias(StandardField.YEAR));
+        assertEquals(
+            Optional.of("2003"),
+            entry.getFieldOrAlias(StandardField.YEAR)
+        );
     }
 
     @Test
     void getFieldOrAliasYearWithDateYYYYMM() {
         entry.setField(StandardField.DATE, "2003-03");
-        assertEquals(Optional.of("2003"), entry.getFieldOrAlias(StandardField.YEAR));
+        assertEquals(
+            Optional.of("2003"),
+            entry.getFieldOrAlias(StandardField.YEAR)
+        );
     }
 
     @Test
     void getFieldOrAliasYearWithDateYYYYMMDD() {
         entry.setField(StandardField.DATE, "2003-03-30");
-        assertEquals(Optional.of("2003"), entry.getFieldOrAlias(StandardField.YEAR));
+        assertEquals(
+            Optional.of("2003"),
+            entry.getFieldOrAlias(StandardField.YEAR)
+        );
     }
 
     @Test
     void getFieldOrAliasMonthWithDateYYYYReturnsNull() {
         entry.setField(StandardField.DATE, "2003");
-        assertEquals(Optional.empty(), entry.getFieldOrAlias(StandardField.MONTH));
+        assertEquals(
+            Optional.empty(),
+            entry.getFieldOrAlias(StandardField.MONTH)
+        );
     }
 
     @Test
     void getFieldOrAliasMonthWithDateYYYYMM() {
         entry.setField(StandardField.DATE, "2003-03");
-        assertEquals(Optional.of("#mar#"), entry.getFieldOrAlias(StandardField.MONTH));
+        assertEquals(
+            Optional.of("#mar#"),
+            entry.getFieldOrAlias(StandardField.MONTH)
+        );
     }
 
     @Test
     void getFieldOrAliasMonthWithDateYYYYMMDD() {
         entry.setField(StandardField.DATE, "2003-03-30");
-        assertEquals(Optional.of("#mar#"), entry.getFieldOrAlias(StandardField.MONTH));
+        assertEquals(
+            Optional.of("#mar#"),
+            entry.getFieldOrAlias(StandardField.MONTH)
+        );
     }
 
     @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));
+        entry.setField(
+            StandardField.TITLE,
+            "A Title Without any LaTeX commands"
+        );
+        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));
+        entry.setField(
+            StandardField.JOURNAL,
+            "A Title Without any LaTeX commands"
+        );
+        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));
+        entry.setField(
+            StandardField.JOURNAL,
+            "A 32~{mA} {$\\Sigma\\Delta$}-modulator"
+        );
+        assertEquals(
+            Optional.of("A 32 mA ΣΔ-modulator"),
+            entry.getFieldOrAliasLatexFree(StandardField.JOURNALTITLE)
+        );
     }
 
     @Test
@@ -252,7 +323,10 @@ void testGetAndAddToLinkedFileList() {
         List<LinkedFile> files = entry.getFiles();
         files.add(new LinkedFile("", Path.of(""), ""));
         entry.setFiles(files);
-        assertEquals(Arrays.asList(new LinkedFile("", Path.of(""), "")), entry.getFiles());
+        assertEquals(
+            Arrays.asList(new LinkedFile("", Path.of(""), "")),
+            entry.getFiles()
+        );
     }
 
     @Test
@@ -306,7 +380,10 @@ void clearFieldWorksForAuthor() {
     @Test
     void setFieldWorksForAuthor() {
         entry.setField(StandardField.AUTHOR, "Albert Einstein");
-        assertEquals(Optional.of("Albert Einstein"), entry.getField(StandardField.AUTHOR));
+        assertEquals(
+            Optional.of("Albert Einstein"),
+            entry.getField(StandardField.AUTHOR)
+        );
     }
 
     @Test
@@ -333,10 +410,14 @@ void allFieldsPresentOr() {
         e.setField(StandardField.JOURNAL, "abc");
 
         List<OrFields> requiredFields = new ArrayList<>();
-        requiredFields.add(new OrFields(StandardField.JOURNAL, StandardField.YEAR));
+        requiredFields.add(
+            new OrFields(StandardField.JOURNAL, StandardField.YEAR)
+        );
         assertTrue(e.allFieldsPresent(requiredFields, null));
 
-        requiredFields.add(new OrFields(StandardField.YEAR, StandardField.ADDRESS));
+        requiredFields.add(
+            new OrFields(StandardField.YEAR, StandardField.ADDRESS)
+        );
         assertFalse(e.allFieldsPresent(requiredFields, null));
     }
 
@@ -391,19 +472,28 @@ void compareIsTrueWhenIdAndFieldsAreEqual() throws Exception {
     @Test
     void addNullKeywordThrowsNPE() {
         entry.setField(StandardField.KEYWORDS, "Foo, Bar");
-        assertThrows(NullPointerException.class, () -> entry.addKeyword((Keyword) null, ','));
+        assertThrows(
+            NullPointerException.class,
+            () -> entry.addKeyword((Keyword) null, ',')
+        );
     }
 
     @Test
     void putNullKeywordListThrowsNPE() {
         entry.setField(StandardField.KEYWORDS, "Foo, Bar");
-        assertThrows(NullPointerException.class, () -> entry.putKeywords((KeywordList) null, ','));
+        assertThrows(
+            NullPointerException.class,
+            () -> entry.putKeywords((KeywordList) null, ',')
+        );
     }
 
     @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
@@ -416,7 +506,10 @@ void testGetSeparatedKeywordsAreCorrect() {
     void testAddKeywordIsCorrect() {
         entry.setField(StandardField.KEYWORDS, "Foo, Bar");
         entry.addKeyword("FooBar", ',');
-        assertEquals(new KeywordList("Foo", "Bar", "FooBar"), entry.getKeywords(','));
+        assertEquals(
+            new KeywordList("Foo", "Bar", "FooBar"),
+            entry.getKeywords(',')
+        );
     }
 
     @Test
@@ -431,14 +524,20 @@ void testAddKeywordTwiceYiedsOnlyOne() {
         entry.setField(StandardField.KEYWORDS, "Foo, Bar");
         entry.addKeyword("FooBar", ',');
         entry.addKeyword("FooBar", ',');
-        assertEquals(new KeywordList("Foo", "Bar", "FooBar"), entry.getKeywords(','));
+        assertEquals(
+            new KeywordList("Foo", "Bar", "FooBar"),
+            entry.getKeywords(',')
+        );
     }
 
     @Test
     void addKeywordIsCaseSensitive() {
         entry.setField(StandardField.KEYWORDS, "Foo, Bar");
         entry.addKeyword("FOO", ',');
-        assertEquals(new KeywordList("Foo", "Bar", "FOO"), entry.getKeywords(','));
+        assertEquals(
+            new KeywordList("Foo", "Bar", "FOO"),
+            entry.getKeywords(',')
+        );
     }
 
     @Test
@@ -528,41 +627,73 @@ void testPutKeywordsPutEmpyListToEmptyBibentryNotChanged() {
 
     @Test
     void putKeywordsToEmptyReturnsNoChange() {
-        Optional<FieldChange> change = entry.putKeywords(Collections.emptyList(), ',');
+        Optional<FieldChange> change = entry.putKeywords(
+            Collections.emptyList(),
+            ','
+        );
         assertEquals(Optional.empty(), change);
     }
 
     @Test
     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);
+        Optional<FieldChange> change = entry.putKeywords(
+            Collections.emptyList(),
+            ','
+        );
+        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")),
-                change);
+        Optional<FieldChange> change = entry.putKeywords(
+            Arrays.asList("Test", "FooTest"),
+            ','
+        );
+        assertEquals(
+            Optional.of(
+                new FieldChange(
+                    entry,
+                    StandardField.KEYWORDS,
+                    "Foo, Bar",
+                    "Test, FooTest"
+                )
+            ),
+            change
+        );
     }
 
     @Test
     void putKeywordsToSameReturnsNoChange() {
         entry.setField(StandardField.KEYWORDS, "Foo, Bar");
-        Optional<FieldChange> change = entry.putKeywords(Arrays.asList("Foo", "Bar"), ',');
+        Optional<FieldChange> change = entry.putKeywords(
+            Arrays.asList("Foo", "Bar"),
+            ','
+        );
         assertEquals(Optional.empty(), change);
     }
 
     @Test
     void getKeywordsReturnsParsedKeywordListFromKeywordsField() {
         entry.setField(StandardField.KEYWORDS, "w1, w2a w2b, w3");
-        assertEquals(new KeywordList("w1", "w2a w2b", "w3"), entry.getKeywords(','));
+        assertEquals(
+            new KeywordList("w1", "w2a w2b", "w3"),
+            entry.getKeywords(',')
+        );
     }
 
     @Test
     void removeKeywordsOnEntryWithoutKeywordsDoesNothing() {
-        Optional<FieldChange> change = entry.removeKeywords(SpecialField.RANKING.getKeyWords(), ',');
+        Optional<FieldChange> change = entry.removeKeywords(
+            SpecialField.RANKING.getKeyWords(),
+            ','
+        );
         assertEquals(Optional.empty(), change);
     }
 
@@ -570,7 +701,10 @@ void removeKeywordsOnEntryWithoutKeywordsDoesNothing() {
     void removeKeywordsWithEmptyListDoesNothing() {
         entry.setField(StandardField.KEYWORDS, "Foo, Bar");
         entry.putKeywords(Arrays.asList("kw1", "kw2"), ',');
-        Optional<FieldChange> change = entry.removeKeywords(new KeywordList(), ',');
+        Optional<FieldChange> change = entry.removeKeywords(
+            new KeywordList(),
+            ','
+        );
         assertEquals(Optional.empty(), change);
     }
 
@@ -578,16 +712,25 @@ 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());
+        assertEquals(
+            Sets.newHashSet("kw1", "kw2"),
+            entry.getKeywords(',').toStringList()
+        );
     }
 
     @Test
     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 +741,14 @@ 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 +799,14 @@ void testGetResolvedKeywords() {
 
         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
@@ -667,22 +824,31 @@ 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");
+            .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());
@@ -691,21 +857,30 @@ 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");
+            .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());
@@ -714,24 +889,36 @@ 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");
+            .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);
+        Set<Field> otherPrioritizedFields = Set.of(
+            StandardField.VOLUME,
+            StandardField.KEYWORDS
+        );
 
         copyEntry.mergeWith(otherEntry, otherPrioritizedFields);
         assertEquals(expected.getFields(), copyEntry.getFields());
@@ -740,24 +927,36 @@ 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");
+            .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);
+        Set<Field> otherPrioritizedFields = Set.of(
+            StandardField.AUTHOR,
+            StandardField.EPRINT
+        );
 
         copyEntry.mergeWith(otherEntry, otherPrioritizedFields);
         assertEquals(expected.getFields(), copyEntry.getFields());
@@ -766,23 +965,35 @@ 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");
+            .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);
+        Set<Field> otherPrioritizedFields = Set.of(
+            StandardField.TITLE,
+            StandardField.DATE
+        );
 
         copyEntry.mergeWith(otherEntry, otherPrioritizedFields);
         assertEquals(expected.getFields(), copyEntry.getFields());
@@ -791,23 +1002,35 @@ 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");
+            .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);
+        Set<Field> otherPrioritizedFields = Set.of(
+            StandardField.AUTHOR,
+            StandardField.DATE
+        );
 
         copyEntry.mergeWith(otherEntry, otherPrioritizedFields);
         assertEquals(expected.getFields(), copyEntry.getFields());
@@ -815,17 +1038,18 @@ void mergeEntriesWithOverlapAndPriorityGivenToOverlappingField() {
 
     public static Stream<BibEntry> isEmpty() {
         return Stream.of(
-                new BibEntry(),
-                new BibEntry(StandardEntryType.Book),
-                new BibEntry().withField(StandardField.OWNER, "test"),
-                new BibEntry().withField(StandardField.CREATIONDATE, "test"),
-                new BibEntry()
-                        .withField(StandardField.OWNER, "test")
-                        .withField(StandardField.CREATIONDATE, "test"),
-                // source: https://github.com/JabRef/jabref/issues/8645
-                new BibEntry()
-                        .withField(StandardField.OWNER, "mlep")
-                        .withField(StandardField.CREATIONDATE, "2022-04-05T10:41:54"));
+            new BibEntry(),
+            new BibEntry(StandardEntryType.Book),
+            new BibEntry().withField(StandardField.OWNER, "test"),
+            new BibEntry().withField(StandardField.CREATIONDATE, "test"),
+            new BibEntry()
+                .withField(StandardField.OWNER, "test")
+                .withField(StandardField.CREATIONDATE, "test"),
+            // source: https://github.com/JabRef/jabref/issues/8645
+            new BibEntry()
+                .withField(StandardField.OWNER, "mlep")
+                .withField(StandardField.CREATIONDATE, "2022-04-05T10:41:54")
+        );
     }
 
     @ParameterizedTest
@@ -836,8 +1060,8 @@ void isEmpty(BibEntry entry) {
 
     public static Stream<BibEntry> isNotEmpty() {
         return Stream.of(
-                new BibEntry().withCitationKey("test"),
-                new BibEntry().withField(StandardField.AUTHOR, "test")
+            new BibEntry().withCitationKey("test"),
+            new BibEntry().withField(StandardField.AUTHOR, "test")
         );
     }
 
diff --git a/src/test/java/org/jabref/model/entry/BibEntryTypesManagerTest.java b/src/test/java/org/jabref/model/entry/BibEntryTypesManagerTest.java
index 0564e8b4bd7..65e4d56cffb 100644
--- a/src/test/java/org/jabref/model/entry/BibEntryTypesManagerTest.java
+++ b/src/test/java/org/jabref/model/entry/BibEntryTypesManagerTest.java
@@ -1,11 +1,14 @@
 package org.jabref.model.entry;
 
+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.Collections;
 import java.util.List;
 import java.util.Optional;
 import java.util.TreeSet;
 import java.util.stream.Collectors;
-
 import org.jabref.architecture.AllowedToUseLogic;
 import org.jabref.logic.exporter.MetaDataSerializer;
 import org.jabref.logic.importer.util.MetaDataParser;
@@ -22,66 +25,98 @@
 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.assertTrue;
-
-@AllowedToUseLogic("Requires MetaDataSerializer and MetaDataParser for parsing tests")
+@AllowedToUseLogic(
+    "Requires MetaDataSerializer and MetaDataParser for parsing tests"
+)
 class BibEntryTypesManagerTest {
 
-    private static final EntryType UNKNOWN_TYPE = new UnknownEntryType("unknownType");
-    private static final EntryType CUSTOM_TYPE = new UnknownEntryType("customType");
+    private static final EntryType UNKNOWN_TYPE = new UnknownEntryType(
+        "unknownType"
+    );
+    private static final EntryType CUSTOM_TYPE = new UnknownEntryType(
+        "customType"
+    );
     private BibEntryType newCustomType;
     private BibEntryType overwrittenStandardType;
     private BibEntryTypesManager entryTypesManager;
 
     @BeforeEach
     void setUp() {
-        newCustomType = new BibEntryType(
+        newCustomType =
+            new BibEntryType(
                 CUSTOM_TYPE,
-                List.of(new BibField(StandardField.AUTHOR, FieldPriority.IMPORTANT)),
-                Collections.emptySet());
-        overwrittenStandardType = new BibEntryType(
+                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());
+                List.of(
+                    new BibField(StandardField.TITLE, FieldPriority.IMPORTANT)
+                ),
+                Collections.emptySet()
+            );
         entryTypesManager = new BibEntryTypesManager();
     }
 
     @ParameterizedTest
     @EnumSource(BibDatabaseMode.class)
-    void isCustomOrModifiedTypeReturnsTrueForModifiedStandardEntryType(BibDatabaseMode mode) {
-        entryTypesManager.addCustomOrModifiedType(overwrittenStandardType, mode);
-        assertTrue(entryTypesManager.isCustomOrModifiedType(overwrittenStandardType, mode));
+    void isCustomOrModifiedTypeReturnsTrueForModifiedStandardEntryType(
+        BibDatabaseMode mode
+    ) {
+        entryTypesManager.addCustomOrModifiedType(
+            overwrittenStandardType,
+            mode
+        );
+        assertTrue(
+            entryTypesManager.isCustomOrModifiedType(
+                overwrittenStandardType,
+                mode
+            )
+        );
     }
 
     @Test
     void allTypesBibtexAreCorrect() {
-        TreeSet<BibEntryType> defaultTypes = new TreeSet<>(BibtexEntryTypeDefinitions.ALL);
+        TreeSet<BibEntryType> defaultTypes = new TreeSet<>(
+            BibtexEntryTypeDefinitions.ALL
+        );
         defaultTypes.addAll(IEEETranEntryTypeDefinitions.ALL);
 
-        assertEquals(defaultTypes, entryTypesManager.getAllTypes(BibDatabaseMode.BIBTEX));
+        assertEquals(
+            defaultTypes,
+            entryTypesManager.getAllTypes(BibDatabaseMode.BIBTEX)
+        );
     }
 
     @Test
     void allTypesBiblatexAreCorrect() {
-        TreeSet<BibEntryType> defaultTypes = new TreeSet<>(BiblatexEntryTypeDefinitions.ALL);
+        TreeSet<BibEntryType> defaultTypes = new TreeSet<>(
+            BiblatexEntryTypeDefinitions.ALL
+        );
         defaultTypes.addAll(BiblatexSoftwareEntryTypeDefinitions.ALL);
         defaultTypes.addAll(BiblatexAPAEntryTypeDefinitions.ALL);
 
-        assertEquals(defaultTypes, entryTypesManager.getAllTypes(BibDatabaseMode.BIBLATEX));
+        assertEquals(
+            defaultTypes,
+            entryTypesManager.getAllTypes(BibDatabaseMode.BIBLATEX)
+        );
     }
 
     @ParameterizedTest
     @EnumSource(BibDatabaseMode.class)
     void unknownTypeIsNotFound(BibDatabaseMode mode) {
-        assertEquals(Optional.empty(), entryTypesManager.enrich(UNKNOWN_TYPE, mode));
+        assertEquals(
+            Optional.empty(),
+            entryTypesManager.enrich(UNKNOWN_TYPE, mode)
+        );
         assertFalse(entryTypesManager.isCustomType(UNKNOWN_TYPE, mode));
     }
 
@@ -89,20 +124,35 @@ void unknownTypeIsNotFound(BibDatabaseMode mode) {
     @EnumSource(BibDatabaseMode.class)
     void newCustomEntryTypeFound(BibDatabaseMode mode) {
         entryTypesManager.addCustomOrModifiedType(newCustomType, mode);
-        assertEquals(Optional.of(newCustomType), entryTypesManager.enrich(CUSTOM_TYPE, mode));
+        assertEquals(
+            Optional.of(newCustomType),
+            entryTypesManager.enrich(CUSTOM_TYPE, mode)
+        );
     }
 
     @ParameterizedTest
     @EnumSource(BibDatabaseMode.class)
-    void registeredBibEntryTypeIsContainedInListOfCustomizedEntryTypes(BibDatabaseMode mode) {
+    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));
+        entryTypesManager.addCustomOrModifiedType(
+            newCustomType,
+            BibDatabaseMode.BIBTEX
+        );
+        assertFalse(
+            entryTypesManager
+                .getAllTypes(BibDatabaseMode.BIBLATEX)
+                .contains(newCustomType)
+        );
     }
 
     @ParameterizedTest
@@ -110,63 +160,122 @@ void registerBibEntryTypeDoesNotAffectOtherMode() {
     void overwriteBibEntryTypeFields(BibDatabaseMode mode) {
         entryTypesManager.addCustomOrModifiedType(newCustomType, mode);
         BibEntryType newBibEntryTypeTitle = new BibEntryType(
-                CUSTOM_TYPE,
-                Collections.singleton(new BibField(StandardField.TITLE, FieldPriority.IMPORTANT)),
-                Collections.emptySet());
+            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));
+        entryTypesManager.addCustomOrModifiedType(
+            overwrittenStandardType,
+            mode
+        );
+        assertEquals(
+            Optional.of(overwrittenStandardType),
+            entryTypesManager.enrich(overwrittenStandardType.getType(), mode)
+        );
     }
 
     @ParameterizedTest
     @EnumSource(BibDatabaseMode.class)
-    void registeredCustomizedStandardEntryTypeIsNotContainedInListOfCustomEntryTypes(BibDatabaseMode mode) {
-        entryTypesManager.addCustomOrModifiedType(overwrittenStandardType, mode);
-        assertEquals(Collections.emptyList(), entryTypesManager.getAllCustomTypes(mode));
+    void registeredCustomizedStandardEntryTypeIsNotContainedInListOfCustomEntryTypes(
+        BibDatabaseMode mode
+    ) {
+        entryTypesManager.addCustomOrModifiedType(
+            overwrittenStandardType,
+            mode
+        );
+        assertEquals(
+            Collections.emptyList(),
+            entryTypesManager.getAllCustomTypes(mode)
+        );
     }
 
     @ParameterizedTest
     @EnumSource(BibDatabaseMode.class)
     void standardTypeIsStillAccessibleIfOverwritten(BibDatabaseMode mode) {
-        entryTypesManager.addCustomOrModifiedType(overwrittenStandardType, mode);
-        assertFalse(entryTypesManager.isCustomType(overwrittenStandardType.getType(), mode));
+        entryTypesManager.addCustomOrModifiedType(
+            overwrittenStandardType,
+            mode
+        );
+        assertFalse(
+            entryTypesManager.isCustomType(
+                overwrittenStandardType.getType(),
+                mode
+            )
+        );
     }
 
     @ParameterizedTest
     @EnumSource(BibDatabaseMode.class)
     void testsModifyingArticle(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());
-
-        entryTypesManager.addCustomOrModifiedType(overwrittenStandardType, mode);
-        assertEquals(Collections.singletonList(overwrittenStandardType), entryTypesManager.getAllTypes(mode).stream().filter(t -> "article".equals(t.getType().getName())).collect(Collectors.toList()));
+        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())
+        );
     }
 
     @ParameterizedTest
     @EnumSource(BibDatabaseMode.class)
     void testsModifyingArticleWithParsing(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());
-
-        entryTypesManager.addCustomOrModifiedType(overwrittenStandardType, mode);
-        String serialized = MetaDataSerializer.serializeCustomEntryTypes(overwrittenStandardType);
-        Optional<BibEntryType> type = MetaDataParser.parseCustomEntryType(serialized);
+        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
+        );
+        Optional<BibEntryType> type = MetaDataParser.parseCustomEntryType(
+            serialized
+        );
 
         assertEquals(Optional.of(overwrittenStandardType), type);
     }
@@ -174,18 +283,35 @@ void testsModifyingArticleWithParsing(BibDatabaseMode mode) {
     @ParameterizedTest
     @EnumSource(BibDatabaseMode.class)
     void testsModifyingArticleWithParsingKeepsListOrder(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());
-
-        entryTypesManager.addCustomOrModifiedType(overwrittenStandardType, mode);
-        String serialized = MetaDataSerializer.serializeCustomEntryTypes(overwrittenStandardType);
-        Optional<BibEntryType> type = MetaDataParser.parseCustomEntryType(serialized);
-
-        assertEquals(overwrittenStandardType.getOptionalFields(), type.get().getOptionalFields());
+        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
+        );
+        Optional<BibEntryType> type = MetaDataParser.parseCustomEntryType(
+            serialized
+        );
+
+        assertEquals(
+            overwrittenStandardType.getOptionalFields(),
+            type.get().getOptionalFields()
+        );
     }
 }
diff --git a/src/test/java/org/jabref/model/entry/BibtexStringTest.java b/src/test/java/org/jabref/model/entry/BibtexStringTest.java
index 1d418a13f7b..940d0b135a9 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;
+
 public class BibtexStringTest {
 
     @Test
@@ -40,7 +40,10 @@ public void cloningDoesNotChangeContents() {
 
     @Test
     public void clonedBibtexStringEqualsOriginalString() {
-        BibtexString bibtexString = new BibtexString("AAA", "An alternative action");
+        BibtexString bibtexString = new BibtexString(
+            "AAA",
+            "An alternative action"
+        );
         bibtexString.setId("ID");
 
         BibtexString clone = (BibtexString) bibtexString.clone();
@@ -77,7 +80,10 @@ public void settingFieldsInACloneWorks() {
     @Test
     public void modifyingACloneDoesNotModifyTheOriginalEntry() {
         // Instantiate
-        BibtexString original = new BibtexString("AAA", "An alternative action");
+        BibtexString original = new BibtexString(
+            "AAA",
+            "An alternative action"
+        );
         original.setId("ID");
 
         BibtexString clone = (BibtexString) original.clone();
@@ -105,7 +111,10 @@ public void authorTypeCorrectlyDetermined() {
     @Test
     public 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 +128,10 @@ public void otherTypeCorrectlyDeterminedForLowerCase() {
     @Test
     public 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 7861f47fbdc..f402d1f977f 100644
--- a/src/test/java/org/jabref/model/entry/CanonicalBibEntryTest.java
+++ b/src/test/java/org/jabref/model/entry/CanonicalBibEntryTest.java
@@ -1,22 +1,24 @@
 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
@@ -26,9 +28,12 @@ public void simpleCanonicalRepresentation() {
         e.setField(StandardField.AUTHOR, "abc");
         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}",
-                canonicalRepresentation);
+        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}",
+            canonicalRepresentation
+        );
     }
 
     @Test
@@ -36,7 +41,11 @@ public void canonicalRepresentationWithNewlines() {
         BibEntry e = new BibEntry(StandardEntryType.Article);
         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);
+        String canonicalRepresentation =
+            CanonicalBibEntry.getCanonicalRepresentation(e);
+        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 9f212b5b519..ee42abedb89 100644
--- a/src/test/java/org/jabref/model/entry/CrossrefTest.java
+++ b/src/test/java/org/jabref/model/entry/CrossrefTest.java
@@ -1,24 +1,22 @@
 package org.jabref.model.entry;
 
+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;
-
 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;
-
 class CrossrefTest {
 
     private BibEntry parent;
@@ -49,7 +47,10 @@ 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());
@@ -62,24 +63,27 @@ void authorInheritance(EntryType parentType, EntryType childType) {
         child.setType(childType);
 
         assertEquals(
-                parent.getResolvedFieldOrAlias(StandardField.AUTHOR, null),
-                child.getResolvedFieldOrAlias(StandardField.AUTHOR, db)
+            parent.getResolvedFieldOrAlias(StandardField.AUTHOR, null),
+            child.getResolvedFieldOrAlias(StandardField.AUTHOR, db)
         );
 
         assertEquals(
-                parent.getResolvedFieldOrAlias(StandardField.AUTHOR, null),
-                child.getResolvedFieldOrAlias(StandardField.BOOKAUTHOR, db)
+            parent.getResolvedFieldOrAlias(StandardField.AUTHOR, null),
+            child.getResolvedFieldOrAlias(StandardField.BOOKAUTHOR, db)
         );
     }
 
     private static Stream<Arguments> authorInheritanceSource() {
         return Stream.of(
-                Arguments.of(StandardEntryType.MvBook, StandardEntryType.InBook),
-                Arguments.of(StandardEntryType.MvBook, StandardEntryType.BookInBook),
-                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.MvBook, StandardEntryType.InBook),
+            Arguments.of(
+                StandardEntryType.MvBook,
+                StandardEntryType.BookInBook
+            ),
+            Arguments.of(StandardEntryType.MvBook, StandardEntryType.SuppBook),
+            Arguments.of(StandardEntryType.Book, StandardEntryType.InBook),
+            Arguments.of(StandardEntryType.Book, StandardEntryType.BookInBook),
+            Arguments.of(StandardEntryType.Book, StandardEntryType.SuppBook)
         );
     }
 
@@ -90,32 +94,56 @@ void mainTitleInheritance(EntryType parentType, EntryType childType) {
         child.setType(childType);
 
         assertEquals(
-                parent.getResolvedFieldOrAlias(StandardField.TITLE, null),
-                child.getResolvedFieldOrAlias(StandardField.MAINTITLE, db)
+            parent.getResolvedFieldOrAlias(StandardField.TITLE, null),
+            child.getResolvedFieldOrAlias(StandardField.MAINTITLE, db)
         );
         assertEquals(
-                parent.getResolvedFieldOrAlias(StandardField.SUBTITLE, null),
-                child.getResolvedFieldOrAlias(StandardField.MAINSUBTITLE, db)
+            parent.getResolvedFieldOrAlias(StandardField.SUBTITLE, null),
+            child.getResolvedFieldOrAlias(StandardField.MAINSUBTITLE, db)
         );
         assertEquals(
-                parent.getResolvedFieldOrAlias(StandardField.TITLEADDON, null),
-                child.getResolvedFieldOrAlias(StandardField.MAINTITLEADDON, db)
+            parent.getResolvedFieldOrAlias(StandardField.TITLEADDON, null),
+            child.getResolvedFieldOrAlias(StandardField.MAINTITLEADDON, db)
         );
     }
 
     private static Stream<Arguments> mainTitleInheritanceSource() {
         return Stream.of(
-                Arguments.of(StandardEntryType.MvBook, StandardEntryType.Book),
-                Arguments.of(StandardEntryType.MvBook, StandardEntryType.InBook),
-                Arguments.of(StandardEntryType.MvBook, StandardEntryType.BookInBook),
-                Arguments.of(StandardEntryType.MvBook, StandardEntryType.SuppBook),
-                Arguments.of(StandardEntryType.MvCollection, StandardEntryType.Collection),
-                Arguments.of(StandardEntryType.MvCollection, StandardEntryType.InCollection),
-                Arguments.of(StandardEntryType.MvCollection, StandardEntryType.SuppCollection),
-                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.MvBook, StandardEntryType.Book),
+            Arguments.of(StandardEntryType.MvBook, StandardEntryType.InBook),
+            Arguments.of(
+                StandardEntryType.MvBook,
+                StandardEntryType.BookInBook
+            ),
+            Arguments.of(StandardEntryType.MvBook, StandardEntryType.SuppBook),
+            Arguments.of(
+                StandardEntryType.MvCollection,
+                StandardEntryType.Collection
+            ),
+            Arguments.of(
+                StandardEntryType.MvCollection,
+                StandardEntryType.InCollection
+            ),
+            Arguments.of(
+                StandardEntryType.MvCollection,
+                StandardEntryType.SuppCollection
+            ),
+            Arguments.of(
+                StandardEntryType.MvProceedings,
+                StandardEntryType.Proceedings
+            ),
+            Arguments.of(
+                StandardEntryType.MvProceedings,
+                StandardEntryType.InProceedings
+            ),
+            Arguments.of(
+                StandardEntryType.MvReference,
+                StandardEntryType.Reference
+            ),
+            Arguments.of(
+                StandardEntryType.MvReference,
+                StandardEntryType.InReference
+            )
         );
     }
 
@@ -126,28 +154,40 @@ void bookTitleInheritance(EntryType parentType, EntryType childType) {
         child.setType(childType);
 
         assertEquals(
-                parent.getResolvedFieldOrAlias(StandardField.TITLE, null),
-                child.getResolvedFieldOrAlias(StandardField.BOOKTITLE, db)
+            parent.getResolvedFieldOrAlias(StandardField.TITLE, null),
+            child.getResolvedFieldOrAlias(StandardField.BOOKTITLE, db)
         );
         assertEquals(
-                parent.getResolvedFieldOrAlias(StandardField.SUBTITLE, null),
-                child.getResolvedFieldOrAlias(StandardField.BOOKSUBTITLE, db)
+            parent.getResolvedFieldOrAlias(StandardField.SUBTITLE, null),
+            child.getResolvedFieldOrAlias(StandardField.BOOKSUBTITLE, db)
         );
         assertEquals(
-                parent.getResolvedFieldOrAlias(StandardField.TITLEADDON, null),
-                child.getResolvedFieldOrAlias(StandardField.BOOKTITLEADDON, db)
+            parent.getResolvedFieldOrAlias(StandardField.TITLEADDON, null),
+            child.getResolvedFieldOrAlias(StandardField.BOOKTITLEADDON, db)
         );
     }
 
     private static Stream<Arguments> bookTitleInheritanceSource() {
         return Stream.of(
-                Arguments.of(StandardEntryType.Book, StandardEntryType.InBook),
-                Arguments.of(StandardEntryType.Book, StandardEntryType.BookInBook),
-                Arguments.of(StandardEntryType.Book, StandardEntryType.SuppBook),
-                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.Book, StandardEntryType.InBook),
+            Arguments.of(StandardEntryType.Book, StandardEntryType.BookInBook),
+            Arguments.of(StandardEntryType.Book, StandardEntryType.SuppBook),
+            Arguments.of(
+                StandardEntryType.Collection,
+                StandardEntryType.InCollection
+            ),
+            Arguments.of(
+                StandardEntryType.Collection,
+                StandardEntryType.SuppCollection
+            ),
+            Arguments.of(
+                StandardEntryType.Reference,
+                StandardEntryType.InReference
+            ),
+            Arguments.of(
+                StandardEntryType.Proceedings,
+                StandardEntryType.InProceedings
+            )
         );
     }
 
@@ -158,19 +198,25 @@ void journalTitleInheritance(EntryType parentType, EntryType childType) {
         child.setType(childType);
 
         assertEquals(
-                parent.getResolvedFieldOrAlias(StandardField.TITLE, null),
-                child.getResolvedFieldOrAlias(StandardField.JOURNALTITLE, db)
+            parent.getResolvedFieldOrAlias(StandardField.TITLE, null),
+            child.getResolvedFieldOrAlias(StandardField.JOURNALTITLE, db)
         );
         assertEquals(
-                parent.getResolvedFieldOrAlias(StandardField.SUBTITLE, null),
-                child.getResolvedFieldOrAlias(StandardField.JOURNALSUBTITLE, db)
+            parent.getResolvedFieldOrAlias(StandardField.SUBTITLE, null),
+            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.Article
+            ),
+            Arguments.of(
+                IEEETranEntryType.Periodical,
+                StandardEntryType.SuppPeriodical
+            )
         );
     }
 
@@ -180,144 +226,568 @@ void noTitleInheritance(EntryType parentType, EntryType childType) {
         parent.setType(parentType);
         child.setType(childType);
 
-        assertTrue(child.getResolvedFieldOrAlias(StandardField.TITLE, db).isEmpty());
-        assertTrue(child.getResolvedFieldOrAlias(StandardField.SUBTITLE, db).isEmpty());
-        assertTrue(child.getResolvedFieldOrAlias(StandardField.TITLEADDON, db).isEmpty());
-        assertTrue(child.getResolvedFieldOrAlias(StandardField.SHORTTITLE, db).isEmpty());
+        assertTrue(
+            child.getResolvedFieldOrAlias(StandardField.TITLE, db).isEmpty()
+        );
+        assertTrue(
+            child.getResolvedFieldOrAlias(StandardField.SUBTITLE, db).isEmpty()
+        );
+        assertTrue(
+            child
+                .getResolvedFieldOrAlias(StandardField.TITLEADDON, db)
+                .isEmpty()
+        );
+        assertTrue(
+            child
+                .getResolvedFieldOrAlias(StandardField.SHORTTITLE, db)
+                .isEmpty()
+        );
     }
 
     private static Stream<Arguments> noTitleInheritanceSource() {
         return Stream.of(
-                Arguments.of(StandardEntryType.MvBook, StandardEntryType.Book),
-                Arguments.of(StandardEntryType.MvBook, StandardEntryType.InBook),
-                Arguments.of(StandardEntryType.MvBook, StandardEntryType.BookInBook),
-                Arguments.of(StandardEntryType.MvBook, StandardEntryType.SuppBook),
-                Arguments.of(StandardEntryType.MvCollection, StandardEntryType.Collection),
-                Arguments.of(StandardEntryType.MvCollection, StandardEntryType.InCollection),
-                Arguments.of(StandardEntryType.MvCollection, StandardEntryType.SuppCollection),
-                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.Book, StandardEntryType.InBook),
-                Arguments.of(StandardEntryType.Book, StandardEntryType.BookInBook),
-                Arguments.of(StandardEntryType.Book, StandardEntryType.SuppBook),
-                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.MvBook, StandardEntryType.Book),
+            Arguments.of(StandardEntryType.MvBook, StandardEntryType.InBook),
+            Arguments.of(
+                StandardEntryType.MvBook,
+                StandardEntryType.BookInBook
+            ),
+            Arguments.of(StandardEntryType.MvBook, StandardEntryType.SuppBook),
+            Arguments.of(
+                StandardEntryType.MvCollection,
+                StandardEntryType.Collection
+            ),
+            Arguments.of(
+                StandardEntryType.MvCollection,
+                StandardEntryType.InCollection
+            ),
+            Arguments.of(
+                StandardEntryType.MvCollection,
+                StandardEntryType.SuppCollection
+            ),
+            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.Book, StandardEntryType.InBook),
+            Arguments.of(StandardEntryType.Book, StandardEntryType.BookInBook),
+            Arguments.of(StandardEntryType.Book, StandardEntryType.SuppBook),
+            Arguments.of(
+                StandardEntryType.Collection,
+                StandardEntryType.InCollection
+            ),
+            Arguments.of(
+                StandardEntryType.Collection,
+                StandardEntryType.SuppCollection
+            ),
+            Arguments.of(
+                StandardEntryType.Reference,
+                StandardEntryType.InReference
+            ),
+            Arguments.of(
+                StandardEntryType.Proceedings,
+                StandardEntryType.InProceedings
+            )
         );
     }
 
     @ParameterizedTest
     @MethodSource("sameNameInheritance")
-    void sameNameInheritance(EntryType parentType, EntryType childType, StandardField field) {
+    void sameNameInheritance(
+        EntryType parentType,
+        EntryType childType,
+        StandardField field
+    ) {
         parent.setType(parentType);
         child.setType(childType);
 
         assertTrue(parent.setField(field, "parent_FIELD").isPresent());
 
         assertEquals(
-                parent.getResolvedFieldOrAlias(field, null),
-                child.getResolvedFieldOrAlias(field, db)
+            parent.getResolvedFieldOrAlias(field, null),
+            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 f25fa62136f..6ac42808a89 100644
--- a/src/test/java/org/jabref/model/entry/DateTest.java
+++ b/src/test/java/org/jabref/model/entry/DateTest.java
@@ -1,5 +1,9 @@
 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 java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.time.Month;
@@ -11,50 +15,76 @@
 import java.time.temporal.Temporal;
 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(
-                Arguments.of(LocalDateTime.of(2018, Month.OCTOBER, 3, 7, 24), "2018-10-03T07:24"),
-                Arguments.of(LocalDateTime.of(2018, Month.OCTOBER, 3, 17, 2), "2018-10-03T17:2"),
-                Arguments.of(LocalDateTime.of(2018, Month.OCTOBER, 3, 7, 24), "2018-10-03T7:24"),
-                Arguments.of(LocalDateTime.of(2018, Month.OCTOBER, 3, 7, 7), "2018-10-03T7:7"),
-                Arguments.of(LocalDateTime.of(2018, Month.OCTOBER, 3, 7, 0), "2018-10-03T07"),
-                Arguments.of(LocalDateTime.of(2018, Month.OCTOBER, 3, 7, 0), "2018-10-03T7"),
-                Arguments.of(LocalDate.of(2009, Month.JANUARY, 15), "2009-1-15"),
-                Arguments.of(YearMonth.of(2009, Month.NOVEMBER), "2009-11"),
-                Arguments.of(LocalDate.of(2012, Month.JANUARY, 15), "15-1-2012"),
-                Arguments.of(YearMonth.of(2012, Month.JANUARY), "1-2012"),
-                Arguments.of(YearMonth.of(2015, Month.SEPTEMBER), "9/2015"),
-                Arguments.of(YearMonth.of(2015, Month.SEPTEMBER), "09/2015"),
-                Arguments.of(YearMonth.of(2015, Month.SEPTEMBER), "9/15"),
-                Arguments.of(LocalDate.of(2015, Month.SEPTEMBER, 1), "September 1, 2015"),
-                Arguments.of(YearMonth.of(2015, Month.SEPTEMBER), "September, 2015"),
-                Arguments.of(LocalDate.of(2015, Month.JANUARY, 15), "15.1.2015"),
-                Arguments.of(LocalDate.of(2015, Month.JANUARY, 15), "2015.1.15"),
-                Arguments.of(Year.of(2015), "2015"),
-                Arguments.of(YearMonth.of(2020, Month.JANUARY), "Jan, 2020"),
-                Arguments.of(LocalDate.of(2015, Month.OCTOBER, 15), "2015.10.15"),
-                Arguments.of(LocalDate.of(-10000, Month.OCTOBER, 15), "-10000-10-15"),
-                Arguments.of(YearMonth.of(2015, Month.NOVEMBER), "2015/11"),
-                Arguments.of(LocalDate.of(2015, Month.JANUARY, 15), "15 January 2015"),
-                Arguments.of(Year.of(2015), "2015-"),
-                Arguments.of(Year.of(2015), "2015?"),
-                Arguments.of(Year.of(-29), "30 BC"),
-                Arguments.of(Year.of(-29), "0030 BC"),
-                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(
+                LocalDateTime.of(2018, Month.OCTOBER, 3, 7, 24),
+                "2018-10-03T07:24"
+            ),
+            Arguments.of(
+                LocalDateTime.of(2018, Month.OCTOBER, 3, 17, 2),
+                "2018-10-03T17:2"
+            ),
+            Arguments.of(
+                LocalDateTime.of(2018, Month.OCTOBER, 3, 7, 24),
+                "2018-10-03T7:24"
+            ),
+            Arguments.of(
+                LocalDateTime.of(2018, Month.OCTOBER, 3, 7, 7),
+                "2018-10-03T7:7"
+            ),
+            Arguments.of(
+                LocalDateTime.of(2018, Month.OCTOBER, 3, 7, 0),
+                "2018-10-03T07"
+            ),
+            Arguments.of(
+                LocalDateTime.of(2018, Month.OCTOBER, 3, 7, 0),
+                "2018-10-03T7"
+            ),
+            Arguments.of(LocalDate.of(2009, Month.JANUARY, 15), "2009-1-15"),
+            Arguments.of(YearMonth.of(2009, Month.NOVEMBER), "2009-11"),
+            Arguments.of(LocalDate.of(2012, Month.JANUARY, 15), "15-1-2012"),
+            Arguments.of(YearMonth.of(2012, Month.JANUARY), "1-2012"),
+            Arguments.of(YearMonth.of(2015, Month.SEPTEMBER), "9/2015"),
+            Arguments.of(YearMonth.of(2015, Month.SEPTEMBER), "09/2015"),
+            Arguments.of(YearMonth.of(2015, Month.SEPTEMBER), "9/15"),
+            Arguments.of(
+                LocalDate.of(2015, Month.SEPTEMBER, 1),
+                "September 1, 2015"
+            ),
+            Arguments.of(
+                YearMonth.of(2015, Month.SEPTEMBER),
+                "September, 2015"
+            ),
+            Arguments.of(LocalDate.of(2015, Month.JANUARY, 15), "15.1.2015"),
+            Arguments.of(LocalDate.of(2015, Month.JANUARY, 15), "2015.1.15"),
+            Arguments.of(Year.of(2015), "2015"),
+            Arguments.of(YearMonth.of(2020, Month.JANUARY), "Jan, 2020"),
+            Arguments.of(LocalDate.of(2015, Month.OCTOBER, 15), "2015.10.15"),
+            Arguments.of(
+                LocalDate.of(-10000, Month.OCTOBER, 15),
+                "-10000-10-15"
+            ),
+            Arguments.of(YearMonth.of(2015, Month.NOVEMBER), "2015/11"),
+            Arguments.of(
+                LocalDate.of(2015, Month.JANUARY, 15),
+                "15 January 2015"
+            ),
+            Arguments.of(Year.of(2015), "2015-"),
+            Arguments.of(Year.of(2015), "2015?"),
+            Arguments.of(Year.of(-29), "30 BC"),
+            Arguments.of(Year.of(-29), "0030 BC"),
+            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")
         );
     }
 
@@ -66,37 +96,80 @@ 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() {
         return Stream.of(
-                Arguments.of("", "input value not empty"),
-                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("", "input value not empty"),
+            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]")
         );
     }
 
@@ -109,10 +182,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)))
+            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"));
diff --git a/src/test/java/org/jabref/model/entry/EntryLinkListTest.java b/src/test/java/org/jabref/model/entry/EntryLinkListTest.java
index 46f34989c7f..94de93bd172 100644
--- a/src/test/java/org/jabref/model/entry/EntryLinkListTest.java
+++ b/src/test/java/org/jabref/model/entry/EntryLinkListTest.java
@@ -1,18 +1,16 @@
 package org.jabref.model.entry;
 
+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;
-
 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;
-
 public class EntryLinkListTest {
 
     private static final String KEY = "test";
@@ -33,8 +31,7 @@ public 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 +59,10 @@ public void givenFieldValueAndDatabaseWhenParsingThenExpectLink() {
 
     @Test
     public 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
@@ -79,7 +78,9 @@ public void givenTargetAndSourceWhenSourceCrossrefTargetThenSourceCrossrefsTarge
     }
 
     private void assertSourceCrossrefsTarget(BibEntry target, BibEntry source) {
-        Optional<String> sourceCrossref = source.getField(StandardField.CROSSREF);
+        Optional<String> sourceCrossref = source.getField(
+            StandardField.CROSSREF
+        );
         Optional<String> targetCiteKey = target.getCitationKey();
         assertEquals(sourceCrossref, targetCiteKey);
     }
diff --git a/src/test/java/org/jabref/model/entry/EntryTypeFactoryTest.java b/src/test/java/org/jabref/model/entry/EntryTypeFactoryTest.java
index 9cfef3dbff6..98450e6ca77 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;
-
 public 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 83ef54af5eb..798066821c8 100644
--- a/src/test/java/org/jabref/model/entry/IdGeneratorTest.java
+++ b/src/test/java/org/jabref/model/entry/IdGeneratorTest.java
@@ -1,11 +1,10 @@
 package org.jabref.model.entry;
 
-import java.util.HashSet;
+import static org.junit.jupiter.api.Assertions.assertFalse;
 
+import java.util.HashSet;
 import org.junit.jupiter.api.Test;
 
-import static org.junit.jupiter.api.Assertions.assertFalse;
-
 public class IdGeneratorTest {
 
     @Test
diff --git a/src/test/java/org/jabref/model/entry/KeywordListTest.java b/src/test/java/org/jabref/model/entry/KeywordListTest.java
index 4fc3ce2a6d0..a91b7b7f131 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;
-
 public class KeywordListTest {
 
     private KeywordList keywords;
@@ -23,55 +23,76 @@ public void parseEmptyStringReturnsEmptyList() throws Exception {
 
     @Test
     public void parseOneWordReturnsOneKeyword() throws Exception {
-        assertEquals(new KeywordList("keywordOne"),
-                KeywordList.parse("keywordOne", ','));
+        assertEquals(
+            new KeywordList("keywordOne"),
+            KeywordList.parse("keywordOne", ',')
+        );
     }
 
     @Test
     public void parseTwoWordReturnsTwoKeywords() throws Exception {
-        assertEquals(new KeywordList("keywordOne", "keywordTwo"),
-                KeywordList.parse("keywordOne, keywordTwo", ','));
+        assertEquals(
+            new KeywordList("keywordOne", "keywordTwo"),
+            KeywordList.parse("keywordOne, keywordTwo", ',')
+        );
     }
 
     @Test
     public void parseTwoWordReturnsTwoKeywordsWithoutSpace() throws Exception {
-        assertEquals(new KeywordList("keywordOne", "keywordTwo"),
-                KeywordList.parse("keywordOne,keywordTwo", ','));
+        assertEquals(
+            new KeywordList("keywordOne", "keywordTwo"),
+            KeywordList.parse("keywordOne,keywordTwo", ',')
+        );
     }
 
     @Test
-    public void parseTwoWordReturnsTwoKeywordsWithDifferentDelimiter() throws Exception {
-        assertEquals(new KeywordList("keywordOne", "keywordTwo"),
-                KeywordList.parse("keywordOne| keywordTwo", '|'));
+    public void parseTwoWordReturnsTwoKeywordsWithDifferentDelimiter()
+        throws Exception {
+        assertEquals(
+            new KeywordList("keywordOne", "keywordTwo"),
+            KeywordList.parse("keywordOne| keywordTwo", '|')
+        );
     }
 
     @Test
     public 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
-    public void parseWordsWithWhitespaceAndCommaReturnsTwoKeyword() throws Exception {
-        assertEquals(new KeywordList("keyword and one", "and two"),
-                KeywordList.parse("keyword and one, and two", ','));
+    public void parseWordsWithWhitespaceAndCommaReturnsTwoKeyword()
+        throws Exception {
+        assertEquals(
+            new KeywordList("keyword and one", "and two"),
+            KeywordList.parse("keyword and one, and two", ',')
+        );
     }
 
     @Test
     public void parseIgnoresDuplicates() throws Exception {
-        assertEquals(new KeywordList("keywordOne", "keywordTwo"),
-                KeywordList.parse("keywordOne, keywordTwo, keywordOne", ','));
+        assertEquals(
+            new KeywordList("keywordOne", "keywordTwo"),
+            KeywordList.parse("keywordOne, keywordTwo, keywordOne", ',')
+        );
     }
 
     @Test
     public void parseTakeDelimiterNotRegexWhite() throws Exception {
-        assertEquals(new KeywordList("keywordOne keywordTwo", "keywordThree"),
-                KeywordList.parse("keywordOne keywordTwoskeywordThree", 's'));
+        assertEquals(
+            new KeywordList("keywordOne keywordTwo", "keywordThree"),
+            KeywordList.parse("keywordOne keywordTwoskeywordThree", 's')
+        );
     }
 
     @Test
     public void parseWordsWithBracketsReturnsOneKeyword() throws Exception {
-        assertEquals(new KeywordList("[a] keyword"), KeywordList.parse("[a] keyword", ','));
+        assertEquals(
+            new KeywordList("[a] keyword"),
+            KeywordList.parse("[a] keyword", ',')
+        );
     }
 
     @Test
@@ -83,7 +104,10 @@ public void asStringAddsSpaceAfterDelimiter() throws Exception {
     public 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,28 +115,53 @@ public void parseTwoHierarchicalChains() throws Exception {
         Keyword expectedOne = Keyword.of("Parent1", "Node1", "Child1");
         Keyword expectedTwo = Keyword.of("Parent2", "Node2", "Child2");
 
-        assertEquals(new KeywordList(expectedOne, expectedTwo),
-                KeywordList.parse("Parent1 > Node1 > Child1, Parent2 > Node2 > Child2", ',', '>'));
+        assertEquals(
+            new KeywordList(expectedOne, expectedTwo),
+            KeywordList.parse(
+                "Parent1 > Node1 > Child1, Parent2 > Node2 > Child2",
+                ',',
+                '>'
+            )
+        );
     }
 
     @Test
     public void mergeTwoIdenticalKeywordsShouldReturnOnKeyword() {
-        assertEquals(new KeywordList("JabRef"), KeywordList.merge("JabRef", "JabRef", ','));
+        assertEquals(
+            new KeywordList("JabRef"),
+            KeywordList.merge("JabRef", "JabRef", ',')
+        );
     }
 
     @Test
     public void mergeOneEmptyKeywordAnAnotherNonEmptyShouldReturnTheNonEmptyKeyword() {
-        assertEquals(new KeywordList("JabRef"), KeywordList.merge("", "JabRef", ','));
+        assertEquals(
+            new KeywordList("JabRef"),
+            KeywordList.merge("", "JabRef", ',')
+        );
     }
 
     @Test
     public void mergeTwoDistinctKeywordsShouldReturnTheTwoKeywordsMerged() {
-        assertEquals(new KeywordList("Figma", "JabRef"), KeywordList.merge("Figma", "JabRef", ','));
-        assertEquals(new KeywordList("JabRef", "Figma"), KeywordList.merge("Figma", "JabRef", ','));
+        assertEquals(
+            new KeywordList("Figma", "JabRef"),
+            KeywordList.merge("Figma", "JabRef", ',')
+        );
+        assertEquals(
+            new KeywordList("JabRef", "Figma"),
+            KeywordList.merge("Figma", "JabRef", ',')
+        );
     }
 
     @Test
     public 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 7496ed23771..809072ba3dd 100644
--- a/src/test/java/org/jabref/model/entry/KeywordTest.java
+++ b/src/test/java/org/jabref/model/entry/KeywordTest.java
@@ -1,18 +1,20 @@
 package org.jabref.model.entry;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
 import java.util.HashSet;
 import java.util.Set;
-
 import org.junit.jupiter.api.Test;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-
 public class KeywordTest {
 
     @Test
     public void getPathFromRootAsStringForSimpleChain() throws Exception {
         Keyword keywordChain = Keyword.of("A", "B", "C");
-        assertEquals("A > B", keywordChain.getChild().get().getPathFromRootAsString('>'));
+        assertEquals(
+            "A > B",
+            keywordChain.getChild().get().getPathFromRootAsString('>')
+        );
     }
 
     @Test
diff --git a/src/test/java/org/jabref/model/entry/MonthTest.java b/src/test/java/org/jabref/model/entry/MonthTest.java
index 17c98897907..35b9d23a642 100644
--- a/src/test/java/org/jabref/model/entry/MonthTest.java
+++ b/src/test/java/org/jabref/model/entry/MonthTest.java
@@ -1,205 +1,219 @@
 package org.jabref.model.entry;
 
+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;
-
 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;
-
 public 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));
     }
 
     private static Stream<Arguments> parseShortName() {
         return Stream.of(
-                arguments(Optional.of(Month.JANUARY), "jan"),
-                arguments(Optional.of(Month.FEBRUARY), "feb"),
-                arguments(Optional.of(Month.MARCH), "mar"),
-                arguments(Optional.of(Month.APRIL), "apr"),
-                arguments(Optional.of(Month.MAY), "may"),
-                arguments(Optional.of(Month.JUNE), "jun"),
-                arguments(Optional.of(Month.JULY), "jul"),
-                arguments(Optional.of(Month.AUGUST), "aug"),
-                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.JANUARY), "jan"),
+            arguments(Optional.of(Month.FEBRUARY), "feb"),
+            arguments(Optional.of(Month.MARCH), "mar"),
+            arguments(Optional.of(Month.APRIL), "apr"),
+            arguments(Optional.of(Month.MAY), "may"),
+            arguments(Optional.of(Month.JUNE), "jun"),
+            arguments(Optional.of(Month.JULY), "jul"),
+            arguments(Optional.of(Month.AUGUST), "aug"),
+            arguments(Optional.of(Month.SEPTEMBER), "sep"),
+            arguments(Optional.of(Month.OCTOBER), "oct"),
+            arguments(Optional.of(Month.NOVEMBER), "nov"),
+            arguments(Optional.of(Month.DECEMBER), "dec")
         );
     }
 
     private static Stream<Arguments> parseBibtexName() {
         return Stream.of(
-                arguments(Optional.of(Month.JANUARY), "#jan#"),
-                arguments(Optional.of(Month.FEBRUARY), "#feb#"),
-                arguments(Optional.of(Month.MARCH), "#mar#"),
-                arguments(Optional.of(Month.APRIL), "#apr#"),
-                arguments(Optional.of(Month.MAY), "#may#"),
-                arguments(Optional.of(Month.JUNE), "#jun#"),
-                arguments(Optional.of(Month.JULY), "#jul#"),
-                arguments(Optional.of(Month.AUGUST), "#aug#"),
-                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.JANUARY), "#jan#"),
+            arguments(Optional.of(Month.FEBRUARY), "#feb#"),
+            arguments(Optional.of(Month.MARCH), "#mar#"),
+            arguments(Optional.of(Month.APRIL), "#apr#"),
+            arguments(Optional.of(Month.MAY), "#may#"),
+            arguments(Optional.of(Month.JUNE), "#jun#"),
+            arguments(Optional.of(Month.JULY), "#jul#"),
+            arguments(Optional.of(Month.AUGUST), "#aug#"),
+            arguments(Optional.of(Month.SEPTEMBER), "#sep#"),
+            arguments(Optional.of(Month.OCTOBER), "#oct#"),
+            arguments(Optional.of(Month.NOVEMBER), "#nov#"),
+            arguments(Optional.of(Month.DECEMBER), "#dec#")
         );
     }
 
     private static Stream<Arguments> parseFullName() {
         return Stream.of(
-                arguments(Optional.of(Month.JANUARY), "January"),
-                arguments(Optional.of(Month.FEBRUARY), "February"),
-                arguments(Optional.of(Month.MARCH), "March"),
-                arguments(Optional.of(Month.APRIL), "April"),
-                arguments(Optional.of(Month.MAY), "May"),
-                arguments(Optional.of(Month.JUNE), "June"),
-                arguments(Optional.of(Month.JULY), "July"),
-                arguments(Optional.of(Month.AUGUST), "August"),
-                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.JANUARY), "January"),
+            arguments(Optional.of(Month.FEBRUARY), "February"),
+            arguments(Optional.of(Month.MARCH), "March"),
+            arguments(Optional.of(Month.APRIL), "April"),
+            arguments(Optional.of(Month.MAY), "May"),
+            arguments(Optional.of(Month.JUNE), "June"),
+            arguments(Optional.of(Month.JULY), "July"),
+            arguments(Optional.of(Month.AUGUST), "August"),
+            arguments(Optional.of(Month.SEPTEMBER), "September"),
+            arguments(Optional.of(Month.OCTOBER), "October"),
+            arguments(Optional.of(Month.NOVEMBER), "November"),
+            arguments(Optional.of(Month.DECEMBER), "December")
         );
     }
 
     private static Stream<Arguments> parseTwoDigitNumber() {
         return Stream.of(
-                arguments(Optional.of(Month.JANUARY), "01"),
-                arguments(Optional.of(Month.FEBRUARY), "02"),
-                arguments(Optional.of(Month.MARCH), "03"),
-                arguments(Optional.of(Month.APRIL), "04"),
-                arguments(Optional.of(Month.MAY), "05"),
-                arguments(Optional.of(Month.JUNE), "06"),
-                arguments(Optional.of(Month.JULY), "07"),
-                arguments(Optional.of(Month.AUGUST), "08"),
-                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.JANUARY), "01"),
+            arguments(Optional.of(Month.FEBRUARY), "02"),
+            arguments(Optional.of(Month.MARCH), "03"),
+            arguments(Optional.of(Month.APRIL), "04"),
+            arguments(Optional.of(Month.MAY), "05"),
+            arguments(Optional.of(Month.JUNE), "06"),
+            arguments(Optional.of(Month.JULY), "07"),
+            arguments(Optional.of(Month.AUGUST), "08"),
+            arguments(Optional.of(Month.SEPTEMBER), "09"),
+            arguments(Optional.of(Month.OCTOBER), "10"),
+            arguments(Optional.of(Month.NOVEMBER), "11"),
+            arguments(Optional.of(Month.DECEMBER), "12")
         );
     }
 
     private static Stream<Arguments> parseNumber() {
         return Stream.of(
-                arguments(Optional.of(Month.JANUARY), "1"),
-                arguments(Optional.of(Month.FEBRUARY), "2"),
-                arguments(Optional.of(Month.MARCH), "3"),
-                arguments(Optional.of(Month.APRIL), "4"),
-                arguments(Optional.of(Month.MAY), "5"),
-                arguments(Optional.of(Month.JUNE), "6"),
-                arguments(Optional.of(Month.JULY), "7"),
-                arguments(Optional.of(Month.AUGUST), "8"),
-                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.JANUARY), "1"),
+            arguments(Optional.of(Month.FEBRUARY), "2"),
+            arguments(Optional.of(Month.MARCH), "3"),
+            arguments(Optional.of(Month.APRIL), "4"),
+            arguments(Optional.of(Month.MAY), "5"),
+            arguments(Optional.of(Month.JUNE), "6"),
+            arguments(Optional.of(Month.JULY), "7"),
+            arguments(Optional.of(Month.AUGUST), "8"),
+            arguments(Optional.of(Month.SEPTEMBER), "9"),
+            arguments(Optional.of(Month.OCTOBER), "10"),
+            arguments(Optional.of(Month.NOVEMBER), "11"),
+            arguments(Optional.of(Month.DECEMBER), "12")
         );
     }
 
     private static Stream<Arguments> parseShortNameGerman() {
         return Stream.of(
-                arguments(Optional.of(Month.JANUARY), "Jan"),
-                arguments(Optional.of(Month.FEBRUARY), "Feb"),
-                arguments(Optional.of(Month.MARCH), "Mär"),
-                arguments(Optional.of(Month.MARCH), "Mae"),
-                arguments(Optional.of(Month.APRIL), "Apr"),
-                arguments(Optional.of(Month.MAY), "Mai"),
-                arguments(Optional.of(Month.JUNE), "Jun"),
-                arguments(Optional.of(Month.JULY), "Jul"),
-                arguments(Optional.of(Month.AUGUST), "Aug"),
-                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.JANUARY), "Jan"),
+            arguments(Optional.of(Month.FEBRUARY), "Feb"),
+            arguments(Optional.of(Month.MARCH), "Mär"),
+            arguments(Optional.of(Month.MARCH), "Mae"),
+            arguments(Optional.of(Month.APRIL), "Apr"),
+            arguments(Optional.of(Month.MAY), "Mai"),
+            arguments(Optional.of(Month.JUNE), "Jun"),
+            arguments(Optional.of(Month.JULY), "Jul"),
+            arguments(Optional.of(Month.AUGUST), "Aug"),
+            arguments(Optional.of(Month.SEPTEMBER), "Sep"),
+            arguments(Optional.of(Month.OCTOBER), "Okt"),
+            arguments(Optional.of(Month.NOVEMBER), "Nov"),
+            arguments(Optional.of(Month.DECEMBER), "Dez")
         );
     }
 
     private static Stream<Arguments> parseFullNameGerman() {
         return Stream.of(
-                arguments(Optional.of(Month.JANUARY), "Januar"),
-                arguments(Optional.of(Month.FEBRUARY), "Februar"),
-                arguments(Optional.of(Month.MARCH), "März"),
-                arguments(Optional.of(Month.MARCH), "Maerz"),
-                arguments(Optional.of(Month.APRIL), "April"),
-                arguments(Optional.of(Month.MAY), "Mai"),
-                arguments(Optional.of(Month.JUNE), "Juni"),
-                arguments(Optional.of(Month.JULY), "Juli"),
-                arguments(Optional.of(Month.AUGUST), "August"),
-                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.JANUARY), "Januar"),
+            arguments(Optional.of(Month.FEBRUARY), "Februar"),
+            arguments(Optional.of(Month.MARCH), "März"),
+            arguments(Optional.of(Month.MARCH), "Maerz"),
+            arguments(Optional.of(Month.APRIL), "April"),
+            arguments(Optional.of(Month.MAY), "Mai"),
+            arguments(Optional.of(Month.JUNE), "Juni"),
+            arguments(Optional.of(Month.JULY), "Juli"),
+            arguments(Optional.of(Month.AUGUST), "August"),
+            arguments(Optional.of(Month.SEPTEMBER), "September"),
+            arguments(Optional.of(Month.OCTOBER), "Oktober"),
+            arguments(Optional.of(Month.NOVEMBER), "November"),
+            arguments(Optional.of(Month.DECEMBER), "Dezember")
         );
     }
 
     private static Stream<Arguments> parseShortNameGermanLowercase() {
         return Stream.of(
-                arguments(Optional.of(Month.JANUARY), "jan"),
-                arguments(Optional.of(Month.FEBRUARY), "feb"),
-                arguments(Optional.of(Month.MARCH), "mär"),
-                arguments(Optional.of(Month.MARCH), "mae"),
-                arguments(Optional.of(Month.APRIL), "apr"),
-                arguments(Optional.of(Month.MAY), "mai"),
-                arguments(Optional.of(Month.JUNE), "jun"),
-                arguments(Optional.of(Month.JULY), "jul"),
-                arguments(Optional.of(Month.AUGUST), "aug"),
-                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.JANUARY), "jan"),
+            arguments(Optional.of(Month.FEBRUARY), "feb"),
+            arguments(Optional.of(Month.MARCH), "mär"),
+            arguments(Optional.of(Month.MARCH), "mae"),
+            arguments(Optional.of(Month.APRIL), "apr"),
+            arguments(Optional.of(Month.MAY), "mai"),
+            arguments(Optional.of(Month.JUNE), "jun"),
+            arguments(Optional.of(Month.JULY), "jul"),
+            arguments(Optional.of(Month.AUGUST), "aug"),
+            arguments(Optional.of(Month.SEPTEMBER), "sep"),
+            arguments(Optional.of(Month.OCTOBER), "okt"),
+            arguments(Optional.of(Month.NOVEMBER), "nov"),
+            arguments(Optional.of(Month.DECEMBER), "dez")
         );
     }
 
     private static Stream<Arguments> parseSpecialCases() {
         return Stream.of(
-                arguments(Optional.empty(), ";lkjasdf"),
-                arguments(Optional.empty(), "3.2"),
-                arguments(Optional.empty(), "#test#"),
-                arguments(Optional.empty(), "8,"),
-                arguments(Optional.empty(), "")
+            arguments(Optional.empty(), ";lkjasdf"),
+            arguments(Optional.empty(), "3.2"),
+            arguments(Optional.empty(), "#test#"),
+            arguments(Optional.empty(), "8,"),
+            arguments(Optional.empty(), "")
         );
     }
 
     @ParameterizedTest
     @MethodSource("parseGermanShortMonthTest")
-    public void parseGermanShortMonthTest(Optional<Month> expected, String input) {
+    public void parseGermanShortMonthTest(
+        Optional<Month> expected,
+        String input
+    ) {
         assertEquals(expected, Month.parseGermanShortMonth(input));
     }
 
     private static Stream<Arguments> parseGermanShortMonthTest() {
         return Stream.of(
-                arguments(Optional.of(Month.JANUARY), "jan"),
-                arguments(Optional.of(Month.JANUARY), "januar"),
-                arguments(Optional.of(Month.FEBRUARY), "feb"),
-                arguments(Optional.of(Month.FEBRUARY), "februar"),
-                arguments(Optional.of(Month.MARCH), "mär"),
-                arguments(Optional.of(Month.MARCH), "mae"),
-                arguments(Optional.of(Month.MARCH), "märz"),
-                arguments(Optional.of(Month.MARCH), "maerz"),
-                arguments(Optional.of(Month.APRIL), "apr"),
-                arguments(Optional.of(Month.APRIL), "april"),
-                arguments(Optional.of(Month.MAY), "mai"),
-                arguments(Optional.of(Month.JUNE), "jun"),
-                arguments(Optional.of(Month.JUNE), "juni"),
-                arguments(Optional.of(Month.JULY), "jul"),
-                arguments(Optional.of(Month.JULY), "juli"),
-                arguments(Optional.of(Month.AUGUST), "aug"),
-                arguments(Optional.of(Month.AUGUST), "august"),
-                arguments(Optional.of(Month.SEPTEMBER), "sep"),
-                arguments(Optional.of(Month.SEPTEMBER), "september"),
-                arguments(Optional.of(Month.OCTOBER), "okt"),
-                arguments(Optional.of(Month.OCTOBER), "oktober"),
-                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.JANUARY), "jan"),
+            arguments(Optional.of(Month.JANUARY), "januar"),
+            arguments(Optional.of(Month.FEBRUARY), "feb"),
+            arguments(Optional.of(Month.FEBRUARY), "februar"),
+            arguments(Optional.of(Month.MARCH), "mär"),
+            arguments(Optional.of(Month.MARCH), "mae"),
+            arguments(Optional.of(Month.MARCH), "märz"),
+            arguments(Optional.of(Month.MARCH), "maerz"),
+            arguments(Optional.of(Month.APRIL), "apr"),
+            arguments(Optional.of(Month.APRIL), "april"),
+            arguments(Optional.of(Month.MAY), "mai"),
+            arguments(Optional.of(Month.JUNE), "jun"),
+            arguments(Optional.of(Month.JUNE), "juni"),
+            arguments(Optional.of(Month.JULY), "jul"),
+            arguments(Optional.of(Month.JULY), "juli"),
+            arguments(Optional.of(Month.AUGUST), "aug"),
+            arguments(Optional.of(Month.AUGUST), "august"),
+            arguments(Optional.of(Month.SEPTEMBER), "sep"),
+            arguments(Optional.of(Month.SEPTEMBER), "september"),
+            arguments(Optional.of(Month.OCTOBER), "okt"),
+            arguments(Optional.of(Month.OCTOBER), "oktober"),
+            arguments(Optional.of(Month.NOVEMBER), "nov"),
+            arguments(Optional.of(Month.NOVEMBER), "november"),
+            arguments(Optional.of(Month.DECEMBER), "dez"),
+            arguments(Optional.of(Month.DECEMBER), "dezember")
         );
     }
 
@@ -211,39 +225,42 @@ public void getMonthByNumberTest(Optional<Month> expected, int input) {
 
     private static Stream<Arguments> getMonthByNumberTest() {
         return Stream.of(
-                arguments(Optional.empty(), -1),
-                arguments(Optional.empty(), 0),
-                arguments(Optional.of(Month.JANUARY), 1),
-                arguments(Optional.of(Month.FEBRUARY), 2),
-                arguments(Optional.of(Month.MARCH), 3),
-                arguments(Optional.of(Month.APRIL), 4),
-                arguments(Optional.of(Month.MAY), 5),
-                arguments(Optional.of(Month.JUNE), 6),
-                arguments(Optional.of(Month.JULY), 7),
-                arguments(Optional.of(Month.AUGUST), 8),
-                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.empty(), 13),
-                arguments(Optional.empty(), 14)
+            arguments(Optional.empty(), -1),
+            arguments(Optional.empty(), 0),
+            arguments(Optional.of(Month.JANUARY), 1),
+            arguments(Optional.of(Month.FEBRUARY), 2),
+            arguments(Optional.of(Month.MARCH), 3),
+            arguments(Optional.of(Month.APRIL), 4),
+            arguments(Optional.of(Month.MAY), 5),
+            arguments(Optional.of(Month.JUNE), 6),
+            arguments(Optional.of(Month.JULY), 7),
+            arguments(Optional.of(Month.AUGUST), 8),
+            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.empty(), 13),
+            arguments(Optional.empty(), 14)
         );
     }
 
     @ParameterizedTest
-    @MethodSource({"parseShortName", "getMonthByShortNameSpecialCases"})
-    public void getMonthByShortNameLowercaseTest(Optional<Month> expected, String input) {
+    @MethodSource({ "parseShortName", "getMonthByShortNameSpecialCases" })
+    public void getMonthByShortNameLowercaseTest(
+        Optional<Month> expected,
+        String input
+    ) {
         assertEquals(expected, Month.getMonthByShortName(input));
     }
 
     private static Stream<Arguments> getMonthByShortNameSpecialCases() {
         return Stream.of(
-                arguments(Optional.of(Month.JANUARY), "jan"),
-                arguments(Optional.of(Month.JANUARY), "Jan"),
-                arguments(Optional.of(Month.JANUARY), "JAN"),
-                arguments(Optional.empty(), ""),
-                arguments(Optional.empty(), "dez"),
-                arguments(Optional.empty(), "+*ç%&/()=.,:;-${}![]^'?~¦@#°§¬|¢äüö")
+            arguments(Optional.of(Month.JANUARY), "jan"),
+            arguments(Optional.of(Month.JANUARY), "Jan"),
+            arguments(Optional.of(Month.JANUARY), "JAN"),
+            arguments(Optional.empty(), ""),
+            arguments(Optional.empty(), "dez"),
+            arguments(Optional.empty(), "+*ç%&/()=.,:;-${}![]^'?~¦@#°§¬|¢äüö")
         );
     }
 
@@ -255,18 +272,18 @@ public void getShortNameTest(String expected, Month month) {
 
     private static Stream<Arguments> getShortNameTest() {
         return Stream.of(
-                arguments("jan", Month.JANUARY),
-                arguments("feb", Month.FEBRUARY),
-                arguments("mar", Month.MARCH),
-                arguments("apr", Month.APRIL),
-                arguments("may", Month.MAY),
-                arguments("jun", Month.JUNE),
-                arguments("jul", Month.JULY),
-                arguments("aug", Month.AUGUST),
-                arguments("sep", Month.SEPTEMBER),
-                arguments("oct", Month.OCTOBER),
-                arguments("nov", Month.NOVEMBER),
-                arguments("dec", Month.DECEMBER)
+            arguments("jan", Month.JANUARY),
+            arguments("feb", Month.FEBRUARY),
+            arguments("mar", Month.MARCH),
+            arguments("apr", Month.APRIL),
+            arguments("may", Month.MAY),
+            arguments("jun", Month.JUNE),
+            arguments("jul", Month.JULY),
+            arguments("aug", Month.AUGUST),
+            arguments("sep", Month.SEPTEMBER),
+            arguments("oct", Month.OCTOBER),
+            arguments("nov", Month.NOVEMBER),
+            arguments("dec", Month.DECEMBER)
         );
     }
 
@@ -278,18 +295,18 @@ public void getJabRefFormatTest(String expected, Month month) {
 
     private static Stream<Arguments> getJabRefFormatTest() {
         return Stream.of(
-                arguments("#jan#", Month.JANUARY),
-                arguments("#feb#", Month.FEBRUARY),
-                arguments("#mar#", Month.MARCH),
-                arguments("#apr#", Month.APRIL),
-                arguments("#may#", Month.MAY),
-                arguments("#jun#", Month.JUNE),
-                arguments("#jul#", Month.JULY),
-                arguments("#aug#", Month.AUGUST),
-                arguments("#sep#", Month.SEPTEMBER),
-                arguments("#oct#", Month.OCTOBER),
-                arguments("#nov#", Month.NOVEMBER),
-                arguments("#dec#", Month.DECEMBER)
+            arguments("#jan#", Month.JANUARY),
+            arguments("#feb#", Month.FEBRUARY),
+            arguments("#mar#", Month.MARCH),
+            arguments("#apr#", Month.APRIL),
+            arguments("#may#", Month.MAY),
+            arguments("#jun#", Month.JUNE),
+            arguments("#jul#", Month.JULY),
+            arguments("#aug#", Month.AUGUST),
+            arguments("#sep#", Month.SEPTEMBER),
+            arguments("#oct#", Month.OCTOBER),
+            arguments("#nov#", Month.NOVEMBER),
+            arguments("#dec#", Month.DECEMBER)
         );
     }
 
@@ -301,18 +318,18 @@ public void getNumberTest(int expected, Month month) {
 
     private static Stream<Arguments> getNumberTest() {
         return Stream.of(
-                arguments(1, Month.JANUARY),
-                arguments(2, Month.FEBRUARY),
-                arguments(3, Month.MARCH),
-                arguments(4, Month.APRIL),
-                arguments(5, Month.MAY),
-                arguments(6, Month.JUNE),
-                arguments(7, Month.JULY),
-                arguments(8, Month.AUGUST),
-                arguments(9, Month.SEPTEMBER),
-                arguments(10, Month.OCTOBER),
-                arguments(11, Month.NOVEMBER),
-                arguments(12, Month.DECEMBER)
+            arguments(1, Month.JANUARY),
+            arguments(2, Month.FEBRUARY),
+            arguments(3, Month.MARCH),
+            arguments(4, Month.APRIL),
+            arguments(5, Month.MAY),
+            arguments(6, Month.JUNE),
+            arguments(7, Month.JULY),
+            arguments(8, Month.AUGUST),
+            arguments(9, Month.SEPTEMBER),
+            arguments(10, Month.OCTOBER),
+            arguments(11, Month.NOVEMBER),
+            arguments(12, Month.DECEMBER)
         );
     }
 
@@ -324,18 +341,18 @@ public void getFullNameTest(String expected, Month month) {
 
     private static Stream<Arguments> getFullNameTest() {
         return Stream.of(
-                arguments("January", Month.JANUARY),
-                arguments("February", Month.FEBRUARY),
-                arguments("March", Month.MARCH),
-                arguments("April", Month.APRIL),
-                arguments("May", Month.MAY),
-                arguments("June", Month.JUNE),
-                arguments("July", Month.JULY),
-                arguments("August", Month.AUGUST),
-                arguments("September", Month.SEPTEMBER),
-                arguments("October", Month.OCTOBER),
-                arguments("November", Month.NOVEMBER),
-                arguments("December", Month.DECEMBER)
+            arguments("January", Month.JANUARY),
+            arguments("February", Month.FEBRUARY),
+            arguments("March", Month.MARCH),
+            arguments("April", Month.APRIL),
+            arguments("May", Month.MAY),
+            arguments("June", Month.JUNE),
+            arguments("July", Month.JULY),
+            arguments("August", Month.AUGUST),
+            arguments("September", Month.SEPTEMBER),
+            arguments("October", Month.OCTOBER),
+            arguments("November", Month.NOVEMBER),
+            arguments("December", Month.DECEMBER)
         );
     }
 
@@ -347,18 +364,18 @@ public void getTwoDigitNumberTest(String expected, Month month) {
 
     private static Stream<Arguments> getTwoDigitNumberTest() {
         return Stream.of(
-                arguments("01", Month.JANUARY),
-                arguments("02", Month.FEBRUARY),
-                arguments("03", Month.MARCH),
-                arguments("04", Month.APRIL),
-                arguments("05", Month.MAY),
-                arguments("06", Month.JUNE),
-                arguments("07", Month.JULY),
-                arguments("08", Month.AUGUST),
-                arguments("09", Month.SEPTEMBER),
-                arguments("10", Month.OCTOBER),
-                arguments("11", Month.NOVEMBER),
-                arguments("12", Month.DECEMBER)
+            arguments("01", Month.JANUARY),
+            arguments("02", Month.FEBRUARY),
+            arguments("03", Month.MARCH),
+            arguments("04", Month.APRIL),
+            arguments("05", Month.MAY),
+            arguments("06", Month.JUNE),
+            arguments("07", Month.JULY),
+            arguments("08", Month.AUGUST),
+            arguments("09", Month.SEPTEMBER),
+            arguments("10", Month.OCTOBER),
+            arguments("11", Month.NOVEMBER),
+            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 9775efda976..5c5d5b866dd 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,25 @@
 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 f218e3f82d7..79135a7e3f2 100644
--- a/src/test/java/org/jabref/model/entry/field/FieldFactoryTest.java
+++ b/src/test/java/org/jabref/model/entry/field/FieldFactoryTest.java
@@ -1,35 +1,53 @@
 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 java.util.stream.Stream;
 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;
-
 class FieldFactoryTest {
+
     @Test
     void testOrFieldsTwoTerms() {
-        assertEquals("Aaa/Bbb", FieldFactory.serializeOrFields(new UnknownField("aaa"), new UnknownField("bbb")));
+        assertEquals(
+            "Aaa/Bbb",
+            FieldFactory.serializeOrFields(
+                new UnknownField("aaa"),
+                new UnknownField("bbb")
+            )
+        );
     }
 
     @Test
     void testOrFieldsThreeTerms() {
-        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"),
-                // unknown field
-                Arguments.of(new UnknownField("cased", "cAsEd"), "cAsEd")
+            // comment fields
+            Arguments.of(
+                new UserSpecificCommentField("user1"),
+                "comment-user1"
+            ),
+            Arguments.of(
+                new UserSpecificCommentField("other-user-id"),
+                "comment-other-user-id"
+            ),
+            // unknown field
+            Arguments.of(new UnknownField("cased", "cAsEd"), "cAsEd")
         );
     }
 
@@ -41,11 +59,20 @@ void fieldsWithoutFieldProperties(Field expected, String name) {
 
     @Test
     void testDoesNotParseApaFieldWithoutEntryType() {
-        assertNotEquals(BiblatexApaField.ARTICLE, FieldFactory.parseField("article"));
+        assertNotEquals(
+            BiblatexApaField.ARTICLE,
+            FieldFactory.parseField("article")
+        );
     }
 
     @Test
     void testDoesParseApaFieldWithEntryType() {
-        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 eacd5ef3e27..db95c43df9d 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,18 @@
 package org.jabref.model.entry.field;
 
-import java.util.Optional;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
+import java.util.Optional;
 import org.junit.jupiter.api.Test;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-
 public class SpecialFieldTest {
 
     @Test
     public 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 4ea68752d79..1c459a37ad4 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 1b6ca0212c0..fd8a573541f 100644
--- a/src/test/java/org/jabref/model/entry/field/UnknownFieldTest.java
+++ b/src/test/java/org/jabref/model/entry/field/UnknownFieldTest.java
@@ -1,10 +1,11 @@
 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() {
         assertEquals(new UnknownField("title"), new UnknownField("title"));
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 d6892808fef..3e3a49cfac1 100644
--- a/src/test/java/org/jabref/model/entry/identifier/ArXivIdentifierTest.java
+++ b/src/test/java/org/jabref/model/entry/identifier/ArXivIdentifierTest.java
@@ -1,12 +1,11 @@
 package org.jabref.model.entry.identifier;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
 import java.net.URI;
 import java.util.Optional;
-
 import org.junit.jupiter.api.Test;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-
 class ArXivIdentifierTest {
 
     @Test
@@ -18,91 +17,152 @@ void parse() throws Exception {
 
     @Test
     void parseWithArXivPrefix() throws Exception {
-        Optional<ArXivIdentifier> parsed = ArXivIdentifier.parse("arXiv:0710.0994");
+        Optional<ArXivIdentifier> parsed = ArXivIdentifier.parse(
+            "arXiv:0710.0994"
+        );
 
         assertEquals(Optional.of(new ArXivIdentifier("0710.0994")), parsed);
     }
 
     @Test
     void parseWithArxivPrefix() throws Exception {
-        Optional<ArXivIdentifier> parsed = ArXivIdentifier.parse("arxiv:0710.0994");
+        Optional<ArXivIdentifier> parsed = ArXivIdentifier.parse(
+            "arxiv:0710.0994"
+        );
 
         assertEquals(Optional.of(new ArXivIdentifier("0710.0994")), parsed);
     }
 
     @Test
     void parseWithClassification() throws Exception {
-        Optional<ArXivIdentifier> parsed = ArXivIdentifier.parse("0706.0001v1 [q-bio.CB]");
-
-        assertEquals(Optional.of(new ArXivIdentifier("0706.0001", "1", "q-bio.CB")), parsed);
+        Optional<ArXivIdentifier> parsed = ArXivIdentifier.parse(
+            "0706.0001v1 [q-bio.CB]"
+        );
+
+        assertEquals(
+            Optional.of(new ArXivIdentifier("0706.0001", "1", "q-bio.CB")),
+            parsed
+        );
     }
 
     @Test
     void parseWithArXivPrefixAndClassification() throws Exception {
-        Optional<ArXivIdentifier> parsed = ArXivIdentifier.parse("arXiv:0706.0001v1 [q-bio.CB]");
-
-        assertEquals(Optional.of(new ArXivIdentifier("0706.0001", "1", "q-bio.CB")), parsed);
+        Optional<ArXivIdentifier> parsed = ArXivIdentifier.parse(
+            "arXiv:0706.0001v1 [q-bio.CB]"
+        );
+
+        assertEquals(
+            Optional.of(new ArXivIdentifier("0706.0001", "1", "q-bio.CB")),
+            parsed
+        );
     }
 
     @Test
     void parseOldIdentifier() throws Exception {
-        Optional<ArXivIdentifier> parsed = ArXivIdentifier.parse("math.GT/0309136");
-
-        assertEquals(Optional.of(new ArXivIdentifier("math.GT/0309136", "math.GT")), parsed);
+        Optional<ArXivIdentifier> parsed = ArXivIdentifier.parse(
+            "math.GT/0309136"
+        );
+
+        assertEquals(
+            Optional.of(new ArXivIdentifier("math.GT/0309136", "math.GT")),
+            parsed
+        );
     }
 
     @Test
     public void acceptLegacyEprint() {
-        Optional<ArXivIdentifier> parsed = ArXivIdentifier.parse("astro-ph.GT/1234567");
-        assertEquals(Optional.of(new ArXivIdentifier("astro-ph.GT/1234567", "astro-ph.GT")), parsed);
+        Optional<ArXivIdentifier> parsed = ArXivIdentifier.parse(
+            "astro-ph.GT/1234567"
+        );
+        assertEquals(
+            Optional.of(
+                new ArXivIdentifier("astro-ph.GT/1234567", "astro-ph.GT")
+            ),
+            parsed
+        );
     }
 
     @Test
     public void acceptLegacyMathEprint() {
-        Optional<ArXivIdentifier> parsed = ArXivIdentifier.parse("math/1234567");
-        assertEquals(Optional.of(new ArXivIdentifier("math/1234567", "math")), parsed);
+        Optional<ArXivIdentifier> parsed = ArXivIdentifier.parse(
+            "math/1234567"
+        );
+        assertEquals(
+            Optional.of(new ArXivIdentifier("math/1234567", "math")),
+            parsed
+        );
     }
 
     @Test
     void parseOldIdentifierWithArXivPrefix() throws Exception {
-        Optional<ArXivIdentifier> parsed = ArXivIdentifier.parse("arXiv:math.GT/0309136");
-
-        assertEquals(Optional.of(new ArXivIdentifier("math.GT/0309136", "math.GT")), parsed);
+        Optional<ArXivIdentifier> parsed = ArXivIdentifier.parse(
+            "arXiv:math.GT/0309136"
+        );
+
+        assertEquals(
+            Optional.of(new ArXivIdentifier("math.GT/0309136", "math.GT")),
+            parsed
+        );
     }
 
     @Test
     void parseUrl() throws Exception {
-        Optional<ArXivIdentifier> parsed = ArXivIdentifier.parse("http://arxiv.org/abs/1502.05795");
-
-        assertEquals(Optional.of(new ArXivIdentifier("1502.05795", "")), parsed);
+        Optional<ArXivIdentifier> parsed = ArXivIdentifier.parse(
+            "http://arxiv.org/abs/1502.05795"
+        );
+
+        assertEquals(
+            Optional.of(new ArXivIdentifier("1502.05795", "")),
+            parsed
+        );
     }
 
     @Test
     void parseHttpsUrl() throws Exception {
-        Optional<ArXivIdentifier> parsed = ArXivIdentifier.parse("https://arxiv.org/abs/1502.05795");
-
-        assertEquals(Optional.of(new ArXivIdentifier("1502.05795", "")), parsed);
+        Optional<ArXivIdentifier> parsed = ArXivIdentifier.parse(
+            "https://arxiv.org/abs/1502.05795"
+        );
+
+        assertEquals(
+            Optional.of(new ArXivIdentifier("1502.05795", "")),
+            parsed
+        );
     }
 
     @Test
     void parsePdfUrl() throws Exception {
-        Optional<ArXivIdentifier> parsed = ArXivIdentifier.parse("http://arxiv.org/pdf/1502.05795");
-
-        assertEquals(Optional.of(new ArXivIdentifier("1502.05795", "")), parsed);
+        Optional<ArXivIdentifier> parsed = ArXivIdentifier.parse(
+            "http://arxiv.org/pdf/1502.05795"
+        );
+
+        assertEquals(
+            Optional.of(new ArXivIdentifier("1502.05795", "")),
+            parsed
+        );
     }
 
     @Test
     void parseUrlWithVersion() throws Exception {
-        Optional<ArXivIdentifier> parsed = ArXivIdentifier.parse("http://arxiv.org/abs/1502.05795v1");
-
-        assertEquals(Optional.of(new ArXivIdentifier("1502.05795", "1", "")), parsed);
+        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");
-
-        assertEquals(Optional.of(new ArXivIdentifier("hep-ex/0307015", "1", "hep-ex")), parsed);
+        Optional<ArXivIdentifier> parsed = ArXivIdentifier.parse(
+            "http://arxiv.org/pdf/hep-ex/0307015v1"
+        );
+
+        assertEquals(
+            Optional.of(new ArXivIdentifier("hep-ex/0307015", "1", "hep-ex")),
+            parsed
+        );
     }
 
     @Test
@@ -120,54 +180,86 @@ public void acceptPlainEprint() {
     @Test
     public void acceptPlainEprintWithVersion() {
         Optional<ArXivIdentifier> parsed = ArXivIdentifier.parse("0706.0001v1");
-        assertEquals(Optional.of(new ArXivIdentifier("0706.0001", "v1", "")), parsed);
+        assertEquals(
+            Optional.of(new ArXivIdentifier("0706.0001", "v1", "")),
+            parsed
+        );
     }
 
     @Test
     public void acceptArxivPrefix() {
-        Optional<ArXivIdentifier> parsed = ArXivIdentifier.parse("arXiv:0706.0001v1");
-        assertEquals(Optional.of(new ArXivIdentifier("0706.0001", "v1", "")), parsed);
+        Optional<ArXivIdentifier> parsed = ArXivIdentifier.parse(
+            "arXiv:0706.0001v1"
+        );
+        assertEquals(
+            Optional.of(new ArXivIdentifier("0706.0001", "v1", "")),
+            parsed
+        );
     }
 
     @Test
     public void ignoreLeadingAndTrailingWhitespaces() {
-        Optional<ArXivIdentifier> parsed = ArXivIdentifier.parse("  0706.0001v1 ");
-        assertEquals(Optional.of(new ArXivIdentifier("0706.0001", "v1", "")), parsed);
+        Optional<ArXivIdentifier> parsed = ArXivIdentifier.parse(
+            "  0706.0001v1 "
+        );
+        assertEquals(
+            Optional.of(new ArXivIdentifier("0706.0001", "v1", "")),
+            parsed
+        );
     }
 
     @Test
     public void rejectEmbeddedEprint() {
-        Optional<ArXivIdentifier> parsed = ArXivIdentifier.parse("other stuff 0706.0001v1 end");
+        Optional<ArXivIdentifier> parsed = ArXivIdentifier.parse(
+            "other stuff 0706.0001v1 end"
+        );
         assertEquals(Optional.empty(), parsed);
     }
 
     @Test
     public void rejectInvalidEprint() {
-        Optional<ArXivIdentifier> parsed = ArXivIdentifier.parse("https://thisisnouri");
+        Optional<ArXivIdentifier> parsed = ArXivIdentifier.parse(
+            "https://thisisnouri"
+        );
         assertEquals(Optional.empty(), parsed);
     }
 
     @Test
     public void acceptUrlHttpEprint() {
-        Optional<ArXivIdentifier> parsed = ArXivIdentifier.parse("http://arxiv.org/abs/0706.0001v1");
-        assertEquals(Optional.of(new ArXivIdentifier("0706.0001", "v1", "")), parsed);
+        Optional<ArXivIdentifier> parsed = ArXivIdentifier.parse(
+            "http://arxiv.org/abs/0706.0001v1"
+        );
+        assertEquals(
+            Optional.of(new ArXivIdentifier("0706.0001", "v1", "")),
+            parsed
+        );
     }
 
     @Test
     public void acceptUrlHttpsEprint() {
-        Optional<ArXivIdentifier> parsed = ArXivIdentifier.parse("https://arxiv.org/abs/0706.0001v1");
-        assertEquals(Optional.of(new ArXivIdentifier("0706.0001", "v1", "")), parsed);
+        Optional<ArXivIdentifier> parsed = ArXivIdentifier.parse(
+            "https://arxiv.org/abs/0706.0001v1"
+        );
+        assertEquals(
+            Optional.of(new ArXivIdentifier("0706.0001", "v1", "")),
+            parsed
+        );
     }
 
     @Test
     public 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
     public 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 544844845de..6e20e30394e 100644
--- a/src/test/java/org/jabref/model/entry/identifier/DOITest.java
+++ b/src/test/java/org/jabref/model/entry/identifier/DOITest.java
@@ -1,208 +1,482 @@
 package org.jabref.model.entry.identifier;
 
+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;
-
 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;
-
 public class DOITest {
 
     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.1126/sciadv.1500214", new DOI("10.1126/sciadv.1500214").getDOI()),
-
-                // PlainShortDoi
-                Arguments.of("10/gf4gqc", new DOI("10/gf4gqc").getDOI()),
-                Arguments.of("10/1000", new DOI("10/1000").getDOI()),
-                Arguments.of("10/aaaa", new DOI("10/aaaa").getDOI()),
-                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()),
-
-                // 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()),
-
-                // acceptDoiPrefixInShortDoi
-                Arguments.of("10/gf4gqc", new DOI("doi:10/gf4gqc").getDOI()),
-
-                // acceptURNPrefix
-                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()),
-
-                // acceptShortcutShortDoi
-                Arguments.of("10/d8dn", new DOI("https://doi.org/d8dn").getDOI()),
-                Arguments.of("10/d8dn", new DOI(" https://doi.org/d8dn  ").getDOI()),
-                Arguments.of("10/d8dn", new DOI("doi.org/d8dn").getDOI()),
-                Arguments.of("10/d8dn", new DOI("www.doi.org/d8dn").getDOI()),
-                Arguments.of("10/d8dn", new DOI("  doi.org/d8dn ").getDOI()),
-
-                // acceptURNPrefixInShortDoi
-                Arguments.of("10/gf4gqc", new DOI("urn:10/gf4gqc").getDOI()),
-                Arguments.of("10/gf4gqc", new DOI("doi:10/gf4gqc").getDOI()),
-                Arguments.of("10/gf4gqc", new DOI("urn:doi:10/gf4gqc").getDOI()),
-                Arguments.of("10/gf4gqc", new DOI("http://doi.org/urn:doi:10/gf4gqc").getDOI()),
-                // : is also allowed as divider, will be replaced by RESOLVER
-                Arguments.of("10:gf4gqc", new DOI("http://doi.org/urn:doi:10:gf4gqc").getDOI()),
-
-                // acceptURLDoi
-                // http
-                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()),
-                // https with % divider
-                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",
-                        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",
-                        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",
-                        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",
-                        new DOI("http://dx.doi.de/10.1007/978-3-642-15618-2_19").getDOI()),
-                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",
-                        new DOI("http://doi.ieeecomputersociety.org/10.1109/MIC.2012.43").getDOI()),
-
-                // acceptURLShortDoi
-                // http
-                Arguments.of("10/gf4gqc", new DOI("http://doi.org/10/gf4gqc").getDOI()),
-                // https
-                Arguments.of("10/gf4gqc", new DOI("https://doi.org/10/gf4gqc").getDOI()),
-                // https with % divider
-                Arguments.of("10/gf4gqc", new DOI("https://dx.doi.org/10%2Fgf4gqc").getDOI()),
-                // other domains
-                Arguments.of("10/gf4gqc", new DOI("http://doi.acm.org/10/gf4gqc").getDOI()),
-                Arguments.of("10/gf4gqc", new DOI("www.doi.acm.org/10/gf4gqc").getDOI()),
-                Arguments.of("10/gf4gqc", new DOI("doi.acm.org/10/gf4gqc").getDOI()),
-                Arguments.of("10/gf4gqc", new DOI("10/gf4gqc").getDOI()),
-                Arguments.of("10/gf4gqc", new DOI("/10/gf4gqc").getDOI()),
-                Arguments.of("10/gf4gqc", new DOI(" /10/gf4gqc").getDOI()),
-                Arguments.of("10/gf4gqc", new DOI(" 10/gf4gqc").getDOI()),
-                Arguments.of("10/gf4gqc", new DOI("http://doi.acm.net/10/gf4gqc").getDOI()),
-                Arguments.of("10/gf4gqc", new DOI("http://doi.acm.com/10/gf4gqc").getDOI()),
-                Arguments.of("10/gf4gqc", new DOI("http://doi.acm.de/10/gf4gqc").getDOI()),
-                Arguments.of("10/gf4gqc", new DOI("http://dx.doi.org/10/gf4gqc").getDOI()),
-                Arguments.of("10/gf4gqc", new DOI("http://dx.doi.net/10/gf4gqc").getDOI()),
-                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()),
-
-                // 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()),
-                // parse short DOI with whitespace
-                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("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 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",
-                        new DOI("https://doi.org/10.1006/rwei.1999%25.0001").getURIAsASCIIString()),
-                // " -> (%22)
-                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",
-                        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",
-                        new DOI("https://doi.org/10.1006/rwei.1999%20.0001").getURIAsASCIIString()),
-                // ? -> (%3F)
-                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",
-                        new DOI("10.1006/jmbi.1998.2354").getURIAsASCIIString()),
-                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",
-                        new DOI("doi:10.1109/VLHCC.2004.20").getURIAsASCIIString()),
-
-                // constructCorrectURLForShortDoi
-                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()),
-                // " -> (%22)
-                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()),
-                // SPACE -> (%20)
-                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()),
-
-                // findDoiInsideArbitraryText
-                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()),
-
-                // 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" +
+            // 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.1126/sciadv.1500214",
+                new DOI("10.1126/sciadv.1500214").getDOI()
+            ),
+            // PlainShortDoi
+            Arguments.of("10/gf4gqc", new DOI("10/gf4gqc").getDOI()),
+            Arguments.of("10/1000", new DOI("10/1000").getDOI()),
+            Arguments.of("10/aaaa", new DOI("10/aaaa").getDOI()),
+            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()
+            ),
+            // 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()
+            ),
+            // acceptDoiPrefixInShortDoi
+            Arguments.of("10/gf4gqc", new DOI("doi:10/gf4gqc").getDOI()),
+            // acceptURNPrefix
+            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()
+            ),
+            // acceptShortcutShortDoi
+            Arguments.of("10/d8dn", new DOI("https://doi.org/d8dn").getDOI()),
+            Arguments.of(
+                "10/d8dn",
+                new DOI(" https://doi.org/d8dn  ").getDOI()
+            ),
+            Arguments.of("10/d8dn", new DOI("doi.org/d8dn").getDOI()),
+            Arguments.of("10/d8dn", new DOI("www.doi.org/d8dn").getDOI()),
+            Arguments.of("10/d8dn", new DOI("  doi.org/d8dn ").getDOI()),
+            // acceptURNPrefixInShortDoi
+            Arguments.of("10/gf4gqc", new DOI("urn:10/gf4gqc").getDOI()),
+            Arguments.of("10/gf4gqc", new DOI("doi:10/gf4gqc").getDOI()),
+            Arguments.of("10/gf4gqc", new DOI("urn:doi:10/gf4gqc").getDOI()),
+            Arguments.of(
+                "10/gf4gqc",
+                new DOI("http://doi.org/urn:doi:10/gf4gqc").getDOI()
+            ),
+            // : is also allowed as divider, will be replaced by RESOLVER
+            Arguments.of(
+                "10:gf4gqc",
+                new DOI("http://doi.org/urn:doi:10:gf4gqc").getDOI()
+            ),
+            // acceptURLDoi
+            // http
+            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()
+            ),
+            // https with % divider
+            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",
+                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",
+                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",
+                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",
+                new DOI("http://dx.doi.de/10.1007/978-3-642-15618-2_19")
+                    .getDOI()
+            ),
+            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",
+                new DOI(
+                    "http://doi.ieeecomputersociety.org/10.1109/MIC.2012.43"
+                )
+                    .getDOI()
+            ),
+            // acceptURLShortDoi
+            // http
+            Arguments.of(
+                "10/gf4gqc",
+                new DOI("http://doi.org/10/gf4gqc").getDOI()
+            ),
+            // https
+            Arguments.of(
+                "10/gf4gqc",
+                new DOI("https://doi.org/10/gf4gqc").getDOI()
+            ),
+            // https with % divider
+            Arguments.of(
+                "10/gf4gqc",
+                new DOI("https://dx.doi.org/10%2Fgf4gqc").getDOI()
+            ),
+            // other domains
+            Arguments.of(
+                "10/gf4gqc",
+                new DOI("http://doi.acm.org/10/gf4gqc").getDOI()
+            ),
+            Arguments.of(
+                "10/gf4gqc",
+                new DOI("www.doi.acm.org/10/gf4gqc").getDOI()
+            ),
+            Arguments.of(
+                "10/gf4gqc",
+                new DOI("doi.acm.org/10/gf4gqc").getDOI()
+            ),
+            Arguments.of("10/gf4gqc", new DOI("10/gf4gqc").getDOI()),
+            Arguments.of("10/gf4gqc", new DOI("/10/gf4gqc").getDOI()),
+            Arguments.of("10/gf4gqc", new DOI(" /10/gf4gqc").getDOI()),
+            Arguments.of("10/gf4gqc", new DOI(" 10/gf4gqc").getDOI()),
+            Arguments.of(
+                "10/gf4gqc",
+                new DOI("http://doi.acm.net/10/gf4gqc").getDOI()
+            ),
+            Arguments.of(
+                "10/gf4gqc",
+                new DOI("http://doi.acm.com/10/gf4gqc").getDOI()
+            ),
+            Arguments.of(
+                "10/gf4gqc",
+                new DOI("http://doi.acm.de/10/gf4gqc").getDOI()
+            ),
+            Arguments.of(
+                "10/gf4gqc",
+                new DOI("http://dx.doi.org/10/gf4gqc").getDOI()
+            ),
+            Arguments.of(
+                "10/gf4gqc",
+                new DOI("http://dx.doi.net/10/gf4gqc").getDOI()
+            ),
+            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()
+            ),
+            // 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()
+            ),
+            // parse short DOI with whitespace
+            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(
+                "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 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",
+                new DOI("https://doi.org/10.1006/rwei.1999%25.0001")
+                    .getURIAsASCIIString()
+            ),
+            // " -> (%22)
+            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",
+                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",
+                new DOI("https://doi.org/10.1006/rwei.1999%20.0001")
+                    .getURIAsASCIIString()
+            ),
+            // ? -> (%3F)
+            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",
+                new DOI("10.1006/jmbi.1998.2354").getURIAsASCIIString()
+            ),
+            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",
+                new DOI("doi:10.1109/VLHCC.2004.20").getURIAsASCIIString()
+            ),
+            // constructCorrectURLForShortDoi
+            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()
+            ),
+            // " -> (%22)
+            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()
+            ),
+            // SPACE -> (%20)
+            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()
+            ),
+            // findDoiInsideArbitraryText
+            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()
+            ),
+            // 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()),
-
-                // 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())
+                        "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()
+            )
         );
     }
 
@@ -214,7 +488,10 @@ public void testEquals(String expected, String input) {
 
     @Test
     public void equalsWorksFor2017Doi() {
-        assertEquals(new DOI("10.1109/cloud.2017.89"), new DOI("10.1109/CLOUD.2017.89"));
+        assertEquals(
+            new DOI("10.1109/cloud.2017.89"),
+            new DOI("10.1109/CLOUD.2017.89")
+        );
     }
 
     @Test
@@ -224,17 +501,41 @@ public void isShortDoiShouldReturnTrueWhenItIsShortDoi() {
 
     @Test
     public void noDOIFoundInsideArbitraryText() {
-        assertEquals(Optional.empty(), DOI.findInText("text without 28282 a doi"));
+        assertEquals(
+            Optional.empty(),
+            DOI.findInText("text without 28282 a doi")
+        );
         assertEquals(Optional.empty(), DOI.findInText("It's 10:30 o'clock"));
-        assertEquals(Optional.empty(), DOI.findInText("...archive number 10/XYZ/123..."));
-        assertEquals(Optional.empty(), DOI.findInText("some website poi.org/ab123 end"));
+        assertEquals(
+            Optional.empty(),
+            DOI.findInText("...archive number 10/XYZ/123...")
+        );
+        assertEquals(
+            Optional.empty(),
+            DOI.findInText("some website poi.org/ab123 end")
+        );
     }
 
     @Test
     public 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
@@ -244,21 +545,39 @@ public void isShortDoiShouldReturnFalseWhenItIsDoi() {
 
     @Test
     public 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
     public void rejectEmbeddedShortDoi() {
-        assertThrows(IllegalArgumentException.class, () -> new DOI("other stuff 10/gf4gqc end"));
-        assertThrows(IllegalArgumentException.class, () -> new DOI("10/2021/01"));
-        assertThrows(IllegalArgumentException.class, () -> new DOI("01/10/2021"));
-        assertThrows(IllegalArgumentException.class, () -> new DOI("https://www.abc.de/10/abcd"));
+        assertThrows(
+            IllegalArgumentException.class,
+            () -> new DOI("other stuff 10/gf4gqc end")
+        );
+        assertThrows(
+            IllegalArgumentException.class,
+            () -> new DOI("10/2021/01")
+        );
+        assertThrows(
+            IllegalArgumentException.class,
+            () -> new DOI("01/10/2021")
+        );
+        assertThrows(
+            IllegalArgumentException.class,
+            () -> new DOI("https://www.abc.de/10/abcd")
+        );
     }
 
     @Test
     public void rejectInvalidDirectoryIndicator() {
         // wrong directory indicator
-        assertThrows(IllegalArgumentException.class, () -> new DOI("12.1006/jmbi.1998.2354 end"));
+        assertThrows(
+            IllegalArgumentException.class,
+            () -> new DOI("12.1006/jmbi.1998.2354 end")
+        );
     }
 
     @Test
@@ -268,24 +587,33 @@ public void rejectInvalidDirectoryIndicatorInShortDoi() {
 
     @Test
     public 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
     public void rejectInvalidDoiUri() {
-        assertThrows(IllegalArgumentException.class, () -> new DOI("https://thisisnouri"));
+        assertThrows(
+            IllegalArgumentException.class,
+            () -> new DOI("https://thisisnouri")
+        );
     }
 
     @Test
     public void rejectMissingDivider() {
         // missing divider
-        assertThrows(IllegalArgumentException.class, () -> new DOI("10.1006jmbi.1998.2354 end"));
+        assertThrows(
+            IllegalArgumentException.class,
+            () -> new DOI("10.1006jmbi.1998.2354 end")
+        );
     }
 
     @Test
     public void rejectMissingDividerInShortDoi() {
-        assertThrows(IllegalArgumentException.class, () -> new DOI("10gf4gqc end"));
+        assertThrows(
+            IllegalArgumentException.class,
+            () -> new DOI("10gf4gqc end")
+        );
     }
 }
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 55dcfe847ca..d820287483a 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;
+
 public 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 d585552e5fe..316d2cae174 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;
+
 public 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 cd8c8731c94..cc04fec863f 100644
--- a/src/test/java/org/jabref/model/entry/identifier/IacrEprintTest.java
+++ b/src/test/java/org/jabref/model/entry/identifier/IacrEprintTest.java
@@ -1,59 +1,64 @@
 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 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.assertThrows;
-
 public 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
     public void rejectInvalidIacrEprint() {
-        assertThrows(IllegalArgumentException.class, () -> new IacrEprint("2021/12"));
+        assertThrows(
+            IllegalArgumentException.class,
+            () -> new IacrEprint("2021/12")
+        );
     }
 
     @ParameterizedTest(name = "{index} {0}")
     @MethodSource("provideTestData")
-    public void acceptCorrectIacrEprintIdentifier(String name, String identifier) {
+    public void acceptCorrectIacrEprintIdentifier(
+        String name,
+        String identifier
+    ) {
         assertEquals("2019/001", new IacrEprint(identifier).getNormalized());
     }
 
     @Test
     public void constructValidIacrEprintUrl() {
-        assertEquals("https://ia.cr/2019/001", new IacrEprint("2019/001").getAsciiUrl());
+        assertEquals(
+            "https://ia.cr/2019/001",
+            new IacrEprint("2019/001").getAsciiUrl()
+        );
     }
 }
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 5ec57641415..b1f1f4f7bd9 100644
--- a/src/test/java/org/jabref/model/entry/identifier/MathSciNetIdTest.java
+++ b/src/test/java/org/jabref/model/entry/identifier/MathSciNetIdTest.java
@@ -1,11 +1,10 @@
 package org.jabref.model.entry.identifier;
 
-import java.util.Optional;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
+import java.util.Optional;
 import org.junit.jupiter.api.Test;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-
 public class MathSciNetIdTest {
 
     @Test
diff --git a/src/test/java/org/jabref/model/event/EventListenerTest.java b/src/test/java/org/jabref/model/event/EventListenerTest.java
index 598e784b7f5..3d125dbbc57 100644
--- a/src/test/java/org/jabref/model/event/EventListenerTest.java
+++ b/src/test/java/org/jabref/model/event/EventListenerTest.java
@@ -1,14 +1,12 @@
 package org.jabref.model.event;
 
+import com.google.common.eventbus.Subscribe;
 import java.util.List;
-
 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;
-
 public class EventListenerTest {
 
     private List<BibEntry> addedEntries;
diff --git a/src/test/java/org/jabref/model/groups/AutomaticKeywordGroupTest.java b/src/test/java/org/jabref/model/groups/AutomaticKeywordGroupTest.java
index a6a84698ff2..74fba4a5bc9 100644
--- a/src/test/java/org/jabref/model/groups/AutomaticKeywordGroupTest.java
+++ b/src/test/java/org/jabref/model/groups/AutomaticKeywordGroupTest.java
@@ -1,21 +1,26 @@
 package org.jabref.model.groups;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
 import java.util.HashSet;
 import java.util.Set;
-
 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 AutomaticKeywordGroupTest {
 
     @Test
     void createSubgroupsForTwoKeywords() throws Exception {
-        AutomaticKeywordGroup keywordsGroup = new AutomaticKeywordGroup("Keywords", GroupHierarchyType.INDEPENDENT, StandardField.KEYWORDS, ',', '>');
-        BibEntry entry = new BibEntry().withField(StandardField.KEYWORDS, "A, B");
+        AutomaticKeywordGroup keywordsGroup = new AutomaticKeywordGroup(
+            "Keywords",
+            GroupHierarchyType.INDEPENDENT,
+            StandardField.KEYWORDS,
+            ',',
+            '>'
+        );
+        BibEntry entry = new BibEntry()
+            .withField(StandardField.KEYWORDS, "A, B");
 
         Set<GroupTreeNode> expected = createIncludingKeywordsSubgroup();
 
@@ -24,8 +29,15 @@ void createSubgroupsForTwoKeywords() throws Exception {
 
     @Test
     void createSubgroupsIgnoresEmptyKeyword() throws Exception {
-        AutomaticKeywordGroup keywordsGroup = new AutomaticKeywordGroup("Keywords", GroupHierarchyType.INDEPENDENT, StandardField.KEYWORDS, ',', '>');
-        BibEntry entry = new BibEntry().withField(StandardField.KEYWORDS, "A, ,B");
+        AutomaticKeywordGroup keywordsGroup = new AutomaticKeywordGroup(
+            "Keywords",
+            GroupHierarchyType.INDEPENDENT,
+            StandardField.KEYWORDS,
+            ',',
+            '>'
+        );
+        BibEntry entry = new BibEntry()
+            .withField(StandardField.KEYWORDS, "A, ,B");
 
         Set<GroupTreeNode> expected = createIncludingKeywordsSubgroup();
 
@@ -34,8 +46,32 @@ 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 6bceb4625d7..765857de613 100644
--- a/src/test/java/org/jabref/model/groups/AutomaticPersonsGroupTest.java
+++ b/src/test/java/org/jabref/model/groups/AutomaticPersonsGroupTest.java
@@ -1,55 +1,87 @@
 package org.jabref.model.groups;
 
+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;
-
 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;
-
 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);
+
+    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);
     }
 
     @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));
     }
 
     @Test
     void createSubgroupFromLatex() {
-        BibEntry bibEntry = new BibEntry().withField(StandardField.AUTHOR, "Kurt G{\\\"{o}}del");
-        var subgroup = new AutomaticPersonsGroup("", GroupHierarchyType.INDEPENDENT, StandardField.AUTHOR).createSubgroups(bibEntry);
+        BibEntry bibEntry = new BibEntry()
+            .withField(StandardField.AUTHOR, "Kurt G{\\\"{o}}del");
+        var subgroup = new AutomaticPersonsGroup(
+            "",
+            GroupHierarchyType.INDEPENDENT,
+            StandardField.AUTHOR
+        )
+            .createSubgroups(bibEntry);
         var expectedSubgroup = createPersonSubGroupFrom("Gödel");
         assertThat(subgroup, contains(expectedSubgroup));
     }
 
     @Test
     void createSubgroupFromUnicode() {
-        BibEntry bibEntry = new BibEntry().withField(StandardField.AUTHOR, "Kurt Gödel");
-        var subgroup = new AutomaticPersonsGroup("", GroupHierarchyType.INDEPENDENT, StandardField.AUTHOR).createSubgroups(bibEntry);
+        BibEntry bibEntry = new BibEntry()
+            .withField(StandardField.AUTHOR, "Kurt Gödel");
+        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 e629b7dfc76..b5e7c2a6a11 100644
--- a/src/test/java/org/jabref/model/groups/ExplicitGroupTest.java
+++ b/src/test/java/org/jabref/model/groups/ExplicitGroupTest.java
@@ -1,17 +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 java.util.Optional;
 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;
-
 class ExplicitGroupTest {
 
     private ExplicitGroup group;
@@ -21,64 +19,92 @@ class ExplicitGroupTest {
 
     @BeforeEach
     void setUp() {
-        group = new ExplicitGroup("myExplicitGroup", GroupHierarchyType.INDEPENDENT, ',');
-        group2 = new ExplicitGroup("myExplicitGroup2", GroupHierarchyType.INCLUDING, ',');
+        group =
+            new ExplicitGroup(
+                "myExplicitGroup",
+                GroupHierarchyType.INDEPENDENT,
+                ','
+            );
+        group2 =
+            new ExplicitGroup(
+                "myExplicitGroup2",
+                GroupHierarchyType.INCLUDING,
+                ','
+            );
         entry = new BibEntry();
     }
 
     @Test
     void addSingleGroupToEmptyBibEntryChangesGroupsField() {
         group.add(entry);
-        assertEquals(Optional.of("myExplicitGroup"), entry.getField(StandardField.GROUPS));
+        assertEquals(
+            Optional.of("myExplicitGroup"),
+            entry.getField(StandardField.GROUPS)
+        );
     }
 
     @Test
     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
     void addDuplicateGroupDoesNotChangeGroupsField() throws Exception {
         entry.setField(StandardField.GROUPS, "myExplicitGroup");
         group.add(entry);
-        assertEquals(Optional.of("myExplicitGroup"), entry.getField(StandardField.GROUPS));
+        assertEquals(
+            Optional.of("myExplicitGroup"),
+            entry.getField(StandardField.GROUPS)
+        );
     }
 
     @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 +112,14 @@ 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 8878219ecda..2a69fa5ab75 100644
--- a/src/test/java/org/jabref/model/groups/GroupTreeNodeTest.java
+++ b/src/test/java/org/jabref/model/groups/GroupTreeNodeTest.java
@@ -1,12 +1,15 @@
 package org.jabref.model.groups;
 
+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;
-
 import org.jabref.model.FieldChange;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.field.StandardField;
@@ -14,14 +17,9 @@
 import org.jabref.model.search.matchers.OrMatcher;
 import org.jabref.model.search.rules.SearchRules;
 import org.jabref.model.search.rules.SearchRules.SearchFlags;
-
 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;
-
 public class GroupTreeNodeTest {
 
     private final List<BibEntry> entries = new ArrayList<>();
@@ -35,10 +33,19 @@ public class GroupTreeNodeTest {
      *          B ExplicitNode, Refining (<-- this)
      */
     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, ','));
+        root.addSubgroup(
+            new ExplicitGroup("ExplicitA", GroupHierarchyType.INCLUDING, ',')
+        );
+        GroupTreeNode parent = root.addSubgroup(
+            new ExplicitGroup(
+                "ExplicitParent",
+                GroupHierarchyType.INDEPENDENT,
+                ','
+            )
+        );
+        return parent.addSubgroup(
+            new ExplicitGroup("ExplicitNode", GroupHierarchyType.REFINING, ',')
+        );
     }
 
     /**
@@ -60,13 +67,22 @@ 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, ','));
+        root.addSubgroup(
+            new ExplicitGroup("ExplicitA", GroupHierarchyType.INCLUDING, ',')
+        );
+        GroupTreeNode grandParent = root.addSubgroup(
+            new ExplicitGroup(
+                "ExplicitGrandParent",
+                GroupHierarchyType.INDEPENDENT,
+                ','
+            )
+        );
         root.addSubgroup(getKeywordGroup("KeywordA"));
 
         grandParent.addSubgroup(getExplict("ExplicitB"));
-        GroupTreeNode parent = grandParent.addSubgroup(getKeywordGroup("KeywordParent"));
+        GroupTreeNode parent = grandParent.addSubgroup(
+            getKeywordGroup("KeywordParent")
+        );
         grandParent.addSubgroup(getSearchGroup("SearchB"));
         grandParent.addSubgroup(getKeywordGroup("KeywordB"));
 
@@ -80,11 +96,24 @@ 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(SearchRules.SearchFlags.CASE_SENSITIVE));
+        return new SearchGroup(
+            name,
+            GroupHierarchyType.INCLUDING,
+            "searchExpression",
+            EnumSet.of(SearchRules.SearchFlags.CASE_SENSITIVE)
+        );
     }
 
     private static AbstractGroup getExplict(String name) {
@@ -118,7 +147,10 @@ void setUp() {
         entries.clear();
         entry = new BibEntry();
         entries.add(entry);
-        entries.add(new BibEntry().withField(StandardField.AUTHOR, "author1 and author2"));
+        entries.add(
+            new BibEntry()
+                .withField(StandardField.AUTHOR, "author1 and author2")
+        );
         entries.add(new BibEntry().withField(StandardField.AUTHOR, "author1"));
     }
 
@@ -134,18 +166,20 @@ 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(
-                        new ExplicitGroup("parent", GroupHierarchyType.INDEPENDENT, ','));
-        GroupTreeNode node = parent
-                .addSubgroup(new ExplicitGroup("node", GroupHierarchyType.REFINING, ','));
+        GroupTreeNode parent = GroupTreeNode.fromGroup(
+            new ExplicitGroup("parent", GroupHierarchyType.INDEPENDENT, ',')
+        );
+        GroupTreeNode node = parent.addSubgroup(
+            new ExplicitGroup("node", GroupHierarchyType.REFINING, ',')
+        );
 
         AndMatcher matcher = new AndMatcher();
         matcher.addRule(node.getGroup());
@@ -155,8 +189,12 @@ 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());
@@ -166,14 +204,26 @@ 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));
+            new WordKeywordGroup(
+                "node",
+                GroupHierarchyType.INDEPENDENT,
+                StandardField.AUTHOR,
+                "author2",
+                true,
+                ',',
+                false
+            )
+        );
         assertEquals(1, node.findMatches(entries).size());
     }
 
@@ -181,7 +231,16 @@ void findMatchesOneEntry() {
     void findMatchesMultipleEntries() {
         GroupTreeNode parent = getNodeInSimpleTree();
         GroupTreeNode node = parent.addSubgroup(
-                new WordKeywordGroup("node", GroupHierarchyType.INDEPENDENT, StandardField.AUTHOR, "author1", true, ',', false));
+            new WordKeywordGroup(
+                "node",
+                GroupHierarchyType.INDEPENDENT,
+                StandardField.AUTHOR,
+                "author1",
+                true,
+                ',',
+                false
+            )
+        );
         assertEquals(2, node.findMatches(entries).size());
     }
 
@@ -189,9 +248,27 @@ void findMatchesMultipleEntries() {
     void findMatchesWorksForRefiningGroups() {
         GroupTreeNode grandParent = getNodeInSimpleTree();
         GroupTreeNode parent = grandParent.addSubgroup(
-                new WordKeywordGroup("node", GroupHierarchyType.INDEPENDENT, StandardField.AUTHOR, "author2", true, ',', false));
+            new WordKeywordGroup(
+                "node",
+                GroupHierarchyType.INDEPENDENT,
+                StandardField.AUTHOR,
+                "author2",
+                true,
+                ',',
+                false
+            )
+        );
         GroupTreeNode node = parent.addSubgroup(
-                new WordKeywordGroup("node", GroupHierarchyType.REFINING, StandardField.AUTHOR, "author1", true, ',', false));
+            new WordKeywordGroup(
+                "node",
+                GroupHierarchyType.REFINING,
+                StandardField.AUTHOR,
+                "author1",
+                true,
+                ',',
+                false
+            )
+        );
         assertEquals(1, node.findMatches(entries).size());
     }
 
@@ -199,16 +276,38 @@ void findMatchesWorksForRefiningGroups() {
     void findMatchesWorksForHierarchyOfIndependentGroups() {
         GroupTreeNode grandParent = getNodeInSimpleTree();
         GroupTreeNode parent = grandParent.addSubgroup(
-                new WordKeywordGroup("node", GroupHierarchyType.INDEPENDENT, StandardField.AUTHOR, "author2", true, ',', false));
+            new WordKeywordGroup(
+                "node",
+                GroupHierarchyType.INDEPENDENT,
+                StandardField.AUTHOR,
+                "author2",
+                true,
+                ',',
+                false
+            )
+        );
         GroupTreeNode node = parent.addSubgroup(
-                new WordKeywordGroup("node", GroupHierarchyType.INDEPENDENT, StandardField.AUTHOR, "author1", true, ',', false));
+            new WordKeywordGroup(
+                "node",
+                GroupHierarchyType.INDEPENDENT,
+                StandardField.AUTHOR,
+                "author1",
+                true,
+                ',',
+                false
+            )
+        );
         assertEquals(2, node.findMatches(entries).size());
     }
 
     @Test
     void setGroupChangesUnderlyingGroup() {
         GroupTreeNode node = getNodeInSimpleTree();
-        AbstractGroup newGroup = new ExplicitGroup("NewGroup", GroupHierarchyType.INDEPENDENT, ',');
+        AbstractGroup newGroup = new ExplicitGroup(
+            "NewGroup",
+            GroupHierarchyType.INDEPENDENT,
+            ','
+        );
 
         node.setGroup(newGroup, true, true, entries);
 
@@ -217,10 +316,18 @@ void setGroupChangesUnderlyingGroup() {
 
     @Test
     void setGroupAddsPreviousAssignmentsExplicitToExplicit() {
-        ExplicitGroup oldGroup = new ExplicitGroup("OldGroup", GroupHierarchyType.INDEPENDENT, ',');
+        ExplicitGroup oldGroup = new ExplicitGroup(
+            "OldGroup",
+            GroupHierarchyType.INDEPENDENT,
+            ','
+        );
         oldGroup.add(entry);
         GroupTreeNode node = GroupTreeNode.fromGroup(oldGroup);
-        AbstractGroup newGroup = new ExplicitGroup("NewGroup", GroupHierarchyType.INDEPENDENT, ',');
+        AbstractGroup newGroup = new ExplicitGroup(
+            "NewGroup",
+            GroupHierarchyType.INDEPENDENT,
+            ','
+        );
 
         node.setGroup(newGroup, true, true, entries);
 
@@ -229,10 +336,18 @@ void setGroupAddsPreviousAssignmentsExplicitToExplicit() {
 
     @Test
     void setGroupWithFalseDoesNotAddsPreviousAssignments() {
-        ExplicitGroup oldGroup = new ExplicitGroup("OldGroup", GroupHierarchyType.INDEPENDENT, ',');
+        ExplicitGroup oldGroup = new ExplicitGroup(
+            "OldGroup",
+            GroupHierarchyType.INDEPENDENT,
+            ','
+        );
         oldGroup.add(entry);
         GroupTreeNode node = GroupTreeNode.fromGroup(oldGroup);
-        AbstractGroup newGroup = new ExplicitGroup("NewGroup", GroupHierarchyType.INDEPENDENT, ',');
+        AbstractGroup newGroup = new ExplicitGroup(
+            "NewGroup",
+            GroupHierarchyType.INDEPENDENT,
+            ','
+        );
 
         node.setGroup(newGroup, false, false, entries);
 
@@ -241,10 +356,18 @@ void setGroupWithFalseDoesNotAddsPreviousAssignments() {
 
     @Test
     void setGroupAddsOnlyPreviousAssignments() {
-        ExplicitGroup oldGroup = new ExplicitGroup("OldGroup", GroupHierarchyType.INDEPENDENT, ',');
+        ExplicitGroup oldGroup = new ExplicitGroup(
+            "OldGroup",
+            GroupHierarchyType.INDEPENDENT,
+            ','
+        );
         assertFalse(oldGroup.isMatch(entry));
         GroupTreeNode node = GroupTreeNode.fromGroup(oldGroup);
-        AbstractGroup newGroup = new ExplicitGroup("NewGroup", GroupHierarchyType.INDEPENDENT, ',');
+        AbstractGroup newGroup = new ExplicitGroup(
+            "NewGroup",
+            GroupHierarchyType.INDEPENDENT,
+            ','
+        );
 
         node.setGroup(newGroup, true, true, entries);
 
@@ -253,10 +376,19 @@ void setGroupAddsOnlyPreviousAssignments() {
 
     @Test
     void setGroupExplicitToSearchDoesNotKeepPreviousAssignments() {
-        ExplicitGroup oldGroup = new ExplicitGroup("OldGroup", GroupHierarchyType.INDEPENDENT, ',');
+        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);
 
@@ -265,10 +397,18 @@ void setGroupExplicitToSearchDoesNotKeepPreviousAssignments() {
 
     @Test
     void setGroupExplicitToExplicitIsRenameAndSoRemovesPreviousAssignment() {
-        ExplicitGroup oldGroup = new ExplicitGroup("OldGroup", GroupHierarchyType.INDEPENDENT, ',');
+        ExplicitGroup oldGroup = new ExplicitGroup(
+            "OldGroup",
+            GroupHierarchyType.INDEPENDENT,
+            ','
+        );
         oldGroup.add(entry);
         GroupTreeNode node = GroupTreeNode.fromGroup(oldGroup);
-        AbstractGroup newGroup = new ExplicitGroup("NewGroup", GroupHierarchyType.INDEPENDENT, ',');
+        AbstractGroup newGroup = new ExplicitGroup(
+            "NewGroup",
+            GroupHierarchyType.INDEPENDENT,
+            ','
+        );
 
         node.setGroup(newGroup, true, true, entries);
 
@@ -280,7 +420,10 @@ void getChildByPathFindsCorrectChildInSecondLevel() {
         GroupTreeNode root = getRoot();
         GroupTreeNode child = getNodeInSimpleTree(root);
 
-        assertEquals(Optional.of(child), root.getChildByPath("ExplicitParent > ExplicitNode"));
+        assertEquals(
+            Optional.of(child),
+            root.getChildByPath("ExplicitParent > ExplicitNode")
+        );
     }
 
     @Test
@@ -290,7 +433,10 @@ void getChildByPathDoesNotFindChildWhenInvalidPath() {
         // use side effect of method, which builds the group tree
         getNodeInSimpleTree(root);
 
-        assertEquals(Optional.empty(), root.getChildByPath("ExplicitParent > ExplicitChildNode"));
+        assertEquals(
+            Optional.empty(),
+            root.getChildByPath("ExplicitParent > ExplicitChildNode")
+        );
     }
 
     @Test
@@ -303,38 +449,82 @@ void getPathSimpleTree() {
     @Test
     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, ','));
-
-        BibEntry newEntry = new BibEntry().withField(StandardField.AUTHOR, "Stephen King");
+        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, ',')
+        );
+
+        BibEntry newEntry = new BibEntry()
+            .withField(StandardField.AUTHOR, "Stephen King");
         child.addEntriesToGroup(Collections.singletonList(newEntry));
         entries.add(newEntry);
 
-        assertEquals(rootNode.getContainingGroups(entries, false), Arrays.asList(rootNode, child));
+        assertEquals(
+            rootNode.getContainingGroups(entries, false),
+            Arrays.asList(rootNode, child)
+        );
     }
 
     @Test
     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, ','));
+        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,
+                ','
+            )
+        );
 
         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(SearchRules.SearchFlags.CASE_SENSITIVE)));
+        GroupTreeNode searchGroup = new GroupTreeNode(
+            new SearchGroup(
+                "Search A",
+                GroupHierarchyType.INCLUDING,
+                "searchExpression",
+                EnumSet.of(SearchRules.SearchFlags.CASE_SENSITIVE)
+            )
+        );
         List<FieldChange> fieldChanges = searchGroup.addEntriesToGroup(entries);
 
         assertEquals(Collections.emptyList(), fieldChanges);
@@ -342,8 +532,17 @@ void addEntriesToGroupWorksNotForGroupsNotSupportingExplicitAddingOfEntries() {
 
     @Test
     void removeEntriesFromGroupWorksNotForGroupsNotSupportingExplicitRemovalOfEntries() {
-        GroupTreeNode searchGroup = new GroupTreeNode(new SearchGroup("Search A", GroupHierarchyType.INCLUDING, "searchExpression", EnumSet.of(SearchRules.SearchFlags.CASE_SENSITIVE)));
-        List<FieldChange> fieldChanges = searchGroup.removeEntriesFromGroup(entries);
+        GroupTreeNode searchGroup = new GroupTreeNode(
+            new SearchGroup(
+                "Search A",
+                GroupHierarchyType.INCLUDING,
+                "searchExpression",
+                EnumSet.of(SearchRules.SearchFlags.CASE_SENSITIVE)
+            )
+        );
+        List<FieldChange> fieldChanges = searchGroup.removeEntriesFromGroup(
+            entries
+        );
 
         assertEquals(Collections.emptyList(), fieldChanges);
     }
diff --git a/src/test/java/org/jabref/model/groups/SearchGroupTest.java b/src/test/java/org/jabref/model/groups/SearchGroupTest.java
index 5bdec41d87e..b935d721e08 100644
--- a/src/test/java/org/jabref/model/groups/SearchGroupTest.java
+++ b/src/test/java/org/jabref/model/groups/SearchGroupTest.java
@@ -1,21 +1,27 @@
 package org.jabref.model.groups;
 
-import java.util.EnumSet;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
+import java.util.EnumSet;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.field.StandardField;
 import org.jabref.model.search.rules.SearchRules;
-
 import org.junit.jupiter.api.Test;
 
-import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-
 public class SearchGroupTest {
 
     @Test
     public void containsFindsWordWithRegularExpression() {
-        SearchGroup group = new SearchGroup("myExplicitGroup", GroupHierarchyType.INDEPENDENT, "anyfield=rev*", EnumSet.of(SearchRules.SearchFlags.CASE_SENSITIVE, SearchRules.SearchFlags.REGULAR_EXPRESSION));
+        SearchGroup group = new SearchGroup(
+            "myExplicitGroup",
+            GroupHierarchyType.INDEPENDENT,
+            "anyfield=rev*",
+            EnumSet.of(
+                SearchRules.SearchFlags.CASE_SENSITIVE,
+                SearchRules.SearchFlags.REGULAR_EXPRESSION
+            )
+        );
         BibEntry entry = new BibEntry();
         entry.addKeyword("review", ',');
 
@@ -24,7 +30,15 @@ public void containsFindsWordWithRegularExpression() {
 
     @Test
     public void containsDoesNotFindsWordWithInvalidRegularExpression() {
-        SearchGroup group = new SearchGroup("myExplicitGroup", GroupHierarchyType.INDEPENDENT, "anyfield=*rev*", EnumSet.of(SearchRules.SearchFlags.CASE_SENSITIVE, SearchRules.SearchFlags.REGULAR_EXPRESSION));
+        SearchGroup group = new SearchGroup(
+            "myExplicitGroup",
+            GroupHierarchyType.INDEPENDENT,
+            "anyfield=*rev*",
+            EnumSet.of(
+                SearchRules.SearchFlags.CASE_SENSITIVE,
+                SearchRules.SearchFlags.REGULAR_EXPRESSION
+            )
+        );
         BibEntry entry = new BibEntry();
         entry.addKeyword("review", ',');
 
@@ -33,21 +47,31 @@ public void containsDoesNotFindsWordWithInvalidRegularExpression() {
 
     @Test
     public void notQueryWorksWithLeftPartOfQuery() {
-        SearchGroup groupToBeClassified = new SearchGroup("to-be-classified", GroupHierarchyType.INDEPENDENT, "NOT(groups=alpha) AND NOT(groups=beta)", EnumSet.noneOf(SearchRules.SearchFlags.class));
+        SearchGroup groupToBeClassified = new SearchGroup(
+            "to-be-classified",
+            GroupHierarchyType.INDEPENDENT,
+            "NOT(groups=alpha) AND NOT(groups=beta)",
+            EnumSet.noneOf(SearchRules.SearchFlags.class)
+        );
 
         BibEntry alphaEntry = new BibEntry()
-                .withCitationKey("alpha")
-                .withField(StandardField.GROUPS, "alpha");
+            .withCitationKey("alpha")
+            .withField(StandardField.GROUPS, "alpha");
         assertFalse(groupToBeClassified.contains(alphaEntry));
     }
 
     @Test
     public void notQueryWorksWithLRightPartOfQuery() {
-        SearchGroup groupToBeClassified = new SearchGroup("to-be-classified", GroupHierarchyType.INDEPENDENT, "NOT(groups=alpha) AND NOT(groups=beta)", EnumSet.noneOf(SearchRules.SearchFlags.class));
+        SearchGroup groupToBeClassified = new SearchGroup(
+            "to-be-classified",
+            GroupHierarchyType.INDEPENDENT,
+            "NOT(groups=alpha) AND NOT(groups=beta)",
+            EnumSet.noneOf(SearchRules.SearchFlags.class)
+        );
 
         BibEntry betaEntry = new BibEntry()
-                .withCitationKey("beta")
-                .withField(StandardField.GROUPS, "beta");
+            .withCitationKey("beta")
+            .withField(StandardField.GROUPS, "beta");
         assertFalse(groupToBeClassified.contains(betaEntry));
     }
 }
diff --git a/src/test/java/org/jabref/model/groups/TexGroupTest.java b/src/test/java/org/jabref/model/groups/TexGroupTest.java
index a140ccba4cd..4f12b1af2f0 100644
--- a/src/test/java/org/jabref/model/groups/TexGroupTest.java
+++ b/src/test/java/org/jabref/model/groups/TexGroupTest.java
@@ -1,21 +1,19 @@
 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 java.nio.file.Path;
 import org.jabref.architecture.AllowedToUseLogic;
 import org.jabref.logic.auxparser.DefaultAuxParser;
 import org.jabref.model.database.BibDatabase;
 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;
-
 @AllowedToUseLogic("because class under test relies on logic classes")
 public class TexGroupTest {
 
@@ -28,8 +26,17 @@ public void setUp() throws Exception {
 
     @Test
     public 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);
+        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
+        );
         BibEntry inAux = new BibEntry();
         inAux.setCitationKey("Darwin1888");
 
@@ -38,8 +45,17 @@ public void containsReturnsTrueForEntryInAux() throws Exception {
 
     @Test
     public 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);
+        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
+        );
         BibEntry notInAux = new BibEntry();
         notInAux.setCitationKey("NotInAux2017");
 
@@ -48,10 +64,20 @@ public void containsReturnsTrueForEntryNotInAux() throws Exception {
 
     @Test
     public void getFilePathReturnsRelativePath() throws Exception {
-        Path auxFile = Path.of(TexGroupTest.class.getResource("paper.aux").toURI());
+        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 915390ed533..74d1541f262 100644
--- a/src/test/java/org/jabref/model/groups/WordKeywordGroupTest.java
+++ b/src/test/java/org/jabref/model/groups/WordKeywordGroupTest.java
@@ -1,17 +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 java.util.Optional;
 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;
-
 public class WordKeywordGroupTest {
 
     private WordKeywordGroup testGroup;
@@ -21,9 +19,36 @@ public class WordKeywordGroupTest {
 
     @BeforeEach
     public 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();
     }
 
@@ -36,21 +61,30 @@ public void containsFindsSameWord() {
 
     @Test
     public void containsFindsWordInSentence() throws Exception {
-        entry.setField(StandardField.KEYWORDS, "Some sentence containing test word");
+        entry.setField(
+            StandardField.KEYWORDS,
+            "Some sentence containing test word"
+        );
 
         assertTrue(testGroup.contains(entry));
     }
 
     @Test
     public void containsFindsWordInCommaSeparatedList() throws Exception {
-        entry.setField(StandardField.KEYWORDS, "Some,list,containing,test,word");
+        entry.setField(
+            StandardField.KEYWORDS,
+            "Some,list,containing,test,word"
+        );
 
         assertTrue(testGroup.contains(entry));
     }
 
     @Test
     public void containsFindsWordInSemicolonSeparatedList() throws Exception {
-        entry.setField(StandardField.KEYWORDS, "Some;list;containing;test;word");
+        entry.setField(
+            StandardField.KEYWORDS,
+            "Some;list;containing;test;word"
+        );
 
         assertTrue(testGroup.contains(entry));
     }
@@ -64,7 +98,10 @@ public void containsFindsSameComplexWord() throws Exception {
 
     @Test
     public void containsFindsComplexWordInSentence() throws Exception {
-        entry.setField(StandardField.KEYWORDS, "Some sentence containing \\H2O word");
+        entry.setField(
+            StandardField.KEYWORDS,
+            "Some sentence containing \\H2O word"
+        );
 
         assertTrue(waterGroup.contains(entry));
     }
@@ -77,8 +114,12 @@ public void containsDoesNotFindWordIfCaseDiffers() throws Exception {
     }
 
     @Test
-    public void containsDoesNotFindsWordInSentenceIfCaseDiffers() throws Exception {
-        entry.setField(StandardField.KEYWORDS, "Some sentence containing Test word");
+    public void containsDoesNotFindsWordInSentenceIfCaseDiffers()
+        throws Exception {
+        entry.setField(
+            StandardField.KEYWORDS,
+            "Some sentence containing Test word"
+        );
 
         assertFalse(testCaseSensitiveGroup.contains(entry));
     }
@@ -87,7 +128,10 @@ public void containsDoesNotFindsWordInSentenceIfCaseDiffers() throws Exception {
     public void addChangesFieldIfEmptyBefore() throws Exception {
         testGroup.add(entry);
 
-        assertEquals(Optional.of("test"), entry.getField(StandardField.KEYWORDS));
+        assertEquals(
+            Optional.of("test"),
+            entry.getField(StandardField.KEYWORDS)
+        );
     }
 
     @Test
@@ -95,7 +139,10 @@ public void addChangesFieldIfNotEmptyBefore() throws Exception {
         entry.setField(StandardField.KEYWORDS, "bla, blubb");
         testGroup.add(entry);
 
-        assertEquals(Optional.of("bla, blubb, test"), entry.getField(StandardField.KEYWORDS));
+        assertEquals(
+            Optional.of("bla, blubb, test"),
+            entry.getField(StandardField.KEYWORDS)
+        );
     }
 
     @Test
@@ -103,7 +150,10 @@ public void addDoesNotAddDuplicate() throws Exception {
         entry.setField(StandardField.KEYWORDS, "test, blubb");
         testGroup.add(entry);
 
-        assertEquals(Optional.of("test, blubb"), entry.getField(StandardField.KEYWORDS));
+        assertEquals(
+            Optional.of("test, blubb"),
+            entry.getField(StandardField.KEYWORDS)
+        );
     }
 
     @Test
@@ -111,7 +161,10 @@ public void removeDoesNothingIfEntryNotMatched() throws Exception {
         entry.setField(StandardField.KEYWORDS, "something");
         testGroup.remove(entry);
 
-        assertEquals(Optional.of("something"), entry.getField(StandardField.KEYWORDS));
+        assertEquals(
+            Optional.of("something"),
+            entry.getField(StandardField.KEYWORDS)
+        );
     }
 
     @Test
@@ -119,6 +172,9 @@ public void removeRemovesNameFromField() throws Exception {
         entry.setField(StandardField.KEYWORDS, "test, blubb");
         testGroup.remove(entry);
 
-        assertEquals(Optional.of("blubb"), entry.getField(StandardField.KEYWORDS));
+        assertEquals(
+            Optional.of("blubb"),
+            entry.getField(StandardField.KEYWORDS)
+        );
     }
 }
diff --git a/src/test/java/org/jabref/model/metadata/MetaDataTest.java b/src/test/java/org/jabref/model/metadata/MetaDataTest.java
index 017881ba922..69f5b47ce04 100644
--- a/src/test/java/org/jabref/model/metadata/MetaDataTest.java
+++ b/src/test/java/org/jabref/model/metadata/MetaDataTest.java
@@ -1,12 +1,11 @@
 package org.jabref.model.metadata;
 
-import java.util.Optional;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
+import java.util.Optional;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-
 public class MetaDataTest {
 
     private MetaData metaData;
diff --git a/src/test/java/org/jabref/model/openoffice/CitationEntryTest.java b/src/test/java/org/jabref/model/openoffice/CitationEntryTest.java
index 8648d9b5df9..b422b86479b 100644
--- a/src/test/java/org/jabref/model/openoffice/CitationEntryTest.java
+++ b/src/test/java/org/jabref/model/openoffice/CitationEntryTest.java
@@ -1,18 +1,21 @@
 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 java.util.Optional;
+import org.junit.jupiter.api.Test;
+
 class CitationEntryTest {
 
     @Test
     void testCitationEntryInitialPageInfo() {
-        CitationEntry citationEntry = new CitationEntry("RefMark", "Context", "Info");
+        CitationEntry citationEntry = new CitationEntry(
+            "RefMark",
+            "Context",
+            "Info"
+        );
         assertTrue(citationEntry.getPageInfo().isPresent());
         assertEquals("Info", citationEntry.getPageInfo().get());
         assertEquals("RefMark", citationEntry.getRefMarkName());
@@ -21,7 +24,11 @@ void testCitationEntryInitialPageInfo() {
 
     @Test
     void testCitationEntryOptionalInitialPageInfo() {
-        CitationEntry citationEntry = new CitationEntry("RefMark", "Context", Optional.of("Info"));
+        CitationEntry citationEntry = new CitationEntry(
+            "RefMark",
+            "Context",
+            Optional.of("Info")
+        );
 
         assertEquals(Optional.of("Info"), citationEntry.getPageInfo());
         assertEquals("RefMark", citationEntry.getRefMarkName());
@@ -30,7 +37,11 @@ void testCitationEntryOptionalInitialPageInfo() {
 
     @Test
     void testCitationEntryInitalPageInfoChanged() {
-        CitationEntry citationEntry = new CitationEntry("RefMark", "Context", "Info");
+        CitationEntry citationEntry = new CitationEntry(
+            "RefMark",
+            "Context",
+            "Info"
+        );
         assertEquals(Optional.of("Info"), citationEntry.getPageInfo());
     }
 
@@ -42,9 +53,21 @@ void testCitationEntryNoInitialPageInfo() {
 
     @Test
     void testCitationEntryEquals() {
-        CitationEntry citationEntry1 = new CitationEntry("RefMark", "Context", "Info");
-        CitationEntry citationEntry2 = new CitationEntry("RefMark2", "Context", "Info");
-        CitationEntry citationEntry3 = new CitationEntry("RefMark", "Other Context", "Other Info");
+        CitationEntry citationEntry1 = new CitationEntry(
+            "RefMark",
+            "Context",
+            "Info"
+        );
+        CitationEntry citationEntry2 = new CitationEntry(
+            "RefMark2",
+            "Context",
+            "Info"
+        );
+        CitationEntry citationEntry3 = new CitationEntry(
+            "RefMark",
+            "Other Context",
+            "Other Info"
+        );
         assertEquals(citationEntry1, citationEntry1);
         assertEquals(citationEntry1, citationEntry3);
         assertNotEquals(citationEntry1, citationEntry2);
@@ -53,9 +76,21 @@ void testCitationEntryEquals() {
 
     @Test
     void testCitationEntryCompareTo() {
-        CitationEntry citationEntry1 = new CitationEntry("RefMark", "Context", "Info");
-        CitationEntry citationEntry2 = new CitationEntry("RefMark2", "Context", "Info");
-        CitationEntry citationEntry3 = new CitationEntry("RefMark", "Other Context", "Other Info");
+        CitationEntry citationEntry1 = new CitationEntry(
+            "RefMark",
+            "Context",
+            "Info"
+        );
+        CitationEntry citationEntry2 = new CitationEntry(
+            "RefMark2",
+            "Context",
+            "Info"
+        );
+        CitationEntry citationEntry3 = new CitationEntry(
+            "RefMark",
+            "Other Context",
+            "Other Info"
+        );
         assertEquals(0, citationEntry1.compareTo(citationEntry3));
         assertEquals(-1, citationEntry1.compareTo(citationEntry2));
         assertEquals(1, citationEntry2.compareTo(citationEntry1));
diff --git a/src/test/java/org/jabref/model/paging/PageTest.java b/src/test/java/org/jabref/model/paging/PageTest.java
index e08e0d43619..0c23a2a0639 100644
--- a/src/test/java/org/jabref/model/paging/PageTest.java
+++ b/src/test/java/org/jabref/model/paging/PageTest.java
@@ -1,24 +1,24 @@
 package org.jabref.model.paging;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+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.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;
-
 public class PageTest {
+
     private Page<String> page1;
     private Page<String> page2;
     private final int testPageNumber = 3;
     private final String testQuery = "anyQuery";
     private Collection<String> testContent = new ArrayList<>();
-    private final String[] testStrings = {"str1", "str2", "str3"};
+    private final String[] testStrings = { "str1", "str2", "str3" };
 
     @BeforeEach
     public void setup() {
diff --git a/src/test/java/org/jabref/model/pdf/FileAnnotationTest.java b/src/test/java/org/jabref/model/pdf/FileAnnotationTest.java
index 74b54990ef6..2e1e9885396 100644
--- a/src/test/java/org/jabref/model/pdf/FileAnnotationTest.java
+++ b/src/test/java/org/jabref/model/pdf/FileAnnotationTest.java
@@ -1,14 +1,13 @@
 package org.jabref.model.pdf;
 
+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;
-
 import org.junit.jupiter.api.Test;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-
 public class FileAnnotationTest {
 
     @Test
@@ -41,11 +40,18 @@ public void testParseNotADate() {
 
     @Test
     public void testAbbreviateAnnotationName() {
-        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());
+        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 be77c6773e3..31b400f83d8 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;
-
 public class MatcherSetsTest {
 
     @Test
diff --git a/src/test/java/org/jabref/model/search/rules/ContainsBasedSearchRuleTest.java b/src/test/java/org/jabref/model/search/rules/ContainsBasedSearchRuleTest.java
index ed77afd40be..7e552c579f9 100644
--- a/src/test/java/org/jabref/model/search/rules/ContainsBasedSearchRuleTest.java
+++ b/src/test/java/org/jabref/model/search/rules/ContainsBasedSearchRuleTest.java
@@ -1,30 +1,46 @@
 package org.jabref.model.search.rules;
 
-import java.util.EnumSet;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
+import java.util.EnumSet;
 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.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-
 /**
  * Test case for ContainBasedSearchRule.
  */
 public class ContainsBasedSearchRuleTest {
 
     private final BibEntry be = new BibEntry(StandardEntryType.InCollection)
-            .withCitationKey("shields01")
-            .withField(StandardField.TITLE, "Marine finfish larviculture in Europe")
-            .withField(StandardField.YEAR, "2001")
-            .withField(StandardField.AUTHOR, "Kevin Shields");
-    private final ContainsBasedSearchRule bsCaseSensitive = new ContainsBasedSearchRule(EnumSet.of(SearchRules.SearchFlags.CASE_SENSITIVE, SearchRules.SearchFlags.REGULAR_EXPRESSION));
-    private final ContainsBasedSearchRule bsCaseInsensitive = new ContainsBasedSearchRule(EnumSet.of(SearchRules.SearchFlags.REGULAR_EXPRESSION));
-    private final RegexBasedSearchRule bsCaseSensitiveRegexp = new RegexBasedSearchRule(EnumSet.of(SearchRules.SearchFlags.CASE_SENSITIVE, SearchRules.SearchFlags.REGULAR_EXPRESSION));
-    private final RegexBasedSearchRule bsCaseInsensitiveRegexp = new RegexBasedSearchRule(EnumSet.of(SearchRules.SearchFlags.REGULAR_EXPRESSION));
+        .withCitationKey("shields01")
+        .withField(StandardField.TITLE, "Marine finfish larviculture in Europe")
+        .withField(StandardField.YEAR, "2001")
+        .withField(StandardField.AUTHOR, "Kevin Shields");
+    private final ContainsBasedSearchRule bsCaseSensitive =
+        new ContainsBasedSearchRule(
+            EnumSet.of(
+                SearchRules.SearchFlags.CASE_SENSITIVE,
+                SearchRules.SearchFlags.REGULAR_EXPRESSION
+            )
+        );
+    private final ContainsBasedSearchRule bsCaseInsensitive =
+        new ContainsBasedSearchRule(
+            EnumSet.of(SearchRules.SearchFlags.REGULAR_EXPRESSION)
+        );
+    private final RegexBasedSearchRule bsCaseSensitiveRegexp =
+        new RegexBasedSearchRule(
+            EnumSet.of(
+                SearchRules.SearchFlags.CASE_SENSITIVE,
+                SearchRules.SearchFlags.REGULAR_EXPRESSION
+            )
+        );
+    private final RegexBasedSearchRule bsCaseInsensitiveRegexp =
+        new RegexBasedSearchRule(
+            EnumSet.of(SearchRules.SearchFlags.REGULAR_EXPRESSION)
+        );
 
     @Test
     public void testContentOfSingleField() {
diff --git a/src/test/java/org/jabref/model/search/rules/GrammarBasedSearchRuleTest.java b/src/test/java/org/jabref/model/search/rules/GrammarBasedSearchRuleTest.java
index 6b410b5a088..b995377abf9 100644
--- a/src/test/java/org/jabref/model/search/rules/GrammarBasedSearchRuleTest.java
+++ b/src/test/java/org/jabref/model/search/rules/GrammarBasedSearchRuleTest.java
@@ -1,17 +1,15 @@
 package org.jabref.model.search.rules;
 
-import java.util.EnumSet;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
+import java.util.EnumSet;
 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.Disabled;
 import org.junit.jupiter.api.Test;
 
-import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-
 /**
  * Test case for GrammarBasedSearchRuleTest.
  */
@@ -19,7 +17,12 @@ public class GrammarBasedSearchRuleTest {
 
     @Test
     void applyRuleMatchesSingleTermWithRegex() {
-        GrammarBasedSearchRule searchRule = new GrammarBasedSearchRule(EnumSet.of(SearchRules.SearchFlags.CASE_SENSITIVE, SearchRules.SearchFlags.REGULAR_EXPRESSION));
+        GrammarBasedSearchRule searchRule = new GrammarBasedSearchRule(
+            EnumSet.of(
+                SearchRules.SearchFlags.CASE_SENSITIVE,
+                SearchRules.SearchFlags.REGULAR_EXPRESSION
+            )
+        );
 
         String query = "M[a-z]+e";
         assertTrue(searchRule.validateSearchStrings(query));
@@ -28,7 +31,12 @@ void applyRuleMatchesSingleTermWithRegex() {
 
     @Test
     void applyRuleDoesNotMatchSingleTermWithRegex() {
-        GrammarBasedSearchRule searchRule = new GrammarBasedSearchRule(EnumSet.of(SearchRules.SearchFlags.CASE_SENSITIVE, SearchRules.SearchFlags.REGULAR_EXPRESSION));
+        GrammarBasedSearchRule searchRule = new GrammarBasedSearchRule(
+            EnumSet.of(
+                SearchRules.SearchFlags.CASE_SENSITIVE,
+                SearchRules.SearchFlags.REGULAR_EXPRESSION
+            )
+        );
 
         String query = "M[0-9]+e";
         assertTrue(searchRule.validateSearchStrings(query));
@@ -37,65 +45,110 @@ void applyRuleDoesNotMatchSingleTermWithRegex() {
 
     @Test
     void searchRuleOfDocumentationMatches() {
-        GrammarBasedSearchRule searchRule = new GrammarBasedSearchRule(EnumSet.of(SearchRules.SearchFlags.REGULAR_EXPRESSION));
+        GrammarBasedSearchRule searchRule = new GrammarBasedSearchRule(
+            EnumSet.of(SearchRules.SearchFlags.REGULAR_EXPRESSION)
+        );
 
-        String query = "(author = miller or title|keywords = \"image processing\") and not author = brown";
+        String query =
+            "(author = miller or title|keywords = \"image processing\") and not author = brown";
         assertTrue(searchRule.validateSearchStrings(query));
-        assertTrue(searchRule.applyRule(query, new BibEntry()
-                .withCitationKey("key")
-                .withField(StandardField.KEYWORDS, "image processing")));
-        assertFalse(searchRule.applyRule(query, new BibEntry()
-                .withCitationKey("key")
-                .withField(StandardField.AUTHOR, "Sam Brown")
-                .withField(StandardField.KEYWORDS, "image processing")));
+        assertTrue(
+            searchRule.applyRule(
+                query,
+                new BibEntry()
+                    .withCitationKey("key")
+                    .withField(StandardField.KEYWORDS, "image processing")
+            )
+        );
+        assertFalse(
+            searchRule.applyRule(
+                query,
+                new BibEntry()
+                    .withCitationKey("key")
+                    .withField(StandardField.AUTHOR, "Sam Brown")
+                    .withField(StandardField.KEYWORDS, "image processing")
+            )
+        );
     }
 
     @Disabled
     @Test
     void searchForAnyFieldWorks() {
-        GrammarBasedSearchRule searchRule = new GrammarBasedSearchRule(EnumSet.of(SearchRules.SearchFlags.REGULAR_EXPRESSION));
+        GrammarBasedSearchRule searchRule = new GrammarBasedSearchRule(
+            EnumSet.of(SearchRules.SearchFlags.REGULAR_EXPRESSION)
+        );
 
         String query = "anyfield:fruit";
         assertTrue(searchRule.validateSearchStrings(query));
-        assertTrue(searchRule.applyRule(query, new BibEntry()
-                .withField(StandardField.KEYWORDS, "fruit")));
+        assertTrue(
+            searchRule.applyRule(
+                query,
+                new BibEntry().withField(StandardField.KEYWORDS, "fruit")
+            )
+        );
     }
 
     @Disabled
     @Test
     void searchForAnyKeywordWorks() {
-        GrammarBasedSearchRule searchRule = new GrammarBasedSearchRule(EnumSet.of(SearchRules.SearchFlags.REGULAR_EXPRESSION));
+        GrammarBasedSearchRule searchRule = new GrammarBasedSearchRule(
+            EnumSet.of(SearchRules.SearchFlags.REGULAR_EXPRESSION)
+        );
 
         String query = "anykeyword:apple";
         assertTrue(searchRule.validateSearchStrings(query));
-        assertTrue(searchRule.applyRule(query, new BibEntry()
-                .withField(StandardField.KEYWORDS, "apple")));
-        assertFalse(searchRule.applyRule(query, new BibEntry()
-                .withField(StandardField.KEYWORDS, "pineapple")));
+        assertTrue(
+            searchRule.applyRule(
+                query,
+                new BibEntry().withField(StandardField.KEYWORDS, "apple")
+            )
+        );
+        assertFalse(
+            searchRule.applyRule(
+                query,
+                new BibEntry().withField(StandardField.KEYWORDS, "pineapple")
+            )
+        );
     }
 
     @Test
     void searchForCitationKeyWorks() {
-        GrammarBasedSearchRule searchRule = new GrammarBasedSearchRule(EnumSet.noneOf(SearchRules.SearchFlags.class));
+        GrammarBasedSearchRule searchRule = new GrammarBasedSearchRule(
+            EnumSet.noneOf(SearchRules.SearchFlags.class)
+        );
         String query = "citationkey==miller2005";
         assertTrue(searchRule.validateSearchStrings(query));
-        assertTrue(searchRule.applyRule(query, new BibEntry()
-                .withCitationKey("miller2005")));
+        assertTrue(
+            searchRule.applyRule(
+                query,
+                new BibEntry().withCitationKey("miller2005")
+            )
+        );
     }
 
     @Test
     void searchForThesisEntryTypeWorks() {
-        GrammarBasedSearchRule searchRule = new GrammarBasedSearchRule(EnumSet.noneOf(SearchRules.SearchFlags.class));
+        GrammarBasedSearchRule searchRule = new GrammarBasedSearchRule(
+            EnumSet.noneOf(SearchRules.SearchFlags.class)
+        );
         String query = "entrytype=thesis";
         assertTrue(searchRule.validateSearchStrings(query));
-        assertTrue(searchRule.applyRule(query, new BibEntry(StandardEntryType.PhdThesis)));
+        assertTrue(
+            searchRule.applyRule(
+                query,
+                new BibEntry(StandardEntryType.PhdThesis)
+            )
+        );
     }
 
     public BibEntry makeBibtexEntry() {
         return new BibEntry(StandardEntryType.InCollection)
-                .withCitationKey("shields01")
-                .withField(StandardField.TITLE, "Marine finfish larviculture in Europe")
-                .withField(StandardField.YEAR, "2001")
-                .withField(StandardField.AUTHOR, "Kevin Shields");
+            .withCitationKey("shields01")
+            .withField(
+                StandardField.TITLE,
+                "Marine finfish larviculture in Europe"
+            )
+            .withField(StandardField.YEAR, "2001")
+            .withField(StandardField.AUTHOR, "Kevin Shields");
     }
 }
diff --git a/src/test/java/org/jabref/model/search/rules/SentenceAnalyzerTest.java b/src/test/java/org/jabref/model/search/rules/SentenceAnalyzerTest.java
index 61e05e3def4..466382ff2a1 100644
--- a/src/test/java/org/jabref/model/search/rules/SentenceAnalyzerTest.java
+++ b/src/test/java/org/jabref/model/search/rules/SentenceAnalyzerTest.java
@@ -1,28 +1,24 @@
 package org.jabref.model.search.rules;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
 import java.util.List;
 import java.util.stream.Stream;
-
 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;
-
 public class SentenceAnalyzerTest {
 
     static Stream<Arguments> getParameters() {
         return Stream.of(
-                Arguments.of(List.of("a", "b"), "a b"),
-
-                // Leading and trailing spaces
-                Arguments.of(List.of("a", "b"), " a b "),
-
-                // Escaped characters and trailing spaces
-                Arguments.of(List.of("b "), "\"b \" "),
-
-                // Escaped characters and leading spaces.
-                Arguments.of(List.of(" a"), " \\ a")
+            Arguments.of(List.of("a", "b"), "a b"),
+            // Leading and trailing spaces
+            Arguments.of(List.of("a", "b"), " a b "),
+            // Escaped characters and trailing spaces
+            Arguments.of(List.of("b "), "\"b \" "),
+            // Escaped characters and leading spaces.
+            Arguments.of(List.of(" a"), " \\ a")
         );
     }
 
diff --git a/src/test/java/org/jabref/model/strings/StringUtilTest.java b/src/test/java/org/jabref/model/strings/StringUtilTest.java
index a1ba47b247a..732add4a438 100644
--- a/src/test/java/org/jabref/model/strings/StringUtilTest.java
+++ b/src/test/java/org/jabref/model/strings/StringUtilTest.java
@@ -1,32 +1,41 @@
 package org.jabref.model.strings;
 
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
+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.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;
-import static org.junit.jupiter.api.Assertions.assertThrows;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-
 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
@@ -76,7 +85,10 @@ void testUnifyLineBreaks() {
     @Test
     void testGetCorrectFileName() {
         assertEquals("aa.bib", StringUtil.getCorrectFileName("aa", "bib"));
-        assertEquals(".login.bib", StringUtil.getCorrectFileName(".login", "bib"));
+        assertEquals(
+            ".login.bib",
+            StringUtil.getCorrectFileName(".login", "bib")
+        );
         assertEquals("a.bib", StringUtil.getCorrectFileName("a.bib", "bib"));
         assertEquals("a.bib", StringUtil.getCorrectFileName("a.bib", "BIB"));
         assertEquals("a.bib", StringUtil.getCorrectFileName("a", "bib"));
@@ -95,7 +107,10 @@ void testRemoveBracesAroundCapitals() {
         assertEquals("ABC", StringUtil.removeBracesAroundCapitals("{ABC}"));
         assertEquals("ABC", StringUtil.removeBracesAroundCapitals("{{ABC}}"));
         assertEquals("{abc}", StringUtil.removeBracesAroundCapitals("{abc}"));
-        assertEquals("ABCDEF", StringUtil.removeBracesAroundCapitals("{ABC}{DEF}"));
+        assertEquals(
+            "ABCDEF",
+            StringUtil.removeBracesAroundCapitals("{ABC}{DEF}")
+        );
     }
 
     @Test
@@ -104,7 +119,10 @@ void testPutBracesAroundCapitals() {
         assertEquals("{ABC}", StringUtil.putBracesAroundCapitals("{ABC}"));
         assertEquals("abc", StringUtil.putBracesAroundCapitals("abc"));
         assertEquals("#ABC#", StringUtil.putBracesAroundCapitals("#ABC#"));
-        assertEquals("{ABC} def {EFG}", StringUtil.putBracesAroundCapitals("ABC def EFG"));
+        assertEquals(
+            "{ABC} def {EFG}",
+            StringUtil.putBracesAroundCapitals("ABC def EFG")
+        );
     }
 
     @Test
@@ -121,7 +139,7 @@ void testShaveString() {
 
     @Test
     void testJoin() {
-        String[] s = {"ab", "cd", "ed"};
+        String[] s = { "ab", "cd", "ed" };
         assertEquals("ab\\cd\\ed", StringUtil.join(s, "\\", 0, s.length));
 
         assertEquals("cd\\ed", StringUtil.join(s, "\\", 1, s.length));
@@ -130,7 +148,7 @@ void testJoin() {
 
         assertEquals("", StringUtil.join(s, "\\", 3, s.length));
 
-        assertEquals("", StringUtil.join(new String[]{}, "\\", 0, 0));
+        assertEquals("", StringUtil.join(new String[] {}, "\\", 0, 0));
     }
 
     @Test
@@ -148,13 +166,22 @@ void testStripBrackets() {
     @Test
     void testGetPart() {
         // Get word between braces
-        assertEquals("{makes}", StringUtil.getPart("Practice {makes} perfect", 8, false));
+        assertEquals(
+            "{makes}",
+            StringUtil.getPart("Practice {makes} perfect", 8, false)
+        );
         // When the string is empty and start Index equal zero
         assertEquals("", StringUtil.getPart("", 0, false));
         // When the word are in between close curly bracket
-        assertEquals("", StringUtil.getPart("A closed mouth catches no }flies}", 25, false));
+        assertEquals(
+            "",
+            StringUtil.getPart("A closed mouth catches no }flies}", 25, false)
+        );
         // Get the word from the end of the sentence
-        assertEquals("bite", StringUtil.getPart("Barking dogs seldom bite", 19, true));
+        assertEquals(
+            "bite",
+            StringUtil.getPart("Barking dogs seldom bite", 19, true)
+        );
     }
 
     @Test
@@ -165,27 +192,78 @@ void testFindEncodingsForString() {
     @Test
     void testWrap() {
         String newline = "newline";
-        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 ccccc", StringUtil.wrap("aaaaa bbbbb ccccc", 12, newline));
-        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",
-                StringUtil.wrap("aaaaa\n\nbbbbb\nccccc", 12, newline));
-        assertEquals("aaaaa" + newline + "\t" + newline + "\tbbbbb" + newline + "\t" + newline + "\tccccc",
-                StringUtil.wrap("aaaaa\r\nbbbbb\r\nccccc", 12, newline));
+            "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 ccccc",
+            StringUtil.wrap("aaaaa bbbbb ccccc", 12, newline)
+        );
+        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",
+            StringUtil.wrap("aaaaa\n\nbbbbb\nccccc", 12, newline)
+        );
+        assertEquals(
+            "aaaaa" +
+            newline +
+            "\t" +
+            newline +
+            "\tbbbbb" +
+            newline +
+            "\t" +
+            newline +
+            "\tccccc",
+            StringUtil.wrap("aaaaa\r\nbbbbb\r\nccccc", 12, newline)
+        );
     }
 
     @Test
     void testDecodeStringDoubleArray() {
-        assertArrayEquals(new String[][]{{"a", "b"}, {"c", "d"}}, StringUtil.decodeStringDoubleArray("a:b;c:d"));
-        assertArrayEquals(new String[][]{{"a", ""}, {"c", "d"}}, StringUtil.decodeStringDoubleArray("a:;c:d"));
+        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
@@ -242,17 +320,26 @@ void testIntValueOfStartWithZeros() {
 
     @Test
     void testIntValueOfExceptionIfStringContainsLetter() {
-        assertThrows(NumberFormatException.class, () -> StringUtil.intValueOf("12A2"));
+        assertThrows(
+            NumberFormatException.class,
+            () -> StringUtil.intValueOf("12A2")
+        );
     }
 
     @Test
     void testIntValueOfExceptionIfStringNull() {
-        assertThrows(NumberFormatException.class, () -> StringUtil.intValueOf(null));
+        assertThrows(
+            NumberFormatException.class,
+            () -> StringUtil.intValueOf(null)
+        );
     }
 
     @Test
     void testIntValueOfExceptionfIfStringEmpty() {
-        assertThrows(NumberFormatException.class, () -> StringUtil.intValueOf(""));
+        assertThrows(
+            NumberFormatException.class,
+            () -> StringUtil.intValueOf("")
+        );
     }
 
     @Test
@@ -264,12 +351,18 @@ void testIntValueOfWithNullSingleDigit() {
 
     @Test
     void testIntValueOfWithNullLongString() {
-        assertEquals(Optional.of(1234567890), StringUtil.intValueOfOptional("1234567890"));
+        assertEquals(
+            Optional.of(1234567890),
+            StringUtil.intValueOfOptional("1234567890")
+        );
     }
 
     @Test
     void testIntValueOfWithNullStartWithZeros() {
-        assertEquals(Optional.of(1234), StringUtil.intValueOfOptional("001234"));
+        assertEquals(
+            Optional.of(1234),
+            StringUtil.intValueOfOptional("001234")
+        );
     }
 
     @Test
@@ -294,8 +387,14 @@ void testLimitStringLengthShort() {
 
     @Test
     void testLimitStringLengthLimiting() {
-        assertEquals("TestTes...", StringUtil.limitStringLength("TestTestTestTestTest", 10));
-        assertEquals(10, StringUtil.limitStringLength("TestTestTestTestTest", 10).length());
+        assertEquals(
+            "TestTes...",
+            StringUtil.limitStringLength("TestTestTestTestTest", 10)
+        );
+        assertEquals(
+            10,
+            StringUtil.limitStringLength("TestTestTestTestTest", 10).length()
+        );
     }
 
     @Test
@@ -305,8 +404,14 @@ void testLimitStringLengthNullInput() {
 
     @Test
     void testReplaceSpecialCharacters() {
-        assertEquals("Hallo Arger", StringUtil.replaceSpecialCharacters("Hallo Arger"));
-        assertEquals("aaAeoeeee", StringUtil.replaceSpecialCharacters("åÄöéèë"));
+        assertEquals(
+            "Hallo Arger",
+            StringUtil.replaceSpecialCharacters("Hallo Arger")
+        );
+        assertEquals(
+            "aaAeoeeee",
+            StringUtil.replaceSpecialCharacters("åÄöéèë")
+        );
     }
 
     @Test
@@ -316,10 +421,10 @@ void replaceSpecialCharactersWithNonNormalizedUnicode() {
 
     static Stream<Arguments> testRepeatSpacesData() {
         return Stream.of(
-                Arguments.of("", -1),
-                Arguments.of("", 0),
-                Arguments.of(" ", 1),
-                Arguments.of("       ", 7)
+            Arguments.of("", -1),
+            Arguments.of("", 0),
+            Arguments.of(" ", 1),
+            Arguments.of("       ", 7)
         );
     }
 
@@ -368,17 +473,20 @@ void testCapitalizeFirst() {
 
     private static Stream<Arguments> getQuoteStringIfSpaceIsContainedData() {
         return Stream.of(
-                Arguments.of("", ""),
-                Arguments.of("\" \"", " "),
-                Arguments.of("world", "world"),
-                Arguments.of("\"hello world\"", "hello world")
+            Arguments.of("", ""),
+            Arguments.of("\" \"", " "),
+            Arguments.of("world", "world"),
+            Arguments.of("\"hello world\"", "hello world")
         );
     }
 
     @ParameterizedTest
     @MethodSource("getQuoteStringIfSpaceIsContainedData")
     void testGuoteStringIfSpaceIsContained(String expected, String source) {
-        assertEquals(expected, StringUtil.quoteStringIfSpaceIsContained(source));
+        assertEquals(
+            expected,
+            StringUtil.quoteStringIfSpaceIsContained(source)
+        );
     }
 
     @Test
@@ -389,18 +497,18 @@ void testStripAccents() {
 
     static Stream<Arguments> testContainsWhitespace() {
         return Stream.of(
-                Arguments.of(true, "file url"),
-                Arguments.of(true, "file\nurl"),
-                Arguments.of(true, "file\r\nurl"),
-                Arguments.of(true, "file\rurl"),
-                Arguments.of(true, "file\furl"),
-                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, ""));
+            Arguments.of(true, "file url"),
+            Arguments.of(true, "file\nurl"),
+            Arguments.of(true, "file\r\nurl"),
+            Arguments.of(true, "file\rurl"),
+            Arguments.of(true, "file\furl"),
+            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, "")
+        );
     }
 
     @ParameterizedTest
diff --git a/src/test/java/org/jabref/model/texparser/CitationTest.java b/src/test/java/org/jabref/model/texparser/CitationTest.java
index 36b7df4f2c0..06be74a7918 100644
--- a/src/test/java/org/jabref/model/texparser/CitationTest.java
+++ b/src/test/java/org/jabref/model/texparser/CitationTest.java
@@ -1,8 +1,12 @@
 package org.jabref.model.texparser;
 
+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;
-
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.params.ParameterizedTest;
@@ -10,11 +14,6 @@
 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;
-
 public class CitationTest {
 
     Path path;
@@ -27,43 +26,58 @@ public 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})
+    @ValueSource(ints = { -1, 0 })
     public 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());
     }
 
     @ParameterizedTest
-    @ValueSource(ints = {1, 2})
+    @ValueSource(ints = { 1, 2 })
     public void constructorLineLargerZeroTest(int line) {
         Citation citation = new Citation(path, line, 1, 5, "lineText");
     }
 
     @ParameterizedTest
     @MethodSource("colStartColEndNotInBounds")
-    public void constructorColStartColEndNotInBoundsTest(int colStart, int colEnd) {
-        Exception e = assertThrows(IllegalArgumentException.class, () -> new Citation(path, 10, colStart, colEnd, "lineText"));
-        assertEquals("Citation has to be between 0 and line length.", e.getMessage());
+    public void constructorColStartColEndNotInBoundsTest(
+        int colStart,
+        int colEnd
+    ) {
+        Exception e = assertThrows(
+            IllegalArgumentException.class,
+            () -> new Citation(path, 10, colStart, colEnd, "lineText")
+        );
+        assertEquals(
+            "Citation has to be between 0 and line length.",
+            e.getMessage()
+        );
     }
 
     @ParameterizedTest
     @MethodSource("colStartColEndInBounds")
-    public void constructorColStartColEndInBoundsTest(int colStart, int colEnd) {
-        Citation citation = new Citation(path, 10, colStart, colEnd, "lineText");
+    public void constructorColStartColEndInBoundsTest(
+        int colStart,
+        int colEnd
+    ) {
+        Citation citation = new Citation(
+            path,
+            10,
+            colStart,
+            colEnd,
+            "lineText"
+        );
     }
 
     @Test
diff --git a/src/test/java/org/jabref/performance/BibtexEntryGenerator.java b/src/test/java/org/jabref/performance/BibtexEntryGenerator.java
index f69932fe26a..16b58d5e578 100644
--- a/src/test/java/org/jabref/performance/BibtexEntryGenerator.java
+++ b/src/test/java/org/jabref/performance/BibtexEntryGenerator.java
@@ -12,15 +12,19 @@ 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/support/CIServerCondition.java b/src/test/java/org/jabref/support/CIServerCondition.java
index f4829374c25..3d8cd771fd2 100644
--- a/src/test/java/org/jabref/support/CIServerCondition.java
+++ b/src/test/java/org/jabref/support/CIServerCondition.java
@@ -2,9 +2,7 @@
 
 import java.lang.reflect.AnnotatedElement;
 import java.util.Optional;
-
 import org.jabref.model.strings.StringUtil;
-
 import org.junit.jupiter.api.extension.ConditionEvaluationResult;
 import org.junit.jupiter.api.extension.ExecutionCondition;
 import org.junit.jupiter.api.extension.ExtensionContext;
@@ -12,7 +10,8 @@
 
 public class CIServerCondition implements ExecutionCondition {
 
-    private static final ConditionEvaluationResult ENABLED = ConditionEvaluationResult.enabled("not on CI server");
+    private static final ConditionEvaluationResult ENABLED =
+        ConditionEvaluationResult.enabled("not on CI server");
 
     private static boolean isCIServer() {
         // See http://docs.travis-ci.com/user/environment-variables/#Default-Environment-Variables
@@ -25,17 +24,21 @@ private static boolean isCIServer() {
      * the CI server.
      */
     @Override
-    public ConditionEvaluationResult evaluateExecutionCondition(ExtensionContext context) {
+    public ConditionEvaluationResult evaluateExecutionCondition(
+        ExtensionContext context
+    ) {
         if (!isCIServer()) {
             return ENABLED;
         }
 
         Optional<AnnotatedElement> element = context.getElement();
-        Optional<DisabledOnCIServer> disabled = AnnotationSupport.findAnnotation(element, DisabledOnCIServer.class);
+        Optional<DisabledOnCIServer> disabled =
+            AnnotationSupport.findAnnotation(element, DisabledOnCIServer.class);
         if (disabled.isPresent()) {
-            String reason = disabled.map(DisabledOnCIServer::value)
-                                    .filter(StringUtil::isNotBlank)
-                                    .orElseGet(() -> element.get() + " is disabled on CI server");
+            String reason = disabled
+                .map(DisabledOnCIServer::value)
+                .filter(StringUtil::isNotBlank)
+                .orElseGet(() -> element.get() + " is disabled on CI server");
             return ConditionEvaluationResult.disabled(reason);
         }
 
diff --git a/src/test/java/org/jabref/support/DisabledOnCIServer.java b/src/test/java/org/jabref/support/DisabledOnCIServer.java
index f70e346d998..60fe18f4096 100644
--- a/src/test/java/org/jabref/support/DisabledOnCIServer.java
+++ b/src/test/java/org/jabref/support/DisabledOnCIServer.java
@@ -4,10 +4,9 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
-
 import org.junit.jupiter.api.extension.ExtendWith;
 
-@Target(value = {ElementType.TYPE, ElementType.METHOD})
+@Target(value = { ElementType.TYPE, ElementType.METHOD })
 @Retention(RetentionPolicy.RUNTIME)
 @ExtendWith(CIServerCondition.class)
 public @interface DisabledOnCIServer {
diff --git a/src/test/java/org/jabref/testutils/category/DatabaseTest.java b/src/test/java/org/jabref/testutils/category/DatabaseTest.java
index b4611ddc2e4..be7d3bd5f71 100644
--- a/src/test/java/org/jabref/testutils/category/DatabaseTest.java
+++ b/src/test/java/org/jabref/testutils/category/DatabaseTest.java
@@ -5,10 +5,9 @@
 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})
+@Target({ ElementType.TYPE, ElementType.METHOD })
 @Retention(RetentionPolicy.RUNTIME)
 @Inherited
 @Tag("DatabaseTest")
diff --git a/src/test/java/org/jabref/testutils/category/FetcherTest.java b/src/test/java/org/jabref/testutils/category/FetcherTest.java
index 3f01fae2ce3..cbc721560c0 100644
--- a/src/test/java/org/jabref/testutils/category/FetcherTest.java
+++ b/src/test/java/org/jabref/testutils/category/FetcherTest.java
@@ -5,10 +5,9 @@
 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})
+@Target({ ElementType.TYPE, ElementType.METHOD })
 @Retention(RetentionPolicy.RUNTIME)
 @Inherited
 @Tag("FetcherTest")
diff --git a/src/test/java/org/jabref/testutils/category/GUITest.java b/src/test/java/org/jabref/testutils/category/GUITest.java
index 8add1b3eda8..3f18879ddbc 100644
--- a/src/test/java/org/jabref/testutils/category/GUITest.java
+++ b/src/test/java/org/jabref/testutils/category/GUITest.java
@@ -5,13 +5,12 @@
 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})
+@Target({ ElementType.TYPE, ElementType.METHOD })
 @Retention(RetentionPolicy.RUNTIME)
 @Inherited
 @Tag("GUITest")
 public @interface GUITest {
-    // empty
+// empty
 }
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 bc6ebceb2de..e59995246c1 100644
--- a/src/test/java/org/jabref/testutils/interactive/styletester/StyleTesterMain.java
+++ b/src/test/java/org/jabref/testutils/interactive/styletester/StyleTesterMain.java
@@ -3,7 +3,6 @@
 import javafx.application.Application;
 import javafx.scene.Scene;
 import javafx.stage.Stage;
-
 import org.jabref.gui.JabRefExecutorService;
 import org.jabref.gui.theme.ThemeManager;
 import org.jabref.gui.util.DefaultFileUpdateMonitor;
@@ -22,12 +21,17 @@ public static void main(String[] args) {
     @Override
     public void start(Stage stage) throws JabRefException {
         StyleTesterView view = new StyleTesterView();
-        DefaultFileUpdateMonitor fileUpdateMonitor = new DefaultFileUpdateMonitor();
-        JabRefExecutorService.INSTANCE.executeInterruptableTask(fileUpdateMonitor, "FileUpdateMonitor");
+        DefaultFileUpdateMonitor fileUpdateMonitor =
+            new DefaultFileUpdateMonitor();
+        JabRefExecutorService.INSTANCE.executeInterruptableTask(
+            fileUpdateMonitor,
+            "FileUpdateMonitor"
+        );
         ThemeManager themeManager = new ThemeManager(
-                JabRefPreferences.getInstance().getWorkspacePreferences(),
-                fileUpdateMonitor,
-                Runnable::run);
+            JabRefPreferences.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 c4e3c3779b0..ba9bc2bb7d6 100644
--- a/src/test/java/org/jabref/testutils/interactive/styletester/StyleTesterView.java
+++ b/src/test/java/org/jabref/testutils/interactive/styletester/StyleTesterView.java
@@ -1,28 +1,44 @@
 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;
-    @FXML private Button normalButtonFocused;
-    @FXML private Button textButtonHover;
-    @FXML private Button textButtonPressed;
-    @FXML private Button textButtonFocused;
-    @FXML private Button containedButtonHover;
-    @FXML private Button containedButtonPressed;
-    @FXML private Button containedButtonFocused;
+
+    @FXML
+    private Button normalButtonHover;
+
+    @FXML
+    private Button normalButtonPressed;
+
+    @FXML
+    private Button normalButtonFocused;
+
+    @FXML
+    private Button textButtonHover;
+
+    @FXML
+    private Button textButtonPressed;
+
+    @FXML
+    private Button textButtonFocused;
+
+    @FXML
+    private Button containedButtonHover;
+
+    @FXML
+    private Button containedButtonPressed;
+
+    @FXML
+    private Button containedButtonFocused;
+
     private Parent content;
 
     StyleTesterView() {
-        content = ViewLoader.view(this)
-                            .load()
-                            .getView();
+        content = ViewLoader.view(this).load().getView();
 
         setStates();
     }

From 3582e1e5d3b83e31963b25ef4f7773c4e09fcf3a Mon Sep 17 00:00:00 2001
From: Oliver Kopp <kopp.dev@gmail.com>
Date: Fri, 17 Nov 2023 16:33:33 +0100
Subject: [PATCH 22/27] Only error, no push - on remote PRs

---
 .github/workflows/tests.yml | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 2fb37649b43..fc61bba7009 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -45,7 +45,16 @@ jobs:
           show-progress: 'false'
       - name: Install prettier-plugin-java
         run: npm install
-      - name: Prettify code
+      - name: Check code style (using prettier-java)
+        if: github.event_name == 'pull_request' && github.event.pull_request.head.repo.full_name != github.repository
+        uses: creyD/prettier_action@v4.3
+        with:
+          prettier_options: --check **/*.java
+          prettier_plugins: "prettier-plugin-java"
+          clean_node_folder: false
+          dry: true
+      - name: Reformat code (using prettier-java)
+       if: "!(github.event_name == 'pull_request' && github.event.pull_request.head.repo.full_name != github.repository)"
         uses: creyD/prettier_action@v4.3
         with:
           prettier_options: --write **/*.java

From 0d5cd4ea41b0cfe9b63d8e7ed0eb6efef8359734 Mon Sep 17 00:00:00 2001
From: Oliver Kopp <kopp.dev@gmail.com>
Date: Fri, 17 Nov 2023 16:53:39 +0100
Subject: [PATCH 23/27] Remove comments - don't work on forks

---
 .github/workflows/tests.yml | 58 -------------------------------------
 1 file changed, 58 deletions(-)

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index fc61bba7009..ca4e9861aea 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -75,20 +75,6 @@ jobs:
           checkstyle_version: '10.3'
       - name: Run checkstyle using gradle
         run: ./gradlew checkstyleMain checkstyleTest checkstyleJmh
-      - name: Add comment on pull request
-        if: ${{ failure() }}
-        uses: thollander/actions-comment-pull-request@v2
-        with:
-          message: >
-              Your code currently does not meet JabRef's code guidelines.
-              We use [Checkstyle](https://checkstyle.sourceforge.io/) to identify issues.
-              The tool reviewdog already placed comments on GitHub to indicate the places. See the tab "Files" in you PR.
-              Please carefully follow [the setup guide for the codestyle](https://devdocs.jabref.org/getting-into-the-code/guidelines-for-setting-up-a-local-workspace/intellij-13-code-style.html).
-              Afterwards, please run checkstyle locally and fix the issues.
-
-
-              More information on code quality in JabRef is available at <https://devdocs.jabref.org/getting-into-the-code/development-strategy.html>.
-          comment_tag: checkstyle
   openrewrite:
     name: OpenRewrite
     runs-on: ubuntu-latest
@@ -107,19 +93,6 @@ jobs:
       - name: Run OpenRewrite
         run: |
           ./gradlew rewriteDryRun
-      - name: Add comment on pull request
-        if: ${{ failure() }}
-        uses: thollander/actions-comment-pull-request@v2
-        with:
-          message: >
-              Your code currently does not meet JabRef's code guidelines.
-              We use [OpenRewrite](https://docs.openrewrite.org/) to ensure "modern" Java coding practices.
-              The issues found can be **automatically fixed**.
-              Please execute the gradle task *`rewriteRun`*, check the results, commit, and push.
-
-
-              You can check the detailed error output at the tab "Checks", section "Tests" (on the left), subsection "OpenRewrite".
-          comment_tag: openrewrite
   modernizer:
     name: Modernizer
     runs-on: ubuntu-latest
@@ -140,18 +113,6 @@ jobs:
           # enable failing of this task if modernizer complains
           sed -i "s/failOnViolations = false/failOnViolations = true/" build.gradle
           ./gradlew modernizer
-      - name: Add comment on pull request
-        if: ${{ failure() }}
-        uses: thollander/actions-comment-pull-request@v2
-        with:
-          message: >
-              Your code currently does not meet JabRef's code guidelines.
-              We use [Gradle Modernizer Plugin](https://github.com/andygoossens/gradle-modernizer-plugin#gradle-modernizer-plugin) to ensure "modern" Java coding practices.
-              Please fix the detected errors, commit, and push.
-
-
-              You can check the detailed error output at the tab "Checks", section "Tests" (on the left), subsection "Modernizer".
-          comment_tag: modernizer
   markdown:
     name: Markdown
     runs-on: ubuntu-latest
@@ -167,17 +128,6 @@ jobs:
           globs: |
             *.md
             docs/**/*.md
-      - name: Add comment on pull request
-        if: ${{ failure() }}
-        uses: thollander/actions-comment-pull-request@v2
-        with:
-          message: >
-              You modified Markdown (*.md) files.
-              To ensure consistent styling, we have [markdown-lint](https://github.com/DavidAnson/markdownlint) in place.
-              [Markdown lint's rules](https://github.com/DavidAnson/markdownlint/blob/main/doc/Rules.md#rules) help to keep our Markdown files consistent within this repository and consistent with the Markdown files outside here.
-
-              You can check the detailed error output at the tab "Checks", section "Tests" (on the left), subsection "Markdown".
-          comment_tag: markdown
   changelog:
     name: CHANGELOG.md
     runs-on: ubuntu-latest
@@ -224,14 +174,6 @@ jobs:
           diff \
             <(git show origin/main:CHANGELOG.md | clparse --format=json --separator=– - | jq '.releases[] | select(.version != null)') \
             <(git show HEAD:CHANGELOG.md | clparse --format=json --separator=– - | jq '.releases[] | select(.version != null)')
-      - name: Add comment on pull request
-        if: ${{ failure() }}
-        uses: thollander/actions-comment-pull-request@v2
-        with:
-          message: >
-              While the PR was in progress, JabRef released a new version.
-              You have to merge `upstream/main` and move your entry in `CHANGELOG.md` to section `## [Unreleased]`.
-          comment_tag: changelog-unreleased-only
   tests:
     name: Unit tests
     runs-on: ubuntu-latest

From f447423abfe3256a13f9255f92c915d2bce1171f Mon Sep 17 00:00:00 2001
From: Oliver Kopp <kopp.dev@gmail.com>
Date: Fri, 17 Nov 2023 16:59:20 +0100
Subject: [PATCH 24/27] Disable UnnecessaryParantheses due to
 https://github.com/openrewrite/rewrite-static-analysis/issues/219

---
 rewrite.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/rewrite.yml b/rewrite.yml
index 7d5eaad4866..2d73bf8c98a 100644
--- a/rewrite.yml
+++ b/rewrite.yml
@@ -85,7 +85,8 @@ recipeList:
   #  - org.openrewrite.staticanalysis.UnnecessaryCloseInTryWithResources
   # Does not work
   #  - org.openrewrite.staticanalysis.UnnecessaryExplicitTypeArguments
-  - org.openrewrite.staticanalysis.UnnecessaryParentheses
+  # Contradicts Prettier-Java
+  #  - org.openrewrite.staticanalysis.UnnecessaryParentheses
   # Does not work
   #  - org.openrewrite.staticanalysis.UnnecessaryPrimitiveAnnotations
   # Removes too much throws

From 2c409bb8747fa1828714b63eed9c54c3d24e6b83 Mon Sep 17 00:00:00 2001
From: Oliver Kopp <kopp.dev@gmail.com>
Date: Sat, 18 Nov 2023 11:08:51 +0100
Subject: [PATCH 25/27] Switch to 100 line width

---
 .prettierrc.yaml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.prettierrc.yaml b/.prettierrc.yaml
index eed5d963f44..0a88ae54481 100644
--- a/.prettierrc.yaml
+++ b/.prettierrc.yaml
@@ -1,3 +1,4 @@
 tabWidth: 4
+printWidth: 100
 plugins:
   - prettier-plugin-java

From 6f151ec1491975fe8c1b3dd7e914cf774ca301dd Mon Sep 17 00:00:00 2001
From: Oliver Kopp <kopp.dev@gmail.com>
Date: Sat, 18 Nov 2023 11:17:50 +0100
Subject: [PATCH 26/27] Reformat code

---
 .../org/jabref/benchmarks/Benchmarks.java     |   7 +-
 src/main/java/module-info.java                |   6 +-
 .../org/jabref/cli/ArgumentProcessor.java     | 240 ++++-----------
 .../java/org/jabref/cli/AuxCommandLine.java   |   4 +-
 src/main/java/org/jabref/cli/JabRefCLI.java   |  69 +----
 .../jabref/cli/JournalListMvGenerator.java    |  50 ++-
 src/main/java/org/jabref/cli/Launcher.java    |  47 +--
 .../java/org/jabref/gui/ClipBoardManager.java |  37 +--
 .../java/org/jabref/gui/DefaultInjector.java  |  14 +-
 .../java/org/jabref/gui/DialogService.java    |  46 +--
 .../jabref/gui/DragAndDropDataFormats.java    |   9 +-
 .../org/jabref/gui/DragAndDropHelper.java     |   4 +-
 .../java/org/jabref/gui/EntryTypeView.java    |  75 ++---
 .../org/jabref/gui/EntryTypeViewModel.java    |  68 ++---
 src/main/java/org/jabref/gui/FXDialog.java    |  17 +-
 .../jabref/gui/FallbackExceptionHandler.java  |  15 +-
 src/main/java/org/jabref/gui/Globals.java     |  10 +-
 .../org/jabref/gui/actions/ActionFactory.java |  80 +----
 .../org/jabref/gui/actions/ActionHelper.java  |  45 +--
 .../org/jabref/gui/actions/JabRefAction.java  |  21 +-
 .../org/jabref/gui/actions/SimpleCommand.java |   4 +-
 .../jabref/gui/actions/StandardActions.java   | 204 +++----------
 .../autocompleter/AppendWordsStrategy.java    |   5 +-
 .../AutoCompletionTextInputBinding.java       |  40 +--
 .../BibEntrySuggestionProvider.java           |   5 +-
 .../ContentSelectorSuggestionProvider.java    |   8 +-
 .../EmptySuggestionProvider.java              |   5 +-
 .../JournalsSuggestionProvider.java           |   5 +-
 .../PersonNameSuggestionProvider.java         |  20 +-
 .../StringSuggestionProvider.java             |   5 +-
 .../autocompleter/SuggestionProviders.java    |  14 +-
 .../autosaveandbackup/AutosaveManager.java    |  16 +-
 .../gui/autosaveandbackup/BackupManager.java  | 126 ++------
 .../auximport/AuxParserResultViewModel.java   |   5 +-
 .../jabref/gui/auximport/FromAuxDialog.java   |  30 +-
 .../gui/auximport/FromAuxDialogViewModel.java |  51 +---
 .../gui/auximport/NewSubLibraryAction.java    |   9 +-
 .../gui/backup/BackupResolverDialog.java      |  26 +-
 .../gui/bibtexextractor/BibtexExtractor.java  |  34 +--
 .../BibtexExtractorViewModel.java             |  31 +-
 .../bibtexextractor/ExtractBibtexAction.java  |   4 +-
 .../bibtexextractor/ExtractBibtexDialog.java  |   4 +-
 .../GenerateCitationKeyAction.java            |  71 ++---
 .../GenerateCitationKeySingleAction.java      |  15 +-
 .../org/jabref/gui/cleanup/CleanupAction.java |  47 +--
 .../org/jabref/gui/cleanup/CleanupDialog.java |   4 +-
 .../gui/cleanup/CleanupPresetPanel.java       |  81 ++---
 .../gui/cleanup/CleanupSingleAction.java      |  35 +--
 .../org/jabref/gui/collab/ChangeScanner.java  |  10 +-
 .../org/jabref/gui/collab/DatabaseChange.java |   9 +-
 .../DatabaseChangeDetailsViewFactory.java     |   5 +-
 .../jabref/gui/collab/DatabaseChangeList.java |  36 +--
 .../gui/collab/DatabaseChangeMonitor.java     |  30 +-
 .../gui/collab/DatabaseChangeResolver.java    |   3 +-
 .../collab/DatabaseChangesResolverDialog.java |  23 +-
 .../ExternalChangesResolverViewModel.java     |  16 +-
 .../jabref/gui/collab/entryadd/EntryAdd.java  |   4 +-
 .../gui/collab/entrychange/EntryChange.java   |  14 +-
 .../entrychange/EntryChangeDetailsView.java   |  56 ++--
 .../entrychange/EntryChangeResolver.java      |   9 +-
 .../EntryWithPreviewAndSourceDetailsView.java |  21 +-
 .../entrychange/PreviewWithSourceTab.java     |  20 +-
 .../gui/collab/entrydelete/EntryDelete.java   |   7 +-
 .../gui/collab/groupchange/GroupChange.java   |  11 +-
 .../collab/metedatachange/MetadataChange.java |   4 +-
 .../MetadataChangeDetailsView.java            |  24 +-
 .../collab/preamblechange/PreambleChange.java |   8 +-
 .../PreambleChangeDetailsView.java            |  14 +-
 .../gui/collab/stringadd/BibTexStringAdd.java |  15 +-
 .../stringadd/BibTexStringAddDetailsView.java |  17 +-
 .../stringchange/BibTexStringChange.java      |  12 +-
 .../BibTexStringChangeDetailsView.java        |  15 +-
 .../stringdelete/BibTexStringDelete.java      |  13 +-
 .../BibTexStringDeleteDetailsView.java        |  13 +-
 .../stringrename/BibTexStringRename.java      |  16 +-
 .../BibTexStringRenameDetailsView.java        |   7 +-
 .../CitationKeyPatternPanel.java              |  77 ++---
 .../CitationKeyPatternPanelItemModel.java     |  16 +-
 .../CitationKeyPatternPanelViewModel.java     |  45 +--
 .../FieldFormatterCleanupsPanel.java          |  39 +--
 .../FieldFormatterCleanupsPanelViewModel.java |  60 ++--
 .../SaveOrderConfigPanel.java                 |  61 +---
 .../SaveOrderConfigPanelViewModel.java        |  41 +--
 .../SortCriterionViewModel.java               |  11 +-
 .../jabref/gui/copyfiles/CopyFilesAction.java |  17 +-
 .../gui/copyfiles/CopyFilesDialogView.java    |  12 +-
 .../copyfiles/CopyFilesDialogViewModel.java   |  11 +-
 .../CopyFilesResultItemViewModel.java         |  12 +-
 .../CopyFilesResultListDependency.java        |   4 +-
 .../jabref/gui/copyfiles/CopyFilesTask.java   |  66 +---
 .../gui/copyfiles/CopySingleFileAction.java   |  32 +-
 .../org/jabref/gui/desktop/JabRefDesktop.java | 108 ++-----
 .../jabref/gui/desktop/os/DefaultDesktop.java |  13 +-
 .../java/org/jabref/gui/desktop/os/Linux.java |  92 ++----
 .../jabref/gui/desktop/os/NativeDesktop.java  |  40 +--
 .../java/org/jabref/gui/desktop/os/OSX.java   |  31 +-
 .../org/jabref/gui/desktop/os/Windows.java    |  69 ++---
 .../jabref/gui/dialogs/AutosaveUiManager.java |   8 +-
 .../jabref/gui/dialogs/BackupUIManager.java   |  51 +---
 .../documentviewer/DocumentViewerControl.java |  44 +--
 .../documentviewer/DocumentViewerView.java    |  22 +-
 .../DocumentViewerViewModel.java              |  21 +-
 .../PdfDocumentPageViewModel.java             |  18 +-
 .../documentviewer/PdfDocumentViewModel.java  |   4 +-
 .../ShowDocumentViewerAction.java             |  16 +-
 .../DuplicateResolverDialog.java              |  91 ++----
 .../duplicationFinder/DuplicateSearch.java    |  44 +--
 .../org/jabref/gui/edit/CopyDoiUrlAction.java |  13 +-
 .../org/jabref/gui/edit/CopyMoreAction.java   |  63 +---
 .../java/org/jabref/gui/edit/EditAction.java  |  34 +--
 .../jabref/gui/edit/ManageKeywordsAction.java |  13 +-
 .../jabref/gui/edit/ManageKeywordsDialog.java |  26 +-
 .../gui/edit/ManageKeywordsViewModel.java     |  54 +---
 .../jabref/gui/edit/OpenBrowserAction.java    |   6 +-
 .../jabref/gui/edit/ReplaceStringAction.java  |   8 +-
 .../jabref/gui/edit/ReplaceStringView.java    |   6 +-
 .../gui/edit/ReplaceStringViewModel.java      |  13 +-
 ...tractAutomaticFieldEditorTabViewModel.java |   6 +-
 .../AutomaticFieldEditorAction.java           |  14 +-
 .../AutomaticFieldEditorDialog.java           |  33 +-
 .../AutomaticFieldEditorViewModel.java        |   4 +-
 .../MoveFieldValueAction.java                 |  16 +-
 .../NotificationPaneAdapter.java              |   3 +-
 .../CopyOrMoveFieldContentTabView.java        |  35 +--
 .../CopyOrMoveFieldContentTabViewModel.java   |  72 +----
 .../EditFieldContentTabView.java              |  33 +-
 .../EditFieldContentViewModel.java            |  74 ++---
 .../renamefield/RenameFieldTabView.java       |  15 +-
 .../renamefield/RenameFieldViewModel.java     |  18 +-
 .../jabref/gui/entryeditor/CommentsTab.java   |  12 +-
 .../gui/entryeditor/DeprecatedFieldsTab.java  |   9 +-
 .../jabref/gui/entryeditor/EntryEditor.java   |  83 ++---
 .../entryeditor/EntryEditorPreferences.java   |  47 +--
 .../gui/entryeditor/EntryEditorTab.java       |   5 +-
 .../gui/entryeditor/FieldsEditorTab.java      |  39 +--
 .../gui/entryeditor/LatexCitationsTab.java    |  33 +-
 .../LatexCitationsTabViewModel.java           |  56 +---
 .../jabref/gui/entryeditor/MathSciNetTab.java |   4 +-
 .../entryeditor/OpenEntryEditorAction.java    |   4 +-
 .../entryeditor/OptionalFieldsTabBase.java    |   9 +-
 .../gui/entryeditor/OtherFieldsTab.java       |   5 +-
 .../gui/entryeditor/PreviewSwitchAction.java  |  11 +-
 .../jabref/gui/entryeditor/PreviewTab.java    |   4 +-
 .../gui/entryeditor/RelatedArticlesTab.java   |  63 +---
 .../org/jabref/gui/entryeditor/SciteTab.java  |  33 +-
 .../gui/entryeditor/SciteTabViewModel.java    |  24 +-
 .../org/jabref/gui/entryeditor/SourceTab.java | 136 ++-------
 .../BibEntryRelationsCache.java               |  34 +--
 .../citationrelationtab/BibEntryView.java     |  20 +-
 .../CitationRelationsTab.java                 |  92 ++----
 .../SemanticScholarFetcher.java               |  22 +-
 .../FileAnnotationTabView.java                |  25 +-
 .../FileAnnotationTabViewModel.java           |  49 +--
 .../FileAnnotationViewModel.java              |   8 +-
 .../FulltextSearchResultsTab.java             |  54 +---
 .../gui/errorconsole/ErrorConsoleView.java    |  46 +--
 .../errorconsole/ErrorConsoleViewModel.java   |  21 +-
 .../gui/errorconsole/LogEventViewModel.java   |   9 +-
 .../CreateModifyExporterDialogView.java       |  14 +-
 .../CreateModifyExporterDialogViewModel.java  |  29 +-
 .../jabref/gui/exporter/ExportCommand.java    |  64 +---
 .../gui/exporter/ExportToClipboardAction.java |  55 +---
 .../org/jabref/gui/exporter/SaveAction.java   |   4 +-
 .../jabref/gui/exporter/SaveAllAction.java    |   5 +-
 .../gui/exporter/SaveDatabaseAction.java      | 138 +++------
 .../WriteMetadataToLinkedPdfsAction.java      |  41 +--
 .../externalfiles/AutoLinkFilesAction.java    |  90 +++---
 .../externalfiles/AutoSetFileLinksUtil.java   |  51 +---
 .../gui/externalfiles/ChainedFilters.java     |   4 +-
 .../externalfiles/DownloadFullTextAction.java |  66 ++--
 .../ExternalFilesEntryLinker.java             |  50 ++-
 .../gui/externalfiles/FileDownloadTask.java   |  12 +-
 .../externalfiles/FileExtensionViewModel.java |   3 +-
 .../gui/externalfiles/FileFilterUtils.java    |   9 +-
 .../FindUnlinkedFilesAction.java              |   5 +-
 .../externalfiles/GitIgnoreFileFilter.java    |  24 +-
 .../ImportFilesResultItemViewModel.java       |  14 +-
 .../gui/externalfiles/ImportHandler.java      | 147 +++------
 .../externalfiles/UnlinkedFilesCrawler.java   |  31 +-
 .../UnlinkedFilesDialogView.java              |  72 ++---
 .../UnlinkedFilesDialogViewModel.java         | 102 ++-----
 .../CustomExternalFileType.java               |  18 +-
 .../externalfiletype/ExternalFileTypes.java   |  30 +-
 .../StandardExternalFileType.java             |  81 +----
 .../fieldeditors/AbstractEditorViewModel.java |  24 +-
 .../gui/fieldeditors/CitationKeyEditor.java   |   5 +-
 .../jabref/gui/fieldeditors/DateEditor.java   |   5 +-
 .../gui/fieldeditors/DateEditorViewModel.java |   9 +-
 .../gui/fieldeditors/EditorTextArea.java      |   5 +-
 .../gui/fieldeditors/EditorTextField.java     |   5 +-
 .../gui/fieldeditors/EditorValidator.java     |   3 +-
 .../gui/fieldeditors/FieldEditorFX.java       |   7 +-
 .../jabref/gui/fieldeditors/FieldEditors.java |  80 +----
 .../gui/fieldeditors/FieldNameLabel.java      |  88 ++----
 .../jabref/gui/fieldeditors/GroupEditor.java  |  25 +-
 .../jabref/gui/fieldeditors/ISSNEditor.java   |   5 +-
 .../gui/fieldeditors/ISSNEditorViewModel.java |  12 +-
 .../gui/fieldeditors/JournalEditor.java       |  10 +-
 .../fieldeditors/JournalEditorViewModel.java  |   7 +-
 .../JournalInfoOptInDialogHelper.java         |  34 +--
 .../gui/fieldeditors/KeywordsEditor.java      |   8 +-
 .../gui/fieldeditors/LinkedEntriesEditor.java |  43 +--
 .../LinkedEntriesEditorViewModel.java         |   6 +-
 .../gui/fieldeditors/LinkedFileViewModel.java | 273 +++++------------
 .../gui/fieldeditors/LinkedFilesEditor.java   | 155 +++-------
 .../LinkedFilesEditorViewModel.java           | 101 ++-----
 .../fieldeditors/MapBasedEditorViewModel.java |  14 +-
 .../jabref/gui/fieldeditors/OptionEditor.java |  14 +-
 .../jabref/gui/fieldeditors/OwnerEditor.java  |   5 +-
 .../gui/fieldeditors/PersonsEditor.java       |  12 +-
 .../fieldeditors/PersonsEditorViewModel.java  |   4 +-
 .../jabref/gui/fieldeditors/PopOverUtil.java  |   8 +-
 .../jabref/gui/fieldeditors/SimpleEditor.java |  29 +-
 .../TextInputControlBehavior.java             |  26 +-
 .../org/jabref/gui/fieldeditors/URLUtil.java  |  37 +--
 .../jabref/gui/fieldeditors/UrlEditor.java    |  12 +-
 .../gui/fieldeditors/UrlEditorViewModel.java  |  13 +-
 .../WriteMetadataToSinglePdfAction.java       |  27 +-
 .../fieldeditors/contextmenu/DefaultMenu.java |  14 +-
 .../contextmenu/EditorContextAction.java      |  43 +--
 .../fieldeditors/contextmenu/EditorMenus.java |  39 +--
 .../contextmenu/ProtectedTermsMenu.java       |  31 +-
 .../BaseIdentifierEditorViewModel.java        |  40 +--
 .../DoiIdentifierEditorViewModel.java         |  20 +-
 .../EprintIdentifierEditorViewModel.java      |  13 +-
 .../ISBNIdentifierEditorViewModel.java        |   8 +-
 .../identifier/IdentifierEditor.java          |  18 +-
 .../journalinfo/JournalInfoView.java          |  12 +-
 .../journalinfo/JournalInfoViewModel.java     |  77 ++---
 .../jabref/gui/groups/GroupDescriptions.java  |  23 +-
 .../jabref/gui/groups/GroupDialogView.java    | 144 +++------
 .../gui/groups/GroupDialogViewModel.java      | 285 +++++-------------
 232 files changed, 2004 insertions(+), 5925 deletions(-)

diff --git a/src/jmh/java/org/jabref/benchmarks/Benchmarks.java b/src/jmh/java/org/jabref/benchmarks/Benchmarks.java
index 2f12d81edbc..4640a161656 100644
--- a/src/jmh/java/org/jabref/benchmarks/Benchmarks.java
+++ b/src/jmh/java/org/jabref/benchmarks/Benchmarks.java
@@ -62,8 +62,7 @@ public void init() throws Exception {
             entry.setField(StandardField.TITLE, "This is my title " + i);
             entry.setField(
                 StandardField.AUTHOR,
-                "Firstname Lastname and FirstnameA LastnameA and FirstnameB LastnameB" +
-                i
+                "Firstname Lastname and FirstnameA LastnameA and FirstnameB LastnameB" + i
             );
             entry.setField(StandardField.JOURNAL, "Journal Title " + i);
             entry.setField(StandardField.KEYWORDS, "testkeyword");
@@ -100,9 +99,7 @@ private StringWriter getOutputWriter() throws IOException {
 
     @Benchmark
     public ParserResult parse() throws IOException {
-        BibtexParser parser = new BibtexParser(
-            Globals.prefs.getImportFormatPreferences()
-        );
+        BibtexParser parser = new BibtexParser(Globals.prefs.getImportFormatPreferences());
         return parser.parse(new StringReader(bibtexString));
     }
 
diff --git a/src/main/java/module-info.java b/src/main/java/module-info.java
index c363e0b33fe..50c1a06eed4 100644
--- a/src/main/java/module-info.java
+++ b/src/main/java/module-info.java
@@ -25,10 +25,8 @@
     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 org.controlsfx.controls;
     requires org.fxmisc.richtext;
diff --git a/src/main/java/org/jabref/cli/ArgumentProcessor.java b/src/main/java/org/jabref/cli/ArgumentProcessor.java
index 90c9e987e81..9b2cfa77f79 100644
--- a/src/main/java/org/jabref/cli/ArgumentProcessor.java
+++ b/src/main/java/org/jabref/cli/ArgumentProcessor.java
@@ -63,9 +63,7 @@
 
 public class ArgumentProcessor {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(
-        ArgumentProcessor.class
-    );
+    private static final Logger LOGGER = LoggerFactory.getLogger(ArgumentProcessor.class);
     private final JabRefCLI cli;
 
     // Written once by processArguments()
@@ -153,10 +151,7 @@ private Optional<ParserResult> importFile(String argument) {
             if (OS.WINDOWS) {
                 file = Path.of(address);
             } else {
-                file =
-                    Path.of(
-                        address.replace("~", System.getProperty("user.home"))
-                    );
+                file = Path.of(address.replace("~", System.getProperty("user.home")));
             }
         }
 
@@ -187,36 +182,21 @@ private Optional<ParserResult> importFile(Path file, String importFormat) {
 
             if (!"*".equals(importFormat)) {
                 System.out.println(Localization.lang("Importing %0", file));
-                ParserResult result = importFormatReader.importFromFile(
-                    importFormat,
-                    file
-                );
+                ParserResult result = importFormatReader.importFromFile(importFormat, file);
                 return Optional.of(result);
             } else {
                 // * means "guess the format":
-                System.out.println(
-                    Localization.lang(
-                        "Importing file %0 as unknown format",
-                        file
-                    )
-                );
+                System.out.println(Localization.lang("Importing file %0 as unknown format", file));
 
                 ImportFormatReader.UnknownFormatImport importResult =
-                    importFormatReader.importUnknownFormat(
-                        file,
-                        new DummyFileUpdateMonitor()
-                    );
+                    importFormatReader.importUnknownFormat(file, new DummyFileUpdateMonitor());
 
-                System.out.println(
-                    Localization.lang("Format used: %0", importResult.format())
-                );
+                System.out.println(Localization.lang("Format used: %0", importResult.format()));
                 return Optional.of(importResult.parserResult());
             }
         } catch (ImportException ex) {
             System.err.println(
-                Localization.lang("Error opening file '%0'", file) +
-                "\n" +
-                ex.getLocalizedMessage()
+                Localization.lang("Error opening file '%0'", file) + "\n" + ex.getLocalizedMessage()
             );
             return Optional.empty();
         }
@@ -263,9 +243,7 @@ public void processArguments() {
                 }
             } else {
                 System.err.println(
-                    Localization.lang(
-                        "The output option depends on a valid input option."
-                    )
+                    Localization.lang("The output option depends on a valid input option.")
                 );
             }
         }
@@ -280,28 +258,21 @@ public void processArguments() {
 
         if (
             (cli.isWriteXMPtoPdf() && cli.isEmbeddBibfileInPdf()) ||
-            (cli.isWriteMetadatatoPdf() &&
-                (cli.isWriteXMPtoPdf() || cli.isEmbeddBibfileInPdf()))
+            (cli.isWriteMetadatatoPdf() && (cli.isWriteXMPtoPdf() || cli.isEmbeddBibfileInPdf()))
         ) {
             System.err.println(
                 "Give only one of [writeXMPtoPdf, embeddBibfileInPdf, writeMetadatatoPdf]"
             );
         }
 
-        if (
-            cli.isWriteMetadatatoPdf() ||
-            cli.isWriteXMPtoPdf() ||
-            cli.isEmbeddBibfileInPdf()
-        ) {
+        if (cli.isWriteMetadatatoPdf() || cli.isWriteXMPtoPdf() || cli.isEmbeddBibfileInPdf()) {
             if (!loaded.isEmpty()) {
                 writeMetadataToPdf(
                     loaded,
                     cli.getWriteMetadatatoPdf(),
                     preferencesService.getXmpPreferences(),
                     preferencesService.getFilePreferences(),
-                    preferencesService
-                        .getLibraryPreferences()
-                        .getDefaultBibDatabaseMode(),
+                    preferencesService.getLibraryPreferences().getDefaultBibDatabaseMode(),
                     Globals.entryTypesManager,
                     preferencesService.getFieldPreferences(),
                     Globals.journalAbbreviationRepository,
@@ -317,18 +288,14 @@ public void processArguments() {
                 LOGGER.debug("Finished export");
             } else {
                 System.err.println(
-                    Localization.lang(
-                        "The output option depends on a valid import option."
-                    )
+                    Localization.lang("The output option depends on a valid import option.")
                 );
             }
         }
 
         if (cli.isPreferencesExport()) {
             try {
-                preferencesService.exportPreferences(
-                    Path.of(cli.getPreferencesExport())
-                );
+                preferencesService.exportPreferences(Path.of(cli.getPreferencesExport()));
             } catch (JabRefException ex) {
                 LOGGER.error("Cannot export preferences", ex);
             }
@@ -354,21 +321,18 @@ private void writeMetadataToPdf(
         boolean embeddBibfile
     ) {
         if (loaded.isEmpty()) {
-            LOGGER.error(
-                "The write xmp option depends on a valid import option."
-            );
+            LOGGER.error("The write xmp option depends on a valid import option.");
             return;
         }
         ParserResult pr = loaded.get(loaded.size() - 1);
         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()) {
@@ -474,10 +438,7 @@ private void writeMetadataToPDFsOfEntry(
                 }
             }
         } catch (Exception e) {
-            LOGGER.error(
-                "Failed writing metadata on a linked file of {}.",
-                citeKey
-            );
+            LOGGER.error("Failed writing metadata on a linked file of {}.", citeKey);
         }
     }
 
@@ -496,10 +457,7 @@ private void writeMetadataToPdfByCitekey(
                 .getDatabase()
                 .getEntriesByCitationKey(citeKey);
             if (bibEntryList.isEmpty()) {
-                System.err.printf(
-                    "Skipped - Cannot find %s in library.%n",
-                    citeKey
-                );
+                System.err.printf("Skipped - Cannot find %s in library.%n", citeKey);
                 continue;
             }
             for (BibEntry entry : bibEntryList) {
@@ -533,16 +491,10 @@ private void writeMetadataToPdfByFileNames(
             if (!filePath.isAbsolute()) {
                 filePath =
                     FileUtil
-                        .find(
-                            fileName,
-                            databaseContext.getFileDirectories(filePreferences)
-                        )
+                        .find(fileName, databaseContext.getFileDirectories(filePreferences))
                         .orElse(
                             FileUtil
-                                .find(
-                                    fileName,
-                                    List.of(Path.of("").toAbsolutePath())
-                                )
+                                .find(fileName, List.of(Path.of("").toAbsolutePath()))
                                 .orElse(filePath)
                         );
             }
@@ -607,14 +559,9 @@ private boolean exportMatches(List<ParserResult> loaded) {
         BibDatabaseContext databaseContext = pr.getDatabaseContext();
         BibDatabase dataBase = pr.getDatabase();
 
-        SearchPreferences searchPreferences =
-            preferencesService.getSearchPreferences();
-        SearchQuery query = new SearchQuery(
-            searchTerm,
-            searchPreferences.getSearchFlags()
-        );
-        List<BibEntry> matches = new DatabaseSearcher(query, dataBase)
-            .getMatches();
+        SearchPreferences searchPreferences = preferencesService.getSearchPreferences();
+        SearchQuery query = new SearchQuery(searchTerm, searchPreferences.getSearchFlags());
+        List<BibEntry> matches = new DatabaseSearcher(query, dataBase).getMatches();
 
         // export matches
         if (!matches.isEmpty()) {
@@ -623,8 +570,7 @@ private boolean exportMatches(List<ParserResult> loaded) {
             // read in the export format, take default format if no format entered
             switch (data.length) {
                 case 3 -> formatName = data[2];
-                case 2 -> // default exporter: bib file
-                formatName = "bib";
+                case 2 -> formatName = "bib"; // default exporter: bib file
                 default -> {
                     System.err.println(
                         Localization
@@ -650,22 +596,13 @@ private boolean exportMatches(List<ParserResult> loaded) {
                     preferencesService,
                     Globals.entryTypesManager
                 );
-                Optional<Exporter> exporter = exporterFactory.getExporterByName(
-                    formatName
-                );
+                Optional<Exporter> exporter = exporterFactory.getExporterByName(formatName);
                 if (exporter.isEmpty()) {
-                    System.err.println(
-                        Localization.lang(
-                            "Unknown export format %0",
-                            formatName
-                        )
-                    );
+                    System.err.println(Localization.lang("Unknown export format %0", formatName));
                 } else {
                     // We have an TemplateExporter instance:
                     try {
-                        System.out.println(
-                            Localization.lang("Exporting %0", data[1])
-                        );
+                        System.out.println(Localization.lang("Exporting %0", data[1]));
                         exporter
                             .get()
                             .export(
@@ -702,13 +639,9 @@ private void doAuxImport(List<ParserResult> loaded) {
         }
 
         if (usageMsg) {
-            System.out.println(
-                Localization.lang("no base-BibTeX-file specified!")
-            );
+            System.out.println(Localization.lang("no base-BibTeX-file specified!"));
             System.out.println(Localization.lang("usage") + " :");
-            System.out.println(
-                "jabref --aux infile[.aux],outfile[.bib] base-BibTeX-file"
-            );
+            System.out.println("jabref --aux infile[.aux],outfile[.bib] base-BibTeX-file");
         }
     }
 
@@ -720,9 +653,7 @@ private List<ParserResult> importAndOpenFiles() {
                 // Leftover arguments that have a "bib" extension are interpreted as
                 // BIB files to open. Other files, and files that could not be opened
                 // as bib, we try to import instead.
-                boolean bibExtension = aLeftOver
-                    .toLowerCase(Locale.ENGLISH)
-                    .endsWith("bib");
+                boolean bibExtension = aLeftOver.toLowerCase(Locale.ENGLISH).endsWith("bib");
 
                 ParserResult pr = new ParserResult();
                 if (bibExtension) {
@@ -749,10 +680,7 @@ private List<ParserResult> importAndOpenFiles() {
                     if (startupMode == Mode.INITIAL_START) {
                         toImport.add(aLeftOver);
                     } else {
-                        loaded.add(
-                            importToOpenBase(aLeftOver)
-                                .orElse(new ParserResult())
-                        );
+                        loaded.add(importToOpenBase(aLeftOver).orElse(new ParserResult()));
                     }
                 } else {
                     loaded.add(pr);
@@ -820,9 +748,7 @@ private void saveDatabase(BibDatabase newBase, String subName) {
                 SelfContainedSaveConfiguration saveConfiguration =
                     (SelfContainedSaveConfiguration) new SelfContainedSaveConfiguration()
                         .withReformatOnSave(
-                            preferencesService
-                                .getLibraryPreferences()
-                                .shouldAlwaysReformatOnSave()
+                            preferencesService.getLibraryPreferences().shouldAlwaysReformatOnSave()
                         );
                 BibDatabaseWriter databaseWriter = new BibtexDatabaseWriter(
                     bibWriter,
@@ -847,9 +773,7 @@ private void saveDatabase(BibDatabase newBase, String subName) {
             }
         } catch (IOException ex) {
             System.err.println(
-                Localization.lang("Could not save file.") +
-                "\n" +
-                ex.getLocalizedMessage()
+                Localization.lang("Could not save file.") + "\n" + ex.getLocalizedMessage()
             );
         }
     }
@@ -865,9 +789,7 @@ private void exportFile(List<ParserResult> loaded, String[] data) {
                 }
             } else {
                 System.err.println(
-                    Localization.lang(
-                        "The output option depends on a valid import option."
-                    )
+                    Localization.lang("The output option depends on a valid import option.")
                 );
             }
         } else if (data.length == 2) {
@@ -876,8 +798,7 @@ private void exportFile(List<ParserResult> loaded, String[] data) {
             ParserResult parserResult = loaded.get(loaded.size() - 1);
 
             Path path = parserResult.getPath().get().toAbsolutePath();
-            BibDatabaseContext databaseContext =
-                parserResult.getDatabaseContext();
+            BibDatabaseContext databaseContext = parserResult.getDatabaseContext();
             databaseContext.setDatabasePath(path);
             List<Path> fileDirForDatabase = databaseContext.getFileDirectories(
                 preferencesService.getFilePreferences()
@@ -887,13 +808,9 @@ private void exportFile(List<ParserResult> loaded, String[] data) {
                 preferencesService,
                 Globals.entryTypesManager
             );
-            Optional<Exporter> exporter = exporterFactory.getExporterByName(
-                data[1]
-            );
+            Optional<Exporter> exporter = exporterFactory.getExporterByName(data[1]);
             if (exporter.isEmpty()) {
-                System.err.println(
-                    Localization.lang("Unknown export format %0", data[1])
-                );
+                System.err.println(Localization.lang("Unknown export format %0", data[1]));
             } else {
                 // We have an exporter:
                 try {
@@ -902,10 +819,7 @@ private void exportFile(List<ParserResult> loaded, String[] data) {
                         .export(
                             parserResult.getDatabaseContext(),
                             Path.of(data[0]),
-                            parserResult
-                                .getDatabaseContext()
-                                .getDatabase()
-                                .getEntries(),
+                            parserResult.getDatabaseContext().getDatabase().getEntries(),
                             fileDirForDatabase,
                             Globals.journalAbbreviationRepository
                         );
@@ -924,11 +838,8 @@ private void exportFile(List<ParserResult> loaded, String[] data) {
 
     private void importPreferences() {
         try {
-            preferencesService.importPreferences(
-                Path.of(cli.getPreferencesImport())
-            );
-            Globals.entryTypesManager =
-                preferencesService.getCustomEntryTypesRepository();
+            preferencesService.importPreferences(Path.of(cli.getPreferencesImport()));
+            Globals.entryTypesManager = preferencesService.getCustomEntryTypesRepository();
         } catch (JabRefException ex) {
             LOGGER.error("Cannot import preferences", ex);
         }
@@ -937,17 +848,11 @@ private void importPreferences() {
     private void resetPreferences(String value) {
         if ("all".equals(value.trim())) {
             try {
-                System.out.println(
-                    Localization.lang(
-                        "Setting all preferences to default values."
-                    )
-                );
+                System.out.println(Localization.lang("Setting all preferences to default values."));
                 preferencesService.clear();
                 new SharedDatabasePreferences().clear();
             } catch (BackingStoreException e) {
-                System.err.println(
-                    Localization.lang("Unable to clear preferences.")
-                );
+                System.err.println(Localization.lang("Unable to clear preferences."));
                 LOGGER.error("Unable to clear preferences", e);
             }
         } else {
@@ -956,10 +861,7 @@ private void resetPreferences(String value) {
                 try {
                     preferencesService.deleteKey(key.trim());
                     System.out.println(
-                        Localization.lang(
-                            "Resetting preference key '%0'",
-                            key.trim()
-                        )
+                        Localization.lang("Resetting preference key '%0'", key.trim())
                     );
                 } catch (IllegalArgumentException e) {
                     System.out.println(e.getMessage());
@@ -977,10 +879,7 @@ private void automaticallySetFileLinks(List<ParserResult> loaded) {
                 preferencesService.getFilePreferences(),
                 preferencesService.getAutoLinkPreferences()
             );
-            util.linkAssociatedFiles(
-                database.getEntries(),
-                new NamedCompound("")
-            );
+            util.linkAssociatedFiles(database.getEntries(), new NamedCompound(""));
         }
     }
 
@@ -988,11 +887,7 @@ private void regenerateCitationKeys(List<ParserResult> loaded) {
         for (ParserResult parserResult : loaded) {
             BibDatabase database = parserResult.getDatabase();
 
-            LOGGER.info(
-                Localization.lang(
-                    "Regenerating citation keys according to metadata"
-                )
-            );
+            LOGGER.info(Localization.lang("Regenerating citation keys according to metadata"));
 
             CitationKeyGenerator keyGenerator = new CitationKeyGenerator(
                 parserResult.getDatabaseContext(),
@@ -1013,13 +908,9 @@ 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("The following fetchers are available:")
+                Localization.lang("Expected syntax for --fetch='<name of fetcher>:<query>'")
             );
+            System.out.println(Localization.lang("The following fetchers are available:"));
             return Optional.empty();
         }
 
@@ -1036,43 +927,26 @@ private Optional<ParserResult> fetch(String fetchCommand) {
             .filter(fetcher -> fetcher.getName().equalsIgnoreCase(engine))
             .findFirst();
         if (selectedFetcher.isEmpty()) {
-            System.out.println(
-                Localization.lang("Could not find fetcher '%0'", engine)
-            );
+            System.out.println(Localization.lang("Could not find fetcher '%0'", engine));
 
-            System.out.println(
-                Localization.lang("The following fetchers are available:")
-            );
-            fetchers.forEach(fetcher ->
-                System.out.println("  " + fetcher.getName())
-            );
+            System.out.println(Localization.lang("The following fetchers are available:"));
+            fetchers.forEach(fetcher -> System.out.println("  " + fetcher.getName()));
 
             return Optional.empty();
         } else {
             System.out.println(
-                Localization.lang(
-                    "Running query '%0' with fetcher '%1'.",
-                    query,
-                    engine
-                )
+                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);
+                List<BibEntry> matches = selectedFetcher.get().performSearch(query);
                 if (matches.isEmpty()) {
-                    System.out.println(
-                        "\r" + Localization.lang("No results found.")
-                    );
+                    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())
-                        )
+                        Localization.lang("Found %0 results.", String.valueOf(matches.size()))
                     );
                     return Optional.of(new ParserResult(matches));
                 }
diff --git a/src/main/java/org/jabref/cli/AuxCommandLine.java b/src/main/java/org/jabref/cli/AuxCommandLine.java
index 0d2eb8bd496..3de321c467e 100644
--- a/src/main/java/org/jabref/cli/AuxCommandLine.java
+++ b/src/main/java/org/jabref/cli/AuxCommandLine.java
@@ -26,9 +26,7 @@ public BibDatabase perform() {
             AuxParserResult result = auxParser.parse(Path.of(auxFile));
             subDatabase = result.getGeneratedBibDatabase();
             // print statistics
-            System.out.println(
-                new AuxParserResultViewModel(result).getInformation(true)
-            );
+            System.out.println(new AuxParserResultViewModel(result).getInformation(true));
         }
         return subDatabase;
     }
diff --git a/src/main/java/org/jabref/cli/JabRefCLI.java b/src/main/java/org/jabref/cli/JabRefCLI.java
index 575e58bf242..13548cffa00 100644
--- a/src/main/java/org/jabref/cli/JabRefCLI.java
+++ b/src/main/java/org/jabref/cli/JabRefCLI.java
@@ -199,9 +199,7 @@ private static Options getOptions() {
             "g",
             "generateCitationKeys",
             false,
-            Localization.lang(
-                "Regenerate all keys for the entries in a BibTeX file"
-            )
+            Localization.lang("Regenerate all keys for the entries in a BibTeX file")
         );
         options.addOption(
             "b",
@@ -209,40 +207,22 @@ private static Options getOptions() {
             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("v", "version", false, Localization.lang("Display version"));
+        options.addOption(null, "debug", false, Localization.lang("Show debug level messages"));
 
         // The "-console" option is handled by the install4j launcher
         options.addOption(
             null,
             "console",
             false,
-            Localization.lang(
-                "Show console output (only when the launcher is used)"
-            )
+            Localization.lang("Show console output (only when the launcher is used)")
         );
 
         options.addOption(
             Option
                 .builder("i")
                 .longOpt("import")
-                .desc(
-                    String.format(
-                        "%s: '%s'",
-                        Localization.lang("Import file"),
-                        "-i library.bib"
-                    )
-                )
+                .desc(String.format("%s: '%s'", Localization.lang("Import file"), "-i library.bib"))
                 .hasArg()
                 .argName("FILE[,FORMAT]")
                 .build()
@@ -252,11 +232,7 @@ private static Options getOptions() {
             Option
                 .builder()
                 .longOpt("importToOpen")
-                .desc(
-                    Localization.lang(
-                        "Same as --import, but will be imported to the opened tab"
-                    )
-                )
+                .desc(Localization.lang("Same as --import, but will be imported to the opened tab"))
                 .hasArg()
                 .argName("FILE[,FORMAT]")
                 .build()
@@ -397,16 +373,12 @@ private static Options getOptions() {
                 .desc(
                     String.format(
                         "%s: '%s'",
-                        Localization.lang(
-                            "Write BibTeXEntry as XMP metadata to PDF."
-                        ),
+                        Localization.lang("Write BibTeXEntry as XMP metadata to PDF."),
                         "-w pathToMyOwnPaper.pdf"
                     )
                 )
                 .hasArg()
-                .argName(
-                    "CITEKEY1[,CITEKEY2][,CITEKEYn] | PDF1[,PDF2][,PDFn] | all"
-                )
+                .argName("CITEKEY1[,CITEKEY2][,CITEKEYn] | PDF1[,PDF2][,PDFn] | all")
                 .build()
         );
 
@@ -422,9 +394,7 @@ private static Options getOptions() {
                     )
                 )
                 .hasArg()
-                .argName(
-                    "CITEKEY1[,CITEKEY2][,CITEKEYn] | PDF1[,PDF2][,PDFn] | all"
-                )
+                .argName("CITEKEY1[,CITEKEY2][,CITEKEYn] | PDF1[,PDF2][,PDFn] | all")
                 .build()
         );
 
@@ -435,16 +405,12 @@ private static Options getOptions() {
                 .desc(
                     String.format(
                         "%s: '%s'",
-                        Localization.lang(
-                            "Write BibTeXEntry as metadata to PDF."
-                        ),
+                        Localization.lang("Write BibTeXEntry as metadata to PDF."),
                         "-w pathToMyOwnPaper.pdf"
                     )
                 )
                 .hasArg()
-                .argName(
-                    "CITEKEY1[,CITEKEY2][,CITEKEYn] | PDF1[,PDF2][,PDFn] | all"
-                )
+                .argName("CITEKEY1[,CITEKEY2][,CITEKEYn] | PDF1[,PDF2][,PDFn] | all")
                 .build()
         );
 
@@ -468,9 +434,7 @@ public static void printUsage(PreferencesService preferencesService) {
             .stream()
             .map(format -> new Pair<>(format.getName(), format.getId()))
             .toList();
-        String importFormatsIntro = Localization.lang(
-            "Available import formats"
-        );
+        String importFormatsIntro = Localization.lang("Available import formats");
         String importFormatsList = String.format(
             "%s:%n%s%n",
             importFormatsIntro,
@@ -523,9 +487,7 @@ protected static String alignStringTable(List<Pair<String, String>> table) {
 
         int maxLength = table
             .stream()
-            .mapToInt(pair ->
-                Objects.requireNonNullElse(pair.getKey(), "").length()
-            )
+            .mapToInt(pair -> Objects.requireNonNullElse(pair.getKey(), "").length())
             .max()
             .orElse(0);
 
@@ -547,10 +509,7 @@ protected static String alignStringTable(List<Pair<String, String>> table) {
     /**
      * Creates and wraps a multi-line and colon-seperated string from a List of Strings.
      */
-    protected static String wrapStringList(
-        List<String> list,
-        int firstLineIndentation
-    ) {
+    protected static String wrapStringList(List<String> list, int firstLineIndentation) {
         StringBuilder builder = new StringBuilder();
         int lastBreak = -firstLineIndentation;
 
diff --git a/src/main/java/org/jabref/cli/JournalListMvGenerator.java b/src/main/java/org/jabref/cli/JournalListMvGenerator.java
index e2ed00f0af3..bffd8afcf57 100644
--- a/src/main/java/org/jabref/cli/JournalListMvGenerator.java
+++ b/src/main/java/org/jabref/cli/JournalListMvGenerator.java
@@ -19,16 +19,10 @@ public class JournalListMvGenerator {
     public static void main(String[] args) throws IOException {
         boolean verbose = (args.length == 1) && ("--verbose".equals(args[0]));
 
-        Path abbreviationsDirectory = Path.of(
-            "buildres",
-            "abbrv.jabref.org",
-            "journals"
-        );
+        Path abbreviationsDirectory = Path.of("buildres", "abbrv.jabref.org", "journals");
         if (!Files.exists(abbreviationsDirectory)) {
             System.out.println(
-                "Path " +
-                abbreviationsDirectory.toAbsolutePath() +
-                " does not exist"
+                "Path " + abbreviationsDirectory.toAbsolutePath() + " does not exist"
             );
             System.exit(0);
         }
@@ -62,9 +56,7 @@ public static void main(String[] args) throws IOException {
                 .compressHigh()
                 .open()
         ) {
-            MVMap<String, Abbreviation> fullToAbbreviation = store.openMap(
-                "FullToAbbreviation"
-            );
+            MVMap<String, Abbreviation> fullToAbbreviation = store.openMap("FullToAbbreviation");
             stream.forEach(
                 Unchecked.consumer(path -> {
                     String fileName = path.getFileName().toString();
@@ -75,27 +67,23 @@ public static void main(String[] args) throws IOException {
                     } 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;
+                            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/cli/Launcher.java b/src/main/java/org/jabref/cli/Launcher.java
index 2b190f361c6..7c719499560 100644
--- a/src/main/java/org/jabref/cli/Launcher.java
+++ b/src/main/java/org/jabref/cli/Launcher.java
@@ -65,16 +65,10 @@ public static void main(String[] args) {
             Globals.entryTypesManager = entryTypesManager;
 
             // Initialize preferences
-            final JabRefPreferences preferences =
-                JabRefPreferences.getInstance();
+            final JabRefPreferences preferences = JabRefPreferences.getInstance();
 
             // Early exit in case another instance is already running
-            if (
-                !handleMultipleAppInstances(
-                    ARGUMENTS,
-                    preferences.getRemotePreferences()
-                )
-            ) {
+            if (!handleMultipleAppInstances(ARGUMENTS, preferences.getRemotePreferences())) {
                 return;
             }
 
@@ -88,8 +82,7 @@ public static void main(String[] args) {
             clearOldSearchIndices();
 
             try {
-                FileUpdateMonitor fileUpdateMonitor =
-                    Globals.getFileUpdateMonitor();
+                FileUpdateMonitor fileUpdateMonitor = Globals.getFileUpdateMonitor();
 
                 // Process arguments
                 ArgumentProcessor argumentProcessor = new ArgumentProcessor(
@@ -101,9 +94,7 @@ public static void main(String[] args) {
                 );
                 argumentProcessor.processArguments();
                 if (argumentProcessor.shouldShutDown()) {
-                    LOGGER.debug(
-                        "JabRef shut down after processing command line arguments"
-                    );
+                    LOGGER.debug("JabRef shut down after processing command line arguments");
                     // A clean shutdown takes 60s time
                     // We don't need the clean shutdown here
                     System.exit(0);
@@ -161,9 +152,7 @@ private static void addLogToDisk() {
 
         configuration
             .entrySet()
-            .forEach(config ->
-                Configuration.set(config.getKey(), config.getValue())
-            );
+            .forEach(config -> Configuration.set(config.getKey(), config.getValue()));
         initializeLogger();
     }
 
@@ -177,9 +166,7 @@ private static boolean handleMultipleAppInstances(
     ) {
         if (remotePreferences.useRemoteServer()) {
             // Try to contact already running JabRef
-            RemoteClient remoteClient = new RemoteClient(
-                remotePreferences.getPort()
-            );
+            RemoteClient remoteClient = new RemoteClient(remotePreferences.getPort());
             if (remoteClient.ping()) {
                 // We are not alone, there is already a server out there, send command line
                 // arguments to other instance
@@ -192,9 +179,7 @@ private static boolean handleMultipleAppInstances(
                     );
                     return false;
                 } else {
-                    LOGGER.warn(
-                        "Could not communicate with other running JabRef instance."
-                    );
+                    LOGGER.warn("Could not communicate with other running JabRef instance.");
                 }
             }
         }
@@ -210,17 +195,12 @@ private static void initGlobals(PreferencesService preferences) {
 
         Globals.entryTypesManager = preferences.getCustomEntryTypesRepository();
         Globals.protectedTermsLoader =
-            new ProtectedTermsLoader(
-                preferences.getProtectedTermsPreferences()
-            );
+            new ProtectedTermsLoader(preferences.getProtectedTermsPreferences());
     }
 
     private static void configureProxy(ProxyPreferences proxyPreferences) {
         ProxyRegisterer.register(proxyPreferences);
-        if (
-            proxyPreferences.shouldUseProxy() &&
-            proxyPreferences.shouldUseAuthentication()
-        ) {
+        if (proxyPreferences.shouldUseProxy() && proxyPreferences.shouldUseAuthentication()) {
             Authenticator.setDefault(new ProxyAuthenticator());
         }
     }
@@ -232,9 +212,7 @@ private static void configureSSL(SSLPreferences sslPreferences) {
     }
 
     private static void clearOldSearchIndices() {
-        Path currentIndexPath = OS
-            .getNativeDesktop()
-            .getFulltextIndexBaseDirectory();
+        Path currentIndexPath = OS.getNativeDesktop().getFulltextIndexBaseDirectory();
         Path appData = currentIndexPath.getParent();
 
         try {
@@ -251,10 +229,7 @@ private static void clearOldSearchIndices() {
                     path.toString().contains("lucene") &&
                     !path.equals(currentIndexPath)
                 ) {
-                    LOGGER.info(
-                        "Deleting out-of-date fulltext search index at {}.",
-                        path
-                    );
+                    LOGGER.info("Deleting out-of-date fulltext search index at {}.", path);
                     Files
                         .walk(path)
                         .sorted(Comparator.reverseOrder())
diff --git a/src/main/java/org/jabref/gui/ClipBoardManager.java b/src/main/java/org/jabref/gui/ClipBoardManager.java
index 6ef896c4de6..893aa10098a 100644
--- a/src/main/java/org/jabref/gui/ClipBoardManager.java
+++ b/src/main/java/org/jabref/gui/ClipBoardManager.java
@@ -28,9 +28,7 @@ public class ClipBoardManager {
 
     public static final DataFormat XML = new DataFormat("application/xml");
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(
-        ClipBoardManager.class
-    );
+    private static final Logger LOGGER = LoggerFactory.getLogger(ClipBoardManager.class);
 
     private static Clipboard clipboard;
     private static java.awt.datatransfer.Clipboard primary;
@@ -68,24 +66,17 @@ public ClipBoardManager(
     public static void addX11Support(TextInputControl input) {
         input
             .selectedTextProperty()
-            .addListener(// using InvalidationListener because of https://bugs.openjdk.java.net/browse/JDK-8176270
-            observable ->
+            .addListener(observable -> // using InvalidationListener because of https://bugs.openjdk.java.net/browse/JDK-8176270
                 Platform.runLater(() -> {
                     String newValue = input.getSelectedText();
                     if (!newValue.isEmpty() && (primary != null)) {
-                        primary.setContents(
-                            new StringSelection(newValue),
-                            null
-                        );
+                        primary.setContents(new StringSelection(newValue), null);
                     }
                 })
             );
         input.setOnMouseClicked(event -> {
             if (event.getButton() == MouseButton.MIDDLE) {
-                input.insertText(
-                    input.getCaretPosition(),
-                    getContentsPrimary()
-                );
+                input.insertText(input.getCaretPosition(), getContentsPrimary());
             }
         });
     }
@@ -111,14 +102,9 @@ public static String getContents() {
     public static String getContentsPrimary() {
         if (primary != null) {
             Transferable contents = primary.getContents(null);
-            if (
-                (contents != null) &&
-                contents.isDataFlavorSupported(DataFlavor.stringFlavor)
-            ) {
+            if ((contents != null) && contents.isDataFlavorSupported(DataFlavor.stringFlavor)) {
                 try {
-                    return (String) contents.getTransferData(
-                        DataFlavor.stringFlavor
-                    );
+                    return (String) contents.getTransferData(DataFlavor.stringFlavor);
                 } catch (UnsupportedFlavorException | IOException e) {
                     LOGGER.warn(e.getMessage());
                 }
@@ -163,19 +149,14 @@ 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 {
         final ClipboardContent content = new ClipboardContent();
         BibEntryWriter writer = new BibEntryWriter(
             new FieldWriter(preferencesService.getFieldPreferences()),
             entryTypesManager
         );
-        String serializedEntries = writer.serializeAll(
-            entries,
-            BibDatabaseMode.BIBTEX
-        );
+        String serializedEntries = writer.serializeAll(entries, BibDatabaseMode.BIBTEX);
         // 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
         // Furthermore, storing a string also enables other applications to work with the data
diff --git a/src/main/java/org/jabref/gui/DefaultInjector.java b/src/main/java/org/jabref/gui/DefaultInjector.java
index e11efa2651c..daee77e6ac5 100644
--- a/src/main/java/org/jabref/gui/DefaultInjector.java
+++ b/src/main/java/org/jabref/gui/DefaultInjector.java
@@ -17,9 +17,7 @@
 
 public class DefaultInjector implements PresenterFactory {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(
-        DefaultInjector.class
-    );
+    private static final Logger LOGGER = LoggerFactory.getLogger(DefaultInjector.class);
 
     /**
      * This method takes care of creating dependencies.
@@ -62,10 +60,7 @@ private static Object createDependency(Class<?> clazz) {
     }
 
     @Override
-    public <T> T instantiatePresenter(
-        Class<T> clazz,
-        Function<String, Object> injectionContext
-    ) {
+    public <T> T instantiatePresenter(Class<T> clazz, Function<String, Object> injectionContext) {
         LOGGER.debug("Instantiate {}", clazz.getName());
 
         // Use our own method to construct dependencies
@@ -75,10 +70,7 @@ public <T> T instantiatePresenter(
     }
 
     @Override
-    public void injectMembers(
-        Object instance,
-        Function<String, Object> injectionContext
-    ) {
+    public void injectMembers(Object instance, Function<String, Object> injectionContext) {
         LOGGER.debug("Inject into {}", instance.getClass().getName());
 
         // Use our own method to construct dependencies
diff --git a/src/main/java/org/jabref/gui/DialogService.java b/src/main/java/org/jabref/gui/DialogService.java
index a0fc3c5988a..90c171326b9 100644
--- a/src/main/java/org/jabref/gui/DialogService.java
+++ b/src/main/java/org/jabref/gui/DialogService.java
@@ -46,13 +46,7 @@ default <T> Optional<T> showChoiceDialogAndWait(
         String okButtonLabel,
         Collection<T> choices
     ) {
-        return showChoiceDialogAndWait(
-            title,
-            content,
-            okButtonLabel,
-            null,
-            choices
-        );
+        return showChoiceDialogAndWait(title, content, okButtonLabel, null, choices);
     }
 
     /**
@@ -107,10 +101,7 @@ Optional<String> showInputDialogWithDefaultAndWait(
      * @param exception the exception causing the error
      */
     default void showErrorDialogAndWait(Exception exception) {
-        showErrorDialogAndWait(
-            Localization.lang("Unhandled exception occurred."),
-            exception
-        );
+        showErrorDialogAndWait(Localization.lang("Unhandled exception occurred."), exception);
     }
 
     /**
@@ -118,11 +109,7 @@ default void showErrorDialogAndWait(Exception exception) {
      *
      * @param exception the exception causing the error
      */
-    void showErrorDialogAndWait(
-        String title,
-        String content,
-        Throwable exception
-    );
+    void showErrorDialogAndWait(String title, String content, Throwable exception);
 
     /**
      * Create and display error dialog displaying the given message.
@@ -149,11 +136,7 @@ void showErrorDialogAndWait(
      *
      * @return true if the use clicked "OK" otherwise false
      */
-    boolean showConfirmationDialogAndWait(
-        String title,
-        String content,
-        String okButtonLabel
-    );
+    boolean showConfirmationDialogAndWait(String title, String content, String okButtonLabel);
 
     /**
      * Create and display a new confirmation dialog.
@@ -210,11 +193,7 @@ boolean showConfirmationDialogWithOptOutAndWait(
      *
      * @return the entered password if pressed "OK", null otherwise
      */
-    Optional<String> showPasswordDialogAndWait(
-        String title,
-        String header,
-        String content
-    );
+    Optional<String> showPasswordDialogAndWait(String title, String header, String content);
 
     /**
      * Shows a custom dialog without returning any results.
@@ -255,9 +234,7 @@ Optional<ButtonType> showCustomDialogAndWait(
      * @param dialog dialog to show
      * @param <R>    type of result
      */
-    <R> Optional<R> showCustomDialogAndWait(
-        javafx.scene.control.Dialog<R> dialog
-    );
+    <R> Optional<R> showCustomDialogAndWait(javafx.scene.control.Dialog<R> dialog);
 
     /**
      * Constructs and shows a canceable {@link ProgressDialog}. Clicking cancel will cancel the underlying service and close the dialog
@@ -298,9 +275,7 @@ <V> Optional<ButtonType> showBackgroundProgressDialogAndWait(
      *
      * @return the selected file or an empty {@link Optional} if no file has been selected
      */
-    Optional<Path> showFileSaveDialog(
-        FileDialogConfiguration fileDialogConfiguration
-    );
+    Optional<Path> showFileSaveDialog(FileDialogConfiguration fileDialogConfiguration);
 
     /**
      * Shows a new file open dialog. The method doesn't return until the
@@ -311,9 +286,7 @@ Optional<Path> showFileSaveDialog(
      *
      * @return the selected file or an empty {@link Optional} if no file has been selected
      */
-    Optional<Path> showFileOpenDialog(
-        FileDialogConfiguration fileDialogConfiguration
-    );
+    Optional<Path> showFileOpenDialog(FileDialogConfiguration fileDialogConfiguration);
 
     /**
      * Shows a new file open dialog. The method doesn't return until the
@@ -356,6 +329,5 @@ Optional<Path> showDirectorySelectionDialog(
      *
      * @return the selected file or an empty {@link Optional} if no file has been selected
      */
-    Optional<Path> showFileOpenFromArchiveDialog(Path archivePath)
-        throws IOException;
+    Optional<Path> showFileOpenFromArchiveDialog(Path archivePath) throws IOException;
 }
diff --git a/src/main/java/org/jabref/gui/DragAndDropDataFormats.java b/src/main/java/org/jabref/gui/DragAndDropDataFormats.java
index bc2ee349516..9607404bdf5 100644
--- a/src/main/java/org/jabref/gui/DragAndDropDataFormats.java
+++ b/src/main/java/org/jabref/gui/DragAndDropDataFormats.java
@@ -9,9 +9,7 @@
  */
 public class DragAndDropDataFormats {
 
-    public static final DataFormat FIELD = new DataFormat(
-        "dnd/org.jabref.model.entry.field.Field"
-    );
+    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"
     );
@@ -26,6 +24,7 @@ public class DragAndDropDataFormats {
     );
 
     @SuppressWarnings("unchecked")
-    public static final Class<List<PreviewLayout>> PREVIEWLAYOUT_LIST_CLASS =
-        (Class<List<PreviewLayout>>) (Class<?>) List.class;
+    public static final Class<List<PreviewLayout>> PREVIEWLAYOUT_LIST_CLASS = (Class<
+            List<PreviewLayout>
+        >) (Class<?>) List.class;
 }
diff --git a/src/main/java/org/jabref/gui/DragAndDropHelper.java b/src/main/java/org/jabref/gui/DragAndDropHelper.java
index 1860aad56aa..99a22254124 100644
--- a/src/main/java/org/jabref/gui/DragAndDropHelper.java
+++ b/src/main/java/org/jabref/gui/DragAndDropHelper.java
@@ -35,9 +35,7 @@ public static List<String> getGroups(Dragboard dragboard) {
         if (!dragboard.hasContent(DragAndDropDataFormats.GROUP)) {
             return Collections.emptyList();
         } else {
-            return (List<String>) dragboard.getContent(
-                DragAndDropDataFormats.GROUP
-            );
+            return (List<String>) dragboard.getContent(DragAndDropDataFormats.GROUP);
         }
     }
 }
diff --git a/src/main/java/org/jabref/gui/EntryTypeView.java b/src/main/java/org/jabref/gui/EntryTypeView.java
index 92722c17ee9..738bc84f687 100644
--- a/src/main/java/org/jabref/gui/EntryTypeView.java
+++ b/src/main/java/org/jabref/gui/EntryTypeView.java
@@ -112,8 +112,7 @@ public EntryTypeView(
             return type;
         });
 
-        Button btnGenerate = (Button) this.getDialogPane()
-            .lookupButton(generateButton);
+        Button btnGenerate = (Button) this.getDialogPane().lookupButton(generateButton);
         btnGenerate.getStyleClass().add("customGenerateButton");
 
         btnGenerate
@@ -147,18 +146,11 @@ public EntryTypeView(
         );
     }
 
-    private void addEntriesToPane(
-        FlowPane pane,
-        Collection<? extends BibEntryType> entryTypes
-    ) {
+    private void addEntriesToPane(FlowPane pane, Collection<? extends BibEntryType> entryTypes) {
         for (BibEntryType entryType : entryTypes) {
-            Button entryButton = new Button(
-                entryType.getType().getDisplayName()
-            );
+            Button entryButton = new Button(entryType.getType().getDisplayName());
             entryButton.setUserData(entryType);
-            entryButton.setOnAction(event ->
-                setEntryTypeForReturnAndClose(Optional.of(entryType))
-            );
+            entryButton.setOnAction(event -> setEntryTypeForReturnAndClose(Optional.of(entryType)));
             pane.getChildren().add(entryButton);
 
             EntryType selectedType = entryType.getType();
@@ -188,12 +180,8 @@ public void initialize() {
             );
 
         idBasedFetchers.itemsProperty().bind(viewModel.fetcherItemsProperty());
-        idTextField
-            .textProperty()
-            .bindBidirectional(viewModel.idTextProperty());
-        idBasedFetchers
-            .valueProperty()
-            .bindBidirectional(viewModel.selectedItemProperty());
+        idTextField.textProperty().bindBidirectional(viewModel.idTextProperty());
+        idBasedFetchers.valueProperty().bindBidirectional(viewModel.selectedItemProperty());
 
         EasyBind.subscribe(
             viewModel.getFocusAndSelectAllProperty(),
@@ -214,30 +202,20 @@ public void initialize() {
         recommendedEntriesTitlePane
             .managedProperty()
             .bind(recommendedEntriesTitlePane.visibleProperty());
-        otherEntriesTitlePane
-            .managedProperty()
-            .bind(otherEntriesTitlePane.visibleProperty());
-        customTitlePane
-            .managedProperty()
-            .bind(customTitlePane.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()
-                        );
+                    this.setHeight(this.getHeight() + otherEntriesPane.getHeight());
                 } else {
-                    this.setHeight(
-                            this.getHeight() - otherEntriesPane.getHeight()
-                        );
+                    this.setHeight(this.getHeight() - otherEntriesPane.getHeight());
                 }
             });
 
-        boolean isBiblatexMode = libraryTab
-            .getBibDatabaseContext()
-            .isBiblatexMode();
+        boolean isBiblatexMode = libraryTab.getBibDatabaseContext().isBiblatexMode();
         List<BibEntryType> recommendedEntries;
         List<BibEntryType> otherEntries;
         if (isBiblatexMode) {
@@ -264,8 +242,9 @@ public void initialize() {
         BibDatabaseMode customTypeDatabaseMode = isBiblatexMode
             ? BibDatabaseMode.BIBLATEX
             : BibDatabaseMode.BIBTEX;
-        List<BibEntryType> customTypes =
-            Globals.entryTypesManager.getAllCustomTypes(customTypeDatabaseMode);
+        List<BibEntryType> customTypes = Globals.entryTypesManager.getAllCustomTypes(
+            customTypeDatabaseMode
+        );
         if (customTypes.isEmpty()) {
             customTitlePane.setVisible(false);
         } else {
@@ -275,11 +254,7 @@ public void initialize() {
         viewModel
             .idTextProperty()
             .addListener((obs, oldValue, newValue) ->
-                visualizer.initVisualization(
-                    viewModel.idFieldValidationStatus(),
-                    idTextField,
-                    true
-                )
+                visualizer.initVisualization(viewModel.idFieldValidationStatus(), idTextField, true)
             );
 
         Platform.runLater(() -> idTextField.requestFocus());
@@ -300,9 +275,7 @@ private void focusTextField(Event event) {
         idTextField.selectAll();
     }
 
-    private void setEntryTypeForReturnAndClose(
-        Optional<BibEntryType> entryType
-    ) {
+    private void setEntryTypeForReturnAndClose(Optional<BibEntryType> entryType) {
         type = entryType.map(BibEntryType::getType).orElse(null);
         viewModel.stopFetching();
         this.stateManager.clearSearchQuery();
@@ -336,9 +309,7 @@ public static String getDescription(EntryType selectedType) {
                     );
                 }
                 case Conference -> {
-                    return Localization.lang(
-                        "A legacy alias for \"InProceedings\"."
-                    );
+                    return Localization.lang("A legacy alias for \"InProceedings\".");
                 }
                 case InBook -> {
                     return Localization.lang(
@@ -351,9 +322,7 @@ public static String getDescription(EntryType selectedType) {
                     );
                 }
                 case InProceedings -> {
-                    return Localization.lang(
-                        "An article in a conference proceedings."
-                    );
+                    return Localization.lang("An article in a conference proceedings.");
                 }
                 case Manual -> {
                     return Localization.lang(
@@ -407,9 +376,7 @@ public static String getDescription(EntryType selectedType) {
                     return Localization.lang("A multi-volume \"Collection\".");
                 }
                 case MvProceedings -> {
-                    return Localization.lang(
-                        "A multi-volume \"Proceedings\" entry."
-                    );
+                    return Localization.lang("A multi-volume \"Proceedings\" entry.");
                 }
                 case MvReference -> {
                     return Localization.lang(
@@ -442,9 +409,7 @@ public static String getDescription(EntryType selectedType) {
                     );
                 }
                 case SuppCollection -> {
-                    return Localization.lang(
-                        "Supplemental material in a \"Collection\"."
-                    );
+                    return Localization.lang("Supplemental material in a \"Collection\".");
                 }
                 case SuppPeriodical -> {
                     return Localization.lang(
diff --git a/src/main/java/org/jabref/gui/EntryTypeViewModel.java b/src/main/java/org/jabref/gui/EntryTypeViewModel.java
index 4285b5789fd..a06c06586eb 100644
--- a/src/main/java/org/jabref/gui/EntryTypeViewModel.java
+++ b/src/main/java/org/jabref/gui/EntryTypeViewModel.java
@@ -36,22 +36,18 @@
 
 public class EntryTypeViewModel {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(
-        EntryTypeViewModel.class
-    );
+    private static final Logger LOGGER = LoggerFactory.getLogger(EntryTypeViewModel.class);
 
     private final PreferencesService preferencesService;
-    private final BooleanProperty searchingProperty =
-        new SimpleBooleanProperty();
-    private final BooleanProperty searchSuccesfulProperty =
-        new SimpleBooleanProperty();
+    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 ListProperty<IdBasedFetcher> fetchers = new SimpleListProperty<>(
+        FXCollections.observableArrayList()
+    );
     private final StringProperty idText = new SimpleStringProperty();
-    private final BooleanProperty focusAndSelectAllProperty =
-        new SimpleBooleanProperty();
+    private final BooleanProperty focusAndSelectAllProperty = new SimpleBooleanProperty();
     private Task<Optional<BibEntry>> fetcherWorker = new FetcherWorker();
     private final LibraryTab libraryTab;
     private final DialogService dialogService;
@@ -87,10 +83,7 @@ public EntryTypeViewModel(
                 idText,
                 StringUtil::isNotBlank,
                 ValidationMessage.error(
-                    Localization.lang(
-                        "Required field \"%0\" is empty.",
-                        Localization.lang("ID")
-                    )
+                    Localization.lang("Required field \"%0\" is empty.", Localization.lang("ID"))
                 )
             );
     }
@@ -122,9 +115,7 @@ public BooleanProperty getFocusAndSelectAllProperty() {
     public void storeSelectedFetcher() {
         preferencesService
             .getGuiPreferences()
-            .setLastSelectedIdBasedFetcher(
-                selectedItemProperty.getValue().getName()
-            );
+            .setLastSelectedIdBasedFetcher(selectedItemProperty.getValue().getName());
     }
 
     private IdBasedFetcher getLastSelectedFetcher() {
@@ -133,16 +124,10 @@ private IdBasedFetcher getLastSelectedFetcher() {
             .filter(fetcher ->
                 fetcher
                     .getName()
-                    .equals(
-                        preferencesService
-                            .getGuiPreferences()
-                            .getLastSelectedIdBasedFetcher()
-                    )
+                    .equals(preferencesService.getGuiPreferences().getLastSelectedIdBasedFetcher())
             )
             .findFirst()
-            .orElse(
-                new DoiFetcher(preferencesService.getImportFormatPreferences())
-            );
+            .orElse(new DoiFetcher(preferencesService.getImportFormatPreferences()));
     }
 
     public ListProperty<IdBasedFetcher> fetcherItemsProperty() {
@@ -203,10 +188,7 @@ public void runFetcherWorker() {
             } else {
                 dialogService.showInformationDialogAndWait(
                     Localization.lang("Failed to import by ID"),
-                    Localization.lang(
-                        "Error message %0",
-                        fetcherExceptionMessage
-                    )
+                    Localization.lang("Error message %0", fetcherExceptionMessage)
                 );
             }
 
@@ -235,10 +217,7 @@ public void runFetcherWorker() {
                     dialogService,
                     taskExecutor
                 );
-                handler.importEntryWithDuplicateCheck(
-                    libraryTab.getBibDatabaseContext(),
-                    entry
-                );
+                handler.importEntryWithDuplicateCheck(libraryTab.getBibDatabaseContext(), entry);
 
                 searchSuccesfulProperty.set(true);
             } else if (StringUtil.isBlank(idText.getValue())) {
@@ -253,17 +232,16 @@ public void runFetcherWorker() {
                 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")
-                    );
+                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.frame(),
diff --git a/src/main/java/org/jabref/gui/FXDialog.java b/src/main/java/org/jabref/gui/FXDialog.java
index 5385e8d4f15..12eabe676c1 100644
--- a/src/main/java/org/jabref/gui/FXDialog.java
+++ b/src/main/java/org/jabref/gui/FXDialog.java
@@ -23,12 +23,7 @@
  */
 public class FXDialog extends Alert {
 
-    public FXDialog(
-        AlertType type,
-        String title,
-        Image image,
-        boolean isModal
-    ) {
+    public FXDialog(AlertType type, String title, Image image, boolean isModal) {
         this(type, title, isModal);
         setDialogIcon(image);
     }
@@ -63,14 +58,8 @@ public FXDialog(AlertType type, boolean isModal) {
         dialogWindow
             .getScene()
             .setOnKeyPressed(event -> {
-                KeyBindingRepository keyBindingRepository =
-                    Globals.getKeyPrefs();
-                if (
-                    keyBindingRepository.checkKeyCombinationEquality(
-                        KeyBinding.CLOSE,
-                        event
-                    )
-                ) {
+                KeyBindingRepository keyBindingRepository = Globals.getKeyPrefs();
+                if (keyBindingRepository.checkKeyCombinationEquality(KeyBinding.CLOSE, event)) {
                     dialogWindow.close();
                 }
             });
diff --git a/src/main/java/org/jabref/gui/FallbackExceptionHandler.java b/src/main/java/org/jabref/gui/FallbackExceptionHandler.java
index 06e7f8b3019..8d17e7483bc 100644
--- a/src/main/java/org/jabref/gui/FallbackExceptionHandler.java
+++ b/src/main/java/org/jabref/gui/FallbackExceptionHandler.java
@@ -8,26 +8,19 @@
 /**
  * Catch and log any unhandled exceptions.
  */
-public class FallbackExceptionHandler
-    implements Thread.UncaughtExceptionHandler {
+public class FallbackExceptionHandler implements Thread.UncaughtExceptionHandler {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(
-        FallbackExceptionHandler.class
-    );
+    private static final Logger LOGGER = LoggerFactory.getLogger(FallbackExceptionHandler.class);
 
     public static void installExceptionHandler() {
-        Thread.setDefaultUncaughtExceptionHandler(
-            new FallbackExceptionHandler()
-        );
+        Thread.setDefaultUncaughtExceptionHandler(new FallbackExceptionHandler());
     }
 
     @Override
     public void uncaughtException(Thread thread, Throwable exception) {
         LOGGER.error("Uncaught exception occurred in " + thread, exception);
         DefaultTaskExecutor.runInJavaFXThread(() -> {
-            DialogService dialogService = Injector.instantiateModelOrService(
-                DialogService.class
-            );
+            DialogService dialogService = Injector.instantiateModelOrService(DialogService.class);
             dialogService.showErrorDialogAndWait(
                 "Uncaught exception occurred in " + thread,
                 exception
diff --git a/src/main/java/org/jabref/gui/Globals.java b/src/main/java/org/jabref/gui/Globals.java
index da892616fa8..0f17f21e22b 100644
--- a/src/main/java/org/jabref/gui/Globals.java
+++ b/src/main/java/org/jabref/gui/Globals.java
@@ -38,9 +38,7 @@ public class Globals {
      */
     public static StateManager stateManager = new StateManager();
 
-    public static final TaskExecutor TASK_EXECUTOR = new DefaultTaskExecutor(
-        stateManager
-    );
+    public static final TaskExecutor TASK_EXECUTOR = new DefaultTaskExecutor(stateManager);
 
     /**
      * Each test case initializes this field if required
@@ -119,11 +117,7 @@ public static void startBackgroundTasks() {
         RemotePreferences remotePreferences = prefs.getRemotePreferences();
         if (remotePreferences.useRemoteServer()) {
             Globals.REMOTE_LISTENER.openAndStart(
-                new CLIMessageHandler(
-                    prefs,
-                    fileUpdateMonitor,
-                    entryTypesManager
-                ),
+                new CLIMessageHandler(prefs, fileUpdateMonitor, entryTypesManager),
                 remotePreferences.getPort()
             );
         }
diff --git a/src/main/java/org/jabref/gui/actions/ActionFactory.java b/src/main/java/org/jabref/gui/actions/ActionFactory.java
index 45549c9e4d1..e2129e816b3 100644
--- a/src/main/java/org/jabref/gui/actions/ActionFactory.java
+++ b/src/main/java/org/jabref/gui/actions/ActionFactory.java
@@ -26,15 +26,12 @@
  */
 public class ActionFactory {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(
-        ActionFactory.class
-    );
+    private static final Logger LOGGER = LoggerFactory.getLogger(ActionFactory.class);
 
     private final KeyBindingRepository keyBindingRepository;
 
     public ActionFactory(KeyBindingRepository keyBindingRepository) {
-        this.keyBindingRepository =
-            Objects.requireNonNull(keyBindingRepository);
+        this.keyBindingRepository = Objects.requireNonNull(keyBindingRepository);
     }
 
     /**
@@ -42,9 +39,7 @@ public ActionFactory(KeyBindingRepository keyBindingRepository) {
      */
     private static void setGraphic(MenuItem node, Action action) {
         node.graphicProperty().unbind();
-        action
-            .getIcon()
-            .ifPresent(icon -> node.setGraphic(icon.getGraphicNode()));
+        action.getIcon().ifPresent(icon -> node.setGraphic(icon.getGraphicNode()));
     }
 
     /*
@@ -69,9 +64,7 @@ private static Label getAssociatedNode(MenuItem menuItem) {
             // We have to use reflection to get the associated label
             try {
                 Method getLabel =
-                    ContextMenuContent.MenuItemContainer.class.getDeclaredMethod(
-                            "getLabel"
-                        );
+                    ContextMenuContent.MenuItemContainer.class.getDeclaredMethod("getLabel");
                 getLabel.setAccessible(true);
                 return (Label) getLabel.invoke(container);
             } catch (
@@ -86,18 +79,9 @@ private static Label getAssociatedNode(MenuItem menuItem) {
         return null;
     }
 
-    public MenuItem configureMenuItem(
-        Action action,
-        Command command,
-        MenuItem menuItem
-    ) {
+    public MenuItem configureMenuItem(Action action, Command command, MenuItem menuItem) {
         ActionUtils.configureMenuItem(
-            new JabRefAction(
-                action,
-                command,
-                keyBindingRepository,
-                Sources.FromMenu
-            ),
+            new JabRefAction(action, command, keyBindingRepository, Sources.FromMenu),
             menuItem
         );
         setGraphic(menuItem, action);
@@ -129,18 +113,9 @@ public MenuItem createMenuItem(Action action, Command command) {
         return menuItem;
     }
 
-    public CheckMenuItem createCheckMenuItem(
-        Action action,
-        Command command,
-        boolean selected
-    ) {
+    public CheckMenuItem createCheckMenuItem(Action action, Command command, boolean selected) {
         CheckMenuItem checkMenuItem = ActionUtils.createCheckMenuItem(
-            new JabRefAction(
-                action,
-                command,
-                keyBindingRepository,
-                Sources.FromMenu
-            )
+            new JabRefAction(action, command, keyBindingRepository, Sources.FromMenu)
         );
         checkMenuItem.setSelected(selected);
         setGraphic(checkMenuItem, action);
@@ -154,12 +129,7 @@ public CheckMenuItem createCheckMenuItem(
         BooleanExpression selectedBinding
     ) {
         CheckMenuItem checkMenuItem = ActionUtils.createCheckMenuItem(
-            new JabRefAction(
-                action,
-                command,
-                keyBindingRepository,
-                Sources.FromMenu
-            )
+            new JabRefAction(action, command, keyBindingRepository, Sources.FromMenu)
         );
         EasyBind.subscribe(selectedBinding, checkMenuItem::setSelected);
         setGraphic(checkMenuItem, action);
@@ -168,9 +138,7 @@ public CheckMenuItem createCheckMenuItem(
     }
 
     public Menu createMenu(Action action) {
-        Menu menu = ActionUtils.createMenu(
-            new JabRefAction(action, keyBindingRepository)
-        );
+        Menu menu = ActionUtils.createMenu(new JabRefAction(action, keyBindingRepository));
 
         // For some reason the graphic is not set correctly, so let's fix this
         setGraphic(menu, action);
@@ -185,12 +153,7 @@ public Menu createSubMenu(Action action, MenuItem... children) {
 
     public Button createIconButton(Action action, Command command) {
         Button button = ActionUtils.createButton(
-            new JabRefAction(
-                action,
-                command,
-                keyBindingRepository,
-                Sources.FromButton
-            ),
+            new JabRefAction(action, command, keyBindingRepository, Sources.FromButton),
             ActionUtils.ActionTextBehavior.HIDE
         );
 
@@ -198,27 +161,16 @@ public Button createIconButton(Action action, Command command) {
 
         // For some reason the graphic is not set correctly, so let's fix this
         button.graphicProperty().unbind();
-        action
-            .getIcon()
-            .ifPresent(icon -> button.setGraphic(icon.getGraphicNode()));
+        action.getIcon().ifPresent(icon -> button.setGraphic(icon.getGraphicNode()));
 
         button.setFocusTraversable(false); // Prevent the buttons from stealing the focus
         return button;
     }
 
-    public ButtonBase configureIconButton(
-        Action action,
-        Command command,
-        ButtonBase button
-    ) {
+    public ButtonBase configureIconButton(Action action, Command command, ButtonBase button) {
         ActionUtils.unconfigureButton(button);
         ActionUtils.configureButton(
-            new JabRefAction(
-                action,
-                command,
-                keyBindingRepository,
-                Sources.FromButton
-            ),
+            new JabRefAction(action, command, keyBindingRepository, Sources.FromButton),
             button,
             ActionUtils.ActionTextBehavior.HIDE
         );
@@ -228,9 +180,7 @@ public ButtonBase configureIconButton(
         // For some reason the graphic is not set correctly, so let's fix this
         // ToDO: Find a way to reuse JabRefIconView
         button.graphicProperty().unbind();
-        action
-            .getIcon()
-            .ifPresent(icon -> button.setGraphic(icon.getGraphicNode()));
+        action.getIcon().ifPresent(icon -> button.setGraphic(icon.getGraphicNode()));
 
         return button;
     }
diff --git a/src/main/java/org/jabref/gui/actions/ActionHelper.java b/src/main/java/org/jabref/gui/actions/ActionHelper.java
index 3417d27bc4c..d7afc615d14 100644
--- a/src/main/java/org/jabref/gui/actions/ActionHelper.java
+++ b/src/main/java/org/jabref/gui/actions/ActionHelper.java
@@ -26,22 +26,15 @@ public static BooleanExpression needsDatabase(StateManager stateManager) {
         return stateManager.activeDatabaseProperty().isPresent();
     }
 
-    public static BooleanExpression needsSharedDatabase(
-        StateManager stateManager
-    ) {
+    public static BooleanExpression needsSharedDatabase(StateManager stateManager) {
         EasyBinding<Boolean> binding = EasyBind.map(
             stateManager.activeDatabaseProperty(),
-            context ->
-                context
-                    .filter(c -> c.getLocation() == DatabaseLocation.SHARED)
-                    .isPresent()
+            context -> context.filter(c -> c.getLocation() == DatabaseLocation.SHARED).isPresent()
         );
         return BooleanExpression.booleanExpression(binding);
     }
 
-    public static BooleanExpression needsStudyDatabase(
-        StateManager stateManager
-    ) {
+    public static BooleanExpression needsStudyDatabase(StateManager stateManager) {
         EasyBinding<Boolean> binding = EasyBind.map(
             stateManager.activeDatabaseProperty(),
             context -> context.filter(BibDatabaseContext::isStudy).isPresent()
@@ -49,9 +42,7 @@ public static BooleanExpression needsStudyDatabase(
         return BooleanExpression.booleanExpression(binding);
     }
 
-    public static BooleanExpression needsEntriesSelected(
-        StateManager stateManager
-    ) {
+    public static BooleanExpression needsEntriesSelected(StateManager stateManager) {
         return Bindings.isNotEmpty(stateManager.getSelectedEntries());
     }
 
@@ -69,27 +60,20 @@ public static BooleanExpression isFieldSetForSelectedEntry(
         Field field,
         StateManager stateManager
     ) {
-        return isAnyFieldSetForSelectedEntry(
-            Collections.singletonList(field),
-            stateManager
-        );
+        return isAnyFieldSetForSelectedEntry(Collections.singletonList(field), stateManager);
     }
 
     public static BooleanExpression isAnyFieldSetForSelectedEntry(
         List<Field> fields,
         StateManager stateManager
     ) {
-        ObservableList<BibEntry> selectedEntries =
-            stateManager.getSelectedEntries();
+        ObservableList<BibEntry> selectedEntries = stateManager.getSelectedEntries();
         Binding<Boolean> fieldsAreSet = EasyBind
             .valueAt(selectedEntries, 0)
             .mapObservable(entry ->
                 Bindings.createBooleanBinding(
                     () -> {
-                        return entry
-                            .getFields()
-                            .stream()
-                            .anyMatch(fields::contains);
+                        return entry.getFields().stream().anyMatch(fields::contains);
                     },
                     entry.getFieldsObservable()
                 )
@@ -102,17 +86,13 @@ public static BooleanExpression isFilePresentForSelectedEntry(
         StateManager stateManager,
         PreferencesService preferencesService
     ) {
-        ObservableList<BibEntry> selectedEntries =
-            stateManager.getSelectedEntries();
+        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 ((!entry.getFiles().isEmpty()) && stateManager.getActiveDatabase().isPresent()) {
                     if (files.get(0).isOnlineLink()) {
                         return true;
                     }
@@ -140,14 +120,11 @@ public static BooleanExpression isFilePresentForSelectedEntry(
      * @param stateManager manager for the state of the GUI
      * @return a boolean binding
      */
-    public static BooleanExpression hasLinkedFileForSelectedEntries(
-        StateManager stateManager
-    ) {
+    public static BooleanExpression hasLinkedFileForSelectedEntries(StateManager stateManager) {
         return BooleanExpression.booleanExpression(
             EasyBind.reduce(
                 stateManager.getSelectedEntries(),
-                entries ->
-                    entries.anyMatch(entry -> !entry.getFiles().isEmpty())
+                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 f7568a75730..f185c056191 100644
--- a/src/main/java/org/jabref/gui/actions/JabRefAction.java
+++ b/src/main/java/org/jabref/gui/actions/JabRefAction.java
@@ -11,10 +11,7 @@
  */
 class JabRefAction extends org.controlsfx.control.action.Action {
 
-    public JabRefAction(
-        Action action,
-        KeyBindingRepository keyBindingRepository
-    ) {
+    public JabRefAction(Action action, KeyBindingRepository keyBindingRepository) {
         super(action.getText());
         action.getIcon().ifPresent(icon -> setGraphic(icon.getGraphicNode()));
         action
@@ -28,11 +25,7 @@ public JabRefAction(
         setLongText(action.getDescription());
     }
 
-    public JabRefAction(
-        Action action,
-        Command command,
-        KeyBindingRepository keyBindingRepository
-    ) {
+    public JabRefAction(Action action, Command command, KeyBindingRepository keyBindingRepository) {
         this(action, command, keyBindingRepository, null);
     }
 
@@ -61,12 +54,7 @@ public JabRefAction(
 
         if (command instanceof SimpleCommand ourCommand) {
             longTextProperty()
-                .bind(
-                    Bindings.concat(
-                        action.getDescription(),
-                        ourCommand.statusMessageProperty()
-                    )
-                );
+                .bind(Bindings.concat(action.getDescription(), ourCommand.statusMessageProperty()));
         }
     }
 
@@ -92,8 +80,7 @@ private String getActionName(Action action, Command command) {
     private void trackExecute(String actionName) {
         Telemetry
             .getTelemetryClient()
-            .ifPresent(telemetryClient -> telemetryClient.trackEvent(actionName)
-            );
+            .ifPresent(telemetryClient -> telemetryClient.trackEvent(actionName));
     }
 
     private void trackUserActionSource(String actionName, Sources source) {
diff --git a/src/main/java/org/jabref/gui/actions/SimpleCommand.java b/src/main/java/org/jabref/gui/actions/SimpleCommand.java
index 0c03a96ba4a..4385291edb3 100644
--- a/src/main/java/org/jabref/gui/actions/SimpleCommand.java
+++ b/src/main/java/org/jabref/gui/actions/SimpleCommand.java
@@ -11,9 +11,7 @@
  */
 public abstract class SimpleCommand extends CommandBase {
 
-    protected ReadOnlyStringWrapper statusMessage = new ReadOnlyStringWrapper(
-        ""
-    );
+    protected ReadOnlyStringWrapper statusMessage = new ReadOnlyStringWrapper("");
 
     public String getStatusMessage() {
         return statusMessage.get();
diff --git a/src/main/java/org/jabref/gui/actions/StandardActions.java b/src/main/java/org/jabref/gui/actions/StandardActions.java
index 7d7060363bd..1e0f8340b19 100644
--- a/src/main/java/org/jabref/gui/actions/StandardActions.java
+++ b/src/main/java/org/jabref/gui/actions/StandardActions.java
@@ -9,10 +9,7 @@
 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_KEY(Localization.lang("Copy citation key"), KeyBinding.COPY_CITATION_KEY),
     COPY_CITE_KEY(
         Localization.lang("Copy \\cite{citation key}"),
         KeyBinding.COPY_CITE_CITATION_KEY
@@ -25,15 +22,9 @@ public enum StandardActions implements Action {
         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_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
-    ),
+    COPY_CITATION_PREVIEW(Localization.lang("Copy preview"), KeyBinding.COPY_PREVIEW),
     EXPORT_TO_CLIPBOARD(
         Localization.lang("Export to clipboard"),
         IconTheme.JabRefIcons.EXPORT_TO_CLIPBOARD
@@ -42,16 +33,8 @@ public enum StandardActions implements Action {
         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
-    ),
+    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(
@@ -77,31 +60,20 @@ public enum StandardActions implements Action {
         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
-    ),
+    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
     ),
     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_HIGH(Localization.lang("Set priority to high"), IconTheme.JabRefIcons.PRIORITY_HIGH),
     PRIORITY_MEDIUM(
         Localization.lang("Set priority to medium"),
         IconTheme.JabRefIcons.PRIORITY_MEDIUM
     ),
-    PRIORITY_LOW(
-        Localization.lang("Set priority to low"),
-        IconTheme.JabRefIcons.PRIORITY_LOW
-    ),
+    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"),
@@ -115,18 +87,9 @@ public enum StandardActions implements Action {
     RANK_4(Localization.lang("Set rank to four"), IconTheme.JabRefIcons.RANK4),
     RANK_5(Localization.lang("Set rank to five"), IconTheme.JabRefIcons.RANK5),
     PRINTED(Localization.lang("Printed"), IconTheme.JabRefIcons.PRINTED),
-    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
-    ),
+    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,
@@ -138,10 +101,7 @@ public enum StandardActions implements Action {
         KeyBinding.SKIMMED
     ),
     RELEVANCE(Localization.lang("Relevance"), IconTheme.JabRefIcons.RELEVANCE),
-    RELEVANT(
-        Localization.lang("Toggle 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"),
@@ -149,23 +109,14 @@ public enum StandardActions implements Action {
         KeyBinding.OPEN_DATABASE
     ),
     IMPORT(Localization.lang("Import"), IconTheme.JabRefIcons.IMPORT),
-    EXPORT(
-        Localization.lang("Export"),
-        IconTheme.JabRefIcons.EXPORT,
-        KeyBinding.EXPORT
-    ),
+    EXPORT(Localization.lang("Export"), IconTheme.JabRefIcons.EXPORT, KeyBinding.EXPORT),
     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_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"),
@@ -181,14 +132,8 @@ public enum StandardActions implements Action {
         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
-    ),
+    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
@@ -219,20 +164,9 @@ public enum StandardActions implements Action {
         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
-    ),
+    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),
     MANAGE_KEYWORDS(Localization.lang("Manage keywords")),
     MASS_SET_FIELDS(Localization.lang("Manage field names & content")),
 
@@ -268,18 +202,12 @@ public enum StandardActions implements Action {
     ),
     WRITE_METADATA_TO_PDF(
         Localization.lang("Write metadata to PDF files"),
-        Localization.lang(
-            "Will write metadata to the PDFs linked from selected entries."
-        ),
+        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")
-    ),
+    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")),
@@ -314,9 +242,7 @@ public enum StandardActions implements Action {
     ),
     ABBREVIATE_DOTLESS(
         Localization.lang("dotless"),
-        Localization.lang(
-            "Abbreviate journal names of the selected entries (DOTLESS abbreviation)"
-        )
+        Localization.lang("Abbreviate journal names of the selected entries (DOTLESS abbreviation)")
     ),
     ABBREVIATE_SHORTEST_UNIQUE(
         Localization.lang("shortest unique"),
@@ -336,10 +262,7 @@ 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
-    ),
+    SHOW_PREFS(Localization.lang("Preferences"), IconTheme.JabRefIcons.PREFERENCES),
     MANAGE_JOURNALS(Localization.lang("Manage journal abbreviations")),
     CUSTOMIZE_KEYBINDING(
         Localization.lang("Customize key bindings"),
@@ -351,14 +274,8 @@ public enum StandardActions implements Action {
         IconTheme.JabRefIcons.EDIT_ENTRY,
         KeyBinding.EDIT_ENTRY
     ),
-    SHOW_PDF_VIEWER(
-        Localization.lang("Open document viewer"),
-        IconTheme.JabRefIcons.PDF_FILE
-    ),
-    NEXT_PREVIEW_STYLE(
-        Localization.lang("Next preview style"),
-        KeyBinding.NEXT_PREVIEW_LAYOUT
-    ),
+    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
@@ -374,20 +291,14 @@ public enum StandardActions implements Action {
         IconTheme.JabRefIcons.ADD_ENTRY,
         KeyBinding.NEW_ENTRY
     ),
-    NEW_ARTICLE(
-        Localization.lang("New article"),
-        IconTheme.JabRefIcons.ADD_ARTICLE
-    ),
+    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,
         KeyBinding.NEW_ENTRY_FROM_PLAIN_TEXT
     ),
     LIBRARY_PROPERTIES(Localization.lang("Library properties")),
-    FIND_DUPLICATES(
-        Localization.lang("Find duplicates"),
-        IconTheme.JabRefIcons.FIND_DUPLICATES
-    ),
+    FIND_DUPLICATES(Localization.lang("Find duplicates"), IconTheme.JabRefIcons.FIND_DUPLICATES),
     MERGE_ENTRIES(
         Localization.lang("Merge entries"),
         IconTheme.JabRefIcons.MERGE_ENTRIES,
@@ -398,10 +309,7 @@ public enum StandardActions implements Action {
         Localization.lang("Find and remove duplicate citation keys"),
         KeyBinding.RESOLVE_DUPLICATE_CITATION_KEYS
     ),
-    CHECK_INTEGRITY(
-        Localization.lang("Check integrity"),
-        KeyBinding.CHECK_INTEGRITY
-    ),
+    CHECK_INTEGRITY(Localization.lang("Check integrity"), KeyBinding.CHECK_INTEGRITY),
     FIND_UNLINKED_FILES(
         Localization.lang("Search for unlinked local files"),
         IconTheme.JabRefIcons.SEARCH,
@@ -412,9 +320,7 @@ public enum StandardActions implements Action {
         IconTheme.JabRefIcons.AUTO_FILE_LINK,
         KeyBinding.AUTOMATICALLY_LINK_FILES
     ),
-    LOOKUP_DOC_IDENTIFIER(
-        Localization.lang("Search document identifier online")
-    ),
+    LOOKUP_DOC_IDENTIFIER(Localization.lang("Search document identifier online")),
     LOOKUP_FULLTEXT(
         Localization.lang("Search full text documents online"),
         IconTheme.JabRefIcons.FILE_SEARCH,
@@ -445,15 +351,8 @@ public enum StandardActions implements Action {
         KeyBinding.AUTOMATICALLY_LINK_FILES
     ),
 
-    EDIT_FILE_LINK(
-        Localization.lang("Edit"),
-        IconTheme.JabRefIcons.EDIT,
-        KeyBinding.EDIT_ENTRY
-    ),
-    DOWNLOAD_FILE(
-        Localization.lang("Download file"),
-        IconTheme.JabRefIcons.DOWNLOAD_FILE
-    ),
+    EDIT_FILE_LINK(Localization.lang("Edit"), IconTheme.JabRefIcons.EDIT, KeyBinding.EDIT_ENTRY),
+    DOWNLOAD_FILE(Localization.lang("Download file"), IconTheme.JabRefIcons.DOWNLOAD_FILE),
     RENAME_FILE_TO_PATTERN(
         Localization.lang("Rename file to defined pattern"),
         IconTheme.JabRefIcons.AUTO_RENAME
@@ -475,21 +374,14 @@ public enum StandardActions implements Action {
         IconTheme.JabRefIcons.COPY_TO_FOLDER,
         KeyBinding.COPY
     ),
-    REMOVE_LINK(
-        Localization.lang("Remove link"),
-        IconTheme.JabRefIcons.REMOVE_LINK
-    ),
+    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
     ),
 
-    HELP(
-        Localization.lang("Online help"),
-        IconTheme.JabRefIcons.HELP,
-        KeyBinding.HELP
-    ),
+    HELP(Localization.lang("Online help"), IconTheme.JabRefIcons.HELP, KeyBinding.HELP),
     HELP_KEY_PATTERNS(
         Localization.lang("Help on key patterns"),
         IconTheme.JabRefIcons.HELP,
@@ -538,9 +430,7 @@ public enum StandardActions implements Action {
     ),
     OPEN_DEV_VERSION_LINK(
         Localization.lang("Development version"),
-        Localization.lang(
-            "Opens a link where the current development version can be downloaded"
-        )
+        Localization.lang("Opens a link where the current development version can be downloaded")
     ),
     OPEN_CHANGELOG(
         Localization.lang("View change log"),
@@ -581,16 +471,12 @@ public enum StandardActions implements Action {
     GROUP_SUBGROUP_REMOVE(Localization.lang("Remove subgroups")),
     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(Localization.lang("Sort subgroups by # of entries (Descending)")),
     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")
-    );
+    GROUP_ENTRIES_REMOVE(Localization.lang("Remove selected entries from this group"));
 
     private final String text;
     private final String description;
@@ -608,22 +494,14 @@ public enum StandardActions implements Action {
         this.keyBinding = Optional.empty();
     }
 
-    StandardActions(
-        String text,
-        IconTheme.JabRefIcons icon,
-        KeyBinding keyBinding
-    ) {
+    StandardActions(String text, IconTheme.JabRefIcons icon, KeyBinding keyBinding) {
         this.text = text;
         this.description = "";
         this.icon = Optional.of(icon);
         this.keyBinding = Optional.of(keyBinding);
     }
 
-    StandardActions(
-        String text,
-        String description,
-        IconTheme.JabRefIcons icon
-    ) {
+    StandardActions(String text, String description, IconTheme.JabRefIcons icon) {
         this.text = text;
         this.description = description;
         this.icon = Optional.of(icon);
diff --git a/src/main/java/org/jabref/gui/autocompleter/AppendWordsStrategy.java b/src/main/java/org/jabref/gui/autocompleter/AppendWordsStrategy.java
index f2af355d791..1cc0563be0b 100644
--- a/src/main/java/org/jabref/gui/autocompleter/AppendWordsStrategy.java
+++ b/src/main/java/org/jabref/gui/autocompleter/AppendWordsStrategy.java
@@ -13,10 +13,7 @@ public AutoCompletionInput analyze(String input) {
         return determinePrefixAndReturnRemainder(input, getDelimiter());
     }
 
-    private AutoCompletionInput determinePrefixAndReturnRemainder(
-        String input,
-        String delimiter
-    ) {
+    private AutoCompletionInput determinePrefixAndReturnRemainder(String input, String delimiter) {
         int index = input.toLowerCase(Locale.ROOT).lastIndexOf(delimiter);
         if (index >= 0) {
             String prefix = input.substring(0, index + delimiter.length());
diff --git a/src/main/java/org/jabref/gui/autocompleter/AutoCompletionTextInputBinding.java b/src/main/java/org/jabref/gui/autocompleter/AutoCompletionTextInputBinding.java
index f776e000af2..82817b91fa2 100644
--- a/src/main/java/org/jabref/gui/autocompleter/AutoCompletionTextInputBinding.java
+++ b/src/main/java/org/jabref/gui/autocompleter/AutoCompletionTextInputBinding.java
@@ -39,29 +39,20 @@
  * This class is a slightly modified version of {@link impl.org.controlsfx.autocompletion.AutoCompletionTextFieldBinding}
  * that works with general text input controls instead of just text fields.
  */
-public class AutoCompletionTextInputBinding<T>
-    extends AutoCompletionBinding<T> {
+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
-    ) -> {
+    private final ChangeListener<String> textChangeListener = (obs, oldText, newText) -> {
         if (getCompletionTarget().isFocused()) {
             setUserInputText(newText);
         }
     };
     private boolean showOnFocus;
-    private final ChangeListener<Boolean> focusChangedListener = (
-        obs,
-        oldFocused,
-        newFocused
-    ) -> {
+    private final ChangeListener<Boolean> focusChangedListener = (obs, oldFocused, newFocused) -> {
         if (newFocused) {
             if (showOnFocus) {
                 setUserInputText(getCompletionTarget().getText());
@@ -92,12 +83,7 @@ private AutoCompletionTextInputBinding(
         final Callback<ISuggestionRequest, Collection<T>> suggestionProvider,
         final StringConverter<T> converter
     ) {
-        this(
-            textInputControl,
-            suggestionProvider,
-            converter,
-            new ReplaceStrategy()
-        );
+        this(textInputControl, suggestionProvider, converter, new ReplaceStrategy());
     }
 
     private AutoCompletionTextInputBinding(
@@ -111,9 +97,7 @@ private AutoCompletionTextInputBinding(
         this.inputAnalyzer = inputAnalyzer;
 
         getCompletionTarget().textProperty().addListener(textChangeListener);
-        getCompletionTarget()
-            .focusedProperty()
-            .addListener(focusChangedListener);
+        getCompletionTarget().focusedProperty().addListener(focusChangedListener);
     }
 
     private static <T> StringConverter<T> defaultStringConverter() {
@@ -143,11 +127,7 @@ public static <T> void autoComplete(
         Callback<ISuggestionRequest, Collection<T>> suggestionProvider,
         StringConverter<T> converter
     ) {
-        new AutoCompletionTextInputBinding<>(
-            textArea,
-            suggestionProvider,
-            converter
-        );
+        new AutoCompletionTextInputBinding<>(textArea, suggestionProvider, converter);
     }
 
     public static <T> AutoCompletionTextInputBinding<T> autoComplete(
@@ -182,9 +162,7 @@ private void setUserInputText(String newText) {
             newText = "";
         }
         AutoCompletionInput input = inputAnalyzer.analyze(newText);
-        DefaultTaskExecutor.runInJavaFXThread(() ->
-            setUserInput(input.getUnfinishedPart())
-        );
+        DefaultTaskExecutor.runInJavaFXThread(() -> setUserInput(input.getUnfinishedPart()));
     }
 
     @Override
@@ -195,9 +173,7 @@ public TextInputControl getCompletionTarget() {
     @Override
     public void dispose() {
         getCompletionTarget().textProperty().removeListener(textChangeListener);
-        getCompletionTarget()
-            .focusedProperty()
-            .removeListener(focusChangedListener);
+        getCompletionTarget().focusedProperty().removeListener(focusChangedListener);
     }
 
     @Override
diff --git a/src/main/java/org/jabref/gui/autocompleter/BibEntrySuggestionProvider.java b/src/main/java/org/jabref/gui/autocompleter/BibEntrySuggestionProvider.java
index da5330815b3..693a4951f99 100644
--- a/src/main/java/org/jabref/gui/autocompleter/BibEntrySuggestionProvider.java
+++ b/src/main/java/org/jabref/gui/autocompleter/BibEntrySuggestionProvider.java
@@ -32,10 +32,7 @@ protected Comparator<BibEntry> getComparator() {
     }
 
     @Override
-    protected boolean isMatch(
-        BibEntry entry,
-        AutoCompletionBinding.ISuggestionRequest request
-    ) {
+    protected boolean isMatch(BibEntry entry, AutoCompletionBinding.ISuggestionRequest request) {
         String userText = request.getUserText();
         return entry
             .getCitationKey()
diff --git a/src/main/java/org/jabref/gui/autocompleter/ContentSelectorSuggestionProvider.java b/src/main/java/org/jabref/gui/autocompleter/ContentSelectorSuggestionProvider.java
index 4362aed4e6c..e0c87a16e7f 100644
--- a/src/main/java/org/jabref/gui/autocompleter/ContentSelectorSuggestionProvider.java
+++ b/src/main/java/org/jabref/gui/autocompleter/ContentSelectorSuggestionProvider.java
@@ -8,8 +8,7 @@
 /**
  * Enriches a suggestion provider by a given set of content selector values.
  */
-public class ContentSelectorSuggestionProvider
-    extends StringSuggestionProvider {
+public class ContentSelectorSuggestionProvider extends StringSuggestionProvider {
 
     private final SuggestionProvider<String> suggestionProvider;
     private final List<String> contentSelectorValues;
@@ -24,10 +23,7 @@ public ContentSelectorSuggestionProvider(
 
     @Override
     public Stream<String> getSource() {
-        return Stream.concat(
-            contentSelectorValues.stream(),
-            suggestionProvider.getSource()
-        );
+        return Stream.concat(contentSelectorValues.stream(), suggestionProvider.getSource());
     }
 
     @Override
diff --git a/src/main/java/org/jabref/gui/autocompleter/EmptySuggestionProvider.java b/src/main/java/org/jabref/gui/autocompleter/EmptySuggestionProvider.java
index f91cc0bc974..fbb7e41a34f 100644
--- a/src/main/java/org/jabref/gui/autocompleter/EmptySuggestionProvider.java
+++ b/src/main/java/org/jabref/gui/autocompleter/EmptySuggestionProvider.java
@@ -18,10 +18,7 @@ protected Comparator<String> getComparator() {
     }
 
     @Override
-    protected boolean isMatch(
-        String candidate,
-        AutoCompletionBinding.ISuggestionRequest request
-    ) {
+    protected boolean isMatch(String candidate, AutoCompletionBinding.ISuggestionRequest request) {
         return false;
     }
 
diff --git a/src/main/java/org/jabref/gui/autocompleter/JournalsSuggestionProvider.java b/src/main/java/org/jabref/gui/autocompleter/JournalsSuggestionProvider.java
index e01078855d6..830eda0a94a 100644
--- a/src/main/java/org/jabref/gui/autocompleter/JournalsSuggestionProvider.java
+++ b/src/main/java/org/jabref/gui/autocompleter/JournalsSuggestionProvider.java
@@ -21,9 +21,6 @@ public class JournalsSuggestionProvider extends FieldValueSuggestionProvider {
 
     @Override
     public Stream<String> getSource() {
-        return Streams.concat(
-            super.getSource(),
-            repository.getFullNames().stream()
-        );
+        return Streams.concat(super.getSource(), repository.getFullNames().stream());
     }
 }
diff --git a/src/main/java/org/jabref/gui/autocompleter/PersonNameSuggestionProvider.java b/src/main/java/org/jabref/gui/autocompleter/PersonNameSuggestionProvider.java
index bb72a6a2203..beb7793a8a8 100644
--- a/src/main/java/org/jabref/gui/autocompleter/PersonNameSuggestionProvider.java
+++ b/src/main/java/org/jabref/gui/autocompleter/PersonNameSuggestionProvider.java
@@ -24,16 +24,10 @@ public class PersonNameSuggestionProvider extends SuggestionProvider<Author> {
     private final BibDatabase database;
 
     PersonNameSuggestionProvider(Field field, BibDatabase database) {
-        this(
-            Collections.singletonList(Objects.requireNonNull(field)),
-            database
-        );
+        this(Collections.singletonList(Objects.requireNonNull(field)), database);
     }
 
-    public PersonNameSuggestionProvider(
-        Collection<Field> fields,
-        BibDatabase database
-    ) {
+    public PersonNameSuggestionProvider(Collection<Field> fields, BibDatabase database) {
         super();
         this.fields = Objects.requireNonNull(fields);
         this.database = database;
@@ -61,14 +55,8 @@ protected Comparator<Author> getComparator() {
     }
 
     @Override
-    protected boolean isMatch(
-        Author candidate,
-        AutoCompletionBinding.ISuggestionRequest request
-    ) {
-        return StringUtil.containsIgnoreCase(
-            candidate.getLastFirst(false),
-            request.getUserText()
-        );
+    protected boolean isMatch(Author candidate, AutoCompletionBinding.ISuggestionRequest request) {
+        return StringUtil.containsIgnoreCase(candidate.getLastFirst(false), request.getUserText());
     }
 
     @Override
diff --git a/src/main/java/org/jabref/gui/autocompleter/StringSuggestionProvider.java b/src/main/java/org/jabref/gui/autocompleter/StringSuggestionProvider.java
index 8ddf43ac54f..fca7b372b5b 100644
--- a/src/main/java/org/jabref/gui/autocompleter/StringSuggestionProvider.java
+++ b/src/main/java/org/jabref/gui/autocompleter/StringSuggestionProvider.java
@@ -19,10 +19,7 @@ protected Comparator<String> getComparator() {
     }
 
     @Override
-    protected boolean isMatch(
-        String candidate,
-        AutoCompletionBinding.ISuggestionRequest request
-    ) {
+    protected boolean isMatch(String candidate, AutoCompletionBinding.ISuggestionRequest request) {
         return StringUtil.containsIgnoreCase(candidate, request.getUserText());
     }
 
diff --git a/src/main/java/org/jabref/gui/autocompleter/SuggestionProviders.java b/src/main/java/org/jabref/gui/autocompleter/SuggestionProviders.java
index f9cd6f8b588..d770a0c67db 100644
--- a/src/main/java/org/jabref/gui/autocompleter/SuggestionProviders.java
+++ b/src/main/java/org/jabref/gui/autocompleter/SuggestionProviders.java
@@ -30,10 +30,7 @@ public SuggestionProviders() {
     }
 
     public SuggestionProvider<?> getForField(Field field) {
-        if (
-            isEmpty ||
-            !autoCompletePreferences.getCompleteFields().contains(field)
-        ) {
+        if (isEmpty || !autoCompletePreferences.getCompleteFields().contains(field)) {
             return new EmptySuggestionProvider();
         }
 
@@ -46,14 +43,9 @@ public SuggestionProvider<?> getForField(Field field) {
         ) {
             return new BibEntrySuggestionProvider(database);
         } else if (
-            fieldProperties.contains(FieldProperty.JOURNAL_NAME) ||
-            StandardField.PUBLISHER == field
+            fieldProperties.contains(FieldProperty.JOURNAL_NAME) || StandardField.PUBLISHER == field
         ) {
-            return new JournalsSuggestionProvider(
-                field,
-                database,
-                abbreviationRepository
-            );
+            return new JournalsSuggestionProvider(field, database, abbreviationRepository);
         } else {
             return new WordSuggestionProvider(field, database);
         }
diff --git a/src/main/java/org/jabref/gui/autosaveandbackup/AutosaveManager.java b/src/main/java/org/jabref/gui/autosaveandbackup/AutosaveManager.java
index 5db53261a04..1bc0f94128a 100644
--- a/src/main/java/org/jabref/gui/autosaveandbackup/AutosaveManager.java
+++ b/src/main/java/org/jabref/gui/autosaveandbackup/AutosaveManager.java
@@ -20,9 +20,7 @@
  */
 public class AutosaveManager {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(
-        AutosaveManager.class
-    );
+    private static final Logger LOGGER = LoggerFactory.getLogger(AutosaveManager.class);
 
     private static final int DELAY_BETWEEN_AUTOSAVE_ATTEMPTS_IN_SECONDS = 31;
 
@@ -56,9 +54,7 @@ private AutosaveManager(BibDatabaseContext bibDatabaseContext) {
     }
 
     @Subscribe
-    public void listen(
-        @SuppressWarnings("unused") BibDatabaseContextChangedEvent event
-    ) {
+    public void listen(@SuppressWarnings("unused") BibDatabaseContextChangedEvent event) {
         if (!event.isFilteredOut()) {
             this.needsSave = true;
         }
@@ -76,9 +72,7 @@ private void shutdown() {
      * @param bibDatabaseContext Associated {@link BibDatabaseContext}
      */
     public static AutosaveManager start(BibDatabaseContext bibDatabaseContext) {
-        AutosaveManager autosaveManager = new AutosaveManager(
-            bibDatabaseContext
-        );
+        AutosaveManager autosaveManager = new AutosaveManager(bibDatabaseContext);
         runningInstances.add(autosaveManager);
         return autosaveManager;
     }
@@ -91,9 +85,7 @@ public static AutosaveManager start(BibDatabaseContext bibDatabaseContext) {
     public static void shutdown(BibDatabaseContext bibDatabaseContext) {
         runningInstances
             .stream()
-            .filter(instance ->
-                instance.bibDatabaseContext == bibDatabaseContext
-            )
+            .filter(instance -> instance.bibDatabaseContext == bibDatabaseContext)
             .findAny()
             .ifPresent(instance -> {
                 instance.shutdown();
diff --git a/src/main/java/org/jabref/gui/autosaveandbackup/BackupManager.java b/src/main/java/org/jabref/gui/autosaveandbackup/BackupManager.java
index ea380af2e58..0022c170e21 100644
--- a/src/main/java/org/jabref/gui/autosaveandbackup/BackupManager.java
+++ b/src/main/java/org/jabref/gui/autosaveandbackup/BackupManager.java
@@ -48,9 +48,7 @@
  */
 public class BackupManager {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(
-        BackupManager.class
-    );
+    private static final Logger LOGGER = LoggerFactory.getLogger(BackupManager.class);
 
     private static final int MAXIMUM_BACKUP_FILE_COUNT = 10;
 
@@ -100,10 +98,7 @@ static Path getBackupPathForNewBackup(Path originalPath, Path backupDir) {
     /**
      * Determines the most recent existing backup file name
      */
-    static Optional<Path> getLatestBackupPath(
-        Path originalPath,
-        Path backupDir
-    ) {
+    static Optional<Path> getLatestBackupPath(Path originalPath, Path backupDir) {
         return BackupFileUtil.getPathOfLatestExistingBackupFile(
             originalPath,
             BackupFileType.BACKUP,
@@ -131,9 +126,7 @@ public static BackupManager start(
             entryTypesManager,
             preferences
         );
-        backupManager.startBackupTask(
-            preferences.getFilePreferences().getBackupDirectory()
-        );
+        backupManager.startBackupTask(preferences.getFilePreferences().getBackupDirectory());
         runningInstances.add(backupManager);
         return backupManager;
     }
@@ -143,15 +136,10 @@ public static BackupManager start(
      *
      * @param bibDatabaseContext Associated {@link BibDatabaseContext}
      */
-    public static void discardBackup(
-        BibDatabaseContext bibDatabaseContext,
-        Path backupDir
-    ) {
+    public static void discardBackup(BibDatabaseContext bibDatabaseContext, Path backupDir) {
         runningInstances
             .stream()
-            .filter(instance ->
-                instance.bibDatabaseContext == bibDatabaseContext
-            )
+            .filter(instance -> instance.bibDatabaseContext == bibDatabaseContext)
             .forEach(backupManager -> backupManager.discardBackup(backupDir));
     }
 
@@ -169,15 +157,9 @@ public static void shutdown(
     ) {
         runningInstances
             .stream()
-            .filter(instance ->
-                instance.bibDatabaseContext == bibDatabaseContext
-            )
-            .forEach(backupManager ->
-                backupManager.shutdown(backupDir, createBackup)
-            );
-        runningInstances.removeIf(instance ->
-            instance.bibDatabaseContext == bibDatabaseContext
-        );
+            .filter(instance -> instance.bibDatabaseContext == bibDatabaseContext)
+            .forEach(backupManager -> backupManager.shutdown(backupDir, createBackup));
+        runningInstances.removeIf(instance -> instance.bibDatabaseContext == bibDatabaseContext);
     }
 
     /**
@@ -198,11 +180,7 @@ public static boolean backupFileDiffers(Path originalPath, Path backupDir) {
             try {
                 Files.delete(discardedFile);
             } catch (IOException e) {
-                LOGGER.error(
-                    "Could not remove discarded file {}",
-                    discardedFile,
-                    e
-                );
+                LOGGER.error("Could not remove discarded file {}", discardedFile, e);
                 return true;
             }
             return false;
@@ -211,21 +189,15 @@ public static boolean backupFileDiffers(Path originalPath, Path backupDir) {
             .map(latestBackupPath -> {
                 FileTime latestBackupFileLastModifiedTime;
                 try {
-                    latestBackupFileLastModifiedTime =
-                        Files.getLastModifiedTime(latestBackupPath);
+                    latestBackupFileLastModifiedTime = Files.getLastModifiedTime(latestBackupPath);
                 } catch (IOException e) {
-                    LOGGER.debug(
-                        "Could not get timestamp of backup file {}",
-                        latestBackupPath,
-                        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);
+                    currentFileLastModifiedTime = Files.getLastModifiedTime(originalPath);
                 } catch (IOException e) {
                     LOGGER.debug(
                         "Could not get timestamp of current file file {}",
@@ -235,25 +207,15 @@ public static boolean backupFileDiffers(Path originalPath, Path backupDir) {
                     // If we cannot get the timestamp, we do show any warning
                     return false;
                 }
-                if (
-                    latestBackupFileLastModifiedTime.compareTo(
-                        currentFileLastModifiedTime
-                    ) <=
-                    0
-                ) {
+                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 {
-                    return (
-                        Files.mismatch(originalPath, latestBackupPath) != -1L
-                    );
+                    return (Files.mismatch(originalPath, latestBackupPath) != -1L);
                 } catch (IOException e) {
-                    LOGGER.debug(
-                        "Could not compare original file and backup file.",
-                        e
-                    );
+                    LOGGER.debug("Could not compare original file and backup file.", e);
                     // User has to investigate in this case
                     return true;
                 }
@@ -267,20 +229,13 @@ public static boolean backupFileDiffers(Path originalPath, Path backupDir) {
      * @param originalPath Path to the file which should be equalized to the backup file.
      */
     public static void restoreBackup(Path originalPath, Path backupDir) {
-        Optional<Path> backupPath = getLatestBackupPath(
-            originalPath,
-            backupDir
-        );
+        Optional<Path> backupPath = getLatestBackupPath(originalPath, backupDir);
         if (backupPath.isEmpty()) {
             LOGGER.error("There is no backup file");
             return;
         }
         try {
-            Files.copy(
-                backupPath.get(),
-                originalPath,
-                StandardCopyOption.REPLACE_EXISTING
-            );
+            Files.copy(backupPath.get(), originalPath, StandardCopyOption.REPLACE_EXISTING);
         } catch (IOException e) {
             LOGGER.error("Error while restoring the backup file.", e);
         }
@@ -289,9 +244,7 @@ public static void restoreBackup(Path originalPath, Path backupDir) {
     Optional<Path> determineBackupPathForNewBackup(Path backupDir) {
         return bibDatabaseContext
             .getDatabasePath()
-            .map(path ->
-                BackupManager.getBackupPathForNewBackup(path, backupDir)
-            );
+            .map(path -> BackupManager.getBackupPathForNewBackup(path, backupDir));
     }
 
     /**
@@ -312,11 +265,7 @@ void performBackup(Path backupPath) {
             try {
                 Files.delete(oldestBackupFile);
             } catch (IOException e) {
-                LOGGER.error(
-                    "Could not delete backup file {}",
-                    oldestBackupFile,
-                    e
-                );
+                LOGGER.error("Could not delete backup file {}", oldestBackupFile, e);
             }
         }
 
@@ -327,16 +276,15 @@ void performBackup(Path backupPath) {
             .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();
+                    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()
-                            )
+                            .map(column -> ((MainTableColumn<?>) column).getModel())
                             .flatMap(model -> model.getSortCriteria().stream())
                             .toList()
                     );
@@ -350,9 +298,7 @@ void performBackup(Path backupPath) {
                 .withMakeBackup(false)
                 .withSaveOrder(saveOrder)
                 .withReformatOnSave(
-                    preferences
-                        .getLibraryPreferences()
-                        .shouldAlwaysReformatOnSave()
+                    preferences.getLibraryPreferences().shouldAlwaysReformatOnSave()
                 );
 
         Charset encoding = bibDatabaseContext
@@ -363,9 +309,7 @@ void performBackup(Path backupPath) {
         // 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 the write 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)
-        ) {
+        try (Writer writer = new AtomicFileWriter(backupPath, encoding, false)) {
             BibWriter bibWriter = new BibWriter(
                 writer,
                 bibDatabaseContext.getDatabase().getNewLineSeparator()
@@ -390,10 +334,7 @@ void performBackup(Path backupPath) {
 
     private static Path determineDiscardedFile(Path file, Path backupDir) {
         return backupDir.resolve(
-            BackupFileUtil.getUniqueFilePrefix(file) +
-            "--" +
-            file.getFileName() +
-            "--discarded"
+            BackupFileUtil.getUniqueFilePrefix(file) + "--" + file.getFileName() + "--discarded"
         );
     }
 
@@ -404,10 +345,7 @@ private static Path determineDiscardedFile(Path file, Path backupDir) {
      * Therefore, we mark discarded backups by a --discarded file.
      */
     public void discardBackup(Path backupDir) {
-        Path path = determineDiscardedFile(
-            bibDatabaseContext.getDatabasePath().get(),
-            backupDir
-        );
+        Path path = determineDiscardedFile(bibDatabaseContext.getDatabasePath().get(), backupDir);
         try {
             Files.createFile(path);
         } catch (IOException e) {
@@ -420,8 +358,7 @@ private void logIfCritical(Path backupPath, IOException e) {
         while (innermostCause.getCause() != null) {
             innermostCause = innermostCause.getCause();
         }
-        boolean isErrorInField =
-            innermostCause instanceof InvalidFieldValueException;
+        boolean isErrorInField = innermostCause instanceof InvalidFieldValueException;
 
         // do not print errors in field values into the log during autosave
         if (!isErrorInField) {
@@ -468,9 +405,7 @@ private void fillQueue(Path backupDir) {
                     List<Path> allSavFiles = Files
                         .list(backupDir)
                         // just list the .sav belonging to the given targetFile
-                        .filter(p ->
-                            p.getFileName().toString().startsWith(prefix)
-                        )
+                        .filter(p -> p.getFileName().toString().startsWith(prefix))
                         .sorted()
                         .toList();
                     backupFilesQueue.addAll(allSavFiles);
@@ -494,8 +429,7 @@ private void shutdown(Path backupDir, boolean createBackup) {
 
         if (createBackup) {
             // Ensure that backup is a recent one
-            determineBackupPathForNewBackup(backupDir)
-                .ifPresent(this::performBackup);
+            determineBackupPathForNewBackup(backupDir).ifPresent(this::performBackup);
         }
     }
 }
diff --git a/src/main/java/org/jabref/gui/auximport/AuxParserResultViewModel.java b/src/main/java/org/jabref/gui/auximport/AuxParserResultViewModel.java
index 3eb43d104ff..5058fde7791 100644
--- a/src/main/java/org/jabref/gui/auximport/AuxParserResultViewModel.java
+++ b/src/main/java/org/jabref/gui/auximport/AuxParserResultViewModel.java
@@ -19,10 +19,7 @@ public AuxParserResultViewModel(AuxParserResult auxParserResult) {
      */
     public String getInformation(boolean includeMissingEntries) {
         String missingEntries = "";
-        if (
-            includeMissingEntries &&
-            (this.auxParserResult.getUnresolvedKeysCount() > 0)
-        ) {
+        if (includeMissingEntries && (this.auxParserResult.getUnresolvedKeysCount() > 0)) {
             missingEntries =
                 this.auxParserResult.getUnresolvedKeys()
                     .stream()
diff --git a/src/main/java/org/jabref/gui/auximport/FromAuxDialog.java b/src/main/java/org/jabref/gui/auximport/FromAuxDialog.java
index 524f2d7df9b..f15ed989498 100644
--- a/src/main/java/org/jabref/gui/auximport/FromAuxDialog.java
+++ b/src/main/java/org/jabref/gui/auximport/FromAuxDialog.java
@@ -61,18 +61,13 @@ public FromAuxDialog(LibraryTabContainer tabContainer) {
 
         ViewLoader.view(this).load().setAsDialogPane(this);
 
-        Button generateButton = (Button) this.getDialogPane()
-            .lookupButton(generateButtonType);
+        Button generateButton = (Button) this.getDialogPane().lookupButton(generateButtonType);
         generateButton
             .disableProperty()
             .bind(
-                viewModel
-                    .parseFailedProperty()
-                    .or(viewModel.notFoundList().emptyProperty().not())
+                viewModel.parseFailedProperty().or(viewModel.notFoundList().emptyProperty().not())
             );
-        generateButton
-            .defaultButtonProperty()
-            .bind(generateButton.disableProperty().not());
+        generateButton.defaultButtonProperty().bind(generateButton.disableProperty().not());
         setResultConverter(button -> {
             if (button == generateButtonType) {
                 viewModel.addResultToTabContainer();
@@ -86,26 +81,15 @@ public FromAuxDialog(LibraryTabContainer tabContainer) {
     @FXML
     private void initialize() {
         viewModel =
-            new FromAuxDialogViewModel(
-                tabContainer,
-                dialogService,
-                preferences,
-                stateManager
-            );
+            new FromAuxDialogViewModel(tabContainer, dialogService, preferences, stateManager);
 
-        auxFileField
-            .textProperty()
-            .bindBidirectional(viewModel.auxFileProperty());
-        statusInfos
-            .textProperty()
-            .bindBidirectional(viewModel.statusTextProperty());
+        auxFileField.textProperty().bindBidirectional(viewModel.auxFileProperty());
+        statusInfos.textProperty().bindBidirectional(viewModel.statusTextProperty());
         notFoundList.itemsProperty().bind(viewModel.notFoundList());
 
         libraryListView.setEditable(false);
         libraryListView.itemsProperty().bind(viewModel.librariesProperty());
-        libraryListView
-            .valueProperty()
-            .bindBidirectional(viewModel.selectedLibraryProperty());
+        libraryListView.valueProperty().bindBidirectional(viewModel.selectedLibraryProperty());
         new ViewModelListCellFactory<BibDatabaseContext>()
             .withText(viewModel::getDatabaseName)
             .install(libraryListView);
diff --git a/src/main/java/org/jabref/gui/auximport/FromAuxDialogViewModel.java b/src/main/java/org/jabref/gui/auximport/FromAuxDialogViewModel.java
index 5c019326ed9..cb23688630b 100644
--- a/src/main/java/org/jabref/gui/auximport/FromAuxDialogViewModel.java
+++ b/src/main/java/org/jabref/gui/auximport/FromAuxDialogViewModel.java
@@ -30,16 +30,15 @@
 
 public class FromAuxDialogViewModel {
 
-    private final BooleanProperty parseFailedProperty =
-        new SimpleBooleanProperty(false);
+    private final BooleanProperty parseFailedProperty = new SimpleBooleanProperty(false);
     private final StringProperty auxFileProperty = new SimpleStringProperty();
-    private final StringProperty statusTextProperty =
-        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 ListProperty<BibDatabaseContext> librariesProperty = new SimpleListProperty<>(
+        FXCollections.observableArrayList()
+    );
     private final ObjectProperty<BibDatabaseContext> selectedLibraryProperty =
         new SimpleObjectProperty<>();
 
@@ -62,9 +61,7 @@ public FromAuxDialogViewModel(
         this.stateManager = stateManager;
 
         librariesProperty.setAll(stateManager.getOpenDatabases());
-        selectedLibraryProperty.set(
-            tabContainer.getCurrentLibraryTab().getBibDatabaseContext()
-        );
+        selectedLibraryProperty.set(tabContainer.getCurrentLibraryTab().getBibDatabaseContext());
         EasyBind.listen(
             selectedLibraryProperty,
             (obs, oldValue, newValue) -> {
@@ -97,51 +94,35 @@ public String getDatabaseName(BibDatabaseContext databaseContext) {
     }
 
     public void browse() {
-        FileDialogConfiguration fileDialogConfiguration =
-            new FileDialogConfiguration.Builder()
-                .addExtensionFilter(StandardFileType.AUX)
-                .withDefaultExtension(StandardFileType.AUX)
-                .withInitialDirectory(
-                    preferencesService
-                        .getFilePreferences()
-                        .getWorkingDirectory()
-                )
-                .build();
+        FileDialogConfiguration fileDialogConfiguration = new FileDialogConfiguration.Builder()
+            .addExtensionFilter(StandardFileType.AUX)
+            .withDefaultExtension(StandardFileType.AUX)
+            .withInitialDirectory(preferencesService.getFilePreferences().getWorkingDirectory())
+            .build();
         dialogService
             .showFileOpenDialog(fileDialogConfiguration)
-            .ifPresent(file ->
-                auxFileProperty.setValue(file.toAbsolutePath().toString())
-            );
+            .ifPresent(file -> auxFileProperty.setValue(file.toAbsolutePath().toString()));
     }
 
     public void parse() {
         parseFailedProperty.set(false);
         notFoundList.clear();
         statusTextProperty.setValue("");
-        BibDatabase referenceDatabase = selectedLibraryProperty
-            .get()
-            .getDatabase();
+        BibDatabase referenceDatabase = selectedLibraryProperty.get().getDatabase();
         String auxName = auxFileProperty.get();
 
-        if (
-            (auxName != null) &&
-            (referenceDatabase != null) &&
-            !auxName.isEmpty()
-        ) {
+        if ((auxName != null) && (referenceDatabase != null) && !auxName.isEmpty()) {
             AuxParser auxParser = new DefaultAuxParser(referenceDatabase);
             auxParserResult = auxParser.parse(Path.of(auxName));
             notFoundList.setAll(auxParserResult.getUnresolvedKeys());
             statusTextProperty.set(
-                new AuxParserResultViewModel(auxParserResult)
-                    .getInformation(false)
+                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.get() + "\n" + Localization.lang("empty library")
                 );
                 parseFailedProperty.set(true);
             }
diff --git a/src/main/java/org/jabref/gui/auximport/NewSubLibraryAction.java b/src/main/java/org/jabref/gui/auximport/NewSubLibraryAction.java
index 73d20146105..c1ae30c90d8 100644
--- a/src/main/java/org/jabref/gui/auximport/NewSubLibraryAction.java
+++ b/src/main/java/org/jabref/gui/auximport/NewSubLibraryAction.java
@@ -17,10 +17,7 @@ public class NewSubLibraryAction extends SimpleCommand {
 
     private final JabRefFrame jabRefFrame;
 
-    public NewSubLibraryAction(
-        JabRefFrame jabRefFrame,
-        StateManager stateManager
-    ) {
+    public NewSubLibraryAction(JabRefFrame jabRefFrame, StateManager stateManager) {
         this.jabRefFrame = jabRefFrame;
 
         this.executable.bind(needsDatabase(stateManager));
@@ -28,9 +25,7 @@ public NewSubLibraryAction(
 
     @Override
     public void execute() {
-        DialogService dialogService = Injector.instantiateModelOrService(
-            DialogService.class
-        );
+        DialogService dialogService = Injector.instantiateModelOrService(DialogService.class);
         dialogService.showCustomDialogAndWait(new FromAuxDialog(jabRefFrame));
     }
 }
diff --git a/src/main/java/org/jabref/gui/backup/BackupResolverDialog.java b/src/main/java/org/jabref/gui/backup/BackupResolverDialog.java
index 0baee714b70..c2ae5b02bd4 100644
--- a/src/main/java/org/jabref/gui/backup/BackupResolverDialog.java
+++ b/src/main/java/org/jabref/gui/backup/BackupResolverDialog.java
@@ -31,9 +31,7 @@ public class BackupResolverDialog extends FXDialog {
         ButtonBar.ButtonData.CANCEL_CLOSE
     );
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(
-        BackupResolverDialog.class
-    );
+    private static final Logger LOGGER = LoggerFactory.getLogger(BackupResolverDialog.class);
 
     public BackupResolverDialog(
         Path originalPath,
@@ -43,16 +41,13 @@ public BackupResolverDialog(
         super(AlertType.CONFIRMATION, Localization.lang("Backup found"), true);
         setHeaderText(null);
         getDialogPane().setMinHeight(180);
-        getDialogPane()
-            .getButtonTypes()
-            .setAll(RESTORE_FROM_BACKUP, REVIEW_BACKUP, IGNORE_BACKUP);
+        getDialogPane().getButtonTypes().setAll(RESTORE_FROM_BACKUP, REVIEW_BACKUP, IGNORE_BACKUP);
 
-        Optional<Path> backupPathOpt =
-            BackupFileUtil.getPathOfLatestExistingBackupFile(
-                originalPath,
-                BackupFileType.BACKUP,
-                backupDir
-            );
+        Optional<Path> backupPathOpt = BackupFileUtil.getPathOfLatestExistingBackupFile(
+            originalPath,
+            BackupFileType.BACKUP,
+            backupDir
+        );
         String backupFilename = backupPathOpt
             .map(Path::getFileName)
             .map(Path::toString)
@@ -68,9 +63,7 @@ public BackupResolverDialog(
                 "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?"
-            );
+            Localization.lang("Do you want to recover the library from the backup file?");
         setContentText(content);
 
         HyperlinkLabel contentLabel = new HyperlinkLabel(content);
@@ -80,8 +73,7 @@ public BackupResolverDialog(
                 if (!(e.getSource() instanceof Hyperlink)) {
                     return;
                 }
-                String clickedLinkText =
-                    ((Hyperlink) (e.getSource())).getText();
+                String clickedLinkText = ((Hyperlink) (e.getSource())).getText();
                 if (backupFilename.equals(clickedLinkText)) {
                     try {
                         JabRefDesktop.openFolderAndSelectFile(
diff --git a/src/main/java/org/jabref/gui/bibtexextractor/BibtexExtractor.java b/src/main/java/org/jabref/gui/bibtexextractor/BibtexExtractor.java
index f122fbe42d0..4a3a3a69ce3 100644
--- a/src/main/java/org/jabref/gui/bibtexextractor/BibtexExtractor.java
+++ b/src/main/java/org/jabref/gui/bibtexextractor/BibtexExtractor.java
@@ -76,14 +76,9 @@ public BibEntry extract(String input) {
     }
 
     private BibEntry generateEntity(String input) {
-        EntryType type = isArticle
-            ? StandardEntryType.Article
-            : StandardEntryType.Book;
+        EntryType type = isArticle ? StandardEntryType.Article : StandardEntryType.Book;
         BibEntry extractedEntity = new BibEntry(type);
-        extractedEntity.setField(
-            StandardField.AUTHOR,
-            String.join(" and ", authors)
-        );
+        extractedEntity.setField(StandardField.AUTHOR, String.join(" and ", authors));
         extractedEntity.setField(StandardField.URL, String.join(", ", urls));
         extractedEntity.setField(StandardField.YEAR, year);
         extractedEntity.setField(StandardField.PAGES, pages);
@@ -91,10 +86,7 @@ private BibEntry generateEntity(String input) {
         if (isArticle) {
             extractedEntity.setField(StandardField.JOURNAL, journalOrPublisher);
         } else {
-            extractedEntity.setField(
-                StandardField.PUBLISHER,
-                journalOrPublisher
-            );
+            extractedEntity.setField(StandardField.PUBLISHER, journalOrPublisher);
         }
         extractedEntity.setField(StandardField.COMMENT, input);
         return extractedEntity;
@@ -111,10 +103,7 @@ private String findUrls(String input) {
     private String findYear(String input) {
         Matcher matcher = YEAR_PATTERN.matcher(input);
         while (matcher.find()) {
-            String yearCandidate = input.substring(
-                matcher.start(),
-                matcher.end()
-            );
+            String yearCandidate = input.substring(matcher.start(), matcher.end());
             int intYearCandidate = Integer.parseInt(yearCandidate);
             if (
                 (intYearCandidate > 1700) &&
@@ -136,10 +125,7 @@ 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)
-                )
+                GenerateAuthor(matcher.group(LASTNAME_GROUP), matcher.group(INITIALS_GROUP))
             );
         }
         return fixSpaces(matcher.replaceAll(AUTHOR_TAG));
@@ -181,15 +167,9 @@ private String findParts(String input) {
                     .replace(YEAR_TAG, "")
                     .replace(PAGES_TAG, "")
             );
-            lastParts.addAll(
-                Arrays.asList(
-                    input.substring(delimiterIndex + 2).split(",|\\.")
-                )
-            );
+            lastParts.addAll(Arrays.asList(input.substring(delimiterIndex + 2).split(",|\\.")));
         } else {
-            lastParts.addAll(
-                Arrays.asList(input.substring(afterAuthorsIndex).split(",|\\."))
-            );
+            lastParts.addAll(Arrays.asList(input.substring(afterAuthorsIndex).split(",|\\.")));
         }
         int nonDigitParts = 0;
         for (String part : lastParts) {
diff --git a/src/main/java/org/jabref/gui/bibtexextractor/BibtexExtractorViewModel.java b/src/main/java/org/jabref/gui/bibtexextractor/BibtexExtractorViewModel.java
index fb271cfd729..833b3246c9b 100644
--- a/src/main/java/org/jabref/gui/bibtexextractor/BibtexExtractorViewModel.java
+++ b/src/main/java/org/jabref/gui/bibtexextractor/BibtexExtractorViewModel.java
@@ -24,13 +24,9 @@
 
 public class BibtexExtractorViewModel {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(
-        BibtexExtractorViewModel.class
-    );
+    private static final Logger LOGGER = LoggerFactory.getLogger(BibtexExtractorViewModel.class);
 
-    private final StringProperty inputTextProperty = new SimpleStringProperty(
-        ""
-    );
+    private final StringProperty inputTextProperty = new SimpleStringProperty("");
     private final DialogService dialogService;
     private final PreferencesService preferencesService;
     private final TaskExecutor taskExecutor;
@@ -73,8 +69,7 @@ public void startParsing() {
     }
 
     private void parseUsingBibtexExtractor() {
-        BibEntry parsedEntry = new BibtexExtractor()
-            .extract(inputTextProperty.getValue());
+        BibEntry parsedEntry = new BibtexExtractor().extract(inputTextProperty.getValue());
         importHandler.importEntries(List.of(parsedEntry));
         trackNewEntry(parsedEntry, "ParseWithBibTeXExtractor");
     }
@@ -85,15 +80,8 @@ private void parseUsingGrobid() {
             preferencesService.getImportFormatPreferences()
         );
         BackgroundTask
-            .wrap(() ->
-                grobidCitationFetcher.performSearch(
-                    inputTextProperty.getValue()
-                )
-            )
-            .onRunning(() ->
-                dialogService.notify(
-                    Localization.lang("Your text is being parsed...")
-                )
+            .wrap(() -> grobidCitationFetcher.performSearch(inputTextProperty.getValue()))
+            .onRunning(() -> dialogService.notify(Localization.lang("Your text is being parsed..."))
             )
             .onFailure(e -> {
                 if (e instanceof FetcherException) {
@@ -123,14 +111,9 @@ private void parseUsingGrobid() {
 
     private void trackNewEntry(BibEntry bibEntry, String eventMessage) {
         Map<String, String> properties = new HashMap<>();
-        properties.put(
-            "EntryType",
-            bibEntry.typeProperty().getValue().getName()
-        );
+        properties.put("EntryType", bibEntry.typeProperty().getValue().getName());
         Telemetry
             .getTelemetryClient()
-            .ifPresent(client ->
-                client.trackEvent(eventMessage, properties, new HashMap<>())
-            );
+            .ifPresent(client -> client.trackEvent(eventMessage, properties, new HashMap<>()));
     }
 }
diff --git a/src/main/java/org/jabref/gui/bibtexextractor/ExtractBibtexAction.java b/src/main/java/org/jabref/gui/bibtexextractor/ExtractBibtexAction.java
index 1dbf647bfbc..0054626ff97 100644
--- a/src/main/java/org/jabref/gui/bibtexextractor/ExtractBibtexAction.java
+++ b/src/main/java/org/jabref/gui/bibtexextractor/ExtractBibtexAction.java
@@ -26,9 +26,7 @@ public ExtractBibtexAction(
 
     @Override
     public void execute() {
-        DialogService dialogService = Injector.instantiateModelOrService(
-            DialogService.class
-        );
+        DialogService dialogService = Injector.instantiateModelOrService(DialogService.class);
         GrobidOptInDialogHelper.showAndWaitIfUserIsUndecided(
             dialogService,
             preferencesService.getGrobidPreferences()
diff --git a/src/main/java/org/jabref/gui/bibtexextractor/ExtractBibtexDialog.java b/src/main/java/org/jabref/gui/bibtexextractor/ExtractBibtexDialog.java
index bb86719f885..b70b22c1ef2 100644
--- a/src/main/java/org/jabref/gui/bibtexextractor/ExtractBibtexDialog.java
+++ b/src/main/java/org/jabref/gui/bibtexextractor/ExtractBibtexDialog.java
@@ -69,9 +69,7 @@ public ExtractBibtexDialog() {
             )
         );
         buttonParse.setOnAction(event -> viewModel.startParsing());
-        buttonParse
-            .disableProperty()
-            .bind(viewModel.inputTextProperty().isEmpty());
+        buttonParse.disableProperty().bind(viewModel.inputTextProperty().isEmpty());
     }
 
     @FXML
diff --git a/src/main/java/org/jabref/gui/citationkeypattern/GenerateCitationKeyAction.java b/src/main/java/org/jabref/gui/citationkeypattern/GenerateCitationKeyAction.java
index 5b808a5ba82..2c2fc5cda11 100644
--- a/src/main/java/org/jabref/gui/citationkeypattern/GenerateCitationKeyAction.java
+++ b/src/main/java/org/jabref/gui/citationkeypattern/GenerateCitationKeyAction.java
@@ -52,28 +52,20 @@ public void execute() {
         if (entries.isEmpty()) {
             dialogService.showWarningDialogAndWait(
                 Localization.lang("Autogenerate citation keys"),
-                Localization.lang(
-                    "First select the entries you want keys to be generated for."
-                )
+                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()
-            )
+            formatOutputMessage(Localization.lang("Generating citation key for"), entries.size())
         );
 
         checkOverwriteKeysChosen();
 
         if (!this.isCanceled) {
-            BackgroundTask<Void> backgroundTask =
-                this.generateKeysInBackground();
+            BackgroundTask<Void> backgroundTask = this.generateKeysInBackground();
             backgroundTask.showToUser(true);
-            backgroundTask
-                .titleProperty()
-                .set(Localization.lang("Autogenerate citation keys"));
+            backgroundTask.titleProperty().set(Localization.lang("Autogenerate citation keys"));
             backgroundTask
                 .messageProperty()
                 .set(Localization.lang("%0/%1 entries", 0, entries.size()));
@@ -87,15 +79,11 @@ public static boolean confirmOverwriteKeys(
         PreferencesService preferencesService
     ) {
         if (
-            preferencesService
-                .getCitationKeyPatternPreferences()
-                .shouldWarnBeforeOverwriteCiteKey()
+            preferencesService.getCitationKeyPatternPreferences().shouldWarnBeforeOverwriteCiteKey()
         ) {
             return dialogService.showConfirmationDialogWithOptOutAndWait(
                 Localization.lang("Overwrite keys"),
-                Localization.lang(
-                    "One or more keys will be overwritten. Continue?"
-                ),
+                Localization.lang("One or more keys will be overwritten. Continue?"),
                 Localization.lang("Overwrite keys"),
                 Localization.lang("Cancel"),
                 Localization.lang("Do not ask again"),
@@ -113,18 +101,12 @@ public static boolean confirmOverwriteKeys(
     private void checkOverwriteKeysChosen() {
         // We don't want to generate keys for entries which already have one thus remove the entries
         if (
-            this.preferencesService.getCitationKeyPatternPreferences()
-                .shouldAvoidOverwriteCiteKey()
+            this.preferencesService.getCitationKeyPatternPreferences().shouldAvoidOverwriteCiteKey()
         ) {
             entries.removeIf(BibEntry::hasCitationKey);
             // if we're going to override some citation keys warn the user about it
-        } else if (
-            entries.parallelStream().anyMatch(BibEntry::hasCitationKey)
-        ) {
-            boolean overwriteKeys = confirmOverwriteKeys(
-                dialogService,
-                this.preferencesService
-            );
+        } else if (entries.parallelStream().anyMatch(BibEntry::hasCitationKey)) {
+            boolean overwriteKeys = confirmOverwriteKeys(dialogService, this.preferencesService);
 
             // The user doesn't want to override citation keys
             if (!overwriteKeys) {
@@ -144,44 +126,29 @@ protected Void call() {
                 }
                 DefaultTaskExecutor.runInJavaFXThread(() -> {
                     updateProgress(0, entries.size());
-                    messageProperty()
-                        .set(
-                            Localization.lang(
-                                "%0/%1 entries",
-                                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,
-                                preferencesService.getCitationKeyPatternPreferences()
-                            );
+                            new NamedCompound(Localization.lang("Autogenerate citation keys"));
+                        CitationKeyGenerator keyGenerator = new CitationKeyGenerator(
+                            databaseContext,
+                            preferencesService.getCitationKeyPatternPreferences()
+                        );
                         int entriesDone = 0;
                         for (BibEntry entry : entries) {
                             keyGenerator
                                 .generateAndSetKey(entry)
                                 .ifPresent(fieldChange ->
-                                    compound.addEdit(
-                                        new UndoableKeyChange(fieldChange)
-                                    )
+                                    compound.addEdit(new UndoableKeyChange(fieldChange))
                                 );
                             entriesDone++;
                             int finalEntriesDone = entriesDone;
                             DefaultTaskExecutor.runInJavaFXThread(() -> {
-                                updateProgress(
-                                    finalEntriesDone,
-                                    entries.size()
-                                );
+                                updateProgress(finalEntriesDone, entries.size());
                                 messageProperty()
                                     .set(
                                         Localization.lang(
@@ -221,9 +188,7 @@ private String formatOutputMessage(String start, int count) {
             "%s %d %s.",
             start,
             count,
-            (count > 1
-                    ? Localization.lang("entries")
-                    : Localization.lang("entry"))
+            (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 86df1af4f9a..341a35e02bf 100644
--- a/src/main/java/org/jabref/gui/citationkeypattern/GenerateCitationKeySingleAction.java
+++ b/src/main/java/org/jabref/gui/citationkeypattern/GenerateCitationKeySingleAction.java
@@ -30,11 +30,7 @@ public GenerateCitationKeySingleAction(
         this.preferencesService = preferencesService;
         this.undoManager = undoManager;
 
-        if (
-            preferencesService
-                .getCitationKeyPatternPreferences()
-                .shouldAvoidOverwriteCiteKey()
-        ) {
+        if (preferencesService.getCitationKeyPatternPreferences().shouldAvoidOverwriteCiteKey()) {
             this.executable.bind(entry.getCiteKeyBinding().isEmpty());
         }
     }
@@ -43,19 +39,14 @@ public GenerateCitationKeySingleAction(
     public void execute() {
         if (
             !entry.hasCitationKey() ||
-            GenerateCitationKeyAction.confirmOverwriteKeys(
-                dialogService,
-                preferencesService
-            )
+            GenerateCitationKeyAction.confirmOverwriteKeys(dialogService, preferencesService)
         ) {
             new CitationKeyGenerator(
                 databaseContext,
                 preferencesService.getCitationKeyPatternPreferences()
             )
                 .generateAndSetKey(entry)
-                .ifPresent(change ->
-                    undoManager.addEdit(new UndoableKeyChange(change))
-                );
+                .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 1b9276b0ad2..8ff677d3eff 100644
--- a/src/main/java/org/jabref/gui/cleanup/CleanupAction.java
+++ b/src/main/java/org/jabref/gui/cleanup/CleanupAction.java
@@ -76,45 +76,36 @@ public void execute() {
             preferences.getFilePreferences()
         );
 
-        Optional<CleanupPreferences> chosenPreset =
-            dialogService.showCustomDialogAndWait(cleanupDialog);
+        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)
-                    );
+                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().setActiveJobs(preset.getActiveJobs());
             preferences
                 .getCleanupPreferences()
                 .setFieldFormatterCleanups(preset.getFieldFormatterCleanups());
 
             BackgroundTask
-                .wrap(() ->
-                    cleanup(stateManager.getActiveDatabase().get(), preset)
-                )
+                .wrap(() -> cleanup(stateManager.getActiveDatabase().get(), preset))
                 .onSuccess(result -> showResults())
                 .onFailure(dialogService::showErrorDialogAndWait)
                 .executeWith(taskExecutor);
@@ -156,13 +147,9 @@ private void showResults() {
         }
 
         if (modifiedEntriesCount == 0) {
-            dialogService.notify(
-                Localization.lang("No entry needed a clean up")
-            );
+            dialogService.notify(Localization.lang("No entry needed a clean up"));
         } else if (modifiedEntriesCount == 1) {
-            dialogService.notify(
-                Localization.lang("One entry needed a clean up")
-            );
+            dialogService.notify(Localization.lang("One entry needed a clean up"));
         } else {
             dialogService.notify(
                 Localization.lang(
@@ -179,9 +166,7 @@ private void cleanup(
     ) {
         for (BibEntry entry : stateManager.getSelectedEntries()) {
             // undo granularity is on entry level
-            NamedCompound ce = new NamedCompound(
-                Localization.lang("Cleanup entry")
-            );
+            NamedCompound ce = new NamedCompound(Localization.lang("Cleanup entry"));
 
             doCleanup(databaseContext, cleanupPreferences, entry, ce);
 
diff --git a/src/main/java/org/jabref/gui/cleanup/CleanupDialog.java b/src/main/java/org/jabref/gui/cleanup/CleanupDialog.java
index 220c24aa518..a6e1172db31 100644
--- a/src/main/java/org/jabref/gui/cleanup/CleanupDialog.java
+++ b/src/main/java/org/jabref/gui/cleanup/CleanupDialog.java
@@ -17,9 +17,7 @@ public CleanupDialog(
     ) {
         setTitle(Localization.lang("Cleanup entries"));
         getDialogPane().setPrefSize(600, 650);
-        getDialogPane()
-            .getButtonTypes()
-            .setAll(ButtonType.OK, ButtonType.CANCEL);
+        getDialogPane().getButtonTypes().setAll(ButtonType.OK, ButtonType.CANCEL);
 
         CleanupPresetPanel presetPanel = new CleanupPresetPanel(
             databaseContext,
diff --git a/src/main/java/org/jabref/gui/cleanup/CleanupPresetPanel.java b/src/main/java/org/jabref/gui/cleanup/CleanupPresetPanel.java
index 52ee99f2991..7bc076d6cf6 100644
--- a/src/main/java/org/jabref/gui/cleanup/CleanupPresetPanel.java
+++ b/src/main/java/org/jabref/gui/cleanup/CleanupPresetPanel.java
@@ -80,12 +80,8 @@ public CleanupPresetPanel(
         init(cleanupPreferences, filePreferences);
     }
 
-    private void init(
-        CleanupPreferences cleanupPreferences,
-        FilePreferences filePreferences
-    ) {
-        Optional<Path> firstExistingDir =
-            databaseContext.getFirstExistingFileDir(filePreferences);
+    private void init(CleanupPreferences cleanupPreferences, FilePreferences filePreferences) {
+        Optional<Path> firstExistingDir = databaseContext.getFirstExistingFileDir(filePreferences);
         if (firstExistingDir.isPresent()) {
             cleanUpMovePDF.setText(
                 Localization.lang(
@@ -95,10 +91,7 @@ private void init(
             );
         } else {
             cleanUpMovePDF.setText(
-                Localization.lang(
-                    "Move linked files to default file directory %0",
-                    "..."
-                )
+                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.
@@ -140,53 +133,35 @@ private void init(
             .selectedProperty()
             .addListener((observable, oldValue, newValue) -> {
                 if (newValue) {
-                    cleanUpTimestampToModificationDate
-                        .selectedProperty()
-                        .setValue(false);
+                    cleanUpTimestampToModificationDate.selectedProperty().setValue(false);
                 }
             });
         cleanUpTimestampToModificationDate
             .selectedProperty()
             .addListener((observable, oldValue, newValue) -> {
                 if (newValue) {
-                    cleanUpTimestampToCreationDate
-                        .selectedProperty()
-                        .setValue(false);
+                    cleanUpTimestampToCreationDate.selectedProperty().setValue(false);
                 }
             });
         updateDisplay(cleanupPreferences);
     }
 
     private void updateDisplay(CleanupPreferences preset) {
-        cleanUpDOI.setSelected(
-            preset.isActive(CleanupPreferences.CleanupStep.CLEAN_UP_DOI)
-        );
-        cleanUpEprint.setSelected(
-            preset.isActive(CleanupPreferences.CleanupStep.CLEANUP_EPRINT)
-        );
-        cleanUpURL.setSelected(
-            preset.isActive(CleanupPreferences.CleanupStep.CLEAN_UP_URL)
-        );
+        cleanUpDOI.setSelected(preset.isActive(CleanupPreferences.CleanupStep.CLEAN_UP_DOI));
+        cleanUpEprint.setSelected(preset.isActive(CleanupPreferences.CleanupStep.CLEANUP_EPRINT));
+        cleanUpURL.setSelected(preset.isActive(CleanupPreferences.CleanupStep.CLEAN_UP_URL));
         if (!cleanUpMovePDF.isDisabled()) {
-            cleanUpMovePDF.setSelected(
-                preset.isActive(CleanupPreferences.CleanupStep.MOVE_PDF)
-            );
+            cleanUpMovePDF.setSelected(preset.isActive(CleanupPreferences.CleanupStep.MOVE_PDF));
         }
         cleanUpMakePathsRelative.setSelected(
             preset.isActive(CleanupPreferences.CleanupStep.MAKE_PATHS_RELATIVE)
         );
-        cleanUpRenamePDF.setSelected(
-            preset.isActive(CleanupPreferences.CleanupStep.RENAME_PDF)
-        );
+        cleanUpRenamePDF.setSelected(preset.isActive(CleanupPreferences.CleanupStep.RENAME_PDF));
         cleanUpRenamePDFonlyRelativePaths.setSelected(
-            preset.isActive(
-                CleanupPreferences.CleanupStep.RENAME_PDF_ONLY_RELATIVE_PATHS
-            )
+            preset.isActive(CleanupPreferences.CleanupStep.RENAME_PDF_ONLY_RELATIVE_PATHS)
         );
         cleanUpUpgradeExternalLinks.setSelected(
-            preset.isActive(
-                CleanupPreferences.CleanupStep.CLEAN_UP_UPGRADE_EXTERNAL_LINKS
-            )
+            preset.isActive(CleanupPreferences.CleanupStep.CLEAN_UP_UPGRADE_EXTERNAL_LINKS)
         );
         cleanUpBiblatex.setSelected(
             preset.isActive(CleanupPreferences.CleanupStep.CONVERT_TO_BIBLATEX)
@@ -195,23 +170,15 @@ private void updateDisplay(CleanupPreferences preset) {
             preset.isActive(CleanupPreferences.CleanupStep.CONVERT_TO_BIBTEX)
         );
         cleanUpTimestampToCreationDate.setSelected(
-            preset.isActive(
-                CleanupPreferences.CleanupStep.CONVERT_TIMESTAMP_TO_CREATIONDATE
-            )
+            preset.isActive(CleanupPreferences.CleanupStep.CONVERT_TIMESTAMP_TO_CREATIONDATE)
         );
         cleanUpTimestampToModificationDate.setSelected(
-            preset.isActive(
-                CleanupPreferences.CleanupStep.CONVERT_TIMESTAMP_TO_MODIFICATIONDATE
-            )
+            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)
+            preset.isActive(CleanupPreferences.CleanupStep.DO_NOT_CONVERT_TIMESTAMP)
         );
+        cleanUpISSN.setSelected(preset.isActive(CleanupPreferences.CleanupStep.CLEAN_UP_ISSN));
         formatterCleanupsPanel
             .cleanupsDisableProperty()
             .setValue(!preset.getFieldFormatterCleanups().isEnabled());
@@ -249,17 +216,13 @@ public CleanupPreferences getCleanupPreset() {
         }
         if (cleanUpRenamePDF.isSelected()) {
             if (cleanUpRenamePDFonlyRelativePaths.isSelected()) {
-                activeJobs.add(
-                    CleanupPreferences.CleanupStep.RENAME_PDF_ONLY_RELATIVE_PATHS
-                );
+                activeJobs.add(CleanupPreferences.CleanupStep.RENAME_PDF_ONLY_RELATIVE_PATHS);
             } else {
                 activeJobs.add(CleanupPreferences.CleanupStep.RENAME_PDF);
             }
         }
         if (cleanUpUpgradeExternalLinks.isSelected()) {
-            activeJobs.add(
-                CleanupPreferences.CleanupStep.CLEAN_UP_UPGRADE_EXTERNAL_LINKS
-            );
+            activeJobs.add(CleanupPreferences.CleanupStep.CLEAN_UP_UPGRADE_EXTERNAL_LINKS);
         }
         if (cleanUpBiblatex.isSelected()) {
             activeJobs.add(CleanupPreferences.CleanupStep.CONVERT_TO_BIBLATEX);
@@ -268,14 +231,10 @@ public CleanupPreferences getCleanupPreset() {
             activeJobs.add(CleanupPreferences.CleanupStep.CONVERT_TO_BIBTEX);
         }
         if (cleanUpTimestampToCreationDate.isSelected()) {
-            activeJobs.add(
-                CleanupPreferences.CleanupStep.CONVERT_TIMESTAMP_TO_CREATIONDATE
-            );
+            activeJobs.add(CleanupPreferences.CleanupStep.CONVERT_TIMESTAMP_TO_CREATIONDATE);
         }
         if (cleanUpTimestampToModificationDate.isSelected()) {
-            activeJobs.add(
-                CleanupPreferences.CleanupStep.CONVERT_TIMESTAMP_TO_MODIFICATIONDATE
-            );
+            activeJobs.add(CleanupPreferences.CleanupStep.CONVERT_TIMESTAMP_TO_MODIFICATIONDATE);
         }
 
         activeJobs.add(CleanupPreferences.CleanupStep.FIX_FILE_LINKS);
diff --git a/src/main/java/org/jabref/gui/cleanup/CleanupSingleAction.java b/src/main/java/org/jabref/gui/cleanup/CleanupSingleAction.java
index 9690ad4dc13..9ce21e1ccec 100644
--- a/src/main/java/org/jabref/gui/cleanup/CleanupSingleAction.java
+++ b/src/main/java/org/jabref/gui/cleanup/CleanupSingleAction.java
@@ -54,37 +54,30 @@ public void execute() {
             preferences.getFilePreferences()
         );
 
-        Optional<CleanupPreferences> chosenPreset =
-            dialogService.showCustomDialogAndWait(cleanupDialog);
+        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)
-                    );
+                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().setActiveJobs(preset.getActiveJobs());
             preferences
                 .getCleanupPreferences()
                 .setFieldFormatterCleanups(preset.getFieldFormatterCleanups());
@@ -122,9 +115,7 @@ private void cleanup(
         CleanupPreferences cleanupPreferences
     ) {
         // undo granularity is on entry level
-        NamedCompound ce = new NamedCompound(
-            Localization.lang("Cleanup entry")
-        );
+        NamedCompound ce = new NamedCompound(Localization.lang("Cleanup entry"));
 
         doCleanup(databaseContext, cleanupPreferences, entry, ce);
 
diff --git a/src/main/java/org/jabref/gui/collab/ChangeScanner.java b/src/main/java/org/jabref/gui/collab/ChangeScanner.java
index 5e3f40e8f52..086d3463156 100644
--- a/src/main/java/org/jabref/gui/collab/ChangeScanner.java
+++ b/src/main/java/org/jabref/gui/collab/ChangeScanner.java
@@ -15,9 +15,7 @@
 
 public class ChangeScanner {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(
-        ChangeScanner.class
-    );
+    private static final Logger LOGGER = LoggerFactory.getLogger(ChangeScanner.class);
     private final BibDatabaseContext database;
     private final PreferencesService preferencesService;
 
@@ -31,11 +29,7 @@ public ChangeScanner(
         this.database = database;
         this.preferencesService = preferencesService;
         this.databaseChangeResolverFactory =
-            new DatabaseChangeResolverFactory(
-                dialogService,
-                database,
-                preferencesService
-            );
+            new DatabaseChangeResolverFactory(dialogService, database, preferencesService);
     }
 
     public List<DatabaseChange> scanForChanges() {
diff --git a/src/main/java/org/jabref/gui/collab/DatabaseChange.java b/src/main/java/org/jabref/gui/collab/DatabaseChange.java
index a4c8ff3c25e..4d0e83c3646 100644
--- a/src/main/java/org/jabref/gui/collab/DatabaseChange.java
+++ b/src/main/java/org/jabref/gui/collab/DatabaseChange.java
@@ -33,9 +33,8 @@ public abstract sealed class DatabaseChange
         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();
 
@@ -47,9 +46,7 @@ protected DatabaseChange(
         setChangeName("Unnamed Change!");
 
         if (databaseChangeResolverFactory != null) {
-            externalChangeResolver.set(
-                databaseChangeResolverFactory.create(this)
-            );
+            externalChangeResolver.set(databaseChangeResolverFactory.create(this));
         }
     }
 
diff --git a/src/main/java/org/jabref/gui/collab/DatabaseChangeDetailsViewFactory.java b/src/main/java/org/jabref/gui/collab/DatabaseChangeDetailsViewFactory.java
index 45ffbfdbb4c..02dc12a0b81 100644
--- a/src/main/java/org/jabref/gui/collab/DatabaseChangeDetailsViewFactory.java
+++ b/src/main/java/org/jabref/gui/collab/DatabaseChangeDetailsViewFactory.java
@@ -99,10 +99,7 @@ public DatabaseChangeDetailsView create(DatabaseChange databaseChange) {
         } else if (databaseChange instanceof BibTexStringRename stringRename) {
             return new BibTexStringRenameDetailsView(stringRename);
         } else if (databaseChange instanceof MetadataChange metadataChange) {
-            return new MetadataChangeDetailsView(
-                metadataChange,
-                preferencesService
-            );
+            return new MetadataChangeDetailsView(metadataChange, preferencesService);
         } else if (databaseChange instanceof GroupChange groupChange) {
             return new GroupChangeDetailsView(groupChange);
         } else if (databaseChange instanceof PreambleChange preambleChange) {
diff --git a/src/main/java/org/jabref/gui/collab/DatabaseChangeList.java b/src/main/java/org/jabref/gui/collab/DatabaseChangeList.java
index d8ab6272df0..e284088b5ce 100644
--- a/src/main/java/org/jabref/gui/collab/DatabaseChangeList.java
+++ b/src/main/java/org/jabref/gui/collab/DatabaseChangeList.java
@@ -36,20 +36,13 @@ public static List<DatabaseChange> compareAndGetChanges(
     ) {
         List<DatabaseChange> changes = new ArrayList<>();
 
-        BibDatabaseDiff differences = BibDatabaseDiff.compare(
-            originalDatabase,
-            otherDatabase
-        );
+        BibDatabaseDiff differences = BibDatabaseDiff.compare(originalDatabase, otherDatabase);
 
         differences
             .getMetaDataDifferences()
             .ifPresent(diff -> {
                 changes.add(
-                    new MetadataChange(
-                        diff,
-                        originalDatabase,
-                        databaseChangeResolverFactory
-                    )
+                    new MetadataChange(diff, originalDatabase, databaseChangeResolverFactory)
                 );
                 diff
                     .getGroupDifferences()
@@ -67,33 +60,21 @@ public static List<DatabaseChange> compareAndGetChanges(
             .getPreambleDifferences()
             .ifPresent(diff ->
                 changes.add(
-                    new PreambleChange(
-                        diff,
-                        originalDatabase,
-                        databaseChangeResolverFactory
-                    )
+                    new PreambleChange(diff, originalDatabase, databaseChangeResolverFactory)
                 )
             );
         differences
             .getBibStringDifferences()
             .forEach(diff ->
                 changes.add(
-                    createBibStringDiff(
-                        originalDatabase,
-                        databaseChangeResolverFactory,
-                        diff
-                    )
+                    createBibStringDiff(originalDatabase, databaseChangeResolverFactory, diff)
                 )
             );
         differences
             .getEntryDifferences()
             .forEach(diff ->
                 changes.add(
-                    createBibEntryDiff(
-                        originalDatabase,
-                        databaseChangeResolverFactory,
-                        diff
-                    )
+                    createBibEntryDiff(originalDatabase, databaseChangeResolverFactory, diff)
                 )
             );
 
@@ -121,12 +102,7 @@ private static DatabaseChange createBibStringDiff(
             );
         }
 
-        if (
-            diff
-                .getOriginalString()
-                .getName()
-                .equals(diff.getNewString().getName())
-        ) {
+        if (diff.getOriginalString().getName().equals(diff.getNewString().getName())) {
             return new BibTexStringChange(
                 diff.getOriginalString(),
                 diff.getNewString(),
diff --git a/src/main/java/org/jabref/gui/collab/DatabaseChangeMonitor.java b/src/main/java/org/jabref/gui/collab/DatabaseChangeMonitor.java
index 763a35197ff..0874de7e790 100644
--- a/src/main/java/org/jabref/gui/collab/DatabaseChangeMonitor.java
+++ b/src/main/java/org/jabref/gui/collab/DatabaseChangeMonitor.java
@@ -20,9 +20,7 @@
 
 public class DatabaseChangeMonitor implements FileUpdateListener {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(
-        DatabaseChangeMonitor.class
-    );
+    private static final Logger LOGGER = LoggerFactory.getLogger(DatabaseChangeMonitor.class);
 
     private final BibDatabaseContext database;
     private final FileUpdateMonitor fileMonitor;
@@ -59,9 +57,7 @@ public DatabaseChangeMonitor(
         addListener(changes ->
             notificationPane.notify(
                 IconTheme.JabRefIcons.SAVE.getGraphicNode(),
-                Localization.lang(
-                    "The library has been modified by another program."
-                ),
+                Localization.lang("The library has been modified by another program."),
                 List.of(
                     new Action(
                         Localization.lang("Dismiss changes"),
@@ -74,9 +70,7 @@ public DatabaseChangeMonitor(
                                 new DatabaseChangesResolverDialog(
                                     changes,
                                     database,
-                                    Localization.lang(
-                                        "External Changes Resolver"
-                                    )
+                                    Localization.lang("External Changes Resolver")
                                 )
                             );
                             notificationPane.hide();
@@ -92,23 +86,15 @@ public DatabaseChangeMonitor(
     public void fileUpdated() {
         synchronized (database) {
             // 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,
-                preferencesService
-            );
+            ChangeScanner scanner = new ChangeScanner(database, dialogService, preferencesService);
             BackgroundTask
                 .wrap(scanner::scanForChanges)
                 .onSuccess(changes -> {
                     if (!changes.isEmpty()) {
-                        listeners.forEach(listener ->
-                            listener.databaseChanged(changes)
-                        );
+                        listeners.forEach(listener -> listener.databaseChanged(changes));
                     }
                 })
-                .onFailure(e ->
-                    LOGGER.error("Error while watching for changes", e)
-                )
+                .onFailure(e -> LOGGER.error("Error while watching for changes", e))
                 .executeWith(taskExecutor);
         }
     }
@@ -118,8 +104,6 @@ public void addListener(DatabaseChangeListener listener) {
     }
 
     public void unregister() {
-        database
-            .getDatabasePath()
-            .ifPresent(file -> fileMonitor.removeListener(file, this));
+        database.getDatabasePath().ifPresent(file -> fileMonitor.removeListener(file, this));
     }
 }
diff --git a/src/main/java/org/jabref/gui/collab/DatabaseChangeResolver.java b/src/main/java/org/jabref/gui/collab/DatabaseChangeResolver.java
index 66210ef9a6d..17f310fc2a9 100644
--- a/src/main/java/org/jabref/gui/collab/DatabaseChangeResolver.java
+++ b/src/main/java/org/jabref/gui/collab/DatabaseChangeResolver.java
@@ -4,8 +4,7 @@
 import org.jabref.gui.DialogService;
 import org.jabref.gui.collab.entrychange.EntryChangeResolver;
 
-public abstract sealed class DatabaseChangeResolver
-    permits EntryChangeResolver {
+public abstract sealed class DatabaseChangeResolver permits EntryChangeResolver {
 
     protected final DialogService dialogService;
 
diff --git a/src/main/java/org/jabref/gui/collab/DatabaseChangesResolverDialog.java b/src/main/java/org/jabref/gui/collab/DatabaseChangesResolverDialog.java
index a0013b78a53..e2e2dbe2493 100644
--- a/src/main/java/org/jabref/gui/collab/DatabaseChangesResolverDialog.java
+++ b/src/main/java/org/jabref/gui/collab/DatabaseChangesResolverDialog.java
@@ -36,10 +36,8 @@ public class DatabaseChangesResolverDialog extends BaseDialog<Boolean> {
      * 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;
@@ -132,18 +130,14 @@ private void initialize() {
 
         viewModel = new ExternalChangesResolverViewModel(changes, undoManager);
 
-        changeName.setCellValueFactory(data ->
-            new SimpleStringProperty(data.getValue().getName())
-        );
+        changeName.setCellValueFactory(data -> new SimpleStringProperty(data.getValue().getName()));
         askUserToResolveChangeButton
             .disableProperty()
             .bind(viewModel.canAskUserToResolveChangeProperty().not());
 
         changesTableView.setItems(viewModel.getVisibleChanges());
         // Think twice before setting this to MULTIPLE...
-        changesTableView
-            .getSelectionModel()
-            .setSelectionMode(SelectionMode.SINGLE);
+        changesTableView.getSelectionModel().setSelectionMode(SelectionMode.SINGLE);
         changesTableView.getSelectionModel().selectFirst();
 
         viewModel
@@ -153,11 +147,10 @@ private void initialize() {
             viewModel.selectedChangeProperty(),
             selectedChange -> {
                 if (selectedChange != null) {
-                    DatabaseChangeDetailsView detailsView =
-                        DETAILS_VIEW_CACHE.computeIfAbsent(
-                            selectedChange,
-                            databaseChangeDetailsViewFactory::create
-                        );
+                    DatabaseChangeDetailsView detailsView = DETAILS_VIEW_CACHE.computeIfAbsent(
+                        selectedChange,
+                        databaseChangeDetailsViewFactory::create
+                    );
                     changeInfoPane.setCenter(detailsView);
                 }
             }
diff --git a/src/main/java/org/jabref/gui/collab/ExternalChangesResolverViewModel.java b/src/main/java/org/jabref/gui/collab/ExternalChangesResolverViewModel.java
index 19a128aa174..7261a818c73 100644
--- a/src/main/java/org/jabref/gui/collab/ExternalChangesResolverViewModel.java
+++ b/src/main/java/org/jabref/gui/collab/ExternalChangesResolverViewModel.java
@@ -32,11 +32,9 @@ public class ExternalChangesResolverViewModel extends AbstractViewModel {
      * Because visible changes list will be bound to the UI, certain changes can be removed. This list is used to keep
      * track of changes even when they're removed from the UI.
      */
-    private final ObservableList<DatabaseChange> changes =
-        FXCollections.observableArrayList();
+    private final ObservableList<DatabaseChange> changes = FXCollections.observableArrayList();
 
-    private final ObjectProperty<DatabaseChange> selectedChange =
-        new SimpleObjectProperty<>();
+    private final ObjectProperty<DatabaseChange> selectedChange = new SimpleObjectProperty<>();
 
     private final BooleanBinding areAllChangesResolved;
 
@@ -56,18 +54,12 @@ public ExternalChangesResolverViewModel(
         this.undoManager = undoManager;
 
         areAllChangesResolved =
-            Bindings.createBooleanBinding(
-                visibleChanges::isEmpty,
-                visibleChanges
-            );
+            Bindings.createBooleanBinding(visibleChanges::isEmpty, visibleChanges);
         canAskUserToResolveChange =
             Bindings.createBooleanBinding(
                 () ->
                     selectedChange.isNotNull().get() &&
-                    selectedChange
-                        .get()
-                        .getExternalChangeResolver()
-                        .isPresent(),
+                    selectedChange.get().getExternalChangeResolver().isPresent(),
                 selectedChange
             );
     }
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 bcf4a0835a1..55bcb91c2a3 100644
--- a/src/main/java/org/jabref/gui/collab/entryadd/EntryAdd.java
+++ b/src/main/java/org/jabref/gui/collab/entryadd/EntryAdd.java
@@ -30,9 +30,7 @@ public EntryAdd(
     @Override
     public void applyChange(NamedCompound undoEdit) {
         databaseContext.getDatabase().insertEntry(addedEntry);
-        undoEdit.addEdit(
-            new UndoableInsertEntries(databaseContext.getDatabase(), addedEntry)
-        );
+        undoEdit.addEdit(new UndoableInsertEntries(databaseContext.getDatabase(), addedEntry));
     }
 
     public BibEntry getAddedEntry() {
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 280f6dd9280..e980c8b6755 100644
--- a/src/main/java/org/jabref/gui/collab/entrychange/EntryChange.java
+++ b/src/main/java/org/jabref/gui/collab/entrychange/EntryChange.java
@@ -32,11 +32,7 @@ public EntryChange(
         );
     }
 
-    public EntryChange(
-        BibEntry oldEntry,
-        BibEntry newEntry,
-        BibDatabaseContext databaseContext
-    ) {
+    public EntryChange(BibEntry oldEntry, BibEntry newEntry, BibDatabaseContext databaseContext) {
         this(oldEntry, newEntry, databaseContext, null);
     }
 
@@ -53,12 +49,8 @@ public void applyChange(NamedCompound undoEdit) {
         databaseContext.getDatabase().removeEntry(oldEntry);
         databaseContext.getDatabase().insertEntry(newEntry);
         CompoundEdit changeEntryEdit = new CompoundEdit();
-        changeEntryEdit.addEdit(
-            new UndoableRemoveEntries(databaseContext.getDatabase(), oldEntry)
-        );
-        changeEntryEdit.addEdit(
-            new UndoableInsertEntries(databaseContext.getDatabase(), newEntry)
-        );
+        changeEntryEdit.addEdit(new UndoableRemoveEntries(databaseContext.getDatabase(), oldEntry));
+        changeEntryEdit.addEdit(new UndoableInsertEntries(databaseContext.getDatabase(), newEntry));
         changeEntryEdit.end();
 
         undoEdit.addEdit(changeEntryEdit);
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 c3e6a70cd56..830d18d1e84 100644
--- a/src/main/java/org/jabref/gui/collab/entrychange/EntryChangeDetailsView.java
+++ b/src/main/java/org/jabref/gui/collab/entrychange/EntryChangeDetailsView.java
@@ -23,10 +23,8 @@
 
 public final class EntryChangeDetailsView extends DatabaseChangeDetailsView {
 
-    private final PreviewWithSourceTab oldPreviewWithSourcesTab =
-        new PreviewWithSourceTab();
-    private final PreviewWithSourceTab newPreviewWithSourcesTab =
-        new PreviewWithSourceTab();
+    private final PreviewWithSourceTab oldPreviewWithSourcesTab = new PreviewWithSourceTab();
+    private final PreviewWithSourceTab newPreviewWithSourcesTab = new PreviewWithSourceTab();
     private boolean scrolling = false;
 
     public EntryChangeDetailsView(
@@ -63,31 +61,27 @@ public EntryChangeDetailsView(
         synchronizeScrolling(previewViewerView, previewCloneView);
         // TODO: Also sync scrolling for BibTeX view.
 
-        TabPane oldEntryTabPane =
-            oldPreviewWithSourcesTab.getPreviewWithSourceTab(
-                oldEntry,
-                databaseContext,
-                preferencesService,
-                entryTypesManager,
-                previewClone,
-                Localization.lang("Entry Preview")
-            );
-        TabPane newEntryTabPane =
-            newPreviewWithSourcesTab.getPreviewWithSourceTab(
-                newEntry,
-                databaseContext,
-                preferencesService,
-                entryTypesManager,
-                previewViewer,
-                Localization.lang("Entry Preview")
-            );
+        TabPane oldEntryTabPane = oldPreviewWithSourcesTab.getPreviewWithSourceTab(
+            oldEntry,
+            databaseContext,
+            preferencesService,
+            entryTypesManager,
+            previewClone,
+            Localization.lang("Entry Preview")
+        );
+        TabPane newEntryTabPane = newPreviewWithSourcesTab.getPreviewWithSourceTab(
+            newEntry,
+            databaseContext,
+            preferencesService,
+            entryTypesManager,
+            previewViewer,
+            Localization.lang("Entry Preview")
+        );
 
         EasyBind.subscribe(
             oldEntryTabPane.getSelectionModel().selectedIndexProperty(),
             selectedIndex -> {
-                newEntryTabPane
-                    .getSelectionModel()
-                    .select(selectedIndex.intValue());
+                newEntryTabPane.getSelectionModel().select(selectedIndex.intValue());
             }
         );
 
@@ -98,9 +92,7 @@ public EntryChangeDetailsView(
                     oldEntryTabPane.getSelectionModel().getSelectedIndex() !=
                     selectedIndex.intValue()
                 ) {
-                    oldEntryTabPane
-                        .getSelectionModel()
-                        .select(selectedIndex.intValue());
+                    oldEntryTabPane.getSelectionModel().select(selectedIndex.intValue());
                 }
             }
         );
@@ -135,14 +127,10 @@ private void synchronizeScrolling(WebView webView, WebView otherWebView) {
                                 .executeScript("window.scrollY");
                             otherWebView
                                 .getEngine()
-                                .executeScript(
-                                    "window.scrollTo(0, " + value + ")"
-                                );
+                                .executeScript("window.scrollTo(0, " + value + ")");
                         }
                     } else {
-                        otherWebView.fireEvent(
-                            event.copyFor(otherWebView, otherWebView)
-                        );
+                        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 b9c9037baed..6ad62cb8721 100644
--- a/src/main/java/org/jabref/gui/collab/entrychange/EntryChangeResolver.java
+++ b/src/main/java/org/jabref/gui/collab/entrychange/EntryChangeResolver.java
@@ -42,10 +42,7 @@ public Optional<DatabaseChange> askUserToResolveChange() {
         mergeEntriesDialog.setLeftHeaderText(Localization.lang("In JabRef"));
         mergeEntriesDialog.setRightHeaderText(Localization.lang("On disk"));
         mergeEntriesDialog.configureDiff(
-            new ShowDiffConfig(
-                ThreeWayMergeToolbar.DiffView.SPLIT,
-                BasicDiffMethod.WORDS
-            )
+            new ShowDiffConfig(ThreeWayMergeToolbar.DiffView.SPLIT, BasicDiffMethod.WORDS)
         );
 
         return dialogService
@@ -53,9 +50,7 @@ public Optional<DatabaseChange> askUserToResolveChange() {
             .map(this::mapMergeResultToExternalChange);
     }
 
-    private EntryChange mapMergeResultToExternalChange(
-        EntriesMergeResult entriesMergeResult
-    ) {
+    private EntryChange mapMergeResultToExternalChange(EntriesMergeResult entriesMergeResult) {
         return new EntryChange(
             entryChange.getOldEntry(),
             entriesMergeResult.mergedEntry(),
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 a4372a4ef09..285985c8999 100644
--- a/src/main/java/org/jabref/gui/collab/entrychange/EntryWithPreviewAndSourceDetailsView.java
+++ b/src/main/java/org/jabref/gui/collab/entrychange/EntryWithPreviewAndSourceDetailsView.java
@@ -8,11 +8,9 @@
 import org.jabref.model.entry.BibEntryTypesManager;
 import org.jabref.preferences.PreferencesService;
 
-public final class EntryWithPreviewAndSourceDetailsView
-    extends DatabaseChangeDetailsView {
+public final class EntryWithPreviewAndSourceDetailsView extends DatabaseChangeDetailsView {
 
-    private final PreviewWithSourceTab previewWithSourceTab =
-        new PreviewWithSourceTab();
+    private final PreviewWithSourceTab previewWithSourceTab = new PreviewWithSourceTab();
 
     public EntryWithPreviewAndSourceDetailsView(
         BibEntry entry,
@@ -21,14 +19,13 @@ public EntryWithPreviewAndSourceDetailsView(
         BibEntryTypesManager entryTypesManager,
         PreviewViewer previewViewer
     ) {
-        TabPane tabPanePreviewCode =
-            previewWithSourceTab.getPreviewWithSourceTab(
-                entry,
-                bibDatabaseContext,
-                preferencesService,
-                entryTypesManager,
-                previewViewer
-            );
+        TabPane tabPanePreviewCode = previewWithSourceTab.getPreviewWithSourceTab(
+            entry,
+            bibDatabaseContext,
+            preferencesService,
+            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 f0e30c2c268..578cc2cf39d 100644
--- a/src/main/java/org/jabref/gui/collab/entrychange/PreviewWithSourceTab.java
+++ b/src/main/java/org/jabref/gui/collab/entrychange/PreviewWithSourceTab.java
@@ -23,9 +23,7 @@
 
 public class PreviewWithSourceTab {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(
-        PreviewWithSourceTab.class
-    );
+    private static final Logger LOGGER = LoggerFactory.getLogger(PreviewWithSourceTab.class);
 
     public TabPane getPreviewWithSourceTab(
         BibEntry entry,
@@ -53,9 +51,7 @@ public TabPane getPreviewWithSourceTab(
         String label
     ) {
         previewViewer.setLayout(
-            preferencesService
-                .getPreviewPreferences()
-                .getSelectedPreviewLayout()
+            preferencesService.getPreviewPreferences().getSelectedPreviewLayout()
         );
         previewViewer.setEntry(entry);
 
@@ -88,10 +84,7 @@ public TabPane getPreviewWithSourceTab(
         }
         codeArea.setEditable(false);
         Tab codeTab = new Tab(
-            Localization.lang(
-                "%0 source",
-                bibDatabaseContext.getMode().getFormattedName()
-            ),
+            Localization.lang("%0 source", bibDatabaseContext.getMode().getFormattedName()),
             codeArea
         );
 
@@ -107,11 +100,8 @@ private String getSourceString(
     ) throws IOException {
         StringWriter writer = new StringWriter();
         BibWriter bibWriter = new BibWriter(writer, OS.NEWLINE);
-        FieldWriter fieldWriter = FieldWriter.buildIgnoreHashes(
-            fieldPreferences
-        );
-        new BibEntryWriter(fieldWriter, entryTypesManager)
-            .write(entry, bibWriter, type);
+        FieldWriter fieldWriter = FieldWriter.buildIgnoreHashes(fieldPreferences);
+        new BibEntryWriter(fieldWriter, entryTypesManager).write(entry, bibWriter, type);
         return writer.toString();
     }
 }
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 a46b949c94c..43270a495ad 100644
--- a/src/main/java/org/jabref/gui/collab/entrydelete/EntryDelete.java
+++ b/src/main/java/org/jabref/gui/collab/entrydelete/EntryDelete.java
@@ -30,12 +30,7 @@ public EntryDelete(
     @Override
     public void applyChange(NamedCompound undoEdit) {
         databaseContext.getDatabase().removeEntry(deletedEntry);
-        undoEdit.addEdit(
-            new UndoableRemoveEntries(
-                databaseContext.getDatabase(),
-                deletedEntry
-            )
-        );
+        undoEdit.addEdit(new UndoableRemoveEntries(databaseContext.getDatabase(), deletedEntry));
     }
 
     public BibEntry getDeletedEntry() {
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 6851969548e..685a7d87ed4 100644
--- a/src/main/java/org/jabref/gui/collab/groupchange/GroupChange.java
+++ b/src/main/java/org/jabref/gui/collab/groupchange/GroupChange.java
@@ -46,21 +46,14 @@ public void applyChange(NamedCompound undoEdit) {
             });
 
         final UndoableModifySubtree undo = new UndoableModifySubtree(
-            new GroupTreeNodeViewModel(
-                databaseContext.getMetaData().getGroups().orElse(null)
-            ),
+            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
-            root.setGroup(
-                DefaultGroupsFactory.getAllEntriesGroup(),
-                false,
-                false,
-                null
-            );
+            root.setGroup(DefaultGroupsFactory.getAllEntriesGroup(), false, false, null);
         } else {
             // change root group, even though it'll be AllEntries anyway
             root.setGroup(newRoot.getGroup(), false, false, null);
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 ca13e687c9b..ef02c99bb16 100644
--- a/src/main/java/org/jabref/gui/collab/metedatachange/MetadataChange.java
+++ b/src/main/java/org/jabref/gui/collab/metedatachange/MetadataChange.java
@@ -30,9 +30,7 @@ public void applyChange(NamedCompound undoEdit) {
         metaDataDiff
             .getGroupDifferences()
             .ifPresent(groupDiff ->
-                databaseContext
-                    .getMetaData()
-                    .setGroups(groupDiff.getOriginalGroupRoot())
+                databaseContext.getMetaData().setGroups(groupDiff.getOriginalGroupRoot())
             );
     }
 
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 4bd516798c5..458010391be 100644
--- a/src/main/java/org/jabref/gui/collab/metedatachange/MetadataChangeDetailsView.java
+++ b/src/main/java/org/jabref/gui/collab/metedatachange/MetadataChangeDetailsView.java
@@ -16,21 +16,15 @@ public MetadataChangeDetailsView(
     ) {
         VBox container = new VBox(15);
 
-        Label header = new Label(
-            Localization.lang("The following metadata changed:")
-        );
+        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(preferencesService)) {
-            container
-                .getChildren()
-                .add(new Label(getDifferenceString(diff.differenceType())));
-            container
-                .getChildren()
-                .add(new Label(diff.originalObject().toString()));
+            container.getChildren().add(new Label(getDifferenceString(diff.differenceType())));
+            container.getChildren().add(new Label(diff.originalObject().toString()));
             container.getChildren().add(new Label(diff.newObject().toString()));
         }
 
@@ -51,18 +45,12 @@ private String getDifferenceString(MetaDataDiff.DifferenceType changeType) {
             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 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 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 4e70a08567c..62218f39340 100644
--- a/src/main/java/org/jabref/gui/collab/preamblechange/PreambleChange.java
+++ b/src/main/java/org/jabref/gui/collab/preamblechange/PreambleChange.java
@@ -12,9 +12,7 @@
 
 public final class PreambleChange extends DatabaseChange {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(
-        PreambleChange.class
-    );
+    private static final Logger LOGGER = LoggerFactory.getLogger(PreambleChange.class);
 
     private final PreambleDiff preambleDiff;
 
@@ -31,9 +29,7 @@ public PreambleChange(
 
     @Override
     public void applyChange(NamedCompound undoEdit) {
-        databaseContext
-            .getDatabase()
-            .setPreamble(preambleDiff.getNewPreamble());
+        databaseContext.getDatabase().setPreamble(preambleDiff.getNewPreamble());
         undoEdit.addEdit(
             new UndoablePreambleChange(
                 databaseContext.getDatabase(),
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 f19f2cea691..b10c021f36f 100644
--- a/src/main/java/org/jabref/gui/collab/preamblechange/PreambleChangeDetailsView.java
+++ b/src/main/java/org/jabref/gui/collab/preamblechange/PreambleChangeDetailsView.java
@@ -22,10 +22,7 @@ public PreambleChangeDetailsView(PreambleChange preambleChange) {
                 .getChildren()
                 .add(
                     new Label(
-                        Localization.lang(
-                            "Current value: %0",
-                            preambleDiff.getOriginalPreamble()
-                        )
+                        Localization.lang("Current value: %0", preambleDiff.getOriginalPreamble())
                     )
                 );
         }
@@ -35,16 +32,11 @@ public PreambleChangeDetailsView(PreambleChange preambleChange) {
                 .getChildren()
                 .add(
                     new Label(
-                        Localization.lang(
-                            "Value set externally: %0",
-                            preambleDiff.getNewPreamble()
-                        )
+                        Localization.lang("Value set externally: %0", preambleDiff.getNewPreamble())
                     )
                 );
         } else {
-            container
-                .getChildren()
-                .add(new Label(Localization.lang("Value cleared externally")));
+            container.getChildren().add(new Label(Localization.lang("Value cleared externally")));
         }
         setLeftAnchor(container, 8d);
         setTopAnchor(container, 8d);
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 39f3ee42a74..da1a7e86670 100644
--- a/src/main/java/org/jabref/gui/collab/stringadd/BibTexStringAdd.java
+++ b/src/main/java/org/jabref/gui/collab/stringadd/BibTexStringAdd.java
@@ -13,9 +13,7 @@
 
 public final class BibTexStringAdd extends DatabaseChange {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(
-        BibTexStringAdd.class
-    );
+    private static final Logger LOGGER = LoggerFactory.getLogger(BibTexStringAdd.class);
 
     private final BibtexString addedString;
 
@@ -26,21 +24,14 @@ public BibTexStringAdd(
     ) {
         super(databaseContext, databaseChangeResolverFactory);
         this.addedString = addedString;
-        setChangeName(
-            Localization.lang("Added string: '%0'", addedString.getName())
-        );
+        setChangeName(Localization.lang("Added string: '%0'", addedString.getName()));
     }
 
     @Override
     public void applyChange(NamedCompound undoEdit) {
         try {
             databaseContext.getDatabase().addString(addedString);
-            undoEdit.addEdit(
-                new UndoableInsertString(
-                    databaseContext.getDatabase(),
-                    addedString
-                )
-            );
+            undoEdit.addEdit(new UndoableInsertString(databaseContext.getDatabase(), addedString));
         } catch (KeyCollisionException ex) {
             LOGGER.warn(
                 "Error: could not add string '{}': {}",
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 b19f5fecc9e..d3154bb612d 100644
--- a/src/main/java/org/jabref/gui/collab/stringadd/BibTexStringAddDetailsView.java
+++ b/src/main/java/org/jabref/gui/collab/stringadd/BibTexStringAddDetailsView.java
@@ -5,8 +5,7 @@
 import org.jabref.gui.collab.DatabaseChangeDetailsView;
 import org.jabref.logic.l10n.Localization;
 
-public final class BibTexStringAddDetailsView
-    extends DatabaseChangeDetailsView {
+public final class BibTexStringAddDetailsView extends DatabaseChangeDetailsView {
 
     public BibTexStringAddDetailsView(BibTexStringAdd stringAdd) {
         VBox container = new VBox();
@@ -16,18 +15,8 @@ public BibTexStringAddDetailsView(BibTexStringAdd stringAdd) {
             .getChildren()
             .addAll(
                 header,
-                new Label(
-                    Localization.lang(
-                        "Label: %0",
-                        stringAdd.getAddedString().getName()
-                    )
-                ),
-                new Label(
-                    Localization.lang(
-                        "Content: %0",
-                        stringAdd.getAddedString().getContent()
-                    )
-                )
+                new Label(Localization.lang("Label: %0", stringAdd.getAddedString().getName())),
+                new Label(Localization.lang("Content: %0", stringAdd.getAddedString().getContent()))
             );
         setLeftAnchor(container, 8d);
         setTopAnchor(container, 8d);
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 91ead32b222..56babe521d0 100644
--- a/src/main/java/org/jabref/gui/collab/stringchange/BibTexStringChange.java
+++ b/src/main/java/org/jabref/gui/collab/stringchange/BibTexStringChange.java
@@ -12,9 +12,7 @@
 
 public final class BibTexStringChange extends DatabaseChange {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(
-        BibTexStringChange.class
-    );
+    private static final Logger LOGGER = LoggerFactory.getLogger(BibTexStringChange.class);
 
     private final BibtexString oldString;
     private final BibtexString newString;
@@ -29,9 +27,7 @@ public BibTexStringChange(
         this.oldString = oldString;
         this.newString = newString;
 
-        setChangeName(
-            Localization.lang("Modified string: '%0'", oldString.getName())
-        );
+        setChangeName(Localization.lang("Modified string: '%0'", oldString.getName()));
     }
 
     @Override
@@ -39,9 +35,7 @@ public void applyChange(NamedCompound undoEdit) {
         String oldContent = oldString.getContent();
         String newContent = newString.getContent();
         oldString.setContent(newContent);
-        undoEdit.addEdit(
-            new UndoableStringChange(oldString, false, oldContent, newContent)
-        );
+        undoEdit.addEdit(new UndoableStringChange(oldString, false, oldContent, newContent));
     }
 
     public BibtexString getOldString() {
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 1b8bf1bef39..30f414195b6 100644
--- a/src/main/java/org/jabref/gui/collab/stringchange/BibTexStringChangeDetailsView.java
+++ b/src/main/java/org/jabref/gui/collab/stringchange/BibTexStringChangeDetailsView.java
@@ -5,8 +5,7 @@
 import org.jabref.gui.collab.DatabaseChangeDetailsView;
 import org.jabref.logic.l10n.Localization;
 
-public final class BibTexStringChangeDetailsView
-    extends DatabaseChangeDetailsView {
+public final class BibTexStringChangeDetailsView extends DatabaseChangeDetailsView {
 
     public BibTexStringChangeDetailsView(BibTexStringChange stringChange) {
         VBox container = new VBox();
@@ -16,17 +15,9 @@ public BibTexStringChangeDetailsView(BibTexStringChange stringChange) {
             .getChildren()
             .addAll(
                 header,
+                new Label(Localization.lang("Label: %0", stringChange.getOldString().getName())),
                 new Label(
-                    Localization.lang(
-                        "Label: %0",
-                        stringChange.getOldString().getName()
-                    )
-                ),
-                new Label(
-                    Localization.lang(
-                        "Content: %0",
-                        stringChange.getNewString().getContent()
-                    )
+                    Localization.lang("Content: %0", stringChange.getNewString().getContent())
                 )
             );
 
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 c59b226102b..6684a099219 100644
--- a/src/main/java/org/jabref/gui/collab/stringdelete/BibTexStringDelete.java
+++ b/src/main/java/org/jabref/gui/collab/stringdelete/BibTexStringDelete.java
@@ -12,9 +12,7 @@
 
 public final class BibTexStringDelete extends DatabaseChange {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(
-        BibTexStringDelete.class
-    );
+    private static final Logger LOGGER = LoggerFactory.getLogger(BibTexStringDelete.class);
 
     private final BibtexString deletedString;
 
@@ -25,9 +23,7 @@ public BibTexStringDelete(
     ) {
         super(databaseContext, databaseChangeResolverFactory);
         this.deletedString = deletedString;
-        setChangeName(
-            Localization.lang("Deleted string: '%0'", deletedString.getName())
-        );
+        setChangeName(Localization.lang("Deleted string: '%0'", deletedString.getName()));
     }
 
     @Override
@@ -35,10 +31,7 @@ public void applyChange(NamedCompound undoEdit) {
         try {
             databaseContext.getDatabase().removeString(deletedString.getId());
             undoEdit.addEdit(
-                new UndoableRemoveString(
-                    databaseContext.getDatabase(),
-                    deletedString
-                )
+                new UndoableRemoveString(databaseContext.getDatabase(), deletedString)
             );
         } catch (Exception ex) {
             LOGGER.warn(
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 1e00ad6b656..22e38f1af3d 100644
--- a/src/main/java/org/jabref/gui/collab/stringdelete/BibTexStringDeleteDetailsView.java
+++ b/src/main/java/org/jabref/gui/collab/stringdelete/BibTexStringDeleteDetailsView.java
@@ -5,8 +5,7 @@
 import org.jabref.gui.collab.DatabaseChangeDetailsView;
 import org.jabref.logic.l10n.Localization;
 
-public final class BibTexStringDeleteDetailsView
-    extends DatabaseChangeDetailsView {
+public final class BibTexStringDeleteDetailsView extends DatabaseChangeDetailsView {
 
     public BibTexStringDeleteDetailsView(BibTexStringDelete stringDelete) {
         VBox container = new VBox();
@@ -17,16 +16,10 @@ public BibTexStringDeleteDetailsView(BibTexStringDelete stringDelete) {
             .addAll(
                 header,
                 new Label(
-                    Localization.lang(
-                        "Label: %0",
-                        stringDelete.getDeletedString().getName()
-                    )
+                    Localization.lang("Label: %0", stringDelete.getDeletedString().getName())
                 ),
                 new Label(
-                    Localization.lang(
-                        "Content: %0",
-                        stringDelete.getDeletedString().getContent()
-                    )
+                    Localization.lang("Content: %0", stringDelete.getDeletedString().getContent())
                 )
             );
         setLeftAnchor(container, 8d);
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 1b3e69ccaf4..93582b84c5e 100644
--- a/src/main/java/org/jabref/gui/collab/stringrename/BibTexStringRename.java
+++ b/src/main/java/org/jabref/gui/collab/stringrename/BibTexStringRename.java
@@ -12,9 +12,7 @@
 
 public final class BibTexStringRename extends DatabaseChange {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(
-        BibTexStringRename.class
-    );
+    private static final Logger LOGGER = LoggerFactory.getLogger(BibTexStringRename.class);
 
     private final BibtexString oldString;
     private final BibtexString newString;
@@ -29,16 +27,12 @@ public BibTexStringRename(
         this.oldString = oldString;
         this.newString = newString;
 
-        setChangeName(
-            Localization.lang("Renamed string: '%0'", oldString.getName())
-        );
+        setChangeName(Localization.lang("Renamed string: '%0'", oldString.getName()));
     }
 
     @Override
     public void applyChange(NamedCompound undoEdit) {
-        if (
-            databaseContext.getDatabase().hasStringByName(newString.getName())
-        ) {
+        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",
@@ -50,9 +44,7 @@ public void applyChange(NamedCompound undoEdit) {
         String currentName = oldString.getName();
         String newName = newString.getName();
         oldString.setName(newName);
-        undoEdit.addEdit(
-            new UndoableStringChange(oldString, true, currentName, newName)
-        );
+        undoEdit.addEdit(new UndoableStringChange(oldString, true, currentName, newName));
     }
 
     public BibtexString getOldString() {
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 10fd142d81e..5739af9fd36 100644
--- a/src/main/java/org/jabref/gui/collab/stringrename/BibTexStringRenameDetailsView.java
+++ b/src/main/java/org/jabref/gui/collab/stringrename/BibTexStringRenameDetailsView.java
@@ -3,14 +3,11 @@
 import javafx.scene.control.Label;
 import org.jabref.gui.collab.DatabaseChangeDetailsView;
 
-public final class BibTexStringRenameDetailsView
-    extends DatabaseChangeDetailsView {
+public final class BibTexStringRenameDetailsView extends DatabaseChangeDetailsView {
 
     public BibTexStringRenameDetailsView(BibTexStringRename stringRename) {
         Label label = new Label(
-            stringRename.getNewString().getName() +
-            " : " +
-            stringRename.getOldString().getContent()
+            stringRename.getNewString().getName() + " : " + stringRename.getOldString().getContent()
         );
         setLeftAnchor(label, 8d);
         setTopAnchor(label, 8d);
diff --git a/src/main/java/org/jabref/gui/commonfxcontrols/CitationKeyPatternPanel.java b/src/main/java/org/jabref/gui/commonfxcontrols/CitationKeyPatternPanel.java
index 191c4093da3..2f4d2b4c3d2 100644
--- a/src/main/java/org/jabref/gui/commonfxcontrols/CitationKeyPatternPanel.java
+++ b/src/main/java/org/jabref/gui/commonfxcontrols/CitationKeyPatternPanel.java
@@ -19,23 +19,16 @@
 import org.jabref.model.entry.types.EntryType;
 import org.jabref.preferences.PreferencesService;
 
-public class CitationKeyPatternPanel
-    extends TableView<CitationKeyPatternPanelItemModel> {
+public class CitationKeyPatternPanel extends TableView<CitationKeyPatternPanelItemModel> {
 
     @FXML
-    public TableColumn<
-        CitationKeyPatternPanelItemModel,
-        EntryType
-    > entryTypeColumn;
+    public TableColumn<CitationKeyPatternPanelItemModel, EntryType> entryTypeColumn;
 
     @FXML
     public TableColumn<CitationKeyPatternPanelItemModel, String> patternColumn;
 
     @FXML
-    public TableColumn<
-        CitationKeyPatternPanelItemModel,
-        EntryType
-    > actionsColumn;
+    public TableColumn<CitationKeyPatternPanelItemModel, EntryType> actionsColumn;
 
     @Inject
     private PreferencesService preferences;
@@ -53,54 +46,37 @@ public CitationKeyPatternPanel() {
     @FXML
     private void initialize() {
         viewModel =
-            new CitationKeyPatternPanelViewModel(
-                preferences.getCitationKeyPatternPreferences()
-            );
+            new CitationKeyPatternPanelViewModel(preferences.getCitationKeyPatternPreferences());
 
         this.setEditable(true);
 
         entryTypeColumn.setSortable(true);
         entryTypeColumn.setReorderable(false);
-        entryTypeColumn.setCellValueFactory(cellData ->
-            cellData.getValue().entryType()
-        );
+        entryTypeColumn.setCellValueFactory(cellData -> cellData.getValue().entryType());
         new ValueTableCellFactory<CitationKeyPatternPanelItemModel, EntryType>()
             .withText(EntryType::getDisplayName)
             .install(entryTypeColumn);
         this.setOnSort(event ->
                 viewModel
                     .patternListProperty()
-                    .sort(
-                        CitationKeyPatternPanelViewModel.defaultOnTopComparator
-                    )
+                    .sort(CitationKeyPatternPanelViewModel.defaultOnTopComparator)
             );
 
         patternColumn.setSortable(true);
         patternColumn.setReorderable(false);
-        patternColumn.setCellValueFactory(cellData ->
-            cellData.getValue().pattern()
-        );
+        patternColumn.setCellValueFactory(cellData -> cellData.getValue().pattern());
         patternColumn.setCellFactory(TextFieldTableCell.forTableColumn());
         patternColumn.setEditable(true);
         patternColumn.setOnEditCommit(
-                (
-                    TableColumn.CellEditEvent<
-                        CitationKeyPatternPanelItemModel,
-                        String
-                    > event
-                ) ->
+                (TableColumn.CellEditEvent<CitationKeyPatternPanelItemModel, String> event) ->
             event.getRowValue().setPattern(event.getNewValue())
         );
 
         actionsColumn.setSortable(false);
         actionsColumn.setReorderable(false);
-        actionsColumn.setCellValueFactory(cellData ->
-            cellData.getValue().entryType()
-        );
+        actionsColumn.setCellValueFactory(cellData -> cellData.getValue().entryType());
         new ValueTableCellFactory<CitationKeyPatternPanelItemModel, EntryType>()
-            .withGraphic(entryType ->
-                IconTheme.JabRefIcons.REFRESH.getGraphicNode()
-            )
+            .withGraphic(entryType -> IconTheme.JabRefIcons.REFRESH.getGraphicNode())
             .withTooltip(entryType ->
                 String.format(
                     Localization.lang("Reset %s to default value"),
@@ -108,10 +84,7 @@ private void initialize() {
                 )
             )
             .withOnMouseClickedEvent(item ->
-                evt ->
-                    viewModel.setItemToDefaultPattern(
-                        this.getFocusModel().getFocusedItem()
-                    )
+                evt -> viewModel.setItemToDefaultPattern(this.getFocusModel().getFocusedItem())
             )
             .install(actionsColumn);
 
@@ -131,15 +104,11 @@ public void resetAll() {
         viewModel.resetAll();
     }
 
-    public ListProperty<
-        CitationKeyPatternPanelItemModel
-    > patternListProperty() {
+    public ListProperty<CitationKeyPatternPanelItemModel> patternListProperty() {
         return viewModel.patternListProperty();
     }
 
-    public ObjectProperty<
-        CitationKeyPatternPanelItemModel
-    > defaultKeyPatternProperty() {
+    public ObjectProperty<CitationKeyPatternPanelItemModel> defaultKeyPatternProperty() {
         return viewModel.defaultKeyPatternProperty();
     }
 
@@ -158,25 +127,15 @@ private void jumpToSearchKey(KeyEvent keypressed) {
 
         this.getItems()
             .stream()
-            .filter(item ->
-                item
-                    .getEntryType()
-                    .getName()
-                    .toLowerCase()
-                    .startsWith(tableSearchTerm)
-            )
+            .filter(item -> item.getEntryType().getName().toLowerCase().startsWith(tableSearchTerm))
             .findFirst()
             .ifPresent(this::scrollTo);
     }
 
-    private static class HighlightTableRow
-        extends TableRow<CitationKeyPatternPanelItemModel> {
+    private static class HighlightTableRow extends TableRow<CitationKeyPatternPanelItemModel> {
 
         @Override
-        public void updateItem(
-            CitationKeyPatternPanelItemModel item,
-            boolean empty
-        ) {
+        public void updateItem(CitationKeyPatternPanelItemModel item, boolean empty) {
             super.updateItem(item, empty);
             if (item == null || item.getEntryType() == null) {
                 setStyle("");
@@ -186,9 +145,7 @@ public void updateItem(
                 item
                     .getEntryType()
                     .getName()
-                    .equals(
-                        CitationKeyPatternPanelViewModel.ENTRY_TYPE_DEFAULT_NAME
-                    )
+                    .equals(CitationKeyPatternPanelViewModel.ENTRY_TYPE_DEFAULT_NAME)
             ) {
                 setStyle("-fx-background-color: -fx-default-button");
             } else {
diff --git a/src/main/java/org/jabref/gui/commonfxcontrols/CitationKeyPatternPanelItemModel.java b/src/main/java/org/jabref/gui/commonfxcontrols/CitationKeyPatternPanelItemModel.java
index c225fca0483..40b3b8718ac 100644
--- a/src/main/java/org/jabref/gui/commonfxcontrols/CitationKeyPatternPanelItemModel.java
+++ b/src/main/java/org/jabref/gui/commonfxcontrols/CitationKeyPatternPanelItemModel.java
@@ -9,14 +9,10 @@
 
 public class CitationKeyPatternPanelItemModel {
 
-    private final ObjectProperty<EntryType> entryType =
-        new SimpleObjectProperty<>();
+    private final ObjectProperty<EntryType> entryType = new SimpleObjectProperty<>();
     private final StringProperty pattern = new SimpleStringProperty("");
 
-    public CitationKeyPatternPanelItemModel(
-        EntryType entryType,
-        String pattern
-    ) {
+    public CitationKeyPatternPanelItemModel(EntryType entryType, String pattern) {
         Objects.requireNonNull(entryType);
         Objects.requireNonNull(pattern);
         this.entryType.setValue(entryType);
@@ -45,12 +41,6 @@ public StringProperty pattern() {
 
     @Override
     public String toString() {
-        return (
-            "[" +
-            entryType.getValue().getName() +
-            "," +
-            pattern.getValue() +
-            "]"
-        );
+        return ("[" + entryType.getValue().getName() + "," + pattern.getValue() + "]");
     }
 }
diff --git a/src/main/java/org/jabref/gui/commonfxcontrols/CitationKeyPatternPanelViewModel.java b/src/main/java/org/jabref/gui/commonfxcontrols/CitationKeyPatternPanelViewModel.java
index 2e1ba16b0ff..2d8ee56e47e 100644
--- a/src/main/java/org/jabref/gui/commonfxcontrols/CitationKeyPatternPanelViewModel.java
+++ b/src/main/java/org/jabref/gui/commonfxcontrols/CitationKeyPatternPanelViewModel.java
@@ -17,9 +17,10 @@ public class CitationKeyPatternPanelViewModel {
 
     public static final String ENTRY_TYPE_DEFAULT_NAME = "default";
 
-    public static Comparator<
-        CitationKeyPatternPanelItemModel
-    > defaultOnTopComparator = (o1, o2) -> {
+    public static Comparator<CitationKeyPatternPanelItemModel> defaultOnTopComparator = (
+        o1,
+        o2
+    ) -> {
         String itemOneName = o1.getEntryType().getName();
         String itemTwoName = o2.getEntryType().getName();
 
@@ -34,18 +35,14 @@ public class CitationKeyPatternPanelViewModel {
         return 0;
     };
 
-    private final ListProperty<
-        CitationKeyPatternPanelItemModel
-    > patternListProperty = new SimpleListProperty<>();
-    private final ObjectProperty<
-        CitationKeyPatternPanelItemModel
-    > defaultItemProperty = new SimpleObjectProperty<>();
+    private final ListProperty<CitationKeyPatternPanelItemModel> patternListProperty =
+        new SimpleListProperty<>();
+    private final ObjectProperty<CitationKeyPatternPanelItemModel> defaultItemProperty =
+        new SimpleObjectProperty<>();
 
     private final CitationKeyPatternPreferences keyPatternPreferences;
 
-    public CitationKeyPatternPanelViewModel(
-        CitationKeyPatternPreferences keyPatternPreferences
-    ) {
+    public CitationKeyPatternPanelViewModel(CitationKeyPatternPreferences keyPatternPreferences) {
         this.keyPatternPreferences = keyPatternPreferences;
     }
 
@@ -64,10 +61,7 @@ public void setValues(
         }
 
         defaultItemProperty.setValue(
-            new CitationKeyPatternPanelItemModel(
-                new DefaultEntryType(),
-                defaultPattern
-            )
+            new CitationKeyPatternPanelItemModel(new DefaultEntryType(), defaultPattern)
         );
         patternListProperty.setValue(FXCollections.observableArrayList());
         patternListProperty.add(defaultItemProperty.getValue());
@@ -80,12 +74,9 @@ public void setValues(
                 if (initialKeyPattern.isDefaultValue(entryType)) {
                     pattern = "";
                 } else {
-                    pattern =
-                        initialKeyPattern.getPatterns().get(entryType).get(0);
+                    pattern = initialKeyPattern.getPatterns().get(entryType).get(0);
                 }
-                patternListProperty.add(
-                    new CitationKeyPatternPanelItemModel(entryType, pattern)
-                );
+                patternListProperty.add(new CitationKeyPatternPanelItemModel(entryType, pattern));
             });
     }
 
@@ -95,20 +86,14 @@ public void setItemToDefaultPattern(CitationKeyPatternPanelItemModel item) {
 
     public void resetAll() {
         patternListProperty.forEach(item -> item.setPattern(""));
-        defaultItemProperty
-            .getValue()
-            .setPattern(keyPatternPreferences.getDefaultPattern());
+        defaultItemProperty.getValue().setPattern(keyPatternPreferences.getDefaultPattern());
     }
 
-    public ListProperty<
-        CitationKeyPatternPanelItemModel
-    > patternListProperty() {
+    public ListProperty<CitationKeyPatternPanelItemModel> patternListProperty() {
         return patternListProperty;
     }
 
-    public ObjectProperty<
-        CitationKeyPatternPanelItemModel
-    > defaultKeyPatternProperty() {
+    public ObjectProperty<CitationKeyPatternPanelItemModel> defaultKeyPatternProperty() {
         return defaultItemProperty;
     }
 
diff --git a/src/main/java/org/jabref/gui/commonfxcontrols/FieldFormatterCleanupsPanel.java b/src/main/java/org/jabref/gui/commonfxcontrols/FieldFormatterCleanupsPanel.java
index f033a15aa28..ed438b69946 100644
--- a/src/main/java/org/jabref/gui/commonfxcontrols/FieldFormatterCleanupsPanel.java
+++ b/src/main/java/org/jabref/gui/commonfxcontrols/FieldFormatterCleanupsPanel.java
@@ -84,32 +84,20 @@ private void setupTable() {
             new ReadOnlyObjectWrapper<>(cellData.getValue().getField())
         );
         new ValueTableCellFactory<FieldFormatterCleanup, Field>()
-            .withGraphic(field ->
-                IconTheme.JabRefIcons.DELETE_ENTRY.getGraphicNode()
-            )
+            .withGraphic(field -> IconTheme.JabRefIcons.DELETE_ENTRY.getGraphicNode())
             .withTooltip(field ->
-                Localization.lang(
-                    "Remove formatter for %0",
-                    field.getDisplayName()
-                )
+                Localization.lang("Remove formatter for %0", field.getDisplayName())
             )
             .withOnMouseClickedEvent(item ->
-                event ->
-                    viewModel.removeCleanup(
-                        cleanupsList.getSelectionModel().getSelectedItem()
-                    )
+                event -> viewModel.removeCleanup(cleanupsList.getSelectionModel().getSelectedItem())
             )
             .install(actionsColumn);
 
-        viewModel
-            .selectedCleanupProperty()
-            .setValue(cleanupsList.getSelectionModel());
+        viewModel.selectedCleanupProperty().setValue(cleanupsList.getSelectionModel());
 
         cleanupsList.setOnKeyPressed(event -> {
             if (event.getCode() == KeyCode.DELETE) {
-                viewModel.removeCleanup(
-                    cleanupsList.getSelectionModel().getSelectedItem()
-                );
+                viewModel.removeCleanup(cleanupsList.getSelectionModel().getSelectedItem());
             }
         });
     }
@@ -120,10 +108,7 @@ private void setupCombos() {
             .install(addableFields);
         addableFields.setConverter(FieldsUtil.FIELD_STRING_CONVERTER);
         addableFields.setOnKeyPressed(event -> {
-            if (
-                event.getCode() == KeyCode.TAB ||
-                event.getCode() == KeyCode.ENTER
-            ) {
+            if (event.getCode() == KeyCode.TAB || event.getCode() == KeyCode.ENTER) {
                 addableFormatters.requestFocus();
                 event.consume();
             }
@@ -151,15 +136,9 @@ private void setupBindings() {
 
         cleanupsList.itemsProperty().bind(viewModel.cleanupsListProperty());
         addableFields.itemsProperty().bind(viewModel.availableFieldsProperty());
-        addableFields
-            .valueProperty()
-            .bindBidirectional(viewModel.selectedFieldProperty());
-        addableFormatters
-            .itemsProperty()
-            .bind(viewModel.availableFormattersProperty());
-        addableFormatters
-            .valueProperty()
-            .bindBidirectional(viewModel.selectedFormatterProperty());
+        addableFields.valueProperty().bindBidirectional(viewModel.selectedFieldProperty());
+        addableFormatters.itemsProperty().bind(viewModel.availableFormattersProperty());
+        addableFormatters.valueProperty().bindBidirectional(viewModel.selectedFormatterProperty());
     }
 
     @FXML
diff --git a/src/main/java/org/jabref/gui/commonfxcontrols/FieldFormatterCleanupsPanelViewModel.java b/src/main/java/org/jabref/gui/commonfxcontrols/FieldFormatterCleanupsPanelViewModel.java
index c4b964aca54..0347e9422ea 100644
--- a/src/main/java/org/jabref/gui/commonfxcontrols/FieldFormatterCleanupsPanelViewModel.java
+++ b/src/main/java/org/jabref/gui/commonfxcontrols/FieldFormatterCleanupsPanelViewModel.java
@@ -21,33 +21,24 @@
 
 public class FieldFormatterCleanupsPanelViewModel {
 
-    private final BooleanProperty cleanupsDisableProperty =
-        new SimpleBooleanProperty();
+    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 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 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<>();
 
@@ -58,13 +49,9 @@ public void resetToRecommended() {
             .getActiveDatabase()
             .ifPresent(databaseContext -> {
                 if (databaseContext.isBiblatexMode()) {
-                    cleanupsListProperty.setAll(
-                        FieldFormatterCleanups.RECOMMEND_BIBLATEX_ACTIONS
-                    );
+                    cleanupsListProperty.setAll(FieldFormatterCleanups.RECOMMEND_BIBLATEX_ACTIONS);
                 } else {
-                    cleanupsListProperty.setAll(
-                        FieldFormatterCleanups.RECOMMEND_BIBTEX_ACTIONS
-                    );
+                    cleanupsListProperty.setAll(FieldFormatterCleanups.RECOMMEND_BIBTEX_ACTIONS);
                 }
             });
     }
@@ -75,8 +62,7 @@ public void clearAll() {
 
     public void addCleanup() {
         if (
-            selectedFieldProperty.getValue() == null ||
-            selectedFormatterProperty.getValue() == null
+            selectedFieldProperty.getValue() == null || selectedFormatterProperty.getValue() == null
         ) {
             return;
         }
@@ -86,11 +72,7 @@ public void addCleanup() {
             selectedFormatterProperty.getValue()
         );
 
-        if (
-            cleanupsListProperty
-                .stream()
-                .noneMatch(item -> item.equals(cleanup))
-        ) {
+        if (cleanupsListProperty.stream().noneMatch(item -> item.equals(cleanup))) {
             cleanupsListProperty.add(cleanup);
         }
     }
@@ -107,9 +89,7 @@ public ListProperty<FieldFormatterCleanup> cleanupsListProperty() {
         return cleanupsListProperty;
     }
 
-    public ObjectProperty<
-        SelectionModel<FieldFormatterCleanup>
-    > selectedCleanupProperty() {
+    public ObjectProperty<SelectionModel<FieldFormatterCleanup>> selectedCleanupProperty() {
         return selectedCleanupProperty;
     }
 
diff --git a/src/main/java/org/jabref/gui/commonfxcontrols/SaveOrderConfigPanel.java b/src/main/java/org/jabref/gui/commonfxcontrols/SaveOrderConfigPanel.java
index 7c56e160e08..ca382dc5bb7 100644
--- a/src/main/java/org/jabref/gui/commonfxcontrols/SaveOrderConfigPanel.java
+++ b/src/main/java/org/jabref/gui/commonfxcontrols/SaveOrderConfigPanel.java
@@ -68,17 +68,12 @@ private void initialize() {
                     while (change.next()) {
                         if (change.wasReplaced()) {
                             clearCriterionRow(change.getFrom());
-                            createCriterionRow(
-                                change.getAddedSubList().get(0),
-                                change.getFrom()
-                            );
+                            createCriterionRow(change.getAddedSubList().get(0), change.getFrom());
                         } else if (change.wasAdded()) {
                             for (SortCriterionViewModel criterionViewModel : change.getAddedSubList()) {
                                 int row =
                                     change.getFrom() +
-                                    change
-                                        .getAddedSubList()
-                                        .indexOf(criterionViewModel);
+                                    change.getAddedSubList().indexOf(criterionViewModel);
                                 createCriterionRow(criterionViewModel, row);
                             }
                         } else if (change.wasRemoved()) {
@@ -91,10 +86,7 @@ private void initialize() {
             );
     }
 
-    private void createCriterionRow(
-        SortCriterionViewModel criterionViewModel,
-        int row
-    ) {
+    private void createCriterionRow(SortCriterionViewModel criterionViewModel, int row) {
         sortCriterionList
             .getChildren()
             .stream()
@@ -102,36 +94,24 @@ private void createCriterionRow(
             .forEach(item -> {
                 GridPane.setRowIndex(item, GridPane.getRowIndex(item) + 1);
                 if (item instanceof Label label) {
-                    label.setText(
-                        String.valueOf(GridPane.getRowIndex(item) + 1)
-                    );
+                    label.setText(String.valueOf(GridPane.getRowIndex(item) + 1));
                 }
             });
 
         Label label = new Label(String.valueOf(row + 1));
         sortCriterionList.add(label, 0, row);
 
-        ComboBox<Field> field = new ComboBox<>(
-            viewModel.sortableFieldsProperty()
-        );
+        ComboBox<Field> field = new ComboBox<>(viewModel.sortableFieldsProperty());
         field.setMaxWidth(Double.MAX_VALUE);
-        new ViewModelListCellFactory<Field>()
-            .withText(FieldsUtil::getNameWithType)
-            .install(field);
+        new ViewModelListCellFactory<Field>().withText(FieldsUtil::getNameWithType).install(field);
         field.setConverter(FieldsUtil.FIELD_STRING_CONVERTER);
-        field
-            .itemsProperty()
-            .bindBidirectional(viewModel.sortableFieldsProperty());
-        field
-            .valueProperty()
-            .bindBidirectional(criterionViewModel.fieldProperty());
+        field.itemsProperty().bindBidirectional(viewModel.sortableFieldsProperty());
+        field.valueProperty().bindBidirectional(criterionViewModel.fieldProperty());
         sortCriterionList.add(field, 1, row);
         GridPane.getHgrow(field);
 
         CheckBox descending = new CheckBox(Localization.lang("Descending"));
-        descending
-            .selectedProperty()
-            .bindBidirectional(criterionViewModel.descendingProperty());
+        descending.selectedProperty().bindBidirectional(criterionViewModel.descendingProperty());
         sortCriterionList.add(descending, 2, row);
 
         HBox hBox = new HBox();
@@ -139,31 +119,20 @@ private void createCriterionRow(
         sortCriterionList.add(hBox, 3, row);
     }
 
-    private List<Node> createRowButtons(
-        SortCriterionViewModel criterionViewModel
-    ) {
-        Button remove = new Button(
-            "",
-            new JabRefIconView(IconTheme.JabRefIcons.REMOVE_NOBOX)
-        );
+    private List<Node> createRowButtons(SortCriterionViewModel criterionViewModel) {
+        Button remove = new Button("", new JabRefIconView(IconTheme.JabRefIcons.REMOVE_NOBOX));
         remove.getStyleClass().addAll("icon-button", "narrow");
         remove.setPrefHeight(20.0);
         remove.setPrefWidth(20.0);
         remove.setOnAction(event -> removeCriterion(criterionViewModel));
 
-        Button moveUp = new Button(
-            "",
-            new JabRefIconView(IconTheme.JabRefIcons.LIST_MOVE_UP)
-        );
+        Button moveUp = new Button("", new JabRefIconView(IconTheme.JabRefIcons.LIST_MOVE_UP));
         moveUp.getStyleClass().addAll("icon-button", "narrow");
         moveUp.setPrefHeight(20.0);
         moveUp.setPrefWidth(20.0);
         moveUp.setOnAction(event -> moveCriterionUp(criterionViewModel));
 
-        Button moveDown = new Button(
-            "",
-            new JabRefIconView(IconTheme.JabRefIcons.LIST_MOVE_DOWN)
-        );
+        Button moveDown = new Button("", new JabRefIconView(IconTheme.JabRefIcons.LIST_MOVE_DOWN));
         moveDown.getStyleClass().addAll("icon-button", "narrow");
         moveDown.setPrefHeight(20.0);
         moveDown.setPrefWidth(20.0);
@@ -187,9 +156,7 @@ private void clearCriterionRow(int row) {
             .forEach(item -> {
                 GridPane.setRowIndex(item, GridPane.getRowIndex(item) - 1);
                 if (item instanceof Label label) {
-                    label.setText(
-                        String.valueOf(GridPane.getRowIndex(item) + 1)
-                    );
+                    label.setText(String.valueOf(GridPane.getRowIndex(item) + 1));
                 }
             });
     }
diff --git a/src/main/java/org/jabref/gui/commonfxcontrols/SaveOrderConfigPanelViewModel.java b/src/main/java/org/jabref/gui/commonfxcontrols/SaveOrderConfigPanelViewModel.java
index 407ef1d9dfe..5632f6865af 100644
--- a/src/main/java/org/jabref/gui/commonfxcontrols/SaveOrderConfigPanelViewModel.java
+++ b/src/main/java/org/jabref/gui/commonfxcontrols/SaveOrderConfigPanelViewModel.java
@@ -10,20 +10,15 @@
 
 public class SaveOrderConfigPanelViewModel {
 
-    private final BooleanProperty saveInOriginalProperty =
-        new SimpleBooleanProperty();
-    private final BooleanProperty saveInTableOrderProperty =
-        new SimpleBooleanProperty();
-    private final BooleanProperty saveInSpecifiedOrderProperty =
-        new SimpleBooleanProperty();
+    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<>(
+    private final ListProperty<Field> sortableFieldsProperty = new SimpleListProperty<>(
         FXCollections.observableArrayList()
     );
+    private final ListProperty<SortCriterionViewModel> selectedSortCriteriaProperty =
+        new SimpleListProperty<>(FXCollections.observableArrayList());
 
     public SaveOrderConfigPanelViewModel() {}
 
@@ -37,32 +32,18 @@ public void removeCriterion(SortCriterionViewModel sortCriterionViewModel) {
 
     public void moveCriterionUp(SortCriterionViewModel sortCriterionViewModel) {
         if (selectedSortCriteriaProperty.contains(sortCriterionViewModel)) {
-            int index = selectedSortCriteriaProperty.indexOf(
-                sortCriterionViewModel
-            );
+            int index = selectedSortCriteriaProperty.indexOf(sortCriterionViewModel);
             if (index > 0) {
-                Collections.swap(
-                    selectedSortCriteriaProperty,
-                    index - 1,
-                    index
-                );
+                Collections.swap(selectedSortCriteriaProperty, index - 1, index);
             }
         }
     }
 
-    public void moveCriterionDown(
-        SortCriterionViewModel sortCriterionViewModel
-    ) {
+    public void moveCriterionDown(SortCriterionViewModel sortCriterionViewModel) {
         if (selectedSortCriteriaProperty.contains(sortCriterionViewModel)) {
-            int index = selectedSortCriteriaProperty.indexOf(
-                sortCriterionViewModel
-            );
+            int index = selectedSortCriteriaProperty.indexOf(sortCriterionViewModel);
             if (index >= 0 && index < selectedSortCriteriaProperty.size() - 1) {
-                Collections.swap(
-                    selectedSortCriteriaProperty,
-                    index + 1,
-                    index
-                );
+                Collections.swap(selectedSortCriteriaProperty, index + 1, index);
             }
         }
     }
diff --git a/src/main/java/org/jabref/gui/commonfxcontrols/SortCriterionViewModel.java b/src/main/java/org/jabref/gui/commonfxcontrols/SortCriterionViewModel.java
index 7941f3b2987..a568d31f91f 100644
--- a/src/main/java/org/jabref/gui/commonfxcontrols/SortCriterionViewModel.java
+++ b/src/main/java/org/jabref/gui/commonfxcontrols/SortCriterionViewModel.java
@@ -10,10 +10,8 @@
 
 public class SortCriterionViewModel {
 
-    private final ObjectProperty<Field> fieldProperty =
-        new SimpleObjectProperty<>();
-    private final BooleanProperty descendingProperty =
-        new SimpleBooleanProperty();
+    private final ObjectProperty<Field> fieldProperty = new SimpleObjectProperty<>();
+    private final BooleanProperty descendingProperty = new SimpleBooleanProperty();
 
     public SortCriterionViewModel(SaveOrder.SortCriterion criterion) {
         this.fieldProperty.setValue(criterion.field);
@@ -34,9 +32,6 @@ public BooleanProperty descendingProperty() {
     }
 
     public SaveOrder.SortCriterion getCriterion() {
-        return new SaveOrder.SortCriterion(
-            fieldProperty.getValue(),
-            descendingProperty.getValue()
-        );
+        return new SaveOrder.SortCriterion(fieldProperty.getValue(), descendingProperty.getValue());
     }
 }
diff --git a/src/main/java/org/jabref/gui/copyfiles/CopyFilesAction.java b/src/main/java/org/jabref/gui/copyfiles/CopyFilesAction.java
index ebc0fce7678..110bb15a0c1 100644
--- a/src/main/java/org/jabref/gui/copyfiles/CopyFilesAction.java
+++ b/src/main/java/org/jabref/gui/copyfiles/CopyFilesAction.java
@@ -35,10 +35,7 @@ public CopyFilesAction(
         this.stateManager = stateManager;
         this.taskExecutor = taskExecutor;
 
-        this.executable.bind(
-                needsDatabase(stateManager)
-                    .and(needsEntriesSelected(stateManager))
-            );
+        this.executable.bind(needsDatabase(stateManager).and(needsEntriesSelected(stateManager)));
     }
 
     private void showDialog(List<CopyFilesResultItemViewModel> data) {
@@ -64,17 +61,19 @@ public void execute() {
         DirectoryDialogConfiguration dirDialogConfiguration =
             new DirectoryDialogConfiguration.Builder()
                 .withInitialDirectory(
-                    preferencesService
-                        .getExportPreferences()
-                        .getExportWorkingDirectory()
+                    preferencesService.getExportPreferences().getExportWorkingDirectory()
                 )
                 .build();
         Optional<Path> exportPath = dialogService.showDirectorySelectionDialog(
             dirDialogConfiguration
         );
         exportPath.ifPresent(path -> {
-            Task<List<CopyFilesResultItemViewModel>> exportTask =
-                new CopyFilesTask(database, entries, path, preferencesService);
+            Task<List<CopyFilesResultItemViewModel>> exportTask = new CopyFilesTask(
+                database,
+                entries,
+                path,
+                preferencesService
+            );
             dialogService.showProgressDialog(
                 Localization.lang("Copy linked files to folder..."),
                 Localization.lang("Copy linked files to folder..."),
diff --git a/src/main/java/org/jabref/gui/copyfiles/CopyFilesDialogView.java b/src/main/java/org/jabref/gui/copyfiles/CopyFilesDialogView.java
index fdf09038212..874925ce2af 100644
--- a/src/main/java/org/jabref/gui/copyfiles/CopyFilesDialogView.java
+++ b/src/main/java/org/jabref/gui/copyfiles/CopyFilesDialogView.java
@@ -45,11 +45,8 @@ private void initialize() {
 
     private void setupTable() {
         colFile.setCellValueFactory(cellData -> cellData.getValue().getFile());
-        colMessage.setCellValueFactory(cellData ->
-            cellData.getValue().getMessage()
-        );
-        colStatus.setCellValueFactory(cellData -> cellData.getValue().getIcon()
-        );
+        colMessage.setCellValueFactory(cellData -> cellData.getValue().getMessage());
+        colStatus.setCellValueFactory(cellData -> cellData.getValue().getIcon());
 
         colFile.setCellFactory(
             new ValueTableCellFactory<CopyFilesResultItemViewModel, String>()
@@ -57,10 +54,7 @@ private void setupTable() {
                 .withTooltip(item -> item)
         );
         colStatus.setCellFactory(
-            new ValueTableCellFactory<
-                CopyFilesResultItemViewModel,
-                JabRefIcon
-            >()
+            new ValueTableCellFactory<CopyFilesResultItemViewModel, JabRefIcon>()
                 .withGraphic(item -> {
                     if (item == IconTheme.JabRefIcons.CHECK) {
                         item = item.withColor(Color.GREEN);
diff --git a/src/main/java/org/jabref/gui/copyfiles/CopyFilesDialogViewModel.java b/src/main/java/org/jabref/gui/copyfiles/CopyFilesDialogViewModel.java
index a1e444d67d1..566b2a5e566 100644
--- a/src/main/java/org/jabref/gui/copyfiles/CopyFilesDialogViewModel.java
+++ b/src/main/java/org/jabref/gui/copyfiles/CopyFilesDialogViewModel.java
@@ -6,19 +6,14 @@
 
 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());
     }
 
-    public SimpleListProperty<
-        CopyFilesResultItemViewModel
-    > copyFilesResultListProperty() {
+    public SimpleListProperty<CopyFilesResultItemViewModel> copyFilesResultListProperty() {
         return this.copyFilesResultItems;
     }
 }
diff --git a/src/main/java/org/jabref/gui/copyfiles/CopyFilesResultItemViewModel.java b/src/main/java/org/jabref/gui/copyfiles/CopyFilesResultItemViewModel.java
index 415ab990001..ea490647def 100644
--- a/src/main/java/org/jabref/gui/copyfiles/CopyFilesResultItemViewModel.java
+++ b/src/main/java/org/jabref/gui/copyfiles/CopyFilesResultItemViewModel.java
@@ -16,11 +16,7 @@ public class CopyFilesResultItemViewModel {
     );
     private final StringProperty message = new SimpleStringProperty("");
 
-    public CopyFilesResultItemViewModel(
-        Path file,
-        boolean success,
-        String message
-    ) {
+    public CopyFilesResultItemViewModel(Path file, boolean success, String message) {
         this.file.setValue(file.toString());
         this.message.setValue(message);
         if (success) {
@@ -43,11 +39,7 @@ public ObjectProperty<JabRefIcon> getIcon() {
     @Override
     public String toString() {
         return (
-            "CopyFilesResultItemViewModel [file=" +
-            file.get() +
-            ", message=" +
-            message.get() +
-            "]"
+            "CopyFilesResultItemViewModel [file=" + file.get() + ", message=" + message.get() + "]"
         );
     }
 }
diff --git a/src/main/java/org/jabref/gui/copyfiles/CopyFilesResultListDependency.java b/src/main/java/org/jabref/gui/copyfiles/CopyFilesResultListDependency.java
index e6f5de44456..71aef284159 100644
--- a/src/main/java/org/jabref/gui/copyfiles/CopyFilesResultListDependency.java
+++ b/src/main/java/org/jabref/gui/copyfiles/CopyFilesResultListDependency.java
@@ -14,9 +14,7 @@ public CopyFilesResultListDependency() {
         // empty, workaround for injection into FXML controller
     }
 
-    public CopyFilesResultListDependency(
-        List<CopyFilesResultItemViewModel> results
-    ) {
+    public CopyFilesResultListDependency(List<CopyFilesResultItemViewModel> results) {
         this.results = results;
     }
 
diff --git a/src/main/java/org/jabref/gui/copyfiles/CopyFilesTask.java b/src/main/java/org/jabref/gui/copyfiles/CopyFilesTask.java
index 97bdded193e..80796458809 100644
--- a/src/main/java/org/jabref/gui/copyfiles/CopyFilesTask.java
+++ b/src/main/java/org/jabref/gui/copyfiles/CopyFilesTask.java
@@ -25,33 +25,23 @@
 
 public class CopyFilesTask extends Task<List<CopyFilesResultItemViewModel>> {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(
-        CopyFilesAction.class
-    );
+    private static final Logger LOGGER = LoggerFactory.getLogger(CopyFilesAction.class);
     private static final String LOGFILE_PREFIX = "copyFileslog_";
     private static final String LOGFILE_EXT = ".log";
     private final BibDatabaseContext databaseContext;
     private final PreferencesService preferencesService;
     private final Path exportPath;
-    private final String localizedSuccessMessage = Localization.lang(
-        "Copied file successfully"
-    );
+    private final String localizedSuccessMessage = Localization.lang("Copied file successfully");
     private final String localizedErrorMessage =
-        Localization.lang("Could not copy file") +
-        ": " +
-        Localization.lang("File exists");
+        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<>();
+    private final List<CopyFilesResultItemViewModel> results = new ArrayList<>();
     private Optional<Path> newPath = Optional.empty();
     private int numberSuccessful;
     private int totalFilesCounter;
 
-    private final BiFunction<Path, Path, Path> resolvePathFilename = (
-            path,
-            file
-        ) ->
+    private final BiFunction<Path, Path, Path> resolvePathFilename = (path, file) ->
         path.resolve(file.getFileName());
 
     public CopyFilesTask(
@@ -64,20 +54,16 @@ public CopyFilesTask(
         this.preferencesService = preferencesService;
         this.entries = entries;
         this.exportPath = path;
-        totalFilesCount =
-            entries.stream().mapToLong(entry -> entry.getFiles().size()).sum();
+        totalFilesCount = entries.stream().mapToLong(entry -> entry.getFiles().size()).sum();
     }
 
     @Override
-    protected List<CopyFilesResultItemViewModel> call()
-        throws InterruptedException, IOException {
+    protected List<CopyFilesResultItemViewModel> call() throws InterruptedException, IOException {
         updateMessage(Localization.lang("Copying files..."));
         updateProgress(0, totalFilesCount);
 
         LocalDateTime currentTime = LocalDateTime.now();
-        String currentDate = currentTime.format(
-            DateTimeFormatter.ofPattern("yyyy-MM-dd-HH-mm-ss")
-        );
+        String currentDate = currentTime.format(DateTimeFormatter.ofPattern("yyyy-MM-dd-HH-mm-ss"));
 
         try (
             BufferedWriter bw = Files.newBufferedWriter(
@@ -121,11 +107,7 @@ protected List<CopyFilesResultItemViewModel> call()
 
                     if (newPath.isPresent()) {
                         Path newFile = newPath.get();
-                        boolean success = FileUtil.copyFile(
-                            fileToExport.get(),
-                            newFile,
-                            false
-                        );
+                        boolean success = FileUtil.copyFile(fileToExport.get(), newFile, false);
                         updateProgress(totalFilesCounter++, totalFilesCount);
                         try {
                             Thread.sleep(300);
@@ -138,24 +120,12 @@ protected List<CopyFilesResultItemViewModel> call()
                         if (success) {
                             updateMessage(localizedSuccessMessage);
                             numberSuccessful++;
-                            writeLogMessage(
-                                newFile,
-                                bw,
-                                localizedSuccessMessage
-                            );
-                            addResultToList(
-                                newFile,
-                                success,
-                                localizedSuccessMessage
-                            );
+                            writeLogMessage(newFile, bw, localizedSuccessMessage);
+                            addResultToList(newFile, success, localizedSuccessMessage);
                         } else {
                             updateMessage(localizedErrorMessage);
                             writeLogMessage(newFile, bw, localizedErrorMessage);
-                            addResultToList(
-                                newFile,
-                                success,
-                                localizedErrorMessage
-                            );
+                            addResultToList(newFile, success, localizedErrorMessage);
                         }
                     }
                 }
@@ -174,11 +144,7 @@ protected List<CopyFilesResultItemViewModel> call()
         }
     }
 
-    private void writeLogMessage(
-        Path newFile,
-        BufferedWriter bw,
-        String logMessage
-    ) {
+    private void writeLogMessage(Path newFile, BufferedWriter bw, String logMessage) {
         try {
             bw.write(logMessage + ": " + newFile);
             bw.write(OS.NEWLINE);
@@ -187,11 +153,7 @@ private void writeLogMessage(
         }
     }
 
-    private void addResultToList(
-        Path newFile,
-        boolean success,
-        String logMessage
-    ) {
+    private void addResultToList(Path newFile, boolean success, String logMessage) {
         CopyFilesResultItemViewModel result = new CopyFilesResultItemViewModel(
             newFile,
             success,
diff --git a/src/main/java/org/jabref/gui/copyfiles/CopySingleFileAction.java b/src/main/java/org/jabref/gui/copyfiles/CopySingleFileAction.java
index 6088b6ef3e5..d4dd0558093 100644
--- a/src/main/java/org/jabref/gui/copyfiles/CopySingleFileAction.java
+++ b/src/main/java/org/jabref/gui/copyfiles/CopySingleFileAction.java
@@ -21,10 +21,7 @@ public class CopySingleFileAction extends SimpleCommand {
     private final BibDatabaseContext databaseContext;
     private final FilePreferences filePreferences;
 
-    private final BiFunction<Path, Path, Path> resolvePathFilename = (
-            path,
-            file
-        ) ->
+    private final BiFunction<Path, Path, Path> resolvePathFilename = (path, file) ->
         path.resolve(file.getFileName());
 
     public CopySingleFileAction(
@@ -42,9 +39,7 @@ public CopySingleFileAction(
                 Bindings.createBooleanBinding(
                     () ->
                         !linkedFile.isOnlineLink() &&
-                        linkedFile
-                            .findIn(databaseContext, this.filePreferences)
-                            .isPresent(),
+                        linkedFile.findIn(databaseContext, this.filePreferences).isPresent(),
                     linkedFile.linkProperty()
                 )
             );
@@ -63,10 +58,7 @@ public void execute() {
     }
 
     private void copyFileToDestination(Path exportPath) {
-        Optional<Path> fileToExport = linkedFile.findIn(
-            databaseContext,
-            filePreferences
-        );
+        Optional<Path> fileToExport = linkedFile.findIn(databaseContext, filePreferences);
         Optional<Path> newPath = OptionalUtil.combine(
             Optional.of(exportPath),
             fileToExport,
@@ -76,17 +68,13 @@ private void copyFileToDestination(Path exportPath) {
         if (newPath.isPresent()) {
             Path newFile = newPath.get();
             boolean success =
-                fileToExport.isPresent() &&
-                FileUtil.copyFile(fileToExport.get(), newFile, false);
+                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("")
+                        newPath.map(Path::getParent).map(Path::toString).orElse("")
                     )
                 );
             } else {
@@ -94,10 +82,7 @@ private void copyFileToDestination(Path exportPath) {
                     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("")
+                        newPath.map(Path::getParent).map(Path::toString).orElse("")
                     )
                 );
             }
@@ -105,10 +90,7 @@ private void copyFileToDestination(Path exportPath) {
             dialogService.showErrorDialogAndWait(
                 Localization.lang(
                     "Could not resolve the file %0",
-                    fileToExport
-                        .map(Path::getParent)
-                        .map(Path::toString)
-                        .orElse("")
+                    fileToExport.map(Path::getParent).map(Path::toString).orElse("")
                 )
             );
         }
diff --git a/src/main/java/org/jabref/gui/desktop/JabRefDesktop.java b/src/main/java/org/jabref/gui/desktop/JabRefDesktop.java
index 5cea155b6fa..0391ac7bb8e 100644
--- a/src/main/java/org/jabref/gui/desktop/JabRefDesktop.java
+++ b/src/main/java/org/jabref/gui/desktop/JabRefDesktop.java
@@ -36,14 +36,10 @@
  */
 public class JabRefDesktop {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(
-        JabRefDesktop.class
-    );
+    private static final Logger LOGGER = LoggerFactory.getLogger(JabRefDesktop.class);
 
     private static final NativeDesktop NATIVE_DESKTOP = OS.getNativeDesktop();
-    private static final Pattern REMOTE_LINK_PATTERN = Pattern.compile(
-        "[a-z]+://.*"
-    );
+    private static final Pattern REMOTE_LINK_PATTERN = Pattern.compile("[a-z]+://.*");
 
     private JabRefDesktop() {}
 
@@ -72,9 +68,7 @@ public static void openExternalViewer(
 
             // Check that the file exists:
             if (file.isEmpty() || !Files.exists(file.get())) {
-                throw new IOException(
-                    "File not found (" + field + "): '" + link + "'."
-                );
+                throw new IOException("File not found (" + field + "): '" + link + "'.");
             }
             link = file.get().toAbsolutePath().toString();
 
@@ -85,8 +79,7 @@ public static void openExternalViewer(
                     field = StandardField.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 = StandardField.PS;
                 }
@@ -108,12 +101,8 @@ public static void openExternalViewer(
                     .orElse(link);
 
             if (Objects.equals(link, initialLink)) {
-                Optional<String> eprintTypeOpt = entry.getField(
-                    StandardField.EPRINTTYPE
-                );
-                Optional<String> archivePrefixOpt = entry.getField(
-                    StandardField.ARCHIVEPREFIX
-                );
+                Optional<String> eprintTypeOpt = entry.getField(StandardField.EPRINTTYPE);
+                Optional<String> archivePrefixOpt = entry.getField(StandardField.ARCHIVEPREFIX);
                 if (eprintTypeOpt.isEmpty() && archivePrefixOpt.isEmpty()) {
                     dialogService.showErrorDialogAndWait(
                         Localization.lang(
@@ -162,10 +151,8 @@ public static void openExternalViewer(
         }
     }
 
-    private static void openDoi(
-        String doi,
-        PreferencesService preferencesService
-    ) throws IOException {
+    private static void openDoi(String doi, PreferencesService preferencesService)
+        throws IOException {
         String link = DOI.parse(doi).map(DOI::getURIAsASCIIString).orElse(doi);
         openBrowser(link, preferencesService.getFilePreferences());
     }
@@ -184,10 +171,7 @@ public static void openCustomDoi(
             )
             .ifPresent(uri -> {
                 try {
-                    JabRefDesktop.openBrowser(
-                        uri,
-                        preferences.getFilePreferences()
-                    );
+                    JabRefDesktop.openBrowser(uri, preferences.getFilePreferences());
                 } catch (IOException e) {
                     dialogService.showErrorDialogAndWait(
                         Localization.lang("Unable to open link."),
@@ -197,10 +181,8 @@ public static void openCustomDoi(
             });
     }
 
-    private static void openIsbn(
-        String isbn,
-        PreferencesService preferencesService
-    ) throws IOException {
+    private static void openIsbn(String isbn, PreferencesService preferencesService)
+        throws IOException {
         String link = "https://openlibrary.org/isbn/" + isbn;
         openBrowser(link, preferencesService.getFilePreferences());
     }
@@ -219,25 +201,15 @@ public static boolean openExternalFileAnyFormat(
         String link,
         final Optional<ExternalFileType> type
     ) throws IOException {
-        if (
-            REMOTE_LINK_PATTERN.matcher(link.toLowerCase(Locale.ROOT)).matches()
-        ) {
+        if (REMOTE_LINK_PATTERN.matcher(link.toLowerCase(Locale.ROOT)).matches()) {
             openBrowser(link, filePreferences);
             return true;
         }
-        Optional<Path> file = FileUtil.find(
-            databaseContext,
-            link,
-            filePreferences
-        );
+        Optional<Path> file = FileUtil.find(databaseContext, link, filePreferences);
         if (file.isPresent() && Files.exists(file.get())) {
             // Open the file:
             String filePath = file.get().toString();
-            openExternalFilePlatformIndependent(
-                type,
-                filePath,
-                filePreferences
-            );
+            openExternalFilePlatformIndependent(type, filePath, filePreferences);
             return true;
         }
 
@@ -255,11 +227,7 @@ private static void openExternalFilePlatformIndependent(
             String application = fileType.get().getOpenWithApplication();
 
             if (application.isEmpty()) {
-                NATIVE_DESKTOP.openFile(
-                    filePath,
-                    fileType.get().getExtension(),
-                    filePreferences
-                );
+                NATIVE_DESKTOP.openFile(filePath, fileType.get().getExtension(), filePreferences);
             } else {
                 NATIVE_DESKTOP.openFileWithApplication(filePath, application);
             }
@@ -285,15 +253,13 @@ public static void openFolderAndSelectFile(
             return;
         }
 
-        boolean useCustomFileBrowser =
-            externalApplicationsPreferences.useCustomFileBrowser();
+        boolean useCustomFileBrowser = externalApplicationsPreferences.useCustomFileBrowser();
         if (!useCustomFileBrowser) {
             NATIVE_DESKTOP.openFolderAndSelectFile(fileLink);
             return;
         }
         String absolutePath = fileLink.toAbsolutePath().getParent().toString();
-        String command =
-            externalApplicationsPreferences.getCustomFileBrowserCommand();
+        String command = externalApplicationsPreferences.getCustomFileBrowserCommand();
         if (command.isEmpty()) {
             LOGGER.info("No custom file browser command defined");
             NATIVE_DESKTOP.openFolderAndSelectFile(fileLink);
@@ -334,9 +300,7 @@ public static void openConsole(
         command = command.trim();
         if (command.isEmpty()) {
             NATIVE_DESKTOP.openConsole(absolutePath, dialogService);
-            LOGGER.info(
-                "Preference for custom terminal is empty. Using default terminal."
-            );
+            LOGGER.info("Preference for custom terminal is empty. Using default terminal.");
             return;
         }
         executeCommand(command, absolutePath, dialogService);
@@ -354,9 +318,7 @@ private static void executeCommand(
         command = command.replace("%DIR", absolutePath);
 
         LOGGER.info("Executing command \"{}\"...", command);
-        dialogService.notify(
-            Localization.lang("Executing command \"%0\"...", command)
-        );
+        dialogService.notify(Localization.lang("Executing command \"%0\"...", command));
 
         String[] subcommands = command.split(" ");
         try {
@@ -364,10 +326,7 @@ private static void executeCommand(
         } catch (IOException exception) {
             LOGGER.error("Error during command execution", exception);
             dialogService.notify(
-                Localization.lang(
-                    "Error occurred while executing the command \"%0\".",
-                    command
-                )
+                Localization.lang("Error occurred while executing the command \"%0\".", command)
             );
         }
     }
@@ -377,15 +336,15 @@ private static void executeCommand(
      *
      * @param url the URL to open
      */
-    public static void openBrowser(String url, FilePreferences filePreferences)
-        throws IOException {
-        Optional<ExternalFileType> fileType =
-            ExternalFileTypes.getExternalFileTypeByExt("html", filePreferences);
+    public static void openBrowser(String url, FilePreferences filePreferences) throws IOException {
+        Optional<ExternalFileType> fileType = ExternalFileTypes.getExternalFileTypeByExt(
+            "html",
+            filePreferences
+        );
         openExternalFilePlatformIndependent(fileType, url, filePreferences);
     }
 
-    public static void openBrowser(URI url, FilePreferences filePreferences)
-        throws IOException {
+    public static void openBrowser(URI url, FilePreferences filePreferences) throws IOException {
         openBrowser(url.toASCIIString(), filePreferences);
     }
 
@@ -404,24 +363,15 @@ public static void openBrowserShowPopup(
         } catch (IOException exception) {
             Globals.getClipboardManager().setContent(url);
             LOGGER.error("Could not open browser", exception);
-            String couldNotOpenBrowser = Localization.lang(
-                "Could not open browser."
-            );
-            String openManually = Localization.lang(
-                "Please open %0 manually.",
-                url
-            );
+            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."
             );
             dialogService.notify(couldNotOpenBrowser);
             dialogService.showErrorDialogAndWait(
                 couldNotOpenBrowser,
-                couldNotOpenBrowser +
-                "\n" +
-                openManually +
-                "\n" +
-                copiedToClipboard
+                couldNotOpenBrowser + "\n" + openManually + "\n" + copiedToClipboard
             );
         }
     }
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 43d76b3839c..da96f7c0159 100644
--- a/src/main/java/org/jabref/gui/desktop/os/DefaultDesktop.java
+++ b/src/main/java/org/jabref/gui/desktop/os/DefaultDesktop.java
@@ -20,17 +20,13 @@
 public class DefaultDesktop extends NativeDesktop {
 
     @Override
-    public void openFile(
-        String filePath,
-        String fileType,
-        FilePreferences filePreferences
-    ) throws IOException {
+    public void openFile(String filePath, String fileType, FilePreferences filePreferences)
+        throws IOException {
         Desktop.getDesktop().open(new File(filePath));
     }
 
     @Override
-    public void openFileWithApplication(String filePath, String application)
-        throws IOException {
+    public void openFileWithApplication(String filePath, String application) throws IOException {
         Desktop.getDesktop().open(new File(filePath));
     }
 
@@ -41,8 +37,7 @@ public void openFolderAndSelectFile(Path filePath) throws IOException {
     }
 
     @Override
-    public void openConsole(String absolutePath, DialogService dialogService)
-        throws IOException {
+    public void openConsole(String absolutePath, DialogService dialogService) throws IOException {
         LoggerFactory
             .getLogger(DefaultDesktop.class)
             .error("This feature is not supported by your Operating System.");
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 e1f3b80b186..46763fa8c54 100644
--- a/src/main/java/org/jabref/gui/desktop/os/Linux.java
+++ b/src/main/java/org/jabref/gui/desktop/os/Linux.java
@@ -41,13 +41,9 @@ private void nativeOpenFile(String filePath) {
                 Desktop.getDesktop().open(file);
                 LoggerFactory
                     .getLogger(Linux.class)
-                    .debug(
-                        "Open file in default application with Desktop integration"
-                    );
+                    .debug("Open file in default application with Desktop integration");
             } catch (IllegalArgumentException e) {
-                LoggerFactory
-                    .getLogger(Linux.class)
-                    .debug("Fail back to xdg-open");
+                LoggerFactory.getLogger(Linux.class).debug("Fail back to xdg-open");
                 try {
                     String[] cmd = { "xdg-open", filePath };
                     Runtime.getRuntime().exec(cmd);
@@ -65,26 +61,17 @@ private void nativeOpenFile(String filePath) {
     }
 
     @Override
-    public void openFile(
-        String filePath,
-        String fileType,
-        FilePreferences filePreferences
-    ) throws IOException {
-        Optional<ExternalFileType> type =
-            ExternalFileTypes.getExternalFileTypeByExt(
-                fileType,
-                filePreferences
-            );
+    public void openFile(String filePath, String fileType, FilePreferences filePreferences)
+        throws IOException {
+        Optional<ExternalFileType> type = ExternalFileTypes.getExternalFileTypeByExt(
+            fileType,
+            filePreferences
+        );
         String viewer;
 
-        if (
-            type.isPresent() && !type.get().getOpenWithApplication().isEmpty()
-        ) {
+        if (type.isPresent() && !type.get().getOpenWithApplication().isEmpty()) {
             viewer = type.get().getOpenWithApplication();
-            ProcessBuilder processBuilder = new ProcessBuilder(
-                viewer,
-                filePath
-            );
+            ProcessBuilder processBuilder = new ProcessBuilder(viewer, filePath);
             Process process = processBuilder.start();
             StreamGobbler streamGobblerInput = new StreamGobbler(
                 process.getInputStream(),
@@ -103,8 +90,7 @@ public void openFile(
     }
 
     @Override
-    public void openFileWithApplication(String filePath, String application)
-        throws IOException {
+    public void openFileWithApplication(String filePath, String application) throws IOException {
         // Use the given app if specified, and the universal "xdg-open" otherwise:
         String[] openWith;
         if ((application != null) && !application.isEmpty()) {
@@ -143,10 +129,7 @@ public void openFolderAndSelectFile(Path filePath) throws IOException {
             desktopSession = desktopSession.toLowerCase(Locale.ROOT);
             if (desktopSession.contains("gnome")) {
                 cmd = new String[] { "nautilus", "--select", absoluteFilePath };
-            } else if (
-                desktopSession.contains("kde") ||
-                desktopSession.contains("plasma")
-            ) {
+            } else if (desktopSession.contains("kde") || desktopSession.contains("plasma")) {
                 cmd = new String[] { "dolphin", "--select", absoluteFilePath };
             } else if (desktopSession.contains("mate")) {
                 cmd = new String[] { "caja", "--select", absoluteFilePath };
@@ -158,10 +141,7 @@ public void openFolderAndSelectFile(Path filePath) throws IOException {
         }
         LoggerFactory
             .getLogger(Linux.class)
-            .debug(
-                "Opening folder and selecting file using {}",
-                String.join(" ", cmd)
-            );
+            .debug("Opening folder and selecting file using {}", String.join(" ", cmd));
         ProcessBuilder processBuilder = new ProcessBuilder(cmd);
         Process process = processBuilder.start();
 
@@ -179,8 +159,7 @@ public void openFolderAndSelectFile(Path filePath) throws IOException {
     }
 
     @Override
-    public void openConsole(String absolutePath, DialogService dialogService)
-        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(
@@ -204,26 +183,14 @@ public void openConsole(String absolutePath, DialogService dialogService)
         ) {
             String emulatorName = reader.readLine();
             if (emulatorName != null) {
-                emulatorName =
-                    emulatorName.substring(
-                        emulatorName.lastIndexOf(File.separator) + 1
-                    );
+                emulatorName = emulatorName.substring(emulatorName.lastIndexOf(File.separator) + 1);
 
                 String[] cmd;
                 if (emulatorName.contains("gnome")) {
-                    cmd =
-                        new String[] {
-                            "gnome-terminal",
-                            "--working-directory",
-                            absolutePath,
-                        };
+                    cmd = new String[] { "gnome-terminal", "--working-directory", absolutePath };
                 } else if (emulatorName.contains("xfce4")) {
                     // xfce4-terminal requires "--working-directory=<directory>" format (one arg)
-                    cmd =
-                        new String[] {
-                            "xfce4-terminal",
-                            "--working-directory=" + absolutePath,
-                        };
+                    cmd = new String[] { "xfce4-terminal", "--working-directory=" + absolutePath };
                 } else if (emulatorName.contains("konsole")) {
                     cmd = new String[] { "konsole", "--workdir", absolutePath };
                 } else {
@@ -273,20 +240,14 @@ 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
+            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
-                )
+                new InputStreamReader(process.getInputStream(), StandardCharsets.UTF_8)
             )
                 .lines()
                 .toList();
             if (strings.isEmpty()) {
-                LoggerFactory
-                    .getLogger(Linux.class)
-                    .error("xdg-user-dir returned nothing");
+                LoggerFactory.getLogger(Linux.class).error("xdg-user-dir returned nothing");
                 return getUserDirectory();
             }
             String documentsDirectory = strings.get(0);
@@ -294,20 +255,13 @@ public Path getDefaultFileChooserDirectory() {
             if (!Files.exists(documentsPath)) {
                 LoggerFactory
                     .getLogger(Linux.class)
-                    .error(
-                        "xdg-user-dir returned non-existant directory {}",
-                        documentsDirectory
-                    );
+                    .error("xdg-user-dir returned non-existant directory {}", documentsDirectory);
                 return getUserDirectory();
             }
-            LoggerFactory
-                .getLogger(Linux.class)
-                .debug("Got documents path {}", documentsPath);
+            LoggerFactory.getLogger(Linux.class).debug("Got documents path {}", documentsPath);
             return documentsPath;
         } catch (IOException e) {
-            LoggerFactory
-                .getLogger(Linux.class)
-                .error("Error while executing xdg-user-dir", e);
+            LoggerFactory.getLogger(Linux.class).error("Error while executing xdg-user-dir", e);
         }
 
         // Fallback
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 51940de3d35..4c3bb1332e8 100644
--- a/src/main/java/org/jabref/gui/desktop/os/NativeDesktop.java
+++ b/src/main/java/org/jabref/gui/desktop/os/NativeDesktop.java
@@ -40,22 +40,15 @@ public abstract void openFile(
      * @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;
 
-    public abstract String detectProgramPath(
-        String programName,
-        String directoryName
-    );
+    public abstract String detectProgramPath(String programName, String directoryName);
 
     /**
      * Returns the path to the system's applications folder.
@@ -92,11 +85,7 @@ public Path getLogDirectory() {
             .of(
                 AppDirsFactory
                     .getInstance()
-                    .getUserDataDir(
-                        OS.APP_DIR_APP_NAME,
-                        "logs",
-                        OS.APP_DIR_APP_AUTHOR
-                    )
+                    .getUserDataDir(OS.APP_DIR_APP_NAME, "logs", OS.APP_DIR_APP_AUTHOR)
             )
             .resolve(new BuildInfo().version.toString());
     }
@@ -105,11 +94,7 @@ public Path getBackupDirectory() {
         return Path.of(
             AppDirsFactory
                 .getInstance()
-                .getUserDataDir(
-                    OS.APP_DIR_APP_NAME,
-                    "backups",
-                    OS.APP_DIR_APP_AUTHOR
-                )
+                .getUserDataDir(OS.APP_DIR_APP_NAME, "backups", OS.APP_DIR_APP_AUTHOR)
         );
     }
 
@@ -129,11 +114,7 @@ public Path getSslDirectory() {
         return Path.of(
             AppDirsFactory
                 .getInstance()
-                .getUserDataDir(
-                    OS.APP_DIR_APP_NAME,
-                    "ssl",
-                    OS.APP_DIR_APP_AUTHOR
-                )
+                .getUserDataDir(OS.APP_DIR_APP_NAME, "ssl", OS.APP_DIR_APP_AUTHOR)
         );
     }
 
@@ -151,10 +132,7 @@ public String getHostName() {
             } catch (UnknownHostException e) {
                 LoggerFactory
                     .getLogger(OS.class)
-                    .info(
-                        "Hostname not found. Using \"localhost\" as fallback.",
-                        e
-                    );
+                    .info("Hostname not found. Using \"localhost\" as fallback.", e);
                 hostName = "localhost";
             }
         }
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 c128851f3f4..b6d79dc3c3b 100644
--- a/src/main/java/org/jabref/gui/desktop/os/OSX.java
+++ b/src/main/java/org/jabref/gui/desktop/os/OSX.java
@@ -20,23 +20,14 @@
 public class OSX extends NativeDesktop {
 
     @Override
-    public void openFile(
-        String filePath,
-        String fileType,
-        FilePreferences filePreferences
-    ) throws IOException {
-        Optional<ExternalFileType> type =
-            ExternalFileTypes.getExternalFileTypeByExt(
-                fileType,
-                filePreferences
-            );
-        if (
-            type.isPresent() && !type.get().getOpenWithApplication().isEmpty()
-        ) {
-            openFileWithApplication(
-                filePath,
-                type.get().getOpenWithApplication()
-            );
+    public void openFile(String filePath, String fileType, FilePreferences filePreferences)
+        throws IOException {
+        Optional<ExternalFileType> type = ExternalFileTypes.getExternalFileTypeByExt(
+            fileType,
+            filePreferences
+        );
+        if (type.isPresent() && !type.get().getOpenWithApplication().isEmpty()) {
+            openFileWithApplication(filePath, type.get().getOpenWithApplication());
         } else {
             String[] cmd = { "/usr/bin/open", filePath };
             Runtime.getRuntime().exec(cmd);
@@ -44,8 +35,7 @@ public void openFile(
     }
 
     @Override
-    public void openFileWithApplication(String filePath, String application)
-        throws IOException {
+    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 }
@@ -60,8 +50,7 @@ public void openFolderAndSelectFile(Path file) throws IOException {
     }
 
     @Override
-    public void openConsole(String absolutePath, DialogService dialogService)
-        throws IOException {
+    public void openConsole(String absolutePath, DialogService dialogService) throws IOException {
         new ProcessBuilder("open", "-a", "Terminal", absolutePath).start();
     }
 
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 d6526e40187..61e8ba584c6 100644
--- a/src/main/java/org/jabref/gui/desktop/os/Windows.java
+++ b/src/main/java/org/jabref/gui/desktop/os/Windows.java
@@ -27,24 +27,15 @@ public class Windows extends NativeDesktop {
     private static final String DEFAULT_EXECUTABLE_EXTENSION = ".exe";
 
     @Override
-    public void openFile(
-        String filePath,
-        String fileType,
-        FilePreferences filePreferences
-    ) throws IOException {
-        Optional<ExternalFileType> type =
-            ExternalFileTypes.getExternalFileTypeByExt(
-                fileType,
-                filePreferences
-            );
+    public void openFile(String filePath, String fileType, FilePreferences filePreferences)
+        throws IOException {
+        Optional<ExternalFileType> type = ExternalFileTypes.getExternalFileTypeByExt(
+            fileType,
+            filePreferences
+        );
 
-        if (
-            type.isPresent() && !type.get().getOpenWithApplication().isEmpty()
-        ) {
-            openFileWithApplication(
-                filePath,
-                type.get().getOpenWithApplication()
-            );
+        if (type.isPresent() && !type.get().getOpenWithApplication().isEmpty()) {
+            openFileWithApplication(filePath, type.get().getOpenWithApplication());
         } else {
             // quote String so explorer handles URL query strings correctly
             String quotePath = "\"" + filePath + "\"";
@@ -72,22 +63,13 @@ public String detectProgramPath(String programName, String directoryName) {
         return "";
     }
 
-    private String getProgramPath(
-        String programName,
-        String directoryName,
-        String progFiles
-    ) {
+    private String getProgramPath(String programName, String directoryName, String progFiles) {
         Path programPath;
         if ((directoryName != null) && !directoryName.isEmpty()) {
             programPath =
-                Path.of(
-                    progFiles,
-                    directoryName,
-                    programName + DEFAULT_EXECUTABLE_EXTENSION
-                );
+                Path.of(progFiles, directoryName, programName + DEFAULT_EXECUTABLE_EXTENSION);
         } else {
-            programPath =
-                Path.of(progFiles, programName + DEFAULT_EXECUTABLE_EXTENSION);
+            programPath = Path.of(progFiles, programName + DEFAULT_EXECUTABLE_EXTENSION);
         }
         if (Files.exists(programPath)) {
             return programPath.toString();
@@ -109,45 +91,30 @@ public Path getApplicationDirectory() {
     public Path getDefaultFileChooserDirectory() {
         try {
             try {
-                return Path.of(
-                    Shell32Util.getKnownFolderPath(
-                        KnownFolders.FOLDERID_Documents
-                    )
-                );
+                return Path.of(Shell32Util.getKnownFolderPath(KnownFolders.FOLDERID_Documents));
             } catch (UnsatisfiedLinkError e) {
                 // Windows Vista or earlier
-                return Path.of(
-                    Shell32Util.getFolderPath(ShlObj.CSIDL_MYDOCUMENTS)
-                );
+                return Path.of(Shell32Util.getFolderPath(ShlObj.CSIDL_MYDOCUMENTS));
             }
         } catch (Win32Exception e) {
             // needs to be non-static because of org.jabref.cli.Launcher.addLogToDisk
-            LoggerFactory
-                .getLogger(Windows.class)
-                .error("Error accessing folder", e);
+            LoggerFactory.getLogger(Windows.class).error("Error accessing folder", e);
             return Path.of(System.getProperty("user.home"));
         }
     }
 
     @Override
-    public void openFileWithApplication(String filePath, String application)
-        throws IOException {
-        new ProcessBuilder(
-            Path.of(application).toString(),
-            Path.of(filePath).toString()
-        )
-            .start();
+    public void openFileWithApplication(String filePath, String application) throws IOException {
+        new ProcessBuilder(Path.of(application).toString(), Path.of(filePath).toString()).start();
     }
 
     @Override
     public void openFolderAndSelectFile(Path filePath) throws IOException {
-        new ProcessBuilder("explorer.exe", "/select,", filePath.toString())
-            .start();
+        new ProcessBuilder("explorer.exe", "/select,", filePath.toString()).start();
     }
 
     @Override
-    public void openConsole(String absolutePath, DialogService dialogService)
-        throws IOException {
+    public void openConsole(String absolutePath, DialogService dialogService) throws IOException {
         ProcessBuilder process = new ProcessBuilder("cmd.exe", "/c", "start");
         process.directory(new File(absolutePath));
         process.start();
diff --git a/src/main/java/org/jabref/gui/dialogs/AutosaveUiManager.java b/src/main/java/org/jabref/gui/dialogs/AutosaveUiManager.java
index 8f9e2d0f8fe..188522c1a25 100644
--- a/src/main/java/org/jabref/gui/dialogs/AutosaveUiManager.java
+++ b/src/main/java/org/jabref/gui/dialogs/AutosaveUiManager.java
@@ -16,9 +16,7 @@
  */
 public class AutosaveUiManager {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(
-        AutosaveUiManager.class
-    );
+    private static final Logger LOGGER = LoggerFactory.getLogger(AutosaveUiManager.class);
 
     private final SaveDatabaseAction saveDatabaseAction;
 
@@ -40,9 +38,7 @@ public AutosaveUiManager(
     @Subscribe
     public void listen(AutosaveEvent event) {
         try {
-            this.saveDatabaseAction.save(
-                    SaveDatabaseAction.SaveDatabaseMode.SILENT
-                );
+            this.saveDatabaseAction.save(SaveDatabaseAction.SaveDatabaseMode.SILENT);
         } catch (Throwable e) {
             LOGGER.error("Problem occurred while saving.", e);
         }
diff --git a/src/main/java/org/jabref/gui/dialogs/BackupUIManager.java b/src/main/java/org/jabref/gui/dialogs/BackupUIManager.java
index b88327280e6..80d83424f71 100644
--- a/src/main/java/org/jabref/gui/dialogs/BackupUIManager.java
+++ b/src/main/java/org/jabref/gui/dialogs/BackupUIManager.java
@@ -31,9 +31,7 @@
  */
 public class BackupUIManager {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(
-        BackupUIManager.class
-    );
+    private static final Logger LOGGER = LoggerFactory.getLogger(BackupUIManager.class);
 
     private BackupUIManager() {}
 
@@ -76,11 +74,7 @@ private static Optional<ButtonType> showBackupResolverDialog(
     ) {
         return DefaultTaskExecutor.runInJavaFXThread(() ->
             dialogService.showCustomDialogAndWait(
-                new BackupResolverDialog(
-                    originalPath,
-                    backupDir,
-                    externalApplicationsPreferences
-                )
+                new BackupResolverDialog(originalPath, backupDir, externalApplicationsPreferences)
             )
         );
     }
@@ -102,8 +96,7 @@ private static Optional<ParserResult> showReviewBackupDialog(
                 fileUpdateMonitor
             );
             // This will be modified by using the `DatabaseChangesResolverDialog`.
-            BibDatabaseContext originalDatabase =
-                originalParserResult.getDatabaseContext();
+            BibDatabaseContext originalDatabase = originalParserResult.getDatabaseContext();
 
             Path backupPath = BackupFileUtil
                 .getPathOfLatestExistingBackupFile(
@@ -113,36 +106,24 @@ private static Optional<ParserResult> showReviewBackupDialog(
                 )
                 .orElseThrow();
             BibDatabaseContext backupDatabase = OpenDatabase
-                .loadDatabase(
-                    backupPath,
-                    importFormatPreferences,
-                    new DummyFileUpdateMonitor()
-                )
+                .loadDatabase(backupPath, importFormatPreferences, new DummyFileUpdateMonitor())
                 .getDatabaseContext();
 
-            DatabaseChangeResolverFactory changeResolverFactory =
-                new DatabaseChangeResolverFactory(
-                    dialogService,
-                    originalDatabase,
-                    preferencesService
-                );
+            DatabaseChangeResolverFactory changeResolverFactory = new DatabaseChangeResolverFactory(
+                dialogService,
+                originalDatabase,
+                preferencesService
+            );
 
             return DefaultTaskExecutor.runInJavaFXThread(() -> {
-                List<DatabaseChange> changes =
-                    DatabaseChangeList.compareAndGetChanges(
-                        originalDatabase,
-                        backupDatabase,
-                        changeResolverFactory
-                    );
-                DatabaseChangesResolverDialog reviewBackupDialog =
-                    new DatabaseChangesResolverDialog(
-                        changes,
-                        originalDatabase,
-                        "Review Backup"
-                    );
-                var allChangesResolved = dialogService.showCustomDialogAndWait(
-                    reviewBackupDialog
+                List<DatabaseChange> changes = DatabaseChangeList.compareAndGetChanges(
+                    originalDatabase,
+                    backupDatabase,
+                    changeResolverFactory
                 );
+                DatabaseChangesResolverDialog reviewBackupDialog =
+                    new DatabaseChangesResolverDialog(changes, originalDatabase, "Review Backup");
+                var allChangesResolved = dialogService.showCustomDialogAndWait(reviewBackupDialog);
                 if (allChangesResolved.isEmpty() || !allChangesResolved.get()) {
                     // In case not all changes are resolved, start from scratch
                     return showRestoreBackupDialog(
diff --git a/src/main/java/org/jabref/gui/documentviewer/DocumentViewerControl.java b/src/main/java/org/jabref/gui/documentviewer/DocumentViewerControl.java
index 2762de6c21f..23457ed5289 100644
--- a/src/main/java/org/jabref/gui/documentviewer/DocumentViewerControl.java
+++ b/src/main/java/org/jabref/gui/documentviewer/DocumentViewerControl.java
@@ -27,14 +27,11 @@ public class DocumentViewerControl extends StackPane {
 
     private final TaskExecutor taskExecutor;
 
-    private final ObjectProperty<Integer> currentPage =
-        new SimpleObjectProperty<>(1);
+    private final ObjectProperty<Integer> currentPage = new SimpleObjectProperty<>(1);
     private final DoubleProperty scrollY = new SimpleDoubleProperty();
     private final DoubleProperty scrollYMax = new SimpleDoubleProperty();
     private VirtualFlow<DocumentPageViewModel, DocumentViewerPage> flow;
-    private PageDimension desiredPageDimension = PageDimension.ofFixedWidth(
-        600
-    );
+    private PageDimension desiredPageDimension = PageDimension.ofFixedWidth(600);
 
     public DocumentViewerControl(TaskExecutor taskExecutor) {
         this.taskExecutor = Objects.requireNonNull(taskExecutor);
@@ -68,11 +65,7 @@ private void showPage(int pageNumber) {
     }
 
     public void show(DocumentViewModel document) {
-        flow =
-            VirtualFlow.createVertical(
-                document.getPages(),
-                DocumentViewerPage::new
-            );
+        flow = VirtualFlow.createVertical(document.getPages(), DocumentViewerPage::new);
         getChildren().setAll(flow);
         flow
             .visibleCells()
@@ -84,22 +77,16 @@ public void show(DocumentViewModel document) {
         // (Bidirectional) binding does not work, so use listeners instead
         flow
             .estimatedScrollYProperty()
-            .addListener((observable, oldValue, newValue) ->
-                scrollY.setValue(newValue)
-            );
+            .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)
-            );
+            .addListener((observable, oldValue, newValue) -> scrollYMax.setValue(newValue));
     }
 
-    private void updateCurrentPage(
-        ObservableList<DocumentViewerPage> visiblePages
-    ) {
+    private void updateCurrentPage(ObservableList<DocumentViewerPage> visiblePages) {
         if (flow == null) {
             return;
         }
@@ -107,10 +94,7 @@ private void updateCurrentPage(
         // We try to find the page that is displayed in the center of the viewport
         Optional<DocumentViewerPage> inMiddleOfViewport = Optional.empty();
         try {
-            VirtualFlowHit<DocumentViewerPage> hit = flow.hit(
-                0,
-                flow.getHeight() / 2
-            );
+            VirtualFlowHit<DocumentViewerPage> hit = flow.hit(0, flow.getHeight() / 2);
             if (hit.isCellHit()) {
                 // Successful hit
                 inMiddleOfViewport = Optional.of(hit.getCell());
@@ -125,11 +109,7 @@ private void updateCurrentPage(
         } 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)
             );
         }
     }
@@ -164,8 +144,7 @@ public void changePageWidth(int delta) {
      * Represents the viewport for a page. Note: the instances of {@link DocumentViewerPage} are reused, i.e., not every
      * page is rendered in a new instance but instead {@link DocumentViewerPage#updateItem(Object)} is called.
      */
-    private class DocumentViewerPage
-        implements Cell<DocumentPageViewModel, StackPane> {
+    private class DocumentViewerPage implements Cell<DocumentPageViewModel, StackPane> {
 
         private final ImageView imageView;
         private final StackPane imageHolder;
@@ -233,10 +212,7 @@ public void updateItem(DocumentPageViewModel page) {
                     imageView.setImage(image);
 
                     // Fade new page in for smoother transition
-                    FadeTransition fadeIn = new FadeTransition(
-                        Duration.millis(100),
-                        imageView
-                    );
+                    FadeTransition fadeIn = new FadeTransition(Duration.millis(100), imageView);
                     fadeIn.setFromValue(0);
                     fadeIn.setToValue(1);
                     fadeIn.play();
diff --git a/src/main/java/org/jabref/gui/documentviewer/DocumentViewerView.java b/src/main/java/org/jabref/gui/documentviewer/DocumentViewerView.java
index 0caae54d394..5948609ca0e 100644
--- a/src/main/java/org/jabref/gui/documentviewer/DocumentViewerView.java
+++ b/src/main/java/org/jabref/gui/documentviewer/DocumentViewerView.java
@@ -70,8 +70,7 @@ public DocumentViewerView() {
 
     @FXML
     private void initialize() {
-        viewModel =
-            new DocumentViewerViewModel(stateManager, preferencesService);
+        viewModel = new DocumentViewerViewModel(stateManager, preferencesService);
 
         setupViewer();
         setupScrollbar();
@@ -92,25 +91,22 @@ private void setupScrollbar() {
 
     private void setupPageControls() {
         OnlyIntegerFormatter integerFormatter = new OnlyIntegerFormatter(1);
-        viewModel
-            .currentPageProperty()
-            .bindBidirectional(integerFormatter.valueProperty());
+        viewModel.currentPageProperty().bindBidirectional(integerFormatter.valueProperty());
         currentPage.setTextFormatter(integerFormatter);
         maxPages.textProperty().bind(viewModel.maxPagesProperty().asString());
     }
 
     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)
-            );
+            .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
         fileChoice
@@ -130,9 +126,7 @@ private void setupViewer() {
                     viewer.show(newDocument);
                 }
             });
-        viewModel
-            .currentPageProperty()
-            .bindBidirectional(viewer.currentPageProperty());
+        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 499ed42131b..6398b58c65e 100644
--- a/src/main/java/org/jabref/gui/documentviewer/DocumentViewerViewModel.java
+++ b/src/main/java/org/jabref/gui/documentviewer/DocumentViewerViewModel.java
@@ -29,18 +29,14 @@
 
 public class DocumentViewerViewModel extends AbstractViewModel {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(
-        DocumentViewerViewModel.class
-    );
+    private static final Logger LOGGER = LoggerFactory.getLogger(DocumentViewerViewModel.class);
 
     private final StateManager stateManager;
     private final PreferencesService preferencesService;
-    private final ObjectProperty<DocumentViewModel> currentDocument =
-        new SimpleObjectProperty<>();
+    private final ObjectProperty<DocumentViewModel> currentDocument = new SimpleObjectProperty<>();
     private final ListProperty<LinkedFile> files = new SimpleListProperty<>();
     private final BooleanProperty liveMode = new SimpleBooleanProperty();
-    private final ObjectProperty<Integer> currentPage =
-        new SimpleObjectProperty<>();
+    private final ObjectProperty<Integer> currentPage = new SimpleObjectProperty<>();
     private final IntegerProperty maxPages = new SimpleIntegerProperty();
 
     public DocumentViewerViewModel(
@@ -55,9 +51,7 @@ public DocumentViewerViewModel(
                 (ListChangeListener<? super BibEntry>) c -> {
                     // Switch to currently selected entry in live mode
                     if (isLiveMode()) {
-                        setCurrentEntries(
-                            this.stateManager.getSelectedEntries()
-                        );
+                        setCurrentEntries(this.stateManager.getSelectedEntries());
                     }
                 }
             );
@@ -136,12 +130,7 @@ public void switchToFile(LinkedFile file) {
         if (file != null) {
             stateManager
                 .getActiveDatabase()
-                .flatMap(database ->
-                    file.findIn(
-                        database,
-                        preferencesService.getFilePreferences()
-                    )
-                )
+                .flatMap(database -> file.findIn(database, preferencesService.getFilePreferences()))
                 .ifPresent(this::setCurrentDocument);
         }
     }
diff --git a/src/main/java/org/jabref/gui/documentviewer/PdfDocumentPageViewModel.java b/src/main/java/org/jabref/gui/documentviewer/PdfDocumentPageViewModel.java
index e9a4a164315..ede3fbe2ac9 100644
--- a/src/main/java/org/jabref/gui/documentviewer/PdfDocumentPageViewModel.java
+++ b/src/main/java/org/jabref/gui/documentviewer/PdfDocumentPageViewModel.java
@@ -24,32 +24,20 @@ public class PdfDocumentPageViewModel extends DocumentPageViewModel {
     private final int pageNumber;
     private final PDDocument document;
 
-    public PdfDocumentPageViewModel(
-        PDPage page,
-        int pageNumber,
-        PDDocument document
-    ) {
+    public PdfDocumentPageViewModel(PDPage page, int pageNumber, PDDocument document) {
         this.page = Objects.requireNonNull(page);
         this.pageNumber = pageNumber;
         this.document = document;
     }
 
     // Taken from http://stackoverflow.com/a/9417836/873661
-    private static BufferedImage resize(
-        BufferedImage img,
-        int newWidth,
-        int newHeight
-    ) {
+    private static BufferedImage resize(BufferedImage img, int newWidth, int newHeight) {
         java.awt.Image tmp = img.getScaledInstance(
             newWidth,
             newHeight,
             java.awt.Image.SCALE_SMOOTH
         );
-        BufferedImage dimg = new BufferedImage(
-            newWidth,
-            newHeight,
-            BufferedImage.TYPE_INT_ARGB
-        );
+        BufferedImage dimg = new BufferedImage(newWidth, newHeight, BufferedImage.TYPE_INT_ARGB);
 
         Graphics2D g2d = dimg.createGraphics();
         g2d.drawImage(tmp, 0, 0, null);
diff --git a/src/main/java/org/jabref/gui/documentviewer/PdfDocumentViewModel.java b/src/main/java/org/jabref/gui/documentviewer/PdfDocumentViewModel.java
index 02d8c1fed9d..93932ffa09f 100644
--- a/src/main/java/org/jabref/gui/documentviewer/PdfDocumentViewModel.java
+++ b/src/main/java/org/jabref/gui/documentviewer/PdfDocumentViewModel.java
@@ -24,9 +24,7 @@ public ObservableList<DocumentPageViewModel> 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
         for (int i = 0; i < pages.getCount(); i++) {
-            pdfPages.add(
-                new PdfDocumentPageViewModel(pages.get(i), i, document)
-            );
+            pdfPages.add(new PdfDocumentPageViewModel(pages.get(i), i, document));
         }
         return FXCollections.observableArrayList(pdfPages);
     }
diff --git a/src/main/java/org/jabref/gui/documentviewer/ShowDocumentViewerAction.java b/src/main/java/org/jabref/gui/documentviewer/ShowDocumentViewerAction.java
index 7990b94766d..c33b6fdfd22 100644
--- a/src/main/java/org/jabref/gui/documentviewer/ShowDocumentViewerAction.java
+++ b/src/main/java/org/jabref/gui/documentviewer/ShowDocumentViewerAction.java
@@ -11,26 +11,16 @@
 
 public class ShowDocumentViewerAction extends SimpleCommand {
 
-    public ShowDocumentViewerAction(
-        StateManager stateManager,
-        PreferencesService preferences
-    ) {
+    public ShowDocumentViewerAction(StateManager stateManager, PreferencesService preferences) {
         this.executable.bind(
                 needsEntriesSelected(stateManager)
-                    .and(
-                        ActionHelper.isFilePresentForSelectedEntry(
-                            stateManager,
-                            preferences
-                        )
-                    )
+                    .and(ActionHelper.isFilePresentForSelectedEntry(stateManager, preferences))
             );
     }
 
     @Override
     public void execute() {
-        DialogService dialogService = Injector.instantiateModelOrService(
-            DialogService.class
-        );
+        DialogService dialogService = Injector.instantiateModelOrService(DialogService.class);
         dialogService.showCustomDialog(new DocumentViewerView());
     }
 }
diff --git a/src/main/java/org/jabref/gui/duplicationFinder/DuplicateResolverDialog.java b/src/main/java/org/jabref/gui/duplicationFinder/DuplicateResolverDialog.java
index 6c03ea944bb..7cfcb34cb28 100644
--- a/src/main/java/org/jabref/gui/duplicationFinder/DuplicateResolverDialog.java
+++ b/src/main/java/org/jabref/gui/duplicationFinder/DuplicateResolverDialog.java
@@ -20,8 +20,7 @@
 import org.jabref.model.entry.BibEntry;
 import org.jabref.preferences.PreferencesService;
 
-public class DuplicateResolverDialog
-    extends BaseDialog<DuplicateResolverResult> {
+public class DuplicateResolverDialog extends BaseDialog<DuplicateResolverResult> {
 
     private final BibDatabaseContext database;
     private final StateManager stateManager;
@@ -60,17 +59,13 @@ public DuplicateResolverDialog(
         this.stateManager = stateManager;
         this.dialogService = dialogService;
         this.preferencesService = preferencesService;
-        this.actionFactory =
-            new ActionFactory(preferencesService.getKeyBindingRepository());
+        this.actionFactory = new ActionFactory(preferencesService.getKeyBindingRepository());
         init(one, two, type);
     }
 
     private void init(BibEntry one, BibEntry two, DuplicateResolverType type) {
         ButtonType cancel = ButtonType.CANCEL;
-        ButtonType merge = new ButtonType(
-            Localization.lang("Keep merged"),
-            ButtonData.OK_DONE
-        );
+        ButtonType merge = new ButtonType(Localization.lang("Keep merged"), ButtonData.OK_DONE);
 
         ButtonType both;
         ButtonType second;
@@ -83,60 +78,22 @@ private void init(BibEntry one, BibEntry two, DuplicateResolverType type) {
 
         switch (type) {
             case DUPLICATE_SEARCH -> {
-                first =
-                    new ButtonType(
-                        Localization.lang("Keep left"),
-                        ButtonData.LEFT
-                    );
-                second =
-                    new ButtonType(
-                        Localization.lang("Keep right"),
-                        ButtonData.LEFT
-                    );
-                both =
-                    new ButtonType(
-                        Localization.lang("Keep both"),
-                        ButtonData.LEFT
-                    );
-                threeWayMerge =
-                    new ThreeWayMergeView(one, two, preferencesService);
+                first = new ButtonType(Localization.lang("Keep left"), ButtonData.LEFT);
+                second = new ButtonType(Localization.lang("Keep right"), ButtonData.LEFT);
+                both = new ButtonType(Localization.lang("Keep both"), ButtonData.LEFT);
+                threeWayMerge = new ThreeWayMergeView(one, two, preferencesService);
             }
             case DUPLICATE_SEARCH_WITH_EXACT -> {
-                first =
-                    new ButtonType(
-                        Localization.lang("Keep left"),
-                        ButtonData.LEFT
-                    );
-                second =
-                    new ButtonType(
-                        Localization.lang("Keep right"),
-                        ButtonData.LEFT
-                    );
-                both =
-                    new ButtonType(
-                        Localization.lang("Keep both"),
-                        ButtonData.LEFT
-                    );
+                first = new ButtonType(Localization.lang("Keep left"), ButtonData.LEFT);
+                second = new ButtonType(Localization.lang("Keep right"), ButtonData.LEFT);
+                both = new ButtonType(Localization.lang("Keep both"), ButtonData.LEFT);
                 removeExactVisible = true;
-                threeWayMerge =
-                    new ThreeWayMergeView(one, two, preferencesService);
+                threeWayMerge = new ThreeWayMergeView(one, two, preferencesService);
             }
             case IMPORT_CHECK -> {
-                first =
-                    new ButtonType(
-                        Localization.lang("Keep old entry"),
-                        ButtonData.LEFT
-                    );
-                second =
-                    new ButtonType(
-                        Localization.lang("Keep from import"),
-                        ButtonData.LEFT
-                    );
-                both =
-                    new ButtonType(
-                        Localization.lang("Keep both"),
-                        ButtonData.LEFT
-                    );
+                first = new ButtonType(Localization.lang("Keep old 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,
@@ -146,14 +103,10 @@ private void init(BibEntry one, BibEntry two, DuplicateResolverType type) {
                         preferencesService
                     );
             }
-            default -> throw new IllegalStateException(
-                "Switch expression should be exhaustive"
-            );
+            default -> throw new IllegalStateException("Switch expression should be exhaustive");
         }
 
-        this.getDialogPane()
-            .getButtonTypes()
-            .addAll(first, second, both, merge, cancel);
+        this.getDialogPane().getButtonTypes().addAll(first, second, both, merge, cancel);
         this.getDialogPane().setFocusTraversable(false);
 
         if (removeExactVisible) {
@@ -169,12 +122,9 @@ private void init(BibEntry one, BibEntry two, DuplicateResolverType type) {
         }
 
         // Retrieves the previous window state and sets the new dialog window size and position to match it
-        DialogWindowState state = stateManager.getDialogWindowState(
-            getClass().getSimpleName()
-        );
+        DialogWindowState state = stateManager.getDialogWindowState(getClass().getSimpleName());
         if (state != null) {
-            this.getDialogPane()
-                .setPrefSize(state.getWidth(), state.getHeight());
+            this.getDialogPane().setPrefSize(state.getWidth(), state.getHeight());
             this.setX(state.getX());
             this.setY(state.getY());
         }
@@ -213,10 +163,7 @@ private void init(BibEntry one, BibEntry two, DuplicateResolverType type) {
             dialogService,
             preferencesService.getFilePreferences()
         );
-        Button helpButton = actionFactory.createIconButton(
-            StandardActions.HELP,
-            helpCommand
-        );
+        Button helpButton = actionFactory.createIconButton(StandardActions.HELP, helpCommand);
         borderPane.setRight(helpButton);
 
         getDialogPane().setContent(borderPane);
diff --git a/src/main/java/org/jabref/gui/duplicationFinder/DuplicateSearch.java b/src/main/java/org/jabref/gui/duplicationFinder/DuplicateSearch.java
index b603d971b74..f46059f0506 100644
--- a/src/main/java/org/jabref/gui/duplicationFinder/DuplicateSearch.java
+++ b/src/main/java/org/jabref/gui/duplicationFinder/DuplicateSearch.java
@@ -40,18 +40,14 @@
 public class DuplicateSearch extends SimpleCommand {
 
     private final JabRefFrame frame;
-    private final BlockingQueue<List<BibEntry>> duplicates =
-        new LinkedBlockingQueue<>();
+    private final BlockingQueue<List<BibEntry>> duplicates = new LinkedBlockingQueue<>();
 
     private final AtomicBoolean libraryAnalyzed = new AtomicBoolean();
     private final AtomicBoolean autoRemoveExactDuplicates = new AtomicBoolean();
     private final AtomicInteger duplicateCount = new AtomicInteger();
-    private final SimpleStringProperty duplicateCountObservable =
-        new SimpleStringProperty();
-    private final SimpleStringProperty duplicateTotal =
-        new SimpleStringProperty();
-    private final SimpleIntegerProperty duplicateProgress =
-        new SimpleIntegerProperty(0);
+    private final SimpleStringProperty duplicateCountObservable = new SimpleStringProperty();
+    private final SimpleStringProperty duplicateTotal = new SimpleStringProperty();
+    private final SimpleIntegerProperty duplicateProgress = new SimpleIntegerProperty(0);
     private final DialogService dialogService;
     private final StateManager stateManager;
 
@@ -95,9 +91,7 @@ public void execute() {
         }
 
         duplicateCountObservable.addListener((obj, oldValue, newValue) ->
-            DefaultTaskExecutor.runAndWaitInJavaFXThread(() ->
-                duplicateTotal.set(newValue)
-            )
+            DefaultTaskExecutor.runAndWaitInJavaFXThread(() -> duplicateTotal.set(newValue))
         );
 
         JabRefExecutorService.INSTANCE.executeInterruptableTask(
@@ -110,10 +104,7 @@ public void execute() {
             .executeWith(taskExecutor);
     }
 
-    private void searchPossibleDuplicates(
-        List<BibEntry> entries,
-        BibDatabaseMode databaseMode
-    ) {
+    private void searchPossibleDuplicates(List<BibEntry> entries, BibDatabaseMode databaseMode) {
         for (int i = 0; i < (entries.size() - 1); i++) {
             for (int j = i + 1; j < entries.size(); j++) {
                 if (Thread.interrupted()) {
@@ -124,13 +115,10 @@ private void searchPossibleDuplicates(
                 BibEntry second = entries.get(j);
 
                 if (
-                    new DuplicateCheck(entryTypesManager)
-                        .isDuplicate(first, second, databaseMode)
+                    new DuplicateCheck(entryTypesManager).isDuplicate(first, second, databaseMode)
                 ) {
                     duplicates.add(Arrays.asList(first, second));
-                    duplicateCountObservable.set(
-                        String.valueOf(duplicateCount.incrementAndGet())
-                    );
+                    duplicateCountObservable.set(String.valueOf(duplicateCount.incrementAndGet()));
                 }
             }
         }
@@ -248,10 +236,7 @@ private void handleDuplicates(DuplicateSearchResult result) {
         // Now, do the actual removal:
         if (!result.getToRemove().isEmpty()) {
             compoundEdit.addEdit(
-                new UndoableRemoveEntries(
-                    libraryTab.getDatabase(),
-                    result.getToRemove()
-                )
+                new UndoableRemoveEntries(libraryTab.getDatabase(), result.getToRemove())
             );
             libraryTab.getDatabase().removeEntries(result.getToRemove());
             libraryTab.markBaseChanged();
@@ -259,10 +244,7 @@ private void handleDuplicates(DuplicateSearchResult result) {
         // and adding merged entries:
         if (!result.getToAdd().isEmpty()) {
             compoundEdit.addEdit(
-                new UndoableInsertEntries(
-                    libraryTab.getDatabase(),
-                    result.getToAdd()
-                )
+                new UndoableInsertEntries(libraryTab.getDatabase(), result.getToAdd())
             );
             libraryTab.getDatabase().insertEntries(result.getToAdd());
             libraryTab.markBaseChanged();
@@ -308,11 +290,7 @@ public synchronized void remove(BibEntry entry) {
             duplicates++;
         }
 
-        public synchronized void replace(
-            BibEntry first,
-            BibEntry second,
-            BibEntry replacement
-        ) {
+        public synchronized void replace(BibEntry first, BibEntry second, BibEntry replacement) {
             remove(first);
             remove(second);
             toAdd.add(replacement);
diff --git a/src/main/java/org/jabref/gui/edit/CopyDoiUrlAction.java b/src/main/java/org/jabref/gui/edit/CopyDoiUrlAction.java
index 3cf947d119d..ead9024eefc 100644
--- a/src/main/java/org/jabref/gui/edit/CopyDoiUrlAction.java
+++ b/src/main/java/org/jabref/gui/edit/CopyDoiUrlAction.java
@@ -33,10 +33,7 @@ public void execute() {
         String identifier = component.getText();
 
         if (action == StandardActions.COPY_DOI_URL) {
-            copy(
-                DOI.parse(identifier).map(DOI::getURIAsASCIIString),
-                identifier
-            );
+            copy(DOI.parse(identifier).map(DOI::getURIAsASCIIString), identifier);
         } else {
             copy(DOI.parse(identifier).map(DOI::getDOI), identifier);
         }
@@ -45,13 +42,9 @@ public void execute() {
     private void copy(Optional<String> urlOptional, String identifier) {
         if (urlOptional.isPresent()) {
             Globals.getClipboardManager().setContent(urlOptional.get());
-            dialogService.notify(
-                Localization.lang("The link has been copied to the clipboard.")
-            );
+            dialogService.notify(Localization.lang("The link has been copied to the clipboard."));
         } else {
-            dialogService.notify(
-                Localization.lang("Invalid DOI: '%0'.", identifier)
-            );
+            dialogService.notify(Localization.lang("Invalid DOI: '%0'.", identifier));
         }
     }
 }
diff --git a/src/main/java/org/jabref/gui/edit/CopyMoreAction.java b/src/main/java/org/jabref/gui/edit/CopyMoreAction.java
index 3c708f9dadb..17214c4b19b 100644
--- a/src/main/java/org/jabref/gui/edit/CopyMoreAction.java
+++ b/src/main/java/org/jabref/gui/edit/CopyMoreAction.java
@@ -25,9 +25,7 @@
 
 public class CopyMoreAction extends SimpleCommand {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(
-        CopyMoreAction.class
-    );
+    private static final Logger LOGGER = LoggerFactory.getLogger(CopyMoreAction.class);
     private final StandardActions action;
     private final DialogService dialogService;
     private final StateManager stateManager;
@@ -83,9 +81,7 @@ private void copyTitle() {
             .collect(Collectors.toList());
 
         if (titles.isEmpty()) {
-            dialogService.notify(
-                Localization.lang("None of the selected entries have titles.")
-            );
+            dialogService.notify(Localization.lang("None of the selected entries have titles."));
             return;
         }
 
@@ -123,9 +119,7 @@ private void copyKey() {
 
         if (keys.isEmpty()) {
             dialogService.notify(
-                Localization.lang(
-                    "None of the selected entries have citation keys."
-                )
+                Localization.lang("None of the selected entries have citation keys.")
             );
             return;
         }
@@ -179,9 +173,7 @@ private void copyDoi() {
 
     private void copyDoiList(List<String> dois, int size) {
         if (dois.isEmpty()) {
-            dialogService.notify(
-                Localization.lang("None of the selected entries have DOIs.")
-            );
+            dialogService.notify(Localization.lang("None of the selected entries have DOIs."));
             return;
         }
 
@@ -219,24 +211,17 @@ private void copyCiteKey() {
 
         if (keys.isEmpty()) {
             dialogService.notify(
-                Localization.lang(
-                    "None of the selected entries have citation keys."
-                )
+                Localization.lang("None of the selected entries have citation keys.")
             );
             return;
         }
 
         String citeCommand = Optional
-            .ofNullable(
-                preferencesService
-                    .getExternalApplicationsPreferences()
-                    .getCiteCommand()
-            )
+            .ofNullable(preferencesService.getExternalApplicationsPreferences().getCiteCommand())
             .filter(cite -> cite.contains("\\")) // must contain \
             .orElse("\\cite");
 
-        final String copiedCiteCommand =
-            citeCommand + "{" + String.join(",", keys) + '}';
+        final String copiedCiteCommand = citeCommand + "{" + String.join(",", keys) + '}';
         clipBoardManager.setContent(copiedCiteCommand);
 
         if (keys.size() == entries.size()) {
@@ -287,19 +272,14 @@ private void copyKeyAndTitle() {
             if (entry.hasCitationKey()) {
                 entriesWithKeys++;
                 keyAndTitle.append(
-                    layout.doLayout(
-                        entry,
-                        stateManager.getActiveDatabase().get().getDatabase()
-                    )
+                    layout.doLayout(entry, stateManager.getActiveDatabase().get().getDatabase())
                 );
             }
         }
 
         if (entriesWithKeys == 0) {
             dialogService.notify(
-                Localization.lang(
-                    "None of the selected entries have citation keys."
-                )
+                Localization.lang("None of the selected entries have citation keys.")
             );
             return;
         }
@@ -311,9 +291,7 @@ private void copyKeyAndTitle() {
             dialogService.notify(
                 Localization.lang(
                     "Copied '%0' to clipboard.",
-                    JabRefDialogService.shortenDialogMessage(
-                        keyAndTitle.toString()
-                    )
+                    JabRefDialogService.shortenDialogMessage(keyAndTitle.toString())
                 )
             );
         } else {
@@ -345,9 +323,7 @@ private void copyKeyAndLink() {
 
         if (entriesWithKey.isEmpty()) {
             dialogService.notify(
-                Localization.lang(
-                    "None of the selected entries have citation keys."
-                )
+                Localization.lang("None of the selected entries have citation keys.")
             );
             return;
         }
@@ -356,30 +332,21 @@ private void copyKeyAndLink() {
             String key = entry.getCitationKey().get();
             String url = entry.getField(StandardField.URL).orElse("");
             keyAndLink.append(
-                url.isEmpty()
-                    ? key
-                    : String.format("<a href=\"%s\">%s</a>", url, key)
+                url.isEmpty() ? key : String.format("<a href=\"%s\">%s</a>", url, key)
             );
             keyAndLink.append(OS.NEWLINE);
-            fallbackString.append(
-                url.isEmpty() ? key : String.format("%s - %s", key, url)
-            );
+            fallbackString.append(url.isEmpty() ? key : String.format("%s - %s", key, url));
             fallbackString.append(OS.NEWLINE);
         }
 
-        clipBoardManager.setHtmlContent(
-            keyAndLink.toString(),
-            fallbackString.toString()
-        );
+        clipBoardManager.setHtmlContent(keyAndLink.toString(), fallbackString.toString());
 
         if (entriesWithKey.size() == entries.size()) {
             // All entries had keys.
             dialogService.notify(
                 Localization.lang(
                     "Copied '%0' to clipboard.",
-                    JabRefDialogService.shortenDialogMessage(
-                        keyAndLink.toString()
-                    )
+                    JabRefDialogService.shortenDialogMessage(keyAndLink.toString())
                 )
             );
         } else {
diff --git a/src/main/java/org/jabref/gui/edit/EditAction.java b/src/main/java/org/jabref/gui/edit/EditAction.java
index 3b41ac3b928..6f214322f18 100644
--- a/src/main/java/org/jabref/gui/edit/EditAction.java
+++ b/src/main/java/org/jabref/gui/edit/EditAction.java
@@ -17,19 +17,13 @@
  */
 public class EditAction extends SimpleCommand {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(
-        EditAction.class
-    );
+    private static final Logger LOGGER = LoggerFactory.getLogger(EditAction.class);
 
     private final JabRefFrame frame;
     private final StandardActions action;
     private final StateManager stateManager;
 
-    public EditAction(
-        StandardActions action,
-        JabRefFrame frame,
-        StateManager stateManager
-    ) {
+    public EditAction(StandardActions action, JabRefFrame frame, StateManager stateManager) {
         this.action = action;
         this.frame = frame;
         this.stateManager = stateManager;
@@ -37,9 +31,7 @@ public EditAction(
         if (action == StandardActions.PASTE) {
             this.executable.bind(ActionHelper.needsDatabase(stateManager));
         } else {
-            this.executable.bind(
-                    ActionHelper.needsEntriesSelected(stateManager)
-                );
+            this.executable.bind(ActionHelper.needsEntriesSelected(stateManager));
         }
     }
 
@@ -53,11 +45,7 @@ public void execute() {
         stateManager
             .getFocusOwner()
             .ifPresent(focusOwner -> {
-                LOGGER.debug(
-                    "focusOwner: {}; Action: {}",
-                    focusOwner,
-                    action.getText()
-                );
+                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
@@ -78,26 +66,18 @@ public void execute() {
                             throw new IllegalStateException(message);
                         }
                     }
-                } else if (
-                    (focusOwner instanceof CodeArea) ||
-                    (focusOwner instanceof WebView)
-                ) {
+                } else if ((focusOwner instanceof CodeArea) || (focusOwner instanceof WebView)) {
                     LOGGER.debug("Ignoring request in CodeArea or WebView");
                     return;
                 } else {
-                    LOGGER.debug(
-                        "Else: {}",
-                        focusOwner.getClass().getSimpleName()
-                    );
+                    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 -> frame.getCurrentLibraryTab().copy();
                         case CUT -> frame.getCurrentLibraryTab().cut();
                         case PASTE -> frame.getCurrentLibraryTab().paste();
-                        case DELETE_ENTRY -> frame
-                            .getCurrentLibraryTab()
-                            .delete(false);
+                        case DELETE_ENTRY -> frame.getCurrentLibraryTab().delete(false);
                         case UNDO -> {
                             if (frame.getUndoManager().canUndo()) {
                                 frame.getUndoManager().undo();
diff --git a/src/main/java/org/jabref/gui/edit/ManageKeywordsAction.java b/src/main/java/org/jabref/gui/edit/ManageKeywordsAction.java
index 1fd6dad9c1b..cdd6dcfc7db 100644
--- a/src/main/java/org/jabref/gui/edit/ManageKeywordsAction.java
+++ b/src/main/java/org/jabref/gui/edit/ManageKeywordsAction.java
@@ -20,26 +20,19 @@ public class ManageKeywordsAction extends SimpleCommand {
     public ManageKeywordsAction(StateManager stateManager) {
         this.stateManager = stateManager;
 
-        this.executable.bind(
-                needsDatabase(stateManager)
-                    .and(needsEntriesSelected(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."
-                    )
+                    Localization.lang("Select at least one entry to manage keywords.")
                 )
             );
     }
 
     @Override
     public void execute() {
-        DialogService dialogService = Injector.instantiateModelOrService(
-            DialogService.class
-        );
+        DialogService dialogService = Injector.instantiateModelOrService(DialogService.class);
         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 d8de4b24229..3d298ee1bcc 100644
--- a/src/main/java/org/jabref/gui/edit/ManageKeywordsDialog.java
+++ b/src/main/java/org/jabref/gui/edit/ManageKeywordsDialog.java
@@ -58,11 +58,7 @@ public ManageKeywordsDialog(List<BibEntry> entries) {
 
     @FXML
     public void initialize() {
-        viewModel =
-            new ManageKeywordsViewModel(
-                preferences.getBibEntryPreferences(),
-                entries
-            );
+        viewModel = new ManageKeywordsViewModel(preferences.getBibEntryPreferences(), entries);
 
         viewModel
             .displayTypeProperty()
@@ -85,19 +81,11 @@ public void initialize() {
         );
         keywordsTableMainColumn.setOnEditCommit(event -> {
             // Poor mans reverse databinding (necessary because we use a constant value above)
-            viewModel
-                .getKeywords()
-                .set(event.getTablePosition().getRow(), event.getNewValue());
+            viewModel.getKeywords().set(event.getTablePosition().getRow(), event.getNewValue());
         });
-        keywordsTableMainColumn.setCellFactory(
-            TextFieldTableCell.forTableColumn()
-        );
-        keywordsTableEditColumn.setCellValueFactory(data ->
-            BindingsHelper.constantOf(true)
-        );
-        keywordsTableDeleteColumn.setCellValueFactory(data ->
-            BindingsHelper.constantOf(true)
-        );
+        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 ->
@@ -110,9 +98,7 @@ public void initialize() {
             .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 d12a17ad06b..a592c483256 100644
--- a/src/main/java/org/jabref/gui/edit/ManageKeywordsViewModel.java
+++ b/src/main/java/org/jabref/gui/edit/ManageKeywordsViewModel.java
@@ -19,13 +19,10 @@
 public class ManageKeywordsViewModel {
 
     private final List<BibEntry> entries;
-    private final KeywordList sortedKeywordsOfAllEntriesBeforeUpdateByUser =
-        new KeywordList();
+    private final KeywordList sortedKeywordsOfAllEntriesBeforeUpdateByUser = new KeywordList();
     private final BibEntryPreferences bibEntryPreferences;
     private final ObjectProperty<ManageKeywordsDisplayType> displayType =
-        new SimpleObjectProperty<>(
-            ManageKeywordsDisplayType.CONTAINED_IN_ALL_ENTRIES
-        );
+        new SimpleObjectProperty<>(ManageKeywordsDisplayType.CONTAINED_IN_ALL_ENTRIES);
     private final ObservableList<String> keywords;
 
     public ManageKeywordsViewModel(
@@ -54,35 +51,23 @@ private void fillKeywordsList(ManageKeywordsDisplayType type) {
 
         if (type == ManageKeywordsDisplayType.CONTAINED_IN_ALL_ENTRIES) {
             for (BibEntry entry : entries) {
-                KeywordList separatedKeywords = entry.getKeywords(
-                    keywordSeparator
-                );
-                sortedKeywordsOfAllEntriesBeforeUpdateByUser.addAll(
-                    separatedKeywords
-                );
+                KeywordList separatedKeywords = entry.getKeywords(keywordSeparator);
+                sortedKeywordsOfAllEntriesBeforeUpdateByUser.addAll(separatedKeywords);
             }
         } else if (type == ManageKeywordsDisplayType.CONTAINED_IN_ANY_ENTRY) {
             // all keywords from first entry have to be added
             BibEntry firstEntry = entries.get(0);
-            KeywordList separatedKeywords = firstEntry.getKeywords(
-                keywordSeparator
-            );
-            sortedKeywordsOfAllEntriesBeforeUpdateByUser.addAll(
-                separatedKeywords
-            );
+            KeywordList separatedKeywords = firstEntry.getKeywords(keywordSeparator);
+            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
             for (BibEntry entry : entries) {
                 separatedKeywords = entry.getKeywords(keywordSeparator);
-                sortedKeywordsOfAllEntriesBeforeUpdateByUser.retainAll(
-                    separatedKeywords
-                );
+                sortedKeywordsOfAllEntriesBeforeUpdateByUser.retainAll(separatedKeywords);
             }
         } else {
-            throw new IllegalStateException(
-                "DisplayType " + type + " not handled"
-            );
+            throw new IllegalStateException("DisplayType " + type + " not handled");
         }
         for (Keyword keyword : sortedKeywordsOfAllEntriesBeforeUpdateByUser) {
             keywords.add(keyword.get());
@@ -103,9 +88,7 @@ public void saveChanges() {
         // build keywordsToAdd and userSelectedKeywords in parallel
         for (String keyword : keywords) {
             userSelectedKeywords.add(keyword);
-            if (
-                !sortedKeywordsOfAllEntriesBeforeUpdateByUser.contains(keyword)
-            ) {
+            if (!sortedKeywordsOfAllEntriesBeforeUpdateByUser.contains(keyword)) {
                 keywordsToAdd.add(keyword);
             }
         }
@@ -122,11 +105,7 @@ public void saveChanges() {
             return;
         }
 
-        NamedCompound ce = updateKeywords(
-            entries,
-            keywordsToAdd,
-            keywordsToRemove
-        );
+        NamedCompound ce = updateKeywords(entries, keywordsToAdd, keywordsToRemove);
         // TODO: bp.getUndoManager().addEdit(ce);
     }
 
@@ -137,9 +116,7 @@ private NamedCompound updateKeywords(
     ) {
         Character keywordSeparator = bibEntryPreferences.getKeywordSeparator();
 
-        NamedCompound ce = new NamedCompound(
-            Localization.lang("Update keywords")
-        );
+        NamedCompound ce = new NamedCompound(Localization.lang("Update keywords"));
         for (BibEntry entry : entries) {
             KeywordList keywords = entry.getKeywords(keywordSeparator);
 
@@ -148,13 +125,8 @@ private NamedCompound updateKeywords(
             keywords.addAll(keywordsToAdd);
 
             // put keywords back
-            Optional<FieldChange> change = entry.putKeywords(
-                keywords,
-                keywordSeparator
-            );
-            change.ifPresent(fieldChange ->
-                ce.addEdit(new UndoableFieldChange(fieldChange))
-            );
+            Optional<FieldChange> change = entry.putKeywords(keywords, keywordSeparator);
+            change.ifPresent(fieldChange -> ce.addEdit(new UndoableFieldChange(fieldChange)));
         }
         ce.end();
         return ce;
diff --git a/src/main/java/org/jabref/gui/edit/OpenBrowserAction.java b/src/main/java/org/jabref/gui/edit/OpenBrowserAction.java
index 81deae2d06f..9f57e016b65 100644
--- a/src/main/java/org/jabref/gui/edit/OpenBrowserAction.java
+++ b/src/main/java/org/jabref/gui/edit/OpenBrowserAction.java
@@ -23,10 +23,6 @@ public OpenBrowserAction(
 
     @Override
     public void execute() {
-        JabRefDesktop.openBrowserShowPopup(
-            urlToOpen,
-            dialogService,
-            filePreferences
-        );
+        JabRefDesktop.openBrowserShowPopup(urlToOpen, dialogService, filePreferences);
     }
 }
diff --git a/src/main/java/org/jabref/gui/edit/ReplaceStringAction.java b/src/main/java/org/jabref/gui/edit/ReplaceStringAction.java
index 1fea74555dd..482a4ce0091 100644
--- a/src/main/java/org/jabref/gui/edit/ReplaceStringAction.java
+++ b/src/main/java/org/jabref/gui/edit/ReplaceStringAction.java
@@ -19,11 +19,7 @@ public ReplaceStringAction(JabRefFrame frame, StateManager stateManager) {
 
     @Override
     public void execute() {
-        DialogService dialogService = Injector.instantiateModelOrService(
-            DialogService.class
-        );
-        dialogService.showCustomDialogAndWait(
-            new ReplaceStringView(frame.getCurrentLibraryTab())
-        );
+        DialogService dialogService = Injector.instantiateModelOrService(DialogService.class);
+        dialogService.showCustomDialogAndWait(new ReplaceStringView(frame.getCurrentLibraryTab()));
     }
 }
diff --git a/src/main/java/org/jabref/gui/edit/ReplaceStringView.java b/src/main/java/org/jabref/gui/edit/ReplaceStringView.java
index fd4dad8b46f..7c876eb657d 100644
--- a/src/main/java/org/jabref/gui/edit/ReplaceStringView.java
+++ b/src/main/java/org/jabref/gui/edit/ReplaceStringView.java
@@ -44,11 +44,7 @@ public ReplaceStringView(LibraryTab libraryTab) {
 
         ViewLoader.view(this).load().setAsDialogPane(this);
 
-        ControlHelper.setAction(
-            replaceButton,
-            getDialogPane(),
-            event -> buttonReplace()
-        );
+        ControlHelper.setAction(replaceButton, getDialogPane(), event -> buttonReplace());
     }
 
     @FXML
diff --git a/src/main/java/org/jabref/gui/edit/ReplaceStringViewModel.java b/src/main/java/org/jabref/gui/edit/ReplaceStringViewModel.java
index ab82f70e560..eea11da3a1d 100644
--- a/src/main/java/org/jabref/gui/edit/ReplaceStringViewModel.java
+++ b/src/main/java/org/jabref/gui/edit/ReplaceStringViewModel.java
@@ -26,8 +26,7 @@ public class ReplaceStringViewModel extends AbstractViewModel {
     private StringProperty findStringProperty = new SimpleStringProperty();
     private StringProperty replaceStringProperty = new SimpleStringProperty();
     private StringProperty fieldStringProperty = new SimpleStringProperty();
-    private BooleanProperty allFieldReplaceProperty =
-        new SimpleBooleanProperty();
+    private BooleanProperty allFieldReplaceProperty = new SimpleBooleanProperty();
     private BooleanProperty selectOnlyProperty = new SimpleBooleanProperty();
 
     public ReplaceStringViewModel(LibraryTab libraryTab) {
@@ -42,9 +41,7 @@ public int replace() {
         boolean selOnly = selectOnlyProperty.getValue();
         allFieldReplace = allFieldReplaceProperty.getValue();
 
-        final NamedCompound compound = new NamedCompound(
-            Localization.lang("Replace string")
-        );
+        final NamedCompound compound = new NamedCompound(Localization.lang("Replace string"));
         int counter = 0;
         if (selOnly) {
             for (BibEntry bibEntry : this.panel.getSelectedEntries()) {
@@ -76,11 +73,7 @@ private int replaceItem(BibEntry entry, NamedCompound compound) {
         return counter;
     }
 
-    private int replaceField(
-        BibEntry entry,
-        Field field,
-        NamedCompound compound
-    ) {
+    private int replaceField(BibEntry entry, Field field, NamedCompound compound) {
         if (!entry.hasField(field)) {
             return 0;
         }
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 6cb1a864807..3bad1c147f5 100644
--- a/src/main/java/org/jabref/gui/edit/automaticfiededitor/AbstractAutomaticFieldEditorTabViewModel.java
+++ b/src/main/java/org/jabref/gui/edit/automaticfiededitor/AbstractAutomaticFieldEditorTabViewModel.java
@@ -16,8 +16,7 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-public abstract class AbstractAutomaticFieldEditorTabViewModel
-    extends AbstractViewModel {
+public abstract class AbstractAutomaticFieldEditorTabViewModel extends AbstractViewModel {
 
     public static final Logger LOGGER = LoggerFactory.getLogger(
         AbstractAutomaticFieldEditorTabViewModel.class
@@ -25,8 +24,7 @@ public abstract class AbstractAutomaticFieldEditorTabViewModel
 
     protected final StateManager stateManager;
 
-    private final ObservableList<Field> allFields =
-        FXCollections.observableArrayList();
+    private final ObservableList<Field> allFields = FXCollections.observableArrayList();
 
     public AbstractAutomaticFieldEditorTabViewModel(
         BibDatabase bibDatabase,
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 7f227dd638b..5cff9c16073 100644
--- a/src/main/java/org/jabref/gui/edit/automaticfiededitor/AutomaticFieldEditorAction.java
+++ b/src/main/java/org/jabref/gui/edit/automaticfiededitor/AutomaticFieldEditorAction.java
@@ -12,23 +12,15 @@ public class AutomaticFieldEditorAction extends SimpleCommand {
     private final StateManager stateManager;
     private final DialogService dialogService;
 
-    public AutomaticFieldEditorAction(
-        StateManager stateManager,
-        DialogService dialogService
-    ) {
+    public AutomaticFieldEditorAction(StateManager stateManager, DialogService dialogService) {
         this.stateManager = stateManager;
         this.dialogService = dialogService;
 
-        this.executable.bind(
-                needsDatabase(stateManager)
-                    .and(needsEntriesSelected(stateManager))
-            );
+        this.executable.bind(needsDatabase(stateManager).and(needsEntriesSelected(stateManager)));
     }
 
     @Override
     public void execute() {
-        dialogService.showCustomDialogAndWait(
-            new AutomaticFieldEditorDialog(stateManager)
-        );
+        dialogService.showCustomDialogAndWait(new AutomaticFieldEditorDialog(stateManager));
     }
 }
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 3014e9a9c54..c2b03ae9667 100644
--- a/src/main/java/org/jabref/gui/edit/automaticfiededitor/AutomaticFieldEditorDialog.java
+++ b/src/main/java/org/jabref/gui/edit/automaticfiededitor/AutomaticFieldEditorDialog.java
@@ -21,9 +21,7 @@
 
 public class AutomaticFieldEditorDialog extends BaseDialog<String> {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(
-        AutomaticFieldEditorDialog.class
-    );
+    private static final Logger LOGGER = LoggerFactory.getLogger(AutomaticFieldEditorDialog.class);
 
     @FXML
     private TabPane tabPane;
@@ -41,8 +39,7 @@ public class AutomaticFieldEditorDialog extends BaseDialog<String> {
 
     public AutomaticFieldEditorDialog(StateManager stateManager) {
         this.selectedEntries = stateManager.getSelectedEntries();
-        this.database =
-            stateManager.getActiveDatabase().orElseThrow().getDatabase();
+        this.database = stateManager.getActiveDatabase().orElseThrow().getDatabase();
         this.stateManager = stateManager;
         this.undoManager = Globals.undoManager;
 
@@ -51,10 +48,7 @@ public AutomaticFieldEditorDialog(StateManager stateManager) {
         ViewLoader.view(this).load().setAsDialogPane(this);
 
         setResultConverter(buttonType -> {
-            if (
-                buttonType != null &&
-                buttonType.getButtonData() == ButtonBar.ButtonData.OK_DONE
-            ) {
+            if (buttonType != null && buttonType.getButtonData() == ButtonBar.ButtonData.OK_DONE) {
                 saveChanges();
             } else {
                 cancelChanges();
@@ -74,20 +68,14 @@ public AutomaticFieldEditorDialog(StateManager stateManager) {
     @FXML
     public void initialize() {
         viewModel =
-            new AutomaticFieldEditorViewModel(
-                selectedEntries,
-                database,
-                undoManager,
-                stateManager
-            );
+            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));
+            tabPane.getTabs().add(new Tab(tabModel.getTabName(), notificationPane));
         }
 
         EasyBind.listen(
@@ -96,10 +84,7 @@ public void initialize() {
                 viewModel.getDialogEdits().addEdit(lastEdit.getEdit());
                 notificationPanes
                     .get(lastEdit.getTabIndex())
-                    .notify(
-                        lastEdit.getAffectedEntries(),
-                        selectedEntries.size()
-                    );
+                    .notify(lastEdit.getAffectedEntries(), selectedEntries.size());
             }
         );
     }
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 2e1a829f0d2..661a6bfac2a 100644
--- a/src/main/java/org/jabref/gui/edit/automaticfiededitor/AutomaticFieldEditorViewModel.java
+++ b/src/main/java/org/jabref/gui/edit/automaticfiededitor/AutomaticFieldEditorViewModel.java
@@ -18,9 +18,7 @@ public class AutomaticFieldEditorViewModel extends AbstractViewModel {
     public static final String NAMED_COMPOUND_EDITS = "EDIT_FIELDS";
     private final ObservableList<AutomaticFieldEditorTab> fieldEditorTabs =
         FXCollections.observableArrayList();
-    private final NamedCompound dialogEdits = new NamedCompound(
-        NAMED_COMPOUND_EDITS
-    );
+    private final NamedCompound dialogEdits = new NamedCompound(NAMED_COMPOUND_EDITS);
 
     private final UndoManager undoManager;
 
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 42ffa68a47f..5c715cfa7f4 100644
--- a/src/main/java/org/jabref/gui/edit/automaticfiededitor/MoveFieldValueAction.java
+++ b/src/main/java/org/jabref/gui/edit/automaticfiededitor/MoveFieldValueAction.java
@@ -54,21 +54,9 @@ public void execute() {
                     entry.setField(toField, fromFieldValue);
                     entry.setField(fromField, "");
 
+                    edits.addEdit(new UndoableFieldChange(entry, fromField, fromFieldValue, null));
                     edits.addEdit(
-                        new UndoableFieldChange(
-                            entry,
-                            fromField,
-                            fromFieldValue,
-                            null
-                        )
-                    );
-                    edits.addEdit(
-                        new UndoableFieldChange(
-                            entry,
-                            toField,
-                            toFieldValue,
-                            fromFieldValue
-                        )
+                        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 28f51a32876..6a434d71ee2 100644
--- a/src/main/java/org/jabref/gui/edit/automaticfiededitor/NotificationPaneAdapter.java
+++ b/src/main/java/org/jabref/gui/edit/automaticfiededitor/NotificationPaneAdapter.java
@@ -18,8 +18,7 @@ public void notify(int affectedEntries, int totalEntries) {
             affectedEntries,
             totalEntries
         );
-        Node notificationGraphic =
-            IconTheme.JabRefIcons.INTEGRITY_INFO.getGraphicNode();
+        Node notificationGraphic = IconTheme.JabRefIcons.INTEGRITY_INFO.getGraphicNode();
 
         notify(
             notificationGraphic,
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 4616cee5371..f038828961d 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
@@ -48,12 +48,8 @@ public class CopyOrMoveFieldContentTabView
 
     private final ControlsFxVisualizer visualizer = new ControlsFxVisualizer();
 
-    public CopyOrMoveFieldContentTabView(
-        BibDatabase database,
-        StateManager stateManager
-    ) {
-        this.selectedEntries =
-            new ArrayList<>(stateManager.getSelectedEntries());
+    public CopyOrMoveFieldContentTabView(BibDatabase database, StateManager stateManager) {
+        this.selectedEntries = new ArrayList<>(stateManager.getSelectedEntries());
         this.database = database;
         this.stateManager = stateManager;
 
@@ -61,26 +57,15 @@ public CopyOrMoveFieldContentTabView(
     }
 
     public void initialize() {
-        viewModel =
-            new CopyOrMoveFieldContentTabViewModel(
-                selectedEntries,
-                database,
-                stateManager
-            );
+        viewModel = new CopyOrMoveFieldContentTabViewModel(selectedEntries, database, stateManager);
         initializeFromAndToComboBox();
 
         viewModel
             .overwriteFieldContentProperty()
-            .bindBidirectional(
-                overwriteFieldContentCheckBox.selectedProperty()
-            );
+            .bindBidirectional(overwriteFieldContentCheckBox.selectedProperty());
 
-        moveContentButton
-            .disableProperty()
-            .bind(viewModel.canMoveProperty().not());
-        swapContentButton
-            .disableProperty()
-            .bind(viewModel.canSwapProperty().not());
+        moveContentButton.disableProperty().bind(viewModel.canMoveProperty().not());
+        swapContentButton.disableProperty().bind(viewModel.canSwapProperty().not());
         copyContentButton
             .disableProperty()
             .bind(viewModel.toFieldValidationStatus().validProperty().not());
@@ -105,12 +90,8 @@ private void initializeFromAndToComboBox() {
 
         toFieldComboBox.setConverter(FIELD_STRING_CONVERTER);
 
-        fromFieldComboBox
-            .valueProperty()
-            .bindBidirectional(viewModel.fromFieldProperty());
-        toFieldComboBox
-            .valueProperty()
-            .bindBidirectional(viewModel.toFieldProperty());
+        fromFieldComboBox.valueProperty().bindBidirectional(viewModel.fromFieldProperty());
+        toFieldComboBox.valueProperty().bindBidirectional(viewModel.toFieldProperty());
 
         EasyBind.listen(
             fromFieldComboBox.getEditor().textProperty(),
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 2d7282c5fed..8dac5f52418 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
@@ -23,20 +23,16 @@
 import org.jabref.model.entry.field.StandardField;
 import org.jabref.model.strings.StringUtil;
 
-public class CopyOrMoveFieldContentTabViewModel
-    extends AbstractAutomaticFieldEditorTabViewModel {
+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> toField = new SimpleObjectProperty<>(
-        StandardField.AUTHOR
-    );
+    private final ObjectProperty<Field> toField = new SimpleObjectProperty<>(StandardField.AUTHOR);
 
-    private final BooleanProperty overwriteFieldContent =
-        new SimpleBooleanProperty(Boolean.FALSE);
+    private final BooleanProperty overwriteFieldContent = new SimpleBooleanProperty(Boolean.FALSE);
     private final List<BibEntry> selectedEntries;
 
     private final Validator toFieldValidator;
@@ -58,9 +54,7 @@ public CopyOrMoveFieldContentTabViewModel(
                 toField,
                 field -> {
                     if (StringUtil.isBlank(field.getName())) {
-                        return ValidationMessage.error(
-                            "Field name cannot be empty"
-                        );
+                        return ValidationMessage.error("Field name cannot be empty");
                     } else if (StringUtil.containsWhitespace(field.getName())) {
                         return ValidationMessage.error(
                             "Field name cannot have whitespace characters"
@@ -118,26 +112,17 @@ public BooleanProperty overwriteFieldContentProperty() {
     }
 
     public void copyValue() {
-        NamedCompound copyFieldValueEdit = new NamedCompound(
-            "COPY_FIELD_VALUE"
-        );
+        NamedCompound copyFieldValueEdit = new NamedCompound("COPY_FIELD_VALUE");
         int affectedEntriesCount = 0;
         for (BibEntry entry : selectedEntries) {
             String fromFieldValue = entry.getField(fromField.get()).orElse("");
             String toFieldValue = entry.getField(toField.get()).orElse("");
 
-            if (
-                overwriteFieldContent.get() || StringUtil.isBlank(toFieldValue)
-            ) {
+            if (overwriteFieldContent.get() || StringUtil.isBlank(toFieldValue)) {
                 if (StringUtil.isNotBlank(fromFieldValue)) {
                     entry.setField(toField.get(), fromFieldValue);
                     copyFieldValueEdit.addEdit(
-                        new UndoableFieldChange(
-                            entry,
-                            toField.get(),
-                            toFieldValue,
-                            fromFieldValue
-                        )
+                        new UndoableFieldChange(entry, toField.get(), toFieldValue, fromFieldValue)
                     );
                     affectedEntriesCount++;
                 }
@@ -147,11 +132,7 @@ public void copyValue() {
             copyFieldValueEdit.end();
         }
         stateManager.setLastAutomaticFieldEditorEdit(
-            new LastAutomaticFieldEditorEdit(
-                affectedEntriesCount,
-                TAB_INDEX,
-                copyFieldValueEdit
-            )
+            new LastAutomaticFieldEditorEdit(affectedEntriesCount, TAB_INDEX, copyFieldValueEdit)
         );
     }
 
@@ -160,12 +141,7 @@ public void moveValue() {
         int affectedEntriesCount = 0;
         if (overwriteFieldContent.get()) {
             affectedEntriesCount =
-                new MoveFieldValueAction(
-                    fromField.get(),
-                    toField.get(),
-                    selectedEntries,
-                    moveEdit
-                )
+                new MoveFieldValueAction(fromField.get(), toField.get(), selectedEntries, moveEdit)
                     .executeAndGetAffectedEntriesCount();
 
             if (moveEdit.hasEdits()) {
@@ -173,18 +149,12 @@ public void moveValue() {
             }
         }
         stateManager.setLastAutomaticFieldEditorEdit(
-            new LastAutomaticFieldEditorEdit(
-                affectedEntriesCount,
-                TAB_INDEX,
-                moveEdit
-            )
+            new LastAutomaticFieldEditorEdit(affectedEntriesCount, TAB_INDEX, moveEdit)
         );
     }
 
     public void swapValues() {
-        NamedCompound swapFieldValuesEdit = new NamedCompound(
-            "SWAP_FIELD_VALUES"
-        );
+        NamedCompound swapFieldValuesEdit = new NamedCompound("SWAP_FIELD_VALUES");
         int affectedEntriesCount = 0;
         for (BibEntry entry : selectedEntries) {
             String fromFieldValue = entry.getField(fromField.get()).orElse("");
@@ -199,21 +169,11 @@ public void swapValues() {
                 entry.setField(fromField.get(), toFieldValue);
 
                 swapFieldValuesEdit.addEdit(
-                    new UndoableFieldChange(
-                        entry,
-                        toField.get(),
-                        toFieldValue,
-                        fromFieldValue
-                    )
+                    new UndoableFieldChange(entry, toField.get(), toFieldValue, fromFieldValue)
                 );
 
                 swapFieldValuesEdit.addEdit(
-                    new UndoableFieldChange(
-                        entry,
-                        fromField.get(),
-                        fromFieldValue,
-                        toFieldValue
-                    )
+                    new UndoableFieldChange(entry, fromField.get(), fromFieldValue, toFieldValue)
                 );
                 affectedEntriesCount++;
             }
@@ -223,11 +183,7 @@ public void swapValues() {
             swapFieldValuesEdit.end();
         }
         stateManager.setLastAutomaticFieldEditorEdit(
-            new LastAutomaticFieldEditorEdit(
-                affectedEntriesCount,
-                TAB_INDEX,
-                swapFieldValuesEdit
-            )
+            new LastAutomaticFieldEditorEdit(affectedEntriesCount, TAB_INDEX, swapFieldValuesEdit)
         );
     }
 
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 b8030fc76aa..fb0288e704b 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
@@ -19,8 +19,7 @@
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.field.Field;
 
-public class EditFieldContentTabView
-    extends AbstractAutomaticFieldEditorTabView {
+public class EditFieldContentTabView extends AbstractAutomaticFieldEditorTabView {
 
     public Button appendValueButton;
     public Button clearFieldButton;
@@ -44,10 +43,7 @@ public class EditFieldContentTabView
 
     private final ControlsFxVisualizer visualizer = new ControlsFxVisualizer();
 
-    public EditFieldContentTabView(
-        BibDatabase database,
-        StateManager stateManager
-    ) {
+    public EditFieldContentTabView(BibDatabase database, StateManager stateManager) {
         this.selectedEntries = stateManager.getSelectedEntries();
         this.database = database;
         this.stateManager = stateManager;
@@ -57,37 +53,26 @@ public EditFieldContentTabView(
 
     @FXML
     public void initialize() {
-        viewModel =
-            new EditFieldContentViewModel(
-                database,
-                selectedEntries,
-                stateManager
-            );
+        viewModel = new EditFieldContentViewModel(database, selectedEntries, stateManager);
         fieldComboBox.setConverter(FIELD_STRING_CONVERTER);
 
         fieldComboBox.getItems().setAll(viewModel.getAllFields());
 
         fieldComboBox.getSelectionModel().selectFirst();
 
-        fieldComboBox
-            .valueProperty()
-            .bindBidirectional(viewModel.selectedFieldProperty());
+        fieldComboBox.valueProperty().bindBidirectional(viewModel.selectedFieldProperty());
         EasyBind.listen(
             fieldComboBox.getEditor().textProperty(),
             observable -> fieldComboBox.commitValue()
         );
 
-        fieldValueTextField
-            .textProperty()
-            .bindBidirectional(viewModel.fieldValueProperty());
+        fieldValueTextField.textProperty().bindBidirectional(viewModel.fieldValueProperty());
 
         overwriteFieldContentCheckBox
             .selectedProperty()
             .bindBidirectional(viewModel.overwriteFieldContentProperty());
 
-        appendValueButton
-            .disableProperty()
-            .bind(viewModel.canAppendProperty().not());
+        appendValueButton.disableProperty().bind(viewModel.canAppendProperty().not());
         setValueButton
             .disableProperty()
             .bind(viewModel.fieldValidationStatus().validProperty().not());
@@ -99,11 +84,7 @@ public void initialize() {
             .bind(viewModel.fieldValidationStatus().validProperty().not());
 
         Platform.runLater(() ->
-            visualizer.initVisualization(
-                viewModel.fieldValidationStatus(),
-                fieldComboBox,
-                true
-            )
+            visualizer.initVisualization(viewModel.fieldValidationStatus(), fieldComboBox, true)
         );
     }
 
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 f79896af404..f837515ce0b 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
@@ -26,8 +26,7 @@
 import org.jabref.model.entry.field.StandardField;
 import org.jabref.model.strings.StringUtil;
 
-public class EditFieldContentViewModel
-    extends AbstractAutomaticFieldEditorTabViewModel {
+public class EditFieldContentViewModel extends AbstractAutomaticFieldEditorTabViewModel {
 
     public static final int TAB_INDEX = 0;
 
@@ -35,11 +34,11 @@ public class EditFieldContentViewModel
 
     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 BooleanProperty overwriteFieldContent = new SimpleBooleanProperty(Boolean.FALSE);
 
     private final Validator fieldValidator;
     private final BooleanBinding canAppend;
@@ -57,9 +56,7 @@ public EditFieldContentViewModel(
                 selectedField,
                 field -> {
                     if (StringUtil.isBlank(field.getName())) {
-                        return ValidationMessage.error(
-                            "Field name cannot be empty"
-                        );
+                        return ValidationMessage.error("Field name cannot be empty");
                     } else if (StringUtil.containsWhitespace(field.getName())) {
                         return ValidationMessage.error(
                             "Field name cannot have whitespace characters"
@@ -70,10 +67,7 @@ public EditFieldContentViewModel(
             );
 
         canAppend =
-            Bindings.and(
-                overwriteFieldContentProperty(),
-                fieldValidationStatus().validProperty()
-            );
+            Bindings.and(overwriteFieldContentProperty(), fieldValidationStatus().validProperty());
     }
 
     public ValidationStatus fieldValidationStatus() {
@@ -85,21 +79,15 @@ public BooleanBinding canAppendProperty() {
     }
 
     public void clearSelectedField() {
-        NamedCompound clearFieldEdit = new NamedCompound(
-            "CLEAR_SELECTED_FIELD"
-        );
+        NamedCompound clearFieldEdit = new NamedCompound("CLEAR_SELECTED_FIELD");
         int affectedEntriesCount = 0;
         for (BibEntry entry : selectedEntries) {
-            Optional<String> oldFieldValue = entry.getField(
-                selectedField.get()
-            );
+            Optional<String> oldFieldValue = entry.getField(selectedField.get());
             if (oldFieldValue.isPresent()) {
                 entry
                     .clearField(selectedField.get())
                     .ifPresent(fieldChange ->
-                        clearFieldEdit.addEdit(
-                            new UndoableFieldChange(fieldChange)
-                        )
+                        clearFieldEdit.addEdit(new UndoableFieldChange(fieldChange))
                     );
                 affectedEntriesCount++;
             }
@@ -109,11 +97,7 @@ public void clearSelectedField() {
             clearFieldEdit.end();
         }
         stateManager.setLastAutomaticFieldEditorEdit(
-            new LastAutomaticFieldEditorEdit(
-                affectedEntriesCount,
-                TAB_INDEX,
-                clearFieldEdit
-            )
+            new LastAutomaticFieldEditorEdit(affectedEntriesCount, TAB_INDEX, clearFieldEdit)
         );
     }
 
@@ -122,16 +106,12 @@ public void setFieldValue() {
         String toSetFieldValue = fieldValue.getValue();
         int affectedEntriesCount = 0;
         for (BibEntry entry : selectedEntries) {
-            Optional<String> oldFieldValue = entry.getField(
-                selectedField.get()
-            );
+            Optional<String> oldFieldValue = entry.getField(selectedField.get());
             if (oldFieldValue.isEmpty() || overwriteFieldContent.get()) {
                 entry
                     .setField(selectedField.get(), toSetFieldValue)
                     .ifPresent(fieldChange ->
-                        setFieldEdit.addEdit(
-                            new UndoableFieldChange(fieldChange)
-                        )
+                        setFieldEdit.addEdit(new UndoableFieldChange(fieldChange))
                     );
                 fieldValue.set("");
                 // TODO: increment affected entries only when UndoableFieldChange.isPresent()
@@ -143,36 +123,24 @@ public void setFieldValue() {
             setFieldEdit.end();
         }
         stateManager.setLastAutomaticFieldEditorEdit(
-            new LastAutomaticFieldEditorEdit(
-                affectedEntriesCount,
-                TAB_INDEX,
-                setFieldEdit
-            )
+            new LastAutomaticFieldEditorEdit(affectedEntriesCount, TAB_INDEX, setFieldEdit)
         );
     }
 
     public void appendToFieldValue() {
-        NamedCompound appendToFieldEdit = new NamedCompound(
-            "APPEND_TO_SELECTED_FIELD"
-        );
+        NamedCompound appendToFieldEdit = new NamedCompound("APPEND_TO_SELECTED_FIELD");
         String toAppendFieldValue = fieldValue.getValue();
         int affectedEntriesCount = 0;
         for (BibEntry entry : selectedEntries) {
-            Optional<String> oldFieldValue = entry.getField(
-                selectedField.get()
-            );
+            Optional<String> oldFieldValue = entry.getField(selectedField.get());
             // Append button should be disabled if 'overwriteNonEmptyFields' is false
             if (overwriteFieldContent.get()) {
-                String newFieldValue = oldFieldValue
-                    .orElse("")
-                    .concat(toAppendFieldValue);
+                String newFieldValue = oldFieldValue.orElse("").concat(toAppendFieldValue);
 
                 entry
                     .setField(selectedField.get(), newFieldValue)
                     .ifPresent(fieldChange ->
-                        appendToFieldEdit.addEdit(
-                            new UndoableFieldChange(fieldChange)
-                        )
+                        appendToFieldEdit.addEdit(new UndoableFieldChange(fieldChange))
                     );
 
                 fieldValue.set("");
@@ -184,11 +152,7 @@ public void appendToFieldValue() {
             appendToFieldEdit.end();
         }
         stateManager.setLastAutomaticFieldEditorEdit(
-            new LastAutomaticFieldEditorEdit(
-                affectedEntriesCount,
-                TAB_INDEX,
-                appendToFieldEdit
-            )
+            new LastAutomaticFieldEditorEdit(affectedEntriesCount, TAB_INDEX, appendToFieldEdit)
         );
     }
 
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 2bc5bf4fe11..4f83bb3bb0a 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
@@ -49,29 +49,22 @@ public RenameFieldTabView(BibDatabase database, StateManager stateManager) {
 
     @FXML
     public void initialize() {
-        viewModel =
-            new RenameFieldViewModel(selectedEntries, database, stateManager);
+        viewModel = new RenameFieldViewModel(selectedEntries, database, stateManager);
 
         fieldComboBox.getItems().setAll(viewModel.getAllFields());
         fieldComboBox.getSelectionModel().selectFirst();
 
         fieldComboBox.setConverter(FIELD_STRING_CONVERTER);
 
-        fieldComboBox
-            .valueProperty()
-            .bindBidirectional(viewModel.selectedFieldProperty());
+        fieldComboBox.valueProperty().bindBidirectional(viewModel.selectedFieldProperty());
         EasyBind.listen(
             fieldComboBox.getEditor().textProperty(),
             observable -> fieldComboBox.commitValue()
         );
 
-        renameButton
-            .disableProperty()
-            .bind(viewModel.canRenameProperty().not());
+        renameButton.disableProperty().bind(viewModel.canRenameProperty().not());
 
-        newFieldNameTextField
-            .textProperty()
-            .bindBidirectional(viewModel.newFieldNameProperty());
+        newFieldNameTextField.textProperty().bindBidirectional(viewModel.newFieldNameProperty());
 
         Platform.runLater(() -> {
             visualizer.initVisualization(
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 620b9f90ea2..9fb3ecfe316 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
@@ -23,13 +23,13 @@
 import org.jabref.model.entry.field.StandardField;
 import org.jabref.model.strings.StringUtil;
 
-public class RenameFieldViewModel
-    extends AbstractAutomaticFieldEditorTabViewModel {
+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;
@@ -57,9 +57,7 @@ public RenameFieldViewModel(
                 newFieldName,
                 fieldName -> {
                     if (StringUtil.isBlank(fieldName)) {
-                        return ValidationMessage.error(
-                            "Field name cannot be empty"
-                        );
+                        return ValidationMessage.error("Field name cannot be empty");
                     } else if (StringUtil.containsWhitespace(fieldName)) {
                         return ValidationMessage.error(
                             "Field name cannot have whitespace characters"
@@ -132,11 +130,7 @@ public void renameField() {
         }
 
         stateManager.setLastAutomaticFieldEditorEdit(
-            new LastAutomaticFieldEditorEdit(
-                affectedEntriesCount,
-                TAB_INDEX,
-                renameEdit
-            )
+            new LastAutomaticFieldEditorEdit(affectedEntriesCount, TAB_INDEX, renameEdit)
         );
     }
 }
diff --git a/src/main/java/org/jabref/gui/entryeditor/CommentsTab.java b/src/main/java/org/jabref/gui/entryeditor/CommentsTab.java
index 224a77ccf64..298b5b6f715 100644
--- a/src/main/java/org/jabref/gui/entryeditor/CommentsTab.java
+++ b/src/main/java/org/jabref/gui/entryeditor/CommentsTab.java
@@ -60,8 +60,7 @@ public CommentsTab(
 
     @Override
     protected Set<Field> determineFieldsToShow(BibEntry entry) {
-        UserSpecificCommentField defaultCommentField =
-            new UserSpecificCommentField(defaultOwner);
+        UserSpecificCommentField defaultCommentField = new UserSpecificCommentField(defaultOwner);
 
         // As default: Show BibTeX comment field and the user-specific comment field of the default owner
         Set<Field> comments = new LinkedHashSet<>(
@@ -86,10 +85,7 @@ protected Set<Field> determineFieldsToShow(BibEntry entry) {
     protected void setupPanel(BibEntry entry, boolean compressed) {
         super.setupPanel(entry, compressed);
 
-        for (Map.Entry<
-            Field,
-            FieldEditorFX
-        > fieldEditorEntry : editors.entrySet()) {
+        for (Map.Entry<Field, FieldEditorFX> fieldEditorEntry : editors.entrySet()) {
             Field field = fieldEditorEntry.getKey();
             FieldEditorFX editor = fieldEditorEntry.getValue();
 
@@ -100,9 +96,7 @@ protected void setupPanel(BibEntry entry, boolean compressed) {
             } else {
                 editor
                     .getNode()
-                    .setDisable(
-                        !field.getName().equals(StandardField.COMMENT.getName())
-                    );
+                    .setDisable(!field.getName().equals(StandardField.COMMENT.getName()));
             }
         }
     }
diff --git a/src/main/java/org/jabref/gui/entryeditor/DeprecatedFieldsTab.java b/src/main/java/org/jabref/gui/entryeditor/DeprecatedFieldsTab.java
index 45047227232..27285cd8137 100644
--- a/src/main/java/org/jabref/gui/entryeditor/DeprecatedFieldsTab.java
+++ b/src/main/java/org/jabref/gui/entryeditor/DeprecatedFieldsTab.java
@@ -72,9 +72,7 @@ public DeprecatedFieldsTab(
                 } else {
                     setTooltip(
                         new Tooltip(
-                            Localization.lang(
-                                "Shows fields having a successor in biblatex."
-                            )
+                            Localization.lang("Shows fields having a successor in biblatex.")
                         )
                     );
                 }
@@ -86,10 +84,7 @@ public DeprecatedFieldsTab(
     @Override
     protected Set<Field> determineFieldsToShow(BibEntry entry) {
         BibDatabaseMode mode = databaseContext.getMode();
-        Optional<BibEntryType> entryType = entryTypesManager.enrich(
-            entry.getType(),
-            mode
-        );
+        Optional<BibEntryType> entryType = entryTypesManager.enrich(entry.getType(), mode);
         if (entryType.isPresent()) {
             return entryType
                 .get()
diff --git a/src/main/java/org/jabref/gui/entryeditor/EntryEditor.java b/src/main/java/org/jabref/gui/entryeditor/EntryEditor.java
index 2fe0e27fcb5..713bfc5c33e 100644
--- a/src/main/java/org/jabref/gui/entryeditor/EntryEditor.java
+++ b/src/main/java/org/jabref/gui/entryeditor/EntryEditor.java
@@ -73,9 +73,7 @@
  */
 public class EntryEditor extends BorderPane {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(
-        EntryEditor.class
-    );
+    private static final Logger LOGGER = LoggerFactory.getLogger(EntryEditor.class);
 
     private final LibraryTab libraryTab;
     private final BibDatabaseContext databaseContext;
@@ -145,8 +143,7 @@ public EntryEditor(LibraryTab libraryTab) {
 
         ViewLoader.view(this).root(this).load();
 
-        this.entryEditorPreferences =
-            preferencesService.getEntryEditorPreferences();
+        this.entryEditorPreferences = preferencesService.getEntryEditorPreferences();
         this.fileLinker =
             new ExternalFilesEntryLinker(
                 preferencesService.getFilePreferences(),
@@ -227,8 +224,7 @@ private void setupKeyBindings() {
         this.addEventHandler(
                 KeyEvent.KEY_PRESSED,
                 event -> {
-                    Optional<KeyBinding> keyBinding =
-                        keyBindingRepository.mapToKeyBinding(event);
+                    Optional<KeyBinding> keyBinding = keyBindingRepository.mapToKeyBinding(event);
                     if (keyBinding.isPresent()) {
                         switch (keyBinding.get()) {
                             case ENTRY_EDITOR_NEXT_PANEL:
@@ -283,14 +279,13 @@ private void deleteEntry() {
 
     @FXML
     void generateCiteKeyButton() {
-        GenerateCitationKeySingleAction action =
-            new GenerateCitationKeySingleAction(
-                getEntry(),
-                databaseContext,
-                dialogService,
-                preferencesService,
-                undoManager
-            );
+        GenerateCitationKeySingleAction action = new GenerateCitationKeySingleAction(
+            getEntry(),
+            databaseContext,
+            dialogService,
+            preferencesService,
+            undoManager
+        );
         action.execute();
     }
 
@@ -441,10 +436,7 @@ private List<EntryEditorTab> createTabs() {
         entryEditorTabList.remove(SciteTab.NAME);
         entryEditorTabList.remove("Comments");
         // Then show the remaining configured
-        for (Map.Entry<
-            String,
-            Set<Field>
-        > tab : entryEditorTabList.entrySet()) {
+        for (Map.Entry<String, Set<Field>> tab : entryEditorTabList.entrySet()) {
             entryEditorTabs.add(
                 new UserDefinedFieldsTab(
                     tab.getKey(),
@@ -465,9 +457,7 @@ private List<EntryEditorTab> createTabs() {
 
         // "Special" tabs
         entryEditorTabs.add(new MathSciNetTab());
-        entryEditorTabs.add(
-            new FileAnnotationTab(libraryTab.getAnnotationCache())
-        );
+        entryEditorTabs.add(new FileAnnotationTab(libraryTab.getAnnotationCache()));
         entryEditorTabs.add(
             new RelatedArticlesTab(
                 entryEditorPreferences,
@@ -504,12 +494,7 @@ private List<EntryEditorTab> createTabs() {
         entryEditorTabs.add(sourceTab);
 
         entryEditorTabs.add(
-            new LatexCitationsTab(
-                databaseContext,
-                preferencesService,
-                taskExecutor,
-                dialogService
-            )
+            new LatexCitationsTab(databaseContext, preferencesService, taskExecutor, dialogService)
         );
 
         entryEditorTabs.add(
@@ -521,9 +506,7 @@ private List<EntryEditorTab> createTabs() {
             )
         );
 
-        entryEditorTabs.add(
-            new SciteTab(preferencesService, taskExecutor, dialogService)
-        );
+        entryEditorTabs.add(new SciteTab(preferencesService, taskExecutor, dialogService));
 
         return entryEditorTabs;
     }
@@ -584,9 +567,7 @@ public void setEntry(BibEntry entry) {
 
         recalculateVisibleTabs();
         EasyBind.listen(
-            preferencesService
-                .getPreviewPreferences()
-                .showPreviewAsExtraTabProperty(),
+            preferencesService.getPreviewPreferences().showPreviewAsExtraTabProperty(),
             (obs, oldValue, newValue) -> recalculateVisibleTabs()
         );
 
@@ -605,8 +586,7 @@ public void setEntry(BibEntry entry) {
                 this.entry.typeProperty(),
                 type -> {
                     typeLabel.setText(
-                        new TypedBibEntry(entry, databaseContext.getMode())
-                            .getTypeForDisplay()
+                        new TypedBibEntry(entry, databaseContext.getMode()).getTypeForDisplay()
                     );
                     recalculateVisibleTabs();
                     getSelectedTab().notifyAboutFocus(entry);
@@ -620,10 +600,7 @@ private EntryEditorTab getSelectedTab() {
 
     private void setupToolBar() {
         // Update type label
-        TypedBibEntry typedEntry = new TypedBibEntry(
-            entry,
-            databaseContext.getMode()
-        );
+        TypedBibEntry typedEntry = new TypedBibEntry(entry, databaseContext.getMode());
         typeLabel.setText(typedEntry.getTypeForDisplay());
 
         // Add type change menu
@@ -635,28 +612,22 @@ private void setupToolBar() {
             bibEntryTypesManager
         )
             .asContextMenu();
-        typeLabel.setOnMouseClicked(event ->
-            typeMenu.show(typeLabel, Side.RIGHT, 0, 0)
-        );
+        typeLabel.setOnMouseClicked(event -> typeMenu.show(typeLabel, 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(
-                preferencesService.getImporterPreferences(),
-                preferencesService.getImportFormatPreferences(),
-                preferencesService.getFilePreferences(),
-                databaseContext
-            );
+        SortedSet<EntryBasedFetcher> entryBasedFetchers = WebFetchers.getEntryBasedFetchers(
+            preferencesService.getImporterPreferences(),
+            preferencesService.getImportFormatPreferences(),
+            preferencesService.getFilePreferences(),
+            databaseContext
+        );
         for (EntryBasedFetcher fetcher : entryBasedFetchers) {
             MenuItem fetcherMenuItem = new MenuItem(fetcher.getName());
-            if (
-                fetcher instanceof
-                PdfMergeMetadataImporter.EntryBasedFetcherWrapper
-            ) {
+            if (fetcher instanceof PdfMergeMetadataImporter.EntryBasedFetcherWrapper) {
                 // Handle Grobid Opt-In in case of the PdfMergeMetadataImporter
                 fetcherMenuItem.setOnAction(event -> {
                     GrobidOptInDialogHelper.showAndWaitIfUserIsUndecided(
@@ -677,9 +648,7 @@ private void setupToolBar() {
             fetcherMenu.getItems().add(fetcherMenuItem);
         }
 
-        fetcherButton.setOnMouseClicked(event ->
-            fetcherMenu.show(fetcherButton, Side.RIGHT, 0, 0)
-        );
+        fetcherButton.setOnMouseClicked(event -> fetcherMenu.show(fetcherButton, Side.RIGHT, 0, 0));
     }
 
     private void fetchAndMerge(EntryBasedFetcher fetcher) {
diff --git a/src/main/java/org/jabref/gui/entryeditor/EntryEditorPreferences.java b/src/main/java/org/jabref/gui/entryeditor/EntryEditorPreferences.java
index c8633710c34..bf149179e55 100644
--- a/src/main/java/org/jabref/gui/entryeditor/EntryEditorPreferences.java
+++ b/src/main/java/org/jabref/gui/entryeditor/EntryEditorPreferences.java
@@ -30,9 +30,7 @@ public static JournalPopupEnabled fromString(String status) {
                     return value;
                 }
             }
-            throw new IllegalArgumentException(
-                "No enum found with value: " + status
-            );
+            throw new IllegalArgumentException("No enum found with value: " + status);
         }
     }
 
@@ -64,24 +62,15 @@ public EntryEditorPreferences(
         boolean showSciteTab
     ) {
         this.entryEditorTabList =
-            new SimpleMapProperty<>(
-                FXCollections.observableMap(entryEditorTabList)
-            );
+            new SimpleMapProperty<>(FXCollections.observableMap(entryEditorTabList));
         this.defaultEntryEditorTabList =
-            new SimpleMapProperty<>(
-                FXCollections.observableMap(defaultEntryEditorTabList)
-            );
-        this.shouldOpenOnNewEntry =
-            new SimpleBooleanProperty(shouldOpenOnNewEntry);
-        this.shouldShowRecommendationsTab =
-            new SimpleBooleanProperty(shouldShowRecommendationsTab);
-        this.shouldShowLatexCitationsTab =
-            new SimpleBooleanProperty(shouldShowLatexCitationsTab);
-        this.showSourceTabByDefault =
-            new SimpleBooleanProperty(showSourceTabByDefault);
+            new SimpleMapProperty<>(FXCollections.observableMap(defaultEntryEditorTabList));
+        this.shouldOpenOnNewEntry = new SimpleBooleanProperty(shouldOpenOnNewEntry);
+        this.shouldShowRecommendationsTab = new SimpleBooleanProperty(shouldShowRecommendationsTab);
+        this.shouldShowLatexCitationsTab = new SimpleBooleanProperty(shouldShowLatexCitationsTab);
+        this.showSourceTabByDefault = new SimpleBooleanProperty(showSourceTabByDefault);
         this.enableValidation = new SimpleBooleanProperty(enableValidation);
-        this.allowIntegerEditionBibtex =
-            new SimpleBooleanProperty(allowIntegerEditionBibtex);
+        this.allowIntegerEditionBibtex = new SimpleBooleanProperty(allowIntegerEditionBibtex);
         this.dividerPosition = new SimpleDoubleProperty(dividerPosition);
         this.autoLinkFiles = new SimpleBooleanProperty(autolinkFilesEnabled);
         this.enablementStatus = new SimpleObjectProperty<>(journalPopupEnabled);
@@ -96,12 +85,8 @@ public MapProperty<String, Set<Field>> entryEditorTabs() {
         return entryEditorTabList;
     }
 
-    public void setEntryEditorTabList(
-        Map<String, Set<Field>> entryEditorTabList
-    ) {
-        this.entryEditorTabList.set(
-                FXCollections.observableMap(entryEditorTabList)
-            );
+    public void setEntryEditorTabList(Map<String, Set<Field>> entryEditorTabList) {
+        this.entryEditorTabList.set(FXCollections.observableMap(entryEditorTabList));
     }
 
     public ObservableMap<String, Set<Field>> getDefaultEntryEditorTabs() {
@@ -128,9 +113,7 @@ public BooleanProperty shouldShowRecommendationsTabProperty() {
         return shouldShowRecommendationsTab;
     }
 
-    public void setShouldShowRecommendationsTab(
-        boolean shouldShowRecommendationsTab
-    ) {
+    public void setShouldShowRecommendationsTab(boolean shouldShowRecommendationsTab) {
         this.shouldShowRecommendationsTab.set(shouldShowRecommendationsTab);
     }
 
@@ -142,9 +125,7 @@ public BooleanProperty shouldShowLatexCitationsTabProperty() {
         return shouldShowLatexCitationsTab;
     }
 
-    public void setShouldShowLatexCitationsTab(
-        boolean shouldShowLatexCitationsTab
-    ) {
+    public void setShouldShowLatexCitationsTab(boolean shouldShowLatexCitationsTab) {
         this.shouldShowLatexCitationsTab.set(shouldShowLatexCitationsTab);
     }
 
@@ -180,9 +161,7 @@ public BooleanProperty allowIntegerEditionBibtexProperty() {
         return allowIntegerEditionBibtex;
     }
 
-    public void setAllowIntegerEditionBibtex(
-        boolean allowIntegerEditionBibtex
-    ) {
+    public void setAllowIntegerEditionBibtex(boolean allowIntegerEditionBibtex) {
         this.allowIntegerEditionBibtex.set(allowIntegerEditionBibtex);
     }
 
diff --git a/src/main/java/org/jabref/gui/entryeditor/EntryEditorTab.java b/src/main/java/org/jabref/gui/entryeditor/EntryEditorTab.java
index a91f6d6701b..bf7cce72987 100644
--- a/src/main/java/org/jabref/gui/entryeditor/EntryEditorTab.java
+++ b/src/main/java/org/jabref/gui/entryeditor/EntryEditorTab.java
@@ -35,10 +35,7 @@ protected void handleFocus() {
      * Notifies the tab that it got focus and should display the given entry.
      */
     public void notifyAboutFocus(BibEntry entry) {
-        if (
-            !entry.equals(currentEntry) ||
-            !entry.getType().equals(currentEntryType)
-        ) {
+        if (!entry.equals(currentEntry) || !entry.getType().equals(currentEntryType)) {
             currentEntry = entry;
             currentEntryType = entry.getType();
             bindToEntry(entry);
diff --git a/src/main/java/org/jabref/gui/entryeditor/FieldsEditorTab.java b/src/main/java/org/jabref/gui/entryeditor/FieldsEditorTab.java
index 6e8efb2843a..3ba8be1e669 100644
--- a/src/main/java/org/jabref/gui/entryeditor/FieldsEditorTab.java
+++ b/src/main/java/org/jabref/gui/entryeditor/FieldsEditorTab.java
@@ -79,25 +79,16 @@ public FieldsEditorTab(
         this.preferences = Objects.requireNonNull(preferences);
         this.themeManager = themeManager;
         this.taskExecutor = Objects.requireNonNull(taskExecutor);
-        this.journalAbbreviationRepository =
-            Objects.requireNonNull(journalAbbreviationRepository);
+        this.journalAbbreviationRepository = Objects.requireNonNull(journalAbbreviationRepository);
         this.stateManager = stateManager;
         this.indexingTaskManager = indexingTaskManager;
     }
 
-    private static void addColumn(
-        GridPane gridPane,
-        int columnIndex,
-        List<Label> nodes
-    ) {
+    private static void addColumn(GridPane gridPane, int columnIndex, List<Label> nodes) {
         gridPane.addColumn(columnIndex, nodes.toArray(new Node[0]));
     }
 
-    private static void addColumn(
-        GridPane gridPane,
-        int columnIndex,
-        Stream<Parent> nodes
-    ) {
+    private static void addColumn(GridPane gridPane, int columnIndex, Stream<Parent> nodes) {
         gridPane.addColumn(columnIndex, nodes.toArray(Node[]::new));
     }
 
@@ -148,11 +139,7 @@ protected void setupPanel(BibEntry entry, boolean compressed) {
             addColumn(
                 gridPane,
                 1,
-                editors
-                    .values()
-                    .stream()
-                    .map(FieldEditorFX::getNode)
-                    .limit(rows)
+                editors.values().stream().map(FieldEditorFX::getNode).limit(rows)
             );
             addColumn(
                 gridPane,
@@ -174,15 +161,9 @@ protected void setupPanel(BibEntry entry, boolean compressed) {
             setCompressedRowLayout(gridPane, rows);
         } else {
             addColumn(gridPane, 0, labels);
-            addColumn(
-                gridPane,
-                1,
-                editors.values().stream().map(FieldEditorFX::getNode)
-            );
+            addColumn(gridPane, 1, editors.values().stream().map(FieldEditorFX::getNode));
 
-            gridPane
-                .getColumnConstraints()
-                .addAll(columnDoNotContract, columnExpand);
+            gridPane.getColumnConstraints().addAll(columnDoNotContract, columnExpand);
 
             setRegularRowLayout(gridPane);
         }
@@ -199,9 +180,7 @@ private void setRegularRowLayout(GridPane gridPane) {
             RowConstraints rowExpand = new RowConstraints();
             rowExpand.setVgrow(Priority.ALWAYS);
             rowExpand.setValignment(VPos.TOP);
-            rowExpand.setPercentHeight(
-                (100 * editors.get(field).getWeight()) / totalWeight
-            );
+            rowExpand.setPercentHeight((100 * editors.get(field).getWeight()) / totalWeight);
             constraints.add(rowExpand);
         }
         gridPane.getRowConstraints().addAll(constraints);
@@ -287,9 +266,7 @@ private void initPanel() {
                     taskExecutor
                 );
             EasyBind.subscribe(
-                preferences
-                    .getPreviewPreferences()
-                    .showPreviewAsExtraTabProperty(),
+                preferences.getPreviewPreferences().showPreviewAsExtraTabProperty(),
                 show -> {
                     if (show) {
                         container.getItems().remove(previewPanel);
diff --git a/src/main/java/org/jabref/gui/entryeditor/LatexCitationsTab.java b/src/main/java/org/jabref/gui/entryeditor/LatexCitationsTab.java
index d5f2dd1ea0e..18a5f4492cb 100644
--- a/src/main/java/org/jabref/gui/entryeditor/LatexCitationsTab.java
+++ b/src/main/java/org/jabref/gui/entryeditor/LatexCitationsTab.java
@@ -50,11 +50,7 @@ public LatexCitationsTab(
 
         setText(Localization.lang("LaTeX Citations"));
         setTooltip(
-            new Tooltip(
-                Localization.lang(
-                    "Search citations for this entry in LaTeX files"
-                )
-            )
+            new Tooltip(Localization.lang("Search citations for this entry in LaTeX files"))
         );
         setGraphic(IconTheme.JabRefIcons.LATEX_CITATIONS.getGraphicNode());
         setSearchPane();
@@ -62,9 +58,7 @@ public LatexCitationsTab(
 
     private void setSearchPane() {
         progressIndicator.setMaxSize(100, 100);
-        citationsDisplay
-            .basePathProperty()
-            .bindBidirectional(viewModel.directoryProperty());
+        citationsDisplay.basePathProperty().bindBidirectional(viewModel.directoryProperty());
         citationsDisplay.setItems(viewModel.getCitationList());
 
         RowConstraints mainRow = new RowConstraints();
@@ -106,23 +100,14 @@ private void setSearchPane() {
     }
 
     private HBox getLatexDirectoryBox() {
-        Text latexDirectoryText = new Text(
-            Localization.lang("Current search directory:")
-        );
-        Text latexDirectoryPath = new Text(
-            viewModel.directoryProperty().get().toString()
-        );
-        latexDirectoryPath.setStyle(
-            "-fx-font-family:monospace;-fx-font-weight: bold;"
-        );
-        Button latexDirectoryButton = new Button(
-            Localization.lang("Set LaTeX file directory")
-        );
+        Text latexDirectoryText = new Text(Localization.lang("Current search directory:"));
+        Text latexDirectoryPath = new Text(viewModel.directoryProperty().get().toString());
+        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.setOnAction(event -> viewModel.setLatexDirectory()
-        );
+        latexDirectoryButton.setOnAction(event -> viewModel.setLatexDirectory());
         HBox latexDirectoryBox = new HBox(
             10,
             latexDirectoryText,
@@ -144,9 +129,7 @@ private VBox getNotFoundPane() {
         titleLabel.getStyleClass().add("heading");
 
         Text notFoundText = new Text(
-            Localization.lang(
-                "No LaTeX files containing this entry were found."
-            )
+            Localization.lang("No LaTeX files containing this entry were found.")
         );
         notFoundText.getStyleClass().add("description");
 
diff --git a/src/main/java/org/jabref/gui/entryeditor/LatexCitationsTabViewModel.java b/src/main/java/org/jabref/gui/entryeditor/LatexCitationsTabViewModel.java
index e5a8bd4174a..cad0a3249b9 100644
--- a/src/main/java/org/jabref/gui/entryeditor/LatexCitationsTabViewModel.java
+++ b/src/main/java/org/jabref/gui/entryeditor/LatexCitationsTabViewModel.java
@@ -39,9 +39,7 @@ enum Status {
         ERROR,
     }
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(
-        LatexCitationsTabViewModel.class
-    );
+    private static final Logger LOGGER = LoggerFactory.getLogger(LatexCitationsTabViewModel.class);
     private static final String TEX_EXT = ".tex";
     private final BibDatabaseContext databaseContext;
     private final PreferencesService preferencesService;
@@ -69,15 +67,11 @@ public LatexCitationsTabViewModel(
             new SimpleObjectProperty<>(
                 databaseContext
                     .getMetaData()
-                    .getLatexFileDirectory(
-                        preferencesService.getFilePreferences().getUserAndHost()
-                    )
+                    .getLatexFileDirectory(preferencesService.getFilePreferences().getUserAndHost())
                     .orElse(
                         FileUtil.getInitialDirectory(
                             databaseContext,
-                            preferencesService
-                                .getFilePreferences()
-                                .getWorkingDirectory()
+                            preferencesService.getFilePreferences().getWorkingDirectory()
                         )
                     )
             );
@@ -96,9 +90,7 @@ public void init(BibEntry entry) {
             startSearch(citeKey.get());
         } else {
             searchError.set(
-                Localization.lang(
-                    "Selected entry does not have an associated citation key."
-                )
+                Localization.lang("Selected entry does not have an associated citation key.")
             );
             status.set(Status.ERROR);
         }
@@ -127,11 +119,7 @@ private void startSearch(String citeKey) {
                 .onRunning(() -> status.set(Status.IN_PROGRESS))
                 .onSuccess(result -> {
                     citationList.setAll(result);
-                    status.set(
-                        citationList.isEmpty()
-                            ? Status.NO_RESULTS
-                            : Status.CITATIONS_FOUND
-                    );
+                    status.set(citationList.isEmpty() ? Status.NO_RESULTS : Status.CITATIONS_FOUND);
                 })
                 .onFailure(error -> {
                     searchError.set(error.getMessage());
@@ -141,11 +129,7 @@ private void startSearch(String citeKey) {
     }
 
     private void cancelSearch() {
-        if (
-            searchTask == null ||
-            searchTask.isCancelled() ||
-            searchTask.isDone()
-        ) {
+        if (searchTask == null || searchTask.isCancelled() || searchTask.isDone()) {
             return;
         }
 
@@ -153,34 +137,24 @@ private void cancelSearch() {
         searchTask.cancel(true);
     }
 
-    private Collection<Citation> searchAndParse(String citeKey)
-        throws IOException {
+    private Collection<Citation> searchAndParse(String citeKey) throws IOException {
         // we need to check whether the user meanwhile set the LaTeX file directory or the database changed locations
         Path newDirectory = databaseContext
             .getMetaData()
-            .getLatexFileDirectory(
-                preferencesService.getFilePreferences().getUserAndHost()
-            )
+            .getLatexFileDirectory(preferencesService.getFilePreferences().getUserAndHost())
             .orElse(
                 FileUtil.getInitialDirectory(
                     databaseContext,
-                    preferencesService
-                        .getFilePreferences()
-                        .getWorkingDirectory()
+                    preferencesService.getFilePreferences().getWorkingDirectory()
                 )
             );
 
-        if (
-            latexParserResult == null || !newDirectory.equals(directory.get())
-        ) {
+        if (latexParserResult == null || !newDirectory.equals(directory.get())) {
             directory.set(newDirectory);
 
             if (!newDirectory.toFile().exists()) {
                 throw new IOException(
-                    String.format(
-                        "Current search directory does not exist: %s",
-                        newDirectory
-                    )
+                    String.format("Current search directory does not exist: %s", newDirectory)
                 );
             }
 
@@ -221,9 +195,7 @@ public void setLatexDirectory() {
                 databaseContext
                     .getMetaData()
                     .setLatexFileDirectory(
-                        preferencesService
-                            .getFilePreferences()
-                            .getUserAndHost(),
+                        preferencesService.getFilePreferences().getUserAndHost(),
                         selectedDirectory.toAbsolutePath()
                     )
             );
@@ -232,8 +204,6 @@ public void setLatexDirectory() {
     }
 
     public boolean shouldShow() {
-        return preferencesService
-            .getEntryEditorPreferences()
-            .shouldShowLatexCitationsTab();
+        return preferencesService.getEntryEditorPreferences().shouldShowLatexCitationsTab();
     }
 }
diff --git a/src/main/java/org/jabref/gui/entryeditor/MathSciNetTab.java b/src/main/java/org/jabref/gui/entryeditor/MathSciNetTab.java
index 1ecc6db0060..be3bbb18ac7 100644
--- a/src/main/java/org/jabref/gui/entryeditor/MathSciNetTab.java
+++ b/src/main/java/org/jabref/gui/entryeditor/MathSciNetTab.java
@@ -19,9 +19,7 @@ public MathSciNetTab() {
     }
 
     private Optional<MathSciNetId> getMathSciNetId(BibEntry entry) {
-        return entry
-            .getField(StandardField.MR_NUMBER)
-            .flatMap(MathSciNetId::parse);
+        return entry.getField(StandardField.MR_NUMBER).flatMap(MathSciNetId::parse);
     }
 
     private StackPane getPane(BibEntry entry) {
diff --git a/src/main/java/org/jabref/gui/entryeditor/OpenEntryEditorAction.java b/src/main/java/org/jabref/gui/entryeditor/OpenEntryEditorAction.java
index 2238c3cc398..4fe0a8101b4 100644
--- a/src/main/java/org/jabref/gui/entryeditor/OpenEntryEditorAction.java
+++ b/src/main/java/org/jabref/gui/entryeditor/OpenEntryEditorAction.java
@@ -19,9 +19,7 @@ public OpenEntryEditorAction(JabRefFrame frame, StateManager stateManager) {
 
     public void execute() {
         if (!stateManager.getSelectedEntries().isEmpty()) {
-            frame
-                .getCurrentLibraryTab()
-                .showAndEdit(stateManager.getSelectedEntries().get(0));
+            frame.getCurrentLibraryTab().showAndEdit(stateManager.getSelectedEntries().get(0));
         }
     }
 }
diff --git a/src/main/java/org/jabref/gui/entryeditor/OptionalFieldsTabBase.java b/src/main/java/org/jabref/gui/entryeditor/OptionalFieldsTabBase.java
index 28f29a18b51..b7d2942fbbc 100644
--- a/src/main/java/org/jabref/gui/entryeditor/OptionalFieldsTabBase.java
+++ b/src/main/java/org/jabref/gui/entryeditor/OptionalFieldsTabBase.java
@@ -65,17 +65,12 @@ public OptionalFieldsTabBase(
     @Override
     protected Set<Field> determineFieldsToShow(BibEntry entry) {
         BibDatabaseMode mode = databaseContext.getMode();
-        Optional<BibEntryType> entryType = entryTypesManager.enrich(
-            entry.getType(),
-            mode
-        );
+        Optional<BibEntryType> entryType = entryTypesManager.enrich(entry.getType(), mode);
         if (entryType.isPresent()) {
             if (isPrimaryOptionalFields) {
                 return entryType.get().getPrimaryOptionalFields();
             } else {
-                return entryType
-                    .get()
-                    .getSecondaryOptionalNotDeprecatedFields(mode);
+                return entryType.get().getSecondaryOptionalNotDeprecatedFields(mode);
             }
         } else {
             // Entry type unknown -> treat all fields as required
diff --git a/src/main/java/org/jabref/gui/entryeditor/OtherFieldsTab.java b/src/main/java/org/jabref/gui/entryeditor/OtherFieldsTab.java
index 2e06ef41205..482ad9b8de1 100644
--- a/src/main/java/org/jabref/gui/entryeditor/OtherFieldsTab.java
+++ b/src/main/java/org/jabref/gui/entryeditor/OtherFieldsTab.java
@@ -78,10 +78,7 @@ public OtherFieldsTab(
     @Override
     protected Set<Field> determineFieldsToShow(BibEntry entry) {
         BibDatabaseMode mode = databaseContext.getMode();
-        Optional<BibEntryType> entryType = entryTypesManager.enrich(
-            entry.getType(),
-            mode
-        );
+        Optional<BibEntryType> entryType = entryTypesManager.enrich(entry.getType(), mode);
         if (entryType.isPresent()) {
             Set<Field> allKnownFields = entryType.get().getAllFields();
             Set<Field> otherFields = entry
diff --git a/src/main/java/org/jabref/gui/entryeditor/PreviewSwitchAction.java b/src/main/java/org/jabref/gui/entryeditor/PreviewSwitchAction.java
index 5bac51cfb78..495cc84413d 100644
--- a/src/main/java/org/jabref/gui/entryeditor/PreviewSwitchAction.java
+++ b/src/main/java/org/jabref/gui/entryeditor/PreviewSwitchAction.java
@@ -16,11 +16,7 @@ public enum Direction {
     private final JabRefFrame frame;
     private final Direction direction;
 
-    public PreviewSwitchAction(
-        Direction direction,
-        JabRefFrame frame,
-        StateManager stateManager
-    ) {
+    public PreviewSwitchAction(Direction direction, JabRefFrame frame, StateManager stateManager) {
         this.frame = frame;
         this.direction = direction;
 
@@ -32,10 +28,7 @@ public void execute() {
         if (direction == Direction.NEXT) {
             frame.getCurrentLibraryTab().getEntryEditor().nextPreviewStyle();
         } else {
-            frame
-                .getCurrentLibraryTab()
-                .getEntryEditor()
-                .previousPreviewStyle();
+            frame.getCurrentLibraryTab().getEntryEditor().previousPreviewStyle();
         }
     }
 }
diff --git a/src/main/java/org/jabref/gui/entryeditor/PreviewTab.java b/src/main/java/org/jabref/gui/entryeditor/PreviewTab.java
index ff17cb89e56..eb99000aecd 100644
--- a/src/main/java/org/jabref/gui/entryeditor/PreviewTab.java
+++ b/src/main/java/org/jabref/gui/entryeditor/PreviewTab.java
@@ -61,9 +61,7 @@ protected void previousPreviewStyle() {
 
     @Override
     public boolean shouldShow(BibEntry entry) {
-        return preferences
-            .getPreviewPreferences()
-            .shouldShowPreviewAsExtraTab();
+        return preferences.getPreviewPreferences().shouldShowPreviewAsExtraTab();
     }
 
     @Override
diff --git a/src/main/java/org/jabref/gui/entryeditor/RelatedArticlesTab.java b/src/main/java/org/jabref/gui/entryeditor/RelatedArticlesTab.java
index b04068f5a84..4c3de6c102b 100644
--- a/src/main/java/org/jabref/gui/entryeditor/RelatedArticlesTab.java
+++ b/src/main/java/org/jabref/gui/entryeditor/RelatedArticlesTab.java
@@ -39,9 +39,7 @@
 public class RelatedArticlesTab extends EntryEditorTab {
 
     public static final String NAME = "Related articles";
-    private static final Logger LOGGER = LoggerFactory.getLogger(
-        RelatedArticlesTab.class
-    );
+    private static final Logger LOGGER = LoggerFactory.getLogger(RelatedArticlesTab.class);
     private final EntryEditorPreferences preferences;
     private final DialogService dialogService;
     private final PreferencesService preferencesService;
@@ -83,15 +81,11 @@ private StackPane getRelatedArticlesPane(BibEntry entry) {
             .onRunning(() -> progress.setVisible(true))
             .onSuccess(relatedArticles -> {
                 ImportCleanup cleanup = ImportCleanup.targeting(
-                    BibDatabaseModeDetection.inferMode(
-                        new BibDatabase(List.of(entry))
-                    )
+                    BibDatabaseModeDetection.inferMode(new BibDatabase(List.of(entry)))
                 );
                 cleanup.doPostCleanup(relatedArticles);
                 progress.setVisible(false);
-                root
-                    .getChildren()
-                    .add(getRelatedArticleInfo(relatedArticles, fetcher));
+                root.getChildren().add(getRelatedArticleInfo(relatedArticles, fetcher));
             })
             .onFailure(exception -> {
                 LOGGER.error("Error while fetching from Mr. DLib", exception);
@@ -111,10 +105,7 @@ private StackPane getRelatedArticlesPane(BibEntry entry) {
      * @param list List of BibEntries of related articles
      * @return VBox of related article descriptions to be displayed in the Related Articles tab
      */
-    private ScrollPane getRelatedArticleInfo(
-        List<BibEntry> list,
-        MrDLibFetcher fetcher
-    ) {
+    private ScrollPane getRelatedArticleInfo(List<BibEntry> list, MrDLibFetcher fetcher) {
         ScrollPane scrollPane = new ScrollPane();
 
         VBox vBox = new VBox();
@@ -168,9 +159,7 @@ private ScrollPane getRelatedArticleInfo(
                 }
             });
 
-            hBox
-                .getChildren()
-                .addAll(titleLink, journalText, authorsText, yearText);
+            hBox.getChildren().addAll(titleLink, journalText, authorsText, yearText);
             vBox.getChildren().add(hBox);
         }
         scrollPane.setContent(vBox);
@@ -189,9 +178,7 @@ private ScrollPane getErrorInfo() {
         vBox.setSpacing(20.0);
 
         Text descriptionText = new Text(
-            Localization.lang(
-                "No recommendations received from Mr. DLib for this entry."
-            )
+            Localization.lang("No recommendations received from Mr. DLib for this entry.")
         );
         descriptionText.getStyleClass().add("description");
         vBox.getChildren().add(descriptionText);
@@ -234,15 +221,11 @@ private ScrollPane getPrivacyDialog(BibEntry entry) {
         );
         line2.wrappingWidthProperty().bind(rootWidth);
         Text line3 = new Text(
-            Localization.lang(
-                "This setting may be changed in preferences at any time."
-            )
+            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."
-            )
+            Localization.lang("Further information about Mr. DLib for JabRef users.")
         );
         mdlLink.setOnAction(event -> {
             try {
@@ -251,18 +234,13 @@ private ScrollPane getPrivacyDialog(BibEntry entry) {
                     preferencesService.getFilePreferences()
                 );
             } catch (IOException e) {
-                LOGGER.error(
-                    "Error opening the browser to Mr. DLib information page.",
-                    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.)"
-            )
+            Localization.lang("Entry Title (Required to deliver recommendations.)")
         );
         cbTitle.setSelected(true);
         cbTitle.setDisable(true);
@@ -288,14 +266,11 @@ private ScrollPane getPrivacyDialog(BibEntry entry) {
                 "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.getChildren().addAll(cbTitle, cbVersion, cbLanguage, cbOS, cbTimezone);
         vb.setSpacing(10);
 
         button.setOnAction(event -> {
-            MrDlibPreferences mrDlibPreferences =
-                preferencesService.getMrDlibPreferences();
+            MrDlibPreferences mrDlibPreferences = preferencesService.getMrDlibPreferences();
             mrDlibPreferences.setAcceptRecommendations(true);
             mrDlibPreferences.setSendLanguage(cbLanguage.isSelected());
             mrDlibPreferences.setSendOs(cbOS.isSelected());
@@ -303,16 +278,12 @@ private ScrollPane getPrivacyDialog(BibEntry entry) {
 
             dialogService.showWarningDialogAndWait(
                 Localization.lang("Restart"),
-                Localization.lang(
-                    "Please restart JabRef for preferences to take effect."
-                )
+                Localization.lang("Please restart JabRef for preferences to take effect.")
             );
             setContent(getRelatedArticlesPane(entry));
         });
 
-        vbox
-            .getChildren()
-            .addAll(title, line1, line2, mdlLink, line3, vb, button);
+        vbox.getChildren().addAll(title, line1, line2, mdlLink, line3, vb, button);
         root.setContent(vbox);
 
         return root;
@@ -326,11 +297,7 @@ public boolean shouldShow(BibEntry entry) {
     @Override
     protected void bindToEntry(BibEntry entry) {
         // Ask for consent to send data to Mr. DLib on first time to tab
-        if (
-            preferencesService
-                .getMrDlibPreferences()
-                .shouldAcceptRecommendations()
-        ) {
+        if (preferencesService.getMrDlibPreferences().shouldAcceptRecommendations()) {
             setContent(getRelatedArticlesPane(entry));
         } else {
             setContent(getPrivacyDialog(entry));
diff --git a/src/main/java/org/jabref/gui/entryeditor/SciteTab.java b/src/main/java/org/jabref/gui/entryeditor/SciteTab.java
index cf8ce783aea..bab515f5125 100644
--- a/src/main/java/org/jabref/gui/entryeditor/SciteTab.java
+++ b/src/main/java/org/jabref/gui/entryeditor/SciteTab.java
@@ -24,8 +24,7 @@
 public class SciteTab extends EntryEditorTab {
 
     public static final String NAME = "Scite";
-    public static final String SCITE_REPORTS_URL_BASE =
-        "https://scite.ai/reports/";
+    public static final String SCITE_REPORTS_URL_BASE = "https://scite.ai/reports/";
 
     private final GridPane sciteResultsPane;
     private final ProgressIndicator progressIndicator;
@@ -39,17 +38,12 @@ public SciteTab(
         DialogService dialogService
     ) {
         this.preferencesService = preferencesService;
-        this.viewModel =
-            new SciteTabViewModel(preferencesService, taskExecutor);
+        this.viewModel = new SciteTabViewModel(preferencesService, taskExecutor);
         this.dialogService = dialogService;
         this.sciteResultsPane = new GridPane();
         this.progressIndicator = new ProgressIndicator();
         setText(NAME);
-        setTooltip(
-            new Tooltip(
-                Localization.lang("Search scite.ai for Smart Citations")
-            )
-        );
+        setTooltip(new Tooltip(Localization.lang("Search scite.ai for Smart Citations")));
         setSciteResultsPane();
     }
 
@@ -70,16 +64,10 @@ private void setSciteResultsPane() {
             status -> {
                 sciteResultsPane.getChildren().clear();
                 switch (status) {
-                    case IN_PROGRESS -> sciteResultsPane.add(
-                        progressIndicator,
-                        0,
-                        0
-                    );
+                    case IN_PROGRESS -> sciteResultsPane.add(progressIndicator, 0, 0);
                     case FOUND -> viewModel
                         .getCurrentResult()
-                        .ifPresent(result ->
-                            sciteResultsPane.add(getTalliesPane(result), 0, 0)
-                        );
+                        .ifPresent(result -> sciteResultsPane.add(getTalliesPane(result), 0, 0));
                     case ERROR -> sciteResultsPane.add(getErrorPane(), 0, 0);
                 }
             }
@@ -106,9 +94,7 @@ private VBox getErrorPane() {
     }
 
     private VBox getTalliesPane(SciteTallyModel tallModel) {
-        Label titleLabel = new Label(
-            Localization.lang("Tallies for %0", tallModel.doi())
-        );
+        Label titleLabel = new Label(Localization.lang("Tallies for %0", tallModel.doi()));
         titleLabel.getStyleClass().add("scite-tallies-label");
         Text message = new Text(
             String.format(
@@ -123,17 +109,14 @@ private VBox getTalliesPane(SciteTallyModel tallModel) {
         );
 
         String url =
-            SCITE_REPORTS_URL_BASE +
-            URLEncoder.encode(tallModel.doi(), StandardCharsets.UTF_8);
+            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;
     }
 
     private VBox getMessageBox(String url, Label titleLabel, Text message) {
-        HyperlinkLabel link = new HyperlinkLabel(
-            Localization.lang("See full report at [%0]", url)
-        );
+        HyperlinkLabel link = new HyperlinkLabel(Localization.lang("See full report at [%0]", url));
         link.setOnAction(event -> {
             if (event.getSource() instanceof Hyperlink) {
                 var filePreferences = preferencesService.getFilePreferences();
diff --git a/src/main/java/org/jabref/gui/entryeditor/SciteTabViewModel.java b/src/main/java/org/jabref/gui/entryeditor/SciteTabViewModel.java
index 65f44b40354..8298d2bd6b7 100644
--- a/src/main/java/org/jabref/gui/entryeditor/SciteTabViewModel.java
+++ b/src/main/java/org/jabref/gui/entryeditor/SciteTabViewModel.java
@@ -43,10 +43,7 @@ public enum SciteStatus {
 
     private Future<?> searchTask;
 
-    public SciteTabViewModel(
-        PreferencesService preferencesService,
-        TaskExecutor taskExecutor
-    ) {
+    public SciteTabViewModel(PreferencesService preferencesService, TaskExecutor taskExecutor) {
         this.preferencesService = preferencesService;
         this.taskExecutor = taskExecutor;
         this.status = new SimpleObjectProperty<>(SciteStatus.IN_PROGRESS);
@@ -54,9 +51,7 @@ public SciteTabViewModel(
     }
 
     public boolean shouldShow() {
-        return preferencesService
-            .getEntryEditorPreferences()
-            .shouldShowSciteTab();
+        return preferencesService.getEntryEditorPreferences().shouldShowSciteTab();
     }
 
     public void bindToEntry(BibEntry entry) {
@@ -71,9 +66,7 @@ public void bindToEntry(BibEntry entry) {
 
         // The scite.ai api requires a DOI
         if (entry.getDOI().isEmpty()) {
-            searchError.set(
-                Localization.lang("This entry does not have a DOI")
-            );
+            searchError.set(Localization.lang("This entry does not have a DOI"));
             status.set(SciteStatus.ERROR);
             return;
         }
@@ -94,11 +87,7 @@ public void bindToEntry(BibEntry entry) {
     }
 
     private void cancelSearch() {
-        if (
-            searchTask == null ||
-            searchTask.isCancelled() ||
-            searchTask.isDone()
-        ) {
+        if (searchTask == null || searchTask.isCancelled() || searchTask.isDone()) {
             return;
         }
 
@@ -123,10 +112,7 @@ public SciteTallyModel fetchTallies(DOI doi) throws FetcherException {
         } catch (MalformedURLException | URISyntaxException ex) {
             throw new FetcherException("Malformed url for DOs", ex);
         } catch (IOException ioex) {
-            throw new FetcherException(
-                "Failed to retrieve tallies for DOI - IO Exception",
-                ioex
-            );
+            throw new FetcherException("Failed to retrieve tallies for DOI - IO Exception", ioex);
         }
     }
 
diff --git a/src/main/java/org/jabref/gui/entryeditor/SourceTab.java b/src/main/java/org/jabref/gui/entryeditor/SourceTab.java
index a6f98ce37f6..45841a1eaed 100644
--- a/src/main/java/org/jabref/gui/entryeditor/SourceTab.java
+++ b/src/main/java/org/jabref/gui/entryeditor/SourceTab.java
@@ -58,16 +58,12 @@
 
 public class SourceTab extends EntryEditorTab {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(
-        SourceTab.class
-    );
+    private static final Logger LOGGER = LoggerFactory.getLogger(SourceTab.class);
     private final FieldPreferences fieldPreferences;
     private final BibDatabaseMode mode;
     private final UndoManager undoManager;
-    private final ObjectProperty<ValidationMessage> sourceIsValid =
-        new SimpleObjectProperty<>();
-    private final ObservableRuleBasedValidator sourceValidator =
-        new ObservableRuleBasedValidator();
+    private final ObjectProperty<ValidationMessage> sourceIsValid = new SimpleObjectProperty<>();
+    private final ObservableRuleBasedValidator sourceValidator = new ObservableRuleBasedValidator();
     private final ImportFormatPreferences importFormatPreferences;
     private final FileUpdateMonitor fileMonitor;
     private final DialogService dialogService;
@@ -113,12 +109,7 @@ public SourceTab(
         this.mode = bibDatabaseContext.getMode();
         this.setText(Localization.lang("%0 source", mode.getFormattedName()));
         this.setTooltip(
-                new Tooltip(
-                    Localization.lang(
-                        "Show/edit %0 source",
-                        mode.getFormattedName()
-                    )
-                )
+                new Tooltip(Localization.lang("Show/edit %0 source", mode.getFormattedName()))
             );
         this.setGraphic(IconTheme.JabRefIcons.SOURCE.getGraphicNode());
         this.undoManager = undoManager;
@@ -133,8 +124,7 @@ public SourceTab(
         stateManager
             .activeSearchQueryProperty()
             .addListener((observable, oldValue, newValue) -> {
-                searchHighlightPattern =
-                    newValue.flatMap(SearchQuery::getPatternForWords);
+                searchHighlightPattern = newValue.flatMap(SearchQuery::getPatternForWords);
                 highlightSearchPattern();
             });
     }
@@ -142,16 +132,10 @@ public SourceTab(
     private void highlightSearchPattern() {
         if (searchHighlightPattern.isPresent() && (codeArea != null)) {
             codeArea.setStyleClass(0, codeArea.getLength(), "text");
-            Matcher matcher = searchHighlightPattern
-                .get()
-                .matcher(codeArea.getText());
+            Matcher matcher = searchHighlightPattern.get().matcher(codeArea.getText());
             while (matcher.find()) {
                 for (int i = 0; i <= matcher.groupCount(); i++) {
-                    codeArea.setStyleClass(
-                        matcher.start(),
-                        matcher.end(),
-                        "search"
-                    );
+                    codeArea.setStyleClass(matcher.start(), matcher.end(), "search");
                 }
             }
         }
@@ -164,19 +148,15 @@ private String getSourceString(
     ) throws IOException {
         StringWriter writer = new StringWriter();
         BibWriter bibWriter = new BibWriter(writer, OS.NEWLINE);
-        FieldWriter fieldWriter = FieldWriter.buildIgnoreHashes(
-            fieldPreferences
-        );
-        new BibEntryWriter(fieldWriter, entryTypesManager)
-            .write(entry, bibWriter, type);
+        FieldWriter fieldWriter = FieldWriter.buildIgnoreHashes(fieldPreferences);
+        new BibEntryWriter(fieldWriter, entryTypesManager).write(entry, bibWriter, type);
         return writer.toString();
     }
 
     /* Work around for different input methods.
      * https://github.com/FXMisc/RichTextFX/issues/146
      */
-    private static class InputMethodRequestsObject
-        implements InputMethodRequests {
+    private static class InputMethodRequestsObject implements InputMethodRequests {
 
         @Override
         public String getSelectedText() {
@@ -212,27 +192,17 @@ private void setupSourceEditor() {
         codeArea.setId("bibtexSourceCodeArea");
         codeArea.addEventFilter(
             KeyEvent.KEY_PRESSED,
-            event ->
-                CodeAreaKeyBindings.call(codeArea, event, keyBindingRepository)
-        );
-        codeArea.addEventFilter(
-            KeyEvent.KEY_PRESSED,
-            this::listenForSaveKeybinding
+            event -> CodeAreaKeyBindings.call(codeArea, event, keyBindingRepository)
         );
+        codeArea.addEventFilter(KeyEvent.KEY_PRESSED, this::listenForSaveKeybinding);
 
         ActionFactory factory = new ActionFactory(keyBindingRepository);
         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.CUT, new EditAction(StandardActions.CUT)),
+                factory.createMenuItem(StandardActions.COPY, new EditAction(StandardActions.COPY)),
                 factory.createMenuItem(
                     StandardActions.PASTE,
                     new EditAction(StandardActions.PASTE)
@@ -253,8 +223,7 @@ private void setupSourceEditor() {
             .getMessages()
             .addListener(
                 (InvalidationListener) c -> {
-                    ValidationStatus sourceValidationStatus =
-                        sourceValidator.getValidationStatus();
+                    ValidationStatus sourceValidationStatus = sourceValidator.getValidationStatus();
                     if (!sourceValidationStatus.isValid()) {
                         sourceValidationStatus
                             .getHighestMessage()
@@ -282,14 +251,10 @@ private void setupSourceEditor() {
             .focusedProperty()
             .addListener((obs, oldValue, onFocus) -> {
                 if (!onFocus && (currentEntry != null)) {
-                    storeSource(
-                        currentEntry,
-                        codeArea.textProperty().getValue()
-                    );
+                    storeSource(currentEntry, codeArea.textProperty().getValue());
                 }
             });
-        VirtualizedScrollPane<CodeArea> scrollableCodeArea =
-            new VirtualizedScrollPane<>(codeArea);
+        VirtualizedScrollPane<CodeArea> scrollableCodeArea = new VirtualizedScrollPane<>(codeArea);
         this.setContent(scrollableCodeArea);
     }
 
@@ -306,9 +271,7 @@ private void updateCodeArea() {
 
             codeArea.clear();
             try {
-                codeArea.appendText(
-                    getSourceString(currentEntry, mode, fieldPreferences)
-                );
+                codeArea.appendText(getSourceString(currentEntry, mode, fieldPreferences));
                 codeArea.setEditable(true);
                 highlightSearchPattern();
             } catch (IOException ex) {
@@ -345,14 +308,9 @@ private void storeSource(BibEntry outOfFocusEntry, String text) {
             return;
         }
 
-        BibtexParser bibtexParser = new BibtexParser(
-            importFormatPreferences,
-            fileMonitor
-        );
+        BibtexParser bibtexParser = new BibtexParser(importFormatPreferences, fileMonitor);
         try {
-            ParserResult parserResult = bibtexParser.parse(
-                new StringReader(text)
-            );
+            ParserResult parserResult = bibtexParser.parse(new StringReader(text));
             BibDatabase database = parserResult.getDatabase();
 
             if (database.getEntryCount() > 1) {
@@ -362,9 +320,7 @@ private void storeSource(BibEntry outOfFocusEntry, String text) {
             if (!database.hasEntries()) {
                 if (parserResult.hasWarnings()) {
                     // put the warning into as exception text -> it will be displayed to the user
-                    throw new IllegalStateException(
-                        parserResult.warnings().get(0)
-                    );
+                    throw new IllegalStateException(parserResult.warnings().get(0));
                 } else {
                     throw new IllegalStateException("No entries found.");
                 }
@@ -375,9 +331,7 @@ private void storeSource(BibEntry outOfFocusEntry, String text) {
                 throw new IllegalStateException(parserResult.getErrorMessage());
             }
 
-            NamedCompound compound = new NamedCompound(
-                Localization.lang("source edit")
-            );
+            NamedCompound compound = new NamedCompound(Localization.lang("source edit"));
             BibEntry newEntry = database.getEntries().get(0);
             String newKey = newEntry.getCitationKey().orElse(null);
 
@@ -388,55 +342,36 @@ private void storeSource(BibEntry outOfFocusEntry, String text) {
             }
 
             // First, remove fields that the user has removed.
-            for (Map.Entry<Field, String> field : outOfFocusEntry
-                .getFieldMap()
-                .entrySet()) {
+            for (Map.Entry<Field, String> field : outOfFocusEntry.getFieldMap().entrySet()) {
                 Field fieldName = field.getKey();
                 String fieldValue = field.getValue();
 
                 if (!newEntry.hasField(fieldName)) {
                     compound.addEdit(
-                        new UndoableFieldChange(
-                            outOfFocusEntry,
-                            fieldName,
-                            fieldValue,
-                            null
-                        )
+                        new UndoableFieldChange(outOfFocusEntry, fieldName, fieldValue, null)
                     );
                     outOfFocusEntry.clearField(fieldName);
                 }
             }
 
             // Then set all fields that have been set by the user.
-            for (Map.Entry<Field, String> field : newEntry
-                .getFieldMap()
-                .entrySet()) {
+            for (Map.Entry<Field, String> field : newEntry.getFieldMap().entrySet()) {
                 Field fieldName = field.getKey();
-                String oldValue = outOfFocusEntry
-                    .getField(fieldName)
-                    .orElse(null);
+                String oldValue = outOfFocusEntry.getField(fieldName).orElse(null);
                 String newValue = field.getValue();
                 if (!Objects.equals(oldValue, newValue)) {
                     // Test if the field is legally set.
-                    new FieldWriter(fieldPreferences)
-                        .write(fieldName, newValue);
+                    new FieldWriter(fieldPreferences).write(fieldName, newValue);
 
                     compound.addEdit(
-                        new UndoableFieldChange(
-                            outOfFocusEntry,
-                            fieldName,
-                            oldValue,
-                            newValue
-                        )
+                        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())
-            ) {
+            if (!Objects.equals(newEntry.getType(), outOfFocusEntry.getType())) {
                 compound.addEdit(
                     new UndoableChangeType(
                         outOfFocusEntry,
@@ -450,14 +385,10 @@ private void storeSource(BibEntry outOfFocusEntry, String text) {
             undoManager.addEdit(compound);
 
             sourceIsValid.setValue(null);
-        } catch (
-            InvalidFieldValueException | IllegalStateException | IOException ex
-        ) {
+        } catch (InvalidFieldValueException | IllegalStateException | IOException ex) {
             sourceIsValid.setValue(
                 ValidationMessage.error(
-                    Localization.lang("Problem with parsing entry") +
-                    ": " +
-                    ex.getMessage()
+                    Localization.lang("Problem with parsing entry") + ": " + ex.getMessage()
                 )
             );
             LOGGER.debug("Incorrect source", ex);
@@ -470,10 +401,7 @@ private void listenForSaveKeybinding(KeyEvent event) {
             .ifPresent(binding -> {
                 switch (binding) {
                     case SAVE_DATABASE, SAVE_ALL, SAVE_DATABASE_AS -> {
-                        storeSource(
-                            currentEntry,
-                            codeArea.textProperty().getValue()
-                        );
+                        storeSource(currentEntry, codeArea.textProperty().getValue());
                     }
                 }
             });
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 9826ff49a8d..e986800edaa 100644
--- a/src/main/java/org/jabref/gui/entryeditor/citationrelationtab/BibEntryRelationsCache.java
+++ b/src/main/java/org/jabref/gui/entryeditor/citationrelationtab/BibEntryRelationsCache.java
@@ -9,10 +9,8 @@
 
 public class BibEntryRelationsCache {
 
-    private static final Map<String, List<BibEntry>> CITATIONS_MAP =
-        new HashMap<>();
-    private static final Map<String, List<BibEntry>> REFERENCES_MAP =
-        new HashMap<>();
+    private static final Map<String, List<BibEntry>> CITATIONS_MAP = new HashMap<>();
+    private static final Map<String, List<BibEntry>> REFERENCES_MAP = new HashMap<>();
 
     public List<BibEntry> getCitations(BibEntry entry) {
         return CITATIONS_MAP.getOrDefault(
@@ -28,35 +26,19 @@ public List<BibEntry> getReferences(BibEntry entry) {
         );
     }
 
-    public void cacheOrMergeCitations(
-        BibEntry entry,
-        List<BibEntry> citations
-    ) {
-        entry
-            .getDOI()
-            .ifPresent(doi -> CITATIONS_MAP.put(doi.getDOI(), citations));
+    public void cacheOrMergeCitations(BibEntry entry, List<BibEntry> citations) {
+        entry.getDOI().ifPresent(doi -> CITATIONS_MAP.put(doi.getDOI(), citations));
     }
 
-    public void cacheOrMergeReferences(
-        BibEntry entry,
-        List<BibEntry> references
-    ) {
-        entry
-            .getDOI()
-            .ifPresent(doi ->
-                REFERENCES_MAP.putIfAbsent(doi.getDOI(), references)
-            );
+    public void cacheOrMergeReferences(BibEntry entry, List<BibEntry> references) {
+        entry.getDOI().ifPresent(doi -> REFERENCES_MAP.putIfAbsent(doi.getDOI(), references));
     }
 
     public boolean citationsCached(BibEntry entry) {
-        return CITATIONS_MAP.containsKey(
-            entry.getDOI().map(DOI::getDOI).orElse("")
-        );
+        return CITATIONS_MAP.containsKey(entry.getDOI().map(DOI::getDOI).orElse(""));
     }
 
     public boolean referencesCached(BibEntry entry) {
-        return REFERENCES_MAP.containsKey(
-            entry.getDOI().map(DOI::getDOI).orElse("")
-        );
+        return REFERENCES_MAP.containsKey(entry.getDOI().map(DOI::getDOI).orElse(""));
     }
 }
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 8c72845e9ac..cdabb44fd98 100644
--- a/src/main/java/org/jabref/gui/entryeditor/citationrelationtab/BibEntryView.java
+++ b/src/main/java/org/jabref/gui/entryeditor/citationrelationtab/BibEntryView.java
@@ -27,23 +27,15 @@ public class BibEntryView {
     public static Node getEntryNode(BibEntry entry) {
         Node entryType = getIcon(entry.getType()).getGraphicNode();
         entryType.getStyleClass().add("type");
-        Label authors = new Label(
-            entry.getFieldOrAliasLatexFree(StandardField.AUTHOR).orElse("")
-        );
+        Label authors = new Label(entry.getFieldOrAliasLatexFree(StandardField.AUTHOR).orElse(""));
         authors.getStyleClass().add("authors");
         authors.setWrapText(true);
-        Label title = new Label(
-            entry.getFieldOrAliasLatexFree(StandardField.TITLE).orElse("")
-        );
+        Label title = new Label(entry.getFieldOrAliasLatexFree(StandardField.TITLE).orElse(""));
         title.getStyleClass().add("title");
         title.setWrapText(true);
-        Label year = new Label(
-            entry.getFieldOrAliasLatexFree(StandardField.YEAR).orElse("")
-        );
+        Label year = new Label(entry.getFieldOrAliasLatexFree(StandardField.YEAR).orElse(""));
         year.getStyleClass().add("year");
-        Label journal = new Label(
-            entry.getFieldOrAliasLatexFree(StandardField.JOURNAL).orElse("")
-        );
+        Label journal = new Label(entry.getFieldOrAliasLatexFree(StandardField.JOURNAL).orElse(""));
         journal.getStyleClass().add("journal");
 
         VBox entryContainer = new VBox(
@@ -54,9 +46,7 @@ public static Node getEntryNode(BibEntry entry) {
         entry
             .getFieldOrAliasLatexFree(StandardField.ABSTRACT)
             .ifPresent(summaryText -> {
-                TextFlowLimited summary = new TextFlowLimited(
-                    new Text(summaryText)
-                );
+                TextFlowLimited summary = new TextFlowLimited(new Text(summaryText));
                 summary.getStyleClass().add("summary");
                 entryContainer.getChildren().add(summary);
             });
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 8a7326bfe28..f2cc7221738 100644
--- a/src/main/java/org/jabref/gui/entryeditor/citationrelationtab/CitationRelationsTab.java
+++ b/src/main/java/org/jabref/gui/entryeditor/citationrelationtab/CitationRelationsTab.java
@@ -49,9 +49,7 @@
  */
 public class CitationRelationsTab extends EntryEditorTab {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(
-        CitationRelationsTab.class
-    );
+    private static final Logger LOGGER = LoggerFactory.getLogger(CitationRelationsTab.class);
 
     // Tasks used to implement asynchronous fetching of related articles
     private static BackgroundTask<List<BibEntry>> citingTask;
@@ -85,9 +83,7 @@ public CitationRelationsTab(
         this.preferencesService = preferencesService;
         this.libraryTab = lTab;
         setText(Localization.lang("Citation relations"));
-        setTooltip(
-            new Tooltip(Localization.lang("Show articles related by citation"))
-        );
+        setTooltip(new Tooltip(Localization.lang("Show articles related by citation")));
 
         this.bibEntryRelationsRepository =
             new BibEntryRelationsRepository(
@@ -122,35 +118,25 @@ private SplitPane getPaneAndStartSearch(BibEntry entry) {
         styleLabel(citedByLabel);
 
         // Create ListViews
-        CheckListView<CitationRelationItem> citingListView =
-            new CheckListView<>();
-        CheckListView<CitationRelationItem> citedByListView =
-            new CheckListView<>();
+        CheckListView<CitationRelationItem> citingListView = new CheckListView<>();
+        CheckListView<CitationRelationItem> citedByListView = new CheckListView<>();
 
         // Create refresh Buttons for both sides
         Button refreshCitingButton = IconTheme.JabRefIcons.REFRESH.asButton();
-        refreshCitingButton.setTooltip(
-            new Tooltip(Localization.lang("Restart search"))
-        );
+        refreshCitingButton.setTooltip(new Tooltip(Localization.lang("Restart search")));
         styleTopBarNode(refreshCitingButton, 15.0);
         Button refreshCitedByButton = IconTheme.JabRefIcons.REFRESH.asButton();
-        refreshCitedByButton.setTooltip(
-            new Tooltip(Localization.lang("Restart search"))
-        );
+        refreshCitedByButton.setTooltip(new Tooltip(Localization.lang("Restart search")));
         styleTopBarNode(refreshCitedByButton, 15.0);
 
         // Create abort buttons for both sides
         Button abortCitingButton = IconTheme.JabRefIcons.CLOSE.asButton();
         abortCitingButton.getGraphic().resize(30, 30);
-        abortCitingButton.setTooltip(
-            new Tooltip(Localization.lang("Cancel search"))
-        );
+        abortCitingButton.setTooltip(new Tooltip(Localization.lang("Cancel search")));
         styleTopBarNode(abortCitingButton, 15.0);
         Button abortCitedButton = IconTheme.JabRefIcons.CLOSE.asButton();
         abortCitedButton.getGraphic().resize(30, 30);
-        abortCitedButton.setTooltip(
-            new Tooltip(Localization.lang("Cancel search"))
-        );
+        abortCitedButton.setTooltip(new Tooltip(Localization.lang("Cancel search")));
         styleTopBarNode(abortCitedButton, 15.0);
 
         ProgressIndicator citingProgress = new ProgressIndicator();
@@ -259,9 +245,7 @@ private SplitPane getPaneAndStartSearch(BibEntry entry) {
      *
      * @param listView CheckListView to style
      */
-    private void styleFetchedListView(
-        CheckListView<CitationRelationItem> listView
-    ) {
+    private void styleFetchedListView(CheckListView<CitationRelationItem> listView) {
         PseudoClass entrySelected = PseudoClass.getPseudoClass("selected");
         new ViewModelListCellFactory<CitationRelationItem>()
             .withGraphic(entry -> {
@@ -270,17 +254,11 @@ private void styleFetchedListView(
                 Node entryNode = BibEntryView.getEntryNode(entry.getEntry());
                 HBox.setHgrow(entryNode, Priority.ALWAYS);
                 HBox hContainer = new HBox();
-                hContainer
-                    .prefWidthProperty()
-                    .bind(listView.widthProperty().subtract(25));
+                hContainer.prefWidthProperty().bind(listView.widthProperty().subtract(25));
 
                 if (entry.isLocal()) {
                     Button jumpTo = IconTheme.JabRefIcons.LINK.asButton();
-                    jumpTo.setTooltip(
-                        new Tooltip(
-                            Localization.lang("Jump to entry in database")
-                        )
-                    );
+                    jumpTo.setTooltip(new Tooltip(Localization.lang("Jump to entry in database")));
                     jumpTo.getStyleClass().add("addEntryButton");
                     jumpTo.setOnMouseClicked(event -> {
                         libraryTab.showAndEdit(entry.getEntry());
@@ -288,15 +266,10 @@ private void styleFetchedListView(
                         citingTask.cancel();
                         citedByTask.cancel();
                     });
-                    hContainer
-                        .getChildren()
-                        .addAll(entryNode, separator, jumpTo);
+                    hContainer.getChildren().addAll(entryNode, separator, jumpTo);
                 } else {
-                    ToggleButton addToggle =
-                        IconTheme.JabRefIcons.ADD.asToggleButton();
-                    addToggle.setTooltip(
-                        new Tooltip(Localization.lang("Select entry"))
-                    );
+                    ToggleButton addToggle = IconTheme.JabRefIcons.ADD.asToggleButton();
+                    addToggle.setTooltip(new Tooltip(Localization.lang("Select entry")));
                     EasyBind.subscribe(
                         addToggle.selectedProperty(),
                         selected -> {
@@ -307,21 +280,15 @@ private void styleFetchedListView(
                                         .getGraphicNode()
                                 );
                             } else {
-                                addToggle.setGraphic(
-                                    IconTheme.JabRefIcons.ADD.getGraphicNode()
-                                );
+                                addToggle.setGraphic(IconTheme.JabRefIcons.ADD.getGraphicNode());
                             }
                         }
                     );
                     addToggle.getStyleClass().add("addEntryButton");
                     addToggle
                         .selectedProperty()
-                        .bindBidirectional(
-                            listView.getItemBooleanProperty(entry)
-                        );
-                    hContainer
-                        .getChildren()
-                        .addAll(entryNode, separator, addToggle);
+                        .bindBidirectional(listView.getItemBooleanProperty(entry));
+                    hContainer.getChildren().addAll(entryNode, separator, addToggle);
                 }
                 hContainer.getStyleClass().add("entry-container");
 
@@ -413,8 +380,7 @@ private void searchForRelations(
             return;
         }
 
-        ObservableList<CitationRelationItem> observableList =
-            FXCollections.observableArrayList();
+        ObservableList<CitationRelationItem> observableList = FXCollections.observableArrayList();
 
         listView.setItems(observableList);
 
@@ -438,9 +404,7 @@ private void searchForRelations(
             task =
                 BackgroundTask.wrap(() -> {
                     if (shouldRefresh) {
-                        bibEntryRelationsRepository.forceRefreshReferences(
-                            entry
-                        );
+                        bibEntryRelationsRepository.forceRefreshReferences(entry);
                     }
                     return bibEntryRelationsRepository.getReferences(entry);
                 });
@@ -449,9 +413,7 @@ private void searchForRelations(
             task =
                 BackgroundTask.wrap(() -> {
                     if (shouldRefresh) {
-                        bibEntryRelationsRepository.forceRefreshCitations(
-                            entry
-                        );
+                        bibEntryRelationsRepository.forceRefreshCitations(entry);
                     }
                     return bibEntryRelationsRepository.getCitations(entry);
                 });
@@ -522,21 +484,13 @@ private void onSearchForRelationsSucceed(
         if (!observableList.isEmpty()) {
             listView.refresh();
         } else {
-            Label placeholder = new Label(
-                Localization.lang("No articles found")
-            );
+            Label placeholder = new Label(Localization.lang("No articles found"));
             listView.setPlaceholder(placeholder);
         }
-        BooleanBinding booleanBind = Bindings.isEmpty(
-            listView.getCheckModel().getCheckedItems()
-        );
+        BooleanBinding booleanBind = Bindings.isEmpty(listView.getCheckModel().getCheckedItems());
         importButton.disableProperty().bind(booleanBind);
         importButton.setOnMouseClicked(event ->
-            importEntries(
-                listView.getCheckModel().getCheckedItems(),
-                searchType,
-                entry
-            )
+            importEntries(listView.getCheckModel().getCheckedItems(), searchType, entry)
         );
         showNodes(refreshButton, importButton);
     }
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 3786747f3d1..11da3d3183f 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
@@ -12,12 +12,10 @@
 
 public class SemanticScholarFetcher implements CitationFetcher {
 
-    private static final String SEMANTIC_SCHOLAR_API =
-        "https://api.semanticscholar.org/graph/v1/";
+    private static final String SEMANTIC_SCHOLAR_API = "https://api.semanticscholar.org/graph/v1/";
 
     @Override
-    public List<BibEntry> searchCitedBy(BibEntry entry)
-        throws FetcherException {
+    public List<BibEntry> searchCitedBy(BibEntry entry) throws FetcherException {
         if (entry.getDOI().isPresent()) {
             StringBuilder urlBuilder = new StringBuilder(SEMANTIC_SCHOLAR_API)
                 .append("paper/")
@@ -38,12 +36,8 @@ public List<BibEntry> searchCitedBy(BibEntry entry)
                 return citationsResponse
                     .getData()
                     .stream()
-                    .filter(citationDataItem ->
-                        citationDataItem.getCitingPaper() != null
-                    )
-                    .map(citationDataItem ->
-                        citationDataItem.getCitingPaper().toBibEntry()
-                    )
+                    .filter(citationDataItem -> citationDataItem.getCitingPaper() != null)
+                    .map(citationDataItem -> citationDataItem.getCitingPaper().toBibEntry())
                     .toList();
             } catch (IOException e) {
                 throw new RuntimeException(e);
@@ -74,12 +68,8 @@ public List<BibEntry> searchCiting(BibEntry entry) {
                 return referencesResponse
                     .getData()
                     .stream()
-                    .filter(citationDataItem ->
-                        citationDataItem.getCitedPaper() != null
-                    )
-                    .map(referenceDataItem ->
-                        referenceDataItem.getCitedPaper().toBibEntry()
-                    )
+                    .filter(citationDataItem -> citationDataItem.getCitedPaper() != null)
+                    .map(referenceDataItem -> referenceDataItem.getCitedPaper().toBibEntry())
                     .toList();
             } catch (IOException e) {
                 throw new RuntimeException(e);
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 1b78970524c..a5ba5b59ecd 100644
--- a/src/main/java/org/jabref/gui/entryeditor/fileannotationtab/FileAnnotationTabView.java
+++ b/src/main/java/org/jabref/gui/entryeditor/fileannotationtab/FileAnnotationTabView.java
@@ -58,22 +58,14 @@ public class FileAnnotationTabView {
     @Inject
     private FileUpdateMonitor fileMonitor;
 
-    public FileAnnotationTabView(
-        BibEntry entry,
-        FileAnnotationCache fileAnnotationCache
-    ) {
+    public FileAnnotationTabView(BibEntry entry, FileAnnotationCache fileAnnotationCache) {
         this.entry = entry;
         this.fileAnnotationCache = fileAnnotationCache;
     }
 
     @FXML
     public void initialize() {
-        viewModel =
-            new FileAnnotationTabViewModel(
-                fileAnnotationCache,
-                entry,
-                fileMonitor
-            );
+        viewModel = new FileAnnotationTabViewModel(fileAnnotationCache, entry, fileMonitor);
 
         // Set-up files list
         files.getItems().setAll(viewModel.filesProperty().get());
@@ -86,9 +78,7 @@ public void initialize() {
         files.getSelectionModel().selectFirst();
 
         // Set-up annotation list
-        annotationList
-            .getSelectionModel()
-            .setSelectionMode(SelectionMode.SINGLE);
+        annotationList.getSelectionModel().setSelectionMode(SelectionMode.SINGLE);
         annotationList
             .getSelectionModel()
             .selectedItemProperty()
@@ -102,10 +92,7 @@ public void initialize() {
         annotationList.setPlaceholder(
             new Label(Localization.lang("File has no attached annotations"))
         );
-        Bindings.bindContent(
-            annotationList.itemsProperty().get(),
-            viewModel.annotationsProperty()
-        );
+        Bindings.bindContent(annotationList.itemsProperty().get(), viewModel.annotationsProperty());
         annotationList.getSelectionModel().selectFirst();
         annotationList
             .itemsProperty()
@@ -147,9 +134,7 @@ private Node createFileAnnotationNode(FileAnnotationViewModel annotation) {
         Label marking = new Label(annotation.getMarking());
         Label author = new Label(annotation.getAuthor());
         Label date = new Label(annotation.getDate());
-        Label page = new Label(
-            Localization.lang("Page") + ": " + annotation.getPage()
-        );
+        Label page = new Label(Localization.lang("Page") + ": " + annotation.getPage());
 
         marking.setStyle("-fx-font-size: 0.75em; -fx-font-weight: bold");
         marking.setMaxHeight(30);
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 55debaa6886..bd3be941d61 100644
--- a/src/main/java/org/jabref/gui/entryeditor/fileannotationtab/FileAnnotationTabViewModel.java
+++ b/src/main/java/org/jabref/gui/entryeditor/fileannotationtab/FileAnnotationTabViewModel.java
@@ -29,19 +29,17 @@
 
 public class FileAnnotationTabViewModel extends AbstractViewModel {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(
-        FileAnnotationTabViewModel.class
-    );
+    private static final Logger LOGGER = LoggerFactory.getLogger(FileAnnotationTabViewModel.class);
 
-    private final ListProperty<FileAnnotationViewModel> annotations =
-        new SimpleListProperty<>(FXCollections.observableArrayList());
+    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 ReadOnlyBooleanProperty annotationEmpty = annotations.emptyProperty();
 
     private final FileAnnotationCache cache;
     private final BibEntry entry;
@@ -79,9 +77,7 @@ public ListProperty<Path> filesProperty() {
         return files;
     }
 
-    public void notifyNewSelectedAnnotation(
-        FileAnnotationViewModel newAnnotation
-    ) {
+    public void notifyNewSelectedAnnotation(FileAnnotationViewModel newAnnotation) {
         currentAnnotation.set(newAnnotation);
     }
 
@@ -89,9 +85,7 @@ public void notifyNewSelectedFile(Path newFile) {
         fileMonitor.removeListener(currentFile, fileListener);
         currentFile = newFile;
 
-        Comparator<FileAnnotation> byPage = Comparator.comparingInt(
-            FileAnnotation::getPage
-        );
+        Comparator<FileAnnotation> byPage = Comparator.comparingInt(FileAnnotation::getPage);
 
         List<FileAnnotationViewModel> newAnnotations = fileAnnotations
             .getOrDefault(currentFile, new ArrayList<>())
@@ -105,10 +99,7 @@ public void notifyNewSelectedFile(Path newFile) {
         try {
             fileMonitor.addListenerForFile(currentFile, fileListener);
         } catch (IOException e) {
-            LOGGER.error(
-                "Problem while watching file for changes " + currentFile,
-                e
-            );
+            LOGGER.error("Problem while watching file for changes " + currentFile, e);
         }
     }
 
@@ -133,26 +124,12 @@ public void copyCurrentAnnotation() {
             return;
         }
         StringJoiner sj = new StringJoiner("," + OS.NEWLINE);
+        sj.add(Localization.lang("Author") + ": " + getCurrentAnnotation().getAuthor());
+        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("Author") +
-            ": " +
-            getCurrentAnnotation().getAuthor()
-        );
-        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()
+            Localization.lang("Marking") + ": " + getCurrentAnnotation().markingProperty().get()
         );
 
         Globals.getClipboardManager().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 7adc83ce7d8..e1ef7542926 100644
--- a/src/main/java/org/jabref/gui/entryeditor/fileannotationtab/FileAnnotationViewModel.java
+++ b/src/main/java/org/jabref/gui/entryeditor/fileannotationtab/FileAnnotationViewModel.java
@@ -91,14 +91,10 @@ public StringProperty authorProperty() {
     @Override
     public String toString() {
         if (annotation.hasLinkedAnnotation() && this.getContent().isEmpty()) {
-            if (
-                FileAnnotationType.UNDERLINE == annotation.getAnnotationType()
-            ) {
+            if (FileAnnotationType.UNDERLINE == annotation.getAnnotationType()) {
                 return Localization.lang("Empty Underline");
             }
-            if (
-                FileAnnotationType.HIGHLIGHT == annotation.getAnnotationType()
-            ) {
+            if (FileAnnotationType.HIGHLIGHT == annotation.getAnnotationType()) {
                 return Localization.lang("Empty Highlight");
             }
             return Localization.lang("Empty Marking");
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 7f88862c415..2413d6dddee 100644
--- a/src/main/java/org/jabref/gui/entryeditor/fileannotationtab/FulltextSearchResultsTab.java
+++ b/src/main/java/org/jabref/gui/entryeditor/fileannotationtab/FulltextSearchResultsTab.java
@@ -37,9 +37,7 @@
 public class FulltextSearchResultsTab extends EntryEditorTab {
 
     public static final String NAME = "Search results";
-    private static final Logger LOGGER = LoggerFactory.getLogger(
-        FulltextSearchResultsTab.class
-    );
+    private static final Logger LOGGER = LoggerFactory.getLogger(FulltextSearchResultsTab.class);
 
     private final StateManager stateManager;
     private final PreferencesService preferencesService;
@@ -62,8 +60,7 @@ public FulltextSearchResultsTab(
         this.stateManager = stateManager;
         this.preferencesService = preferencesService;
         this.dialogService = dialogService;
-        this.actionFactory =
-            new ActionFactory(preferencesService.getKeyBindingRepository());
+        this.actionFactory = new ActionFactory(preferencesService.getKeyBindingRepository());
         this.taskExecutor = taskExecutor;
 
         content = new TextFlow();
@@ -73,8 +70,7 @@ public FulltextSearchResultsTab(
         setContent(scrollPane);
         setText(Localization.lang("Search results"));
         this.stateManager.activeSearchQueryProperty()
-            .addListener((observable, oldValue, newValue) -> bindToEntry(entry)
-            );
+            .addListener((observable, oldValue, newValue) -> bindToEntry(entry));
     }
 
     @Override
@@ -87,12 +83,7 @@ public boolean shouldShow(BibEntry entry) {
                 .get()
                 .getSearchFlags()
                 .contains(SearchRules.SearchFlags.FULLTEXT) &&
-            this.stateManager.activeSearchQueryProperty()
-                    .get()
-                    .get()
-                    .getQuery()
-                    .length() >
-                0
+            this.stateManager.activeSearchQueryProperty().get().get().getQuery().length() > 0
         );
     }
 
@@ -118,22 +109,14 @@ protected void bindToEntry(BibEntry entry) {
         content.getChildren().clear();
 
         if (searchResults.numSearchResults() == 0) {
-            content
-                .getChildren()
-                .add(new Text(Localization.lang("No search matches.")));
+            content.getChildren().add(new Text(Localization.lang("No search matches.")));
         }
 
         // Iterate through files with search hits
-        for (Map.Entry<
-            String,
-            List<SearchResult>
-        > resultsForPath : searchResults.getSearchResultsByPath().entrySet()) {
-            content
-                .getChildren()
-                .addAll(
-                    createFileLink(resultsForPath.getKey()),
-                    lineSeparator()
-                );
+        for (Map.Entry<String, List<SearchResult>> resultsForPath : searchResults
+            .getSearchResultsByPath()
+            .entrySet()) {
+            content.getChildren().addAll(createFileLink(resultsForPath.getKey()), lineSeparator());
 
             // Iterate through pages (within file) with search hits
             for (SearchResult searchResult : resultsForPath.getValue()) {
@@ -194,14 +177,9 @@ private Text createFileLink(String pathToFile) {
 
         ContextMenu fileContextMenu = getFileContextMenu(linkedFile);
         Path resolvedPath = linkedFile
-            .findIn(
-                stateManager.getActiveDatabase().get(),
-                preferencesService.getFilePreferences()
-            )
+            .findIn(stateManager.getActiveDatabase().get(), preferencesService.getFilePreferences())
             .orElse(Path.of(pathToFile));
-        Tooltip fileLinkTooltip = new Tooltip(
-            resolvedPath.toAbsolutePath().toString()
-        );
+        Tooltip fileLinkTooltip = new Tooltip(resolvedPath.toAbsolutePath().toString());
         Tooltip.install(fileLinkText, fileLinkTooltip);
         fileLinkText.setOnMouseClicked(event -> {
             if (MouseButton.PRIMARY.equals(event.getButton())) {
@@ -214,11 +192,7 @@ private Text createFileLink(String pathToFile) {
                     LOGGER.error("Cannot open {}.", resolvedPath.toString(), e);
                 }
             } else {
-                fileContextMenu.show(
-                    fileLinkText,
-                    event.getScreenX(),
-                    event.getScreenY()
-                );
+                fileContextMenu.show(fileLinkText, event.getScreenX(), event.getScreenY());
             }
         });
         return fileLinkText;
@@ -281,9 +255,7 @@ private Separator lineSeparator() {
 
     private Separator lineSeparator(double widthMultiplier) {
         Separator lineSeparator = new Separator(Orientation.HORIZONTAL);
-        lineSeparator
-            .prefWidthProperty()
-            .bind(content.widthProperty().multiply(widthMultiplier));
+        lineSeparator.prefWidthProperty().bind(content.widthProperty().multiply(widthMultiplier));
         lineSeparator.setPrefHeight(15);
         return lineSeparator;
     }
diff --git a/src/main/java/org/jabref/gui/errorconsole/ErrorConsoleView.java b/src/main/java/org/jabref/gui/errorconsole/ErrorConsoleView.java
index 728943b7509..b00c51c2c17 100644
--- a/src/main/java/org/jabref/gui/errorconsole/ErrorConsoleView.java
+++ b/src/main/java/org/jabref/gui/errorconsole/ErrorConsoleView.java
@@ -72,21 +72,9 @@ public ErrorConsoleView() {
 
         ViewLoader.view(this).load().setAsDialogPane(this);
 
-        ControlHelper.setAction(
-            copyLogButton,
-            getDialogPane(),
-            event -> copyLog()
-        );
-        ControlHelper.setAction(
-            clearLogButton,
-            getDialogPane(),
-            event -> clearLog()
-        );
-        ControlHelper.setAction(
-            createIssueButton,
-            getDialogPane(),
-            event -> createIssue()
-        );
+        ControlHelper.setAction(copyLogButton, getDialogPane(), event -> copyLog());
+        ControlHelper.setAction(clearLogButton, getDialogPane(), event -> clearLog());
+        ControlHelper.setAction(createIssueButton, getDialogPane(), event -> createIssue());
 
         themeManager.updateFontStyle(getDialogPane().getScene());
     }
@@ -101,15 +89,9 @@ private void initialize() {
                 buildInfo
             );
         messagesListView.setCellFactory(createCellFactory());
-        messagesListView
-            .itemsProperty()
-            .bind(viewModel.allMessagesDataProperty());
-        messagesListView.scrollTo(
-            viewModel.allMessagesDataProperty().getSize() - 1
-        );
-        messagesListView
-            .getSelectionModel()
-            .setSelectionMode(SelectionMode.MULTIPLE);
+        messagesListView.itemsProperty().bind(viewModel.allMessagesDataProperty());
+        messagesListView.scrollTo(viewModel.allMessagesDataProperty().getSize() - 1);
+        messagesListView.getSelectionModel().setSelectionMode(SelectionMode.MULTIPLE);
         viewModel
             .allMessagesDataProperty()
             .addListener(
@@ -120,15 +102,10 @@ private void initialize() {
                         }
                     })
             );
-        descriptionLabel.setGraphic(
-            IconTheme.JabRefIcons.CONSOLE.getGraphicNode()
-        );
+        descriptionLabel.setGraphic(IconTheme.JabRefIcons.CONSOLE.getGraphicNode());
     }
 
-    private Callback<
-        ListView<LogEventViewModel>,
-        ListCell<LogEventViewModel>
-    > createCellFactory() {
+    private Callback<ListView<LogEventViewModel>, ListCell<LogEventViewModel>> createCellFactory() {
         return cell ->
             new ListCell<>() {
                 private HBox graphic;
@@ -167,12 +144,7 @@ public void updateItem(LogEventViewModel event, boolean empty) {
 
     @FXML
     private void copySelectedLogEntries(KeyEvent event) {
-        if (
-            keyBindingRepository.checkKeyCombinationEquality(
-                KeyBinding.COPY,
-                event
-            )
-        ) {
+        if (keyBindingRepository.checkKeyCombinationEquality(KeyBinding.COPY, event)) {
             ObservableList<LogEventViewModel> selectedEntries = messagesListView
                 .getSelectionModel()
                 .getSelectedItems();
diff --git a/src/main/java/org/jabref/gui/errorconsole/ErrorConsoleViewModel.java b/src/main/java/org/jabref/gui/errorconsole/ErrorConsoleViewModel.java
index ec1e271b08b..d7aa6a1ac83 100644
--- a/src/main/java/org/jabref/gui/errorconsole/ErrorConsoleViewModel.java
+++ b/src/main/java/org/jabref/gui/errorconsole/ErrorConsoleViewModel.java
@@ -25,9 +25,7 @@
 
 public class ErrorConsoleViewModel extends AbstractViewModel {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(
-        ErrorConsoleViewModel.class
-    );
+    private static final Logger LOGGER = LoggerFactory.getLogger(ErrorConsoleViewModel.class);
 
     private final DialogService dialogService;
     private final PreferencesService preferencesService;
@@ -108,8 +106,7 @@ public void reportIssue() {
                 BuildInfo.JAVA_VERSION
             );
             // Steps to reproduce
-            String howToReproduce =
-                "Steps to reproduce:\n\n1. ...\n2. ...\n3. ...";
+            String howToReproduce = "Steps to reproduce:\n\n1. ...\n2. ...\n3. ...";
             // Log messages
             String issueDetails =
                 "<details>\n" +
@@ -121,15 +118,9 @@ public void reportIssue() {
             clipBoardManager.setContent(issueDetails);
             // Bug report body
             String issueBody =
-                systemInfo +
-                "\n\n" +
-                howToReproduce +
-                "\n\n" +
-                "Paste your log details here.";
+                systemInfo + "\n\n" + howToReproduce + "\n\n" + "Paste your log details here.";
 
-            dialogService.notify(
-                Localization.lang("Issue on GitHub successfully reported.")
-            );
+            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.") +
@@ -142,9 +133,7 @@ public void reportIssue() {
                     "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."
-                )
+                Localization.lang("Please also add all steps to reproduce this issue, if possible.")
             );
 
             URIBuilder uriBuilder = new URIBuilder()
diff --git a/src/main/java/org/jabref/gui/errorconsole/LogEventViewModel.java b/src/main/java/org/jabref/gui/errorconsole/LogEventViewModel.java
index aa62cc0bded..d1e14eb06a3 100644
--- a/src/main/java/org/jabref/gui/errorconsole/LogEventViewModel.java
+++ b/src/main/java/org/jabref/gui/errorconsole/LogEventViewModel.java
@@ -45,17 +45,12 @@ public JabRefIcon getIcon() {
     }
 
     public Optional<String> getStackTrace() {
-        return Optional
-            .ofNullable(logEvent.getException())
-            .map(Throwables::getStackTraceAsString);
+        return Optional.ofNullable(logEvent.getException()).map(Throwables::getStackTraceAsString);
     }
 
     public String getDetailedText() {
         return (
-            getDisplayText() +
-            getStackTrace()
-                .map(stacktrace -> OS.NEWLINE + stacktrace)
-                .orElse("")
+            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 add90da85d4..fa949ee12d9 100644
--- a/src/main/java/org/jabref/gui/exporter/CreateModifyExporterDialogView.java
+++ b/src/main/java/org/jabref/gui/exporter/CreateModifyExporterDialogView.java
@@ -11,8 +11,7 @@
 import org.jabref.logic.l10n.Localization;
 import org.jabref.preferences.PreferencesService;
 
-public class CreateModifyExporterDialogView
-    extends BaseDialog<ExporterViewModel> {
+public class CreateModifyExporterDialogView extends BaseDialog<ExporterViewModel> {
 
     private final ExporterViewModel exporter;
 
@@ -53,16 +52,9 @@ public CreateModifyExporterDialogView(ExporterViewModel exporter) {
 
     @FXML
     private void initialize() {
-        viewModel =
-            new CreateModifyExporterDialogViewModel(
-                exporter,
-                dialogService,
-                preferences
-            );
+        viewModel = new CreateModifyExporterDialogViewModel(exporter, dialogService, preferences);
         name.textProperty().bindBidirectional(viewModel.getName());
-        fileName
-            .textProperty()
-            .bindBidirectional(viewModel.getLayoutFileName());
+        fileName.textProperty().bindBidirectional(viewModel.getLayoutFileName());
         extension.textProperty().bindBidirectional(viewModel.getExtension());
     }
 
diff --git a/src/main/java/org/jabref/gui/exporter/CreateModifyExporterDialogViewModel.java b/src/main/java/org/jabref/gui/exporter/CreateModifyExporterDialogViewModel.java
index 60673aa0d7c..a2528dc6c45 100644
--- a/src/main/java/org/jabref/gui/exporter/CreateModifyExporterDialogViewModel.java
+++ b/src/main/java/org/jabref/gui/exporter/CreateModifyExporterDialogViewModel.java
@@ -52,9 +52,7 @@ public CreateModifyExporterDialogViewModel(
     public ExporterViewModel saveExporter() {
         Path layoutFileDir = Path.of(layoutFile.get()).getParent();
         if (layoutFileDir != null) {
-            preferences
-                .getExportPreferences()
-                .setExportWorkingDirectory(layoutFileDir);
+            preferences.getExportPreferences().setExportWorkingDirectory(layoutFileDir);
         }
 
         // Check that there are no empty strings.
@@ -74,31 +72,18 @@ public ExporterViewModel saveExporter() {
             layoutFile.get(),
             extension.get(),
             preferences.getLayoutFormatterPreferences(),
-            preferences
-                .getSelfContainedExportConfiguration()
-                .getSelfContainedSaveOrder()
+            preferences.getSelfContainedExportConfiguration().getSelfContainedSaveOrder()
         );
         format.setCustomExport(true);
         return new ExporterViewModel(format);
     }
 
     public void browse() {
-        FileDialogConfiguration fileDialogConfiguration =
-            new FileDialogConfiguration.Builder()
-                .addExtensionFilter(
-                    Localization.lang("Custom layout file"),
-                    StandardFileType.LAYOUT
-                )
-                .withDefaultExtension(
-                    Localization.lang("Custom layout file"),
-                    StandardFileType.LAYOUT
-                )
-                .withInitialDirectory(
-                    preferences
-                        .getExportPreferences()
-                        .getExportWorkingDirectory()
-                )
-                .build();
+        FileDialogConfiguration fileDialogConfiguration = new FileDialogConfiguration.Builder()
+            .addExtensionFilter(Localization.lang("Custom layout file"), StandardFileType.LAYOUT)
+            .withDefaultExtension(Localization.lang("Custom layout file"), StandardFileType.LAYOUT)
+            .withInitialDirectory(preferences.getExportPreferences().getExportWorkingDirectory())
+            .build();
         dialogService
             .showFileOpenDialog(fileDialogConfiguration)
             .ifPresent(f -> layoutFile.set(f.toAbsolutePath().toString()));
diff --git a/src/main/java/org/jabref/gui/exporter/ExportCommand.java b/src/main/java/org/jabref/gui/exporter/ExportCommand.java
index f07dbe9f6a9..06ddf5a72b4 100644
--- a/src/main/java/org/jabref/gui/exporter/ExportCommand.java
+++ b/src/main/java/org/jabref/gui/exporter/ExportCommand.java
@@ -43,9 +43,7 @@ public enum ExportMethod {
         EXPORT_SELECTED,
     }
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(
-        ExportCommand.class
-    );
+    private static final Logger LOGGER = LoggerFactory.getLogger(ExportCommand.class);
 
     private final ExportMethod exportMethod;
     private final JabRefFrame frame;
@@ -85,38 +83,22 @@ public ExportCommand(
     @Override
     public void execute() {
         // Get list of exporters and sort before adding to file dialog
-        ExporterFactory exporterFactory = ExporterFactory.create(
-            preferences,
-            entryTypesManager
-        );
+        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();
+        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
-                )
+                export(path, fileDialogConfiguration.getSelectedExtensionFilter(), exporters)
             );
     }
 
@@ -125,10 +107,7 @@ private void export(
         FileChooser.ExtensionFilter selectedExtensionFilter,
         List<Exporter> exporters
     ) {
-        String selectedExtension = selectedExtensionFilter
-            .getExtensions()
-            .get(0)
-            .replace("*", "");
+        String selectedExtension = selectedExtensionFilter.getExtensions().get(0).replace("*", "");
         if (!file.endsWith(selectedExtension)) {
             FileUtil.addExtension(file, selectedExtension);
         }
@@ -136,9 +115,7 @@ private void export(
         final Exporter format = FileFilterConverter
             .getExporter(selectedExtensionFilter, exporters)
             .orElseThrow(() ->
-                new IllegalStateException(
-                    "User didn't selected a file type for the extension"
-                )
+                new IllegalStateException("User didn't selected a file type for the extension")
             );
         List<BibEntry> entries;
         if (exportMethod == ExportMethod.EXPORT_SELECTED) {
@@ -156,18 +133,12 @@ private void export(
         List<Path> fileDirForDatabase = stateManager
             .getActiveDatabase()
             .map(db -> db.getFileDirectories(preferences.getFilePreferences()))
-            .orElse(
-                List.of(preferences.getFilePreferences().getWorkingDirectory())
-            );
+            .orElse(List.of(preferences.getFilePreferences().getWorkingDirectory()));
 
         // Make sure we remember which filter was used, to set
         // the default for next time:
-        preferences
-            .getExportPreferences()
-            .setLastExportExtension(format.getName());
-        preferences
-            .getExportPreferences()
-            .setExportWorkingDirectory(file.getParent());
+        preferences.getExportPreferences().setLastExportExtension(format.getName());
+        preferences.getExportPreferences().setExportWorkingDirectory(file.getParent());
 
         final List<BibEntry> finEntries = entries;
 
@@ -188,9 +159,7 @@ private void export(
                     .getNotificationPane();
                 notificationPane.notify(
                     IconTheme.JabRefIcons.FOLDER.getGraphicNode(),
-                    Localization.lang(
-                        "Export operation finished successfully."
-                    ),
+                    Localization.lang("Export operation finished successfully."),
                     List.of(
                         new Action(
                             Localization.lang("Reveal in File Explorer"),
@@ -202,10 +171,7 @@ private void export(
                                         dialogService
                                     );
                                 } catch (IOException e) {
-                                    LOGGER.error(
-                                        "Could not open export folder.",
-                                        e
-                                    );
+                                    LOGGER.error("Could not open export folder.", e);
                                 }
                                 notificationPane.hide();
                             }
diff --git a/src/main/java/org/jabref/gui/exporter/ExportToClipboardAction.java b/src/main/java/org/jabref/gui/exporter/ExportToClipboardAction.java
index 3a508565fbf..63e4a652ed2 100644
--- a/src/main/java/org/jabref/gui/exporter/ExportToClipboardAction.java
+++ b/src/main/java/org/jabref/gui/exporter/ExportToClipboardAction.java
@@ -30,9 +30,7 @@
 
 public class ExportToClipboardAction extends SimpleCommand {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(
-        ExportToClipboardAction.class
-    );
+    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(
@@ -72,9 +70,7 @@ public ExportToClipboardAction(
     public void execute() {
         if (stateManager.getSelectedEntries().isEmpty()) {
             dialogService.notify(
-                Localization.lang(
-                    "This operation requires one or more entries to be selected."
-                )
+                Localization.lang("This operation requires one or more entries to be selected.")
             );
             return;
         }
@@ -87,9 +83,7 @@ public void execute() {
             .getExporters()
             .stream()
             .sorted(Comparator.comparing(Exporter::getName))
-            .filter(exporter ->
-                SUPPORTED_FILETYPES.contains(exporter.getFileType())
-            )
+            .filter(exporter -> SUPPORTED_FILETYPES.contains(exporter.getFileType()))
             .collect(Collectors.toList());
 
         // Find default choice, if any
@@ -98,23 +92,18 @@ public void execute() {
             .filter(exporter ->
                 exporter
                     .getName()
-                    .equals(
-                        preferences
-                            .getExportPreferences()
-                            .getLastExportExtension()
-                    )
+                    .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
-            );
+        Optional<Exporter> selectedExporter = dialogService.showChoiceDialogAndWait(
+            Localization.lang("Export"),
+            Localization.lang("Select export format"),
+            Localization.lang("Export"),
+            defaultChoice,
+            exporters
+        );
 
         selectedExporter.ifPresent(exporter ->
             BackgroundTask
@@ -122,10 +111,7 @@ public void execute() {
                 .onSuccess(this::setContentToClipboard)
                 .onFailure(ex -> {
                     LOGGER.error("Error exporting to clipboard", ex);
-                    dialogService.showErrorDialogAndWait(
-                        "Error exporting to clipboard",
-                        ex
-                    );
+                    dialogService.showErrorDialogAndWait("Error exporting to clipboard", ex);
                 })
                 .executeWith(taskExecutor)
         );
@@ -135,14 +121,10 @@ private ExportResult exportToClipboard(Exporter exporter) throws Exception {
         List<Path> fileDirForDatabase = stateManager
             .getActiveDatabase()
             .map(db -> db.getFileDirectories(preferences.getFilePreferences()))
-            .orElse(
-                List.of(preferences.getFilePreferences().getWorkingDirectory())
-            );
+            .orElse(List.of(preferences.getFilePreferences().getWorkingDirectory()));
 
         // Add chosen export type to last used preference, to become default
-        preferences
-            .getExportPreferences()
-            .setLastExportExtension(exporter.getName());
+        preferences.getExportPreferences().setLastExportExtension(exporter.getName());
 
         Path tmp = null;
         try {
@@ -162,10 +144,7 @@ private ExportResult exportToClipboard(Exporter exporter) throws Exception {
             );
             // Read the file and put the contents on the clipboard:
 
-            return new ExportResult(
-                Files.readString(tmp),
-                exporter.getFileType()
-            );
+            return new ExportResult(Files.readString(tmp), exporter.getFileType());
         } finally {
             // Clean up:
             if ((tmp != null) && Files.exists(tmp)) {
@@ -192,9 +171,7 @@ private void setContentToClipboard(ExportResult result) {
         this.clipBoardManager.setContent(clipboardContent);
 
         dialogService.notify(
-            Localization.lang("Entries exported to clipboard") +
-            ": " +
-            entries.size()
+            Localization.lang("Entries exported to clipboard") + ": " + entries.size()
         );
     }
 
diff --git a/src/main/java/org/jabref/gui/exporter/SaveAction.java b/src/main/java/org/jabref/gui/exporter/SaveAction.java
index 6b05df458c2..ab20bdf19db 100644
--- a/src/main/java/org/jabref/gui/exporter/SaveAction.java
+++ b/src/main/java/org/jabref/gui/exporter/SaveAction.java
@@ -38,9 +38,7 @@ public SaveAction(
         this.preferencesService = preferencesService;
 
         if (saveMethod == SaveMethod.SAVE_SELECTED) {
-            this.executable.bind(
-                    ActionHelper.needsEntriesSelected(stateManager)
-                );
+            this.executable.bind(ActionHelper.needsEntriesSelected(stateManager));
         } else {
             this.executable.bind(ActionHelper.needsDatabase(stateManager));
         }
diff --git a/src/main/java/org/jabref/gui/exporter/SaveAllAction.java b/src/main/java/org/jabref/gui/exporter/SaveAllAction.java
index 8e72f66165b..b38b1e000fe 100644
--- a/src/main/java/org/jabref/gui/exporter/SaveAllAction.java
+++ b/src/main/java/org/jabref/gui/exporter/SaveAllAction.java
@@ -14,10 +14,7 @@ public class SaveAllAction extends SimpleCommand {
     private final DialogService dialogService;
     private final PreferencesService preferencesService;
 
-    public SaveAllAction(
-        JabRefFrame frame,
-        PreferencesService preferencesService
-    ) {
+    public SaveAllAction(JabRefFrame frame, PreferencesService preferencesService) {
         this.frame = frame;
         this.dialogService = frame.getDialogService();
         this.preferencesService = preferencesService;
diff --git a/src/main/java/org/jabref/gui/exporter/SaveDatabaseAction.java b/src/main/java/org/jabref/gui/exporter/SaveDatabaseAction.java
index 7e25c77c908..b9a871d44ab 100644
--- a/src/main/java/org/jabref/gui/exporter/SaveDatabaseAction.java
+++ b/src/main/java/org/jabref/gui/exporter/SaveDatabaseAction.java
@@ -53,9 +53,7 @@
  */
 public class SaveDatabaseAction {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(
-        SaveDatabaseAction.class
-    );
+    private static final Logger LOGGER = LoggerFactory.getLogger(SaveDatabaseAction.class);
 
     private final LibraryTab libraryTab;
     private final DialogService dialogService;
@@ -80,10 +78,7 @@ public SaveDatabaseAction(
     }
 
     public boolean save() {
-        return save(
-            libraryTab.getBibDatabaseContext(),
-            SaveDatabaseMode.NORMAL
-        );
+        return save(libraryTab.getBibDatabaseContext(), SaveDatabaseMode.NORMAL);
     }
 
     public boolean save(SaveDatabaseMode mode) {
@@ -109,16 +104,15 @@ private SelfContainedSaveOrder 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();
+                    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()
-                            )
+                            .map(column -> ((MainTableColumn<?>) column).getModel())
                             .flatMap(model -> model.getSortCriteria().stream())
                             .toList()
                     );
@@ -140,21 +134,12 @@ public void saveSelectedAsPlain() {
                         BibDatabaseWriter.SaveType.PLAIN_BIBTEX,
                         getSaveOrder()
                     );
-                    preferences
-                        .getGuiPreferences()
-                        .getFileHistory()
-                        .newFile(path);
+                    preferences.getGuiPreferences().getFileHistory().newFile(path);
                     dialogService.notify(
-                        Localization.lang(
-                            "Saved selected to '%0'.",
-                            path.toString()
-                        )
+                        Localization.lang("Saved selected to '%0'.", path.toString())
                     );
                 } catch (SaveException ex) {
-                    LOGGER.error(
-                        "A problem occurred when trying to save the file",
-                        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."),
@@ -188,9 +173,7 @@ boolean saveAs(Path file, SaveDatabaseMode mode) {
         // Set new location
         if (context.getLocation() == DatabaseLocation.SHARED) {
             // Save all properties dependent on the ID. This makes it possible to restore them.
-            new SharedDatabasePreferences(
-                context.getDatabase().generateSharedDatabaseID()
-            )
+            new SharedDatabasePreferences(context.getDatabase().generateSharedDatabaseID())
                 .putAllDBMSConnectionProperties(
                     context.getDBMSSynchronizer().getConnectionProperties()
                 );
@@ -221,32 +204,19 @@ 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();
-        Optional<Path> selectedPath = dialogService.showFileSaveDialog(
-            fileDialogConfiguration
-        );
+        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())
+            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"))
-            ) {
+            if (!(savePath.getFileName().toString().toLowerCase().endsWith(".bib"))) {
                 savePath = Path.of(savePath.toString() + ".bib");
                 if (!Files.notExists(savePath)) {
                     if (
@@ -267,10 +237,7 @@ private Optional<Path> askForSavePath() {
         return selectedPath;
     }
 
-    private boolean save(
-        BibDatabaseContext bibDatabaseContext,
-        SaveDatabaseMode mode
-    ) {
+    private boolean save(BibDatabaseContext bibDatabaseContext, SaveDatabaseMode mode) {
         Optional<Path> databasePath = bibDatabaseContext.getDatabasePath();
         if (databasePath.isEmpty()) {
             Optional<Path> savePath = askForSavePath();
@@ -285,9 +252,7 @@ private boolean save(
 
     private boolean save(Path targetPath, SaveDatabaseMode mode) {
         if (mode == SaveDatabaseMode.NORMAL) {
-            dialogService.notify(
-                String.format("%s...", Localization.lang("Saving library"))
-            );
+            dialogService.notify(String.format("%s...", Localization.lang("Saving library")));
         }
 
         synchronized (libraryTab) {
@@ -327,10 +292,7 @@ private boolean save(Path targetPath, SaveDatabaseMode mode) {
             return success;
         } catch (SaveException ex) {
             LOGGER.error(
-                String.format(
-                    "A problem occurred when trying to save the file %s",
-                    targetPath
-                ),
+                String.format("A problem occurred when trying to save the file %s", targetPath),
                 ex
             );
             dialogService.showErrorDialogAndWait(
@@ -353,15 +315,13 @@ private boolean saveDatabase(
         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();
+        SelfContainedSaveConfiguration saveConfiguration = new SelfContainedSaveConfiguration(
+            saveOrder,
+            false,
+            saveType,
+            preferences.getLibraryPreferences().shouldAlwaysReformatOnSave()
+        );
+        BibDatabaseContext bibDatabaseContext = libraryTab.getBibDatabaseContext();
         synchronized (bibDatabaseContext) {
             try (
                 AtomicFileWriter fileWriter = new AtomicFileWriter(
@@ -391,9 +351,7 @@ private boolean saveDatabase(
                     databaseWriter.saveDatabase(bibDatabaseContext);
                 }
 
-                libraryTab.registerUndoableChanges(
-                    databaseWriter.getSaveActionsFieldChanges()
-                );
+                libraryTab.registerUndoableChanges(databaseWriter.getSaveActionsFieldChanges());
 
                 if (fileWriter.hasEncodingProblems()) {
                     saveWithDifferentEncoding(
@@ -440,10 +398,7 @@ private void saveWithDifferentEncoding(
                     )
                 ),
                 new Text(
-                    encodingProblems
-                        .stream()
-                        .map(Object::toString)
-                        .collect(Collectors.joining("."))
+                    encodingProblems.stream().map(Object::toString).collect(Collectors.joining("."))
                 ),
                 new Text(Localization.lang("What do you want to do?"))
             );
@@ -453,10 +408,7 @@ private void saveWithDifferentEncoding(
             Localization.lang("Try different encoding"),
             ButtonBar.ButtonData.OTHER
         );
-        ButtonType ignore = new ButtonType(
-            Localization.lang("Ignore"),
-            ButtonBar.ButtonData.APPLY
-        );
+        ButtonType ignore = new ButtonType(Localization.lang("Ignore"), ButtonBar.ButtonData.APPLY);
         boolean saveWithDifferentEncoding = dialogService
             .showCustomDialogAndWait(
                 Localization.lang("Save library"),
@@ -467,31 +419,21 @@ private void saveWithDifferentEncoding(
             .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
-                    );
+                    .setEncoding(newEncoding.get(), ChangePropagation.DO_NOT_POST_EVENT);
 
-                saveDatabase(
-                    file,
-                    selectedOnly,
-                    newEncoding.get(),
-                    saveType,
-                    saveOrder
-                );
+                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 4415f2e68d2..4fb6032a492 100644
--- a/src/main/java/org/jabref/gui/exporter/WriteMetadataToLinkedPdfsAction.java
+++ b/src/main/java/org/jabref/gui/exporter/WriteMetadataToLinkedPdfsAction.java
@@ -67,9 +67,7 @@ public WriteMetadataToLinkedPdfsAction(
 
     @Override
     public void execute() {
-        BibDatabaseContext databaseContext = stateManager
-            .getActiveDatabase()
-            .get();
+        BibDatabaseContext databaseContext = stateManager.getActiveDatabase().get();
         if (stateManager.getActiveDatabase().isEmpty()) {
             return;
         }
@@ -81,17 +79,13 @@ 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."
-                    )
+                    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?"
-                    )
+                    Localization.lang("Write metadata for all PDFs in current library?")
                 );
                 if (!confirm) {
                     return;
@@ -171,10 +165,7 @@ protected Void call() throws Exception {
                     .getFiles()
                     .stream()
                     .map(file ->
-                        file.findIn(
-                            stateManager.getActiveDatabase().get(),
-                            filePreferences
-                        )
+                        file.findIn(stateManager.getActiveDatabase().get(), filePreferences)
                     )
                     .filter(Optional::isPresent)
                     .map(Optional::get)
@@ -183,18 +174,13 @@ protected Void call() throws Exception {
                 if (files.isEmpty()) {
                     LOGGER.debug(
                         "Skipped empty entry '{}'",
-                        entry
-                            .getCitationKey()
-                            .orElse(entry.getAuthorTitleYear(16))
+                        entry.getCitationKey().orElse(entry.getAuthorTitleYear(16))
                     );
                     skipped++;
                 } else {
                     for (Path file : files) {
                         updateMessage(
-                            Localization.lang(
-                                "Writing metadata to %0",
-                                file.getFileName()
-                            )
+                            Localization.lang("Writing metadata to %0", file.getFileName())
                         );
 
                         if (Files.exists(file)) {
@@ -211,11 +197,7 @@ protected Void call() throws Exception {
                                 );
                                 entriesChanged++;
                             } catch (Exception e) {
-                                LOGGER.error(
-                                    "Error while writing XMP data to pdf '{}'",
-                                    file,
-                                    e
-                                );
+                                LOGGER.error("Error while writing XMP data to pdf '{}'", file, e);
                                 failedWrittenFiles.add(file);
                                 errors++;
                             }
@@ -232,10 +214,7 @@ protected Void call() throws Exception {
             dialogService.notify(
                 Localization.lang(
                     "Finished writing metadata for library %0 (%1 succeeded, %2 skipped, %3 errors).",
-                    databaseContext
-                        .getDatabasePath()
-                        .map(Path::toString)
-                        .orElse("undefined"),
+                    databaseContext.getDatabasePath().map(Path::toString).orElse("undefined"),
                     String.valueOf(entriesChanged),
                     String.valueOf(skipped),
                     String.valueOf(errors)
@@ -243,9 +222,7 @@ protected Void call() throws Exception {
             );
 
             if (!failedWrittenFiles.isEmpty()) {
-                LOGGER.error(
-                    "Failed to write XMP data to PDFs:\n" + failedWrittenFiles
-                );
+                LOGGER.error("Failed to write XMP data to PDFs:\n" + failedWrittenFiles);
             }
 
             return null;
diff --git a/src/main/java/org/jabref/gui/externalfiles/AutoLinkFilesAction.java b/src/main/java/org/jabref/gui/externalfiles/AutoLinkFilesAction.java
index 0beff3a18e7..b7924a8a584 100644
--- a/src/main/java/org/jabref/gui/externalfiles/AutoLinkFilesAction.java
+++ b/src/main/java/org/jabref/gui/externalfiles/AutoLinkFilesAction.java
@@ -43,16 +43,13 @@ public AutoLinkFilesAction(
         this.taskExecutor = taskExecutor;
 
         this.executable.bind(
-                needsDatabase(this.stateManager)
-                    .and(needsEntriesSelected(stateManager))
+                needsDatabase(this.stateManager).and(needsEntriesSelected(stateManager))
             );
         this.statusMessage.bind(
                 BindingsHelper.ifThenElse(
                     executable,
                     "",
-                    Localization.lang(
-                        "This operation requires one or more entries to be selected."
-                    )
+                    Localization.lang("This operation requires one or more entries to be selected.")
                 )
             );
     }
@@ -72,56 +69,49 @@ public void execute() {
             Localization.lang("Automatically set file links")
         );
 
-        Task<AutoSetFileLinksUtil.LinkFilesResult> linkFilesTask =
-            new Task<>() {
-                @Override
-                protected AutoSetFileLinksUtil.LinkFilesResult call() {
-                    return util.linkAssociatedFiles(entries, nc);
-                }
-
-                @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;
-                    }
+        Task<AutoSetFileLinksUtil.LinkFilesResult> linkFilesTask = new Task<>() {
+            @Override
+            protected AutoSetFileLinksUtil.LinkFilesResult call() {
+                return util.linkAssociatedFiles(entries, nc);
+            }
 
-                    if (result.getChangedEntries().isEmpty()) {
-                        dialogService.showWarningDialogAndWait(
-                            "Automatically set file links",
-                            Localization.lang(
-                                "Finished automatically setting external links."
-                            ) +
-                            "\n" +
-                            Localization.lang("No files found.")
-                        );
-                        return;
-                    }
+            @Override
+            protected void succeeded() {
+                AutoSetFileLinksUtil.LinkFilesResult result = getValue();
 
-                    if (nc.hasEdits()) {
-                        nc.end();
-                        undoManager.addEdit(nc);
-                    }
+                if (!result.getFileExceptions().isEmpty()) {
+                    dialogService.showWarningDialogAndWait(
+                        Localization.lang("Automatically set file links"),
+                        Localization.lang("Problem finding files. See error log for details.")
+                    );
+                    return;
+                }
 
-                    dialogService.notify(
-                        Localization.lang(
-                            "Finished automatically setting external links."
-                        ) +
-                        " " +
-                        Localization.lang(
-                            "Changed %0 entries.",
-                            String.valueOf(result.getChangedEntries().size())
-                        )
+                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 381372a7303..2c6a6fb0f98 100644
--- a/src/main/java/org/jabref/gui/externalfiles/AutoSetFileLinksUtil.java
+++ b/src/main/java/org/jabref/gui/externalfiles/AutoSetFileLinksUtil.java
@@ -50,9 +50,7 @@ public List<IOException> getFileExceptions() {
         }
     }
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(
-        AutoSetFileLinksUtil.class
-    );
+    private static final Logger LOGGER = LoggerFactory.getLogger(AutoSetFileLinksUtil.class);
     private final List<Path> directories;
     private final AutoLinkPreferences autoLinkPreferences;
     private final FilePreferences filePreferences;
@@ -79,10 +77,7 @@ private AutoSetFileLinksUtil(
         this.filePreferences = filePreferences;
     }
 
-    public LinkFilesResult linkAssociatedFiles(
-        List<BibEntry> entries,
-        NamedCompound ce
-    ) {
+    public LinkFilesResult linkAssociatedFiles(List<BibEntry> entries, NamedCompound ce) {
         LinkFilesResult result = new LinkFilesResult();
 
         for (BibEntry entry : entries) {
@@ -100,12 +95,8 @@ public LinkFilesResult linkAssociatedFiles(
 
                 for (LinkedFile linkedFile : linkedFiles) {
                     // store undo information
-                    String newVal = FileFieldWriter.getStringRepresentation(
-                        linkedFile
-                    );
-                    String oldVal = entry
-                        .getField(StandardField.FILE)
-                        .orElse(null);
+                    String newVal = FileFieldWriter.getStringRepresentation(linkedFile);
+                    String oldVal = entry.getField(StandardField.FILE).orElse(null);
                     UndoableFieldChange fieldChange = new UndoableFieldChange(
                         entry,
                         StandardField.FILE,
@@ -128,8 +119,7 @@ public LinkFilesResult linkAssociatedFiles(
         return result;
     }
 
-    public List<LinkedFile> findAssociatedNotLinkedFiles(BibEntry entry)
-        throws IOException {
+    public List<LinkedFile> findAssociatedNotLinkedFiles(BibEntry entry) throws IOException {
         List<LinkedFile> linkedFiles = new ArrayList<>();
 
         List<String> extensions = filePreferences
@@ -139,14 +129,8 @@ public List<LinkedFile> findAssociatedNotLinkedFiles(BibEntry entry)
             .collect(Collectors.toList());
 
         // Run the search operation
-        FileFinder fileFinder = FileFinders.constructFromConfiguration(
-            autoLinkPreferences
-        );
-        List<Path> result = fileFinder.findAssociatedFiles(
-            entry,
-            directories,
-            extensions
-        );
+        FileFinder fileFinder = FileFinders.constructFromConfiguration(autoLinkPreferences);
+        List<Path> result = fileFinder.findAssociatedFiles(entry, directories, extensions);
 
         // Collect the found files that are not yet linked
         for (Path foundFile : result) {
@@ -156,10 +140,7 @@ public List<LinkedFile> findAssociatedNotLinkedFiles(BibEntry entry)
                 .map(file -> file.findIn(directories))
                 .anyMatch(file -> {
                     try {
-                        return (
-                            file.isPresent() &&
-                            Files.isSameFile(file.get(), foundFile)
-                        );
+                        return (file.isPresent() && Files.isSameFile(file.get(), foundFile));
                     } catch (IOException e) {
                         LOGGER.error("Problem with isSameFile", e);
                     }
@@ -170,23 +151,13 @@ public List<LinkedFile> findAssociatedNotLinkedFiles(BibEntry entry)
                 Optional<ExternalFileType> type = FileUtil
                     .getFileExtension(foundFile)
                     .map(extension ->
-                        ExternalFileTypes.getExternalFileTypeByExt(
-                            extension,
-                            filePreferences
-                        )
+                        ExternalFileTypes.getExternalFileTypeByExt(extension, filePreferences)
                     )
                     .orElse(Optional.of(new UnknownExternalFileType("")));
 
                 String strType = type.isPresent() ? type.get().getName() : "";
-                Path relativeFilePath = FileUtil.relativize(
-                    foundFile,
-                    directories
-                );
-                LinkedFile linkedFile = new LinkedFile(
-                    "",
-                    relativeFilePath,
-                    strType
-                );
+                Path relativeFilePath = FileUtil.relativize(foundFile, directories);
+                LinkedFile linkedFile = new LinkedFile("", relativeFilePath, strType);
                 linkedFiles.add(linkedFile);
             }
         }
diff --git a/src/main/java/org/jabref/gui/externalfiles/ChainedFilters.java b/src/main/java/org/jabref/gui/externalfiles/ChainedFilters.java
index fceee97a984..bc6d593463b 100644
--- a/src/main/java/org/jabref/gui/externalfiles/ChainedFilters.java
+++ b/src/main/java/org/jabref/gui/externalfiles/ChainedFilters.java
@@ -12,9 +12,7 @@
  */
 public class ChainedFilters implements DirectoryStream.Filter<Path> {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(
-        ChainedFilters.class
-    );
+    private static final Logger LOGGER = LoggerFactory.getLogger(ChainedFilters.class);
 
     private DirectoryStream.Filter<Path>[] filters;
 
diff --git a/src/main/java/org/jabref/gui/externalfiles/DownloadFullTextAction.java b/src/main/java/org/jabref/gui/externalfiles/DownloadFullTextAction.java
index 69558baf198..5243867212f 100644
--- a/src/main/java/org/jabref/gui/externalfiles/DownloadFullTextAction.java
+++ b/src/main/java/org/jabref/gui/externalfiles/DownloadFullTextAction.java
@@ -26,9 +26,7 @@
  */
 public class DownloadFullTextAction extends SimpleCommand {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(
-        DownloadFullTextAction.class
-    );
+    private static final Logger LOGGER = LoggerFactory.getLogger(DownloadFullTextAction.class);
     // The minimum number of selected entries to ask the user for confirmation
     private static final int WARNING_LIMIT = 5;
 
@@ -63,27 +61,24 @@ public void execute() {
             return;
         }
 
-        dialogService.notify(
-            Localization.lang("Looking for full text document...")
-        );
+        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."));
@@ -94,8 +89,7 @@ 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<>();
+                Map<BibEntry, Optional<URL>> downloads = new ConcurrentHashMap<>();
                 int count = 0;
                 for (BibEntry entry : entries) {
                     FulltextFetchers fetchers = new FulltextFetchers(
@@ -110,10 +104,7 @@ protected Map<BibEntry, Optional<URL>> call() {
         };
 
         findFullTextsTask.setOnSucceeded(value ->
-            downloadFullTexts(
-                findFullTextsTask.getValue(),
-                stateManager.getActiveDatabase().get()
-            )
+            downloadFullTexts(findFullTextsTask.getValue(), stateManager.getActiveDatabase().get())
         );
 
         dialogService.showProgressDialog(
@@ -129,10 +120,7 @@ private void downloadFullTexts(
         Map<BibEntry, Optional<URL>> downloads,
         BibDatabaseContext databaseContext
     ) {
-        for (Map.Entry<
-            BibEntry,
-            Optional<URL>
-        > download : downloads.entrySet()) {
+        for (Map.Entry<BibEntry, Optional<URL>> download : downloads.entrySet()) {
             BibEntry entry = download.getKey();
             Optional<URL> result = download.getValue();
             if (result.isPresent()) {
@@ -141,9 +129,7 @@ private void downloadFullTexts(
                 dialogService.notify(
                     Localization.lang(
                         "No full text document found for entry %0.",
-                        entry
-                            .getCitationKey()
-                            .orElse(Localization.lang("undefined"))
+                        entry.getCitationKey().orElse(Localization.lang("undefined"))
                     )
                 );
             }
@@ -158,11 +144,7 @@ private void downloadFullTexts(
      * @param url             the url "key"
      * @param entry           the entry "value"
      */
-    private void addLinkedFileFromURL(
-        BibDatabaseContext databaseContext,
-        URL url,
-        BibEntry entry
-    ) {
+    private void addLinkedFileFromURL(BibDatabaseContext databaseContext, URL url, BibEntry entry) {
         LinkedFile newLinkedFile = new LinkedFile(url, "");
 
         if (!entry.getFiles().contains(newLinkedFile)) {
@@ -180,9 +162,7 @@ private void addLinkedFileFromURL(
             dialogService.notify(
                 Localization.lang(
                     "Full text document for entry %0 already linked.",
-                    entry
-                        .getCitationKey()
-                        .orElse(Localization.lang("undefined"))
+                    entry.getCitationKey().orElse(Localization.lang("undefined"))
                 )
             );
         }
diff --git a/src/main/java/org/jabref/gui/externalfiles/ExternalFilesEntryLinker.java b/src/main/java/org/jabref/gui/externalfiles/ExternalFilesEntryLinker.java
index 588a91bfb3a..31b13096665 100644
--- a/src/main/java/org/jabref/gui/externalfiles/ExternalFilesEntryLinker.java
+++ b/src/main/java/org/jabref/gui/externalfiles/ExternalFilesEntryLinker.java
@@ -27,9 +27,7 @@
 
 public class ExternalFilesEntryLinker {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(
-        ExternalFilesEntryLinker.class
-    );
+    private static final Logger LOGGER = LoggerFactory.getLogger(ExternalFilesEntryLinker.class);
 
     private final FilePreferences filePreferences;
     private final BibDatabaseContext bibDatabaseContext;
@@ -44,20 +42,17 @@ public ExternalFilesEntryLinker(
     ) {
         this.filePreferences = filePreferences;
         this.bibDatabaseContext = bibDatabaseContext;
-        this.moveFilesCleanup =
-            new MoveFilesCleanup(bibDatabaseContext, filePreferences);
-        this.renameFilesCleanup =
-            new RenamePdfCleanup(false, bibDatabaseContext, filePreferences);
+        this.moveFilesCleanup = new MoveFilesCleanup(bibDatabaseContext, filePreferences);
+        this.renameFilesCleanup = new RenamePdfCleanup(false, bibDatabaseContext, filePreferences);
         this.dialogService = dialogService;
     }
 
     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());
+            Path targetFile = firstExistingFileDir.get().resolve(file.getFileName());
             if (FileUtil.copyFile(file, targetFile, false)) {
                 return Optional.of(targetFile);
             }
@@ -86,11 +81,7 @@ public void addFilesToEntry(BibEntry entry, List<Path> files) {
                         file,
                         bibDatabaseContext.getFileDirectories(filePreferences)
                     );
-                    LinkedFile linkedfile = new LinkedFile(
-                        "",
-                        relativePath,
-                        type.getName()
-                    );
+                    LinkedFile linkedfile = new LinkedFile("", relativePath, type.getName());
                     entry.addFile(linkedfile);
                 });
         }
@@ -129,10 +120,7 @@ public void copyFilesToFileDirAndAddToEntry(
             for (Path file : files) {
                 copyFileToFileDir(file)
                     .ifPresent(copiedFile ->
-                        addFilesToEntry(
-                            entry,
-                            Collections.singletonList(copiedFile)
-                        )
+                        addFilesToEntry(entry, Collections.singletonList(copiedFile))
                     );
             }
             renameLinkedFilesToPattern(entry);
@@ -160,18 +148,14 @@ private List<Path> getValidFileNames(List<Path> filesToAdd) {
                     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")
-                    );
+                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/FileDownloadTask.java b/src/main/java/org/jabref/gui/externalfiles/FileDownloadTask.java
index 0eb13920e33..a2dabad3161 100644
--- a/src/main/java/org/jabref/gui/externalfiles/FileDownloadTask.java
+++ b/src/main/java/org/jabref/gui/externalfiles/FileDownloadTask.java
@@ -25,21 +25,13 @@ protected 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
-            );
+            Files.copy(inputStream, destination, StandardCopyOption.REPLACE_EXISTING);
         }
 
         return destination;
diff --git a/src/main/java/org/jabref/gui/externalfiles/FileExtensionViewModel.java b/src/main/java/org/jabref/gui/externalfiles/FileExtensionViewModel.java
index b2147dfa18d..c777ceac704 100644
--- a/src/main/java/org/jabref/gui/externalfiles/FileExtensionViewModel.java
+++ b/src/main/java/org/jabref/gui/externalfiles/FileExtensionViewModel.java
@@ -26,8 +26,7 @@ public class FileExtensionViewModel {
 
     public String getDescription() {
         return (
-            this.description +
-            extensions.stream().collect(Collectors.joining(", ", " (", ")"))
+            this.description + extensions.stream().collect(Collectors.joining(", ", " (", ")"))
         );
     }
 
diff --git a/src/main/java/org/jabref/gui/externalfiles/FileFilterUtils.java b/src/main/java/org/jabref/gui/externalfiles/FileFilterUtils.java
index 10c065e816f..1bb115c93c0 100644
--- a/src/main/java/org/jabref/gui/externalfiles/FileFilterUtils.java
+++ b/src/main/java/org/jabref/gui/externalfiles/FileFilterUtils.java
@@ -14,9 +14,7 @@
 
 public class FileFilterUtils {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(
-        FileFilterUtils.class
-    );
+    private static final Logger LOGGER = LoggerFactory.getLogger(FileFilterUtils.class);
 
     /* Returns the last edited time of a file as LocalDateTime. */
     public static LocalDateTime getFileTime(Path path) {
@@ -119,10 +117,7 @@ public List<Path> sortByDateDescending(List<Path> files) {
      * Sorts a list of Path objects according to the last edited date
      * the order depends on the specified sorter type.
      */
-    public static List<Path> sortByDate(
-        List<Path> files,
-        ExternalFileSorter sortType
-    ) {
+    public static List<Path> sortByDate(List<Path> files, ExternalFileSorter sortType) {
         FileFilterUtils fileFilter = new FileFilterUtils();
         List<Path> sortedFiles =
             switch (sortType) {
diff --git a/src/main/java/org/jabref/gui/externalfiles/FindUnlinkedFilesAction.java b/src/main/java/org/jabref/gui/externalfiles/FindUnlinkedFilesAction.java
index 2fed0518a8a..60eadc8f004 100644
--- a/src/main/java/org/jabref/gui/externalfiles/FindUnlinkedFilesAction.java
+++ b/src/main/java/org/jabref/gui/externalfiles/FindUnlinkedFilesAction.java
@@ -11,10 +11,7 @@ public class FindUnlinkedFilesAction extends SimpleCommand {
     private final DialogService dialogService;
     private final StateManager stateManager;
 
-    public FindUnlinkedFilesAction(
-        DialogService dialogService,
-        StateManager stateManager
-    ) {
+    public FindUnlinkedFilesAction(DialogService dialogService, StateManager stateManager) {
         this.dialogService = dialogService;
         this.stateManager = stateManager;
 
diff --git a/src/main/java/org/jabref/gui/externalfiles/GitIgnoreFileFilter.java b/src/main/java/org/jabref/gui/externalfiles/GitIgnoreFileFilter.java
index 8ffb899c875..03e0995f8ae 100644
--- a/src/main/java/org/jabref/gui/externalfiles/GitIgnoreFileFilter.java
+++ b/src/main/java/org/jabref/gui/externalfiles/GitIgnoreFileFilter.java
@@ -16,18 +16,13 @@
 
 public class GitIgnoreFileFilter implements DirectoryStream.Filter<Path> {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(
-        GitIgnoreFileFilter.class
-    );
+    private static final Logger LOGGER = LoggerFactory.getLogger(GitIgnoreFileFilter.class);
 
     private Set<PathMatcher> gitIgnorePatterns;
 
     public GitIgnoreFileFilter(Path path) {
         Path currentPath = path;
-        while (
-            (currentPath != null) &&
-            !Files.exists(currentPath.resolve(".gitignore"))
-        ) {
+        while ((currentPath != null) && !Files.exists(currentPath.resolve(".gitignore"))) {
             currentPath = currentPath.getParent();
         }
         if (currentPath == null) {
@@ -38,9 +33,7 @@ public GitIgnoreFileFilter(Path path) {
                     .stream()
                     // duplicate code as below
                     .map(line -> "glob:" + line)
-                    .map(matcherString ->
-                        FileSystems.getDefault().getPathMatcher(matcherString)
-                    )
+                    .map(matcherString -> FileSystems.getDefault().getPathMatcher(matcherString))
                     .collect(Collectors.toSet());
         } else {
             Path gitIgnore = currentPath.resolve(".gitignore");
@@ -53,16 +46,11 @@ public GitIgnoreFileFilter(Path path) {
                     .filter(line -> !line.startsWith("#"))
                     // convert to Java syntax for Glob patterns
                     .map(line -> "glob:" + line)
-                    .map(matcherString ->
-                        FileSystems.getDefault().getPathMatcher(matcherString)
-                    )
+                    .map(matcherString -> FileSystems.getDefault().getPathMatcher(matcherString))
                     .collect(Collectors.toSet());
-                gitIgnorePatterns =
-                    new HashSet<>(plainGitIgnorePatternsFromGitIgnoreFile);
+                gitIgnorePatterns = new HashSet<>(plainGitIgnorePatternsFromGitIgnoreFile);
                 // we want to ignore ".gitignore" itself
-                gitIgnorePatterns.add(
-                    FileSystems.getDefault().getPathMatcher("glob:.gitignore")
-                );
+                gitIgnorePatterns.add(FileSystems.getDefault().getPathMatcher("glob:.gitignore"));
             } catch (IOException e) {
                 LOGGER.info("Could not read .gitignore from {}", gitIgnore, e);
                 gitIgnorePatterns = Set.of();
diff --git a/src/main/java/org/jabref/gui/externalfiles/ImportFilesResultItemViewModel.java b/src/main/java/org/jabref/gui/externalfiles/ImportFilesResultItemViewModel.java
index 58616985ee8..6c666e623da 100644
--- a/src/main/java/org/jabref/gui/externalfiles/ImportFilesResultItemViewModel.java
+++ b/src/main/java/org/jabref/gui/externalfiles/ImportFilesResultItemViewModel.java
@@ -17,21 +17,13 @@ public class ImportFilesResultItemViewModel {
     );
     private final StringProperty message = new SimpleStringProperty("");
 
-    public ImportFilesResultItemViewModel(
-        Path file,
-        boolean success,
-        String message
-    ) {
+    public ImportFilesResultItemViewModel(Path file, boolean success, String message) {
         this.file.setValue(file.toString());
         this.message.setValue(message);
         if (success) {
-            this.icon.setValue(
-                    IconTheme.JabRefIcons.CHECK.withColor(Color.GREEN)
-                );
+            this.icon.setValue(IconTheme.JabRefIcons.CHECK.withColor(Color.GREEN));
         } else {
-            this.icon.setValue(
-                    IconTheme.JabRefIcons.WARNING.withColor(Color.RED)
-                );
+            this.icon.setValue(IconTheme.JabRefIcons.WARNING.withColor(Color.RED));
         }
     }
 
diff --git a/src/main/java/org/jabref/gui/externalfiles/ImportHandler.java b/src/main/java/org/jabref/gui/externalfiles/ImportHandler.java
index a4186106052..fd94d2372b1 100644
--- a/src/main/java/org/jabref/gui/externalfiles/ImportHandler.java
+++ b/src/main/java/org/jabref/gui/externalfiles/ImportHandler.java
@@ -55,9 +55,7 @@
 
 public class ImportHandler {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(
-        ImportHandler.class
-    );
+    private static final Logger LOGGER = LoggerFactory.getLogger(ImportHandler.class);
     private final BibDatabaseContext bibDatabaseContext;
     private final PreferencesService preferencesService;
     private final FileUpdateMonitor fileUpdateMonitor;
@@ -91,9 +89,7 @@ public ImportHandler(
                 dialogService
             );
         this.contentImporter =
-            new ExternalFilesContentImporter(
-                preferencesService.getImportFormatPreferences()
-            );
+            new ExternalFilesContentImporter(preferencesService.getImportFormatPreferences());
         this.undoManager = undoManager;
     }
 
@@ -101,13 +97,12 @@ public ExternalFilesEntryLinker getLinker() {
         return linker;
     }
 
-    public BackgroundTask<
-        List<ImportFilesResultItemViewModel>
-    > importFilesInBackground(final List<Path> files) {
+    public BackgroundTask<List<ImportFilesResultItemViewModel>> importFilesInBackground(
+        final List<Path> files
+    ) {
         return new BackgroundTask<>() {
             private int counter;
-            private final List<ImportFilesResultItemViewModel> results =
-                new ArrayList<>();
+            private final List<ImportFilesResultItemViewModel> results = new ArrayList<>();
 
             @Override
             protected List<ImportFilesResultItemViewModel> call() {
@@ -121,19 +116,13 @@ protected List<ImportFilesResultItemViewModel> call() {
                     }
 
                     DefaultTaskExecutor.runInJavaFXThread(() -> {
-                        updateMessage(
-                            Localization.lang(
-                                "Processing file %0",
-                                file.getFileName()
-                            )
-                        );
+                        updateMessage(Localization.lang("Processing file %0", file.getFileName()));
                         updateProgress(counter, files.size() - 1d);
                     });
 
                     try {
                         if (FileUtil.isPDFFile(file)) {
-                            var pdfImporterResult =
-                                contentImporter.importPDFContent(file);
+                            var pdfImporterResult = contentImporter.importPDFContent(file);
                             List<BibEntry> pdfEntriesInFile = pdfImporterResult
                                 .getDatabase()
                                 .getEntries();
@@ -159,9 +148,7 @@ protected List<ImportFilesResultItemViewModel> call() {
                                     )
                                 );
                             } else {
-                                entriesToAdd.add(
-                                    createEmptyEntryWithLink(file)
-                                );
+                                entriesToAdd.add(createEmptyEntryWithLink(file));
                                 addResultToList(
                                     file,
                                     false,
@@ -171,30 +158,21 @@ protected List<ImportFilesResultItemViewModel> call() {
                                 );
                             }
                         } 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()
-                                );
+                                addResultToList(file, false, bibtexParserResult.getErrorMessage());
                             }
 
                             entriesToAdd.addAll(
-                                bibtexParserResult
-                                    .getDatabaseContext()
-                                    .getEntries()
+                                bibtexParserResult.getDatabaseContext().getEntries()
                             );
                             addResultToList(
                                 file,
                                 true,
-                                Localization.lang(
-                                    "Bib entry was successfully imported"
-                                )
+                                Localization.lang("Bib entry was successfully imported")
                             );
                         } else {
                             entriesToAdd.add(createEmptyEntryWithLink(file));
@@ -211,10 +189,7 @@ protected List<ImportFilesResultItemViewModel> call() {
                         addResultToList(
                             file,
                             false,
-                            Localization.lang(
-                                "Error from import: %0",
-                                ex.getLocalizedMessage()
-                            )
+                            Localization.lang("Error from import: %0", ex.getLocalizedMessage())
                         );
 
                         DefaultTaskExecutor.runInJavaFXThread(() ->
@@ -223,15 +198,10 @@ protected List<ImportFilesResultItemViewModel> call() {
                     }
 
                     // We need to run the actual import on the FX Thread, otherwise we will get some deadlocks with the UIThreadList
-                    DefaultTaskExecutor.runInJavaFXThread(() ->
-                        importEntries(entriesToAdd)
-                    );
+                    DefaultTaskExecutor.runInJavaFXThread(() -> importEntries(entriesToAdd));
 
                     ce.addEdit(
-                        new UndoableInsertEntries(
-                            bibDatabaseContext.getDatabase(),
-                            entriesToAdd
-                        )
+                        new UndoableInsertEntries(bibDatabaseContext.getDatabase(), entriesToAdd)
                     );
                     ce.end();
                     undoManager.addEdit(ce);
@@ -241,16 +211,8 @@ protected List<ImportFilesResultItemViewModel> call() {
                 return results;
             }
 
-            private void addResultToList(
-                Path newFile,
-                boolean success,
-                String logMessage
-            ) {
-                var result = new ImportFilesResultItemViewModel(
-                    newFile,
-                    success,
-                    logMessage
-                );
+            private void addResultToList(Path newFile, boolean success, String logMessage) {
+                var result = new ImportFilesResultItemViewModel(newFile, success, logMessage);
                 results.add(result);
             }
         };
@@ -268,9 +230,7 @@ private BibEntry createEmptyEntryWithLink(Path file) {
      * There is no automatic download done.
      */
     public void importEntries(List<BibEntry> entries) {
-        ImportCleanup cleanup = ImportCleanup.targeting(
-            bibDatabaseContext.getMode()
-        );
+        ImportCleanup cleanup = ImportCleanup.targeting(bibDatabaseContext.getMode());
         cleanup.doPostCleanup(entries);
         importCleanedEntries(entries);
     }
@@ -307,13 +267,8 @@ public void importEntryWithDuplicateCheck(
     }
 
     @VisibleForTesting
-    BibEntry cleanUpEntry(
-        BibDatabaseContext bibDatabaseContext,
-        BibEntry entry
-    ) {
-        ImportCleanup cleanup = ImportCleanup.targeting(
-            bibDatabaseContext.getMode()
-        );
+    BibEntry cleanUpEntry(BibDatabaseContext bibDatabaseContext, BibEntry entry) {
+        ImportCleanup cleanup = ImportCleanup.targeting(bibDatabaseContext.getMode());
         return cleanup.doPostCleanup(entry);
     }
 
@@ -386,9 +341,7 @@ public void setAutomaticFields(List<BibEntry> entries) {
     }
 
     public void downloadLinkedFiles(BibEntry entry) {
-        if (
-            preferencesService.getFilePreferences().shouldDownloadLinkedFiles()
-        ) {
+        if (preferencesService.getFilePreferences().shouldDownloadLinkedFiles()) {
             entry
                 .getFiles()
                 .stream()
@@ -407,10 +360,7 @@ public void downloadLinkedFiles(BibEntry entry) {
         }
     }
 
-    private void addToGroups(
-        List<BibEntry> entries,
-        Collection<GroupTreeNode> groups
-    ) {
+    private void addToGroups(List<BibEntry> entries, Collection<GroupTreeNode> groups) {
         for (GroupTreeNode node : groups) {
             if (node.getGroup() instanceof GroupEntryChanger entryChanger) {
                 List<FieldChange> undo = entryChanger.add(entries);
@@ -429,20 +379,14 @@ private void addToGroups(
      * @param entries entries to generate keys for
      */
     private void generateKeys(List<BibEntry> entries) {
-        if (
-            !preferencesService
-                .getImporterPreferences()
-                .isGenerateNewKeyOnImport()
-        ) {
+        if (!preferencesService.getImporterPreferences().isGenerateNewKeyOnImport()) {
             return;
         }
         CitationKeyGenerator keyGenerator = new CitationKeyGenerator(
             bibDatabaseContext
                 .getMetaData()
                 .getCiteKeyPattern(
-                    preferencesService
-                        .getCitationKeyPatternPreferences()
-                        .getKeyPattern()
+                    preferencesService.getCitationKeyPatternPreferences().getKeyPattern()
                 ),
             bibDatabaseContext.getDatabase(),
             preferencesService.getCitationKeyPatternPreferences()
@@ -457,9 +401,7 @@ public List<BibEntry> handleBibTeXData(String entries) {
         );
         try {
             return parser.parseEntries(
-                new ByteArrayInputStream(
-                    entries.getBytes(StandardCharsets.UTF_8)
-                )
+                new ByteArrayInputStream(entries.getBytes(StandardCharsets.UTF_8))
             );
         } catch (ParseException ex) {
             LOGGER.error("Could not paste", ex);
@@ -467,8 +409,7 @@ public List<BibEntry> handleBibTeXData(String entries) {
         }
     }
 
-    public List<BibEntry> handleStringData(String data)
-        throws FetcherException {
+    public List<BibEntry> handleStringData(String data) throws FetcherException {
         if ((data == null) || data.isEmpty()) {
             return Collections.emptyList();
         }
@@ -498,45 +439,31 @@ private List<BibEntry> tryImportFormats(String data) {
                 preferencesService.getImportFormatPreferences(),
                 fileUpdateMonitor
             );
-            UnknownFormatImport unknownFormatImport =
-                importFormatReader.importUnknownFormat(data);
-            return unknownFormatImport
-                .parserResult()
-                .getDatabase()
-                .getEntries();
+            UnknownFormatImport unknownFormatImport = importFormatReader.importUnknownFormat(data);
+            return unknownFormatImport.parserResult().getDatabase().getEntries();
         } catch (ImportException ex) { // ex is already localized
-            dialogService.showErrorDialogAndWait(
-                Localization.lang("Import error"),
-                ex
-            );
+            dialogService.showErrorDialogAndWait(Localization.lang("Import error"), ex);
             return Collections.emptyList();
         }
     }
 
     private List<BibEntry> fetchByDOI(DOI doi) throws FetcherException {
         LOGGER.info("Found DOI identifer in clipboard");
-        Optional<BibEntry> entry = new DoiFetcher(
-            preferencesService.getImportFormatPreferences()
-        )
+        Optional<BibEntry> entry = new DoiFetcher(preferencesService.getImportFormatPreferences())
             .performSearchById(doi.getDOI());
         return OptionalUtil.toList(entry);
     }
 
-    private List<BibEntry> fetchByArXiv(ArXivIdentifier arXivIdentifier)
-        throws FetcherException {
+    private List<BibEntry> fetchByArXiv(ArXivIdentifier arXivIdentifier) throws FetcherException {
         LOGGER.info("Found arxiv identifier in clipboard");
-        Optional<BibEntry> entry = new ArXivFetcher(
-            preferencesService.getImportFormatPreferences()
-        )
+        Optional<BibEntry> entry = new ArXivFetcher(preferencesService.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(
-            preferencesService.getImportFormatPreferences()
-        )
+        Optional<BibEntry> entry = new IsbnFetcher(preferencesService.getImportFormatPreferences())
             .performSearchById(isbn.getNormalized());
         return OptionalUtil.toList(entry);
     }
diff --git a/src/main/java/org/jabref/gui/externalfiles/UnlinkedFilesCrawler.java b/src/main/java/org/jabref/gui/externalfiles/UnlinkedFilesCrawler.java
index f34e2bc8d35..962f3cc071c 100644
--- a/src/main/java/org/jabref/gui/externalfiles/UnlinkedFilesCrawler.java
+++ b/src/main/java/org/jabref/gui/externalfiles/UnlinkedFilesCrawler.java
@@ -25,9 +25,7 @@
  */
 public class UnlinkedFilesCrawler extends BackgroundTask<FileNodeViewModel> {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(
-        UnlinkedFilesCrawler.class
-    );
+    private static final Logger LOGGER = LoggerFactory.getLogger(UnlinkedFilesCrawler.class);
 
     private final Path directory;
     private final Filter<Path> fileFilter;
@@ -84,19 +82,14 @@ protected 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(
-                String.format("Invalid directory for searching: %s", directory)
-            );
+            throw new IOException(String.format("Invalid directory for searching: %s", directory));
         }
 
-        FileNodeViewModel fileNodeViewModelForCurrentDirectory =
-            new FileNodeViewModel(directory);
+        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)
@@ -115,9 +108,7 @@ FileNodeViewModel searchDirectory(
             )
         ) {
             directoryAndFilePartition =
-                filesStream.collect(
-                    Collectors.partitioningBy(Files::isDirectory)
-                );
+                filesStream.collect(Collectors.partitioningBy(Files::isDirectory));
         } catch (IOException e) {
             LOGGER.error("Error while searching files", e);
             return fileNodeViewModelForCurrentDirectory;
@@ -132,10 +123,7 @@ FileNodeViewModel searchDirectory(
 
         // now we crawl into the found subdirectories first (!)
         for (Path subDirectory : subDirectories) {
-            FileNodeViewModel subRoot = searchDirectory(
-                subDirectory,
-                unlinkedPDFFileFilter
-            );
+            FileNodeViewModel subRoot = searchDirectory(subDirectory, unlinkedPDFFileFilter);
             if (!subRoot.getChildren().isEmpty()) {
                 fileCountOfSubdirectories += subRoot.getFileCount();
                 fileNodeViewModelForCurrentDirectory.getChildren().add(subRoot);
@@ -167,10 +155,7 @@ FileNodeViewModel searchDirectory(
         fileNodeViewModelForCurrentDirectory
             .getChildren()
             .addAll(
-                resultingFiles
-                    .stream()
-                    .map(FileNodeViewModel::new)
-                    .collect(Collectors.toList())
+                resultingFiles.stream().map(FileNodeViewModel::new).collect(Collectors.toList())
             );
 
         return fileNodeViewModelForCurrentDirectory;
diff --git a/src/main/java/org/jabref/gui/externalfiles/UnlinkedFilesDialogView.java b/src/main/java/org/jabref/gui/externalfiles/UnlinkedFilesDialogView.java
index f0b86ce3db7..f2425d09207 100644
--- a/src/main/java/org/jabref/gui/externalfiles/UnlinkedFilesDialogView.java
+++ b/src/main/java/org/jabref/gui/externalfiles/UnlinkedFilesDialogView.java
@@ -163,12 +163,9 @@ private void initialize() {
         this.bibDatabaseContext =
             stateManager
                 .getActiveDatabase()
-                .orElseThrow(() -> new NullPointerException("No active library")
-                );
+                .orElseThrow(() -> new NullPointerException("No active library"));
 
-        progressDisplay
-            .progressProperty()
-            .bind(viewModel.progressValueProperty());
+        progressDisplay.progressProperty().bind(viewModel.progressValueProperty());
         progressText.textProperty().bind(viewModel.progressTextProperty());
         progressPane.managedProperty().bind(viewModel.taskActiveProperty());
         progressPane.visibleProperty().bind(viewModel.taskActiveProperty());
@@ -203,9 +200,7 @@ private void initialize() {
     private void initDirectorySelection() {
         validationVisualizer.setDecoration(new IconValidationDecorator());
 
-        directoryPathField
-            .textProperty()
-            .bindBidirectional(viewModel.directoryPathProperty());
+        directoryPathField.textProperty().bindBidirectional(viewModel.directoryPathProperty());
         Platform.runLater(() ->
             validationVisualizer.initVisualization(
                 viewModel.directoryPathValidationStatus(),
@@ -218,32 +213,24 @@ private void initDirectorySelection() {
             .withIcon(FileExtensionViewModel::getIcon)
             .install(fileTypeCombo);
         fileTypeCombo.setItems(viewModel.getFileFilters());
-        fileTypeCombo
-            .valueProperty()
-            .bindBidirectional(viewModel.selectedExtensionProperty());
+        fileTypeCombo.valueProperty().bindBidirectional(viewModel.selectedExtensionProperty());
         fileTypeCombo.getSelectionModel().selectFirst();
         new ViewModelListCellFactory<DateRange>()
             .withText(DateRange::getDateRange)
             .install(fileDateCombo);
         fileDateCombo.setItems(viewModel.getDateFilters());
-        fileDateCombo
-            .valueProperty()
-            .bindBidirectional(viewModel.selectedDateProperty());
+        fileDateCombo.valueProperty().bindBidirectional(viewModel.selectedDateProperty());
         fileDateCombo.getSelectionModel().selectFirst();
         new ViewModelListCellFactory<ExternalFileSorter>()
             .withText(ExternalFileSorter::getSorter)
             .install(fileSortCombo);
         fileSortCombo.setItems(viewModel.getSorters());
-        fileSortCombo
-            .valueProperty()
-            .bindBidirectional(viewModel.selectedSortProperty());
+        fileSortCombo.valueProperty().bindBidirectional(viewModel.selectedSortProperty());
         fileSortCombo.getSelectionModel().selectFirst();
 
         directoryPathField.setText(
             bibDatabaseContext
-                .getFirstExistingFileDir(
-                    preferencesService.getFilePreferences()
-                )
+                .getFirstExistingFileDir(preferencesService.getFilePreferences())
                 .map(Path::toString)
                 .orElse("")
         );
@@ -256,12 +243,8 @@ private void initUnlinkedFilesList() {
 
         unlinkedFilesList
             .maxHeightProperty()
-            .bind(
-                ((Control) filePane.contentProperty().get()).heightProperty()
-            );
-        unlinkedFilesList
-            .getSelectionModel()
-            .setSelectionMode(SelectionMode.MULTIPLE);
+            .bind(((Control) filePane.contentProperty().get()).heightProperty());
+        unlinkedFilesList.getSelectionModel().setSelectionMode(SelectionMode.MULTIPLE);
         unlinkedFilesList
             .rootProperty()
             .bind(
@@ -285,9 +268,7 @@ private void initUnlinkedFilesList() {
             unlinkedFilesList.rootProperty(),
             root -> {
                 if (root != null) {
-                    ((CheckBoxTreeItem<FileNodeViewModel>) root).setSelected(
-                            true
-                        );
+                    ((CheckBoxTreeItem<FileNodeViewModel>) root).setSelected(true);
                     root.setExpanded(true);
                     EasyBind.bindContent(
                         viewModel.checkedFileListProperty(),
@@ -310,8 +291,7 @@ private void initResultTable() {
             .withTooltip(item -> item)
             .install(colFile);
 
-        colMessage.setCellValueFactory(cellData -> cellData.getValue().message()
-        );
+        colMessage.setCellValueFactory(cellData -> cellData.getValue().message());
         new ValueTableCellFactory<ImportFilesResultItemViewModel, String>()
             .withText(item -> item)
             .withTooltip(item -> item)
@@ -319,10 +299,7 @@ private void initResultTable() {
 
         colStatus.setCellValueFactory(cellData -> cellData.getValue().icon());
         colStatus.setCellFactory(
-            new ValueTableCellFactory<
-                ImportFilesResultItemViewModel,
-                JabRefIcon
-            >()
+            new ValueTableCellFactory<ImportFilesResultItemViewModel, JabRefIcon>()
                 .withGraphic(JabRefIcon::getGraphicNode)
         );
         importResultTable.setColumnResizePolicy(param -> true);
@@ -343,12 +320,7 @@ private void initButtons() {
             .bind(
                 viewModel
                     .taskActiveProperty()
-                    .or(
-                        viewModel
-                            .directoryPathValidationStatus()
-                            .validProperty()
-                            .not()
-                    )
+                    .or(viewModel.directoryPathValidationStatus().validProperty().not())
             );
     }
 
@@ -386,9 +358,7 @@ private void expandTree(TreeItem<?> item, boolean expand) {
 
     private ContextMenu createSearchContextMenu() {
         ContextMenu contextMenu = new ContextMenu();
-        ActionFactory factory = new ActionFactory(
-            preferencesService.getKeyBindingRepository()
-        );
+        ActionFactory factory = new ActionFactory(preferencesService.getKeyBindingRepository());
 
         contextMenu
             .getItems()
@@ -440,17 +410,9 @@ public SearchContextAction(StandardActions command) {
         public void execute() {
             switch (command) {
                 case SELECT_ALL -> unlinkedFilesList.getCheckModel().checkAll();
-                case UNSELECT_ALL -> unlinkedFilesList
-                    .getCheckModel()
-                    .clearChecks();
-                case EXPAND_ALL -> expandTree(
-                    unlinkedFilesList.getRoot(),
-                    true
-                );
-                case COLLAPSE_ALL -> expandTree(
-                    unlinkedFilesList.getRoot(),
-                    false
-                );
+                case UNSELECT_ALL -> unlinkedFilesList.getCheckModel().clearChecks();
+                case EXPAND_ALL -> expandTree(unlinkedFilesList.getRoot(), true);
+                case COLLAPSE_ALL -> expandTree(unlinkedFilesList.getRoot(), false);
             }
         }
     }
diff --git a/src/main/java/org/jabref/gui/externalfiles/UnlinkedFilesDialogViewModel.java b/src/main/java/org/jabref/gui/externalfiles/UnlinkedFilesDialogViewModel.java
index f4f0c9ce36b..7b20d30a485 100644
--- a/src/main/java/org/jabref/gui/externalfiles/UnlinkedFilesDialogViewModel.java
+++ b/src/main/java/org/jabref/gui/externalfiles/UnlinkedFilesDialogViewModel.java
@@ -53,25 +53,17 @@ public class UnlinkedFilesDialogViewModel {
     private final StringProperty directoryPath = new SimpleStringProperty("");
     private final ObjectProperty<FileExtensionViewModel> selectedExtension =
         new SimpleObjectProperty<>();
-    private final ObjectProperty<DateRange> selectedDate =
-        new SimpleObjectProperty<>();
-    private final ObjectProperty<ExternalFileSorter> selectedSort =
-        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 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 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();
@@ -82,9 +74,7 @@ public class UnlinkedFilesDialogViewModel {
     private final DialogService dialogService;
     private final PreferencesService preferences;
     private BackgroundTask<FileNodeViewModel> findUnlinkedFilesTask;
-    private BackgroundTask<
-        List<ImportFilesResultItemViewModel>
-    > importFilesBackgroundTask;
+    private BackgroundTask<List<ImportFilesResultItemViewModel>> importFilesBackgroundTask;
 
     private final BibDatabaseContext bibDatabase;
     private final TaskExecutor taskExecutor;
@@ -123,35 +113,24 @@ public UnlinkedFilesDialogViewModel(
                     StandardFileType.ANY_FILE,
                     preferences.getFilePreferences()
                 ),
-                new FileExtensionViewModel(
-                    StandardFileType.HTML,
-                    preferences.getFilePreferences()
-                ),
+                new FileExtensionViewModel(StandardFileType.HTML, preferences.getFilePreferences()),
                 new FileExtensionViewModel(
                     StandardFileType.MARKDOWN,
                     preferences.getFilePreferences()
                 ),
-                new FileExtensionViewModel(
-                    StandardFileType.PDF,
-                    preferences.getFilePreferences()
-                )
+                new FileExtensionViewModel(StandardFileType.PDF, preferences.getFilePreferences())
             );
 
-        this.dateFilterList =
-            FXCollections.observableArrayList(DateRange.values());
+        this.dateFilterList = FXCollections.observableArrayList(DateRange.values());
 
-        this.fileSortList =
-            FXCollections.observableArrayList(ExternalFileSorter.values());
+        this.fileSortList = FXCollections.observableArrayList(ExternalFileSorter.values());
 
-        Predicate<String> isDirectory = path ->
-            Files.isDirectory(Path.of(path));
+        Predicate<String> isDirectory = path -> Files.isDirectory(Path.of(path));
         scanDirectoryValidator =
             new FunctionBasedValidator<>(
                 directoryPath,
                 isDirectory,
-                ValidationMessage.error(
-                    Localization.lang("Please enter a valid file path.")
-                )
+                ValidationMessage.error(Localization.lang("Please enter a valid file path."))
             );
 
         treeRootProperty.setValue(Optional.empty());
@@ -159,9 +138,7 @@ public UnlinkedFilesDialogViewModel(
 
     public void startSearch() {
         Path directory = this.getSearchDirectory();
-        Filter<Path> selectedFileFilter = selectedExtension
-            .getValue()
-            .dirFilter();
+        Filter<Path> selectedFileFilter = selectedExtension.getValue().dirFilter();
         DateRange selectedDateFilter = selectedDate.getValue();
         ExternalFileSorter selectedSortFilter = selectedSort.getValue();
         progressValueProperty.unbind();
@@ -177,15 +154,9 @@ public void startSearch() {
                 preferences.getFilePreferences()
             )
                 .onRunning(() -> {
-                    progressValueProperty.set(
-                        ProgressIndicator.INDETERMINATE_PROGRESS
-                    );
-                    progressTextProperty.setValue(
-                        Localization.lang("Searching file system...")
-                    );
-                    progressTextProperty.bind(
-                        findUnlinkedFilesTask.messageProperty()
-                    );
+                    progressValueProperty.set(ProgressIndicator.INDETERMINATE_PROGRESS);
+                    progressTextProperty.setValue(Localization.lang("Searching file system..."));
+                    progressTextProperty.bind(findUnlinkedFilesTask.messageProperty());
                     taskActiveProperty.setValue(true);
                     treeRootProperty.setValue(Optional.empty());
                 })
@@ -193,9 +164,7 @@ public void startSearch() {
                     progressValueProperty.set(0);
                     taskActiveProperty.setValue(false);
                 })
-                .onSuccess(treeRoot ->
-                    treeRootProperty.setValue(Optional.of(treeRoot))
-                );
+                .onSuccess(treeRoot -> treeRootProperty.setValue(Optional.of(treeRoot)));
 
         findUnlinkedFilesTask.executeWith(taskExecutor);
     }
@@ -219,9 +188,7 @@ public void startImport() {
                     progressValueProperty.bind(
                         importFilesBackgroundTask.workDonePercentageProperty()
                     );
-                    progressTextProperty.bind(
-                        importFilesBackgroundTask.messageProperty()
-                    );
+                    progressTextProperty.bind(importFilesBackgroundTask.messageProperty());
                     taskActiveProperty.setValue(true);
                 })
                 .onFinished(() -> {
@@ -247,17 +214,12 @@ public void startExport() {
             return;
         }
 
-        FileDialogConfiguration fileDialogConfiguration =
-            new FileDialogConfiguration.Builder()
-                .withInitialDirectory(
-                    preferences.getFilePreferences().getWorkingDirectory()
-                )
-                .addExtensionFilter(StandardFileType.TXT)
-                .withDefaultExtension(StandardFileType.TXT)
-                .build();
-        Optional<Path> exportPath = dialogService.showFileSaveDialog(
-            fileDialogConfiguration
-        );
+        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;
@@ -302,17 +264,13 @@ public void cancelTasks() {
     public void browseFileDirectory() {
         DirectoryDialogConfiguration directoryDialogConfiguration =
             new DirectoryDialogConfiguration.Builder()
-                .withInitialDirectory(
-                    preferences.getFilePreferences().getWorkingDirectory()
-                )
+                .withInitialDirectory(preferences.getFilePreferences().getWorkingDirectory())
                 .build();
 
         dialogService
             .showDirectorySelectionDialog(directoryDialogConfiguration)
             .ifPresent(selectedDirectory -> {
-                directoryPath.setValue(
-                    selectedDirectory.toAbsolutePath().toString()
-                );
+                directoryPath.setValue(selectedDirectory.toAbsolutePath().toString());
                 preferences
                     .getFilePreferences()
                     .setWorkingDirectory(selectedDirectory.toAbsolutePath());
@@ -372,9 +330,7 @@ public BooleanProperty taskActiveProperty() {
         return this.taskActiveProperty;
     }
 
-    public SimpleListProperty<
-        TreeItem<FileNodeViewModel>
-    > checkedFileListProperty() {
+    public SimpleListProperty<TreeItem<FileNodeViewModel>> checkedFileListProperty() {
         return checkedFileListProperty;
     }
 }
diff --git a/src/main/java/org/jabref/gui/externalfiletype/CustomExternalFileType.java b/src/main/java/org/jabref/gui/externalfiletype/CustomExternalFileType.java
index 92a8ae5da92..5ded941fe0d 100644
--- a/src/main/java/org/jabref/gui/externalfiletype/CustomExternalFileType.java
+++ b/src/main/java/org/jabref/gui/externalfiletype/CustomExternalFileType.java
@@ -89,14 +89,7 @@ public static ExternalFileType buildFromArgs(String[] val) {
             }
         }
 
-        return new CustomExternalFileType(
-            name,
-            extension,
-            mimeType,
-            openWith,
-            iconName,
-            icon
-        );
+        return new CustomExternalFileType(name, extension, mimeType, openWith, iconName, icon);
     }
 
     @Override
@@ -178,14 +171,7 @@ public String toString() {
     }
 
     public ExternalFileType copy() {
-        return new CustomExternalFileType(
-            name,
-            extension,
-            mimeType,
-            openWith,
-            iconName,
-            icon
-        );
+        return new CustomExternalFileType(name, extension, mimeType, openWith, iconName, icon);
     }
 
     @Override
diff --git a/src/main/java/org/jabref/gui/externalfiletype/ExternalFileTypes.java b/src/main/java/org/jabref/gui/externalfiletype/ExternalFileTypes.java
index 6d8f6fe2151..1284100431c 100644
--- a/src/main/java/org/jabref/gui/externalfiletype/ExternalFileTypes.java
+++ b/src/main/java/org/jabref/gui/externalfiletype/ExternalFileTypes.java
@@ -21,8 +21,7 @@ public class ExternalFileTypes {
     // This String is used in the encoded list in prefs of external file type
     // modifications, in order to indicate a removed default file type:
     private static final String FILE_TYPE_REMOVED_FLAG = "REMOVED";
-    private static final ExternalFileType HTML_FALLBACK_TYPE =
-        StandardExternalFileType.URL;
+    private static final ExternalFileType HTML_FALLBACK_TYPE = StandardExternalFileType.URL;
 
     private ExternalFileTypes() {}
 
@@ -66,9 +65,7 @@ public static Optional<ExternalFileType> getExternalFileTypeByExt(
         return filePreferences
             .getExternalFileTypes()
             .stream()
-            .filter(type ->
-                type.getExtension().equalsIgnoreCase(extensionCleaned)
-            )
+            .filter(type -> type.getExtension().equalsIgnoreCase(extensionCleaned))
             .findFirst();
     }
 
@@ -148,9 +145,7 @@ public static Optional<ExternalFileType> getExternalFileTypeByFile(
     ) {
         final String filePath = file.toString();
         final Optional<String> extension = FileUtil.getFileExtension(filePath);
-        return extension.flatMap(ext ->
-            getExternalFileTypeByExt(ext, filePreferences)
-        );
+        return extension.flatMap(ext -> getExternalFileTypeByExt(ext, filePreferences));
     }
 
     public static Optional<ExternalFileType> getExternalFileTypeByLinkedFile(
@@ -162,8 +157,7 @@ public static Optional<ExternalFileType> getExternalFileTypeByLinkedFile(
             linkedFile.getFileType(),
             filePreferences
         );
-        boolean isUnknownType =
-            type.isEmpty() || (type.get() instanceof UnknownExternalFileType);
+        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:
@@ -178,9 +172,7 @@ public static Optional<ExternalFileType> getExternalFileTypeByLinkedFile(
             // No type could be found from mime type. Try based on the extension:
             return FileUtil
                 .getFileExtension(linkedFile.getLink())
-                .flatMap(extension ->
-                    getExternalFileTypeByExt(extension, filePreferences)
-                );
+                .flatMap(extension -> getExternalFileTypeByExt(extension, filePreferences));
         } else {
             return type;
         }
@@ -191,9 +183,7 @@ public static Optional<ExternalFileType> getExternalFileTypeByLinkedFile(
      */
     public static String toStringList(Collection<ExternalFileType> fileTypes) {
         // First find a list of the default types:
-        List<ExternalFileType> defTypes = new ArrayList<>(
-            getDefaultExternalFileTypes()
-        );
+        List<ExternalFileType> defTypes = new ArrayList<>(getDefaultExternalFileTypes());
         // Make a list of types that are unchanged:
         List<ExternalFileType> unchanged = new ArrayList<>();
         // Create a result list
@@ -248,9 +238,7 @@ public static String toStringList(Collection<ExternalFileType> fileTypes) {
      */
     public static Set<ExternalFileType> fromString(String storedFileTypes) {
         // First get a list of the default file types as a starting point:
-        Set<ExternalFileType> types = new HashSet<>(
-            getDefaultExternalFileTypes()
-        );
+        Set<ExternalFileType> types = new HashSet<>(getDefaultExternalFileTypes());
 
         // If no changes have been stored, simply use the defaults:
         if (StringUtil.isBlank(storedFileTypes)) {
@@ -275,9 +263,7 @@ public static Set<ExternalFileType> fromString(String storedFileTypes) {
                 }
             } else {
                 // A new or modified entry type. Construct it from the string array:
-                ExternalFileType type = CustomExternalFileType.buildFromArgs(
-                    val
-                );
+                ExternalFileType type = CustomExternalFileType.buildFromArgs(val);
                 // Check if there is a default type with the same name. If so, this is a
                 // modification of that type, so remove the default one:
                 ExternalFileType toRemove = null;
diff --git a/src/main/java/org/jabref/gui/externalfiletype/StandardExternalFileType.java b/src/main/java/org/jabref/gui/externalfiletype/StandardExternalFileType.java
index d4de59a81e6..ad1d4349f00 100644
--- a/src/main/java/org/jabref/gui/externalfiletype/StandardExternalFileType.java
+++ b/src/main/java/org/jabref/gui/externalfiletype/StandardExternalFileType.java
@@ -5,14 +5,7 @@
 import org.jabref.logic.l10n.Localization;
 
 public enum StandardExternalFileType implements ExternalFileType {
-    PDF(
-        "PDF",
-        "pdf",
-        "application/pdf",
-        "evince",
-        "pdfSmall",
-        IconTheme.JabRefIcons.PDF_FILE
-    ),
+    PDF("PDF", "pdf", "application/pdf", "evince", "pdfSmall", IconTheme.JabRefIcons.PDF_FILE),
     PostScript(
         "PostScript",
         "ps",
@@ -125,38 +118,10 @@ public enum StandardExternalFileType implements ExternalFileType {
         "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
-    ),
+    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",
@@ -165,38 +130,10 @@ public enum StandardExternalFileType implements ExternalFileType {
         "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
-    ),
-    MARKDOWN(
-        "Markdown",
-        "md",
-        "text/markdown",
-        "emacs",
-        "emacs",
-        IconTheme.JabRefIcons.FILE_TEXT
-    );
+    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),
+    MARKDOWN("Markdown", "md", "text/markdown", "emacs", "emacs", IconTheme.JabRefIcons.FILE_TEXT);
 
     private final String name;
     private final String extension;
diff --git a/src/main/java/org/jabref/gui/fieldeditors/AbstractEditorViewModel.java b/src/main/java/org/jabref/gui/fieldeditors/AbstractEditorViewModel.java
index 0cf99242d72..c6fb57a9436 100644
--- a/src/main/java/org/jabref/gui/fieldeditors/AbstractEditorViewModel.java
+++ b/src/main/java/org/jabref/gui/fieldeditors/AbstractEditorViewModel.java
@@ -41,15 +41,10 @@ public AbstractEditorViewModel(
 
         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);
         }
     }
@@ -85,12 +80,7 @@ public void bindToEntry(BibEntry entry) {
                     if (!(newValue.trim()).equals(oldValue)) {
                         entry.setField(field, newValue);
                         undoManager.addEdit(
-                            new UndoableFieldChange(
-                                entry,
-                                field,
-                                oldValue,
-                                newValue
-                            )
+                            new UndoableFieldChange(entry, field, oldValue, newValue)
                         );
                     }
                 }
@@ -98,9 +88,7 @@ public void bindToEntry(BibEntry entry) {
         );
     }
 
-    public Collection<?> complete(
-        AutoCompletionBinding.ISuggestionRequest request
-    ) {
+    public Collection<?> complete(AutoCompletionBinding.ISuggestionRequest request) {
         return suggestionProvider.provideSuggestions(request);
     }
 }
diff --git a/src/main/java/org/jabref/gui/fieldeditors/CitationKeyEditor.java b/src/main/java/org/jabref/gui/fieldeditors/CitationKeyEditor.java
index 45bd09938b5..56dd33beff4 100644
--- a/src/main/java/org/jabref/gui/fieldeditors/CitationKeyEditor.java
+++ b/src/main/java/org/jabref/gui/fieldeditors/CitationKeyEditor.java
@@ -62,10 +62,7 @@ public CitationKeyEditor(
         textField.initContextMenu(Collections::emptyList);
 
         new EditorValidator(preferencesService)
-            .configureValidation(
-                viewModel.getFieldValidator().getValidationStatus(),
-                textField
-            );
+            .configureValidation(viewModel.getFieldValidator().getValidationStatus(), textField);
     }
 
     public CitationKeyEditorViewModel getViewModel() {
diff --git a/src/main/java/org/jabref/gui/fieldeditors/DateEditor.java b/src/main/java/org/jabref/gui/fieldeditors/DateEditor.java
index dc5a064775f..880b59d684a 100644
--- a/src/main/java/org/jabref/gui/fieldeditors/DateEditor.java
+++ b/src/main/java/org/jabref/gui/fieldeditors/DateEditor.java
@@ -46,10 +46,7 @@ public DateEditor(
             );
 
         datePicker.setStringConverter(viewModel.getDateToStringConverter());
-        datePicker
-            .getEditor()
-            .textProperty()
-            .bindBidirectional(viewModel.textProperty());
+        datePicker.getEditor().textProperty().bindBidirectional(viewModel.textProperty());
 
         new EditorValidator(preferencesService)
             .configureValidation(
diff --git a/src/main/java/org/jabref/gui/fieldeditors/DateEditorViewModel.java b/src/main/java/org/jabref/gui/fieldeditors/DateEditorViewModel.java
index fec77c583a4..25beb4eb046 100644
--- a/src/main/java/org/jabref/gui/fieldeditors/DateEditorViewModel.java
+++ b/src/main/java/org/jabref/gui/fieldeditors/DateEditorViewModel.java
@@ -16,9 +16,7 @@
 
 public class DateEditorViewModel extends AbstractEditorViewModel {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(
-        DateEditorViewModel.class
-    );
+    private static final Logger LOGGER = LoggerFactory.getLogger(DateEditorViewModel.class);
     private final DateTimeFormatter dateFormatter;
 
     public DateEditorViewModel(
@@ -55,10 +53,7 @@ public TemporalAccessor fromString(String string) {
                         return dateFormatter.parse(string);
                     } catch (DateTimeParseException exception) {
                         // We accept all kinds of dates (not just in the format specified)
-                        return Date
-                            .parse(string)
-                            .map(Date::toTemporalAccessor)
-                            .orElse(null);
+                        return Date.parse(string).map(Date::toTemporalAccessor).orElse(null);
                     }
                 } else {
                     return null;
diff --git a/src/main/java/org/jabref/gui/fieldeditors/EditorTextArea.java b/src/main/java/org/jabref/gui/fieldeditors/EditorTextArea.java
index 958224c7f7d..d733b24633f 100644
--- a/src/main/java/org/jabref/gui/fieldeditors/EditorTextArea.java
+++ b/src/main/java/org/jabref/gui/fieldeditors/EditorTextArea.java
@@ -42,10 +42,7 @@ public void initContextMenu(final Supplier<List<MenuItem>> items) {
             contextMenu
                 .getItems()
                 .setAll(
-                    EditorContextAction.getDefaultContextMenuItems(
-                        this,
-                        Globals.getKeyPrefs()
-                    )
+                    EditorContextAction.getDefaultContextMenuItems(this, Globals.getKeyPrefs())
                 );
             contextMenu.getItems().addAll(0, items.get());
 
diff --git a/src/main/java/org/jabref/gui/fieldeditors/EditorTextField.java b/src/main/java/org/jabref/gui/fieldeditors/EditorTextField.java
index 4f7917d2b3a..438ded4d14b 100644
--- a/src/main/java/org/jabref/gui/fieldeditors/EditorTextField.java
+++ b/src/main/java/org/jabref/gui/fieldeditors/EditorTextField.java
@@ -38,10 +38,7 @@ public void initContextMenu(final Supplier<List<MenuItem>> items) {
             contextMenu
                 .getItems()
                 .setAll(
-                    EditorContextAction.getDefaultContextMenuItems(
-                        this,
-                        Globals.getKeyPrefs()
-                    )
+                    EditorContextAction.getDefaultContextMenuItems(this, Globals.getKeyPrefs())
                 );
             contextMenu.getItems().addAll(0, items.get());
 
diff --git a/src/main/java/org/jabref/gui/fieldeditors/EditorValidator.java b/src/main/java/org/jabref/gui/fieldeditors/EditorValidator.java
index 0dfd0c51ebd..b3387a72b59 100644
--- a/src/main/java/org/jabref/gui/fieldeditors/EditorValidator.java
+++ b/src/main/java/org/jabref/gui/fieldeditors/EditorValidator.java
@@ -19,8 +19,7 @@ public void configureValidation(
         final TextInputControl textInput
     ) {
         if (preferences.getEntryEditorPreferences().shouldEnableValidation()) {
-            ControlsFxVisualizer validationVisualizer =
-                new ControlsFxVisualizer();
+            ControlsFxVisualizer validationVisualizer = new ControlsFxVisualizer();
             validationVisualizer.setDecoration(new IconValidationDecorator());
             validationVisualizer.initVisualization(status, textInput);
         }
diff --git a/src/main/java/org/jabref/gui/fieldeditors/FieldEditorFX.java b/src/main/java/org/jabref/gui/fieldeditors/FieldEditorFX.java
index e90a0b40f8b..a420e9108f0 100644
--- a/src/main/java/org/jabref/gui/fieldeditors/FieldEditorFX.java
+++ b/src/main/java/org/jabref/gui/fieldeditors/FieldEditorFX.java
@@ -10,12 +10,7 @@ public interface FieldEditorFX {
     Parent getNode();
 
     default void focus() {
-        getNode()
-            .getChildrenUnmodifiable()
-            .stream()
-            .findFirst()
-            .orElse(getNode())
-            .requestFocus();
+        getNode().getChildrenUnmodifiable().stream().findFirst().orElse(getNode()).requestFocus();
     }
 
     default boolean childIsFocused() {
diff --git a/src/main/java/org/jabref/gui/fieldeditors/FieldEditors.java b/src/main/java/org/jabref/gui/fieldeditors/FieldEditors.java
index 4fe853cd054..228f4a34c19 100644
--- a/src/main/java/org/jabref/gui/fieldeditors/FieldEditors.java
+++ b/src/main/java/org/jabref/gui/fieldeditors/FieldEditors.java
@@ -29,9 +29,7 @@
 @SuppressWarnings("unchecked")
 public class FieldEditors {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(
-        FieldEditors.class
-    );
+    private static final Logger LOGGER = LoggerFactory.getLogger(FieldEditors.class);
 
     public static FieldEditorFX getForField(
         final Field field,
@@ -56,9 +54,7 @@ public static FieldEditorFX getForField(
             databaseContext,
             preferences.getFilePreferences(),
             journalAbbreviationRepository,
-            preferences
-                .getEntryEditorPreferences()
-                .shouldAllowIntegerEditionBibtex()
+            preferences.getEntryEditorPreferences().shouldAllowIntegerEditionBibtex()
         );
 
         boolean isMultiLine = FieldFactory.isMultiLineField(
@@ -66,12 +62,7 @@ public static FieldEditorFX getForField(
             preferences.getFieldPreferences().getNonWrappableFields()
         );
 
-        if (
-            preferences
-                .getTimestampPreferences()
-                .getTimestampField()
-                .equals(field)
-        ) {
+        if (preferences.getTimestampPreferences().getTimestampField().equals(field)) {
             return new DateEditor(
                 field,
                 DateTimeFormatter.ofPattern(
@@ -96,11 +87,7 @@ public static FieldEditorFX getForField(
             fieldProperties.contains(FieldProperty.EPRINT) ||
             fieldProperties.contains(FieldProperty.ISBN)
         ) {
-            return new IdentifierEditor(
-                field,
-                suggestionProvider,
-                fieldCheckers
-            );
+            return new IdentifierEditor(field, suggestionProvider, fieldCheckers);
         } else if (fieldProperties.contains(FieldProperty.ISSN)) {
             return new ISSNEditor(field, suggestionProvider, fieldCheckers);
         } else if (field == StandardField.OWNER) {
@@ -115,20 +102,10 @@ public static FieldEditorFX getForField(
                 undoManager
             );
         } else if (fieldProperties.contains(FieldProperty.FILE_EDITOR)) {
-            return new LinkedFilesEditor(
-                field,
-                databaseContext,
-                suggestionProvider,
-                fieldCheckers
-            );
+            return new LinkedFilesEditor(field, databaseContext, suggestionProvider, fieldCheckers);
         } else if (fieldProperties.contains(FieldProperty.YES_NO)) {
             return new OptionEditor<>(
-                new YesNoEditorViewModel(
-                    field,
-                    suggestionProvider,
-                    fieldCheckers,
-                    undoManager
-                )
+                new YesNoEditorViewModel(field, suggestionProvider, fieldCheckers, undoManager)
             );
         } else if (fieldProperties.contains(FieldProperty.MONTH)) {
             return new OptionEditor<>(
@@ -142,30 +119,15 @@ public static FieldEditorFX getForField(
             );
         } else if (fieldProperties.contains(FieldProperty.GENDER)) {
             return new OptionEditor<>(
-                new GenderEditorViewModel(
-                    field,
-                    suggestionProvider,
-                    fieldCheckers,
-                    undoManager
-                )
+                new GenderEditorViewModel(field, suggestionProvider, fieldCheckers, undoManager)
             );
         } else if (fieldProperties.contains(FieldProperty.EDITOR_TYPE)) {
             return new OptionEditor<>(
-                new EditorTypeEditorViewModel(
-                    field,
-                    suggestionProvider,
-                    fieldCheckers,
-                    undoManager
-                )
+                new EditorTypeEditorViewModel(field, suggestionProvider, fieldCheckers, undoManager)
             );
         } else if (fieldProperties.contains(FieldProperty.PAGINATION)) {
             return new OptionEditor<>(
-                new PaginationEditorViewModel(
-                    field,
-                    suggestionProvider,
-                    fieldCheckers,
-                    undoManager
-                )
+                new PaginationEditorViewModel(field, suggestionProvider, fieldCheckers, undoManager)
             );
         } else if (fieldProperties.contains(FieldProperty.TYPE)) {
             if (entryType.equals(IEEETranEntryType.Patent)) {
@@ -179,12 +141,7 @@ public static FieldEditorFX getForField(
                 );
             } else {
                 return new OptionEditor<>(
-                    new TypeEditorViewModel(
-                        field,
-                        suggestionProvider,
-                        fieldCheckers,
-                        undoManager
-                    )
+                    new TypeEditorViewModel(field, suggestionProvider, fieldCheckers, undoManager)
                 );
             }
         } else if (fieldProperties.contains(FieldProperty.SINGLE_ENTRY_LINK)) {
@@ -194,9 +151,7 @@ public static FieldEditorFX getForField(
                 (SuggestionProvider<BibEntry>) suggestionProvider,
                 fieldCheckers
             );
-        } else if (
-            fieldProperties.contains(FieldProperty.MULTIPLE_ENTRY_LINK)
-        ) {
+        } else if (fieldProperties.contains(FieldProperty.MULTIPLE_ENTRY_LINK)) {
             return new LinkedEntriesEditor(
                 field,
                 databaseContext,
@@ -221,12 +176,7 @@ public static FieldEditorFX getForField(
                 undoManager
             );
         } else if (field == InternalField.KEY_FIELD) {
-            return new CitationKeyEditor(
-                field,
-                suggestionProvider,
-                fieldCheckers,
-                databaseContext
-            );
+            return new CitationKeyEditor(field, suggestionProvider, fieldCheckers, databaseContext);
         } else {
             // default
             return new SimpleEditor(
@@ -245,11 +195,9 @@ private static SuggestionProvider<?> getSuggestionProvider(
         SuggestionProviders suggestionProviders,
         MetaData metaData
     ) {
-        SuggestionProvider<?> suggestionProvider =
-            suggestionProviders.getForField(field);
+        SuggestionProvider<?> suggestionProvider = suggestionProviders.getForField(field);
 
-        List<String> contentSelectorValues =
-            metaData.getContentSelectorValuesForField(field);
+        List<String> contentSelectorValues = metaData.getContentSelectorValuesForField(field);
         if (!contentSelectorValues.isEmpty()) {
             // Enrich auto completion by content selector values
             try {
diff --git a/src/main/java/org/jabref/gui/fieldeditors/FieldNameLabel.java b/src/main/java/org/jabref/gui/fieldeditors/FieldNameLabel.java
index 8636765f78e..ac59ce239f1 100644
--- a/src/main/java/org/jabref/gui/fieldeditors/FieldNameLabel.java
+++ b/src/main/java/org/jabref/gui/fieldeditors/FieldNameLabel.java
@@ -44,43 +44,31 @@ public String getDescription(Field field) {
                         "Miscellaneous bibliographic data usually printed at the end of the entry."
                     );
                 case AFTERWORD:
-                    return Localization.lang(
-                        "Author(s) of an afterword to the work."
-                    );
+                    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."
                     );
                 case ANNOTATOR:
-                    return Localization.lang(
-                        "Author(s) of annotations to the work."
-                    );
+                    return Localization.lang("Author(s) of annotations to the work.");
                 case AUTHOR:
                     return Localization.lang("Author(s) of the work.");
                 case BOOKSUBTITLE:
-                    return Localization.lang(
-                        "Subtitle related to the \"Booktitle\"."
-                    );
+                    return Localization.lang("Subtitle related to the \"Booktitle\".");
                 case BOOKTITLE:
-                    return Localization.lang(
-                        "Title of the main publication this work is part of."
-                    );
+                    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."
                     );
                 case CHAPTER:
-                    return Localization.lang(
-                        "Chapter or section or any other unit of a work."
-                    );
+                    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."
-                        ) +
+                        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."
@@ -89,13 +77,9 @@ public String getDescription(Field field) {
                 case DATE:
                     return Localization.lang("Publication date of the work.");
                 case DOI:
-                    return Localization.lang(
-                        "Digital Object Identifier of the work."
-                    );
+                    return Localization.lang("Digital Object Identifier of the work.");
                 case EDITION:
-                    return Localization.lang(
-                        "Edition of a printed publication."
-                    );
+                    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."
@@ -113,9 +97,7 @@ public String getDescription(Field field) {
                         "Another secondary editor performing a different role."
                     );
                 case EDITORTYPE:
-                    return Localization.lang(
-                        "Type of editorial role performed by the \"Editor\"."
-                    );
+                    return Localization.lang("Type of editorial role performed by the \"Editor\".");
                 case EDITORATYPE:
                     return Localization.lang(
                         "Type of editorial role performed by the \"Editora\"."
@@ -138,9 +120,7 @@ public String getDescription(Field field) {
                     );
                 case EPRINT:
                     return (
-                        Localization.lang(
-                            "Electronic identifier of an online publication."
-                        ) +
+                        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."
@@ -180,9 +160,7 @@ public String getDescription(Field field) {
                     return (
                         Localization.lang("Annex to the eventtitle field.") +
                         "\n" +
-                        Localization.lang(
-                            "Can be used for known event acronyms."
-                        )
+                        Localization.lang("Can be used for known event acronyms.")
                     );
                 case FILE:
                 case PDF:
@@ -190,26 +168,18 @@ public String getDescription(Field field) {
                         "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."
-                    );
+                    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."
                     );
                 case INSTITUTION:
                 case SCHOOL:
-                    return Localization.lang(
-                        "Name of a university or some other institution."
-                    );
+                    return Localization.lang("Name of a university or some other institution.");
                 case INTRODUCTION:
-                    return Localization.lang(
-                        "Author(s) of an introduction to the work."
-                    );
+                    return Localization.lang("Author(s) of an introduction to the work.");
                 case ISBN:
-                    return Localization.lang(
-                        "International Standard Book Number of a book."
-                    );
+                    return Localization.lang("International Standard Book Number of a book.");
                 case ISRN:
                     return Localization.lang(
                         "International Standard Technical Report Number of a technical report."
@@ -261,9 +231,7 @@ public String getDescription(Field field) {
                         "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\"."
-                    );
+                    return Localization.lang("Subtitle related to the \"Maintitle\".");
                 case MAINTITLE:
                     return Localization.lang(
                         "Main title of a multi-volume book, such as \"Collected Works\"."
@@ -300,18 +268,14 @@ public String getDescription(Field field) {
                     );
                 case PAGES:
                     return (
-                        Localization.lang(
-                            "One or more page numbers or page ranges."
-                        ) +
+                        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."
-                    );
+                    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."
@@ -323,9 +287,7 @@ public String getDescription(Field field) {
                 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\"."
-                    );
+                    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."
@@ -363,13 +325,9 @@ public String getDescription(Field field) {
                         "Revision number of a piece of software, a manual, etc."
                     );
                 case VOLUME:
-                    return Localization.lang(
-                        "Volume of a multi-volume book or a periodical."
-                    );
+                    return Localization.lang("Volume of a multi-volume book or a periodical.");
                 case VOLUMES:
-                    return Localization.lang(
-                        "Total number of volumes of a multi-volume work."
-                    );
+                    return Localization.lang("Total number of volumes of a multi-volume work.");
                 case YEAR:
                     return Localization.lang("Year of publication.");
                 case CROSSREF:
@@ -404,9 +362,7 @@ public String getDescription(Field field) {
         } else if (field instanceof InternalField internalField) {
             switch (internalField) {
                 case KEY_FIELD:
-                    return Localization.lang(
-                        "Key by which the work may be cited."
-                    );
+                    return Localization.lang("Key by which the work may be cited.");
             }
         } else if (field instanceof SpecialField specialField) {
             switch (specialField) {
diff --git a/src/main/java/org/jabref/gui/fieldeditors/GroupEditor.java b/src/main/java/org/jabref/gui/fieldeditors/GroupEditor.java
index 70311fec6a3..70a563f3f9f 100644
--- a/src/main/java/org/jabref/gui/fieldeditors/GroupEditor.java
+++ b/src/main/java/org/jabref/gui/fieldeditors/GroupEditor.java
@@ -24,20 +24,9 @@ public GroupEditor(
         final boolean isMultiLine,
         final UndoManager undoManager
     ) {
-        super(
-            field,
-            suggestionProvider,
-            fieldCheckers,
-            preferences,
-            isMultiLine,
-            undoManager
-        );
+        super(field, suggestionProvider, fieldCheckers, preferences, isMultiLine, undoManager);
         this.setOnDragOver(event -> {
-                if (
-                    event
-                        .getDragboard()
-                        .hasContent(DragAndDropDataFormats.GROUP)
-                ) {
+                if (event.getDragboard().hasContent(DragAndDropDataFormats.GROUP)) {
                     event.acceptTransferModes(TransferMode.MOVE);
                 }
                 event.consume();
@@ -45,11 +34,7 @@ public GroupEditor(
 
         this.setOnDragDropped(event -> {
                 boolean success = false;
-                if (
-                    event
-                        .getDragboard()
-                        .hasContent(DragAndDropDataFormats.GROUP)
-                ) {
+                if (event.getDragboard().hasContent(DragAndDropDataFormats.GROUP)) {
                     List<String> draggedGroups = (List<String>) event
                         .getDragboard()
                         .getContent(DragAndDropDataFormats.GROUP);
@@ -68,9 +53,7 @@ public GroupEditor(
                                     .orElse(draggedGroups.get(0))
                             )
                             .orElse(null);
-                        bibEntry.map(entry ->
-                            entry.setField(StandardField.GROUPS, newGroup)
-                        );
+                        bibEntry.map(entry -> entry.setField(StandardField.GROUPS, newGroup));
                         success = true;
                     }
                 }
diff --git a/src/main/java/org/jabref/gui/fieldeditors/ISSNEditor.java b/src/main/java/org/jabref/gui/fieldeditors/ISSNEditor.java
index f3c46ccea72..ddb21549d56 100644
--- a/src/main/java/org/jabref/gui/fieldeditors/ISSNEditor.java
+++ b/src/main/java/org/jabref/gui/fieldeditors/ISSNEditor.java
@@ -72,10 +72,7 @@ public ISSNEditor(
         textArea.initContextMenu(new DefaultMenu(textArea));
 
         new EditorValidator(preferencesService)
-            .configureValidation(
-                viewModel.getFieldValidator().getValidationStatus(),
-                textArea
-            );
+            .configureValidation(viewModel.getFieldValidator().getValidationStatus(), textArea);
     }
 
     public ISSNEditorViewModel getViewModel() {
diff --git a/src/main/java/org/jabref/gui/fieldeditors/ISSNEditorViewModel.java b/src/main/java/org/jabref/gui/fieldeditors/ISSNEditorViewModel.java
index 188ef9ea83c..3de0254ab43 100644
--- a/src/main/java/org/jabref/gui/fieldeditors/ISSNEditorViewModel.java
+++ b/src/main/java/org/jabref/gui/fieldeditors/ISSNEditorViewModel.java
@@ -41,12 +41,7 @@ public ISSNEditorViewModel(
     }
 
     public void showJournalInfo(Button journalInfoButton) {
-        PopOverUtil.showJournalInfo(
-            journalInfoButton,
-            entry,
-            dialogService,
-            taskExecutor
-        );
+        PopOverUtil.showJournalInfo(journalInfoButton, entry, dialogService, taskExecutor);
     }
 
     public void fetchBibliographyInformation(BibEntry bibEntry) {
@@ -62,10 +57,7 @@ public void fetchBibliographyInformation(BibEntry bibEntry) {
                         undoManager
                     )
                         .fetchAndMerge(bibEntry, StandardField.ISSN),
-                () ->
-                    dialogService.notify(
-                        Localization.lang("No library selected")
-                    )
+                () -> 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 492f2495ca4..e71da14a026 100644
--- a/src/main/java/org/jabref/gui/fieldeditors/JournalEditor.java
+++ b/src/main/java/org/jabref/gui/fieldeditors/JournalEditor.java
@@ -65,16 +65,10 @@ public JournalEditor(
         textField.textProperty().bindBidirectional(viewModel.textProperty());
         textField.initContextMenu(new DefaultMenu(textField));
 
-        AutoCompletionTextInputBinding.autoComplete(
-            textField,
-            viewModel::complete
-        );
+        AutoCompletionTextInputBinding.autoComplete(textField, viewModel::complete);
 
         new EditorValidator(preferencesService)
-            .configureValidation(
-                viewModel.getFieldValidator().getValidationStatus(),
-                textField
-            );
+            .configureValidation(viewModel.getFieldValidator().getValidationStatus(), textField);
     }
 
     public JournalEditorViewModel getViewModel() {
diff --git a/src/main/java/org/jabref/gui/fieldeditors/JournalEditorViewModel.java b/src/main/java/org/jabref/gui/fieldeditors/JournalEditorViewModel.java
index 590e10ea25b..f78ea46d2e7 100644
--- a/src/main/java/org/jabref/gui/fieldeditors/JournalEditorViewModel.java
+++ b/src/main/java/org/jabref/gui/fieldeditors/JournalEditorViewModel.java
@@ -49,11 +49,6 @@ public void toggleAbbreviation() {
     }
 
     public void showJournalInfo(Button journalInfoButton) {
-        PopOverUtil.showJournalInfo(
-            journalInfoButton,
-            entry,
-            dialogService,
-            taskExecutor
-        );
+        PopOverUtil.showJournalInfo(journalInfoButton, entry, dialogService, taskExecutor);
     }
 }
diff --git a/src/main/java/org/jabref/gui/fieldeditors/JournalInfoOptInDialogHelper.java b/src/main/java/org/jabref/gui/fieldeditors/JournalInfoOptInDialogHelper.java
index 907104e012e..81e4b764d46 100644
--- a/src/main/java/org/jabref/gui/fieldeditors/JournalInfoOptInDialogHelper.java
+++ b/src/main/java/org/jabref/gui/fieldeditors/JournalInfoOptInDialogHelper.java
@@ -24,17 +24,16 @@ public static boolean isJournalInfoEnabled(
             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")
-                );
+            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
@@ -45,13 +44,12 @@ public static boolean isJournalInfoEnabled(
             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
diff --git a/src/main/java/org/jabref/gui/fieldeditors/KeywordsEditor.java b/src/main/java/org/jabref/gui/fieldeditors/KeywordsEditor.java
index 050f5bf54d2..389f7b36367 100644
--- a/src/main/java/org/jabref/gui/fieldeditors/KeywordsEditor.java
+++ b/src/main/java/org/jabref/gui/fieldeditors/KeywordsEditor.java
@@ -15,13 +15,7 @@ public KeywordsEditor(
         PreferencesService preferences,
         UndoManager undoManager
     ) {
-        super(
-            field,
-            suggestionProvider,
-            fieldCheckers,
-            preferences,
-            undoManager
-        );
+        super(field, suggestionProvider, fieldCheckers, preferences, undoManager);
     }
 
     @Override
diff --git a/src/main/java/org/jabref/gui/fieldeditors/LinkedEntriesEditor.java b/src/main/java/org/jabref/gui/fieldeditors/LinkedEntriesEditor.java
index 5d79b8a730e..4c1b65eee73 100644
--- a/src/main/java/org/jabref/gui/fieldeditors/LinkedEntriesEditor.java
+++ b/src/main/java/org/jabref/gui/fieldeditors/LinkedEntriesEditor.java
@@ -36,9 +36,7 @@
 
 public class LinkedEntriesEditor extends HBox implements FieldEditorFX {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(
-        LinkedEntriesEditor.class
-    );
+    private static final Logger LOGGER = LoggerFactory.getLogger(LinkedEntriesEditor.class);
 
     @FXML
     public TagsField<ParsedEntryLink> entryLinkField;
@@ -75,8 +73,7 @@ public LinkedEntriesEditor(
             );
 
         entryLinkField.setCellFactory(
-            new ViewModelListCellFactory<ParsedEntryLink>()
-                .withText(ParsedEntryLink::getKey)
+            new ViewModelListCellFactory<ParsedEntryLink>().withText(ParsedEntryLink::getKey)
         );
         // Mind the .collect(Collectors.toList()) as the list needs to be mutable
         entryLinkField.setSuggestionProvider(request ->
@@ -99,14 +96,9 @@ public LinkedEntriesEditor(
             viewModel.getStringConverter().fromString(searchText)
         );
         entryLinkField.setMatcher((entryLink, searchText) ->
-            entryLink
-                .getKey()
-                .toLowerCase()
-                .startsWith(searchText.toLowerCase())
-        );
-        entryLinkField.setComparator(
-            Comparator.comparing(ParsedEntryLink::getKey)
+            entryLink.getKey().toLowerCase().startsWith(searchText.toLowerCase())
         );
+        entryLinkField.setComparator(Comparator.comparing(ParsedEntryLink::getKey));
         entryLinkField.setShowSearchIcon(false);
         entryLinkField.getEditor().getStyleClass().clear();
         entryLinkField.getEditor().getStyleClass().add("tags-field-editor");
@@ -121,15 +113,10 @@ private Node createTag(ParsedEntryLink entryLink) {
         Label tagLabel = new Label();
         tagLabel.setText(entryLinkField.getConverter().toString(entryLink));
         tagLabel.setGraphic(IconTheme.JabRefIcons.REMOVE_TAGS.getGraphicNode());
-        tagLabel
-            .getGraphic()
-            .setOnMouseClicked(event -> entryLinkField.removeTags(entryLink));
+        tagLabel.getGraphic().setOnMouseClicked(event -> entryLinkField.removeTags(entryLink));
         tagLabel.setContentDisplay(ContentDisplay.RIGHT);
         tagLabel.setOnMouseClicked(event -> {
-            if (
-                event.getClickCount() == 2 &&
-                event.getButton().equals(MouseButton.PRIMARY)
-            ) {
+            if (event.getClickCount() == 2 && event.getButton().equals(MouseButton.PRIMARY)) {
                 viewModel.jumpToEntry(entryLink);
             }
         });
@@ -175,10 +162,7 @@ private class TagContextAction extends SimpleCommand {
         private final StandardActions command;
         private final ParsedEntryLink entryLink;
 
-        public TagContextAction(
-            StandardActions command,
-            ParsedEntryLink entryLink
-        ) {
+        public TagContextAction(StandardActions command, ParsedEntryLink entryLink) {
             this.command = command;
             this.entryLink = entryLink;
         }
@@ -191,9 +175,7 @@ public void execute() {
                     dialogService.notify(
                         Localization.lang(
                             "Copied '%0' to clipboard.",
-                            JabRefDialogService.shortenDialogMessage(
-                                entryLink.getKey()
-                            )
+                            JabRefDialogService.shortenDialogMessage(entryLink.getKey())
                         )
                     );
                 }
@@ -202,18 +184,13 @@ public void execute() {
                     dialogService.notify(
                         Localization.lang(
                             "Copied '%0' to clipboard.",
-                            JabRefDialogService.shortenDialogMessage(
-                                entryLink.getKey()
-                            )
+                            JabRefDialogService.shortenDialogMessage(entryLink.getKey())
                         )
                     );
                     entryLinkField.removeTags(entryLink);
                 }
                 case DELETE -> entryLinkField.removeTags(entryLink);
-                default -> LOGGER.info(
-                    "Action {} not defined",
-                    command.getText()
-                );
+                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 066ba0908e3..f20dc2eabb3 100644
--- a/src/main/java/org/jabref/gui/fieldeditors/LinkedEntriesEditorViewModel.java
+++ b/src/main/java/org/jabref/gui/fieldeditors/LinkedEntriesEditorViewModel.java
@@ -27,14 +27,12 @@ public LinkedEntriesEditorViewModel(
     ) {
         super(field, suggestionProvider, fieldCheckers, undoManager);
         this.databaseContext = databaseContext;
-        linkedEntries =
-            new SimpleListProperty<>(FXCollections.observableArrayList());
+        linkedEntries = new SimpleListProperty<>(FXCollections.observableArrayList());
         BindingsHelper.bindContentBidirectional(
             linkedEntries,
             text,
             EntryLinkList::serialize,
-            newText ->
-                EntryLinkList.parse(newText, databaseContext.getDatabase())
+            newText -> EntryLinkList.parse(newText, databaseContext.getDatabase())
         );
     }
 
diff --git a/src/main/java/org/jabref/gui/fieldeditors/LinkedFileViewModel.java b/src/main/java/org/jabref/gui/fieldeditors/LinkedFileViewModel.java
index 17213bc5180..4376e826b15 100644
--- a/src/main/java/org/jabref/gui/fieldeditors/LinkedFileViewModel.java
+++ b/src/main/java/org/jabref/gui/fieldeditors/LinkedFileViewModel.java
@@ -70,23 +70,14 @@
 
 public class LinkedFileViewModel extends AbstractViewModel {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(
-        LinkedFileViewModel.class
-    );
+    private static final Logger LOGGER = LoggerFactory.getLogger(LinkedFileViewModel.class);
 
     private final LinkedFile linkedFile;
     private final BibDatabaseContext databaseContext;
-    private final DoubleProperty downloadProgress = new SimpleDoubleProperty(
-        -1
-    );
-    private final BooleanProperty downloadOngoing = new SimpleBooleanProperty(
-        false
-    );
-    private final BooleanProperty isAutomaticallyFound =
-        new SimpleBooleanProperty(false);
-    private final BooleanProperty isOfflinePdf = new SimpleBooleanProperty(
-        false
-    );
+    private final DoubleProperty downloadProgress = new SimpleDoubleProperty(-1);
+    private final BooleanProperty downloadOngoing = new SimpleBooleanProperty(false);
+    private final BooleanProperty isAutomaticallyFound = new SimpleBooleanProperty(false);
+    private final BooleanProperty isOfflinePdf = new SimpleBooleanProperty(false);
     private final DialogService dialogService;
     private final BibEntry entry;
     private final TaskExecutor taskExecutor;
@@ -135,21 +126,15 @@ public LinkedFileViewModel(
                     }
                 },
                 ValidationMessage.warning(
-                    Localization.lang(
-                        "Could not find file '%0'.",
-                        linkedFile.getLink()
-                    )
+                    Localization.lang("Could not find file '%0'.", linkedFile.getLink())
                 )
             );
 
         downloadOngoing.bind(
-            downloadProgress
-                .greaterThanOrEqualTo(0)
-                .and(downloadProgress.lessThan(1))
+            downloadProgress.greaterThanOrEqualTo(0).and(downloadProgress.lessThan(1))
         );
         isOfflinePdf.setValue(
-            !linkedFile.isOnlineLink() &&
-            "pdf".equalsIgnoreCase(linkedFile.getFileType())
+            !linkedFile.isOnlineLink() && "pdf".equalsIgnoreCase(linkedFile.getFileType())
         );
     }
 
@@ -189,9 +174,7 @@ public String getDescriptionAndLink() {
         if (StringUtil.isBlank(linkedFile.getDescription())) {
             return linkedFile.getLink();
         } else {
-            return (
-                linkedFile.getDescription() + " (" + linkedFile.getLink() + ")"
-            );
+            return (linkedFile.getDescription() + " (" + linkedFile.getLink() + ")");
         }
     }
 
@@ -259,9 +242,7 @@ public void acceptAsLinked() {
     }
 
     public Observable[] getObservables() {
-        List<Observable> observables = new ArrayList<>(
-            Arrays.asList(linkedFile.getObservables())
-        );
+        List<Observable> observables = new ArrayList<>(Arrays.asList(linkedFile.getObservables()));
         observables.add(downloadOngoing);
         observables.add(downloadProgress);
         observables.add(isAutomaticallyFound);
@@ -270,12 +251,11 @@ public Observable[] getObservables() {
 
     public void open() {
         try {
-            Optional<ExternalFileType> type =
-                ExternalFileTypes.getExternalFileTypeByLinkedFile(
-                    linkedFile,
-                    true,
-                    preferencesService.getFilePreferences()
-                );
+            Optional<ExternalFileType> type = ExternalFileTypes.getExternalFileTypeByLinkedFile(
+                linkedFile,
+                true,
+                preferencesService.getFilePreferences()
+            );
             boolean successful = JabRefDesktop.openExternalFileAnyFormat(
                 databaseContext,
                 preferencesService.getFilePreferences(),
@@ -285,18 +265,12 @@ public void open() {
             if (!successful) {
                 dialogService.showErrorDialogAndWait(
                     Localization.lang("File not found"),
-                    Localization.lang(
-                        "Could not find file '%0'.",
-                        linkedFile.getLink()
-                    )
+                    Localization.lang("Could not find file '%0'.", linkedFile.getLink())
                 );
             }
         } catch (IOException e) {
             dialogService.showErrorDialogAndWait(
-                Localization.lang(
-                    "Error opening file '%0'",
-                    linkedFile.getLink()
-                ),
+                Localization.lang("Error opening file '%0'", linkedFile.getLink()),
                 e
             );
         }
@@ -317,15 +291,11 @@ public void openFolder() {
                         dialogService
                     );
                 } else {
-                    dialogService.showErrorDialogAndWait(
-                        Localization.lang("File not found")
-                    );
+                    dialogService.showErrorDialogAndWait(Localization.lang("File not found"));
                 }
             } else {
                 dialogService.showErrorDialogAndWait(
-                    Localization.lang(
-                        "Cannot open folder as the file is an online link."
-                    )
+                    Localization.lang("Cannot open folder as the file is an online link.")
                 );
             }
         } catch (IOException ex) {
@@ -340,12 +310,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);
     }
 
@@ -364,10 +333,7 @@ public void renameFileToName(String targetFileName) {
         } else {
             dialogService.showErrorDialogAndWait(
                 Localization.lang("File not found"),
-                Localization.lang(
-                    "Could not find file '%0'.",
-                    linkedFile.getLink()
-                )
+                Localization.lang("Could not find file '%0'.", linkedFile.getLink())
             );
         }
     }
@@ -384,10 +350,7 @@ private void performRenameWithConflictCheck(String targetFileName) {
             overwriteFile =
                 dialogService.showConfirmationDialogAndWait(
                     Localization.lang("File exists"),
-                    Localization.lang(
-                        "'%0' exists. Overwrite file?",
-                        targetFileName
-                    ),
+                    Localization.lang("'%0' exists. Overwrite file?", targetFileName),
                     Localization.lang("Overwrite")
                 );
 
@@ -421,9 +384,7 @@ public void moveToDefaultDirectory() {
         if (fileDir.isEmpty()) {
             dialogService.showErrorDialogAndWait(
                 Localization.lang("Move file"),
-                Localization.lang(
-                    "File directory is not set or does not exist!"
-                )
+                Localization.lang("File directory is not set or does not exist!")
             );
             return;
         }
@@ -439,10 +400,7 @@ public void moveToDefaultDirectory() {
             } catch (IOException exception) {
                 dialogService.showErrorDialogAndWait(
                     Localization.lang("Move file"),
-                    Localization.lang(
-                        "Could not move file '%0'.",
-                        file.get().toString()
-                    ),
+                    Localization.lang("Could not move file '%0'.", file.get().toString()),
                     exception
                 );
             }
@@ -450,10 +408,7 @@ public void moveToDefaultDirectory() {
             // 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()
-                )
+                Localization.lang("Could not find file '%0'.", linkedFile.getLink())
             );
         }
     }
@@ -466,8 +421,7 @@ public void moveToDefaultDirectory() {
     public boolean isGeneratedNameSameAsOriginal() {
         Path file = Path.of(this.linkedFile.getLink());
         String currentFileName = file.getFileName().toString();
-        String suggestedFileName =
-            this.linkedFileHandler.getSuggestedFileName();
+        String suggestedFileName = this.linkedFileHandler.getSuggestedFileName();
 
         return currentFileName.equals(suggestedFileName);
     }
@@ -478,11 +432,8 @@ public boolean isGeneratedNameSameAsOriginal() {
      * @return true if suggested filepath is same as existing filepath.
      */
     public boolean isGeneratedPathSameAsOriginal() {
-        FilePreferences filePreferences =
-            preferencesService.getFilePreferences();
-        Optional<Path> baseDir = databaseContext.getFirstExistingFileDir(
-            filePreferences
-        );
+        FilePreferences filePreferences = preferencesService.getFilePreferences();
+        Optional<Path> baseDir = databaseContext.getFirstExistingFileDir(filePreferences);
         if (baseDir.isEmpty()) {
             // could not find default path
             return false;
@@ -495,9 +446,7 @@ public boolean isGeneratedPathSameAsOriginal() {
             filePreferences.getFileDirectoryPattern()
         );
 
-        Optional<Path> targetDir = baseDir.map(dir ->
-            dir.resolve(targetDirectoryName)
-        );
+        Optional<Path> targetDir = baseDir.map(dir -> dir.resolve(targetDirectoryName));
 
         Optional<Path> currentDir = linkedFile
             .findIn(databaseContext, preferencesService.getFilePreferences())
@@ -543,24 +492,18 @@ public boolean delete() {
             Localization.lang("Remove from entry"),
             ButtonData.YES
         );
-        ButtonType deleteFromEntry = new ButtonType(
-            Localization.lang("Delete from disk")
+        ButtonType deleteFromEntry = new ButtonType(Localization.lang("Delete from disk"));
+        Optional<ButtonType> buttonType = dialogService.showCustomButtonDialogAndWait(
+            AlertType.INFORMATION,
+            Localization.lang("Delete '%0'", file.get().getFileName().toString()),
+            Localization.lang(
+                "Delete '%0' permanently from disk, or just remove the file from the entry? Pressing Delete will delete the file permanently from disk.",
+                file.get().toString()
+            ),
+            removeFromEntry,
+            deleteFromEntry,
+            ButtonType.CANCEL
         );
-        Optional<ButtonType> buttonType =
-            dialogService.showCustomButtonDialogAndWait(
-                AlertType.INFORMATION,
-                Localization.lang(
-                    "Delete '%0'",
-                    file.get().getFileName().toString()
-                ),
-                Localization.lang(
-                    "Delete '%0' permanently from disk, or just remove the file from the entry? Pressing Delete will delete the file permanently from disk.",
-                    file.get().toString()
-                ),
-                removeFromEntry,
-                deleteFromEntry,
-                ButtonType.CANCEL
-            );
 
         if (buttonType.isPresent()) {
             if (buttonType.get().equals(removeFromEntry)) {
@@ -576,11 +519,7 @@ public boolean delete() {
                         Localization.lang("Cannot delete file"),
                         Localization.lang("File permission error")
                     );
-                    LOGGER.warn(
-                        "File permission error while deleting: {}",
-                        linkedFile,
-                        ex
-                    );
+                    LOGGER.warn("File permission error while deleting: {}", linkedFile, ex);
                 }
             }
         }
@@ -605,16 +544,13 @@ public void download() {
             );
         }
         try {
-            Optional<Path> targetDirectory =
-                databaseContext.getFirstExistingFileDir(
-                    preferencesService.getFilePreferences()
-                );
+            Optional<Path> targetDirectory = databaseContext.getFirstExistingFileDir(
+                preferencesService.getFilePreferences()
+            );
             if (targetDirectory.isEmpty()) {
                 dialogService.showErrorDialogAndWait(
                     Localization.lang("Download file"),
-                    Localization.lang(
-                        "File directory is not set or does not exist!"
-                    )
+                    Localization.lang("File directory is not set or does not exist!")
                 );
                 return;
             }
@@ -638,38 +574,25 @@ public void download() {
                             dialogService
                         );
                 } catch (IOException e) {
-                    LOGGER.error(
-                        "FileNameUniqueness.isDuplicatedFile failed",
-                        e
-                    );
+                    LOGGER.error("FileNameUniqueness.isDuplicatedFile failed", e);
                     return;
                 }
 
                 if (!isDuplicate) {
                     // we need to call LinkedFileViewModel#fromFile, because we need to make the path relative to the configured directories
-                    LinkedFile newLinkedFile =
-                        LinkedFilesEditorViewModel.fromFile(
-                            destination,
-                            databaseContext.getFileDirectories(
-                                preferencesService.getFilePreferences()
-                            ),
-                            preferencesService.getFilePreferences()
-                        );
-                    entry.replaceDownloadedFile(
-                        linkedFile.getLink(),
-                        newLinkedFile
+                    LinkedFile newLinkedFile = LinkedFilesEditorViewModel.fromFile(
+                        destination,
+                        databaseContext.getFileDirectories(preferencesService.getFilePreferences()),
+                        preferencesService.getFilePreferences()
                     );
+                    entry.replaceDownloadedFile(linkedFile.getLink(), newLinkedFile);
 
                     // Notify in bar when the file type is HTML.
                     if (
-                        newLinkedFile
-                            .getFileType()
-                            .equals(StandardExternalFileType.URL.getName())
+                        newLinkedFile.getFileType().equals(StandardExternalFileType.URL.getName())
                     ) {
                         dialogService.notify(
-                            Localization.lang(
-                                "Downloaded website as an HTML file."
-                            )
+                            Localization.lang("Downloaded website as an HTML file.")
                         );
                         LOGGER.debug(
                             "Downloaded website {} as an HTML file at {}",
@@ -686,9 +609,7 @@ public void download() {
                 .set(
                     Localization.lang("Fulltext for") +
                     ": " +
-                    entry
-                        .getCitationKey()
-                        .orElse(Localization.lang("New entry"))
+                    entry.getCitationKey().orElse(Localization.lang("New entry"))
                 );
             downloadTask.showToUser(true);
             downloadTask.onFailure(ex -> {
@@ -725,9 +646,7 @@ public void download() {
                             )
                         );
                     }
-                } else if (
-                    ex instanceof FetcherServerException serverException
-                ) {
+                } else if (ex instanceof FetcherServerException serverException) {
                     statusCode = serverException.getStatusCode();
                     dialogService.showInformationDialogAndWait(
                         Localization.lang("Failed to download from URL"),
@@ -751,10 +670,7 @@ public void download() {
             });
             taskExecutor.execute(downloadTask);
         } catch (MalformedURLException exception) {
-            dialogService.showErrorDialogAndWait(
-                Localization.lang("Invalid URL"),
-                exception
-            );
+            dialogService.showErrorDialogAndWait(Localization.lang("Invalid URL"), exception);
         }
     }
 
@@ -774,16 +690,11 @@ public boolean checkSSLHandshake(URLDownload urlDownload) {
                 ) {
                     return true;
                 } else {
-                    dialogService.notify(
-                        Localization.lang("Download operation canceled.")
-                    );
+                    dialogService.notify(Localization.lang("Download operation canceled."));
                     return false;
                 }
             } else {
-                LOGGER.error(
-                    "Error while checking if the file can be downloaded",
-                    ex
-                );
+                LOGGER.error("Error while checking if the file can be downloaded", ex);
                 dialogService.notify(Localization.lang("Error downloading"));
                 return false;
             }
@@ -791,19 +702,12 @@ public boolean checkSSLHandshake(URLDownload urlDownload) {
         return true;
     }
 
-    public BackgroundTask<Path> prepareDownloadTask(
-        Path targetDirectory,
-        URLDownload urlDownload
-    ) {
-        SSLSocketFactory defaultSSLSocketFactory =
-            HttpsURLConnection.getDefaultSSLSocketFactory();
-        HostnameVerifier defaultHostnameVerifier =
-            HttpsURLConnection.getDefaultHostnameVerifier();
+    public BackgroundTask<Path> prepareDownloadTask(Path targetDirectory, URLDownload urlDownload) {
+        SSLSocketFactory defaultSSLSocketFactory = HttpsURLConnection.getDefaultSSLSocketFactory();
+        HostnameVerifier defaultHostnameVerifier = HttpsURLConnection.getDefaultHostnameVerifier();
         return BackgroundTask
             .wrap(() -> {
-                Optional<ExternalFileType> suggestedType = inferFileType(
-                    urlDownload
-                );
+                Optional<ExternalFileType> suggestedType = inferFileType(urlDownload);
                 ExternalFileType externalFileType = suggestedType.orElse(
                     StandardExternalFileType.PDF
                 );
@@ -814,47 +718,33 @@ public BackgroundTask<Path> prepareDownloadTask(
                 String fulltextDir = FileUtil.createDirNameFromPattern(
                     databaseContext.getDatabase(),
                     entry,
-                    preferencesService
-                        .getFilePreferences()
-                        .getFileDirectoryPattern()
+                    preferencesService.getFilePreferences().getFileDirectoryPattern()
                 );
                 suggestedName =
                     FileNameUniqueness.getNonOverWritingFileName(
                         targetDirectory.resolve(fulltextDir),
                         suggestedName
                     );
-                return targetDirectory
-                    .resolve(fulltextDir)
-                    .resolve(suggestedName);
+                return targetDirectory.resolve(fulltextDir).resolve(suggestedName);
             })
-            .then(destination ->
-                new FileDownloadTask(urlDownload.getSource(), destination)
-            )
+            .then(destination -> new FileDownloadTask(urlDownload.getSource(), destination))
             .onFailure(ex -> LOGGER.error("Error in download", ex))
             .onFinished(() ->
-                URLDownload.setSSLVerification(
-                    defaultSSLSocketFactory,
-                    defaultHostnameVerifier
-                )
+                URLDownload.setSSLVerification(defaultSSLSocketFactory, defaultHostnameVerifier)
             );
     }
 
     private Optional<ExternalFileType> inferFileType(URLDownload urlDownload) {
-        Optional<ExternalFileType> suggestedType = inferFileTypeFromMimeType(
-            urlDownload
-        );
+        Optional<ExternalFileType> suggestedType = inferFileTypeFromMimeType(urlDownload);
 
         // If we did not find a file type from the MIME type, try based on extension:
         if (suggestedType.isEmpty()) {
-            suggestedType =
-                inferFileTypeFromURL(urlDownload.getSource().toExternalForm());
+            suggestedType = inferFileTypeFromURL(urlDownload.getSource().toExternalForm());
         }
         return suggestedType;
     }
 
-    private Optional<ExternalFileType> inferFileTypeFromMimeType(
-        URLDownload urlDownload
-    ) {
+    private Optional<ExternalFileType> inferFileTypeFromMimeType(URLDownload urlDownload) {
         String mimeType = urlDownload.getMimeType();
 
         if (mimeType != null) {
@@ -915,15 +805,11 @@ public void parsePdfMetadataAndShowMergeDialog() {
                         filePath
                     )
                 );
-                if (
-                    preferencesService.getGrobidPreferences().isGrobidEnabled()
-                ) {
+                if (preferencesService.getGrobidPreferences().isGrobidEnabled()) {
                     dialog.addSource(
                         "Grobid",
                         wrapImporterToSupplier(
-                            new PdfGrobidImporter(
-                                preferencesService.getImportFormatPreferences()
-                            ),
+                            new PdfGrobidImporter(preferencesService.getImportFormatPreferences()),
                             filePath
                         )
                     );
@@ -931,9 +817,7 @@ public void parsePdfMetadataAndShowMergeDialog() {
                 dialog.addSource(
                     Localization.lang("XMP metadata"),
                     wrapImporterToSupplier(
-                        new PdfXmpImporter(
-                            preferencesService.getXmpPreferences()
-                        ),
+                        new PdfXmpImporter(preferencesService.getXmpPreferences()),
                         filePath
                     )
                 );
@@ -950,10 +834,7 @@ public void parsePdfMetadataAndShowMergeDialog() {
             });
     }
 
-    private Supplier<BibEntry> wrapImporterToSupplier(
-        Importer importer,
-        Path filePath
-    ) {
+    private Supplier<BibEntry> wrapImporterToSupplier(Importer importer, Path filePath) {
         return () -> {
             try {
                 ParserResult parserResult = importer.importDatabase(filePath);
diff --git a/src/main/java/org/jabref/gui/fieldeditors/LinkedFilesEditor.java b/src/main/java/org/jabref/gui/fieldeditors/LinkedFilesEditor.java
index 3f74dfa8d6d..c5f4e02cad5 100644
--- a/src/main/java/org/jabref/gui/fieldeditors/LinkedFilesEditor.java
+++ b/src/main/java/org/jabref/gui/fieldeditors/LinkedFilesEditor.java
@@ -95,9 +95,7 @@ public class LinkedFilesEditor extends HBox implements FieldEditorFX {
     private ObservableOptionalValue<BibEntry> bibEntry = EasyBind.wrapNullable(
         new SimpleObjectProperty<>()
     );
-    private final UiThreadObservableList<
-        LinkedFileViewModel
-    > decoratedModelList;
+    private final UiThreadObservableList<LinkedFileViewModel> decoratedModelList;
 
     public LinkedFilesEditor(
         Field field,
@@ -112,12 +110,8 @@ public LinkedFilesEditor(
 
         ViewLoader.view(this).root(this).load();
 
-        decoratedModelList =
-            new UiThreadObservableList<>(viewModel.filesProperty());
-        Bindings.bindContentBidirectional(
-            listView.itemsProperty().get(),
-            decoratedModelList
-        );
+        decoratedModelList = new UiThreadObservableList<>(viewModel.filesProperty());
+        Bindings.bindContentBidirectional(listView.itemsProperty().get(), decoratedModelList);
     }
 
     @FXML
@@ -146,17 +140,12 @@ private void initialize() {
             .install(listView);
         listView.getSelectionModel().setSelectionMode(SelectionMode.MULTIPLE);
 
-        fulltextFetcher
-            .visibleProperty()
-            .bind(viewModel.fulltextLookupInProgressProperty().not());
+        fulltextFetcher.visibleProperty().bind(viewModel.fulltextLookupInProgressProperty().not());
 
         setUpKeyBindings();
     }
 
-    private void handleOnDragOver(
-        LinkedFileViewModel originalItem,
-        DragEvent event
-    ) {
+    private void handleOnDragOver(LinkedFileViewModel originalItem, DragEvent event) {
         if (
             (event.getGestureSource() != originalItem) &&
             event.getDragboard().hasContent(DragAndDropDataFormats.LINKED_FILE)
@@ -169,10 +158,7 @@ private void handleOnDragDetected(
         @SuppressWarnings("unused") LinkedFileViewModel linkedFile,
         MouseEvent event
     ) {
-        LinkedFile selectedItem = listView
-            .getSelectionModel()
-            .getSelectedItem()
-            .getFile();
+        LinkedFile selectedItem = listView.getSelectionModel().getSelectedItem().getFile();
         if (selectedItem != null) {
             ClipboardContent content = new ClipboardContent();
             Dragboard dragboard = listView.startDragAndDrop(TransferMode.MOVE);
@@ -183,16 +169,11 @@ private void handleOnDragDetected(
         event.consume();
     }
 
-    private void handleOnDragDropped(
-        LinkedFileViewModel originalItem,
-        DragEvent event
-    ) {
+    private void handleOnDragDropped(LinkedFileViewModel originalItem, DragEvent event) {
         Dragboard dragboard = event.getDragboard();
         boolean success = false;
 
-        ObservableList<LinkedFileViewModel> items = listView
-            .itemsProperty()
-            .get();
+        ObservableList<LinkedFileViewModel> items = listView.itemsProperty().get();
 
         if (dragboard.hasContent(DragAndDropDataFormats.LINKED_FILE)) {
             LinkedFile linkedFile = (LinkedFile) dragboard.getContent(
@@ -236,12 +217,8 @@ private Node createFileDisplay(LinkedFileViewModel linkedFile) {
         desc.getStyleClass().setAll("file-row-text");
 
         ProgressBar progressIndicator = new ProgressBar();
-        progressIndicator
-            .progressProperty()
-            .bind(linkedFile.downloadProgressProperty());
-        progressIndicator
-            .visibleProperty()
-            .bind(linkedFile.downloadOngoingProperty());
+        progressIndicator.progressProperty().bind(linkedFile.downloadProgressProperty());
+        progressIndicator.visibleProperty().bind(linkedFile.downloadOngoingProperty());
 
         Label label = new Label();
         label.graphicProperty().bind(linkedFile.typeIconProperty());
@@ -258,8 +235,7 @@ private Node createFileDisplay(LinkedFileViewModel linkedFile) {
         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();
+        Button acceptAutoLinkedFile = IconTheme.JabRefIcons.AUTO_LINKED_FILE.asButton();
         acceptAutoLinkedFile.setTooltip(
             new Tooltip(
                 Localization.lang(
@@ -267,23 +243,16 @@ private Node createFileDisplay(LinkedFileViewModel linkedFile) {
                 )
             )
         );
-        acceptAutoLinkedFile
-            .visibleProperty()
-            .bind(linkedFile.isAutomaticallyFoundProperty());
-        acceptAutoLinkedFile
-            .managedProperty()
-            .bind(linkedFile.isAutomaticallyFoundProperty());
+        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();
+        Button writeMetadataToPdf = IconTheme.JabRefIcons.PDF_METADATA_WRITE.asButton();
         writeMetadataToPdf.setTooltip(
             new Tooltip(Localization.lang("Write BibTeXEntry metadata to PDF."))
         );
-        writeMetadataToPdf
-            .visibleProperty()
-            .bind(linkedFile.isOfflinePdfProperty());
+        writeMetadataToPdf.visibleProperty().bind(linkedFile.isOfflinePdfProperty());
         writeMetadataToPdf.getStyleClass().setAll("icon-button");
         WriteMetadataToSinglePdfAction writeMetadataToSinglePdfAction =
             new WriteMetadataToSinglePdfAction(
@@ -301,18 +270,11 @@ private Node createFileDisplay(LinkedFileViewModel linkedFile) {
         writeMetadataToPdf
             .disableProperty()
             .bind(writeMetadataToSinglePdfAction.executableProperty().not());
-        writeMetadataToPdf.setOnAction(event ->
-            writeMetadataToSinglePdfAction.execute()
-        );
+        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());
+        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,
@@ -324,17 +286,10 @@ private Node createFileDisplay(LinkedFileViewModel linkedFile) {
 
         HBox container = new HBox(2);
         container.setPrefHeight(Double.NEGATIVE_INFINITY);
-        container
-            .maxWidthProperty()
-            .bind(listView.widthProperty().subtract(20d));
+        container.maxWidthProperty().bind(listView.widthProperty().subtract(20d));
         container
             .getChildren()
-            .addAll(
-                acceptAutoLinkedFile,
-                info,
-                writeMetadataToPdf,
-                parsePdfMetadata
-            );
+            .addAll(acceptAutoLinkedFile, info, writeMetadataToPdf, parsePdfMetadata);
 
         return container;
     }
@@ -343,9 +298,7 @@ private void setUpKeyBindings() {
         listView.addEventFilter(
             KeyEvent.KEY_PRESSED,
             event -> {
-                Optional<KeyBinding> keyBinding = Globals
-                    .getKeyPrefs()
-                    .mapToKeyBinding(event);
+                Optional<KeyBinding> keyBinding = Globals.getKeyPrefs().mapToKeyBinding(event);
                 if (keyBinding.isPresent()) {
                     switch (keyBinding.get()) {
                         case DELETE_ENTRY:
@@ -397,14 +350,8 @@ private void addFromURL() {
         viewModel.addFromURL();
     }
 
-    private void handleItemMouseClick(
-        LinkedFileViewModel linkedFile,
-        MouseEvent event
-    ) {
-        if (
-            event.getButton().equals(MouseButton.PRIMARY) &&
-            (event.getClickCount() == 2)
-        ) {
+    private void handleItemMouseClick(LinkedFileViewModel linkedFile, MouseEvent event) {
+        if (event.getButton().equals(MouseButton.PRIMARY) && (event.getClickCount() == 2)) {
             // Double click -> open
             linkedFile.open();
         }
@@ -415,9 +362,7 @@ public double getWeight() {
         return 3;
     }
 
-    private ContextMenu createContextMenuForFile(
-        LinkedFileViewModel linkedFile
-    ) {
+    private ContextMenu createContextMenuForFile(LinkedFileViewModel linkedFile) {
         ContextMenu menu = new ContextMenu();
         ActionFactory factory = new ActionFactory(Globals.getKeyPrefs());
 
@@ -435,28 +380,16 @@ private ContextMenu createContextMenuForFile(
                 new SeparatorMenuItem(),
                 factory.createMenuItem(
                     StandardActions.OPEN_FILE,
-                    new ContextAction(
-                        StandardActions.OPEN_FILE,
-                        linkedFile,
-                        preferencesService
-                    )
+                    new ContextAction(StandardActions.OPEN_FILE, linkedFile, preferencesService)
                 ),
                 factory.createMenuItem(
                     StandardActions.OPEN_FOLDER,
-                    new ContextAction(
-                        StandardActions.OPEN_FOLDER,
-                        linkedFile,
-                        preferencesService
-                    )
+                    new ContextAction(StandardActions.OPEN_FOLDER, linkedFile, preferencesService)
                 ),
                 new SeparatorMenuItem(),
                 factory.createMenuItem(
                     StandardActions.DOWNLOAD_FILE,
-                    new ContextAction(
-                        StandardActions.DOWNLOAD_FILE,
-                        linkedFile,
-                        preferencesService
-                    )
+                    new ContextAction(StandardActions.DOWNLOAD_FILE, linkedFile, preferencesService)
                 ),
                 factory.createMenuItem(
                     StandardActions.RENAME_FILE_TO_PATTERN,
@@ -501,19 +434,11 @@ private ContextMenu createContextMenuForFile(
                 ),
                 factory.createMenuItem(
                     StandardActions.REMOVE_LINK,
-                    new ContextAction(
-                        StandardActions.REMOVE_LINK,
-                        linkedFile,
-                        preferencesService
-                    )
+                    new ContextAction(StandardActions.REMOVE_LINK, linkedFile, preferencesService)
                 ),
                 factory.createMenuItem(
                     StandardActions.DELETE_FILE,
-                    new ContextAction(
-                        StandardActions.DELETE_FILE,
-                        linkedFile,
-                        preferencesService
-                    )
+                    new ContextAction(StandardActions.DELETE_FILE, linkedFile, preferencesService)
                 )
             );
 
@@ -547,10 +472,7 @@ public ContextAction(
                                     .isPresent() &&
                                 !linkedFile.isGeneratedNameSameAsOriginal(),
                             linkedFile.getFile().linkProperty(),
-                            bibEntry
-                                .getValue()
-                                .map(BibEntry::getFieldsObservable)
-                                .orElse(null)
+                            bibEntry.getValue().map(BibEntry::getFieldsObservable).orElse(null)
                         );
                         case MOVE_FILE_TO_FOLDER,
                             MOVE_FILE_TO_FOLDER_AND_RENAME -> Bindings.createBooleanBinding(
@@ -565,18 +487,12 @@ public ContextAction(
                                     .isPresent() &&
                                 !linkedFile.isGeneratedPathSameAsOriginal(),
                             linkedFile.getFile().linkProperty(),
-                            bibEntry
-                                .getValue()
-                                .map(BibEntry::getFieldsObservable)
-                                .orElse(null)
+                            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)
+                            bibEntry.getValue().map(BibEntry::getFieldsObservable).orElse(null)
                         );
                         case OPEN_FILE,
                             OPEN_FOLDER,
@@ -592,10 +508,7 @@ public ContextAction(
                                     )
                                     .isPresent(),
                             linkedFile.getFile().linkProperty(),
-                            bibEntry
-                                .getValue()
-                                .map(BibEntry::getFieldsObservable)
-                                .orElse(null)
+                            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 1a25f2aec94..b2fd9401e11 100644
--- a/src/main/java/org/jabref/gui/fieldeditors/LinkedFilesEditorViewModel.java
+++ b/src/main/java/org/jabref/gui/fieldeditors/LinkedFilesEditorViewModel.java
@@ -48,18 +48,12 @@
 
 public class LinkedFilesEditorViewModel extends AbstractEditorViewModel {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(
-        LinkedFilesEditorViewModel.class
-    );
+    private static final Logger LOGGER = LoggerFactory.getLogger(LinkedFilesEditorViewModel.class);
 
-    private final ListProperty<LinkedFileViewModel> files =
-        new SimpleListProperty<>(
-            FXCollections.observableArrayList(
-                LinkedFileViewModel::getObservables
-            )
-        );
-    private final BooleanProperty fulltextLookupInProgress =
-        new SimpleBooleanProperty(false);
+    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;
@@ -89,9 +83,7 @@ public LinkedFilesEditorViewModel(
         );
     }
 
-    private static String getStringRepresentation(
-        List<LinkedFileViewModel> files
-    ) {
+    private static String getStringRepresentation(List<LinkedFileViewModel> files) {
         // Only serialize linked files, not the ones that are automatically found
         List<LinkedFile> filesToSerialize = files
             .stream()
@@ -121,19 +113,12 @@ public static LinkedFile fromFile(
         return new LinkedFile("", relativePath, suggestedFileType.getName());
     }
 
-    public LinkedFileViewModel fromFile(
-        Path file,
-        FilePreferences filePreferences
-    ) {
+    public LinkedFileViewModel fromFile(Path file, FilePreferences filePreferences) {
         List<Path> fileDirectories = databaseContext.getFileDirectories(
             preferences.getFilePreferences()
         );
 
-        LinkedFile linkedFile = fromFile(
-            file,
-            fileDirectories,
-            filePreferences
-        );
+        LinkedFile linkedFile = fromFile(file, fileDirectories, filePreferences);
         return new LinkedFileViewModel(
             linkedFile,
             entry,
@@ -174,18 +159,16 @@ public void addNewFile() {
             .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> selectedFiles = dialogService.showFileOpenDialogAndGetMultipleFiles(
+            fileDialogConfiguration
+        );
 
         for (Path fileToAdd : selectedFiles) {
             if (FileUtil.detectBadFileName(fileToAdd.toString())) {
@@ -193,18 +176,14 @@ public void addNewFile() {
                     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")
-                    );
+                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);
@@ -222,10 +201,7 @@ public void addNewFile() {
         }
     }
 
-    private void addNewLinkedFile(
-        Path correctPath,
-        List<Path> fileDirectories
-    ) {
+    private void addNewLinkedFile(Path correctPath, List<Path> fileDirectories) {
         LinkedFile newLinkedFile = fromFile(
             correctPath,
             fileDirectories,
@@ -247,13 +223,8 @@ private void addNewLinkedFile(
     public void bindToEntry(BibEntry entry) {
         super.bindToEntry(entry);
 
-        if (
-            (entry != null) &&
-            preferences.getEntryEditorPreferences().autoLinkFilesEnabled()
-        ) {
-            BackgroundTask<
-                List<LinkedFileViewModel>
-            > findAssociatedNotLinkedFiles = BackgroundTask
+        if ((entry != null) && preferences.getEntryEditorPreferences().autoLinkFilesEnabled()) {
+            BackgroundTask<List<LinkedFileViewModel>> findAssociatedNotLinkedFiles = BackgroundTask
                 .wrap(() -> findAssociatedNotLinkedFiles(entry))
                 .onSuccess(files::addAll);
             taskExecutor.execute(findAssociatedNotLinkedFiles);
@@ -263,9 +234,7 @@ public void bindToEntry(BibEntry entry) {
     /**
      * Find files that are probably associated  to the given entry but not yet linked.
      */
-    private List<LinkedFileViewModel> findAssociatedNotLinkedFiles(
-        BibEntry entry
-    ) {
+    private List<LinkedFileViewModel> findAssociatedNotLinkedFiles(BibEntry entry) {
         List<LinkedFileViewModel> result = new ArrayList<>();
 
         AutoSetFileLinksUtil util = new AutoSetFileLinksUtil(
@@ -274,9 +243,7 @@ private List<LinkedFileViewModel> findAssociatedNotLinkedFiles(
             preferences.getAutoLinkPreferences()
         );
         try {
-            List<LinkedFile> linkedFiles = util.findAssociatedNotLinkedFiles(
-                entry
-            );
+            List<LinkedFile> linkedFiles = util.findAssociatedNotLinkedFiles(entry);
             for (LinkedFile linkedFile : linkedFiles) {
                 LinkedFileViewModel newLinkedFile = new LinkedFileViewModel(
                     linkedFile,
@@ -290,10 +257,7 @@ private List<LinkedFileViewModel> findAssociatedNotLinkedFiles(
                 result.add(newLinkedFile);
             }
         } catch (IOException e) {
-            dialogService.showErrorDialogAndWait(
-                "Error accessing the file system",
-                e
-            );
+            dialogService.showErrorDialogAndWait("Error accessing the file system", e);
         }
 
         return result;
@@ -305,10 +269,7 @@ 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;
         }
     }
@@ -332,9 +293,7 @@ public void fetchFulltext() {
                     if (url.isPresent()) {
                         addFromURLAndDownload(url.get());
                     } else {
-                        dialogService.notify(
-                            Localization.lang("No full text document found")
-                        );
+                        dialogService.notify(Localization.lang("No full text document found"));
                     }
                 })
                 .executeWith(taskExecutor);
diff --git a/src/main/java/org/jabref/gui/fieldeditors/MapBasedEditorViewModel.java b/src/main/java/org/jabref/gui/fieldeditors/MapBasedEditorViewModel.java
index 1e000539e7c..b9efa5c1e8f 100644
--- a/src/main/java/org/jabref/gui/fieldeditors/MapBasedEditorViewModel.java
+++ b/src/main/java/org/jabref/gui/fieldeditors/MapBasedEditorViewModel.java
@@ -14,12 +14,9 @@
 /**
  * View model for a field editor that shows various options backed by a map.
  */
-public abstract class MapBasedEditorViewModel<T>
-    extends OptionEditorViewModel<T> {
+public abstract class MapBasedEditorViewModel<T> extends OptionEditorViewModel<T> {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(
-        MapBasedEditorViewModel.class
-    );
+    private static final Logger LOGGER = LoggerFactory.getLogger(MapBasedEditorViewModel.class);
 
     public MapBasedEditorViewModel(
         Field field,
@@ -40,9 +37,7 @@ public String toString(T object) {
                 if (object == null) {
                     return null;
                 } else {
-                    return getItemMap()
-                        .inverse()
-                        .getOrDefault(object, object.toString()); // if the object is not found we simply return itself as string
+                    return getItemMap().inverse().getOrDefault(object, object.toString()); // if the object is not found we simply return itself as string
                 }
             }
 
@@ -51,8 +46,7 @@ public T fromString(String string) {
                 if (string == null) {
                     return null;
                 } else {
-                    return getItemMap()
-                        .getOrDefault(string, getValueFromString(string));
+                    return getItemMap().getOrDefault(string, getValueFromString(string));
                 }
             }
         };
diff --git a/src/main/java/org/jabref/gui/fieldeditors/OptionEditor.java b/src/main/java/org/jabref/gui/fieldeditors/OptionEditor.java
index 89899265cca..9b43330b0a5 100644
--- a/src/main/java/org/jabref/gui/fieldeditors/OptionEditor.java
+++ b/src/main/java/org/jabref/gui/fieldeditors/OptionEditor.java
@@ -29,14 +29,10 @@ public OptionEditor(OptionEditorViewModel<T> viewModel) {
 
         comboBox.setConverter(viewModel.getStringConverter());
         comboBox.setCellFactory(
-            new ViewModelListCellFactory<T>()
-                .withText(viewModel::convertToDisplayText)
+            new ViewModelListCellFactory<T>().withText(viewModel::convertToDisplayText)
         );
         comboBox.getItems().setAll(viewModel.getItems());
-        comboBox
-            .getEditor()
-            .textProperty()
-            .bindBidirectional(viewModel.textProperty());
+        comboBox.getEditor().textProperty().bindBidirectional(viewModel.textProperty());
 
         comboBox
             .getEditor()
@@ -50,11 +46,7 @@ public OptionEditor(OptionEditorViewModel<T> viewModel) {
                             Globals.getKeyPrefs()
                         )
                     );
-                TextInputControlBehavior.showContextMenu(
-                    comboBox.getEditor(),
-                    contextMenu,
-                    event
-                );
+                TextInputControlBehavior.showContextMenu(comboBox.getEditor(), contextMenu, event);
             });
     }
 
diff --git a/src/main/java/org/jabref/gui/fieldeditors/OwnerEditor.java b/src/main/java/org/jabref/gui/fieldeditors/OwnerEditor.java
index 8d1236488ba..acb679f9ef0 100644
--- a/src/main/java/org/jabref/gui/fieldeditors/OwnerEditor.java
+++ b/src/main/java/org/jabref/gui/fieldeditors/OwnerEditor.java
@@ -47,10 +47,7 @@ public OwnerEditor(
         textArea.initContextMenu(EditorMenus.getNameMenu(textArea));
 
         new EditorValidator(preferencesService)
-            .configureValidation(
-                viewModel.getFieldValidator().getValidationStatus(),
-                textArea
-            );
+            .configureValidation(viewModel.getFieldValidator().getValidationStatus(), textArea);
     }
 
     public OwnerEditorViewModel getViewModel() {
diff --git a/src/main/java/org/jabref/gui/fieldeditors/PersonsEditor.java b/src/main/java/org/jabref/gui/fieldeditors/PersonsEditor.java
index 78e626c41bd..fe19fed0427 100644
--- a/src/main/java/org/jabref/gui/fieldeditors/PersonsEditor.java
+++ b/src/main/java/org/jabref/gui/fieldeditors/PersonsEditor.java
@@ -38,12 +38,9 @@ public PersonsEditor(
 
         textInput = isMultiLine ? new EditorTextArea() : new EditorTextField();
 
-        decoratedStringProperty =
-            new UiThreadStringProperty(viewModel.textProperty());
+        decoratedStringProperty = new UiThreadStringProperty(viewModel.textProperty());
         textInput.textProperty().bindBidirectional(decoratedStringProperty);
-        ((ContextMenuAddable) textInput).initContextMenu(
-                EditorMenus.getNameMenu(textInput)
-            );
+        ((ContextMenuAddable) textInput).initContextMenu(EditorMenus.getNameMenu(textInput));
         this.getChildren().add(textInput);
 
         AutoCompletionTextInputBinding.autoComplete(
@@ -54,10 +51,7 @@ public PersonsEditor(
         );
 
         new EditorValidator(preferencesService)
-            .configureValidation(
-                viewModel.getFieldValidator().getValidationStatus(),
-                textInput
-            );
+            .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 67e7f69ccdd..08ff23a5920 100644
--- a/src/main/java/org/jabref/gui/fieldeditors/PersonsEditorViewModel.java
+++ b/src/main/java/org/jabref/gui/fieldeditors/PersonsEditorViewModel.java
@@ -33,9 +33,7 @@ public StringConverter<Author> getAutoCompletionConverter() {
     }
 
     @SuppressWarnings("unchecked")
-    public Collection<Author> complete(
-        AutoCompletionBinding.ISuggestionRequest request
-    ) {
+    public Collection<Author> complete(AutoCompletionBinding.ISuggestionRequest request) {
         return (Collection<Author>) super.complete(request);
     }
 
diff --git a/src/main/java/org/jabref/gui/fieldeditors/PopOverUtil.java b/src/main/java/org/jabref/gui/fieldeditors/PopOverUtil.java
index faccbe7fb11..041eb9e7bf3 100644
--- a/src/main/java/org/jabref/gui/fieldeditors/PopOverUtil.java
+++ b/src/main/java/org/jabref/gui/fieldeditors/PopOverUtil.java
@@ -21,9 +21,7 @@ public static void showJournalInfo(
         TaskExecutor taskExecutor
     ) {
         Optional<String> optionalIssn = entry.getField(StandardField.ISSN);
-        Optional<String> optionalJournalName = entry.getFieldOrAlias(
-            StandardField.JOURNAL
-        );
+        Optional<String> optionalJournalName = entry.getFieldOrAlias(StandardField.JOURNAL);
 
         if (optionalIssn.isPresent() || optionalJournalName.isPresent()) {
             PopOver popOver = new PopOver();
@@ -59,9 +57,7 @@ public static void showJournalInfo(
                 .executeWith(taskExecutor);
         } else {
             dialogService.notify(
-                Localization.lang(
-                    "ISSN or journal name required for fetching journal information"
-                )
+                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 a65e46bdd5d..66b5b05db19 100644
--- a/src/main/java/org/jabref/gui/fieldeditors/SimpleEditor.java
+++ b/src/main/java/org/jabref/gui/fieldeditors/SimpleEditor.java
@@ -28,20 +28,13 @@ public SimpleEditor(
         final UndoManager undoManager
     ) {
         this.viewModel =
-            new SimpleEditorViewModel(
-                field,
-                suggestionProvider,
-                fieldCheckers,
-                undoManager
-            );
+            new SimpleEditorViewModel(field, suggestionProvider, fieldCheckers, undoManager);
 
         textInput = isMultiLine ? new EditorTextArea() : new EditorTextField();
         HBox.setHgrow(textInput, Priority.ALWAYS);
 
         textInput.textProperty().bindBidirectional(viewModel.textProperty());
-        ((ContextMenuAddable) textInput).initContextMenu(
-                new DefaultMenu(textInput)
-            );
+        ((ContextMenuAddable) textInput).initContextMenu(new DefaultMenu(textInput));
         this.getChildren().add(textInput);
 
         if (!isMultiLine) {
@@ -51,19 +44,14 @@ public SimpleEditor(
                     viewModel::complete,
                     viewModel.getAutoCompletionStrategy()
                 );
-            if (
-                suggestionProvider instanceof ContentSelectorSuggestionProvider
-            ) {
+            if (suggestionProvider instanceof ContentSelectorSuggestionProvider) {
                 // 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
-            );
+            .configureValidation(viewModel.getFieldValidator().getValidationStatus(), textInput);
     }
 
     public SimpleEditor(
@@ -73,14 +61,7 @@ public SimpleEditor(
         final PreferencesService preferences,
         UndoManager undoManager
     ) {
-        this(
-            field,
-            suggestionProvider,
-            fieldCheckers,
-            preferences,
-            false,
-            undoManager
-        );
+        this(field, suggestionProvider, fieldCheckers, preferences, false, undoManager);
     }
 
     @Override
diff --git a/src/main/java/org/jabref/gui/fieldeditors/TextInputControlBehavior.java b/src/main/java/org/jabref/gui/fieldeditors/TextInputControlBehavior.java
index 663d8ef219d..e567d2bf5aa 100644
--- a/src/main/java/org/jabref/gui/fieldeditors/TextInputControlBehavior.java
+++ b/src/main/java/org/jabref/gui/fieldeditors/TextInputControlBehavior.java
@@ -42,14 +42,8 @@ public static void showContextMenu(
                 menuPos = skin.getMenuPosition();
             } else {
                 menuPos = skin.getMenuPosition();
-                if (
-                    menuPos != null &&
-                    (menuPos.getX() <= 0 || menuPos.getY() <= 0)
-                ) {
-                    skin.positionCaret(
-                        skin.getIndex(e.getX(), e.getY()),
-                        false
-                    );
+                if (menuPos != null && (menuPos.getX() <= 0 || menuPos.getY() <= 0)) {
+                    skin.positionCaret(skin.getIndex(e.getX(), e.getY()), false);
                     menuPos = skin.getMenuPosition();
                 }
             }
@@ -69,8 +63,7 @@ public static void showContextMenu(
         }
 
         double menuWidth = contextMenu.prefWidth(-1);
-        double menuX =
-            screenX - (Properties.IS_TOUCH_SUPPORTED ? (menuWidth / 2) : 0);
+        double menuX = screenX - (Properties.IS_TOUCH_SUPPORTED ? (menuWidth / 2) : 0);
         Screen currentScreen = Screen.getPrimary();
         Rectangle2D bounds = currentScreen.getBounds();
 
@@ -113,14 +106,8 @@ public static void showContextMenu(
                 menuPos = skin.getMenuPosition();
             } else {
                 menuPos = skin.getMenuPosition();
-                if (
-                    menuPos != null &&
-                    (menuPos.getX() <= 0 || menuPos.getY() <= 0)
-                ) {
-                    skin.positionCaret(
-                        skin.getIndex(e.getX(), e.getY()),
-                        false
-                    );
+                if (menuPos != null && (menuPos.getX() <= 0 || menuPos.getY() <= 0)) {
+                    skin.positionCaret(skin.getIndex(e.getX(), e.getY()), false);
                     menuPos = skin.getMenuPosition();
                 }
             }
@@ -140,8 +127,7 @@ public static void showContextMenu(
         }
 
         double menuWidth = contextMenu.prefWidth(-1);
-        double menuX =
-            screenX - (Properties.IS_TOUCH_SUPPORTED ? (menuWidth / 2) : 0);
+        double menuX = screenX - (Properties.IS_TOUCH_SUPPORTED ? (menuWidth / 2) : 0);
         Screen currentScreen = Screen.getPrimary();
         Rectangle2D bounds = currentScreen.getBounds();
 
diff --git a/src/main/java/org/jabref/gui/fieldeditors/URLUtil.java b/src/main/java/org/jabref/gui/fieldeditors/URLUtil.java
index fe2bda46cfc..f4208e4ee10 100644
--- a/src/main/java/org/jabref/gui/fieldeditors/URLUtil.java
+++ b/src/main/java/org/jabref/gui/fieldeditors/URLUtil.java
@@ -53,10 +53,7 @@ public static String cleanGoogleSearchURL(String url) {
                 if (pair.startsWith("url=")) {
                     String value = pair.substring(pair.indexOf('=') + 1);
 
-                    String decode = URLDecoder.decode(
-                        value,
-                        StandardCharsets.UTF_8
-                    );
+                    String decode = URLDecoder.decode(value, StandardCharsets.UTF_8);
                     // url?
                     if (decode.matches(URL_EXP)) {
                         return decode;
@@ -94,23 +91,13 @@ 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,
-        FilePreferences filePreferences
-    ) {
+    public static Optional<String> getSuffix(final String link, FilePreferences filePreferences) {
         String strippedLink = link;
         try {
             // Try to strip the query string, if any, to get the correct suffix:
             URL url = new URL(link);
-            if (
-                (url.getQuery() != null) &&
-                (url.getQuery().length() < (link.length() - 1))
-            ) {
-                strippedLink =
-                    link.substring(
-                        0,
-                        link.length() - url.getQuery().length() - 1
-                    );
+            if ((url.getQuery() != null) && (url.getQuery().length() < (link.length() - 1))) {
+                strippedLink = link.substring(0, link.length() - url.getQuery().length() - 1);
             }
         } catch (MalformedURLException e) {
             // Don't report this error, since this getting the suffix is a non-critical
@@ -119,17 +106,12 @@ public static Optional<String> getSuffix(
         // First see if the stripped link gives a reasonable suffix:
         String suffix;
         int strippedLinkIndex = strippedLink.lastIndexOf('.');
-        if (
-            (strippedLinkIndex <= 0) ||
-            (strippedLinkIndex == (strippedLink.length() - 1))
-        ) {
+        if ((strippedLinkIndex <= 0) || (strippedLinkIndex == (strippedLink.length() - 1))) {
             suffix = null;
         } else {
             suffix = strippedLink.substring(strippedLinkIndex + 1);
         }
-        if (
-            !ExternalFileTypes.isExternalFileTypeByExt(suffix, filePreferences)
-        ) {
+        if (!ExternalFileTypes.isExternalFileTypeByExt(suffix, filePreferences)) {
             // If the suffix doesn't seem to give any reasonable file type, try
             // with the non-stripped link:
             int index = link.lastIndexOf('.');
@@ -137,12 +119,7 @@ public static Optional<String> getSuffix(
                 // No occurrence, or at the end
                 // Check if there are path separators in the suffix - if so, it is definitely
                 // not a proper suffix, so we should give up:
-                if (
-                    strippedLink
-                        .substring(strippedLinkIndex + 1)
-                        .indexOf('/') >=
-                    1
-                ) {
+                if (strippedLink.substring(strippedLinkIndex + 1).indexOf('/') >= 1) {
                     return Optional.empty();
                 } else {
                     return Optional.of(suffix); // return the first one we found, anyway.
diff --git a/src/main/java/org/jabref/gui/fieldeditors/UrlEditor.java b/src/main/java/org/jabref/gui/fieldeditors/UrlEditor.java
index 34de5bf6337..77cccabcf75 100644
--- a/src/main/java/org/jabref/gui/fieldeditors/UrlEditor.java
+++ b/src/main/java/org/jabref/gui/fieldeditors/UrlEditor.java
@@ -55,25 +55,19 @@ public UrlEditor(
             );
 
         textArea.textProperty().bindBidirectional(viewModel.textProperty());
-        Supplier<List<MenuItem>> contextMenuSupplier =
-            EditorMenus.getCleanupUrlMenu(textArea);
+        Supplier<List<MenuItem>> contextMenuSupplier = EditorMenus.getCleanupUrlMenu(textArea);
         textArea.initContextMenu(contextMenuSupplier);
 
         // init paste handler for UrlEditor to format pasted url link in textArea
         textArea.setPasteActionHandler(() ->
             textArea.setText(
                 new CleanupUrlFormatter()
-                    .format(
-                        new TrimWhitespaceFormatter().format(textArea.getText())
-                    )
+                    .format(new TrimWhitespaceFormatter().format(textArea.getText()))
             )
         );
 
         new EditorValidator(preferencesService)
-            .configureValidation(
-                viewModel.getFieldValidator().getValidationStatus(),
-                textArea
-            );
+            .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 95c0e1d8f37..7f26abfbbff 100644
--- a/src/main/java/org/jabref/gui/fieldeditors/UrlEditorViewModel.java
+++ b/src/main/java/org/jabref/gui/fieldeditors/UrlEditorViewModel.java
@@ -18,8 +18,7 @@ public class UrlEditorViewModel extends AbstractEditorViewModel {
 
     private final DialogService dialogService;
     private final PreferencesService preferencesService;
-    private final BooleanProperty validUrlIsNotPresent =
-        new SimpleBooleanProperty(true);
+    private final BooleanProperty validUrlIsNotPresent = new SimpleBooleanProperty(true);
 
     public UrlEditorViewModel(
         Field field,
@@ -34,10 +33,7 @@ public UrlEditorViewModel(
         this.preferencesService = preferencesService;
 
         validUrlIsNotPresent.bind(
-            EasyBind.map(
-                text,
-                input -> StringUtil.isBlank(input) || !URLUtil.isURL(input)
-            )
+            EasyBind.map(text, input -> StringUtil.isBlank(input) || !URLUtil.isURL(input))
         );
     }
 
@@ -55,10 +51,7 @@ public void openExternalLink() {
         }
 
         try {
-            JabRefDesktop.openBrowser(
-                text.get(),
-                preferencesService.getFilePreferences()
-            );
+            JabRefDesktop.openBrowser(text.get(), preferencesService.getFilePreferences());
         } catch (IOException ex) {
             dialogService.notify(Localization.lang("Unable to open link."));
         }
diff --git a/src/main/java/org/jabref/gui/fieldeditors/WriteMetadataToSinglePdfAction.java b/src/main/java/org/jabref/gui/fieldeditors/WriteMetadataToSinglePdfAction.java
index 58d0dc66fd7..fee09b5f0ef 100644
--- a/src/main/java/org/jabref/gui/fieldeditors/WriteMetadataToSinglePdfAction.java
+++ b/src/main/java/org/jabref/gui/fieldeditors/WriteMetadataToSinglePdfAction.java
@@ -69,10 +69,7 @@ public WriteMetadataToSinglePdfAction(
     @Override
     public void execute() {
         BackgroundTask<Void> writeTask = BackgroundTask.wrap(() -> {
-            Optional<Path> file = linkedFile.findIn(
-                databaseContext,
-                filePreferences
-            );
+            Optional<Path> file = linkedFile.findIn(databaseContext, filePreferences);
             if (file.isEmpty()) {
                 dialogService.notify(
                     Localization.lang(
@@ -92,9 +89,7 @@ public void execute() {
                         filePreferences,
                         xmpPreferences
                     );
-                    dialogService.notify(
-                        Localization.lang("Success! Finished writing metadata.")
-                    );
+                    dialogService.notify(Localization.lang("Success! Finished writing metadata."));
                 } catch (IOException | TransformerException ex) {
                     dialogService.notify(
                         Localization.lang(
@@ -110,9 +105,7 @@ public void execute() {
             }
             return null;
         });
-        writeTask
-            .onRunning(() -> setExecutable(false))
-            .onFinished(() -> setExecutable(true));
+        writeTask.onRunning(() -> setExecutable(false)).onFinished(() -> setExecutable(true));
         taskExecutor.execute(writeTask);
     }
 
@@ -127,15 +120,13 @@ public static synchronized void writeMetadataToFile(
         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());
+        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,
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 0b234f1b679..a97385c2f2e 100644
--- a/src/main/java/org/jabref/gui/fieldeditors/contextmenu/DefaultMenu.java
+++ b/src/main/java/org/jabref/gui/fieldeditors/contextmenu/DefaultMenu.java
@@ -50,11 +50,7 @@ private static Menu getCaseChangeMenu(TextInputControl textInputControl) {
             menuItem.setOnAction(event ->
                 textInputControl
                     .textProperty()
-                    .set(
-                        caseChanger.format(
-                            textInputControl.textProperty().get()
-                        )
-                    )
+                    .set(caseChanger.format(textInputControl.textProperty().get()))
             );
             submenu.getItems().add(menuItem);
         }
@@ -74,9 +70,7 @@ private static Menu getConversionMenu(TextInputControl textInputControl) {
             menuItem.setOnAction(event ->
                 textInputControl
                     .textProperty()
-                    .set(
-                        converter.format(textInputControl.textProperty().get())
-                    )
+                    .set(converter.format(textInputControl.textProperty().get()))
             );
             submenu.getItems().add(menuItem);
         }
@@ -85,9 +79,7 @@ private static Menu getConversionMenu(TextInputControl textInputControl) {
     }
 
     // Icon: DELETE_SWEEP
-    private static MenuItem getClearFieldMenuItem(
-        TextInputControl textInputControl
-    ) {
+    private static MenuItem getClearFieldMenuItem(TextInputControl textInputControl) {
         MenuItem menuItem = new MenuItem(Localization.lang("Clear"));
         menuItem.setOnAction(event -> textInputControl.setText(""));
 
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 a4b1500c595..cf4a1ffd200 100644
--- a/src/main/java/org/jabref/gui/fieldeditors/contextmenu/EditorContextAction.java
+++ b/src/main/java/org/jabref/gui/fieldeditors/contextmenu/EditorContextAction.java
@@ -18,16 +18,12 @@
 
 public class EditorContextAction extends SimpleCommand {
 
-    private static final boolean SHOW_HANDLES =
-        Properties.IS_TOUCH_SUPPORTED && !OS.OS_X;
+    private static final boolean SHOW_HANDLES = Properties.IS_TOUCH_SUPPORTED && !OS.OS_X;
 
     private final StandardActions command;
     private final TextInputControl textInputControl;
 
-    public EditorContextAction(
-        StandardActions command,
-        TextInputControl textInputControl
-    ) {
+    public EditorContextAction(StandardActions command, TextInputControl textInputControl) {
         this.command = command;
         this.textInputControl = textInputControl;
 
@@ -36,22 +32,19 @@ public EditorContextAction(
             () -> textInputControl.getLength() > 0,
             textInputControl.textProperty()
         );
-        BooleanBinding hasStringInClipboardBinding =
-            (BooleanBinding) BindingsHelper.constantOf(
-                Clipboard.getSystemClipboard().hasString()
-            );
+        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()
+            textInputControl.getSelection().getLength() == textInputControl.getLength()
         );
-        BooleanBinding maskTextBinding =
-            (BooleanBinding) BindingsHelper.constantOf(
-                textInputControl instanceof PasswordField
-            ); // (maskText("A") != "A");
+        BooleanBinding maskTextBinding = (BooleanBinding) BindingsHelper.constantOf(
+            textInputControl instanceof PasswordField
+        ); // (maskText("A") != "A");
 
         this.executable.bind(
                 switch (command) {
@@ -59,9 +52,7 @@ public EditorContextAction(
                         .and(maskTextBinding.not())
                         .and(hasSelectionBinding);
                     case CUT -> maskTextBinding.not().and(hasSelectionBinding);
-                    case PASTE -> editableBinding.and(
-                        hasStringInClipboardBinding
-                    );
+                    case PASTE -> editableBinding.and(hasStringInClipboardBinding);
                     case DELETE -> editableBinding.and(hasSelectionBinding);
                     case SELECT_ALL -> {
                         if (SHOW_HANDLES) {
@@ -81,9 +72,7 @@ public void execute() {
             case COPY -> textInputControl.copy();
             case CUT -> textInputControl.cut();
             case PASTE -> textInputControl.paste();
-            case DELETE -> textInputControl.deleteText(
-                textInputControl.getSelection()
-            );
+            case DELETE -> textInputControl.deleteText(textInputControl.getSelection());
             case SELECT_ALL -> textInputControl.selectAll();
         }
         textInputControl.requestFocus();
@@ -100,10 +89,7 @@ public static List<MenuItem> getDefaultContextMenuItems(
 
         MenuItem selectAllMenuItem = factory.createMenuItem(
             StandardActions.SELECT_ALL,
-            new EditorContextAction(
-                StandardActions.SELECT_ALL,
-                textInputControl
-            )
+            new EditorContextAction(StandardActions.SELECT_ALL, textInputControl)
         );
         if (SHOW_HANDLES) {
             selectAllMenuItem.getProperties().put("refreshMenu", Boolean.TRUE);
@@ -124,10 +110,7 @@ public static List<MenuItem> getDefaultContextMenuItems(
             ),
             factory.createMenuItem(
                 StandardActions.DELETE,
-                new EditorContextAction(
-                    StandardActions.DELETE,
-                    textInputControl
-                )
+                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 3aee762f5e1..4de8e82cb6a 100644
--- a/src/main/java/org/jabref/gui/fieldeditors/contextmenu/EditorMenus.java
+++ b/src/main/java/org/jabref/gui/fieldeditors/contextmenu/EditorMenus.java
@@ -32,22 +32,17 @@ public class EditorMenus {
      * @param textInput text-input-control that this menu will be connected to
      * @return menu containing items of the default menu and an item for normalizing person names
      */
-    public static Supplier<List<MenuItem>> getNameMenu(
-        final TextInputControl textInput
-    ) {
+    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))
+                value -> normalizeNames.setDisable(StringUtil.isNullOrEmpty(value))
             );
             normalizeNames.setOnAction(event ->
-                textInput.setText(
-                    new NormalizeNamesFormatter().format(textInput.getText())
-                )
+                textInput.setText(new NormalizeNamesFormatter().format(textInput.getText()))
             );
             List<MenuItem> menuItems = new ArrayList<>(6);
             menuItems.add(normalizeNames);
@@ -68,24 +63,14 @@ public static Supplier<List<MenuItem>> getDOIMenu(
         PreferencesService preferencesService
     ) {
         return () -> {
-            ActionFactory factory = new ActionFactory(
-                preferencesService.getKeyBindingRepository()
-            );
+            ActionFactory factory = new ActionFactory(preferencesService.getKeyBindingRepository());
             MenuItem copyDoiMenuItem = factory.createMenuItem(
                 StandardActions.COPY_DOI,
-                new CopyDoiUrlAction(
-                    textArea,
-                    StandardActions.COPY_DOI,
-                    dialogService
-                )
+                new CopyDoiUrlAction(textArea, StandardActions.COPY_DOI, dialogService)
             );
             MenuItem copyDoiUrlMenuItem = factory.createMenuItem(
                 StandardActions.COPY_DOI_URL,
-                new CopyDoiUrlAction(
-                    textArea,
-                    StandardActions.COPY_DOI_URL,
-                    dialogService
-                )
+                new CopyDoiUrlAction(textArea, StandardActions.COPY_DOI_URL, dialogService)
             );
             List<MenuItem> menuItems = new ArrayList<>();
             menuItems.add(copyDoiMenuItem);
@@ -102,18 +87,12 @@ public static Supplier<List<MenuItem>> getDOIMenu(
      * @param textArea text-area that this menu will be connected to
      * @return menu containing items of the default menu and an item to cleanup a URL
      */
-    public static Supplier<List<MenuItem>> getCleanupUrlMenu(
-        TextArea textArea
-    ) {
+    public static Supplier<List<MenuItem>> getCleanupUrlMenu(TextArea textArea) {
         return () -> {
-            MenuItem cleanupURL = new MenuItem(
-                Localization.lang("Cleanup URL link")
-            );
+            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())
-                )
+                textArea.setText(new CleanupUrlFormatter().format(textArea.getText()))
             );
             List<MenuItem> menuItems = new ArrayList<>();
             menuItems.add(cleanupURL);
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 4386712e62b..b20a5d7c5b6 100644
--- a/src/main/java/org/jabref/gui/fieldeditors/contextmenu/ProtectedTermsMenu.java
+++ b/src/main/java/org/jabref/gui/fieldeditors/contextmenu/ProtectedTermsMenu.java
@@ -24,9 +24,7 @@ class ProtectedTermsMenu extends Menu {
         Globals.protectedTermsLoader
     );
     private final TextInputControl textInputControl;
-    private final ActionFactory factory = new ActionFactory(
-        Globals.getKeyPrefs()
-    );
+    private final ActionFactory factory = new ActionFactory(Globals.getKeyPrefs());
 
     private final Action protectSelectionActionInformation = new Action() {
         @Override
@@ -60,9 +58,7 @@ public String getDescription() {
     private class ProtectSelectionAction extends SimpleCommand {
 
         ProtectSelectionAction() {
-            this.executable.bind(
-                    textInputControl.selectedTextProperty().isNotEmpty()
-                );
+            this.executable.bind(textInputControl.selectedTextProperty().isNotEmpty());
         }
 
         @Override
@@ -77,25 +73,20 @@ public void execute() {
             if (selectedText.endsWith(" ")) {
                 lastStr = "} ";
             }
-            textInputControl.replaceSelection(
-                firstStr + selectedText.strip() + lastStr
-            );
+            textInputControl.replaceSelection(firstStr + selectedText.strip() + lastStr);
         }
     }
 
     private class UnprotectSelectionAction extends SimpleCommand {
 
         public UnprotectSelectionAction() {
-            this.executable.bind(
-                    textInputControl.selectedTextProperty().isNotEmpty()
-                );
+            this.executable.bind(textInputControl.selectedTextProperty().isNotEmpty());
         }
 
         @Override
         public void execute() {
             String selectedText = textInputControl.getSelectedText();
-            String formattedString = new UnprotectTermsFormatter()
-                .format(selectedText);
+            String formattedString = new UnprotectTermsFormatter().format(selectedText);
             textInputControl.replaceSelection(formattedString);
         }
     }
@@ -108,9 +99,7 @@ private class FormatFieldAction extends SimpleCommand {
 
         @Override
         public void execute() {
-            textInputControl.setText(
-                FORMATTER.format(textInputControl.getText())
-            );
+            textInputControl.setText(FORMATTER.format(textInputControl.getText()));
         }
     }
 
@@ -143,9 +132,7 @@ public void execute() {
                 list.addProtectedTerm(text.substring(beginIdx, endIdx));
             } else {
                 // Remove leading and trailing whitespaces
-                list.addProtectedTerm(
-                    textInputControl.getSelectedText().strip()
-                );
+                list.addProtectedTerm(textInputControl.getSelectedText().strip());
             }
         }
     }
@@ -194,9 +181,7 @@ private Menu getExternalFilesMenu() {
             );
 
         if (protectedTermsMenu.getItems().isEmpty()) {
-            MenuItem emptyItem = new MenuItem(
-                Localization.lang("No list enabled")
-            );
+            MenuItem emptyItem = new MenuItem(Localization.lang("No list enabled"));
             emptyItem.setDisable(true);
             protectedTermsMenu.getItems().add(emptyItem);
         }
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 aeda1405cde..974d2d3d547 100644
--- a/src/main/java/org/jabref/gui/fieldeditors/identifier/BaseIdentifierEditorViewModel.java
+++ b/src/main/java/org/jabref/gui/fieldeditors/identifier/BaseIdentifierEditorViewModel.java
@@ -33,15 +33,14 @@ public abstract class BaseIdentifierEditorViewModel<T extends Identifier>
         BaseIdentifierEditorViewModel.class
     );
     protected BooleanProperty isInvalidIdentifier = new SimpleBooleanProperty();
-    protected final BooleanProperty identifierLookupInProgress =
-        new SimpleBooleanProperty(false);
-    protected final BooleanProperty canLookupIdentifier =
-        new SimpleBooleanProperty(true);
+    protected final BooleanProperty identifierLookupInProgress = new SimpleBooleanProperty(false);
+    protected final BooleanProperty canLookupIdentifier = new SimpleBooleanProperty(true);
     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 PreferencesService preferences;
@@ -73,9 +72,7 @@ protected final void configure(
         boolean canLookupIdentifier
     ) {
         this.canLookupIdentifier.set(canLookupIdentifier);
-        this.canFetchBibliographyInformationById.set(
-                canFetchBibliographyInformationById
-            );
+        this.canFetchBibliographyInformationById.set(canFetchBibliographyInformationById);
     }
 
     protected Optional<T> updateIdentifier() {
@@ -87,10 +84,7 @@ protected Optional<T> updateIdentifier() {
         return identifier.get();
     }
 
-    protected void handleIdentifierFetchingError(
-        Exception exception,
-        IdFetcher<T> fetcher
-    ) {
+    protected void handleIdentifierFetchingError(Exception exception, IdFetcher<T> fetcher) {
         LOGGER.error("Error while fetching identifier", exception);
         if (exception instanceof FetcherClientException) {
             dialogService.showInformationDialogAndWait(
@@ -105,18 +99,12 @@ protected void handleIdentifierFetchingError(
         } else if (exception.getCause() != null) {
             dialogService.showWarningDialogAndWait(
                 Localization.lang("Look up %0", fetcher.getName()),
-                Localization.lang(
-                    "Error occurred %0",
-                    exception.getCause().getMessage()
-                )
+                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()
-                )
+                Localization.lang("Error occurred %0", exception.getCause().getMessage())
             );
         }
     }
@@ -161,10 +149,7 @@ public void fetchBibliographyInformation(BibEntry bibEntry) {
     }
 
     public void lookupIdentifier(BibEntry bibEntry) {
-        LOGGER.warn(
-            "Unable to lookup identifier for '{}'",
-            field.getDisplayName()
-        );
+        LOGGER.warn("Unable to lookup identifier for '{}'", field.getDisplayName());
     }
 
     public void openExternalLink() {
@@ -173,10 +158,7 @@ public void openExternalLink() {
             .flatMap(Identifier::getExternalURI)
             .ifPresent(url -> {
                 try {
-                    JabRefDesktop.openBrowser(
-                        url,
-                        preferences.getFilePreferences()
-                    );
+                    JabRefDesktop.openBrowser(url, preferences.getFilePreferences());
                 } catch (IOException ex) {
                     dialogService.showErrorDialogAndWait(
                         Localization.lang("Unable to open link."),
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 03fdfe58304..a6feed5515d 100644
--- a/src/main/java/org/jabref/gui/fieldeditors/identifier/DoiIdentifierEditorViewModel.java
+++ b/src/main/java/org/jabref/gui/fieldeditors/identifier/DoiIdentifierEditorViewModel.java
@@ -18,12 +18,9 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-public class DoiIdentifierEditorViewModel
-    extends BaseIdentifierEditorViewModel<DOI> {
+public class DoiIdentifierEditorViewModel extends BaseIdentifierEditorViewModel<DOI> {
 
-    public static final Logger LOGGER = LoggerFactory.getLogger(
-        DoiIdentifierEditorViewModel.class
-    );
+    public static final Logger LOGGER = LoggerFactory.getLogger(DoiIdentifierEditorViewModel.class);
 
     private final UndoManager undoManager;
     private final StateManager stateManager;
@@ -63,9 +60,7 @@ public void lookupIdentifier(BibEntry bibEntry) {
                 if (identifier.isPresent()) {
                     entry.setField(field, identifier.get().getNormalized());
                 } else {
-                    dialogService.notify(
-                        Localization.lang("No %0 found", field.getDisplayName())
-                    );
+                    dialogService.notify(Localization.lang("No %0 found", field.getDisplayName()));
                 }
             })
             .onFailure(e -> handleIdentifierFetchingError(e, doiFetcher))
@@ -86,10 +81,7 @@ public void fetchBibliographyInformation(BibEntry bibEntry) {
                         undoManager
                     )
                         .fetchAndMerge(entry, field),
-                () ->
-                    dialogService.notify(
-                        Localization.lang("No library selected")
-                    )
+                () -> dialogService.notify(Localization.lang("No library selected"))
             );
     }
 
@@ -98,8 +90,6 @@ public void openExternalLink() {
         identifier
             .get()
             .map(DOI::getDOI)
-            .ifPresent(s ->
-                JabRefDesktop.openCustomDoi(s, preferences, dialogService)
-            );
+            .ifPresent(s -> JabRefDesktop.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 0dc4ba349d9..9898d1744e5 100644
--- a/src/main/java/org/jabref/gui/fieldeditors/identifier/EprintIdentifierEditorViewModel.java
+++ b/src/main/java/org/jabref/gui/fieldeditors/identifier/EprintIdentifierEditorViewModel.java
@@ -22,13 +22,12 @@ public class EprintIdentifierEditorViewModel
     // 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();
-            }
-        };
+    private MapChangeListener<Field, String> eprintTypeFieldListener = change -> {
+        Field changedField = change.getKey();
+        if (StandardField.EPRINTTYPE == changedField) {
+            updateIdentifier();
+        }
+    };
 
     public EprintIdentifierEditorViewModel(
         SuggestionProvider<?> suggestionProvider,
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 bb298c360c8..592780e8539 100644
--- a/src/main/java/org/jabref/gui/fieldeditors/identifier/ISBNIdentifierEditorViewModel.java
+++ b/src/main/java/org/jabref/gui/fieldeditors/identifier/ISBNIdentifierEditorViewModel.java
@@ -13,8 +13,7 @@
 import org.jabref.model.entry.identifier.ISBN;
 import org.jabref.preferences.PreferencesService;
 
-public class ISBNIdentifierEditorViewModel
-    extends BaseIdentifierEditorViewModel<ISBN> {
+public class ISBNIdentifierEditorViewModel extends BaseIdentifierEditorViewModel<ISBN> {
 
     private final UndoManager undoManager;
     private final StateManager stateManager;
@@ -56,10 +55,7 @@ public void fetchBibliographyInformation(BibEntry bibEntry) {
                         undoManager
                     )
                         .fetchAndMerge(entry, field),
-                () ->
-                    dialogService.notify(
-                        Localization.lang("No library selected")
-                    )
+                () -> 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 f82d91d6048..c978fb0b88f 100644
--- a/src/main/java/org/jabref/gui/fieldeditors/identifier/IdentifierEditor.java
+++ b/src/main/java/org/jabref/gui/fieldeditors/identifier/IdentifierEditor.java
@@ -115,12 +115,7 @@ public IdentifierEditor(
         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()))
@@ -128,21 +123,14 @@ public IdentifierEditor(
 
         if (field.equals(DOI)) {
             textArea.initContextMenu(
-                EditorMenus.getDOIMenu(
-                    textArea,
-                    dialogService,
-                    preferencesService
-                )
+                EditorMenus.getDOIMenu(textArea, dialogService, preferencesService)
             );
         } else {
             textArea.initContextMenu(new DefaultMenu(textArea));
         }
 
         new EditorValidator(preferencesService)
-            .configureValidation(
-                viewModel.getFieldValidator().getValidationStatus(),
-                textArea
-            );
+            .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 9dba994d2a9..fd1e407aaf4 100644
--- a/src/main/java/org/jabref/gui/fieldeditors/journalinfo/JournalInfoView.java
+++ b/src/main/java/org/jabref/gui/fieldeditors/journalinfo/JournalInfoView.java
@@ -54,9 +54,7 @@ public JournalInfoView() {
         this.getStylesheets()
             .add(
                 Objects
-                    .requireNonNull(
-                        JournalInfoView.class.getResource("JournalInfo.css")
-                    )
+                    .requireNonNull(JournalInfoView.class.getResource("JournalInfo.css"))
                     .toExternalForm()
             );
 
@@ -80,13 +78,9 @@ public Node getNode() {
 
     private void bindChartProperties() {
         sjrChart.setData(viewModel.getSjrData());
-        citableDocsPrevious3YearsChart.setData(
-            viewModel.getCitableDocsPrevious3YearsData()
-        );
+        citableDocsPrevious3YearsChart.setData(viewModel.getCitableDocsPrevious3YearsData());
         citesOutgoingChart.setData(viewModel.getCitesOutgoingData());
-        citesOutgoingPerDocChart.setData(
-            viewModel.getCitesOutgoingPerDocData()
-        );
+        citesOutgoingPerDocChart.setData(viewModel.getCitesOutgoingPerDocData());
         citesIncomingByRecentlyPublishedChart.setData(
             viewModel.getCitesIncomingByRecentlyPublishedData()
         );
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 936c09c66ef..fbd82ae1f1c 100644
--- a/src/main/java/org/jabref/gui/fieldeditors/journalinfo/JournalInfoViewModel.java
+++ b/src/main/java/org/jabref/gui/fieldeditors/journalinfo/JournalInfoViewModel.java
@@ -18,8 +18,7 @@ public class JournalInfoViewModel extends AbstractViewModel {
 
     private final ReadOnlyStringWrapper title = new ReadOnlyStringWrapper();
     private final ReadOnlyStringWrapper country = new ReadOnlyStringWrapper();
-    private final ReadOnlyStringWrapper categories =
-        new ReadOnlyStringWrapper();
+    private final ReadOnlyStringWrapper categories = new ReadOnlyStringWrapper();
     private final ReadOnlyStringWrapper publisher = new ReadOnlyStringWrapper();
     private final ReadOnlyStringWrapper scimagoId = new ReadOnlyStringWrapper();
     private final ReadOnlyStringWrapper hIndex = new ReadOnlyStringWrapper();
@@ -28,28 +27,22 @@ public class JournalInfoViewModel extends AbstractViewModel {
         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 =
+    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>
-    > docsThisYearData = FXCollections.observableArrayList();
+    > 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);
+        Optional<JournalInformation> journalInformationOptional = new JournalInformationFetcher()
+            .getJournalInformation(issn, journalName);
 
         journalInformationOptional.ifPresent(journalInformation -> {
             setTitle(journalInformation.title());
@@ -64,20 +57,12 @@ public void populateJournalInformation(String issn, String journalName)
             citableDocsPrevious3YearsData.add(
                 convertToSeries(journalInformation.citableDocsPrevious3Years())
             );
-            citesOutgoingData.add(
-                convertToSeries(journalInformation.citesOutgoing())
-            );
-            citesOutgoingPerDocData.add(
-                convertToSeries(journalInformation.citesOutgoingPerDoc())
-            );
+            citesOutgoingData.add(convertToSeries(journalInformation.citesOutgoing()));
+            citesOutgoingPerDocData.add(convertToSeries(journalInformation.citesOutgoingPerDoc()));
             citesIncomingByRecentlyPublishedData.add(
-                convertToSeries(
-                    journalInformation.citesIncomingByRecentlyPublished()
-                )
-            );
-            docsThisYearData.add(
-                convertToSeries(journalInformation.docsThisYear())
+                convertToSeries(journalInformation.citesIncomingByRecentlyPublished())
             );
+            docsThisYearData.add(convertToSeries(journalInformation.docsThisYear()));
         });
     }
 
@@ -173,21 +158,15 @@ public ObservableList<XYChart.Series<String, Double>> getSnipData() {
         return snipData;
     }
 
-    public ObservableList<
-        XYChart.Series<String, Double>
-    > getCitableDocsPrevious3YearsData() {
+    public ObservableList<XYChart.Series<String, Double>> getCitableDocsPrevious3YearsData() {
         return citableDocsPrevious3YearsData;
     }
 
-    public ObservableList<
-        XYChart.Series<String, Double>
-    > getCitesOutgoingData() {
+    public ObservableList<XYChart.Series<String, Double>> getCitesOutgoingData() {
         return citesOutgoingData;
     }
 
-    public ObservableList<
-        XYChart.Series<String, Double>
-    > getCitesOutgoingPerDocData() {
+    public ObservableList<XYChart.Series<String, Double>> getCitesOutgoingPerDocData() {
         return citesOutgoingPerDocData;
     }
 
@@ -197,37 +176,27 @@ > getCitesIncomingByRecentlyPublishedData() {
         return citesIncomingByRecentlyPublishedData;
     }
 
-    public ObservableList<
-        XYChart.Series<String, Double>
-    > getDocsThisYearData() {
+    public ObservableList<XYChart.Series<String, Double>> getDocsThisYearData() {
         return docsThisYearData;
     }
 
-    public XYChart.Series<String, Double> convertToSeries(
-        List<Pair<Integer, Double>> data
-    ) {
+    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())
-            )
+            .map(pair -> new XYChart.Data<>(pair.getKey().toString(), pair.getValue()))
             .forEach(series.getData()::add);
         return series;
     }
 
-    private static String getFormattedCategories(
-        JournalInformation journalInformation
-    ) {
+    private static String getFormattedCategories(JournalInformation journalInformation) {
         return Arrays
             .stream(journalInformation.categories().split(","))
             .map(String::trim)
             .collect(Collectors.joining("\n"));
     }
 
-    private static String getFormattedPublisher(
-        JournalInformation journalInformation
-    ) {
+    private static String getFormattedPublisher(JournalInformation journalInformation) {
         StringBuilder publisher = new StringBuilder();
         publisher.append(journalInformation.publisher());
         String country = journalInformation.country();
diff --git a/src/main/java/org/jabref/gui/groups/GroupDescriptions.java b/src/main/java/org/jabref/gui/groups/GroupDescriptions.java
index 1151d57eac5..8d47444a778 100644
--- a/src/main/java/org/jabref/gui/groups/GroupDescriptions.java
+++ b/src/main/java/org/jabref/gui/groups/GroupDescriptions.java
@@ -17,10 +17,7 @@ public static String getShortDescriptionKeywordGroup(
         StringBuilder sb = new StringBuilder();
         sb.append("<b>");
         if (showDynamic) {
-            sb
-                .append("<i>")
-                .append(StringUtil.quoteForHTML(keywordGroup.getName()))
-                .append("</i>");
+            sb.append("<i>").append(StringUtil.quoteForHTML(keywordGroup.getName())).append("</i>");
         } else {
             sb.append(StringUtil.quoteForHTML(keywordGroup.getName()));
         }
@@ -46,9 +43,7 @@ public static String getShortDescriptionKeywordGroup(
         return sb.toString();
     }
 
-    public static String getShortDescriptionExplicitGroup(
-        ExplicitGroup explicitGroup
-    ) {
+    public static String getShortDescriptionExplicitGroup(ExplicitGroup explicitGroup) {
         StringBuilder sb = new StringBuilder();
         sb
             .append("<b>")
@@ -69,22 +64,14 @@ public static String getShortDescriptionExplicitGroup(
     }
 
     public static String getShortDescriptionAllEntriesGroup() {
-        return Localization.lang(
-            "<b>All Entries</b> (this group cannot be edited or removed)"
-        );
+        return Localization.lang("<b>All Entries</b> (this group cannot be edited or removed)");
     }
 
-    public static String getShortDescription(
-        SearchGroup searchGroup,
-        boolean showDynamic
-    ) {
+    public static String getShortDescription(SearchGroup searchGroup, boolean showDynamic) {
         StringBuilder sb = new StringBuilder();
         sb.append("<b>");
         if (showDynamic) {
-            sb
-                .append("<i>")
-                .append(StringUtil.quoteForHTML(searchGroup.getName()))
-                .append("</i>");
+            sb.append("<i>").append(StringUtil.quoteForHTML(searchGroup.getName())).append("</i>");
         } else {
             sb.append(StringUtil.quoteForHTML(searchGroup.getName()));
         }
diff --git a/src/main/java/org/jabref/gui/groups/GroupDialogView.java b/src/main/java/org/jabref/gui/groups/GroupDialogView.java
index 6005e7465e8..e7a753a217b 100644
--- a/src/main/java/org/jabref/gui/groups/GroupDialogView.java
+++ b/src/main/java/org/jabref/gui/groups/GroupDialogView.java
@@ -129,13 +129,14 @@ 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();
+    private final ControlsFxVisualizer validationVisualizer = new ControlsFxVisualizer();
 
     private final BibDatabaseContext currentDatabase;
     private final AbstractGroup editedGroup;
@@ -167,27 +168,17 @@ public GroupDialogView(
                 this.setTitle(Localization.lang("Add subgroup"));
             }
         } else {
-            this.setTitle(
-                    Localization.lang("Edit group") +
-                    " " +
-                    editedGroup.getName()
-                );
+            this.setTitle(Localization.lang("Edit group") + " " + editedGroup.getName());
         }
 
-        getDialogPane()
-            .getButtonTypes()
-            .setAll(ButtonType.OK, ButtonType.CANCEL);
+        getDialogPane().getButtonTypes().setAll(ButtonType.OK, ButtonType.CANCEL);
 
-        final Button confirmDialogButton = (Button) getDialogPane()
-            .lookupButton(ButtonType.OK);
+        final Button confirmDialogButton = (Button) getDialogPane().lookupButton(ButtonType.OK);
         confirmDialogButton
             .disableProperty()
             .bind(viewModel.validationStatus().validProperty().not());
         // handle validation before closing dialog and calling resultConverter
-        confirmDialogButton.addEventFilter(
-            ActionEvent.ACTION,
-            viewModel::validationHandler
-        );
+        confirmDialogButton.addEventFilter(ActionEvent.ACTION, viewModel::validationHandler);
     }
 
     @FXML
@@ -203,48 +194,31 @@ public void initialize() {
 
         setResultConverter(viewModel::resultConverter);
 
-        hierarchyText.put(
-            GroupHierarchyType.INCLUDING,
-            Localization.lang("Union")
-        );
+        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"
             )
         );
-        hierarchyText.put(
-            GroupHierarchyType.REFINING,
-            Localization.lang("Intersection")
-        );
+        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"
             )
         );
-        hierarchyText.put(
-            GroupHierarchyType.INDEPENDENT,
-            Localization.lang("Independent")
-        );
+        hierarchyText.put(GroupHierarchyType.INDEPENDENT, Localization.lang("Independent"));
         hierarchyToolTip.put(
             GroupHierarchyType.INDEPENDENT,
-            Localization.lang(
-                "Independent group: When selected, view only this group's entries"
-            )
+            Localization.lang("Independent group: When selected, view only this group's entries")
         );
 
         nameField.textProperty().bindBidirectional(viewModel.nameProperty());
-        descriptionField
-            .textProperty()
-            .bindBidirectional(viewModel.descriptionProperty());
+        descriptionField.textProperty().bindBidirectional(viewModel.descriptionProperty());
         iconField.textProperty().bindBidirectional(viewModel.iconProperty());
-        colorField
-            .valueProperty()
-            .bindBidirectional(viewModel.colorFieldProperty());
-        hierarchicalContextCombo
-            .itemsProperty()
-            .bind(viewModel.groupHierarchyListProperty());
+        colorField.valueProperty().bindBidirectional(viewModel.colorFieldProperty());
+        hierarchicalContextCombo.itemsProperty().bind(viewModel.groupHierarchyListProperty());
         new ViewModelListCellFactory<GroupHierarchyType>()
             .withText(hierarchyText::get)
             .withStringTooltip(hierarchyToolTip::get)
@@ -253,21 +227,11 @@ public void initialize() {
             .valueProperty()
             .bindBidirectional(viewModel.groupHierarchySelectedProperty());
 
-        explicitRadioButton
-            .selectedProperty()
-            .bindBidirectional(viewModel.typeExplicitProperty());
-        keywordsRadioButton
-            .selectedProperty()
-            .bindBidirectional(viewModel.typeKeywordsProperty());
-        searchRadioButton
-            .selectedProperty()
-            .bindBidirectional(viewModel.typeSearchProperty());
-        autoRadioButton
-            .selectedProperty()
-            .bindBidirectional(viewModel.typeAutoProperty());
-        texRadioButton
-            .selectedProperty()
-            .bindBidirectional(viewModel.typeTexProperty());
+        explicitRadioButton.selectedProperty().bindBidirectional(viewModel.typeExplicitProperty());
+        keywordsRadioButton.selectedProperty().bindBidirectional(viewModel.typeKeywordsProperty());
+        searchRadioButton.selectedProperty().bindBidirectional(viewModel.typeSearchProperty());
+        autoRadioButton.selectedProperty().bindBidirectional(viewModel.typeAutoProperty());
+        texRadioButton.selectedProperty().bindBidirectional(viewModel.typeTexProperty());
 
         keywordGroupSearchTerm
             .textProperty()
@@ -286,17 +250,12 @@ public void initialize() {
             .textProperty()
             .bindBidirectional(viewModel.searchGroupSearchTermProperty());
         searchGroupCaseSensitive.setSelected(
-            viewModel
-                .searchFlagsProperty()
-                .getValue()
-                .contains(SearchFlags.CASE_SENSITIVE)
+            viewModel.searchFlagsProperty().getValue().contains(SearchFlags.CASE_SENSITIVE)
         );
         searchGroupCaseSensitive
             .selectedProperty()
             .addListener((observable, oldValue, newValue) -> {
-                EnumSet<SearchFlags> searchFlags = viewModel
-                    .searchFlagsProperty()
-                    .get();
+                EnumSet<SearchFlags> searchFlags = viewModel.searchFlagsProperty().get();
                 if (newValue) {
                     searchFlags.add(SearchRules.SearchFlags.CASE_SENSITIVE);
                 } else {
@@ -305,23 +264,16 @@ public void initialize() {
                 viewModel.searchFlagsProperty().set(searchFlags);
             });
         searchGroupRegex.setSelected(
-            viewModel
-                .searchFlagsProperty()
-                .getValue()
-                .contains(SearchFlags.REGULAR_EXPRESSION)
+            viewModel.searchFlagsProperty().getValue().contains(SearchFlags.REGULAR_EXPRESSION)
         );
         searchGroupRegex
             .selectedProperty()
             .addListener((observable, oldValue, newValue) -> {
-                EnumSet<SearchFlags> searchFlags = viewModel
-                    .searchFlagsProperty()
-                    .get();
+                EnumSet<SearchFlags> searchFlags = viewModel.searchFlagsProperty().get();
                 if (newValue) {
                     searchFlags.add(SearchRules.SearchFlags.REGULAR_EXPRESSION);
                 } else {
-                    searchFlags.remove(
-                        SearchRules.SearchFlags.REGULAR_EXPRESSION
-                    );
+                    searchFlags.remove(SearchRules.SearchFlags.REGULAR_EXPRESSION);
                 }
                 viewModel.searchFlagsProperty().set(searchFlags);
             });
@@ -334,14 +286,10 @@ public void initialize() {
             .bindBidirectional(viewModel.autoGroupKeywordsFieldProperty());
         autoGroupKeywordsDeliminator
             .textProperty()
-            .bindBidirectional(
-                viewModel.autoGroupKeywordsDeliminatorProperty()
-            );
+            .bindBidirectional(viewModel.autoGroupKeywordsDeliminatorProperty());
         autoGroupKeywordsHierarchicalDeliminator
             .textProperty()
-            .bindBidirectional(
-                viewModel.autoGroupKeywordsHierarchicalDeliminatorProperty()
-            );
+            .bindBidirectional(viewModel.autoGroupKeywordsHierarchicalDeliminatorProperty());
         autoGroupPersonsOption
             .selectedProperty()
             .bindBidirectional(viewModel.autoGroupPersonsOptionProperty());
@@ -349,25 +297,17 @@ public void initialize() {
             .textProperty()
             .bindBidirectional(viewModel.autoGroupPersonsFieldProperty());
 
-        texGroupFilePath
-            .textProperty()
-            .bindBidirectional(viewModel.texGroupFilePathProperty());
+        texGroupFilePath.textProperty().bindBidirectional(viewModel.texGroupFilePathProperty());
 
         validationVisualizer.setDecoration(new IconValidationDecorator());
         Platform.runLater(() -> {
-            validationVisualizer.initVisualization(
-                viewModel.nameValidationStatus(),
-                nameField
-            );
+            validationVisualizer.initVisualization(viewModel.nameValidationStatus(), nameField);
             validationVisualizer.initVisualization(
                 viewModel.nameContainsDelimiterValidationStatus(),
                 nameField,
                 false
             );
-            validationVisualizer.initVisualization(
-                viewModel.sameNameValidationStatus(),
-                nameField
-            );
+            validationVisualizer.initVisualization(viewModel.sameNameValidationStatus(), nameField);
             validationVisualizer.initVisualization(
                 viewModel.searchRegexValidationStatus(),
                 searchGroupSearchTerm
@@ -428,16 +368,11 @@ private void openIconPicker() {
             .addListener((obs, oldValue, newValue) ->
                 filteredList.setPredicate(ikon ->
                     newValue.isEmpty() ||
-                    ikon
-                        .getDescription()
-                        .toLowerCase()
-                        .contains(newValue.toLowerCase())
+                    ikon.getDescription().toLowerCase().contains(newValue.toLowerCase())
                 )
             );
 
-        GridView<Ikon> ikonGridView = new GridView<>(
-            FXCollections.observableArrayList()
-        );
+        GridView<Ikon> ikonGridView = new GridView<>(FXCollections.observableArrayList());
         ikonGridView.setCellFactory(gridView -> new IkonliCell());
         ikonGridView.setPrefWidth(520);
         ikonGridView.setPrefHeight(400);
@@ -488,13 +423,8 @@ protected void updateItem(Ikon ikon, boolean empty) {
                 );
 
                 setOnMouseClicked(event -> {
-                    iconField
-                        .textProperty()
-                        .setValue(String.valueOf(fontIcon.getIconCode()));
-                    PopOver stage = (PopOver) this.getGridView()
-                        .getParent()
-                        .getScene()
-                        .getWindow();
+                    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 7dc4d4de932..52bc0f8098d 100644
--- a/src/main/java/org/jabref/gui/groups/GroupDialogViewModel.java
+++ b/src/main/java/org/jabref/gui/groups/GroupDialogViewModel.java
@@ -61,59 +61,40 @@ public class GroupDialogViewModel {
 
     // Basic Settings
     private final StringProperty nameProperty = new SimpleStringProperty("");
-    private final StringProperty descriptionProperty = new SimpleStringProperty(
-        ""
-    );
+    private final StringProperty descriptionProperty = new SimpleStringProperty("");
     private final StringProperty iconProperty = new SimpleStringProperty("");
-    private final ObjectProperty<Color> colorProperty =
-        new SimpleObjectProperty<>();
+    private final ObjectProperty<Color> colorProperty = new SimpleObjectProperty<>();
     private final ListProperty<GroupHierarchyType> groupHierarchyListProperty =
         new SimpleListProperty<>();
-    private final ObjectProperty<
-        GroupHierarchyType
-    > groupHierarchySelectedProperty = new SimpleObjectProperty<>();
+    private final ObjectProperty<GroupHierarchyType> groupHierarchySelectedProperty =
+        new SimpleObjectProperty<>();
 
     // Type
-    private final BooleanProperty typeExplicitProperty =
-        new SimpleBooleanProperty();
-    private final BooleanProperty typeKeywordsProperty =
-        new SimpleBooleanProperty();
-    private final BooleanProperty typeSearchProperty =
-        new SimpleBooleanProperty();
-    private final BooleanProperty typeAutoProperty =
-        new SimpleBooleanProperty();
+    private final BooleanProperty typeExplicitProperty = new SimpleBooleanProperty();
+    private final BooleanProperty typeKeywordsProperty = new SimpleBooleanProperty();
+    private final BooleanProperty typeSearchProperty = new SimpleBooleanProperty();
+    private final BooleanProperty typeAutoProperty = new SimpleBooleanProperty();
     private final BooleanProperty typeTexProperty = new SimpleBooleanProperty();
 
     // Option Groups
-    private final StringProperty keywordGroupSearchTermProperty =
-        new SimpleStringProperty("");
-    private final StringProperty keywordGroupSearchFieldProperty =
-        new SimpleStringProperty("");
-    private final BooleanProperty keywordGroupCaseSensitiveProperty =
-        new SimpleBooleanProperty();
-    private final BooleanProperty keywordGroupRegexProperty =
-        new SimpleBooleanProperty();
+    private final StringProperty keywordGroupSearchTermProperty = new SimpleStringProperty("");
+    private final StringProperty keywordGroupSearchFieldProperty = new SimpleStringProperty("");
+    private final BooleanProperty keywordGroupCaseSensitiveProperty = new SimpleBooleanProperty();
+    private final BooleanProperty keywordGroupRegexProperty = new SimpleBooleanProperty();
 
-    private final StringProperty searchGroupSearchTermProperty =
-        new SimpleStringProperty("");
+    private final StringProperty searchGroupSearchTermProperty = new SimpleStringProperty("");
     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 BooleanProperty autoGroupKeywordsOptionProperty = new SimpleBooleanProperty();
+    private final StringProperty autoGroupKeywordsFieldProperty = new SimpleStringProperty("");
+    private final StringProperty autoGroupKeywordsDelimiterProperty = new SimpleStringProperty("");
     private final StringProperty autoGroupKeywordsHierarchicalDelimiterProperty =
         new SimpleStringProperty("");
-    private final BooleanProperty autoGroupPersonsOptionProperty =
-        new SimpleBooleanProperty();
-    private final StringProperty autoGroupPersonsFieldProperty =
-        new SimpleStringProperty("");
+    private final BooleanProperty autoGroupPersonsOptionProperty = new SimpleBooleanProperty();
+    private final StringProperty autoGroupPersonsFieldProperty = new SimpleStringProperty("");
 
-    private final StringProperty texGroupFilePathProperty =
-        new SimpleStringProperty("");
+    private final StringProperty texGroupFilePathProperty = new SimpleStringProperty("");
 
     private Validator nameValidator;
     private Validator nameContainsDelimiterValidator;
@@ -156,9 +137,7 @@ private void setupValidation() {
             new FunctionBasedValidator<>(
                 nameProperty,
                 StringUtil::isNotBlank,
-                ValidationMessage.error(
-                    Localization.lang("Please enter a name for the group.")
-                )
+                ValidationMessage.error(Localization.lang("Please enter a name for the group."))
             );
 
         nameContainsDelimiterValidator =
@@ -167,18 +146,14 @@ private void setupValidation() {
                 name ->
                     !name.contains(
                         Character.toString(
-                            preferencesService
-                                .getBibEntryPreferences()
-                                .getKeywordSeparator()
+                            preferencesService.getBibEntryPreferences().getKeywordSeparator()
                         )
                     ),
                 ValidationMessage.warning(
                     Localization.lang(
                         "The group name contains the keyword separator \"%0\" and thus probably does not work as expected.",
                         Character.toString(
-                            preferencesService
-                                .getBibEntryPreferences()
-                                .getKeywordSeparator()
+                            preferencesService.getBibEntryPreferences().getKeywordSeparator()
                         )
                     )
                 )
@@ -188,15 +163,11 @@ private void setupValidation() {
             new FunctionBasedValidator<>(
                 nameProperty,
                 name -> {
-                    Optional<GroupTreeNode> rootGroup = currentDatabase
-                        .getMetaData()
-                        .getGroups();
+                    Optional<GroupTreeNode> rootGroup = currentDatabase.getMetaData().getGroups();
                     if (rootGroup.isPresent()) {
                         int groupsWithSameName = rootGroup
                             .get()
-                            .findChildrenSatisfying(group ->
-                                group.getName().equals(name)
-                            )
+                            .findChildrenSatisfying(group -> group.getName().equals(name))
                             .size();
                         if ((editedGroup == null) && (groupsWithSameName > 0)) {
                             // New group but there is already one group with the same name
@@ -213,9 +184,7 @@ private void setupValidation() {
                     return true;
                 },
                 ValidationMessage.warning(
-                    Localization.lang(
-                        "There exists already a group with the same name."
-                    ) +
+                    Localization.lang("There exists already a group with the same name.") +
                     "\n" +
                     Localization.lang(
                         "If you use it, it will inherit all entries from this other group."
@@ -257,9 +226,7 @@ private void setupValidation() {
                 keywordGroupSearchFieldProperty,
                 StringUtil::isNotBlank,
                 ValidationMessage.error(
-                    Localization.lang(
-                        "Please enter a field name to search for a keyword."
-                    )
+                    Localization.lang("Please enter a field name to search for a keyword.")
                 )
             );
 
@@ -331,10 +298,7 @@ private void setupValidation() {
                         return false;
                     } else {
                         Path inputPath = getAbsoluteTexGroupPath(input);
-                        if (
-                            !inputPath.isAbsolute() ||
-                            !Files.isRegularFile(inputPath)
-                        ) {
+                        if (!inputPath.isAbsolute() || !Files.isRegularFile(inputPath)) {
                             return false;
                         }
                         return FileUtil
@@ -343,22 +307,14 @@ private void setupValidation() {
                             .orElse(false);
                     }
                 },
-                ValidationMessage.error(
-                    Localization.lang("Please provide a valid aux file.")
-                )
+                ValidationMessage.error(Localization.lang("Please provide a valid aux file."))
             );
 
         typeSearchProperty.addListener((obs, _oldValue, isSelected) -> {
             if (isSelected) {
-                validator.addValidators(
-                    searchRegexValidator,
-                    searchSearchTermEmptyValidator
-                );
+                validator.addValidators(searchRegexValidator, searchSearchTermEmptyValidator);
             } else {
-                validator.removeValidators(
-                    searchRegexValidator,
-                    searchSearchTermEmptyValidator
-                );
+                validator.removeValidators(searchRegexValidator, searchSearchTermEmptyValidator);
             }
         });
 
@@ -386,11 +342,7 @@ private void setupValidation() {
             }
         });
 
-        validator.addValidators(
-            nameValidator,
-            nameContainsDelimiterValidator,
-            sameNameValidator
-        );
+        validator.addValidators(nameValidator, nameContainsDelimiterValidator, sameNameValidator);
     }
 
     /**
@@ -402,12 +354,8 @@ private void setupValidation() {
     private Path getAbsoluteTexGroupPath(String input) {
         Optional<Path> latexFileDirectory = currentDatabase
             .getMetaData()
-            .getLatexFileDirectory(
-                preferencesService.getFilePreferences().getUserAndHost()
-            );
-        return latexFileDirectory
-            .map(path -> path.resolve(input))
-            .orElse(Path.of(input));
+            .getLatexFileDirectory(preferencesService.getFilePreferences().getUserAndHost());
+        return latexFileDirectory.map(path -> path.resolve(input)).orElse(Path.of(input));
     }
 
     public void validationHandler(Event event) {
@@ -434,9 +382,7 @@ public AbstractGroup resultConverter(ButtonType button) {
                     new ExplicitGroup(
                         groupName,
                         groupHierarchySelectedProperty.getValue(),
-                        preferencesService
-                            .getBibEntryPreferences()
-                            .getKeywordSeparator()
+                        preferencesService.getBibEntryPreferences().getKeywordSeparator()
                     );
             } else if (typeKeywordsProperty.getValue()) {
                 if (keywordGroupRegexProperty.getValue()) {
@@ -445,9 +391,7 @@ public AbstractGroup resultConverter(ButtonType button) {
                             groupName,
                             groupHierarchySelectedProperty.getValue(),
                             FieldFactory.parseField(
-                                keywordGroupSearchFieldProperty
-                                    .getValue()
-                                    .trim()
+                                keywordGroupSearchFieldProperty.getValue().trim()
                             ),
                             keywordGroupSearchTermProperty.getValue().trim(),
                             keywordGroupCaseSensitiveProperty.getValue()
@@ -458,15 +402,11 @@ public AbstractGroup resultConverter(ButtonType button) {
                             groupName,
                             groupHierarchySelectedProperty.getValue(),
                             FieldFactory.parseField(
-                                keywordGroupSearchFieldProperty
-                                    .getValue()
-                                    .trim()
+                                keywordGroupSearchFieldProperty.getValue().trim()
                             ),
                             keywordGroupSearchTermProperty.getValue().trim(),
                             keywordGroupCaseSensitiveProperty.getValue(),
-                            preferencesService
-                                .getBibEntryPreferences()
-                                .getKeywordSeparator(),
+                            preferencesService.getBibEntryPreferences().getKeywordSeparator(),
                             false
                         );
                 }
@@ -482,27 +422,15 @@ public AbstractGroup resultConverter(ButtonType button) {
                 if (autoGroupKeywordsOptionProperty.getValue()) {
                     // Set default value for delimiters: ',' for base and '>' for hierarchical
                     char delimiter = ',';
-                    char hierarDelimiter =
-                        Keyword.DEFAULT_HIERARCHICAL_DELIMITER;
+                    char hierarDelimiter = Keyword.DEFAULT_HIERARCHICAL_DELIMITER;
                     autoGroupKeywordsOptionProperty.setValue(Boolean.TRUE);
                     // Modify values for delimiters if user provided customized values
-                    if (
-                        !autoGroupKeywordsDelimiterProperty.getValue().isEmpty()
-                    ) {
-                        delimiter =
-                            autoGroupKeywordsDelimiterProperty
-                                .getValue()
-                                .charAt(0);
+                    if (!autoGroupKeywordsDelimiterProperty.getValue().isEmpty()) {
+                        delimiter = autoGroupKeywordsDelimiterProperty.getValue().charAt(0);
                     }
-                    if (
-                        !autoGroupKeywordsHierarchicalDelimiterProperty
-                            .getValue()
-                            .isEmpty()
-                    ) {
+                    if (!autoGroupKeywordsHierarchicalDelimiterProperty.getValue().isEmpty()) {
                         hierarDelimiter =
-                            autoGroupKeywordsHierarchicalDelimiterProperty
-                                .getValue()
-                                .charAt(0);
+                            autoGroupKeywordsHierarchicalDelimiterProperty.getValue().charAt(0);
                     }
                     resultingGroup =
                         new AutomaticKeywordGroup(
@@ -519,9 +447,7 @@ public AbstractGroup resultConverter(ButtonType button) {
                         new AutomaticPersonsGroup(
                             groupName,
                             groupHierarchySelectedProperty.getValue(),
-                            FieldFactory.parseField(
-                                autoGroupPersonsFieldProperty.getValue().trim()
-                            )
+                            FieldFactory.parseField(autoGroupPersonsFieldProperty.getValue().trim())
                         );
                 }
             } else if (typeTexProperty.getValue()) {
@@ -539,9 +465,7 @@ public AbstractGroup resultConverter(ButtonType button) {
             if (resultingGroup != null) {
                 preferencesService
                     .getGroupsPreferences()
-                    .setDefaultHierarchicalContext(
-                        groupHierarchySelectedProperty.getValue()
-                    );
+                    .setDefaultHierarchicalContext(groupHierarchySelectedProperty.getValue());
 
                 resultingGroup.setColor(colorProperty.getValue());
                 resultingGroup.setDescription(descriptionProperty.getValue());
@@ -551,10 +475,7 @@ public AbstractGroup resultConverter(ButtonType button) {
 
             return null;
         } catch (IllegalArgumentException | IOException exception) {
-            dialogService.showErrorDialogAndWait(
-                exception.getLocalizedMessage(),
-                exception
-            );
+            dialogService.showErrorDialogAndWait(exception.getLocalizedMessage(), exception);
             return null;
         }
     }
@@ -569,59 +490,37 @@ public void setValues() {
             colorProperty.setValue(IconTheme.getDefaultGroupColor());
             typeExplicitProperty.setValue(true);
             groupHierarchySelectedProperty.setValue(
-                preferencesService
-                    .getGroupsPreferences()
-                    .getDefaultHierarchicalContext()
+                preferencesService.getGroupsPreferences().getDefaultHierarchicalContext()
             );
             autoGroupKeywordsOptionProperty.setValue(Boolean.TRUE);
         } else {
             nameProperty.setValue(editedGroup.getName());
-            colorProperty.setValue(
-                editedGroup.getColor().orElse(IconTheme.getDefaultGroupColor())
-            );
-            descriptionProperty.setValue(
-                editedGroup.getDescription().orElse("")
-            );
+            colorProperty.setValue(editedGroup.getColor().orElse(IconTheme.getDefaultGroupColor()));
+            descriptionProperty.setValue(editedGroup.getDescription().orElse(""));
             iconProperty.setValue(editedGroup.getIconName().orElse(""));
-            groupHierarchySelectedProperty.setValue(
-                editedGroup.getHierarchicalContext()
-            );
+            groupHierarchySelectedProperty.setValue(editedGroup.getHierarchicalContext());
 
             if (editedGroup.getClass() == WordKeywordGroup.class) {
                 typeKeywordsProperty.setValue(true);
 
                 WordKeywordGroup group = (WordKeywordGroup) editedGroup;
-                keywordGroupSearchFieldProperty.setValue(
-                    group.getSearchField().getName()
-                );
-                keywordGroupSearchTermProperty.setValue(
-                    group.getSearchExpression()
-                );
-                keywordGroupCaseSensitiveProperty.setValue(
-                    group.isCaseSensitive()
-                );
+                keywordGroupSearchFieldProperty.setValue(group.getSearchField().getName());
+                keywordGroupSearchTermProperty.setValue(group.getSearchExpression());
+                keywordGroupCaseSensitiveProperty.setValue(group.isCaseSensitive());
                 keywordGroupRegexProperty.setValue(false);
             } else if (editedGroup.getClass() == RegexKeywordGroup.class) {
                 typeKeywordsProperty.setValue(true);
 
                 RegexKeywordGroup group = (RegexKeywordGroup) editedGroup;
-                keywordGroupSearchFieldProperty.setValue(
-                    group.getSearchField().getName()
-                );
-                keywordGroupSearchTermProperty.setValue(
-                    group.getSearchExpression()
-                );
-                keywordGroupCaseSensitiveProperty.setValue(
-                    group.isCaseSensitive()
-                );
+                keywordGroupSearchFieldProperty.setValue(group.getSearchField().getName());
+                keywordGroupSearchTermProperty.setValue(group.getSearchExpression());
+                keywordGroupCaseSensitiveProperty.setValue(group.isCaseSensitive());
                 keywordGroupRegexProperty.setValue(true);
             } else if (editedGroup.getClass() == SearchGroup.class) {
                 typeSearchProperty.setValue(true);
 
                 SearchGroup group = (SearchGroup) editedGroup;
-                searchGroupSearchTermProperty.setValue(
-                    group.getSearchExpression()
-                );
+                searchGroupSearchTermProperty.setValue(group.getSearchExpression());
                 searchFlagsProperty.setValue(group.getSearchFlags());
             } else if (editedGroup.getClass() == ExplicitGroup.class) {
                 typeExplicitProperty.setValue(true);
@@ -629,8 +528,7 @@ public void setValues() {
                 typeAutoProperty.setValue(true);
 
                 if (editedGroup.getClass() == AutomaticKeywordGroup.class) {
-                    AutomaticKeywordGroup group =
-                        (AutomaticKeywordGroup) editedGroup;
+                    AutomaticKeywordGroup group = (AutomaticKeywordGroup) editedGroup;
                     autoGroupKeywordsOptionProperty.setValue(Boolean.TRUE);
                     autoGroupKeywordsDelimiterProperty.setValue(
                         group.getKeywordDelimiter().toString()
@@ -638,73 +536,50 @@ public void setValues() {
                     autoGroupKeywordsHierarchicalDelimiterProperty.setValue(
                         group.getKeywordHierarchicalDelimiter().toString()
                     );
-                    autoGroupKeywordsFieldProperty.setValue(
-                        group.getField().getName()
-                    );
-                } else if (
-                    editedGroup.getClass() == AutomaticPersonsGroup.class
-                ) {
-                    AutomaticPersonsGroup group =
-                        (AutomaticPersonsGroup) editedGroup;
+                    autoGroupKeywordsFieldProperty.setValue(group.getField().getName());
+                } else if (editedGroup.getClass() == AutomaticPersonsGroup.class) {
+                    AutomaticPersonsGroup group = (AutomaticPersonsGroup) editedGroup;
                     autoGroupPersonsOptionProperty.setValue(Boolean.TRUE);
-                    autoGroupPersonsFieldProperty.setValue(
-                        group.getField().getName()
-                    );
+                    autoGroupPersonsFieldProperty.setValue(group.getField().getName());
                 }
             } else if (editedGroup.getClass() == TexGroup.class) {
                 typeTexProperty.setValue(true);
 
                 TexGroup group = (TexGroup) editedGroup;
-                texGroupFilePathProperty.setValue(
-                    group.getFilePath().toString()
-                );
+                texGroupFilePathProperty.setValue(group.getFilePath().toString());
             }
         }
     }
 
     public void texGroupBrowse() {
-        FileDialogConfiguration fileDialogConfiguration =
-            new FileDialogConfiguration.Builder()
-                .addExtensionFilter(StandardFileType.AUX)
-                .withDefaultExtension(StandardFileType.AUX)
-                .withInitialDirectory(
-                    currentDatabase
-                        .getMetaData()
-                        .getLatexFileDirectory(
-                            preferencesService
-                                .getFilePreferences()
-                                .getUserAndHost()
+        FileDialogConfiguration fileDialogConfiguration = new FileDialogConfiguration.Builder()
+            .addExtensionFilter(StandardFileType.AUX)
+            .withDefaultExtension(StandardFileType.AUX)
+            .withInitialDirectory(
+                currentDatabase
+                    .getMetaData()
+                    .getLatexFileDirectory(preferencesService.getFilePreferences().getUserAndHost())
+                    .orElse(
+                        FileUtil.getInitialDirectory(
+                            currentDatabase,
+                            preferencesService.getFilePreferences().getWorkingDirectory()
                         )
-                        .orElse(
-                            FileUtil.getInitialDirectory(
-                                currentDatabase,
-                                preferencesService
-                                    .getFilePreferences()
-                                    .getWorkingDirectory()
-                            )
-                        )
-                )
-                .build();
+                    )
+            )
+            .build();
         dialogService
             .showFileOpenDialog(fileDialogConfiguration)
             .ifPresent(file ->
                 texGroupFilePathProperty.setValue(
                     FileUtil
-                        .relativize(
-                            file.toAbsolutePath(),
-                            getFileDirectoriesAsPaths()
-                        )
+                        .relativize(file.toAbsolutePath(), getFileDirectoriesAsPaths())
                         .toString()
                 )
             );
     }
 
     public void openHelpPage() {
-        new HelpAction(
-            HelpFile.GROUPS,
-            dialogService,
-            preferencesService.getFilePreferences()
-        )
+        new HelpAction(HelpFile.GROUPS, dialogService, preferencesService.getFilePreferences())
             .execute();
     }
 
@@ -712,9 +587,7 @@ private List<Path> getFileDirectoriesAsPaths() {
         List<Path> fileDirs = new ArrayList<>();
         MetaData metaData = currentDatabase.getMetaData();
         metaData
-            .getLatexFileDirectory(
-                preferencesService.getFilePreferences().getUserAndHost()
-            )
+            .getLatexFileDirectory(preferencesService.getFilePreferences().getUserAndHost())
             .ifPresent(fileDirs::add);
 
         return fileDirs;

From 5b3c78522e2c0a789156fe700d7d40c9a52b71c0 Mon Sep 17 00:00:00 2001
From: Oliver Kopp <kopp.dev@gmail.com>
Date: Sat, 18 Nov 2023 12:28:53 +0100
Subject: [PATCH 27/27] Reformat to 100 line length

---
 .../org/jabref/gui/JabRefDialogService.java   | 184 +---
 .../org/jabref/gui/JabRefExecutorService.java |  53 +-
 src/main/java/org/jabref/gui/JabRefFrame.java | 455 +++------
 src/main/java/org/jabref/gui/JabRefGUI.java   |  60 +-
 src/main/java/org/jabref/gui/LibraryTab.java  | 244 +----
 .../java/org/jabref/gui/MainApplication.java  |   8 +-
 src/main/java/org/jabref/gui/MainMenu.java    |  33 +-
 src/main/java/org/jabref/gui/MainToolBar.java | 110 +-
 .../org/jabref/gui/OpenConsoleAction.java     |  10 +-
 .../org/jabref/gui/SendAsEMailAction.java     |  21 +-
 .../jabref/gui/SendAsKindleEmailAction.java   |  10 +-
 .../jabref/gui/SendAsStandardEmailAction.java |  18 +-
 .../java/org/jabref/gui/StateManager.java     | 104 +-
 src/main/java/org/jabref/gui/Telemetry.java   |   5 +-
 .../java/org/jabref/gui/TelemetryClient.java  |   6 +-
 .../jabref/gui/UpdateTimestampListener.java   |   7 +-
 .../jabref/gui/WaitForSaveFinishedDialog.java |   7 +-
 .../jabref/gui/groups/GroupNodeViewModel.java |  93 +-
 .../gui/groups/GroupTreeNodeViewModel.java    |  59 +-
 .../org/jabref/gui/groups/GroupTreeView.java  | 194 +---
 .../jabref/gui/groups/GroupTreeViewModel.java | 271 ++---
 .../jabref/gui/groups/GroupsPreferences.java  |  17 +-
 .../gui/groups/UndoableAddOrRemoveGroup.java  |  19 +-
 .../gui/groups/UndoableModifySubtree.java     |   8 +-
 .../jabref/gui/groups/UndoableMoveGroup.java  |  25 +-
 .../java/org/jabref/gui/help/AboutAction.java |   4 +-
 .../jabref/gui/help/AboutDialogViewModel.java |  26 +-
 .../jabref/gui/help/ErrorConsoleAction.java   |   4 +-
 .../java/org/jabref/gui/help/HelpAction.java  |   6 +-
 .../org/jabref/gui/help/NewVersionDialog.java |  17 +-
 .../gui/help/SearchForUpdateAction.java       |  11 +-
 .../org/jabref/gui/help/VersionWorker.java    |  27 +-
 .../java/org/jabref/gui/icon/IconTheme.java   |  26 +-
 .../gui/icon/InternalMaterialDesignIcon.java  |  11 +-
 .../org/jabref/gui/icon/JabRefIconView.java   |  10 +-
 .../gui/icon/JabRefMaterialDesignIcon.java    |   8 +-
 .../jabref/gui/icon/JabrefIconProvider.java   |   3 +-
 .../BibEntryTypePrefsAndFileViewModel.java    |   4 +-
 .../importer/GenerateEntryFromIdAction.java   |  30 +-
 .../importer/GenerateEntryFromIdDialog.java   |  25 +-
 .../gui/importer/GrobidOptInDialogHelper.java |  17 +-
 .../jabref/gui/importer/ImportCommand.java    |  84 +-
 .../ImportCustomEntryTypesDialog.java         |  42 +-
 ...ImportCustomEntryTypesDialogViewModel.java |  39 +-
 .../gui/importer/ImportEntriesDialog.java     |  66 +-
 .../gui/importer/ImportEntriesViewModel.java  | 121 +--
 .../gui/importer/NewDatabaseAction.java       |   9 +-
 .../jabref/gui/importer/NewEntryAction.java   |  20 +-
 .../importer/ParserResultWarningDialog.java   |   4 +-
 .../actions/CheckForNewEntryTypesAction.java  |  33 +-
 .../actions/MergeReviewIntoCommentAction.java |  15 +-
 ...geReviewIntoCommentConfirmationDialog.java |   8 +-
 .../importer/actions/OpenDatabaseAction.java  |  78 +-
 .../fetcher/LookupIdentifierAction.java       |  31 +-
 .../importer/fetcher/WebSearchPaneView.java   |  33 +-
 .../fetcher/WebSearchPaneViewModel.java       |  51 +-
 .../gui/integrity/IntegrityCheckAction.java   |  18 +-
 .../gui/integrity/IntegrityCheckDialog.java   |  27 +-
 .../jabref/gui/journals/AbbreviateAction.java |  48 +-
 .../gui/journals/UndoableAbbreviator.java     |  18 +-
 .../gui/journals/UndoableUnabbreviator.java   |  21 +-
 .../gui/keyboard/CodeAreaKeyBindings.java     |  82 +-
 .../org/jabref/gui/keyboard/KeyBinding.java   |  98 +-
 .../gui/keyboard/KeyBindingRepository.java    |  29 +-
 .../gui/keyboard/TextInputKeyBindings.java    |  30 +-
 .../AbstractPropertiesTabView.java            |   4 +-
 .../LibraryPropertiesAction.java              |  12 +-
 .../LibraryPropertiesView.java                |   7 +-
 .../constants/ConstantsItemModel.java         |  37 +-
 .../constants/ConstantsPropertiesView.java    |  53 +-
 .../ConstantsPropertiesViewModel.java         |  39 +-
 .../contentselectors/ContentSelectorView.java |  35 +-
 .../ContentSelectorViewModel.java             |  43 +-
 .../general/GeneralPropertiesView.java        |  31 +-
 .../general/GeneralPropertiesViewModel.java   |  91 +-
 .../keypattern/KeyPatternPropertiesView.java  |  16 +-
 .../KeyPatternPropertiesViewModel.java        |  52 +-
 .../preamble/PreamblePropertiesView.java      |   6 +-
 .../preamble/PreamblePropertiesViewModel.java |  21 +-
 .../saving/SavingPropertiesView.java          |  11 +-
 .../saving/SavingPropertiesViewModel.java     |  73 +-
 .../gui/linkedfile/AttachFileAction.java      |  35 +-
 .../linkedfile/AttachFileFromURLAction.java   |  21 +-
 .../gui/linkedfile/DeleteFileAction.java      |  57 +-
 .../linkedfile/LinkedFileEditDialogView.java  |  16 +-
 .../LinkedFilesEditDialogViewModel.java       |  77 +-
 .../gui/maintable/BibEntryTableViewModel.java |  76 +-
 .../org/jabref/gui/maintable/CellFactory.java |   5 +-
 .../gui/maintable/ColumnPreferences.java      |   3 +-
 .../org/jabref/gui/maintable/MainTable.java   |  72 +-
 .../gui/maintable/MainTableColumnFactory.java |  77 +-
 .../gui/maintable/MainTableColumnModel.java   |  27 +-
 .../gui/maintable/MainTableDataModel.java     |  51 +-
 .../MainTableFieldValueFormatter.java         |  26 +-
 .../maintable/MainTableHeaderContextMenu.java |  93 +-
 .../gui/maintable/MainTablePreferences.java   |   6 +-
 .../gui/maintable/NameDisplayPreferences.java |   8 +-
 .../gui/maintable/OpenExternalFileAction.java |  53 +-
 .../gui/maintable/OpenFolderAction.java       |  48 +-
 .../jabref/gui/maintable/OpenUrlAction.java   |  29 +-
 .../PersistenceVisualStateTable.java          |  13 +-
 .../jabref/gui/maintable/RightClickMenu.java  |  50 +-
 .../maintable/SearchShortScienceAction.java   |  11 +-
 .../SmartConstrainedResizePolicy.java         |  19 +-
 .../gui/maintable/columns/FieldColumn.java    |   9 +-
 .../gui/maintable/columns/FileColumn.java     |  55 +-
 .../gui/maintable/columns/LibraryColumn.java  |   4 +-
 .../columns/LinkedIdentifierColumn.java       |  29 +-
 .../maintable/columns/SpecialFieldColumn.java |  50 +-
 .../gui/menus/ChangeEntryTypeAction.java      |  19 +-
 .../jabref/gui/menus/ChangeEntryTypeMenu.java |  31 +-
 .../org/jabref/gui/menus/FileHistoryMenu.java |   8 +-
 .../gui/mergeentries/DiffHighlighting.java    |  36 +-
 .../DiffHighlightingEllipsingTextFlow.java    |  53 +-
 .../gui/mergeentries/FetchAndMergeEntry.java  | 117 +--
 .../gui/mergeentries/MergeEntriesAction.java  |  26 +-
 .../gui/mergeentries/MergeEntriesDialog.java  |  10 +-
 .../jabref/gui/mergeentries/MergeResult.java  |   6 +-
 .../mergeentries/MergeTwoEntriesAction.java   |  14 +-
 .../MergeWithFetchedEntryAction.java          |  10 +-
 .../mergeentries/MultiMergeEntriesView.java   | 150 +--
 .../MultiMergeEntriesViewModel.java           |  46 +-
 .../newmergedialog/FieldRowView.java          | 111 +-
 .../newmergedialog/FieldRowViewModel.java     |  40 +-
 .../PersonsNameFieldRowView.java              |   5 +-
 .../newmergedialog/ShowDiffConfig.java        |   5 +-
 .../ThreeWayMergeHeaderView.java              |  13 +-
 .../newmergedialog/ThreeWayMergeView.java     |  76 +-
 .../ThreeWayMergeViewModel.java               |  17 +-
 .../cell/CopyFieldValueCommand.java           |   5 +-
 .../newmergedialog/cell/FieldValueCell.java   |  33 +-
 .../cell/FieldValueCellViewModel.java         |   3 +-
 .../newmergedialog/cell/HeaderCell.java       |   7 +-
 .../newmergedialog/cell/MergedFieldCell.java  |   4 +-
 .../cell/OpenExternalLinkAction.java          |  21 +-
 .../cell/ThreeWayMergeCell.java               |  10 +-
 .../cell/ThreeWayMergeCellViewModel.java      |  10 +-
 .../cell/sidebuttons/InfoButton.java          |   9 +-
 .../sidebuttons/ToggleMergeUnmergeButton.java |  23 +-
 .../diffhighlighter/DiffHighlighter.java      |  13 +-
 .../diffhighlighter/SplitDiffHighlighter.java |  29 +-
 .../UnifiedDiffHighlighter.java               |  66 +-
 .../fieldsmerger/FieldMergerFactory.java      |   3 +-
 .../fieldsmerger/GroupMerger.java             |  10 +-
 .../fieldsmerger/KeywordMerger.java           |   4 +-
 .../toolbar/ThreeWayMergeToolbar.java         |  51 +-
 .../openoffice/AdvancedCiteDialogView.java    |  11 +-
 .../org/jabref/gui/openoffice/Bootstrap.java  | 124 +--
 .../openoffice/CitationEntryViewModel.java    |  16 +-
 .../DetectOpenOfficeInstallation.java         |  39 +-
 .../openoffice/ManageCitationsDialogView.java |  23 +-
 .../ManageCitationsDialogViewModel.java       |  16 +-
 .../org/jabref/gui/openoffice/OOBibBase.java  | 362 ++-----
 .../gui/openoffice/OOBibBaseConnect.java      |  51 +-
 .../org/jabref/gui/openoffice/OOError.java    |  29 +-
 .../gui/openoffice/OpenOfficePanel.java       | 319 ++----
 .../gui/openoffice/StyleSelectDialogView.java |  36 +-
 .../StyleSelectDialogViewModel.java           |  52 +-
 .../openoffice/StyleSelectItemViewModel.java  |   7 +-
 .../AbstractPreferenceTabView.java            |   4 +-
 .../preferences/PreferencesDialogView.java    |  30 +-
 .../PreferencesDialogViewModel.java           |  89 +-
 .../preferences/PreferencesFilterDialog.java  |  38 +-
 .../preferences/PreferencesSearchHandler.java |  31 +-
 .../preferences/ShowPreferencesAction.java    |   9 +-
 .../autocompletion/AutoCompletionTab.java     |  13 +-
 .../AutoCompletionTabViewModel.java           |  93 +-
 .../CitationKeyPatternTab.java                |  40 +-
 .../CitationKeyPatternTabViewModel.java       | 125 +--
 .../CustomEntryTypeViewModel.java             |   5 +-
 .../customentrytypes/CustomEntryTypesTab.java |  92 +-
 .../CustomEntryTypesTabViewModel.java         |  68 +-
 .../customentrytypes/EntryTypeViewModel.java  |  21 +-
 .../customentrytypes/FieldViewModel.java      |   3 +-
 .../customexporter/CustomExporterTab.java     |  15 +-
 .../CustomExporterTabViewModel.java           |  29 +-
 .../customimporter/CustomImporterTab.java     |  23 +-
 .../CustomImporterTabViewModel.java           |  93 +-
 .../gui/preferences/entry/EntryTab.java       |  42 +-
 .../preferences/entry/EntryTabViewModel.java  |  82 +-
 .../entryeditor/EntryEditorTab.java           |  27 +-
 .../entryeditor/EntryEditorTabViewModel.java  |  96 +-
 .../gui/preferences/export/ExportTab.java     |  11 +-
 .../export/ExportTabViewModel.java            |  33 +-
 .../gui/preferences/external/ExternalTab.java |  26 +-
 .../external/ExternalTabViewModel.java        | 107 +-
 .../EditExternalFileTypeEntryDialog.java      |  21 +-
 .../EditExternalFileTypeViewModel.java        |  44 +-
 .../ExternalFileTypeItemViewModel.java        |  14 +-
 .../ExternalFileTypesTab.java                 |  61 +-
 .../ExternalFileTypesTabViewModel.java        |  16 +-
 .../gui/preferences/general/GeneralTab.java   |  98 +-
 .../general/GeneralTabViewModel.java          | 218 ++--
 .../gui/preferences/groups/GroupsTab.java     |  11 +-
 .../groups/GroupsTabViewModel.java            |  28 +-
 .../journals/AbbreviationViewModel.java       |  31 +-
 .../journals/AbbreviationsFileViewModel.java  |   9 +-
 .../journals/JournalAbbreviationsTab.java     |  99 +-
 .../JournalAbbreviationsTabViewModel.java     | 166 +--
 .../keybindings/KeyBindingViewModel.java      |  29 +-
 .../keybindings/KeyBindingsTab.java           |  47 +-
 .../keybindings/KeyBindingsTabViewModel.java  |  48 +-
 .../linkedfiles/LinkedFilesTab.java           |  42 +-
 .../linkedfiles/LinkedFilesTabViewModel.java  |  90 +-
 .../nameformatter/NameFormatterTab.java       |  63 +-
 .../NameFormatterTabViewModel.java            |  18 +-
 .../network/CustomCertificateViewModel.java   |  24 +-
 .../gui/preferences/network/NetworkTab.java   | 113 +-
 .../network/NetworkTabViewModel.java          | 147 +--
 .../gui/preferences/preview/PreviewTab.java   | 135 +--
 .../preview/PreviewTabViewModel.java          | 235 ++---
 .../NewProtectedTermsFileDialog.java          |  37 +-
 .../protectedterms/ProtectedTermsTab.java     |  96 +-
 .../ProtectedTermsTabViewModel.java           |  83 +-
 .../gui/preferences/table/TableTab.java       |  70 +-
 .../preferences/table/TableTabViewModel.java  | 180 +---
 .../preferences/websearch/WebSearchTab.java   |  70 +-
 .../websearch/WebSearchTabViewModel.java      | 101 +-
 .../gui/preferences/xmp/XmpPrivacyTab.java    |  54 +-
 .../xmp/XmpPrivacyTabViewModel.java           |  45 +-
 .../gui/preview/CopyCitationAction.java       |  55 +-
 .../org/jabref/gui/preview/PreviewPanel.java  |  47 +-
 .../org/jabref/gui/preview/PreviewViewer.java |  67 +-
 .../gui/push/AbstractPushToApplication.java   |  61 +-
 .../jabref/gui/push/PushToApplication.java    |   6 +-
 .../gui/push/PushToApplicationCommand.java    |  49 +-
 .../gui/push/PushToApplicationSettings.java   |  20 +-
 .../jabref/gui/push/PushToApplications.java   |   7 +-
 .../java/org/jabref/gui/push/PushToEmacs.java |  32 +-
 .../jabref/gui/push/PushToEmacsSettings.java  |   6 +-
 .../java/org/jabref/gui/push/PushToLyx.java   |  16 +-
 .../jabref/gui/push/PushToSublimeText.java    |  30 +-
 .../org/jabref/gui/push/PushToTeXstudio.java  |  12 +-
 .../org/jabref/gui/push/PushToTexShop.java    |  34 +-
 .../org/jabref/gui/push/PushToTexmaker.java   |   5 +-
 .../java/org/jabref/gui/push/PushToVim.java   |  19 +-
 .../jabref/gui/push/PushToVimSettings.java    |   6 +-
 .../org/jabref/gui/push/PushToWinEdt.java     |   5 +-
 .../jabref/gui/remote/CLIMessageHandler.java  |   4 +-
 .../jabref/gui/search/GlobalSearchBar.java    | 212 ++--
 .../gui/search/GlobalSearchResultDialog.java  |  28 +-
 .../GlobalSearchResultDialogViewModel.java    |  15 +-
 .../RebuildFulltextSearchIndexAction.java     |  21 +-
 .../jabref/gui/search/SearchDisplayMode.java  |  15 +-
 .../gui/search/SearchFieldRightClickMenu.java |  26 +-
 .../jabref/gui/search/SearchResultsTable.java |  37 +-
 .../search/SearchResultsTableDataModel.java   |  37 +-
 .../jabref/gui/search/SearchTextField.java    |   3 +-
 ...tainsAndRegexBasedSearchRuleDescriber.java |  14 +-
 .../GrammarBasedSearchRuleDescriber.java      | 136 +--
 .../rules/describer/SearchDescribers.java     |  17 +-
 .../ConnectToSharedDatabaseCommand.java       |   8 +-
 .../shared/PullChangesFromSharedAction.java   |   3 +-
 .../shared/SharedDatabaseLoginDialogView.java |  82 +-
 .../SharedDatabaseLoginDialogViewModel.java   | 254 ++---
 .../gui/shared/SharedDatabaseUIManager.java   | 133 +--
 .../gui/sidepane/GroupsSidePaneComponent.java |  28 +-
 .../org/jabref/gui/sidepane/SidePane.java     |   3 +-
 .../gui/sidepane/SidePaneComponent.java       |  11 +-
 .../gui/sidepane/SidePaneContentFactory.java  |   6 +-
 .../gui/sidepane/SidePaneViewModel.java       |  34 +-
 .../jabref/gui/sidepane/TogglePaneAction.java |   6 +-
 .../gui/slr/EditExistingStudyAction.java      |  26 +-
 .../gui/slr/ExistingStudySearchAction.java    |  27 +-
 .../gui/slr/ManageStudyDefinitionView.java    |  66 +-
 .../slr/ManageStudyDefinitionViewModel.java   |  75 +-
 .../jabref/gui/slr/StartNewStudyAction.java   |  31 +-
 .../org/jabref/gui/slr/StudyCatalogItem.java  |   9 +-
 .../gui/specialfields/SpecialFieldAction.java |  41 +-
 .../SpecialFieldMenuItemFactory.java          |  33 +-
 .../SpecialFieldValueViewModel.java           |   4 +-
 .../specialfields/SpecialFieldViewModel.java  |   9 +-
 .../SpecialFieldsPreferences.java             |   3 +-
 .../gui/texparser/CitationsDisplay.java       |  26 +-
 .../gui/texparser/ParseLatexAction.java       |   8 +-
 .../gui/texparser/ParseLatexDialogView.java   |  33 +-
 .../texparser/ParseLatexDialogViewModel.java  |  58 +-
 .../gui/texparser/ParseLatexResultView.java   |  10 +-
 .../texparser/ParseLatexResultViewModel.java  |  18 +-
 .../java/org/jabref/gui/theme/StyleSheet.java |  12 +-
 .../org/jabref/gui/theme/StyleSheetFile.java  |  17 +-
 .../org/jabref/gui/theme/ThemeManager.java    |  93 +-
 .../gui/undo/AbstractUndoableJabRefEdit.java  |  16 +-
 .../org/jabref/gui/undo/UndoRedoAction.java   |  12 +-
 .../jabref/gui/undo/UndoableChangeType.java   |  15 +-
 .../jabref/gui/undo/UndoableFieldChange.java  |  22 +-
 .../gui/undo/UndoableInsertEntries.java       |  20 +-
 .../jabref/gui/undo/UndoableInsertString.java |   9 +-
 .../gui/undo/UndoablePreambleChange.java      |   6 +-
 .../gui/undo/UndoableRemoveEntries.java       |  20 +-
 .../jabref/gui/undo/UndoableRemoveString.java |   9 +-
 .../org/jabref/gui/util/BackgroundTask.java   |  54 +-
 .../java/org/jabref/gui/util/BaseDialog.java  |  18 +-
 .../org/jabref/gui/util/BindingsHelper.java   |  77 +-
 .../org/jabref/gui/util/ControlHelper.java    |  33 +-
 .../gui/util/CurrentThreadTaskExecutor.java   |  13 +-
 .../jabref/gui/util/CustomLocalDragboard.java |  11 +-
 .../jabref/gui/util/CustomTitledPaneSkin.java |  61 +-
 .../gui/util/DefaultFileUpdateMonitor.java    |  22 +-
 .../jabref/gui/util/DefaultTaskExecutor.java  |  36 +-
 .../java/org/jabref/gui/util/FieldsUtil.java  |  51 +-
 .../gui/util/FileDialogConfiguration.java     |  39 +-
 .../jabref/gui/util/FileFilterConverter.java  |  50 +-
 .../jabref/gui/util/FileNodeViewModel.java    |  16 +-
 .../gui/util/IconValidationDecorator.java     |  16 +-
 .../gui/util/JabRefResourceLocator.java       |   4 +-
 .../gui/util/OptionalObjectProperty.java      |   3 +-
 .../util/OptionalValueTableCellFactory.java   |   7 +-
 .../jabref/gui/util/RecursiveTreeItem.java    |  17 +-
 .../org/jabref/gui/util/StreamGobbler.java    |  15 +-
 .../org/jabref/gui/util/TooltipTextUtil.java  |  64 +-
 .../org/jabref/gui/util/UiThreadList.java     |   8 +-
 .../gui/util/ValueTableCellFactory.java       |  58 +-
 .../gui/util/ViewModelListCellFactory.java    |  80 +-
 .../gui/util/ViewModelTableRowFactory.java    |  56 +-
 ...extFieldTableCellVisualizationFactory.java |  27 +-
 .../gui/util/ViewModelTreeCellFactory.java    |  38 +-
 .../util/ViewModelTreeTableCellFactory.java   |  24 +-
 .../util/ViewModelTreeTableRowFactory.java    | 106 +-
 .../org/jabref/gui/util/ZipFileChooser.java   |  39 +-
 .../comparator/NumericFieldComparator.java    |   5 +-
 .../comparator/RankingFieldComparator.java    |   8 +-
 .../comparator/SpecialFieldComparator.java    |   3 +-
 .../component/TemporalAccessorPicker.java     |  68 +-
 .../uithreadaware/UiThreadChangeListener.java |   6 +-
 .../UiThreadInvalidationListener.java         |   4 +-
 .../java/org/jabref/http/JabrefMediaType.java |   3 +-
 .../java/org/jabref/http/dto/BibEntryDTO.java |  11 +-
 .../org/jabref/http/server/Application.java   |  10 +-
 .../org/jabref/http/server/CORSFilter.java    |  22 +-
 .../jabref/http/server/LibrariesResource.java |   4 +-
 .../jabref/http/server/LibraryResource.java   |  29 +-
 .../java/org/jabref/http/server/Server.java   |  22 +-
 .../org/jabref/logic/JabRefException.java     |  14 +-
 .../java/org/jabref/logic/TypedBibEntry.java  |  14 +-
 .../logic/auxparser/DefaultAuxParser.java     |  33 +-
 .../jabref/logic/bibtex/BibEntryWriter.java   |  58 +-
 .../jabref/logic/bibtex/FieldPreferences.java |   6 +-
 .../org/jabref/logic/bibtex/FieldWriter.java  |  37 +-
 .../jabref/logic/bibtex/FileFieldWriter.java  |  11 +-
 .../bibtex/comparator/BibDatabaseDiff.java    |  56 +-
 .../bibtex/comparator/BibStringDiff.java      |  16 +-
 .../bibtex/comparator/EntryComparator.java    |  18 +-
 .../bibtex/comparator/FieldComparator.java    |   6 +-
 .../comparator/FieldComparatorStack.java      |   4 +-
 .../logic/bibtex/comparator/GroupDiff.java    |  15 +-
 .../logic/bibtex/comparator/MetaDataDiff.java |   9 +-
 .../logic/bibtex/comparator/PreambleDiff.java |   9 +-
 .../org/jabref/logic/bst/BstFunctions.java    | 143 +--
 .../jabref/logic/bst/BstPreviewLayout.java    |  15 +-
 src/main/java/org/jabref/logic/bst/BstVM.java |  24 +-
 .../org/jabref/logic/bst/BstVMContext.java    |   6 +-
 .../org/jabref/logic/bst/BstVMVisitor.java    |  56 +-
 .../jabref/logic/bst/util/BstCaseChanger.java |  33 +-
 .../logic/bst/util/BstNameFormatter.java      |  60 +-
 .../jabref/logic/bst/util/BstPurifier.java    |  17 +-
 .../logic/bst/util/BstTextPrefixer.java       |   9 +-
 .../logic/bst/util/BstWidthCalculator.java    |  20 +-
 .../AbstractCitationKeyPattern.java           |  10 +-
 .../citationkeypattern/BracketedPattern.java  | 281 ++---
 .../CitationKeyGenerator.java                 |  59 +-
 .../CitationKeyPatternPreferences.java        |  42 +-
 .../DatabaseCitationKeyPattern.java           |   4 +-
 .../logic/citationstyle/CSLAdapter.java       |  14 +-
 .../logic/citationstyle/CitationStyle.java    |  70 +-
 .../citationstyle/CitationStyleCache.java     |   9 +-
 .../citationstyle/CitationStyleGenerator.java |  16 +-
 .../CitationStylePreviewLayout.java           |   5 +-
 .../citationstyle/JabRefItemDataProvider.java |  62 +-
 .../citationstyle/JabRefLocaleProvider.java   |  14 +-
 .../jabref/logic/cleanup/CleanupWorker.java   |  29 +-
 .../cleanup/ConvertToBiblatexCleanup.java     |  29 +-
 .../logic/cleanup/ConvertToBibtexCleanup.java |  22 +-
 .../org/jabref/logic/cleanup/DoiCleanup.java  |  22 +-
 .../jabref/logic/cleanup/EprintCleanup.java   |  13 +-
 .../logic/cleanup/FieldFormatterCleanup.java  |  23 +-
 .../logic/cleanup/FieldFormatterCleanups.java |  83 +-
 .../logic/cleanup/MoveFilesCleanup.java       |  15 +-
 .../logic/cleanup/RenamePdfCleanup.java       |  10 +-
 .../cleanup/TimeStampToCreationDate.java      |  24 +-
 .../cleanup/TimeStampToModificationDate.java  |  28 +-
 .../org/jabref/logic/cleanup/URLCleanup.java  |  55 +-
 .../cleanup/UpgradePdfPsToFileCleanup.java    |  18 +-
 .../org/jabref/logic/crawler/Crawler.java     |   3 +-
 .../StudyCatalogToFetcherConverter.java       |  17 +-
 .../jabref/logic/crawler/StudyFetcher.java    |  30 +-
 .../jabref/logic/crawler/StudyRepository.java | 160 +--
 .../jabref/logic/crawler/StudyYamlParser.java |   9 +-
 .../jabref/logic/database/DatabaseMerger.java |  26 +-
 .../jabref/logic/database/DuplicateCheck.java | 121 +--
 .../exporter/AtomicFileOutputStream.java      |  36 +-
 .../logic/exporter/AtomicFileWriter.java      |   3 +-
 .../logic/exporter/BibDatabaseWriter.java     | 127 +--
 .../logic/exporter/BibtexDatabaseWriter.java  |  54 +-
 .../exporter/EmbeddedBibFilePdfExporter.java  |  49 +-
 .../org/jabref/logic/exporter/Exporter.java   |   5 +-
 .../logic/exporter/ExporterFactory.java       |  13 +-
 .../logic/exporter/GroupSerializer.java       |  32 +-
 .../jabref/logic/exporter/MSBibExporter.java  |  20 +-
 .../logic/exporter/MetaDataSerializer.java    |  78 +-
 .../jabref/logic/exporter/ModsExporter.java   | 135 +--
 .../jabref/logic/exporter/OOCalcDatabase.java |  31 +-
 .../exporter/OpenDocumentRepresentation.java  |  79 +-
 .../OpenDocumentSpreadsheetCreator.java       |  45 +-
 .../exporter/OpenOfficeDocumentCreator.java   |  36 +-
 .../logic/exporter/SaveConfiguration.java     |   4 +-
 .../jabref/logic/exporter/SaveException.java  |  11 +-
 .../logic/exporter/TemplateExporter.java      |  84 +-
 .../jabref/logic/exporter/XmpExporter.java    |  18 +-
 .../jabref/logic/exporter/XmpPdfExporter.java |  29 +-
 .../ExternalFilesContentImporter.java         |  19 +-
 .../externalfiles/LinkedFileHandler.java      |  58 +-
 .../jabref/logic/formatter/Formatters.java    |   9 +-
 .../bibtexfields/AddBracesFormatter.java      |   4 +-
 .../bibtexfields/CleanupUrlFormatter.java     |   8 +-
 .../EscapeAmpersandsFormatter.java            |   8 +-
 .../EscapeDollarSignFormatter.java            |   5 +-
 .../bibtexfields/HtmlToLatexFormatter.java    |  66 +-
 .../bibtexfields/HtmlToUnicodeFormatter.java  |   8 +-
 .../bibtexfields/LatexCleanupFormatter.java   |  29 +-
 .../bibtexfields/NormalizeMonthFormatter.java |   4 +-
 .../bibtexfields/NormalizeNamesFormatter.java |   4 +-
 .../bibtexfields/NormalizePagesFormatter.java |  11 +-
 .../OrdinalsToSuperscriptFormatter.java       |   3 +-
 .../bibtexfields/RegexFormatter.java          |  51 +-
 .../bibtexfields/RemoveBracesFormatter.java   |   4 +-
 .../RemoveHyphenatedNewlinesFormatter.java    |   4 +-
 .../bibtexfields/RemoveNewlinesFormatter.java |   4 +-
 .../ReplaceTabsBySpaceFormater.java           |   4 +-
 .../bibtexfields/ShortenDOIFormatter.java     |   4 +-
 .../bibtexfields/TrimWhitespaceFormatter.java |   4 +-
 .../bibtexfields/UnicodeToLatexFormatter.java |  29 +-
 .../bibtexfields/UnitsToLatexFormatter.java   |  20 +-
 .../casechanger/SentenceCaseFormatter.java    |   4 +-
 .../logic/formatter/casechanger/Title.java    |   5 +-
 .../casechanger/TitleCaseFormatter.java       |   6 +-
 .../formatter/casechanger/TitleParser.java    |   8 +-
 .../casechanger/UnprotectTermsFormatter.java  |   4 +-
 .../logic/formatter/casechanger/Word.java     |  16 +-
 .../minifier/MinifyNameListFormatter.java     |   5 +-
 .../java/org/jabref/logic/git/GitHandler.java |  49 +-
 .../org/jabref/logic/git/SlrGitHandler.java   |  47 +-
 .../logic/groups/DefaultGroupsFactory.java    |   7 +-
 .../java/org/jabref/logic/help/HelpFile.java  |  32 +-
 .../logic/importer/AuthorListParser.java      | 115 +--
 .../logic/importer/CompositeIdFetcher.java    |  15 +-
 .../importer/EntryBasedParserFetcher.java     |   9 +-
 .../importer/FetcherClientException.java      |  12 +-
 .../logic/importer/FetcherException.java      |   6 +-
 .../importer/FetcherServerException.java      |  12 +-
 .../logic/importer/FulltextFetcher.java       |   3 +-
 .../logic/importer/FulltextFetchers.java      |  51 +-
 .../jabref/logic/importer/IdBasedFetcher.java |   3 +-
 .../logic/importer/IdBasedParserFetcher.java  |   8 +-
 .../logic/importer/IdParserFetcher.java       |  12 +-
 .../logic/importer/ImportCleanupBibtex.java   |   3 +-
 .../logic/importer/ImportFormatReader.java    |  46 +-
 .../org/jabref/logic/importer/Importer.java   |  55 +-
 .../logic/importer/ImporterPreferences.java   |  13 +-
 .../jabref/logic/importer/OpenDatabase.java   |   5 +-
 .../importer/PagedSearchBasedFetcher.java     |  13 +-
 .../PagedSearchBasedParserFetcher.java        |  21 +-
 .../org/jabref/logic/importer/Parser.java     |   9 +-
 .../jabref/logic/importer/ParserResult.java   |   9 +-
 .../jabref/logic/importer/QueryParser.java    |  10 +-
 .../logic/importer/SearchBasedFetcher.java    |   7 +-
 .../importer/SearchBasedParserFetcher.java    |  13 +-
 .../jabref/logic/importer/WebFetchers.java    |  63 +-
 .../importer/fetcher/ACMPortalFetcher.java    |   7 +-
 .../jabref/logic/importer/fetcher/ACS.java    |   4 +-
 .../importer/fetcher/AbstractIsbnFetcher.java |  11 +-
 .../logic/importer/fetcher/ApsFetcher.java    |   8 +-
 .../logic/importer/fetcher/ArXivFetcher.java  | 344 ++-----
 .../fetcher/AstrophysicsDataSystem.java       |  99 +-
 .../importer/fetcher/BibsonomyScraper.java    |  12 +-
 .../importer/fetcher/BiodiversityLibrary.java | 100 +-
 .../logic/importer/fetcher/BvbFetcher.java    |   6 +-
 .../logic/importer/fetcher/CiteSeer.java      |  13 +-
 ...fComputerScienceBibliographiesFetcher.java |  36 +-
 ...OfComputerScienceBibliographiesParser.java |  29 +-
 .../importer/fetcher/ComplexSearchQuery.java  |  78 +-
 .../fetcher/CompositeSearchBasedFetcher.java  |  24 +-
 .../logic/importer/fetcher/CrossRef.java      |  76 +-
 .../logic/importer/fetcher/DBLPFetcher.java   |  16 +-
 .../logic/importer/fetcher/DOABFetcher.java   |  68 +-
 .../logic/importer/fetcher/DOAJFetcher.java   |  58 +-
 .../jabref/logic/importer/fetcher/DiVA.java   |   4 +-
 .../logic/importer/fetcher/DoiFetcher.java    |  91 +-
 .../logic/importer/fetcher/DoiResolution.java |  31 +-
 .../logic/importer/fetcher/GoogleScholar.java |  98 +-
 .../fetcher/GrobidCitationFetcher.java        |  17 +-
 .../importer/fetcher/GrobidPreferences.java   |   6 +-
 .../logic/importer/fetcher/GvkFetcher.java    |  26 +-
 .../jabref/logic/importer/fetcher/IEEE.java   | 122 +--
 .../importer/fetcher/INSPIREFetcher.java      |  44 +-
 .../importer/fetcher/IacrEprintFetcher.java   |  85 +-
 .../logic/importer/fetcher/IssnFetcher.java   |  15 +-
 .../fetcher/JournalInformationFetcher.java    |  92 +-
 .../logic/importer/fetcher/JstorFetcher.java  |  25 +-
 .../logic/importer/fetcher/LOBIDFetcher.java  |  57 +-
 .../importer/fetcher/LibraryOfCongress.java   |   4 +-
 .../logic/importer/fetcher/MathSciNet.java    |  68 +-
 .../importer/fetcher/MedlineFetcher.java      |  69 +-
 .../jabref/logic/importer/fetcher/Medra.java  |  19 +-
 .../logic/importer/fetcher/MrDLibFetcher.java |  34 +-
 .../logic/importer/fetcher/OpenAccessDoi.java |  13 +-
 .../logic/importer/fetcher/ResearchGate.java  |  67 +-
 .../logic/importer/fetcher/RfcFetcher.java    |   4 +-
 .../fetcher/ScholarArchiveFetcher.java        |  52 +-
 .../logic/importer/fetcher/ScienceDirect.java |  45 +-
 .../importer/fetcher/SemanticScholar.java     |  67 +-
 .../importer/fetcher/SpringerFetcher.java     |  92 +-
 .../logic/importer/fetcher/SpringerLink.java  |  26 +-
 .../logic/importer/fetcher/TitleFetcher.java  |   7 +-
 .../jabref/logic/importer/fetcher/ZbMATH.java |  50 +-
 .../DoiToBibtexConverterComIsbnFetcher.java   |  52 +-
 .../isbntobibtex/EbookDeIsbnFetcher.java      |  23 +-
 .../fetcher/isbntobibtex/IsbnFetcher.java     |  36 +-
 .../isbntobibtex/OpenLibraryIsbnFetcher.java  |  30 +-
 .../AbstractQueryTransformer.java             |  23 +-
 .../transformers/ArXivQueryTransformer.java   |   3 +-
 .../CiteSeerQueryTransformer.java             |   5 +-
 .../transformers/DBLPQueryTransformer.java    |   7 +-
 .../transformers/DefaultQueryTransformer.java |   3 +-
 .../transformers/GVKQueryTransformer.java     |  13 +-
 .../transformers/IEEEQueryTransformer.java    |  21 +-
 .../transformers/MedlineQueryTransformer.java |   7 +-
 .../transformers/ScholarQueryTransformer.java |   3 +-
 .../YearRangeByFilteringQueryTransformer.java |  11 +-
 .../importer/fileformat/ACMPortalParser.java  | 114 +--
 .../fileformat/BiblioscapeImporter.java       |  77 +-
 .../importer/fileformat/BibtexImporter.java   |  53 +-
 .../importer/fileformat/BibtexParser.java     | 117 +--
 .../importer/fileformat/CffImporter.java      |  20 +-
 .../fileformat/CitaviXmlImporter.java         | 183 +---
 .../importer/fileformat/CiteSeerParser.java   |  17 +-
 .../importer/fileformat/CoinsParser.java      |  10 +-
 .../importer/fileformat/CopacImporter.java    |  18 +-
 .../importer/fileformat/CustomImporter.java   |  10 +-
 .../importer/fileformat/EndnoteImporter.java  |  17 +-
 .../fileformat/EndnoteXmlImporter.java        | 218 +---
 .../importer/fileformat/InspecImporter.java   |  13 +-
 .../importer/fileformat/IsiImporter.java      |  45 +-
 .../importer/fileformat/MarcXmlParser.java    | 118 +--
 .../importer/fileformat/MedlineImporter.java  | 501 ++-------
 .../fileformat/MedlinePlainImporter.java      |  74 +-
 .../importer/fileformat/ModsImporter.java     | 322 ++----
 .../importer/fileformat/MrDLibImporter.java   |  41 +-
 .../importer/fileformat/MsBibImporter.java    |  35 +-
 .../importer/fileformat/OvidImporter.java     |  58 +-
 .../fileformat/PdfContentImporter.java        |  65 +-
 .../PdfEmbeddedBibFileImporter.java           |  64 +-
 .../fileformat/PdfGrobidImporter.java         |  22 +-
 .../fileformat/PdfMergeMetadataImporter.java  |  51 +-
 .../PdfVerbatimBibTextImporter.java           |  22 +-
 .../importer/fileformat/PdfXmpImporter.java   |  10 +-
 .../importer/fileformat/PicaXmlParser.java    |  27 +-
 .../importer/fileformat/RepecNepImporter.java |  57 +-
 .../importer/fileformat/RisImporter.java      |  93 +-
 .../fileformat/SilverPlatterImporter.java     |  47 +-
 .../fileformat/medline/Investigator.java      |   6 +-
 .../logic/importer/util/FileFieldParser.java  |  23 +-
 .../logic/importer/util/GrobidService.java    |  35 +-
 .../logic/importer/util/GroupsParser.java     | 169 +--
 .../logic/importer/util/IdentifierParser.java |   8 +-
 .../logic/importer/util/JsonReader.java       |  16 +-
 .../logic/importer/util/MathMLParser.java     |  14 +-
 .../logic/importer/util/MediaTypes.java       |   3 +-
 .../logic/importer/util/MetaDataParser.java   | 126 +--
 .../logic/importer/util/ShortDOIService.java  |   4 +-
 .../util/ShortDOIServiceException.java        |   6 +-
 .../logic/importer/util/StaxParser.java       |  16 +-
 .../integrity/ASCIICharacterChecker.java      |   4 +-
 .../logic/integrity/AbbreviationChecker.java  |   4 +-
 .../logic/integrity/AmpersandChecker.java     |  13 +-
 .../logic/integrity/BibStringChecker.java     |   4 +-
 .../logic/integrity/BooktitleChecker.java     |   4 +-
 .../logic/integrity/BracketChecker.java       |   8 +-
 .../logic/integrity/CitationKeyChecker.java   |   4 +-
 .../CitationKeyDeviationChecker.java          |   7 +-
 .../CitationKeyDuplicationChecker.java        |   4 +-
 .../integrity/DoiDuplicationChecker.java      |   8 +-
 .../logic/integrity/EditionChecker.java       |  40 +-
 .../logic/integrity/EntryLinkChecker.java     |  16 +-
 .../jabref/logic/integrity/FieldCheckers.java |  38 +-
 .../jabref/logic/integrity/FileChecker.java   |  11 +-
 .../logic/integrity/HTMLCharacterChecker.java |  12 +-
 .../logic/integrity/HowPublishedChecker.java  |   9 +-
 .../logic/integrity/IntegrityCheck.java       |   9 +-
 .../JournalInAbbreviationListChecker.java     |   3 +-
 .../integrity/LatexIntegrityChecker.java      |  64 +-
 .../jabref/logic/integrity/MonthChecker.java  |  19 +-
 .../logic/integrity/NoBibtexFieldChecker.java |   7 +-
 .../jabref/logic/integrity/NoteChecker.java   |   7 +-
 .../jabref/logic/integrity/PagesChecker.java  |   7 +-
 .../logic/integrity/PersonNamesChecker.java   |   6 +-
 .../jabref/logic/integrity/TitleChecker.java  |  16 +-
 .../jabref/logic/integrity/TypeChecker.java   |   4 +-
 .../jabref/logic/integrity/UTF8Checker.java   |   4 +-
 .../jabref/logic/integrity/YearChecker.java   |  12 +-
 .../jabref/logic/journals/Abbreviation.java   |  24 +-
 .../logic/journals/AbbreviationParser.java    |  18 +-
 .../logic/journals/AbbreviationWriter.java    |  11 +-
 .../journals/JournalAbbreviationLoader.java   |  26 +-
 .../JournalAbbreviationPreferences.java       |   3 +-
 .../JournalAbbreviationRepository.java        |  72 +-
 .../org/jabref/logic/l10n/Localization.java   |  50 +-
 .../logic/l10n/LocalizationKeyParams.java     |  10 +-
 .../layout/AbstractParamLayoutFormatter.java  |   8 +-
 .../java/org/jabref/logic/layout/Layout.java  |  14 +-
 .../org/jabref/logic/layout/LayoutEntry.java  | 122 +--
 .../layout/LayoutFormatterPreferences.java    |  12 +-
 .../org/jabref/logic/layout/LayoutHelper.java |  53 +-
 .../logic/layout/TextBasedPreviewLayout.java  |  15 +-
 .../layout/format/AuthorFirstFirstCommas.java |   6 +-
 .../layout/format/AuthorFirstLastCommas.java  |   6 +-
 .../jabref/logic/layout/format/Authors.java   |  42 +-
 .../layout/format/CreateBibORDFAuthors.java   |  11 +-
 .../layout/format/CreateDocBook4Authors.java  |   7 +-
 .../layout/format/CreateDocBook4Editors.java  |   7 +-
 .../layout/format/CreateDocBook5Authors.java  |   7 +-
 .../layout/format/CreateDocBook5Editors.java  |   7 +-
 .../logic/layout/format/DateFormatter.java    |   5 +-
 .../jabref/logic/layout/format/Default.java   |   4 +-
 .../layout/format/DocBookAuthorFormatter.java |  21 +-
 .../jabref/logic/layout/format/FileLink.java  |   5 +-
 .../jabref/logic/layout/format/HTMLChars.java |  16 +-
 .../logic/layout/format/HTMLParagraphs.java   |   8 +-
 .../jabref/logic/layout/format/IfPlural.java  |   4 +-
 .../format/LatexToUnicodeFormatter.java       |   8 +-
 .../logic/layout/format/NameFormatter.java    |  26 +-
 .../format/NameFormatterPreferences.java      |   6 +-
 .../layout/format/NotFoundFormatter.java      |   7 +-
 .../jabref/logic/layout/format/RTFChars.java  |  71 +-
 .../format/RemoveLatexCommandsFormatter.java  |  25 +-
 .../ReplaceUnicodeLigaturesFormatter.java     |   8 +-
 .../jabref/logic/layout/format/RisMonth.java  |   4 +-
 .../logic/layout/format/WrapFileLinks.java    |  19 +-
 .../jabref/logic/layout/format/XMLChars.java  |   3 +-
 .../org/jabref/logic/logging/LogMessages.java |   3 +-
 .../jabref/logic/msbib/BibTeXConverter.java   | 104 +-
 .../jabref/logic/msbib/MSBibConverter.java    |  71 +-
 .../org/jabref/logic/msbib/MSBibDatabase.java |  34 +-
 .../org/jabref/logic/msbib/MSBibEntry.java    |  62 +-
 .../org/jabref/logic/msbib/MSBibMapping.java  | 206 +---
 .../org/jabref/logic/msbib/PageNumbers.java   |   8 +-
 .../jabref/logic/net/ProxyPreferences.java    |  10 +-
 .../org/jabref/logic/net/ProxyRegisterer.java |  10 +-
 .../org/jabref/logic/net/URLDownload.java     | 107 +-
 .../jabref/logic/net/ssl/SSLCertificate.java  |  11 +-
 .../logic/net/ssl/TrustStoreManager.java      |  90 +-
 .../openoffice/OpenOfficeFileSearch.java      |  31 +-
 .../openoffice/OpenOfficePreferences.java     |   9 +-
 .../logic/openoffice/action/EditInsert.java   |  10 +-
 .../logic/openoffice/action/EditMerge.java    | 111 +-
 .../logic/openoffice/action/EditSeparate.java |  11 +-
 .../logic/openoffice/action/ExportCited.java  |  13 +-
 .../openoffice/action/ManageCitations.java    |   5 +-
 .../logic/openoffice/action/Update.java       |  18 +-
 .../logic/openoffice/backend/Backend52.java   | 109 +-
 .../logic/openoffice/backend/Codec52.java     |  26 +-
 .../logic/openoffice/backend/GetContext.java  |  10 +-
 .../NamedRangeManagerReferenceMark.java       |  13 +-
 .../backend/NamedRangeReferenceMark.java      | 116 +--
 .../logic/openoffice/frontend/OOFrontend.java | 174 +---
 .../frontend/RangeForOverlapCheck.java        |   7 +-
 .../frontend/UpdateBibliography.java          |  29 +-
 .../frontend/UpdateCitationMarkers.java       |  32 +-
 .../logic/openoffice/style/OOBibStyle.java    | 118 +--
 .../style/OOBibStyleGetCitationMarker.java    | 118 +--
 .../style/OOBibStyleGetNumCitationMarker.java |  56 +-
 .../style/OOFormatBibliography.java           |  55 +-
 .../openoffice/style/OOPreFormatter.java      |  26 +-
 .../logic/openoffice/style/OOProcess.java     |  19 +-
 .../style/OOProcessAuthorYearMarkers.java     |  35 +-
 .../style/OOProcessCitationKeyMarkers.java    |  10 +-
 .../style/OOProcessNumericMarkers.java        |   5 +-
 .../logic/openoffice/style/StyleLoader.java   |  36 +-
 .../logic/pdf/EntryAnnotationImporter.java    |   8 +-
 .../jabref/logic/pdf/FileAnnotationCache.java |  29 +-
 .../logic/pdf/PdfAnnotationImporter.java      |  60 +-
 .../org/jabref/logic/pdf/TextExtractor.java   |  14 +-
 .../pdf/search/indexing/DocumentReader.java   |  71 +-
 .../search/indexing/IndexingTaskManager.java  |  26 +-
 .../logic/pdf/search/indexing/PdfIndexer.java |  44 +-
 .../pdf/search/retrieval/PdfSearcher.java     |  40 +-
 .../logic/preferences/OwnerPreferences.java   |   6 +-
 .../protectedterms/ProtectedTermsList.java    |  10 +-
 .../protectedterms/ProtectedTermsLoader.java  |  46 +-
 .../protectedterms/ProtectedTermsParser.java  |  14 +-
 .../ProtectedTermsPreferences.java            |   6 +-
 .../org/jabref/logic/remote/Protocol.java     |  18 +-
 .../logic/remote/client/RemoteClient.java     |  14 +-
 .../remote/server/RemoteListenerServer.java   |  26 +-
 .../server/RemoteListenerServerManager.java   |  14 +-
 .../server/RemoteListenerServerThread.java    |  10 +-
 .../jabref/logic/search/DatabaseSearcher.java |   4 +-
 .../org/jabref/logic/search/SearchQuery.java  |  22 +-
 .../jabref/logic/shared/DBMSConnection.java   |  11 +-
 .../shared/DBMSConnectionProperties.java      |  39 +-
 .../DBMSConnectionPropertiesBuilder.java      |   4 +-
 .../jabref/logic/shared/DBMSProcessor.java    | 163 +--
 .../jabref/logic/shared/DBMSSynchronizer.java | 104 +-
 .../org/jabref/logic/shared/DBMSType.java     |  21 +-
 .../logic/shared/DatabaseSynchronizer.java    |   3 +-
 .../jabref/logic/shared/MySQLProcessor.java   |  17 +-
 .../jabref/logic/shared/OracleProcessor.java  |  70 +-
 .../logic/shared/PostgreSQLProcessor.java     |  67 +-
 .../exception/OfflineLockException.java       |   5 +-
 .../PostgresSQLNotificationListener.java      |  14 +-
 .../prefs/SharedDatabasePreferences.java      |  50 +-
 .../logic/shared/security/Password.java       |  12 +-
 .../logic/texparser/DefaultLatexParser.java   |  27 +-
 .../texparser/TexBibEntriesResolver.java      |  36 +-
 .../java/org/jabref/logic/util/BuildInfo.java |  32 +-
 .../jabref/logic/util/CoarseChangeFilter.java |   6 +-
 .../jabref/logic/util/DelayTaskThrottler.java |  10 +-
 .../MetadataSerializationConfiguration.java   |   6 +-
 src/main/java/org/jabref/logic/util/OS.java   |  18 +-
 .../jabref/logic/util/StandardFileType.java   |   4 +-
 .../java/org/jabref/logic/util/TestEntry.java |  15 +-
 .../jabref/logic/util/UnknownFileType.java    |   3 +-
 .../org/jabref/logic/util/UpdateField.java    |  29 +-
 .../java/org/jabref/logic/util/Version.java   |  58 +-
 .../org/jabref/logic/util/WebViewStore.java   |   9 +-
 .../logic/util/io/AutoLinkPreferences.java    |  14 +-
 .../jabref/logic/util/io/BackupFileUtil.java  |  13 +-
 .../util/io/CitationKeyBasedFileFinder.java   |  20 +-
 .../logic/util/io/DatabaseFileLookup.java     |   8 +-
 .../org/jabref/logic/util/io/FileFinder.java  |   7 +-
 .../org/jabref/logic/util/io/FileFinders.java |   4 +-
 .../logic/util/io/FileNameUniqueness.java     |  50 +-
 .../org/jabref/logic/util/io/FileUtil.java    |  80 +-
 .../logic/util/io/RegExpBasedFileFinder.java  |  60 +-
 .../org/jabref/logic/util/io/XMLUtil.java     |  13 +-
 .../strings/HTMLUnicodeConversionMaps.java    |  50 +-
 .../util/strings/QuotedStringTokenizer.java   |  10 +-
 .../logic/util/strings/StringManipulator.java |  71 +-
 .../xmp/DocumentInformationExtractor.java     |   4 +-
 .../jabref/logic/xmp/DublinCoreExtractor.java |  67 +-
 .../org/jabref/logic/xmp/XmpPreferences.java  |   3 +-
 .../org/jabref/logic/xmp/XmpUtilReader.java   |  53 +-
 .../org/jabref/logic/xmp/XmpUtilShared.java   |  20 +-
 .../org/jabref/logic/xmp/XmpUtilWriter.java   |  90 +-
 .../ConvertLegacyExplicitGroups.java          |   8 +-
 .../migrations/ConvertMarkingToGroups.java    |  46 +-
 .../CustomEntryTypePreferenceMigration.java   |  29 +-
 .../MergeReviewIntoCommentMigration.java      |  26 +-
 .../migrations/PreferencesMigrations.java     | 249 ++---
 .../SpecialFieldsToSeparateFields.java        |  12 +-
 .../java/org/jabref/model/FieldChange.java    |   7 +-
 src/main/java/org/jabref/model/TreeNode.java  |  14 +-
 .../jabref/model/database/BibDatabase.java    | 115 +--
 .../model/database/BibDatabaseContext.java    |  71 +-
 .../database/BibDatabaseModeDetection.java    |   5 +-
 .../jabref/model/database/BibDatabases.java   |   4 +-
 .../model/database/KeyChangeListener.java     |  18 +-
 .../database/event/EntriesAddedEvent.java     |   5 +-
 .../database/event/EntriesRemovedEvent.java   |   5 +-
 .../java/org/jabref/model/entry/Author.java   |  43 +-
 .../org/jabref/model/entry/AuthorList.java    |  53 +-
 .../java/org/jabref/model/entry/BibEntry.java | 188 +---
 .../org/jabref/model/entry/BibEntryType.java  |  22 +-
 .../model/entry/BibEntryTypeBuilder.java      |  38 +-
 .../model/entry/BibEntryTypesManager.java     |  67 +-
 .../org/jabref/model/entry/BibtexString.java  |  13 +-
 .../jabref/model/entry/CanonicalBibEntry.java |  16 +-
 .../java/org/jabref/model/entry/Date.java     |  80 +-
 .../jabref/model/entry/EntryConverter.java    |   4 +-
 .../org/jabref/model/entry/EntryLinkList.java |  10 +-
 .../java/org/jabref/model/entry/Keyword.java  |  13 +-
 .../org/jabref/model/entry/KeywordList.java   |  39 +-
 .../org/jabref/model/entry/LinkedFile.java    |  12 +-
 .../jabref/model/entry/ParsedEntryLink.java   |   5 +-
 .../model/entry/event/EntriesEvent.java       |   5 +-
 .../entry/event/FieldAddedOrRemovedEvent.java |   5 +-
 .../model/entry/event/FieldChangedEvent.java  |  26 +-
 .../jabref/model/entry/field/AMSField.java    |   7 +-
 .../jabref/model/entry/field/BibField.java    |  12 +-
 .../model/entry/field/BiblatexApaField.java   |   7 +-
 .../entry/field/BiblatexSoftwareField.java    |  11 +-
 .../model/entry/field/FieldFactory.java       |  43 +-
 .../jabref/model/entry/field/OrFields.java    |   4 +-
 .../model/entry/field/SpecialField.java       |   4 +-
 .../model/entry/field/SpecialFieldValue.java  |   8 +-
 .../model/entry/field/StandardField.java      |  14 +-
 .../model/entry/field/UnknownField.java       |  11 +-
 .../jabref/model/entry/identifier/ARK.java    |   4 +-
 .../entry/identifier/ArXivIdentifier.java     |  15 +-
 .../jabref/model/entry/identifier/DOI.java    |  28 +-
 .../jabref/model/entry/identifier/ISBN.java   |  11 +-
 .../jabref/model/entry/identifier/ISSN.java   |   8 +-
 .../model/entry/identifier/IacrEprint.java    |  18 +-
 .../model/entry/identifier/MathSciNetId.java  |  11 +-
 .../BiblatexAPAEntryTypeDefinitions.java      |  31 +-
 .../types/BiblatexEntryTypeDefinitions.java   |  36 +-
 .../BiblatexSoftwareEntryTypeDefinitions.java | 117 ++-
 .../types/BibtexEntryTypeDefinitions.java     |   6 +-
 .../model/entry/types/EntryTypeFactory.java   |  29 +-
 ...tematicLiteratureReviewStudyEntryType.java |   4 +-
 ...ratureReviewStudyEntryTypeDefinitions.java |  16 +-
 .../jabref/model/groups/AllEntriesGroup.java  |   5 +-
 .../jabref/model/groups/AutomaticGroup.java   |   4 +-
 .../model/groups/AutomaticKeywordGroup.java   |  10 +-
 .../model/groups/AutomaticPersonsGroup.java   |  19 +-
 .../jabref/model/groups/ExplicitGroup.java    |  21 +-
 .../jabref/model/groups/GroupTreeNode.java    |  23 +-
 .../jabref/model/groups/LastNameGroup.java    |  13 +-
 .../model/groups/RegexKeywordGroup.java       |  14 +-
 .../org/jabref/model/groups/SearchGroup.java  |  14 +-
 .../org/jabref/model/groups/TexGroup.java     |  27 +-
 .../jabref/model/groups/WordKeywordGroup.java |  41 +-
 .../model/metadata/ContentSelector.java       |   5 +-
 .../org/jabref/model/metadata/MetaData.java   |  69 +-
 .../org/jabref/model/metadata/SaveOrder.java  |  20 +-
 .../metadata/SelfContainedSaveOrder.java      |  23 +-
 .../model/openoffice/CitationEntry.java       |   6 +-
 .../model/openoffice/backend/NamedRange.java  |   6 +-
 .../openoffice/backend/NamedRangeManager.java |   6 +-
 .../model/openoffice/ootext/OOFormat.java     |  13 +-
 .../model/openoffice/ootext/OOTextIntoOO.java | 195 +---
 .../rangesort/FunctionalTextViewCursor.java   |  33 +-
 .../openoffice/rangesort/RangeOverlap.java    |   5 +-
 .../rangesort/RangeOverlapBetween.java        |  36 +-
 .../rangesort/RangeOverlapWithin.java         |  39 +-
 .../model/openoffice/rangesort/RangeSort.java |  23 +-
 .../openoffice/rangesort/RangeSortVisual.java |  27 +-
 .../model/openoffice/style/Citation.java      |  29 +-
 .../model/openoffice/style/CitationGroup.java |  15 +-
 .../openoffice/style/CitationGroups.java      |  37 +-
 .../style/CitationLookupResult.java           |   3 +-
 .../model/openoffice/style/CitedKey.java      |  35 +-
 .../openoffice/style/CompareCitation.java     |   8 +-
 .../openoffice/style/CompareCitedKey.java     |   5 +-
 .../model/openoffice/style/OODataModel.java   |   9 +-
 .../model/openoffice/style/PageInfo.java      |   4 +-
 .../model/openoffice/uno/UnoBookmark.java     |  34 +-
 .../jabref/model/openoffice/uno/UnoCast.java  |   4 +-
 .../model/openoffice/uno/UnoCrossRef.java     |  24 +-
 .../model/openoffice/uno/UnoCursor.java       |   8 +-
 .../model/openoffice/uno/UnoNameAccess.java   |   6 +-
 .../jabref/model/openoffice/uno/UnoNamed.java |  12 +-
 .../model/openoffice/uno/UnoProperties.java   |  31 +-
 .../model/openoffice/uno/UnoRedlines.java     |   7 +-
 .../openoffice/uno/UnoReferenceMark.java      |  43 +-
 .../model/openoffice/uno/UnoSelection.java    |  21 +-
 .../jabref/model/openoffice/uno/UnoStyle.java |  42 +-
 .../model/openoffice/uno/UnoTextDocument.java |  20 +-
 .../model/openoffice/uno/UnoTextRange.java    |  35 +-
 .../model/openoffice/uno/UnoTextSection.java  |  35 +-
 .../jabref/model/openoffice/uno/UnoUndo.java  |   7 +-
 .../uno/UnoUserDefinedProperty.java           |  55 +-
 .../model/openoffice/util/OOListUtil.java     |  10 +-
 .../org/jabref/model/pdf/FileAnnotation.java  |  17 +-
 .../jabref/model/pdf/FileAnnotationType.java  |  12 +-
 .../jabref/model/pdf/search/SearchResult.java |  40 +-
 .../model/schema/DublinCoreSchemaCustom.java  |  18 +-
 .../search/rules/ContainsBasedSearchRule.java |  10 +-
 .../search/rules/FullTextSearchRule.java      |  14 +-
 .../search/rules/GrammarBasedSearchRule.java  |  99 +-
 .../search/rules/RegexBasedSearchRule.java    |   4 +-
 .../model/search/rules/SearchRules.java       |   9 +-
 .../model/strings/LatexToUnicodeAdapter.java  |  18 +-
 .../org/jabref/model/strings/StringUtil.java  | 111 +-
 .../java/org/jabref/model/study/Study.java    |   4 +-
 .../org/jabref/model/study/StudyDatabase.java |  14 +-
 .../org/jabref/model/study/StudyQuery.java    |   4 +-
 .../org/jabref/model/texparser/Citation.java  |  16 +-
 .../LatexBibEntriesResolverResult.java        |   3 +-
 .../model/texparser/LatexParserResult.java    |  14 +-
 .../jabref/model/util/FileUpdateMonitor.java  |   3 +-
 .../java/org/jabref/model/util/ListUtil.java  |  10 +-
 .../org/jabref/model/util/OptionalUtil.java   |  13 +-
 .../org/jabref/model/util/TreeCollector.java  |   8 +-
 .../preferences/CleanupPreferences.java       |  11 +-
 .../jabref/preferences/ExportPreferences.java |   6 +-
 .../ExternalApplicationsPreferences.java      |  17 +-
 .../jabref/preferences/FilePreferences.java   |  36 +-
 .../jabref/preferences/GuiPreferences.java    |  26 +-
 .../jabref/preferences/JabRefPreferences.java | 962 +++++-------------
 .../preferences/LibraryPreferences.java       |  10 +-
 .../jabref/preferences/MrDlibPreferences.java |   3 +-
 .../jabref/preferences/PreferencesFilter.java |  26 +-
 .../preferences/PreferencesService.java       |   4 +-
 .../preferences/PreviewPreferences.java       |  20 +-
 .../PushToApplicationPreferences.java         |   6 +-
 .../jabref/preferences/SearchPreferences.java |   6 +-
 .../preferences/SidePanePreferences.java      |   6 +-
 .../preferences/TelemetryPreferences.java     |   6 +-
 .../preferences/WorkspacePreferences.java     |  11 +-
 .../java/org/jabref/IconsPropertiesTest.java  |  15 +-
 .../architecture/MainArchitectureTest.java    |  45 +-
 .../architecture/TestArchitectureTest.java    |  49 +-
 .../org/jabref/cli/ArgumentProcessorTest.java |  45 +-
 .../org/jabref/cli/AuxCommandLineTest.java    |  13 +-
 .../java/org/jabref/cli/JabRefCLITest.java    |  45 +-
 .../gui/UpdateTimestampListenerTest.java      |   9 +-
 .../AppendPersonNamesStrategyTest.java        |   4 +-
 .../gui/autocompleter/AutoCompleterUtil.java  |   4 +-
 .../BibEntrySuggestionProviderTest.java       |  32 +-
 ...ContentSelectorSuggestionProviderTest.java |  82 +-
 .../DefaultAutoCompleterTest.java             |  52 +-
 .../FieldValueSuggestionProviderTest.java     |  63 +-
 .../PersonNameStringConverterTest.java        |   4 +-
 .../PersonNameSuggestionProviderTest.java     |  77 +-
 .../SuggestionProvidersTest.java              |  39 +-
 .../BackupManagerDiscardedTest.java           |  17 +-
 .../autosaveandbackup/BackupManagerTest.java  |  73 +-
 .../SaveOrderPanelViewModelTest.java          |   8 +-
 .../PdfDocumentViewModelTest.java             |   4 +-
 .../jabref/gui/edit/CopyMoreActionTest.java   | 105 +-
 ...opyOrMoveFieldContentTabViewModelTest.java |  76 +-
 .../EditFieldContentTabViewModelTest.java     |  34 +-
 .../gui/edit/ManageKeywordsViewModelTest.java |  35 +-
 .../gui/edit/RenameFieldViewModelTest.java    |  60 +-
 .../gui/edit/ReplaceStringViewModelTest.java  |  30 +-
 .../gui/entryeditor/CommentsTabTest.java      |  19 +-
 .../jabref/gui/entryeditor/SciteTabTest.java  |   3 +-
 .../entryeditor/SciteTabViewModelTest.java    |   3 +-
 .../jabref/gui/entryeditor/SourceTabTest.java |  16 +-
 .../FileAnnotationViewModelTest.java          |   5 +-
 .../exporter/ExportToClipboardActionTest.java |  51 +-
 .../gui/exporter/SaveDatabaseActionTest.java  |  50 +-
 .../AutoSetFileLinksUtilTest.java             |  14 +-
 .../externalfiles/FileFilterUtilsTest.java    |  50 +-
 .../GitIgnoreFileFilterTest.java              |   6 +-
 .../gui/externalfiles/ImportHandlerTest.java  |  47 +-
 .../UnlinkedFilesCrawlerTest.java             |  25 +-
 .../ExternalFileTypesTest.java                |  33 +-
 .../fieldeditors/LinkedFileViewModelTest.java |  62 +-
 .../LinkedFilesEditorViewModelTest.java       |  19 +-
 .../gui/groups/GroupDialogViewModelTest.java  |  35 +-
 .../gui/groups/GroupNodeViewModelTest.java    |  38 +-
 .../gui/groups/GroupTreeViewModelTest.java    |  16 +-
 .../gui/importer/NewEntryActionTest.java      |  25 +-
 .../fetcher/WebSearchPaneViewModelTest.java   |  74 +-
 .../gui/keyboard/KeyBindingsTabModelTest.java |  69 +-
 .../ConstantsPropertiesViewModelTest.java     |  21 +-
 .../ContentSelectorViewModelTest.java         |   8 +-
 .../maintable/MainTableColumnModelTest.java   |  27 +-
 .../gui/maintable/MainTableDataModelTest.java |  65 +-
 .../jabref/gui/menus/FileHistoryMenuTest.java |  10 +-
 .../mergeentries/DiffHighlightingTest.java    |  10 +-
 .../mergeentries/FieldRowViewModelTest.java   |  98 +-
 .../gui/mergeentries/GroupMergerTest.java     |   6 +-
 .../ThreeWayMergeCellViewModelTest.java       |  11 +-
 .../ThreeWayMergeViewModelTest.java           |  31 +-
 .../journals/AbbreviationViewModelTest.java   |  39 +-
 .../JournalAbbreviationsViewModelTabTest.java | 297 ++----
 .../keybindings/KeyBindingViewModelTest.java  |  15 +-
 .../org/jabref/gui/push/PushToEmacsTest.java  |  16 +-
 .../gui/search/GlobalSearchBarTest.java       |  26 +-
 .../GrammarBasedSearchRuleDescriberTest.java  |  59 +-
 .../gui/search/TextFlowEqualityHelper.java    |  16 +-
 .../gui/sidepane/SidePaneViewModelTest.java   |  37 +-
 .../ManageStudyDefinitionViewModelTest.java   |  32 +-
 .../jabref/gui/theme/ThemeManagerTest.java    | 122 +--
 .../java/org/jabref/gui/theme/ThemeTest.java  |  14 +-
 .../gui/util/FileDialogConfigurationTest.java |  67 +-
 .../gui/util/OpenConsoleActionTest.java       |  13 +-
 .../gui/util/RecursiveTreeItemTest.java       |  23 +-
 .../jabref/gui/util/TooltipTextUtilTest.java  | 118 +--
 .../NumericFieldComparatorTest.java           |   3 +-
 .../http/server/LibrariesResourceTest.java    |   9 +-
 .../org/jabref/http/server/ServerTest.java    |  41 +-
 .../org/jabref/http/server/TestBibFile.java   |   7 +-
 .../jabref/logic/auxparser/AuxParserTest.java | 104 +-
 .../jabref/logic/bibtex/BibEntryAssert.java   |  72 +-
 .../logic/bibtex/BibEntryWriterTest.java      |  83 +-
 .../bibtex/FieldContentFormatterTest.java     |  37 +-
 .../jabref/logic/bibtex/FieldWriterTest.java  |  47 +-
 .../logic/bibtex/FileFieldWriterTest.java     |  31 +-
 .../comparator/BibDatabaseDiffTest.java       |  71 +-
 .../bibtex/comparator/BibStringDiffTest.java  |  68 +-
 .../BibtexStringComparatorTest.java           |  44 +-
 .../comparator/EntryComparatorTest.java       | 141 +--
 .../comparator/FieldComparatorTest.java       | 101 +-
 .../bibtex/comparator/GroupDiffTest.java      |  56 +-
 .../bibtex/comparator/MetaDataDiffTest.java   |  11 +-
 .../bibtex/comparator/PreambleDiffTest.java   |  20 +-
 .../jabref/logic/bst/BstFunctionsTest.java    |  29 +-
 .../logic/bst/BstPreviewLayoutTest.java       |  24 +-
 .../java/org/jabref/logic/bst/BstVMTest.java  |  18 +-
 .../jabref/logic/bst/BstVMVisitorTest.java    |  39 +-
 .../logic/bst/util/BstCaseChangersTest.java   |  45 +-
 .../logic/bst/util/BstNameFormatterTest.java  |  69 +-
 .../logic/bst/util/BstTextPrefixerTest.java   |  10 +-
 .../bst/util/BstWidthCalculatorTest.java      |   5 +-
 .../BracketedPatternTest.java                 | 495 ++-------
 .../CitationKeyGeneratorTest.java             | 660 +++---------
 .../MakeLabelWithDatabaseTest.java            | 209 ++--
 .../MakeLabelWithoutDatabaseTest.java         |  35 +-
 .../CitationStyleGeneratorTest.java           |  87 +-
 .../JabRefItemDataProviderTest.java           |  28 +-
 .../cleanup/BibtexBiblatexRoundtripTest.java  |  10 +-
 .../logic/cleanup/CleanupWorkerTest.java      | 184 +---
 .../cleanup/ConvertToBiblatexCleanupTest.java |  28 +-
 .../cleanup/ConvertToBibtexCleanupTest.java   |  24 +-
 .../jabref/logic/cleanup/DoiCleanupTest.java  |  48 +-
 .../logic/cleanup/DoiDecodeCleanupTest.java   |  34 +-
 .../cleanup/FieldFormatterCleanupTest.java    |  35 +-
 .../cleanup/FieldFormatterCleanupsTest.java   | 420 +++-----
 .../jabref/logic/cleanup/ISSNCleanupTest.java |  10 +-
 .../logic/cleanup/MoveFilesCleanupTest.java   |  43 +-
 .../logic/cleanup/RenamePdfCleanupTest.java   |  56 +-
 .../cleanup/TimeStampToCreationDateTest.java  | 153 +--
 .../TimeStampToModificationDateTest.java      |  54 +-
 .../jabref/logic/cleanup/URLCleanupTest.java  |  94 +-
 .../org/jabref/logic/crawler/CrawlerTest.java |  45 +-
 .../StudyCatalogToFetcherConverterTest.java   |  34 +-
 .../logic/crawler/StudyRepositoryTest.java    | 116 +--
 .../logic/crawler/StudyYamlParserTest.java    |  38 +-
 .../logic/database/DatabaseMergerTest.java    |  99 +-
 .../logic/database/DuplicateCheckTest.java    | 286 +-----
 .../exporter/AtomicFileOutputStreamTest.java  |  28 +-
 .../exporter/BibtexDatabaseWriterTest.java    | 505 ++-------
 .../logic/exporter/CsvExportFormatTest.java   |  23 +-
 .../logic/exporter/DocBook5ExporterTest.java  |  19 +-
 .../logic/exporter/DocbookExporterTest.java   |  11 +-
 .../EmbeddedBibFilePdfExporterTest.java       |  82 +-
 .../logic/exporter/GroupSerializerTest.java   |  69 +-
 .../exporter/HayagrivaYamlExporterTest.java   |  62 +-
 .../logic/exporter/HtmlExportFormatTest.java  |   5 +-
 .../exporter/MSBibExportFormatFilesTest.java  |   8 +-
 .../exporter/MetaDataSerializerTest.java      |  59 +-
 .../exporter/ModsExportFormatFilesTest.java   |  45 +-
 .../logic/exporter/ModsExportFormatTest.java  |  14 +-
 .../OpenOfficeDocumentCreatorTest.java        |  30 +-
 .../logic/exporter/XmpExporterTest.java       |  59 +-
 .../logic/exporter/XmpPdfExporterTest.java    | 118 +--
 .../logic/exporter/YamlExporterTest.java      |  38 +-
 .../jabref/logic/formatter/FormatterTest.java |   7 +-
 .../bibtexfields/AddBracesFormatterTest.java  |   5 +-
 .../bibtexfields/CleanupUrlFormatterTest.java |  15 +-
 .../EscapeAmpersandsFormatterTest.java        |  16 +-
 .../EscapeDollarSignFormatterTest.java        |   8 +-
 .../EscapeUnderscoresFormatterTest.java       |   5 +-
 .../HtmlToLatexFormatterTest.java             |   5 +-
 .../LatexCleanupFormatterTest.java            |  14 +-
 .../NormalizeDateFormatterTest.java           |   5 +-
 .../NormalizeEnDashesFormatterTest.java       |  20 +-
 .../NormalizeNamesFormatterTest.java          |  41 +-
 .../NormalizePagesFormatterTest.java          |   5 +-
 .../OrdinalsToSuperscriptFormatterTest.java   |   5 +-
 .../bibtexfields/RegexFormatterTest.java      |  22 +-
 .../ReplaceWithEscapedDoubleQuotesTest.java   |  10 +-
 .../TrimWhitespaceFormatterTest.java          |   5 +-
 .../UnicodeToLatexFormatterTest.java          |   5 +-
 .../casechanger/CapitalizeFormatterTest.java  |   5 +-
 .../casechanger/LowerCaseFormatterTest.java   |   5 +-
 .../ProtectTermsFormatterTest.java            |   5 +-
 .../SentenceCaseFormatterTest.java            |   5 +-
 .../casechanger/TitleCaseFormatterTest.java   |  10 +-
 .../UnprotectTermsFormatterTest.java          |   5 +-
 .../casechanger/UpperCaseFormatterTest.java   |   5 +-
 .../minifier/MinifyNameListFormatterTest.java |  20 +-
 .../jabref/logic/git/SlrGitHandlerTest.java   |  22 +-
 .../org/jabref/logic/help/HelpFileTest.java   |   6 +-
 .../logic/importer/AuthorListParserTest.java  |  34 +-
 .../logic/importer/BibDatabaseFilesTest.java  |  16 +-
 .../logic/importer/FulltextFetchersTest.java  |  20 +-
 .../jabref/logic/importer/ImportDataTest.java |  15 +-
 .../ImportFormatReaderIntegrationTest.java    |  91 +-
 .../ImportFormatReaderParameterlessTest.java  |  27 +-
 .../jabref/logic/importer/ImporterTest.java   |  35 +-
 .../logic/importer/OpenDatabaseTest.java      |  36 +-
 .../logic/importer/QueryParserTest.java       |  18 +-
 .../logic/importer/WebFetchersTest.java       |  65 +-
 .../fetcher/ACMPortalFetcherTest.java         |  22 +-
 .../logic/importer/fetcher/ACSTest.java       |   6 +-
 .../fetcher/AbstractIsbnFetcherTest.java      |  22 +-
 .../importer/fetcher/ApsFetcherTest.java      |  12 +-
 .../importer/fetcher/ArXivFetcherTest.java    | 318 ++----
 .../fetcher/AstrophysicsDataSystemTest.java   |  99 +-
 .../fetcher/BiodiversityLibraryTest.java      |  61 +-
 .../importer/fetcher/BvbFetcherTest.java      |  23 +-
 .../logic/importer/fetcher/CiteSeerTest.java  |  35 +-
 ...puterScienceBibliographiesFetcherTest.java |  58 +-
 ...mputerScienceBibliographiesParserTest.java |  29 +-
 .../fetcher/CompositeIdFetcherTest.java       |  34 +-
 .../CompositeSearchBasedFetcherTest.java      |  48 +-
 .../logic/importer/fetcher/CrossRefTest.java  |  69 +-
 .../importer/fetcher/DBLPFetcherTest.java     |   4 +-
 .../importer/fetcher/DOABFetcherTest.java     |  38 +-
 .../importer/fetcher/DOAJFetcherTest.java     |  50 +-
 .../logic/importer/fetcher/DiVATest.java      |  20 +-
 .../importer/fetcher/DoiFetcherTest.java      |  60 +-
 .../importer/fetcher/DoiResolutionTest.java   |  20 +-
 .../importer/fetcher/FulltextFetcherTest.java |   8 +-
 .../importer/fetcher/GoogleScholarTest.java   |  12 +-
 .../fetcher/GrobidCitationFetcherTest.java    |  69 +-
 .../importer/fetcher/GvkFetcherTest.java      |  37 +-
 .../logic/importer/fetcher/IEEETest.java      |  57 +-
 .../importer/fetcher/INSPIREFetcherTest.java  |  28 +-
 .../fetcher/IacrEprintFetcherTest.java        | 167 +--
 .../importer/fetcher/IssnFetcherTest.java     |   9 +-
 .../importer/fetcher/JstorFetcherTest.java    |  21 +-
 .../importer/fetcher/LOBIDFetcherTest.java    |  36 +-
 .../fetcher/LibraryOfCongressTest.java        |  24 +-
 .../importer/fetcher/MathSciNetTest.java      |  27 +-
 .../importer/fetcher/MedlineFetcherTest.java  |  22 +-
 .../logic/importer/fetcher/MedraTest.java     |  31 +-
 .../importer/fetcher/MrDLibFetcherTest.java   |  17 +-
 .../fetcher/PagedSearchFetcherTest.java       |   6 +-
 .../importer/fetcher/PicaXmlParserTest.java   |  46 +-
 .../importer/fetcher/ResearchGateTest.java    |  37 +-
 .../importer/fetcher/RfcFetcherTest.java      |  49 +-
 .../fetcher/ScholarArchiveFetcherTest.java    |   8 +-
 .../importer/fetcher/ScienceDirectTest.java   |  12 +-
 .../SearchBasedFetcherCapabilityTest.java     |  31 +-
 .../importer/fetcher/SemanticScholarTest.java |  48 +-
 .../importer/fetcher/SpringerFetcherTest.java |  83 +-
 .../importer/fetcher/SpringerLinkTest.java    |  16 +-
 .../importer/fetcher/TitleFetcherTest.java    |   5 +-
 .../logic/importer/fetcher/ZbMATHTest.java    |  19 +-
 ...oiToBibtexConverterComIsbnFetcherTest.java |  22 +-
 .../isbntobibtex/EbookDeIsbnFetcherTest.java  |  26 +-
 .../isbntobibtex/GVKIsbnFetcherTest.java      |  44 +-
 .../fetcher/isbntobibtex/IsbnFetcherTest.java |  38 +-
 .../OpenLibraryIsbnFetcherTest.java           |  20 +-
 .../CiteSeerQueryTransformerTest.java         |  66 +-
 ...nceBibliographiesQueryTransformerTest.java |  15 +-
 .../DBLPQueryTransformerTest.java             |   9 +-
 .../DefaultQueryTransformerTest.java          |   4 +-
 .../transformers/GVKQueryTransformerTest.java |   6 +-
 .../IEEEQueryTransformerTest.java             |   9 +-
 .../transformers/InfixTransformerTest.java    |  39 +-
 .../JstorQueryTransformerTest.java            |   9 +-
 .../ScholarQueryTransformerTest.java          |   4 +-
 .../SpringerQueryTransformerTest.java         |   9 +-
 .../transformers/SuffixTransformerTest.java   |  43 +-
 ...rRangeByFilteringQueryTransformerTest.java |   3 +-
 .../ZbMathQueryTransformerTest.java           |   9 +-
 .../fileformat/ACMPortalParserTest.java       |  63 +-
 .../BiblioscapeImporterFilesTest.java         |  11 +-
 .../fileformat/BiblioscapeImporterTest.java   |   5 +-
 .../BiblioscapeImporterTypesTest.java         |   6 +-
 .../fileformat/BibtexImporterTest.java        | 142 +--
 .../importer/fileformat/BibtexParserTest.java | 782 ++++----------
 .../importer/fileformat/CffImporterTest.java  | 113 +-
 .../CitaviXmlImporterFilesTest.java           |  17 +-
 .../fileformat/CopacImporterFilesTest.java    |  19 +-
 .../fileformat/CopacImporterTest.java         |   9 +-
 .../fileformat/CustomImporterTest.java        |  17 +-
 .../fileformat/EndnoteImporterTest.java       | 146 +--
 .../EndnoteXmlImporterFilesTest.java          |  14 +-
 .../fileformat/ImporterTestEngine.java        |  34 +-
 .../fileformat/InspecImporterTest.java        |  42 +-
 .../importer/fileformat/IsiImporterTest.java  | 225 +---
 .../fileformat/MarcXmlParserTest.java         |  12 +-
 .../fileformat/MedlineImporterFilesTest.java  |  24 +-
 .../fileformat/MedlineImporterTest.java       |   5 +-
 .../fileformat/MedlinePlainImporterTest.java  | 101 +-
 .../fileformat/ModsImporterFilesTest.java     |  11 +-
 .../fileformat/MrDLibImporterTest.java        |   5 +-
 .../fileformat/MsBibImporterFilesTest.java    |  19 +-
 .../fileformat/MsBibImporterTest.java         |  21 +-
 .../importer/fileformat/OvidImporterTest.java | 114 +--
 .../PdfContentImporterFilesTest.java          |  11 +-
 .../fileformat/PdfContentImporterTest.java    |  37 +-
 .../PdfEmbeddedBibFileImporterTest.java       |  18 +-
 .../fileformat/PdfGrobidImporterTest.java     |  45 +-
 .../PdfMergeMetadataImporterTest.java         |  30 +-
 .../PdfVerbatimBibTextImporterTest.java       |  22 +-
 .../fileformat/PdfXmpImporterTest.java        |  39 +-
 .../fileformat/RISImporterFilesTest.java      |   6 +-
 .../importer/fileformat/RISImporterTest.java  |  13 +-
 .../fileformat/RepecNepImporterTest.java      |  11 +-
 .../fileformat/SilverPlatterImporterTest.java |  22 +-
 .../importer/util/FileFieldParserTest.java    |  73 +-
 .../importer/util/GrobidServiceTest.java      |  36 +-
 .../logic/importer/util/GroupsParserTest.java |  33 +-
 .../logic/importer/util/JsonReaderTest.java   |  16 +-
 .../logic/importer/util/MathMLParserTest.java |   7 +-
 .../importer/util/MetaDataParserTest.java     |   5 +-
 .../importer/util/ShortDOIServiceTest.java    |   8 +-
 .../logic/importer/util/StaxParserTest.java   |   7 +-
 .../integrity/AbbreviationCheckerTest.java    |  11 +-
 .../logic/integrity/AmpersandCheckerTest.java |  38 +-
 .../logic/integrity/BibStringCheckerTest.java |  30 +-
 .../logic/integrity/BracesCorrectorTest.java  |   5 +-
 .../integrity/CitationKeyCheckerTest.java     |   4 +-
 .../CitationKeyDeviationCheckerTest.java      |  27 +-
 .../CitationKeyDuplicationCheckerTest.java    |   6 +-
 .../integrity/DoiDuplicationCheckerTest.java  |  15 +-
 .../integrity/DoiValidityCheckerTest.java     |   9 +-
 .../logic/integrity/EditionCheckerTest.java   |  70 +-
 .../logic/integrity/EntryLinkCheckerTest.java |   5 +-
 .../integrity/HTMLCharacterCheckerTest.java   |  27 +-
 .../integrity/HowPublishedCheckerTest.java    |  10 +-
 .../logic/integrity/ISBNCheckerTest.java      |  10 +-
 .../logic/integrity/ISSNCheckerTest.java      |   5 +-
 .../logic/integrity/IntegrityCheckTest.java   |  92 +-
 .../JournalInAbbreviationListCheckerTest.java |  12 +-
 .../integrity/LatexIntegrityCheckerTest.java  | 163 +--
 .../logic/integrity/MonthCheckerTest.java     |   5 +-
 .../integrity/NoBibTexFieldCheckerTest.java   |   6 +-
 .../logic/integrity/NoteCheckerTest.java      |  10 +-
 .../integrity/PersonNamesCheckerTest.java     |   6 +-
 .../logic/integrity/TitleCheckerTest.java     |  55 +-
 .../logic/integrity/UTF8CheckerTest.java      |  12 +-
 .../logic/integrity/UrlCheckerTest.java       |  10 +-
 .../ValidCitationKeyCheckerTest.java          |  13 +-
 .../logic/integrity/YearCheckerTest.java      |  10 +-
 .../journals/AbbreviationParserTest.java      |  20 +-
 .../logic/journals/AbbreviationTest.java      |  62 +-
 .../journals/AbbreviationWriterTest.java      |   8 +-
 .../logic/journals/AbbreviationsTest.java     |  10 +-
 .../JournalAbbreviationRepositoryTest.java    | 369 ++-----
 .../JournalInformationFetcherTest.java        | 474 +++++----
 .../l10n/JavaLocalizationEntryParser.java     |  25 +-
 .../l10n/JavaLocalizationEntryParserTest.java |  63 +-
 .../org/jabref/logic/l10n/LanguageTest.java   |   5 +-
 .../l10n/LocalizationConsistencyTest.java     |  49 +-
 .../logic/l10n/LocalizationKeyParamsTest.java |  20 +-
 .../logic/l10n/LocalizationKeyTest.java       |  19 +-
 .../jabref/logic/l10n/LocalizationParser.java |  38 +-
 .../jabref/logic/l10n/LocalizationTest.java   |   5 +-
 .../jabref/logic/layout/LayoutEntryTest.java  |  85 +-
 .../jabref/logic/layout/LayoutHelperTest.java |   8 +-
 .../org/jabref/logic/layout/LayoutTest.java   |  34 +-
 .../layout/format/AuthorAbbreviatorTest.java  |   9 +-
 .../AuthorAndToSemicolonReplacerTest.java     |   5 +-
 .../format/AuthorAndsCommaReplacerTest.java   |   5 +-
 .../layout/format/AuthorAndsReplacerTest.java |   5 +-
 .../format/AuthorFirstFirstCommasTest.java    |   4 +-
 .../layout/format/AuthorFirstFirstTest.java   |   4 +-
 .../AuthorFirstLastOxfordCommasTest.java      |   5 +-
 .../layout/format/AuthorLF_FFAbbrTest.java    |   4 +-
 .../logic/layout/format/AuthorLF_FFTest.java  |   5 +-
 .../AuthorLastFirstAbbreviatorTest.java       |  13 +-
 .../format/AuthorLastFirstCommasTest.java     |   5 +-
 .../AuthorLastFirstOxfordCommasTest.java      |   5 +-
 .../layout/format/AuthorLastFirstTest.java    |   5 +-
 .../logic/layout/format/AuthorNatBibTest.java |   5 +-
 .../logic/layout/format/AuthorOrgSciTest.java |  20 +-
 .../logic/layout/format/AuthorsTest.java      |  40 +-
 .../layout/format/CompositeFormatTest.java    |   6 +-
 .../logic/layout/format/DOICheckTest.java     |  15 +-
 .../logic/layout/format/DOIStripTest.java     |  10 +-
 .../layout/format/DateFormatterTest.java      |   6 +-
 .../logic/layout/format/DefaultTest.java      |   6 +-
 .../logic/layout/format/FileLinkTest.java     |  29 +-
 .../logic/layout/format/FirstPageTest.java    |   5 +-
 .../logic/layout/format/HTMLCharsTest.java    |  10 +-
 .../logic/layout/format/LastPageTest.java     |   5 +-
 .../format/LatexToUnicodeFormatterTest.java   |  14 +-
 .../layout/format/MarkdownFormatterTest.java  |   5 +-
 .../layout/format/NameFormatterTest.java      |  20 +-
 .../NoSpaceBetweenAbbreviationsTest.java      |  18 +-
 .../logic/layout/format/RTFCharsTest.java     |  13 +-
 .../layout/format/RemoveBracketsTest.java     |   3 +-
 .../layout/format/RemoveWhitespaceTest.java   |   5 +-
 .../logic/layout/format/ReplaceTest.java      |  10 +-
 .../format/ShortMonthFormatterTest.java       |   5 +-
 .../logic/layout/format/ToLowerCaseTest.java  |   5 +-
 .../logic/layout/format/WrapContentTest.java  |  32 +-
 .../layout/format/WrapFileLinksTest.java      |  32 +-
 .../logic/msbib/MSBibConverterTest.java       |   9 +-
 .../jabref/logic/msbib/MsBibAuthorTest.java   |  24 +-
 .../org/jabref/logic/net/URLDownloadTest.java |  49 +-
 .../org/jabref/logic/net/URLUtilTest.java     |  21 +-
 .../openoffice/style/OOBibStyleTest.java      | 318 +-----
 .../style/OOBibStyleTestHelper.java           |  78 +-
 .../openoffice/style/OOPreFormatterTest.java  |  35 +-
 .../openoffice/style/StyleLoaderTest.java     | 198 +---
 .../pdf/EntryAnnotationImporterTest.java      |  11 +-
 .../logic/pdf/PdfAnnotationImporterTest.java  |  50 +-
 .../search/indexing/DocumentReaderTest.java   |  29 +-
 .../pdf/search/indexing/PdfIndexerTest.java   |  16 +-
 .../pdf/search/retrieval/PdfSearcherTest.java |  21 +-
 .../ProtectedTermsLoaderTest.java             |  35 +-
 .../logic/remote/RemoteCommunicationTest.java |   5 +-
 .../jabref/logic/remote/RemoteSetupTest.java  |  38 +-
 .../jabref/logic/remote/RemoteUtilTest.java   |  10 +-
 .../logic/search/DatabaseSearcherTest.java    |  34 +-
 .../jabref/logic/search/SearchQueryTest.java  |  69 +-
 .../jabref/logic/shared/ConnectorTest.java    |  11 +-
 .../shared/DBMSConnectionPropertiesTest.java  |  54 +-
 .../logic/shared/DBMSConnectionTest.java      |   4 +-
 .../logic/shared/DBMSProcessorTest.java       | 197 +---
 .../logic/shared/DBMSSynchronizerTest.java    |  62 +-
 .../org/jabref/logic/shared/DBMSTypeTest.java |  25 +-
 .../shared/SynchronizationSimulatorTest.java  |  28 +-
 .../org/jabref/logic/shared/TestManager.java  |   7 +-
 .../logic/shared/security/PasswordTest.java   |   6 +-
 .../logic/texparser/DefaultTexParserTest.java | 241 +----
 .../logic/texparser/LatexParserTest.java      | 182 ++--
 .../texparser/TexBibEntriesResolverTest.java  | 185 ++--
 .../org/jabref/logic/util/BuildInfoTest.java  |   4 +-
 .../logic/util/DevelopmentStageTest.java      |  41 +-
 .../logic/util/FileNameCleanerTest.java       |  20 +-
 .../jabref/logic/util/UpdateFieldTest.java    | 125 +--
 .../org/jabref/logic/util/VersionTest.java    |  15 +-
 .../logic/util/io/BackupFileUtilTest.java     |  27 +-
 .../io/CitationKeyBasedFileFinderTest.java    |  53 +-
 .../logic/util/io/FileNameUniquenessTest.java |  15 +-
 .../jabref/logic/util/io/FileUtilTest.java    | 130 +--
 .../util/io/RegExpBasedFileFinderTest.java    |  50 +-
 .../strings/StringLengthComparatorTest.java   |   6 +-
 .../util/strings/StringManipulatorTest.java   | 113 +-
 .../util/strings/StringSimilarityTest.java    |  11 +-
 .../jabref/logic/xmp/XmpUtilReaderTest.java   |  85 +-
 .../jabref/logic/xmp/XmpUtilWriterTest.java   |  48 +-
 .../ConvertLegacyExplicitGroupsTest.java      |  32 +-
 .../ConvertMarkingToGroupsTest.java           |  21 +-
 ...eReviewIntoCommentActionMigrationTest.java |  54 +-
 .../migrations/PreferencesMigrationsTest.java | 173 +---
 .../SpecialFieldsToSeparateFieldsTest.java    |  18 +-
 .../org/jabref/model/FieldChangeTest.java     |  52 +-
 .../java/org/jabref/model/TreeNodeTest.java   | 448 +++-----
 .../database/BibDatabaseContextTest.java      |  22 +-
 .../BibDatabaseModeDetectionTest.java         |  13 +-
 .../model/database/BibDatabaseTest.java       |  80 +-
 .../model/database/KeyChangeListenerTest.java |  35 +-
 .../jabref/model/entry/AuthorListTest.java    | 820 ++++-----------
 .../org/jabref/model/entry/BibEntryTest.java  | 292 +-----
 .../model/entry/BibEntryTypesManagerTest.java | 159 +--
 .../jabref/model/entry/BibtexStringTest.java  |  10 +-
 .../model/entry/CanonicalBibEntryTest.java    |   6 +-
 .../org/jabref/model/entry/CrossrefTest.java  | 161 +--
 .../java/org/jabref/model/entry/DateTest.java |  50 +-
 .../jabref/model/entry/EntryLinkListTest.java |   8 +-
 .../jabref/model/entry/KeywordListTest.java   |  53 +-
 .../org/jabref/model/entry/KeywordTest.java   |   5 +-
 .../org/jabref/model/entry/MonthTest.java     |  10 +-
 .../model/entry/field/FieldFactoryTest.java   |  25 +-
 .../model/entry/field/SpecialFieldTest.java   |   5 +-
 .../entry/identifier/ArXivIdentifierTest.java | 135 +--
 .../model/entry/identifier/DOITest.java       | 315 ++----
 .../entry/identifier/IacrEprintTest.java      |  40 +-
 .../groups/AutomaticKeywordGroupTest.java     |   6 +-
 .../groups/AutomaticPersonsGroupTest.java     |  10 +-
 .../model/groups/ExplicitGroupTest.java       |  24 +-
 .../model/groups/GroupTreeNodeTest.java       | 143 +--
 .../org/jabref/model/groups/TexGroupTest.java |  12 +-
 .../model/groups/WordKeywordGroupTest.java    |  53 +-
 .../model/openoffice/CitationEntryTest.java   |  54 +-
 .../jabref/model/pdf/FileAnnotationTest.java  |   5 +-
 .../rules/ContainsBasedSearchRuleTest.java    |  40 +-
 .../rules/GrammarBasedSearchRuleTest.java     |  29 +-
 .../jabref/model/strings/StringUtilTest.java  | 105 +-
 .../jabref/model/texparser/CitationTest.java  |  23 +-
 .../org/jabref/support/CIServerCondition.java |  15 +-
 .../styletester/StyleTesterMain.java          |   3 +-
 1345 files changed, 13606 insertions(+), 42347 deletions(-)

diff --git a/src/main/java/org/jabref/gui/JabRefDialogService.java b/src/main/java/org/jabref/gui/JabRefDialogService.java
index c91e4a9fe9e..822187c145f 100644
--- a/src/main/java/org/jabref/gui/JabRefDialogService.java
+++ b/src/main/java/org/jabref/gui/JabRefDialogService.java
@@ -65,12 +65,8 @@ public class JabRefDialogService implements DialogService {
     // Snackbar dialog maximum size
     public static final int DIALOG_SIZE_LIMIT = 300;
 
-    private static final Duration TOAST_MESSAGE_DISPLAY_TIME = Duration.millis(
-        3000
-    );
-    private static final Logger LOGGER = LoggerFactory.getLogger(
-        JabRefDialogService.class
-    );
+    private static final Duration TOAST_MESSAGE_DISPLAY_TIME = Duration.millis(3000);
+    private static final Logger LOGGER = LoggerFactory.getLogger(JabRefDialogService.class);
 
     private final Window mainWindow;
 
@@ -78,11 +74,7 @@ public JabRefDialogService(Window mainWindow) {
         this.mainWindow = mainWindow;
     }
 
-    private FXDialog createDialog(
-        AlertType type,
-        String title,
-        String content
-    ) {
+    private FXDialog createDialog(AlertType type, String title, String content) {
         FXDialog alert = new FXDialog(type, title, true);
         alert.setHeaderText(null);
         alert.setContentText(content);
@@ -111,9 +103,7 @@ private FXDialog createDialogWithOptOut(
                 protected Node createDetailsButton() {
                     CheckBox optOut = new CheckBox();
                     optOut.setText(optOutMessage);
-                    optOut.setOnAction(e ->
-                        optOutAction.accept(optOut.isSelected())
-                    );
+                    optOut.setOnAction(e -> optOutAction.accept(optOut.isSelected()));
                     return optOut;
                 }
             }
@@ -139,10 +129,7 @@ public static String shortenDialogMessage(String dialogMessage) {
         return (
             dialogMessage.substring(
                 0,
-                Math.min(
-                    dialogMessage.length(),
-                    JabRefDialogService.DIALOG_SIZE_LIMIT
-                )
+                Math.min(dialogMessage.length(), JabRefDialogService.DIALOG_SIZE_LIMIT)
             ) +
             "..."
         ).trim();
@@ -156,20 +143,11 @@ public <T> Optional<T> showChoiceDialogAndWait(
         T defaultChoice,
         Collection<T> choices
     ) {
-        ChoiceDialog<T> choiceDialog = new ChoiceDialog<>(
-            defaultChoice,
-            choices
-        );
+        ChoiceDialog<T> choiceDialog = new ChoiceDialog<>(defaultChoice, choices);
         ((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);
+        ButtonType okButtonType = new ButtonType(okButtonLabel, ButtonBar.ButtonData.OK_DONE);
+        choiceDialog.getDialogPane().getButtonTypes().setAll(ButtonType.CANCEL, okButtonType);
         choiceDialog.setHeaderText(title);
         choiceDialog.setTitle(title);
         choiceDialog.setContentText(content);
@@ -178,10 +156,7 @@ public <T> Optional<T> showChoiceDialogAndWait(
     }
 
     @Override
-    public Optional<String> showInputDialogAndWait(
-        String title,
-        String content
-    ) {
+    public Optional<String> showInputDialogAndWait(String title, String content) {
         TextInputDialog inputDialog = new TextInputDialog();
         inputDialog.setHeaderText(title);
         inputDialog.setContentText(content);
@@ -230,11 +205,7 @@ public void showErrorDialogAndWait(String message, Throwable exception) {
     }
 
     @Override
-    public void showErrorDialogAndWait(
-        String title,
-        String content,
-        Throwable exception
-    ) {
+    public void showErrorDialogAndWait(String title, String content, Throwable exception) {
         ExceptionDialog exceptionDialog = new ExceptionDialog(exception);
         exceptionDialog.setHeaderText(title);
         exceptionDialog.setContentText(content);
@@ -255,10 +226,7 @@ public void showErrorDialogAndWait(String message) {
     @Override
     public boolean showConfirmationDialogAndWait(String title, String content) {
         FXDialog alert = createDialog(AlertType.CONFIRMATION, title, content);
-        return alert
-            .showAndWait()
-            .filter(buttonType -> buttonType == ButtonType.OK)
-            .isPresent();
+        return alert.showAndWait().filter(buttonType -> buttonType == ButtonType.OK).isPresent();
     }
 
     @Override
@@ -268,15 +236,9 @@ public boolean showConfirmationDialogAndWait(
         String okButtonLabel
     ) {
         FXDialog alert = createDialog(AlertType.CONFIRMATION, title, content);
-        ButtonType okButtonType = new ButtonType(
-            okButtonLabel,
-            ButtonBar.ButtonData.OK_DONE
-        );
+        ButtonType okButtonType = new ButtonType(okButtonLabel, ButtonBar.ButtonData.OK_DONE);
         alert.getButtonTypes().setAll(ButtonType.CANCEL, okButtonType);
-        return alert
-            .showAndWait()
-            .filter(buttonType -> buttonType == okButtonType)
-            .isPresent();
+        return alert.showAndWait().filter(buttonType -> buttonType == okButtonType).isPresent();
     }
 
     @Override
@@ -287,19 +249,10 @@ public boolean showConfirmationDialogAndWait(
         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
-        );
+        ButtonType okButtonType = new ButtonType(okButtonLabel, ButtonBar.ButtonData.OK_DONE);
+        ButtonType cancelButtonType = new ButtonType(cancelButtonLabel, ButtonBar.ButtonData.NO);
         alert.getButtonTypes().setAll(okButtonType, cancelButtonType);
-        return alert
-            .showAndWait()
-            .filter(buttonType -> buttonType == okButtonType)
-            .isPresent();
+        return alert.showAndWait().filter(buttonType -> buttonType == okButtonType).isPresent();
     }
 
     @Override
@@ -317,10 +270,7 @@ public boolean showConfirmationDialogWithOptOutAndWait(
             optOutAction
         );
         alert.getButtonTypes().setAll(ButtonType.YES, ButtonType.NO);
-        return alert
-            .showAndWait()
-            .filter(buttonType -> buttonType == ButtonType.YES)
-            .isPresent();
+        return alert.showAndWait().filter(buttonType -> buttonType == ButtonType.YES).isPresent();
     }
 
     @Override
@@ -339,19 +289,10 @@ public boolean showConfirmationDialogWithOptOutAndWait(
             optOutMessage,
             optOutAction
         );
-        ButtonType okButtonType = new ButtonType(
-            okButtonLabel,
-            ButtonBar.ButtonData.YES
-        );
-        ButtonType cancelButtonType = new ButtonType(
-            cancelButtonLabel,
-            ButtonBar.ButtonData.NO
-        );
+        ButtonType okButtonType = new ButtonType(okButtonLabel, ButtonBar.ButtonData.YES);
+        ButtonType cancelButtonType = new ButtonType(cancelButtonLabel, ButtonBar.ButtonData.NO);
         alert.getButtonTypes().setAll(okButtonType, cancelButtonType);
-        return alert
-            .showAndWait()
-            .filter(buttonType -> buttonType == okButtonType)
-            .isPresent();
+        return alert.showAndWait().filter(buttonType -> buttonType == okButtonType).isPresent();
     }
 
     @Override
@@ -382,9 +323,7 @@ public Optional<ButtonType> showCustomDialogAndWait(
     }
 
     @Override
-    public <R> Optional<R> showCustomDialogAndWait(
-        javafx.scene.control.Dialog<R> dialog
-    ) {
+    public <R> Optional<R> showCustomDialogAndWait(javafx.scene.control.Dialog<R> dialog) {
         if (dialog.getOwner() == null) {
             dialog.initOwner(mainWindow);
         }
@@ -392,13 +331,8 @@ public <R> Optional<R> showCustomDialogAndWait(
     }
 
     @Override
-    public Optional<String> showPasswordDialogAndWait(
-        String title,
-        String header,
-        String content
-    ) {
-        javafx.scene.control.Dialog<String> dialog =
-            new javafx.scene.control.Dialog<>();
+    public Optional<String> showPasswordDialogAndWait(String title, String header, String content) {
+        javafx.scene.control.Dialog<String> dialog = new javafx.scene.control.Dialog<>();
         dialog.setTitle(title);
         dialog.setHeaderText(header);
 
@@ -410,10 +344,7 @@ public Optional<String> showPasswordDialogAndWait(
         dialog.setTitle(title);
         dialog.getDialogPane().setContent(box);
 
-        dialog
-            .getDialogPane()
-            .getButtonTypes()
-            .addAll(ButtonType.CANCEL, ButtonType.OK);
+        dialog.getDialogPane().getButtonTypes().addAll(ButtonType.CANCEL, ButtonType.OK);
         dialog.setResultConverter(dialogButton -> {
             if (dialogButton == ButtonType.OK) {
                 return passwordField.getText();
@@ -424,27 +355,18 @@ public Optional<String> showPasswordDialogAndWait(
     }
 
     @Override
-    public <V> void showProgressDialog(
-        String title,
-        String content,
-        Task<V> task
-    ) {
+    public <V> void showProgressDialog(String title, String content, Task<V> task) {
         ProgressDialog progressDialog = new ProgressDialog(task);
         progressDialog.setHeaderText(null);
         progressDialog.setTitle(title);
         progressDialog.setContentText(content);
         progressDialog.setGraphic(null);
-        ((Stage) progressDialog
-                .getDialogPane()
-                .getScene()
-                .getWindow()).getIcons()
+        ((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
-        );
+        Button cancelButton = (Button) dialogPane.lookupButton(ButtonType.CANCEL);
         cancelButton.setOnAction(evt -> {
             task.cancel();
             progressDialog.close();
@@ -460,10 +382,7 @@ public <V> Optional<ButtonType> showBackgroundProgressDialogAndWait(
         StateManager stateManager
     ) {
         TaskProgressView<Task<?>> taskProgressView = new TaskProgressView<>();
-        EasyBind.bindContent(
-            taskProgressView.getTasks(),
-            stateManager.getBackgroundTasks()
-        );
+        EasyBind.bindContent(taskProgressView.getTasks(), stateManager.getBackgroundTasks());
         taskProgressView.setRetainTasks(false);
         taskProgressView.setGraphicFactory(BackgroundTask::getIcon);
 
@@ -512,9 +431,7 @@ public void notify(String message) {
                         // TODO: Change to a notification overview instead of event log when that is available. The event log is not that user friendly (different purpose).
                         .text(
                             "(" +
-                            Localization.lang(
-                                "Check the event log to see all notifications"
-                            ) +
+                            Localization.lang("Check the event log to see all notifications") +
                             ")" +
                             "\n\n" +
                             message
@@ -530,9 +447,7 @@ public void notify(String message) {
     }
 
     @Override
-    public Optional<Path> showFileSaveDialog(
-        FileDialogConfiguration fileDialogConfiguration
-    ) {
+    public Optional<Path> showFileSaveDialog(FileDialogConfiguration fileDialogConfiguration) {
         FileChooser chooser = getConfiguredFileChooser(fileDialogConfiguration);
         File file = chooser.showSaveDialog(mainWindow);
         Optional
@@ -542,9 +457,7 @@ public Optional<Path> showFileSaveDialog(
     }
 
     @Override
-    public Optional<Path> showFileOpenDialog(
-        FileDialogConfiguration fileDialogConfiguration
-    ) {
+    public Optional<Path> showFileOpenDialog(FileDialogConfiguration fileDialogConfiguration) {
         FileChooser chooser = getConfiguredFileChooser(fileDialogConfiguration);
         File file = chooser.showOpenDialog(mainWindow);
         Optional
@@ -557,9 +470,7 @@ public Optional<Path> showFileOpenDialog(
     public Optional<Path> showDirectorySelectionDialog(
         DirectoryDialogConfiguration directoryDialogConfiguration
     ) {
-        DirectoryChooser chooser = getConfiguredDirectoryChooser(
-            directoryDialogConfiguration
-        );
+        DirectoryChooser chooser = getConfiguredDirectoryChooser(directoryDialogConfiguration);
         File file = chooser.showDialog(mainWindow);
         return Optional.ofNullable(file).map(File::toPath);
     }
@@ -586,19 +497,11 @@ private DirectoryChooser getConfiguredDirectoryChooser(
         return chooser;
     }
 
-    private FileChooser getConfiguredFileChooser(
-        FileDialogConfiguration fileDialogConfiguration
-    ) {
+    private FileChooser getConfiguredFileChooser(FileDialogConfiguration fileDialogConfiguration) {
         FileChooser chooser = new FileChooser();
-        chooser
-            .getExtensionFilters()
-            .addAll(fileDialogConfiguration.getExtensionFilters());
-        chooser.setSelectedExtensionFilter(
-            fileDialogConfiguration.getDefaultExtension()
-        );
-        chooser.setInitialFileName(
-            fileDialogConfiguration.getInitialFileName()
-        );
+        chooser.getExtensionFilters().addAll(fileDialogConfiguration.getExtensionFilters());
+        chooser.setSelectedExtensionFilter(fileDialogConfiguration.getDefaultExtension());
+        chooser.setInitialFileName(fileDialogConfiguration.getInitialFileName());
         fileDialogConfiguration
             .getInitialDirectory()
             .map(Path::toFile)
@@ -612,20 +515,11 @@ public boolean showPrintDialog(PrinterJob job) {
     }
 
     @Override
-    public Optional<Path> showFileOpenFromArchiveDialog(Path archivePath)
-        throws IOException {
-        try (
-            FileSystem zipFile = FileSystems.newFileSystem(
-                archivePath,
-                (ClassLoader) null
-            )
-        ) {
+    public Optional<Path> showFileOpenFromArchiveDialog(Path archivePath) throws IOException {
+        try (FileSystem zipFile = FileSystems.newFileSystem(archivePath, (ClassLoader) null)) {
             return new ZipFileChooser(zipFile).showAndWait();
         } catch (NoClassDefFoundError exc) {
-            throw new IOException(
-                "Could not instantiate ZIP-archive reader.",
-                exc
-            );
+            throw new IOException("Could not instantiate ZIP-archive reader.", exc);
         }
     }
 
diff --git a/src/main/java/org/jabref/gui/JabRefExecutorService.java b/src/main/java/org/jabref/gui/JabRefExecutorService.java
index 95471278642..1f32ddf26bd 100644
--- a/src/main/java/org/jabref/gui/JabRefExecutorService.java
+++ b/src/main/java/org/jabref/gui/JabRefExecutorService.java
@@ -20,28 +20,23 @@
  */
 public class JabRefExecutorService {
 
-    public static final JabRefExecutorService INSTANCE =
-        new JabRefExecutorService();
-
-    private static final Logger LOGGER = LoggerFactory.getLogger(
-        JabRefExecutorService.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;
-        });
+    public static final JabRefExecutorService INSTANCE = new JabRefExecutorService();
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(JabRefExecutorService.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 Timer timer = new Timer("timer", true);
 
@@ -107,13 +102,8 @@ public <T> List<Future<T>> executeAll(
         }
     }
 
-    public void executeInterruptableTask(
-        final Runnable runnable,
-        String taskName
-    ) {
-        this.lowPriorityExecutorService.execute(
-                new NamedRunnable(taskName, runnable)
-            );
+    public void executeInterruptableTask(final Runnable runnable, String taskName) {
+        this.lowPriorityExecutorService.execute(new NamedRunnable(taskName, runnable));
     }
 
     public void executeInterruptableTaskAndWait(Runnable runnable) {
@@ -205,10 +195,7 @@ public static void gracefullyShutdown(ExecutorService executorService) {
                         executorService.toString()
                     );
                 } else {
-                    LOGGER.error(
-                        "{} did not terminate",
-                        executorService.toString()
-                    );
+                    LOGGER.error("{} did not terminate", executorService.toString());
                 }
             }
         } catch (InterruptedException ie) {
diff --git a/src/main/java/org/jabref/gui/JabRefFrame.java b/src/main/java/org/jabref/gui/JabRefFrame.java
index 64ebf9f6f94..56a37ac26c7 100644
--- a/src/main/java/org/jabref/gui/JabRefFrame.java
+++ b/src/main/java/org/jabref/gui/JabRefFrame.java
@@ -88,9 +88,7 @@ public class JabRefFrame extends BorderPane implements LibraryTabContainer {
 
     public static final String FRAME_TITLE = "JabRef";
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(
-        JabRefFrame.class
-    );
+    private static final Logger LOGGER = LoggerFactory.getLogger(JabRefFrame.class);
 
     private final SplitPane splitPane = new SplitPane();
     private final PreferencesService prefs = Globals.prefs;
@@ -123,21 +121,10 @@ public JabRefFrame(Stage mainStage) {
         this.fileUpdateMonitor = Globals.getFileUpdateMonitor();
         this.entryTypesManager = Globals.entryTypesManager;
         this.globalSearchBar =
-            new GlobalSearchBar(
-                this,
-                stateManager,
-                prefs,
-                undoManager,
-                dialogService
-            );
+            new GlobalSearchBar(this, stateManager, prefs, undoManager, dialogService);
         this.taskExecutor = Globals.TASK_EXECUTOR;
         this.pushToApplicationCommand =
-            new PushToApplicationCommand(
-                stateManager,
-                dialogService,
-                prefs,
-                taskExecutor
-            );
+            new PushToApplicationCommand(stateManager, dialogService, prefs, taskExecutor);
         this.fileHistory =
             new FileHistoryMenu(
                 prefs.getGuiPreferences().getFileHistory(),
@@ -166,9 +153,7 @@ private void initDragAndDrop() {
                 // Add drag and drop listeners to JabRefFrame
                 this.getScene()
                     .setOnDragOver(event -> {
-                        if (
-                            DragAndDropHelper.hasBibFiles(event.getDragboard())
-                        ) {
+                        if (DragAndDropHelper.hasBibFiles(event.getDragboard())) {
                             event.acceptTransferModes(TransferMode.ANY);
                             if (!tabbedPane.getTabs().contains(dndIndicator)) {
                                 tabbedPane.getTabs().add(dndIndicator);
@@ -178,11 +163,7 @@ private void initDragAndDrop() {
                             tabbedPane.getTabs().remove(dndIndicator);
                         }
                         // Accept drag entries from MainTable
-                        if (
-                            event
-                                .getDragboard()
-                                .hasContent(DragAndDropDataFormats.ENTRIES)
-                        ) {
+                        if (event.getDragboard().hasContent(DragAndDropDataFormats.ENTRIES)) {
                             event.acceptTransferModes(TransferMode.COPY);
                             event.consume();
                         }
@@ -196,157 +177,107 @@ private void initDragAndDrop() {
                             .lookupAll(".tab")
                             .forEach(destinationTabNode -> {
                                 destinationTabNode.setOnDragOver(tabDragEvent -> {
-                                        if (
-                                            DragAndDropHelper.hasBibFiles(
-                                                tabDragEvent.getDragboard()
-                                            ) ||
-                                            DragAndDropHelper.hasGroups(
-                                                tabDragEvent.getDragboard()
-                                            )
-                                        ) {
-                                            tabDragEvent.acceptTransferModes(
-                                                TransferMode.ANY
-                                            );
-                                            if (
-                                                !tabbedPane
-                                                    .getTabs()
-                                                    .contains(dndIndicator)
-                                            ) {
-                                                tabbedPane
-                                                    .getTabs()
-                                                    .add(dndIndicator);
-                                            }
-                                            event.consume();
-                                        } else {
-                                            tabbedPane
-                                                .getTabs()
-                                                .remove(dndIndicator);
+                                    if (
+                                        DragAndDropHelper.hasBibFiles(
+                                            tabDragEvent.getDragboard()
+                                        ) ||
+                                        DragAndDropHelper.hasGroups(tabDragEvent.getDragboard())
+                                    ) {
+                                        tabDragEvent.acceptTransferModes(TransferMode.ANY);
+                                        if (!tabbedPane.getTabs().contains(dndIndicator)) {
+                                            tabbedPane.getTabs().add(dndIndicator);
                                         }
+                                        event.consume();
+                                    } else {
+                                        tabbedPane.getTabs().remove(dndIndicator);
+                                    }
 
-                                        if (
-                                            tabDragEvent
-                                                .getDragboard()
-                                                .hasContent(
-                                                    DragAndDropDataFormats.ENTRIES
-                                                )
-                                        ) {
-                                            tabDragEvent.acceptTransferModes(
-                                                TransferMode.COPY
-                                            );
-                                            tabDragEvent.consume();
-                                        }
+                                    if (
+                                        tabDragEvent
+                                            .getDragboard()
+                                            .hasContent(DragAndDropDataFormats.ENTRIES)
+                                    ) {
+                                        tabDragEvent.acceptTransferModes(TransferMode.COPY);
+                                        tabDragEvent.consume();
                                     }
-                                );
+                                });
                                 destinationTabNode.setOnDragExited(event1 ->
                                     tabbedPane.getTabs().remove(dndIndicator)
                                 );
                                 destinationTabNode.setOnDragDropped(tabDragEvent -> {
-                                        Dragboard dragboard =
-                                            tabDragEvent.getDragboard();
-
-                                        if (
-                                            DragAndDropHelper.hasBibFiles(
-                                                dragboard
-                                            )
-                                        ) {
-                                            tabbedPane
-                                                .getTabs()
-                                                .remove(dndIndicator);
-                                            List<Path> bibFiles =
-                                                DragAndDropHelper.getBibFiles(
-                                                    dragboard
-                                                );
-                                            OpenDatabaseAction openDatabaseAction =
-                                                this.getOpenDatabaseAction();
-                                            openDatabaseAction.openFiles(
-                                                bibFiles
-                                            );
-                                            tabDragEvent.setDropCompleted(true);
-                                            tabDragEvent.consume();
-                                        } else {
-                                            for (Tab libraryTab : tabbedPane.getTabs()) {
-                                                if (
-                                                    libraryTab
-                                                        .getId()
-                                                        .equals(
-                                                            destinationTabNode.getId()
-                                                        ) &&
-                                                    !tabbedPane
-                                                        .getSelectionModel()
-                                                        .getSelectedItem()
-                                                        .equals(libraryTab)
-                                                ) {
-                                                    LibraryTab destinationLibraryTab =
-                                                        (LibraryTab) libraryTab;
-                                                    if (
-                                                        DragAndDropHelper.hasGroups(
-                                                            dragboard
-                                                        )
-                                                    ) {
-                                                        List<
-                                                            String
-                                                        > groupPathToSources =
-                                                            DragAndDropHelper.getGroups(
-                                                                dragboard
-                                                            );
-
-                                                        copyRootNode(
-                                                            destinationLibraryTab
-                                                        );
-
-                                                        GroupTreeNode destinationLibraryGroupRoot =
-                                                            destinationLibraryTab
+                                    Dragboard dragboard = tabDragEvent.getDragboard();
+
+                                    if (DragAndDropHelper.hasBibFiles(dragboard)) {
+                                        tabbedPane.getTabs().remove(dndIndicator);
+                                        List<Path> bibFiles = DragAndDropHelper.getBibFiles(
+                                            dragboard
+                                        );
+                                        OpenDatabaseAction openDatabaseAction =
+                                            this.getOpenDatabaseAction();
+                                        openDatabaseAction.openFiles(bibFiles);
+                                        tabDragEvent.setDropCompleted(true);
+                                        tabDragEvent.consume();
+                                    } else {
+                                        for (Tab libraryTab : tabbedPane.getTabs()) {
+                                            if (
+                                                libraryTab
+                                                    .getId()
+                                                    .equals(destinationTabNode.getId()) &&
+                                                !tabbedPane
+                                                    .getSelectionModel()
+                                                    .getSelectedItem()
+                                                    .equals(libraryTab)
+                                            ) {
+                                                LibraryTab destinationLibraryTab =
+                                                    (LibraryTab) libraryTab;
+                                                if (DragAndDropHelper.hasGroups(dragboard)) {
+                                                    List<String> groupPathToSources =
+                                                        DragAndDropHelper.getGroups(dragboard);
+
+                                                    copyRootNode(destinationLibraryTab);
+
+                                                    GroupTreeNode destinationLibraryGroupRoot =
+                                                        destinationLibraryTab
+                                                            .getBibDatabaseContext()
+                                                            .getMetaData()
+                                                            .getGroups()
+                                                            .get();
+
+                                                    for (String pathToSource : groupPathToSources) {
+                                                        GroupTreeNode groupTreeNodeToCopy =
+                                                            getCurrentLibraryTab()
                                                                 .getBibDatabaseContext()
                                                                 .getMetaData()
                                                                 .getGroups()
+                                                                .get()
+                                                                .getChildByPath(pathToSource)
                                                                 .get();
-
-                                                        for (String pathToSource : groupPathToSources) {
-                                                            GroupTreeNode groupTreeNodeToCopy =
-                                                                getCurrentLibraryTab()
-                                                                    .getBibDatabaseContext()
-                                                                    .getMetaData()
-                                                                    .getGroups()
-                                                                    .get()
-                                                                    .getChildByPath(
-                                                                        pathToSource
-                                                                    )
-                                                                    .get();
-                                                            copyGroupTreeNode(
-                                                                (LibraryTab) libraryTab,
-                                                                destinationLibraryGroupRoot,
-                                                                groupTreeNodeToCopy
-                                                            );
-                                                        }
-                                                        return;
+                                                        copyGroupTreeNode(
+                                                            (LibraryTab) libraryTab,
+                                                            destinationLibraryGroupRoot,
+                                                            groupTreeNodeToCopy
+                                                        );
                                                     }
-                                                    destinationLibraryTab.dropEntry(
-                                                        stateManager
-                                                            .getLocalDragboard()
-                                                            .getBibEntries()
-                                                    );
+                                                    return;
                                                 }
+                                                destinationLibraryTab.dropEntry(
+                                                    stateManager.getLocalDragboard().getBibEntries()
+                                                );
                                             }
-                                            tabDragEvent.consume();
                                         }
+                                        tabDragEvent.consume();
                                     }
-                                );
+                                });
                             });
                         event.consume();
                     });
 
-                this.getScene()
-                    .setOnDragExited(event ->
-                        tabbedPane.getTabs().remove(dndIndicator)
-                    );
+                this.getScene().setOnDragExited(event -> tabbedPane.getTabs().remove(dndIndicator));
                 this.getScene()
                     .setOnDragDropped(event -> {
                         tabbedPane.getTabs().remove(dndIndicator);
-                        List<Path> bibFiles = DragAndDropHelper.getBibFiles(
-                            event.getDragboard()
-                        );
-                        OpenDatabaseAction openDatabaseAction =
-                            this.getOpenDatabaseAction();
+                        List<Path> bibFiles = DragAndDropHelper.getBibFiles(event.getDragboard());
+                        OpenDatabaseAction openDatabaseAction = this.getOpenDatabaseAction();
                         openDatabaseAction.openFiles(bibFiles);
                         event.setDropCompleted(true);
                         event.consume();
@@ -359,21 +290,15 @@ private void initKeyBindings() {
         addEventFilter(
             KeyEvent.KEY_PRESSED,
             event -> {
-                Optional<KeyBinding> keyBinding = Globals
-                    .getKeyPrefs()
-                    .mapToKeyBinding(event);
+                Optional<KeyBinding> keyBinding = Globals.getKeyPrefs().mapToKeyBinding(event);
                 if (keyBinding.isPresent()) {
                     switch (keyBinding.get()) {
                         case FOCUS_ENTRY_TABLE:
-                            getCurrentLibraryTab()
-                                .getMainTable()
-                                .requestFocus();
+                            getCurrentLibraryTab().getMainTable().requestFocus();
                             event.consume();
                             break;
                         case FOCUS_GROUP_LIST:
-                            sidePane
-                                .getSidePaneComponent(SidePaneType.GROUPS)
-                                .requestFocus();
+                            sidePane.getSidePaneComponent(SidePaneType.GROUPS).requestFocus();
                             event.consume();
                             break;
                         case NEXT_LIBRARY:
@@ -481,13 +406,8 @@ private void initKeyBindings() {
                             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))
+                                    !(stateManager.getFocusOwner().isPresent() &&
+                                        (stateManager.getFocusOwner().get() instanceof CodeArea))
                                 ) {
                                     event.consume();
                                     break;
@@ -519,8 +439,7 @@ public void run() {
     }
 
     private void showTrackingNotification() {
-        TelemetryPreferences telemetryPreferences =
-            prefs.getTelemetryPreferences();
+        TelemetryPreferences telemetryPreferences = prefs.getTelemetryPreferences();
         boolean shouldCollect = telemetryPreferences.shouldCollectTelemetry();
 
         if (!telemetryPreferences.shouldCollectTelemetry()) {
@@ -551,12 +470,7 @@ public void openAction(String filePath) {
      * The MacAdapter calls this method when "About" is selected from the application menu.
      */
     public void about() {
-        new HelpAction(
-            HelpFile.CONTENTS,
-            dialogService,
-            prefs.getFilePreferences()
-        )
-            .execute();
+        new HelpAction(HelpFile.CONTENTS, dialogService, prefs.getFilePreferences()).execute();
     }
 
     /**
@@ -603,21 +517,13 @@ public boolean quit() {
         It is important to wait for unfinished background tasks before checking if a save-operation is needed, because
         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
-                );
-            if (
-                !(shouldClose.isPresent() &&
-                    (shouldClose.get() == ButtonType.YES))
-            ) {
+        if (stateManager.getAnyTasksThatWillNotBeRecoveredRunning().getValue()) {
+            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;
             }
         }
@@ -626,12 +532,8 @@ public boolean quit() {
         List<String> filenames = new ArrayList<>();
         for (int i = 0; i < tabbedPane.getTabs().size(); i++) {
             LibraryTab libraryTab = getLibraryTabAt(i);
-            final BibDatabaseContext context =
-                libraryTab.getBibDatabaseContext();
-            if (
-                libraryTab.isModified() &&
-                (context.getLocation() == DatabaseLocation.LOCAL)
-            ) {
+            final BibDatabaseContext context = libraryTab.getBibDatabaseContext();
+            if (libraryTab.isModified() && (context.getLocation() == DatabaseLocation.LOCAL)) {
                 tabbedPane.getSelectionModel().select(i);
                 if (!confirmClose(libraryTab)) {
                     return false;
@@ -654,8 +556,9 @@ public boolean quit() {
                 .ifPresent(filenames::add);
         }
 
-        WaitForSaveFinishedDialog waitForSaveFinishedDialog =
-            new WaitForSaveFinishedDialog(dialogService);
+        WaitForSaveFinishedDialog waitForSaveFinishedDialog = new WaitForSaveFinishedDialog(
+            dialogService
+        );
         waitForSaveFinishedDialog.showAndWait(getLibraryTabs());
 
         // We call saveWindow state here again because under Mac the windowClose listener on the stage isn't triggered when using cmd + q
@@ -743,9 +646,7 @@ private void initLayout() {
         splitPane.getItems().addAll(tabbedPane);
         SplitPane.setResizableWithParent(sidePane, false);
 
-        sidePane
-            .getChildren()
-            .addListener((InvalidationListener) c -> updateSidePane());
+        sidePane.getChildren().addListener((InvalidationListener) c -> updateSidePane());
         updateSidePane();
 
         // We need to wait with setting the divider since it gets reset a few times during the initial set-up
@@ -785,16 +686,12 @@ private void updateSidePane() {
     private void setDividerPosition() {
         if (mainStage.isShowing() && !sidePane.getChildren().isEmpty()) {
             splitPane.setDividerPositions(
-                prefs.getGuiPreferences().getSidePaneWidth() /
-                splitPane.getWidth()
+                prefs.getGuiPreferences().getSidePaneWidth() / splitPane.getWidth()
             );
             dividerSubscription =
                 EasyBind.subscribe(
                     sidePane.widthProperty(),
-                    width ->
-                        prefs
-                            .getGuiPreferences()
-                            .setSidePaneWidth(width.doubleValue())
+                    width -> prefs.getGuiPreferences().setSidePaneWidth(width.doubleValue())
                 );
         }
     }
@@ -849,17 +746,12 @@ public void init() {
         initDragAndDrop();
 
         // Bind global state
-        FilteredList<Tab> filteredTabs = new FilteredList<>(
-            tabbedPane.getTabs()
-        );
+        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()
-            );
+            EasyBind.map(filteredTabs, tab -> ((LibraryTab) tab).getBibDatabaseContext());
         EasyBind.bindContent(stateManager.getOpenDatabases(), openDatabaseList);
 
         // the binding for stateManager.activeDatabaseProperty() is at org.jabref.gui.LibraryTab.onDatabaseLoadingSucceed
@@ -884,21 +776,14 @@ public void init() {
         Platform.runLater(() ->
             stateManager
                 .focusOwnerProperty()
-                .bind(
-                    EasyBind.map(
-                        mainStage.getScene().focusOwnerProperty(),
-                        Optional::ofNullable
-                    )
-                )
+                .bind(EasyBind.map(mainStage.getScene().focusOwnerProperty(), Optional::ofNullable))
         );
 
         EasyBind.subscribe(
             tabbedPane.getSelectionModel().selectedItemProperty(),
             selectedTab -> {
                 if (selectedTab instanceof LibraryTab libraryTab) {
-                    stateManager.setActiveDatabase(
-                        libraryTab.getBibDatabaseContext()
-                    );
+                    stateManager.setActiveDatabase(libraryTab.getBibDatabaseContext());
                 } else if (selectedTab == null) {
                     // All databases are closed
                     stateManager.setActiveDatabase(null);
@@ -922,9 +807,7 @@ public void init() {
                 }
 
                 // Poor-mans binding to global state
-                stateManager.setSelectedEntries(
-                    libraryTab.getSelectedEntries()
-                );
+                stateManager.setSelectedEntries(libraryTab.getSelectedEntries());
 
                 // Update active search query when switching between databases
                 if (
@@ -950,10 +833,7 @@ public void init() {
 
                 // Set window title - copy tab title
                 StringBinding windowTitle = Bindings.createStringBinding(
-                    () ->
-                        libraryTab.textProperty().getValue() +
-                        " \u2013 " +
-                        FRAME_TITLE,
+                    () -> libraryTab.textProperty().getValue() + " \u2013 " + FRAME_TITLE,
                     libraryTab.textProperty()
                 );
                 mainStage.titleProperty().bind(windowTitle);
@@ -966,10 +846,7 @@ public void init() {
      * Returns the currently viewed BasePanel.
      */
     public LibraryTab getCurrentLibraryTab() {
-        if (
-            (tabbedPane == null) ||
-            (tabbedPane.getSelectionModel().getSelectedItem() == null)
-        ) {
+        if ((tabbedPane == null) || (tabbedPane.getSelectionModel().getSelectedItem() == null)) {
             return null;
         }
         return (LibraryTab) tabbedPane.getSelectionModel().getSelectedItem();
@@ -999,13 +876,8 @@ public void setupAllTables() {
         tabbedPane
             .getTabs()
             .forEach(tab -> {
-                if (
-                    tab instanceof LibraryTab libraryTab &&
-                    (libraryTab.getDatabase() != null)
-                ) {
-                    DefaultTaskExecutor.runInJavaFXThread(
-                        libraryTab::setupMainPanel
-                    );
+                if (tab instanceof LibraryTab libraryTab && (libraryTab.getDatabase() != null)) {
+                    DefaultTaskExecutor.runInJavaFXThread(libraryTab::setupMainPanel);
                 }
             });
     }
@@ -1022,10 +894,7 @@ private ContextMenu createTabContextMenuFor(
             .addAll(
                 factory.createMenuItem(
                     StandardActions.LIBRARY_PROPERTIES,
-                    new LibraryPropertiesAction(
-                        tab::getBibDatabaseContext,
-                        stateManager
-                    )
+                    new LibraryPropertiesAction(tab::getBibDatabaseContext, stateManager)
                 ),
                 factory.createMenuItem(
                     StandardActions.OPEN_DATABASE_FOLDER,
@@ -1071,13 +940,9 @@ public void addTab(LibraryTab libraryTab, boolean raisePanel) {
             event.consume();
         });
 
-        libraryTab.setContextMenu(
-            createTabContextMenuFor(libraryTab, Globals.getKeyPrefs())
-        );
+        libraryTab.setContextMenu(createTabContextMenuFor(libraryTab, Globals.getKeyPrefs()));
 
-        libraryTab
-            .getUndoManager()
-            .registerListener(new UndoRedoEventManager());
+        libraryTab.getUndoManager().registerListener(new UndoRedoEventManager());
     }
 
     /**
@@ -1122,10 +987,7 @@ public void addTab(ParserResult parserResult, boolean raisePanel) {
             Optional<LibraryTab> libraryTab = getLibraryTabs()
                 .stream()
                 .filter(p ->
-                    p
-                        .getBibDatabaseContext()
-                        .getDatabasePath()
-                        .equals(parserResult.getPath())
+                    p.getBibDatabaseContext().getDatabasePath().equals(parserResult.getPath())
                 )
                 .findFirst();
 
@@ -1143,21 +1005,11 @@ public void addTab(ParserResult parserResult, boolean raisePanel) {
      * @param panel        The BasePanel to add to.
      * @param parserResult The entries to add.
      */
-    private void addImportedEntries(
-        final LibraryTab panel,
-        final ParserResult parserResult
-    ) {
-        BackgroundTask<ParserResult> task = BackgroundTask.wrap(() ->
-            parserResult
-        );
-        ImportCleanup cleanup = ImportCleanup.targeting(
-            panel.getBibDatabaseContext().getMode()
-        );
+    private void addImportedEntries(final LibraryTab panel, final ParserResult parserResult) {
+        BackgroundTask<ParserResult> task = BackgroundTask.wrap(() -> parserResult);
+        ImportCleanup cleanup = ImportCleanup.targeting(panel.getBibDatabaseContext().getMode());
         cleanup.doPostCleanup(parserResult.getDatabase().getEntries());
-        ImportEntriesDialog dialog = new ImportEntriesDialog(
-            panel.getBibDatabaseContext(),
-            task
-        );
+        ImportEntriesDialog dialog = new ImportEntriesDialog(panel.getBibDatabaseContext(), task);
         dialog.setTitle(Localization.lang("Import"));
         dialogService.showCustomDialogAndWait(dialog);
     }
@@ -1193,15 +1045,14 @@ private boolean confirmClose(LibraryTab libraryTab) {
             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
-            );
+        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;
@@ -1225,14 +1076,9 @@ private boolean confirmClose(LibraryTab libraryTab) {
                     return true;
                 }
                 // The action was either canceled or unsuccessful.
-                dialogService.notify(
-                    Localization.lang("Unable to save library")
-                );
+                dialogService.notify(Localization.lang("Unable to save library"));
             } catch (Throwable ex) {
-                LOGGER.error(
-                    "A problem occurred when trying to save the file",
-                    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."),
@@ -1262,10 +1108,7 @@ public void closeTab(LibraryTab libraryTab) {
 
         final BibDatabaseContext context = libraryTab.getBibDatabaseContext();
 
-        if (
-            libraryTab.isModified() &&
-            (context.getLocation() == DatabaseLocation.LOCAL)
-        ) {
+        if (libraryTab.isModified() && (context.getLocation() == DatabaseLocation.LOCAL)) {
             if (confirmClose(libraryTab)) {
                 removeTab(libraryTab);
             } else {
@@ -1328,17 +1171,11 @@ private void copyGroupTreeNode(
         GroupTreeNode parent,
         GroupTreeNode groupTreeNodeToCopy
     ) {
-        List<BibEntry> allEntries = getCurrentLibraryTab()
-            .getBibDatabaseContext()
-            .getEntries();
+        List<BibEntry> allEntries = getCurrentLibraryTab().getBibDatabaseContext().getEntries();
         // add groupTreeNodeToCopy to the parent-- in the first run that will the source/main GroupTreeNode
-        GroupTreeNode copiedNode = parent.addSubgroup(
-            groupTreeNodeToCopy.copyNode().getGroup()
-        );
+        GroupTreeNode copiedNode = parent.addSubgroup(groupTreeNodeToCopy.copyNode().getGroup());
         // add all entries of a groupTreeNode to the new library.
-        destinationLibraryTab.dropEntry(
-            groupTreeNodeToCopy.getEntriesInGroup(allEntries)
-        );
+        destinationLibraryTab.dropEntry(groupTreeNodeToCopy.getEntriesInGroup(allEntries));
         // List of all children of groupTreeNodeToCopy
         List<GroupTreeNode> children = groupTreeNodeToCopy.getChildren();
 
@@ -1351,13 +1188,7 @@ private void copyGroupTreeNode(
     }
 
     private void copyRootNode(LibraryTab destinationLibraryTab) {
-        if (
-            !destinationLibraryTab
-                .getBibDatabaseContext()
-                .getMetaData()
-                .getGroups()
-                .isEmpty()
-        ) {
+        if (!destinationLibraryTab.getBibDatabaseContext().getMetaData().getGroups().isEmpty()) {
             return;
         }
         // a root (all entries) GroupTreeNode
@@ -1401,10 +1232,7 @@ protected static class CloseDatabaseAction extends SimpleCommand {
         private final LibraryTabContainer tabContainer;
         private final LibraryTab libraryTab;
 
-        public CloseDatabaseAction(
-            LibraryTabContainer tabContainer,
-            LibraryTab libraryTab
-        ) {
+        public CloseDatabaseAction(LibraryTabContainer tabContainer, LibraryTab libraryTab) {
             this.tabContainer = tabContainer;
             this.libraryTab = libraryTab;
         }
@@ -1457,9 +1285,7 @@ private class OpenDatabaseFolder extends SimpleCommand {
 
         private final Supplier<BibDatabaseContext> databaseContext;
 
-        public OpenDatabaseFolder(
-            Supplier<BibDatabaseContext> databaseContext
-        ) {
+        public OpenDatabaseFolder(Supplier<BibDatabaseContext> databaseContext) {
             this.databaseContext = databaseContext;
         }
 
@@ -1487,8 +1313,7 @@ private class UndoRedoEventManager {
         @Subscribe
         public void listen(UndoRedoEvent event) {
             updateTexts(event);
-            JabRefFrame.this.getCurrentLibraryTab()
-                .updateEntryEditorIfShowing();
+            JabRefFrame.this.getCurrentLibraryTab().updateEntryEditorIfShowing();
         }
 
         @Subscribe
diff --git a/src/main/java/org/jabref/gui/JabRefGUI.java b/src/main/java/org/jabref/gui/JabRefGUI.java
index edb12998b51..c6cfc0a40d5 100644
--- a/src/main/java/org/jabref/gui/JabRefGUI.java
+++ b/src/main/java/org/jabref/gui/JabRefGUI.java
@@ -35,9 +35,7 @@
 
 public class JabRefGUI {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(
-        JabRefGUI.class
-    );
+    private static final Logger LOGGER = LoggerFactory.getLogger(JabRefGUI.class);
 
     private static JabRefFrame mainFrame;
     private final PreferencesService preferencesService;
@@ -69,9 +67,7 @@ public JabRefGUI(
         openWindow(mainStage);
 
         EasyBind.subscribe(
-            preferencesService
-                .getInternalPreferences()
-                .versionCheckEnabledProperty(),
+            preferencesService.getInternalPreferences().versionCheckEnabledProperty(),
             enabled -> {
                 if (enabled) {
                     new VersionWorker(
@@ -98,17 +94,13 @@ private void setupProxy() {
 
         if (
             preferencesService.getProxyPreferences().shouldPersistPassword() &&
-            StringUtil.isNotBlank(
-                preferencesService.getProxyPreferences().getPassword()
-            )
+            StringUtil.isNotBlank(preferencesService.getProxyPreferences().getPassword())
         ) {
             ProxyRegisterer.register(preferencesService.getProxyPreferences());
             return;
         }
 
-        DialogService dialogService = Injector.instantiateModelOrService(
-            DialogService.class
-        );
+        DialogService dialogService = Injector.instantiateModelOrService(DialogService.class);
         Optional<String> password = dialogService.showPasswordDialogAndWait(
             Localization.lang("Proxy configuration"),
             Localization.lang("Proxy requires password"),
@@ -116,9 +108,7 @@ private void setupProxy() {
         );
 
         if (password.isPresent()) {
-            preferencesService
-                .getProxyPreferences()
-                .setPassword(password.get());
+            preferencesService.getProxyPreferences().setPassword(password.get());
             ProxyRegisterer.register(preferencesService.getProxyPreferences());
         } else {
             LOGGER.warn("No proxy password specified");
@@ -142,9 +132,7 @@ private void openWindow(Stage mainStage) {
         if (guiPreferences.isWindowMaximised()) {
             mainStage.setMaximized(true);
         }
-        if (
-            (Screen.getScreens().size() == 1) && isWindowPositionOutOfBounds()
-        ) {
+        if ((Screen.getScreens().size() == 1) && isWindowPositionOutOfBounds()) {
             // corrects the Window, if it is outside the mainscreen
             LOGGER.debug("The Jabref window is outside the main screen");
             mainStage.setX(0);
@@ -210,10 +198,7 @@ private void openWindow(Stage mainStage) {
      */
     private void openDatabases() {
         // If the option is enabled, open the last edited libraries, if any.
-        if (
-            !isBlank &&
-            preferencesService.getWorkspacePreferences().shouldOpenLastEdited()
-        ) {
+        if (!isBlank && preferencesService.getWorkspacePreferences().shouldOpenLastEdited()) {
             openLastEditedDatabases();
         }
 
@@ -297,30 +282,20 @@ private void openDatabases() {
             String message =
                 Localization.lang(
                     "Error opening file '%0'",
-                    pr
-                        .getPath()
-                        .map(Path::toString)
-                        .orElse("(File name unknown)")
+                    pr.getPath().map(Path::toString).orElse("(File name unknown)")
                 ) +
                 "\n" +
                 pr.getErrorMessage();
 
             mainFrame
                 .getDialogService()
-                .showErrorDialogAndWait(
-                    Localization.lang("Error opening file"),
-                    message
-                );
+                .showErrorDialogAndWait(Localization.lang("Error opening file"), message);
         }
 
         // Display warnings, if any
         int tabNumber = 0;
         for (ParserResult pr : parserResults) {
-            ParserResultWarningDialog.showParserResultWarningDialog(
-                pr,
-                mainFrame,
-                tabNumber++
-            );
+            ParserResultWarningDialog.showParserResultWarningDialog(pr, mainFrame, tabNumber++);
         }
 
         // After adding the databases, go through each and see if
@@ -332,11 +307,7 @@ private void openDatabases() {
         // This is because importToOpen might have been used, which adds to
         // loadedDatabases, but not to getBasePanelCount()
 
-        for (
-            int i = 0;
-            (i < parserResults.size()) && (i < mainFrame.getBasePanelCount());
-            i++
-        ) {
+        for (int i = 0; (i < parserResults.size()) && (i < mainFrame.getBasePanelCount()); i++) {
             ParserResult pr = parserResults.get(i);
             LibraryTab libraryTab = mainFrame.getLibraryTabAt(i);
 
@@ -401,17 +372,12 @@ private boolean isWindowPositionOutOfBounds() {
     }
 
     private void openLastEditedDatabases() {
-        List<String> lastFiles = preferencesService
-            .getGuiPreferences()
-            .getLastFilesOpened();
+        List<String> lastFiles = preferencesService.getGuiPreferences().getLastFilesOpened();
         if (lastFiles.isEmpty()) {
             return;
         }
 
-        List<Path> filesToOpen = lastFiles
-            .stream()
-            .map(Path::of)
-            .collect(Collectors.toList());
+        List<Path> filesToOpen = lastFiles.stream().map(Path::of).collect(Collectors.toList());
         getMainFrame().getOpenDatabaseAction().openFiles(filesToOpen);
     }
 
diff --git a/src/main/java/org/jabref/gui/LibraryTab.java b/src/main/java/org/jabref/gui/LibraryTab.java
index 7150264d135..fdf9223ed68 100644
--- a/src/main/java/org/jabref/gui/LibraryTab.java
+++ b/src/main/java/org/jabref/gui/LibraryTab.java
@@ -79,9 +79,7 @@
 
 public class LibraryTab extends Tab {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(
-        LibraryTab.class
-    );
+    private static final Logger LOGGER = LoggerFactory.getLogger(LibraryTab.class);
     private final JabRefFrame frame;
     private final CountingUndoManager undoManager;
     private final DialogService dialogService;
@@ -89,11 +87,8 @@ public class LibraryTab extends Tab {
     private final FileUpdateMonitor fileUpdateMonitor;
     private final StateManager stateManager;
     private final BibEntryTypesManager entryTypesManager;
-    private final BooleanProperty changedProperty = new SimpleBooleanProperty(
-        false
-    );
-    private final BooleanProperty nonUndoableChangeProperty =
-        new SimpleBooleanProperty(false);
+    private final BooleanProperty changedProperty = new SimpleBooleanProperty(false);
+    private final BooleanProperty nonUndoableChangeProperty = new SimpleBooleanProperty(false);
 
     private BibDatabaseContext bibDatabaseContext;
     private MainTableDataModel tableModel;
@@ -151,18 +146,11 @@ public LibraryTab(
         bibDatabaseContext.getMetaData().registerListener(this);
 
         this.tableModel =
-            new MainTableDataModel(
-                getBibDatabaseContext(),
-                preferencesService,
-                stateManager
-            );
+            new MainTableDataModel(getBibDatabaseContext(), preferencesService, stateManager);
 
         citationStyleCache = new CitationStyleCache(bibDatabaseContext);
         annotationCache =
-            new FileAnnotationCache(
-                bibDatabaseContext,
-                preferencesService.getFilePreferences()
-            );
+            new FileAnnotationCache(bibDatabaseContext, preferencesService.getFilePreferences());
 
         setupMainPanel();
         setupAutoCompletion();
@@ -171,13 +159,11 @@ public LibraryTab(
         this.getDatabase().registerListener(new EntriesRemovedListener());
 
         // ensure that at each addition of a new entry, the entry is added to the groups interface
-        this.bibDatabaseContext.getDatabase()
-            .registerListener(new GroupTreeListener());
+        this.bibDatabaseContext.getDatabase().registerListener(new GroupTreeListener());
         // ensure that all entry changes mark the panel as changed
         this.bibDatabaseContext.getDatabase().registerListener(this);
 
-        this.getDatabase()
-            .registerListener(new UpdateTimestampListener(preferencesService));
+        this.getDatabase().registerListener(new UpdateTimestampListener(preferencesService));
 
         this.entryEditor = new EntryEditor(this);
 
@@ -196,23 +182,14 @@ public LibraryTab(
         });
     }
 
-    private static void addChangedInformation(
-        StringBuilder text,
-        String fileName
-    ) {
+    private static void addChangedInformation(StringBuilder text, String fileName) {
         text.append("\n");
         text.append(Localization.lang("Library '%0' has changed.", fileName));
     }
 
-    private static void addModeInfo(
-        StringBuilder text,
-        BibDatabaseContext bibDatabaseContext
-    ) {
+    private static void addModeInfo(StringBuilder text, BibDatabaseContext bibDatabaseContext) {
         String mode = bibDatabaseContext.getMode().getFormattedName();
-        String modeInfo = String.format(
-            "\n%s",
-            Localization.lang("%0 mode", mode)
-        );
+        String modeInfo = String.format("\n%s", Localization.lang("%0 mode", mode));
         text.append(modeInfo);
     }
 
@@ -226,9 +203,7 @@ private static void addSharedDbInformation(
         text.append("]");
     }
 
-    public void setDataLoadingTask(
-        BackgroundTask<ParserResult> dataLoadingTask
-    ) {
+    public void setDataLoadingTask(BackgroundTask<ParserResult> dataLoadingTask) {
         this.dataLoadingTask = dataLoadingTask;
     }
 
@@ -263,17 +238,10 @@ public void onDatabaseLoadingSucceed(ParserResult result) {
 
         feedData(context);
 
-        if (
-            preferencesService
-                .getFilePreferences()
-                .shouldFulltextIndexLinkedFiles()
-        ) {
+        if (preferencesService.getFilePreferences().shouldFulltextIndexLinkedFiles()) {
             try {
                 indexingTaskManager.updateIndex(
-                    PdfIndexer.of(
-                        bibDatabaseContext,
-                        preferencesService.getFilePreferences()
-                    ),
+                    PdfIndexer.of(bibDatabaseContext, preferencesService.getFilePreferences()),
                     bibDatabaseContext
                 );
             } catch (IOException e) {
@@ -293,18 +261,10 @@ public void onDatabaseLoadingFailed(Exception ex) {
         dialogService.showErrorDialogAndWait(title, content, ex);
     }
 
-    public void feedData(
-        BibDatabaseContext bibDatabaseContextFromParserResult
-    ) {
+    public void feedData(BibDatabaseContext bibDatabaseContextFromParserResult) {
         cleanUp();
 
-        if (
-            this.getTabPane()
-                .getSelectionModel()
-                .selectedItemProperty()
-                .get()
-                .equals(this)
-        ) {
+        if (this.getTabPane().getSelectionModel().selectedItemProperty().get().equals(this)) {
             // If you open an existing library, a library tab with a loading animation is added immediately.
             // At that point, the library tab is given a temporary bibDatabaseContext with no entries.
             // This line is necessary because, while there is already a binding that updates the active database when a new tab is added,
@@ -317,16 +277,13 @@ public void feedData(
         Optional<BibDatabaseContext> foundExistingBibDatabase = stateManager
             .getOpenDatabases()
             .stream()
-            .filter(databaseContext ->
-                databaseContext.equals(this.bibDatabaseContext)
-            )
+            .filter(databaseContext -> databaseContext.equals(this.bibDatabaseContext))
             .findFirst();
         foundExistingBibDatabase.ifPresent(databaseContext ->
             stateManager.getOpenDatabases().remove(databaseContext)
         );
 
-        this.bibDatabaseContext =
-            Objects.requireNonNull(bibDatabaseContextFromParserResult);
+        this.bibDatabaseContext = Objects.requireNonNull(bibDatabaseContextFromParserResult);
 
         stateManager.getOpenDatabases().add(bibDatabaseContextFromParserResult);
 
@@ -334,13 +291,8 @@ public void feedData(
         bibDatabaseContextFromParserResult.getMetaData().registerListener(this);
 
         this.tableModel =
-            new MainTableDataModel(
-                getBibDatabaseContext(),
-                preferencesService,
-                stateManager
-            );
-        citationStyleCache =
-            new CitationStyleCache(bibDatabaseContextFromParserResult);
+            new MainTableDataModel(getBibDatabaseContext(), preferencesService, stateManager);
+        citationStyleCache = new CitationStyleCache(bibDatabaseContextFromParserResult);
         annotationCache =
             new FileAnnotationCache(
                 bibDatabaseContextFromParserResult,
@@ -353,13 +305,11 @@ public void feedData(
         this.getDatabase().registerListener(new EntriesRemovedListener());
 
         // ensure that at each addition of a new entry, the entry is added to the groups interface
-        this.bibDatabaseContext.getDatabase()
-            .registerListener(new GroupTreeListener());
+        this.bibDatabaseContext.getDatabase().registerListener(new GroupTreeListener());
         // ensure that all entry changes mark the panel as changed
         this.bibDatabaseContext.getDatabase().registerListener(this);
 
-        this.getDatabase()
-            .registerListener(new UpdateTimestampListener(preferencesService));
+        this.getDatabase().registerListener(new UpdateTimestampListener(preferencesService));
 
         this.entryEditor = new EntryEditor(this);
 
@@ -378,16 +328,9 @@ public void feedData(
 
     public void installAutosaveManagerAndBackupManager() {
         if (isDatabaseReadyForAutoSave(bibDatabaseContext)) {
-            AutosaveManager autosaveManager = AutosaveManager.start(
-                bibDatabaseContext
-            );
+            AutosaveManager autosaveManager = AutosaveManager.start(bibDatabaseContext);
             autosaveManager.registerListener(
-                new AutosaveUiManager(
-                    this,
-                    dialogService,
-                    preferencesService,
-                    entryTypesManager
-                )
+                new AutosaveUiManager(this, dialogService, preferencesService, entryTypesManager)
             );
         }
         if (
@@ -407,9 +350,7 @@ private boolean isDatabaseReadyForAutoSave(BibDatabaseContext context) {
         return (
             ((context.getLocation() == DatabaseLocation.SHARED) ||
                 ((context.getLocation() == DatabaseLocation.LOCAL) &&
-                    preferencesService
-                        .getLibraryPreferences()
-                        .shouldAutoSave())) &&
+                    preferencesService.getLibraryPreferences().shouldAutoSave())) &&
             context.getDatabasePath().isPresent()
         );
     }
@@ -429,9 +370,7 @@ private boolean isDatabaseReadyForBackup(BibDatabaseContext context) {
      * Example: *jabref-authors.bib – testbib
      */
     public void updateTabTitle(boolean isChanged) {
-        boolean isAutosaveEnabled = preferencesService
-            .getLibraryPreferences()
-            .shouldAutoSave();
+        boolean isAutosaveEnabled = preferencesService.getLibraryPreferences().shouldAutoSave();
 
         DatabaseLocation databaseLocation = bibDatabaseContext.getLocation();
         Optional<Path> file = bibDatabaseContext.getDatabasePath();
@@ -471,9 +410,7 @@ public void updateTabTitle(boolean isChanged) {
                 stateManager.collectAllDatabasePaths(),
                 databasePath
             );
-            uniquePathPart.ifPresent(part ->
-                tabTitle.append(" \u2013 ").append(part)
-            );
+            uniquePathPart.ifPresent(part -> tabTitle.append(" \u2013 ").append(part));
         } else {
             if (databaseLocation == DatabaseLocation.LOCAL) {
                 tabTitle.append(Localization.lang("untitled"));
@@ -492,10 +429,7 @@ public void updateTabTitle(boolean isChanged) {
                 (databaseLocation == DatabaseLocation.LOCAL) &&
                 bibDatabaseContext.getDatabase().hasEntries()
             ) {
-                addChangedInformation(
-                    toolTipText,
-                    Localization.lang("untitled")
-                );
+                addChangedInformation(toolTipText, Localization.lang("untitled"));
             }
         }
 
@@ -504,11 +438,7 @@ public void updateTabTitle(boolean isChanged) {
             setTooltip(new Tooltip(toolTipText.toString()));
         });
 
-        if (
-            preferencesService
-                .getFilePreferences()
-                .shouldFulltextIndexLinkedFiles()
-        ) {
+        if (preferencesService.getFilePreferences().shouldFulltextIndexLinkedFiles()) {
             indexingTaskManager.updateDatabaseName(tabTitle.toString());
         }
     }
@@ -560,13 +490,7 @@ private void delete(boolean cut, List<BibEntry> entries) {
         }
 
         getUndoManager()
-            .addEdit(
-                new UndoableRemoveEntries(
-                    bibDatabaseContext.getDatabase(),
-                    entries,
-                    cut
-                )
-            );
+            .addEdit(new UndoableRemoveEntries(bibDatabaseContext.getDatabase(), entries, cut));
         bibDatabaseContext.getDatabase().removeEntries(entries);
         ensureNotShowingBottomPanel(entries);
 
@@ -621,19 +545,10 @@ public void insertEntries(final List<BibEntry> entries) {
             );
             // Create an UndoableInsertEntries object.
             getUndoManager()
-                .addEdit(
-                    new UndoableInsertEntries(
-                        bibDatabaseContext.getDatabase(),
-                        entries
-                    )
-                );
+                .addEdit(new UndoableInsertEntries(bibDatabaseContext.getDatabase(), entries));
 
             this.changedProperty.setValue(true); // The database just changed.
-            if (
-                preferencesService
-                    .getEntryEditorPreferences()
-                    .shouldOpenOnNewEntry()
-            ) {
+            if (preferencesService.getEntryEditorPreferences().shouldOpenOnNewEntry()) {
                 showAndEdit(entries.get(0));
             }
             clearAndSelect(entries.get(0));
@@ -730,10 +645,7 @@ private void setupAutoCompletion() {
             suggestionProviders = new SuggestionProviders();
         }
         searchAutoCompleter =
-            new PersonNameSuggestionProvider(
-                FieldFactory.getPersonNameFields(),
-                getDatabase()
-            );
+            new PersonNameSuggestionProvider(FieldFactory.getPersonNameFields(), getDatabase());
     }
 
     public void updateSearchManager() {
@@ -762,9 +674,7 @@ public void showAndEdit(BibEntry entry) {
 
     private void showBottomPane(BasePanelMode newMode) {
         if (newMode != BasePanelMode.SHOWING_EDITOR) {
-            throw new UnsupportedOperationException(
-                "new mode not recognized: " + newMode.name()
-            );
+            throw new UnsupportedOperationException("new mode not recognized: " + newMode.name());
         }
         Node pane = entryEditor;
 
@@ -798,17 +708,13 @@ public void clearAndSelect(final BibEntry bibEntry) {
     public void selectPreviousEntry() {
         mainTable
             .getSelectionModel()
-            .clearAndSelect(
-                mainTable.getSelectionModel().getSelectedIndex() - 1
-            );
+            .clearAndSelect(mainTable.getSelectionModel().getSelectedIndex() - 1);
     }
 
     public void selectNextEntry() {
         mainTable
             .getSelectionModel()
-            .clearAndSelect(
-                mainTable.getSelectionModel().getSelectedIndex() + 1
-            );
+            .clearAndSelect(mainTable.getSelectionModel().getSelectedIndex() + 1);
     }
 
     /**
@@ -847,9 +753,7 @@ public void updateEntryEditorIfShowing() {
     public synchronized void markChangedOrUnChanged() {
         if (undoManager.hasChanged()) {
             this.changedProperty.setValue(true);
-        } else if (
-            changedProperty.getValue() && !nonUndoableChangeProperty.getValue()
-        ) {
+        } else if (changedProperty.getValue() && !nonUndoableChangeProperty.getValue()) {
             this.changedProperty.setValue(false);
         }
     }
@@ -859,13 +763,9 @@ public BibDatabase getDatabase() {
     }
 
     private boolean showDeleteConfirmationDialog(int numberOfEntries) {
-        if (
-            preferencesService.getWorkspacePreferences().shouldConfirmDelete()
-        ) {
+        if (preferencesService.getWorkspacePreferences().shouldConfirmDelete()) {
             String title = Localization.lang("Delete entry");
-            String message = Localization.lang(
-                "Really delete the selected entry?"
-            );
+            String message = Localization.lang("Really delete the selected entry?");
             String okButton = Localization.lang("Delete entry");
             String cancelButton = Localization.lang("Keep entry");
             if (numberOfEntries > 1) {
@@ -885,10 +785,7 @@ private boolean showDeleteConfirmationDialog(int numberOfEntries) {
                 okButton,
                 cancelButton,
                 Localization.lang("Do not ask again"),
-                optOut ->
-                    preferencesService
-                        .getWorkspacePreferences()
-                        .setConfirmDelete(!optOut)
+                optOut -> preferencesService.getWorkspacePreferences().setConfirmDelete(!optOut)
             );
         } else {
             return true;
@@ -949,9 +846,7 @@ public String formatOutputMessage(String start, int count) {
             "%s %d %s.",
             start,
             count,
-            (count > 1
-                    ? Localization.lang("entries")
-                    : Localization.lang("entry"))
+            (count > 1 ? Localization.lang("entries") : Localization.lang("entry"))
         );
     }
 
@@ -970,9 +865,7 @@ public Optional<SearchQuery> getCurrentSearchQuery() {
     /**
      * Set the query the user currently searches while this basepanel is active
      */
-    public void setCurrentSearchQuery(
-        Optional<SearchQuery> currentSearchQuery
-    ) {
+    public void setCurrentSearchQuery(Optional<SearchQuery> currentSearchQuery) {
         this.currentSearchQuery = currentSearchQuery;
     }
 
@@ -1117,25 +1010,16 @@ private class GroupTreeListener {
         @Subscribe
         public void listen(EntriesAddedEvent addedEntriesEvent) {
             // if the event is an undo, don't add it to the current group
-            if (
-                addedEntriesEvent.getEntriesEventSource() ==
-                EntriesEventSource.UNDO
-            ) {
+            if (addedEntriesEvent.getEntriesEventSource() == EntriesEventSource.UNDO) {
                 return;
             }
 
             // Automatically add new entries to the selected group (or set of groups)
-            if (
-                preferencesService
-                    .getGroupsPreferences()
-                    .shouldAutoAssignGroup()
-            ) {
+            if (preferencesService.getGroupsPreferences().shouldAutoAssignGroup()) {
                 stateManager
                     .getSelectedGroup(bibDatabaseContext)
                     .forEach(selectedGroup ->
-                        selectedGroup.addEntriesToGroup(
-                            addedEntriesEvent.getBibEntries()
-                        )
+                        selectedGroup.addEntriesToGroup(addedEntriesEvent.getBibEntries())
                     );
             }
         }
@@ -1153,22 +1037,14 @@ private class IndexUpdateListener {
 
         @Subscribe
         public void listen(EntriesAddedEvent addedEntryEvent) {
-            if (
-                preferencesService
-                    .getFilePreferences()
-                    .shouldFulltextIndexLinkedFiles()
-            ) {
+            if (preferencesService.getFilePreferences().shouldFulltextIndexLinkedFiles()) {
                 try {
                     PdfIndexer pdfIndexer = PdfIndexer.of(
                         bibDatabaseContext,
                         preferencesService.getFilePreferences()
                     );
                     for (BibEntry addedEntry : addedEntryEvent.getBibEntries()) {
-                        indexingTaskManager.addToIndex(
-                            pdfIndexer,
-                            addedEntry,
-                            bibDatabaseContext
-                        );
+                        indexingTaskManager.addToIndex(pdfIndexer, addedEntry, bibDatabaseContext);
                     }
                 } catch (IOException e) {
                     LOGGER.error("Cannot access lucene index", e);
@@ -1178,21 +1054,14 @@ public void listen(EntriesAddedEvent addedEntryEvent) {
 
         @Subscribe
         public void listen(EntriesRemovedEvent removedEntriesEvent) {
-            if (
-                preferencesService
-                    .getFilePreferences()
-                    .shouldFulltextIndexLinkedFiles()
-            ) {
+            if (preferencesService.getFilePreferences().shouldFulltextIndexLinkedFiles()) {
                 try {
                     PdfIndexer pdfIndexer = PdfIndexer.of(
                         bibDatabaseContext,
                         preferencesService.getFilePreferences()
                     );
                     for (BibEntry removedEntry : removedEntriesEvent.getBibEntries()) {
-                        indexingTaskManager.removeFromIndex(
-                            pdfIndexer,
-                            removedEntry
-                        );
+                        indexingTaskManager.removeFromIndex(pdfIndexer, removedEntry);
                     }
                 } catch (IOException e) {
                     LOGGER.error("Cannot access lucene index", e);
@@ -1202,11 +1071,7 @@ public void listen(EntriesRemovedEvent removedEntriesEvent) {
 
         @Subscribe
         public void listen(FieldChangedEvent fieldChangedEvent) {
-            if (
-                preferencesService
-                    .getFilePreferences()
-                    .shouldFulltextIndexLinkedFiles()
-            ) {
+            if (preferencesService.getFilePreferences().shouldFulltextIndexLinkedFiles()) {
                 if (fieldChangedEvent.getField().equals(StandardField.FILE)) {
                     List<LinkedFile> oldFileList = FileFieldParser.parse(
                         fieldChangedEvent.getOldValue()
@@ -1217,9 +1082,7 @@ public void listen(FieldChangedEvent fieldChangedEvent) {
 
                     List<LinkedFile> addedFiles = new ArrayList<>(newFileList);
                     addedFiles.remove(oldFileList);
-                    List<LinkedFile> removedFiles = new ArrayList<>(
-                        oldFileList
-                    );
+                    List<LinkedFile> removedFiles = new ArrayList<>(oldFileList);
                     removedFiles.remove(newFileList);
 
                     try {
@@ -1258,12 +1121,7 @@ public DatabaseNotification(Node content) {
             super(content);
         }
 
-        public void notify(
-            Node graphic,
-            String text,
-            List<Action> actions,
-            Duration duration
-        ) {
+        public void notify(Node graphic, String text, List<Action> actions, Duration duration) {
             this.setGraphic(graphic);
             this.setText(text);
             this.getActions().setAll(actions);
diff --git a/src/main/java/org/jabref/gui/MainApplication.java b/src/main/java/org/jabref/gui/MainApplication.java
index f83dcc3a9a7..307708c1a1a 100644
--- a/src/main/java/org/jabref/gui/MainApplication.java
+++ b/src/main/java/org/jabref/gui/MainApplication.java
@@ -36,13 +36,7 @@ public static void main(
     public void start(Stage mainStage) {
         FallbackExceptionHandler.installExceptionHandler();
         Globals.startBackgroundTasks();
-        new JabRefGUI(
-            mainStage,
-            parserResults,
-            isBlank,
-            preferences,
-            fileUpdateMonitor
-        );
+        new JabRefGUI(mainStage, parserResults, isBlank, preferences, fileUpdateMonitor);
     }
 
     @Override
diff --git a/src/main/java/org/jabref/gui/MainMenu.java b/src/main/java/org/jabref/gui/MainMenu.java
index 15b89537965..89922a08313 100644
--- a/src/main/java/org/jabref/gui/MainMenu.java
+++ b/src/main/java/org/jabref/gui/MainMenu.java
@@ -133,10 +133,7 @@ private void createMenu() {
                     StandardActions.NEW_LIBRARY,
                     new NewDatabaseAction(frame, preferencesService)
                 ),
-                factory.createMenuItem(
-                    StandardActions.OPEN_LIBRARY,
-                    frame.getOpenDatabaseAction()
-                ),
+                factory.createMenuItem(StandardActions.OPEN_LIBRARY, frame.getOpenDatabaseAction()),
                 frame.getFileHistory(),
                 factory.createMenuItem(
                     StandardActions.SAVE_LIBRARY,
@@ -251,10 +248,7 @@ private void createMenu() {
                     new ShowPreferencesAction(frame, taskExecutor)
                 ),
                 new SeparatorMenuItem(),
-                factory.createMenuItem(
-                    StandardActions.QUIT,
-                    new JabRefFrame.CloseAction(frame)
-                )
+                factory.createMenuItem(StandardActions.QUIT, new JabRefFrame.CloseAction(frame))
             );
 
         edit
@@ -262,21 +256,11 @@ private void createMenu() {
             .addAll(
                 factory.createMenuItem(
                     StandardActions.UNDO,
-                    new UndoRedoAction(
-                        StandardActions.UNDO,
-                        frame,
-                        dialogService,
-                        stateManager
-                    )
+                    new UndoRedoAction(StandardActions.UNDO, frame, dialogService, stateManager)
                 ),
                 factory.createMenuItem(
                     StandardActions.REDO,
-                    new UndoRedoAction(
-                        StandardActions.REDO,
-                        frame,
-                        dialogService,
-                        stateManager
-                    )
+                    new UndoRedoAction(StandardActions.REDO, frame, dialogService, stateManager)
                 ),
                 new SeparatorMenuItem(),
                 factory.createMenuItem(
@@ -399,11 +383,7 @@ private void createMenu() {
         SeparatorMenuItem specialFieldsSeparator = new SeparatorMenuItem();
         specialFieldsSeparator
             .visibleProperty()
-            .bind(
-                preferencesService
-                    .getSpecialFieldsPreferences()
-                    .specialFieldsEnabledProperty()
-            );
+            .bind(preferencesService.getSpecialFieldsPreferences().specialFieldsEnabledProperty());
 
         edit
             .getItems()
@@ -601,8 +581,7 @@ private void createMenu() {
 
         // @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);
     }
 
diff --git a/src/main/java/org/jabref/gui/MainToolBar.java b/src/main/java/org/jabref/gui/MainToolBar.java
index 546227b2c11..c311e06e1b0 100644
--- a/src/main/java/org/jabref/gui/MainToolBar.java
+++ b/src/main/java/org/jabref/gui/MainToolBar.java
@@ -93,9 +93,7 @@ private void createToolBar() {
             pushToApplicationCommand.getAction(),
             pushToApplicationCommand
         );
-        pushToApplicationCommand.registerReconfigurable(
-            pushToApplicationButton
-        );
+        pushToApplicationCommand.registerReconfigurable(pushToApplicationButton);
 
         // Setup Toolbar
 
@@ -146,50 +144,27 @@ private void createToolBar() {
                     ),
                     factory.createIconButton(
                         StandardActions.NEW_ENTRY,
-                        new NewEntryAction(
-                            frame,
-                            dialogService,
-                            preferencesService,
-                            stateManager
-                        )
+                        new NewEntryAction(frame, dialogService, preferencesService, stateManager)
                     ),
                     createNewEntryFromIdButton(),
                     factory.createIconButton(
                         StandardActions.NEW_ENTRY_FROM_PLAIN_TEXT,
-                        new ExtractBibtexAction(
-                            dialogService,
-                            preferencesService,
-                            stateManager
-                        )
+                        new ExtractBibtexAction(dialogService, preferencesService, stateManager)
                     ),
                     factory.createIconButton(
                         StandardActions.DELETE_ENTRY,
-                        new EditAction(
-                            StandardActions.DELETE_ENTRY,
-                            frame,
-                            stateManager
-                        )
+                        new EditAction(StandardActions.DELETE_ENTRY, frame, stateManager)
                     )
                 ),
                 new Separator(Orientation.VERTICAL),
                 new HBox(
                     factory.createIconButton(
                         StandardActions.UNDO,
-                        new UndoRedoAction(
-                            StandardActions.UNDO,
-                            frame,
-                            dialogService,
-                            stateManager
-                        )
+                        new UndoRedoAction(StandardActions.UNDO, frame, dialogService, stateManager)
                     ),
                     factory.createIconButton(
                         StandardActions.REDO,
-                        new UndoRedoAction(
-                            StandardActions.REDO,
-                            frame,
-                            dialogService,
-                            stateManager
-                        )
+                        new UndoRedoAction(StandardActions.REDO, frame, dialogService, stateManager)
                     ),
                     factory.createIconButton(
                         StandardActions.CUT,
@@ -197,19 +172,11 @@ private void createToolBar() {
                     ),
                     factory.createIconButton(
                         StandardActions.COPY,
-                        new EditAction(
-                            StandardActions.COPY,
-                            frame,
-                            stateManager
-                        )
+                        new EditAction(StandardActions.COPY, frame, stateManager)
                     ),
                     factory.createIconButton(
                         StandardActions.PASTE,
-                        new EditAction(
-                            StandardActions.PASTE,
-                            frame,
-                            stateManager
-                        )
+                        new EditAction(StandardActions.PASTE, frame, stateManager)
                     )
                 ),
                 new Separator(Orientation.VERTICAL),
@@ -263,30 +230,23 @@ private void createToolBar() {
     Button createNewEntryFromIdButton() {
         Button newEntryFromIdButton = new Button();
 
-        newEntryFromIdButton.setGraphic(
-            IconTheme.JabRefIcons.IMPORT.getGraphicNode()
-        );
+        newEntryFromIdButton.setGraphic(IconTheme.JabRefIcons.IMPORT.getGraphicNode());
         newEntryFromIdButton.getStyleClass().setAll("icon-button");
         newEntryFromIdButton.setFocusTraversable(false);
-        newEntryFromIdButton
-            .disableProperty()
-            .bind(ActionHelper.needsDatabase(stateManager).not());
+        newEntryFromIdButton.disableProperty().bind(ActionHelper.needsDatabase(stateManager).not());
         newEntryFromIdButton.setOnMouseClicked(event -> {
-            GenerateEntryFromIdDialog entryFromId =
-                new GenerateEntryFromIdDialog(
-                    frame.getCurrentLibraryTab(),
-                    dialogService,
-                    preferencesService,
-                    taskExecutor,
-                    stateManager
-                );
+            GenerateEntryFromIdDialog entryFromId = new GenerateEntryFromIdDialog(
+                frame.getCurrentLibraryTab(),
+                dialogService,
+                preferencesService,
+                taskExecutor,
+                stateManager
+            );
 
             if (entryFromIdPopOver == null) {
                 entryFromIdPopOver = new PopOver(entryFromId.getDialogPane());
                 entryFromIdPopOver.setTitle(Localization.lang("Import by ID"));
-                entryFromIdPopOver.setArrowLocation(
-                    PopOver.ArrowLocation.TOP_CENTER
-                );
+                entryFromIdPopOver.setArrowLocation(PopOver.ArrowLocation.TOP_CENTER);
                 entryFromIdPopOver.setContentNode(entryFromId.getDialogPane());
                 entryFromIdPopOver.show(newEntryFromIdButton);
                 entryFromId.setEntryFromIdPopOver(entryFromIdPopOver);
@@ -298,9 +258,7 @@ Button createNewEntryFromIdButton() {
                 entryFromId.setEntryFromIdPopOver(entryFromIdPopOver);
             }
         });
-        newEntryFromIdButton.setTooltip(
-            new Tooltip(Localization.lang("Import by ID"))
-        );
+        newEntryFromIdButton.setTooltip(new Tooltip(Localization.lang("Import by ID")));
 
         return newEntryFromIdButton;
     }
@@ -310,12 +268,8 @@ Group createTaskIndicator() {
         indicator.getStyleClass().add("progress-indicatorToolbar");
         indicator.progressProperty().bind(stateManager.getTasksProgress());
 
-        Tooltip someTasksRunning = new Tooltip(
-            Localization.lang("Background Tasks are running")
-        );
-        Tooltip noTasksRunning = new Tooltip(
-            Localization.lang("Background Tasks are done")
-        );
+        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()
@@ -342,33 +296,21 @@ hide it and clip it to a square of (width x width) each time width is updated.
                     indicator.setPrefWidth(newValue.doubleValue());
                 }
                 if (newValue.doubleValue() > 0) {
-                    Rectangle clip = new Rectangle(
-                        newValue.doubleValue(),
-                        newValue.doubleValue()
-                    );
+                    Rectangle clip = new Rectangle(newValue.doubleValue(), newValue.doubleValue());
                     indicator.setClip(clip);
                 }
             });
 
         indicator.setOnMouseClicked(event -> {
-            TaskProgressView<Task<?>> taskProgressView = new TaskProgressView<
-                Task<?>
-            >();
-            EasyBind.bindContent(
-                taskProgressView.getTasks(),
-                stateManager.getBackgroundTasks()
-            );
+            TaskProgressView<Task<?>> taskProgressView = new TaskProgressView<Task<?>>();
+            EasyBind.bindContent(taskProgressView.getTasks(), stateManager.getBackgroundTasks());
             taskProgressView.setRetainTasks(true);
             taskProgressView.setGraphicFactory(BackgroundTask::getIcon);
 
             if (progressViewPopOver == null) {
                 progressViewPopOver = new PopOver(taskProgressView);
-                progressViewPopOver.setTitle(
-                    Localization.lang("Background Tasks")
-                );
-                progressViewPopOver.setArrowLocation(
-                    PopOver.ArrowLocation.RIGHT_TOP
-                );
+                progressViewPopOver.setTitle(Localization.lang("Background Tasks"));
+                progressViewPopOver.setArrowLocation(PopOver.ArrowLocation.RIGHT_TOP);
                 progressViewPopOver.setContentNode(taskProgressView);
                 progressViewPopOver.show(indicator);
             } else if (progressViewPopOver.isShowing()) {
diff --git a/src/main/java/org/jabref/gui/OpenConsoleAction.java b/src/main/java/org/jabref/gui/OpenConsoleAction.java
index 3808e28bc20..76810b10fc7 100644
--- a/src/main/java/org/jabref/gui/OpenConsoleAction.java
+++ b/src/main/java/org/jabref/gui/OpenConsoleAction.java
@@ -13,9 +13,7 @@
 
 public class OpenConsoleAction extends SimpleCommand {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(
-        OpenConsoleAction.class
-    );
+    private static final Logger LOGGER = LoggerFactory.getLogger(OpenConsoleAction.class);
     private final Supplier<BibDatabaseContext> databaseContext;
     private final StateManager stateManager;
     private final PreferencesService preferencesService;
@@ -60,11 +58,7 @@ public void execute() {
             .flatMap(BibDatabaseContext::getDatabasePath)
             .ifPresent(path -> {
                 try {
-                    JabRefDesktop.openConsole(
-                        path,
-                        preferencesService,
-                        dialogService
-                    );
+                    JabRefDesktop.openConsole(path, preferencesService, dialogService);
                 } catch (IOException e) {
                     LOGGER.info("Could not open console", e);
                 }
diff --git a/src/main/java/org/jabref/gui/SendAsEMailAction.java b/src/main/java/org/jabref/gui/SendAsEMailAction.java
index 0ea00c2d41b..3a3f908b35e 100644
--- a/src/main/java/org/jabref/gui/SendAsEMailAction.java
+++ b/src/main/java/org/jabref/gui/SendAsEMailAction.java
@@ -33,9 +33,7 @@
 @AllowedToUseAwt("Requires AWT to send an email")
 public abstract class SendAsEMailAction extends SimpleCommand {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(
-        SendAsEMailAction.class
-    );
+    private static final Logger LOGGER = LoggerFactory.getLogger(SendAsEMailAction.class);
     private final DialogService dialogService;
     private final PreferencesService preferencesService;
     private final StateManager stateManager;
@@ -67,17 +65,12 @@ public void execute() {
     }
 
     private String sendEmail() throws Exception {
-        if (
-            !Desktop.isDesktopSupported() ||
-            stateManager.getActiveDatabase().isEmpty()
-        ) {
+        if (!Desktop.isDesktopSupported() || stateManager.getActiveDatabase().isEmpty()) {
             return Localization.lang("Error creating email");
         }
 
         if (stateManager.getSelectedEntries().isEmpty()) {
-            return Localization.lang(
-                "This operation requires one or more entries to be selected."
-            );
+            return Localization.lang("This operation requires one or more entries to be selected.");
         }
 
         List<BibEntry> entries = stateManager.getSelectedEntries();
@@ -116,14 +109,10 @@ private List<String> getAttachments(List<BibEntry> entries) {
             .getExternalApplicationsPreferences()
             .shouldAutoOpenEmailAttachmentsFolder();
 
-        BibDatabaseContext databaseContext = stateManager
-            .getActiveDatabase()
-            .get();
+        BibDatabaseContext databaseContext = stateManager.getActiveDatabase().get();
         List<Path> fileList = FileUtil.getListOfLinkedFiles(
             entries,
-            databaseContext.getFileDirectories(
-                preferencesService.getFilePreferences()
-            )
+            databaseContext.getFileDirectories(preferencesService.getFilePreferences())
         );
 
         List<String> attachments = new ArrayList<>();
diff --git a/src/main/java/org/jabref/gui/SendAsKindleEmailAction.java b/src/main/java/org/jabref/gui/SendAsKindleEmailAction.java
index 6baf340dca4..fa1e8fe9ee5 100644
--- a/src/main/java/org/jabref/gui/SendAsKindleEmailAction.java
+++ b/src/main/java/org/jabref/gui/SendAsKindleEmailAction.java
@@ -24,19 +24,13 @@ public SendAsKindleEmailAction(
         this.executable.bind(
                 ActionHelper
                     .needsEntriesSelected(stateManager)
-                    .and(
-                        ActionHelper.hasLinkedFileForSelectedEntries(
-                            stateManager
-                        )
-                    )
+                    .and(ActionHelper.hasLinkedFileForSelectedEntries(stateManager))
             );
     }
 
     @Override
     protected String getEmailAddress() {
-        return preferencesService
-            .getExternalApplicationsPreferences()
-            .getKindleEmail();
+        return preferencesService.getExternalApplicationsPreferences().getKindleEmail();
     }
 
     @Override
diff --git a/src/main/java/org/jabref/gui/SendAsStandardEmailAction.java b/src/main/java/org/jabref/gui/SendAsStandardEmailAction.java
index 1357db9229d..80f5de01114 100644
--- a/src/main/java/org/jabref/gui/SendAsStandardEmailAction.java
+++ b/src/main/java/org/jabref/gui/SendAsStandardEmailAction.java
@@ -22,9 +22,7 @@
  */
 public class SendAsStandardEmailAction extends SendAsEMailAction {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(
-        SendAsStandardEmailAction.class
-    );
+    private static final Logger LOGGER = LoggerFactory.getLogger(SendAsStandardEmailAction.class);
     private final PreferencesService preferencesService;
     private final StateManager stateManager;
     private final BibEntryTypesManager entryTypesManager;
@@ -50,17 +48,13 @@ protected String getEmailAddress() {
 
     @Override
     protected String getSubject() {
-        return preferencesService
-            .getExternalApplicationsPreferences()
-            .getEmailSubject();
+        return preferencesService.getExternalApplicationsPreferences().getEmailSubject();
     }
 
     @Override
     protected String getBody() {
         List<BibEntry> entries = stateManager.getSelectedEntries();
-        BibDatabaseContext databaseContext = stateManager
-            .getActiveDatabase()
-            .get();
+        BibDatabaseContext databaseContext = stateManager.getActiveDatabase().get();
         StringWriter rawEntries = new StringWriter();
         BibWriter bibWriter = new BibWriter(rawEntries, OS.NEWLINE);
 
@@ -71,11 +65,7 @@ protected String getBody() {
 
         for (BibEntry entry : entries) {
             try {
-                bibtexEntryWriter.write(
-                    entry,
-                    bibWriter,
-                    databaseContext.getMode()
-                );
+                bibtexEntryWriter.write(entry, bibWriter, databaseContext.getMode());
             } catch (IOException e) {
                 LOGGER.warn("Problem creating BibTeX file for mailing.", e);
             }
diff --git a/src/main/java/org/jabref/gui/StateManager.java b/src/main/java/org/jabref/gui/StateManager.java
index 3d479d5b531..01b807d090a 100644
--- a/src/main/java/org/jabref/gui/StateManager.java
+++ b/src/main/java/org/jabref/gui/StateManager.java
@@ -49,52 +49,41 @@
  */
 public class StateManager {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(
-        StateManager.class
-    );
-    private final CustomLocalDragboard localDragboard =
-        new CustomLocalDragboard();
+    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 ReadOnlyListWrapper<GroupTreeNode> activeGroups =
-        new ReadOnlyListWrapper<>(FXCollections.observableArrayList());
-    private final ObservableList<BibEntry> selectedEntries =
-        FXCollections.observableArrayList();
-    private final ObservableMap<
-        BibDatabaseContext,
-        ObservableList<GroupTreeNode>
-    > selectedGroups = FXCollections.observableHashMap();
+    private final ReadOnlyListWrapper<GroupTreeNode> activeGroups = new ReadOnlyListWrapper<>(
+        FXCollections.observableArrayList()
+    );
+    private final ObservableList<BibEntry> selectedEntries = FXCollections.observableArrayList();
+    private final ObservableMap<BibDatabaseContext, ObservableList<GroupTreeNode>> selectedGroups =
+        FXCollections.observableHashMap();
     private final OptionalObjectProperty<SearchQuery> activeSearchQuery =
         OptionalObjectProperty.empty();
-    private final ObservableMap<
-        BibDatabaseContext,
-        IntegerProperty
-    > searchResultMap = FXCollections.observableHashMap();
-    private final OptionalObjectProperty<Node> focusOwner =
-        OptionalObjectProperty.empty();
-    private final ObservableList<
-        Pair<BackgroundTask<?>, Task<?>>
-    > backgroundTasks = FXCollections.observableArrayList(task ->
-        new Observable[] {
-            task.getValue().progressProperty(),
-            task.getValue().runningProperty(),
-        }
-    );
+    private final ObservableMap<BibDatabaseContext, IntegerProperty> searchResultMap =
+        FXCollections.observableHashMap();
+    private final OptionalObjectProperty<Node> focusOwner = OptionalObjectProperty.empty();
+    private final ObservableList<Pair<BackgroundTask<?>, Task<?>>> backgroundTasks =
+        FXCollections.observableArrayList(task ->
+            new Observable[] {
+                task.getValue().progressProperty(),
+                task.getValue().runningProperty(),
+            }
+        );
     private final EasyBinding<Boolean> anyTaskRunning = EasyBind.reduce(
         backgroundTasks,
         tasks -> tasks.map(Pair::getValue).anyMatch(Task::isRunning)
     );
-    private final EasyBinding<Boolean> anyTasksThatWillNotBeRecoveredRunning =
-        EasyBind.reduce(
-            backgroundTasks,
-            tasks ->
-                tasks.anyMatch(task ->
-                    !task.getKey().willBeRecoveredAutomatically() &&
-                    task.getValue().isRunning()
-                )
-        );
+    private final EasyBinding<Boolean> anyTasksThatWillNotBeRecoveredRunning = EasyBind.reduce(
+        backgroundTasks,
+        tasks ->
+            tasks.anyMatch(task ->
+                !task.getKey().willBeRecoveredAutomatically() && task.getValue().isRunning()
+            )
+    );
     private final EasyBinding<Double> tasksProgress = EasyBind.reduce(
         backgroundTasks,
         tasks ->
@@ -110,17 +99,13 @@ public class StateManager {
     private final ObservableList<SidePaneType> visibleSidePanes =
         FXCollections.observableArrayList();
 
-    private final ObjectProperty<
-        LastAutomaticFieldEditorEdit
-    > lastAutomaticFieldEditorEdit = new SimpleObjectProperty<>();
+    private final ObjectProperty<LastAutomaticFieldEditorEdit> lastAutomaticFieldEditorEdit =
+        new SimpleObjectProperty<>();
 
-    private final ObservableList<String> searchHistory =
-        FXCollections.observableArrayList();
+    private final ObservableList<String> searchHistory = FXCollections.observableArrayList();
 
     public StateManager() {
-        activeGroups.bind(
-            Bindings.valueAt(selectedGroups, activeDatabase.orElseOpt(null))
-        );
+        activeGroups.bind(Bindings.valueAt(selectedGroups, activeDatabase.orElseOpt(null)));
     }
 
     public ObservableList<SidePaneType> getVisibleSidePaneComponents() {
@@ -143,10 +128,7 @@ public OptionalObjectProperty<SearchQuery> activeSearchQueryProperty() {
         return activeSearchQuery;
     }
 
-    public void setActiveSearchResultSize(
-        BibDatabaseContext database,
-        IntegerProperty resultSize
-    ) {
+    public void setActiveSearchResultSize(BibDatabaseContext database, IntegerProperty resultSize) {
         searchResultMap.put(database, resultSize);
     }
 
@@ -174,17 +156,11 @@ public void setSelectedGroups(
         List<GroupTreeNode> newSelectedGroups
     ) {
         Objects.requireNonNull(newSelectedGroups);
-        selectedGroups.put(
-            database,
-            FXCollections.observableArrayList(newSelectedGroups)
-        );
+        selectedGroups.put(database, FXCollections.observableArrayList(newSelectedGroups));
     }
 
-    public ObservableList<GroupTreeNode> getSelectedGroup(
-        BibDatabaseContext database
-    ) {
-        ObservableList<GroupTreeNode> selectedGroupsForDatabase =
-            selectedGroups.get(database);
+    public ObservableList<GroupTreeNode> getSelectedGroup(BibDatabaseContext database) {
+        ObservableList<GroupTreeNode> selectedGroupsForDatabase = selectedGroups.get(database);
         return selectedGroupsForDatabase != null
             ? selectedGroupsForDatabase
             : FXCollections.observableArrayList();
@@ -233,10 +209,7 @@ public ObservableList<Task<?>> getBackgroundTasks() {
         return EasyBind.map(backgroundTasks, Pair::getValue);
     }
 
-    public void addBackgroundTask(
-        BackgroundTask<?> backgroundTask,
-        Task<?> task
-    ) {
+    public void addBackgroundTask(BackgroundTask<?> backgroundTask, Task<?> task) {
         this.backgroundTasks.add(0, new Pair<>(backgroundTask, task));
     }
 
@@ -256,16 +229,11 @@ public DialogWindowState getDialogWindowState(String className) {
         return dialogWindowStates.get(className);
     }
 
-    public void setDialogWindowState(
-        String className,
-        DialogWindowState state
-    ) {
+    public void setDialogWindowState(String className, DialogWindowState state) {
         dialogWindowStates.put(className, state);
     }
 
-    public ObjectProperty<
-        LastAutomaticFieldEditorEdit
-    > lastAutomaticFieldEditorEditProperty() {
+    public ObjectProperty<LastAutomaticFieldEditorEdit> lastAutomaticFieldEditorEditProperty() {
         return lastAutomaticFieldEditorEdit;
     }
 
diff --git a/src/main/java/org/jabref/gui/Telemetry.java b/src/main/java/org/jabref/gui/Telemetry.java
index 8cb6d383364..4098b7d6dec 100644
--- a/src/main/java/org/jabref/gui/Telemetry.java
+++ b/src/main/java/org/jabref/gui/Telemetry.java
@@ -12,10 +12,7 @@ public static Optional<TelemetryClient> getTelemetryClient() {
         return Optional.empty();
     }
 
-    private static void start(
-        TelemetryPreferences telemetryPreferences,
-        BuildInfo buildInfo
-    ) {}
+    private static void start(TelemetryPreferences telemetryPreferences, BuildInfo buildInfo) {}
 
     public static void shutdown() {
         getTelemetryClient().ifPresent(client -> {});
diff --git a/src/main/java/org/jabref/gui/TelemetryClient.java b/src/main/java/org/jabref/gui/TelemetryClient.java
index ba453a4d8d4..bb1bfe2c611 100644
--- a/src/main/java/org/jabref/gui/TelemetryClient.java
+++ b/src/main/java/org/jabref/gui/TelemetryClient.java
@@ -6,9 +6,5 @@ public class TelemetryClient {
 
     public void trackEvent(String actionName) {}
 
-    public <K, V> void trackEvent(
-        String actionName,
-        Map<K, V> source,
-        Map<K, V> of
-    ) {}
+    public <K, V> void trackEvent(String actionName, Map<K, V> source, Map<K, V> of) {}
 }
diff --git a/src/main/java/org/jabref/gui/UpdateTimestampListener.java b/src/main/java/org/jabref/gui/UpdateTimestampListener.java
index 03b237177de..964acc27ccc 100644
--- a/src/main/java/org/jabref/gui/UpdateTimestampListener.java
+++ b/src/main/java/org/jabref/gui/UpdateTimestampListener.java
@@ -22,11 +22,8 @@ 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 (
-            preferencesService
-                .getTimestampPreferences()
-                .shouldAddModificationDate() &&
-            event.getEntriesEventSource() !=
-                EntriesEventSource.CLEANUP_TIMESTAMP
+            preferencesService.getTimestampPreferences().shouldAddModificationDate() &&
+            event.getEntriesEventSource() != EntriesEventSource.CLEANUP_TIMESTAMP
         ) {
             event
                 .getBibEntry()
diff --git a/src/main/java/org/jabref/gui/WaitForSaveFinishedDialog.java b/src/main/java/org/jabref/gui/WaitForSaveFinishedDialog.java
index db0bb254e3b..369e0650cdb 100644
--- a/src/main/java/org/jabref/gui/WaitForSaveFinishedDialog.java
+++ b/src/main/java/org/jabref/gui/WaitForSaveFinishedDialog.java
@@ -20,9 +20,7 @@ public void showAndWait(List<LibraryTab> LibraryTabs) {
             Task<Void> waitForSaveFinished = new Task<>() {
                 @Override
                 protected Void call() throws Exception {
-                    while (
-                        LibraryTabs.stream().anyMatch(LibraryTab::isSaving)
-                    ) {
+                    while (LibraryTabs.stream().anyMatch(LibraryTab::isSaving)) {
                         if (isCancelled()) {
                             return null;
                         } else {
@@ -35,8 +33,7 @@ protected Void call() throws Exception {
 
             dialogService.showProgressDialog(
                 Localization.lang("Please wait..."),
-                Localization.lang("Waiting for save operation to finish") +
-                "...",
+                Localization.lang("Waiting for save operation to finish") + "...",
                 waitForSaveFinished
             );
         }
diff --git a/src/main/java/org/jabref/gui/groups/GroupNodeViewModel.java b/src/main/java/org/jabref/gui/groups/GroupNodeViewModel.java
index 0d91a71e858..3dbd80e9455 100644
--- a/src/main/java/org/jabref/gui/groups/GroupNodeViewModel.java
+++ b/src/main/java/org/jabref/gui/groups/GroupNodeViewModel.java
@@ -55,19 +55,16 @@ public class GroupNodeViewModel {
     private final BibDatabaseContext databaseContext;
     private final StateManager stateManager;
     private final GroupTreeNode groupNode;
-    private final ObservableList<BibEntry> matchedEntries =
-        FXCollections.observableArrayList();
+    private final ObservableList<BibEntry> matchedEntries = FXCollections.observableArrayList();
     private final SimpleBooleanProperty hasChildren;
-    private final SimpleBooleanProperty expandedProperty =
-        new SimpleBooleanProperty();
+    private final SimpleBooleanProperty expandedProperty = new SimpleBooleanProperty();
     private final BooleanBinding anySelectedEntriesMatched;
     private final BooleanBinding allSelectedEntriesMatched;
     private final TaskExecutor taskExecutor;
     private final CustomLocalDragboard localDragBoard;
     private final ObservableList<BibEntry> entriesList;
     private final PreferencesService preferencesService;
-    private final InvalidationListener onInvalidatedGroup = listener ->
-        refreshGroup();
+    private final InvalidationListener onInvalidatedGroup = listener -> refreshGroup();
 
     public GroupNodeViewModel(
         BibDatabaseContext databaseContext,
@@ -89,24 +86,15 @@ public GroupNodeViewModel(
         if (groupNode.getGroup() instanceof AutomaticGroup automaticGroup) {
             children =
                 automaticGroup
-                    .createSubgroups(
-                        this.databaseContext.getDatabase().getEntries()
-                    )
+                    .createSubgroups(this.databaseContext.getDatabase().getEntries())
                     .stream()
                     .map(this::toViewModel)
                     .sorted((group1, group2) ->
-                        group1
-                            .getDisplayName()
-                            .compareToIgnoreCase(group2.getDisplayName())
+                        group1.getDisplayName().compareToIgnoreCase(group2.getDisplayName())
                     )
-                    .collect(
-                        Collectors.toCollection(
-                            FXCollections::observableArrayList
-                        )
-                    );
+                    .collect(Collectors.toCollection(FXCollections::observableArrayList));
         } else {
-            children =
-                EasyBind.mapBacked(groupNode.getChildren(), this::toViewModel);
+            children = EasyBind.mapBacked(groupNode.getChildren(), this::toViewModel);
         }
         if (groupNode.getGroup() instanceof TexGroup) {
             databaseContext
@@ -117,9 +105,7 @@ public GroupNodeViewModel(
         hasChildren = new SimpleBooleanProperty();
         hasChildren.bind(Bindings.isNotEmpty(children));
         EasyBind.subscribe(
-            preferencesService
-                .getGroupsPreferences()
-                .displayGroupCountProperty(),
+            preferencesService.getGroupsPreferences().displayGroupCountProperty(),
             shouldDisplay -> updateMatchedEntries()
         );
         expandedProperty.set(groupNode.getGroup().isExpanded());
@@ -136,8 +122,7 @@ public GroupNodeViewModel(
             stateManager.getSelectedEntries(),
             groupNode::matches
         );
-        anySelectedEntriesMatched =
-            selectedEntriesMatchStatus.anyMatch(matched -> matched);
+        anySelectedEntriesMatched = selectedEntriesMatchStatus.anyMatch(matched -> matched);
         // 'all' returns 'true' for empty streams, so this has to be checked explicitly
         allSelectedEntriesMatched =
             selectedEntriesMatchStatus
@@ -288,19 +273,12 @@ 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() {
-        Color color = groupNode
-            .getGroup()
-            .getColor()
-            .orElse(IconTheme.getDefaultGroupColor());
-        return IconTheme.JabRefIcons.DEFAULT_GROUP_ICON_COLORED.withColor(
-            color
-        );
+        Color color = groupNode.getGroup().getColor().orElse(IconTheme.getDefaultGroupColor());
+        return IconTheme.JabRefIcons.DEFAULT_GROUP_ICON_COLORED.withColor(color);
     }
 
     private Optional<JabRefIcon> parseIcon(String iconCode) {
@@ -318,9 +296,7 @@ public GroupTreeNode getGroupNode() {
     /**
      * Gets invoked if an entry in the current database changes.
      */
-    private void onDatabaseChanged(
-        ListChangeListener.Change<? extends BibEntry> change
-    ) {
+    private void onDatabaseChanged(ListChangeListener.Change<? extends BibEntry> change) {
         while (change.next()) {
             if (change.wasPermutated()) {
                 // Nothing to do, as permutation doesn't change matched entries
@@ -367,12 +343,9 @@ 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
         // for example, a previously matched entry gets removed -> hits = hits - 1
-        if (
-            preferencesService.getGroupsPreferences().shouldDisplayGroupCount()
-        ) {
+        if (preferencesService.getGroupsPreferences().shouldDisplayGroupCount()) {
             BackgroundTask
-                .wrap(() -> groupNode.findMatches(databaseContext.getDatabase())
-                )
+                .wrap(() -> groupNode.findMatches(databaseContext.getDatabase()))
                 .onSuccess(entries -> {
                     matchedEntries.clear();
                     matchedEntries.addAll(entries);
@@ -397,10 +370,7 @@ boolean isMatchedBy(String searchString) {
     }
 
     public Color getColor() {
-        return groupNode
-            .getGroup()
-            .getColor()
-            .orElse(IconTheme.getDefaultGroupColor());
+        return groupNode.getGroup().getColor().orElse(IconTheme.getDefaultGroupColor());
     }
 
     public String getPath() {
@@ -420,12 +390,9 @@ public Optional<GroupNodeViewModel> getChildByPath(String pathToSource) {
      */
     public boolean acceptableDrop(Dragboard dragboard) {
         // TODO: we should also check isNodeDescendant
-        boolean canDropOtherGroup = dragboard.hasContent(
-            DragAndDropDataFormats.GROUP
-        );
+        boolean canDropOtherGroup = dragboard.hasContent(DragAndDropDataFormats.GROUP);
         boolean canDropEntries =
-            localDragBoard.hasBibEntries() &&
-            (groupNode.getGroup() instanceof GroupEntryChanger);
+            localDragBoard.hasBibEntries() && (groupNode.getGroup() instanceof GroupEntryChanger);
         return canDropOtherGroup || canDropEntries;
     }
 
@@ -448,10 +415,7 @@ public Optional<GroupTreeNode> getParent() {
         return groupNode.getParent();
     }
 
-    public void draggedOn(
-        GroupNodeViewModel target,
-        DroppingMouseLocation mouseLocation
-    ) {
+    public void draggedOn(GroupNodeViewModel target, DroppingMouseLocation mouseLocation) {
         // No action, if the target is the same as the source
         if (this.equals(target)) {
             return;
@@ -497,9 +461,7 @@ public boolean canAddEntriesIn() {
             return false;
         } else if (group instanceof ExplicitGroup) {
             return true;
-        } else if (
-            group instanceof LastNameGroup || group instanceof RegexKeywordGroup
-        ) {
+        } else if (group instanceof LastNameGroup || group instanceof RegexKeywordGroup) {
             return groupNode
                 .getParent()
                 .map(parent -> parent.getGroup())
@@ -521,8 +483,7 @@ public boolean canAddEntriesIn() {
             return false;
         } else {
             throw new UnsupportedOperationException(
-                "canAddEntriesIn method not yet implemented in group: " +
-                group.getClass().getName()
+                "canAddEntriesIn method not yet implemented in group: " + group.getClass().getName()
             );
         }
     }
@@ -553,8 +514,7 @@ public boolean canBeDragged() {
             return true;
         } else {
             throw new UnsupportedOperationException(
-                "canBeDragged method not yet implemented in group: " +
-                group.getClass().getName()
+                "canBeDragged method not yet implemented in group: " + group.getClass().getName()
             );
         }
     }
@@ -585,8 +545,7 @@ public boolean canAddGroupsIn() {
             return true;
         } else {
             throw new UnsupportedOperationException(
-                "canAddGroupsIn method not yet implemented in group: " +
-                group.getClass().getName()
+                "canAddGroupsIn method not yet implemented in group: " + group.getClass().getName()
             );
         }
     }
@@ -617,8 +576,7 @@ public boolean canRemove() {
             return true;
         } else {
             throw new UnsupportedOperationException(
-                "canRemove method not yet implemented in group: " +
-                group.getClass().getName()
+                "canRemove method not yet implemented in group: " + group.getClass().getName()
             );
         }
     }
@@ -649,8 +607,7 @@ public boolean isEditable() {
             return true;
         } else {
             throw new UnsupportedOperationException(
-                "isEditable method not yet implemented in group: " +
-                group.getClass().getName()
+                "isEditable method not yet implemented in group: " + group.getClass().getName()
             );
         }
     }
diff --git a/src/main/java/org/jabref/gui/groups/GroupTreeNodeViewModel.java b/src/main/java/org/jabref/gui/groups/GroupTreeNodeViewModel.java
index b1babbe6b79..49cc2bb4df8 100644
--- a/src/main/java/org/jabref/gui/groups/GroupTreeNodeViewModel.java
+++ b/src/main/java/org/jabref/gui/groups/GroupTreeNodeViewModel.java
@@ -20,9 +20,7 @@
 
 public class GroupTreeNodeViewModel {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(
-        GroupTreeNodeViewModel.class
-    );
+    private static final Logger LOGGER = LoggerFactory.getLogger(GroupTreeNodeViewModel.class);
 
     private final GroupTreeNode node;
 
@@ -59,22 +57,14 @@ public String getDescription() {
         String shortDescription = "";
         boolean showDynamic = true;
         if (group instanceof ExplicitGroup explicitGroup) {
-            shortDescription =
-                GroupDescriptions.getShortDescriptionExplicitGroup(
-                    explicitGroup
-                );
+            shortDescription = GroupDescriptions.getShortDescriptionExplicitGroup(explicitGroup);
         } else if (group instanceof KeywordGroup keywordGroup) {
             shortDescription =
-                GroupDescriptions.getShortDescriptionKeywordGroup(
-                    keywordGroup,
-                    showDynamic
-                );
+                GroupDescriptions.getShortDescriptionKeywordGroup(keywordGroup, showDynamic);
         } else if (group instanceof SearchGroup searchGroup) {
-            shortDescription =
-                GroupDescriptions.getShortDescription(searchGroup, showDynamic);
+            shortDescription = GroupDescriptions.getShortDescription(searchGroup, showDynamic);
         } else {
-            shortDescription =
-                GroupDescriptions.getShortDescriptionAllEntriesGroup();
+            shortDescription = GroupDescriptions.getShortDescriptionAllEntriesGroup();
         }
         return "<html>" + shortDescription + "</html>";
     }
@@ -97,10 +87,7 @@ public void sortChildrenByName(boolean recursive) {
         getNode()
             .sortChildren(
                 (node1, node2) ->
-                    node1
-                        .getGroup()
-                        .getName()
-                        .compareToIgnoreCase(node2.getGroup().getName()),
+                    node1.getGroup().getName().compareToIgnoreCase(node2.getGroup().getName()),
                 recursive
             );
     }
@@ -160,10 +147,7 @@ public boolean canMoveRight() {
         );
     }
 
-    public void changeEntriesTo(
-        List<BibEntry> entries,
-        UndoManager undoManager
-    ) {
+    public void changeEntriesTo(List<BibEntry> entries, UndoManager undoManager) {
         AbstractGroup group = node.getGroup();
         List<FieldChange> changesRemove = new ArrayList<>();
         List<FieldChange> changesAdd = new ArrayList<>();
@@ -194,25 +178,17 @@ public void changeEntriesTo(
 
         // 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
-                    )
-                );
+                undoRemove.addEdit(UndoableChangeEntriesOfGroup.getUndoableEdit(this, changesAdd));
             }
             undoManager.addEdit(undoRemove);
         } else if (!changesAdd.isEmpty()) {
-            undoManager.addEdit(
-                UndoableChangeEntriesOfGroup.getUndoableEdit(this, changesAdd)
-            );
+            undoManager.addEdit(UndoableChangeEntriesOfGroup.getUndoableEdit(this, changesAdd));
         }
     }
 
@@ -224,10 +200,7 @@ public boolean isAllEntriesGroup() {
         return getNode().getGroup() instanceof AllEntriesGroup;
     }
 
-    public void addNewGroup(
-        AbstractGroup newGroup,
-        CountingUndoManager undoManager
-    ) {
+    public void addNewGroup(AbstractGroup newGroup, CountingUndoManager undoManager) {
         GroupTreeNode newNode = GroupTreeNode.fromGroup(newGroup);
         this.getNode().addChild(newNode);
 
@@ -246,9 +219,7 @@ public List<FieldChange> addEntriesToGroup(List<BibEntry> entries) {
         return node.addEntriesToGroup(entries);
     }
 
-    public void subscribeToDescendantChanged(
-        Consumer<GroupTreeNodeViewModel> subscriber
-    ) {
+    public void subscribeToDescendantChanged(Consumer<GroupTreeNodeViewModel> subscriber) {
         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 16225eccc6c..09d38046997 100644
--- a/src/main/java/org/jabref/gui/groups/GroupTreeView.java
+++ b/src/main/java/org/jabref/gui/groups/GroupTreeView.java
@@ -68,31 +68,23 @@
 
 public class GroupTreeView extends BorderPane {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(
-        GroupTreeView.class
-    );
+    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_ROOTELEMENT =
-        PseudoClass.getPseudoClass("root");
-    private static final PseudoClass PSEUDOCLASS_SUBELEMENT =
-        PseudoClass.getPseudoClass("sub"); // > 1 deep
+    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 double SCROLL_SPEED_UP = 3.0;
 
     private TreeTableView<GroupNodeViewModel> groupTree;
     private TreeTableColumn<GroupNodeViewModel, GroupNodeViewModel> mainColumn;
-    private TreeTableColumn<
-        GroupNodeViewModel,
-        GroupNodeViewModel
-    > numberColumn;
-    private TreeTableColumn<
-        GroupNodeViewModel,
-        GroupNodeViewModel
-    > expansionNodeColumn;
+    private TreeTableColumn<GroupNodeViewModel, GroupNodeViewModel> numberColumn;
+    private TreeTableColumn<GroupNodeViewModel, GroupNodeViewModel> expansionNodeColumn;
     private CustomTextField searchField;
 
     private final StateManager stateManager;
@@ -130,9 +122,7 @@ public GroupTreeView(
         this.getStylesheets()
             .add(
                 Objects
-                    .requireNonNull(
-                        GroupTreeView.class.getResource("GroupTree.css")
-                    )
+                    .requireNonNull(GroupTreeView.class.getResource("GroupTree.css"))
                     .toExternalForm()
             );
         initialize();
@@ -166,17 +156,11 @@ private void createNodes() {
 
         groupTree = new TreeTableView<>();
         groupTree.setId("groupTree");
-        groupTree.setColumnResizePolicy(
-            TreeTableView.CONSTRAINED_RESIZE_POLICY_FLEX_LAST_COLUMN
-        );
-        groupTree
-            .getColumns()
-            .addAll(List.of(mainColumn, numberColumn, expansionNodeColumn));
+        groupTree.setColumnResizePolicy(TreeTableView.CONSTRAINED_RESIZE_POLICY_FLEX_LAST_COLUMN);
+        groupTree.getColumns().addAll(List.of(mainColumn, numberColumn, expansionNodeColumn));
         this.setCenter(groupTree);
 
-        mainColumn
-            .prefWidthProperty()
-            .bind(groupTree.widthProperty().subtract(80d).subtract(15d));
+        mainColumn.prefWidthProperty().bind(groupTree.widthProperty().subtract(80d).subtract(15d));
 
         Button addNewGroup = new Button(Localization.lang("Add group"));
         addNewGroup.setId("addNewGroup");
@@ -210,8 +194,7 @@ private void initialize() {
             BindingsHelper.bindContentBidirectional(
                 groupTree.getSelectionModel().getSelectedItems(),
                 viewModel.selectedGroupsProperty(),
-                newSelectedGroups ->
-                    newSelectedGroups.forEach(this::selectNode),
+                newSelectedGroups -> newSelectedGroups.forEach(this::selectNode),
                 this::updateSelection
             )
         );
@@ -222,16 +205,12 @@ private void initialize() {
             Duration.ofMillis(400),
             () -> {
                 LOGGER.debug("Run group search {}", searchField.getText());
-                viewModel
-                    .filterTextProperty()
-                    .setValue(searchField.textProperty().getValue());
+                viewModel.filterTextProperty().setValue(searchField.textProperty().getValue());
             }
         );
         searchField
             .textProperty()
-            .addListener((observable, oldValue, newValue) ->
-                searchTask.restart()
-            );
+            .addListener((observable, oldValue, newValue) -> searchTask.restart());
 
         groupTree
             .rootProperty()
@@ -282,8 +261,7 @@ private void initialize() {
                 MouseEvent.MOUSE_PRESSED,
                 (row, event) -> {
                     if (
-                        ((MouseEvent) event).getButton() ==
-                            MouseButton.SECONDARY &&
+                        ((MouseEvent) event).getButton() == MouseButton.SECONDARY &&
                         !stateManager.getSelectedEntries().isEmpty()
                     ) {
                         // Prevent right-click to select group whe we have selected entries
@@ -291,9 +269,7 @@ private void initialize() {
                     } else if (event.getTarget() instanceof StackPane pane) {
                         if (
                             pane.getStyleClass().contains("arrow") ||
-                            pane
-                                .getStyleClass()
-                                .contains("tree-disclosure-node")
+                            pane.getStyleClass().contains("tree-disclosure-node")
                         ) {
                             event.consume();
                         }
@@ -306,9 +282,7 @@ private void initialize() {
                 row.setDisclosureNode(null);
                 row
                     .disclosureNodeProperty()
-                    .addListener((observable, oldValue, newValue) ->
-                        row.setDisclosureNode(null)
-                    );
+                    .addListener((observable, oldValue, newValue) -> row.setDisclosureNode(null));
             })
             .setOnDragDetected(this::handleOnDragDetected)
             .setOnDragDropped(this::handleOnDragDropped)
@@ -329,9 +303,7 @@ private void initialize() {
                 PSEUDOCLASS_SUBELEMENT,
                 row ->
                     Bindings.createBooleanBinding(
-                        () ->
-                            (row != null) &&
-                            (groupTree.getTreeItemLevel(row.getTreeItem()) > 1),
+                        () -> (row != null) && (groupTree.getTreeItemLevel(row.getTreeItem()) > 1),
                         row.treeItemProperty()
                     )
             )
@@ -371,9 +343,7 @@ private StackPane createNumberCell(GroupNodeViewModel group) {
         }
         Text text = new Text();
         EasyBind.subscribe(
-            preferencesService
-                .getGroupsPreferences()
-                .displayGroupCountProperty(),
+            preferencesService.getGroupsPreferences().displayGroupCountProperty(),
             shouldDisplayGroupCount -> {
                 if (text.textProperty().isBound()) {
                     text.textProperty().unbind();
@@ -383,12 +353,7 @@ private StackPane createNumberCell(GroupNodeViewModel group) {
                 if (shouldDisplayGroupCount) {
                     text
                         .textProperty()
-                        .bind(
-                            group
-                                .getHits()
-                                .map(Number::intValue)
-                                .map(this::getFormattedNumber)
-                        );
+                        .bind(group.getHits().map(Number::intValue).map(this::getFormattedNumber));
                     Tooltip tooltip = new Tooltip();
                     tooltip.textProperty().bind(group.getHits().asString());
                     Tooltip.install(text, tooltip);
@@ -416,14 +381,9 @@ private StackPane createNumberCell(GroupNodeViewModel group) {
                         } else {
                             reducedFontSize = 0.75;
                         }
-                        return String.format(
-                            "-fx-font-size: %fem;",
-                            reducedFontSize
-                        );
+                        return String.format("-fx-font-size: %fem;", reducedFontSize);
                     },
-                    preferencesService
-                        .getWorkspacePreferences()
-                        .mainFontSizeProperty()
+                    preferencesService.getWorkspacePreferences().mainFontSizeProperty()
                 )
             );
 
@@ -477,10 +437,7 @@ private void handleOnDragDropped(
         Dragboard dragboard = event.getDragboard();
         boolean success = false;
 
-        if (
-            dragboard.hasContent(DragAndDropDataFormats.GROUP) &&
-            row.getItem().canAddGroupsIn()
-        ) {
+        if (dragboard.hasContent(DragAndDropDataFormats.GROUP) && row.getItem().canAddGroupsIn()) {
             List<String> pathToSources = (List<String>) dragboard.getContent(
                 DragAndDropDataFormats.GROUP
             );
@@ -541,9 +498,7 @@ private void handleOnDragOver(
         }
     }
 
-    private void updateSelection(
-        List<TreeItem<GroupNodeViewModel>> newSelectedGroups
-    ) {
+    private void updateSelection(List<TreeItem<GroupNodeViewModel>> newSelectedGroups) {
         if ((newSelectedGroups == null) || newSelectedGroups.isEmpty()) {
             viewModel.selectedGroupsProperty().clear();
         } else {
@@ -551,8 +506,7 @@ private void updateSelection(
                 .stream()
                 .filter(model ->
                     (model != null) &&
-                    !(model.getValue().getGroupNode().getGroup() instanceof
-                        AllEntriesGroup)
+                    !(model.getValue().getGroupNode().getGroup() instanceof AllEntriesGroup)
                 )
                 .map(TreeItem::getValue)
                 .collect(Collectors.toList());
@@ -578,9 +532,7 @@ private void selectNode(GroupNodeViewModel value, boolean expandParents) {
             });
     }
 
-    private Optional<TreeItem<GroupNodeViewModel>> getTreeItemByValue(
-        GroupNodeViewModel value
-    ) {
+    private Optional<TreeItem<GroupNodeViewModel>> getTreeItemByValue(GroupNodeViewModel value) {
         return getTreeItemByValue(groupTree.getRoot(), value);
     }
 
@@ -617,8 +569,7 @@ private void setupDragScrolling() {
                 () ->
                     getVerticalScrollbar()
                         .ifPresent(scrollBar -> {
-                            double newValue =
-                                scrollBar.getValue() + scrollVelocity;
+                            double newValue = scrollBar.getValue() + scrollVelocity;
                             newValue = Math.min(newValue, 1d);
                             newValue = Math.max(newValue, 0d);
                             scrollBar.setValue(newValue);
@@ -643,19 +594,15 @@ private void setupDragScrolling() {
 
             double distanceFromNonScrollableInsideArea;
             if (scrollingUp) {
-                distanceFromNonScrollableInsideArea =
-                    scrollableAreaHeight - event.getY();
+                distanceFromNonScrollableInsideArea = scrollableAreaHeight - event.getY();
             } else {
                 distanceFromNonScrollableInsideArea =
-                    scrollableAreaHeight -
-                    (groupTree.getHeight() - event.getY());
+                    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;
+            scrollVelocity = (baseFactor * (1.0 + distanceFromNonScrollableInsideArea)) / 10.0;
             if (scrollingUp) {
                 scrollVelocity = -scrollVelocity;
             }
@@ -687,8 +634,7 @@ private void initScrolling() {
         heightOfOneNode = heightOfOneNode * 2.0;
 
         // At most scroll area is three entries large
-        scrollableAreaHeight =
-            Math.min(heightOfOneNode * 3.0, groupTree.getHeight() / 3.0);
+        scrollableAreaHeight = Math.min(heightOfOneNode * 3.0, groupTree.getHeight() / 3.0);
         upperBorder = scrollableAreaHeight;
         lowerBorder = groupTree.getHeight() - scrollableAreaHeight;
 
@@ -716,9 +662,7 @@ private ContextMenu createContextMenuForGroup(GroupNodeViewModel group) {
         }
 
         ContextMenu contextMenu = new ContextMenu();
-        ActionFactory factory = new ActionFactory(
-            preferencesService.getKeyBindingRepository()
-        );
+        ActionFactory factory = new ActionFactory(preferencesService.getKeyBindingRepository());
 
         MenuItem removeGroup;
         if (group.hasSubgroups() && group.canAddGroupsIn() && !group.isRoot()) {
@@ -745,10 +689,7 @@ private ContextMenu createContextMenuForGroup(GroupNodeViewModel group) {
             removeGroup =
                 factory.createMenuItem(
                     StandardActions.GROUP_REMOVE,
-                    new GroupTreeView.ContextAction(
-                        StandardActions.GROUP_REMOVE,
-                        group
-                    )
+                    new GroupTreeView.ContextAction(StandardActions.GROUP_REMOVE, group)
                 );
         }
 
@@ -767,38 +708,23 @@ private ContextMenu createContextMenuForGroup(GroupNodeViewModel group) {
                 ),
                 factory.createMenuItem(
                     StandardActions.GROUP_SUBGROUP_REMOVE,
-                    new ContextAction(
-                        StandardActions.GROUP_SUBGROUP_REMOVE,
-                        group
-                    )
+                    new ContextAction(StandardActions.GROUP_SUBGROUP_REMOVE, group)
                 ),
                 factory.createMenuItem(
                     StandardActions.GROUP_SUBGROUP_SORT,
-                    new ContextAction(
-                        StandardActions.GROUP_SUBGROUP_SORT,
-                        group
-                    )
+                    new ContextAction(StandardActions.GROUP_SUBGROUP_SORT, group)
                 ),
                 factory.createMenuItem(
                     StandardActions.GROUP_SUBGROUP_SORT_REVERSE,
-                    new ContextAction(
-                        StandardActions.GROUP_SUBGROUP_SORT_REVERSE,
-                        group
-                    )
+                    new ContextAction(StandardActions.GROUP_SUBGROUP_SORT_REVERSE, group)
                 ),
                 factory.createMenuItem(
                     StandardActions.GROUP_SUBGROUP_SORT_ENTRIES,
-                    new ContextAction(
-                        StandardActions.GROUP_SUBGROUP_SORT_ENTRIES,
-                        group
-                    )
+                    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 ContextAction(StandardActions.GROUP_SUBGROUP_SORT_ENTRIES_REVERSE, group)
                 ),
                 new SeparatorMenuItem(),
                 factory.createMenuItem(
@@ -807,10 +733,7 @@ private ContextMenu createContextMenuForGroup(GroupNodeViewModel group) {
                 ),
                 factory.createMenuItem(
                     StandardActions.GROUP_ENTRIES_REMOVE,
-                    new ContextAction(
-                        StandardActions.GROUP_ENTRIES_REMOVE,
-                        group
-                    )
+                    new ContextAction(StandardActions.GROUP_ENTRIES_REMOVE, group)
                 )
             );
 
@@ -846,11 +769,7 @@ private void setupClearButtonField(CustomTextField customTextField) {
                     );
             m.setAccessible(true);
             m.invoke(null, customTextField, customTextField.rightProperty());
-        } catch (
-            NoSuchMethodException
-            | IllegalAccessException
-            | InvocationTargetException ex
-        ) {
+        } catch (NoSuchMethodException | IllegalAccessException | InvocationTargetException ex) {
             LOGGER.error("Failed to decorate text field with clear button", ex);
         }
     }
@@ -869,10 +788,7 @@ public void expandGroup(TreeItem<GroupNodeViewModel> treeItem) {
                 return;
             }
 
-            if (
-                (System.currentTimeMillis() - this.dragStarted) >
-                DRAG_TIME_BEFORE_EXPANDING_MS
-            ) {
+            if ((System.currentTimeMillis() - this.dragStarted) > DRAG_TIME_BEFORE_EXPANDING_MS) {
                 // expand or collapse the tree item and reset the time
                 this.dragStarted = System.currentTimeMillis();
                 this.draggedItem.setExpanded(!this.draggedItem.isExpanded());
@@ -888,10 +804,7 @@ private class ContextAction extends SimpleCommand {
         private final StandardActions command;
         private final GroupNodeViewModel group;
 
-        public ContextAction(
-            StandardActions command,
-            GroupNodeViewModel group
-        ) {
+        public ContextAction(StandardActions command, GroupNodeViewModel group) {
             this.command = command;
             this.group = group;
 
@@ -914,8 +827,7 @@ public ContextAction(
                                 group.hasSubgroups() &&
                                 group.canAddEntriesIn()) ||
                             group.isRoot();
-                            case GROUP_ENTRIES_ADD,
-                                GROUP_ENTRIES_REMOVE -> group.canAddEntriesIn();
+                            case GROUP_ENTRIES_ADD, GROUP_ENTRIES_REMOVE -> group.canAddEntriesIn();
                             default -> true;
                         }
                     )
@@ -926,12 +838,8 @@ public ContextAction(
         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_KEEP_SUBGROUPS -> viewModel.removeGroupKeepSubgroups(group);
+                case GROUP_REMOVE_WITH_SUBGROUPS -> viewModel.removeGroupAndSubgroups(group);
                 case GROUP_EDIT -> {
                     viewModel.editGroup(group);
                     groupTree.refresh();
@@ -954,9 +862,7 @@ public void execute() {
                     group.getGroupNode()
                 );
                 case GROUP_ENTRIES_ADD -> viewModel.addSelectedEntries(group);
-                case GROUP_ENTRIES_REMOVE -> viewModel.removeSelectedEntries(
-                    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 95783d332bd..5636f469970 100644
--- a/src/main/java/org/jabref/gui/groups/GroupTreeViewModel.java
+++ b/src/main/java/org/jabref/gui/groups/GroupTreeViewModel.java
@@ -42,18 +42,17 @@
 
 public class GroupTreeViewModel extends AbstractViewModel {
 
-    private final ObjectProperty<GroupNodeViewModel> rootGroup =
-        new SimpleObjectProperty<>();
-    private final ListProperty<GroupNodeViewModel> selectedGroups =
-        new SimpleListProperty<>(FXCollections.observableArrayList());
+    private final ObjectProperty<GroupNodeViewModel> rootGroup = new SimpleObjectProperty<>();
+    private final ListProperty<GroupNodeViewModel> selectedGroups = new SimpleListProperty<>(
+        FXCollections.observableArrayList()
+    );
     private final StateManager stateManager;
     private final DialogService dialogService;
     private final PreferencesService 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,
@@ -65,28 +64,17 @@ public class GroupTreeViewModel extends AbstractViewModel {
             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();
+    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();
+        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();
@@ -105,25 +93,18 @@ public GroupTreeViewModel(
         this.localDragboard = Objects.requireNonNull(localDragboard);
 
         // Register listener
-        EasyBind.subscribe(
-            stateManager.activeDatabaseProperty(),
-            this::onActiveDatabaseChanged
-        );
+        EasyBind.subscribe(stateManager.activeDatabaseProperty(), this::onActiveDatabaseChanged);
         EasyBind.subscribe(selectedGroups, this::onSelectedGroupChanged);
 
         // Set-up bindings
-        filterPredicate.bind(
-            EasyBind.map(filterText, text -> group -> group.isMatchedBy(text))
-        );
+        filterPredicate.bind(EasyBind.map(filterText, text -> group -> group.isMatchedBy(text)));
 
         // Init
         refresh();
     }
 
     private void refresh() {
-        onActiveDatabaseChanged(
-            stateManager.activeDatabaseProperty().getValue()
-        );
+        onActiveDatabaseChanged(stateManager.activeDatabaseProperty().getValue());
     }
 
     public ObjectProperty<GroupNodeViewModel> rootGroupProperty() {
@@ -134,9 +115,7 @@ public ListProperty<GroupNodeViewModel> selectedGroupsProperty() {
         return selectedGroups;
     }
 
-    public ObjectProperty<
-        Predicate<GroupNodeViewModel>
-    > filterPredicateProperty() {
+    public ObjectProperty<Predicate<GroupNodeViewModel>> filterPredicateProperty() {
         return filterPredicate;
     }
 
@@ -148,14 +127,8 @@ public StringProperty filterTextProperty() {
      * Gets invoked if the user selects a different group.
      * We need to notify the {@link StateManager} about this change so that the main table gets updated.
      */
-    private void onSelectedGroupChanged(
-        ObservableList<GroupNodeViewModel> newValue
-    ) {
-        if (
-            !currentDatabase.equals(
-                stateManager.activeDatabaseProperty().getValue()
-            )
-        ) {
+    private void onSelectedGroupChanged(ObservableList<GroupNodeViewModel> newValue) {
+        if (!currentDatabase.equals(stateManager.activeDatabaseProperty().getValue())) {
             // Switch of database occurred -> do nothing
             return;
         }
@@ -184,9 +157,7 @@ public void addNewGroupToRoot() {
         } else {
             dialogService.showWarningDialogAndWait(
                 Localization.lang("Cannot create group"),
-                Localization.lang(
-                    "Cannot create group. Please create a library first."
-                )
+                Localization.lang("Cannot create group. Please create a library first.")
             );
         }
     }
@@ -195,9 +166,7 @@ public void addNewGroupToRoot() {
      * Gets invoked if the user changes the active database.
      * We need to get the new group tree and update the view
      */
-    private void onActiveDatabaseChanged(
-        Optional<BibDatabaseContext> newDatabase
-    ) {
+    private void onActiveDatabaseChanged(Optional<BibDatabaseContext> newDatabase) {
         if (newDatabase.isPresent()) {
             GroupNodeViewModel newRoot = newDatabase
                 .map(BibDatabaseContext::getMetaData)
@@ -254,15 +223,11 @@ private void onActiveDatabaseChanged(
     /**
      * Opens "New Group Dialog" and adds the resulting group as subgroup to the specified group
      */
-    public void addNewSubgroup(
-        GroupNodeViewModel parent,
-        GroupDialogHeader groupDialogHeader
-    ) {
+    public void addNewSubgroup(GroupNodeViewModel parent, GroupDialogHeader groupDialogHeader) {
         currentDatabase.ifPresent(database -> {
-            Optional<AbstractGroup> newGroup =
-                dialogService.showCustomDialogAndWait(
-                    new GroupDialogView(database, null, groupDialogHeader)
-                );
+            Optional<AbstractGroup> newGroup = dialogService.showCustomDialogAndWait(
+                new GroupDialogView(database, null, groupDialogHeader)
+            );
 
             newGroup.ifPresent(group -> {
                 parent.addSubgroup(group);
@@ -274,9 +239,7 @@ public void addNewSubgroup(
                 // TODO: Expand parent to make new group visible
                 // parent.expand();
 
-                dialogService.notify(
-                    Localization.lang("Added group \"%0\".", group.getName())
-                );
+                dialogService.notify(Localization.lang("Added group \"%0\".", group.getName()));
                 writeGroupChangesToMetaData();
             });
         });
@@ -288,10 +251,7 @@ public void writeGroupChangesToMetaData() {
         );
     }
 
-    private boolean isGroupTypeEqual(
-        AbstractGroup oldGroup,
-        AbstractGroup newGroup
-    ) {
+    private boolean isGroupTypeEqual(AbstractGroup oldGroup, AbstractGroup newGroup) {
         return oldGroup.getClass().equals(newGroup.getClass());
     }
 
@@ -324,10 +284,8 @@ boolean onlyMinorChanges(AbstractGroup oldGroup, AbstractGroup newGroup) {
                 )
             );
         } else if (oldGroup.getClass() == RegexKeywordGroup.class) {
-            RegexKeywordGroup oldRegexKeywordGroup =
-                (RegexKeywordGroup) oldGroup;
-            RegexKeywordGroup newRegexKeywordGroup =
-                (RegexKeywordGroup) newGroup;
+            RegexKeywordGroup oldRegexKeywordGroup = (RegexKeywordGroup) oldGroup;
+            RegexKeywordGroup newRegexKeywordGroup = (RegexKeywordGroup) newGroup;
 
             return (
                 Objects.equals(
@@ -352,16 +310,11 @@ boolean onlyMinorChanges(AbstractGroup oldGroup, AbstractGroup newGroup) {
                     oldSearchGroup.getSearchExpression(),
                     newSearchGroup.getSearchExpression()
                 ) &&
-                Objects.equals(
-                    oldSearchGroup.getSearchFlags(),
-                    newSearchGroup.getSearchFlags()
-                )
+                Objects.equals(oldSearchGroup.getSearchFlags(), newSearchGroup.getSearchFlags())
             );
         } else if (oldGroup.getClass() == AutomaticKeywordGroup.class) {
-            AutomaticKeywordGroup oldAutomaticKeywordGroup =
-                (AutomaticKeywordGroup) oldGroup;
-            AutomaticKeywordGroup newAutomaticKeywordGroup =
-                (AutomaticKeywordGroup) oldGroup;
+            AutomaticKeywordGroup oldAutomaticKeywordGroup = (AutomaticKeywordGroup) oldGroup;
+            AutomaticKeywordGroup newAutomaticKeywordGroup = (AutomaticKeywordGroup) oldGroup;
 
             return (
                 Objects.equals(
@@ -378,10 +331,8 @@ boolean onlyMinorChanges(AbstractGroup oldGroup, AbstractGroup newGroup) {
                 )
             );
         } else if (oldGroup.getClass() == AutomaticPersonsGroup.class) {
-            AutomaticPersonsGroup oldAutomaticPersonsGroup =
-                (AutomaticPersonsGroup) oldGroup;
-            AutomaticPersonsGroup newAutomaticPersonsGroup =
-                (AutomaticPersonsGroup) newGroup;
+            AutomaticPersonsGroup oldAutomaticPersonsGroup = (AutomaticPersonsGroup) oldGroup;
+            AutomaticPersonsGroup newAutomaticPersonsGroup = (AutomaticPersonsGroup) newGroup;
 
             return Objects.equals(
                 oldAutomaticPersonsGroup.getField().getName(),
@@ -403,14 +354,13 @@ boolean onlyMinorChanges(AbstractGroup oldGroup, AbstractGroup newGroup) {
      */
     public void editGroup(GroupNodeViewModel oldGroup) {
         currentDatabase.ifPresent(database -> {
-            Optional<AbstractGroup> newGroup =
-                dialogService.showCustomDialogAndWait(
-                    new GroupDialogView(
-                        database,
-                        oldGroup.getGroupNode().getGroup(),
-                        GroupDialogHeader.SUBGROUP
-                    )
-                );
+            Optional<AbstractGroup> newGroup = dialogService.showCustomDialogAndWait(
+                new GroupDialogView(
+                    database,
+                    oldGroup.getGroupNode().getGroup(),
+                    GroupDialogHeader.SUBGROUP
+                )
+            );
             newGroup.ifPresent(group -> {
                 AbstractGroup oldGroupDef = oldGroup.getGroupNode().getGroup();
                 String oldGroupName = oldGroupDef.getName();
@@ -436,9 +386,7 @@ public void editGroup(GroupNodeViewModel oldGroup) {
                         groupsWithSameName =
                             databaseRootGroup
                                 .get()
-                                .findChildrenSatisfying(g ->
-                                    g.getName().equals(oldGroupName)
-                                )
+                                .findChildrenSatisfying(g -> g.getName().equals(oldGroupName))
                                 .size();
                     }
                     boolean removePreviousAssignments = true;
@@ -449,18 +397,10 @@ public void editGroup(GroupNodeViewModel oldGroup) {
 
                     oldGroup
                         .getGroupNode()
-                        .setGroup(
-                            group,
-                            true,
-                            removePreviousAssignments,
-                            database.getEntries()
-                        );
+                        .setGroup(group, true, removePreviousAssignments, database.getEntries());
 
                     dialogService.notify(
-                        Localization.lang(
-                            "Modified group \"%0\".",
-                            group.getName()
-                        )
+                        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
@@ -468,13 +408,8 @@ public void editGroup(GroupNodeViewModel oldGroup) {
                     return;
                 }
 
-                if (
-                    groupTypeEqual &&
-                    onlyMinorChanges(oldGroup.getGroupNode().getGroup(), group)
-                ) {
-                    oldGroup
-                        .getGroupNode()
-                        .setGroup(group, true, true, database.getEntries());
+                if (groupTypeEqual && onlyMinorChanges(oldGroup.getGroupNode().getGroup(), group)) {
+                    oldGroup.getGroupNode().setGroup(group, true, true, database.getEntries());
 
                     writeGroupChangesToMetaData();
                     refresh();
@@ -517,8 +452,7 @@ public void editGroup(GroupNodeViewModel oldGroup) {
                         cancel
                     );
                 boolean removePreviousAssignments =
-                    (oldGroup.getGroupNode().getGroup() instanceof
-                        ExplicitGroup) &&
+                    (oldGroup.getGroupNode().getGroup() instanceof ExplicitGroup) &&
                     (group instanceof ExplicitGroup);
 
                 int groupsWithSameName = 0;
@@ -531,9 +465,7 @@ public void editGroup(GroupNodeViewModel oldGroup) {
                     groupsWithSameName =
                         databaseRootGroup
                             .get()
-                            .findChildrenSatisfying(g ->
-                                g.getName().equals(name)
-                            )
+                            .findChildrenSatisfying(g -> g.getName().equals(name))
                             .size();
                 }
                 // okay we found more than 2 groups with the same name
@@ -544,34 +476,21 @@ public void editGroup(GroupNodeViewModel oldGroup) {
 
                 if (
                     previousAssignments.isPresent() &&
-                    (previousAssignments.get().getButtonData() ==
-                        ButtonBar.ButtonData.YES)
+                    (previousAssignments.get().getButtonData() == ButtonBar.ButtonData.YES)
                 ) {
                     oldGroup
                         .getGroupNode()
-                        .setGroup(
-                            group,
-                            true,
-                            removePreviousAssignments,
-                            database.getEntries()
-                        );
+                        .setGroup(group, true, removePreviousAssignments, database.getEntries());
                 } else if (
                     previousAssignments.isPresent() &&
-                    (previousAssignments.get().getButtonData() ==
-                        ButtonBar.ButtonData.NO)
+                    (previousAssignments.get().getButtonData() == ButtonBar.ButtonData.NO)
                 ) {
                     oldGroup
                         .getGroupNode()
-                        .setGroup(
-                            group,
-                            false,
-                            removePreviousAssignments,
-                            database.getEntries()
-                        );
+                        .setGroup(group, false, removePreviousAssignments, database.getEntries());
                 } else if (
                     previousAssignments.isPresent() &&
-                    (previousAssignments.get().getButtonData() ==
-                        ButtonBar.ButtonData.CANCEL_CLOSE)
+                    (previousAssignments.get().getButtonData() == ButtonBar.ButtonData.CANCEL_CLOSE)
                 ) {
                     return;
                 }
@@ -595,9 +514,7 @@ public void editGroup(GroupNodeViewModel oldGroup) {
                 //    undoAddPreviousEntries = UndoableChangeEntriesOfGroup.getUndoableEdit(null, addChange);
                 // }
 
-                dialogService.notify(
-                    Localization.lang("Modified group \"%0\".", group.getName())
-                );
+                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();
@@ -608,10 +525,7 @@ public void editGroup(GroupNodeViewModel oldGroup) {
     public void removeSubgroups(GroupNodeViewModel group) {
         boolean confirmation = dialogService.showConfirmationDialogAndWait(
             Localization.lang("Remove subgroups"),
-            Localization.lang(
-                "Remove all subgroups of \"%0\"?",
-                group.getDisplayName()
-            )
+            Localization.lang("Remove all subgroups of \"%0\"?", group.getDisplayName())
         );
         if (confirmation) {
             /// TODO: Add undo
@@ -622,10 +536,7 @@ public void removeSubgroups(GroupNodeViewModel group) {
             }
             group.getGroupNode().removeAllChildren();
             dialogService.notify(
-                Localization.lang(
-                    "Removed all subgroups of group \"%0\".",
-                    group.getDisplayName()
-                )
+                Localization.lang("Removed all subgroups of group \"%0\".", group.getDisplayName())
             );
             writeGroupChangesToMetaData();
         }
@@ -647,9 +558,7 @@ public void removeGroupKeepSubgroups(GroupNodeViewModel group) {
             confirmed =
                 dialogService.showConfirmationDialogAndWait(
                     Localization.lang("Remove groups"),
-                    Localization.lang(
-                        "Remove all selected groups and keep their subgroups?"
-                    ),
+                    Localization.lang("Remove all selected groups and keep their subgroups?"),
                     Localization.lang("Remove all")
                 );
         }
@@ -659,33 +568,23 @@ public void removeGroupKeepSubgroups(GroupNodeViewModel group) {
             // final UndoableAddOrRemoveGroup undo = new UndoableAddOrRemoveGroup(groupsRoot, node, UndoableAddOrRemoveGroup.REMOVE_NODE_KEEP_CHILDREN);
             // panel.getUndoManager().addEdit(undo);
 
-            List<GroupNodeViewModel> selectedGroupNodes = new ArrayList<>(
-                selectedGroups
-            );
+            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.moveAllChildrenTo(parent, parent.getIndexOfChild(groupNode).get())
                     );
                 groupNode.removeFromParent();
             });
 
             if (selectedGroupNodes.size() > 1) {
-                dialogService.notify(
-                    Localization.lang("Removed all selected groups.")
-                );
+                dialogService.notify(Localization.lang("Removed all selected groups."));
             } else {
                 dialogService.notify(
-                    Localization.lang(
-                        "Removed group \"%0\".",
-                        group.getDisplayName()
-                    )
+                    Localization.lang("Removed group \"%0\".", group.getDisplayName())
                 );
             }
             writeGroupChangesToMetaData();
@@ -711,9 +610,7 @@ public void removeGroupAndSubgroups(GroupNodeViewModel group) {
             confirmed =
                 dialogService.showConfirmationDialogAndWait(
                     Localization.lang("Remove groups and subgroups"),
-                    Localization.lang(
-                        "Remove all selected groups and their subgroups?"
-                    ),
+                    Localization.lang("Remove all selected groups and their subgroups?"),
                     Localization.lang("Remove all")
                 );
         }
@@ -723,9 +620,7 @@ public void removeGroupAndSubgroups(GroupNodeViewModel group) {
             // final UndoableAddOrRemoveGroup undo = new UndoableAddOrRemoveGroup(groupsRoot, node, UndoableAddOrRemoveGroup.REMOVE_NODE_AND_CHILDREN);
             // panel.getUndoManager().addEdit(undo);
 
-            ArrayList<GroupNodeViewModel> selectedGroupNodes = new ArrayList<>(
-                selectedGroups
-            );
+            ArrayList<GroupNodeViewModel> selectedGroupNodes = new ArrayList<>(selectedGroups);
             selectedGroupNodes.forEach(eachNode -> {
                 removeGroupsAndSubGroupsFromEntries(eachNode);
                 eachNode.getGroupNode().removeFromParent();
@@ -733,9 +628,7 @@ public void removeGroupAndSubgroups(GroupNodeViewModel group) {
 
             if (selectedGroupNodes.size() > 1) {
                 dialogService.notify(
-                    Localization.lang(
-                        "Removed all selected groups and their subgroups."
-                    )
+                    Localization.lang("Removed all selected groups and their subgroups.")
                 );
             } else {
                 dialogService.notify(
@@ -758,19 +651,14 @@ public void removeGroupNoSubgroups(GroupNodeViewModel group) {
             confirmed =
                 dialogService.showConfirmationDialogAndWait(
                     Localization.lang("Remove group"),
-                    Localization.lang(
-                        "Remove group \"%0\"?",
-                        group.getDisplayName()
-                    ),
+                    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 selected groups and their subgroups?"),
                     Localization.lang("Remove all")
                 );
         }
@@ -780,24 +668,17 @@ public void removeGroupNoSubgroups(GroupNodeViewModel group) {
             // final UndoableAddOrRemoveGroup undo = new UndoableAddOrRemoveGroup(groupsRoot, node, UndoableAddOrRemoveGroup.REMOVE_NODE_WITHOUT_CHILDREN);
             // panel.getUndoManager().addEdit(undo);
 
-            ArrayList<GroupNodeViewModel> selectedGroupNodes = new ArrayList<>(
-                selectedGroups
-            );
+            ArrayList<GroupNodeViewModel> selectedGroupNodes = new ArrayList<>(selectedGroups);
             selectedGroupNodes.forEach(eachNode -> {
                 removeGroupsAndSubGroupsFromEntries(eachNode);
                 eachNode.getGroupNode().removeFromParent();
             });
 
             if (selectedGroupNodes.size() > 1) {
-                dialogService.notify(
-                    Localization.lang("Removed all selected groups.")
-                );
+                dialogService.notify(Localization.lang("Removed all selected groups."));
             } else {
                 dialogService.notify(
-                    Localization.lang(
-                        "Removed group \"%0\".",
-                        group.getDisplayName()
-                    )
+                    Localization.lang("Removed group \"%0\".", group.getDisplayName())
                 );
             }
             writeGroupChangesToMetaData();
@@ -813,16 +694,10 @@ void removeGroupsAndSubGroupsFromEntries(GroupNodeViewModel group) {
         if (group.getGroupNode().getGroup() instanceof ExplicitGroup) {
             int groupsWithSameName = 0;
             String name = group.getGroupNode().getGroup().getName();
-            Optional<GroupTreeNode> rootGroup = currentDatabase
-                .get()
-                .getMetaData()
-                .getGroups();
+            Optional<GroupTreeNode> rootGroup = currentDatabase.get().getMetaData().getGroups();
             if (rootGroup.isPresent()) {
                 groupsWithSameName =
-                    rootGroup
-                        .get()
-                        .findChildrenSatisfying(g -> g.getName().equals(name))
-                        .size();
+                    rootGroup.get().findChildrenSatisfying(g -> g.getName().equals(name)).size();
             }
             if (groupsWithSameName < 2) {
                 List<BibEntry> entriesInGroup = group
@@ -838,9 +713,7 @@ public void addSelectedEntries(GroupNodeViewModel group) {
         // if (!WarnAssignmentSideEffects.warnAssignmentSideEffects(node.getNode().getGroup(), panel.frame())) {
         //    return; // user aborted operation
 
-        group
-            .getGroupNode()
-            .addEntriesToGroup(stateManager.getSelectedEntries());
+        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)); }
@@ -867,9 +740,7 @@ public void removeSelectedEntries(GroupNodeViewModel group) {
         // if (!WarnAssignmentSideEffects.warnAssignmentSideEffects(mNode.getNode().getGroup(), mPanel.frame())) {
         //    return; // user aborted operation
 
-        group
-            .getGroupNode()
-            .removeEntriesFromGroup(stateManager.getSelectedEntries());
+        group.getGroupNode().removeEntriesFromGroup(stateManager.getSelectedEntries());
         // TODO: Add undo
         // if (!undo.isEmpty()) {
         //    mPanel.getUndoManager().addEdit(UndoableChangeEntriesOfGroup.getUndoableEdit(mNode, undo));
diff --git a/src/main/java/org/jabref/gui/groups/GroupsPreferences.java b/src/main/java/org/jabref/gui/groups/GroupsPreferences.java
index 0d44157b670..1692f790576 100644
--- a/src/main/java/org/jabref/gui/groups/GroupsPreferences.java
+++ b/src/main/java/org/jabref/gui/groups/GroupsPreferences.java
@@ -20,12 +20,9 @@ public GroupsPreferences(
         GroupHierarchyType defaultHierarchicalContext
     ) {
         this.groupViewMode = new SimpleObjectProperty<>(groupViewMode);
-        this.shouldAutoAssignGroup =
-            new SimpleBooleanProperty(shouldAutoAssignGroup);
-        this.shouldDisplayGroupCount =
-            new SimpleBooleanProperty(shouldDisplayGroupCount);
-        this.defaultHierarchicalContext =
-            new SimpleObjectProperty<>(defaultHierarchicalContext);
+        this.shouldAutoAssignGroup = new SimpleBooleanProperty(shouldAutoAssignGroup);
+        this.shouldDisplayGroupCount = new SimpleBooleanProperty(shouldDisplayGroupCount);
+        this.defaultHierarchicalContext = new SimpleObjectProperty<>(defaultHierarchicalContext);
     }
 
     public GroupViewMode getGroupViewMode() {
@@ -68,15 +65,11 @@ public GroupHierarchyType getDefaultHierarchicalContext() {
         return defaultHierarchicalContext.get();
     }
 
-    public ObjectProperty<
-        GroupHierarchyType
-    > defaultHierarchicalContextProperty() {
+    public ObjectProperty<GroupHierarchyType> defaultHierarchicalContextProperty() {
         return defaultHierarchicalContext;
     }
 
-    public void setDefaultHierarchicalContext(
-        GroupHierarchyType defaultHierarchicalContext
-    ) {
+    public void setDefaultHierarchicalContext(GroupHierarchyType defaultHierarchicalContext) {
         this.defaultHierarchicalContext.set(defaultHierarchicalContext);
     }
 }
diff --git a/src/main/java/org/jabref/gui/groups/UndoableAddOrRemoveGroup.java b/src/main/java/org/jabref/gui/groups/UndoableAddOrRemoveGroup.java
index 53193339a5f..8beb917e9b2 100644
--- a/src/main/java/org/jabref/gui/groups/UndoableAddOrRemoveGroup.java
+++ b/src/main/java/org/jabref/gui/groups/UndoableAddOrRemoveGroup.java
@@ -75,9 +75,7 @@ public UndoableAddOrRemoveGroup(
         m_subtreeBackup =
             editType != UndoableAddOrRemoveGroup.REMOVE_NODE_KEEP_CHILDREN
                 ? editedNode.getNode().copySubtree()
-                : GroupTreeNode.fromGroup(
-                    editedNode.getNode().getGroup().deepCopy()
-                );
+                : 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.
@@ -126,11 +124,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);
@@ -148,15 +142,10 @@ 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);
+                        removedNode.getFirstChild().get().moveTo(cursor, childIndex);
                     }
                     break;
                 case REMOVE_NODE_AND_CHILDREN:
diff --git a/src/main/java/org/jabref/gui/groups/UndoableModifySubtree.java b/src/main/java/org/jabref/gui/groups/UndoableModifySubtree.java
index 24ca7681a15..a668bbe4438 100644
--- a/src/main/java/org/jabref/gui/groups/UndoableModifySubtree.java
+++ b/src/main/java/org/jabref/gui/groups/UndoableModifySubtree.java
@@ -51,9 +51,7 @@ 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();
@@ -65,9 +63,7 @@ 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 bc59f38bbe7..57c7de8b638 100644
--- a/src/main/java/org/jabref/gui/groups/UndoableMoveGroup.java
+++ b/src/main/java/org/jabref/gui/groups/UndoableMoveGroup.java
@@ -14,10 +14,7 @@ class UndoableMoveGroup extends AbstractUndoableJabRefEdit {
     private final List<Integer> pathToOldParent;
     private final int oldChildIndex;
 
-    public UndoableMoveGroup(
-        GroupTreeNodeViewModel root,
-        MoveGroupChange moveChange
-    ) {
+    public UndoableMoveGroup(GroupTreeNodeViewModel root, MoveGroupChange moveChange) {
         this.root = Objects.requireNonNull(root);
         Objects.requireNonNull(moveChange);
         pathToOldParent = moveChange.getOldParent().getIndexedPathFromRoot();
@@ -35,31 +32,19 @@ public String getPresentationName() {
     public void undo() {
         super.undo();
 
-        GroupTreeNode newParent = root
-            .getNode()
-            .getDescendant(pathToNewParent)
-            .get(); // TODO: NULL
+        GroupTreeNode newParent = root.getNode().getDescendant(pathToNewParent).get(); // TODO: NULL
         GroupTreeNode node = newParent.getChildAt(newChildIndex).get(); // TODO: Null
         // TODO: NULL
-        node.moveTo(
-            root.getNode().getDescendant(pathToOldParent).get(),
-            oldChildIndex
-        );
+        node.moveTo(root.getNode().getDescendant(pathToOldParent).get(), oldChildIndex);
     }
 
     @Override
     public void redo() {
         super.redo();
 
-        GroupTreeNode oldParent = root
-            .getNode()
-            .getDescendant(pathToOldParent)
-            .get(); // TODO: NULL
+        GroupTreeNode oldParent = root.getNode().getDescendant(pathToOldParent).get(); // TODO: NULL
         GroupTreeNode node = oldParent.getChildAt(oldChildIndex).get(); // TODO:Null
         // TODO: NULL
-        node.moveTo(
-            root.getNode().getDescendant(pathToNewParent).get(),
-            newChildIndex
-        );
+        node.moveTo(root.getNode().getDescendant(pathToNewParent).get(), newChildIndex);
     }
 }
diff --git a/src/main/java/org/jabref/gui/help/AboutAction.java b/src/main/java/org/jabref/gui/help/AboutAction.java
index 7d22fddcd95..d4355aa51a8 100644
--- a/src/main/java/org/jabref/gui/help/AboutAction.java
+++ b/src/main/java/org/jabref/gui/help/AboutAction.java
@@ -14,9 +14,7 @@ public AboutAction() {
 
     @Override
     public void execute() {
-        DialogService dialogService = Injector.instantiateModelOrService(
-            DialogService.class
-        );
+        DialogService dialogService = Injector.instantiateModelOrService(DialogService.class);
         dialogService.showCustomDialog(aboutDialogView);
     }
 
diff --git a/src/main/java/org/jabref/gui/help/AboutDialogViewModel.java b/src/main/java/org/jabref/gui/help/AboutDialogViewModel.java
index bd4635eec8e..68e114e6bc6 100644
--- a/src/main/java/org/jabref/gui/help/AboutDialogViewModel.java
+++ b/src/main/java/org/jabref/gui/help/AboutDialogViewModel.java
@@ -34,21 +34,15 @@ public class AboutDialogViewModel extends AbstractViewModel {
         "https://github.com/JabRef/jabref/blob/main/PRIVACY.md";
     private final String changelogUrl;
     private final String versionInfo;
-    private final ReadOnlyStringWrapper environmentInfo =
-        new ReadOnlyStringWrapper();
-    private final Logger logger = LoggerFactory.getLogger(
-        AboutDialogViewModel.class
-    );
+    private final ReadOnlyStringWrapper environmentInfo = new ReadOnlyStringWrapper();
+    private final Logger logger = LoggerFactory.getLogger(AboutDialogViewModel.class);
     private final ReadOnlyStringWrapper heading = new ReadOnlyStringWrapper();
-    private final ReadOnlyStringWrapper maintainers =
-        new ReadOnlyStringWrapper();
+    private final ReadOnlyStringWrapper maintainers = new ReadOnlyStringWrapper();
     private final ReadOnlyStringWrapper license = new ReadOnlyStringWrapper();
-    private final ReadOnlyBooleanWrapper isDevelopmentVersion =
-        new ReadOnlyBooleanWrapper();
+    private final ReadOnlyBooleanWrapper isDevelopmentVersion = new ReadOnlyBooleanWrapper();
     private final DialogService dialogService;
     private final PreferencesService preferencesService;
-    private final ReadOnlyStringWrapper developmentVersion =
-        new ReadOnlyStringWrapper();
+    private final ReadOnlyStringWrapper developmentVersion = new ReadOnlyStringWrapper();
     private final ClipBoardManager clipBoardManager;
 
     public AboutDialogViewModel(
@@ -177,15 +171,9 @@ public void openDonation() {
 
     private void openWebsite(String url) {
         try {
-            JabRefDesktop.openBrowser(
-                url,
-                preferencesService.getFilePreferences()
-            );
+            JabRefDesktop.openBrowser(url, preferencesService.getFilePreferences());
         } catch (IOException e) {
-            dialogService.showErrorDialogAndWait(
-                Localization.lang("Could not open website."),
-                e
-            );
+            dialogService.showErrorDialogAndWait(Localization.lang("Could not open website."), e);
             logger.error("Could not open default browser.", e);
         }
     }
diff --git a/src/main/java/org/jabref/gui/help/ErrorConsoleAction.java b/src/main/java/org/jabref/gui/help/ErrorConsoleAction.java
index 657a304ed32..cd0e1f4dc51 100644
--- a/src/main/java/org/jabref/gui/help/ErrorConsoleAction.java
+++ b/src/main/java/org/jabref/gui/help/ErrorConsoleAction.java
@@ -16,9 +16,7 @@ public class ErrorConsoleAction extends SimpleCommand {
 
     @Override
     public void execute() {
-        DialogService dialogService = Injector.instantiateModelOrService(
-            DialogService.class
-        );
+        DialogService dialogService = Injector.instantiateModelOrService(DialogService.class);
         dialogService.showCustomDialog(new ErrorConsoleView());
     }
 }
diff --git a/src/main/java/org/jabref/gui/help/HelpAction.java b/src/main/java/org/jabref/gui/help/HelpAction.java
index 0d7b19e44c7..cc6d2f373bf 100644
--- a/src/main/java/org/jabref/gui/help/HelpAction.java
+++ b/src/main/java/org/jabref/gui/help/HelpAction.java
@@ -29,11 +29,7 @@ public HelpAction(
     void openHelpPage(HelpFile helpPage) {
         StringBuilder sb = new StringBuilder("https://docs.jabref.org/");
         sb.append(helpPage.getPageName());
-        JabRefDesktop.openBrowserShowPopup(
-            sb.toString(),
-            dialogService,
-            filePreferences
-        );
+        JabRefDesktop.openBrowserShowPopup(sb.toString(), dialogService, filePreferences);
     }
 
     @Override
diff --git a/src/main/java/org/jabref/gui/help/NewVersionDialog.java b/src/main/java/org/jabref/gui/help/NewVersionDialog.java
index a28ee0de2f3..74deea6fac4 100644
--- a/src/main/java/org/jabref/gui/help/NewVersionDialog.java
+++ b/src/main/java/org/jabref/gui/help/NewVersionDialog.java
@@ -50,8 +50,7 @@ public NewVersionDialog(
                 }
                 return true;
             });
-        Button defaultButton = (Button) this.getDialogPane()
-            .lookupButton(btnDownloadUpdate);
+        Button defaultButton = (Button) this.getDialogPane().lookupButton(btnDownloadUpdate);
         defaultButton.setDefaultButton(true);
 
         Hyperlink lblMoreInformation = new Hyperlink(
@@ -66,19 +65,11 @@ public NewVersionDialog(
         );
 
         VBox container = new VBox(
+            new Label(Localization.lang("A new version of JabRef has been released.")),
             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()
+                Localization.lang("Installed version") + ": " + currentVersion.getFullVersion()
             ),
+            new Label(Localization.lang("Latest version") + ": " + latestVersion.getFullVersion()),
             lblMoreInformation
         );
         getDialogPane().setContent(container);
diff --git a/src/main/java/org/jabref/gui/help/SearchForUpdateAction.java b/src/main/java/org/jabref/gui/help/SearchForUpdateAction.java
index 84d47e8e063..70c229027ad 100644
--- a/src/main/java/org/jabref/gui/help/SearchForUpdateAction.java
+++ b/src/main/java/org/jabref/gui/help/SearchForUpdateAction.java
@@ -25,20 +25,13 @@ public SearchForUpdateAction(
         this.taskExecutor = taskExecutor;
 
         this.executable.bind(
-                preferencesService
-                    .getInternalPreferences()
-                    .versionCheckEnabledProperty()
+                preferencesService.getInternalPreferences().versionCheckEnabledProperty()
             );
     }
 
     @Override
     public void execute() {
-        new VersionWorker(
-            buildInfo.version,
-            dialogService,
-            taskExecutor,
-            preferencesService
-        )
+        new VersionWorker(buildInfo.version, dialogService, taskExecutor, preferencesService)
             .checkForNewVersionAsync();
     }
 }
diff --git a/src/main/java/org/jabref/gui/help/VersionWorker.java b/src/main/java/org/jabref/gui/help/VersionWorker.java
index 813507fb1c5..74668c27877 100644
--- a/src/main/java/org/jabref/gui/help/VersionWorker.java
+++ b/src/main/java/org/jabref/gui/help/VersionWorker.java
@@ -26,9 +26,7 @@
  */
 public class VersionWorker {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(
-        VersionWorker.class
-    );
+    private static final Logger LOGGER = LoggerFactory.getLogger(VersionWorker.class);
 
     /**
      * The current version of the installed JabRef
@@ -89,14 +87,9 @@ public void checkForNewVersionDelayed() {
     /**
      * Prints the connection problem to the status bar and shows a dialog if it was executed manually
      */
-    private void showConnectionError(
-        Exception exception,
-        boolean manualExecution
-    ) {
+    private void showConnectionError(Exception exception, boolean manualExecution) {
         if (manualExecution) {
-            String couldNotConnect = Localization.lang(
-                "Could not connect to the update server."
-            );
+            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."
             );
@@ -113,22 +106,14 @@ private void showConnectionError(
      * Prints up-to-date to the status bar (and shows a dialog it was executed manually) if there is now new version.
      * Shows a "New Version" Dialog to the user if there is.
      */
-    private void showUpdateInfo(
-        Optional<Version> newerVersion,
-        boolean manualExecution
-    ) {
+    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)
+            (newerVersion.get().equals(internalPreferences.getIgnoredVersion()) && !manualExecution)
         ) {
             if (manualExecution) {
-                dialogService.notify(
-                    Localization.lang("JabRef is up-to-date.")
-                );
+                dialogService.notify(Localization.lang("JabRef is up-to-date."));
             }
         } else {
             // notify the user about a newer version
diff --git a/src/main/java/org/jabref/gui/icon/IconTheme.java b/src/main/java/org/jabref/gui/icon/IconTheme.java
index 9c8bd284fc5..8fd1b5e0951 100644
--- a/src/main/java/org/jabref/gui/icon/IconTheme.java
+++ b/src/main/java/org/jabref/gui/icon/IconTheme.java
@@ -53,9 +53,7 @@ public class IconTheme {
     public static final Color DEFAULT_DISABLED_COLOR = Color.web("#c8c8c8");
     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 Logger LOGGER = LoggerFactory.getLogger(IconTheme.class);
     private static final Map<String, String> KEY_TO_ICON = readIconThemeFile(
         IconTheme.class.getResource("/images/Icons.properties"),
         "/images/external/"
@@ -72,12 +70,8 @@ public static Optional<JabRefIcon> findIcon(String code, Color color) {
         }
         return ICON_NAMES
             .stream()
-            .filter(icon ->
-                icon.toString().equals(code.toUpperCase(Locale.ENGLISH))
-            )
-            .map(internalMat ->
-                new InternalMaterialDesignIcon(internalMat).withColor(color)
-            )
+            .filter(icon -> icon.toString().equals(code.toUpperCase(Locale.ENGLISH)))
+            .map(internalMat -> new InternalMaterialDesignIcon(internalMat).withColor(color))
             .findFirst();
     }
 
@@ -86,9 +80,7 @@ public static Image getJabRefImage() {
     }
 
     private static void loadAllIkons() {
-        ServiceLoader<IkonProvider> providers = ServiceLoader.load(
-            IkonProvider.class
-        );
+        ServiceLoader<IkonProvider> providers = ServiceLoader.load(IkonProvider.class);
 
         for (IkonProvider provider : providers) {
             ICON_NAMES.addAll(allOf(provider.getIkon()));
@@ -141,10 +133,7 @@ public static URL getIconUrl(String name) {
      * @return A Map containing all key-value pairs found.
      */
     // FIXME: prefix can be removed?!
-    private static Map<String, String> readIconThemeFile(
-        URL url,
-        String prefix
-    ) {
+    private static Map<String, String> readIconThemeFile(URL url, String prefix) {
         Objects.requireNonNull(url, "url");
         Objects.requireNonNull(prefix, "prefix");
 
@@ -152,10 +141,7 @@ private static Map<String, String> readIconThemeFile(
 
         try (
             BufferedReader in = new BufferedReader(
-                new InputStreamReader(
-                    url.openStream(),
-                    StandardCharsets.ISO_8859_1
-                )
+                new InputStreamReader(url.openStream(), StandardCharsets.ISO_8859_1)
             )
         ) {
             String line;
diff --git a/src/main/java/org/jabref/gui/icon/InternalMaterialDesignIcon.java b/src/main/java/org/jabref/gui/icon/InternalMaterialDesignIcon.java
index 8ce08e50de6..e63db6f68f5 100644
--- a/src/main/java/org/jabref/gui/icon/InternalMaterialDesignIcon.java
+++ b/src/main/java/org/jabref/gui/icon/InternalMaterialDesignIcon.java
@@ -32,11 +32,7 @@ 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());
+            icons.stream().map(Ikon::getCode).map(String::valueOf).collect(Collectors.joining());
         this.color = Optional.empty();
     }
 
@@ -60,10 +56,7 @@ public Node getGraphicNode() {
 
     @Override
     public JabRefIcon disabled() {
-        return new InternalMaterialDesignIcon(
-            IconTheme.DEFAULT_DISABLED_COLOR,
-            icons
-        );
+        return new InternalMaterialDesignIcon(IconTheme.DEFAULT_DISABLED_COLOR, icons);
     }
 
     @Override
diff --git a/src/main/java/org/jabref/gui/icon/JabRefIconView.java b/src/main/java/org/jabref/gui/icon/JabRefIconView.java
index dbbbd19cec3..48be39acde0 100644
--- a/src/main/java/org/jabref/gui/icon/JabRefIconView.java
+++ b/src/main/java/org/jabref/gui/icon/JabRefIconView.java
@@ -23,10 +23,7 @@ public JabRefIconView(JabRefIcons icon, int size) {
         this.glyphSize = new SimpleObjectProperty<>(size);
 
         EasyBind.subscribe(glyph, glyph -> setIconCode(glyph.getIkon()));
-        EasyBind.subscribe(
-            glyphSize,
-            glyphsize -> setIconSize(glyphsize.intValue())
-        );
+        EasyBind.subscribe(glyphSize, glyphsize -> setIconSize(glyphsize.intValue()));
     }
 
     public JabRefIconView(IconTheme.JabRefIcons icon) {
@@ -38,10 +35,7 @@ public JabRefIconView(IconTheme.JabRefIcons icon) {
         int px = (int) size.pixels(getFont());
         glyphSize.set(px);
         EasyBind.subscribe(glyph, glyph -> setIconCode(glyph.getIkon()));
-        EasyBind.subscribe(
-            glyphSize,
-            glyphsize -> setIconSize(glyphsize.intValue())
-        );
+        EasyBind.subscribe(glyphSize, glyphsize -> setIconSize(glyphsize.intValue()));
     }
 
     public JabRefIconView() {
diff --git a/src/main/java/org/jabref/gui/icon/JabRefMaterialDesignIcon.java b/src/main/java/org/jabref/gui/icon/JabRefMaterialDesignIcon.java
index 63c4514d451..6450f17fd02 100644
--- a/src/main/java/org/jabref/gui/icon/JabRefMaterialDesignIcon.java
+++ b/src/main/java/org/jabref/gui/icon/JabRefMaterialDesignIcon.java
@@ -40,17 +40,13 @@ public enum JabRefMaterialDesignIcon implements Ikon {
         this.code = code;
     }
 
-    public static JabRefMaterialDesignIcon findByDescription(
-        String description
-    ) {
+    public static JabRefMaterialDesignIcon findByDescription(String description) {
         for (JabRefMaterialDesignIcon font : values()) {
             if (font.getDescription().equals(description)) {
                 return font;
             }
         }
-        throw new IllegalArgumentException(
-            "Icon description '" + description + "' is invalid!"
-        );
+        throw new IllegalArgumentException("Icon description '" + description + "' is invalid!");
     }
 
     @Override
diff --git a/src/main/java/org/jabref/gui/icon/JabrefIconProvider.java b/src/main/java/org/jabref/gui/icon/JabrefIconProvider.java
index 670b2ada618..f794bbccd47 100644
--- a/src/main/java/org/jabref/gui/icon/JabrefIconProvider.java
+++ b/src/main/java/org/jabref/gui/icon/JabrefIconProvider.java
@@ -2,8 +2,7 @@
 
 import org.kordamp.ikonli.IkonProvider;
 
-public class JabrefIconProvider
-    implements IkonProvider<JabRefMaterialDesignIcon> {
+public class JabrefIconProvider implements IkonProvider<JabRefMaterialDesignIcon> {
 
     @Override
     public Class<JabRefMaterialDesignIcon> getIkon() {
diff --git a/src/main/java/org/jabref/gui/importer/BibEntryTypePrefsAndFileViewModel.java b/src/main/java/org/jabref/gui/importer/BibEntryTypePrefsAndFileViewModel.java
index 02dd0e55604..0ce96e4182a 100644
--- a/src/main/java/org/jabref/gui/importer/BibEntryTypePrefsAndFileViewModel.java
+++ b/src/main/java/org/jabref/gui/importer/BibEntryTypePrefsAndFileViewModel.java
@@ -16,9 +16,7 @@ public String toString() {
         return Localization.lang(
             "%0 (from file)\n%1 (current setting)",
             MetaDataSerializer.serializeCustomEntryTypes(customTypeFromFile),
-            MetaDataSerializer.serializeCustomEntryTypes(
-                customTypeFromPreferences
-            )
+            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 b25aa08a384..6f32392025b 100644
--- a/src/main/java/org/jabref/gui/importer/GenerateEntryFromIdAction.java
+++ b/src/main/java/org/jabref/gui/importer/GenerateEntryFromIdAction.java
@@ -23,9 +23,7 @@
 
 public class GenerateEntryFromIdAction extends SimpleCommand {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(
-        GenerateEntryFromIdAction.class
-    );
+    private static final Logger LOGGER = LoggerFactory.getLogger(GenerateEntryFromIdAction.class);
 
     private final LibraryTab libraryTab;
     private final DialogService dialogService;
@@ -58,15 +56,12 @@ public GenerateEntryFromIdAction(
 
     @Override
     public void execute() {
-        BackgroundTask<Optional<BibEntry>> backgroundTask =
-            searchAndImportEntryInBackground();
+        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())
-            );
+            dialogService.notify("%s".formatted(backgroundTask.messageProperty().get()));
         });
         backgroundTask.onFailure(exception -> {
             String fetcherExceptionMessage = exception.getMessage();
@@ -87,11 +82,7 @@ public void execute() {
                     "\n" +
                     fetcherExceptionMessage;
             } else {
-                msg =
-                    Localization.lang(
-                        "Error message %0",
-                        fetcherExceptionMessage
-                    );
+                msg = Localization.lang("Error message %0", fetcherExceptionMessage);
             }
 
             LOGGER.info(fetcherExceptionMessage, exception);
@@ -127,10 +118,7 @@ public void execute() {
                     dialogService,
                     taskExecutor
                 );
-                handler.importEntryWithDuplicateCheck(
-                    libraryTab.getBibDatabaseContext(),
-                    entry
-                );
+                handler.importEntryWithDuplicateCheck(libraryTab.getBibDatabaseContext(), entry);
             } else {
                 dialogService.notify("No entry found or import canceled");
             }
@@ -138,9 +126,7 @@ public void execute() {
         backgroundTask.executeWith(taskExecutor);
     }
 
-    private BackgroundTask<
-        Optional<BibEntry>
-    > searchAndImportEntryInBackground() {
+    private BackgroundTask<Optional<BibEntry>> searchAndImportEntryInBackground() {
         return new BackgroundTask<>() {
             @Override
             protected Optional<BibEntry> call() throws FetcherException {
@@ -148,9 +134,7 @@ protected Optional<BibEntry> call() throws FetcherException {
                     return Optional.empty();
                 }
                 updateMessage(Localization.lang("Searching..."));
-                return new CompositeIdFetcher(
-                    preferencesService.getImportFormatPreferences()
-                )
+                return new CompositeIdFetcher(preferencesService.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 900bc8ee477..646b6e283c2 100644
--- a/src/main/java/org/jabref/gui/importer/GenerateEntryFromIdDialog.java
+++ b/src/main/java/org/jabref/gui/importer/GenerateEntryFromIdDialog.java
@@ -51,9 +51,7 @@ public GenerateEntryFromIdDialog(
         this.libraryTab = libraryTab;
         this.taskExecutor = taskExecutor;
         this.stateManager = stateManager;
-        this.generateButton.setGraphic(
-                IconTheme.JabRefIcons.IMPORT.getGraphicNode()
-            );
+        this.generateButton.setGraphic(IconTheme.JabRefIcons.IMPORT.getGraphicNode());
         this.generateButton.setDefaultButton(true);
     }
 
@@ -66,17 +64,16 @@ private void generateEntry() {
 
         this.idTextField.requestFocus();
 
-        GenerateEntryFromIdAction generateEntryFromIdAction =
-            new GenerateEntryFromIdAction(
-                libraryTab,
-                dialogService,
-                preferencesService,
-                taskExecutor,
-                entryFromIdPopOver,
-                idTextField.getText(),
-                stateManager,
-                fileUpdateMonitor
-            );
+        GenerateEntryFromIdAction generateEntryFromIdAction = new GenerateEntryFromIdAction(
+            libraryTab,
+            dialogService,
+            preferencesService,
+            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 d10e1abc635..9a9489d8ae5 100644
--- a/src/main/java/org/jabref/gui/importer/GrobidOptInDialogHelper.java
+++ b/src/main/java/org/jabref/gui/importer/GrobidOptInDialogHelper.java
@@ -28,15 +28,14 @@ public static boolean showAndWaitIfUserIsUndecided(
         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.grobidOptOutProperty().setValue(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.grobidOptOutProperty().setValue(optOut)
+        );
         preferences.grobidEnabledProperty().setValue(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 34a8aca7ac0..768db63068c 100644
--- a/src/main/java/org/jabref/gui/importer/ImportCommand.java
+++ b/src/main/java/org/jabref/gui/importer/ImportCommand.java
@@ -42,9 +42,7 @@
  */
 public class ImportCommand extends SimpleCommand {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(
-        ImportCommand.class
-    );
+    private static final Logger LOGGER = LoggerFactory.getLogger(ImportCommand.class);
 
     public enum ImportMethod {
         AS_NEW,
@@ -89,21 +87,14 @@ public void execute() {
         );
         SortedSet<Importer> importers = importFormatReader.getImportFormats();
 
-        FileDialogConfiguration fileDialogConfiguration =
-            new FileDialogConfiguration.Builder()
-                .addExtensionFilter(FileFilterConverter.ANY_FILE)
-                .addExtensionFilter(
-                    FileFilterConverter.forAllImporters(importers)
-                )
-                .addExtensionFilter(
-                    FileFilterConverter.importerToExtensionFilter(importers)
-                )
-                .withInitialDirectory(
-                    preferencesService
-                        .getImporterPreferences()
-                        .getImportWorkingDirectory()
-                )
-                .build();
+        FileDialogConfiguration fileDialogConfiguration = new FileDialogConfiguration.Builder()
+            .addExtensionFilter(FileFilterConverter.ANY_FILE)
+            .addExtensionFilter(FileFilterConverter.forAllImporters(importers))
+            .addExtensionFilter(FileFilterConverter.importerToExtensionFilter(importers))
+            .withInitialDirectory(
+                preferencesService.getImporterPreferences().getImportWorkingDirectory()
+            )
+            .build();
         dialogService
             .showFileOpenDialog(fileDialogConfiguration)
             .ifPresent(path ->
@@ -123,10 +114,7 @@ private void importSingleFile(
         if (!Files.exists(file)) {
             dialogService.showErrorDialogAndWait(
                 Localization.lang("Import"),
-                Localization.lang("File not found") +
-                ": '" +
-                file.getFileName() +
-                "'."
+                Localization.lang("File not found") + ": '" + file.getFileName() + "'."
             );
 
             return;
@@ -153,9 +141,7 @@ private void importSingleFile(
                 .onFailure(ex -> {
                     LOGGER.error("Error importing", ex);
                     dialogService.notify(
-                        Localization.lang(
-                            "Error importing. See the error log for details."
-                        )
+                        Localization.lang("Error importing. See the error log for details.")
                     );
                 })
                 .executeWith(taskExecutor);
@@ -171,20 +157,16 @@ private void importSingleFile(
         }
 
         // Set last working dir for import
-        preferencesService
-            .getImporterPreferences()
-            .setImportWorkingDirectory(file.getParent());
+        preferencesService.getImporterPreferences().setImportWorkingDirectory(file.getParent());
     }
 
     /**
      * @throws IOException of a specified importer
      */
-    private ParserResult doImport(List<Path> files, Importer importFormat)
-        throws IOException {
+    private ParserResult doImport(List<Path> files, Importer importFormat) throws IOException {
         Optional<Importer> importer = Optional.ofNullable(importFormat);
         // We import all files and collect their results
-        List<ImportFormatReader.UnknownFormatImport> imports =
-            new ArrayList<>();
+        List<ImportFormatReader.UnknownFormatImport> imports = new ArrayList<>();
         ImportFormatReader importFormatReader = new ImportFormatReader(
             preferencesService.getImporterPreferences(),
             preferencesService.getImportFormatPreferences(),
@@ -213,17 +195,13 @@ private ParserResult doImport(List<Path> files, Importer importFormat)
                     });
                     // This import method never throws an IOException
                     imports.add(
-                        importFormatReader.importUnknownFormat(
-                            filename,
-                            fileUpdateMonitor
-                        )
+                        importFormatReader.importUnknownFormat(filename, fileUpdateMonitor)
                     );
                 } else {
                     DefaultTaskExecutor.runAndWaitInJavaFXThread(() -> {
                         if (
                             ((importer.get() instanceof PdfGrobidImporter) ||
-                                (importer.get() instanceof
-                                    PdfMergeMetadataImporter)) &&
+                                (importer.get() instanceof PdfMergeMetadataImporter)) &&
                             GrobidOptInDialogHelper.showAndWaitIfUserIsUndecided(
                                 dialogService,
                                 preferencesService.getGrobidPreferences()
@@ -232,29 +210,21 @@ private ParserResult doImport(List<Path> files, Importer importFormat)
                             importFormatReader.reset();
                         }
                         dialogService.notify(
-                            Localization.lang(
-                                "Importing in %0 format",
-                                importer.get().getName()
-                            ) +
+                            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
-                        )
+                        new ImportFormatReader.UnknownFormatImport(importer.get().getName(), pr)
                     );
                 }
             } catch (ImportException ex) {
                 DefaultTaskExecutor.runAndWaitInJavaFXThread(() ->
                     dialogService.showWarningDialogAndWait(
                         Localization.lang("Import error"),
-                        Localization.lang(
-                            "Please check your library file for wrong syntax."
-                        ) +
+                        Localization.lang("Please check your library file for wrong syntax.") +
                         "\n\n" +
                         ex.getLocalizedMessage()
                     )
@@ -281,9 +251,7 @@ private ParserResult doImport(List<Path> files, Importer importFormat)
     /**
      * TODO: Move this to logic package. Blocked by undo functionality.
      */
-    public ParserResult mergeImportResults(
-        List<ImportFormatReader.UnknownFormatImport> imports
-    ) {
+    public ParserResult mergeImportResults(List<ImportFormatReader.UnknownFormatImport> imports) {
         BibDatabase resultDatabase = new BibDatabase();
         ParserResult result = new ParserResult(resultDatabase);
 
@@ -292,18 +260,12 @@ public ParserResult mergeImportResults(
                 continue;
             }
             ParserResult parserResult = importResult.parserResult();
-            resultDatabase.insertEntries(
-                parserResult.getDatabase().getEntries()
-            );
+            resultDatabase.insertEntries(parserResult.getDatabase().getEntries());
 
-            if (
-                ImportFormatReader.BIBTEX_FORMAT.equals(importResult.format())
-            ) {
+            if (ImportFormatReader.BIBTEX_FORMAT.equals(importResult.format())) {
                 // additional treatment of BibTeX
                 new DatabaseMerger(
-                    preferencesService
-                        .getBibEntryPreferences()
-                        .getKeywordSeparator()
+                    preferencesService.getBibEntryPreferences().getKeywordSeparator()
                 )
                     .mergeMetaData(
                         result.getMetaData(),
diff --git a/src/main/java/org/jabref/gui/importer/ImportCustomEntryTypesDialog.java b/src/main/java/org/jabref/gui/importer/ImportCustomEntryTypesDialog.java
index 2b13a8ff725..823f543a3f4 100644
--- a/src/main/java/org/jabref/gui/importer/ImportCustomEntryTypesDialog.java
+++ b/src/main/java/org/jabref/gui/importer/ImportCustomEntryTypesDialog.java
@@ -29,17 +29,12 @@ public class ImportCustomEntryTypesDialog extends BaseDialog<Void> {
     private CheckListView<BibEntryType> unknownEntryTypesCheckList;
 
     @FXML
-    private CheckListView<
-        BibEntryTypePrefsAndFileViewModel
-    > differentCustomizationCheckList;
+    private CheckListView<BibEntryTypePrefsAndFileViewModel> differentCustomizationCheckList;
 
     private final BibDatabaseMode mode;
     private ImportCustomEntryTypesDialogViewModel viewModel;
 
-    public ImportCustomEntryTypesDialog(
-        BibDatabaseMode mode,
-        List<BibEntryType> customEntryTypes
-    ) {
+    public ImportCustomEntryTypesDialog(BibDatabaseMode mode, List<BibEntryType> customEntryTypes) {
         this.mode = mode;
         this.customEntryTypes = customEntryTypes;
 
@@ -48,16 +43,12 @@ public ImportCustomEntryTypesDialog(
         setResultConverter(btn -> {
             if (btn == ButtonType.OK) {
                 viewModel.importBibEntryTypes(
-                    unknownEntryTypesCheckList
-                        .getCheckModel()
-                        .getCheckedItems(),
+                    unknownEntryTypesCheckList.getCheckModel().getCheckedItems(),
                     differentCustomizationCheckList
                         .getCheckModel()
                         .getCheckedItems()
                         .stream()
-                        .map(
-                            BibEntryTypePrefsAndFileViewModel::customTypeFromPreferences
-                        )
+                        .map(BibEntryTypePrefsAndFileViewModel::customTypeFromPreferences)
                         .toList()
                 );
             }
@@ -70,11 +61,7 @@ public ImportCustomEntryTypesDialog(
     @FXML
     public void initialize() {
         viewModel =
-            new ImportCustomEntryTypesDialogViewModel(
-                mode,
-                customEntryTypes,
-                preferencesService
-            );
+            new ImportCustomEntryTypesDialogViewModel(mode, customEntryTypes, preferencesService);
         boxDifferentCustomization
             .visibleProperty()
             .bind(Bindings.isNotEmpty(viewModel.differentCustomizations()));
@@ -83,25 +70,14 @@ public void initialize() {
             .bind(Bindings.isNotEmpty(viewModel.differentCustomizations()));
         unknownEntryTypesCheckList.setItems(viewModel.newTypes());
         unknownEntryTypesCheckList.setCellFactory(listView ->
-            new CheckBoxListCell<>(
-                unknownEntryTypesCheckList::getItemBooleanProperty
-            ) {
+            new CheckBoxListCell<>(unknownEntryTypesCheckList::getItemBooleanProperty) {
                 @Override
-                public void updateItem(
-                    BibEntryType bibEntryType,
-                    boolean empty
-                ) {
+                public void updateItem(BibEntryType bibEntryType, boolean empty) {
                     super.updateItem(bibEntryType, empty);
-                    setText(
-                        bibEntryType == null
-                            ? ""
-                            : bibEntryType.getType().getDisplayName()
-                    );
+                    setText(bibEntryType == null ? "" : bibEntryType.getType().getDisplayName());
                 }
             }
         );
-        differentCustomizationCheckList.setItems(
-            viewModel.differentCustomizations()
-        );
+        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 dd1da7be7ad..d7c14b5d5df 100644
--- a/src/main/java/org/jabref/gui/importer/ImportCustomEntryTypesDialogViewModel.java
+++ b/src/main/java/org/jabref/gui/importer/ImportCustomEntryTypesDialogViewModel.java
@@ -21,11 +21,9 @@ public class ImportCustomEntryTypesDialogViewModel {
     private final BibDatabaseMode mode;
     private final PreferencesService preferencesService;
 
-    private final ObservableList<BibEntryType> newTypes =
+    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,
@@ -36,27 +34,20 @@ public ImportCustomEntryTypesDialogViewModel(
         this.preferencesService = preferencesService;
 
         for (BibEntryType customType : entryTypes) {
-            Optional<BibEntryType> currentlyStoredType =
-                Globals.entryTypesManager.enrich(customType.getType(), mode);
+            Optional<BibEntryType> currentlyStoredType = Globals.entryTypesManager.enrich(
+                customType.getType(),
+                mode
+            );
             if (currentlyStoredType.isEmpty()) {
                 newTypes.add(customType);
             } else {
                 if (
-                    !EntryTypeFactory.nameAndFieldsAreEqual(
-                        customType,
-                        currentlyStoredType.get()
-                    )
+                    !EntryTypeFactory.nameAndFieldsAreEqual(customType, currentlyStoredType.get())
                 ) {
-                    LOGGER.info(
-                        "currently stored type:    {}",
-                        currentlyStoredType.get()
-                    );
+                    LOGGER.info("currently stored type:    {}", currentlyStoredType.get());
                     LOGGER.info("type provided by library: {}", customType);
                     differentCustomizationTypes.add(
-                        new BibEntryTypePrefsAndFileViewModel(
-                            currentlyStoredType.get(),
-                            customType
-                        )
+                        new BibEntryTypePrefsAndFileViewModel(currentlyStoredType.get(), customType)
                     );
                 }
             }
@@ -67,9 +58,7 @@ public ObservableList<BibEntryType> newTypes() {
         return this.newTypes;
     }
 
-    public ObservableList<
-        BibEntryTypePrefsAndFileViewModel
-    > differentCustomizations() {
+    public ObservableList<BibEntryTypePrefsAndFileViewModel> differentCustomizations() {
         return this.differentCustomizationTypes;
     }
 
@@ -81,17 +70,13 @@ public void importBibEntryTypes(
             checkedUnknownEntryTypes.forEach(type ->
                 Globals.entryTypesManager.addCustomOrModifiedType(type, mode)
             );
-            preferencesService.storeCustomEntryTypesRepository(
-                Globals.entryTypesManager
-            );
+            preferencesService.storeCustomEntryTypesRepository(Globals.entryTypesManager);
         }
         if (!checkedDifferentEntryTypes.isEmpty()) {
             checkedUnknownEntryTypes.forEach(type ->
                 Globals.entryTypesManager.addCustomOrModifiedType(type, mode)
             );
-            preferencesService.storeCustomEntryTypesRepository(
-                Globals.entryTypesManager
-            );
+            preferencesService.storeCustomEntryTypesRepository(Globals.entryTypesManager);
         }
     }
 }
diff --git a/src/main/java/org/jabref/gui/importer/ImportEntriesDialog.java b/src/main/java/org/jabref/gui/importer/ImportEntriesDialog.java
index 38bba1df99d..9b5b86f002d 100644
--- a/src/main/java/org/jabref/gui/importer/ImportEntriesDialog.java
+++ b/src/main/java/org/jabref/gui/importer/ImportEntriesDialog.java
@@ -85,10 +85,7 @@ public class ImportEntriesDialog extends BaseDialog<Boolean> {
      * @param database the database to import into
      * @param task     the task executed for parsing the selected files(s).
      */
-    public ImportEntriesDialog(
-        BibDatabaseContext database,
-        BackgroundTask<ParserResult> task
-    ) {
+    public ImportEntriesDialog(BibDatabaseContext database, BackgroundTask<ParserResult> task) {
         this.database = database;
         this.task = task;
         ViewLoader.view(this).load().setAsDialogPane(this);
@@ -169,17 +166,12 @@ private void initialize() {
             .bind(libraryListView.getSelectionModel().selectedItemProperty());
         stateManager
             .getActiveDatabase()
-            .ifPresent(database1 ->
-                libraryListView.getSelectionModel().select(database1)
-            );
+            .ifPresent(database1 -> libraryListView.getSelectionModel().select(database1));
 
-        PseudoClass entrySelected = PseudoClass.getPseudoClass(
-            "entry-selected"
-        );
+        PseudoClass entrySelected = PseudoClass.getPseudoClass("entry-selected");
         new ViewModelListCellFactory<BibEntry>()
             .withGraphic(entry -> {
-                ToggleButton addToggle =
-                    IconTheme.JabRefIcons.ADD.asToggleButton();
+                ToggleButton addToggle = IconTheme.JabRefIcons.ADD.asToggleButton();
                 EasyBind.subscribe(
                     addToggle.selectedProperty(),
                     selected -> {
@@ -190,18 +182,14 @@ private void initialize() {
                                     .getGraphicNode()
                             );
                         } else {
-                            addToggle.setGraphic(
-                                IconTheme.JabRefIcons.ADD.getGraphicNode()
-                            );
+                            addToggle.setGraphic(IconTheme.JabRefIcons.ADD.getGraphicNode());
                         }
                     }
                 );
                 addToggle.getStyleClass().add("addEntryButton");
                 addToggle
                     .selectedProperty()
-                    .bindBidirectional(
-                        entriesListView.getItemBooleanProperty(entry)
-                    );
+                    .bindBidirectional(entriesListView.getItemBooleanProperty(entry));
                 HBox separator = new HBox();
                 HBox.setHgrow(separator, Priority.SOMETIMES);
                 Node entryNode = getEntryNode(entry);
@@ -213,8 +201,7 @@ private void initialize() {
                     .wrap(() -> viewModel.hasDuplicate(entry))
                     .onSuccess(duplicateFound -> {
                         if (duplicateFound) {
-                            Button duplicateButton =
-                                IconTheme.JabRefIcons.DUPLICATE.asButton();
+                            Button duplicateButton = IconTheme.JabRefIcons.DUPLICATE.asButton();
                             duplicateButton.setTooltip(
                                 new Tooltip(
                                     Localization.lang(
@@ -222,9 +209,7 @@ private void initialize() {
                                     )
                                 )
                             );
-                            duplicateButton.setOnAction(event ->
-                                viewModel.resolveDuplicate(entry)
-                            );
+                            duplicateButton.setOnAction(event -> viewModel.resolveDuplicate(entry));
                             container.getChildren().add(1, duplicateButton);
                         }
                     })
@@ -243,43 +228,26 @@ private void initialize() {
             .withOnMouseClickedEvent((entry, event) ->
                 entriesListView.getCheckModel().toggleCheckState(entry)
             )
-            .withPseudoClass(
-                entrySelected,
-                entriesListView::getItemBooleanProperty
-            )
+            .withPseudoClass(entrySelected, entriesListView::getItemBooleanProperty)
             .install(entriesListView);
 
         selectedItems
             .textProperty()
-            .bind(
-                Bindings
-                    .size(entriesListView.getCheckModel().getCheckedItems())
-                    .asString()
-            );
-        totalItems
-            .textProperty()
-            .bind(Bindings.size(entriesListView.getItems()).asString());
+            .bind(Bindings.size(entriesListView.getCheckModel().getCheckedItems()).asString());
+        totalItems.textProperty().bind(Bindings.size(entriesListView.getItems()).asString());
         entriesListView.setSelectionModel(new NoSelectionModel<>());
     }
 
     private Node getEntryNode(BibEntry entry) {
         Node entryType = getIcon(entry.getType()).getGraphicNode();
         entryType.getStyleClass().add("type");
-        Label authors = new Label(
-            entry.getFieldOrAliasLatexFree(StandardField.AUTHOR).orElse("")
-        );
+        Label authors = new Label(entry.getFieldOrAliasLatexFree(StandardField.AUTHOR).orElse(""));
         authors.getStyleClass().add("authors");
-        Label title = new Label(
-            entry.getFieldOrAliasLatexFree(StandardField.TITLE).orElse("")
-        );
+        Label title = new Label(entry.getFieldOrAliasLatexFree(StandardField.TITLE).orElse(""));
         title.getStyleClass().add("title");
-        Label year = new Label(
-            entry.getFieldOrAliasLatexFree(StandardField.YEAR).orElse("")
-        );
+        Label year = new Label(entry.getFieldOrAliasLatexFree(StandardField.YEAR).orElse(""));
         year.getStyleClass().add("year");
-        Label journal = new Label(
-            entry.getFieldOrAliasLatexFree(StandardField.JOURNAL).orElse("")
-        );
+        Label journal = new Label(entry.getFieldOrAliasLatexFree(StandardField.JOURNAL).orElse(""));
         journal.getStyleClass().add("journal");
 
         VBox entryContainer = new VBox(
@@ -290,9 +258,7 @@ private Node getEntryNode(BibEntry entry) {
         entry
             .getFieldOrAliasLatexFree(StandardField.ABSTRACT)
             .ifPresent(summaryText -> {
-                TextFlowLimited summary = new TextFlowLimited(
-                    new Text(summaryText)
-                );
+                TextFlowLimited summary = new TextFlowLimited(new Text(summaryText));
                 summary.getStyleClass().add("summary");
                 entryContainer.getChildren().add(summary);
             });
diff --git a/src/main/java/org/jabref/gui/importer/ImportEntriesViewModel.java b/src/main/java/org/jabref/gui/importer/ImportEntriesViewModel.java
index 4f9d8d34322..62f1baca0d2 100644
--- a/src/main/java/org/jabref/gui/importer/ImportEntriesViewModel.java
+++ b/src/main/java/org/jabref/gui/importer/ImportEntriesViewModel.java
@@ -32,9 +32,7 @@
 
 public class ImportEntriesViewModel extends AbstractViewModel {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(
-        ImportEntriesViewModel.class
-    );
+    private static final Logger LOGGER = LoggerFactory.getLogger(ImportEntriesViewModel.class);
 
     private final StringProperty message;
     private final TaskExecutor taskExecutor;
@@ -85,9 +83,7 @@ public ImportEntriesViewModel(
                 entries.addAll(parserResult.getDatabase().getEntries());
                 if (entries.isEmpty()) {
                     task.updateMessage(
-                        Localization.lang(
-                            "No entries corresponding to given query"
-                        )
+                        Localization.lang("No entries corresponding to given query")
                     );
                 }
             })
@@ -136,21 +132,12 @@ public boolean hasDuplicate(BibEntry entry) {
      *
      * @param entriesToImport subset of the entries contained in parserResult
      */
-    public void importEntries(
-        List<BibEntry> entriesToImport,
-        boolean shouldDownloadFiles
-    ) {
+    public void importEntries(List<BibEntry> entriesToImport, boolean shouldDownloadFiles) {
         // Check if we are supposed to warn about duplicates.
         // If so, then see if there are duplicates, and warn if yes.
-        if (
-            preferences
-                .getImporterPreferences()
-                .shouldWarnAboutDuplicatesOnImport()
-        ) {
+        if (preferences.getImporterPreferences().shouldWarnAboutDuplicatesOnImport()) {
             BackgroundTask
-                .wrap(() ->
-                    entriesToImport.stream().anyMatch(this::hasDuplicate)
-                )
+                .wrap(() -> entriesToImport.stream().anyMatch(this::hasDuplicate))
                 .onSuccess(duplicateFound -> {
                     if (duplicateFound) {
                         boolean continueImport =
@@ -169,13 +156,9 @@ public void importEntries(
                             );
 
                         if (!continueImport) {
-                            dialogService.notify(
-                                Localization.lang("Import canceled")
-                            );
+                            dialogService.notify(Localization.lang("Import canceled"));
                         } else {
-                            buildImportHandlerThenImportEntries(
-                                entriesToImport
-                            );
+                            buildImportHandlerThenImportEntries(entriesToImport);
                         }
                     } else {
                         buildImportHandlerThenImportEntries(entriesToImport);
@@ -187,9 +170,7 @@ public void importEntries(
         }
 
         // Remember the selection in the dialog
-        preferences
-            .getFilePreferences()
-            .setDownloadLinkedFiles(shouldDownloadFiles);
+        preferences.getFilePreferences().setDownloadLinkedFiles(shouldDownloadFiles);
 
         if (shouldDownloadFiles) {
             for (BibEntry bibEntry : entriesToImport) {
@@ -211,31 +192,19 @@ public void importEntries(
             }
         }
 
-        new DatabaseMerger(
-            preferences.getBibEntryPreferences().getKeywordSeparator()
-        )
-            .mergeStrings(
-                databaseContext.getDatabase(),
-                parserResult.getDatabase()
-            );
-        new DatabaseMerger(
-            preferences.getBibEntryPreferences().getKeywordSeparator()
-        )
+        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.getPath().map(path -> path.getFileName().toString()).orElse("unknown"),
                 parserResult.getDatabase().getEntries()
             );
         //        JabRefGUI.getMainFrame().getCurrentLibraryTab().markBaseChanged();
     }
 
-    private void buildImportHandlerThenImportEntries(
-        List<BibEntry> entriesToImport
-    ) {
+    private void buildImportHandlerThenImportEntries(List<BibEntry> entriesToImport) {
         ImportHandler importHandler = new ImportHandler(
             selectedDb.getValue(),
             preferences,
@@ -277,11 +246,7 @@ private Optional<BibEntry> findInternalDuplicate(BibEntry entry) {
     public void resolveDuplicate(BibEntry entry) {
         // First, try to find duplicate in the existing library
         Optional<BibEntry> other = new DuplicateCheck(entryTypesManager)
-            .containsDuplicate(
-                databaseContext.getDatabase(),
-                entry,
-                databaseContext.getMode()
-            );
+            .containsDuplicate(databaseContext.getDatabase(), entry, databaseContext.getMode());
         if (other.isPresent()) {
             DuplicateResolverDialog dialog = new DuplicateResolverDialog(
                 other.get(),
@@ -293,36 +258,21 @@ public void resolveDuplicate(BibEntry entry) {
                 preferences
             );
 
-            DuplicateResolverDialog.DuplicateResolverResult result =
-                dialogService
-                    .showCustomDialogAndWait(dialog)
-                    .orElse(
-                        DuplicateResolverDialog.DuplicateResolverResult.BREAK
-                    );
+            DuplicateResolverDialog.DuplicateResolverResult result = dialogService
+                .showCustomDialogAndWait(dialog)
+                .orElse(DuplicateResolverDialog.DuplicateResolverResult.BREAK);
 
-            if (
-                result ==
-                DuplicateResolverDialog.DuplicateResolverResult.KEEP_LEFT
-            ) {
+            if (result == DuplicateResolverDialog.DuplicateResolverResult.KEEP_LEFT) {
                 // TODO: Remove old entry. Or... add it to a list of entries
                 // to be deleted. We only delete
                 // it after Ok is clicked.
                 // entriesToDelete.add(other.get());
-            } else if (
-                result ==
-                DuplicateResolverDialog.DuplicateResolverResult.KEEP_RIGHT
-            ) {
+            } else if (result == DuplicateResolverDialog.DuplicateResolverResult.KEEP_RIGHT) {
                 // Remove the entry from the import inspection dialog.
                 entries.remove(entry);
-            } else if (
-                result ==
-                DuplicateResolverDialog.DuplicateResolverResult.KEEP_BOTH
-            ) {
+            } else if (result == DuplicateResolverDialog.DuplicateResolverResult.KEEP_BOTH) {
                 // Do nothing.
-            } else if (
-                result ==
-                DuplicateResolverDialog.DuplicateResolverResult.KEEP_MERGE
-            ) {
+            } else if (result == DuplicateResolverDialog.DuplicateResolverResult.KEEP_MERGE) {
                 // TODO: Remove old entry. Or... add it to a list of entries
                 // to be deleted. We only delete
                 // it after Ok is clicked.
@@ -347,33 +297,18 @@ public void resolveDuplicate(BibEntry entry) {
                 preferences
             );
 
-            DuplicateResolverDialog.DuplicateResolverResult answer =
-                dialogService
-                    .showCustomDialogAndWait(diag)
-                    .orElse(
-                        DuplicateResolverDialog.DuplicateResolverResult.BREAK
-                    );
-            if (
-                answer ==
-                DuplicateResolverDialog.DuplicateResolverResult.KEEP_LEFT
-            ) {
+            DuplicateResolverDialog.DuplicateResolverResult answer = dialogService
+                .showCustomDialogAndWait(diag)
+                .orElse(DuplicateResolverDialog.DuplicateResolverResult.BREAK);
+            if (answer == DuplicateResolverDialog.DuplicateResolverResult.KEEP_LEFT) {
                 // Remove other entry
                 entries.remove(other.get());
-            } else if (
-                answer ==
-                DuplicateResolverDialog.DuplicateResolverResult.KEEP_RIGHT
-            ) {
+            } else if (answer == DuplicateResolverDialog.DuplicateResolverResult.KEEP_RIGHT) {
                 // Remove entry
                 entries.remove(entry);
-            } else if (
-                answer ==
-                DuplicateResolverDialog.DuplicateResolverResult.KEEP_BOTH
-            ) {
+            } else if (answer == DuplicateResolverDialog.DuplicateResolverResult.KEEP_BOTH) {
                 // Do nothing
-            } else if (
-                answer ==
-                DuplicateResolverDialog.DuplicateResolverResult.KEEP_MERGE
-            ) {
+            } else if (answer == DuplicateResolverDialog.DuplicateResolverResult.KEEP_MERGE) {
                 // Replace both entries by merged entry
                 entries.add(diag.getMergedEntry());
                 entries.remove(entry);
diff --git a/src/main/java/org/jabref/gui/importer/NewDatabaseAction.java b/src/main/java/org/jabref/gui/importer/NewDatabaseAction.java
index 383b2cee2cb..968fc523e2e 100644
--- a/src/main/java/org/jabref/gui/importer/NewDatabaseAction.java
+++ b/src/main/java/org/jabref/gui/importer/NewDatabaseAction.java
@@ -19,10 +19,7 @@ public class NewDatabaseAction extends SimpleCommand {
      * @param jabRefFrame        the application frame of JabRef
      * @param preferencesService the preferencesService of JabRef
      */
-    public NewDatabaseAction(
-        JabRefFrame jabRefFrame,
-        PreferencesService preferencesService
-    ) {
+    public NewDatabaseAction(JabRefFrame jabRefFrame, PreferencesService preferencesService) {
         this.jabRefFrame = jabRefFrame;
         this.preferencesService = preferencesService;
     }
@@ -31,9 +28,7 @@ public NewDatabaseAction(
     public void execute() {
         BibDatabaseContext bibDatabaseContext = new BibDatabaseContext();
         bibDatabaseContext.setMode(
-            preferencesService
-                .getLibraryPreferences()
-                .getDefaultBibDatabaseMode()
+            preferencesService.getLibraryPreferences().getDefaultBibDatabaseMode()
         );
         jabRefFrame.addTab(bibDatabaseContext, true);
     }
diff --git a/src/main/java/org/jabref/gui/importer/NewEntryAction.java b/src/main/java/org/jabref/gui/importer/NewEntryAction.java
index 525c49e8dac..68dae0e81e7 100644
--- a/src/main/java/org/jabref/gui/importer/NewEntryAction.java
+++ b/src/main/java/org/jabref/gui/importer/NewEntryAction.java
@@ -19,9 +19,7 @@
 
 public class NewEntryAction extends SimpleCommand {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(
-        NewEntryAction.class
-    );
+    private static final Logger LOGGER = LoggerFactory.getLogger(NewEntryAction.class);
 
     private final JabRefFrame jabRefFrame;
 
@@ -63,16 +61,12 @@ public NewEntryAction(
     @Override
     public void execute() {
         if (jabRefFrame.getBasePanelCount() <= 0) {
-            LOGGER.error(
-                "Action 'New entry' must be disabled when no database is open."
-            );
+            LOGGER.error("Action 'New entry' must be disabled when no database is open.");
             return;
         }
 
         if (type.isPresent()) {
-            jabRefFrame
-                .getCurrentLibraryTab()
-                .insertEntry(new BibEntry(type.get()));
+            jabRefFrame.getCurrentLibraryTab().insertEntry(new BibEntry(type.get()));
         } else {
             EntryTypeView typeChoiceDialog = new EntryTypeView(
                 jabRefFrame.getCurrentLibraryTab(),
@@ -87,9 +81,7 @@ public void execute() {
             }
 
             trackNewEntry(selectedType);
-            jabRefFrame
-                .getCurrentLibraryTab()
-                .insertEntry(new BibEntry(selectedType));
+            jabRefFrame.getCurrentLibraryTab().insertEntry(new BibEntry(selectedType));
         }
     }
 
@@ -99,8 +91,6 @@ private void trackNewEntry(EntryType type) {
 
         Telemetry
             .getTelemetryClient()
-            .ifPresent(client ->
-                client.trackEvent("NewEntry", properties, new HashMap<>())
-            );
+            .ifPresent(client -> client.trackEvent("NewEntry", properties, new HashMap<>()));
     }
 }
diff --git a/src/main/java/org/jabref/gui/importer/ParserResultWarningDialog.java b/src/main/java/org/jabref/gui/importer/ParserResultWarningDialog.java
index b3434f2a5d0..b6831652afe 100644
--- a/src/main/java/org/jabref/gui/importer/ParserResultWarningDialog.java
+++ b/src/main/java/org/jabref/gui/importer/ParserResultWarningDialog.java
@@ -57,9 +57,7 @@ public static void showParserResultWarningDialog(
         final StringBuilder dialogContent = new StringBuilder();
         int warningCount = 1;
         for (final String warning : warnings) {
-            dialogContent.append(
-                String.format("%d. %s%n", warningCount++, warning)
-            );
+            dialogContent.append(String.format("%d. %s%n", warningCount++, warning));
         }
         dialogContent.deleteCharAt(dialogContent.length() - 1);
 
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 fba51e2f192..60c8d202950 100644
--- a/src/main/java/org/jabref/gui/importer/actions/CheckForNewEntryTypesAction.java
+++ b/src/main/java/org/jabref/gui/importer/actions/CheckForNewEntryTypesAction.java
@@ -19,19 +19,13 @@ public class CheckForNewEntryTypesAction implements GUIPostOpenAction {
 
     @Override
     public boolean isActionNecessary(ParserResult parserResult) {
-        return !getListOfUnknownAndUnequalCustomizations(parserResult)
-            .isEmpty();
+        return !getListOfUnknownAndUnequalCustomizations(parserResult).isEmpty();
     }
 
     @Override
-    public void performAction(
-        LibraryTab libraryTab,
-        ParserResult parserResult
-    ) {
+    public void performAction(LibraryTab libraryTab, ParserResult parserResult) {
         BibDatabaseMode mode = getBibDatabaseModeFromParserResult(parserResult);
-        DialogService dialogService = Injector.instantiateModelOrService(
-            DialogService.class
-        );
+        DialogService dialogService = Injector.instantiateModelOrService(DialogService.class);
         dialogService.showCustomDialogAndWait(
             new ImportCustomEntryTypesDialog(
                 mode,
@@ -40,33 +34,20 @@ public void performAction(
         );
     }
 
-    private List<BibEntryType> getListOfUnknownAndUnequalCustomizations(
-        ParserResult parserResult
-    ) {
+    private List<BibEntryType> getListOfUnknownAndUnequalCustomizations(ParserResult parserResult) {
         BibDatabaseMode mode = getBibDatabaseModeFromParserResult(parserResult);
 
         return parserResult
             .getEntryTypes()
             .stream()
-            .filter(type ->
-                Globals.entryTypesManager.isDifferentCustomOrModifiedType(
-                    type,
-                    mode
-                )
-            )
+            .filter(type -> Globals.entryTypesManager.isDifferentCustomOrModifiedType(type, mode))
             .collect(Collectors.toList());
     }
 
-    private BibDatabaseMode getBibDatabaseModeFromParserResult(
-        ParserResult parserResult
-    ) {
+    private BibDatabaseMode getBibDatabaseModeFromParserResult(ParserResult parserResult) {
         return parserResult
             .getMetaData()
             .getMode()
-            .orElse(
-                Globals.prefs
-                    .getLibraryPreferences()
-                    .getDefaultBibDatabaseMode()
-            );
+            .orElse(Globals.prefs.getLibraryPreferences().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 b4b5ac0c712..609842a8879 100644
--- a/src/main/java/org/jabref/gui/importer/actions/MergeReviewIntoCommentAction.java
+++ b/src/main/java/org/jabref/gui/importer/actions/MergeReviewIntoCommentAction.java
@@ -14,21 +14,14 @@ public boolean isActionNecessary(ParserResult parserResult) {
     }
 
     @Override
-    public void performAction(
-        LibraryTab libraryTab,
-        ParserResult parserResult
-    ) {
-        MergeReviewIntoCommentMigration migration =
-            new MergeReviewIntoCommentMigration();
+    public void performAction(LibraryTab libraryTab, ParserResult parserResult) {
+        MergeReviewIntoCommentMigration migration = new MergeReviewIntoCommentMigration();
 
         migration.performMigration(parserResult);
-        List<BibEntry> conflicts =
-            MergeReviewIntoCommentMigration.collectConflicts(parserResult);
+        List<BibEntry> conflicts = MergeReviewIntoCommentMigration.collectConflicts(parserResult);
         if (
             !conflicts.isEmpty() &&
-            new MergeReviewIntoCommentConfirmationDialog(
-                libraryTab.frame().getDialogService()
-            )
+            new MergeReviewIntoCommentConfirmationDialog(libraryTab.frame().getDialogService())
                 .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 f227201dc67..f2075e586ff 100644
--- a/src/main/java/org/jabref/gui/importer/actions/MergeReviewIntoCommentConfirmationDialog.java
+++ b/src/main/java/org/jabref/gui/importer/actions/MergeReviewIntoCommentConfirmationDialog.java
@@ -11,9 +11,7 @@ public class MergeReviewIntoCommentConfirmationDialog {
 
     private final DialogService dialogService;
 
-    public MergeReviewIntoCommentConfirmationDialog(
-        DialogService dialogService
-    ) {
+    public MergeReviewIntoCommentConfirmationDialog(DialogService dialogService) {
         this.dialogService = dialogService;
     }
 
@@ -28,9 +26,7 @@ public boolean askUserForMerge(List<BibEntry> conflicts) {
         String content =
             bibKeys +
             " " +
-            Localization.lang(
-                "has/have both a 'Comment' and a 'Review' field."
-            ) +
+            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."
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 2157e51d9b5..8a36996afb5 100644
--- a/src/main/java/org/jabref/gui/importer/actions/OpenDatabaseAction.java
+++ b/src/main/java/org/jabref/gui/importer/actions/OpenDatabaseAction.java
@@ -42,9 +42,7 @@
 // The action concerned with opening an existing database.
 public class OpenDatabaseAction extends SimpleCommand {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(
-        OpenDatabaseAction.class
-    );
+    private static final Logger LOGGER = LoggerFactory.getLogger(OpenDatabaseAction.class);
 
     // 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:
@@ -91,10 +89,7 @@ public OpenDatabaseAction(
      * @param libraryTab The BasePanel where the database is shown.
      * @param result     The result of the BIB file parse operation.
      */
-    public static void performPostOpenActions(
-        LibraryTab libraryTab,
-        ParserResult result
-    ) {
+    public static void performPostOpenActions(LibraryTab libraryTab, ParserResult result) {
         for (GUIPostOpenAction action : OpenDatabaseAction.POST_OPEN_ACTIONS) {
             if (action.isActionNecessary(result)) {
                 action.performAction(libraryTab, result);
@@ -105,17 +100,15 @@ public static void performPostOpenActions(
 
     @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(filesToOpen);
     }
 
@@ -124,9 +117,7 @@ public void execute() {
      */
     private Path getInitialDirectory() {
         if (frame.getLibraryTabs().isEmpty()) {
-            return preferencesService
-                .getFilePreferences()
-                .getWorkingDirectory();
+            return preferencesService.getFilePreferences().getWorkingDirectory();
         } else {
             Optional<Path> databasePath = frame
                 .getCurrentLibraryTab()
@@ -134,11 +125,7 @@ private Path getInitialDirectory() {
                 .getDatabasePath();
             return databasePath
                 .map(Path::getParent)
-                .orElse(
-                    preferencesService
-                        .getFilePreferences()
-                        .getWorkingDirectory()
-                );
+                .orElse(preferencesService.getFilePreferences().getWorkingDirectory());
         }
     }
 
@@ -164,23 +151,13 @@ public void openFiles(List<Path> filesToOpen) {
         int removed = 0;
 
         // Check if any of the files are already open:
-        for (
-            Iterator<Path> iterator = filesToOpen.iterator();
-            iterator.hasNext();
-        ) {
+        for (Iterator<Path> iterator = filesToOpen.iterator(); iterator.hasNext();) {
             Path file = iterator.next();
             for (int i = 0; i < frame.getLibraryTabs().size(); i++) {
                 LibraryTab libraryTab = frame.getLibraryTabAt(i);
                 if (
-                    (libraryTab
-                            .getBibDatabaseContext()
-                            .getDatabasePath()
-                            .isPresent()) &&
-                    libraryTab
-                        .getBibDatabaseContext()
-                        .getDatabasePath()
-                        .get()
-                        .equals(file)
+                    (libraryTab.getBibDatabaseContext().getDatabasePath().isPresent()) &&
+                    libraryTab.getBibDatabaseContext().getDatabasePath().get().equals(file)
                 ) {
                     iterator.remove();
                     removed++;
@@ -198,9 +175,7 @@ public void openFiles(List<Path> filesToOpen) {
         // Run the actual open in a thread to prevent the program
         // locking until the file is loaded.
         if (!filesToOpen.isEmpty()) {
-            FileHistory fileHistory = preferencesService
-                .getGuiPreferences()
-                .getFileHistory();
+            FileHistory fileHistory = preferencesService.getGuiPreferences().getFileHistory();
             filesToOpen.forEach(theFile -> {
                 // This method will execute the concrete file opening and loading in a background thread
                 openTheFile(theFile);
@@ -224,9 +199,7 @@ private void openTheFile(Path file) {
             return;
         }
 
-        BackgroundTask<ParserResult> backgroundTask = BackgroundTask.wrap(() ->
-            loadDatabase(file)
-        );
+        BackgroundTask<ParserResult> backgroundTask = BackgroundTask.wrap(() -> loadDatabase(file));
         // The backgroundTask is executed within the method createLibraryTab
         LibraryTab newTab = LibraryTab.createLibraryTab(
             backgroundTask,
@@ -248,12 +221,8 @@ private ParserResult loadDatabase(Path file) throws Exception {
 
         dialogService.notify(Localization.lang("Opening") + ": '" + file + "'");
 
-        preferencesService
-            .getFilePreferences()
-            .setWorkingDirectory(fileToLoad.getParent());
-        Path backupDir = preferencesService
-            .getFilePreferences()
-            .getBackupDirectory();
+        preferencesService.getFilePreferences().setWorkingDirectory(fileToLoad.getParent());
+        Path backupDir = preferencesService.getFilePreferences().getBackupDirectory();
 
         ParserResult parserResult = null;
         if (BackupManager.backupFileDiffers(fileToLoad, backupDir)) {
@@ -283,9 +252,7 @@ private ParserResult loadDatabase(Path file) throws Exception {
 
             if (parserResult.hasWarnings()) {
                 String content =
-                    Localization.lang(
-                        "Please check your library file for wrong syntax."
-                    ) +
+                    Localization.lang("Please check your library file for wrong syntax.") +
                     "\n\n" +
                     parserResult.getErrorMessage();
                 DefaultTaskExecutor.runInJavaFXThread(() ->
@@ -325,10 +292,7 @@ private void trackOpenNewDatabase(LibraryTab libraryTab) {
                     Map.of(),
                     Map.of(
                         "NumberOfEntries",
-                        (double) libraryTab
-                            .getBibDatabaseContext()
-                            .getDatabase()
-                            .getEntryCount()
+                        (double) libraryTab.getBibDatabaseContext().getDatabase().getEntryCount()
                     )
                 )
             );
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 1f194a7def4..94bf2028f7e 100644
--- a/src/main/java/org/jabref/gui/importer/fetcher/LookupIdentifierAction.java
+++ b/src/main/java/org/jabref/gui/importer/fetcher/LookupIdentifierAction.java
@@ -25,12 +25,9 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-public class LookupIdentifierAction<T extends Identifier>
-    extends SimpleCommand {
+public class LookupIdentifierAction<T extends Identifier> extends SimpleCommand {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(
-        LookupIdentifierAction.class
-    );
+    private static final Logger LOGGER = LoggerFactory.getLogger(LookupIdentifierAction.class);
 
     private final JabRefFrame frame;
 
@@ -53,16 +50,13 @@ public LookupIdentifierAction(
         this.taskExecutor = taskExecutor;
 
         this.executable.bind(
-                needsDatabase(this.stateManager)
-                    .and(needsEntriesSelected(this.stateManager))
+                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."
-                    )
+                    Localization.lang("This operation requires one or more entries to be selected.")
                 )
             );
     }
@@ -71,8 +65,7 @@ public LookupIdentifierAction(
     public void execute() {
         try {
             BackgroundTask
-                .wrap(() -> lookupIdentifiers(stateManager.getSelectedEntries())
-                )
+                .wrap(() -> lookupIdentifiers(stateManager.getSelectedEntries()))
                 .onSuccess(frame.getDialogService()::notify)
                 .executeWith(taskExecutor);
         } catch (Exception e) {
@@ -107,23 +100,15 @@ private String lookupIdentifiers(List<BibEntry> bibEntries) {
             try {
                 identifier = fetcher.findIdentifier(bibEntry);
             } catch (FetcherException e) {
-                LOGGER.error(
-                    "Could not fetch " + fetcher.getIdentifierName(),
-                    e
-                );
+                LOGGER.error("Could not fetch " + fetcher.getIdentifierName(), e);
             }
-            if (
-                identifier.isPresent() &&
-                !bibEntry.hasField(identifier.get().getDefaultField())
-            ) {
+            if (identifier.isPresent() && !bibEntry.hasField(identifier.get().getDefaultField())) {
                 Optional<FieldChange> fieldChange = bibEntry.setField(
                     identifier.get().getDefaultField(),
                     identifier.get().getNormalized()
                 );
                 if (fieldChange.isPresent()) {
-                    namedCompound.addEdit(
-                        new UndoableFieldChange(fieldChange.get())
-                    );
+                    namedCompound.addEdit(new UndoableFieldChange(fieldChange.get()));
                     foundCount++;
                     final String nextStatusMessage = Localization.lang(
                         "Looking up %0... - entry %1 out of %2 - found %3",
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 7660bceb1b0..640280980fc 100644
--- a/src/main/java/org/jabref/gui/importer/fetcher/WebSearchPaneView.java
+++ b/src/main/java/org/jabref/gui/importer/fetcher/WebSearchPaneView.java
@@ -26,9 +26,7 @@
 
 public class WebSearchPaneView extends VBox {
 
-    private static final PseudoClass QUERY_INVALID = PseudoClass.getPseudoClass(
-        "invalid"
-    );
+    private static final PseudoClass QUERY_INVALID = PseudoClass.getPseudoClass("invalid");
 
     private final WebSearchPaneViewModel viewModel;
     private final PreferencesService preferences;
@@ -41,12 +39,7 @@ public WebSearchPaneView(
     ) {
         this.preferences = preferences;
         this.dialogService = dialogService;
-        this.viewModel =
-            new WebSearchPaneViewModel(
-                preferences,
-                dialogService,
-                stateManager
-            );
+        this.viewModel = new WebSearchPaneViewModel(preferences, dialogService, stateManager);
         initialize();
     }
 
@@ -56,16 +49,12 @@ private void initialize() {
             .withText(SearchBasedFetcher::getName)
             .install(fetchers);
         fetchers.itemsProperty().bind(viewModel.fetchersProperty());
-        fetchers
-            .valueProperty()
-            .bindBidirectional(viewModel.selectedFetcherProperty());
+        fetchers.valueProperty().bindBidirectional(viewModel.selectedFetcherProperty());
         fetchers.setMaxWidth(Double.POSITIVE_INFINITY);
 
         // Create help button for currently selected fetcher
         StackPane helpButtonContainer = new StackPane();
-        ActionFactory factory = new ActionFactory(
-            preferences.getKeyBindingRepository()
-        );
+        ActionFactory factory = new ActionFactory(preferences.getKeyBindingRepository());
         EasyBind.subscribe(
             viewModel.selectedFetcherProperty(),
             fetcher -> {
@@ -95,20 +84,10 @@ private void initialize() {
         EasyBind.subscribe(
             viewModel.queryValidationStatus().validProperty(),
             valid -> {
-                if (
-                    !valid &&
-                    viewModel
-                        .queryValidationStatus()
-                        .getHighestMessage()
-                        .isPresent()
-                ) {
+                if (!valid && viewModel.queryValidationStatus().getHighestMessage().isPresent()) {
                     query.setTooltip(
                         new Tooltip(
-                            viewModel
-                                .queryValidationStatus()
-                                .getHighestMessage()
-                                .get()
-                                .getMessage()
+                            viewModel.queryValidationStatus().getHighestMessage().get().getMessage()
                         )
                     );
                     query.pseudoClassStateChanged(QUERY_INVALID, true);
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 03d7d5001b3..96ab632178e 100644
--- a/src/main/java/org/jabref/gui/importer/fetcher/WebSearchPaneViewModel.java
+++ b/src/main/java/org/jabref/gui/importer/fetcher/WebSearchPaneViewModel.java
@@ -38,10 +38,10 @@
 
 public class WebSearchPaneViewModel {
 
-    private final ObjectProperty<SearchBasedFetcher> selectedFetcher =
-        new SimpleObjectProperty<>();
-    private final ListProperty<SearchBasedFetcher> fetchers =
-        new SimpleListProperty<>(FXCollections.observableArrayList());
+    private final ObjectProperty<SearchBasedFetcher> selectedFetcher = new SimpleObjectProperty<>();
+    private final ListProperty<SearchBasedFetcher> fetchers = new SimpleListProperty<>(
+        FXCollections.observableArrayList()
+    );
     private final StringProperty query = new SimpleStringProperty();
     private final DialogService dialogService;
     private final PreferencesService preferencesService;
@@ -67,18 +67,12 @@ public WebSearchPaneViewModel(
         );
 
         // Choose last-selected fetcher as default
-        SidePanePreferences sidePanePreferences =
-            preferencesService.getSidePanePreferences();
-        int defaultFetcherIndex =
-            sidePanePreferences.getWebSearchFetcherSelected();
-        if (
-            (defaultFetcherIndex <= 0) ||
-            (defaultFetcherIndex >= fetchers.size())
-        ) {
+        SidePanePreferences sidePanePreferences = preferencesService.getSidePanePreferences();
+        int defaultFetcherIndex = sidePanePreferences.getWebSearchFetcherSelected();
+        if ((defaultFetcherIndex <= 0) || (defaultFetcherIndex >= fetchers.size())) {
             selectedFetcherProperty().setValue(fetchers.get(0));
         } else {
-            selectedFetcherProperty()
-                .setValue(fetchers.get(defaultFetcherIndex));
+            selectedFetcherProperty().setValue(fetchers.get(defaultFetcherIndex));
         }
         EasyBind.subscribe(
             selectedFetcherProperty(),
@@ -110,10 +104,7 @@ public WebSearchPaneViewModel(
                         int position = e.currentToken.beginColumn;
                         if (element == null) {
                             return ValidationMessage.error(
-                                Localization.lang(
-                                    "Invalid query. Check position %0.",
-                                    position
-                                )
+                                Localization.lang("Invalid query. Check position %0.", position)
                             );
                         } else {
                             return ValidationMessage.error(
@@ -157,11 +148,7 @@ public StringProperty queryProperty() {
 
     public void search() {
         if (!preferencesService.getImporterPreferences().areImporterEnabled()) {
-            if (
-                !preferencesService
-                    .getImporterPreferences()
-                    .areImporterEnabled()
-            ) {
+            if (!preferencesService.getImporterPreferences().areImporterEnabled()) {
                 dialogService.notify(Localization.lang("Web search disabled"));
                 return;
             }
@@ -169,16 +156,12 @@ public void search() {
 
         String query = getQuery().trim();
         if (StringUtil.isBlank(query)) {
-            dialogService.notify(
-                Localization.lang("Please enter a search string")
-            );
+            dialogService.notify(Localization.lang("Please enter a search string"));
             return;
         }
         if (stateManager.getActiveDatabase().isEmpty()) {
             dialogService.notify(
-                Localization.lang(
-                    "Please open or start a new library before searching"
-                )
+                Localization.lang("Please open or start a new library before searching")
             );
             return;
         }
@@ -195,9 +178,7 @@ public void search() {
             parserResultCallable =
                 () ->
                     new ParserResult(
-                        OptionalUtil.toList(
-                            compositeIdFetcher.performSearchById(query)
-                        )
+                        OptionalUtil.toList(compositeIdFetcher.performSearchById(query))
                     );
             fetcherName = Localization.lang("Identifier-based Web Search");
         }
@@ -206,11 +187,7 @@ public void search() {
         Telemetry
             .getTelemetryClient()
             .ifPresent(client ->
-                client.trackEvent(
-                    "search",
-                    Map.of("fetcher", finalFetcherName),
-                    Map.of()
-                )
+                client.trackEvent("search", Map.of("fetcher", finalFetcherName), Map.of())
             );
 
         BackgroundTask<ParserResult> task = BackgroundTask
diff --git a/src/main/java/org/jabref/gui/integrity/IntegrityCheckAction.java b/src/main/java/org/jabref/gui/integrity/IntegrityCheckAction.java
index 14fe8f47a14..5f18ce49a0b 100644
--- a/src/main/java/org/jabref/gui/integrity/IntegrityCheckAction.java
+++ b/src/main/java/org/jabref/gui/integrity/IntegrityCheckAction.java
@@ -56,17 +56,13 @@ public void execute() {
             preferencesService.getFilePreferences(),
             preferencesService.getCitationKeyPatternPreferences(),
             abbreviationRepository,
-            preferencesService
-                .getEntryEditorPreferences()
-                .shouldAllowIntegerEditionBibtex()
+            preferencesService.getEntryEditorPreferences().shouldAllowIntegerEditionBibtex()
         );
 
         Task<List<IntegrityMessage>> task = new Task<>() {
             @Override
             protected List<IntegrityMessage> call() {
-                ObservableList<BibEntry> entries = database
-                    .getDatabase()
-                    .getEntries();
+                ObservableList<BibEntry> entries = database.getDatabase().getEntries();
                 List<IntegrityMessage> result = new ArrayList<>(
                     check.checkDatabase(database.getDatabase())
                 );
@@ -89,18 +85,12 @@ protected List<IntegrityMessage> call() {
                 dialogService.notify(Localization.lang("No problems found."));
             } else {
                 dialogService.showCustomDialogAndWait(
-                    new IntegrityCheckDialog(
-                        messages,
-                        frame.getCurrentLibraryTab()
-                    )
+                    new IntegrityCheckDialog(messages, frame.getCurrentLibraryTab())
                 );
             }
         });
         task.setOnFailed(event ->
-            dialogService.showErrorDialogAndWait(
-                "Integrity check failed.",
-                task.getException()
-            )
+            dialogService.showErrorDialogAndWait("Integrity check failed.", task.getException())
         );
 
         dialogService.showProgressDialog(
diff --git a/src/main/java/org/jabref/gui/integrity/IntegrityCheckDialog.java b/src/main/java/org/jabref/gui/integrity/IntegrityCheckDialog.java
index 39103b9ea00..2e873dc065e 100644
--- a/src/main/java/org/jabref/gui/integrity/IntegrityCheckDialog.java
+++ b/src/main/java/org/jabref/gui/integrity/IntegrityCheckDialog.java
@@ -52,10 +52,7 @@ public class IntegrityCheckDialog extends BaseDialog<Void> {
     private IntegrityCheckDialogViewModel viewModel;
     private TableFilter<IntegrityMessage> tableFilter;
 
-    public IntegrityCheckDialog(
-        List<IntegrityMessage> messages,
-        LibraryTab libraryTab
-    ) {
+    public IntegrityCheckDialog(List<IntegrityMessage> messages, LibraryTab libraryTab) {
         this.messages = messages;
         this.libraryTab = libraryTab;
         this.setTitle(Localization.lang("Check integrity"));
@@ -66,19 +63,14 @@ public IntegrityCheckDialog(
         themeManager.updateFontStyle(getDialogPane().getScene());
     }
 
-    private void onSelectionChanged(
-        ListChangeListener.Change<? extends IntegrityMessage> change
-    ) {
+    private void onSelectionChanged(ListChangeListener.Change<? extends IntegrityMessage> change) {
         if (change.next()) {
             change
                 .getAddedSubList()
                 .stream()
                 .findFirst()
                 .ifPresent(message ->
-                    libraryTab.editEntryAndFocusField(
-                        message.getEntry(),
-                        message.getField()
-                    )
+                    libraryTab.editEntryAndFocusField(message.getEntry(), message.getField())
                 );
         }
     }
@@ -91,20 +83,13 @@ public IntegrityCheckDialogViewModel getViewModel() {
     private void initialize() {
         viewModel = new IntegrityCheckDialogViewModel(messages);
 
-        messagesTable
-            .getSelectionModel()
-            .getSelectedItems()
-            .addListener(this::onSelectionChanged);
+        messagesTable.getSelectionModel().getSelectedItems().addListener(this::onSelectionChanged);
         messagesTable.setItems(viewModel.getMessages());
         keyColumn.setCellValueFactory(row ->
-            new ReadOnlyStringWrapper(
-                row.getValue().getEntry().getCitationKey().orElse("")
-            )
+            new ReadOnlyStringWrapper(row.getValue().getEntry().getCitationKey().orElse(""))
         );
         fieldColumn.setCellValueFactory(row ->
-            new ReadOnlyStringWrapper(
-                row.getValue().getField().getDisplayName()
-            )
+            new ReadOnlyStringWrapper(row.getValue().getField().getDisplayName())
         );
         messageColumn.setCellValueFactory(row ->
             new ReadOnlyStringWrapper(row.getValue().getMessage())
diff --git a/src/main/java/org/jabref/gui/journals/AbbreviateAction.java b/src/main/java/org/jabref/gui/journals/AbbreviateAction.java
index 218f7aac0fa..df44a31c763 100644
--- a/src/main/java/org/jabref/gui/journals/AbbreviateAction.java
+++ b/src/main/java/org/jabref/gui/journals/AbbreviateAction.java
@@ -31,9 +31,7 @@
  */
 public class AbbreviateAction extends SimpleCommand {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(
-        AbbreviateAction.class
-    );
+    private static final Logger LOGGER = LoggerFactory.getLogger(AbbreviateAction.class);
 
     private final StandardActions action;
     private final JabRefFrame frame;
@@ -63,12 +61,9 @@ public AbbreviateAction(
         this.taskExecutor = taskExecutor;
 
         switch (action) {
-            case ABBREVIATE_DEFAULT -> abbreviationType =
-                AbbreviationType.DEFAULT;
-            case ABBREVIATE_DOTLESS -> abbreviationType =
-                AbbreviationType.DOTLESS;
-            case ABBREVIATE_SHORTEST_UNIQUE -> abbreviationType =
-                AbbreviationType.SHORTEST_UNIQUE;
+            case ABBREVIATE_DEFAULT -> abbreviationType = AbbreviationType.DEFAULT;
+            case ABBREVIATE_DOTLESS -> abbreviationType = AbbreviationType.DOTLESS;
+            case ABBREVIATE_SHORTEST_UNIQUE -> abbreviationType = AbbreviationType.SHORTEST_UNIQUE;
             default -> LOGGER.debug("Unknown action: " + action.name());
         }
 
@@ -116,19 +111,14 @@ public void execute() {
         }
     }
 
-    private String abbreviate(
-        BibDatabaseContext databaseContext,
-        List<BibEntry> entries
-    ) {
+    private String abbreviate(BibDatabaseContext databaseContext, List<BibEntry> entries) {
         UndoableAbbreviator undoableAbbreviator = new UndoableAbbreviator(
             abbreviationRepository,
             abbreviationType,
             journalAbbreviationPreferences.shouldUseFJournalField()
         );
 
-        NamedCompound ce = new NamedCompound(
-            Localization.lang("Abbreviate journal names")
-        );
+        NamedCompound ce = new NamedCompound(Localization.lang("Abbreviate journal names"));
 
         // Collect all callables to execute in one collection.
         Set<Callable<Boolean>> tasks = entries
@@ -150,8 +140,7 @@ private String abbreviate(
             .collect(Collectors.toSet());
 
         // Execute the callables and wait for the results.
-        List<Future<Boolean>> futures =
-            JabRefExecutorService.INSTANCE.executeAll(tasks);
+        List<Future<Boolean>> futures = JabRefExecutorService.INSTANCE.executeAll(tasks);
 
         // Evaluate the results of the callables.
         long count = futures
@@ -173,23 +162,15 @@ private String abbreviate(
         ce.end();
         frame.getUndoManager().addEdit(ce);
         frame.getCurrentLibraryTab().markBaseChanged();
-        return Localization.lang(
-            "Abbreviated %0 journal names.",
-            String.valueOf(count)
-        );
+        return Localization.lang("Abbreviated %0 journal names.", String.valueOf(count));
     }
 
-    private String unabbreviate(
-        BibDatabaseContext databaseContext,
-        List<BibEntry> entries
-    ) {
+    private String unabbreviate(BibDatabaseContext databaseContext, List<BibEntry> entries) {
         UndoableUnabbreviator undoableAbbreviator = new UndoableUnabbreviator(
             Globals.journalAbbreviationRepository
         );
 
-        NamedCompound ce = new NamedCompound(
-            Localization.lang("Unabbreviate journal names")
-        );
+        NamedCompound ce = new NamedCompound(Localization.lang("Unabbreviate journal names"));
         int count = entries
             .stream()
             .mapToInt(entry ->
@@ -208,17 +189,12 @@ private String unabbreviate(
             )
             .sum();
         if (count == 0) {
-            return Localization.lang(
-                "No journal names could be unabbreviated."
-            );
+            return Localization.lang("No journal names could be unabbreviated.");
         }
 
         ce.end();
         frame.getUndoManager().addEdit(ce);
         frame.getCurrentLibraryTab().markBaseChanged();
-        return Localization.lang(
-            "Unabbreviated %0 journal names.",
-            String.valueOf(count)
-        );
+        return Localization.lang("Unabbreviated %0 journal names.", String.valueOf(count));
     }
 }
diff --git a/src/main/java/org/jabref/gui/journals/UndoableAbbreviator.java b/src/main/java/org/jabref/gui/journals/UndoableAbbreviator.java
index 05b6e65fca5..f66ca36537f 100644
--- a/src/main/java/org/jabref/gui/journals/UndoableAbbreviator.java
+++ b/src/main/java/org/jabref/gui/journals/UndoableAbbreviator.java
@@ -55,9 +55,7 @@ public boolean abbreviate(
             return false; // Unknown, cannot abbreviate anything.
         }
 
-        Abbreviation abbreviation = journalAbbreviationRepository
-            .get(text)
-            .get();
+        Abbreviation abbreviation = journalAbbreviationRepository.get(text).get();
         String newText = getAbbreviatedName(abbreviation);
 
         if (newText.equals(origText)) {
@@ -67,24 +65,16 @@ public boolean abbreviate(
         // Store full name into fjournal but only if it exists
         if (
             useFJournalField &&
-            (StandardField.JOURNAL == fieldName ||
-                StandardField.JOURNALTITLE == fieldName)
+            (StandardField.JOURNAL == fieldName || StandardField.JOURNALTITLE == fieldName)
         ) {
             entry.setField(AMSField.FJOURNAL, abbreviation.getName());
             ce.addEdit(
-                new UndoableFieldChange(
-                    entry,
-                    AMSField.FJOURNAL,
-                    null,
-                    abbreviation.getName()
-                )
+                new UndoableFieldChange(entry, AMSField.FJOURNAL, null, abbreviation.getName())
             );
         }
 
         entry.setField(fieldName, newText);
-        ce.addEdit(
-            new UndoableFieldChange(entry, fieldName, origText, newText)
-        );
+        ce.addEdit(new UndoableFieldChange(entry, fieldName, origText, newText));
         return true;
     }
 
diff --git a/src/main/java/org/jabref/gui/journals/UndoableUnabbreviator.java b/src/main/java/org/jabref/gui/journals/UndoableUnabbreviator.java
index f468299ac83..0cb758d64cc 100644
--- a/src/main/java/org/jabref/gui/journals/UndoableUnabbreviator.java
+++ b/src/main/java/org/jabref/gui/journals/UndoableUnabbreviator.java
@@ -14,9 +14,7 @@ public class UndoableUnabbreviator {
 
     private final JournalAbbreviationRepository journalAbbreviationRepository;
 
-    public UndoableUnabbreviator(
-        JournalAbbreviationRepository journalAbbreviationRepository
-    ) {
+    public UndoableUnabbreviator(JournalAbbreviationRepository journalAbbreviationRepository) {
         this.journalAbbreviationRepository = journalAbbreviationRepository;
     }
 
@@ -56,23 +54,16 @@ public boolean unabbreviate(
             return false; // Cannot unabbreviate unabbreviated name.
         }
 
-        Abbreviation abbreviation = journalAbbreviationRepository
-            .get(text)
-            .get();
+        Abbreviation abbreviation = journalAbbreviationRepository.get(text).get();
         String newText = abbreviation.getName();
         entry.setField(field, newText);
         ce.addEdit(new UndoableFieldChange(entry, field, origText, newText));
         return true;
     }
 
-    public boolean restoreFromFJournal(
-        BibEntry entry,
-        Field field,
-        CompoundEdit ce
-    ) {
+    public boolean restoreFromFJournal(BibEntry entry, Field field, CompoundEdit ce) {
         if (
-            (StandardField.JOURNAL != field &&
-                StandardField.JOURNALTITLE != field) ||
+            (StandardField.JOURNAL != field && StandardField.JOURNALTITLE != field) ||
             !entry.hasField(AMSField.FJOURNAL)
         ) {
             return false;
@@ -82,9 +73,7 @@ public boolean restoreFromFJournal(
         String newText = entry.getField(AMSField.FJOURNAL).get().trim();
 
         entry.setField(AMSField.FJOURNAL, "");
-        ce.addEdit(
-            new UndoableFieldChange(entry, AMSField.FJOURNAL, newText, "")
-        );
+        ce.addEdit(new UndoableFieldChange(entry, AMSField.FJOURNAL, newText, ""));
 
         entry.setField(field, newText);
         ce.addEdit(new UndoableFieldChange(entry, field, origText, newText));
diff --git a/src/main/java/org/jabref/gui/keyboard/CodeAreaKeyBindings.java b/src/main/java/org/jabref/gui/keyboard/CodeAreaKeyBindings.java
index bac36229026..e2d694c7846 100644
--- a/src/main/java/org/jabref/gui/keyboard/CodeAreaKeyBindings.java
+++ b/src/main/java/org/jabref/gui/keyboard/CodeAreaKeyBindings.java
@@ -22,29 +22,19 @@ public static void call(
                         event.consume();
                     }
                     case EDITOR_BACKWARD -> {
-                        codeArea.previousChar(
-                            NavigationActions.SelectionPolicy.CLEAR
-                        );
+                        codeArea.previousChar(NavigationActions.SelectionPolicy.CLEAR);
                         event.consume();
                     }
                     case EDITOR_FORWARD -> {
-                        codeArea.nextChar(
-                            NavigationActions.SelectionPolicy.CLEAR
-                        );
+                        codeArea.nextChar(NavigationActions.SelectionPolicy.CLEAR);
                         event.consume();
                     }
                     case EDITOR_WORD_BACKWARD -> {
-                        codeArea.wordBreaksBackwards(
-                            2,
-                            NavigationActions.SelectionPolicy.CLEAR
-                        );
+                        codeArea.wordBreaksBackwards(2, NavigationActions.SelectionPolicy.CLEAR);
                         event.consume();
                     }
                     case EDITOR_WORD_FORWARD -> {
-                        codeArea.wordBreaksForwards(
-                            2,
-                            NavigationActions.SelectionPolicy.CLEAR
-                        );
+                        codeArea.wordBreaksForwards(2, NavigationActions.SelectionPolicy.CLEAR);
                         event.consume();
                     }
                     case EDITOR_BEGINNING_DOC -> {
@@ -52,15 +42,11 @@ public static void call(
                         event.consume();
                     }
                     case EDITOR_UP -> {
-                        codeArea.paragraphStart(
-                            NavigationActions.SelectionPolicy.CLEAR
-                        );
+                        codeArea.paragraphStart(NavigationActions.SelectionPolicy.CLEAR);
                         event.consume();
                     }
                     case EDITOR_BEGINNING -> {
-                        codeArea.lineStart(
-                            NavigationActions.SelectionPolicy.CLEAR
-                        );
+                        codeArea.lineStart(NavigationActions.SelectionPolicy.CLEAR);
                         event.consume();
                     }
                     case EDITOR_END_DOC -> {
@@ -68,55 +54,33 @@ public static void call(
                         event.consume();
                     }
                     case EDITOR_DOWN -> {
-                        codeArea.paragraphEnd(
-                            NavigationActions.SelectionPolicy.CLEAR
-                        );
+                        codeArea.paragraphEnd(NavigationActions.SelectionPolicy.CLEAR);
                         event.consume();
                     }
                     case EDITOR_END -> {
-                        codeArea.lineEnd(
-                            NavigationActions.SelectionPolicy.CLEAR
-                        );
+                        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
-                        );
+                        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
-                        );
+                        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
-                        );
+                        String text = codeArea.getText(0, codeArea.getText().length());
+                        ResultingStringState res = StringManipulator.uppercase(pos, text);
                         codeArea.clear();
                         codeArea.replaceText(res.text);
                         codeArea.displaceCaret(res.caretPosition);
@@ -130,26 +94,16 @@ public static void call(
                     }
                     case EDITOR_KILL_WORD -> {
                         int pos = codeArea.getCaretPosition();
-                        String text = codeArea.getText(
-                            0,
-                            codeArea.getText().length()
-                        );
-                        ResultingStringState res = StringManipulator.killWord(
-                            pos,
-                            text
-                        );
+                        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);
+                        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 71fbddb7c7a..908559a4637 100644
--- a/src/main/java/org/jabref/gui/keyboard/KeyBinding.java
+++ b/src/main/java/org/jabref/gui/keyboard/KeyBinding.java
@@ -3,12 +3,7 @@
 import org.jabref.logic.l10n.Localization;
 
 public enum KeyBinding {
-    EDITOR_DELETE(
-        "Delete",
-        Localization.lang("Delete text"),
-        "",
-        KeyBindingCategory.EDITOR
-    ),
+    EDITOR_DELETE("Delete", Localization.lang("Delete text"), "", KeyBindingCategory.EDITOR),
     // DELETE BACKWARDS = Rubout
     EDITOR_BACKWARD(
         "Move caret left",
@@ -119,12 +114,7 @@ public enum KeyBinding {
         "ctrl+G",
         KeyBindingCategory.QUALITY
     ),
-    ACCEPT(
-        "Accept",
-        Localization.lang("Accept"),
-        "ctrl+ENTER",
-        KeyBindingCategory.EDIT
-    ),
+    ACCEPT("Accept", Localization.lang("Accept"), "ctrl+ENTER", KeyBindingCategory.EDIT),
     AUTOMATICALLY_LINK_FILES(
         "Automatically link files",
         Localization.lang("Automatically set file links"),
@@ -137,24 +127,14 @@ public enum KeyBinding {
         "ctrl+F8",
         KeyBindingCategory.QUALITY
     ),
-    CLEANUP(
-        "Cleanup",
-        Localization.lang("Cleanup entries"),
-        "alt+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(
-        "Close dialog",
-        Localization.lang("Close dialog"),
-        "Esc",
-        KeyBindingCategory.VIEW
-    ),
+    CLOSE("Close dialog", Localization.lang("Close dialog"), "Esc", KeyBindingCategory.VIEW),
     COPY("Copy", Localization.lang("Copy"), "ctrl+C", KeyBindingCategory.EDIT),
     COPY_TITLE(
         "Copy title",
@@ -224,12 +204,7 @@ public enum KeyBinding {
         "ctrl+E",
         KeyBindingCategory.VIEW
     ),
-    EXPORT(
-        "Export",
-        Localization.lang("Export"),
-        "ctrl+alt+e",
-        KeyBindingCategory.FILE
-    ),
+    EXPORT("Export", Localization.lang("Export"), "ctrl+alt+e", KeyBindingCategory.FILE),
     EXPORT_SELECTED(
         "Export Selected",
         Localization.lang("Export selected entries"),
@@ -328,18 +303,8 @@ public enum KeyBinding {
         "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_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(
         "New entry from plain text",
         Localization.lang("New entry from plain text"),
@@ -413,12 +378,7 @@ public enum KeyBinding {
         "ctrl+O",
         KeyBindingCategory.FILE
     ),
-    OPEN_FILE(
-        "Open file",
-        Localization.lang("Open file"),
-        "F4",
-        KeyBindingCategory.TOOLS
-    ),
+    OPEN_FILE("Open file", Localization.lang("Open file"), "F4", KeyBindingCategory.TOOLS),
     OPEN_FOLDER(
         "Open folder",
         Localization.lang("Open folder"),
@@ -437,12 +397,7 @@ public enum KeyBinding {
         "F3",
         KeyBindingCategory.TOOLS
     ),
-    PASTE(
-        "Paste",
-        Localization.lang("Paste"),
-        "ctrl+V",
-        KeyBindingCategory.EDIT
-    ),
+    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"),
@@ -467,12 +422,7 @@ public enum KeyBinding {
         "ctrl+L",
         KeyBindingCategory.TOOLS
     ),
-    QUIT_JABREF(
-        "Quit JabRef",
-        Localization.lang("Quit JabRef"),
-        "ctrl+Q",
-        KeyBindingCategory.FILE
-    ),
+    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",
@@ -492,12 +442,7 @@ public enum KeyBinding {
         "ctrl+shift+D",
         KeyBindingCategory.BIBTEX
     ),
-    SAVE_ALL(
-        "Save all",
-        Localization.lang("Save all"),
-        "ctrl+alt+S",
-        KeyBindingCategory.FILE
-    ),
+    SAVE_ALL("Save all", Localization.lang("Save all"), "ctrl+alt+S", KeyBindingCategory.FILE),
     SAVE_DATABASE(
         "Save library",
         Localization.lang("Save library"),
@@ -510,18 +455,8 @@ public enum KeyBinding {
         "ctrl+shift+S",
         KeyBindingCategory.FILE
     ),
-    SEARCH(
-        "Search",
-        Localization.lang("Search"),
-        "ctrl+F",
-        KeyBindingCategory.SEARCH
-    ),
-    SELECT_ALL(
-        "Select all",
-        Localization.lang("Select all"),
-        "ctrl+A",
-        KeyBindingCategory.EDIT
-    ),
+    SEARCH("Search", Localization.lang("Search"), "ctrl+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"),
@@ -565,12 +500,7 @@ public enum KeyBinding {
         KeyBindingCategory.TOOLS
     ),
     UNDO("Undo", Localization.lang("Undo"), "ctrl+Z", KeyBindingCategory.EDIT),
-    WEB_SEARCH(
-        "Web search",
-        Localization.lang("Web search"),
-        "alt+4",
-        KeyBindingCategory.SEARCH
-    ),
+    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"),
diff --git a/src/main/java/org/jabref/gui/keyboard/KeyBindingRepository.java b/src/main/java/org/jabref/gui/keyboard/KeyBindingRepository.java
index 236d8d5932d..86315eb1b2b 100644
--- a/src/main/java/org/jabref/gui/keyboard/KeyBindingRepository.java
+++ b/src/main/java/org/jabref/gui/keyboard/KeyBindingRepository.java
@@ -30,13 +30,10 @@ public KeyBindingRepository(SortedMap<KeyBinding, String> bindings) {
     }
 
     public KeyBindingRepository(List<String> bindNames, List<String> bindings) {
-        this.bindings =
-            new TreeMap<>(Comparator.comparing(KeyBinding::getLocalization));
+        this.bindings = new TreeMap<>(Comparator.comparing(KeyBinding::getLocalization));
 
         if (
-            (bindNames.isEmpty()) ||
-            (bindings.isEmpty()) ||
-            (bindNames.size() != bindings.size())
+            (bindNames.isEmpty()) || (bindings.isEmpty()) || (bindNames.size() != bindings.size())
         ) {
             // Use default key bindings
             for (KeyBinding keyBinding : KeyBinding.values()) {
@@ -74,9 +71,7 @@ public Optional<String> get(KeyBinding key) {
 
     public String get(String key) {
         Optional<KeyBinding> keyBinding = getKeyBinding(key);
-        Optional<String> result = keyBinding.flatMap(k ->
-            Optional.ofNullable(bindings.get(k))
-        );
+        Optional<String> result = keyBinding.flatMap(k -> Optional.ofNullable(bindings.get(k)));
 
         if (result.isPresent()) {
             return result.get();
@@ -110,8 +105,7 @@ private Optional<KeyBinding> getKeyBinding(String key) {
     }
 
     public void resetToDefault(String key) {
-        getKeyBinding(key)
-            .ifPresent(b -> bindings.put(b, b.getDefaultKeyBinding()));
+        getKeyBinding(key).ifPresent(b -> bindings.put(b, b.getDefaultKeyBinding()));
     }
 
     public void resetToDefault() {
@@ -149,23 +143,14 @@ public Optional<KeyCombination> getKeyCombination(KeyBinding bindName) {
      * @param keyEvent as KeEvent
      * @return true if matching, else false
      */
-    public boolean checkKeyCombinationEquality(
-        KeyBinding binding,
-        KeyEvent keyEvent
-    ) {
+    public boolean checkKeyCombinationEquality(KeyBinding binding, KeyEvent keyEvent) {
         return getKeyCombination(binding)
-            .filter(combination ->
-                checkKeyCombinationEquality(combination, keyEvent)
-            )
+            .filter(combination -> checkKeyCombinationEquality(combination, keyEvent))
             .isPresent();
     }
 
     public List<String> getBindNames() {
-        return bindings
-            .keySet()
-            .stream()
-            .map(KeyBinding::getConstant)
-            .collect(Collectors.toList());
+        return bindings.keySet().stream().map(KeyBinding::getConstant).collect(Collectors.toList());
     }
 
     public List<String> getBindings() {
diff --git a/src/main/java/org/jabref/gui/keyboard/TextInputKeyBindings.java b/src/main/java/org/jabref/gui/keyboard/TextInputKeyBindings.java
index 1a643485962..22193d793ab 100644
--- a/src/main/java/org/jabref/gui/keyboard/TextInputKeyBindings.java
+++ b/src/main/java/org/jabref/gui/keyboard/TextInputKeyBindings.java
@@ -12,9 +12,7 @@ public class TextInputKeyBindings {
     public static void call(Scene scene, KeyEvent event) {
         if (scene.focusOwnerProperty().get() instanceof TextInputControl) {
             KeyBindingRepository keyBindingRepository = Globals.getKeyPrefs();
-            TextInputControl focusedTextField = (TextInputControl) scene
-                .focusOwnerProperty()
-                .get();
+            TextInputControl focusedTextField = (TextInputControl) scene.focusOwnerProperty().get();
             keyBindingRepository
                 .mapToKeyBinding(event)
                 .ifPresent(binding -> {
@@ -39,9 +37,7 @@ public static void call(Scene scene, KeyEvent event) {
                             focusedTextField.nextWord();
                             event.consume();
                         }
-                        case EDITOR_BEGINNING,
-                            EDITOR_UP,
-                            EDITOR_BEGINNING_DOC -> {
+                        case EDITOR_BEGINNING, EDITOR_UP, EDITOR_BEGINNING_DOC -> {
                             focusedTextField.home();
                             event.consume();
                         }
@@ -55,8 +51,7 @@ public static void call(Scene scene, KeyEvent event) {
                                 0,
                                 focusedTextField.getText().length()
                             );
-                            ResultingStringState res =
-                                StringManipulator.capitalize(pos, text);
+                            ResultingStringState res = StringManipulator.capitalize(pos, text);
                             focusedTextField.setText(res.text);
                             focusedTextField.positionCaret(res.caretPosition);
                             event.consume();
@@ -67,8 +62,7 @@ public static void call(Scene scene, KeyEvent event) {
                                 0,
                                 focusedTextField.getText().length()
                             );
-                            ResultingStringState res =
-                                StringManipulator.lowercase(pos, text);
+                            ResultingStringState res = StringManipulator.lowercase(pos, text);
                             focusedTextField.setText(res.text);
                             focusedTextField.positionCaret(res.caretPosition);
                             event.consume();
@@ -79,17 +73,14 @@ public static void call(Scene scene, KeyEvent event) {
                                 0,
                                 focusedTextField.getText().length()
                             );
-                            ResultingStringState res =
-                                StringManipulator.uppercase(pos, text);
+                            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.setText(focusedTextField.getText(0, pos));
                             focusedTextField.positionCaret(pos);
                             event.consume();
                         }
@@ -99,8 +90,7 @@ public static void call(Scene scene, KeyEvent event) {
                                 0,
                                 focusedTextField.getText().length()
                             );
-                            ResultingStringState res =
-                                StringManipulator.killWord(pos, text);
+                            ResultingStringState res = StringManipulator.killWord(pos, text);
                             focusedTextField.setText(res.text);
                             focusedTextField.positionCaret(res.caretPosition);
                             event.consume();
@@ -111,8 +101,10 @@ public static void call(Scene scene, KeyEvent event) {
                                 0,
                                 focusedTextField.getText().length()
                             );
-                            ResultingStringState res =
-                                StringManipulator.backwardKillWord(pos, text);
+                            ResultingStringState res = StringManipulator.backwardKillWord(
+                                pos,
+                                text
+                            );
                             focusedTextField.setText(res.text);
                             focusedTextField.positionCaret(res.caretPosition);
                             event.consume();
diff --git a/src/main/java/org/jabref/gui/libraryproperties/AbstractPropertiesTabView.java b/src/main/java/org/jabref/gui/libraryproperties/AbstractPropertiesTabView.java
index 1f4d2d8f9df..de6cb3d0911 100644
--- a/src/main/java/org/jabref/gui/libraryproperties/AbstractPropertiesTabView.java
+++ b/src/main/java/org/jabref/gui/libraryproperties/AbstractPropertiesTabView.java
@@ -6,9 +6,7 @@
 import org.jabref.gui.DialogService;
 import org.jabref.model.database.BibDatabaseContext;
 
-public abstract class AbstractPropertiesTabView<
-    T extends PropertiesTabViewModel
->
+public abstract class AbstractPropertiesTabView<T extends PropertiesTabViewModel>
     extends VBox
     implements PropertiesTab {
 
diff --git a/src/main/java/org/jabref/gui/libraryproperties/LibraryPropertiesAction.java b/src/main/java/org/jabref/gui/libraryproperties/LibraryPropertiesAction.java
index db41ee39517..179b3e1c58b 100644
--- a/src/main/java/org/jabref/gui/libraryproperties/LibraryPropertiesAction.java
+++ b/src/main/java/org/jabref/gui/libraryproperties/LibraryPropertiesAction.java
@@ -13,9 +13,7 @@
 
 public class LibraryPropertiesAction extends SimpleCommand {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(
-        LibraryPropertiesAction.class
-    );
+    private static final Logger LOGGER = LoggerFactory.getLogger(LibraryPropertiesAction.class);
 
     private final StateManager stateManager;
     private final Supplier<BibDatabaseContext> alternateDatabase;
@@ -35,9 +33,7 @@ public LibraryPropertiesAction(
 
     @Override
     public void execute() {
-        DialogService dialogService = Injector.instantiateModelOrService(
-            DialogService.class
-        );
+        DialogService dialogService = Injector.instantiateModelOrService(DialogService.class);
 
         if (alternateDatabase != null) {
             dialogService.showCustomDialogAndWait(
@@ -46,9 +42,7 @@ public void execute() {
         } else {
             if (stateManager.getActiveDatabase().isPresent()) {
                 dialogService.showCustomDialogAndWait(
-                    new LibraryPropertiesView(
-                        stateManager.getActiveDatabase().get()
-                    )
+                    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 1732bc67c22..a300aa499ea 100644
--- a/src/main/java/org/jabref/gui/libraryproperties/LibraryPropertiesView.java
+++ b/src/main/java/org/jabref/gui/libraryproperties/LibraryPropertiesView.java
@@ -13,8 +13,7 @@
 import org.jabref.logic.l10n.Localization;
 import org.jabref.model.database.BibDatabaseContext;
 
-public class LibraryPropertiesView
-    extends BaseDialog<LibraryPropertiesViewModel> {
+public class LibraryPropertiesView extends BaseDialog<LibraryPropertiesViewModel> {
 
     @FXML
     private TabPane tabPane;
@@ -63,9 +62,7 @@ private void initialize() {
             scrollPane.setFitToWidth(true);
             tabPane.getTabs().add(new Tab(pane.getTabName(), scrollPane));
             if (pane instanceof AbstractPropertiesTabView<?> propertiesTab) {
-                propertiesTab
-                    .prefHeightProperty()
-                    .bind(tabPane.tabMaxHeightProperty());
+                propertiesTab.prefHeightProperty().bind(tabPane.tabMaxHeightProperty());
                 propertiesTab.prefWidthProperty().bind(tabPane.widthProperty());
                 propertiesTab.getStyleClass().add("propertiesTab");
             }
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 63ee6bacad6..b044550a081 100644
--- a/src/main/java/org/jabref/gui/libraryproperties/constants/ConstantsItemModel.java
+++ b/src/main/java/org/jabref/gui/libraryproperties/constants/ConstantsItemModel.java
@@ -13,9 +13,7 @@
 
 public class ConstantsItemModel {
 
-    private static final 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,17 +27,10 @@ public ConstantsItemModel(String label, String content) {
         this.contentProperty.setValue(content);
 
         labelValidator =
-            new FunctionBasedValidator<>(
-                this.labelProperty,
-                ConstantsItemModel::validateLabel
-            );
+            new FunctionBasedValidator<>(this.labelProperty, ConstantsItemModel::validateLabel);
         contentValidator =
-            new FunctionBasedValidator<>(
-                this.contentProperty,
-                ConstantsItemModel::validateContent
-            );
-        combinedValidator =
-            new CompositeValidator(labelValidator, contentValidator);
+            new FunctionBasedValidator<>(this.contentProperty, ConstantsItemModel::validateContent);
+        combinedValidator = new CompositeValidator(labelValidator, contentValidator);
     }
 
     public ValidationStatus labelValidation() {
@@ -74,24 +65,18 @@ private static ValidationMessage validateLabel(String input) {
         if (input == null) {
             return ValidationMessage.error("May not be null");
         } else if (input.trim().isEmpty()) {
-            return ValidationMessage.error(
-                Localization.lang("Please enter the string's label")
-            );
+            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.")
             );
         } else if (input.contains("#")) {
             return ValidationMessage.error(
-                Localization.lang(
-                    "The label of the string cannot contain the '#' character."
-                )
+                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."
-                )
+                Localization.lang("The label of the string cannot contain spaces.")
             );
         } else {
             return null; // everything is ok
@@ -100,13 +85,9 @@ private static ValidationMessage validateLabel(String input) {
 
     private static ValidationMessage validateContent(String input) {
         if (input == null) {
-            return ValidationMessage.error(
-                Localization.lang("Must not be empty!")
-            );
+            return ValidationMessage.error(Localization.lang("Must not be empty!"));
         } else if (input.trim().isEmpty()) {
-            return ValidationMessage.error(
-                Localization.lang("Must not be empty!")
-            );
+            return ValidationMessage.error(Localization.lang("Must not be empty!"));
         } 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 939af70db1f..4d3e607aafd 100644
--- a/src/main/java/org/jabref/gui/libraryproperties/constants/ConstantsPropertiesView.java
+++ b/src/main/java/org/jabref/gui/libraryproperties/constants/ConstantsPropertiesView.java
@@ -67,38 +67,27 @@ public void initialize() {
                 preferencesService.getFilePreferences()
             );
 
-        addStringButton.setTooltip(
-            new Tooltip(Localization.lang("New string"))
-        );
+        addStringButton.setTooltip(new Tooltip(Localization.lang("New string")));
 
         labelColumn.setSortable(true);
         labelColumn.setReorderable(false);
 
-        labelColumn.setCellValueFactory(cellData ->
-            cellData.getValue().labelProperty()
-        );
-        new ViewModelTextFieldTableCellVisualizationFactory<
-            ConstantsItemModel,
-            String
-        >()
+        labelColumn.setCellValueFactory(cellData -> cellData.getValue().labelProperty());
+        new ViewModelTextFieldTableCellVisualizationFactory<ConstantsItemModel, String>()
             .withValidation(ConstantsItemModel::labelValidation)
             .install(labelColumn, new DefaultStringConverter());
         labelColumn.setOnEditCommit(
-            (
-                TableColumn.CellEditEvent<ConstantsItemModel, String> cellEvent
-            ) -> {
+            (TableColumn.CellEditEvent<ConstantsItemModel, String> cellEvent) -> {
                 var tableView = cellEvent.getTableView();
                 ConstantsItemModel cellItem = tableView
                     .getItems()
                     .get(cellEvent.getTablePosition().getRow());
 
-                Optional<ConstantsItemModel> existingItem =
-                    viewModel.labelAlreadyExists(cellEvent.getNewValue());
+                Optional<ConstantsItemModel> existingItem = viewModel.labelAlreadyExists(
+                    cellEvent.getNewValue()
+                );
 
-                if (
-                    existingItem.isPresent() &&
-                    !existingItem.get().equals(cellItem)
-                ) {
+                if (existingItem.isPresent() && !existingItem.get().equals(cellItem)) {
                     dialogService.showErrorDialogAndWait(
                         Localization.lang(
                             "A string with the label '%0' already exists.",
@@ -122,13 +111,8 @@ public void initialize() {
 
         contentColumn.setSortable(true);
         contentColumn.setReorderable(false);
-        contentColumn.setCellValueFactory(cellData ->
-            cellData.getValue().contentProperty()
-        );
-        new ViewModelTextFieldTableCellVisualizationFactory<
-            ConstantsItemModel,
-            String
-        >()
+        contentColumn.setCellValueFactory(cellData -> cellData.getValue().contentProperty());
+        new ViewModelTextFieldTableCellVisualizationFactory<ConstantsItemModel, String>()
             .withValidation(ConstantsItemModel::contentValidation)
             .install(contentColumn, new DefaultStringConverter());
         contentColumn.setOnEditCommit(
@@ -138,25 +122,16 @@ public void initialize() {
 
         actionsColumn.setSortable(false);
         actionsColumn.setReorderable(false);
-        actionsColumn.setCellValueFactory(cellData ->
-            cellData.getValue().labelProperty()
-        );
+        actionsColumn.setCellValueFactory(cellData -> cellData.getValue().labelProperty());
         new ValueTableCellFactory<ConstantsItemModel, String>()
-            .withGraphic(label ->
-                IconTheme.JabRefIcons.DELETE_ENTRY.getGraphicNode()
-            )
+            .withGraphic(label -> IconTheme.JabRefIcons.DELETE_ENTRY.getGraphicNode())
             .withTooltip(label -> Localization.lang("Remove string %0", label))
             .withOnMouseClickedEvent(item ->
-                evt ->
-                    viewModel.removeString(
-                        stringsList.getFocusModel().getFocusedItem()
-                    )
+                evt -> viewModel.removeString(stringsList.getFocusModel().getFocusedItem())
             )
             .install(actionsColumn);
 
-        stringsList
-            .itemsProperty()
-            .bindBidirectional(viewModel.stringsListProperty());
+        stringsList.itemsProperty().bindBidirectional(viewModel.stringsListProperty());
         stringsList.setEditable(true);
     }
 
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 cf81acfac1a..a9f56702f68 100644
--- a/src/main/java/org/jabref/gui/libraryproperties/constants/ConstantsPropertiesViewModel.java
+++ b/src/main/java/org/jabref/gui/libraryproperties/constants/ConstantsPropertiesViewModel.java
@@ -25,8 +25,9 @@ public class ConstantsPropertiesViewModel implements PropertiesTabViewModel {
 
     private static final String NEW_STRING_LABEL = "NewString"; // must not contain spaces
 
-    private final ListProperty<ConstantsItemModel> stringsListProperty =
-        new SimpleListProperty<>(FXCollections.observableArrayList());
+    private final ListProperty<ConstantsItemModel> stringsListProperty = new SimpleListProperty<>(
+        FXCollections.observableArrayList()
+    );
 
     private final BooleanProperty validProperty = new SimpleBooleanProperty();
 
@@ -44,16 +45,12 @@ public ConstantsPropertiesViewModel(
         this.dialogService = dialogService;
         this.filePreferences = filePreferences;
 
-        ObservableList<ObservableValue<Boolean>> allValidProperty =
-            EasyBind.map(
-                stringsListProperty,
-                ConstantsItemModel::combinedValidationValidProperty
-            );
+        ObservableList<ObservableValue<Boolean>> allValidProperty = EasyBind.map(
+            stringsListProperty,
+            ConstantsItemModel::combinedValidationValidProperty
+        );
         validProperty.bind(
-            EasyBind.combine(
-                allValidProperty,
-                stream -> stream.allMatch(valid -> valid)
-            )
+            EasyBind.combine(allValidProperty, stream -> stream.allMatch(valid -> valid))
         );
     }
 
@@ -92,19 +89,12 @@ 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)
-            )
+            Comparator.comparing(c -> c.labelProperty().get().toLowerCase(Locale.ROOT))
         );
     }
 
-    private ConstantsItemModel convertFromBibTexString(
-        BibtexString bibtexString
-    ) {
-        return new ConstantsItemModel(
-            bibtexString.getName(),
-            bibtexString.getContent()
-        );
+    private ConstantsItemModel convertFromBibTexString(BibtexString bibtexString) {
+        return new ConstantsItemModel(bibtexString.getName(), bibtexString.getContent());
     }
 
     @Override
@@ -119,9 +109,7 @@ public void storeSettings() {
             );
     }
 
-    private BibtexString fromBibtexStringViewModel(
-        ConstantsItemModel viewModel
-    ) {
+    private BibtexString fromBibtexStringViewModel(ConstantsItemModel viewModel) {
         String label = viewModel.labelProperty().getValue();
         String content = viewModel.contentProperty().getValue();
         return new BibtexString(label, content);
@@ -135,8 +123,7 @@ public Optional<ConstantsItemModel> labelAlreadyExists(String label) {
     }
 
     public void openHelpPage() {
-        new HelpAction(HelpFile.STRING_EDITOR, dialogService, filePreferences)
-            .execute();
+        new HelpAction(HelpFile.STRING_EDITOR, dialogService, filePreferences).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 d8ff5228822..ab63ac907b7 100644
--- a/src/main/java/org/jabref/gui/libraryproperties/contentselectors/ContentSelectorView.java
+++ b/src/main/java/org/jabref/gui/libraryproperties/contentselectors/ContentSelectorView.java
@@ -17,8 +17,7 @@
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.entry.field.Field;
 
-public class ContentSelectorView
-    extends AbstractPropertiesTabView<ContentSelectorViewModel> {
+public class ContentSelectorView extends AbstractPropertiesTabView<ContentSelectorViewModel> {
 
     @FXML
     private Button removeFieldNameButton;
@@ -53,8 +52,7 @@ public String getTabName() {
 
     @FXML
     public void initialize() {
-        this.viewModel =
-            new ContentSelectorViewModel(databaseContext, dialogService);
+        this.viewModel = new ContentSelectorViewModel(databaseContext, dialogService);
 
         initFieldNameComponents();
         initKeywordsComponents();
@@ -68,13 +66,8 @@ private void initFieldNameComponents() {
         new ViewModelListCellFactory<Field>()
             .withText(Field::getDisplayName)
             .install(fieldsListView);
-        removeFieldNameButton
-            .disableProperty()
-            .bind(viewModel.isNoFieldNameSelected());
-        EasyBind.subscribe(
-            viewModel.selectedFieldProperty(),
-            viewModel::populateKeywords
-        );
+        removeFieldNameButton.disableProperty().bind(viewModel.isNoFieldNameSelected());
+        EasyBind.subscribe(viewModel.selectedFieldProperty(), viewModel::populateKeywords);
     }
 
     private void initKeywordsComponents() {
@@ -82,12 +75,8 @@ private void initKeywordsComponents() {
         viewModel
             .selectedKeywordProperty()
             .bind(keywordsListView.getSelectionModel().selectedItemProperty());
-        addKeywordButton
-            .disableProperty()
-            .bind(viewModel.isFieldNameListEmpty());
-        removeKeywordButton
-            .disableProperty()
-            .bind(viewModel.isNoKeywordSelected());
+        addKeywordButton.disableProperty().bind(viewModel.isFieldNameListEmpty());
+        removeKeywordButton.disableProperty().bind(viewModel.isNoKeywordSelected());
     }
 
     @FXML
@@ -97,8 +86,7 @@ private void addNewFieldName() {
 
     @FXML
     private void removeFieldName() {
-        getSelectedField()
-            .ifPresent(viewModel::showRemoveFieldNameConfirmationDialog);
+        getSelectedField().ifPresent(viewModel::showRemoveFieldNameConfirmationDialog);
     }
 
     @FXML
@@ -111,10 +99,7 @@ private void removeKeyword() {
         Optional<Field> fieldName = getSelectedField();
         Optional<String> keywordToRemove = getSelectedKeyword();
         if (fieldName.isPresent() && keywordToRemove.isPresent()) {
-            viewModel.showRemoveKeywordConfirmationDialog(
-                fieldName.get(),
-                keywordToRemove.get()
-            );
+            viewModel.showRemoveKeywordConfirmationDialog(fieldName.get(), keywordToRemove.get());
         }
     }
 
@@ -127,9 +112,7 @@ private <T> void initListView(
     }
 
     private Optional<Field> getSelectedField() {
-        return Optional
-            .of(fieldsListView.getSelectionModel())
-            .map(SelectionModel::getSelectedItem);
+        return Optional.of(fieldsListView.getSelectionModel()).map(SelectionModel::getSelectedItem);
     }
 
     private Optional<String> getSelectedKeyword() {
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 c6e3cc3b581..5381861e7dc 100644
--- a/src/main/java/org/jabref/gui/libraryproperties/contentselectors/ContentSelectorViewModel.java
+++ b/src/main/java/org/jabref/gui/libraryproperties/contentselectors/ContentSelectorViewModel.java
@@ -48,14 +48,10 @@ public class ContentSelectorViewModel implements PropertiesTabViewModel {
     private final ListProperty<String> keywords = new SimpleListProperty<>(
         FXCollections.observableArrayList()
     );
-    private final ObjectProperty<Field> selectedField =
-        new SimpleObjectProperty<>();
+    private final ObjectProperty<Field> selectedField = new SimpleObjectProperty<>();
     private final StringProperty selectedKeyword = new SimpleStringProperty();
 
-    ContentSelectorViewModel(
-        BibDatabaseContext databaseContext,
-        DialogService dialogService
-    ) {
+    ContentSelectorViewModel(BibDatabaseContext databaseContext, DialogService dialogService) {
         this.metaData = databaseContext.getMetaData();
         this.dialogService = dialogService;
     }
@@ -84,9 +80,7 @@ public void setValues() {
 
     @Override
     public void storeSettings() {
-        List<Field> metaDataFields = metaData
-            .getContentSelectors()
-            .getFieldsWithSelectors();
+        List<Field> metaDataFields = metaData.getContentSelectors().getFieldsWithSelectors();
 
         if (isDefaultMap(fieldKeywordsMap)) {
             Iterator<ContentSelector> iterator = metaData
@@ -163,10 +157,7 @@ private void addFieldIfUnique(Field fieldToAdd) {
         boolean exists = fieldKeywordsMap.containsKey(fieldToAdd);
         if (exists) {
             dialogService.showErrorDialogAndWait(
-                Localization.lang(
-                    "Field name \"%0\" already exists",
-                    fieldToAdd.getDisplayName()
-                )
+                Localization.lang("Field name \"%0\" already exists", fieldToAdd.getDisplayName())
             );
             return;
         }
@@ -177,9 +168,7 @@ private void addFieldIfUnique(Field fieldToAdd) {
 
     void showRemoveFieldNameConfirmationDialog(Field fieldToRemove) {
         if (fieldToRemove == null) {
-            dialogService.showErrorDialogAndWait(
-                Localization.lang("No field name selected!")
-            );
+            dialogService.showErrorDialogAndWait(Localization.lang("No field name selected!"));
             return;
         }
 
@@ -214,9 +203,7 @@ void showInputKeywordDialog(Field selectedField) {
                 Localization.lang("Add new keyword"),
                 Localization.lang("Keyword:")
             )
-            .ifPresent(newKeyword ->
-                addKeywordIfUnique(selectedField, newKeyword)
-            );
+            .ifPresent(newKeyword -> addKeywordIfUnique(selectedField, newKeyword));
     }
 
     private void addKeywordIfUnique(Field field, String keywordToAdd) {
@@ -228,26 +215,17 @@ private void addKeywordIfUnique(Field field, String keywordToAdd) {
             return;
         }
 
-        List<String> existingKeywords = fieldKeywordsMap.getOrDefault(
-            field,
-            new ArrayList<>()
-        );
+        List<String> existingKeywords = fieldKeywordsMap.getOrDefault(field, new ArrayList<>());
         existingKeywords.add(keywordToAdd);
         existingKeywords.sort(Comparator.naturalOrder());
         fieldKeywordsMap.put(field, existingKeywords);
         populateKeywords(field);
     }
 
-    void showRemoveKeywordConfirmationDialog(
-        Field field,
-        String keywordToRemove
-    ) {
+    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
-            )
+            Localization.lang("Are you sure you want to remove keyword: \"%0\"?", keywordToRemove)
         );
         if (deleteConfirmed) {
             removeKeyword(field, keywordToRemove);
@@ -287,8 +265,7 @@ private void updateMetaDataContentSelector(
 
     private boolean keywordsHaveChanged(Field field, List<String> keywords) {
         HashSet<String> keywordsSet = asHashSet(keywords);
-        List<String> existingKeywords =
-            metaData.getContentSelectorValuesForField(field);
+        List<String> existingKeywords = metaData.getContentSelectorValuesForField(field);
         if (!keywordsSet.equals(asHashSet(existingKeywords))) {
             return true;
         }
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 b771b17882a..38032e4d172 100644
--- a/src/main/java/org/jabref/gui/libraryproperties/general/GeneralPropertiesView.java
+++ b/src/main/java/org/jabref/gui/libraryproperties/general/GeneralPropertiesView.java
@@ -13,8 +13,7 @@
 import org.jabref.model.database.BibDatabaseMode;
 import org.jabref.preferences.PreferencesService;
 
-public class GeneralPropertiesView
-    extends AbstractPropertiesTabView<GeneralPropertiesViewModel> {
+public class GeneralPropertiesView extends AbstractPropertiesTabView<GeneralPropertiesViewModel> {
 
     @FXML
     private ComboBox<Charset> encoding;
@@ -47,40 +46,26 @@ public String getTabName() {
 
     public void initialize() {
         this.viewModel =
-            new GeneralPropertiesViewModel(
-                databaseContext,
-                dialogService,
-                preferencesService
-            );
-
-        new ViewModelListCellFactory<Charset>()
-            .withText(Charset::displayName)
-            .install(encoding);
+            new GeneralPropertiesViewModel(databaseContext, dialogService, preferencesService);
+
+        new ViewModelListCellFactory<Charset>().withText(Charset::displayName).install(encoding);
         encoding.disableProperty().bind(viewModel.encodingDisableProperty());
         encoding.itemsProperty().bind(viewModel.encodingsProperty());
-        encoding
-            .valueProperty()
-            .bindBidirectional(viewModel.selectedEncodingProperty());
+        encoding.valueProperty().bindBidirectional(viewModel.selectedEncodingProperty());
 
         new ViewModelListCellFactory<BibDatabaseMode>()
             .withText(BibDatabaseMode::getFormattedName)
             .install(databaseMode);
         databaseMode.itemsProperty().bind(viewModel.databaseModesProperty());
-        databaseMode
-            .valueProperty()
-            .bindBidirectional(viewModel.selectedDatabaseModeProperty());
+        databaseMode.valueProperty().bindBidirectional(viewModel.selectedDatabaseModeProperty());
 
         generalFileDirectory
             .textProperty()
-            .bindBidirectional(
-                viewModel.generalFileDirectoryPropertyProperty()
-            );
+            .bindBidirectional(viewModel.generalFileDirectoryPropertyProperty());
         userSpecificFileDirectory
             .textProperty()
             .bindBidirectional(viewModel.userSpecificFileDirectoryProperty());
-        laTexFileDirectory
-            .textProperty()
-            .bindBidirectional(viewModel.laTexFileDirectoryProperty());
+        laTexFileDirectory.textProperty().bindBidirectional(viewModel.laTexFileDirectoryProperty());
     }
 
     @FXML
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 00fb964da18..870efd57b45 100644
--- a/src/main/java/org/jabref/gui/libraryproperties/general/GeneralPropertiesViewModel.java
+++ b/src/main/java/org/jabref/gui/libraryproperties/general/GeneralPropertiesViewModel.java
@@ -24,29 +24,21 @@
 
 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().get(0));
-    private final ListProperty<BibDatabaseMode> databaseModesProperty =
-        new SimpleListProperty<>(
-            FXCollections.observableArrayList(BibDatabaseMode.values())
-        );
-    private final SimpleObjectProperty<
-        BibDatabaseMode
-    > selectedDatabaseModeProperty = new SimpleObjectProperty<>(
-        BibDatabaseMode.BIBLATEX
+    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().get(0)
     );
-    private final StringProperty generalFileDirectoryProperty =
-        new SimpleStringProperty("");
-    private final StringProperty userSpecificFileDirectoryProperty =
-        new SimpleStringProperty("");
-    private final StringProperty laTexFileDirectoryProperty =
-        new SimpleStringProperty("");
+    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("");
 
     private final DialogService dialogService;
     private final PreferencesService preferencesService;
@@ -67,42 +59,27 @@ public class GeneralPropertiesViewModel implements PropertiesTabViewModel {
 
         this.directoryDialogConfiguration =
             new DirectoryDialogConfiguration.Builder()
-                .withInitialDirectory(
-                    preferencesService
-                        .getFilePreferences()
-                        .getWorkingDirectory()
-                )
+                .withInitialDirectory(preferencesService.getFilePreferences().getWorkingDirectory())
                 .build();
     }
 
     @Override
     public void setValues() {
-        boolean isShared =
-            databaseContext.getLocation() == DatabaseLocation.SHARED;
+        boolean isShared = databaseContext.getLocation() == DatabaseLocation.SHARED;
         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()
-        );
+        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(
-                    preferencesService.getFilePreferences().getUserAndHost()
-                )
+                .getUserFileDirectory(preferencesService.getFilePreferences().getUserAndHost())
                 .orElse("")
                 .trim()
         );
         laTexFileDirectoryProperty.setValue(
             metaData
-                .getLatexFileDirectory(
-                    preferencesService.getFilePreferences().getUserAndHost()
-                )
+                .getLatexFileDirectory(preferencesService.getFilePreferences().getUserAndHost())
                 .map(Path::toString)
                 .orElse("")
         );
@@ -115,17 +92,14 @@ public void storeSettings() {
         newMetaData.setEncoding(selectedEncodingProperty.getValue());
         newMetaData.setMode(selectedDatabaseModeProperty.getValue());
 
-        String generalFileDirectory = generalFileDirectoryProperty
-            .getValue()
-            .trim();
+        String generalFileDirectory = generalFileDirectoryProperty.getValue().trim();
         if (generalFileDirectory.isEmpty()) {
             newMetaData.clearDefaultFileDirectory();
         } else {
             newMetaData.setDefaultFileDirectory(generalFileDirectory);
         }
 
-        String userSpecificFileDirectory =
-            userSpecificFileDirectoryProperty.getValue();
+        String userSpecificFileDirectory = userSpecificFileDirectoryProperty.getValue();
         if (userSpecificFileDirectory.isEmpty()) {
             newMetaData.clearUserFileDirectory(
                 preferencesService.getFilePreferences().getUserAndHost()
@@ -155,10 +129,7 @@ public void storeSettings() {
     public void browseGeneralDir() {
         dialogService
             .showDirectorySelectionDialog(directoryDialogConfiguration)
-            .ifPresent(dir ->
-                generalFileDirectoryProperty.setValue(
-                    dir.toAbsolutePath().toString()
-                )
+            .ifPresent(dir -> generalFileDirectoryProperty.setValue(dir.toAbsolutePath().toString())
             );
     }
 
@@ -166,20 +137,14 @@ public void browseUserDir() {
         dialogService
             .showDirectorySelectionDialog(directoryDialogConfiguration)
             .ifPresent(dir ->
-                userSpecificFileDirectoryProperty.setValue(
-                    dir.toAbsolutePath().toString()
-                )
+                userSpecificFileDirectoryProperty.setValue(dir.toAbsolutePath().toString())
             );
     }
 
     public void browseLatexDir() {
         dialogService
             .showDirectorySelectionDialog(directoryDialogConfiguration)
-            .ifPresent(dir ->
-                laTexFileDirectoryProperty.setValue(
-                    dir.toAbsolutePath().toString()
-                )
-            );
+            .ifPresent(dir -> laTexFileDirectoryProperty.setValue(dir.toAbsolutePath().toString()));
     }
 
     public BooleanProperty encodingDisableProperty() {
@@ -198,9 +163,7 @@ public ListProperty<BibDatabaseMode> databaseModesProperty() {
         return databaseModesProperty;
     }
 
-    public SimpleObjectProperty<
-        BibDatabaseMode
-    > selectedDatabaseModeProperty() {
+    public SimpleObjectProperty<BibDatabaseMode> selectedDatabaseModeProperty() {
         return selectedDatabaseModeProperty;
     }
 
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 fe35f92c916..003481d881e 100644
--- a/src/main/java/org/jabref/gui/libraryproperties/keypattern/KeyPatternPropertiesView.java
+++ b/src/main/java/org/jabref/gui/libraryproperties/keypattern/KeyPatternPropertiesView.java
@@ -45,11 +45,7 @@ public String getTabName() {
     }
 
     public void initialize() {
-        this.viewModel =
-            new KeyPatternPropertiesViewModel(
-                databaseContext,
-                preferencesService
-            );
+        this.viewModel = new KeyPatternPropertiesViewModel(databaseContext, preferencesService);
 
         bibtexKeyPatternTable
             .patternListProperty()
@@ -78,18 +74,12 @@ public void setValues() {
                 databaseContext
                     .getMetaData()
                     .getMode()
-                    .orElse(
-                        preferencesService
-                            .getLibraryPreferences()
-                            .getDefaultBibDatabaseMode()
-                    )
+                    .orElse(preferencesService.getLibraryPreferences().getDefaultBibDatabaseMode())
             ),
             databaseContext
                 .getMetaData()
                 .getCiteKeyPattern(
-                    preferencesService
-                        .getCitationKeyPatternPreferences()
-                        .getKeyPattern()
+                    preferencesService.getCitationKeyPatternPreferences().getKeyPattern()
                 )
         );
     }
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 78ece995e50..be6aa9e5e8a 100644
--- a/src/main/java/org/jabref/gui/libraryproperties/keypattern/KeyPatternPropertiesViewModel.java
+++ b/src/main/java/org/jabref/gui/libraryproperties/keypattern/KeyPatternPropertiesViewModel.java
@@ -16,19 +16,15 @@ 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<
-        CitationKeyPatternPanelItemModel
-    > patternListProperty = new SimpleListProperty<>(
-        FXCollections.observableArrayList()
-    );
-    private final ObjectProperty<
-        CitationKeyPatternPanelItemModel
-    > defaultKeyPatternProperty = new SimpleObjectProperty<>(
-        new CitationKeyPatternPanelItemModel(
-            new CitationKeyPatternPanelViewModel.DefaultEntryType(),
-            ""
-        )
-    );
+    private final ListProperty<CitationKeyPatternPanelItemModel> patternListProperty =
+        new SimpleListProperty<>(FXCollections.observableArrayList());
+    private final ObjectProperty<CitationKeyPatternPanelItemModel> defaultKeyPatternProperty =
+        new SimpleObjectProperty<>(
+            new CitationKeyPatternPanelItemModel(
+                new CitationKeyPatternPanelViewModel.DefaultEntryType(),
+                ""
+            )
+        );
 
     private final PreferencesService preferencesService;
 
@@ -49,47 +45,33 @@ public void setValues() {
 
     @Override
     public void storeSettings() {
-        DatabaseCitationKeyPattern newKeyPattern =
-            new DatabaseCitationKeyPattern(
-                preferencesService
-                    .getCitationKeyPatternPreferences()
-                    .getKeyPattern()
-            );
+        DatabaseCitationKeyPattern newKeyPattern = new DatabaseCitationKeyPattern(
+            preferencesService.getCitationKeyPatternPreferences().getKeyPattern()
+        );
 
         patternListProperty.forEach(item -> {
             String patternString = item.getPattern();
             if (!item.getEntryType().getName().equals("default")) {
                 if (!patternString.trim().isEmpty()) {
-                    newKeyPattern.addCitationKeyPattern(
-                        item.getEntryType(),
-                        patternString
-                    );
+                    newKeyPattern.addCitationKeyPattern(item.getEntryType(), patternString);
                 }
             }
         });
 
-        if (
-            !defaultKeyPatternProperty.getValue().getPattern().trim().isEmpty()
-        ) {
+        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
             // at the end of the pattern
-            newKeyPattern.setDefaultValue(
-                defaultKeyPatternProperty.getValue().getPattern()
-            );
+            newKeyPattern.setDefaultValue(defaultKeyPatternProperty.getValue().getPattern());
         }
 
         databaseContext.getMetaData().setCiteKeyPattern(newKeyPattern);
     }
 
-    public ListProperty<
-        CitationKeyPatternPanelItemModel
-    > patternListProperty() {
+    public ListProperty<CitationKeyPatternPanelItemModel> patternListProperty() {
         return patternListProperty;
     }
 
-    public ObjectProperty<
-        CitationKeyPatternPanelItemModel
-    > defaultKeyPatternProperty() {
+    public ObjectProperty<CitationKeyPatternPanelItemModel> defaultKeyPatternProperty() {
         return defaultKeyPatternProperty;
     }
 }
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 70378775674..c0fb4a17aac 100644
--- a/src/main/java/org/jabref/gui/libraryproperties/preamble/PreamblePropertiesView.java
+++ b/src/main/java/org/jabref/gui/libraryproperties/preamble/PreamblePropertiesView.java
@@ -9,8 +9,7 @@
 import org.jabref.logic.l10n.Localization;
 import org.jabref.model.database.BibDatabaseContext;
 
-public class PreamblePropertiesView
-    extends AbstractPropertiesTabView<PreamblePropertiesViewModel> {
+public class PreamblePropertiesView extends AbstractPropertiesTabView<PreamblePropertiesViewModel> {
 
     @FXML
     private TextArea preamble;
@@ -30,8 +29,7 @@ public String getTabName() {
     }
 
     public void initialize() {
-        this.viewModel =
-            new PreamblePropertiesViewModel(databaseContext, undoManager);
+        this.viewModel = new PreamblePropertiesViewModel(databaseContext, undoManager);
 
         preamble.textProperty().bindBidirectional(viewModel.preambleProperty());
     }
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 e13c377d8da..d995193b6c6 100644
--- a/src/main/java/org/jabref/gui/libraryproperties/preamble/PreamblePropertiesViewModel.java
+++ b/src/main/java/org/jabref/gui/libraryproperties/preamble/PreamblePropertiesViewModel.java
@@ -9,38 +9,25 @@
 
 public class PreamblePropertiesViewModel implements PropertiesTabViewModel {
 
-    private final StringProperty preambleProperty = new SimpleStringProperty(
-        ""
-    );
+    private final StringProperty preambleProperty = new SimpleStringProperty("");
 
     private final BibDatabaseContext databaseContext;
     private final UndoManager undoManager;
 
-    PreamblePropertiesViewModel(
-        BibDatabaseContext databaseContext,
-        UndoManager undoManager
-    ) {
+    PreamblePropertiesViewModel(BibDatabaseContext databaseContext, UndoManager undoManager) {
         this.undoManager = undoManager;
         this.databaseContext = databaseContext;
     }
 
     @Override
     public void setValues() {
-        preambleProperty.setValue(
-            databaseContext.getDatabase().getPreamble().orElse("")
-        );
+        preambleProperty.setValue(databaseContext.getDatabase().getPreamble().orElse(""));
     }
 
     @Override
     public void storeSettings() {
         String newPreamble = preambleProperty.getValue();
-        if (
-            !databaseContext
-                .getDatabase()
-                .getPreamble()
-                .orElse("")
-                .equals(newPreamble)
-        ) {
+        if (!databaseContext.getDatabase().getPreamble().orElse("").equals(newPreamble)) {
             undoManager.addEdit(
                 new UndoablePreambleChange(
                     databaseContext.getDatabase(),
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 5656e10c34a..e5a3e83033a 100644
--- a/src/main/java/org/jabref/gui/libraryproperties/saving/SavingPropertiesView.java
+++ b/src/main/java/org/jabref/gui/libraryproperties/saving/SavingPropertiesView.java
@@ -40,13 +40,10 @@ public String getTabName() {
     }
 
     public void initialize() {
-        this.viewModel =
-            new SavingPropertiesViewModel(databaseContext, preferencesService);
+        this.viewModel = new SavingPropertiesViewModel(databaseContext, preferencesService);
 
         protect.disableProperty().bind(viewModel.protectDisableProperty());
-        protect
-            .selectedProperty()
-            .bindBidirectional(viewModel.libraryProtectedProperty());
+        protect.selectedProperty().bindBidirectional(viewModel.libraryProtectedProperty());
 
         saveOrderConfigPanel
             .saveInOriginalProperty()
@@ -57,9 +54,7 @@ public void initialize() {
         saveOrderConfigPanel
             .saveInSpecifiedOrderProperty()
             .bindBidirectional(viewModel.saveInSpecifiedOrderProperty());
-        saveOrderConfigPanel
-            .sortableFieldsProperty()
-            .bind(viewModel.sortableFieldsProperty());
+        saveOrderConfigPanel.sortableFieldsProperty().bind(viewModel.sortableFieldsProperty());
         saveOrderConfigPanel
             .sortCriteriaProperty()
             .bindBidirectional(viewModel.sortCriteriaProperty());
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 4eda5b23519..f370d630eb6 100644
--- a/src/main/java/org/jabref/gui/libraryproperties/saving/SavingPropertiesViewModel.java
+++ b/src/main/java/org/jabref/gui/libraryproperties/saving/SavingPropertiesViewModel.java
@@ -36,30 +36,24 @@ public class SavingPropertiesViewModel implements PropertiesTabViewModel {
         )
     );
 
-    private final BooleanProperty protectDisableProperty =
-        new SimpleBooleanProperty();
-    private final BooleanProperty libraryProtectedProperty =
-        new SimpleBooleanProperty();
+    private final BooleanProperty protectDisableProperty = new SimpleBooleanProperty();
+    private final BooleanProperty libraryProtectedProperty = new SimpleBooleanProperty();
 
     // SaveOrderConfigPanel
-    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 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<>())
-        );
+        new SimpleListProperty<>(FXCollections.observableArrayList(new ArrayList<>()));
 
     // FieldFormatterCleanupsPanel
-    private final BooleanProperty cleanupsDisableProperty =
-        new SimpleBooleanProperty();
-    private final ListProperty<FieldFormatterCleanup> cleanupsProperty =
-        new SimpleListProperty<>(FXCollections.emptyObservableList());
+    private final BooleanProperty cleanupsDisableProperty = new SimpleBooleanProperty();
+    private final ListProperty<FieldFormatterCleanup> cleanupsProperty = new SimpleListProperty<>(
+        FXCollections.emptyObservableList()
+    );
 
     private final BibDatabaseContext databaseContext;
     private final MetaData initialMetaData;
@@ -73,8 +67,7 @@ public SavingPropertiesViewModel(
         this.databaseContext = databaseContext;
         this.preferencesService = preferencesService;
         this.initialMetaData = databaseContext.getMetaData();
-        this.saveOrder =
-            initialMetaData.getSaveOrder().orElse(UI_DEFAULT_SAVE_ORDER);
+        this.saveOrder = initialMetaData.getSaveOrder().orElse(UI_DEFAULT_SAVE_ORDER);
     }
 
     @Override
@@ -97,42 +90,30 @@ public void setValues() {
         fields.add(InternalField.KEY_FIELD);
         fields.add(InternalField.TYPE_HEADER);
 
-        sortableFieldsProperty.addAll(
-            FieldFactory.getStandardFieldsWithCitationKey()
-        );
+        sortableFieldsProperty.addAll(FieldFactory.getStandardFieldsWithCitationKey());
         sortCriteriaProperty.clear();
         sortCriteriaProperty.addAll(
-            saveOrder
-                .getSortCriteria()
-                .stream()
-                .map(SortCriterionViewModel::new)
-                .toList()
+            saveOrder.getSortCriteria().stream().map(SortCriterionViewModel::new).toList()
         );
 
         // FieldFormatterCleanupsPanel, included via <?import ...> in FXML
 
-        Optional<FieldFormatterCleanups> saveActions =
-            initialMetaData.getSaveActions();
+        Optional<FieldFormatterCleanups> saveActions = initialMetaData.getSaveActions();
         saveActions.ifPresentOrElse(
             value -> {
                 cleanupsDisableProperty.setValue(!value.isEnabled());
                 cleanupsProperty.setValue(
-                    FXCollections.observableArrayList(
-                        value.getConfiguredActions()
-                    )
+                    FXCollections.observableArrayList(value.getConfiguredActions())
                 );
             },
             () -> {
-                CleanupPreferences defaultPreset =
-                    preferencesService.getDefaultCleanupPreset();
+                CleanupPreferences defaultPreset = preferencesService.getDefaultCleanupPreset();
                 cleanupsDisableProperty.setValue(
                     !defaultPreset.getFieldFormatterCleanups().isEnabled()
                 );
                 cleanupsProperty.setValue(
                     FXCollections.observableArrayList(
-                        defaultPreset
-                            .getFieldFormatterCleanups()
-                            .getConfiguredActions()
+                        defaultPreset.getFieldFormatterCleanups().getConfiguredActions()
                     )
                 );
             }
@@ -149,11 +130,10 @@ 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(
@@ -175,10 +155,7 @@ public void storeSettings() {
                 saveInSpecifiedOrderProperty.getValue(),
                 saveInOriginalProperty.getValue()
             ),
-            sortCriteriaProperty
-                .stream()
-                .map(SortCriterionViewModel::getCriterion)
-                .toList()
+            sortCriteriaProperty.stream().map(SortCriterionViewModel::getCriterion).toList()
         );
 
         if (!newSaveOrder.equals(saveOrder)) {
diff --git a/src/main/java/org/jabref/gui/linkedfile/AttachFileAction.java b/src/main/java/org/jabref/gui/linkedfile/AttachFileAction.java
index 58825eb57ac..0c2064e393e 100644
--- a/src/main/java/org/jabref/gui/linkedfile/AttachFileAction.java
+++ b/src/main/java/org/jabref/gui/linkedfile/AttachFileAction.java
@@ -35,32 +35,24 @@ public AttachFileAction(
         this.dialogService = dialogService;
         this.filePreferences = filePreferences;
 
-        this.executable.bind(
-                ActionHelper.needsEntriesSelected(1, stateManager)
-            );
+        this.executable.bind(ActionHelper.needsEntriesSelected(1, stateManager));
     }
 
     @Override
     public void execute() {
         if (stateManager.getActiveDatabase().isEmpty()) {
-            dialogService.notify(
-                Localization.lang("This operation requires an open library.")
-            );
+            dialogService.notify(Localization.lang("This operation requires an open library."));
             return;
         }
 
         if (stateManager.getSelectedEntries().size() != 1) {
             dialogService.notify(
-                Localization.lang(
-                    "This operation requires exactly one item to be selected."
-                )
+                Localization.lang("This operation requires exactly one item to be selected.")
             );
             return;
         }
 
-        BibDatabaseContext databaseContext = stateManager
-            .getActiveDatabase()
-            .get();
+        BibDatabaseContext databaseContext = stateManager.getActiveDatabase().get();
 
         BibEntry entry = stateManager.getSelectedEntries().get(0);
 
@@ -68,10 +60,9 @@ public void execute() {
             .getFirstExistingFileDir(filePreferences)
             .orElse(filePreferences.getWorkingDirectory());
 
-        FileDialogConfiguration fileDialogConfiguration =
-            new FileDialogConfiguration.Builder()
-                .withInitialDirectory(workingDirectory)
-                .build();
+        FileDialogConfiguration fileDialogConfiguration = new FileDialogConfiguration.Builder()
+            .withInitialDirectory(workingDirectory)
+            .build();
 
         dialogService
             .showFileOpenDialog(fileDialogConfiguration)
@@ -82,20 +73,14 @@ public void execute() {
                     filePreferences
                 );
 
-                LinkedFileEditDialogView dialog = new LinkedFileEditDialogView(
-                    linkedFile
-                );
+                LinkedFileEditDialogView dialog = new LinkedFileEditDialogView(linkedFile);
 
                 dialogService
                     .showCustomDialogAndWait(dialog)
                     .ifPresent(editedLinkedFile -> {
-                        Optional<FieldChange> fieldChange = entry.addFile(
-                            editedLinkedFile
-                        );
+                        Optional<FieldChange> fieldChange = entry.addFile(editedLinkedFile);
                         fieldChange.ifPresent(change -> {
-                            UndoableFieldChange ce = new UndoableFieldChange(
-                                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 be98c61c1de..a0c39469167 100644
--- a/src/main/java/org/jabref/gui/linkedfile/AttachFileFromURLAction.java
+++ b/src/main/java/org/jabref/gui/linkedfile/AttachFileFromURLAction.java
@@ -35,32 +35,24 @@ public AttachFileFromURLAction(
         this.taskExecutor = taskExecutor;
         this.preferencesService = preferencesService;
 
-        this.executable.bind(
-                ActionHelper.needsEntriesSelected(1, stateManager)
-            );
+        this.executable.bind(ActionHelper.needsEntriesSelected(1, stateManager));
     }
 
     @Override
     public void execute() {
         if (stateManager.getActiveDatabase().isEmpty()) {
-            dialogService.notify(
-                Localization.lang("This operation requires an open library.")
-            );
+            dialogService.notify(Localization.lang("This operation requires an open library."));
             return;
         }
 
         if (stateManager.getSelectedEntries().size() != 1) {
             dialogService.notify(
-                Localization.lang(
-                    "This operation requires exactly one item to be selected."
-                )
+                Localization.lang("This operation requires exactly one item to be selected.")
             );
             return;
         }
 
-        BibDatabaseContext databaseContext = stateManager
-            .getActiveDatabase()
-            .get();
+        BibDatabaseContext databaseContext = stateManager.getActiveDatabase().get();
 
         BibEntry entry = stateManager.getSelectedEntries().get(0);
 
@@ -85,10 +77,7 @@ public void execute() {
             );
             onlineFile.download();
         } catch (MalformedURLException exception) {
-            dialogService.showErrorDialogAndWait(
-                Localization.lang("Invalid URL"),
-                exception
-            );
+            dialogService.showErrorDialogAndWait(Localization.lang("Invalid URL"), exception);
         }
     }
 
diff --git a/src/main/java/org/jabref/gui/linkedfile/DeleteFileAction.java b/src/main/java/org/jabref/gui/linkedfile/DeleteFileAction.java
index 146f9250b02..36e38550662 100644
--- a/src/main/java/org/jabref/gui/linkedfile/DeleteFileAction.java
+++ b/src/main/java/org/jabref/gui/linkedfile/DeleteFileAction.java
@@ -22,9 +22,7 @@
 
 public class DeleteFileAction extends SimpleCommand {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(
-        DeleteFileAction.class
-    );
+    private static final Logger LOGGER = LoggerFactory.getLogger(DeleteFileAction.class);
 
     private final DialogService dialogService;
     private final PreferencesService preferences;
@@ -54,9 +52,7 @@ public void execute() {
 
         if (toBeDeleted.isEmpty()) {
             dialogService.notify(
-                Localization.lang(
-                    "This operation requires selected linked files."
-                )
+                Localization.lang("This operation requires selected linked files.")
             );
             return;
         }
@@ -65,8 +61,7 @@ public void execute() {
         String dialogContent;
 
         if (toBeDeleted.size() != 1) {
-            dialogTitle =
-                Localization.lang("Delete %0 files", toBeDeleted.size());
+            dialogTitle = Localization.lang("Delete %0 files", toBeDeleted.size());
             dialogContent =
                 Localization.lang(
                     "Delete %0 files permanently from disk, or just remove the files from the entry? " +
@@ -80,11 +75,7 @@ public void execute() {
                 .findIn(databaseContext, preferences.getFilePreferences());
 
             if (file.isPresent()) {
-                dialogTitle =
-                    Localization.lang(
-                        "Delete '%0'",
-                        file.get().getFileName().toString()
-                    );
+                dialogTitle = Localization.lang("Delete '%0'", file.get().getFileName().toString());
                 dialogContent =
                     Localization.lang(
                         "Delete '%0' permanently from disk, or just remove the file from the entry? " +
@@ -106,18 +97,15 @@ public void execute() {
             Localization.lang("Remove from entry"),
             ButtonBar.ButtonData.YES
         );
-        ButtonType deleteFromEntry = new ButtonType(
-            Localization.lang("Delete from disk")
+        ButtonType deleteFromEntry = new ButtonType(Localization.lang("Delete from disk"));
+        Optional<ButtonType> buttonType = dialogService.showCustomButtonDialogAndWait(
+            Alert.AlertType.INFORMATION,
+            dialogTitle,
+            dialogContent,
+            removeFromEntry,
+            deleteFromEntry,
+            ButtonType.CANCEL
         );
-        Optional<ButtonType> buttonType =
-            dialogService.showCustomButtonDialogAndWait(
-                Alert.AlertType.INFORMATION,
-                dialogTitle,
-                dialogContent,
-                removeFromEntry,
-                deleteFromEntry,
-                ButtonType.CANCEL
-            );
 
         if (buttonType.isPresent()) {
             if (buttonType.get().equals(removeFromEntry)) {
@@ -136,10 +124,7 @@ public void execute() {
      * @param toBeDeleted the files to be deleted
      * @param deleteFromDisk if true, the files are deleted from disk, otherwise they are only removed from the entry
      */
-    private void deleteFiles(
-        List<LinkedFileViewModel> toBeDeleted,
-        boolean deleteFromDisk
-    ) {
+    private void deleteFiles(List<LinkedFileViewModel> toBeDeleted, boolean deleteFromDisk) {
         for (LinkedFileViewModel fileViewModel : toBeDeleted) {
             if (fileViewModel.getFile().isOnlineLink()) {
                 viewModel.removeFileLink(fileViewModel);
@@ -160,10 +145,7 @@ private void deleteFiles(
     public void deleteFileFromDisk(LinkedFileViewModel fileViewModel) {
         LinkedFile linkedFile = fileViewModel.getFile();
 
-        Optional<Path> file = linkedFile.findIn(
-            databaseContext,
-            preferences.getFilePreferences()
-        );
+        Optional<Path> file = linkedFile.findIn(databaseContext, preferences.getFilePreferences());
 
         if (file.isEmpty()) {
             LOGGER.warn("Could not find file {}", linkedFile.getLink());
@@ -177,18 +159,11 @@ public void deleteFileFromDisk(LinkedFileViewModel fileViewModel) {
                     Localization.lang("Cannot delete file"),
                     Localization.lang("File permission error")
                 );
-                LOGGER.warn(
-                    "File permission error while deleting: {}",
-                    linkedFile,
-                    ex
-                );
+                LOGGER.warn("File permission error while deleting: {}", linkedFile, ex);
             }
         } else {
             dialogService.notify(
-                Localization.lang(
-                    "Error accessing file '%0'.",
-                    linkedFile.getLink()
-                )
+                Localization.lang("Error accessing file '%0'.", linkedFile.getLink())
             );
         }
     }
diff --git a/src/main/java/org/jabref/gui/linkedfile/LinkedFileEditDialogView.java b/src/main/java/org/jabref/gui/linkedfile/LinkedFileEditDialogView.java
index 019e032fd25..e88cd5d6808 100644
--- a/src/main/java/org/jabref/gui/linkedfile/LinkedFileEditDialogView.java
+++ b/src/main/java/org/jabref/gui/linkedfile/LinkedFileEditDialogView.java
@@ -45,9 +45,7 @@ public LinkedFileEditDialogView(LinkedFile linkedFile) {
 
         ViewLoader.view(this).load().setAsContent(this.getDialogPane());
 
-        this.getDialogPane()
-            .getButtonTypes()
-            .addAll(ButtonType.APPLY, ButtonType.CANCEL);
+        this.getDialogPane().getButtonTypes().addAll(ButtonType.APPLY, ButtonType.CANCEL);
         this.setResizable(false);
         this.setTitle(Localization.lang("Edit file link"));
 
@@ -69,21 +67,15 @@ private void initialize() {
                 dialogService,
                 preferences.getFilePreferences()
             );
-        fileType
-            .itemsProperty()
-            .bindBidirectional(viewModel.externalFileTypeProperty());
+        fileType.itemsProperty().bindBidirectional(viewModel.externalFileTypeProperty());
         new ViewModelListCellFactory<ExternalFileType>()
             .withIcon(ExternalFileType::getIcon)
             .withText(ExternalFileType::getName)
             .install(fileType);
 
-        description
-            .textProperty()
-            .bindBidirectional(viewModel.descriptionProperty());
+        description.textProperty().bindBidirectional(viewModel.descriptionProperty());
         link.textProperty().bindBidirectional(viewModel.linkProperty());
-        fileType
-            .valueProperty()
-            .bindBidirectional(viewModel.selectedExternalFileTypeProperty());
+        fileType.valueProperty().bindBidirectional(viewModel.selectedExternalFileTypeProperty());
     }
 
     @FXML
diff --git a/src/main/java/org/jabref/gui/linkedfile/LinkedFilesEditDialogViewModel.java b/src/main/java/org/jabref/gui/linkedfile/LinkedFilesEditDialogViewModel.java
index 3d3617efe19..e2f38e68e4d 100644
--- a/src/main/java/org/jabref/gui/linkedfile/LinkedFilesEditDialogViewModel.java
+++ b/src/main/java/org/jabref/gui/linkedfile/LinkedFilesEditDialogViewModel.java
@@ -28,18 +28,15 @@
 
 public class LinkedFilesEditDialogViewModel extends AbstractViewModel {
 
-    private static final Pattern REMOTE_LINK_PATTERN = Pattern.compile(
-        "[a-z]+://.*"
-    );
+    private static final Pattern REMOTE_LINK_PATTERN = Pattern.compile("[a-z]+://.*");
     private final StringProperty link = new SimpleStringProperty("");
     private final StringProperty description = new SimpleStringProperty("");
-    private final ListProperty<ExternalFileType> allExternalFileTypes =
-        new SimpleListProperty<>(FXCollections.emptyObservableList());
+    private final ListProperty<ExternalFileType> allExternalFileTypes = new SimpleListProperty<>(
+        FXCollections.emptyObservableList()
+    );
     private final ObjectProperty<ExternalFileType> selectedExternalFileType =
         new SimpleObjectProperty<>();
-    private final ObservableOptionalValue<
-        ExternalFileType
-    > monadicSelectedExternalFileType;
+    private final ObservableOptionalValue<ExternalFileType> monadicSelectedExternalFileType;
     private final BibDatabaseContext database;
     private final DialogService dialogService;
     private final FilePreferences filePreferences;
@@ -54,13 +51,10 @@ public LinkedFilesEditDialogViewModel(
         this.dialogService = dialogService;
         this.filePreferences = filePreferences;
         allExternalFileTypes.set(
-            FXCollections.observableArrayList(
-                filePreferences.getExternalFileTypes()
-            )
+            FXCollections.observableArrayList(filePreferences.getExternalFileTypes())
         );
 
-        monadicSelectedExternalFileType =
-            EasyBind.wrapNullable(selectedExternalFileType);
+        monadicSelectedExternalFileType = EasyBind.wrapNullable(selectedExternalFileType);
         setValues(linkedFile);
     }
 
@@ -84,20 +78,15 @@ private void setExternalFileTypeByExtension(String link) {
     public void openBrowseDialog() {
         String fileText = link.get();
 
-        Optional<Path> file = FileUtil.find(
-            database,
-            fileText,
-            filePreferences
-        );
+        Optional<Path> file = FileUtil.find(database, fileText, filePreferences);
 
         Path workingDir = file.orElse(filePreferences.getWorkingDirectory());
         String fileName = Path.of(fileText).getFileName().toString();
 
-        FileDialogConfiguration fileDialogConfiguration =
-            new FileDialogConfiguration.Builder()
-                .withInitialDirectory(workingDir)
-                .withInitialFileName(fileName)
-                .build();
+        FileDialogConfiguration fileDialogConfiguration = new FileDialogConfiguration.Builder()
+            .withInitialDirectory(workingDir)
+            .withInitialFileName(fileName)
+            .build();
 
         dialogService
             .showFileOpenDialog(fileDialogConfiguration)
@@ -122,20 +111,14 @@ public void setValues(LinkedFile linkedFile) {
         selectedExternalFileType.setValue(null);
 
         // See what is a reasonable selection for the type combobox:
-        Optional<ExternalFileType> fileType =
-            ExternalFileTypes.getExternalFileTypeByLinkedFile(
-                linkedFile,
-                false,
-                filePreferences
-            );
-        if (
-            fileType.isPresent() &&
-            !(fileType.get() instanceof UnknownExternalFileType)
-        ) {
+        Optional<ExternalFileType> fileType = ExternalFileTypes.getExternalFileTypeByLinkedFile(
+            linkedFile,
+            false,
+            filePreferences
+        );
+        if (fileType.isPresent() && !(fileType.get() instanceof UnknownExternalFileType)) {
             selectedExternalFileType.setValue(fileType.get());
-        } else if (
-            (linkedFile.getLink() != null) && (!linkedFile.getLink().isEmpty())
-        ) {
+        } else if ((linkedFile.getLink() != null) && (!linkedFile.getLink().isEmpty())) {
             setExternalFileTypeByExtension(linkedFile.getLink());
         }
     }
@@ -164,30 +147,16 @@ public LinkedFile getNewLinkedFile() {
 
         if (LinkedFile.isOnlineLink(link.getValue())) {
             try {
-                return new LinkedFile(
-                    description.getValue(),
-                    new URL(link.getValue()),
-                    fileType
-                );
+                return new LinkedFile(description.getValue(), new URL(link.getValue()), fileType);
             } catch (MalformedURLException e) {
-                return new LinkedFile(
-                    description.getValue(),
-                    link.getValue(),
-                    fileType
-                );
+                return new LinkedFile(description.getValue(), link.getValue(), fileType);
             }
         }
-        return new LinkedFile(
-            description.getValue(),
-            Path.of(link.getValue()),
-            fileType
-        );
+        return new LinkedFile(description.getValue(), Path.of(link.getValue()), fileType);
     }
 
     private String relativize(Path filePath) {
-        List<Path> fileDirectories = database.getFileDirectories(
-            filePreferences
-        );
+        List<Path> fileDirectories = database.getFileDirectories(filePreferences);
         return FileUtil.relativize(filePath, fileDirectories).toString();
     }
 }
diff --git a/src/main/java/org/jabref/gui/maintable/BibEntryTableViewModel.java b/src/main/java/org/jabref/gui/maintable/BibEntryTableViewModel.java
index e9de99a19b8..fdb80c40e28 100644
--- a/src/main/java/org/jabref/gui/maintable/BibEntryTableViewModel.java
+++ b/src/main/java/org/jabref/gui/maintable/BibEntryTableViewModel.java
@@ -34,11 +34,8 @@
 public class BibEntryTableViewModel {
 
     private final BibEntry entry;
-    private final ObservableValue<
-        MainTableFieldValueFormatter
-    > fieldValueFormatter;
-    private final Map<OrFields, ObservableValue<String>> fieldValues =
-        new HashMap<>();
+    private final ObservableValue<MainTableFieldValueFormatter> fieldValueFormatter;
+    private final Map<OrFields, ObservableValue<String>> fieldValues = new HashMap<>();
     private final Map<
         SpecialField,
         OptionalBinding<SpecialFieldValueViewModel>
@@ -61,14 +58,11 @@ public BibEntryTableViewModel(
                 .mapOpt(FileFieldParser::parse)
                 .orElseOpt(Collections.emptyList());
         this.linkedIdentifiers = createLinkedIdentifiersBinding(entry);
-        this.matchedGroups =
-            createMatchedGroupsBinding(bibDatabaseContext, entry);
+        this.matchedGroups = createMatchedGroupsBinding(bibDatabaseContext, entry);
         this.bibDatabaseContext = bibDatabaseContext;
     }
 
-    private static EasyBinding<
-        Map<Field, String>
-    > createLinkedIdentifiersBinding(BibEntry entry) {
+    private static EasyBinding<Map<Field, String>> createLinkedIdentifiersBinding(BibEntry entry) {
         return EasyBind.combine(
             entry.getFieldBinding(StandardField.URL),
             entry.getFieldBinding(StandardField.DOI),
@@ -77,18 +71,11 @@ > createLinkedIdentifiersBinding(BibEntry entry) {
             entry.getFieldBinding(StandardField.ISBN),
             (url, doi, uri, eprint, isbn) -> {
                 Map<Field, String> identifiers = new HashMap<>();
-                url.ifPresent(value -> identifiers.put(StandardField.URL, value)
-                );
-                doi.ifPresent(value -> identifiers.put(StandardField.DOI, value)
-                );
-                uri.ifPresent(value -> identifiers.put(StandardField.URI, value)
-                );
-                eprint.ifPresent(value ->
-                    identifiers.put(StandardField.EPRINT, value)
-                );
-                isbn.ifPresent(value ->
-                    identifiers.put(StandardField.ISBN, value)
-                );
+                url.ifPresent(value -> identifiers.put(StandardField.URL, value));
+                doi.ifPresent(value -> identifiers.put(StandardField.DOI, value));
+                uri.ifPresent(value -> identifiers.put(StandardField.URI, value));
+                eprint.ifPresent(value -> identifiers.put(StandardField.EPRINT, value));
+                isbn.ifPresent(value -> identifiers.put(StandardField.ISBN, value));
                 return identifiers;
             }
         );
@@ -115,13 +102,7 @@ private static Binding<List<AbstractGroup>> createMatchedGroupsBinding(
                                 .getMatchingGroups(entry)
                                 .stream()
                                 .map(GroupTreeNode::getGroup)
-                                .filter(
-                                    Predicate.not(
-                                        Predicate.isEqual(
-                                            groupTreeNode.getGroup()
-                                        )
-                                    )
-                                )
+                                .filter(Predicate.not(Predicate.isEqual(groupTreeNode.getGroup())))
                                 .collect(Collectors.toList())
                         )
                         .orElse(Collections.emptyList())
@@ -145,39 +126,29 @@ public ObservableValue<List<AbstractGroup>> getMatchedGroups() {
         return matchedGroups;
     }
 
-    public ObservableValue<
-        Optional<SpecialFieldValueViewModel>
-    > getSpecialField(SpecialField field) {
-        OptionalBinding<SpecialFieldValueViewModel> value =
-            specialFieldValues.get(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)
+                        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)
+                !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)
+                            field.parseValue(fieldValue).map(SpecialFieldValueViewModel::new)
                         );
                 specialFieldValues.put(field, value);
                 return value;
@@ -186,9 +157,7 @@ > getSpecialField(SpecialField field) {
             value =
                 getField(field)
                     .flatMapOpt(fieldValue ->
-                        field
-                            .parseValue(fieldValue)
-                            .map(SpecialFieldValueViewModel::new)
+                        field.parseValue(fieldValue).map(SpecialFieldValueViewModel::new)
                     );
             specialFieldValues.put(field, value);
         }
@@ -201,17 +170,12 @@ public ObservableValue<String> getFields(OrFields fields) {
             return value;
         }
 
-        ArrayList<Observable> observables = new ArrayList<>(
-            List.of(entry.getObservables())
-        );
+        ArrayList<Observable> observables = new ArrayList<>(List.of(entry.getObservables()));
         observables.add(fieldValueFormatter);
 
         value =
             Bindings.createStringBinding(
-                () ->
-                    fieldValueFormatter
-                        .getValue()
-                        .formatFieldsValues(fields, entry),
+                () -> fieldValueFormatter.getValue().formatFieldsValues(fields, entry),
                 observables.toArray(Observable[]::new)
             );
         fieldValues.put(fields, value);
diff --git a/src/main/java/org/jabref/gui/maintable/CellFactory.java b/src/main/java/org/jabref/gui/maintable/CellFactory.java
index 9f200ed0fe7..07879f7d094 100644
--- a/src/main/java/org/jabref/gui/maintable/CellFactory.java
+++ b/src/main/java/org/jabref/gui/maintable/CellFactory.java
@@ -18,10 +18,7 @@ public class CellFactory {
 
     private final Map<Field, JabRefIcon> TABLE_ICONS = new HashMap<>();
 
-    public CellFactory(
-        PreferencesService preferencesService,
-        UndoManager undoManager
-    ) {
+    public CellFactory(PreferencesService preferencesService, UndoManager undoManager) {
         JabRefIcon icon;
         icon = IconTheme.JabRefIcons.PDF_FILE;
         // icon.setToo(Localization.lang("Open") + " PDF");
diff --git a/src/main/java/org/jabref/gui/maintable/ColumnPreferences.java b/src/main/java/org/jabref/gui/maintable/ColumnPreferences.java
index 83bf000327e..6516ef2bbc5 100644
--- a/src/main/java/org/jabref/gui/maintable/ColumnPreferences.java
+++ b/src/main/java/org/jabref/gui/maintable/ColumnPreferences.java
@@ -17,8 +17,7 @@ public ColumnPreferences(
         List<MainTableColumnModel> columnSortOrder
     ) {
         this.columns = FXCollections.observableArrayList(columns);
-        this.columnSortOrder =
-            FXCollections.observableArrayList(columnSortOrder);
+        this.columnSortOrder = FXCollections.observableArrayList(columnSortOrder);
     }
 
     public ObservableList<MainTableColumnModel> getColumns() {
diff --git a/src/main/java/org/jabref/gui/maintable/MainTable.java b/src/main/java/org/jabref/gui/maintable/MainTable.java
index a612623be0f..21566386467 100644
--- a/src/main/java/org/jabref/gui/maintable/MainTable.java
+++ b/src/main/java/org/jabref/gui/maintable/MainTable.java
@@ -55,9 +55,7 @@
 
 public class MainTable extends TableView<BibEntryTableViewModel> {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(
-        MainTable.class
-    );
+    private static final Logger LOGGER = LoggerFactory.getLogger(MainTable.class);
 
     private final LibraryTab libraryTab;
     private final DialogService dialogService;
@@ -96,8 +94,7 @@ public MainTable(
         this.entryTypesManager = entryTypesManager;
         this.taskExecutor = taskExecutor;
         UndoManager undoManager = libraryTab.getUndoManager();
-        MainTablePreferences mainTablePreferences =
-            preferencesService.getMainTablePreferences();
+        MainTablePreferences mainTablePreferences = preferencesService.getMainTablePreferences();
 
         importHandler =
             new ImportHandler(
@@ -185,19 +182,12 @@ public MainTable(
         this.setItems(model.getEntriesFilteredAndSorted());
 
         // Enable sorting
-        model
-            .getEntriesFilteredAndSorted()
-            .comparatorProperty()
-            .bind(this.comparatorProperty());
+        model.getEntriesFilteredAndSorted().comparatorProperty().bind(this.comparatorProperty());
 
-        this.getStylesheets()
-            .add(MainTable.class.getResource("MainTable.css").toExternalForm());
+        this.getStylesheets().add(MainTable.class.getResource("MainTable.css").toExternalForm());
 
         // Store visual state
-        new PersistenceVisualStateTable(
-            this,
-            mainTablePreferences.getColumnPreferences()
-        )
+        new PersistenceVisualStateTable(this, mainTablePreferences.getColumnPreferences())
             .addListeners();
 
         setupKeyBindings(keyBindingRepository);
@@ -211,16 +201,15 @@ public MainTable(
 
         database.getDatabase().registerListener(this);
 
-        MainTableColumnFactory rightClickMenuFactory =
-            new MainTableColumnFactory(
-                database,
-                preferencesService,
-                preferencesService.getMainTableColumnPreferences(),
-                libraryTab.getUndoManager(),
-                dialogService,
-                stateManager,
-                taskExecutor
-            );
+        MainTableColumnFactory rightClickMenuFactory = new MainTableColumnFactory(
+            database,
+            preferencesService,
+            preferencesService.getMainTableColumnPreferences(),
+            libraryTab.getUndoManager(),
+            dialogService,
+            stateManager,
+            taskExecutor
+        );
 
         // Enable the header right-click menu.
         new MainTableHeaderContextMenu(this, rightClickMenuFactory).show(true);
@@ -252,9 +241,7 @@ private void jumpToSearchKey(
             .stream()
             .filter(item ->
                 Optional
-                    .ofNullable(
-                        sortedColumn.getCellObservableValue(item).getValue()
-                    )
+                    .ofNullable(sortedColumn.getCellObservableValue(item).getValue())
                     .map(Object::toString)
                     .orElse("")
                     .toLowerCase()
@@ -269,9 +256,7 @@ private void jumpToSearchKey(
 
     @Subscribe
     public void listen(EntriesAddedEvent event) {
-        DefaultTaskExecutor.runInJavaFXThread(() ->
-            clearAndSelect(event.getFirstEntry())
-        );
+        DefaultTaskExecutor.runInJavaFXThread(() -> clearAndSelect(event.getFirstEntry()));
     }
 
     public void clearAndSelect(BibEntry bibEntry) {
@@ -296,10 +281,7 @@ public void copy() {
                     )
                 );
             } catch (IOException e) {
-                LOGGER.error(
-                    "Error while copying selected entries to clipboard",
-                    e
-                );
+                LOGGER.error("Error while copying selected entries to clipboard", e);
             }
         }
     }
@@ -343,8 +325,7 @@ private void setupKeyBindings(KeyBindingRepository keyBindings) {
                         return;
                     }
 
-                    Optional<KeyBinding> keyBinding =
-                        keyBindings.mapToKeyBinding(event);
+                    Optional<KeyBinding> keyBinding = keyBindings.mapToKeyBinding(event);
                     if (keyBinding.isPresent()) {
                         switch (keyBinding.get()) {
                             case SELECT_FIRST_ENTRY:
@@ -429,10 +410,7 @@ private List<BibEntry> handleNonBibTeXStringData(String data) {
 
     public void dropEntry(List<BibEntry> entriesToAdd) {
         for (BibEntry entry : entriesToAdd) {
-            importHandler.importEntryWithDuplicateCheck(
-                database,
-                (BibEntry) entry.clone()
-            );
+            importHandler.importEntryWithDuplicateCheck(database, (BibEntry) entry.clone());
         }
     }
 
@@ -535,9 +513,7 @@ private void handleOnDragDropped(
                     switch (event.getTransferMode()) {
                         case LINK -> {
                             LOGGER.debug("Mode LINK"); // shift on win or no modifier
-                            importHandler
-                                .getLinker()
-                                .addFilesToEntry(entry, files);
+                            importHandler.getLinker().addFilesToEntry(entry, files);
                         }
                         case MOVE -> {
                             LOGGER.debug("Mode MOVE"); // alt on win
@@ -580,9 +556,7 @@ private void handleOnDragDroppedTableView(DragEvent event) {
                 .stream()
                 .map(File::toPath)
                 .collect(Collectors.toList());
-            importHandler
-                .importFilesInBackground(files)
-                .executeWith(taskExecutor);
+            importHandler.importFilesInBackground(files).executeWith(taskExecutor);
 
             success = true;
         }
@@ -591,9 +565,7 @@ private void handleOnDragDroppedTableView(DragEvent event) {
         event.consume();
     }
 
-    public void addSelectionListener(
-        ListChangeListener<? super BibEntryTableViewModel> listener
-    ) {
+    public void addSelectionListener(ListChangeListener<? super BibEntryTableViewModel> listener) {
         getSelectionModel().getSelectedItems().addListener(listener);
     }
 
diff --git a/src/main/java/org/jabref/gui/maintable/MainTableColumnFactory.java b/src/main/java/org/jabref/gui/maintable/MainTableColumnFactory.java
index 1f7eb42092c..060392fbdd1 100644
--- a/src/main/java/org/jabref/gui/maintable/MainTableColumnFactory.java
+++ b/src/main/java/org/jabref/gui/maintable/MainTableColumnFactory.java
@@ -45,9 +45,7 @@ public class MainTableColumnFactory {
 
     public static final String STYLE_ICON_COLUMN = "column-icon";
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(
-        MainTableColumnFactory.class
-    );
+    private static final Logger LOGGER = LoggerFactory.getLogger(MainTableColumnFactory.class);
 
     private final PreferencesService preferencesService;
     private final ColumnPreferences columnPreferences;
@@ -77,9 +75,7 @@ public MainTableColumnFactory(
         this.stateManager = stateManager;
     }
 
-    public TableColumn<BibEntryTableViewModel, ?> createColumn(
-        MainTableColumnModel column
-    ) {
+    public TableColumn<BibEntryTableViewModel, ?> createColumn(MainTableColumnModel column) {
         TableColumn<BibEntryTableViewModel, ?> returnColumn = null;
         switch (column.getType()) {
             case INDEX:
@@ -104,9 +100,7 @@ public MainTableColumnFactory(
                 break;
             case SPECIALFIELD:
                 if (!column.getQualifier().isBlank()) {
-                    Field field = FieldFactory.parseField(
-                        column.getQualifier()
-                    );
+                    Field field = FieldFactory.parseField(column.getQualifier());
                     if (field instanceof SpecialField) {
                         returnColumn = createSpecialFieldColumn(column);
                     } else {
@@ -129,8 +123,7 @@ public MainTableColumnFactory(
     }
 
     public List<TableColumn<BibEntryTableViewModel, ?>> createColumns() {
-        List<TableColumn<BibEntryTableViewModel, ?>> columns =
-            new ArrayList<>();
+        List<TableColumn<BibEntryTableViewModel, ?>> columns = new ArrayList<>();
 
         columnPreferences
             .getColumns()
@@ -153,25 +146,15 @@ public static void setExactWidth(TableColumn<?, ?> column, double width) {
     private TableColumn<BibEntryTableViewModel, String> createIndexColumn(
         MainTableColumnModel columnModel
     ) {
-        TableColumn<BibEntryTableViewModel, String> column =
-            new MainTableColumn<>(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())
-        );
+        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
-                )
+                String.valueOf(cellData.getTableView().getItems().indexOf(cellData.getValue()) + 1)
             )
         );
         new ValueTableCellFactory<BibEntryTableViewModel, String>()
@@ -187,21 +170,16 @@ private TableColumn<BibEntryTableViewModel, String> createIndexColumn(
     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"))
+        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);
         column.getStyleClass().add(STYLE_ICON_COLUMN);
         setExactWidth(column, ColumnPreferences.ICON_COLUMN_WIDTH);
         column.setResizable(false);
-        column.setCellValueFactory(cellData ->
-            cellData.getValue().getMatchedGroups()
-        );
+        column.setCellValueFactory(cellData -> cellData.getValue().getMatchedGroups());
         new ValueTableCellFactory<BibEntryTableViewModel, List<AbstractGroup>>()
             .withGraphic(this::createGroupColorRegion)
             .install(column);
@@ -245,9 +223,7 @@ private Node createGroupColorRegion(
                 .map(AbstractGroup::getName)
                 .collect(Collectors.joining(", "));
             Tooltip tooltip = new Tooltip(
-                Localization.lang(
-                    "Entry is contained in the following groups:"
-                ) +
+                Localization.lang("Entry is contained in the following groups:") +
                 "\n" +
                 matchedGroupsString
             );
@@ -269,10 +245,9 @@ private Node createGroupColorRegion(
     /**
      * Creates a clickable icons column for DOIs, URLs, URIs and EPrints.
      */
-    private TableColumn<
-        BibEntryTableViewModel,
-        Map<Field, String>
-    > createIdentifierColumn(MainTableColumnModel columnModel) {
+    private TableColumn<BibEntryTableViewModel, Map<Field, String>> createIdentifierColumn(
+        MainTableColumnModel columnModel
+    ) {
         return new LinkedIdentifierColumn(
             columnModel,
             cellFactory,
@@ -290,21 +265,16 @@ > createIdentifierColumn(MainTableColumnModel columnModel) {
         BibEntryTableViewModel,
         Optional<SpecialFieldValueViewModel>
     > createSpecialFieldColumn(MainTableColumnModel columnModel) {
-        return new SpecialFieldColumn(
-            columnModel,
-            preferencesService,
-            undoManager
-        );
+        return new SpecialFieldColumn(columnModel, preferencesService, undoManager);
     }
 
     /**
      * 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) {
+    private TableColumn<BibEntryTableViewModel, List<LinkedFile>> createFilesColumn(
+        MainTableColumnModel columnModel
+    ) {
         return new FileColumn(
             columnModel,
             database,
@@ -317,10 +287,9 @@ > createFilesColumn(MainTableColumnModel columnModel) {
     /**
      * Creates a column for all the linked files of a single file type.
      */
-    private TableColumn<
-        BibEntryTableViewModel,
-        List<LinkedFile>
-    > createExtraFileColumn(MainTableColumnModel columnModel) {
+    private TableColumn<BibEntryTableViewModel, List<LinkedFile>> createExtraFileColumn(
+        MainTableColumnModel columnModel
+    ) {
         return new FileColumn(
             columnModel,
             database,
diff --git a/src/main/java/org/jabref/gui/maintable/MainTableColumnModel.java b/src/main/java/org/jabref/gui/maintable/MainTableColumnModel.java
index 89376a846cf..44c237a1589 100644
--- a/src/main/java/org/jabref/gui/maintable/MainTableColumnModel.java
+++ b/src/main/java/org/jabref/gui/maintable/MainTableColumnModel.java
@@ -26,9 +26,7 @@ public class MainTableColumnModel {
 
     public static final Character COLUMNS_QUALIFIER_DELIMITER = ':';
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(
-        MainTableColumnModel.class
-    );
+    private static final Logger LOGGER = LoggerFactory.getLogger(MainTableColumnModel.class);
 
     public enum Type {
         INDEX("index", Localization.lang("Index")),
@@ -79,8 +77,7 @@ public static Type fromString(String text) {
         }
     }
 
-    private final ObjectProperty<Type> typeProperty =
-        new SimpleObjectProperty<>();
+    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 =
@@ -217,18 +214,12 @@ public boolean equals(Object o) {
         if (typeProperty.getValue() != that.typeProperty.getValue()) {
             return false;
         }
-        return Objects.equals(
-            qualifierProperty.getValue(),
-            that.qualifierProperty.getValue()
-        );
+        return Objects.equals(qualifierProperty.getValue(), that.qualifierProperty.getValue());
     }
 
     @Override
     public int hashCode() {
-        return Objects.hash(
-            typeProperty.getValue(),
-            qualifierProperty.getValue()
-        );
+        return Objects.hash(typeProperty.getValue(), qualifierProperty.getValue());
     }
 
     /**
@@ -239,18 +230,12 @@ public int hashCode() {
      */
     public static MainTableColumnModel parse(String rawColumnName) {
         Objects.requireNonNull(rawColumnName);
-        String[] splittedName = rawColumnName.split(
-            COLUMNS_QUALIFIER_DELIMITER.toString()
-        );
+        String[] splittedName = rawColumnName.split(COLUMNS_QUALIFIER_DELIMITER.toString());
 
         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
             } else {
diff --git a/src/main/java/org/jabref/gui/maintable/MainTableDataModel.java b/src/main/java/org/jabref/gui/maintable/MainTableDataModel.java
index 8cdce920a8a..f2cbf5e48ef 100644
--- a/src/main/java/org/jabref/gui/maintable/MainTableDataModel.java
+++ b/src/main/java/org/jabref/gui/maintable/MainTableDataModel.java
@@ -27,9 +27,7 @@ public class MainTableDataModel {
 
     private final FilteredList<BibEntryTableViewModel> entriesFiltered;
     private final SortedList<BibEntryTableViewModel> entriesFilteredAndSorted;
-    private final ObjectProperty<
-        MainTableFieldValueFormatter
-    > fieldValueFormatter;
+    private final ObjectProperty<MainTableFieldValueFormatter> fieldValueFormatter;
     private final GroupsPreferences groupsPreferences;
     private final NameDisplayPreferences nameDisplayPreferences;
     private final BibDatabaseContext bibDatabaseContext;
@@ -40,30 +38,20 @@ public MainTableDataModel(
         StateManager stateManager
     ) {
         this.groupsPreferences = preferencesService.getGroupsPreferences();
-        this.nameDisplayPreferences =
-            preferencesService.getNameDisplayPreferences();
+        this.nameDisplayPreferences = preferencesService.getNameDisplayPreferences();
         this.bibDatabaseContext = context;
         this.fieldValueFormatter =
             new SimpleObjectProperty<>(
-                new MainTableFieldValueFormatter(
-                    nameDisplayPreferences,
-                    bibDatabaseContext
-                )
+                new MainTableFieldValueFormatter(nameDisplayPreferences, bibDatabaseContext)
             );
 
         ObservableList<BibEntry> allEntries = BindingsHelper.forUI(
             context.getDatabase().getEntries()
         );
-        ObservableList<BibEntryTableViewModel> entriesViewModel =
-            EasyBind.mapBacked(
-                allEntries,
-                entry ->
-                    new BibEntryTableViewModel(
-                        entry,
-                        bibDatabaseContext,
-                        fieldValueFormatter
-                    )
-            );
+        ObservableList<BibEntryTableViewModel> entriesViewModel = EasyBind.mapBacked(
+            allEntries,
+            entry -> new BibEntryTableViewModel(entry, bibDatabaseContext, fieldValueFormatter)
+        );
 
         entriesFiltered = new FilteredList<>(entriesViewModel);
         entriesFiltered
@@ -73,8 +61,7 @@ public MainTableDataModel(
                     stateManager.activeGroupProperty(),
                     stateManager.activeSearchQueryProperty(),
                     groupsPreferences.groupViewModeProperty(),
-                    (groups, query, groupViewMode) ->
-                        entry -> isMatched(groups, query, entry)
+                    (groups, query, groupViewMode) -> entry -> isMatched(groups, query, entry)
                 )
             );
 
@@ -90,18 +77,11 @@ private boolean isMatched(
         Optional<SearchQuery> query,
         BibEntryTableViewModel entry
     ) {
-        return (
-            isMatchedByGroup(groups, entry) && isMatchedBySearch(query, entry)
-        );
+        return (isMatchedByGroup(groups, entry) && isMatchedBySearch(query, entry));
     }
 
-    private boolean isMatchedBySearch(
-        Optional<SearchQuery> query,
-        BibEntryTableViewModel entry
-    ) {
-        return query
-            .map(matcher -> matcher.isMatch(entry.getEntry()))
-            .orElse(true);
+    private boolean isMatchedBySearch(Optional<SearchQuery> query, BibEntryTableViewModel entry) {
+        return query.map(matcher -> matcher.isMatch(entry.getEntry())).orElse(true);
     }
 
     private boolean isMatchedByGroup(
@@ -113,9 +93,7 @@ private boolean isMatchedByGroup(
             .orElse(true);
     }
 
-    private Optional<MatcherSet> createGroupMatcher(
-        List<GroupTreeNode> selectedGroups
-    ) {
+    private Optional<MatcherSet> createGroupMatcher(List<GroupTreeNode> selectedGroups) {
         if ((selectedGroups == null) || selectedGroups.isEmpty()) {
             // No selected group, show all entries
             return Optional.empty();
@@ -139,10 +117,7 @@ public SortedList<BibEntryTableViewModel> getEntriesFilteredAndSorted() {
 
     public void refresh() {
         this.fieldValueFormatter.setValue(
-                new MainTableFieldValueFormatter(
-                    nameDisplayPreferences,
-                    bibDatabaseContext
-                )
+                new MainTableFieldValueFormatter(nameDisplayPreferences, bibDatabaseContext)
             );
     }
 }
diff --git a/src/main/java/org/jabref/gui/maintable/MainTableFieldValueFormatter.java b/src/main/java/org/jabref/gui/maintable/MainTableFieldValueFormatter.java
index fc65aef7465..c64875123f9 100644
--- a/src/main/java/org/jabref/gui/maintable/MainTableFieldValueFormatter.java
+++ b/src/main/java/org/jabref/gui/maintable/MainTableFieldValueFormatter.java
@@ -35,26 +35,22 @@ public MainTableFieldValueFormatter(
      * @param entry the BibEntry of {@link BibEntryTableViewModel}.
      * @return The formatted name field.
      */
-    public String formatFieldsValues(
-        final OrFields fields,
-        final BibEntry entry
-    ) {
+    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)
             ) {
-                Optional<String> name = entry.getResolvedFieldOrAlias(
-                    field,
-                    bibDatabase
-                );
+                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();
@@ -90,16 +86,10 @@ private String formatFieldWithAuthorValue(final String nameToFormat) {
             default -> nameToFormat;
             case FIRSTNAME_LASTNAME -> authors
                 .latexFree()
-                .getAsFirstLastNames(
-                    abbreviationStyle == AbbreviationStyle.FULL,
-                    false
-                );
+                .getAsFirstLastNames(abbreviationStyle == AbbreviationStyle.FULL, false);
             case LASTNAME_FIRSTNAME -> authors
                 .latexFree()
-                .getAsLastFirstNames(
-                    abbreviationStyle == AbbreviationStyle.FULL,
-                    false
-                );
+                .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 1ba64926ccb..de6dc534be2 100644
--- a/src/main/java/org/jabref/gui/maintable/MainTableHeaderContextMenu.java
+++ b/src/main/java/org/jabref/gui/maintable/MainTableHeaderContextMenu.java
@@ -20,10 +20,7 @@ public class MainTableHeaderContextMenu extends ContextMenu {
      * Constructor for the right click menu
      *
      */
-    public MainTableHeaderContextMenu(
-        MainTable mainTable,
-        MainTableColumnFactory factory
-    ) {
+    public MainTableHeaderContextMenu(MainTable mainTable, MainTableColumnFactory factory) {
         super();
         this.mainTable = mainTable;
         this.factory = factory;
@@ -52,14 +49,10 @@ public void show(boolean show) {
     private void constructItems(MainTable mainTable) {
         // Reset the right-click menu
         this.getItems().clear();
-        List<TableColumn<BibEntryTableViewModel, ?>> commonColumns =
-            commonColumns();
+        List<TableColumn<BibEntryTableViewModel, ?>> commonColumns = commonColumns();
 
         // Populate the menu with currently used fields
-        for (TableColumn<
-            BibEntryTableViewModel,
-            ?
-        > column : mainTable.getColumns()) {
+        for (TableColumn<BibEntryTableViewModel, ?> column : mainTable.getColumns()) {
             // Append only if the column has not already been added (a common column)
             RightClickMenuItem itemToAdd = createMenuItem(column, true);
             this.getItems().add(itemToAdd);
@@ -68,8 +61,7 @@ private void constructItems(MainTable mainTable) {
             MainTableColumn searchCol = (MainTableColumn<?>) column;
             if (isACommonColumn(searchCol)) {
                 commonColumns.removeIf(tableCol ->
-                    ((MainTableColumn) tableCol).getModel()
-                        .equals(searchCol.getModel())
+                    ((MainTableColumn) tableCol).getModel().equals(searchCol.getModel())
                 );
             }
         }
@@ -79,10 +71,7 @@ private void constructItems(MainTable mainTable) {
 
         // Append to the menu the current remaining columns in the common columns.
 
-        for (TableColumn<
-            BibEntryTableViewModel,
-            ?
-        > tableColumn : commonColumns) {
+        for (TableColumn<BibEntryTableViewModel, ?> tableColumn : commonColumns) {
             RightClickMenuItem itemToAdd = createMenuItem(tableColumn, false);
             this.getItems().add(itemToAdd);
         }
@@ -108,8 +97,7 @@ private RightClickMenuItem createMenuItem(
      *
      */
     private int obtainIndexOfColumn(MainTableColumn searchColumn) {
-        ObservableList<TableColumn<BibEntryTableViewModel, ?>> columns =
-            mainTable.getColumns();
+        ObservableList<TableColumn<BibEntryTableViewModel, ?>> columns = mainTable.getColumns();
         for (int i = 0; i < columns.size(); i++) {
             TableColumn<BibEntryTableViewModel, ?> column = columns.get(i);
             MainTableColumnModel model = ((MainTableColumn) column).getModel();
@@ -140,8 +128,7 @@ private void removeColumn(MainTableColumn tableColumn) {
         mainTable
             .getColumns()
             .removeIf(tableCol ->
-                ((MainTableColumn) tableCol).getModel()
-                    .equals(tableColumn.getModel())
+                ((MainTableColumn) tableCol).getModel().equals(tableColumn.getModel())
             );
     }
 
@@ -184,72 +171,38 @@ private boolean isColumnInList(
 
         // Create the MainTableColumn Models from qualifiers + types.
         List<MainTableColumnModel> commonColumns = new ArrayList<>();
+        commonColumns.add(new MainTableColumnModel(MainTableColumnModel.Type.GROUPS));
+        commonColumns.add(new MainTableColumnModel(MainTableColumnModel.Type.FILES));
+        commonColumns.add(new MainTableColumnModel(MainTableColumnModel.Type.LINKED_IDENTIFIER));
         commonColumns.add(
-            new MainTableColumnModel(MainTableColumnModel.Type.GROUPS)
-        );
-        commonColumns.add(
-            new MainTableColumnModel(MainTableColumnModel.Type.FILES)
-        );
-        commonColumns.add(
-            new MainTableColumnModel(
-                MainTableColumnModel.Type.LINKED_IDENTIFIER
-            )
-        );
-        commonColumns.add(
-            new MainTableColumnModel(
-                MainTableColumnModel.Type.NORMALFIELD,
-                entryTypeQualifier
-            )
+            new MainTableColumnModel(MainTableColumnModel.Type.NORMALFIELD, entryTypeQualifier)
         );
         commonColumns.add(
-            new MainTableColumnModel(
-                MainTableColumnModel.Type.NORMALFIELD,
-                authorEditQualifier
-            )
+            new MainTableColumnModel(MainTableColumnModel.Type.NORMALFIELD, authorEditQualifier)
         );
         commonColumns.add(
-            new MainTableColumnModel(
-                MainTableColumnModel.Type.NORMALFIELD,
-                titleQualifier
-            )
+            new MainTableColumnModel(MainTableColumnModel.Type.NORMALFIELD, titleQualifier)
         );
         commonColumns.add(
-            new MainTableColumnModel(
-                MainTableColumnModel.Type.NORMALFIELD,
-                yearQualifier
-            )
+            new MainTableColumnModel(MainTableColumnModel.Type.NORMALFIELD, yearQualifier)
         );
         commonColumns.add(
-            new MainTableColumnModel(
-                MainTableColumnModel.Type.NORMALFIELD,
-                journalBookQualifier
-            )
+            new MainTableColumnModel(MainTableColumnModel.Type.NORMALFIELD, journalBookQualifier)
         );
         commonColumns.add(
-            new MainTableColumnModel(
-                MainTableColumnModel.Type.SPECIALFIELD,
-                rankQualifier
-            )
+            new MainTableColumnModel(MainTableColumnModel.Type.SPECIALFIELD, rankQualifier)
         );
         commonColumns.add(
-            new MainTableColumnModel(
-                MainTableColumnModel.Type.SPECIALFIELD,
-                readStatusQualifier
-            )
+            new MainTableColumnModel(MainTableColumnModel.Type.SPECIALFIELD, readStatusQualifier)
         );
         commonColumns.add(
-            new MainTableColumnModel(
-                MainTableColumnModel.Type.SPECIALFIELD,
-                priorityQualifier
-            )
+            new MainTableColumnModel(MainTableColumnModel.Type.SPECIALFIELD, priorityQualifier)
         );
 
         // Create the Table Columns from the models using factory methods.
-        List<TableColumn<BibEntryTableViewModel, ?>> commonTableColumns =
-            new ArrayList<>();
+        List<TableColumn<BibEntryTableViewModel, ?>> commonTableColumns = new ArrayList<>();
         for (MainTableColumnModel columnModel : commonColumns) {
-            TableColumn<BibEntryTableViewModel, ?> tableColumn =
-                factory.createColumn(columnModel);
+            TableColumn<BibEntryTableViewModel, ?> tableColumn = factory.createColumn(columnModel);
             commonTableColumns.add(tableColumn);
         }
         return commonTableColumns;
@@ -264,11 +217,7 @@ private class RightClickMenuItem extends RadioMenuItem {
         private int index;
         private boolean visibleInTable;
 
-        RightClickMenuItem(
-            String displayName,
-            MainTableColumn column,
-            boolean isVisible
-        ) {
+        RightClickMenuItem(String displayName, MainTableColumn column, boolean isVisible) {
             super(displayName);
             setVisibleInTable(isVisible);
             // Flag item as selected if the item is already in the main table.
diff --git a/src/main/java/org/jabref/gui/maintable/MainTablePreferences.java b/src/main/java/org/jabref/gui/maintable/MainTablePreferences.java
index 82af334c708..84c77f1495f 100644
--- a/src/main/java/org/jabref/gui/maintable/MainTablePreferences.java
+++ b/src/main/java/org/jabref/gui/maintable/MainTablePreferences.java
@@ -6,10 +6,8 @@
 public class MainTablePreferences {
 
     private final ColumnPreferences columnPreferences;
-    private final BooleanProperty resizeColumnsToFit =
-        new SimpleBooleanProperty();
-    private final BooleanProperty extraFileColumnsEnabled =
-        new SimpleBooleanProperty();
+    private final BooleanProperty resizeColumnsToFit = new SimpleBooleanProperty();
+    private final BooleanProperty extraFileColumnsEnabled = new SimpleBooleanProperty();
 
     public MainTablePreferences(
         ColumnPreferences columnPreferences,
diff --git a/src/main/java/org/jabref/gui/maintable/NameDisplayPreferences.java b/src/main/java/org/jabref/gui/maintable/NameDisplayPreferences.java
index 29d505c4c25..a7079081374 100644
--- a/src/main/java/org/jabref/gui/maintable/NameDisplayPreferences.java
+++ b/src/main/java/org/jabref/gui/maintable/NameDisplayPreferences.java
@@ -18,15 +18,11 @@ public enum AbbreviationStyle {
         FULL,
     }
 
-    private final ObjectProperty<DisplayStyle> displayStyle =
-        new SimpleObjectProperty<>();
+    private final ObjectProperty<DisplayStyle> displayStyle = 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/OpenExternalFileAction.java b/src/main/java/org/jabref/gui/maintable/OpenExternalFileAction.java
index 0713174f05a..a792c33aa3d 100644
--- a/src/main/java/org/jabref/gui/maintable/OpenExternalFileAction.java
+++ b/src/main/java/org/jabref/gui/maintable/OpenExternalFileAction.java
@@ -31,14 +31,7 @@ public OpenExternalFileAction(
         PreferencesService preferencesService,
         TaskExecutor taskExecutor
     ) {
-        this(
-            dialogService,
-            stateManager,
-            preferencesService,
-            null,
-            null,
-            taskExecutor
-        );
+        this(dialogService, stateManager, preferencesService, null, null, taskExecutor);
     }
 
     public OpenExternalFileAction(
@@ -78,11 +71,9 @@ public void execute() {
             .getActiveDatabase()
             .ifPresent(databaseContext -> {
                 if (entry == null) {
-                    final List<BibEntry> selectedEntries =
-                        stateManager.getSelectedEntries();
+                    final List<BibEntry> selectedEntries = stateManager.getSelectedEntries();
 
-                    List<LinkedFileViewModel> linkedFileViewModelList =
-                        new LinkedList<>();
+                    List<LinkedFileViewModel> linkedFileViewModelList = new LinkedList<>();
                     LinkedFileViewModel linkedFileViewModel;
 
                     for (BibEntry entry : selectedEntries) {
@@ -103,18 +94,15 @@ public void execute() {
 
                     // 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")
-                            );
+                        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;
                         }
@@ -122,15 +110,14 @@ public void execute() {
 
                     linkedFileViewModelList.forEach(LinkedFileViewModel::open);
                 } else {
-                    LinkedFileViewModel linkedFileViewModel =
-                        new LinkedFileViewModel(
-                            linkedFile,
-                            entry,
-                            databaseContext,
-                            taskExecutor,
-                            dialogService,
-                            preferencesService
-                        );
+                    LinkedFileViewModel linkedFileViewModel = new LinkedFileViewModel(
+                        linkedFile,
+                        entry,
+                        databaseContext,
+                        taskExecutor,
+                        dialogService,
+                        preferencesService
+                    );
                     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 fce17337d25..15afebc5175 100644
--- a/src/main/java/org/jabref/gui/maintable/OpenFolderAction.java
+++ b/src/main/java/org/jabref/gui/maintable/OpenFolderAction.java
@@ -26,14 +26,7 @@ public OpenFolderAction(
         PreferencesService preferencesService,
         TaskExecutor taskExecutor
     ) {
-        this(
-            dialogService,
-            stateManager,
-            preferencesService,
-            null,
-            null,
-            taskExecutor
-        );
+        this(dialogService, stateManager, preferencesService, null, null, taskExecutor);
     }
 
     public OpenFolderAction(
@@ -53,10 +46,7 @@ public OpenFolderAction(
 
         if (this.linkedFile == null) {
             this.executable.bind(
-                    ActionHelper.isFilePresentForSelectedEntry(
-                        stateManager,
-                        preferencesService
-                    )
+                    ActionHelper.isFilePresentForSelectedEntry(stateManager, preferencesService)
                 );
         } else {
             this.setExecutable(true);
@@ -74,27 +64,25 @@ public void execute() {
                         .stream()
                         .filter(entry -> !entry.getFiles().isEmpty())
                         .forEach(entry -> {
-                            LinkedFileViewModel linkedFileViewModel =
-                                new LinkedFileViewModel(
-                                    entry.getFiles().get(0),
-                                    entry,
-                                    databaseContext,
-                                    taskExecutor,
-                                    dialogService,
-                                    preferencesService
-                                );
+                            LinkedFileViewModel linkedFileViewModel = new LinkedFileViewModel(
+                                entry.getFiles().get(0),
+                                entry,
+                                databaseContext,
+                                taskExecutor,
+                                dialogService,
+                                preferencesService
+                            );
                             linkedFileViewModel.openFolder();
                         });
                 } else {
-                    LinkedFileViewModel linkedFileViewModel =
-                        new LinkedFileViewModel(
-                            linkedFile,
-                            entry,
-                            databaseContext,
-                            taskExecutor,
-                            dialogService,
-                            preferencesService
-                        );
+                    LinkedFileViewModel linkedFileViewModel = new LinkedFileViewModel(
+                        linkedFile,
+                        entry,
+                        databaseContext,
+                        taskExecutor,
+                        dialogService,
+                        preferencesService
+                    );
                     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 a4b9b6d5456..ea3b81a506d 100644
--- a/src/main/java/org/jabref/gui/maintable/OpenUrlAction.java
+++ b/src/main/java/org/jabref/gui/maintable/OpenUrlAction.java
@@ -30,21 +30,11 @@ public OpenUrlAction(
         this.stateManager = stateManager;
         this.preferences = preferences;
 
-        BooleanExpression fieldIsSet =
-            ActionHelper.isAnyFieldSetForSelectedEntry(
-                List.of(
-                    StandardField.URL,
-                    StandardField.DOI,
-                    StandardField.URI,
-                    StandardField.EPRINT
-                ),
-                stateManager
-            );
-        this.executable.bind(
-                ActionHelper
-                    .needsEntriesSelected(1, stateManager)
-                    .and(fieldIsSet)
-            );
+        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
@@ -52,8 +42,7 @@ public void execute() {
         stateManager
             .getActiveDatabase()
             .ifPresent(databaseContext -> {
-                final List<BibEntry> entries =
-                    stateManager.getSelectedEntries();
+                final List<BibEntry> entries = stateManager.getSelectedEntries();
 
                 if (entries.size() != 1) {
                     dialogService.notify(
@@ -93,11 +82,7 @@ public void execute() {
                             field.equals(StandardField.DOI) &&
                             preferences.getDOIPreferences().isUseCustom()
                         ) {
-                            JabRefDesktop.openCustomDoi(
-                                link.get(),
-                                preferences,
-                                dialogService
-                            );
+                            JabRefDesktop.openCustomDoi(link.get(), preferences, dialogService);
                         } else {
                             JabRefDesktop.openExternalViewer(
                                 databaseContext,
diff --git a/src/main/java/org/jabref/gui/maintable/PersistenceVisualStateTable.java b/src/main/java/org/jabref/gui/maintable/PersistenceVisualStateTable.java
index 3919c89b3fc..fd4bbeb6ab3 100644
--- a/src/main/java/org/jabref/gui/maintable/PersistenceVisualStateTable.java
+++ b/src/main/java/org/jabref/gui/maintable/PersistenceVisualStateTable.java
@@ -15,9 +15,7 @@
  */
 public class PersistenceVisualStateTable {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(
-        PersistenceVisualStateTable.class
-    );
+    private static final Logger LOGGER = LoggerFactory.getLogger(PersistenceVisualStateTable.class);
 
     protected final TableView<BibEntryTableViewModel> table;
     protected final ColumnPreferences preferences;
@@ -31,15 +29,12 @@ public PersistenceVisualStateTable(
     }
 
     public void addListeners() {
-        table
-            .getColumns()
-            .addListener((InvalidationListener) obs -> updateColumns());
+        table.getColumns().addListener((InvalidationListener) obs -> updateColumns());
         table
             .getSortOrder()
             .addListener(
-                (ListChangeListener<
-                        ? super TableColumn<BibEntryTableViewModel, ?>
-                    >) obs -> updateSortOrder()
+                (ListChangeListener<? super TableColumn<BibEntryTableViewModel, ?>>) obs ->
+                    updateSortOrder()
             );
 
         // As we store the ColumnModels of the MainTable, we need to add the listener to the ColumnModel properties,
diff --git a/src/main/java/org/jabref/gui/maintable/RightClickMenu.java b/src/main/java/org/jabref/gui/maintable/RightClickMenu.java
index cb625c099f6..5a122d335cd 100644
--- a/src/main/java/org/jabref/gui/maintable/RightClickMenu.java
+++ b/src/main/java/org/jabref/gui/maintable/RightClickMenu.java
@@ -55,11 +55,7 @@ public static ContextMenu create(
             .addAll(
                 factory.createMenuItem(
                     StandardActions.COPY,
-                    new EditAction(
-                        StandardActions.COPY,
-                        libraryTab.frame(),
-                        stateManager
-                    )
+                    new EditAction(StandardActions.COPY, libraryTab.frame(), stateManager)
                 ),
                 createCopySubMenu(
                     factory,
@@ -72,35 +68,19 @@ public static ContextMenu create(
                 ),
                 factory.createMenuItem(
                     StandardActions.PASTE,
-                    new EditAction(
-                        StandardActions.PASTE,
-                        libraryTab.frame(),
-                        stateManager
-                    )
+                    new EditAction(StandardActions.PASTE, libraryTab.frame(), stateManager)
                 ),
                 factory.createMenuItem(
                     StandardActions.CUT,
-                    new EditAction(
-                        StandardActions.CUT,
-                        libraryTab.frame(),
-                        stateManager
-                    )
+                    new EditAction(StandardActions.CUT, libraryTab.frame(), stateManager)
                 ),
                 factory.createMenuItem(
                     StandardActions.MERGE_ENTRIES,
-                    new MergeEntriesAction(
-                        dialogService,
-                        stateManager,
-                        preferencesService
-                    )
+                    new MergeEntriesAction(dialogService, stateManager, preferencesService)
                 ),
                 factory.createMenuItem(
                     StandardActions.DELETE_ENTRY,
-                    new EditAction(
-                        StandardActions.DELETE_ENTRY,
-                        libraryTab.frame(),
-                        stateManager
-                    )
+                    new EditAction(StandardActions.DELETE_ENTRY, libraryTab.frame(), stateManager)
                 ),
                 new SeparatorMenuItem(),
                 createSendSubMenu(
@@ -204,19 +184,11 @@ public static ContextMenu create(
                 ),
                 factory.createMenuItem(
                     StandardActions.OPEN_URL,
-                    new OpenUrlAction(
-                        dialogService,
-                        stateManager,
-                        preferencesService
-                    )
+                    new OpenUrlAction(dialogService, stateManager, preferencesService)
                 ),
                 factory.createMenuItem(
                     StandardActions.SEARCH_SHORTSCIENCE,
-                    new SearchShortScienceAction(
-                        dialogService,
-                        stateManager,
-                        preferencesService
-                    )
+                    new SearchShortScienceAction(dialogService, stateManager, preferencesService)
                 ),
                 new SeparatorMenuItem(),
                 new ChangeEntryTypeMenu(
@@ -337,12 +309,8 @@ private static Menu createCopySubMenu(
             );
 
         // the submenu will behave dependent on what style is currently selected (citation/preview)
-        PreviewPreferences previewPreferences =
-            preferencesService.getPreviewPreferences();
-        if (
-            previewPreferences.getSelectedPreviewLayout() instanceof
-            CitationStylePreviewLayout
-        ) {
+        PreviewPreferences previewPreferences = preferencesService.getPreviewPreferences();
+        if (previewPreferences.getSelectedPreviewLayout() instanceof CitationStylePreviewLayout) {
             copySpecialMenu
                 .getItems()
                 .addAll(
diff --git a/src/main/java/org/jabref/gui/maintable/SearchShortScienceAction.java b/src/main/java/org/jabref/gui/maintable/SearchShortScienceAction.java
index a515cb4e7bd..31fa56d39a3 100644
--- a/src/main/java/org/jabref/gui/maintable/SearchShortScienceAction.java
+++ b/src/main/java/org/jabref/gui/maintable/SearchShortScienceAction.java
@@ -35,9 +35,7 @@ public SearchShortScienceAction(
             StandardField.TITLE,
             stateManager
         );
-        this.executable.bind(
-                needsEntriesSelected(1, stateManager).and(fieldIsSet)
-            );
+        this.executable.bind(needsEntriesSelected(1, stateManager).and(fieldIsSet));
     }
 
     @Override
@@ -45,8 +43,7 @@ public void execute() {
         stateManager
             .getActiveDatabase()
             .ifPresent(databaseContext -> {
-                final List<BibEntry> bibEntries =
-                    stateManager.getSelectedEntries();
+                final List<BibEntry> bibEntries = stateManager.getSelectedEntries();
 
                 if (bibEntries.size() != 1) {
                     dialogService.notify(
@@ -70,9 +67,7 @@ public void execute() {
                             );
                         } catch (IOException ex) {
                             dialogService.showErrorDialogAndWait(
-                                Localization.lang(
-                                    "Unable to open ShortScience."
-                                ),
+                                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 8d3ce694853..54dfea01146 100644
--- a/src/main/java/org/jabref/gui/maintable/SmartConstrainedResizePolicy.java
+++ b/src/main/java/org/jabref/gui/maintable/SmartConstrainedResizePolicy.java
@@ -16,8 +16,7 @@
  * We make sure that the width of all columns sums up to the total width of the table.
  * However, in contrast to {@link TableView#CONSTRAINED_RESIZE_POLICY} we size the columns initially by their preferred width.
  */
-public class SmartConstrainedResizePolicy
-    implements Callback<TableView.ResizeFeatures, Boolean> {
+public class SmartConstrainedResizePolicy implements Callback<TableView.ResizeFeatures, Boolean> {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(
         SmartConstrainedResizePolicy.class
@@ -34,8 +33,7 @@ public Boolean call(TableView.ResizeFeatures prop) {
 
     private Boolean initColumnSize(TableView<?> table) {
         double tableWidth = getContentWidth(table);
-        List<? extends TableColumnBase<?, ?>> visibleLeafColumns =
-            table.getVisibleLeafColumns();
+        List<? extends TableColumnBase<?, ?>> visibleLeafColumns = table.getVisibleLeafColumns();
         double totalWidth = visibleLeafColumns
             .stream()
             .mapToDouble(TableColumnBase::getWidth)
@@ -91,14 +89,8 @@ 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
-        );
+        List<? extends TableColumnBase<?, ?>> visibleLeafColumns = table.getVisibleLeafColumns();
+        return constrainedResize(prop, false, getContentWidth(table) - 2, visibleLeafColumns);
     }
 
     private Boolean constrainedResize(
@@ -141,8 +133,7 @@ private Boolean constrainedResize(
     private Double getContentWidth(TableView<?> table) {
         try {
             // TODO: reflective access, should be removed
-            Field privateStringField =
-                TableView.class.getDeclaredField("contentWidth");
+            Field privateStringField = TableView.class.getDeclaredField("contentWidth");
             privateStringField.setAccessible(true);
             return (Double) privateStringField.get(table);
         } catch (IllegalAccessException | NoSuchFieldException e) {
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 88151eea4fa..22ae5f85483 100644
--- a/src/main/java/org/jabref/gui/maintable/columns/FieldColumn.java
+++ b/src/main/java/org/jabref/gui/maintable/columns/FieldColumn.java
@@ -31,10 +31,7 @@ public FieldColumn(MainTableColumnModel model) {
 
         if (fields.hasExactlyOne()) {
             // comparator can't parse more than one value
-            Field field = fields
-                .getFields()
-                .stream()
-                .collect(MoreCollectors.onlyElement());
+            Field field = fields.getFields().stream().collect(MoreCollectors.onlyElement());
 
             if ((field instanceof UnknownField) || field.isNumeric()) {
                 this.setComparator(new NumericFieldComparator());
@@ -54,9 +51,7 @@ public String getDisplayName() {
         return fields.getDisplayName();
     }
 
-    private ObservableValue<String> getFieldValue(
-        BibEntryTableViewModel entry
-    ) {
+    private ObservableValue<String> getFieldValue(BibEntryTableViewModel entry) {
         if (fields.isEmpty()) {
             return null;
         } else {
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 6a44ed3f986..7b12126ef8f 100644
--- a/src/main/java/org/jabref/gui/maintable/columns/FileColumn.java
+++ b/src/main/java/org/jabref/gui/maintable/columns/FileColumn.java
@@ -54,10 +54,7 @@ public FileColumn(
         setCommonSettings();
 
         Node headerGraphic = IconTheme.JabRefIcons.FILE.getGraphicNode();
-        Tooltip.install(
-            headerGraphic,
-            new Tooltip(Localization.lang("Linked files"))
-        );
+        Tooltip.install(headerGraphic, new Tooltip(Localization.lang("Linked files")));
         this.setGraphic(headerGraphic);
 
         new ValueTableCellFactory<BibEntryTableViewModel, List<LinkedFile>>()
@@ -66,20 +63,16 @@ public FileColumn(
             .withMenu(this::createFileMenu)
             .withOnMouseClickedEvent((entry, linkedFiles) ->
                 event -> {
-                    if (
-                        (event.getButton() == MouseButton.PRIMARY) &&
-                        (linkedFiles.size() == 1)
-                    ) {
+                    if ((event.getButton() == MouseButton.PRIMARY) && (linkedFiles.size() == 1)) {
                         // Only one linked file -> open directly
-                        LinkedFileViewModel linkedFileViewModel =
-                            new LinkedFileViewModel(
-                                linkedFiles.get(0),
-                                entry.getEntry(),
-                                database,
-                                taskExecutor,
-                                dialogService,
-                                preferencesService
-                            );
+                        LinkedFileViewModel linkedFileViewModel = new LinkedFileViewModel(
+                            linkedFiles.get(0),
+                            entry.getEntry(),
+                            database,
+                            taskExecutor,
+                            dialogService,
+                            preferencesService
+                        );
                         linkedFileViewModel.open();
                     }
                 }
@@ -108,10 +101,7 @@ public FileColumn(
 
         this.setGraphic(
                 ExternalFileTypes
-                    .getExternalFileTypeByName(
-                        fileType,
-                        preferencesService.getFilePreferences()
-                    )
+                    .getExternalFileTypeByName(fileType, preferencesService.getFilePreferences())
                     .map(ExternalFileType::getIcon)
                     .orElse(IconTheme.JabRefIcons.FILE)
                     .getGraphicNode()
@@ -122,9 +112,7 @@ public FileColumn(
                 createFileIcon(
                     linkedFiles
                         .stream()
-                        .filter(linkedFile ->
-                            linkedFile.getFileType().equalsIgnoreCase(fileType)
-                        )
+                        .filter(linkedFile -> linkedFile.getFileType().equalsIgnoreCase(fileType))
                         .collect(Collectors.toList())
                 )
             )
@@ -133,30 +121,19 @@ public FileColumn(
 
     private void setCommonSettings() {
         this.setResizable(false);
-        MainTableColumnFactory.setExactWidth(
-            this,
-            ColumnPreferences.ICON_COLUMN_WIDTH
-        );
+        MainTableColumnFactory.setExactWidth(this, ColumnPreferences.ICON_COLUMN_WIDTH);
         this.getStyleClass().add(MainTableColumnFactory.STYLE_ICON_COLUMN);
-        this.setCellValueFactory(cellData ->
-                cellData.getValue().getLinkedFiles()
-            );
+        this.setCellValueFactory(cellData -> cellData.getValue().getLinkedFiles());
     }
 
     private String createFileTooltip(List<LinkedFile> linkedFiles) {
         if (!linkedFiles.isEmpty()) {
-            return Localization.lang(
-                "Open file %0",
-                linkedFiles.get(0).getLink()
-            );
+            return Localization.lang("Open file %0", linkedFiles.get(0).getLink());
         }
         return null;
     }
 
-    private ContextMenu createFileMenu(
-        BibEntryTableViewModel entry,
-        List<LinkedFile> linkedFiles
-    ) {
+    private ContextMenu createFileMenu(BibEntryTableViewModel entry, List<LinkedFile> linkedFiles) {
         if (linkedFiles.size() <= 1) {
             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 652342c381b..08b4e9ef3b6 100644
--- a/src/main/java/org/jabref/gui/maintable/columns/LibraryColumn.java
+++ b/src/main/java/org/jabref/gui/maintable/columns/LibraryColumn.java
@@ -15,9 +15,7 @@ public LibraryColumn(MainTableColumnModel model) {
         new ValueTableCellFactory<BibEntryTableViewModel, String>()
             .withText(FileUtil::getBaseName)
             .install(this);
-        setCellValueFactory(param ->
-            param.getValue().bibDatabaseContextProperty()
-        );
+        setCellValueFactory(param -> param.getValue().bibDatabaseContextProperty());
     }
 
     public LibraryColumn() {
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 d8598b31ead..2450bce0b0c 100644
--- a/src/main/java/org/jabref/gui/maintable/columns/LinkedIdentifierColumn.java
+++ b/src/main/java/org/jabref/gui/maintable/columns/LinkedIdentifierColumn.java
@@ -27,8 +27,7 @@
 /**
  * A clickable icons column for DOIs, URLs, URIs and EPrints.
  */
-public class LinkedIdentifierColumn
-    extends MainTableColumn<Map<Field, String>> {
+public class LinkedIdentifierColumn extends MainTableColumn<Map<Field, String>> {
 
     private final BibDatabaseContext database;
     private final CellFactory cellFactory;
@@ -50,20 +49,12 @@ public LinkedIdentifierColumn(
         this.preferences = preferences;
 
         Node headerGraphic = IconTheme.JabRefIcons.WWW.getGraphicNode();
-        Tooltip.install(
-            headerGraphic,
-            new Tooltip(Localization.lang("Linked identifiers"))
-        );
+        Tooltip.install(headerGraphic, new Tooltip(Localization.lang("Linked identifiers")));
         this.setGraphic(headerGraphic);
         this.getStyleClass().add(MainTableColumnFactory.STYLE_ICON_COLUMN);
-        MainTableColumnFactory.setExactWidth(
-            this,
-            ColumnPreferences.ICON_COLUMN_WIDTH
-        );
+        MainTableColumnFactory.setExactWidth(this, ColumnPreferences.ICON_COLUMN_WIDTH);
         this.setResizable(false);
-        this.setCellValueFactory(cellData ->
-                cellData.getValue().getLinkedIdentifiers()
-            );
+        this.setCellValueFactory(cellData -> cellData.getValue().getLinkedIdentifiers());
         new ValueTableCellFactory<BibEntryTableViewModel, Map<Field, String>>()
             .withGraphic(this::createIdentifierGraphic)
             .withTooltip(this::createIdentifierTooltip)
@@ -71,16 +62,8 @@ public LinkedIdentifierColumn(
             .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();
+                    if ((linkedFiles.size() == 1) && (event.getButton() == MouseButton.PRIMARY)) {
+                        new OpenUrlAction(dialogService, stateManager, preferences).execute();
                     }
                 }
             )
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 4dc23d978c7..0608dcd943d 100644
--- a/src/main/java/org/jabref/gui/maintable/columns/SpecialFieldColumn.java
+++ b/src/main/java/org/jabref/gui/maintable/columns/SpecialFieldColumn.java
@@ -30,8 +30,7 @@
 /**
  * A column that displays a SpecialField
  */
-public class SpecialFieldColumn
-    extends MainTableColumn<Optional<SpecialFieldValueViewModel>> {
+public class SpecialFieldColumn extends MainTableColumn<Optional<SpecialFieldValueViewModel>> {
 
     private final PreferencesService preferencesService;
     private final UndoManager undoManager;
@@ -45,9 +44,7 @@ public SpecialFieldColumn(
         this.preferencesService = preferencesService;
         this.undoManager = undoManager;
 
-        SpecialField specialField = (SpecialField) FieldFactory.parseField(
-            model.getQualifier()
-        );
+        SpecialField specialField = (SpecialField) FieldFactory.parseField(model.getQualifier());
         SpecialFieldViewModel specialFieldViewModel = new SpecialFieldViewModel(
             specialField,
             preferencesService,
@@ -55,10 +52,7 @@ public SpecialFieldColumn(
         );
 
         Node headerGraphic = specialFieldViewModel.getIcon().getGraphicNode();
-        Tooltip.install(
-            headerGraphic,
-            new Tooltip(specialFieldViewModel.getLocalization())
-        );
+        Tooltip.install(headerGraphic, new Tooltip(specialFieldViewModel.getLocalization()));
         this.setGraphic(headerGraphic);
         this.getStyleClass().add(MainTableColumnFactory.STYLE_ICON_COLUMN);
 
@@ -68,17 +62,11 @@ public SpecialFieldColumn(
                 SpecialFieldsPreferences.COLUMN_RANKING_WIDTH
             );
             this.setResizable(false);
-            new OptionalValueTableCellFactory<
-                BibEntryTableViewModel,
-                SpecialFieldValueViewModel
-            >()
+            new OptionalValueTableCellFactory<BibEntryTableViewModel, SpecialFieldValueViewModel>()
                 .withGraphic(this::createSpecialRating)
                 .install(this);
         } else {
-            MainTableColumnFactory.setExactWidth(
-                this,
-                ColumnPreferences.ICON_COLUMN_WIDTH
-            );
+            MainTableColumnFactory.setExactWidth(this, ColumnPreferences.ICON_COLUMN_WIDTH);
             this.setResizable(false);
 
             if (specialField.isSingleValueField()) {
@@ -106,18 +94,13 @@ public SpecialFieldColumn(
                         createSpecialFieldIcon(value, specialFieldViewModel)
                     )
                     .withMenu((entry, value) ->
-                        createSpecialFieldMenu(
-                            entry.getEntry(),
-                            specialFieldViewModel
-                        )
+                        createSpecialFieldMenu(entry.getEntry(), specialFieldViewModel)
                     )
                     .install(this);
             }
         }
 
-        this.setCellValueFactory(cellData ->
-                cellData.getValue().getSpecialField(specialField)
-            );
+        this.setCellValueFactory(cellData -> cellData.getValue().getSpecialField(specialField));
 
         if (specialField == SpecialField.RANKING) {
             this.setComparator(new RankingFieldComparator());
@@ -143,10 +126,7 @@ private Rating createSpecialRating(
         ranking.addEventFilter(
             MouseEvent.MOUSE_CLICKED,
             event -> {
-                if (
-                    event.getButton().equals(MouseButton.PRIMARY) &&
-                    event.getClickCount() == 2
-                ) {
+                if (event.getButton().equals(MouseButton.PRIMARY) && event.getClickCount() == 2) {
                     ranking.setRating(0);
                     event.consume();
                 } else if (event.getButton().equals(MouseButton.SECONDARY)) {
@@ -158,11 +138,7 @@ private Rating createSpecialRating(
         EasyBind.subscribe(
             ranking.ratingProperty(),
             rating ->
-                new SpecialFieldViewModel(
-                    SpecialField.RANKING,
-                    preferencesService,
-                    undoManager
-                )
+                new SpecialFieldViewModel(SpecialField.RANKING, preferencesService, undoManager)
                     .setSpecialFieldValue(
                         entry.getEntry(),
                         SpecialFieldValue.getRating(rating.intValue())
@@ -172,10 +148,7 @@ private Rating createSpecialRating(
         return ranking;
     }
 
-    private ContextMenu createSpecialFieldMenu(
-        BibEntry entry,
-        SpecialFieldViewModel specialField
-    ) {
+    private ContextMenu createSpecialFieldMenu(BibEntry entry, SpecialFieldViewModel specialField) {
         ContextMenu contextMenu = new ContextMenu();
 
         for (SpecialFieldValueViewModel value : specialField.getValues()) {
@@ -183,8 +156,7 @@ private ContextMenu createSpecialFieldMenu(
                 value.getMenuString(),
                 value.getIcon().map(JabRefIcon::getGraphicNode).orElse(null)
             );
-            menuItem.setOnAction(event ->
-                specialField.setSpecialFieldValue(entry, value.getValue())
+            menuItem.setOnAction(event -> specialField.setSpecialFieldValue(entry, value.getValue())
             );
             contextMenu.getItems().add(menuItem);
         }
diff --git a/src/main/java/org/jabref/gui/menus/ChangeEntryTypeAction.java b/src/main/java/org/jabref/gui/menus/ChangeEntryTypeAction.java
index 8c2c15905b6..3b85ca0949b 100644
--- a/src/main/java/org/jabref/gui/menus/ChangeEntryTypeAction.java
+++ b/src/main/java/org/jabref/gui/menus/ChangeEntryTypeAction.java
@@ -19,29 +19,18 @@ public class ChangeEntryTypeAction extends SimpleCommand {
     private final UndoManager undoManager;
     private final ReadOnlyStringWrapper statusMessageProperty;
 
-    public ChangeEntryTypeAction(
-        EntryType type,
-        List<BibEntry> entries,
-        UndoManager undoManager
-    ) {
+    public ChangeEntryTypeAction(EntryType type, List<BibEntry> entries, UndoManager undoManager) {
         this.type = type;
         this.entries = entries;
         this.undoManager = undoManager;
-        this.statusMessageProperty =
-            new ReadOnlyStringWrapper(EntryTypeView.getDescription(type));
+        this.statusMessageProperty = new ReadOnlyStringWrapper(EntryTypeView.getDescription(type));
     }
 
     @Override
     public void execute() {
-        NamedCompound compound = new NamedCompound(
-            Localization.lang("Change entry type")
-        );
+        NamedCompound compound = new NamedCompound(Localization.lang("Change entry type"));
         entries.forEach(e ->
-            e
-                .setType(type)
-                .ifPresent(change ->
-                    compound.addEdit(new UndoableChangeType(change))
-                )
+            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 c6012d6c080..415230de4cb 100644
--- a/src/main/java/org/jabref/gui/menus/ChangeEntryTypeMenu.java
+++ b/src/main/java/org/jabref/gui/menus/ChangeEntryTypeMenu.java
@@ -45,17 +45,13 @@ public ChangeEntryTypeMenu(
 
     public ContextMenu asContextMenu() {
         ContextMenu menu = new ContextMenu();
-        menu
-            .getItems()
-            .setAll(getMenuItems(entries, bibDatabaseContext, undoManager));
+        menu.getItems().setAll(getMenuItems(entries, bibDatabaseContext, undoManager));
         return menu;
     }
 
     public Menu asSubMenu() {
         Menu menu = new Menu(Localization.lang("Change entry type"));
-        menu
-            .getItems()
-            .setAll(getMenuItems(entries, bibDatabaseContext, undoManager));
+        menu.getItems().setAll(getMenuItems(entries, bibDatabaseContext, undoManager));
         return menu;
     }
 
@@ -83,9 +79,7 @@ private ObservableList<MenuItem> getMenuItems(
                 entries,
                 undoManager
             )
-                .ifPresent(subMenu ->
-                    items.addAll(new SeparatorMenuItem(), subMenu)
-                );
+                .ifPresent(subMenu -> items.addAll(new SeparatorMenuItem(), subMenu));
         } else {
             // Default BibTeX
             createSubMenu(
@@ -97,15 +91,8 @@ private ObservableList<MenuItem> getMenuItems(
                 .ifPresent(items::add);
 
             // IEEETran
-            createSubMenu(
-                "IEEETran",
-                IEEETranEntryTypeDefinitions.ALL,
-                entries,
-                undoManager
-            )
-                .ifPresent(subMenu ->
-                    items.addAll(new SeparatorMenuItem(), subMenu)
-                );
+            createSubMenu("IEEETran", IEEETranEntryTypeDefinitions.ALL, entries, undoManager)
+                .ifPresent(subMenu -> items.addAll(new SeparatorMenuItem(), subMenu));
 
             // Custom types
             createSubMenu(
@@ -114,9 +101,7 @@ private ObservableList<MenuItem> getMenuItems(
                 entries,
                 undoManager
             )
-                .ifPresent(subMenu ->
-                    items.addAll(new SeparatorMenuItem(), subMenu)
-                );
+                .ifPresent(subMenu -> items.addAll(new SeparatorMenuItem(), subMenu));
         }
 
         return items;
@@ -132,9 +117,7 @@ private Optional<Menu> createSubMenu(
 
         if (!entryTypes.isEmpty()) {
             subMenu = factory.createMenu(() -> text);
-            subMenu
-                .getItems()
-                .addAll(fromEntryTypes(entryTypes, entries, undoManager));
+            subMenu.getItems().addAll(fromEntryTypes(entryTypes, entries, undoManager));
         }
 
         return Optional.ofNullable(subMenu);
diff --git a/src/main/java/org/jabref/gui/menus/FileHistoryMenu.java b/src/main/java/org/jabref/gui/menus/FileHistoryMenu.java
index efe525ef740..ff1701ef4d3 100644
--- a/src/main/java/org/jabref/gui/menus/FileHistoryMenu.java
+++ b/src/main/java/org/jabref/gui/menus/FileHistoryMenu.java
@@ -26,9 +26,7 @@ public FileHistoryMenu(
         setText(Localization.lang("Recent libraries"));
 
         this.clearRecentLibraries = new MenuItem();
-        clearRecentLibraries.setText(
-            Localization.lang("Clear recent libraries")
-        );
+        clearRecentLibraries.setText(Localization.lang("Clear recent libraries"));
         clearRecentLibraries.setOnAction(event -> clearLibrariesHistory());
 
         this.history = fileHistory;
@@ -56,9 +54,7 @@ public boolean openFileByKey(KeyEvent keyEvent) {
         if (num <= 0 || num > history.size()) {
             return false;
         }
-        this.openFile(
-                history.get(Integer.parseInt(keyEvent.getCharacter()) - 1)
-            );
+        this.openFile(history.get(Integer.parseInt(keyEvent.getCharacter()) - 1));
         return true;
     }
 
diff --git a/src/main/java/org/jabref/gui/mergeentries/DiffHighlighting.java b/src/main/java/org/jabref/gui/mergeentries/DiffHighlighting.java
index 07612ba76a9..67f1df56fc0 100644
--- a/src/main/java/org/jabref/gui/mergeentries/DiffHighlighting.java
+++ b/src/main/java/org/jabref/gui/mergeentries/DiffHighlighting.java
@@ -12,9 +12,7 @@
 
 public class DiffHighlighting {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(
-        DiffHighlighting.class
-    );
+    private static final Logger LOGGER = LoggerFactory.getLogger(DiffHighlighting.class);
 
     private DiffHighlighting() {}
 
@@ -39,40 +37,28 @@ public static List<Text> generateDiffHighlighting(
             switch (delta.getType()) {
                 case CHANGE:
                     for (String line : lines) {
-                        result.set(
-                            startPos + offset,
-                            forRemoved(line + separator)
-                        );
+                        result.set(startPos + offset, forRemoved(line + separator));
                         offset++;
                     }
                     result.set(
                         startPos + offset - 1,
-                        forRemoved(
-                            stringList.get((startPos + offset) - 1) + separator
-                        )
+                        forRemoved(stringList.get((startPos + offset) - 1) + separator)
                     );
                     result.add(
                         startPos + offset,
-                        forAdded(
-                            String.join(separator, delta.getTarget().getLines())
-                        )
+                        forAdded(String.join(separator, delta.getTarget().getLines()))
                     );
                     break;
                 case DELETE:
                     for (String line : lines) {
-                        result.set(
-                            startPos + offset,
-                            forRemoved(line + separator)
-                        );
+                        result.set(startPos + offset, forRemoved(line + separator));
                         offset++;
                     }
                     break;
                 case INSERT:
                     result.add(
                         delta.getSource().getPosition(),
-                        forAdded(
-                            String.join(separator, delta.getTarget().getLines())
-                        )
+                        forAdded(String.join(separator, delta.getTarget().getLines()))
                     );
                     break;
                 default:
@@ -127,19 +113,13 @@ public static List<Text> generateSymmetricHighlighting(
             switch (delta.getType()) {
                 case CHANGE:
                     for (String line : lines) {
-                        result.set(
-                            startPos + offset,
-                            forChanged(line + separator)
-                        );
+                        result.set(startPos + offset, forChanged(line + separator));
                         offset++;
                     }
                     break;
                 case DELETE:
                     for (String line : lines) {
-                        result.set(
-                            startPos + offset,
-                            forAdded(line + separator)
-                        );
+                        result.set(startPos + offset, forAdded(line + separator));
                         offset++;
                     }
                     break;
diff --git a/src/main/java/org/jabref/gui/mergeentries/DiffHighlightingEllipsingTextFlow.java b/src/main/java/org/jabref/gui/mergeentries/DiffHighlightingEllipsingTextFlow.java
index 3e8c5b9b9d1..2b7ef0c5062 100644
--- a/src/main/java/org/jabref/gui/mergeentries/DiffHighlightingEllipsingTextFlow.java
+++ b/src/main/java/org/jabref/gui/mergeentries/DiffHighlightingEllipsingTextFlow.java
@@ -19,16 +19,10 @@ public class DiffHighlightingEllipsingTextFlow extends TextFlow {
     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
-        ) ->
+    private final ObservableList<Node> allChildren = FXCollections.observableArrayList();
+    private final ChangeListener<Number> sizeChangeListener = (observableValue, number, t1) ->
         adjustText();
-    private final ListChangeListener<Node> listChangeListener =
-        this::adjustChildren;
+    private final ListChangeListener<Node> listChangeListener = this::adjustChildren;
 
     private final String fullText;
     private final EasyObservableValue<String> comparisonString;
@@ -46,9 +40,7 @@ public DiffHighlightingEllipsingTextFlow(
 
         this.comparisonString = comparisonString;
         this.diffMode = diffMode;
-        comparisonString.addListener((obs, oldValue, newValue) ->
-            highlightDiff()
-        );
+        comparisonString.addListener((obs, oldValue, newValue) -> highlightDiff());
         diffMode.addListener((obs, oldValue, newValue) -> highlightDiff());
         highlightDiff();
     }
@@ -58,9 +50,7 @@ public ObservableList<Node> getChildren() {
         return allChildren;
     }
 
-    private void adjustChildren(
-        ListChangeListener.Change<? extends Node> change
-    ) {
+    private void adjustChildren(ListChangeListener.Change<? extends Node> change) {
         super.getChildren().clear();
         super.getChildren().addAll(allChildren);
         super.autosize();
@@ -100,27 +90,21 @@ private boolean fillUntilOverflowing() {
             if (super.getChildren().size() == allChildren.size()) {
                 if (allChildren.size() > 0) {
                     // all Texts are displayed, let's make sure all chars are as well
-                    Node lastChildAsShown = super
-                        .getChildren()
-                        .get(super.getChildren().size() - 1);
+                    Node lastChildAsShown = super.getChildren().get(super.getChildren().size() - 1);
                     Node lastChild = allChildren.get(allChildren.size() - 1);
                     if (
                         lastChildAsShown instanceof Text &&
                         ((Text) lastChildAsShown).getText().length() <
                             ((Text) lastChild).getText().length()
                     ) {
-                        ((Text) lastChildAsShown).setText(
-                                ((Text) lastChild).getText()
-                            );
+                        ((Text) lastChildAsShown).setText(((Text) lastChild).getText());
                     } else {
                         // nothing to fill the space with
                         return false;
                     }
                 }
             } else {
-                super
-                    .getChildren()
-                    .add(allChildren.get(super.getChildren().size()));
+                super.getChildren().add(allChildren.get(super.getChildren().size()));
             }
             super.autosize();
         }
@@ -140,16 +124,10 @@ private boolean ellipseUntilTextFits() {
                     return false;
                 }
                 lastChildAsShown =
-                    (Text) super
-                        .getChildren()
-                        .remove(super.getChildren().size() - 1);
+                    (Text) super.getChildren().remove(super.getChildren().size() - 1);
             }
-            Text shortenedChild = new Text(
-                ellipseString(lastChildAsShown.getText())
-            );
-            shortenedChild
-                .getStyleClass()
-                .addAll(lastChildAsShown.getStyleClass());
+            Text shortenedChild = new Text(ellipseString(lastChildAsShown.getText()));
+            shortenedChild.getStyleClass().addAll(lastChildAsShown.getStyleClass());
             super.getChildren().add(shortenedChild);
             super.autosize();
         }
@@ -158,10 +136,7 @@ private boolean ellipseUntilTextFits() {
 
     public void highlightDiff() {
         allChildren.clear();
-        if (
-            comparisonString.get() != null &&
-            !comparisonString.get().equals(fullText)
-        ) {
+        if (comparisonString.get() != null && !comparisonString.get().equals(fullText)) {
             final List<Text> highlightedText =
                 switch (diffMode.getValue()) {
                     case PLAIN -> {
@@ -206,9 +181,7 @@ public final void setEllipsisString(String value) {
     }
 
     public String getEllipsisString() {
-        return ellipsisString == null
-            ? DEFAULT_ELLIPSIS_STRING
-            : ellipsisString.get();
+        return ellipsisString == null ? DEFAULT_ELLIPSIS_STRING : ellipsisString.get();
     }
 
     public final StringProperty ellipsisStringProperty() {
diff --git a/src/main/java/org/jabref/gui/mergeentries/FetchAndMergeEntry.java b/src/main/java/org/jabref/gui/mergeentries/FetchAndMergeEntry.java
index 154ac10bc16..efc52e2ca6d 100644
--- a/src/main/java/org/jabref/gui/mergeentries/FetchAndMergeEntry.java
+++ b/src/main/java/org/jabref/gui/mergeentries/FetchAndMergeEntry.java
@@ -43,9 +43,7 @@ public class FetchAndMergeEntry {
         StandardField.EPRINT,
         StandardField.ISBN
     );
-    private static final Logger LOGGER = LoggerFactory.getLogger(
-        FetchAndMergeEntry.class
-    );
+    private static final Logger LOGGER = LoggerFactory.getLogger(FetchAndMergeEntry.class);
     private final DialogService dialogService;
     private final UndoManager undoManager;
     private final BibDatabaseContext bibDatabaseContext;
@@ -78,16 +76,13 @@ 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,
-                        preferencesService.getImportFormatPreferences()
-                    );
+                Optional<IdBasedFetcher> fetcher = WebFetchers.getIdBasedFetcherForField(
+                    field,
+                    preferencesService.getImportFormatPreferences()
+                );
                 if (fetcher.isPresent()) {
                     BackgroundTask
-                        .wrap(() ->
-                            fetcher.get().performSearchById(fieldContent.get())
-                        )
+                        .wrap(() -> fetcher.get().performSearchById(fieldContent.get()))
                         .onSuccess(fetchedEntry -> {
                             ImportCleanup cleanup = ImportCleanup.targeting(
                                 bibDatabaseContext.getMode()
@@ -95,11 +90,7 @@ public void fetchAndMerge(BibEntry entry, List<Field> fields) {
                             String type = field.getDisplayName();
                             if (fetchedEntry.isPresent()) {
                                 cleanup.doPostCleanup(fetchedEntry.get());
-                                showMergeDialog(
-                                    entry,
-                                    fetchedEntry.get(),
-                                    fetcher.get()
-                                );
+                                showMergeDialog(entry, fetchedEntry.get(), fetcher.get());
                             } else {
                                 dialogService.notify(
                                     Localization.lang(
@@ -121,13 +112,9 @@ public void fetchAndMerge(BibEntry entry, List<Field> fields) {
                                         "Fetching information using %0",
                                         fetcher.get().getName()
                                     ),
-                                    Localization.lang(
-                                        "No data was found for the identifier"
-                                    )
+                                    Localization.lang("No data was found for the identifier")
                                 );
-                            } else if (
-                                exception instanceof FetcherServerException
-                            ) {
+                            } else if (exception instanceof FetcherServerException) {
                                 dialogService.showInformationDialogAndWait(
                                     Localization.lang(
                                         "Fetching information using %0",
@@ -141,19 +128,14 @@ public void fetchAndMerge(BibEntry entry, List<Field> fields) {
                                         "Fetching information using %0",
                                         fetcher.get().getName()
                                     ),
-                                    Localization.lang(
-                                        "Error occurred %0",
-                                        exception.getMessage()
-                                    )
+                                    Localization.lang("Error occurred %0", exception.getMessage())
                                 );
                             }
                         })
                         .executeWith(taskExecutor);
                 }
             } else {
-                dialogService.notify(
-                    Localization.lang("No %0 found", field.getDisplayName())
-                );
+                dialogService.notify(Localization.lang("No %0 found", field.getDisplayName()));
             }
         }
     }
@@ -168,36 +150,22 @@ private void showMergeDialog(
             fetchedEntry,
             preferencesService
         );
-        dialog.setTitle(
-            Localization.lang(
-                "Merge entry with %0 information",
-                fetcher.getName()
-            )
-        );
+        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())
-        );
+        dialog.setRightHeaderText(Localization.lang("Entry from %0", fetcher.getName()));
         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()
-                )
+                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)
-            );
+            Set<Field> jointFields = new TreeSet<>(Comparator.comparing(Field::getName));
             jointFields.addAll(mergedEntry.get().getFields());
-            Set<Field> originalFields = new TreeSet<>(
-                Comparator.comparing(Field::getName)
-            );
+            Set<Field> originalFields = new TreeSet<>(Comparator.comparing(Field::getName));
             originalFields.addAll(originalEntry.getFields());
             boolean edited = false;
 
@@ -207,22 +175,15 @@ private void showMergeDialog(
 
             if (!oldType.equals(newType)) {
                 originalEntry.setType(newType);
-                ce.addEdit(
-                    new UndoableChangeType(originalEntry, oldType, newType)
-                );
+                ce.addEdit(new UndoableChangeType(originalEntry, oldType, newType));
                 edited = true;
             }
 
             // fields
             for (Field field : jointFields) {
                 Optional<String> originalString = originalEntry.getField(field);
-                Optional<String> mergedString = mergedEntry
-                    .get()
-                    .getField(field);
-                if (
-                    originalString.isEmpty() ||
-                    !originalString.equals(mergedString)
-                ) {
+                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(
@@ -238,21 +199,11 @@ private void showMergeDialog(
 
             // Remove fields which are not in the merged entry, unless they are internal fields
             for (Field field : originalFields) {
-                if (
-                    !jointFields.contains(field) &&
-                    !FieldFactory.isInternalField(field)
-                ) {
-                    Optional<String> originalString = originalEntry.getField(
-                        field
-                    );
+                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
-                        )
+                        new UndoableFieldChange(originalEntry, field, originalString.get(), null)
                     ); // originalString always present
                     edited = true;
                 }
@@ -262,10 +213,7 @@ private void showMergeDialog(
                 ce.end();
                 undoManager.addEdit(ce);
                 dialogService.notify(
-                    Localization.lang(
-                        "Updated entry with info from %0",
-                        fetcher.getName()
-                    )
+                    Localization.lang("Updated entry with info from %0", fetcher.getName())
                 );
             } else {
                 dialogService.notify(Localization.lang("No information added"));
@@ -280,30 +228,19 @@ public void fetchAndMerge(BibEntry entry, EntryBasedFetcher fetcher) {
             .wrap(() -> fetcher.performSearch(entry).stream().findFirst())
             .onSuccess(fetchedEntry -> {
                 if (fetchedEntry.isPresent()) {
-                    ImportCleanup cleanup = ImportCleanup.targeting(
-                        bibDatabaseContext.getMode()
-                    );
+                    ImportCleanup cleanup = ImportCleanup.targeting(bibDatabaseContext.getMode());
                     cleanup.doPostCleanup(fetchedEntry.get());
                     showMergeDialog(entry, fetchedEntry.get(), fetcher);
                 } else {
                     dialogService.notify(
-                        Localization.lang(
-                            "Could not find any bibliographic information."
-                        )
+                        Localization.lang("Could not find any bibliographic information.")
                     );
                 }
             })
             .onFailure(exception -> {
-                LOGGER.error(
-                    "Error while fetching entry with {} ",
-                    fetcher.getName(),
-                    exception
-                );
+                LOGGER.error("Error while fetching entry with {} ", fetcher.getName(), exception);
                 dialogService.showErrorDialogAndWait(
-                    Localization.lang(
-                        "Error while fetching from %0",
-                        fetcher.getName()
-                    ),
+                    Localization.lang("Error while fetching from %0", fetcher.getName()),
                     exception
                 );
             })
diff --git a/src/main/java/org/jabref/gui/mergeentries/MergeEntriesAction.java b/src/main/java/org/jabref/gui/mergeentries/MergeEntriesAction.java
index c2983cfe004..7411d249a03 100644
--- a/src/main/java/org/jabref/gui/mergeentries/MergeEntriesAction.java
+++ b/src/main/java/org/jabref/gui/mergeentries/MergeEntriesAction.java
@@ -29,10 +29,7 @@ public MergeEntriesAction(
         this.preferencesService = preferencesService;
 
         this.executable.bind(
-                ActionHelper.needsEntriesSelected(
-                    NUMBER_OF_ENTRIES_NEEDED,
-                    stateManager
-                )
+                ActionHelper.needsEntriesSelected(NUMBER_OF_ENTRIES_NEEDED, stateManager)
             );
     }
 
@@ -48,9 +45,7 @@ public void execute() {
             // Inform the user to select entries first.
             dialogService.showInformationDialogAndWait(
                 Localization.lang("Merge entries"),
-                Localization.lang(
-                    "You have to choose exactly two entries to merge."
-                )
+                Localization.lang("You have to choose exactly two entries to merge.")
             );
             return;
         }
@@ -75,26 +70,17 @@ public void execute() {
             second = one;
         }
 
-        MergeEntriesDialog dialog = new MergeEntriesDialog(
-            first,
-            second,
-            preferencesService
-        );
+        MergeEntriesDialog dialog = new MergeEntriesDialog(first, second, preferencesService);
         dialog.setTitle(Localization.lang("Merge entries"));
 
-        Optional<EntriesMergeResult> mergeResultOpt =
-            dialogService.showCustomDialogAndWait(dialog);
+        Optional<EntriesMergeResult> mergeResultOpt = dialogService.showCustomDialogAndWait(dialog);
         mergeResultOpt.ifPresentOrElse(
             entriesMergeResult -> {
-                new MergeTwoEntriesAction(entriesMergeResult, stateManager)
-                    .execute();
+                new MergeTwoEntriesAction(entriesMergeResult, stateManager).execute();
 
                 dialogService.notify(Localization.lang("Merged entries"));
             },
-            () ->
-                dialogService.notify(
-                    Localization.lang("Canceled merging 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 dc4a1791641..d7c28e5f103 100644
--- a/src/main/java/org/jabref/gui/mergeentries/MergeEntriesDialog.java
+++ b/src/main/java/org/jabref/gui/mergeentries/MergeEntriesDialog.java
@@ -15,11 +15,7 @@ public class MergeEntriesDialog extends BaseDialog<EntriesMergeResult> {
     private final BibEntry one;
     private final BibEntry two;
 
-    public MergeEntriesDialog(
-        BibEntry one,
-        BibEntry two,
-        PreferencesService preferencesService
-    ) {
+    public MergeEntriesDialog(BibEntry one, BibEntry two, PreferencesService preferencesService) {
         threeWayMergeView = new ThreeWayMergeView(one, two, preferencesService);
         this.one = one;
         this.two = two;
@@ -41,9 +37,7 @@ private void init() {
             Localization.lang("Merge entries"),
             ButtonBar.ButtonData.OK_DONE
         );
-        this.getDialogPane()
-            .getButtonTypes()
-            .setAll(ButtonType.CANCEL, replaceEntries);
+        this.getDialogPane().getButtonTypes().setAll(ButtonType.CANCEL, replaceEntries);
         this.setResultConverter(buttonType -> {
                 threeWayMergeView.saveConfiguration();
                 if (buttonType.equals(replaceEntries)) {
diff --git a/src/main/java/org/jabref/gui/mergeentries/MergeResult.java b/src/main/java/org/jabref/gui/mergeentries/MergeResult.java
index cffe2ac2f2f..a91af4d0083 100644
--- a/src/main/java/org/jabref/gui/mergeentries/MergeResult.java
+++ b/src/main/java/org/jabref/gui/mergeentries/MergeResult.java
@@ -2,8 +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 4f5e3ef3e98..02980acab95 100644
--- a/src/main/java/org/jabref/gui/mergeentries/MergeTwoEntriesAction.java
+++ b/src/main/java/org/jabref/gui/mergeentries/MergeTwoEntriesAction.java
@@ -17,10 +17,7 @@ public class MergeTwoEntriesAction extends SimpleCommand {
     private final EntriesMergeResult entriesMergeResult;
     private final StateManager stateManager;
 
-    public MergeTwoEntriesAction(
-        EntriesMergeResult entriesMergeResult,
-        StateManager stateManager
-    ) {
+    public MergeTwoEntriesAction(EntriesMergeResult entriesMergeResult, StateManager stateManager) {
         this.entriesMergeResult = entriesMergeResult;
         this.stateManager = stateManager;
     }
@@ -31,10 +28,7 @@ public void execute() {
             return;
         }
 
-        BibDatabase database = stateManager
-            .getActiveDatabase()
-            .get()
-            .getDatabase();
+        BibDatabase database = stateManager.getActiveDatabase().get().getDatabase();
         List<BibEntry> entriesToRemove = Arrays.asList(
             entriesMergeResult.originalLeftEntry(),
             entriesMergeResult.originalRightEntry()
@@ -43,9 +37,7 @@ public void execute() {
         database.insertEntry(entriesMergeResult.mergedEntry());
         database.removeEntries(entriesToRemove);
 
-        NamedCompound ce = new NamedCompound(
-            Localization.lang("Merge entries")
-        );
+        NamedCompound ce = new NamedCompound(Localization.lang("Merge entries"));
         ce.addEdit(
             new UndoableInsertEntries(
                 stateManager.getActiveDatabase().get().getDatabase(),
diff --git a/src/main/java/org/jabref/gui/mergeentries/MergeWithFetchedEntryAction.java b/src/main/java/org/jabref/gui/mergeentries/MergeWithFetchedEntryAction.java
index 16e5ac7a47d..da2260f6fe5 100644
--- a/src/main/java/org/jabref/gui/mergeentries/MergeWithFetchedEntryAction.java
+++ b/src/main/java/org/jabref/gui/mergeentries/MergeWithFetchedEntryAction.java
@@ -55,16 +55,10 @@ public void execute() {
             dialogService.showInformationDialogAndWait(
                 Localization.lang(
                     "Merge entry with %0 information",
-                    new OrFields(
-                        StandardField.DOI,
-                        StandardField.ISBN,
-                        StandardField.EPRINT
-                    )
+                    new OrFields(StandardField.DOI, StandardField.ISBN, StandardField.EPRINT)
                         .getDisplayName()
                 ),
-                Localization.lang(
-                    "This operation requires exactly one item to be selected."
-                )
+                Localization.lang("This operation requires exactly one item to be selected.")
             );
         }
 
diff --git a/src/main/java/org/jabref/gui/mergeentries/MultiMergeEntriesView.java b/src/main/java/org/jabref/gui/mergeentries/MultiMergeEntriesView.java
index 383975af6ca..e1905f3e7e8 100644
--- a/src/main/java/org/jabref/gui/mergeentries/MultiMergeEntriesView.java
+++ b/src/main/java/org/jabref/gui/mergeentries/MultiMergeEntriesView.java
@@ -55,9 +55,7 @@
 
 public class MultiMergeEntriesView extends BaseDialog<BibEntry> {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(
-        MultiMergeEntriesView.class
-    );
+    private static final Logger LOGGER = LoggerFactory.getLogger(MultiMergeEntriesView.class);
 
     // LEFT
     @FXML
@@ -100,10 +98,7 @@ public class MultiMergeEntriesView extends BaseDialog<BibEntry> {
 
     private final PreferencesService preferences;
 
-    public MultiMergeEntriesView(
-        PreferencesService preferences,
-        TaskExecutor taskExecutor
-    ) {
+    public MultiMergeEntriesView(PreferencesService preferences, TaskExecutor taskExecutor) {
         this.preferences = preferences;
         this.taskExecutor = taskExecutor;
 
@@ -115,17 +110,13 @@ public MultiMergeEntriesView(
             Localization.lang("Merge entries"),
             ButtonBar.ButtonData.OK_DONE
         );
-        this.getDialogPane()
-            .getButtonTypes()
-            .setAll(ButtonType.CANCEL, mergeEntries);
+        this.getDialogPane().getButtonTypes().setAll(ButtonType.CANCEL, mergeEntries);
         this.setResultConverter(viewModel::resultConverter);
 
         viewModel
             .entriesProperty()
             .addListener(
-                (ListChangeListener<
-                        MultiMergeEntriesViewModel.EntrySource
-                    >) c -> {
+                (ListChangeListener<MultiMergeEntriesViewModel.EntrySource>) c -> {
                     while (c.next()) {
                         if (c.wasAdded()) {
                             for (MultiMergeEntriesViewModel.EntrySource entrySourceColumn : c.getAddedSubList()) {
@@ -142,18 +133,10 @@ public MultiMergeEntriesView(
             .getFieldsObservable()
             .addListener(
                 (MapChangeListener<Field, String>) change -> {
-                    if (
-                        change.wasAdded() &&
-                        !fieldRows.containsKey(change.getKey())
-                    ) {
+                    if (change.wasAdded() && !fieldRows.containsKey(change.getKey())) {
                         FieldRow fieldRow = new FieldRow(
                             change.getKey(),
-                            viewModel
-                                .mergedEntryProperty()
-                                .get()
-                                .getFields()
-                                .size() -
-                            1
+                            viewModel.mergedEntryProperty().get().getFields().size() - 1
                         );
                         fieldRows.put(change.getKey(), fieldRow);
                     }
@@ -163,15 +146,9 @@ public MultiMergeEntriesView(
 
     @FXML
     public void initialize() {
-        topScrollPane
-            .hvalueProperty()
-            .bindBidirectional(centerScrollPane.hvalueProperty());
-        leftScrollPane
-            .vvalueProperty()
-            .bindBidirectional(centerScrollPane.vvalueProperty());
-        rightScrollPane
-            .vvalueProperty()
-            .bindBidirectional(centerScrollPane.vvalueProperty());
+        topScrollPane.hvalueProperty().bindBidirectional(centerScrollPane.hvalueProperty());
+        leftScrollPane.vvalueProperty().bindBidirectional(centerScrollPane.vvalueProperty());
+        rightScrollPane.vvalueProperty().bindBidirectional(centerScrollPane.vvalueProperty());
 
         viewModel
             .failedSuppliersProperty()
@@ -181,10 +158,7 @@ public void initialize() {
                         ? ""
                         : Localization.lang(
                             "Could not extract Metadata from: %0",
-                            String.join(
-                                ", ",
-                                viewModel.failedSuppliersProperty()
-                            )
+                            String.join(", ", viewModel.failedSuppliersProperty())
                         )
                 )
             );
@@ -194,9 +168,7 @@ public void initialize() {
 
     private void fillDiffModes() {
         diffMode.setItems(
-            FXCollections.observableList(
-                List.of(DiffMode.PLAIN, DiffMode.WORD, DiffMode.CHARACTER)
-            )
+            FXCollections.observableList(List.of(DiffMode.PLAIN, DiffMode.WORD, DiffMode.CHARACTER))
         );
         new ViewModelListCellFactory<DiffMode>()
             .withText(DiffMode::getDisplayText)
@@ -208,15 +180,10 @@ private void fillDiffModes() {
         );
     }
 
-    private void addColumn(
-        MultiMergeEntriesViewModel.EntrySource entrySourceColumn
-    ) {
+    private void addColumn(MultiMergeEntriesViewModel.EntrySource entrySourceColumn) {
         // add header
         int columnIndex = supplierHeader.getChildren().size();
-        ToggleButton header = generateEntryHeader(
-            entrySourceColumn,
-            columnIndex
-        );
+        ToggleButton header = generateEntryHeader(entrySourceColumn, columnIndex);
         header.getStyleClass().add("toggle-button");
         HBox.setHgrow(header, Priority.ALWAYS);
         supplierHeader.getChildren().add(header);
@@ -236,10 +203,7 @@ private void addColumn(
             entrySourceColumn
                 .isLoadingProperty()
                 .addListener((observable, oldValue, newValue) -> {
-                    if (
-                        !newValue &&
-                        entrySourceColumn.entryProperty().get() != null
-                    ) {
+                    if (!newValue && entrySourceColumn.entryProperty().get() != null) {
                         writeBibEntryToColumn(entrySourceColumn, columnIndex);
                         header.setDisable(false);
                     }
@@ -262,9 +226,7 @@ private ToggleButton generateEntryHeader(
             progressIndicator.setMinHeight(Control.USE_PREF_SIZE);
             progressIndicator.setMaxHeight(Control.USE_PREF_SIZE);
             header.setGraphic(progressIndicator);
-            progressIndicator
-                .visibleProperty()
-                .bind(column.isLoadingProperty());
+            progressIndicator.visibleProperty().bind(column.isLoadingProperty());
         }
 
         column
@@ -312,10 +274,7 @@ private void writeBibEntryToColumn(
      * @param sourceButton the header button to setup
      * @param column       the column this button is heading
      */
-    private void setupSourceButtonAction(
-        ToggleButton sourceButton,
-        int column
-    ) {
+    private void setupSourceButtonAction(ToggleButton sourceButton, int column) {
         sourceButton
             .selectedProperty()
             .addListener((observable, oldValue, newValue) -> {
@@ -330,9 +289,7 @@ private void setupSourceButtonAction(
                                 .stream()
                                 .filter(ToggleButton.class::isInstance)
                                 .forEach(toggleButton ->
-                                    ((ToggleButton) toggleButton).setSelected(
-                                            true
-                                        )
+                                    ((ToggleButton) toggleButton).setSelected(true)
                                 )
                         );
                     sourceButton.setSelected(true);
@@ -371,19 +328,11 @@ public Cell(String content, Field field, int columnIndex) {
                 FieldRow row = fieldRows.get(field);
 
                 prefWidthProperty()
-                    .bind(
-                        ((Region) supplierHeader
-                                .getChildren()
-                                .get(columnIndex)).widthProperty()
-                    );
+                    .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()
-                    );
+                    .bind(((Region) fieldEditor.getChildren().get(row.rowIndex)).heightProperty());
                 setMinHeight(Control.USE_PREF_SIZE);
                 setMaxHeight(Control.USE_PREF_SIZE);
 
@@ -401,11 +350,7 @@ public Cell(String content, Field field, int columnIndex) {
                 DiffHighlightingEllipsingTextFlow buttonText =
                     new DiffHighlightingEllipsingTextFlow(
                         content,
-                        viewModel
-                            .mergedEntryProperty()
-                            .get()
-                            .getFieldBinding(field)
-                            .asOrdinary(),
+                        viewModel.mergedEntryProperty().get().getFieldBinding(field).asOrdinary(),
                         diffMode.valueProperty()
                     );
 
@@ -428,12 +373,9 @@ public Cell(String content, Field field, int columnIndex) {
                 }
 
                 if (field.equals(StandardField.DOI)) {
-                    Button doiButton =
-                        IconTheme.JabRefIcons.LOOKUP_IDENTIFIER.asButton();
+                    Button doiButton = IconTheme.JabRefIcons.LOOKUP_IDENTIFIER.asButton();
                     HBox.setHgrow(doiButton, Priority.NEVER);
-                    doiButton
-                        .prefHeightProperty()
-                        .bind(cellButton.heightProperty());
+                    doiButton.prefHeightProperty().bind(cellButton.heightProperty());
                     doiButton.setMinHeight(Control.USE_PREF_SIZE);
                     doiButton.setMaxHeight(Control.USE_PREF_SIZE);
 
@@ -448,17 +390,9 @@ public Cell(String content, Field field, int columnIndex) {
                             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 doiFetcher.performSearchById(content).get();
+                                } catch (FetcherException | NoSuchElementException e) {
+                                    LOGGER.warn("Failed to fetch BibEntry for DOI {}", content, e);
                                     return null;
                                 }
                             }
@@ -474,18 +408,12 @@ public String getContent() {
     }
 
     public void addSource(String title, BibEntry entry) {
-        viewModel.addSource(
-            new MultiMergeEntriesViewModel.EntrySource(title, entry)
-        );
+        viewModel.addSource(new MultiMergeEntriesViewModel.EntrySource(title, entry));
     }
 
     public void addSource(String title, Supplier<BibEntry> supplier) {
         viewModel.addSource(
-            new MultiMergeEntriesViewModel.EntrySource(
-                title,
-                supplier,
-                taskExecutor
-            )
+            new MultiMergeEntriesViewModel.EntrySource(title, supplier, taskExecutor)
         );
     }
 
@@ -523,10 +451,7 @@ public FieldRow(Field field, int rowIndex) {
                 .selectedToggleProperty()
                 .addListener((obs, oldValue, newValue) -> {
                     if (newValue == null) {
-                        viewModel
-                            .mergedEntryProperty()
-                            .get()
-                            .setField(field, "");
+                        viewModel.mergedEntryProperty().get().setField(field, "");
                     } else {
                         viewModel
                             .mergedEntryProperty()
@@ -549,11 +474,7 @@ private void addRow(Field field) {
             VBox.setVgrow(fieldEditorCell, Priority.ALWAYS);
 
             fieldBinding =
-                viewModel
-                    .mergedEntryProperty()
-                    .get()
-                    .getFieldBinding(field)
-                    .asOrdinary();
+                viewModel.mergedEntryProperty().get().getFieldBinding(field).asOrdinary();
             BindingsHelper.bindBidirectional(
                 fieldEditorCell.textProperty(),
                 fieldBinding,
@@ -564,10 +485,7 @@ private void addRow(Field field) {
                 },
                 binding -> {
                     if (binding != null) {
-                        viewModel
-                            .mergedEntryProperty()
-                            .get()
-                            .setField(field, binding);
+                        viewModel.mergedEntryProperty().get().setField(field, binding);
                     }
                 }
             );
@@ -578,9 +496,7 @@ private void addRow(Field field) {
 
             // setup header label
             Label fieldHeaderLabel = new Label(field.getDisplayName());
-            fieldHeaderLabel
-                .prefHeightProperty()
-                .bind(fieldEditorCell.heightProperty());
+            fieldHeaderLabel.prefHeightProperty().bind(fieldEditorCell.heightProperty());
             fieldHeaderLabel.setMaxWidth(Control.USE_PREF_SIZE);
             fieldHeaderLabel.setMinWidth(Control.USE_PREF_SIZE);
             fieldHeader.getChildren().add(fieldHeaderLabel);
@@ -589,9 +505,7 @@ private void addRow(Field field) {
             RowConstraints constraint = new RowConstraints();
             constraint.setMinHeight(Control.USE_PREF_SIZE);
             constraint.setMaxHeight(Control.USE_PREF_SIZE);
-            constraint
-                .prefHeightProperty()
-                .bind(fieldEditorCell.heightProperty());
+            constraint.prefHeightProperty().bind(fieldEditorCell.heightProperty());
             optionsGrid.getRowConstraints().add(constraint);
         }
     }
diff --git a/src/main/java/org/jabref/gui/mergeentries/MultiMergeEntriesViewModel.java b/src/main/java/org/jabref/gui/mergeentries/MultiMergeEntriesViewModel.java
index 27194ea7e66..f09523df67d 100644
--- a/src/main/java/org/jabref/gui/mergeentries/MultiMergeEntriesViewModel.java
+++ b/src/main/java/org/jabref/gui/mergeentries/MultiMergeEntriesViewModel.java
@@ -24,28 +24,24 @@ public class MultiMergeEntriesViewModel extends AbstractViewModel {
         FXCollections.observableArrayList()
     );
 
-    private final ObjectProperty<BibEntry> mergedEntry =
-        new SimpleObjectProperty<>(new BibEntry());
+    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);
     }
@@ -54,19 +50,10 @@ public void updateFields(BibEntry entry) {
         if (entry == null) {
             return;
         }
-        for (Map.Entry<Field, String> fieldEntry : entry
-            .getFieldMap()
-            .entrySet()) {
+        for (Map.Entry<Field, String> fieldEntry : entry.getFieldMap().entrySet()) {
             // make sure there is a row for the field
-            if (
-                !mergedEntry
-                    .get()
-                    .getFieldsObservable()
-                    .containsKey(fieldEntry.getKey())
-            ) {
-                mergedEntry
-                    .get()
-                    .setField(fieldEntry.getKey(), fieldEntry.getValue());
+            if (!mergedEntry.get().getFieldsObservable().containsKey(fieldEntry.getKey())) {
+                mergedEntry.get().setField(fieldEntry.getKey(), fieldEntry.getValue());
             }
         }
     }
@@ -93,11 +80,8 @@ public ListProperty<String> failedSuppliersProperty() {
     public static class EntrySource {
 
         private final StringProperty title = new SimpleStringProperty("");
-        private final ObjectProperty<BibEntry> entry =
-            new SimpleObjectProperty<>();
-        private final BooleanProperty isLoading = new SimpleBooleanProperty(
-            false
-        );
+        private final ObjectProperty<BibEntry> entry = new SimpleObjectProperty<>();
+        private final BooleanProperty isLoading = new SimpleBooleanProperty(false);
 
         public EntrySource(
             String title,
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 c9cd0a1cf6d..8077d93d871 100644
--- a/src/main/java/org/jabref/gui/mergeentries/newmergedialog/FieldRowView.java
+++ b/src/main/java/org/jabref/gui/mergeentries/newmergedialog/FieldRowView.java
@@ -28,15 +28,11 @@
  */
 public class FieldRowView {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(
-        FieldRowView.class
-    );
+    private static final Logger LOGGER = LoggerFactory.getLogger(FieldRowView.class);
 
     protected final FieldRowViewModel viewModel;
 
-    protected final BooleanProperty shouldShowDiffs = new SimpleBooleanProperty(
-        true
-    );
+    protected final BooleanProperty shouldShowDiffs = new SimpleBooleanProperty(true);
     private final FieldNameCell fieldNameCell;
     private final FieldValueCell leftValueCell;
     private final FieldValueCell rightValueCell;
@@ -56,29 +52,14 @@ public FieldRowView(
         int rowIndex
     ) {
         viewModel =
-            new FieldRowViewModel(
-                field,
-                leftEntry,
-                rightEntry,
-                mergedEntry,
-                fieldMergerFactory
-            );
+            new FieldRowViewModel(field, leftEntry, rightEntry, mergedEntry, fieldMergerFactory);
 
         fieldNameCell = new FieldNameCell(field.getDisplayName(), rowIndex);
         leftValueCell =
-            new FieldValueCell(
-                viewModel.getLeftFieldValue(),
-                rowIndex,
-                preferencesService
-            );
+            new FieldValueCell(viewModel.getLeftFieldValue(), rowIndex, preferencesService);
         rightValueCell =
-            new FieldValueCell(
-                viewModel.getRightFieldValue(),
-                rowIndex,
-                preferencesService
-            );
-        mergedValueCell =
-            new MergedFieldCell(viewModel.getMergedFieldValue(), rowIndex);
+            new FieldValueCell(viewModel.getRightFieldValue(), rowIndex, preferencesService);
+        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.
         // This won't be necessary when https://bugs.openjdk.org/browse/JDK-8136901 is fixed.
@@ -91,25 +72,15 @@ public FieldRowView(
             });
 
         if (FieldMergerFactory.canMerge(field)) {
-            ToggleMergeUnmergeButton toggleMergeUnmergeButton =
-                new ToggleMergeUnmergeButton(field);
-            toggleMergeUnmergeButton.setCanMerge(
-                !viewModel.hasEqualLeftAndRightValues()
-            );
+            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
-                        ) {
+                        LOGGER.debug("Field merge state is {} for field {}", fieldState, field);
+                        if (fieldState == ToggleMergeUnmergeButton.FieldState.MERGED) {
                             viewModel.mergeFields();
                         } else {
                             viewModel.unmergeFields();
@@ -120,15 +91,9 @@ public FieldRowView(
 
         toggleGroup.getToggles().addAll(leftValueCell, rightValueCell);
 
-        mergedValueCell
-            .textProperty()
-            .bindBidirectional(viewModel.mergedFieldValueProperty());
-        leftValueCell
-            .textProperty()
-            .bindBidirectional(viewModel.leftFieldValueProperty());
-        rightValueCell
-            .textProperty()
-            .bindBidirectional(viewModel.rightFieldValueProperty());
+        mergedValueCell.textProperty().bindBidirectional(viewModel.mergedFieldValueProperty());
+        leftValueCell.textProperty().bindBidirectional(viewModel.leftFieldValueProperty());
+        rightValueCell.textProperty().bindBidirectional(viewModel.rightFieldValueProperty());
 
         EasyBind.subscribe(
             viewModel.selectionProperty(),
@@ -235,9 +200,7 @@ public void showDiff(ShowDiffConfig diffConfig) {
         // Clearing old diff styles based on previous diffConfig
         hideDiff();
         if (shouldShowDiffs.get()) {
-            if (
-                diffConfig.diffView() == ThreeWayMergeToolbar.DiffView.UNIFIED
-            ) {
+            if (diffConfig.diffView() == ThreeWayMergeToolbar.DiffView.UNIFIED) {
                 new UnifiedDiffHighlighter(
                     leftLabel,
                     rightLabel,
@@ -245,11 +208,7 @@ public void showDiff(ShowDiffConfig diffConfig) {
                 )
                     .highlight();
             } else {
-                new SplitDiffHighlighter(
-                    leftLabel,
-                    rightLabel,
-                    diffConfig.diffHighlightingMethod()
-                )
+                new SplitDiffHighlighter(leftLabel, rightLabel, diffConfig.diffHighlightingMethod())
                     .highlight();
             }
         }
@@ -259,12 +218,7 @@ public void hide() {
         if (parent != null) {
             parent
                 .getChildren()
-                .removeAll(
-                    leftValueCell,
-                    rightValueCell,
-                    mergedValueCell,
-                    fieldNameCell
-                );
+                .removeAll(leftValueCell, rightValueCell, mergedValueCell, fieldNameCell);
         }
     }
 
@@ -273,12 +227,7 @@ public void show() {
             if (!parent.getChildren().contains(leftValueCell)) {
                 parent
                     .getChildren()
-                    .addAll(
-                        leftValueCell,
-                        rightValueCell,
-                        mergedValueCell,
-                        fieldNameCell
-                    );
+                    .addAll(leftValueCell, rightValueCell, mergedValueCell, fieldNameCell);
             }
         }
     }
@@ -290,25 +239,13 @@ public void hideDiff() {
 
         LOGGER.debug("Hiding diffs...");
 
-        int leftValueLength = getLeftValueCell()
-            .getStyleClassedLabel()
-            .getLength();
-        getLeftValueCell()
-            .getStyleClassedLabel()
-            .clearStyle(0, leftValueLength);
-        getLeftValueCell()
-            .getStyleClassedLabel()
-            .replaceText(viewModel.getLeftFieldValue());
-
-        int rightValueLength = getRightValueCell()
-            .getStyleClassedLabel()
-            .getLength();
-        getRightValueCell()
-            .getStyleClassedLabel()
-            .clearStyle(0, rightValueLength);
-        getRightValueCell()
-            .getStyleClassedLabel()
-            .replaceText(viewModel.getRightFieldValue());
+        int leftValueLength = getLeftValueCell().getStyleClassedLabel().getLength();
+        getLeftValueCell().getStyleClassedLabel().clearStyle(0, leftValueLength);
+        getLeftValueCell().getStyleClassedLabel().replaceText(viewModel.getLeftFieldValue());
+
+        int rightValueLength = getRightValueCell().getStyleClassedLabel().getLength();
+        getRightValueCell().getStyleClassedLabel().clearStyle(0, rightValueLength);
+        getRightValueCell().getStyleClassedLabel().replaceText(viewModel.getRightFieldValue());
     }
 
     public boolean hasEqualLeftAndRightValues() {
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 f110ad89f40..296bc2b05fd 100644
--- a/src/main/java/org/jabref/gui/mergeentries/newmergedialog/FieldRowViewModel.java
+++ b/src/main/java/org/jabref/gui/mergeentries/newmergedialog/FieldRowViewModel.java
@@ -35,21 +35,14 @@ public enum Selection {
         NONE,
     }
 
-    private final Logger LOGGER = LoggerFactory.getLogger(
-        FieldRowViewModel.class
-    );
-    private final BooleanProperty isFieldsMerged = new SimpleBooleanProperty(
-        Boolean.FALSE
-    );
+    private final Logger LOGGER = LoggerFactory.getLogger(FieldRowViewModel.class);
+    private final BooleanProperty isFieldsMerged = new SimpleBooleanProperty(Boolean.FALSE);
 
-    private final ObjectProperty<Selection> selection =
-        new SimpleObjectProperty<>();
+    private final ObjectProperty<Selection> selection = new SimpleObjectProperty<>();
 
     private final StringProperty leftFieldValue = new SimpleStringProperty("");
     private final StringProperty rightFieldValue = new SimpleStringProperty("");
-    private final StringProperty mergedFieldValue = new SimpleStringProperty(
-        ""
-    );
+    private final StringProperty mergedFieldValue = new SimpleStringProperty("");
 
     private final Field field;
 
@@ -98,8 +91,7 @@ public FieldRowViewModel(
             mergedFieldValueProperty(),
             (obs, old, mergedFieldValue) -> {
                 if (field.equals(InternalField.TYPE_HEADER)) {
-                    getMergedEntry()
-                        .setType(EntryTypeFactory.parse(mergedFieldValue));
+                    getMergedEntry().setType(EntryTypeFactory.parse(mergedFieldValue));
                 } else {
                     getMergedEntry().setField(field, mergedFieldValue);
                 }
@@ -130,11 +122,7 @@ public FieldRowViewModel(
         EasyBind.subscribe(
             selectionProperty(),
             selection -> {
-                LOGGER.debug(
-                    "Selecting {}' value for field {}",
-                    selection,
-                    field.getDisplayName()
-                );
+                LOGGER.debug("Selecting {}' value for field {}", selection, field.getDisplayName());
                 switch (selection) {
                     case LEFT -> EasyBind.subscribe(
                         leftFieldValueProperty(),
@@ -166,10 +154,7 @@ public FieldRowViewModel(
             }
         );
 
-        EasyBind.subscribe(
-            hasEqualLeftAndRightBinding(),
-            this::setIsFieldsMerged
-        );
+        EasyBind.subscribe(hasEqualLeftAndRightBinding(), this::setIsFieldsMerged);
     }
 
     public void selectNonEmptyValue() {
@@ -223,10 +208,7 @@ public void mergeFields() {
         String oldRightFieldValue = getRightFieldValue();
 
         FieldMerger fieldMerger = fieldMergerFactory.create(field);
-        String mergedFields = fieldMerger.merge(
-            getLeftFieldValue(),
-            getRightFieldValue()
-        );
+        String mergedFields = fieldMerger.merge(getLeftFieldValue(), getRightFieldValue());
         setLeftFieldValue(mergedFields);
         setRightFieldValue(mergedFields);
 
@@ -234,11 +216,7 @@ public void mergeFields() {
             fieldsMergedEdit.redo();
         } else {
             fieldsMergedEdit.addEdit(
-                new MergeFieldsUndo(
-                    oldLeftFieldValue,
-                    oldRightFieldValue,
-                    mergedFields
-                )
+                new MergeFieldsUndo(oldLeftFieldValue, oldRightFieldValue, mergedFields)
             );
             fieldsMergedEdit.end();
         }
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 b743eb728cc..47329a801ee 100644
--- a/src/main/java/org/jabref/gui/mergeentries/newmergedialog/PersonsNameFieldRowView.java
+++ b/src/main/java/org/jabref/gui/mergeentries/newmergedialog/PersonsNameFieldRowView.java
@@ -39,10 +39,7 @@ public PersonsNameFieldRowView(
         leftEntryNames = authorsParser.parse(viewModel.getLeftFieldValue());
         rightEntryNames = authorsParser.parse(viewModel.getRightFieldValue());
 
-        if (
-            !viewModel.hasEqualLeftAndRightValues() &&
-            leftEntryNames.equals(rightEntryNames)
-        ) {
+        if (!viewModel.hasEqualLeftAndRightValues() && leftEntryNames.equals(rightEntryNames)) {
             showPersonsNamesAreTheSameInfo();
             shouldShowDiffs.set(false);
         }
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 16ba4e818d4..5f70ac0db73 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 2f8a6d661c5..a911d8bf052 100644
--- a/src/main/java/org/jabref/gui/mergeentries/newmergedialog/ThreeWayMergeHeaderView.java
+++ b/src/main/java/org/jabref/gui/mergeentries/newmergedialog/ThreeWayMergeHeaderView.java
@@ -23,16 +23,9 @@ public ThreeWayMergeHeaderView(String leftHeader, String rightHeader) {
 
         this.leftHeaderCell = new HeaderCell(leftHeader);
         this.rightHeaderCell = new HeaderCell(rightHeader);
-        this.mergedHeaderCell =
-            new HeaderCell(Localization.lang("Merged Entry"));
-
-        addRow(
-            0,
-            new HeaderCell(""),
-            leftHeaderCell,
-            rightHeaderCell,
-            mergedHeaderCell
-        );
+        this.mergedHeaderCell = new HeaderCell(Localization.lang("Merged Entry"));
+
+        addRow(0, new HeaderCell(""), leftHeaderCell, rightHeaderCell, mergedHeaderCell);
 
         setPrefHeight(Control.USE_COMPUTED_SIZE);
         setMaxHeight(Control.USE_PREF_SIZE);
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 a3d0289e55b..bf3105d1bb2 100644
--- a/src/main/java/org/jabref/gui/mergeentries/newmergedialog/ThreeWayMergeView.java
+++ b/src/main/java/org/jabref/gui/mergeentries/newmergedialog/ThreeWayMergeView.java
@@ -21,21 +21,25 @@ public class ThreeWayMergeView extends VBox {
 
     public static final int GRID_COLUMN_MIN_WIDTH = 250;
 
-    public static final String LEFT_DEFAULT_HEADER = Localization.lang(
-        "Left Entry"
+    public static final String LEFT_DEFAULT_HEADER = Localization.lang("Left Entry");
+    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
     );
-    public static final String RIGHT_DEFAULT_HEADER = Localization.lang(
-        "Right Entry"
+    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 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 ThreeWayMergeToolbar toolbar;
     private final ThreeWayMergeHeaderView headerView;
     private final ScrollPane scrollPane;
@@ -59,10 +63,7 @@ public ThreeWayMergeView(
         this.preferencesService = preferencesService;
 
         getStylesheets()
-            .add(
-                ThreeWayMergeView.class.getResource("ThreeWayMergeView.css")
-                    .toExternalForm()
-            );
+            .add(ThreeWayMergeView.class.getResource("ThreeWayMergeView.css").toExternalForm());
         viewModel =
             new ThreeWayMergeViewModel(
                 (BibEntry) leftEntry.clone(),
@@ -73,10 +74,7 @@ public ThreeWayMergeView(
         this.fieldMergerFactory =
             new FieldMergerFactory(preferencesService.getBibEntryPreferences());
         this.keywordSeparator =
-            preferencesService
-                .getBibEntryPreferences()
-                .getKeywordSeparator()
-                .toString();
+            preferencesService.getBibEntryPreferences().getKeywordSeparator().toString();
 
         mergeGridPane = new GridPane();
         scrollPane = new ScrollPane();
@@ -100,29 +98,17 @@ public ThreeWayMergeView(
         BibEntry rightEntry,
         PreferencesService preferencesService
     ) {
-        this(
-            leftEntry,
-            rightEntry,
-            LEFT_DEFAULT_HEADER,
-            RIGHT_DEFAULT_HEADER,
-            preferencesService
-        );
+        this(leftEntry, rightEntry, LEFT_DEFAULT_HEADER, RIGHT_DEFAULT_HEADER, preferencesService);
     }
 
     private void initializeToolbar() {
-        toolbar.setOnSelectLeftEntryValuesButtonClicked(
-            this::selectLeftEntryValues
-        );
-        toolbar.setOnSelectRightEntryValuesButtonClicked(
-            this::selectRightEntryValues
-        );
+        toolbar.setOnSelectLeftEntryValuesButtonClicked(this::selectLeftEntryValues);
+        toolbar.setOnSelectRightEntryValuesButtonClicked(this::selectRightEntryValues);
 
         toolbar.showDiffProperty().addListener(e -> updateDiff());
         toolbar.diffViewProperty().addListener(e -> updateDiff());
         toolbar.diffHighlightingMethodProperty().addListener(e -> updateDiff());
-        toolbar
-            .hideEqualFieldsProperty()
-            .addListener(e -> showOrHideEqualFields());
+        toolbar.hideEqualFieldsProperty().addListener(e -> showOrHideEqualFields());
 
         updateDiff();
         showOrHideEqualFields();
@@ -145,14 +131,8 @@ private void updateDiff() {
             for (FieldRowView row : fieldRows) {
                 if (
                     "Groups".equals(row.getFieldNameCell().getText()) &&
-                    (row
-                            .getLeftValueCell()
-                            .getText()
-                            .contains(keywordSeparator) ||
-                        row
-                            .getRightValueCell()
-                            .getText()
-                            .contains(keywordSeparator))
+                    (row.getLeftValueCell().getText().contains(keywordSeparator) ||
+                        row.getRightValueCell().getText().contains(keywordSeparator))
                 ) {
                     row.showDiff(
                         new ShowDiffConfig(
@@ -208,11 +188,7 @@ private void initializeMergeGridPane() {
                 mergedEntryColumnConstraints
             );
 
-        for (
-            int fieldIndex = 0;
-            fieldIndex < viewModel.numberOfVisibleFields();
-            fieldIndex++
-        ) {
+        for (int fieldIndex = 0; fieldIndex < viewModel.numberOfVisibleFields(); fieldIndex++) {
             addRow(fieldIndex);
 
             mergeGridPane.getRowConstraints().add(new RowConstraints());
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 76d2f5119e6..e7d102fd551 100644
--- a/src/main/java/org/jabref/gui/mergeentries/newmergedialog/ThreeWayMergeViewModel.java
+++ b/src/main/java/org/jabref/gui/mergeentries/newmergedialog/ThreeWayMergeViewModel.java
@@ -19,17 +19,13 @@
 
 public class ThreeWayMergeViewModel extends AbstractViewModel {
 
-    private final ObjectProperty<BibEntry> leftEntry =
-        new SimpleObjectProperty<>();
-    private final ObjectProperty<BibEntry> rightEntry =
-        new SimpleObjectProperty<>();
-    private final ObjectProperty<BibEntry> mergedEntry =
-        new SimpleObjectProperty<>();
+    private final ObjectProperty<BibEntry> leftEntry = new SimpleObjectProperty<>();
+    private final ObjectProperty<BibEntry> rightEntry = new SimpleObjectProperty<>();
+    private final ObjectProperty<BibEntry> mergedEntry = new SimpleObjectProperty<>();
     private final StringProperty leftHeader = new SimpleStringProperty();
     private final StringProperty rightHeader = new SimpleStringProperty();
 
-    private final ObservableList<Field> visibleFields =
-        FXCollections.observableArrayList();
+    private final ObservableList<Field> visibleFields = FXCollections.observableArrayList();
 
     public ThreeWayMergeViewModel(
         BibEntry leftEntry,
@@ -51,10 +47,7 @@ public ThreeWayMergeViewModel(
 
         setVisibleFields(
             Stream
-                .concat(
-                    leftEntry.getFields().stream(),
-                    rightEntry.getFields().stream()
-                )
+                .concat(leftEntry.getFields().stream(), rightEntry.getFields().stream())
                 .collect(Collectors.toSet())
         );
     }
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 a9e4b43b5cf..936d1bc5999 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
@@ -10,10 +10,7 @@ public class CopyFieldValueCommand extends SimpleCommand {
     private final String fieldValue;
     private final ClipBoardManager clipBoardManager;
 
-    public CopyFieldValueCommand(
-        PreferencesService preferencesService,
-        final String fieldValue
-    ) {
+    public CopyFieldValueCommand(PreferencesService preferencesService, final String fieldValue) {
         Objects.requireNonNull(fieldValue, "Field value cannot be null");
         this.fieldValue = fieldValue;
         this.clipBoardManager = new ClipBoardManager(preferencesService);
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 55e574f4ce3..1b7cd1f23a1 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
@@ -39,15 +39,12 @@
  */
 public class FieldValueCell extends ThreeWayMergeCell implements Toggle {
 
-    public static final Logger LOGGER = LoggerFactory.getLogger(
-        FieldValueCell.class
-    );
+    public static final Logger LOGGER = LoggerFactory.getLogger(FieldValueCell.class);
 
     public static final String DEFAULT_STYLE_CLASS = "merge-field-value";
     public static final String SELECTION_BOX_STYLE_CLASS = "selection-box";
 
-    private static final PseudoClass SELECTED_PSEUDO_CLASS =
-        PseudoClass.getPseudoClass("selected");
+    private static final PseudoClass SELECTED_PSEUDO_CLASS = PseudoClass.getPseudoClass("selected");
 
     private final PreferencesService preferencesService;
 
@@ -62,11 +59,7 @@ public class FieldValueCell extends ThreeWayMergeCell implements Toggle {
     private final HBox actionsContainer = new HBox();
     private final FieldValueCellViewModel viewModel;
 
-    public FieldValueCell(
-        String text,
-        int rowIndex,
-        PreferencesService preferencesService
-    ) {
+    public FieldValueCell(String text, int rowIndex, PreferencesService preferencesService) {
         super(text, rowIndex);
         this.preferencesService = preferencesService;
         this.factory = new ActionFactory(Globals.getKeyPrefs());
@@ -112,26 +105,20 @@ private void initializeLabel() {
         // Workarounds
         preventTextSelectionViaMouseEvents();
 
-        label
-            .prefHeightProperty()
-            .bind(label.totalHeightEstimateProperty().orElseConst(-1d));
+        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)
-                    );
+                FieldValueCell.this.fireEvent(e.copyFor(e.getSource(), FieldValueCell.this));
             }
         );
     }
 
     private void initializeActions() {
-        actionsContainer
-            .getChildren()
-            .setAll(createOpenLinkButton(), createCopyButton());
+        actionsContainer.getChildren().setAll(createOpenLinkButton(), createCopyButton());
         actionsContainer.setAlignment(Pos.TOP_CENTER);
         actionsContainer.setPrefWidth(28);
     }
@@ -167,10 +154,7 @@ public Button createOpenLinkButton() {
 
         Button openLinkButton = factory.createIconButton(
             () -> Localization.lang("Open Link"),
-            new OpenExternalLinkAction(
-                getText(),
-                preferencesService.getFilePreferences()
-            )
+            new OpenExternalLinkAction(getText(), preferencesService.getFilePreferences())
         );
         openLinkButton.setGraphic(openLinkIcon);
         openLinkButton.setContentDisplay(ContentDisplay.GRAPHIC_ONLY);
@@ -182,8 +166,7 @@ public Button createOpenLinkButton() {
                 EasyBind.map(
                     textProperty(),
                     input ->
-                        StringUtil.isNotBlank(input) &&
-                        (URLUtil.isURL(input) || DOI.isValid(input))
+                        StringUtil.isNotBlank(input) && (URLUtil.isURL(input) || DOI.isValid(input))
                 )
             );
 
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 e95e6858bec..ba6e5c3641d 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
@@ -15,8 +15,7 @@ public class FieldValueCellViewModel {
         FieldValueCell.class,
         "selected"
     );
-    private final ObjectProperty<ToggleGroup> toggleGroup =
-        new SimpleObjectProperty<>();
+    private final ObjectProperty<ToggleGroup> toggleGroup = new SimpleObjectProperty<>();
 
     public FieldValueCellViewModel(String text) {
         setFieldValue(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 84ff082fdba..79d467290a5 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
@@ -25,12 +25,7 @@ private void initialize() {
     private void initializeLabel() {
         label.textProperty().bind(textProperty());
         label.setPadding(
-            new Insets(
-                getPadding().getTop(),
-                getPadding().getRight(),
-                getPadding().getBottom(),
-                16
-            )
+            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 d2b52d0aff0..bd8afd083fb 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
@@ -43,9 +43,7 @@ private void initializeTextArea() {
             ScrollEvent.SCROLL,
             e -> {
                 e.consume();
-                MergedFieldCell.this.fireEvent(
-                        e.copyFor(e.getSource(), MergedFieldCell.this)
-                    );
+                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 96a95423588..d51d50f4b18 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
@@ -14,18 +14,13 @@
  */
 public class OpenExternalLinkAction extends SimpleCommand {
 
-    private final Logger LOGGER = LoggerFactory.getLogger(
-        OpenExternalLinkAction.class
-    );
+    private final Logger LOGGER = LoggerFactory.getLogger(OpenExternalLinkAction.class);
 
     private final FilePreferences filePreferences;
 
     private final String urlOrDoi;
 
-    public OpenExternalLinkAction(
-        String urlOrDoi,
-        FilePreferences filePreferences
-    ) {
+    public OpenExternalLinkAction(String urlOrDoi, FilePreferences filePreferences) {
         this.filePreferences = filePreferences;
         this.urlOrDoi = urlOrDoi;
     }
@@ -35,22 +30,14 @@ public void execute() {
         try {
             if (DOI.isValid(urlOrDoi)) {
                 JabRefDesktop.openBrowser(
-                    DOI
-                        .parse(urlOrDoi)
-                        .flatMap(DOI::getExternalURI)
-                        .map(URI::toString)
-                        .orElse(""),
+                    DOI.parse(urlOrDoi).flatMap(DOI::getExternalURI).map(URI::toString).orElse(""),
                     filePreferences
                 );
             } else {
                 JabRefDesktop.openBrowser(urlOrDoi, filePreferences);
             }
         } catch (IOException e) {
-            LOGGER.warn(
-                "Cannot open the given external link '{}'",
-                urlOrDoi,
-                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 e4c63df6786..536b1c2a899 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
@@ -21,19 +21,13 @@ public ThreeWayMergeCell(String text, int rowIndex) {
         EasyBind.subscribe(
             viewModel.oddProperty(),
             isOdd -> {
-                pseudoClassStateChanged(
-                    PseudoClass.getPseudoClass(ODD_PSEUDO_CLASS),
-                    isOdd
-                );
+                pseudoClassStateChanged(PseudoClass.getPseudoClass(ODD_PSEUDO_CLASS), isOdd);
             }
         );
         EasyBind.subscribe(
             viewModel.evenProperty(),
             isEven -> {
-                pseudoClassStateChanged(
-                    PseudoClass.getPseudoClass(EVEN_PSEUDO_CLASS),
-                    isEven
-                );
+                pseudoClassStateChanged(PseudoClass.getPseudoClass(EVEN_PSEUDO_CLASS), isEven);
             }
         );
     }
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 fe59de87c13..ec5f80de399 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
@@ -11,14 +11,8 @@
 public class ThreeWayMergeCellViewModel {
 
     private final StringProperty text = new SimpleStringProperty();
-    private final BooleanProperty odd = new SimpleBooleanProperty(
-        ThreeWayMergeCell.class,
-        "odd"
-    );
-    private final BooleanProperty even = new SimpleBooleanProperty(
-        ThreeWayMergeCell.class,
-        "even"
-    );
+    private final BooleanProperty odd = new SimpleBooleanProperty(ThreeWayMergeCell.class, "odd");
+    private final BooleanProperty even = new SimpleBooleanProperty(ThreeWayMergeCell.class, "even");
 
     public ThreeWayMergeCellViewModel(String text, int rowIndex) {
         setText(text);
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 9a6de68df6a..878a2966b74 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
@@ -15,9 +15,7 @@
 public class InfoButton extends Button {
 
     private final StringProperty infoMessage = new SimpleStringProperty();
-    private final ActionFactory actionFactory = new ActionFactory(
-        Globals.getKeyPrefs()
-    );
+    private final ActionFactory actionFactory = new ActionFactory(Globals.getKeyPrefs());
 
     private final Action mergeAction = new Action() {
         @Override
@@ -34,10 +32,7 @@ public String getText() {
     public InfoButton(String infoMessage) {
         this.infoMessage.setValue(infoMessage);
         configureButton();
-        EasyBind.subscribe(
-            this.infoMessage,
-            newWarningMessage -> configureButton()
-        );
+        EasyBind.subscribe(this.infoMessage, newWarningMessage -> configureButton());
     }
 
     private void configureButton() {
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 0b985304d3e..4f2c719a38b 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
@@ -17,15 +17,12 @@
 
 public class ToggleMergeUnmergeButton extends Button {
 
-    private final ObjectProperty<FieldState> fieldState =
-        new SimpleObjectProperty<>(FieldState.UNMERGED);
-    private final BooleanProperty canMerge = new SimpleBooleanProperty(
-        Boolean.TRUE
+    private final ObjectProperty<FieldState> fieldState = new SimpleObjectProperty<>(
+        FieldState.UNMERGED
     );
+    private final BooleanProperty canMerge = new SimpleBooleanProperty(Boolean.TRUE);
 
-    private final ActionFactory actionFactory = new ActionFactory(
-        Globals.getKeyPrefs()
-    );
+    private final ActionFactory actionFactory = new ActionFactory(Globals.getKeyPrefs());
 
     private final Field field;
 
@@ -40,20 +37,12 @@ public ToggleMergeUnmergeButton(Field field) {
 
     private void configureMergeButton() {
         ToggleMergeCommand mergeCommand = new ToggleMergeCommand();
-        actionFactory.configureIconButton(
-            mergeCommand.mergeAction,
-            mergeCommand,
-            this
-        );
+        actionFactory.configureIconButton(mergeCommand.mergeAction, mergeCommand, this);
     }
 
     private void configureUnmergeButton() {
         ToggleMergeCommand unmergeCommand = new ToggleMergeCommand();
-        actionFactory.configureIconButton(
-            unmergeCommand.unmergeAction,
-            unmergeCommand,
-            this
-        );
+        actionFactory.configureIconButton(unmergeCommand.unmergeAction, unmergeCommand, this);
     }
 
     public ObjectProperty<FieldState> fieldStateProperty() {
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 53775f7ecb0..c578f53ba1d 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
@@ -6,8 +6,7 @@
 import org.fxmisc.richtext.StyleClassedTextArea;
 import org.jabref.gui.mergeentries.newmergedialog.DiffMethod;
 
-public abstract sealed class DiffHighlighter
-    permits SplitDiffHighlighter, UnifiedDiffHighlighter {
+public abstract sealed class DiffHighlighter permits SplitDiffHighlighter, UnifiedDiffHighlighter {
 
     protected final StyleClassedTextArea sourceTextview;
     protected final StyleClassedTextArea targetTextview;
@@ -19,14 +18,8 @@ public DiffHighlighter(
         StyleClassedTextArea targetTextview,
         DiffMethod diffMethod
     ) {
-        Objects.requireNonNull(
-            sourceTextview,
-            "source text view MUST NOT be null."
-        );
-        Objects.requireNonNull(
-            targetTextview,
-            "target text view MUST NOT be null."
-        );
+        Objects.requireNonNull(sourceTextview, "source text view MUST NOT be null.");
+        Objects.requireNonNull(targetTextview, "target text view MUST NOT be null.");
 
         this.sourceTextview = sourceTextview;
         this.targetTextview = targetTextview;
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 31ea10af885..797f808c8b8 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
@@ -46,9 +46,7 @@ public void highlight() {
                 .map(String::length)
                 .reduce(Integer::sum)
                 .map(value ->
-                    value +
-                    (getSeparator().length() *
-                        (affectedTokensInSource.size() - 1))
+                    value + (getSeparator().length() * (affectedTokensInSource.size() - 1))
                 )
                 .orElse(0);
 
@@ -57,9 +55,7 @@ public void highlight() {
                 .map(String::length)
                 .reduce(Integer::sum)
                 .map(value ->
-                    value +
-                    (getSeparator().length() *
-                        (affectedTokensInTarget.size() - 1))
+                    value + (getSeparator().length() * (affectedTokensInTarget.size() - 1))
                 )
                 .orElse(0);
             int affectedSourceTokensPositionInText = getPositionInText(
@@ -74,37 +70,30 @@ public void highlight() {
                 case CHANGE -> {
                     sourceTextview.setStyleClass(
                         affectedSourceTokensPositionInText,
-                        affectedSourceTokensPositionInText +
-                        joinedSourceTokensLength,
+                        affectedSourceTokensPositionInText + joinedSourceTokensLength,
                         "deletion"
                     );
                     targetTextview.setStyleClass(
                         affectedTargetTokensPositionInText,
-                        affectedTargetTokensPositionInText +
-                        joinedTargetTokensLength,
+                        affectedTargetTokensPositionInText + joinedTargetTokensLength,
                         "updated"
                     );
                 }
                 case DELETE -> sourceTextview.setStyleClass(
                     affectedSourceTokensPositionInText,
-                    affectedSourceTokensPositionInText +
-                    joinedSourceTokensLength,
+                    affectedSourceTokensPositionInText + joinedSourceTokensLength,
                     "deletion"
                 );
                 case INSERT -> targetTextview.setStyleClass(
                     affectedTargetTokensPositionInText,
-                    affectedTargetTokensPositionInText +
-                    joinedTargetTokensLength,
+                    affectedTargetTokensPositionInText + joinedTargetTokensLength,
                     "addition"
                 );
             }
         }
     }
 
-    public int getPositionInText(
-        int positionInTokenList,
-        List<String> tokenList
-    ) {
+    public int getPositionInText(int positionInTokenList, List<String> tokenList) {
         if (positionInTokenList == 0) {
             return 0;
         } else {
@@ -113,9 +102,7 @@ public int getPositionInText(
                 .limit(positionInTokenList)
                 .map(String::length)
                 .reduce(Integer::sum)
-                .map(value ->
-                    value + (getSeparator().length() * positionInTokenList)
-                )
+                .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 86bc3a982bc..3dd288456c4 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
@@ -48,43 +48,26 @@ public void highlight() {
                     int changePosition = delta.getTarget().getPosition();
                     int deletionPoint = changePosition + deletionCount;
                     int insertionPoint = deletionPoint + 1;
-                    List<String> deltaSourceWords = delta
-                        .getSource()
-                        .getLines();
-                    List<String> deltaTargetWords = delta
-                        .getTarget()
-                        .getLines();
+                    List<String> deltaSourceWords = delta.getSource().getLines();
+                    List<String> deltaTargetWords = delta.getTarget().getLines();
 
                     unifiedWords.add(deletionPoint, join(deltaSourceWords));
 
+                    changeList.add(new Change(deletionPoint, 1, ChangeType.CHANGE_DELETION));
                     changeList.add(
-                        new Change(deletionPoint, 1, ChangeType.CHANGE_DELETION)
-                    );
-                    changeList.add(
-                        new Change(
-                            insertionPoint,
-                            deltaTargetWords.size(),
-                            ChangeType.ADDITION
-                        )
+                        new Change(insertionPoint, deltaTargetWords.size(), ChangeType.ADDITION)
                     );
                     deletionCount++;
                 }
                 case DELETE -> {
-                    int deletionPoint =
-                        delta.getTarget().getPosition() + deletionCount;
-                    unifiedWords.add(
-                        deletionPoint,
-                        join(delta.getSource().getLines())
-                    );
+                    int deletionPoint = delta.getTarget().getPosition() + deletionCount;
+                    unifiedWords.add(deletionPoint, join(delta.getSource().getLines()));
 
-                    changeList.add(
-                        new Change(deletionPoint, 1, ChangeType.DELETION)
-                    );
+                    changeList.add(new Change(deletionPoint, 1, ChangeType.DELETION));
                     deletionCount++;
                 }
                 case INSERT -> {
-                    int insertionPoint =
-                        delta.getTarget().getPosition() + deletionCount;
+                    int insertionPoint = delta.getTarget().getPosition() + deletionCount;
                     changeList.add(
                         new Change(
                             insertionPoint,
@@ -100,16 +83,9 @@ public void highlight() {
         boolean changeInProgress = false;
         for (int position = 0; position < unifiedWords.size(); position++) {
             String word = unifiedWords.get(position);
-            Optional<Change> changeAtPosition = findChange(
-                position,
-                changeList
-            );
+            Optional<Change> changeAtPosition = findChange(position, changeList);
             if (changeAtPosition.isEmpty()) {
-                appendToTextArea(
-                    targetTextview,
-                    getSeparator() + word,
-                    "unchanged"
-                );
+                appendToTextArea(targetTextview, getSeparator() + word, "unchanged");
             } else {
                 Change change = changeAtPosition.get();
                 List<String> changeWords = unifiedWords.subList(
@@ -125,11 +101,7 @@ public void highlight() {
                     );
                 } else if (change.type() == ChangeType.ADDITION) {
                     if (changeInProgress) {
-                        appendToTextArea(
-                            targetTextview,
-                            join(changeWords),
-                            "addition"
-                        );
+                        appendToTextArea(targetTextview, join(changeWords), "addition");
                         changeInProgress = false;
                     } else {
                         appendToTextArea(
@@ -155,30 +127,20 @@ public void highlight() {
         }
     }
 
-    private void appendToTextArea(
-        StyleClassedTextArea textArea,
-        String text,
-        String styleClass
-    ) {
+    private void appendToTextArea(StyleClassedTextArea textArea, String text, String styleClass) {
         if (text.isEmpty()) {
             return;
         }
         // Append separator without styling it
         if (text.startsWith(getSeparator())) {
             textArea.append(getSeparator(), "unchanged");
-            textArea.append(
-                text.substring(getSeparator().length()),
-                styleClass
-            );
+            textArea.append(text.substring(getSeparator().length()), styleClass);
         } else {
             textArea.append(text, styleClass);
         }
     }
 
     private Optional<Change> findChange(int position, List<Change> changeList) {
-        return changeList
-            .stream()
-            .filter(change -> change.position() == position)
-            .findAny();
+        return changeList.stream().filter(change -> change.position() == position).findAny();
     }
 }
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 dd426f67c93..96ce98241d0 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
@@ -23,8 +23,7 @@ public FieldMerger create(Field field) {
             return new FileMerger();
         } else {
             throw new IllegalArgumentException(
-                "No implementation found for merging the given field: " +
-                field.getDisplayName()
+                "No implementation found for merging the given field: " + field.getDisplayName()
             );
         }
     }
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 be6e88af2bf..28047c24840 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
@@ -12,9 +12,7 @@
 public class GroupMerger implements FieldMerger {
 
     public static final String GROUPS_SEPARATOR = ", ";
-    public static final Pattern GROUPS_SEPARATOR_REGEX = Pattern.compile(
-        "\s*,\s*"
-    );
+    public static final Pattern GROUPS_SEPARATOR_REGEX = Pattern.compile("\s*,\s*");
 
     @Override
     public String merge(String groupsA, String groupsB) {
@@ -26,11 +24,7 @@ public String merge(String groupsA, String groupsB) {
             return groupsA;
         } else {
             return Arrays
-                .stream(
-                    GROUPS_SEPARATOR_REGEX.split(
-                        groupsA + GROUPS_SEPARATOR + groupsB
-                    )
-                )
+                .stream(GROUPS_SEPARATOR_REGEX.split(groupsA + GROUPS_SEPARATOR + groupsB))
                 .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 7e30d73bcfd..d735c04e7fc 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
@@ -20,8 +20,6 @@ public KeywordMerger(BibEntryPreferences bibEntryPreferences) {
     @Override
     public String merge(String keywordsA, String keywordsB) {
         Character delimiter = bibEntryPreferences.getKeywordSeparator();
-        return KeywordList
-            .merge(keywordsA, keywordsB, delimiter)
-            .getAsString(delimiter);
+        return KeywordList.merge(keywordsA, keywordsB, delimiter).getAsString(delimiter);
     }
 }
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 9975f1fe6d4..0ebec20f851 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
@@ -53,10 +53,8 @@ public class ThreeWayMergeToolbar extends AnchorPane {
     @Inject
     private PreferencesService preferencesService;
 
-    private final ObjectProperty<DiffMethod> diffHighlightingMethod =
-        new SimpleObjectProperty<>();
-    private final BooleanProperty onlyShowChangedFields =
-        new SimpleBooleanProperty();
+    private final ObjectProperty<DiffMethod> diffHighlightingMethod = new SimpleObjectProperty<>();
+    private final BooleanProperty onlyShowChangedFields = new SimpleBooleanProperty();
     private EasyBinding<Boolean> showDiff;
 
     public ThreeWayMergeToolbar() {
@@ -104,9 +102,7 @@ public DiffView fromString(String string) {
         );
 
         highlightWordsRadioButton.disableProperty().bind(notShowDiffProperty());
-        highlightCharactersRadioButtons
-            .disableProperty()
-            .bind(notShowDiffProperty());
+        highlightCharactersRadioButtons.disableProperty().bind(notShowDiffProperty());
 
         diffHighlightingMethodToggleGroup
             .selectedToggleProperty()
@@ -127,13 +123,9 @@ public DiffView fromString(String string) {
         onlyShowChangedFieldsCheck
             .selectedProperty()
             .bindBidirectional(
-                preferencesService
-                    .getGuiPreferences()
-                    .mergeShowChangedFieldOnlyProperty()
+                preferencesService.getGuiPreferences().mergeShowChangedFieldOnlyProperty()
             );
-        onlyShowChangedFields.bind(
-            onlyShowChangedFieldsCheck.selectedProperty()
-        );
+        onlyShowChangedFields.bind(onlyShowChangedFieldsCheck.selectedProperty());
 
         loadSavedConfiguration();
     }
@@ -141,18 +133,14 @@ public DiffView fromString(String string) {
     private void loadSavedConfiguration() {
         GuiPreferences guiPreferences = preferencesService.getGuiPreferences();
 
-        PlainTextOrDiff plainTextOrDiffPreference =
-            guiPreferences.getMergeShouldShowDiff()
-                ? PlainTextOrDiff.Diff
-                : PlainTextOrDiff.PLAIN_TEXT;
-        plainTextOrDiffComboBox
-            .getSelectionModel()
-            .select(plainTextOrDiffPreference);
+        PlainTextOrDiff plainTextOrDiffPreference = guiPreferences.getMergeShouldShowDiff()
+            ? PlainTextOrDiff.Diff
+            : PlainTextOrDiff.PLAIN_TEXT;
+        plainTextOrDiffComboBox.getSelectionModel().select(plainTextOrDiffPreference);
 
-        DiffView diffViewPreference =
-            guiPreferences.getMergeShouldShowUnifiedDiff()
-                ? DiffView.UNIFIED
-                : DiffView.SPLIT;
+        DiffView diffViewPreference = guiPreferences.getMergeShouldShowUnifiedDiff()
+            ? DiffView.UNIFIED
+            : DiffView.SPLIT;
         diffViewComboBox.getSelectionModel().select(diffViewPreference);
 
         diffHighlightingMethodToggleGroup.selectToggle(
@@ -165,19 +153,14 @@ private void loadSavedConfiguration() {
     public void saveToolbarConfiguration() {
         preferencesService
             .getGuiPreferences()
-            .setMergeShouldShowDiff(
-                plainTextOrDiffComboBox.getValue() == PlainTextOrDiff.Diff
-            );
+            .setMergeShouldShowDiff(plainTextOrDiffComboBox.getValue() == PlainTextOrDiff.Diff);
         preferencesService
             .getGuiPreferences()
-            .setMergeShouldShowUnifiedDiff(
-                diffViewComboBox.getValue() == DiffView.UNIFIED
-            );
+            .setMergeShouldShowUnifiedDiff(diffViewComboBox.getValue() == DiffView.UNIFIED);
 
-        boolean highlightWordsRadioButtonValue =
-            diffHighlightingMethodToggleGroup
-                .getSelectedToggle()
-                .equals(highlightWordsRadioButton);
+        boolean highlightWordsRadioButtonValue = diffHighlightingMethodToggleGroup
+            .getSelectedToggle()
+            .equals(highlightWordsRadioButton);
         preferencesService
             .getGuiPreferences()
             .setMergeHighlightWords(highlightWordsRadioButtonValue);
diff --git a/src/main/java/org/jabref/gui/openoffice/AdvancedCiteDialogView.java b/src/main/java/org/jabref/gui/openoffice/AdvancedCiteDialogView.java
index abb256093a0..938ee42e6bc 100644
--- a/src/main/java/org/jabref/gui/openoffice/AdvancedCiteDialogView.java
+++ b/src/main/java/org/jabref/gui/openoffice/AdvancedCiteDialogView.java
@@ -9,8 +9,7 @@
 import org.jabref.gui.util.BaseDialog;
 import org.jabref.logic.l10n.Localization;
 
-public class AdvancedCiteDialogView
-    extends BaseDialog<AdvancedCiteDialogViewModel> {
+public class AdvancedCiteDialogView extends BaseDialog<AdvancedCiteDialogViewModel> {
 
     @FXML
     private TextField pageInfo;
@@ -43,12 +42,8 @@ public AdvancedCiteDialogView() {
     private void initialize() {
         viewModel = new AdvancedCiteDialogViewModel();
 
-        inPar
-            .selectedProperty()
-            .bindBidirectional(viewModel.citeInParProperty());
-        inText
-            .selectedProperty()
-            .bindBidirectional(viewModel.citeInTextProperty());
+        inPar.selectedProperty().bindBidirectional(viewModel.citeInParProperty());
+        inText.selectedProperty().bindBidirectional(viewModel.citeInTextProperty());
         pageInfo.textProperty().bindBidirectional(viewModel.pageInfoProperty());
     }
 }
diff --git a/src/main/java/org/jabref/gui/openoffice/Bootstrap.java b/src/main/java/org/jabref/gui/openoffice/Bootstrap.java
index e2bd4297d2f..4cd743d1476 100644
--- a/src/main/java/org/jabref/gui/openoffice/Bootstrap.java
+++ b/src/main/java/org/jabref/gui/openoffice/Bootstrap.java
@@ -73,58 +73,29 @@ 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
-            )
-        );
+        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
-            )
+            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
-            )
+            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
-            )
+            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
-            )
+            xImpLoader.activate("com.sun.star.comp.connections.Acceptor", null, null, null)
         );
     }
 
@@ -146,12 +117,7 @@ private static void insertBasicFactories(
      * @since LibreOffice 5.1
      */
     public static String[] getDefaultOptions() {
-        return new String[] {
-            "--nologo",
-            "--nodefault",
-            "--norestore",
-            "--nolockcheck",
-        };
+        return new String[] { "--nologo", "--nodefault", "--norestore", "--nolockcheck" };
     }
 
     /**
@@ -164,9 +130,7 @@ public static String[] getDefaultOptions() {
     public static XComponentContext createInitialComponentContext(
         Hashtable<String, Object> context_entries
     ) throws Exception {
-        return createInitialComponentContext(
-            (Map<String, Object>) context_entries
-        );
+        return createInitialComponentContext((Map<String, Object>) context_entries);
     }
 
     /**
@@ -185,10 +149,7 @@ public static XComponentContext createInitialComponentContext(
             XImplementationLoader.class,
             new JavaLoader()
         );
-        XInitialization xInit = UnoRuntime.queryInterface(
-            XInitialization.class,
-            xImpLoader
-        );
+        XInitialization xInit = UnoRuntime.queryInterface(XInitialization.class, xImpLoader);
         Object[] args = new Object[] { xSMgr };
         xInit.initialize(args);
 
@@ -202,10 +163,7 @@ public static XComponentContext createInitialComponentContext(
             new ComponentContextEntry(null, xSMgr)
         );
         // ... xxx todo: add standard entries
-        XComponentContext xContext = new ComponentContext(
-            context_entries,
-            null
-        );
+        XComponentContext xContext = new ComponentContext(context_entries, null);
 
         xSMgr.setDefaultContext(xContext);
 
@@ -224,12 +182,10 @@ public static XComponentContext createInitialComponentContext(
      * @return a freshly bootstrapped service manager
      * @throws Exception if things go awry.
      */
-    public static XMultiServiceFactory createSimpleServiceManager()
-        throws Exception {
+    public static XMultiServiceFactory createSimpleServiceManager() throws Exception {
         return UnoRuntime.queryInterface(
             XMultiServiceFactory.class,
-            createInitialComponentContext((Map<String, Object>) null)
-                .getServiceManager()
+            createInitialComponentContext((Map<String, Object>) null).getServiceManager()
         );
     }
 
@@ -242,12 +198,8 @@ public static XMultiServiceFactory createSimpleServiceManager()
      * <code>cppuhelper/defaultBootstrap_InitialComponentContext()</code>.
      * @throws Exception if things go awry.
      */
-    public static XComponentContext defaultBootstrap_InitialComponentContext()
-        throws Exception {
-        return defaultBootstrap_InitialComponentContext(
-            (String) null,
-            (Map<String, String>) null
-        );
+    public static XComponentContext defaultBootstrap_InitialComponentContext() throws Exception {
+        return defaultBootstrap_InitialComponentContext((String) null, (Map<String, String>) null);
     }
 
     /**
@@ -288,19 +240,14 @@ public static XComponentContext defaultBootstrap_InitialComponentContext(
         if (null != bootstrap_parameters) {
             pairs = new String[2 * bootstrap_parameters.size()];
             int n = 0;
-            for (Map.Entry<
-                String,
-                String
-            > bootstrap_parameter : bootstrap_parameters.entrySet()) {
+            for (Map.Entry<String, String> bootstrap_parameter : bootstrap_parameters.entrySet()) {
                 pairs[n++] = bootstrap_parameter.getKey();
                 pairs[n++] = bootstrap_parameter.getValue();
             }
         }
 
         if (!M_LOADED_JUH) {
-            if (
-                "The Android Project".equals(System.getProperty("java.vendor"))
-            ) {
+            if ("The Android Project".equals(System.getProperty("java.vendor"))) {
                 // Find out if we are configured with DISABLE_DYNLOADING or
                 // not. Try to load the lo-bootstrap shared library which
                 // won't exist in the DISABLE_DYNLOADING case. (And which will
@@ -318,26 +265,16 @@ public static XComponentContext defaultBootstrap_InitialComponentContext(
                 }
 
                 if (!disable_dynloading) {
-                    NativeLibraryLoader.loadLibrary(
-                        Bootstrap.class.getClassLoader(),
-                        "juh"
-                    );
+                    NativeLibraryLoader.loadLibrary(Bootstrap.class.getClassLoader(), "juh");
                 }
             } else {
-                NativeLibraryLoader.loadLibrary(
-                    Bootstrap.class.getClassLoader(),
-                    "juh"
-                );
+                NativeLibraryLoader.loadLibrary(Bootstrap.class.getClassLoader(), "juh");
             }
             M_LOADED_JUH = true;
         }
         return UnoRuntime.queryInterface(
             XComponentContext.class,
-            cppuhelper_bootstrap(
-                ini_file,
-                pairs,
-                Bootstrap.class.getClassLoader()
-            )
+            cppuhelper_bootstrap(ini_file, pairs, Bootstrap.class.getClassLoader())
         );
     }
 
@@ -354,8 +291,7 @@ private static native Object cppuhelper_bootstrap(
      * @throws BootstrapException if things go awry.
      * @since UDK 3.1.0
      */
-    public static XComponentContext bootstrap(Path ooPath)
-        throws BootstrapException {
+    public static XComponentContext bootstrap(Path ooPath) throws BootstrapException {
         String[] defaultArgArray = getDefaultOptions();
         return bootstrap(defaultArgArray, ooPath);
     }
@@ -396,8 +332,7 @@ public static XComponentContext bootstrap(String[] argArray, Path path)
             pipe(p.getErrorStream(), System.err, "CE> ");
 
             // initial service manager
-            XMultiComponentFactory xLocalServiceManager =
-                xLocalContext.getServiceManager();
+            XMultiComponentFactory xLocalServiceManager = xLocalContext.getServiceManager();
             if (xLocalServiceManager == null) {
                 throw new BootstrapException("no initial service manager!");
             }
@@ -407,19 +342,14 @@ public static XComponentContext bootstrap(String[] argArray, Path path)
 
             // connection string
             String sConnect =
-                "uno:socket,host=localhost,port=2083" +
-                ";urp;StarOffice.ComponentContext";
+                "uno:socket,host=localhost,port=2083" + ";urp;StarOffice.ComponentContext";
 
             // wait until office is started
             for (int i = 0;; ++i) {
                 try {
                     // try to connect to office
                     Object context = xUrlResolver.resolve(sConnect);
-                    xContext =
-                        UnoRuntime.queryInterface(
-                            XComponentContext.class,
-                            context
-                        );
+                    xContext = UnoRuntime.queryInterface(XComponentContext.class, context);
                     if (xContext == null) {
                         throw new BootstrapException("no component context!");
                     }
@@ -444,11 +374,7 @@ public static XComponentContext bootstrap(String[] argArray, Path path)
         return xContext;
     }
 
-    private static void pipe(
-        final InputStream in,
-        final PrintStream out,
-        final String prefix
-    ) {
+    private static void pipe(final InputStream in, final PrintStream out, final String prefix) {
         new Thread("Pipe: " + prefix) {
             @Override
             public void run() {
diff --git a/src/main/java/org/jabref/gui/openoffice/CitationEntryViewModel.java b/src/main/java/org/jabref/gui/openoffice/CitationEntryViewModel.java
index fadd14b595f..a8a9c959f18 100644
--- a/src/main/java/org/jabref/gui/openoffice/CitationEntryViewModel.java
+++ b/src/main/java/org/jabref/gui/openoffice/CitationEntryViewModel.java
@@ -7,16 +7,10 @@
 public class CitationEntryViewModel {
 
     private final StringProperty citation = new SimpleStringProperty("");
-    private final StringProperty extraInformation = new SimpleStringProperty(
-        ""
-    );
+    private final StringProperty extraInformation = new SimpleStringProperty("");
     private final String refMarkName;
 
-    public CitationEntryViewModel(
-        String refMarkName,
-        String citation,
-        String extraInfo
-    ) {
+    public CitationEntryViewModel(String refMarkName, String citation, String extraInfo) {
         this.refMarkName = refMarkName;
         this.citation.setValue(citation);
         this.extraInformation.setValue(extraInfo);
@@ -31,11 +25,7 @@ public CitationEntryViewModel(CitationEntry citationEntry) {
     }
 
     public CitationEntry toCitationEntry() {
-        return new CitationEntry(
-            refMarkName,
-            citation.getValue(),
-            extraInformation.getValue()
-        );
+        return new CitationEntry(refMarkName, citation.getValue(), extraInformation.getValue());
     }
 
     public StringProperty citationProperty() {
diff --git a/src/main/java/org/jabref/gui/openoffice/DetectOpenOfficeInstallation.java b/src/main/java/org/jabref/gui/openoffice/DetectOpenOfficeInstallation.java
index 0e7b2dac8d9..59b1c631805 100644
--- a/src/main/java/org/jabref/gui/openoffice/DetectOpenOfficeInstallation.java
+++ b/src/main/java/org/jabref/gui/openoffice/DetectOpenOfficeInstallation.java
@@ -37,9 +37,7 @@ public Optional<Path> selectInstallationPath() {
         final NativeDesktop nativeDesktop = OS.getNativeDesktop();
 
         dialogService.showInformationDialogAndWait(
-            Localization.lang(
-                "Could not find OpenOffice/LibreOffice installation"
-            ),
+            Localization.lang("Could not find OpenOffice/LibreOffice installation"),
             Localization.lang(
                 "Unable to autodetect OpenOffice/LibreOffice installation. Please choose the installation directory manually."
             )
@@ -48,47 +46,30 @@ public Optional<Path> selectInstallationPath() {
             new DirectoryDialogConfiguration.Builder()
                 .withInitialDirectory(nativeDesktop.getApplicationDirectory())
                 .build();
-        return dialogService.showDirectorySelectionDialog(
-            dirDialogConfiguration
-        );
+        return dialogService.showDirectorySelectionDialog(dirDialogConfiguration);
     }
 
     /**
      * Checks whether the executablePath exists
      */
-    private boolean checkAutoDetectedPaths(
-        OpenOfficePreferences openOfficePreferences
-    ) {
+    private boolean checkAutoDetectedPaths(OpenOfficePreferences openOfficePreferences) {
         String executablePath = openOfficePreferences.getExecutablePath();
 
         if (OS.LINUX && (System.getenv("FLATPAK_SANDBOX_DIR") != null)) {
-            executablePath =
-                OpenOfficePreferences.DEFAULT_LINUX_FLATPAK_EXEC_PATH;
+            executablePath = OpenOfficePreferences.DEFAULT_LINUX_FLATPAK_EXEC_PATH;
         }
-        return (
-            !StringUtil.isNullOrEmpty(executablePath) &&
-            Files.exists(Path.of(executablePath))
-        );
+        return (!StringUtil.isNullOrEmpty(executablePath) && Files.exists(Path.of(executablePath)));
     }
 
     public boolean setOpenOfficePreferences(Path installDir) {
         Optional<Path> execPath = Optional.empty();
 
         if (OS.WINDOWS) {
-            execPath =
-                FileUtil.find(
-                    OpenOfficePreferences.WINDOWS_EXECUTABLE,
-                    installDir
-                );
+            execPath = FileUtil.find(OpenOfficePreferences.WINDOWS_EXECUTABLE, installDir);
         } else if (OS.OS_X) {
-            execPath =
-                FileUtil.find(OpenOfficePreferences.OSX_EXECUTABLE, installDir);
+            execPath = FileUtil.find(OpenOfficePreferences.OSX_EXECUTABLE, installDir);
         } else if (OS.LINUX) {
-            execPath =
-                FileUtil.find(
-                    OpenOfficePreferences.LINUX_EXECUTABLE,
-                    installDir
-                );
+            execPath = FileUtil.find(OpenOfficePreferences.LINUX_EXECUTABLE, installDir);
         }
 
         if (execPath.isPresent()) {
@@ -110,9 +91,7 @@ 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."
-            ) +
+            Localization.lang("Found more than one OpenOffice/LibreOffice executable.") +
             "\n" +
             Localization.lang("Please choose which one to connect to:"),
             Localization.lang("Use selected instance"),
diff --git a/src/main/java/org/jabref/gui/openoffice/ManageCitationsDialogView.java b/src/main/java/org/jabref/gui/openoffice/ManageCitationsDialogView.java
index fb7606cd8b6..3b1a106a1b2 100644
--- a/src/main/java/org/jabref/gui/openoffice/ManageCitationsDialogView.java
+++ b/src/main/java/org/jabref/gui/openoffice/ManageCitationsDialogView.java
@@ -57,26 +57,19 @@ public ManageCitationsDialogView(OOBibBase ooBase) {
     private void initialize() {
         viewModel = new ManageCitationsDialogViewModel(ooBase, dialogService);
 
-        citation.setCellValueFactory(cellData ->
-            cellData.getValue().citationProperty()
-        );
+        citation.setCellValueFactory(cellData -> cellData.getValue().citationProperty());
         new ValueTableCellFactory<CitationEntryViewModel, String>()
             .withGraphic(this::getText)
             .install(citation);
 
-        extraInfo.setCellValueFactory(cellData ->
-            cellData.getValue().extraInformationProperty()
-        );
+        extraInfo.setCellValueFactory(cellData -> cellData.getValue().extraInformationProperty());
         extraInfo.setEditable(true);
 
         citationsTableView.setEditable(true);
 
-        citationsTableView
-            .itemsProperty()
-            .bindBidirectional(viewModel.citationsProperty());
+        citationsTableView.itemsProperty().bindBidirectional(viewModel.citationsProperty());
 
-        extraInfo.setOnEditCommit(
-                (CellEditEvent<CitationEntryViewModel, String> cell) ->
+        extraInfo.setOnEditCommit((CellEditEvent<CitationEntryViewModel, String> cell) ->
             cell.getRowValue().setExtraInfo(cell.getNewValue())
         );
         extraInfo.setCellFactory(TextFieldTableCell.forTableColumn());
@@ -88,13 +81,9 @@ private Node getText(String citationContext) {
             HTML_BOLD_START_TAG,
             HTML_BOLD_END_TAG
         );
-        String start = citationContext.substring(
-            0,
-            citationContext.indexOf(HTML_BOLD_START_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()
+            citationContext.lastIndexOf(HTML_BOLD_END_TAG) + HTML_BOLD_END_TAG.length()
         );
 
         Text startText = new Text(start);
diff --git a/src/main/java/org/jabref/gui/openoffice/ManageCitationsDialogViewModel.java b/src/main/java/org/jabref/gui/openoffice/ManageCitationsDialogViewModel.java
index 3834714dba3..e50a67fcc5b 100644
--- a/src/main/java/org/jabref/gui/openoffice/ManageCitationsDialogViewModel.java
+++ b/src/main/java/org/jabref/gui/openoffice/ManageCitationsDialogViewModel.java
@@ -12,28 +12,24 @@
 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;
 
-    public ManageCitationsDialogViewModel(
-        OOBibBase ooBase,
-        DialogService dialogService
-    ) {
+    public ManageCitationsDialogViewModel(OOBibBase ooBase, DialogService dialogService) {
         this.ooBase = ooBase;
         this.dialogService = dialogService;
 
-        Optional<List<CitationEntry>> citationEntries =
-            ooBase.guiActionGetCitationEntries();
+        Optional<List<CitationEntry>> citationEntries = ooBase.guiActionGetCitationEntries();
         this.failedToGetCitationEntries = citationEntries.isEmpty();
         if (citationEntries.isEmpty()) {
             return;
         }
 
         for (CitationEntry entry : citationEntries.get()) {
-            CitationEntryViewModel itemViewModelEntry =
-                new CitationEntryViewModel(entry);
+            CitationEntryViewModel itemViewModelEntry = new CitationEntryViewModel(entry);
             citations.add(itemViewModelEntry);
         }
     }
diff --git a/src/main/java/org/jabref/gui/openoffice/OOBibBase.java b/src/main/java/org/jabref/gui/openoffice/OOBibBase.java
index 0317cdc0140..1dda5bc36a3 100644
--- a/src/main/java/org/jabref/gui/openoffice/OOBibBase.java
+++ b/src/main/java/org/jabref/gui/openoffice/OOBibBase.java
@@ -53,9 +53,7 @@
  */
 class OOBibBase {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(
-        OOBibBase.class
-    );
+    private static final Logger LOGGER = LoggerFactory.getLogger(OOBibBase.class);
 
     private final DialogService dialogService;
 
@@ -84,20 +82,10 @@ public void guiActionSelectDocument(boolean autoSelectForSingle) {
         } catch (NoDocumentFoundException ex) {
             OOError.from(ex).showErrorDialog(dialogService);
         } catch (DisposedException ex) {
-            OOError
-                .from(ex)
-                .setTitle(errorTitle)
-                .showErrorDialog(dialogService);
-        } catch (
-            WrappedTargetException
-            | IndexOutOfBoundsException
-            | NoSuchElementException ex
-        ) {
+            OOError.from(ex).setTitle(errorTitle).showErrorDialog(dialogService);
+        } catch (WrappedTargetException | IndexOutOfBoundsException | NoSuchElementException ex) {
             LOGGER.warn("Problem connecting", ex);
-            OOError
-                .fromMisc(ex)
-                .setTitle(errorTitle)
-                .showErrorDialog(dialogService);
+            OOError.fromMisc(ex).setTitle(errorTitle).showErrorDialog(dialogService);
         }
 
         if (this.isConnectedToDocument()) {
@@ -153,10 +141,7 @@ void showDialog(String errorTitle, OOError err) {
         err.setTitle(errorTitle).showErrorDialog(dialogService);
     }
 
-    OOVoidResult<OOError> collectResults(
-        String errorTitle,
-        List<OOVoidResult<OOError>> results
-    ) {
+    OOVoidResult<OOError> collectResults(String errorTitle, List<OOVoidResult<OOError>> results) {
         String msg = results
             .stream()
             .filter(OOVoidResult::isError)
@@ -182,10 +167,7 @@ boolean testDialog(String errorTitle, List<OOVoidResult<OOError>> results) {
     }
 
     @SafeVarargs
-    final boolean testDialog(
-        String errorTitle,
-        OOVoidResult<OOError>... results
-    ) {
+    final boolean testDialog(String errorTitle, OOVoidResult<OOError>... results) {
         List<OOVoidResult<OOError>> resultList = Arrays.asList(results);
         return testDialog(collectResults(errorTitle, resultList));
     }
@@ -207,13 +189,10 @@ OOResult<XTextCursor, OOError> getUserCursorForTextInsertion(
         } catch (com.sun.star.uno.RuntimeException ex) {
             String msg =
                 Localization.lang(
-                    "Please move the cursor" +
-                    " to the location for the new citation."
+                    "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("I cannot insert to the cursor's current location.");
             return OOResult.error(new OOError(errorTitle, msg, ex));
         }
         return OOResult.ok(cursor);
@@ -227,23 +206,18 @@ OOResult<FunctionalTextViewCursor, OOError> getFunctionalTextViewCursor(
         String errorTitle
     ) {
         String messageOnFailureToObtain =
-            Localization.lang(
-                "Please move the cursor into the document text."
-            ) +
+            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."
             );
-        OOResult<FunctionalTextViewCursor, String> result =
-            FunctionalTextViewCursor.get(doc);
+        OOResult<FunctionalTextViewCursor, String> result = FunctionalTextViewCursor.get(doc);
         if (result.isError()) {
             LOGGER.warn(result.getError());
         }
-        return result.mapError(detail ->
-            new OOError(errorTitle, messageOnFailureToObtain)
-        );
+        return result.mapError(detail -> new OOError(errorTitle, messageOnFailureToObtain));
     }
 
     private static OOVoidResult<OOError> checkRangeOverlaps(
@@ -255,19 +229,12 @@ private static OOVoidResult<OOError> checkRangeOverlaps(
         int maxReportedOverlaps = 10;
         try {
             return frontend
-                .checkRangeOverlaps(
-                    doc,
-                    new ArrayList<>(),
-                    requireSeparation,
-                    maxReportedOverlaps
-                )
+                .checkRangeOverlaps(doc, new ArrayList<>(), requireSeparation, maxReportedOverlaps)
                 .mapError(OOError::from);
         } catch (NoDocumentException ex) {
             return OOVoidResult.error(OOError.from(ex).setTitle(errorTitle));
         } catch (WrappedTargetException ex) {
-            return OOVoidResult.error(
-                OOError.fromMisc(ex).setTitle(errorTitle)
-            );
+            return OOVoidResult.error(OOError.fromMisc(ex).setTitle(errorTitle));
         }
     }
 
@@ -283,29 +250,17 @@ private static OOVoidResult<OOError> checkRangeOverlapsWithCursor(
         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) {
-            return OOVoidResult.error(
-                OOError.fromMisc(ex).setTitle(errorTitle)
-            );
+            return OOVoidResult.error(OOError.fromMisc(ex).setTitle(errorTitle));
         }
 
         if (res.isError()) {
-            final String xtitle = Localization.lang(
-                "The cursor is in a protected area."
-            );
+            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);
@@ -317,12 +272,8 @@ private static OOVoidResult<OOError> checkRangeOverlapsWithCursor(
      *
      * ******************************************************/
 
-    private static OOVoidResult<OOError> checkIfOpenOfficeIsRecordingChanges(
-        XTextDocument doc
-    ) {
-        String errorTitle = Localization.lang(
-            "Recording and/or Recorded changes"
-        );
+    private static OOVoidResult<OOError> checkIfOpenOfficeIsRecordingChanges(XTextDocument doc) {
+        String errorTitle = Localization.lang("Recording and/or Recorded changes");
         try {
             boolean recordingChanges = UnoRedlines.getRecordChanges(doc);
             int nRedlines = UnoRedlines.countRedlines(doc);
@@ -331,8 +282,7 @@ private static OOVoidResult<OOError> checkIfOpenOfficeIsRecordingChanges(
                 if (recordingChanges) {
                     msg +=
                     Localization.lang(
-                        "Cannot work with" +
-                        " [Edit]/[Track Changes]/[Record] turned on."
+                        "Cannot work with" + " [Edit]/[Track Changes]/[Record] turned on."
                     );
                 }
                 if (nRedlines > 0) {
@@ -347,16 +297,13 @@ private static OOVoidResult<OOError> checkIfOpenOfficeIsRecordingChanges(
                     );
                     msg += "\n";
                     msg +=
-                    Localization.lang(
-                        "Use [Edit]/[Track Changes]/[Manage] to resolve them first."
-                    );
+                    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."
+                "Error while checking if Writer" + " is recording changes or has recorded changes."
             );
             return OOVoidResult.error(new OOError(errorTitle, msg, ex));
         }
@@ -382,10 +329,7 @@ OOResult<OOFrontend, OOError> getFrontend(XTextDocument doc) {
         }
     }
 
-    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 {
@@ -414,11 +358,7 @@ private OOVoidResult<OOError> checkStyleExistsInTheDocument(
         String labelInJstyleFile,
         String pathToStyleFile
     ) throws WrappedTargetException {
-        Optional<String> internalName = UnoStyle.getInternalNameOfStyle(
-            doc,
-            familyName,
-            styleName
-        );
+        Optional<String> internalName = UnoStyle.getInternalNameOfStyle(doc, familyName, styleName);
 
         if (internalName.isEmpty()) {
             String msg =
@@ -442,9 +382,7 @@ private OOVoidResult<OOError> checkStyleExistsInTheDocument(
                     );
                 } +
                 "\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));
@@ -480,9 +418,7 @@ private OOVoidResult<OOError> checkStyleExistsInTheDocument(
                 ) +
                 "\n" +
                 pathToStyleFile;
-            return OOVoidResult.error(
-                new OOError("StyleNameIsNotInternal", msg)
-            );
+            return OOVoidResult.error(new OOError("StyleNameIsNotInternal", msg));
         }
         return OOVoidResult.ok();
     }
@@ -527,11 +463,7 @@ public OOVoidResult<OOError> checkStylesExistInTheDocument(
         } catch (WrappedTargetException ex) {
             results.add(
                 OOVoidResult.error(
-                    new OOError(
-                        "Other error in checkStyleExistsInTheDocument",
-                        ex.getMessage(),
-                        ex
-                    )
+                    new OOError("Other error in checkStyleExistsInTheDocument", ex.getMessage(), ex)
                 )
             );
         }
@@ -546,9 +478,7 @@ public OOVoidResult<OOError> checkStylesExistInTheDocument(
      * ******************************************************/
     public Optional<List<CitationEntry>> guiActionGetCitationEntries() {
         final Optional<List<CitationEntry>> FAIL = Optional.empty();
-        final String errorTitle = Localization.lang(
-            "Problem collecting citations"
-        );
+        final String errorTitle = Localization.lang("Problem collecting citations");
 
         OOResult<XTextDocument, OOError> odoc = getXTextDocument();
         if (testDialog(errorTitle, odoc.asVoidResult())) {
@@ -564,23 +494,14 @@ public Optional<List<CitationEntry>> guiActionGetCitationEntries() {
         try {
             return Optional.of(ManageCitations.getCitationEntries(doc));
         } catch (NoDocumentException ex) {
-            OOError
-                .from(ex)
-                .setTitle(errorTitle)
-                .showErrorDialog(dialogService);
+            OOError.from(ex).setTitle(errorTitle).showErrorDialog(dialogService);
             return FAIL;
         } catch (DisposedException ex) {
-            OOError
-                .from(ex)
-                .setTitle(errorTitle)
-                .showErrorDialog(dialogService);
+            OOError.from(ex).setTitle(errorTitle).showErrorDialog(dialogService);
             return FAIL;
         } catch (WrappedTargetException ex) {
             LOGGER.warn(errorTitle, ex);
-            OOError
-                .fromMisc(ex)
-                .setTitle(errorTitle)
-                .showErrorDialog(dialogService);
+            OOError.fromMisc(ex).setTitle(errorTitle).showErrorDialog(dialogService);
             return FAIL;
         }
     }
@@ -604,12 +525,8 @@ public Optional<List<CitationEntry>> guiActionGetCitationEntries() {
      *      citation from the text).</li>
      * </ul>
      */
-    public void guiActionApplyCitationEntries(
-        List<CitationEntry> citationEntries
-    ) {
-        final String errorTitle = Localization.lang(
-            "Problem modifying citation"
-        );
+    public void guiActionApplyCitationEntries(List<CitationEntry> citationEntries) {
+        final String errorTitle = Localization.lang("Problem modifying citation");
 
         OOResult<XTextDocument, OOError> odoc = getXTextDocument();
         if (testDialog(errorTitle, odoc.asVoidResult())) {
@@ -620,15 +537,9 @@ public void guiActionApplyCitationEntries(
         try {
             ManageCitations.applyCitationEntries(doc, citationEntries);
         } catch (NoDocumentException ex) {
-            OOError
-                .from(ex)
-                .setTitle(errorTitle)
-                .showErrorDialog(dialogService);
+            OOError.from(ex).setTitle(errorTitle).showErrorDialog(dialogService);
         } catch (DisposedException ex) {
-            OOError
-                .from(ex)
-                .setTitle(errorTitle)
-                .showErrorDialog(dialogService);
+            OOError.from(ex).setTitle(errorTitle).showErrorDialog(dialogService);
         } catch (
             PropertyVetoException
             | IllegalTypeException
@@ -636,10 +547,7 @@ public void guiActionApplyCitationEntries(
             | com.sun.star.lang.IllegalArgumentException ex
         ) {
             LOGGER.warn(errorTitle, ex);
-            OOError
-                .fromMisc(ex)
-                .setTitle(errorTitle)
-                .showErrorDialog(dialogService);
+            OOError.fromMisc(ex).setTitle(errorTitle).showErrorDialog(dialogService);
         }
     }
 
@@ -675,10 +583,7 @@ public void guiActionInsertEntry(
                 errorTitle,
                 odoc.asVoidResult(),
                 styleIsRequired(style),
-                selectedBibEntryIsRequired(
-                    entries,
-                    OOError::noEntriesSelectedForCitation
-                )
+                selectedBibEntryIsRequired(entries, OOError::noEntriesSelectedForCitation)
             )
         ) {
             return;
@@ -690,20 +595,12 @@ public void guiActionInsertEntry(
             return;
         }
 
-        OOResult<XTextCursor, OOError> cursor = getUserCursorForTextInsertion(
-            doc,
-            errorTitle
-        );
+        OOResult<XTextCursor, OOError> cursor = getUserCursorForTextInsertion(doc, errorTitle);
         if (testDialog(errorTitle, cursor.asVoidResult())) {
             return;
         }
 
-        if (
-            testDialog(
-                errorTitle,
-                checkRangeOverlapsWithCursor(doc, frontend.get())
-            )
-        ) {
+        if (testDialog(errorTitle, checkRangeOverlapsWithCursor(doc, frontend.get()))) {
             return;
         }
 
@@ -729,11 +626,7 @@ public void guiActionInsertEntry(
         }
 
         syncOptions
-            .map(e ->
-                e.setUpdateBibliography(
-                    this.refreshBibliographyDuringSyncWhenCiting
-                )
-            )
+            .map(e -> e.setUpdateBibliography(this.refreshBibliographyDuringSyncWhenCiting))
             .map(e -> e.setAlwaysAddCitedOnPages(this.alwaysAddCitedOnPages));
 
         if (syncOptions.isPresent()) {
@@ -764,23 +657,12 @@ public void guiActionInsertEntry(
             );
 
             if (syncOptions.isPresent()) {
-                Update.resyncDocument(
-                    doc,
-                    style,
-                    fcursor.get(),
-                    syncOptions.get()
-                );
+                Update.resyncDocument(doc, style, fcursor.get(), syncOptions.get());
             }
         } catch (NoDocumentException ex) {
-            OOError
-                .from(ex)
-                .setTitle(errorTitle)
-                .showErrorDialog(dialogService);
+            OOError.from(ex).setTitle(errorTitle).showErrorDialog(dialogService);
         } catch (DisposedException ex) {
-            OOError
-                .from(ex)
-                .setTitle(errorTitle)
-                .showErrorDialog(dialogService);
+            OOError.from(ex).setTitle(errorTitle).showErrorDialog(dialogService);
         } catch (
             CreationException
             | IllegalTypeException
@@ -789,10 +671,7 @@ public void guiActionInsertEntry(
             | WrappedTargetException ex
         ) {
             LOGGER.warn("Could not insert entry", ex);
-            OOError
-                .fromMisc(ex)
-                .setTitle(errorTitle)
-                .showErrorDialog(dialogService);
+            OOError.fromMisc(ex).setTitle(errorTitle).showErrorDialog(dialogService);
         } finally {
             UnoUndo.leaveUndoContext(doc);
         }
@@ -801,13 +680,8 @@ public void guiActionInsertEntry(
     /**
      * GUI action "Merge citations"
      */
-    public void guiActionMergeCitationGroups(
-        List<BibDatabase> databases,
-        OOBibStyle style
-    ) {
-        final String errorTitle = Localization.lang(
-            "Problem combining cite markers"
-        );
+    public void guiActionMergeCitationGroups(List<BibDatabase> databases, OOBibStyle style) {
+        final String errorTitle = Localization.lang("Problem combining cite markers");
 
         OOResult<XTextDocument, OOError> odoc = getXTextDocument();
         if (
@@ -822,8 +696,10 @@ public void guiActionMergeCitationGroups(
         }
         XTextDocument doc = odoc.get();
 
-        OOResult<FunctionalTextViewCursor, OOError> fcursor =
-            getFunctionalTextViewCursor(doc, errorTitle);
+        OOResult<FunctionalTextViewCursor, OOError> fcursor = getFunctionalTextViewCursor(
+            doc,
+            errorTitle
+        );
 
         if (
             testDialog(
@@ -840,28 +716,16 @@ public void guiActionMergeCitationGroups(
             UnoUndo.enterUndoContext(doc, "Merge citations");
 
             OOFrontend frontend = new OOFrontend(doc);
-            boolean madeModifications = EditMerge.mergeCitationGroups(
-                doc,
-                frontend,
-                style
-            );
+            boolean madeModifications = EditMerge.mergeCitationGroups(doc, frontend, style);
             if (madeModifications) {
                 UnoCrossRef.refresh(doc);
-                Update.SyncOptions syncOptions = new Update.SyncOptions(
-                    databases
-                );
+                Update.SyncOptions syncOptions = new Update.SyncOptions(databases);
                 Update.resyncDocument(doc, style, fcursor.get(), syncOptions);
             }
         } catch (NoDocumentException ex) {
-            OOError
-                .from(ex)
-                .setTitle(errorTitle)
-                .showErrorDialog(dialogService);
+            OOError.from(ex).setTitle(errorTitle).showErrorDialog(dialogService);
         } catch (DisposedException ex) {
-            OOError
-                .from(ex)
-                .setTitle(errorTitle)
-                .showErrorDialog(dialogService);
+            OOError.from(ex).setTitle(errorTitle).showErrorDialog(dialogService);
         } catch (
             CreationException
             | IllegalTypeException
@@ -871,10 +735,7 @@ public void guiActionMergeCitationGroups(
             | com.sun.star.lang.IllegalArgumentException ex
         ) {
             LOGGER.warn("Problem combining cite markers", ex);
-            OOError
-                .fromMisc(ex)
-                .setTitle(errorTitle)
-                .showErrorDialog(dialogService);
+            OOError.fromMisc(ex).setTitle(errorTitle).showErrorDialog(dialogService);
         } finally {
             UnoUndo.leaveUndoContext(doc);
             fcursor.get().restore(doc);
@@ -886,13 +747,8 @@ public void guiActionMergeCitationGroups(
      * <p>
      * Do the opposite of MergeCitationGroups. Combined markers are split, with a space inserted between.
      */
-    public void guiActionSeparateCitations(
-        List<BibDatabase> databases,
-        OOBibStyle style
-    ) {
-        final String errorTitle = Localization.lang(
-            "Problem during separating cite markers"
-        );
+    public void guiActionSeparateCitations(List<BibDatabase> databases, OOBibStyle style) {
+        final String errorTitle = Localization.lang("Problem during separating cite markers");
 
         OOResult<XTextDocument, OOError> odoc = getXTextDocument();
         if (
@@ -907,8 +763,10 @@ public void guiActionSeparateCitations(
         }
 
         XTextDocument doc = odoc.get();
-        OOResult<FunctionalTextViewCursor, OOError> fcursor =
-            getFunctionalTextViewCursor(doc, errorTitle);
+        OOResult<FunctionalTextViewCursor, OOError> fcursor = getFunctionalTextViewCursor(
+            doc,
+            errorTitle
+        );
 
         if (
             testDialog(
@@ -933,21 +791,13 @@ public void guiActionSeparateCitations(
             );
             if (madeModifications) {
                 UnoCrossRef.refresh(doc);
-                Update.SyncOptions syncOptions = new Update.SyncOptions(
-                    databases
-                );
+                Update.SyncOptions syncOptions = new Update.SyncOptions(databases);
                 Update.resyncDocument(doc, style, fcursor.get(), syncOptions);
             }
         } catch (NoDocumentException ex) {
-            OOError
-                .from(ex)
-                .setTitle(errorTitle)
-                .showErrorDialog(dialogService);
+            OOError.from(ex).setTitle(errorTitle).showErrorDialog(dialogService);
         } catch (DisposedException ex) {
-            OOError
-                .from(ex)
-                .setTitle(errorTitle)
-                .showErrorDialog(dialogService);
+            OOError.from(ex).setTitle(errorTitle).showErrorDialog(dialogService);
         } catch (
             CreationException
             | IllegalTypeException
@@ -957,10 +807,7 @@ public void guiActionSeparateCitations(
             | com.sun.star.lang.IllegalArgumentException ex
         ) {
             LOGGER.warn("Problem during separating cite markers", ex);
-            OOError
-                .fromMisc(ex)
-                .setTitle(errorTitle)
-                .showErrorDialog(dialogService);
+            OOError.fromMisc(ex).setTitle(errorTitle).showErrorDialog(dialogService);
         } finally {
             UnoUndo.leaveUndoContext(doc);
             fcursor.get().restore(doc);
@@ -979,19 +826,14 @@ public Optional<BibDatabase> exportCitedHelper(
         boolean returnPartialResult
     ) {
         final Optional<BibDatabase> FAIL = Optional.empty();
-        final String errorTitle = Localization.lang(
-            "Unable to generate new library"
-        );
+        final String errorTitle = Localization.lang("Unable to generate new library");
 
         OOResult<XTextDocument, OOError> odoc = getXTextDocument();
         if (
             testDialog(
                 errorTitle,
                 odoc.asVoidResult(),
-                databaseIsRequired(
-                    databases,
-                    OOError::noDataBaseIsOpenForExport
-                )
+                databaseIsRequired(databases, OOError::noDataBaseIsOpenForExport)
             )
         ) {
             return FAIL;
@@ -1001,10 +843,7 @@ public Optional<BibDatabase> exportCitedHelper(
         try {
             ExportCited.GenerateDatabaseResult result;
             try {
-                UnoUndo.enterUndoContext(
-                    doc,
-                    "Changes during \"Export cited\""
-                );
+                UnoUndo.enterUndoContext(doc, "Changes during \"Export cited\"");
                 result = ExportCited.generateDatabase(doc, databases);
             } finally {
                 // There should be no changes, thus no Undo entry should appear
@@ -1047,19 +886,10 @@ public Optional<BibDatabase> exportCitedHelper(
         } catch (NoDocumentException ex) {
             OOError.from(ex).showErrorDialog(dialogService);
         } catch (DisposedException ex) {
-            OOError
-                .from(ex)
-                .setTitle(errorTitle)
-                .showErrorDialog(dialogService);
-        } catch (
-            WrappedTargetException
-            | com.sun.star.lang.IllegalArgumentException ex
-        ) {
+            OOError.from(ex).setTitle(errorTitle).showErrorDialog(dialogService);
+        } catch (WrappedTargetException | com.sun.star.lang.IllegalArgumentException ex) {
             LOGGER.warn("Problem generating new database.", ex);
-            OOError
-                .fromMisc(ex)
-                .setTitle(errorTitle)
-                .showErrorDialog(dialogService);
+            OOError.fromMisc(ex).setTitle(errorTitle).showErrorDialog(dialogService);
         }
         return FAIL;
     }
@@ -1070,30 +900,21 @@ public Optional<BibDatabase> exportCitedHelper(
      * @param databases Must have at least one.
      * @param style     Style.
      */
-    public void guiActionUpdateDocument(
-        List<BibDatabase> databases,
-        OOBibStyle style
-    ) {
-        final String errorTitle = Localization.lang(
-            "Unable to synchronize bibliography"
-        );
+    public void guiActionUpdateDocument(List<BibDatabase> databases, OOBibStyle style) {
+        final String errorTitle = Localization.lang("Unable to synchronize bibliography");
 
         try {
             OOResult<XTextDocument, OOError> odoc = getXTextDocument();
-            if (
-                testDialog(
-                    errorTitle,
-                    odoc.asVoidResult(),
-                    styleIsRequired(style)
-                )
-            ) {
+            if (testDialog(errorTitle, odoc.asVoidResult(), styleIsRequired(style))) {
                 return;
             }
 
             XTextDocument doc = odoc.get();
 
-            OOResult<FunctionalTextViewCursor, OOError> fcursor =
-                getFunctionalTextViewCursor(doc, errorTitle);
+            OOResult<FunctionalTextViewCursor, OOError> fcursor = getFunctionalTextViewCursor(
+                doc,
+                errorTitle
+            );
 
             if (
                 testDialog(
@@ -1115,21 +936,13 @@ public void guiActionUpdateDocument(
             try {
                 UnoUndo.enterUndoContext(doc, "Refresh bibliography");
 
-                Update.SyncOptions syncOptions = new Update.SyncOptions(
-                    databases
-                );
+                Update.SyncOptions syncOptions = new Update.SyncOptions(databases);
                 syncOptions
                     .setUpdateBibliography(true)
                     .setAlwaysAddCitedOnPages(this.alwaysAddCitedOnPages);
 
                 unresolvedKeys =
-                    Update.synchronizeDocument(
-                        doc,
-                        frontend,
-                        style,
-                        fcursor.get(),
-                        syncOptions
-                    );
+                    Update.synchronizeDocument(doc, frontend, style, fcursor.get(), syncOptions);
             } finally {
                 UnoUndo.leaveUndoContext(doc);
                 fcursor.get().restore(doc);
@@ -1144,25 +957,16 @@ public void guiActionUpdateDocument(
                 dialogService.showErrorDialogAndWait(errorTitle, msg);
             }
         } catch (NoDocumentException ex) {
-            OOError
-                .from(ex)
-                .setTitle(errorTitle)
-                .showErrorDialog(dialogService);
+            OOError.from(ex).setTitle(errorTitle).showErrorDialog(dialogService);
         } catch (DisposedException ex) {
-            OOError
-                .from(ex)
-                .setTitle(errorTitle)
-                .showErrorDialog(dialogService);
+            OOError.from(ex).setTitle(errorTitle).showErrorDialog(dialogService);
         } catch (
             CreationException
             | WrappedTargetException
             | com.sun.star.lang.IllegalArgumentException ex
         ) {
             LOGGER.warn("Could not update bibliography", ex);
-            OOError
-                .fromMisc(ex)
-                .setTitle(errorTitle)
-                .showErrorDialog(dialogService);
+            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 2d63c0df110..9a27d58700e 100644
--- a/src/main/java/org/jabref/gui/openoffice/OOBibBaseConnect.java
+++ b/src/main/java/org/jabref/gui/openoffice/OOBibBaseConnect.java
@@ -35,9 +35,7 @@
  */
 public class OOBibBaseConnect {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(
-        OOBibBaseConnect.class
-    );
+    private static final Logger LOGGER = LoggerFactory.getLogger(OOBibBaseConnect.class);
 
     private final DialogService dialogService;
     private final XDesktop xDesktop;
@@ -55,8 +53,7 @@ public OOBibBaseConnect(Path loPath, 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);
         XMultiComponentFactory sem = context.getServiceManager();
@@ -65,11 +62,7 @@ private XDesktop simpleBootstrap(Path loPath)
         // hierarchy of frames that contain viewable components:
         Object desktop;
         try {
-            desktop =
-                sem.createInstanceWithContext(
-                    "com.sun.star.frame.Desktop",
-                    context
-                );
+            desktop = sem.createInstanceWithContext("com.sun.star.frame.Desktop", context);
         } catch (com.sun.star.uno.Exception e) {
             throw new CreationException(e.getMessage());
         }
@@ -96,10 +89,7 @@ public static void closeOfficeConnection() {
                 }
             }
         } catch (Exception ex) {
-            LOGGER.error(
-                "Exception disposing office process connection bridge",
-                ex
-            );
+            LOGGER.error("Exception disposing office process connection bridge", ex);
         }
     }
 
@@ -113,10 +103,7 @@ private static List<XTextDocument> getTextDocuments(XDesktop desktop)
         while (compEnum.hasMoreElements()) {
             Object next = compEnum.nextElement();
             XComponent comp = UnoCast.cast(XComponent.class, next).get();
-            Optional<XTextDocument> doc = UnoCast.cast(
-                XTextDocument.class,
-                comp
-            );
+            Optional<XTextDocument> doc = UnoCast.cast(XTextDocument.class, comp);
             doc.ifPresent(result::add);
         }
         return result;
@@ -138,8 +125,7 @@ class DocumentTitleViewModel {
 
             public DocumentTitleViewModel(XTextDocument xTextDocument) {
                 this.xTextDocument = xTextDocument;
-                this.description =
-                    UnoTextDocument.getFrameTitle(xTextDocument).orElse("");
+                this.description = UnoTextDocument.getFrameTitle(xTextDocument).orElse("");
             }
 
             public XTextDocument getXtextDocument() {
@@ -160,17 +146,14 @@ public String toString() {
         // 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);
+        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);
     }
 
     /**
@@ -193,11 +176,7 @@ public void selectDocument(boolean autoSelectForSingle)
         } else if ((textDocumentList.size() == 1) && autoSelectForSingle) {
             selected = textDocumentList.get(0); // Get the only one
         } else { // Bring up a dialog
-            selected =
-                OOBibBaseConnect.selectDocumentDialog(
-                    textDocumentList,
-                    this.dialogService
-                );
+            selected = OOBibBaseConnect.selectDocumentDialog(textDocumentList, this.dialogService);
         }
 
         if (selected == null) {
diff --git a/src/main/java/org/jabref/gui/openoffice/OOError.java b/src/main/java/org/jabref/gui/openoffice/OOError.java
index 71575c67a31..773467bd6d7 100644
--- a/src/main/java/org/jabref/gui/openoffice/OOError.java
+++ b/src/main/java/org/jabref/gui/openoffice/OOError.java
@@ -39,11 +39,7 @@ 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
@@ -99,9 +95,7 @@ public static OOError fromMisc(Exception err) {
     public static OOError noDataBaseIsOpenForCiting() {
         return new OOError(
             Localization.lang("No database"),
-            Localization.lang(
-                "No bibliography database is open for citation."
-            ) +
+            Localization.lang("No bibliography database is open for citation.") +
             "\n" +
             Localization.lang("Open one before citing.")
         );
@@ -110,9 +104,7 @@ public static OOError noDataBaseIsOpenForCiting() {
     public static OOError noDataBaseIsOpenForSyncingAfterCitation() {
         return new OOError(
             Localization.lang("No database"),
-            Localization.lang(
-                "No database is open for updating citation markers after citing."
-            ) +
+            Localization.lang("No database is open for updating citation markers after citing.") +
             "\n" +
             Localization.lang("Open one before citing.")
         );
@@ -130,9 +122,7 @@ public static OOError noDataBaseIsOpenForExport() {
     public static OOError noDataBaseIsOpen() {
         return new OOError(
             Localization.lang("No database is open"),
-            Localization.lang(
-                "This operation requires a bibliography database."
-            )
+            Localization.lang("This operation requires a bibliography database.")
         );
     }
 
@@ -140,15 +130,12 @@ public static OOError noDataBaseIsOpen() {
     public static OOError noValidStyleSelected() {
         return new OOError(
             Localization.lang("No valid style file defined"),
-            Localization.lang(
-                "No bibliography style is selected for citation."
-            ) +
+            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."
+                "You must select either a valid style file," + " or use one of the default styles."
             )
         );
     }
@@ -157,9 +144,7 @@ public static OOError noValidStyleSelected() {
     public static OOError noEntriesSelectedForCitation() {
         return new OOError(
             Localization.lang("No entries selected for citation"),
-            Localization.lang(
-                "No bibliography entries are 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 a0ee264bc39..72c129451a0 100644
--- a/src/main/java/org/jabref/gui/openoffice/OpenOfficePanel.java
+++ b/src/main/java/org/jabref/gui/openoffice/OpenOfficePanel.java
@@ -65,40 +65,22 @@
  */
 public class OpenOfficePanel {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(
-        OpenOfficePanel.class
-    );
+    private static final Logger LOGGER = LoggerFactory.getLogger(OpenOfficePanel.class);
     private final DialogService dialogService;
 
     private final Button connect;
     private final Button manualConnect;
     private final Button selectDocument;
-    private final Button setStyleFile = new Button(
-        Localization.lang("Select style")
-    );
+    private final Button setStyleFile = new Button(Localization.lang("Select style"));
     private final Button pushEntries = new Button(Localization.lang("Cite"));
-    private final Button pushEntriesInt = new Button(
-        Localization.lang("Cite in-text")
-    );
-    private final Button pushEntriesEmpty = new Button(
-        Localization.lang("Insert empty citation")
-    );
-    private final Button pushEntriesAdvanced = new Button(
-        Localization.lang("Cite special")
-    );
+    private final Button pushEntriesInt = new Button(Localization.lang("Cite in-text"));
+    private final Button pushEntriesEmpty = new Button(Localization.lang("Insert empty citation"));
+    private final Button pushEntriesAdvanced = new Button(Localization.lang("Cite special"));
     private final Button update;
-    private final Button merge = new Button(
-        Localization.lang("Merge citations")
-    );
-    private final Button unmerge = new Button(
-        Localization.lang("Separate citations")
-    );
-    private final Button manageCitations = new Button(
-        Localization.lang("Manage citations")
-    );
-    private final Button exportCitations = new Button(
-        Localization.lang("Export cited")
-    );
+    private final Button merge = new Button(Localization.lang("Merge citations"));
+    private final Button unmerge = new Button(Localization.lang("Separate citations"));
+    private final Button manageCitations = new Button(Localization.lang("Manage citations"));
+    private final Button exportCitations = new Button(Localization.lang("Export cited"));
     private final Button settingsB = new Button(Localization.lang("Settings"));
     private final Button help;
     private final VBox vbox = new VBox();
@@ -137,19 +119,13 @@ public OpenOfficePanel(
         this.undoManager = undoManager;
 
         connect = new Button();
-        connect.setGraphic(
-            IconTheme.JabRefIcons.CONNECT_OPEN_OFFICE.getGraphicNode()
-        );
+        connect.setGraphic(IconTheme.JabRefIcons.CONNECT_OPEN_OFFICE.getGraphicNode());
         connect.setTooltip(new Tooltip(Localization.lang("Connect")));
         connect.setMaxWidth(Double.MAX_VALUE);
 
         manualConnect = new Button();
-        manualConnect.setGraphic(
-            IconTheme.JabRefIcons.CONNECT_OPEN_OFFICE.getGraphicNode()
-        );
-        manualConnect.setTooltip(
-            new Tooltip(Localization.lang("Manual connect"))
-        );
+        manualConnect.setGraphic(IconTheme.JabRefIcons.CONNECT_OPEN_OFFICE.getGraphicNode());
+        manualConnect.setTooltip(new Tooltip(Localization.lang("Manual connect")));
         manualConnect.setMaxWidth(Double.MAX_VALUE);
 
         help =
@@ -165,17 +141,13 @@ public OpenOfficePanel(
 
         selectDocument = new Button();
         selectDocument.setGraphic(IconTheme.JabRefIcons.OPEN.getGraphicNode());
-        selectDocument.setTooltip(
-            new Tooltip(Localization.lang("Select Writer document"))
-        );
+        selectDocument.setTooltip(new Tooltip(Localization.lang("Select Writer document")));
         selectDocument.setMaxWidth(Double.MAX_VALUE);
 
         update = new Button();
         update.setGraphic(IconTheme.JabRefIcons.REFRESH.getGraphicNode());
         update.setTooltip(
-            new Tooltip(
-                Localization.lang("Sync OpenOffice/LibreOffice bibliography")
-            )
+            new Tooltip(Localization.lang("Sync OpenOffice/LibreOffice bibliography"))
         );
         update.setMaxWidth(Double.MAX_VALUE);
 
@@ -207,10 +179,7 @@ private boolean getOrUpdateTheStyle(String title) {
             try {
                 style.ensureUpToDate();
             } catch (IOException ex) {
-                LOGGER.warn(
-                    "Unable to reload style file '" + style.getPath() + "'",
-                    ex
-                );
+                LOGGER.warn("Unable to reload style file '" + style.getPath() + "'", ex);
                 String msg =
                     Localization.lang("Unable to reload style file") +
                     "'" +
@@ -230,11 +199,7 @@ private void initPanel() {
         manualConnect.setOnAction(e -> connectManually());
 
         selectDocument.setTooltip(
-            new Tooltip(
-                Localization.lang(
-                    "Select which open Writer document to work on"
-                )
-            )
+            new Tooltip(Localization.lang("Select which open Writer document to work on"))
         );
         selectDocument.setOnAction(e -> ooBase.guiActionSelectDocument(false));
 
@@ -247,39 +212,23 @@ private void initPanel() {
                     try {
                         style.ensureUpToDate();
                     } catch (IOException e) {
-                        LOGGER.warn(
-                            "Unable to reload style file '" +
-                            style.getPath() +
-                            "'",
-                            e
-                        );
+                        LOGGER.warn("Unable to reload style file '" + style.getPath() + "'", e);
                     }
                     dialogService.notify(
-                        Localization.lang(
-                            "Current style is '%0'",
-                            style.getName()
-                        )
+                        Localization.lang("Current style is '%0'", style.getName())
                     );
                 })
         );
 
         pushEntries.setTooltip(
-            new Tooltip(
-                Localization.lang("Cite selected entries between parenthesis")
-            )
-        );
-        pushEntries.setOnAction(e ->
-            pushEntries(CitationType.AUTHORYEAR_PAR, false)
+            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.setOnAction(e ->
-            pushEntries(CitationType.AUTHORYEAR_INTEXT, false)
+            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(
@@ -288,26 +237,16 @@ private void initPanel() {
                 )
             )
         );
-        pushEntriesEmpty.setOnAction(e ->
-            pushEntries(CitationType.INVISIBLE_CIT, false)
-        );
+        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.setOnAction(e ->
-            pushEntries(CitationType.AUTHORYEAR_INTEXT, true)
+            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("Ensure that the bibliography is up-to-date")
-            )
+            new Tooltip(Localization.lang("Ensure that the bibliography is up-to-date"))
         );
 
         update.setOnAction(event -> {
@@ -322,34 +261,22 @@ private void initPanel() {
         merge.setMaxWidth(Double.MAX_VALUE);
         merge.setTooltip(
             new Tooltip(
-                Localization.lang(
-                    "Combine pairs of citations that are separated by spaces only"
-                )
+                Localization.lang("Combine pairs of citations that are separated by spaces only")
             )
         );
-        merge.setOnAction(e ->
-            ooBase.guiActionMergeCitationGroups(getBaseList(), style)
-        );
+        merge.setOnAction(e -> ooBase.guiActionMergeCitationGroups(getBaseList(), style));
 
         unmerge.setMaxWidth(Double.MAX_VALUE);
-        unmerge.setTooltip(
-            new Tooltip(Localization.lang("Separate merged citations"))
-        );
-        unmerge.setOnAction(e ->
-            ooBase.guiActionSeparateCitations(getBaseList(), style)
-        );
+        unmerge.setTooltip(new Tooltip(Localization.lang("Separate merged citations")));
+        unmerge.setOnAction(e -> ooBase.guiActionSeparateCitations(getBaseList(), style));
 
         ContextMenu settingsMenu = createSettingsPopup();
         settingsB.setMaxWidth(Double.MAX_VALUE);
         settingsB.setContextMenu(settingsMenu);
-        settingsB.setOnAction(e ->
-            settingsMenu.show(settingsB, Side.BOTTOM, 0, 0)
-        );
+        settingsB.setOnAction(e -> settingsMenu.show(settingsB, Side.BOTTOM, 0, 0));
         manageCitations.setMaxWidth(Double.MAX_VALUE);
         manageCitations.setOnAction(e -> {
-            ManageCitationsDialogView dialog = new ManageCitationsDialogView(
-                ooBase
-            );
+            ManageCitationsDialogView dialog = new ManageCitationsDialogView(ooBase);
             if (dialog.isOkToShowThisDialog()) {
                 dialogService.showCustomDialogAndWait(dialog);
             }
@@ -361,9 +288,7 @@ private void initPanel() {
         updateButtonAvailability();
 
         HBox hbox = new HBox();
-        hbox
-            .getChildren()
-            .addAll(connect, manualConnect, selectDocument, update, help);
+        hbox.getChildren().addAll(connect, manualConnect, selectDocument, update, help);
         hbox.getChildren().forEach(btn -> HBox.setHgrow(btn, Priority.ALWAYS));
 
         FlowPane flow = new FlowPane();
@@ -372,9 +297,7 @@ private void initPanel() {
         flow.setHgap(4);
         flow.setPrefWrapLength(200);
         flow.getChildren().addAll(setStyleFile, pushEntries, pushEntriesInt);
-        flow
-            .getChildren()
-            .addAll(pushEntriesAdvanced, pushEntriesEmpty, merge, unmerge);
+        flow.getChildren().addAll(pushEntriesAdvanced, pushEntriesEmpty, merge, unmerge);
         flow.getChildren().addAll(manageCitations, exportCitations, settingsB);
 
         vbox.setFillWidth(true);
@@ -389,9 +312,7 @@ private void exportEntries() {
             returnPartialResult
         );
         if (newDatabase.isPresent()) {
-            BibDatabaseContext databaseContext = new BibDatabaseContext(
-                newDatabase.get()
-            );
+            BibDatabaseContext databaseContext = new BibDatabaseContext(newDatabase.get());
             LibraryTab libraryTab = LibraryTab.createLibraryTab(
                 databaseContext,
                 JabRefGUI.getMainFrame(),
@@ -409,9 +330,7 @@ private void exportEntries() {
 
     private List<BibDatabase> getBaseList() {
         List<BibDatabase> databases = new ArrayList<>();
-        if (
-            preferencesService.getOpenOfficePreferences().getUseAllDatabases()
-        ) {
+        if (preferencesService.getOpenOfficePreferences().getUseAllDatabases()) {
             for (BibDatabaseContext database : stateManager.getOpenDatabases()) {
                 databases.add(database.getDatabase());
             }
@@ -428,11 +347,10 @@ private List<BibDatabase> getBaseList() {
     }
 
     private void connectAutomatically() {
-        DetectOpenOfficeInstallation officeInstallation =
-            new DetectOpenOfficeInstallation(
-                preferencesService.getOpenOfficePreferences(),
-                dialogService
-            );
+        DetectOpenOfficeInstallation officeInstallation = new DetectOpenOfficeInstallation(
+            preferencesService.getOpenOfficePreferences(),
+            dialogService
+        );
 
         if (officeInstallation.isExecutablePathDefined()) {
             connect();
@@ -445,21 +363,16 @@ protected List<Path> call() {
             };
 
             taskConnectIfInstalled.setOnSucceeded(evt -> {
-                var installations = new ArrayList<>(
-                    taskConnectIfInstalled.getValue()
-                );
+                var installations = new ArrayList<>(taskConnectIfInstalled.getValue());
                 if (installations.isEmpty()) {
-                    officeInstallation
-                        .selectInstallationPath()
-                        .ifPresent(installations::add);
+                    officeInstallation.selectInstallationPath().ifPresent(installations::add);
                 }
-                Optional<Path> actualFile =
-                    officeInstallation.chooseAmongInstallations(installations);
+                Optional<Path> actualFile = officeInstallation.chooseAmongInstallations(
+                    installations
+                );
                 if (
                     actualFile.isPresent() &&
-                    officeInstallation.setOpenOfficePreferences(
-                        actualFile.get()
-                    )
+                    officeInstallation.setOpenOfficePreferences(actualFile.get())
                 ) {
                     connect();
                 }
@@ -486,22 +399,18 @@ private void connectManually() {
         var fileDialogConfiguration = new DirectoryDialogConfiguration.Builder()
             .withInitialDirectory(System.getProperty("user.home"))
             .build();
-        Optional<Path> selectedPath =
-            dialogService.showDirectorySelectionDialog(fileDialogConfiguration);
+        Optional<Path> selectedPath = dialogService.showDirectorySelectionDialog(
+            fileDialogConfiguration
+        );
 
-        DetectOpenOfficeInstallation officeInstallation =
-            new DetectOpenOfficeInstallation(
-                preferencesService.getOpenOfficePreferences(),
-                dialogService
-            );
+        DetectOpenOfficeInstallation officeInstallation = new DetectOpenOfficeInstallation(
+            preferencesService.getOpenOfficePreferences(),
+            dialogService
+        );
 
         if (selectedPath.isPresent()) {
             BackgroundTask
-                .wrap(() ->
-                    officeInstallation.setOpenOfficePreferences(
-                        selectedPath.get()
-                    )
-                )
+                .wrap(() -> officeInstallation.setOpenOfficePreferences(selectedPath.get()))
                 .withInitialMessage("Searching for executable")
                 .onFailure(dialogService::showErrorDialogAndWait)
                 .onSuccess(value -> {
@@ -521,9 +430,7 @@ private void connectManually() {
                 .executeWith(taskExecutor);
         } else {
             dialogService.showErrorDialogAndWait(
-                Localization.lang(
-                    "Could not connect to running OpenOffice/LibreOffice."
-                ),
+                Localization.lang("Could not connect to running OpenOffice/LibreOffice."),
                 Localization.lang(
                     "If connecting manually, please verify program and library paths."
                 )
@@ -533,8 +440,7 @@ private void connectManually() {
 
     private void updateButtonAvailability() {
         boolean isConnected = ooBase != null;
-        boolean isConnectedToDocument =
-            isConnected && !ooBase.isDocumentConnectionMissing();
+        boolean isConnectedToDocument = isConnected && !ooBase.isDocumentConnectionMissing();
 
         // For these, we need to watch something
         boolean hasStyle = true; // (style != null);
@@ -542,12 +448,9 @@ private void updateButtonAvailability() {
         boolean hasSelectedBibEntry = true;
 
         selectDocument.setDisable(!isConnected);
-        pushEntries.setDisable(
-            !(isConnectedToDocument && hasStyle && hasDatabase)
-        );
+        pushEntries.setDisable(!(isConnectedToDocument && hasStyle && hasDatabase));
 
-        boolean canCite =
-            isConnectedToDocument && hasStyle && hasSelectedBibEntry;
+        boolean canCite = isConnectedToDocument && hasStyle && hasSelectedBibEntry;
         pushEntriesInt.setDisable(!canCite);
         pushEntriesEmpty.setDisable(!canCite);
         pushEntriesAdvanced.setDisable(!canCite);
@@ -571,9 +474,7 @@ protected OOBibBase call() throws Exception {
                 );
 
                 var path = Path.of(
-                    preferencesService
-                        .getOpenOfficePreferences()
-                        .getExecutablePath()
+                    preferencesService.getOpenOfficePreferences().getExecutablePath()
                 );
                 return createBibBase(path);
             }
@@ -592,10 +493,7 @@ protected OOBibBase call() throws Exception {
             Throwable ex = connectTask.getException();
             LOGGER.error("autodetect failed", ex);
             if (ex instanceof UnsatisfiedLinkError) {
-                LOGGER.warn(
-                    "Could not connect to running OpenOffice/LibreOffice",
-                    ex
-                );
+                LOGGER.warn("Could not connect to running OpenOffice/LibreOffice", ex);
 
                 dialogService.showErrorDialogAndWait(
                     Localization.lang(
@@ -604,18 +502,11 @@ protected OOBibBase call() throws Exception {
                     )
                 );
             } else if (ex instanceof IOException) {
-                LOGGER.warn(
-                    "Could not connect to running OpenOffice/LibreOffice",
-                    ex
-                );
+                LOGGER.warn("Could not connect to running OpenOffice/LibreOffice", ex);
 
                 dialogService.showErrorDialogAndWait(
-                    Localization.lang(
-                        "Could not connect to running OpenOffice/LibreOffice."
-                    ),
-                    Localization.lang(
-                        "Could not connect to running OpenOffice/LibreOffice."
-                    ) +
+                    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."
@@ -630,10 +521,7 @@ protected OOBibBase call() throws Exception {
                     ex
                 );
             } else if (ex instanceof BootstrapException bootstrapEx) {
-                LOGGER.error(
-                    "Exception boostrap cause",
-                    bootstrapEx.getTargetException()
-                );
+                LOGGER.error("Exception boostrap cause", bootstrapEx.getTargetException());
                 dialogService.showErrorDialogAndWait(
                     "Bootstrap error",
                     bootstrapEx.getTargetException()
@@ -655,8 +543,7 @@ protected OOBibBase call() throws Exception {
         taskExecutor.execute(connectTask);
     }
 
-    private OOBibBase createBibBase(Path loPath)
-        throws BootstrapException, CreationException {
+    private OOBibBase createBibBase(Path loPath) throws BootstrapException, CreationException {
         return new OOBibBase(loPath, dialogService);
     }
 
@@ -666,22 +553,15 @@ private OOBibBase createBibBase(Path loPath)
      * @param withText      False means invisible citation (no text).
      * @param inParenthesis True means "(Au and Thor 2000)". False means "Au and Thor (2000)".
      */
-    private static CitationType citationTypeFromOptions(
-        boolean withText,
-        boolean inParenthesis
-    ) {
+    private static CitationType citationTypeFromOptions(boolean withText, boolean inParenthesis) {
         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) {
-        final String errorDialogTitle = Localization.lang(
-            "Error pushing entries"
-        );
+        final String errorDialogTitle = Localization.lang("Error pushing entries");
 
         if (
             stateManager.getActiveDatabase().isEmpty() ||
@@ -694,10 +574,7 @@ private void pushEntries(CitationType citationType, boolean addPageInfo) {
             return;
         }
 
-        final BibDatabase database = stateManager
-            .getActiveDatabase()
-            .get()
-            .getDatabase();
+        final BibDatabase database = stateManager.getActiveDatabase().get().getDatabase();
         if (database == null) {
             OOError
                 .noDataBaseIsOpenForCiting()
@@ -724,19 +601,14 @@ private void pushEntries(CitationType citationType, boolean addPageInfo) {
             boolean withText = citationType.withText();
 
             Optional<AdvancedCiteDialogViewModel> citeDialogViewModel =
-                dialogService.showCustomDialogAndWait(
-                    new AdvancedCiteDialogView()
-                );
+                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()
-                    );
+                    citationTypeFromOptions(withText, model.citeInParProperty().getValue());
             } else {
                 // user canceled
                 return;
@@ -754,14 +626,7 @@ private void pushEntries(CitationType citationType, boolean addPageInfo) {
             ? Optional.of(new Update.SyncOptions(getBaseList()))
             : Optional.empty();
 
-        ooBase.guiActionInsertEntry(
-            entries,
-            database,
-            style,
-            citationType,
-            pageInfo,
-            syncOptions
-        );
+        ooBase.guiActionInsertEntry(entries, database, style, citationType, pageInfo, syncOptions);
     }
 
     /**
@@ -789,30 +654,23 @@ 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("Cannot cite entries without citation keys. Generate keys now?"),
             Localization.lang("Generate keys"),
             Localization.lang("Cancel")
         );
 
-        Optional<BibDatabaseContext> databaseContext =
-            stateManager.getActiveDatabase();
+        Optional<BibDatabaseContext> databaseContext = stateManager.getActiveDatabase();
         if (citePressed && databaseContext.isPresent()) {
             // Generate keys
             CitationKeyPatternPreferences prefs =
                 preferencesService.getCitationKeyPatternPreferences();
-            NamedCompound undoCompound = new NamedCompound(
-                Localization.lang("Cite")
-            );
+            NamedCompound undoCompound = new NamedCompound(Localization.lang("Cite"));
             for (BibEntry entry : entries) {
                 if (entry.getCitationKey().isEmpty()) {
                     // Generate key
                     new CitationKeyGenerator(databaseContext.get(), prefs)
                         .generateAndSetKey(entry)
-                        .ifPresent(change ->
-                            undoCompound.addEdit(new UndoableKeyChange(change))
-                        );
+                        .ifPresent(change -> undoCompound.addEdit(new UndoableKeyChange(change)));
                 }
             }
             undoCompound.end();
@@ -827,23 +685,16 @@ private boolean checkThatEntriesHaveKeys(List<BibEntry> entries) {
     }
 
     private ContextMenu createSettingsPopup() {
-        OpenOfficePreferences openOfficePreferences =
-            preferencesService.getOpenOfficePreferences();
+        OpenOfficePreferences openOfficePreferences = preferencesService.getOpenOfficePreferences();
 
         ContextMenu contextMenu = new ContextMenu();
 
         CheckMenuItem autoSync = new CheckMenuItem(
-            Localization.lang(
-                "Automatically sync bibliography when inserting citations"
-            )
+            Localization.lang("Automatically sync bibliography when inserting citations")
         );
         autoSync
             .selectedProperty()
-            .set(
-                preferencesService
-                    .getOpenOfficePreferences()
-                    .getSyncWhenCiting()
-            );
+            .set(preferencesService.getOpenOfficePreferences().getSyncWhenCiting());
 
         ToggleGroup toggleGroup = new ToggleGroup();
         RadioMenuItem useActiveBase = new RadioMenuItem(
@@ -865,22 +716,16 @@ private ContextMenu createSettingsPopup() {
             useActiveBase.setSelected(true);
         }
 
-        autoSync.setOnAction(e ->
-            openOfficePreferences.setSyncWhenCiting(autoSync.isSelected())
-        );
+        autoSync.setOnAction(e -> openOfficePreferences.setSyncWhenCiting(autoSync.isSelected()));
         useAllBases.setOnAction(e ->
             openOfficePreferences.setUseAllDatabases(useAllBases.isSelected())
         );
         useActiveBase.setOnAction(e ->
-            openOfficePreferences.setUseAllDatabases(
-                !useActiveBase.isSelected()
-            )
+            openOfficePreferences.setUseAllDatabases(!useActiveBase.isSelected())
         );
         clearConnectionSettings.setOnAction(e -> {
             openOfficePreferences.clearConnectionSettings();
-            dialogService.notify(
-                Localization.lang("Cleared connection settings")
-            );
+            dialogService.notify(Localization.lang("Cleared connection settings"));
         });
 
         contextMenu
diff --git a/src/main/java/org/jabref/gui/openoffice/StyleSelectDialogView.java b/src/main/java/org/jabref/gui/openoffice/StyleSelectDialogView.java
index 762bfbb6d6d..b395ffac041 100644
--- a/src/main/java/org/jabref/gui/openoffice/StyleSelectDialogView.java
+++ b/src/main/java/org/jabref/gui/openoffice/StyleSelectDialogView.java
@@ -83,10 +83,7 @@ public StyleSelectDialogView(StyleLoader loader) {
         setResultConverter(button -> {
             if (button == ButtonType.OK) {
                 viewModel.storePrefs();
-                return tvStyles
-                    .getSelectionModel()
-                    .getSelectedItem()
-                    .getStyle();
+                return tvStyles.getSelectionModel().getSelectedItem().getStyle();
             }
             return null;
         });
@@ -95,12 +92,7 @@ public StyleSelectDialogView(StyleLoader loader) {
 
     @FXML
     private void initialize() {
-        viewModel =
-            new StyleSelectDialogViewModel(
-                dialogService,
-                loader,
-                preferencesService
-            );
+        viewModel = new StyleSelectDialogViewModel(dialogService, loader, preferencesService);
 
         previewArticle =
             new PreviewViewer(
@@ -126,18 +118,10 @@ private void initialize() {
         previewBook.setEntry(TestEntry.getTestEntryBook());
         vbox.getChildren().add(previewBook);
 
-        colName.setCellValueFactory(cellData ->
-            cellData.getValue().nameProperty()
-        );
-        colJournals.setCellValueFactory(cellData ->
-            cellData.getValue().journalsProperty()
-        );
-        colFile.setCellValueFactory(cellData ->
-            cellData.getValue().fileProperty()
-        );
-        colDeleteIcon.setCellValueFactory(cellData ->
-            cellData.getValue().internalStyleProperty()
-        );
+        colName.setCellValueFactory(cellData -> cellData.getValue().nameProperty());
+        colJournals.setCellValueFactory(cellData -> cellData.getValue().journalsProperty());
+        colFile.setCellValueFactory(cellData -> cellData.getValue().fileProperty());
+        colDeleteIcon.setCellValueFactory(cellData -> cellData.getValue().internalStyleProperty());
 
         new ValueTableCellFactory<StyleSelectItemViewModel, Boolean>()
             .withGraphic(internalStyle -> {
@@ -182,16 +166,12 @@ private void initialize() {
                 tvStyles.getSelectionModel().select(style);
                 previewArticle.setLayout(
                     new TextBasedPreviewLayout(
-                        style
-                            .getStyle()
-                            .getReferenceFormat(StandardEntryType.Article)
+                        style.getStyle().getReferenceFormat(StandardEntryType.Article)
                     )
                 );
                 previewBook.setLayout(
                     new TextBasedPreviewLayout(
-                        style
-                            .getStyle()
-                            .getReferenceFormat(StandardEntryType.Book)
+                        style.getStyle().getReferenceFormat(StandardEntryType.Book)
                     )
                 );
             }
diff --git a/src/main/java/org/jabref/gui/openoffice/StyleSelectDialogViewModel.java b/src/main/java/org/jabref/gui/openoffice/StyleSelectDialogViewModel.java
index df0db4b1292..7d52cb903e0 100644
--- a/src/main/java/org/jabref/gui/openoffice/StyleSelectDialogViewModel.java
+++ b/src/main/java/org/jabref/gui/openoffice/StyleSelectDialogViewModel.java
@@ -34,8 +34,9 @@ public class StyleSelectDialogViewModel {
     private final StyleLoader styleLoader;
     private final OpenOfficePreferences openOfficePreferences;
     private final FilePreferences filePreferences;
-    private final ListProperty<StyleSelectItemViewModel> styles =
-        new SimpleListProperty<>(FXCollections.observableArrayList());
+    private final ListProperty<StyleSelectItemViewModel> styles = new SimpleListProperty<>(
+        FXCollections.observableArrayList()
+    );
     private final ObjectProperty<StyleSelectItemViewModel> selectedItem =
         new SimpleObjectProperty<>();
 
@@ -46,8 +47,7 @@ public StyleSelectDialogViewModel(
     ) {
         this.dialogService = dialogService;
         this.filePreferences = preferencesService.getFilePreferences();
-        this.openOfficePreferences =
-            preferencesService.getOpenOfficePreferences();
+        this.openOfficePreferences = preferencesService.getOpenOfficePreferences();
         this.styleLoader = styleLoader;
 
         styles.addAll(loadStyles());
@@ -60,9 +60,7 @@ public StyleSelectItemViewModel fromOOBibStyle(OOBibStyle style) {
         return new StyleSelectItemViewModel(
             style.getName(),
             String.join(", ", style.getJournals()),
-            style.isInternalStyle()
-                ? Localization.lang("Internal style")
-                : style.getPath(),
+            style.isInternalStyle() ? Localization.lang("Internal style") : style.getPath(),
             style
         );
     }
@@ -72,21 +70,12 @@ public OOBibStyle toOOBibStyle(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();
-        Optional<Path> path = dialogService.showFileOpenDialog(
-            fileDialogConfiguration
-        );
+        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)
@@ -127,11 +116,10 @@ public void deleteStyle() {
 
     public void editStyle() {
         OOBibStyle style = selectedItem.getValue().getStyle();
-        Optional<ExternalFileType> type =
-            ExternalFileTypes.getExternalFileTypeByExt(
-                "jstyle",
-                filePreferences
-            );
+        Optional<ExternalFileType> type = ExternalFileTypes.getExternalFileTypeByExt(
+            "jstyle",
+            filePreferences
+        );
         try {
             JabRefDesktop.openExternalFileAnyFormat(
                 new BibDatabaseContext(),
@@ -152,11 +140,7 @@ public void viewStyle(StyleSelectItemViewModel item) {
         TextArea styleView = new TextArea(item.getStyle().getLocalCopy());
         scrollPane.setContent(styleView);
         pane.setContent(scrollPane);
-        dialogService.showCustomDialogAndWait(
-            item.getStyle().getName(),
-            pane,
-            ButtonType.OK
-        );
+        dialogService.showCustomDialogAndWait(item.getStyle().getName(), pane, ButtonType.OK);
     }
 
     public ObjectProperty<StyleSelectItemViewModel> selectedItemProperty() {
@@ -171,9 +155,7 @@ public void storePrefs() {
             .map(OOBibStyle::getPath)
             .collect(Collectors.toList());
         openOfficePreferences.setExternalStyles(externalStyles);
-        openOfficePreferences.setCurrentStyle(
-            selectedItem.getValue().getStylePath()
-        );
+        openOfficePreferences.setCurrentStyle(selectedItem.getValue().getStylePath());
     }
 
     private StyleSelectItemViewModel getStyleOrDefault(String stylePath) {
diff --git a/src/main/java/org/jabref/gui/openoffice/StyleSelectItemViewModel.java b/src/main/java/org/jabref/gui/openoffice/StyleSelectItemViewModel.java
index 80ac7148cbb..8890f246c0c 100644
--- a/src/main/java/org/jabref/gui/openoffice/StyleSelectItemViewModel.java
+++ b/src/main/java/org/jabref/gui/openoffice/StyleSelectItemViewModel.java
@@ -21,12 +21,7 @@ public class StyleSelectItemViewModel {
     private final OOBibStyle style;
     private final BooleanProperty internalStyle = new SimpleBooleanProperty();
 
-    public StyleSelectItemViewModel(
-        String name,
-        String journals,
-        String file,
-        OOBibStyle style
-    ) {
+    public StyleSelectItemViewModel(String name, String journals, String file, OOBibStyle style) {
         this.name.setValue(name);
         this.journals.setValue(journals);
         this.file.setValue(file);
diff --git a/src/main/java/org/jabref/gui/preferences/AbstractPreferenceTabView.java b/src/main/java/org/jabref/gui/preferences/AbstractPreferenceTabView.java
index 26cee411fda..2ce9d3906e0 100644
--- a/src/main/java/org/jabref/gui/preferences/AbstractPreferenceTabView.java
+++ b/src/main/java/org/jabref/gui/preferences/AbstractPreferenceTabView.java
@@ -8,9 +8,7 @@
 import org.jabref.gui.util.TaskExecutor;
 import org.jabref.preferences.PreferencesService;
 
-public abstract class AbstractPreferenceTabView<
-    T extends PreferenceTabViewModel
->
+public abstract class AbstractPreferenceTabView<T extends PreferenceTabViewModel>
     extends VBox
     implements PreferencesTab {
 
diff --git a/src/main/java/org/jabref/gui/preferences/PreferencesDialogView.java b/src/main/java/org/jabref/gui/preferences/PreferencesDialogView.java
index 929dcbd0065..ede1a3bba84 100644
--- a/src/main/java/org/jabref/gui/preferences/PreferencesDialogView.java
+++ b/src/main/java/org/jabref/gui/preferences/PreferencesDialogView.java
@@ -27,8 +27,7 @@
  * PreferencesTab interface, since this dialog will call the storeSettings() method of all tabs when the user presses
  * ok.
  */
-public class PreferencesDialogView
-    extends BaseDialog<PreferencesDialogViewModel> {
+public class PreferencesDialogView extends BaseDialog<PreferencesDialogViewModel> {
 
     @FXML
     private CustomTextField searchBox;
@@ -85,16 +84,9 @@ public PreferencesDialogViewModel getViewModel() {
 
     @FXML
     private void initialize() {
-        viewModel =
-            new PreferencesDialogViewModel(
-                dialogService,
-                preferencesService,
-                frame
-            );
+        viewModel = new PreferencesDialogViewModel(dialogService, preferencesService, frame);
 
-        preferenceTabList
-            .itemsProperty()
-            .setValue(viewModel.getPreferenceTabs());
+        preferenceTabList.itemsProperty().setValue(viewModel.getPreferenceTabs());
 
         // The list view does not respect the listener for the dialog and needs its own
         preferenceTabList.setOnKeyReleased(key -> {
@@ -126,17 +118,11 @@ private void initialize() {
         EasyBind.subscribe(
             preferenceTabList.getSelectionModel().selectedItemProperty(),
             tab -> {
-                if (
-                    tab instanceof AbstractPreferenceTabView<?> preferencesTab
-                ) {
-                    preferencesContainer.setContent(
-                        preferencesTab.getBuilder()
-                    );
+                if (tab instanceof AbstractPreferenceTabView<?> preferencesTab) {
+                    preferencesContainer.setContent(preferencesTab.getBuilder());
                     preferencesTab
                         .prefWidthProperty()
-                        .bind(
-                            preferencesContainer.widthProperty().subtract(10d)
-                        );
+                        .bind(preferencesContainer.widthProperty().subtract(10d));
                     preferencesTab.getStyleClass().add("preferencesTab");
                 } else {
                     preferencesContainer.setContent(null);
@@ -149,9 +135,7 @@ private void initialize() {
             .withText(PreferencesTab::getTabName)
             .install(preferenceTabList);
 
-        memoryStickMode
-            .selectedProperty()
-            .bindBidirectional(viewModel.getMemoryStickProperty());
+        memoryStickMode.selectedProperty().bindBidirectional(viewModel.getMemoryStickProperty());
 
         viewModel.setValues();
     }
diff --git a/src/main/java/org/jabref/gui/preferences/PreferencesDialogViewModel.java b/src/main/java/org/jabref/gui/preferences/PreferencesDialogViewModel.java
index ac19f497d89..363f0adfdd7 100644
--- a/src/main/java/org/jabref/gui/preferences/PreferencesDialogViewModel.java
+++ b/src/main/java/org/jabref/gui/preferences/PreferencesDialogViewModel.java
@@ -45,12 +45,9 @@
 
 public class PreferencesDialogViewModel extends AbstractViewModel {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(
-        PreferencesDialogViewModel.class
-    );
+    private static final Logger LOGGER = LoggerFactory.getLogger(PreferencesDialogViewModel.class);
 
-    private final SimpleBooleanProperty memoryStickProperty =
-        new SimpleBooleanProperty();
+    private final SimpleBooleanProperty memoryStickProperty = new SimpleBooleanProperty();
 
     private final DialogService dialogService;
     private final PreferencesService preferences;
@@ -98,16 +95,13 @@ public ObservableList<PreferencesTab> getPreferenceTabs() {
     }
 
     public void importPreferences() {
-        FileDialogConfiguration fileDialogConfiguration =
-            new FileDialogConfiguration.Builder()
-                .addExtensionFilter(StandardFileType.XML)
-                .withDefaultExtension(StandardFileType.XML)
-                .withInitialDirectory(
-                    preferences
-                        .getInternalPreferences()
-                        .getLastPreferencesExportPath()
-                )
-                .build();
+        FileDialogConfiguration fileDialogConfiguration = new FileDialogConfiguration.Builder()
+            .addExtensionFilter(StandardFileType.XML)
+            .withDefaultExtension(StandardFileType.XML)
+            .withInitialDirectory(
+                preferences.getInternalPreferences().getLastPreferencesExportPath()
+            )
+            .build();
 
         dialogService
             .showFileOpenDialog(fileDialogConfiguration)
@@ -118,9 +112,7 @@ public void importPreferences() {
 
                     dialogService.showWarningDialogAndWait(
                         Localization.lang("Import preferences"),
-                        Localization.lang(
-                            "You must restart JabRef for this to come into effect."
-                        )
+                        Localization.lang("You must restart JabRef for this to come into effect.")
                     );
                 } catch (JabRefException ex) {
                     LOGGER.error("Error while importing preferences", ex);
@@ -133,16 +125,13 @@ public void importPreferences() {
     }
 
     public void exportPreferences() {
-        FileDialogConfiguration fileDialogConfiguration =
-            new FileDialogConfiguration.Builder()
-                .addExtensionFilter(StandardFileType.XML)
-                .withDefaultExtension(StandardFileType.XML)
-                .withInitialDirectory(
-                    preferences
-                        .getInternalPreferences()
-                        .getLastPreferencesExportPath()
-                )
-                .build();
+        FileDialogConfiguration fileDialogConfiguration = new FileDialogConfiguration.Builder()
+            .addExtensionFilter(StandardFileType.XML)
+            .withDefaultExtension(StandardFileType.XML)
+            .withInitialDirectory(
+                preferences.getInternalPreferences().getLastPreferencesExportPath()
+            )
+            .build();
 
         dialogService
             .showFileSaveDialog(fileDialogConfiguration)
@@ -150,9 +139,7 @@ public void exportPreferences() {
                 try {
                     storeAllSettings();
                     preferences.exportPreferences(exportFile);
-                    preferences
-                        .getInternalPreferences()
-                        .setLastPreferencesExportPath(exportFile);
+                    preferences.getInternalPreferences().setLastPreferencesExportPath(exportFile);
                 } catch (JabRefException ex) {
                     LOGGER.warn(ex.getMessage(), ex);
                     dialogService.showErrorDialogAndWait(
@@ -170,31 +157,23 @@ public void showPreferences() {
     }
 
     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"),
-                    Localization.lang(
-                        "You must restart JabRef for this to come into effect."
-                    )
+                    Localization.lang("You must restart JabRef for this to come into effect.")
                 );
             } catch (BackingStoreException ex) {
                 LOGGER.error("Error while resetting preferences", ex);
-                dialogService.showErrorDialogAndWait(
-                    Localization.lang("Reset preferences"),
-                    ex
-                );
+                dialogService.showErrorDialogAndWait(Localization.lang("Reset preferences"), ex);
             }
 
             updateAfterPreferenceChanges();
@@ -207,9 +186,7 @@ public void resetPreferences() {
     private void updateAfterPreferenceChanges() {
         setValues();
 
-        frame
-            .getLibraryTabs()
-            .forEach(panel -> panel.getMainTable().getTableModel().refresh());
+        frame.getLibraryTabs().forEach(panel -> panel.getMainTable().getTableModel().refresh());
     }
 
     /**
@@ -233,9 +210,7 @@ public void storeAllSettings() {
         }
 
         // Store settings
-        preferences
-            .getInternalPreferences()
-            .setMemoryStickMode(memoryStickProperty.get());
+        preferences.getInternalPreferences().setMemoryStickMode(memoryStickProperty.get());
 
         for (PreferencesTab tab : preferenceTabs) {
             tab.storeSettings();
@@ -248,9 +223,7 @@ public void storeAllSettings() {
                 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.")
             );
         }
 
@@ -266,9 +239,7 @@ public void storeAllSettings() {
      * Inserts the preference values into the Properties of the ViewModel
      */
     public void setValues() {
-        memoryStickProperty.setValue(
-            preferences.getInternalPreferences().isMemoryStickMode()
-        );
+        memoryStickProperty.setValue(preferences.getInternalPreferences().isMemoryStickMode());
 
         for (PreferencesTab preferencesTab : preferenceTabs) {
             preferencesTab.setValues();
diff --git a/src/main/java/org/jabref/gui/preferences/PreferencesFilterDialog.java b/src/main/java/org/jabref/gui/preferences/PreferencesFilterDialog.java
index a2827ac2d75..b04abecf894 100644
--- a/src/main/java/org/jabref/gui/preferences/PreferencesFilterDialog.java
+++ b/src/main/java/org/jabref/gui/preferences/PreferencesFilterDialog.java
@@ -23,12 +23,8 @@
 public class PreferencesFilterDialog extends BaseDialog<Void> {
 
     private final PreferencesFilter preferencesFilter;
-    private final ObservableList<
-        PreferencesFilter.PreferenceOption
-    > preferenceOptions;
-    private final FilteredList<
-        PreferencesFilter.PreferenceOption
-    > filteredOptions;
+    private final ObservableList<PreferencesFilter.PreferenceOption> preferenceOptions;
+    private final FilteredList<PreferencesFilter.PreferenceOption> filteredOptions;
 
     @FXML
     private TableView<PreferencesFilter.PreferenceOption> table;
@@ -46,10 +42,7 @@ public class PreferencesFilterDialog extends BaseDialog<Void> {
     private TableColumn<PreferencesFilter.PreferenceOption, Object> columnValue;
 
     @FXML
-    private TableColumn<
-        PreferencesFilter.PreferenceOption,
-        Object
-    > columnDefaultValue;
+    private TableColumn<PreferencesFilter.PreferenceOption, Object> columnDefaultValue;
 
     @FXML
     private CheckBox showOnlyDeviatingPreferenceOptions;
@@ -82,43 +75,30 @@ private void initialize() {
                         if ((searchText == null) || searchText.isEmpty()) {
                             return null;
                         }
-                        String lowerCaseSearchText = searchText.toLowerCase(
-                            Locale.ROOT
-                        );
+                        String lowerCaseSearchText = searchText.toLowerCase(Locale.ROOT);
                         return option ->
-                            option
-                                .getKey()
-                                .toLowerCase(Locale.ROOT)
-                                .contains(lowerCaseSearchText);
+                            option.getKey().toLowerCase(Locale.ROOT).contains(lowerCaseSearchText);
                     }
                 )
             );
         columnType.setCellValueFactory(data ->
             new ReadOnlyObjectWrapper<>(data.getValue().getType())
         );
-        columnKey.setCellValueFactory(data ->
-            new ReadOnlyStringWrapper(data.getValue().getKey())
-        );
+        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("")
-            )
+            new ReadOnlyObjectWrapper<>(data.getValue().getDefaultValue().orElse(""))
         );
         table.setItems(filteredOptions);
-        count
-            .textProperty()
-            .bind(Bindings.size(table.getItems()).asString("(%d)"));
+        count.textProperty().bind(Bindings.size(table.getItems()).asString("(%d)"));
         updateModel();
     }
 
     private void updateModel() {
         if (showOnlyDeviatingPreferenceOptions.isSelected()) {
-            preferenceOptions.setAll(
-                preferencesFilter.getDeviatingPreferences()
-            );
+            preferenceOptions.setAll(preferencesFilter.getDeviatingPreferences());
         } else {
             preferenceOptions.setAll(preferencesFilter.getPreferenceOptions());
         }
diff --git a/src/main/java/org/jabref/gui/preferences/PreferencesSearchHandler.java b/src/main/java/org/jabref/gui/preferences/PreferencesSearchHandler.java
index 1e9d5ede8ea..bae2be79147 100644
--- a/src/main/java/org/jabref/gui/preferences/PreferencesSearchHandler.java
+++ b/src/main/java/org/jabref/gui/preferences/PreferencesSearchHandler.java
@@ -14,24 +14,17 @@
 
 class PreferencesSearchHandler {
 
-    private static PseudoClass labelHighlight = PseudoClass.getPseudoClass(
-        "search-highlight"
-    );
+    private static PseudoClass labelHighlight = PseudoClass.getPseudoClass("search-highlight");
     private final List<PreferencesTab> preferenceTabs;
     private final ListProperty<PreferencesTab> filteredPreferenceTabs;
-    private final ArrayListMultimap<
-        PreferencesTab,
-        Labeled
-    > preferenceTabsLabelNames;
+    private final ArrayListMultimap<PreferencesTab, Labeled> preferenceTabsLabelNames;
     private final ArrayList<Labeled> highlightedLabels = new ArrayList<>();
 
     PreferencesSearchHandler(List<PreferencesTab> preferenceTabs) {
         this.preferenceTabs = preferenceTabs;
         this.preferenceTabsLabelNames = getPrefsTabLabelMap();
         this.filteredPreferenceTabs =
-            new SimpleListProperty<>(
-                FXCollections.observableArrayList(preferenceTabs)
-            );
+            new SimpleListProperty<>(FXCollections.observableArrayList(preferenceTabs));
     }
 
     public void filterTabs(String text) {
@@ -70,8 +63,7 @@ private void highlightLabel(Labeled labeled) {
     }
 
     private void clearHighlights() {
-        highlightedLabels.forEach(labeled ->
-            labeled.pseudoClassStateChanged(labelHighlight, false)
+        highlightedLabels.forEach(labeled -> labeled.pseudoClassStateChanged(labelHighlight, false)
         );
     }
 
@@ -84,17 +76,12 @@ private void clearSearch() {
      * mapping from PreferencesTab to all its Labeled type nodes.
      */
     private ArrayListMultimap<PreferencesTab, Labeled> getPrefsTabLabelMap() {
-        ArrayListMultimap<PreferencesTab, Labeled> prefsTabLabelMap =
-            ArrayListMultimap.create();
+        ArrayListMultimap<PreferencesTab, Labeled> prefsTabLabelMap = ArrayListMultimap.create();
         for (PreferencesTab preferencesTab : preferenceTabs) {
             Node builder = preferencesTab.getBuilder();
             if (builder instanceof Parent) {
                 Parent parentBuilder = (Parent) builder;
-                scanLabeledControls(
-                    parentBuilder,
-                    prefsTabLabelMap,
-                    preferencesTab
-                );
+                scanLabeledControls(parentBuilder, prefsTabLabelMap, preferencesTab);
             }
         }
         return prefsTabLabelMap;
@@ -111,11 +98,7 @@ private static void scanLabeledControls(
     ) {
         for (Node child : parent.getChildrenUnmodifiable()) {
             if (!(child instanceof Labeled)) {
-                scanLabeledControls(
-                    (Parent) child,
-                    prefsTabLabelMap,
-                    preferencesTab
-                );
+                scanLabeledControls((Parent) child, prefsTabLabelMap, preferencesTab);
             } else {
                 Labeled labeled = (Labeled) child;
                 if (!labeled.getText().isEmpty()) {
diff --git a/src/main/java/org/jabref/gui/preferences/ShowPreferencesAction.java b/src/main/java/org/jabref/gui/preferences/ShowPreferencesAction.java
index 0e494c680e6..ce209954b47 100644
--- a/src/main/java/org/jabref/gui/preferences/ShowPreferencesAction.java
+++ b/src/main/java/org/jabref/gui/preferences/ShowPreferencesAction.java
@@ -11,19 +11,14 @@ public class ShowPreferencesAction extends SimpleCommand {
     private final JabRefFrame jabRefFrame;
     private final TaskExecutor taskExecutor;
 
-    public ShowPreferencesAction(
-        JabRefFrame jabRefFrame,
-        TaskExecutor taskExecutor
-    ) {
+    public ShowPreferencesAction(JabRefFrame jabRefFrame, TaskExecutor taskExecutor) {
         this.jabRefFrame = jabRefFrame;
         this.taskExecutor = taskExecutor;
     }
 
     @Override
     public void execute() {
-        DialogService dialogService = Injector.instantiateModelOrService(
-            DialogService.class
-        );
+        DialogService dialogService = Injector.instantiateModelOrService(DialogService.class);
         dialogService.showCustomDialog(new PreferencesDialogView(jabRefFrame));
     }
 }
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 bbe08a23a9f..8335e19aa1f 100644
--- a/src/main/java/org/jabref/gui/preferences/autocompletion/AutoCompletionTab.java
+++ b/src/main/java/org/jabref/gui/preferences/autocompletion/AutoCompletionTab.java
@@ -47,26 +47,19 @@ public String getTabName() {
     }
 
     public void initialize() {
-        viewModel =
-            new AutoCompletionTabViewModel(
-                preferencesService.getAutoCompletePreferences()
-            );
+        viewModel = new AutoCompletionTabViewModel(preferencesService.getAutoCompletePreferences());
 
         enableAutoComplete
             .selectedProperty()
             .bindBidirectional(viewModel.enableAutoCompleteProperty());
-        autoCompleteFields
-            .textProperty()
-            .bindBidirectional(viewModel.autoCompleteFieldsProperty());
+        autoCompleteFields.textProperty().bindBidirectional(viewModel.autoCompleteFieldsProperty());
         autoCompleteFirstLast
             .selectedProperty()
             .bindBidirectional(viewModel.autoCompleteFirstLastProperty());
         autoCompleteLastFirst
             .selectedProperty()
             .bindBidirectional(viewModel.autoCompleteLastFirstProperty());
-        autoCompleteBoth
-            .selectedProperty()
-            .bindBidirectional(viewModel.autoCompleteBothProperty());
+        autoCompleteBoth.selectedProperty().bindBidirectional(viewModel.autoCompleteBothProperty());
         firstNameModeAbbreviated
             .selectedProperty()
             .bindBidirectional(viewModel.firstNameModeAbbreviatedProperty());
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 47229ac276d..e27000fb7f5 100644
--- a/src/main/java/org/jabref/gui/preferences/autocompletion/AutoCompletionTabViewModel.java
+++ b/src/main/java/org/jabref/gui/preferences/autocompletion/AutoCompletionTabViewModel.java
@@ -14,50 +14,34 @@
 
 public class AutoCompletionTabViewModel implements PreferenceTabViewModel {
 
-    private final BooleanProperty enableAutoCompleteProperty =
-        new SimpleBooleanProperty();
-    private final StringProperty autoCompleteFieldsProperty =
-        new SimpleStringProperty();
-    private final BooleanProperty autoCompleteFirstLastProperty =
-        new SimpleBooleanProperty();
-    private final BooleanProperty autoCompleteLastFirstProperty =
-        new SimpleBooleanProperty();
-    private final BooleanProperty autoCompleteBothProperty =
-        new SimpleBooleanProperty();
-    private final BooleanProperty firstNameModeAbbreviatedProperty =
-        new SimpleBooleanProperty();
-    private final BooleanProperty firstNameModeFullProperty =
-        new SimpleBooleanProperty();
-    private final BooleanProperty firstNameModeBothProperty =
-        new SimpleBooleanProperty();
+    private final BooleanProperty enableAutoCompleteProperty = new SimpleBooleanProperty();
+    private final StringProperty autoCompleteFieldsProperty = new SimpleStringProperty();
+    private final BooleanProperty autoCompleteFirstLastProperty = new SimpleBooleanProperty();
+    private final BooleanProperty autoCompleteLastFirstProperty = new SimpleBooleanProperty();
+    private final BooleanProperty autoCompleteBothProperty = new SimpleBooleanProperty();
+    private final BooleanProperty firstNameModeAbbreviatedProperty = new SimpleBooleanProperty();
+    private final BooleanProperty firstNameModeFullProperty = new SimpleBooleanProperty();
+    private final BooleanProperty firstNameModeBothProperty = new SimpleBooleanProperty();
 
     private final AutoCompletePreferences autoCompletePreferences;
 
     private final List<String> restartWarnings = new ArrayList<>();
 
-    public AutoCompletionTabViewModel(
-        AutoCompletePreferences autoCompletePreferences
-    ) {
+    public AutoCompletionTabViewModel(AutoCompletePreferences autoCompletePreferences) {
         this.autoCompletePreferences = autoCompletePreferences;
     }
 
     @Override
     public void setValues() {
-        enableAutoCompleteProperty.setValue(
-            autoCompletePreferences.shouldAutoComplete()
-        );
-        autoCompleteFieldsProperty.setValue(
-            autoCompletePreferences.getCompleteNamesAsString()
-        );
+        enableAutoCompleteProperty.setValue(autoCompletePreferences.shouldAutoComplete());
+        autoCompleteFieldsProperty.setValue(autoCompletePreferences.getCompleteNamesAsString());
 
         if (
-            autoCompletePreferences.getNameFormat() ==
-            AutoCompletePreferences.NameFormat.FIRST_LAST
+            autoCompletePreferences.getNameFormat() == AutoCompletePreferences.NameFormat.FIRST_LAST
         ) {
             autoCompleteFirstLastProperty.setValue(true);
         } else if (
-            autoCompletePreferences.getNameFormat() ==
-            AutoCompletePreferences.NameFormat.LAST_FIRST
+            autoCompletePreferences.getNameFormat() == AutoCompletePreferences.NameFormat.LAST_FIRST
         ) {
             autoCompleteLastFirstProperty.setValue(true);
         } else {
@@ -65,9 +49,7 @@ public void setValues() {
         }
 
         switch (autoCompletePreferences.getFirstNameMode()) {
-            case ONLY_ABBREVIATED -> firstNameModeAbbreviatedProperty.setValue(
-                true
-            );
+            case ONLY_ABBREVIATED -> firstNameModeAbbreviatedProperty.setValue(true);
             case ONLY_FULL -> firstNameModeFullProperty.setValue(true);
             default -> firstNameModeBothProperty.setValue(true);
         }
@@ -75,61 +57,36 @@ public void setValues() {
 
     @Override
     public void storeSettings() {
-        autoCompletePreferences.setAutoComplete(
-            enableAutoCompleteProperty.getValue()
-        );
+        autoCompletePreferences.setAutoComplete(enableAutoCompleteProperty.getValue());
 
         if (autoCompleteBothProperty.getValue()) {
-            autoCompletePreferences.setNameFormat(
-                AutoCompletePreferences.NameFormat.BOTH
-            );
+            autoCompletePreferences.setNameFormat(AutoCompletePreferences.NameFormat.BOTH);
         } else if (autoCompleteFirstLastProperty.getValue()) {
-            autoCompletePreferences.setNameFormat(
-                AutoCompletePreferences.NameFormat.FIRST_LAST
-            );
+            autoCompletePreferences.setNameFormat(AutoCompletePreferences.NameFormat.FIRST_LAST);
         } else if (autoCompleteLastFirstProperty.getValue()) {
-            autoCompletePreferences.setNameFormat(
-                AutoCompletePreferences.NameFormat.LAST_FIRST
-            );
+            autoCompletePreferences.setNameFormat(AutoCompletePreferences.NameFormat.LAST_FIRST);
         }
 
         if (firstNameModeBothProperty.getValue()) {
-            autoCompletePreferences.setFirstNameMode(
-                AutoCompleteFirstNameMode.BOTH
-            );
+            autoCompletePreferences.setFirstNameMode(AutoCompleteFirstNameMode.BOTH);
         } else if (firstNameModeAbbreviatedProperty.getValue()) {
-            autoCompletePreferences.setFirstNameMode(
-                AutoCompleteFirstNameMode.ONLY_ABBREVIATED
-            );
+            autoCompletePreferences.setFirstNameMode(AutoCompleteFirstNameMode.ONLY_ABBREVIATED);
         } else if (firstNameModeFullProperty.getValue()) {
-            autoCompletePreferences.setFirstNameMode(
-                AutoCompleteFirstNameMode.ONLY_FULL
-            );
+            autoCompletePreferences.setFirstNameMode(AutoCompleteFirstNameMode.ONLY_FULL);
         }
 
-        if (
-            autoCompletePreferences.shouldAutoComplete() !=
-            enableAutoCompleteProperty.getValue()
-        ) {
+        if (autoCompletePreferences.shouldAutoComplete() != enableAutoCompleteProperty.getValue()) {
             if (enableAutoCompleteProperty.getValue()) {
-                restartWarnings.add(
-                    Localization.lang("Auto complete enabled.")
-                );
+                restartWarnings.add(Localization.lang("Auto complete enabled."));
             } else {
-                restartWarnings.add(
-                    Localization.lang("Auto complete disabled.")
-                );
+                restartWarnings.add(Localization.lang("Auto complete disabled."));
             }
         }
 
         autoCompletePreferences.getCompleteFields().clear();
         autoCompletePreferences
             .getCompleteFields()
-            .addAll(
-                FieldFactory.parseFieldList(
-                    autoCompleteFieldsProperty.getValue()
-                )
-            );
+            .addAll(FieldFactory.parseFieldList(autoCompleteFieldsProperty.getValue()));
     }
 
     @Override
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 be7628c1df4..fecd1a3d250 100644
--- a/src/main/java/org/jabref/gui/preferences/citationkeypattern/CitationKeyPatternTab.java
+++ b/src/main/java/org/jabref/gui/preferences/citationkeypattern/CitationKeyPatternTab.java
@@ -68,33 +68,17 @@ public void initialize() {
                 preferencesService.getCitationKeyPatternPreferences()
             );
 
-        overwriteAllow
-            .selectedProperty()
-            .bindBidirectional(viewModel.overwriteAllowProperty());
-        overwriteWarning
-            .selectedProperty()
-            .bindBidirectional(viewModel.overwriteWarningProperty());
-        generateOnSave
-            .selectedProperty()
-            .bindBidirectional(viewModel.generateOnSaveProperty());
-        letterStartA
-            .selectedProperty()
-            .bindBidirectional(viewModel.letterStartAProperty());
-        letterStartB
-            .selectedProperty()
-            .bindBidirectional(viewModel.letterStartBProperty());
-        letterAlwaysAdd
-            .selectedProperty()
-            .bindBidirectional(viewModel.letterAlwaysAddProperty());
-        keyPatternRegex
-            .textProperty()
-            .bindBidirectional(viewModel.keyPatternRegexProperty());
+        overwriteAllow.selectedProperty().bindBidirectional(viewModel.overwriteAllowProperty());
+        overwriteWarning.selectedProperty().bindBidirectional(viewModel.overwriteWarningProperty());
+        generateOnSave.selectedProperty().bindBidirectional(viewModel.generateOnSaveProperty());
+        letterStartA.selectedProperty().bindBidirectional(viewModel.letterStartAProperty());
+        letterStartB.selectedProperty().bindBidirectional(viewModel.letterStartBProperty());
+        letterAlwaysAdd.selectedProperty().bindBidirectional(viewModel.letterAlwaysAddProperty());
+        keyPatternRegex.textProperty().bindBidirectional(viewModel.keyPatternRegexProperty());
         keyPatternReplacement
             .textProperty()
             .bindBidirectional(viewModel.keyPatternReplacementProperty());
-        unwantedCharacters
-            .textProperty()
-            .bindBidirectional(viewModel.unwantedCharactersProperty());
+        unwantedCharacters.textProperty().bindBidirectional(viewModel.unwantedCharactersProperty());
 
         bibtexKeyPatternTable
             .patternListProperty()
@@ -120,13 +104,9 @@ public void setValues() {
         viewModel.setValues();
         bibtexKeyPatternTable.setValues(
             Globals.entryTypesManager.getAllTypes(
-                preferencesService
-                    .getLibraryPreferences()
-                    .getDefaultBibDatabaseMode()
+                preferencesService.getLibraryPreferences().getDefaultBibDatabaseMode()
             ),
-            preferencesService
-                .getCitationKeyPatternPreferences()
-                .getKeyPattern()
+            preferencesService.getCitationKeyPatternPreferences().getKeyPattern()
         );
     }
 
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 52c6dad18ad..3982b97bb44 100644
--- a/src/main/java/org/jabref/gui/preferences/citationkeypattern/CitationKeyPatternTabViewModel.java
+++ b/src/main/java/org/jabref/gui/preferences/citationkeypattern/CitationKeyPatternTabViewModel.java
@@ -17,64 +17,42 @@
 
 public class CitationKeyPatternTabViewModel implements PreferenceTabViewModel {
 
-    private final BooleanProperty overwriteAllowProperty =
-        new SimpleBooleanProperty();
-    private final BooleanProperty overwriteWarningProperty =
-        new SimpleBooleanProperty();
-    private final BooleanProperty generateOnSaveProperty =
-        new SimpleBooleanProperty();
-    private final BooleanProperty letterStartAProperty =
-        new SimpleBooleanProperty();
-    private final BooleanProperty letterStartBProperty =
-        new SimpleBooleanProperty();
-    private final BooleanProperty letterAlwaysAddProperty =
-        new SimpleBooleanProperty();
-    private final StringProperty keyPatternRegexProperty =
-        new SimpleStringProperty();
-    private final StringProperty keyPatternReplacementProperty =
-        new SimpleStringProperty();
-    private final StringProperty unwantedCharactersProperty =
-        new SimpleStringProperty();
+    private final BooleanProperty overwriteAllowProperty = new SimpleBooleanProperty();
+    private final BooleanProperty overwriteWarningProperty = new SimpleBooleanProperty();
+    private final BooleanProperty generateOnSaveProperty = new SimpleBooleanProperty();
+    private final BooleanProperty letterStartAProperty = new SimpleBooleanProperty();
+    private final BooleanProperty letterStartBProperty = new SimpleBooleanProperty();
+    private final BooleanProperty letterAlwaysAddProperty = new SimpleBooleanProperty();
+    private final StringProperty keyPatternRegexProperty = new SimpleStringProperty();
+    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<
-        CitationKeyPatternPanelItemModel
-    > patternListProperty = new SimpleListProperty<>(
-        FXCollections.observableArrayList()
-    );
-    private final ObjectProperty<
-        CitationKeyPatternPanelItemModel
-    > defaultKeyPatternProperty = new SimpleObjectProperty<>(
-        new CitationKeyPatternPanelItemModel(
-            new CitationKeyPatternPanelViewModel.DefaultEntryType(),
-            ""
-        )
-    );
+    private final ListProperty<CitationKeyPatternPanelItemModel> patternListProperty =
+        new SimpleListProperty<>(FXCollections.observableArrayList());
+    private final ObjectProperty<CitationKeyPatternPanelItemModel> defaultKeyPatternProperty =
+        new SimpleObjectProperty<>(
+            new CitationKeyPatternPanelItemModel(
+                new CitationKeyPatternPanelViewModel.DefaultEntryType(),
+                ""
+            )
+        );
 
     private final CitationKeyPatternPreferences keyPatternPreferences;
 
-    public CitationKeyPatternTabViewModel(
-        CitationKeyPatternPreferences keyPatternPreferences
-    ) {
+    public CitationKeyPatternTabViewModel(CitationKeyPatternPreferences keyPatternPreferences) {
         this.keyPatternPreferences = keyPatternPreferences;
     }
 
     @Override
     public void setValues() {
-        overwriteAllowProperty.setValue(
-            !keyPatternPreferences.shouldAvoidOverwriteCiteKey()
-        );
-        overwriteWarningProperty.setValue(
-            keyPatternPreferences.shouldWarnBeforeOverwriteCiteKey()
-        );
-        generateOnSaveProperty.setValue(
-            keyPatternPreferences.shouldGenerateCiteKeysBeforeSaving()
-        );
+        overwriteAllowProperty.setValue(!keyPatternPreferences.shouldAvoidOverwriteCiteKey());
+        overwriteWarningProperty.setValue(keyPatternPreferences.shouldWarnBeforeOverwriteCiteKey());
+        generateOnSaveProperty.setValue(keyPatternPreferences.shouldGenerateCiteKeysBeforeSaving());
 
         if (
-            keyPatternPreferences.getKeySuffix() ==
-            CitationKeyPatternPreferences.KeySuffix.ALWAYS
+            keyPatternPreferences.getKeySuffix() == CitationKeyPatternPreferences.KeySuffix.ALWAYS
         ) {
             letterAlwaysAddProperty.setValue(true);
             letterStartAProperty.setValue(false);
@@ -92,15 +70,9 @@ public void setValues() {
             letterStartBProperty.setValue(true);
         }
 
-        keyPatternRegexProperty.setValue(
-            keyPatternPreferences.getKeyPatternRegex()
-        );
-        keyPatternReplacementProperty.setValue(
-            keyPatternPreferences.getKeyPatternReplacement()
-        );
-        unwantedCharactersProperty.setValue(
-            keyPatternPreferences.getUnwantedCharacters()
-        );
+        keyPatternRegexProperty.setValue(keyPatternPreferences.getKeyPatternRegex());
+        keyPatternReplacementProperty.setValue(keyPatternPreferences.getKeyPatternReplacement());
+        unwantedCharactersProperty.setValue(keyPatternPreferences.getUnwantedCharacters());
     }
 
     @Override
@@ -112,22 +84,15 @@ public void storeSettings() {
             String patternString = item.getPattern();
             if (!item.getEntryType().getName().equals("default")) {
                 if (!patternString.trim().isEmpty()) {
-                    newKeyPattern.addCitationKeyPattern(
-                        item.getEntryType(),
-                        patternString
-                    );
+                    newKeyPattern.addCitationKeyPattern(item.getEntryType(), patternString);
                 }
             }
         });
 
-        if (
-            !defaultKeyPatternProperty.getValue().getPattern().trim().isEmpty()
-        ) {
+        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
             // at the end of the pattern
-            newKeyPattern.setDefaultValue(
-                defaultKeyPatternProperty.getValue().getPattern()
-            );
+            newKeyPattern.setDefaultValue(defaultKeyPatternProperty.getValue().getPattern());
         }
 
         CitationKeyPatternPreferences.KeySuffix keySuffix =
@@ -139,25 +104,13 @@ public void storeSettings() {
             keySuffix = CitationKeyPatternPreferences.KeySuffix.SECOND_WITH_B;
         }
 
-        keyPatternPreferences.setAvoidOverwriteCiteKey(
-            !overwriteAllowProperty.getValue()
-        );
-        keyPatternPreferences.setWarnBeforeOverwriteCiteKey(
-            overwriteWarningProperty.getValue()
-        );
-        keyPatternPreferences.setGenerateCiteKeysBeforeSaving(
-            generateOnSaveProperty.getValue()
-        );
+        keyPatternPreferences.setAvoidOverwriteCiteKey(!overwriteAllowProperty.getValue());
+        keyPatternPreferences.setWarnBeforeOverwriteCiteKey(overwriteWarningProperty.getValue());
+        keyPatternPreferences.setGenerateCiteKeysBeforeSaving(generateOnSaveProperty.getValue());
         keyPatternPreferences.setKeySuffix(keySuffix);
-        keyPatternPreferences.setKeyPatternRegex(
-            keyPatternRegexProperty.getValue()
-        );
-        keyPatternPreferences.setKeyPatternReplacement(
-            keyPatternReplacementProperty.getValue()
-        );
-        keyPatternPreferences.setUnwantedCharacters(
-            unwantedCharactersProperty.getValue()
-        );
+        keyPatternPreferences.setKeyPatternRegex(keyPatternRegexProperty.getValue());
+        keyPatternPreferences.setKeyPatternReplacement(keyPatternReplacementProperty.getValue());
+        keyPatternPreferences.setUnwantedCharacters(unwantedCharactersProperty.getValue());
         keyPatternPreferences.setKeyPattern(newKeyPattern);
     }
 
@@ -193,15 +146,11 @@ public StringProperty keyPatternReplacementProperty() {
         return keyPatternReplacementProperty;
     }
 
-    public ListProperty<
-        CitationKeyPatternPanelItemModel
-    > patternListProperty() {
+    public ListProperty<CitationKeyPatternPanelItemModel> patternListProperty() {
         return patternListProperty;
     }
 
-    public ObjectProperty<
-        CitationKeyPatternPanelItemModel
-    > defaultKeyPatternProperty() {
+    public ObjectProperty<CitationKeyPatternPanelItemModel> defaultKeyPatternProperty() {
         return defaultKeyPatternProperty;
     }
 
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 49210d85955..a708fdfc52d 100644
--- a/src/main/java/org/jabref/gui/preferences/customentrytypes/CustomEntryTypeViewModel.java
+++ b/src/main/java/org/jabref/gui/preferences/customentrytypes/CustomEntryTypeViewModel.java
@@ -6,10 +6,7 @@
 
 public class CustomEntryTypeViewModel extends EntryTypeViewModel {
 
-    public CustomEntryTypeViewModel(
-        BibEntryType entryType,
-        Predicate<Field> isMultiline
-    ) {
+    public CustomEntryTypeViewModel(BibEntryType entryType, Predicate<Field> isMultiline) {
         super(entryType, isMultiline);
     }
 }
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 93c95c930d1..e2b184ee769 100644
--- a/src/main/java/org/jabref/gui/preferences/customentrytypes/CustomEntryTypesTab.java
+++ b/src/main/java/org/jabref/gui/preferences/customentrytypes/CustomEntryTypesTab.java
@@ -99,11 +99,7 @@ public void initialize() {
         BibDatabaseMode mode = stateManager
             .getActiveDatabase()
             .map(BibDatabaseContext::getMode)
-            .orElse(
-                preferencesService
-                    .getLibraryPreferences()
-                    .getDefaultBibDatabaseMode()
-            );
+            .orElse(preferencesService.getLibraryPreferences().getDefaultBibDatabaseMode());
         BibEntryTypesManager entryTypesRepository =
             preferencesService.getCustomEntryTypesRepository();
 
@@ -134,11 +130,7 @@ public void initialize() {
                 addNewEntryType,
                 true
             );
-            visualizer.initVisualization(
-                viewModel.fieldValidationStatus(),
-                addNewField,
-                true
-            );
+            visualizer.initVisualization(viewModel.fieldValidationStatus(), addNewField, true);
         });
     }
 
@@ -179,9 +171,7 @@ private void setupEntryTypesTable() {
                 if (type instanceof CustomEntryTypeViewModel) {
                     return evt ->
                         viewModel.removeEntryType(
-                            entryTypesTable
-                                .getSelectionModel()
-                                .getSelectedItem()
+                            entryTypesTable.getSelectionModel().getSelectedItem()
                         );
                 } else {
                     return evt -> {};
@@ -192,9 +182,7 @@ private void setupEntryTypesTable() {
         viewModel
             .selectedEntryTypeProperty()
             .bind(entryTypesTable.getSelectionModel().selectedItemProperty());
-        viewModel
-            .entryTypeToAddProperty()
-            .bindBidirectional(addNewEntryType.textProperty());
+        viewModel.entryTypeToAddProperty().bindBidirectional(addNewEntryType.textProperty());
 
         EasyBind.subscribe(
             viewModel.selectedEntryTypeProperty(),
@@ -210,32 +198,23 @@ private void setupEntryTypesTable() {
     }
 
     private void setupFieldsTable() {
-        fieldNameColumn.setCellValueFactory(item ->
-            item.getValue().displayNameProperty()
-        );
+        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")
-                    );
+                    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();
+                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) &&
@@ -249,32 +228,21 @@ private void setupFieldsTable() {
                     );
                     event.getTableView().edit(-1, null);
                 } else {
-                    fieldViewModel
-                        .displayNameProperty()
-                        .setValue(newDisplayName);
+                    fieldViewModel.displayNameProperty().setValue(newDisplayName);
                 }
                 event.getTableView().refresh();
             }
         );
 
-        fieldTypeColumn.setCellFactory(
-            CheckBoxTableCell.forTableColumn(fieldTypeColumn)
-        );
-        fieldTypeColumn.setCellValueFactory(item ->
-            item.getValue().requiredProperty()
-        );
+        fieldTypeColumn.setCellFactory(CheckBoxTableCell.forTableColumn(fieldTypeColumn));
+        fieldTypeColumn.setCellValueFactory(item -> item.getValue().requiredProperty());
         makeRotatedColumnHeader(fieldTypeColumn, Localization.lang("Required"));
 
         fieldTypeMultilineColumn.setCellFactory(
             CheckBoxTableCell.forTableColumn(fieldTypeMultilineColumn)
         );
-        fieldTypeMultilineColumn.setCellValueFactory(item ->
-            item.getValue().multilineProperty()
-        );
-        makeRotatedColumnHeader(
-            fieldTypeMultilineColumn,
-            Localization.lang("Multiline")
-        );
+        fieldTypeMultilineColumn.setCellValueFactory(item -> item.getValue().multilineProperty());
+        makeRotatedColumnHeader(fieldTypeMultilineColumn, Localization.lang("Multiline"));
 
         fieldTypeActionColumn.setSortable(false);
         fieldTypeActionColumn.setReorderable(false);
@@ -284,20 +252,12 @@ private void setupFieldsTable() {
         );
 
         new ValueTableCellFactory<FieldViewModel, String>()
-            .withGraphic(item ->
-                IconTheme.JabRefIcons.DELETE_ENTRY.getGraphicNode()
-            )
+            .withGraphic(item -> IconTheme.JabRefIcons.DELETE_ENTRY.getGraphicNode())
             .withTooltip(name ->
-                Localization.lang(
-                    "Remove field %0 from currently selected entry type",
-                    name
-                )
+                Localization.lang("Remove field %0 from currently selected entry type", name)
             )
             .withOnMouseClickedEvent(item ->
-                evt ->
-                    viewModel.removeField(
-                        fields.getSelectionModel().getSelectedItem()
-                    )
+                evt -> viewModel.removeField(fields.getSelectionModel().getSelectedItem())
             )
             .install(fieldTypeActionColumn);
 
@@ -311,24 +271,16 @@ private void setupFieldsTable() {
         addNewField.setItems(viewModel.fieldsForAdding());
         addNewField.setConverter(FieldsUtil.FIELD_STRING_CONVERTER);
 
-        viewModel
-            .newFieldToAddProperty()
-            .bindBidirectional(addNewField.valueProperty());
+        viewModel.newFieldToAddProperty().bindBidirectional(addNewField.valueProperty());
         // 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)
-                )
+            text -> addNewField.setValue(FieldsUtil.FIELD_STRING_CONVERTER.fromString(text))
         );
     }
 
-    private void makeRotatedColumnHeader(
-        TableColumn<?, ?> column,
-        String text
-    ) {
+    private void makeRotatedColumnHeader(TableColumn<?, ?> column, String text) {
         Label label = new Label();
         label.setText(text);
         label.setRotate(-90);
@@ -373,9 +325,7 @@ private void handleOnDragDropped(
         DragEvent event
     ) {
         if (localDragboard.hasType(FieldViewModel.class)) {
-            FieldViewModel field = localDragboard.getValue(
-                FieldViewModel.class
-            );
+            FieldViewModel field = localDragboard.getValue(FieldViewModel.class);
             fields.getItems().remove(field);
 
             if (row.isEmpty()) {
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 1e61a2ed752..40b7b1e2634 100644
--- a/src/main/java/org/jabref/gui/preferences/customentrytypes/CustomEntryTypesTabViewModel.java
+++ b/src/main/java/org/jabref/gui/preferences/customentrytypes/CustomEntryTypesTabViewModel.java
@@ -38,15 +38,13 @@
 
 public class CustomEntryTypesTabViewModel implements PreferenceTabViewModel {
 
-    private final ObservableList<Field> fieldsForAdding =
-        FXCollections.observableArrayList(
-            FieldFactory.getStandardFieldsWithCitationKey()
-        );
+    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 ObjectProperty<Field> newFieldToAdd = new SimpleObjectProperty<>();
     private final ObservableList<EntryTypeViewModel> entryTypesWithFields =
         FXCollections.observableArrayList(extractor ->
             new Observable[] { extractor.entryType(), extractor.fields() }
@@ -86,21 +84,15 @@ public CustomEntryTypesTabViewModel(
                 entryTypeToAdd,
                 StringUtil::isNotBlank,
                 ValidationMessage.error(
-                    Localization.lang(
-                        "Entry type cannot be empty. Please enter a name."
-                    )
+                    Localization.lang("Entry type cannot be empty. Please enter a name.")
                 )
             );
         fieldValidator =
             new FunctionBasedValidator<>(
                 newFieldToAdd,
-                input ->
-                    (input != null) &&
-                    StringUtil.isNotBlank(input.getDisplayName()),
+                input -> (input != null) && StringUtil.isNotBlank(input.getDisplayName()),
                 ValidationMessage.error(
-                    Localization.lang(
-                        "Field cannot be empty. Please enter a name."
-                    )
+                    Localization.lang("Field cannot be empty. Please enter a name.")
                 )
             );
     }
@@ -110,20 +102,12 @@ public void setValues() {
         if (!this.entryTypesWithFields.isEmpty()) {
             this.entryTypesWithFields.clear();
         }
-        Collection<BibEntryType> allTypes = entryTypesManager.getAllTypes(
-            bibDatabaseMode
-        );
+        Collection<BibEntryType> allTypes = entryTypesManager.getAllTypes(bibDatabaseMode);
 
         for (BibEntryType entryType : allTypes) {
             EntryTypeViewModel viewModel;
-            if (
-                entryTypesManager.isCustomType(
-                    entryType.getType(),
-                    bibDatabaseMode
-                )
-            ) {
-                viewModel =
-                    new CustomEntryTypeViewModel(entryType, isMultiline);
+            if (entryTypesManager.isCustomType(entryType.getType(), bibDatabaseMode)) {
+                viewModel = new CustomEntryTypeViewModel(entryType, isMultiline);
             } else {
                 viewModel = new EntryTypeViewModel(entryType, isMultiline);
             }
@@ -157,40 +141,26 @@ public void storeSettings() {
                 .map(FieldViewModel::toBibField)
                 .collect(Collectors.toList());
 
-            BibEntryType newType = new BibEntryType(
-                type.getType(),
-                fields,
-                required
-            );
+            BibEntryType newType = new BibEntryType(type.getType(), fields, required);
             entryTypesManager.addCustomOrModifiedType(newType, bibDatabaseMode);
         }
 
         for (var entryType : entryTypesToDelete) {
-            entryTypesManager.removeCustomOrModifiedEntryType(
-                entryType,
-                bibDatabaseMode
-            );
+            entryTypesManager.removeCustomOrModifiedEntryType(entryType, bibDatabaseMode);
         }
 
-        preferencesService
-            .getFieldPreferences()
-            .setNonWrappableFields(multilineFields);
+        preferencesService.getFieldPreferences().setNonWrappableFields(multilineFields);
         preferencesService.storeCustomEntryTypesRepository(entryTypesManager);
     }
 
     public EntryTypeViewModel addNewCustomEntryType() {
-        EntryType newentryType = new UnknownEntryType(
-            entryTypeToAdd.getValue()
-        );
+        EntryType newentryType = new UnknownEntryType(entryTypeToAdd.getValue());
         BibEntryType type = new BibEntryType(
             newentryType,
             new ArrayList<>(),
             Collections.emptyList()
         );
-        EntryTypeViewModel viewModel = new CustomEntryTypeViewModel(
-            type,
-            isMultiline
-        );
+        EntryTypeViewModel viewModel = new CustomEntryTypeViewModel(type, isMultiline);
         this.entryTypesWithFields.add(viewModel);
         this.entryTypeToAdd.setValue("");
 
@@ -229,15 +199,11 @@ public void addNewField() {
     }
 
     public boolean displayNameExists(String displayName) {
-        ObservableList<FieldViewModel> entryFields =
-            this.selectedEntryType.getValue().fields();
+        ObservableList<FieldViewModel> entryFields = this.selectedEntryType.getValue().fields();
         return entryFields
             .stream()
             .anyMatch(fieldViewModel ->
-                fieldViewModel
-                    .displayNameProperty()
-                    .getValue()
-                    .equals(displayName)
+                fieldViewModel.displayNameProperty().getValue().equals(displayName)
             );
     }
 
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 17f430b7684..c4b51401c29 100644
--- a/src/main/java/org/jabref/gui/preferences/customentrytypes/EntryTypeViewModel.java
+++ b/src/main/java/org/jabref/gui/preferences/customentrytypes/EntryTypeViewModel.java
@@ -15,14 +15,10 @@
 
 public class EntryTypeViewModel {
 
-    private final ObjectProperty<BibEntryType> entryType =
-        new SimpleObjectProperty<>();
+    private final ObjectProperty<BibEntryType> entryType = new SimpleObjectProperty<>();
     private final ObservableList<FieldViewModel> fields;
 
-    public EntryTypeViewModel(
-        BibEntryType entryType,
-        Predicate<Field> isMultiline
-    ) {
+    public EntryTypeViewModel(BibEntryType entryType, Predicate<Field> isMultiline) {
         this.entryType.set(entryType);
         List<FieldViewModel> allFieldsForType = entryType
             .getAllBibFields()
@@ -55,10 +51,7 @@ public boolean equals(Object obj) {
             return false;
         }
         EntryTypeViewModel other = (EntryTypeViewModel) obj;
-        return (
-            Objects.equals(entryType, other.entryType) &&
-            Objects.equals(fields, other.fields)
-        );
+        return (Objects.equals(entryType, other.entryType) && Objects.equals(fields, other.fields));
     }
 
     public void addField(FieldViewModel field) {
@@ -79,12 +72,6 @@ public void removeField(FieldViewModel focusedItem) {
 
     @Override
     public String toString() {
-        return (
-            "CustomEntryTypeViewModel [entryType=" +
-            entryType +
-            ", fields=" +
-            fields +
-            "]"
-        );
+        return ("CustomEntryTypeViewModel [entryType=" + entryType + ", fields=" + fields + "]");
     }
 }
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 a66833ab368..5b29230c8cd 100644
--- a/src/main/java/org/jabref/gui/preferences/customentrytypes/FieldViewModel.java
+++ b/src/main/java/org/jabref/gui/preferences/customentrytypes/FieldViewModel.java
@@ -18,8 +18,7 @@ public class FieldViewModel {
     private final StringProperty displayName = new SimpleStringProperty("");
     private final BooleanProperty required = new SimpleBooleanProperty();
     private final BooleanProperty multiline = new SimpleBooleanProperty();
-    private final ObjectProperty<FieldPriority> priorityProperty =
-        new SimpleObjectProperty<>();
+    private final ObjectProperty<FieldPriority> priorityProperty = new SimpleObjectProperty<>();
 
     public FieldViewModel(
         Field field,
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 b7a0aba6d2c..0ed93d3045f 100644
--- a/src/main/java/org/jabref/gui/preferences/customexporter/CustomExporterTab.java
+++ b/src/main/java/org/jabref/gui/preferences/customexporter/CustomExporterTab.java
@@ -38,24 +38,17 @@ public String getTabName() {
 
     @FXML
     private void initialize() {
-        viewModel =
-            new CustomExporterTabViewModel(preferencesService, dialogService);
+        viewModel = new CustomExporterTabViewModel(preferencesService, dialogService);
 
-        exporterTable
-            .getSelectionModel()
-            .setSelectionMode(SelectionMode.MULTIPLE);
+        exporterTable.getSelectionModel().setSelectionMode(SelectionMode.MULTIPLE);
         exporterTable.itemsProperty().bind(viewModel.exportersProperty());
         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()
-        );
+        layoutColumn.setCellValueFactory(cellData -> cellData.getValue().layoutFileName());
+        extensionColumn.setCellValueFactory(cellData -> cellData.getValue().extension());
     }
 
     @FXML
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 b1621c45f3a..da6d79b4192 100644
--- a/src/main/java/org/jabref/gui/preferences/customexporter/CustomExporterTabViewModel.java
+++ b/src/main/java/org/jabref/gui/preferences/customexporter/CustomExporterTabViewModel.java
@@ -15,18 +15,17 @@
 
 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 PreferencesService preferences;
     private final DialogService dialogService;
 
-    public CustomExporterTabViewModel(
-        PreferencesService preferences,
-        DialogService dialogService
-    ) {
+    public CustomExporterTabViewModel(PreferencesService preferences, DialogService dialogService) {
         this.preferences = preferences;
         this.dialogService = dialogService;
     }
@@ -52,10 +51,8 @@ public void storeSettings() {
     }
 
     public void addExporter() {
-        CreateModifyExporterDialogView dialog =
-            new CreateModifyExporterDialogView(null);
-        Optional<ExporterViewModel> exporter =
-            dialogService.showCustomDialogAndWait(dialog);
+        CreateModifyExporterDialogView dialog = new CreateModifyExporterDialogView(null);
+        Optional<ExporterViewModel> exporter = dialogService.showCustomDialogAndWait(dialog);
         if ((exporter != null) && exporter.isPresent()) {
             exporters.add(exporter.get());
         }
@@ -67,10 +64,10 @@ public void modifyExporter() {
         }
 
         ExporterViewModel exporterToModify = selectedExporters.get(0);
-        CreateModifyExporterDialogView dialog =
-            new CreateModifyExporterDialogView(exporterToModify);
-        Optional<ExporterViewModel> exporter =
-            dialogService.showCustomDialogAndWait(dialog);
+        CreateModifyExporterDialogView dialog = new CreateModifyExporterDialogView(
+            exporterToModify
+        );
+        Optional<ExporterViewModel> exporter = dialogService.showCustomDialogAndWait(dialog);
         if ((exporter != null) && exporter.isPresent()) {
             exporters.remove(exporterToModify);
             exporters.add(exporter.get());
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 9b127f85662..75dbc4108cf 100644
--- a/src/main/java/org/jabref/gui/preferences/customimporter/CustomImporterTab.java
+++ b/src/main/java/org/jabref/gui/preferences/customimporter/CustomImporterTab.java
@@ -44,37 +44,26 @@ public String getTabName() {
 
     @FXML
     private void initialize() {
-        viewModel =
-            new CustomImporterTabViewModel(preferencesService, dialogService);
+        viewModel = new CustomImporterTabViewModel(preferencesService, dialogService);
 
-        importerTable
-            .getSelectionModel()
-            .setSelectionMode(SelectionMode.MULTIPLE);
+        importerTable.getSelectionModel().setSelectionMode(SelectionMode.MULTIPLE);
         importerTable.itemsProperty().bind(viewModel.importersProperty());
         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()
-        );
+        classColumn.setCellValueFactory(cellData -> cellData.getValue().className());
+        basePathColumn.setCellValueFactory(cellData -> cellData.getValue().basePath());
         new ViewModelTableRowFactory<ImporterViewModel>()
             .withTooltip(importer -> importer.getLogic().getDescription())
             .install(importerTable);
 
         addButton.setTooltip(
             new Tooltip(
-                Localization.lang(
-                    "Add a (compiled) custom Importer class from a class path."
-                ) +
+                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."
-                )
+                Localization.lang("The path need not be on the classpath of JabRef.")
             )
         );
     }
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 71fc7e5d112..b75d8daa330 100644
--- a/src/main/java/org/jabref/gui/preferences/customimporter/CustomImporterTabViewModel.java
+++ b/src/main/java/org/jabref/gui/preferences/customimporter/CustomImporterTabViewModel.java
@@ -24,22 +24,19 @@
 
 public class CustomImporterTabViewModel implements PreferenceTabViewModel {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(
-        CustomImporterTabViewModel.class
-    );
+    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 PreferencesService preferences;
     private final DialogService dialogService;
 
-    public CustomImporterTabViewModel(
-        PreferencesService preferences,
-        DialogService dialogService
-    ) {
+    public CustomImporterTabViewModel(PreferencesService preferences, DialogService dialogService) {
         this.preferences = preferences;
         this.dialogService = dialogService;
     }
@@ -60,10 +57,7 @@ public void storeSettings() {
         preferences
             .getImporterPreferences()
             .setCustomImporters(
-                importers
-                    .stream()
-                    .map(ImporterViewModel::getLogic)
-                    .collect(Collectors.toSet())
+                importers.stream().map(ImporterViewModel::getLogic).collect(Collectors.toSet())
             );
     }
 
@@ -89,51 +83,31 @@ 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
-        );
+        Optional<Path> selectedFile = dialogService.showFileOpenDialog(fileDialogConfiguration);
 
-        if (
-            selectedFile.isPresent() && (selectedFile.get().getParent() != null)
-        ) {
+        if (selectedFile.isPresent() && (selectedFile.get().getParent() != null)) {
             boolean isArchive = FileUtil
                 .getFileExtension(selectedFile.get())
                 .filter(extension ->
-                    "jar".equalsIgnoreCase(extension) ||
-                    "zip".equalsIgnoreCase(extension)
+                    "jar".equalsIgnoreCase(extension) || "zip".equalsIgnoreCase(extension)
                 )
                 .isPresent();
 
             if (isArchive) {
                 try {
                     Optional<Path> selectedFileInArchive =
-                        dialogService.showFileOpenFromArchiveDialog(
-                            selectedFile.get()
-                        );
+                        dialogService.showFileOpenFromArchiveDialog(selectedFile.get());
                     if (selectedFileInArchive.isPresent()) {
                         String className = selectedFileInArchive
                             .get()
                             .toString()
-                            .substring(
-                                0,
-                                selectedFileInArchive
-                                    .get()
-                                    .toString()
-                                    .lastIndexOf('.')
-                            )
+                            .substring(0, selectedFileInArchive.get().toString().lastIndexOf('.'))
                             .replace("/", ".");
                         CustomImporter importer = new CustomImporter(
                             selectedFile.get().toAbsolutePath().toString(),
@@ -144,37 +118,23 @@ public void addImporter() {
                 } catch (IOException exc) {
                     LOGGER.error("Could not open ZIP-archive.", exc);
                     dialogService.showErrorDialogAndWait(
-                        Localization.lang(
-                            "Could not open %0",
-                            selectedFile.get().toString()
-                        ) +
+                        Localization.lang("Could not open %0", selectedFile.get().toString()) +
                         "\n" +
-                        Localization.lang(
-                            "Have you chosen the correct package path?"
-                        ),
+                        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"
-                        ),
+                        Localization.lang("Could not instantiate %0 %1", "importer"),
                         exc
                     );
                 }
             } else {
                 try {
                     String basePath = selectedFile.get().getParent().toString();
-                    String className = pathToClass(
-                        basePath,
-                        selectedFile.get()
-                    );
-                    CustomImporter importer = new CustomImporter(
-                        basePath,
-                        className
-                    );
+                    String className = pathToClass(basePath, selectedFile.get());
+                    CustomImporter importer = new CustomImporter(basePath, className);
 
                     importers.add(new ImporterViewModel(importer));
                 } catch (Exception exc) {
@@ -187,10 +147,7 @@ public void addImporter() {
                         exc
                     );
                 } catch (NoClassDefFoundError exc) {
-                    LOGGER.error(
-                        "Could not find class while instantiating importer",
-                        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?",
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 d681a5694a1..62cc7a01dbc 100644
--- a/src/main/java/org/jabref/gui/preferences/entry/EntryTab.java
+++ b/src/main/java/org/jabref/gui/preferences/entry/EntryTab.java
@@ -61,9 +61,7 @@ public EntryTab() {
     public void initialize() {
         this.viewModel = new EntryTabViewModel(preferencesService);
 
-        keywordSeparator
-            .textProperty()
-            .bindBidirectional(viewModel.keywordSeparatorProperty());
+        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 -> {
@@ -72,41 +70,25 @@ public void initialize() {
             }
             return null; // null means the change is rejected
         };
-        TextFormatter<String> formatter = new TextFormatter<>(
-            singleCharacterFilter
-        );
+        TextFormatter<String> formatter = new TextFormatter<>(singleCharacterFilter);
 
         keywordSeparator.setTextFormatter(formatter);
 
-        resolveStrings
-            .selectedProperty()
-            .bindBidirectional(viewModel.resolveStringsProperty());
+        resolveStrings.selectedProperty().bindBidirectional(viewModel.resolveStringsProperty());
         resolveStringsForFields
             .textProperty()
             .bindBidirectional(viewModel.resolveStringsForFieldsProperty());
-        nonWrappableFields
-            .textProperty()
-            .bindBidirectional(viewModel.nonWrappableFieldsProperty());
+        nonWrappableFields.textProperty().bindBidirectional(viewModel.nonWrappableFieldsProperty());
 
-        markOwner
-            .selectedProperty()
-            .bindBidirectional(viewModel.markOwnerProperty());
-        markOwnerName
-            .textProperty()
-            .bindBidirectional(viewModel.markOwnerNameProperty());
-        markOwnerName
-            .disableProperty()
-            .bind(markOwner.selectedProperty().not());
+        markOwner.selectedProperty().bindBidirectional(viewModel.markOwnerProperty());
+        markOwnerName.textProperty().bindBidirectional(viewModel.markOwnerNameProperty());
+        markOwnerName.disableProperty().bind(markOwner.selectedProperty().not());
         markOwnerOverwrite
             .selectedProperty()
             .bindBidirectional(viewModel.markOwnerOverwriteProperty());
-        markOwnerOverwrite
-            .disableProperty()
-            .bind(markOwner.selectedProperty().not());
+        markOwnerOverwrite.disableProperty().bind(markOwner.selectedProperty().not());
 
-        addCreationDate
-            .selectedProperty()
-            .bindBidirectional(viewModel.addCreationDateProperty());
+        addCreationDate.selectedProperty().bindBidirectional(viewModel.addCreationDateProperty());
         addModificationDate
             .selectedProperty()
             .bindBidirectional(viewModel.addModificationDateProperty());
@@ -114,11 +96,7 @@ public void initialize() {
         ActionFactory actionFactory = new ActionFactory(keyBindingRepository);
         actionFactory.configureIconButton(
             StandardActions.HELP,
-            new HelpAction(
-                HelpFile.OWNER,
-                dialogService,
-                preferencesService.getFilePreferences()
-            ),
+            new HelpAction(HelpFile.OWNER, dialogService, preferencesService.getFilePreferences()),
             markOwnerHelp
         );
     }
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 dfed9652b0a..a3e791b51b9 100644
--- a/src/main/java/org/jabref/gui/preferences/entry/EntryTabViewModel.java
+++ b/src/main/java/org/jabref/gui/preferences/entry/EntryTabViewModel.java
@@ -14,26 +14,17 @@
 
 public class EntryTabViewModel implements PreferenceTabViewModel {
 
-    private final StringProperty keywordSeparatorProperty =
-        new SimpleStringProperty("");
-
-    private final BooleanProperty resolveStringsProperty =
-        new SimpleBooleanProperty();
-    private final StringProperty resolveStringsForFieldsProperty =
-        new SimpleStringProperty("");
-    private final StringProperty nonWrappableFieldsProperty =
-        new SimpleStringProperty("");
-
-    private final BooleanProperty markOwnerProperty =
-        new SimpleBooleanProperty();
-    private final StringProperty markOwnerNameProperty =
-        new SimpleStringProperty("");
-    private final BooleanProperty markOwnerOverwriteProperty =
-        new SimpleBooleanProperty();
-    private final BooleanProperty addCreationDateProperty =
-        new SimpleBooleanProperty();
-    private final BooleanProperty addModificationDateProperty =
-        new SimpleBooleanProperty();
+    private final StringProperty keywordSeparatorProperty = new SimpleStringProperty("");
+
+    private final BooleanProperty resolveStringsProperty = new SimpleBooleanProperty();
+    private final StringProperty resolveStringsForFieldsProperty = new SimpleStringProperty("");
+    private final StringProperty nonWrappableFieldsProperty = new SimpleStringProperty("");
+
+    private final BooleanProperty markOwnerProperty = new SimpleBooleanProperty();
+    private final StringProperty markOwnerNameProperty = new SimpleStringProperty("");
+    private final BooleanProperty markOwnerOverwriteProperty = new SimpleBooleanProperty();
+    private final BooleanProperty addCreationDateProperty = new SimpleBooleanProperty();
+    private final BooleanProperty addModificationDateProperty = new SimpleBooleanProperty();
 
     private final FieldPreferences fieldPreferences;
     private final BibEntryPreferences bibEntryPreferences;
@@ -44,42 +35,27 @@ public EntryTabViewModel(PreferencesService preferencesService) {
         this.bibEntryPreferences = preferencesService.getBibEntryPreferences();
         this.fieldPreferences = preferencesService.getFieldPreferences();
         this.ownerPreferences = preferencesService.getOwnerPreferences();
-        this.timestampPreferences =
-            preferencesService.getTimestampPreferences();
+        this.timestampPreferences = preferencesService.getTimestampPreferences();
     }
 
     @Override
     public void setValues() {
-        keywordSeparatorProperty.setValue(
-            bibEntryPreferences.getKeywordSeparator().toString()
-        );
+        keywordSeparatorProperty.setValue(bibEntryPreferences.getKeywordSeparator().toString());
 
-        resolveStringsProperty.setValue(
-            fieldPreferences.shouldResolveStrings()
-        );
+        resolveStringsProperty.setValue(fieldPreferences.shouldResolveStrings());
         resolveStringsForFieldsProperty.setValue(
-            FieldFactory.serializeFieldsList(
-                fieldPreferences.getResolvableFields()
-            )
+            FieldFactory.serializeFieldsList(fieldPreferences.getResolvableFields())
         );
         nonWrappableFieldsProperty.setValue(
-            FieldFactory.serializeFieldsList(
-                fieldPreferences.getNonWrappableFields()
-            )
+            FieldFactory.serializeFieldsList(fieldPreferences.getNonWrappableFields())
         );
 
         markOwnerProperty.setValue(ownerPreferences.isUseOwner());
         markOwnerNameProperty.setValue(ownerPreferences.getDefaultOwner());
-        markOwnerOverwriteProperty.setValue(
-            ownerPreferences.isOverwriteOwner()
-        );
+        markOwnerOverwriteProperty.setValue(ownerPreferences.isOverwriteOwner());
 
-        addCreationDateProperty.setValue(
-            timestampPreferences.shouldAddCreationDate()
-        );
-        addModificationDateProperty.setValue(
-            timestampPreferences.shouldAddModificationDate()
-        );
+        addCreationDateProperty.setValue(timestampPreferences.shouldAddCreationDate());
+        addModificationDateProperty.setValue(timestampPreferences.shouldAddModificationDate());
     }
 
     @Override
@@ -90,28 +66,18 @@ public void storeSettings() {
 
         fieldPreferences.setResolveStrings(resolveStringsProperty.getValue());
         fieldPreferences.setResolvableFields(
-            FieldFactory.parseFieldList(
-                resolveStringsForFieldsProperty.getValue().trim()
-            )
+            FieldFactory.parseFieldList(resolveStringsForFieldsProperty.getValue().trim())
         );
         fieldPreferences.setNonWrappableFields(
-            FieldFactory.parseFieldList(
-                nonWrappableFieldsProperty.getValue().trim()
-            )
+            FieldFactory.parseFieldList(nonWrappableFieldsProperty.getValue().trim())
         );
 
         ownerPreferences.setUseOwner(markOwnerProperty.getValue());
         ownerPreferences.setDefaultOwner(markOwnerNameProperty.getValue());
-        ownerPreferences.setOverwriteOwner(
-            markOwnerOverwriteProperty.getValue()
-        );
+        ownerPreferences.setOverwriteOwner(markOwnerOverwriteProperty.getValue());
 
-        timestampPreferences.setAddCreationDate(
-            addCreationDateProperty.getValue()
-        );
-        timestampPreferences.setAddModificationDate(
-            addModificationDateProperty.getValue()
-        );
+        timestampPreferences.setAddCreationDate(addCreationDateProperty.getValue());
+        timestampPreferences.setAddModificationDate(addModificationDateProperty.getValue());
     }
 
     public StringProperty keywordSeparatorProperty() {
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 af35eb447bb..079b89927e2 100644
--- a/src/main/java/org/jabref/gui/preferences/entryeditor/EntryEditorTab.java
+++ b/src/main/java/org/jabref/gui/preferences/entryeditor/EntryEditorTab.java
@@ -68,15 +68,10 @@ public String getTabName() {
     }
 
     public void initialize() {
-        this.viewModel =
-            new EntryEditorTabViewModel(dialogService, preferencesService);
+        this.viewModel = new EntryEditorTabViewModel(dialogService, preferencesService);
 
-        openOnNewEntry
-            .selectedProperty()
-            .bindBidirectional(viewModel.openOnNewEntryProperty());
-        defaultSource
-            .selectedProperty()
-            .bindBidirectional(viewModel.defaultSourceProperty());
+        openOnNewEntry.selectedProperty().bindBidirectional(viewModel.openOnNewEntryProperty());
+        defaultSource.selectedProperty().bindBidirectional(viewModel.defaultSourceProperty());
         enableRelatedArticlesTab
             .selectedProperty()
             .bindBidirectional(viewModel.enableRelatedArticlesTabProperty());
@@ -86,25 +81,17 @@ public void initialize() {
         enableLatexCitationsTab
             .selectedProperty()
             .bindBidirectional(viewModel.enableLatexCitationsTabProperty());
-        enableValidation
-            .selectedProperty()
-            .bindBidirectional(viewModel.enableValidationProperty());
+        enableValidation.selectedProperty().bindBidirectional(viewModel.enableValidationProperty());
         allowIntegerEdition
             .selectedProperty()
             .bindBidirectional(viewModel.allowIntegerEditionProperty());
-        journalPopupEnabled
-            .selectedProperty()
-            .bindBidirectional(viewModel.journalPopupProperty());
+        journalPopupEnabled.selectedProperty().bindBidirectional(viewModel.journalPopupProperty());
         autoLinkFilesEnabled
             .selectedProperty()
             .bindBidirectional(viewModel.autoLinkFilesEnabledProperty());
-        enableSciteTab
-            .selectedProperty()
-            .bindBidirectional(viewModel.enableSciteTabProperty());
+        enableSciteTab.selectedProperty().bindBidirectional(viewModel.enableSciteTabProperty());
 
-        fieldsTextArea
-            .textProperty()
-            .bindBidirectional(viewModel.fieldsProperty());
+        fieldsTextArea.textProperty().bindBidirectional(viewModel.fieldsProperty());
 
         ActionFactory actionFactory = new ActionFactory(keyBindingRepository);
         actionFactory.configureIconButton(
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 9f5b3178e6b..f66256a5b59 100644
--- a/src/main/java/org/jabref/gui/preferences/entryeditor/EntryEditorTabViewModel.java
+++ b/src/main/java/org/jabref/gui/preferences/entryeditor/EntryEditorTabViewModel.java
@@ -19,26 +19,16 @@
 
 public class EntryEditorTabViewModel implements PreferenceTabViewModel {
 
-    private final BooleanProperty openOnNewEntryProperty =
-        new SimpleBooleanProperty();
-    private final BooleanProperty defaultSourceProperty =
-        new SimpleBooleanProperty();
-    private final BooleanProperty enableRelatedArticlesTabProperty =
-        new SimpleBooleanProperty();
-    private final BooleanProperty acceptRecommendationsProperty =
-        new SimpleBooleanProperty();
-    private final BooleanProperty enableLatexCitationsTabProperty =
-        new SimpleBooleanProperty();
-    private final BooleanProperty enableValidationProperty =
-        new SimpleBooleanProperty();
-    private final BooleanProperty allowIntegerEditionProperty =
-        new SimpleBooleanProperty();
-    private final BooleanProperty journalPopupProperty =
-        new SimpleBooleanProperty();
-    private final BooleanProperty autoLinkEnabledProperty =
-        new SimpleBooleanProperty();
-    private final BooleanProperty enableSciteTabProperty =
-        new SimpleBooleanProperty();
+    private final BooleanProperty openOnNewEntryProperty = new SimpleBooleanProperty();
+    private final BooleanProperty defaultSourceProperty = new SimpleBooleanProperty();
+    private final BooleanProperty enableRelatedArticlesTabProperty = new SimpleBooleanProperty();
+    private final BooleanProperty acceptRecommendationsProperty = new SimpleBooleanProperty();
+    private final BooleanProperty enableLatexCitationsTabProperty = new SimpleBooleanProperty();
+    private final BooleanProperty enableValidationProperty = new SimpleBooleanProperty();
+    private final BooleanProperty allowIntegerEditionProperty = new SimpleBooleanProperty();
+    private final BooleanProperty journalPopupProperty = new SimpleBooleanProperty();
+    private final BooleanProperty autoLinkEnabledProperty = new SimpleBooleanProperty();
+    private final BooleanProperty enableSciteTabProperty = new SimpleBooleanProperty();
 
     private final StringProperty fieldsProperty = new SimpleStringProperty();
 
@@ -53,8 +43,7 @@ public EntryEditorTabViewModel(
     ) {
         this.dialogService = dialogService;
         this.preferencesService = preferencesService;
-        this.entryEditorPreferences =
-            preferencesService.getEntryEditorPreferences();
+        this.entryEditorPreferences = preferencesService.getEntryEditorPreferences();
         this.mrDlibPreferences = preferencesService.getMrDlibPreferences();
     }
 
@@ -63,24 +52,16 @@ public void setValues() {
         // ToDo: Include CustomizeGeneralFieldsDialog in PreferencesDialog
         // therefore yet unused: entryEditorPreferences.getEntryEditorTabList();
 
-        openOnNewEntryProperty.setValue(
-            entryEditorPreferences.shouldOpenOnNewEntry()
-        );
-        defaultSourceProperty.setValue(
-            entryEditorPreferences.showSourceTabByDefault()
-        );
+        openOnNewEntryProperty.setValue(entryEditorPreferences.shouldOpenOnNewEntry());
+        defaultSourceProperty.setValue(entryEditorPreferences.showSourceTabByDefault());
         enableRelatedArticlesTabProperty.setValue(
             entryEditorPreferences.shouldShowRecommendationsTab()
         );
-        acceptRecommendationsProperty.setValue(
-            mrDlibPreferences.shouldAcceptRecommendations()
-        );
+        acceptRecommendationsProperty.setValue(mrDlibPreferences.shouldAcceptRecommendations());
         enableLatexCitationsTabProperty.setValue(
             entryEditorPreferences.shouldShowLatexCitationsTab()
         );
-        enableValidationProperty.setValue(
-            entryEditorPreferences.shouldEnableValidation()
-        );
+        enableValidationProperty.setValue(entryEditorPreferences.shouldEnableValidation());
         allowIntegerEditionProperty.setValue(
             entryEditorPreferences.shouldAllowIntegerEditionBibtex()
         );
@@ -88,22 +69,14 @@ public void setValues() {
             entryEditorPreferences.shouldEnableJournalPopup() ==
             EntryEditorPreferences.JournalPopupEnabled.ENABLED
         );
-        autoLinkEnabledProperty.setValue(
-            entryEditorPreferences.autoLinkFilesEnabled()
-        );
-        enableSciteTabProperty.setValue(
-            entryEditorPreferences.shouldShowSciteTab()
-        );
+        autoLinkEnabledProperty.setValue(entryEditorPreferences.autoLinkFilesEnabled());
+        enableSciteTabProperty.setValue(entryEditorPreferences.shouldShowSciteTab());
 
         setFields(entryEditorPreferences.getEntryEditorTabs());
     }
 
     public void resetToDefaults() {
-        setFields(
-            preferencesService
-                .getEntryEditorPreferences()
-                .getDefaultEntryEditorTabs()
-        );
+        setFields(preferencesService.getEntryEditorPreferences().getDefaultEntryEditorTabs());
     }
 
     private void setFields(Map<String, Set<Field>> tabNamesAndFields) {
@@ -122,39 +95,25 @@ private void setFields(Map<String, Set<Field>> tabNamesAndFields) {
     @Override
     public void storeSettings() {
         // entryEditorPreferences.setEntryEditorTabList();
-        entryEditorPreferences.setShouldOpenOnNewEntry(
-            openOnNewEntryProperty.getValue()
-        );
+        entryEditorPreferences.setShouldOpenOnNewEntry(openOnNewEntryProperty.getValue());
         entryEditorPreferences.setShouldShowRecommendationsTab(
             enableRelatedArticlesTabProperty.getValue()
         );
-        mrDlibPreferences.setAcceptRecommendations(
-            acceptRecommendationsProperty.getValue()
-        );
+        mrDlibPreferences.setAcceptRecommendations(acceptRecommendationsProperty.getValue());
         entryEditorPreferences.setShouldShowLatexCitationsTab(
             enableLatexCitationsTabProperty.getValue()
         );
-        entryEditorPreferences.setShowSourceTabByDefault(
-            defaultSourceProperty.getValue()
-        );
-        entryEditorPreferences.setEnableValidation(
-            enableValidationProperty.getValue()
-        );
-        entryEditorPreferences.setAllowIntegerEditionBibtex(
-            allowIntegerEditionProperty.getValue()
-        );
+        entryEditorPreferences.setShowSourceTabByDefault(defaultSourceProperty.getValue());
+        entryEditorPreferences.setEnableValidation(enableValidationProperty.getValue());
+        entryEditorPreferences.setAllowIntegerEditionBibtex(allowIntegerEditionProperty.getValue());
         entryEditorPreferences.setEnableJournalPopup(
             journalPopupProperty.getValue()
                 ? EntryEditorPreferences.JournalPopupEnabled.ENABLED
                 : EntryEditorPreferences.JournalPopupEnabled.DISABLED
         );
         // entryEditorPreferences.setDividerPosition();
-        entryEditorPreferences.setAutoLinkFilesEnabled(
-            autoLinkEnabledProperty.getValue()
-        );
-        entryEditorPreferences.setShouldShowSciteTab(
-            enableSciteTabProperty.getValue()
-        );
+        entryEditorPreferences.setAutoLinkFilesEnabled(autoLinkEnabledProperty.getValue());
+        entryEditorPreferences.setShouldShowSciteTab(enableSciteTabProperty.getValue());
 
         Map<String, Set<Field>> customTabsMap = new LinkedHashMap<>();
         String[] lines = fieldsProperty.get().split("\n");
@@ -175,10 +134,7 @@ public void storeSettings() {
             // 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
             String unwantedChars = "#{}()~,^&-\"'`ʹ\\";
-            String testString = CitationKeyGenerator.cleanKey(
-                parts[1],
-                unwantedChars
-            );
+            String testString = CitationKeyGenerator.cleanKey(parts[1], unwantedChars);
             if (!testString.equals(parts[1])) {
                 dialogService.showInformationDialogAndWait(
                     Localization.lang("Error"),
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 2454f3ece4e..7f7b6bf7c3a 100644
--- a/src/main/java/org/jabref/gui/preferences/export/ExportTab.java
+++ b/src/main/java/org/jabref/gui/preferences/export/ExportTab.java
@@ -24,8 +24,7 @@ public String getTabName() {
     }
 
     public void initialize() {
-        this.viewModel =
-            new ExportTabViewModel(preferencesService.getExportPreferences());
+        this.viewModel = new ExportTabViewModel(preferencesService.getExportPreferences());
 
         exportOrderPanel
             .saveInOriginalProperty()
@@ -36,12 +35,8 @@ public void initialize() {
         exportOrderPanel
             .saveInSpecifiedOrderProperty()
             .bindBidirectional(viewModel.saveInSpecifiedOrderProperty());
-        exportOrderPanel
-            .sortableFieldsProperty()
-            .bind(viewModel.sortableFieldsProperty());
-        exportOrderPanel
-            .sortCriteriaProperty()
-            .bindBidirectional(viewModel.sortCriteriaProperty());
+        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 30c0879aa37..a3e89dfe8b9 100644
--- a/src/main/java/org/jabref/gui/preferences/export/ExportTabViewModel.java
+++ b/src/main/java/org/jabref/gui/preferences/export/ExportTabViewModel.java
@@ -18,18 +18,14 @@
 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 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<>())
-        );
+        new SimpleListProperty<>(FXCollections.observableArrayList(new ArrayList<>()));
 
     private final ExportPreferences exportPreferences;
 
@@ -46,11 +42,7 @@ public void setValues() {
             case TABLE -> exportInTableOrderProperty.setValue(true);
         }
         sortCriteriaProperty.addAll(
-            exportSaveOrder
-                .getSortCriteria()
-                .stream()
-                .map(SortCriterionViewModel::new)
-                .toList()
+            exportSaveOrder.getSortCriteria().stream().map(SortCriterionViewModel::new).toList()
         );
 
         Set<Field> fields = FieldFactory.getAllFieldsWithOutInternal();
@@ -58,9 +50,7 @@ public void setValues() {
         fields.add(InternalField.INTERNAL_ALL_TEXT_FIELDS_FIELD);
         fields.add(InternalField.KEY_FIELD);
         fields.add(InternalField.TYPE_HEADER);
-        sortableFieldsProperty.addAll(
-            FieldFactory.getStandardFieldsWithCitationKey()
-        );
+        sortableFieldsProperty.addAll(FieldFactory.getStandardFieldsWithCitationKey());
     }
 
     @Override
@@ -70,10 +60,7 @@ public void storeSettings() {
                 exportInSpecifiedOrderProperty.getValue(),
                 exportInOriginalProperty.getValue()
             ),
-            sortCriteriaProperty
-                .stream()
-                .map(SortCriterionViewModel::getCriterion)
-                .toList()
+            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 7c1e3371e04..0f23b481d34 100644
--- a/src/main/java/org/jabref/gui/preferences/external/ExternalTab.java
+++ b/src/main/java/org/jabref/gui/preferences/external/ExternalTab.java
@@ -59,8 +59,7 @@ public class ExternalTab
     @FXML
     private TextField kindleEmail;
 
-    private final ControlsFxVisualizer validationVisualizer =
-        new ControlsFxVisualizer();
+    private final ControlsFxVisualizer validationVisualizer = new ControlsFxVisualizer();
 
     public ExternalTab() {
         ViewLoader.view(this).root(this).load();
@@ -72,8 +71,7 @@ public String getTabName() {
     }
 
     public void initialize() {
-        this.viewModel =
-            new ExternalTabViewModel(dialogService, preferencesService);
+        this.viewModel = new ExternalTabViewModel(dialogService, preferencesService);
 
         new ViewModelListCellFactory<PushToApplication>()
             .withText(PushToApplication::getDisplayName)
@@ -87,15 +85,11 @@ public void initialize() {
             .selectedProperty()
             .bindBidirectional(viewModel.autoOpenAttachedFoldersProperty());
 
-        pushToApplicationCombo
-            .itemsProperty()
-            .bind(viewModel.pushToApplicationsListProperty());
+        pushToApplicationCombo.itemsProperty().bind(viewModel.pushToApplicationsListProperty());
         pushToApplicationCombo
             .valueProperty()
             .bindBidirectional(viewModel.selectedPushToApplication());
-        citeCommand
-            .textProperty()
-            .bindBidirectional(viewModel.citeCommandProperty());
+        citeCommand.textProperty().bindBidirectional(viewModel.citeCommandProperty());
 
         useCustomTerminal
             .selectedProperty()
@@ -103,12 +97,8 @@ public void initialize() {
         customTerminalCommand
             .textProperty()
             .bindBidirectional(viewModel.customTerminalCommandProperty());
-        customTerminalCommand
-            .disableProperty()
-            .bind(useCustomTerminal.selectedProperty().not());
-        customTerminalBrowse
-            .disableProperty()
-            .bind(useCustomTerminal.selectedProperty().not());
+        customTerminalCommand.disableProperty().bind(useCustomTerminal.selectedProperty().not());
+        customTerminalBrowse.disableProperty().bind(useCustomTerminal.selectedProperty().not());
 
         useCustomFileBrowser
             .selectedProperty()
@@ -123,9 +113,7 @@ public void initialize() {
             .disableProperty()
             .bind(useCustomFileBrowser.selectedProperty().not());
 
-        kindleEmail
-            .textProperty()
-            .bindBidirectional(viewModel.kindleEmailProperty());
+        kindleEmail.textProperty().bindBidirectional(viewModel.kindleEmailProperty());
 
         validationVisualizer.setDecoration(new IconValidationDecorator());
         Platform.runLater(() -> {
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 884509dce83..f3941a7f486 100644
--- a/src/main/java/org/jabref/gui/preferences/external/ExternalTabViewModel.java
+++ b/src/main/java/org/jabref/gui/preferences/external/ExternalTabViewModel.java
@@ -32,30 +32,18 @@
 
 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 StringProperty citeCommandProperty = new SimpleStringProperty(
-        ""
-    );
-    private final BooleanProperty useCustomTerminalProperty =
-        new SimpleBooleanProperty();
-    private final StringProperty customTerminalCommandProperty =
-        new SimpleStringProperty("");
-    private final BooleanProperty useCustomFileBrowserProperty =
-        new SimpleBooleanProperty();
-    private final StringProperty customFileBrowserCommandProperty =
-        new SimpleStringProperty("");
-    private final StringProperty kindleEmailProperty = new SimpleStringProperty(
-        ""
-    );
+    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 StringProperty citeCommandProperty = new SimpleStringProperty("");
+    private final BooleanProperty useCustomTerminalProperty = new SimpleBooleanProperty();
+    private final StringProperty customTerminalCommandProperty = new SimpleStringProperty("");
+    private final BooleanProperty useCustomFileBrowserProperty = new SimpleBooleanProperty();
+    private final StringProperty customFileBrowserCommandProperty = new SimpleStringProperty("");
+    private final StringProperty kindleEmailProperty = new SimpleStringProperty("");
 
     private final Validator terminalCommandValidator;
     private final Validator fileBrowserCommandValidator;
@@ -78,14 +66,11 @@ public ExternalTabViewModel(
         this.preferences = preferencesService;
         this.initialExternalApplicationPreferences =
             preferences.getExternalApplicationsPreferences();
-        this.initialPushToApplicationPreferences =
-            preferences.getPushToApplicationPreferences();
+        this.initialPushToApplicationPreferences = preferences.getPushToApplicationPreferences();
         this.workingPushToApplicationPreferences =
             new PushToApplicationPreferences(
                 initialPushToApplicationPreferences.getActiveApplicationName(),
-                new HashMap<>(
-                    initialPushToApplicationPreferences.getCommandPaths()
-                ),
+                new HashMap<>(initialPushToApplicationPreferences.getCommandPaths()),
                 initialPushToApplicationPreferences.getEmacsArguments(),
                 initialPushToApplicationPreferences.getVimServer()
             );
@@ -99,9 +84,7 @@ public ExternalTabViewModel(
                         "%s > %s %n %n %s",
                         Localization.lang("External programs"),
                         Localization.lang("Custom applications"),
-                        Localization.lang(
-                            "Please specify a terminal application."
-                        )
+                        Localization.lang("Please specify a terminal application.")
                     )
                 )
             );
@@ -132,10 +115,7 @@ public void setValues() {
 
         pushToApplicationsListProperty.setValue(
             FXCollections.observableArrayList(
-                PushToApplications.getAllApplications(
-                    dialogService,
-                    preferences
-                )
+                PushToApplications.getAllApplications(dialogService, preferences)
             )
         );
         selectedPushToApplicationProperty.setValue(
@@ -148,9 +128,7 @@ public void setValues() {
                 .orElse(new PushToEmacs(dialogService, preferences))
         );
 
-        citeCommandProperty.setValue(
-            initialExternalApplicationPreferences.getCiteCommand()
-        );
+        citeCommandProperty.setValue(initialExternalApplicationPreferences.getCiteCommand());
         useCustomTerminalProperty.setValue(
             initialExternalApplicationPreferences.useCustomTerminal()
         );
@@ -163,31 +141,21 @@ public void setValues() {
         customFileBrowserCommandProperty.setValue(
             initialExternalApplicationPreferences.getCustomFileBrowserCommand()
         );
-        kindleEmailProperty.setValue(
-            initialExternalApplicationPreferences.getKindleEmail()
-        );
+        kindleEmailProperty.setValue(initialExternalApplicationPreferences.getKindleEmail());
     }
 
     @Override
     public void storeSettings() {
         ExternalApplicationsPreferences externalPreferences =
             preferences.getExternalApplicationsPreferences();
-        externalPreferences.setEMailSubject(
-            eMailReferenceSubjectProperty.getValue()
-        );
+        externalPreferences.setEMailSubject(eMailReferenceSubjectProperty.getValue());
         externalPreferences.setAutoOpenEmailAttachmentsFolder(
             autoOpenAttachedFoldersProperty.getValue()
         );
         externalPreferences.setCiteCommand(citeCommandProperty.getValue());
-        externalPreferences.setUseCustomTerminal(
-            useCustomTerminalProperty.getValue()
-        );
-        externalPreferences.setCustomTerminalCommand(
-            customTerminalCommandProperty.getValue()
-        );
-        externalPreferences.setUseCustomFileBrowser(
-            useCustomFileBrowserProperty.getValue()
-        );
+        externalPreferences.setUseCustomTerminal(useCustomTerminalProperty.getValue());
+        externalPreferences.setCustomTerminalCommand(customTerminalCommandProperty.getValue());
+        externalPreferences.setUseCustomFileBrowser(useCustomFileBrowserProperty.getValue());
         externalPreferences.setCustomFileBrowserCommand(
             customFileBrowserCommandProperty.getValue()
         );
@@ -198,15 +166,9 @@ public void storeSettings() {
         pushPreferences.setActiveApplicationName(
             selectedPushToApplicationProperty.getValue().getDisplayName()
         );
-        pushPreferences.setCommandPaths(
-            workingPushToApplicationPreferences.getCommandPaths()
-        );
-        pushPreferences.setEmacsArguments(
-            workingPushToApplicationPreferences.getEmacsArguments()
-        );
-        pushPreferences.setVimServer(
-            workingPushToApplicationPreferences.getVimServer()
-        );
+        pushPreferences.setCommandPaths(workingPushToApplicationPreferences.getCommandPaths());
+        pushPreferences.setEmacsArguments(workingPushToApplicationPreferences.getEmacsArguments());
+        pushPreferences.setVimServer(workingPushToApplicationPreferences.getVimServer());
     }
 
     public ValidationStatus terminalCommandValidationStatus() {
@@ -233,17 +195,14 @@ public boolean validateSettings() {
         if (!validationStatus.isValid()) {
             validationStatus
                 .getHighestMessage()
-                .ifPresent(message ->
-                    dialogService.showErrorDialogAndWait(message.getMessage())
-                );
+                .ifPresent(message -> dialogService.showErrorDialogAndWait(message.getMessage()));
             return false;
         }
         return true;
     }
 
     public void pushToApplicationSettings() {
-        PushToApplication selectedApplication =
-            selectedPushToApplicationProperty.getValue();
+        PushToApplication selectedApplication = selectedPushToApplicationProperty.getValue();
         PushToApplicationSettings settings = selectedApplication.getSettings(
             selectedApplication,
             workingPushToApplicationPreferences
@@ -270,9 +229,7 @@ public void customTerminalBrowse() {
         dialogService
             .showFileOpenDialog(fileDialogConfiguration)
             .ifPresent(file ->
-                customTerminalCommandProperty.setValue(
-                    file.toAbsolutePath().toString()
-                )
+                customTerminalCommandProperty.setValue(file.toAbsolutePath().toString())
             );
     }
 
@@ -280,9 +237,7 @@ public void customFileBrowserBrowse() {
         dialogService
             .showFileOpenDialog(fileDialogConfiguration)
             .ifPresent(file ->
-                customFileBrowserCommandProperty.setValue(
-                    file.toAbsolutePath().toString()
-                )
+                customFileBrowserCommandProperty.setValue(file.toAbsolutePath().toString())
             );
     }
 
@@ -334,9 +289,7 @@ public StringProperty customFileBrowserCommandProperty() {
 
     public void resetCiteCommandToDefault() {
         this.citeCommandProperty.setValue(
-                preferences
-                    .getExternalApplicationsPreferences()
-                    .getDefaultCiteCommand()
+                preferences.getExternalApplicationsPreferences().getDefaultCiteCommand()
             );
     }
 }
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 5972414ad92..7c2635e3e45 100644
--- a/src/main/java/org/jabref/gui/preferences/externalfiletypes/EditExternalFileTypeEntryDialog.java
+++ b/src/main/java/org/jabref/gui/preferences/externalfiletypes/EditExternalFileTypeEntryDialog.java
@@ -58,10 +58,7 @@ public class EditExternalFileTypeEntryDialog extends BaseDialog<Void> {
 
     private EditExternalFileTypeViewModel viewModel;
 
-    public EditExternalFileTypeEntryDialog(
-        ExternalFileTypeItemViewModel item,
-        String dialogTitle
-    ) {
+    public EditExternalFileTypeEntryDialog(ExternalFileTypeItemViewModel item, String dialogTitle) {
         this.item = item;
 
         this.setTitle(dialogTitle);
@@ -88,16 +85,10 @@ public void initialize() {
         customApplication
             .selectedProperty()
             .bindBidirectional(viewModel.customApplicationSelectedProperty());
-        selectedApplication
-            .disableProperty()
-            .bind(viewModel.defaultApplicationSelectedProperty());
-        btnBrowse
-            .disableProperty()
-            .bind(viewModel.defaultApplicationSelectedProperty());
+        selectedApplication.disableProperty().bind(viewModel.defaultApplicationSelectedProperty());
+        btnBrowse.disableProperty().bind(viewModel.defaultApplicationSelectedProperty());
 
-        extension
-            .textProperty()
-            .bindBidirectional(viewModel.extensionProperty());
+        extension.textProperty().bindBidirectional(viewModel.extensionProperty());
         name.textProperty().bindBidirectional(viewModel.nameProperty());
         mimeType.textProperty().bindBidirectional(viewModel.mimeTypeProperty());
         selectedApplication
@@ -110,9 +101,7 @@ private void openFileChooser(ActionEvent event) {
         dialogService
             .showFileOpenDialog(fileDialogConfiguration)
             .ifPresent(path ->
-                viewModel
-                    .selectedApplicationProperty()
-                    .setValue(path.toAbsolutePath().toString())
+                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 d46c26d5448..b67657c3177 100644
--- a/src/main/java/org/jabref/gui/preferences/externalfiletypes/EditExternalFileTypeViewModel.java
+++ b/src/main/java/org/jabref/gui/preferences/externalfiletypes/EditExternalFileTypeViewModel.java
@@ -11,31 +11,22 @@ public class EditExternalFileTypeViewModel {
     private final ExternalFileTypeItemViewModel fileTypeViewModel;
 
     private final StringProperty nameProperty = new SimpleStringProperty("");
-    private final StringProperty mimeTypeProperty = 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 StringProperty extensionProperty = new SimpleStringProperty(
-        ""
+    private final BooleanProperty customApplicationSelectedProperty = new SimpleBooleanProperty(
+        false
     );
-    private final StringProperty selectedApplicationProperty =
-        new SimpleStringProperty("");
-    private final BooleanProperty defaultApplicationSelectedProperty =
-        new SimpleBooleanProperty(false);
-    private final BooleanProperty customApplicationSelectedProperty =
-        new SimpleBooleanProperty(false);
-
-    public EditExternalFileTypeViewModel(
-        ExternalFileTypeItemViewModel fileTypeViewModel
-    ) {
+
+    public EditExternalFileTypeViewModel(ExternalFileTypeItemViewModel fileTypeViewModel) {
         this.fileTypeViewModel = fileTypeViewModel;
 
-        extensionProperty.setValue(
-            fileTypeViewModel.extensionProperty().getValue()
-        );
+        extensionProperty.setValue(fileTypeViewModel.extensionProperty().getValue());
         nameProperty.setValue(fileTypeViewModel.nameProperty().getValue());
-        mimeTypeProperty.setValue(
-            fileTypeViewModel.mimetypeProperty().getValue()
-        );
+        mimeTypeProperty.setValue(fileTypeViewModel.mimetypeProperty().getValue());
 
         if (fileTypeViewModel.applicationProperty().getValue().isEmpty()) {
             defaultApplicationSelectedProperty.setValue(true);
@@ -76,12 +67,8 @@ public BooleanProperty customApplicationSelectedProperty() {
     }
 
     public void storeSettings() {
-        fileTypeViewModel
-            .nameProperty()
-            .setValue(nameProperty.getValue().trim());
-        fileTypeViewModel
-            .mimetypeProperty()
-            .setValue(mimeTypeProperty.getValue().trim());
+        fileTypeViewModel.nameProperty().setValue(nameProperty.getValue().trim());
+        fileTypeViewModel.mimetypeProperty().setValue(mimeTypeProperty.getValue().trim());
 
         String ext = extensionProperty.getValue().trim();
         if (!ext.isEmpty() && (ext.charAt(0) == '.')) {
@@ -93,10 +80,7 @@ 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:
-        if (
-            defaultApplicationSelectedProperty.getValue() ||
-            application.isEmpty()
-        ) {
+        if (defaultApplicationSelectedProperty.getValue() || application.isEmpty()) {
             fileTypeViewModel.applicationProperty().setValue("");
             selectedApplicationProperty.setValue("");
         } else {
diff --git a/src/main/java/org/jabref/gui/preferences/externalfiletypes/ExternalFileTypeItemViewModel.java b/src/main/java/org/jabref/gui/preferences/externalfiletypes/ExternalFileTypeItemViewModel.java
index 495d4bc9d58..35a5eca90ba 100644
--- a/src/main/java/org/jabref/gui/preferences/externalfiletypes/ExternalFileTypeItemViewModel.java
+++ b/src/main/java/org/jabref/gui/preferences/externalfiletypes/ExternalFileTypeItemViewModel.java
@@ -11,8 +11,7 @@
 
 public class ExternalFileTypeItemViewModel {
 
-    private final ObjectProperty<JabRefIcon> icon =
-        new SimpleObjectProperty<>();
+    private final ObjectProperty<JabRefIcon> icon = new SimpleObjectProperty<>();
     private final StringProperty name = new SimpleStringProperty();
     private final StringProperty extension = new SimpleStringProperty();
     private final StringProperty mimetype = new SimpleStringProperty();
@@ -27,16 +26,7 @@ public ExternalFileTypeItemViewModel(ExternalFileType fileType) {
     }
 
     public ExternalFileTypeItemViewModel() {
-        this(
-            new CustomExternalFileType(
-                "",
-                "",
-                "",
-                "",
-                "new",
-                IconTheme.JabRefIcons.FILE
-            )
-        );
+        this(new CustomExternalFileType("", "", "", "", "new", IconTheme.JabRefIcons.FILE));
     }
 
     public ObjectProperty<JabRefIcon> iconProperty() {
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 1672a1ca6cf..0512c317519 100644
--- a/src/main/java/org/jabref/gui/preferences/externalfiletypes/ExternalFileTypesTab.java
+++ b/src/main/java/org/jabref/gui/preferences/externalfiletypes/ExternalFileTypesTab.java
@@ -20,46 +20,25 @@ public class ExternalFileTypesTab
     implements PreferencesTab {
 
     @FXML
-    private TableColumn<
-        ExternalFileTypeItemViewModel,
-        JabRefIcon
-    > fileTypesTableIconColumn;
+    private TableColumn<ExternalFileTypeItemViewModel, JabRefIcon> fileTypesTableIconColumn;
 
     @FXML
-    private TableColumn<
-        ExternalFileTypeItemViewModel,
-        String
-    > fileTypesTableNameColumn;
+    private TableColumn<ExternalFileTypeItemViewModel, String> fileTypesTableNameColumn;
 
     @FXML
-    private TableColumn<
-        ExternalFileTypeItemViewModel,
-        String
-    > fileTypesTableExtensionColumn;
+    private TableColumn<ExternalFileTypeItemViewModel, String> fileTypesTableExtensionColumn;
 
     @FXML
-    private TableColumn<
-        ExternalFileTypeItemViewModel,
-        String
-    > fileTypesTableMimeTypeColumn;
+    private TableColumn<ExternalFileTypeItemViewModel, String> fileTypesTableMimeTypeColumn;
 
     @FXML
-    private TableColumn<
-        ExternalFileTypeItemViewModel,
-        String
-    > fileTypesTableApplicationColumn;
+    private TableColumn<ExternalFileTypeItemViewModel, String> fileTypesTableApplicationColumn;
 
     @FXML
-    private TableColumn<
-        ExternalFileTypeItemViewModel,
-        Boolean
-    > fileTypesTableEditColumn;
+    private TableColumn<ExternalFileTypeItemViewModel, Boolean> fileTypesTableEditColumn;
 
     @FXML
-    private TableColumn<
-        ExternalFileTypeItemViewModel,
-        Boolean
-    > fileTypesTableDeleteColumn;
+    private TableColumn<ExternalFileTypeItemViewModel, Boolean> fileTypesTableDeleteColumn;
 
     @FXML
     private TableView<ExternalFileTypeItemViewModel> fileTypesTable;
@@ -83,15 +62,13 @@ public void initialize() {
 
         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)
@@ -118,29 +95,19 @@ public void initialize() {
             .withText(extension -> extension)
             .install(fileTypesTableApplicationColumn);
 
-        fileTypesTableEditColumn.setCellValueFactory(data ->
-            BindingsHelper.constantOf(true)
-        );
-        fileTypesTableDeleteColumn.setCellValueFactory(data ->
-            BindingsHelper.constantOf(true)
-        );
+        fileTypesTableEditColumn.setCellValueFactory(data -> BindingsHelper.constantOf(true));
+        fileTypesTableDeleteColumn.setCellValueFactory(data -> BindingsHelper.constantOf(true));
 
         new ValueTableCellFactory<ExternalFileTypeItemViewModel, JabRefIcon>()
             .withGraphic(JabRefIcon::getGraphicNode)
             .install(fileTypesTableIconColumn);
         new ValueTableCellFactory<ExternalFileTypeItemViewModel, Boolean>()
             .withGraphic(none -> IconTheme.JabRefIcons.EDIT.getGraphicNode())
-            .withOnMouseClickedEvent((type, none) ->
-                event -> viewModel.edit(type)
-            )
+            .withOnMouseClickedEvent((type, none) -> event -> viewModel.edit(type))
             .install(fileTypesTableEditColumn);
         new ValueTableCellFactory<ExternalFileTypeItemViewModel, Boolean>()
-            .withGraphic(none ->
-                IconTheme.JabRefIcons.DELETE_ENTRY.getGraphicNode()
-            )
-            .withOnMouseClickedEvent((type, none) ->
-                event -> viewModel.remove(type)
-            )
+            .withGraphic(none -> IconTheme.JabRefIcons.DELETE_ENTRY.getGraphicNode())
+            .withOnMouseClickedEvent((type, none) -> event -> viewModel.remove(type))
             .install(fileTypesTableDeleteColumn);
     }
 
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 6a71ddad79f..e39591d3499 100644
--- a/src/main/java/org/jabref/gui/preferences/externalfiletypes/ExternalFileTypesTabViewModel.java
+++ b/src/main/java/org/jabref/gui/preferences/externalfiletypes/ExternalFileTypesTabViewModel.java
@@ -38,9 +38,7 @@ public void setValues() {
                 .map(ExternalFileTypeItemViewModel::new)
                 .toList()
         );
-        fileTypes.sort(
-            Comparator.comparing(ExternalFileTypeItemViewModel::getName)
-        );
+        fileTypes.sort(Comparator.comparing(ExternalFileTypeItemViewModel::getName));
     }
 
     public void storeSettings() {
@@ -70,14 +68,11 @@ public void resetToDefaults() {
                 .map(ExternalFileTypeItemViewModel::new)
                 .toList()
         );
-        fileTypes.sort(
-            Comparator.comparing(ExternalFileTypeItemViewModel::getName)
-        );
+        fileTypes.sort(Comparator.comparing(ExternalFileTypeItemViewModel::getName));
     }
 
     public void addNewType() {
-        ExternalFileTypeItemViewModel item =
-            new ExternalFileTypeItemViewModel();
+        ExternalFileTypeItemViewModel item = new ExternalFileTypeItemViewModel();
         fileTypes.add(item);
         showEditDialog(item, Localization.lang("Add new file type"));
     }
@@ -86,10 +81,7 @@ public ObservableList<ExternalFileTypeItemViewModel> getFileTypes() {
         return fileTypes;
     }
 
-    private void showEditDialog(
-        ExternalFileTypeItemViewModel item,
-        String dialogTitle
-    ) {
+    private void showEditDialog(ExternalFileTypeItemViewModel item, String dialogTitle) {
         dialogService.showCustomDialogAndWait(
             new EditExternalFileTypeEntryDialog(item, dialogTitle)
         );
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 d3159df5af9..58fcc93fbd4 100644
--- a/src/main/java/org/jabref/gui/preferences/general/GeneralTab.java
+++ b/src/main/java/org/jabref/gui/preferences/general/GeneralTab.java
@@ -103,22 +103,20 @@ public class GeneralTab
     @Inject
     private BibEntryTypesManager entryTypesManager;
 
-    private final ControlsFxVisualizer validationVisualizer =
-        new ControlsFxVisualizer();
+    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");
+    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();
@@ -142,37 +140,24 @@ public void initialize() {
             .withText(Language::getDisplayName)
             .install(language);
         language.itemsProperty().bind(viewModel.languagesListProperty());
-        language
-            .valueProperty()
-            .bindBidirectional(viewModel.selectedLanguageProperty());
+        language.valueProperty().bindBidirectional(viewModel.selectedLanguageProperty());
 
-        fontOverride
-            .selectedProperty()
-            .bindBidirectional(viewModel.fontOverrideProperty());
+        fontOverride.selectedProperty().bindBidirectional(viewModel.fontOverrideProperty());
 
         // Spinner does neither support alignment nor disableProperty in FXML
         fontSize.disableProperty().bind(fontOverride.selectedProperty().not());
         fontSize.getEditor().setAlignment(Pos.CENTER_RIGHT);
         fontSize.setValueFactory(GeneralTabViewModel.fontSizeValueFactory);
-        fontSize
-            .getEditor()
-            .textProperty()
-            .bindBidirectional(viewModel.fontSizeProperty());
+        fontSize.getEditor().textProperty().bindBidirectional(viewModel.fontSizeProperty());
         fontSize.getEditor().setTextFormatter(fontSizeFormatter);
 
         new ViewModelListCellFactory<ThemeTypes>()
             .withText(ThemeTypes::getDisplayName)
             .install(theme);
         theme.itemsProperty().bind(viewModel.themesListProperty());
-        theme
-            .valueProperty()
-            .bindBidirectional(viewModel.selectedThemeProperty());
-        themeSyncOs
-            .selectedProperty()
-            .bindBidirectional(viewModel.themeSyncOsProperty());
-        customThemePath
-            .textProperty()
-            .bindBidirectional(viewModel.customPathToThemeProperty());
+        theme.valueProperty().bindBidirectional(viewModel.selectedThemeProperty());
+        themeSyncOs.selectedProperty().bindBidirectional(viewModel.themeSyncOsProperty());
+        customThemePath.textProperty().bindBidirectional(viewModel.customPathToThemeProperty());
         EasyBind.subscribe(
             viewModel.selectedThemeProperty(),
             theme -> {
@@ -184,30 +169,22 @@ public void initialize() {
 
         validationVisualizer.setDecoration(new IconValidationDecorator());
 
-        openLastStartup
-            .selectedProperty()
-            .bindBidirectional(viewModel.openLastStartupProperty());
+        openLastStartup.selectedProperty().bindBidirectional(viewModel.openLastStartupProperty());
         showAdvancedHints
             .selectedProperty()
             .bindBidirectional(viewModel.showAdvancedHintsProperty());
         inspectionWarningDuplicate
             .selectedProperty()
             .bindBidirectional(viewModel.inspectionWarningDuplicateProperty());
-        confirmDelete
-            .selectedProperty()
-            .bindBidirectional(viewModel.confirmDeleteProperty());
+        confirmDelete.selectedProperty().bindBidirectional(viewModel.confirmDeleteProperty());
 
-        collectTelemetry
-            .selectedProperty()
-            .bindBidirectional(viewModel.collectTelemetryProperty());
+        collectTelemetry.selectedProperty().bindBidirectional(viewModel.collectTelemetryProperty());
 
         new ViewModelListCellFactory<BibDatabaseMode>()
             .withText(BibDatabaseMode::getFormattedName)
             .install(biblatexMode);
         biblatexMode.itemsProperty().bind(viewModel.biblatexModeListProperty());
-        biblatexMode
-            .valueProperty()
-            .bindBidirectional(viewModel.selectedBiblatexModeProperty());
+        biblatexMode.valueProperty().bindBidirectional(viewModel.selectedBiblatexModeProperty());
 
         alwaysReformatBib
             .selectedProperty()
@@ -229,48 +206,29 @@ public void initialize() {
         );
         actionFactory.configureIconButton(
             StandardActions.HELP,
-            new HelpAction(
-                HelpFile.REMOTE,
-                dialogService,
-                preferencesService.getFilePreferences()
-            ),
+            new HelpAction(HelpFile.REMOTE, dialogService, preferencesService.getFilePreferences()),
             remoteHelp
         );
 
-        createBackup
-            .selectedProperty()
-            .bindBidirectional(viewModel.createBackupProperty());
-        backupDirectory
-            .textProperty()
-            .bindBidirectional(viewModel.backupDirectoryProperty());
-        backupDirectory
-            .disableProperty()
-            .bind(viewModel.createBackupProperty().not());
+        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.fontSizeValidationStatus(), fontSize);
             validationVisualizer.initVisualization(
                 viewModel.customPathToThemeValidationStatus(),
                 customThemePath
             );
         });
 
-        remoteServer
-            .selectedProperty()
-            .bindBidirectional(viewModel.remoteServerProperty());
-        remotePort
-            .textProperty()
-            .bindBidirectional(viewModel.remotePortProperty());
-        remotePort
-            .disableProperty()
-            .bind(remoteServer.selectedProperty().not());
+        remoteServer.selectedProperty().bindBidirectional(viewModel.remoteServerProperty());
+        remotePort.textProperty().bindBidirectional(viewModel.remotePortProperty());
+        remotePort.disableProperty().bind(remoteServer.selectedProperty().not());
     }
 
     @FXML
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 7f74cdb7c5c..22f73432901 100644
--- a/src/main/java/org/jabref/gui/preferences/general/GeneralTabViewModel.java
+++ b/src/main/java/org/jabref/gui/preferences/general/GeneralTabViewModel.java
@@ -51,61 +51,42 @@
 public class GeneralTabViewModel implements PreferenceTabViewModel {
 
     protected static SpinnerValueFactory<Integer> fontSizeValueFactory =
-        new SpinnerValueFactory.IntegerSpinnerValueFactory(
-            9,
-            Integer.MAX_VALUE
-        );
+        new SpinnerValueFactory.IntegerSpinnerValueFactory(9, Integer.MAX_VALUE);
 
-    private final ReadOnlyListProperty<Language> languagesListProperty =
-        new ReadOnlyListWrapper<>(
-            FXCollections.observableArrayList(Language.values())
-        );
-    private final ObjectProperty<Language> selectedLanguageProperty =
-        new SimpleObjectProperty<>();
+    private final ReadOnlyListProperty<Language> languagesListProperty = new ReadOnlyListWrapper<>(
+        FXCollections.observableArrayList(Language.values())
+    );
+    private final ObjectProperty<Language> selectedLanguageProperty = new SimpleObjectProperty<>();
 
-    private final ReadOnlyListProperty<ThemeTypes> themesListProperty =
-        new ReadOnlyListWrapper<>(
-            FXCollections.observableArrayList(ThemeTypes.values())
-        );
-    private final ObjectProperty<ThemeTypes> selectedThemeProperty =
-        new SimpleObjectProperty<>();
+    private final ReadOnlyListProperty<ThemeTypes> themesListProperty = new ReadOnlyListWrapper<>(
+        FXCollections.observableArrayList(ThemeTypes.values())
+    );
+    private final ObjectProperty<ThemeTypes> selectedThemeProperty = new SimpleObjectProperty<>();
 
-    private final BooleanProperty themeSyncOsProperty =
-        new SimpleBooleanProperty();
+    private final BooleanProperty themeSyncOsProperty = new SimpleBooleanProperty();
 
-    private final StringProperty customPathToThemeProperty =
-        new SimpleStringProperty();
+    private final StringProperty customPathToThemeProperty = new SimpleStringProperty();
 
-    private final BooleanProperty fontOverrideProperty =
-        new SimpleBooleanProperty();
+    private final BooleanProperty fontOverrideProperty = new SimpleBooleanProperty();
     private final StringProperty fontSizeProperty = new SimpleStringProperty();
 
-    private final BooleanProperty openLastStartupProperty =
-        new SimpleBooleanProperty();
-    private final BooleanProperty showAdvancedHintsProperty =
-        new SimpleBooleanProperty();
-    private final BooleanProperty inspectionWarningDuplicateProperty =
-        new SimpleBooleanProperty();
-    private final BooleanProperty confirmDeleteProperty =
-        new SimpleBooleanProperty();
+    private final BooleanProperty openLastStartupProperty = new SimpleBooleanProperty();
+    private final BooleanProperty showAdvancedHintsProperty = new SimpleBooleanProperty();
+    private final BooleanProperty inspectionWarningDuplicateProperty = new SimpleBooleanProperty();
+    private final BooleanProperty confirmDeleteProperty = new SimpleBooleanProperty();
 
-    private final BooleanProperty collectTelemetryProperty =
-        new SimpleBooleanProperty();
+    private final BooleanProperty collectTelemetryProperty = new SimpleBooleanProperty();
 
     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();
+    private final BooleanProperty alwaysReformatBibProperty = new SimpleBooleanProperty();
+    private final BooleanProperty autosaveLocalLibraries = new SimpleBooleanProperty();
 
-    private final BooleanProperty createBackupProperty =
-        new SimpleBooleanProperty();
-    private final StringProperty backupDirectoryProperty =
-        new SimpleStringProperty("");
+    private final BooleanProperty createBackupProperty = new SimpleBooleanProperty();
+    private final StringProperty backupDirectoryProperty = new SimpleStringProperty("");
 
     private final DialogService dialogService;
     private final PreferencesService preferences;
@@ -119,15 +100,11 @@ public class GeneralTabViewModel implements PreferenceTabViewModel {
     private final Validator customPathToThemeValidator;
 
     private final List<String> restartWarning = new ArrayList<>();
-    private final BooleanProperty remoteServerProperty =
-        new SimpleBooleanProperty();
-    private final StringProperty remotePortProperty = new SimpleStringProperty(
-        ""
-    );
+    private final BooleanProperty remoteServerProperty = new SimpleBooleanProperty();
+    private final StringProperty remotePortProperty = new SimpleStringProperty("");
     private final Validator remotePortValidator;
     private final InternalPreferences internalPreferences;
-    private final BooleanProperty versionCheckProperty =
-        new SimpleBooleanProperty();
+    private final BooleanProperty versionCheckProperty = new SimpleBooleanProperty();
     private final FileUpdateMonitor fileUpdateMonitor;
     private final BibEntryTypesManager entryTypesManager;
     private TrustStoreManager trustStoreManager;
@@ -155,9 +132,7 @@ public GeneralTabViewModel(
                 fontSizeProperty,
                 input -> {
                     try {
-                        return (
-                            Integer.parseInt(fontSizeProperty().getValue()) > 8
-                        );
+                        return (Integer.parseInt(fontSizeProperty().getValue()) > 8);
                     } catch (NumberFormatException ex) {
                         return false;
                     }
@@ -167,9 +142,7 @@ public GeneralTabViewModel(
                         "%s > %s %n %n %s",
                         Localization.lang("General"),
                         Localization.lang("Font settings"),
-                        Localization.lang(
-                            "You must enter an integer value higher than 8."
-                        )
+                        Localization.lang("You must enter an integer value higher than 8.")
                     )
                 )
             );
@@ -193,9 +166,7 @@ public GeneralTabViewModel(
                 remotePortProperty,
                 input -> {
                     try {
-                        int portNumber = Integer.parseInt(
-                            remotePortProperty().getValue()
-                        );
+                        int portNumber = Integer.parseInt(remotePortProperty().getValue());
                         return RemoteUtil.isUserPort(portNumber);
                     } catch (NumberFormatException ex) {
                         return false;
@@ -214,9 +185,7 @@ public GeneralTabViewModel(
             );
 
         this.trustStoreManager =
-            new TrustStoreManager(
-                Path.of(preferences.getSSLPreferences().getTruststorePath())
-            );
+            new TrustStoreManager(Path.of(preferences.getSSLPreferences().getTruststorePath()));
     }
 
     public ValidationStatus remotePortValidationStatus() {
@@ -234,58 +203,36 @@ public void setValues() {
             case EMBEDDED -> selectedThemeProperty.setValue(ThemeTypes.DARK);
             case CUSTOM -> {
                 selectedThemeProperty.setValue(ThemeTypes.CUSTOM);
-                customPathToThemeProperty.setValue(
-                    workspacePreferences.getTheme().getName()
-                );
+                customPathToThemeProperty.setValue(workspacePreferences.getTheme().getName());
             }
         }
         themeSyncOsProperty.setValue(workspacePreferences.shouldThemeSyncOs());
 
-        fontOverrideProperty.setValue(
-            workspacePreferences.shouldOverrideDefaultFontSize()
-        );
-        fontSizeProperty.setValue(
-            String.valueOf(workspacePreferences.getMainFontSize())
-        );
+        fontOverrideProperty.setValue(workspacePreferences.shouldOverrideDefaultFontSize());
+        fontSizeProperty.setValue(String.valueOf(workspacePreferences.getMainFontSize()));
 
-        openLastStartupProperty.setValue(
-            workspacePreferences.shouldOpenLastEdited()
-        );
-        showAdvancedHintsProperty.setValue(
-            workspacePreferences.shouldShowAdvancedHints()
-        );
+        openLastStartupProperty.setValue(workspacePreferences.shouldOpenLastEdited());
+        showAdvancedHintsProperty.setValue(workspacePreferences.shouldShowAdvancedHints());
         inspectionWarningDuplicateProperty.setValue(
             workspacePreferences.shouldWarnAboutDuplicatesInInspection()
         );
-        confirmDeleteProperty.setValue(
-            workspacePreferences.shouldConfirmDelete()
-        );
+        confirmDeleteProperty.setValue(workspacePreferences.shouldConfirmDelete());
 
-        collectTelemetryProperty.setValue(
-            telemetryPreferences.shouldCollectTelemetry()
-        );
+        collectTelemetryProperty.setValue(telemetryPreferences.shouldCollectTelemetry());
 
         bibliographyModeListProperty.setValue(
             FXCollections.observableArrayList(BibDatabaseMode.values())
         );
-        selectedBiblatexModeProperty.setValue(
-            libraryPreferences.getDefaultBibDatabaseMode()
-        );
+        selectedBiblatexModeProperty.setValue(libraryPreferences.getDefaultBibDatabaseMode());
 
-        alwaysReformatBibProperty.setValue(
-            libraryPreferences.shouldAlwaysReformatOnSave()
-        );
+        alwaysReformatBibProperty.setValue(libraryPreferences.shouldAlwaysReformatOnSave());
         autosaveLocalLibraries.setValue(libraryPreferences.shouldAutoSave());
 
         createBackupProperty.setValue(filePreferences.shouldCreateBackup());
-        backupDirectoryProperty.setValue(
-            filePreferences.getBackupDirectory().toString()
-        );
+        backupDirectoryProperty.setValue(filePreferences.getBackupDirectory().toString());
 
         remoteServerProperty.setValue(remotePreferences.useRemoteServer());
-        remotePortProperty.setValue(
-            String.valueOf(remotePreferences.getPort())
-        );
+        remotePortProperty.setValue(String.valueOf(remotePreferences.getPort()));
     }
 
     @Override
@@ -295,18 +242,12 @@ public void storeSettings() {
             workspacePreferences.setLanguage(newLanguage);
             Localization.setLanguage(newLanguage);
             restartWarning.add(
-                Localization.lang("Changed language") +
-                ": " +
-                newLanguage.getDisplayName()
+                Localization.lang("Changed language") + ": " + newLanguage.getDisplayName()
             );
         }
 
-        workspacePreferences.setShouldOverrideDefaultFontSize(
-            fontOverrideProperty.getValue()
-        );
-        workspacePreferences.setMainFontSize(
-            Integer.parseInt(fontSizeProperty.getValue())
-        );
+        workspacePreferences.setShouldOverrideDefaultFontSize(fontOverrideProperty.getValue());
+        workspacePreferences.setMainFontSize(Integer.parseInt(fontSizeProperty.getValue()));
 
         switch (selectedThemeProperty.get()) {
             case LIGHT -> workspacePreferences.setTheme(Theme.light());
@@ -317,33 +258,21 @@ public void storeSettings() {
         }
         workspacePreferences.setThemeSyncOs(themeSyncOsProperty.getValue());
 
-        workspacePreferences.setOpenLastEdited(
-            openLastStartupProperty.getValue()
-        );
-        workspacePreferences.setShowAdvancedHints(
-            showAdvancedHintsProperty.getValue()
-        );
+        workspacePreferences.setOpenLastEdited(openLastStartupProperty.getValue());
+        workspacePreferences.setShowAdvancedHints(showAdvancedHintsProperty.getValue());
         workspacePreferences.setWarnAboutDuplicatesInInspection(
             inspectionWarningDuplicateProperty.getValue()
         );
         workspacePreferences.setConfirmDelete(confirmDeleteProperty.getValue());
 
-        telemetryPreferences.setCollectTelemetry(
-            collectTelemetryProperty.getValue()
-        );
+        telemetryPreferences.setCollectTelemetry(collectTelemetryProperty.getValue());
 
-        libraryPreferences.setDefaultBibDatabaseMode(
-            selectedBiblatexModeProperty.getValue()
-        );
+        libraryPreferences.setDefaultBibDatabaseMode(selectedBiblatexModeProperty.getValue());
 
-        libraryPreferences.setAlwaysReformatOnSave(
-            alwaysReformatBibProperty.getValue()
-        );
+        libraryPreferences.setAlwaysReformatOnSave(alwaysReformatBibProperty.getValue());
         libraryPreferences.setAutoSave(autosaveLocalLibraries.getValue());
 
-        filePreferences
-            .createBackupProperty()
-            .setValue(createBackupProperty.getValue());
+        filePreferences.createBackupProperty().setValue(createBackupProperty.getValue());
         filePreferences
             .backupDirectoryProperty()
             .setValue(Path.of(backupDirectoryProperty.getValue()));
@@ -355,9 +284,7 @@ public void storeSettings() {
                 }
             });
 
-        internalPreferences.setVersionCheckEnabled(
-            versionCheckProperty.getValue()
-        );
+        internalPreferences.setVersionCheckEnabled(versionCheckProperty.getValue());
 
         getPortAsInt(remotePortProperty.getValue())
             .ifPresent(newPort -> {
@@ -369,11 +296,7 @@ public void storeSettings() {
         if (remoteServerProperty.getValue()) {
             remotePreferences.setUseRemoteServer(true);
             Globals.REMOTE_LISTENER.openAndStart(
-                new CLIMessageHandler(
-                    preferences,
-                    fileUpdateMonitor,
-                    entryTypesManager
-                ),
+                new CLIMessageHandler(preferences, fileUpdateMonitor, entryTypesManager),
                 remotePreferences.getPort()
             );
         } else {
@@ -385,11 +308,7 @@ public void storeSettings() {
         if (remoteServerProperty.getValue()) {
             remotePreferences.setUseRemoteServer(true);
             Globals.REMOTE_LISTENER.openAndStart(
-                new CLIMessageHandler(
-                    preferences,
-                    fileUpdateMonitor,
-                    entryTypesManager
-                ),
+                new CLIMessageHandler(preferences, fileUpdateMonitor, entryTypesManager),
                 remotePreferences.getPort()
             );
         } else {
@@ -427,9 +346,7 @@ public boolean validateSettings() {
         if (!validationStatus.isValid()) {
             validationStatus
                 .getHighestMessage()
-                .ifPresent(message ->
-                    dialogService.showErrorDialogAndWait(message.getMessage())
-                );
+                .ifPresent(message -> dialogService.showErrorDialogAndWait(message.getMessage()));
             return false;
         }
         return true;
@@ -465,23 +382,17 @@ public StringProperty customPathToThemeProperty() {
     }
 
     public void importCSSFile() {
-        FileDialogConfiguration fileDialogConfiguration =
-            new FileDialogConfiguration.Builder()
-                .addExtensionFilter(StandardFileType.CSS)
-                .withDefaultExtension(StandardFileType.CSS)
-                .withInitialDirectory(
-                    preferences
-                        .getInternalPreferences()
-                        .getLastPreferencesExportPath()
-                )
-                .build();
+        FileDialogConfiguration fileDialogConfiguration = new FileDialogConfiguration.Builder()
+            .addExtensionFilter(StandardFileType.CSS)
+            .withDefaultExtension(StandardFileType.CSS)
+            .withInitialDirectory(
+                preferences.getInternalPreferences().getLastPreferencesExportPath()
+            )
+            .build();
 
         dialogService
             .showFileOpenDialog(fileDialogConfiguration)
-            .ifPresent(file ->
-                customPathToThemeProperty.setValue(
-                    file.toAbsolutePath().toString()
-                )
+            .ifPresent(file -> customPathToThemeProperty.setValue(file.toAbsolutePath().toString())
             );
     }
 
@@ -540,9 +451,7 @@ public StringProperty backupDirectoryProperty() {
     public void backupFileDirBrowse() {
         DirectoryDialogConfiguration dirDialogConfiguration =
             new DirectoryDialogConfiguration.Builder()
-                .withInitialDirectory(
-                    Path.of(backupDirectoryProperty().getValue())
-                )
+                .withInitialDirectory(Path.of(backupDirectoryProperty().getValue()))
                 .build();
         dialogService
             .showDirectorySelectionDialog(dirDialogConfiguration)
@@ -562,10 +471,7 @@ public void openBrowser() {
         try {
             JabRefDesktop.openBrowser(url, preferences.getFilePreferences());
         } catch (IOException e) {
-            dialogService.showErrorDialogAndWait(
-                Localization.lang("Could not open website."),
-                e
-            );
+            dialogService.showErrorDialogAndWait(Localization.lang("Could not open website."), e);
         }
     }
 
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 183dab0b4fe..fd38fc67e52 100644
--- a/src/main/java/org/jabref/gui/preferences/groups/GroupsTab.java
+++ b/src/main/java/org/jabref/gui/preferences/groups/GroupsTab.java
@@ -34,8 +34,7 @@ public String getTabName() {
     }
 
     public void initialize() {
-        this.viewModel =
-            new GroupsTabViewModel(preferencesService.getGroupsPreferences());
+        this.viewModel = new GroupsTabViewModel(preferencesService.getGroupsPreferences());
 
         groupViewModeIntersection
             .selectedProperty()
@@ -43,11 +42,7 @@ public void initialize() {
         groupViewModeUnion
             .selectedProperty()
             .bindBidirectional(viewModel.groupViewModeUnionProperty());
-        autoAssignGroup
-            .selectedProperty()
-            .bindBidirectional(viewModel.autoAssignGroupProperty());
-        displayGroupCount
-            .selectedProperty()
-            .bindBidirectional(viewModel.displayGroupCount());
+        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 bcc123e634c..e45ce8f145b 100644
--- a/src/main/java/org/jabref/gui/preferences/groups/GroupsTabViewModel.java
+++ b/src/main/java/org/jabref/gui/preferences/groups/GroupsTabViewModel.java
@@ -8,14 +8,10 @@
 
 public class GroupsTabViewModel implements PreferenceTabViewModel {
 
-    private final BooleanProperty groupViewModeIntersectionProperty =
-        new SimpleBooleanProperty();
-    private final BooleanProperty groupViewModeUnionProperty =
-        new SimpleBooleanProperty();
-    private final BooleanProperty autoAssignGroupProperty =
-        new SimpleBooleanProperty();
-    private final BooleanProperty displayGroupCountProperty =
-        new SimpleBooleanProperty();
+    private final BooleanProperty groupViewModeIntersectionProperty = new SimpleBooleanProperty();
+    private final BooleanProperty groupViewModeUnionProperty = new SimpleBooleanProperty();
+    private final BooleanProperty autoAssignGroupProperty = new SimpleBooleanProperty();
+    private final BooleanProperty displayGroupCountProperty = new SimpleBooleanProperty();
 
     private final GroupsPreferences groupsPreferences;
 
@@ -35,12 +31,8 @@ public void setValues() {
                 groupViewModeUnionProperty.setValue(true);
             }
         }
-        autoAssignGroupProperty.setValue(
-            groupsPreferences.shouldAutoAssignGroup()
-        );
-        displayGroupCountProperty.setValue(
-            groupsPreferences.shouldDisplayGroupCount()
-        );
+        autoAssignGroupProperty.setValue(groupsPreferences.shouldAutoAssignGroup());
+        displayGroupCountProperty.setValue(groupsPreferences.shouldDisplayGroupCount());
     }
 
     @Override
@@ -50,12 +42,8 @@ public void storeSettings() {
                 ? GroupViewMode.INTERSECTION
                 : GroupViewMode.UNION
         );
-        groupsPreferences.setAutoAssignGroup(
-            autoAssignGroupProperty.getValue()
-        );
-        groupsPreferences.setDisplayGroupCount(
-            displayGroupCountProperty.getValue()
-        );
+        groupsPreferences.setAutoAssignGroup(autoAssignGroupProperty.getValue());
+        groupsPreferences.setDisplayGroupCount(displayGroupCountProperty.getValue());
     }
 
     public BooleanProperty groupViewModeIntersectionProperty() {
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 0dde9ac7f39..5c5a1c790c7 100644
--- a/src/main/java/org/jabref/gui/preferences/journals/AbbreviationViewModel.java
+++ b/src/main/java/org/jabref/gui/preferences/journals/AbbreviationViewModel.java
@@ -16,12 +16,10 @@ public class AbbreviationViewModel {
 
     private final StringProperty name = new SimpleStringProperty("");
     private final StringProperty abbreviation = new SimpleStringProperty("");
-    private final StringProperty shortestUniqueAbbreviation =
-        new SimpleStringProperty("");
+    private final StringProperty shortestUniqueAbbreviation = new SimpleStringProperty("");
 
     // Used when a "null" abbreviation object is added
-    private final BooleanProperty pseudoAbbreviation =
-        new SimpleBooleanProperty();
+    private final BooleanProperty pseudoAbbreviation = new SimpleBooleanProperty();
 
     public AbbreviationViewModel(Abbreviation abbreviationObject) {
         this.pseudoAbbreviation.set(abbreviationObject == null);
@@ -39,19 +37,13 @@ public AbbreviationViewModel(Abbreviation abbreviationObject) {
             if (shortestUniqueAbbreviationIsDefaultValue) {
                 this.shortestUniqueAbbreviation.set("");
             } else {
-                this.shortestUniqueAbbreviation.setValue(
-                        shortestUniqueAbbreviationOfAbbreviation
-                    );
+                this.shortestUniqueAbbreviation.setValue(shortestUniqueAbbreviationOfAbbreviation);
             }
         }
     }
 
     public Abbreviation getAbbreviationObject() {
-        return new Abbreviation(
-            getName(),
-            getAbbreviation(),
-            getShortestUniqueAbbreviation()
-        );
+        return new Abbreviation(getName(), getAbbreviation(), getShortestUniqueAbbreviation());
     }
 
     public String getName() {
@@ -74,9 +66,7 @@ public String getShortestUniqueAbbreviation() {
         return shortestUniqueAbbreviation.get();
     }
 
-    public void setShortestUniqueAbbreviation(
-        String shortestUniqueAbbreviation
-    ) {
+    public void setShortestUniqueAbbreviation(String shortestUniqueAbbreviation) {
         this.shortestUniqueAbbreviation.set(shortestUniqueAbbreviation);
     }
 
@@ -112,8 +102,7 @@ public boolean equals(Object o) {
         return (
             getName().equals(that.getName()) &&
             getAbbreviation().equals(that.getAbbreviation()) &&
-            getShortestUniqueAbbreviation()
-                .equals(that.getShortestUniqueAbbreviation()) &&
+            getShortestUniqueAbbreviation().equals(that.getShortestUniqueAbbreviation()) &&
             (isPseudoAbbreviation() == that.isPseudoAbbreviation())
         );
     }
@@ -131,13 +120,9 @@ public int hashCode() {
     public boolean containsCaseIndependent(String searchTerm) {
         searchTerm = searchTerm.toLowerCase(Locale.ROOT);
         return (
-            this.abbreviation.get()
-                .toLowerCase(Locale.ROOT)
-                .contains(searchTerm) ||
+            this.abbreviation.get().toLowerCase(Locale.ROOT).contains(searchTerm) ||
             this.name.get().toLowerCase(Locale.ROOT).contains(searchTerm) ||
-            this.shortestUniqueAbbreviation.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 6dbbfb196de..d19dd1656cc 100644
--- a/src/main/java/org/jabref/gui/preferences/journals/AbbreviationsFileViewModel.java
+++ b/src/main/java/org/jabref/gui/preferences/journals/AbbreviationsFileViewModel.java
@@ -40,10 +40,7 @@ public AbbreviationsFileViewModel(Path filePath) {
      * a placeholder and its path will be null meaning it has no place on the filesystem. Its isPseudoFile property
      * will therefore be set to true.
      */
-    public AbbreviationsFileViewModel(
-        List<AbbreviationViewModel> abbreviations,
-        String name
-    ) {
+    public AbbreviationsFileViewModel(List<AbbreviationViewModel> abbreviations, String name) {
         this.abbreviations.addAll(abbreviations);
         this.name = name;
         this.path = Optional.empty();
@@ -53,9 +50,7 @@ public AbbreviationsFileViewModel(
     public void readAbbreviations() throws IOException {
         if (path.isPresent()) {
             Collection<Abbreviation> abbreviationList =
-                JournalAbbreviationLoader.readAbbreviationsFromCsvFile(
-                    path.get()
-                );
+                JournalAbbreviationLoader.readAbbreviationsFromCsvFile(path.get());
             abbreviationList.forEach(abbreviation ->
                 abbreviations.addAll(new AbbreviationViewModel(abbreviation))
             );
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 4a93a2f4ffc..3185880a1d0 100644
--- a/src/main/java/org/jabref/gui/preferences/journals/JournalAbbreviationsTab.java
+++ b/src/main/java/org/jabref/gui/preferences/journals/JournalAbbreviationsTab.java
@@ -55,16 +55,10 @@ public class JournalAbbreviationsTab
     private TableColumn<AbbreviationViewModel, String> journalTableNameColumn;
 
     @FXML
-    private TableColumn<
-        AbbreviationViewModel,
-        String
-    > journalTableAbbreviationColumn;
+    private TableColumn<AbbreviationViewModel, String> journalTableAbbreviationColumn;
 
     @FXML
-    private TableColumn<
-        AbbreviationViewModel,
-        String
-    > journalTableShortestUniqueAbbreviationColumn;
+    private TableColumn<AbbreviationViewModel, String> journalTableShortestUniqueAbbreviationColumn;
 
     @FXML
     private TableColumn<AbbreviationViewModel, String> actionsColumn;
@@ -108,8 +102,7 @@ private void initialize() {
                 abbreviationRepository
             );
 
-        filteredAbbreviations =
-            new FilteredList<>(viewModel.abbreviationsProperty());
+        filteredAbbreviations = new FilteredList<>(viewModel.abbreviationsProperty());
 
         setUpTable();
         setBindings();
@@ -120,19 +113,13 @@ private void initialize() {
     }
 
     private void setUpTable() {
-        journalTableNameColumn.setCellValueFactory(cellData ->
-            cellData.getValue().nameProperty()
-        );
-        journalTableNameColumn.setCellFactory(
-            TextFieldTableCell.forTableColumn()
-        );
+        journalTableNameColumn.setCellValueFactory(cellData -> cellData.getValue().nameProperty());
+        journalTableNameColumn.setCellFactory(TextFieldTableCell.forTableColumn());
 
         journalTableAbbreviationColumn.setCellValueFactory(cellData ->
             cellData.getValue().abbreviationProperty()
         );
-        journalTableAbbreviationColumn.setCellFactory(
-            TextFieldTableCell.forTableColumn()
-        );
+        journalTableAbbreviationColumn.setCellFactory(TextFieldTableCell.forTableColumn());
 
         journalTableShortestUniqueAbbreviationColumn.setCellValueFactory(cellData ->
             cellData.getValue().shortestUniqueAbbreviationProperty()
@@ -141,26 +128,16 @@ private void setUpTable() {
             TextFieldTableCell.forTableColumn()
         );
 
-        actionsColumn.setCellValueFactory(cellData ->
-            cellData.getValue().nameProperty()
-        );
+        actionsColumn.setCellValueFactory(cellData -> cellData.getValue().nameProperty());
         new ValueTableCellFactory<AbbreviationViewModel, String>()
-            .withGraphic(name ->
-                IconTheme.JabRefIcons.DELETE_ENTRY.getGraphicNode()
-            )
+            .withGraphic(name -> IconTheme.JabRefIcons.DELETE_ENTRY.getGraphicNode())
             .withTooltip(name -> Localization.lang("Remove journal '%0'", name))
-            .withDisableExpression(item ->
-                viewModel.isEditableAndRemovableProperty().not()
-            )
-            .withVisibleExpression(item ->
-                viewModel.isEditableAndRemovableProperty()
-            )
+            .withDisableExpression(item -> viewModel.isEditableAndRemovableProperty().not())
+            .withVisibleExpression(item -> viewModel.isEditableAndRemovableProperty())
             .withOnMouseClickedEvent(item ->
                 evt ->
                     viewModel.removeAbbreviation(
-                        journalAbbreviationsTable
-                            .getFocusModel()
-                            .getFocusedItem()
+                        journalAbbreviationsTable.getFocusModel().getFocusedItem()
                     )
             )
             .install(actionsColumn);
@@ -170,15 +147,12 @@ private void setBindings() {
         journalAbbreviationsTable.setItems(filteredAbbreviations);
 
         EasyBind.subscribe(
-            journalAbbreviationsTable
-                .getSelectionModel()
-                .selectedItemProperty(),
+            journalAbbreviationsTable.getSelectionModel().selectedItemProperty(),
             newValue -> viewModel.currentAbbreviationProperty().set(newValue)
         );
         EasyBind.subscribe(
             viewModel.currentAbbreviationProperty(),
-            newValue ->
-                journalAbbreviationsTable.getSelectionModel().select(newValue)
+            newValue -> journalAbbreviationsTable.getSelectionModel().select(newValue)
         );
 
         journalTableNameColumn
@@ -194,12 +168,8 @@ private void setBindings() {
         removeAbbreviationListButton
             .disableProperty()
             .bind(viewModel.isFileRemovableProperty().not());
-        journalFilesBox
-            .itemsProperty()
-            .bindBidirectional(viewModel.journalFilesProperty());
-        journalFilesBox
-            .valueProperty()
-            .bindBidirectional(viewModel.currentFileProperty());
+        journalFilesBox.itemsProperty().bindBidirectional(viewModel.journalFilesProperty());
+        journalFilesBox.valueProperty().bindBidirectional(viewModel.currentFileProperty());
 
         addAbbreviationButton
             .disableProperty()
@@ -212,22 +182,18 @@ private void setBindings() {
             .textProperty()
             .addListener((observable, previousText, searchTerm) ->
                 filteredAbbreviations.setPredicate(abbreviation ->
-                    searchTerm.isEmpty() ||
-                    abbreviation.containsCaseIndependent(searchTerm)
+                    searchTerm.isEmpty() || abbreviation.containsCaseIndependent(searchTerm)
                 )
             );
 
-        useFJournal
-            .selectedProperty()
-            .bindBidirectional(viewModel.useFJournalProperty());
+        useFJournal.selectedProperty().bindBidirectional(viewModel.useFJournalProperty());
     }
 
     private void setAnimations() {
-        ObjectProperty<Color> flashingColor = new SimpleObjectProperty<>(
-            Color.TRANSPARENT
+        ObjectProperty<Color> flashingColor = new SimpleObjectProperty<>(Color.TRANSPARENT);
+        StringProperty flashingColorStringProperty = createFlashingColorStringProperty(
+            flashingColor
         );
-        StringProperty flashingColorStringProperty =
-            createFlashingColorStringProperty(flashingColor);
 
         searchBox
             .styleProperty()
@@ -240,11 +206,7 @@ private void setAnimations() {
             new Timeline(
                 new KeyFrame(
                     Duration.seconds(0),
-                    new KeyValue(
-                        flashingColor,
-                        Color.TRANSPARENT,
-                        Interpolator.LINEAR
-                    )
+                    new KeyValue(flashingColor, Color.TRANSPARENT, Interpolator.LINEAR)
                 ),
                 new KeyFrame(
                     Duration.seconds(0.25),
@@ -252,11 +214,7 @@ private void setAnimations() {
                 ),
                 new KeyFrame(
                     Duration.seconds(0.25),
-                    new KeyValue(
-                        searchBox.textProperty(),
-                        "",
-                        Interpolator.DISCRETE
-                    )
+                    new KeyValue(searchBox.textProperty(), "", Interpolator.DISCRETE)
                 ),
                 new KeyFrame(
                     Duration.seconds(0.25),
@@ -264,11 +222,7 @@ private void setAnimations() {
                 ),
                 new KeyFrame(
                     Duration.seconds(0.5),
-                    new KeyValue(
-                        flashingColor,
-                        Color.TRANSPARENT,
-                        Interpolator.LINEAR
-                    )
+                    new KeyValue(flashingColor, Color.TRANSPARENT, Interpolator.LINEAR)
                 )
             );
     }
@@ -306,8 +260,7 @@ private void addAbbreviationActions() {
     private static StringProperty createFlashingColorStringProperty(
         final ObjectProperty<Color> flashingColor
     ) {
-        final StringProperty flashingColorStringProperty =
-            new SimpleStringProperty();
+        final StringProperty flashingColorStringProperty = new SimpleStringProperty();
         setColorStringFromColor(flashingColorStringProperty, flashingColor);
         flashingColor.addListener((observable, oldValue, newValue) ->
             setColorStringFromColor(flashingColorStringProperty, flashingColor)
@@ -334,9 +287,7 @@ private void selectNewAbbreviation() {
         int lastRow = viewModel.abbreviationsCountProperty().get() - 1;
         journalAbbreviationsTable.scrollTo(lastRow);
         journalAbbreviationsTable.getSelectionModel().select(lastRow);
-        journalAbbreviationsTable
-            .getFocusModel()
-            .focus(lastRow, journalTableNameColumn);
+        journalAbbreviationsTable.getFocusModel().focus(lastRow, journalTableNameColumn);
     }
 
     @Override
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 96928ae3bb5..34142765ef1 100644
--- a/src/main/java/org/jabref/gui/preferences/journals/JournalAbbreviationsTabViewModel.java
+++ b/src/main/java/org/jabref/gui/preferences/journals/JournalAbbreviationsTabViewModel.java
@@ -30,38 +30,27 @@
  * 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.
  */
-public class JournalAbbreviationsTabViewModel
-    implements PreferenceTabViewModel {
+public class JournalAbbreviationsTabViewModel implements PreferenceTabViewModel {
 
-    private final Logger LOGGER = LoggerFactory.getLogger(
-        JournalAbbreviationsTabViewModel.class
-    );
+    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 SimpleIntegerProperty abbreviationsCount =
-        new SimpleIntegerProperty();
+    private final SimpleIntegerProperty abbreviationsCount = new SimpleIntegerProperty();
 
     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 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 useFJournal = new SimpleBooleanProperty(
-        true
-    );
+    private final SimpleBooleanProperty useFJournal = new SimpleBooleanProperty(true);
 
     private final DialogService dialogService;
     private final TaskExecutor taskExecutor;
@@ -78,38 +67,27 @@ public JournalAbbreviationsTabViewModel(
     ) {
         this.dialogService = Objects.requireNonNull(dialogService);
         this.taskExecutor = Objects.requireNonNull(taskExecutor);
-        this.journalAbbreviationRepository =
-            Objects.requireNonNull(journalAbbreviationRepository);
+        this.journalAbbreviationRepository = Objects.requireNonNull(journalAbbreviationRepository);
         this.abbreviationsPreferences = abbreviationsPreferences;
 
         abbreviationsCount.bind(abbreviations.sizeProperty());
         currentAbbreviation.addListener((observable, oldValue, newValue) -> {
-            boolean isAbbreviation =
-                (newValue != null) && !newValue.isPseudoAbbreviation();
+            boolean isAbbreviation = (newValue != null) && !newValue.isPseudoAbbreviation();
             boolean isEditableFile =
-                (currentFile.get() != null) &&
-                !currentFile.get().isBuiltInListProperty().get();
+                (currentFile.get() != null) && !currentFile.get().isBuiltInListProperty().get();
             isEditableAndRemovable.set(isEditableFile);
-            isAbbreviationEditableAndRemovable.set(
-                isAbbreviation && isEditableFile
-            );
+            isAbbreviationEditableAndRemovable.set(isAbbreviation && isEditableFile);
         });
         currentFile.addListener((observable, oldValue, newValue) -> {
             if (oldValue != null) {
-                abbreviations.unbindBidirectional(
-                    oldValue.abbreviationsProperty()
-                );
+                abbreviations.unbindBidirectional(oldValue.abbreviationsProperty());
                 currentAbbreviation.set(null);
             }
             if (newValue != null) {
                 isFileRemovable.set(!newValue.isBuiltInListProperty().get());
-                abbreviations.bindBidirectional(
-                    newValue.abbreviationsProperty()
-                );
+                abbreviations.bindBidirectional(newValue.abbreviationsProperty());
                 if (!abbreviations.isEmpty()) {
-                    currentAbbreviation.set(
-                        abbreviations.get(abbreviations.size() - 1)
-                    );
+                    currentAbbreviation.set(abbreviations.get(abbreviations.size() - 1));
                 }
             } else {
                 isFileRemovable.set(false);
@@ -127,11 +105,7 @@ public JournalAbbreviationsTabViewModel(
                     if (!lcl.wasReplaced()) {
                         if (
                             lcl.wasAdded() &&
-                            !lcl
-                                .getAddedSubList()
-                                .get(0)
-                                .isBuiltInListProperty()
-                                .get()
+                            !lcl.getAddedSubList().get(0).isBuiltInListProperty().get()
                         ) {
                             currentFile.set(lcl.getAddedSubList().get(0));
                         }
@@ -154,8 +128,7 @@ public void setValues() {
      * Read all saved file paths and read their abbreviations.
      */
     public void createFileObjects() {
-        List<String> externalFiles =
-            abbreviationsPreferences.getExternalJournalLists();
+        List<String> externalFiles = abbreviationsPreferences.getExternalJournalLists();
         externalFiles.forEach(name -> openFile(Path.of(name)));
     }
 
@@ -166,9 +139,7 @@ public void createFileObjects() {
      */
     public void selectLastJournalFile() {
         if (!journalFiles.isEmpty()) {
-            currentFile.set(
-                journalFilesProperty().get(journalFilesProperty().size() - 1)
-            );
+            currentFile.set(journalFilesProperty().get(journalFilesProperty().size() - 1));
         }
     }
 
@@ -202,14 +173,11 @@ public void addBuiltInList() {
      * basically just calls the {@link #openFile(Path)}} method.
      */
     public void addNewFile() {
-        FileDialogConfiguration fileDialogConfiguration =
-            new FileDialogConfiguration.Builder()
-                .addExtensionFilter(StandardFileType.CSV)
-                .build();
-
-        dialogService
-            .showFileSaveDialog(fileDialogConfiguration)
-            .ifPresent(this::openFile);
+        FileDialogConfiguration fileDialogConfiguration = new FileDialogConfiguration.Builder()
+            .addExtensionFilter(StandardFileType.CSV)
+            .build();
+
+        dialogService.showFileSaveDialog(fileDialogConfiguration).ifPresent(this::openFile);
     }
 
     /**
@@ -220,15 +188,11 @@ public void addNewFile() {
      * @param filePath path to the file
      */
     private void openFile(Path filePath) {
-        AbbreviationsFileViewModel abbreviationsFile =
-            new AbbreviationsFileViewModel(filePath);
+        AbbreviationsFileViewModel abbreviationsFile = new AbbreviationsFileViewModel(filePath);
         if (journalFiles.contains(abbreviationsFile)) {
             dialogService.showErrorDialogAndWait(
                 Localization.lang("Duplicated Journal File"),
-                Localization.lang(
-                    "Journal file %s already added",
-                    filePath.toString()
-                )
+                Localization.lang("Journal file %s already added", filePath.toString())
             );
             return;
         }
@@ -243,14 +207,11 @@ private void openFile(Path filePath) {
     }
 
     public void openFile() {
-        FileDialogConfiguration fileDialogConfiguration =
-            new FileDialogConfiguration.Builder()
-                .addExtensionFilter(StandardFileType.CSV)
-                .build();
-
-        dialogService
-            .showFileOpenDialog(fileDialogConfiguration)
-            .ifPresent(this::openFile);
+        FileDialogConfiguration fileDialogConfiguration = new FileDialogConfiguration.Builder()
+            .addExtensionFilter(StandardFileType.CSV)
+            .build();
+
+        dialogService.showFileOpenDialog(fileDialogConfiguration).ifPresent(this::openFile);
     }
 
     /**
@@ -273,9 +234,7 @@ public void removeCurrentFile() {
      * property to the new abbreviation.
      */
     public void addAbbreviation(Abbreviation abbreviationObject) {
-        AbbreviationViewModel abbreviationViewModel = new AbbreviationViewModel(
-            abbreviationObject
-        );
+        AbbreviationViewModel abbreviationViewModel = new AbbreviationViewModel(abbreviationObject);
         if (abbreviations.contains(abbreviationViewModel)) {
             dialogService.showErrorDialogAndWait(
                 Localization.lang("Duplicated Journal Abbreviation"),
@@ -307,14 +266,10 @@ public void addAbbreviation() {
      */
     void editAbbreviation(Abbreviation abbreviationObject) {
         if (isEditableAndRemovable.get()) {
-            AbbreviationViewModel abbViewModel = new AbbreviationViewModel(
-                abbreviationObject
-            );
+            AbbreviationViewModel abbViewModel = new AbbreviationViewModel(abbreviationObject);
             if (abbreviations.contains(abbViewModel)) {
                 if (abbViewModel.equals(currentAbbreviation.get())) {
-                    setCurrentAbbreviationNameAndAbbreviationIfValid(
-                        abbreviationObject
-                    );
+                    setCurrentAbbreviationNameAndAbbreviationIfValid(abbreviationObject);
                 } else {
                     dialogService.showErrorDialogAndWait(
                         Localization.lang("Duplicated Journal Abbreviation"),
@@ -326,33 +281,23 @@ void editAbbreviation(Abbreviation abbreviationObject) {
                     );
                 }
             } else {
-                setCurrentAbbreviationNameAndAbbreviationIfValid(
-                    abbreviationObject
-                );
+                setCurrentAbbreviationNameAndAbbreviationIfValid(abbreviationObject);
             }
         }
     }
 
-    private void setCurrentAbbreviationNameAndAbbreviationIfValid(
-        Abbreviation abbreviationObject
-    ) {
+    private void setCurrentAbbreviationNameAndAbbreviationIfValid(Abbreviation abbreviationObject) {
         if (abbreviationObject.getName().trim().isEmpty()) {
-            dialogService.showErrorDialogAndWait(
-                Localization.lang("Name cannot be empty")
-            );
+            dialogService.showErrorDialogAndWait(Localization.lang("Name cannot be empty"));
             return;
         }
         if (abbreviationObject.getAbbreviation().trim().isEmpty()) {
-            dialogService.showErrorDialogAndWait(
-                Localization.lang("Abbreviation cannot be empty")
-            );
+            dialogService.showErrorDialogAndWait(Localization.lang("Abbreviation cannot be empty"));
             return;
         }
         AbbreviationViewModel abbreviationViewModel = currentAbbreviation.get();
         abbreviationViewModel.setName(abbreviationObject.getName());
-        abbreviationViewModel.setAbbreviation(
-            abbreviationObject.getAbbreviation()
-        );
+        abbreviationViewModel.setAbbreviation(abbreviationObject.getAbbreviation());
         if (abbreviationObject.isDefaultShortestUniqueAbbreviation()) {
             abbreviationViewModel.setShortestUniqueAbbreviation("");
         } else {
@@ -370,8 +315,7 @@ private void setCurrentAbbreviationNameAndAbbreviationIfValid(
      */
     public void deleteAbbreviation() {
         if (
-            (currentAbbreviation.get() != null) &&
-            !currentAbbreviation.get().isPseudoAbbreviation()
+            (currentAbbreviation.get() != null) && !currentAbbreviation.get().isPseudoAbbreviation()
         ) {
             int index = abbreviations.indexOf(currentAbbreviation.get());
             if (index > 1) {
@@ -424,14 +368,10 @@ public void storeSettings() {
                     .stream()
                     .filter(path -> !path.isBuiltInListProperty().get())
                     .filter(path -> path.getAbsolutePath().isPresent())
-                    .map(path ->
-                        path.getAbsolutePath().get().toAbsolutePath().toString()
-                    )
+                    .map(path -> path.getAbsolutePath().get().toAbsolutePath().toString())
                     .collect(Collectors.toList());
 
-                abbreviationsPreferences.setExternalJournalLists(
-                    journalStringList
-                );
+                abbreviationsPreferences.setExternalJournalLists(journalStringList);
                 abbreviationsPreferences.setUseFJournalField(useFJournal.get());
 
                 if (shouldWriteLists) {
@@ -441,13 +381,9 @@ public void storeSettings() {
             })
             .onSuccess(success ->
                 Globals.journalAbbreviationRepository =
-                    JournalAbbreviationLoader.loadRepository(
-                        abbreviationsPreferences
-                    )
-            )
-            .onFailure(exception ->
-                LOGGER.error("Failed to store journal preferences.", exception)
+                    JournalAbbreviationLoader.loadRepository(abbreviationsPreferences)
             )
+            .onFailure(exception -> LOGGER.error("Failed to store journal preferences.", exception))
             .executeWith(taskExecutor);
     }
 
@@ -455,9 +391,7 @@ public SimpleBooleanProperty isLoadingProperty() {
         return isLoading;
     }
 
-    public SimpleListProperty<
-        AbbreviationsFileViewModel
-    > journalFilesProperty() {
+    public SimpleListProperty<AbbreviationsFileViewModel> journalFilesProperty() {
         return journalFiles;
     }
 
@@ -469,15 +403,11 @@ public SimpleIntegerProperty abbreviationsCountProperty() {
         return abbreviationsCount;
     }
 
-    public SimpleObjectProperty<
-        AbbreviationsFileViewModel
-    > currentFileProperty() {
+    public SimpleObjectProperty<AbbreviationsFileViewModel> currentFileProperty() {
         return currentFile;
     }
 
-    public SimpleObjectProperty<
-        AbbreviationViewModel
-    > currentAbbreviationProperty() {
+    public SimpleObjectProperty<AbbreviationViewModel> currentAbbreviationProperty() {
         return currentAbbreviation;
     }
 
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 cd459e2c2e1..dc8484c842f 100644
--- a/src/main/java/org/jabref/gui/preferences/keybindings/KeyBindingViewModel.java
+++ b/src/main/java/org/jabref/gui/preferences/keybindings/KeyBindingViewModel.java
@@ -29,8 +29,7 @@ public class KeyBindingViewModel {
         FXCollections.observableArrayList();
     private final KeyBindingRepository keyBindingRepository;
     private final SimpleStringProperty displayName = new SimpleStringProperty();
-    private final SimpleStringProperty shownBinding =
-        new SimpleStringProperty();
+    private final SimpleStringProperty shownBinding = new SimpleStringProperty();
 
     private final KeyBindingCategory category;
 
@@ -75,20 +74,14 @@ private void setBinding(String bind) {
         String[] parts = bind.split(" ");
         StringBuilder displayBind = new StringBuilder();
         for (String part : parts) {
-            displayBind
-                .append(CaseFormat.LOWER_CAMEL.to(CaseFormat.UPPER_CAMEL, part))
-                .append(" ");
+            displayBind.append(CaseFormat.LOWER_CAMEL.to(CaseFormat.UPPER_CAMEL, part)).append(" ");
         }
-        this.shownBinding.set(
-                displayBind.toString().trim().replace(" ", " + ")
-            );
+        this.shownBinding.set(displayBind.toString().trim().replace(" ", " + "));
     }
 
     private void setDisplayName() {
         this.displayName.set(
-                keyBinding == null
-                    ? this.category.getName()
-                    : keyBinding.getLocalization()
+                keyBinding == null ? this.category.getName() : keyBinding.getLocalization()
             );
     }
 
@@ -136,11 +129,7 @@ public boolean setNewBinding(KeyEvent evt) {
 
         // if no modifier keys are pressed, only special keys can be shortcuts
         if (modifiers.isEmpty()) {
-            if (
-                !(code.isFunctionKey() ||
-                    (code == KeyCode.ESCAPE) ||
-                    (code == KeyCode.DELETE))
-            ) {
+            if (!(code.isFunctionKey() || (code == KeyCode.ESCAPE) || (code == KeyCode.DELETE))) {
                 return false;
             }
         }
@@ -171,14 +160,10 @@ public void clear() {
     }
 
     public Optional<JabRefIcon> getResetIcon() {
-        return isCategory()
-            ? Optional.empty()
-            : Optional.of(IconTheme.JabRefIcons.REFRESH);
+        return isCategory() ? Optional.empty() : Optional.of(IconTheme.JabRefIcons.REFRESH);
     }
 
     public Optional<JabRefIcon> getClearIcon() {
-        return isCategory()
-            ? Optional.empty()
-            : Optional.of(IconTheme.JabRefIcons.CLEANUP_ENTRIES);
+        return isCategory() ? Optional.empty() : Optional.of(IconTheme.JabRefIcons.CLEANUP_ENTRIES);
     }
 }
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 0264e4edb45..740716afab3 100644
--- a/src/main/java/org/jabref/gui/preferences/keybindings/KeyBindingsTab.java
+++ b/src/main/java/org/jabref/gui/preferences/keybindings/KeyBindingsTab.java
@@ -34,16 +34,10 @@ public class KeyBindingsTab
     private TreeTableColumn<KeyBindingViewModel, String> shortcutColumn;
 
     @FXML
-    private TreeTableColumn<
-        KeyBindingViewModel,
-        KeyBindingViewModel
-    > resetColumn;
+    private TreeTableColumn<KeyBindingViewModel, KeyBindingViewModel> resetColumn;
 
     @FXML
-    private TreeTableColumn<
-        KeyBindingViewModel,
-        KeyBindingViewModel
-    > clearColumn;
+    private TreeTableColumn<KeyBindingViewModel, KeyBindingViewModel> clearColumn;
 
     @FXML
     private MenuButton presetsButton;
@@ -63,15 +57,9 @@ public String getTabName() {
     @FXML
     private void initialize() {
         viewModel =
-            new KeyBindingsTabViewModel(
-                keyBindingRepository,
-                dialogService,
-                preferencesService
-            );
+            new KeyBindingsTabViewModel(keyBindingRepository, dialogService, preferencesService);
 
-        keyBindingsTable
-            .getSelectionModel()
-            .setSelectionMode(SelectionMode.SINGLE);
+        keyBindingsTable.getSelectionModel().setSelectionMode(SelectionMode.SINGLE);
         viewModel
             .selectedKeyBindingProperty()
             .bind(
@@ -87,44 +75,29 @@ private void initialize() {
                 EasyBind.map(
                     viewModel.rootKeyBindingProperty(),
                     keybinding ->
-                        new RecursiveTreeItem<>(
-                            keybinding,
-                            KeyBindingViewModel::getChildren
-                        )
+                        new RecursiveTreeItem<>(keybinding, KeyBindingViewModel::getChildren)
                 )
             );
-        actionColumn.setCellValueFactory(cellData ->
-            cellData.getValue().getValue().nameProperty()
-        );
+        actionColumn.setCellValueFactory(cellData -> cellData.getValue().getValue().nameProperty());
         shortcutColumn.setCellValueFactory(cellData ->
             cellData.getValue().getValue().shownBindingProperty()
         );
         new ViewModelTreeTableCellFactory<KeyBindingViewModel>()
             .withGraphic(keyBinding ->
-                keyBinding
-                    .getResetIcon()
-                    .map(JabRefIcon::getGraphicNode)
-                    .orElse(null)
-            )
-            .withOnMouseClickedEvent(keyBinding ->
-                evt -> keyBinding.resetToDefault()
+                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)
+                keyBinding.getClearIcon().map(JabRefIcon::getGraphicNode).orElse(null)
             )
             .withOnMouseClickedEvent(keyBinding -> evt -> keyBinding.clear())
             .install(clearColumn);
 
         viewModel
             .keyBindingPresets()
-            .forEach(preset ->
-                presetsButton.getItems().add(createMenuItem(preset))
-            );
+            .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 dce2ba7fa59..6af529ed5f1 100644
--- a/src/main/java/org/jabref/gui/preferences/keybindings/KeyBindingsTabViewModel.java
+++ b/src/main/java/org/jabref/gui/preferences/keybindings/KeyBindingsTabViewModel.java
@@ -29,13 +29,12 @@ public class KeyBindingsTabViewModel implements PreferenceTabViewModel {
     private final KeyBindingRepository keyBindingRepository;
     private final KeyBindingRepository initialKeyBindingRepository;
     private final PreferencesService preferences;
-    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 OptionalObjectProperty<KeyBindingViewModel> selectedKeyBinding =
+        OptionalObjectProperty.empty();
+    private final ObjectProperty<KeyBindingViewModel> rootKeyBinding = new SimpleObjectProperty<>();
+    private final ListProperty<KeyBindingPreset> keyBindingPresets = new SimpleListProperty<>(
+        FXCollections.observableArrayList()
+    );
 
     private final DialogService dialogService;
 
@@ -46,8 +45,7 @@ public KeyBindingsTabViewModel(
         DialogService dialogService,
         PreferencesService preferences
     ) {
-        this.keyBindingRepository =
-            Objects.requireNonNull(keyBindingRepository);
+        this.keyBindingRepository = Objects.requireNonNull(keyBindingRepository);
         this.initialKeyBindingRepository =
             new KeyBindingRepository(keyBindingRepository.getKeyBindings());
         this.dialogService = Objects.requireNonNull(dialogService);
@@ -75,12 +73,11 @@ public void setValues() {
                 .getKeyBindings()
                 .forEach((keyBinding, bind) -> {
                     if (keyBinding.getCategory() == category) {
-                        KeyBindingViewModel keyBindViewModel =
-                            new KeyBindingViewModel(
-                                keyBindingRepository,
-                                keyBinding,
-                                bind
-                            );
+                        KeyBindingViewModel keyBindViewModel = new KeyBindingViewModel(
+                            keyBindingRepository,
+                            keyBinding,
+                            bind
+                        );
                         categoryItem.getChildren().add(keyBindViewModel);
                     }
                 });
@@ -90,8 +87,7 @@ public void setValues() {
     }
 
     public void setNewBindingForCurrent(KeyEvent event) {
-        Optional<KeyBindingViewModel> selectedKeyBindingValue =
-            selectedKeyBinding.getValue();
+        Optional<KeyBindingViewModel> selectedKeyBindingValue = selectedKeyBinding.getValue();
         if (selectedKeyBindingValue.isEmpty()) {
             return;
         }
@@ -102,10 +98,7 @@ public void setNewBindingForCurrent(KeyEvent event) {
         }
 
         if (selectedEntry.setNewBinding(event)) {
-            keyBindingRepository.put(
-                selectedEntry.getKeyBinding(),
-                selectedEntry.getBinding()
-            );
+            keyBindingRepository.put(selectedEntry.getKeyBinding(), selectedEntry.getBinding());
         }
     }
 
@@ -119,13 +112,8 @@ public void storeSettings() {
 
     public void resetToDefault() {
         String title = Localization.lang("Resetting all key bindings");
-        String content = Localization.lang(
-            "All key bindings will be reset to their defaults."
-        );
-        ButtonType resetButtonType = new ButtonType(
-            "Reset",
-            ButtonBar.ButtonData.OK_DONE
-        );
+        String content = Localization.lang("All key bindings will be reset to their defaults.");
+        ButtonType resetButtonType = new ButtonType("Reset", ButtonBar.ButtonData.OK_DONE);
         dialogService
             .showCustomButtonDialogAndWait(
                 Alert.AlertType.INFORMATION,
@@ -160,9 +148,7 @@ public List<String> getRestartWarnings() {
         return restartWarning;
     }
 
-    public OptionalObjectProperty<
-        KeyBindingViewModel
-    > selectedKeyBindingProperty() {
+    public OptionalObjectProperty<KeyBindingViewModel> selectedKeyBindingProperty() {
         return selectedKeyBinding;
     }
 
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 0ef99d6166b..ddfce199ae9 100644
--- a/src/main/java/org/jabref/gui/preferences/linkedfiles/LinkedFilesTab.java
+++ b/src/main/java/org/jabref/gui/preferences/linkedfiles/LinkedFilesTab.java
@@ -59,8 +59,7 @@ public class LinkedFilesTab
     @FXML
     private TextField fileDirectoryPattern;
 
-    private final ControlsFxVisualizer validationVisualizer =
-        new ControlsFxVisualizer();
+    private final ControlsFxVisualizer validationVisualizer = new ControlsFxVisualizer();
 
     public LinkedFilesTab() {
         ViewLoader.view(this).root(this).load();
@@ -72,18 +71,11 @@ public String getTabName() {
     }
 
     public void initialize() {
-        this.viewModel =
-            new LinkedFilesTabViewModel(dialogService, preferencesService);
+        this.viewModel = new LinkedFilesTabViewModel(dialogService, preferencesService);
 
-        mainFileDirectory
-            .textProperty()
-            .bindBidirectional(viewModel.mainFileDirectoryProperty());
-        mainFileDirectory
-            .disableProperty()
-            .bind(viewModel.useBibLocationAsPrimaryProperty());
-        browseDirectory
-            .disableProperty()
-            .bind(viewModel.useBibLocationAsPrimaryProperty());
+        mainFileDirectory.textProperty().bindBidirectional(viewModel.mainFileDirectoryProperty());
+        mainFileDirectory.disableProperty().bind(viewModel.useBibLocationAsPrimaryProperty());
+        browseDirectory.disableProperty().bind(viewModel.useBibLocationAsPrimaryProperty());
         useBibLocationAsPrimary
             .selectedProperty()
             .bindBidirectional(viewModel.useBibLocationAsPrimaryProperty());
@@ -97,24 +89,12 @@ public void initialize() {
         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());
+        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());
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 2088032e599..ebfb6a3276d 100644
--- a/src/main/java/org/jabref/gui/preferences/linkedfiles/LinkedFilesTabViewModel.java
+++ b/src/main/java/org/jabref/gui/preferences/linkedfiles/LinkedFilesTabViewModel.java
@@ -24,31 +24,19 @@
 
 public class LinkedFilesTabViewModel implements PreferenceTabViewModel {
 
-    private final StringProperty mainFileDirectoryProperty =
-        new SimpleStringProperty("");
-    private final BooleanProperty useMainFileDirectoryProperty =
-        new SimpleBooleanProperty();
-    private final BooleanProperty useBibLocationAsPrimaryProperty =
-        new SimpleBooleanProperty();
-    private final BooleanProperty autolinkFileStartsBibtexProperty =
-        new SimpleBooleanProperty();
-    private final BooleanProperty autolinkFileExactBibtexProperty =
-        new SimpleBooleanProperty();
-    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
-            )
-        );
+    private final StringProperty mainFileDirectoryProperty = new SimpleStringProperty("");
+    private final BooleanProperty useMainFileDirectoryProperty = new SimpleBooleanProperty();
+    private final BooleanProperty useBibLocationAsPrimaryProperty = new SimpleBooleanProperty();
+    private final BooleanProperty autolinkFileStartsBibtexProperty = new SimpleBooleanProperty();
+    private final BooleanProperty autolinkFileExactBibtexProperty = new SimpleBooleanProperty();
+    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)
+    );
     private final BooleanProperty fulltextIndex = new SimpleBooleanProperty();
-    private final StringProperty fileNamePatternProperty =
-        new SimpleStringProperty();
-    private final StringProperty fileDirectoryPatternProperty =
-        new SimpleStringProperty();
+    private final StringProperty fileNamePatternProperty = new SimpleStringProperty();
+    private final StringProperty fileDirectoryPatternProperty = new SimpleStringProperty();
 
     private final Validator mainFileDirValidator;
 
@@ -56,10 +44,7 @@ public class LinkedFilesTabViewModel implements PreferenceTabViewModel {
     private final FilePreferences filePreferences;
     private final AutoLinkPreferences autoLinkPreferences;
 
-    public LinkedFilesTabViewModel(
-        DialogService dialogService,
-        PreferencesService preferences
-    ) {
+    public LinkedFilesTabViewModel(DialogService dialogService, PreferencesService preferences) {
         this.dialogService = dialogService;
         this.filePreferences = preferences.getFilePreferences();
         this.autoLinkPreferences = preferences.getAutoLinkPreferences();
@@ -92,24 +77,15 @@ public LinkedFilesTabViewModel(
     public void setValues() {
         // External files preferences / Attached files preferences / File preferences
         mainFileDirectoryProperty.setValue(
-            filePreferences
-                .getMainFileDirectory()
-                .orElse(Path.of(""))
-                .toString()
-        );
-        useMainFileDirectoryProperty.setValue(
-            !filePreferences.shouldStoreFilesRelativeToBibFile()
+            filePreferences.getMainFileDirectory().orElse(Path.of("")).toString()
         );
+        useMainFileDirectoryProperty.setValue(!filePreferences.shouldStoreFilesRelativeToBibFile());
         useBibLocationAsPrimaryProperty.setValue(
             filePreferences.shouldStoreFilesRelativeToBibFile()
         );
-        fulltextIndex.setValue(
-            filePreferences.shouldFulltextIndexLinkedFiles()
-        );
+        fulltextIndex.setValue(filePreferences.shouldFulltextIndexLinkedFiles());
         fileNamePatternProperty.setValue(filePreferences.getFileNamePattern());
-        fileDirectoryPatternProperty.setValue(
-            filePreferences.getFileDirectoryPattern()
-        );
+        fileDirectoryPatternProperty.setValue(filePreferences.getFileDirectoryPattern());
 
         // Autolink preferences
         switch (autoLinkPreferences.getCitationKeyDependency()) {
@@ -118,24 +94,16 @@ public void setValues() {
             case REGEX -> autolinkUseRegexProperty.setValue(true);
         }
 
-        autolinkRegexKeyProperty.setValue(
-            autoLinkPreferences.getRegularExpression()
-        );
+        autolinkRegexKeyProperty.setValue(autoLinkPreferences.getRegularExpression());
     }
 
     @Override
     public void storeSettings() {
         // External files preferences / Attached files preferences / File preferences
-        filePreferences.setMainFileDirectory(
-            mainFileDirectoryProperty.getValue()
-        );
-        filePreferences.setStoreFilesRelativeToBibFile(
-            useBibLocationAsPrimaryProperty.getValue()
-        );
+        filePreferences.setMainFileDirectory(mainFileDirectoryProperty.getValue());
+        filePreferences.setStoreFilesRelativeToBibFile(useBibLocationAsPrimaryProperty.getValue());
         filePreferences.setFileNamePattern(fileNamePatternProperty.getValue());
-        filePreferences.setFileDirectoryPattern(
-            fileDirectoryPatternProperty.getValue()
-        );
+        filePreferences.setFileDirectoryPattern(fileDirectoryPatternProperty.getValue());
         filePreferences.setFulltextIndexLinkedFiles(fulltextIndex.getValue());
 
         // Autolink preferences
@@ -153,9 +121,7 @@ public void storeSettings() {
             );
         }
 
-        autoLinkPreferences.setRegularExpression(
-            autolinkRegexKeyProperty.getValue()
-        );
+        autoLinkPreferences.setRegularExpression(autolinkRegexKeyProperty.getValue());
     }
 
     ValidationStatus mainFileDirValidationStatus() {
@@ -165,14 +131,10 @@ ValidationStatus mainFileDirValidationStatus() {
     @Override
     public boolean validateSettings() {
         ValidationStatus validationStatus = mainFileDirValidationStatus();
-        if (
-            !validationStatus.isValid() && useMainFileDirectoryProperty().get()
-        ) {
+        if (!validationStatus.isValid() && useMainFileDirectoryProperty().get()) {
             validationStatus
                 .getHighestMessage()
-                .ifPresent(message ->
-                    dialogService.showErrorDialogAndWait(message.getMessage())
-                );
+                .ifPresent(message -> dialogService.showErrorDialogAndWait(message.getMessage()));
             return false;
         }
         return true;
@@ -181,9 +143,7 @@ public boolean validateSettings() {
     public void mainFileDirBrowse() {
         DirectoryDialogConfiguration dirDialogConfiguration =
             new DirectoryDialogConfiguration.Builder()
-                .withInitialDirectory(
-                    Path.of(mainFileDirectoryProperty.getValue())
-                )
+                .withInitialDirectory(Path.of(mainFileDirectoryProperty.getValue()))
                 .build();
         dialogService
             .showDirectorySelectionDialog(dirDialogConfiguration)
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 d741d0e50ae..3784e15952c 100644
--- a/src/main/java/org/jabref/gui/preferences/nameformatter/NameFormatterTab.java
+++ b/src/main/java/org/jabref/gui/preferences/nameformatter/NameFormatterTab.java
@@ -56,63 +56,36 @@ public String getTabName() {
 
     public void initialize() {
         this.viewModel =
-            new NameFormatterTabViewModel(
-                preferencesService.getNameFormatterPreferences()
-            );
+            new NameFormatterTabViewModel(preferencesService.getNameFormatterPreferences());
 
         formatterNameColumn.setSortable(true);
         formatterNameColumn.setReorderable(false);
-        formatterNameColumn.setCellValueFactory(cellData ->
-            cellData.getValue().nameProperty()
-        );
+        formatterNameColumn.setCellValueFactory(cellData -> cellData.getValue().nameProperty());
         formatterNameColumn.setCellFactory(TextFieldTableCell.forTableColumn());
         formatterNameColumn.setEditable(true);
         formatterNameColumn.setOnEditCommit(
-                (
-                    TableColumn.CellEditEvent<
-                        NameFormatterItemModel,
-                        String
-                    > event
-                ) ->
+                (TableColumn.CellEditEvent<NameFormatterItemModel, String> event) ->
             event.getRowValue().setName(event.getNewValue())
         );
 
         formatterStringColumn.setSortable(true);
         formatterStringColumn.setReorderable(false);
-        formatterStringColumn.setCellValueFactory(cellData ->
-            cellData.getValue().formatProperty()
-        );
-        formatterStringColumn.setCellFactory(
-            TextFieldTableCell.forTableColumn()
-        );
+        formatterStringColumn.setCellValueFactory(cellData -> cellData.getValue().formatProperty());
+        formatterStringColumn.setCellFactory(TextFieldTableCell.forTableColumn());
         formatterStringColumn.setEditable(true);
         formatterStringColumn.setOnEditCommit(
-                (
-                    TableColumn.CellEditEvent<
-                        NameFormatterItemModel,
-                        String
-                    > event
-                ) ->
+                (TableColumn.CellEditEvent<NameFormatterItemModel, String> event) ->
             event.getRowValue().setFormat(event.getNewValue())
         );
 
         actionsColumn.setSortable(false);
         actionsColumn.setReorderable(false);
-        actionsColumn.setCellValueFactory(cellData ->
-            cellData.getValue().nameProperty()
-        );
+        actionsColumn.setCellValueFactory(cellData -> cellData.getValue().nameProperty());
         new ValueTableCellFactory<NameFormatterItemModel, String>()
-            .withGraphic(name ->
-                IconTheme.JabRefIcons.DELETE_ENTRY.getGraphicNode()
-            )
-            .withTooltip(name ->
-                Localization.lang("Remove formatter '%0'", name)
-            )
+            .withGraphic(name -> IconTheme.JabRefIcons.DELETE_ENTRY.getGraphicNode())
+            .withTooltip(name -> Localization.lang("Remove formatter '%0'", name))
             .withOnMouseClickedEvent(item ->
-                evt ->
-                    viewModel.removeFormatter(
-                        formatterList.getFocusModel().getFocusedItem()
-                    )
+                evt -> viewModel.removeFormatter(formatterList.getFocusModel().getFocusedItem())
             )
             .install(actionsColumn);
 
@@ -120,22 +93,16 @@ public void initialize() {
             KeyEvent.KEY_PRESSED,
             event -> {
                 if (event.getCode() == KeyCode.DELETE) {
-                    viewModel.removeFormatter(
-                        formatterList.getSelectionModel().getSelectedItem()
-                    );
+                    viewModel.removeFormatter(formatterList.getSelectionModel().getSelectedItem());
                     event.consume();
                 }
             }
         );
 
         formatterList.setEditable(true);
-        formatterList
-            .itemsProperty()
-            .bindBidirectional(viewModel.formatterListProperty());
+        formatterList.itemsProperty().bindBidirectional(viewModel.formatterListProperty());
 
-        addFormatterName
-            .textProperty()
-            .bindBidirectional(viewModel.addFormatterNameProperty());
+        addFormatterName.textProperty().bindBidirectional(viewModel.addFormatterNameProperty());
         addFormatterName.addEventFilter(
             KeyEvent.KEY_PRESSED,
             event -> {
@@ -147,9 +114,7 @@ public void initialize() {
             }
         );
 
-        addFormatterString
-            .textProperty()
-            .bindBidirectional(viewModel.addFormatterStringProperty());
+        addFormatterString.textProperty().bindBidirectional(viewModel.addFormatterStringProperty());
         addFormatterString.addEventFilter(
             KeyEvent.KEY_PRESSED,
             event -> {
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 53b5bfb58fa..4cd8b83c119 100644
--- a/src/main/java/org/jabref/gui/preferences/nameformatter/NameFormatterTabViewModel.java
+++ b/src/main/java/org/jabref/gui/preferences/nameformatter/NameFormatterTabViewModel.java
@@ -15,10 +15,8 @@ public class NameFormatterTabViewModel implements PreferenceTabViewModel {
 
     private final ListProperty<NameFormatterItemModel> formatterListProperty =
         new SimpleListProperty<>(FXCollections.observableArrayList());
-    private final StringProperty addFormatterNameProperty =
-        new SimpleStringProperty();
-    private final StringProperty addFormatterStringProperty =
-        new SimpleStringProperty();
+    private final StringProperty addFormatterNameProperty = new SimpleStringProperty();
+    private final StringProperty addFormatterStringProperty = new SimpleStringProperty();
 
     private final NameFormatterPreferences nameFormatterPreferences;
 
@@ -34,22 +32,16 @@ public void setValues() {
 
         for (int i = 0; i < names.size(); i++) {
             if (i < formats.size()) {
-                formatterListProperty.add(
-                    new NameFormatterItemModel(names.get(i), formats.get(i))
-                );
+                formatterListProperty.add(new NameFormatterItemModel(names.get(i), formats.get(i)));
             } else {
-                formatterListProperty.add(
-                    new NameFormatterItemModel(names.get(i))
-                );
+                formatterListProperty.add(new NameFormatterItemModel(names.get(i)));
             }
         }
     }
 
     @Override
     public void storeSettings() {
-        formatterListProperty.removeIf(formatter ->
-            formatter.getName().isEmpty()
-        );
+        formatterListProperty.removeIf(formatter -> formatter.getName().isEmpty());
 
         List<String> names = new ArrayList<>(formatterListProperty.size());
         List<String> formats = new ArrayList<>(formatterListProperty.size());
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 90419bfea7f..23db69515f2 100644
--- a/src/main/java/org/jabref/gui/preferences/network/CustomCertificateViewModel.java
+++ b/src/main/java/org/jabref/gui/preferences/network/CustomCertificateViewModel.java
@@ -13,19 +13,13 @@
 
 public class CustomCertificateViewModel extends AbstractViewModel {
 
-    private final StringProperty serialNumberProperty =
-        new SimpleStringProperty("");
+    private final StringProperty serialNumberProperty = new SimpleStringProperty("");
     private final StringProperty issuerProperty = new SimpleStringProperty("");
-    private final ObjectProperty<LocalDate> validFromProperty =
-        new SimpleObjectProperty<>();
-    private final ObjectProperty<LocalDate> validToProperty =
-        new SimpleObjectProperty<>();
-    private final StringProperty signatureAlgorithmProperty =
-        new SimpleStringProperty("");
+    private final ObjectProperty<LocalDate> validFromProperty = new SimpleObjectProperty<>();
+    private final ObjectProperty<LocalDate> validToProperty = new SimpleObjectProperty<>();
+    private final StringProperty signatureAlgorithmProperty = new SimpleStringProperty("");
     private final StringProperty versionProperty = new SimpleStringProperty("");
-    private final StringProperty thumbprintProperty = new SimpleStringProperty(
-        ""
-    );
+    private final StringProperty thumbprintProperty = new SimpleStringProperty("");
     private final StringProperty pathProperty = new SimpleStringProperty("");
 
     public CustomCertificateViewModel(
@@ -91,9 +85,7 @@ public StringProperty pathPropertyProperty() {
     }
 
     public Optional<String> getPath() {
-        if (
-            pathProperty.getValue() == null || pathProperty.getValue().isEmpty()
-        ) {
+        if (pathProperty.getValue() == null || pathProperty.getValue().isEmpty()) {
             return Optional.empty();
         } else {
             return Optional.of(pathProperty.getValue());
@@ -117,9 +109,7 @@ public String getSignatureAlgorithm() {
         return signatureAlgorithmProperty.getValue();
     }
 
-    public static CustomCertificateViewModel fromSSLCertificate(
-        SSLCertificate sslCertificate
-    ) {
+    public static CustomCertificateViewModel fromSSLCertificate(SSLCertificate sslCertificate) {
         return new CustomCertificateViewModel(
             sslCertificate.getSHA256Thumbprint(),
             sslCertificate.getSerialNumber(),
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 fc5283dca24..2933364a5b2 100644
--- a/src/main/java/org/jabref/gui/preferences/network/NetworkTab.java
+++ b/src/main/java/org/jabref/gui/preferences/network/NetworkTab.java
@@ -82,10 +82,7 @@ public class NetworkTab
     private TableColumn<CustomCertificateViewModel, String> certSerialNumber;
 
     @FXML
-    private TableColumn<
-        CustomCertificateViewModel,
-        String
-    > certSignatureAlgorithm;
+    private TableColumn<CustomCertificateViewModel, String> certSignatureAlgorithm;
 
     @FXML
     private TableColumn<CustomCertificateViewModel, String> certValidFrom;
@@ -102,8 +99,7 @@ public class NetworkTab
     private String proxyPasswordText = "";
     private int proxyPasswordCaretPosition = 0;
 
-    private final ControlsFxVisualizer validationVisualizer =
-        new ControlsFxVisualizer();
+    private final ControlsFxVisualizer validationVisualizer = new ControlsFxVisualizer();
 
     public NetworkTab() {
         ViewLoader.view(this).root(this).load();
@@ -115,76 +111,43 @@ public String getTabName() {
     }
 
     public void initialize() {
-        this.viewModel =
-            new NetworkTabViewModel(dialogService, preferencesService);
+        this.viewModel = new NetworkTabViewModel(dialogService, preferencesService);
 
-        versionCheck
-            .selectedProperty()
-            .bindBidirectional(viewModel.versionCheckProperty());
+        versionCheck.selectedProperty().bindBidirectional(viewModel.versionCheckProperty());
 
-        proxyUse
-            .selectedProperty()
-            .bindBidirectional(viewModel.proxyUseProperty());
-        proxyHostnameLabel
-            .disableProperty()
-            .bind(proxyUse.selectedProperty().not());
-        proxyHostname
-            .textProperty()
-            .bindBidirectional(viewModel.proxyHostnameProperty());
+        proxyUse.selectedProperty().bindBidirectional(viewModel.proxyUseProperty());
+        proxyHostnameLabel.disableProperty().bind(proxyUse.selectedProperty().not());
+        proxyHostname.textProperty().bindBidirectional(viewModel.proxyHostnameProperty());
         proxyHostname.disableProperty().bind(proxyUse.selectedProperty().not());
-        proxyPortLabel
-            .disableProperty()
-            .bind(proxyUse.selectedProperty().not());
-        proxyPort
-            .textProperty()
-            .bindBidirectional(viewModel.proxyPortProperty());
+        proxyPortLabel.disableProperty().bind(proxyUse.selectedProperty().not());
+        proxyPort.textProperty().bindBidirectional(viewModel.proxyPortProperty());
         proxyPort.disableProperty().bind(proxyUse.selectedProperty().not());
         proxyUseAuthentication
             .selectedProperty()
             .bindBidirectional(viewModel.proxyUseAuthenticationProperty());
-        proxyUseAuthentication
-            .disableProperty()
-            .bind(proxyUse.selectedProperty().not());
+        proxyUseAuthentication.disableProperty().bind(proxyUse.selectedProperty().not());
 
         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());
+        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()
-            );
+            .bind(proxyCustomAndAuthentication.and(viewModel.passwordPersistAvailable()).not());
         EasyBind.subscribe(
             viewModel.passwordPersistAvailable(),
             available -> {
                 if (!available) {
                     persistentTooltipWrapper.setTooltip(
-                        new Tooltip(
-                            Localization.lang("Credential store not available.")
-                        )
+                        new Tooltip(Localization.lang("Credential store not available."))
                     );
                 } else {
                     persistentTooltipWrapper.setTooltip(null);
@@ -192,21 +155,12 @@ public void initialize() {
             }
         );
 
-        proxyPassword.setRight(
-            IconTheme.JabRefIcons.PASSWORD_REVEALED.getGraphicNode()
-        );
-        proxyPassword
-            .getRight()
-            .addEventFilter(
-                MouseEvent.MOUSE_PRESSED,
-                this::proxyPasswordReveal
-            );
+        proxyPassword.setRight(IconTheme.JabRefIcons.PASSWORD_REVEALED.getGraphicNode());
         proxyPassword
             .getRight()
-            .addEventFilter(MouseEvent.MOUSE_RELEASED, this::proxyPasswordMask);
-        proxyPassword
-            .getRight()
-            .addEventFilter(MouseEvent.MOUSE_EXITED, this::proxyPasswordMask);
+            .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(() -> {
@@ -228,11 +182,8 @@ public void initialize() {
             );
         });
 
-        certSerialNumber.setCellValueFactory(data ->
-            data.getValue().serialNumberProperty()
-        );
-        certIssuer.setCellValueFactory(data -> data.getValue().issuerProperty()
-        );
+        certSerialNumber.setCellValueFactory(data -> data.getValue().serialNumberProperty());
+        certIssuer.setCellValueFactory(data -> data.getValue().issuerProperty());
         certSignatureAlgorithm.setCellValueFactory(data ->
             data.getValue().signatureAlgorithmProperty()
         );
@@ -247,27 +198,19 @@ public void initialize() {
             EasyBind.map(data.getValue().validToProperty(), this::formatDate)
         );
 
-        customCertificatesTable
-            .itemsProperty()
-            .set(viewModel.customCertificateListProperty());
+        customCertificatesTable.itemsProperty().set(viewModel.customCertificateListProperty());
 
         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)
-            )
+            .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)
-                        )
+                        .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 847530a93de..9435988a531 100644
--- a/src/main/java/org/jabref/gui/preferences/network/NetworkTabViewModel.java
+++ b/src/main/java/org/jabref/gui/preferences/network/NetworkTabViewModel.java
@@ -39,30 +39,17 @@
 
 public class NetworkTabViewModel implements PreferenceTabViewModel {
 
-    private final BooleanProperty versionCheckProperty =
-        new SimpleBooleanProperty();
-    private final BooleanProperty proxyUseProperty =
-        new SimpleBooleanProperty();
-    private final StringProperty proxyHostnameProperty =
-        new SimpleStringProperty("");
-    private final StringProperty proxyPortProperty = new SimpleStringProperty(
-        ""
-    );
-    private final BooleanProperty proxyUseAuthenticationProperty =
-        new SimpleBooleanProperty();
-    private final StringProperty proxyUsernameProperty =
-        new SimpleStringProperty("");
-    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 BooleanProperty versionCheckProperty = new SimpleBooleanProperty();
+    private final BooleanProperty proxyUseProperty = new SimpleBooleanProperty();
+    private final StringProperty proxyHostnameProperty = new SimpleStringProperty("");
+    private final StringProperty proxyPortProperty = new SimpleStringProperty("");
+    private final BooleanProperty proxyUseAuthenticationProperty = new SimpleBooleanProperty();
+    private final StringProperty proxyUsernameProperty = new SimpleStringProperty("");
+    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 Validator proxyHostnameValidator;
     private final Validator proxyPortValidator;
@@ -78,14 +65,9 @@ public class NetworkTabViewModel implements PreferenceTabViewModel {
 
     private final TrustStoreManager trustStoreManager;
 
-    private final AtomicBoolean sslCertificatesChanged = new AtomicBoolean(
-        false
-    );
+    private final AtomicBoolean sslCertificatesChanged = new AtomicBoolean(false);
 
-    public NetworkTabViewModel(
-        DialogService dialogService,
-        PreferencesService preferences
-    ) {
+    public NetworkTabViewModel(DialogService dialogService, PreferencesService preferences) {
         this.dialogService = dialogService;
         this.preferences = preferences;
         this.proxyPreferences = preferences.getProxyPreferences();
@@ -159,16 +141,12 @@ public NetworkTabViewModel(
             );
 
         this.trustStoreManager =
-            new TrustStoreManager(
-                Path.of(preferences.getSSLPreferences().getTruststorePath())
-            );
+            new TrustStoreManager(Path.of(preferences.getSSLPreferences().getTruststorePath()));
     }
 
     @Override
     public void setValues() {
-        versionCheckProperty.setValue(
-            internalPreferences.isVersionCheckEnabled()
-        );
+        versionCheckProperty.setValue(internalPreferences.isVersionCheckEnabled());
 
         setProxyValues();
         setSSLValues();
@@ -178,14 +156,10 @@ private void setProxyValues() {
         proxyUseProperty.setValue(proxyPreferences.shouldUseProxy());
         proxyHostnameProperty.setValue(proxyPreferences.getHostname());
         proxyPortProperty.setValue(proxyPreferences.getPort());
-        proxyUseAuthenticationProperty.setValue(
-            proxyPreferences.shouldUseAuthentication()
-        );
+        proxyUseAuthenticationProperty.setValue(proxyPreferences.shouldUseAuthentication());
         proxyUsernameProperty.setValue(proxyPreferences.getUsername());
         proxyPasswordProperty.setValue(proxyPreferences.getPassword());
-        proxyPersistPasswordProperty.setValue(
-            proxyPreferences.shouldPersistPassword()
-        );
+        proxyPersistPasswordProperty.setValue(proxyPreferences.shouldPersistPassword());
         passwordPersistAvailable.setValue(OS.isKeyringAvailable());
     }
 
@@ -203,23 +177,17 @@ private void setSSLValues() {
                 sslCertificatesChanged.set(true);
                 while (c.next()) {
                     if (c.wasAdded()) {
-                        CustomCertificateViewModel certificate = c
-                            .getAddedSubList()
-                            .get(0);
+                        CustomCertificateViewModel certificate = c.getAddedSubList().get(0);
                         certificate
                             .getPath()
                             .ifPresent(path ->
                                 trustStoreManager.addCertificate(
-                                    formatCustomAlias(
-                                        certificate.getThumbprint()
-                                    ),
+                                    formatCustomAlias(certificate.getThumbprint()),
                                     Path.of(path)
                                 )
                             );
                     } else if (c.wasRemoved()) {
-                        CustomCertificateViewModel certificate = c
-                            .getRemoved()
-                            .get(0);
+                        CustomCertificateViewModel certificate = c.getRemoved().get(0);
                         trustStoreManager.deleteCertificate(
                             formatCustomAlias(certificate.getThumbprint())
                         );
@@ -234,13 +202,9 @@ public void storeSettings() {
         proxyPreferences.setUseProxy(proxyUseProperty.getValue());
         proxyPreferences.setHostname(proxyHostnameProperty.getValue().trim());
         proxyPreferences.setPort(proxyPortProperty.getValue().trim());
-        proxyPreferences.setUseAuthentication(
-            proxyUseAuthenticationProperty.getValue()
-        );
+        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);
 
@@ -289,9 +253,7 @@ public boolean validateSettings() {
         if (!validationStatus.isValid()) {
             validationStatus
                 .getHighestMessage()
-                .ifPresent(message ->
-                    dialogService.showErrorDialogAndWait(message.getMessage())
-                );
+                .ifPresent(message -> dialogService.showErrorDialogAndWait(message.getMessage()));
             return false;
         }
         return true;
@@ -301,12 +263,8 @@ public boolean validateSettings() {
      * Check the connection by using the given url. Used for validating the http proxy. The checking result will be appear when request finished. The checking result could be either success or fail, if fail, the cause will be displayed.
      */
     public void checkConnection() {
-        final String connectionSuccessText = Localization.lang(
-            "Connection successful!"
-        );
-        final String connectionFailedText = Localization.lang(
-            "Connection failed!"
-        );
+        final String connectionSuccessText = Localization.lang("Connection successful!");
+        final String connectionFailedText = Localization.lang("Connection failed!");
         final String dialogTitle = Localization.lang("Check Proxy Setting");
 
         final String testUrl = "http://jabref.org";
@@ -327,23 +285,14 @@ public void checkConnection() {
         try {
             urlDownload = new URLDownload(testUrl);
             if (urlDownload.canBeReached()) {
-                dialogService.showInformationDialogAndWait(
-                    dialogTitle,
-                    connectionSuccessText
-                );
+                dialogService.showInformationDialogAndWait(dialogTitle, connectionSuccessText);
             } else {
-                dialogService.showErrorDialogAndWait(
-                    dialogTitle,
-                    connectionFailedText
-                );
+                dialogService.showErrorDialogAndWait(dialogTitle, connectionFailedText);
             }
         } catch (MalformedURLException e) {
             // Why would that happen? Because one of developers inserted a failing url in testUrl...
         } catch (UnirestException e) {
-            dialogService.showErrorDialogAndWait(
-                dialogTitle,
-                connectionFailedText
-            );
+            dialogService.showErrorDialogAndWait(dialogTitle, connectionFailedText);
         }
 
         ProxyRegisterer.register(backupProxyPreferences);
@@ -394,30 +343,22 @@ public ReadOnlyBooleanProperty passwordPersistAvailable() {
         return passwordPersistAvailable;
     }
 
-    public ListProperty<
-        CustomCertificateViewModel
-    > customCertificateListProperty() {
+    public ListProperty<CustomCertificateViewModel> customCertificateListProperty() {
         return customCertificateListProperty;
     }
 
     public void addCertificateFile() {
-        FileDialogConfiguration fileDialogConfiguration =
-            new FileDialogConfiguration.Builder()
-                .addExtensionFilter(
-                    new FileChooser.ExtensionFilter(
-                        Localization.lang("SSL certificate file"),
-                        "*.crt",
-                        "*.cer"
-                    )
-                )
-                .withDefaultExtension(
+        FileDialogConfiguration fileDialogConfiguration = new FileDialogConfiguration.Builder()
+            .addExtensionFilter(
+                new FileChooser.ExtensionFilter(
                     Localization.lang("SSL certificate file"),
-                    StandardFileType.CER
-                )
-                .withInitialDirectory(
-                    preferences.getFilePreferences().getWorkingDirectory()
+                    "*.crt",
+                    "*.cer"
                 )
-                .build();
+            )
+            .withDefaultExtension(Localization.lang("SSL certificate file"), StandardFileType.CER)
+            .withInitialDirectory(preferences.getFilePreferences().getWorkingDirectory())
+            .build();
 
         dialogService
             .showFileOpenDialog(fileDialogConfiguration)
@@ -427,24 +368,18 @@ public void addCertificateFile() {
                     .ifPresent(sslCertificate -> {
                         if (
                             !trustStoreManager.certificateExists(
-                                formatCustomAlias(
-                                    sslCertificate.getSHA256Thumbprint()
-                                )
+                                formatCustomAlias(sslCertificate.getSHA256Thumbprint())
                             )
                         ) {
                             customCertificateListProperty.add(
                                 CustomCertificateViewModel
                                     .fromSSLCertificate(sslCertificate)
-                                    .setPath(
-                                        certPath.toAbsolutePath().toString()
-                                    )
+                                    .setPath(certPath.toAbsolutePath().toString())
                             );
                         } else {
                             dialogService.showWarningDialogAndWait(
                                 Localization.lang("Duplicate Certificates"),
-                                Localization.lang(
-                                    "You already added this certificate"
-                                )
+                                Localization.lang("You already added this certificate")
                             );
                         }
                     })
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 c1cd365ea7b..76402d53b0d 100644
--- a/src/main/java/org/jabref/gui/preferences/preview/PreviewTab.java
+++ b/src/main/java/org/jabref/gui/preferences/preview/PreviewTab.java
@@ -93,8 +93,7 @@ public class PreviewTab
     private long lastKeyPressTime;
     private String listSearchTerm;
 
-    private final ControlsFxVisualizer validationVisualizer =
-        new ControlsFxVisualizer();
+    private final ControlsFxVisualizer validationVisualizer = new ControlsFxVisualizer();
 
     public PreviewTab() {
         ViewLoader.view(this).root(this).load();
@@ -137,9 +136,7 @@ public void initialize() {
             );
         lastKeyPressTime = System.currentTimeMillis();
 
-        showAsTabCheckBox
-            .selectedProperty()
-            .bindBidirectional(viewModel.showAsExtraTabProperty());
+        showAsTabCheckBox.selectedProperty().bindBidirectional(viewModel.showAsExtraTabProperty());
 
         searchBox.setPromptText(Localization.lang("Search") + "...");
         searchBox.setLeft(IconTheme.JabRefIcons.SEARCH.getGraphicNode());
@@ -148,14 +145,8 @@ public void initialize() {
         contextMenu
             .getItems()
             .addAll(
-                factory.createMenuItem(
-                    StandardActions.CUT,
-                    new EditAction(StandardActions.CUT)
-                ),
-                factory.createMenuItem(
-                    StandardActions.COPY,
-                    new EditAction(StandardActions.COPY)
-                ),
+                factory.createMenuItem(StandardActions.CUT, new EditAction(StandardActions.CUT)),
+                factory.createMenuItem(StandardActions.COPY, new EditAction(StandardActions.COPY)),
                 factory.createMenuItem(
                     StandardActions.PASTE,
                     new EditAction(StandardActions.PASTE)
@@ -169,9 +160,7 @@ public void initialize() {
         contextMenu.getStyleClass().add("context-menu");
 
         availableListView.setItems(viewModel.getFilteredAvailableLayouts());
-        viewModel
-            .availableSelectionModelProperty()
-            .setValue(availableListView.getSelectionModel());
+        viewModel.availableSelectionModelProperty().setValue(availableListView.getSelectionModel());
         new ViewModelListCellFactory<PreviewLayout>()
             .withText(PreviewLayout::getDisplayName)
             .install(availableListView);
@@ -180,50 +169,33 @@ public void initialize() {
         availableListView.setOnDragDropped(event ->
             dragDropped(viewModel.availableListProperty(), event)
         );
-        availableListView.setOnKeyTyped(event ->
-            jumpToSearchKey(availableListView, event)
-        );
+        availableListView.setOnKeyTyped(event -> jumpToSearchKey(availableListView, event));
         availableListView.setOnMouseClicked(this::mouseClickedAvailable);
-        availableListView
-            .getSelectionModel()
-            .setSelectionMode(SelectionMode.MULTIPLE);
+        availableListView.getSelectionModel().setSelectionMode(SelectionMode.MULTIPLE);
         availableListView
             .selectionModelProperty()
             .getValue()
             .selectedItemProperty()
-            .addListener((observable, oldValue, newValue) ->
-                viewModel.setPreviewLayout(newValue)
-            );
+            .addListener((observable, oldValue, newValue) -> viewModel.setPreviewLayout(newValue));
 
-        chosenListView
-            .itemsProperty()
-            .bindBidirectional(viewModel.chosenListProperty());
-        viewModel
-            .chosenSelectionModelProperty()
-            .setValue(chosenListView.getSelectionModel());
+        chosenListView.itemsProperty().bindBidirectional(viewModel.chosenListProperty());
+        viewModel.chosenSelectionModelProperty().setValue(chosenListView.getSelectionModel());
         new ViewModelListCellFactory<PreviewLayout>()
             .withText(PreviewLayout::getDisplayName)
             .setOnDragDropped(this::dragDroppedInChosenCell)
             .install(chosenListView);
         chosenListView.setOnDragOver(this::dragOver);
         chosenListView.setOnDragDetected(this::dragDetectedInChosen);
-        chosenListView.setOnDragDropped(event ->
-            dragDropped(viewModel.chosenListProperty(), event)
-        );
-        chosenListView.setOnKeyTyped(event ->
-            jumpToSearchKey(chosenListView, event)
+        chosenListView.setOnDragDropped(event -> dragDropped(viewModel.chosenListProperty(), event)
         );
+        chosenListView.setOnKeyTyped(event -> jumpToSearchKey(chosenListView, event));
         chosenListView.setOnMouseClicked(this::mouseClickedChosen);
-        chosenListView
-            .getSelectionModel()
-            .setSelectionMode(SelectionMode.MULTIPLE);
+        chosenListView.getSelectionModel().setSelectionMode(SelectionMode.MULTIPLE);
         chosenListView
             .selectionModelProperty()
             .getValue()
             .selectedItemProperty()
-            .addListener((observable, oldValue, newValue) ->
-                viewModel.setPreviewLayout(newValue)
-            );
+            .addListener((observable, oldValue, newValue) -> viewModel.setPreviewLayout(newValue));
 
         toRightButton
             .disableProperty()
@@ -237,29 +209,17 @@ public void initialize() {
         toLeftButton
             .disableProperty()
             .bind(
-                viewModel
-                    .chosenSelectionModelProperty()
-                    .getValue()
-                    .selectedItemProperty()
-                    .isNull()
+                viewModel.chosenSelectionModelProperty().getValue().selectedItemProperty().isNull()
             );
         sortUpButton
             .disableProperty()
             .bind(
-                viewModel
-                    .chosenSelectionModelProperty()
-                    .getValue()
-                    .selectedItemProperty()
-                    .isNull()
+                viewModel.chosenSelectionModelProperty().getValue().selectedItemProperty().isNull()
             );
         sortDownButton
             .disableProperty()
             .bind(
-                viewModel
-                    .chosenSelectionModelProperty()
-                    .getValue()
-                    .selectedItemProperty()
-                    .isNull()
+                viewModel.chosenSelectionModelProperty().getValue().selectedItemProperty().isNull()
             );
 
         PreviewViewer previewViewer = new PreviewViewer(
@@ -271,10 +231,7 @@ public void initialize() {
             taskExecutor
         );
         previewViewer.setEntry(TestEntry.getTestEntry());
-        EasyBind.subscribe(
-            viewModel.selectedLayoutProperty(),
-            previewViewer::setLayout
-        );
+        EasyBind.subscribe(viewModel.selectedLayoutProperty(), previewViewer::setLayout);
         previewViewer
             .visibleProperty()
             .bind(
@@ -326,10 +283,7 @@ public void initialize() {
         editArea
             .textProperty()
             .addListener((obs, oldValue, newValue) ->
-                editArea.setStyleSpans(
-                    0,
-                    viewModel.computeHighlighting(newValue)
-                )
+                editArea.setStyleSpans(0, viewModel.computeHighlighting(newValue))
             );
 
         editArea
@@ -346,12 +300,8 @@ public void initialize() {
                 viewModel.setAvailableFilter(searchTerm)
             );
 
-        readOnlyLabel
-            .visibleProperty()
-            .bind(viewModel.selectedIsEditableProperty().not());
-        resetDefaultButton
-            .disableProperty()
-            .bind(viewModel.selectedIsEditableProperty().not());
+        readOnlyLabel.visibleProperty().bind(viewModel.selectedIsEditableProperty().not());
+        resetDefaultButton.disableProperty().bind(viewModel.selectedIsEditableProperty().not());
         contextMenu
             .getItems()
             .get(0)
@@ -362,9 +312,7 @@ public void initialize() {
             .get(2)
             .disableProperty()
             .bind(viewModel.selectedIsEditableProperty().not());
-        editArea
-            .editableProperty()
-            .bind(viewModel.selectedIsEditableProperty());
+        editArea.editableProperty().bind(viewModel.selectedIsEditableProperty());
 
         validationVisualizer.setDecoration(new IconValidationDecorator());
         Platform.runLater(() ->
@@ -383,10 +331,7 @@ public void initialize() {
      * @param keypressed The pressed character
      */
 
-    private void jumpToSearchKey(
-        ListView<PreviewLayout> list,
-        KeyEvent keypressed
-    ) {
+    private void jumpToSearchKey(ListView<PreviewLayout> list, KeyEvent keypressed) {
         if (keypressed.getCharacter() == null) {
             return;
         }
@@ -402,9 +347,7 @@ private void jumpToSearchKey(
         list
             .getItems()
             .stream()
-            .filter(item ->
-                item.getDisplayName().toLowerCase().startsWith(listSearchTerm)
-            )
+            .filter(item -> item.getDisplayName().toLowerCase().startsWith(listSearchTerm))
             .findFirst()
             .ifPresent(list::scrollTo);
     }
@@ -415,10 +358,7 @@ private void dragOver(DragEvent event) {
 
     private void dragDetectedInAvailable(MouseEvent event) {
         List<PreviewLayout> selectedLayouts = new ArrayList<>(
-            viewModel
-                .availableSelectionModelProperty()
-                .getValue()
-                .getSelectedItems()
+            viewModel.availableSelectionModelProperty().getValue().getSelectedItems()
         );
         if (!selectedLayouts.isEmpty()) {
             Dragboard dragboard = startDragAndDrop(TransferMode.MOVE);
@@ -434,10 +374,7 @@ private void dragDetectedInAvailable(MouseEvent event) {
 
     private void dragDetectedInChosen(MouseEvent event) {
         List<PreviewLayout> selectedLayouts = new ArrayList<>(
-            viewModel
-                .chosenSelectionModelProperty()
-                .getValue()
-                .getSelectedItems()
+            viewModel.chosenSelectionModelProperty().getValue().getSelectedItems()
         );
         if (!selectedLayouts.isEmpty()) {
             Dragboard dragboard = startDragAndDrop(TransferMode.MOVE);
@@ -451,26 +388,14 @@ private void dragDetectedInChosen(MouseEvent event) {
         event.consume();
     }
 
-    private void dragDropped(
-        ListProperty<PreviewLayout> targetList,
-        DragEvent event
-    ) {
-        boolean success = viewModel.dragDropped(
-            targetList,
-            event.getDragboard()
-        );
+    private void dragDropped(ListProperty<PreviewLayout> targetList, DragEvent event) {
+        boolean success = viewModel.dragDropped(targetList, event.getDragboard());
         event.setDropCompleted(success);
         event.consume();
     }
 
-    private void dragDroppedInChosenCell(
-        PreviewLayout targetLayout,
-        DragEvent event
-    ) {
-        boolean success = viewModel.dragDroppedInChosenCell(
-            targetLayout,
-            event.getDragboard()
-        );
+    private void dragDroppedInChosenCell(PreviewLayout targetLayout, DragEvent event) {
+        boolean success = viewModel.dragDroppedInChosenCell(targetLayout, event.getDragboard());
         event.setDropCompleted(success);
         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 8a0984efd8a..4a29705642a 100644
--- a/src/main/java/org/jabref/gui/preferences/preview/PreviewTabViewModel.java
+++ b/src/main/java/org/jabref/gui/preferences/preview/PreviewTabViewModel.java
@@ -56,37 +56,30 @@
  * */
 public class PreviewTabViewModel implements PreferenceTabViewModel {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(
-        PreviewTabViewModel.class
-    );
+    private static final Logger LOGGER = LoggerFactory.getLogger(PreviewTabViewModel.class);
 
-    private final BooleanProperty showAsExtraTabProperty =
-        new SimpleBooleanProperty(false);
+    private final BooleanProperty showAsExtraTabProperty = new SimpleBooleanProperty(false);
 
-    private final ListProperty<PreviewLayout> availableListProperty =
-        new SimpleListProperty<>(FXCollections.observableArrayList());
+    private final ListProperty<PreviewLayout> availableListProperty = new SimpleListProperty<>(
+        FXCollections.observableArrayList()
+    );
     private final ObjectProperty<
         MultipleSelectionModel<PreviewLayout>
-    > availableSelectionModelProperty = new SimpleObjectProperty<>(
-        new NoSelectionModel<>()
+    > 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 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<>()
-    );
+    > chosenSelectionModelProperty = new SimpleObjectProperty<>(new NoSelectionModel<>());
 
-    private final BooleanProperty selectedIsEditableProperty =
-        new SimpleBooleanProperty(false);
+    private final BooleanProperty selectedIsEditableProperty = new SimpleBooleanProperty(false);
     private final ObjectProperty<PreviewLayout> selectedLayoutProperty =
         new SimpleObjectProperty<>();
-    private final StringProperty sourceTextProperty = new SimpleStringProperty(
-        ""
-    );
+    private final StringProperty sourceTextProperty = new SimpleStringProperty("");
 
     private final DialogService dialogService;
     private final PreviewPreferences previewPreferences;
@@ -96,9 +89,7 @@ public class PreviewTabViewModel implements PreferenceTabViewModel {
 
     private final CustomLocalDragboard localDragboard;
     private ListProperty<PreviewLayout> dragSourceList = null;
-    private ObjectProperty<
-        MultipleSelectionModel<PreviewLayout>
-    > dragSourceSelectionModel = null;
+    private ObjectProperty<MultipleSelectionModel<PreviewLayout>> dragSourceSelectionModel = null;
 
     public PreviewTabViewModel(
         DialogService dialogService,
@@ -112,10 +103,7 @@ public PreviewTabViewModel(
         this.previewPreferences = previewPreferences;
 
         sourceTextProperty.addListener((observable, oldValue, newValue) -> {
-            if (
-                selectedLayoutProperty.getValue() instanceof
-                TextBasedPreviewLayout layout
-            ) {
+            if (selectedLayoutProperty.getValue() instanceof TextBasedPreviewLayout layout) {
                 layout.setText(sourceTextProperty.getValue());
             }
         });
@@ -137,23 +125,13 @@ public PreviewTabViewModel(
 
     @Override
     public void setValues() {
-        showAsExtraTabProperty.set(
-            previewPreferences.shouldShowPreviewAsExtraTab()
-        );
+        showAsExtraTabProperty.set(previewPreferences.shouldShowPreviewAsExtraTab());
         chosenListProperty().getValue().clear();
-        chosenListProperty
-            .getValue()
-            .addAll(previewPreferences.getLayoutCycle());
+        chosenListProperty.getValue().addAll(previewPreferences.getLayoutCycle());
 
         availableListProperty.clear();
-        if (
-            chosenListProperty
-                .stream()
-                .noneMatch(TextBasedPreviewLayout.class::isInstance)
-        ) {
-            availableListProperty
-                .getValue()
-                .add(previewPreferences.getCustomPreviewLayout());
+        if (chosenListProperty.stream().noneMatch(TextBasedPreviewLayout.class::isInstance)) {
+            availableListProperty.getValue().add(previewPreferences.getCustomPreviewLayout());
         }
 
         BackgroundTask
@@ -161,18 +139,11 @@ public void setValues() {
             .onSuccess(styles ->
                 styles
                     .stream()
-                    .map(style ->
-                        new CitationStylePreviewLayout(
-                            style,
-                            Globals.entryTypesManager
-                        )
-                    )
+                    .map(style -> new CitationStylePreviewLayout(style, Globals.entryTypesManager))
                     .filter(style ->
                         chosenListProperty
                             .getValue()
-                            .filtered(item ->
-                                item.getName().equals(style.getName())
-                            )
+                            .filtered(item -> item.getName().equals(style.getName()))
                             .isEmpty()
                     )
                     .sorted(Comparator.comparing(PreviewLayout::getName))
@@ -212,23 +183,17 @@ public void setPreviewLayout(PreviewLayout selectedLayout) {
         }
 
         if (selectedLayout instanceof TextBasedPreviewLayout layout) {
-            sourceTextProperty.setValue(
-                layout.getText().replace("__NEWLINE__", "\n")
-            );
+            sourceTextProperty.setValue(layout.getText().replace("__NEWLINE__", "\n"));
             selectedIsEditableProperty.setValue(true);
         } else {
-            sourceTextProperty.setValue(
-                ((CitationStylePreviewLayout) selectedLayout).getSource()
-            );
+            sourceTextProperty.setValue(((CitationStylePreviewLayout) selectedLayout).getSource());
             selectedIsEditableProperty.setValue(false);
         }
     }
 
     public void refreshPreview() {
         setPreviewLayout(null);
-        setPreviewLayout(
-            chosenSelectionModelProperty.getValue().getSelectedItem()
-        );
+        setPreviewLayout(chosenSelectionModelProperty.getValue().getSelectedItem());
     }
 
     private PreviewLayout findLayoutByName(String name) {
@@ -256,37 +221,21 @@ public void storeSettings() {
             chosenListProperty.add(previewPreferences.getCustomPreviewLayout());
         }
 
-        PreviewLayout customLayout = findLayoutByName(
-            TextBasedPreviewLayout.NAME
-        );
+        PreviewLayout customLayout = findLayoutByName(TextBasedPreviewLayout.NAME);
         if (customLayout == null) {
             customLayout = previewPreferences.getCustomPreviewLayout();
         }
 
         previewPreferences.getLayoutCycle().clear();
         previewPreferences.getLayoutCycle().addAll(chosenListProperty);
-        previewPreferences.setShowPreviewAsExtraTab(
-            showAsExtraTabProperty.getValue()
-        );
-        previewPreferences.setCustomPreviewLayout(
-            (TextBasedPreviewLayout) customLayout
-        );
+        previewPreferences.setShowPreviewAsExtraTab(showAsExtraTabProperty.getValue());
+        previewPreferences.setCustomPreviewLayout((TextBasedPreviewLayout) customLayout);
 
-        if (
-            !chosenSelectionModelProperty
-                .getValue()
-                .getSelectedItems()
-                .isEmpty()
-        ) {
+        if (!chosenSelectionModelProperty.getValue().getSelectedItems().isEmpty()) {
             previewPreferences.setLayoutCyclePosition(
                 chosenListProperty
                     .getValue()
-                    .indexOf(
-                        chosenSelectionModelProperty
-                            .getValue()
-                            .getSelectedItems()
-                            .get(0)
-                    )
+                    .indexOf(chosenSelectionModelProperty.getValue().getSelectedItems().get(0))
             );
         }
     }
@@ -302,10 +251,7 @@ public boolean validateSettings() {
             if (validationStatus.getHighestMessage().isPresent()) {
                 validationStatus
                     .getHighestMessage()
-                    .ifPresent(message ->
-                        dialogService.showErrorDialogAndWait(
-                            message.getMessage()
-                        )
+                    .ifPresent(message -> dialogService.showErrorDialogAndWait(message.getMessage())
                     );
             }
             return false;
@@ -347,19 +293,12 @@ public void selectedInChosenUp() {
 
         for (int oldIndex : selected) {
             boolean alreadyTaken = newIndices.contains(oldIndex - 1);
-            int newIndex = (oldIndex > 0) && !alreadyTaken
-                ? oldIndex - 1
-                : oldIndex;
-            chosenListProperty.add(
-                newIndex,
-                chosenListProperty.remove(oldIndex)
-            );
+            int newIndex = (oldIndex > 0) && !alreadyTaken ? oldIndex - 1 : oldIndex;
+            chosenListProperty.add(newIndex, chosenListProperty.remove(oldIndex));
             newIndices.add(newIndex);
         }
 
-        newIndices.forEach(index ->
-            chosenSelectionModelProperty.getValue().select(index)
-        );
+        newIndices.forEach(index -> chosenSelectionModelProperty.getValue().select(index));
         chosenSelectionModelProperty.getValue().select(newIndices.get(0));
         refreshPreview();
     }
@@ -378,28 +317,20 @@ public void selectedInChosenDown() {
         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
+            int newIndex = (oldIndex < (chosenListProperty.size() - 1)) && !alreadyTaken
                 ? oldIndex + 1
                 : oldIndex;
-            chosenListProperty.add(
-                newIndex,
-                chosenListProperty.remove(oldIndex)
-            );
+            chosenListProperty.add(newIndex, chosenListProperty.remove(oldIndex));
             newIndices.add(newIndex);
         }
 
-        newIndices.forEach(index ->
-            chosenSelectionModelProperty.getValue().select(index)
-        );
+        newIndices.forEach(index -> chosenSelectionModelProperty.getValue().select(index));
         chosenSelectionModelProperty.getValue().select(newIndices.get(0));
         refreshPreview();
     }
 
     public void resetDefaultLayout() {
-        PreviewLayout defaultLayout = findLayoutByName(
-            TextBasedPreviewLayout.NAME
-        );
+        PreviewLayout defaultLayout = findLayoutByName(TextBasedPreviewLayout.NAME);
         if (defaultLayout instanceof TextBasedPreviewLayout layout) {
             layout.setText(previewPreferences.getDefaultCustomPreviewLayout());
         }
@@ -420,12 +351,9 @@ public void resetDefaultLayout() {
      */
     public StyleSpans<Collection<String>> computeHighlighting(String text) {
         final Pattern XML_TAG = Pattern.compile(
-            "(?<ELEMENT>(</?\\h*)(\\w+)([^<>]*)(\\h*/?>))" +
-            "|(?<COMMENT><!--[^<>]+-->)"
-        );
-        final Pattern ATTRIBUTES = Pattern.compile(
-            "(\\w+\\h*)(=)(\\h*\"[^\"]+\")"
+            "(?<ELEMENT>(</?\\h*)(\\w+)([^<>]*)(\\h*/?>))" + "|(?<COMMENT><!--[^<>]+-->)"
         );
+        final Pattern ATTRIBUTES = Pattern.compile("(\\w+\\h*)(=)(\\h*\"[^\"]+\")");
 
         final int GROUP_OPEN_BRACKET = 2;
         final int GROUP_ELEMENT_NAME = 3;
@@ -437,41 +365,28 @@ public StyleSpans<Collection<String>> computeHighlighting(String text) {
 
         Matcher matcher = XML_TAG.matcher(text);
         int lastKeywordEnd = 0;
-        StyleSpansBuilder<Collection<String>> spansBuilder =
-            new StyleSpansBuilder<>();
+        StyleSpansBuilder<Collection<String>> spansBuilder = new StyleSpansBuilder<>();
         while (matcher.find()) {
-            spansBuilder.add(
-                Collections.emptyList(),
-                matcher.start() - lastKeywordEnd
-            );
+            spansBuilder.add(Collections.emptyList(), matcher.start() - lastKeywordEnd);
             if (matcher.group("COMMENT") != null) {
-                spansBuilder.add(
-                    Collections.singleton("comment"),
-                    matcher.end() - matcher.start()
-                );
+                spansBuilder.add(Collections.singleton("comment"), matcher.end() - matcher.start());
             } else {
                 if (matcher.group("ELEMENT") != null) {
-                    String attributesText = matcher.group(
-                        GROUP_ATTRIBUTES_SECTION
-                    );
+                    String attributesText = matcher.group(GROUP_ATTRIBUTES_SECTION);
 
                     spansBuilder.add(
                         Collections.singleton("tagmark"),
-                        matcher.end(GROUP_OPEN_BRACKET) -
-                        matcher.start(GROUP_OPEN_BRACKET)
+                        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)
+                        matcher.end(GROUP_ELEMENT_NAME) - matcher.end(GROUP_OPEN_BRACKET)
                     );
 
                     if (!attributesText.isEmpty()) {
                         lastKeywordEnd = 0;
 
-                        Matcher attributesMatcher = ATTRIBUTES.matcher(
-                            attributesText
-                        );
+                        Matcher attributesMatcher = ATTRIBUTES.matcher(attributesText);
                         while (attributesMatcher.find()) {
                             spansBuilder.add(
                                 Collections.emptyList(),
@@ -512,28 +427,19 @@ public StyleSpans<Collection<String>> computeHighlighting(String text) {
             }
             lastKeywordEnd = matcher.end();
         }
-        spansBuilder.add(
-            Collections.emptyList(),
-            text.length() - lastKeywordEnd
-        );
+        spansBuilder.add(Collections.emptyList(), text.length() - lastKeywordEnd);
         return spansBuilder.create();
     }
 
     public void dragOver(DragEvent event) {
-        if (
-            event
-                .getDragboard()
-                .hasContent(DragAndDropDataFormats.PREVIEWLAYOUTS)
-        ) {
+        if (event.getDragboard().hasContent(DragAndDropDataFormats.PREVIEWLAYOUTS)) {
             event.acceptTransferModes(TransferMode.MOVE);
         }
     }
 
     public void dragDetected(
         ListProperty<PreviewLayout> sourceList,
-        ObjectProperty<
-            MultipleSelectionModel<PreviewLayout>
-        > sourceSelectionModel,
+        ObjectProperty<MultipleSelectionModel<PreviewLayout>> sourceSelectionModel,
         List<PreviewLayout> selectedLayouts,
         Dragboard dragboard
     ) {
@@ -551,15 +457,11 @@ public void dragDetected(
      * @param targetList either availableListView or chosenListView
      */
 
-    public boolean dragDropped(
-        ListProperty<PreviewLayout> targetList,
-        Dragboard dragboard
-    ) {
+    public boolean dragDropped(ListProperty<PreviewLayout> targetList, Dragboard dragboard) {
         boolean success = false;
 
         if (dragboard.hasContent(DragAndDropDataFormats.PREVIEWLAYOUTS)) {
-            List<PreviewLayout> draggedLayouts =
-                localDragboard.getPreviewLayouts();
+            List<PreviewLayout> draggedLayouts = localDragboard.getPreviewLayouts();
             if (!draggedLayouts.isEmpty()) {
                 dragSourceSelectionModel.getValue().clearSelection();
                 dragSourceList.getValue().removeAll(draggedLayouts);
@@ -569,11 +471,7 @@ public boolean dragDropped(
                 if (targetList == availableListProperty) {
                     targetList
                         .getValue()
-                        .sort((a, b) ->
-                            a
-                                .getDisplayName()
-                                .compareToIgnoreCase(b.getDisplayName())
-                        );
+                        .sort((a, b) -> a.getDisplayName().compareToIgnoreCase(b.getDisplayName()));
                 }
             }
         }
@@ -587,10 +485,7 @@ public boolean dragDropped(
      * @param targetLayout the Layout, the user drops a layout on
      */
 
-    public boolean dragDroppedInChosenCell(
-        PreviewLayout targetLayout,
-        Dragboard dragboard
-    ) {
+    public boolean dragDroppedInChosenCell(PreviewLayout targetLayout, Dragboard dragboard) {
         boolean success = false;
 
         if (dragboard.hasContent(DragAndDropDataFormats.PREVIEWLAYOUTS)) {
@@ -599,9 +494,7 @@ public boolean dragDroppedInChosenCell(
             );
             if (!draggedSelectedLayouts.isEmpty()) {
                 chosenSelectionModelProperty.getValue().clearSelection();
-                int targetId = chosenListProperty
-                    .getValue()
-                    .indexOf(targetLayout);
+                int targetId = chosenListProperty.getValue().indexOf(targetLayout);
 
                 // see https://stackoverflow.com/questions/28603224/sort-tableview-with-drag-and-drop-rows
                 int onSelectedDelta = 0;
@@ -620,15 +513,12 @@ public boolean dragDroppedInChosenCell(
 
                 if (targetLayout != null) {
                     targetId =
-                        chosenListProperty.getValue().indexOf(targetLayout) +
-                        onSelectedDelta;
+                        chosenListProperty.getValue().indexOf(targetLayout) + onSelectedDelta;
                 } else if (targetId != 0) {
                     targetId = chosenListProperty.getValue().size();
                 }
 
-                chosenListProperty
-                    .getValue()
-                    .addAll(targetId, draggedSelectedLayouts);
+                chosenListProperty.getValue().addAll(targetId, draggedSelectedLayouts);
 
                 draggedSelectedLayouts.forEach(layout ->
                     chosenSelectionModelProperty.getValue().select(layout)
@@ -655,14 +545,11 @@ public FilteredList<PreviewLayout> getFilteredAvailableLayouts() {
 
     public void setAvailableFilter(String searchTerm) {
         this.filteredAvailableLayouts.setPredicate(preview ->
-                searchTerm.isEmpty() ||
-                preview.containsCaseIndependent(searchTerm)
+                searchTerm.isEmpty() || preview.containsCaseIndependent(searchTerm)
             );
     }
 
-    public ObjectProperty<
-        MultipleSelectionModel<PreviewLayout>
-    > availableSelectionModelProperty() {
+    public ObjectProperty<MultipleSelectionModel<PreviewLayout>> availableSelectionModelProperty() {
         return availableSelectionModelProperty;
     }
 
@@ -670,9 +557,7 @@ public ListProperty<PreviewLayout> chosenListProperty() {
         return chosenListProperty;
     }
 
-    public ObjectProperty<
-        MultipleSelectionModel<PreviewLayout>
-    > chosenSelectionModelProperty() {
+    public ObjectProperty<MultipleSelectionModel<PreviewLayout>> chosenSelectionModelProperty() {
         return chosenSelectionModelProperty;
     }
 
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 7d41eb85700..1a90fc6836c 100644
--- a/src/main/java/org/jabref/gui/preferences/protectedterms/NewProtectedTermsFileDialog.java
+++ b/src/main/java/org/jabref/gui/preferences/protectedterms/NewProtectedTermsFileDialog.java
@@ -30,46 +30,27 @@ public NewProtectedTermsFileDialog(
 
         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())
-                )
+                .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)
-            )
+            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);
+        getDialogPane().getButtonTypes().setAll(ButtonType.OK, ButtonType.CANCEL);
 
         setResultConverter(button -> {
             if (button == ButtonType.OK) {
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 97b29c8623b..ad953523009 100644
--- a/src/main/java/org/jabref/gui/preferences/protectedterms/ProtectedTermsTab.java
+++ b/src/main/java/org/jabref/gui/preferences/protectedterms/ProtectedTermsTab.java
@@ -33,34 +33,19 @@ public class ProtectedTermsTab
     private TableView<ProtectedTermsListItemModel> filesTable;
 
     @FXML
-    private TableColumn<
-        ProtectedTermsListItemModel,
-        Boolean
-    > filesTableEnabledColumn;
+    private TableColumn<ProtectedTermsListItemModel, Boolean> filesTableEnabledColumn;
 
     @FXML
-    private TableColumn<
-        ProtectedTermsListItemModel,
-        String
-    > filesTableDescriptionColumn;
+    private TableColumn<ProtectedTermsListItemModel, String> filesTableDescriptionColumn;
 
     @FXML
-    private TableColumn<
-        ProtectedTermsListItemModel,
-        String
-    > filesTableFileColumn;
+    private TableColumn<ProtectedTermsListItemModel, String> filesTableFileColumn;
 
     @FXML
-    private TableColumn<
-        ProtectedTermsListItemModel,
-        Boolean
-    > filesTableEditColumn;
+    private TableColumn<ProtectedTermsListItemModel, Boolean> filesTableEditColumn;
 
     @FXML
-    private TableColumn<
-        ProtectedTermsListItemModel,
-        Boolean
-    > filesTableDeleteColumn;
+    private TableColumn<ProtectedTermsListItemModel, Boolean> filesTableDeleteColumn;
 
     @Inject
     private ProtectedTermsLoader termsLoader;
@@ -79,12 +64,7 @@ public String getTabName() {
 
     @FXML
     public void initialize() {
-        viewModel =
-            new ProtectedTermsTabViewModel(
-                termsLoader,
-                dialogService,
-                preferencesService
-            );
+        viewModel = new ProtectedTermsTabViewModel(termsLoader, dialogService, preferencesService);
 
         new ViewModelTableRowFactory<ProtectedTermsListItemModel>()
             .withContextMenu(this::createContextMenu)
@@ -92,51 +72,34 @@ public void initialize() {
         filesTableEnabledColumn.setCellFactory(
             CheckBoxTableCell.forTableColumn(filesTableEnabledColumn)
         );
-        filesTableEnabledColumn.setCellValueFactory(data ->
-            data.getValue().enabledProperty()
-        );
+        filesTableEnabledColumn.setCellValueFactory(data -> data.getValue().enabledProperty());
         filesTableDescriptionColumn.setCellValueFactory(data ->
-            BindingsHelper.constantOf(
-                data.getValue().getTermsList().getDescription()
-            )
+            BindingsHelper.constantOf(data.getValue().getTermsList().getDescription())
         );
 
         filesTableFileColumn.setCellValueFactory(data -> {
             ProtectedTermsList list = data.getValue().getTermsList();
             if (list.isInternalList()) {
-                return BindingsHelper.constantOf(
-                    Localization.lang("Internal list")
-                );
+                return BindingsHelper.constantOf(Localization.lang("Internal list"));
             } else {
                 return BindingsHelper.constantOf(list.getLocation());
             }
         });
 
-        filesTableEditColumn.setCellValueFactory(data ->
-            data.getValue().internalProperty().not()
-        );
+        filesTableEditColumn.setCellValueFactory(data -> data.getValue().internalProperty().not());
         new ValueTableCellFactory<ProtectedTermsListItemModel, Boolean>()
             .withGraphic(none -> IconTheme.JabRefIcons.EDIT.getGraphicNode())
             .withVisibleExpression(ReadOnlyBooleanWrapper::new)
-            .withOnMouseClickedEvent((item, none) ->
-                event -> viewModel.edit(item)
-            )
+            .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()
-            )
+            .withGraphic(none -> IconTheme.JabRefIcons.DELETE_ENTRY.getGraphicNode())
             .withVisibleExpression(ReadOnlyBooleanWrapper::new)
-            .withTooltip(none ->
-                Localization.lang("Remove protected terms file")
-            )
-            .withOnMouseClickedEvent((item, none) ->
-                event -> viewModel.removeList(item)
-            )
+            .withTooltip(none -> Localization.lang("Remove protected terms file"))
+            .withOnMouseClickedEvent((item, none) -> event -> viewModel.removeList(item))
             .install(filesTableDeleteColumn);
 
         filesTable.itemsProperty().set(viewModel.termsFilesProperty());
@@ -150,31 +113,19 @@ private ContextMenu createContextMenu(ProtectedTermsListItemModel file) {
             .addAll(
                 factory.createMenuItem(
                     StandardActions.EDIT_LIST,
-                    new ProtectedTermsTab.ContextAction(
-                        StandardActions.EDIT_LIST,
-                        file
-                    )
+                    new ProtectedTermsTab.ContextAction(StandardActions.EDIT_LIST, file)
                 ),
                 factory.createMenuItem(
                     StandardActions.VIEW_LIST,
-                    new ProtectedTermsTab.ContextAction(
-                        StandardActions.VIEW_LIST,
-                        file
-                    )
+                    new ProtectedTermsTab.ContextAction(StandardActions.VIEW_LIST, file)
                 ),
                 factory.createMenuItem(
                     StandardActions.REMOVE_LIST,
-                    new ProtectedTermsTab.ContextAction(
-                        StandardActions.REMOVE_LIST,
-                        file
-                    )
+                    new ProtectedTermsTab.ContextAction(StandardActions.REMOVE_LIST, file)
                 ),
                 factory.createMenuItem(
                     StandardActions.RELOAD_LIST,
-                    new ProtectedTermsTab.ContextAction(
-                        StandardActions.RELOAD_LIST,
-                        file
-                    )
+                    new ProtectedTermsTab.ContextAction(StandardActions.RELOAD_LIST, file)
                 )
             );
         contextMenu.getItems().forEach(item -> item.setGraphic(null));
@@ -198,19 +149,14 @@ private class ContextAction extends SimpleCommand {
         private final StandardActions command;
         private final ProtectedTermsListItemModel itemModel;
 
-        public ContextAction(
-            StandardActions command,
-            ProtectedTermsListItemModel itemModel
-        ) {
+        public ContextAction(StandardActions command, ProtectedTermsListItemModel itemModel) {
             this.command = command;
             this.itemModel = itemModel;
 
             this.executable.bind(
                     BindingsHelper.constantOf(
                         switch (command) {
-                            case EDIT_LIST,
-                                REMOVE_LIST,
-                                RELOAD_LIST -> !itemModel
+                            case EDIT_LIST, REMOVE_LIST, RELOAD_LIST -> !itemModel
                                 .getTermsList()
                                 .isInternalList();
                             default -> true;
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 2793415290f..d428fdd011f 100644
--- a/src/main/java/org/jabref/gui/preferences/protectedterms/ProtectedTermsTabViewModel.java
+++ b/src/main/java/org/jabref/gui/preferences/protectedterms/ProtectedTermsTabViewModel.java
@@ -32,9 +32,7 @@
 
 public class ProtectedTermsTabViewModel implements PreferenceTabViewModel {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(
-        ProtectedTermsTabViewModel.class
-    );
+    private static final Logger LOGGER = LoggerFactory.getLogger(ProtectedTermsTabViewModel.class);
 
     private final ProtectedTermsLoader termsLoader;
     private final ListProperty<ProtectedTermsListItemModel> termsFilesProperty =
@@ -51,8 +49,7 @@ public ProtectedTermsTabViewModel(
         this.termsLoader = termsLoader;
         this.dialogService = dialogService;
         this.filePreferences = preferencesService.getFilePreferences();
-        this.protectedTermsPreferences =
-            preferencesService.getProtectedTermsPreferences();
+        this.protectedTermsPreferences = preferencesService.getProtectedTermsPreferences();
     }
 
     @Override
@@ -94,35 +91,20 @@ public void storeSettings() {
             }
         }
 
-        protectedTermsPreferences.setEnabledInternalTermLists(
-            enabledInternalList
-        );
-        protectedTermsPreferences.setEnabledExternalTermLists(
-            enabledExternalList
-        );
-        protectedTermsPreferences.setDisabledInternalTermLists(
-            disabledInternalList
-        );
-        protectedTermsPreferences.setDisabledExternalTermLists(
-            disabledExternalList
-        );
+        protectedTermsPreferences.setEnabledInternalTermLists(enabledInternalList);
+        protectedTermsPreferences.setEnabledExternalTermLists(enabledExternalList);
+        protectedTermsPreferences.setDisabledInternalTermLists(disabledInternalList);
+        protectedTermsPreferences.setDisabledExternalTermLists(disabledExternalList);
 
         termsLoader.update(protectedTermsPreferences);
     }
 
     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();
+        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)
@@ -130,10 +112,7 @@ public void addFile() {
                 Path fileName = file.toAbsolutePath();
                 termsFilesProperty.add(
                     new ProtectedTermsListItemModel(
-                        ProtectedTermsLoader.readProtectedTermsListFromFile(
-                            fileName,
-                            true
-                        )
+                        ProtectedTermsLoader.readProtectedTermsListFromFile(fileName, true)
                     )
                 );
             });
@@ -145,9 +124,7 @@ public void removeList(ProtectedTermsListItemModel itemModel) {
             !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("Are you sure you want to remove the protected terms file?"),
                 Localization.lang("Remove protected terms file"),
                 Localization.lang("Cancel")
             )
@@ -161,22 +138,13 @@ public void removeList(ProtectedTermsListItemModel itemModel) {
 
     public void createNewFile() {
         dialogService.showCustomDialogAndWait(
-            new NewProtectedTermsFileDialog(
-                termsFilesProperty,
-                dialogService,
-                filePreferences
-            )
+            new NewProtectedTermsFileDialog(termsFilesProperty, dialogService, filePreferences)
         );
     }
 
     public void edit(ProtectedTermsListItemModel file) {
-        Optional<ExternalFileType> termsFileType = OptionalUtil.<
-            ExternalFileType
-        >orElse(
-            ExternalFileTypes.getExternalFileTypeByExt(
-                "terms",
-                filePreferences
-            ),
+        Optional<ExternalFileType> termsFileType = OptionalUtil.<ExternalFileType>orElse(
+            ExternalFileTypes.getExternalFileTypeByExt("terms", filePreferences),
             ExternalFileTypes.getExternalFileTypeByExt("txt", filePreferences)
         );
 
@@ -215,22 +183,15 @@ public void displayContent(ProtectedTermsListItemModel itemModel) {
 
     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)
-            );
+            termsFilesProperty.set(index, new ProtectedTermsListItemModel(newList));
         } else {
-            LOGGER.warn(
-                "Problem reloading protected terms file {}.",
-                oldList.getLocation()
-            );
+            LOGGER.warn("Problem reloading protected terms file {}.", oldList.getLocation());
         }
     }
 
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 4b20b976890..07bc2156bca 100644
--- a/src/main/java/org/jabref/gui/preferences/table/TableTab.java
+++ b/src/main/java/org/jabref/gui/preferences/table/TableTab.java
@@ -74,8 +74,7 @@ public class TableTab
     @FXML
     private RadioButton abbreviationLastNameOnly;
 
-    private final ControlsFxVisualizer validationVisualizer =
-        new ControlsFxVisualizer();
+    private final ControlsFxVisualizer validationVisualizer = new ControlsFxVisualizer();
 
     public TableTab() {
         ViewLoader.view(this).root(this).load();
@@ -87,8 +86,7 @@ public String getTabName() {
     }
 
     public void initialize() {
-        this.viewModel =
-            new TableTabViewModel(dialogService, preferencesService);
+        this.viewModel = new TableTabViewModel(dialogService, preferencesService);
 
         setupTable();
         setupBindings();
@@ -110,42 +108,28 @@ public void initialize() {
     private void setupTable() {
         nameColumn.setSortable(false);
         nameColumn.setReorderable(false);
-        nameColumn.setCellValueFactory(cellData ->
-            cellData.getValue().nameProperty()
-        );
+        nameColumn.setCellValueFactory(cellData -> cellData.getValue().nameProperty());
         new ValueTableCellFactory<MainTableColumnModel, String>()
             .withText(name -> name)
             .install(nameColumn);
 
         actionsColumn.setSortable(false);
         actionsColumn.setReorderable(false);
-        actionsColumn.setCellValueFactory(cellData ->
-            cellData.getValue().nameProperty()
-        );
+        actionsColumn.setCellValueFactory(cellData -> cellData.getValue().nameProperty());
         new ValueTableCellFactory<MainTableColumnModel, String>()
-            .withGraphic(item ->
-                IconTheme.JabRefIcons.DELETE_ENTRY.getGraphicNode()
-            )
-            .withTooltip(name -> Localization.lang("Remove column") + " " + name
-            )
+            .withGraphic(item -> IconTheme.JabRefIcons.DELETE_ENTRY.getGraphicNode())
+            .withTooltip(name -> Localization.lang("Remove column") + " " + name)
             .withOnMouseClickedEvent(item ->
-                evt ->
-                    viewModel.removeColumn(
-                        columnsList.getFocusModel().getFocusedItem()
-                    )
+                evt -> viewModel.removeColumn(columnsList.getFocusModel().getFocusedItem())
             )
             .install(actionsColumn);
 
-        viewModel
-            .selectedColumnModelProperty()
-            .setValue(columnsList.getSelectionModel());
+        viewModel.selectedColumnModelProperty().setValue(columnsList.getSelectionModel());
         columnsList.addEventFilter(
             KeyEvent.KEY_PRESSED,
             event -> {
                 if (event.getCode() == KeyCode.DELETE) {
-                    viewModel.removeColumn(
-                        columnsList.getSelectionModel().getSelectedItem()
-                    );
+                    viewModel.removeColumn(columnsList.getSelectionModel().getSelectedItem());
                     event.consume();
                 }
             }
@@ -156,12 +140,8 @@ private void setupTable() {
         new ViewModelListCellFactory<MainTableColumnModel>()
             .withText(MainTableColumnModel::getDisplayName)
             .install(addColumnName);
-        addColumnName
-            .itemsProperty()
-            .bind(viewModel.availableColumnsProperty());
-        addColumnName
-            .valueProperty()
-            .bindBidirectional(viewModel.addColumnProperty());
+        addColumnName.itemsProperty().bind(viewModel.availableColumnsProperty());
+        addColumnName.valueProperty().bindBidirectional(viewModel.addColumnProperty());
         addColumnName.setConverter(TableTabViewModel.columnNameStringConverter);
         addColumnName.addEventFilter(
             KeyEvent.KEY_PRESSED,
@@ -193,43 +173,29 @@ private void setupBindings() {
             .selectedProperty()
             .bindBidirectional(viewModel.autoResizeColumnsProperty());
 
-        namesNatbib
-            .selectedProperty()
-            .bindBidirectional(viewModel.namesNatbibProperty());
-        nameAsIs
-            .selectedProperty()
-            .bindBidirectional(viewModel.nameAsIsProperty());
-        nameFirstLast
-            .selectedProperty()
-            .bindBidirectional(viewModel.nameFirstLastProperty());
-        nameLastFirst
-            .selectedProperty()
-            .bindBidirectional(viewModel.nameLastFirstProperty());
+        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())
-            );
+            .bind(namesNatbib.selectedProperty().or(nameAsIs.selectedProperty()));
         abbreviationEnabled
             .selectedProperty()
             .bindBidirectional(viewModel.abbreviationEnabledProperty());
         abbreviationEnabled
             .disableProperty()
-            .bind(
-                namesNatbib.selectedProperty().or(nameAsIs.selectedProperty())
-            );
+            .bind(namesNatbib.selectedProperty().or(nameAsIs.selectedProperty()));
         abbreviationLastNameOnly
             .selectedProperty()
             .bindBidirectional(viewModel.abbreviationLastNameOnlyProperty());
         abbreviationLastNameOnly
             .disableProperty()
-            .bind(
-                namesNatbib.selectedProperty().or(nameAsIs.selectedProperty())
-            );
+            .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 433c14515cf..86f85607354 100644
--- a/src/main/java/org/jabref/gui/preferences/table/TableTabViewModel.java
+++ b/src/main/java/org/jabref/gui/preferences/table/TableTabViewModel.java
@@ -51,38 +51,26 @@ public MainTableColumnModel fromString(String string) {
             }
         };
 
-    private final ListProperty<MainTableColumnModel> columnsListProperty =
-        new SimpleListProperty<>(FXCollections.observableArrayList());
-    private final ObjectProperty<
-        SelectionModel<MainTableColumnModel>
-    > selectedColumnModelProperty = new SimpleObjectProperty<>(
-        new NoSelectionModel<>()
+    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();
-
-    private final BooleanProperty namesNatbibProperty =
-        new SimpleBooleanProperty();
-    private final BooleanProperty nameAsIsProperty =
-        new SimpleBooleanProperty();
-    private final BooleanProperty nameFirstLastProperty =
-        new SimpleBooleanProperty();
-    private final BooleanProperty nameLastFirstProperty =
-        new SimpleBooleanProperty();
-    private final BooleanProperty abbreviationDisabledProperty =
-        new SimpleBooleanProperty();
-    private final BooleanProperty abbreviationEnabledProperty =
-        new SimpleBooleanProperty();
-    private final BooleanProperty abbreviationLastNameOnlyProperty =
-        new SimpleBooleanProperty();
+    private final BooleanProperty specialFieldsEnabledProperty = new SimpleBooleanProperty();
+    private final BooleanProperty extraFileColumnsEnabledProperty = new SimpleBooleanProperty();
+    private final BooleanProperty autoResizeColumnsProperty = new SimpleBooleanProperty();
+
+    private final BooleanProperty namesNatbibProperty = new SimpleBooleanProperty();
+    private final BooleanProperty nameAsIsProperty = new SimpleBooleanProperty();
+    private final BooleanProperty nameFirstLastProperty = new SimpleBooleanProperty();
+    private final BooleanProperty nameLastFirstProperty = new SimpleBooleanProperty();
+    private final BooleanProperty abbreviationDisabledProperty = new SimpleBooleanProperty();
+    private final BooleanProperty abbreviationEnabledProperty = new SimpleBooleanProperty();
+    private final BooleanProperty abbreviationLastNameOnlyProperty = new SimpleBooleanProperty();
 
     private final Validator columnsNotEmptyValidator;
 
@@ -94,36 +82,28 @@ public MainTableColumnModel fromString(String string) {
     private final NameDisplayPreferences nameDisplayPreferences;
     private final MainTablePreferences mainTablePreferences;
 
-    public TableTabViewModel(
-        DialogService dialogService,
-        PreferencesService preferences
-    ) {
+    public TableTabViewModel(DialogService dialogService, PreferencesService preferences) {
         this.dialogService = dialogService;
         this.preferences = preferences;
-        this.specialFieldsPreferences =
-            preferences.getSpecialFieldsPreferences();
+        this.specialFieldsPreferences = preferences.getSpecialFieldsPreferences();
         this.nameDisplayPreferences = preferences.getNameDisplayPreferences();
         this.mainTablePreferences = preferences.getMainTablePreferences();
 
-        specialFieldsEnabledProperty.addListener(
-            (observable, oldValue, newValue) -> {
-                if (newValue) {
-                    insertSpecialFieldColumns();
-                } else {
-                    removeSpecialFieldColumns();
-                }
+        specialFieldsEnabledProperty.addListener((observable, oldValue, newValue) -> {
+            if (newValue) {
+                insertSpecialFieldColumns();
+            } else {
+                removeSpecialFieldColumns();
             }
-        );
+        });
 
-        extraFileColumnsEnabledProperty.addListener(
-            (observable, oldValue, newValue) -> {
-                if (newValue) {
-                    insertExtraFileColumns();
-                } else {
-                    removeExtraFileColumns();
-                }
+        extraFileColumnsEnabledProperty.addListener((observable, oldValue, newValue) -> {
+            if (newValue) {
+                insertExtraFileColumns();
+            } else {
+                removeExtraFileColumns();
             }
-        );
+        });
 
         columnsNotEmptyValidator =
             new FunctionBasedValidator<>(
@@ -144,24 +124,16 @@ public TableTabViewModel(
     public void setValues() {
         initialColumnPreferences = mainTablePreferences.getColumnPreferences();
 
-        specialFieldsEnabledProperty.setValue(
-            specialFieldsPreferences.isSpecialFieldsEnabled()
-        );
-        extraFileColumnsEnabledProperty.setValue(
-            mainTablePreferences.getExtraFileColumnsEnabled()
-        );
-        autoResizeColumnsProperty.setValue(
-            mainTablePreferences.getResizeColumnsToFit()
-        );
+        specialFieldsEnabledProperty.setValue(specialFieldsPreferences.isSpecialFieldsEnabled());
+        extraFileColumnsEnabledProperty.setValue(mainTablePreferences.getExtraFileColumnsEnabled());
+        autoResizeColumnsProperty.setValue(mainTablePreferences.getResizeColumnsToFit());
 
         fillColumnList();
 
         availableColumnsProperty.clear();
         availableColumnsProperty.addAll(
             new MainTableColumnModel(MainTableColumnModel.Type.INDEX),
-            new MainTableColumnModel(
-                MainTableColumnModel.Type.LINKED_IDENTIFIER
-            ),
+            new MainTableColumnModel(MainTableColumnModel.Type.LINKED_IDENTIFIER),
             new MainTableColumnModel(MainTableColumnModel.Type.GROUPS),
             new MainTableColumnModel(MainTableColumnModel.Type.FILES),
             new MainTableColumnModel(
@@ -190,12 +162,7 @@ public void setValues() {
             .allOf(StandardField.class)
             .stream()
             .map(Field::getName)
-            .map(name ->
-                new MainTableColumnModel(
-                    MainTableColumnModel.Type.NORMALFIELD,
-                    name
-                )
-            )
+            .map(name -> new MainTableColumnModel(MainTableColumnModel.Type.NORMALFIELD, name))
             .forEach(item -> availableColumnsProperty.getValue().add(item));
 
         if (specialFieldsEnabledProperty.getValue()) {
@@ -215,9 +182,7 @@ public void setValues() {
 
         switch (nameDisplayPreferences.getAbbreviationStyle()) {
             case FULL -> abbreviationEnabledProperty.setValue(true);
-            case LASTNAME_ONLY -> abbreviationLastNameOnlyProperty.setValue(
-                true
-            );
+            case LASTNAME_ONLY -> abbreviationLastNameOnlyProperty.setValue(true);
             case NONE -> abbreviationDisabledProperty.setValue(true);
         }
     }
@@ -225,9 +190,7 @@ public void setValues() {
     public void fillColumnList() {
         columnsListProperty.getValue().clear();
         if (initialColumnPreferences != null) {
-            initialColumnPreferences
-                .getColumns()
-                .forEach(columnsListProperty.getValue()::add);
+            initialColumnPreferences.getColumns().forEach(columnsListProperty.getValue()::add);
         }
     }
 
@@ -236,26 +199,17 @@ private void insertSpecialFieldColumns() {
             .allOf(SpecialField.class)
             .stream()
             .map(Field::getName)
-            .map(name ->
-                new MainTableColumnModel(
-                    MainTableColumnModel.Type.SPECIALFIELD,
-                    name
-                )
-            )
+            .map(name -> new MainTableColumnModel(MainTableColumnModel.Type.SPECIALFIELD, name))
             .forEach(item -> availableColumnsProperty.getValue().add(0, item));
     }
 
     private void removeSpecialFieldColumns() {
         columnsListProperty
             .getValue()
-            .removeIf(column ->
-                column.getType().equals(MainTableColumnModel.Type.SPECIALFIELD)
-            );
+            .removeIf(column -> column.getType().equals(MainTableColumnModel.Type.SPECIALFIELD));
         availableColumnsProperty
             .getValue()
-            .removeIf(column ->
-                column.getType().equals(MainTableColumnModel.Type.SPECIALFIELD)
-            );
+            .removeIf(column -> column.getType().equals(MainTableColumnModel.Type.SPECIALFIELD));
     }
 
     private void insertExtraFileColumns() {
@@ -264,26 +218,17 @@ private void insertExtraFileColumns() {
             .getExternalFileTypes()
             .stream()
             .map(ExternalFileType::getName)
-            .map(name ->
-                new MainTableColumnModel(
-                    MainTableColumnModel.Type.EXTRAFILE,
-                    name
-                )
-            )
+            .map(name -> new MainTableColumnModel(MainTableColumnModel.Type.EXTRAFILE, name))
             .forEach(item -> availableColumnsProperty.getValue().add(item));
     }
 
     private void removeExtraFileColumns() {
         columnsListProperty
             .getValue()
-            .removeIf(column ->
-                column.getType().equals(MainTableColumnModel.Type.EXTRAFILE)
-            );
+            .removeIf(column -> column.getType().equals(MainTableColumnModel.Type.EXTRAFILE));
         availableColumnsProperty
             .getValue()
-            .removeIf(column ->
-                column.getType().equals(MainTableColumnModel.Type.EXTRAFILE)
-            );
+            .removeIf(column -> column.getType().equals(MainTableColumnModel.Type.EXTRAFILE));
     }
 
     public void insertColumnInList() {
@@ -327,10 +272,7 @@ public void moveColumnDown() {
             .getValue()
             .getSelectedItem();
         int row = columnsListProperty.getValue().indexOf(selectedColumn);
-        if (
-            (selectedColumn == null) ||
-            (row > (columnsListProperty.getValue().size() - 2))
-        ) {
+        if ((selectedColumn == null) || (row > (columnsListProperty.getValue().size() - 2))) {
             return;
         }
 
@@ -341,32 +283,20 @@ public void moveColumnDown() {
 
     @Override
     public void storeSettings() {
-        mainTablePreferences
-            .getColumnPreferences()
-            .setColumns(columnsListProperty.getValue());
-        mainTablePreferences.setResizeColumnsToFit(
-            autoResizeColumnsProperty.getValue()
-        );
-        mainTablePreferences.setExtraFileColumnsEnabled(
-            extraFileColumnsEnabledProperty.getValue()
-        );
+        mainTablePreferences.getColumnPreferences().setColumns(columnsListProperty.getValue());
+        mainTablePreferences.setResizeColumnsToFit(autoResizeColumnsProperty.getValue());
+        mainTablePreferences.setExtraFileColumnsEnabled(extraFileColumnsEnabledProperty.getValue());
 
-        specialFieldsPreferences.setSpecialFieldsEnabled(
-            specialFieldsEnabledProperty.getValue()
-        );
+        specialFieldsPreferences.setSpecialFieldsEnabled(specialFieldsEnabledProperty.getValue());
 
         if (nameLastFirstProperty.getValue()) {
-            nameDisplayPreferences.setDisplayStyle(
-                DisplayStyle.LASTNAME_FIRSTNAME
-            );
+            nameDisplayPreferences.setDisplayStyle(DisplayStyle.LASTNAME_FIRSTNAME);
         } else if (namesNatbibProperty.getValue()) {
             nameDisplayPreferences.setDisplayStyle(DisplayStyle.NATBIB);
         } else if (nameAsIsProperty.getValue()) {
             nameDisplayPreferences.setDisplayStyle(DisplayStyle.AS_IS);
         } else if (nameFirstLastProperty.getValue()) {
-            nameDisplayPreferences.setDisplayStyle(
-                DisplayStyle.FIRSTNAME_LASTNAME
-            );
+            nameDisplayPreferences.setDisplayStyle(DisplayStyle.FIRSTNAME_LASTNAME);
         }
 
         if (abbreviationDisabledProperty.getValue()) {
@@ -374,9 +304,7 @@ public void storeSettings() {
         } else if (abbreviationEnabledProperty.getValue()) {
             nameDisplayPreferences.setAbbreviationStyle(AbbreviationStyle.FULL);
         } else if (abbreviationLastNameOnlyProperty.getValue()) {
-            nameDisplayPreferences.setAbbreviationStyle(
-                AbbreviationStyle.LASTNAME_ONLY
-            );
+            nameDisplayPreferences.setAbbreviationStyle(AbbreviationStyle.LASTNAME_ONLY);
         }
     }
 
@@ -390,9 +318,7 @@ public boolean validateSettings() {
         if (!validationStatus.isValid()) {
             validationStatus
                 .getHighestMessage()
-                .ifPresent(message ->
-                    dialogService.showErrorDialogAndWait(message.getMessage())
-                );
+                .ifPresent(message -> dialogService.showErrorDialogAndWait(message.getMessage()));
             return false;
         }
         return true;
@@ -402,9 +328,7 @@ public ListProperty<MainTableColumnModel> columnsListProperty() {
         return this.columnsListProperty;
     }
 
-    public ObjectProperty<
-        SelectionModel<MainTableColumnModel>
-    > selectedColumnModelProperty() {
+    public ObjectProperty<SelectionModel<MainTableColumnModel>> selectedColumnModelProperty() {
         return selectedColumnModelProperty;
     }
 
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 c74328845d3..5a52b7a4ef2 100644
--- a/src/main/java/org/jabref/gui/preferences/websearch/WebSearchTab.java
+++ b/src/main/java/org/jabref/gui/preferences/websearch/WebSearchTab.java
@@ -88,12 +88,9 @@ public String getTabName() {
     }
 
     public void initialize() {
-        this.viewModel =
-            new WebSearchTabViewModel(preferencesService, dialogService);
+        this.viewModel = new WebSearchTabViewModel(preferencesService, dialogService);
 
-        enableWebSearch
-            .selectedProperty()
-            .bindBidirectional(viewModel.enableWebSearchProperty());
+        enableWebSearch.selectedProperty().bindBidirectional(viewModel.enableWebSearchProperty());
         generateNewKeyOnImport
             .selectedProperty()
             .bindBidirectional(viewModel.generateKeyOnImportProperty());
@@ -104,25 +101,13 @@ public void initialize() {
             .selectedProperty()
             .bindBidirectional(viewModel.shouldDownloadLinkedOnlineFiles());
 
-        grobidEnabled
-            .selectedProperty()
-            .bindBidirectional(viewModel.grobidEnabledProperty());
-        grobidURL
-            .textProperty()
-            .bindBidirectional(viewModel.grobidURLProperty());
-        grobidURL
-            .disableProperty()
-            .bind(grobidEnabled.selectedProperty().not());
+        grobidEnabled.selectedProperty().bindBidirectional(viewModel.grobidEnabledProperty());
+        grobidURL.textProperty().bindBidirectional(viewModel.grobidURLProperty());
+        grobidURL.disableProperty().bind(grobidEnabled.selectedProperty().not());
 
-        useCustomDOI
-            .selectedProperty()
-            .bindBidirectional(viewModel.useCustomDOIProperty());
-        useCustomDOIName
-            .textProperty()
-            .bindBidirectional(viewModel.useCustomDOINameProperty());
-        useCustomDOIName
-            .disableProperty()
-            .bind(useCustomDOI.selectedProperty().not());
+        useCustomDOI.selectedProperty().bindBidirectional(viewModel.useCustomDOIProperty());
+        useCustomDOIName.textProperty().bindBidirectional(viewModel.useCustomDOINameProperty());
+        useCustomDOIName.disableProperty().bind(useCustomDOI.selectedProperty().not());
 
         new ViewModelTableRowFactory<StudyCatalogItem>()
             .withOnMouseClickedEvent((entry, event) -> {
@@ -137,17 +122,11 @@ public void initialize() {
 
         catalogEnabledColumn.setResizable(false);
         catalogEnabledColumn.setReorderable(false);
-        catalogEnabledColumn.setCellFactory(
-            CheckBoxTableCell.forTableColumn(catalogEnabledColumn)
-        );
-        catalogEnabledColumn.setCellValueFactory(param ->
-            param.getValue().enabledProperty()
-        );
+        catalogEnabledColumn.setCellFactory(CheckBoxTableCell.forTableColumn(catalogEnabledColumn));
+        catalogEnabledColumn.setCellValueFactory(param -> param.getValue().enabledProperty());
 
         catalogColumn.setEditable(false);
-        catalogColumn.setCellValueFactory(param ->
-            param.getValue().nameProperty()
-        );
+        catalogColumn.setCellValueFactory(param -> param.getValue().nameProperty());
         catalogTable.setItems(viewModel.getCatalogs());
 
         new ViewModelListCellFactory<FetcherApiKey>()
@@ -167,31 +146,19 @@ public void initialize() {
             });
         customApiKey
             .textProperty()
-            .addListener(listener ->
-                updateFetcherApiKey(apiKeySelector.valueProperty().get())
-            );
+            .addListener(listener -> updateFetcherApiKey(apiKeySelector.valueProperty().get()));
 
-        customApiKey
-            .disableProperty()
-            .bind(useCustomApiKey.selectedProperty().not());
-        testCustomApiKey
-            .disableProperty()
-            .bind(useCustomApiKey.selectedProperty().not());
+        customApiKey.disableProperty().bind(useCustomApiKey.selectedProperty().not());
+        testCustomApiKey.disableProperty().bind(useCustomApiKey.selectedProperty().not());
 
-        persistApiKeys
-            .selectedProperty()
-            .bindBidirectional(viewModel.getApikeyPersistProperty());
-        persistApiKeys
-            .disableProperty()
-            .bind(viewModel.apiKeyPersistAvailable().not());
+        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.")
-                        )
+                        new Tooltip(Localization.lang("Credential store not available."))
                     );
                 } else {
                     persistentTooltipWrapper.setTooltip(null);
@@ -206,8 +173,7 @@ public void initialize() {
         viewModel
             .fetcherApiKeys()
             .addListener(
-                (InvalidationListener) change ->
-                    apiKeySelector.getSelectionModel().selectFirst()
+                (InvalidationListener) change -> apiKeySelector.getSelectionModel().selectFirst()
             );
     }
 
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 b028210bc5f..52f903a4215 100644
--- a/src/main/java/org/jabref/gui/preferences/websearch/WebSearchTabViewModel.java
+++ b/src/main/java/org/jabref/gui/preferences/websearch/WebSearchTabViewModel.java
@@ -39,36 +39,23 @@
 
 public class WebSearchTabViewModel implements PreferenceTabViewModel {
 
-    private final BooleanProperty enableWebSearchProperty =
-        new SimpleBooleanProperty();
-    private final BooleanProperty generateKeyOnImportProperty =
-        new SimpleBooleanProperty();
-    private final BooleanProperty warnAboutDuplicatesOnImportProperty =
-        new SimpleBooleanProperty();
-    private final BooleanProperty shouldDownloadLinkedOnlineFiles =
-        new SimpleBooleanProperty();
-
-    private final BooleanProperty useCustomDOIProperty =
-        new SimpleBooleanProperty();
-    private final StringProperty useCustomDOINameProperty =
-        new SimpleStringProperty("");
-
-    private final ObservableList<StudyCatalogItem> catalogs =
-        FXCollections.observableArrayList();
-    private final BooleanProperty grobidEnabledProperty =
-        new SimpleBooleanProperty();
-    private final StringProperty grobidURLProperty = new SimpleStringProperty(
-        ""
-    );
-
-    private final ListProperty<FetcherApiKey> apiKeys =
-        new SimpleListProperty<>();
+    private final BooleanProperty enableWebSearchProperty = new SimpleBooleanProperty();
+    private final BooleanProperty generateKeyOnImportProperty = new SimpleBooleanProperty();
+    private final BooleanProperty warnAboutDuplicatesOnImportProperty = new SimpleBooleanProperty();
+    private final BooleanProperty shouldDownloadLinkedOnlineFiles = new SimpleBooleanProperty();
+
+    private final BooleanProperty useCustomDOIProperty = new SimpleBooleanProperty();
+    private final StringProperty useCustomDOINameProperty = new SimpleStringProperty("");
+
+    private final ObservableList<StudyCatalogItem> catalogs = FXCollections.observableArrayList();
+    private final BooleanProperty grobidEnabledProperty = new SimpleBooleanProperty();
+    private final StringProperty grobidURLProperty = new SimpleStringProperty("");
+
+    private final ListProperty<FetcherApiKey> apiKeys = new SimpleListProperty<>();
     private final ObjectProperty<FetcherApiKey> selectedApiKeyProperty =
         new SimpleObjectProperty<>();
-    private final BooleanProperty apikeyPersistProperty =
-        new SimpleBooleanProperty();
-    private final BooleanProperty apikeyPersistAvailableProperty =
-        new SimpleBooleanProperty();
+    private final BooleanProperty apikeyPersistProperty = new SimpleBooleanProperty();
+    private final BooleanProperty apikeyPersistAvailableProperty = new SimpleBooleanProperty();
 
     private final DialogService dialogService;
     private final PreferencesService preferencesService;
@@ -88,24 +75,17 @@ public WebSearchTabViewModel(
         this.grobidPreferences = preferencesService.getGrobidPreferences();
         this.doiPreferences = preferencesService.getDOIPreferences();
         this.filePreferences = preferencesService.getFilePreferences();
-        this.importFormatPreferences =
-            preferencesService.getImportFormatPreferences();
+        this.importFormatPreferences = preferencesService.getImportFormatPreferences();
     }
 
     @Override
     public void setValues() {
-        enableWebSearchProperty.setValue(
-            importerPreferences.areImporterEnabled()
-        );
-        generateKeyOnImportProperty.setValue(
-            importerPreferences.isGenerateNewKeyOnImport()
-        );
+        enableWebSearchProperty.setValue(importerPreferences.areImporterEnabled());
+        generateKeyOnImportProperty.setValue(importerPreferences.isGenerateNewKeyOnImport());
         warnAboutDuplicatesOnImportProperty.setValue(
             importerPreferences.shouldWarnAboutDuplicatesOnImport()
         );
-        shouldDownloadLinkedOnlineFiles.setValue(
-            filePreferences.shouldDownloadLinkedFiles()
-        );
+        shouldDownloadLinkedOnlineFiles.setValue(filePreferences.shouldDownloadLinkedFiles());
 
         useCustomDOIProperty.setValue(doiPreferences.isUseCustom());
         useCustomDOINameProperty.setValue(doiPreferences.getDefaultBaseURI());
@@ -120,25 +100,16 @@ public void setValues() {
         );
         apikeyPersistAvailableProperty.setValue(OS.isKeyringAvailable());
         apikeyPersistProperty.setValue(
-            preferencesService
-                .getImporterPreferences()
-                .shouldPersistCustomKeys()
+            preferencesService.getImporterPreferences().shouldPersistCustomKeys()
         );
         catalogs.addAll(
             WebFetchers
-                .getSearchBasedFetchers(
-                    importFormatPreferences,
-                    importerPreferences
-                )
+                .getSearchBasedFetchers(importFormatPreferences, importerPreferences)
                 .stream()
                 .map(SearchBasedFetcher::getName)
-                .filter(name ->
-                    !name.equals(CompositeSearchBasedFetcher.FETCHER_NAME)
-                )
+                .filter(name -> !name.equals(CompositeSearchBasedFetcher.FETCHER_NAME))
                 .map(name -> {
-                    boolean enabled = importerPreferences
-                        .getCatalogs()
-                        .contains(name);
+                    boolean enabled = importerPreferences.getCatalogs().contains(name);
                     return new StudyCatalogItem(name, enabled);
                 })
                 .toList()
@@ -147,26 +118,18 @@ public void setValues() {
 
     @Override
     public void storeSettings() {
-        importerPreferences.setImporterEnabled(
-            enableWebSearchProperty.getValue()
-        );
-        importerPreferences.setGenerateNewKeyOnImport(
-            generateKeyOnImportProperty.getValue()
-        );
+        importerPreferences.setImporterEnabled(enableWebSearchProperty.getValue());
+        importerPreferences.setGenerateNewKeyOnImport(generateKeyOnImportProperty.getValue());
         importerPreferences.setWarnAboutDuplicatesOnImport(
             warnAboutDuplicatesOnImportProperty.getValue()
         );
-        filePreferences.setDownloadLinkedFiles(
-            shouldDownloadLinkedOnlineFiles.getValue()
-        );
+        filePreferences.setDownloadLinkedFiles(shouldDownloadLinkedOnlineFiles.getValue());
 
         grobidPreferences.setGrobidEnabled(grobidEnabledProperty.getValue());
         grobidPreferences.setGrobidOptOut(grobidPreferences.isGrobidOptOut());
         grobidPreferences.setGrobidURL(grobidURLProperty.getValue());
         doiPreferences.setUseCustom(useCustomDOIProperty.get());
-        doiPreferences.setDefaultBaseURI(
-            useCustomDOINameProperty.getValue().trim()
-        );
+        doiPreferences.setDefaultBaseURI(useCustomDOINameProperty.getValue().trim());
         importerPreferences.setCatalogs(
             FXCollections.observableList(
                 catalogs
@@ -179,10 +142,7 @@ public void storeSettings() {
         importerPreferences.setPersistCustomKeys(apikeyPersistProperty.get());
         preferencesService.getImporterPreferences().getApiKeys().clear();
         if (apikeyPersistAvailableProperty.get()) {
-            preferencesService
-                .getImporterPreferences()
-                .getApiKeys()
-                .addAll(apiKeys);
+            preferencesService.getImporterPreferences().getApiKeys().addAll(apiKeys);
         }
     }
 
@@ -286,10 +246,7 @@ public void checkCustomApiKey() {
                             .openConnection()).getResponseCode();
                 keyValid = (statusCode >= 200) && (statusCode < 300);
 
-                URLDownload.setSSLVerification(
-                    defaultSslSocketFactory,
-                    defaultHostnameVerifier
-                );
+                URLDownload.setSSLVerification(defaultSslSocketFactory, defaultHostnameVerifier);
             } catch (IOException | UnirestException e) {
                 keyValid = false;
             }
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 2bfc6905d3f..13bcdc66f92 100644
--- a/src/main/java/org/jabref/gui/preferences/xmp/XmpPrivacyTab.java
+++ b/src/main/java/org/jabref/gui/preferences/xmp/XmpPrivacyTab.java
@@ -44,8 +44,7 @@ public class XmpPrivacyTab
     @FXML
     private Button addField;
 
-    private final ControlsFxVisualizer validationVisualizer =
-        new ControlsFxVisualizer();
+    private final ControlsFxVisualizer validationVisualizer = new ControlsFxVisualizer();
 
     public XmpPrivacyTab() {
         ViewLoader.view(this).root(this).load();
@@ -58,50 +57,29 @@ public String getTabName() {
 
     public void initialize() {
         this.viewModel =
-            new XmpPrivacyTabViewModel(
-                dialogService,
-                preferencesService.getXmpPreferences()
-            );
-
-        enableXmpFilter
-            .selectedProperty()
-            .bindBidirectional(viewModel.xmpFilterEnabledProperty());
-        filterList
-            .disableProperty()
-            .bind(viewModel.xmpFilterEnabledProperty().not());
-        addFieldName
-            .disableProperty()
-            .bind(viewModel.xmpFilterEnabledProperty().not());
-        addField
-            .disableProperty()
-            .bind(viewModel.xmpFilterEnabledProperty().not());
+            new XmpPrivacyTabViewModel(dialogService, preferencesService.getXmpPreferences());
+
+        enableXmpFilter.selectedProperty().bindBidirectional(viewModel.xmpFilterEnabledProperty());
+        filterList.disableProperty().bind(viewModel.xmpFilterEnabledProperty().not());
+        addFieldName.disableProperty().bind(viewModel.xmpFilterEnabledProperty().not());
+        addField.disableProperty().bind(viewModel.xmpFilterEnabledProperty().not());
 
         fieldColumn.setSortable(true);
         fieldColumn.setReorderable(false);
-        fieldColumn.setCellValueFactory(cellData ->
-            BindingsHelper.constantOf(cellData.getValue())
-        );
+        fieldColumn.setCellValueFactory(cellData -> BindingsHelper.constantOf(cellData.getValue()));
         new ValueTableCellFactory<Field, Field>()
             .withText(FieldsUtil::getNameWithType)
             .install(fieldColumn);
 
         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()
-            )
+            .withGraphic(item -> IconTheme.JabRefIcons.DELETE_ENTRY.getGraphicNode())
+            .withTooltip(item -> Localization.lang("Remove") + " " + item.getName())
             .withOnMouseClickedEvent(item ->
-                evt ->
-                    viewModel.removeFilter(
-                        filterList.getFocusModel().getFocusedItem()
-                    )
+                evt -> viewModel.removeFilter(filterList.getFocusModel().getFocusedItem())
             )
             .install(actionsColumn);
 
@@ -109,9 +87,7 @@ public void initialize() {
             KeyEvent.KEY_PRESSED,
             event -> {
                 if (event.getCode() == KeyCode.DELETE) {
-                    viewModel.removeFilter(
-                        filterList.getSelectionModel().getSelectedItem()
-                    );
+                    viewModel.removeFilter(filterList.getSelectionModel().getSelectedItem());
                     event.consume();
                 }
             }
@@ -124,9 +100,7 @@ public void initialize() {
             .withText(FieldsUtil::getNameWithType)
             .install(addFieldName);
         addFieldName.itemsProperty().bind(viewModel.availableFieldsProperty());
-        addFieldName
-            .valueProperty()
-            .bindBidirectional(viewModel.addFieldNameProperty());
+        addFieldName.valueProperty().bindBidirectional(viewModel.addFieldNameProperty());
         addFieldName.setConverter(FieldsUtil.FIELD_STRING_CONVERTER);
         addFieldName.addEventFilter(
             KeyEvent.KEY_PRESSED,
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 b6a5eac0bb7..8821b8eecd8 100644
--- a/src/main/java/org/jabref/gui/preferences/xmp/XmpPrivacyTabViewModel.java
+++ b/src/main/java/org/jabref/gui/preferences/xmp/XmpPrivacyTabViewModel.java
@@ -21,24 +21,21 @@
 
 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 ObjectProperty<Field> addFieldProperty =
-        new SimpleObjectProperty<>();
+    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 ObjectProperty<Field> addFieldProperty = new SimpleObjectProperty<>();
 
     private final DialogService dialogService;
     private final XmpPreferences xmpPreferences;
 
     private final Validator xmpFilterListValidator;
 
-    XmpPrivacyTabViewModel(
-        DialogService dialogService,
-        XmpPreferences xmpPreferences
-    ) {
+    XmpPrivacyTabViewModel(DialogService dialogService, XmpPreferences xmpPreferences) {
         this.dialogService = dialogService;
         this.xmpPreferences = xmpPreferences;
 
@@ -59,29 +56,21 @@ public class XmpPrivacyTabViewModel implements PreferenceTabViewModel {
 
     @Override
     public void setValues() {
-        xmpFilterEnabledProperty.setValue(
-            xmpPreferences.shouldUseXmpPrivacyFilter()
-        );
+        xmpFilterEnabledProperty.setValue(xmpPreferences.shouldUseXmpPrivacyFilter());
 
         xmpFilterListProperty.clear();
         xmpFilterListProperty.addAll(xmpPreferences.getXmpPrivacyFilter());
 
         availableFieldsProperty.clear();
         availableFieldsProperty.addAll(FieldFactory.getCommonFields());
-        availableFieldsProperty.sort(
-            (Comparator.comparing(Field::getDisplayName))
-        );
+        availableFieldsProperty.sort((Comparator.comparing(Field::getDisplayName)));
     }
 
     @Override
     public void storeSettings() {
-        xmpPreferences.setUseXmpPrivacyFilter(
-            xmpFilterEnabledProperty.getValue()
-        );
+        xmpPreferences.setUseXmpPrivacyFilter(xmpFilterEnabledProperty.getValue());
         xmpPreferences.getXmpPrivacyFilter().clear();
-        xmpPreferences
-            .getXmpPrivacyFilter()
-            .addAll(xmpFilterListProperty.getValue());
+        xmpPreferences.getXmpPrivacyFilter().addAll(xmpFilterListProperty.getValue());
     }
 
     public void addField() {
@@ -113,14 +102,10 @@ public ValidationStatus xmpFilterListValidationStatus() {
     @Override
     public boolean validateSettings() {
         ValidationStatus validationStatus = xmpFilterListValidationStatus();
-        if (
-            xmpFilterEnabledProperty.getValue() && !validationStatus.isValid()
-        ) {
+        if (xmpFilterEnabledProperty.getValue() && !validationStatus.isValid()) {
             validationStatus
                 .getHighestMessage()
-                .ifPresent(message ->
-                    dialogService.showErrorDialogAndWait(message.getMessage())
-                );
+                .ifPresent(message -> dialogService.showErrorDialogAndWait(message.getMessage()));
             return false;
         }
         return true;
diff --git a/src/main/java/org/jabref/gui/preview/CopyCitationAction.java b/src/main/java/org/jabref/gui/preview/CopyCitationAction.java
index a33a3dfcb99..03948fabb4d 100644
--- a/src/main/java/org/jabref/gui/preview/CopyCitationAction.java
+++ b/src/main/java/org/jabref/gui/preview/CopyCitationAction.java
@@ -34,9 +34,7 @@
  */
 public class CopyCitationAction extends SimpleCommand {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(
-        CopyCitationAction.class
-    );
+    private static final Logger LOGGER = LoggerFactory.getLogger(CopyCitationAction.class);
 
     private final List<BibEntry> selectedEntries;
     private final CitationStyleOutputFormat outputFormat;
@@ -73,12 +71,7 @@ public CopyCitationAction(
     public void execute() {
         BackgroundTask
             .wrap(this::generateCitations)
-            .onFailure(ex ->
-                LOGGER.error(
-                    "Error while copying citations to the clipboard",
-                    ex
-                )
-            )
+            .onFailure(ex -> LOGGER.error("Error while copying citations to the clipboard", ex))
             .onSuccess(this::setClipBoardContent)
             .executeWith(taskExecutor);
     }
@@ -91,10 +84,7 @@ private List<String> generateCitations() throws IOException {
             .getPreviewPreferences()
             .getSelectedPreviewLayout();
 
-        if (
-            previewLayout instanceof
-            CitationStylePreviewLayout citationStyleLayout
-        ) {
+        if (previewLayout instanceof CitationStylePreviewLayout citationStyleLayout) {
             styleSource = citationStyleLayout.getSource();
         }
 
@@ -111,8 +101,7 @@ private List<String> generateCitations() throws IOException {
         }
     }
 
-    private List<String> generateTextBasedPreviewLayoutCitations()
-        throws IOException {
+    private List<String> generateTextBasedPreviewLayoutCitations() throws IOException {
         if (stateManager.getActiveDatabase().isEmpty()) {
             return Collections.emptyList();
         }
@@ -133,10 +122,7 @@ private List<String> generateTextBasedPreviewLayoutCitations()
         List<String> citations = new ArrayList<>(selectedEntries.size());
         for (BibEntry entry : selectedEntries) {
             citations.add(
-                layout.doLayout(
-                    entry,
-                    stateManager.getActiveDatabase().get().getDatabase()
-                )
+                layout.doLayout(entry, stateManager.getActiveDatabase().get().getDatabase())
             );
         }
         return citations;
@@ -147,17 +133,9 @@ private List<String> generateTextBasedPreviewLayoutCitations()
      */
     protected static ClipboardContent processPreview(List<String> citations) {
         ClipboardContent content = new ClipboardContent();
-        content.putHtml(
-            String.join(
-                CitationStyleOutputFormat.HTML.getLineSeparator(),
-                citations
-            )
-        );
+        content.putHtml(String.join(CitationStyleOutputFormat.HTML.getLineSeparator(), citations));
         content.putString(
-            String.join(
-                CitationStyleOutputFormat.HTML.getLineSeparator(),
-                citations
-            )
+            String.join(CitationStyleOutputFormat.HTML.getLineSeparator(), citations)
         );
         return content;
     }
@@ -168,10 +146,7 @@ protected static ClipboardContent processPreview(List<String> citations) {
     protected static ClipboardContent processText(List<String> citations) {
         ClipboardContent content = new ClipboardContent();
         content.putString(
-            String.join(
-                CitationStyleOutputFormat.TEXT.getLineSeparator(),
-                citations
-            )
+            String.join(CitationStyleOutputFormat.TEXT.getLineSeparator(), citations)
         );
         return content;
     }
@@ -195,13 +170,8 @@ protected static ClipboardContent processHtml(List<String> citations) {
             OS.NEWLINE +
             OS.NEWLINE;
 
-        result +=
-        String.join(
-            CitationStyleOutputFormat.HTML.getLineSeparator(),
-            citations
-        );
-        result +=
-        OS.NEWLINE + "   </body>" + OS.NEWLINE + "</html>" + OS.NEWLINE;
+        result += String.join(CitationStyleOutputFormat.HTML.getLineSeparator(), citations);
+        result += OS.NEWLINE + "   </body>" + OS.NEWLINE + "</html>" + OS.NEWLINE;
 
         ClipboardContent content = new ClipboardContent();
         content.putString(result);
@@ -236,10 +206,7 @@ private void setClipBoardContent(List<String> citations) {
         }
 
         dialogService.notify(
-            Localization.lang(
-                "Copied %0 citations.",
-                String.valueOf(selectedEntries.size())
-            )
+            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 35e681d7f6b..aaf6a8b27e7 100644
--- a/src/main/java/org/jabref/gui/preview/PreviewPanel.java
+++ b/src/main/java/org/jabref/gui/preview/PreviewPanel.java
@@ -34,9 +34,7 @@
 
 public class PreviewPanel extends VBox {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(
-        PreviewPanel.class
-    );
+    private static final Logger LOGGER = LoggerFactory.getLogger(PreviewPanel.class);
 
     private final ExternalFilesEntryLinker fileLinker;
     private final KeyBindingRepository keyBindingRepository;
@@ -69,8 +67,7 @@ public PreviewPanel(
                 dialogService
             );
 
-        PreviewPreferences previewPreferences =
-            preferencesService.getPreviewPreferences();
+        PreviewPreferences previewPreferences = preferencesService.getPreviewPreferences();
         previewView =
             new PreviewViewer(
                 database,
@@ -85,9 +82,7 @@ public PreviewPanel(
         previewView.setOnDragDetected(event -> {
             previewView.startFullDrag();
 
-            Dragboard dragboard = previewView.startDragAndDrop(
-                TransferMode.COPY
-            );
+            Dragboard dragboard = previewView.startDragAndDrop(TransferMode.COPY);
             ClipboardContent content = new ClipboardContent();
             content.putHtml(previewView.getSelectionHtmlContent());
             dragboard.setContent(content);
@@ -97,11 +92,7 @@ public PreviewPanel(
 
         previewView.setOnDragOver(event -> {
             if (event.getDragboard().hasFiles()) {
-                event.acceptTransferModes(
-                    TransferMode.COPY,
-                    TransferMode.MOVE,
-                    TransferMode.LINK
-                );
+                event.acceptTransferModes(TransferMode.COPY, TransferMode.MOVE, TransferMode.LINK);
             }
             event.consume();
         });
@@ -130,11 +121,7 @@ public PreviewPanel(
                 }
                 if (event.getTransferMode() == TransferMode.COPY) {
                     LOGGER.debug("Mode Copy"); // ctrl on win, no modifier on Xubuntu
-                    fileLinker.copyFilesToFileDirAndAddToEntry(
-                        entry,
-                        files,
-                        indexingTaskManager
-                    );
+                    fileLinker.copyFilesToFileDirAndAddToEntry(entry, files, indexingTaskManager);
                 }
                 success = true;
             }
@@ -152,8 +139,7 @@ private void createKeyBindings() {
         previewView.addEventFilter(
             KeyEvent.KEY_PRESSED,
             event -> {
-                Optional<KeyBinding> keyBinding =
-                    keyBindingRepository.mapToKeyBinding(event);
+                Optional<KeyBinding> keyBinding = keyBindingRepository.mapToKeyBinding(event);
                 if (keyBinding.isPresent()) {
                     switch (keyBinding.get()) {
                         case COPY_PREVIEW:
@@ -176,27 +162,19 @@ private ContextMenu createPopupMenu() {
             .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 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()
         );
         printEntryPreview.setOnAction(event -> previewView.print());
-        MenuItem previousPreviewLayout = new MenuItem(
-            Localization.lang("Previous preview layout")
-        );
+        MenuItem previousPreviewLayout = new MenuItem(Localization.lang("Previous preview layout"));
         keyBindingRepository
             .getKeyCombination(KeyBinding.PREVIOUS_PREVIEW_LAYOUT)
             .ifPresent(previousPreviewLayout::setAccelerator);
         previousPreviewLayout.setOnAction(event -> this.previousPreviewStyle());
-        MenuItem nextPreviewLayout = new MenuItem(
-            Localization.lang("Next preview layout")
-        );
+        MenuItem nextPreviewLayout = new MenuItem(Localization.lang("Next preview layout"));
         keyBindingRepository
             .getKeyCombination(KeyBinding.NEXT_PREVIEW_LAYOUT)
             .ifPresent(nextPreviewLayout::setAccelerator);
@@ -236,10 +214,7 @@ private void cyclePreview(int newPosition) {
         PreviewLayout layout = previewPreferences.getSelectedPreviewLayout();
         previewView.setLayout(layout);
         dialogService.notify(
-            Localization.lang(
-                "Preview style changed to: %0",
-                layout.getDisplayName()
-            )
+            Localization.lang("Preview style changed to: %0", layout.getDisplayName())
         );
     }
 }
diff --git a/src/main/java/org/jabref/gui/preview/PreviewViewer.java b/src/main/java/org/jabref/gui/preview/PreviewViewer.java
index 76a67918a0b..ce73d3b78e1 100644
--- a/src/main/java/org/jabref/gui/preview/PreviewViewer.java
+++ b/src/main/java/org/jabref/gui/preview/PreviewViewer.java
@@ -42,9 +42,7 @@
  */
 public class PreviewViewer extends ScrollPane implements InvalidationListener {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(
-        PreviewViewer.class
-    );
+    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 =
@@ -116,9 +114,7 @@ function getSelectionHtml() {
         """
         var markInstance = new Mark(document.getElementById("content"));
         markInstance.unmark(%s);""";
-    private static final Pattern UNESCAPED_FORWARD_SLASH = Pattern.compile(
-        "(?<!\\\\)/"
-    );
+    private static final Pattern UNESCAPED_FORWARD_SLASH = Pattern.compile("(?<!\\\\)/");
 
     private final ClipBoardManager clipBoardManager;
     private final DialogService dialogService;
@@ -142,8 +138,7 @@ function getSelectionHtml() {
         queryOldValue,
         queryNewValue
     ) -> {
-        searchHighlightPattern =
-            queryNewValue.flatMap(SearchQuery::getJavaScriptPatternForWords);
+        searchHighlightPattern = queryNewValue.flatMap(SearchQuery::getJavaScriptPatternForWords);
         highlightSearchPattern();
     };
 
@@ -179,9 +174,7 @@ public PreviewViewer(
                     return;
                 }
                 if (!registered) {
-                    stateManager
-                        .activeSearchQueryProperty()
-                        .addListener(listener);
+                    stateManager.activeSearchQueryProperty().addListener(listener);
                     registered = true;
                 }
                 highlightSearchPattern();
@@ -198,8 +191,7 @@ public PreviewViewer(
                         "click",
                         evt -> {
                             EventTarget target = evt.getCurrentTarget();
-                            HTMLAnchorElement anchorElement =
-                                (HTMLAnchorElement) target;
+                            HTMLAnchorElement anchorElement = (HTMLAnchorElement) target;
                             String href = anchorElement.getHref();
                             if (href != null) {
                                 try {
@@ -210,10 +202,7 @@ public PreviewViewer(
                                 } catch (MalformedURLException exception) {
                                     LOGGER.error("Invalid URL", exception);
                                 } catch (IOException exception) {
-                                    LOGGER.error(
-                                        "Invalid URL Input",
-                                        exception
-                                    );
+                                    LOGGER.error("Invalid URL Input", exception);
                                 }
                             }
                             evt.preventDefault();
@@ -229,16 +218,10 @@ public PreviewViewer(
     private void highlightSearchPattern() {
         String callbackForUnmark = "";
         if (searchHighlightPattern.isPresent()) {
-            String javaScriptRegex = createJavaScriptRegex(
-                searchHighlightPattern.get()
-            );
-            callbackForUnmark =
-                String.format(JS_MARK_REG_EXP_CALLBACK, javaScriptRegex);
+            String javaScriptRegex = createJavaScriptRegex(searchHighlightPattern.get());
+            callbackForUnmark = String.format(JS_MARK_REG_EXP_CALLBACK, javaScriptRegex);
         }
-        String unmarkInstance = String.format(
-            JS_UNMARK_WITH_CALLBACK,
-            callbackForUnmark
-        );
+        String unmarkInstance = String.format(JS_UNMARK_WITH_CALLBACK, callbackForUnmark);
         previewView.getEngine().executeScript(unmarkInstance);
     }
 
@@ -296,10 +279,7 @@ private void update() {
             .onRunning(() ->
                 setPreviewText(
                     "<i>" +
-                    Localization.lang(
-                        "Processing %0",
-                        Localization.lang("Citation Style")
-                    ) +
+                    Localization.lang("Processing %0", Localization.lang("Citation Style")) +
                     ": " +
                     layout.getDisplayName() +
                     " ..." +
@@ -308,13 +288,8 @@ private void update() {
             )
             .onSuccess(this::setPreviewText)
             .onFailure(exception -> {
-                LOGGER.error(
-                    "Error while generating citation style",
-                    exception
-                );
-                setPreviewText(
-                    Localization.lang("Error while generating citation style")
-                );
+                LOGGER.error("Error while generating citation style", exception);
+                setPreviewText(Localization.lang("Error while generating citation style"));
             })
             .executeWith(taskExecutor);
     }
@@ -349,11 +324,7 @@ public void print() {
             .wrap(() -> {
                 job
                     .getJobSettings()
-                    .setJobName(
-                        entry
-                            .flatMap(BibEntry::getCitationKey)
-                            .orElse("NO ENTRY")
-                    );
+                    .setJobName(entry.flatMap(BibEntry::getCitationKey).orElse("NO ENTRY"));
                 previewView.getEngine().print(job);
                 job.endJob();
             })
@@ -372,9 +343,7 @@ public void copyPreviewToClipBoard() {
         ClipboardContent content = new ClipboardContent();
         content.putString(document.getElementById("content").getTextContent());
         content.putHtml(
-            (String) previewView
-                .getEngine()
-                .executeScript("document.documentElement.outerHTML")
+            (String) previewView.getEngine().executeScript("document.documentElement.outerHTML")
         );
 
         clipBoardManager.setContent(content);
@@ -394,14 +363,10 @@ public void invalidated(Observable observable) {
     }
 
     public String getSelectionTextContent() {
-        return (String) previewView
-            .getEngine()
-            .executeScript("window.getSelection().toString()");
+        return (String) previewView.getEngine().executeScript("window.getSelection().toString()");
     }
 
     public String getSelectionHtmlContent() {
-        return (String) previewView
-            .getEngine()
-            .executeScript(JS_GET_SELECTION_HTML_SCRIPT);
+        return (String) previewView.getEngine().executeScript(JS_GET_SELECTION_HTML_SCRIPT);
     }
 }
diff --git a/src/main/java/org/jabref/gui/push/AbstractPushToApplication.java b/src/main/java/org/jabref/gui/push/AbstractPushToApplication.java
index f4b4790d092..5e3e27d2341 100644
--- a/src/main/java/org/jabref/gui/push/AbstractPushToApplication.java
+++ b/src/main/java/org/jabref/gui/push/AbstractPushToApplication.java
@@ -23,9 +23,7 @@
  */
 public abstract class AbstractPushToApplication implements PushToApplication {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(
-        AbstractPushToApplication.class
-    );
+    private static final Logger LOGGER = LoggerFactory.getLogger(AbstractPushToApplication.class);
     private static final String CITE_KEY1 = "key1";
     private static final String CITE_KEY2 = "key2";
 
@@ -56,10 +54,7 @@ private void dissectCiteCommand() {
             .getExternalApplicationsPreferences()
             .getCiteCommand();
 
-        if (
-            preferencesCiteCommand != null &&
-            preferencesCiteCommand.equals(cachedCiteCommand)
-        ) {
+        if (preferencesCiteCommand != null && preferencesCiteCommand.equals(cachedCiteCommand)) {
             return;
         }
 
@@ -67,25 +62,19 @@ private void dissectCiteCommand() {
 
         int indexKey1 = cachedCiteCommand.indexOf(CITE_KEY1);
         int indexKey2 = cachedCiteCommand.indexOf(CITE_KEY2);
-        if (
-            indexKey1 < 0 ||
-            indexKey2 < 0 ||
-            indexKey2 < (indexKey1 + CITE_KEY1.length())
-        ) {
+        if (indexKey1 < 0 || indexKey2 < 0 || indexKey2 < (indexKey1 + CITE_KEY1.length())) {
             return;
         }
 
         cachedCitePrefix = preferencesCiteCommand.substring(0, indexKey1);
         cachedCiteDelimiter =
             preferencesCiteCommand.substring(
-                preferencesCiteCommand.lastIndexOf(CITE_KEY1) +
-                CITE_KEY1.length(),
+                preferencesCiteCommand.lastIndexOf(CITE_KEY1) + CITE_KEY1.length(),
                 indexKey2
             );
         cachedCiteSuffix =
             preferencesCiteCommand.substring(
-                preferencesCiteCommand.lastIndexOf(CITE_KEY2) +
-                CITE_KEY2.length()
+                preferencesCiteCommand.lastIndexOf(CITE_KEY2) + CITE_KEY2.length()
             );
     }
 
@@ -96,10 +85,7 @@ public JabRefIcon getApplicationIcon() {
 
     @Override
     public String getTooltip() {
-        return Localization.lang(
-            "Push entries to external application (%0)",
-            getDisplayName()
-        );
+        return Localization.lang("Push entries to external application (%0)", getDisplayName());
     }
 
     @Override
@@ -108,11 +94,7 @@ public Action getAction() {
     }
 
     @Override
-    public void pushEntries(
-        BibDatabaseContext database,
-        List<BibEntry> entries,
-        String keyString
-    ) {
+    public void pushEntries(BibDatabaseContext database, List<BibEntry> entries, String keyString) {
         couldNotPush = false;
         couldNotCall = false;
         notDefined = false;
@@ -150,17 +132,11 @@ public void pushEntries(
                 );
                 processBuilder.start();
             } else {
-                ProcessBuilder processBuilder = new ProcessBuilder(
-                    getCommandLine(keyString)
-                );
+                ProcessBuilder processBuilder = new ProcessBuilder(getCommandLine(keyString));
                 processBuilder.start();
             }
         } catch (IOException excep) {
-            LOGGER.warn(
-                "Error: Could not call executable '{}'",
-                commandPath,
-                excep
-            );
+            LOGGER.warn("Error: Could not call executable '{}'", commandPath, excep);
             couldNotCall = true;
         }
     }
@@ -170,27 +146,21 @@ public void onOperationCompleted() {
         if (notDefined) {
             dialogService.showErrorDialogAndWait(
                 Localization.lang("Error pushing entries"),
-                Localization.lang("Path to %0 not defined", getDisplayName()) +
-                "."
+                Localization.lang("Path to %0 not defined", getDisplayName()) + "."
             );
         } else if (couldNotCall) {
             dialogService.showErrorDialogAndWait(
                 Localization.lang("Error pushing entries"),
-                Localization.lang("Could not call executable") +
-                " '" +
-                commandPath +
-                "'."
+                Localization.lang("Could not call executable") + " '" + commandPath + "'."
             );
         } else if (couldNotPush) {
             dialogService.showErrorDialogAndWait(
                 Localization.lang("Error pushing entries"),
-                Localization.lang("Could not connect to %0", getDisplayName()) +
-                "."
+                Localization.lang("Could not connect to %0", getDisplayName()) + "."
             );
         } else {
             dialogService.notify(
-                Localization.lang("Pushed citations to %0", getDisplayName()) +
-                "."
+                Localization.lang("Pushed citations to %0", getDisplayName()) + "."
             );
         }
     }
@@ -252,10 +222,7 @@ protected class PushToApplicationAction implements Action {
 
         @Override
         public String getText() {
-            return Localization.lang(
-                "Push entries to external application (%0)",
-                getDisplayName()
-            );
+            return Localization.lang("Push entries to external application (%0)", getDisplayName());
         }
 
         @Override
diff --git a/src/main/java/org/jabref/gui/push/PushToApplication.java b/src/main/java/org/jabref/gui/push/PushToApplication.java
index 5b9754a83db..fa70fea231b 100644
--- a/src/main/java/org/jabref/gui/push/PushToApplication.java
+++ b/src/main/java/org/jabref/gui/push/PushToApplication.java
@@ -21,11 +21,7 @@ public interface PushToApplication {
      * The actual operation. This method will not be called on the event dispatch thread, so it should not do GUI
      * operations without utilizing invokeLater().
      */
-    void pushEntries(
-        BibDatabaseContext database,
-        List<BibEntry> entries,
-        String keyString
-    );
+    void pushEntries(BibDatabaseContext database, List<BibEntry> entries, String keyString);
 
     /**
      * Reporting etc., this method is called on the event dispatch thread after pushEntries() returns.
diff --git a/src/main/java/org/jabref/gui/push/PushToApplicationCommand.java b/src/main/java/org/jabref/gui/push/PushToApplicationCommand.java
index d52a544491d..da6e441c1c4 100644
--- a/src/main/java/org/jabref/gui/push/PushToApplicationCommand.java
+++ b/src/main/java/org/jabref/gui/push/PushToApplicationCommand.java
@@ -31,9 +31,7 @@
  */
 public class PushToApplicationCommand extends SimpleCommand {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(
-        PushToApplicationCommand.class
-    );
+    private static final Logger LOGGER = LoggerFactory.getLogger(PushToApplicationCommand.class);
 
     private final StateManager stateManager;
     private final DialogService dialogService;
@@ -56,29 +54,20 @@ public PushToApplicationCommand(
         this.taskExecutor = taskExecutor;
 
         setApplication(
-            preferencesService
-                .getPushToApplicationPreferences()
-                .getActiveApplicationName()
+            preferencesService.getPushToApplicationPreferences().getActiveApplicationName()
         );
 
         EasyBind.subscribe(
-            preferencesService
-                .getPushToApplicationPreferences()
-                .activeApplicationNameProperty(),
+            preferencesService.getPushToApplicationPreferences().activeApplicationNameProperty(),
             this::setApplication
         );
 
-        this.executable.bind(
-                needsDatabase(stateManager)
-                    .and(needsEntriesSelected(stateManager))
-            );
+        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."
-                    )
+                    Localization.lang("This operation requires one or more entries to be selected.")
                 )
             );
     }
@@ -97,11 +86,7 @@ private void setApplication(String applicationName) {
             preferencesService.getKeyBindingRepository()
         );
         PushToApplication application = PushToApplications
-            .getApplicationByName(
-                applicationName,
-                dialogService,
-                preferencesService
-            )
+            .getApplicationByName(applicationName, dialogService, preferencesService)
             .orElse(new PushToEmacs(dialogService, preferencesService));
 
         preferencesService
@@ -111,17 +96,9 @@ private void setApplication(String applicationName) {
 
         reconfigurableControls.forEach(object -> {
             if (object instanceof MenuItem) {
-                factory.configureMenuItem(
-                    application.getAction(),
-                    this,
-                    (MenuItem) object
-                );
+                factory.configureMenuItem(application.getAction(), this, (MenuItem) object);
             } else if (object instanceof ButtonBase) {
-                factory.configureIconButton(
-                    application.getAction(),
-                    this,
-                    (ButtonBase) object
-                );
+                factory.configureIconButton(application.getAction(), this, (ButtonBase) object);
             }
         });
     }
@@ -130,10 +107,7 @@ public Action getAction() {
         return application.getAction();
     }
 
-    private static String getKeyString(
-        List<BibEntry> entries,
-        String delimiter
-    ) {
+    private static String getKeyString(List<BibEntry> entries, String delimiter) {
         StringBuilder result = new StringBuilder();
         Optional<String> citeKey;
         boolean first = true;
@@ -185,10 +159,7 @@ private void pushEntries() {
         application.pushEntries(
             database,
             stateManager.getSelectedEntries(),
-            getKeyString(
-                stateManager.getSelectedEntries(),
-                application.getDelimiter()
-            )
+            getKeyString(stateManager.getSelectedEntries(), application.getDelimiter())
         );
     }
 }
diff --git a/src/main/java/org/jabref/gui/push/PushToApplicationSettings.java b/src/main/java/org/jabref/gui/push/PushToApplicationSettings.java
index fb8b088f167..c23b1703859 100644
--- a/src/main/java/org/jabref/gui/push/PushToApplicationSettings.java
+++ b/src/main/java/org/jabref/gui/push/PushToApplicationSettings.java
@@ -54,23 +54,17 @@ public PushToApplicationSettings(
         if (this.application.getCommandName() == null) {
             commandLine.append(':');
         } else {
-            commandLine
-                .append(" (")
-                .append(this.application.getCommandName())
-                .append("):");
+            commandLine.append(" (").append(this.application.getCommandName()).append("):");
         }
         commandLabel.setText(commandLine.toString());
         settingsPane.add(commandLabel, 0, 0);
 
-        path.setText(
-            preferences.getCommandPaths().get(this.application.getDisplayName())
-        );
+        path.setText(preferences.getCommandPaths().get(this.application.getDisplayName()));
         settingsPane.add(path, 1, 0);
 
-        FileDialogConfiguration fileDialogConfiguration =
-            new FileDialogConfiguration.Builder()
-                .withInitialDirectory(filePreferences.getWorkingDirectory())
-                .build();
+        FileDialogConfiguration fileDialogConfiguration = new FileDialogConfiguration.Builder()
+            .withInitialDirectory(filePreferences.getWorkingDirectory())
+            .build();
         browse.setOnAction(e ->
             dialogService
                 .showFileOpenDialog(fileDialogConfiguration)
@@ -94,9 +88,7 @@ public PushToApplicationSettings(
      * state of the widgets in the settings panel to Globals.prefs.
      */
     public void storeSettings() {
-        Map<String, String> commandPaths = new HashMap<>(
-            preferences.getCommandPaths()
-        );
+        Map<String, String> commandPaths = new HashMap<>(preferences.getCommandPaths());
         commandPaths.put(application.getDisplayName(), path.getText());
         preferences.setCommandPaths(commandPaths);
     }
diff --git a/src/main/java/org/jabref/gui/push/PushToApplications.java b/src/main/java/org/jabref/gui/push/PushToApplications.java
index e5e8ad797a6..0377573adc8 100644
--- a/src/main/java/org/jabref/gui/push/PushToApplications.java
+++ b/src/main/java/org/jabref/gui/push/PushToApplications.java
@@ -17,8 +17,7 @@ public class PushToApplications {
     public static final String SUBLIME_TEXT = "Sublime Text";
     public static final String TEXSHOP = "TeXShop";
 
-    private static final List<PushToApplication> APPLICATIONS =
-        new ArrayList<>();
+    private static final List<PushToApplication> APPLICATIONS = new ArrayList<>();
 
     private PushToApplications() {}
 
@@ -53,9 +52,7 @@ public static Optional<PushToApplication> getApplicationByName(
     ) {
         return getAllApplications(dialogService, preferencesService)
             .stream()
-            .filter(application ->
-                application.getDisplayName().equals(applicationName)
-            )
+            .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 d5136deb81e..df93e7c0e1b 100644
--- a/src/main/java/org/jabref/gui/push/PushToEmacs.java
+++ b/src/main/java/org/jabref/gui/push/PushToEmacs.java
@@ -21,17 +21,12 @@ public class PushToEmacs extends AbstractPushToApplication {
 
     public static final String NAME = PushToApplications.EMACS;
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(
-        PushToEmacs.class
-    );
+    private static final Logger LOGGER = LoggerFactory.getLogger(PushToEmacs.class);
 
     /**
      * @param preferencesService getPushToApplicationPreferences(), getExternalApplicationsPreferences(), and getFilePreferences() are used
      */
-    public PushToEmacs(
-        DialogService dialogService,
-        PreferencesService preferencesService
-    ) {
+    public PushToEmacs(DialogService dialogService, PreferencesService preferencesService) {
         super(dialogService, preferencesService);
     }
 
@@ -46,11 +41,7 @@ public JabRefIcon getApplicationIcon() {
     }
 
     @Override
-    public void pushEntries(
-        BibDatabaseContext database,
-        List<BibEntry> entries,
-        String keys
-    ) {
+    public void pushEntries(BibDatabaseContext database, List<BibEntry> entries, String keys) {
         couldNotPush = false;
         couldNotCall = false;
         notDefined = false;
@@ -58,32 +49,23 @@ public void pushEntries(
         PushToApplicationPreferences pushToApplicationPreferences =
             preferencesService.getPushToApplicationPreferences();
 
-        commandPath =
-            pushToApplicationPreferences
-                .getCommandPaths()
-                .get(this.getDisplayName());
+        commandPath = pushToApplicationPreferences.getCommandPaths().get(this.getDisplayName());
 
         if ((commandPath == null) || commandPath.trim().isEmpty()) {
             notDefined = true;
             return;
         }
 
-        commandPath =
-            pushToApplicationPreferences
-                .getCommandPaths()
-                .get(this.getDisplayName());
+        commandPath = pushToApplicationPreferences.getCommandPaths().get(this.getDisplayName());
 
-        String[] addParams = pushToApplicationPreferences
-            .getEmacsArguments()
-            .split(" ");
+        String[] addParams = pushToApplicationPreferences.getEmacsArguments().split(" ");
         try {
             String[] com = new String[addParams.length + 2];
             com[0] = commandPath;
             System.arraycopy(addParams, 0, com, 1, addParams.length);
 
             // Surrounding with is handled below
-            String prefix =
-                "(with-current-buffer (window-buffer (selected-window)) (insert ";
+            String prefix = "(with-current-buffer (window-buffer (selected-window)) (insert ";
             String suffix = "))";
 
             if (OS.WINDOWS) {
diff --git a/src/main/java/org/jabref/gui/push/PushToEmacsSettings.java b/src/main/java/org/jabref/gui/push/PushToEmacsSettings.java
index 995d624b947..08cd9145e54 100644
--- a/src/main/java/org/jabref/gui/push/PushToEmacsSettings.java
+++ b/src/main/java/org/jabref/gui/push/PushToEmacsSettings.java
@@ -18,11 +18,7 @@ public PushToEmacsSettings(
         PushToApplicationPreferences preferences
     ) {
         super(application, dialogService, filePreferences, preferences);
-        settingsPane.add(
-            new Label(Localization.lang("Additional parameters") + ":"),
-            0,
-            1
-        );
+        settingsPane.add(new Label(Localization.lang("Additional parameters") + ":"), 0, 1);
         settingsPane.add(additionalParams, 1, 1);
         additionalParams.setText(preferences.getEmacsArguments());
     }
diff --git a/src/main/java/org/jabref/gui/push/PushToLyx.java b/src/main/java/org/jabref/gui/push/PushToLyx.java
index e855cb88ac8..694a2c9e315 100644
--- a/src/main/java/org/jabref/gui/push/PushToLyx.java
+++ b/src/main/java/org/jabref/gui/push/PushToLyx.java
@@ -22,14 +22,9 @@ public class PushToLyx extends AbstractPushToApplication {
 
     public static final String NAME = PushToApplications.LYX;
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(
-        PushToLyx.class
-    );
+    private static final Logger LOGGER = LoggerFactory.getLogger(PushToLyx.class);
 
-    public PushToLyx(
-        DialogService dialogService,
-        PreferencesService preferencesService
-    ) {
+    public PushToLyx(DialogService dialogService, PreferencesService preferencesService) {
         super(dialogService, preferencesService);
     }
 
@@ -48,9 +43,7 @@ public void onOperationCompleted() {
         if (couldNotPush) {
             dialogService.showErrorDialogAndWait(
                 Localization.lang("Error pushing entries"),
-                Localization.lang(
-                    "Verify that LyX is running and that the lyxpipe is valid."
-                ) +
+                Localization.lang("Verify that LyX is running and that the lyxpipe is valid.") +
                 "[" +
                 commandPath +
                 "]"
@@ -118,8 +111,7 @@ public void pushEntries(
                 FileWriter fw = new FileWriter(lyxpipe, StandardCharsets.UTF_8);
                 BufferedWriter lyxOut = new BufferedWriter(fw)
             ) {
-                String citeStr =
-                    "LYXCMD:sampleclient:citation-insert:" + keyString;
+                String citeStr = "LYXCMD:sampleclient:citation-insert:" + keyString;
                 lyxOut.write(citeStr + "\n");
             } catch (IOException excep) {
                 couldNotCall = true;
diff --git a/src/main/java/org/jabref/gui/push/PushToSublimeText.java b/src/main/java/org/jabref/gui/push/PushToSublimeText.java
index c1eda0aba8e..f2bb764cf8a 100644
--- a/src/main/java/org/jabref/gui/push/PushToSublimeText.java
+++ b/src/main/java/org/jabref/gui/push/PushToSublimeText.java
@@ -21,14 +21,9 @@ public class PushToSublimeText extends AbstractPushToApplication {
 
     public static final String NAME = PushToApplications.SUBLIME_TEXT;
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(
-        PushToSublimeText.class
-    );
+    private static final Logger LOGGER = LoggerFactory.getLogger(PushToSublimeText.class);
 
-    public PushToSublimeText(
-        DialogService dialogService,
-        PreferencesService preferencesService
-    ) {
+    public PushToSublimeText(DialogService dialogService, PreferencesService preferencesService) {
         super(dialogService, preferencesService);
     }
 
@@ -43,11 +38,7 @@ public JabRefIcon getApplicationIcon() {
     }
 
     @Override
-    public void pushEntries(
-        BibDatabaseContext database,
-        List<BibEntry> entries,
-        String keyString
-    ) {
+    public void pushEntries(BibDatabaseContext database, List<BibEntry> entries, String keyString) {
         couldNotPush = false;
         couldNotCall = false;
         notDefined = false;
@@ -64,13 +55,8 @@ public void pushEntries(
             return;
         }
         try {
-            LOGGER.debug(
-                "Sublime string: {}",
-                String.join(" ", getCommandLine(keyString))
-            );
-            ProcessBuilder processBuilder = new ProcessBuilder(
-                getCommandLine(keyString)
-            );
+            LOGGER.debug("Sublime string: {}", String.join(" ", getCommandLine(keyString)));
+            ProcessBuilder processBuilder = new ProcessBuilder(getCommandLine(keyString));
             processBuilder.inheritIO();
             Map<String, String> envs = processBuilder.environment();
             envs.put("PATH", Path.of(commandPath).getParent().toString());
@@ -88,11 +74,7 @@ public void pushEntries(
             JabRefExecutorService.INSTANCE.execute(streamGobblerInput);
             JabRefExecutorService.INSTANCE.execute(streamGobblerError);
         } catch (IOException excep) {
-            LOGGER.warn(
-                "Error: Could not call executable '{}'",
-                commandPath,
-                excep
-            );
+            LOGGER.warn("Error: Could not call executable '{}'", commandPath, excep);
             couldNotCall = true;
         }
     }
diff --git a/src/main/java/org/jabref/gui/push/PushToTeXstudio.java b/src/main/java/org/jabref/gui/push/PushToTeXstudio.java
index 30daf218884..75c6c649e31 100644
--- a/src/main/java/org/jabref/gui/push/PushToTeXstudio.java
+++ b/src/main/java/org/jabref/gui/push/PushToTeXstudio.java
@@ -9,10 +9,7 @@ public class PushToTeXstudio extends AbstractPushToApplication {
 
     public static final String NAME = PushToApplications.TEXSTUDIO;
 
-    public PushToTeXstudio(
-        DialogService dialogService,
-        PreferencesService preferencesService
-    ) {
+    public PushToTeXstudio(DialogService dialogService, PreferencesService preferencesService) {
         super(dialogService, preferencesService);
     }
 
@@ -31,12 +28,7 @@ protected String[] getCommandLine(String keyString) {
         return new String[] {
             commandPath,
             "--insert-cite",
-            String.format(
-                "%s%s%s",
-                getCitePrefix(),
-                keyString,
-                getCiteSuffix()
-            ),
+            String.format("%s%s%s", 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 b971332b7de..1acdb26ccd0 100644
--- a/src/main/java/org/jabref/gui/push/PushToTexShop.java
+++ b/src/main/java/org/jabref/gui/push/PushToTexShop.java
@@ -19,14 +19,9 @@ public class PushToTexShop extends AbstractPushToApplication {
 
     public static final String NAME = PushToApplications.TEXSHOP;
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(
-        PushToTexShop.class
-    );
+    private static final Logger LOGGER = LoggerFactory.getLogger(PushToTexShop.class);
 
-    public PushToTexShop(
-        DialogService dialogService,
-        PreferencesService preferencesService
-    ) {
+    public PushToTexShop(DialogService dialogService, PreferencesService preferencesService) {
         super(dialogService, preferencesService);
     }
 
@@ -41,11 +36,7 @@ public JabRefIcon getApplicationIcon() {
     }
 
     @Override
-    public void pushEntries(
-        BibDatabaseContext database,
-        List<BibEntry> entries,
-        String keyString
-    ) {
+    public void pushEntries(BibDatabaseContext database, List<BibEntry> entries, String keyString) {
         couldNotPush = false;
         couldNotCall = false;
         notDefined = false;
@@ -57,13 +48,8 @@ public void pushEntries(
                 .get(this.getDisplayName());
 
         try {
-            LOGGER.debug(
-                "TexShop string: {}",
-                String.join(" ", getCommandLine(keyString))
-            );
-            ProcessBuilder processBuilder = new ProcessBuilder(
-                getCommandLine(keyString)
-            );
+            LOGGER.debug("TexShop string: {}", String.join(" ", getCommandLine(keyString)));
+            ProcessBuilder processBuilder = new ProcessBuilder(getCommandLine(keyString));
             processBuilder.inheritIO();
             Process process = processBuilder.start();
             StreamGobbler streamGobblerInput = new StreamGobbler(
@@ -78,11 +64,7 @@ public void pushEntries(
             JabRefExecutorService.INSTANCE.execute(streamGobblerInput);
             JabRefExecutorService.INSTANCE.execute(streamGobblerError);
         } catch (IOException excep) {
-            LOGGER.warn(
-                "Error: Could not call executable '{}'",
-                commandPath,
-                excep
-            );
+            LOGGER.warn("Error: Could not call executable '{}'", commandPath, excep);
             couldNotCall = true;
         }
     }
@@ -111,9 +93,7 @@ protected String[] getCommandLine(String keyString) {
         } else {
             dialogService.showInformationDialogAndWait(
                 Localization.lang("Push to application"),
-                Localization.lang(
-                    "Pushing citations to TeXShop is only possible on macOS!"
-                )
+                Localization.lang("Pushing citations to TeXShop is only possible on macOS!")
             );
             return new String[] {};
         }
diff --git a/src/main/java/org/jabref/gui/push/PushToTexmaker.java b/src/main/java/org/jabref/gui/push/PushToTexmaker.java
index 12351050d68..e846b52debe 100644
--- a/src/main/java/org/jabref/gui/push/PushToTexmaker.java
+++ b/src/main/java/org/jabref/gui/push/PushToTexmaker.java
@@ -12,10 +12,7 @@ public class PushToTexmaker extends AbstractPushToApplication {
 
     public static final String NAME = "Texmaker";
 
-    public PushToTexmaker(
-        DialogService dialogService,
-        PreferencesService preferencesService
-    ) {
+    public PushToTexmaker(DialogService dialogService, PreferencesService preferencesService) {
         super(dialogService, preferencesService);
     }
 
diff --git a/src/main/java/org/jabref/gui/push/PushToVim.java b/src/main/java/org/jabref/gui/push/PushToVim.java
index e0e14295924..6c3ddeca6f2 100644
--- a/src/main/java/org/jabref/gui/push/PushToVim.java
+++ b/src/main/java/org/jabref/gui/push/PushToVim.java
@@ -20,14 +20,9 @@ public class PushToVim extends AbstractPushToApplication {
 
     public static final String NAME = PushToApplications.VIM;
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(
-        PushToVim.class
-    );
+    private static final Logger LOGGER = LoggerFactory.getLogger(PushToVim.class);
 
-    public PushToVim(
-        DialogService dialogService,
-        PreferencesService preferencesService
-    ) {
+    public PushToVim(DialogService dialogService, PreferencesService preferencesService) {
         super(dialogService, preferencesService);
     }
 
@@ -55,11 +50,7 @@ public PushToApplicationSettings getSettings(
     }
 
     @Override
-    public void pushEntries(
-        BibDatabaseContext database,
-        List<BibEntry> entries,
-        String keys
-    ) {
+    public void pushEntries(BibDatabaseContext database, List<BibEntry> entries, String keys) {
         couldNotPush = false;
         couldNotCall = false;
         notDefined = false;
@@ -79,9 +70,7 @@ public void pushEntries(
             String[] com = new String[] {
                 commandPath,
                 "--servername",
-                preferencesService
-                    .getPushToApplicationPreferences()
-                    .getVimServer(),
+                preferencesService.getPushToApplicationPreferences().getVimServer(),
                 "--remote-send",
                 "<C-\\><C-N>a" + getCitePrefix() + keys + getCiteSuffix(),
             };
diff --git a/src/main/java/org/jabref/gui/push/PushToVimSettings.java b/src/main/java/org/jabref/gui/push/PushToVimSettings.java
index 58cb9fdcb53..0581c7233d1 100644
--- a/src/main/java/org/jabref/gui/push/PushToVimSettings.java
+++ b/src/main/java/org/jabref/gui/push/PushToVimSettings.java
@@ -18,11 +18,7 @@ public PushToVimSettings(
         PushToApplicationPreferences preferences
     ) {
         super(application, dialogService, filePreferences, preferences);
-        settingsPane.add(
-            new Label(Localization.lang("Vim server name") + ":"),
-            0,
-            1
-        );
+        settingsPane.add(new Label(Localization.lang("Vim server name") + ":"), 0, 1);
         settingsPane.add(vimServer, 1, 1);
         vimServer.setText(preferences.getVimServer());
     }
diff --git a/src/main/java/org/jabref/gui/push/PushToWinEdt.java b/src/main/java/org/jabref/gui/push/PushToWinEdt.java
index b6728dbd0fa..949965f722d 100644
--- a/src/main/java/org/jabref/gui/push/PushToWinEdt.java
+++ b/src/main/java/org/jabref/gui/push/PushToWinEdt.java
@@ -9,10 +9,7 @@ public class PushToWinEdt extends AbstractPushToApplication {
 
     public static final String NAME = PushToApplications.WIN_EDT;
 
-    public PushToWinEdt(
-        DialogService dialogService,
-        PreferencesService preferencesService
-    ) {
+    public PushToWinEdt(DialogService dialogService, PreferencesService preferencesService) {
         super(dialogService, preferencesService);
     }
 
diff --git a/src/main/java/org/jabref/gui/remote/CLIMessageHandler.java b/src/main/java/org/jabref/gui/remote/CLIMessageHandler.java
index 016df2a44d9..91f41983220 100644
--- a/src/main/java/org/jabref/gui/remote/CLIMessageHandler.java
+++ b/src/main/java/org/jabref/gui/remote/CLIMessageHandler.java
@@ -15,9 +15,7 @@
 
 public class CLIMessageHandler implements RemoteMessageHandler {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(
-        CLIMessageHandler.class
-    );
+    private static final Logger LOGGER = LoggerFactory.getLogger(CLIMessageHandler.class);
 
     private final PreferencesService preferencesService;
     private final FileUpdateMonitor fileUpdateMonitor;
diff --git a/src/main/java/org/jabref/gui/search/GlobalSearchBar.java b/src/main/java/org/jabref/gui/search/GlobalSearchBar.java
index f6782af6905..d70b237a5c1 100644
--- a/src/main/java/org/jabref/gui/search/GlobalSearchBar.java
+++ b/src/main/java/org/jabref/gui/search/GlobalSearchBar.java
@@ -78,15 +78,13 @@
 
 public class GlobalSearchBar extends HBox {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(
-        GlobalSearchBar.class
-    );
+    private static final Logger LOGGER = LoggerFactory.getLogger(GlobalSearchBar.class);
 
     private static final int SEARCH_DELAY = 400;
-    private static final PseudoClass CLASS_NO_RESULTS =
-        PseudoClass.getPseudoClass("emptyResult");
-    private static final PseudoClass CLASS_RESULTS_FOUND =
-        PseudoClass.getPseudoClass("emptyResult");
+    private static final PseudoClass CLASS_NO_RESULTS = PseudoClass.getPseudoClass("emptyResult");
+    private static final PseudoClass CLASS_RESULTS_FOUND = PseudoClass.getPseudoClass(
+        "emptyResult"
+    );
 
     private final CustomTextField searchField = SearchTextField.create();
     private final ToggleButton caseSensitiveButton;
@@ -106,8 +104,7 @@ public class GlobalSearchBar extends HBox {
     private final SearchPreferences searchPreferences;
     private final DialogService dialogService;
 
-    private final BooleanProperty globalSearchActive =
-        new SimpleBooleanProperty(false);
+    private final BooleanProperty globalSearchActive = new SimpleBooleanProperty(false);
     private GlobalSearchResultDialog globalSearchResultDialog;
 
     public GlobalSearchBar(
@@ -134,13 +131,11 @@ public GlobalSearchBar(
         searchFieldTooltip.setMaxHeight(10);
         updateHintVisibility();
 
-        KeyBindingRepository keyBindingRepository =
-            preferencesService.getKeyBindingRepository();
+        KeyBindingRepository keyBindingRepository = preferencesService.getKeyBindingRepository();
         searchField.addEventFilter(
             KeyEvent.KEY_PRESSED,
             event -> {
-                Optional<KeyBinding> keyBinding =
-                    keyBindingRepository.mapToKeyBinding(event);
+                Optional<KeyBinding> keyBinding = keyBindingRepository.mapToKeyBinding(event);
                 if (keyBinding.isPresent()) {
                     if (keyBinding.get() == KeyBinding.CLOSE) {
                         // Clear search and select first entry, if available
@@ -157,39 +152,28 @@ public GlobalSearchBar(
         );
 
         searchField.setContextMenu(
-            SearchFieldRightClickMenu.create(
-                keyBindingRepository,
-                stateManager,
-                searchField,
-                frame
-            )
+            SearchFieldRightClickMenu.create(keyBindingRepository, stateManager, searchField, frame)
         );
 
         ObservableList<String> search = stateManager.getWholeSearchHistory();
-        search.addListener((ListChangeListener.Change<
-            ? extends String
-        > change) -> {
-                searchField.setContextMenu(
-                    SearchFieldRightClickMenu.create(
-                        keyBindingRepository,
-                        stateManager,
-                        searchField,
-                        frame
-                    )
-                );
-            }
-        );
+        search.addListener((ListChangeListener.Change<? extends String> change) -> {
+            searchField.setContextMenu(
+                SearchFieldRightClickMenu.create(
+                    keyBindingRepository,
+                    stateManager,
+                    searchField,
+                    frame
+                )
+            );
+        });
 
         ClipBoardManager.addX11Support(searchField);
 
         regularExpressionButton = IconTheme.JabRefIcons.REG_EX.asToggleButton();
-        caseSensitiveButton =
-            IconTheme.JabRefIcons.CASE_SENSITIVE.asToggleButton();
+        caseSensitiveButton = IconTheme.JabRefIcons.CASE_SENSITIVE.asToggleButton();
         fulltextButton = IconTheme.JabRefIcons.FULLTEXT.asToggleButton();
-        openGlobalSearchButton =
-            IconTheme.JabRefIcons.OPEN_GLOBAL_SEARCH.asButton();
-        keepSearchString =
-            IconTheme.JabRefIcons.KEEP_SEARCH_STRING.asToggleButton();
+        openGlobalSearchButton = IconTheme.JabRefIcons.OPEN_GLOBAL_SEARCH.asButton();
+        keepSearchString = IconTheme.JabRefIcons.KEEP_SEARCH_STRING.asToggleButton();
 
         initSearchModifierButtons();
 
@@ -211,12 +195,7 @@ public GlobalSearchBar(
         keepSearchString.visibleProperty().bind(focusedOrActive);
 
         StackPane modifierButtons = new StackPane(
-            new HBox(
-                regularExpressionButton,
-                caseSensitiveButton,
-                fulltextButton,
-                keepSearchString
-            )
+            new HBox(regularExpressionButton, caseSensitiveButton, fulltextButton, keepSearchString)
         );
         modifierButtons.setAlignment(Pos.CENTER);
         searchField.setRight(new HBox(searchField.getRight(), modifierButtons));
@@ -227,30 +206,20 @@ public GlobalSearchBar(
         regexValidator =
             new FunctionBasedValidator<>(
                 searchField.textProperty(),
-                query ->
-                    !(regularExpressionButton.isSelected() && !validRegex()),
-                ValidationMessage.error(
-                    Localization.lang("Invalid regular expression")
-                )
+                query -> !(regularExpressionButton.isSelected() && !validRegex()),
+                ValidationMessage.error(Localization.lang("Invalid regular expression"))
             );
         ControlsFxVisualizer visualizer = new ControlsFxVisualizer();
         visualizer.setDecoration(new IconValidationDecorator(Pos.CENTER_LEFT));
         Platform.runLater(() ->
-            visualizer.initVisualization(
-                regexValidator.getValidationStatus(),
-                searchField
-            )
+            visualizer.initVisualization(regexValidator.getValidationStatus(), searchField)
         );
 
-        this.getChildren()
-            .addAll(searchField, openGlobalSearchButton, currentResults);
+        this.getChildren().addAll(searchField, openGlobalSearchButton, currentResults);
         this.setSpacing(4.0);
         this.setAlignment(Pos.CENTER_LEFT);
 
-        Timer searchTask = FxTimer.create(
-            Duration.ofMillis(SEARCH_DELAY),
-            this::updateSearchQuery
-        );
+        Timer searchTask = FxTimer.create(Duration.ofMillis(SEARCH_DELAY), this::updateSearchQuery);
         BindingsHelper.bindBidirectional(
             stateManager.activeSearchQueryProperty(),
             searchField.textProperty(),
@@ -282,12 +251,8 @@ public GlobalSearchBar(
             .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()
-                        );
+                if (oldValue && !(newValue || searchField.getText().isBlank())) {
+                    this.stateManager.addSearchHistory(searchField.textProperty().get());
                 }
             });
     }
@@ -301,12 +266,8 @@ private void updateSearchResultsForQuery(SearchQuery query) {
     }
 
     private void initSearchModifierButtons() {
-        regularExpressionButton.setSelected(
-            searchPreferences.isRegularExpression()
-        );
-        regularExpressionButton.setTooltip(
-            new Tooltip(Localization.lang("regular expression"))
-        );
+        regularExpressionButton.setSelected(searchPreferences.isRegularExpression());
+        regularExpressionButton.setTooltip(new Tooltip(Localization.lang("regular expression")));
         initSearchModifierButton(regularExpressionButton);
         regularExpressionButton.setOnAction(event -> {
             searchPreferences.setSearchFlag(
@@ -317,9 +278,7 @@ private void initSearchModifierButtons() {
         });
 
         caseSensitiveButton.setSelected(searchPreferences.isCaseSensitive());
-        caseSensitiveButton.setTooltip(
-            new Tooltip(Localization.lang("Case sensitive"))
-        );
+        caseSensitiveButton.setTooltip(new Tooltip(Localization.lang("Case sensitive")));
         initSearchModifierButton(caseSensitiveButton);
         caseSensitiveButton.setOnAction(event -> {
             searchPreferences.setSearchFlag(
@@ -330,9 +289,7 @@ private void initSearchModifierButtons() {
         });
 
         fulltextButton.setSelected(searchPreferences.isFulltext());
-        fulltextButton.setTooltip(
-            new Tooltip(Localization.lang("Fulltext search"))
-        );
+        fulltextButton.setTooltip(new Tooltip(Localization.lang("Fulltext search")));
         initSearchModifierButton(fulltextButton);
         fulltextButton.setOnAction(event -> {
             searchPreferences.setSearchFlag(
@@ -342,13 +299,9 @@ private void initSearchModifierButtons() {
             updateSearchQuery();
         });
 
-        keepSearchString.setSelected(
-            searchPreferences.shouldKeepSearchString()
-        );
+        keepSearchString.setSelected(searchPreferences.shouldKeepSearchString());
         keepSearchString.setTooltip(
-            new Tooltip(
-                Localization.lang("Keep search string across libraries")
-            )
+            new Tooltip(Localization.lang("Keep search string across libraries"))
         );
         initSearchModifierButton(keepSearchString);
         keepSearchString.setOnAction(evt -> {
@@ -359,19 +312,14 @@ private void initSearchModifierButtons() {
             updateSearchQuery();
         });
 
-        openGlobalSearchButton
-            .disableProperty()
-            .bindBidirectional(globalSearchActive);
+        openGlobalSearchButton.disableProperty().bindBidirectional(globalSearchActive);
         openGlobalSearchButton.setTooltip(
-            new Tooltip(
-                Localization.lang("Search across libraries in a new window")
-            )
+            new Tooltip(Localization.lang("Search across libraries in a new window"))
         );
         initSearchModifierButton(openGlobalSearchButton);
         openGlobalSearchButton.setOnAction(evt -> {
             globalSearchActive.setValue(true);
-            globalSearchResultDialog =
-                new GlobalSearchResultDialog(undoManager);
+            globalSearchResultDialog = new GlobalSearchResultDialog(undoManager);
             updateSearchQuery();
             dialogService.showCustomDialogAndWait(globalSearchResultDialog);
             globalSearchActive.setValue(false);
@@ -413,9 +361,7 @@ public void updateSearchQuery() {
 
         // Invalid regular expression
         if (!regexValidator.getValidationStatus().isValid()) {
-            currentResults.setText(
-                Localization.lang("Invalid regular expression")
-            );
+            currentResults.setText(Localization.lang("Invalid regular expression"));
             return;
         }
 
@@ -445,25 +391,17 @@ private void informUserAboutInvalidSearchQuery() {
 
         stateManager.clearSearchQuery();
 
-        String illegalSearch = Localization.lang(
-            "Search failed: illegal search expression"
-        );
+        String illegalSearch = Localization.lang("Search failed: illegal search expression");
         currentResults.setText(illegalSearch);
     }
 
     public void setAutoCompleter(SuggestionProvider<Author> searchCompleter) {
-        if (
-            preferencesService.getAutoCompletePreferences().shouldAutoComplete()
-        ) {
+        if (preferencesService.getAutoCompletePreferences().shouldAutoComplete()) {
             AutoCompletionTextInputBinding<Author> autoComplete =
                 AutoCompletionTextInputBinding.autoComplete(
                     searchField,
                     searchCompleter::provideSuggestions,
-                    new PersonNameStringConverter(
-                        false,
-                        false,
-                        AutoCompleteFirstNameMode.BOTH
-                    ),
+                    new PersonNameStringConverter(false, false, AutoCompleteFirstNameMode.BOTH),
                     new AppendPersonNamesStrategy()
                 );
             AutoCompletePopup<Author> popup = getPopup(autoComplete);
@@ -475,37 +413,25 @@ public void setAutoCompleter(SuggestionProvider<Author> searchCompleter) {
      * The popup has private access in {@link AutoCompletionBinding}, so we use reflection to access it.
      */
     @SuppressWarnings("unchecked")
-    private <T> AutoCompletePopup<T> getPopup(
-        AutoCompletionBinding<T> autoCompletionBinding
-    ) {
+    private <T> AutoCompletePopup<T> getPopup(AutoCompletionBinding<T> autoCompletionBinding) {
         try {
             // TODO: reflective access, should be removed
             Field privatePopup =
-                AutoCompletionBinding.class.getDeclaredField(
-                        "autoCompletionPopup"
-                    );
+                AutoCompletionBinding.class.getDeclaredField("autoCompletionPopup");
             privatePopup.setAccessible(true);
-            return (AutoCompletePopup<T>) privatePopup.get(
-                autoCompletionBinding
-            );
+            return (AutoCompletePopup<T>) privatePopup.get(autoCompletionBinding);
         } catch (IllegalAccessException | NoSuchFieldException e) {
             LOGGER.error("Could not get access to auto completion popup", e);
             return new AutoCompletePopup<>();
         }
     }
 
-    private void updateResults(
-        int matched,
-        TextFlow description,
-        boolean grammarBasedSearch
-    ) {
+    private void updateResults(int matched, TextFlow description, boolean grammarBasedSearch) {
         if (matched == 0) {
             currentResults.setText(Localization.lang("No results found."));
             searchField.pseudoClassStateChanged(CLASS_NO_RESULTS, true);
         } else {
-            currentResults.setText(
-                Localization.lang("Found %0 results.", String.valueOf(matched))
-            );
+            currentResults.setText(Localization.lang("Found %0 results.", String.valueOf(matched)));
             searchField.pseudoClassStateChanged(CLASS_RESULTS_FOUND, true);
         }
         if (grammarBasedSearch) {
@@ -520,16 +446,13 @@ private void updateResults(
     }
 
     private void setSearchFieldHintTooltip(TextFlow description) {
-        if (
-            preferencesService
-                .getWorkspacePreferences()
-                .shouldShowAdvancedHints()
-        ) {
+        if (preferencesService.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);
+            List<Text> genericDescriptionTexts = TooltipTextUtil.createTextsFromHtml(
+                genericDescription
+            );
 
             if (description == null) {
                 TextFlow emptyHintTooltip = new TextFlow();
@@ -552,13 +475,10 @@ public void setSearchTerm(String searchTerm) {
             return;
         }
 
-        DefaultTaskExecutor.runInJavaFXThread(() ->
-            searchField.setText(searchTerm)
-        );
+        DefaultTaskExecutor.runInJavaFXThread(() -> searchField.setText(searchTerm));
     }
 
-    private static class SearchPopupSkin<T>
-        implements Skin<AutoCompletePopup<T>> {
+    private static class SearchPopupSkin<T> implements Skin<AutoCompletePopup<T>> {
 
         private final AutoCompletePopup<T> control;
         private final ListView<T> suggestionList;
@@ -572,9 +492,7 @@ public SearchPopupSkin(AutoCompletePopup<T> control) {
                 .add(
                     Objects
                         .requireNonNull(
-                            AutoCompletionBinding.class.getResource(
-                                    "autocompletion.css"
-                                )
+                            AutoCompletionBinding.class.getResource("autocompletion.css")
                         )
                         .toExternalForm()
                 );
@@ -591,12 +509,9 @@ public SearchPopupSkin(AutoCompletePopup<T> control) {
             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());
+            this.suggestionList.prefWidthProperty().bind(control.prefWidthProperty());
+            this.suggestionList.maxWidthProperty().bind(control.maxWidthProperty());
+            this.suggestionList.minWidthProperty().bind(control.minWidthProperty());
 
             this.container = new BorderPane();
             this.container.setCenter(suggestionList);
@@ -608,8 +523,7 @@ private void registerEventListener() {
             this.suggestionList.setOnMouseClicked(me -> {
                     if (me.getButton() == MouseButton.PRIMARY) {
                         this.onSuggestionChosen(
-                                this.suggestionList.getSelectionModel()
-                                    .getSelectedItem()
+                                this.suggestionList.getSelectionModel().getSelectedItem()
                             );
                     }
                 });
@@ -618,8 +532,7 @@ private void registerEventListener() {
                         case TAB:
                         case ENTER:
                             this.onSuggestionChosen(
-                                    this.suggestionList.getSelectionModel()
-                                        .getSelectedItem()
+                                    this.suggestionList.getSelectionModel().getSelectedItem()
                                 );
                             break;
                         case ESCAPE:
@@ -635,10 +548,7 @@ private void registerEventListener() {
 
         private void onSuggestionChosen(T suggestion) {
             if (suggestion != null) {
-                Event.fireEvent(
-                    this.control,
-                    new AutoCompletePopup.SuggestionEvent<>(suggestion)
-                );
+                Event.fireEvent(this.control, new AutoCompletePopup.SuggestionEvent<>(suggestion));
             }
         }
 
diff --git a/src/main/java/org/jabref/gui/search/GlobalSearchResultDialog.java b/src/main/java/org/jabref/gui/search/GlobalSearchResultDialog.java
index 654e7e8fa76..df63f3c0bbc 100644
--- a/src/main/java/org/jabref/gui/search/GlobalSearchResultDialog.java
+++ b/src/main/java/org/jabref/gui/search/GlobalSearchResultDialog.java
@@ -69,9 +69,7 @@ private void initialize() {
             taskExecutor
         );
         previewViewer.setLayout(
-            preferencesService
-                .getPreviewPreferences()
-                .getSelectedPreviewLayout()
+            preferencesService.getPreviewPreferences().getSelectedPreviewLayout()
         );
 
         SearchResultsTableDataModel model = new SearchResultsTableDataModel(
@@ -89,15 +87,11 @@ private void initialize() {
             taskExecutor
         );
 
-        resultsTable
-            .getColumns()
-            .removeIf(SpecialFieldColumn.class::isInstance);
+        resultsTable.getColumns().removeIf(SpecialFieldColumn.class::isInstance);
         resultsTable.getSelectionModel().selectFirst();
 
         if (resultsTable.getSelectionModel().getSelectedItem() != null) {
-            previewViewer.setEntry(
-                resultsTable.getSelectionModel().getSelectedItem().getEntry()
-            );
+            previewViewer.setEntry(resultsTable.getSelectionModel().getSelectedItem().getEntry());
         }
 
         resultsTable
@@ -135,15 +129,11 @@ private void initialize() {
                 event -> {
                     getDialogPane()
                         .setPrefHeight(
-                            preferencesService
-                                .getSearchPreferences()
-                                .getSearchWindowHeight()
+                            preferencesService.getSearchPreferences().getSearchWindowHeight()
                         );
                     getDialogPane()
                         .setPrefWidth(
-                            preferencesService
-                                .getSearchPreferences()
-                                .getSearchWindowWidth()
+                            preferencesService.getSearchPreferences().getSearchWindowWidth()
                         );
                 }
             );
@@ -154,12 +144,8 @@ private void initialize() {
             .addEventHandler(
                 WindowEvent.WINDOW_HIDDEN,
                 event -> {
-                    preferencesService
-                        .getSearchPreferences()
-                        .setSearchWindowHeight(getHeight());
-                    preferencesService
-                        .getSearchPreferences()
-                        .setSearchWindowWidth(getWidth());
+                    preferencesService.getSearchPreferences().setSearchWindowHeight(getHeight());
+                    preferencesService.getSearchPreferences().setSearchWindowWidth(getWidth());
                 }
             );
     }
diff --git a/src/main/java/org/jabref/gui/search/GlobalSearchResultDialogViewModel.java b/src/main/java/org/jabref/gui/search/GlobalSearchResultDialogViewModel.java
index 81162ddafcf..8e9c47af9ab 100644
--- a/src/main/java/org/jabref/gui/search/GlobalSearchResultDialogViewModel.java
+++ b/src/main/java/org/jabref/gui/search/GlobalSearchResultDialogViewModel.java
@@ -9,22 +9,15 @@
 
 public class GlobalSearchResultDialogViewModel {
 
-    private final BibDatabaseContext searchDatabaseContext =
-        new BibDatabaseContext();
+    private final BibDatabaseContext searchDatabaseContext = new BibDatabaseContext();
     private final BooleanProperty keepOnTop = new SimpleBooleanProperty();
 
-    public GlobalSearchResultDialogViewModel(
-        PreferencesService preferencesService
-    ) {
-        SearchPreferences searchPreferences =
-            preferencesService.getSearchPreferences();
+    public GlobalSearchResultDialogViewModel(PreferencesService preferencesService) {
+        SearchPreferences searchPreferences = preferencesService.getSearchPreferences();
 
         keepOnTop.set(searchPreferences.shouldKeepWindowOnTop());
 
-        EasyBind.subscribe(
-            this.keepOnTop,
-            searchPreferences::setKeepWindowOnTop
-        );
+        EasyBind.subscribe(this.keepOnTop, searchPreferences::setKeepWindowOnTop);
     }
 
     public BibDatabaseContext getSearchDatabaseContext() {
diff --git a/src/main/java/org/jabref/gui/search/RebuildFulltextSearchIndexAction.java b/src/main/java/org/jabref/gui/search/RebuildFulltextSearchIndexAction.java
index e50eb69e85a..9b28d4afc5d 100644
--- a/src/main/java/org/jabref/gui/search/RebuildFulltextSearchIndexAction.java
+++ b/src/main/java/org/jabref/gui/search/RebuildFulltextSearchIndexAction.java
@@ -18,9 +18,7 @@
 
 public class RebuildFulltextSearchIndexAction extends SimpleCommand {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(
-        LibraryTab.class
-    );
+    private static final Logger LOGGER = LoggerFactory.getLogger(LibraryTab.class);
 
     private final StateManager stateManager;
     private final GetCurrentLibraryTab currentLibraryTab;
@@ -62,17 +60,13 @@ public void init() {
         databaseContext = stateManager.getActiveDatabase().get();
         boolean confirm = dialogService.showConfirmationDialogAndWait(
             Localization.lang("Rebuild fulltext search index"),
-            Localization.lang(
-                "Rebuild fulltext search index for current library?"
-            )
+            Localization.lang("Rebuild fulltext search index for current library?")
         );
         if (!confirm) {
             shouldContinue = false;
             return;
         }
-        dialogService.notify(
-            Localization.lang("Rebuilding fulltext search index...")
-        );
+        dialogService.notify(Localization.lang("Rebuilding fulltext search index..."));
     }
 
     private void rebuildIndex() {
@@ -87,14 +81,9 @@ private void rebuildIndex() {
             currentLibraryTab
                 .get()
                 .getIndexingTaskManager()
-                .updateIndex(
-                    PdfIndexer.of(databaseContext, filePreferences),
-                    databaseContext
-                );
+                .updateIndex(PdfIndexer.of(databaseContext, filePreferences), databaseContext);
         } catch (IOException e) {
-            dialogService.notify(
-                Localization.lang("Failed to access fulltext search index")
-            );
+            dialogService.notify(Localization.lang("Failed to access fulltext search index"));
             LOGGER.error("Failed to access fulltext search index", e);
         }
     }
diff --git a/src/main/java/org/jabref/gui/search/SearchDisplayMode.java b/src/main/java/org/jabref/gui/search/SearchDisplayMode.java
index b98dbe6f12d..c023b1b09d2 100644
--- a/src/main/java/org/jabref/gui/search/SearchDisplayMode.java
+++ b/src/main/java/org/jabref/gui/search/SearchDisplayMode.java
@@ -7,14 +7,8 @@
  * Collects the possible search modes
  */
 public enum SearchDisplayMode {
-    FLOAT(
-        () -> Localization.lang("Float"),
-        () -> Localization.lang("Gray out non-hits")
-    ),
-    FILTER(
-        () -> Localization.lang("Filter"),
-        () -> Localization.lang("Hide non-hits")
-    );
+    FLOAT(() -> Localization.lang("Float"), () -> Localization.lang("Gray out non-hits")),
+    FILTER(() -> Localization.lang("Filter"), () -> Localization.lang("Hide non-hits"));
 
     private final Supplier<String> displayName;
     private final Supplier<String> toolTipText;
@@ -22,10 +16,7 @@ public enum SearchDisplayMode {
     /**
      * We have to use supplier for the localized text so that language changes are correctly reflected.
      */
-    SearchDisplayMode(
-        Supplier<String> displayName,
-        Supplier<String> toolTipText
-    ) {
+    SearchDisplayMode(Supplier<String> displayName, Supplier<String> toolTipText) {
         this.displayName = displayName;
         this.toolTipText = toolTipText;
     }
diff --git a/src/main/java/org/jabref/gui/search/SearchFieldRightClickMenu.java b/src/main/java/org/jabref/gui/search/SearchFieldRightClickMenu.java
index 9ed8c583f01..fab86321571 100644
--- a/src/main/java/org/jabref/gui/search/SearchFieldRightClickMenu.java
+++ b/src/main/java/org/jabref/gui/search/SearchFieldRightClickMenu.java
@@ -55,17 +55,9 @@ public static ContextMenu create(
                 new SeparatorMenuItem(),
                 factory.createMenuItem(
                     StandardActions.SELECT_ALL,
-                    new EditAction(
-                        StandardActions.SELECT_ALL,
-                        null,
-                        stateManager
-                    )
+                    new EditAction(StandardActions.SELECT_ALL, null, stateManager)
                 ),
-                createSearchFromHistorySubMenu(
-                    factory,
-                    stateManager,
-                    searchField
-                )
+                createSearchFromHistorySubMenu(factory, stateManager, searchField)
             );
 
         return contextMenu;
@@ -82,9 +74,7 @@ private static Menu createSearchFromHistorySubMenu(
 
         int num = stateManager.getLastSearchHistory(10).size();
         if (num == 0) {
-            MenuItem item = new MenuItem(
-                Localization.lang("your search history is empty")
-            );
+            MenuItem item = new MenuItem(Localization.lang("your search history is empty"));
             searchFromHistorySubMenu.getItems().addAll(item);
         } else {
             for (int i = 0; i < num; i++) {
@@ -94,11 +84,7 @@ private static Menu createSearchFromHistorySubMenu(
                     new SimpleCommand() {
                         @Override
                         public void execute() {
-                            searchField.setText(
-                                stateManager
-                                    .getLastSearchHistory(10)
-                                    .get(finalI)
-                            );
+                            searchField.setText(stateManager.getLastSearchHistory(10).get(finalI));
                         }
                     }
                 );
@@ -113,9 +99,7 @@ public void execute() {
                     }
                 }
             );
-            searchFromHistorySubMenu
-                .getItems()
-                .addAll(new SeparatorMenuItem(), clear);
+            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 4ff9ce1e64e..8acf8e3f96e 100644
--- a/src/main/java/org/jabref/gui/search/SearchResultsTable.java
+++ b/src/main/java/org/jabref/gui/search/SearchResultsTable.java
@@ -31,20 +31,18 @@ public SearchResultsTable(
         TaskExecutor taskExecutor
     ) {
         super();
-        MainTablePreferences mainTablePreferences =
-            preferencesService.getMainTablePreferences();
+        MainTablePreferences mainTablePreferences = preferencesService.getMainTablePreferences();
 
-        List<TableColumn<BibEntryTableViewModel, ?>> allCols =
-            new MainTableColumnFactory(
-                database,
-                preferencesService,
-                preferencesService.getSearchDialogColumnPreferences(),
-                undoManager,
-                dialogService,
-                stateManager,
-                taskExecutor
-            )
-                .createColumns();
+        List<TableColumn<BibEntryTableViewModel, ?>> allCols = new MainTableColumnFactory(
+            database,
+            preferencesService,
+            preferencesService.getSearchDialogColumnPreferences(),
+            undoManager,
+            dialogService,
+            stateManager,
+            taskExecutor
+        )
+            .createColumns();
 
         if (allCols.stream().noneMatch(LibraryColumn.class::isInstance)) {
             allCols.add(0, new LibraryColumn());
@@ -71,19 +69,12 @@ public SearchResultsTable(
         this.getSelectionModel().setSelectionMode(SelectionMode.SINGLE);
         this.setItems(model.getEntriesFilteredAndSorted());
         // Enable sorting
-        model
-            .getEntriesFilteredAndSorted()
-            .comparatorProperty()
-            .bind(this.comparatorProperty());
+        model.getEntriesFilteredAndSorted().comparatorProperty().bind(this.comparatorProperty());
 
-        this.getStylesheets()
-            .add(MainTable.class.getResource("MainTable.css").toExternalForm());
+        this.getStylesheets().add(MainTable.class.getResource("MainTable.css").toExternalForm());
 
         // Store visual state
-        new PersistenceVisualStateTable(
-            this,
-            preferencesService.getSearchDialogColumnPreferences()
-        )
+        new PersistenceVisualStateTable(this, preferencesService.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 0e9fb6484d6..56d7e1443b9 100644
--- a/src/main/java/org/jabref/gui/search/SearchResultsTableDataModel.java
+++ b/src/main/java/org/jabref/gui/search/SearchResultsTableDataModel.java
@@ -22,9 +22,7 @@ public class SearchResultsTableDataModel {
 
     private final FilteredList<BibEntryTableViewModel> entriesFiltered;
     private final SortedList<BibEntryTableViewModel> entriesSorted;
-    private final ObjectProperty<
-        MainTableFieldValueFormatter
-    > fieldValueFormatter;
+    private final ObjectProperty<MainTableFieldValueFormatter> fieldValueFormatter;
     private final NameDisplayPreferences nameDisplayPreferences;
     private final BibDatabaseContext bibDatabaseContext;
 
@@ -33,31 +31,20 @@ public SearchResultsTableDataModel(
         PreferencesService preferencesService,
         StateManager stateManager
     ) {
-        this.nameDisplayPreferences =
-            preferencesService.getNameDisplayPreferences();
+        this.nameDisplayPreferences = preferencesService.getNameDisplayPreferences();
         this.bibDatabaseContext = bibDatabaseContext;
         this.fieldValueFormatter =
             new SimpleObjectProperty<>(
-                new MainTableFieldValueFormatter(
-                    nameDisplayPreferences,
-                    bibDatabaseContext
-                )
+                new MainTableFieldValueFormatter(nameDisplayPreferences, bibDatabaseContext)
             );
 
         ObservableList<BibEntryTableViewModel> entriesViewModel =
             FXCollections.observableArrayList();
         for (BibDatabaseContext context : stateManager.getOpenDatabases()) {
-            ObservableList<BibEntry> entriesForDb = context
-                .getDatabase()
-                .getEntries();
+            ObservableList<BibEntry> entriesForDb = context.getDatabase().getEntries();
             List<BibEntryTableViewModel> viewModelForDb = EasyBind.mapBacked(
                 entriesForDb,
-                entry ->
-                    new BibEntryTableViewModel(
-                        entry,
-                        context,
-                        fieldValueFormatter
-                    )
+                entry -> new BibEntryTableViewModel(entry, context, fieldValueFormatter)
             );
             entriesViewModel.addAll(viewModelForDb);
         }
@@ -76,13 +63,8 @@ public SearchResultsTableDataModel(
         entriesSorted = new SortedList<>(entriesFiltered);
     }
 
-    private boolean isMatchedBySearch(
-        Optional<SearchQuery> query,
-        BibEntryTableViewModel entry
-    ) {
-        return query
-            .map(matcher -> matcher.isMatch(entry.getEntry()))
-            .orElse(true);
+    private boolean isMatchedBySearch(Optional<SearchQuery> query, BibEntryTableViewModel entry) {
+        return query.map(matcher -> matcher.isMatch(entry.getEntry())).orElse(true);
     }
 
     public SortedList<BibEntryTableViewModel> getEntriesFilteredAndSorted() {
@@ -91,10 +73,7 @@ public SortedList<BibEntryTableViewModel> getEntriesFilteredAndSorted() {
 
     public void refresh() {
         this.fieldValueFormatter.setValue(
-                new MainTableFieldValueFormatter(
-                    nameDisplayPreferences,
-                    bibDatabaseContext
-                )
+                new MainTableFieldValueFormatter(nameDisplayPreferences, bibDatabaseContext)
             );
     }
 }
diff --git a/src/main/java/org/jabref/gui/search/SearchTextField.java b/src/main/java/org/jabref/gui/search/SearchTextField.java
index 961add7ff6e..e29610477d6 100644
--- a/src/main/java/org/jabref/gui/search/SearchTextField.java
+++ b/src/main/java/org/jabref/gui/search/SearchTextField.java
@@ -8,8 +8,7 @@
 public class SearchTextField {
 
     public static CustomTextField create() {
-        CustomTextField textField =
-            (CustomTextField) TextFields.createClearableTextField();
+        CustomTextField textField = (CustomTextField) TextFields.createClearableTextField();
         textField.setPromptText(Localization.lang("Search") + "...");
         textField.setLeft(IconTheme.JabRefIcons.SEARCH.getGraphicNode());
         textField.setId("searchField");
diff --git a/src/main/java/org/jabref/gui/search/rules/describer/ContainsAndRegexBasedSearchRuleDescriber.java b/src/main/java/org/jabref/gui/search/rules/describer/ContainsAndRegexBasedSearchRuleDescriber.java
index 66579508b17..bf29e13b662 100644
--- a/src/main/java/org/jabref/gui/search/rules/describer/ContainsAndRegexBasedSearchRuleDescriber.java
+++ b/src/main/java/org/jabref/gui/search/rules/describer/ContainsAndRegexBasedSearchRuleDescriber.java
@@ -10,8 +10,7 @@
 import org.jabref.model.search.rules.SearchRules.SearchFlags;
 import org.jabref.model.search.rules.SentenceAnalyzer;
 
-public class ContainsAndRegexBasedSearchRuleDescriber
-    implements SearchDescriber {
+public class ContainsAndRegexBasedSearchRuleDescriber implements SearchDescriber {
 
     private final EnumSet<SearchFlags> searchFlags;
     private final String query;
@@ -29,9 +28,7 @@ public TextFlow getDescription() {
         List<String> words = new SentenceAnalyzer(query).getWords();
         String firstWord = words.isEmpty() ? "" : words.get(0);
 
-        String temp = searchFlags.contains(
-                SearchRules.SearchFlags.REGULAR_EXPRESSION
-            )
+        String temp = searchFlags.contains(SearchRules.SearchFlags.REGULAR_EXPRESSION)
             ? Localization.lang(
                 "This search contains entries in which any field contains the regular expression <b>%0</b>"
             )
@@ -56,12 +53,7 @@ public TextFlow getDescription() {
                         TooltipTextUtil.TextType.NORMAL
                     )
                 );
-                textList.add(
-                    TooltipTextUtil.createText(
-                        word,
-                        TooltipTextUtil.TextType.BOLD
-                    )
-                );
+                textList.add(TooltipTextUtil.createText(word, TooltipTextUtil.TextType.BOLD));
             }
         }
 
diff --git a/src/main/java/org/jabref/gui/search/rules/describer/GrammarBasedSearchRuleDescriber.java b/src/main/java/org/jabref/gui/search/rules/describer/GrammarBasedSearchRuleDescriber.java
index f7eedec2c86..a9875ee0c55 100644
--- a/src/main/java/org/jabref/gui/search/rules/describer/GrammarBasedSearchRuleDescriber.java
+++ b/src/main/java/org/jabref/gui/search/rules/describer/GrammarBasedSearchRuleDescriber.java
@@ -23,10 +23,7 @@ public class GrammarBasedSearchRuleDescriber implements SearchDescriber {
     private final EnumSet<SearchFlags> searchFlags;
     private final ParseTree parseTree;
 
-    public GrammarBasedSearchRuleDescriber(
-        EnumSet<SearchFlags> searchFlags,
-        ParseTree parseTree
-    ) {
+    public GrammarBasedSearchRuleDescriber(EnumSet<SearchFlags> searchFlags, ParseTree parseTree) {
         this.searchFlags = searchFlags;
         this.parseTree = Objects.requireNonNull(parseTree);
     }
@@ -44,24 +41,15 @@ public TextFlow getDescription() {
                 TooltipTextUtil.createText(
                     String.format(
                         "%s ",
-                        Localization.lang(
-                            "This search contains entries in which"
-                        )
+                        Localization.lang("This search contains entries in which")
                     ),
                     TooltipTextUtil.TextType.NORMAL
                 )
             );
+        textFlow.getChildren().addAll(descriptionSearchBaseVisitor.visit(parseTree));
         textFlow
             .getChildren()
-            .addAll(descriptionSearchBaseVisitor.visit(parseTree));
-        textFlow
-            .getChildren()
-            .add(
-                TooltipTextUtil.createText(
-                    ". ",
-                    TooltipTextUtil.TextType.NORMAL
-                )
-            );
+            .add(TooltipTextUtil.createText(". ", TooltipTextUtil.TextType.NORMAL));
         textFlow
             .getChildren()
             .add(
@@ -75,8 +63,7 @@ public TextFlow getDescription() {
         return textFlow;
     }
 
-    private class DescriptionSearchBaseVisitor
-        extends SearchBaseVisitor<List<Text>> {
+    private class DescriptionSearchBaseVisitor extends SearchBaseVisitor<List<Text>> {
 
         @Override
         public List<Text> visitStart(SearchParser.StartContext context) {
@@ -84,9 +71,7 @@ public List<Text> visitStart(SearchParser.StartContext context) {
         }
 
         @Override
-        public List<Text> visitUnaryExpression(
-            SearchParser.UnaryExpressionContext context
-        ) {
+        public List<Text> visitUnaryExpression(SearchParser.UnaryExpressionContext context) {
             List<Text> textList = visit(context.expression());
             textList.add(
                 0,
@@ -99,9 +84,7 @@ public List<Text> visitUnaryExpression(
         }
 
         @Override
-        public List<Text> visitParenExpression(
-            SearchParser.ParenExpressionContext context
-        ) {
+        public List<Text> visitParenExpression(SearchParser.ParenExpressionContext context) {
             ArrayList<Text> textList = new ArrayList<>();
             textList.add(
                 TooltipTextUtil.createText(
@@ -113,9 +96,7 @@ public List<Text> visitParenExpression(
         }
 
         @Override
-        public List<Text> visitBinaryExpression(
-            SearchParser.BinaryExpressionContext context
-        ) {
+        public List<Text> visitBinaryExpression(SearchParser.BinaryExpressionContext context) {
             List<Text> textList = visit(context.left);
             if ("AND".equalsIgnoreCase(context.operator.getText())) {
                 textList.add(
@@ -137,105 +118,52 @@ public List<Text> visitBinaryExpression(
         }
 
         @Override
-        public List<Text> visitComparison(
-            SearchParser.ComparisonContext context
-        ) {
+        public List<Text> visitComparison(SearchParser.ComparisonContext context) {
             final List<Text> textList = new ArrayList<>();
-            final Optional<SearchParser.NameContext> fieldDescriptor =
-                Optional.ofNullable(context.left);
-            final String value = StringUtil.unquote(
-                context.right.getText(),
-                '"'
+            final Optional<SearchParser.NameContext> fieldDescriptor = Optional.ofNullable(
+                context.left
             );
+            final String value = StringUtil.unquote(context.right.getText(), '"');
             if (!fieldDescriptor.isPresent()) {
-                TextFlow description =
-                    new ContainsAndRegexBasedSearchRuleDescriber(
-                        searchFlags,
-                        value
-                    )
-                        .getDescription();
-                description
-                    .getChildren()
-                    .forEach(it -> textList.add((Text) it));
+                TextFlow description = new ContainsAndRegexBasedSearchRuleDescriber(
+                    searchFlags,
+                    value
+                )
+                    .getDescription();
+                description.getChildren().forEach(it -> textList.add((Text) it));
                 return textList;
             }
 
-            final String field = StringUtil.unquote(
-                fieldDescriptor.get().getText(),
-                '"'
-            );
+            final String field = StringUtil.unquote(fieldDescriptor.get().getText(), '"');
             final GrammarBasedSearchRule.ComparisonOperator operator =
-                GrammarBasedSearchRule.ComparisonOperator.build(
-                    context.operator.getText()
-                );
+                GrammarBasedSearchRule.ComparisonOperator.build(context.operator.getText());
 
             final boolean regExpFieldSpec = !Pattern.matches("\\w+", field);
             String temp = regExpFieldSpec
-                ? Localization.lang(
-                    "any field that matches the regular expression <b>%0</b>"
-                )
+                ? Localization.lang("any field that matches the regular expression <b>%0</b>")
                 : Localization.lang("the field <b>%0</b>");
 
-            if (
-                operator == GrammarBasedSearchRule.ComparisonOperator.CONTAINS
-            ) {
-                if (
-                    searchFlags.contains(
-                        SearchRules.SearchFlags.REGULAR_EXPRESSION
-                    )
-                ) {
-                    temp =
-                        Localization.lang(
-                            "%0 contains the regular expression <b>%1</b>",
-                            temp
-                        );
+            if (operator == GrammarBasedSearchRule.ComparisonOperator.CONTAINS) {
+                if (searchFlags.contains(SearchRules.SearchFlags.REGULAR_EXPRESSION)) {
+                    temp = Localization.lang("%0 contains the regular expression <b>%1</b>", temp);
                 } else {
-                    temp =
-                        Localization.lang(
-                            "%0 contains the term <b>%1</b>",
-                            temp
-                        );
+                    temp = Localization.lang("%0 contains the term <b>%1</b>", temp);
                 }
-            } else if (
-                operator == GrammarBasedSearchRule.ComparisonOperator.EXACT
-            ) {
-                if (
-                    searchFlags.contains(
-                        SearchRules.SearchFlags.REGULAR_EXPRESSION
-                    )
-                ) {
-                    temp =
-                        Localization.lang(
-                            "%0 matches the regular expression <b>%1</b>",
-                            temp
-                        );
+            } else if (operator == GrammarBasedSearchRule.ComparisonOperator.EXACT) {
+                if (searchFlags.contains(SearchRules.SearchFlags.REGULAR_EXPRESSION)) {
+                    temp = Localization.lang("%0 matches the regular expression <b>%1</b>", temp);
                 } else {
-                    temp =
-                        Localization.lang(
-                            "%0 matches the term <b>%1</b>",
-                            temp
-                        );
+                    temp = Localization.lang("%0 matches the term <b>%1</b>", temp);
                 }
-            } else if (
-                operator ==
-                GrammarBasedSearchRule.ComparisonOperator.DOES_NOT_CONTAIN
-            ) {
-                if (
-                    searchFlags.contains(
-                        SearchRules.SearchFlags.REGULAR_EXPRESSION
-                    )
-                ) {
+            } else if (operator == GrammarBasedSearchRule.ComparisonOperator.DOES_NOT_CONTAIN) {
+                if (searchFlags.contains(SearchRules.SearchFlags.REGULAR_EXPRESSION)) {
                     temp =
                         Localization.lang(
                             "%0 doesn't contain the regular expression <b>%1</b>",
                             temp
                         );
                 } else {
-                    temp =
-                        Localization.lang(
-                            "%0 doesn't contain the term <b>%1</b>",
-                            temp
-                        );
+                    temp = Localization.lang("%0 doesn't contain the term <b>%1</b>", temp);
                 }
             } else {
                 throw new IllegalStateException("CANNOT HAPPEN!");
diff --git a/src/main/java/org/jabref/gui/search/rules/describer/SearchDescribers.java b/src/main/java/org/jabref/gui/search/rules/describer/SearchDescribers.java
index c509786f4f5..f04b0b4553c 100644
--- a/src/main/java/org/jabref/gui/search/rules/describer/SearchDescribers.java
+++ b/src/main/java/org/jabref/gui/search/rules/describer/SearchDescribers.java
@@ -15,29 +15,20 @@ private SearchDescribers() {}
      * @param searchQuery the search query
      * @return the search describer to turn the search into something human understandable
      */
-    public static SearchDescriber getSearchDescriberFor(
-        SearchQuery searchQuery
-    ) {
-        if (
-            searchQuery.getRule() instanceof
-            GrammarBasedSearchRule grammarBasedSearchRule
-        ) {
+    public static SearchDescriber getSearchDescriberFor(SearchQuery searchQuery) {
+        if (searchQuery.getRule() instanceof GrammarBasedSearchRule grammarBasedSearchRule) {
             return new GrammarBasedSearchRuleDescriber(
                 grammarBasedSearchRule.getSearchFlags(),
                 grammarBasedSearchRule.getTree()
             );
         } else if (
-            searchQuery.getRule() instanceof
-            ContainsBasedSearchRule containBasedSearchRule
+            searchQuery.getRule() instanceof ContainsBasedSearchRule containBasedSearchRule
         ) {
             return new ContainsAndRegexBasedSearchRuleDescriber(
                 containBasedSearchRule.getSearchFlags(),
                 searchQuery.getQuery()
             );
-        } else if (
-            searchQuery.getRule() instanceof
-            RegexBasedSearchRule regexBasedSearchRule
-        ) {
+        } else if (searchQuery.getRule() instanceof RegexBasedSearchRule regexBasedSearchRule) {
             return new ContainsAndRegexBasedSearchRuleDescriber(
                 regexBasedSearchRule.getSearchFlags(),
                 searchQuery.getQuery()
diff --git a/src/main/java/org/jabref/gui/shared/ConnectToSharedDatabaseCommand.java b/src/main/java/org/jabref/gui/shared/ConnectToSharedDatabaseCommand.java
index 28b90236808..b4fa8f81cd0 100644
--- a/src/main/java/org/jabref/gui/shared/ConnectToSharedDatabaseCommand.java
+++ b/src/main/java/org/jabref/gui/shared/ConnectToSharedDatabaseCommand.java
@@ -18,11 +18,7 @@ public ConnectToSharedDatabaseCommand(JabRefFrame jabRefFrame) {
 
     @Override
     public void execute() {
-        DialogService dialogService = Injector.instantiateModelOrService(
-            DialogService.class
-        );
-        dialogService.showCustomDialogAndWait(
-            new SharedDatabaseLoginDialogView(jabRefFrame)
-        );
+        DialogService dialogService = Injector.instantiateModelOrService(DialogService.class);
+        dialogService.showCustomDialogAndWait(new SharedDatabaseLoginDialogView(jabRefFrame));
     }
 }
diff --git a/src/main/java/org/jabref/gui/shared/PullChangesFromSharedAction.java b/src/main/java/org/jabref/gui/shared/PullChangesFromSharedAction.java
index 849f6f43ee6..65d720ab435 100644
--- a/src/main/java/org/jabref/gui/shared/PullChangesFromSharedAction.java
+++ b/src/main/java/org/jabref/gui/shared/PullChangesFromSharedAction.java
@@ -23,8 +23,7 @@ public void execute() {
         stateManager
             .getActiveDatabase()
             .ifPresent(databaseContext -> {
-                DatabaseSynchronizer dbmsSynchronizer =
-                    databaseContext.getDBMSSynchronizer();
+                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 cf8e15be38a..9b83f964405 100644
--- a/src/main/java/org/jabref/gui/shared/SharedDatabaseLoginDialogView.java
+++ b/src/main/java/org/jabref/gui/shared/SharedDatabaseLoginDialogView.java
@@ -108,26 +108,17 @@ public SharedDatabaseLoginDialogView(JabRefFrame frame) {
 
         ViewLoader.view(this).load().setAsDialogPane(this);
 
-        ControlHelper.setAction(
-            connectButton,
-            this.getDialogPane(),
-            event -> openDatabase()
-        );
-        Button btnConnect = (Button) this.getDialogPane()
-            .lookupButton(connectButton);
+        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.disableProperty().bind(viewModel.formValidation().validProperty().not());
         btnConnect
             .textProperty()
             .bind(
                 EasyBind.map(
                     viewModel.loadingProperty(),
                     loading ->
-                        loading
-                            ? Localization.lang("Connecting...")
-                            : Localization.lang("Connect")
+                        loading ? Localization.lang("Connecting...") : Localization.lang("Connect")
                 )
             );
     }
@@ -164,78 +155,39 @@ private void initialize() {
         user.textProperty().bindBidirectional(viewModel.userProperty());
         password.textProperty().bindBidirectional(viewModel.passwordProperty());
         port.textProperty().bindBidirectional(viewModel.portProperty());
-        serverTimezone
-            .textProperty()
-            .bindBidirectional(viewModel.serverTimezoneProperty());
-        databaseType
-            .valueProperty()
-            .bindBidirectional(viewModel.selectedDbmstypeProperty());
+        serverTimezone.textProperty().bindBidirectional(viewModel.serverTimezoneProperty());
+        databaseType.valueProperty().bindBidirectional(viewModel.selectedDbmstypeProperty());
 
         folder.textProperty().bindBidirectional(viewModel.folderProperty());
         browseButton.disableProperty().bind(viewModel.autosaveProperty().not());
         folder.disableProperty().bind(viewModel.autosaveProperty().not());
-        autosave
-            .selectedProperty()
-            .bindBidirectional(viewModel.autosaveProperty());
+        autosave.selectedProperty().bindBidirectional(viewModel.autosaveProperty());
 
         useSSL.selectedProperty().bindBidirectional(viewModel.useSSLProperty());
 
-        fileKeystore
-            .textProperty()
-            .bindBidirectional(viewModel.keyStoreProperty());
+        fileKeystore.textProperty().bindBidirectional(viewModel.keyStoreProperty());
 
         browseKeystore.disableProperty().bind(viewModel.useSSLProperty().not());
-        passwordKeystore
-            .disableProperty()
-            .bind(viewModel.useSSLProperty().not());
-        passwordKeystore
-            .textProperty()
-            .bindBidirectional(viewModel.keyStorePasswordProperty());
-        rememberPassword
-            .selectedProperty()
-            .bindBidirectional(viewModel.rememberPasswordProperty());
+        passwordKeystore.disableProperty().bind(viewModel.useSSLProperty().not());
+        passwordKeystore.textProperty().bindBidirectional(viewModel.keyStorePasswordProperty());
+        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
-            );
+            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
-                    )
+                selected -> visualizer.initVisualization(viewModel.folderValidation(), folder, true)
             );
 
             EasyBind.subscribe(
                 useSSL.selectedProperty(),
                 selected ->
-                    visualizer.initVisualization(
-                        viewModel.keystoreValidation(),
-                        fileKeystore,
-                        true
-                    )
+                    visualizer.initVisualization(viewModel.keystoreValidation(), fileKeystore, true)
             );
         });
     }
diff --git a/src/main/java/org/jabref/gui/shared/SharedDatabaseLoginDialogViewModel.java b/src/main/java/org/jabref/gui/shared/SharedDatabaseLoginDialogViewModel.java
index 8ea753c9f6f..2d454161fe4 100644
--- a/src/main/java/org/jabref/gui/shared/SharedDatabaseLoginDialogViewModel.java
+++ b/src/main/java/org/jabref/gui/shared/SharedDatabaseLoginDialogViewModel.java
@@ -59,8 +59,9 @@ public class SharedDatabaseLoginDialogViewModel extends AbstractViewModel {
         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("");
@@ -69,13 +70,11 @@ public class SharedDatabaseLoginDialogViewModel extends AbstractViewModel {
     private final StringProperty password = new SimpleStringProperty("");
     private final StringProperty folder = new SimpleStringProperty("");
     private final BooleanProperty autosave = new SimpleBooleanProperty();
-    private final BooleanProperty rememberPassword =
-        new SimpleBooleanProperty();
+    private final BooleanProperty rememberPassword = new SimpleBooleanProperty();
     private final BooleanProperty loading = new SimpleBooleanProperty();
     private final StringProperty keystore = new SimpleStringProperty("");
     private final BooleanProperty useSSL = new SimpleBooleanProperty();
-    private final StringProperty keyStorePasswordProperty =
-        new SimpleStringProperty("");
+    private final StringProperty keyStorePasswordProperty = new SimpleStringProperty("");
     private final StringProperty serverTimezone = new SimpleStringProperty("");
 
     private final JabRefFrame frame;
@@ -118,12 +117,10 @@ public SharedDatabaseLoginDialogViewModel(
 
         EasyBind.subscribe(
             selectedDBMSType,
-            selected ->
-                port.setValue(Integer.toString(selected.getDefaultPort()))
+            selected -> port.setValue(Integer.toString(selected.getDefaultPort()))
         );
 
-        Predicate<String> notEmpty = input ->
-            (input != null) && !input.trim().isEmpty();
+        Predicate<String> notEmpty = input -> (input != null) && !input.trim().isEmpty();
         Predicate<String> fileExists = input -> Files.exists(Path.of(input));
         Predicate<String> notEmptyAndfilesExist = notEmpty.and(fileExists);
 
@@ -143,10 +140,7 @@ public SharedDatabaseLoginDialogViewModel(
                 host,
                 notEmpty,
                 ValidationMessage.error(
-                    Localization.lang(
-                        "Required field \"%0\" is empty.",
-                        Localization.lang("Port")
-                    )
+                    Localization.lang("Required field \"%0\" is empty.", Localization.lang("Port"))
                 )
             );
         portValidator =
@@ -154,10 +148,7 @@ public SharedDatabaseLoginDialogViewModel(
                 port,
                 notEmpty,
                 ValidationMessage.error(
-                    Localization.lang(
-                        "Required field \"%0\" is empty.",
-                        Localization.lang("Host")
-                    )
+                    Localization.lang("Required field \"%0\" is empty.", Localization.lang("Host"))
                 )
             );
         userValidator =
@@ -165,55 +156,42 @@ public SharedDatabaseLoginDialogViewModel(
                 user,
                 notEmpty,
                 ValidationMessage.error(
-                    Localization.lang(
-                        "Required field \"%0\" is empty.",
-                        Localization.lang("User")
-                    )
+                    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.")
-                )
+                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.")
-                )
+                ValidationMessage.error(Localization.lang("Please enter a valid file path."))
             );
 
         formValidator = new CompositeValidator();
-        formValidator.addValidators(
-            databaseValidator,
-            hostValidator,
-            portValidator,
-            userValidator
-        );
+        formValidator.addValidators(databaseValidator, hostValidator, portValidator, userValidator);
 
         applyPreferences();
     }
 
     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())
-                .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())
+            .createDBMSConnectionProperties();
 
         setupKeyStore();
         return openSharedDatabase(connectionProperties);
@@ -221,16 +199,11 @@ public boolean openDatabase() {
 
     private void setupKeyStore() {
         System.setProperty("javax.net.ssl.trustStore", keystore.getValue());
-        System.setProperty(
-            "javax.net.ssl.trustStorePassword",
-            keyStorePasswordProperty.getValue()
-        );
+        System.setProperty("javax.net.ssl.trustStorePassword", keyStorePasswordProperty.getValue());
         System.setProperty("javax.net.debug", "ssl");
     }
 
-    private boolean openSharedDatabase(
-        DBMSConnectionProperties connectionProperties
-    ) {
+    private boolean openSharedDatabase(DBMSConnectionProperties connectionProperties) {
         if (isSharedDatabaseAlreadyPresent(connectionProperties)) {
             dialogService.showWarningDialogAndWait(
                 Localization.lang("Shared database connection"),
@@ -244,19 +217,16 @@ private boolean openSharedDatabase(
         if (autosave.get()) {
             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")
-                    );
+            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")
+                );
                 if (!overwriteFilePressed) {
                     return true;
                 }
@@ -276,9 +246,7 @@ private boolean openSharedDatabase(
                 undoManager,
                 taskExecutor
             );
-            LibraryTab libraryTab = manager.openNewSharedDatabaseTab(
-                connectionProperties
-            );
+            LibraryTab libraryTab = manager.openNewSharedDatabaseTab(connectionProperties);
             setPreferences();
 
             if (!folder.getValue().isEmpty() && autosave.get()) {
@@ -296,34 +264,24 @@ private boolean openSharedDatabase(
             }
 
             return true;
-        } catch (
-            SQLException | InvalidDBMSConnectionPropertiesException exception
-        ) {
-            dialogService.showErrorDialogAndWait(
-                Localization.lang("Connection error"),
-                exception
-            );
+        } catch (SQLException | InvalidDBMSConnectionPropertiesException exception) {
+            dialogService.showErrorDialogAndWait(Localization.lang("Connection error"), exception);
         } 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
-                );
+            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))
@@ -344,9 +302,7 @@ private boolean openSharedDatabase(
     }
 
     private void setPreferences() {
-        sharedDatabasePreferences.setType(
-            selectedDBMSType.getValue().toString()
-        );
+        sharedDatabasePreferences.setType(selectedDBMSType.getValue().toString());
         sharedDatabasePreferences.setHost(host.getValue());
         sharedDatabasePreferences.setPort(port.getValue());
         sharedDatabasePreferences.setName(database.getValue());
@@ -360,13 +316,8 @@ private void setPreferences() {
                 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
-                );
+            } 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
@@ -382,31 +333,19 @@ private void setPreferences() {
      * Fetches possibly saved data and configures the control elements respectively.
      */
     private void applyPreferences() {
-        Optional<String> sharedDatabaseType =
-            sharedDatabasePreferences.getType();
-        Optional<String> sharedDatabaseHost =
-            sharedDatabasePreferences.getHost();
-        Optional<String> sharedDatabasePort =
-            sharedDatabasePreferences.getPort();
-        Optional<String> sharedDatabaseName =
-            sharedDatabasePreferences.getName();
-        Optional<String> sharedDatabaseUser =
-            sharedDatabasePreferences.getUser();
-        Optional<String> sharedDatabasePassword =
-            sharedDatabasePreferences.getPassword();
-        boolean sharedDatabaseRememberPassword =
-            sharedDatabasePreferences.getRememberPassword();
-        Optional<String> sharedDatabaseFolder =
-            sharedDatabasePreferences.getFolder();
-        boolean sharedDatabaseAutosave =
-            sharedDatabasePreferences.getAutosave();
-        Optional<String> sharedDatabaseKeystoreFile =
-            sharedDatabasePreferences.getKeyStoreFile();
+        Optional<String> sharedDatabaseType = sharedDatabasePreferences.getType();
+        Optional<String> sharedDatabaseHost = sharedDatabasePreferences.getHost();
+        Optional<String> sharedDatabasePort = sharedDatabasePreferences.getPort();
+        Optional<String> sharedDatabaseName = sharedDatabasePreferences.getName();
+        Optional<String> sharedDatabaseUser = sharedDatabasePreferences.getUser();
+        Optional<String> sharedDatabasePassword = sharedDatabasePreferences.getPassword();
+        boolean sharedDatabaseRememberPassword = sharedDatabasePreferences.getRememberPassword();
+        Optional<String> sharedDatabaseFolder = sharedDatabasePreferences.getFolder();
+        boolean sharedDatabaseAutosave = sharedDatabasePreferences.getAutosave();
+        Optional<String> sharedDatabaseKeystoreFile = sharedDatabasePreferences.getKeyStoreFile();
 
         if (sharedDatabaseType.isPresent()) {
-            Optional<DBMSType> dbmsType = DBMSType.fromString(
-                sharedDatabaseType.get()
-            );
+            Optional<DBMSType> dbmsType = DBMSType.fromString(sharedDatabaseType.get());
             dbmsType.ifPresent(selectedDBMSType::set);
         }
 
@@ -417,9 +356,7 @@ private void applyPreferences() {
         sharedDatabaseKeystoreFile.ifPresent(keystore::set);
         useSSL.setValue(sharedDatabasePreferences.isUseSSL());
 
-        if (
-            sharedDatabasePassword.isPresent() && sharedDatabaseUser.isPresent()
-        ) {
+        if (sharedDatabasePassword.isPresent() && sharedDatabaseUser.isPresent()) {
             try {
                 password.setValue(
                     new Password(
@@ -428,13 +365,8 @@ private void applyPreferences() {
                     )
                         .decrypt()
                 );
-            } catch (
-                GeneralSecurityException | UnsupportedEncodingException e
-            ) {
-                LOGGER.error(
-                    "Could not read the password due to decryption problems.",
-                    e
-                );
+            } catch (GeneralSecurityException | UnsupportedEncodingException e) {
+                LOGGER.error("Could not read the password due to decryption problems.", e);
             }
         }
 
@@ -444,9 +376,7 @@ private void applyPreferences() {
         autosave.set(sharedDatabaseAutosave);
     }
 
-    private boolean isSharedDatabaseAlreadyPresent(
-        DBMSConnectionProperties connectionProperties
-    ) {
+    private boolean isSharedDatabaseAlreadyPresent(DBMSConnectionProperties connectionProperties) {
         List<LibraryTab> libraryTabs = frame.getLibraryTabs();
         return libraryTabs
             .parallelStream()
@@ -463,37 +393,23 @@ private boolean isSharedDatabaseAlreadyPresent(
     }
 
     public void showSaveDbToFileDialog() {
-        FileDialogConfiguration fileDialogConfiguration =
-            new FileDialogConfiguration.Builder()
-                .addExtensionFilter(StandardFileType.BIBTEX_DB)
-                .withDefaultExtension(StandardFileType.BIBTEX_DB)
-                .withInitialDirectory(
-                    preferencesService
-                        .getFilePreferences()
-                        .getWorkingDirectory()
-                )
-                .build();
-        Optional<Path> exportPath = dialogService.showFileSaveDialog(
-            fileDialogConfiguration
-        );
+        FileDialogConfiguration fileDialogConfiguration = new FileDialogConfiguration.Builder()
+            .addExtensionFilter(StandardFileType.BIBTEX_DB)
+            .withDefaultExtension(StandardFileType.BIBTEX_DB)
+            .withInitialDirectory(preferencesService.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(
-                    preferencesService
-                        .getFilePreferences()
-                        .getWorkingDirectory()
-                )
-                .build();
-        Optional<Path> keystorePath = dialogService.showFileOpenDialog(
-            fileDialogConfiguration
-        );
+        FileDialogConfiguration fileDialogConfiguration = new FileDialogConfiguration.Builder()
+            .addExtensionFilter(FileFilterConverter.ANY_FILE)
+            .addExtensionFilter(StandardFileType.JAVA_KEYSTORE)
+            .withDefaultExtension(StandardFileType.JAVA_KEYSTORE)
+            .withInitialDirectory(preferencesService.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 fac4bd13dde..fb4ec7bd39e 100644
--- a/src/main/java/org/jabref/gui/shared/SharedDatabaseUIManager.java
+++ b/src/main/java/org/jabref/gui/shared/SharedDatabaseUIManager.java
@@ -72,44 +72,29 @@ public SharedDatabaseUIManager(
 
     @Subscribe
     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 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
-            );
+        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)) {
                 frame.closeCurrentTab();
-                dialogService.showCustomDialogAndWait(
-                    new SharedDatabaseLoginDialogView(frame)
-                );
+                dialogService.showCustomDialogAndWait(new SharedDatabaseLoginDialogView(frame));
             } else if (answer.get().equals(workOffline)) {
-                connectionLostEvent
-                    .getBibDatabaseContext()
-                    .convertToLocalDatabase();
-                frame
-                    .getLibraryTabs()
-                    .forEach(tab -> tab.updateTabTitle(tab.isModified()));
+                connectionLostEvent.getBibDatabaseContext().convertToLocalDatabase();
+                frame.getLibraryTabs().forEach(tab -> tab.updateTabTitle(tab.isModified()));
                 dialogService.notify(Localization.lang("Working offline."));
             }
         } else {
@@ -125,49 +110,38 @@ public void listen(UpdateRefusedEvent updateRefusedEvent) {
         BibEntry sharedBibEntry = updateRefusedEvent.getSharedBibEntry();
 
         String message =
-            Localization.lang(
-                "Update could not be performed due to existing change conflicts."
-            ) +
+            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."
-            ) +
+            Localization.lang("You are not working on the newest version of BibEntry.") +
             "\r\n" +
             Localization.lang(
                 "Shared version: %0",
-                String.valueOf(
-                    sharedBibEntry.getSharedBibEntryData().getVersion()
-                )
+                String.valueOf(sharedBibEntry.getSharedBibEntryData().getVersion())
             ) +
             "\r\n" +
             Localization.lang(
                 "Local version: %0",
-                String.valueOf(
-                    localBibEntry.getSharedBibEntryData().getVersion()
-                )
+                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."
-            );
+            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
-            );
+        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(
@@ -183,14 +157,10 @@ public void listen(UpdateRefusedEvent updateRefusedEvent) {
             mergedEntry.ifPresent(mergedBibEntry -> {
                 mergedBibEntry
                     .getSharedBibEntryData()
-                    .setSharedID(
-                        sharedBibEntry.getSharedBibEntryData().getSharedID()
-                    );
+                    .setSharedID(sharedBibEntry.getSharedBibEntryData().getSharedID());
                 mergedBibEntry
                     .getSharedBibEntryData()
-                    .setVersion(
-                        sharedBibEntry.getSharedBibEntryData().getVersion()
-                    );
+                    .setVersion(sharedBibEntry.getSharedBibEntryData().getVersion());
 
                 dbmsSynchronizer.synchronizeSharedEntry(mergedBibEntry);
                 dbmsSynchronizer.synchronizeLocalDatabase();
@@ -205,16 +175,10 @@ public void listen(SharedEntriesNotPresentEvent event) {
 
         libraryTab
             .getUndoManager()
-            .addEdit(
-                new UndoableRemoveEntries(
-                    libraryTab.getDatabase(),
-                    event.getBibEntries()
-                )
-            );
+            .addEdit(new UndoableRemoveEntries(libraryTab.getDatabase(), event.getBibEntries()));
 
         if (
-            Objects.nonNull(entryEditor) &&
-            (event.getBibEntries().contains(entryEditor.getEntry()))
+            Objects.nonNull(entryEditor) && (event.getBibEntries().contains(entryEditor.getEntry()))
         ) {
             dialogService.showInformationDialogAndWait(
                 Localization.lang("Shared entry is no longer present"),
@@ -222,9 +186,7 @@ public void listen(SharedEntriesNotPresentEvent event) {
                     "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();
         }
@@ -236,30 +198,22 @@ public void listen(SharedEntriesNotPresentEvent event) {
      * @param dbmsConnectionProperties Connection data
      * @return BasePanel which also used by {@link SaveDatabaseAction}
      */
-    public LibraryTab openNewSharedDatabaseTab(
-        DBMSConnectionProperties dbmsConnectionProperties
-    )
+    public LibraryTab openNewSharedDatabaseTab(DBMSConnectionProperties dbmsConnectionProperties)
         throws SQLException, DatabaseNotSupportedException, InvalidDBMSConnectionPropertiesException {
         BibDatabaseContext bibDatabaseContext = new BibDatabaseContext();
         bibDatabaseContext.setMode(
-            preferencesService
-                .getLibraryPreferences()
-                .getDefaultBibDatabaseMode()
+            preferencesService.getLibraryPreferences().getDefaultBibDatabaseMode()
         );
         DBMSSynchronizer synchronizer = new DBMSSynchronizer(
             bibDatabaseContext,
             preferencesService.getBibEntryPreferences().getKeywordSeparator(),
-            preferencesService
-                .getCitationKeyPatternPreferences()
-                .getKeyPattern(),
+            preferencesService.getCitationKeyPatternPreferences().getKeyPattern(),
             fileUpdateMonitor
         );
         bibDatabaseContext.convertToSharedDatabase(synchronizer);
 
         dbmsSynchronizer = bibDatabaseContext.getDBMSSynchronizer();
-        dbmsSynchronizer.openSharedDatabase(
-            new DBMSConnection(dbmsConnectionProperties)
-        );
+        dbmsSynchronizer.openSharedDatabase(new DBMSConnection(dbmsConnectionProperties));
         dbmsSynchronizer.registerListener(this);
         dialogService.notify(
             Localization.lang(
@@ -294,23 +248,18 @@ public void openSharedDatabaseFromParserResult(ParserResult parserResult)
         }
 
         String sharedDatabaseID = sharedDatabaseIDOptional.get();
-        DBMSConnectionProperties dbmsConnectionProperties =
-            new DBMSConnectionProperties(
-                new SharedDatabasePreferences(sharedDatabaseID)
-            );
+        DBMSConnectionProperties dbmsConnectionProperties = new DBMSConnectionProperties(
+            new SharedDatabasePreferences(sharedDatabaseID)
+        );
 
         BibDatabaseContext bibDatabaseContext = new BibDatabaseContext();
         bibDatabaseContext.setMode(
-            preferencesService
-                .getLibraryPreferences()
-                .getDefaultBibDatabaseMode()
+            preferencesService.getLibraryPreferences().getDefaultBibDatabaseMode()
         );
         DBMSSynchronizer synchronizer = new DBMSSynchronizer(
             bibDatabaseContext,
             preferencesService.getBibEntryPreferences().getKeywordSeparator(),
-            preferencesService
-                .getCitationKeyPatternPreferences()
-                .getKeyPattern(),
+            preferencesService.getCitationKeyPatternPreferences().getKeyPattern(),
             fileUpdateMonitor
         );
         bibDatabaseContext.convertToSharedDatabase(synchronizer);
@@ -321,9 +270,7 @@ public void openSharedDatabaseFromParserResult(ParserResult parserResult)
         );
 
         dbmsSynchronizer = bibDatabaseContext.getDBMSSynchronizer();
-        dbmsSynchronizer.openSharedDatabase(
-            new DBMSConnection(dbmsConnectionProperties)
-        );
+        dbmsSynchronizer.openSharedDatabase(new DBMSConnection(dbmsConnectionProperties));
         dbmsSynchronizer.registerListener(this);
         parserResult.setDatabaseContext(bibDatabaseContext);
         dialogService.notify(
diff --git a/src/main/java/org/jabref/gui/sidepane/GroupsSidePaneComponent.java b/src/main/java/org/jabref/gui/sidepane/GroupsSidePaneComponent.java
index 8447f60d077..89954c0a9a1 100644
--- a/src/main/java/org/jabref/gui/sidepane/GroupsSidePaneComponent.java
+++ b/src/main/java/org/jabref/gui/sidepane/GroupsSidePaneComponent.java
@@ -25,13 +25,7 @@ public GroupsSidePaneComponent(
         GroupsPreferences groupsPreferences,
         DialogService dialogService
     ) {
-        super(
-            SidePaneType.GROUPS,
-            closeCommand,
-            moveUpCommand,
-            moveDownCommand,
-            contentFactory
-        );
+        super(SidePaneType.GROUPS, closeCommand, moveUpCommand, moveDownCommand, contentFactory);
         this.groupsPreferences = groupsPreferences;
         this.dialogService = dialogService;
         setupIntersectionUnionToggle();
@@ -40,21 +34,15 @@ public GroupsSidePaneComponent(
             groupsPreferences.groupViewModeProperty(),
             mode -> {
                 GroupModeViewModel modeViewModel = new GroupModeViewModel(mode);
-                intersectionUnionToggle.setGraphic(
-                    modeViewModel.getUnionIntersectionGraphic()
-                );
-                intersectionUnionToggle.setTooltip(
-                    modeViewModel.getUnionIntersectionTooltip()
-                );
+                intersectionUnionToggle.setGraphic(modeViewModel.getUnionIntersectionGraphic());
+                intersectionUnionToggle.setTooltip(modeViewModel.getUnionIntersectionTooltip());
             }
         );
     }
 
     private void setupIntersectionUnionToggle() {
         addExtraButtonToHeader(intersectionUnionToggle, 0);
-        intersectionUnionToggle.setOnAction(event ->
-            new ToggleUnionIntersectionAction().execute()
-        );
+        intersectionUnionToggle.setOnAction(event -> new ToggleUnionIntersectionAction().execute());
     }
 
     private class ToggleUnionIntersectionAction extends SimpleCommand {
@@ -65,14 +53,10 @@ public void execute() {
 
             if (mode == GroupViewMode.UNION) {
                 groupsPreferences.setGroupViewMode(GroupViewMode.INTERSECTION);
-                dialogService.notify(
-                    Localization.lang("Group view mode set to intersection")
-                );
+                dialogService.notify(Localization.lang("Group view mode set to intersection"));
             } else if (mode == GroupViewMode.INTERSECTION) {
                 groupsPreferences.setGroupViewMode(GroupViewMode.UNION);
-                dialogService.notify(
-                    Localization.lang("Group view mode set to union")
-                );
+                dialogService.notify(Localization.lang("Group view mode set to union"));
             }
         }
     }
diff --git a/src/main/java/org/jabref/gui/sidepane/SidePane.java b/src/main/java/org/jabref/gui/sidepane/SidePane.java
index 2ea44ba7785..a5a2c08e395 100644
--- a/src/main/java/org/jabref/gui/sidepane/SidePane.java
+++ b/src/main/java/org/jabref/gui/sidepane/SidePane.java
@@ -25,8 +25,7 @@ public class SidePane extends VBox {
 
     // These bindings need to be stored, otherwise they are garbage collected
     @SuppressWarnings("MismatchedQueryAndUpdateOfCollection")
-    private final Map<SidePaneType, BooleanBinding> visibleBindings =
-        new HashMap<>();
+    private final Map<SidePaneType, BooleanBinding> visibleBindings = new HashMap<>();
 
     public SidePane(
         LibraryTabContainer tabContainer,
diff --git a/src/main/java/org/jabref/gui/sidepane/SidePaneComponent.java b/src/main/java/org/jabref/gui/sidepane/SidePaneComponent.java
index c4aa87f6c51..74531f48569 100644
--- a/src/main/java/org/jabref/gui/sidepane/SidePaneComponent.java
+++ b/src/main/java/org/jabref/gui/sidepane/SidePaneComponent.java
@@ -42,12 +42,7 @@ private void initialize() {
         getStyleClass().add("sidePaneComponent");
         setTop(createHeaderView());
         setCenter(contentFactory.create(sidePaneType));
-        VBox.setVgrow(
-            this,
-            sidePaneType == SidePaneType.GROUPS
-                ? Priority.ALWAYS
-                : Priority.NEVER
-        );
+        VBox.setVgrow(this, sidePaneType == SidePaneType.GROUPS ? Priority.ALWAYS : Priority.NEVER);
     }
 
     private Node createHeaderView() {
@@ -60,9 +55,7 @@ private Node createHeaderView() {
         upButton.setOnAction(e -> moveUpCommand.execute());
 
         Button downButton = IconTheme.JabRefIcons.DOWN.asButton();
-        downButton.setTooltip(
-            new Tooltip(Localization.lang("Move panel down"))
-        );
+        downButton.setTooltip(new Tooltip(Localization.lang("Move panel down")));
         downButton.setOnAction(e -> moveDownCommand.execute());
 
         this.buttonContainer = new HBox();
diff --git a/src/main/java/org/jabref/gui/sidepane/SidePaneContentFactory.java b/src/main/java/org/jabref/gui/sidepane/SidePaneContentFactory.java
index f11a28f26c0..1d20498034b 100644
--- a/src/main/java/org/jabref/gui/sidepane/SidePaneContentFactory.java
+++ b/src/main/java/org/jabref/gui/sidepane/SidePaneContentFactory.java
@@ -69,11 +69,7 @@ public Node create(SidePaneType sidePaneType) {
                 undoManager
             )
                 .getContent();
-            case WEB_SEARCH -> new WebSearchPaneView(
-                preferences,
-                dialogService,
-                stateManager
-            );
+            case WEB_SEARCH -> new WebSearchPaneView(preferences, dialogService, stateManager);
         };
     }
 }
diff --git a/src/main/java/org/jabref/gui/sidepane/SidePaneViewModel.java b/src/main/java/org/jabref/gui/sidepane/SidePaneViewModel.java
index 42e546f5903..bc6053fe004 100644
--- a/src/main/java/org/jabref/gui/sidepane/SidePaneViewModel.java
+++ b/src/main/java/org/jabref/gui/sidepane/SidePaneViewModel.java
@@ -26,12 +26,9 @@
 
 public class SidePaneViewModel extends AbstractViewModel {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(
-        SidePaneViewModel.class
-    );
+    private static final Logger LOGGER = LoggerFactory.getLogger(SidePaneViewModel.class);
 
-    private final Map<SidePaneType, SidePaneComponent> sidePaneComponentLookup =
-        new HashMap<>();
+    private final Map<SidePaneType, SidePaneComponent> sidePaneComponentLookup = new HashMap<>();
 
     private final PreferencesService preferencesService;
     private final StateManager stateManager;
@@ -65,10 +62,7 @@ public SidePaneViewModel(
                 undoManager
             );
 
-        preferencesService
-            .getSidePanePreferences()
-            .visiblePanes()
-            .forEach(this::show);
+        preferencesService.getSidePanePreferences().visiblePanes().forEach(this::show);
         getPanes()
             .addListener(
                 (ListChangeListener<? super SidePaneType>) change -> {
@@ -126,9 +120,7 @@ private void updatePreferredPositions() {
         IntStream
             .range(0, getPanes().size())
             .forEach(i -> preferredPositions.put(getPanes().get(i), i));
-        preferencesService
-            .getSidePanePreferences()
-            .setPreferredPositions(preferredPositions);
+        preferencesService.getSidePanePreferences().setPreferredPositions(preferredPositions);
     }
 
     public void moveUp(SidePaneType pane) {
@@ -154,10 +146,7 @@ public void moveDown(SidePaneType pane) {
                 swap(getPanes(), currentPosition, newPosition);
                 updatePreferredPositions();
             } else {
-                LOGGER.debug(
-                    "SidePaneComponent {} is already at the top",
-                    pane.getTitle()
-                );
+                LOGGER.debug("SidePaneComponent {} is already at the top", pane.getTitle());
             }
         } else {
             LOGGER.warn("SidePaneComponent {} not visible", pane.getTitle());
@@ -167,12 +156,7 @@ public void moveDown(SidePaneType pane) {
     private void show(SidePaneType pane) {
         if (!getPanes().contains(pane)) {
             getPanes().add(pane);
-            getPanes()
-                .sort(
-                    new PreferredIndexSort(
-                        preferencesService.getSidePanePreferences()
-                    )
-                );
+            getPanes().sort(new PreferredIndexSort(preferencesService.getSidePanePreferences()));
         } else {
             LOGGER.warn("SidePaneComponent {} not visible", pane.getTitle());
         }
@@ -191,14 +175,12 @@ private <T> void swap(ObservableList<T> observableList, int i, int j) {
     /**
      * Helper class for sorting visible side panes based on their preferred position.
      */
-    protected static class PreferredIndexSort
-        implements Comparator<SidePaneType> {
+    protected static class PreferredIndexSort implements Comparator<SidePaneType> {
 
         private final Map<SidePaneType, Integer> preferredPositions;
 
         public PreferredIndexSort(SidePanePreferences sidePanePreferences) {
-            this.preferredPositions =
-                sidePanePreferences.getPreferredPositions();
+            this.preferredPositions = sidePanePreferences.getPreferredPositions();
         }
 
         @Override
diff --git a/src/main/java/org/jabref/gui/sidepane/TogglePaneAction.java b/src/main/java/org/jabref/gui/sidepane/TogglePaneAction.java
index 399adf0c2c4..334b08c0214 100644
--- a/src/main/java/org/jabref/gui/sidepane/TogglePaneAction.java
+++ b/src/main/java/org/jabref/gui/sidepane/TogglePaneAction.java
@@ -26,11 +26,7 @@ public void execute() {
             stateManager.getVisibleSidePaneComponents().add(pane);
             stateManager
                 .getVisibleSidePaneComponents()
-                .sort(
-                    new SidePaneViewModel.PreferredIndexSort(
-                        sidePanePreferences
-                    )
-                );
+                .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 141530c272f..74affe4fb4f 100644
--- a/src/main/java/org/jabref/gui/slr/EditExistingStudyAction.java
+++ b/src/main/java/org/jabref/gui/slr/EditExistingStudyAction.java
@@ -16,17 +16,12 @@
 
 public class EditExistingStudyAction extends SimpleCommand {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(
-        EditExistingStudyAction.class
-    );
+    private static final Logger LOGGER = LoggerFactory.getLogger(EditExistingStudyAction.class);
 
     private final DialogService dialogService;
     private final StateManager stateManager;
 
-    public EditExistingStudyAction(
-        DialogService dialogService,
-        StateManager stateManager
-    ) {
+    public EditExistingStudyAction(DialogService dialogService, StateManager stateManager) {
         this.dialogService = dialogService;
         this.stateManager = stateManager;
         this.executable.bind(ActionHelper.needsStudyDatabase(stateManager));
@@ -42,9 +37,7 @@ public void execute() {
         ) {
             return;
         }
-        BibDatabaseContext bibDatabaseContext = stateManager
-            .getActiveDatabase()
-            .get();
+        BibDatabaseContext bibDatabaseContext = stateManager.getActiveDatabase().get();
 
         // The action can only be called on an existing AND saved study library
         // The saving is ensured at creation of a study library
@@ -63,21 +56,14 @@ public void execute() {
             study =
                 new StudyYamlParser()
                     .parseStudyYamlFile(
-                        studyDirectory.resolve(
-                            StudyRepository.STUDY_DEFINITION_FILE_NAME
-                        )
+                        studyDirectory.resolve(StudyRepository.STUDY_DEFINITION_FILE_NAME)
                     );
         } catch (IOException e) {
-            dialogService.showErrorDialogAndWait(
-                Localization.lang("Error opening file"),
-                e
-            );
+            dialogService.showErrorDialogAndWait(Localization.lang("Error opening file"), e);
             return;
         }
 
         // When the dialog returns, the study.yml file is updated (or kept unmodified at Cancel)
-        dialogService.showCustomDialogAndWait(
-            new ManageStudyDefinitionView(study, studyDirectory)
-        );
+        dialogService.showCustomDialogAndWait(new ManageStudyDefinitionView(study, studyDirectory));
     }
 }
diff --git a/src/main/java/org/jabref/gui/slr/ExistingStudySearchAction.java b/src/main/java/org/jabref/gui/slr/ExistingStudySearchAction.java
index a08f1ae300a..51c9e2acd8c 100644
--- a/src/main/java/org/jabref/gui/slr/ExistingStudySearchAction.java
+++ b/src/main/java/org/jabref/gui/slr/ExistingStudySearchAction.java
@@ -24,9 +24,7 @@
 
 public class ExistingStudySearchAction extends SimpleCommand {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(
-        ExistingStudySearchAction.class
-    );
+    private static final Logger LOGGER = LoggerFactory.getLogger(ExistingStudySearchAction.class);
 
     protected final DialogService dialogService;
 
@@ -93,16 +91,13 @@ public void execute() {
             LOGGER.error("Database is not present, even if it should");
             return;
         }
-        BibDatabaseContext bibDatabaseContext = stateManager
-            .getActiveDatabase()
-            .get();
+        BibDatabaseContext bibDatabaseContext = stateManager.getActiveDatabase().get();
 
         if (bibDatabaseContext.getDatabasePath().isEmpty()) {
             LOGGER.error("Database path is not present, even if it should");
             return;
         }
-        this.studyDirectory =
-            bibDatabaseContext.getDatabasePath().get().getParent();
+        this.studyDirectory = bibDatabaseContext.getDatabasePath().get().getParent();
 
         crawl();
     }
@@ -131,9 +126,7 @@ protected void crawl() {
         } 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."
-                ),
+                Localization.lang("Error during reading of study definition file."),
                 e
             );
             return;
@@ -148,19 +141,14 @@ protected void crawl() {
             .onFailure(e -> {
                 LOGGER.error("Error during persistence of crawling results.");
                 dialogService.showErrorDialogAndWait(
-                    Localization.lang(
-                        "Error during persistence of crawling results."
-                    ),
+                    Localization.lang("Error during persistence of crawling results."),
                     e
                 );
             })
             .onSuccess(unused -> {
                 dialogService.notify(Localization.lang("Finished Searching"));
                 openDatabaseAction.openFile(
-                    Path.of(
-                        this.studyDirectory.toString(),
-                        Crawler.FILENAME_STUDY_RESULT_BIB
-                    )
+                    Path.of(this.studyDirectory.toString(), Crawler.FILENAME_STUDY_RESULT_BIB)
                 );
             })
             .executeWith(taskExecutor);
@@ -169,8 +157,7 @@ protected void crawl() {
     /**
      * Hook for setting up the crawl phase (e.g., initialization the repository)
      */
-    protected void crawlPreparation(Path studyRepositoryRoot)
-        throws IOException, GitAPIException {
+    protected void crawlPreparation(Path studyRepositoryRoot) throws IOException, GitAPIException {
         // Do nothing with the repository as repository is already setup
 
         // The user focused an SLR
diff --git a/src/main/java/org/jabref/gui/slr/ManageStudyDefinitionView.java b/src/main/java/org/jabref/gui/slr/ManageStudyDefinitionView.java
index d4f9015ac4e..6587ecbeeb6 100644
--- a/src/main/java/org/jabref/gui/slr/ManageStudyDefinitionView.java
+++ b/src/main/java/org/jabref/gui/slr/ManageStudyDefinitionView.java
@@ -38,12 +38,9 @@
  * This class controls the user interface of the study definition management dialog. The UI elements and their layout
  * are defined in the FXML file.
  */
-public class ManageStudyDefinitionView
-    extends BaseDialog<SlrStudyAndDirectory> {
+public class ManageStudyDefinitionView extends BaseDialog<SlrStudyAndDirectory> {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(
-        ManageStudyDefinitionView.class
-    );
+    private static final Logger LOGGER = LoggerFactory.getLogger(ManageStudyDefinitionView.class);
 
     @FXML
     private TextField studyTitle;
@@ -160,8 +157,7 @@ public ManageStudyDefinitionView(Study study, Path studyDirectory) {
     }
 
     private void setupSaveSurveyButton(boolean isEdit) {
-        Button saveSurveyButton = (Button) this.getDialogPane()
-            .lookupButton(saveSurveyButtonType);
+        Button saveSurveyButton = (Button) this.getDialogPane().lookupButton(saveSurveyButtonType);
 
         if (!isEdit) {
             saveSurveyButton.setText(Localization.lang("Start survey"));
@@ -220,9 +216,7 @@ private void initialize() {
 
         // Listen whether any catalogs are removed from selection -> Add back to the catalog selector
         studyTitle.textProperty().bindBidirectional(viewModel.titleProperty());
-        studyDirectory
-            .textProperty()
-            .bindBidirectional(viewModel.getDirectory());
+        studyDirectory.textProperty().bindBidirectional(viewModel.getDirectory());
 
         initAuthorTab();
         initQuestionsTab();
@@ -237,11 +231,7 @@ private void initAuthorTab() {
             authorsColumn,
             authorsActionColumn
         );
-        setupCellFactories(
-            authorsColumn,
-            authorsActionColumn,
-            viewModel::deleteAuthor
-        );
+        setupCellFactories(authorsColumn, authorsActionColumn, viewModel::deleteAuthor);
         authorTableView.setItems(viewModel.getAuthors());
     }
 
@@ -252,11 +242,7 @@ private void initQuestionsTab() {
             questionsColumn,
             questionsActionColumn
         );
-        setupCellFactories(
-            questionsColumn,
-            questionsActionColumn,
-            viewModel::deleteQuestion
-        );
+        setupCellFactories(questionsColumn, questionsActionColumn, viewModel::deleteQuestion);
         questionTableView.setItems(viewModel.getResearchQuestions());
     }
 
@@ -267,22 +253,14 @@ private void initQueriesTab() {
             queriesColumn,
             queriesActionColumn
         );
-        setupCellFactories(
-            queriesColumn,
-            queriesActionColumn,
-            viewModel::deleteQuery
-        );
+        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("Query terms are separated by spaces."))
                     .add(
                         Localization.lang(
                             "All query terms are joined using the logical AND, and OR operators"
@@ -318,17 +296,11 @@ private void initCatalogsTab() {
 
         catalogEnabledColumn.setResizable(false);
         catalogEnabledColumn.setReorderable(false);
-        catalogEnabledColumn.setCellFactory(
-            CheckBoxTableCell.forTableColumn(catalogEnabledColumn)
-        );
-        catalogEnabledColumn.setCellValueFactory(param ->
-            param.getValue().enabledProperty()
-        );
+        catalogEnabledColumn.setCellFactory(CheckBoxTableCell.forTableColumn(catalogEnabledColumn));
+        catalogEnabledColumn.setCellValueFactory(param -> param.getValue().enabledProperty());
 
         catalogColumn.setEditable(false);
-        catalogColumn.setCellValueFactory(param ->
-            param.getValue().nameProperty()
-        );
+        catalogColumn.setCellValueFactory(param -> param.getValue().nameProperty());
 
         catalogTable.setItems(viewModel.getCatalogs());
     }
@@ -356,16 +328,10 @@ private void setupCellFactories(
         TableColumn<String, String> actionColumn,
         Consumer<String> removeAction
     ) {
-        contentColumn.setCellValueFactory(param ->
-            new SimpleStringProperty(param.getValue())
-        );
-        actionColumn.setCellValueFactory(param ->
-            new SimpleStringProperty(param.getValue())
-        );
+        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()
-            )
+            .withGraphic(item -> IconTheme.JabRefIcons.DELETE_ENTRY.getGraphicNode())
             .withTooltip(name -> Localization.lang("Remove"))
             .withOnMouseClickedEvent(item -> evt -> removeAction.accept(item))
             .install(actionColumn);
@@ -397,9 +363,7 @@ public void selectStudyDirectory() {
                 .build();
 
         viewModel.setStudyDirectory(
-            dialogService.showDirectorySelectionDialog(
-                directoryDialogConfiguration
-            )
+            dialogService.showDirectorySelectionDialog(directoryDialogConfiguration)
         );
     }
 }
diff --git a/src/main/java/org/jabref/gui/slr/ManageStudyDefinitionViewModel.java b/src/main/java/org/jabref/gui/slr/ManageStudyDefinitionViewModel.java
index f0213b13564..2126e027cec 100644
--- a/src/main/java/org/jabref/gui/slr/ManageStudyDefinitionViewModel.java
+++ b/src/main/java/org/jabref/gui/slr/ManageStudyDefinitionViewModel.java
@@ -51,14 +51,10 @@ public class ManageStudyDefinitionViewModel {
     );
 
     private final StringProperty title = new SimpleStringProperty();
-    private final ObservableList<String> authors =
-        FXCollections.observableArrayList();
-    private final ObservableList<String> researchQuestions =
-        FXCollections.observableArrayList();
-    private final ObservableList<String> queries =
-        FXCollections.observableArrayList();
-    private final ObservableList<StudyCatalogItem> databases =
-        FXCollections.observableArrayList();
+    private final ObservableList<String> authors = FXCollections.observableArrayList();
+    private final ObservableList<String> researchQuestions = FXCollections.observableArrayList();
+    private final ObservableList<String> queries = FXCollections.observableArrayList();
+    private final ObservableList<StudyCatalogItem> databases = FXCollections.observableArrayList();
 
     // Hold the complement of databases for the selector
     private final SimpleStringProperty directory = new SimpleStringProperty();
@@ -75,17 +71,12 @@ public ManageStudyDefinitionViewModel(
     ) {
         databases.addAll(
             WebFetchers
-                .getSearchBasedFetchers(
-                    importFormatPreferences,
-                    importerPreferences
-                )
+                .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)
-                )
+                .filter(name -> !name.equals(CompositeSearchBasedFetcher.FETCHER_NAME))
                 .map(name -> {
                     boolean enabled = DEFAULT_SELECTION.contains(name);
                     return new StudyCatalogItem(name, enabled);
@@ -112,27 +103,18 @@ public ManageStudyDefinitionViewModel(
         authors.addAll(Objects.requireNonNull(study).getAuthors());
         title.setValue(study.getTitle());
         researchQuestions.addAll(study.getResearchQuestions());
-        queries.addAll(
-            study.getQueries().stream().map(StudyQuery::getQuery).toList()
-        );
+        queries.addAll(study.getQueries().stream().map(StudyQuery::getQuery).toList());
         List<StudyDatabase> studyDatabases = study.getDatabases();
         databases.addAll(
             WebFetchers
-                .getSearchBasedFetchers(
-                    importFormatPreferences,
-                    importerPreferences
-                )
+                .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)
-                )
+                .filter(name -> !name.equals(CompositeSearchBasedFetcher.FETCHER_NAME))
                 .map(name -> {
-                    boolean enabled = studyDatabases.contains(
-                        new StudyDatabase(name, true)
-                    );
+                    boolean enabled = studyDatabases.contains(new StudyDatabase(name, true));
                     return new StudyCatalogItem(name, enabled);
                 })
                 .toList()
@@ -174,10 +156,7 @@ public void addAuthor(String author) {
     }
 
     public void addResearchQuestion(String researchQuestion) {
-        if (
-            researchQuestion.isBlank() ||
-            researchQuestions.contains(researchQuestion)
-        ) {
+        if (researchQuestion.isBlank() || researchQuestions.contains(researchQuestion)) {
             return;
         }
         researchQuestions.add(researchQuestion);
@@ -199,10 +178,7 @@ public SlrStudyAndDirectory saveStudy() {
             databases
                 .stream()
                 .map(studyDatabaseItem ->
-                    new StudyDatabase(
-                        studyDatabaseItem.getName(),
-                        studyDatabaseItem.isEnabled()
-                    )
+                    new StudyDatabase(studyDatabaseItem.getName(), studyDatabaseItem.isEnabled())
                 )
                 .filter(StudyDatabase::isEnabled)
                 .collect(Collectors.toList())
@@ -212,15 +188,9 @@ public SlrStudyAndDirectory saveStudy() {
         try {
             studyDirectory = Path.of(studyDirectoryAsString);
         } catch (InvalidPathException e) {
-            LOGGER.error(
-                "Invalid path was provided: {}",
-                studyDirectoryAsString
-            );
+            LOGGER.error("Invalid path was provided: {}", studyDirectoryAsString);
             dialogService.notify(
-                Localization.lang(
-                    "Unable to write to %0.",
-                    studyDirectoryAsString
-                )
+                Localization.lang("Unable to write to %0.", studyDirectoryAsString)
             );
             // We do not assume another path - we return that there is an invalid object.
             return null;
@@ -229,18 +199,11 @@ public SlrStudyAndDirectory saveStudy() {
             StudyRepository.STUDY_DEFINITION_FILE_NAME
         );
         try {
-            new StudyYamlParser()
-                .writeStudyYamlFile(study, studyDefinitionFile);
+            new StudyYamlParser().writeStudyYamlFile(study, studyDefinitionFile);
         } catch (IOException e) {
-            LOGGER.error(
-                "Could not write study file {}",
-                studyDefinitionFile,
-                e
-            );
+            LOGGER.error("Could not write study file {}", studyDefinitionFile, e);
             dialogService.notify(
-                Localization.lang("Please enter a valid file path.") +
-                ": " +
-                studyDirectoryAsString
+                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;
@@ -256,9 +219,7 @@ public SlrStudyAndDirectory saveStudy() {
                 e
             );
             dialogService.notify(
-                Localization.lang("Please enter a valid file path.") +
-                ": " +
-                studyDirectory
+                Localization.lang("Please enter a valid file path.") + ": " + studyDirectory
             );
             // We continue nevertheless as the directory itself could be valid
         }
diff --git a/src/main/java/org/jabref/gui/slr/StartNewStudyAction.java b/src/main/java/org/jabref/gui/slr/StartNewStudyAction.java
index 70cfa629a2d..6b78fc0b1ef 100644
--- a/src/main/java/org/jabref/gui/slr/StartNewStudyAction.java
+++ b/src/main/java/org/jabref/gui/slr/StartNewStudyAction.java
@@ -30,9 +30,7 @@
  */
 public class StartNewStudyAction extends ExistingStudySearchAction {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(
-        StartNewStudyAction.class
-    );
+    private static final Logger LOGGER = LoggerFactory.getLogger(StartNewStudyAction.class);
 
     Study newStudy;
 
@@ -56,34 +54,27 @@ public StartNewStudyAction(
     }
 
     @Override
-    protected void crawlPreparation(Path studyRepositoryRoot)
-        throws IOException, GitAPIException {
+    protected void crawlPreparation(Path studyRepositoryRoot) throws IOException, GitAPIException {
         StudyYamlParser studyYAMLParser = new StudyYamlParser();
         studyYAMLParser.writeStudyYamlFile(
             newStudy,
-            studyRepositoryRoot.resolve(
-                StudyRepository.STUDY_DEFINITION_FILE_NAME
-            )
+            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 "Initial commit" should also contain the created YAML.
         // Thus, we append to that commit.
-        new GitHandler(studyRepositoryRoot)
-            .createCommitOnCurrentBranch("Initial commit", true);
+        new GitHandler(studyRepositoryRoot).createCommitOnCurrentBranch("Initial commit", true);
     }
 
     @Override
     public void execute() {
-        Optional<SlrStudyAndDirectory> studyAndDirectory =
-            dialogService.showCustomDialogAndWait(
-                new ManageStudyDefinitionView(
-                    preferencesService
-                        .getFilePreferences()
-                        .getWorkingDirectory()
-                )
-            );
+        Optional<SlrStudyAndDirectory> studyAndDirectory = dialogService.showCustomDialogAndWait(
+            new ManageStudyDefinitionView(
+                preferencesService.getFilePreferences().getWorkingDirectory()
+            )
+        );
         if (studyAndDirectory.isEmpty()) {
             return;
         }
@@ -92,9 +83,7 @@ public void execute() {
             LOGGER.error("Study directory is blank");
             // This branch probably is never taken
             // Thus, we re-use existing localization
-            dialogService.showErrorDialogAndWait(
-                Localization.lang("Must not be empty!")
-            );
+            dialogService.showErrorDialogAndWait(Localization.lang("Must not be empty!"));
             return;
         }
         studyDirectory = studyAndDirectory.get().getStudyDirectory();
diff --git a/src/main/java/org/jabref/gui/slr/StudyCatalogItem.java b/src/main/java/org/jabref/gui/slr/StudyCatalogItem.java
index c2c763ecc0b..6eb9be8bd44 100644
--- a/src/main/java/org/jabref/gui/slr/StudyCatalogItem.java
+++ b/src/main/java/org/jabref/gui/slr/StudyCatalogItem.java
@@ -46,14 +46,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
diff --git a/src/main/java/org/jabref/gui/specialfields/SpecialFieldAction.java b/src/main/java/org/jabref/gui/specialfields/SpecialFieldAction.java
index aa5ced02ee1..f5cf1c4767e 100644
--- a/src/main/java/org/jabref/gui/specialfields/SpecialFieldAction.java
+++ b/src/main/java/org/jabref/gui/specialfields/SpecialFieldAction.java
@@ -23,9 +23,7 @@
 
 public class SpecialFieldAction extends SimpleCommand {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(
-        SpecialFieldAction.class
-    );
+    private static final Logger LOGGER = LoggerFactory.getLogger(SpecialFieldAction.class);
     private final JabRefFrame frame;
     private final SpecialField specialField;
     private final String value;
@@ -81,9 +79,7 @@ public void execute() {
                     nullFieldIfValueIsTheSame
                 );
 
-                change.ifPresent(fieldChange ->
-                    ce.addEdit(new UndoableFieldChange(fieldChange))
-                );
+                change.ifPresent(fieldChange -> ce.addEdit(new UndoableFieldChange(fieldChange)));
             }
             ce.end();
             if (ce.hasEdits()) {
@@ -92,15 +88,9 @@ public void execute() {
                 frame.getCurrentLibraryTab().updateEntryEditorIfShowing();
                 String outText;
                 if (nullFieldIfValueIsTheSame || value == null) {
-                    outText =
-                        getTextDone(specialField, Integer.toString(bes.size()));
+                    outText = getTextDone(specialField, Integer.toString(bes.size()));
                 } else {
-                    outText =
-                        getTextDone(
-                            specialField,
-                            value,
-                            Integer.toString(bes.size())
-                        );
+                    outText = getTextDone(specialField, value, Integer.toString(bes.size()));
                 }
                 dialogService.notify(outText);
             }
@@ -119,11 +109,7 @@ private String getTextDone(SpecialField field, String... params) {
             undoManager
         );
 
-        if (
-            field.isSingleValueField() &&
-            (params.length == 1) &&
-            (params[0] != null)
-        ) {
+        if (field.isSingleValueField() && (params.length == 1) && (params[0] != null)) {
             // Single value fields can be toggled only
             return Localization.lang(
                 "Toggled '%0' for %1 entries",
@@ -137,20 +123,9 @@ private String getTextDone(SpecialField field, String... params) {
             (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)
-        ) {
+            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",
diff --git a/src/main/java/org/jabref/gui/specialfields/SpecialFieldMenuItemFactory.java b/src/main/java/org/jabref/gui/specialfields/SpecialFieldMenuItemFactory.java
index f3b62857e86..b7692792a28 100644
--- a/src/main/java/org/jabref/gui/specialfields/SpecialFieldMenuItemFactory.java
+++ b/src/main/java/org/jabref/gui/specialfields/SpecialFieldMenuItemFactory.java
@@ -24,25 +24,17 @@ public static MenuItem getSpecialFieldSingleItem(
         UndoManager undoManager,
         StateManager stateManager
     ) {
-        SpecialFieldValueViewModel specialField =
-            new SpecialFieldValueViewModel(field.getValues().get(0));
+        SpecialFieldValueViewModel specialField = new SpecialFieldValueViewModel(
+            field.getValues().get(0)
+        );
         MenuItem menuItem = factory.createMenuItem(
             specialField.getAction(),
             new SpecialFieldViewModel(field, preferencesService, undoManager)
-                .getSpecialFieldAction(
-                    field.getValues().get(0),
-                    frame,
-                    dialogService,
-                    stateManager
-                )
+                .getSpecialFieldAction(field.getValues().get(0), frame, dialogService, stateManager)
         );
         menuItem
             .visibleProperty()
-            .bind(
-                preferencesService
-                    .getSpecialFieldsPreferences()
-                    .specialFieldsEnabledProperty()
-            );
+            .bind(preferencesService.getSpecialFieldsPreferences().specialFieldsEnabledProperty());
         return menuItem;
     }
 
@@ -61,11 +53,7 @@ public static Menu createSpecialFieldMenu(
             preferencesService,
             undoManager,
             specialField ->
-                new SpecialFieldViewModel(
-                    field,
-                    preferencesService,
-                    undoManager
-                )
+                new SpecialFieldViewModel(field, preferencesService, undoManager)
                     .getSpecialFieldAction(
                         specialField.getValue(),
                         frame,
@@ -90,8 +78,7 @@ public static Menu createSpecialFieldMenu(
         Menu menu = factory.createMenu(viewModel.getAction());
 
         for (SpecialFieldValue Value : field.getValues()) {
-            SpecialFieldValueViewModel valueViewModel =
-                new SpecialFieldValueViewModel(Value);
+            SpecialFieldValueViewModel valueViewModel = new SpecialFieldValueViewModel(Value);
             menu
                 .getItems()
                 .add(
@@ -104,11 +91,7 @@ public static Menu createSpecialFieldMenu(
 
         menu
             .visibleProperty()
-            .bind(
-                preferencesService
-                    .getSpecialFieldsPreferences()
-                    .specialFieldsEnabledProperty()
-            );
+            .bind(preferencesService.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 6df1ae372bd..0ea1434ace0 100644
--- a/src/main/java/org/jabref/gui/specialfields/SpecialFieldValueViewModel.java
+++ b/src/main/java/org/jabref/gui/specialfields/SpecialFieldValueViewModel.java
@@ -43,9 +43,7 @@ public String getToolTipText() {
             case RANK_3 -> Localization.lang("Three stars");
             case RANK_4 -> Localization.lang("Four stars");
             case RANK_5 -> Localization.lang("Five stars");
-            case CLEAR_READ_STATUS -> Localization.lang(
-                "No read status information"
-            );
+            case CLEAR_READ_STATUS -> Localization.lang("No read status information");
             case READ -> Localization.lang("Read status read");
             case SKIMMED -> Localization.lang("Read status skimmed");
             case RELEVANT -> Localization.lang("Toggle relevance");
diff --git a/src/main/java/org/jabref/gui/specialfields/SpecialFieldViewModel.java b/src/main/java/org/jabref/gui/specialfields/SpecialFieldViewModel.java
index 6b3a8210dd9..0dba82cb7bd 100644
--- a/src/main/java/org/jabref/gui/specialfields/SpecialFieldViewModel.java
+++ b/src/main/java/org/jabref/gui/specialfields/SpecialFieldViewModel.java
@@ -90,10 +90,7 @@ public List<SpecialFieldValueViewModel> getValues() {
             .collect(Collectors.toList());
     }
 
-    public void setSpecialFieldValue(
-        BibEntry bibEntry,
-        SpecialFieldValue value
-    ) {
+    public void setSpecialFieldValue(BibEntry bibEntry, SpecialFieldValue value) {
         Optional<FieldChange> change = UpdateField.updateField(
             bibEntry,
             getField(),
@@ -101,9 +98,7 @@ public void setSpecialFieldValue(
             getField().isSingleValueField()
         );
 
-        change.ifPresent(fieldChange ->
-            undoManager.addEdit(new UndoableFieldChange(fieldChange))
-        );
+        change.ifPresent(fieldChange -> undoManager.addEdit(new UndoableFieldChange(fieldChange)));
     }
 
     public void toggle(BibEntry entry) {
diff --git a/src/main/java/org/jabref/gui/specialfields/SpecialFieldsPreferences.java b/src/main/java/org/jabref/gui/specialfields/SpecialFieldsPreferences.java
index a59bef6bfd1..ee015786a0d 100644
--- a/src/main/java/org/jabref/gui/specialfields/SpecialFieldsPreferences.java
+++ b/src/main/java/org/jabref/gui/specialfields/SpecialFieldsPreferences.java
@@ -10,8 +10,7 @@ public class SpecialFieldsPreferences {
     private final BooleanProperty specialFieldsEnabled;
 
     public SpecialFieldsPreferences(boolean specialFieldsEnabled) {
-        this.specialFieldsEnabled =
-            new SimpleBooleanProperty(specialFieldsEnabled);
+        this.specialFieldsEnabled = new SimpleBooleanProperty(specialFieldsEnabled);
     }
 
     public boolean isSpecialFieldsEnabled() {
diff --git a/src/main/java/org/jabref/gui/texparser/CitationsDisplay.java b/src/main/java/org/jabref/gui/texparser/CitationsDisplay.java
index 5b3e2d9477d..546f1ba798d 100644
--- a/src/main/java/org/jabref/gui/texparser/CitationsDisplay.java
+++ b/src/main/java/org/jabref/gui/texparser/CitationsDisplay.java
@@ -42,34 +42,20 @@ private Node getDisplayGraphic(Citation item) {
             basePath.set(item.getPath().getRoot());
         }
 
-        Node citationIcon =
-            IconTheme.JabRefIcons.LATEX_COMMENT.getGraphicNode();
-        Text contextText = new Text(
-            LatexToUnicodeAdapter.format(item.getContext())
-        );
-        contextText
-            .wrappingWidthProperty()
-            .bind(this.widthProperty().subtract(85));
+        Node citationIcon = IconTheme.JabRefIcons.LATEX_COMMENT.getGraphicNode();
+        Text contextText = new Text(LatexToUnicodeAdapter.format(item.getContext()));
+        contextText.wrappingWidthProperty().bind(this.widthProperty().subtract(85));
         HBox contextBox = new HBox(8, citationIcon, contextText);
         contextBox.getStyleClass().add("contextBox");
 
         Label fileNameLabel = new Label(
             String.format("%s", basePath.get().relativize(item.getPath()))
         );
-        fileNameLabel.setGraphic(
-            IconTheme.JabRefIcons.LATEX_FILE.getGraphicNode()
-        );
+        fileNameLabel.setGraphic(IconTheme.JabRefIcons.LATEX_FILE.getGraphicNode());
         Label positionLabel = new Label(
-            String.format(
-                "(%s:%s-%s)",
-                item.getLine(),
-                item.getColStart(),
-                item.getColEnd()
-            )
-        );
-        positionLabel.setGraphic(
-            IconTheme.JabRefIcons.LATEX_LINE.getGraphicNode()
+            String.format("(%s:%s-%s)", item.getLine(), item.getColStart(), item.getColEnd())
         );
+        positionLabel.setGraphic(IconTheme.JabRefIcons.LATEX_LINE.getGraphicNode());
         HBox dataBox = new HBox(5, fileNameLabel, positionLabel);
 
         return new VBox(contextBox, dataBox);
diff --git a/src/main/java/org/jabref/gui/texparser/ParseLatexAction.java b/src/main/java/org/jabref/gui/texparser/ParseLatexAction.java
index d8af43dbaaa..a511623f966 100644
--- a/src/main/java/org/jabref/gui/texparser/ParseLatexAction.java
+++ b/src/main/java/org/jabref/gui/texparser/ParseLatexAction.java
@@ -18,14 +18,10 @@ public ParseLatexAction(StateManager stateManager) {
 
     @Override
     public void execute() {
-        DialogService dialogService = Injector.instantiateModelOrService(
-            DialogService.class
-        );
+        DialogService dialogService = Injector.instantiateModelOrService(DialogService.class);
         BibDatabaseContext database = stateManager
             .getActiveDatabase()
             .orElseThrow(NullPointerException::new);
-        dialogService.showCustomDialogAndWait(
-            new ParseLatexDialogView(database)
-        );
+        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 48ff82026c0..a73fc0957d2 100644
--- a/src/main/java/org/jabref/gui/texparser/ParseLatexDialogView.java
+++ b/src/main/java/org/jabref/gui/texparser/ParseLatexDialogView.java
@@ -86,8 +86,7 @@ public ParseLatexDialogView(BibDatabaseContext databaseContext) {
             getDialogPane(),
             event -> viewModel.parseButtonClicked()
         );
-        Button parseButton = (Button) getDialogPane()
-            .lookupButton(parseButtonType);
+        Button parseButton = (Button) getDialogPane().lookupButton(parseButtonType);
         parseButton
             .disableProperty()
             .bind(
@@ -110,22 +109,14 @@ private void initialize() {
                 fileMonitor
             );
 
-        fileTreeView
-            .getSelectionModel()
-            .setSelectionMode(SelectionMode.MULTIPLE);
-        fileTreeView
-            .showRootProperty()
-            .bindBidirectional(viewModel.successfulSearchProperty());
+        fileTreeView.getSelectionModel().setSelectionMode(SelectionMode.MULTIPLE);
+        fileTreeView.showRootProperty().bindBidirectional(viewModel.successfulSearchProperty());
         fileTreeView
             .rootProperty()
             .bind(
                 EasyBind.map(
                     viewModel.rootProperty(),
-                    fileNode ->
-                        new RecursiveTreeItem<>(
-                            fileNode,
-                            FileNodeViewModel::getChildren
-                        )
+                    fileNode -> new RecursiveTreeItem<>(fileNode, FileNodeViewModel::getChildren)
                 )
             );
 
@@ -153,21 +144,13 @@ private void initialize() {
             viewModel.latexDirectoryValidation(),
             latexDirectoryField
         );
-        browseButton
-            .disableProperty()
-            .bindBidirectional(viewModel.searchInProgressProperty());
+        browseButton.disableProperty().bindBidirectional(viewModel.searchInProgressProperty());
         searchButton
             .disableProperty()
             .bind(viewModel.latexDirectoryValidation().validProperty().not());
-        selectAllButton
-            .disableProperty()
-            .bindBidirectional(viewModel.noFilesFoundProperty());
-        unselectAllButton
-            .disableProperty()
-            .bindBidirectional(viewModel.noFilesFoundProperty());
-        progressIndicator
-            .visibleProperty()
-            .bindBidirectional(viewModel.searchInProgressProperty());
+        selectAllButton.disableProperty().bindBidirectional(viewModel.noFilesFoundProperty());
+        unselectAllButton.disableProperty().bindBidirectional(viewModel.noFilesFoundProperty());
+        progressIndicator.visibleProperty().bindBidirectional(viewModel.searchInProgressProperty());
     }
 
     @FXML
diff --git a/src/main/java/org/jabref/gui/texparser/ParseLatexDialogViewModel.java b/src/main/java/org/jabref/gui/texparser/ParseLatexDialogViewModel.java
index 34f83e2582d..cfe064c92d0 100644
--- a/src/main/java/org/jabref/gui/texparser/ParseLatexDialogViewModel.java
+++ b/src/main/java/org/jabref/gui/texparser/ParseLatexDialogViewModel.java
@@ -41,9 +41,7 @@
 
 public class ParseLatexDialogViewModel extends AbstractViewModel {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(
-        ParseLatexDialogViewModel.class
-    );
+    private static final Logger LOGGER = LoggerFactory.getLogger(ParseLatexDialogViewModel.class);
     private static final String TEX_EXT = ".tex";
     private final BibDatabaseContext databaseContext;
     private final DialogService dialogService;
@@ -74,15 +72,11 @@ public ParseLatexDialogViewModel(
             new SimpleStringProperty(
                 databaseContext
                     .getMetaData()
-                    .getLatexFileDirectory(
-                        preferencesService.getFilePreferences().getUserAndHost()
-                    )
+                    .getLatexFileDirectory(preferencesService.getFilePreferences().getUserAndHost())
                     .orElse(
                         FileUtil.getInitialDirectory(
                             databaseContext,
-                            preferencesService
-                                .getFilePreferences()
-                                .getWorkingDirectory()
+                            preferencesService.getFilePreferences().getWorkingDirectory()
                         )
                     )
                     .toAbsolutePath()
@@ -94,15 +88,12 @@ public ParseLatexDialogViewModel(
         this.searchInProgress = new SimpleBooleanProperty(false);
         this.successfulSearch = new SimpleBooleanProperty(false);
 
-        Predicate<String> isDirectory = path ->
-            Path.of(path).toFile().isDirectory();
+        Predicate<String> isDirectory = path -> Path.of(path).toFile().isDirectory();
         latexDirectoryValidator =
             new FunctionBasedValidator<>(
                 latexFileDirectory,
                 isDirectory,
-                ValidationMessage.error(
-                    Localization.lang("Please enter a valid file path.")
-                )
+                ValidationMessage.error(Localization.lang("Please enter a valid file path."))
             );
     }
 
@@ -143,9 +134,7 @@ public void browseButtonClicked() {
         dialogService
             .showDirectorySelectionDialog(directoryDialogConfiguration)
             .ifPresent(selectedDirectory -> {
-                latexFileDirectory.set(
-                    selectedDirectory.toAbsolutePath().toString()
-                );
+                latexFileDirectory.set(selectedDirectory.toAbsolutePath().toString());
                 preferencesService
                     .getFilePreferences()
                     .setWorkingDirectory(selectedDirectory.toAbsolutePath());
@@ -178,16 +167,11 @@ private void handleFailure(Exception exception) {
         final boolean permissionProblem =
             (exception instanceof IOException) &&
             (exception.getCause() instanceof FileSystemException) &&
-            exception
-                .getCause()
-                .getMessage()
-                .endsWith("Operation not permitted");
+            exception.getCause().getMessage().endsWith("Operation not permitted");
         if (permissionProblem) {
             dialogService.showErrorDialogAndWait(
                 String.format(
-                    Localization.lang(
-                        "JabRef does not have permission to access %s"
-                    ),
+                    Localization.lang("JabRef does not have permission to access %s"),
                     exception.getCause().getMessage()
                 )
             );
@@ -196,12 +180,9 @@ private void handleFailure(Exception exception) {
         }
     }
 
-    private FileNodeViewModel searchDirectory(Path directory)
-        throws IOException {
+    private FileNodeViewModel searchDirectory(Path directory) throws IOException {
         if ((directory == null) || !directory.toFile().isDirectory()) {
-            throw new IOException(
-                String.format("Invalid directory for searching: %s", directory)
-            );
+            throw new IOException(String.format("Invalid directory for searching: %s", directory));
         }
 
         FileNodeViewModel parent = new FileNodeViewModel(directory);
@@ -209,11 +190,7 @@ private FileNodeViewModel searchDirectory(Path directory)
 
         try (Stream<Path> filesStream = Files.list(directory)) {
             fileListPartition =
-                filesStream.collect(
-                    Collectors.partitioningBy(path ->
-                        path.toFile().isDirectory()
-                    )
-                );
+                filesStream.collect(Collectors.partitioningBy(path -> path.toFile().isDirectory()));
         } catch (IOException e) {
             LOGGER.error(
                 String.format(
@@ -245,12 +222,7 @@ private FileNodeViewModel searchDirectory(Path directory)
         parent.setFileCount(files.size() + fileCount);
         parent
             .getChildren()
-            .addAll(
-                files
-                    .stream()
-                    .map(FileNodeViewModel::new)
-                    .collect(Collectors.toList())
-            );
+            .addAll(files.stream().map(FileNodeViewModel::new).collect(Collectors.toList()));
         return parent;
     }
 
@@ -276,11 +248,7 @@ public void parseButtonClicked() {
         );
 
         BackgroundTask
-            .wrap(() ->
-                entriesResolver.resolve(
-                    new DefaultLatexParser().parse(fileList)
-                )
-            )
+            .wrap(() -> entriesResolver.resolve(new DefaultLatexParser().parse(fileList)))
             .onRunning(() -> searchInProgress.set(true))
             .onFinished(() -> searchInProgress.set(false))
             .onSuccess(result ->
diff --git a/src/main/java/org/jabref/gui/texparser/ParseLatexResultView.java b/src/main/java/org/jabref/gui/texparser/ParseLatexResultView.java
index d209e16c030..a438f7845e6 100644
--- a/src/main/java/org/jabref/gui/texparser/ParseLatexResultView.java
+++ b/src/main/java/org/jabref/gui/texparser/ParseLatexResultView.java
@@ -58,19 +58,15 @@ public ParseLatexResultView(
                 close();
             }
         );
-        Button importButton = (Button) getDialogPane()
-            .lookupButton(importButtonType);
-        importButton
-            .disableProperty()
-            .bind(viewModel.importButtonDisabledProperty());
+        Button importButton = (Button) getDialogPane().lookupButton(importButtonType);
+        importButton.disableProperty().bind(viewModel.importButtonDisabledProperty());
 
         themeManager.updateFontStyle(getDialogPane().getScene());
     }
 
     @FXML
     private void initialize() {
-        viewModel =
-            new ParseLatexResultViewModel(resolverResult, databaseContext);
+        viewModel = new ParseLatexResultViewModel(resolverResult, databaseContext);
 
         referenceListView.setItems(viewModel.getReferenceList());
         referenceListView.getSelectionModel().selectFirst();
diff --git a/src/main/java/org/jabref/gui/texparser/ParseLatexResultViewModel.java b/src/main/java/org/jabref/gui/texparser/ParseLatexResultViewModel.java
index 48826f3f7bc..c3225e20703 100644
--- a/src/main/java/org/jabref/gui/texparser/ParseLatexResultViewModel.java
+++ b/src/main/java/org/jabref/gui/texparser/ParseLatexResultViewModel.java
@@ -48,19 +48,13 @@ public ParseLatexResultViewModel(
             .entrySet()) {
             String key = entry.getKey();
             referenceList.add(
-                new ReferenceViewModel(
-                    key,
-                    newEntryKeys.contains(key),
-                    entry.getValue()
-                )
+                new ReferenceViewModel(key, newEntryKeys.contains(key), entry.getValue())
             );
         }
 
         this.importButtonDisabled =
             new SimpleBooleanProperty(
-                referenceList
-                    .stream()
-                    .noneMatch(ReferenceViewModel::isHighlighted)
+                referenceList.stream().noneMatch(ReferenceViewModel::isHighlighted)
             );
     }
 
@@ -91,14 +85,10 @@ public void activeReferenceChanged(ReferenceViewModel reference) {
      * Search and import unknown references from associated BIB files.
      */
     public void importButtonClicked() {
-        DialogService dialogService = Injector.instantiateModelOrService(
-            DialogService.class
-        );
+        DialogService dialogService = Injector.instantiateModelOrService(DialogService.class);
         ImportEntriesDialog dialog = new ImportEntriesDialog(
             databaseContext,
-            BackgroundTask.wrap(() ->
-                new ParserResult(resolverResult.getNewEntries())
-            )
+            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/theme/StyleSheet.java b/src/main/java/org/jabref/gui/theme/StyleSheet.java
index 7ada5f1903a..cffd23adc5b 100644
--- a/src/main/java/org/jabref/gui/theme/StyleSheet.java
+++ b/src/main/java/org/jabref/gui/theme/StyleSheet.java
@@ -15,9 +15,7 @@ abstract class StyleSheet {
     static final String DATA_URL_PREFIX = "data:text/css;charset=utf-8;base64,";
     static final String EMPTY_WEBENGINE_CSS = DATA_URL_PREFIX;
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(
-        StyleSheet.class
-    );
+    private static final Logger LOGGER = LoggerFactory.getLogger(StyleSheet.class);
 
     abstract URL getSceneStylesheet();
 
@@ -30,9 +28,7 @@ Path getWatchPath() {
     abstract void reload();
 
     static Optional<StyleSheet> create(String name) {
-        Optional<URL> styleSheetUrl = Optional.ofNullable(
-            JabRefFrame.class.getResource(name)
-        );
+        Optional<URL> styleSheetUrl = Optional.ofNullable(JabRefFrame.class.getResource(name));
 
         if (styleSheetUrl.isEmpty()) {
             try {
@@ -54,9 +50,7 @@ static Optional<StyleSheet> create(String name) {
 
         if (styleSheetUrl.isEmpty()) {
             try {
-                return Optional.of(
-                    new StyleSheetDataUrl(new URL(EMPTY_WEBENGINE_CSS))
-                );
+                return Optional.of(new StyleSheetDataUrl(new URL(EMPTY_WEBENGINE_CSS)));
             } catch (MalformedURLException e) {
                 return Optional.empty();
             }
diff --git a/src/main/java/org/jabref/gui/theme/StyleSheetFile.java b/src/main/java/org/jabref/gui/theme/StyleSheetFile.java
index ee1f0227bee..add71923b84 100644
--- a/src/main/java/org/jabref/gui/theme/StyleSheetFile.java
+++ b/src/main/java/org/jabref/gui/theme/StyleSheetFile.java
@@ -44,9 +44,7 @@ final class StyleSheetFile extends StyleSheet {
      */
     static final int MAX_IN_MEMORY_CSS_LENGTH = 48000;
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(
-        StyleSheetFile.class
-    );
+    private static final Logger LOGGER = LoggerFactory.getLogger(StyleSheetFile.class);
 
     private final URL url;
     private final Path path;
@@ -72,10 +70,7 @@ void reload() {
     @Override
     public URL getSceneStylesheet() {
         if (!Files.exists(path)) {
-            LOGGER.warn(
-                "Cannot load additional css {} because the file does not exist.",
-                path
-            );
+            LOGGER.warn("Cannot load additional css {} because the file does not exist.", path);
             return null;
         }
 
@@ -120,12 +115,8 @@ static Optional<String> getDataUrl(URL url) {
                 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);
-                    LOGGER.debug(
-                        "Embedded css in data URL of length {}",
-                        embeddedDataUrl.length()
-                    );
+                        DATA_URL_PREFIX + Base64.getEncoder().encodeToString(data);
+                    LOGGER.debug("Embedded css in data URL of length {}", embeddedDataUrl.length());
                     return Optional.of(embeddedDataUrl);
                 } else {
                     LOGGER.debug(
diff --git a/src/main/java/org/jabref/gui/theme/ThemeManager.java b/src/main/java/org/jabref/gui/theme/ThemeManager.java
index 703dc9a9f50..f512e75a764 100644
--- a/src/main/java/org/jabref/gui/theme/ThemeManager.java
+++ b/src/main/java/org/jabref/gui/theme/ThemeManager.java
@@ -36,9 +36,7 @@
  */
 public class ThemeManager {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(
-        ThemeManager.class
-    );
+    private static final Logger LOGGER = LoggerFactory.getLogger(ThemeManager.class);
 
     private final WorkspacePreferences workspacePreferences;
     private final FileUpdateMonitor fileUpdateMonitor;
@@ -48,9 +46,7 @@ public class ThemeManager {
     private Theme theme;
 
     private Scene mainWindowScene;
-    private final Set<WebEngine> webEngines = Collections.newSetFromMap(
-        new WeakHashMap<>()
-    );
+    private final Set<WebEngine> webEngines = Collections.newSetFromMap(new WeakHashMap<>());
     private final OsThemeDetector detector = OsThemeDetector.getDetector();
 
     public ThemeManager(
@@ -58,8 +54,7 @@ public ThemeManager(
         FileUpdateMonitor fileUpdateMonitor,
         Consumer<Runnable> updateRunner
     ) {
-        this.workspacePreferences =
-            Objects.requireNonNull(workspacePreferences);
+        this.workspacePreferences = Objects.requireNonNull(workspacePreferences);
         this.fileUpdateMonitor = Objects.requireNonNull(fileUpdateMonitor);
         this.updateRunner = Objects.requireNonNull(updateRunner);
 
@@ -71,10 +66,7 @@ public ThemeManager(
         addStylesheetToWatchlist(this.baseStyleSheet, this::baseCssLiveUpdate);
         baseCssLiveUpdate();
 
-        EasyBind.subscribe(
-            workspacePreferences.themeProperty(),
-            theme -> updateThemeSettings()
-        );
+        EasyBind.subscribe(workspacePreferences.themeProperty(), theme -> updateThemeSettings());
         EasyBind.subscribe(
             workspacePreferences.themeSyncOsProperty(),
             theme -> updateThemeSettings()
@@ -91,9 +83,7 @@ public ThemeManager(
     }
 
     private void updateThemeSettings() {
-        Theme newTheme = Objects.requireNonNull(
-            workspacePreferences.getTheme()
-        );
+        Theme newTheme = Objects.requireNonNull(workspacePreferences.getTheme());
 
         if (workspacePreferences.themeSyncOsProperty().getValue()) {
             if (detector.isDark()) {
@@ -106,24 +96,15 @@ private void updateThemeSettings() {
         if (newTheme.equals(theme)) {
             LOGGER.info("Not updating theme because it hasn't changed");
         } else {
-            theme
-                .getAdditionalStylesheet()
-                .ifPresent(this::removeStylesheetFromWatchList);
+            theme.getAdditionalStylesheet().ifPresent(this::removeStylesheetFromWatchList);
         }
 
         this.theme = newTheme;
-        LOGGER.info(
-            "Theme set to {} with base css {}",
-            newTheme,
-            baseStyleSheet
-        );
+        LOGGER.info("Theme set to {} with base css {}", newTheme, baseStyleSheet);
 
         this.theme.getAdditionalStylesheet()
             .ifPresent(styleSheet ->
-                addStylesheetToWatchlist(
-                    styleSheet,
-                    this::additionalCssLiveUpdate
-                )
+                addStylesheetToWatchlist(styleSheet, this::additionalCssLiveUpdate)
             );
 
         additionalCssLiveUpdate();
@@ -131,38 +112,26 @@ private void updateThemeSettings() {
 
     private void updateFontSettings() {
         DefaultTaskExecutor.runInJavaFXThread(() ->
-            updateRunner.accept(() ->
-                getMainWindowScene().ifPresent(this::updateFontStyle)
-            )
+            updateRunner.accept(() -> getMainWindowScene().ifPresent(this::updateFontStyle))
         );
     }
 
     private void removeStylesheetFromWatchList(StyleSheet styleSheet) {
         Path oldPath = styleSheet.getWatchPath();
         if (oldPath != null) {
-            fileUpdateMonitor.removeListener(
-                oldPath,
-                this::additionalCssLiveUpdate
-            );
+            fileUpdateMonitor.removeListener(oldPath, this::additionalCssLiveUpdate);
             LOGGER.info("No longer watch css {} for live updates", oldPath);
         }
     }
 
-    private void addStylesheetToWatchlist(
-        StyleSheet styleSheet,
-        FileUpdateListener updateMethod
-    ) {
+    private void addStylesheetToWatchlist(StyleSheet styleSheet, FileUpdateListener updateMethod) {
         Path watchPath = styleSheet.getWatchPath();
         if (watchPath != null) {
             try {
                 fileUpdateMonitor.addListenerForFile(watchPath, updateMethod);
                 LOGGER.info("Watching css {} for live updates", watchPath);
             } catch (IOException e) {
-                LOGGER.warn(
-                    "Cannot watch css path {} for live updates",
-                    watchPath,
-                    e
-                );
+                LOGGER.warn("Cannot watch css path {} for live updates", watchPath, e);
             }
         }
     }
@@ -175,9 +144,7 @@ private void baseCssLiveUpdate() {
             LOGGER.debug("Updating base CSS for main window scene");
         }
 
-        DefaultTaskExecutor.runInJavaFXThread(() ->
-            updateRunner.accept(this::updateBaseCss)
-        );
+        DefaultTaskExecutor.runInJavaFXThread(() -> updateRunner.accept(this::updateBaseCss));
     }
 
     private void additionalCssLiveUpdate() {
@@ -200,11 +167,7 @@ private void additionalCssLiveUpdate() {
 
                 webEngines.forEach(webEngine -> {
                     // force refresh by unloading style sheet, if the location hasn't changed
-                    if (
-                        newStyleSheetLocation.equals(
-                            webEngine.getUserStyleSheetLocation()
-                        )
-                    ) {
+                    if (newStyleSheetLocation.equals(webEngine.getUserStyleSheetLocation())) {
                         webEngine.setUserStyleSheetLocation(null);
                     }
                     webEngine.setUserStyleSheetLocation(newStyleSheetLocation);
@@ -221,10 +184,7 @@ private void updateBaseCss() {
                     stylesheets.remove(0);
                 }
 
-                stylesheets.add(
-                    0,
-                    baseStyleSheet.getSceneStylesheet().toExternalForm()
-                );
+                stylesheets.add(0, baseStyleSheet.getSceneStylesheet().toExternalForm());
             });
     }
 
@@ -235,14 +195,11 @@ private void updateAdditionalCss() {
                     .getStylesheets()
                     .setAll(
                         List.of(
-                            baseStyleSheet
-                                .getSceneStylesheet()
-                                .toExternalForm(),
+                            baseStyleSheet.getSceneStylesheet().toExternalForm(),
                             theme
                                 .getAdditionalStylesheet()
                                 .map(styleSheet -> {
-                                    URL stylesheetUrl =
-                                        styleSheet.getSceneStylesheet();
+                                    URL stylesheetUrl = styleSheet.getSceneStylesheet();
                                     if (stylesheetUrl != null) {
                                         return stylesheetUrl.toExternalForm();
                                     } else {
@@ -281,9 +238,7 @@ public void installCss(WebEngine webEngine) {
             if (this.webEngines.add(webEngine)) {
                 webEngine.setUserStyleSheetLocation(
                     this.theme.getAdditionalStylesheet().isPresent()
-                        ? this.theme.getAdditionalStylesheet()
-                            .get()
-                            .getWebEngineStylesheet()
+                        ? this.theme.getAdditionalStylesheet().get().getWebEngineStylesheet()
                         : ""
                 );
             }
@@ -300,19 +255,11 @@ public void updateFontStyle(Scene scene) {
         if (workspacePreferences.shouldOverrideDefaultFontSize()) {
             scene
                 .getRoot()
-                .setStyle(
-                    "-fx-font-size: " +
-                    workspacePreferences.getMainFontSize() +
-                    "pt;"
-                );
+                .setStyle("-fx-font-size: " + workspacePreferences.getMainFontSize() + "pt;");
         } else {
             scene
                 .getRoot()
-                .setStyle(
-                    "-fx-font-size: " +
-                    workspacePreferences.getDefaultFontSize() +
-                    "pt;"
-                );
+                .setStyle("-fx-font-size: " + workspacePreferences.getDefaultFontSize() + "pt;");
         }
     }
 
diff --git a/src/main/java/org/jabref/gui/undo/AbstractUndoableJabRefEdit.java b/src/main/java/org/jabref/gui/undo/AbstractUndoableJabRefEdit.java
index 3c9b6c2cee3..b93ec0b4501 100644
--- a/src/main/java/org/jabref/gui/undo/AbstractUndoableJabRefEdit.java
+++ b/src/main/java/org/jabref/gui/undo/AbstractUndoableJabRefEdit.java
@@ -7,23 +7,11 @@ public class AbstractUndoableJabRefEdit extends AbstractUndoableEdit {
 
     @Override
     public String getUndoPresentationName() {
-        return (
-            "<html>" +
-            Localization.lang("Undo") +
-            ": " +
-            getPresentationName() +
-            "</html>"
-        );
+        return ("<html>" + Localization.lang("Undo") + ": " + getPresentationName() + "</html>");
     }
 
     @Override
     public String getRedoPresentationName() {
-        return (
-            "<html>" +
-            Localization.lang("Redo") +
-            ": " +
-            getPresentationName() +
-            "</html>"
-        );
+        return ("<html>" + Localization.lang("Redo") + ": " + getPresentationName() + "</html>");
     }
 }
diff --git a/src/main/java/org/jabref/gui/undo/UndoRedoAction.java b/src/main/java/org/jabref/gui/undo/UndoRedoAction.java
index 5bfad338bb1..7a703ec5be6 100644
--- a/src/main/java/org/jabref/gui/undo/UndoRedoAction.java
+++ b/src/main/java/org/jabref/gui/undo/UndoRedoAction.java
@@ -15,9 +15,7 @@
 
 public class UndoRedoAction extends SimpleCommand {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(
-        UndoRedoAction.class
-    );
+    private static final Logger LOGGER = LoggerFactory.getLogger(UndoRedoAction.class);
 
     private final StandardActions action;
     private final JabRefFrame frame;
@@ -47,9 +45,7 @@ public void execute() {
                 libraryTab.markBaseChanged();
                 dialogService.notify(Localization.lang("Undo"));
             } catch (CannotUndoException ex) {
-                dialogService.notify(
-                    Localization.lang("Nothing to undo") + '.'
-                );
+                dialogService.notify(Localization.lang("Nothing to undo") + '.');
             }
             frame.getCurrentLibraryTab().markChangedOrUnChanged();
         } else if (action == StandardActions.REDO) {
@@ -58,9 +54,7 @@ public void execute() {
                 libraryTab.markBaseChanged();
                 dialogService.notify(Localization.lang("Redo"));
             } catch (CannotRedoException ex) {
-                dialogService.notify(
-                    Localization.lang("Nothing to redo") + '.'
-                );
+                dialogService.notify(Localization.lang("Nothing to redo") + '.');
             }
 
             libraryTab.markChangedOrUnChanged();
diff --git a/src/main/java/org/jabref/gui/undo/UndoableChangeType.java b/src/main/java/org/jabref/gui/undo/UndoableChangeType.java
index 19edc2b6dce..eae5733bbc1 100644
--- a/src/main/java/org/jabref/gui/undo/UndoableChangeType.java
+++ b/src/main/java/org/jabref/gui/undo/UndoableChangeType.java
@@ -24,11 +24,7 @@ public UndoableChangeType(FieldChange change) {
         );
     }
 
-    public UndoableChangeType(
-        BibEntry entry,
-        EntryType oldType,
-        EntryType newType
-    ) {
+    public UndoableChangeType(BibEntry entry, EntryType oldType, EntryType newType) {
         this.oldType = oldType;
         this.newType = newType;
         this.entry = entry;
@@ -38,13 +34,8 @@ public UndoableChangeType(
     public String getPresentationName() {
         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(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 2d5b172d3bc..85932f42407 100644
--- a/src/main/java/org/jabref/gui/undo/UndoableFieldChange.java
+++ b/src/main/java/org/jabref/gui/undo/UndoableFieldChange.java
@@ -15,21 +15,14 @@
  */
 public class UndoableFieldChange extends AbstractUndoableJabRefEdit {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(
-        UndoableFieldChange.class
-    );
+    private static final Logger LOGGER = LoggerFactory.getLogger(UndoableFieldChange.class);
 
     private final BibEntry entry;
     private final Field field;
     private final String oldValue;
     private final String newValue;
 
-    public UndoableFieldChange(
-        BibEntry entry,
-        Field field,
-        String oldValue,
-        String newValue
-    ) {
+    public UndoableFieldChange(BibEntry entry, Field field, String oldValue, String newValue) {
         this.entry = entry;
         this.field = field;
         this.oldValue = oldValue;
@@ -37,12 +30,7 @@ public UndoableFieldChange(
     }
 
     public UndoableFieldChange(FieldChange change) {
-        this(
-            change.getEntry(),
-            change.getField(),
-            change.getOldValue(),
-            change.getNewValue()
-        );
+        this(change.getEntry(), change.getField(), change.getOldValue(), change.getNewValue());
     }
 
     @Override
@@ -50,9 +38,7 @@ public String getPresentationName() {
         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(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 9c1264c5143..c11be8c3976 100644
--- a/src/main/java/org/jabref/gui/undo/UndoableInsertEntries.java
+++ b/src/main/java/org/jabref/gui/undo/UndoableInsertEntries.java
@@ -16,9 +16,7 @@
  */
 public class UndoableInsertEntries extends AbstractUndoableJabRefEdit {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(
-        UndoableInsertEntries.class
-    );
+    private static final Logger LOGGER = LoggerFactory.getLogger(UndoableInsertEntries.class);
     private final BibDatabase database;
     private final List<BibEntry> entries;
     private final boolean paste;
@@ -31,11 +29,7 @@ public UndoableInsertEntries(BibDatabase database, List<BibEntry> entries) {
         this(database, entries, false);
     }
 
-    public UndoableInsertEntries(
-        BibDatabase database,
-        List<BibEntry> entries,
-        boolean paste
-    ) {
+    public UndoableInsertEntries(BibDatabase database, List<BibEntry> entries, boolean paste) {
         this.database = database;
         this.entries = entries;
         this.paste = paste;
@@ -50,10 +44,7 @@ public String getPresentationName() {
                 return Localization.lang(
                     "paste entry %0",
                     StringUtil.boldHTML(
-                        entries
-                            .get(0)
-                            .getCitationKey()
-                            .orElse(Localization.lang("undefined"))
+                        entries.get(0).getCitationKey().orElse(Localization.lang("undefined"))
                     )
                 );
             } else {
@@ -66,10 +57,7 @@ public String getPresentationName() {
                 return Localization.lang(
                     "insert entry %0",
                     StringUtil.boldHTML(
-                        entries
-                            .get(0)
-                            .getCitationKey()
-                            .orElse(Localization.lang("undefined"))
+                        entries.get(0).getCitationKey().orElse(Localization.lang("undefined"))
                     )
                 );
             } else {
diff --git a/src/main/java/org/jabref/gui/undo/UndoableInsertString.java b/src/main/java/org/jabref/gui/undo/UndoableInsertString.java
index aee395f42ea..0f0ef17a108 100644
--- a/src/main/java/org/jabref/gui/undo/UndoableInsertString.java
+++ b/src/main/java/org/jabref/gui/undo/UndoableInsertString.java
@@ -10,9 +10,7 @@
 
 public class UndoableInsertString extends AbstractUndoableJabRefEdit {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(
-        UndoableInsertString.class
-    );
+    private static final Logger LOGGER = LoggerFactory.getLogger(UndoableInsertString.class);
 
     private final BibDatabase base;
     private final BibtexString string;
@@ -24,10 +22,7 @@ public UndoableInsertString(BibDatabase base, BibtexString string) {
 
     @Override
     public String getPresentationName() {
-        return Localization.lang(
-            "insert string %0",
-            StringUtil.boldHTML(string.toString())
-        );
+        return Localization.lang("insert string %0", StringUtil.boldHTML(string.toString()));
     }
 
     @Override
diff --git a/src/main/java/org/jabref/gui/undo/UndoablePreambleChange.java b/src/main/java/org/jabref/gui/undo/UndoablePreambleChange.java
index 67e05b211d3..af90af87ebd 100644
--- a/src/main/java/org/jabref/gui/undo/UndoablePreambleChange.java
+++ b/src/main/java/org/jabref/gui/undo/UndoablePreambleChange.java
@@ -12,11 +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 7351a9d4338..6c0395b76f4 100644
--- a/src/main/java/org/jabref/gui/undo/UndoableRemoveEntries.java
+++ b/src/main/java/org/jabref/gui/undo/UndoableRemoveEntries.java
@@ -19,9 +19,7 @@
  */
 public class UndoableRemoveEntries extends AbstractUndoableJabRefEdit {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(
-        UndoableRemoveEntries.class
-    );
+    private static final Logger LOGGER = LoggerFactory.getLogger(UndoableRemoveEntries.class);
     private final BibDatabase base;
     private final List<BibEntry> entries;
     private final boolean cut;
@@ -34,11 +32,7 @@ public UndoableRemoveEntries(BibDatabase base, List<BibEntry> entries) {
         this(base, entries, false);
     }
 
-    public UndoableRemoveEntries(
-        BibDatabase base,
-        List<BibEntry> entries,
-        boolean cut
-    ) {
+    public UndoableRemoveEntries(BibDatabase base, List<BibEntry> entries, boolean cut) {
         this.base = base;
         this.entries = entries;
         this.cut = cut;
@@ -53,10 +47,7 @@ public String getPresentationName() {
                 return Localization.lang(
                     "cut entry %0",
                     StringUtil.boldHTML(
-                        entries
-                            .get(0)
-                            .getCitationKey()
-                            .orElse(Localization.lang("undefined"))
+                        entries.get(0).getCitationKey().orElse(Localization.lang("undefined"))
                     )
                 );
             } else {
@@ -69,10 +60,7 @@ public String getPresentationName() {
                 return Localization.lang(
                     "remove entry %0",
                     StringUtil.boldHTML(
-                        entries
-                            .get(0)
-                            .getCitationKey()
-                            .orElse(Localization.lang("undefined"))
+                        entries.get(0).getCitationKey().orElse(Localization.lang("undefined"))
                     )
                 );
             } else {
diff --git a/src/main/java/org/jabref/gui/undo/UndoableRemoveString.java b/src/main/java/org/jabref/gui/undo/UndoableRemoveString.java
index 9babbdf2f97..cca522be9c3 100644
--- a/src/main/java/org/jabref/gui/undo/UndoableRemoveString.java
+++ b/src/main/java/org/jabref/gui/undo/UndoableRemoveString.java
@@ -10,9 +10,7 @@
 
 public class UndoableRemoveString extends AbstractUndoableJabRefEdit {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(
-        UndoableRemoveString.class
-    );
+    private static final Logger LOGGER = LoggerFactory.getLogger(UndoableRemoveString.class);
     private final BibDatabase base;
     private final BibtexString string;
 
@@ -23,10 +21,7 @@ public UndoableRemoveString(BibDatabase base, BibtexString string) {
 
     @Override
     public String getPresentationName() {
-        return Localization.lang(
-            "remove string %0",
-            StringUtil.boldHTML(string.toString())
-        );
+        return Localization.lang("remove string %0", StringUtil.boldHTML(string.toString()));
     }
 
     @Override
diff --git a/src/main/java/org/jabref/gui/util/BackgroundTask.java b/src/main/java/org/jabref/gui/util/BackgroundTask.java
index 824eaa9474d..823e842f4b2 100644
--- a/src/main/java/org/jabref/gui/util/BackgroundTask.java
+++ b/src/main/java/org/jabref/gui/util/BackgroundTask.java
@@ -40,25 +40,18 @@ public abstract class BackgroundTask<V> {
     private Consumer<Exception> onException;
     private Runnable onFinished;
     private final BooleanProperty isCanceled = new SimpleBooleanProperty(false);
-    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
+    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);
     private final BooleanProperty showToUser = new SimpleBooleanProperty(false);
-    private final BooleanProperty willBeRecoveredAutomatically =
-        new SimpleBooleanProperty(false);
+    private final BooleanProperty willBeRecoveredAutomatically = new SimpleBooleanProperty(false);
 
     public BackgroundTask() {
         workDonePercentage.bind(
-            EasyBind.map(
-                progress,
-                BackgroundTask.BackgroundProgress::getWorkDonePercentage
-            )
+            EasyBind.map(progress, BackgroundTask.BackgroundProgress::getWorkDonePercentage)
         );
     }
 
@@ -144,9 +137,7 @@ public boolean willBeRecoveredAutomatically() {
         return willBeRecoveredAutomatically.get();
     }
 
-    public void willBeRecoveredAutomatically(
-        boolean willBeRecoveredAutomatically
-    ) {
+    public void willBeRecoveredAutomatically(boolean willBeRecoveredAutomatically) {
         this.willBeRecoveredAutomatically.set(willBeRecoveredAutomatically);
     }
 
@@ -194,11 +185,7 @@ public Future<?> executeWith(TaskExecutor taskExecutor) {
         return taskExecutor.execute(this);
     }
 
-    public Future<?> scheduleWith(
-        TaskExecutor taskExecutor,
-        long delay,
-        TimeUnit unit
-    ) {
+    public Future<?> scheduleWith(TaskExecutor taskExecutor, long delay, TimeUnit unit) {
         return taskExecutor.schedule(this, delay, unit);
     }
 
@@ -217,18 +204,13 @@ public BackgroundTask<V> onFinished(Runnable onFinished) {
      * @param nextTaskFactory the function that creates the new task
      * @param <T>             type of the return value of the second task
      */
-    public <T> BackgroundTask<T> then(
-        Function<V, BackgroundTask<T>> nextTaskFactory
-    ) {
+    public <T> BackgroundTask<T> then(Function<V, BackgroundTask<T>> nextTaskFactory) {
         return new BackgroundTask<>() {
             @Override
             protected T call() throws Exception {
                 V result = BackgroundTask.this.call();
                 BackgroundTask<T> nextTask = nextTaskFactory.apply(result);
-                EasyBind.subscribe(
-                    nextTask.progressProperty(),
-                    this::updateProgress
-                );
+                EasyBind.subscribe(nextTask.progressProperty(), this::updateProgress);
                 return nextTask.call();
             }
         };
@@ -245,13 +227,8 @@ public <T> BackgroundTask<T> thenRun(Function<V, T> nextOperation) {
             @Override
             protected T call() throws Exception {
                 V result = BackgroundTask.this.call();
-                BackgroundTask<T> nextTask = BackgroundTask.wrap(() ->
-                    nextOperation.apply(result)
-                );
-                EasyBind.subscribe(
-                    nextTask.progressProperty(),
-                    this::updateProgress
-                );
+                BackgroundTask<T> nextTask = BackgroundTask.wrap(() -> nextOperation.apply(result));
+                EasyBind.subscribe(nextTask.progressProperty(), this::updateProgress);
                 return nextTask.call();
             }
         };
@@ -270,10 +247,7 @@ protected Void call() throws Exception {
                 BackgroundTask<Void> nextTask = BackgroundTask.wrap(() ->
                     nextOperation.accept(result)
                 );
-                EasyBind.subscribe(
-                    nextTask.progressProperty(),
-                    this::updateProgress
-                );
+                EasyBind.subscribe(nextTask.progressProperty(), this::updateProgress);
                 return nextTask.call();
             }
         };
diff --git a/src/main/java/org/jabref/gui/util/BaseDialog.java b/src/main/java/org/jabref/gui/util/BaseDialog.java
index 2b49e9762b8..91edc09b1cc 100644
--- a/src/main/java/org/jabref/gui/util/BaseDialog.java
+++ b/src/main/java/org/jabref/gui/util/BaseDialog.java
@@ -12,22 +12,14 @@
 import org.jabref.gui.keyboard.KeyBinding;
 import org.jabref.gui.keyboard.KeyBindingRepository;
 
-public class BaseDialog<T>
-    extends Dialog<T>
-    implements org.jabref.gui.Dialog<T> {
+public class BaseDialog<T> extends Dialog<T> implements org.jabref.gui.Dialog<T> {
 
     protected BaseDialog() {
         getDialogPane()
             .getScene()
             .setOnKeyPressed(event -> {
-                KeyBindingRepository keyBindingRepository =
-                    Globals.getKeyPrefs();
-                if (
-                    keyBindingRepository.checkKeyCombinationEquality(
-                        KeyBinding.CLOSE,
-                        event
-                    )
-                ) {
+                KeyBindingRepository keyBindingRepository = Globals.getKeyPrefs();
+                if (keyBindingRepository.checkKeyCombinationEquality(KeyBinding.CLOSE, event)) {
                     close();
                 } else if (
                     keyBindingRepository.checkKeyCombinationEquality(
@@ -52,9 +44,7 @@ protected BaseDialog() {
     }
 
     private Optional<Button> getDefaultButton() {
-        return Optional.ofNullable(
-            (Button) getDialogPane().lookupButton(getDefaultButtonType())
-        );
+        return Optional.ofNullable((Button) getDialogPane().lookupButton(getDefaultButtonType()));
     }
 
     private ButtonType getDefaultButtonType() {
diff --git a/src/main/java/org/jabref/gui/util/BindingsHelper.java b/src/main/java/org/jabref/gui/util/BindingsHelper.java
index 0cd6920e393..a947adf7505 100644
--- a/src/main/java/org/jabref/gui/util/BindingsHelper.java
+++ b/src/main/java/org/jabref/gui/util/BindingsHelper.java
@@ -36,10 +36,7 @@ public static Subscription includePseudoClassWhen(
     ) {
         Consumer<Boolean> changePseudoClass = value ->
             node.pseudoClassStateChanged(pseudoClass, value);
-        Subscription subscription = EasyBind.subscribe(
-            condition,
-            changePseudoClass
-        );
+        Subscription subscription = EasyBind.subscribe(condition, changePseudoClass);
 
         // Put the pseudo class there depending on the current value
         changePseudoClass.accept(condition.getValue());
@@ -58,9 +55,7 @@ protected List<U> computeValue() {
         };
 
         ObservableList<U> list = FXCollections.observableArrayList();
-        binding.addListener((observable, oldValue, newValue) ->
-            list.setAll(newValue)
-        );
+        binding.addListener((observable, oldValue, newValue) -> list.setAll(newValue));
         return list;
     }
 
@@ -73,10 +68,8 @@ public static <A, B> void bindBidirectional(
         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));
+        Consumer<B> updateA = newValueB -> propertyA.setValue(mapBtoA.apply(newValueB));
+        Consumer<A> updateB = newValueA -> propertyB.setValue(mapAtoB.apply(newValueA));
         bindBidirectional(propertyA, propertyB, updateA, updateB);
     }
 
@@ -134,13 +127,12 @@ public static <A, B> void bindContentBidirectional(
         Consumer<B> updateA,
         Consumer<List<A>> updateB
     ) {
-        final BidirectionalListBinding<A, B> binding =
-            new BidirectionalListBinding<>(
-                propertyA,
-                propertyB,
-                updateA,
-                updateB
-            );
+        final BidirectionalListBinding<A, B> binding = new BidirectionalListBinding<>(
+            propertyA,
+            propertyB,
+            updateA,
+            updateB
+        );
 
         // use property as initial source
         updateA.accept(propertyB.getValue());
@@ -155,10 +147,8 @@ public static <A, B> void bindContentBidirectional(
         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));
+        Consumer<B> updateList = newValueB -> listProperty.setAll(mapToList.apply(newValueB));
+        Consumer<List<A>> updateB = newValueList -> property.setValue(mapToB.apply(newValueList));
 
         bindContentBidirectional(listProperty, property, updateList, updateB);
     }
@@ -169,13 +159,12 @@ public static <A, V, B> void bindContentBidirectional(
         Consumer<B> updateA,
         Consumer<Map<A, V>> updateB
     ) {
-        final BidirectionalMapBinding<A, V, B> binding =
-            new BidirectionalMapBinding<>(
-                propertyA,
-                propertyB,
-                updateA,
-                updateB
-            );
+        final BidirectionalMapBinding<A, V, B> binding = new BidirectionalMapBinding<>(
+            propertyA,
+            propertyB,
+            updateA,
+            updateB
+        );
 
         // use list as initial source
         updateB.accept(propertyA);
@@ -290,27 +279,15 @@ public ChangeListener<? super B> getChangeListenerB() {
             return this::changedB;
         }
 
-        public void changedA(
-            ObservableValue<? extends A> observable,
-            A oldValue,
-            A newValue
-        ) {
+        public void changedA(ObservableValue<? extends A> observable, A oldValue, A newValue) {
             updateLocked(updateB, oldValue, newValue);
         }
 
-        public void changedB(
-            ObservableValue<? extends B> observable,
-            B oldValue,
-            B newValue
-        ) {
+        public void changedB(ObservableValue<? extends B> observable, B oldValue, B newValue) {
             updateLocked(updateA, oldValue, newValue);
         }
 
-        private <T> void updateLocked(
-            Consumer<T> update,
-            T oldValue,
-            T newValue
-        ) {
+        private <T> void updateLocked(Consumer<T> update, T oldValue, T newValue) {
             if (!updating) {
                 try {
                     updating = true;
@@ -344,11 +321,7 @@ public BidirectionalListBinding(
         }
 
         @Override
-        public void changed(
-            ObservableValue<? extends B> observable,
-            B oldValue,
-            B newValue
-        ) {
+        public void changed(ObservableValue<? extends B> observable, B oldValue, B newValue) {
             if (!updating) {
                 try {
                     updating = true;
@@ -394,11 +367,7 @@ public BidirectionalMapBinding(
         }
 
         @Override
-        public void changed(
-            ObservableValue<? extends B> observable,
-            B oldValue,
-            B newValue
-        ) {
+        public void changed(ObservableValue<? extends B> observable, B oldValue, B newValue) {
             if (!updating) {
                 try {
                     updating = true;
diff --git a/src/main/java/org/jabref/gui/util/ControlHelper.java b/src/main/java/org/jabref/gui/util/ControlHelper.java
index e7c4490c6ab..5d5658f18ee 100644
--- a/src/main/java/org/jabref/gui/util/ControlHelper.java
+++ b/src/main/java/org/jabref/gui/util/ControlHelper.java
@@ -16,15 +16,9 @@
 public class ControlHelper {
 
     // Pseudo-classes for drag and drop
-    private static PseudoClass dragOverBottom = PseudoClass.getPseudoClass(
-        "dragOver-bottom"
-    );
-    private static PseudoClass dragOverCenter = PseudoClass.getPseudoClass(
-        "dragOver-center"
-    );
-    private static PseudoClass dragOverTop = PseudoClass.getPseudoClass(
-        "dragOver-top"
-    );
+    private static PseudoClass dragOverBottom = PseudoClass.getPseudoClass("dragOver-bottom");
+    private static PseudoClass dragOverCenter = PseudoClass.getPseudoClass("dragOver-center");
+    private static PseudoClass dragOverTop = PseudoClass.getPseudoClass("dragOver-top");
 
     public enum EllipsisPosition {
         BEGINNING,
@@ -79,10 +73,7 @@ public static TextFormatter<String> getIntegerTextFormatter() {
         return new TextFormatter<>(filter);
     }
 
-    public static void removePseudoClasses(
-        Cell<?> cell,
-        PseudoClass... pseudoClasses
-    ) {
+    public static void removePseudoClasses(Cell<?> cell, PseudoClass... pseudoClasses) {
         for (PseudoClass pseudoClass : pseudoClasses) {
             cell.pseudoClassStateChanged(pseudoClass, false);
         }
@@ -91,10 +82,7 @@ public static void removePseudoClasses(
     /**
      * Determines where the mouse is in the given cell.
      */
-    public static DroppingMouseLocation getDroppingMouseLocation(
-        Cell<?> cell,
-        DragEvent event
-    ) {
+    public static DroppingMouseLocation getDroppingMouseLocation(Cell<?> cell, DragEvent event) {
         if ((cell.getHeight() * 0.25) > event.getY()) {
             return DroppingMouseLocation.TOP;
         } else if ((cell.getHeight() * 0.75) < event.getY()) {
@@ -165,10 +153,7 @@ public static String truncateString(
                 case BEGINNING:
                     return (
                         ellipsisString +
-                        text.substring(
-                            text.length() -
-                            (maxCharacters - ellipsisString.length())
-                        )
+                        text.substring(text.length() - (maxCharacters - ellipsisString.length()))
                     );
                 case CENTER:
                     int partialLength = (int) Math.floor(
@@ -181,11 +166,7 @@ public static String truncateString(
                     );
                 case ENDING:
                     return (
-                        text.substring(
-                            0,
-                            maxCharacters - ellipsisString.length()
-                        ) +
-                        ellipsisString
+                        text.substring(0, maxCharacters - ellipsisString.length()) + ellipsisString
                     );
             }
         }
diff --git a/src/main/java/org/jabref/gui/util/CurrentThreadTaskExecutor.java b/src/main/java/org/jabref/gui/util/CurrentThreadTaskExecutor.java
index 77f19952e61..00607ca2971 100644
--- a/src/main/java/org/jabref/gui/util/CurrentThreadTaskExecutor.java
+++ b/src/main/java/org/jabref/gui/util/CurrentThreadTaskExecutor.java
@@ -18,11 +18,8 @@
  */
 public class CurrentThreadTaskExecutor implements TaskExecutor {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(
-        CurrentThreadTaskExecutor.class
-    );
-    private final WeakHashMap<DelayTaskThrottler, Void> throttlers =
-        new WeakHashMap<>();
+    private static final Logger LOGGER = LoggerFactory.getLogger(CurrentThreadTaskExecutor.class);
+    private final WeakHashMap<DelayTaskThrottler, Void> throttlers = new WeakHashMap<>();
 
     /**
      * Executes the task on the current thread. The code is essentially taken from {@link
@@ -58,11 +55,7 @@ public <V> Future<V> execute(Task<V> task) {
     }
 
     @Override
-    public <V> Future<?> schedule(
-        BackgroundTask<V> task,
-        long delay,
-        TimeUnit unit
-    ) {
+    public <V> Future<?> schedule(BackgroundTask<V> task, long delay, TimeUnit unit) {
         return execute(task);
     }
 
diff --git a/src/main/java/org/jabref/gui/util/CustomLocalDragboard.java b/src/main/java/org/jabref/gui/util/CustomLocalDragboard.java
index 475d1bf777d..0169b568ddd 100644
--- a/src/main/java/org/jabref/gui/util/CustomLocalDragboard.java
+++ b/src/main/java/org/jabref/gui/util/CustomLocalDragboard.java
@@ -16,9 +16,9 @@
 public class CustomLocalDragboard {
 
     @SuppressWarnings("unchecked")
-    private static final Class<List<BibEntry>> BIB_ENTRIES = (Class<
-            List<BibEntry>
-        >) (Class<?>) List.class;
+    private static final Class<List<BibEntry>> BIB_ENTRIES = (Class<List<BibEntry>>) (Class<
+            ?
+        >) List.class;
 
     private final Map<Class<?>, Object> contents = new HashMap<>();
 
@@ -80,10 +80,7 @@ public boolean hasBibEntries() {
      * @param previewLayouts The list to put
      */
     public void putPreviewLayouts(List<PreviewLayout> previewLayouts) {
-        putValue(
-            DragAndDropDataFormats.PREVIEWLAYOUT_LIST_CLASS,
-            previewLayouts
-        );
+        putValue(DragAndDropDataFormats.PREVIEWLAYOUT_LIST_CLASS, previewLayouts);
     }
 
     /**
diff --git a/src/main/java/org/jabref/gui/util/CustomTitledPaneSkin.java b/src/main/java/org/jabref/gui/util/CustomTitledPaneSkin.java
index 0e00d333e0a..95d4954f710 100644
--- a/src/main/java/org/jabref/gui/util/CustomTitledPaneSkin.java
+++ b/src/main/java/org/jabref/gui/util/CustomTitledPaneSkin.java
@@ -89,8 +89,7 @@ public final ObjectProperty<ArrowSide> arrowSideProperty() {
     public CustomTitledPaneSkin(TitledPane control) {
         super(control);
         title = (Region) Objects.requireNonNull(control.lookup(".title"));
-        arrowButton =
-            (Region) Objects.requireNonNull(title.lookup(".arrow-button"));
+        arrowButton = (Region) Objects.requireNonNull(title.lookup(".arrow-button"));
         arrow = (Region) Objects.requireNonNull(arrowButton.lookup(".arrow"));
         text = (Text) Objects.requireNonNull(title.lookup(".text"));
 
@@ -100,19 +99,11 @@ public CustomTitledPaneSkin(TitledPane control) {
         rotate.pivotYProperty().bind(arrow.heightProperty().divide(2.0));
         rotate
             .angleProperty()
-            .bind(
-                Bindings
-                    .when(control.expandedProperty())
-                    .then(-180.0)
-                    .otherwise(90.0)
-            );
+            .bind(Bindings.when(control.expandedProperty()).then(-180.0).otherwise(90.0));
 
         arrow.getTransforms().add(rotate);
 
-        registerChangeListener(
-            control.graphicProperty(),
-            ov -> adjustTitleLayout()
-        );
+        registerChangeListener(control.graphicProperty(), ov -> adjustTitleLayout());
     }
 
     /* ********************************************************
@@ -150,10 +141,7 @@ private void adjustTitleLayout() {
             Bindings.createDoubleBinding(
                 () ->
                     switch (getSkinnable().getAlignment()) {
-                        case TOP_CENTER,
-                            CENTER,
-                            BOTTOM_CENTER,
-                            BASELINE_CENTER -> 0.0;
+                        case TOP_CENTER, CENTER, BOTTOM_CENTER, BASELINE_CENTER -> 0.0;
                         default -> -(arrowButton.getWidth());
                     },
                 getSkinnable().alignmentProperty(),
@@ -211,31 +199,26 @@ 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();
-                }
+        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;
+            @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;
 
diff --git a/src/main/java/org/jabref/gui/util/DefaultFileUpdateMonitor.java b/src/main/java/org/jabref/gui/util/DefaultFileUpdateMonitor.java
index 182fe260edf..a359be71875 100644
--- a/src/main/java/org/jabref/gui/util/DefaultFileUpdateMonitor.java
+++ b/src/main/java/org/jabref/gui/util/DefaultFileUpdateMonitor.java
@@ -28,23 +28,17 @@
  */
 public class DefaultFileUpdateMonitor implements Runnable, FileUpdateMonitor {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(
-        DefaultFileUpdateMonitor.class
-    );
+    private static final Logger LOGGER = LoggerFactory.getLogger(DefaultFileUpdateMonitor.class);
 
-    private final Multimap<Path, FileUpdateListener> listeners =
-        ArrayListMultimap.create(20, 4);
+    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() {
-        try (
-            WatchService watcher = FileSystems.getDefault().newWatchService()
-        ) {
+        try (WatchService watcher = FileSystems.getDefault().newWatchService()) {
             this.watcher = watcher;
             filesystemMonitorFailure.set(Optional.empty());
 
@@ -69,8 +63,7 @@ public void run() {
                         // 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());
+                        Path path = ((Path) key.watchable()).resolve(ev.context());
                         notifyAboutChange(path);
                     }
                     key.reset();
@@ -98,8 +91,7 @@ private void notifyAboutChange(Path path) {
     }
 
     @Override
-    public void addListenerForFile(Path file, FileUpdateListener listener)
-        throws IOException {
+    public void addListenerForFile(Path file, FileUpdateListener listener) throws IOException {
         if (isActive()) {
             // We can't watch files directly, so monitor their parent directory for updates
             Path directory = file.toAbsolutePath().getParent();
diff --git a/src/main/java/org/jabref/gui/util/DefaultTaskExecutor.java b/src/main/java/org/jabref/gui/util/DefaultTaskExecutor.java
index b74c27be6fe..ecc86c548c2 100644
--- a/src/main/java/org/jabref/gui/util/DefaultTaskExecutor.java
+++ b/src/main/java/org/jabref/gui/util/DefaultTaskExecutor.java
@@ -25,15 +25,11 @@
  */
 public class DefaultTaskExecutor implements TaskExecutor {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(
-        DefaultTaskExecutor.class
-    );
+    private static final Logger LOGGER = LoggerFactory.getLogger(DefaultTaskExecutor.class);
 
     private final ExecutorService executor = Executors.newFixedThreadPool(5);
-    private final ScheduledExecutorService scheduledExecutor =
-        Executors.newScheduledThreadPool(2);
-    private final WeakHashMap<DelayTaskThrottler, Void> throttlers =
-        new WeakHashMap<>();
+    private final ScheduledExecutorService scheduledExecutor = Executors.newScheduledThreadPool(2);
+    private final WeakHashMap<DelayTaskThrottler, Void> throttlers = new WeakHashMap<>();
 
     private final StateManager stateManager;
 
@@ -119,11 +115,7 @@ public <V> Future<V> execute(Task<V> task) {
     }
 
     @Override
-    public <V> Future<?> schedule(
-        BackgroundTask<V> task,
-        long delay,
-        TimeUnit unit
-    ) {
+    public <V> Future<?> schedule(BackgroundTask<V> task, long delay, TimeUnit unit) {
         return scheduledExecutor.schedule(getJavaFXTask(task), delay, unit);
     }
 
@@ -156,20 +148,10 @@ private <V> Task<V> getJavaFXTask(BackgroundTask<V> task) {
                 this.updateTitle(task.titleProperty().get());
                 BindingsHelper.subscribeFuture(
                     task.progressProperty(),
-                    progress ->
-                        updateProgress(
-                            progress.getWorkDone(),
-                            progress.getMax()
-                        )
-                );
-                BindingsHelper.subscribeFuture(
-                    task.messageProperty(),
-                    this::updateMessage
-                );
-                BindingsHelper.subscribeFuture(
-                    task.titleProperty(),
-                    this::updateTitle
+                    progress -> updateProgress(progress.getWorkDone(), progress.getMax())
                 );
+                BindingsHelper.subscribeFuture(task.messageProperty(), this::updateMessage);
+                BindingsHelper.subscribeFuture(task.titleProperty(), this::updateTitle);
                 BindingsHelper.subscribeFuture(
                     task.isCanceledProperty(),
                     cancelled -> {
@@ -192,9 +174,7 @@ public V call() throws Exception {
         }
         Consumer<V> onSuccess = task.getOnSuccess();
         if (onSuccess != null) {
-            javaTask.setOnSucceeded(event ->
-                onSuccess.accept(javaTask.getValue())
-            );
+            javaTask.setOnSucceeded(event -> onSuccess.accept(javaTask.getValue()));
         }
         Consumer<Exception> onException = task.getOnException();
         if (onException != null) {
diff --git a/src/main/java/org/jabref/gui/util/FieldsUtil.java b/src/main/java/org/jabref/gui/util/FieldsUtil.java
index 9c190dd6d7f..5f1ddb26902 100644
--- a/src/main/java/org/jabref/gui/util/FieldsUtil.java
+++ b/src/main/java/org/jabref/gui/util/FieldsUtil.java
@@ -13,54 +13,37 @@
 
 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) {
         if (field instanceof SpecialField specialField) {
             return (
-                new SpecialFieldViewModel(
-                    specialField,
-                    Globals.prefs,
-                    Globals.undoManager
-                )
+                new SpecialFieldViewModel(specialField, Globals.prefs, Globals.undoManager)
                     .getLocalization() +
                 " (" +
                 Localization.lang("Special") +
                 ")"
             );
         } else if (field instanceof IEEEField) {
-            return (
-                field.getDisplayName() + " (" + Localization.lang("IEEE") + ")"
-            );
+            return (field.getDisplayName() + " (" + Localization.lang("IEEE") + ")");
         } else if (field instanceof InternalField) {
-            return (
-                field.getDisplayName() +
-                " (" +
-                Localization.lang("Internal") +
-                ")"
-            );
+            return (field.getDisplayName() + " (" + Localization.lang("Internal") + ")");
         } else if (field instanceof UnknownField) {
-            return (
-                field.getDisplayName() +
-                " (" +
-                Localization.lang("Custom") +
-                ")"
-            );
+            return (field.getDisplayName() + " (" + Localization.lang("Custom") + ")");
         } else {
             return field.getDisplayName();
         }
diff --git a/src/main/java/org/jabref/gui/util/FileDialogConfiguration.java b/src/main/java/org/jabref/gui/util/FileDialogConfiguration.java
index 4608c6e4b3e..78fe0764fe5 100644
--- a/src/main/java/org/jabref/gui/util/FileDialogConfiguration.java
+++ b/src/main/java/org/jabref/gui/util/FileDialogConfiguration.java
@@ -50,16 +50,13 @@ public FileChooser.ExtensionFilter getSelectedExtensionFilter() {
         return selectedExtensionFilter;
     }
 
-    public void setSelectedExtensionFilter(
-        FileChooser.ExtensionFilter selectedExtensionFilter
-    ) {
+    public void setSelectedExtensionFilter(FileChooser.ExtensionFilter selectedExtensionFilter) {
         this.selectedExtensionFilter = selectedExtensionFilter;
     }
 
     public static class Builder {
 
-        private final List<FileChooser.ExtensionFilter> extensionFilters =
-            new ArrayList<>();
+        private final List<FileChooser.ExtensionFilter> extensionFilters = new ArrayList<>();
         private Path initialDirectory;
         private FileChooser.ExtensionFilter defaultExtension;
         private String initialFileName;
@@ -105,9 +102,7 @@ public Builder withInitialFileName(String initialFileName) {
             return this;
         }
 
-        public Builder withDefaultExtension(
-            FileChooser.ExtensionFilter extensionFilter
-        ) {
+        public Builder withDefaultExtension(FileChooser.ExtensionFilter extensionFilter) {
             defaultExtension = extensionFilter;
             return this;
         }
@@ -117,24 +112,17 @@ public Builder withDefaultExtension(FileType fileType) {
             return this;
         }
 
-        public Builder withDefaultExtension(
-            String description,
-            FileType fileType
-        ) {
-            defaultExtension =
-                FileFilterConverter.toExtensionFilter(description, fileType);
+        public Builder withDefaultExtension(String description, FileType fileType) {
+            defaultExtension = FileFilterConverter.toExtensionFilter(description, fileType);
             return this;
         }
 
         public Builder withDefaultExtension(String fileTypeDescription) {
             extensionFilters
                 .stream()
-                .filter(type ->
-                    type.getDescription().equalsIgnoreCase(fileTypeDescription)
-                )
+                .filter(type -> type.getDescription().equalsIgnoreCase(fileTypeDescription))
                 .findFirst()
-                .ifPresent(extensionFilter -> defaultExtension = extensionFilter
-                );
+                .ifPresent(extensionFilter -> defaultExtension = extensionFilter);
 
             return this;
         }
@@ -144,9 +132,7 @@ public Builder addExtensionFilter(FileChooser.ExtensionFilter filter) {
             return this;
         }
 
-        public Builder addExtensionFilter(
-            List<FileChooser.ExtensionFilter> filters
-        ) {
+        public Builder addExtensionFilter(List<FileChooser.ExtensionFilter> filters) {
             extensionFilters.addAll(filters);
             return this;
         }
@@ -159,13 +145,8 @@ public Builder addExtensionFilter(FileType... fileTypes) {
             return this;
         }
 
-        public Builder addExtensionFilter(
-            String description,
-            FileType fileType
-        ) {
-            extensionFilters.add(
-                FileFilterConverter.toExtensionFilter(description, fileType)
-            );
+        public Builder addExtensionFilter(String description, FileType fileType) {
+            extensionFilters.add(FileFilterConverter.toExtensionFilter(description, fileType));
             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 7c317c4ab69..f27132a5709 100644
--- a/src/main/java/org/jabref/gui/util/FileFilterConverter.java
+++ b/src/main/java/org/jabref/gui/util/FileFilterConverter.java
@@ -19,23 +19,16 @@
 
 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() {}
 
-    public static FileChooser.ExtensionFilter toExtensionFilter(
-        FileType fileType
-    ) {
-        String fileList = String.join(
-            ", ",
-            fileType.getExtensionsWithAsteriskAndDot()
-        );
-        String description = Localization.lang(
-            "%0 file (%1)",
-            fileType.getName(),
-            fileList
-        );
+    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()
@@ -58,9 +51,7 @@ public static Optional<Importer> getImporter(
     ) {
         return importers
             .stream()
-            .filter(importer ->
-                importer.getName().equals(extensionFilter.getDescription())
-            )
+            .filter(importer -> importer.getName().equals(extensionFilter.getDescription()))
             .findFirst();
     }
 
@@ -70,15 +61,11 @@ public static Optional<Exporter> getExporter(
     ) {
         return exporters
             .stream()
-            .filter(exporter ->
-                exporter.getName().equals(extensionFilter.getDescription())
-            )
+            .filter(exporter -> exporter.getName().equals(extensionFilter.getDescription()))
             .findFirst();
     }
 
-    public static FileChooser.ExtensionFilter forAllImporters(
-        SortedSet<Importer> importers
-    ) {
+    public static FileChooser.ExtensionFilter forAllImporters(SortedSet<Importer> importers) {
         List<FileType> fileTypes = importers
             .stream()
             .map(Importer::getFileType)
@@ -99,9 +86,7 @@ public static List<FileChooser.ExtensionFilter> importerToExtensionFilter(
     ) {
         return importers
             .stream()
-            .map(importer ->
-                toExtensionFilter(importer.getName(), importer.getFileType())
-            )
+            .map(importer -> toExtensionFilter(importer.getName(), importer.getFileType()))
             .collect(Collectors.toList());
     }
 
@@ -110,15 +95,11 @@ public static List<FileChooser.ExtensionFilter> exporterToExtensionFilter(
     ) {
         return exporters
             .stream()
-            .map(exporter ->
-                toExtensionFilter(exporter.getName(), exporter.getFileType())
-            )
+            .map(exporter -> toExtensionFilter(exporter.getName(), exporter.getFileType()))
             .collect(Collectors.toList());
     }
 
-    public static FileFilter toFileFilter(
-        FileChooser.ExtensionFilter extensionFilter
-    ) {
+    public static FileFilter toFileFilter(FileChooser.ExtensionFilter extensionFilter) {
         return toFileFilter(extensionFilter.getExtensions());
     }
 
@@ -144,10 +125,7 @@ public static Filter<Path> toDirFilter(List<String> extensions) {
             return path -> true;
         } else {
             return path ->
-                FileUtil
-                    .getFileExtension(path)
-                    .map(extensionsCleaned::contains)
-                    .orElse(false);
+                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 732f6446f55..7d02fdd9b9a 100644
--- a/src/main/java/org/jabref/gui/util/FileNodeViewModel.java
+++ b/src/main/java/org/jabref/gui/util/FileNodeViewModel.java
@@ -17,9 +17,7 @@
 
 public class FileNodeViewModel {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(
-        FileNodeViewModel.class
-    );
+    private static final Logger LOGGER = LoggerFactory.getLogger(FileNodeViewModel.class);
     private final Path path;
     private final ObservableList<FileNodeViewModel> children;
     private int fileCount;
@@ -55,9 +53,7 @@ public static String formatDateTime(FileTime fileTime) {
             .atZone(ZoneId.systemDefault())
             .toLocalDateTime();
 
-        return localDateTime.format(
-            DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm")
-        );
+        return localDateTime.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm"));
     }
 
     /**
@@ -69,9 +65,7 @@ public String getDisplayText() {
                 "%s (%s %s)",
                 path.getFileName(),
                 fileCount,
-                fileCount == 1
-                    ? Localization.lang("file")
-                    : Localization.lang("files")
+                fileCount == 1 ? Localization.lang("file") : Localization.lang("files")
             );
         }
         return path.getFileName().toString();
@@ -87,9 +81,7 @@ public String getDisplayTextWithEditDate() {
                 "%s (%s %s)",
                 path.getFileName(),
                 fileCount,
-                fileCount == 1
-                    ? Localization.lang("file")
-                    : Localization.lang("files")
+                fileCount == 1 ? Localization.lang("file") : Localization.lang("files")
             );
         }
         FileTime lastEditedTime = null;
diff --git a/src/main/java/org/jabref/gui/util/IconValidationDecorator.java b/src/main/java/org/jabref/gui/util/IconValidationDecorator.java
index a43ce2f0a54..63df9e979cd 100644
--- a/src/main/java/org/jabref/gui/util/IconValidationDecorator.java
+++ b/src/main/java/org/jabref/gui/util/IconValidationDecorator.java
@@ -45,11 +45,7 @@ public Node createDecorationNode(ValidationMessage message) {
             : createWarningNode();
         graphic
             .getStyleClass()
-            .add(
-                Severity.ERROR == message.getSeverity()
-                    ? "error-icon"
-                    : "warning-icon"
-            );
+            .add(Severity.ERROR == message.getSeverity() ? "error-icon" : "warning-icon");
         Label label = new Label();
         label.setGraphic(graphic);
         label.setTooltip(createTooltip(message));
@@ -62,18 +58,12 @@ protected Tooltip createTooltip(ValidationMessage message) {
         Tooltip tooltip = new Tooltip(message.getText());
         tooltip
             .getStyleClass()
-            .add(
-                Severity.ERROR == message.getSeverity()
-                    ? "tooltip-error"
-                    : "tooltip-warning"
-            );
+            .add(Severity.ERROR == message.getSeverity() ? "tooltip-error" : "tooltip-warning");
         return tooltip;
     }
 
     @Override
-    protected Collection<Decoration> createValidationDecorations(
-        ValidationMessage message
-    ) {
+    protected Collection<Decoration> createValidationDecorations(ValidationMessage message) {
         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 7c0449a7c93..bf299bbdfde 100644
--- a/src/main/java/org/jabref/gui/util/JabRefResourceLocator.java
+++ b/src/main/java/org/jabref/gui/util/JabRefResourceLocator.java
@@ -8,9 +8,7 @@
 
 public class JabRefResourceLocator implements ResourceLocator {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(
-        JabRefResourceLocator.class
-    );
+    private static final Logger LOGGER = LoggerFactory.getLogger(JabRefResourceLocator.class);
 
     @Override
     public ResourceBundle getResourceBundle(String s) {
diff --git a/src/main/java/org/jabref/gui/util/OptionalObjectProperty.java b/src/main/java/org/jabref/gui/util/OptionalObjectProperty.java
index 1b721c0e1dc..515cf3367df 100644
--- a/src/main/java/org/jabref/gui/util/OptionalObjectProperty.java
+++ b/src/main/java/org/jabref/gui/util/OptionalObjectProperty.java
@@ -9,8 +9,7 @@
 /**
  * Similar to {@link com.tobiasdiez.easybind.monadic.MonadicObservableValue}
  */
-public class OptionalObjectProperty<T>
-    extends SimpleObjectProperty<Optional<T>> {
+public class OptionalObjectProperty<T> extends SimpleObjectProperty<Optional<T>> {
 
     private OptionalObjectProperty(Optional<T> initialValue) {
         super(initialValue);
diff --git a/src/main/java/org/jabref/gui/util/OptionalValueTableCellFactory.java b/src/main/java/org/jabref/gui/util/OptionalValueTableCellFactory.java
index 85b4cd98ad7..13bac71b916 100644
--- a/src/main/java/org/jabref/gui/util/OptionalValueTableCellFactory.java
+++ b/src/main/java/org/jabref/gui/util/OptionalValueTableCellFactory.java
@@ -11,8 +11,7 @@
  * @param <S> view model of table row
  * @param <T> cell value
  */
-public class OptionalValueTableCellFactory<S, T>
-    extends ValueTableCellFactory<S, Optional<T>> {
+public class OptionalValueTableCellFactory<S, T> extends ValueTableCellFactory<S, Optional<T>> {
 
     private BiFunction<S, T, Node> toGraphicIfPresent;
     private Node defaultGraphic;
@@ -25,9 +24,7 @@ public OptionalValueTableCellFactory<S, T> withGraphicIfPresent(
         return this;
     }
 
-    public OptionalValueTableCellFactory<S, T> withDefaultGraphic(
-        Node defaultGraphic
-    ) {
+    public OptionalValueTableCellFactory<S, T> withDefaultGraphic(Node defaultGraphic) {
         this.defaultGraphic = defaultGraphic;
         setToGraphic();
         return this;
diff --git a/src/main/java/org/jabref/gui/util/RecursiveTreeItem.java b/src/main/java/org/jabref/gui/util/RecursiveTreeItem.java
index e769a137d22..24e5b009ca4 100644
--- a/src/main/java/org/jabref/gui/util/RecursiveTreeItem.java
+++ b/src/main/java/org/jabref/gui/util/RecursiveTreeItem.java
@@ -21,14 +21,10 @@ public class RecursiveTreeItem<T> extends CheckBoxTreeItem<T> {
 
     private final Callback<T, BooleanProperty> expandedProperty;
     private final Callback<T, ObservableList<T>> childrenFactory;
-    private final ObjectProperty<Predicate<T>> filter =
-        new SimpleObjectProperty<>();
+    private final ObjectProperty<Predicate<T>> filter = new SimpleObjectProperty<>();
     private FilteredList<RecursiveTreeItem<T>> children;
 
-    public RecursiveTreeItem(
-        final T value,
-        Callback<T, ObservableList<T>> func
-    ) {
+    public RecursiveTreeItem(final T value, Callback<T, ObservableList<T>> func) {
         this(value, func, null, null);
     }
 
@@ -77,10 +73,7 @@ private RecursiveTreeItem(
             });
     }
 
-    private void bindExpandedProperty(
-        T value,
-        Callback<T, BooleanProperty> expandedProperty
-    ) {
+    private void bindExpandedProperty(T value, Callback<T, BooleanProperty> expandedProperty) {
         if (expandedProperty != null) {
             expandedProperty().bindBidirectional(expandedProperty.call(value));
         }
@@ -100,9 +93,7 @@ private void addChildrenListener(T value) {
                             filter
                         )
                 )
-                .filtered(
-                    Bindings.createObjectBinding(() -> this::showNode, filter)
-                );
+                .filtered(Bindings.createObjectBinding(() -> this::showNode, filter));
 
         Bindings.bindContent(getChildren(), children);
     }
diff --git a/src/main/java/org/jabref/gui/util/StreamGobbler.java b/src/main/java/org/jabref/gui/util/StreamGobbler.java
index 103ad9c3cb2..c9f2240218a 100644
--- a/src/main/java/org/jabref/gui/util/StreamGobbler.java
+++ b/src/main/java/org/jabref/gui/util/StreamGobbler.java
@@ -10,9 +10,7 @@
 
 public class StreamGobbler implements Runnable {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(
-        StreamGobbler.class
-    );
+    private static final Logger LOGGER = LoggerFactory.getLogger(StreamGobbler.class);
 
     private InputStream inputStream;
     private Consumer<String> consumer;
@@ -24,17 +22,10 @@ public StreamGobbler(InputStream inputStream, Consumer<String> consumer) {
 
     @Override
     public void run() {
-        try (
-            BufferedReader reader = new BufferedReader(
-                new InputStreamReader(inputStream)
-            )
-        ) {
+        try (BufferedReader reader = new BufferedReader(new InputStreamReader(inputStream))) {
             reader.lines().forEach(consumer);
         } catch (IOException e) {
-            LOGGER.error(
-                "Error when reading process stream from external application",
-                e
-            );
+            LOGGER.error("Error when reading process stream from external application", e);
         }
     }
 }
diff --git a/src/main/java/org/jabref/gui/util/TooltipTextUtil.java b/src/main/java/org/jabref/gui/util/TooltipTextUtil.java
index 630bba3742f..914bfa1b4fb 100644
--- a/src/main/java/org/jabref/gui/util/TooltipTextUtil.java
+++ b/src/main/java/org/jabref/gui/util/TooltipTextUtil.java
@@ -15,13 +15,9 @@ 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
     // .*? 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 TT_TEXT = Pattern.compile("(?s)(?<before>.*?)<tt>(?<in>.*?)</tt>");
 
-    private static final Pattern B_TEXT = Pattern.compile(
-        "(?s)(?<before>.*?)<b>(?<in>.*?)</b>"
-    );
+    private static final Pattern B_TEXT = Pattern.compile("(?s)(?<before>.*?)<b>(?<in>.*?)</b>");
 
     public enum TextType {
         NORMAL,
@@ -68,12 +64,7 @@ public static List<Text> createTextsFromHtml(String htmlString) {
                 result.addAll(convertHtmlBold(before));
             }
             String in = matcher.group("in");
-            result.add(
-                TooltipTextUtil.createText(
-                    in,
-                    TooltipTextUtil.TextType.MONOSPACED
-                )
-            );
+            result.add(TooltipTextUtil.createText(in, TooltipTextUtil.TextType.MONOSPACED));
         }
         if (lastMatchPos < htmlString.length()) {
             String remaining = htmlString.substring(lastMatchPos);
@@ -108,10 +99,7 @@ private static List<Text> convertHtmlBold(String htmlString) {
     /**
      * Formats a String to multiple Texts by replacing some parts and adding font characteristics.
      */
-    public static List<Text> formatToTexts(
-        String original,
-        TextReplacement... replacements
-    ) {
+    public static List<Text> formatToTexts(String original, TextReplacement... replacements) {
         List<Text> textList = new ArrayList<>();
         textList.add(new Text(original));
         for (TextReplacement replacement : replacements) {
@@ -121,10 +109,7 @@ public static List<Text> formatToTexts(
         return textList;
     }
 
-    private static void splitReplace(
-        List<Text> textList,
-        TextReplacement replacement
-    ) {
+    private static void splitReplace(List<Text> textList, TextReplacement replacement) {
         Optional<Text> textContainingReplacement = textList
             .stream()
             .filter(it -> it.getText().contains(replacement.toReplace))
@@ -138,55 +123,34 @@ private static void splitReplace(
                 if ("".equals(textParts[0])) {
                     textList.add(
                         index,
-                        TooltipTextUtil.createText(
-                            replacement.replacement,
-                            replacement.textType
-                        )
+                        TooltipTextUtil.createText(replacement.replacement, replacement.textType)
                     );
                     textList.add(
                         index + 1,
-                        TooltipTextUtil.createText(
-                            textParts[1],
-                            TooltipTextUtil.TextType.NORMAL
-                        )
+                        TooltipTextUtil.createText(textParts[1], TooltipTextUtil.TextType.NORMAL)
                     );
                 } else {
                     textList.add(
                         index,
-                        TooltipTextUtil.createText(
-                            textParts[0],
-                            TooltipTextUtil.TextType.NORMAL
-                        )
+                        TooltipTextUtil.createText(textParts[0], TooltipTextUtil.TextType.NORMAL)
                     );
                     textList.add(
                         index + 1,
-                        TooltipTextUtil.createText(
-                            replacement.replacement,
-                            replacement.textType
-                        )
+                        TooltipTextUtil.createText(replacement.replacement, replacement.textType)
                     );
                     textList.add(
                         index + 2,
-                        TooltipTextUtil.createText(
-                            textParts[1],
-                            TooltipTextUtil.TextType.NORMAL
-                        )
+                        TooltipTextUtil.createText(textParts[1], TooltipTextUtil.TextType.NORMAL)
                     );
                 }
             } else if (textParts.length == 1) {
                 textList.add(
                     index,
-                    TooltipTextUtil.createText(
-                        textParts[0],
-                        TooltipTextUtil.TextType.NORMAL
-                    )
+                    TooltipTextUtil.createText(textParts[0], TooltipTextUtil.TextType.NORMAL)
                 );
                 textList.add(
                     index + 1,
-                    TooltipTextUtil.createText(
-                        replacement.replacement,
-                        replacement.textType
-                    )
+                    TooltipTextUtil.createText(replacement.replacement, replacement.textType)
                 );
             } else {
                 throw new IllegalStateException(
@@ -224,9 +188,7 @@ public TextReplacement(
     public static String textToHtmlString(Text text) {
         String textString = text.getText();
         textString = textString.replace("\n", "<br>");
-        if (
-            text.getStyleClass().toString().contains("tooltip-text-monospaced")
-        ) {
+        if (text.getStyleClass().toString().contains("tooltip-text-monospaced")) {
             textString = String.format("<tt>%s</tt>", textString);
         }
         if (text.getStyleClass().toString().contains("tooltip-text-bold")) {
diff --git a/src/main/java/org/jabref/gui/util/UiThreadList.java b/src/main/java/org/jabref/gui/util/UiThreadList.java
index 795a0daa66f..bea5e1bcdf1 100644
--- a/src/main/java/org/jabref/gui/util/UiThreadList.java
+++ b/src/main/java/org/jabref/gui/util/UiThreadList.java
@@ -10,18 +10,14 @@
 
 class UiThreadList<T> extends TransformationList<T, T> {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(
-        UiThreadList.class
-    );
+    private static final Logger LOGGER = LoggerFactory.getLogger(UiThreadList.class);
 
     public UiThreadList(ObservableList<? extends T> source) {
         super(source);
     }
 
     @Override
-    protected void sourceChanged(
-        ListChangeListener.Change<? extends T> change
-    ) {
+    protected void sourceChanged(ListChangeListener.Change<? extends T> change) {
         if (Platform.isFxApplicationThread()) {
             fireChange(change);
         } else {
diff --git a/src/main/java/org/jabref/gui/util/ValueTableCellFactory.java b/src/main/java/org/jabref/gui/util/ValueTableCellFactory.java
index 7edf926019c..9b0bec9348f 100644
--- a/src/main/java/org/jabref/gui/util/ValueTableCellFactory.java
+++ b/src/main/java/org/jabref/gui/util/ValueTableCellFactory.java
@@ -21,16 +21,11 @@
  * @param <S> view model of table row
  * @param <T> cell value
  */
-public class ValueTableCellFactory<S, T>
-    implements Callback<TableColumn<S, T>, TableCell<S, T>> {
+public class ValueTableCellFactory<S, T> implements Callback<TableColumn<S, T>, TableCell<S, T>> {
 
     private Function<T, String> toText;
     private BiFunction<S, T, Node> toGraphic;
-    private BiFunction<
-        S,
-        T,
-        EventHandler<? super MouseEvent>
-    > toOnMouseClickedEvent;
+    private BiFunction<S, T, EventHandler<? super MouseEvent>> toOnMouseClickedEvent;
     private Function<T, BooleanExpression> toDisableExpression;
     private Function<T, BooleanExpression> toVisibleExpression;
     private BiFunction<S, T, String> toTooltip;
@@ -42,30 +37,22 @@ public ValueTableCellFactory<S, T> withText(Function<T, String> toText) {
         return this;
     }
 
-    public ValueTableCellFactory<S, T> withGraphic(
-        Function<T, Node> toGraphic
-    ) {
+    public ValueTableCellFactory<S, T> withGraphic(Function<T, Node> toGraphic) {
         this.toGraphic = (rowItem, value) -> toGraphic.apply(value);
         return this;
     }
 
-    public ValueTableCellFactory<S, T> withGraphic(
-        BiFunction<S, T, Node> toGraphic
-    ) {
+    public ValueTableCellFactory<S, T> withGraphic(BiFunction<S, T, Node> toGraphic) {
         this.toGraphic = toGraphic;
         return this;
     }
 
-    public ValueTableCellFactory<S, T> withTooltip(
-        BiFunction<S, T, String> toTooltip
-    ) {
+    public ValueTableCellFactory<S, T> withTooltip(BiFunction<S, T, String> toTooltip) {
         this.toTooltip = toTooltip;
         return this;
     }
 
-    public ValueTableCellFactory<S, T> withTooltip(
-        Function<T, String> toTooltip
-    ) {
+    public ValueTableCellFactory<S, T> withTooltip(Function<T, String> toTooltip) {
         this.toTooltip = (rowItem, value) -> toTooltip.apply(value);
         return this;
     }
@@ -80,8 +67,7 @@ public ValueTableCellFactory<S, T> withOnMouseClickedEvent(
     public ValueTableCellFactory<S, T> withOnMouseClickedEvent(
         Function<T, EventHandler<? super MouseEvent>> toOnMouseClickedEvent
     ) {
-        this.toOnMouseClickedEvent =
-            (rowItem, value) -> toOnMouseClickedEvent.apply(value);
+        this.toOnMouseClickedEvent = (rowItem, value) -> toOnMouseClickedEvent.apply(value);
         return this;
     }
 
@@ -106,9 +92,7 @@ public ValueTableCellFactory<S, T> withContextMenu(
         return this;
     }
 
-    public ValueTableCellFactory<S, T> withMenu(
-        BiFunction<S, T, ContextMenu> menuFactory
-    ) {
+    public ValueTableCellFactory<S, T> withMenu(BiFunction<S, T, ContextMenu> menuFactory) {
         this.menuFactory = menuFactory;
         return this;
     }
@@ -143,9 +127,7 @@ protected void updateItem(T item, boolean empty) {
                         String tooltipText = toTooltip.apply(rowItem, item);
                         if (StringUtil.isNotBlank(tooltipText)) {
                             Screen currentScreen = Screen.getPrimary();
-                            double maxWidth = currentScreen
-                                .getBounds()
-                                .getWidth();
+                            double maxWidth = currentScreen.getBounds().getWidth();
                             Tooltip tooltip = new Tooltip(tooltipText);
                             tooltip.setMaxWidth((maxWidth * 2) / 3);
                             tooltip.setWrapText(true);
@@ -158,12 +140,7 @@ protected void updateItem(T item, boolean empty) {
                         setOnContextMenuRequested(event -> {
                             if (!isEmpty()) {
                                 setContextMenu(contextMenuFactory.apply(item));
-                                getContextMenu()
-                                    .show(
-                                        this,
-                                        event.getScreenX(),
-                                        event.getScreenY()
-                                    );
+                                getContextMenu().show(this, event.getScreenX(), event.getScreenY());
                             }
                             event.consume();
                         });
@@ -171,23 +148,14 @@ protected void updateItem(T item, boolean empty) {
 
                     setOnMouseClicked(event -> {
                         if (toOnMouseClickedEvent != null) {
-                            toOnMouseClickedEvent
-                                .apply(rowItem, item)
-                                .handle(event);
+                            toOnMouseClickedEvent.apply(rowItem, item).handle(event);
                         }
 
                         if ((menuFactory != null) && !event.isConsumed()) {
                             if (event.getButton() == MouseButton.PRIMARY) {
-                                ContextMenu menu = menuFactory.apply(
-                                    rowItem,
-                                    item
-                                );
+                                ContextMenu menu = menuFactory.apply(rowItem, item);
                                 if (menu != null) {
-                                    menu.show(
-                                        this,
-                                        event.getScreenX(),
-                                        event.getScreenY()
-                                    );
+                                    menu.show(this, event.getScreenX(), event.getScreenY());
                                     event.consume();
                                 }
                             }
diff --git a/src/main/java/org/jabref/gui/util/ViewModelListCellFactory.java b/src/main/java/org/jabref/gui/util/ViewModelListCellFactory.java
index 9ccc462ef40..6ac93ac1ae8 100644
--- a/src/main/java/org/jabref/gui/util/ViewModelListCellFactory.java
+++ b/src/main/java/org/jabref/gui/util/ViewModelListCellFactory.java
@@ -27,11 +27,9 @@
  *
  * @param <T> cell value
  */
-public class ViewModelListCellFactory<T>
-    implements Callback<ListView<T>, ListCell<T>> {
+public class ViewModelListCellFactory<T> implements Callback<ListView<T>, ListCell<T>> {
 
-    private static final PseudoClass INVALID_PSEUDO_CLASS =
-        PseudoClass.getPseudoClass("invalid");
+    private static final PseudoClass INVALID_PSEUDO_CLASS = PseudoClass.getPseudoClass("invalid");
 
     private Callback<T, String> toText;
     private Callback<T, Node> toGraphic;
@@ -44,10 +42,8 @@ public class ViewModelListCellFactory<T>
     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) {
@@ -55,16 +51,12 @@ public ViewModelListCellFactory<T> withText(Callback<T, String> toText) {
         return this;
     }
 
-    public ViewModelListCellFactory<T> withGraphic(
-        Callback<T, Node> toGraphic
-    ) {
+    public ViewModelListCellFactory<T> withGraphic(Callback<T, Node> toGraphic) {
         this.toGraphic = toGraphic;
         return this;
     }
 
-    public ViewModelListCellFactory<T> withIcon(
-        Callback<T, JabRefIcon> toIcon
-    ) {
+    public ViewModelListCellFactory<T> withIcon(Callback<T, JabRefIcon> toIcon) {
         this.toGraphic =
             viewModel -> {
                 JabRefIcon icon = toIcon.call(viewModel);
@@ -81,17 +73,11 @@ public ViewModelListCellFactory<T> withIcon(
         Callback<T, Color> toColor
     ) {
         this.toGraphic =
-            viewModel ->
-                toIcon
-                    .call(viewModel)
-                    .withColor(toColor.call(viewModel))
-                    .getGraphicNode();
+            viewModel -> toIcon.call(viewModel).withColor(toColor.call(viewModel)).getGraphicNode();
         return this;
     }
 
-    public ViewModelListCellFactory<T> withStringTooltip(
-        Callback<T, String> toStringTooltip
-    ) {
+    public ViewModelListCellFactory<T> withStringTooltip(Callback<T, String> toStringTooltip) {
         this.toTooltip =
             viewModel -> {
                 String tooltipText = toStringTooltip.call(viewModel);
@@ -103,23 +89,17 @@ public ViewModelListCellFactory<T> withStringTooltip(
         return this;
     }
 
-    public ViewModelListCellFactory<T> withTooltip(
-        Callback<T, Tooltip> toTooltip
-    ) {
+    public ViewModelListCellFactory<T> withTooltip(Callback<T, Tooltip> toTooltip) {
         this.toTooltip = toTooltip;
         return this;
     }
 
-    public ViewModelListCellFactory<T> withContextMenu(
-        Callback<T, ContextMenu> toContextMenu
-    ) {
+    public ViewModelListCellFactory<T> withContextMenu(Callback<T, ContextMenu> toContextMenu) {
         this.toContextMenu = toContextMenu;
         return this;
     }
 
-    public ViewModelListCellFactory<T> withStyleClass(
-        Callback<T, String> toStyleClass
-    ) {
+    public ViewModelListCellFactory<T> withStyleClass(Callback<T, String> toStyleClass) {
         this.toStyleClass = toStyleClass;
         return this;
     }
@@ -218,9 +198,7 @@ protected void updateItem(T item, boolean empty) {
                         setGraphic(toGraphic.call(viewModel));
                     }
                     if (toOnMouseClickedEvent != null) {
-                        setOnMouseClicked(event ->
-                            toOnMouseClickedEvent.accept(viewModel, event)
-                        );
+                        setOnMouseClicked(event -> toOnMouseClickedEvent.accept(viewModel, event));
                     }
                     if (toStyleClass != null) {
                         getStyleClass().setAll(toStyleClass.call(viewModel));
@@ -232,36 +210,27 @@ protected void updateItem(T item, boolean empty) {
                         setContextMenu(toContextMenu.call(viewModel));
                     }
                     if (toOnDragDetected != null) {
-                        setOnDragDetected(event ->
-                            toOnDragDetected.accept(viewModel, event)
-                        );
+                        setOnDragDetected(event -> toOnDragDetected.accept(viewModel, event));
                     }
                     if (toOnDragDropped != null) {
-                        setOnDragDropped(event ->
-                            toOnDragDropped.accept(viewModel, event)
-                        );
+                        setOnDragDropped(event -> toOnDragDropped.accept(viewModel, event));
                     }
                     if (toOnDragEntered != null) {
-                        setOnDragEntered(event ->
-                            toOnDragEntered.accept(viewModel, event)
-                        );
+                        setOnDragEntered(event -> toOnDragEntered.accept(viewModel, event));
                     }
                     if (toOnDragExited != null) {
-                        setOnDragExited(event ->
-                            toOnDragExited.accept(viewModel, event)
-                        );
+                        setOnDragExited(event -> toOnDragExited.accept(viewModel, event));
                     }
                     if (toOnDragOver != null) {
-                        setOnDragOver(event ->
-                            toOnDragOver.accept(viewModel, event)
-                        );
+                        setOnDragOver(event -> toOnDragOver.accept(viewModel, event));
                     }
                     for (Map.Entry<
                         PseudoClass,
                         Callback<T, ObservableValue<Boolean>>
                     > pseudoClassWithCondition : pseudoClasses.entrySet()) {
-                        ObservableValue<Boolean> condition =
-                            pseudoClassWithCondition.getValue().call(viewModel);
+                        ObservableValue<Boolean> condition = pseudoClassWithCondition
+                            .getValue()
+                            .call(viewModel);
                         subscriptions.add(
                             BindingsHelper.includePseudoClassWhen(
                                 this,
@@ -274,18 +243,13 @@ protected void updateItem(T item, boolean empty) {
                         validationStatusProperty
                             .call(viewModel)
                             .getHighestMessage()
-                            .ifPresent(message ->
-                                setTooltip(new Tooltip(message.getMessage()))
-                            );
+                            .ifPresent(message -> setTooltip(new Tooltip(message.getMessage())));
 
                         subscriptions.add(
                             BindingsHelper.includePseudoClassWhen(
                                 this,
                                 INVALID_PSEUDO_CLASS,
-                                validationStatusProperty
-                                    .call(viewModel)
-                                    .validProperty()
-                                    .not()
+                                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 877117b3807..1de1c223ac1 100644
--- a/src/main/java/org/jabref/gui/util/ViewModelTableRowFactory.java
+++ b/src/main/java/org/jabref/gui/util/ViewModelTableRowFactory.java
@@ -23,8 +23,7 @@
  *
  * @param <S> view model
  */
-public class ViewModelTableRowFactory<S>
-    implements Callback<TableView<S>, TableRow<S>> {
+public class ViewModelTableRowFactory<S> implements Callback<TableView<S>, TableRow<S>> {
 
     private BiConsumer<S, ? super MouseEvent> onMouseClickedEvent;
     private Function<S, ContextMenu> contextMenuFactory;
@@ -33,11 +32,7 @@ public class ViewModelTableRowFactory<S>
     private BiConsumer<S, ? super DragEvent> toOnDragEntered;
     private TriConsumer<TableRow<S>, S, ? super DragEvent> toOnDragExited;
     private TriConsumer<TableRow<S>, S, ? super DragEvent> toOnDragOver;
-    private TriConsumer<
-        TableRow<S>,
-        S,
-        ? super MouseDragEvent
-    > toOnMouseDragEntered;
+    private TriConsumer<TableRow<S>, S, ? super MouseDragEvent> toOnMouseDragEntered;
     private Callback<S, String> toTooltip;
 
     public ViewModelTableRowFactory<S> withOnMouseClickedEvent(
@@ -65,8 +60,7 @@ public ViewModelTableRowFactory<S> setOnDragDetected(
         BiConsumer<S, ? super MouseEvent> toOnDragDetected
     ) {
         this.toOnDragDetected =
-            (row, viewModel, event) ->
-                toOnDragDetected.accept(viewModel, event);
+            (row, viewModel, event) -> toOnDragDetected.accept(viewModel, event);
         return this;
     }
 
@@ -80,8 +74,7 @@ public ViewModelTableRowFactory<S> setOnDragDropped(
     public ViewModelTableRowFactory<S> setOnDragDropped(
         BiConsumer<S, ? super DragEvent> toOnDragDropped
     ) {
-        return setOnDragDropped((row, viewModel, event) ->
-            toOnDragDropped.accept(viewModel, event)
+        return setOnDragDropped((row, viewModel, event) -> toOnDragDropped.accept(viewModel, event)
         );
     }
 
@@ -117,9 +110,7 @@ public ViewModelTableRowFactory<S> setOnDragExited(
     public ViewModelTableRowFactory<S> setOnDragExited(
         BiConsumer<S, ? super DragEvent> toOnDragExited
     ) {
-        return setOnDragExited((row, viewModel, event) ->
-            toOnDragExited.accept(viewModel, event)
-        );
+        return setOnDragExited((row, viewModel, event) -> toOnDragExited.accept(viewModel, event));
     }
 
     public ViewModelTableRowFactory<S> setOnDragOver(
@@ -132,14 +123,10 @@ public ViewModelTableRowFactory<S> setOnDragOver(
     public ViewModelTableRowFactory<S> setOnDragOver(
         BiConsumer<S, ? super DragEvent> toOnDragOver
     ) {
-        return setOnDragOver((row, viewModel, event) ->
-            toOnDragOver.accept(viewModel, event)
-        );
+        return setOnDragOver((row, viewModel, event) -> toOnDragOver.accept(viewModel, event));
     }
 
-    public ViewModelTableRowFactory<S> withTooltip(
-        Callback<S, String> toTooltip
-    ) {
+    public ViewModelTableRowFactory<S> withTooltip(Callback<S, String> toTooltip) {
         this.toTooltip = toTooltip;
         return this;
     }
@@ -168,9 +155,7 @@ public TableRow<S> call(TableView<S> tableView) {
             row.setOnContextMenuRequested(event -> {
                 if (!row.isEmpty()) {
                     row.setContextMenu(contextMenuFactory.apply(row.getItem()));
-                    row
-                        .getContextMenu()
-                        .show(row, event.getScreenX(), event.getScreenY());
+                    row.getContextMenu().show(row, event.getScreenX(), event.getScreenY());
                 }
                 event.consume();
             });
@@ -181,33 +166,20 @@ public TableRow<S> call(TableView<S> tableView) {
                 event -> {
                     boolean rowFocused =
                         !row.isEmpty() &&
-                        tableView.getFocusModel().getFocusedIndex() ==
-                            row.getIndex();
+                        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);
+                        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.setContextMenu(contextMenuFactory.apply(row.getItem()));
                         }
                         row
                             .getContextMenu()
-                            .show(
-                                row,
-                                screenPosition.getX(),
-                                screenPosition.getY()
-                            );
+                            .show(row, screenPosition.getX(), screenPosition.getY());
                     }
                 }
             );
diff --git a/src/main/java/org/jabref/gui/util/ViewModelTextFieldTableCellVisualizationFactory.java b/src/main/java/org/jabref/gui/util/ViewModelTextFieldTableCellVisualizationFactory.java
index b3a24d71cbb..ec00ad8aa9c 100644
--- a/src/main/java/org/jabref/gui/util/ViewModelTextFieldTableCellVisualizationFactory.java
+++ b/src/main/java/org/jabref/gui/util/ViewModelTextFieldTableCellVisualizationFactory.java
@@ -20,8 +20,7 @@
 public class ViewModelTextFieldTableCellVisualizationFactory<S, T>
     implements Callback<TableColumn<S, T>, TableCell<S, T>> {
 
-    private static final PseudoClass INVALID_PSEUDO_CLASS =
-        PseudoClass.getPseudoClass("invalid");
+    private static final PseudoClass INVALID_PSEUDO_CLASS = PseudoClass.getPseudoClass("invalid");
 
     private Function<S, ValidationStatus> validationStatusProperty;
     private StringConverter<T> stringConverter;
@@ -33,10 +32,7 @@ public ViewModelTextFieldTableCellVisualizationFactory<S, T> withValidation(
         return this;
     }
 
-    public void install(
-        TableColumn<S, T> column,
-        StringConverter<T> stringConverter
-    ) {
+    public void install(TableColumn<S, T> column, StringConverter<T> stringConverter) {
         column.setCellFactory(this);
         this.stringConverter = stringConverter;
     }
@@ -76,9 +72,7 @@ private Optional<TextField> lookupTextField() {
                             (hbox.getChildren().size() > 1) &&
                             hbox.getChildren().get(1) instanceof TextField
                         ) {
-                            return Optional.of(
-                                (TextField) hbox.getChildren().get(1)
-                            );
+                            return Optional.of((TextField) hbox.getChildren().get(1));
                         }
                     }
                     return Optional.empty();
@@ -92,11 +86,7 @@ public void updateItem(T item, boolean empty) {
                 subscriptions.forEach(Subscription::unsubscribe);
                 subscriptions.clear();
 
-                if (
-                    empty ||
-                    getTableRow() == null ||
-                    getTableRow().getItem() == null
-                ) {
+                if (empty || getTableRow() == null || getTableRow().getItem() == null) {
                     setText(null);
                     setGraphic(null);
                     setOnMouseClicked(null);
@@ -108,18 +98,13 @@ public void updateItem(T item, boolean empty) {
                         validationStatusProperty
                             .apply(viewModel)
                             .getHighestMessage()
-                            .ifPresent(message ->
-                                setTooltip(new Tooltip(message.getMessage()))
-                            );
+                            .ifPresent(message -> setTooltip(new Tooltip(message.getMessage())));
 
                         subscriptions.add(
                             BindingsHelper.includePseudoClassWhen(
                                 this,
                                 INVALID_PSEUDO_CLASS,
-                                validationStatusProperty
-                                    .apply(viewModel)
-                                    .validProperty()
-                                    .not()
+                                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 9f7458d2d2e..4ab09dc7fb9 100644
--- a/src/main/java/org/jabref/gui/util/ViewModelTreeCellFactory.java
+++ b/src/main/java/org/jabref/gui/util/ViewModelTreeCellFactory.java
@@ -19,8 +19,7 @@
  *
  * @param <T> cell value
  */
-public class ViewModelTreeCellFactory<T>
-    implements Callback<TreeView<T>, TreeCell<T>> {
+public class ViewModelTreeCellFactory<T> implements Callback<TreeView<T>, TreeCell<T>> {
 
     private Callback<T, String> toText;
     private Callback<T, Node> toGraphic;
@@ -32,23 +31,17 @@ public ViewModelTreeCellFactory<T> withText(Callback<T, String> toText) {
         return this;
     }
 
-    public ViewModelTreeCellFactory<T> withGraphic(
-        Callback<T, Node> toGraphic
-    ) {
+    public ViewModelTreeCellFactory<T> withGraphic(Callback<T, Node> toGraphic) {
         this.toGraphic = toGraphic;
         return this;
     }
 
-    public ViewModelTreeCellFactory<T> withIcon(
-        Callback<T, JabRefIcon> toIcon
-    ) {
+    public ViewModelTreeCellFactory<T> withIcon(Callback<T, JabRefIcon> toIcon) {
         this.toGraphic = viewModel -> toIcon.call(viewModel).getGraphicNode();
         return this;
     }
 
-    public ViewModelTreeCellFactory<T> withTooltip(
-        Callback<T, String> toTooltip
-    ) {
+    public ViewModelTreeCellFactory<T> withTooltip(Callback<T, String> toTooltip) {
         this.toTooltip = toTooltip;
         return this;
     }
@@ -66,24 +59,17 @@ public void install(TreeView<T> treeView) {
 
     @Override
     public TreeCell<T> call(TreeView<T> tree) {
-        Callback<TreeItem<T>, ObservableValue<Boolean>> getSelectedProperty =
-            item -> {
-                if (item instanceof CheckBoxTreeItem<?>) {
-                    return ((CheckBoxTreeItem<?>) item).selectedProperty();
-                }
-                return null;
-            };
+        Callback<TreeItem<T>, ObservableValue<Boolean>> getSelectedProperty = item -> {
+            if (item instanceof CheckBoxTreeItem<?>) {
+                return ((CheckBoxTreeItem<?>) item).selectedProperty();
+            }
+            return null;
+        };
 
-        StringConverter<TreeItem<T>> converter = new StringConverter<
-            TreeItem<T>
-        >() {
+        StringConverter<TreeItem<T>> converter = new StringConverter<TreeItem<T>>() {
             @Override
             public String toString(TreeItem<T> treeItem) {
-                return (
-                        treeItem == null ||
-                        treeItem.getValue() == null ||
-                        toText == null
-                    )
+                return (treeItem == null || treeItem.getValue() == null || toText == null)
                     ? ""
                     : toText.call(treeItem.getValue());
             }
diff --git a/src/main/java/org/jabref/gui/util/ViewModelTreeTableCellFactory.java b/src/main/java/org/jabref/gui/util/ViewModelTreeTableCellFactory.java
index 9727cf7b987..da384312755 100644
--- a/src/main/java/org/jabref/gui/util/ViewModelTreeTableCellFactory.java
+++ b/src/main/java/org/jabref/gui/util/ViewModelTreeTableCellFactory.java
@@ -23,30 +23,22 @@ public class ViewModelTreeTableCellFactory<S>
     private Callback<S, EventHandler<? super MouseEvent>> toOnMouseClickedEvent;
     private Callback<S, String> toTooltip;
 
-    public ViewModelTreeTableCellFactory<S> withText(
-        Callback<S, String> toText
-    ) {
+    public ViewModelTreeTableCellFactory<S> withText(Callback<S, String> toText) {
         this.toText = toText;
         return this;
     }
 
-    public ViewModelTreeTableCellFactory<S> withGraphic(
-        Callback<S, Node> toGraphic
-    ) {
+    public ViewModelTreeTableCellFactory<S> withGraphic(Callback<S, Node> toGraphic) {
         this.toGraphic = toGraphic;
         return this;
     }
 
-    public ViewModelTreeTableCellFactory<S> withIcon(
-        Callback<S, JabRefIcon> toIcon
-    ) {
+    public ViewModelTreeTableCellFactory<S> withIcon(Callback<S, JabRefIcon> toIcon) {
         this.toGraphic = viewModel -> toIcon.call(viewModel).getGraphicNode();
         return this;
     }
 
-    public ViewModelTreeTableCellFactory<S> withTooltip(
-        Callback<S, String> toTooltip
-    ) {
+    public ViewModelTreeTableCellFactory<S> withTooltip(Callback<S, String> toTooltip) {
         this.toTooltip = toTooltip;
         return this;
     }
@@ -83,9 +75,7 @@ protected void updateItem(S viewModel, boolean empty) {
                         }
                     }
                     if (toOnMouseClickedEvent != null) {
-                        setOnMouseClicked(
-                            toOnMouseClickedEvent.call(viewModel)
-                        );
+                        setOnMouseClicked(toOnMouseClickedEvent.call(viewModel));
                     }
                 }
             }
@@ -93,9 +83,7 @@ protected void updateItem(S viewModel, boolean empty) {
     }
 
     public void install(TreeTableColumn<S, S> column) {
-        column.setCellValueFactory(cellData ->
-            cellData.getValue().valueProperty()
-        );
+        column.setCellValueFactory(cellData -> cellData.getValue().valueProperty());
         column.setCellFactory(this);
     }
 }
diff --git a/src/main/java/org/jabref/gui/util/ViewModelTreeTableRowFactory.java b/src/main/java/org/jabref/gui/util/ViewModelTreeTableRowFactory.java
index 5852e78358d..84450dafebb 100644
--- a/src/main/java/org/jabref/gui/util/ViewModelTreeTableRowFactory.java
+++ b/src/main/java/org/jabref/gui/util/ViewModelTreeTableRowFactory.java
@@ -32,24 +32,14 @@ public class ViewModelTreeTableRowFactory<S>
     private BiConsumer<S, ? super MouseEvent> onMousePressedEvent;
     private Consumer<TreeTableRow<S>> toCustomInitializer;
     private Function<S, ContextMenu> contextMenuFactory;
-    private TriConsumer<
-        TreeTableRow<S>,
-        S,
-        ? super MouseEvent
-    > toOnDragDetected;
+    private TriConsumer<TreeTableRow<S>, S, ? super MouseEvent> toOnDragDetected;
     private TriConsumer<TreeTableRow<S>, S, ? super DragEvent> toOnDragDropped;
     private BiConsumer<S, ? super DragEvent> toOnDragEntered;
     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 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>>
@@ -94,8 +84,7 @@ public ViewModelTreeTableRowFactory<S> setOnDragDetected(
         BiConsumer<S, ? super MouseEvent> toOnDragDetected
     ) {
         this.toOnDragDetected =
-            (row, viewModel, event) ->
-                toOnDragDetected.accept(viewModel, event);
+            (row, viewModel, event) -> toOnDragDetected.accept(viewModel, event);
         return this;
     }
 
@@ -109,8 +98,7 @@ public ViewModelTreeTableRowFactory<S> setOnDragDropped(
     public ViewModelTreeTableRowFactory<S> setOnDragDropped(
         BiConsumer<S, ? super DragEvent> toOnDragDropped
     ) {
-        return setOnDragDropped((row, viewModel, event) ->
-            toOnDragDropped.accept(viewModel, event)
+        return setOnDragDropped((row, viewModel, event) -> toOnDragDropped.accept(viewModel, event)
         );
     }
 
@@ -146,9 +134,7 @@ public ViewModelTreeTableRowFactory<S> setOnDragExited(
     public ViewModelTreeTableRowFactory<S> setOnDragExited(
         BiConsumer<S, ? super DragEvent> toOnDragExited
     ) {
-        return setOnDragExited((row, viewModel, event) ->
-            toOnDragExited.accept(viewModel, event)
-        );
+        return setOnDragExited((row, viewModel, event) -> toOnDragExited.accept(viewModel, event));
     }
 
     public ViewModelTreeTableRowFactory<S> setOnDragOver(
@@ -161,9 +147,7 @@ public ViewModelTreeTableRowFactory<S> setOnDragOver(
     public ViewModelTreeTableRowFactory<S> setOnDragOver(
         BiConsumer<S, ? super DragEvent> toOnDragOver
     ) {
-        return setOnDragOver((row, viewModel, event) ->
-            toOnDragOver.accept(viewModel, event)
-        );
+        return setOnDragOver((row, viewModel, event) -> toOnDragOver.accept(viewModel, event));
     }
 
     public ViewModelTreeTableRowFactory<S> withPseudoClass(
@@ -204,12 +188,7 @@ protected void updateItem(S row, boolean empty) {
                     setOnContextMenuRequested(event -> {
                         if (!isEmpty()) {
                             setContextMenu(contextMenuFactory.apply(row));
-                            getContextMenu()
-                                .show(
-                                    this,
-                                    event.getScreenX(),
-                                    event.getScreenY()
-                                );
+                            getContextMenu().show(this, event.getScreenX(), event.getScreenY());
                         }
                         event.consume();
                     });
@@ -220,36 +199,19 @@ protected void updateItem(S row, boolean empty) {
                         event -> {
                             boolean rowFocused =
                                 isEmpty() &&
-                                treeTableView
-                                        .getFocusModel()
-                                        .getFocusedIndex() ==
-                                    getIndex();
-                            if (
-                                event.getCode() == KeyCode.CONTEXT_MENU &&
-                                rowFocused
-                            ) {
+                                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);
+                                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())
-                                    );
+                                    setContextMenu(contextMenuFactory.apply(getItem()));
                                 }
                                 getContextMenu()
-                                    .show(
-                                        this,
-                                        screenPosition.getX(),
-                                        screenPosition.getY()
-                                    );
+                                    .show(this, screenPosition.getX(), screenPosition.getY());
                             }
                         }
                     );
@@ -257,15 +219,11 @@ protected void updateItem(S row, boolean empty) {
 
                 if (!empty && (row != null)) {
                     if (onMouseClickedEvent != null) {
-                        setOnMouseClicked(event ->
-                            onMouseClickedEvent.accept(getItem(), event)
-                        );
+                        setOnMouseClicked(event -> onMouseClickedEvent.accept(getItem(), event));
                     }
 
                     if (onMousePressedEvent != null) {
-                        setOnMousePressed(event ->
-                            onMousePressedEvent.accept(getItem(), event)
-                        );
+                        setOnMousePressed(event -> onMousePressedEvent.accept(getItem(), event));
                     }
 
                     if (toCustomInitializer != null) {
@@ -273,29 +231,19 @@ protected void updateItem(S row, boolean empty) {
                     }
 
                     if (toOnDragDetected != null) {
-                        setOnDragDetected(event ->
-                            toOnDragDetected.accept(this, getItem(), event)
-                        );
+                        setOnDragDetected(event -> toOnDragDetected.accept(this, getItem(), event));
                     }
                     if (toOnDragDropped != null) {
-                        setOnDragDropped(event ->
-                            toOnDragDropped.accept(this, getItem(), event)
-                        );
+                        setOnDragDropped(event -> toOnDragDropped.accept(this, getItem(), event));
                     }
                     if (toOnDragEntered != null) {
-                        setOnDragEntered(event ->
-                            toOnDragEntered.accept(getItem(), event)
-                        );
+                        setOnDragEntered(event -> toOnDragEntered.accept(getItem(), event));
                     }
                     if (toOnDragExited != null) {
-                        setOnDragExited(event ->
-                            toOnDragExited.accept(this, getItem(), event)
-                        );
+                        setOnDragExited(event -> toOnDragExited.accept(this, getItem(), event));
                     }
                     if (toOnDragOver != null) {
-                        setOnDragOver(event ->
-                            toOnDragOver.accept(this, getItem(), event)
-                        );
+                        setOnDragOver(event -> toOnDragOver.accept(this, getItem(), event));
                     }
 
                     if (toOnMouseDragEntered != null) {
@@ -310,8 +258,7 @@ protected void updateItem(S row, boolean empty) {
                     > eventFilter : eventFilters.entrySet()) {
                         addEventFilter(
                             eventFilter.getKey(),
-                            event ->
-                                eventFilter.getValue().accept(getItem(), event)
+                            event -> eventFilter.getValue().accept(getItem(), event)
                         );
                     }
 
@@ -319,8 +266,9 @@ protected void updateItem(S row, boolean empty) {
                         PseudoClass,
                         Callback<TreeTableRow<S>, ObservableValue<Boolean>>
                     > pseudoClassWithCondition : pseudoClasses.entrySet()) {
-                        ObservableValue<Boolean> condition =
-                            pseudoClassWithCondition.getValue().call(this);
+                        ObservableValue<Boolean> condition = pseudoClassWithCondition
+                            .getValue()
+                            .call(this);
                         subscriptions.add(
                             BindingsHelper.includePseudoClassWhen(
                                 this,
diff --git a/src/main/java/org/jabref/gui/util/ZipFileChooser.java b/src/main/java/org/jabref/gui/util/ZipFileChooser.java
index 5f155bbfef4..b6ca2df5fe0 100644
--- a/src/main/java/org/jabref/gui/util/ZipFileChooser.java
+++ b/src/main/java/org/jabref/gui/util/ZipFileChooser.java
@@ -32,39 +32,26 @@ public class ZipFileChooser extends BaseDialog<Path> {
     public ZipFileChooser(FileSystem zipFile) throws IOException {
         setTitle(Localization.lang("Select file from ZIP-archive"));
 
-        TableView<Path> table = new TableView<>(
-            getSelectableZipEntries(zipFile)
-        );
-        TableColumn<Path, String> nameColumn = new TableColumn<>(
-            Localization.lang("Name")
-        );
+        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, Number> sizeColumn = new TableColumn<>(
-            Localization.lang("Size")
-        );
+        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())
+        nameColumn.setCellValueFactory(data -> new ReadOnlyStringWrapper(data.getValue().toString())
         );
         modifiedColumn.setCellValueFactory(data -> {
             try {
                 return new ReadOnlyStringWrapper(
                     ZonedDateTime
                         .ofInstant(
-                            Files
-                                .getLastModifiedTime(data.getValue())
-                                .toInstant(),
+                            Files.getLastModifiedTime(data.getValue()).toInstant(),
                             ZoneId.systemDefault()
                         )
-                        .format(
-                            DateTimeFormatter.ofLocalizedDateTime(
-                                FormatStyle.MEDIUM
-                            )
-                        )
+                        .format(DateTimeFormatter.ofLocalizedDateTime(FormatStyle.MEDIUM))
                 );
             } catch (IOException e) {
                 // Ignore
@@ -83,9 +70,7 @@ public ZipFileChooser(FileSystem zipFile) throws IOException {
 
         getDialogPane().setContent(table);
 
-        getDialogPane()
-            .getButtonTypes()
-            .setAll(ButtonType.OK, ButtonType.CANCEL);
+        getDialogPane().getButtonTypes().setAll(ButtonType.OK, ButtonType.CANCEL);
 
         setResultConverter(button -> {
             if (button == ButtonType.OK) {
@@ -102,16 +87,12 @@ 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())
+            Files.walk(rootDir).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 c99fea60c38..05bc6416c7a 100644
--- a/src/main/java/org/jabref/gui/util/comparator/NumericFieldComparator.java
+++ b/src/main/java/org/jabref/gui/util/comparator/NumericFieldComparator.java
@@ -47,10 +47,7 @@ private static boolean isNumber(String number) {
         if (StringUtil.isNullOrEmpty(number)) {
             return false;
         }
-        if (
-            number.length() == 1 &&
-            (number.charAt(0) == '-' || number.charAt(0) == '+')
-        ) {
+        if (number.length() == 1 && (number.charAt(0) == '-' || number.charAt(0) == '+')) {
             return false;
         }
         for (int i = 0; i < number.length(); i++) {
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 76018685ef1..4989fdfcf56 100644
--- a/src/main/java/org/jabref/gui/util/comparator/RankingFieldComparator.java
+++ b/src/main/java/org/jabref/gui/util/comparator/RankingFieldComparator.java
@@ -9,8 +9,7 @@
  * <p>
  * Inverse comparison of ranking as rank5 is higher than rank1
  */
-public class RankingFieldComparator
-    implements Comparator<Optional<SpecialFieldValueViewModel>> {
+public class RankingFieldComparator implements Comparator<Optional<SpecialFieldValueViewModel>> {
 
     @Override
     public int compare(
@@ -19,10 +18,7 @@ public int compare(
     ) {
         if (val1.isPresent()) {
             if (val2.isPresent()) {
-                int compareToRes = val1
-                    .get()
-                    .getValue()
-                    .compareTo(val2.get().getValue());
+                int compareToRes = val1.get().getValue().compareTo(val2.get().getValue());
                 if (compareToRes == 0) {
                     return 0;
                 } else {
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 181953989ea..51e18fe09f0 100644
--- a/src/main/java/org/jabref/gui/util/comparator/SpecialFieldComparator.java
+++ b/src/main/java/org/jabref/gui/util/comparator/SpecialFieldComparator.java
@@ -4,8 +4,7 @@
 import java.util.Optional;
 import org.jabref.gui.specialfields.SpecialFieldValueViewModel;
 
-public class SpecialFieldComparator
-    implements Comparator<Optional<SpecialFieldValueViewModel>> {
+public class SpecialFieldComparator implements Comparator<Optional<SpecialFieldValueViewModel>> {
 
     @Override
     public int compare(
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 3f3163f857b..112cc01e113 100644
--- a/src/main/java/org/jabref/gui/util/component/TemporalAccessorPicker.java
+++ b/src/main/java/org/jabref/gui/util/component/TemporalAccessorPicker.java
@@ -44,8 +44,9 @@ public class TemporalAccessorPicker extends DatePicker {
     private final ObjectProperty<TemporalAccessor> temporalAccessorValue =
         new SimpleObjectProperty<>(null);
 
-    private final DateTimeFormatter defaultFormatter =
-        DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm");
+    private final DateTimeFormatter defaultFormatter = DateTimeFormatter.ofPattern(
+        "yyyy-MM-dd HH:mm"
+    );
     private final ObjectProperty<StringConverter<TemporalAccessor>> converter =
         new SimpleObjectProperty<>(null);
 
@@ -71,11 +72,7 @@ public TemporalAccessorPicker() {
                             Globals.getKeyPrefs()
                         )
                     );
-                TextInputControlBehavior.showContextMenu(
-                    getEditor(),
-                    contextMenu,
-                    event
-                );
+                TextInputControlBehavior.showContextMenu(getEditor(), contextMenu, event);
             });
     }
 
@@ -113,45 +110,34 @@ private static LocalDate getLocalDate(TemporalAccessor dateTime) {
         }
     }
 
-    public final ObjectProperty<
-        StringConverter<TemporalAccessor>
-    > stringConverterProperty() {
+    public final ObjectProperty<StringConverter<TemporalAccessor>> stringConverterProperty() {
         return converter;
     }
 
     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);
-                        }
-                    } else {
-                        return 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;
                 }
-            };
-        return Objects.requireNonNullElseGet(
-            stringConverterProperty().get(),
-            () -> newConverter
-        );
+            }
+        };
+        return Objects.requireNonNullElseGet(stringConverterProperty().get(), () -> newConverter);
     }
 
-    public final void setStringConverter(
-        StringConverter<TemporalAccessor> value
-    ) {
+    public final void setStringConverter(StringConverter<TemporalAccessor> value) {
         stringConverterProperty().set(value);
     }
 
@@ -159,9 +145,7 @@ public TemporalAccessor getTemporalAccessorValue() {
         return temporalAccessorValue.get();
     }
 
-    public void setTemporalAccessorValue(
-        TemporalAccessor temporalAccessorValue
-    ) {
+    public void setTemporalAccessorValue(TemporalAccessor temporalAccessorValue) {
         this.temporalAccessorValue.set(temporalAccessorValue);
     }
 
@@ -176,9 +160,7 @@ public String toString(LocalDate object) {
             TemporalAccessor value = getTemporalAccessorValue();
 
             // Keeps the original text when it is an invalid date
-            return value != null
-                ? getStringConverter().toString(value)
-                : getEditor().getText();
+            return value != null ? getStringConverter().toString(value) : getEditor().getText();
         }
 
         @Override
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 9ad59a70056..ec405d74160 100644
--- a/src/main/java/org/jabref/gui/util/uithreadaware/UiThreadChangeListener.java
+++ b/src/main/java/org/jabref/gui/util/uithreadaware/UiThreadChangeListener.java
@@ -12,11 +12,7 @@ public UiThreadChangeListener(ChangeListener<T> delegate) {
     }
 
     @Override
-    public void changed(
-        ObservableValue<? extends T> observable,
-        T oldValue,
-        T newValue
-    ) {
+    public void changed(ObservableValue<? extends T> observable, T oldValue, T newValue) {
         UiThreadHelper.ensureUiThreadExecution(() ->
             delegate.changed(observable, oldValue, newValue)
         );
diff --git a/src/main/java/org/jabref/gui/util/uithreadaware/UiThreadInvalidationListener.java b/src/main/java/org/jabref/gui/util/uithreadaware/UiThreadInvalidationListener.java
index 704463f2dc3..818c85a15a5 100644
--- a/src/main/java/org/jabref/gui/util/uithreadaware/UiThreadInvalidationListener.java
+++ b/src/main/java/org/jabref/gui/util/uithreadaware/UiThreadInvalidationListener.java
@@ -13,9 +13,7 @@ public UiThreadInvalidationListener(InvalidationListener delegate) {
 
     @Override
     public void invalidated(Observable observable) {
-        UiThreadHelper.ensureUiThreadExecution(() ->
-            delegate.invalidated(observable)
-        );
+        UiThreadHelper.ensureUiThreadExecution(() -> delegate.invalidated(observable));
     }
 
     @Override
diff --git a/src/main/java/org/jabref/http/JabrefMediaType.java b/src/main/java/org/jabref/http/JabrefMediaType.java
index bd28fe06695..9651b8a1949 100644
--- a/src/main/java/org/jabref/http/JabrefMediaType.java
+++ b/src/main/java/org/jabref/http/JabrefMediaType.java
@@ -3,6 +3,5 @@
 public class JabrefMediaType {
 
     public static final String BIBTEX = "application/x-bibtex";
-    public static final String JSON_CSL_ITEM =
-        "application/x-bibtex-library-csl+json";
+    public static final String JSON_CSL_ITEM = "application/x-bibtex-library-csl+json";
 }
diff --git a/src/main/java/org/jabref/http/dto/BibEntryDTO.java b/src/main/java/org/jabref/http/dto/BibEntryDTO.java
index 1b8b168f729..e54e5742c22 100644
--- a/src/main/java/org/jabref/http/dto/BibEntryDTO.java
+++ b/src/main/java/org/jabref/http/dto/BibEntryDTO.java
@@ -29,9 +29,7 @@ public record BibEntryDTO(
     String bibtex
 )
     implements Comparable<BibEntryDTO> {
-    public static final Logger LOGGER = LoggerFactory.getLogger(
-        BibEntryDTO.class
-    );
+    public static final Logger LOGGER = LoggerFactory.getLogger(BibEntryDTO.class);
 
     public BibEntryDTO(
         BibEntry bibEntry,
@@ -43,12 +41,7 @@ public BibEntryDTO(
             bibEntry.getSharedBibEntryData(),
             bibEntry.getUserComments(),
             bibEntry.getCitationKey().orElse(""),
-            convertToString(
-                bibEntry,
-                bibDatabaseMode,
-                fieldWriterPreferences,
-                bibEntryTypesManager
-            )
+            convertToString(bibEntry, bibDatabaseMode, fieldWriterPreferences, bibEntryTypesManager)
         );
     }
 
diff --git a/src/main/java/org/jabref/http/server/Application.java b/src/main/java/org/jabref/http/server/Application.java
index 17b349a3bea..7046fb4045d 100644
--- a/src/main/java/org/jabref/http/server/Application.java
+++ b/src/main/java/org/jabref/http/server/Application.java
@@ -29,13 +29,7 @@ public Set<Class<?>> getClasses() {
      * Separate initialization method, because @Inject does not support injection at the constructor
      */
     private void initialize() {
-        ServiceLocatorUtilities.addFactoryConstants(
-            serviceLocator,
-            new GsonFactory()
-        );
-        ServiceLocatorUtilities.addFactoryConstants(
-            serviceLocator,
-            new PreferenceServiceFactory()
-        );
+        ServiceLocatorUtilities.addFactoryConstants(serviceLocator, new GsonFactory());
+        ServiceLocatorUtilities.addFactoryConstants(serviceLocator, new PreferenceServiceFactory());
     }
 }
diff --git a/src/main/java/org/jabref/http/server/CORSFilter.java b/src/main/java/org/jabref/http/server/CORSFilter.java
index 37537cbc482..85f2b91d210 100644
--- a/src/main/java/org/jabref/http/server/CORSFilter.java
+++ b/src/main/java/org/jabref/http/server/CORSFilter.java
@@ -16,28 +16,16 @@ public void filter(
         String requestOrigin = requestContext.getHeaderString("Origin");
         if (requestOrigin == null) {
             // IntelliJ's rest client is calling
-            responseContext
-                .getHeaders()
-                .add("Access-Control-Allow-Origin", "*");
+            responseContext.getHeaders().add("Access-Control-Allow-Origin", "*");
         } else if (requestOrigin.contains("://localhost")) {
-            responseContext
-                .getHeaders()
-                .add("Access-Control-Allow-Origin", requestOrigin);
+            responseContext.getHeaders().add("Access-Control-Allow-Origin", requestOrigin);
         }
         responseContext
             .getHeaders()
-            .add(
-                "Access-Control-Allow-Methods",
-                "GET, POST, PUT, DELETE, OPTIONS"
-            );
+            .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");
+            .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 e4717bfe3c2..792592e3131 100644
--- a/src/main/java/org/jabref/http/server/LibrariesResource.java
+++ b/src/main/java/org/jabref/http/server/LibrariesResource.java
@@ -24,9 +24,7 @@ public String get() {
             .getLastFilesOpened()
             .stream()
             .map(java.nio.file.Path::of)
-            .map(p ->
-                p.getFileName() + "-" + BackupFileUtil.getUniqueFilePrefix(p)
-            )
+            .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 85ce0e88220..0a7940f4eb5 100644
--- a/src/main/java/org/jabref/http/server/LibraryResource.java
+++ b/src/main/java/org/jabref/http/server/LibraryResource.java
@@ -30,9 +30,7 @@
 @Path("libraries/{id}")
 public class LibraryResource {
 
-    public static final Logger LOGGER = LoggerFactory.getLogger(
-        LibraryResource.class
-    );
+    public static final Logger LOGGER = LoggerFactory.getLogger(LibraryResource.class);
 
     @Inject
     PreferencesService preferences;
@@ -48,11 +46,7 @@ public String getJson(@PathParam("id") String id) {
             .getDatabase()
             .getEntries()
             .stream()
-            .peek(bibEntry ->
-                bibEntry
-                    .getSharedBibEntryData()
-                    .setSharedID(Objects.hash(bibEntry))
-            )
+            .peek(bibEntry -> bibEntry.getSharedBibEntryData().setSharedID(Objects.hash(bibEntry)))
             .map(entry ->
                 new BibEntryDTO(
                     entry,
@@ -69,8 +63,7 @@ public String getJson(@PathParam("id") String id) {
     @Produces(JabrefMediaType.JSON_CSL_ITEM)
     public String getClsItemJson(@PathParam("id") String id) {
         ParserResult parserResult = getParserResult(id);
-        JabRefItemDataProvider jabRefItemDataProvider =
-            new JabRefItemDataProvider();
+        JabRefItemDataProvider jabRefItemDataProvider = new JabRefItemDataProvider();
         jabRefItemDataProvider.setData(
             parserResult.getDatabaseContext(),
             new BibEntryTypesManager()
@@ -90,10 +83,7 @@ private ParserResult getParserResult(String id) {
                     .importDatabase(library);
         } catch (IOException e) {
             LOGGER.warn("Could not find open library file {}", library, e);
-            throw new InternalServerErrorException(
-                "Could not parse library",
-                e
-            );
+            throw new InternalServerErrorException("Could not parse library", e);
         }
         return parserResult;
     }
@@ -107,10 +97,7 @@ public Response getBibtex(@PathParam("id") String id) {
             libraryAsString = Files.readString(library);
         } catch (IOException e) {
             LOGGER.error("Could not read library {}", library, e);
-            throw new InternalServerErrorException(
-                "Could not read library " + library,
-                e
-            );
+            throw new InternalServerErrorException("Could not read library " + library, e);
         }
         return Response.ok().entity(libraryAsString).build();
     }
@@ -121,11 +108,7 @@ private java.nio.file.Path getLibraryPath(String id) {
             .getLastFilesOpened()
             .stream()
             .map(java.nio.file.Path::of)
-            .filter(p ->
-                (p.getFileName() +
-                    "-" +
-                    BackupFileUtil.getUniqueFilePrefix(p)).equals(id)
-            )
+            .filter(p -> (p.getFileName() + "-" + BackupFileUtil.getUniqueFilePrefix(p)).equals(id))
             .findAny()
             .orElseThrow(NotFoundException::new);
     }
diff --git a/src/main/java/org/jabref/http/server/Server.java b/src/main/java/org/jabref/http/server/Server.java
index abe74b1083b..64e14b7343e 100644
--- a/src/main/java/org/jabref/http/server/Server.java
+++ b/src/main/java/org/jabref/http/server/Server.java
@@ -32,8 +32,7 @@ public class Server {
      * Starts an http server serving the last files opened in JabRef<br>
      * More files can be provided as args.
      */
-    public static void main(final String[] args)
-        throws InterruptedException, URISyntaxException {
+    public static void main(final String[] args) throws InterruptedException, URISyntaxException {
         SLF4JBridgeHandler.removeHandlersForRootLogger();
         SLF4JBridgeHandler.install();
 
@@ -55,10 +54,7 @@ public static void main(final String[] args)
                 .filter(path -> !lastFilesOpened.contains(path))
                 .toList();
 
-            LOGGER.debug(
-                "Adding following files to the list of opened libraries: {}",
-                filesToAdd
-            );
+            LOGGER.debug("Adding following files to the list of opened libraries: {}", filesToAdd);
 
             // add the files in the front of the last opened libraries
             Collections.reverse(filesToAdd);
@@ -68,15 +64,11 @@ public static void main(final String[] args)
         }
 
         if (lastFilesOpened.isEmpty()) {
-            LOGGER.debug(
-                "still no library available to serve, serve the demo library"
-            );
+            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"
-                )
+                .of("src/main/resources/org/jabref/http/server/http-server-demo.bib")
                 .toAbsolutePath();
             LOGGER.debug("Location of demo library: {}", bibPath);
             lastFilesOpened.add(bibPath.toString());
@@ -128,11 +120,7 @@ private static SSLContext getSslContext() {
             .of(
                 AppDirsFactory
                     .getInstance()
-                    .getUserDataDir(
-                        OS.APP_DIR_APP_NAME,
-                        "ssl",
-                        OS.APP_DIR_APP_AUTHOR
-                    )
+                    .getUserDataDir(OS.APP_DIR_APP_NAME, "ssl", OS.APP_DIR_APP_AUTHOR)
             )
             .resolve("server.p12");
         if (Files.exists(serverKeyStore)) {
diff --git a/src/main/java/org/jabref/logic/JabRefException.java b/src/main/java/org/jabref/logic/JabRefException.java
index 45041856d47..687383f9823 100644
--- a/src/main/java/org/jabref/logic/JabRefException.java
+++ b/src/main/java/org/jabref/logic/JabRefException.java
@@ -5,9 +5,7 @@
 
 public class JabRefException extends Exception {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(
-        JabRefException.class
-    );
+    private static final Logger LOGGER = LoggerFactory.getLogger(JabRefException.class);
     private String localizedMessage;
 
     public JabRefException(String message) {
@@ -23,11 +21,7 @@ public JabRefException(String message, String localizedMessage) {
         this.localizedMessage = localizedMessage;
     }
 
-    public JabRefException(
-        String message,
-        String localizedMessage,
-        Throwable cause
-    ) {
+    public JabRefException(String message, String localizedMessage, Throwable cause) {
         super(message, cause);
         this.localizedMessage = localizedMessage;
     }
@@ -39,9 +33,7 @@ public JabRefException(Throwable cause) {
     @Override
     public String getLocalizedMessage() {
         if (localizedMessage == null) {
-            LOGGER.debug(
-                "No localized exception message defined. Falling back to getMessage()."
-            );
+            LOGGER.debug("No localized exception message defined. Falling back to getMessage().");
             return getMessage();
         } else {
             return localizedMessage;
diff --git a/src/main/java/org/jabref/logic/TypedBibEntry.java b/src/main/java/org/jabref/logic/TypedBibEntry.java
index b562aaa0f35..2ef2527c596 100644
--- a/src/main/java/org/jabref/logic/TypedBibEntry.java
+++ b/src/main/java/org/jabref/logic/TypedBibEntry.java
@@ -37,18 +37,10 @@ public TypedBibEntry(BibEntry entry, BibDatabaseContext databaseContext) {
      *
      * @return true if all required fields are set, false otherwise
      */
-    public boolean hasAllRequiredFields(
-        BibEntryTypesManager entryTypesManager
-    ) {
-        Optional<BibEntryType> type = entryTypesManager.enrich(
-            entry.getType(),
-            this.mode
-        );
+    public boolean hasAllRequiredFields(BibEntryTypesManager entryTypesManager) {
+        Optional<BibEntryType> type = entryTypesManager.enrich(entry.getType(), this.mode);
         if (type.isPresent()) {
-            return entry.allFieldsPresent(
-                type.get().getRequiredFields(),
-                database.orElse(null)
-            );
+            return entry.allFieldsPresent(type.get().getRequiredFields(), database.orElse(null));
         } else {
             return true;
         }
diff --git a/src/main/java/org/jabref/logic/auxparser/DefaultAuxParser.java b/src/main/java/org/jabref/logic/auxparser/DefaultAuxParser.java
index ac732a5508c..01832be09ad 100644
--- a/src/main/java/org/jabref/logic/auxparser/DefaultAuxParser.java
+++ b/src/main/java/org/jabref/logic/auxparser/DefaultAuxParser.java
@@ -29,16 +29,12 @@
  */
 public class DefaultAuxParser implements AuxParser {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(
-        DefaultAuxParser.class
-    );
+    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 INPUT_PATTERN = Pattern.compile(
-        "\\\\@input\\{(.+)\\}"
-    );
+    private static final Pattern INPUT_PATTERN = Pattern.compile("\\\\@input\\{(.+)\\}");
 
     private final BibDatabase masterDatabase;
 
@@ -136,15 +132,8 @@ private void resolveTags(AuxParserResult result) {
         List<BibEntry> entriesToInsert = new ArrayList<>();
 
         for (String key : result.getUniqueKeys()) {
-            if (
-                !result
-                    .getGeneratedBibDatabase()
-                    .getEntryByCitationKey(key)
-                    .isPresent()
-            ) {
-                Optional<BibEntry> entry = masterDatabase.getEntryByCitationKey(
-                    key
-                );
+            if (!result.getGeneratedBibDatabase().getEntryByCitationKey(key).isPresent()) {
+                Optional<BibEntry> entry = masterDatabase.getEntryByCitationKey(key);
                 if (entry.isPresent()) {
                     entriesToInsert.add(entry.get());
                 } else {
@@ -159,9 +148,7 @@ private void resolveTags(AuxParserResult result) {
         if (result.getGeneratedBibDatabase().hasEntries()) {
             result.getGeneratedBibDatabase().copyPreamble(masterDatabase);
             result.insertStrings(
-                masterDatabase.getUsedStrings(
-                    result.getGeneratedBibDatabase().getEntries()
-                )
+                masterDatabase.getUsedStrings(result.getGeneratedBibDatabase().getEntries())
             );
         }
     }
@@ -172,10 +159,7 @@ private void resolveTags(AuxParserResult result) {
      * @param entries Entries to check for CrossRefs
      * @param result AUX file
      */
-    private void resolveCrossReferences(
-        List<BibEntry> entries,
-        AuxParserResult result
-    ) {
+    private void resolveCrossReferences(List<BibEntry> entries, AuxParserResult result) {
         List<BibEntry> entriesToInsert = new ArrayList<>();
         for (BibEntry entry : entries) {
             entry
@@ -187,8 +171,9 @@ private void resolveCrossReferences(
                             .getEntryByCitationKey(crossref)
                             .isPresent()
                     ) {
-                        Optional<BibEntry> refEntry =
-                            masterDatabase.getEntryByCitationKey(crossref);
+                        Optional<BibEntry> refEntry = masterDatabase.getEntryByCitationKey(
+                            crossref
+                        );
 
                         if (refEntry.isPresent()) {
                             if (!entriesToInsert.contains(refEntry.get())) {
diff --git a/src/main/java/org/jabref/logic/bibtex/BibEntryWriter.java b/src/main/java/org/jabref/logic/bibtex/BibEntryWriter.java
index 3b0a96063a7..8d64e2be4a5 100644
--- a/src/main/java/org/jabref/logic/bibtex/BibEntryWriter.java
+++ b/src/main/java/org/jabref/logic/bibtex/BibEntryWriter.java
@@ -29,25 +29,18 @@
 
 public class BibEntryWriter {
 
-    private static final org.slf4j.Logger LOGGER = LoggerFactory.getLogger(
-        BibEntryWriter.class
-    );
+    private static final org.slf4j.Logger LOGGER = LoggerFactory.getLogger(BibEntryWriter.class);
 
     private final BibEntryTypesManager entryTypesManager;
     private final FieldWriter fieldWriter;
 
-    public BibEntryWriter(
-        FieldWriter fieldWriter,
-        BibEntryTypesManager entryTypesManager
-    ) {
+    public BibEntryWriter(FieldWriter fieldWriter, BibEntryTypesManager entryTypesManager) {
         this.fieldWriter = fieldWriter;
         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) {
@@ -56,11 +49,8 @@ public String serializeAll(
         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);
     }
 
@@ -86,16 +76,11 @@ public void write(
         }
 
         writeUserComments(entry, out);
-        writeRequiredFieldsFirstRemainingFieldsSecond(
-            entry,
-            out,
-            bibDatabaseMode
-        );
+        writeRequiredFieldsFirstRemainingFieldsSecond(entry, out, bibDatabaseMode);
         out.finishBlock();
     }
 
-    private void writeUserComments(BibEntry entry, BibWriter out)
-        throws IOException {
+    private void writeUserComments(BibEntry entry, BibWriter out) throws IOException {
         String userComments = entry.getUserComments();
 
         if (!userComments.isEmpty()) {
@@ -123,10 +108,7 @@ private void writeRequiredFieldsFirstRemainingFieldsSecond(
         written.add(InternalField.KEY_FIELD);
         final int indent = getLengthOfLongestFieldName(entry);
 
-        Optional<BibEntryType> type = entryTypesManager.enrich(
-            entry.getType(),
-            bibDatabaseMode
-        );
+        Optional<BibEntryType> type = entryTypesManager.enrich(entry.getType(), bibDatabaseMode);
         if (type.isPresent()) {
             // Write required fields first
             List<Field> requiredFields = type
@@ -164,9 +146,7 @@ private void writeRequiredFieldsFirstRemainingFieldsSecond(
             .stream()
             .filter(key -> !written.contains(key))
             .collect(
-                Collectors.toCollection(() ->
-                    new TreeSet<>(Comparator.comparing(Field::getName))
-                )
+                Collectors.toCollection(() -> new TreeSet<>(Comparator.comparing(Field::getName)))
             );
 
         for (Field field : remainingFields) {
@@ -177,11 +157,8 @@ private void writeRequiredFieldsFirstRemainingFieldsSecond(
         out.writeLine("}");
     }
 
-    private void writeKeyField(BibEntry entry, BibWriter out)
-        throws IOException {
-        String keyField = StringUtil.shaveString(
-            entry.getCitationKey().orElse("")
-        );
+    private void writeKeyField(BibEntry entry, BibWriter out) throws IOException {
+        String keyField = StringUtil.shaveString(entry.getCitationKey().orElse(""));
         out.writeLine(keyField + ',');
     }
 
@@ -193,12 +170,8 @@ private void writeKeyField(BibEntry entry, BibWriter out)
      * @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
@@ -230,8 +203,7 @@ private void writeField(
     }
 
     static int getLengthOfLongestFieldName(BibEntry entry) {
-        Predicate<Field> isNotCitationKey = field ->
-            InternalField.KEY_FIELD != field;
+        Predicate<Field> isNotCitationKey = field -> InternalField.KEY_FIELD != field;
         return entry
             .getFields()
             .stream()
diff --git a/src/main/java/org/jabref/logic/bibtex/FieldPreferences.java b/src/main/java/org/jabref/logic/bibtex/FieldPreferences.java
index 0fd646adcc6..1e44e6301c9 100644
--- a/src/main/java/org/jabref/logic/bibtex/FieldPreferences.java
+++ b/src/main/java/org/jabref/logic/bibtex/FieldPreferences.java
@@ -23,10 +23,8 @@ public FieldPreferences(
         List<Field> nonWrappableFields
     ) {
         this.resolveStrings.set(resolveStrings);
-        this.resolvableFields =
-            FXCollections.observableArrayList(resolvableFields);
-        this.nonWrappableFields =
-            FXCollections.observableArrayList(nonWrappableFields);
+        this.resolvableFields = FXCollections.observableArrayList(resolvableFields);
+        this.nonWrappableFields = FXCollections.observableArrayList(nonWrappableFields);
     }
 
     public boolean shouldResolveStrings() {
diff --git a/src/main/java/org/jabref/logic/bibtex/FieldWriter.java b/src/main/java/org/jabref/logic/bibtex/FieldWriter.java
index 7af4f6bedb3..4eb500109df 100644
--- a/src/main/java/org/jabref/logic/bibtex/FieldWriter.java
+++ b/src/main/java/org/jabref/logic/bibtex/FieldWriter.java
@@ -12,9 +12,7 @@ public class FieldWriter {
     // See also ADR-0024
     public static final char BIBTEX_STRING_START_END_SYMBOL = '#';
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(
-        FieldWriter.class
-    );
+    private static final Logger LOGGER = LoggerFactory.getLogger(FieldWriter.class);
 
     private static final char FIELD_START = '{';
     private static final char FIELD_END = '}';
@@ -27,10 +25,7 @@ public FieldWriter(FieldPreferences preferences) {
         this(true, preferences);
     }
 
-    private FieldWriter(
-        boolean neverFailOnHashes,
-        FieldPreferences preferences
-    ) {
+    private FieldWriter(boolean neverFailOnHashes, FieldPreferences preferences) {
         this.neverFailOnHashes = neverFailOnHashes;
         this.preferences = preferences;
 
@@ -41,8 +36,7 @@ public static FieldWriter buildIgnoreHashes(FieldPreferences prefs) {
         return new FieldWriter(true, prefs);
     }
 
-    private static void checkBraces(String text)
-        throws InvalidFieldValueException {
+    private static void checkBraces(String text) throws InvalidFieldValueException {
         int left = 0;
         int right = 0;
 
@@ -85,9 +79,7 @@ private static void checkBraces(String text)
         }
         if (left != right) {
             LOGGER.error("Braces don't match. Field value: {}", text);
-            throw new InvalidFieldValueException(
-                "Braces don't match. Field value: " + text
-            );
+            throw new InvalidFieldValueException("Braces don't match. Field value: " + text);
         }
     }
 
@@ -99,8 +91,7 @@ private static void checkBraces(String text)
      * @return a formatted string suitable for output
      * @throws InvalidFieldValueException if s is not a correct bibtex string, e.g., because of improperly balanced braces or using # not paired
      */
-    public String write(Field field, String content)
-        throws InvalidFieldValueException {
+    public String write(Field field, String content) throws InvalidFieldValueException {
         if (content == null) {
             return FIELD_START + String.valueOf(FIELD_END);
         }
@@ -146,8 +137,7 @@ private String formatAndResolveStrings(String content, Field field)
                 pos1 = content.length(); // No more occurrences found.
                 pos2 = -1;
             } else {
-                pos2 =
-                    content.indexOf(BIBTEX_STRING_START_END_SYMBOL, pos1 + 1);
+                pos2 = content.indexOf(BIBTEX_STRING_START_END_SYMBOL, pos1 + 1);
                 if (pos2 == -1) {
                     if (neverFailOnHashes) {
                         pos1 = content.length(); // just write out the rest of the text, and throw no exception
@@ -213,9 +203,7 @@ private String formatWithoutResolvingStrings(String content, Field field)
         throws InvalidFieldValueException {
         checkBraces(content);
 
-        StringBuilder stringBuilder = new StringBuilder(
-            String.valueOf(FIELD_START)
-        );
+        StringBuilder stringBuilder = new StringBuilder(String.valueOf(FIELD_START));
         stringBuilder.append(formatter.format(content, field));
         stringBuilder.append(FIELD_END);
         return stringBuilder.toString();
@@ -225,12 +213,7 @@ private String formatWithoutResolvingStrings(String content, Field field)
      * @param stringBuilder the StringBuilder to append the text to
      * @param text          the text to append
      */
-    private void writeText(
-        StringBuilder stringBuilder,
-        String text,
-        int startPos,
-        int endPos
-    ) {
+    private void writeText(StringBuilder stringBuilder, String text, int startPos, int endPos) {
         stringBuilder.append(FIELD_START);
         stringBuilder.append(text, startPos, endPos);
         stringBuilder.append(FIELD_END);
@@ -253,9 +236,7 @@ private void writeStringLabel(
         boolean isLast
     ) {
         String line =
-            (isFirst ? "" : " # ") +
-            text.substring(startPos, endPos) +
-            (isLast ? "" : " # ");
+            (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 15fc7974439..bda22d63fbd 100644
--- a/src/main/java/org/jabref/logic/bibtex/FileFieldWriter.java
+++ b/src/main/java/org/jabref/logic/bibtex/FileFieldWriter.java
@@ -15,11 +15,7 @@ public static String getStringRepresentation(List<LinkedFile> fields) {
         int i = 0;
         for (LinkedFile entry : fields) {
             array[i] =
-                new String[] {
-                    entry.getDescription(),
-                    entry.getLink(),
-                    entry.getFileType(),
-                };
+                new String[] { entry.getDescription(), entry.getLink(), entry.getFileType() };
             i++;
         }
         return encodeStringArray(array);
@@ -51,10 +47,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/comparator/BibDatabaseDiff.java b/src/main/java/org/jabref/logic/bibtex/comparator/BibDatabaseDiff.java
index 84185b9512f..00979fb8e9d 100644
--- a/src/main/java/org/jabref/logic/bibtex/comparator/BibDatabaseDiff.java
+++ b/src/main/java/org/jabref/logic/bibtex/comparator/BibDatabaseDiff.java
@@ -27,27 +27,18 @@ private BibDatabaseDiff(
     ) {
         metaDataDiff =
             MetaDataDiff
-                .compare(
-                    originalDatabase.getMetaData(),
-                    newDatabase.getMetaData()
-                )
+                .compare(originalDatabase.getMetaData(), newDatabase.getMetaData())
                 .orElse(null);
-        preambleDiff =
-            PreambleDiff.compare(originalDatabase, newDatabase).orElse(null);
+        preambleDiff = PreambleDiff.compare(originalDatabase, newDatabase).orElse(null);
         bibStringDiffs =
-            BibStringDiff.compare(
-                originalDatabase.getDatabase(),
-                newDatabase.getDatabase()
-            );
+            BibStringDiff.compare(originalDatabase.getDatabase(), newDatabase.getDatabase());
 
         // Sort both databases according to a common sort key.
         EntryComparator comparator = getEntryComparator();
         List<BibEntry> originalEntriesSorted = originalDatabase
             .getDatabase()
             .getEntriesSorted(comparator);
-        List<BibEntry> newEntriesSorted = newDatabase
-            .getDatabase()
-            .getEntriesSorted(comparator);
+        List<BibEntry> newEntriesSorted = newDatabase.getDatabase().getEntriesSorted(comparator);
 
         if (!includeEmptyEntries) {
             originalEntriesSorted.removeIf(BibEntry::isEmpty);
@@ -55,23 +46,13 @@ private BibDatabaseDiff(
         }
 
         entryDiffs =
-            compareEntries(
-                originalEntriesSorted,
-                newEntriesSorted,
-                originalDatabase.getMode()
-            );
+            compareEntries(originalEntriesSorted, newEntriesSorted, originalDatabase.getMode());
     }
 
     private static EntryComparator getEntryComparator() {
-        EntryComparator comparator = new EntryComparator(
-            false,
-            true,
-            StandardField.TITLE
-        );
-        comparator =
-            new EntryComparator(false, true, StandardField.AUTHOR, comparator);
-        comparator =
-            new EntryComparator(false, true, StandardField.YEAR, comparator);
+        EntryComparator comparator = new EntryComparator(false, true, StandardField.TITLE);
+        comparator = new EntryComparator(false, true, StandardField.AUTHOR, comparator);
+        comparator = new EntryComparator(false, true, StandardField.YEAR, comparator);
         return comparator;
     }
 
@@ -109,9 +90,7 @@ private static List<BibEntryDiff> compareEntries(
         }
 
         // Now we've found all exact matches, look through the remaining entries, looking for close matches.
-        DuplicateCheck duplicateCheck = new DuplicateCheck(
-            new BibEntryTypesManager()
-        );
+        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.
             double bestMatch = 0;
@@ -136,12 +115,7 @@ private static List<BibEntryDiff> compareEntries(
                 duplicateCheck.isDuplicate(originalEntry, bestEntry, mode)
             ) {
                 used.add(bestMatchIndex);
-                differences.add(
-                    new BibEntryDiff(
-                        originalEntry,
-                        newEntries.get(bestMatchIndex)
-                    )
-                );
+                differences.add(new BibEntryDiff(originalEntry, newEntries.get(bestMatchIndex)));
             } else {
                 differences.add(new BibEntryDiff(originalEntry, null));
             }
@@ -157,10 +131,7 @@ private static List<BibEntryDiff> compareEntries(
         return differences;
     }
 
-    private static boolean hasEqualCitationKey(
-        BibEntry oneEntry,
-        BibEntry twoEntry
-    ) {
+    private static boolean hasEqualCitationKey(BibEntry oneEntry, BibEntry twoEntry) {
         return (
             oneEntry.hasCitationKey() &&
             twoEntry.hasCitationKey() &&
@@ -168,10 +139,7 @@ private static boolean hasEqualCitationKey(
         );
     }
 
-    public static BibDatabaseDiff compare(
-        BibDatabaseContext base,
-        BibDatabaseContext changed
-    ) {
+    public static BibDatabaseDiff compare(BibDatabaseContext base, BibDatabaseContext changed) {
         return new BibDatabaseDiff(base, changed, false);
     }
 
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 b02679552b4..5a7a61b8067 100644
--- a/src/main/java/org/jabref/logic/bibtex/comparator/BibStringDiff.java
+++ b/src/main/java/org/jabref/logic/bibtex/comparator/BibStringDiff.java
@@ -43,12 +43,7 @@ public static List<BibStringDiff> compare(
                 .findAny();
             if (match.isPresent()) {
                 // We have found a string with a matching name.
-                if (
-                    !Objects.equals(
-                        original.getContent(),
-                        match.get().getContent()
-                    )
-                ) {
+                if (!Objects.equals(original.getContent(), match.get().getContent())) {
                     // But they have non-matching contents, so we've found a change.
                     differences.add(new BibStringDiff(original, match.get()));
                 }
@@ -60,10 +55,7 @@ public static List<BibStringDiff> compare(
         }
 
         // 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();
-        ) {
+        for (Iterator<BibtexString> iterator = notMatched.iterator(); iterator.hasNext();) {
             BibtexString original = iterator.next();
 
             Optional<BibtexString> match = newDatabase
@@ -90,9 +82,7 @@ public static List<BibStringDiff> compare(
             .getStringValues()
             .stream()
             .filter(test -> !used.contains(test))
-            .forEach(newString ->
-                differences.add(new BibStringDiff(null, newString))
-            );
+            .forEach(newString -> differences.add(new BibStringDiff(null, newString)));
 
         return differences;
     }
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 2fc3f4a1461..5dd08b94893 100644
--- a/src/main/java/org/jabref/logic/bibtex/comparator/EntryComparator.java
+++ b/src/main/java/org/jabref/logic/bibtex/comparator/EntryComparator.java
@@ -64,13 +64,9 @@ public int compare(BibEntry e1, BibEntry e2) {
         if (binary) {
             // We just separate on set and unset fields:
             if (f1 == null) {
-                return f2 == null
-                    ? (next == null ? idCompare(e1, e2) : next.compare(e1, e2))
-                    : 1;
+                return f2 == null ? (next == null ? idCompare(e1, e2) : next.compare(e1, e2)) : 1;
             } else {
-                return f2 == null
-                    ? -1
-                    : (next == null ? idCompare(e1, e2) : next.compare(e1, e2));
+                return f2 == null ? -1 : (next == null ? idCompare(e1, e2) : next.compare(e1, e2));
             }
         }
 
@@ -78,16 +74,10 @@ public int compare(BibEntry e1, BibEntry e2) {
         // sorted according to last name.
         if (sortField.getProperties().contains(FieldProperty.PERSON_NAMES)) {
             if (f1 != null) {
-                f1 =
-                    AuthorList
-                        .fixAuthorForAlphabetization((String) f1)
-                        .toLowerCase(Locale.ROOT);
+                f1 = AuthorList.fixAuthorForAlphabetization((String) f1).toLowerCase(Locale.ROOT);
             }
             if (f2 != null) {
-                f2 =
-                    AuthorList
-                        .fixAuthorForAlphabetization((String) f2)
-                        .toLowerCase(Locale.ROOT);
+                f2 = AuthorList.fixAuthorForAlphabetization((String) f2).toLowerCase(Locale.ROOT);
             }
         } else if (sortField.equals(InternalField.TYPE_HEADER)) {
             // Sort by type.
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 385b642deb2..77d2456a237 100644
--- a/src/main/java/org/jabref/logic/bibtex/comparator/FieldComparator.java
+++ b/src/main/java/org/jabref/logic/bibtex/comparator/FieldComparator.java
@@ -66,11 +66,7 @@ private static Collator getCollator() {
     private FieldType determineFieldType() {
         if (InternalField.TYPE_HEADER == this.fields.getPrimary()) {
             return FieldType.TYPE;
-        } else if (
-            this.fields.getPrimary()
-                .getProperties()
-                .contains(FieldProperty.PERSON_NAMES)
-        ) {
+        } else if (this.fields.getPrimary().getProperties().contains(FieldProperty.PERSON_NAMES)) {
             return FieldType.NAME;
         } else if (StandardField.YEAR == this.fields.getPrimary()) {
             return FieldType.YEAR;
diff --git a/src/main/java/org/jabref/logic/bibtex/comparator/FieldComparatorStack.java b/src/main/java/org/jabref/logic/bibtex/comparator/FieldComparatorStack.java
index dbc66250eb0..b7c9526e1cd 100644
--- a/src/main/java/org/jabref/logic/bibtex/comparator/FieldComparatorStack.java
+++ b/src/main/java/org/jabref/logic/bibtex/comparator/FieldComparatorStack.java
@@ -12,9 +12,7 @@ public class FieldComparatorStack<T> implements Comparator<T> {
 
     private final List<? extends Comparator<? super T>> comparators;
 
-    public FieldComparatorStack(
-        List<? extends Comparator<? super T>> comparators
-    ) {
+    public FieldComparatorStack(List<? extends Comparator<? super T>> comparators) {
         this.comparators = comparators;
     }
 
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 0f305bab2c1..fd81ab33b27 100644
--- a/src/main/java/org/jabref/logic/bibtex/comparator/GroupDiff.java
+++ b/src/main/java/org/jabref/logic/bibtex/comparator/GroupDiff.java
@@ -18,21 +18,12 @@ public class GroupDiff {
      * This method only detects whether a change took place or not. It does not determine the type of change. This would
      * be possible, but difficult to do properly, so we rather only report the change.
      */
-    public static Optional<GroupDiff> compare(
-        MetaData originalMetaData,
-        MetaData newMetaData
-    ) {
-        final Optional<GroupTreeNode> originalGroups =
-            originalMetaData.getGroups();
+    public static Optional<GroupDiff> compare(MetaData originalMetaData, MetaData newMetaData) {
+        final Optional<GroupTreeNode> originalGroups = originalMetaData.getGroups();
         final Optional<GroupTreeNode> newGroups = newMetaData.getGroups();
 
         if (!originalGroups.equals(newGroups)) {
-            return Optional.of(
-                new GroupDiff(
-                    originalGroups.orElse(null),
-                    newGroups.orElse(null)
-                )
-            );
+            return Optional.of(new GroupDiff(originalGroups.orElse(null), newGroups.orElse(null)));
         } else {
             return Optional.empty();
         }
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 d9f1bf2fbbe..36990f732fb 100644
--- a/src/main/java/org/jabref/logic/bibtex/comparator/MetaDataDiff.java
+++ b/src/main/java/org/jabref/logic/bibtex/comparator/MetaDataDiff.java
@@ -40,10 +40,7 @@ private MetaDataDiff(MetaData originalMetaData, MetaData newMetaData) {
         this.groupDiff = GroupDiff.compare(originalMetaData, newMetaData);
     }
 
-    public static Optional<MetaDataDiff> compare(
-        MetaData originalMetaData,
-        MetaData newMetaData
-    ) {
+    public static Optional<MetaDataDiff> compare(MetaData originalMetaData, MetaData newMetaData) {
         if (originalMetaData.equals(newMetaData)) {
             return Optional.empty();
         } else {
@@ -58,9 +55,7 @@ private void addToListIfDiff(
         Object newObject
     ) {
         if (!Objects.equals(originalObject, newObject)) {
-            changes.add(
-                new Difference(differenceType, originalObject, newObject)
-            );
+            changes.add(new Difference(differenceType, originalObject, newObject));
         }
     }
 
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 271dc70021e..17b34c37981 100644
--- a/src/main/java/org/jabref/logic/bibtex/comparator/PreambleDiff.java
+++ b/src/main/java/org/jabref/logic/bibtex/comparator/PreambleDiff.java
@@ -18,18 +18,13 @@ public static Optional<PreambleDiff> compare(
         BibDatabaseContext originalDatabase,
         BibDatabaseContext newDatabase
     ) {
-        Optional<String> originalPreamble = originalDatabase
-            .getDatabase()
-            .getPreamble();
+        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("")
-                )
+                new PreambleDiff(originalPreamble.orElse(""), newPreamble.orElse(""))
             );
         }
     }
diff --git a/src/main/java/org/jabref/logic/bst/BstFunctions.java b/src/main/java/org/jabref/logic/bst/BstFunctions.java
index 1a2fe55145b..d83bb079274 100644
--- a/src/main/java/org/jabref/logic/bst/BstFunctions.java
+++ b/src/main/java/org/jabref/logic/bst/BstFunctions.java
@@ -21,12 +21,8 @@
 
 public class BstFunctions {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(
-        BstFunctions.class
-    );
-    private static final Pattern ADD_PERIOD_PATTERN = Pattern.compile(
-        "([^.?!}\\s])(}|\\s)*$"
-    );
+    private static final Logger LOGGER = LoggerFactory.getLogger(BstFunctions.class);
+    private static final Pattern ADD_PERIOD_PATTERN = Pattern.compile("([^.?!}\\s])(}|\\s)*$");
 
     private final Map<String, String> strings;
     private final Map<String, Integer> integers;
@@ -129,11 +125,7 @@ private void bstIsGreaterThan(BstVMVisitor visitor, ParserRuleContext ctx) {
             throw new BstVMException("Can only compare two integers with >");
         }
 
-        stack.push(
-            ((Integer) o1).compareTo((Integer) o2) > 0
-                ? BstVM.TRUE
-                : BstVM.FALSE
-        );
+        stack.push(((Integer) o1).compareTo((Integer) o2) > 0 ? BstVM.TRUE : BstVM.FALSE);
     }
 
     /**
@@ -143,26 +135,18 @@ private void bstIsGreaterThan(BstVMVisitor visitor, ParserRuleContext ctx) {
      */
     private void bstIsLowerThan(BstVMVisitor visitor, ParserRuleContext ctx) {
         if (stack.size() < 2) {
-            throw new BstVMException(
-                "Not enough operands on stack for operation <"
-            );
+            throw new BstVMException("Not enough operands on stack for operation <");
         }
         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()
-                    )
+                "Can only compare two integers with < (line %d)".formatted(ctx.start.getLine())
             );
         }
 
-        stack.push(
-            ((Integer) o1).compareTo((Integer) o2) < 0
-                ? BstVM.TRUE
-                : BstVM.FALSE
-        );
+        stack.push(((Integer) o1).compareTo((Integer) o2) < 0 ? BstVM.TRUE : BstVM.FALSE);
     }
 
     /**
@@ -209,9 +193,7 @@ private void bstAdd(BstVMVisitor visitor, ParserRuleContext ctx) {
 
         if (!((o1 instanceof Integer) && (o2 instanceof Integer))) {
             throw new BstVMException(
-                "Can only compare two integers with + (line %d)".formatted(
-                        ctx.start.getLine()
-                    )
+                "Can only compare two integers with + (line %d)".formatted(ctx.start.getLine())
             );
         }
 
@@ -235,9 +217,7 @@ private void bstSubtract(BstVMVisitor visitor, ParserRuleContext ctx) {
 
         if (!((o1 instanceof Integer) && (o2 instanceof Integer))) {
             throw new BstVMException(
-                "Can only subtract two integers with - (line %d)".formatted(
-                        ctx.start.getLine()
-                    )
+                "Can only subtract two integers with - (line %d)".formatted(ctx.start.getLine())
             );
         }
 
@@ -271,9 +251,7 @@ private void bstConcat(BstVMVisitor visitor, ParserRuleContext ctx) {
             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()
-                    )
+                "Can only concatenate two String with * (line %d)".formatted(ctx.start.getLine())
             );
         }
 
@@ -292,11 +270,7 @@ public void execute(BstVMVisitor visitor, ParserRuleContext ctx) {
         }
 
         @Override
-        public void execute(
-            BstVMVisitor visitor,
-            ParserRuleContext ctx,
-            BstEntry bstEntry
-        ) {
+        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(
@@ -309,18 +283,13 @@ public void execute(
 
             if (!(o1 instanceof BstVMVisitor.Identifier identifier)) {
                 throw new BstVMException(
-                    "Invalid parameters (line %d)".formatted(
-                            ctx.start.getLine()
-                        )
+                    "Invalid parameters (line %d)".formatted(ctx.start.getLine())
                 );
             }
             String name = identifier.name();
 
             if (o2 instanceof String value) {
-                if (
-                    (bstEntry != null) &&
-                    bstEntry.localStrings.containsKey(name)
-                ) {
+                if ((bstEntry != null) && bstEntry.localStrings.containsKey(name)) {
                     bstEntry.localStrings.put(name, value);
                     return;
                 }
@@ -329,10 +298,7 @@ public void execute(
                     strings.put(name, value);
                 }
             } else if (o2 instanceof Integer value) {
-                if (
-                    (bstEntry != null) &&
-                    bstEntry.localIntegers.containsKey(name)
-                ) {
+                if ((bstEntry != null) && bstEntry.localIntegers.containsKey(name)) {
                     bstEntry.localIntegers.put(name, value);
                     return;
                 }
@@ -342,9 +308,7 @@ public void execute(
                 }
             } else {
                 throw new BstVMException(
-                    "Invalid parameters (line %d)".formatted(
-                            ctx.start.getLine()
-                        )
+                    "Invalid parameters (line %d)".formatted(ctx.start.getLine())
                 );
             }
         }
@@ -411,17 +375,11 @@ public void execute(BstVMVisitor visitor, ParserRuleContext ctx) {
         }
 
         @Override
-        public void execute(
-            BstVMVisitor visitor,
-            ParserRuleContext ctx,
-            BstEntry bstEntry
-        ) {
+        public void execute(BstVMVisitor visitor, ParserRuleContext ctx, BstEntry bstEntry) {
             if (bstEntry == null) {
                 this.execute(visitor, ctx); // Throw error
             } else {
-                functions
-                    .get(bstEntry.entry.getType().getName())
-                    .execute(visitor, ctx, bstEntry);
+                functions.get(bstEntry.entry.getType().getName()).execute(visitor, ctx, bstEntry);
             }
         }
     }
@@ -472,12 +430,7 @@ private void bstChangeCase(BstVMVisitor visitor, ParserRuleContext ctx) {
             );
         }
 
-        stack.push(
-            BstCaseChanger.changeCase(
-                toChange,
-                BstCaseChanger.FormatMode.of(format)
-            )
-        );
+        stack.push(BstCaseChanger.changeCase(toChange, BstCaseChanger.FormatMode.of(format)));
     }
 
     /**
@@ -515,18 +468,12 @@ 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()
-                    )
+                "Must have an entry to cite$ (line %d)".formatted(ctx.start.getLine())
             );
         }
 
         @Override
-        public void execute(
-            BstVMVisitor visitor,
-            ParserRuleContext ctx,
-            BstEntry bstEntryContext
-        ) {
+        public void execute(BstVMVisitor visitor, ParserRuleContext ctx, BstEntry bstEntryContext) {
             if (bstEntryContext == null) {
                 execute(visitor, ctx);
                 return;
@@ -575,9 +522,7 @@ 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()
-                    )
+                "Operand does not match function empty$ (line %d)".formatted(ctx.start.getLine())
             );
         }
 
@@ -607,11 +552,7 @@ private void bstFormatName(BstVMVisitor visitor, ParserRuleContext ctx) {
         Object o2 = stack.pop();
         Object o3 = stack.pop();
 
-        if (
-            !(o1 instanceof String) &&
-            !(o2 instanceof Integer) &&
-            !(o3 instanceof String)
-        ) {
+        if (!(o1 instanceof String) && !(o2 instanceof Integer) && !(o3 instanceof String)) {
             // warning("A string is needed for change.case$");
             stack.push("");
             return;
@@ -649,9 +590,7 @@ 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()
-                    )
+                "Not enough operands on stack for if$ (line %d)".formatted(ctx.start.getLine())
             );
         }
 
@@ -660,10 +599,8 @@ private void bstIf(BstVMVisitor visitor, ParserRuleContext ctx) {
         Object i = stack.pop();
 
         if (
-            !((f1 instanceof BstVMVisitor.Identifier) ||
-                (f1 instanceof ParseTree)) &&
-            ((f2 instanceof BstVMVisitor.Identifier) ||
-                (f2 instanceof ParseTree)) &&
+            !((f1 instanceof BstVMVisitor.Identifier) || (f1 instanceof ParseTree)) &&
+            ((f2 instanceof BstVMVisitor.Identifier) || (f2 instanceof ParseTree)) &&
             (i instanceof Integer)
         ) {
             throw new BstVMException(
@@ -680,11 +617,7 @@ private void bstIf(BstVMVisitor visitor, ParserRuleContext ctx) {
         }
     }
 
-    private void callIdentifierOrTree(
-        Object f,
-        BstVMVisitor visitor,
-        ParserRuleContext ctx
-    ) {
+    private void callIdentifierOrTree(Object f, BstVMVisitor visitor, ParserRuleContext ctx) {
         if (f instanceof ParseTree tree) {
             visitor.visit(tree);
         } else if (f instanceof BstVMVisitor.Identifier identifier) {
@@ -935,9 +868,7 @@ private void bstSubstring(BstVMVisitor visitor, ParserRuleContext ctx) {
             startI += s.length() + 1;
             startI = Math.max(1, (startI + 1) - lenI);
         }
-        stack.push(
-            s.substring(startI - 1, Math.min((startI - 1) + lenI, s.length()))
-        );
+        stack.push(s.substring(startI - 1, Math.min((startI - 1) + lenI, s.length())));
     }
 
     /**
@@ -1074,11 +1005,7 @@ private void bstTextPrefix(BstVMVisitor visitor, ParserRuleContext ctx) {
      * Pops and prints the top of the stack to the log file. It's useful for debugging.
      */
     private void bstTop(BstVMVisitor visitor, ParserRuleContext ctx) {
-        LOGGER.debug(
-            "Stack entry {} (line {})",
-            stack.pop(),
-            ctx.start.getLine()
-        );
+        LOGGER.debug("Stack entry {} (line {})", stack.pop(), ctx.start.getLine());
     }
 
     /**
@@ -1095,11 +1022,7 @@ public void execute(BstVMVisitor visitor, ParserRuleContext ctx) {
         }
 
         @Override
-        public void execute(
-            BstVMVisitor visitor,
-            ParserRuleContext ctx,
-            BstEntry bstEntryContext
-        ) {
+        public void execute(BstVMVisitor visitor, ParserRuleContext ctx, BstEntry bstEntryContext) {
             if (bstEntryContext == null) {
                 this.execute(visitor, ctx);
                 return;
@@ -1135,15 +1058,11 @@ private void bstWhile(BstVMVisitor visitor, ParserRuleContext ctx) {
         Object f1 = stack.pop();
 
         if (
-            !((f1 instanceof BstVMVisitor.Identifier) ||
-                (f1 instanceof ParseTree)) &&
-            ((f2 instanceof BstVMVisitor.Identifier) ||
-                (f2 instanceof ParseTree))
+            !((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()
-                    )
+                "Expecting two functions for while$ (line %d)".formatted(ctx.start.getLine())
             );
         }
 
diff --git a/src/main/java/org/jabref/logic/bst/BstPreviewLayout.java b/src/main/java/org/jabref/logic/bst/BstPreviewLayout.java
index d2cb847fb8d..ac3a9a65a0a 100644
--- a/src/main/java/org/jabref/logic/bst/BstPreviewLayout.java
+++ b/src/main/java/org/jabref/logic/bst/BstPreviewLayout.java
@@ -17,9 +17,7 @@
 
 public class BstPreviewLayout implements PreviewLayout {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(
-        BstPreviewLayout.class
-    );
+    private static final Logger LOGGER = LoggerFactory.getLogger(BstPreviewLayout.class);
 
     private final String name;
 
@@ -30,24 +28,19 @@ public BstPreviewLayout(Path path) {
         name = path.getFileName().toString();
         if (!Files.exists(path)) {
             LOGGER.error("File {} not found", path.toAbsolutePath());
-            error =
-                Localization.lang("Error opening file '%0'", path.toString());
+            error = Localization.lang("Error opening file '%0'", path.toString());
             return;
         }
         try {
             bstVM = new BstVM(path);
         } catch (Exception e) {
             LOGGER.error("Could not read {}.", path.toAbsolutePath(), e);
-            error =
-                Localization.lang("Error opening file '%0'", path.toString());
+            error = Localization.lang("Error opening file '%0'", path.toString());
         }
     }
 
     @Override
-    public String generatePreview(
-        BibEntry originalEntry,
-        BibDatabaseContext databaseContext
-    ) {
+    public String generatePreview(BibEntry originalEntry, BibDatabaseContext databaseContext) {
         if (error != null) {
             return error;
         }
diff --git a/src/main/java/org/jabref/logic/bst/BstVM.java b/src/main/java/org/jabref/logic/bst/BstVM.java
index eed5a61f314..60446914f6e 100644
--- a/src/main/java/org/jabref/logic/bst/BstVM.java
+++ b/src/main/java/org/jabref/logic/bst/BstVM.java
@@ -64,10 +64,7 @@ private static ParseTree charStream2CommonTree(CharStream query) {
      * @param bibDatabase (may be null) the bibDatabase used for resolving strings / crossref
      * @return list of references in plain text form
      */
-    public String render(
-        Collection<BibEntry> bibEntries,
-        BibDatabase bibDatabase
-    ) {
+    public String render(Collection<BibEntry> bibEntries, BibDatabase bibDatabase) {
         Objects.requireNonNull(bibEntries);
 
         List<BstEntry> entries = new ArrayList<>(bibEntries.size());
@@ -77,24 +74,14 @@ public String render(
 
         StringBuilder resultBuffer = new StringBuilder();
 
-        BstVMContext bstVMContext = new BstVMContext(
-            entries,
-            bibDatabase,
-            path
-        );
+        BstVMContext bstVMContext = new BstVMContext(entries, bibDatabase, path);
         bstVMContext
             .functions()
-            .putAll(
-                new BstFunctions(bstVMContext, resultBuffer)
-                    .getBuiltInFunctions()
-            );
+            .putAll(new BstFunctions(bstVMContext, resultBuffer).getBuiltInFunctions());
         bstVMContext.integers().put("entry.max$", Integer.MAX_VALUE);
         bstVMContext.integers().put("global.max$", Integer.MAX_VALUE);
 
-        BstVMVisitor bstVMVisitor = new BstVMVisitor(
-            bstVMContext,
-            resultBuffer
-        );
+        BstVMVisitor bstVMVisitor = new BstVMVisitor(bstVMContext, resultBuffer);
         bstVMVisitor.visit(tree);
 
         latestContext = bstVMContext;
@@ -118,8 +105,7 @@ protected Deque<Object> getStack() {
 
     private static class ThrowingErrorListener extends BaseErrorListener {
 
-        public static final ThrowingErrorListener INSTANCE =
-            new ThrowingErrorListener();
+        public static final ThrowingErrorListener INSTANCE = new ThrowingErrorListener();
 
         @Override
         public void syntaxError(
diff --git a/src/main/java/org/jabref/logic/bst/BstVMContext.java b/src/main/java/org/jabref/logic/bst/BstVMContext.java
index 54acd984af7..9b84145593b 100644
--- a/src/main/java/org/jabref/logic/bst/BstVMContext.java
+++ b/src/main/java/org/jabref/logic/bst/BstVMContext.java
@@ -18,11 +18,7 @@ public record BstVMContext(
     BibDatabase bibDatabase,
     Optional<Path> path
 ) {
-    public BstVMContext(
-        List<BstEntry> entries,
-        BibDatabase bibDatabase,
-        Path path
-    ) {
+    public BstVMContext(List<BstEntry> entries, BibDatabase bibDatabase, Path path) {
         // LinkedList instead of ArrayDeque, because we (currently) need null support
         this(
             entries,
diff --git a/src/main/java/org/jabref/logic/bst/BstVMVisitor.java b/src/main/java/org/jabref/logic/bst/BstVMVisitor.java
index f589aa41b8c..221acc47444 100644
--- a/src/main/java/org/jabref/logic/bst/BstVMVisitor.java
+++ b/src/main/java/org/jabref/logic/bst/BstVMVisitor.java
@@ -20,9 +20,7 @@
 
 class BstVMVisitor extends BstBaseVisitor<Integer> {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(
-        BstVMVisitor.class
-    );
+    private static final Logger LOGGER = LoggerFactory.getLogger(BstVMVisitor.class);
 
     private final BstVMContext bstVMContext;
     private final StringBuilder bbl;
@@ -60,24 +58,18 @@ public Integer visitIntegersCommand(BstParser.IntegersCommandContext ctx) {
     public Integer visitFunctionCommand(BstParser.FunctionCommandContext ctx) {
         bstVMContext
             .functions()
-            .put(
-                ctx.id.getText(),
-                (visitor, functionContext) -> visitor.visit(ctx.function)
-            );
+            .put(ctx.id.getText(), (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);
+        String replacement = ctx.repl.getText().substring(1, ctx.repl.getText().length() - 1);
         bstVMContext
             .functions()
             .put(
                 ctx.id.getText(),
-                (visitor, functionContext) ->
-                    bstVMContext.stack().push(replacement)
+                (visitor, functionContext) -> bstVMContext.stack().push(replacement)
             );
         return BstVM.TRUE;
     }
@@ -85,11 +77,7 @@ public Integer visitMacroCommand(BstParser.MacroCommandContext ctx) {
     @Override
     public Integer visitReadCommand(BstParser.ReadCommandContext ctx) {
         FieldWriter fieldWriter = new FieldWriter(
-            new FieldPreferences(
-                true,
-                List.of(StandardField.MONTH),
-                Collections.emptyList()
-            )
+            new FieldPreferences(true, List.of(StandardField.MONTH), Collections.emptyList())
         );
         for (BstEntry e : bstVMContext.entries()) {
             for (Map.Entry<String, String> mEntry : e.fields.entrySet()) {
@@ -106,15 +94,10 @@ public Integer visitReadCommand(BstParser.ReadCommandContext ctx) {
                             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 Month.parse(result).map(Month::getFullName).orElse(result);
                             }
                             return result;
-                        } catch (
-                            InvalidFieldValueException invalidFieldValueException
-                        ) {
+                        } catch (InvalidFieldValueException invalidFieldValueException) {
                             // in case there is something wrong with the content, just return the content itself
                             return content;
                         }
@@ -199,9 +182,7 @@ public Integer visitEntryCommand(BstParser.EntryCommandContext ctx) {
 
     @Override
     public Integer visitSortCommand(BstParser.SortCommandContext ctx) {
-        bstVMContext
-            .entries()
-            .sort(Comparator.comparing(o -> (o.localStrings.get("sort.key$"))));
+        bstVMContext.entries().sort(Comparator.comparing(o -> (o.localStrings.get("sort.key$"))));
         return BstVM.TRUE;
     }
 
@@ -218,15 +199,11 @@ protected void resolveIdentifier(String name, ParserRuleContext ctx) {
                 return;
             }
             if (selectedBstEntry.localStrings.containsKey(name)) {
-                bstVMContext
-                    .stack()
-                    .push(selectedBstEntry.localStrings.get(name));
+                bstVMContext.stack().push(selectedBstEntry.localStrings.get(name));
                 return;
             }
             if (selectedBstEntry.localIntegers.containsKey(name)) {
-                bstVMContext
-                    .stack()
-                    .push(selectedBstEntry.localIntegers.get(name));
+                bstVMContext.stack().push(selectedBstEntry.localIntegers.get(name));
                 return;
             }
         }
@@ -251,10 +228,7 @@ protected void resolveIdentifier(String name, ParserRuleContext ctx) {
     public Integer visitBstFunction(BstParser.BstFunctionContext ctx) {
         String name = ctx.getChild(0).getText();
         if (bstVMContext.functions().containsKey(name)) {
-            bstVMContext
-                .functions()
-                .get(name)
-                .execute(this, ctx, selectedBstEntry);
+            bstVMContext.functions().get(name).execute(this, ctx, selectedBstEntry);
         } else {
             visit(ctx.getChild(0));
         }
@@ -270,15 +244,11 @@ public Integer visitStackitem(BstParser.StackitemContext ctx) {
                     switch (token.getSymbol().getType()) {
                         case BstParser.STRING -> {
                             String s = token.getText();
-                            bstVMContext
-                                .stack()
-                                .push(s.substring(1, s.length() - 1));
+                            bstVMContext.stack().push(s.substring(1, s.length() - 1));
                         }
                         case BstParser.INTEGER -> bstVMContext
                             .stack()
-                            .push(
-                                Integer.parseInt(token.getText().substring(1))
-                            );
+                            .push(Integer.parseInt(token.getText().substring(1)));
                         case BstParser.QUOTED -> bstVMContext
                             .stack()
                             .push(new Identifier(token.getText().substring(1)));
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 42fa529745f..729c95703d9 100644
--- a/src/main/java/org/jabref/logic/bst/util/BstCaseChanger.java
+++ b/src/main/java/org/jabref/logic/bst/util/BstCaseChanger.java
@@ -7,9 +7,7 @@
 
 public final class BstCaseChanger {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(
-        BstCaseChanger.class
-    );
+    private static final Logger LOGGER = LoggerFactory.getLogger(BstCaseChanger.class);
 
     // stores whether the char before the current char was a colon
     private boolean prevColon = true;
@@ -99,8 +97,7 @@ private String doChangeCase(String s, FormatMode format) {
                 }
                 if (
                     (format == FormatMode.TITLE_LOWERS) &&
-                    ((i == 0) ||
-                        (prevColon && Character.isWhitespace(c[i - 1])))
+                    ((i == 0) || (prevColon && Character.isWhitespace(c[i - 1])))
                 ) {
                     sb.append('{');
                     i++;
@@ -146,12 +143,7 @@ private String doChangeCase(String s, FormatMode format) {
      *
      * @param start  the current position. It points to the opening brace
      */
-    private int convertSpecialChar(
-        StringBuilder sb,
-        char[] c,
-        int start,
-        FormatMode format
-    ) {
+    private int convertSpecialChar(StringBuilder sb, char[] c, int start, FormatMode format) {
         int i = start;
 
         sb.append(c[i]);
@@ -225,12 +217,7 @@ private int convertAccented(
         return pos;
     }
 
-    private int convertNonControl(
-        char[] c,
-        int start,
-        StringBuilder sb,
-        FormatMode format
-    ) {
+    private int convertNonControl(char[] c, int start, StringBuilder sb, FormatMode format) {
         int pos = start;
         switch (format) {
             case TITLE_LOWERS, ALL_LOWERS -> {
@@ -241,9 +228,7 @@ private int convertNonControl(
                 sb.append(Character.toUpperCase(c[pos]));
                 pos++;
             }
-            default -> LOGGER.info(
-                "convertNonControl - Unknown format: " + format
-            );
+            default -> LOGGER.info("convertNonControl - Unknown format: " + format);
         }
         return pos;
     }
@@ -257,9 +242,7 @@ private int convertCharIfBraceLevelIsZero(
         int i = start;
         switch (format) {
             case TITLE_LOWERS -> {
-                if (
-                    (i == 0) || (prevColon && Character.isWhitespace(c[i - 1]))
-                ) {
+                if ((i == 0) || (prevColon && Character.isWhitespace(c[i - 1]))) {
                     sb.append(c[i]);
                 } else {
                     sb.append(Character.toLowerCase(c[i]));
@@ -272,9 +255,7 @@ private int convertCharIfBraceLevelIsZero(
             }
             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
-            );
+            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 287ec47ab26..5427d1cbf3e 100644
--- a/src/main/java/org/jabref/logic/bst/util/BstNameFormatter.java
+++ b/src/main/java/org/jabref/logic/bst/util/BstNameFormatter.java
@@ -28,9 +28,7 @@
  */
 public class BstNameFormatter {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(
-        BstNameFormatter.class
-    );
+    private static final Logger LOGGER = LoggerFactory.getLogger(BstNameFormatter.class);
 
     private BstNameFormatter() {}
 
@@ -41,11 +39,7 @@ private BstNameFormatter() {}
      * @param whichName       index of the list, starting with 1
      * @param formatString    TODO
      */
-    public static String formatName(
-        String authorsNameList,
-        int whichName,
-        String formatString
-    ) {
+    public static String formatName(String authorsNameList, int whichName, String formatString) {
         AuthorList al = AuthorList.parse(authorsNameList);
 
         if ((whichName < 1) && (whichName > al.getNumberOfAuthors())) {
@@ -56,10 +50,7 @@ public static String formatName(
             );
             return "";
         }
-        return BstNameFormatter.formatName(
-            al.getAuthor(whichName - 1),
-            formatString
-        );
+        return BstNameFormatter.formatName(al.getAuthor(whichName - 1), formatString);
     }
 
     public static String formatName(Author author, String format) {
@@ -104,9 +95,7 @@ public static String formatName(Author author, String format) {
                     i++;
                 }
                 i--; // unskip last brace (for last i++ at the end)
-                String control = level1Chars
-                    .toString()
-                    .toLowerCase(Locale.ROOT);
+                String control = level1Chars.toString().toLowerCase(Locale.ROOT);
 
                 if (control.isEmpty()) {
                     continue;
@@ -153,10 +142,7 @@ public static String formatName(Author author, String format) {
 
                 // Now we know what to do
 
-                if (
-                    (braceLevel == 0) &&
-                    (wholeChar.charAt(wholeChar.length() - 1) == '}')
-                ) {
+                if ((braceLevel == 0) && (wholeChar.charAt(wholeChar.length() - 1) == '}')) {
                     wholeChar.deleteCharAt(wholeChar.length() - 1);
                 }
 
@@ -175,17 +161,8 @@ public static String formatName(Author author, String format) {
                         }
                         if (((j + 1) < d.length) && (d[j + 1] == '{')) {
                             StringBuilder interTokenSb = new StringBuilder();
-                            j =
-                                BstNameFormatter.consumeToMatchingBrace(
-                                    interTokenSb,
-                                    d,
-                                    j + 1
-                                );
-                            interToken =
-                                interTokenSb.substring(
-                                    1,
-                                    interTokenSb.length() - 1
-                                );
+                            j = BstNameFormatter.consumeToMatchingBrace(interTokenSb, d, j + 1);
+                            interToken = interTokenSb.substring(1, interTokenSb.length() - 1);
                         }
 
                         for (int k = 0; k < tokens.length; k++) {
@@ -196,9 +173,7 @@ public static String formatName(Author author, String format) {
                                 token =
                                     Arrays
                                         .stream(dashes)
-                                        .map(
-                                            BstNameFormatter::getFirstCharOfString
-                                        )
+                                        .map(BstNameFormatter::getFirstCharOfString)
                                         .collect(Collectors.joining(".-"));
                             }
 
@@ -217,10 +192,7 @@ public static String formatName(Author author, String format) {
                                     if (
                                         (k == (tokens.length - 2)) ||
                                         (BstNameFormatter.numberOfChars(
-                                                sb.substring(
-                                                    groupStart,
-                                                    sb.length()
-                                                ),
+                                                sb.substring(groupStart, sb.length()),
                                                 3
                                             ) <
                                             3)
@@ -255,8 +227,7 @@ public static String formatName(Author author, String format) {
                                     4
                                 ) >=
                                 4) ||
-                            ((sb.length() > 1) &&
-                                (noDisTie = sb.charAt(sb.length() - 2) == '~')))
+                            ((sb.length() > 1) && (noDisTie = sb.charAt(sb.length() - 2) == '~')))
                     ) {
                         sb.deleteCharAt(sb.length() - 1);
                         if (!noDisTie) {
@@ -272,10 +243,7 @@ public static String formatName(Author author, String format) {
             i++;
         }
         if (braceLevel != 0) {
-            LOGGER.warn(
-                "Unbalanced brace in format string for nameFormat: {}",
-                format
-            );
+            LOGGER.warn("Unbalanced brace in format string for nameFormat: {}", format);
         }
 
         return sb.toString();
@@ -284,11 +252,7 @@ public static String formatName(Author author, String format) {
     /**
      * Including the matching brace.
      */
-    public static int consumeToMatchingBrace(
-        StringBuilder interTokenSb,
-        char[] c,
-        int pos
-    ) {
+    public static int consumeToMatchingBrace(StringBuilder interTokenSb, char[] c, int pos) {
         int braceLevel = 0;
 
         for (int i = pos; i < c.length; i++) {
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 2e5e7486528..0cfb136f068 100644
--- a/src/main/java/org/jabref/logic/bst/util/BstPurifier.java
+++ b/src/main/java/org/jabref/logic/bst/util/BstPurifier.java
@@ -15,9 +15,7 @@
  */
 public class BstPurifier {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(
-        BstPurifier.class
-    );
+    private static final Logger LOGGER = LoggerFactory.getLogger(BstPurifier.class);
 
     private BstPurifier() {}
 
@@ -42,16 +40,12 @@ public static String purify(String toPurify) {
                     i++; // skip brace
                     while ((i < n) && (braceLevel > 0)) {
                         i++; // skip backslash
-                        BstCaseChanger
-                            .findSpecialChar(cs, i)
-                            .ifPresent(sb::append);
+                        BstCaseChanger.findSpecialChar(cs, i).ifPresent(sb::append);
 
                         while ((i < n) && Character.isLetter(cs[i])) {
                             i++;
                         }
-                        while (
-                            (i < n) && (braceLevel > 0) && ((c = cs[i]) != '\\')
-                        ) {
+                        while ((i < n) && (braceLevel > 0) && ((c = cs[i]) != '\\')) {
                             if (Character.isLetterOrDigit(c)) {
                                 sb.append(c);
                             } else if (c == '}') {
@@ -68,10 +62,7 @@ public static String purify(String toPurify) {
                 if (braceLevel > 0) {
                     braceLevel--;
                 } else {
-                    LOGGER.warn(
-                        "Unbalanced brace in string for purify$: {}",
-                        toPurify
-                    );
+                    LOGGER.warn("Unbalanced brace in string for purify$: {}", toPurify);
                 }
             }
             i++;
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 ecb53a6a374..f310198807a 100644
--- a/src/main/java/org/jabref/logic/bst/util/BstTextPrefixer.java
+++ b/src/main/java/org/jabref/logic/bst/util/BstTextPrefixer.java
@@ -19,9 +19,7 @@
  */
 public class BstTextPrefixer {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(
-        BstTextPrefixer.class
-    );
+    private static final Logger LOGGER = LoggerFactory.getLogger(BstTextPrefixer.class);
 
     private BstTextPrefixer() {}
 
@@ -56,10 +54,7 @@ public static String textPrefix(int inNumOfChars, String toPrefix) {
                 if (braceLevel > 0) {
                     braceLevel--;
                 } else {
-                    LOGGER.warn(
-                        "Unbalanced brace in string for purify$: {}",
-                        toPrefix
-                    );
+                    LOGGER.warn("Unbalanced brace in string for purify$: {}", toPrefix);
                 }
             } else {
                 numOfChars--;
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 f537220b385..353e9694e52 100644
--- a/src/main/java/org/jabref/logic/bst/util/BstWidthCalculator.java
+++ b/src/main/java/org/jabref/logic/bst/util/BstWidthCalculator.java
@@ -15,9 +15,7 @@
  */
 public class BstWidthCalculator {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(
-        BstWidthCalculator.class
-    );
+    private static final Logger LOGGER = LoggerFactory.getLogger(BstWidthCalculator.class);
 
     /*
      * Quoted from Bibtex:
@@ -204,16 +202,8 @@ public static int width(String toMeasure) {
                         if ((i < n) && (i == afterBackslash)) {
                             i++; // Skip non-alpha control seq
                         } else {
-                            if (
-                                BstCaseChanger
-                                    .findSpecialChar(c, afterBackslash)
-                                    .isPresent()
-                            ) {
-                                result +=
-                                BstWidthCalculator.getSpecialCharWidth(
-                                    c,
-                                    afterBackslash
-                                );
+                            if (BstCaseChanger.findSpecialChar(c, afterBackslash).isPresent()) {
+                                result += BstWidthCalculator.getSpecialCharWidth(c, afterBackslash);
                             }
                         }
                         while ((i < n) && Character.isWhitespace(c[i])) {
@@ -236,9 +226,7 @@ public static int width(String toMeasure) {
                 if (braceLevel > 0) {
                     braceLevel--;
                 } else {
-                    LOGGER.warn(
-                        "Too many closing braces in string: " + toMeasure
-                    );
+                    LOGGER.warn("Too many closing braces in string: " + toMeasure);
                 }
             }
             result += BstWidthCalculator.getCharWidth(c[i]);
diff --git a/src/main/java/org/jabref/logic/citationkeypattern/AbstractCitationKeyPattern.java b/src/main/java/org/jabref/logic/citationkeypattern/AbstractCitationKeyPattern.java
index 655c0e7db0f..b4cfe329e7c 100644
--- a/src/main/java/org/jabref/logic/citationkeypattern/AbstractCitationKeyPattern.java
+++ b/src/main/java/org/jabref/logic/citationkeypattern/AbstractCitationKeyPattern.java
@@ -48,9 +48,7 @@ public void addCitationKeyPattern(EntryType type, String pattern) {
 
     @Override
     public String toString() {
-        final StringBuilder sb = new StringBuilder(
-            "AbstractCitationKeyPattern{"
-        );
+        final StringBuilder sb = new StringBuilder("AbstractCitationKeyPattern{");
         sb.append("defaultPattern=").append(defaultPattern);
         sb.append(", data=").append(data);
         sb.append('}');
@@ -67,8 +65,7 @@ public boolean equals(Object o) {
         }
         AbstractCitationKeyPattern that = (AbstractCitationKeyPattern) o;
         return (
-            Objects.equals(defaultPattern, that.defaultPattern) &&
-            Objects.equals(data, that.data)
+            Objects.equals(defaultPattern, that.defaultPattern) && Objects.equals(data, that.data)
         );
     }
 
@@ -124,8 +121,7 @@ public List<String> getDefaultValue() {
      */
     public void setDefaultValue(String bibtexKeyPattern) {
         Objects.requireNonNull(bibtexKeyPattern);
-        this.defaultPattern =
-            AbstractCitationKeyPattern.split(bibtexKeyPattern);
+        this.defaultPattern = AbstractCitationKeyPattern.split(bibtexKeyPattern);
     }
 
     public Set<EntryType> getAllKeys() {
diff --git a/src/main/java/org/jabref/logic/citationkeypattern/BracketedPattern.java b/src/main/java/org/jabref/logic/citationkeypattern/BracketedPattern.java
index 795b0e78707..533359ce509 100644
--- a/src/main/java/org/jabref/logic/citationkeypattern/BracketedPattern.java
+++ b/src/main/java/org/jabref/logic/citationkeypattern/BracketedPattern.java
@@ -47,9 +47,7 @@
  */
 public class BracketedPattern {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(
-        BracketedPattern.class
-    );
+    private static final Logger LOGGER = LoggerFactory.getLogger(BracketedPattern.class);
 
     /**
      * The maximum number of characters in the first author's last name.
@@ -70,17 +68,13 @@ public class BracketedPattern {
     /**
      * Matches everything that is not an uppercase ASCII letter. The intended use is to remove all lowercase letters
      */
-    private static final Pattern NOT_CAPITAL_CHARACTER = Pattern.compile(
-        "[^A-Z]"
-    );
+    private static final Pattern NOT_CAPITAL_CHARACTER = Pattern.compile("[^A-Z]");
 
     /**
      * 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]+(?=}\\))"
-    );
+    private static final Pattern INLINE_ABBREVIATION = Pattern.compile("(?<=\\(\\{)[A-Z]+(?=}\\))");
 
     /**
      * Matches with "dep"/"dip", case-insensitive
@@ -90,9 +84,7 @@ public class BracketedPattern {
         Pattern.CASE_INSENSITIVE
     );
 
-    private static final Pattern WHITESPACE = Pattern.compile(
-        "\\p{javaWhitespace}"
-    );
+    private static final Pattern WHITESPACE = Pattern.compile("\\p{javaWhitespace}");
 
     private enum Institution {
         SCHOOL,
@@ -136,13 +128,9 @@ public static EnumSet<Institution> findTypes(List<String> nameParts) {
             for (String namePart : nameParts) {
                 if (UNIVERSITIES.matcher(namePart).matches()) {
                     parts.add(Institution.UNIVERSITY);
-                } else if (
-                    TECHNOLOGICAL_INSTITUTES.matcher(namePart).matches()
-                ) {
+                } else if (TECHNOLOGICAL_INSTITUTES.matcher(namePart).matches()) {
                     parts.add(Institution.TECHNOLOGY);
-                } else if (
-                    StandardField.SCHOOL.getName().equalsIgnoreCase(namePart)
-                ) {
+                } else if (StandardField.SCHOOL.getName().equalsIgnoreCase(namePart)) {
                     parts.add(Institution.SCHOOL);
                 } else if (DEPARTMENTS_OR_LABS.matcher(namePart).matches()) {
                     parts.add(Institution.DEPARTMENT);
@@ -197,18 +185,9 @@ public String expand(BibEntry bibentry, BibDatabase database) {
      * @param database         The database to use for string-lookups and cross-refs. May be null.
      * @return The expanded pattern. The empty string is returned, if it could not be expanded.
      */
-    public String expand(
-        BibEntry bibentry,
-        Character keywordDelimiter,
-        BibDatabase database
-    ) {
+    public String expand(BibEntry bibentry, Character keywordDelimiter, BibDatabase database) {
         Objects.requireNonNull(bibentry);
-        return expandBrackets(
-            this.pattern,
-            keywordDelimiter,
-            bibentry,
-            database
-        );
+        return expandBrackets(this.pattern, keywordDelimiter, bibentry, database);
     }
 
     /**
@@ -228,10 +207,7 @@ public static String expandBrackets(
     ) {
         Objects.requireNonNull(pattern);
         Objects.requireNonNull(entry);
-        return expandBrackets(
-            pattern,
-            expandBracketContent(keywordDelimiter, entry, database)
-        );
+        return expandBrackets(pattern, expandBracketContent(keywordDelimiter, entry, database));
     }
 
     /**
@@ -253,13 +229,7 @@ public static Function<String, String> expandBracketContent(
             List<String> fieldParts = parseFieldAndModifiers(bracket);
             // check whether there is a modifier on the end such as
             // ":lower":
-            expandedPattern =
-                getFieldValue(
-                    entry,
-                    fieldParts.get(0),
-                    keywordDelimiter,
-                    database
-                );
+            expandedPattern = getFieldValue(entry, fieldParts.get(0), keywordDelimiter, database);
             if (fieldParts.size() > 1) {
                 // apply modifiers:
                 expandedPattern =
@@ -288,32 +258,21 @@ public static String expandBrackets(
     ) {
         Objects.requireNonNull(pattern);
         StringBuilder expandedPattern = new StringBuilder();
-        StringTokenizer parsedPattern = new StringTokenizer(
-            pattern,
-            "\\[]\"",
-            true
-        );
+        StringTokenizer parsedPattern = new StringTokenizer(pattern, "\\[]\"", true);
 
         while (parsedPattern.hasMoreTokens()) {
             String token = parsedPattern.nextToken();
             switch (token) {
                 case "\"" -> appendQuote(expandedPattern, parsedPattern);
                 case "[" -> {
-                    String fieldMarker = contentBetweenBrackets(
-                        parsedPattern,
-                        pattern
-                    );
-                    expandedPattern.append(
-                        bracketContentHandler.apply(fieldMarker)
-                    );
+                    String fieldMarker = contentBetweenBrackets(parsedPattern, pattern);
+                    expandedPattern.append(bracketContentHandler.apply(fieldMarker));
                 }
                 case "\\" -> {
                     if (parsedPattern.hasMoreTokens()) {
                         expandedPattern.append(parsedPattern.nextToken());
                     } else {
-                        LOGGER.warn(
-                            "Found a \"\\\" that is not part of an escape sequence"
-                        );
+                        LOGGER.warn("Found a \"\\\" that is not part of an escape sequence");
                     }
                 }
                 default -> expandedPattern.append(token);
@@ -333,10 +292,7 @@ public static String expandBrackets(
      * @param tokenizer the tokenizer producing the tokens
      * @return the content enclosed by brackets
      */
-    private static String contentBetweenBrackets(
-        StringTokenizer tokenizer,
-        final String pattern
-    ) {
+    private static String contentBetweenBrackets(StringTokenizer tokenizer, final String pattern) {
         StringBuilder bracketContent = new StringBuilder();
         boolean foundClosingBracket = false;
         int subBrackets = 0;
@@ -378,10 +334,7 @@ private static String contentBetweenBrackets(
      * @param stringBuilder the <code>StringBuilder</code> to which tokens will be appended
      * @param tokenizer     the tokenizer producing the tokens
      */
-    private static void appendQuote(
-        StringBuilder stringBuilder,
-        StringTokenizer tokenizer
-    ) {
+    private static void appendQuote(StringBuilder stringBuilder, StringTokenizer tokenizer) {
         stringBuilder.append("\""); // We know that the previous token was \"
         String token = "";
         while (tokenizer.hasMoreTokens() && !"\"".equals(token)) {
@@ -421,12 +374,7 @@ public static String getFieldValue(
                 } else if (unparsedAuthors.isEmpty()) {
                     // special feature: A pattern starting with "auth" falls back to the editor
                     unparsedAuthors =
-                        entry
-                            .getResolvedFieldOrAlias(
-                                StandardField.EDITOR,
-                                database
-                            )
-                            .orElse("");
+                        entry.getResolvedFieldOrAlias(StandardField.EDITOR, database).orElse("");
                 }
 
                 AuthorList authorList = createAuthorList(unparsedAuthors);
@@ -475,18 +423,12 @@ public static String getFieldValue(
                     int num = Integer.parseInt(pattern.substring(4));
                     return authN(authorList, num);
                 } else if (pattern.matches("authors\\d+")) {
-                    return nAuthors(
-                        authorList,
-                        Integer.parseInt(pattern.substring(7))
-                    );
+                    return nAuthors(authorList, Integer.parseInt(pattern.substring(7)));
                 } else {
                     // This "auth" business was a dead end, so just
                     // use it literally:
                     return entry
-                        .getResolvedFieldOrAlias(
-                            FieldFactory.parseField(pattern),
-                            database
-                        )
+                        .getResolvedFieldOrAlias(FieldFactory.parseField(pattern), database)
                         .orElse("");
                 }
             } else if (pattern.startsWith("ed")) {
@@ -537,50 +479,32 @@ public static String getFieldValue(
                     // This "ed" business was a dead end, so just
                     // use it literally:
                     return entry
-                        .getResolvedFieldOrAlias(
-                            FieldFactory.parseField(pattern),
-                            database
-                        )
+                        .getResolvedFieldOrAlias(FieldFactory.parseField(pattern), database)
                         .orElse("");
                 }
             } else if ("firstpage".equals(pattern)) {
                 return firstPage(
-                    entry
-                        .getResolvedFieldOrAlias(StandardField.PAGES, database)
-                        .orElse("")
+                    entry.getResolvedFieldOrAlias(StandardField.PAGES, database).orElse("")
                 );
             } else if ("pageprefix".equals(pattern)) {
                 return pagePrefix(
-                    entry
-                        .getResolvedFieldOrAlias(StandardField.PAGES, database)
-                        .orElse("")
+                    entry.getResolvedFieldOrAlias(StandardField.PAGES, database).orElse("")
                 );
             } else if ("lastpage".equals(pattern)) {
                 return lastPage(
-                    entry
-                        .getResolvedFieldOrAlias(StandardField.PAGES, database)
-                        .orElse("")
+                    entry.getResolvedFieldOrAlias(StandardField.PAGES, database).orElse("")
                 );
             } else if ("title".equals(pattern)) {
                 return camelizeSignificantWordsInTitle(
-                    entry
-                        .getResolvedFieldOrAlias(StandardField.TITLE, database)
-                        .orElse("")
+                    entry.getResolvedFieldOrAlias(StandardField.TITLE, database).orElse("")
                 );
             } else if ("fulltitle".equals(pattern)) {
-                return entry
-                    .getResolvedFieldOrAlias(StandardField.TITLE, database)
-                    .orElse("");
+                return entry.getResolvedFieldOrAlias(StandardField.TITLE, database).orElse("");
             } else if ("shorttitle".equals(pattern)) {
                 return getTitleWords(
                     3,
                     removeSmallWords(
-                        entry
-                            .getResolvedFieldOrAlias(
-                                StandardField.TITLE,
-                                database
-                            )
-                            .orElse("")
+                        entry.getResolvedFieldOrAlias(StandardField.TITLE, database).orElse("")
                     )
                 );
             } else if ("shorttitleINI".equals(pattern)) {
@@ -588,12 +512,7 @@ public static String getFieldValue(
                     applyModifiers(
                         getTitleWordsWithSpaces(
                             3,
-                            entry
-                                .getResolvedFieldOrAlias(
-                                    StandardField.TITLE,
-                                    database
-                                )
-                                .orElse("")
+                            entry.getResolvedFieldOrAlias(StandardField.TITLE, database).orElse("")
                         ),
                         Collections.singletonList("abbr"),
                         0,
@@ -604,19 +523,12 @@ public static String getFieldValue(
                 return getTitleWords(
                     1,
                     removeSmallWords(
-                        entry
-                            .getResolvedFieldOrAlias(
-                                StandardField.TITLE,
-                                database
-                            )
-                            .orElse("")
+                        entry.getResolvedFieldOrAlias(StandardField.TITLE, database).orElse("")
                     )
                 );
             } else if ("camel".equals(pattern)) {
                 return getCamelizedTitle(
-                    entry
-                        .getResolvedFieldOrAlias(StandardField.TITLE, database)
-                        .orElse("")
+                    entry.getResolvedFieldOrAlias(StandardField.TITLE, database).orElse("")
                 );
             } else if ("shortyear".equals(pattern)) {
                 String yearString = entry
@@ -625,9 +537,7 @@ public static String getFieldValue(
                 if (yearString.isEmpty()) {
                     return yearString;
                     // In press/in preparation/submitted
-                } else if (
-                    yearString.startsWith("in") || yearString.startsWith("sub")
-                ) {
+                } else if (yearString.startsWith("in") || yearString.startsWith("sub")) {
                     return "IP";
                 } else if (yearString.length() > 2) {
                     return yearString.substring(yearString.length() - 2);
@@ -636,10 +546,7 @@ public static String getFieldValue(
                 }
             } else if ("entrytype".equals(pattern)) {
                 return entry
-                    .getResolvedFieldOrAlias(
-                        InternalField.TYPE_HEADER,
-                        database
-                    )
+                    .getResolvedFieldOrAlias(InternalField.TYPE_HEADER, database)
                     .orElse("");
             } else if (pattern.matches("keyword\\d+")) {
                 // according to LabelPattern.php, it returns keyword number n
@@ -682,10 +589,7 @@ public static String getFieldValue(
             } else {
                 // we haven't seen any special demands
                 return entry
-                    .getResolvedFieldOrAlias(
-                        FieldFactory.parseField(pattern),
-                        database
-                    )
+                    .getResolvedFieldOrAlias(FieldFactory.parseField(pattern), database)
                     .orElse("");
             }
         } catch (NullPointerException ex) {
@@ -717,23 +621,11 @@ private static AuthorList createAuthorList(String unparsedAuthors) {
                     )
                     .orElse(null);
                 return new Author(
-                    author
-                        .getFirst()
-                        .map(LatexToUnicodeAdapter::format)
-                        .orElse(null),
-                    author
-                        .getFirstAbbr()
-                        .map(LatexToUnicodeAdapter::format)
-                        .orElse(null),
-                    author
-                        .getVon()
-                        .map(LatexToUnicodeAdapter::format)
-                        .orElse(null),
+                    author.getFirst().map(LatexToUnicodeAdapter::format).orElse(null),
+                    author.getFirstAbbr().map(LatexToUnicodeAdapter::format).orElse(null),
+                    author.getVon().map(LatexToUnicodeAdapter::format).orElse(null),
                     lastName,
-                    author
-                        .getJr()
-                        .map(LatexToUnicodeAdapter::format)
-                        .orElse(null)
+                    author.getJr().map(LatexToUnicodeAdapter::format).orElse(null)
                 );
             })
             .collect(AuthorList.collect());
@@ -788,8 +680,7 @@ static String applyModifiers(
                 }
                 resultingLabel = abbreviateSB.toString();
             } else {
-                Optional<Formatter> formatter =
-                    Formatters.getFormatterForModifier(modifier);
+                Optional<Formatter> formatter = Formatters.getFormatterForModifier(modifier);
                 if (formatter.isPresent()) {
                     resultingLabel = formatter.get().format(resultingLabel);
                 } else if (
@@ -807,10 +698,7 @@ static String applyModifiers(
                             );
                     }
                 } else {
-                    LOGGER.warn(
-                        "Key generator warning: unknown modifier '{}'.",
-                        modifier
-                    );
+                    LOGGER.warn("Key generator warning: unknown modifier '{}'.", modifier);
                 }
             }
         }
@@ -878,9 +766,7 @@ private static String camelizeTitle(String title) {
                 String word = titleScanner.next();
 
                 // Camelize the word
-                word =
-                    word.substring(0, 1).toUpperCase(Locale.ROOT) +
-                    word.substring(1);
+                word = word.substring(0, 1).toUpperCase(Locale.ROOT) + word.substring(1);
 
                 if (stringBuilder.length() > 0) {
                     stringBuilder.append(' ');
@@ -904,19 +790,13 @@ public static String camelizeSignificantWordsInTitle(String title) {
                 String word = titleScanner.next();
 
                 // Camelize the word if it is significant
-                boolean camelize = !Word.SMALLER_WORDS.contains(
-                    word.toLowerCase(Locale.ROOT)
-                );
+                boolean camelize = !Word.SMALLER_WORDS.contains(word.toLowerCase(Locale.ROOT));
 
                 // We want to capitalize significant words and the first word of the title
                 if (camelize || (stringJoiner.length() == 0)) {
-                    word =
-                        word.substring(0, 1).toUpperCase(Locale.ROOT) +
-                        word.substring(1);
+                    word = word.substring(0, 1).toUpperCase(Locale.ROOT) + word.substring(1);
                 } else {
-                    word =
-                        word.substring(0, 1).toLowerCase(Locale.ROOT) +
-                        word.substring(1);
+                    word = word.substring(0, 1).toLowerCase(Locale.ROOT) + word.substring(1);
                 }
 
                 stringJoiner.add(word);
@@ -941,10 +821,7 @@ private static String getTitleWordsWithSpaces(int number, String title) {
         String formattedTitle = formatTitle(title);
 
         try (Scanner titleScanner = new Scanner(formattedTitle)) {
-            return titleScanner
-                .tokens()
-                .limit(number)
-                .collect(Collectors.joining(" "));
+            return titleScanner.tokens().limit(number).collect(Collectors.joining(" "));
         }
     }
 
@@ -952,11 +829,7 @@ private static String keepLettersAndDigitsOnly(String in) {
         return in
             .codePoints()
             .filter(Character::isLetterOrDigit)
-            .collect(
-                StringBuilder::new,
-                StringBuilder::appendCodePoint,
-                StringBuilder::append
-            )
+            .collect(StringBuilder::new, StringBuilder::appendCodePoint, StringBuilder::append)
             .toString();
     }
 
@@ -972,11 +845,7 @@ private static String firstAuthor(AuthorList authorList) {
             .getAuthors()
             .stream()
             .findFirst()
-            .flatMap(author ->
-                author.getLast().isPresent()
-                    ? author.getLast()
-                    : author.getVon()
-            )
+            .flatMap(author -> author.getLast().isPresent() ? author.getLast() : author.getVon())
             .orElse("");
     }
 
@@ -1005,9 +874,7 @@ private static String firstAuthorForenameInitials(AuthorList authorList) {
      * never return null.
      */
     private static String firstAuthorVonAndLast(AuthorList authorList) {
-        return authorList.isEmpty()
-            ? ""
-            : authorList.getAuthor(0).getLastOnly().replace(" ", "");
+        return authorList.isEmpty() ? "" : authorList.getAuthor(0).getLastOnly().replace(" ", "");
     }
 
     /**
@@ -1056,12 +923,7 @@ private static String lastAuthorForenameInitials(AuthorList authorList) {
      * @return the surname of all authors/editors
      */
     static String allAuthors(AuthorList authorList) {
-        return joinAuthorsOnLastName(
-            authorList,
-            authorList.getNumberOfAuthors(),
-            "",
-            "EtAl"
-        );
+        return joinAuthorsOnLastName(authorList, authorList.getNumberOfAuthors(), "", "EtAl");
     }
 
     /**
@@ -1100,9 +962,7 @@ static String authorsAlpha(AuthorList authorList) {
                 Math.min(3, firstAuthor[firstAuthor.length - 1].length())
             );
         } else {
-            boolean andOthersPresent = authorList
-                .getAuthor(maxAuthors - 1)
-                .equals(Author.OTHERS);
+            boolean andOthersPresent = authorList.getAuthor(maxAuthors - 1).equals(Author.OTHERS);
             if (andOthersPresent) {
                 maxAuthors--;
             }
@@ -1115,10 +975,7 @@ static String authorsAlpha(AuthorList authorList) {
             for (String vonAndLast : vonAndLastNames) {
                 // replace all whitespaces by " "
                 // split the lastname at " "
-                String[] nameParts = vonAndLast
-                    .replaceAll("\\s+", " ")
-                    .trim()
-                    .split(" ");
+                String[] nameParts = vonAndLast.replaceAll("\\s+", " ").trim().split(" ");
                 for (String part : nameParts) {
                     // use first character of each part of lastname
                     alphaStyle.append(part, 0, 1);
@@ -1148,18 +1005,14 @@ private static String joinAuthorsOnLastName(
         String delimiter,
         final String suffix
     ) {
-        final String finalSuffix = authorList.getNumberOfAuthors() > maxAuthors
-            ? 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())
-                        );
+                        return Optional.of(suffix.substring(delimiter.length()));
                     } else {
                         return Optional.of(suffix);
                     }
@@ -1236,11 +1089,7 @@ private static String authNofMth(AuthorList authorList, int n, int m) {
         // have m counting from 0
         int mminusone = m - 1;
 
-        if (
-            (authorList.getNumberOfAuthors() <= mminusone) ||
-            (n < 0) ||
-            (mminusone < 0)
-        ) {
+        if ((authorList.getNumberOfAuthors() <= mminusone) || (n < 0) || (mminusone < 0)) {
             return "";
         }
 
@@ -1399,9 +1248,7 @@ protected static List<String> parseFieldAndModifiers(String arg) {
             } else if ((currentChar == '(') && !escaped) {
                 inParenthesis++;
                 current.append(currentChar);
-            } else if (
-                (currentChar == ')') && !escaped && (inParenthesis > 0)
-            ) {
+            } else if ((currentChar == ')') && !escaped && (inParenthesis > 0)) {
                 inParenthesis--;
                 current.append(currentChar);
             } else if (currentChar == '\\') {
@@ -1499,9 +1346,7 @@ private static String generateInstitutionKey(String content) {
             return LatexToUnicodeAdapter.format(matcher.group());
         }
 
-        Optional<String> unicodeFormattedName = LatexToUnicodeAdapter.parse(
-            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",
@@ -1524,9 +1369,7 @@ private static String generateInstitutionKey(String content) {
         String rest = null;
 
         for (int index = 0; index < institutionNameTokens.length; index++) {
-            List<String> tokenParts = getValidInstitutionNameParts(
-                institutionNameTokens[index]
-            );
+            List<String> tokenParts = getValidInstitutionNameParts(institutionNameTokens[index]);
             EnumSet<Institution> tokenTypes = Institution.findTypes(tokenParts);
 
             if (tokenTypes.contains(Institution.UNIVERSITY)) {
@@ -1556,15 +1399,11 @@ private static String generateInstitutionKey(String content) {
                 for (String k : tokenParts) {
                     if (noOtherInstitutionKeyWord(k)) {
                         if (tokenTypes.contains(Institution.SCHOOL)) {
-                            schoolSB.append(
-                                NOT_CAPITAL_CHARACTER.matcher(k).replaceAll("")
-                            );
+                            schoolSB.append(NOT_CAPITAL_CHARACTER.matcher(k).replaceAll(""));
                         }
                         // Explicitly defined department part is build the same way as school
                         if (tokenTypes.contains(Institution.DEPARTMENT)) {
-                            departmentSB.append(
-                                NOT_CAPITAL_CHARACTER.matcher(k).replaceAll("")
-                            );
+                            departmentSB.append(NOT_CAPITAL_CHARACTER.matcher(k).replaceAll(""));
                         }
                     }
                 }
@@ -1594,8 +1433,7 @@ private static String generateInstitutionKey(String content) {
         return (
             (university == null ? Objects.toString(rest, "") : university) +
             (school == null ? "" : school) +
-            ((department == null) ||
-                    ((school != null) && department.equals(school))
+            ((department == null) || ((school != null) && department.equals(school))
                     ? ""
                     : department)
         );
@@ -1628,8 +1466,7 @@ private static List<String> getValidInstitutionNameParts(String name) {
                     // remove empty
                     (part.charAt(part.length() - 1) != '.') &&
                     Character.isUpperCase(part.charAt(0))) ||
-                ((part.length() >= 3) &&
-                    "uni".equalsIgnoreCase(part.substring(0, 3)))
+                ((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 c2f8b7cef3f..342234ca560 100644
--- a/src/main/java/org/jabref/logic/citationkeypattern/CitationKeyGenerator.java
+++ b/src/main/java/org/jabref/logic/citationkeypattern/CitationKeyGenerator.java
@@ -23,8 +23,7 @@ public class CitationKeyGenerator extends BracketedPattern {
     /**
      * All single characters that we can use for extending a key to make it unique.
      */
-    public static final String APPENDIX_CHARACTERS =
-        "abcdefghijklmnopqrstuvwxyz";
+    public static final String APPENDIX_CHARACTERS = "abcdefghijklmnopqrstuvwxyz";
 
     /**
      * List of unwanted characters. These will be removed at the end.
@@ -33,9 +32,7 @@ public class CitationKeyGenerator extends BracketedPattern {
      */
     public static final String DEFAULT_UNWANTED_CHARACTERS = "-`ʹ:!;?^";
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(
-        CitationKeyGenerator.class
-    );
+    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(
@@ -65,9 +62,7 @@ public CitationKeyGenerator(
         this(
             bibDatabaseContext
                 .getMetaData()
-                .getCiteKeyPattern(
-                    citationKeyPatternPreferences.getKeyPattern()
-                ),
+                .getCiteKeyPattern(citationKeyPatternPreferences.getKeyPattern()),
             bibDatabaseContext.getDatabase(),
             citationKeyPatternPreferences
         );
@@ -80,10 +75,8 @@ public CitationKeyGenerator(
     ) {
         this.citeKeyPattern = Objects.requireNonNull(citeKeyPattern);
         this.database = Objects.requireNonNull(database);
-        this.citationKeyPatternPreferences =
-            Objects.requireNonNull(citationKeyPatternPreferences);
-        this.unwantedCharacters =
-            citationKeyPatternPreferences.getUnwantedCharacters();
+        this.citationKeyPatternPreferences = Objects.requireNonNull(citationKeyPatternPreferences);
+        this.unwantedCharacters = citationKeyPatternPreferences.getUnwantedCharacters();
     }
 
     /**
@@ -108,19 +101,12 @@ public static String removeDefaultUnwantedCharacters(String key) {
         return removeUnwantedCharacters(key, DEFAULT_UNWANTED_CHARACTERS);
     }
 
-    public static String removeUnwantedCharacters(
-        String key,
-        String unwantedCharacters
-    ) {
+    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
-            )
+            .collect(StringBuilder::new, StringBuilder::appendCodePoint, StringBuilder::append)
             .toString();
 
         // Replace non-English characters like umlauts etc. with a sensible
@@ -129,8 +115,7 @@ public static String removeUnwantedCharacters(
     }
 
     public static String cleanKey(String key, String unwantedCharacters) {
-        return removeUnwantedCharacters(key, unwantedCharacters)
-            .replaceAll("\\s", "");
+        return removeUnwantedCharacters(key, unwantedCharacters).replaceAll("\\s", "");
     }
 
     /**
@@ -180,8 +165,7 @@ private String appendLettersToKey(String key, String oldKey) {
                 moddedKey = key + getAppendix(number);
                 number++;
 
-                occurrences =
-                    database.getNumberOfCitationKeyOccurrences(moddedKey);
+                occurrences = database.getNumberOfCitationKeyOccurrences(moddedKey);
                 // only happens if #getAddition() is buggy
                 if (Objects.equals(oldKey, moddedKey)) {
                     occurrences--;
@@ -203,8 +187,7 @@ private String replaceWithRegex(String key) {
         // Remove Regular Expressions while generating Keys
         String regex = citationKeyPatternPreferences.getKeyPatternRegex();
         if ((regex != null) && !regex.trim().isEmpty()) {
-            String replacement =
-                citationKeyPatternPreferences.getKeyPatternReplacement();
+            String replacement = citationKeyPatternPreferences.getKeyPatternReplacement();
             try {
                 key = key.replaceAll(regex, replacement);
             } catch (PatternSyntaxException e) {
@@ -226,10 +209,7 @@ private String createCitationKeyFromPattern(BibEntry entry) {
         if (citationKeyPattern.isEmpty()) {
             return "";
         }
-        return expandBrackets(
-            citationKeyPattern.get(0),
-            expandBracketContent(entry)
-        );
+        return expandBrackets(citationKeyPattern.get(0), expandBracketContent(entry));
     }
 
     /**
@@ -239,8 +219,7 @@ private String createCitationKeyFromPattern(BibEntry entry) {
      * @return a cleaned citation key for the given {@link BibEntry}
      */
     private Function<String, String> expandBracketContent(BibEntry entry) {
-        Character keywordDelimiter =
-            citationKeyPatternPreferences.getKeywordDelimiter();
+        Character keywordDelimiter = citationKeyPatternPreferences.getKeywordDelimiter();
 
         return (String bracket) -> {
             String expandedPattern;
@@ -248,12 +227,7 @@ private Function<String, String> expandBracketContent(BibEntry entry) {
 
             expandedPattern =
                 removeUnwantedCharacters(
-                    getFieldValue(
-                        entry,
-                        fieldParts.get(0),
-                        keywordDelimiter,
-                        database
-                    ),
+                    getFieldValue(entry, fieldParts.get(0), keywordDelimiter, database),
                     unwantedCharacters
                 );
             // check whether there is a modifier on the end such as
@@ -261,12 +235,7 @@ private Function<String, String> expandBracketContent(BibEntry entry) {
             if (fieldParts.size() > 1) {
                 // apply modifiers:
                 expandedPattern =
-                    applyModifiers(
-                        expandedPattern,
-                        fieldParts,
-                        1,
-                        expandBracketContent(entry)
-                    );
+                    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 d06123aa274..b4d8861bd58 100644
--- a/src/main/java/org/jabref/logic/citationkeypattern/CitationKeyPatternPreferences.java
+++ b/src/main/java/org/jabref/logic/citationkeypattern/CitationKeyPatternPreferences.java
@@ -17,19 +17,13 @@ public enum KeySuffix {
         SECOND_WITH_B, // CiteKey, CiteKeyB, CiteKeyC ...
     }
 
-    private final BooleanProperty shouldAvoidOverwriteCiteKey =
-        new SimpleBooleanProperty();
-    private final BooleanProperty shouldWarnBeforeOverwriteCiteKey =
-        new SimpleBooleanProperty();
-    private final BooleanProperty shouldGenerateCiteKeysBeforeSaving =
-        new SimpleBooleanProperty();
-    private final ObjectProperty<KeySuffix> keySuffix =
-        new SimpleObjectProperty<>();
+    private final BooleanProperty shouldAvoidOverwriteCiteKey = new SimpleBooleanProperty();
+    private final BooleanProperty shouldWarnBeforeOverwriteCiteKey = new SimpleBooleanProperty();
+    private final BooleanProperty shouldGenerateCiteKeysBeforeSaving = new SimpleBooleanProperty();
+    private final ObjectProperty<KeySuffix> keySuffix = new SimpleObjectProperty<>();
     private final StringProperty keyPatternRegex = new SimpleStringProperty();
-    private final StringProperty keyPatternReplacement =
-        new SimpleStringProperty();
-    private final StringProperty unwantedCharacters =
-        new SimpleStringProperty();
+    private final StringProperty keyPatternReplacement = new SimpleStringProperty();
+    private final StringProperty unwantedCharacters = new SimpleStringProperty();
     private final ObjectProperty<GlobalCitationKeyPattern> keyPattern =
         new SimpleObjectProperty<>();
     private final String defaultPattern;
@@ -48,12 +42,8 @@ public CitationKeyPatternPreferences(
         ReadOnlyObjectProperty<Character> keywordDelimiter
     ) {
         this.shouldAvoidOverwriteCiteKey.set(shouldAvoidOverwriteCiteKey);
-        this.shouldWarnBeforeOverwriteCiteKey.set(
-                shouldWarnBeforeOverwriteCiteKey
-            );
-        this.shouldGenerateCiteKeysBeforeSaving.set(
-                shouldGenerateCiteKeysBeforeSaving
-            );
+        this.shouldWarnBeforeOverwriteCiteKey.set(shouldWarnBeforeOverwriteCiteKey);
+        this.shouldGenerateCiteKeysBeforeSaving.set(shouldGenerateCiteKeysBeforeSaving);
         this.keySuffix.set(keySuffix);
         this.keyPatternRegex.set(keyPatternRegex);
         this.keyPatternReplacement.set(keyPatternReplacement);
@@ -111,12 +101,8 @@ public BooleanProperty shouldWarnBeforeOverwriteCiteKeyProperty() {
         return shouldWarnBeforeOverwriteCiteKey;
     }
 
-    public void setWarnBeforeOverwriteCiteKey(
-        boolean shouldWarnBeforeOverwriteCiteKey
-    ) {
-        this.shouldWarnBeforeOverwriteCiteKey.set(
-                shouldWarnBeforeOverwriteCiteKey
-            );
+    public void setWarnBeforeOverwriteCiteKey(boolean shouldWarnBeforeOverwriteCiteKey) {
+        this.shouldWarnBeforeOverwriteCiteKey.set(shouldWarnBeforeOverwriteCiteKey);
     }
 
     public boolean shouldGenerateCiteKeysBeforeSaving() {
@@ -127,12 +113,8 @@ public BooleanProperty shouldGenerateCiteKeysBeforeSavingProperty() {
         return shouldGenerateCiteKeysBeforeSaving;
     }
 
-    public void setGenerateCiteKeysBeforeSaving(
-        boolean shouldGenerateCiteKeysBeforeSaving
-    ) {
-        this.shouldGenerateCiteKeysBeforeSaving.set(
-                shouldGenerateCiteKeysBeforeSaving
-            );
+    public void setGenerateCiteKeysBeforeSaving(boolean shouldGenerateCiteKeysBeforeSaving) {
+        this.shouldGenerateCiteKeysBeforeSaving.set(shouldGenerateCiteKeysBeforeSaving);
     }
 
     public KeySuffix getKeySuffix() {
diff --git a/src/main/java/org/jabref/logic/citationkeypattern/DatabaseCitationKeyPattern.java b/src/main/java/org/jabref/logic/citationkeypattern/DatabaseCitationKeyPattern.java
index 8a2cd852f82..492c68c96e7 100644
--- a/src/main/java/org/jabref/logic/citationkeypattern/DatabaseCitationKeyPattern.java
+++ b/src/main/java/org/jabref/logic/citationkeypattern/DatabaseCitationKeyPattern.java
@@ -7,9 +7,7 @@ public class DatabaseCitationKeyPattern extends AbstractCitationKeyPattern {
 
     private final GlobalCitationKeyPattern globalCitationKeyPattern;
 
-    public DatabaseCitationKeyPattern(
-        GlobalCitationKeyPattern globalCitationKeyPattern
-    ) {
+    public DatabaseCitationKeyPattern(GlobalCitationKeyPattern globalCitationKeyPattern) {
         this.globalCitationKeyPattern = globalCitationKeyPattern;
     }
 
diff --git a/src/main/java/org/jabref/logic/citationstyle/CSLAdapter.java b/src/main/java/org/jabref/logic/citationstyle/CSLAdapter.java
index f1cb4f1648e..e5459f51c1b 100644
--- a/src/main/java/org/jabref/logic/citationstyle/CSLAdapter.java
+++ b/src/main/java/org/jabref/logic/citationstyle/CSLAdapter.java
@@ -29,8 +29,7 @@
  */
 public class CSLAdapter {
 
-    private final JabRefItemDataProvider dataProvider =
-        new JabRefItemDataProvider();
+    private final JabRefItemDataProvider dataProvider = new JabRefItemDataProvider();
     private String style;
     private CitationStyleOutputFormat format;
     private CSL cslInstance;
@@ -62,10 +61,8 @@ public synchronized List<String> makeBibliography(
      * @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 {
+    private void initialize(String newStyle, CitationStyleOutputFormat newFormat)
+        throws IOException {
         final boolean newCslInstanceNeedsToBeCreated =
             (cslInstance == null) || !Objects.equals(newStyle, style);
         if (newCslInstanceNeedsToBeCreated) {
@@ -81,10 +78,7 @@ private void initialize(
             style = newStyle;
         }
 
-        if (
-            newCslInstanceNeedsToBeCreated ||
-            (!Objects.equals(newFormat, format))
-        ) {
+        if (newCslInstanceNeedsToBeCreated || (!Objects.equals(newFormat, format))) {
             cslInstance.setOutputFormat(newFormat.getFormat());
             format = newFormat;
         }
diff --git a/src/main/java/org/jabref/logic/citationstyle/CitationStyle.java b/src/main/java/org/jabref/logic/citationstyle/CitationStyle.java
index f84f62f86ab..aa3dd60c811 100644
--- a/src/main/java/org/jabref/logic/citationstyle/CitationStyle.java
+++ b/src/main/java/org/jabref/logic/citationstyle/CitationStyle.java
@@ -36,23 +36,16 @@ public class CitationStyle {
 
     public static final String DEFAULT = "/ieee.csl";
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(
-        CitationStyle.class
-    );
+    private static final Logger LOGGER = LoggerFactory.getLogger(CitationStyle.class);
     private static final String STYLES_ROOT = "/csl-styles";
     private static final List<CitationStyle> STYLES = new ArrayList<>();
-    private static final DocumentBuilderFactory FACTORY =
-        DocumentBuilderFactory.newInstance();
+    private static final DocumentBuilderFactory FACTORY = DocumentBuilderFactory.newInstance();
 
     private final String filePath;
     private final String title;
     private final String source;
 
-    private CitationStyle(
-        final String filename,
-        final String title,
-        final String source
-    ) {
+    private CitationStyle(final String filename, final String title, final String source) {
         this.filePath = Objects.requireNonNull(filename);
         this.title = Objects.requireNonNull(title);
         this.source = Objects.requireNonNull(source);
@@ -65,42 +58,26 @@ private static Optional<CitationStyle> createCitationStyleFromSource(
         final String source,
         final String filename
     ) {
-        if (
-            (filename != null) &&
-            !filename.isEmpty() &&
-            (source != null) &&
-            !source.isEmpty()
-        ) {
+        if ((filename != null) && !filename.isEmpty() && (source != null) && !source.isEmpty()) {
             try {
                 InputSource inputSource = new InputSource();
-                inputSource.setCharacterStream(
-                    new StringReader(stripInvalidProlog(source))
-                );
+                inputSource.setCharacterStream(new StringReader(stripInvalidProlog(source)));
 
                 Document doc = FACTORY.newDocumentBuilder().parse(inputSource);
 
                 // See CSL#canFormatBibliographies, checks if the tag exists
                 NodeList bibs = doc.getElementsByTagName("bibliography");
                 if (bibs.getLength() <= 0) {
-                    LOGGER.debug(
-                        "no bibliography element for file {} ",
-                        filename
-                    );
+                    LOGGER.debug("no bibliography element for file {} ", filename);
                     return Optional.empty();
                 }
 
                 NodeList nodes = doc.getElementsByTagName("info");
-                NodeList titleNode =
-                    ((Element) nodes.item(0)).getElementsByTagName("title");
-                String title =
-                    ((CharacterData) titleNode
-                            .item(0)
-                            .getFirstChild()).getData();
+                NodeList titleNode = ((Element) nodes.item(0)).getElementsByTagName("title");
+                String title = ((CharacterData) titleNode.item(0).getFirstChild()).getData();
 
                 return Optional.of(new CitationStyle(filename, title, source));
-            } catch (
-                ParserConfigurationException | SAXException | IOException e
-            ) {
+            } catch (ParserConfigurationException | SAXException | IOException e) {
                 LOGGER.error("Error while parsing source", e);
             }
         }
@@ -119,9 +96,7 @@ private static String stripInvalidProlog(String source) {
     /**
      * Loads the CitationStyle from the given file
      */
-    public static Optional<CitationStyle> createCitationStyleFromFile(
-        final String styleFile
-    ) {
+    public static Optional<CitationStyle> createCitationStyleFromFile(final String styleFile) {
         if (!isCitationStyleFile(styleFile)) {
             LOGGER.error("Can only load style files: {}", styleFile);
             return Optional.empty();
@@ -129,18 +104,11 @@ public static Optional<CitationStyle> createCitationStyleFromFile(
 
         try {
             String text;
-            String internalFile =
-                STYLES_ROOT +
-                (styleFile.startsWith("/") ? "" : "/") +
-                styleFile;
+            String internalFile = STYLES_ROOT + (styleFile.startsWith("/") ? "" : "/") + styleFile;
             URL url = CitationStyle.class.getResource(internalFile);
 
             if (url != null) {
-                text =
-                    CSLUtils.readURLToString(
-                        url,
-                        StandardCharsets.UTF_8.toString()
-                    );
+                text = CSLUtils.readURLToString(url, StandardCharsets.UTF_8.toString());
             } else {
                 // if the url is null then the style is located outside the classpath
                 text = Files.readString(Path.of(styleFile));
@@ -160,8 +128,7 @@ public static Optional<CitationStyle> createCitationStyleFromFile(
      * @return default citation style
      */
     public static CitationStyle getDefault() {
-        return createCitationStyleFromFile(DEFAULT)
-            .orElse(new CitationStyle("", "Empty", ""));
+        return createCitationStyleFromFile(DEFAULT).orElse(new CitationStyle("", "Empty", ""));
     }
 
     /**
@@ -174,8 +141,7 @@ public static List<CitationStyle> discoverCitationStyles() {
             return STYLES;
         }
 
-        URL url =
-            CitationStyle.class.getResource(STYLES_ROOT + "/acm-siggraph.csl");
+        URL url = CitationStyle.class.getResource(STYLES_ROOT + "/acm-siggraph.csl");
         Objects.requireNonNull(url);
 
         try {
@@ -185,16 +151,12 @@ public static List<CitationStyle> discoverCitationStyles() {
 
             return STYLES;
         } catch (URISyntaxException | IOException e) {
-            LOGGER.error(
-                "something went wrong while searching available CitationStyles",
-                e
-            );
+            LOGGER.error("something went wrong while searching available CitationStyles", e);
             return Collections.emptyList();
         }
     }
 
-    private static List<CitationStyle> discoverCitationStylesInPath(Path path)
-        throws IOException {
+    private static List<CitationStyle> discoverCitationStylesInPath(Path path) throws IOException {
         try (
             Stream<Path> stream = Files.find(
                 path,
diff --git a/src/main/java/org/jabref/logic/citationstyle/CitationStyleCache.java b/src/main/java/org/jabref/logic/citationstyle/CitationStyleCache.java
index 7a39a1cb59e..922a247a1eb 100644
--- a/src/main/java/org/jabref/logic/citationstyle/CitationStyleCache.java
+++ b/src/main/java/org/jabref/logic/citationstyle/CitationStyleCache.java
@@ -32,19 +32,14 @@ public CitationStyleCache(BibDatabaseContext databaseContext) {
                         @Override
                         public String load(BibEntry entry) {
                             if (citationStyle != null) {
-                                return citationStyle.generatePreview(
-                                    entry,
-                                    databaseContext
-                                );
+                                return citationStyle.generatePreview(entry, databaseContext);
                             } else {
                                 return "";
                             }
                         }
                     }
                 );
-        databaseContext
-            .getDatabase()
-            .registerListener(new BibDatabaseEntryListener());
+        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 74f19066be4..0b29b73838f 100644
--- a/src/main/java/org/jabref/logic/citationstyle/CitationStyleGenerator.java
+++ b/src/main/java/org/jabref/logic/citationstyle/CitationStyleGenerator.java
@@ -17,9 +17,7 @@
  */
 public class CitationStyleGenerator {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(
-        CitationStyleGenerator.class
-    );
+    private static final Logger LOGGER = LoggerFactory.getLogger(CitationStyleGenerator.class);
     private static final CSLAdapter CSL_ADAPTER = new CSLAdapter();
 
     private CitationStyleGenerator() {}
@@ -106,24 +104,18 @@ public static List<String> generateCitations(
                 e
             );
             return Collections.singletonList(
-                Localization.lang(
-                    "Cannot generate preview based on selected citation style."
-                )
+                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."
-                )
+                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."
-                ) +
+                Localization.lang("Cannot generate preview based on selected citation style.") +
                 outputFormat.getLineSeparator() +
                 Localization.lang("Bad character inside entry") +
                 outputFormat.getLineSeparator() +
diff --git a/src/main/java/org/jabref/logic/citationstyle/CitationStylePreviewLayout.java b/src/main/java/org/jabref/logic/citationstyle/CitationStylePreviewLayout.java
index a3da0fc87a7..368b864f710 100644
--- a/src/main/java/org/jabref/logic/citationstyle/CitationStylePreviewLayout.java
+++ b/src/main/java/org/jabref/logic/citationstyle/CitationStylePreviewLayout.java
@@ -19,10 +19,7 @@ public CitationStylePreviewLayout(
     }
 
     @Override
-    public String generatePreview(
-        BibEntry entry,
-        BibDatabaseContext databaseContext
-    ) {
+    public String generatePreview(BibEntry entry, BibDatabaseContext databaseContext) {
         return CitationStyleGenerator.generateCitation(
             entry,
             citationStyle.getSource(),
diff --git a/src/main/java/org/jabref/logic/citationstyle/JabRefItemDataProvider.java b/src/main/java/org/jabref/logic/citationstyle/JabRefItemDataProvider.java
index 45005ab49b9..b50ed749310 100644
--- a/src/main/java/org/jabref/logic/citationstyle/JabRefItemDataProvider.java
+++ b/src/main/java/org/jabref/logic/citationstyle/JabRefItemDataProvider.java
@@ -34,8 +34,7 @@
  */
 public class JabRefItemDataProvider implements ItemDataProvider {
 
-    private static final BibTeXConverter BIBTEX_CONVERTER =
-        new BibTeXConverter();
+    private static final BibTeXConverter BIBTEX_CONVERTER = new BibTeXConverter();
 
     private final StringJsonBuilderFactory stringJsonBuilderFactory;
 
@@ -111,8 +110,7 @@ private CSLItemData bibEntryToCSLItemData(
         );
 
         // Not every field is already generated into latex free fields
-        RemoveNewlinesFormatter removeNewlinesFormatter =
-            new RemoveNewlinesFormatter();
+        RemoveNewlinesFormatter removeNewlinesFormatter = new RemoveNewlinesFormatter();
 
         Optional<BibEntryType> entryType = entryTypesManager.enrich(
             bibEntry.getType(),
@@ -125,9 +123,7 @@ private CSLItemData bibEntryToCSLItemData(
             // See BibTeXConverter
             if (bibDatabaseContext.isBiblatexMode()) {
                 // Map "number" to CSL "issue", unless no number exists
-                Optional<String> numberField = bibEntry.getField(
-                    StandardField.NUMBER
-                );
+                Optional<String> numberField = bibEntry.getField(StandardField.NUMBER);
                 numberField.ifPresent(number -> {
                     bibEntry.setField(StandardField.ISSUE, number);
                     bibEntry.clearField(StandardField.NUMBER);
@@ -152,11 +148,7 @@ private CSLItemData bibEntryToCSLItemData(
                 bibEntry
                     .getField(StandardField.PAGES)
                     .ifPresent(pages -> {
-                        if (
-                            pages
-                                .toLowerCase(Locale.ROOT)
-                                .startsWith("article ")
-                        ) {
+                        if (pages.toLowerCase(Locale.ROOT).startsWith("article ")) {
                             pages = pages.substring("Article ".length());
                             bibEntry.setField(StandardField.NUMBER, pages);
                         }
@@ -173,9 +165,7 @@ private CSLItemData bibEntryToCSLItemData(
         }
 
         Set<Field> fields = new LinkedHashSet<>(
-            entryType
-                .map(BibEntryType::getAllFields)
-                .orElse(bibEntry.getFields())
+            entryType.map(BibEntryType::getAllFields).orElse(bibEntry.getFields())
         );
         fields.addAll(bibEntry.getFields());
         for (Field key : fields) {
@@ -186,16 +176,9 @@ private CSLItemData bibEntryToCSLItemData(
                 .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);
+                        value = bibEntry.getMonth().map(Month::getShortName).orElse(value);
                     }
-                    bibTeXEntry.addField(
-                        new Key(key.getName()),
-                        new DigitStringValue(value)
-                    );
+                    bibTeXEntry.addField(new Key(key.getName()), new DigitStringValue(value));
                 });
         }
         return BIBTEX_CONVERTER.toItemData(bibTeXEntry);
@@ -208,11 +191,7 @@ public void setData(
         BibDatabaseContext bibDatabaseContext,
         BibEntryTypesManager entryTypesManager
     ) {
-        this.setData(
-                bibDatabaseContext.getEntries(),
-                bibDatabaseContext,
-                entryTypesManager
-            );
+        this.setData(bibDatabaseContext.getEntries(), bibDatabaseContext, entryTypesManager);
     }
 
     public void setData(
@@ -237,23 +216,14 @@ public CSLItemData retrieveItem(String id) {
         return data
             .stream()
             .filter(entry -> entry.getCitationKey().orElse("").equals(id))
-            .map(entry ->
-                bibEntryToCSLItemData(
-                    entry,
-                    bibDatabaseContext,
-                    entryTypesManager
-                )
-            )
+            .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() {
@@ -261,16 +231,8 @@ public String toJson() {
         this.setData(entries, bibDatabaseContext, entryTypesManager);
         return entries
             .stream()
-            .map(entry ->
-                bibEntryToCSLItemData(
-                    entry,
-                    bibDatabaseContext,
-                    entryTypesManager
-                )
-            )
-            .map(item ->
-                item.toJson(stringJsonBuilderFactory.createJsonBuilder())
-            )
+            .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 0975fa742c7..6291977a470 100644
--- a/src/main/java/org/jabref/logic/citationstyle/JabRefLocaleProvider.java
+++ b/src/main/java/org/jabref/logic/citationstyle/JabRefLocaleProvider.java
@@ -25,22 +25,14 @@ public String retrieveLocale(String lang) {
             lang,
             locale -> {
                 try {
-                    URL url = getClass()
-                        .getResource(
-                            LOCALES_ROOT + "/locales-" + locale + ".xml"
-                        );
+                    URL url = getClass().getResource(LOCALES_ROOT + "/locales-" + locale + ".xml");
                     if (url == null) {
-                        throw new IllegalArgumentException(
-                            "Unable to load locale " + locale
-                        );
+                        throw new IllegalArgumentException("Unable to load locale " + locale);
                     }
 
                     return CSLUtils.readURLToString(url, "UTF-8");
                 } catch (IOException e) {
-                    throw new UncheckedIOException(
-                        "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/CleanupWorker.java b/src/main/java/org/jabref/logic/cleanup/CleanupWorker.java
index 0a7e8ca31df..d6ef1753b54 100644
--- a/src/main/java/org/jabref/logic/cleanup/CleanupWorker.java
+++ b/src/main/java/org/jabref/logic/cleanup/CleanupWorker.java
@@ -26,10 +26,7 @@ public CleanupWorker(
         this.timestampPreferences = timestampPreferences;
     }
 
-    public List<FieldChange> cleanup(
-        CleanupPreferences preset,
-        BibEntry entry
-    ) {
+    public List<FieldChange> cleanup(CleanupPreferences preset, BibEntry entry) {
         Objects.requireNonNull(preset);
         Objects.requireNonNull(entry);
 
@@ -43,9 +40,7 @@ public List<FieldChange> cleanup(
         return changes;
     }
 
-    private List<CleanupJob> determineCleanupActions(
-        CleanupPreferences preset
-    ) {
+    private List<CleanupJob> determineCleanupActions(CleanupPreferences preset) {
         List<CleanupJob> jobs = new ArrayList<>();
 
         for (CleanupPreferences.CleanupStep action : preset.getActiveJobs()) {
@@ -53,9 +48,7 @@ private List<CleanupJob> determineCleanupActions(
         }
 
         if (preset.getFieldFormatterCleanups().isEnabled()) {
-            jobs.addAll(
-                preset.getFieldFormatterCleanups().getConfiguredActions()
-            );
+            jobs.addAll(preset.getFieldFormatterCleanups().getConfiguredActions());
         }
 
         return jobs;
@@ -66,15 +59,8 @@ private CleanupJob toJob(CleanupPreferences.CleanupStep 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 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,
@@ -89,10 +75,7 @@ private CleanupJob toJob(CleanupPreferences.CleanupStep action) {
             case CONVERT_TIMESTAMP_TO_MODIFICATIONDATE -> new TimeStampToModificationDate(
                 timestampPreferences
             );
-            case MOVE_PDF -> new MoveFilesCleanup(
-                databaseContext,
-                filePreferences
-            );
+            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 db868c6509f..d442416d685 100644
--- a/src/main/java/org/jabref/logic/cleanup/ConvertToBiblatexCleanup.java
+++ b/src/main/java/org/jabref/logic/cleanup/ConvertToBiblatexCleanup.java
@@ -29,14 +29,9 @@ public List<FieldChange> cleanup(BibEntry entry) {
             entry
                 .getField(oldField)
                 .ifPresent(oldValue -> {
-                    if (
-                        !oldValue.isEmpty() &&
-                        (!entry.getField(newField).isPresent())
-                    ) {
+                    if (!oldValue.isEmpty() && (!entry.getField(newField).isPresent())) {
                         // There is content in the old field and no value in the new, so just copy
-                        entry
-                            .setField(newField, oldValue)
-                            .ifPresent(changes::add);
+                        entry.setField(newField, oldValue).ifPresent(changes::add);
                         entry.clearField(oldField).ifPresent(changes::add);
                     }
                 });
@@ -47,15 +42,9 @@ public List<FieldChange> cleanup(BibEntry entry) {
             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.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
@@ -70,12 +59,8 @@ public List<FieldChange> cleanup(BibEntry entry) {
                     );
 
                     if (checkDate.equals(newDate)) {
-                        entry
-                            .clearField(StandardField.YEAR)
-                            .ifPresent(changes::add);
-                        entry
-                            .clearField(StandardField.MONTH)
-                            .ifPresent(changes::add);
+                        entry.clearField(StandardField.YEAR).ifPresent(changes::add);
+                        entry.clearField(StandardField.MONTH).ifPresent(changes::add);
                     }
                 });
         }
diff --git a/src/main/java/org/jabref/logic/cleanup/ConvertToBibtexCleanup.java b/src/main/java/org/jabref/logic/cleanup/ConvertToBibtexCleanup.java
index d3f6d593077..03a3eafe7fd 100644
--- a/src/main/java/org/jabref/logic/cleanup/ConvertToBibtexCleanup.java
+++ b/src/main/java/org/jabref/logic/cleanup/ConvertToBibtexCleanup.java
@@ -27,9 +27,7 @@ public List<FieldChange> cleanup(BibEntry entry) {
                 if (StringUtil.isBlank(entry.getField(StandardField.YEAR))) {
                     date
                         .getYear()
-                        .flatMap(year ->
-                            entry.setField(StandardField.YEAR, year.toString())
-                        )
+                        .flatMap(year -> entry.setField(StandardField.YEAR, year.toString()))
                         .ifPresent(changes::add);
                 }
 
@@ -37,18 +35,13 @@ public List<FieldChange> cleanup(BibEntry entry) {
                     date
                         .getMonth()
                         .flatMap(month ->
-                            entry.setField(
-                                StandardField.MONTH,
-                                month.getJabRefFormat()
-                            )
+                            entry.setField(StandardField.MONTH, month.getJabRefFormat())
                         )
                         .ifPresent(changes::add);
                 }
 
                 if (!changes.isEmpty()) {
-                    entry
-                        .clearField(StandardField.DATE)
-                        .ifPresent(changes::add);
+                    entry.clearField(StandardField.DATE).ifPresent(changes::add);
                 }
             });
 
@@ -61,14 +54,9 @@ public List<FieldChange> cleanup(BibEntry entry) {
             entry
                 .getField(oldField)
                 .ifPresent(oldValue -> {
-                    if (
-                        !oldValue.isEmpty() &&
-                        (!entry.getField(newField).isPresent())
-                    ) {
+                    if (!oldValue.isEmpty() && (!entry.getField(newField).isPresent())) {
                         // There is content in the old field and no value in the new, so just copy
-                        entry
-                            .setField(newField, oldValue)
-                            .ifPresent(changes::add);
+                        entry.setField(newField, oldValue).ifPresent(changes::add);
                         entry.clearField(oldField).ifPresent(changes::add);
                     }
                 });
diff --git a/src/main/java/org/jabref/logic/cleanup/DoiCleanup.java b/src/main/java/org/jabref/logic/cleanup/DoiCleanup.java
index 5c5ee704615..a19d8de3caa 100644
--- a/src/main/java/org/jabref/logic/cleanup/DoiCleanup.java
+++ b/src/main/java/org/jabref/logic/cleanup/DoiCleanup.java
@@ -36,13 +36,10 @@ public List<FieldChange> cleanup(BibEntry entry) {
 
         // First check if the Doi Field is empty
         if (entry.hasField(StandardField.DOI)) {
-            String doiFieldValue = entry
-                .getField(StandardField.DOI)
-                .orElse(null);
+            String doiFieldValue = entry.getField(StandardField.DOI).orElse(null);
 
             String decodeDoiFieldValue = "";
-            decodeDoiFieldValue =
-                URLDecoder.decode(doiFieldValue, StandardCharsets.UTF_8);
+            decodeDoiFieldValue = URLDecoder.decode(doiFieldValue, StandardCharsets.UTF_8);
             doiFieldValue = decodeDoiFieldValue;
 
             Optional<DOI> doi = DOI.parse(doiFieldValue);
@@ -66,9 +63,7 @@ public List<FieldChange> cleanup(BibEntry entry) {
                     entry
                         .getField(field)
                         .flatMap(DOI::parse)
-                        .ifPresent(unused ->
-                            removeFieldValue(entry, field, changes)
-                        );
+                        .ifPresent(unused -> removeFieldValue(entry, field, changes));
                 }
             }
         } else {
@@ -105,15 +100,8 @@ public List<FieldChange> cleanup(BibEntry entry) {
         return changes;
     }
 
-    private void removeFieldValue(
-        BibEntry entry,
-        Field field,
-        List<FieldChange> changes
-    ) {
-        CleanupJob eraser = new FieldFormatterCleanup(
-            field,
-            new ClearFormatter()
-        );
+    private void removeFieldValue(BibEntry entry, Field field, List<FieldChange> changes) {
+        CleanupJob eraser = new FieldFormatterCleanup(field, new ClearFormatter());
         changes.addAll(eraser.cleanup(entry));
     }
 }
diff --git a/src/main/java/org/jabref/logic/cleanup/EprintCleanup.java b/src/main/java/org/jabref/logic/cleanup/EprintCleanup.java
index 5202fa29c8e..276fa436e66 100644
--- a/src/main/java/org/jabref/logic/cleanup/EprintCleanup.java
+++ b/src/main/java/org/jabref/logic/cleanup/EprintCleanup.java
@@ -31,15 +31,10 @@ public List<FieldChange> cleanup(BibEntry entry) {
 
             if (arXivIdentifier.isPresent()) {
                 entry
-                    .setField(
-                        StandardField.EPRINT,
-                        arXivIdentifier.get().getNormalized()
-                    )
+                    .setField(StandardField.EPRINT, arXivIdentifier.get().getNormalized())
                     .ifPresent(changes::add);
 
-                entry
-                    .setField(StandardField.EPRINTTYPE, "arxiv")
-                    .ifPresent(changes::add);
+                entry.setField(StandardField.EPRINTTYPE, "arxiv").ifPresent(changes::add);
 
                 arXivIdentifier
                     .get()
@@ -54,9 +49,7 @@ public List<FieldChange> cleanup(BibEntry entry) {
 
                 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 4e3eb32ce82..37db224aaf8 100644
--- a/src/main/java/org/jabref/logic/cleanup/FieldFormatterCleanup.java
+++ b/src/main/java/org/jabref/logic/cleanup/FieldFormatterCleanup.java
@@ -46,10 +46,7 @@ public List<FieldChange> cleanup(BibEntry entry) {
      * @param entry    the entry to be cleaned up
      * @return a list of changes of the entry
      */
-    private List<FieldChange> cleanupSingleField(
-        Field fieldKey,
-        BibEntry entry
-    ) {
+    private List<FieldChange> cleanupSingleField(Field fieldKey, BibEntry entry) {
         if (!entry.hasField(fieldKey)) {
             // Not set -> nothing to do
             return Collections.emptyList();
@@ -66,18 +63,9 @@ private List<FieldChange> cleanupSingleField(
                 entry.clearField(fieldKey);
                 newValue = null;
             } else {
-                entry.setField(
-                    fieldKey,
-                    newValue,
-                    EntriesEventSource.SAVE_ACTION
-                );
+                entry.setField(fieldKey, newValue, EntriesEventSource.SAVE_ACTION);
             }
-            FieldChange change = new FieldChange(
-                entry,
-                fieldKey,
-                oldValue,
-                newValue
-            );
+            FieldChange change = new FieldChange(entry, fieldKey, oldValue, newValue);
             return Collections.singletonList(change);
         }
     }
@@ -121,10 +109,7 @@ public boolean equals(Object obj) {
             return true;
         }
         if (obj instanceof FieldFormatterCleanup that) {
-            return (
-                Objects.equals(field, that.field) &&
-                Objects.equals(formatter, that.formatter)
-            );
+            return (Objects.equals(field, that.field) && Objects.equals(formatter, that.formatter));
         }
         return false;
     }
diff --git a/src/main/java/org/jabref/logic/cleanup/FieldFormatterCleanups.java b/src/main/java/org/jabref/logic/cleanup/FieldFormatterCleanups.java
index 12f238a761e..7d6f0a59e59 100644
--- a/src/main/java/org/jabref/logic/cleanup/FieldFormatterCleanups.java
+++ b/src/main/java/org/jabref/logic/cleanup/FieldFormatterCleanups.java
@@ -40,9 +40,7 @@ public class FieldFormatterCleanups {
     public static final String ENABLED = "enabled";
     public static final String DISABLED = "disabled";
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(
-        FieldFormatterCleanups.class
-    );
+    private static final Logger LOGGER = LoggerFactory.getLogger(FieldFormatterCleanups.class);
 
     /**
      * This parses the key/list map of fields and clean up actions for the field.
@@ -55,32 +53,25 @@ 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(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);
+        List<FieldFormatterCleanup> recommendedBibtexFormatters = new ArrayList<>(
+            DEFAULT_SAVE_ACTIONS
+        );
         recommendedBibtexFormatters.addAll(
             List.of(
                 new FieldFormatterCleanup(
@@ -97,17 +88,14 @@ public class FieldFormatterCleanups {
                 )
             )
         );
-        RECOMMEND_BIBTEX_ACTIONS =
-            Collections.unmodifiableList(recommendedBibtexFormatters);
+        RECOMMEND_BIBTEX_ACTIONS = Collections.unmodifiableList(recommendedBibtexFormatters);
 
-        List<FieldFormatterCleanup> recommendedBiblatexFormatters =
-            new ArrayList<>(DEFAULT_SAVE_ACTIONS);
+        List<FieldFormatterCleanup> recommendedBiblatexFormatters = new ArrayList<>(
+            DEFAULT_SAVE_ACTIONS
+        );
         recommendedBiblatexFormatters.addAll(
             List.of(
-                new FieldFormatterCleanup(
-                    StandardField.TITLE,
-                    new HtmlToUnicodeFormatter()
-                ),
+                new FieldFormatterCleanup(StandardField.TITLE, new HtmlToUnicodeFormatter()),
                 new FieldFormatterCleanup(
                     InternalField.INTERNAL_ALL_TEXT_FIELDS_FIELD,
                     new LatexToUnicodeFormatter()
@@ -115,17 +103,13 @@ public class FieldFormatterCleanups {
             )
         );
         // DO NOT ADD OrdinalsToSuperscriptFormatter here, because this causes issues. See https://github.com/JabRef/jabref/issues/2596.
-        RECOMMEND_BIBLATEX_ACTIONS =
-            Collections.unmodifiableList(recommendedBiblatexFormatters);
+        RECOMMEND_BIBLATEX_ACTIONS = Collections.unmodifiableList(recommendedBiblatexFormatters);
     }
 
     private final boolean enabled;
     private final List<FieldFormatterCleanup> actions;
 
-    public FieldFormatterCleanups(
-        boolean enabled,
-        List<FieldFormatterCleanup> actions
-    ) {
+    public FieldFormatterCleanups(boolean enabled, List<FieldFormatterCleanup> actions) {
         this.enabled = enabled;
         this.actions = Objects.requireNonNull(actions);
     }
@@ -160,11 +144,7 @@ public static String getMetaDataString(
         for (Map.Entry<Field, List<String>> entry : groupedByField.entrySet()) {
             result.append(entry.getKey().getName());
 
-            StringJoiner joiner = new StringJoiner(
-                ",",
-                "[",
-                "]" + newLineSeparator
-            );
+            StringJoiner joiner = new StringJoiner(",", "[", "]" + newLineSeparator);
             entry.getValue().forEach(joiner::add);
             result.append(joiner);
         }
@@ -222,14 +202,9 @@ public static List<FieldFormatterCleanup> parse(String formatterString) {
         List<FieldFormatterCleanup> result = new ArrayList<>();
 
         // first remove all newlines for easier parsing
-        String formatterStringWithoutLineBreaks = StringUtil.unifyLineBreaks(
-            formatterString,
-            ""
-        );
+        String formatterStringWithoutLineBreaks = StringUtil.unifyLineBreaks(formatterString, "");
 
-        Matcher matcher = FIELD_FORMATTER_CLEANUP_PATTERN.matcher(
-            formatterStringWithoutLineBreaks
-        );
+        Matcher matcher = FIELD_FORMATTER_CLEANUP_PATTERN.matcher(formatterStringWithoutLineBreaks);
         while (matcher.find()) {
             String fieldKey = matcher.group(1);
             Field field = FieldFactory.parseField(fieldKey);
@@ -254,10 +229,7 @@ public static FieldFormatterCleanups parse(List<String> formatterMetaList) {
             );
             String formatterString = formatterMetaList.get(1);
 
-            return new FieldFormatterCleanups(
-                enablementStatus,
-                parse(formatterString)
-            );
+            return new FieldFormatterCleanups(enablementStatus, parse(formatterString));
         } else {
             // return default actions
             return new FieldFormatterCleanups(false, DEFAULT_SAVE_ACTIONS);
@@ -285,10 +257,7 @@ public boolean equals(Object obj) {
             return true;
         }
         if (obj instanceof FieldFormatterCleanups other) {
-            return (
-                Objects.equals(actions, other.actions) &&
-                (enabled == other.enabled)
-            );
+            return (Objects.equals(actions, other.actions) && (enabled == other.enabled));
         }
         return false;
     }
@@ -296,13 +265,7 @@ public boolean equals(Object obj) {
     @Override
     public String toString() {
         return (
-            "FieldFormatterCleanups{" +
-            "enabled=" +
-            enabled +
-            "," +
-            "actions=" +
-            actions +
-            "}"
+            "FieldFormatterCleanups{" + "enabled=" + enabled + "," + "actions=" + actions + "}"
         );
     }
 }
diff --git a/src/main/java/org/jabref/logic/cleanup/MoveFilesCleanup.java b/src/main/java/org/jabref/logic/cleanup/MoveFilesCleanup.java
index 1cdd299eaed..4a2a189429c 100644
--- a/src/main/java/org/jabref/logic/cleanup/MoveFilesCleanup.java
+++ b/src/main/java/org/jabref/logic/cleanup/MoveFilesCleanup.java
@@ -17,17 +17,12 @@
 
 public class MoveFilesCleanup implements CleanupJob {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(
-        MoveFilesCleanup.class
-    );
+    private static final Logger LOGGER = LoggerFactory.getLogger(MoveFilesCleanup.class);
 
     private final BibDatabaseContext databaseContext;
     private final FilePreferences filePreferences;
 
-    public MoveFilesCleanup(
-        BibDatabaseContext databaseContext,
-        FilePreferences filePreferences
-    ) {
+    public MoveFilesCleanup(BibDatabaseContext databaseContext, FilePreferences filePreferences) {
         this.databaseContext = Objects.requireNonNull(databaseContext);
         this.filePreferences = Objects.requireNonNull(filePreferences);
     }
@@ -50,11 +45,7 @@ public List<FieldChange> cleanup(BibEntry entry) {
                     changed = true;
                 }
             } catch (IOException exception) {
-                LOGGER.error(
-                    "Error while moving file {}",
-                    file.getLink(),
-                    exception
-                );
+                LOGGER.error("Error while moving file {}", file.getLink(), exception);
             }
         }
 
diff --git a/src/main/java/org/jabref/logic/cleanup/RenamePdfCleanup.java b/src/main/java/org/jabref/logic/cleanup/RenamePdfCleanup.java
index 150888b2314..5c884fda1be 100644
--- a/src/main/java/org/jabref/logic/cleanup/RenamePdfCleanup.java
+++ b/src/main/java/org/jabref/logic/cleanup/RenamePdfCleanup.java
@@ -18,9 +18,7 @@
 
 public class RenamePdfCleanup implements CleanupJob {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(
-        RenamePdfCleanup.class
-    );
+    private static final Logger LOGGER = LoggerFactory.getLogger(RenamePdfCleanup.class);
 
     private final BibDatabaseContext databaseContext;
     private final boolean onlyRelativePaths;
@@ -58,11 +56,7 @@ public List<FieldChange> cleanup(BibEntry entry) {
                     changed = true;
                 }
             } catch (IOException exception) {
-                LOGGER.error(
-                    "Error while renaming file {}",
-                    file.getLink(),
-                    exception
-                );
+                LOGGER.error("Error while renaming file {}", file.getLink(), exception);
             }
         }
 
diff --git a/src/main/java/org/jabref/logic/cleanup/TimeStampToCreationDate.java b/src/main/java/org/jabref/logic/cleanup/TimeStampToCreationDate.java
index 37efe9c5c2a..defbc9e229f 100644
--- a/src/main/java/org/jabref/logic/cleanup/TimeStampToCreationDate.java
+++ b/src/main/java/org/jabref/logic/cleanup/TimeStampToCreationDate.java
@@ -44,18 +44,10 @@ private Optional<String> formatTimeStamp(String timeStamp) {
             int year = date.getYear().orElse(1);
             int month = getMonth(date);
             int day = date.getDay().orElse(1);
-            LocalDateTime localDateTime = LocalDateTime.of(
-                year,
-                month,
-                day,
-                0,
-                0
-            );
+            LocalDateTime localDateTime = LocalDateTime.of(year, month, day, 0, 0);
             // Remove any time unites smaller than seconds
             localDateTime.truncatedTo(ChronoUnit.SECONDS);
-            return Optional.of(
-                localDateTime.format(DateTimeFormatter.ISO_LOCAL_DATE_TIME)
-            );
+            return Optional.of(localDateTime.format(DateTimeFormatter.ISO_LOCAL_DATE_TIME));
         }
     }
 
@@ -82,20 +74,12 @@ public List<FieldChange> cleanup(BibEntry entry) {
                 return Collections.emptyList();
             }
             // Setting the EventSource is necessary to circumvent the update of the modification date during timestamp migration
-            entry.clearField(
-                timeStampField,
-                EntriesEventSource.CLEANUP_TIMESTAMP
-            );
+            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(),
-                    ""
-                )
+                new FieldChange(entry, StandardField.TIMESTAMP, formattedTimeStamp.get(), "")
             );
             entry.setField(
                 StandardField.CREATIONDATE,
diff --git a/src/main/java/org/jabref/logic/cleanup/TimeStampToModificationDate.java b/src/main/java/org/jabref/logic/cleanup/TimeStampToModificationDate.java
index 456009b9935..a5f371e05b8 100644
--- a/src/main/java/org/jabref/logic/cleanup/TimeStampToModificationDate.java
+++ b/src/main/java/org/jabref/logic/cleanup/TimeStampToModificationDate.java
@@ -25,9 +25,7 @@ public class TimeStampToModificationDate implements CleanupJob {
 
     private final Field timeStampField;
 
-    public TimeStampToModificationDate(
-        TimestampPreferences timestampPreferences
-    ) {
+    public TimeStampToModificationDate(TimestampPreferences timestampPreferences) {
         timeStampField = timestampPreferences.getTimestampField();
     }
 
@@ -46,18 +44,10 @@ private Optional<String> formatTimeStamp(String timeStamp) {
             int year = date.getYear().orElse(1);
             int month = getMonth(date);
             int day = date.getDay().orElse(1);
-            LocalDateTime localDateTime = LocalDateTime.of(
-                year,
-                month,
-                day,
-                0,
-                0
-            );
+            LocalDateTime localDateTime = LocalDateTime.of(year, month, day, 0, 0);
             // Remove any time unites smaller than seconds
             localDateTime.truncatedTo(ChronoUnit.SECONDS);
-            return Optional.of(
-                localDateTime.format(DateTimeFormatter.ISO_LOCAL_DATE_TIME)
-            );
+            return Optional.of(localDateTime.format(DateTimeFormatter.ISO_LOCAL_DATE_TIME));
         }
     }
 
@@ -84,20 +74,12 @@ public List<FieldChange> cleanup(BibEntry entry) {
                 return Collections.emptyList();
             }
             // Setting the EventSource is necessary to circumvent the update of the modification date during timestamp migration
-            entry.clearField(
-                timeStampField,
-                EntriesEventSource.CLEANUP_TIMESTAMP
-            );
+            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(),
-                    ""
-                )
+                new FieldChange(entry, StandardField.TIMESTAMP, formattedTimeStamp.get(), "")
             );
             entry.setField(
                 StandardField.MODIFICATIONDATE,
diff --git a/src/main/java/org/jabref/logic/cleanup/URLCleanup.java b/src/main/java/org/jabref/logic/cleanup/URLCleanup.java
index 7f1aaeb8a1e..28b2799101a 100644
--- a/src/main/java/org/jabref/logic/cleanup/URLCleanup.java
+++ b/src/main/java/org/jabref/logic/cleanup/URLCleanup.java
@@ -28,27 +28,16 @@ public class URLCleanup implements CleanupJob {
         "<>\\\\]+\\)))*\\))+(?:\\(([^\\s()<>\\\\]+|(\\([^\\s()<>\\\\]+\\" +
         ")))*\\)|[^\\s`!()\\[\\]{};:'\".,<>?«»“”‘’]))";
 
-    public static final String DATE_TERMS_REGEX =
-        "accessed on|visited on|retrieved on|viewed on";
+    public static final String DATE_TERMS_REGEX = "accessed on|visited on|retrieved on|viewed on";
 
     private static final Field NOTE_FIELD = StandardField.NOTE;
     private static final Field URL_FIELD = StandardField.URL;
     private static final Field URLDATE_FIELD = StandardField.URLDATE;
 
-    final Pattern urlPattern = Pattern.compile(
-        URL_REGEX,
-        Pattern.CASE_INSENSITIVE
-    );
-    final Pattern dateTermsPattern = Pattern.compile(
-        DATE_TERMS_REGEX,
-        Pattern.CASE_INSENSITIVE
-    );
-    final Pattern datePattern = Pattern.compile(
-        Date.DATE_REGEX,
-        Pattern.CASE_INSENSITIVE
-    );
-    private final NormalizeDateFormatter formatter =
-        new NormalizeDateFormatter();
+    final Pattern urlPattern = Pattern.compile(URL_REGEX, Pattern.CASE_INSENSITIVE);
+    final Pattern dateTermsPattern = Pattern.compile(DATE_TERMS_REGEX, Pattern.CASE_INSENSITIVE);
+    final Pattern datePattern = Pattern.compile(Date.DATE_REGEX, Pattern.CASE_INSENSITIVE);
+    private final NormalizeDateFormatter formatter = new NormalizeDateFormatter();
 
     @Override
     public List<FieldChange> cleanup(BibEntry entry) {
@@ -57,9 +46,7 @@ public List<FieldChange> cleanup(BibEntry entry) {
         String noteFieldValue = entry.getField(NOTE_FIELD).orElse("");
 
         final Matcher urlMatcher = urlPattern.matcher(noteFieldValue);
-        final Matcher dateTermsMatcher = dateTermsPattern.matcher(
-            noteFieldValue
-        );
+        final Matcher dateTermsMatcher = dateTermsPattern.matcher(noteFieldValue);
         final Matcher dateMatcher = datePattern.matcher(noteFieldValue);
 
         if (urlMatcher.find()) {
@@ -87,14 +74,10 @@ public List<FieldChange> cleanup(BibEntry entry) {
             if (entry.hasField(URL_FIELD)) {
                 String urlFieldValue = entry.getField(URL_FIELD).orElse("");
                 if (urlFieldValue.equals(url)) {
-                    entry
-                        .setField(NOTE_FIELD, newNoteFieldValue)
-                        .ifPresent(changes::add);
+                    entry.setField(NOTE_FIELD, newNoteFieldValue).ifPresent(changes::add);
                 }
             } else {
-                entry
-                    .setField(NOTE_FIELD, newNoteFieldValue)
-                    .ifPresent(changes::add);
+                entry.setField(NOTE_FIELD, newNoteFieldValue).ifPresent(changes::add);
                 entry.setField(URL_FIELD, url).ifPresent(changes::add);
             }
 
@@ -105,29 +88,17 @@ public List<FieldChange> cleanup(BibEntry entry) {
                     String date = dateMatcher.group();
                     String formattedDate = formatter.format(date);
                     newNoteFieldValue =
-                        newNoteFieldValue
-                            .replace(date, "")
-                            .trim()
-                            .replaceAll("^,|,$", "")
-                            .trim(); // either starts or ends with a comma
+                        newNoteFieldValue.replace(date, "").trim().replaceAll("^,|,$", "").trim(); // either starts or ends with a comma
 
                     // Same approach with the URL cleanup.
                     if (entry.hasField(URLDATE_FIELD)) {
-                        String urlDateFieldValue = entry
-                            .getField(URLDATE_FIELD)
-                            .orElse("");
+                        String urlDateFieldValue = entry.getField(URLDATE_FIELD).orElse("");
                         if (urlDateFieldValue.equals(formattedDate)) {
-                            entry
-                                .setField(NOTE_FIELD, newNoteFieldValue)
-                                .ifPresent(changes::add);
+                            entry.setField(NOTE_FIELD, newNoteFieldValue).ifPresent(changes::add);
                         }
                     } else {
-                        entry
-                            .setField(NOTE_FIELD, newNoteFieldValue)
-                            .ifPresent(changes::add);
-                        entry
-                            .setField(URLDATE_FIELD, formattedDate)
-                            .ifPresent(changes::add);
+                        entry.setField(NOTE_FIELD, newNoteFieldValue).ifPresent(changes::add);
+                        entry.setField(URLDATE_FIELD, formattedDate).ifPresent(changes::add);
                     }
                 }
             }
diff --git a/src/main/java/org/jabref/logic/cleanup/UpgradePdfPsToFileCleanup.java b/src/main/java/org/jabref/logic/cleanup/UpgradePdfPsToFileCleanup.java
index 4d6116a0237..a0cef7d4b51 100644
--- a/src/main/java/org/jabref/logic/cleanup/UpgradePdfPsToFileCleanup.java
+++ b/src/main/java/org/jabref/logic/cleanup/UpgradePdfPsToFileCleanup.java
@@ -50,28 +50,14 @@ public List<FieldChange> cleanup(BibEntry entry) {
                     fileList.add(flEntry);
 
                     entry.clearField(field.getKey());
-                    changes.add(
-                        new FieldChange(
-                            entry,
-                            field.getKey(),
-                            fieldContent,
-                            null
-                        )
-                    );
+                    changes.add(new FieldChange(entry, field.getKey(), fieldContent, null));
                 });
         }
 
         if (fileList.size() != oldItemCount) {
             String newValue = FileFieldWriter.getStringRepresentation(fileList);
             entry.setField(StandardField.FILE, newValue);
-            changes.add(
-                new FieldChange(
-                    entry,
-                    StandardField.FILE,
-                    oldFileContent,
-                    newValue
-                )
-            );
+            changes.add(new FieldChange(entry, StandardField.FILE, oldFileContent, newValue));
         }
 
         return changes;
diff --git a/src/main/java/org/jabref/logic/crawler/Crawler.java b/src/main/java/org/jabref/logic/crawler/Crawler.java
index e3831a5549e..68dd1a24535 100644
--- a/src/main/java/org/jabref/logic/crawler/Crawler.java
+++ b/src/main/java/org/jabref/logic/crawler/Crawler.java
@@ -73,8 +73,7 @@ public Crawler(
      *
      * @throws IOException Thrown if a problem occurred during the persistence of the result.
      */
-    public void performCrawl()
-        throws IOException, GitAPIException, SaveException {
+    public void performCrawl() throws IOException, GitAPIException, SaveException {
         List<QueryResult> results = studyFetcher.crawl();
         studyRepository.persist(results);
     }
diff --git a/src/main/java/org/jabref/logic/crawler/StudyCatalogToFetcherConverter.java b/src/main/java/org/jabref/logic/crawler/StudyCatalogToFetcherConverter.java
index f6fe3b81d55..622baf92be9 100644
--- a/src/main/java/org/jabref/logic/crawler/StudyCatalogToFetcherConverter.java
+++ b/src/main/java/org/jabref/logic/crawler/StudyCatalogToFetcherConverter.java
@@ -62,21 +62,16 @@ private List<SearchBasedFetcher> getFetchersFromLibraryEntries(
      * @param studyDatabase the entry that will be converted
      * @return An instance of the fetcher defined by the library entry.
      */
-    private SearchBasedFetcher createFetcherFromLibraryEntry(
-        StudyDatabase studyDatabase
-    ) {
-        Set<SearchBasedFetcher> searchBasedFetchers =
-            WebFetchers.getSearchBasedFetchers(
-                importFormatPreferences,
-                importerPreferences
-            );
+    private SearchBasedFetcher createFetcherFromLibraryEntry(StudyDatabase studyDatabase) {
+        Set<SearchBasedFetcher> searchBasedFetchers = WebFetchers.getSearchBasedFetchers(
+            importFormatPreferences,
+            importerPreferences
+        );
         String libraryNameFromFetcher = studyDatabase.getName();
         return searchBasedFetchers
             .stream()
             .filter(searchBasedFetcher ->
-                searchBasedFetcher
-                    .getName()
-                    .equalsIgnoreCase(libraryNameFromFetcher)
+                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 56458538b69..c92bb400798 100644
--- a/src/main/java/org/jabref/logic/crawler/StudyFetcher.java
+++ b/src/main/java/org/jabref/logic/crawler/StudyFetcher.java
@@ -20,18 +20,14 @@
  */
 class StudyFetcher {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(
-        StudyFetcher.class
-    );
+    private static final Logger LOGGER = LoggerFactory.getLogger(StudyFetcher.class);
     private static final int MAX_AMOUNT_OF_RESULTS_PER_FETCHER = 100;
 
     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;
     }
@@ -61,8 +57,7 @@ private QueryResult getQueryResult(String searchQuery) {
     private List<FetchResult> performSearchOnQuery(String searchQuery) {
         return activeFetchers
             .parallelStream()
-            .map(fetcher -> performSearchOnQueryForFetcher(searchQuery, fetcher)
-            )
+            .map(fetcher -> performSearchOnQueryForFetcher(searchQuery, fetcher))
             .filter(Objects::nonNull)
             .collect(Collectors.toList());
     }
@@ -75,28 +70,19 @@ private FetchResult performSearchOnQueryForFetcher(
             List<BibEntry> fetchResult = new ArrayList<>();
             if (fetcher instanceof PagedSearchBasedFetcher basedFetcher) {
                 int pages = (int) Math.ceil(
-                    ((double) MAX_AMOUNT_OF_RESULTS_PER_FETCHER) /
-                    basedFetcher.getPageSize()
+                    ((double) MAX_AMOUNT_OF_RESULTS_PER_FETCHER) / basedFetcher.getPageSize()
                 );
                 for (int page = 0; page < pages; page++) {
                     fetchResult.addAll(
-                        basedFetcher
-                            .performSearchPaged(searchQuery, page)
-                            .getContent()
+                        basedFetcher.performSearchPaged(searchQuery, page).getContent()
                     );
                 }
             } else {
                 fetchResult = fetcher.performSearch(searchQuery);
             }
-            return new FetchResult(
-                fetcher.getName(),
-                new BibDatabase(fetchResult)
-            );
+            return new FetchResult(fetcher.getName(), new BibDatabase(fetchResult));
         } catch (FetcherException e) {
-            LOGGER.warn(
-                String.format("%s API request failed", fetcher.getName()),
-                e
-            );
+            LOGGER.warn(String.format("%s API request failed", fetcher.getName()), e);
             return null;
         }
     }
diff --git a/src/main/java/org/jabref/logic/crawler/StudyRepository.java b/src/main/java/org/jabref/logic/crawler/StudyRepository.java
index 816e832cb23..406f2ec1fb1 100644
--- a/src/main/java/org/jabref/logic/crawler/StudyRepository.java
+++ b/src/main/java/org/jabref/logic/crawler/StudyRepository.java
@@ -51,14 +51,10 @@ public class StudyRepository {
     // Tests work with study.yml
     public static final String STUDY_DEFINITION_FILE_NAME = "study.yml";
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(
-        StudyRepository.class
-    );
+    private static final Logger LOGGER = LoggerFactory.getLogger(StudyRepository.class);
 
     private static final Pattern MATCH_COLON = Pattern.compile(":");
-    private static final Pattern MATCH_ILLEGAL_CHARACTERS = Pattern.compile(
-        "[^A-Za-z0-9_.\\s=-]"
-    );
+    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
     private static final String REMOTE = "origin";
@@ -94,18 +90,14 @@ public StudyRepository(
         this.gitHandler = gitHandler;
         this.preferencesService = preferencesService;
         this.fileUpdateMonitor = fileUpdateMonitor;
-        this.studyDefinitionFile =
-            Path.of(repositoryPath.toString(), STUDY_DEFINITION_FILE_NAME);
+        this.studyDefinitionFile = Path.of(repositoryPath.toString(), STUDY_DEFINITION_FILE_NAME);
         this.bibEntryTypesManager = bibEntryTypesManager;
 
         if (Files.notExists(repositoryPath)) {
             throw new IOException("The given repository does not exists.");
         }
         try {
-            gitHandler.createCommitOnCurrentBranch(
-                "Save changes before searching.",
-                false
-            );
+            gitHandler.createCommitOnCurrentBranch("Save changes before searching.", false);
             gitHandler.checkoutBranch(WORK_BRANCH);
             updateWorkAndSearchBranch();
         } catch (GitAPIException e) {
@@ -118,32 +110,22 @@ public StudyRepository(
         }
         study = parseStudyFile();
         try {
-            final String updateRepositoryStructureMessage =
-                "Update repository structure";
+            final String updateRepositoryStructureMessage = "Update repository structure";
 
             // Update repository structure on work branch in case of changes
             setUpRepositoryStructureForQueriesAndFetchers();
-            gitHandler.createCommitOnCurrentBranch(
-                updateRepositoryStructureMessage,
-                false
-            );
+            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));
+                    new StudyYamlParser().parseStudyYamlFile(studyDefinitionFile).equals(study));
             if (studyDefinitionDoesNotExistOrChanged) {
-                new StudyYamlParser()
-                    .writeStudyYamlFile(study, studyDefinitionFile);
+                new StudyYamlParser().writeStudyYamlFile(study, studyDefinitionFile);
             }
             setUpRepositoryStructureForQueriesAndFetchers();
-            gitHandler.createCommitOnCurrentBranch(
-                updateRepositoryStructureMessage,
-                false
-            );
+            gitHandler.createCommitOnCurrentBranch(updateRepositoryStructureMessage, false);
         } catch (GitAPIException e) {
             LOGGER.error("Could not checkout search branch.");
         }
@@ -157,10 +139,8 @@ public StudyRepository(
     /**
      * 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(
@@ -176,8 +156,7 @@ public BibDatabaseContext getFetcherResultEntries(
     /**
      * Returns the merged entries stored in the repository for a certain query
      */
-    public BibDatabaseContext getQueryResultEntries(String query)
-        throws IOException {
+    public BibDatabaseContext getQueryResultEntries(String query) throws IOException {
         if (Files.exists(getPathToQueryResultFile(query))) {
             return OpenDatabase
                 .loadDatabase(
@@ -235,8 +214,7 @@ public List<String> getSearchQueryStrings() {
      * @return List of BibEntries of type Library
      * @throws IllegalArgumentException If a transformation from Library entry to LibraryDefinition fails
      */
-    public List<StudyDatabase> getActiveLibraryEntries()
-        throws IllegalArgumentException {
+    public List<StudyDatabase> getActiveLibraryEntries() throws IllegalArgumentException {
         return study
             .getDatabases()
             .parallelStream()
@@ -269,12 +247,8 @@ public void persist(List<QueryResult> crawlResults)
         try {
             // First commit changes to search branch and update remote
             String commitMessage =
-                "Conducted search: " +
-                LocalDateTime.now().truncatedTo(ChronoUnit.SECONDS);
-            boolean newSearchResults = gitHandler.createCommitOnCurrentBranch(
-                commitMessage,
-                false
-            );
+                "Conducted search: " + LocalDateTime.now().truncatedTo(ChronoUnit.SECONDS);
+            boolean newSearchResults = gitHandler.createCommitOnCurrentBranch(commitMessage, false);
             gitHandler.checkoutBranch(WORK_BRANCH);
             if (!newSearchResults) {
                 return;
@@ -295,8 +269,7 @@ public void persist(List<QueryResult> crawlResults)
      * Update the remote tracking branches of the work and search branches
      * The currently checked out branch is not changed if the method is executed successfully
      */
-    private void updateRemoteSearchAndWorkBranch()
-        throws IOException, GitAPIException {
+    private void updateRemoteSearchAndWorkBranch() throws IOException, GitAPIException {
         String currentBranch = gitHandler.getCurrentlyCheckedOutBranch();
 
         // update remote search branch
@@ -314,8 +287,7 @@ private void updateRemoteSearchAndWorkBranch()
      * Updates the local work and search branches with changes from their tracking remote branches
      * The currently checked out branch is not changed if the method is executed successfully
      */
-    private void updateWorkAndSearchBranch()
-        throws IOException, GitAPIException {
+    private void updateWorkAndSearchBranch() throws IOException, GitAPIException {
         String currentBranch = gitHandler.getCurrentlyCheckedOutBranch();
 
         // update search branch
@@ -332,22 +304,18 @@ private void updateWorkAndSearchBranch()
     /**
      * Create for each query a folder, and for each fetcher a bib file in the query folder to store its results.
      */
-    private void setUpRepositoryStructureForQueriesAndFetchers()
-        throws IOException {
+    private void setUpRepositoryStructureForQueriesAndFetchers() throws IOException {
         // Cannot use stream here since IOException has to be thrown
-        StudyCatalogToFetcherConverter converter =
-            new StudyCatalogToFetcherConverter(
-                this.getActiveLibraryEntries(),
-                preferencesService.getImportFormatPreferences(),
-                preferencesService.getImporterPreferences()
-            );
+        StudyCatalogToFetcherConverter converter = new StudyCatalogToFetcherConverter(
+            this.getActiveLibraryEntries(),
+            preferencesService.getImportFormatPreferences(),
+            preferencesService.getImporterPreferences()
+        );
         for (String query : this.getSearchQueryStrings()) {
             createQueryResultFolder(query);
             converter
                 .getActiveFetchers()
-                .forEach(searchBasedFetcher ->
-                    createFetcherResultFile(query, searchBasedFetcher)
-                );
+                .forEach(searchBasedFetcher -> createFetcherResultFile(query, searchBasedFetcher));
             createQueryResultFile(query);
         }
         createStudyResultFile();
@@ -370,10 +338,7 @@ private void createFolder(Path folder) throws IOException {
         }
     }
 
-    private void createFetcherResultFile(
-        String query,
-        SearchBasedFetcher searchBasedFetcher
-    ) {
+    private void createFetcherResultFile(String query, SearchBasedFetcher searchBasedFetcher) {
         String fetcherName = searchBasedFetcher.getName();
         Path fetcherResultFile = getPathToFetcherResultFile(query, fetcherName);
         createBibFile(fetcherResultFile);
@@ -424,12 +389,10 @@ private void createBibFile(Path file) {
     private String trimNameAndAddID(String query) {
         // Replace all field: with field= for folder name
         String trimmedNamed = MATCH_COLON.matcher(query).replaceAll("=");
-        trimmedNamed =
-            MATCH_ILLEGAL_CHARACTERS.matcher(trimmedNamed).replaceAll("");
+        trimmedNamed = MATCH_ILLEGAL_CHARACTERS.matcher(trimmedNamed).replaceAll("");
         String id = computeIDForQuery(query);
         // Whole path has to be shorter than 260
-        int remainingPathLength =
-            220 - studyDefinitionFile.toString().length() - id.length();
+        int remainingPathLength = 220 - studyDefinitionFile.toString().length() - id.length();
         if (query.length() > remainingPathLength) {
             trimmedNamed = query.substring(0, remainingPathLength);
         }
@@ -448,8 +411,7 @@ private String computeIDForQuery(String query) {
      *
      * @param crawlResults The results that shall be persisted.
      */
-    private void persistResults(List<QueryResult> crawlResults)
-        throws IOException, SaveException {
+    private void persistResults(List<QueryResult> crawlResults) throws IOException, SaveException {
         DatabaseMerger merger = new DatabaseMerger(
             preferencesService.getBibEntryPreferences().getKeywordSeparator()
         );
@@ -459,17 +421,13 @@ private void persistResults(List<QueryResult> 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
-                );
+                merger.merge(existingFetcherResult.getDatabase(), fetcherEntries);
 
                 // Create citation keys for all entries that do not have one
                 generateCiteKeys(existingFetcherResult, fetcherEntries);
@@ -478,48 +436,28 @@ private void persistResults(List<QueryResult> crawlResults)
                 merger.merge(queryResultEntries, fetcherEntries);
 
                 writeResultToFile(
-                    getPathToFetcherResultFile(
-                        result.getQuery(),
-                        fetcherResult.getFetcherName()
-                    ),
+                    getPathToFetcherResultFile(result.getQuery(), fetcherResult.getFetcherName()),
                     existingFetcherResult
                 );
             }
-            BibDatabaseContext existingQueryEntries = getQueryResultEntries(
-                result.getQuery()
-            );
+            BibDatabaseContext existingQueryEntries = getQueryResultEntries(result.getQuery());
 
             // Merge new entries into query result file
-            merger.merge(
-                existingQueryEntries.getDatabase(),
-                queryResultEntries
-            );
+            merger.merge(existingQueryEntries.getDatabase(), queryResultEntries);
             // Aggregate all new entries for every query into the study result
             merger.merge(newStudyResultEntries, queryResultEntries);
 
-            writeResultToFile(
-                getPathToQueryResultFile(result.getQuery()),
-                existingQueryEntries
-            );
+            writeResultToFile(getPathToQueryResultFile(result.getQuery()), existingQueryEntries);
         }
         BibDatabaseContext existingStudyResultEntries = getStudyResultEntries();
 
         // Merge new entries into study result file
-        merger.merge(
-            existingStudyResultEntries.getDatabase(),
-            newStudyResultEntries
-        );
+        merger.merge(existingStudyResultEntries.getDatabase(), newStudyResultEntries);
 
-        writeResultToFile(
-            getPathToStudyResultFile(),
-            existingStudyResultEntries
-        );
+        writeResultToFile(getPathToStudyResultFile(), existingStudyResultEntries);
     }
 
-    private void generateCiteKeys(
-        BibDatabaseContext existingEntries,
-        BibDatabase targetEntries
-    ) {
+    private void generateCiteKeys(BibDatabaseContext existingEntries, BibDatabase targetEntries) {
         CitationKeyGenerator citationKeyGenerator = new CitationKeyGenerator(
             existingEntries,
             preferencesService.getCitationKeyPatternPreferences()
@@ -534,10 +472,7 @@ private void generateCiteKeys(
     private void writeResultToFile(Path pathToFile, BibDatabaseContext context)
         throws SaveException {
         try (
-            AtomicFileWriter fileWriter = new AtomicFileWriter(
-                pathToFile,
-                StandardCharsets.UTF_8
-            )
+            AtomicFileWriter fileWriter = new AtomicFileWriter(pathToFile, StandardCharsets.UTF_8)
         ) {
             SelfContainedSaveConfiguration saveConfiguration =
                 (SelfContainedSaveConfiguration) new SelfContainedSaveConfiguration()
@@ -549,9 +484,7 @@ private void writeResultToFile(Path pathToFile, BibDatabaseContext context)
                             .orElse(SaveOrder.getDefaultSaveOrder())
                     )
                     .withReformatOnSave(
-                        preferencesService
-                            .getLibraryPreferences()
-                            .shouldAlwaysReformatOnSave()
+                        preferencesService.getLibraryPreferences().shouldAlwaysReformatOnSave()
                     );
             BibWriter bibWriter = new BibWriter(fileWriter, OS.NEWLINE);
             BibtexDatabaseWriter databaseWriter = new BibtexDatabaseWriter(
@@ -564,10 +497,7 @@ private void writeResultToFile(Path pathToFile, BibDatabaseContext context)
             databaseWriter.saveDatabase(context);
         } catch (UnsupportedCharsetException ex) {
             throw new SaveException(
-                Localization.lang(
-                    "Character encoding UTF-8 is not supported.",
-                    ex
-                )
+                Localization.lang("Character encoding UTF-8 is not supported.", ex)
             );
         } catch (IOException ex) {
             throw new SaveException("Problems saving", ex);
@@ -581,9 +511,7 @@ private Path getPathToFetcherResultFile(String query, String fetcherName) {
     }
 
     private Path getPathToQueryResultFile(String query) {
-        return repositoryPath
-            .resolve(trimNameAndAddID(query))
-            .resolve("result.bib");
+        return repositoryPath.resolve(trimNameAndAddID(query)).resolve("result.bib");
     }
 
     private Path getPathToStudyResultFile() {
diff --git a/src/main/java/org/jabref/logic/crawler/StudyYamlParser.java b/src/main/java/org/jabref/logic/crawler/StudyYamlParser.java
index 2a7fbfe3b77..c8e4f82f361 100644
--- a/src/main/java/org/jabref/logic/crawler/StudyYamlParser.java
+++ b/src/main/java/org/jabref/logic/crawler/StudyYamlParser.java
@@ -19,11 +19,7 @@ public class StudyYamlParser {
      */
     public Study parseStudyYamlFile(Path studyYamlFile) throws IOException {
         ObjectMapper yamlMapper = new ObjectMapper(new YAMLFactory());
-        try (
-            InputStream fileInputStream = new FileInputStream(
-                studyYamlFile.toFile()
-            )
-        ) {
+        try (InputStream fileInputStream = new FileInputStream(studyYamlFile.toFile())) {
             return yamlMapper.readValue(fileInputStream, Study.class);
         }
     }
@@ -31,8 +27,7 @@ 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 {
+    public void writeStudyYamlFile(Study study, Path studyYamlFile) throws IOException {
         ObjectMapper yamlMapper = new ObjectMapper(
             new YAMLFactory()
                 .disable(YAMLGenerator.Feature.WRITE_DOC_START_MARKER)
diff --git a/src/main/java/org/jabref/logic/database/DatabaseMerger.java b/src/main/java/org/jabref/logic/database/DatabaseMerger.java
index 412b322927b..40ffcf5a9ae 100644
--- a/src/main/java/org/jabref/logic/database/DatabaseMerger.java
+++ b/src/main/java/org/jabref/logic/database/DatabaseMerger.java
@@ -19,9 +19,7 @@
 
 public class DatabaseMerger {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(
-        DatabaseMerger.class
-    );
+    private static final Logger LOGGER = LoggerFactory.getLogger(DatabaseMerger.class);
     private final char keywordDelimiter;
 
     public DatabaseMerger(char keywordDelimiter) {
@@ -54,29 +52,18 @@ public synchronized void merge(
     ) {
         mergeEntries(target.getDatabase(), other.getDatabase());
         mergeStrings(target.getDatabase(), other.getDatabase());
-        mergeMetaData(
-            target.getMetaData(),
-            other.getMetaData(),
-            otherFileName,
-            other.getEntries()
-        );
+        mergeMetaData(target.getMetaData(), other.getMetaData(), otherFileName, other.getEntries());
     }
 
     private void mergeEntries(BibDatabase target, BibDatabase other) {
-        DuplicateCheck duplicateCheck = new DuplicateCheck(
-            new BibEntryTypesManager()
-        );
+        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)
-                    )
+                    .containsDuplicate(target, entry, BibDatabaseModeDetection.inferMode(target))
                     .isEmpty()
             )
             .collect(Collectors.toList());
@@ -105,10 +92,7 @@ public void mergeStrings(BibDatabase target, BibDatabase other) {
                         suffix++;
                         newName = bibtexStringName + "_" + suffix;
                     }
-                    BibtexString newBibtexString = new BibtexString(
-                        newName,
-                        importedContent
-                    );
+                    BibtexString newBibtexString = new BibtexString(newName, importedContent);
                     // TODO undo/redo
                     target.addString(newBibtexString);
                     LOGGER.info(
diff --git a/src/main/java/org/jabref/logic/database/DuplicateCheck.java b/src/main/java/org/jabref/logic/database/DuplicateCheck.java
index 55b63030aad..c05099b609e 100644
--- a/src/main/java/org/jabref/logic/database/DuplicateCheck.java
+++ b/src/main/java/org/jabref/logic/database/DuplicateCheck.java
@@ -37,9 +37,7 @@ public class DuplicateCheck {
 
     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
-    );
+    private static final Logger LOGGER = LoggerFactory.getLogger(DuplicateCheck.class);
     /*
      * Integer values for indicating result of duplicate check (for entries):
      */
@@ -74,32 +72,20 @@ public DuplicateCheck(BibEntryTypesManager entryTypesManager) {
         this.entryTypesManager = entryTypesManager;
     }
 
-    private static boolean haveSameIdentifier(
-        final BibEntry one,
-        final BibEntry two
-    ) {
+    private static boolean haveSameIdentifier(final BibEntry one, final BibEntry two) {
         for (final Field name : FieldFactory.getIdentifierFieldNames()) {
-            if (
-                one.getField(name).isPresent() &&
-                one.getField(name).equals(two.getField(name))
-            ) {
+            if (one.getField(name).isPresent() && one.getField(name).equals(two.getField(name))) {
                 return true;
             }
         }
         return false;
     }
 
-    private static boolean haveDifferentEntryType(
-        final BibEntry one,
-        final BibEntry two
-    ) {
+    private static boolean haveDifferentEntryType(final BibEntry one, final BibEntry two) {
         return !one.getType().equals(two.getType());
     }
 
-    private static boolean haveDifferentEditions(
-        final BibEntry one,
-        final BibEntry two
-    ) {
+    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 (
@@ -116,10 +102,8 @@ private static boolean haveDifferentChaptersOrPagesOfTheSameBook(
         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))
+            ((compareSingleField(StandardField.CHAPTER, one, two) == NOT_EQUAL) ||
+                (compareSingleField(StandardField.PAGES, one, two) == NOT_EQUAL))
         );
     }
 
@@ -132,10 +116,7 @@ private static double[] compareRequiredFields(
         return requiredFields.isEmpty()
             ? new double[] { 0., 0. }
             : DuplicateCheck.compareFieldSet(
-                requiredFields
-                    .stream()
-                    .map(OrFields::getPrimary)
-                    .collect(Collectors.toSet()),
+                requiredFields.stream().map(OrFields::getPrimary).collect(Collectors.toSet()),
                 one,
                 two
             );
@@ -145,10 +126,7 @@ private static boolean isFarFromThreshold(double value) {
         if (value < 0.0) {
             LOGGER.debug("Value {} is below zero. Should not happen", value);
         }
-        return (
-            value - DuplicateCheck.DUPLICATE_THRESHOLD >
-            DuplicateCheck.DOUBT_RANGE
-        );
+        return (value - DuplicateCheck.DUPLICATE_THRESHOLD > DuplicateCheck.DOUBT_RANGE);
     }
 
     private static boolean compareOptionalFields(
@@ -162,18 +140,13 @@ private static boolean compareOptionalFields(
             return req[0] >= DuplicateCheck.DUPLICATE_THRESHOLD;
         }
         final double[] opt = DuplicateCheck.compareFieldSet(
-            optionalFields
-                .stream()
-                .map(BibField::field)
-                .collect(Collectors.toSet()),
+            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];
+            (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;
     }
@@ -189,8 +162,7 @@ private static double[] compareFieldSet(
         double equalWeights = 0;
         double totalWeights = 0.;
         for (final Field field : fields) {
-            final double currentWeight =
-                DuplicateCheck.FIELD_WEIGHTS.getOrDefault(field, 1.0);
+            final double currentWeight = DuplicateCheck.FIELD_WEIGHTS.getOrDefault(field, 1.0);
             totalWeights += currentWeight;
             int result = DuplicateCheck.compareSingleField(field, one, two);
             if (result == EQUAL) {
@@ -239,10 +211,7 @@ private static int compareSingleField(
         return compareField(stringOne, stringTwo);
     }
 
-    private static int compareAuthorField(
-        final String stringOne,
-        final String stringTwo
-    ) {
+    private static int compareAuthorField(final String stringOne, final String stringTwo) {
         // Specific for name fields.
         // Harmonise case:
         final String authorOne = AuthorList
@@ -253,10 +222,7 @@ private static int compareAuthorField(
             .fixAuthorLastNameOnlyCommas(stringTwo, false)
             .replace(" and ", " ")
             .toLowerCase(Locale.ROOT);
-        final double similarity = DuplicateCheck.correlateByWords(
-            authorOne,
-            authorTwo
-        );
+        final double similarity = DuplicateCheck.correlateByWords(authorOne, authorTwo);
         if (similarity > 0.8) {
             return EQUAL;
         }
@@ -268,10 +234,7 @@ private static int compareAuthorField(
      * We do a replace to harmonize these to a simple "-"
      * After this, a simple test for equality should be enough
      */
-    private static int comparePagesField(
-        final String stringOne,
-        final String stringTwo
-    ) {
+    private static int comparePagesField(final String stringOne, final String stringTwo) {
         final String processedStringOne = stringOne.replaceAll("[- ]+", "-");
         final String processedStringTwo = stringTwo.replaceAll("[- ]+", "-");
         if (processedStringOne.equals(processedStringTwo)) {
@@ -284,16 +247,9 @@ private static int comparePagesField(
      * We do not attempt to harmonize abbreviation state of the journal names,
      * but we remove periods from the names in case they are abbreviated with and without dots:
      */
-    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);
+    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
@@ -304,23 +260,13 @@ private static int compareJournalField(
         return NOT_EQUAL;
     }
 
-    private static int compareChapterField(
-        final String stringOne,
-        final String stringTwo
-    ) {
-        final String processedStringOne = stringOne
-            .replaceAll("(?i)chapter", "")
-            .trim();
-        final String processedStringTwo = stringTwo
-            .replaceAll("(?i)chapter", "")
-            .trim();
+    private static int compareChapterField(final String stringOne, final String stringTwo) {
+        final String processedStringOne = stringOne.replaceAll("(?i)chapter", "").trim();
+        final String processedStringTwo = stringTwo.replaceAll("(?i)chapter", "").trim();
         return compareField(processedStringOne, processedStringTwo);
     }
 
-    private static int compareField(
-        final String stringOne,
-        final String stringTwo
-    ) {
+    private static int compareField(final String stringOne, final String stringTwo) {
         final String processedStringOne = StringUtil.unifyLineBreaks(
             stringOne.toLowerCase(Locale.ROOT).trim(),
             OS.NEWLINE
@@ -356,11 +302,7 @@ public static double compareEntriesStrictly(BibEntry one, BibEntry two) {
         return (double) score / allFields.size();
     }
 
-    private static boolean isSingleFieldEqual(
-        BibEntry one,
-        BibEntry two,
-        Field field
-    ) {
+    private static boolean isSingleFieldEqual(BibEntry one, BibEntry two, Field field) {
         final Optional<String> stringOne = one.getField(field);
         final Optional<String> stringTwo = two.getField(field);
         if (stringOne.isEmpty() && stringTwo.isEmpty()) {
@@ -419,8 +361,7 @@ private static double similarity(final String first, final String second) {
         }
         final double distanceIgnoredCase = new StringSimilarity()
             .editDistanceIgnoreCase(longer, shorter);
-        final double similarity =
-            (longerLength - distanceIgnoredCase) / longerLength;
+        final double similarity = (longerLength - distanceIgnoredCase) / longerLength;
         LOGGER.debug(
             "Longer string: {} Shorter string: {} Similarity: {}",
             longer,
@@ -469,11 +410,7 @@ public boolean isDuplicate(
         );
         if (type.isPresent()) {
             BibEntryType entryType = type.get();
-            final double[] reqCmpResult = compareRequiredFields(
-                entryType,
-                one,
-                two
-            );
+            final double[] reqCmpResult = compareRequiredFields(entryType, one, two);
 
             if (isFarFromThreshold(reqCmpResult[0])) {
                 // Far from the threshold value, so we base our decision on the required fields only
@@ -488,11 +425,7 @@ public boolean isDuplicate(
         // 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] >=
+            compareFieldSet(Sets.union(one.getFields(), two.getFields()), one, two)[0] >=
             DuplicateCheck.DUPLICATE_THRESHOLD
         );
     }
diff --git a/src/main/java/org/jabref/logic/exporter/AtomicFileOutputStream.java b/src/main/java/org/jabref/logic/exporter/AtomicFileOutputStream.java
index 0771bd3942d..3f4fb0270e9 100644
--- a/src/main/java/org/jabref/logic/exporter/AtomicFileOutputStream.java
+++ b/src/main/java/org/jabref/logic/exporter/AtomicFileOutputStream.java
@@ -44,13 +44,10 @@
  */
 public class AtomicFileOutputStream extends FilterOutputStream {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(
-        AtomicFileOutputStream.class
-    );
+    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().get(0);
+    private static final String SAVE_EXTENSION = "." + BackupFileType.SAVE.getExtensions().get(0);
 
     /**
      * The file we want to create/replace.
@@ -79,8 +76,7 @@ public class AtomicFileOutputStream extends FilterOutputStream {
      * @param path       the path of the file to write to or replace
      * @param keepBackup whether to keep the backup file (.sav) after a successful write process
      */
-    public AtomicFileOutputStream(Path path, boolean keepBackup)
-        throws IOException {
+    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,
@@ -180,11 +176,7 @@ public void abort() {
             Files.deleteIfExists(temporaryFile);
             Files.deleteIfExists(backupFile);
         } catch (IOException exception) {
-            LOGGER.debug(
-                "Unable to abort writing to file {}",
-                temporaryFile,
-                exception
-            );
+            LOGGER.debug("Unable to abort writing to file {}", temporaryFile, exception);
         }
     }
 
@@ -196,11 +188,7 @@ private void cleanup() {
         } catch (IOException exception) {
             // Currently, we always get the exception:
             // Unable to release lock on file C:\Users\koppor\AppData\Local\Temp\junit11976839611279549873\error-during-save.txt.tmp: java.nio.channels.ClosedChannelException
-            LOGGER.debug(
-                "Unable to release lock on file {}",
-                temporaryFile,
-                exception
-            );
+            LOGGER.debug("Unable to release lock on file {}", temporaryFile, exception);
         }
         try {
             Files.deleteIfExists(temporaryFile);
@@ -244,18 +232,13 @@ public void close() throws IOException {
             );
             if (Files.exists(targetFile)) {
                 try {
-                    Files.copy(
-                        targetFile,
-                        backupFile,
-                        StandardCopyOption.REPLACE_EXISTING
-                    );
+                    Files.copy(targetFile, backupFile, StandardCopyOption.REPLACE_EXISTING);
                 } catch (Exception e) {
                     LOGGER.warn("Could not create backup file {}", backupFile);
                 }
                 if (FileUtil.IS_POSIX_COMPLIANT) {
                     try {
-                        oldFilePermissions =
-                            Files.getPosixFilePermissions(targetFile);
+                        oldFilePermissions = Files.getPosixFilePermissions(targetFile);
                     } catch (IOException exception) {
                         LOGGER.warn(
                             "Error getting file permissions for file {}.",
@@ -282,10 +265,7 @@ public void close() throws IOException {
             // Restore file permissions
             if (FileUtil.IS_POSIX_COMPLIANT) {
                 try {
-                    Files.setPosixFilePermissions(
-                        targetFile,
-                        oldFilePermissions
-                    );
+                    Files.setPosixFilePermissions(targetFile, oldFilePermissions);
                 } catch (IOException exception) {
                     LOGGER.warn(
                         "Error writing file permissions to file {}.",
diff --git a/src/main/java/org/jabref/logic/exporter/AtomicFileWriter.java b/src/main/java/org/jabref/logic/exporter/AtomicFileWriter.java
index 12c601b86bc..19274cbeafa 100644
--- a/src/main/java/org/jabref/logic/exporter/AtomicFileWriter.java
+++ b/src/main/java/org/jabref/logic/exporter/AtomicFileWriter.java
@@ -25,8 +25,7 @@ public AtomicFileWriter(Path file, Charset encoding) throws IOException {
         this(file, encoding, false);
     }
 
-    public AtomicFileWriter(Path file, Charset encoding, boolean keepBackup)
-        throws IOException {
+    public AtomicFileWriter(Path file, Charset encoding, boolean keepBackup) throws IOException {
         super(new AtomicFileOutputStream(file, keepBackup), encoding);
         encoder = encoding.newEncoder();
     }
diff --git a/src/main/java/org/jabref/logic/exporter/BibDatabaseWriter.java b/src/main/java/org/jabref/logic/exporter/BibDatabaseWriter.java
index 56f41b29649..ae94a0985df 100644
--- a/src/main/java/org/jabref/logic/exporter/BibDatabaseWriter.java
+++ b/src/main/java/org/jabref/logic/exporter/BibDatabaseWriter.java
@@ -57,14 +57,11 @@ public enum SaveType {
         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;
-    protected final List<FieldChange> saveActionsFieldChanges =
-        new ArrayList<>();
+    protected final List<FieldChange> saveActionsFieldChanges = new ArrayList<>();
     protected final BibEntryTypesManager entryTypesManager;
 
     public BibDatabaseWriter(
@@ -77,18 +74,13 @@ public BibDatabaseWriter(
         this.saveConfiguration = saveConfiguration;
         this.keyPatternPreferences = keyPatternPreferences;
         this.entryTypesManager = entryTypesManager;
-        assert saveConfiguration.getSaveOrder().getOrderType() !=
-        SaveOrder.OrderType.TABLE;
+        assert saveConfiguration.getSaveOrder().getOrderType() != SaveOrder.OrderType.TABLE;
     }
 
-    private static List<FieldChange> applySaveActions(
-        List<BibEntry> toChange,
-        MetaData metaData
-    ) {
+    private static List<FieldChange> applySaveActions(List<BibEntry> toChange, MetaData metaData) {
         List<FieldChange> changes = new ArrayList<>();
 
-        Optional<FieldFormatterCleanups> saveActions =
-            metaData.getSaveActions();
+        Optional<FieldFormatterCleanups> saveActions = metaData.getSaveActions();
         saveActions.ifPresent(actions -> {
             // save actions defined -> apply for every entry
             for (BibEntry entry : toChange) {
@@ -99,11 +91,7 @@ private static List<FieldChange> applySaveActions(
         // Run standard cleanups
         List<FieldFormatterCleanup> preSaveCleanups = Stream
             .of(new TrimWhitespaceFormatter())
-            .map(formatter ->
-                new FieldFormatterCleanup(
-                    InternalField.INTERNAL_ALL_FIELD,
-                    formatter
-                )
+            .map(formatter -> new FieldFormatterCleanup(InternalField.INTERNAL_ALL_FIELD, formatter)
             )
             .toList();
         for (FieldFormatterCleanup formatter : preSaveCleanups) {
@@ -115,16 +103,11 @@ private static List<FieldChange> applySaveActions(
         return changes;
     }
 
-    public static List<FieldChange> applySaveActions(
-        BibEntry entry,
-        MetaData metaData
-    ) {
+    public static List<FieldChange> applySaveActions(BibEntry entry, MetaData metaData) {
         return applySaveActions(Collections.singletonList(entry), metaData);
     }
 
-    private static List<Comparator<BibEntry>> getSaveComparators(
-        SaveOrder saveOrder
-    ) {
+    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
@@ -161,8 +144,7 @@ public static List<BibEntry> getSortedEntries(
         Objects.requireNonNull(saveOrder);
 
         List<Comparator<BibEntry>> comparators = getSaveComparators(saveOrder);
-        FieldComparatorStack<BibEntry> comparatorStack =
-            new FieldComparatorStack<>(comparators);
+        FieldComparatorStack<BibEntry> comparatorStack = new FieldComparatorStack<>(comparators);
 
         List<BibEntry> sorted = new ArrayList<>(entriesToSort);
         sorted.sort(comparatorStack);
@@ -176,8 +158,7 @@ public List<FieldChange> getSaveActionsFieldChanges() {
     /**
      * Saves the complete database.
      */
-    public void saveDatabase(BibDatabaseContext bibDatabaseContext)
-        throws IOException {
+    public void saveDatabase(BibDatabaseContext bibDatabaseContext) throws IOException {
         List<BibEntry> entries = bibDatabaseContext
             .getDatabase()
             .getEntries()
@@ -192,16 +173,12 @@ public void saveDatabase(BibDatabaseContext bibDatabaseContext)
      *
      * @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 {
+    public void savePartOfDatabase(BibDatabaseContext bibDatabaseContext, List<BibEntry> entries)
+        throws IOException {
         Optional<String> sharedDatabaseIDOptional = bibDatabaseContext
             .getDatabase()
             .getSharedDatabaseID();
-        sharedDatabaseIDOptional.ifPresent(
-            Unchecked.consumer(id -> writeDatabaseID(id))
-        );
+        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) {
@@ -215,9 +192,7 @@ public void savePartOfDatabase(
         bibWriter.finishBlock();
 
         // Write preamble if there is one.
-        writePreamble(
-            bibDatabaseContext.getDatabase().getPreamble().orElse("")
-        );
+        writePreamble(bibDatabaseContext.getDatabase().getPreamble().orElse(""));
 
         // Write strings if there are any.
         writeStrings(bibDatabaseContext.getDatabase());
@@ -233,10 +208,7 @@ public void savePartOfDatabase(
         );
         saveActionsFieldChanges.addAll(saveActionChanges);
         if (keyPatternPreferences.shouldGenerateCiteKeysBeforeSaving()) {
-            List<FieldChange> keyChanges = generateCitationKeys(
-                bibDatabaseContext,
-                sortedEntries
-            );
+            List<FieldChange> keyChanges = generateCitationKeys(bibDatabaseContext, sortedEntries);
             saveActionsFieldChanges.addAll(keyChanges);
         }
 
@@ -247,12 +219,7 @@ public void savePartOfDatabase(
             // Check if we must write the type definition for this
             // entry, as well. Our criterion is that all non-standard
             // types (*not* all customized standard types) must be written.
-            if (
-                entryTypesManager.isCustomType(
-                    entry.getType(),
-                    bibDatabaseContext.getMode()
-                )
-            ) {
+            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
@@ -265,10 +232,7 @@ public void savePartOfDatabase(
 
         if (saveConfiguration.getSaveType() == SaveType.WITH_JABREF_META_DATA) {
             // Write meta data.
-            writeMetaData(
-                bibDatabaseContext.getMetaData(),
-                keyPatternPreferences.getKeyPattern()
-            );
+            writeMetaData(bibDatabaseContext.getMetaData(), keyPatternPreferences.getKeyPattern());
 
             // Write type definitions, if any:
             writeEntryTypeDefinitions(typesToWrite);
@@ -278,47 +242,36 @@ public void savePartOfDatabase(
         writeEpilogue(bibDatabaseContext.getDatabase().getEpilog());
     }
 
-    protected abstract void writeProlog(
-        BibDatabaseContext bibDatabaseContext,
-        Charset encoding
-    ) throws IOException;
-
-    protected abstract void writeEntry(BibEntry entry, BibDatabaseMode mode)
+    protected abstract void writeProlog(BibDatabaseContext bibDatabaseContext, Charset encoding)
         throws IOException;
 
+    protected abstract void writeEntry(BibEntry entry, BibDatabaseMode mode) throws IOException;
+
     protected abstract void writeEpilogue(String epilogue) throws IOException;
 
     /**
      * Writes all data to the specified writer, using each object's toString() method.
      */
-    protected void writeMetaData(
-        MetaData metaData,
-        GlobalCitationKeyPattern globalCiteKeyPattern
-    ) throws IOException {
+    protected void writeMetaData(MetaData metaData, GlobalCitationKeyPattern 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()) {
+        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;
 
-    protected abstract void writeDatabaseID(String sharedDatabaseID)
-        throws IOException;
+    protected abstract void writeDatabaseID(String sharedDatabaseID) throws IOException;
 
     /**
      * Write all strings in alphabetical order, modified to produce a safe (for BibTeX) order of the strings if they
@@ -343,9 +296,7 @@ private void writeStrings(BibDatabase database) throws IOException {
 
         for (BibtexString.Type t : BibtexString.Type.values()) {
             for (BibtexString bs : strings) {
-                if (
-                    remaining.containsKey(bs.getName()) && (bs.getType() == t)
-                ) {
+                if (remaining.containsKey(bs.getName()) && (bs.getType() == t)) {
                     writeString(bs, remaining, maxKeyLength);
                 }
             }
@@ -383,20 +334,16 @@ protected void writeString(
         writeString(bibtexString, maxKeyLength);
     }
 
-    protected abstract void writeString(
-        BibtexString bibtexString,
-        int maxKeyLength
-    ) throws IOException;
+    protected abstract void writeString(BibtexString bibtexString, int maxKeyLength)
+        throws IOException;
 
-    protected void writeEntryTypeDefinitions(SortedSet<BibEntryType> types)
-        throws IOException {
+    protected void writeEntryTypeDefinitions(SortedSet<BibEntryType> types) throws IOException {
         for (BibEntryType type : types) {
             writeEntryTypeDefinition(type);
         }
     }
 
-    protected abstract void writeEntryTypeDefinition(BibEntryType customType)
-        throws IOException;
+    protected abstract void writeEntryTypeDefinition(BibEntryType customType) throws IOException;
 
     /**
      * Generate keys for all entries that are lacking keys.
@@ -413,9 +360,7 @@ protected List<FieldChange> generateCitationKeys(
         for (BibEntry bes : entries) {
             Optional<String> oldKey = bes.getCitationKey();
             if (StringUtil.isBlank(oldKey)) {
-                Optional<FieldChange> change = keyGenerator.generateAndSetKey(
-                    bes
-                );
+                Optional<FieldChange> change = keyGenerator.generateAndSetKey(bes);
                 change.ifPresent(changes::add);
             }
         }
diff --git a/src/main/java/org/jabref/logic/exporter/BibtexDatabaseWriter.java b/src/main/java/org/jabref/logic/exporter/BibtexDatabaseWriter.java
index 1ab7111627d..566a5730ba9 100644
--- a/src/main/java/org/jabref/logic/exporter/BibtexDatabaseWriter.java
+++ b/src/main/java/org/jabref/logic/exporter/BibtexDatabaseWriter.java
@@ -41,12 +41,7 @@ public BibtexDatabaseWriter(
         CitationKeyPatternPreferences citationKeyPatternPreferences,
         BibEntryTypesManager entryTypesManager
     ) {
-        super(
-            bibWriter,
-            saveConfiguration,
-            citationKeyPatternPreferences,
-            entryTypesManager
-        );
+        super(bibWriter, saveConfiguration, citationKeyPatternPreferences, entryTypesManager);
         this.fieldPreferences = fieldPreferences;
     }
 
@@ -76,8 +71,7 @@ protected void writeEpilogue(String epilogue) throws IOException {
     }
 
     @Override
-    protected void writeMetaDataItem(Map.Entry<String, String> metaItem)
-        throws IOException {
+    protected void writeMetaDataItem(Map.Entry<String, String> metaItem) throws IOException {
         bibWriter.write(COMMENT_PREFIX + "{");
         bibWriter.write(MetaData.META_FLAG);
         bibWriter.write(metaItem.getKey());
@@ -98,13 +92,9 @@ protected void writePreamble(String preamble) throws IOException {
     }
 
     @Override
-    protected void writeString(BibtexString bibtexString, int maxKeyLength)
-        throws IOException {
+    protected void writeString(BibtexString bibtexString, int maxKeyLength) throws IOException {
         // If the string has not been modified, write it back as it was
-        if (
-            !saveConfiguration.shouldReformatFile() &&
-            !bibtexString.hasChanged()
-        ) {
+        if (!saveConfiguration.shouldReformatFile() && !bibtexString.hasChanged()) {
             bibWriter.write(bibtexString.getParsedSerialization());
             return;
         }
@@ -119,9 +109,7 @@ protected void writeString(BibtexString bibtexString, int maxKeyLength)
             STRING_PREFIX +
             "{" +
             bibtexString.getName() +
-            StringUtil.repeatSpaces(
-                maxKeyLength - bibtexString.getName().length()
-            ) +
+            StringUtil.repeatSpaces(maxKeyLength - bibtexString.getName().length()) +
             " = "
         );
         if (bibtexString.getContent().isEmpty()) {
@@ -129,10 +117,7 @@ protected void writeString(BibtexString bibtexString, int maxKeyLength)
         } else {
             try {
                 String formatted = new FieldWriter(fieldPreferences)
-                    .write(
-                        InternalField.BIBTEX_STRING,
-                        bibtexString.getContent()
-                    );
+                    .write(InternalField.BIBTEX_STRING, bibtexString.getContent());
                 bibWriter.write(formatted);
             } catch (InvalidFieldValueException ex) {
                 throw new IOException(ex);
@@ -143,30 +128,23 @@ protected void writeString(BibtexString bibtexString, int maxKeyLength)
     }
 
     @Override
-    protected void writeEntryTypeDefinition(BibEntryType customType)
-        throws IOException {
+    protected void writeEntryTypeDefinition(BibEntryType customType) throws IOException {
         bibWriter.write(COMMENT_PREFIX + "{");
-        bibWriter.write(
-            MetaDataSerializer.serializeCustomEntryTypes(customType)
-        );
+        bibWriter.write(MetaDataSerializer.serializeCustomEntryTypes(customType));
         bibWriter.writeLine("}");
         bibWriter.finishBlock();
     }
 
     @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() &&
+            (!bibDatabaseContext.getMetaData().getEncodingExplicitlySupplied() &&
                 (encoding.equals(StandardCharsets.UTF_8)))
         ) {
             return;
@@ -186,17 +164,11 @@ protected void writeDatabaseID(String sharedDatabaseID) throws IOException {
     }
 
     @Override
-    protected void writeEntry(BibEntry entry, BibDatabaseMode mode)
-        throws IOException {
+    protected void writeEntry(BibEntry entry, BibDatabaseMode mode) throws IOException {
         BibEntryWriter bibtexEntryWriter = new BibEntryWriter(
             new FieldWriter(fieldPreferences),
             entryTypesManager
         );
-        bibtexEntryWriter.write(
-            entry,
-            bibWriter,
-            mode,
-            saveConfiguration.shouldReformatFile()
-        );
+        bibtexEntryWriter.write(entry, bibWriter, mode, saveConfiguration.shouldReformatFile());
     }
 }
diff --git a/src/main/java/org/jabref/logic/exporter/EmbeddedBibFilePdfExporter.java b/src/main/java/org/jabref/logic/exporter/EmbeddedBibFilePdfExporter.java
index 65289f47da0..d52682face3 100644
--- a/src/main/java/org/jabref/logic/exporter/EmbeddedBibFilePdfExporter.java
+++ b/src/main/java/org/jabref/logic/exporter/EmbeddedBibFilePdfExporter.java
@@ -43,9 +43,7 @@ public class EmbeddedBibFilePdfExporter extends Exporter {
 
     public static String EMBEDDED_FILE_NAME = "main.bib";
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(
-        EmbeddedBibFilePdfExporter.class
-    );
+    private static final Logger LOGGER = LoggerFactory.getLogger(EmbeddedBibFilePdfExporter.class);
 
     private final BibDatabaseMode bibDatabaseMode;
     private final BibEntryTypesManager bibEntryTypesManager;
@@ -68,11 +66,8 @@ public EmbeddedBibFilePdfExporter(
      * @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);
@@ -82,18 +77,10 @@ public void export(
                 PDPage page = new PDPage();
                 document.addPage(page);
 
-                try (
-                    PDPageContentStream contentStream = new PDPageContentStream(
-                        document,
-                        page
-                    )
-                ) {
+                try (PDPageContentStream contentStream = new PDPageContentStream(document, page)) {
                     contentStream.beginText();
                     contentStream.newLineAtOffset(25, 500);
-                    contentStream.setFont(
-                        new PDType1Font(Standard14Fonts.FontName.HELVETICA),
-                        12
-                    );
+                    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."
                     );
@@ -122,17 +109,14 @@ private void embedBibTex(String bibTeX, Path path) throws IOException {
         // See https://issues.apache.org/jira/browse/PDFBOX-4028
         Path newFile = Files.createTempFile("JabRef", "pdf");
         try (PDDocument document = Loader.loadPDF(path.toFile())) {
-            PDDocumentNameDictionary nameDictionary = document
-                .getDocumentCatalog()
-                .getNames();
+            PDDocumentNameDictionary nameDictionary = document.getDocumentCatalog().getNames();
             PDEmbeddedFilesNameTreeNode efTree;
             Map<String, PDComplexFileSpecification> names;
 
             if (nameDictionary == null) {
                 efTree = new PDEmbeddedFilesNameTreeNode();
                 names = new HashMap<>();
-                nameDictionary =
-                    new PDDocumentNameDictionary(document.getDocumentCatalog());
+                nameDictionary = new PDDocumentNameDictionary(document.getDocumentCatalog());
                 nameDictionary.setEmbeddedFiles(efTree);
                 document.getDocumentCatalog().setNames(nameDictionary);
             } else {
@@ -159,10 +143,7 @@ private void embedBibTex(String bibTeX, Path path) throws IOException {
                     bibTeX.getBytes(StandardCharsets.UTF_8)
                 );
                 fileSpecification.setFile(EMBEDDED_FILE_NAME);
-                PDEmbeddedFile embeddedFile = new PDEmbeddedFile(
-                    document,
-                    inputStream
-                );
+                PDEmbeddedFile embeddedFile = new PDEmbeddedFile(document, inputStream);
                 embeddedFile.setSubtype("text/x-bibtex");
                 embeddedFile.setSize(bibTeX.length());
                 fileSpecification.setEmbeddedFile(embeddedFile);
@@ -172,10 +153,7 @@ private void embedBibTex(String bibTeX, Path path) throws IOException {
                         names.put(EMBEDDED_FILE_NAME, fileSpecification);
                     } catch (UnsupportedOperationException e) {
                         throw new IOException(
-                            Localization.lang(
-                                "File '%0' is write protected.",
-                                path.toString()
-                            )
+                            Localization.lang("File '%0' is write protected.", path.toString())
                         );
                     }
                 }
@@ -193,13 +171,8 @@ private void embedBibTex(String bibTeX, Path path) throws IOException {
     private String getBibString(List<BibEntry> entries) throws IOException {
         StringWriter stringWriter = new StringWriter();
         BibWriter bibWriter = new BibWriter(stringWriter, OS.NEWLINE);
-        FieldWriter fieldWriter = FieldWriter.buildIgnoreHashes(
-            fieldPreferences
-        );
-        BibEntryWriter bibEntryWriter = new BibEntryWriter(
-            fieldWriter,
-            bibEntryTypesManager
-        );
+        FieldWriter fieldWriter = FieldWriter.buildIgnoreHashes(fieldPreferences);
+        BibEntryWriter bibEntryWriter = new BibEntryWriter(fieldWriter, bibEntryTypesManager);
         for (BibEntry entry : entries) {
             bibEntryWriter.write(entry, bibWriter, bibDatabaseMode);
         }
diff --git a/src/main/java/org/jabref/logic/exporter/Exporter.java b/src/main/java/org/jabref/logic/exporter/Exporter.java
index 0d07d846934..b3d67303998 100644
--- a/src/main/java/org/jabref/logic/exporter/Exporter.java
+++ b/src/main/java/org/jabref/logic/exporter/Exporter.java
@@ -95,10 +95,7 @@ public boolean exportToAllFilesOfEntry(
 
         for (LinkedFile file : entryToWriteOn.getFiles()) {
             if (file.getFileType().equals(fileType.getName())) {
-                Optional<Path> filePath = file.findIn(
-                    databaseContext,
-                    filePreferences
-                );
+                Optional<Path> filePath = file.findIn(databaseContext, filePreferences);
                 if (filePath.isPresent()) {
                     export(
                         databaseContext,
diff --git a/src/main/java/org/jabref/logic/exporter/ExporterFactory.java b/src/main/java/org/jabref/logic/exporter/ExporterFactory.java
index cd3a48b9cce..7fc7a124b74 100644
--- a/src/main/java/org/jabref/logic/exporter/ExporterFactory.java
+++ b/src/main/java/org/jabref/logic/exporter/ExporterFactory.java
@@ -33,13 +33,10 @@ public static ExporterFactory create(
         LayoutFormatterPreferences layoutPreferences =
             preferencesService.getLayoutFormatterPreferences();
         SelfContainedSaveOrder saveOrder = SelfContainedSaveOrder.of(
-            preferencesService
-                .getSelfContainedExportConfiguration()
-                .getSaveOrder()
+            preferencesService.getSelfContainedExportConfiguration().getSaveOrder()
         );
         XmpPreferences xmpPreferences = preferencesService.getXmpPreferences();
-        FieldPreferences fieldPreferences =
-            preferencesService.getFieldPreferences();
+        FieldPreferences fieldPreferences = preferencesService.getFieldPreferences();
         BibDatabaseMode bibDatabaseMode = preferencesService
             .getLibraryPreferences()
             .getDefaultBibDatabaseMode();
@@ -255,11 +252,7 @@ public static ExporterFactory create(
         exporters.add(new XmpExporter(xmpPreferences));
         exporters.add(new XmpPdfExporter(xmpPreferences));
         exporters.add(
-            new EmbeddedBibFilePdfExporter(
-                bibDatabaseMode,
-                entryTypesManager,
-                fieldPreferences
-            )
+            new EmbeddedBibFilePdfExporter(bibDatabaseMode, entryTypesManager, fieldPreferences)
         );
 
         // Now add custom export formats
diff --git a/src/main/java/org/jabref/logic/exporter/GroupSerializer.java b/src/main/java/org/jabref/logic/exporter/GroupSerializer.java
index c0499839985..fc0d1f32836 100644
--- a/src/main/java/org/jabref/logic/exporter/GroupSerializer.java
+++ b/src/main/java/org/jabref/logic/exporter/GroupSerializer.java
@@ -107,17 +107,13 @@ private String serializeSearchGroup(SearchGroup group) {
         sb.append(MetadataSerializationConfiguration.GROUP_UNIT_SEPARATOR);
         sb.append(
             StringUtil.booleanToBinaryString(
-                group
-                    .getSearchFlags()
-                    .contains(SearchRules.SearchFlags.CASE_SENSITIVE)
+                group.getSearchFlags().contains(SearchRules.SearchFlags.CASE_SENSITIVE)
             )
         );
         sb.append(MetadataSerializationConfiguration.GROUP_UNIT_SEPARATOR);
         sb.append(
             StringUtil.booleanToBinaryString(
-                group
-                    .getSearchFlags()
-                    .contains(SearchRules.SearchFlags.REGULAR_EXPRESSION)
+                group.getSearchFlags().contains(SearchRules.SearchFlags.REGULAR_EXPRESSION)
             )
         );
         sb.append(MetadataSerializationConfiguration.GROUP_UNIT_SEPARATOR);
@@ -127,10 +123,7 @@ private String serializeSearchGroup(SearchGroup group) {
         return sb.toString();
     }
 
-    private void appendGroupDetails(
-        StringBuilder builder,
-        AbstractGroup group
-    ) {
+    private void appendGroupDetails(StringBuilder builder, AbstractGroup group) {
         builder.append(StringUtil.booleanToBinaryString(group.isExpanded()));
         builder.append(MetadataSerializationConfiguration.GROUP_UNIT_SEPARATOR);
         builder.append(group.getColor().map(Color::toString).orElse(""));
@@ -153,11 +146,7 @@ public List<String> serializeTree(GroupTreeNode node) {
         List<String> representation = new ArrayList<>();
 
         // Append current node
-        representation.add(
-            String.valueOf(node.getLevel()) +
-            ' ' +
-            serializeGroup(node.getGroup())
-        );
+        representation.add(String.valueOf(node.getLevel()) + ' ' + serializeGroup(node.getGroup()));
 
         // Append children
         for (GroupTreeNode child : node.getChildren()) {
@@ -218,9 +207,7 @@ private String serializeTexGroup(TexGroup group) {
 
     private String serializeAutomaticPersonsGroup(AutomaticPersonsGroup group) {
         StringBuilder sb = new StringBuilder();
-        sb.append(
-            MetadataSerializationConfiguration.AUTOMATIC_PERSONS_GROUP_ID
-        );
+        sb.append(MetadataSerializationConfiguration.AUTOMATIC_PERSONS_GROUP_ID);
         appendAutomaticGroupDetails(sb, group);
         sb.append(
             StringUtil.quote(
@@ -234,10 +221,7 @@ private String serializeAutomaticPersonsGroup(AutomaticPersonsGroup group) {
         return sb.toString();
     }
 
-    private void appendAutomaticGroupDetails(
-        StringBuilder builder,
-        AutomaticGroup group
-    ) {
+    private void appendAutomaticGroupDetails(StringBuilder builder, AutomaticGroup group) {
         builder.append(
             StringUtil.quote(
                 group.getName(),
@@ -252,9 +236,7 @@ private void appendAutomaticGroupDetails(
 
     private String serializeAutomaticKeywordGroup(AutomaticKeywordGroup group) {
         StringBuilder sb = new StringBuilder();
-        sb.append(
-            MetadataSerializationConfiguration.AUTOMATIC_KEYWORD_GROUP_ID
-        );
+        sb.append(MetadataSerializationConfiguration.AUTOMATIC_KEYWORD_GROUP_ID);
         appendAutomaticGroupDetails(sb, group);
         sb.append(
             StringUtil.quote(
diff --git a/src/main/java/org/jabref/logic/exporter/MSBibExporter.java b/src/main/java/org/jabref/logic/exporter/MSBibExporter.java
index 0d4c5e7f0fb..aa29b7716a4 100644
--- a/src/main/java/org/jabref/logic/exporter/MSBibExporter.java
+++ b/src/main/java/org/jabref/logic/exporter/MSBibExporter.java
@@ -39,26 +39,14 @@ public void export(
             return;
         }
 
-        MSBibDatabase msBibDatabase = new MSBibDatabase(
-            databaseContext.getDatabase(),
-            entries
-        );
+        MSBibDatabase msBibDatabase = new MSBibDatabase(databaseContext.getDatabase(), entries);
 
         // forcing to use UTF8 output format for some problems with xml export in other encodings
-        try (
-            AtomicFileWriter ps = new AtomicFileWriter(
-                file,
-                StandardCharsets.UTF_8
-            )
-        ) {
+        try (AtomicFileWriter ps = new AtomicFileWriter(file, StandardCharsets.UTF_8)) {
             try {
-                DOMSource source = new DOMSource(
-                    msBibDatabase.getDomForExport()
-                );
+                DOMSource source = new DOMSource(msBibDatabase.getDomForExport());
                 StreamResult result = new StreamResult(ps);
-                Transformer trans = TransformerFactory
-                    .newInstance()
-                    .newTransformer();
+                Transformer trans = TransformerFactory.newInstance().newTransformer();
                 trans.setOutputProperty(OutputKeys.INDENT, "yes");
                 trans.transform(source, result);
             } catch (
diff --git a/src/main/java/org/jabref/logic/exporter/MetaDataSerializer.java b/src/main/java/org/jabref/logic/exporter/MetaDataSerializer.java
index 0135601f17c..80677602007 100644
--- a/src/main/java/org/jabref/logic/exporter/MetaDataSerializer.java
+++ b/src/main/java/org/jabref/logic/exporter/MetaDataSerializer.java
@@ -44,28 +44,17 @@ public static Map<String, String> getSerializedStringMap(
         metaData
             .getSaveOrder()
             .ifPresent(saveOrderConfig ->
-                stringyMetaData.put(
-                    MetaData.SAVE_ORDER_CONFIG,
-                    saveOrderConfig.getAsStringList()
-                )
+                stringyMetaData.put(MetaData.SAVE_ORDER_CONFIG, saveOrderConfig.getAsStringList())
             );
         metaData
             .getSaveActions()
             .ifPresent(saveActions ->
-                stringyMetaData.put(
-                    MetaData.SAVE_ACTIONS,
-                    saveActions.getAsStringList(OS.NEWLINE)
-                )
+                stringyMetaData.put(MetaData.SAVE_ACTIONS, saveActions.getAsStringList(OS.NEWLINE))
             );
         if (metaData.isProtected()) {
-            stringyMetaData.put(
-                MetaData.PROTECTED_FLAG_META,
-                Collections.singletonList("true")
-            );
+            stringyMetaData.put(MetaData.PROTECTED_FLAG_META, Collections.singletonList("true"));
         }
-        stringyMetaData.putAll(
-            serializeCiteKeyPattern(metaData, globalCiteKeyPattern)
-        );
+        stringyMetaData.putAll(serializeCiteKeyPattern(metaData, globalCiteKeyPattern));
         metaData
             .getMode()
             .ifPresent(mode ->
@@ -77,10 +66,7 @@ public static Map<String, String> getSerializedStringMap(
         metaData
             .getDefaultFileDirectory()
             .ifPresent(path ->
-                stringyMetaData.put(
-                    MetaData.FILE_DIRECTORY,
-                    Collections.singletonList(path.trim())
-                )
+                stringyMetaData.put(MetaData.FILE_DIRECTORY, Collections.singletonList(path.trim()))
             );
         metaData
             .getUserFileDirectories()
@@ -114,29 +100,18 @@ public static Map<String, String> getSerializedStringMap(
             );
         }
 
-        Map<String, String> serializedMetaData = serializeMetaData(
-            stringyMetaData
-        );
+        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)
-                )
-            );
+            .ifPresent(root -> serializedMetaData.put(MetaData.GROUPSTREE, serializeGroups(root)));
 
         // 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()) {
+        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,
@@ -145,10 +120,7 @@ public static Map<String, String> getSerializedStringMap(
             );
             for (String line : entry.getValue()) {
                 value.add(
-                    line.replace(
-                        MetaData.SEPARATOR_STRING,
-                        "\\" + MetaData.SEPARATOR_STRING
-                    )
+                    line.replace(MetaData.SEPARATOR_STRING, "\\" + MetaData.SEPARATOR_STRING)
                 );
             }
             serializedMetaData.put(entry.getKey(), value.toString());
@@ -161,19 +133,14 @@ 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()) {
+        for (Map.Entry<String, List<String>> metaItem : stringyMetaData.entrySet()) {
             List<String> itemList = metaItem.getValue();
             if (itemList.isEmpty()) {
                 // Only add non-empty values
                 continue;
             }
 
-            boolean isSaveActions = metaItem
-                .getKey()
-                .equals(MetaData.SAVE_ACTIONS);
+            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,
@@ -189,11 +156,7 @@ private static Map<String, String> serializeMetaData(
                     string = "";
                 }
                 string +=
-                StringUtil.quote(
-                    dataItem,
-                    MetaData.SEPARATOR_STRING,
-                    MetaData.ESCAPE_CHARACTER
-                );
+                StringUtil.quote(dataItem, MetaData.SEPARATOR_STRING, MetaData.ESCAPE_CHARACTER);
                 // in case of save actions, add an additional newline after the enabled flag
                 lastWasSaveActionsEnablement =
                     isSaveActions &&
@@ -215,8 +178,9 @@ private static Map<String, List<String>> serializeCiteKeyPattern(
         GlobalCitationKeyPattern globalCitationKeyPattern
     ) {
         Map<String, List<String>> stringyPattern = new HashMap<>();
-        AbstractCitationKeyPattern citationKeyPattern =
-            metaData.getCiteKeyPattern(globalCitationKeyPattern);
+        AbstractCitationKeyPattern citationKeyPattern = metaData.getCiteKeyPattern(
+            globalCitationKeyPattern
+        );
         for (EntryType key : citationKeyPattern.getAllKeys()) {
             if (!citationKeyPattern.isDefaultValue(key)) {
                 List<String> data = new ArrayList<>();
@@ -242,11 +206,7 @@ private static String serializeGroups(GroupTreeNode root) {
 
         for (String groupNode : new GroupSerializer().serializeTree(root)) {
             stringBuilder.append(
-                StringUtil.quote(
-                    groupNode,
-                    MetaData.SEPARATOR_STRING,
-                    MetaData.ESCAPE_CHARACTER
-                )
+                StringUtil.quote(groupNode, MetaData.SEPARATOR_STRING, MetaData.ESCAPE_CHARACTER)
             );
             stringBuilder.append(MetaData.SEPARATOR_STRING);
             stringBuilder.append(OS.NEWLINE);
@@ -259,9 +219,7 @@ public static String serializeCustomEntryTypes(BibEntryType entryType) {
         builder.append(MetaData.ENTRYTYPE_FLAG);
         builder.append(entryType.getType().getName());
         builder.append(": req[");
-        builder.append(
-            FieldFactory.serializeOrFieldsList(entryType.getRequiredFields())
-        );
+        builder.append(FieldFactory.serializeOrFieldsList(entryType.getRequiredFields()));
         builder.append("] opt[");
         builder.append(
             FieldFactory.serializeFieldsList(
diff --git a/src/main/java/org/jabref/logic/exporter/ModsExporter.java b/src/main/java/org/jabref/logic/exporter/ModsExporter.java
index f9ec3b99dac..7aea9260b9e 100644
--- a/src/main/java/org/jabref/logic/exporter/ModsExporter.java
+++ b/src/main/java/org/jabref/logic/exporter/ModsExporter.java
@@ -37,16 +37,13 @@
  */
 class ModsExporter extends Exporter {
 
-    private static final String MODS_NAMESPACE_URI =
-        "http://www.loc.gov/mods/v3";
+    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 Logger LOGGER = LoggerFactory.getLogger(
-        ModsExporter.class
-    );
+    private static final Logger LOGGER = LoggerFactory.getLogger(ModsExporter.class);
 
     public ModsExporter() {
         super("mods", "MODS", StandardFileType.XML);
@@ -75,16 +72,10 @@ public void export(
                     String citekey = bibEntry.getCitationKey().get();
                     addIdentifier(writer, new UnknownField("citekey"), citekey);
                 } else {
-                    writer.writeStartElement(
-                        "mods",
-                        "mods",
-                        MODS_NAMESPACE_URI
-                    );
+                    writer.writeStartElement("mods", "mods", MODS_NAMESPACE_URI);
                 }
 
-                Map<Field, String> fieldMap = new TreeMap<>(
-                    Comparator.comparing(Field::getName)
-                );
+                Map<Field, String> fieldMap = new TreeMap<>(Comparator.comparing(Field::getName));
                 fieldMap.putAll(bibEntry.getFieldMap());
                 addGenre(writer, bibEntry.getType());
 
@@ -153,23 +144,15 @@ public void export(
         }
     }
 
-    private XMLStreamWriter createWriter(StringWriter sw)
-        throws XMLStreamException {
+    private XMLStreamWriter createWriter(StringWriter sw) throws XMLStreamException {
         XMLOutputFactory outputFactory = XMLOutputFactory.newFactory();
 
-        XMLStreamWriter writer = outputFactory.createXMLStreamWriter(
-            new StreamResult(sw)
-        );
-        writer.writeDTD(
-            "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?>\n"
-        );
+        XMLStreamWriter writer = outputFactory.createXMLStreamWriter(new StreamResult(sw));
+        writer.writeDTD("<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?>\n");
         writer.writeStartElement("mods", "modsCollection", MODS_NAMESPACE_URI);
         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.writeNamespace("xsi", "http://www.w3.org/2001/XMLSchema-instance");
         writer.writeAttribute(
             "xsi",
             "http://www.w3.org/2001/XMLSchema-instance",
@@ -181,15 +164,10 @@ private XMLStreamWriter createWriter(StringWriter sw)
 
     private void writerFormatted(Path file, StringWriter sw)
         throws TransformerException, IOException {
-        Transformer transformer = TransformerFactory
-            .newInstance()
-            .newTransformer();
+        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"
-        );
+        transformer.setOutputProperty("{http://xml.apache.org/xslt}indent-amount", "4");
 
         try (OutputStream outputStream = Files.newOutputStream(file)) {
             transformer.transform(
@@ -265,11 +243,7 @@ private void writePartInformation(
         }
     }
 
-    private void trackOriginInformation(
-        List<String> originItems,
-        Field field,
-        String value
-    ) {
+    private void trackOriginInformation(List<String> originItems, Field field, String value) {
         if (field.equals(StandardField.YEAR)) {
             originItems.add(value);
         } else if (field.equals(new UnknownField("created"))) {
@@ -293,22 +267,19 @@ private void addPart(List<String> part, String value) {
         part.add(value);
     }
 
-    private void addGenre(XMLStreamWriter writer, EntryType entryType)
-        throws XMLStreamException {
+    private void addGenre(XMLStreamWriter writer, EntryType entryType) throws XMLStreamException {
         writer.writeStartElement("mods", "genre", MODS_NAMESPACE_URI);
         writer.writeCharacters(entryType.getName());
         writer.writeEndElement();
     }
 
-    private void addAbstract(XMLStreamWriter writer, String value)
-        throws XMLStreamException {
+    private void addAbstract(XMLStreamWriter writer, String value) throws XMLStreamException {
         writer.writeStartElement("mods", "abstract", MODS_NAMESPACE_URI);
         writer.writeCharacters(value);
         writer.writeEndElement(); // end abstract
     }
 
-    private void addTitle(XMLStreamWriter writer, String value)
-        throws XMLStreamException {
+    private void addTitle(XMLStreamWriter writer, String value) throws XMLStreamException {
         writer.writeStartElement("mods", "titleInfo", MODS_NAMESPACE_URI);
         writer.writeStartElement("mods", "title", MODS_NAMESPACE_URI);
         writer.writeCharacters(value);
@@ -316,8 +287,7 @@ private void addTitle(XMLStreamWriter writer, String value)
         writer.writeEndElement(); // end titleInfo
     }
 
-    private void addAffiliation(XMLStreamWriter writer, String value)
-        throws XMLStreamException {
+    private void addAffiliation(XMLStreamWriter writer, String value) throws XMLStreamException {
         writer.writeStartElement("mods", "name", MODS_NAMESPACE_URI);
         writer.writeStartElement("mods", "affiliation", MODS_NAMESPACE_URI);
         writer.writeCharacters(value);
@@ -325,24 +295,18 @@ private void addAffiliation(XMLStreamWriter writer, String value)
         writer.writeEndElement(); // end name
     }
 
-    private void addLocation(XMLStreamWriter writer, String value)
-        throws XMLStreamException {
+    private void addLocation(XMLStreamWriter writer, String value) throws XMLStreamException {
         writer.writeStartElement("mods", "location", MODS_NAMESPACE_URI);
         String[] locations = value.split(", ");
         for (String location : locations) {
-            writer.writeStartElement(
-                "mods",
-                "physicalLocation",
-                MODS_NAMESPACE_URI
-            );
+            writer.writeStartElement("mods", "physicalLocation", MODS_NAMESPACE_URI);
             writer.writeCharacters(location);
             writer.writeEndElement();
         }
         writer.writeEndElement();
     }
 
-    private void addNote(XMLStreamWriter writer, String value)
-        throws XMLStreamException {
+    private void addNote(XMLStreamWriter writer, String value) throws XMLStreamException {
         String[] notes = value.split(", ");
         for (String note : notes) {
             writer.writeStartElement("mods", "note", MODS_NAMESPACE_URI);
@@ -351,8 +315,7 @@ private void addNote(XMLStreamWriter writer, String value)
         }
     }
 
-    private void addUrl(XMLStreamWriter writer, String value)
-        throws XMLStreamException {
+    private void addUrl(XMLStreamWriter writer, String value) throws XMLStreamException {
         String[] urls = value.split(", ");
         writer.writeStartElement("mods", "location", MODS_NAMESPACE_URI);
         for (String url : urls) {
@@ -363,8 +326,7 @@ private void addUrl(XMLStreamWriter writer, String value)
         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);
 
@@ -377,8 +339,7 @@ private void addJournal(XMLStreamWriter writer, String value)
         writer.writeEndElement(); // End titleInfo element
     }
 
-    private void addLanguage(XMLStreamWriter writer, String value)
-        throws XMLStreamException {
+    private void addLanguage(XMLStreamWriter writer, String value) throws XMLStreamException {
         writer.writeStartElement("mods", "language", MODS_NAMESPACE_URI);
         writer.writeStartElement("mods", "languageTerm", MODS_NAMESPACE_URI);
         writer.writeCharacters(value);
@@ -386,8 +347,7 @@ private void addLanguage(XMLStreamWriter writer, String value)
         writer.writeEndElement(); // end language
     }
 
-    private void addPages(XMLStreamWriter writer, String value)
-        throws XMLStreamException {
+    private void addPages(XMLStreamWriter writer, String value) throws XMLStreamException {
         if (value.contains(DOUBLE_MINUS)) {
             addStartAndEndPage(writer, value, DOUBLE_MINUS);
         } else if (value.contains(MINUS)) {
@@ -402,8 +362,7 @@ private void addPages(XMLStreamWriter writer, String value)
         }
     }
 
-    private void addKeyWords(XMLStreamWriter writer, String value)
-        throws XMLStreamException {
+    private void addKeyWords(XMLStreamWriter writer, String value) throws XMLStreamException {
         String[] keywords = value.split(", ");
 
         for (String keyword : keywords) {
@@ -415,8 +374,7 @@ private void addKeyWords(XMLStreamWriter writer, String value)
         }
     }
 
-    private void handleAuthors(XMLStreamWriter writer, String value)
-        throws XMLStreamException {
+    private void handleAuthors(XMLStreamWriter writer, String value) throws XMLStreamException {
         String[] authors = value.split("and");
         for (String author : authors) {
             writer.writeStartElement("mods", "name", MODS_NAMESPACE_URI);
@@ -426,11 +384,7 @@ private void handleAuthors(XMLStreamWriter writer, String value)
                 // 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
-                );
+                writer.writeStartElement("mods", "namePart", MODS_NAMESPACE_URI);
                 writer.writeAttribute("type", "family");
                 writer.writeCharacters(familyName);
                 writer.writeEndElement();
@@ -440,11 +394,7 @@ private void handleAuthors(XMLStreamWriter writer, String value)
                 String[] forenames = forename.split(" ");
                 for (String given : forenames) {
                     if (!given.isEmpty()) {
-                        writer.writeStartElement(
-                            "mods",
-                            "namePart",
-                            MODS_NAMESPACE_URI
-                        );
+                        writer.writeStartElement("mods", "namePart", MODS_NAMESPACE_URI);
                         writer.writeAttribute("type", "given");
                         writer.writeCharacters(given);
                         writer.writeEndElement();
@@ -453,11 +403,7 @@ private void handleAuthors(XMLStreamWriter writer, String value)
                 writer.writeEndElement();
             } else {
                 // no "," indicates that there should only be a family name
-                writer.writeStartElement(
-                    "mods",
-                    "namePart",
-                    MODS_NAMESPACE_URI
-                );
+                writer.writeStartElement("mods", "namePart", MODS_NAMESPACE_URI);
                 writer.writeAttribute("type", "family");
                 writer.writeCharacters(author);
                 writer.writeEndElement();
@@ -466,11 +412,8 @@ private void handleAuthors(XMLStreamWriter writer, String value)
         }
     }
 
-    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);
             writer.writeAttribute("ID", value);
@@ -481,11 +424,8 @@ private void addIdentifier(
         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 = "";
@@ -515,11 +455,8 @@ private void addDetail(XMLStreamWriter writer, Field field, String value)
         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);
         } else if (field.equals(new UnknownField("created"))) {
@@ -546,11 +483,7 @@ private void addOriginInformation(
             writer.writeStartElement("mods", "place", MODS_NAMESPACE_URI);
             String[] places = value.split(", ");
             for (String place : places) {
-                writer.writeStartElement(
-                    "mods",
-                    "placeTerm",
-                    MODS_NAMESPACE_URI
-                );
+                writer.writeStartElement("mods", "placeTerm", MODS_NAMESPACE_URI);
                 writer.writeAttribute("type", "text");
                 writer.writeCharacters(place);
                 writer.writeEndElement();
diff --git a/src/main/java/org/jabref/logic/exporter/OOCalcDatabase.java b/src/main/java/org/jabref/logic/exporter/OOCalcDatabase.java
index 7de05996d3d..510ac736ecf 100644
--- a/src/main/java/org/jabref/logic/exporter/OOCalcDatabase.java
+++ b/src/main/java/org/jabref/logic/exporter/OOCalcDatabase.java
@@ -25,12 +25,8 @@
 
 class OOCalcDatabase {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(
-        OOCalcDatabase.class
-    );
-    private static final Field REPORT_TYPE_FIELD = new UnknownField(
-        "reporttype"
-    );
+    private static final Logger LOGGER = LoggerFactory.getLogger(OOCalcDatabase.class);
+    private static final Field REPORT_TYPE_FIELD = new UnknownField("reporttype");
 
     private final List<BibEntry> entries = new ArrayList<>();
     private final List<Field> toExportFields = Stream
@@ -58,11 +54,7 @@ private static String getField(BibEntry e, Field field) {
     public Document getDOMrepresentation() {
         Document document = null;
         try {
-            document =
-                DocumentBuilderFactory
-                    .newInstance()
-                    .newDocumentBuilder()
-                    .newDocument();
+            document = DocumentBuilderFactory.newInstance().newDocumentBuilder().newDocument();
             Element root = createRootElement(document);
             Element body = document.createElement("office:body");
             Element table = createTableElement(document);
@@ -85,21 +77,14 @@ public Document getDOMrepresentation() {
     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())
-        );
+        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))
-                        )
+                        .format(new RemoveBrackets().format(getField(entry, StandardField.TITLE)))
                 );
             } else {
                 addTableCell(document, row, getField(entry, field));
@@ -151,11 +136,7 @@ private Element createRootElement(Document document) {
         return root;
     }
 
-    private static void addTableCell(
-        Document doc,
-        Element parent,
-        String content
-    ) {
+    private static void addTableCell(Document doc, Element parent, String content) {
         Element cell = doc.createElement("table:table-cell");
         Element text = doc.createElement("text:p");
         Text textNode = doc.createTextNode(content);
diff --git a/src/main/java/org/jabref/logic/exporter/OpenDocumentRepresentation.java b/src/main/java/org/jabref/logic/exporter/OpenDocumentRepresentation.java
index a93310fe7d7..b0ef2860cae 100644
--- a/src/main/java/org/jabref/logic/exporter/OpenDocumentRepresentation.java
+++ b/src/main/java/org/jabref/logic/exporter/OpenDocumentRepresentation.java
@@ -24,17 +24,12 @@
 
 class OpenDocumentRepresentation {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(
-        OpenDocumentRepresentation.class
-    );
+    private static final Logger LOGGER = LoggerFactory.getLogger(OpenDocumentRepresentation.class);
     private final List<BibEntry> entries;
 
     private final BibDatabase database;
 
-    public OpenDocumentRepresentation(
-        BibDatabase database,
-        List<BibEntry> entries
-    ) {
+    public OpenDocumentRepresentation(BibDatabase database, List<BibEntry> entries) {
         this.database = database;
         // Make a list of comparators for sorting the entries:
         List<FieldComparator> comparators = new ArrayList<>();
@@ -58,13 +53,9 @@ public OpenDocumentRepresentation(
     public Document getDOMrepresentation() {
         Document result = null;
         try {
-            DocumentBuilder dbuild = DocumentBuilderFactory
-                .newInstance()
-                .newDocumentBuilder();
+            DocumentBuilder dbuild = DocumentBuilderFactory.newInstance().newDocumentBuilder();
             result = dbuild.newDocument();
-            Element collection = result.createElement(
-                "office:document-content"
-            );
+            Element collection = result.createElement("office:document-content");
             // collection.setAttribute("xmlns", "http://openoffice.org/2000/office");
             collection.setAttribute(
                 "xmlns:office",
@@ -74,27 +65,18 @@ public Document getDOMrepresentation() {
                 "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: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:meta",
-                "urn:oasis:names:tc:opendocument:xmlns:meta: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:xlink",
-                "http://www.w3.org/1999/xlink"
-            );
+            collection.setAttribute("xmlns:xlink", "http://www.w3.org/1999/xlink");
             Element el = result.createElement("office:scripts");
             collection.appendChild(el);
 
@@ -170,11 +152,7 @@ public Document getDOMrepresentation() {
             for (BibEntry e : entries) {
                 row = result.createElement("table:table-row");
                 addTableCell(result, row, getField(e, InternalField.KEY_FIELD));
-                addTableCell(
-                    result,
-                    row,
-                    new GetOpenOfficeType().format(e.getType().getName())
-                );
+                addTableCell(result, row, new GetOpenOfficeType().format(e.getType().getName()));
                 addTableCell(result, row, getField(e, StandardField.ADDRESS));
                 addTableCell(result, row, getField(e, StandardField.ASSIGNEE));
                 addTableCell(result, row, getField(e, StandardField.ANNOTE));
@@ -185,36 +163,16 @@ public Document getDOMrepresentation() {
                 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.HOWPUBLISHED)
-                );
-                addTableCell(
-                    result,
-                    row,
-                    getField(e, StandardField.INSTITUTION)
-                );
+                addTableCell(result, row, getField(e, StandardField.HOWPUBLISHED));
+                addTableCell(result, row, getField(e, StandardField.INSTITUTION));
                 addTableCell(result, row, getField(e, StandardField.JOURNAL));
                 addTableCell(result, row, getField(e, StandardField.LANGUAGE));
                 addTableCell(result, row, getField(e, StandardField.MONTH));
-                addTableCell(
-                    result,
-                    row,
-                    getField(e, StandardField.MONTHFILED)
-                );
-                addTableCell(
-                    result,
-                    row,
-                    getField(e, StandardField.NATIONALITY)
-                );
+                addTableCell(result, row, getField(e, StandardField.MONTHFILED));
+                addTableCell(result, row, getField(e, StandardField.NATIONALITY));
                 addTableCell(result, row, getField(e, StandardField.NOTE));
                 addTableCell(result, row, getField(e, StandardField.NUMBER));
-                addTableCell(
-                    result,
-                    row,
-                    getField(e, StandardField.ORGANIZATION)
-                );
+                addTableCell(result, row, getField(e, StandardField.ORGANIZATION));
                 addTableCell(result, row, getField(e, StandardField.PAGES));
                 addTableCell(result, row, getField(e, StandardField.PUBLISHER));
                 addTableCell(result, row, getField(e, StandardField.REVISION));
@@ -224,16 +182,9 @@ public Document getDOMrepresentation() {
                     result,
                     row,
                     new RemoveWhitespace()
-                        .format(
-                            new RemoveBrackets()
-                                .format(getField(e, StandardField.TITLE))
-                        )
-                );
-                addTableCell(
-                    result,
-                    row,
-                    getField(e, new UnknownField("reporttype"))
+                        .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));
                 addTableCell(result, row, getField(e, StandardField.YEARFILED));
diff --git a/src/main/java/org/jabref/logic/exporter/OpenDocumentSpreadsheetCreator.java b/src/main/java/org/jabref/logic/exporter/OpenDocumentSpreadsheetCreator.java
index c825d308b50..0d623b71166 100644
--- a/src/main/java/org/jabref/logic/exporter/OpenDocumentSpreadsheetCreator.java
+++ b/src/main/java/org/jabref/logic/exporter/OpenDocumentSpreadsheetCreator.java
@@ -42,17 +42,11 @@ public class OpenDocumentSpreadsheetCreator extends Exporter {
      * Creates a new instance of OpenOfficeDocumentCreator
      */
     public OpenDocumentSpreadsheetCreator() {
-        super(
-            "ods",
-            Localization.lang("OpenDocument spreadsheet"),
-            StandardFileType.ODS
-        );
+        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))
@@ -104,22 +98,11 @@ private static void exportOpenDocumentSpreadsheet(
     ) throws IOException {
         // First store the xml formatted content to a temporary file.
         File tmpFile = File.createTempFile("opendocument", null);
-        OpenDocumentSpreadsheetCreator.exportOpenDocumentSpreadsheetXML(
-            tmpFile,
-            database,
-            entries
-        );
+        OpenDocumentSpreadsheetCreator.exportOpenDocumentSpreadsheetXML(tmpFile, database, entries);
 
         // Then add the content to the zip file:
-        try (
-            BufferedInputStream in = new BufferedInputStream(
-                new FileInputStream(tmpFile)
-            )
-        ) {
-            OpenDocumentSpreadsheetCreator.storeOpenDocumentSpreadsheetFile(
-                file,
-                in
-            );
+        try (BufferedInputStream in = new BufferedInputStream(new FileInputStream(tmpFile))) {
+            OpenDocumentSpreadsheetCreator.storeOpenDocumentSpreadsheetFile(file, in);
         }
         // Delete the temporary file:
         if (!tmpFile.delete()) {
@@ -149,10 +132,7 @@ private static void exportOpenDocumentSpreadsheetXML(
         BibDatabase database,
         List<BibEntry> entries
     ) {
-        OpenDocumentRepresentation od = new OpenDocumentRepresentation(
-            database,
-            entries
-        );
+        OpenDocumentRepresentation od = new OpenDocumentRepresentation(database, entries);
 
         try (
             Writer ps = new OutputStreamWriter(
@@ -162,9 +142,7 @@ private static void exportOpenDocumentSpreadsheetXML(
         ) {
             DOMSource source = new DOMSource(od.getDOMrepresentation());
             StreamResult result = new StreamResult(ps);
-            Transformer trans = TransformerFactory
-                .newInstance()
-                .newTransformer();
+            Transformer trans = TransformerFactory.newInstance().newTransformer();
             trans.setOutputProperty(OutputKeys.INDENT, "yes");
             trans.transform(source, result);
         } catch (Exception e) {
@@ -172,11 +150,8 @@ private static void exportOpenDocumentSpreadsheetXML(
         }
     }
 
-    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 1543647fde5..d340ed092bc 100644
--- a/src/main/java/org/jabref/logic/exporter/OpenOfficeDocumentCreator.java
+++ b/src/main/java/org/jabref/logic/exporter/OpenOfficeDocumentCreator.java
@@ -32,23 +32,16 @@
 
 public class OpenOfficeDocumentCreator extends Exporter {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(
-        OpenOfficeDocumentCreator.class
-    );
+    private static final Logger LOGGER = LoggerFactory.getLogger(OpenOfficeDocumentCreator.class);
 
     /**
      * Creates a new instance of OpenOfficeDocumentCreator
      */
     public OpenOfficeDocumentCreator() {
-        super(
-            "oocalc",
-            "Old OpenOffice/LibreOffice Calc format",
-            StandardFileType.SXC
-        );
+        super("oocalc", "Old OpenOffice/LibreOffice Calc format", StandardFileType.SXC);
     }
 
-    private static void storeOpenOfficeFile(Path file, InputStream source)
-        throws Exception {
+    private static void storeOpenOfficeFile(Path file, InputStream source) throws Exception {
         try (
             ZipOutputStream out = new ZipOutputStream(
                 new BufferedOutputStream(Files.newOutputStream(file))
@@ -89,18 +82,10 @@ private static void exportOpenOfficeCalc(
     ) throws Exception {
         // First store the xml formatted content to a temporary file.
         File tmpFile = File.createTempFile("oocalc", null);
-        OpenOfficeDocumentCreator.exportOpenOfficeCalcXML(
-            tmpFile,
-            database,
-            entries
-        );
+        OpenOfficeDocumentCreator.exportOpenOfficeCalcXML(tmpFile, database, entries);
 
         // Then add the content to the zip file:
-        try (
-            BufferedInputStream in = new BufferedInputStream(
-                new FileInputStream(tmpFile)
-            )
-        ) {
+        try (BufferedInputStream in = new BufferedInputStream(new FileInputStream(tmpFile))) {
             OpenOfficeDocumentCreator.storeOpenOfficeFile(file, in);
         }
 
@@ -142,9 +127,7 @@ private static void exportOpenOfficeCalcXML(
         ) {
             DOMSource source = new DOMSource(od.getDOMrepresentation());
             StreamResult result = new StreamResult(ps);
-            Transformer trans = TransformerFactory
-                .newInstance()
-                .newTransformer();
+            Transformer trans = TransformerFactory.newInstance().newTransformer();
             trans.setOutputProperty(OutputKeys.INDENT, "yes");
             trans.transform(source, result);
         } catch (Exception e) {
@@ -152,11 +135,8 @@ private static void exportOpenOfficeCalcXML(
         }
     }
 
-    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 76b6ab52dec..40d034d4eb6 100644
--- a/src/main/java/org/jabref/logic/exporter/SaveConfiguration.java
+++ b/src/main/java/org/jabref/logic/exporter/SaveConfiguration.java
@@ -61,9 +61,7 @@ public BibDatabaseWriter.SaveType getSaveType() {
         return saveType;
     }
 
-    public SaveConfiguration withSaveType(
-        BibDatabaseWriter.SaveType newSaveType
-    ) {
+    public SaveConfiguration withSaveType(BibDatabaseWriter.SaveType newSaveType) {
         this.saveType = newSaveType;
         return this;
     }
diff --git a/src/main/java/org/jabref/logic/exporter/SaveException.java b/src/main/java/org/jabref/logic/exporter/SaveException.java
index a1104b8a921..a07ce8191b2 100644
--- a/src/main/java/org/jabref/logic/exporter/SaveException.java
+++ b/src/main/java/org/jabref/logic/exporter/SaveException.java
@@ -11,9 +11,7 @@ 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."
-        )
+        Localization.lang("Could not save, file locked by another JabRef instance.")
     );
     public static final SaveException BACKUP_CREATION = new SaveException(
         "Unable to create backup",
@@ -51,12 +49,7 @@ public SaveException(String message, BibEntry entry) {
         this.entry = entry;
     }
 
-    public SaveException(
-        String message,
-        String localizedMessage,
-        BibEntry entry,
-        Throwable base
-    ) {
+    public SaveException(String message, String localizedMessage, BibEntry entry, Throwable base) {
         super(message, base);
         this.localizedMessage = localizedMessage;
         this.entry = entry;
diff --git a/src/main/java/org/jabref/logic/exporter/TemplateExporter.java b/src/main/java/org/jabref/logic/exporter/TemplateExporter.java
index b3045a24842..78faccc660e 100644
--- a/src/main/java/org/jabref/logic/exporter/TemplateExporter.java
+++ b/src/main/java/org/jabref/logic/exporter/TemplateExporter.java
@@ -44,9 +44,7 @@ public class TemplateExporter extends Exporter {
     private static final String BEGIN_INFIX = ".begin";
     private static final String END_INFIX = ".end";
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(
-        TemplateExporter.class
-    );
+    private static final Logger LOGGER = LoggerFactory.getLogger(TemplateExporter.class);
 
     private final String lfFileName;
     private final String directory;
@@ -71,16 +69,7 @@ public TemplateExporter(
         String directory,
         FileType extension
     ) {
-        this(
-            displayName,
-            consoleName,
-            lfFileName,
-            directory,
-            extension,
-            null,
-            null,
-            null
-        );
+        this(displayName, consoleName, lfFileName, directory, extension, null, null, null);
     }
 
     /**
@@ -162,17 +151,13 @@ public TemplateExporter(
         super(consoleName, displayName, extension);
         if (Objects.requireNonNull(lfFileName).endsWith(LAYOUT_EXTENSION)) {
             this.lfFileName =
-                lfFileName.substring(
-                    0,
-                    lfFileName.length() - LAYOUT_EXTENSION.length()
-                );
+                lfFileName.substring(0, lfFileName.length() - LAYOUT_EXTENSION.length());
         } else {
             this.lfFileName = lfFileName;
         }
         this.directory = directory;
         this.layoutPreferences = layoutPreferences;
-        this.saveOrder =
-            saveOrder == null ? SaveOrder.getDefaultSaveOrder() : saveOrder;
+        this.saveOrder = saveOrder == null ? SaveOrder.getDefaultSaveOrder() : saveOrder;
         this.blankLineBehaviour = blankLineBehaviour;
     }
 
@@ -225,11 +210,8 @@ private Reader getReader(String filename) throws IOException {
     }
 
     @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 {
         export(
             databaseContext,
             file,
@@ -266,11 +248,7 @@ public void export(
             List<String> missingFormatters = new ArrayList<>(1);
 
             // Print header
-            try (
-                Reader reader = getReader(
-                    lfFileName + BEGIN_INFIX + LAYOUT_EXTENSION
-                )
-            ) {
+            try (Reader reader = getReader(lfFileName + BEGIN_INFIX + LAYOUT_EXTENSION)) {
                 LayoutHelper layoutHelper = new LayoutHelper(
                     reader,
                     fileDirForDatabase,
@@ -292,10 +270,7 @@ public void export(
              * Write database entries; entries will be sorted as they appear on the
              * screen, or sorted by author, depending on Preferences.
              */
-            List<BibEntry> sorted = BibDatabaseWriter.getSortedEntries(
-                entries,
-                saveOrder
-            );
+            List<BibEntry> sorted = BibDatabaseWriter.getSortedEntries(entries, saveOrder);
 
             // Load default layout
             Layout defLayout;
@@ -313,10 +288,7 @@ public void export(
             if (defLayout != null) {
                 missingFormatters.addAll(defLayout.getMissingFormatters());
                 if (!missingFormatters.isEmpty()) {
-                    LOGGER.warn(
-                        "Missing formatters found: {}",
-                        missingFormatters
-                    );
+                    LOGGER.warn("Missing formatters found: {}", missingFormatters);
                 }
             }
             Map<EntryType, Layout> layouts = new HashMap<>();
@@ -346,9 +318,7 @@ public void export(
                         layout = layoutHelper.getLayoutFromText();
                         layouts.put(type, layout);
                         if (layout != null) {
-                            missingFormatters.addAll(
-                                layout.getMissingFormatters()
-                            );
+                            missingFormatters.addAll(layout.getMissingFormatters());
                         }
                     } catch (IOException ex) {
                         // The exception indicates that no type-specific layout
@@ -360,9 +330,7 @@ public void export(
 
                 // Write the entry
                 if (layout != null) {
-                    if (
-                        blankLineBehaviour == BlankLineBehaviour.DELETE_BLANKS
-                    ) {
+                    if (blankLineBehaviour == BlankLineBehaviour.DELETE_BLANKS) {
                         String[] lines = layout
                             .doLayout(entry, databaseContext.getDatabase())
                             .split(BLANK_LINE_PATTERN);
@@ -372,23 +340,14 @@ public void export(
                             }
                         }
                     } else {
-                        ps.write(
-                            layout.doLayout(
-                                entry,
-                                databaseContext.getDatabase()
-                            )
-                        );
+                        ps.write(layout.doLayout(entry, databaseContext.getDatabase()));
                     }
                 }
             }
 
             // Print footer
             Layout endLayout = null;
-            try (
-                Reader reader = getReader(
-                    lfFileName + END_INFIX + LAYOUT_EXTENSION
-                )
-            ) {
+            try (Reader reader = getReader(lfFileName + END_INFIX + LAYOUT_EXTENSION)) {
                 layoutHelper =
                     new LayoutHelper(
                         reader,
@@ -411,10 +370,7 @@ public void export(
             layoutPreferences.clearCustomExportNameFormatters();
 
             if (!missingFormatters.isEmpty() && LOGGER.isWarnEnabled()) {
-                LOGGER.warn(
-                    "Formatters {} not found",
-                    String.join(", ", missingFormatters)
-                );
+                LOGGER.warn("Formatters {} not found", String.join(", ", missingFormatters));
             }
         }
     }
@@ -426,12 +382,7 @@ public void export(
     private void readFormatterFile() {
         Path formatterFile = Path.of(lfFileName + FORMATTERS_EXTENSION);
         if (Files.exists(formatterFile)) {
-            try (
-                Reader in = Files.newBufferedReader(
-                    formatterFile,
-                    StandardCharsets.UTF_8
-                )
-            ) {
+            try (Reader in = Files.newBufferedReader(formatterFile, StandardCharsets.UTF_8)) {
                 // Ok, we found and opened the file. Read all contents:
                 StringBuilder sb = new StringBuilder();
                 int c;
@@ -450,10 +401,7 @@ private void readFormatterFile() {
                     if ((index > 0) && ((index + 1) < line.length())) {
                         String formatterName = line.substring(0, index);
                         String contents = line.substring(index + 1);
-                        layoutPreferences.putCustomExportNameFormatter(
-                            formatterName,
-                            contents
-                        );
+                        layoutPreferences.putCustomExportNameFormatter(formatterName, contents);
                     }
                 }
             } catch (IOException ex) {
diff --git a/src/main/java/org/jabref/logic/exporter/XmpExporter.java b/src/main/java/org/jabref/logic/exporter/XmpExporter.java
index 7c7e77445c3..7071cc5cdf4 100644
--- a/src/main/java/org/jabref/logic/exporter/XmpExporter.java
+++ b/src/main/java/org/jabref/logic/exporter/XmpExporter.java
@@ -35,11 +35,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);
@@ -50,13 +47,7 @@ public void export(
 
         // 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)
-        ) {
+        if (file.getFileName().toString().trim().equals(XMP_SPLIT_DIRECTORY_INDICATOR)) {
             for (BibEntry entry : entries) {
                 // Avoid situations, where two citation keys are null
                 Path entryFile;
@@ -77,8 +68,7 @@ public void export(
         }
     }
 
-    private void writeBibToXmp(Path file, List<BibEntry> entries)
-        throws IOException {
+    private void writeBibToXmp(Path file, List<BibEntry> entries) throws IOException {
         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 06b3bf050c7..321272ecbc3 100644
--- a/src/main/java/org/jabref/logic/exporter/XmpPdfExporter.java
+++ b/src/main/java/org/jabref/logic/exporter/XmpPdfExporter.java
@@ -21,27 +21,18 @@
 
 public class XmpPdfExporter extends Exporter {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(
-        XmpPdfExporter.class
-    );
+    private static final Logger LOGGER = LoggerFactory.getLogger(XmpPdfExporter.class);
 
     private final XmpPreferences xmpPreferences;
 
     public XmpPdfExporter(XmpPreferences xmpPreferences) {
-        super(
-            "pdf",
-            Localization.lang("XMP-annotated PDF"),
-            StandardFileType.PDF
-        );
+        super("pdf", Localization.lang("XMP-annotated PDF"), StandardFileType.PDF);
         this.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);
@@ -53,18 +44,10 @@ public void export(
                 PDPage page = new PDPage();
                 document.addPage(page);
 
-                try (
-                    PDPageContentStream contentStream = new PDPageContentStream(
-                        document,
-                        page
-                    )
-                ) {
+                try (PDPageContentStream contentStream = new PDPageContentStream(document, page)) {
                     contentStream.beginText();
                     contentStream.newLineAtOffset(25, 500);
-                    contentStream.setFont(
-                        new PDType1Font(Standard14Fonts.FontName.HELVETICA),
-                        12
-                    );
+                    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."
                     );
diff --git a/src/main/java/org/jabref/logic/externalfiles/ExternalFilesContentImporter.java b/src/main/java/org/jabref/logic/externalfiles/ExternalFilesContentImporter.java
index 7e1323f8383..ee7ec259868 100644
--- a/src/main/java/org/jabref/logic/externalfiles/ExternalFilesContentImporter.java
+++ b/src/main/java/org/jabref/logic/externalfiles/ExternalFilesContentImporter.java
@@ -12,29 +12,20 @@ public class ExternalFilesContentImporter {
 
     private final ImportFormatPreferences importFormatPreferences;
 
-    public ExternalFilesContentImporter(
-        ImportFormatPreferences importFormatPreferences
-    ) {
+    public ExternalFilesContentImporter(ImportFormatPreferences importFormatPreferences) {
         this.importFormatPreferences = importFormatPreferences;
     }
 
     public ParserResult importPDFContent(Path file) {
         try {
-            return new PdfMergeMetadataImporter(importFormatPreferences)
-                .importDatabase(file);
+            return new PdfMergeMetadataImporter(importFormatPreferences).importDatabase(file);
         } catch (IOException e) {
             return ParserResult.fromError(e);
         }
     }
 
-    public ParserResult importFromBibFile(
-        Path bibFile,
-        FileUpdateMonitor fileUpdateMonitor
-    ) throws IOException {
-        return OpenDatabase.loadDatabase(
-            bibFile,
-            importFormatPreferences,
-            fileUpdateMonitor
-        );
+    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 12a106994d6..e269087b92e 100644
--- a/src/main/java/org/jabref/logic/externalfiles/LinkedFileHandler.java
+++ b/src/main/java/org/jabref/logic/externalfiles/LinkedFileHandler.java
@@ -18,9 +18,7 @@
 
 public class LinkedFileHandler {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(
-        LinkedFileHandler.class
-    );
+    private static final Logger LOGGER = LoggerFactory.getLogger(LinkedFileHandler.class);
 
     private final BibDatabaseContext databaseContext;
     private final FilePreferences filePreferences;
@@ -41,16 +39,12 @@ public LinkedFileHandler(
     }
 
     public boolean moveToDefaultDirectory() throws IOException {
-        Optional<Path> targetDirectory =
-            databaseContext.getFirstExistingFileDir(filePreferences);
+        Optional<Path> targetDirectory = databaseContext.getFirstExistingFileDir(filePreferences);
         if (targetDirectory.isEmpty()) {
             return false;
         }
 
-        Optional<Path> oldFile = fileEntry.findIn(
-            databaseContext,
-            filePreferences
-        );
+        Optional<Path> oldFile = fileEntry.findIn(databaseContext, filePreferences);
         if (oldFile.isEmpty()) {
             // Could not find file
             return false;
@@ -95,14 +89,9 @@ public boolean renameToSuggestedName() throws IOException {
         return renameToName(getSuggestedFileName(), false);
     }
 
-    public boolean renameToName(
-        String targetFileName,
-        boolean overwriteExistingFile
-    ) throws IOException {
-        Optional<Path> oldFile = fileEntry.findIn(
-            databaseContext,
-            filePreferences
-        );
+    public boolean renameToName(String targetFileName, boolean overwriteExistingFile)
+        throws IOException {
+        Optional<Path> oldFile = fileEntry.findIn(databaseContext, filePreferences);
         if (oldFile.isEmpty()) {
             return false;
         }
@@ -117,11 +106,7 @@ public boolean renameToName(
 
         // 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
-        ) {
+        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,
@@ -130,11 +115,7 @@ public boolean renameToName(
             return false;
         }
 
-        if (
-            Files.exists(newPath) &&
-            !pathsDifferOnlyByCase &&
-            overwriteExistingFile
-        ) {
+        if (Files.exists(newPath) && !pathsDifferOnlyByCase && overwriteExistingFile) {
             Files.createDirectories(newPath.getParent());
             LOGGER.debug("Overwriting existing file {}", newPath);
             Files.move(oldPath, newPath, StandardCopyOption.REPLACE_EXISTING);
@@ -150,18 +131,14 @@ public boolean renameToName(
     }
 
     private String relativize(Path path) {
-        List<Path> fileDirectories = databaseContext.getFileDirectories(
-            filePreferences
-        );
+        List<Path> fileDirectories = databaseContext.getFileDirectories(filePreferences);
         return FileUtil.relativize(path, fileDirectories).toString();
     }
 
     public String getSuggestedFileName() {
         String oldFileName = fileEntry.getLink();
 
-        String extension = FileUtil
-            .getFileExtension(oldFileName)
-            .orElse(fileEntry.getFileType());
+        String extension = FileUtil.getFileExtension(oldFileName).orElse(fileEntry.getFileType());
         return getSuggestedFileName(extension);
     }
 
@@ -198,26 +175,17 @@ public Optional<Path> findExistingFile(
             .get()
             .getParent()
             .resolve(targetFileName);
-        Path oldFilePath = flEntry
-            .findIn(databaseContext, filePreferences)
-            .get();
+        Path oldFilePath = flEntry.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())
-                    )
+                    .filter(name -> name.toString().equalsIgnoreCase(targetFilePath.toString()))
                     .findFirst();
         } catch (IOException e) {
-            LOGGER.error(
-                "Could not get the list of files in target directory",
-                e
-            );
+            LOGGER.error("Could not get the list of files in target directory", e);
         }
         return matchedByDiffCase;
     }
diff --git a/src/main/java/org/jabref/logic/formatter/Formatters.java b/src/main/java/org/jabref/logic/formatter/Formatters.java
index 74df450768f..73968878594 100644
--- a/src/main/java/org/jabref/logic/formatter/Formatters.java
+++ b/src/main/java/org/jabref/logic/formatter/Formatters.java
@@ -38,9 +38,7 @@
 
 public class Formatters {
 
-    private static final Pattern TRUNCATE_PATTERN = Pattern.compile(
-        "\\Atruncate\\d+\\z"
-    );
+    private static final Pattern TRUNCATE_PATTERN = Pattern.compile("\\Atruncate\\d+\\z");
 
     private Formatters() {}
 
@@ -116,10 +114,7 @@ public static Optional<Formatter> getFormatterForModifier(String modifier) {
             int truncateAfter = Integer.parseInt(modifier.substring(8));
             return Optional.of(new TruncateFormatter(truncateAfter));
         } else {
-            return getAll()
-                .stream()
-                .filter(f -> f.getKey().equals(modifier))
-                .findAny();
+            return getAll().stream().filter(f -> f.getKey().equals(modifier)).findAny();
         }
     }
 }
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 567eec4ae92..d147b758065 100644
--- a/src/main/java/org/jabref/logic/formatter/bibtexfields/AddBracesFormatter.java
+++ b/src/main/java/org/jabref/logic/formatter/bibtexfields/AddBracesFormatter.java
@@ -34,9 +34,7 @@ public String format(String value) {
 
     @Override
     public String getDescription() {
-        return Localization.lang(
-            "Add braces encapsulating the complete field content."
-        );
+        return Localization.lang("Add braces encapsulating the complete field content.");
     }
 
     @Override
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 2b8fbd66e81..2532a22fd6b 100644
--- a/src/main/java/org/jabref/logic/formatter/bibtexfields/CleanupUrlFormatter.java
+++ b/src/main/java/org/jabref/logic/formatter/bibtexfields/CleanupUrlFormatter.java
@@ -18,9 +18,7 @@
 public class CleanupUrlFormatter extends Formatter {
 
     // This regexp find "url=" or "to=" parameter in full link and get text after them
-    private static final Pattern PATTERN_URL = Pattern.compile(
-        "(?:url|to)=([^&]*)"
-    );
+    private static final Pattern PATTERN_URL = Pattern.compile("(?:url|to)=([^&]*)");
 
     @Override
     public String getName() {
@@ -50,9 +48,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);
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 e401c6811ff..7f1f85aa770 100644
--- a/src/main/java/org/jabref/logic/formatter/bibtexfields/EscapeAmpersandsFormatter.java
+++ b/src/main/java/org/jabref/logic/formatter/bibtexfields/EscapeAmpersandsFormatter.java
@@ -37,9 +37,7 @@ public String format(String value) {
                 if (!inCommandOption) {
                     commandName.append(c);
                 }
-            } else if (
-                Character.isWhitespace(c) && (inCommand || inCommandOption)
-            ) {
+            } else if (Character.isWhitespace(c) && (inCommand || inCommandOption)) {
                 // Whitespace
             } else if (inCommandName) {
                 // This means the command name is ended.
@@ -63,9 +61,7 @@ public String format(String value) {
                 if ("begin".contentEquals(commandName)) {
                     nestedEnvironments++;
                 }
-                if (
-                    (nestedEnvironments > 0) && "end".contentEquals(commandName)
-                ) {
+                if ((nestedEnvironments > 0) && "end".contentEquals(commandName)) {
                     nestedEnvironments--;
                 }
 
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 445cf04aeb5..c27e9cc080f 100644
--- a/src/main/java/org/jabref/logic/formatter/bibtexfields/EscapeDollarSignFormatter.java
+++ b/src/main/java/org/jabref/logic/formatter/bibtexfields/EscapeDollarSignFormatter.java
@@ -20,10 +20,7 @@ public String getKey() {
     @Override
     public String format(String value) {
         Objects.requireNonNull(value);
-        return value.replaceAll(
-            "(?<!\\\\)\\$",
-            Matcher.quoteReplacement("\\$")
-        );
+        return value.replaceAll("(?<!\\\\)\\$", Matcher.quoteReplacement("\\$"));
     }
 
     @Override
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 eb7b255be3e..68acb046e02 100644
--- a/src/main/java/org/jabref/logic/formatter/bibtexfields/HtmlToLatexFormatter.java
+++ b/src/main/java/org/jabref/logic/formatter/bibtexfields/HtmlToLatexFormatter.java
@@ -13,15 +13,11 @@
 
 public class HtmlToLatexFormatter extends Formatter implements LayoutFormatter {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(
-        HtmlToLatexFormatter.class
-    );
+    private static final Logger LOGGER = LoggerFactory.getLogger(HtmlToLatexFormatter.class);
 
     private static final int MAX_TAG_LENGTH = 100;
 
-    private static final Pattern ESCAPED_PATTERN = Pattern.compile(
-        "&#([x]*)([0]*)(\\p{XDigit}+);"
-    );
+    private static final Pattern ESCAPED_PATTERN = Pattern.compile("&#([x]*)([0]*)(\\p{XDigit}+);");
     private static final Pattern ESCAPED_PATTERN2 = Pattern.compile(
         "(.)&#([x]*)([0]*)(\\p{XDigit}+);"
     );
@@ -40,16 +36,8 @@ public String format(String text) {
 
         StringBuilder sb = new StringBuilder();
         // 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\\}"
-            );
+        result = result.replaceAll("<[ ]?sup>([^<]+)</sup>", "\\\\textsuperscript\\{$1\\}");
+        result = result.replaceAll("<[ ]?sub>([^<]+)</sub>", "\\\\textsubscript\\{$1\\}");
 
         // TODO: maybe rewrite this based on regular expressions instead
         // Note that (at least) the IEEE Xplore fetcher must be fixed as it relies on the current way to
@@ -71,15 +59,12 @@ public String format(String text) {
         result = sb.toString();
 
         // Handle text based HTML entities
-        Set<String> patterns =
-            HTMLUnicodeConversionMaps.HTML_LATEX_CONVERSION_MAP.keySet();
+        Set<String> patterns = HTMLUnicodeConversionMaps.HTML_LATEX_CONVERSION_MAP.keySet();
         for (String pattern : patterns) {
             result =
                 result.replace(
                     pattern,
-                    HTMLUnicodeConversionMaps.HTML_LATEX_CONVERSION_MAP.get(
-                        pattern
-                    )
+                    HTMLUnicodeConversionMaps.HTML_LATEX_CONVERSION_MAP.get(pattern)
                 );
         }
 
@@ -87,17 +72,11 @@ public String format(String text) {
         Matcher m = ESCAPED_PATTERN.matcher(result);
         while (m.find()) {
             int num = Integer.decode(m.group(1).replace("x", "#") + m.group(3));
-            if (
-                HTMLUnicodeConversionMaps.NUMERICAL_LATEX_CONVERSION_MAP.containsKey(
-                    num
-                )
-            ) {
+            if (HTMLUnicodeConversionMaps.NUMERICAL_LATEX_CONVERSION_MAP.containsKey(num)) {
                 result =
                     result.replace(
                         "&#" + m.group(1) + m.group(2) + m.group(3) + ";",
-                        HTMLUnicodeConversionMaps.NUMERICAL_LATEX_CONVERSION_MAP.get(
-                            num
-                        )
+                        HTMLUnicodeConversionMaps.NUMERICAL_LATEX_CONVERSION_MAP.get(num)
                     );
             }
         }
@@ -110,38 +89,19 @@ public String format(String text) {
                 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}}"
+                            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}}"
+                            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) +
-                            ";",
+                            m.group(1) + "&#" + m.group(2) + m.group(3) + m.group(4) + ";",
                             "{\\" +
                             HTMLUnicodeConversionMaps.ESCAPED_ACCENTS.get(num) +
                             "{" +
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 27fc6839c07..2b05b93197a 100644
--- a/src/main/java/org/jabref/logic/formatter/bibtexfields/HtmlToUnicodeFormatter.java
+++ b/src/main/java/org/jabref/logic/formatter/bibtexfields/HtmlToUnicodeFormatter.java
@@ -7,9 +7,7 @@
 import org.jabref.logic.layout.LayoutFormatter;
 
 @ApacheCommonsLang3Allowed("There is no equivalent in Google's Guava")
-public class HtmlToUnicodeFormatter
-    extends Formatter
-    implements LayoutFormatter {
+public class HtmlToUnicodeFormatter extends Formatter implements LayoutFormatter {
 
     @Override
     public String getName() {
@@ -34,8 +32,6 @@ public String getExampleInput() {
     @Override
     public String format(String fieldText) {
         // StringEscapeUtils converts characters and regex kills tags
-        return StringEscapeUtils
-            .unescapeHtml4(fieldText)
-            .replaceAll("<[^>]*>", "");
+        return StringEscapeUtils.unescapeHtml4(fieldText).replaceAll("<[^>]*>", "");
     }
 }
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 db79317b5fd..0924b1921ac 100644
--- a/src/main/java/org/jabref/logic/formatter/bibtexfields/LatexCleanupFormatter.java
+++ b/src/main/java/org/jabref/logic/formatter/bibtexfields/LatexCleanupFormatter.java
@@ -13,20 +13,15 @@ public class LatexCleanupFormatter extends Formatter {
         "(?<!\\\\[\\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 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 ESCAPE_PERCENT_SIGN_ONCE = Pattern.compile(
-        "(^|[^\\\\%])%"
+    private static final Pattern MOVE_NUMBERS_RIGHT_INTO_EQUATION = Pattern.compile(
+        "@@([ ]?[-+/]?[ ]?[0-9\\)\\.]+)"
     );
+    private static final Pattern ESCAPE_PERCENT_SIGN_ONCE = Pattern.compile("(^|[^\\\\%])%");
 
     @Override
     public String getName() {
@@ -49,24 +44,18 @@ public String format(String oldString) {
         // 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 = 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 = 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/NormalizeMonthFormatter.java b/src/main/java/org/jabref/logic/formatter/bibtexfields/NormalizeMonthFormatter.java
index 1e2d7dd630b..d6926ae2312 100644
--- a/src/main/java/org/jabref/logic/formatter/bibtexfields/NormalizeMonthFormatter.java
+++ b/src/main/java/org/jabref/logic/formatter/bibtexfields/NormalizeMonthFormatter.java
@@ -27,9 +27,7 @@ public String format(String value) {
 
     @Override
     public String getDescription() {
-        return Localization.lang(
-            "Normalize month to BibTeX standard abbreviation."
-        );
+        return Localization.lang("Normalize month to BibTeX standard abbreviation.");
     }
 
     @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 809967719b6..21ba49f8785 100644
--- a/src/main/java/org/jabref/logic/formatter/bibtexfields/NormalizeNamesFormatter.java
+++ b/src/main/java/org/jabref/logic/formatter/bibtexfields/NormalizeNamesFormatter.java
@@ -29,9 +29,7 @@ public String format(String nameList) {
 
     @Override
     public String getDescription() {
-        return Localization.lang(
-            "Normalizes lists of persons to the BibTeX standard."
-        );
+        return Localization.lang("Normalizes lists of persons to the BibTeX standard.");
     }
 
     @Override
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 07007cbe411..fd9509d0b9c 100644
--- a/src/main/java/org/jabref/logic/formatter/bibtexfields/NormalizePagesFormatter.java
+++ b/src/main/java/org/jabref/logic/formatter/bibtexfields/NormalizePagesFormatter.java
@@ -35,15 +35,10 @@
  */
 public class NormalizePagesFormatter extends Formatter {
 
-    private static final Pattern EM_EN_DASH_PATTERN = Pattern.compile(
-        "\u2013|\u2014"
-    );
-    private static final Pattern DASHES_DETECT_PATTERN = Pattern.compile(
-        "[ ]*-+[ ]*"
-    );
+    private static final Pattern EM_EN_DASH_PATTERN = Pattern.compile("\u2013|\u2014");
+    private static final Pattern DASHES_DETECT_PATTERN = Pattern.compile("[ ]*-+[ ]*");
 
-    private final Formatter unprotectTermsFormatter =
-        new UnprotectTermsFormatter();
+    private final Formatter unprotectTermsFormatter = new UnprotectTermsFormatter();
 
     @Override
     public String getName() {
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 4d22b127c68..5ca85a16b6a 100644
--- a/src/main/java/org/jabref/logic/formatter/bibtexfields/OrdinalsToSuperscriptFormatter.java
+++ b/src/main/java/org/jabref/logic/formatter/bibtexfields/OrdinalsToSuperscriptFormatter.java
@@ -17,8 +17,7 @@ public class OrdinalsToSuperscriptFormatter extends Formatter {
         Pattern.CASE_INSENSITIVE | Pattern.MULTILINE
     );
 
-    private static final String SUPERSCRIPT_REPLACE_PATTERN =
-        "$1\\\\textsuperscript{$2}";
+    private static final String SUPERSCRIPT_REPLACE_PATTERN = "$1\\\\textsuperscript{$2}";
 
     @Override
     public String getName() {
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 10df86ab84a..fc8b8e241cb 100644
--- a/src/main/java/org/jabref/logic/formatter/bibtexfields/RegexFormatter.java
+++ b/src/main/java/org/jabref/logic/formatter/bibtexfields/RegexFormatter.java
@@ -14,22 +14,14 @@
 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(
-        "\\\\\\}"
-    );
+    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 Pattern ENCLOSED_IN_CURLY_BRACES = Pattern.compile("\\{.*?}");
     private static final String REGEX_CAPTURING_GROUP = "regex";
     private static final String REPLACEMENT_CAPTURING_GROUP = "replacement";
     /**
@@ -44,12 +36,9 @@ public class RegexFormatter extends Formatter {
         ">.*)\"\\)$"
     );
     // 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');
-    private static final String PLACEHOLDER_FOR_CLOSING_CURLY_BRACE =
-        Character.toString('\u0A16');
+    private static final String PLACEHOLDER_FOR_PROTECTED_GROUP = Character.toString('\u0A14');
+    private static final String PLACEHOLDER_FOR_OPENING_CURLY_BRACE = Character.toString('\u0A15');
+    private static final String PLACEHOLDER_FOR_CLOSING_CURLY_BRACE = Character.toString('\u0A16');
     private final String regex;
     private final String replacement;
 
@@ -65,8 +54,7 @@ public RegexFormatter(String input) {
         Matcher constructorArgument = CONSTRUCTOR_ARGUMENT.matcher(input);
         if (constructorArgument.matches()) {
             regex = constructorArgument.group(REGEX_CAPTURING_GROUP);
-            replacement =
-                constructorArgument.group(REPLACEMENT_CAPTURING_GROUP);
+            replacement = constructorArgument.group(REPLACEMENT_CAPTURING_GROUP);
         } else {
             regex = null;
             replacement = null;
@@ -91,9 +79,7 @@ private String replaceHonoringProtectedGroups(final String input) {
         while (matcher.find()) {
             replaced.add(matcher.group());
         }
-        String workingString = matcher.replaceAll(
-            PLACEHOLDER_FOR_PROTECTED_GROUP
-        );
+        String workingString = matcher.replaceAll(PLACEHOLDER_FOR_PROTECTED_GROUP);
         try {
             workingString = workingString.replaceAll(regex, replacement);
         } catch (PatternSyntaxException e) {
@@ -106,8 +92,7 @@ private String replaceHonoringProtectedGroups(final String input) {
         }
 
         for (String r : replaced) {
-            workingString =
-                workingString.replaceFirst(PLACEHOLDER_FOR_PROTECTED_GROUP, r);
+            workingString = workingString.replaceFirst(PLACEHOLDER_FOR_PROTECTED_GROUP, r);
         }
         return workingString;
     }
@@ -119,9 +104,7 @@ public String format(final String input) {
             return input;
         }
 
-        Matcher escapedOpeningCurlyBrace = ESCAPED_OPENING_CURLY_BRACE.matcher(
-            input
-        );
+        Matcher escapedOpeningCurlyBrace = ESCAPED_OPENING_CURLY_BRACE.matcher(input);
         String inputWithPlaceholder = escapedOpeningCurlyBrace.replaceAll(
             PLACEHOLDER_FOR_OPENING_CURLY_BRACE
         );
@@ -130,13 +113,9 @@ public String format(final String input) {
             inputWithPlaceholder
         );
         inputWithPlaceholder =
-            escapedClosingCurlyBrace.replaceAll(
-                PLACEHOLDER_FOR_CLOSING_CURLY_BRACE
-            );
+            escapedClosingCurlyBrace.replaceAll(PLACEHOLDER_FOR_CLOSING_CURLY_BRACE);
 
-        final String regexMatchesReplaced = replaceHonoringProtectedGroups(
-            inputWithPlaceholder
-        );
+        final String regexMatchesReplaced = replaceHonoringProtectedGroups(inputWithPlaceholder);
 
         return regexMatchesReplaced
             .replaceAll(PLACEHOLDER_FOR_OPENING_CURLY_BRACE, "\\\\{")
@@ -145,9 +124,7 @@ public String format(final String input) {
 
     @Override
     public String getDescription() {
-        return Localization.lang(
-            "Add a regular expression for the key pattern."
-        );
+        return Localization.lang("Add a regular expression for the key pattern.");
     }
 
     @Override
diff --git a/src/main/java/org/jabref/logic/formatter/bibtexfields/RemoveBracesFormatter.java b/src/main/java/org/jabref/logic/formatter/bibtexfields/RemoveBracesFormatter.java
index 9e204e4bdcf..24a108d4439 100644
--- a/src/main/java/org/jabref/logic/formatter/bibtexfields/RemoveBracesFormatter.java
+++ b/src/main/java/org/jabref/logic/formatter/bibtexfields/RemoveBracesFormatter.java
@@ -42,9 +42,7 @@ public String format(String value) {
 
     @Override
     public String getDescription() {
-        return Localization.lang(
-            "Removes braces encapsulating the complete field content."
-        );
+        return Localization.lang("Removes braces encapsulating the complete field content.");
     }
 
     @Override
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 18c991ccd35..af720bd7fc4 100644
--- a/src/main/java/org/jabref/logic/formatter/bibtexfields/RemoveHyphenatedNewlinesFormatter.java
+++ b/src/main/java/org/jabref/logic/formatter/bibtexfields/RemoveHyphenatedNewlinesFormatter.java
@@ -32,9 +32,7 @@ public String format(String value) {
 
     @Override
     public String getDescription() {
-        return Localization.lang(
-            "Removes all hyphenated line breaks in the field content."
-        );
+        return Localization.lang("Removes all hyphenated line breaks in the field content.");
     }
 
     @Override
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 538d563f40b..c9148d19c35 100644
--- a/src/main/java/org/jabref/logic/formatter/bibtexfields/RemoveNewlinesFormatter.java
+++ b/src/main/java/org/jabref/logic/formatter/bibtexfields/RemoveNewlinesFormatter.java
@@ -32,9 +32,7 @@ public String format(String value) {
 
     @Override
     public String getDescription() {
-        return Localization.lang(
-            "Removes all line breaks in the field content."
-        );
+        return Localization.lang("Removes all line breaks in the field content.");
     }
 
     @Override
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 d5f1c1d7401..49e59adb98c 100644
--- a/src/main/java/org/jabref/logic/formatter/bibtexfields/ReplaceTabsBySpaceFormater.java
+++ b/src/main/java/org/jabref/logic/formatter/bibtexfields/ReplaceTabsBySpaceFormater.java
@@ -30,9 +30,7 @@ public String format(String value) {
 
     @Override
     public String getDescription() {
-        return Localization.lang(
-            "Replace tabs with space in the field content."
-        );
+        return Localization.lang("Replace tabs with space in the field content.");
     }
 
     @Override
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 bf9361fb36c..1d7281a348d 100644
--- a/src/main/java/org/jabref/logic/formatter/bibtexfields/ShortenDOIFormatter.java
+++ b/src/main/java/org/jabref/logic/formatter/bibtexfields/ShortenDOIFormatter.java
@@ -13,9 +13,7 @@
 
 public class ShortenDOIFormatter extends Formatter {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(
-        ShortenDOIFormatter.class
-    );
+    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();
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 034b90450dc..c46fdfc3687 100644
--- a/src/main/java/org/jabref/logic/formatter/bibtexfields/TrimWhitespaceFormatter.java
+++ b/src/main/java/org/jabref/logic/formatter/bibtexfields/TrimWhitespaceFormatter.java
@@ -27,9 +27,7 @@ public String format(String value) {
 
     @Override
     public String getDescription() {
-        return Localization.lang(
-            "Trim all whitespace characters in the field content."
-        );
+        return Localization.lang("Trim all whitespace characters in the field content.");
     }
 
     @Override
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 fe5c86799b0..aaf2695a7bf 100644
--- a/src/main/java/org/jabref/logic/formatter/bibtexfields/UnicodeToLatexFormatter.java
+++ b/src/main/java/org/jabref/logic/formatter/bibtexfields/UnicodeToLatexFormatter.java
@@ -9,13 +9,9 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-public class UnicodeToLatexFormatter
-    extends Formatter
-    implements LayoutFormatter {
+public class UnicodeToLatexFormatter extends Formatter implements LayoutFormatter {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(
-        UnicodeToLatexFormatter.class
-    );
+    private static final Logger LOGGER = LoggerFactory.getLogger(UnicodeToLatexFormatter.class);
 
     @Override
     public String format(String text) {
@@ -30,11 +26,7 @@ public String format(String text) {
             String,
             String
         > unicodeLatexPair : HTMLUnicodeConversionMaps.UNICODE_LATEX_CONVERSION_MAP.entrySet()) {
-            result =
-                result.replace(
-                    unicodeLatexPair.getKey(),
-                    unicodeLatexPair.getValue()
-                );
+            result = result.replace(unicodeLatexPair.getKey(), unicodeLatexPair.getValue());
         }
 
         // Combining accents
@@ -44,9 +36,7 @@ public String format(String text) {
             if (!consumed && (i < (result.length() - 1))) {
                 int cpCurrent = result.codePointAt(i);
                 Integer cpNext = result.codePointAt(i + 1);
-                String code = HTMLUnicodeConversionMaps.ESCAPED_ACCENTS.get(
-                    cpNext
-                );
+                String code = HTMLUnicodeConversionMaps.ESCAPED_ACCENTS.get(cpNext);
                 if (code == null) {
                     // skip next index to avoid reading surrogate as a separate char
                     if (!Character.isBmpCodePoint(cpCurrent)) {
@@ -54,12 +44,7 @@ public String format(String text) {
                     }
                     sb.appendCodePoint(cpCurrent);
                 } else {
-                    sb
-                        .append("{\\")
-                        .append(code)
-                        .append('{')
-                        .append((char) cpCurrent)
-                        .append("}}");
+                    sb.append("{\\").append(code).append('{').append((char) cpCurrent).append("}}");
                     consumed = true;
                 }
             } else {
@@ -83,9 +68,7 @@ public String format(String text) {
 
     @Override
     public String getDescription() {
-        return Localization.lang(
-            "Converts Unicode characters to LaTeX encoding."
-        );
+        return Localization.lang("Converts Unicode characters to LaTeX encoding.");
     }
 
     @Override
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 6c67f2acd3c..c0d832cc7e1 100644
--- a/src/main/java/org/jabref/logic/formatter/bibtexfields/UnitsToLatexFormatter.java
+++ b/src/main/java/org/jabref/logic/formatter/bibtexfields/UnitsToLatexFormatter.java
@@ -102,10 +102,7 @@ public String format(String text) {
         }
 
         // 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"
-        );
+        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
         result = result.replaceAll("([0-9,\\.]+) ([Bb][Ii][Tt])", "$1~$2");
@@ -113,18 +110,9 @@ public String format(String text) {
         // 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
+            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/SentenceCaseFormatter.java b/src/main/java/org/jabref/logic/formatter/casechanger/SentenceCaseFormatter.java
index c7b2cbe6a55..85b73b2545f 100644
--- a/src/main/java/org/jabref/logic/formatter/casechanger/SentenceCaseFormatter.java
+++ b/src/main/java/org/jabref/logic/formatter/casechanger/SentenceCaseFormatter.java
@@ -37,9 +37,7 @@ public String format(String input) {
 
     @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/Title.java b/src/main/java/org/jabref/logic/formatter/casechanger/Title.java
index aa5a090fdef..30c8a2aeb37 100644
--- a/src/main/java/org/jabref/logic/formatter/casechanger/Title.java
+++ b/src/main/java/org/jabref/logic/formatter/casechanger/Title.java
@@ -37,9 +37,6 @@ public Optional<Word> getLastWord() {
 
     @Override
     public String toString() {
-        return words
-            .stream()
-            .map(Word::toString)
-            .collect(Collectors.joining(" "));
+        return words.stream().map(Word::toString).collect(Collectors.joining(" "));
     }
 }
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 30b4a647794..17baf6f5043 100644
--- a/src/main/java/org/jabref/logic/formatter/casechanger/TitleCaseFormatter.java
+++ b/src/main/java/org/jabref/logic/formatter/casechanger/TitleCaseFormatter.java
@@ -30,11 +30,7 @@ public String format(String input) {
             .map(sentence -> {
                 Title title = new Title(sentence);
 
-                title
-                    .getWords()
-                    .stream()
-                    .filter(Word::isSmallerWord)
-                    .forEach(Word::toLowerCase);
+                title.getWords().stream().filter(Word::isSmallerWord).forEach(Word::toLowerCase);
                 title
                     .getWords()
                     .stream()
diff --git a/src/main/java/org/jabref/logic/formatter/casechanger/TitleParser.java b/src/main/java/org/jabref/logic/formatter/casechanger/TitleParser.java
index 16869ac7300..3e02a7c1fc5 100644
--- a/src/main/java/org/jabref/logic/formatter/casechanger/TitleParser.java
+++ b/src/main/java/org/jabref/logic/formatter/casechanger/TitleParser.java
@@ -46,13 +46,7 @@ private Optional<Word> createWord(boolean[] isProtected) {
         char[] chars = buffer.toString().toCharArray();
         boolean[] protectedChars = new boolean[chars.length];
 
-        System.arraycopy(
-            isProtected,
-            wordStart,
-            protectedChars,
-            0,
-            chars.length
-        );
+        System.arraycopy(isProtected, wordStart, protectedChars, 0, chars.length);
 
         reset();
 
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 b4cc6ad9844..c5cee466835 100644
--- a/src/main/java/org/jabref/logic/formatter/casechanger/UnprotectTermsFormatter.java
+++ b/src/main/java/org/jabref/logic/formatter/casechanger/UnprotectTermsFormatter.java
@@ -41,9 +41,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/Word.java b/src/main/java/org/jabref/logic/formatter/casechanger/Word.java
index b3beabfb6fa..fe4bb983089 100644
--- a/src/main/java/org/jabref/logic/formatter/casechanger/Word.java
+++ b/src/main/java/org/jabref/logic/formatter/casechanger/Word.java
@@ -29,9 +29,7 @@ public final class Word {
         Set<String> conjunctions = new HashSet<>();
 
         // Conjunctions used as part of Title case capitalisation to specifically check if word is conjunction or not
-        conjunctions.addAll(
-            Arrays.asList("and", "but", "for", "nor", "or", "so", "yet")
-        );
+        conjunctions.addAll(Arrays.asList("and", "but", "for", "nor", "or", "so", "yet"));
         // Articles
         smallerWords.addAll(Arrays.asList("a", "an", "the"));
         // Prepositions
@@ -172,9 +170,7 @@ 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]);
+                    i == 0 ? Character.toUpperCase(chars[i]) : Character.toLowerCase(chars[i]);
             }
         }
     }
@@ -194,9 +190,7 @@ 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))
+                    i == 0 || (DASHES.contains(chars[i - 1]) && isConjunction(chars, i))
                         ? Character.toUpperCase(chars[i])
                         : Character.toLowerCase(chars[i]);
             }
@@ -225,9 +219,7 @@ public void stripConsonants() {
 
     public boolean isSmallerWord() {
         // "word:" is still a small "word"
-        return SMALLER_WORDS.contains(
-            this.toString().replace(":", "").toLowerCase(Locale.ROOT)
-        );
+        return SMALLER_WORDS.contains(this.toString().replace(":", "").toLowerCase(Locale.ROOT));
     }
 
     public boolean isLargerWord() {
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 7d6fac3a284..2f83841a533 100644
--- a/src/main/java/org/jabref/logic/formatter/minifier/MinifyNameListFormatter.java
+++ b/src/main/java/org/jabref/logic/formatter/minifier/MinifyNameListFormatter.java
@@ -68,10 +68,7 @@ private String abbreviateAuthor(String authorField) {
         }
 
         // already abbreviated
-        if (
-            "others".equals(authors[authors.length - 1]) &&
-            (authors.length == 2)
-        ) {
+        if ("others".equals(authors[authors.length - 1]) && (authors.length == 2)) {
             return authorField;
         }
 
diff --git a/src/main/java/org/jabref/logic/git/GitHandler.java b/src/main/java/org/jabref/logic/git/GitHandler.java
index da372baf7b7..69e8d3c50e7 100644
--- a/src/main/java/org/jabref/logic/git/GitHandler.java
+++ b/src/main/java/org/jabref/logic/git/GitHandler.java
@@ -27,14 +27,12 @@ public class GitHandler {
     static final Logger LOGGER = LoggerFactory.getLogger(GitHandler.class);
     final Path repositoryPath;
     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);
+    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
+    );
 
     /**
      * Initialize the handler for the given repository
@@ -46,22 +44,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) {
@@ -75,9 +65,7 @@ void setupGitIgnore() {
             Path gitignore = Path.of(repositoryPath.toString(), ".gitignore");
             if (!Files.exists(gitignore)) {
                 FileUtil.copyFile(
-                    Path.of(
-                        this.getClass().getResource("git.gitignore").toURI()
-                    ),
+                    Path.of(this.getClass().getResource("git.gitignore").toURI()),
                     gitignore,
                     false
                 );
@@ -104,8 +92,7 @@ boolean isGitRepository() {
      *
      * @param branchToCheckout Name of the branch to check out
      */
-    public void checkoutBranch(String branchToCheckout)
-        throws IOException, GitAPIException {
+    public void checkoutBranch(String branchToCheckout) throws IOException, GitAPIException {
         try (Git git = Git.open(this.repositoryPathAsFile)) {
             Optional<Ref> branch = getRefForBranch(branchToCheckout);
             git
@@ -121,8 +108,7 @@ public void checkoutBranch(String branchToCheckout)
      * Returns the reference of the specified branch
      * If it does not exist returns an empty optional
      */
-    Optional<Ref> getRefForBranch(String branchName)
-        throws GitAPIException, IOException {
+    Optional<Ref> getRefForBranch(String branchName) throws GitAPIException, IOException {
         try (Git git = Git.open(this.repositoryPathAsFile)) {
             return git
                 .branchList()
@@ -139,10 +125,8 @@ Optional<Ref> getRefForBranch(String branchName)
      * @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();
@@ -156,12 +140,7 @@ public boolean createCommitOnCurrentBranch(
                     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;
diff --git a/src/main/java/org/jabref/logic/git/SlrGitHandler.java b/src/main/java/org/jabref/logic/git/SlrGitHandler.java
index 5fffa42411d..d7ac7636800 100644
--- a/src/main/java/org/jabref/logic/git/SlrGitHandler.java
+++ b/src/main/java/org/jabref/logic/git/SlrGitHandler.java
@@ -60,12 +60,8 @@ String calculatePatchOfNewSearchResults(String sourceBranch)
             }
             Repository repository = git.getRepository();
             ObjectId branchHead = sourceBranchRef.get().getObjectId();
-            ObjectId treeIdHead = repository.resolve(
-                branchHead.getName() + "^{tree}"
-            );
-            ObjectId treeIdHeadParent = repository.resolve(
-                branchHead.getName() + "~1^{tree}"
-            );
+            ObjectId treeIdHead = repository.resolve(branchHead.getName() + "^{tree}");
+            ObjectId treeIdHeadParent = repository.resolve(branchHead.getName() + "~1^{tree}");
 
             try (ObjectReader reader = repository.newObjectReader()) {
                 CanonicalTreeParser oldTreeIter = new CanonicalTreeParser();
@@ -76,16 +72,9 @@ String calculatePatchOfNewSearchResults(String sourceBranch)
                 ByteArrayOutputStream put = new ByteArrayOutputStream();
                 try (DiffFormatter formatter = new DiffFormatter(put)) {
                     formatter.setRepository(git.getRepository());
-                    List<DiffEntry> entries = formatter.scan(
-                        oldTreeIter,
-                        newTreeIter
-                    );
+                    List<DiffEntry> entries = formatter.scan(oldTreeIter, newTreeIter);
                     for (DiffEntry entry : entries) {
-                        if (
-                            entry
-                                .getChangeType()
-                                .equals(DiffEntry.ChangeType.MODIFY)
-                        ) {
+                        if (entry.getChangeType().equals(DiffEntry.ChangeType.MODIFY)) {
                             formatter.format(entry);
                         }
                     }
@@ -105,8 +94,7 @@ String calculatePatchOfNewSearchResults(String sourceBranch)
      * @param patch the patch (diff) as a string
      * @return Returns a map where each file has its path as a key and the string contains the hunk of new results
      */
-    Map<Path, String> parsePatchForAddedEntries(String patch)
-        throws IOException, GitAPIException {
+    Map<Path, String> parsePatchForAddedEntries(String patch) throws IOException, GitAPIException {
         String[] tokens = patch.split("\n");
         // Tracks for each file the related diff. Represents each file by its relative path
         Map<Path, String> diffsPerFile = new HashMap<>();
@@ -118,11 +106,7 @@ Map<Path, String> parsePatchForAddedEntries(String patch)
             if (currentToken.startsWith("diff --git a/")) {
                 // If the diff is related to a different file, save the diff for the previous file
                 if (!(Objects.isNull(relativePath) || Objects.isNull(joiner))) {
-                    if (
-                        !relativePath.contains(
-                            StudyRepository.STUDY_DEFINITION_FILE_NAME
-                        )
-                    ) {
+                    if (!relativePath.contains(StudyRepository.STUDY_DEFINITION_FILE_NAME)) {
                         diffsPerFile.put(
                             Path.of(repositoryPath.toString(), relativePath),
                             joiner.toString()
@@ -130,16 +114,13 @@ Map<Path, String> parsePatchForAddedEntries(String patch)
                     }
                 }
                 // Find the relative path of the file that is related with the current diff
-                relativePath =
-                    currentToken.substring(13, currentToken.indexOf(" b/"));
+                relativePath = currentToken.substring(13, currentToken.indexOf(" b/"));
                 content = false;
                 joiner = new StringJoiner("\n");
                 continue;
             }
             // From here on content follows
-            if (
-                currentToken.startsWith("@@ ") && currentToken.endsWith(" @@")
-            ) {
+            if (currentToken.startsWith("@@ ") && currentToken.endsWith(" @@")) {
                 content = true;
                 continue;
             }
@@ -153,10 +134,7 @@ Map<Path, String> parsePatchForAddedEntries(String patch)
         }
         if (!(Objects.isNull(relativePath) || Objects.isNull(joiner))) {
             // For the last file this has to be done at the end
-            diffsPerFile.put(
-                Path.of(repositoryPath.toString(), relativePath),
-                joiner.toString()
-            );
+            diffsPerFile.put(Path.of(repositoryPath.toString(), relativePath), joiner.toString());
         }
         return diffsPerFile;
     }
@@ -175,11 +153,8 @@ void applyPatch(Map<Path, String> patch) {
                     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);
+                        prefix = currentContent.substring(0, endOfEncoding + 1) + "\n";
+                        currentContent = currentContent.substring(endOfEncoding + 2);
                     }
                     Files.writeString(
                         path,
diff --git a/src/main/java/org/jabref/logic/groups/DefaultGroupsFactory.java b/src/main/java/org/jabref/logic/groups/DefaultGroupsFactory.java
index 00f9a6a04a0..160fef06b6b 100644
--- a/src/main/java/org/jabref/logic/groups/DefaultGroupsFactory.java
+++ b/src/main/java/org/jabref/logic/groups/DefaultGroupsFactory.java
@@ -5,15 +5,12 @@
 
 public class DefaultGroupsFactory {
 
-    private static String ALL_ENTRIES_GROUP_DEFAULT_ICON =
-        "ALL_ENTRIES_GROUP_ICON";
+    private static String ALL_ENTRIES_GROUP_DEFAULT_ICON = "ALL_ENTRIES_GROUP_ICON";
 
     private DefaultGroupsFactory() {}
 
     public static AllEntriesGroup getAllEntriesGroup() {
-        AllEntriesGroup group = new AllEntriesGroup(
-            Localization.lang("All entries")
-        );
+        AllEntriesGroup group = new AllEntriesGroup(Localization.lang("All entries"));
         group.setIconName(ALL_ENTRIES_GROUP_DEFAULT_ICON);
         return group;
     }
diff --git a/src/main/java/org/jabref/logic/help/HelpFile.java b/src/main/java/org/jabref/logic/help/HelpFile.java
index 5ba702f6117..507b687b47f 100644
--- a/src/main/java/org/jabref/logic/help/HelpFile.java
+++ b/src/main/java/org/jabref/logic/help/HelpFile.java
@@ -32,41 +32,25 @@ public enum HelpFile {
     FETCHER_ACM("collect/import-using-online-bibliographic-database#acmportal"),
     FETCHER_ADS("collect/import-using-online-bibliographic-database#ads"),
     FETCHER_BIBSONOMY_SCRAPER(""),
-    FETCHER_CITESEERX(
-        "collect/import-using-online-bibliographic-database#citeseer"
-    ),
+    FETCHER_CITESEERX("collect/import-using-online-bibliographic-database#citeseer"),
     FETCHER_DBLP("collect/import-using-online-bibliographic-database#dblp"),
     FETCHER_DIVA("collect/add-entry-using-an-id"),
     FETCHER_DOAJ("collect/import-using-online-bibliographic-database#doaj"),
     FETCHER_DOI("collect/add-entry-using-an-id"),
-    FETCHER_GOOGLE_SCHOLAR(
-        "collect/import-using-online-bibliographic-database#googlescholar"
-    ),
+    FETCHER_GOOGLE_SCHOLAR("collect/import-using-online-bibliographic-database#googlescholar"),
     FETCHER_GVK("collect/import-using-online-bibliographic-database#gvk"),
-    FETCHER_IEEEXPLORE(
-        "collect/import-using-online-bibliographic-database#ieeexplore"
-    ),
-    FETCHER_INSPIRE(
-        "collect/import-using-online-bibliographic-database#inspire"
-    ),
+    FETCHER_IEEEXPLORE("collect/import-using-online-bibliographic-database#ieeexplore"),
+    FETCHER_INSPIRE("collect/import-using-online-bibliographic-database#inspire"),
     FETCHER_ISBN("collect/add-entry-using-an-id"),
-    FETCHER_MEDLINE(
-        "collect/import-using-online-bibliographic-database#medline"
-    ),
-    FETCHER_OAI2_ARXIV(
-        "collect/import-using-online-bibliographic-database#arxiv"
-    ),
+    FETCHER_MEDLINE("collect/import-using-online-bibliographic-database#medline"),
+    FETCHER_OAI2_ARXIV("collect/import-using-online-bibliographic-database#arxiv"),
     FETCHER_RFC("collect/add-entry-using-an-id"),
-    FETCHER_SPRINGER(
-        "collect/import-using-online-bibliographic-database#springer"
-    ),
+    FETCHER_SPRINGER("collect/import-using-online-bibliographic-database#springer"),
     FETCHER_TITLE("collect/add-entry-using-an-id"),
     FETCHER_SCIENCEDIRECT(""),
     DATABASE_PROPERTIES("setup/databaseproperties"),
     FIND_DUPLICATES("finding-sorting-and-cleaning-entries/findduplicates"),
-    SQL_DATABASE_MIGRATION(
-        "collaborative-work/sqldatabase/sqldatabasemigration"
-    ),
+    SQL_DATABASE_MIGRATION("collaborative-work/sqldatabase/sqldatabasemigration"),
     PUSH_TO_APPLICATION("cite/pushtoapplications");
 
     private final String pageName;
diff --git a/src/main/java/org/jabref/logic/importer/AuthorListParser.java b/src/main/java/org/jabref/logic/importer/AuthorListParser.java
index 338259d6242..a8bde024717 100644
--- a/src/main/java/org/jabref/logic/importer/AuthorListParser.java
+++ b/src/main/java/org/jabref/logic/importer/AuthorListParser.java
@@ -126,17 +126,14 @@ public AuthorList parse(String listOfNames) {
         final boolean andOthersPresent;
         if (StringUtil.endsWithIgnoreCase(listOfNames, andOthersSuffix)) {
             andOthersPresent = true;
-            listOfNames =
-                StringUtil.removeStringAtTheEnd(listOfNames, " and others");
+            listOfNames = StringUtil.removeStringAtTheEnd(listOfNames, " and others");
         } else {
             andOthersPresent = false;
         }
 
         // Handle case names in order lastname, firstname and separated by ","
         // E.g., Ali Babar, M., Dingsøyr, T., Lago, P., van der Vliet, H.
-        final boolean authorsContainAND = listOfNames
-            .toUpperCase(Locale.ENGLISH)
-            .contains(" AND ");
+        final boolean authorsContainAND = listOfNames.toUpperCase(Locale.ENGLISH).contains(" AND ");
         final boolean authorsContainOpeningBrace = listOfNames.contains("{");
         final boolean authorsContainSemicolon = listOfNames.contains(";");
         final boolean authorsContainTwoOrMoreCommas =
@@ -154,10 +151,7 @@ public AuthorList parse(String listOfNames) {
 
             // Looking for space between pre- and lastname
             boolean spaceInAllParts =
-                arrayNameList
-                    .stream()
-                    .filter(name -> name.contains(" "))
-                    .count() ==
+                arrayNameList.stream().filter(name -> name.contains(" ")).count() ==
                 arrayNameList.size();
 
             // We hit the comma name separator case
@@ -187,8 +181,7 @@ public AuthorList parse(String listOfNames) {
 
                 if ((valuePartsCount % 2) == 0) {
                     // We hit the described special case with name affix like Jr
-                    listOfNames =
-                        buildWithAffix(avoidIndex, arrayNameList).toString();
+                    listOfNames = buildWithAffix(avoidIndex, arrayNameList).toString();
                 }
             }
         }
@@ -253,9 +246,7 @@ private Optional<Author> getAuthor() {
                     if (vonStart < 0) {
                         if (!tokenCase) {
                             int previousTermToken =
-                                (tokens.size() -
-                                    TOKEN_GROUP_LENGTH -
-                                    TOKEN_GROUP_LENGTH) +
+                                (tokens.size() - TOKEN_GROUP_LENGTH - TOKEN_GROUP_LENGTH) +
                                 OFFSET_TOKEN_TERM;
                             if (
                                 (previousTermToken >= 0) &&
@@ -265,12 +256,8 @@ private Optional<Author> getAuthor() {
                                 break;
                             }
 
-                            int thisTermToken =
-                                previousTermToken + TOKEN_GROUP_LENGTH;
-                            if (
-                                (thisTermToken >= 0) &&
-                                tokens.get(thisTermToken).equals('-')
-                            ) {
+                            int thisTermToken = previousTermToken + TOKEN_GROUP_LENGTH;
+                            if ((thisTermToken >= 0) && tokens.get(thisTermToken).equals('-')) {
                                 // We are in a name which contained a hyphen
                                 break;
                             }
@@ -307,9 +294,7 @@ private Optional<Author> getAuthor() {
             if (vonStart < 0) { // no 'von part'
                 lastPartEnd = tokens.size();
                 lastPartStart = tokens.size() - TOKEN_GROUP_LENGTH;
-                int index =
-                    (tokens.size() - (2 * TOKEN_GROUP_LENGTH)) +
-                    OFFSET_TOKEN_TERM;
+                int index = (tokens.size() - (2 * TOKEN_GROUP_LENGTH)) + OFFSET_TOKEN_TERM;
                 if (index > 0) {
                     Character ch = (Character) tokens.get(index);
                     if (ch == '-') {
@@ -369,11 +354,7 @@ private Optional<Author> getAuthor() {
             }
         }
 
-        if (
-            (firstPartStart == -1) &&
-            (lastPartStart == -1) &&
-            (vonPartStart != -1)
-        ) {
+        if ((firstPartStart == -1) && (lastPartStart == -1) && (vonPartStart != -1)) {
             // There is no first or last name, but we have a von part. This is likely
             // to indicate a single-entry name without an initial capital letter, such
             // as "unknown".
@@ -387,40 +368,16 @@ private Optional<Author> getAuthor() {
         // Third step: do actual splitting, construct Author object
         String firstPart = firstPartStart < 0
             ? null
-            : concatTokens(
-                tokens,
-                firstPartStart,
-                firstPartEnd,
-                OFFSET_TOKEN,
-                false
-            );
+            : concatTokens(tokens, firstPartStart, firstPartEnd, OFFSET_TOKEN, false);
         String firstAbbr = firstPartStart < 0
             ? null
-            : concatTokens(
-                tokens,
-                firstPartStart,
-                firstPartEnd,
-                OFFSET_TOKEN_ABBR,
-                true
-            );
+            : concatTokens(tokens, firstPartStart, firstPartEnd, OFFSET_TOKEN_ABBR, true);
         String vonPart = vonPartStart < 0
             ? null
-            : concatTokens(
-                tokens,
-                vonPartStart,
-                vonPartEnd,
-                OFFSET_TOKEN,
-                false
-            );
+            : concatTokens(tokens, vonPartStart, vonPartEnd, OFFSET_TOKEN, false);
         String lastPart = lastPartStart < 0
             ? null
-            : concatTokens(
-                tokens,
-                lastPartStart,
-                lastPartEnd,
-                OFFSET_TOKEN,
-                false
-            );
+            : concatTokens(tokens, lastPartStart, lastPartEnd, OFFSET_TOKEN, false);
         String jrPart = jrPartStart < 0
             ? null
             : concatTokens(tokens, jrPartStart, jrPartEnd, OFFSET_TOKEN, false);
@@ -430,19 +387,14 @@ private Optional<Author> getAuthor() {
             (lastPart != null) &&
             lastPart.equals(lastPart.toUpperCase(Locale.ROOT)) &&
             (lastPart.length() < 5) &&
-            (Character.UnicodeScript.of(lastPart.charAt(0)) !=
-                Character.UnicodeScript.HAN)
+            (Character.UnicodeScript.of(lastPart.charAt(0)) != Character.UnicodeScript.HAN)
         ) {
             // The last part is a small string in complete upper case, so 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
             // The length < 5 constraint should allow for "Smith S.H." as input
-            return Optional.of(
-                new Author(lastPart, lastPart, vonPart, firstPart, jrPart)
-            );
+            return Optional.of(new Author(lastPart, lastPart, vonPart, firstPart, jrPart));
         } else {
-            return Optional.of(
-                new Author(firstPart, firstAbbr, vonPart, lastPart, jrPart)
-            );
+            return Optional.of(new Author(firstPart, firstAbbr, vonPart, lastPart, jrPart));
         }
     }
 
@@ -474,11 +426,7 @@ private String concatTokens(
         }
         int updatedStart = start + TOKEN_GROUP_LENGTH;
         while (updatedStart < end) {
-            result.append(
-                tokens.get(
-                    (updatedStart - TOKEN_GROUP_LENGTH) + OFFSET_TOKEN_TERM
-                )
-            );
+            result.append(tokens.get((updatedStart - TOKEN_GROUP_LENGTH) + OFFSET_TOKEN_TERM));
             result.append((String) tokens.get(updatedStart + offset));
             if (dotAfter) {
                 result.append('.');
@@ -546,26 +494,17 @@ private Token getToken() {
                 bracesLevel++;
             }
 
-            if (
-                firstLetterIsFound &&
-                (tokenAbbrEnd < 0) &&
-                ((bracesLevel == 0) || (c == '{'))
-            ) {
+            if (firstLetterIsFound && (tokenAbbrEnd < 0) && ((bracesLevel == 0) || (c == '{'))) {
                 tokenAbbrEnd = tokenEnd;
             }
             if ((c == '}') && (bracesLevel > 0)) {
                 bracesLevel--;
             }
-            if (
-                !firstLetterIsFound &&
-                (currentBackslash < 0) &&
-                Character.isLetter(c)
-            ) {
+            if (!firstLetterIsFound && (currentBackslash < 0) && Character.isLetter(c)) {
                 if (bracesLevel == 0) {
                     tokenCase =
                         Character.isUpperCase(c) ||
-                        (Character.UnicodeScript.of(c) ==
-                            Character.UnicodeScript.HAN);
+                        (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"
@@ -576,10 +515,7 @@ private Token getToken() {
             }
             if ((currentBackslash >= 0) && !Character.isLetter(c)) {
                 if (!firstLetterIsFound) {
-                    String texCmdName = original.substring(
-                        currentBackslash + 1,
-                        tokenEnd
-                    );
+                    String texCmdName = original.substring(currentBackslash + 1, tokenEnd);
                     if (TEX_NAMES.contains(texCmdName)) {
                         tokenCase = Character.isUpperCase(texCmdName.charAt(0));
                         firstLetterIsFound = true;
@@ -590,10 +526,7 @@ private Token getToken() {
             if (c == '\\') {
                 currentBackslash = tokenEnd;
             }
-            if (
-                (bracesLevel == 0) &&
-                ((",;-".indexOf(c) != -1) || Character.isWhitespace(c))
-            ) {
+            if ((bracesLevel == 0) && ((",;-".indexOf(c) != -1) || Character.isWhitespace(c))) {
                 break;
             }
             tokenEnd++;
@@ -601,9 +534,7 @@ private Token getToken() {
         if (tokenAbbrEnd < 0) {
             tokenAbbrEnd = tokenEnd;
         }
-        if (
-            (tokenEnd < original.length()) && (original.charAt(tokenEnd) == '-')
-        ) {
+        if ((tokenEnd < original.length()) && (original.charAt(tokenEnd) == '-')) {
             tokenTerm = '-';
         }
         if ("and".equalsIgnoreCase(original.substring(tokenStart, tokenEnd))) {
diff --git a/src/main/java/org/jabref/logic/importer/CompositeIdFetcher.java b/src/main/java/org/jabref/logic/importer/CompositeIdFetcher.java
index 4ee6ca65c66..6a3c59be2ed 100644
--- a/src/main/java/org/jabref/logic/importer/CompositeIdFetcher.java
+++ b/src/main/java/org/jabref/logic/importer/CompositeIdFetcher.java
@@ -18,16 +18,13 @@ public CompositeIdFetcher(ImportFormatPreferences importFormatPreferences) {
         this.importFormatPreferences = importFormatPreferences;
     }
 
-    public Optional<BibEntry> performSearchById(String identifier)
-        throws FetcherException {
+    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());
         }
-        Optional<ArXivIdentifier> arXivIdentifier = ArXivIdentifier.parse(
-            identifier
-        );
+        Optional<ArXivIdentifier> arXivIdentifier = ArXivIdentifier.parse(identifier);
         if (arXivIdentifier.isPresent()) {
             return new ArXivFetcher(importFormatPreferences)
                 .performSearchById(arXivIdentifier.get().getNormalized());
@@ -54,13 +51,9 @@ public String getName() {
 
     public static boolean containsValidId(String identifier) {
         Optional<DOI> doi = DOI.findInText(identifier);
-        Optional<ArXivIdentifier> arXivIdentifier = ArXivIdentifier.parse(
-            identifier
-        );
+        Optional<ArXivIdentifier> arXivIdentifier = ArXivIdentifier.parse(identifier);
         Optional<ISBN> isbn = ISBN.parse(identifier);
 
-        return Stream
-            .of(doi, arXivIdentifier, isbn)
-            .anyMatch(Optional::isPresent);
+        return Stream.of(doi, arXivIdentifier, isbn).anyMatch(Optional::isPresent);
     }
 }
diff --git a/src/main/java/org/jabref/logic/importer/EntryBasedParserFetcher.java b/src/main/java/org/jabref/logic/importer/EntryBasedParserFetcher.java
index 65301d32a21..743c7fcd786 100644
--- a/src/main/java/org/jabref/logic/importer/EntryBasedParserFetcher.java
+++ b/src/main/java/org/jabref/logic/importer/EntryBasedParserFetcher.java
@@ -51,8 +51,7 @@ default void doPostCleanup(BibEntry entry) {
     }
 
     @Override
-    default List<BibEntry> performSearch(BibEntry entry)
-        throws FetcherException {
+    default List<BibEntry> performSearch(BibEntry entry) throws FetcherException {
         Objects.requireNonNull(entry);
 
         URL UrlForEntry;
@@ -64,11 +63,7 @@ default List<BibEntry> performSearch(BibEntry entry)
             throw new FetcherException("Search URI is malformed", e);
         }
 
-        try (
-            InputStream stream = new BufferedInputStream(
-                UrlForEntry.openStream()
-            )
-        ) {
+        try (InputStream stream = new BufferedInputStream(UrlForEntry.openStream())) {
             List<BibEntry> fetchedEntries = getParser().parseEntries(stream);
 
             // Post-cleanup
diff --git a/src/main/java/org/jabref/logic/importer/FetcherClientException.java b/src/main/java/org/jabref/logic/importer/FetcherClientException.java
index 1ca9d09afa8..aacebd1b00c 100644
--- a/src/main/java/org/jabref/logic/importer/FetcherClientException.java
+++ b/src/main/java/org/jabref/logic/importer/FetcherClientException.java
@@ -11,11 +11,7 @@ public FetcherClientException(String errorMessage, Throwable cause) {
         super(errorMessage, cause);
     }
 
-    public FetcherClientException(
-        String errorMessage,
-        Throwable cause,
-        int statusCode
-    ) {
+    public FetcherClientException(String errorMessage, Throwable cause, int statusCode) {
         super(errorMessage, cause);
         this.statusCode = statusCode;
     }
@@ -24,11 +20,7 @@ public FetcherClientException(String errorMessage) {
         super(errorMessage);
     }
 
-    public FetcherClientException(
-        String errorMessage,
-        String localizedMessage,
-        Throwable cause
-    ) {
+    public FetcherClientException(String errorMessage, String localizedMessage, Throwable cause) {
         super(errorMessage, localizedMessage, cause);
     }
 
diff --git a/src/main/java/org/jabref/logic/importer/FetcherException.java b/src/main/java/org/jabref/logic/importer/FetcherException.java
index 7fc4f6257ef..03557eef2bc 100644
--- a/src/main/java/org/jabref/logic/importer/FetcherException.java
+++ b/src/main/java/org/jabref/logic/importer/FetcherException.java
@@ -12,11 +12,7 @@ public FetcherException(String errorMessage) {
         super(errorMessage);
     }
 
-    public FetcherException(
-        String errorMessage,
-        String localizedMessage,
-        Throwable cause
-    ) {
+    public FetcherException(String errorMessage, String localizedMessage, Throwable cause) {
         super(errorMessage, localizedMessage, cause);
     }
 }
diff --git a/src/main/java/org/jabref/logic/importer/FetcherServerException.java b/src/main/java/org/jabref/logic/importer/FetcherServerException.java
index b1ed04a244f..76be461b8bd 100644
--- a/src/main/java/org/jabref/logic/importer/FetcherServerException.java
+++ b/src/main/java/org/jabref/logic/importer/FetcherServerException.java
@@ -11,11 +11,7 @@ public FetcherServerException(String errorMessage, Throwable cause) {
         super(errorMessage, cause);
     }
 
-    public FetcherServerException(
-        String errorMessage,
-        Throwable cause,
-        int statusCode
-    ) {
+    public FetcherServerException(String errorMessage, Throwable cause, int statusCode) {
         super(errorMessage, cause);
         this.statusCode = statusCode;
     }
@@ -24,11 +20,7 @@ public FetcherServerException(String errorMessage) {
         super(errorMessage);
     }
 
-    public FetcherServerException(
-        String errorMessage,
-        String localizedMessage,
-        Throwable cause
-    ) {
+    public FetcherServerException(String errorMessage, String localizedMessage, Throwable cause) {
         super(errorMessage, localizedMessage, cause);
     }
 
diff --git a/src/main/java/org/jabref/logic/importer/FulltextFetcher.java b/src/main/java/org/jabref/logic/importer/FulltextFetcher.java
index e5e99341684..f104bac21f0 100644
--- a/src/main/java/org/jabref/logic/importer/FulltextFetcher.java
+++ b/src/main/java/org/jabref/logic/importer/FulltextFetcher.java
@@ -21,8 +21,7 @@ public interface FulltextFetcher {
      * @throws java.io.IOException  if an IO operation has failed
      * @throws FetcherException     if a fetcher specific error occurred
      */
-    Optional<URL> findFullText(BibEntry entry)
-        throws IOException, FetcherException;
+    Optional<URL> findFullText(BibEntry entry) throws IOException, FetcherException;
 
     /**
      * Returns the level of trust for this fetcher.
diff --git a/src/main/java/org/jabref/logic/importer/FulltextFetchers.java b/src/main/java/org/jabref/logic/importer/FulltextFetchers.java
index 603185bd851..7152bd9110b 100644
--- a/src/main/java/org/jabref/logic/importer/FulltextFetchers.java
+++ b/src/main/java/org/jabref/logic/importer/FulltextFetchers.java
@@ -31,9 +31,7 @@
  */
 public class FulltextFetchers {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(
-        FulltextFetchers.class
-    );
+    private static final Logger LOGGER = LoggerFactory.getLogger(FulltextFetchers.class);
 
     // Timeout in seconds
     private static final int FETCHER_TIMEOUT = 10;
@@ -53,12 +51,7 @@ public FulltextFetchers(
         ImportFormatPreferences importFormatPreferences,
         ImporterPreferences importerPreferences
     ) {
-        this(
-            WebFetchers.getFullTextFetchers(
-                importFormatPreferences,
-                importerPreferences
-            )
-        );
+        this(WebFetchers.getFullTextFetchers(importFormatPreferences, importerPreferences));
     }
 
     FulltextFetchers(Set<FulltextFetcher> fetcher) {
@@ -68,20 +61,17 @@ public FulltextFetchers(
     public Optional<URL> findFullTextPDF(BibEntry entry) {
         // for accuracy, fetch DOI first but do not modify entry
         BibEntry clonedEntry = (BibEntry) entry.clone();
-        Optional<DOI> doi = clonedEntry
-            .getField(StandardField.DOI)
-            .flatMap(DOI::parse);
+        Optional<DOI> doi = clonedEntry.getField(StandardField.DOI).flatMap(DOI::parse);
 
         if (doi.isEmpty()) {
             findDoiForEntry(clonedEntry);
         }
 
-        List<Future<Optional<FetcherResult>>> result =
-            JabRefExecutorService.INSTANCE.executeAll(
-                getCallables(clonedEntry, finders),
-                FETCHER_TIMEOUT,
-                TimeUnit.SECONDS
-            );
+        List<Future<Optional<FetcherResult>>> result = JabRefExecutorService.INSTANCE.executeAll(
+            getCallables(clonedEntry, finders),
+            FETCHER_TIMEOUT,
+            TimeUnit.SECONDS
+        );
 
         return result
             .stream()
@@ -91,9 +81,7 @@ public Optional<URL> findFullTextPDF(BibEntry entry) {
             .filter(res -> Objects.nonNull(res.getSource()))
             .sorted(
                 Comparator
-                    .comparingInt((FetcherResult res) ->
-                        res.getTrust().getTrustScore()
-                    )
+                    .comparingInt((FetcherResult res) -> res.getTrust().getTrustScore())
                     .reversed()
             )
             .map(FetcherResult::getSource)
@@ -105,17 +93,13 @@ private void findDoiForEntry(BibEntry clonedEntry) {
             WebFetchers
                 .getIdFetcherForIdentifier(DOI.class)
                 .findIdentifier(clonedEntry)
-                .ifPresent(e ->
-                    clonedEntry.setField(StandardField.DOI, e.getDOI())
-                );
+                .ifPresent(e -> clonedEntry.setField(StandardField.DOI, e.getDOI()));
         } catch (FetcherException e) {
             LOGGER.debug("Failed to find DOI", e);
         }
     }
 
-    private static Optional<FetcherResult> getResults(
-        Future<Optional<FetcherResult>> future
-    ) {
+    private static Optional<FetcherResult> getResults(Future<Optional<FetcherResult>> future) {
         try {
             return future.get();
         } catch (InterruptedException ignore) {
@@ -126,17 +110,13 @@ private static Optional<FetcherResult> getResults(
         return Optional.empty();
     }
 
-    private Callable<Optional<FetcherResult>> getCallable(
-        BibEntry entry,
-        FulltextFetcher fetcher
-    ) {
+    private Callable<Optional<FetcherResult>> getCallable(BibEntry entry, FulltextFetcher fetcher) {
         return () -> {
             try {
                 return fetcher
                     .findFullText(entry)
                     .filter(url -> isPDF.test(url.toString()))
-                    .map(url -> new FetcherResult(fetcher.getTrustLevel(), url)
-                    );
+                    .map(url -> new FetcherResult(fetcher.getTrustLevel(), url));
             } catch (IOException | FetcherException e) {
                 LOGGER.debug("Failed to find fulltext PDF at given URL", e);
             }
@@ -148,9 +128,6 @@ private List<Callable<Optional<FetcherResult>>> getCallables(
         BibEntry entry,
         Set<FulltextFetcher> fetchers
     ) {
-        return fetchers
-            .stream()
-            .map(f -> getCallable(entry, f))
-            .collect(Collectors.toList());
+        return fetchers.stream().map(f -> getCallable(entry, f)).collect(Collectors.toList());
     }
 }
diff --git a/src/main/java/org/jabref/logic/importer/IdBasedFetcher.java b/src/main/java/org/jabref/logic/importer/IdBasedFetcher.java
index 5c9092a42fe..0e5e4553cdd 100644
--- a/src/main/java/org/jabref/logic/importer/IdBasedFetcher.java
+++ b/src/main/java/org/jabref/logic/importer/IdBasedFetcher.java
@@ -14,6 +14,5 @@ public interface IdBasedFetcher extends WebFetcher {
      * @param identifier a string which uniquely identifies the item
      * @return a {@link BibEntry} containing the bibliographic information (or an empty optional if no data was found)
      */
-    Optional<BibEntry> performSearchById(String identifier)
-        throws FetcherException;
+    Optional<BibEntry> performSearchById(String identifier) throws FetcherException;
 }
diff --git a/src/main/java/org/jabref/logic/importer/IdBasedParserFetcher.java b/src/main/java/org/jabref/logic/importer/IdBasedParserFetcher.java
index 8fd192b59b8..521d65a1bc5 100644
--- a/src/main/java/org/jabref/logic/importer/IdBasedParserFetcher.java
+++ b/src/main/java/org/jabref/logic/importer/IdBasedParserFetcher.java
@@ -54,16 +54,12 @@ default void doPostCleanup(BibEntry entry) {
     }
 
     @Override
-    default Optional<BibEntry> performSearchById(String identifier)
-        throws FetcherException {
+    default Optional<BibEntry> performSearchById(String identifier) throws FetcherException {
         if (StringUtil.isBlank(identifier)) {
             return Optional.empty();
         }
 
-        try (
-            InputStream stream = getUrlDownload(getUrlForIdentifier(identifier))
-                .asInputStream()
-        ) {
+        try (InputStream stream = getUrlDownload(getUrlForIdentifier(identifier)).asInputStream()) {
             List<BibEntry> fetchedEntries = getParser().parseEntries(stream);
 
             if (fetchedEntries.isEmpty()) {
diff --git a/src/main/java/org/jabref/logic/importer/IdParserFetcher.java b/src/main/java/org/jabref/logic/importer/IdParserFetcher.java
index 204e92c50b7..ef61aaff500 100644
--- a/src/main/java/org/jabref/logic/importer/IdParserFetcher.java
+++ b/src/main/java/org/jabref/logic/importer/IdParserFetcher.java
@@ -63,20 +63,14 @@ default void doPostCleanup(BibEntry entry) {
      *                       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 {
         Objects.requireNonNull(entry);
 
-        try (
-            InputStream stream = new BufferedInputStream(
-                getURLForEntry(entry).openStream()
-            )
-        ) {
+        try (InputStream stream = new BufferedInputStream(getURLForEntry(entry).openStream())) {
             List<BibEntry> fetchedEntries = getParser().parseEntries(stream);
 
             if (fetchedEntries.isEmpty()) {
diff --git a/src/main/java/org/jabref/logic/importer/ImportCleanupBibtex.java b/src/main/java/org/jabref/logic/importer/ImportCleanupBibtex.java
index 8c876f19ae8..ddda1f73e73 100644
--- a/src/main/java/org/jabref/logic/importer/ImportCleanupBibtex.java
+++ b/src/main/java/org/jabref/logic/importer/ImportCleanupBibtex.java
@@ -5,8 +5,7 @@
 
 public class ImportCleanupBibtex implements ImportCleanup {
 
-    private final ConvertToBibtexCleanup convertToBibtexCleanup =
-        new ConvertToBibtexCleanup();
+    private final ConvertToBibtexCleanup convertToBibtexCleanup = new ConvertToBibtexCleanup();
 
     /**
      * Performs a format conversion of the given entry into the targeted format.
diff --git a/src/main/java/org/jabref/logic/importer/ImportFormatReader.java b/src/main/java/org/jabref/logic/importer/ImportFormatReader.java
index 64b6a3f862e..4c76b2e2335 100644
--- a/src/main/java/org/jabref/logic/importer/ImportFormatReader.java
+++ b/src/main/java/org/jabref/logic/importer/ImportFormatReader.java
@@ -79,17 +79,13 @@ public void reset() {
         if (importFormatPreferences.grobidPreferences().isGrobidEnabled()) {
             formats.add(new PdfGrobidImporter(importFormatPreferences));
         }
-        formats.add(
-            new PdfXmpImporter(importFormatPreferences.xmpPreferences())
-        );
+        formats.add(new PdfXmpImporter(importFormatPreferences.xmpPreferences()));
         formats.add(new RepecNepImporter(importFormatPreferences));
         formats.add(new RisImporter());
         formats.add(new SilverPlatterImporter());
         formats.add(new CffImporter());
         formats.add(new BiblioscapeImporter());
-        formats.add(
-            new BibtexImporter(importFormatPreferences, fileUpdateMonitor)
-        );
+        formats.add(new BibtexImporter(importFormatPreferences, fileUpdateMonitor));
         formats.add(new CitaviXmlImporter());
 
         // Get custom import formats
@@ -114,14 +110,11 @@ private Optional<Importer> getByCliId(String cliId) {
         return Optional.empty();
     }
 
-    public ParserResult importFromFile(String format, Path file)
-        throws ImportException {
+    public ParserResult importFromFile(String format, Path file) throws ImportException {
         Optional<Importer> importer = getByCliId(format);
 
         if (importer.isEmpty()) {
-            throw new ImportException(
-                Localization.lang("Unknown import format") + ": " + format
-            );
+            throw new ImportException(Localization.lang("Unknown import format") + ": " + format);
         }
 
         try {
@@ -143,10 +136,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,
@@ -156,10 +146,8 @@ public record UnknownFormatImport(
      *
      * @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 {
@@ -182,19 +170,14 @@ public UnknownFormatImport importUnknownFormat(
                     !parserResult.getDatabase().hasNoStrings()
                 ) {
                     parserResult.setPath(filePath);
-                    return new UnknownFormatImport(
-                        ImportFormatReader.BIBTEX_FORMAT,
-                        parserResult
-                    );
+                    return new UnknownFormatImport(ImportFormatReader.BIBTEX_FORMAT, parserResult);
                 } else {
                     throw new ImportException(parserResult.getErrorMessage());
                 }
             } catch (IOException ignore) {
                 // Ignored
                 throw new ImportException(
-                    Localization.lang(
-                        "Could not find a suitable import format."
-                    )
+                    Localization.lang("Could not find a suitable import format.")
                 );
             }
         }
@@ -226,9 +209,7 @@ private UnknownFormatImport importUnknownFormat(
                 }
 
                 ParserResult parserResult = importDatabase.apply(imFo);
-                List<BibEntry> entries = parserResult
-                    .getDatabase()
-                    .getEntries();
+                List<BibEntry> entries = parserResult.getDatabase().getEntries();
 
                 BibDatabases.purgeEmptyEntries(entries);
                 int entryCount = entries.size();
@@ -249,9 +230,7 @@ private UnknownFormatImport importUnknownFormat(
             return new UnknownFormatImport(bestFormatName, parserResult);
         }
 
-        throw new ImportException(
-            Localization.lang("Could not find a suitable import format.")
-        );
+        throw new ImportException(Localization.lang("Could not find a suitable import format."));
     }
 
     @FunctionalInterface
@@ -267,8 +246,7 @@ public interface CheckedFunction<T, R> {
      * @return an UnknownFormatImport with the imported entries and metadata
      * @throws ImportException if the import fails (for example, if no suitable importer is found)
      */
-    public UnknownFormatImport importUnknownFormat(String data)
-        throws ImportException {
+    public UnknownFormatImport importUnknownFormat(String data) throws ImportException {
         Objects.requireNonNull(data);
 
         return importUnknownFormat(
diff --git a/src/main/java/org/jabref/logic/importer/Importer.java b/src/main/java/org/jabref/logic/importer/Importer.java
index 3e9a0f22651..af172f5bf63 100644
--- a/src/main/java/org/jabref/logic/importer/Importer.java
+++ b/src/main/java/org/jabref/logic/importer/Importer.java
@@ -26,9 +26,7 @@
  */
 public abstract class Importer implements Comparable<Importer> {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(
-        Importer.class
-    );
+    private static final Logger LOGGER = LoggerFactory.getLogger(Importer.class);
 
     /**
      * Check whether the source is in the correct format for this importer.
@@ -39,8 +37,7 @@ public abstract class Importer implements Comparable<Importer> {
      * Thus the correct behaviour is to return false if it is certain that the file is not of the suitable type, and
      * true otherwise. Returning true is the safe choice if not certain.
      */
-    public abstract boolean isRecognizedFormat(BufferedReader input)
-        throws IOException;
+    public abstract boolean isRecognizedFormat(BufferedReader input) throws IOException;
 
     /**
      * Check whether the source is in the correct format for this importer.
@@ -84,8 +81,7 @@ public boolean isRecognizedFormat(String data) throws IOException {
      *
      * @param input the input to read from
      */
-    public abstract ParserResult importDatabase(BufferedReader input)
-        throws IOException;
+    public abstract ParserResult importDatabase(BufferedReader input) throws IOException;
 
     /**
      * Parse the database in the specified file.
@@ -93,15 +89,8 @@ public abstract ParserResult importDatabase(BufferedReader input)
      * @param filePath the path to the file which should be imported
      */
     public ParserResult importDatabase(Path filePath) throws IOException {
-        try (
-            InputStream inputStream = Files.newInputStream(
-                filePath,
-                StandardOpenOption.READ
-            )
-        ) {
-            BufferedInputStream bufferedInputStream = new BufferedInputStream(
-                inputStream
-            );
+        try (InputStream inputStream = Files.newInputStream(filePath, StandardOpenOption.READ)) {
+            BufferedInputStream bufferedInputStream = new BufferedInputStream(inputStream);
 
             Charset charset = StandardCharsets.UTF_8;
 
@@ -119,19 +108,13 @@ public ParserResult importDatabase(Path filePath) throws IOException {
             if (parserResult.getMetaData().getMode().isEmpty()) {
                 parserResult
                     .getMetaData()
-                    .setMode(
-                        BibDatabaseModeDetection.inferMode(
-                            parserResult.getDatabase()
-                        )
-                    );
+                    .setMode(BibDatabaseModeDetection.inferMode(parserResult.getDatabase()));
             }
             return parserResult;
         }
     }
 
-    protected static Charset getCharset(
-        BufferedInputStream bufferedInputStream
-    ) {
+    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.
@@ -145,11 +128,7 @@ protected static Charset getCharset(
                 return defaultCharSet;
             }
 
-            if (
-                Arrays
-                    .stream(matches)
-                    .anyMatch(charset -> "ASCII".equals(charset.getName()))
-            ) {
+            if (Arrays.stream(matches).anyMatch(charset -> "ASCII".equals(charset.getName()))) {
                 return defaultCharSet;
             }
 
@@ -182,29 +161,19 @@ public ParserResult importDatabase(String data) throws IOException {
     }
 
     public static BufferedReader getReader(Path filePath) throws IOException {
-        InputStream stream = Files.newInputStream(
-            filePath,
-            StandardOpenOption.READ
-        );
+        InputStream stream = Files.newInputStream(filePath, StandardOpenOption.READ);
 
         if (FileUtil.isBibFile(filePath)) {
             return getReader(stream);
         }
 
-        return new BufferedReader(
-            new InputStreamReader(stream, StandardCharsets.UTF_8)
-        );
+        return new BufferedReader(new InputStreamReader(stream, StandardCharsets.UTF_8));
     }
 
     public static BufferedReader getReader(InputStream stream) {
-        BufferedInputStream bufferedInputStream = new BufferedInputStream(
-            stream
-        );
+        BufferedInputStream bufferedInputStream = new BufferedInputStream(stream);
         Charset charset = getCharset(bufferedInputStream);
-        InputStreamReader reader = new InputStreamReader(
-            bufferedInputStream,
-            charset
-        );
+        InputStreamReader reader = new InputStreamReader(bufferedInputStream, charset);
         return new BufferedReader(reader);
     }
 
diff --git a/src/main/java/org/jabref/logic/importer/ImporterPreferences.java b/src/main/java/org/jabref/logic/importer/ImporterPreferences.java
index 780e83f15c1..dfa78b6cdf3 100644
--- a/src/main/java/org/jabref/logic/importer/ImporterPreferences.java
+++ b/src/main/java/org/jabref/logic/importer/ImporterPreferences.java
@@ -36,12 +36,9 @@ public ImporterPreferences(
         List<String> catalogs
     ) {
         this.importerEnabled = new SimpleBooleanProperty(importerEnabled);
-        this.generateNewKeyOnImport =
-            new SimpleBooleanProperty(generateNewKeyOnImport);
-        this.importWorkingDirectory =
-            new SimpleObjectProperty<>(importWorkingDirectory);
-        this.warnAboutDuplicatesOnImport =
-            new SimpleBooleanProperty(warnAboutDuplicatesOnImport);
+        this.generateNewKeyOnImport = new SimpleBooleanProperty(generateNewKeyOnImport);
+        this.importWorkingDirectory = new SimpleObjectProperty<>(importWorkingDirectory);
+        this.warnAboutDuplicatesOnImport = new SimpleBooleanProperty(warnAboutDuplicatesOnImport);
         this.customImporters = FXCollections.observableSet(customImporters);
         this.apiKeys = FXCollections.observableSet(apiKeys);
         this.persistCustomKeys = new SimpleBooleanProperty(persistCustomKeys);
@@ -92,9 +89,7 @@ public BooleanProperty warnAboutDuplicatesOnImportProperty() {
         return warnAboutDuplicatesOnImport;
     }
 
-    public void setWarnAboutDuplicatesOnImport(
-        boolean warnAboutDuplicatesOnImport
-    ) {
+    public void setWarnAboutDuplicatesOnImport(boolean warnAboutDuplicatesOnImport) {
         this.warnAboutDuplicatesOnImport.set(warnAboutDuplicatesOnImport);
     }
 
diff --git a/src/main/java/org/jabref/logic/importer/OpenDatabase.java b/src/main/java/org/jabref/logic/importer/OpenDatabase.java
index 9f6cc4b16ef..1567bae1da5 100644
--- a/src/main/java/org/jabref/logic/importer/OpenDatabase.java
+++ b/src/main/java/org/jabref/logic/importer/OpenDatabase.java
@@ -26,10 +26,7 @@ public static ParserResult loadDatabase(
         ImportFormatPreferences importFormatPreferences,
         FileUpdateMonitor fileMonitor
     ) throws IOException {
-        ParserResult result = new BibtexImporter(
-            importFormatPreferences,
-            fileMonitor
-        )
+        ParserResult result = new BibtexImporter(importFormatPreferences, fileMonitor)
             .importDatabase(fileToOpen);
         performLoadDatabaseMigrations(
             result,
diff --git a/src/main/java/org/jabref/logic/importer/PagedSearchBasedFetcher.java b/src/main/java/org/jabref/logic/importer/PagedSearchBasedFetcher.java
index 74ba36a3490..eeb0a09ba19 100644
--- a/src/main/java/org/jabref/logic/importer/PagedSearchBasedFetcher.java
+++ b/src/main/java/org/jabref/logic/importer/PagedSearchBasedFetcher.java
@@ -24,10 +24,8 @@ Page<BibEntry> performSearchPaged(QueryNode luceneQuery, int pageNumber)
      * @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());
         }
@@ -39,9 +37,7 @@ default Page<BibEntry> performSearchPaged(
                     pageNumber
                 );
         } catch (QueryNodeParseException e) {
-            throw new FetcherException(
-                "An error occurred during parsing of the query."
-            );
+            throw new FetcherException("An error occurred during parsing of the query.");
         }
     }
 
@@ -59,8 +55,7 @@ default int getPageSize() {
      * @return a list of {@link BibEntry}, which are matched by the query (may be empty)
      */
     @Override
-    default List<BibEntry> performSearch(QueryNode luceneQuery)
-        throws FetcherException {
+    default List<BibEntry> performSearch(QueryNode luceneQuery) throws FetcherException {
         return new ArrayList<>(performSearchPaged(luceneQuery, 0).getContent());
     }
 }
diff --git a/src/main/java/org/jabref/logic/importer/PagedSearchBasedParserFetcher.java b/src/main/java/org/jabref/logic/importer/PagedSearchBasedParserFetcher.java
index e98d4d32787..edb756fa1b6 100644
--- a/src/main/java/org/jabref/logic/importer/PagedSearchBasedParserFetcher.java
+++ b/src/main/java/org/jabref/logic/importer/PagedSearchBasedParserFetcher.java
@@ -13,10 +13,8 @@
 public interface PagedSearchBasedParserFetcher
     extends SearchBasedParserFetcher, PagedSearchBasedFetcher {
     @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 {
@@ -27,15 +25,10 @@ default Page<BibEntry> performSearchPaged(
                 e
             );
         }
-        return new Page<>(
-            luceneQuery.toString(),
-            pageNumber,
-            getBibEntries(urlForQuery)
-        );
+        return new Page<>(luceneQuery.toString(), pageNumber, getBibEntries(urlForQuery));
     }
 
-    private List<BibEntry> getBibEntries(URL urlForQuery)
-        throws FetcherException {
+    private List<BibEntry> getBibEntries(URL urlForQuery) throws FetcherException {
         try (InputStream stream = getUrlDownload(urlForQuery).asInputStream()) {
             List<BibEntry> fetchedEntries = getParser().parseEntries(stream);
             fetchedEntries.forEach(this::doPostCleanup);
@@ -47,8 +40,7 @@ private List<BibEntry> getBibEntries(URL urlForQuery)
             );
         } catch (ParseException e) {
             throw new FetcherException(
-                "An internal parser error occurred while fetching from " +
-                urlForQuery,
+                "An internal parser error occurred while fetching from " + urlForQuery,
                 e
             );
         }
@@ -70,8 +62,7 @@ default URL getURLForQuery(QueryNode luceneQuery)
     }
 
     @Override
-    default List<BibEntry> performSearch(QueryNode luceneQuery)
-        throws FetcherException {
+    default List<BibEntry> performSearch(QueryNode luceneQuery) throws FetcherException {
         return SearchBasedParserFetcher.super.performSearch(luceneQuery);
     }
 }
diff --git a/src/main/java/org/jabref/logic/importer/Parser.java b/src/main/java/org/jabref/logic/importer/Parser.java
index e6b4fe8e1b1..280ab4e8aab 100644
--- a/src/main/java/org/jabref/logic/importer/Parser.java
+++ b/src/main/java/org/jabref/logic/importer/Parser.java
@@ -12,12 +12,7 @@
 public interface Parser {
     List<BibEntry> parseEntries(InputStream inputStream) throws ParseException;
 
-    default List<BibEntry> parseEntries(String dataString)
-        throws ParseException {
-        return parseEntries(
-            new ByteArrayInputStream(
-                dataString.getBytes(StandardCharsets.UTF_8)
-            )
-        );
+    default List<BibEntry> parseEntries(String dataString) throws ParseException {
+        return parseEntries(new ByteArrayInputStream(dataString.getBytes(StandardCharsets.UTF_8)));
     }
 }
diff --git a/src/main/java/org/jabref/logic/importer/ParserResult.java b/src/main/java/org/jabref/logic/importer/ParserResult.java
index 9f5d0d97e05..49d215acb82 100644
--- a/src/main/java/org/jabref/logic/importer/ParserResult.java
+++ b/src/main/java/org/jabref/logic/importer/ParserResult.java
@@ -39,11 +39,7 @@ public ParserResult(BibDatabase database) {
         this(database, new MetaData(), new HashSet<>());
     }
 
-    public ParserResult(
-        BibDatabase database,
-        MetaData metaData,
-        Set<BibEntryType> entryTypes
-    ) {
+    public ParserResult(BibDatabase database, MetaData metaData, Set<BibEntryType> entryTypes) {
         this.database = Objects.requireNonNull(database);
         this.metaData = Objects.requireNonNull(metaData);
         this.entryTypes = Objects.requireNonNull(entryTypes);
@@ -59,8 +55,7 @@ public static ParserResult fromErrorMessage(String message) {
     private static String getErrorMessage(Exception exception) {
         String errorMessage = exception.getLocalizedMessage();
         if (exception.getCause() != null) {
-            errorMessage +=
-            " Caused by: " + exception.getCause().getLocalizedMessage();
+            errorMessage += " Caused by: " + exception.getCause().getLocalizedMessage();
         }
         return errorMessage;
     }
diff --git a/src/main/java/org/jabref/logic/importer/QueryParser.java b/src/main/java/org/jabref/logic/importer/QueryParser.java
index ca81271888b..0853e03ad14 100644
--- a/src/main/java/org/jabref/logic/importer/QueryParser.java
+++ b/src/main/java/org/jabref/logic/importer/QueryParser.java
@@ -27,9 +27,7 @@ public class QueryParser {
      * @param query The given query string
      * @return A complex query containing all fields of the query string
      */
-    public Optional<ComplexSearchQuery> parseQueryStringIntoComplexQuery(
-        String query
-    ) {
+    public Optional<ComplexSearchQuery> parseQueryStringIntoComplexQuery(String query) {
         try {
             StandardQueryParser parser = new StandardQueryParser();
             Query luceneQuery = parser.parse(query, "default");
@@ -42,11 +40,7 @@ public Optional<ComplexSearchQuery> parseQueryStringIntoComplexQuery(
             List<Term> sortedTerms = new ArrayList<>(terms);
             sortedTerms.sort(Comparator.comparing(Term::text).reversed());
             return Optional.of(ComplexSearchQuery.fromTerms(sortedTerms));
-        } catch (
-            QueryNodeException
-            | IllegalStateException
-            | IllegalArgumentException ex
-        ) {
+        } catch (QueryNodeException | IllegalStateException | IllegalArgumentException ex) {
             return Optional.empty();
         }
     }
diff --git a/src/main/java/org/jabref/logic/importer/SearchBasedFetcher.java b/src/main/java/org/jabref/logic/importer/SearchBasedFetcher.java
index ad0675ed564..84977d42eb6 100644
--- a/src/main/java/org/jabref/logic/importer/SearchBasedFetcher.java
+++ b/src/main/java/org/jabref/logic/importer/SearchBasedFetcher.java
@@ -32,8 +32,7 @@ public interface SearchBasedFetcher extends WebFetcher {
      * @param searchQuery query string that can be parsed into a lucene query
      * @return a list of {@link BibEntry}, which are matched by the query (may be empty)
      */
-    default List<BibEntry> performSearch(String searchQuery)
-        throws FetcherException {
+    default List<BibEntry> performSearch(String searchQuery) throws FetcherException {
         if (searchQuery.isBlank()) {
             return Collections.emptyList();
         }
@@ -43,9 +42,7 @@ default List<BibEntry> performSearch(String searchQuery)
         try {
             queryNode = parser.parse(searchQuery, NO_EXPLICIT_FIELD);
         } catch (QueryNodeParseException e) {
-            throw new FetcherException(
-                "An error occurred when parsing the query"
-            );
+            throw new FetcherException("An error occurred when parsing the query");
         }
 
         return this.performSearch(queryNode);
diff --git a/src/main/java/org/jabref/logic/importer/SearchBasedParserFetcher.java b/src/main/java/org/jabref/logic/importer/SearchBasedParserFetcher.java
index c4b0789b76c..cdb5ac74d62 100644
--- a/src/main/java/org/jabref/logic/importer/SearchBasedParserFetcher.java
+++ b/src/main/java/org/jabref/logic/importer/SearchBasedParserFetcher.java
@@ -40,15 +40,12 @@ public interface SearchBasedParserFetcher extends SearchBasedFetcher {
      * @param luceneQuery the root node of the lucene query
      */
     @Override
-    default List<BibEntry> performSearch(QueryNode luceneQuery)
-        throws FetcherException {
+    default List<BibEntry> performSearch(QueryNode luceneQuery) throws FetcherException {
         // ADR-0014
         URL urlForQuery;
         try {
             urlForQuery = getURLForQuery(luceneQuery);
-        } catch (
-            URISyntaxException | MalformedURLException | FetcherException e
-        ) {
+        } catch (URISyntaxException | MalformedURLException | FetcherException e) {
             throw new FetcherException(
                 "Search URI crafted from complex search query is malformed",
                 e
@@ -57,8 +54,7 @@ default List<BibEntry> performSearch(QueryNode luceneQuery)
         return getBibEntries(urlForQuery);
     }
 
-    private List<BibEntry> getBibEntries(URL urlForQuery)
-        throws FetcherException {
+    private List<BibEntry> getBibEntries(URL urlForQuery) throws FetcherException {
         try (InputStream stream = getUrlDownload(urlForQuery).asInputStream()) {
             List<BibEntry> fetchedEntries = getParser().parseEntries(stream);
             fetchedEntries.forEach(this::doPostCleanup);
@@ -70,8 +66,7 @@ private List<BibEntry> getBibEntries(URL urlForQuery)
             );
         } catch (ParseException e) {
             throw new FetcherException(
-                "An internal parser error occurred while fetching from " +
-                urlForQuery,
+                "An internal parser error occurred while fetching from " + urlForQuery,
                 e
             );
         }
diff --git a/src/main/java/org/jabref/logic/importer/WebFetchers.java b/src/main/java/org/jabref/logic/importer/WebFetchers.java
index 36b57f75ee5..d404febe65b 100644
--- a/src/main/java/org/jabref/logic/importer/WebFetchers.java
+++ b/src/main/java/org/jabref/logic/importer/WebFetchers.java
@@ -81,9 +81,7 @@ public static Optional<IdBasedFetcher> getIdBasedFetcherForField(
     }
 
     @SuppressWarnings("unchecked")
-    public static <T extends Identifier> IdFetcher<T> getIdFetcherForIdentifier(
-        Class<T> clazz
-    ) {
+    public static <T extends Identifier> IdFetcher<T> getIdFetcherForIdentifier(Class<T> clazz) {
         if (clazz == DOI.class) {
             return (IdFetcher<T>) new CrossRef();
         } else {
@@ -93,9 +91,7 @@ public static <T extends Identifier> IdFetcher<T> getIdFetcherForIdentifier(
         }
     }
 
-    public static Optional<
-        IdFetcher<? extends Identifier>
-    > getIdFetcherForField(Field field) {
+    public static Optional<IdFetcher<? extends Identifier>> getIdFetcherForField(Field field) {
         if (field == StandardField.DOI) {
             return Optional.of(new CrossRef());
         }
@@ -109,20 +105,13 @@ public static SortedSet<SearchBasedFetcher> getSearchBasedFetchers(
         ImportFormatPreferences importFormatPreferences,
         ImporterPreferences importerPreferences
     ) {
-        SortedSet<SearchBasedFetcher> set = new TreeSet<>(
-            new CompositeSearchFirstComparator()
-        );
+        SortedSet<SearchBasedFetcher> set = new TreeSet<>(new CompositeSearchFirstComparator());
         set.add(new ArXivFetcher(importFormatPreferences));
         set.add(new INSPIREFetcher(importFormatPreferences));
         set.add(new GvkFetcher(importFormatPreferences));
         set.add(new BvbFetcher());
         set.add(new MedlineFetcher());
-        set.add(
-            new AstrophysicsDataSystem(
-                importFormatPreferences,
-                importerPreferences
-            )
-        );
+        set.add(new AstrophysicsDataSystem(importFormatPreferences, importerPreferences));
         set.add(new MathSciNet(importFormatPreferences));
         set.add(new ZbMATH(importFormatPreferences));
         set.add(new ACMPortalFetcher());
@@ -152,16 +141,9 @@ public static SortedSet<IdBasedFetcher> getIdBasedFetchers(
         ImportFormatPreferences importFormatPreferences,
         ImporterPreferences importerPreferences
     ) {
-        SortedSet<IdBasedFetcher> set = new TreeSet<>(
-            Comparator.comparing(WebFetcher::getName)
-        );
+        SortedSet<IdBasedFetcher> set = new TreeSet<>(Comparator.comparing(WebFetcher::getName));
         set.add(new ArXivFetcher(importFormatPreferences));
-        set.add(
-            new AstrophysicsDataSystem(
-                importFormatPreferences,
-                importerPreferences
-            )
-        );
+        set.add(new AstrophysicsDataSystem(importFormatPreferences, importerPreferences));
         set.add(new IsbnFetcher(importFormatPreferences));
         // .addRetryFetcher(new EbookDeIsbnFetcher(importFormatPreferences)));
         // .addRetryFetcher(new DoiToBibtexConverterComIsbnFetcher(importFormatPreferences)));
@@ -189,16 +171,9 @@ public static SortedSet<EntryBasedFetcher> getEntryBasedFetchers(
         FilePreferences filePreferences,
         BibDatabaseContext databaseContext
     ) {
-        SortedSet<EntryBasedFetcher> set = new TreeSet<>(
-            Comparator.comparing(WebFetcher::getName)
-        );
+        SortedSet<EntryBasedFetcher> set = new TreeSet<>(Comparator.comparing(WebFetcher::getName));
         set.add(new INSPIREFetcher(importFormatPreferences));
-        set.add(
-            new AstrophysicsDataSystem(
-                importFormatPreferences,
-                importerPreferences
-            )
-        );
+        set.add(new AstrophysicsDataSystem(importFormatPreferences, importerPreferences));
         set.add(new DoiFetcher(importFormatPreferences));
         set.add(new IsbnFetcher(importFormatPreferences));
         set.add(new IssnFetcher());
@@ -225,9 +200,7 @@ public static SortedSet<EntryBasedFetcher> getEntryBasedFetchers(
     public static SortedSet<IdFetcher<? extends Identifier>> getIdFetchers(
         ImportFormatPreferences importFormatPreferences
     ) {
-        SortedSet<IdFetcher<?>> set = new TreeSet<>(
-            Comparator.comparing(WebFetcher::getName)
-        );
+        SortedSet<IdFetcher<?>> set = new TreeSet<>(Comparator.comparing(WebFetcher::getName));
         set.add(new CrossRef());
         set.add(new ArXivFetcher(importFormatPreferences));
         return set;
@@ -243,9 +216,7 @@ public static Set<FulltextFetcher> getFullTextFetchers(
         Set<FulltextFetcher> fetchers = new HashSet<>();
 
         // Original
-        fetchers.add(
-            new DoiResolution(importFormatPreferences.doiPreferences())
-        );
+        fetchers.add(new DoiResolution(importFormatPreferences.doiPreferences()));
 
         // Publishers
         fetchers.add(new ScienceDirect(importerPreferences));
@@ -277,12 +248,7 @@ public static Set<CustomizableKeyFetcher> getCustomizableKeyFetchers(
         fetchers.add(new IEEE(importFormatPreferences, importerPreferences));
         fetchers.add(new SpringerFetcher(importerPreferences));
         fetchers.add(new ScienceDirect(importerPreferences));
-        fetchers.add(
-            new AstrophysicsDataSystem(
-                importFormatPreferences,
-                importerPreferences
-            )
-        );
+        fetchers.add(new AstrophysicsDataSystem(importFormatPreferences, importerPreferences));
         fetchers.add(new BiodiversityLibrary(importerPreferences));
         return fetchers;
     }
@@ -295,12 +261,7 @@ class CompositeSearchFirstComparator implements Comparator<SearchBasedFetcher> {
 
     @Override
     public int compare(SearchBasedFetcher s1, SearchBasedFetcher s2) {
-        if (
-            Objects.equals(
-                s1.getName(),
-                CompositeSearchBasedFetcher.FETCHER_NAME
-            )
-        ) {
+        if (Objects.equals(s1.getName(), CompositeSearchBasedFetcher.FETCHER_NAME)) {
             return -1;
         } else {
             return s1.getName().compareTo(s2.getName());
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 6ab46df5beb..38e5fe6b3af 100644
--- a/src/main/java/org/jabref/logic/importer/fetcher/ACMPortalFetcher.java
+++ b/src/main/java/org/jabref/logic/importer/fetcher/ACMPortalFetcher.java
@@ -19,8 +19,7 @@ public class ACMPortalFetcher implements SearchBasedParserFetcher {
 
     public static final String FETCHER_NAME = "ACM Portal";
 
-    private static final String SEARCH_URL =
-        "https://dl.acm.org/action/doSearch";
+    private static final String SEARCH_URL = "https://dl.acm.org/action/doSearch";
 
     public ACMPortalFetcher() {
         // website dl.acm.org requires cookies
@@ -38,9 +37,7 @@ public Optional<HelpFile> getHelpPage() {
     }
 
     private static String createQueryString(QueryNode query) {
-        return new DefaultQueryTransformer()
-            .transformLuceneQuery(query)
-            .orElse("");
+        return new DefaultQueryTransformer().transformLuceneQuery(query).orElse("");
     }
 
     /**
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 fa3ba1b29e8..6b84dd28ee9 100644
--- a/src/main/java/org/jabref/logic/importer/fetcher/ACS.java
+++ b/src/main/java/org/jabref/logic/importer/fetcher/ACS.java
@@ -38,9 +38,7 @@ public Optional<URL> findFullText(BibEntry entry) throws IOException {
         Objects.requireNonNull(entry);
 
         // DOI search
-        Optional<DOI> doi = entry
-            .getField(StandardField.DOI)
-            .flatMap(DOI::parse);
+        Optional<DOI> doi = entry.getField(StandardField.DOI).flatMap(DOI::parse);
 
         if (!doi.isPresent()) {
             return Optional.empty();
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 38d7d1889b1..16f18dd9fe8 100644
--- a/src/main/java/org/jabref/logic/importer/fetcher/AbstractIsbnFetcher.java
+++ b/src/main/java/org/jabref/logic/importer/fetcher/AbstractIsbnFetcher.java
@@ -14,9 +14,7 @@ public abstract class AbstractIsbnFetcher implements IdBasedParserFetcher {
 
     protected final ImportFormatPreferences importFormatPreferences;
 
-    public AbstractIsbnFetcher(
-        ImportFormatPreferences importFormatPreferences
-    ) {
+    public AbstractIsbnFetcher(ImportFormatPreferences importFormatPreferences) {
         this.importFormatPreferences = importFormatPreferences;
     }
 
@@ -25,13 +23,10 @@ public Optional<HelpFile> getHelpPage() {
         return Optional.of(HelpFile.FETCHER_ISBN);
     }
 
-    protected void ensureThatIsbnIsValid(String identifier)
-        throws FetcherException {
+    protected void ensureThatIsbnIsValid(String identifier) throws FetcherException {
         ISBN isbn = new ISBN(identifier);
         if (!isbn.isValid()) {
-            throw new FetcherException(
-                Localization.lang("Invalid ISBN: '%0'.", identifier)
-            );
+            throw new FetcherException(Localization.lang("Invalid ISBN: '%0'.", identifier));
         }
     }
 
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 028ecbd5d0d..2721c3bd4fb 100644
--- a/src/main/java/org/jabref/logic/importer/fetcher/ApsFetcher.java
+++ b/src/main/java/org/jabref/logic/importer/fetcher/ApsFetcher.java
@@ -20,9 +20,7 @@
  */
 public class ApsFetcher implements FulltextFetcher {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(
-        ApsFetcher.class
-    );
+    private static final Logger LOGGER = LoggerFactory.getLogger(ApsFetcher.class);
 
     // The actual API needs either an API key or a header. This is a workaround.
     private static final String DOI_URL = "https://www.doi.org/";
@@ -32,9 +30,7 @@ public class ApsFetcher 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.isPresent()) {
             return Optional.empty();
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 998254f2bdd..5c546aa1a26 100644
--- a/src/main/java/org/jabref/logic/importer/fetcher/ArXivFetcher.java
+++ b/src/main/java/org/jabref/logic/importer/fetcher/ArXivFetcher.java
@@ -68,14 +68,9 @@
  */
 public class ArXivFetcher
     implements
-        FulltextFetcher,
-        PagedSearchBasedFetcher,
-        IdBasedFetcher,
-        IdFetcher<ArXivIdentifier> {
+        FulltextFetcher, PagedSearchBasedFetcher, IdBasedFetcher, IdFetcher<ArXivIdentifier> {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(
-        ArXivFetcher.class
-    );
+    private static final Logger LOGGER = LoggerFactory.getLogger(ArXivFetcher.class);
 
     // See https://blog.arxiv.org/2022/02/17/new-arxiv-articles-are-now-automatically-assigned-dois/
     private static final String DOI_PREFIX = "10.48550/arXiv.";
@@ -103,17 +98,15 @@ public class ArXivFetcher
         InternalField.KEY_FIELD
     );
 
-    private static final Map<
-        String,
-        String
-    > ARXIV_KEYWORDS_WITH_COMMA_REPLACEMENTS = Collections.unmodifiableMap(
-        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 =
+        Collections.unmodifiableMap(
+            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;
@@ -126,10 +119,7 @@ public ArXivFetcher(ImportFormatPreferences importFormatPreferences) {
     /**
      * @param doiFetcher The fetcher, maybe be NULL if no additional search is desired.
      */
-    public ArXivFetcher(
-        ImportFormatPreferences importFormatPreferences,
-        DoiFetcher doiFetcher
-    ) {
+    public ArXivFetcher(ImportFormatPreferences importFormatPreferences, DoiFetcher doiFetcher) {
         this.arXiv = new ArXiv(importFormatPreferences);
         this.doiFetcher = doiFetcher;
         this.importFormatPreferences = importFormatPreferences;
@@ -161,9 +151,7 @@ public Optional<HelpFile> getHelpPage() {
      * @param bibEntry A BibEntry to modify
      */
     private void adaptKeywordsFrom(BibEntry bibEntry) {
-        Optional<String> allKeywords = bibEntry.getField(
-            StandardField.KEYWORDS
-        );
+        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
@@ -173,20 +161,14 @@ private void adaptKeywordsFrom(BibEntry bibEntry) {
                 String
             > entry : ARXIV_KEYWORDS_WITH_COMMA_REPLACEMENTS.entrySet()) {
                 allKeywords =
-                    Optional.of(
-                        allKeywords
-                            .get()
-                            .replaceAll(entry.getKey(), entry.getValue())
-                    );
+                    Optional.of(allKeywords.get().replaceAll(entry.getKey(), entry.getValue()));
             }
 
             String filteredKeywords = KeywordList
                 .merge(
                     allKeywords.get(),
                     "",
-                    importFormatPreferences
-                        .bibEntryPreferences()
-                        .getKeywordSeparator()
+                    importFormatPreferences.bibEntryPreferences().getKeywordSeparator()
                 )
                 .toString();
             bibEntry.setField(StandardField.KEYWORDS, filteredKeywords);
@@ -217,13 +199,9 @@ private static String getAutomaticDoi(String arXivId) {
     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
         // ArXiv's API again (method 'findIdentifier')
-        Optional<String> entryEprint = arXivBibEntry.getField(
-            StandardField.EPRINT
-        );
+        Optional<String> entryEprint = arXivBibEntry.getField(StandardField.EPRINT);
         if (entryEprint.isEmpty()) {
-            LOGGER.error(
-                "Cannot infer ArXiv-issued DOI from BibEntry: no 'EPRINT' field found"
-            );
+            LOGGER.error("Cannot infer ArXiv-issued DOI from BibEntry: no 'EPRINT' field found");
             return Optional.empty();
         } else {
             return Optional.of(ArXivFetcher.getAutomaticDoi(entryEprint.get()));
@@ -259,9 +237,7 @@ private static boolean isManualDoi(String doi) {
      * @return User-issued DOI, if any field exists and if it's not an automatic one (see {@link #getAutomaticDoi(ArXivIdentifier)})
      */
     private static Optional<String> getManualDoi(BibEntry arXivBibEntry) {
-        return arXivBibEntry
-            .getField(StandardField.DOI)
-            .filter(ArXivFetcher::isManualDoi);
+        return arXivBibEntry.getField(StandardField.DOI).filter(ArXivFetcher::isManualDoi);
     }
 
     /**
@@ -277,10 +253,7 @@ private static Optional<BibEntry> waitForBibEntryRetrieval(
             return bibEntryFuture.join();
         } catch (CompletionException e) {
             if (!(e.getCause() instanceof FetcherException)) {
-                LOGGER.error(
-                    "The supplied future should only throw a FetcherException.",
-                    e
-                );
+                LOGGER.error("The supplied future should only throw a FetcherException.", e);
                 throw e;
             }
             throw (FetcherException) e.getCause();
@@ -305,11 +278,7 @@ private void mergeArXivEntryWithFutureDoiEntry(
         try {
             bibEntry = waitForBibEntryRetrieval(bibEntryFuture);
         } catch (FetcherException | CompletionException e) {
-            LOGGER.error(
-                "Failed to fetch future BibEntry with id '{}' (skipping merge).",
-                id,
-                e
-            );
+            LOGGER.error("Failed to fetch future BibEntry with id '{}' (skipping merge).", id, e);
             return;
         }
 
@@ -337,10 +306,7 @@ private void inplaceAsyncInfuseArXivWithDoi(BibEntry arXivBibEntry) {
             .flatMap(ArXivIdentifier::parse);
 
         try {
-            this.inplaceAsyncInfuseArXivWithDoi(
-                    arXivBibEntryCompletedFuture,
-                    arXivBibEntryId
-                );
+            this.inplaceAsyncInfuseArXivWithDoi(arXivBibEntryCompletedFuture, arXivBibEntryId);
         } catch (FetcherException e) {
             LOGGER.error(
                 "FetcherException should not be found here, as main Bibtex Entry already exists " +
@@ -361,9 +327,7 @@ private void inplaceAsyncInfuseArXivWithDoi(
         CompletableFuture<Optional<BibEntry>> arXivBibEntryFuture,
         Optional<ArXivIdentifier> arXivId
     ) throws FetcherException {
-        Optional<
-            CompletableFuture<Optional<BibEntry>>
-        > automaticDoiBibEntryFuture;
+        Optional<CompletableFuture<Optional<BibEntry>>> automaticDoiBibEntryFuture;
         Optional<BibEntry> arXivBibEntry;
 
         Optional<String> automaticDoi;
@@ -373,35 +337,27 @@ private void inplaceAsyncInfuseArXivWithDoi(
         // 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()));
+            automaticDoi = Optional.of(ArXivFetcher.getAutomaticDoi(arXivId.get()));
             automaticDoiBibEntryFuture =
-                Optional.of(
-                    doiFetcher.asyncPerformSearchById(automaticDoi.get())
-                );
+                Optional.of(doiFetcher.asyncPerformSearchById(automaticDoi.get()));
 
-            arXivBibEntry =
-                ArXivFetcher.waitForBibEntryRetrieval(arXivBibEntryFuture);
+            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)
-            arXivBibEntry =
-                ArXivFetcher.waitForBibEntryRetrieval(arXivBibEntryFuture);
+            arXivBibEntry = ArXivFetcher.waitForBibEntryRetrieval(arXivBibEntryFuture);
             if (arXivBibEntry.isEmpty()) {
                 return;
             }
 
             automaticDoi = ArXivFetcher.getAutomaticDoi(arXivBibEntry.get());
-            automaticDoiBibEntryFuture =
-                automaticDoi.map(arXiv::asyncPerformSearchById);
+            automaticDoiBibEntryFuture = automaticDoi.map(arXiv::asyncPerformSearchById);
         }
 
         manualDoi = ArXivFetcher.getManualDoi(arXivBibEntry.get());
-        Optional<
-            CompletableFuture<Optional<BibEntry>>
-        > manualDoiBibEntryFuture = manualDoi.map(
+        Optional<CompletableFuture<Optional<BibEntry>>> manualDoiBibEntryFuture = manualDoi.map(
             doiFetcher::asyncPerformSearchById
         );
 
@@ -431,21 +387,14 @@ private void inplaceAsyncInfuseArXivWithDoi(
      * @return A list of entries matching the complex query
      */
     @Override
-    public Page<BibEntry> performSearchPaged(
-        QueryNode luceneQuery,
-        int pageNumber
-    ) throws FetcherException {
-        Page<BibEntry> result = arXiv.performSearchPaged(
-            luceneQuery,
-            pageNumber
-        );
+    public Page<BibEntry> performSearchPaged(QueryNode luceneQuery, int pageNumber)
+        throws FetcherException {
+        Page<BibEntry> result = arXiv.performSearchPaged(luceneQuery, pageNumber);
         if (this.doiFetcher == null) {
             return result;
         }
 
-        ExecutorService executor = Executors.newFixedThreadPool(
-            getPageSize() * 2
-        );
+        ExecutorService executor = Executors.newFixedThreadPool(getPageSize() * 2);
 
         Collection<CompletableFuture<BibEntry>> futureSearchResult = result
             .getContent()
@@ -466,30 +415,22 @@ public Page<BibEntry> performSearchPaged(
             .map(CompletableFuture::join)
             .collect(Collectors.toList());
 
-        return new Page<>(
-            result.getQuery(),
-            result.getPageNumber(),
-            modifiedSearchResult
-        );
+        return new Page<>(result.getQuery(), result.getPageNumber(), modifiedSearchResult);
     }
 
     @Override
-    public Optional<BibEntry> performSearchById(String identifier)
-        throws FetcherException {
-        CompletableFuture<Optional<BibEntry>> arXivBibEntryPromise =
-            arXiv.asyncPerformSearchById(identifier);
+    public Optional<BibEntry> performSearchById(String identifier) throws FetcherException {
+        CompletableFuture<Optional<BibEntry>> arXivBibEntryPromise = arXiv.asyncPerformSearchById(
+            identifier
+        );
         if (this.doiFetcher != null) {
-            inplaceAsyncInfuseArXivWithDoi(
-                arXivBibEntryPromise,
-                ArXivIdentifier.parse(identifier)
-            );
+            inplaceAsyncInfuseArXivWithDoi(arXivBibEntryPromise, ArXivIdentifier.parse(identifier));
         }
         return arXivBibEntryPromise.join();
     }
 
     @Override
-    public Optional<ArXivIdentifier> findIdentifier(BibEntry entry)
-        throws FetcherException {
+    public Optional<ArXivIdentifier> findIdentifier(BibEntry entry) throws FetcherException {
         return arXiv.findIdentifier(entry);
     }
 
@@ -511,17 +452,11 @@ public String getIdentifierName() {
      */
     protected class ArXiv
         implements
-            FulltextFetcher,
-            PagedSearchBasedFetcher,
-            IdBasedFetcher,
-            IdFetcher<ArXivIdentifier> {
+            FulltextFetcher, PagedSearchBasedFetcher, IdBasedFetcher, IdFetcher<ArXivIdentifier> {
 
-        private static final Logger LOGGER = LoggerFactory.getLogger(
-            ArXivFetcher.ArXiv.class
-        );
+        private static final Logger LOGGER = LoggerFactory.getLogger(ArXivFetcher.ArXiv.class);
 
-        private static final String API_URL =
-            "https://export.arxiv.org/api/query";
+        private static final String API_URL = "https://export.arxiv.org/api/query";
 
         private final ImportFormatPreferences importFormatPreferences;
 
@@ -540,9 +475,7 @@ public Optional<URL> findFullText(BibEntry entry) throws IOException {
                     .filter(Optional::isPresent)
                     .map(Optional::get)
                     .findFirst();
-                pdfUrl.ifPresent(url ->
-                    LOGGER.info("Fulltext PDF found @ arXiv.")
-                );
+                pdfUrl.ifPresent(url -> LOGGER.info("Fulltext PDF found @ arXiv."));
                 return pdfUrl;
             } catch (FetcherException e) {
                 LOGGER.warn("arXiv API request failed", e);
@@ -556,14 +489,8 @@ public TrustLevel getTrustLevel() {
             return TrustLevel.PREPRINT;
         }
 
-        private Optional<ArXivEntry> searchForEntry(String searchQuery)
-            throws FetcherException {
-            List<ArXivEntry> entries = queryApi(
-                searchQuery,
-                Collections.emptyList(),
-                0,
-                1
-            );
+        private Optional<ArXivEntry> searchForEntry(String searchQuery) throws FetcherException {
+            List<ArXivEntry> entries = queryApi(searchQuery, Collections.emptyList(), 0, 1);
             if (entries.size() == 1) {
                 return Optional.of(entries.get(0));
             } else {
@@ -571,8 +498,7 @@ private Optional<ArXivEntry> searchForEntry(String searchQuery)
             }
         }
 
-        private Optional<ArXivEntry> searchForEntryById(String id)
-            throws FetcherException {
+        private Optional<ArXivEntry> searchForEntryById(String id) throws FetcherException {
             Optional<ArXivIdentifier> identifier = ArXivIdentifier.parse(id);
             if (identifier.isEmpty()) {
                 return Optional.empty();
@@ -591,8 +517,7 @@ private Optional<ArXivEntry> searchForEntryById(String id)
             }
         }
 
-        private List<ArXivEntry> searchForEntries(BibEntry originalEntry)
-            throws FetcherException {
+        private List<ArXivEntry> searchForEntries(BibEntry originalEntry) throws FetcherException {
             // We need to clone the entry, because we modify it by a cleanup job.
             final BibEntry entry = (BibEntry) originalEntry.clone();
 
@@ -602,9 +527,7 @@ private List<ArXivEntry> searchForEntries(BibEntry originalEntry)
             if (StringUtil.isNotBlank(identifier)) {
                 try {
                     // Get pdf of entry with the specified id
-                    return OptionalUtil.toList(
-                        searchForEntryById(identifier.get())
-                    );
+                    return OptionalUtil.toList(searchForEntryById(identifier.get()));
                 } catch (FetcherException e) {
                     LOGGER.warn("arXiv eprint API request failed", e);
                 }
@@ -618,10 +541,7 @@ private List<ArXivEntry> searchForEntries(BibEntry originalEntry)
                 .map(DOI::getNormalized);
 
             // ArXiv-issued DOIs seem to be unsearchable from ArXiv API's "query string", so ignore it
-            if (
-                doiString.isPresent() &&
-                ArXivFetcher.isManualDoi(doiString.get())
-            ) {
+            if (doiString.isPresent() && ArXivFetcher.isManualDoi(doiString.get())) {
                 query = "doi:" + doiString.get();
             } else {
                 Optional<String> authorQuery = entry
@@ -630,11 +550,7 @@ private List<ArXivEntry> searchForEntries(BibEntry originalEntry)
                 Optional<String> titleQuery = entry
                     .getField(StandardField.TITLE)
                     .map(title -> "ti:" + StringUtil.ignoreCurlyBracket(title));
-                query =
-                    String.join(
-                        "+AND+",
-                        OptionalUtil.toList(authorQuery, titleQuery)
-                    );
+                query = String.join("+AND+", OptionalUtil.toList(authorQuery, titleQuery));
             }
 
             Optional<ArXivEntry> arxivEntry = searchForEntry(query);
@@ -653,10 +569,8 @@ private List<ArXivEntry> searchForEntries(BibEntry originalEntry)
             return Collections.emptyList();
         }
 
-        private List<ArXivEntry> searchForEntries(
-            String searchQuery,
-            int pageNumber
-        ) throws FetcherException {
+        private List<ArXivEntry> searchForEntries(String searchQuery, int pageNumber)
+            throws FetcherException {
             return queryApi(
                 searchQuery,
                 Collections.emptyList(),
@@ -672,14 +586,9 @@ private List<ArXivEntry> queryApi(
             int maxResults
         ) throws FetcherException {
             Document result = callApi(searchQuery, ids, start, maxResults);
-            List<Node> entries = XMLUtil.asList(
-                result.getElementsByTagName("entry")
-            );
+            List<Node> entries = XMLUtil.asList(result.getElementsByTagName("entry"));
 
-            return entries
-                .stream()
-                .map(ArXivEntry::new)
-                .collect(Collectors.toList());
+            return entries.stream().map(ArXivEntry::new).collect(Collectors.toList());
         }
 
         /**
@@ -714,10 +623,7 @@ private Document callApi(
                 URIBuilder uriBuilder = new URIBuilder(API_URL);
                 // The arXiv API has problems with accents, so we remove them (i.e. Fréchet -> Frechet)
                 if (StringUtil.isNotBlank(searchQuery)) {
-                    uriBuilder.addParameter(
-                        "search_query",
-                        StringUtil.stripAccents(searchQuery)
-                    );
+                    uriBuilder.addParameter("search_query", StringUtil.stripAccents(searchQuery));
                 }
                 if (!ids.isEmpty()) {
                     uriBuilder.addParameter(
@@ -729,23 +635,16 @@ private Document callApi(
                     );
                 }
                 uriBuilder.addParameter("start", String.valueOf(start));
-                uriBuilder.addParameter(
-                    "max_results",
-                    String.valueOf(maxResults)
-                );
+                uriBuilder.addParameter("max_results", String.valueOf(maxResults));
                 URL url = uriBuilder.build().toURL();
 
-                DocumentBuilderFactory factory =
-                    DocumentBuilderFactory.newInstance();
+                DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
                 DocumentBuilder builder = factory.newDocumentBuilder();
 
-                HttpURLConnection connection =
-                    (HttpURLConnection) url.openConnection();
+                HttpURLConnection connection = (HttpURLConnection) url.openConnection();
                 if (connection.getResponseCode() == 400) {
                     // Bad request error from server, try to get more information
-                    throw getException(
-                        builder.parse(connection.getErrorStream())
-                    );
+                    throw getException(builder.parse(connection.getErrorStream()));
                 } else {
                     return builder.parse(connection.getInputStream());
                 }
@@ -755,17 +654,12 @@ private Document callApi(
                 | IOException
                 | URISyntaxException exception
             ) {
-                throw new FetcherException(
-                    "arXiv API request failed",
-                    exception
-                );
+                throw new FetcherException("arXiv API request failed", exception);
             }
         }
 
         private FetcherException getException(Document error) {
-            List<Node> entries = XMLUtil.asList(
-                error.getElementsByTagName("entry")
-            );
+            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:
@@ -779,9 +673,7 @@ private FetcherException getException(Document error) {
                 Node node = entries.get(0);
                 Optional<String> id = XMLUtil.getNodeContent(node, "id");
                 Boolean isError = id
-                    .map(idContent ->
-                        idContent.startsWith("http://arxiv.org/api/errors")
-                    )
+                    .map(idContent -> idContent.startsWith("http://arxiv.org/api/errors"))
                     .orElse(false);
                 if (isError) {
                     String errorMessage = XMLUtil
@@ -810,32 +702,19 @@ 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
-            )
+            String transformedQuery = transformer.transformLuceneQuery(luceneQuery).orElse("");
+            List<BibEntry> searchResult = searchForEntries(transformedQuery, pageNumber)
                 .stream()
                 .map(arXivEntry ->
                     arXivEntry.toBibEntry(
-                        importFormatPreferences
-                            .bibEntryPreferences()
-                            .getKeywordSeparator()
+                        importFormatPreferences.bibEntryPreferences().getKeywordSeparator()
                     )
                 )
                 .collect(Collectors.toList());
-            return new Page<>(
-                transformedQuery,
-                pageNumber,
-                filterYears(searchResult, transformer)
-            );
+            return new Page<>(transformedQuery, pageNumber, filterYears(searchResult, transformer));
         }
 
         private List<BibEntry> filterYears(
@@ -848,30 +727,19 @@ private List<BibEntry> filterYears(
                 // Filter the date field for year only
                 .filter(entry ->
                     transformer.getEndYear().isEmpty() ||
-                    (Integer.parseInt(
-                            entry
-                                .getField(StandardField.DATE)
-                                .get()
-                                .substring(0, 4)
-                        ) <=
+                    (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)
-                        ) >=
+                    (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 {
+        protected CompletableFuture<Optional<BibEntry>> asyncPerformSearchById(String identifier)
+            throws CompletionException {
             return CompletableFuture.supplyAsync(() -> {
                 try {
                     return performSearchById(identifier);
@@ -882,21 +750,17 @@ protected CompletableFuture<Optional<BibEntry>> asyncPerformSearchById(
         }
 
         @Override
-        public Optional<BibEntry> performSearchById(String identifier)
-            throws FetcherException {
+        public Optional<BibEntry> performSearchById(String identifier) throws FetcherException {
             return searchForEntryById(identifier)
                 .map(arXivEntry ->
                     arXivEntry.toBibEntry(
-                        importFormatPreferences
-                            .bibEntryPreferences()
-                            .getKeywordSeparator()
+                        importFormatPreferences.bibEntryPreferences().getKeywordSeparator()
                     )
                 );
         }
 
         @Override
-        public Optional<ArXivIdentifier> findIdentifier(BibEntry entry)
-            throws FetcherException {
+        public Optional<ArXivIdentifier> findIdentifier(BibEntry entry) throws FetcherException {
             return searchForEntries(entry)
                 .stream()
                 .map(ArXivEntry::getId)
@@ -928,10 +792,7 @@ public ArXivEntry(Node item) {
 
                 // Title of the article
                 // The result from the arXiv contains hard line breaks, try to remove them
-                title =
-                    XMLUtil
-                        .getNodeContent(item, "title")
-                        .map(ArXivEntry::correctLineBreaks);
+                title = XMLUtil.getNodeContent(item, "title").map(ArXivEntry::correctLineBreaks);
 
                 // The url leading to the abstract page
                 urlAbstractPage = XMLUtil.getNodeContent(item, "id");
@@ -957,24 +818,15 @@ public ArXivEntry(Node item) {
 
                 // Categories (arXiv, ACM, or MSC classification)
                 categories = new ArrayList<>();
-                for (Node categoryNode : XMLUtil.getNodesByName(
-                    item,
-                    "category"
-                )) {
-                    Optional<String> category = XMLUtil.getAttributeContent(
-                        categoryNode,
-                        "term"
-                    );
+                for (Node categoryNode : XMLUtil.getNodesByName(item, "category")) {
+                    Optional<String> category = XMLUtil.getAttributeContent(categoryNode, "term");
                     category.ifPresent(categories::add);
                 }
 
                 // Links
                 Optional<URL> pdfUrlParsed = Optional.empty();
                 for (Node linkNode : XMLUtil.getNodesByName(item, "link")) {
-                    Optional<String> linkTitle = XMLUtil.getAttributeContent(
-                        linkNode,
-                        "title"
-                    );
+                    Optional<String> linkTitle = XMLUtil.getAttributeContent(linkNode, "title");
                     if (linkTitle.equals(Optional.of("pdf"))) {
                         pdfUrlParsed =
                             XMLUtil
@@ -994,25 +846,20 @@ public ArXivEntry(Node item) {
                 doi = XMLUtil.getNodeContent(item, "arxiv:doi");
 
                 // Journal reference (as provided by the author)
-                journalReferenceText =
-                    XMLUtil.getNodeContent(item, "arxiv:journal_ref");
+                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")
-                        );
+                        .flatMap(node -> XMLUtil.getAttributeContent(node, "term"));
             }
 
             public static String correctLineBreaks(String s) {
                 String result = s.replaceAll("\\n(?!\\s*\\n)", " ");
                 result = result.replaceAll("\\s*\\n\\s*", "\n");
-                return result
-                    .replaceAll(" {2,}", " ")
-                    .replaceAll("(^\\s*|\\s+$)", "");
+                return result.replaceAll(" {2,}", " ").replaceAll("(^\\s*|\\s+$)", "");
             }
 
             /**
@@ -1052,27 +899,16 @@ public Optional<String> getDate() {
             public BibEntry toBibEntry(Character keywordDelimiter) {
                 BibEntry bibEntry = new BibEntry(StandardEntryType.Article);
                 bibEntry.setField(StandardField.EPRINTTYPE, "arXiv");
-                bibEntry.setField(
-                    StandardField.AUTHOR,
-                    String.join(" and ", authorNames)
-                );
+                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)
-                );
-                doi.ifPresent(doiContent ->
-                    bibEntry.setField(StandardField.DOI, doiContent)
+                getIdString().ifPresent(id -> bibEntry.setField(StandardField.EPRINT, id));
+                title.ifPresent(titleContent -> bibEntry.setField(StandardField.TITLE, titleContent)
                 );
+                doi.ifPresent(doiContent -> bibEntry.setField(StandardField.DOI, doiContent));
                 abstractText.ifPresent(abstractContent ->
                     bibEntry.setField(StandardField.ABSTRACT, abstractContent)
                 );
-                getDate()
-                    .ifPresent(date ->
-                        bibEntry.setField(StandardField.DATE, date)
-                    );
+                getDate().ifPresent(date -> bibEntry.setField(StandardField.DATE, date));
                 primaryCategory.ifPresent(category ->
                     bibEntry.setField(StandardField.EPRINTCLASS, category)
                 );
@@ -1081,11 +917,7 @@ public BibEntry toBibEntry(Character keywordDelimiter) {
                 );
                 getPdfUrl()
                     .ifPresent(url ->
-                        bibEntry.setFiles(
-                            Collections.singletonList(
-                                new LinkedFile(url, "PDF")
-                            )
-                        )
+                        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 ec48157edb6..f19a6b55b8d 100644
--- a/src/main/java/org/jabref/logic/importer/fetcher/AstrophysicsDataSystem.java
+++ b/src/main/java/org/jabref/logic/importer/fetcher/AstrophysicsDataSystem.java
@@ -52,13 +52,11 @@ public class AstrophysicsDataSystem
         EntryBasedParserFetcher,
         CustomizableKeyFetcher {
 
-    private static final String API_SEARCH_URL =
-        "https://api.adsabs.harvard.edu/v1/search/query";
+    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_KEY = new BuildInfo()
-        .astrophysicsDataSystemAPIKey;
+    private static final String API_KEY = new BuildInfo().astrophysicsDataSystemAPIKey;
     private final ImportFormatPreferences preferences;
     private final ImporterPreferences importerPreferences;
 
@@ -82,8 +80,7 @@ private static String buildPostData(Collection<String> bibcodes) {
     /**
      * @return export URL endpoint
      */
-    private static URL getURLforExport()
-        throws URISyntaxException, MalformedURLException {
+    private static URL getURLforExport() throws URISyntaxException, MalformedURLException {
         return new URIBuilder(API_EXPORT_URL).build().toURL();
     }
 
@@ -102,16 +99,11 @@ public URL getURLForQuery(QueryNode luceneQuery, int pageNumber)
         URIBuilder builder = new URIBuilder(API_SEARCH_URL);
         builder.addParameter(
             "q",
-            new DefaultQueryTransformer()
-                .transformLuceneQuery(luceneQuery)
-                .orElse("")
+            new DefaultQueryTransformer().transformLuceneQuery(luceneQuery).orElse("")
         );
         builder.addParameter("fl", "bibcode");
         builder.addParameter("rows", String.valueOf(getPageSize()));
-        builder.addParameter(
-            "start",
-            String.valueOf(getPageSize() * pageNumber)
-        );
+        builder.addParameter("start", String.valueOf(getPageSize() * pageNumber));
         return builder.build().toURL();
     }
 
@@ -120,8 +112,7 @@ public URL getURLForQuery(QueryNode luceneQuery, int pageNumber)
      * @return URL which points to a search request for given entry
      */
     @Override
-    public URL getURLForEntry(BibEntry entry)
-        throws URISyntaxException, MalformedURLException {
+    public URL getURLForEntry(BibEntry entry) throws URISyntaxException, MalformedURLException {
         StringBuilder stringBuilder = new StringBuilder();
 
         Optional<String> title = entry
@@ -132,9 +123,7 @@ public URL getURLForEntry(BibEntry entry)
             .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(""));
         }
@@ -154,8 +143,7 @@ public URL getURLForEntry(BibEntry entry)
     @Override
     public URL getUrlForIdentifier(String identifier)
         throws FetcherException, URISyntaxException, MalformedURLException {
-        String query =
-            "doi:\"" + identifier + "\" OR " + "bibcode:\"" + identifier + "\"";
+        String query = "doi:\"" + identifier + "\" OR " + "bibcode:\"" + identifier + "\"";
         URIBuilder builder = new URIBuilder(API_SEARCH_URL);
         builder.addParameter("q", query);
         builder.addParameter("fl", "bibcode");
@@ -174,62 +162,37 @@ public Parser getParser() {
 
     @Override
     public void doPostCleanup(BibEntry entry) {
-        new FieldFormatterCleanup(
-            StandardField.ABSTRACT,
-            new RemoveBracesFormatter()
-        )
-            .cleanup(entry);
-        new FieldFormatterCleanup(
-            StandardField.ABSTRACT,
-            new RemoveNewlinesFormatter()
-        )
+        new FieldFormatterCleanup(StandardField.ABSTRACT, new RemoveBracesFormatter())
             .cleanup(entry);
-        new FieldFormatterCleanup(
-            StandardField.TITLE,
-            new RemoveBracesFormatter()
-        )
+        new FieldFormatterCleanup(StandardField.ABSTRACT, new RemoveNewlinesFormatter())
             .cleanup(entry);
-        new FieldFormatterCleanup(
-            StandardField.AUTHOR,
-            new NormalizeNamesFormatter()
-        )
+        new FieldFormatterCleanup(StandardField.TITLE, new RemoveBracesFormatter()).cleanup(entry);
+        new FieldFormatterCleanup(StandardField.AUTHOR, new NormalizeNamesFormatter())
             .cleanup(entry);
-        new FieldFormatterCleanup(
-            StandardField.MONTH,
-            new NormalizeMonthFormatter()
-        )
+        new FieldFormatterCleanup(StandardField.MONTH, new NormalizeMonthFormatter())
             .cleanup(entry);
 
         // Remove ADS note
-        new FieldFormatterCleanup(
-            new UnknownField("adsnote"),
-            new ClearFormatter()
-        )
-            .cleanup(entry);
+        new FieldFormatterCleanup(new UnknownField("adsnote"), new ClearFormatter()).cleanup(entry);
         // Move adsurl to url field
-        new MoveFieldCleanup(new UnknownField("adsurl"), StandardField.URL)
-            .cleanup(entry);
+        new MoveFieldCleanup(new UnknownField("adsurl"), StandardField.URL).cleanup(entry);
         entry
             .getField(StandardField.ABSTRACT)
             .filter("Not Available <P />"::equals)
-            .ifPresent(abstractText -> entry.clearField(StandardField.ABSTRACT)
-            );
+            .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)
-            );
+            .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 {
+    public List<BibEntry> performSearch(BibEntry entry) throws FetcherException {
         if (
             entry.getFieldOrAlias(StandardField.TITLE).isEmpty() &&
             entry.getFieldOrAlias(StandardField.AUTHOR).isEmpty()
@@ -256,9 +219,7 @@ private List<String> fetchBibcodes(URL url) throws FetcherException {
             URLDownload download = getUrlDownload(url);
             String content = download.asString();
             JSONObject obj = new JSONObject(content);
-            JSONArray codes = obj
-                .getJSONObject("response")
-                .getJSONArray("docs");
+            JSONArray codes = obj.getJSONObject("response").getJSONArray("docs");
             List<String> bibcodes = new ArrayList<>();
             for (int i = 0; i < codes.length(); i++) {
                 bibcodes.add(codes.getJSONObject(i).getString("bibcode"));
@@ -272,16 +233,13 @@ private List<String> fetchBibcodes(URL url) throws FetcherException {
     }
 
     @Override
-    public Optional<BibEntry> performSearchById(String identifier)
-        throws FetcherException {
+    public Optional<BibEntry> performSearchById(String identifier) throws FetcherException {
         if (StringUtil.isBlank(identifier)) {
             return Optional.empty();
         }
 
         try {
-            List<String> bibcodes = fetchBibcodes(
-                getUrlForIdentifier(identifier)
-            );
+            List<String> bibcodes = fetchBibcodes(getUrlForIdentifier(identifier));
             List<BibEntry> fetchedEntries = performSearchByIds(bibcodes);
 
             if (fetchedEntries.isEmpty()) {
@@ -323,8 +281,7 @@ private List<BibEntry> performSearchByIds(Collection<String> identifiers)
             URLDownload download = new URLDownload(getURLforExport());
             download.addHeader(
                 "Authorization",
-                "Bearer " +
-                importerPreferences.getApiKey(getName()).orElse(API_KEY)
+                "Bearer " + importerPreferences.getApiKey(getName()).orElse(API_KEY)
             );
             download.addHeader("ContentType", "application/json");
             download.setPostData(postData);
@@ -332,8 +289,7 @@ private List<BibEntry> performSearchByIds(Collection<String> identifiers)
             JSONObject obj = new JSONObject(content);
 
             try {
-                List<BibEntry> fetchedEntries = getParser()
-                    .parseEntries(obj.optString("export"));
+                List<BibEntry> fetchedEntries = getParser().parseEntries(obj.optString("export"));
                 if (fetchedEntries.isEmpty()) {
                     return Collections.emptyList();
                 }
@@ -354,8 +310,7 @@ private List<BibEntry> performSearchByIds(Collection<String> identifiers)
     }
 
     @Override
-    public List<BibEntry> performSearch(QueryNode luceneQuery)
-        throws FetcherException {
+    public List<BibEntry> performSearch(QueryNode luceneQuery) throws FetcherException {
         URL urlForQuery;
         try {
             urlForQuery = getURLForQuery(luceneQuery);
@@ -369,10 +324,8 @@ public List<BibEntry> performSearch(QueryNode luceneQuery)
     }
 
     @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);
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 a346124190f..f5badbef7fb 100644
--- a/src/main/java/org/jabref/logic/importer/fetcher/BibsonomyScraper.java
+++ b/src/main/java/org/jabref/logic/importer/fetcher/BibsonomyScraper.java
@@ -16,13 +16,10 @@
  */
 public class BibsonomyScraper {
 
-    private static final String BIBSONOMY_SCRAPER =
-        "https://scraper.bibsonomy.org/service?url=";
+    private static final String BIBSONOMY_SCRAPER = "https://scraper.bibsonomy.org/service?url=";
     private static final String BIBSONOMY_SCRAPER_POST = "&format=bibtex";
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(
-        BibsonomyScraper.class
-    );
+    private static final Logger LOGGER = LoggerFactory.getLogger(BibsonomyScraper.class);
 
     private BibsonomyScraper() {}
 
@@ -49,10 +46,7 @@ public static Optional<BibEntry> getEntry(
                 BibsonomyScraper.BIBSONOMY_SCRAPER_POST
             );
             String bibtex = new URLDownload(url).asString();
-            return BibtexParser.singleFromString(
-                bibtex,
-                importFormatPreferences
-            );
+            return BibtexParser.singleFromString(bibtex, importFormatPreferences);
         } catch (IOException ex) {
             LOGGER.warn("Could not download entry", ex);
             return Optional.empty();
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 31a542a3f30..83297ded792 100644
--- a/src/main/java/org/jabref/logic/importer/fetcher/BiodiversityLibrary.java
+++ b/src/main/java/org/jabref/logic/importer/fetcher/BiodiversityLibrary.java
@@ -34,13 +34,10 @@
  *
  * @see <a href="https://www.biodiversitylibrary.org/docs/api3.html">API documentation</a>
  */
-public class BiodiversityLibrary
-    implements SearchBasedParserFetcher, CustomizableKeyFetcher {
+public class BiodiversityLibrary implements SearchBasedParserFetcher, CustomizableKeyFetcher {
 
-    private static final String API_KEY = new BuildInfo()
-        .biodiversityHeritageApiKey;
-    private static final String BASE_URL =
-        "https://www.biodiversitylibrary.org/api3";
+    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=";
@@ -65,10 +62,7 @@ public String getTestUrl() {
 
     public URL getBaseURL() throws URISyntaxException, MalformedURLException {
         URIBuilder baseURI = new URIBuilder(BASE_URL);
-        baseURI.addParameter(
-            "apikey",
-            importerPreferences.getApiKey(getName()).orElse(API_KEY)
-        );
+        baseURI.addParameter("apikey", importerPreferences.getApiKey(getName()).orElse(API_KEY));
         baseURI.addParameter("format", RESPONSE_FORMAT);
 
         return baseURI.build().toURL();
@@ -110,62 +104,35 @@ public BibEntry parseBibJSONtoBibtex(JSONObject item, BibEntry entry)
             if (item.getString("BHLType").equals("Part")) {
                 URL url = getPartMetadataURL(item.getString("PartID"));
                 JSONObject itemsDetails = getDetails(url);
-                entry.setField(
-                    StandardField.LANGUAGE,
-                    itemsDetails.optString("Language", "")
-                );
+                entry.setField(StandardField.LANGUAGE, itemsDetails.optString("Language", ""));
 
-                entry.setField(
-                    StandardField.DOI,
-                    itemsDetails.optString("Doi", "")
-                );
+                entry.setField(StandardField.DOI, itemsDetails.optString("Doi", ""));
 
                 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", "")
-                );
+                entry.setField(StandardField.DATE, itemsDetails.optString("Date", ""));
+                entry.setField(StandardField.VOLUME, itemsDetails.optString("Volume", ""));
+                entry.setField(StandardField.URL, itemsDetails.optString("PartUrl", ""));
             }
 
             if (item.getString("BHLType").equals("Item")) {
                 URL url = getItemMetadataURL(item.getString("ItemID"));
                 JSONObject itemsDetails = getDetails(url);
-                entry.setField(
-                    StandardField.EDITOR,
-                    itemsDetails.optString("Sponsor", "")
-                );
+                entry.setField(StandardField.EDITOR, itemsDetails.optString("Sponsor", ""));
                 entry.setField(
                     StandardField.PUBLISHER,
                     itemsDetails.optString("HoldingInstitution", "")
                 );
-                entry.setField(
-                    StandardField.LANGUAGE,
-                    itemsDetails.optString("Language", "")
-                );
-                entry.setField(
-                    StandardField.URL,
-                    itemsDetails.optString("ItemUrl", "")
-                );
+                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)
                 ) {
-                    entry.setField(
-                        StandardField.DATE,
-                        itemsDetails.getString("Date")
-                    );
+                    entry.setField(StandardField.DATE, itemsDetails.getString("Date"));
                 }
             }
         }
@@ -183,30 +150,15 @@ public BibEntry jsonResultToBibEntry(JSONObject item) {
         }
         entry.setField(StandardField.TITLE, item.optString("Title", ""));
 
-        entry.setField(
-            StandardField.AUTHOR,
-            toAuthors(item.optJSONArray("Authors"))
-        );
+        entry.setField(StandardField.AUTHOR, toAuthors(item.optJSONArray("Authors")));
 
         entry.setField(StandardField.PAGES, item.optString("PageRange", ""));
-        entry.setField(
-            StandardField.LOCATION,
-            item.optString("PublisherPlace", "")
-        );
-        entry.setField(
-            StandardField.PUBLISHER,
-            item.optString("PublisherName", "")
-        );
+        entry.setField(StandardField.LOCATION, item.optString("PublisherPlace", ""));
+        entry.setField(StandardField.PUBLISHER, item.optString("PublisherName", ""));
 
         entry.setField(StandardField.DATE, item.optString("Date", ""));
-        entry.setField(
-            StandardField.YEAR,
-            item.optString("PublicationDate", "")
-        );
-        entry.setField(
-            StandardField.JOURNALTITLE,
-            item.optString("ContainerTitle", "")
-        );
+        entry.setField(StandardField.YEAR, item.optString("PublicationDate", ""));
+        entry.setField(StandardField.JOURNALTITLE, item.optString("ContainerTitle", ""));
         entry.setField(StandardField.VOLUME, item.optString("Volume", ""));
 
         return entry;
@@ -221,9 +173,7 @@ private String toAuthors(JSONArray authors) {
         return IntStream
             .range(0, authors.length())
             .mapToObj(authors::getJSONObject)
-            .map(author ->
-                new Author(author.optString("Name", ""), "", "", "", "")
-            )
+            .map(author -> new Author(author.optString("Name", ""), "", "", "", ""))
             .collect(AuthorList.collect())
             .getAsFirstLastNamesWithAnd();
     }
@@ -248,13 +198,8 @@ public Parser getParser() {
                 BibEntry entry = jsonResultToBibEntry(item);
                 try {
                     entry = parseBibJSONtoBibtex(item, entry);
-                } catch (
-                    JSONException | IOException | URISyntaxException exception
-                ) {
-                    throw new ParseException(
-                        "Error when parsing entry",
-                        exception
-                    );
+                } catch (JSONException | IOException | URISyntaxException exception) {
+                    throw new ParseException("Error when parsing entry", exception);
                 }
                 entries.add(entry);
             }
@@ -267,8 +212,7 @@ public Parser getParser() {
     public URL getURLForQuery(QueryNode luceneQuery)
         throws URISyntaxException, MalformedURLException, FetcherException {
         URIBuilder uriBuilder = new URIBuilder(getBaseURL().toURI());
-        BiodiversityLibraryTransformer transformer =
-            new BiodiversityLibraryTransformer();
+        BiodiversityLibraryTransformer transformer = new BiodiversityLibraryTransformer();
         uriBuilder.addParameter("op", "PublicationSearch");
         uriBuilder.addParameter("searchtype", "C");
         uriBuilder.addParameter(
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 9841255dcb1..3be64baee8d 100644
--- a/src/main/java/org/jabref/logic/importer/fetcher/BvbFetcher.java
+++ b/src/main/java/org/jabref/logic/importer/fetcher/BvbFetcher.java
@@ -14,8 +14,7 @@
 
 public class BvbFetcher implements SearchBasedParserFetcher {
 
-    private static final String URL_PATTERN =
-        "http://bvbr.bib-bvb.de:5661/bvb01sru?";
+    private static final String URL_PATTERN = "http://bvbr.bib-bvb.de:5661/bvb01sru?";
 
     @Override
     public String getName() {
@@ -28,8 +27,7 @@ public Optional<HelpFile> getHelpPage() {
     }
 
     @Override
-    public URL getURLForQuery(QueryNode query)
-        throws URISyntaxException, MalformedURLException {
+    public URL getURLForQuery(QueryNode query) throws URISyntaxException, MalformedURLException {
         URIBuilder uriBuilder = new URIBuilder(URL_PATTERN);
         uriBuilder.addParameter("version", "1.1");
         uriBuilder.addParameter("recordSchema", "marcxml");
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 75aae239a42..a5d96cedb42 100644
--- a/src/main/java/org/jabref/logic/importer/fetcher/CiteSeer.java
+++ b/src/main/java/org/jabref/logic/importer/fetcher/CiteSeer.java
@@ -24,8 +24,7 @@ public class CiteSeer implements SearchBasedFetcher, FulltextFetcher {
 
     private static final String BASE_URL = "citeseerx.ist.psu.edu";
 
-    private static final String API_URL =
-        "https://citeseerx.ist.psu.edu/api/search";
+    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";
@@ -45,8 +44,7 @@ public Optional<HelpFile> getHelpPage() {
     }
 
     @Override
-    public List<BibEntry> performSearch(QueryNode luceneQuery)
-        throws FetcherException {
+    public List<BibEntry> performSearch(QueryNode luceneQuery) throws FetcherException {
         // ADR-0014
         try {
             JSONElement payload = getPayloadJSON(luceneQuery);
@@ -86,15 +84,12 @@ public List<BibEntry> performSearch(QueryNode luceneQuery)
 
     private JSONElement getPayloadJSON(QueryNode luceneQuery) {
         transformer = new CiteSeerQueryTransformer();
-        String transformedQuery = transformer
-            .transformLuceneQuery(luceneQuery)
-            .orElse("");
+        String transformedQuery = transformer.transformLuceneQuery(luceneQuery).orElse("");
         return transformer.getJSONPayload();
     }
 
     @Override
-    public Optional<URL> findFullText(BibEntry entry)
-        throws IOException, FetcherException {
+    public Optional<URL> findFullText(BibEntry entry) throws IOException, FetcherException {
         Objects.requireNonNull(entry);
 
         // does not use a valid DOI, but Cite Seer's id / hash available for each entry
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 652092c084e..a8f0a7c6ceb 100644
--- a/src/main/java/org/jabref/logic/importer/fetcher/CollectionOfComputerScienceBibliographiesFetcher.java
+++ b/src/main/java/org/jabref/logic/importer/fetcher/CollectionOfComputerScienceBibliographiesFetcher.java
@@ -22,21 +22,16 @@
 import org.jabref.model.entry.field.StandardField;
 import org.jabref.model.entry.field.UnknownField;
 
-public class CollectionOfComputerScienceBibliographiesFetcher
-    implements SearchBasedParserFetcher {
+public class CollectionOfComputerScienceBibliographiesFetcher implements SearchBasedParserFetcher {
 
-    private static final String BASIC_SEARCH_URL =
-        "http://liinwww.ira.uka.de/bibliography/rss?";
+    private static final String BASIC_SEARCH_URL = "http://liinwww.ira.uka.de/bibliography/rss?";
 
     private final CollectionOfComputerScienceBibliographiesParser parser;
 
     public CollectionOfComputerScienceBibliographiesFetcher(
         ImportFormatPreferences importFormatPreferences
     ) {
-        this.parser =
-            new CollectionOfComputerScienceBibliographiesParser(
-                importFormatPreferences
-            );
+        this.parser = new CollectionOfComputerScienceBibliographiesParser(importFormatPreferences);
     }
 
     @Override
@@ -66,26 +61,13 @@ public String getName() {
 
     @Override
     public void doPostCleanup(BibEntry entry) {
-        new FieldFormatterCleanup(
-            StandardField.ABSTRACT,
-            new RemoveNewlinesFormatter()
-        )
+        new FieldFormatterCleanup(StandardField.ABSTRACT, new RemoveNewlinesFormatter())
             .cleanup(entry);
-        new FieldFormatterCleanup(
-            StandardField.ABSTRACT,
-            new ReplaceTabsBySpaceFormater()
-        )
+        new FieldFormatterCleanup(StandardField.ABSTRACT, new ReplaceTabsBySpaceFormater())
             .cleanup(entry);
-        new FieldFormatterCleanup(
-            StandardField.ABSTRACT,
-            new RemoveRedundantSpacesFormatter()
-        )
-            .cleanup(entry);
-        new FieldFormatterCleanup(
-            StandardField.EDITOR,
-            new RemoveDigitsFormatter()
-        )
+        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"
         // thus, key can contain multiple ":"; sometimes value separated by " " instead of ":"
@@ -96,9 +78,7 @@ public void doPostCleanup(BibEntry entry) {
             .flatMap(value -> Arrays.stream(value.split("; ")))
             .forEach(identifierKeyValue -> {
                 // check for pattern "Scopus 2-..."
-                String[] identifierKeyValueSplit = identifierKeyValue.split(
-                    " "
-                );
+                String[] identifierKeyValueSplit = identifierKeyValue.split(" ");
                 if (identifierKeyValueSplit.length == 1) {
                     // check for pattern "doi:..."
                     identifierKeyValueSplit = identifierKeyValue.split(":");
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 2839f19c347..d682da5ddde 100644
--- a/src/main/java/org/jabref/logic/importer/fetcher/CollectionOfComputerScienceBibliographiesParser.java
+++ b/src/main/java/org/jabref/logic/importer/fetcher/CollectionOfComputerScienceBibliographiesParser.java
@@ -35,13 +35,9 @@ public CollectionOfComputerScienceBibliographiesParser(
     }
 
     @Override
-    public List<BibEntry> parseEntries(InputStream inputStream)
-        throws ParseException {
+    public List<BibEntry> parseEntries(InputStream inputStream) throws ParseException {
         try {
-            List<String> links = matchRegexFromInputStreamHtml(
-                inputStream,
-                REGEX_FOR_LINKS
-            );
+            List<String> links = matchRegexFromInputStreamHtml(inputStream, REGEX_FOR_LINKS);
             String bibtexDataString = parseBibtexStringsFromLinks(links)
                 .stream()
                 .collect(Collectors.joining());
@@ -52,10 +48,7 @@ public List<BibEntry> parseEntries(InputStream inputStream)
         }
     }
 
-    private List<String> matchRegexFromInputStreamHtml(
-        InputStream inputStream,
-        Pattern pattern
-    ) {
+    private List<String> matchRegexFromInputStreamHtml(InputStream inputStream, Pattern pattern) {
         try (Scanner scanner = new Scanner(inputStream)) {
             return scanner
                 .findAll(pattern)
@@ -64,18 +57,14 @@ private List<String> matchRegexFromInputStreamHtml(
         }
     }
 
-    private List<String> parseBibtexStringsFromLinks(List<String> links)
-        throws IOException {
+    private List<String> parseBibtexStringsFromLinks(List<String> links) throws IOException {
         List<String> bibtexStringsFromAllLinks = new ArrayList<>();
         for (String link : links) {
-            try (
-                InputStream inputStream = new URLDownload(link).asInputStream()
-            ) {
-                List<String> bibtexStringsFromLink =
-                    matchRegexFromInputStreamHtml(
-                        inputStream,
-                        REGEX_FOR_BIBTEX
-                    );
+            try (InputStream inputStream = new URLDownload(link).asInputStream()) {
+                List<String> bibtexStringsFromLink = matchRegexFromInputStreamHtml(
+                    inputStream,
+                    REGEX_FOR_BIBTEX
+                );
                 bibtexStringsFromAllLinks.addAll(bibtexStringsFromLink);
             }
         }
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 980f4c5e722..1fdece11407 100644
--- a/src/main/java/org/jabref/logic/importer/fetcher/ComplexSearchQuery.java
+++ b/src/main/java/org/jabref/logic/importer/fetcher/ComplexSearchQuery.java
@@ -118,11 +118,8 @@ public boolean equals(Object o) {
 
         // Just check for set equality, order does not matter
         if (
-            !(getDefaultFieldPhrases()
-                    .containsAll(that.getDefaultFieldPhrases()) &&
-                that
-                    .getDefaultFieldPhrases()
-                    .containsAll(getDefaultFieldPhrases()))
+            !(getDefaultFieldPhrases().containsAll(that.getDefaultFieldPhrases()) &&
+                that.getDefaultFieldPhrases().containsAll(getDefaultFieldPhrases()))
         ) {
             return false;
         }
@@ -165,11 +162,7 @@ public boolean equals(Object o) {
         ) {
             return false;
         }
-        if (
-            getDOI().isPresent()
-                ? !getDOI().equals(that.getDOI())
-                : that.getDOI().isPresent()
-        ) {
+        if (getDOI().isPresent() ? !getDOI().equals(that.getDOI()) : that.getDOI().isPresent()) {
             return false;
         }
         return getJournal().isPresent()
@@ -196,10 +189,8 @@ public int hashCode() {
     public String toString() {
         StringJoiner stringJoiner = new StringJoiner(" ");
 
-        getSingleYear()
-            .ifPresent(singleYear -> stringJoiner.add(singleYear.toString()));
-        getFromYear()
-            .ifPresent(fromYear -> stringJoiner.add(fromYear.toString()));
+        getSingleYear().ifPresent(singleYear -> stringJoiner.add(singleYear.toString()));
+        getFromYear().ifPresent(fromYear -> stringJoiner.add(fromYear.toString()));
         getToYear().ifPresent(toYear -> stringJoiner.add(toYear.toString()));
         getJournal().ifPresent(stringJoiner::add);
         getDOI().ifPresent(newElement -> stringJoiner.add("doi:" + newElement));
@@ -226,20 +217,13 @@ public static class ComplexSearchQueryBuilder {
 
         private ComplexSearchQueryBuilder() {}
 
-        public ComplexSearchQueryBuilder defaultFieldPhrase(
-            String defaultFieldPhrase
-        ) {
+        public ComplexSearchQueryBuilder defaultFieldPhrase(String defaultFieldPhrase) {
             if (Objects.requireNonNull(defaultFieldPhrase).isBlank()) {
-                throw new IllegalArgumentException(
-                    "Parameter must not be blank"
-                );
+                throw new IllegalArgumentException("Parameter must not be blank");
             }
             // Strip all quotes before wrapping
             this.defaultFieldPhrases.add(
-                    String.format(
-                        "\"%s\"",
-                        defaultFieldPhrase.replace("\"", "")
-                    )
+                    String.format("\"%s\"", defaultFieldPhrase.replace("\"", ""))
                 );
             return this;
         }
@@ -249,9 +233,7 @@ public ComplexSearchQueryBuilder defaultFieldPhrase(
          */
         public ComplexSearchQueryBuilder author(String author) {
             if (Objects.requireNonNull(author).isBlank()) {
-                throw new IllegalArgumentException(
-                    "Parameter must not be blank"
-                );
+                throw new IllegalArgumentException("Parameter must not be blank");
             }
             // Strip all quotes before wrapping
             this.authors.add(String.format("\"%s\"", author.replace("\"", "")));
@@ -263,14 +245,10 @@ public ComplexSearchQueryBuilder author(String author) {
          */
         public ComplexSearchQueryBuilder titlePhrase(String titlePhrase) {
             if (Objects.requireNonNull(titlePhrase).isBlank()) {
-                throw new IllegalArgumentException(
-                    "Parameter must not be blank"
-                );
+                throw new IllegalArgumentException("Parameter must not be blank");
             }
             // Strip all quotes before wrapping
-            this.titlePhrases.add(
-                    String.format("\"%s\"", titlePhrase.replace("\"", ""))
-                );
+            this.titlePhrases.add(String.format("\"%s\"", titlePhrase.replace("\"", "")));
             return this;
         }
 
@@ -279,21 +257,14 @@ public ComplexSearchQueryBuilder titlePhrase(String titlePhrase) {
          */
         public ComplexSearchQueryBuilder abstractPhrase(String abstractPhrase) {
             if (Objects.requireNonNull(abstractPhrase).isBlank()) {
-                throw new IllegalArgumentException(
-                    "Parameter must not be blank"
-                );
+                throw new IllegalArgumentException("Parameter must not be blank");
             }
             // Strip all quotes before wrapping
-            this.titlePhrases.add(
-                    String.format("\"%s\"", abstractPhrase.replace("\"", ""))
-                );
+            this.titlePhrases.add(String.format("\"%s\"", abstractPhrase.replace("\"", "")));
             return this;
         }
 
-        public ComplexSearchQueryBuilder fromYearAndToYear(
-            Integer fromYear,
-            Integer toYear
-        ) {
+        public ComplexSearchQueryBuilder fromYearAndToYear(Integer fromYear, Integer toYear) {
             if (Objects.nonNull(singleYear)) {
                 throw new IllegalArgumentException(
                     "You can not use single year and year range search."
@@ -316,9 +287,7 @@ public ComplexSearchQueryBuilder singleYear(Integer singleYear) {
 
         public ComplexSearchQueryBuilder journal(String journal) {
             if (Objects.requireNonNull(journal).isBlank()) {
-                throw new IllegalArgumentException(
-                    "Parameter must not be blank"
-                );
+                throw new IllegalArgumentException("Parameter must not be blank");
             }
             this.journal = String.format("\"%s\"", journal.replace("\"", ""));
             return this;
@@ -326,9 +295,7 @@ public ComplexSearchQueryBuilder journal(String journal) {
 
         public ComplexSearchQueryBuilder DOI(String doi) {
             if (Objects.requireNonNull(doi).isBlank()) {
-                throw new IllegalArgumentException(
-                    "Parameter must not be blank"
-                );
+                throw new IllegalArgumentException("Parameter must not be blank");
             }
             this.doi = doi.replace("\"", "");
             return this;
@@ -361,9 +328,7 @@ public ComplexSearchQueryBuilder terms(Collection<Term> terms) {
          */
         public ComplexSearchQuery build() throws IllegalStateException {
             if (textSearchFieldsAndYearFieldsAreEmpty()) {
-                throw new IllegalStateException(
-                    "At least one text field has to be set"
-                );
+                throw new IllegalStateException("At least one text field has to be set");
             }
             return new ComplexSearchQuery(
                 defaultFieldPhrases,
@@ -411,17 +376,12 @@ private boolean textSearchFieldsAndYearFieldsAreEmpty() {
 
         private boolean yearFieldsAreEmpty() {
             return (
-                Objects.isNull(singleYear) &&
-                Objects.isNull(fromYear) &&
-                Objects.isNull(toYear)
+                Objects.isNull(singleYear) && Objects.isNull(fromYear) && Objects.isNull(toYear)
             );
         }
 
         private boolean stringListIsBlank(List<String> stringList) {
-            return (
-                Objects.isNull(stringList) ||
-                stringList.stream().allMatch(String::isBlank)
-            );
+            return (Objects.isNull(stringList) || stringList.stream().allMatch(String::isBlank));
         }
     }
 }
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 64dc6760cb9..5e2411e45b3 100644
--- a/src/main/java/org/jabref/logic/importer/fetcher/CompositeSearchBasedFetcher.java
+++ b/src/main/java/org/jabref/logic/importer/fetcher/CompositeSearchBasedFetcher.java
@@ -18,9 +18,7 @@ public class CompositeSearchBasedFetcher implements SearchBasedFetcher {
 
     public static final String FETCHER_NAME = "Search Selected";
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(
-        CompositeSearchBasedFetcher.class
-    );
+    private static final Logger LOGGER = LoggerFactory.getLogger(CompositeSearchBasedFetcher.class);
 
     private Set<SearchBasedFetcher> fetchers;
     private final int maximumNumberOfReturnedResults;
@@ -31,9 +29,7 @@ public CompositeSearchBasedFetcher(
         int maximumNumberOfReturnedResults
     ) throws IllegalArgumentException {
         if (searchBasedFetchers == null) {
-            throw new IllegalArgumentException(
-                "The set of searchBasedFetchers must not be null!"
-            );
+            throw new IllegalArgumentException("The set of searchBasedFetchers must not be null!");
         }
 
         fetchers =
@@ -46,9 +42,7 @@ public CompositeSearchBasedFetcher(
                     importerPreferences
                         .getCatalogs()
                         .stream()
-                        .anyMatch(
-                            (name -> name.equals(searchBasedFetcher.getName()))
-                        )
+                        .anyMatch((name -> name.equals(searchBasedFetcher.getName())))
                 )
                 .collect(Collectors.toSet());
         this.maximumNumberOfReturnedResults = maximumNumberOfReturnedResults;
@@ -65,22 +59,16 @@ public Optional<HelpFile> getHelpPage() {
     }
 
     @Override
-    public List<BibEntry> performSearch(QueryNode luceneQuery)
-        throws FetcherException {
+    public List<BibEntry> performSearch(QueryNode luceneQuery) throws FetcherException {
         // 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();
+                    return searchBasedFetcher.performSearch(luceneQuery).stream();
                 } catch (FetcherException e) {
                     LOGGER.warn(
-                        String.format(
-                            "%s API request failed",
-                            searchBasedFetcher.getName()
-                        ),
+                        String.format("%s API request failed", searchBasedFetcher.getName()),
                         e
                     );
                     return Stream.empty();
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 70466c7eca2..c3870dcd3fb 100644
--- a/src/main/java/org/jabref/logic/importer/fetcher/CrossRef.java
+++ b/src/main/java/org/jabref/logic/importer/fetcher/CrossRef.java
@@ -63,18 +63,13 @@ public URL getURLForEntry(BibEntry entry)
         URIBuilder uriBuilder = new URIBuilder(API_URL);
         entry
             .getFieldLatexFree(StandardField.TITLE)
-            .ifPresent(title ->
-                uriBuilder.addParameter("query.bibliographic", title)
-            );
+            .ifPresent(title -> uriBuilder.addParameter("query.bibliographic", title));
         entry
             .getFieldLatexFree(StandardField.AUTHOR)
-            .ifPresent(author -> uriBuilder.addParameter("query.author", author)
-            );
+            .ifPresent(author -> uriBuilder.addParameter("query.author", author));
         entry
             .getFieldLatexFree(StandardField.YEAR)
-            .ifPresent(year ->
-                uriBuilder.addParameter("filter", "from-pub-date:" + 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();
@@ -86,9 +81,7 @@ public URL getURLForQuery(QueryNode luceneQuery)
         URIBuilder uriBuilder = new URIBuilder(API_URL);
         uriBuilder.addParameter(
             "query",
-            new DefaultQueryTransformer()
-                .transformLuceneQuery(luceneQuery)
-                .orElse("")
+            new DefaultQueryTransformer().transformLuceneQuery(luceneQuery).orElse("")
         );
         return uriBuilder.build().toURL();
     }
@@ -134,16 +127,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
-        if (
-            entry
-                .getField(StandardField.TITLE)
-                .equals(entry.getField(StandardField.SUBTITLE))
-        ) {
-            new FieldFormatterCleanup(
-                StandardField.SUBTITLE,
-                new ClearFormatter()
-            )
-                .cleanup(entry);
+        if (entry.getField(StandardField.TITLE).equals(entry.getField(StandardField.SUBTITLE))) {
+            new FieldFormatterCleanup(StandardField.SUBTITLE, new ClearFormatter()).cleanup(entry);
         }
     }
 
@@ -165,10 +150,7 @@ private BibEntry jsonItemToBibEntry(JSONObject item) throws ParseException {
                     .map(array -> array.optString(0))
                     .orElse("")
             );
-            entry.setField(
-                StandardField.AUTHOR,
-                toAuthors(item.optJSONArray("author"))
-            );
+            entry.setField(StandardField.AUTHOR, toAuthors(item.optJSONArray("author")));
             entry.setField(
                 StandardField.YEAR,
                 Optional
@@ -180,21 +162,12 @@ private BibEntry jsonItemToBibEntry(JSONObject item) throws ParseException {
                     .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.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("")
+                Optional.ofNullable(item.optJSONArray("subject")).map(this::getKeywords).orElse("")
             );
             entry.setField(StandardField.PAGES, item.optString("page"));
             entry.setField(StandardField.VOLUME, item.optString("volume"));
@@ -207,10 +180,7 @@ private BibEntry jsonItemToBibEntry(JSONObject item) throws ParseException {
             );
             return entry;
         } catch (JSONException exception) {
-            throw new ParseException(
-                "CrossRef API JSON format has changed",
-                exception
-            );
+            throw new ParseException("CrossRef API JSON format has changed", exception);
         }
     }
 
@@ -237,16 +207,12 @@ private String toAuthors(JSONArray authors) {
     }
 
     private EntryType convertType(String type) {
-        return "journal-article".equals(type)
-            ? StandardEntryType.Article
-            : StandardEntryType.Misc;
+        return "journal-article".equals(type) ? StandardEntryType.Article : StandardEntryType.Misc;
     }
 
     @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("")
         );
@@ -255,9 +221,7 @@ public Optional<DOI> extractIdentifier(
         for (BibEntry fetchedEntry : fetchedEntries) {
             // currently only title-based comparison
             // title
-            Optional<String> dataTitle = fetchedEntry.getField(
-                StandardField.TITLE
-            );
+            Optional<String> dataTitle = fetchedEntry.getField(StandardField.TITLE);
 
             if (
                 OptionalUtil.isPresentAnd(
@@ -270,9 +234,7 @@ public Optional<DOI> extractIdentifier(
 
             // subtitle
             // additional check, as sometimes subtitle is needed but sometimes only duplicates the title
-            Optional<String> dataSubtitle = fetchedEntry.getField(
-                StandardField.SUBTITLE
-            );
+            Optional<String> dataSubtitle = fetchedEntry.getField(StandardField.SUBTITLE);
             Optional<String> dataWithSubTitle = OptionalUtil.combine(
                 dataTitle,
                 dataSubtitle,
@@ -281,11 +243,7 @@ public Optional<DOI> extractIdentifier(
             if (
                 OptionalUtil.isPresentAnd(
                     dataWithSubTitle,
-                    titleWithSubtitle ->
-                        stringSimilarity.isSimilar(
-                            entryTitle,
-                            titleWithSubtitle
-                        )
+                    titleWithSubtitle -> stringSimilarity.isSimilar(entryTitle, titleWithSubtitle)
                 )
             ) {
                 return fetchedEntry.getDOI();
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 d1164c6fb65..3d979a54458 100644
--- a/src/main/java/org/jabref/logic/importer/fetcher/DBLPFetcher.java
+++ b/src/main/java/org/jabref/logic/importer/fetcher/DBLPFetcher.java
@@ -33,8 +33,7 @@ public class DBLPFetcher implements SearchBasedParserFetcher {
 
     public static final String FETCHER_NAME = "DBLP";
 
-    private static final String BASIC_SEARCH_URL =
-        "https://dblp.org/search/publ/api";
+    private static final String BASIC_SEARCH_URL = "https://dblp.org/search/publ/api";
 
     private final ImportFormatPreferences importFormatPreferences;
 
@@ -49,9 +48,7 @@ public URL getURLForQuery(QueryNode luceneQuery)
         URIBuilder uriBuilder = new URIBuilder(BASIC_SEARCH_URL);
         uriBuilder.addParameter(
             "q",
-            new DBLPQueryTransformer()
-                .transformLuceneQuery(luceneQuery)
-                .orElse("")
+            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
@@ -74,16 +71,11 @@ public void doPostCleanup(BibEntry entry) {
         FieldFormatterCleanups cleanups = new FieldFormatterCleanups(
             true,
             List.of(
-                new FieldFormatterCleanup(
-                    StandardField.TIMESTAMP,
-                    new ClearFormatter()
-                ),
+                new FieldFormatterCleanup(StandardField.TIMESTAMP, new ClearFormatter()),
                 // unescape the the contents of the URL field, e.g., some\_url\_part becomes some_url_part
                 new FieldFormatterCleanup(
                     StandardField.URL,
-                    new LayoutFormatterBasedFormatter(
-                        new RemoveLatexCommandsFormatter()
-                    )
+                    new LayoutFormatterBasedFormatter(new RemoveLatexCommandsFormatter())
                 )
             )
         );
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 efb7fbc6a80..109ae37ccdb 100644
--- a/src/main/java/org/jabref/logic/importer/fetcher/DOABFetcher.java
+++ b/src/main/java/org/jabref/logic/importer/fetcher/DOABFetcher.java
@@ -30,8 +30,7 @@
  */
 public class DOABFetcher implements SearchBasedParserFetcher {
 
-    private static final String SEARCH_URL =
-        "https://directory.doabooks.org/rest/search?";
+    private static final String SEARCH_URL = "https://directory.doabooks.org/rest/search?";
 
     @Override
     public String getName() {
@@ -42,9 +41,7 @@ public String getName() {
     public URL getURLForQuery(QueryNode luceneQuery)
         throws URISyntaxException, MalformedURLException, FetcherException {
         URIBuilder builder = new URIBuilder(SEARCH_URL);
-        String query = new DefaultQueryTransformer()
-            .transformLuceneQuery(luceneQuery)
-            .orElse("");
+        String query = new DefaultQueryTransformer().transformLuceneQuery(luceneQuery).orElse("");
         // adding quotations for the query for more specified results
         // without the quotation the results returned are not relevant to the query
         query = ("\"".concat(query)).concat("\"");
@@ -68,23 +65,15 @@ public Parser getParser() {
             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
-                JSONArray metadataArray = response
-                    .getJSONObject(0)
-                    .getJSONArray("metadata");
-                JSONArray bitstreamArray = response
-                    .getJSONObject(0)
-                    .getJSONArray("bitstreams");
+                JSONArray metadataArray = response.getJSONObject(0).getJSONArray("metadata");
+                JSONArray bitstreamArray = response.getJSONObject(0).getJSONArray("bitstreams");
                 BibEntry entry = jsonToBibEntry(metadataArray, bitstreamArray);
                 return Collections.singletonList(entry);
             }
             List<BibEntry> entries = new ArrayList<>(response.length());
             for (int i = 0; i < response.length(); i++) {
-                JSONArray metadataArray = response
-                    .getJSONObject(i)
-                    .getJSONArray("metadata");
-                JSONArray bitstreamArray = response
-                    .getJSONObject(i)
-                    .getJSONArray("bitstreams");
+                JSONArray metadataArray = response.getJSONObject(i).getJSONArray("metadata");
+                JSONArray bitstreamArray = response.getJSONObject(i).getJSONArray("bitstreams");
                 BibEntry entry = jsonToBibEntry(metadataArray, bitstreamArray);
                 entries.add(entry);
             }
@@ -92,10 +81,7 @@ public Parser getParser() {
         };
     }
 
-    private BibEntry jsonToBibEntry(
-        JSONArray metadataArray,
-        JSONArray bitstreamArray
-    ) {
+    private BibEntry jsonToBibEntry(JSONArray metadataArray, JSONArray bitstreamArray) {
         BibEntry entry = new BibEntry();
         List<Author> authorsList = new ArrayList<>();
         List<Author> editorsList = new ArrayList<>();
@@ -112,19 +98,13 @@ private BibEntry jsonToBibEntry(
             JSONArray array = bitstreamObject.getJSONArray("metadata");
             for (int k = 0; k < array.length(); k++) {
                 JSONObject metadataInBitstreamObject = array.getJSONObject(k);
-                if (
-                    metadataInBitstreamObject
-                        .getString("key")
-                        .equals("dc.identifier.isbn")
-                ) {
+                if (metadataInBitstreamObject.getString("key").equals("dc.identifier.isbn")) {
                     entry.setField(
                         StandardField.ISBN,
                         metadataInBitstreamObject.getString("value")
                     );
                 } else if (
-                    metadataInBitstreamObject
-                        .getString("key")
-                        .equals("oapen.relation.isbn")
+                    metadataInBitstreamObject.getString("key").equals("oapen.relation.isbn")
                 ) {
                     entry.setField(
                         StandardField.ISBN,
@@ -139,15 +119,9 @@ private BibEntry jsonToBibEntry(
             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"))
-                        );
+                        authorsList.add(toAuthor(dataObject.getString("value")));
                     }
                 }
                 case "dc.type" -> entry.setType(StandardEntryType.Book);
@@ -170,10 +144,7 @@ private BibEntry jsonToBibEntry(
                             String.valueOf(dataObject.getInt("value"))
                         );
                     } catch (JSONException e) {
-                        entry.setField(
-                            StandardField.PAGES,
-                            dataObject.getString("value")
-                        );
+                        entry.setField(StandardField.PAGES, dataObject.getString("value"));
                     }
                 }
                 case "dc.description.abstract" -> entry.setField(
@@ -194,15 +165,10 @@ private BibEntry jsonToBibEntry(
                 );
                 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.subject.other" -> keywordJoiner.add(dataObject.getString("value"));
                 case "dc.contributor.editor" -> editorsList.add(
                     toAuthor(dataObject.getString("value"))
                 );
@@ -210,8 +176,7 @@ private BibEntry jsonToBibEntry(
                     StandardField.VOLUME,
                     dataObject.getString("value")
                 );
-                case "oapen.relation.isbn",
-                    "dc.identifier.isbn" -> entry.setField(
+                case "oapen.relation.isbn", "dc.identifier.isbn" -> entry.setField(
                     StandardField.ISBN,
                     dataObject.getString("value")
                 );
@@ -219,8 +184,7 @@ private BibEntry jsonToBibEntry(
                     StandardField.SUBTITLE,
                     dataObject.getString("value")
                 );
-                case "oapen.imprint" -> publisherImprint =
-                    dataObject.getString("value");
+                case "oapen.imprint" -> publisherImprint = dataObject.getString("value");
             }
         }
 
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 0117a356fbf..5204f882c4f 100644
--- a/src/main/java/org/jabref/logic/importer/fetcher/DOAJFetcher.java
+++ b/src/main/java/org/jabref/logic/importer/fetcher/DOAJFetcher.java
@@ -36,12 +36,9 @@
  */
 public class DOAJFetcher implements SearchBasedParserFetcher {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(
-        DOAJFetcher.class
-    );
+    private static final Logger LOGGER = LoggerFactory.getLogger(DOAJFetcher.class);
 
-    private static final String SEARCH_URL =
-        "https://doaj.org/api/v1/search/articles/";
+    private static final String SEARCH_URL = "https://doaj.org/api/v1/search/articles/";
     private final ImportFormatPreferences preferences;
 
     public DOAJFetcher(ImportFormatPreferences preferences) {
@@ -86,10 +83,7 @@ public static BibEntry parseBibJSONtoBibtex(
                     LOGGER.info("Empty author name.");
                 }
             }
-            entry.setField(
-                StandardField.AUTHOR,
-                String.join(" and ", authorList)
-            );
+            entry.setField(StandardField.AUTHOR, String.join(" and ", authorList));
         } else {
             LOGGER.info("No author found.");
         }
@@ -106,15 +100,10 @@ public static BibEntry parseBibJSONtoBibtex(
             if (bibJsonEntry.has("end_page")) {
                 entry.setField(
                     StandardField.PAGES,
-                    bibJsonEntry.getString("start_page") +
-                    "--" +
-                    bibJsonEntry.getString("end_page")
+                    bibJsonEntry.getString("start_page") + "--" + bibJsonEntry.getString("end_page")
                 );
             } else {
-                entry.setField(
-                    StandardField.PAGES,
-                    bibJsonEntry.getString("start_page")
-                );
+                entry.setField(StandardField.PAGES, bibJsonEntry.getString("start_page"));
             }
         }
 
@@ -123,10 +112,7 @@ public static BibEntry parseBibJSONtoBibtex(
             JSONObject journal = bibJsonEntry.getJSONObject("journal");
             // Journal title
             if (journal.has("title")) {
-                entry.setField(
-                    StandardField.JOURNAL,
-                    journal.getString("title").trim()
-                );
+                entry.setField(StandardField.JOURNAL, journal.getString("title").trim());
             } else {
                 LOGGER.info("No journal title found.");
             }
@@ -145,10 +131,7 @@ public static BibEntry parseBibJSONtoBibtex(
             JSONArray keywords = bibJsonEntry.getJSONArray("keywords");
             for (int i = 0; i < keywords.length(); i++) {
                 if (!keywords.isNull(i)) {
-                    entry.addKeyword(
-                        keywords.getString(i).trim(),
-                        keywordSeparator
-                    );
+                    entry.addKeyword(keywords.getString(i).trim(), keywordSeparator);
                 }
             }
         }
@@ -159,10 +142,7 @@ public static BibEntry parseBibJSONtoBibtex(
             for (int i = 0; i < identifiers.length(); i++) {
                 String type = identifiers.getJSONObject(i).getString("type");
                 if ("doi".equals(type)) {
-                    entry.setField(
-                        StandardField.DOI,
-                        identifiers.getJSONObject(i).getString("id")
-                    );
+                    entry.setField(StandardField.DOI, identifiers.getJSONObject(i).getString("id"));
                 } else if ("pissn".equals(type)) {
                     entry.setField(
                         StandardField.ISSN,
@@ -183,14 +163,8 @@ public static BibEntry parseBibJSONtoBibtex(
             for (int i = 0; i < links.length(); i++) {
                 if (links.getJSONObject(i).has("type")) {
                     String type = links.getJSONObject(i).getString("type");
-                    if (
-                        "fulltext".equals(type) &&
-                        links.getJSONObject(i).has("url")
-                    ) {
-                        entry.setField(
-                            StandardField.URL,
-                            links.getJSONObject(i).getString("url")
-                        );
+                    if ("fulltext".equals(type) && links.getJSONObject(i).has("url")) {
+                        entry.setField(StandardField.URL, links.getJSONObject(i).getString("url"));
                     }
                 }
             }
@@ -234,9 +208,7 @@ public URL getURLForQuery(QueryNode luceneQuery)
         URIBuilder uriBuilder = new URIBuilder(SEARCH_URL);
         DOAJFetcher.addPath(
             uriBuilder,
-            new DefaultLuceneQueryTransformer()
-                .transformLuceneQuery(luceneQuery)
-                .orElse("")
+            new DefaultLuceneQueryTransformer().transformLuceneQuery(luceneQuery).orElse("")
         );
         // Number of results
         uriBuilder.addParameter("pageSize", "30");
@@ -248,9 +220,7 @@ public URL getURLForQuery(QueryNode luceneQuery)
     @Override
     public Parser getParser() {
         return inputStream -> {
-            String response = new BufferedReader(
-                new InputStreamReader(inputStream)
-            )
+            String response = new BufferedReader(new InputStreamReader(inputStream))
                 .lines()
                 .collect(Collectors.joining(OS.NEWLINE));
             JSONObject jsonObject = new JSONObject(response);
@@ -259,9 +229,7 @@ public Parser getParser() {
             if (jsonObject.has("results")) {
                 JSONArray results = jsonObject.getJSONArray("results");
                 for (int i = 0; i < results.length(); i++) {
-                    JSONObject bibJsonEntry = results
-                        .getJSONObject(i)
-                        .getJSONObject("bibjson");
+                    JSONObject bibJsonEntry = results.getJSONObject(i).getJSONObject("bibjson");
                     BibEntry entry = parseBibJSONtoBibtex(
                         bibJsonEntry,
                         preferences.bibEntryPreferences().getKeywordSeparator()
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 d7bf87eed80..4dc960a5cf8 100644
--- a/src/main/java/org/jabref/logic/importer/fetcher/DiVA.java
+++ b/src/main/java/org/jabref/logic/importer/fetcher/DiVA.java
@@ -37,9 +37,7 @@ public Optional<HelpFile> getHelpPage() {
     @Override
     public URL getUrlForIdentifier(String identifier)
         throws URISyntaxException, MalformedURLException, FetcherException {
-        URIBuilder uriBuilder = new URIBuilder(
-            "http://www.diva-portal.org/smash/getreferences"
-        );
+        URIBuilder uriBuilder = new URIBuilder("http://www.diva-portal.org/smash/getreferences");
 
         uriBuilder.addParameter("referenceFormat", "BibTex");
         uriBuilder.addParameter("pids", identifier);
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 c0896bfcd63..d87618258c2 100644
--- a/src/main/java/org/jabref/logic/importer/fetcher/DoiFetcher.java
+++ b/src/main/java/org/jabref/logic/importer/fetcher/DoiFetcher.java
@@ -41,17 +41,12 @@ public class DoiFetcher implements IdBasedFetcher, EntryBasedFetcher {
 
     private static final String APS_JOURNAL_ORG_DOI_ID = "1103";
     private static final String APS_SUFFIX = "([\\w]+\\.)([\\w]+\\.)([\\w]+)";
-    private static final Pattern APS_SUFFIX_PATTERN = Pattern.compile(
-        APS_SUFFIX
-    );
+    private static final Pattern APS_SUFFIX_PATTERN = Pattern.compile(APS_SUFFIX);
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(
-        DoiFetcher.class
-    );
+    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
-    private static final RateLimiter DATA_CITE_DCN_RATE_LIMITER =
-        RateLimiter.create(3.33);
+    private static final RateLimiter DATA_CITE_DCN_RATE_LIMITER = RateLimiter.create(3.33);
 
     /*
      * By default, it seems that CrossRef DOI Content Negotiation responses are returned by their API pools, more specifically the public one
@@ -60,8 +55,7 @@ public class DoiFetcher implements IdBasedFetcher, EntryBasedFetcher {
      * to default to 50 request / second. However, because of its dynamic nature, this rate could change between API calls, so we need to update it
      * atomically when that happens (as multiple threads might access it at the same time)
      */
-    private static final RateLimiter CROSSREF_DCN_RATE_LIMITER =
-        RateLimiter.create(50.0);
+    private static final RateLimiter CROSSREF_DCN_RATE_LIMITER = RateLimiter.create(50.0);
 
     private final ImportFormatPreferences preferences;
 
@@ -86,9 +80,7 @@ private void doAPILimiting(String identifier) {
 
         try {
             Optional<String> agency;
-            if (
-                doi.isPresent() && (agency = getAgency(doi.get())).isPresent()
-            ) {
+            if (doi.isPresent() && (agency = getAgency(doi.get())).isPresent()) {
                 double waitingTime = 0.0;
                 if ("datacite".equalsIgnoreCase(agency.get())) {
                     waitingTime = DATA_CITE_DCN_RATE_LIMITER.acquire();
@@ -110,9 +102,7 @@ private void doAPILimiting(String identifier) {
         }
     }
 
-    protected CompletableFuture<Optional<BibEntry>> asyncPerformSearchById(
-        String identifier
-    ) {
+    protected CompletableFuture<Optional<BibEntry>> asyncPerformSearchById(String identifier) {
         doAPILimiting(identifier);
         return CompletableFuture.supplyAsync(() -> {
             try {
@@ -124,8 +114,7 @@ protected CompletableFuture<Optional<BibEntry>> asyncPerformSearchById(
     }
 
     @Override
-    public Optional<BibEntry> performSearchById(String identifier)
-        throws FetcherException {
+    public Optional<BibEntry> performSearchById(String identifier) throws FetcherException {
         Optional<DOI> doi = DOI.parse(identifier);
 
         try {
@@ -134,9 +123,7 @@ public Optional<BibEntry> performSearchById(String identifier)
 
                 // mEDRA does not return a parsable bibtex string
                 Optional<String> agency = getAgency(doi.get());
-                if (
-                    agency.isPresent() && "medra".equalsIgnoreCase(agency.get())
-                ) {
+                if (agency.isPresent() && "medra".equalsIgnoreCase(agency.get())) {
                     return new Medra().performSearchById(identifier);
                 }
                 URL doiURL = new URL(doi.get().getURIAsASCIIString());
@@ -159,35 +146,22 @@ public Optional<BibEntry> performSearchById(String identifier)
                 }
 
                 // BibTeX entry
-                fetchedEntry =
-                    BibtexParser.singleFromString(bibtexString, preferences);
+                fetchedEntry = BibtexParser.singleFromString(bibtexString, preferences);
                 fetchedEntry.ifPresent(this::doPostCleanup);
 
                 // Crossref has a dynamic API rate limit
-                if (
-                    agency.isPresent() &&
-                    "crossref".equalsIgnoreCase(agency.get())
-                ) {
+                if (agency.isPresent() && "crossref".equalsIgnoreCase(agency.get())) {
                     updateCrossrefAPIRate(openConnection);
                 }
 
                 // 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)
-                ) {
+                if (fetchedEntry.isPresent() && fetchedEntry.get().hasField(StandardField.DOI)) {
                     BibEntry entry = fetchedEntry.get();
                     if (
-                        isAPSJournal(
-                            entry,
-                            entry.getField(StandardField.DOI).get()
-                        ) &&
+                        isAPSJournal(entry, entry.getField(StandardField.DOI).get()) &&
                         !entry.hasField(StandardField.PAGES)
                     ) {
-                        setPageCountToArticleId(
-                            entry,
-                            entry.getField(StandardField.DOI).get()
-                        );
+                        setPageCountToArticleId(entry, entry.getField(StandardField.DOI).get());
                     }
                 }
 
@@ -196,33 +170,21 @@ public Optional<BibEntry> performSearchById(String identifier)
                 }
                 return fetchedEntry;
             } else {
-                throw new FetcherException(
-                    Localization.lang("Invalid DOI: '%0'.", identifier)
-                );
+                throw new FetcherException(Localization.lang("Invalid DOI: '%0'.", identifier));
             }
         } catch (IOException e) {
-            throw new FetcherException(
-                Localization.lang("Connection error"),
-                e
-            );
+            throw new FetcherException(Localization.lang("Connection error"), e);
         } catch (ParseException e) {
             throw new FetcherException("Could not parse BibTeX entry", e);
         } catch (JSONException e) {
-            throw new FetcherException(
-                "Could not retrieve Registration Agency",
-                e
-            );
+            throw new FetcherException("Could not retrieve Registration Agency", e);
         }
     }
 
     private void doPostCleanup(BibEntry entry) {
-        new FieldFormatterCleanup(
-            StandardField.PAGES,
-            new NormalizePagesFormatter()
-        )
-            .cleanup(entry);
-        new FieldFormatterCleanup(StandardField.URL, new ClearFormatter())
+        new FieldFormatterCleanup(StandardField.PAGES, new NormalizePagesFormatter())
             .cleanup(entry);
+        new FieldFormatterCleanup(StandardField.URL, new ClearFormatter()).cleanup(entry);
     }
 
     private void updateCrossrefAPIRate(URLConnection existingConnection) {
@@ -231,13 +193,10 @@ private void updateCrossrefAPIRate(URLConnection existingConnection) {
             String xRateLimitInterval = existingConnection
                 .getHeaderField("X-Rate-Limit-Interval")
                 .replaceAll("[^\\.0123456789]", "");
-            String xRateLimit = existingConnection.getHeaderField(
-                "X-Rate-Limit-Limit"
-            );
+            String xRateLimit = existingConnection.getHeaderField("X-Rate-Limit-Limit");
 
             double newRate =
-                Double.parseDouble(xRateLimit) /
-                Double.parseDouble(xRateLimitInterval);
+                Double.parseDouble(xRateLimit) / Double.parseDouble(xRateLimitInterval);
             double oldRate = CROSSREF_DCN_RATE_LIMITER.getRate();
 
             // In theory, the actual update might rarely happen...
@@ -259,8 +218,7 @@ private void updateCrossrefAPIRate(URLConnection existingConnection) {
     }
 
     @Override
-    public List<BibEntry> performSearch(BibEntry entry)
-        throws FetcherException {
+    public List<BibEntry> performSearch(BibEntry entry) throws FetcherException {
         Optional<String> doi = entry.getField(StandardField.DOI);
         if (doi.isPresent()) {
             return OptionalUtil.toList(performSearchById(doi.get()));
@@ -280,8 +238,7 @@ public Optional<String> getAgency(DOI doi) throws IOException {
             URLDownload download = getUrlDownload(
                 new URL(DOI.AGENCY_RESOLVER + "/" + doi.getDOI())
             );
-            JSONObject response = new JSONArray(download.asString())
-                .getJSONObject(0);
+            JSONObject response = new JSONArray(download.asString()).getJSONObject(0);
             if (response != null) {
                 agency = Optional.ofNullable(response.optString("RA"));
             }
@@ -294,9 +251,7 @@ public Optional<String> getAgency(DOI doi) throws IOException {
     }
 
     private void setPageCountToArticleId(BibEntry entry, String doiAsString) {
-        String articleId = doiAsString.substring(
-            doiAsString.lastIndexOf('.') + 1
-        );
+        String articleId = doiAsString.substring(doiAsString.lastIndexOf('.') + 1);
         entry.setField(StandardField.PAGES, articleId);
     }
 
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 77b15efbdc5..c583d4a3548 100644
--- a/src/main/java/org/jabref/logic/importer/fetcher/DoiResolution.java
+++ b/src/main/java/org/jabref/logic/importer/fetcher/DoiResolution.java
@@ -37,9 +37,7 @@
  */
 public class DoiResolution implements FulltextFetcher {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(
-        DoiResolution.class
-    );
+    private static final Logger LOGGER = LoggerFactory.getLogger(DoiResolution.class);
     private DOIPreferences doiPreferences;
 
     public DoiResolution(DOIPreferences doiPreferences) {
@@ -51,9 +49,7 @@ public DoiResolution(DOIPreferences doiPreferences) {
     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();
@@ -107,19 +103,14 @@ public Optional<URL> findFullText(BibEntry entry) throws IOException {
 
             List<URL> links = new ArrayList<>();
             for (Element element : hrefElements) {
-                String href = element
-                    .attr("abs:href")
-                    .toLowerCase(Locale.ENGLISH);
+                String href = element.attr("abs:href").toLowerCase(Locale.ENGLISH);
                 String hrefText = element.text().toLowerCase(Locale.ENGLISH);
                 // Only check if pdf is included in the link or inside the text
                 // 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") &&
+                    element.attr("title").toLowerCase(Locale.ENGLISH).contains("pdf") &&
                     new URLDownload(href).isPdf()
                 ) {
                     return Optional.of(new URL(href));
@@ -158,9 +149,7 @@ public Optional<URL> findFullText(BibEntry entry) throws IOException {
      * See https://scholar.google.com/intl/de/scholar/inclusion.html#indexing
      */
     private Optional<URL> citationMetaTag(Document html) {
-        Elements citationPdfUrlElement = html
-            .head()
-            .select("meta[name='citation_pdf_url']");
+        Elements citationPdfUrlElement = html.head().select("meta[name='citation_pdf_url']");
         Optional<String> citationPdfUrl = citationPdfUrlElement
             .stream()
             .map(e -> e.attr("content"))
@@ -178,10 +167,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 {
@@ -195,10 +181,7 @@ private Optional<URL> findEmbeddedLink(Document html, URL base) {
     }
 
     private Optional<URL> findDistinctLinks(List<URL> urls) {
-        List<URL> distinctLinks = urls
-            .stream()
-            .distinct()
-            .collect(Collectors.toList());
+        List<URL> distinctLinks = urls.stream().distinct().collect(Collectors.toList());
 
         if (distinctLinks.isEmpty()) {
             return Optional.empty();
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 26ae8dd9479..aeb23a6fd68 100644
--- a/src/main/java/org/jabref/logic/importer/fetcher/GoogleScholar.java
+++ b/src/main/java/org/jabref/logic/importer/fetcher/GoogleScholar.java
@@ -40,16 +40,13 @@
  */
 public class GoogleScholar implements FulltextFetcher, PagedSearchBasedFetcher {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(
-        GoogleScholar.class
-    );
+    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 String BASIC_SEARCH_URL =
-        "https://scholar.google.ch/scholar?";
+    private static final String BASIC_SEARCH_URL = "https://scholar.google.ch/scholar?";
 
     private static final int NUM_RESULTS = 10;
 
@@ -61,8 +58,7 @@ public GoogleScholar(ImportFormatPreferences importFormatPreferences) {
     }
 
     @Override
-    public Optional<URL> findFullText(BibEntry entry)
-        throws IOException, FetcherException {
+    public Optional<URL> findFullText(BibEntry entry) throws IOException, FetcherException {
         Objects.requireNonNull(entry);
 
         // Search in title
@@ -75,10 +71,7 @@ public Optional<URL> findFullText(BibEntry entry)
             URIBuilder uriBuilder = new URIBuilder(BASIC_SEARCH_URL);
             uriBuilder.addParameter("as_q", "");
             // as_epq as exact phrase
-            uriBuilder.addParameter(
-                "as_epq",
-                entry.getField(StandardField.TITLE).orElse("")
-            );
+            uriBuilder.addParameter("as_epq", entry.getField(StandardField.TITLE).orElse(""));
             // as_occt field to search in
             uriBuilder.addParameter("as_occt", "title");
 
@@ -96,23 +89,16 @@ public TrustLevel getTrustLevel() {
     private Optional<URL> search(String url) throws IOException {
         Optional<URL> pdfLink = Optional.empty();
 
-        Document doc = Jsoup
-            .connect(url)
-            .userAgent(URLDownload.USER_AGENT)
-            .get();
+        Document doc = Jsoup.connect(url).userAgent(URLDownload.USER_AGENT).get();
 
         if (needsCaptcha(doc.body().html())) {
-            LOGGER.warn(
-                "Hit Google traffic limitation. Captcha prevents automatic fetching."
-            );
+            LOGGER.warn("Hit Google traffic limitation. Captcha prevents automatic fetching.");
             return Optional.empty();
         }
         // Check results for PDF link
         // TODO: link always on first result or none?
         for (int i = 0; i < NUM_RESULTS; i++) {
-            Elements link = doc.select(
-                String.format("div[data-rp=%S] div.gs_or_ggsm a", i)
-            );
+            Elements link = doc.select(String.format("div[data-rp=%S] div.gs_or_ggsm a", i));
 
             if (link.first() != null) {
                 String target = link.first().attr("href");
@@ -149,9 +135,7 @@ private void addHitsFromQuery(List<BibEntry> entryList, String queryURL)
 
         if (needsCaptcha(content)) {
             throw new FetcherException(
-                "Fetching from Google Scholar failed: Captacha hit at " +
-                queryURL +
-                ".",
+                "Fetching from Google Scholar failed: Captacha hit at " + queryURL + ".",
                 Localization.lang(
                     "This might be caused by reaching the traffic limitation of Google Scholar (see 'Help' for details)."
                 ),
@@ -167,22 +151,17 @@ private void addHitsFromQuery(List<BibEntry> entryList, String queryURL)
         }
     }
 
-    private BibEntry downloadEntry(String link)
-        throws IOException, FetcherException {
+    private BibEntry downloadEntry(String link) throws IOException, FetcherException {
         String downloadedContent = new URLDownload(link).asString();
         BibtexParser parser = new BibtexParser(importFormatPreferences);
         ParserResult result = parser.parse(new StringReader(downloadedContent));
         if ((result == null) || (result.getDatabase() == null)) {
-            throw new FetcherException(
-                "Parsing entries from Google Scholar bib file failed."
-            );
+            throw new FetcherException("Parsing entries from Google Scholar bib file failed.");
         } else {
             Collection<BibEntry> entries = result.getDatabase().getEntries();
             if (entries.size() != 1) {
                 LOGGER.debug(entries.size() + " entries found! (" + link + ")");
-                throw new FetcherException(
-                    "Parsing entries from Google Scholar bib file failed."
-                );
+                throw new FetcherException("Parsing entries from Google Scholar bib file failed.");
             } else {
                 BibEntry entry = entries.iterator().next();
                 return entry;
@@ -192,32 +171,22 @@ private BibEntry downloadEntry(String link)
 
     private void obtainAndModifyCookie() throws FetcherException {
         try {
-            URLDownload downloader = new URLDownload(
-                "https://scholar.google.com"
-            );
+            URLDownload downloader = new URLDownload("https://scholar.google.com");
             List<HttpCookie> cookies = downloader.getCookieFromUrl();
             for (HttpCookie cookie : cookies) {
                 // append "CF=4" which represents "Citation format bibtex"
                 cookie.setValue(cookie.getValue() + ":CF=4");
             }
         } catch (IOException e) {
-            throw new FetcherException(
-                "Cookie configuration for Google Scholar failed.",
-                e
-            );
+            throw new FetcherException("Cookie configuration for Google Scholar failed.", e);
         }
     }
 
     @Override
-    public Page<BibEntry> performSearchPaged(
-        QueryNode luceneQuery,
-        int pageNumber
-    ) throws FetcherException {
-        ScholarQueryTransformer queryTransformer =
-            new ScholarQueryTransformer();
-        String transformedQuery = queryTransformer
-            .transformLuceneQuery(luceneQuery)
-            .orElse("");
+    public Page<BibEntry> performSearchPaged(QueryNode luceneQuery, int pageNumber)
+        throws FetcherException {
+        ScholarQueryTransformer queryTransformer = new ScholarQueryTransformer();
+        String transformedQuery = queryTransformer.transformLuceneQuery(luceneQuery).orElse("");
         try {
             obtainAndModifyCookie();
             List<BibEntry> foundEntries = new ArrayList<>(10);
@@ -225,19 +194,10 @@ public Page<BibEntry> performSearchPaged(
             uriBuilder.addParameter("hl", "en");
             uriBuilder.addParameter("btnG", "Search");
             uriBuilder.addParameter("q", transformedQuery);
-            uriBuilder.addParameter(
-                "start",
-                String.valueOf(pageNumber * getPageSize())
-            );
+            uriBuilder.addParameter("start", String.valueOf(pageNumber * getPageSize()));
             uriBuilder.addParameter("num", String.valueOf(getPageSize()));
-            uriBuilder.addParameter(
-                "as_ylo",
-                String.valueOf(queryTransformer.getStartYear())
-            );
-            uriBuilder.addParameter(
-                "as_yhi",
-                String.valueOf(queryTransformer.getEndYear())
-            );
+            uriBuilder.addParameter("as_ylo", String.valueOf(queryTransformer.getStartYear()));
+            uriBuilder.addParameter("as_yhi", String.valueOf(queryTransformer.getEndYear()));
 
             try {
                 addHitsFromQuery(foundEntries, uriBuilder.toString());
@@ -251,13 +211,7 @@ public Page<BibEntry> performSearchPaged(
                 // 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
-                if (
-                    e
-                        .getMessage()
-                        .contains(
-                            "Server returned HTTP response code: 503 for URL"
-                        )
-                ) {
+                if (e.getMessage().contains("Server returned HTTP response code: 503 for URL")) {
                     throw new FetcherException(
                         "Fetching from Google Scholar failed.",
                         Localization.lang(
@@ -266,18 +220,12 @@ public Page<BibEntry> performSearchPaged(
                         e
                     );
                 } else {
-                    throw new FetcherException(
-                        "Error while fetching from " + getName(),
-                        e
-                    );
+                    throw new FetcherException("Error while fetching from " + getName(), e);
                 }
             }
             return new Page<>(transformedQuery, pageNumber, foundEntries);
         } catch (URISyntaxException e) {
-            throw new FetcherException(
-                "Error while fetching from " + getName(),
-                e
-            );
+            throw new FetcherException("Error while fetching from " + getName(), e);
         }
     }
 }
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 c0a10707051..788da771a29 100644
--- a/src/main/java/org/jabref/logic/importer/fetcher/GrobidCitationFetcher.java
+++ b/src/main/java/org/jabref/logic/importer/fetcher/GrobidCitationFetcher.java
@@ -22,9 +22,7 @@
 
 public class GrobidCitationFetcher implements SearchBasedFetcher {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(
-        GrobidCitationFetcher.class
-    );
+    private static final Logger LOGGER = LoggerFactory.getLogger(GrobidCitationFetcher.class);
 
     private final ImportFormatPreferences importFormatPreferences;
     private final GrobidService grobidService;
@@ -51,8 +49,7 @@ public GrobidCitationFetcher(
      * @return A BibTeX string if extraction is successful
      * @throws FetcherException
      */
-    private Optional<BibEntry> parseUsingGrobid(String plainText)
-        throws FetcherException {
+    private Optional<BibEntry> parseUsingGrobid(String plainText) throws FetcherException {
         try {
             return grobidService.processCitation(
                 plainText,
@@ -80,15 +77,12 @@ public String getName() {
     }
 
     @Override
-    public List<BibEntry> performSearch(String searchQuery)
-        throws FetcherException {
+    public List<BibEntry> performSearch(String searchQuery) throws FetcherException {
         List<BibEntry> collect;
         try {
             collect =
                 Arrays
-                    .stream(
-                        searchQuery.split("\\r\\r+|\\n\\n+|\\r\\n(\\r\\n)+")
-                    )
+                    .stream(searchQuery.split("\\r\\r+|\\n\\n+|\\r\\n(\\r\\n)+"))
                     .map(String::trim)
                     .filter(str -> !str.isBlank())
                     .map(Unchecked.function(this::parseUsingGrobid))
@@ -105,8 +99,7 @@ public List<BibEntry> performSearch(String searchQuery)
      * Not used
      */
     @Override
-    public List<BibEntry> performSearch(QueryNode luceneQuery)
-        throws FetcherException {
+    public List<BibEntry> performSearch(QueryNode luceneQuery) throws FetcherException {
         return Collections.emptyList();
     }
 }
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 40db5bc8216..b1641cca789 100644
--- a/src/main/java/org/jabref/logic/importer/fetcher/GrobidPreferences.java
+++ b/src/main/java/org/jabref/logic/importer/fetcher/GrobidPreferences.java
@@ -11,11 +11,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);
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 a4d6d5c823d..c60bfdb0db0 100644
--- a/src/main/java/org/jabref/logic/importer/fetcher/GvkFetcher.java
+++ b/src/main/java/org/jabref/logic/importer/fetcher/GvkFetcher.java
@@ -21,12 +21,9 @@
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.field.StandardField;
 
-public class GvkFetcher
-    extends AbstractIsbnFetcher
-    implements SearchBasedParserFetcher {
+public class GvkFetcher extends AbstractIsbnFetcher implements SearchBasedParserFetcher {
 
-    private static final String URL_PATTERN =
-        "https://sru.k10plus.de/opac-de-627?";
+    private static final String URL_PATTERN = "https://sru.k10plus.de/opac-de-627?";
 
     /**
      * Searchkeys are used to specify a search request. For example "tit" stands for "title".
@@ -68,9 +65,7 @@ public URL getURLForQuery(QueryNode luceneQuery)
         uriBuilder.addParameter("operation", "searchRetrieve");
         uriBuilder.addParameter(
             "query",
-            new GVKQueryTransformer()
-                .transformLuceneQuery(luceneQuery)
-                .orElse("")
+            new GVKQueryTransformer().transformLuceneQuery(luceneQuery).orElse("")
         );
         uriBuilder.addParameter("maximumRecords", "50");
         uriBuilder.addParameter("recordSchema", "picaxml");
@@ -109,20 +104,11 @@ public void doPostCleanup(BibEntry entry) {
         entry
             .getField(StandardField.PAGETOTAL)
             .ifPresent(pages ->
-                entry.setField(
-                    StandardField.PAGETOTAL,
-                    pages.replaceAll("[\\D]", "")
-                )
+                entry.setField(StandardField.PAGETOTAL, pages.replaceAll("[\\D]", ""))
             );
-        new FieldFormatterCleanup(
-            StandardField.PAGETOTAL,
-            new NormalizePagesFormatter()
-        )
+        new FieldFormatterCleanup(StandardField.PAGETOTAL, new NormalizePagesFormatter())
             .cleanup(entry);
-        new FieldFormatterCleanup(
-            StandardField.AUTHOR,
-            new NormalizeNamesFormatter()
-        )
+        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 4911239f607..b25eb62ae03 100644
--- a/src/main/java/org/jabref/logic/importer/fetcher/IEEE.java
+++ b/src/main/java/org/jabref/logic/importer/fetcher/IEEE.java
@@ -44,21 +44,17 @@
  * @see <a href="https://developer.ieee.org/docs">API documentation</a>
  */
 public class IEEE
-    implements
-        FulltextFetcher, PagedSearchBasedParserFetcher, CustomizableKeyFetcher {
+    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 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 DOCUMENT_PATTERN = Pattern.compile(
-        "document/([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[^\"]+)\""
@@ -78,25 +74,19 @@ public IEEE(
         ImportFormatPreferences importFormatPreferences,
         ImporterPreferences importerPreferences
     ) {
-        this.importFormatPreferences =
-            Objects.requireNonNull(importFormatPreferences);
+        this.importFormatPreferences = Objects.requireNonNull(importFormatPreferences);
         this.importerPreferences = Objects.requireNonNull(importerPreferences);
     }
 
     /**
      * @implNote <a href="https://developer.ieee.org/docs/read/Metadata_API_responses">documentation</a>
      */
-    private static BibEntry parseJsonResponse(
-        JSONObject jsonEntry,
-        Character keywordSeparator
-    ) {
+    private static BibEntry parseJsonResponse(JSONObject jsonEntry, Character keywordSeparator) {
         BibEntry entry = new BibEntry();
 
         switch (jsonEntry.optString("content_type")) {
             case "Books" -> entry.setType(StandardEntryType.Book);
-            case "Conferences" -> entry.setType(
-                StandardEntryType.InProceedings
-            );
+            case "Conferences" -> entry.setType(StandardEntryType.InProceedings);
             case "Courses" -> entry.setType(StandardEntryType.Misc);
             default -> entry.setType(StandardEntryType.Article);
         }
@@ -113,20 +103,12 @@ private static BibEntry parseJsonResponse(
                 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.LOCATION, jsonEntry.optString("conference_location"));
         entry.setField(StandardField.DOI, jsonEntry.optString("doi"));
-        entry.setField(
-            StandardField.YEAR,
-            jsonEntry.optString("publication_year")
-        );
+        entry.setField(StandardField.YEAR, jsonEntry.optString("publication_year"));
         entry.setField(
             StandardField.PAGES,
-            jsonEntry.optString("start_page") +
-            "--" +
-            jsonEntry.optString("end_page")
+            jsonEntry.optString("start_page") + "--" + jsonEntry.optString("end_page")
         );
 
         JSONObject keywordsContainer = jsonEntry.optJSONObject("index_terms");
@@ -155,32 +137,15 @@ private static BibEntry parseJsonResponse(
         entry.setField(StandardField.ISSN, jsonEntry.optString("issn"));
         entry.setField(StandardField.ISSUE, jsonEntry.optString("issue"));
         try {
-            entry.addFile(
-                new LinkedFile(new URL(jsonEntry.optString("pdf_url")), "PDF")
-            );
+            entry.addFile(new LinkedFile(new URL(jsonEntry.optString("pdf_url")), "PDF"));
         } catch (MalformedURLException e) {
             LOGGER.error("Fetched PDF URL String is malformed.");
         }
-        entry.setField(
-            StandardField.JOURNALTITLE,
-            jsonEntry.optString("publication_title")
-        );
-        entry.setField(
-            StandardField.DATE,
-            jsonEntry.optString("publication_date")
-        );
-        entry.setField(
-            StandardField.EVENTTITLEADDON,
-            jsonEntry.optString("conference_location")
-        );
-        entry.setField(
-            StandardField.EVENTDATE,
-            jsonEntry.optString("conference_dates")
-        );
-        entry.setField(
-            StandardField.PUBLISHER,
-            jsonEntry.optString("publisher")
-        );
+        entry.setField(StandardField.JOURNALTITLE, jsonEntry.optString("publication_title"));
+        entry.setField(StandardField.DATE, jsonEntry.optString("publication_date"));
+        entry.setField(StandardField.EVENTTITLEADDON, jsonEntry.optString("conference_location"));
+        entry.setField(StandardField.EVENTDATE, jsonEntry.optString("conference_dates"));
+        entry.setField(StandardField.PUBLISHER, jsonEntry.optString("publisher"));
         entry.setField(StandardField.TITLE, jsonEntry.optString("title"));
         entry.setField(StandardField.VOLUME, jsonEntry.optString("volume"));
 
@@ -196,9 +161,7 @@ public Optional<URL> findFullText(BibEntry entry) throws IOException {
         // Try URL first -- will primarily work for entries from the old IEEE search
         Optional<String> urlString = entry.getField(StandardField.URL);
         if (urlString.isPresent()) {
-            Matcher documentUrlMatcher = DOCUMENT_PATTERN.matcher(
-                urlString.get()
-            );
+            Matcher documentUrlMatcher = DOCUMENT_PATTERN.matcher(urlString.get());
             if (documentUrlMatcher.find()) {
                 String docId = documentUrlMatcher.group(1);
                 stampString = STAMP_BASE_STRING_DOCUMENT + docId;
@@ -214,18 +177,14 @@ public Optional<URL> findFullText(BibEntry entry) throws IOException {
 
         // If not, try DOI
         if (stampString.isEmpty()) {
-            Optional<DOI> doi = entry
-                .getField(StandardField.DOI)
-                .flatMap(DOI::parse);
+            Optional<DOI> doi = entry.getField(StandardField.DOI).flatMap(DOI::parse);
             if (
                 doi.isPresent() &&
                 doi.get().getDOI().startsWith(IEEE_DOI) &&
                 doi.get().getExternalURI().isPresent()
             ) {
                 // Download the HTML page from IEEE
-                URLDownload urlDownload = new URLDownload(
-                    doi.get().getExternalURI().get().toURL()
-                );
+                URLDownload urlDownload = new URLDownload(doi.get().getExternalURI().get().toURL());
                 // We don't need to modify the cookies, but we need support for them
                 urlDownload.getCookieFromUrl();
 
@@ -268,9 +227,7 @@ public TrustLevel getTrustLevel() {
     @Override
     public Parser getParser() {
         return inputStream -> {
-            String response = new BufferedReader(
-                new InputStreamReader(inputStream)
-            )
+            String response = new BufferedReader(new InputStreamReader(inputStream))
                 .lines()
                 .collect(Collectors.joining(OS.NEWLINE));
             JSONObject jsonObject = new JSONObject(response);
@@ -282,9 +239,7 @@ public Parser getParser() {
                     JSONObject jsonEntry = results.getJSONObject(i);
                     BibEntry entry = parseJsonResponse(
                         jsonEntry,
-                        importFormatPreferences
-                            .bibEntryPreferences()
-                            .getKeywordSeparator()
+                        importFormatPreferences.bibEntryPreferences().getKeywordSeparator()
                     );
                     boolean addEntry;
                     // In case entry has no year, add it
@@ -299,15 +254,11 @@ public Parser getParser() {
                                     return (
                                         transformer
                                             .getStartYear()
-                                            .map(startYear ->
-                                                yearAsInteger >= startYear
-                                            )
+                                            .map(startYear -> yearAsInteger >= startYear)
                                             .orElse(true) &&
                                         transformer
                                             .getEndYear()
-                                            .map(endYear ->
-                                                yearAsInteger <= endYear
-                                            )
+                                            .map(endYear -> yearAsInteger <= endYear)
                                             .orElse(true)
                                     );
                                 })
@@ -350,9 +301,7 @@ public URL getURLForQuery(QueryNode luceneQuery, int pageNumber)
         // 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("");
+        String transformedQuery = transformer.transformLuceneQuery(luceneQuery).orElse("");
         URIBuilder uriBuilder = new URIBuilder(
             "https://ieeexploreapi.ieee.org/api/v1/search/articles"
         );
@@ -363,34 +312,19 @@ public URL getURLForQuery(QueryNode luceneQuery, int pageNumber)
         uriBuilder.addParameter("max_records", String.valueOf(getPageSize()));
         // Currently not working as part of the query string
         if (transformer.getJournal().isPresent()) {
-            uriBuilder.addParameter(
-                "publication_title",
-                transformer.getJournal().get()
-            );
+            uriBuilder.addParameter("publication_title", transformer.getJournal().get());
         }
         if (transformer.getStartYear().isPresent()) {
-            uriBuilder.addParameter(
-                "start_year",
-                String.valueOf(transformer.getStartYear().get())
-            );
+            uriBuilder.addParameter("start_year", String.valueOf(transformer.getStartYear().get()));
         }
         if (transformer.getEndYear().isPresent()) {
-            uriBuilder.addParameter(
-                "end_year",
-                String.valueOf(transformer.getEndYear().get())
-            );
+            uriBuilder.addParameter("end_year", String.valueOf(transformer.getEndYear().get()));
         }
         if (transformer.getArticleNumber().isPresent()) {
-            uriBuilder.addParameter(
-                "article_number",
-                transformer.getArticleNumber().get()
-            );
+            uriBuilder.addParameter("article_number", transformer.getArticleNumber().get());
         }
         // Starts to index at 1 for the first entry
-        uriBuilder.addParameter(
-            "start_record",
-            String.valueOf(getPageSize() * pageNumber) + 1
-        );
+        uriBuilder.addParameter("start_record", String.valueOf(getPageSize() * pageNumber) + 1);
 
         return uriBuilder.build().toURL();
     }
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 fdbe3a17467..b5339c31ce7 100644
--- a/src/main/java/org/jabref/logic/importer/fetcher/INSPIREFetcher.java
+++ b/src/main/java/org/jabref/logic/importer/fetcher/INSPIREFetcher.java
@@ -32,15 +32,11 @@
 /**
  * Fetches data from the INSPIRE database.
  */
-public class INSPIREFetcher
-    implements SearchBasedParserFetcher, EntryBasedFetcher {
+public class INSPIREFetcher implements SearchBasedParserFetcher, EntryBasedFetcher {
 
-    private static final String INSPIRE_HOST =
-        "https://inspirehep.net/api/literature/";
-    private static final String INSPIRE_DOI_HOST =
-        "https://inspirehep.net/api/doi/";
-    private static final String INSPIRE_ARXIV_HOST =
-        "https://inspirehep.net/api/arxiv/";
+    private static final String INSPIRE_HOST = "https://inspirehep.net/api/literature/";
+    private static final String INSPIRE_DOI_HOST = "https://inspirehep.net/api/doi/";
+    private static final String INSPIRE_ARXIV_HOST = "https://inspirehep.net/api/arxiv/";
 
     private final ImportFormatPreferences importFormatPreferences;
 
@@ -64,9 +60,7 @@ public URL getURLForQuery(QueryNode luceneQuery)
         URIBuilder uriBuilder = new URIBuilder(INSPIRE_HOST);
         uriBuilder.addParameter(
             "q",
-            new DefaultLuceneQueryTransformer()
-                .transformLuceneQuery(luceneQuery)
-                .orElse("")
+            new DefaultLuceneQueryTransformer().transformLuceneQuery(luceneQuery).orElse("")
         );
         return uriBuilder.build().toURL();
     }
@@ -81,23 +75,13 @@ public URLDownload getUrlDownload(URL url) {
     @Override
     public void doPostCleanup(BibEntry entry) {
         // Remove strange "SLACcitation" field
-        new FieldFormatterCleanup(
-            new UnknownField("SLACcitation"),
-            new ClearFormatter()
-        )
+        new FieldFormatterCleanup(new UnknownField("SLACcitation"), new ClearFormatter())
             .cleanup(entry);
 
         // Remove braces around content of "title" field
-        new FieldFormatterCleanup(
-            StandardField.TITLE,
-            new RemoveBracesFormatter()
-        )
-            .cleanup(entry);
+        new FieldFormatterCleanup(StandardField.TITLE, new RemoveBracesFormatter()).cleanup(entry);
 
-        new FieldFormatterCleanup(
-            StandardField.TITLE,
-            new LatexToUnicodeFormatter()
-        )
+        new FieldFormatterCleanup(StandardField.TITLE, new LatexToUnicodeFormatter())
             .cleanup(entry);
     }
 
@@ -107,20 +91,14 @@ public Parser getParser() {
     }
 
     @Override
-    public List<BibEntry> performSearch(BibEntry entry)
-        throws FetcherException {
+    public List<BibEntry> performSearch(BibEntry entry) throws FetcherException {
         List<BibEntry> results = new ArrayList<>();
         Optional<String> doi = entry.getField(StandardField.DOI);
-        Optional<String> archiveprefix = entry.getFieldOrAlias(
-            StandardField.ARCHIVEPREFIX
-        );
+        Optional<String> archiveprefix = entry.getFieldOrAlias(StandardField.ARCHIVEPREFIX);
         Optional<String> eprint = entry.getField(StandardField.EPRINT);
         String url;
 
-        if (
-            archiveprefix.filter("arxiv"::equals).isPresent() &&
-            eprint.isPresent()
-        ) {
+        if (archiveprefix.filter("arxiv"::equals).isPresent() && eprint.isPresent()) {
             url = INSPIRE_ARXIV_HOST + eprint.get();
         } else if (doi.isPresent()) {
             url = INSPIRE_DOI_HOST + doi.get();
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 62761551e11..3b6f84463a7 100644
--- a/src/main/java/org/jabref/logic/importer/fetcher/IacrEprintFetcher.java
+++ b/src/main/java/org/jabref/logic/importer/fetcher/IacrEprintFetcher.java
@@ -22,21 +22,15 @@ public class IacrEprintFetcher implements FulltextFetcher, IdBasedFetcher {
 
     public static final String NAME = "IACR eprints";
 
-    private static final Pattern WITHOUT_LETTERS_SPACE = Pattern.compile(
-        "[^0-9/]"
-    );
+    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 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/";
-    private static final String VERSION_URL_PREFIX =
-        "https://eprint.iacr.org/archive/versions/";
+    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/";
+    private static final String VERSION_URL_PREFIX = "https://eprint.iacr.org/archive/versions/";
 
     private final ImportFormatPreferences prefs;
 
@@ -45,22 +39,17 @@ public IacrEprintFetcher(ImportFormatPreferences prefs) {
     }
 
     @Override
-    public Optional<BibEntry> performSearchById(String identifier)
-        throws FetcherException {
+    public Optional<BibEntry> performSearchById(String identifier) throws FetcherException {
         String identifierWithoutLettersAndSpaces = WITHOUT_LETTERS_SPACE
             .matcher(identifier)
             .replaceAll(" ")
             .trim();
 
         if (!IDENTIFIER_PREDICATE.test(identifierWithoutLettersAndSpaces)) {
-            throw new FetcherException(
-                Localization.lang("Invalid identifier: '%0'.", identifier)
-            );
+            throw new FetcherException(Localization.lang("Invalid identifier: '%0'.", identifier));
         }
 
-        Optional<BibEntry> entry = createEntryFromIacrCitation(
-            identifierWithoutLettersAndSpaces
-        );
+        Optional<BibEntry> entry = createEntryFromIacrCitation(identifierWithoutLettersAndSpaces);
 
         if (entry.isPresent()) {
             setAdditionalFields(entry.get(), identifierWithoutLettersAndSpaces);
@@ -69,12 +58,9 @@ public Optional<BibEntry> performSearchById(String identifier)
         return entry;
     }
 
-    private Optional<BibEntry> createEntryFromIacrCitation(
-        String validIdentifier
-    ) throws FetcherException {
-        String bibtexCitationHtml = getHtml(
-            CITATION_URL_PREFIX + validIdentifier
-        );
+    private Optional<BibEntry> createEntryFromIacrCitation(String validIdentifier)
+        throws FetcherException {
+        String bibtexCitationHtml = getHtml(CITATION_URL_PREFIX + validIdentifier);
         if (bibtexCitationHtml.contains("No such report found")) {
             throw new FetcherException(Localization.lang("No results found."));
         }
@@ -94,8 +80,7 @@ private Optional<BibEntry> createEntryFromIacrCitation(
         }
     }
 
-    private void setAdditionalFields(BibEntry entry, String identifier)
-        throws FetcherException {
+    private void setAdditionalFields(BibEntry entry, String identifier) throws FetcherException {
         String entryUrl = DESCRIPTION_URL_PREFIX + identifier;
         String descriptiveHtml = getHtml(entryUrl);
 
@@ -112,15 +97,9 @@ private void setAdditionalFields(BibEntry entry, String identifier)
         }
     }
 
-    private String getVersion(String identifier, String versionHtml)
-        throws FetcherException {
-        String startOfVersionString =
-            "<li><a href=\"/archive/" + identifier + "/";
-        String version = getRequiredValueBetween(
-            startOfVersionString,
-            "\">",
-            versionHtml
-        );
+    private String getVersion(String identifier, String versionHtml) throws FetcherException {
+        String startOfVersionString = "<li><a href=\"/archive/" + identifier + "/";
+        String version = getRequiredValueBetween(startOfVersionString, "\">", versionHtml);
         return version;
     }
 
@@ -136,8 +115,7 @@ private String getAbstract(String descriptiveHtml) throws FetcherException {
     }
 
     private String getDate(String descriptiveHtml) throws FetcherException {
-        String startOfHistoryString =
-            "<dt>History</dt>\n      \n      \n      <dd>";
+        String startOfHistoryString = "<dt>History</dt>\n      \n      \n      <dd>";
         String dateStringAsInHtml = getRequiredValueBetween(
             startOfHistoryString,
             ":",
@@ -152,20 +130,14 @@ private String getHtml(String url) throws FetcherException {
             return download.asString();
         } catch (IOException e) {
             throw new FetcherException(
-                Localization.lang(
-                    "Could not retrieve entry data from '%0'.",
-                    url
-                ),
+                Localization.lang("Could not retrieve entry data from '%0'.", url),
                 e
             );
         }
     }
 
-    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(
@@ -176,15 +148,12 @@ private String getRequiredValueBetween(
         }
     }
 
-    private boolean isFromOrAfterYear2000(BibEntry entry)
-        throws FetcherException {
+    private boolean isFromOrAfterYear2000(BibEntry entry) throws FetcherException {
         Optional<String> yearField = entry.getField(StandardField.YEAR);
         if (yearField.isPresent()) {
             return Integer.parseInt(yearField.get()) > 2000;
         }
-        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"));
     }
 
     @Override
@@ -193,15 +162,13 @@ public String getName() {
     }
 
     @Override
-    public Optional<URL> findFullText(BibEntry entry)
-        throws IOException, FetcherException {
+    public Optional<URL> findFullText(BibEntry entry) throws IOException, FetcherException {
         Objects.requireNonNull(entry);
 
         Optional<String> urlField = entry.getField(StandardField.URL);
         if (urlField.isPresent()) {
             String descriptiveHtml = getHtml(urlField.get());
-            String startOfFulltextLink =
-                "<a class=\"btn btn-sm btn-outline-dark\"";
+            String startOfFulltextLink = "<a class=\"btn btn-sm btn-outline-dark\"";
             String fulltextLinkAsInHtml = getRequiredValueBetween(
                 startOfFulltextLink,
                 ".pdf",
@@ -209,10 +176,8 @@ public Optional<URL> findFullText(BibEntry entry)
             );
             // 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";
+            fulltextLinkAsInHtml = fulltextLinkAsInHtml.replaceFirst(".*href=\"/", "").trim();
+            String fulltextLink = FULLTEXT_URL_PREFIX + fulltextLinkAsInHtml + ".pdf";
             return Optional.of(new URL(fulltextLink));
         }
         return Optional.empty();
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 4eb0b451b6d..53eb721c084 100644
--- a/src/main/java/org/jabref/logic/importer/fetcher/IssnFetcher.java
+++ b/src/main/java/org/jabref/logic/importer/fetcher/IssnFetcher.java
@@ -25,16 +25,13 @@ public IssnFetcher() {
     }
 
     @Override
-    public List<BibEntry> performSearch(BibEntry entry)
-        throws FetcherException {
+    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())
-                )
+                .map(journalInfo -> journalInformationToBibEntry(journalInfo, issn.get()))
                 .stream()
                 .toList();
         }
@@ -47,8 +44,7 @@ public String getName() {
     }
 
     @Override
-    public Optional<BibEntry> performSearchById(String identifier)
-        throws FetcherException {
+    public Optional<BibEntry> performSearchById(String identifier) throws FetcherException {
         Optional<JournalInformation> journalInformation =
             journalInformationFetcher.getJournalInformation(identifier, "");
         return journalInformation.map(journalInfo ->
@@ -56,10 +52,7 @@ public Optional<BibEntry> performSearchById(String identifier)
         );
     }
 
-    private BibEntry journalInformationToBibEntry(
-        JournalInformation journalInfo,
-        String issn
-    ) {
+    private BibEntry journalInformationToBibEntry(JournalInformation journalInfo, String issn) {
         return new BibEntry()
             .withField(StandardField.JOURNALTITLE, journalInfo.title())
             .withField(StandardField.PUBLISHER, journalInfo.publisher())
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 28bd3b9f12e..e878cc8b4b6 100644
--- a/src/main/java/org/jabref/logic/importer/fetcher/JournalInformationFetcher.java
+++ b/src/main/java/org/jabref/logic/importer/fetcher/JournalInformationFetcher.java
@@ -28,14 +28,10 @@
 public class JournalInformationFetcher implements WebFetcher {
 
     public static final String NAME = "Journal Information";
-    private static final Logger LOGGER = LoggerFactory.getLogger(
-        JournalInformationFetcher.class
-    );
+    private static final Logger LOGGER = LoggerFactory.getLogger(JournalInformationFetcher.class);
     // Uses JabRef Online APIs
     private static final String API_URL = "https://jabref.org/api";
-    private static final Pattern QUOTES_BRACKET_PATTERN = Pattern.compile(
-        "[\"\\[\\]]"
-    );
+    private static final Pattern QUOTES_BRACKET_PATTERN = Pattern.compile("[\"\\[\\]]");
 
     @Override
     public String getName() {
@@ -55,8 +51,7 @@ public Optional<JournalInformation> getJournalInformation(
             LOGGER.warn(Localization.lang("Incorrect ISSN format"));
         }
 
-        Optional<JournalInformation> journalInformationOptional =
-            Optional.empty();
+        Optional<JournalInformation> journalInformationOptional = Optional.empty();
 
         JSONObject postData = buildPostData(cleanedISSN, journalName);
 
@@ -68,8 +63,7 @@ public Optional<JournalInformation> getJournalInformation(
 
         if (httpResponse.getBody() != null) {
             JSONObject responseJsonObject = httpResponse.getBody().getObject();
-            journalInformationOptional =
-                Optional.of(parseResponse(responseJsonObject));
+            journalInformationOptional = Optional.of(parseResponse(responseJsonObject));
         }
 
         return journalInformationOptional;
@@ -91,14 +85,11 @@ private JournalInformation parseResponse(JSONObject responseJsonObject)
         List<Pair<Integer, Double>> snipArray = new ArrayList<>();
         List<Pair<Integer, Double>> docsThisYear = new ArrayList<>();
         List<Pair<Integer, Double>> docsPrevious3Years = new ArrayList<>();
-        List<Pair<Integer, Double>> citableDocsPrevious3Years =
-            new ArrayList<>();
+        List<Pair<Integer, Double>> citableDocsPrevious3Years = new ArrayList<>();
         List<Pair<Integer, Double>> citesOutgoing = new ArrayList<>();
         List<Pair<Integer, Double>> citesOutgoingPerDoc = new ArrayList<>();
-        List<Pair<Integer, Double>> citesIncomingByRecentlyPublished =
-            new ArrayList<>();
-        List<Pair<Integer, Double>> citesIncomingPerDocByRecentlyPublished =
-            new ArrayList<>();
+        List<Pair<Integer, Double>> citesIncomingByRecentlyPublished = new ArrayList<>();
+        List<Pair<Integer, Double>> citesIncomingPerDocByRecentlyPublished = new ArrayList<>();
 
         try {
             if (responseJsonObject.has("errors")) {
@@ -108,9 +99,7 @@ private JournalInformation parseResponse(JSONObject responseJsonObject)
                     String errorMessage = error.optString("message", "");
                     LOGGER.error("Error accessing catalog: {}", errorMessage);
                 }
-                throw new FetcherException(
-                    Localization.lang("Error accessing catalog")
-                );
+                throw new FetcherException(Localization.lang("Error accessing catalog"));
             }
 
             if (responseJsonObject.has("data")) {
@@ -120,67 +109,42 @@ private JournalInformation parseResponse(JSONObject responseJsonObject)
 
                     title = journalData.optString("name", "");
                     publisher = journalData.optString("publisher", "");
-                    coverageStartYear =
-                        journalData.optString("coverageStartYear", "");
-                    coverageEndYear =
-                        journalData.optString("coverageEndYear", "");
+                    coverageStartYear = journalData.optString("coverageStartYear", "");
+                    coverageEndYear = journalData.optString("coverageEndYear", "");
                     scimagoId = journalData.optString("scimagoId", "");
                     country = journalData.optString("country", "");
                     issn = getConcatenatedString(journalData, "issn");
                     subjectArea = getConcatenatedString(journalData, "areas");
-                    categories =
-                        getConcatenatedString(journalData, "categories");
+                    categories = getConcatenatedString(journalData, "categories");
                     hIndex = journalData.optString("hIndex", "");
 
-                    JSONArray citationInfo = journalData.optJSONArray(
-                        "citationInfo"
-                    );
+                    JSONArray citationInfo = journalData.optJSONArray("citationInfo");
                     if (citationInfo != null) {
-                        docsThisYear =
-                            parseCitationInfo(citationInfo, "docsThisYear");
-                        docsPrevious3Years =
-                            parseCitationInfo(
-                                citationInfo,
-                                "docsPrevious3Years"
-                            );
+                        docsThisYear = parseCitationInfo(citationInfo, "docsThisYear");
+                        docsPrevious3Years = parseCitationInfo(citationInfo, "docsPrevious3Years");
                         citableDocsPrevious3Years =
-                            parseCitationInfo(
-                                citationInfo,
-                                "citableDocsPrevious3Years"
-                            );
-                        citesOutgoing =
-                            parseCitationInfo(citationInfo, "citesOutgoing");
+                            parseCitationInfo(citationInfo, "citableDocsPrevious3Years");
+                        citesOutgoing = parseCitationInfo(citationInfo, "citesOutgoing");
                         citesOutgoingPerDoc =
-                            parseCitationInfo(
-                                citationInfo,
-                                "citesOutgoingPerDoc"
-                            );
+                            parseCitationInfo(citationInfo, "citesOutgoingPerDoc");
                         citesIncomingByRecentlyPublished =
-                            parseCitationInfo(
-                                citationInfo,
-                                "citesIncomingByRecentlyPublished"
-                            );
+                            parseCitationInfo(citationInfo, "citesIncomingByRecentlyPublished");
                         citesIncomingPerDocByRecentlyPublished =
                             parseCitationInfo(
                                 citationInfo,
                                 "citesIncomingPerDocByRecentlyPublished"
                             );
                         sjrArray = parseCitationInfo(citationInfo, "sjrIndex");
-                        snipArray =
-                            parseCitationInfo(citationInfo, "snipIndex");
+                        snipArray = parseCitationInfo(citationInfo, "snipIndex");
                     }
                 } else {
                     throw new FetcherException(
-                        Localization.lang(
-                            "ISSN and/or journal name not found in catalog"
-                        )
+                        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"
-                    )
+                    Localization.lang("ISSN and/or journal name not found in catalog")
                 );
             }
         } catch (JSONException e) {
@@ -210,15 +174,10 @@ private JournalInformation parseResponse(JSONObject responseJsonObject)
         );
     }
 
-    private static String getConcatenatedString(
-        JSONObject jsonObject,
-        String key
-    ) {
+    private static String getConcatenatedString(JSONObject jsonObject, String key) {
         JSONArray jsonArray = jsonObject.optJSONArray(key);
         if (jsonArray != null) {
-            return QUOTES_BRACKET_PATTERN
-                .matcher(jsonArray.join(", "))
-                .replaceAll("");
+            return QUOTES_BRACKET_PATTERN.matcher(jsonArray.join(", ")).replaceAll("");
         } else {
             return "";
         }
@@ -264,10 +223,7 @@ query GetJournal($issn: String, $name: String) {
         return postData;
     }
 
-    private List<Pair<Integer, Double>> parseCitationInfo(
-        JSONArray jsonArray,
-        String key
-    ) {
+    private List<Pair<Integer, Double>> parseCitationInfo(JSONArray jsonArray, String key) {
         List<Pair<Integer, Double>> parsedArray = new ArrayList<>();
         Set<Integer> yearSet = new HashSet<>();
 
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 addfdf241f9..c1e369fa300 100644
--- a/src/main/java/org/jabref/logic/importer/fetcher/JstorFetcher.java
+++ b/src/main/java/org/jabref/logic/importer/fetcher/JstorFetcher.java
@@ -52,9 +52,7 @@ public URL getURLForQuery(QueryNode luceneQuery)
         URIBuilder uriBuilder = new URIBuilder(SEARCH_HOST);
         uriBuilder.addParameter(
             "Query",
-            new JstorQueryTransformer()
-                .transformLuceneQuery(luceneQuery)
-                .orElse("")
+            new JstorQueryTransformer().transformLuceneQuery(luceneQuery).orElse("")
         );
         return uriBuilder.build().toURL();
     }
@@ -100,26 +98,16 @@ public Parser getParser() {
                 Document doc = Jsoup.parse(inputStream, null, HOST);
 
                 StringBuilder stringBuilder = new StringBuilder();
-                List<Element> elements = doc
-                    .body()
-                    .getElementsByClass("cite-this-item");
+                List<Element> elements = doc.body().getElementsByClass("cite-this-item");
                 for (Element element : elements) {
-                    String id = element
-                        .attr("href")
-                        .replace("citation/info/", "");
+                    String id = element.attr("href").replace("citation/info/", "");
 
                     String data = new URLDownload(CITE_HOST + id).asString();
                     stringBuilder.append(data);
                 }
-                entries =
-                    new ArrayList<>(
-                        parser.parseEntries(stringBuilder.toString())
-                    );
+                entries = new ArrayList<>(parser.parseEntries(stringBuilder.toString()));
             } catch (IOException e) {
-                throw new ParseException(
-                    "Could not download data from jstor.org",
-                    e
-                );
+                throw new ParseException("Could not download data from jstor.org", e);
             }
             return entries;
         };
@@ -136,8 +124,7 @@ public Optional<URL> findFullText(BibEntry entry) throws IOException {
             return Optional.empty();
         }
 
-        String page = new URLDownload(entry.getField(StandardField.URL).get())
-            .asString();
+        String page = new URLDownload(entry.getField(StandardField.URL).get()).asString();
 
         Document doc = Jsoup.parse(page);
 
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 d67b9beeb3c..ae8832fcfc7 100644
--- a/src/main/java/org/jabref/logic/importer/fetcher/LOBIDFetcher.java
+++ b/src/main/java/org/jabref/logic/importer/fetcher/LOBIDFetcher.java
@@ -38,9 +38,7 @@ public class LOBIDFetcher implements PagedSearchBasedParserFetcher {
 
     public static final String FETCHER_NAME = "LOBID";
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(
-        LOBIDFetcher.class
-    );
+    private static final Logger LOGGER = LoggerFactory.getLogger(LOBIDFetcher.class);
 
     private static final String API_URL = "https://lobid.org/resources/search";
 
@@ -63,14 +61,9 @@ public URL getURLForQuery(QueryNode luceneQuery, int pageNumber)
         URIBuilder uriBuilder = new URIBuilder(API_URL);
         uriBuilder.addParameter(
             "q",
-            new LOBIDQueryTransformer()
-                .transformLuceneQuery(luceneQuery)
-                .orElse("")
+            new LOBIDQueryTransformer().transformLuceneQuery(luceneQuery).orElse("")
         ); // search query
-        uriBuilder.addParameter(
-            "from",
-            String.valueOf(getPageSize() * pageNumber)
-        ); // from entry number, starts indexing at 0
+        uriBuilder.addParameter("from", String.valueOf(getPageSize() * pageNumber)); // from entry number, starts indexing at 0
         uriBuilder.addParameter("size", String.valueOf(getPageSize())); // page size
         uriBuilder.addParameter("format", "json"); // response format
         return uriBuilder.build().toURL();
@@ -79,9 +72,7 @@ public URL getURLForQuery(QueryNode luceneQuery, int pageNumber)
     @Override
     public Parser getParser() {
         return inputStream -> {
-            String response = new BufferedReader(
-                new InputStreamReader(inputStream)
-            )
+            String response = new BufferedReader(new InputStreamReader(inputStream))
                 .lines()
                 .collect(Collectors.joining(OS.NEWLINE));
             JSONObject jsonObject = new JSONObject(response);
@@ -131,10 +122,7 @@ private BibEntry parseJSONtoBibtex(JSONObject jsonEntry) {
         entry.setField(StandardField.ISBN, isbn);
 
         // parent resource
-        String bibliographicCitation = jsonEntry.optString(
-            "bibliographicCitation",
-            ""
-        );
+        String bibliographicCitation = jsonEntry.optString("bibliographicCitation", "");
         String[] bibSplit = bibliographicCitation.split("/");
         String parentResource = "";
         if (bibSplit.length > 0) {
@@ -142,33 +130,21 @@ private BibEntry parseJSONtoBibtex(JSONObject jsonEntry) {
             entry.setField(nametype, parentResource);
         }
 
-        entry.setField(
-            StandardField.ISSN,
-            getFirstArrayElement(jsonEntry, "issn")
-        );
+        entry.setField(StandardField.ISSN, getFirstArrayElement(jsonEntry, "issn"));
         entry.setField(StandardField.TITLE, jsonEntry.optString("title", ""));
-        entry.setField(
-            StandardField.ABSTRACT,
-            getFirstArrayElement(jsonEntry, "note")
-        );
+        entry.setField(StandardField.ABSTRACT, getFirstArrayElement(jsonEntry, "note"));
         entry.setField(
             StandardField.TITLEADDON,
             getFirstArrayElement(jsonEntry, "otherTitleInformation")
         );
-        entry.setField(
-            StandardField.EDITION,
-            getFirstArrayElement(jsonEntry, "edition")
-        );
+        entry.setField(StandardField.EDITION, getFirstArrayElement(jsonEntry, "edition"));
 
         // authors
         JSONArray authors = jsonEntry.optJSONArray("contribution");
         if (authors != null) {
             List<String> authorNames = getAuthorNames(authors);
             if (!authors.isEmpty()) {
-                entry.setField(
-                    StandardField.AUTHOR,
-                    String.join(" and ", authorNames)
-                );
+                entry.setField(StandardField.AUTHOR, String.join(" and ", authorNames));
             }
         }
 
@@ -205,10 +181,7 @@ private BibEntry parseJSONtoBibtex(JSONObject jsonEntry) {
                 .filter(Objects::nonNull)
                 .map(language -> language.optString("label"))
                 .toList();
-            entry.setField(
-                StandardField.LANGUAGE,
-                String.join(" and ", languageList)
-            );
+            entry.setField(StandardField.LANGUAGE, String.join(" and ", languageList));
         }
 
         // keywords
@@ -219,10 +192,7 @@ private BibEntry parseJSONtoBibtex(JSONObject jsonEntry) {
                 .mapToObj(keywordArray::optString)
                 .filter(keyword -> !keyword.isEmpty())
                 .toList();
-            entry.setField(
-                StandardField.KEYWORDS,
-                String.join(", ", keywordList)
-            );
+            entry.setField(StandardField.KEYWORDS, String.join(", ", keywordList));
         }
 
         return entry;
@@ -238,10 +208,7 @@ private static List<String> getAuthorNames(JSONArray authors) {
             .toList();
     }
 
-    private static String getFirstArrayElement(
-        JSONObject jsonEntry,
-        String key
-    ) {
+    private static String getFirstArrayElement(JSONObject jsonEntry, String key) {
         return Optional
             .ofNullable(jsonEntry.optJSONArray(key))
             .map(array -> array.getString(0))
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 59fb93750b7..7beeed162f4 100644
--- a/src/main/java/org/jabref/logic/importer/fetcher/LibraryOfCongress.java
+++ b/src/main/java/org/jabref/logic/importer/fetcher/LibraryOfCongress.java
@@ -29,9 +29,7 @@ public String getName() {
     @Override
     public URL getUrlForIdentifier(String identifier)
         throws URISyntaxException, MalformedURLException, FetcherException {
-        URIBuilder uriBuilder = new URIBuilder(
-            "https://lccn.loc.gov/" + identifier + "/mods"
-        );
+        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 a4bc20c37ac..a66cb5fd8cf 100644
--- a/src/main/java/org/jabref/logic/importer/fetcher/MathSciNet.java
+++ b/src/main/java/org/jabref/logic/importer/fetcher/MathSciNet.java
@@ -42,14 +42,9 @@
  * Fetches data from the MathSciNet (http://www.ams.org/mathscinet)
  */
 public class MathSciNet
-    implements
-        SearchBasedParserFetcher,
-        EntryBasedParserFetcher,
-        IdBasedParserFetcher {
-
-    private static final Logger LOGGER = LoggerFactory.getLogger(
-        MathSciNet.class
-    );
+    implements SearchBasedParserFetcher, EntryBasedParserFetcher, IdBasedParserFetcher {
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(MathSciNet.class);
     private final ImportFormatPreferences preferences;
 
     public MathSciNet(ImportFormatPreferences preferences) {
@@ -68,9 +63,7 @@ public String getName() {
     @Override
     public URL getURLForEntry(BibEntry entry)
         throws URISyntaxException, MalformedURLException, FetcherException {
-        Optional<String> mrNumberInEntry = entry.getField(
-            StandardField.MR_NUMBER
-        );
+        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());
@@ -80,22 +73,10 @@ public URL getURLForEntry(BibEntry entry)
             "https://mathscinet.ams.org/mathscinet/api/freetools/mrlookup"
         );
 
-        uriBuilder.addParameter(
-            "author",
-            entry.getFieldOrAlias(StandardField.AUTHOR).orElse("")
-        );
-        uriBuilder.addParameter(
-            "title",
-            entry.getFieldOrAlias(StandardField.TITLE).orElse("")
-        );
-        uriBuilder.addParameter(
-            "journal",
-            entry.getFieldOrAlias(StandardField.JOURNAL).orElse("")
-        );
-        uriBuilder.addParameter(
-            "year",
-            entry.getFieldOrAlias(StandardField.YEAR).orElse("")
-        );
+        uriBuilder.addParameter("author", entry.getFieldOrAlias(StandardField.AUTHOR).orElse(""));
+        uriBuilder.addParameter("title", entry.getFieldOrAlias(StandardField.TITLE).orElse(""));
+        uriBuilder.addParameter("journal", entry.getFieldOrAlias(StandardField.JOURNAL).orElse(""));
+        uriBuilder.addParameter("year", entry.getFieldOrAlias(StandardField.YEAR).orElse(""));
         uriBuilder.addParameter("firstPage", "");
         uriBuilder.addParameter("lastPage", "");
 
@@ -111,9 +92,7 @@ public URL getURLForQuery(QueryNode luceneQuery)
         uriBuilder.addParameter("pg7", "ALLF"); // search all fields
         uriBuilder.addParameter(
             "s7",
-            new DefaultQueryTransformer()
-                .transformLuceneQuery(luceneQuery)
-                .orElse("")
+            new DefaultQueryTransformer().transformLuceneQuery(luceneQuery).orElse("")
         ); // query
         uriBuilder.addParameter("r", "1"); // start index
         uriBuilder.addParameter("extend", "1"); // should return up to 100 items (instead of default 10)
@@ -138,18 +117,14 @@ public URL getUrlForIdentifier(String identifier)
     @Override
     public Parser getParser() {
         return inputStream -> {
-            String response = new BufferedReader(
-                new InputStreamReader(inputStream)
-            )
+            String response = new BufferedReader(new InputStreamReader(inputStream))
                 .lines()
                 .collect(Collectors.joining(OS.NEWLINE));
 
             List<BibEntry> entries = new ArrayList<>();
             try {
                 JSONObject jsonResponse = new JSONObject(response);
-                JSONArray entriesArray = jsonResponse
-                    .getJSONObject("all")
-                    .getJSONArray("results");
+                JSONArray entriesArray = jsonResponse.getJSONObject("all").getJSONArray("results");
 
                 BibtexParser bibtexParser = new BibtexParser(
                     preferences,
@@ -157,9 +132,7 @@ public Parser getParser() {
                 );
 
                 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));
                 }
             } catch (JSONException | TokenMgrException e) {
@@ -172,21 +145,12 @@ public Parser getParser() {
 
     @Override
     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()
-        )
+        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 DoiCleanup().cleanup(entry);
-        new FieldFormatterCleanup(StandardField.URL, new ClearFormatter())
-            .cleanup(entry);
+        new FieldFormatterCleanup(StandardField.URL, new ClearFormatter()).cleanup(entry);
 
         // Remove comments: MathSciNet prepends a <pre> html tag
         entry.setCommentsBeforeEntry("");
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 58e30d7db2b..bf16e6fcbd6 100644
--- a/src/main/java/org/jabref/logic/importer/fetcher/MedlineFetcher.java
+++ b/src/main/java/org/jabref/logic/importer/fetcher/MedlineFetcher.java
@@ -42,12 +42,9 @@
  * The MedlineFetcher fetches the entries from the PubMed database.
  * See <a href="https://docs.jabref.org/collect/import-using-online-bibliographic-database#medline-pubmed">docs.jabref.org</a> for a detailed documentation of the available fields.
  */
-public class MedlineFetcher
-    implements IdBasedParserFetcher, SearchBasedFetcher {
+public class MedlineFetcher implements IdBasedParserFetcher, SearchBasedFetcher {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(
-        MedlineFetcher.class
-    );
+    private static final Logger LOGGER = LoggerFactory.getLogger(MedlineFetcher.class);
 
     private static final int NUMBER_TO_FETCH = 50;
     private static final String ID_URL =
@@ -64,8 +61,7 @@ public class MedlineFetcher
      *
      * @see <a href="https://www.ncbi.nlm.nih.gov/books/NBK25500/">www.ncbi.nlm.nih.gov/books/NBK25500/</a>
      */
-    private List<String> getPubMedIdsFromQuery(String query)
-        throws FetcherException {
+    private List<String> getPubMedIdsFromQuery(String query) throws FetcherException {
         boolean fetchIDs = false;
         boolean firstOccurrenceOfCount = false;
         List<String> idList = new ArrayList<>();
@@ -73,9 +69,7 @@ private List<String> getPubMedIdsFromQuery(String query)
             URL ncbi = createSearchUrl(query);
 
             XMLInputFactory inputFactory = XMLInputFactory.newFactory();
-            XMLStreamReader streamReader = inputFactory.createXMLStreamReader(
-                ncbi.openStream()
-            );
+            XMLStreamReader streamReader = inputFactory.createXMLStreamReader(ncbi.openStream());
 
             fetchLoop:while (streamReader.hasNext()) {
                 int event = streamReader.getEventType();
@@ -86,16 +80,13 @@ private List<String> getPubMedIdsFromQuery(String query)
                             firstOccurrenceOfCount = true;
                         }
 
-                        if (
-                            "IdList".equals(streamReader.getName().toString())
-                        ) {
+                        if ("IdList".equals(streamReader.getName().toString())) {
                             fetchIDs = true;
                         }
                         break;
                     case XMLStreamConstants.CHARACTERS:
                         if (firstOccurrenceOfCount) {
-                            numberOfResultsFound =
-                                Integer.parseInt(streamReader.getText());
+                            numberOfResultsFound = Integer.parseInt(streamReader.getText());
                             firstOccurrenceOfCount = false;
                         }
 
@@ -105,9 +96,7 @@ private List<String> getPubMedIdsFromQuery(String query)
                         break;
                     case XMLStreamConstants.END_ELEMENT:
                         // Everything relevant is listed before the IdList. So we break the loop right after the IdList tag closes.
-                        if (
-                            "IdList".equals(streamReader.getName().toString())
-                        ) {
+                        if ("IdList".equals(streamReader.getName().toString())) {
                             break fetchLoop;
                         }
                 }
@@ -157,36 +146,19 @@ public Parser getParser() {
 
     @Override
     public void doPostCleanup(BibEntry entry) {
-        new FieldFormatterCleanup(
-            new UnknownField("journal-abbreviation"),
-            new ClearFormatter()
-        )
-            .cleanup(entry);
-        new FieldFormatterCleanup(
-            new UnknownField("status"),
-            new ClearFormatter()
-        )
+        new FieldFormatterCleanup(new UnknownField("journal-abbreviation"), new ClearFormatter())
             .cleanup(entry);
-        new FieldFormatterCleanup(
-            new UnknownField("copyright"),
-            new ClearFormatter()
-        )
+        new FieldFormatterCleanup(new UnknownField("status"), new ClearFormatter()).cleanup(entry);
+        new FieldFormatterCleanup(new UnknownField("copyright"), new ClearFormatter())
             .cleanup(entry);
 
-        new FieldFormatterCleanup(
-            StandardField.MONTH,
-            new NormalizeMonthFormatter()
-        )
+        new FieldFormatterCleanup(StandardField.MONTH, new NormalizeMonthFormatter())
             .cleanup(entry);
-        new FieldFormatterCleanup(
-            StandardField.AUTHOR,
-            new NormalizeNamesFormatter()
-        )
+        new FieldFormatterCleanup(StandardField.AUTHOR, new NormalizeNamesFormatter())
             .cleanup(entry);
     }
 
-    private URL createSearchUrl(String query)
-        throws URISyntaxException, MalformedURLException {
+    private URL createSearchUrl(String query) throws URISyntaxException, MalformedURLException {
         URIBuilder uriBuilder = new URIBuilder(SEARCH_URL);
         uriBuilder.addParameter("db", "pubmed");
         uriBuilder.addParameter("sort", "relevance");
@@ -202,8 +174,7 @@ private URL createSearchUrl(String query)
      * @param ids A list of IDs to search for.
      * @return Will return an empty list on error.
      */
-    private List<BibEntry> fetchMedline(List<String> ids)
-        throws FetcherException {
+    private List<BibEntry> fetchMedline(List<String> ids) throws FetcherException {
         try {
             // Separate the IDs with a comma to search multiple entries
             URL fetchURL = getUrlForIdentifier(String.join(",", ids));
@@ -211,10 +182,7 @@ private List<BibEntry> fetchMedline(List<String> ids)
             ParserResult result = new MedlineImporter()
                 .importDatabase(
                     new BufferedReader(
-                        new InputStreamReader(
-                            data.getInputStream(),
-                            StandardCharsets.UTF_8
-                        )
+                        new InputStreamReader(data.getInputStream(), StandardCharsets.UTF_8)
                     )
                 );
             if (result.hasWarnings()) {
@@ -239,13 +207,10 @@ private List<BibEntry> fetchMedline(List<String> ids)
     }
 
     @Override
-    public List<BibEntry> performSearch(QueryNode luceneQuery)
-        throws FetcherException {
+    public List<BibEntry> performSearch(QueryNode luceneQuery) throws FetcherException {
         List<BibEntry> entryList;
         MedlineQueryTransformer transformer = new MedlineQueryTransformer();
-        Optional<String> transformedQuery = transformer.transformLuceneQuery(
-            luceneQuery
-        );
+        Optional<String> transformedQuery = transformer.transformLuceneQuery(luceneQuery);
 
         if (transformedQuery.isEmpty() || transformedQuery.get().isBlank()) {
             return Collections.emptyList();
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 1ca48661192..565ead0b961 100644
--- a/src/main/java/org/jabref/logic/importer/fetcher/Medra.java
+++ b/src/main/java/org/jabref/logic/importer/fetcher/Medra.java
@@ -55,10 +55,7 @@ private BibEntry jsonItemToBibEntry(JSONObject item) throws ParseException {
         try {
             return new BibEntry(convertType(item.getString("type")))
                 .withField(StandardField.TITLE, item.getString("title"))
-                .withField(
-                    StandardField.AUTHOR,
-                    toAuthors(item.optJSONArray("author"))
-                )
+                .withField(StandardField.AUTHOR, toAuthors(item.optJSONArray("author")))
                 .withField(
                     StandardField.YEAR,
                     Optional
@@ -72,25 +69,17 @@ private BibEntry jsonItemToBibEntry(JSONObject item) throws ParseException {
                 .withField(StandardField.DOI, item.getString("DOI"))
                 .withField(StandardField.PAGES, item.optString("page"))
                 .withField(StandardField.ISSN, item.optString("ISSN"))
-                .withField(
-                    StandardField.JOURNAL,
-                    item.optString("container-title")
-                )
+                .withField(StandardField.JOURNAL, item.optString("container-title"))
                 .withField(StandardField.PUBLISHER, item.optString("publisher"))
                 .withField(StandardField.URL, item.optString("URL"))
                 .withField(StandardField.VOLUME, item.optString("volume"));
         } catch (JSONException exception) {
-            throw new ParseException(
-                "mEdRA API JSON format has changed",
-                exception
-            );
+            throw new ParseException("mEdRA API JSON format has changed", exception);
         }
     }
 
     private EntryType convertType(String type) {
-        return "article-journal".equals(type)
-            ? StandardEntryType.Article
-            : StandardEntryType.Misc;
+        return "article-journal".equals(type) ? StandardEntryType.Article : StandardEntryType.Misc;
     }
 
     private String toAuthors(JSONArray authors) {
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 2ad21c60968..375583c161a 100644
--- a/src/main/java/org/jabref/logic/importer/fetcher/MrDLibFetcher.java
+++ b/src/main/java/org/jabref/logic/importer/fetcher/MrDLibFetcher.java
@@ -27,14 +27,13 @@
  */
 public class MrDLibFetcher implements EntryBasedFetcher {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(
-        MrDLibFetcher.class
-    );
+    private static final Logger LOGGER = LoggerFactory.getLogger(MrDLibFetcher.class);
     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;
@@ -42,11 +41,7 @@ public class MrDLibFetcher implements EntryBasedFetcher {
     private String recommendationSetId;
     private final MrDlibPreferences preferences;
 
-    public MrDLibFetcher(
-        String language,
-        Version version,
-        MrDlibPreferences preferences
-    ) {
+    public MrDLibFetcher(String language, Version version, MrDlibPreferences preferences) {
         LANGUAGE = language;
         VERSION = version;
         this.preferences = preferences;
@@ -58,8 +53,7 @@ public String getName() {
     }
 
     @Override
-    public List<BibEntry> performSearch(BibEntry entry)
-        throws FetcherException {
+    public List<BibEntry> performSearch(BibEntry entry) throws FetcherException {
         Optional<String> title = entry.getFieldLatexFree(StandardField.TITLE);
         if (title.isPresent()) {
             String response = makeServerRequest(title.get());
@@ -102,12 +96,9 @@ public String getDescription() {
      * @param queryByTitle the query holds the title of the selected entry. Used to make a query to the MDL Server
      * @return Returns the server response. This is an XML document as a String.
      */
-    private String makeServerRequest(String queryByTitle)
-        throws FetcherException {
+    private String makeServerRequest(String queryByTitle) throws FetcherException {
         try {
-            URLDownload urlDownload = new URLDownload(
-                constructQuery(queryByTitle)
-            );
+            URLDownload urlDownload = new URLDownload(constructQuery(queryByTitle));
             String response = urlDownload.asString();
 
             // Conversion of < and >
@@ -131,9 +122,7 @@ private String constructQuery(String queryWithTitle) {
         URIBuilder builder = new URIBuilder();
         builder.setScheme("http");
         builder.setHost(MDL_URL);
-        builder.setPath(
-            "/v2/documents/" + queryWithTitle + "/related_documents"
-        );
+        builder.setPath("/v2/documents/" + queryWithTitle + "/related_documents");
         builder.addParameter("partner_id", MDL_JABREF_PARTNER_ID);
         builder.addParameter("app_id", "jabref_desktop");
         builder.addParameter("app_version", VERSION.getFullVersion());
@@ -145,10 +134,7 @@ private String constructQuery(String queryWithTitle) {
             builder.addParameter("os", System.getProperty("os.name"));
         }
         if (preferences.shouldSendTimezone()) {
-            builder.addParameter(
-                "timezone",
-                Calendar.getInstance().getTimeZone().getID()
-            );
+            builder.addParameter("timezone", Calendar.getInstance().getTimeZone().getID());
         }
 
         try {
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 ba05a680cb7..aa4725abd85 100644
--- a/src/main/java/org/jabref/logic/importer/fetcher/OpenAccessDoi.java
+++ b/src/main/java/org/jabref/logic/importer/fetcher/OpenAccessDoi.java
@@ -23,9 +23,7 @@
  */
 public class OpenAccessDoi implements FulltextFetcher {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(
-        FulltextFetcher.class
-    );
+    private static final Logger LOGGER = LoggerFactory.getLogger(FulltextFetcher.class);
 
     private static final String API_URL = "https://api.oadoi.org/v2/";
 
@@ -33,9 +31,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.isPresent()) {
             return Optional.empty();
@@ -72,10 +68,7 @@ public Optional<URL> findFullText(DOI doi) throws UnirestException {
                 try {
                     return Optional.of(new URL(url));
                 } catch (MalformedURLException e) {
-                    LOGGER.debug(
-                        "Could not determine URL to fetch full text from",
-                        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 31611b7857e..a4f1237335f 100644
--- a/src/main/java/org/jabref/logic/importer/fetcher/ResearchGate.java
+++ b/src/main/java/org/jabref/logic/importer/fetcher/ResearchGate.java
@@ -33,18 +33,13 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-public class ResearchGate
-    implements FulltextFetcher, EntryBasedFetcher, SearchBasedFetcher {
+public class ResearchGate implements FulltextFetcher, EntryBasedFetcher, SearchBasedFetcher {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(
-        ResearchGate.class
-    );
+    private static final Logger LOGGER = LoggerFactory.getLogger(ResearchGate.class);
     private static final String HOST = "https://www.researchgate.net/";
-    private static final String GOOGLE_SEARCH =
-        "https://www.google.com/search?q=";
+    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 = "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 final ImportFormatPreferences formatPreferences;
@@ -64,8 +59,7 @@ public ResearchGate(ImportFormatPreferences importFormatPreferences) {
      * @throws FetcherException if the ResearchGate refuses to serve the page
      */
     @Override
-    public Optional<URL> findFullText(BibEntry entry)
-        throws IOException, FetcherException {
+    public Optional<URL> findFullText(BibEntry entry) throws IOException, FetcherException {
         Objects.requireNonNull(entry);
 
         Document html;
@@ -76,10 +70,7 @@ public Optional<URL> findFullText(BibEntry entry)
             return Optional.empty();
         }
         Elements eLink = html.getElementsByTag("section");
-        String link = eLink
-            .select("a[href^=https]")
-            .select("a[href$=.pdf]")
-            .attr("href");
+        String link = eLink.select("a[href^=https]").select("a[href$=.pdf]").attr("href");
         LOGGER.debug("PDF link: {}", link);
 
         if (link.contains("researchgate.net")) {
@@ -88,13 +79,10 @@ public Optional<URL> findFullText(BibEntry entry)
         return Optional.empty();
     }
 
-    private Document getHTML(BibEntry entry)
-        throws FetcherException, IOException {
+    private Document getHTML(BibEntry entry) throws FetcherException, IOException {
         // DOI search
         Optional<String> title = entry.getField(StandardField.TITLE);
-        Optional<DOI> doi = entry
-            .getField(StandardField.DOI)
-            .flatMap(DOI::parse);
+        Optional<DOI> doi = entry.getField(StandardField.DOI).flatMap(DOI::parse);
 
         // Retrieve PDF link
         Optional<String> linkForSearch;
@@ -127,8 +115,7 @@ private Document getHTML(BibEntry entry)
         throw new FetcherException("Could not find a pdf");
     }
 
-    Optional<String> getURLByString(String query)
-        throws IOException, NullPointerException {
+    Optional<String> getURLByString(String query) throws IOException, NullPointerException {
         URIBuilder source;
         String link;
         try {
@@ -161,8 +148,7 @@ Optional<String> getURLByString(String query)
         return Optional.of(link);
     }
 
-    Optional<String> getURLByDoi(DOI doi)
-        throws IOException, NullPointerException {
+    Optional<String> getURLByDoi(DOI doi) throws IOException, NullPointerException {
         String link;
         try {
             URIBuilder source = new URIBuilder(SEARCH);
@@ -177,11 +163,7 @@ Optional<String> getURLByDoi(DOI doi)
                 .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();
         }
@@ -199,11 +181,8 @@ Optional<String> getURLByDoi(DOI doi)
      * @throws URISyntaxException from {@link URIBuilder}'s build() method
      * @throws IOException        from {@link Connection}'s get() method
      */
-    private Document getPage(QueryNode luceneQuery)
-        throws URISyntaxException, IOException {
-        String query = new DefaultQueryTransformer()
-            .transformLuceneQuery(luceneQuery)
-            .orElse("");
+    private Document getPage(QueryNode luceneQuery) throws URISyntaxException, IOException {
+        String query = new DefaultQueryTransformer().transformLuceneQuery(luceneQuery).orElse("");
         URIBuilder source = new URIBuilder(SEARCH);
         source.addParameter("type", "publication");
         source.addParameter("query", query);
@@ -228,26 +207,19 @@ public TrustLevel getTrustLevel() {
      * @throws FetcherException if the ResearchGate refuses to serve the page
      */
     @Override
-    public List<BibEntry> performSearch(QueryNode luceneQuery)
-        throws FetcherException {
+    public List<BibEntry> performSearch(QueryNode luceneQuery) throws FetcherException {
         Document html;
         try {
             html = getPage(luceneQuery);
             // ResearchGate's server blocks when too many request are made
-            if (
-                !html
-                    .getElementsByClass("nova-legacy-v-publication-item__title")
-                    .hasText()
-            ) {
+            if (!html.getElementsByClass("nova-legacy-v-publication-item__title").hasText()) {
                 throw new FetcherException("ResearchGate server unavailable");
             }
         } catch (URISyntaxException | IOException e) {
             throw new FetcherException("URL is not correct", e);
         }
 
-        Elements sol = html.getElementsByClass(
-            "nova-legacy-v-publication-item__title"
-        );
+        Elements sol = html.getElementsByClass("nova-legacy-v-publication-item__title");
         List<String> urls = sol
             .select("a")
             .eachAttr("href")
@@ -262,9 +234,7 @@ public List<BibEntry> performSearch(QueryNode luceneQuery)
             .map(idStream -> SEARCH_FOR_BIB_ENTRY + idStream)
             .map(this::getInputStream)
             .filter(Objects::nonNull)
-            .map(stream ->
-                stream.lines().collect(Collectors.joining(OS.NEWLINE))
-            )
+            .map(stream -> stream.lines().collect(Collectors.joining(OS.NEWLINE)))
             .toList();
 
         List<BibEntry> list = new ArrayList<>();
@@ -304,8 +274,7 @@ public String getName() {
      * @throws FetcherException if the ResearchGate refuses to serve the page
      */
     @Override
-    public List<BibEntry> performSearch(BibEntry entry)
-        throws FetcherException {
+    public List<BibEntry> performSearch(BibEntry entry) throws FetcherException {
         Optional<String> title = entry.getTitle();
         if (title.isEmpty()) {
             return new ArrayList<>();
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 5d111088af0..8b0590e1f44 100644
--- a/src/main/java/org/jabref/logic/importer/fetcher/RfcFetcher.java
+++ b/src/main/java/org/jabref/logic/importer/fetcher/RfcFetcher.java
@@ -56,9 +56,7 @@ public URL getUrlForIdentifier(String identifier)
             prefixedIdentifier = "rfc" + prefixedIdentifier;
         }
         URIBuilder uriBuilder = new URIBuilder(
-            "https://datatracker.ietf.org/doc/" +
-            prefixedIdentifier +
-            "/bibtex/"
+            "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 d2b609e6f8e..1e07100ec89 100644
--- a/src/main/java/org/jabref/logic/importer/fetcher/ScholarArchiveFetcher.java
+++ b/src/main/java/org/jabref/logic/importer/fetcher/ScholarArchiveFetcher.java
@@ -32,9 +32,7 @@ public class ScholarArchiveFetcher implements PagedSearchBasedParserFetcher {
 
     public static final String FETCHER_NAME = "ScholarArchive";
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(
-        ScholarArchiveFetcher.class
-    );
+    private static final Logger LOGGER = LoggerFactory.getLogger(ScholarArchiveFetcher.class);
 
     private static final String API_URL = "https://scholar.archive.org/search";
 
@@ -51,14 +49,9 @@ public URL getURLForQuery(QueryNode luceneQuery, int pageNumber)
         URIBuilder uriBuilder = new URIBuilder(API_URL);
         uriBuilder.addParameter(
             "q",
-            new ScholarArchiveQueryTransformer()
-                .transformLuceneQuery(luceneQuery)
-                .orElse("")
-        );
-        uriBuilder.addParameter(
-            "from",
-            String.valueOf(getPageSize() * pageNumber)
+            new ScholarArchiveQueryTransformer().transformLuceneQuery(luceneQuery).orElse("")
         );
+        uriBuilder.addParameter("from", String.valueOf(getPageSize() * pageNumber));
         uriBuilder.addParameter("size", String.valueOf(getPageSize()));
         uriBuilder.addParameter("format", "json");
 
@@ -101,8 +94,7 @@ public String getName() {
         return FETCHER_NAME;
     }
 
-    private BibEntry parseJSONtoBibtex(JSONObject jsonEntry)
-        throws ParseException {
+    private BibEntry parseJSONtoBibtex(JSONObject jsonEntry) throws ParseException {
         try {
             BibEntry entry = new BibEntry();
             EntryType entryType = StandardEntryType.InCollection;
@@ -132,29 +124,14 @@ private BibEntry parseJSONtoBibtex(JSONObject jsonEntry)
             entry.setType(entryType);
 
             entry.setField(StandardField.TITLE, biblio.optString("title"));
-            entry.setField(
-                StandardField.JOURNAL,
-                biblio.optString("container_name")
-            );
+            entry.setField(StandardField.JOURNAL, biblio.optString("container_name"));
             entry.setField(StandardField.DOI, biblio.optString("doi"));
             entry.setField(StandardField.ISSUE, biblio.optString("issue"));
-            entry.setField(
-                StandardField.LANGUAGE,
-                biblio.optString("lang_code")
-            );
-            entry.setField(
-                StandardField.PUBLISHER,
-                biblio.optString("publisher")
-            );
-
-            entry.setField(
-                StandardField.YEAR,
-                String.valueOf(biblio.optInt("release_year"))
-            );
-            entry.setField(
-                StandardField.VOLUME,
-                String.valueOf(biblio.optInt("volume_int"))
-            );
+            entry.setField(StandardField.LANGUAGE, biblio.optString("lang_code"));
+            entry.setField(StandardField.PUBLISHER, biblio.optString("publisher"));
+
+            entry.setField(StandardField.YEAR, String.valueOf(biblio.optInt("release_year")));
+            entry.setField(StandardField.VOLUME, String.valueOf(biblio.optInt("volume_int")));
             entry.setField(StandardField.ABSTRACT, foundAbstract);
             entry.setField(StandardField.URL, url);
 
@@ -168,9 +145,7 @@ private BibEntry parseJSONtoBibtex(JSONObject jsonEntry)
                 for (int i = 0; i < authors.length(); i++) {
                     authorList.add(authors.getString(i));
                 }
-                AuthorList parsedAuthors = AuthorList.parse(
-                    String.join(" and ", authorList)
-                );
+                AuthorList parsedAuthors = AuthorList.parse(String.join(" and ", authorList));
                 entry.setField(
                     StandardField.AUTHOR,
                     parsedAuthors.getAsLastFirstNamesWithAnd(false)
@@ -187,10 +162,7 @@ private BibEntry parseJSONtoBibtex(JSONObject jsonEntry)
             }
             return entry;
         } catch (JSONException exception) {
-            throw new ParseException(
-                "ScholarArchive API JSON format has changed",
-                exception
-            );
+            throw new ParseException("ScholarArchive API JSON format has changed", exception);
         }
     }
 }
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 67106648ee6..bd84844c5fc 100644
--- a/src/main/java/org/jabref/logic/importer/fetcher/ScienceDirect.java
+++ b/src/main/java/org/jabref/logic/importer/fetcher/ScienceDirect.java
@@ -33,12 +33,9 @@
  */
 public class ScienceDirect implements FulltextFetcher, CustomizableKeyFetcher {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(
-        ScienceDirect.class
-    );
+    private static final Logger LOGGER = LoggerFactory.getLogger(ScienceDirect.class);
 
-    private static final String API_URL =
-        "https://api.elsevier.com/content/article/doi/";
+    private static final String API_URL = "https://api.elsevier.com/content/article/doi/";
     private static final String API_KEY = new BuildInfo().scienceDirectApiKey;
     private static final String FETCHER_NAME = "ScienceDirect";
 
@@ -52,9 +49,7 @@ public ScienceDirect(ImporterPreferences importerPreferences) {
     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()) {
             // Full text fetching works only if a DOI is present
             return Optional.empty();
@@ -73,10 +68,7 @@ public Optional<URL> findFullText(BibEntry entry) throws IOException {
             .get();
 
         // Retrieve PDF link from meta data (most recent)
-        Elements metaLinks = html.getElementsByAttributeValue(
-            "name",
-            "citation_pdf_url"
-        );
+        Elements metaLinks = html.getElementsByAttributeValue("name", "citation_pdf_url");
         if (!metaLinks.isEmpty()) {
             String link = metaLinks.first().attr("content");
             return Optional.of(new URL(link));
@@ -112,27 +104,14 @@ public Optional<URL> findFullText(BibEntry entry) throws IOException {
             String linkToPdf = pdfDownload.getString("linkToPdf");
             URL url = new URL(urlFromDoi);
             fullLinkToPdf =
-                String.format(
-                    "%s://%s%s",
-                    url.getProtocol(),
-                    url.getAuthority(),
-                    linkToPdf
-                );
+                String.format("%s://%s%s", url.getProtocol(), url.getAuthority(), linkToPdf);
         } else if (pdfDownload.has("urlMetadata")) {
             JSONObject urlMetadata = pdfDownload.getJSONObject("urlMetadata");
-            JSONObject queryParamsObject = urlMetadata.getJSONObject(
-                "queryParams"
-            );
+            JSONObject queryParamsObject = urlMetadata.getJSONObject("queryParams");
             String queryParameters = queryParamsObject
                 .keySet()
                 .stream()
-                .map(key ->
-                    String.format(
-                        "%s=%s",
-                        key,
-                        queryParamsObject.getString(key)
-                    )
-                )
+                .map(key -> String.format("%s=%s", key, queryParamsObject.getString(key)))
                 .collect(Collectors.joining("&"));
             fullLinkToPdf =
                 String.format(
@@ -147,10 +126,7 @@ public Optional<URL> findFullText(BibEntry entry) throws IOException {
             return Optional.empty();
         }
 
-        LOGGER.info(
-            "Fulltext PDF found at ScienceDirect at {}.",
-            fullLinkToPdf
-        );
+        LOGGER.info("Fulltext PDF found at ScienceDirect at {}.", fullLinkToPdf);
         try {
             return Optional.of(new URL(fullLinkToPdf));
         } catch (MalformedURLException e) {
@@ -170,10 +146,7 @@ private String getUrlByDoi(String doi) throws UnirestException {
             String request = API_URL + doi;
             HttpResponse<JsonNode> jsonResponse = Unirest
                 .get(request)
-                .header(
-                    "X-ELS-APIKey",
-                    importerPreferences.getApiKey(getName()).orElse(API_KEY)
-                )
+                .header("X-ELS-APIKey", importerPreferences.getApiKey(getName()).orElse(API_KEY))
                 .queryString("httpAccept", "application/json")
                 .asJson();
 
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 1317e356866..e4e88509ef5 100644
--- a/src/main/java/org/jabref/logic/importer/fetcher/SemanticScholar.java
+++ b/src/main/java/org/jabref/logic/importer/fetcher/SemanticScholar.java
@@ -39,17 +39,11 @@
 
 public class SemanticScholar
     implements
-        FulltextFetcher,
-        PagedSearchBasedParserFetcher,
-        EntryBasedFetcher,
-        CustomizableKeyFetcher {
+        FulltextFetcher, PagedSearchBasedParserFetcher, EntryBasedFetcher, CustomizableKeyFetcher {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(
-        SemanticScholar.class
-    );
+    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_ID_SEARCH = "https://api.semanticscholar.org/v1/paper/";
     private static final String SOURCE_WEB_SEARCH =
         "https://api.semanticscholar.org/graph/v1/paper/search?";
     private final ImporterPreferences importerPreferences;
@@ -69,13 +63,10 @@ public SemanticScholar(ImporterPreferences importerPreferences) {
      * @throws FetcherException if the received page differs from what was expected
      */
     @Override
-    public Optional<URL> findFullText(BibEntry entry)
-        throws IOException, FetcherException {
+    public Optional<URL> findFullText(BibEntry entry) throws IOException, FetcherException {
         Objects.requireNonNull(entry);
 
-        Optional<DOI> doi = entry
-            .getField(StandardField.DOI)
-            .flatMap(DOI::parse);
+        Optional<DOI> doi = entry.getField(StandardField.DOI).flatMap(DOI::parse);
         Optional<ArXivIdentifier> arXiv = entry
             .getField(StandardField.EPRINT)
             .flatMap(ArXivIdentifier::parse);
@@ -98,10 +89,7 @@ public Optional<URL> findFullText(BibEntry entry)
                 LOGGER.info("Error for pdf lookup with DOI");
             }
         }
-        if (
-            arXiv.isPresent() &&
-            entry.getField(StandardField.EPRINT).isPresent()
-        ) {
+        if (arXiv.isPresent() && entry.getField(StandardField.EPRINT).isPresent()) {
             // Check if entry is a match
             String arXivString = entry.getField(StandardField.EPRINT).get();
             if (!arXivString.startsWith("arXiv:")) {
@@ -125,13 +113,10 @@ public Optional<URL> findFullText(BibEntry entry)
         // Retrieve PDF link from button on the webpage
         // First checked is a drop-down menu, as it has the correct URL if present
         // Else take the primary button
-        Elements metaLinks = html.getElementsByClass(
-            "flex-item alternate-sources__dropdown"
-        );
+        Elements metaLinks = html.getElementsByClass("flex-item alternate-sources__dropdown");
         String link = metaLinks.select("a").attr("href");
         if (link.length() < 10) {
-            metaLinks =
-                html.getElementsByClass("flex-paper-actions__button--primary");
+            metaLinks = html.getElementsByClass("flex-paper-actions__button--primary");
             link = metaLinks.select("a").attr("href");
         }
         if (link.isBlank()) {
@@ -162,19 +147,12 @@ public URL getURLForQuery(QueryNode luceneQuery, int pageNumber)
         URIBuilder uriBuilder = new URIBuilder(SOURCE_WEB_SEARCH);
         uriBuilder.addParameter(
             "query",
-            new DefaultQueryTransformer()
-                .transformLuceneQuery(luceneQuery)
-                .orElse("")
-        );
-        uriBuilder.addParameter(
-            "offset",
-            String.valueOf(pageNumber * getPageSize())
+            new DefaultQueryTransformer().transformLuceneQuery(luceneQuery).orElse("")
         );
+        uriBuilder.addParameter("offset", String.valueOf(pageNumber * getPageSize()));
         uriBuilder.addParameter(
             "limit",
-            String.valueOf(
-                Math.min(getPageSize(), 10000 - pageNumber * getPageSize())
-            )
+            String.valueOf(Math.min(getPageSize(), 10000 - pageNumber * getPageSize()))
         );
         // All fields need to be specified
         uriBuilder.addParameter(
@@ -201,11 +179,7 @@ public Parser getParser() {
             if (total == 0) {
                 return Collections.emptyList();
             } else if (response.has("next")) {
-                total =
-                    Math.min(
-                        total,
-                        response.getInt("next") - response.getInt("offset")
-                    );
+                total = Math.min(total, response.getInt("next") - response.getInt("offset"));
             }
 
             // Response contains a list
@@ -242,28 +216,20 @@ private BibEntry jsonItemToBibEntry(JSONObject item) throws ParseException {
                 IntStream
                     .range(0, item.optJSONArray("authors").length())
                     .mapToObj(item.optJSONArray("authors")::getJSONObject)
-                    .map(author ->
-                        author.has("name") ? author.getString("name") : ""
-                    )
+                    .map(author -> author.has("name") ? author.getString("name") : "")
                     .collect(Collectors.joining(" and "))
             );
 
             JSONObject externalIds = item.optJSONObject("externalIds");
             entry.setField(StandardField.DOI, externalIds.optString("DOI"));
             if (externalIds.has("ArXiv")) {
-                entry.setField(
-                    StandardField.EPRINT,
-                    externalIds.getString("ArXiv")
-                );
+                entry.setField(StandardField.EPRINT, externalIds.getString("ArXiv"));
                 entry.setField(StandardField.EPRINTTYPE, "arXiv");
             }
             entry.setField(StandardField.PMID, externalIds.optString("PubMed"));
             return entry;
         } catch (JSONException exception) {
-            throw new ParseException(
-                "SemanticScholar API JSON format has changed",
-                exception
-            );
+            throw new ParseException("SemanticScholar API JSON format has changed", exception);
         }
     }
 
@@ -285,8 +251,7 @@ public String getName() {
      * @throws FetcherException if an error linked to the Fetcher applies
      */
     @Override
-    public List<BibEntry> performSearch(BibEntry entry)
-        throws FetcherException {
+    public List<BibEntry> performSearch(BibEntry entry) throws FetcherException {
         Optional<String> title = entry.getTitle();
         if (title.isEmpty()) {
             return new ArrayList<>();
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 7e55369bdca..6d6702a0626 100644
--- a/src/main/java/org/jabref/logic/importer/fetcher/SpringerFetcher.java
+++ b/src/main/java/org/jabref/logic/importer/fetcher/SpringerFetcher.java
@@ -35,17 +35,13 @@
  *
  * @see <a href="https://dev.springernature.com/">API documentation</a> for more details
  */
-public class SpringerFetcher
-    implements PagedSearchBasedParserFetcher, CustomizableKeyFetcher {
+public class SpringerFetcher implements PagedSearchBasedParserFetcher, CustomizableKeyFetcher {
 
     public static final String FETCHER_NAME = "Springer";
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(
-        SpringerFetcher.class
-    );
+    private static final Logger LOGGER = LoggerFactory.getLogger(SpringerFetcher.class);
 
-    private static final String API_URL =
-        "https://api.springernature.com/meta/v1/json";
+    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 =
@@ -63,9 +59,7 @@ public SpringerFetcher(ImporterPreferences importerPreferences) {
      * @param springerJsonEntry the JSONObject from search results
      * @return the converted BibEntry
      */
-    public static BibEntry parseSpringerJSONtoBibtex(
-        JSONObject springerJsonEntry
-    ) {
+    public static BibEntry parseSpringerJSONtoBibtex(JSONObject springerJsonEntry) {
         // Fields that are directly accessible at the top level Json object
         Field[] singleFieldStrings = {
             StandardField.ISSN,
@@ -99,17 +93,12 @@ public static BibEntry parseSpringerJSONtoBibtex(
             List<String> authorList = new ArrayList<>();
             for (int i = 0; i < authors.length(); i++) {
                 if (authors.getJSONObject(i).has("creator")) {
-                    authorList.add(
-                        authors.getJSONObject(i).getString("creator")
-                    );
+                    authorList.add(authors.getJSONObject(i).getString("creator"));
                 } else {
                     LOGGER.info("Empty author name.");
                 }
             }
-            entry.setField(
-                StandardField.AUTHOR,
-                String.join(" and ", authorList)
-            );
+            entry.setField(StandardField.AUTHOR, String.join(" and ", authorList));
         } else {
             LOGGER.info("No author found.");
         }
@@ -140,45 +129,28 @@ public static BibEntry parseSpringerJSONtoBibtex(
                     springerJsonEntry.getString("endingPage")
                 );
             } else {
-                entry.setField(
-                    StandardField.PAGES,
-                    springerJsonEntry.getString("startingPage")
-                );
+                entry.setField(StandardField.PAGES, springerJsonEntry.getString("startingPage"));
             }
         }
 
         // Journal
         if (springerJsonEntry.has("publicationName")) {
-            entry.setField(
-                nametype,
-                springerJsonEntry.getString("publicationName")
-            );
+            entry.setField(nametype, springerJsonEntry.getString("publicationName"));
         }
 
         // Online file
         if (springerJsonEntry.has("url")) {
             JSONArray urls = springerJsonEntry.optJSONArray("url");
             if (urls == null) {
-                entry.setField(
-                    StandardField.URL,
-                    springerJsonEntry.optString("url")
-                );
+                entry.setField(StandardField.URL, springerJsonEntry.optString("url"));
             } else {
                 urls.forEach(data -> {
                     JSONObject url = (JSONObject) data;
                     if (url.optString("format").equalsIgnoreCase("pdf")) {
                         try {
-                            entry.addFile(
-                                new LinkedFile(
-                                    new URL(url.optString("value")),
-                                    "PDF"
-                                )
-                            );
+                            entry.addFile(new LinkedFile(new URL(url.optString("value")), "PDF"));
                         } catch (MalformedURLException e) {
-                            LOGGER.info(
-                                "Malformed URL: {}",
-                                url.optString("value")
-                            );
+                            LOGGER.info("Malformed URL: {}", url.optString("value"));
                         }
                     }
                 });
@@ -191,9 +163,7 @@ public static BibEntry parseSpringerJSONtoBibtex(
             entry.setField(StandardField.DATE, date); // For biblatex
             String[] dateparts = date.split("-");
             entry.setField(StandardField.YEAR, dateparts[0]);
-            Optional<Month> month = Month.getMonthByNumber(
-                Integer.parseInt(dateparts[1])
-            );
+            Optional<Month> month = Month.getMonthByNumber(Integer.parseInt(dateparts[1]));
             month.ifPresent(entry::setMonth);
         }
 
@@ -202,10 +172,7 @@ public static BibEntry parseSpringerJSONtoBibtex(
             .getField(StandardField.ABSTRACT)
             .ifPresent(abstractContents -> {
                 if (abstractContents.startsWith("Abstract")) {
-                    entry.setField(
-                        StandardField.ABSTRACT,
-                        abstractContents.substring(8)
-                    );
+                    entry.setField(StandardField.ABSTRACT, abstractContents.substring(8));
                 }
             });
 
@@ -240,39 +207,24 @@ public URL getURLForQuery(QueryNode luceneQuery, int pageNumber)
         URIBuilder uriBuilder = new URIBuilder(API_URL);
         uriBuilder.addParameter(
             "q",
-            new SpringerQueryTransformer()
-                .transformLuceneQuery(luceneQuery)
-                .orElse("")
+            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("s", String.valueOf(getPageSize() * pageNumber + 1)); // Start entry, starts indexing at 1
         uriBuilder.addParameter("p", String.valueOf(getPageSize())); // Page size
         return uriBuilder.build().toURL();
     }
 
-    private String constructComplexQueryString(
-        ComplexSearchQuery complexSearchQuery
-    ) {
+    private String constructComplexQueryString(ComplexSearchQuery complexSearchQuery) {
         List<String> searchTerms = new ArrayList<>();
-        complexSearchQuery
-            .getAuthors()
-            .forEach(author -> searchTerms.add("name:" + author));
-        complexSearchQuery
-            .getTitlePhrases()
-            .forEach(title -> searchTerms.add("title:" + title));
-        complexSearchQuery
-            .getJournal()
-            .ifPresent(journal -> searchTerms.add("journal:" + journal));
+        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
-        complexSearchQuery
-            .getSingleYear()
-            .ifPresent(year -> searchTerms.add("date:" + year + "*"));
+        complexSearchQuery.getSingleYear().ifPresent(year -> searchTerms.add("date:" + year + "*"));
         searchTerms.addAll(complexSearchQuery.getDefaultFieldPhrases());
         return String.join(" AND ", searchTerms);
     }
@@ -280,9 +232,7 @@ private String constructComplexQueryString(
     @Override
     public Parser getParser() {
         return inputStream -> {
-            String response = new BufferedReader(
-                new InputStreamReader(inputStream)
-            )
+            String response = new BufferedReader(new InputStreamReader(inputStream))
                 .lines()
                 .collect(Collectors.joining(OS.NEWLINE));
             JSONObject jsonObject = new JSONObject(response);
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 290ca114aa5..6c9ce018ae0 100644
--- a/src/main/java/org/jabref/logic/importer/fetcher/SpringerLink.java
+++ b/src/main/java/org/jabref/logic/importer/fetcher/SpringerLink.java
@@ -27,12 +27,9 @@ public class SpringerLink implements FulltextFetcher, CustomizableKeyFetcher {
 
     public static final String FETCHER_NAME = "Springer";
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(
-        SpringerLink.class
-    );
+    private static final Logger LOGGER = LoggerFactory.getLogger(SpringerLink.class);
 
-    private static final String API_URL =
-        "https://api.springer.com/meta/v1/json";
+    private static final String API_URL = "https://api.springer.com/meta/v1/json";
     private static final String API_KEY = new BuildInfo().springerNatureAPIKey;
     private static final String CONTENT_HOST = "link.springer.com";
 
@@ -47,9 +44,7 @@ public Optional<URL> findFullText(BibEntry entry) throws IOException {
         Objects.requireNonNull(entry);
 
         // Try unique DOI first
-        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();
@@ -58,18 +53,12 @@ public Optional<URL> findFullText(BibEntry entry) throws IOException {
         try {
             HttpResponse<JsonNode> jsonResponse = Unirest
                 .get(API_URL)
-                .queryString(
-                    "api_key",
-                    importerPreferences.getApiKey(getName()).orElse(API_KEY)
-                )
+                .queryString("api_key", importerPreferences.getApiKey(getName()).orElse(API_KEY))
                 .queryString("q", String.format("doi:%s", doi.get().getDOI()))
                 .asJson();
             if (jsonResponse.getBody() != null) {
                 JSONObject json = jsonResponse.getBody().getObject();
-                int results = json
-                    .getJSONArray("result")
-                    .getJSONObject(0)
-                    .getInt("total");
+                int results = json.getJSONArray("result").getJSONObject(0).getInt("total");
 
                 if (results > 0) {
                     LOGGER.info("Fulltext PDF found @ Springer.");
@@ -77,10 +66,7 @@ public Optional<URL> findFullText(BibEntry entry) throws IOException {
                         new URL(
                             "http",
                             CONTENT_HOST,
-                            String.format(
-                                "/content/pdf/%s.pdf",
-                                doi.get().getDOI()
-                            )
+                            String.format("/content/pdf/%s.pdf", doi.get().getDOI())
                         )
                     );
                 }
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 02c9ca94d05..a1505117c35 100644
--- a/src/main/java/org/jabref/logic/importer/fetcher/TitleFetcher.java
+++ b/src/main/java/org/jabref/logic/importer/fetcher/TitleFetcher.java
@@ -30,8 +30,7 @@ public Optional<HelpFile> getHelpPage() {
     }
 
     @Override
-    public Optional<BibEntry> performSearchById(String identifier)
-        throws FetcherException {
+    public Optional<BibEntry> performSearchById(String identifier) throws FetcherException {
         if (StringUtil.isBlank(identifier)) {
             return Optional.empty();
         }
@@ -39,9 +38,7 @@ public Optional<BibEntry> performSearchById(String identifier)
         BibEntry entry = new BibEntry();
         entry.setField(StandardField.TITLE, identifier);
 
-        Optional<DOI> doi = WebFetchers
-            .getIdFetcherForIdentifier(DOI.class)
-            .findIdentifier(entry);
+        Optional<DOI> doi = WebFetchers.getIdFetcherForIdentifier(DOI.class).findIdentifier(entry);
         if (doi.isEmpty()) {
             return Optional.empty();
         }
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 598a5335c93..55917c310cf 100644
--- a/src/main/java/org/jabref/logic/importer/fetcher/ZbMATH.java
+++ b/src/main/java/org/jabref/logic/importer/fetcher/ZbMATH.java
@@ -33,10 +33,7 @@
  * Fetches data from the Zentralblatt Math (https://www.zbmath.org/)
  */
 public class ZbMATH
-    implements
-        SearchBasedParserFetcher,
-        IdBasedParserFetcher,
-        EntryBasedParserFetcher {
+    implements SearchBasedParserFetcher, IdBasedParserFetcher, EntryBasedParserFetcher {
 
     private final ImportFormatPreferences preferences;
 
@@ -52,17 +49,13 @@ public String getName() {
     @Override
     public URL getURLForEntry(BibEntry entry)
         throws URISyntaxException, MalformedURLException, FetcherException {
-        Optional<String> zblidInEntry = entry.getField(
-            StandardField.ZBL_NUMBER
-        );
+        Optional<String> zblidInEntry = entry.getField(StandardField.ZBL_NUMBER);
         if (zblidInEntry.isPresent()) {
             // zbmath id is already present
             return getUrlForIdentifier(zblidInEntry.get());
         }
 
-        URIBuilder uriBuilder = new URIBuilder(
-            "https://zbmath.org/citationmatching/match"
-        );
+        URIBuilder uriBuilder = new URIBuilder("https://zbmath.org/citationmatching/match");
         uriBuilder.addParameter("n", "1"); // return only the best matching entry
         uriBuilder.addParameter("m", "5"); // return only entries with a score of at least 5
 
@@ -107,10 +100,7 @@ public URL getURLForEntry(BibEntry entry)
         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();
             }
@@ -126,14 +116,10 @@ public URL getURLForEntry(BibEntry entry)
     @Override
     public URL getURLForQuery(QueryNode luceneQuery)
         throws URISyntaxException, MalformedURLException, FetcherException {
-        URIBuilder uriBuilder = new URIBuilder(
-            "https://zbmath.org/bibtexoutput/"
-        );
+        URIBuilder uriBuilder = new URIBuilder("https://zbmath.org/bibtexoutput/");
         uriBuilder.addParameter(
             "q",
-            new ZbMathQueryTransformer()
-                .transformLuceneQuery(luceneQuery)
-                .orElse("")
+            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)
@@ -143,9 +129,7 @@ public URL getURLForQuery(QueryNode luceneQuery)
     @Override
     public URL getUrlForIdentifier(String identifier)
         throws URISyntaxException, MalformedURLException, FetcherException {
-        URIBuilder uriBuilder = new URIBuilder(
-            "https://zbmath.org/bibtexoutput/"
-        );
+        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);
         uriBuilder.addParameter("start", "0"); // start index
@@ -160,22 +144,10 @@ public Parser getParser() {
 
     @Override
     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 RemoveBracesFormatter()
-        )
-            .cleanup(entry);
-        new FieldFormatterCleanup(
-            StandardField.TITLE,
-            new RemoveBracesFormatter()
-        )
+        new MoveFieldCleanup(new UnknownField("msc2010"), StandardField.KEYWORDS).cleanup(entry);
+        new MoveFieldCleanup(AMSField.FJOURNAL, StandardField.JOURNAL).cleanup(entry);
+        new FieldFormatterCleanup(StandardField.JOURNAL, new RemoveBracesFormatter())
             .cleanup(entry);
+        new FieldFormatterCleanup(StandardField.TITLE, new RemoveBracesFormatter()).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 1ad6e7c9b14..5dd666bc1c6 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
@@ -27,12 +27,9 @@
  */
 public class DoiToBibtexConverterComIsbnFetcher extends AbstractIsbnFetcher {
 
-    private static final String BASE_URL =
-        "https://doi-to-bibtex-converter.herokuapp.com";
+    private static final String BASE_URL = "https://doi-to-bibtex-converter.herokuapp.com";
 
-    public DoiToBibtexConverterComIsbnFetcher(
-        ImportFormatPreferences importFormatPreferences
-    ) {
+    public DoiToBibtexConverterComIsbnFetcher(ImportFormatPreferences importFormatPreferences) {
         super(importFormatPreferences);
     }
 
@@ -80,47 +77,20 @@ private BibEntry jsonItemToBibEntry(JSONObject item) throws ParseException {
             var type = getElementFromJSONArrayByKey(data, "type");
 
             BibEntry entry = new BibEntry(evaluateBibEntryTypeFromString(type));
-            entry.setField(
-                StandardField.AUTHOR,
-                getElementFromJSONArrayByKey(data, "author")
-            );
-            entry.setField(
-                StandardField.PAGES,
-                getElementFromJSONArrayByKey(data, "pagecount")
-            );
-            entry.setField(
-                StandardField.ISBN,
-                getElementFromJSONArrayByKey(data, "isbn")
-            );
-            entry.setField(
-                StandardField.TITLE,
-                getElementFromJSONArrayByKey(data, "title")
-            );
-            entry.setField(
-                StandardField.YEAR,
-                getElementFromJSONArrayByKey(data, "year")
-            );
-            entry.setField(
-                StandardField.MONTH,
-                getElementFromJSONArrayByKey(data, "month")
-            );
-            entry.setField(
-                StandardField.DAY,
-                getElementFromJSONArrayByKey(data, "day")
-            );
+            entry.setField(StandardField.AUTHOR, getElementFromJSONArrayByKey(data, "author"));
+            entry.setField(StandardField.PAGES, getElementFromJSONArrayByKey(data, "pagecount"));
+            entry.setField(StandardField.ISBN, getElementFromJSONArrayByKey(data, "isbn"));
+            entry.setField(StandardField.TITLE, getElementFromJSONArrayByKey(data, "title"));
+            entry.setField(StandardField.YEAR, getElementFromJSONArrayByKey(data, "year"));
+            entry.setField(StandardField.MONTH, getElementFromJSONArrayByKey(data, "month"));
+            entry.setField(StandardField.DAY, getElementFromJSONArrayByKey(data, "day"));
             return entry;
         } catch (JSONException exception) {
-            throw new ParseException(
-                "CrossRef API JSON format has changed",
-                exception
-            );
+            throw new ParseException("CrossRef API JSON format has changed", exception);
         }
     }
 
-    private String getElementFromJSONArrayByKey(
-        JSONArray jsonArray,
-        String key
-    ) {
+    private String getElementFromJSONArrayByKey(JSONArray jsonArray, String key) {
         return IntStream
             .range(0, jsonArray.length())
             .mapToObj(jsonArray::getJSONObject)
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 7a277df678c..8956f08192a 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
@@ -18,8 +18,7 @@
  */
 public class EbookDeIsbnFetcher extends AbstractIsbnFetcher {
 
-    private static final String BASE_URL =
-        "https://www.ebook.de/de/tools/isbn2bibtex";
+    private static final String BASE_URL = "https://www.ebook.de/de/tools/isbn2bibtex";
 
     public EbookDeIsbnFetcher(ImportFormatPreferences importFormatPreferences) {
         super(importFormatPreferences);
@@ -34,10 +33,7 @@ public String getName() {
     public URL getUrlForIdentifier(String identifier)
         throws URISyntaxException, MalformedURLException, FetcherException {
         this.ensureThatIsbnIsValid(identifier);
-        return new URIBuilder(BASE_URL)
-            .addParameter("isbn", identifier)
-            .build()
-            .toURL();
+        return new URIBuilder(BASE_URL).addParameter("isbn", identifier).build().toURL();
     }
 
     @Override
@@ -50,20 +46,11 @@ public void doPostCleanup(BibEntry entry) {
         entry
             .getField(StandardField.PAGETOTAL)
             .ifPresent(pages ->
-                entry.setField(
-                    StandardField.PAGETOTAL,
-                    pages.replaceAll("[\\D]", "")
-                )
+                entry.setField(StandardField.PAGETOTAL, pages.replaceAll("[\\D]", ""))
             );
-        new FieldFormatterCleanup(
-            StandardField.PAGETOTAL,
-            new NormalizePagesFormatter()
-        )
+        new FieldFormatterCleanup(StandardField.PAGETOTAL, new NormalizePagesFormatter())
             .cleanup(entry);
-        new FieldFormatterCleanup(
-            StandardField.AUTHOR,
-            new NormalizeNamesFormatter()
-        )
+        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 e043de9a009..3045dc86e77 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
@@ -29,20 +29,17 @@
  */
 public class IsbnFetcher implements EntryBasedFetcher, IdBasedFetcher {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(
-        IsbnFetcher.class
-    );
-    private static final Pattern NEWLINE_SPACE_PATTERN = Pattern.compile(
-        "\\n|\\r\\n|\\s"
-    );
+    private static final Logger LOGGER = LoggerFactory.getLogger(IsbnFetcher.class);
+    private static final Pattern NEWLINE_SPACE_PATTERN = Pattern.compile("\\n|\\r\\n|\\s");
     protected final ImportFormatPreferences importFormatPreferences;
     private final List<AbstractIsbnFetcher> retryIsbnFetcher;
     private final GvkFetcher gvkIbsnFetcher;
 
     public IsbnFetcher(ImportFormatPreferences importFormatPreferences) {
         this.importFormatPreferences = importFormatPreferences;
-        OpenLibraryIsbnFetcher openLibraryIsbnFetcher =
-            new OpenLibraryIsbnFetcher(importFormatPreferences);
+        OpenLibraryIsbnFetcher openLibraryIsbnFetcher = new OpenLibraryIsbnFetcher(
+            importFormatPreferences
+        );
         this.gvkIbsnFetcher = new GvkFetcher(importFormatPreferences);
         this.retryIsbnFetcher = new ArrayList<>();
         this.addRetryFetcher(openLibraryIsbnFetcher);
@@ -59,18 +56,14 @@ public Optional<HelpFile> getHelpPage() {
     }
 
     @Override
-    public Optional<BibEntry> performSearchById(String identifier)
-        throws FetcherException {
+    public Optional<BibEntry> performSearchById(String identifier) throws FetcherException {
         Optional<BibEntry> bibEntry = Optional.empty();
 
         try {
             identifier = removeNewlinesAndSpacesFromIdentifier(identifier);
             Optional<ISBN> isbn = ISBN.parse(identifier);
             if (isbn.isPresent()) {
-                bibEntry =
-                    gvkIbsnFetcher.performSearchById(
-                        isbn.get().getNormalized()
-                    );
+                bibEntry = gvkIbsnFetcher.performSearchById(isbn.get().getNormalized());
             }
         } catch (FetcherException ex) {
             LOGGER.debug("Got a fetcher exception for IBSN search", ex);
@@ -79,12 +72,9 @@ public Optional<BibEntry> performSearchById(String identifier)
             }
         } finally {
             // 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();
+            Iterator<AbstractIsbnFetcher> iterator = retryIsbnFetcher.iterator();
             while (bibEntry.isEmpty() && iterator.hasNext()) {
-                LOGGER.debug(
-                    "Trying using the alternate ISBN fetchers to find an entry."
-                );
+                LOGGER.debug("Trying using the alternate ISBN fetchers to find an entry.");
 
                 AbstractIsbnFetcher fetcher = iterator.next();
                 LOGGER.debug(
@@ -104,8 +94,7 @@ public Optional<BibEntry> performSearchById(String identifier)
     }
 
     @Override
-    public List<BibEntry> performSearch(BibEntry entry)
-        throws FetcherException {
+    public List<BibEntry> performSearch(BibEntry entry) throws FetcherException {
         Optional<String> isbn = entry.getField(StandardField.ISBN);
         if (isbn.isPresent()) {
             return OptionalUtil.toList(performSearchById(isbn.get()));
@@ -115,10 +104,7 @@ public List<BibEntry> performSearch(BibEntry entry)
     }
 
     public IsbnFetcher addRetryFetcher(AbstractIsbnFetcher retryFetcher) {
-        Objects.requireNonNull(
-            retryFetcher,
-            "Please provide a valid isbn fetcher."
-        );
+        Objects.requireNonNull(retryFetcher, "Please provide a valid isbn fetcher.");
         retryIsbnFetcher.add(retryFetcher);
         return this;
     }
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 ab2716ccc2f..ec8a14d4048 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
@@ -38,14 +38,10 @@
  */
 public class OpenLibraryIsbnFetcher extends AbstractIsbnFetcher {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(
-        OpenLibraryIsbnFetcher.class
-    );
+    private static final Logger LOGGER = LoggerFactory.getLogger(OpenLibraryIsbnFetcher.class);
     private static final String BASE_URL = "https://openlibrary.org";
 
-    public OpenLibraryIsbnFetcher(
-        ImportFormatPreferences importFormatPreferences
-    ) {
+    public OpenLibraryIsbnFetcher(ImportFormatPreferences importFormatPreferences) {
         super(importFormatPreferences);
     }
 
@@ -94,10 +90,7 @@ private BibEntry jsonItemToBibEntry(JSONObject item) throws ParseException {
                 authors = fromWorksToAuthors(works);
             }
             entry.setField(StandardField.AUTHOR, authors);
-            entry.setField(
-                StandardField.PAGES,
-                item.optString("number_of_pages")
-            );
+            entry.setField(StandardField.PAGES, item.optString("number_of_pages"));
             entry.setField(
                 StandardField.ISBN,
                 Optional
@@ -114,8 +107,7 @@ private BibEntry jsonItemToBibEntry(JSONObject item) throws ParseException {
                 StandardField.TITLE,
                 Optional
                     .ofNullable(item.optString("full_title", null))
-                    .or(() -> Optional.ofNullable(item.optString("title", null))
-                    )
+                    .or(() -> Optional.ofNullable(item.optString("title", null)))
                     .orElse("")
             );
             entry.setField(StandardField.SUBTITLE, item.optString("subtitle"));
@@ -133,10 +125,7 @@ private BibEntry jsonItemToBibEntry(JSONObject item) throws ParseException {
             );
             return entry;
         } catch (JSONException exception) {
-            throw new ParseException(
-                "CrossRef API JSON format has changed",
-                exception
-            );
+            throw new ParseException("CrossRef API JSON format has changed", exception);
         }
     }
 
@@ -153,10 +142,7 @@ private String toAuthors(JSONArray authors) {
     }
 
     private Author toAuthor(String key) {
-        JsonNode authorResponse = Unirest
-            .get(BASE_URL + key + ".json")
-            .asJson()
-            .getBody();
+        JsonNode authorResponse = Unirest.get(BASE_URL + key + ".json").asJson().getBody();
         if (authorResponse == null) {
             LOGGER.warn("Could not parse author");
             return new Author(null, null, null, null, null);
@@ -199,8 +185,6 @@ private Stream<Author> fromWorkToAuthors(String link) {
         return IntStream
             .range(0, authors.length())
             .mapToObj(authors::getJSONObject)
-            .map(authorObject ->
-                toAuthor(authorObject.getJSONObject("author").getString("key"))
-            );
+            .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 79d090b740f..73c0f78851a 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
@@ -20,9 +20,7 @@
 public abstract class AbstractQueryTransformer {
 
     public static final String NO_EXPLICIT_FIELD = "default";
-    private static final Logger LOGGER = LoggerFactory.getLogger(
-        AbstractQueryTransformer.class
-    );
+    private static final Logger LOGGER = LoggerFactory.getLogger(AbstractQueryTransformer.class);
 
     // These can be used for filtering in post processing
     protected int startYear = Integer.MAX_VALUE;
@@ -120,8 +118,7 @@ protected String handleDoi(String term) {
     private Optional<String> transform(ModifierQueryNode query) {
         ModifierQueryNode.Modifier modifier = query.getModifier();
         if (modifier == ModifierQueryNode.Modifier.MOD_NOT) {
-            return transform(query.getChild())
-                .map(s -> getLogicalNotOperator() + s);
+            return transform(query.getChild()).map(s -> getLogicalNotOperator() + s);
         } else {
             return transform(query.getChild());
         }
@@ -198,11 +195,7 @@ protected String createKeyValuePair(String fieldAsString, String term) {
         return createKeyValuePair(fieldAsString, term, ":");
     }
 
-    protected String createKeyValuePair(
-        String fieldAsString,
-        String term,
-        String separator
-    ) {
+    protected String createKeyValuePair(String fieldAsString, String term, String separator) {
         return String.format(
             "%s%s%s",
             fieldAsString,
@@ -215,10 +208,7 @@ protected String createKeyValuePair(
      * Return a string representation of the provided field
      * If it is not supported return an empty optional.
      */
-    protected Optional<String> handleOtherField(
-        String fieldAsString,
-        String term
-    ) {
+    protected Optional<String> handleOtherField(String fieldAsString, String term) {
         return Optional.of(createKeyValuePair(fieldAsString, term));
     }
 
@@ -232,10 +222,7 @@ private Optional<String> transform(QueryNode query) {
         } else if (query instanceof ModifierQueryNode) {
             return transform((ModifierQueryNode) query);
         } else {
-            LOGGER.error(
-                "Unsupported case when transforming the query:\n {}",
-                query
-            );
+            LOGGER.error("Unsupported case when transforming the query:\n {}", query);
             return Optional.empty();
         }
     }
diff --git a/src/main/java/org/jabref/logic/importer/fetcher/transformers/ArXivQueryTransformer.java b/src/main/java/org/jabref/logic/importer/fetcher/transformers/ArXivQueryTransformer.java
index 21bcb4eca61..4e6ee3469f6 100644
--- a/src/main/java/org/jabref/logic/importer/fetcher/transformers/ArXivQueryTransformer.java
+++ b/src/main/java/org/jabref/logic/importer/fetcher/transformers/ArXivQueryTransformer.java
@@ -2,8 +2,7 @@
 
 import java.util.Optional;
 
-public class ArXivQueryTransformer
-    extends YearRangeByFilteringQueryTransformer {
+public class ArXivQueryTransformer extends YearRangeByFilteringQueryTransformer {
 
     @Override
     protected String getLogicalAndOperator() {
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 0d8754e97e1..3af1571e43b 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
@@ -81,10 +81,7 @@ protected String handleYearRange(String yearRange) {
      * except "must_have_pdf" as FullTextFetcher is not yet implemented for CiteSeer
      */
     @Override
-    protected Optional<String> handleOtherField(
-        String fieldAsString,
-        String term
-    ) {
+    protected Optional<String> handleOtherField(String fieldAsString, String term) {
         return switch (fieldAsString) {
             case "page" -> handlePage(term);
             case "pageSize" -> handlePageSize(term);
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 32ae19dfa69..267035626ae 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
@@ -7,12 +7,9 @@
 /**
  * DBLP does not support explicit year field search, thus we extend YearAndYearRangeByFilteringQueryTransformer
  */
-public class DBLPQueryTransformer
-    extends YearAndYearRangeByFilteringQueryTransformer {
+public class DBLPQueryTransformer extends YearAndYearRangeByFilteringQueryTransformer {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(
-        DBLPQueryTransformer.class
-    );
+    private static final Logger LOGGER = LoggerFactory.getLogger(DBLPQueryTransformer.class);
 
     @Override
     protected String getLogicalAndOperator() {
diff --git a/src/main/java/org/jabref/logic/importer/fetcher/transformers/DefaultQueryTransformer.java b/src/main/java/org/jabref/logic/importer/fetcher/transformers/DefaultQueryTransformer.java
index 8dc4d6c5cb0..40f2064e62d 100644
--- a/src/main/java/org/jabref/logic/importer/fetcher/transformers/DefaultQueryTransformer.java
+++ b/src/main/java/org/jabref/logic/importer/fetcher/transformers/DefaultQueryTransformer.java
@@ -5,8 +5,7 @@
 /**
  * Default query transformer without any boolean operators
  */
-public class DefaultQueryTransformer
-    extends YearAndYearRangeByFilteringQueryTransformer {
+public class DefaultQueryTransformer extends YearAndYearRangeByFilteringQueryTransformer {
 
     @Override
     protected String getLogicalAndOperator() {
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 955b1222bdf..df22543024a 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
@@ -6,9 +6,7 @@
 
 public class GVKQueryTransformer extends YearRangeByFilteringQueryTransformer {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(
-        GVKQueryTransformer.class
-    );
+    private static final Logger LOGGER = LoggerFactory.getLogger(GVKQueryTransformer.class);
 
     @Override
     protected String getLogicalAndOperator() {
@@ -57,12 +55,7 @@ protected Optional<String> handleUnFieldedTerm(String term) {
     }
 
     @Override
-    protected Optional<String> handleOtherField(
-        String fieldAsString,
-        String term
-    ) {
-        return Optional.of(
-            createKeyValuePair("pica." + fieldAsString, term, "=")
-        );
+    protected Optional<String> handleOtherField(String fieldAsString, String term) {
+        return Optional.of(createKeyValuePair("pica." + fieldAsString, term, "="));
     }
 }
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 0dcf97844ff..3d1e04bc175 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
@@ -14,13 +14,7 @@ public class IEEEQueryTransformer extends YearRangeByFilteringQueryTransformer {
      * Returns words ignored by the engine. Need to be removed when querying for them.
      * See ADR-0022
      */
-    private static final List<String> STOP_WORDS = List.of(
-        "a",
-        "and",
-        "for",
-        "or",
-        "with"
-    );
+    private static final List<String> STOP_WORDS = List.of("a", "and", "for", "or", "with");
 
     // 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
@@ -66,10 +60,7 @@ protected String handleYear(String year) {
     }
 
     @Override
-    protected Optional<String> handleOtherField(
-        String fieldAsString,
-        String term
-    ) {
+    protected Optional<String> handleOtherField(String fieldAsString, String term) {
         return switch (fieldAsString) {
             case "article_number" -> handleArticleNumber(term);
             default -> super.handleOtherField(fieldAsString, term);
@@ -90,14 +81,10 @@ private Optional<String> handleArticleNumber(String term) {
     }
 
     public Optional<String> getJournal() {
-        return Objects.isNull(journal)
-            ? Optional.empty()
-            : Optional.of(journal);
+        return Objects.isNull(journal) ? Optional.empty() : Optional.of(journal);
     }
 
     public Optional<String> getArticleNumber() {
-        return Objects.isNull(articleNumber)
-            ? Optional.empty()
-            : Optional.of(articleNumber);
+        return Objects.isNull(articleNumber) ? Optional.empty() : Optional.of(articleNumber);
     }
 }
diff --git a/src/main/java/org/jabref/logic/importer/fetcher/transformers/MedlineQueryTransformer.java b/src/main/java/org/jabref/logic/importer/fetcher/transformers/MedlineQueryTransformer.java
index 8c5513621c8..87932a90765 100644
--- a/src/main/java/org/jabref/logic/importer/fetcher/transformers/MedlineQueryTransformer.java
+++ b/src/main/java/org/jabref/logic/importer/fetcher/transformers/MedlineQueryTransformer.java
@@ -49,11 +49,6 @@ protected String handleYearRange(String yearRange) {
         if (endYear == Integer.MAX_VALUE) {
             return yearRange;
         }
-        return (
-            Integer.toString(startYear) +
-            ":" +
-            Integer.toString(endYear) +
-            "[dp]"
-        );
+        return (Integer.toString(startYear) + ":" + Integer.toString(endYear) + "[dp]");
     }
 }
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 4627292d116..7b2114817b6 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,6 @@
 package org.jabref.logic.importer.fetcher.transformers;
 
-public class ScholarQueryTransformer
-    extends YearAndYearRangeByFilteringQueryTransformer {
+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
     private int startYear = Integer.MAX_VALUE;
diff --git a/src/main/java/org/jabref/logic/importer/fetcher/transformers/YearRangeByFilteringQueryTransformer.java b/src/main/java/org/jabref/logic/importer/fetcher/transformers/YearRangeByFilteringQueryTransformer.java
index 14237f3496a..40480dc4d13 100644
--- a/src/main/java/org/jabref/logic/importer/fetcher/transformers/YearRangeByFilteringQueryTransformer.java
+++ b/src/main/java/org/jabref/logic/importer/fetcher/transformers/YearRangeByFilteringQueryTransformer.java
@@ -6,19 +6,14 @@
  * This is a query transformer for a fetcher, which does not support server-side filtering by year-range (e.g., only publications between 1999 and 2002).
  * Thus, JabRef (as client) filters for year ranges on client-side.
  */
-public abstract class YearRangeByFilteringQueryTransformer
-    extends AbstractQueryTransformer {
+public abstract class YearRangeByFilteringQueryTransformer extends AbstractQueryTransformer {
 
     public Optional<Integer> getStartYear() {
-        return startYear == Integer.MAX_VALUE
-            ? Optional.empty()
-            : Optional.of(startYear);
+        return startYear == Integer.MAX_VALUE ? Optional.empty() : Optional.of(startYear);
     }
 
     public Optional<Integer> getEndYear() {
-        return endYear == Integer.MIN_VALUE
-            ? Optional.empty()
-            : Optional.of(endYear);
+        return endYear == Integer.MIN_VALUE ? Optional.empty() : Optional.of(endYear);
     }
 
     /**
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 bf2498ddf3c..fee7f0461bb 100644
--- a/src/main/java/org/jabref/logic/importer/fileformat/ACMPortalParser.java
+++ b/src/main/java/org/jabref/logic/importer/fileformat/ACMPortalParser.java
@@ -37,8 +37,7 @@
 public class ACMPortalParser implements Parser {
 
     private static final String HOST = "https://dl.acm.org";
-    private static final String DOI_URL =
-        "https://dl.acm.org/action/exportCiteProcCitation";
+    private static final String DOI_URL = "https://dl.acm.org/action/exportCiteProcCitation";
 
     /**
      * Parse the DOI of the ACM Portal search result page and obtain the corresponding BibEntry
@@ -47,12 +46,10 @@ public class ACMPortalParser implements Parser {
      * @return BibEntry List
      */
     @Override
-    public List<BibEntry> parseEntries(InputStream stream)
-        throws ParseException {
+    public List<BibEntry> parseEntries(InputStream stream) throws ParseException {
         List<BibEntry> bibEntries;
         try {
-            bibEntries =
-                getBibEntriesFromDoiList(this.parseDoiSearchPage(stream));
+            bibEntries = getBibEntriesFromDoiList(this.parseDoiSearchPage(stream));
         } catch (FetcherException e) {
             throw new ParseException(e);
         }
@@ -65,15 +62,12 @@ public List<BibEntry> parseEntries(InputStream stream)
      * @param stream html stream
      * @return DOI list
      */
-    public List<String> parseDoiSearchPage(InputStream stream)
-        throws ParseException {
+    public List<String> parseDoiSearchPage(InputStream stream) throws ParseException {
         List<String> doiList = new ArrayList<>();
 
         try {
             Document doc = Jsoup.parse(stream, null, HOST);
-            Elements doiHrefs = doc.select(
-                "div.issue-item__content-right > h5 > span > a"
-            );
+            Elements doiHrefs = doc.select("div.issue-item__content-right > h5 > span > a");
 
             for (Element elem : doiHrefs) {
                 String fullSegment = elem.attr("href");
@@ -93,39 +87,23 @@ public List<String> parseDoiSearchPage(InputStream stream)
      * @param doiList DOI List
      * @return BibEntry List
      */
-    public List<BibEntry> getBibEntriesFromDoiList(List<String> doiList)
-        throws FetcherException {
+    public List<BibEntry> getBibEntriesFromDoiList(List<String> doiList) throws FetcherException {
         List<BibEntry> bibEntries = new ArrayList<>();
         CookieHandler.setDefault(new CookieManager());
-        try (
-            InputStream stream = new URLDownload(getUrlFromDoiList(doiList))
-                .asInputStream()
-        ) {
-            String jsonString = new String(
-                (stream.readAllBytes()),
-                StandardCharsets.UTF_8
-            );
+        try (InputStream stream = new URLDownload(getUrlFromDoiList(doiList)).asInputStream()) {
+            String jsonString = new String((stream.readAllBytes()), StandardCharsets.UTF_8);
 
             JsonElement jsonElement = JsonParser.parseString(jsonString);
             if (jsonElement.isJsonObject()) {
-                JsonArray items = jsonElement
-                    .getAsJsonObject()
-                    .getAsJsonArray("items");
+                JsonArray items = jsonElement.getAsJsonObject().getAsJsonArray("items");
                 for (JsonElement item : items) {
-                    for (Map.Entry<String, JsonElement> entry : item
-                        .getAsJsonObject()
-                        .entrySet()) {
-                        bibEntries.add(
-                            parseBibEntry(entry.getValue().toString())
-                        );
+                    for (Map.Entry<String, JsonElement> entry : item.getAsJsonObject().entrySet()) {
+                        bibEntries.add(parseBibEntry(entry.getValue().toString()));
                     }
                 }
             }
         } catch (IOException | URISyntaxException e) {
-            throw new FetcherException(
-                "A network error occurred while fetching from ",
-                e
-            );
+            throw new FetcherException("A network error occurred while fetching from ", e);
         }
 
         return bibEntries;
@@ -157,10 +135,7 @@ private StandardEntryType typeStrToEnum(String typeStr) {
             );
             type =
                 Enums
-                    .getIfPresent(
-                        StandardEntryType.class,
-                        upperUnderscoreTyeStr
-                    )
+                    .getIfPresent(StandardEntryType.class, upperUnderscoreTyeStr)
                     .or(StandardEntryType.Article);
         }
         return type;
@@ -173,22 +148,15 @@ private StandardEntryType typeStrToEnum(String typeStr) {
      * @return BibEntry parsed from query result
      */
     public BibEntry parseBibEntry(String jsonStr) {
-        JsonObject jsonObject = JsonParser
-            .parseString(jsonStr)
-            .getAsJsonObject();
+        JsonObject jsonObject = JsonParser.parseString(jsonStr).getAsJsonObject();
         BibEntry bibEntry = new BibEntry();
         if (jsonObject.has("type")) {
-            bibEntry.setType(
-                typeStrToEnum(jsonObject.get("type").getAsString())
-            );
+            bibEntry.setType(typeStrToEnum(jsonObject.get("type").getAsString()));
         }
 
         if (jsonObject.has("author")) {
             JsonArray authors = jsonObject.getAsJsonArray("author");
-            bibEntry.setField(
-                StandardField.AUTHOR,
-                getAuthorsLastFirst(authors)
-            );
+            bibEntry.setField(StandardField.AUTHOR, getAuthorsLastFirst(authors));
         }
 
         if (jsonObject.has("issued")) {
@@ -205,19 +173,13 @@ public BibEntry parseBibEntry(String jsonStr) {
                     StandardField.DAY,
                 };
                 for (int i = 0; i < dateArray.size(); i++) {
-                    bibEntry.setField(
-                        dateField[i],
-                        dateArray.get(i).getAsString()
-                    );
+                    bibEntry.setField(dateField[i], dateArray.get(i).getAsString());
                 }
             }
         }
 
         if (jsonObject.has("abstract")) {
-            bibEntry.setField(
-                StandardField.ABSTRACT,
-                jsonObject.get("abstract").getAsString()
-            );
+            bibEntry.setField(StandardField.ABSTRACT, jsonObject.get("abstract").getAsString());
         }
 
         if (jsonObject.has("collection-title")) {
@@ -235,31 +197,19 @@ public BibEntry parseBibEntry(String jsonStr) {
         }
 
         if (jsonObject.has("DOI")) {
-            bibEntry.setField(
-                StandardField.DOI,
-                jsonObject.get("DOI").getAsString()
-            );
+            bibEntry.setField(StandardField.DOI, jsonObject.get("DOI").getAsString());
         }
 
         if (jsonObject.has("event-place")) {
-            bibEntry.setField(
-                StandardField.LOCATION,
-                jsonObject.get("event-place").getAsString()
-            );
+            bibEntry.setField(StandardField.LOCATION, jsonObject.get("event-place").getAsString());
         }
 
         if (jsonObject.has("ISBN")) {
-            bibEntry.setField(
-                StandardField.ISBN,
-                jsonObject.get("ISBN").getAsString()
-            );
+            bibEntry.setField(StandardField.ISBN, jsonObject.get("ISBN").getAsString());
         }
 
         if (jsonObject.has("keyword")) {
-            String[] keywords = jsonObject
-                .get("keyword")
-                .getAsString()
-                .split(", ");
+            String[] keywords = jsonObject.get("keyword").getAsString().split(", ");
             String sortedKeywords = Arrays
                 .stream(keywords)
                 .sorted()
@@ -275,17 +225,11 @@ public BibEntry parseBibEntry(String jsonStr) {
         }
 
         if (jsonObject.has("page")) {
-            bibEntry.setField(
-                StandardField.PAGES,
-                jsonObject.get("page").getAsString()
-            );
+            bibEntry.setField(StandardField.PAGES, jsonObject.get("page").getAsString());
         }
 
         if (jsonObject.has("publisher")) {
-            bibEntry.setField(
-                StandardField.PUBLISHER,
-                jsonObject.get("publisher").getAsString()
-            );
+            bibEntry.setField(StandardField.PUBLISHER, jsonObject.get("publisher").getAsString());
         }
 
         if (jsonObject.has("publisher-place")) {
@@ -296,17 +240,11 @@ public BibEntry parseBibEntry(String jsonStr) {
         }
 
         if (jsonObject.has("title")) {
-            bibEntry.setField(
-                StandardField.TITLE,
-                jsonObject.get("title").getAsString()
-            );
+            bibEntry.setField(StandardField.TITLE, jsonObject.get("title").getAsString());
         }
 
         if (jsonObject.has("URL")) {
-            bibEntry.setField(
-                StandardField.URL,
-                jsonObject.get("URL").getAsString()
-            );
+            bibEntry.setField(StandardField.URL, jsonObject.get("URL").getAsString());
         }
 
         return bibEntry;
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 43fcf4872c1..6e220482b95 100644
--- a/src/main/java/org/jabref/logic/importer/fileformat/BiblioscapeImporter.java
+++ b/src/main/java/org/jabref/logic/importer/fileformat/BiblioscapeImporter.java
@@ -50,8 +50,7 @@ public boolean isRecognizedFormat(BufferedReader reader) {
     }
 
     @Override
-    public ParserResult importDatabase(BufferedReader reader)
-        throws IOException {
+    public ParserResult importDatabase(BufferedReader reader) throws IOException {
         List<BibEntry> bibItems = new ArrayList<>();
         String line;
         Map<Field, String> hm = new HashMap<>();
@@ -72,15 +71,9 @@ public ParserResult importDatabase(BufferedReader reader)
                 String titleTI = null;
                 List<String> comments = new ArrayList<>();
                 // add item
-                for (Map.Entry<
-                    String,
-                    StringBuilder
-                > entry : lines.entrySet()) {
+                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();
                     } else if ("ST".equals(entry.getKey())) {
@@ -88,24 +81,15 @@ public ParserResult importDatabase(BufferedReader reader)
                     } else if ("YP".equals(entry.getKey())) {
                         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();
                     } else if ("PE".equals(entry.getKey())) {
                         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();
                     } else if ("SB".equals(entry.getKey())) {
@@ -115,19 +99,13 @@ public ParserResult importDatabase(BufferedReader reader)
                     } else if ("NT".equals(entry.getKey())) {
                         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());
                     } else if ("TT".equals(entry.getKey())) {
                         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();
                     } else if ("QA".equals(entry.getKey())) {
@@ -137,23 +115,14 @@ public ParserResult importDatabase(BufferedReader reader)
                     } else if ("IS".equals(entry.getKey())) {
                         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();
                     } 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();
-                    } else if (
-                        "UR".equals(entry.getKey()) ||
-                        "AT".equals(entry.getKey())
-                    ) {
+                    } else if ("UR".equals(entry.getKey()) || "AT".equals(entry.getKey())) {
                         String s = entry.getValue().toString().trim();
                         hm.put(
                             s.startsWith("http://") || s.startsWith("ftp://")
@@ -174,19 +143,13 @@ public ParserResult importDatabase(BufferedReader reader)
                     } else if ("C6".equals(entry.getKey())) {
                         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());
                     } else if ("TH".equals(entry.getKey())) {
                         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"))
@@ -196,11 +159,7 @@ public ParserResult importDatabase(BufferedReader reader)
 
                 EntryType bibtexType = BibEntry.DEFAULT_TYPE;
                 // to find type, first check TW, then RT
-                for (
-                    int i = 1;
-                    (i >= 0) && BibEntry.DEFAULT_TYPE.equals(bibtexType);
-                    --i
-                ) {
+                for (int i = 1; (i >= 0) && BibEntry.DEFAULT_TYPE.equals(bibtexType); --i) {
                     if (type[i] == null) {
                         continue;
                     }
@@ -219,9 +178,7 @@ public ParserResult importDatabase(BufferedReader reader)
                         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;
@@ -285,9 +242,7 @@ public ParserResult importDatabase(BufferedReader reader)
             }
             // new key
             if (
-                line.startsWith("--") &&
-                (line.length() >= 7) &&
-                "-- ".equals(line.substring(4, 7))
+                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 da8c0f082da..05bf33cb55b 100644
--- a/src/main/java/org/jabref/logic/importer/fileformat/BibtexImporter.java
+++ b/src/main/java/org/jabref/logic/importer/fileformat/BibtexImporter.java
@@ -27,9 +27,7 @@
  */
 public class BibtexImporter extends Importer {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(
-        BibtexImporter.class
-    );
+    private static final Logger LOGGER = LoggerFactory.getLogger(BibtexImporter.class);
 
     // Signature written at the top of the .bib file in earlier versions.
     private static final String SIGNATURE = "This file was created with JabRef";
@@ -76,18 +74,12 @@ public ParserResult importDatabase(Path filePath) throws IOException {
             parserResult.getMetaData().setEncoding(result.encoding());
             parserResult
                 .getMetaData()
-                .setEncodingExplicitlySupplied(
-                    result.encodingExplicitlySupplied()
-                );
+                .setEncodingExplicitlySupplied(result.encodingExplicitlySupplied());
             parserResult.setPath(filePath);
             if (parserResult.getMetaData().getMode().isEmpty()) {
                 parserResult
                     .getMetaData()
-                    .setMode(
-                        BibDatabaseModeDetection.inferMode(
-                            parserResult.getDatabase()
-                        )
-                    );
+                    .setMode(BibDatabaseModeDetection.inferMode(parserResult.getDatabase()));
             }
             return parserResult;
         }
@@ -101,8 +93,7 @@ public static Charset getEncoding(Path filePath) throws IOException {
      * Determines the encoding of the supplied BibTeX file. If a JabRef encoding information is present, this information is used.
      * If there is none present, {@link com.ibm.icu.text.CharsetDetector#CharsetDetector()} is used.
      */
-    private static EncodingResult getEncodingResult(Path filePath)
-        throws IOException {
+    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
         // which character encoding is used.
 
@@ -112,9 +103,7 @@ private static EncodingResult getEncodingResult(Path filePath)
 
         Charset detectedCharset;
         try (InputStream inputStream = Files.newInputStream(filePath)) {
-            BufferedInputStream bufferedInputStream = new BufferedInputStream(
-                inputStream
-            );
+            BufferedInputStream bufferedInputStream = new BufferedInputStream(inputStream);
             bufferedInputStream.mark(8192);
             detectedCharset = getCharset(bufferedInputStream);
             bufferedInputStream.reset();
@@ -123,12 +112,7 @@ private static EncodingResult getEncodingResult(Path filePath)
 
         Charset encoding;
         boolean encodingExplicitlySupplied;
-        try (
-            BufferedReader reader = Files.newBufferedReader(
-                filePath,
-                detectedCharset
-            )
-        ) {
+        try (BufferedReader reader = Files.newBufferedReader(filePath, detectedCharset)) {
             Optional<Charset> suppliedEncoding = getSuppliedEncoding(reader);
             LOGGER.debug("Supplied encoding: {}", suppliedEncoding);
             encodingExplicitlySupplied = suppliedEncoding.isPresent();
@@ -137,27 +121,19 @@ private static EncodingResult getEncodingResult(Path filePath)
             encoding = suppliedEncoding.orElse(detectedCharset);
             LOGGER.debug("Encoding used to read the file: {}", encoding);
         }
-        EncodingResult result = new EncodingResult(
-            encoding,
-            encodingExplicitlySupplied
-        );
+        EncodingResult result = new EncodingResult(encoding, encodingExplicitlySupplied);
         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
      * reader manually to the metadata
      */
     @Override
-    public ParserResult importDatabase(BufferedReader reader)
-        throws IOException {
-        return new BibtexParser(importFormatPreferences, fileMonitor)
-            .parse(reader);
+    public ParserResult importDatabase(BufferedReader reader) throws IOException {
+        return new BibtexParser(importFormatPreferences, fileMonitor).parse(reader);
     }
 
     @Override
@@ -178,9 +154,7 @@ public String getDescription() {
     /**
      * Searches the file for "Encoding: myEncoding" and returns the found supplied encoding.
      */
-    private static Optional<Charset> getSuppliedEncoding(
-        BufferedReader reader
-    ) {
+    private static Optional<Charset> getSuppliedEncoding(BufferedReader reader) {
         try {
             String line;
             while ((line = reader.readLine()) != null) {
@@ -209,10 +183,7 @@ private static Optional<Charset> getSuppliedEncoding(
                                 atSymbolIndex
                             );
                     } else {
-                        encoding =
-                            line.substring(
-                                SaveConfiguration.ENCODING_PREFIX.length()
-                            );
+                        encoding = line.substring(SaveConfiguration.ENCODING_PREFIX.length());
                     }
 
                     return Optional.of(Charset.forName(encoding));
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 d614e1f8eca..453f0b96aef 100644
--- a/src/main/java/org/jabref/logic/importer/fileformat/BibtexParser.java
+++ b/src/main/java/org/jabref/logic/importer/fileformat/BibtexParser.java
@@ -66,9 +66,7 @@
  */
 public class BibtexParser implements Parser {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(
-        BibtexParser.class
-    );
+    private static final Logger LOGGER = LoggerFactory.getLogger(BibtexParser.class);
 
     private static final Integer LOOKAHEAD = 1024;
     private final FieldContentFormatter fieldContentFormatter;
@@ -86,12 +84,9 @@ public BibtexParser(
         ImportFormatPreferences importFormatPreferences,
         FileUpdateMonitor fileMonitor
     ) {
-        this.importFormatPreferences =
-            Objects.requireNonNull(importFormatPreferences);
+        this.importFormatPreferences = Objects.requireNonNull(importFormatPreferences);
         this.fieldContentFormatter =
-            new FieldContentFormatter(
-                importFormatPreferences.fieldPreferences()
-            );
+            new FieldContentFormatter(importFormatPreferences.fieldPreferences());
         this.metaDataParser = new MetaDataParser(fileMonitor);
     }
 
@@ -119,8 +114,7 @@ public static Optional<BibEntry> singleFromString(
     }
 
     @Override
-    public List<BibEntry> parseEntries(InputStream inputStream)
-        throws ParseException {
+    public List<BibEntry> parseEntries(InputStream inputStream) throws ParseException {
         Reader reader;
         try {
             reader = Importer.getReader(inputStream);
@@ -130,8 +124,7 @@ public List<BibEntry> parseEntries(InputStream inputStream)
         }
     }
 
-    public Optional<BibEntry> parseSingleEntry(String bibtexString)
-        throws ParseException {
+    public Optional<BibEntry> parseSingleEntry(String bibtexString) throws ParseException {
         return parseEntries(bibtexString).stream().findFirst();
     }
 
@@ -169,11 +162,7 @@ private String determineNewLineSeparator() throws IOException {
             currentChar = pushbackReader.read();
             stringWriter.append((char) currentChar);
             i++;
-        } while (
-            (i < BibtexParser.LOOKAHEAD) &&
-            (currentChar != '\r') &&
-            (currentChar != '\n')
-        );
+        } while ((i < BibtexParser.LOOKAHEAD) && (currentChar != '\r') && (currentChar != '\n'));
         if (currentChar == '\r') {
             newLineSeparator = "\r\n";
         } else if (currentChar == '\n') {
@@ -249,9 +238,7 @@ private ParserResult parseFileContent() throws IOException {
             parserResult.setMetaData(
                 metaDataParser.parse(
                     meta,
-                    importFormatPreferences
-                        .bibEntryPreferences()
-                        .getKeywordSeparator()
+                    importFormatPreferences.bibEntryPreferences().getKeywordSeparator()
                 )
             );
         } catch (ParseException exception) {
@@ -273,8 +260,7 @@ private void checkEpilog() {
             Pattern.compile("\\w+\\s*=.*,").matcher(database.getEpilog()).find()
         ) {
             parserResult.addWarning(
-                "following BibTex fragment has not been parsed:\n" +
-                database.getEpilog()
+                "following BibTex fragment has not been parsed:\n" + database.getEpilog()
             );
         }
     }
@@ -292,11 +278,9 @@ private void parseAndAddEntry(String type) {
             // remove first newline
             // this is appended by JabRef during writing automatically
             if (commentsAndEntryTypeDefinition.startsWith("\r\n")) {
-                commentsAndEntryTypeDefinition =
-                    commentsAndEntryTypeDefinition.substring(2);
+                commentsAndEntryTypeDefinition = commentsAndEntryTypeDefinition.substring(2);
             } else if (commentsAndEntryTypeDefinition.startsWith("\n")) {
-                commentsAndEntryTypeDefinition =
-                    commentsAndEntryTypeDefinition.substring(1);
+                commentsAndEntryTypeDefinition = commentsAndEntryTypeDefinition.substring(1);
             }
 
             BibEntry entry = parseEntry(type);
@@ -346,10 +330,7 @@ private void parseJabRefComment(Map<String, String> meta) {
         String comment = buffer.toString().replaceAll("[\\x0d\\x0a]", "");
         if (
             comment
-                .substring(
-                    0,
-                    Math.min(comment.length(), MetaData.META_FLAG.length())
-                )
+                .substring(0, Math.min(comment.length(), MetaData.META_FLAG.length()))
                 .equals(MetaData.META_FLAG)
         ) {
             if (comment.startsWith(MetaData.META_FLAG)) {
@@ -370,26 +351,17 @@ private void parseJabRefComment(Map<String, String> meta) {
             }
         } else if (
             comment
-                .substring(
-                    0,
-                    Math.min(comment.length(), MetaData.ENTRYTYPE_FLAG.length())
-                )
+                .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
-            );
+            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
+                    Localization.lang("Ill-formed entrytype comment in BIB file") + ": " + comment
                 );
             }
 
@@ -405,9 +377,7 @@ private void parseBibtexString() throws IOException {
             database.addString(bibtexString);
         } catch (KeyCollisionException ex) {
             parserResult.addWarning(
-                Localization.lang("Duplicate string name") +
-                ": " +
-                bibtexString.getName()
+                Localization.lang("Duplicate string name") + ": " + bibtexString.getName()
             );
         }
     }
@@ -456,8 +426,7 @@ private String purge(String context, String stringToPurge) {
         // strip empty lines
         while (
             (runningIndex < indexOfAt) &&
-            ((context.charAt(runningIndex) == '\r') ||
-                (context.charAt(runningIndex) == '\n'))
+            ((context.charAt(runningIndex) == '\r') || (context.charAt(runningIndex) == '\n'))
         ) {
             runningIndex++;
         }
@@ -670,9 +639,7 @@ private BibEntry parseEntry(String entryType) throws IOException {
     }
 
     private void parseField(BibEntry entry) throws IOException {
-        Field field = FieldFactory.parseField(
-            parseTextToken().toLowerCase(Locale.ROOT)
-        );
+        Field field = FieldFactory.parseField(parseTextToken().toLowerCase(Locale.ROOT));
 
         skipWhitespace();
         consume('=');
@@ -688,20 +655,13 @@ private void parseField(BibEntry entry) throws IOException {
                 // at least one online database exports bibtex likes to do that, making
                 // it inconvenient
                 // for users if JabRef did not accept it.
-                if (
-                    field.getProperties().contains(FieldProperty.PERSON_NAMES)
-                ) {
-                    entry.setField(
-                        field,
-                        entry.getField(field).get() + " and " + content
-                    );
+                if (field.getProperties().contains(FieldProperty.PERSON_NAMES)) {
+                    entry.setField(field, entry.getField(field).get() + " and " + content);
                 } else if (StandardField.KEYWORDS == field) {
                     // multiple keywords fields should be combined to one
                     entry.addKeyword(
                         content,
-                        importFormatPreferences
-                            .bibEntryPreferences()
-                            .getKeywordSeparator()
+                        importFormatPreferences.bibEntryPreferences().getKeywordSeparator()
                     );
                 }
             } else {
@@ -715,15 +675,9 @@ private String parseFieldContent(Field field) throws IOException {
         StringBuilder value = new StringBuilder();
         int character;
 
-        while (
-            ((character = peek()) != ',') &&
-            (character != '}') &&
-            (character != ')')
-        ) {
+        while (((character = peek()) != ',') && (character != '}') && (character != ')')) {
             if (eof) {
-                throw new IOException(
-                    "Error in line " + line + ": EOF in mid-string"
-                );
+                throw new IOException("Error in line " + line + ": EOF in mid-string");
             }
             if (character == '"') {
                 StringBuilder text = parseQuotedFieldExactly();
@@ -777,8 +731,7 @@ private String parseTextToken() throws IOException {
             }
 
             if (
-                Character.isLetterOrDigit((char) character) ||
-                (":-_*+./'".indexOf(character) >= 0)
+                Character.isLetterOrDigit((char) character) || (":-_*+./'".indexOf(character) >= 0)
             ) {
                 token.append((char) character);
             } else {
@@ -974,9 +927,7 @@ private String parseBracketedText() throws IOException {
         while (!((isClosingBracketNext()) && (brackets == 0))) {
             int character = read();
             if (isEOFCharacter(character)) {
-                throw new IOException(
-                    "Error in line " + line + ": EOF in mid-string"
-                );
+                throw new IOException("Error in line " + line + ": EOF in mid-string");
             } else if ((character == '{') || (character == '(')) {
                 brackets++;
             } else if ((character == '}') || (character == ')')) {
@@ -991,10 +942,7 @@ private String parseBracketedText() throws IOException {
             if (Character.isWhitespace((char) character)) {
                 String whitespacesReduced = skipAndRecordWhitespace(character);
 
-                if (
-                    !(whitespacesReduced.isEmpty()) &&
-                    !"\n\t".equals(whitespacesReduced)
-                ) { // &&
+                if (!(whitespacesReduced.isEmpty()) && !"\n\t".equals(whitespacesReduced)) { // &&
                     whitespacesReduced = whitespacesReduced.replace("\t", ""); // Remove tabulators.
                     value.append(whitespacesReduced);
                 } else {
@@ -1074,9 +1022,7 @@ private StringBuilder parseBracketedFieldContent() throws IOException {
             if (isClosingBracket && (brackets == 0)) {
                 return value;
             } else if (isEOFCharacter(character)) {
-                throw new IOException(
-                    "Error in line " + line + ": EOF in mid-string"
-                );
+                throw new IOException("Error in line " + line + ": EOF in mid-string");
             } else if ((character == '{') && (!isEscapeSymbol(lastCharacter))) {
                 brackets++;
             } else if (isClosingBracket) {
@@ -1103,9 +1049,7 @@ private StringBuilder parseQuotedFieldExactly() throws IOException {
         while (!((peek() == '"') && (brackets == 0))) {
             int j = read();
             if (isEOFCharacter(j)) {
-                throw new IOException(
-                    "Error in line " + line + ": EOF in mid-string"
-                );
+                throw new IOException("Error in line " + line + ": EOF in mid-string");
             } else if (j == '{') {
                 brackets++;
             } else if (j == '}') {
@@ -1138,9 +1082,7 @@ private boolean consumeUncritically(char expected) throws IOException {
         int character;
         do {
             character = read();
-        } while (
-            (character != expected) && (character != -1) && (character != 65535)
-        );
+        } while ((character != expected) && (character != -1) && (character != 65535));
 
         if (isEOFCharacter(character)) {
             eof = true;
@@ -1150,8 +1092,7 @@ private boolean consumeUncritically(char expected) throws IOException {
         return character == expected;
     }
 
-    private void consume(char firstOption, char secondOption)
-        throws IOException {
+    private void consume(char firstOption, char secondOption) throws IOException {
         // Consumes one of the two, doesn't care which appears.
 
         int character = read();
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 bdd3faf75e7..b044da1a227 100644
--- a/src/main/java/org/jabref/logic/importer/fileformat/CffImporter.java
+++ b/src/main/java/org/jabref/logic/importer/fileformat/CffImporter.java
@@ -88,8 +88,7 @@ public CffIdentifier() {}
     }
 
     @Override
-    public ParserResult importDatabase(BufferedReader reader)
-        throws IOException {
+    public ParserResult importDatabase(BufferedReader reader) throws IOException {
         ObjectMapper mapper = new ObjectMapper(new YAMLFactory());
         CffFormat citation = mapper.readValue(reader, CffFormat.class);
         HashMap<Field, String> entryMap = new HashMap<>();
@@ -99,19 +98,13 @@ public ParserResult importDatabase(BufferedReader reader)
         HashMap<String, Field> fieldMap = getFieldMappings();
         for (Map.Entry<String, String> property : citation.values.entrySet()) {
             if (fieldMap.containsKey(property.getKey())) {
-                entryMap.put(
-                    fieldMap.get(property.getKey()),
-                    property.getValue()
-                );
+                entryMap.put(fieldMap.get(property.getKey()), property.getValue());
             } else if ("type".equals(property.getKey())) {
                 if ("dataset".equals(property.getValue())) {
                     entryType = StandardEntryType.Dataset;
                 }
             } else if (getUnmappedFields().contains(property.getKey())) {
-                entryMap.put(
-                    new UnknownField(property.getKey()),
-                    property.getValue()
-                );
+                entryMap.put(new UnknownField(property.getKey()), property.getValue());
             }
         }
 
@@ -135,9 +128,7 @@ public ParserResult importDatabase(BufferedReader reader)
         entryMap.put(StandardField.AUTHOR, authorStr);
 
         // Select DOI to keep
-        if (
-            (entryMap.get(StandardField.DOI) == null) && (citation.ids != null)
-        ) {
+        if ((entryMap.get(StandardField.DOI) == null) && (citation.ids != null)) {
             List<CffIdentifier> doiIds = citation.ids
                 .stream()
                 .filter(id -> "doi".equals(id.type))
@@ -179,8 +170,7 @@ public ParserResult importDatabase(BufferedReader reader)
     }
 
     @Override
-    public boolean isRecognizedFormat(BufferedReader reader)
-        throws IOException {
+    public boolean isRecognizedFormat(BufferedReader reader) throws IOException {
         ObjectMapper mapper = new ObjectMapper(new YAMLFactory());
         CffFormat citation;
 
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 cf295015a7b..04221d40719 100644
--- a/src/main/java/org/jabref/logic/importer/fileformat/CitaviXmlImporter.java
+++ b/src/main/java/org/jabref/logic/importer/fileformat/CitaviXmlImporter.java
@@ -57,17 +57,14 @@
 
 public class CitaviXmlImporter extends Importer implements Parser {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(
-        CitaviXmlImporter.class
-    );
+    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 final HtmlToLatexFormatter htmlToLatexFormatter =
-        new HtmlToLatexFormatter();
-    private final NormalizePagesFormatter pagesFormatter =
-        new NormalizePagesFormatter();
+    private static final EnumSet<QuotationTypeMapping> QUOTATION_TYPES = EnumSet.allOf(
+        QuotationTypeMapping.class
+    );
+    private final HtmlToLatexFormatter htmlToLatexFormatter = new HtmlToLatexFormatter();
+    private final NormalizePagesFormatter pagesFormatter = new NormalizePagesFormatter();
 
     private final Map<String, Author> knownPersons = new HashMap<>();
     private final Map<String, Keyword> knownKeywords = new HashMap<>();
@@ -115,8 +112,7 @@ public String getDescription() {
     }
 
     @Override
-    public boolean isRecognizedFormat(BufferedReader reader)
-        throws IOException {
+    public boolean isRecognizedFormat(BufferedReader reader) throws IOException {
         Objects.requireNonNull(reader);
         return false;
     }
@@ -127,9 +123,7 @@ public boolean isRecognizedFormat(Path filePath) throws IOException {
             String str;
             int i = 0;
             while (((str = reader.readLine()) != null) && (i < 50)) {
-                if (
-                    str.toLowerCase(Locale.ROOT).contains("citaviexchangedata")
-                ) {
+                if (str.toLowerCase(Locale.ROOT).contains("citaviexchangedata")) {
                     return true;
                 }
                 i++;
@@ -148,9 +142,7 @@ public ParserResult importDatabase(Path filePath) throws IOException {
 
                 return new ParserResult(bibEntries);
             } else {
-                return ParserResult.fromErrorMessage(
-                    "File does not start with xml tag."
-                );
+                return ParserResult.fromErrorMessage("File does not start with xml tag.");
             }
         } catch (JAXBException | XMLStreamException e) {
             LOGGER.debug("could not parse document", e);
@@ -181,8 +173,7 @@ private List<BibEntry> parseDataList(CitaviExchangeData data) {
             this.refIdWithKeywords = buildKeywordList(refKeywords.getOnetoN());
         }
         if (refPublishers != null) {
-            this.refIdWithPublishers =
-                buildPublisherList(refPublishers.getOnetoN());
+            this.refIdWithPublishers = buildPublisherList(refPublishers.getOnetoN());
         }
 
         bibEntries =
@@ -202,26 +193,19 @@ private BibEntry parseData(CitaviExchangeData.References.Reference data) {
         entry.setType(getType(data));
         Optional
             .ofNullable(data.getTitle())
-            .ifPresent(value ->
-                entry.setField(StandardField.TITLE, clean(value))
-            );
+            .ifPresent(value -> entry.setField(StandardField.TITLE, clean(value)));
         Optional
             .ofNullable(data.getAbstract())
-            .ifPresent(value ->
-                entry.setField(StandardField.ABSTRACT, clean(value))
-            );
+            .ifPresent(value -> entry.setField(StandardField.ABSTRACT, clean(value)));
         Optional
             .ofNullable(data.getYear())
-            .ifPresent(value -> entry.setField(StandardField.YEAR, clean(value))
-            );
+            .ifPresent(value -> entry.setField(StandardField.YEAR, clean(value)));
         Optional
             .ofNullable(data.getDoi())
-            .ifPresent(value -> entry.setField(StandardField.DOI, clean(value))
-            );
+            .ifPresent(value -> entry.setField(StandardField.DOI, clean(value)));
         Optional
             .ofNullable(data.getIsbn())
-            .ifPresent(value -> entry.setField(StandardField.ISBN, clean(value))
-            );
+            .ifPresent(value -> entry.setField(StandardField.ISBN, clean(value)));
 
         String pages = clean(getPages(data));
         // Cleans also unicode minus signs
@@ -230,36 +214,23 @@ private BibEntry parseData(CitaviExchangeData.References.Reference data) {
 
         Optional
             .ofNullable(data.getVolume())
-            .ifPresent(value ->
-                entry.setField(StandardField.VOLUME, clean(value))
-            );
+            .ifPresent(value -> entry.setField(StandardField.VOLUME, clean(value)));
         Optional
             .ofNullable(getAuthorName(data))
-            .ifPresent(value ->
-                entry.setField(StandardField.AUTHOR, clean(value))
-            );
+            .ifPresent(value -> entry.setField(StandardField.AUTHOR, clean(value)));
         Optional
             .ofNullable(getEditorName(data))
-            .ifPresent(value ->
-                entry.setField(StandardField.EDITOR, clean(value))
-            );
+            .ifPresent(value -> entry.setField(StandardField.EDITOR, clean(value)));
         Optional
             .ofNullable(getKeywords(data))
-            .ifPresent(value ->
-                entry.setField(StandardField.KEYWORDS, clean(value))
-            );
+            .ifPresent(value -> entry.setField(StandardField.KEYWORDS, clean(value)));
         Optional
             .ofNullable(getPublisher(data))
-            .ifPresent(value ->
-                entry.setField(StandardField.PUBLISHER, clean(value))
-            );
+            .ifPresent(value -> entry.setField(StandardField.PUBLISHER, clean(value)));
         Optional
             .ofNullable(getKnowledgeItem(data))
             .ifPresent(value ->
-                entry.setField(
-                    StandardField.COMMENT,
-                    StringUtil.unifyLineBreaks(value, "\n")
-                )
+                entry.setField(StandardField.COMMENT, StringUtil.unifyLineBreaks(value, "\n"))
             );
         return entry;
     }
@@ -291,13 +262,9 @@ private String getPages(CitaviExchangeData.References.Reference data) {
         String tmpStr = "";
         if ((data.getPageCount() != null) && (data.getPageRange() == null)) {
             tmpStr = data.getPageCount();
-        } else if (
-            (data.getPageCount() == null) && (data.getPageRange() != null)
-        ) {
+        } else if ((data.getPageCount() == null) && (data.getPageRange() != null)) {
             tmpStr = data.getPageRange();
-        } else if (
-            (data.getPageCount() == null) && (data.getPageRange() == null)
-        ) {
+        } else if ((data.getPageCount() == null) && (data.getPageRange() == null)) {
             return tmpStr;
         }
         int count = 0;
@@ -328,9 +295,7 @@ private Map<String, String> buildPersonList(List<String> authorsOrEditors) {
 
         for (String idStringsWithSemicolon : authorsOrEditors) {
             String refId = idStringsWithSemicolon.substring(0, UUID_LENGTH);
-            String rest = idStringsWithSemicolon.substring(
-                UUID_SEMICOLON_OFFSET_INDEX
-            );
+            String rest = idStringsWithSemicolon.substring(UUID_SEMICOLON_OFFSET_INDEX);
 
             String[] personIds = rest.split(";");
 
@@ -347,15 +312,7 @@ private Map<String, String> buildPersonList(List<String> authorsOrEditors) {
                             .filter(p -> p.getId().equals(k))
                             .findFirst();
                         return person
-                            .map(p ->
-                                new Author(
-                                    p.getFirstName(),
-                                    "",
-                                    "",
-                                    p.getLastName(),
-                                    ""
-                                )
-                            )
+                            .map(p -> new Author(p.getFirstName(), "", "", p.getLastName(), ""))
                             .orElse(null);
                     }
                 );
@@ -374,9 +331,7 @@ private Map<String, String> buildKeywordList(List<String> keywordsList) {
 
         for (String idStringsWithSemicolon : keywordsList) {
             String refId = idStringsWithSemicolon.substring(0, UUID_LENGTH);
-            String rest = idStringsWithSemicolon.substring(
-                UUID_SEMICOLON_OFFSET_INDEX
-            );
+            String rest = idStringsWithSemicolon.substring(UUID_SEMICOLON_OFFSET_INDEX);
 
             String[] keywordIds = rest.split(";");
 
@@ -387,15 +342,12 @@ private Map<String, String> buildKeywordList(List<String> keywordsList) {
                 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);
+                        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));
@@ -408,16 +360,12 @@ private Map<String, String> buildKeywordList(List<String> keywordsList) {
         return refToKeywords;
     }
 
-    private Map<String, String> buildPublisherList(
-        List<String> publishersList
-    ) {
+    private Map<String, String> buildPublisherList(List<String> publishersList) {
         Map<String, String> refToPublishers = new HashMap<>();
 
         for (String idStringsWithSemicolon : publishersList) {
             String refId = idStringsWithSemicolon.substring(0, UUID_LENGTH);
-            String rest = idStringsWithSemicolon.substring(
-                UUID_SEMICOLON_OFFSET_INDEX
-            );
+            String rest = idStringsWithSemicolon.substring(UUID_SEMICOLON_OFFSET_INDEX);
 
             String[] publisherIds = rest.split(";");
 
@@ -428,17 +376,13 @@ private Map<String, String> buildPublisherList(
                 knownPublishers.computeIfAbsent(
                     pubId,
                     k -> {
-                        Optional<
-                            CitaviExchangeData.Publishers.Publisher
-                        > publisher = publishers
+                        Optional<CitaviExchangeData.Publishers.Publisher> publisher = publishers
                             .getPublisher()
                             .stream()
                             .filter(p -> p.getId().equals(k))
                             .findFirst();
                         return publisher
-                            .map(
-                                CitaviExchangeData.Publishers.Publisher::getName
-                            )
+                            .map(CitaviExchangeData.Publishers.Publisher::getName)
                             .orElse(null);
                     }
                 );
@@ -472,9 +416,7 @@ private String getPublisher(CitaviExchangeData.References.Reference data) {
         return this.refIdWithPublishers.get(data.getId());
     }
 
-    private String getKnowledgeItem(
-        CitaviExchangeData.References.Reference data
-    ) {
+    private String getKnowledgeItem(CitaviExchangeData.References.Reference data) {
         StringJoiner comment = new StringJoiner("\n\n");
         List<KnowledgeItem> foundItems = knowledgeItems
             .getKnowledgeItem()
@@ -506,13 +448,9 @@ private String getKnowledgeItem(
                         .map(QuotationTypeMapping::getName)
                         .findFirst()
                 );
-            quotationTypeDesc.ifPresent(qt ->
-                comment.add(String.format("quotation type: %s", qt))
-            );
+            quotationTypeDesc.ifPresent(qt -> comment.add(String.format("quotation type: %s", qt)));
 
-            Optional<Short> quotationIndex = Optional.of(
-                knowledgeItem.getQuotationIndex()
-            );
+            Optional<Short> quotationIndex = Optional.of(knowledgeItem.getQuotationIndex());
             quotationIndex.ifPresent(index ->
                 comment.add(String.format("quotation index: %d", index))
             );
@@ -541,13 +479,10 @@ private void initUnmarshaller() throws JAXBException {
         }
     }
 
-    private Object unmarshallRoot(BufferedReader reader)
-        throws XMLStreamException, JAXBException {
+    private Object unmarshallRoot(BufferedReader reader) throws XMLStreamException, JAXBException {
         initUnmarshaller();
 
-        XMLStreamReader xmlStreamReader = xmlInputFactory.createXMLStreamReader(
-            reader
-        );
+        XMLStreamReader xmlStreamReader = xmlInputFactory.createXMLStreamReader(reader);
 
         // Go to the root element
         while (!xmlStreamReader.isStartElement()) {
@@ -558,8 +493,7 @@ private Object unmarshallRoot(BufferedReader reader)
     }
 
     @Override
-    public ParserResult importDatabase(BufferedReader reader)
-        throws IOException {
+    public ParserResult importDatabase(BufferedReader reader) throws IOException {
         Objects.requireNonNull(reader);
         throw new UnsupportedOperationException(
             "CitaviXmlImporter does not support importDatabase(BufferedReader reader)." +
@@ -571,9 +505,7 @@ public ParserResult importDatabase(BufferedReader reader)
     public List<BibEntry> parseEntries(InputStream inputStream) {
         try {
             return importDatabase(
-                new BufferedReader(
-                    new InputStreamReader(inputStream, StandardCharsets.UTF_8)
-                )
+                new BufferedReader(new InputStreamReader(inputStream, StandardCharsets.UTF_8))
             )
                 .getDatabase()
                 .getEntries();
@@ -584,9 +516,7 @@ public List<BibEntry> parseEntries(InputStream inputStream) {
     }
 
     private BufferedReader getReaderFromZip(Path filePath) throws IOException {
-        ZipInputStream zis = new ZipInputStream(
-            new FileInputStream(filePath.toFile())
-        );
+        ZipInputStream zis = new ZipInputStream(new FileInputStream(filePath.toFile()));
         ZipEntry zipEntry = zis.getNextEntry();
 
         Path newFile = Files.createTempFile("citavicontent", ".xml");
@@ -599,10 +529,7 @@ private BufferedReader getReaderFromZip(Path filePath) throws IOException {
 
         zis.closeEntry();
 
-        InputStream stream = Files.newInputStream(
-            newFile,
-            StandardOpenOption.READ
-        );
+        InputStream stream = Files.newInputStream(newFile, StandardOpenOption.READ);
 
         // check and delete the utf-8 BOM bytes
         InputStream newStream = checkForUtf8BOMAndDiscardIfAny(stream);
@@ -610,25 +537,18 @@ private BufferedReader getReaderFromZip(Path filePath) throws IOException {
         // clean up the temp file
         Files.delete(newFile);
 
-        return new BufferedReader(
-            new InputStreamReader(newStream, StandardCharsets.UTF_8)
-        );
+        return new BufferedReader(new InputStreamReader(newStream, StandardCharsets.UTF_8));
     }
 
-    private static InputStream checkForUtf8BOMAndDiscardIfAny(
-        InputStream inputStream
-    ) throws IOException {
+    private static InputStream checkForUtf8BOMAndDiscardIfAny(InputStream inputStream)
+        throws IOException {
         PushbackInputStream pushbackInputStream = new PushbackInputStream(
             new BufferedInputStream(inputStream),
             3
         );
         byte[] bom = new byte[3];
         if (pushbackInputStream.read(bom) != -1) {
-            if (
-                !((bom[0] == (byte) 0xEF) &&
-                    (bom[1] == (byte) 0xBB) &&
-                    (bom[2] == (byte) 0xBF))
-            ) {
+            if (!((bom[0] == (byte) 0xEF) && (bom[1] == (byte) 0xBB) && (bom[2] == (byte) 0xBF))) {
                 pushbackInputStream.unread(bom);
             }
         }
@@ -636,10 +556,7 @@ private static InputStream checkForUtf8BOMAndDiscardIfAny(
     }
 
     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 52f15fde8f4..ce3e07b7cd6 100644
--- a/src/main/java/org/jabref/logic/importer/fileformat/CiteSeerParser.java
+++ b/src/main/java/org/jabref/logic/importer/fileformat/CiteSeerParser.java
@@ -15,8 +15,7 @@
 
 public class CiteSeerParser {
 
-    public List<BibEntry> parseCiteSeerResponse(JSONArray jsonResponse)
-        throws ParseException {
+    public List<BibEntry> parseCiteSeerResponse(JSONArray jsonResponse) throws ParseException {
         List<BibEntry> response = new ArrayList<>();
         CookieHandler.setDefault(new CookieManager());
         for (int i = 0; i < jsonResponse.length(); ++i) {
@@ -39,14 +38,8 @@ private BibEntry parseBibEntry(JSONObject jsonObj) {
         bibEntry.setField(StandardField.TITLE, jsonObj.optString("title"));
         bibEntry.setField(StandardField.VENUE, jsonObj.optString("venue"));
         bibEntry.setField(StandardField.YEAR, jsonObj.optString("year"));
-        bibEntry.setField(
-            StandardField.PUBLISHER,
-            jsonObj.optString("publisher")
-        );
-        bibEntry.setField(
-            StandardField.ABSTRACT,
-            jsonObj.optString("abstract")
-        );
+        bibEntry.setField(StandardField.PUBLISHER, jsonObj.optString("publisher"));
+        bibEntry.setField(StandardField.ABSTRACT, jsonObj.optString("abstract"));
         bibEntry.setField(
             StandardField.AUTHOR,
             parseAuthors(Optional.ofNullable(jsonObj.optJSONArray("authors")))
@@ -68,9 +61,7 @@ private String parseAuthors(Optional<JSONArray> authorsOpt) {
                 .append(StringUtil.shaveString(authorsArray.getString(i)))
                 .append(separator);
         }
-        authorsStringBuilder.append(
-            authorsArray.getString(authorsArray.length() - 1)
-        );
+        authorsStringBuilder.append(authorsArray.getString(authorsArray.length() - 1));
         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 0e1dfe9ce03..48a741d928b 100644
--- a/src/main/java/org/jabref/logic/importer/fileformat/CoinsParser.java
+++ b/src/main/java/org/jabref/logic/importer/fileformat/CoinsParser.java
@@ -33,8 +33,7 @@ public class CoinsParser implements Parser {
     private final Pattern AUTHOR = Pattern.compile("&amp;rft.au=([^&]+)");
 
     @Override
-    public List<BibEntry> parseEntries(InputStream inputStream)
-        throws ParseException {
+    public List<BibEntry> parseEntries(InputStream inputStream) throws ParseException {
         String data = new BufferedReader(new InputStreamReader(inputStream))
             .lines()
             .collect(Collectors.joining(OS.NEWLINE));
@@ -72,12 +71,7 @@ public List<BibEntry> parseEntries(InputStream inputStream)
         return Collections.singletonList(entry);
     }
 
-    private void appendData(
-        String data,
-        BibEntry entry,
-        Pattern pattern,
-        Field field
-    ) {
+    private void appendData(String data, BibEntry entry, Pattern pattern, Field field) {
         Matcher matcher = pattern.matcher(data);
         if (matcher.find()) {
             entry.setField(field, matcher.group(1));
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 af961fef17e..beaf2ccfbec 100644
--- a/src/main/java/org/jabref/logic/importer/fileformat/CopacImporter.java
+++ b/src/main/java/org/jabref/logic/importer/fileformat/CopacImporter.java
@@ -46,8 +46,7 @@ public String getDescription() {
     }
 
     @Override
-    public boolean isRecognizedFormat(BufferedReader reader)
-        throws IOException {
+    public boolean isRecognizedFormat(BufferedReader reader) throws IOException {
         String str;
         while ((str = reader.readLine()) != null) {
             if (CopacImporter.COPAC_PATTERN.matcher(str).find()) {
@@ -57,12 +56,7 @@ public boolean isRecognizedFormat(BufferedReader reader)
         return false;
     }
 
-    private static void setOrAppend(
-        BibEntry b,
-        Field field,
-        String value,
-        String separator
-    ) {
+    private static void setOrAppend(BibEntry b, Field field, String value, String separator) {
         if (b.hasField(field) && b.getField(field).isPresent()) {
             b.setField(field, b.getField(field).get() + separator + value);
         } else {
@@ -71,8 +65,7 @@ private static void setOrAppend(
     }
 
     @Override
-    public ParserResult importDatabase(BufferedReader reader)
-        throws IOException {
+    public ParserResult importDatabase(BufferedReader reader) throws IOException {
         Objects.requireNonNull(reader);
 
         List<String> entries = new LinkedList<>();
@@ -185,10 +178,7 @@ public ParserResult importDatabase(BufferedReader reader)
                     );
                     default -> setOrAppend(
                         b,
-                        FieldFactory.parseField(
-                            StandardEntryType.Book,
-                            line.substring(0, 2)
-                        ),
+                        FieldFactory.parseField(StandardEntryType.Book, line.substring(0, 2)),
                         line.substring(4).trim(),
                         ", "
                     );
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 96ef3dc838e..99a39218ce5 100644
--- a/src/main/java/org/jabref/logic/importer/fileformat/CustomImporter.java
+++ b/src/main/java/org/jabref/logic/importer/fileformat/CustomImporter.java
@@ -25,8 +25,7 @@ public class CustomImporter extends Importer {
 
     private final Importer importer;
 
-    public CustomImporter(String basePath, String className)
-        throws ImportException {
+    public CustomImporter(String basePath, String className) throws ImportException {
         this.basePath = Path.of(basePath);
         this.className = className;
         try {
@@ -38,9 +37,7 @@ public CustomImporter(String basePath, String className)
 
     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();
         }
@@ -80,8 +77,7 @@ public boolean isRecognizedFormat(BufferedReader input) throws IOException {
     }
 
     @Override
-    public ParserResult importDatabase(BufferedReader input)
-        throws IOException {
+    public ParserResult importDatabase(BufferedReader input) throws IOException {
         return importer.importDatabase(input);
     }
 
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 0724dd63985..ed29c5552d1 100644
--- a/src/main/java/org/jabref/logic/importer/fileformat/EndnoteImporter.java
+++ b/src/main/java/org/jabref/logic/importer/fileformat/EndnoteImporter.java
@@ -55,15 +55,11 @@ public String getDescription() {
     }
 
     @Override
-    public boolean isRecognizedFormat(BufferedReader reader)
-        throws IOException {
+    public boolean isRecognizedFormat(BufferedReader reader) throws IOException {
         // Our strategy is to look for the "%A *" line.
         String str;
         while ((str = reader.readLine()) != null) {
-            if (
-                A_PATTERN.matcher(str).matches() ||
-                E_PATTERN.matcher(str).matches()
-            ) {
+            if (A_PATTERN.matcher(str).matches() || E_PATTERN.matcher(str).matches()) {
                 return true;
             }
         }
@@ -71,8 +67,7 @@ public boolean isRecognizedFormat(BufferedReader reader)
     }
 
     @Override
-    public ParserResult importDatabase(BufferedReader reader)
-        throws IOException {
+    public ParserResult importDatabase(BufferedReader reader) throws IOException {
         List<BibEntry> bibitems = new ArrayList<>();
         StringBuilder sb = new StringBuilder();
         String str;
@@ -171,8 +166,7 @@ public ParserResult importDatabase(BufferedReader reader)
                     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.
+                    case "J" -> // has been set with %B. // "Alternate journal. Let's set it only if no journal
                     hm.putIfAbsent(StandardField.JOURNAL, val);
                     case "B" -> {
                         // This prefix stands for "journal" in a journal entry, and
@@ -196,8 +190,7 @@ public ParserResult importDatabase(BufferedReader reader)
                             hm.put(StandardField.PUBLISHER, val);
                         }
                     }
-                    case "P" -> // replace single dash page ranges (23-45) with double dashes (23--45):
-                    hm.put(
+                    case "P" -> hm.put( // replace single dash page ranges (23-45) with double dashes (23--45):
                         StandardField.PAGES,
                         val.replaceAll("([0-9]) *- *([0-9])", "$1--$2")
                     );
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 c0b08bab4f3..a2a5cad6d66 100644
--- a/src/main/java/org/jabref/logic/importer/fileformat/EndnoteXmlImporter.java
+++ b/src/main/java/org/jabref/logic/importer/fileformat/EndnoteXmlImporter.java
@@ -45,9 +45,7 @@
  */
 public class EndnoteXmlImporter extends Importer implements Parser {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(
-        EndnoteXmlImporter.class
-    );
+    private static final Logger LOGGER = LoggerFactory.getLogger(EndnoteXmlImporter.class);
     private final ImportFormatPreferences preferences;
     private final XMLInputFactory xmlInputFactory;
 
@@ -86,8 +84,7 @@ public String getDescription() {
     }
 
     @Override
-    public boolean isRecognizedFormat(BufferedReader reader)
-        throws IOException {
+    public boolean isRecognizedFormat(BufferedReader reader) throws IOException {
         String str;
         int i = 0;
         while (((str = reader.readLine()) != null) && (i < 50)) {
@@ -101,16 +98,13 @@ public boolean isRecognizedFormat(BufferedReader reader)
     }
 
     @Override
-    public ParserResult importDatabase(BufferedReader input)
-        throws IOException {
+    public ParserResult importDatabase(BufferedReader input) throws IOException {
         Objects.requireNonNull(input);
 
         List<BibEntry> bibItems = new ArrayList<>();
 
         try {
-            XMLStreamReader reader = xmlInputFactory.createXMLStreamReader(
-                input
-            );
+            XMLStreamReader reader = xmlInputFactory.createXMLStreamReader(input);
 
             while (reader.hasNext()) {
                 reader.next();
@@ -128,11 +122,8 @@ public ParserResult importDatabase(BufferedReader input)
         return new ParserResult(bibItems);
     }
 
-    private void parseRecord(
-        XMLStreamReader reader,
-        List<BibEntry> bibItems,
-        String startElement
-    ) throws XMLStreamException {
+    private void parseRecord(XMLStreamReader reader, List<BibEntry> bibItems, String startElement)
+        throws XMLStreamException {
         Map<Field, String> fields = new HashMap<>();
         EntryType entryType = StandardEntryType.Article;
 
@@ -155,39 +146,19 @@ private void parseRecord(
                         handleTitles(reader, fields, elementName);
                     }
                     case "pages" -> {
-                        parseStyleContent(
-                            reader,
-                            fields,
-                            StandardField.PAGES,
-                            elementName
-                        );
+                        parseStyleContent(reader, fields, StandardField.PAGES, elementName);
                     }
                     case "volume" -> {
-                        parseStyleContent(
-                            reader,
-                            fields,
-                            StandardField.VOLUME,
-                            elementName
-                        );
+                        parseStyleContent(reader, fields, StandardField.VOLUME, elementName);
                     }
                     case "number" -> {
-                        parseStyleContent(
-                            reader,
-                            fields,
-                            StandardField.NUMBER,
-                            elementName
-                        );
+                        parseStyleContent(reader, fields, StandardField.NUMBER, elementName);
                     }
                     case "dates" -> {
                         parseYear(reader, fields);
                     }
                     case "notes" -> {
-                        parseStyleContent(
-                            reader,
-                            fields,
-                            StandardField.NOTE,
-                            elementName
-                        );
+                        parseStyleContent(reader, fields, StandardField.NOTE, elementName);
                     }
                     case "urls" -> {
                         handleUrlList(reader, fields, linkedFiles);
@@ -196,36 +167,16 @@ private void parseRecord(
                         handleKeywordsList(reader, keywordList, elementName);
                     }
                     case "abstract" -> {
-                        parseStyleContent(
-                            reader,
-                            fields,
-                            StandardField.ABSTRACT,
-                            elementName
-                        );
+                        parseStyleContent(reader, fields, StandardField.ABSTRACT, elementName);
                     }
                     case "isbn" -> {
-                        parseStyleContent(
-                            reader,
-                            fields,
-                            StandardField.ISBN,
-                            elementName
-                        );
+                        parseStyleContent(reader, fields, StandardField.ISBN, elementName);
                     }
                     case "electronic-resource-num" -> {
-                        parseStyleContent(
-                            reader,
-                            fields,
-                            StandardField.DOI,
-                            elementName
-                        );
+                        parseStyleContent(reader, fields, StandardField.DOI, elementName);
                     }
                     case "publisher" -> {
-                        parseStyleContent(
-                            reader,
-                            fields,
-                            StandardField.PUBLISHER,
-                            elementName
-                        );
+                        parseStyleContent(reader, fields, StandardField.PUBLISHER, elementName);
                     }
                     case "label" -> {
                         parseStyleContent(
@@ -237,19 +188,13 @@ private void parseRecord(
                     }
                 }
             }
-            if (
-                isEndXMLEvent(reader) &&
-                reader.getName().getLocalPart().equals(startElement)
-            ) {
+            if (isEndXMLEvent(reader) && reader.getName().getLocalPart().equals(startElement)) {
                 break;
             }
         }
 
         BibEntry entry = new BibEntry(entryType);
-        entry.putKeywords(
-            keywordList,
-            preferences.bibEntryPreferences().getKeywordSeparator()
-        );
+        entry.putKeywords(keywordList, preferences.bibEntryPreferences().getKeywordSeparator());
 
         entry.setField(fields);
         entry.setFiles(linkedFiles);
@@ -286,10 +231,7 @@ private void handleAuthorList(
                 }
             }
 
-            if (
-                isEndXMLEvent(reader) &&
-                reader.getName().getLocalPart().equals(startElement)
-            ) {
+            if (isEndXMLEvent(reader) && reader.getName().getLocalPart().equals(startElement)) {
                 break;
             }
         }
@@ -312,10 +254,7 @@ private void parseAuthor(XMLStreamReader reader, List<String> authorNames)
                 }
             }
 
-            if (
-                isEndXMLEvent(reader) &&
-                "author".equals(reader.getName().getLocalPart())
-            ) {
+            if (isEndXMLEvent(reader) && "author".equals(reader.getName().getLocalPart())) {
                 break;
             }
         }
@@ -339,30 +278,18 @@ private void parseStyleContent(
                             "electronic-resource-num".equals(elementName) ||
                             "notes".equals(elementName)
                         ) {
-                            putIfValueNotNull(
-                                fields,
-                                field,
-                                reader.getText().trim()
-                            );
+                            putIfValueNotNull(fields, field, reader.getText().trim());
                         } else if (
-                            "isbn".equals(elementName) ||
-                            "secondary-title".equals(elementName)
+                            "isbn".equals(elementName) || "secondary-title".equals(elementName)
                         ) {
-                            putIfValueNotNull(
-                                fields,
-                                field,
-                                clean(reader.getText())
-                            );
+                            putIfValueNotNull(fields, field, clean(reader.getText()));
                         } else {
                             putIfValueNotNull(fields, field, reader.getText());
                         }
                     }
                 }
             }
-            if (
-                isEndXMLEvent(reader) &&
-                reader.getName().getLocalPart().equals(elementName)
-            ) {
+            if (isEndXMLEvent(reader) && reader.getName().getLocalPart().equals(elementName)) {
                 break;
             }
         }
@@ -378,20 +305,13 @@ private void parseYear(XMLStreamReader reader, Map<Field, String> fields)
                     case "style" -> {
                         reader.next();
                         if (isCharacterXMLEvent(reader)) {
-                            putIfValueNotNull(
-                                fields,
-                                StandardField.YEAR,
-                                reader.getText()
-                            );
+                            putIfValueNotNull(fields, StandardField.YEAR, reader.getText());
                         }
                     }
                 }
             }
 
-            if (
-                isEndXMLEvent(reader) &&
-                "year".equals(reader.getName().getLocalPart())
-            ) {
+            if (isEndXMLEvent(reader) && "year".equals(reader.getName().getLocalPart())) {
                 break;
             }
         }
@@ -412,10 +332,7 @@ private void handleKeywordsList(
                     }
                 }
             }
-            if (
-                isEndXMLEvent(reader) &&
-                reader.getName().getLocalPart().equals(startElement)
-            ) {
+            if (isEndXMLEvent(reader) && reader.getName().getLocalPart().equals(startElement)) {
                 break;
             }
         }
@@ -439,10 +356,7 @@ private void parseKeyword(XMLStreamReader reader, KeywordList keywordList)
                 }
             }
 
-            if (
-                isEndXMLEvent(reader) &&
-                "keyword".equals(reader.getName().getLocalPart())
-            ) {
+            if (isEndXMLEvent(reader) && "keyword".equals(reader.getName().getLocalPart())) {
                 break;
             }
         }
@@ -468,19 +382,14 @@ private void handleTitles(
                                     reader.next();
                                     if (isCharacterXMLEvent(reader)) {
                                         if (reader.getText() != null) {
-                                            titleStyleContent.add(
-                                                (reader.getText())
-                                            );
+                                            titleStyleContent.add((reader.getText()));
                                         }
                                     }
                                 }
                             }
                             if (
                                 isEndXMLEvent(reader) &&
-                                reader
-                                    .getName()
-                                    .getLocalPart()
-                                    .equals(elementName)
+                                reader.getName().getLocalPart().equals(elementName)
                             ) {
                                 break;
                             }
@@ -492,20 +401,12 @@ private void handleTitles(
                         );
                     }
                     case "secondary-title" -> {
-                        parseStyleContent(
-                            reader,
-                            fields,
-                            StandardField.JOURNAL,
-                            elementName
-                        );
+                        parseStyleContent(reader, fields, StandardField.JOURNAL, elementName);
                     }
                 }
             }
 
-            if (
-                isEndXMLEvent(reader) &&
-                reader.getName().getLocalPart().equals(startElement)
-            ) {
+            if (isEndXMLEvent(reader) && reader.getName().getLocalPart().equals(startElement)) {
                 break;
             }
         }
@@ -530,19 +431,14 @@ private void handleUrlList(
                 }
             }
 
-            if (
-                isEndXMLEvent(reader) &&
-                "urls".equals(reader.getName().getLocalPart())
-            ) {
+            if (isEndXMLEvent(reader) && "urls".equals(reader.getName().getLocalPart())) {
                 break;
             }
         }
     }
 
-    private void parseRelatedUrls(
-        XMLStreamReader reader,
-        Map<Field, String> fields
-    ) throws XMLStreamException {
+    private void parseRelatedUrls(XMLStreamReader reader, Map<Field, String> fields)
+        throws XMLStreamException {
         while (reader.hasNext()) {
             reader.next();
             if (isStartXMLEvent(reader)) {
@@ -550,11 +446,7 @@ private void parseRelatedUrls(
                 if ("style".equals(elementName)) {
                     reader.next();
                     if (isCharacterXMLEvent(reader)) {
-                        putIfValueNotNull(
-                            fields,
-                            StandardField.URL,
-                            reader.getText()
-                        );
+                        putIfValueNotNull(fields, StandardField.URL, reader.getText());
                     }
                 }
             } else if (isCharacterXMLEvent(reader)) {
@@ -564,10 +456,7 @@ private void parseRelatedUrls(
                 }
             }
 
-            if (
-                isEndXMLEvent(reader) &&
-                "related-urls".equals(reader.getName().getLocalPart())
-            ) {
+            if (isEndXMLEvent(reader) && "related-urls".equals(reader.getName().getLocalPart())) {
                 break;
             }
         }
@@ -591,16 +480,10 @@ private void parsePdfUrls(
                             if (isCharacterXMLEvent(reader)) {
                                 try {
                                     linkedFiles.add(
-                                        new LinkedFile(
-                                            new URL(reader.getText()),
-                                            "PDF"
-                                        )
+                                        new LinkedFile(new URL(reader.getText()), "PDF")
                                     );
                                 } catch (MalformedURLException e) {
-                                    LOGGER.info(
-                                        "Unable to parse {}",
-                                        reader.getText()
-                                    );
+                                    LOGGER.info("Unable to parse {}", reader.getText());
                                 }
                             }
                         }
@@ -609,34 +492,22 @@ private void parsePdfUrls(
             }
             if (isCharacterXMLEvent(reader)) {
                 try {
-                    linkedFiles.add(
-                        new LinkedFile(new URL(reader.getText()), "PDF")
-                    );
+                    linkedFiles.add(new LinkedFile(new URL(reader.getText()), "PDF"));
                 } catch (MalformedURLException e) {
                     LOGGER.info("Unable to parse {}", reader.getText());
                 }
             }
-            if (
-                isEndXMLEvent(reader) &&
-                "pdf-urls".equals(reader.getName().getLocalPart())
-            ) {
+            if (isEndXMLEvent(reader) && "pdf-urls".equals(reader.getName().getLocalPart())) {
                 break;
             }
         }
     }
 
     private String clean(String input) {
-        return StringUtil
-            .unifyLineBreaks(input, " ")
-            .trim()
-            .replaceAll(" +", " ");
+        return StringUtil.unifyLineBreaks(input, " ").trim().replaceAll(" +", " ");
     }
 
-    private void putIfValueNotNull(
-        Map<Field, String> fields,
-        Field field,
-        String value
-    ) {
+    private void putIfValueNotNull(Map<Field, String> fields, Field field, String value) {
         if (value != null) {
             fields.put(field, value);
         }
@@ -655,13 +526,10 @@ private boolean isEndXMLEvent(XMLStreamReader reader) {
     }
 
     @Override
-    public List<BibEntry> parseEntries(InputStream inputStream)
-        throws ParseException {
+    public List<BibEntry> parseEntries(InputStream inputStream) throws ParseException {
         try {
             return importDatabase(
-                new BufferedReader(
-                    new InputStreamReader(inputStream, StandardCharsets.UTF_8)
-                )
+                new BufferedReader(new InputStreamReader(inputStream, StandardCharsets.UTF_8))
             )
                 .getDatabase()
                 .getEntries();
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 75e351ae274..08fd796b7e4 100644
--- a/src/main/java/org/jabref/logic/importer/fileformat/InspecImporter.java
+++ b/src/main/java/org/jabref/logic/importer/fileformat/InspecImporter.java
@@ -23,9 +23,7 @@
  */
 public class InspecImporter extends Importer {
 
-    private static final Pattern INSPEC_PATTERN = Pattern.compile(
-        "Record.*INSPEC.*"
-    );
+    private static final Pattern INSPEC_PATTERN = Pattern.compile("Record.*INSPEC.*");
 
     @Override
     public String getName() {
@@ -43,8 +41,7 @@ public String getDescription() {
     }
 
     @Override
-    public boolean isRecognizedFormat(BufferedReader reader)
-        throws IOException {
+    public boolean isRecognizedFormat(BufferedReader reader) throws IOException {
         // Our strategy is to look for the "PY <year>" line.
         String str;
         while ((str = reader.readLine()) != null) {
@@ -56,8 +53,7 @@ public boolean isRecognizedFormat(BufferedReader reader)
     }
 
     @Override
-    public ParserResult importDatabase(BufferedReader reader)
-        throws IOException {
+    public ParserResult importDatabase(BufferedReader reader) throws IOException {
         List<BibEntry> bibitems = new ArrayList<>();
         StringBuilder sb = new StringBuilder();
         String str;
@@ -126,8 +122,7 @@ public ParserResult importDatabase(BufferedReader reader)
                         ) {
                             type = StandardEntryType.InProceedings;
                         } else {
-                            type =
-                                EntryTypeFactory.parse(frest.replace(" ", ""));
+                            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 8bd0101fffd..4a7cd1de9e8 100644
--- a/src/main/java/org/jabref/logic/importer/fileformat/IsiImporter.java
+++ b/src/main/java/org/jabref/logic/importer/fileformat/IsiImporter.java
@@ -44,12 +44,8 @@
  */
 public class IsiImporter extends Importer {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(
-        IsiImporter.class
-    );
-    private static final Pattern SUB_SUP_PATTERN = Pattern.compile(
-        "/(sub|sup)\\s+(.*?)\\s*/"
-    );
+    private static final Logger LOGGER = LoggerFactory.getLogger(IsiImporter.class);
+    private static final Pattern SUB_SUP_PATTERN = Pattern.compile("/(sub|sup)\\s+(.*?)\\s*/");
 
     // 2006.09.05: Modified pattern to avoid false positives for other files due to an
     // extra | at the end:
@@ -81,8 +77,7 @@ public String getDescription() {
     }
 
     @Override
-    public boolean isRecognizedFormat(BufferedReader reader)
-        throws IOException {
+    public boolean isRecognizedFormat(BufferedReader reader) throws IOException {
         String str;
         int i = 0;
         while (((str = reader.readLine()) != null) && (i < 50)) {
@@ -112,9 +107,7 @@ public static void processSubSup(Map<Field, String> map) {
 
         for (Field aSubsup : subsup) {
             if (map.containsKey(aSubsup)) {
-                Matcher m = IsiImporter.SUB_SUP_PATTERN.matcher(
-                    map.get(aSubsup)
-                );
+                Matcher m = IsiImporter.SUB_SUP_PATTERN.matcher(map.get(aSubsup));
                 StringBuilder sb = new StringBuilder();
 
                 while (m.find()) {
@@ -138,11 +131,7 @@ public static void processSubSup(Map<Field, String> map) {
     }
 
     private static void processCapitalization(Map<Field, String> map) {
-        Field[] subsup = {
-            StandardField.TITLE,
-            StandardField.JOURNAL,
-            StandardField.PUBLISHER,
-        };
+        Field[] subsup = { StandardField.TITLE, StandardField.JOURNAL, StandardField.PUBLISHER };
 
         for (Field aSubsup : subsup) {
             if (map.containsKey(aSubsup)) {
@@ -156,8 +145,7 @@ private static void processCapitalization(Map<Field, String> map) {
     }
 
     @Override
-    public ParserResult importDatabase(BufferedReader reader)
-        throws IOException {
+    public ParserResult importDatabase(BufferedReader reader) throws IOException {
         Objects.requireNonNull(reader);
 
         List<BibEntry> bibEntries = new ArrayList<>();
@@ -245,8 +233,7 @@ public ParserResult importDatabase(BufferedReader reader)
 
                         // if there is already someone there then append with "and"
                         if (hm.get(StandardField.AUTHOR) != null) {
-                            author =
-                                hm.get(StandardField.AUTHOR) + " and " + author;
+                            author = hm.get(StandardField.AUTHOR) + " and " + author;
                         }
                         hm.put(StandardField.AUTHOR, author);
                     }
@@ -260,13 +247,8 @@ public ParserResult importDatabase(BufferedReader reader)
                     );
                     case "ID", "KW" -> {
                         value = EOL_PATTERN.matcher(value).replaceAll(" ");
-                        String existingKeywords = hm.get(
-                            StandardField.KEYWORDS
-                        );
-                        if (
-                            (existingKeywords == null) ||
-                            existingKeywords.contains(value)
-                        ) {
+                        String existingKeywords = hm.get(StandardField.KEYWORDS);
+                        if ((existingKeywords == null) || existingKeywords.contains(value)) {
                             existingKeywords = value;
                         } else {
                             existingKeywords += ", " + value;
@@ -282,10 +264,7 @@ public ParserResult importDatabase(BufferedReader reader)
                         int detpos = value.indexOf(' ');
 
                         // tweak for IEEE Explore
-                        if (
-                            (detpos != -1) &&
-                            !value.substring(0, detpos).trim().isEmpty()
-                        ) {
+                        if ((detpos != -1) && !value.substring(0, detpos).trim().isEmpty()) {
                             value = value.substring(0, detpos);
                         }
                         pages = pages + "--" + value;
@@ -380,9 +359,7 @@ private static String parsePages(String value) {
     static String parseMonth(String value) {
         String[] parts = value.split("\\s|\\-");
         for (String part1 : parts) {
-            Optional<Month> month = Month.getMonthByShortName(
-                part1.toLowerCase(Locale.ROOT)
-            );
+            Optional<Month> month = Month.getMonthByShortName(part1.toLowerCase(Locale.ROOT));
             if (month.isPresent()) {
                 return month.get().getJabRefFormat();
             }
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 4ca46ce002e..bd9698d72b7 100644
--- a/src/main/java/org/jabref/logic/importer/fileformat/MarcXmlParser.java
+++ b/src/main/java/org/jabref/logic/importer/fileformat/MarcXmlParser.java
@@ -51,22 +51,17 @@
  */
 public class MarcXmlParser implements Parser {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(
-        MarcXmlParser.class
-    );
+    private static final Logger LOGGER = LoggerFactory.getLogger(MarcXmlParser.class);
 
     @Override
-    public List<BibEntry> parseEntries(InputStream inputStream)
-        throws ParseException {
+    public List<BibEntry> parseEntries(InputStream inputStream) throws ParseException {
         try {
             DocumentBuilder documentBuilder = DocumentBuilderFactory
                 .newInstance()
                 .newDocumentBuilder();
             Document content = documentBuilder.parse(inputStream);
             return this.parseEntries(content);
-        } catch (
-            ParserConfigurationException | SAXException | IOException exception
-        ) {
+        } catch (ParserConfigurationException | SAXException | IOException exception) {
             throw new ParseException(exception);
         }
     }
@@ -74,9 +69,7 @@ public List<BibEntry> parseEntries(InputStream inputStream)
     private List<BibEntry> parseEntries(Document content) {
         List<BibEntry> result = new LinkedList<>();
 
-        Element root = (Element) content
-            .getElementsByTagName("zs:searchRetrieveResponse")
-            .item(0);
+        Element root = (Element) content.getElementsByTagName("zs:searchRetrieveResponse").item(0);
         Element srwrecords = getChild("zs:records", root);
         if (srwrecords == null) {
             // no records found, so return the empty list
@@ -105,9 +98,7 @@ private BibEntry parseEntry(Element element) {
 
             if ("020".equals(tag)) {
                 putIsbn(bibEntry, datafield);
-            } else if (
-                "100".equals(tag) || "700".equals(tag) || "710".equals(tag)
-            ) {
+            } else if ("100".equals(tag) || "700".equals(tag) || "710".equals(tag)) {
                 putPersonalName(bibEntry, datafield); // Author, Editor, Publisher
             } else if ("111".equals(tag)) {
                 // FixMe: Conference Information also in Subtitle (245) & Author (710)
@@ -134,9 +125,7 @@ private BibEntry parseEntry(Element element) {
                 putElectronicLocation(bibEntry, datafield);
             } else if ("966".equals(tag)) {
                 putDoi(bibEntry, datafield);
-            } else if (
-                Integer.parseInt(tag) >= 546 && Integer.parseInt(tag) <= 599
-            ) {
+            } else if (Integer.parseInt(tag) >= 546 && Integer.parseInt(tag) <= 599) {
                 // Notes
                 // FixMe: Some notes seem to have tags lower than 546
                 putNotes(bibEntry, datafield);
@@ -204,10 +193,7 @@ 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.getField(field.get()).get().concat(" and " + brackedName)
                     );
                 } else {
                     bibEntry.setField(field.get(), brackedName);
@@ -290,10 +276,7 @@ private void putPublication(BibEntry bibEntry, Element datafield) {
                 } catch (DateTimeException exception) {
                     // cannot read date value, just copy it in plain text
                     LOGGER.info("Cannot parse date '{}'", strippedDate);
-                    bibEntry.setField(
-                        StandardField.DATE,
-                        StringUtil.stripBrackets(strippedDate)
-                    );
+                    bibEntry.setField(StandardField.DATE, StringUtil.stripBrackets(strippedDate));
                 }
             }
         }
@@ -310,10 +293,7 @@ private void putPhysicalDescription(BibEntry bibEntry, Element datafield) {
                 pagetotal.contains("Seiten"))
         ) {
             pagetotal =
-                pagetotal.replaceAll(
-                    ".*?(\\d+)(?:\\s*Seiten|\\s*S|\\s*pages|\\s*p).*",
-                    "$1"
-                );
+                pagetotal.replaceAll(".*?(\\d+)(?:\\s*Seiten|\\s*S|\\s*pages|\\s*p).*", "$1");
             bibEntry.setField(StandardField.PAGETOTAL, pagetotal);
         }
     }
@@ -357,18 +337,11 @@ 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.getField(StandardField.ABSTRACT).get().concat(summary)
                 );
             } else {
                 bibEntry.setField(StandardField.ABSTRACT, summary);
@@ -380,14 +353,9 @@ private void putKeywords(BibEntry bibEntry, Element datafield) {
         String keyword = getSubfield("a", datafield);
 
         if (StringUtil.isNotBlank(keyword)) {
-            Optional<String> keywords = bibEntry.getField(
-                StandardField.KEYWORDS
-            );
+            Optional<String> keywords = bibEntry.getField(StandardField.KEYWORDS);
             if (keywords.isPresent()) {
-                bibEntry.setField(
-                    StandardField.KEYWORDS,
-                    keywords.get() + ", " + keyword
-                );
+                bibEntry.setField(StandardField.KEYWORDS, keywords.get() + ", " + keyword);
             } else {
                 bibEntry.setField(StandardField.KEYWORDS, keyword);
             }
@@ -407,30 +375,12 @@ private void putIssue(BibEntry bibEntry, Element datafield) {
 
                 if (StringUtil.isNotBlank(value)) {
                     switch (key) {
-                        case "number" -> bibEntry.setField(
-                            StandardField.NUMBER,
-                            value
-                        );
-                        case "year" -> bibEntry.setField(
-                            StandardField.YEAR,
-                            value
-                        );
-                        case "pages" -> bibEntry.setField(
-                            StandardField.PAGES,
-                            value
-                        );
-                        case "volume" -> bibEntry.setField(
-                            StandardField.VOLUME,
-                            value
-                        );
-                        case "day" -> bibEntry.setField(
-                            StandardField.DAY,
-                            value
-                        );
-                        case "month" -> bibEntry.setField(
-                            StandardField.MONTH,
-                            value
-                        );
+                        case "number" -> bibEntry.setField(StandardField.NUMBER, value);
+                        case "year" -> bibEntry.setField(StandardField.YEAR, value);
+                        case "pages" -> bibEntry.setField(StandardField.PAGES, value);
+                        case "volume" -> bibEntry.setField(StandardField.VOLUME, value);
+                        case "day" -> bibEntry.setField(StandardField.DAY, value);
+                        case "month" -> bibEntry.setField(StandardField.MONTH, value);
                     }
                 }
             }
@@ -441,23 +391,13 @@ 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);
 
             if ("Volltext".equals(fulltext)) {
                 try {
-                    LinkedFile linkedFile = new LinkedFile(
-                        new URL(resource),
-                        "PDF"
-                    );
-                    bibEntry.setField(
-                        StandardField.FILE,
-                        linkedFile.toString()
-                    );
+                    LinkedFile linkedFile = new LinkedFile(new URL(resource), "PDF");
+                    bibEntry.setField(StandardField.FILE, linkedFile.toString());
                 } catch (MalformedURLException e) {
                     LOGGER.info("Malformed URL: {}", resource);
                 }
@@ -476,18 +416,10 @@ private void putElectronicLocation(BibEntry bibEntry, Element datafield) {
             String fulltext = getSubfield("3", datafield);
             String resource = getSubfield("u", datafield);
 
-            if (
-                "Volltext".equals(fulltext) && StringUtil.isNotBlank(resource)
-            ) {
+            if ("Volltext".equals(fulltext) && StringUtil.isNotBlank(resource)) {
                 try {
-                    LinkedFile linkedFile = new LinkedFile(
-                        new URL(resource),
-                        "PDF"
-                    );
-                    bibEntry.setField(
-                        StandardField.FILE,
-                        linkedFile.toString()
-                    );
+                    LinkedFile linkedFile = new LinkedFile(new URL(resource), "PDF");
+                    bibEntry.setField(StandardField.FILE, linkedFile.toString());
                 } catch (MalformedURLException e) {
                     LOGGER.info("Malformed URL: {}", resource);
                 }
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 70552699189..2a9724b0d8b 100644
--- a/src/main/java/org/jabref/logic/importer/fileformat/MedlineImporter.java
+++ b/src/main/java/org/jabref/logic/importer/fileformat/MedlineImporter.java
@@ -47,9 +47,7 @@
  */
 public class MedlineImporter extends Importer implements Parser {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(
-        MedlineImporter.class
-    );
+    private static final Logger LOGGER = LoggerFactory.getLogger(MedlineImporter.class);
     private static final String KEYWORD_SEPARATOR = "; ";
 
     private static final Locale ENGLISH = Locale.ENGLISH;
@@ -64,10 +62,7 @@ public MedlineImporter() {
         xmlInputFactory.setProperty(XMLInputFactory.IS_COALESCING, true);
         // TODO: decide if necessary, if disabled MedlineImporterTestNbib fails
         xmlInputFactory.setProperty(XMLInputFactory.IS_NAMESPACE_AWARE, false);
-        xmlInputFactory.setProperty(
-            XMLInputFactory.IS_SUPPORTING_EXTERNAL_ENTITIES,
-            true
-        );
+        xmlInputFactory.setProperty(XMLInputFactory.IS_SUPPORTING_EXTERNAL_ENTITIES, true);
     }
 
     @Override
@@ -91,8 +86,7 @@ public String getDescription() {
     }
 
     @Override
-    public boolean isRecognizedFormat(BufferedReader reader)
-        throws IOException {
+    public boolean isRecognizedFormat(BufferedReader reader) throws IOException {
         String str;
         int i = 0;
         while (((str = reader.readLine()) != null) && (i < 50)) {
@@ -109,16 +103,13 @@ public boolean isRecognizedFormat(BufferedReader reader)
     }
 
     @Override
-    public ParserResult importDatabase(BufferedReader input)
-        throws IOException {
+    public ParserResult importDatabase(BufferedReader input) throws IOException {
         Objects.requireNonNull(input);
 
         List<BibEntry> bibItems = new ArrayList<>();
 
         try {
-            XMLStreamReader reader = xmlInputFactory.createXMLStreamReader(
-                input
-            );
+            XMLStreamReader reader = xmlInputFactory.createXMLStreamReader(input);
 
             while (reader.hasNext()) {
                 reader.next();
@@ -160,20 +151,13 @@ private void parseBookArticle(
                     case "PublicationStatus" -> {
                         reader.next();
                         if (isCharacterXMLEvent(reader)) {
-                            putIfValueNotNull(
-                                fields,
-                                StandardField.PUBSTATE,
-                                reader.getText()
-                            );
+                            putIfValueNotNull(fields, StandardField.PUBSTATE, reader.getText());
                         }
                     }
                 }
             }
 
-            if (
-                isEndXMLEvent(reader) &&
-                reader.getName().getLocalPart().equals(startElement)
-            ) {
+            if (isEndXMLEvent(reader) && reader.getName().getLocalPart().equals(startElement)) {
                 break;
             }
         }
@@ -242,33 +226,21 @@ private void parseBookDocument(
                 }
             }
 
-            if (
-                isEndXMLEvent(reader) &&
-                reader.getName().getLocalPart().equals(startElement)
-            ) {
+            if (isEndXMLEvent(reader) && reader.getName().getLocalPart().equals(startElement)) {
                 break;
             }
         }
 
         // populate multiple occurrence fields
         if (!sectionTitleList.isEmpty()) {
-            fields.put(
-                new UnknownField("sections"),
-                String.join("; ", sectionTitleList)
-            );
+            fields.put(new UnknownField("sections"), String.join("; ", sectionTitleList));
         }
         addKeywords(fields, keywordList);
         if (!publicationTypeList.isEmpty()) {
-            fields.put(
-                new UnknownField("pubtype"),
-                String.join(", ", publicationTypeList)
-            );
+            fields.put(new UnknownField("pubtype"), String.join(", ", publicationTypeList));
         }
         if (!articleTitleList.isEmpty()) {
-            fields.put(
-                new UnknownField("article"),
-                String.join(", ", articleTitleList)
-            );
+            fields.put(new UnknownField("article"), String.join(", ", articleTitleList));
         }
     }
 
@@ -288,11 +260,7 @@ private void parseBookInformation(
                     case "PublisherName" -> {
                         reader.next();
                         if (isCharacterXMLEvent(reader)) {
-                            putIfValueNotNull(
-                                fields,
-                                StandardField.PUBLISHER,
-                                reader.getText()
-                            );
+                            putIfValueNotNull(fields, StandardField.PUBLISHER, reader.getText());
                         }
                     }
                     case "PublisherLocation" -> {
@@ -317,31 +285,19 @@ private void parseBookInformation(
                     case "Volume" -> {
                         reader.next();
                         if (isCharacterXMLEvent(reader)) {
-                            putIfValueNotNull(
-                                fields,
-                                StandardField.VOLUME,
-                                reader.getText()
-                            );
+                            putIfValueNotNull(fields, StandardField.VOLUME, reader.getText());
                         }
                     }
                     case "Edition" -> {
                         reader.next();
                         if (isCharacterXMLEvent(reader)) {
-                            putIfValueNotNull(
-                                fields,
-                                StandardField.EDITION,
-                                reader.getText()
-                            );
+                            putIfValueNotNull(fields, StandardField.EDITION, reader.getText());
                         }
                     }
                     case "Medium" -> {
                         reader.next();
                         if (isCharacterXMLEvent(reader)) {
-                            putIfValueNotNull(
-                                fields,
-                                new UnknownField("medium"),
-                                reader.getText()
-                            );
+                            putIfValueNotNull(fields, new UnknownField("medium"), reader.getText());
                         }
                     }
                     case "ReportNumber" -> {
@@ -355,10 +311,7 @@ private void parseBookInformation(
                         }
                     }
                     case "ELocationID" -> {
-                        String eidType = reader.getAttributeValue(
-                            null,
-                            "EIdType"
-                        );
+                        String eidType = reader.getAttributeValue(null, "EIdType");
                         reader.next();
                         if (isCharacterXMLEvent(reader)) {
                             handleElocationId(fields, reader, eidType);
@@ -373,10 +326,7 @@ private void parseBookInformation(
                 }
             }
 
-            if (
-                isEndXMLEvent(reader) &&
-                reader.getName().getLocalPart().equals(startElement)
-            ) {
+            if (isEndXMLEvent(reader) && reader.getName().getLocalPart().equals(startElement)) {
                 break;
             }
         }
@@ -386,11 +336,7 @@ private void parseBookInformation(
         }
 
         if (!titleList.isEmpty()) {
-            putIfValueNotNull(
-                fields,
-                StandardField.TITLE,
-                String.join(" ", titleList)
-            );
+            putIfValueNotNull(fields, StandardField.TITLE, String.join(" ", titleList));
         }
     }
 
@@ -407,10 +353,8 @@ private void handleElocationId(
         }
     }
 
-    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()) {
@@ -431,10 +375,7 @@ private void parseSections(
                 }
             }
 
-            if (
-                isEndXMLEvent(reader) &&
-                "Section".equals(reader.getName().getLocalPart())
-            ) {
+            if (isEndXMLEvent(reader) && "Section".equals(reader.getName().getLocalPart())) {
                 if (sectionLevel == 0) {
                     break;
                 } else {
@@ -444,11 +385,8 @@ private void parseSections(
         }
     }
 
-    private void parseArticle(
-        XMLStreamReader reader,
-        List<BibEntry> bibItems,
-        String startElement
-    ) throws XMLStreamException {
+    private void parseArticle(XMLStreamReader reader, List<BibEntry> bibItems, String startElement)
+        throws XMLStreamException {
         Map<Field, String> fields = new HashMap<>();
 
         while (reader.hasNext()) {
@@ -465,10 +403,7 @@ private void parseArticle(
                 }
             }
 
-            if (
-                isEndXMLEvent(reader) &&
-                reader.getName().getLocalPart().equals(startElement)
-            ) {
+            if (isEndXMLEvent(reader) && reader.getName().getLocalPart().equals(startElement)) {
                 break;
             }
         }
@@ -499,34 +434,22 @@ private void parsePubmedData(
                         }
                     }
                     case "ArticleId" -> {
-                        String idType = reader.getAttributeValue(
-                            null,
-                            "IdType"
-                        );
+                        String idType = reader.getAttributeValue(null, "IdType");
                         reader.next();
                         if (isCharacterXMLEvent(reader)) {
-                            articleIdList.add(
-                                new ArticleId(idType, reader.getText())
-                            );
+                            articleIdList.add(new ArticleId(idType, reader.getText()));
                         }
                     }
                 }
             }
 
-            if (
-                isEndXMLEvent(reader) &&
-                reader.getName().getLocalPart().equals(startElement)
-            ) {
+            if (isEndXMLEvent(reader) && reader.getName().getLocalPart().equals(startElement)) {
                 break;
             }
         }
 
         if (fields.get(new UnknownField("revised")) != null) {
-            putIfValueNotNull(
-                fields,
-                StandardField.PUBSTATE,
-                publicationStatus
-            );
+            putIfValueNotNull(fields, StandardField.PUBSTATE, publicationStatus);
             if (!articleIdList.isEmpty()) {
                 addArticleIdList(fields, articleIdList);
             }
@@ -566,22 +489,13 @@ private void parseMedlineCitation(
                         parseArticleInformation(reader, fields);
                     }
                     case "PMID" -> {
-                        String versionStr = reader.getAttributeValue(
-                            null,
-                            "Version"
-                        );
+                        String versionStr = reader.getAttributeValue(null, "Version");
                         reader.next();
                         if (versionStr != null) {
                             int version = Integer.parseInt(versionStr);
-                            if (
-                                isCharacterXMLEvent(reader) &&
-                                version > latestVersion
-                            ) {
+                            if (isCharacterXMLEvent(reader) && version > latestVersion) {
                                 latestVersion = version;
-                                fields.put(
-                                    StandardField.PMID,
-                                    reader.getText()
-                                );
+                                fields.put(StandardField.PMID, reader.getText());
                             }
                         }
                     }
@@ -614,23 +528,14 @@ private void parseMedlineCitation(
                         }
                     }
                     case "PersonalNameSubject" -> {
-                        parsePersonalNameSubject(
-                            reader,
-                            personalNameSubjectList,
-                            elementName
-                        );
+                        parsePersonalNameSubject(reader, personalNameSubjectList, elementName);
                     }
                     case "OtherID" -> {
-                        String otherIdSource = reader.getAttributeValue(
-                            null,
-                            "Source"
-                        );
+                        String otherIdSource = reader.getAttributeValue(null, "Source");
                         reader.next();
                         if (isCharacterXMLEvent(reader)) {
                             String content = reader.getText();
-                            otherIdList.add(
-                                new OtherId(otherIdSource, content)
-                            );
+                            otherIdList.add(new OtherId(otherIdSource, content));
                         }
                     }
                     case "Keyword" -> {
@@ -646,11 +551,7 @@ private void parseMedlineCitation(
                         }
                     }
                     case "Investigator" -> {
-                        parseInvestigator(
-                            reader,
-                            investigatorList,
-                            elementName
-                        );
+                        parseInvestigator(reader, investigatorList, elementName);
                     }
                     case "GeneralNote" -> {
                         reader.next();
@@ -661,20 +562,14 @@ private void parseMedlineCitation(
                 }
             }
 
-            if (
-                isEndXMLEvent(reader) &&
-                reader.getName().getLocalPart().equals(startElement)
-            ) {
+            if (isEndXMLEvent(reader) && reader.getName().getLocalPart().equals(startElement)) {
                 break;
             }
         }
 
         // populate multiple occurrence fields
         if (!citationSubsets.isEmpty()) {
-            fields.put(
-                new UnknownField("citation-subset"),
-                String.join(", ", citationSubsets)
-            );
+            fields.put(new UnknownField("citation-subset"), String.join(", ", citationSubsets));
         }
         addMeshHeading(fields, meshHeadingList);
         addPersonalNames(fields, personalNameSubjectList);
@@ -725,17 +620,12 @@ private void parseInvestigator(
                 }
             }
 
-            if (
-                isEndXMLEvent(reader) &&
-                reader.getName().getLocalPart().equals(startElement)
-            ) {
+            if (isEndXMLEvent(reader) && reader.getName().getLocalPart().equals(startElement)) {
                 break;
             }
         }
 
-        investigatorList.add(
-            new Investigator(lastName, foreName, affiliationList)
-        );
+        investigatorList.add(new Investigator(lastName, foreName, affiliationList));
     }
 
     private void parsePersonalNameSubject(
@@ -766,17 +656,12 @@ private void parsePersonalNameSubject(
                 }
             }
 
-            if (
-                isEndXMLEvent(reader) &&
-                reader.getName().getLocalPart().equals(startElement)
-            ) {
+            if (isEndXMLEvent(reader) && reader.getName().getLocalPart().equals(startElement)) {
                 break;
             }
         }
 
-        personalNameSubjectList.add(
-            new PersonalNameSubject(lastName, foreName)
-        );
+        personalNameSubjectList.add(new PersonalNameSubject(lastName, foreName));
     }
 
     private void parseMeshHeading(
@@ -807,10 +692,7 @@ private void parseMeshHeading(
                 }
             }
 
-            if (
-                isEndXMLEvent(reader) &&
-                reader.getName().getLocalPart().equals(startElement)
-            ) {
+            if (isEndXMLEvent(reader) && reader.getName().getLocalPart().equals(startElement)) {
                 break;
             }
         }
@@ -837,19 +719,13 @@ private void parseGeneSymbolList(
                 }
             }
 
-            if (
-                isEndXMLEvent(reader) &&
-                reader.getName().getLocalPart().equals(startElement)
-            ) {
+            if (isEndXMLEvent(reader) && reader.getName().getLocalPart().equals(startElement)) {
                 break;
             }
         }
 
         if (!geneSymbols.isEmpty()) {
-            fields.put(
-                new UnknownField("gene-symbols"),
-                String.join(", ", geneSymbols)
-            );
+            fields.put(new UnknownField("gene-symbols"), String.join(", ", geneSymbols));
         }
     }
 
@@ -872,18 +748,12 @@ private void parseChemicalList(
                 }
             }
 
-            if (
-                isEndXMLEvent(reader) &&
-                reader.getName().getLocalPart().equals(startElement)
-            ) {
+            if (isEndXMLEvent(reader) && reader.getName().getLocalPart().equals(startElement)) {
                 break;
             }
         }
 
-        fields.put(
-            new UnknownField("chemicals"),
-            String.join(", ", chemicalNames)
-        );
+        fields.put(new UnknownField("chemicals"), String.join(", ", chemicalNames));
     }
 
     private void parseMedlineJournalInfo(
@@ -919,11 +789,7 @@ private void parseMedlineJournalInfo(
                     case "NlmUniqueID" -> {
                         reader.next();
                         if (isCharacterXMLEvent(reader)) {
-                            putIfValueNotNull(
-                                fields,
-                                new UnknownField("nlm-id"),
-                                reader.getText()
-                            );
+                            putIfValueNotNull(fields, new UnknownField("nlm-id"), reader.getText());
                         }
                     }
                     case "ISSNLinking" -> {
@@ -939,19 +805,14 @@ private void parseMedlineJournalInfo(
                 }
             }
 
-            if (
-                isEndXMLEvent(reader) &&
-                reader.getName().getLocalPart().equals(startElement)
-            ) {
+            if (isEndXMLEvent(reader) && reader.getName().getLocalPart().equals(startElement)) {
                 break;
             }
         }
     }
 
-    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);
@@ -971,18 +832,10 @@ private void parseArticleInformation(
                         addPagination(reader, fields, elementName);
                     }
                     case "ELocationID" -> {
-                        String eidType = reader.getAttributeValue(
-                            null,
-                            "EIdType"
-                        );
-                        String validYN = reader.getAttributeValue(
-                            null,
-                            "ValidYN"
-                        );
+                        String eidType = reader.getAttributeValue(null, "EIdType");
+                        String validYN = reader.getAttributeValue(null, "ValidYN");
                         reader.next();
-                        if (
-                            isCharacterXMLEvent(reader) && "Y".equals(validYN)
-                        ) {
+                        if (isCharacterXMLEvent(reader) && "Y".equals(validYN)) {
                             handleElocationId(fields, reader, eidType);
                         }
                     }
@@ -995,26 +848,18 @@ private void parseArticleInformation(
                 }
             }
 
-            if (
-                isEndXMLEvent(reader) &&
-                "Article".equals(reader.getName().getLocalPart())
-            ) {
+            if (isEndXMLEvent(reader) && "Article".equals(reader.getName().getLocalPart())) {
                 break;
             }
         }
 
         if (!titleList.isEmpty()) {
-            fields.put(
-                StandardField.TITLE,
-                StringUtil.stripBrackets(String.join(" ", titleList))
-            );
+            fields.put(StandardField.TITLE, StringUtil.stripBrackets(String.join(" ", titleList)));
         }
     }
 
-    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)) {
@@ -1023,41 +868,25 @@ private void parseJournal(
                     case "Title" -> {
                         reader.next();
                         if (isCharacterXMLEvent(reader)) {
-                            putIfValueNotNull(
-                                fields,
-                                StandardField.JOURNAL,
-                                reader.getText()
-                            );
+                            putIfValueNotNull(fields, StandardField.JOURNAL, reader.getText());
                         }
                     }
                     case "ISSN" -> {
                         reader.next();
                         if (isCharacterXMLEvent(reader)) {
-                            putIfValueNotNull(
-                                fields,
-                                StandardField.ISSN,
-                                reader.getText()
-                            );
+                            putIfValueNotNull(fields, StandardField.ISSN, reader.getText());
                         }
                     }
                     case "Volume" -> {
                         reader.next();
                         if (isCharacterXMLEvent(reader)) {
-                            putIfValueNotNull(
-                                fields,
-                                StandardField.VOLUME,
-                                reader.getText()
-                            );
+                            putIfValueNotNull(fields, StandardField.VOLUME, reader.getText());
                         }
                     }
                     case "Issue" -> {
                         reader.next();
                         if (isCharacterXMLEvent(reader)) {
-                            putIfValueNotNull(
-                                fields,
-                                StandardField.ISSUE,
-                                reader.getText()
-                            );
+                            putIfValueNotNull(fields, StandardField.ISSUE, reader.getText());
                         }
                     }
                     case "PubDate" -> {
@@ -1066,20 +895,14 @@ private void parseJournal(
                 }
             }
 
-            if (
-                isEndXMLEvent(reader) &&
-                "Journal".equals(reader.getName().getLocalPart())
-            ) {
+            if (isEndXMLEvent(reader) && "Journal".equals(reader.getName().getLocalPart())) {
                 break;
             }
         }
     }
 
-    private void parseDate(
-        XMLStreamReader reader,
-        Map<Field, String> fields,
-        String startElement
-    ) throws XMLStreamException {
+    private void parseDate(XMLStreamReader reader, Map<Field, String> fields, String startElement)
+        throws XMLStreamException {
         Optional<String> year = Optional.empty();
         Optional<String> month = Optional.empty();
         Optional<String> day = Optional.empty();
@@ -1124,40 +947,25 @@ private void parseDate(
                 }
             }
 
-            if (
-                isEndXMLEvent(reader) &&
-                reader.getName().getLocalPart().equals(startElement)
-            ) {
+            if (isEndXMLEvent(reader) && reader.getName().getLocalPart().equals(startElement)) {
                 break;
             }
         }
 
         Optional<Date> date = Date.parse(year, month, day);
         date.ifPresent(dateValue ->
-            fields.put(
-                new UnknownField(dateFieldMap.get(startElement)),
-                dateValue.getNormalized()
-            )
+            fields.put(new UnknownField(dateFieldMap.get(startElement)), dateValue.getNormalized())
         );
     }
 
-    private void addArticleIdList(
-        Map<Field, String> fields,
-        List<ArticleId> articleIdList
-    ) {
+    private void addArticleIdList(Map<Field, String> fields, List<ArticleId> articleIdList) {
         for (ArticleId id : articleIdList) {
             if (!id.idType().isBlank()) {
                 if ("pubmed".equals(id.idType())) {
-                    fields.computeIfAbsent(
-                        StandardField.PMID,
-                        k -> id.content()
-                    );
+                    fields.computeIfAbsent(StandardField.PMID, k -> id.content());
                 } else {
                     fields.computeIfAbsent(
-                        FieldFactory.parseField(
-                            StandardEntryType.Article,
-                            id.idType()
-                        ),
+                        FieldFactory.parseField(StandardEntryType.Article, id.idType()),
                         k -> id.content()
                     );
                 }
@@ -1165,10 +973,7 @@ private void addArticleIdList(
         }
     }
 
-    private void addNotes(
-        Map<Field, String> fields,
-        List<String> generalNoteList
-    ) {
+    private void addNotes(Map<Field, String> fields, List<String> generalNoteList) {
         List<String> notes = new ArrayList<>();
 
         for (String note : generalNoteList) {
@@ -1182,19 +987,14 @@ private void addNotes(
         }
     }
 
-    private void addInvestigators(
-        Map<Field, String> fields,
-        List<Investigator> investigatorList
-    ) {
+    private void addInvestigators(Map<Field, String> fields, List<Investigator> investigatorList) {
         List<String> investigatorNames = new ArrayList<>();
         List<String> affiliationInfos = new ArrayList<>();
 
         // add the investigators like the authors
         if (!investigatorList.isEmpty()) {
             for (Investigator investigator : investigatorList) {
-                StringBuilder result = new StringBuilder(
-                    investigator.lastName()
-                );
+                StringBuilder result = new StringBuilder(investigator.lastName());
                 if (!investigator.foreName().isBlank()) {
                     result.append(", ").append(investigator.foreName());
                 }
@@ -1207,53 +1007,32 @@ private void addInvestigators(
             }
 
             if (!affiliationInfos.isEmpty()) {
-                fields.put(
-                    new UnknownField("affiliation"),
-                    String.join(", ", affiliationInfos)
-                );
+                fields.put(new UnknownField("affiliation"), String.join(", ", affiliationInfos));
             }
 
-            fields.put(
-                new UnknownField("investigator"),
-                String.join(" and ", investigatorNames)
-            );
+            fields.put(new UnknownField("investigator"), String.join(" and ", investigatorNames));
         }
     }
 
-    private void addKeywords(
-        Map<Field, String> fields,
-        List<String> keywordList
-    ) {
+    private void addKeywords(Map<Field, String> fields, List<String> keywordList) {
         // Check whether MeshHeadingList exists or not
         if (fields.get(StandardField.KEYWORDS) == null) {
-            fields.put(
-                StandardField.KEYWORDS,
-                String.join(KEYWORD_SEPARATOR, keywordList)
-            );
+            fields.put(StandardField.KEYWORDS, String.join(KEYWORD_SEPARATOR, keywordList));
         } else {
             if (!keywordList.isEmpty()) {
                 // if it exists, combine the MeshHeading with the keywords
                 String result = String.join("; ", keywordList);
-                result =
-                    fields.get(StandardField.KEYWORDS) +
-                    KEYWORD_SEPARATOR +
-                    result;
+                result = fields.get(StandardField.KEYWORDS) + KEYWORD_SEPARATOR + result;
                 fields.put(StandardField.KEYWORDS, result);
             }
         }
     }
 
-    private void addOtherId(
-        Map<Field, String> fields,
-        List<OtherId> otherIdList
-    ) {
+    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()
-                    ),
+                    FieldFactory.parseField(StandardEntryType.Article, id.source()),
                     id.content()
                 );
             }
@@ -1270,36 +1049,24 @@ private void addPersonalNames(
 
             if (!personalNameSubjectList.isEmpty()) {
                 for (PersonalNameSubject personalNameSubject : personalNameSubjectList) {
-                    StringBuilder result = new StringBuilder(
-                        personalNameSubject.lastName()
-                    );
+                    StringBuilder result = new StringBuilder(personalNameSubject.lastName());
                     if (!personalNameSubject.foreName().isBlank()) {
-                        result
-                            .append(", ")
-                            .append(personalNameSubject.foreName());
+                        result.append(", ").append(personalNameSubject.foreName());
                     }
                     personalNames.add(result.toString());
                 }
 
-                fields.put(
-                    StandardField.AUTHOR,
-                    String.join(" and ", personalNames)
-                );
+                fields.put(StandardField.AUTHOR, String.join(" and ", personalNames));
             }
         }
     }
 
-    private void addMeshHeading(
-        Map<Field, String> fields,
-        List<MeshHeading> meshHeadingList
-    ) {
+    private void addMeshHeading(Map<Field, String> fields, List<MeshHeading> meshHeadingList) {
         List<String> keywords = new ArrayList<>();
 
         if (!meshHeadingList.isEmpty()) {
             for (MeshHeading meshHeading : meshHeadingList) {
-                StringBuilder result = new StringBuilder(
-                    meshHeading.descriptorName()
-                );
+                StringBuilder result = new StringBuilder(meshHeading.descriptorName());
                 if (meshHeading.qualifierNames() != null) {
                     for (String qualifierName : meshHeading.qualifierNames()) {
                         result.append(", ").append(qualifierName);
@@ -1308,18 +1075,12 @@ private void addMeshHeading(
                 keywords.add(result.toString());
             }
 
-            fields.put(
-                StandardField.KEYWORDS,
-                String.join(KEYWORD_SEPARATOR, keywords)
-            );
+            fields.put(StandardField.KEYWORDS, String.join(KEYWORD_SEPARATOR, keywords));
         }
     }
 
-    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)) {
@@ -1328,10 +1089,7 @@ private void addPubDate(
                     case "MedlineDate" -> {
                         reader.next();
                         if (isCharacterXMLEvent(reader)) {
-                            fields.put(
-                                StandardField.YEAR,
-                                extractYear(reader.getText())
-                            );
+                            fields.put(StandardField.YEAR, extractYear(reader.getText()));
                         }
                     }
                     case "Year" -> {
@@ -1343,33 +1101,22 @@ private void addPubDate(
                     case "Month" -> {
                         reader.next();
                         if (isCharacterXMLEvent(reader)) {
-                            Optional<Month> month = Month.parse(
-                                reader.getText()
-                            );
+                            Optional<Month> month = Month.parse(reader.getText());
                             month.ifPresent(monthValue ->
-                                fields.put(
-                                    StandardField.MONTH,
-                                    monthValue.getJabRefFormat()
-                                )
+                                fields.put(StandardField.MONTH, monthValue.getJabRefFormat())
                             );
                         }
                     }
                     case "Season" -> {
                         reader.next();
                         if (isCharacterXMLEvent(reader)) {
-                            fields.put(
-                                new UnknownField("season"),
-                                reader.getText()
-                            );
+                            fields.put(new UnknownField("season"), reader.getText());
                         }
                     }
                 }
             }
 
-            if (
-                isEndXMLEvent(reader) &&
-                reader.getName().getLocalPart().equals(startElement)
-            ) {
+            if (isEndXMLEvent(reader) && reader.getName().getLocalPart().equals(startElement)) {
                 break;
             }
         }
@@ -1398,28 +1145,18 @@ private void addAbstract(
                         }
                     }
                     case "AbstractText" -> {
-                        handleTextElement(
-                            reader,
-                            abstractTextList,
-                            elementName
-                        );
+                        handleTextElement(reader, abstractTextList, elementName);
                     }
                 }
             }
 
-            if (
-                isEndXMLEvent(reader) &&
-                reader.getName().getLocalPart().equals(startElement)
-            ) {
+            if (isEndXMLEvent(reader) && reader.getName().getLocalPart().equals(startElement)) {
                 break;
             }
         }
 
         if (!abstractTextList.isEmpty()) {
-            fields.put(
-                StandardField.ABSTRACT,
-                String.join(" ", abstractTextList)
-            );
+            fields.put(StandardField.ABSTRACT, String.join(" ", abstractTextList));
         }
     }
 
@@ -1446,10 +1183,7 @@ private void handleTextElement(
                     case "sup", "sub" -> {
                         reader.next();
                         if (isCharacterXMLEvent(reader)) {
-                            result
-                                .append("(")
-                                .append(reader.getText())
-                                .append(")");
+                            result.append("(").append(reader.getText()).append(")");
                         }
                     }
                 }
@@ -1457,10 +1191,7 @@ private void handleTextElement(
                 result.append(reader.getText().trim()).append(" ");
             }
 
-            if (
-                isEndXMLEvent(reader) &&
-                reader.getName().getLocalPart().equals(startElement)
-            ) {
+            if (isEndXMLEvent(reader) && reader.getName().getLocalPart().equals(startElement)) {
                 break;
             }
         }
@@ -1496,11 +1227,7 @@ private void addPagination(
                         if (isCharacterXMLEvent(reader)) {
                             // it could happen, that the article has only a start page
                             startPage = reader.getText() + endPage;
-                            putIfValueNotNull(
-                                fields,
-                                StandardField.PAGES,
-                                startPage
-                            );
+                            putIfValueNotNull(fields, StandardField.PAGES, startPage);
                         }
                     }
                     case "EndPage" -> {
@@ -1517,10 +1244,7 @@ private void addPagination(
                 }
             }
 
-            if (
-                isEndXMLEvent(reader) &&
-                reader.getName().getLocalPart().equals(startElement)
-            ) {
+            if (isEndXMLEvent(reader) && reader.getName().getLocalPart().equals(startElement)) {
                 break;
             }
         }
@@ -1549,10 +1273,7 @@ private void handleAuthorList(
                 }
             }
 
-            if (
-                isEndXMLEvent(reader) &&
-                reader.getName().getLocalPart().equals(startElement)
-            ) {
+            if (isEndXMLEvent(reader) && reader.getName().getLocalPart().equals(startElement)) {
                 break;
             }
         }
@@ -1591,10 +1312,7 @@ private void parseAuthor(XMLStreamReader reader, List<String> authorNames)
                 }
             }
 
-            if (
-                isEndXMLEvent(reader) &&
-                "Author".equals(reader.getName().getLocalPart())
-            ) {
+            if (isEndXMLEvent(reader) && "Author".equals(reader.getName().getLocalPart())) {
                 break;
             }
         }
@@ -1607,11 +1325,7 @@ private void parseAuthor(XMLStreamReader reader, List<String> authorNames)
         }
     }
 
-    private void putIfValueNotNull(
-        Map<Field, String> fields,
-        Field field,
-        String value
-    ) {
+    private void putIfValueNotNull(Map<Field, String> fields, Field field, String value) {
         if (value != null) {
             fields.put(field, value);
         }
@@ -1631,9 +1345,7 @@ private String fixPageRange(String pageRange) {
         int lengthOfEndPage = endPage.length();
         int lengthOfStartPage = startPage.length();
         if (lengthOfEndPage < lengthOfStartPage) {
-            endPage =
-                startPage.substring(0, lengthOfStartPage - lengthOfEndPage) +
-                endPage;
+            endPage = startPage.substring(0, lengthOfStartPage - lengthOfEndPage) + endPage;
         }
         return startPage + "--" + endPage;
     }
@@ -1651,13 +1363,10 @@ private boolean isEndXMLEvent(XMLStreamReader reader) {
     }
 
     @Override
-    public List<BibEntry> parseEntries(InputStream inputStream)
-        throws ParseException {
+    public List<BibEntry> parseEntries(InputStream inputStream) throws ParseException {
         try {
             return importDatabase(
-                new BufferedReader(
-                    new InputStreamReader(inputStream, StandardCharsets.UTF_8)
-                )
+                new BufferedReader(new InputStreamReader(inputStream, StandardCharsets.UTF_8))
             )
                 .getDatabase()
                 .getEntries();
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 6d4f869d128..5c8a7442631 100644
--- a/src/main/java/org/jabref/logic/importer/fileformat/MedlinePlainImporter.java
+++ b/src/main/java/org/jabref/logic/importer/fileformat/MedlinePlainImporter.java
@@ -33,9 +33,7 @@ public class MedlinePlainImporter extends Importer {
     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 static final Pattern COMPLETE_DATE_PATTERN = Pattern.compile("\\d{8}");
 
     @Override
     public String getName() {
@@ -58,8 +56,7 @@ public String getId() {
     }
 
     @Override
-    public boolean isRecognizedFormat(BufferedReader reader)
-        throws IOException {
+    public boolean isRecognizedFormat(BufferedReader reader) throws IOException {
         // Our strategy is to look for the "PMID  - *", "PMC.*-.*", or "PMCR.*-.*" line
         // (i.e., PubMed Unique Identifier, PubMed Central Identifier, PubMed Central Release)
         String str;
@@ -76,8 +73,7 @@ public boolean isRecognizedFormat(BufferedReader reader)
     }
 
     @Override
-    public ParserResult importDatabase(BufferedReader reader)
-        throws IOException {
+    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
@@ -117,9 +113,7 @@ public ParserResult importDatabase(BufferedReader reader)
                     if (lines[j + 1].charAt(4) != '-') {
                         if (
                             (current.length() > 0) &&
-                            !Character.isWhitespace(
-                                current.charAt(current.length() - 1)
-                            )
+                            !Character.isWhitespace(current.charAt(current.length() - 1))
                         ) {
                             current.append(' ');
                         }
@@ -195,19 +189,12 @@ public ParserResult importDatabase(BufferedReader reader)
                     }
                 }
 
-                if (
-                    "IRAD".equals(label) ||
-                    "IR".equals(label) ||
-                    "FIR".equals(label)
-                ) {
+                if ("IRAD".equals(label) || "IR".equals(label) || "FIR".equals(label)) {
                     String oldInvestigator = fieldConversionMap.get(
                         new UnknownField("investigator")
                     );
                     if (oldInvestigator == null) {
-                        fieldConversionMap.put(
-                            new UnknownField("investigator"),
-                            value
-                        );
+                        fieldConversionMap.put(new UnknownField("investigator"), value);
                     } else {
                         fieldConversionMap.put(
                             new UnknownField("investigator"),
@@ -215,18 +202,11 @@ public ParserResult importDatabase(BufferedReader reader)
                         );
                     }
                 } else if ("MH".equals(label) || "OT".equals(label)) {
-                    if (
-                        !fieldConversionMap.containsKey(StandardField.KEYWORDS)
-                    ) {
+                    if (!fieldConversionMap.containsKey(StandardField.KEYWORDS)) {
                         fieldConversionMap.put(StandardField.KEYWORDS, value);
                     } else {
-                        String kw = fieldConversionMap.get(
-                            StandardField.KEYWORDS
-                        );
-                        fieldConversionMap.put(
-                            StandardField.KEYWORDS,
-                            kw + ", " + value
-                        );
+                        String kw = fieldConversionMap.get(StandardField.KEYWORDS);
+                        fieldConversionMap.put(StandardField.KEYWORDS, kw + ", " + value);
                     }
                 } else if (
                     "CON".equals(label) ||
@@ -299,11 +279,7 @@ private EntryType addSourceType(String value, EntryType type) {
         }
     }
 
-    private void addStandardNumber(
-        Map<Field, String> hm,
-        String lab,
-        String value
-    ) {
+    private void addStandardNumber(Map<Field, String> hm, String lab, String value) {
         if ("IS".equals(lab)) {
             Field key = StandardField.ISSN;
             // it is possible to have two issn, one for electronic and for print
@@ -312,10 +288,7 @@ private void addStandardNumber(
             if (value.indexOf('(') > 0) {
                 int keyStart = value.indexOf('(');
                 int keyEnd = value.indexOf(')');
-                key =
-                    new UnknownField(
-                        value.substring(keyStart + 1, keyEnd) + "-" + key
-                    );
+                key = new UnknownField(value.substring(keyStart + 1, keyEnd) + "-" + key);
                 String numberValue = value.substring(0, keyStart - 1);
                 hm.put(key, numberValue);
             } else {
@@ -345,8 +318,7 @@ private void addIDs(Map<Field, String> hm, String lab, String value) {
                 int endOfIdentifier = value.indexOf(']');
                 key =
                     new UnknownField(
-                        "article-" +
-                        value.substring(startOfIdentifier + 1, endOfIdentifier)
+                        "article-" + value.substring(startOfIdentifier + 1, endOfIdentifier)
                     );
                 idValue = value.substring(0, startOfIdentifier - 1);
             }
@@ -364,22 +336,13 @@ private void addIDs(Map<Field, String> hm, String lab, String value) {
         }
     }
 
-    private void addTitles(
-        Map<Field, String> hm,
-        String lab,
-        String val,
-        EntryType type
-    ) {
+    private void addTitles(Map<Field, String> hm, String lab, String val, EntryType type) {
         if ("TI".equals(lab)) {
             String oldVal = hm.get(StandardField.TITLE);
             if (oldVal == null) {
                 hm.put(StandardField.TITLE, val);
             } else {
-                if (
-                    oldVal.endsWith(":") ||
-                    oldVal.endsWith(".") ||
-                    oldVal.endsWith("?")
-                ) {
+                if (oldVal.endsWith(":") || oldVal.endsWith(".") || oldVal.endsWith("?")) {
                     hm.put(StandardField.TITLE, oldVal + " " + val);
                 } else {
                     hm.put(StandardField.TITLE, oldVal + ": " + val);
@@ -411,9 +374,7 @@ private void addAbstract(Map<Field, String> hm, String lab, String value) {
             if (value.contains("Copyright")) {
                 int copyrightIndex = value.lastIndexOf("Copyright");
                 // remove the copyright from the field since the name of the field is copyright
-                String copyrightInfo = value
-                    .substring(copyrightIndex)
-                    .replace("Copyright ", "");
+                String copyrightInfo = value.substring(copyrightIndex).replace("Copyright ", "");
                 hm.put(new UnknownField("copyright"), copyrightInfo);
                 abstractValue = value.substring(0, copyrightIndex);
             } else {
@@ -423,10 +384,7 @@ private void addAbstract(Map<Field, String> hm, String lab, String value) {
             if (oldAb == null) {
                 hm.put(StandardField.ABSTRACT, abstractValue);
             } else {
-                hm.put(
-                    StandardField.ABSTRACT,
-                    oldAb + OS.NEWLINE + abstractValue
-                );
+                hm.put(StandardField.ABSTRACT, oldAb + OS.NEWLINE + abstractValue);
             }
         } else if ("OAB".equals(lab) || "OABL".equals(lab)) {
             hm.put(new UnknownField("other-abstract"), value);
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 3d2d9a7fafa..a1f0f7fa35b 100644
--- a/src/main/java/org/jabref/logic/importer/fileformat/ModsImporter.java
+++ b/src/main/java/org/jabref/logic/importer/fileformat/ModsImporter.java
@@ -47,9 +47,7 @@
  */
 public class ModsImporter extends Importer implements Parser {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(
-        ModsImporter.class
-    );
+    private static final Logger LOGGER = LoggerFactory.getLogger(ModsImporter.class);
     private static final Pattern MODS_PATTERN = Pattern.compile("<mods .*>");
 
     private final String keywordSeparator;
@@ -57,10 +55,7 @@ public class ModsImporter extends Importer implements Parser {
 
     public ModsImporter(ImportFormatPreferences importFormatPreferences) {
         keywordSeparator =
-            importFormatPreferences
-                .bibEntryPreferences()
-                .getKeywordSeparator() +
-            " ";
+            importFormatPreferences.bibEntryPreferences().getKeywordSeparator() + " ";
         xmlInputFactory = XMLInputFactory.newInstance();
         // prevent xxe (https://rules.sonarsource.com/java/RSPEC-2755)
         // Not supported by aalto-xml
@@ -70,21 +65,16 @@ public ModsImporter(ImportFormatPreferences importFormatPreferences) {
 
     @Override
     public boolean isRecognizedFormat(BufferedReader input) throws IOException {
-        return input
-            .lines()
-            .anyMatch(line -> MODS_PATTERN.matcher(line).find());
+        return input.lines().anyMatch(line -> MODS_PATTERN.matcher(line).find());
     }
 
     @Override
-    public ParserResult importDatabase(BufferedReader input)
-        throws IOException {
+    public ParserResult importDatabase(BufferedReader input) throws IOException {
         Objects.requireNonNull(input);
 
         List<BibEntry> bibItems = new ArrayList<>();
         try {
-            XMLStreamReader reader = xmlInputFactory.createXMLStreamReader(
-                input
-            );
+            XMLStreamReader reader = xmlInputFactory.createXMLStreamReader(input);
             parseModsCollection(bibItems, reader);
         } catch (XMLStreamException e) {
             LOGGER.debug("could not parse document", e);
@@ -94,16 +84,11 @@ public ParserResult importDatabase(BufferedReader input)
         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())
-            ) {
+            if (isStartXMLEvent(reader) && "mods".equals(reader.getName().getLocalPart())) {
                 BibEntry entry = new BibEntry();
                 Map<Field, String> fields = new HashMap<>();
 
@@ -120,11 +105,8 @@ private void parseModsCollection(
         }
     }
 
-    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<>();
@@ -140,21 +122,13 @@ private void parseModsGroup(
                     case "abstract" -> {
                         reader.next();
                         if (isCharacterXMLEvent(reader)) {
-                            putIfValueNotNull(
-                                fields,
-                                StandardField.ABSTRACT,
-                                reader.getText()
-                            );
+                            putIfValueNotNull(fields, StandardField.ABSTRACT, reader.getText());
                         }
                     }
                     case "genre" -> {
                         reader.next();
                         if (isCharacterXMLEvent(reader)) {
-                            entry.setType(
-                                EntryTypeFactory.parse(
-                                    mapGenre(reader.getText())
-                                )
-                            );
+                            entry.setType(EntryTypeFactory.parse(mapGenre(reader.getText())));
                         }
                     }
                     case "language" -> {
@@ -167,11 +141,7 @@ private void parseModsGroup(
                         String type = reader.getAttributeValue(null, "type");
                         reader.next();
                         if (isCharacterXMLEvent(reader)) {
-                            parseIdentifier(
-                                fields,
-                                new Identifier(type, reader.getText()),
-                                entry
-                            );
+                            parseIdentifier(fields, new Identifier(type, reader.getText()), entry);
                         }
                     }
                     case "note" -> {
@@ -201,21 +171,13 @@ private void parseModsGroup(
                 }
             }
 
-            if (
-                isEndXMLEvent(reader) &&
-                "mods".equals(reader.getName().getLocalPart())
-            ) {
+            if (isEndXMLEvent(reader) && "mods".equals(reader.getName().getLocalPart())) {
                 break;
             }
         }
 
         putIfListIsNotEmpty(fields, notes, StandardField.NOTE, ", ");
-        putIfListIsNotEmpty(
-            fields,
-            keywords,
-            StandardField.KEYWORDS,
-            this.keywordSeparator
-        );
+        putIfListIsNotEmpty(fields, keywords, StandardField.KEYWORDS, this.keywordSeparator);
         putIfListIsNotEmpty(fields, authors, StandardField.AUTHOR, " and ");
     }
 
@@ -225,10 +187,8 @@ private void parseModsGroup(
      * 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)) {
@@ -236,11 +196,7 @@ private void parseRelatedItem(
                     case "title" -> {
                         reader.next();
                         if (isCharacterXMLEvent(reader)) {
-                            putIfValueNotNull(
-                                fields,
-                                StandardField.JOURNAL,
-                                reader.getText()
-                            );
+                            putIfValueNotNull(fields, StandardField.JOURNAL, reader.getText());
                         }
                     }
                     case "detail" -> {
@@ -252,19 +208,14 @@ private void parseRelatedItem(
                 }
             }
 
-            if (
-                isEndXMLEvent(reader) &&
-                "relatedItem".equals(reader.getName().getLocalPart())
-            ) {
+            if (isEndXMLEvent(reader) && "relatedItem".equals(reader.getName().getLocalPart())) {
                 break;
             }
         }
     }
 
-    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 = "";
@@ -294,10 +245,7 @@ private void handleExtent(
                 }
             }
 
-            if (
-                isEndXMLEvent(reader) &&
-                "extent".equals(reader.getName().getLocalPart())
-            ) {
+            if (isEndXMLEvent(reader) && "extent".equals(reader.getName().getLocalPart())) {
                 break;
             }
         }
@@ -314,10 +262,8 @@ private void handleExtent(
         }
     }
 
-    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");
 
@@ -325,34 +271,22 @@ private void handleDetail(
             reader.next();
 
             if (isStartXMLEvent(reader)) {
-                if (
-                    detailElementSet.contains(reader.getName().getLocalPart())
-                ) {
+                if (detailElementSet.contains(reader.getName().getLocalPart())) {
                     reader.next();
                     if (isCharacterXMLEvent(reader)) {
-                        putIfValueNotNull(
-                            fields,
-                            FieldFactory.parseField(type),
-                            reader.getText()
-                        );
+                        putIfValueNotNull(fields, FieldFactory.parseField(type), reader.getText());
                     }
                 }
             }
 
-            if (
-                isEndXMLEvent(reader) &&
-                "detail".equals(reader.getName().getLocalPart())
-            ) {
+            if (isEndXMLEvent(reader) && "detail".equals(reader.getName().getLocalPart())) {
                 break;
             }
         }
     }
 
-    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()) {
@@ -377,10 +311,7 @@ private void parseName(
                 }
             }
 
-            if (
-                isEndXMLEvent(reader) &&
-                "name".equals(reader.getName().getLocalPart())
-            ) {
+            if (isEndXMLEvent(reader) && "name".equals(reader.getName().getLocalPart())) {
                 break;
             }
         }
@@ -388,10 +319,8 @@ private void parseName(
         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()) {
@@ -413,36 +342,22 @@ private void parseOriginInfo(
                     case "placeTerm" -> {
                         reader.next();
                         if (isCharacterXMLEvent(reader)) {
-                            appendIfValueNotNullOrBlank(
-                                places,
-                                reader.getText()
-                            );
+                            appendIfValueNotNullOrBlank(places, reader.getText());
                         }
                     }
                     case "publisher" -> {
                         reader.next();
                         if (isCharacterXMLEvent(reader)) {
-                            putIfValueNotNull(
-                                fields,
-                                StandardField.PUBLISHER,
-                                reader.getText()
-                            );
+                            putIfValueNotNull(fields, StandardField.PUBLISHER, reader.getText());
                         }
                     }
                     case "edition" -> {
                         reader.next();
                         if (isCharacterXMLEvent(reader)) {
-                            putIfValueNotNull(
-                                fields,
-                                StandardField.EDITION,
-                                reader.getText()
-                            );
+                            putIfValueNotNull(fields, StandardField.EDITION, reader.getText());
                         }
                     }
-                    case "dateIssued",
-                        "dateCreated",
-                        "dateCaptured",
-                        "dateModified" -> {
+                    case "dateIssued", "dateCreated", "dateCaptured", "dateModified" -> {
                         reader.next();
                         if (isCharacterXMLEvent(reader)) {
                             putDate(fields, elementName, reader.getText());
@@ -451,10 +366,7 @@ private void parseOriginInfo(
                 }
             }
 
-            if (
-                isEndXMLEvent(reader) &&
-                "originInfo".equals(reader.getName().getLocalPart())
-            ) {
+            if (isEndXMLEvent(reader) && "originInfo".equals(reader.getName().getLocalPart())) {
                 break;
             }
         }
@@ -481,11 +393,7 @@ private void parseSubject(
                     case "city" -> {
                         reader.next();
                         if (isCharacterXMLEvent(reader)) {
-                            putIfValueNotNull(
-                                fields,
-                                new UnknownField("city"),
-                                reader.getText()
-                            );
+                            putIfValueNotNull(fields, new UnknownField("city"), reader.getText());
                         }
                     }
                     case "country" -> {
@@ -501,19 +409,14 @@ private void parseSubject(
                 }
             }
 
-            if (
-                isEndXMLEvent(reader) &&
-                "subject".equals(reader.getName().getLocalPart())
-            ) {
+            if (isEndXMLEvent(reader) && "subject".equals(reader.getName().getLocalPart())) {
                 break;
             }
         }
     }
 
-    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();
@@ -522,18 +425,12 @@ private void parseRecordInfo(
             reader.next();
 
             if (isStartXMLEvent(reader)) {
-                if (
-                    RecordInfo.elementNameSet.contains(
-                        reader.getName().getLocalPart()
-                    )
-                ) {
+                if (RecordInfo.elementNameSet.contains(reader.getName().getLocalPart())) {
                     reader.next();
                     if (isCharacterXMLEvent(reader)) {
                         recordContents.add(0, reader.getText());
                     }
-                } else if (
-                    "languageTerm".equals(reader.getName().getLocalPart())
-                ) {
+                } else if ("languageTerm".equals(reader.getName().getLocalPart())) {
                     reader.next();
                     if (isCharacterXMLEvent(reader)) {
                         languages.add(reader.getText());
@@ -541,49 +438,30 @@ private void parseRecordInfo(
                 }
             }
 
-            if (
-                isEndXMLEvent(reader) &&
-                "recordInfo".equals(reader.getName().getLocalPart())
-            ) {
+            if (isEndXMLEvent(reader) && "recordInfo".equals(reader.getName().getLocalPart())) {
                 break;
             }
         }
 
         for (String recordContent : recordContents) {
-            putIfValueNotNull(
-                fields,
-                new UnknownField("source"),
-                recordContent
-            );
+            putIfValueNotNull(fields, new UnknownField("source"), recordContent);
         }
         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();
 
-            if (
-                isStartXMLEvent(reader) &&
-                "languageTerm".equals(reader.getName().getLocalPart())
-            ) {
+            if (isStartXMLEvent(reader) && "languageTerm".equals(reader.getName().getLocalPart())) {
                 reader.next();
                 if (isCharacterXMLEvent(reader)) {
-                    putIfValueNotNull(
-                        fields,
-                        StandardField.LANGUAGE,
-                        reader.getText()
-                    );
+                    putIfValueNotNull(fields, StandardField.LANGUAGE, reader.getText());
                 }
             }
 
-            if (
-                isEndXMLEvent(reader) &&
-                "language".equals(reader.getName().getLocalPart())
-            ) {
+            if (isEndXMLEvent(reader) && "language".equals(reader.getName().getLocalPart())) {
                 break;
             }
         }
@@ -594,33 +472,21 @@ private void parseTitle(XMLStreamReader reader, Map<Field, String> fields)
         while (reader.hasNext()) {
             reader.next();
 
-            if (
-                isStartXMLEvent(reader) &&
-                "title".equals(reader.getName().getLocalPart())
-            ) {
+            if (isStartXMLEvent(reader) && "title".equals(reader.getName().getLocalPart())) {
                 reader.next();
                 if (isCharacterXMLEvent(reader)) {
-                    putIfValueNotNull(
-                        fields,
-                        StandardField.TITLE,
-                        reader.getText()
-                    );
+                    putIfValueNotNull(fields, StandardField.TITLE, reader.getText());
                 }
             }
 
-            if (
-                isEndXMLEvent(reader) &&
-                "titleInfo".equals(reader.getName().getLocalPart())
-            ) {
+            if (isEndXMLEvent(reader) && "titleInfo".equals(reader.getName().getLocalPart())) {
                 break;
             }
         }
     }
 
-    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<>();
 
@@ -628,9 +494,7 @@ private void parseLocationAndUrl(
             reader.next();
 
             if (isStartXMLEvent(reader)) {
-                if (
-                    "physicalLocation".equals(reader.getName().getLocalPart())
-                ) {
+                if ("physicalLocation".equals(reader.getName().getLocalPart())) {
                     reader.next();
                     if (isCharacterXMLEvent(reader)) {
                         locations.add(reader.getText());
@@ -643,10 +507,7 @@ private void parseLocationAndUrl(
                 }
             }
 
-            if (
-                isEndXMLEvent(reader) &&
-                "location".equals(reader.getName().getLocalPart())
-            ) {
+            if (isEndXMLEvent(reader) && "location".equals(reader.getName().getLocalPart())) {
                 break;
             }
         }
@@ -660,18 +521,12 @@ private String mapGenre(String genre) {
             case "conference publication" -> "proceedings";
             case "database" -> "dataset";
             case "yearbook", "handbook" -> "book";
-            case "law report or digest",
-                "technical report",
-                "reporting" -> "report";
+            case "law report or digest", "technical report", "reporting" -> "report";
             default -> genre;
         };
     }
 
-    private void parseIdentifier(
-        Map<Field, String> fields,
-        Identifier identifier,
-        BibEntry entry
-    ) {
+    private void parseIdentifier(Map<Field, String> fields, Identifier identifier, BibEntry entry) {
         String type = identifier.type();
         if ("citekey".equals(type) && entry.getCitationKey().isEmpty()) {
             entry.setCitationKey(identifier.value());
@@ -685,59 +540,37 @@ private void parseIdentifier(
         }
     }
 
-    private void putDate(
-        Map<Field, String> fields,
-        String elementName,
-        String date
-    ) {
+    private void putDate(Map<Field, String> fields, String elementName, String date) {
         if (date != null) {
             Optional<Date> optionalParsedDate = Date.parse(date);
             switch (elementName) {
                 case "dateIssued" -> {
                     optionalParsedDate.ifPresent(parsedDate ->
-                        fields.put(
-                            StandardField.DATE,
-                            parsedDate.getNormalized()
-                        )
+                        fields.put(StandardField.DATE, parsedDate.getNormalized())
                     );
 
                     optionalParsedDate
                         .flatMap(Date::getYear)
-                        .ifPresent(year ->
-                            fields.put(StandardField.YEAR, year.toString())
-                        );
+                        .ifPresent(year -> fields.put(StandardField.YEAR, year.toString()));
 
                     optionalParsedDate
                         .flatMap(Date::getMonth)
-                        .ifPresent(month ->
-                            fields.put(
-                                StandardField.MONTH,
-                                month.getJabRefFormat()
-                            )
+                        .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
-                    fields.computeIfAbsent(
-                        StandardField.YEAR,
-                        k -> date.substring(0, 4)
-                    );
+                    fields.computeIfAbsent(StandardField.YEAR, k -> date.substring(0, 4));
                     fields.put(new UnknownField("created"), date);
                 }
                 case "dateCaptured" -> {
                     optionalParsedDate.ifPresent(parsedDate ->
-                        fields.put(
-                            StandardField.CREATIONDATE,
-                            parsedDate.getNormalized()
-                        )
+                        fields.put(StandardField.CREATIONDATE, parsedDate.getNormalized())
                     );
                 }
                 case "dateModified" -> {
                     optionalParsedDate.ifPresent(parsedDate ->
-                        fields.put(
-                            StandardField.MODIFICATIONDATE,
-                            parsedDate.getNormalized()
-                        )
+                        fields.put(StandardField.MODIFICATIONDATE, parsedDate.getNormalized())
                     );
                 }
             }
@@ -751,17 +584,11 @@ private void putIfListIsNotEmpty(
         String separator
     ) {
         if (!list.isEmpty()) {
-            fields.put(
-                key,
-                list.stream().collect(Collectors.joining(separator))
-            );
+            fields.put(key, list.stream().collect(Collectors.joining(separator)));
         }
     }
 
-    private void handleAuthorsInNamePart(
-        List<Name> names,
-        List<String> authors
-    ) {
+    private void handleAuthorsInNamePart(List<Name> names, List<String> authors) {
         List<String> foreName = new ArrayList<>();
         String familyName = "";
         String author = "";
@@ -801,11 +628,7 @@ private void handleAuthorsInNamePart(
         }
     }
 
-    private void putIfValueNotNull(
-        Map<Field, String> fields,
-        Field field,
-        String value
-    ) {
+    private void putIfValueNotNull(Map<Field, String> fields, Field field, String value) {
         if (value != null) {
             fields.put(field, value);
         }
@@ -845,13 +668,10 @@ public String getDescription() {
     }
 
     @Override
-    public List<BibEntry> parseEntries(InputStream inputStream)
-        throws ParseException {
+    public List<BibEntry> parseEntries(InputStream inputStream) throws ParseException {
         try {
             return importDatabase(
-                new BufferedReader(
-                    new InputStreamReader(inputStream, StandardCharsets.UTF_8)
-                )
+                new BufferedReader(new InputStreamReader(inputStream, StandardCharsets.UTF_8))
             )
                 .getDatabase()
                 .getEntries();
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 63e5c3ba1a7..0532e987eee 100644
--- a/src/main/java/org/jabref/logic/importer/fileformat/MrDLibImporter.java
+++ b/src/main/java/org/jabref/logic/importer/fileformat/MrDLibImporter.java
@@ -25,9 +25,7 @@
  */
 public class MrDLibImporter extends Importer {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(
-        MrDLibImporter.class
-    );
+    private static final Logger LOGGER = LoggerFactory.getLogger(MrDLibImporter.class);
     public ParserResult parserResult;
     private String recommendationsHeading;
     private String recommendationsDescription;
@@ -49,8 +47,7 @@ public boolean isRecognizedFormat(BufferedReader input) throws IOException {
     }
 
     @Override
-    public ParserResult importDatabase(BufferedReader input)
-        throws IOException {
+    public ParserResult importDatabase(BufferedReader input) throws IOException {
         parse(input);
         return parserResult;
     }
@@ -118,9 +115,7 @@ private void parse(BufferedReader input) throws IOException {
         List<RankedBibEntry> rankedBibEntries = new ArrayList<>();
 
         // Get recommendations from response and populate bib entries
-        JSONObject recommendationsJson = recommendationSetJson.getJSONObject(
-            "recommendations"
-        );
+        JSONObject recommendationsJson = recommendationSetJson.getJSONObject("recommendations");
         Iterator<String> keys = recommendationsJson.keys();
         while (keys.hasNext()) {
             String key = keys.next();
@@ -129,11 +124,7 @@ private void parse(BufferedReader input) throws IOException {
         }
 
         // Sort bib entries according to rank
-        rankedBibEntries.sort(
-                (
-                    RankedBibEntry rankedBibEntry1,
-                    RankedBibEntry rankedBibEntry2
-                ) ->
+        rankedBibEntries.sort((RankedBibEntry rankedBibEntry1, RankedBibEntry rankedBibEntry2) ->
             rankedBibEntry1.rank.compareTo(rankedBibEntry2.rank)
         );
         List<BibEntry> bibEntries = rankedBibEntries
@@ -148,9 +139,7 @@ private void parse(BufferedReader input) throws IOException {
         recommendationsHeading = label.getString("label-text");
         recommendationsDescription = label.getString("label-description");
         recommendationSetId =
-            recommendationSetJson
-                .getBigInteger("recommendation_set_id")
-                .toString();
+            recommendationSetJson.getBigInteger("recommendation_set_id").toString();
     }
 
     /**
@@ -169,25 +158,16 @@ private RankedBibEntry populateBibEntry(JSONObject recommendation) {
         String title = isRecommendationFieldPresent(recommendation, "title")
             ? recommendation.getString("title")
             : "";
-        String year = isRecommendationFieldPresent(
-                recommendation,
-                "published_year"
-            )
+        String year = isRecommendationFieldPresent(recommendation, "published_year")
             ? Integer.toString(recommendation.getInt("published_year"))
             : "";
-        String journal = isRecommendationFieldPresent(
-                recommendation,
-                "published_in"
-            )
+        String journal = isRecommendationFieldPresent(recommendation, "published_in")
             ? recommendation.getString("published_in")
             : "";
         String url = isRecommendationFieldPresent(recommendation, "url")
             ? recommendation.getString("url")
             : "";
-        Integer rank = isRecommendationFieldPresent(
-                recommendation,
-                "recommendation_id"
-            )
+        Integer rank = isRecommendationFieldPresent(recommendation, "recommendation_id")
             ? recommendation.getInt("recommendation_id")
             : 100;
 
@@ -201,10 +181,7 @@ private RankedBibEntry populateBibEntry(JSONObject recommendation) {
         return new RankedBibEntry(current, rank);
     }
 
-    private Boolean isRecommendationFieldPresent(
-        JSONObject recommendation,
-        String field
-    ) {
+    private Boolean isRecommendationFieldPresent(JSONObject recommendation, String field) {
         return recommendation.has(field) && !recommendation.isNull(field);
     }
 
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 8a3e99294c7..cd9682ddaf6 100644
--- a/src/main/java/org/jabref/logic/importer/fileformat/MsBibImporter.java
+++ b/src/main/java/org/jabref/logic/importer/fileformat/MsBibImporter.java
@@ -23,17 +23,13 @@
  */
 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 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";
 
     @Override
-    public boolean isRecognizedFormat(BufferedReader reader)
-        throws IOException {
+    public boolean isRecognizedFormat(BufferedReader reader) throws IOException {
         Objects.requireNonNull(reader);
 
         /*
@@ -43,27 +39,22 @@ public boolean isRecognizedFormat(BufferedReader reader)
          */
         Document docin;
         try {
-            DocumentBuilder dbuild = makeSafeDocBuilderFactory(
-                DocumentBuilderFactory.newInstance()
-            )
+            DocumentBuilder dbuild = makeSafeDocBuilderFactory(DocumentBuilderFactory.newInstance())
                 .newDocumentBuilder();
             dbuild.setErrorHandler(
                 new ErrorHandler() {
                     @Override
-                    public void warning(SAXParseException exception)
-                        throws SAXException {
+                    public void warning(SAXParseException exception) throws SAXException {
                         // ignore warnings
                     }
 
                     @Override
-                    public void fatalError(SAXParseException exception)
-                        throws SAXException {
+                    public void fatalError(SAXParseException exception) throws SAXException {
                         throw exception;
                     }
 
                     @Override
-                    public void error(SAXParseException exception)
-                        throws SAXException {
+                    public void error(SAXParseException exception) throws SAXException {
                         throw exception;
                     }
                 }
@@ -73,15 +64,11 @@ public void error(SAXParseException exception)
         } catch (Exception e) {
             return false;
         }
-        return (
-            (docin == null) ||
-            docin.getDocumentElement().getTagName().contains("Sources")
-        );
+        return ((docin == null) || docin.getDocumentElement().getTagName().contains("Sources"));
     }
 
     @Override
-    public ParserResult importDatabase(BufferedReader reader)
-        throws IOException {
+    public ParserResult importDatabase(BufferedReader reader) throws IOException {
         Objects.requireNonNull(reader);
 
         MSBibDatabase dbase = new MSBibDatabase();
@@ -110,9 +97,7 @@ public String getDescription() {
      * @param dBuild | DocumentBuilderFactory to be made XXE safe.
      * @return If supported, XXE safe DocumentBuilderFactory. Else, returns original builder given
      */
-    private DocumentBuilderFactory makeSafeDocBuilderFactory(
-        DocumentBuilderFactory dBuild
-    ) {
+    private DocumentBuilderFactory makeSafeDocBuilderFactory(DocumentBuilderFactory dBuild) {
         String feature = null;
 
         try {
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 a27456b7ce2..79d3e942ea3 100644
--- a/src/main/java/org/jabref/logic/importer/fileformat/OvidImporter.java
+++ b/src/main/java/org/jabref/logic/importer/fileformat/OvidImporter.java
@@ -47,9 +47,7 @@ public class OvidImporter extends Importer {
     );
 
     private static final String OVID_PATTERN_STRING = "<[0-9]+>";
-    private static final Pattern OVID_PATTERN = Pattern.compile(
-        OVID_PATTERN_STRING
-    );
+    private static final Pattern OVID_PATTERN = Pattern.compile(OVID_PATTERN_STRING);
 
     private static final int MAX_ITEMS = 50;
 
@@ -69,8 +67,7 @@ public String getDescription() {
     }
 
     @Override
-    public boolean isRecognizedFormat(BufferedReader reader)
-        throws IOException {
+    public boolean isRecognizedFormat(BufferedReader reader) throws IOException {
         String str;
         int i = 0;
         while (((str = reader.readLine()) != null) && (i < MAX_ITEMS)) {
@@ -83,8 +80,7 @@ public boolean isRecognizedFormat(BufferedReader reader)
     }
 
     @Override
-    public ParserResult importDatabase(BufferedReader reader)
-        throws IOException {
+    public ParserResult importDatabase(BufferedReader reader) throws IOException {
         List<BibEntry> bibitems = new ArrayList<>();
         StringBuilder sb = new StringBuilder();
         String line;
@@ -129,12 +125,7 @@ public ParserResult importDatabase(BufferedReader reader)
                     h.put(new UnknownField("chaptertitle"), content);
                 } else if (fieldName.startsWith("Source")) {
                     Matcher matcher;
-                    if (
-                        (matcher =
-                                OvidImporter.OVID_SOURCE_PATTERN.matcher(
-                                    content
-                                )).find()
-                    ) {
+                    if ((matcher = OvidImporter.OVID_SOURCE_PATTERN.matcher(content)).find()) {
                         h.put(StandardField.JOURNAL, matcher.group(1));
                         h.put(StandardField.VOLUME, matcher.group(2));
                         h.put(StandardField.ISSUE, matcher.group(3));
@@ -142,19 +133,14 @@ public ParserResult importDatabase(BufferedReader reader)
                         h.put(StandardField.YEAR, matcher.group(5));
                     } else if (
                         (matcher =
-                                OvidImporter.OVID_SOURCE_PATTERN_NO_ISSUE.matcher(
-                                    content
-                                )).find()
+                                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()
+                        (matcher = OvidImporter.OVID_SOURCE_PATTERN_2.matcher(content)).find()
                     ) {
                         h.put(StandardField.JOURNAL, matcher.group(1));
                         h.put(StandardField.VOLUME, matcher.group(2));
@@ -163,26 +149,15 @@ public ParserResult importDatabase(BufferedReader reader)
                         h.put(StandardField.YEAR, matcher.group(5));
                         h.put(StandardField.PAGES, matcher.group(6));
                     } else if (
-                        (matcher =
-                                OvidImporter.INCOLLECTION_PATTERN.matcher(
-                                    content
-                                )).find()
+                        (matcher = OvidImporter.INCOLLECTION_PATTERN.matcher(content)).find()
                     ) {
-                        h.put(
-                            StandardField.EDITOR,
-                            matcher.group(1).replace(" (Ed)", "")
-                        );
+                        h.put(StandardField.EDITOR, matcher.group(1).replace(" (Ed)", ""));
                         h.put(StandardField.YEAR, matcher.group(2));
                         h.put(StandardField.BOOKTITLE, matcher.group(3));
                         h.put(StandardField.PAGES, matcher.group(4));
                         h.put(StandardField.ADDRESS, matcher.group(5));
                         h.put(StandardField.PUBLISHER, matcher.group(6));
-                    } else if (
-                        (matcher =
-                                OvidImporter.BOOK_PATTERN.matcher(
-                                    content
-                                )).find()
-                    ) {
+                    } else if ((matcher = OvidImporter.BOOK_PATTERN.matcher(content)).find()) {
                         h.put(StandardField.YEAR, matcher.group(1));
                         h.put(StandardField.PAGES, matcher.group(2));
                         h.put(StandardField.ADDRESS, matcher.group(3));
@@ -190,10 +165,7 @@ public ParserResult importDatabase(BufferedReader reader)
                     }
                     // Add double hyphens to page ranges:
                     if (h.get(StandardField.PAGES) != null) {
-                        h.put(
-                            StandardField.PAGES,
-                            h.get(StandardField.PAGES).replace("-", "--")
-                        );
+                        h.put(StandardField.PAGES, h.get(StandardField.PAGES).replace("-", "--"));
                     }
                 } else if ("Abstract".equals(fieldName)) {
                     h.put(StandardField.ABSTRACT, content);
@@ -247,10 +219,7 @@ public ParserResult importDatabase(BufferedReader reader)
                 // This means we have an "incollection" entry.
                 entryType = StandardEntryType.InCollection;
                 // Move the "chaptertitle" to just "title":
-                h.put(
-                    StandardField.TITLE,
-                    h.remove(new UnknownField("chaptertitle"))
-                );
+                h.put(StandardField.TITLE, h.remove(new UnknownField("chaptertitle")));
             }
             BibEntry b = new BibEntry(entryType);
             b.setField(h);
@@ -270,10 +239,7 @@ public ParserResult importDatabase(BufferedReader reader)
     private static String fixNames(String content) {
         String names;
         if (content.indexOf(';') > 0) { // LN FN; [LN FN;]*
-            names =
-                content
-                    .replaceAll("[^\\.A-Za-z,;\\- ]", "")
-                    .replace(";", " and");
+            names = content.replaceAll("[^\\.A-Za-z,;\\- ]", "").replace(";", " and");
         } else if (content.indexOf("  ") > 0) {
             String[] sNames = content.split(" {2}");
             StringBuilder sb = new StringBuilder();
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 bf5aaa2a49e..0e7705f95f4 100644
--- a/src/main/java/org/jabref/logic/importer/fileformat/PdfContentImporter.java
+++ b/src/main/java/org/jabref/logic/importer/fileformat/PdfContentImporter.java
@@ -35,9 +35,7 @@
  */
 public class PdfContentImporter extends Importer {
 
-    private static final Pattern YEAR_EXTRACT_PATTERN = Pattern.compile(
-        "\\d{4}"
-    );
+    private static final Pattern YEAR_EXTRACT_PATTERN = Pattern.compile("\\d{4}");
     // input lines into several lines
     private String[] lines;
     // current index in lines
@@ -91,10 +89,7 @@ private String streamlineNames(String names) {
                     if (posAnd >= 0) {
                         String nameBefore = curName.substring(0, posAnd);
                         // cannot be first name as "," is contained in the string
-                        res =
-                            res
-                                .concat(" and ")
-                                .concat(removeNonLettersAtEnd(nameBefore));
+                        res = res.concat(" and ").concat(removeNonLettersAtEnd(nameBefore));
                         curName = curName.substring(posAnd + 5);
                     }
                 }
@@ -185,8 +180,7 @@ public boolean isRecognizedFormat(BufferedReader input) throws IOException {
     }
 
     @Override
-    public ParserResult importDatabase(BufferedReader reader)
-        throws IOException {
+    public ParserResult importDatabase(BufferedReader reader) throws IOException {
         Objects.requireNonNull(reader);
         throw new UnsupportedOperationException(
             "PdfContentImporter does not support importDatabase(BufferedReader reader)." +
@@ -206,35 +200,23 @@ public ParserResult importDatabase(String data) throws IOException {
     @Override
     public ParserResult importDatabase(Path filePath) {
         final ArrayList<BibEntry> result = new ArrayList<>(1);
-        try (
-            PDDocument document = new XmpUtilReader()
-                .loadWithAutomaticDecryption(filePath)
-        ) {
+        try (PDDocument document = new XmpUtilReader().loadWithAutomaticDecryption(filePath)) {
             String firstPageContents = getFirstPageContents(document);
-            Optional<BibEntry> entry = getEntryFromPDFContent(
-                firstPageContents,
-                OS.NEWLINE
-            );
+            Optional<BibEntry> entry = getEntryFromPDFContent(firstPageContents, OS.NEWLINE);
             entry.ifPresent(result::add);
         } catch (EncryptedPdfsNotSupportedException e) {
-            return ParserResult.fromErrorMessage(
-                Localization.lang("Decryption not supported.")
-            );
+            return ParserResult.fromErrorMessage(Localization.lang("Decryption not supported."));
         } catch (IOException exception) {
             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);
     }
 
     // make this method package visible so we can test it
-    Optional<BibEntry> getEntryFromPDFContent(
-        String firstpageContents,
-        String lineSeparator
-    ) {
+    Optional<BibEntry> getEntryFromPDFContent(String firstpageContents, String lineSeparator) {
         // idea: split[] contains the different lines
         // blocks are separated by empty lines
         // treat each block
@@ -328,9 +310,7 @@ Optional<BibEntry> getEntryFromPDFContent(
             curString = lines[lineIndex];
             if (
                 (curString.length() >= "Abstract".length()) &&
-                "Abstract".equalsIgnoreCase(
-                        curString.substring(0, "Abstract".length())
-                    )
+                "Abstract".equalsIgnoreCase(curString.substring(0, "Abstract".length()))
             ) {
                 if (curString.length() == "Abstract".length()) {
                     // only word "abstract" found -- skip line
@@ -345,29 +325,21 @@ Optional<BibEntry> getEntryFromPDFContent(
                 lineIndex++;
                 // 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());
+                while ((lineIndex < lines.length) && !"".equals(lines[lineIndex])) {
+                    curString = curString.concat(lines[lineIndex]).concat(System.lineSeparator());
                     lineIndex++;
                 }
                 abstractT = curString.trim();
                 lineIndex++;
             } else if (
                 (curString.length() >= "Keywords".length()) &&
-                "Keywords".equalsIgnoreCase(
-                        curString.substring(0, "Keywords".length())
-                    )
+                "Keywords".equalsIgnoreCase(curString.substring(0, "Keywords".length()))
             ) {
                 if (curString.length() == "Keywords".length()) {
                     // only word "Keywords" found -- skip line
                     curString = "";
                 } else {
-                    curString =
-                        curString.substring("Keywords".length() + 1).trim();
+                    curString = curString.substring("Keywords".length() + 1).trim();
                 }
                 lineIndex++;
                 fillCurStringWithNonEmptyLines();
@@ -474,9 +446,7 @@ Optional<BibEntry> getEntryFromPDFContent(
                             // before the price, the ISSN is stated
                             // skip that
                             pos -= 2;
-                            while (
-                                (pos >= 0) && (curString.charAt(pos) != ' ')
-                            ) {
+                            while ((pos >= 0) && (curString.charAt(pos) != ' ')) {
                                 pos--;
                             }
                             if (pos > 0) {
@@ -535,8 +505,7 @@ Optional<BibEntry> getEntryFromPDFContent(
         return Optional.of(entry);
     }
 
-    private String getFirstPageContents(PDDocument document)
-        throws IOException {
+    private String getFirstPageContents(PDDocument document) throws IOException {
         PDFTextStripper stripper = new PDFTextStripper();
 
         stripper.setStartPage(1);
@@ -569,9 +538,7 @@ private void extractYear() {
      * proceed to next non-empty line
      */
     private void proceedToNextNonEmptyLine() {
-        while (
-            (lineIndex < lines.length) && lines[lineIndex].trim().isEmpty()
-        ) {
+        while ((lineIndex < lines.length) && lines[lineIndex].trim().isEmpty()) {
             lineIndex++;
         }
     }
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 91687f22857..effe6e30bc4 100644
--- a/src/main/java/org/jabref/logic/importer/fileformat/PdfEmbeddedBibFileImporter.java
+++ b/src/main/java/org/jabref/logic/importer/fileformat/PdfEmbeddedBibFileImporter.java
@@ -34,9 +34,7 @@ public class PdfEmbeddedBibFileImporter extends Importer {
 
     private final BibtexParser bibtexParser;
 
-    public PdfEmbeddedBibFileImporter(
-        ImportFormatPreferences importFormatPreferences
-    ) {
+    public PdfEmbeddedBibFileImporter(ImportFormatPreferences importFormatPreferences) {
         bibtexParser = new BibtexParser(importFormatPreferences);
     }
 
@@ -46,8 +44,7 @@ public boolean isRecognizedFormat(BufferedReader input) throws IOException {
     }
 
     @Override
-    public ParserResult importDatabase(BufferedReader reader)
-        throws IOException {
+    public ParserResult importDatabase(BufferedReader reader) throws IOException {
         Objects.requireNonNull(reader);
         throw new UnsupportedOperationException(
             "PdfEmbeddedBibFileImporter does not support importDatabase(BufferedReader reader)." +
@@ -66,15 +63,10 @@ public ParserResult importDatabase(String data) throws IOException {
 
     @Override
     public ParserResult importDatabase(Path filePath) {
-        try (
-            PDDocument document = new XmpUtilReader()
-                .loadWithAutomaticDecryption(filePath)
-        ) {
+        try (PDDocument document = new XmpUtilReader().loadWithAutomaticDecryption(filePath)) {
             return new ParserResult(getEmbeddedBibFileEntries(document));
         } catch (EncryptedPdfsNotSupportedException e) {
-            return ParserResult.fromErrorMessage(
-                Localization.lang("Decryption not supported.")
-            );
+            return ParserResult.fromErrorMessage(Localization.lang("Decryption not supported."));
         } catch (IOException | ParseException e) {
             return ParserResult.fromError(e);
         }
@@ -88,28 +80,19 @@ public ParserResult importDatabase(Path filePath) {
     private List<BibEntry> getEmbeddedBibFileEntries(PDDocument document)
         throws IOException, ParseException {
         List<BibEntry> allParsedEntries = new ArrayList<>();
-        PDDocumentNameDictionary nameDictionary = document
-            .getDocumentCatalog()
-            .getNames();
+        PDDocumentNameDictionary nameDictionary = document.getDocumentCatalog().getNames();
         if (nameDictionary != null) {
-            PDEmbeddedFilesNameTreeNode efTree =
-                nameDictionary.getEmbeddedFiles();
+            PDEmbeddedFilesNameTreeNode efTree = nameDictionary.getEmbeddedFiles();
             if (efTree != null) {
-                Map<String, PDComplexFileSpecification> names =
-                    efTree.getNames();
+                Map<String, PDComplexFileSpecification> names = efTree.getNames();
                 if (names != null) {
                     allParsedEntries.addAll(extractAndParseFiles(names));
                 } else {
-                    List<PDNameTreeNode<PDComplexFileSpecification>> kids =
-                        efTree.getKids();
+                    List<PDNameTreeNode<PDComplexFileSpecification>> kids = efTree.getKids();
                     if (kids != null) {
-                        for (PDNameTreeNode<
-                            PDComplexFileSpecification
-                        > node : kids) {
+                        for (PDNameTreeNode<PDComplexFileSpecification> node : kids) {
                             names = node.getNames();
-                            allParsedEntries.addAll(
-                                extractAndParseFiles(names)
-                            );
+                            allParsedEntries.addAll(extractAndParseFiles(names));
                         }
                     }
                 }
@@ -118,36 +101,25 @@ private List<BibEntry> getEmbeddedBibFileEntries(PDDocument document)
         // extract files from annotations
         for (PDPage page : document.getPages()) {
             for (PDAnnotation annotation : page.getAnnotations()) {
-                if (
-                    annotation instanceof
-                    PDAnnotationFileAttachment annotationFileAttachment
-                ) {
+                if (annotation instanceof PDAnnotationFileAttachment annotationFileAttachment) {
                     PDComplexFileSpecification fileSpec =
                         (PDComplexFileSpecification) annotationFileAttachment.getFile();
-                    allParsedEntries.addAll(
-                        extractAndParseFile(getEmbeddedFile(fileSpec))
-                    );
+                    allParsedEntries.addAll(extractAndParseFile(getEmbeddedFile(fileSpec)));
                 }
             }
         }
         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()) {
+        for (Map.Entry<String, PDComplexFileSpecification> entry : names.entrySet()) {
             String filename = entry.getKey();
             FileUtil.getFileExtension(filename);
             if (FileUtil.isBibFile(Path.of(filename))) {
                 PDComplexFileSpecification fileSpec = entry.getValue();
-                allParsedEntries.addAll(
-                    extractAndParseFile(getEmbeddedFile(fileSpec))
-                );
+                allParsedEntries.addAll(extractAndParseFile(getEmbeddedFile(fileSpec)));
             }
         }
         return allParsedEntries;
@@ -158,9 +130,7 @@ private List<BibEntry> extractAndParseFile(PDEmbeddedFile embeddedFile)
         return bibtexParser.parseEntries(embeddedFile.createInputStream());
     }
 
-    private static PDEmbeddedFile getEmbeddedFile(
-        PDComplexFileSpecification fileSpec
-    ) {
+    private static PDEmbeddedFile getEmbeddedFile(PDComplexFileSpecification fileSpec) {
         // search for the first available alternative of the embedded file
         PDEmbeddedFile embeddedFile = null;
         if (fileSpec != null) {
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 de4ddc44512..fb130b2e67e 100644
--- a/src/main/java/org/jabref/logic/importer/fileformat/PdfGrobidImporter.java
+++ b/src/main/java/org/jabref/logic/importer/fileformat/PdfGrobidImporter.java
@@ -24,8 +24,7 @@ public class PdfGrobidImporter extends Importer {
     private final ImportFormatPreferences importFormatPreferences;
 
     public PdfGrobidImporter(ImportFormatPreferences importFormatPreferences) {
-        this.grobidService =
-            new GrobidService(importFormatPreferences.grobidPreferences());
+        this.grobidService = new GrobidService(importFormatPreferences.grobidPreferences());
         this.importFormatPreferences = importFormatPreferences;
     }
 
@@ -40,8 +39,7 @@ public StandardFileType getFileType() {
     }
 
     @Override
-    public ParserResult importDatabase(BufferedReader reader)
-        throws IOException {
+    public ParserResult importDatabase(BufferedReader reader) throws IOException {
         Objects.requireNonNull(reader);
         throw new UnsupportedOperationException(
             "PdfGrobidImporter does not support importDatabase(BufferedReader reader)." +
@@ -62,14 +60,9 @@ public ParserResult importDatabase(String data) throws IOException {
     public ParserResult importDatabase(Path filePath) {
         Objects.requireNonNull(filePath);
         try {
-            List<BibEntry> result = grobidService.processPDF(
-                filePath,
-                importFormatPreferences
-            );
+            List<BibEntry> result = grobidService.processPDF(filePath, importFormatPreferences);
             result.forEach(entry ->
-                entry.addFile(
-                    new LinkedFile("", filePath.toAbsolutePath(), "PDF")
-                )
+                entry.addFile(new LinkedFile("", filePath.toAbsolutePath(), "PDF"))
             );
             return new ParserResult(result);
         } catch (Exception exception) {
@@ -78,8 +71,7 @@ public ParserResult importDatabase(Path filePath) {
     }
 
     @Override
-    public boolean isRecognizedFormat(BufferedReader reader)
-        throws IOException {
+    public boolean isRecognizedFormat(BufferedReader reader) throws IOException {
         Objects.requireNonNull(reader);
         return false;
     }
@@ -92,9 +84,7 @@ public boolean isRecognizedFormat(BufferedReader reader)
     public boolean isRecognizedFormat(Path filePath) throws IOException {
         Objects.requireNonNull(filePath);
         Optional<String> extension = FileUtil.getFileExtension(filePath);
-        return extension
-            .filter(s -> getFileType().getExtensions().contains(s))
-            .isPresent();
+        return extension.filter(s -> getFileType().getExtensions().contains(s)).isPresent();
     }
 
     @Override
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 77bdbfd2c8c..287fa32a672 100644
--- a/src/main/java/org/jabref/logic/importer/fileformat/PdfMergeMetadataImporter.java
+++ b/src/main/java/org/jabref/logic/importer/fileformat/PdfMergeMetadataImporter.java
@@ -32,32 +32,20 @@
  */
 public class PdfMergeMetadataImporter extends Importer {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(
-        PdfMergeMetadataImporter.class
-    );
+    private static final Logger LOGGER = LoggerFactory.getLogger(PdfMergeMetadataImporter.class);
 
     private final List<Importer> metadataImporters;
     private final ImportFormatPreferences importFormatPreferences;
 
-    public PdfMergeMetadataImporter(
-        ImportFormatPreferences importFormatPreferences
-    ) {
+    public PdfMergeMetadataImporter(ImportFormatPreferences importFormatPreferences) {
         this.importFormatPreferences = importFormatPreferences;
         this.metadataImporters = new ArrayList<>();
-        this.metadataImporters.add(
-                new PdfVerbatimBibTextImporter(importFormatPreferences)
-            );
-        this.metadataImporters.add(
-                new PdfEmbeddedBibFileImporter(importFormatPreferences)
-            );
+        this.metadataImporters.add(new PdfVerbatimBibTextImporter(importFormatPreferences));
+        this.metadataImporters.add(new PdfEmbeddedBibFileImporter(importFormatPreferences));
         if (importFormatPreferences.grobidPreferences().isGrobidEnabled()) {
-            this.metadataImporters.add(
-                    new PdfGrobidImporter(importFormatPreferences)
-                );
+            this.metadataImporters.add(new PdfGrobidImporter(importFormatPreferences));
         }
-        this.metadataImporters.add(
-                new PdfXmpImporter(importFormatPreferences.xmpPreferences())
-            );
+        this.metadataImporters.add(new PdfXmpImporter(importFormatPreferences.xmpPreferences()));
         this.metadataImporters.add(new PdfContentImporter());
     }
 
@@ -67,8 +55,7 @@ public boolean isRecognizedFormat(BufferedReader input) throws IOException {
     }
 
     @Override
-    public ParserResult importDatabase(BufferedReader reader)
-        throws IOException {
+    public ParserResult importDatabase(BufferedReader reader) throws IOException {
         Objects.requireNonNull(reader);
         throw new UnsupportedOperationException(
             "PdfMergeMetadataImporter does not support importDatabase(BufferedReader reader)." +
@@ -107,9 +94,7 @@ public ParserResult importDatabase(Path filePath) throws IOException {
             if (candidate.hasField(StandardField.DOI)) {
                 try {
                     new DoiFetcher(importFormatPreferences)
-                        .performSearchById(
-                            candidate.getField(StandardField.DOI).get()
-                        )
+                        .performSearchById(candidate.getField(StandardField.DOI).get())
                         .ifPresent(fetchedCandidates::add);
                 } catch (FetcherException e) {
                     LOGGER.error(
@@ -124,9 +109,7 @@ public ParserResult importDatabase(Path filePath) throws IOException {
                     new IsbnFetcher(importFormatPreferences)
                         // .addRetryFetcher(new EbookDeIsbnFetcher(importFormatPreferences))
                         // .addRetryFetcher(new DoiToBibtexConverterComIsbnFetcher(importFormatPreferences))
-                        .performSearchById(
-                            candidate.getField(StandardField.ISBN).get()
-                        )
+                        .performSearchById(candidate.getField(StandardField.ISBN).get())
                         .ifPresent(fetchedCandidates::add);
                 } catch (FetcherException e) {
                     LOGGER.error(
@@ -144,9 +127,7 @@ public ParserResult importDatabase(Path filePath) throws IOException {
                 entry.setType(candidate.getType());
             }
             Set<Field> presentFields = entry.getFields();
-            for (Map.Entry<Field, String> fieldEntry : candidate
-                .getFieldMap()
-                .entrySet()) {
+            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.
                 // Nevertheless, retain online links.
                 if (
@@ -165,9 +146,7 @@ public ParserResult importDatabase(Path filePath) throws IOException {
             }
         }
 
-        entry.addFile(
-            new LinkedFile("", filePath, StandardFileType.PDF.getName())
-        );
+        entry.addFile(new LinkedFile("", filePath, StandardFileType.PDF.getName()));
         return new ParserResult(List.of(entry));
     }
 
@@ -207,13 +186,9 @@ public EntryBasedFetcherWrapper(
         }
 
         @Override
-        public List<BibEntry> performSearch(BibEntry entry)
-            throws FetcherException {
+        public List<BibEntry> performSearch(BibEntry entry) throws FetcherException {
             for (LinkedFile file : entry.getFiles()) {
-                Optional<Path> filePath = file.findIn(
-                    databaseContext,
-                    filePreferences
-                );
+                Optional<Path> filePath = file.findIn(databaseContext, filePreferences);
                 if (filePath.isPresent()) {
                     try {
                         ParserResult result = importDatabase(filePath.get());
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 a0bf792f131..7932bc3816d 100644
--- a/src/main/java/org/jabref/logic/importer/fileformat/PdfVerbatimBibTextImporter.java
+++ b/src/main/java/org/jabref/logic/importer/fileformat/PdfVerbatimBibTextImporter.java
@@ -26,9 +26,7 @@ public class PdfVerbatimBibTextImporter extends Importer {
 
     private final ImportFormatPreferences importFormatPreferences;
 
-    public PdfVerbatimBibTextImporter(
-        ImportFormatPreferences importFormatPreferences
-    ) {
+    public PdfVerbatimBibTextImporter(ImportFormatPreferences importFormatPreferences) {
         this.importFormatPreferences = importFormatPreferences;
     }
 
@@ -38,8 +36,7 @@ public boolean isRecognizedFormat(BufferedReader input) throws IOException {
     }
 
     @Override
-    public ParserResult importDatabase(BufferedReader reader)
-        throws IOException {
+    public ParserResult importDatabase(BufferedReader reader) throws IOException {
         Objects.requireNonNull(reader);
         throw new UnsupportedOperationException(
             "PdfVerbatimBibTextImporter does not support importDatabase(BufferedReader reader)." +
@@ -59,30 +56,23 @@ public ParserResult importDatabase(String data) throws IOException {
     @Override
     public ParserResult importDatabase(Path filePath) {
         List<BibEntry> result;
-        try (
-            PDDocument document = new XmpUtilReader()
-                .loadWithAutomaticDecryption(filePath)
-        ) {
+        try (PDDocument document = new XmpUtilReader().loadWithAutomaticDecryption(filePath)) {
             String firstPageContents = getFirstPageContents(document);
             BibtexParser parser = new BibtexParser(importFormatPreferences);
             result = parser.parseEntries(firstPageContents);
         } catch (EncryptedPdfsNotSupportedException e) {
-            return ParserResult.fromErrorMessage(
-                Localization.lang("Decryption not supported.")
-            );
+            return ParserResult.fromErrorMessage(Localization.lang("Decryption not supported."));
         } catch (IOException | ParseException e) {
             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);
     }
 
-    private String getFirstPageContents(PDDocument document)
-        throws IOException {
+    private String getFirstPageContents(PDDocument document) throws IOException {
         PDFTextStripper stripper = new PDFTextStripper();
 
         stripper.setStartPage(1);
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 4cc20836b53..1b53247db97 100644
--- a/src/main/java/org/jabref/logic/importer/fileformat/PdfXmpImporter.java
+++ b/src/main/java/org/jabref/logic/importer/fileformat/PdfXmpImporter.java
@@ -34,8 +34,7 @@ public StandardFileType getFileType() {
     }
 
     @Override
-    public ParserResult importDatabase(BufferedReader reader)
-        throws IOException {
+    public ParserResult importDatabase(BufferedReader reader) throws IOException {
         Objects.requireNonNull(reader);
         throw new UnsupportedOperationException(
             "PdfXmpImporter does not support importDatabase(BufferedReader reader)." +
@@ -56,17 +55,14 @@ public ParserResult importDatabase(String data) throws IOException {
     public ParserResult importDatabase(Path filePath) {
         Objects.requireNonNull(filePath);
         try {
-            return new ParserResult(
-                new XmpUtilReader().readXmp(filePath, xmpPreferences)
-            );
+            return new ParserResult(new XmpUtilReader().readXmp(filePath, xmpPreferences));
         } catch (IOException exception) {
             return ParserResult.fromError(exception);
         }
     }
 
     @Override
-    public boolean isRecognizedFormat(BufferedReader reader)
-        throws IOException {
+    public boolean isRecognizedFormat(BufferedReader reader) throws IOException {
         Objects.requireNonNull(reader);
         return false;
     }
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 fb74767071a..4921ceb2e9f 100644
--- a/src/main/java/org/jabref/logic/importer/fileformat/PicaXmlParser.java
+++ b/src/main/java/org/jabref/logic/importer/fileformat/PicaXmlParser.java
@@ -25,22 +25,15 @@
 
 public class PicaXmlParser implements Parser {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(
-        PicaXmlParser.class
-    );
+    private static final Logger LOGGER = LoggerFactory.getLogger(PicaXmlParser.class);
 
     @Override
-    public List<BibEntry> parseEntries(InputStream inputStream)
-        throws ParseException {
+    public List<BibEntry> parseEntries(InputStream inputStream) throws ParseException {
         try {
-            DocumentBuilder dbuild = DocumentBuilderFactory
-                .newInstance()
-                .newDocumentBuilder();
+            DocumentBuilder dbuild = DocumentBuilderFactory.newInstance().newDocumentBuilder();
             Document content = dbuild.parse(inputStream);
             return this.parseEntries(content);
-        } catch (
-            ParserConfigurationException | SAXException | IOException exception
-        ) {
+        } catch (ParserConfigurationException | SAXException | IOException exception) {
             throw new ParseException(exception);
         }
     }
@@ -51,9 +44,7 @@ private List<BibEntry> parseEntries(Document content) {
         // used for creating test cases
         // XMLUtil.printDocument(content);
 
-        Element root = (Element) content
-            .getElementsByTagName("zs:searchRetrieveResponse")
-            .item(0);
+        Element root = (Element) content.getElementsByTagName("zs:searchRetrieveResponse").item(0);
         Element srwrecords = getChild("zs:records", root);
         if (srwrecords == null) {
             // no records found -> return empty list
@@ -294,9 +285,7 @@ private BibEntry parseEntry(Element e) {
             }
 
             // Wenn eine Verlagsdiss vorliegt
-            if (
-                entryType.equals(StandardEntryType.PhdThesis) && (isbn != null)
-            ) {
+            if (entryType.equals(StandardEntryType.PhdThesis) && (isbn != null)) {
                 entryType = StandardEntryType.Book;
             }
 
@@ -443,9 +432,7 @@ private BibEntry parseEntry(Element e) {
 
         if ("article".equals(entryType.getName()) && (journal != null)) {
             result.setField(StandardField.JOURNAL, journal);
-        } else if (
-            "incollection".equals(entryType.getName()) && (booktitle != null)
-        ) {
+        } else if ("incollection".equals(entryType.getName()) && (booktitle != null)) {
             result.setField(StandardField.BOOKTITLE, booktitle);
         }
 
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 b61398c30f7..74d0bca6f30 100644
--- a/src/main/java/org/jabref/logic/importer/fileformat/RepecNepImporter.java
+++ b/src/main/java/org/jabref/logic/importer/fileformat/RepecNepImporter.java
@@ -138,9 +138,7 @@
  */
 public class RepecNepImporter extends Importer {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(
-        RepecNepImporter.class
-    );
+    private static final Logger LOGGER = LoggerFactory.getLogger(RepecNepImporter.class);
 
     private static final Collection<String> RECOGNIZED_FIELDS = Arrays.asList(
         "Keywords",
@@ -180,8 +178,7 @@ public String getDescription() {
     }
 
     @Override
-    public boolean isRecognizedFormat(BufferedReader reader)
-        throws IOException {
+    public boolean isRecognizedFormat(BufferedReader reader) throws IOException {
         // read the first couple of lines
         // NEP message usually contain the String 'NEP: New Economics Papers'
         // or, they are from nep.repec.org
@@ -200,8 +197,7 @@ public boolean isRecognizedFormat(BufferedReader reader)
     private boolean startsWithKeyword(Collection<String> keywords) {
         boolean result = this.lastLine.indexOf(':') >= 1;
         if (result) {
-            String possibleKeyword =
-                this.lastLine.substring(0, this.lastLine.indexOf(':'));
+            String possibleKeyword = this.lastLine.substring(0, this.lastLine.indexOf(':'));
             result = keywords.contains(possibleKeyword);
         }
         return result;
@@ -237,9 +233,7 @@ private String readMultipleLines(BufferedReader in) throws IOException {
             !isStartOfWorkingPaper()
         ) {
             result.append(
-                this.lastLine.isEmpty()
-                    ? this.lastLine.trim()
-                    : " " + this.lastLine.trim()
+                this.lastLine.isEmpty() ? this.lastLine.trim() : " " + this.lastLine.trim()
             );
             readLine(in);
         }
@@ -251,8 +245,7 @@ private String readMultipleLines(BufferedReader in) throws IOException {
      *
      * @throws IOException in case of error
      */
-    private void parseTitleString(BibEntry be, BufferedReader in)
-        throws IOException {
+    private void parseTitleString(BibEntry be, BufferedReader in) throws IOException {
         // skip article number
         this.lastLine = this.lastLine.substring(this.lastLine.indexOf('.') + 1);
         be.setField(StandardField.TITLE, readMultipleLines(in));
@@ -263,8 +256,7 @@ private void parseTitleString(BibEntry be, BufferedReader in)
      *
      * @throws IOException in case of error
      */
-    private void parseAuthors(BibEntry be, BufferedReader in)
-        throws IOException {
+    private void parseAuthors(BibEntry be, BufferedReader in) throws IOException {
         // read authors and institutions
         List<String> authors = new ArrayList<>();
         StringBuilder institutions = new StringBuilder();
@@ -278,16 +270,13 @@ private void parseAuthors(BibEntry be, BufferedReader in)
             StringBuilder institution = new StringBuilder();
             boolean institutionDone;
             if (this.lastLine.indexOf('(') >= 0) {
-                author =
-                    this.lastLine.substring(0, this.lastLine.indexOf('('))
-                        .trim();
+                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.indexOf('(') + 1))
                                 ? this.lastLine.indexOf(')')
                                 : this.lastLine.length()
                         )
@@ -304,9 +293,7 @@ private void parseAuthors(BibEntry be, BufferedReader in)
                 institution.append(
                     this.lastLine.substring(
                             0,
-                            institutionDone
-                                ? this.lastLine.indexOf(')')
-                                : this.lastLine.length()
+                            institutionDone ? this.lastLine.indexOf(')') : this.lastLine.length()
                         )
                         .trim()
                 );
@@ -337,8 +324,7 @@ private void parseAuthors(BibEntry be, BufferedReader in)
      *
      * @throws IOException in case of error
      */
-    private void parseAbstract(BibEntry be, BufferedReader in)
-        throws IOException {
+    private void parseAbstract(BibEntry be, BufferedReader in) throws IOException {
         String theabstract = readMultipleLines(in);
 
         if (!theabstract.isEmpty()) {
@@ -364,8 +350,7 @@ private void parseAdditionalFields(
         while (
             (this.lastLine != null) &&
             !isStartOfWorkingPaper() &&
-            (startsWithKeyword(RepecNepImporter.RECOGNIZED_FIELDS) ||
-                "".equals(this.lastLine))
+            (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)
@@ -375,8 +360,7 @@ private void parseAdditionalFields(
             this.lastLine =
                 "".equals(this.lastLine)
                     ? ""
-                    : this.lastLine.substring(this.lastLine.indexOf(':') + 1)
-                        .trim();
+                    : this.lastLine.substring(this.lastLine.indexOf(':') + 1).trim();
 
             if ("Keywords".equals(keyword)) {
                 // parse keywords field
@@ -384,9 +368,7 @@ private void parseAdditionalFields(
                 String[] keywords = content.split("[,;]");
                 be.addKeywords(
                     Arrays.asList(keywords),
-                    importFormatPreferences
-                        .bibEntryPreferences()
-                        .getKeywordSeparator()
+                    importFormatPreferences.bibEntryPreferences().getKeywordSeparator()
                 );
             } else if ("JEL".equals(keyword)) {
                 // parse JEL field
@@ -427,8 +409,7 @@ private boolean isStartOfWorkingPaper() {
     }
 
     @Override
-    public ParserResult importDatabase(BufferedReader reader)
-        throws IOException {
+    public ParserResult importDatabase(BufferedReader reader) throws IOException {
         Objects.requireNonNull(reader);
 
         List<BibEntry> bibitems = new ArrayList<>();
@@ -438,13 +419,11 @@ public ParserResult importDatabase(BufferedReader reader)
             readLine(reader); // skip header and editor information
             while (this.lastLine != null) {
                 if (this.lastLine.startsWith("-----------------------------")) {
-                    this.inOverviewSection =
-                        this.preLine.startsWith("In this issue we have");
+                    this.inOverviewSection = this.preLine.startsWith("In this issue we have");
                 }
                 if (isStartOfWorkingPaper()) {
                     BibEntry be = new BibEntry(StandardEntryType.TechReport);
-                    paperNoStr =
-                        this.lastLine.substring(0, this.lastLine.indexOf('.'));
+                    paperNoStr = this.lastLine.substring(0, this.lastLine.indexOf('.'));
                     parseTitleString(be, reader);
                     if (startsWithKeyword(RepecNepImporter.RECOGNIZED_FIELDS)) {
                         parseAdditionalFields(be, false, reader);
@@ -453,9 +432,7 @@ public ParserResult importDatabase(BufferedReader reader)
                         parseAuthors(be, reader);
                         readLine(reader); // skip empty line
                     }
-                    if (
-                        !startsWithKeyword(RepecNepImporter.RECOGNIZED_FIELDS)
-                    ) {
+                    if (!startsWithKeyword(RepecNepImporter.RECOGNIZED_FIELDS)) {
                         parseAbstract(be, reader);
                     }
                     parseAdditionalFields(be, true, reader);
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 612fa6ed4b8..4affc279542 100644
--- a/src/main/java/org/jabref/logic/importer/fileformat/RisImporter.java
+++ b/src/main/java/org/jabref/logic/importer/fileformat/RisImporter.java
@@ -29,11 +29,8 @@
 
 public class RisImporter extends Importer {
 
-    private static final Pattern RECOGNIZED_FORMAT_PATTERN = Pattern.compile(
-        "TY {2}- .*"
-    );
-    private static final DateTimeFormatter YEAR_FORMATTER =
-        DateTimeFormatter.ofPattern("yyyy");
+    private static final Pattern RECOGNIZED_FORMAT_PATTERN = Pattern.compile("TY {2}- .*");
+    private static final DateTimeFormatter YEAR_FORMATTER = DateTimeFormatter.ofPattern("yyyy");
 
     @Override
     public String getName() {
@@ -51,17 +48,13 @@ public String getDescription() {
     }
 
     @Override
-    public boolean isRecognizedFormat(BufferedReader reader)
-        throws IOException {
+    public boolean isRecognizedFormat(BufferedReader reader) throws IOException {
         // Our strategy is to look for the "TY  - *" line.
-        return reader
-            .lines()
-            .anyMatch(line -> RECOGNIZED_FORMAT_PATTERN.matcher(line).find());
+        return reader.lines().anyMatch(line -> RECOGNIZED_FORMAT_PATTERN.matcher(line).find());
     }
 
     @Override
-    public ParserResult importDatabase(BufferedReader reader)
-        throws IOException {
+    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
@@ -101,14 +94,11 @@ public ParserResult importDatabase(BufferedReader reader)
                 boolean done = false;
                 while (!done && (j < (lines.length - 1))) {
                     if (
-                        (lines[j + 1].length() >= 6) &&
-                        !"  - ".equals(lines[j + 1].substring(2, 6))
+                        (lines[j + 1].length() >= 6) && !"  - ".equals(lines[j + 1].substring(2, 6))
                     ) {
                         if (
                             (!current.isEmpty()) &&
-                            !Character.isWhitespace(
-                                current.charAt(current.length() - 1)
-                            ) &&
+                            !Character.isWhitespace(current.charAt(current.length() - 1)) &&
                             !Character.isWhitespace(lines[j + 1].charAt(0))
                         ) {
                             current.append(' ');
@@ -128,9 +118,7 @@ public ParserResult importDatabase(BufferedReader reader)
                     if ("TY".equals(tag)) {
                         if ("BOOK".equals(value)) {
                             type = StandardEntryType.Book;
-                        } else if (
-                            "JOUR".equals(value) || "MGZN".equals(value)
-                        ) {
+                        } else if ("JOUR".equals(value) || "MGZN".equals(value)) {
                             type = StandardEntryType.Article;
                         } else if ("THES".equals(value)) {
                             type = StandardEntryType.PhdThesis;
@@ -153,41 +141,27 @@ public ParserResult importDatabase(BufferedReader reader)
                             fields.put(StandardField.TITLE, value);
                         } else {
                             if (
-                                oldVal.endsWith(":") ||
-                                oldVal.endsWith(".") ||
-                                oldVal.endsWith("?")
+                                oldVal.endsWith(":") || oldVal.endsWith(".") || oldVal.endsWith("?")
                             ) {
-                                fields.put(
-                                    StandardField.TITLE,
-                                    oldVal + " " + value
-                                );
+                                fields.put(StandardField.TITLE, oldVal + " " + value);
                             } else {
-                                fields.put(
-                                    StandardField.TITLE,
-                                    oldVal + ": " + value
-                                );
+                                fields.put(StandardField.TITLE, oldVal + ": " + value);
                             }
                         }
                         fields.put(
                             StandardField.TITLE,
-                            fields
-                                .get(StandardField.TITLE)
-                                .replaceAll("\\s+", " ")
+                            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)) &&
+                        ("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)
-                    ) {
+                    } else if ("JO".equals(tag) || "J1".equals(tag) || "JF".equals(tag)) {
                         // if this field appears then this should be the journal title
                         fields.put(StandardField.JOURNAL, value);
                     } else if ("T3".equals(tag)) {
@@ -223,10 +197,7 @@ public ParserResult importDatabase(BufferedReader reader)
                     } 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)
+                        "IS".equals(tag) || "AN".equals(tag) || "C7".equals(tag) || "M1".equals(tag)
                     ) {
                         fields.put(StandardField.NUMBER, value);
                     } else if ("SP".equals(tag)) {
@@ -237,9 +208,7 @@ public ParserResult importDatabase(BufferedReader reader)
                         } else {
                             fields.put(StandardField.PUBLISHER, value);
                         }
-                    } else if (
-                        "AD".equals(tag) || "CY".equals(tag) || "PP".equals(tag)
-                    ) {
+                    } else if ("AD".equals(tag) || "CY".equals(tag) || "PP".equals(tag)) {
                         fields.put(StandardField.ADDRESS, value);
                     } else if ("EP".equals(tag)) {
                         endPage = value;
@@ -257,18 +226,12 @@ public ParserResult importDatabase(BufferedReader reader)
                         if (oldAb == null) {
                             fields.put(StandardField.ABSTRACT, value);
                         } else if (!oldAb.equals(value) && !value.isEmpty()) {
-                            fields.put(
-                                StandardField.ABSTRACT,
-                                oldAb + OS.NEWLINE + value
-                            );
+                            fields.put(StandardField.ABSTRACT, oldAb + OS.NEWLINE + value);
                         }
-                    } else if (
-                        "UR".equals(tag) || "L2".equals(tag) || "LK".equals(tag)
-                    ) {
+                    } 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)
+                        ((tagPriority = dateTags.indexOf(tag)) != -1) && (value.length() >= 4)
                     ) {
                         if (tagPriority < datePriority) {
                             String year = value.substring(0, 4);
@@ -286,16 +249,11 @@ public ParserResult importDatabase(BufferedReader reader)
                     } else if ("KW".equals(tag)) {
                         if (fields.containsKey(StandardField.KEYWORDS)) {
                             String kw = fields.get(StandardField.KEYWORDS);
-                            fields.put(
-                                StandardField.KEYWORDS,
-                                kw + ", " + value
-                            );
+                            fields.put(StandardField.KEYWORDS, kw + ", " + value);
                         } else {
                             fields.put(StandardField.KEYWORDS, value);
                         }
-                    } else if (
-                        "U1".equals(tag) || "U2".equals(tag) || "N1".equals(tag)
-                    ) {
+                    } else if ("U1".equals(tag) || "U2".equals(tag) || "N1".equals(tag)) {
                         if (!comment.isEmpty()) {
                             comment = comment + OS.NEWLINE;
                         }
@@ -321,10 +279,7 @@ public ParserResult importDatabase(BufferedReader reader)
                     } else if ("DB".equals(tag)) {
                         fields.put(new UnknownField("archive"), value);
                     } else if ("NV".equals(tag)) {
-                        fields.put(
-                            new UnknownField("number-of-volumes"),
-                            value
-                        );
+                        fields.put(new UnknownField("number-of-volumes"), value);
                     } else if ("OP".equals(tag)) {
                         fields.put(new UnknownField("original-title"), value);
                     } else if ("RI".equals(tag)) {
@@ -371,9 +326,7 @@ public ParserResult importDatabase(BufferedReader reader)
             // Remove empty fields:
             fields
                 .entrySet()
-                .removeIf(key ->
-                    (key.getValue() == null) || key.getValue().trim().isEmpty()
-                );
+                .removeIf(key -> (key.getValue() == null) || key.getValue().trim().isEmpty());
 
             // create one here
             // type is set in the loop above
diff --git a/src/main/java/org/jabref/logic/importer/fileformat/SilverPlatterImporter.java b/src/main/java/org/jabref/logic/importer/fileformat/SilverPlatterImporter.java
index 2372fbdcb7e..3bc43a3845d 100644
--- a/src/main/java/org/jabref/logic/importer/fileformat/SilverPlatterImporter.java
+++ b/src/main/java/org/jabref/logic/importer/fileformat/SilverPlatterImporter.java
@@ -24,9 +24,7 @@
  */
 public class SilverPlatterImporter extends Importer {
 
-    private static final Pattern START_PATTERN = Pattern.compile(
-        "Record.*INSPEC.*"
-    );
+    private static final Pattern START_PATTERN = Pattern.compile("Record.*INSPEC.*");
 
     @Override
     public String getName() {
@@ -44,8 +42,7 @@ public String getDescription() {
     }
 
     @Override
-    public boolean isRecognizedFormat(BufferedReader reader)
-        throws IOException {
+    public boolean isRecognizedFormat(BufferedReader reader) throws IOException {
         // This format is very similar to Inspec, so we have a two-fold strategy:
         // If we see the flag signaling that it is an Inspec file, return false.
         // This flag should appear above the first entry and prevent us from
@@ -64,8 +61,7 @@ public boolean isRecognizedFormat(BufferedReader reader)
     }
 
     @Override
-    public ParserResult importDatabase(BufferedReader reader)
-        throws IOException {
+    public ParserResult importDatabase(BufferedReader reader) throws IOException {
         List<BibEntry> bibitems = new ArrayList<>();
         boolean isChapter = false;
         String str;
@@ -108,22 +104,15 @@ public ParserResult importDatabase(BufferedReader reader)
                             h.put(
                                 StandardField.AUTHOR,
                                 AuthorList.fixAuthorLastNameFirst(
-                                    frest
-                                        .replace(",-", ", ")
-                                        .replace(";", " and ")
+                                    frest.replace(",-", ", ").replace(";", " and ")
                                 )
                             );
                         }
                     }
                     case "AB" -> h.put(StandardField.ABSTRACT, frest);
                     case "DE" -> {
-                        String kw = frest
-                            .replace("-;", ",")
-                            .toLowerCase(Locale.ROOT);
-                        h.put(
-                            StandardField.KEYWORDS,
-                            kw.substring(0, kw.length() - 1)
-                        );
+                        String kw = frest.replace("-;", ",").toLowerCase(Locale.ROOT);
+                        h.put(StandardField.KEYWORDS, kw.substring(0, kw.length() - 1));
                     }
                     case "SO" -> {
                         int m = frest.indexOf('.');
@@ -148,12 +137,7 @@ public ParserResult importDatabase(BufferedReader reader)
                                     );
                                     h.put(
                                         StandardField.ISSUE,
-                                        frest
-                                            .substring(
-                                                issueIndex + 1,
-                                                endIssueIndex
-                                            )
-                                            .trim()
+                                        frest.substring(issueIndex + 1, endIssueIndex).trim()
                                     );
                                 }
                             }
@@ -163,10 +147,7 @@ public ParserResult importDatabase(BufferedReader reader)
                         int m = frest.indexOf(':');
                         if (m >= 0) {
                             String jr = frest.substring(0, m);
-                            h.put(
-                                StandardField.PUBLISHER,
-                                jr.replace("-", " ").trim()
-                            );
+                            h.put(StandardField.PUBLISHER, jr.replace("-", " ").trim());
                             frest = frest.substring(m);
                             m = frest.indexOf(", ");
                             if ((m + 2) < frest.length()) {
@@ -189,22 +170,16 @@ public ParserResult importDatabase(BufferedReader reader)
                         } else if (frest.startsWith("Dissertation")) {
                             type = StandardEntryType.PhdThesis;
                         } else if (
-                            frest
-                                .toLowerCase(Locale.ROOT)
-                                .contains(StandardField.JOURNAL.getName())
+                            frest.toLowerCase(Locale.ROOT).contains(StandardField.JOURNAL.getName())
                         ) {
                             type = StandardEntryType.Article;
-                        } else if (
-                            "Contribution".equals(frest) ||
-                            "Chapter".equals(frest)
-                        ) {
+                        } else if ("Contribution".equals(frest) || "Chapter".equals(frest)) {
                             type = StandardEntryType.InCollection;
                             // This entry type contains page numbers and booktitle in the
                             // title field.
                             isChapter = true;
                         } else {
-                            type =
-                                EntryTypeFactory.parse(frest.replace(" ", ""));
+                            type = EntryTypeFactory.parse(frest.replace(" ", ""));
                         }
                     }
                 }
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 6b33484cb42..04cbfe7dc8f 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,8 +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/util/FileFieldParser.java b/src/main/java/org/jabref/logic/importer/util/FileFieldParser.java
index 931ea3c7964..cb5c6120143 100644
--- a/src/main/java/org/jabref/logic/importer/util/FileFieldParser.java
+++ b/src/main/java/org/jabref/logic/importer/util/FileFieldParser.java
@@ -12,9 +12,7 @@
 
 public class FileFieldParser {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(
-        FileFieldParser.class
-    );
+    private static final Logger LOGGER = LoggerFactory.getLogger(FileFieldParser.class);
 
     private final String value;
 
@@ -88,9 +86,7 @@ public List<LinkedFile> parse() {
                 // Check if we are entering an XML special character construct such
                 // as "&#44;", because we need to know in order to ignore the semicolon.
                 charactersOfCurrentElement.append(c);
-                if (
-                    (value.length() > (i + 1)) && (value.charAt(i + 1) == '#')
-                ) {
+                if ((value.length() > (i + 1)) && (value.charAt(i + 1) == '#')) {
                     inXmlChar = true;
                 }
             } else if (!escaped && inXmlChar && (c == ';')) {
@@ -154,16 +150,10 @@ static LinkedFile convert(List<String> entry) {
         LinkedFile field = null;
         if (LinkedFile.isOnlineLink(entry.get(1))) {
             try {
-                field =
-                    new LinkedFile(
-                        entry.get(0),
-                        new URL(entry.get(1)),
-                        entry.get(2)
-                    );
+                field = new LinkedFile(entry.get(0), new URL(entry.get(1)), entry.get(2));
             } catch (MalformedURLException e) {
                 // in case the URL is malformed, store it nevertheless
-                field =
-                    new LinkedFile(entry.get(0), entry.get(1), entry.get(2));
+                field = new LinkedFile(entry.get(0), entry.get(1), entry.get(2));
             }
         }
 
@@ -180,10 +170,7 @@ static LinkedFile convert(List<String> entry) {
                     field = new LinkedFile(entry.get(0), path, entry.get(2));
                 } catch (InvalidPathException e) {
                     // Ignored
-                    LOGGER.debug(
-                        "Invalid path object, continueing with string",
-                        e
-                    );
+                    LOGGER.debug("Invalid path object, continueing with string", e);
                     field = new LinkedFile(entry.get(0), pathStr, entry.get(2));
                 }
             }
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 44280185e14..6a11ed8d589 100644
--- a/src/main/java/org/jabref/logic/importer/util/GrobidService.java
+++ b/src/main/java/org/jabref/logic/importer/util/GrobidService.java
@@ -46,9 +46,7 @@ public int getCode() {
     public GrobidService(GrobidPreferences grobidPreferences) {
         this.grobidPreferences = grobidPreferences;
         if (!grobidPreferences.isGrobidEnabled()) {
-            throw new UnsupportedOperationException(
-                "Grobid was used but not enabled."
-            );
+            throw new UnsupportedOperationException("Grobid was used but not enabled.");
         }
     }
 
@@ -67,10 +65,7 @@ public Optional<BibEntry> processCitation(
             .connect(grobidPreferences.getGrobidURL() + "/api/processCitation")
             .header("Accept", MediaTypes.APPLICATION_BIBTEX)
             .data("citations", rawCitation)
-            .data(
-                "consolidateCitations",
-                String.valueOf(consolidateCitations.getCode())
-            )
+            .data("consolidateCitations", String.valueOf(consolidateCitations.getCode()))
             .method(Connection.Method.POST)
             .ignoreContentType(true)
             .timeout(100_000)
@@ -80,19 +75,12 @@ public Optional<BibEntry> processCitation(
         if (
             httpResponse == null ||
             "@misc{-1,\n  author = {}\n}\n".equals(httpResponse) ||
-            httpResponse.equals(
-                "@misc{-1,\n  author = {" + rawCitation + "}\n}\n"
-            )
+            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."
-            );
+            throw new IOException("The GROBID server response does not contain anything.");
         }
 
-        return BibtexParser.singleFromString(
-            httpResponse,
-            importFormatPreferences
-        );
+        return BibtexParser.singleFromString(httpResponse, importFormatPreferences);
     }
 
     public List<BibEntry> processPDF(
@@ -100,9 +88,7 @@ public List<BibEntry> processPDF(
         ImportFormatPreferences importFormatPreferences
     ) throws IOException, ParseException {
         Connection.Response response = Jsoup
-            .connect(
-                grobidPreferences.getGrobidURL() + "/api/processHeaderDocument"
-            )
+            .connect(grobidPreferences.getGrobidURL() + "/api/processHeaderDocument")
             .header("Accept", MediaTypes.APPLICATION_BIBTEX)
             .data("input", filePath.toString(), Files.newInputStream(filePath))
             .method(Connection.Method.POST)
@@ -112,13 +98,8 @@ public List<BibEntry> processPDF(
 
         String httpResponse = response.body();
 
-        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."
-            );
+        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.");
         }
 
         BibtexParser parser = new BibtexParser(importFormatPreferences);
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 6a6ae5baf81..c7d9cc68989 100644
--- a/src/main/java/org/jabref/logic/importer/util/GroupsParser.java
+++ b/src/main/java/org/jabref/logic/importer/util/GroupsParser.java
@@ -37,9 +37,7 @@
  */
 public class GroupsParser {
 
-    private static final org.slf4j.Logger LOGGER = LoggerFactory.getLogger(
-        GroupsParser.class
-    );
+    private static final org.slf4j.Logger LOGGER = LoggerFactory.getLogger(GroupsParser.class);
 
     private GroupsParser() {}
 
@@ -61,9 +59,7 @@ public static GroupTreeNode importGroups(
 
                 int spaceIndex = string.indexOf(' ');
                 if (spaceIndex <= 0) {
-                    throw new ParseException(
-                        "Expected \"" + string + "\" to contain whitespace"
-                    );
+                    throw new ParseException("Expected \"" + string + "\" to contain whitespace");
                 }
                 int level = Integer.parseInt(string.substring(0, spaceIndex));
                 AbstractGroup group = GroupsParser.fromString(
@@ -79,10 +75,7 @@ public static GroupTreeNode importGroups(
                     root = cursor;
                 } else {
                     // insert at desired location
-                    while (
-                        (level <= cursor.getLevel()) &&
-                        (cursor.getParent().isPresent())
-                    ) {
+                    while ((level <= cursor.getLevel()) && (cursor.getParent().isPresent())) {
                         cursor = cursor.getParent().get();
                     }
                     cursor.addChild(newNode);
@@ -116,40 +109,22 @@ public static AbstractGroup fromString(
         if (s.startsWith(MetadataSerializationConfiguration.KEYWORD_GROUP_ID)) {
             return keywordGroupFromString(s, keywordSeparator);
         }
-        if (
-            s.startsWith(
-                MetadataSerializationConfiguration.ALL_ENTRIES_GROUP_ID
-            )
-        ) {
+        if (s.startsWith(MetadataSerializationConfiguration.ALL_ENTRIES_GROUP_ID)) {
             return allEntriesGroupFromString(s);
         }
         if (s.startsWith(MetadataSerializationConfiguration.SEARCH_GROUP_ID)) {
             return searchGroupFromString(s);
         }
-        if (
-            s.startsWith(MetadataSerializationConfiguration.EXPLICIT_GROUP_ID)
-        ) {
+        if (s.startsWith(MetadataSerializationConfiguration.EXPLICIT_GROUP_ID)) {
             return explicitGroupFromString(s, keywordSeparator);
         }
-        if (
-            s.startsWith(
-                MetadataSerializationConfiguration.LEGACY_EXPLICIT_GROUP_ID
-            )
-        ) {
+        if (s.startsWith(MetadataSerializationConfiguration.LEGACY_EXPLICIT_GROUP_ID)) {
             return legacyExplicitGroupFromString(s, keywordSeparator);
         }
-        if (
-            s.startsWith(
-                MetadataSerializationConfiguration.AUTOMATIC_PERSONS_GROUP_ID
-            )
-        ) {
+        if (s.startsWith(MetadataSerializationConfiguration.AUTOMATIC_PERSONS_GROUP_ID)) {
             return automaticPersonsGroupFromString(s);
         }
-        if (
-            s.startsWith(
-                MetadataSerializationConfiguration.AUTOMATIC_KEYWORD_GROUP_ID
-            )
-        ) {
+        if (s.startsWith(MetadataSerializationConfiguration.AUTOMATIC_KEYWORD_GROUP_ID)) {
             return automaticKeywordGroupFromString(s);
         }
         if (s.startsWith(MetadataSerializationConfiguration.TEX_GROUP_ID)) {
@@ -165,9 +140,7 @@ private static AbstractGroup texGroupFromString(
         MetaData metaData
     ) throws ParseException {
         QuotedStringTokenizer tok = new QuotedStringTokenizer(
-            string.substring(
-                MetadataSerializationConfiguration.TEX_GROUP_ID.length()
-            ),
+            string.substring(MetadataSerializationConfiguration.TEX_GROUP_ID.length()),
             MetadataSerializationConfiguration.GROUP_UNIT_SEPARATOR,
             MetadataSerializationConfiguration.GROUP_QUOTE_CHAR
         );
@@ -216,14 +189,8 @@ private static AbstractGroup texGroupFromString(
         }
     }
 
-    private static AbstractGroup automaticPersonsGroupFromString(
-        String string
-    ) {
-        if (
-            !string.startsWith(
-                MetadataSerializationConfiguration.AUTOMATIC_PERSONS_GROUP_ID
-            )
-        ) {
+    private static AbstractGroup automaticPersonsGroupFromString(String string) {
+        if (!string.startsWith(MetadataSerializationConfiguration.AUTOMATIC_PERSONS_GROUP_ID)) {
             throw new IllegalArgumentException(
                 "KeywordGroup cannot be created from \"" + string + "\"."
             );
@@ -244,28 +211,15 @@ private static AbstractGroup automaticPersonsGroupFromString(
             Integer.parseInt(tok.nextToken())
         );
         Field field = FieldFactory.parseField(
-            StringUtil.unquote(
-                tok.nextToken(),
-                MetadataSerializationConfiguration.GROUP_QUOTE_CHAR
-            )
-        );
-        AutomaticPersonsGroup newGroup = new AutomaticPersonsGroup(
-            name,
-            context,
-            field
+            StringUtil.unquote(tok.nextToken(), MetadataSerializationConfiguration.GROUP_QUOTE_CHAR)
         );
+        AutomaticPersonsGroup newGroup = new AutomaticPersonsGroup(name, context, field);
         addGroupDetails(tok, newGroup);
         return newGroup;
     }
 
-    private static AbstractGroup automaticKeywordGroupFromString(
-        String string
-    ) {
-        if (
-            !string.startsWith(
-                MetadataSerializationConfiguration.AUTOMATIC_KEYWORD_GROUP_ID
-            )
-        ) {
+    private static AbstractGroup automaticKeywordGroupFromString(String string) {
+        if (!string.startsWith(MetadataSerializationConfiguration.AUTOMATIC_KEYWORD_GROUP_ID)) {
             throw new IllegalArgumentException(
                 "KeywordGroup cannot be created from \"" + string + "\"."
             );
@@ -286,22 +240,13 @@ private static AbstractGroup automaticKeywordGroupFromString(
             Integer.parseInt(tok.nextToken())
         );
         Field field = FieldFactory.parseField(
-            StringUtil.unquote(
-                tok.nextToken(),
-                MetadataSerializationConfiguration.GROUP_QUOTE_CHAR
-            )
+            StringUtil.unquote(tok.nextToken(), MetadataSerializationConfiguration.GROUP_QUOTE_CHAR)
         );
         Character delimiter = StringUtil
-            .unquote(
-                tok.nextToken(),
-                MetadataSerializationConfiguration.GROUP_QUOTE_CHAR
-            )
+            .unquote(tok.nextToken(), MetadataSerializationConfiguration.GROUP_QUOTE_CHAR)
             .charAt(0);
         Character hierarchicalDelimiter = StringUtil
-            .unquote(
-                tok.nextToken(),
-                MetadataSerializationConfiguration.GROUP_QUOTE_CHAR
-            )
+            .unquote(tok.nextToken(), MetadataSerializationConfiguration.GROUP_QUOTE_CHAR)
             .charAt(0);
         AutomaticKeywordGroup newGroup = new AutomaticKeywordGroup(
             name,
@@ -319,21 +264,15 @@ private static AbstractGroup automaticKeywordGroupFromString(
      *
      * @param s The String representation obtained from KeywordGroup.toString()
      */
-    private static KeywordGroup keywordGroupFromString(
-        String s,
-        Character keywordSeparator
-    ) throws ParseException {
-        if (
-            !s.startsWith(MetadataSerializationConfiguration.KEYWORD_GROUP_ID)
-        ) {
+    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 + "\"."
             );
         }
         QuotedStringTokenizer tok = new QuotedStringTokenizer(
-            s.substring(
-                MetadataSerializationConfiguration.KEYWORD_GROUP_ID.length()
-            ),
+            s.substring(MetadataSerializationConfiguration.KEYWORD_GROUP_ID.length()),
             MetadataSerializationConfiguration.GROUP_UNIT_SEPARATOR,
             MetadataSerializationConfiguration.GROUP_QUOTE_CHAR
         );
@@ -346,10 +285,7 @@ private static KeywordGroup keywordGroupFromString(
             Integer.parseInt(tok.nextToken())
         );
         Field field = FieldFactory.parseField(
-            StringUtil.unquote(
-                tok.nextToken(),
-                MetadataSerializationConfiguration.GROUP_QUOTE_CHAR
-            )
+            StringUtil.unquote(tok.nextToken(), MetadataSerializationConfiguration.GROUP_QUOTE_CHAR)
         );
         String expression = StringUtil.unquote(
             tok.nextToken(),
@@ -359,14 +295,7 @@ private static KeywordGroup keywordGroupFromString(
         boolean regExp = Integer.parseInt(tok.nextToken()) == 1;
         KeywordGroup newGroup;
         if (regExp) {
-            newGroup =
-                new RegexKeywordGroup(
-                    name,
-                    context,
-                    field,
-                    expression,
-                    caseSensitive
-                );
+            newGroup = new RegexKeywordGroup(name, context, field, expression, caseSensitive);
         } else {
             newGroup =
                 new WordKeywordGroup(
@@ -383,23 +312,15 @@ private static KeywordGroup keywordGroupFromString(
         return newGroup;
     }
 
-    private static ExplicitGroup explicitGroupFromString(
-        String input,
-        Character keywordSeparator
-    ) throws ParseException {
-        if (
-            !input.startsWith(
-                MetadataSerializationConfiguration.EXPLICIT_GROUP_ID
-            )
-        ) {
+    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 + "\"."
             );
         }
         QuotedStringTokenizer tok = new QuotedStringTokenizer(
-            input.substring(
-                MetadataSerializationConfiguration.EXPLICIT_GROUP_ID.length()
-            ),
+            input.substring(MetadataSerializationConfiguration.EXPLICIT_GROUP_ID.length()),
             MetadataSerializationConfiguration.GROUP_UNIT_SEPARATOR,
             MetadataSerializationConfiguration.GROUP_QUOTE_CHAR
         );
@@ -426,19 +347,13 @@ private static ExplicitGroup legacyExplicitGroupFromString(
         String input,
         Character keywordSeparator
     ) throws ParseException {
-        if (
-            !input.startsWith(
-                MetadataSerializationConfiguration.LEGACY_EXPLICIT_GROUP_ID
-            )
-        ) {
+        if (!input.startsWith(MetadataSerializationConfiguration.LEGACY_EXPLICIT_GROUP_ID)) {
             throw new IllegalArgumentException(
                 "ExplicitGroup cannot be created from \"" + input + "\"."
             );
         }
         QuotedStringTokenizer tok = new QuotedStringTokenizer(
-            input.substring(
-                MetadataSerializationConfiguration.LEGACY_EXPLICIT_GROUP_ID.length()
-            ),
+            input.substring(MetadataSerializationConfiguration.LEGACY_EXPLICIT_GROUP_ID.length()),
             MetadataSerializationConfiguration.GROUP_UNIT_SEPARATOR,
             MetadataSerializationConfiguration.GROUP_QUOTE_CHAR
         );
@@ -467,10 +382,7 @@ private static ExplicitGroup legacyExplicitGroupFromString(
      *  ExplicitGroup:GroupName\;0\;Key1\;Key2\;;
      * This method exists for backwards compatibility.
      */
-    private static void addLegacyEntryKeys(
-        QuotedStringTokenizer tok,
-        ExplicitGroup group
-    ) {
+    private static void addLegacyEntryKeys(QuotedStringTokenizer tok, ExplicitGroup group) {
         while (tok.hasMoreTokens()) {
             String key = StringUtil.unquote(
                 tok.nextToken(),
@@ -481,11 +393,7 @@ private static void addLegacyEntryKeys(
     }
 
     private static AbstractGroup allEntriesGroupFromString(String s) {
-        if (
-            !s.startsWith(
-                MetadataSerializationConfiguration.ALL_ENTRIES_GROUP_ID
-            )
-        ) {
+        if (!s.startsWith(MetadataSerializationConfiguration.ALL_ENTRIES_GROUP_ID)) {
             throw new IllegalArgumentException(
                 "AllEntriesGroup cannot be created from \"" + s + "\"."
             );
@@ -500,14 +408,10 @@ private static AbstractGroup allEntriesGroupFromString(String s) {
      */
     private static AbstractGroup searchGroupFromString(String s) {
         if (!s.startsWith(MetadataSerializationConfiguration.SEARCH_GROUP_ID)) {
-            throw new IllegalArgumentException(
-                "SearchGroup cannot be created from \"" + s + "\"."
-            );
+            throw new IllegalArgumentException("SearchGroup cannot be created from \"" + s + "\".");
         }
         QuotedStringTokenizer tok = new QuotedStringTokenizer(
-            s.substring(
-                MetadataSerializationConfiguration.SEARCH_GROUP_ID.length()
-            ),
+            s.substring(MetadataSerializationConfiguration.SEARCH_GROUP_ID.length()),
             MetadataSerializationConfiguration.GROUP_UNIT_SEPARATOR,
             MetadataSerializationConfiguration.GROUP_QUOTE_CHAR
         );
@@ -540,10 +444,7 @@ private static AbstractGroup searchGroupFromString(String s) {
         return searchGroup;
     }
 
-    private static void addGroupDetails(
-        QuotedStringTokenizer tokenizer,
-        AbstractGroup group
-    ) {
+    private static void addGroupDetails(QuotedStringTokenizer tokenizer, AbstractGroup group) {
         if (tokenizer.hasMoreTokens()) {
             group.setExpanded(Integer.parseInt(tokenizer.nextToken()) == 1);
             group.setColor(tokenizer.nextToken());
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 1ecdb95ced1..be1089c157f 100644
--- a/src/main/java/org/jabref/logic/importer/util/IdentifierParser.java
+++ b/src/main/java/org/jabref/logic/importer/util/IdentifierParser.java
@@ -43,12 +43,8 @@ public Optional<? extends Identifier> parse(Field field) {
     }
 
     private Optional<? extends Identifier> parseEprint(String eprint) {
-        Optional<String> eprintTypeOpt = entry.getField(
-            StandardField.EPRINTTYPE
-        );
-        Optional<String> archivePrefixOpt = entry.getField(
-            StandardField.ARCHIVEPREFIX
-        );
+        Optional<String> eprintTypeOpt = entry.getField(StandardField.EPRINTTYPE);
+        Optional<String> archivePrefixOpt = entry.getField(StandardField.ARCHIVEPREFIX);
 
         String eprintType = eprintTypeOpt.or(() -> archivePrefixOpt).orElse("");
         if ("arxiv".equalsIgnoreCase(eprintType)) {
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 4222805178b..2afb08418a6 100644
--- a/src/main/java/org/jabref/logic/importer/util/JsonReader.java
+++ b/src/main/java/org/jabref/logic/importer/util/JsonReader.java
@@ -18,13 +18,9 @@ public class JsonReader {
      *
      * @return A {@link JSONObject}. An empty JSON object is returned in the case an empty stream is passed.
      */
-    public static JSONObject toJsonObject(InputStream inputStream)
-        throws ParseException {
+    public static JSONObject toJsonObject(InputStream inputStream) throws ParseException {
         try {
-            String inputStr = new String(
-                (inputStream.readAllBytes()),
-                StandardCharsets.UTF_8
-            );
+            String inputStr = new String((inputStream.readAllBytes()), StandardCharsets.UTF_8);
             // Fallback: in case an empty stream was passed, return an empty JSON object
             if (inputStr.isBlank()) {
                 return new JSONObject();
@@ -35,13 +31,9 @@ public static JSONObject toJsonObject(InputStream inputStream)
         }
     }
 
-    public static JSONArray toJsonArray(InputStream stream)
-        throws ParseException {
+    public static JSONArray toJsonArray(InputStream stream) throws ParseException {
         try {
-            String inpStr = new String(
-                (stream.readAllBytes()),
-                StandardCharsets.UTF_8
-            );
+            String inpStr = new String((stream.readAllBytes()), StandardCharsets.UTF_8);
             if (inpStr.isBlank()) {
                 return new JSONArray();
             }
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 8da30f7d0ec..0bfdc7c82ef 100644
--- a/src/main/java/org/jabref/logic/importer/util/MathMLParser.java
+++ b/src/main/java/org/jabref/logic/importer/util/MathMLParser.java
@@ -20,11 +20,8 @@
 
 public class MathMLParser {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(
-        MathMLParser.class
-    );
-    private static final String XSLT_FILE_PATH =
-        "/xslt/mathml_latex/mmltex.xsl";
+    private static final Logger LOGGER = LoggerFactory.getLogger(MathMLParser.class);
+    private static final String XSLT_FILE_PATH = "/xslt/mathml_latex/mmltex.xsl";
 
     /**
      * Parses the MathML element into its corresponding
@@ -50,11 +47,8 @@ public static String parse(XMLStreamReader reader) {
                 xsltResource.toURI().toASCIIString()
             );
 
-            TransformerFactory transformerFactory =
-                TransformerFactory.newInstance();
-            Transformer transformer = transformerFactory.newTransformer(
-                xsltSource
-            );
+            TransformerFactory transformerFactory = TransformerFactory.newInstance();
+            Transformer transformer = transformerFactory.newTransformer(xsltSource);
 
             StringWriter writer = new StringWriter();
             Result result = new StreamResult(writer);
diff --git a/src/main/java/org/jabref/logic/importer/util/MediaTypes.java b/src/main/java/org/jabref/logic/importer/util/MediaTypes.java
index 54b47e0fbaa..986d013cdd7 100644
--- a/src/main/java/org/jabref/logic/importer/util/MediaTypes.java
+++ b/src/main/java/org/jabref/logic/importer/util/MediaTypes.java
@@ -6,6 +6,5 @@
 public class MediaTypes {
 
     public static final String APPLICATION_BIBTEX = "application/x-bibtex";
-    public static final String CITATIONSTYLES_JSON =
-        "application/vnd.citationstyles.csl+json";
+    public static final String CITATIONSTYLES_JSON = "application/vnd.citationstyles.csl+json";
 }
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 a792fe6fbc8..281e3f183b8 100644
--- a/src/main/java/org/jabref/logic/importer/util/MetaDataParser.java
+++ b/src/main/java/org/jabref/logic/importer/util/MetaDataParser.java
@@ -33,14 +33,10 @@
  */
 public class MetaDataParser {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(
-        MetaDataParser.class
-    );
+    private static final Logger LOGGER = LoggerFactory.getLogger(MetaDataParser.class);
     private static FileUpdateMonitor fileMonitor;
 
-    private static final Pattern SINGLE_BACKSLASH = Pattern.compile(
-        "[^\\\\]\\\\[^\\\\]"
-    );
+    private static final Pattern SINGLE_BACKSLASH = Pattern.compile("[^\\\\]\\\\[^\\\\]");
 
     public MetaDataParser(FileUpdateMonitor fileMonitor) {
         MetaDataParser.fileMonitor = fileMonitor;
@@ -55,23 +51,15 @@ public static Optional<BibEntryType> parseCustomEntryType(String comment) {
         String fieldsDescription = rest.substring(indexEndOfName + 2);
 
         int indexEndOfRequiredFields = fieldsDescription.indexOf(']');
-        int indexEndOfOptionalFields = fieldsDescription.indexOf(
-            ']',
-            indexEndOfRequiredFields + 1
-        );
+        int indexEndOfOptionalFields = fieldsDescription.indexOf(']', indexEndOfRequiredFields + 1);
         if (
             (indexEndOfRequiredFields < 4) ||
             (indexEndOfOptionalFields < (indexEndOfRequiredFields + 6))
         ) {
             return Optional.empty();
         }
-        EntryType type = EntryTypeFactory.parse(
-            rest.substring(0, indexEndOfName)
-        );
-        String reqFields = fieldsDescription.substring(
-            4,
-            indexEndOfRequiredFields
-        );
+        EntryType type = EntryTypeFactory.parse(rest.substring(0, indexEndOfName));
+        String reqFields = fieldsDescription.substring(4, indexEndOfRequiredFields);
         String optFields = fieldsDescription.substring(
             indexEndOfRequiredFields + 6,
             indexEndOfOptionalFields
@@ -96,19 +84,13 @@ public MetaData parse(Map<String, String> data, Character keywordSeparator)
     /**
      * Parses the data map and changes the given {@link MetaData} instance respectively.
      */
-    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 {
         List<String> defaultCiteKeyPattern = new ArrayList<>();
-        Map<EntryType, List<String>> nonDefaultCiteKeyPatterns =
-            new HashMap<>();
+        Map<EntryType, List<String>> nonDefaultCiteKeyPatterns = new HashMap<>();
 
         // 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()
-        );
+        List<Map.Entry<String, String>> entryList = new ArrayList<>(data.entrySet());
         entryList.sort(groupsLast());
 
         for (Map.Entry<String, String> entry : entryList) {
@@ -116,66 +98,39 @@ public MetaData parse(
 
             if (entry.getKey().startsWith(MetaData.PREFIX_KEYPATTERN)) {
                 EntryType entryType = EntryTypeFactory.parse(
-                    entry
-                        .getKey()
-                        .substring(MetaData.PREFIX_KEYPATTERN.length())
+                    entry.getKey().substring(MetaData.PREFIX_KEYPATTERN.length())
                 );
                 nonDefaultCiteKeyPatterns.put(
                     entryType,
                     Collections.singletonList(getSingleItem(values))
                 );
-            } else if (
-                entry.getKey().startsWith(MetaData.SELECTOR_META_PREFIX)
-            ) {
+            } 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()
-                                )
+                            entry.getKey().substring(MetaData.SELECTOR_META_PREFIX.length())
                         ),
-                        StringUtil.unquote(
-                            entry.getValue(),
-                            MetaData.ESCAPE_CHARACTER
-                        )
+                        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 + '-')
-            ) {
+                metaData.setDefaultFileDirectory(parseDirectory(entry.getValue()));
+            } else if (entry.getKey().startsWith(MetaData.FILE_DIRECTORY + '-')) {
                 // The user name starts directly after FILE_DIRECTORY + '-'
-                String user = entry
-                    .getKey()
-                    .substring(MetaData.FILE_DIRECTORY.length() + 1);
-                metaData.setUserFileDirectory(
-                    user,
-                    parseDirectory(entry.getValue())
-                );
-            } else if (
-                entry.getKey().startsWith(MetaData.FILE_DIRECTORY_LATEX)
-            ) {
+                String user = entry.getKey().substring(MetaData.FILE_DIRECTORY.length() + 1);
+                metaData.setUserFileDirectory(user, parseDirectory(entry.getValue()));
+            } else if (entry.getKey().startsWith(MetaData.FILE_DIRECTORY_LATEX)) {
                 // The user name starts directly after FILE_DIRECTORY_LATEX" + '-'
-                String user = entry
-                    .getKey()
-                    .substring(MetaData.FILE_DIRECTORY_LATEX.length() + 1);
-                Path path = Path
-                    .of(parseDirectory(entry.getValue()))
-                    .normalize();
+                String user = entry.getKey().substring(MetaData.FILE_DIRECTORY_LATEX.length() + 1);
+                Path path = Path.of(parseDirectory(entry.getValue())).normalize();
                 metaData.setLatexFileDirectory(user, path);
             } else if (entry.getKey().equals(MetaData.SAVE_ACTIONS)) {
                 metaData.setSaveActions(FieldFormatterCleanups.parse(values));
             } else if (entry.getKey().equals(MetaData.DATABASE_TYPE)) {
                 metaData.setMode(BibDatabaseMode.parse(getSingleItem(values)));
             } else if (entry.getKey().equals(MetaData.KEYPATTERNDEFAULT)) {
-                defaultCiteKeyPattern =
-                    Collections.singletonList(getSingleItem(values));
+                defaultCiteKeyPattern = Collections.singletonList(getSingleItem(values));
             } else if (entry.getKey().equals(MetaData.PROTECTED_FLAG_META)) {
                 if (Boolean.parseBoolean(getSingleItem(values))) {
                     metaData.markAsProtected();
@@ -189,12 +144,7 @@ public MetaData parse(
                 entry.getKey().equals(MetaData.GROUPSTREE_LEGACY)
             ) {
                 metaData.setGroups(
-                    GroupsParser.importGroups(
-                        values,
-                        keywordSeparator,
-                        fileMonitor,
-                        metaData
-                    )
+                    GroupsParser.importGroups(values, keywordSeparator, fileMonitor, metaData)
                 );
             } else if (entry.getKey().equals(MetaData.VERSION_DB_STRUCT)) {
                 metaData.setVersionDBStructure(getSingleItem(values));
@@ -204,14 +154,8 @@ public MetaData parse(
             }
         }
 
-        if (
-            !defaultCiteKeyPattern.isEmpty() ||
-            !nonDefaultCiteKeyPatterns.isEmpty()
-        ) {
-            metaData.setCiteKeyPattern(
-                defaultCiteKeyPattern,
-                nonDefaultCiteKeyPatterns
-            );
+        if (!defaultCiteKeyPattern.isEmpty() || !nonDefaultCiteKeyPatterns.isEmpty()) {
+            metaData.setCiteKeyPattern(defaultCiteKeyPattern, nonDefaultCiteKeyPatterns);
         }
 
         return metaData;
@@ -228,14 +172,11 @@ public MetaData parse(
      * @param value the raw value (as stored in the .bib file)
      */
     static String parseDirectory(String value) {
-        value =
-            StringUtil.removeStringAtTheEnd(value, MetaData.SEPARATOR_STRING);
+        value = StringUtil.removeStringAtTheEnd(value, MetaData.SEPARATOR_STRING);
         if (value.contains("\\\\\\\\")) {
             // This is an escaped Windows UNC path
             return value.replace("\\\\", "\\");
-        } else if (
-            value.contains("\\\\") && !SINGLE_BACKSLASH.matcher(value).find()
-        ) {
+        } else if (value.contains("\\\\") && !SINGLE_BACKSLASH.matcher(value).find()) {
             // All backslashes escaped
             return value.replace("\\\\", "\\");
         } else {
@@ -259,14 +200,11 @@ private static Comparator<? super Map.Entry<String, String>> groupsLast() {
      * Returns the first item in the list.
      * If the specified list does not contain exactly one item, then a {@link ParseException} will be thrown.
      */
-    private static String getSingleItem(List<String> value)
-        throws ParseException {
+    private static String getSingleItem(List<String> value) throws ParseException {
         if (value.size() == 1) {
             return value.get(0);
         } else {
-            throw new ParseException(
-                "Expected a single item but received " + value
-            );
+            throw new ParseException("Expected a single item but received " + value);
         }
     }
 
@@ -282,10 +220,7 @@ private static List<String> getAsList(String value) throws ParseException {
             }
         } catch (IOException ex) {
             LOGGER.error("Weird error while parsing meta data.", ex);
-            throw new ParseException(
-                "Weird error while parsing meta data.",
-                ex
-            );
+            throw new ParseException("Weird error while parsing meta data.", ex);
         }
         return orderedValue;
     }
@@ -293,8 +228,7 @@ private static List<String> getAsList(String value) throws ParseException {
     /**
      * Reads the next unit. Units are delimited by ';' (MetaData.SEPARATOR_CHARACTER).
      */
-    private static Optional<String> getNextUnit(Reader reader)
-        throws IOException {
+    private static Optional<String> getNextUnit(Reader reader) throws IOException {
         int c;
         boolean escape = false;
         StringBuilder res = new StringBuilder();
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 b56762a3bb9..73f29ddde91 100644
--- a/src/main/java/org/jabref/logic/importer/util/ShortDOIService.java
+++ b/src/main/java/org/jabref/logic/importer/util/ShortDOIService.java
@@ -50,9 +50,7 @@ private JSONObject makeRequest(DOI doi) throws ShortDOIServiceException {
         URLDownload urlDownload = new URLDownload(url);
 
         try {
-            JSONObject resultAsJSON = JsonReader.toJsonObject(
-                urlDownload.asInputStream()
-            );
+            JSONObject resultAsJSON = JsonReader.toJsonObject(urlDownload.asInputStream());
             if (resultAsJSON.isEmpty()) {
                 throw new ShortDOIServiceException("Cannot get short DOI");
             }
diff --git a/src/main/java/org/jabref/logic/importer/util/ShortDOIServiceException.java b/src/main/java/org/jabref/logic/importer/util/ShortDOIServiceException.java
index 7007ae0860a..ffae6711a1a 100644
--- a/src/main/java/org/jabref/logic/importer/util/ShortDOIServiceException.java
+++ b/src/main/java/org/jabref/logic/importer/util/ShortDOIServiceException.java
@@ -16,11 +16,7 @@ public ShortDOIServiceException(String message, String localizedMessage) {
         super(message, localizedMessage);
     }
 
-    public ShortDOIServiceException(
-        String message,
-        String localizedMessage,
-        Throwable cause
-    ) {
+    public ShortDOIServiceException(String message, String localizedMessage, Throwable cause) {
         super(message, localizedMessage, cause);
     }
 
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 b921ea248a3..7787cb97b19 100644
--- a/src/main/java/org/jabref/logic/importer/util/StaxParser.java
+++ b/src/main/java/org/jabref/logic/importer/util/StaxParser.java
@@ -14,13 +14,9 @@ public class StaxParser {
      * @param reader the stream reader
      * @return Returns the inner XML content
      */
-    public static String getXMLContent(XMLStreamReader reader)
-        throws XMLStreamException {
+    public static String getXMLContent(XMLStreamReader reader) throws XMLStreamException {
         // skip over START DOCUMENT event
-        while (
-            reader.getEventType() == XMLStreamConstants.START_DOCUMENT &&
-            reader.hasNext()
-        ) {
+        while (reader.getEventType() == XMLStreamConstants.START_DOCUMENT && reader.hasNext()) {
             reader.next();
         }
 
@@ -65,8 +61,7 @@ public static String getXMLContent(XMLStreamReader reader)
             } else if (event == XMLStreamConstants.PROCESSING_INSTRUCTION) {
                 content.append(getXMLProcessingInstruction(reader));
             } else if (
-                event == XMLStreamConstants.SPACE ||
-                event == XMLStreamConstants.ENTITY_REFERENCE
+                event == XMLStreamConstants.SPACE || event == XMLStreamConstants.ENTITY_REFERENCE
             ) {
                 content.append(getXMLText(reader));
             }
@@ -75,10 +70,7 @@ public static String getXMLContent(XMLStreamReader reader)
         return content.toString().trim();
     }
 
-    private static String getXMLStartTag(
-        XMLStreamReader reader,
-        boolean addNamespaceURI
-    ) {
+    private static String getXMLStartTag(XMLStreamReader reader, boolean addNamespaceURI) {
         StringBuilder startTag = new StringBuilder();
 
         String prefix = reader.getPrefix();
diff --git a/src/main/java/org/jabref/logic/integrity/ASCIICharacterChecker.java b/src/main/java/org/jabref/logic/integrity/ASCIICharacterChecker.java
index 12dcf196103..21f4aecf667 100644
--- a/src/main/java/org/jabref/logic/integrity/ASCIICharacterChecker.java
+++ b/src/main/java/org/jabref/logic/integrity/ASCIICharacterChecker.java
@@ -17,9 +17,7 @@ public class ASCIICharacterChecker implements EntryChecker {
     public List<IntegrityMessage> check(BibEntry entry) {
         List<IntegrityMessage> results = new ArrayList<>();
         for (Map.Entry<Field, String> field : entry.getFieldMap().entrySet()) {
-            boolean asciiOnly = CharMatcher
-                .ascii()
-                .matchesAllOf(field.getValue());
+            boolean asciiOnly = CharMatcher.ascii().matchesAllOf(field.getValue());
             if (!asciiOnly) {
                 results.add(
                     new IntegrityMessage(
diff --git a/src/main/java/org/jabref/logic/integrity/AbbreviationChecker.java b/src/main/java/org/jabref/logic/integrity/AbbreviationChecker.java
index fe0e760aa0f..c9b6cf9a587 100644
--- a/src/main/java/org/jabref/logic/integrity/AbbreviationChecker.java
+++ b/src/main/java/org/jabref/logic/integrity/AbbreviationChecker.java
@@ -15,9 +15,7 @@ public class AbbreviationChecker implements EntryChecker {
     private final JournalAbbreviationRepository abbreviationRepository;
     private final Set<Field> fields = FieldFactory.getBookNameFields();
 
-    public AbbreviationChecker(
-        JournalAbbreviationRepository abbreviationRepository
-    ) {
+    public AbbreviationChecker(JournalAbbreviationRepository abbreviationRepository) {
         this.abbreviationRepository = abbreviationRepository;
     }
 
diff --git a/src/main/java/org/jabref/logic/integrity/AmpersandChecker.java b/src/main/java/org/jabref/logic/integrity/AmpersandChecker.java
index 3d665681fba..9ad50d690a5 100644
--- a/src/main/java/org/jabref/logic/integrity/AmpersandChecker.java
+++ b/src/main/java/org/jabref/logic/integrity/AmpersandChecker.java
@@ -21,9 +21,7 @@
 public class AmpersandChecker implements EntryChecker {
 
     // matches for an & preceded by any number of \
-    private static final Pattern BACKSLASH_PRECEDED_AMPERSAND = Pattern.compile(
-        "\\\\*&"
-    );
+    private static final Pattern BACKSLASH_PRECEDED_AMPERSAND = Pattern.compile("\\\\*&");
 
     @Override
     public List<IntegrityMessage> check(BibEntry entry) {
@@ -31,17 +29,12 @@ public List<IntegrityMessage> check(BibEntry entry) {
             .getFieldMap()
             .entrySet()
             .stream()
-            .filter(field ->
-                !field.getKey().getProperties().contains(FieldProperty.VERBATIM)
-            )
+            .filter(field -> !field.getKey().getProperties().contains(FieldProperty.VERBATIM))
             // 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()
-                    ),
+                    Localization.lang("Found %0 unescaped '&'", pair.getValue()),
                     entry,
                     pair.getKey()
                 )
diff --git a/src/main/java/org/jabref/logic/integrity/BibStringChecker.java b/src/main/java/org/jabref/logic/integrity/BibStringChecker.java
index 4848c135717..740a986a4ce 100644
--- a/src/main/java/org/jabref/logic/integrity/BibStringChecker.java
+++ b/src/main/java/org/jabref/logic/integrity/BibStringChecker.java
@@ -31,9 +31,7 @@ public List<IntegrityMessage> check(BibEntry entry) {
         Map<Field, String> fields = entry.getFieldMap();
 
         for (Map.Entry<Field, String> field : fields.entrySet()) {
-            if (
-                !field.getKey().getProperties().contains(FieldProperty.VERBATIM)
-            ) {
+            if (!field.getKey().getProperties().contains(FieldProperty.VERBATIM)) {
                 Matcher hashMatcher = UNESCAPED_HASH.matcher(field.getValue());
                 int hashCount = 0;
                 while (hashMatcher.find()) {
diff --git a/src/main/java/org/jabref/logic/integrity/BooktitleChecker.java b/src/main/java/org/jabref/logic/integrity/BooktitleChecker.java
index b0ff5d545a5..a75772cd5e5 100644
--- a/src/main/java/org/jabref/logic/integrity/BooktitleChecker.java
+++ b/src/main/java/org/jabref/logic/integrity/BooktitleChecker.java
@@ -14,9 +14,7 @@ public Optional<String> checkValue(String value) {
         }
 
         if (value.toLowerCase(Locale.ENGLISH).endsWith("conference on")) {
-            return Optional.of(
-                Localization.lang("booktitle ends with 'conference on'")
-            );
+            return Optional.of(Localization.lang("booktitle ends with 'conference on'"));
         }
 
         return Optional.empty();
diff --git a/src/main/java/org/jabref/logic/integrity/BracketChecker.java b/src/main/java/org/jabref/logic/integrity/BracketChecker.java
index aa475954955..1f9e567feab 100644
--- a/src/main/java/org/jabref/logic/integrity/BracketChecker.java
+++ b/src/main/java/org/jabref/logic/integrity/BracketChecker.java
@@ -19,9 +19,7 @@ public Optional<String> checkValue(String value) {
                 counter++;
             } else if (a == '}') {
                 if (counter == 0) {
-                    return Optional.of(
-                        Localization.lang("unexpected closing curly bracket")
-                    );
+                    return Optional.of(Localization.lang("unexpected closing curly bracket"));
                 } else {
                     counter--;
                 }
@@ -29,9 +27,7 @@ public Optional<String> checkValue(String value) {
         }
 
         if (counter > 0) {
-            return Optional.of(
-                Localization.lang("unexpected opening curly bracket")
-            );
+            return Optional.of(Localization.lang("unexpected opening curly bracket"));
         }
 
         return Optional.empty();
diff --git a/src/main/java/org/jabref/logic/integrity/CitationKeyChecker.java b/src/main/java/org/jabref/logic/integrity/CitationKeyChecker.java
index bd89bbbe715..e3bde8205d4 100644
--- a/src/main/java/org/jabref/logic/integrity/CitationKeyChecker.java
+++ b/src/main/java/org/jabref/logic/integrity/CitationKeyChecker.java
@@ -27,9 +27,7 @@ public List<IntegrityMessage> check(BibEntry entry) {
             String authorTitleYear = entry.getAuthorTitleYear(100);
             return Collections.singletonList(
                 new IntegrityMessage(
-                    Localization.lang("empty citation key") +
-                    ": " +
-                    authorTitleYear,
+                    Localization.lang("empty citation key") + ": " + authorTitleYear,
                     entry,
                     InternalField.KEY_FIELD
                 )
diff --git a/src/main/java/org/jabref/logic/integrity/CitationKeyDeviationChecker.java b/src/main/java/org/jabref/logic/integrity/CitationKeyDeviationChecker.java
index 9b05824579f..a92deabbb6f 100644
--- a/src/main/java/org/jabref/logic/integrity/CitationKeyDeviationChecker.java
+++ b/src/main/java/org/jabref/logic/integrity/CitationKeyDeviationChecker.java
@@ -21,8 +21,7 @@ public CitationKeyDeviationChecker(
         CitationKeyPatternPreferences citationKeyPatternPreferences
     ) {
         this.bibDatabaseContext = Objects.requireNonNull(bibDatabaseContext);
-        this.citationKeyPatternPreferences =
-            Objects.requireNonNull(citationKeyPatternPreferences);
+        this.citationKeyPatternPreferences = Objects.requireNonNull(citationKeyPatternPreferences);
     }
 
     @Override
@@ -44,9 +43,7 @@ public List<IntegrityMessage> check(BibEntry entry) {
         if (!Objects.equals(key, generatedKey)) {
             return Collections.singletonList(
                 new IntegrityMessage(
-                    Localization.lang(
-                        "Citation key deviates from generated key"
-                    ),
+                    Localization.lang("Citation key deviates from generated key"),
                     entry,
                     InternalField.KEY_FIELD
                 )
diff --git a/src/main/java/org/jabref/logic/integrity/CitationKeyDuplicationChecker.java b/src/main/java/org/jabref/logic/integrity/CitationKeyDuplicationChecker.java
index b9912249c2f..b3117fb8543 100644
--- a/src/main/java/org/jabref/logic/integrity/CitationKeyDuplicationChecker.java
+++ b/src/main/java/org/jabref/logic/integrity/CitationKeyDuplicationChecker.java
@@ -24,9 +24,7 @@ public List<IntegrityMessage> check(BibEntry entry) {
             return Collections.emptyList();
         }
 
-        boolean isDuplicate = database.isDuplicateCitationKeyExisting(
-            citeKey.get()
-        );
+        boolean isDuplicate = database.isDuplicateCitationKeyExisting(citeKey.get());
         if (isDuplicate) {
             return Collections.singletonList(
                 new IntegrityMessage(
diff --git a/src/main/java/org/jabref/logic/integrity/DoiDuplicationChecker.java b/src/main/java/org/jabref/logic/integrity/DoiDuplicationChecker.java
index dc644c00392..43949318578 100644
--- a/src/main/java/org/jabref/logic/integrity/DoiDuplicationChecker.java
+++ b/src/main/java/org/jabref/logic/integrity/DoiDuplicationChecker.java
@@ -17,16 +17,12 @@ public class DoiDuplicationChecker implements DatabaseChecker {
     @Override
     public List<IntegrityMessage> check(BibDatabase database) {
         ObservableList<BibEntry> bibEntries = database.getEntries();
-        BiMap<DOI, List<BibEntry>> duplicateMap = HashBiMap.create(
-            bibEntries.size()
-        );
+        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)
+                    duplicateMap.computeIfAbsent(doi, absentDoi -> new ArrayList<>()).add(bibEntry)
                 );
         }
 
diff --git a/src/main/java/org/jabref/logic/integrity/EditionChecker.java b/src/main/java/org/jabref/logic/integrity/EditionChecker.java
index 0bc8c857e4b..e8c513233ee 100644
--- a/src/main/java/org/jabref/logic/integrity/EditionChecker.java
+++ b/src/main/java/org/jabref/logic/integrity/EditionChecker.java
@@ -16,9 +16,7 @@ public class EditionChecker implements ValueChecker {
     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 Predicate<String> ONLY_NUMERALS = Pattern.compile("[0-9]+").asPredicate();
     private static final String FIRST_EDITION = "1";
 
     private final BibDatabaseContext bibDatabaseContextEdition;
@@ -26,12 +24,8 @@ public class EditionChecker implements ValueChecker {
     // Allow integers in 'edition' field in BibTeX mode --> see GeneralTab.fml
     private final boolean allowIntegerEdition;
 
-    public EditionChecker(
-        BibDatabaseContext bibDatabaseContext,
-        boolean allowIntegerEdition
-    ) {
-        this.bibDatabaseContextEdition =
-            Objects.requireNonNull(bibDatabaseContext);
+    public EditionChecker(BibDatabaseContext bibDatabaseContext, boolean allowIntegerEdition) {
+        this.bibDatabaseContextEdition = Objects.requireNonNull(bibDatabaseContext);
         this.allowIntegerEdition = allowIntegerEdition;
     }
 
@@ -49,41 +43,25 @@ public Optional<String> checkValue(String value) {
         }
 
         if (value.equals(FIRST_EDITION)) {
-            return Optional.of(
-                Localization.lang("edition of book reported as just 1")
-            );
+            return Optional.of(Localization.lang("edition of book reported as just 1"));
         }
 
         if (bibDatabaseContextEdition.isBiblatexMode()) {
             if (!ONLY_NUMERALS_OR_LITERALS.test(value.trim())) {
-                return Optional.of(
-                    Localization.lang("should contain an integer or a literal")
-                );
+                return Optional.of(Localization.lang("should contain an integer or a literal"));
             }
         } else {
             if (ONLY_NUMERALS.test(value) && (!allowIntegerEdition)) {
-                return Optional.of(
-                    Localization.lang(
-                        "no integer as values for edition allowed"
-                    )
-                );
+                return Optional.of(Localization.lang("no integer as values for edition allowed"));
             }
         }
-        if (
-            !isFirstCharDigit(value) &&
-            !FIRST_LETTER_CAPITALIZED.test(value.trim())
-        ) {
-            return Optional.of(
-                Localization.lang("should have the first letter capitalized")
-            );
+        if (!isFirstCharDigit(value) && !FIRST_LETTER_CAPITALIZED.test(value.trim())) {
+            return Optional.of(Localization.lang("should have the first letter capitalized"));
         }
         return Optional.empty();
     }
 
     boolean isFirstCharDigit(String input) {
-        return (
-            !StringUtil.isNullOrEmpty(input) &&
-            Character.isDigit(input.charAt(0))
-        );
+        return (!StringUtil.isNullOrEmpty(input) && Character.isDigit(input.charAt(0)));
     }
 }
diff --git a/src/main/java/org/jabref/logic/integrity/EntryLinkChecker.java b/src/main/java/org/jabref/logic/integrity/EntryLinkChecker.java
index f7222c79045..4b206c9d52c 100644
--- a/src/main/java/org/jabref/logic/integrity/EntryLinkChecker.java
+++ b/src/main/java/org/jabref/logic/integrity/EntryLinkChecker.java
@@ -26,30 +26,22 @@ public List<IntegrityMessage> check(BibEntry entry) {
         for (Entry<Field, String> field : entry.getFieldMap().entrySet()) {
             Set<FieldProperty> properties = field.getKey().getProperties();
             if (properties.contains(FieldProperty.SINGLE_ENTRY_LINK)) {
-                if (
-                    database.getEntryByCitationKey(field.getValue()).isEmpty()
-                ) {
+                if (database.getEntryByCitationKey(field.getValue()).isEmpty()) {
                     result.add(
                         new IntegrityMessage(
-                            Localization.lang(
-                                "Referenced citation key does not exist"
-                            ),
+                            Localization.lang("Referenced citation key does not exist"),
                             entry,
                             field.getKey()
                         )
                     );
                 }
             } else if (properties.contains(FieldProperty.MULTIPLE_ENTRY_LINK)) {
-                List<String> keys = new ArrayList<>(
-                    Arrays.asList(field.getValue().split(","))
-                );
+                List<String> keys = new ArrayList<>(Arrays.asList(field.getValue().split(",")));
                 for (String key : keys) {
                     if (database.getEntryByCitationKey(key).isEmpty()) {
                         result.add(
                             new IntegrityMessage(
-                                Localization.lang(
-                                    "Referenced citation key does not exist"
-                                ) +
+                                Localization.lang("Referenced citation key does not exist") +
                                 ": " +
                                 key,
                                 entry,
diff --git a/src/main/java/org/jabref/logic/integrity/FieldCheckers.java b/src/main/java/org/jabref/logic/integrity/FieldCheckers.java
index 0b8ee241c42..f2f34de002b 100644
--- a/src/main/java/org/jabref/logic/integrity/FieldCheckers.java
+++ b/src/main/java/org/jabref/logic/integrity/FieldCheckers.java
@@ -38,53 +38,31 @@ private static Multimap<Field, ValueChecker> getAllMap(
         JournalAbbreviationRepository abbreviationRepository,
         boolean allowIntegerEdition
     ) {
-        ArrayListMultimap<Field, ValueChecker> fieldCheckers =
-            ArrayListMultimap.create(50, 10);
+        ArrayListMultimap<Field, ValueChecker> fieldCheckers = ArrayListMultimap.create(50, 10);
 
         for (Field field : FieldFactory.getPersonNameFields()) {
             fieldCheckers.put(field, new PersonNamesChecker(databaseContext));
         }
         fieldCheckers.put(StandardField.BOOKTITLE, new BooktitleChecker());
         fieldCheckers.put(StandardField.TITLE, new BracketChecker());
-        fieldCheckers.put(
-            StandardField.TITLE,
-            new TitleChecker(databaseContext)
-        );
+        fieldCheckers.put(StandardField.TITLE, new TitleChecker(databaseContext));
         fieldCheckers.put(StandardField.DOI, new DoiValidityChecker());
         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.FILE, new FileChecker(databaseContext, filePreferences));
+        fieldCheckers.put(StandardField.HOWPUBLISHED, new HowPublishedChecker(databaseContext));
         fieldCheckers.put(StandardField.ISBN, new ISBNChecker());
         fieldCheckers.put(StandardField.ISSN, new ISSNChecker());
-        fieldCheckers.put(
-            StandardField.MONTH,
-            new MonthChecker(databaseContext)
-        );
-        fieldCheckers.put(
-            StandardField.MONTHFILED,
-            new MonthChecker(databaseContext)
-        );
+        fieldCheckers.put(StandardField.MONTH, new MonthChecker(databaseContext));
+        fieldCheckers.put(StandardField.MONTHFILED, new MonthChecker(databaseContext));
         fieldCheckers.put(StandardField.NOTE, new NoteChecker(databaseContext));
-        fieldCheckers.put(
-            StandardField.PAGES,
-            new PagesChecker(databaseContext)
-        );
+        fieldCheckers.put(StandardField.PAGES, new PagesChecker(databaseContext));
         fieldCheckers.put(StandardField.URL, new UrlChecker());
         fieldCheckers.put(StandardField.YEAR, new YearChecker());
         fieldCheckers.put(StandardField.KEY, new ValidCitationKeyChecker());
-        fieldCheckers.put(
-            InternalField.KEY_FIELD,
-            new ValidCitationKeyChecker()
-        );
+        fieldCheckers.put(InternalField.KEY_FIELD, new ValidCitationKeyChecker());
 
         if (databaseContext.isBiblatexMode()) {
             fieldCheckers.put(StandardField.DATE, new DateChecker());
diff --git a/src/main/java/org/jabref/logic/integrity/FileChecker.java b/src/main/java/org/jabref/logic/integrity/FileChecker.java
index 6893112e27e..adb3f7ba21d 100644
--- a/src/main/java/org/jabref/logic/integrity/FileChecker.java
+++ b/src/main/java/org/jabref/logic/integrity/FileChecker.java
@@ -17,10 +17,7 @@ public class FileChecker implements ValueChecker {
     private final BibDatabaseContext context;
     private final FilePreferences filePreferences;
 
-    public FileChecker(
-        BibDatabaseContext context,
-        FilePreferences filePreferences
-    ) {
+    public FileChecker(BibDatabaseContext context, FilePreferences filePreferences) {
         this.context = context;
         this.filePreferences = filePreferences;
     }
@@ -40,11 +37,7 @@ public Optional<String> checkValue(String value) {
         for (LinkedFile file : linkedFiles) {
             Optional<Path> linkedFile = file.findIn(context, filePreferences);
             if ((!linkedFile.isPresent()) || !Files.exists(linkedFile.get())) {
-                return Optional.of(
-                    Localization.lang(
-                        "link should refer to a correct file path"
-                    )
-                );
+                return Optional.of(Localization.lang("link should refer to a correct file path"));
             }
         }
 
diff --git a/src/main/java/org/jabref/logic/integrity/HTMLCharacterChecker.java b/src/main/java/org/jabref/logic/integrity/HTMLCharacterChecker.java
index ed9c6e8013c..99331b010a7 100644
--- a/src/main/java/org/jabref/logic/integrity/HTMLCharacterChecker.java
+++ b/src/main/java/org/jabref/logic/integrity/HTMLCharacterChecker.java
@@ -12,9 +12,7 @@
 public class HTMLCharacterChecker implements EntryChecker {
 
     // Detect any HTML encoded character
-    private static final Pattern HTML_CHARACTER_PATTERN = Pattern.compile(
-        "&[#\\p{Alnum}]+;"
-    );
+    private static final Pattern HTML_CHARACTER_PATTERN = Pattern.compile("&[#\\p{Alnum}]+;");
 
     @Override
     public List<IntegrityMessage> check(BibEntry entry) {
@@ -22,12 +20,8 @@ public List<IntegrityMessage> check(BibEntry entry) {
             .getFieldMap()
             .entrySet()
             .stream()
-            .filter(field ->
-                !field.getKey().getProperties().contains(FieldProperty.VERBATIM)
-            )
-            .filter(field ->
-                HTML_CHARACTER_PATTERN.matcher(field.getValue()).find()
-            )
+            .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"),
diff --git a/src/main/java/org/jabref/logic/integrity/HowPublishedChecker.java b/src/main/java/org/jabref/logic/integrity/HowPublishedChecker.java
index b3cbaa7cea9..740d4881dd4 100644
--- a/src/main/java/org/jabref/logic/integrity/HowPublishedChecker.java
+++ b/src/main/java/org/jabref/logic/integrity/HowPublishedChecker.java
@@ -33,13 +33,8 @@ public Optional<String> checkValue(String value) {
         }
 
         // BibTeX
-        if (
-            !databaseContext.isBiblatexMode() &&
-            !FIRST_LETTER_CAPITALIZED.test(value.trim())
-        ) {
-            return Optional.of(
-                Localization.lang("should have the first letter capitalized")
-            );
+        if (!databaseContext.isBiblatexMode() && !FIRST_LETTER_CAPITALIZED.test(value.trim())) {
+            return Optional.of(Localization.lang("should have the first letter capitalized"));
         }
 
         return Optional.empty();
diff --git a/src/main/java/org/jabref/logic/integrity/IntegrityCheck.java b/src/main/java/org/jabref/logic/integrity/IntegrityCheck.java
index 91b55b57c5a..cf3379a527e 100644
--- a/src/main/java/org/jabref/logic/integrity/IntegrityCheck.java
+++ b/src/main/java/org/jabref/logic/integrity/IntegrityCheck.java
@@ -46,9 +46,7 @@ public IntegrityCheck(
                         bibDatabaseContext,
                         citationKeyPatternPreferences
                     ),
-                    new CitationKeyDuplicationChecker(
-                        bibDatabaseContext.getDatabase()
-                    ),
+                    new CitationKeyDuplicationChecker(bibDatabaseContext.getDatabase()),
                     new AmpersandChecker(),
                     new LatexIntegrityChecker(),
                     new JournalInAbbreviationListChecker(
@@ -60,10 +58,7 @@ public IntegrityCheck(
         if (bibDatabaseContext.isBiblatexMode()) {
             entryCheckers.add(
                 new UTF8Checker(
-                    bibDatabaseContext
-                        .getMetaData()
-                        .getEncoding()
-                        .orElse(StandardCharsets.UTF_8)
+                    bibDatabaseContext.getMetaData().getEncoding().orElse(StandardCharsets.UTF_8)
                 )
             );
         } else {
diff --git a/src/main/java/org/jabref/logic/integrity/JournalInAbbreviationListChecker.java b/src/main/java/org/jabref/logic/integrity/JournalInAbbreviationListChecker.java
index deba08f63b2..f203454ebbb 100644
--- a/src/main/java/org/jabref/logic/integrity/JournalInAbbreviationListChecker.java
+++ b/src/main/java/org/jabref/logic/integrity/JournalInAbbreviationListChecker.java
@@ -19,8 +19,7 @@ public JournalInAbbreviationListChecker(
         JournalAbbreviationRepository abbreviationRepository
     ) {
         this.field = Objects.requireNonNull(field);
-        this.abbreviationRepository =
-            Objects.requireNonNull(abbreviationRepository);
+        this.abbreviationRepository = Objects.requireNonNull(abbreviationRepository);
     }
 
     @Override
diff --git a/src/main/java/org/jabref/logic/integrity/LatexIntegrityChecker.java b/src/main/java/org/jabref/logic/integrity/LatexIntegrityChecker.java
index d25b22226b5..78472dc069d 100644
--- a/src/main/java/org/jabref/logic/integrity/LatexIntegrityChecker.java
+++ b/src/main/java/org/jabref/logic/integrity/LatexIntegrityChecker.java
@@ -34,9 +34,7 @@
  */
 public class LatexIntegrityChecker implements EntryChecker {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(
-        SnuggleSession.class
-    );
+    private static final Logger LOGGER = LoggerFactory.getLogger(SnuggleSession.class);
     private static final SnuggleEngine ENGINE = new SnuggleEngine();
     private static final SnuggleSession SESSION;
     private static final ResourceBundle ERROR_MESSAGES = ENGINE
@@ -47,24 +45,8 @@ public class LatexIntegrityChecker implements EntryChecker {
 
     static {
         SnugglePackage snugglePackage = ENGINE.getPackages().get(0);
-        snugglePackage.addComplexCommand(
-            "textgreater",
-            false,
-            0,
-            TEXT_MODE_ONLY,
-            null,
-            null,
-            null
-        );
-        snugglePackage.addComplexCommand(
-            "textless",
-            false,
-            0,
-            TEXT_MODE_ONLY,
-            null,
-            null,
-            null
-        );
+        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,
@@ -74,15 +56,7 @@ public class LatexIntegrityChecker implements EntryChecker {
             null,
             null
         );
-        snugglePackage.addComplexCommand(
-            "textbar",
-            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);
 
@@ -99,21 +73,13 @@ public List<IntegrityMessage> check(BibEntry entry) {
             .getFieldMap()
             .entrySet()
             .stream()
-            .filter(field ->
-                !field.getKey().getProperties().contains(FieldProperty.VERBATIM)
-            )
+            .filter(field -> !field.getKey().getProperties().contains(FieldProperty.VERBATIM))
             .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())
+                !pair.getValue().getErrorCode().getErrorGroup().equals(CoreErrorGroup.TDE)
             )
+            .filter(pair -> !EXCLUDED_ERRORS.contains(pair.getValue().getErrorCode()))
             .map(pair ->
                 new IntegrityMessage(
                     errorMessageFormatHelper(
@@ -127,9 +93,9 @@ public List<IntegrityMessage> check(BibEntry entry) {
             .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 {
@@ -152,14 +118,10 @@ public static String errorMessageFormatHelper(
         ErrorCode snuggleTexErrorCode,
         Object... arguments
     ) {
-        String snuggletexMessagePattern =
-            LatexIntegrityChecker.ERROR_MESSAGES.getString(
-                snuggleTexErrorCode.getName()
-            );
-        String snuggletexErrorMessage = MessageFormat.format(
-            snuggletexMessagePattern,
-            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 40c92839f2b..0be29300efc 100644
--- a/src/main/java/org/jabref/logic/integrity/MonthChecker.java
+++ b/src/main/java/org/jabref/logic/integrity/MonthChecker.java
@@ -14,16 +14,13 @@ public class MonthChecker implements ValueChecker {
         .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#"
-        )
+        .compile("#jan#|#feb#|#mar#|#apr#|#may#|#jun#|#jul#|#aug#|#sep#|#oct#|#nov#|#dec#")
         .asPredicate();
 
     private final BibDatabaseContext bibDatabaseContextMonth;
 
     public MonthChecker(BibDatabaseContext bibDatabaseContext) {
-        this.bibDatabaseContextMonth =
-            Objects.requireNonNull(bibDatabaseContext);
+        this.bibDatabaseContextMonth = Objects.requireNonNull(bibDatabaseContext);
     }
 
     /**
@@ -43,19 +40,13 @@ public Optional<String> checkValue(String value) {
         // biblatex
         if (
             bibDatabaseContextMonth.isBiblatexMode() &&
-            !(ONLY_AN_INTEGER.test(value.trim()) ||
-                MONTH_NORMALIZED.test(value.trim()))
+            !(ONLY_AN_INTEGER.test(value.trim()) || MONTH_NORMALIZED.test(value.trim()))
         ) {
-            return Optional.of(
-                Localization.lang("should be an integer or normalized")
-            );
+            return Optional.of(Localization.lang("should be an integer or normalized"));
         }
 
         // BibTeX
-        if (
-            !bibDatabaseContextMonth.isBiblatexMode() &&
-            !MONTH_NORMALIZED.test(value.trim())
-        ) {
+        if (!bibDatabaseContextMonth.isBiblatexMode() && !MONTH_NORMALIZED.test(value.trim())) {
             return Optional.of(Localization.lang("should be normalized"));
         }
 
diff --git a/src/main/java/org/jabref/logic/integrity/NoBibtexFieldChecker.java b/src/main/java/org/jabref/logic/integrity/NoBibtexFieldChecker.java
index 791fe6995d2..83af0ddcd3c 100644
--- a/src/main/java/org/jabref/logic/integrity/NoBibtexFieldChecker.java
+++ b/src/main/java/org/jabref/logic/integrity/NoBibtexFieldChecker.java
@@ -41,12 +41,7 @@ public List<IntegrityMessage> check(BibEntry entry) {
             .getFields()
             .stream()
             .filter(allBiblatexOnlyFields::contains)
-            .map(name ->
-                new IntegrityMessage(
-                    Localization.lang("biblatex field only"),
-                    entry,
-                    name
-                )
+            .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 d4e837c70ec..9b1922838c6 100644
--- a/src/main/java/org/jabref/logic/integrity/NoteChecker.java
+++ b/src/main/java/org/jabref/logic/integrity/NoteChecker.java
@@ -17,8 +17,7 @@ public class NoteChecker implements ValueChecker {
     private final BibDatabaseContext bibDatabaseContextEdition;
 
     public NoteChecker(BibDatabaseContext bibDatabaseContext) {
-        this.bibDatabaseContextEdition =
-            Objects.requireNonNull(bibDatabaseContext);
+        this.bibDatabaseContextEdition = Objects.requireNonNull(bibDatabaseContext);
     }
 
     /**
@@ -38,9 +37,7 @@ public Optional<String> checkValue(String value) {
             !bibDatabaseContextEdition.isBiblatexMode() &&
             !FIRST_LETTER_CAPITALIZED.test(value.trim())
         ) {
-            return Optional.of(
-                Localization.lang("should have the first letter capitalized")
-            );
+            return Optional.of(Localization.lang("should have the first letter capitalized"));
         }
 
         return Optional.empty();
diff --git a/src/main/java/org/jabref/logic/integrity/PagesChecker.java b/src/main/java/org/jabref/logic/integrity/PagesChecker.java
index fb139e5be33..6fc1b3f2c5b 100644
--- a/src/main/java/org/jabref/logic/integrity/PagesChecker.java
+++ b/src/main/java/org/jabref/logic/integrity/PagesChecker.java
@@ -35,8 +35,7 @@ public class PagesChecker implements ValueChecker {
 
     public PagesChecker(BibDatabaseContext databaseContext) {
         if (databaseContext.isBiblatexMode()) {
-            isValidPageNumber =
-                Pattern.compile(PAGES_EXP_BIBLATEX).asPredicate();
+            isValidPageNumber = Pattern.compile(PAGES_EXP_BIBLATEX).asPredicate();
         } else {
             isValidPageNumber = Pattern.compile(PAGES_EXP_BIBTEX).asPredicate();
         }
@@ -63,9 +62,7 @@ public Optional<String> checkValue(String value) {
                 .map(String::trim)
                 .anyMatch(pageRange -> !isValidPageNumber.test(pageRange))
         ) {
-            return Optional.of(
-                Localization.lang("should contain a valid page number range")
-            );
+            return Optional.of(Localization.lang("should contain a valid page number range"));
         }
         return Optional.empty();
     }
diff --git a/src/main/java/org/jabref/logic/integrity/PersonNamesChecker.java b/src/main/java/org/jabref/logic/integrity/PersonNamesChecker.java
index 999b7685414..4c87f10a442 100644
--- a/src/main/java/org/jabref/logic/integrity/PersonNamesChecker.java
+++ b/src/main/java/org/jabref/logic/integrity/PersonNamesChecker.java
@@ -25,13 +25,11 @@ public Optional<String> checkValue(String value) {
 
         String valueTrimmedAndLowerCase = value.trim().toLowerCase(Locale.ROOT);
         if (
-            valueTrimmedAndLowerCase.startsWith("and ") ||
-            valueTrimmedAndLowerCase.startsWith(",")
+            valueTrimmedAndLowerCase.startsWith("and ") || valueTrimmedAndLowerCase.startsWith(",")
         ) {
             return Optional.of(Localization.lang("should start with a name"));
         } else if (
-            valueTrimmedAndLowerCase.endsWith(" and") ||
-            valueTrimmedAndLowerCase.endsWith(",")
+            valueTrimmedAndLowerCase.endsWith(" and") || valueTrimmedAndLowerCase.endsWith(",")
         ) {
             return Optional.of(Localization.lang("should end with a name"));
         }
diff --git a/src/main/java/org/jabref/logic/integrity/TitleChecker.java b/src/main/java/org/jabref/logic/integrity/TitleChecker.java
index 55f0c7bf818..aa2acb07113 100644
--- a/src/main/java/org/jabref/logic/integrity/TitleChecker.java
+++ b/src/main/java/org/jabref/logic/integrity/TitleChecker.java
@@ -9,12 +9,8 @@
 
 public class TitleChecker implements ValueChecker {
 
-    private static final Pattern INSIDE_CURLY_BRAKETS = Pattern.compile(
-        "\\{[^}\\{]*\\}"
-    );
-    private static final Pattern DELIMITERS = Pattern.compile(
-        "\\.|\\!|\\?|\\;|\\:|\\["
-    );
+    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();
@@ -49,18 +45,14 @@ public Optional<String> checkValue(String value) {
             .matcher(value)
             .replaceAll("");
 
-        String[] splitTitle = DELIMITERS.split(
-            valueOnlySpacesWithinCurlyBraces
-        );
+        String[] splitTitle = DELIMITERS.split(valueOnlySpacesWithinCurlyBraces);
         for (String subTitle : splitTitle) {
             subTitle = subTitle.trim();
             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 {}"
-                        )
+                        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 570facb33b5..b1994341aff 100644
--- a/src/main/java/org/jabref/logic/integrity/TypeChecker.java
+++ b/src/main/java/org/jabref/logic/integrity/TypeChecker.java
@@ -20,9 +20,7 @@ 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"
-                    ),
+                    Localization.lang("wrong entry type as proceedings has page numbers"),
                     entry,
                     StandardField.PAGES
                 )
diff --git a/src/main/java/org/jabref/logic/integrity/UTF8Checker.java b/src/main/java/org/jabref/logic/integrity/UTF8Checker.java
index 938097ff15d..89ebe3294c0 100644
--- a/src/main/java/org/jabref/logic/integrity/UTF8Checker.java
+++ b/src/main/java/org/jabref/logic/integrity/UTF8Checker.java
@@ -39,9 +39,7 @@ public UTF8Checker(Charset charset) {
     public List<IntegrityMessage> check(BibEntry entry) {
         List<IntegrityMessage> results = new ArrayList<>();
         for (Map.Entry<Field, String> field : entry.getFieldMap().entrySet()) {
-            boolean utfOnly = UTF8EncodingChecker(
-                field.getValue().getBytes(charset)
-            );
+            boolean utfOnly = UTF8EncodingChecker(field.getValue().getBytes(charset));
             if (!utfOnly) {
                 results.add(
                     new IntegrityMessage(
diff --git a/src/main/java/org/jabref/logic/integrity/YearChecker.java b/src/main/java/org/jabref/logic/integrity/YearChecker.java
index 8c9112a3c99..20924a04120 100644
--- a/src/main/java/org/jabref/logic/integrity/YearChecker.java
+++ b/src/main/java/org/jabref/logic/integrity/YearChecker.java
@@ -30,18 +30,12 @@ public Optional<String> checkValue(String value) {
         }
 
         if (!CONTAINS_FOUR_DIGIT.test(value.trim())) {
-            return Optional.of(
-                Localization.lang("should contain a four digit number")
-            );
+            return Optional.of(Localization.lang("should contain a four digit number"));
         }
 
-        if (
-            !ENDS_WITH_FOUR_DIGIT.test(value.replaceAll(PUNCTUATION_MARKS, ""))
-        ) {
+        if (!ENDS_WITH_FOUR_DIGIT.test(value.replaceAll(PUNCTUATION_MARKS, ""))) {
             return Optional.of(
-                Localization.lang(
-                    "last four nonpunctuation characters should be numerals"
-                )
+                Localization.lang("last four nonpunctuation characters should be numerals")
             );
         }
 
diff --git a/src/main/java/org/jabref/logic/journals/Abbreviation.java b/src/main/java/org/jabref/logic/journals/Abbreviation.java
index 87c83b1f84d..90424b40cf1 100644
--- a/src/main/java/org/jabref/logic/journals/Abbreviation.java
+++ b/src/main/java/org/jabref/logic/journals/Abbreviation.java
@@ -18,11 +18,7 @@ public Abbreviation(String name, String abbreviation) {
         this(name, abbreviation, "");
     }
 
-    public Abbreviation(
-        String name,
-        String abbreviation,
-        String shortestUniqueAbbreviation
-    ) {
+    public Abbreviation(String name, String abbreviation, String shortestUniqueAbbreviation) {
         this(
             name,
             abbreviation,
@@ -41,8 +37,7 @@ private Abbreviation(
         this.name = name.intern();
         this.abbreviation = abbreviation.intern();
         this.dotlessAbbreviation = dotlessAbbreviation.intern();
-        this.shortestUniqueAbbreviation =
-            shortestUniqueAbbreviation.trim().intern();
+        this.shortestUniqueAbbreviation = shortestUniqueAbbreviation.trim().intern();
     }
 
     public String getName() {
@@ -78,14 +73,12 @@ public int compareTo(Abbreviation toCompare) {
             return nameComparison;
         }
 
-        int abbreviationComparison = getAbbreviation()
-            .compareTo(toCompare.getAbbreviation());
+        int abbreviationComparison = getAbbreviation().compareTo(toCompare.getAbbreviation());
         if (abbreviationComparison != 0) {
             return abbreviationComparison;
         }
 
-        return getShortestUniqueAbbreviation()
-            .compareTo(toCompare.getShortestUniqueAbbreviation());
+        return getShortestUniqueAbbreviation().compareTo(toCompare.getShortestUniqueAbbreviation());
     }
 
     public String getNext(String current) {
@@ -130,17 +123,12 @@ public boolean equals(Object o) {
         return (
             getName().equals(that.getName()) &&
             getAbbreviation().equals(that.getAbbreviation()) &&
-            getShortestUniqueAbbreviation()
-                .equals(that.getShortestUniqueAbbreviation())
+            getShortestUniqueAbbreviation().equals(that.getShortestUniqueAbbreviation())
         );
     }
 
     @Override
     public int hashCode() {
-        return Objects.hash(
-            getName(),
-            getAbbreviation(),
-            getShortestUniqueAbbreviation()
-        );
+        return Objects.hash(getName(), getAbbreviation(), getShortestUniqueAbbreviation());
     }
 }
diff --git a/src/main/java/org/jabref/logic/journals/AbbreviationParser.java b/src/main/java/org/jabref/logic/journals/AbbreviationParser.java
index 3bcf80de366..7e5049a28d3 100644
--- a/src/main/java/org/jabref/logic/journals/AbbreviationParser.java
+++ b/src/main/java/org/jabref/logic/journals/AbbreviationParser.java
@@ -20,8 +20,7 @@ public class AbbreviationParser {
     private static final char NO_DELIMITER = '\0'; // empty char
 
     // Ensures ordering while preventing duplicates
-    private final LinkedHashSet<Abbreviation> abbreviations =
-        new LinkedHashSet<>();
+    private final LinkedHashSet<Abbreviation> abbreviations = new LinkedHashSet<>();
 
     /*
      * Read the given file, which should contain a list of journal names and their abbreviations. Each line should be
@@ -41,12 +40,8 @@ void readJournalListFromFile(Path file) throws IOException {
         ) {
             for (CSVRecord csvRecord : csvParser) {
                 String name = csvRecord.size() > 0 ? csvRecord.get(0) : "";
-                String abbreviation = csvRecord.size() > 1
-                    ? csvRecord.get(1)
-                    : "";
-                String shortestUniqueAbbreviation = csvRecord.size() > 2
-                    ? csvRecord.get(2)
-                    : "";
+                String abbreviation = csvRecord.size() > 1 ? csvRecord.get(1) : "";
+                String shortestUniqueAbbreviation = csvRecord.size() > 2 ? csvRecord.get(2) : "";
 
                 // Check name and abbreviation
                 if (name.isEmpty() || abbreviation.isEmpty()) {
@@ -64,12 +59,7 @@ void readJournalListFromFile(Path file) throws IOException {
     }
 
     private char detectDelimiter(Path file) throws IOException {
-        try (
-            BufferedReader reader = Files.newBufferedReader(
-                file,
-                StandardCharsets.UTF_8
-            )
-        ) {
+        try (BufferedReader reader = Files.newBufferedReader(file, StandardCharsets.UTF_8)) {
             String line = reader.readLine();
 
             if (line == null) {
diff --git a/src/main/java/org/jabref/logic/journals/AbbreviationWriter.java b/src/main/java/org/jabref/logic/journals/AbbreviationWriter.java
index f90adf4f131..0ef631de99c 100644
--- a/src/main/java/org/jabref/logic/journals/AbbreviationWriter.java
+++ b/src/main/java/org/jabref/logic/journals/AbbreviationWriter.java
@@ -22,10 +22,8 @@ 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 {
+    public static void writeOrCreate(Path path, List<Abbreviation> abbreviations)
+        throws IOException {
         try (
             OutputStreamWriter writer = new OutputStreamWriter(
                 Files.newOutputStream(path),
@@ -38,10 +36,7 @@ public static void writeOrCreate(
         ) {
             for (Abbreviation entry : abbreviations) {
                 if (entry.isDefaultShortestUniqueAbbreviation()) {
-                    csvPrinter.printRecord(
-                        entry.getName(),
-                        entry.getAbbreviation()
-                    );
+                    csvPrinter.printRecord(entry.getName(), entry.getAbbreviation());
                 } else {
                     csvPrinter.printRecord(
                         entry.getName(),
diff --git a/src/main/java/org/jabref/logic/journals/JournalAbbreviationLoader.java b/src/main/java/org/jabref/logic/journals/JournalAbbreviationLoader.java
index f9e4bd052cf..a1f21b4be9b 100644
--- a/src/main/java/org/jabref/logic/journals/JournalAbbreviationLoader.java
+++ b/src/main/java/org/jabref/logic/journals/JournalAbbreviationLoader.java
@@ -21,13 +21,10 @@
  */
 public class JournalAbbreviationLoader {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(
-        JournalAbbreviationLoader.class
-    );
+    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);
@@ -46,9 +43,7 @@ public static JournalAbbreviationRepository loadRepository(
                 )
         ) {
             if (resourceAsStream == null) {
-                LOGGER.warn(
-                    "There is no journal-list.mv. We use a default journal list"
-                );
+                LOGGER.warn("There is no journal-list.mv. We use a default journal list");
                 repository = new JournalAbbreviationRepository();
             } else {
                 Path tempDir = Files.createTempDirectory("jabref-journal");
@@ -64,8 +59,7 @@ public static JournalAbbreviationRepository loadRepository(
         }
 
         // Read external lists
-        List<String> lists =
-            journalAbbreviationPreferences.getExternalJournalLists();
+        List<String> lists = journalAbbreviationPreferences.getExternalJournalLists();
         // might produce NPE in tests
         if (lists != null && !(lists.isEmpty())) {
             // reversing ensures that the latest lists overwrites the former one
@@ -76,11 +70,7 @@ public static JournalAbbreviationRepository loadRepository(
                         readAbbreviationsFromCsvFile(Path.of(filename))
                     );
                 } catch (IOException e) {
-                    LOGGER.error(
-                        "Cannot read external journal list file {}",
-                        filename,
-                        e
-                    );
+                    LOGGER.error("Cannot read external journal list file {}", filename, e);
                 }
             }
         }
@@ -88,8 +78,6 @@ public static JournalAbbreviationRepository loadRepository(
     }
 
     public static JournalAbbreviationRepository loadBuiltInRepository() {
-        return loadRepository(
-            new JournalAbbreviationPreferences(Collections.emptyList(), true)
-        );
+        return loadRepository(new JournalAbbreviationPreferences(Collections.emptyList(), true));
     }
 }
diff --git a/src/main/java/org/jabref/logic/journals/JournalAbbreviationPreferences.java b/src/main/java/org/jabref/logic/journals/JournalAbbreviationPreferences.java
index 1c2f7704a33..b569d36cd5d 100644
--- a/src/main/java/org/jabref/logic/journals/JournalAbbreviationPreferences.java
+++ b/src/main/java/org/jabref/logic/journals/JournalAbbreviationPreferences.java
@@ -15,8 +15,7 @@ public JournalAbbreviationPreferences(
         List<String> externalJournalLists,
         boolean useFJournalField
     ) {
-        this.externalJournalLists =
-            FXCollections.observableArrayList(externalJournalLists);
+        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 3bd1681a123..6c7cf79c3be 100644
--- a/src/main/java/org/jabref/logic/journals/JournalAbbreviationRepository.java
+++ b/src/main/java/org/jabref/logic/journals/JournalAbbreviationRepository.java
@@ -20,14 +20,10 @@ public class JournalAbbreviationRepository {
 
     static final Pattern QUESTION_MARK = Pattern.compile("\\?");
 
-    private final Map<String, Abbreviation> fullToAbbreviationObject =
-        new HashMap<>();
-    private final Map<String, Abbreviation> abbreviationToAbbreviationObject =
-        new HashMap<>();
-    private final Map<String, Abbreviation> dotlessToAbbreviationObject =
-        new HashMap<>();
-    private final Map<String, Abbreviation> shortestUniqueToAbbreviationObject =
-        new HashMap<>();
+    private final Map<String, Abbreviation> fullToAbbreviationObject = new HashMap<>();
+    private final Map<String, Abbreviation> abbreviationToAbbreviationObject = new HashMap<>();
+    private final Map<String, Abbreviation> dotlessToAbbreviationObject = new HashMap<>();
+    private final Map<String, Abbreviation> shortestUniqueToAbbreviationObject = new HashMap<>();
     private final TreeSet<Abbreviation> customAbbreviations = new TreeSet<>();
 
     /**
@@ -44,26 +40,19 @@ public JournalAbbreviationRepository(Path journalList) {
             mvFullToAbbreviationObject = store.openMap("FullToAbbreviation");
             mvFullToAbbreviationObject.forEach((name, abbreviation) -> {
                 String abbrevationString = abbreviation.getAbbreviation();
-                String shortestUniqueAbbreviation =
-                    abbreviation.getShortestUniqueAbbreviation();
+                String shortestUniqueAbbreviation = abbreviation.getShortestUniqueAbbreviation();
                 Abbreviation newAbbreviation = new Abbreviation(
                     name,
                     abbrevationString,
                     shortestUniqueAbbreviation
                 );
                 fullToAbbreviationObject.put(name, newAbbreviation);
-                abbreviationToAbbreviationObject.put(
-                    abbrevationString,
-                    newAbbreviation
-                );
+                abbreviationToAbbreviationObject.put(abbrevationString, newAbbreviation);
                 dotlessToAbbreviationObject.put(
                     newAbbreviation.getDotlessAbbreviation(),
                     newAbbreviation
                 );
-                shortestUniqueToAbbreviationObject.put(
-                    shortestUniqueAbbreviation,
-                    newAbbreviation
-                );
+                shortestUniqueToAbbreviationObject.put(shortestUniqueAbbreviation, newAbbreviation);
             });
         }
     }
@@ -72,11 +61,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);
@@ -92,10 +77,7 @@ private static boolean isMatched(String name, Abbreviation abbreviation) {
         );
     }
 
-    private static boolean isMatchedAbbreviated(
-        String name,
-        Abbreviation abbreviation
-    ) {
+    private static boolean isMatchedAbbreviated(String name, Abbreviation abbreviation) {
         boolean isExpanded = name.equalsIgnoreCase(abbreviation.getName());
         if (isExpanded) {
             return false;
@@ -115,9 +97,7 @@ public boolean isKnownName(String journalName) {
         if (QUESTION_MARK.matcher(journalName).find()) {
             return false;
         }
-        String journal = journalName
-            .trim()
-            .replaceAll(Matcher.quoteReplacement("\\&"), "&");
+        String journal = journalName.trim().replaceAll(Matcher.quoteReplacement("\\&"), "&");
         return (
             customAbbreviations
                 .stream()
@@ -137,15 +117,11 @@ public boolean isAbbreviatedName(String journalName) {
         if (QUESTION_MARK.matcher(journalName).find()) {
             return false;
         }
-        String journal = journalName
-            .trim()
-            .replaceAll(Matcher.quoteReplacement("\\&"), "&");
+        String journal = journalName.trim().replaceAll(Matcher.quoteReplacement("\\&"), "&");
         return (
             customAbbreviations
                 .stream()
-                .anyMatch(abbreviation ->
-                    isMatchedAbbreviated(journal, abbreviation)
-                ) ||
+                .anyMatch(abbreviation -> isMatchedAbbreviated(journal, abbreviation)) ||
             abbreviationToAbbreviationObject.containsKey(journal) ||
             dotlessToAbbreviationObject.containsKey(journal) ||
             shortestUniqueToAbbreviationObject.containsKey(journal)
@@ -159,9 +135,7 @@ public boolean isAbbreviatedName(String journalName) {
      */
     public Optional<Abbreviation> get(String input) {
         // Clean up input: trim and unescape ampersand
-        String journal = input
-            .trim()
-            .replaceAll(Matcher.quoteReplacement("\\&"), "&");
+        String journal = input.trim().replaceAll(Matcher.quoteReplacement("\\&"), "&");
 
         Optional<Abbreviation> customAbbreviation = customAbbreviations
             .stream()
@@ -173,19 +147,9 @@ public Optional<Abbreviation> get(String input) {
 
         return Optional
             .ofNullable(fullToAbbreviationObject.get(journal))
-            .or(() ->
-                Optional.ofNullable(
-                    abbreviationToAbbreviationObject.get(journal)
-                )
-            )
-            .or(() ->
-                Optional.ofNullable(dotlessToAbbreviationObject.get(journal))
-            )
-            .or(() ->
-                Optional.ofNullable(
-                    shortestUniqueToAbbreviationObject.get(journal)
-                )
-            );
+            .or(() -> Optional.ofNullable(abbreviationToAbbreviationObject.get(journal)))
+            .or(() -> Optional.ofNullable(dotlessToAbbreviationObject.get(journal)))
+            .or(() -> Optional.ofNullable(shortestUniqueToAbbreviationObject.get(journal)));
     }
 
     public void addCustomAbbreviation(Abbreviation abbreviation) {
@@ -201,9 +165,7 @@ public Collection<Abbreviation> getCustomAbbreviations() {
         return customAbbreviations;
     }
 
-    public void addCustomAbbreviations(
-        Collection<Abbreviation> abbreviationsToAdd
-    ) {
+    public void addCustomAbbreviations(Collection<Abbreviation> abbreviationsToAdd) {
         abbreviationsToAdd.forEach(this::addCustomAbbreviation);
     }
 
diff --git a/src/main/java/org/jabref/logic/l10n/Localization.java b/src/main/java/org/jabref/logic/l10n/Localization.java
index b1df49d77ee..ab6714efa31 100644
--- a/src/main/java/org/jabref/logic/l10n/Localization.java
+++ b/src/main/java/org/jabref/logic/l10n/Localization.java
@@ -51,15 +51,10 @@ private Localization() {}
      */
     public static String lang(String key, Object... params) {
         if (localizedMessages == null) {
-            System.err.println(
-                "Messages are not initialized before accessing key: " + key
-            );
+            System.err.println("Messages are not initialized before accessing key: " + key);
             setLanguage(Language.ENGLISH);
         }
-        var stringParams = Arrays
-            .stream(params)
-            .map(Object::toString)
-            .toArray(String[]::new);
+        var stringParams = Arrays.stream(params).map(Object::toString).toArray(String[]::new);
         return lookup(localizedMessages, key, stringParams);
     }
 
@@ -70,9 +65,7 @@ public static String lang(String key, Object... params) {
      * @param language Language identifier like "en", "de", etc.
      */
     public static void setLanguage(Language language) {
-        Optional<Locale> knownLanguage = Language.convertToSupportedLocale(
-            language
-        );
+        Optional<Locale> knownLanguage = Language.convertToSupportedLocale(language);
         final Locale defaultLocale = Locale.getDefault();
         if (knownLanguage.isEmpty()) {
             LoggerFactory
@@ -87,11 +80,7 @@ public static void setLanguage(Language language) {
         }
         // avoid reinitialization of the language bundles
         final Locale langLocale = knownLanguage.get();
-        if (
-            (locale != null) &&
-            locale.equals(langLocale) &&
-            locale.equals(defaultLocale)
-        ) {
+        if ((locale != null) && locale.equals(langLocale) && locale.equals(defaultLocale)) {
             return;
         }
         locale = langLocale;
@@ -134,14 +123,8 @@ public static LocalizationBundle getMessages() {
      * @param locale Localization to use.
      */
     private static void createResourceBundles(Locale locale) {
-        ResourceBundle messages = ResourceBundle.getBundle(
-            RESOURCE_PREFIX,
-            locale
-        );
-        Objects.requireNonNull(
-            messages,
-            "Could not load " + RESOURCE_PREFIX + " resource."
-        );
+        ResourceBundle messages = ResourceBundle.getBundle(RESOURCE_PREFIX, locale);
+        Objects.requireNonNull(messages, "Could not load " + RESOURCE_PREFIX + " resource.");
         localizedMessages = new LocalizationBundle(createLookupMap(messages));
     }
 
@@ -151,12 +134,8 @@ private static void createResourceBundles(Locale locale) {
      * @param baseBundle JabRef language bundle with keys and values for translations.
      * @return Lookup map for the baseBundle.
      */
-    private static Map<String, String> createLookupMap(
-        ResourceBundle baseBundle
-    ) {
-        final ArrayList<String> baseKeys = Collections.list(
-            baseBundle.getKeys()
-        );
+    private static Map<String, String> createLookupMap(ResourceBundle baseBundle) {
+        final ArrayList<String> baseKeys = Collections.list(baseBundle.getKeys());
         return new HashMap<>(
             baseKeys
                 .stream()
@@ -179,16 +158,10 @@ private static Map<String, String> createLookupMap(
      * @param params The parameters that should be inserted into the message
      * @return The final message with replaced parameters.
      */
-    private static String lookup(
-        LocalizationBundle bundle,
-        String key,
-        String... params
-    ) {
+    private static String lookup(LocalizationBundle bundle, String key, String... params) {
         Objects.requireNonNull(key);
 
-        String translation = bundle.containsKey(key)
-            ? bundle.getString(key)
-            : "";
+        String translation = bundle.containsKey(key) ? bundle.getString(key) : "";
         if (translation.isEmpty()) {
             LoggerFactory
                 .getLogger(Localization.class)
@@ -199,8 +172,7 @@ private static String lookup(
                 );
             translation = key;
         }
-        return new LocalizationKeyParams(translation, params)
-            .replacePlaceholders();
+        return new LocalizationKeyParams(translation, params).replacePlaceholders();
     }
 
     /**
diff --git a/src/main/java/org/jabref/logic/l10n/LocalizationKeyParams.java b/src/main/java/org/jabref/logic/l10n/LocalizationKeyParams.java
index 2ada6c0690a..64647355cc4 100644
--- a/src/main/java/org/jabref/logic/l10n/LocalizationKeyParams.java
+++ b/src/main/java/org/jabref/logic/l10n/LocalizationKeyParams.java
@@ -13,9 +13,7 @@ public LocalizationKeyParams(String key, String... params) {
         this.key = LocalizationKey.fromKey(key);
         this.params = Arrays.asList(params);
         if (this.params.size() > 10) {
-            throw new IllegalStateException(
-                "Translations can only have at most 10 parameters"
-            );
+            throw new IllegalStateException("Translations can only have at most 10 parameters");
         }
     }
 
@@ -24,11 +22,7 @@ public String replacePlaceholders() {
 
         for (int i = 0; i < params.size(); i++) {
             String param = params.get(i);
-            translation =
-                translation.replaceAll(
-                    "%" + i,
-                    Matcher.quoteReplacement(param)
-                );
+            translation = translation.replaceAll("%" + i, Matcher.quoteReplacement(param));
         }
 
         return translation;
diff --git a/src/main/java/org/jabref/logic/layout/AbstractParamLayoutFormatter.java b/src/main/java/org/jabref/logic/layout/AbstractParamLayoutFormatter.java
index 3b4b99fefc7..ee0fc8cbe5a 100644
--- a/src/main/java/org/jabref/logic/layout/AbstractParamLayoutFormatter.java
+++ b/src/main/java/org/jabref/logic/layout/AbstractParamLayoutFormatter.java
@@ -7,8 +7,7 @@
  * This is an abstract implementation of ParamLayoutFormatter, which provides some
  * functionality for the handling of argument strings.
  */
-public abstract class AbstractParamLayoutFormatter
-    implements ParamLayoutFormatter {
+public abstract class AbstractParamLayoutFormatter implements ParamLayoutFormatter {
 
     private static final char SEPARATOR = ',';
 
@@ -26,10 +25,7 @@ protected static List<String> parseArgument(String arg) {
         StringBuilder current = new StringBuilder();
         boolean escaped = false;
         for (int i = 0; i < arg.length(); i++) {
-            if (
-                (arg.charAt(i) == AbstractParamLayoutFormatter.SEPARATOR) &&
-                !escaped
-            ) {
+            if ((arg.charAt(i) == AbstractParamLayoutFormatter.SEPARATOR) && !escaped) {
                 parts.add(current.toString());
                 current = new StringBuilder();
             } else if (arg.charAt(i) == '\\') {
diff --git a/src/main/java/org/jabref/logic/layout/Layout.java b/src/main/java/org/jabref/logic/layout/Layout.java
index 22f50f3a315..50f1078249d 100644
--- a/src/main/java/org/jabref/logic/layout/Layout.java
+++ b/src/main/java/org/jabref/logic/layout/Layout.java
@@ -63,9 +63,7 @@ public Layout(
                             blockEntries = null;
                         } else {
                             LOGGER.debug(blockStart + '\n' + parsedEntry.s);
-                            LOGGER.warn(
-                                "Nested field/group entries are not implemented!"
-                            );
+                            LOGGER.warn("Nested field/group entries are not implemented!");
                             Thread.dumpStack();
                         }
                     }
@@ -102,10 +100,7 @@ public void setPostFormatter(LayoutFormatter formatter) {
     }
 
     public String getText() {
-        return layoutEntries
-            .stream()
-            .map(LayoutEntry::getText)
-            .collect(Collectors.joining("\n"));
+        return layoutEntries.stream().map(LayoutEntry::getText).collect(Collectors.joining("\n"));
     }
 
     /**
@@ -138,10 +133,7 @@ public String doLayout(BibEntry bibtex, BibDatabase database) {
      * string references will be replaced by the strings' contents. Even
      * recursive string references are resolved.
      */
-    public String doLayout(
-        BibDatabaseContext databaseContext,
-        Charset encoding
-    ) {
+    public String doLayout(BibDatabaseContext databaseContext, Charset encoding) {
         StringBuilder sb = new StringBuilder(100);
         String fieldText;
 
diff --git a/src/main/java/org/jabref/logic/layout/LayoutEntry.java b/src/main/java/org/jabref/logic/layout/LayoutEntry.java
index 9170bbbbc4d..5c79f154e46 100644
--- a/src/main/java/org/jabref/logic/layout/LayoutEntry.java
+++ b/src/main/java/org/jabref/logic/layout/LayoutEntry.java
@@ -96,9 +96,7 @@
 
 class LayoutEntry {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(
-        LayoutEntry.class
-    );
+    private static final Logger LOGGER = LoggerFactory.getLogger(LayoutEntry.class);
 
     private List<LayoutFormatter> option;
     // Formatter to be run after other formatters:
@@ -122,10 +120,7 @@ public LayoutEntry(
         this.preferences = preferences;
         this.abbreviationRepository = abbreviationRepository;
         this.fileDirForDatabase =
-            Objects.requireNonNullElse(
-                fileDirForDatabase,
-                Collections.emptyList()
-            );
+            Objects.requireNonNullElse(fileDirForDatabase, Collections.emptyList());
 
         type = si.i;
         switch (type) {
@@ -148,10 +143,7 @@ public LayoutEntry(
         this.preferences = preferences;
         this.abbreviationRepository = abbreviationRepository;
         this.fileDirForDatabase =
-            Objects.requireNonNullElse(
-                fileDirForDatabase,
-                Collections.emptyList()
-            );
+            Objects.requireNonNullElse(fileDirForDatabase, Collections.emptyList());
 
         List<LayoutEntry> tmpEntries = new ArrayList<>();
         String blockStart = parsedEntries.get(0).s;
@@ -164,10 +156,7 @@ public LayoutEntry(
         type = layoutType;
         text = blockEnd;
         List<StringInt> blockEntries = null;
-        for (StringInt parsedEntry : parsedEntries.subList(
-            1,
-            parsedEntries.size() - 1
-        )) {
+        for (StringInt parsedEntry : parsedEntries.subList(1, parsedEntries.size() - 1)) {
             switch (parsedEntry.i) {
                 case LayoutHelper.IS_FIELD_START:
                 case LayoutHelper.IS_GROUP_START:
@@ -178,8 +167,7 @@ public LayoutEntry(
                 case LayoutHelper.IS_GROUP_END:
                     if (blockStart.equals(parsedEntry.s)) {
                         blockEntries.add(parsedEntry);
-                        int groupType = parsedEntry.i ==
-                            LayoutHelper.IS_GROUP_END
+                        int groupType = parsedEntry.i == LayoutHelper.IS_GROUP_END
                             ? LayoutHelper.IS_GROUP_START
                             : LayoutHelper.IS_FIELD_START;
                         LayoutEntry le = new LayoutEntry(
@@ -192,9 +180,7 @@ public LayoutEntry(
                         tmpEntries.add(le);
                         blockEntries = null;
                     } else {
-                        LOGGER.warn(
-                            "Nested field entries are not implemented!"
-                        );
+                        LOGGER.warn("Nested field entries are not implemented!");
                     }
                     break;
                 case LayoutHelper.IS_LAYOUT_TEXT:
@@ -236,10 +222,7 @@ public String doLayout(BibEntry bibtex, BibDatabase database) {
                 return text;
             case LayoutHelper.IS_SIMPLE_COMMAND:
                 String value = bibtex
-                    .getResolvedFieldOrAlias(
-                        FieldFactory.parseField(text),
-                        database
-                    )
+                    .getResolvedFieldOrAlias(FieldFactory.parseField(text), database)
                     .orElse("");
 
                 // If a post formatter has been set, call it:
@@ -260,10 +243,7 @@ public String doLayout(BibEntry bibtex, BibDatabase database) {
                 // 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
-                    )
+                    .getResolvedFieldOrAlias(new UnknownField("encoding"), database)
                     .orElse(null);
             default:
                 return "";
@@ -313,18 +293,11 @@ private String handleOptionField(BibEntry bibtex, BibDatabase database) {
         return fieldEntry;
     }
 
-    private String handleFieldOrGroupStart(
-        BibEntry bibtex,
-        BibDatabase database
-    ) {
+    private String handleFieldOrGroupStart(BibEntry bibtex, BibDatabase database) {
         Optional<String> field;
         boolean negated = false;
         if (type == LayoutHelper.IS_GROUP_START) {
-            field =
-                bibtex.getResolvedFieldOrAlias(
-                    FieldFactory.parseField(text),
-                    database
-                );
+            field = bibtex.getResolvedFieldOrAlias(FieldFactory.parseField(text), database);
         } else if (text.matches(".*(;|(\\&+)).*")) {
             // split the strings along &, && or ; for AND formatter
             String[] parts = text.split("\\s*(;|(\\&+))\\s*");
@@ -333,9 +306,7 @@ private String handleFieldOrGroupStart(
                 negated = part.startsWith("!");
                 field =
                     bibtex.getResolvedFieldOrAlias(
-                        FieldFactory.parseField(
-                            negated ? part.substring(1).trim() : part
-                        ),
+                        FieldFactory.parseField(negated ? part.substring(1).trim() : part),
                         database
                     );
                 if (field.isPresent() == negated) {
@@ -350,9 +321,7 @@ private String handleFieldOrGroupStart(
                 negated = part.startsWith("!");
                 field =
                     bibtex.getResolvedFieldOrAlias(
-                        FieldFactory.parseField(
-                            negated ? part.substring(1).trim() : part
-                        ),
+                        FieldFactory.parseField(negated ? part.substring(1).trim() : part),
                         database
                     );
                 if (field.isPresent() ^ negated) {
@@ -380,13 +349,7 @@ private String handleFieldOrGroupStart(
 
                 if (fieldText == null) {
                     if ((i + 1) < layoutEntries.size()) {
-                        if (
-                            layoutEntries
-                                .get(i + 1)
-                                .doLayout(bibtex, database)
-                                .trim()
-                                .isEmpty()
-                        ) {
+                        if (layoutEntries.get(i + 1).doLayout(bibtex, database).trim().isEmpty()) {
                             i++;
                             previousSkipped = true;
                             continue;
@@ -400,8 +363,7 @@ private String handleFieldOrGroupStart(
 
                         while (
                             (eol < fieldText.length()) &&
-                            ((fieldText.charAt(eol) == '\n') ||
-                                (fieldText.charAt(eol) == '\r'))
+                            ((fieldText.charAt(eol) == '\n') || (fieldText.charAt(eol) == '\r'))
                         ) {
                             eol++;
                         }
@@ -426,10 +388,7 @@ private String handleFieldOrGroupStart(
      *
      * @param databaseContext Bibtex Database
      */
-    public String doLayout(
-        BibDatabaseContext databaseContext,
-        Charset encoding
-    ) {
+    public String doLayout(BibDatabaseContext databaseContext, Charset encoding) {
         switch (type) {
             case LayoutHelper.IS_LAYOUT_TEXT:
                 return text;
@@ -448,10 +407,7 @@ public String doLayout(
                     "field and group ends not allowed in begin or end layout"
                 );
             case LayoutHelper.IS_OPTION_FIELD:
-                String field = BibDatabase.getText(
-                    text,
-                    databaseContext.getDatabase()
-                );
+                String field = BibDatabase.getText(text, databaseContext.getDatabase());
                 if (option != null) {
                     for (LayoutFormatter anOption : option) {
                         field = anOption.format(field);
@@ -501,11 +457,9 @@ private void doOptionField(String s) {
     private LayoutFormatter getLayoutFormatterByName(String name) {
         return switch (name) {
             // For backward compatibility
-            case "HTMLToLatexFormatter",
-                "HtmlToLatex" -> new HtmlToLatexFormatter();
+            case "HTMLToLatexFormatter", "HtmlToLatex" -> new HtmlToLatexFormatter();
             // For backward compatibility
-            case "UnicodeToLatexFormatter",
-                "UnicodeToLatex" -> new UnicodeToLatexFormatter();
+            case "UnicodeToLatexFormatter", "UnicodeToLatex" -> new UnicodeToLatexFormatter();
             case "OOPreFormatter" -> new OOPreFormatter();
             case "AuthorAbbreviator" -> new AuthorAbbreviator();
             case "AuthorAndToSemicolonReplacer" -> new AuthorAndToSemicolonReplacer();
@@ -546,13 +500,10 @@ private LayoutFormatter getLayoutFormatterByName(String name) {
             case "HTMLParagraphs" -> new HTMLParagraphs();
             case "Iso690FormatDate" -> new Iso690FormatDate();
             case "Iso690NamesAuthors" -> new Iso690NamesAuthors();
-            case "JournalAbbreviator" -> new JournalAbbreviator(
-                abbreviationRepository
-            );
+            case "JournalAbbreviator" -> new JournalAbbreviator(abbreviationRepository);
             case "LastPage" -> new LastPage();
             // For backward compatibility
-            case "FormatChars",
-                "LatexToUnicode" -> new LatexToUnicodeFormatter();
+            case "FormatChars", "LatexToUnicode" -> new LatexToUnicodeFormatter();
             case "NameFormatter" -> new NameFormatter();
             case "NoSpaceBetweenAbbreviations" -> new NoSpaceBetweenAbbreviations();
             case "Ordinal" -> new Ordinal();
@@ -568,10 +519,7 @@ private LayoutFormatter getLayoutFormatterByName(String name) {
             case "ToUpperCase" -> new ToUpperCase();
             case "XMLChars" -> new XMLChars();
             case "Default" -> new Default();
-            case "FileLink" -> new FileLink(
-                fileDirForDatabase,
-                preferences.getMainFileDirectory()
-            );
+            case "FileLink" -> new FileLink(fileDirForDatabase, preferences.getMainFileDirectory());
             case "Number" -> new Number();
             case "RisAuthors" -> new RisAuthors();
             case "Authors" -> new Authors();
@@ -596,9 +544,7 @@ private LayoutFormatter getLayoutFormatterByName(String name) {
      */
     private List<LayoutFormatter> getOptionalLayout(String formatterName) {
         List<List<String>> formatterStrings = parseMethodsCalls(formatterName);
-        List<LayoutFormatter> results = new ArrayList<>(
-            formatterStrings.size()
-        );
+        List<LayoutFormatter> results = new ArrayList<>(formatterStrings.size());
         Map<String, String> userNameFormatter = NameFormatter.getNameFormatters(
             preferences.getNameFormatterPreferences()
         );
@@ -606,8 +552,7 @@ private List<LayoutFormatter> getOptionalLayout(String formatterName) {
             String nameFormatterName = strings.get(0).trim();
 
             // Check if this is a name formatter defined by this export filter:
-            Optional<String> contents =
-                preferences.getCustomExportNameFormatter(nameFormatterName);
+            Optional<String> contents = preferences.getCustomExportNameFormatter(nameFormatterName);
             if (contents.isPresent()) {
                 NameFormatter nf = new NameFormatter();
                 nf.setParameter(contents.get());
@@ -616,14 +561,11 @@ private List<LayoutFormatter> getOptionalLayout(String formatterName) {
             }
 
             // Try to load from formatters in formatter folder
-            LayoutFormatter formatter = getLayoutFormatterByName(
-                nameFormatterName
-            );
+            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) &&
+                    (formatter instanceof ParamLayoutFormatter layoutFormatter) &&
                     (strings.size() >= 2)
                 ) {
                     layoutFormatter.setArgument(strings.get(1));
@@ -633,9 +575,7 @@ private List<LayoutFormatter> getOptionalLayout(String formatterName) {
             }
 
             // Then check whether this is a user defined formatter
-            String formatterParameter = userNameFormatter.get(
-                nameFormatterName
-            );
+            String formatterParameter = userNameFormatter.get(nameFormatterName);
             if (formatterParameter != null) {
                 NameFormatter nf = new NameFormatter();
                 nf.setParameter(formatterParameter);
@@ -663,10 +603,7 @@ public static List<List<String>> parseMethodsCalls(String calls) {
             int start = i;
             if (Character.isJavaIdentifierStart(c[i])) {
                 i++;
-                while (
-                    (i < c.length) &&
-                    (Character.isJavaIdentifierPart(c[i]) || (c[i] == '.'))
-                ) {
+                while ((i < c.length) && (Character.isJavaIdentifierPart(c[i]) || (c[i] == '.'))) {
                     i++;
                 }
                 if ((i < c.length) && (c[i] == '(')) {
@@ -713,10 +650,7 @@ public static List<List<String>> parseMethodsCalls(String calls) {
 
                             int startParam = i;
 
-                            while (
-                                (i < c.length) &&
-                                (!((c[i] == ')') && (bracelevel == 0)))
-                            ) {
+                            while ((i < c.length) && (!((c[i] == ')') && (bracelevel == 0)))) {
                                 if (c[i] == '(') {
                                     bracelevel++;
                                 } 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 76818b2e9b7..74a0e0406ea 100644
--- a/src/main/java/org/jabref/logic/layout/LayoutFormatterPreferences.java
+++ b/src/main/java/org/jabref/logic/layout/LayoutFormatterPreferences.java
@@ -10,8 +10,7 @@ public class LayoutFormatterPreferences {
 
     private final NameFormatterPreferences nameFormatterPreferences;
     private final StringProperty mainFileDirectoryProperty;
-    private final Map<String, String> customExportNameFormatters =
-        new HashMap<>();
+    private final Map<String, String> customExportNameFormatters = new HashMap<>();
 
     public LayoutFormatterPreferences(
         NameFormatterPreferences nameFormatterPreferences,
@@ -30,19 +29,14 @@ public String getMainFileDirectory() {
     }
 
     public Optional<String> getCustomExportNameFormatter(String formatterName) {
-        return Optional.ofNullable(
-            customExportNameFormatters.get(formatterName)
-        );
+        return Optional.ofNullable(customExportNameFormatters.get(formatterName));
     }
 
     public void clearCustomExportNameFormatters() {
         customExportNameFormatters.clear();
     }
 
-    public void putCustomExportNameFormatter(
-        String formatterName,
-        String contents
-    ) {
+    public void putCustomExportNameFormatter(String formatterName, String contents) {
         customExportNameFormatters.put(formatterName, contents);
     }
 }
diff --git a/src/main/java/org/jabref/logic/layout/LayoutHelper.java b/src/main/java/org/jabref/logic/layout/LayoutHelper.java
index 1796a557485..39ed6df8b17 100644
--- a/src/main/java/org/jabref/logic/layout/LayoutHelper.java
+++ b/src/main/java/org/jabref/logic/layout/LayoutHelper.java
@@ -78,12 +78,7 @@ public Layout getLayoutFromText() throws IOException {
             }
         }
 
-        return new Layout(
-            parsedEntries,
-            fileDirForDatabase,
-            preferences,
-            abbreviationRepository
-        );
+        return new Layout(parsedEntries, fileDirForDatabase, preferences, abbreviationRepository);
     }
 
     public static String getCurrentGroup() {
@@ -113,9 +108,7 @@ private void doBracketedField(final int field) throws IOException {
             if ((currentCharacter == '{') || (currentCharacter == '}')) {
                 if (currentCharacter == '}') {
                     if (buffer != null) {
-                        parsedEntries.add(
-                            new StringInt(buffer.toString(), field)
-                        );
+                        parsedEntries.add(new StringInt(buffer.toString(), field));
                         return;
                     }
                 } else {
@@ -155,18 +148,14 @@ private void doBracketedOptionField() throws IOException {
                         tmp = buffer.toString() + '\n' + option;
                     }
 
-                    parsedEntries.add(
-                        new StringInt(tmp, LayoutHelper.IS_OPTION_FIELD)
-                    );
+                    parsedEntries.add(new StringInt(tmp, LayoutHelper.IS_OPTION_FIELD));
                 }
 
                 return;
             }
             if (
                 !inQuotes &&
-                ((c == ']') ||
-                    (c == '[') ||
-                    (doneWithOptions && ((c == '{') || (c == '}'))))
+                ((c == ']') || (c == '[') || (doneWithOptions && ((c == '{') || (c == '}'))))
             ) {
                 if ((c == ']') || (doneWithOptions && (c == '}'))) {
                     // changed section start - arudert
@@ -182,18 +171,14 @@ private void doBracketedOptionField() throws IOException {
                         // bracketed option must be followed by an (optionally empty) parameter
                         // 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();
+                        String parameter = buffer == null ? " " : buffer.toString();
                         if (option == null) {
                             tmp = parameter;
                         } else {
                             tmp = parameter + '\n' + option;
                         }
 
-                        parsedEntries.add(
-                            new StringInt(tmp, LayoutHelper.IS_OPTION_FIELD)
-                        );
+                        parsedEntries.add(new StringInt(tmp, LayoutHelper.IS_OPTION_FIELD));
 
                         return;
                     }
@@ -245,10 +230,7 @@ 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
-                        )
+                        new StringInt(buffer.toString(), LayoutHelper.IS_LAYOUT_TEXT)
                     );
                 }
 
@@ -258,10 +240,7 @@ private void parse() throws IOException {
             if ((c == '\\') && (peek() != '\\') && !escaped) {
                 if (buffer != null) {
                     parsedEntries.add(
-                        new StringInt(
-                            buffer.toString(),
-                            LayoutHelper.IS_LAYOUT_TEXT
-                        )
+                        new StringInt(buffer.toString(), LayoutHelper.IS_LAYOUT_TEXT)
                     );
 
                     buffer = null;
@@ -347,17 +326,13 @@ private void parseField() throws IOException {
                     // Print the name of the database BIB file.
                     // This is only supported in begin/end layouts, not in
                     // entry layouts.
-                    parsedEntries.add(
-                        new StringInt(name, LayoutHelper.IS_FILENAME)
-                    );
+                    parsedEntries.add(new StringInt(name, LayoutHelper.IS_FILENAME));
                     return;
                 } else if ("filepath".equalsIgnoreCase(name)) {
                     // Print the full path of the database BIB file.
                     // This is only supported in begin/end layouts, not in
                     // entry layouts.
-                    parsedEntries.add(
-                        new StringInt(name, LayoutHelper.IS_FILEPATH)
-                    );
+                    parsedEntries.add(new StringInt(name, LayoutHelper.IS_FILEPATH));
                     return;
                 } else if ("end".equalsIgnoreCase(name)) {
                     // get field name
@@ -371,16 +346,12 @@ private void parseField() throws IOException {
                     // Print the name of the current encoding used for export.
                     // This is only supported in begin/end layouts, not in
                     // entry layouts.
-                    parsedEntries.add(
-                        new StringInt(name, LayoutHelper.IS_ENCODING_NAME)
-                    );
+                    parsedEntries.add(new StringInt(name, LayoutHelper.IS_ENCODING_NAME));
                     return;
                 }
 
                 // for all other cases -> simple command
-                parsedEntries.add(
-                    new StringInt(name, LayoutHelper.IS_SIMPLE_COMMAND)
-                );
+                parsedEntries.add(new StringInt(name, LayoutHelper.IS_SIMPLE_COMMAND));
 
                 return;
             } else {
diff --git a/src/main/java/org/jabref/logic/layout/TextBasedPreviewLayout.java b/src/main/java/org/jabref/logic/layout/TextBasedPreviewLayout.java
index 7dc3eba7948..f029ac6a6e3 100644
--- a/src/main/java/org/jabref/logic/layout/TextBasedPreviewLayout.java
+++ b/src/main/java/org/jabref/logic/layout/TextBasedPreviewLayout.java
@@ -17,9 +17,7 @@ public class TextBasedPreviewLayout implements PreviewLayout {
 
     public static final String NAME = "PREVIEW";
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(
-        TextBasedPreviewLayout.class
-    );
+    private static final Logger LOGGER = LoggerFactory.getLogger(TextBasedPreviewLayout.class);
     private Layout layout;
     private String text;
     private LayoutFormatterPreferences layoutFormatterPreferences;
@@ -45,11 +43,7 @@ public void setText(String text) {
         StringReader sr = new StringReader(text.replace("__NEWLINE__", "\n"));
         try {
             layout =
-                new LayoutHelper(
-                    sr,
-                    layoutFormatterPreferences,
-                    abbreviationRepository
-                )
+                new LayoutHelper(sr, layoutFormatterPreferences, abbreviationRepository)
                     .getLayoutFromText();
         } catch (IOException e) {
             LOGGER.error("Could not generate layout", e);
@@ -57,10 +51,7 @@ public void setText(String text) {
     }
 
     @Override
-    public String generatePreview(
-        BibEntry entry,
-        BibDatabaseContext databaseContext
-    ) {
+    public String generatePreview(BibEntry entry, BibDatabaseContext databaseContext) {
         if (layout != null) {
             return layout.doLayout(entry, databaseContext.getDatabase());
         } else {
diff --git a/src/main/java/org/jabref/logic/layout/format/AuthorFirstFirstCommas.java b/src/main/java/org/jabref/logic/layout/format/AuthorFirstFirstCommas.java
index d0a70f5bcbb..f2e7a272c8f 100644
--- a/src/main/java/org/jabref/logic/layout/format/AuthorFirstFirstCommas.java
+++ b/src/main/java/org/jabref/logic/layout/format/AuthorFirstFirstCommas.java
@@ -15,10 +15,6 @@ public class AuthorFirstFirstCommas implements LayoutFormatter {
 
     @Override
     public String format(String fieldText) {
-        return AuthorList.fixAuthorFirstNameFirstCommas(
-            fieldText,
-            false,
-            false
-        );
+        return AuthorList.fixAuthorFirstNameFirstCommas(fieldText, false, false);
     }
 }
diff --git a/src/main/java/org/jabref/logic/layout/format/AuthorFirstLastCommas.java b/src/main/java/org/jabref/logic/layout/format/AuthorFirstLastCommas.java
index b7a17712567..48365852525 100644
--- a/src/main/java/org/jabref/logic/layout/format/AuthorFirstLastCommas.java
+++ b/src/main/java/org/jabref/logic/layout/format/AuthorFirstLastCommas.java
@@ -15,10 +15,6 @@ public class AuthorFirstLastCommas implements LayoutFormatter {
 
     @Override
     public String format(String fieldText) {
-        return AuthorList.fixAuthorFirstNameFirstCommas(
-            fieldText,
-            false,
-            false
-        );
+        return AuthorList.fixAuthorFirstNameFirstCommas(fieldText, false, false);
     }
 }
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 98a4c06e565..a92b9b6c6ce 100644
--- a/src/main/java/org/jabref/logic/layout/format/Authors.java
+++ b/src/main/java/org/jabref/logic/layout/format/Authors.java
@@ -109,9 +109,7 @@ public void setArgument(String arg) {
     }
 
     private void handleArgument(String key, String value) {
-        if (
-            Authors.AUTHOR_ORDER.contains(key.trim().toLowerCase(Locale.ROOT))
-        ) {
+        if (Authors.AUTHOR_ORDER.contains(key.trim().toLowerCase(Locale.ROOT))) {
             if (comp(key, "FirstFirst")) {
                 flMode = Authors.FIRST_FIRST;
             } else if (comp(key, "LastFirst")) {
@@ -119,9 +117,7 @@ private void handleArgument(String key, String value) {
             } else if (comp(key, "LastFirstFirstFirst")) {
                 flMode = Authors.LF_FF;
             }
-        } else if (
-            Authors.AUTHOR_ABRV.contains(key.trim().toLowerCase(Locale.ROOT))
-        ) {
+        } else if (Authors.AUTHOR_ABRV.contains(key.trim().toLowerCase(Locale.ROOT))) {
             if (comp(key, "FullName")) {
                 abbreviate = false;
             } else if (comp(key, "Initials")) {
@@ -139,9 +135,7 @@ private void handleArgument(String key, String value) {
                 abbreviate = true;
                 abbrSpaces = false;
             }
-        } else if (
-            Authors.AUTHOR_PUNC.contains(key.trim().toLowerCase(Locale.ROOT))
-        ) {
+        } else if (Authors.AUTHOR_PUNC.contains(key.trim().toLowerCase(Locale.ROOT))) {
             if (comp(key, "FullPunc")) {
                 abbrDots = true;
                 lastFirstSeparator = ", ";
@@ -157,9 +151,7 @@ private void handleArgument(String key, String value) {
             }
         } else if (
             Authors.SEPARATORS.contains(key.trim().toLowerCase(Locale.ROOT)) ||
-            Authors.LAST_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>]
@@ -244,8 +236,7 @@ public String format(String fieldText) {
                 addSingleName(
                     sb,
                     a,
-                    (flMode == Authors.FIRST_FIRST) ||
-                    ((flMode == Authors.LF_FF) && (i > 0))
+                    (flMode == Authors.FIRST_FIRST) || ((flMode == Authors.LF_FF) && (i > 0))
                 );
 
                 if (i < (al.getNumberOfAuthors() - 2)) {
@@ -255,19 +246,11 @@ public String format(String fieldText) {
                 }
             }
         } else {
-            for (
-                int i = 0;
-                i < Math.min(al.getNumberOfAuthors() - 1, authorNumberEtAl);
-                i++
-            ) {
+            for (int i = 0; i < Math.min(al.getNumberOfAuthors() - 1, authorNumberEtAl); i++) {
                 if (i > 0) {
                     sb.append(separator);
                 }
-                addSingleName(
-                    sb,
-                    al.getAuthor(i),
-                    flMode == Authors.FIRST_FIRST
-                );
+                addSingleName(sb, al.getAuthor(i), flMode == Authors.FIRST_FIRST);
             }
             sb.append(etAlString);
         }
@@ -300,11 +283,9 @@ private void addSingleName(StringBuilder sb, Author a, boolean firstFirst) {
                     firstNameResult = a.getFirst().get();
                     int index = firstNameResult.indexOf(' ');
                     if (index >= 0) {
-                        firstNameResult =
-                            firstNameResult.substring(0, index + 1);
+                        firstNameResult = firstNameResult.substring(0, index + 1);
                         if (abbr.length() > 3) {
-                            firstNameResult =
-                                firstNameResult + abbr.substring(3);
+                            firstNameResult = firstNameResult + abbr.substring(3);
                         }
                     }
                 }
@@ -326,10 +307,7 @@ private void addSingleName(StringBuilder sb, Author a, boolean firstFirst) {
             sb.append(firstNameResult).append(firstFirstSeparator);
             sb.append(lastNameSB);
         } else {
-            sb
-                .append(lastNameSB)
-                .append(lastFirstSeparator)
-                .append(firstNameResult);
+            sb.append(lastNameSB).append(lastFirstSeparator).append(firstNameResult);
         }
     }
 }
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 c37063bd4e8..a9dbc17f6e6 100644
--- a/src/main/java/org/jabref/logic/layout/format/CreateBibORDFAuthors.java
+++ b/src/main/java/org/jabref/logic/layout/format/CreateBibORDFAuthors.java
@@ -33,11 +33,7 @@ public String format(String fieldText) {
         return sb.toString();
     }
 
-    private static void singleAuthor(
-        StringBuilder sb,
-        String author,
-        int position
-    ) {
+    private static void singleAuthor(StringBuilder sb, String author, int position) {
         sb.append("<bibo:contribution>\n");
         sb.append("  <bibo:Contribution>\n");
         sb.append(
@@ -47,10 +43,7 @@ private static void singleAuthor(
             .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: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/CreateDocBook4Authors.java b/src/main/java/org/jabref/logic/layout/format/CreateDocBook4Authors.java
index b6efacd3fcc..c873c8fbd24 100644
--- a/src/main/java/org/jabref/logic/layout/format/CreateDocBook4Authors.java
+++ b/src/main/java/org/jabref/logic/layout/format/CreateDocBook4Authors.java
@@ -14,12 +14,7 @@ public String format(String fieldText) {
         StringBuilder sb = new StringBuilder(100);
         AuthorList al = AuthorList.parse(fieldText);
         DocBookAuthorFormatter formatter = new DocBookAuthorFormatter();
-        formatter.addBody(
-            sb,
-            al,
-            StandardField.AUTHOR.getName(),
-            DocBookVersion.DOCBOOK_4
-        );
+        formatter.addBody(sb, al, StandardField.AUTHOR.getName(), DocBookVersion.DOCBOOK_4);
         return sb.toString();
     }
 }
diff --git a/src/main/java/org/jabref/logic/layout/format/CreateDocBook4Editors.java b/src/main/java/org/jabref/logic/layout/format/CreateDocBook4Editors.java
index 7c834849379..36b03c3937a 100644
--- a/src/main/java/org/jabref/logic/layout/format/CreateDocBook4Editors.java
+++ b/src/main/java/org/jabref/logic/layout/format/CreateDocBook4Editors.java
@@ -15,12 +15,7 @@ public String format(String fieldText) {
         StringBuilder sb = new StringBuilder(100);
         AuthorList al = AuthorList.parse(fieldText);
         DocBookAuthorFormatter formatter = new DocBookAuthorFormatter();
-        formatter.addBody(
-            sb,
-            al,
-            StandardField.EDITOR.getName(),
-            DocBookVersion.DOCBOOK_4
-        );
+        formatter.addBody(sb, al, StandardField.EDITOR.getName(), DocBookVersion.DOCBOOK_4);
         return sb.toString();
     }
 }
diff --git a/src/main/java/org/jabref/logic/layout/format/CreateDocBook5Authors.java b/src/main/java/org/jabref/logic/layout/format/CreateDocBook5Authors.java
index 4154f3d3b3a..f5b17b62987 100644
--- a/src/main/java/org/jabref/logic/layout/format/CreateDocBook5Authors.java
+++ b/src/main/java/org/jabref/logic/layout/format/CreateDocBook5Authors.java
@@ -15,12 +15,7 @@ public String format(String fieldText) {
         AuthorList al = AuthorList.parse(fieldText);
 
         DocBookAuthorFormatter authorFormatter = new DocBookAuthorFormatter();
-        authorFormatter.addBody(
-            sb,
-            al,
-            StandardField.AUTHOR.getName(),
-            DocBookVersion.DOCBOOK_5
-        );
+        authorFormatter.addBody(sb, al, StandardField.AUTHOR.getName(), DocBookVersion.DOCBOOK_5);
         return sb.toString();
     }
 }
diff --git a/src/main/java/org/jabref/logic/layout/format/CreateDocBook5Editors.java b/src/main/java/org/jabref/logic/layout/format/CreateDocBook5Editors.java
index 4205be58ff6..c98e256d733 100644
--- a/src/main/java/org/jabref/logic/layout/format/CreateDocBook5Editors.java
+++ b/src/main/java/org/jabref/logic/layout/format/CreateDocBook5Editors.java
@@ -15,12 +15,7 @@ public String format(String fieldText) {
         StringBuilder sb = new StringBuilder(100);
         AuthorList al = AuthorList.parse(fieldText);
         DocBookAuthorFormatter formatter = new DocBookAuthorFormatter();
-        formatter.addBody(
-            sb,
-            al,
-            StandardField.EDITOR.getName(),
-            DocBookVersion.DOCBOOK_5
-        );
+        formatter.addBody(sb, al, StandardField.EDITOR.getName(), DocBookVersion.DOCBOOK_5);
         return sb.toString();
     }
 }
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 3967dcdcea4..65f06b16724 100644
--- a/src/main/java/org/jabref/logic/layout/format/DateFormatter.java
+++ b/src/main/java/org/jabref/logic/layout/format/DateFormatter.java
@@ -11,10 +11,7 @@ public class DateFormatter implements ParamLayoutFormatter {
     @Override
     public String format(String fieldText) {
         DateTimeFormatter formatter = DateTimeFormatter.ofPattern(formatString);
-        LocalDate date = LocalDate.parse(
-            fieldText,
-            DateTimeFormatter.ISO_LOCAL_DATE
-        );
+        LocalDate date = LocalDate.parse(fieldText, DateTimeFormatter.ISO_LOCAL_DATE);
         return date.format(formatter);
     }
 
diff --git a/src/main/java/org/jabref/logic/layout/format/Default.java b/src/main/java/org/jabref/logic/layout/format/Default.java
index 4e3b0863cb4..3467c378c95 100644
--- a/src/main/java/org/jabref/logic/layout/format/Default.java
+++ b/src/main/java/org/jabref/logic/layout/format/Default.java
@@ -17,8 +17,6 @@ public void setArgument(String arg) {
 
     @Override
     public String format(String fieldText) {
-        return (fieldText == null) || fieldText.isEmpty()
-            ? defValue
-            : fieldText;
+        return (fieldText == null) || fieldText.isEmpty() ? defValue : fieldText;
     }
 }
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 7b43adfcee8..8480822404e 100644
--- a/src/main/java/org/jabref/logic/layout/format/DocBookAuthorFormatter.java
+++ b/src/main/java/org/jabref/logic/layout/format/DocBookAuthorFormatter.java
@@ -13,12 +13,7 @@ public class DocBookAuthorFormatter {
     /**
      * @param tagName Editor or author field/tag
      */
-    public void addBody(
-        StringBuilder sb,
-        AuthorList al,
-        String tagName,
-        DocBookVersion version
-    ) {
+    public void addBody(StringBuilder sb, AuthorList al, String tagName, DocBookVersion version) {
         for (int i = 0; i < al.getNumberOfAuthors(); i++) {
             sb.append('<').append(tagName).append('>');
             if (version == DocBookVersion.DOCBOOK_5) {
@@ -29,19 +24,13 @@ public void addBody(
                 .getFirst()
                 .filter(first -> !first.isEmpty())
                 .ifPresent(first ->
-                    sb
-                        .append("<firstname>")
-                        .append(XML_CHARS.format(first))
-                        .append("</firstname>")
+                    sb.append("<firstname>").append(XML_CHARS.format(first)).append("</firstname>")
                 );
             a
                 .getVon()
                 .filter(von -> !von.isEmpty())
                 .ifPresent(von ->
-                    sb
-                        .append("<othername>")
-                        .append(XML_CHARS.format(von))
-                        .append("</othername>")
+                    sb.append("<othername>").append(XML_CHARS.format(von)).append("</othername>")
                 );
             a
                 .getLast()
@@ -51,9 +40,7 @@ public void addBody(
                     a
                         .getJr()
                         .filter(jr -> !jr.isEmpty())
-                        .ifPresent(jr ->
-                            sb.append(' ').append(XML_CHARS.format(jr))
-                        );
+                        .ifPresent(jr -> sb.append(' ').append(XML_CHARS.format(jr)));
                     sb.append("</surname>");
                     if (version == DocBookVersion.DOCBOOK_5) {
                         sb.append("</personname>");
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 575e0956fcf..535c7e28a14 100644
--- a/src/main/java/org/jabref/logic/layout/format/FileLink.java
+++ b/src/main/java/org/jabref/logic/layout/format/FileLink.java
@@ -57,10 +57,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 40f8ec9d433..04621f248a5 100644
--- a/src/main/java/org/jabref/logic/layout/format/HTMLChars.java
+++ b/src/main/java/org/jabref/logic/layout/format/HTMLChars.java
@@ -60,9 +60,7 @@ 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}
@@ -83,9 +81,7 @@ public String format(String inField) {
                         }
                         String result = HTML_CHARS.get(command + commandBody);
 
-                        sb.append(
-                            Objects.requireNonNullElse(result, commandBody)
-                        );
+                        sb.append(Objects.requireNonNullElse(result, commandBody));
 
                         incommand = false;
                         escaped = false;
@@ -98,18 +94,14 @@ public String format(String inField) {
                              * then keep
                              * the text of the parameter intact.
                              */
-                            sb.append(
-                                Objects.requireNonNullElse(result, command)
-                            );
+                            sb.append(Objects.requireNonNullElse(result, command));
                         }
                     }
                 }
             } else {
                 if (!incommand) {
                     sb.append(c);
-                } else if (
-                    Character.isWhitespace(c) || (c == '{') || (c == '}')
-                ) {
+                } else if (Character.isWhitespace(c) || (c == '{') || (c == '}')) {
                     String command = currentCommand.toString();
 
                     // Test if we are dealing with a formatting
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 38376d8e549..d985bc1585e 100644
--- a/src/main/java/org/jabref/logic/layout/format/HTMLParagraphs.java
+++ b/src/main/java/org/jabref/logic/layout/format/HTMLParagraphs.java
@@ -10,9 +10,7 @@
  */
 public class HTMLParagraphs implements LayoutFormatter {
 
-    private static final Pattern BEFORE_NEW_LINES_PATTERN = Pattern.compile(
-        "(.*?)\\n\\s*\\n"
-    );
+    private static final Pattern BEFORE_NEW_LINES_PATTERN = Pattern.compile("(.*?)\\n\\s*\\n");
 
     @Override
     public String format(String fieldText) {
@@ -26,9 +24,7 @@ public String format(String fieldText) {
             return trimmedFieldText;
         }
 
-        Matcher m = HTMLParagraphs.BEFORE_NEW_LINES_PATTERN.matcher(
-            trimmedFieldText
-        );
+        Matcher m = HTMLParagraphs.BEFORE_NEW_LINES_PATTERN.matcher(trimmedFieldText);
         StringBuilder s = new StringBuilder();
         while (m.find()) {
             String middle = m.group(1).trim();
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 a0b3fb7d6a8..a6f31c96f70 100644
--- a/src/main/java/org/jabref/logic/layout/format/IfPlural.java
+++ b/src/main/java/org/jabref/logic/layout/format/IfPlural.java
@@ -32,9 +32,7 @@ public void setArgument(String arg) {
 
     @Override
     public String format(String fieldText) {
-        if (
-            (fieldText == null) || fieldText.isEmpty() || (pluralText == null)
-        ) {
+        if ((fieldText == null) || fieldText.isEmpty() || (pluralText == null)) {
             return ""; // TODO: argument missing or invalid. Print an error message here?
         }
         if (fieldText.matches(".*\\sand\\s.*")) {
diff --git a/src/main/java/org/jabref/logic/layout/format/LatexToUnicodeFormatter.java b/src/main/java/org/jabref/logic/layout/format/LatexToUnicodeFormatter.java
index e9c28e7d84f..d0d40370cd3 100644
--- a/src/main/java/org/jabref/logic/layout/format/LatexToUnicodeFormatter.java
+++ b/src/main/java/org/jabref/logic/layout/format/LatexToUnicodeFormatter.java
@@ -9,9 +9,7 @@
  * This formatter converts LaTeX character sequences their equivalent unicode characters,
  * and removes other LaTeX commands without handling them.
  */
-public class LatexToUnicodeFormatter
-    extends Formatter
-    implements LayoutFormatter {
+public class LatexToUnicodeFormatter extends Formatter implements LayoutFormatter {
 
     @Override
     public String getName() {
@@ -30,9 +28,7 @@ public String format(String inField) {
 
     @Override
     public String getDescription() {
-        return Localization.lang(
-            "Converts LaTeX encoding to Unicode characters."
-        );
+        return Localization.lang("Converts LaTeX encoding to Unicode characters.");
     }
 
     @Override
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 7e57044cf61..21f7750c584 100644
--- a/src/main/java/org/jabref/logic/layout/format/NameFormatter.java
+++ b/src/main/java/org/jabref/logic/layout/format/NameFormatter.java
@@ -78,11 +78,7 @@ public class NameFormatter implements LayoutFormatter {
 
     private String parameter = NameFormatter.DEFAULT_FORMAT;
 
-    private static String format(
-        String toFormat,
-        AuthorList al,
-        String[] formats
-    ) {
+    private static String format(String toFormat, AuthorList al, String[] formats) {
         StringBuilder sb = new StringBuilder();
 
         int n = al.getNumberOfAuthors();
@@ -90,9 +86,7 @@ private static String format(
         for (int i = 1; i <= al.getNumberOfAuthors(); i++) {
             for (int j = 1; j < formats.length; j += 2) {
                 if ("*".equals(formats[j])) {
-                    sb.append(
-                        BstNameFormatter.formatName(toFormat, i, formats[j + 1])
-                    );
+                    sb.append(BstNameFormatter.formatName(toFormat, i, formats[j + 1]));
                     break;
                 } else {
                     String[] range = formats[j].split("\\.\\.");
@@ -118,13 +112,7 @@ private static String format(
                     }
 
                     if ((s <= i) && (i <= e)) {
-                        sb.append(
-                            BstNameFormatter.formatName(
-                                toFormat,
-                                i,
-                                formats[j + 1]
-                            )
-                        );
+                        sb.append(BstNameFormatter.formatName(toFormat, i, formats[j + 1]));
                         break;
                     }
                 }
@@ -155,9 +143,7 @@ public String format(String toFormat, String inParameters) {
             if ("*".equals(formatString[0])) {
                 return format(toFormat, al, formatString);
             } else {
-                if (
-                    al.getNumberOfAuthors() <= Integer.parseInt(formatString[0])
-                ) {
+                if (al.getNumberOfAuthors() <= Integer.parseInt(formatString[0])) {
                     return format(toFormat, al, formatString);
                 }
             }
@@ -174,9 +160,7 @@ public void setParameter(String parameter) {
         this.parameter = parameter;
     }
 
-    public static Map<String, String> getNameFormatters(
-        NameFormatterPreferences prefs
-    ) {
+    public static Map<String, String> getNameFormatters(NameFormatterPreferences prefs) {
         Objects.requireNonNull(prefs);
 
         Map<String, String> result = new HashMap<>();
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 7f7ef390bd8..aaf654402ce 100644
--- a/src/main/java/org/jabref/logic/layout/format/NameFormatterPreferences.java
+++ b/src/main/java/org/jabref/logic/layout/format/NameFormatterPreferences.java
@@ -13,10 +13,8 @@ public NameFormatterPreferences(
         List<String> nameFormatterKey,
         List<String> nameFormatterValue
     ) {
-        this.nameFormatterKey =
-            FXCollections.observableArrayList(nameFormatterKey);
-        this.nameFormatterValue =
-            FXCollections.observableArrayList(nameFormatterValue);
+        this.nameFormatterKey = FXCollections.observableArrayList(nameFormatterKey);
+        this.nameFormatterValue = FXCollections.observableArrayList(nameFormatterValue);
     }
 
     public ObservableList<String> getNameFormatterKey() {
diff --git a/src/main/java/org/jabref/logic/layout/format/NotFoundFormatter.java b/src/main/java/org/jabref/logic/layout/format/NotFoundFormatter.java
index 481d88f7736..00976b78f4c 100644
--- a/src/main/java/org/jabref/logic/layout/format/NotFoundFormatter.java
+++ b/src/main/java/org/jabref/logic/layout/format/NotFoundFormatter.java
@@ -21,11 +21,6 @@ public String getNotFound() {
 
     @Override
     public String format(String fieldText) {
-        return (
-            '[' +
-            Localization.lang("Formatter not found: %0", notFound) +
-            "] " +
-            fieldText
-        );
+        return ('[' + Localization.lang("Formatter not found: %0", notFound) + "] " + fieldText);
     }
 }
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 a28ee5bb661..e3f8f92e146 100644
--- a/src/main/java/org/jabref/logic/layout/format/RTFChars.java
+++ b/src/main/java/org/jabref/logic/layout/format/RTFChars.java
@@ -24,9 +24,7 @@
  */
 public class RTFChars implements LayoutFormatter {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(
-        LayoutFormatter.class
-    );
+    private static final Logger LOGGER = LoggerFactory.getLogger(LayoutFormatter.class);
 
     private static final RtfCharMap RTF_CHARS = new RtfCharMap();
 
@@ -58,9 +56,7 @@ 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}
@@ -94,8 +90,7 @@ public String format(String field) {
                 }
             } else {
                 testContent:if (
-                    !incommand ||
-                    (!Character.isWhitespace(c) && (c != '{') && (c != '}'))
+                    !incommand || (!Character.isWhitespace(c) && (c != '{') && (c != '}'))
                 ) {
                     sb.append(c);
                 } else {
@@ -124,10 +119,7 @@ public String format(String field) {
                         break testContent;
                     }
 
-                    if (
-                        ((c == '{') || (c == ' ')) &&
-                        (currentCommand.length() > 0)
-                    ) {
+                    if (((c == '{') || (c == ' ')) && (currentCommand.length() > 0)) {
                         String command = currentCommand.toString();
                         // Then test if we are dealing with a italics or bold
                         // command. If so, handle.
@@ -140,9 +132,7 @@ public String format(String field) {
                             StringInt part = getPart(field, i, c == '{');
                             i += part.i;
                             sb.append("{\\i ").append(part.s).append('}');
-                        } else if (
-                            "textbf".equals(command) || "bf".equals(command)
-                        ) {
+                        } else if ("textbf".equals(command) || "bf".equals(command)) {
                             StringInt part = getPart(field, i, c == '{');
                             i += part.i;
                             sb.append("{\\b ").append(part.s).append('}');
@@ -169,10 +159,7 @@ public String format(String field) {
             if (c < 128) {
                 sb.append(c);
             } else {
-                sb
-                    .append("\\u")
-                    .append((long) c)
-                    .append(transformSpecialCharacter(c));
+                sb.append("\\u").append((long) c).append(transformSpecialCharacter(c));
             }
         }
 
@@ -190,11 +177,7 @@ public String format(String field) {
      * @param commandNestedInBraces true if the command is nested in braces (\emph{xy}), false if spaces are sued (\emph xy)
      * @return a tuple of number of added characters and the extracted part
      */
-    private StringInt getPart(
-        String text,
-        int i,
-        boolean commandNestedInBraces
-    ) {
+    private StringInt getPart(String text, int i, boolean commandNestedInBraces) {
         char c;
         int count = 0;
         int icount = i;
@@ -232,24 +215,16 @@ private StringInt getPart(
      * @return returns the basic character of the given unicode
      */
     private String transformSpecialCharacter(long c) {
-        if (
-            ((192 <= c) && (c <= 197)) || (c == 256) || (c == 258) || (c == 260)
-        ) {
+        if (((192 <= c) && (c <= 197)) || (c == 256) || (c == 258) || (c == 260)) {
             return "A";
         }
-        if (
-            ((224 <= c) && (c <= 229)) || (c == 257) || (c == 259) || (c == 261)
-        ) {
+        if (((224 <= c) && (c <= 229)) || (c == 257) || (c == 259) || (c == 261)) {
             return "a";
         }
-        if (
-            (199 == c) || (262 == c) || (264 == c) || (266 == c) || (268 == c)
-        ) {
+        if ((199 == c) || (262 == c) || (264 == c) || (266 == c) || (268 == c)) {
             return "C";
         }
-        if (
-            (231 == c) || (263 == c) || (265 == c) || (267 == c) || (269 == c)
-        ) {
+        if ((231 == c) || (263 == c) || (265 == c) || (267 == c) || (269 == c)) {
             return "c";
         }
         if ((208 == c) || (272 == c)) {
@@ -278,14 +253,10 @@ private String transformSpecialCharacter(long c) {
         ) {
             return "e";
         }
-        if (
-            ((284 == c) || (286 == c)) || (288 == c) || (290 == c) || (330 == c)
-        ) {
+        if (((284 == c) || (286 == c)) || (288 == c) || (290 == c) || (330 == c)) {
             return "G";
         }
-        if (
-            (285 == c) || (287 == c) || (289 == c) || (291 == c) || (331 == c)
-        ) {
+        if ((285 == c) || (287 == c) || (289 == c) || (291 == c) || (331 == c)) {
             return "g";
         }
         if ((292 == c) || (294 == c)) {
@@ -304,13 +275,7 @@ private String transformSpecialCharacter(long c) {
         ) {
             return "I";
         }
-        if (
-            ((236 <= c) && (c <= 239)) ||
-            (297 == c) ||
-            (299 == c) ||
-            (301 == c) ||
-            (303 == c)
-        ) {
+        if (((236 <= c) && (c <= 239)) || (297 == c) || (299 == c) || (301 == c) || (303 == c)) {
             return "i";
         }
         if (308 == c) {
@@ -337,14 +302,10 @@ private String transformSpecialCharacter(long c) {
         if ((241 == c) || (324 == c) || (326 == c) || (328 == c)) {
             return "n";
         }
-        if (
-            ((210 <= c) && (c <= 214)) || (c == 216) || (332 == c) || (334 == c)
-        ) {
+        if (((210 <= c) && (c <= 214)) || (c == 216) || (332 == c) || (334 == c)) {
             return "O";
         }
-        if (
-            ((242 <= c) && (c <= 248) && (247 != c)) || (333 == c) || (335 == c)
-        ) {
+        if (((242 <= c) && (c <= 248) && (247 != c)) || (333 == c) || (335 == c)) {
             return "o";
         }
         if ((340 == c) || (342 == c) || (344 == 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 cde2a8f8f96..851afe57472 100644
--- a/src/main/java/org/jabref/logic/layout/format/RemoveLatexCommandsFormatter.java
+++ b/src/main/java/org/jabref/logic/layout/format/RemoveLatexCommandsFormatter.java
@@ -29,25 +29,18 @@ public String format(String field) {
                 escaped = true;
                 incommand = true;
                 currentCommand = new StringBuilder();
-            } else if (
-                !incommand &&
-                ((currentCharacter == '{') || (currentCharacter == '}'))
-            ) {
+            } else if (!incommand && ((currentCharacter == '{') || (currentCharacter == '}'))) {
                 // Swallow the brace.
             } else if (
                 Character.isLetter(currentCharacter) ||
-                StringUtil.SPECIAL_COMMAND_CHARS.contains(
-                    String.valueOf(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;
@@ -67,15 +60,11 @@ public String format(String field) {
             } else {
                 if (
                     !incommand ||
-                    (!Character.isWhitespace(currentCharacter) &&
-                        (currentCharacter != '{'))
+                    (!Character.isWhitespace(currentCharacter) && (currentCharacter != '{'))
                 ) {
                     cleanedField.append(currentCharacter);
                 } else {
-                    if (
-                        !Character.isWhitespace(currentCharacter) &&
-                        (currentCharacter != '{')
-                    ) {
+                    if (!Character.isWhitespace(currentCharacter) && (currentCharacter != '{')) {
                         // do not append the opening brace of a command parameter
                         // do not append the whitespace character
                         cleanedField.append(currentCharacter);
@@ -84,9 +73,7 @@ public String format(String field) {
                         // eat up all whitespace characters
                         while (
                             currentFieldPosition + 1 < field.length() &&
-                            Character.isWhitespace(
-                                field.charAt(currentFieldPosition + 1)
-                            )
+                            Character.isWhitespace(field.charAt(currentFieldPosition + 1))
                         ) {
                             currentFieldPosition++;
                         }
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 687b1efe503..0509a3505bd 100644
--- a/src/main/java/org/jabref/logic/layout/format/ReplaceUnicodeLigaturesFormatter.java
+++ b/src/main/java/org/jabref/logic/layout/format/ReplaceUnicodeLigaturesFormatter.java
@@ -8,9 +8,7 @@
 import org.jabref.logic.layout.LayoutFormatter;
 import org.jabref.logic.util.strings.UnicodeLigaturesMap;
 
-public class ReplaceUnicodeLigaturesFormatter
-    extends Formatter
-    implements LayoutFormatter {
+public class ReplaceUnicodeLigaturesFormatter extends Formatter implements LayoutFormatter {
 
     private final Map<Pattern, String> ligaturesMap;
 
@@ -43,9 +41,7 @@ public String format(String fieldText) {
 
     @Override
     public String getDescription() {
-        return Localization.lang(
-            "Replaces Unicode ligatures with their expanded form"
-        );
+        return Localization.lang("Replaces Unicode ligatures with their expanded form");
     }
 
     @Override
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 889de018e60..c57f15819c5 100644
--- a/src/main/java/org/jabref/logic/layout/format/RisMonth.java
+++ b/src/main/java/org/jabref/logic/layout/format/RisMonth.java
@@ -14,8 +14,6 @@ public String format(String month) {
         }
 
         Optional<Month> parsedMonth = Month.getMonthByShortName(month);
-        return parsedMonth
-            .map(Month::getTwoDigitNumber)
-            .orElse(month.toLowerCase(Locale.ROOT));
+        return parsedMonth.map(Month::getTwoDigitNumber).orElse(month.toLowerCase(Locale.ROOT));
     }
 }
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 fd0486fc0db..5fef4b86c91 100644
--- a/src/main/java/org/jabref/logic/layout/format/WrapFileLinks.java
+++ b/src/main/java/org/jabref/logic/layout/format/WrapFileLinks.java
@@ -184,10 +184,7 @@ public String format(String field) {
         int piv = 1; // counter for relevant iterations
         for (LinkedFile flEntry : fileList) {
             // Use this entry if we don't discriminate on types, or if the type fits:
-            if (
-                (fileType == null) ||
-                flEntry.getFileType().equalsIgnoreCase(fileType)
-            ) {
+            if ((fileType == null) || flEntry.getFileType().equalsIgnoreCase(fileType)) {
                 for (FormatEntry entry : format) {
                     switch (entry.getType()) {
                         case STRING:
@@ -199,10 +196,7 @@ public String format(String field) {
                         case FILE_PATH:
                             List<Path> dirs;
                             if (fileDirectories.isEmpty()) {
-                                dirs =
-                                    Collections.singletonList(
-                                        Path.of(mainFileDirectory)
-                                    );
+                                dirs = Collections.singletonList(Path.of(mainFileDirectory));
                             } else {
                                 dirs = fileDirectories;
                             }
@@ -226,9 +220,7 @@ public String format(String field) {
                         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()));
@@ -250,10 +242,7 @@ public String format(String field) {
 
     private String replaceStrings(String text) {
         String result = text;
-        for (Map.Entry<
-            String,
-            String
-        > stringStringEntry : replacements.entrySet()) {
+        for (Map.Entry<String, String> stringStringEntry : replacements.entrySet()) {
             String to = stringStringEntry.getValue();
             result = result.replaceAll(stringStringEntry.getKey(), to);
         }
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 63c5e5af626..f738d373711 100644
--- a/src/main/java/org/jabref/logic/layout/format/XMLChars.java
+++ b/src/main/java/org/jabref/logic/layout/format/XMLChars.java
@@ -12,8 +12,7 @@ public class XMLChars implements LayoutFormatter {
 
     private static final XmlCharsMap XML_CHARS = new XmlCharsMap();
 
-    private static final Map<String, String> ASCII_TO_XML_CHARS =
-        new HashMap<>();
+    private static final Map<String, String> ASCII_TO_XML_CHARS = new HashMap<>();
 
     private boolean[] forceReplace;
 
diff --git a/src/main/java/org/jabref/logic/logging/LogMessages.java b/src/main/java/org/jabref/logic/logging/LogMessages.java
index e5b204c9f24..b379a231e1e 100644
--- a/src/main/java/org/jabref/logic/logging/LogMessages.java
+++ b/src/main/java/org/jabref/logic/logging/LogMessages.java
@@ -12,8 +12,7 @@ public class LogMessages {
 
     private static LogMessages instance = new LogMessages();
 
-    private final ObservableList<LogEntry> messages =
-        FXCollections.observableArrayList();
+    private final ObservableList<LogEntry> messages = FXCollections.observableArrayList();
 
     private LogMessages() {}
 
diff --git a/src/main/java/org/jabref/logic/msbib/BibTeXConverter.java b/src/main/java/org/jabref/logic/msbib/BibTeXConverter.java
index a27a7313fce..75d0a0459bf 100644
--- a/src/main/java/org/jabref/logic/msbib/BibTeXConverter.java
+++ b/src/main/java/org/jabref/logic/msbib/BibTeXConverter.java
@@ -30,9 +30,7 @@ public static BibEntry convert(MSBibEntry entry) {
         BibEntry result;
         Map<Field, String> fieldValues = new HashMap<>();
 
-        EntryType bibTexEntryType = MSBibMapping.getBiblatexEntryType(
-            entry.getType()
-        );
+        EntryType bibTexEntryType = MSBibMapping.getBiblatexEntryType(entry.getType());
         result = new BibEntry(bibTexEntryType);
 
         // add String fields
@@ -40,10 +38,7 @@ public static BibEntry convert(MSBibEntry entry) {
             String msField = field.getKey();
             String value = field.getValue();
 
-            if (
-                (value != null) &&
-                (MSBibMapping.getBibTeXField(msField) != null)
-            ) {
+            if ((value != null) && (MSBibMapping.getBibTeXField(msField) != null)) {
                 fieldValues.put(MSBibMapping.getBibTeXField(msField), value);
             }
         }
@@ -51,10 +46,7 @@ public static BibEntry convert(MSBibEntry entry) {
         // Value must be converted
         if (fieldValues.containsKey(StandardField.LANGUAGE)) {
             int lcid = Integer.valueOf(fieldValues.get(StandardField.LANGUAGE));
-            fieldValues.put(
-                StandardField.LANGUAGE,
-                MSBibMapping.getLanguage(lcid)
-            );
+            fieldValues.put(StandardField.LANGUAGE, MSBibMapping.getLanguage(lcid));
         }
 
         addAuthor(fieldValues, StandardField.AUTHOR, entry.authors);
@@ -66,56 +58,16 @@ public static BibEntry convert(MSBibEntry entry) {
             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
-        );
-        addAuthor(
-            fieldValues,
-            new UnknownField(MSBIB_PREFIX + "writer"),
-            entry.writers
-        );
-        addAuthor(
-            fieldValues,
-            new UnknownField(MSBIB_PREFIX + "director"),
-            entry.directors
-        );
-        addAuthor(
-            fieldValues,
-            new UnknownField(MSBIB_PREFIX + "compiler"),
-            entry.compilers
-        );
-        addAuthor(
-            fieldValues,
-            new UnknownField(MSBIB_PREFIX + "interviewer"),
-            entry.interviewers
-        );
-        addAuthor(
-            fieldValues,
-            new UnknownField(MSBIB_PREFIX + "interviewee"),
-            entry.interviewees
-        );
-        addAuthor(
-            fieldValues,
-            new UnknownField(MSBIB_PREFIX + "inventor"),
-            entry.inventors
-        );
-        addAuthor(
-            fieldValues,
-            new UnknownField(MSBIB_PREFIX + "counsel"),
-            entry.counsels
-        );
+        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);
+        addAuthor(fieldValues, new UnknownField(MSBIB_PREFIX + "writer"), entry.writers);
+        addAuthor(fieldValues, new UnknownField(MSBIB_PREFIX + "director"), entry.directors);
+        addAuthor(fieldValues, new UnknownField(MSBIB_PREFIX + "compiler"), entry.compilers);
+        addAuthor(fieldValues, new UnknownField(MSBIB_PREFIX + "interviewer"), entry.interviewers);
+        addAuthor(fieldValues, new UnknownField(MSBIB_PREFIX + "interviewee"), entry.interviewees);
+        addAuthor(fieldValues, new UnknownField(MSBIB_PREFIX + "inventor"), entry.inventors);
+        addAuthor(fieldValues, new UnknownField(MSBIB_PREFIX + "counsel"), entry.counsels);
 
         if (entry.pages != null) {
             fieldValues.put(StandardField.PAGES, entry.pages.toString("--"));
@@ -132,10 +84,7 @@ public static BibEntry convert(MSBibEntry entry) {
         }
 
         if (entry.dateAccessed != null) {
-            fieldValues.put(
-                new UnknownField(MSBIB_PREFIX + "accessed"),
-                entry.dateAccessed
-            );
+            fieldValues.put(new UnknownField(MSBIB_PREFIX + "accessed"), entry.dateAccessed);
         }
 
         if (entry.journalName != null) {
@@ -155,11 +104,7 @@ public static BibEntry convert(MSBibEntry entry) {
         return result;
     }
 
-    private static void addAuthor(
-        Map<Field, String> map,
-        Field field,
-        List<MsBibAuthor> authors
-    ) {
+    private static void addAuthor(Map<Field, String> map, Field field, List<MsBibAuthor> authors) {
         if (authors == null) {
             return;
         }
@@ -184,27 +129,14 @@ private static void parseSingleStandardNumber(
         }
     }
 
-    private static void parseStandardNumber(
-        String standardNum,
-        Map<Field, String> map
-    ) {
+    private static void parseStandardNumber(String standardNum, Map<Field, String> map) {
         if (standardNum == null) {
             return;
         }
         parseSingleStandardNumber("ISBN", StandardField.ISBN, standardNum, map);
         parseSingleStandardNumber("ISSN", StandardField.ISSN, standardNum, map);
-        parseSingleStandardNumber(
-            "LCCN",
-            new UnknownField("lccn"),
-            standardNum,
-            map
-        );
-        parseSingleStandardNumber(
-            "MRN",
-            StandardField.MR_NUMBER,
-            standardNum,
-            map
-        );
+        parseSingleStandardNumber("LCCN", new UnknownField("lccn"), standardNum, map);
+        parseSingleStandardNumber("MRN", StandardField.MR_NUMBER, standardNum, map);
         parseSingleStandardNumber("DOI", StandardField.DOI, standardNum, map);
     }
 }
diff --git a/src/main/java/org/jabref/logic/msbib/MSBibConverter.java b/src/main/java/org/jabref/logic/msbib/MSBibConverter.java
index 831001f42c8..6f8d7bfdcfd 100644
--- a/src/main/java/org/jabref/logic/msbib/MSBibConverter.java
+++ b/src/main/java/org/jabref/logic/msbib/MSBibConverter.java
@@ -25,9 +25,7 @@ public static MSBibEntry convert(BibEntry entry) {
         // memorize original type
         result.fields.put(BIBTEX_PREFIX + "Entry", entry.getType().getName());
         // define new type
-        String msBibType = MSBibMapping
-            .getMSBibEntryType(entry.getType())
-            .name();
+        String msBibType = MSBibMapping.getMSBibEntryType(entry.getType()).name();
         result.fields.put("SourceType", msBibType);
 
         for (Field field : entry.getFields()) {
@@ -55,44 +53,33 @@ public static MSBibEntry convert(BibEntry entry) {
 
         // TODO: currently this can never happen
         if ("SoundRecording".equals(msBibType)) {
-            result.albumTitle =
-                entry.getFieldLatexFree(StandardField.TITLE).orElse(null);
+            result.albumTitle = entry.getFieldLatexFree(StandardField.TITLE).orElse(null);
         }
 
         // TODO: currently this can never happen
         if ("Interview".equals(msBibType)) {
-            result.broadcastTitle =
-                entry.getFieldLatexFree(StandardField.TITLE).orElse(null);
+            result.broadcastTitle = entry.getFieldLatexFree(StandardField.TITLE).orElse(null);
         }
 
-        result.number =
-            entry.getFieldLatexFree(StandardField.NUMBER).orElse(null);
+        result.number = entry.getFieldLatexFree(StandardField.NUMBER).orElse(null);
 
         if (entry.getType().equals(IEEETranEntryType.Patent)) {
-            result.patentNumber =
-                entry.getFieldLatexFree(StandardField.NUMBER).orElse(null);
+            result.patentNumber = entry.getFieldLatexFree(StandardField.NUMBER).orElse(null);
             result.number = null;
         }
 
-        result.day =
-            entry.getFieldOrAliasLatexFree(StandardField.DAY).orElse(null);
+        result.day = entry.getFieldOrAliasLatexFree(StandardField.DAY).orElse(null);
         result.month = entry.getMonth().map(Month::getFullName).orElse(null);
 
         if (!entry.getFieldLatexFree(StandardField.YEAR).isPresent()) {
-            result.year =
-                entry.getFieldOrAliasLatexFree(StandardField.YEAR).orElse(null);
+            result.year = entry.getFieldOrAliasLatexFree(StandardField.YEAR).orElse(null);
         }
-        result.journalName =
-            entry.getFieldOrAliasLatexFree(StandardField.JOURNAL).orElse(null);
+        result.journalName = entry.getFieldOrAliasLatexFree(StandardField.JOURNAL).orElse(null);
 
         // 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
@@ -113,18 +100,14 @@ public static MSBibEntry convert(BibEntry entry) {
             result.standardNumber = null;
         }
 
-        result.address =
-            entry.getFieldOrAliasLatexFree(StandardField.ADDRESS).orElse(null);
+        result.address = entry.getFieldOrAliasLatexFree(StandardField.ADDRESS).orElse(null);
 
         if (entry.getFieldLatexFree(StandardField.TYPE).isPresent()) {
-            result.thesisType =
-                entry.getFieldLatexFree(StandardField.TYPE).get();
+            result.thesisType = entry.getFieldLatexFree(StandardField.TYPE).get();
         } else {
             if (entry.getType().equals(StandardEntryType.TechReport)) {
                 result.thesisType = "Tech. rep.";
-            } else if (
-                entry.getType().equals(StandardEntryType.MastersThesis)
-            ) {
+            } else if (entry.getType().equals(StandardEntryType.MastersThesis)) {
                 result.thesisType = "Master's thesis";
             } else if (entry.getType().equals(StandardEntryType.PhdThesis)) {
                 result.thesisType = "Ph.D. dissertation";
@@ -134,12 +117,8 @@ public static MSBibEntry convert(BibEntry entry) {
         }
 
         // TODO: currently this can never happen
-        if (
-            "InternetSite".equals(msBibType) ||
-            "DocumentFromInternetSite".equals(msBibType)
-        ) {
-            result.internetSiteTitle =
-                entry.getFieldLatexFree(StandardField.TITLE).orElse(null);
+        if ("InternetSite".equals(msBibType) || "DocumentFromInternetSite".equals(msBibType)) {
+            result.internetSiteTitle = entry.getFieldLatexFree(StandardField.TITLE).orElse(null);
         }
 
         // TODO: currently only Misc can happen
@@ -148,46 +127,36 @@ public static MSBibEntry convert(BibEntry entry) {
             "Art".equals(msBibType) ||
             "Misc".equals(msBibType)
         ) {
-            result.publicationTitle =
-                entry.getFieldLatexFree(StandardField.TITLE).orElse(null);
+            result.publicationTitle = entry.getFieldLatexFree(StandardField.TITLE).orElse(null);
         }
 
         if (entry.getType().equals(IEEETranEntryType.Patent)) {
             entry
                 .getField(StandardField.AUTHOR)
                 .ifPresent(authors ->
-                    result.inventors =
-                        getAuthors(entry, authors, StandardField.AUTHOR)
+                    result.inventors = getAuthors(entry, authors, StandardField.AUTHOR)
                 );
         } else {
             entry
                 .getField(StandardField.AUTHOR)
                 .ifPresent(authors ->
-                    result.authors =
-                        getAuthors(entry, authors, StandardField.AUTHOR)
+                    result.authors = getAuthors(entry, authors, StandardField.AUTHOR)
                 );
         }
         entry
             .getField(StandardField.EDITOR)
-            .ifPresent(editors ->
-                result.editors =
-                    getAuthors(entry, editors, StandardField.EDITOR)
+            .ifPresent(editors -> result.editors = getAuthors(entry, editors, StandardField.EDITOR)
             );
         entry
             .getField(StandardField.TRANSLATOR)
             .ifPresent(translator ->
-                result.translators =
-                    getAuthors(entry, translator, StandardField.EDITOR)
+                result.translators = getAuthors(entry, translator, StandardField.EDITOR)
             );
 
         return result;
     }
 
-    private static List<MsBibAuthor> getAuthors(
-        BibEntry entry,
-        String authors,
-        Field field
-    ) {
+    private static List<MsBibAuthor> getAuthors(BibEntry entry, String authors, Field field) {
         List<MsBibAuthor> result = new ArrayList<>();
         boolean corporate = false;
         // Only one corporate author is supported
diff --git a/src/main/java/org/jabref/logic/msbib/MSBibDatabase.java b/src/main/java/org/jabref/logic/msbib/MSBibDatabase.java
index ca0d0a9ced2..e04f6c11d18 100644
--- a/src/main/java/org/jabref/logic/msbib/MSBibDatabase.java
+++ b/src/main/java/org/jabref/logic/msbib/MSBibDatabase.java
@@ -32,9 +32,7 @@ public class MSBibDatabase {
         "http://schemas.openxmlformats.org/officeDocument/2006/bibliography";
     public static final String PREFIX = "b:";
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(
-        MSBibDatabase.class
-    );
+    private static final Logger LOGGER = LoggerFactory.getLogger(MSBibDatabase.class);
 
     private Set<MSBibEntry> entries;
 
@@ -55,10 +53,7 @@ public MSBibDatabase() {
      */
     public MSBibDatabase(BibDatabase database, List<BibEntry> entries) {
         if (entries == null) {
-            var resolvedEntries = database.resolveForStrings(
-                database.getEntries(),
-                false
-            );
+            var resolvedEntries = database.resolveForStrings(database.getEntries(), false);
             addEntriesForExport(resolvedEntries);
         } else {
             var resolvedEntries = database.resolveForStrings(entries, false);
@@ -75,8 +70,7 @@ public List<BibEntry> importEntriesFromXml(BufferedReader reader) {
         entries = new HashSet<>();
         Document inputDocument;
         try {
-            DocumentBuilderFactory factory =
-                DocumentBuilderFactory.newInstance();
+            DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
             factory.setNamespaceAware(true);
             DocumentBuilder documentBuilder = factory.newDocumentBuilder();
             inputDocument = documentBuilder.parse(new InputSource(reader));
@@ -84,10 +78,7 @@ public List<BibEntry> importEntriesFromXml(BufferedReader reader) {
             LOGGER.warn("Could not parse document", e);
             return Collections.emptyList();
         }
-        NodeList rootList = inputDocument.getElementsByTagNameNS(
-            "*",
-            "Sources"
-        );
+        NodeList rootList = inputDocument.getElementsByTagNameNS("*", "Sources");
         if (rootList.getLength() == 0) {
             rootList = inputDocument.getElementsByTagNameNS("*", "Sources");
         }
@@ -96,8 +87,7 @@ public List<BibEntry> importEntriesFromXml(BufferedReader reader) {
             return bibitems;
         }
 
-        NodeList sourceList =
-            ((Element) rootList.item(0)).getElementsByTagNameNS("*", "Source");
+        NodeList sourceList = ((Element) rootList.item(0)).getElementsByTagNameNS("*", "Source");
         for (int i = 0; i < sourceList.getLength(); i++) {
             MSBibEntry entry = new MSBibEntry((Element) sourceList.item(i));
             entries.add(entry);
@@ -123,21 +113,13 @@ private void addEntriesForExport(List<BibEntry> entriesToAdd) {
     public Document getDomForExport() {
         Document document = null;
         try {
-            DocumentBuilderFactory factory =
-                DocumentBuilderFactory.newInstance();
+            DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
             factory.setNamespaceAware(true);
             DocumentBuilder documentBuilder = factory.newDocumentBuilder();
             document = documentBuilder.newDocument();
 
-            Element rootNode = document.createElementNS(
-                NAMESPACE,
-                PREFIX + "Sources"
-            );
-            rootNode.setAttributeNS(
-                "http://www.w3.org/2000/xmlns/",
-                "xmlns",
-                NAMESPACE
-            );
+            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),
diff --git a/src/main/java/org/jabref/logic/msbib/MSBibEntry.java b/src/main/java/org/jabref/logic/msbib/MSBibEntry.java
index 7ca2bea7de5..ad02bd9fbee 100644
--- a/src/main/java/org/jabref/logic/msbib/MSBibEntry.java
+++ b/src/main/java/org/jabref/logic/msbib/MSBibEntry.java
@@ -135,10 +135,7 @@ private void populateFromXml(Element entry) {
         if (city != null) {
             addressBuffer.append(city);
         }
-        if (
-            ((state != null) && !state.isEmpty()) &&
-            ((city != null) && !city.isEmpty())
-        ) {
+        if (((state != null) && !state.isEmpty()) && ((city != null) && !city.isEmpty())) {
             addressBuffer.append(",").append(' ');
             addressBuffer.append(state);
         }
@@ -156,8 +153,7 @@ private void populateFromXml(Element entry) {
         }
         journalName = getXmlElementTextContent("JournalName", entry);
         month = getXmlElementTextContent("Month", entry);
-        internetSiteTitle =
-            getXmlElementTextContent("InternetSiteTitle", entry);
+        internetSiteTitle = getXmlElementTextContent("InternetSiteTitle", entry);
 
         String monthAccessed = getXmlElementTextContent("MonthAccessed", entry);
         String dayAccessed = getXmlElementTextContent("DayAccessed", entry);
@@ -169,9 +165,7 @@ private void populateFromXml(Element entry) {
             Optional.ofNullable(dayAccessed)
         );
 
-        parsedDateAcessed
-            .map(Date::getNormalized)
-            .ifPresent(date -> dateAccessed = date);
+        parsedDateAcessed.map(Date::getNormalized).ifPresent(date -> dateAccessed = date);
 
         NodeList nodeLst = entry.getElementsByTagNameNS("*", "Author");
         if (nodeLst.getLength() > 0) {
@@ -203,28 +197,20 @@ private List<MsBibAuthor> getSpecificAuthors(String type, Element authors) {
         if (nodeLst.getLength() <= 0) {
             return result;
         }
-        nodeLst =
-            ((Element) nodeLst.item(0)).getElementsByTagNameNS("*", "NameList");
+        nodeLst = ((Element) nodeLst.item(0)).getElementsByTagNameNS("*", "NameList");
         if (nodeLst.getLength() <= 0) {
             return result;
         }
-        NodeList person =
-            ((Element) nodeLst.item(0)).getElementsByTagNameNS("*", "Person");
+        NodeList person = ((Element) nodeLst.item(0)).getElementsByTagNameNS("*", "Person");
         if (person.getLength() <= 0) {
             return result;
         }
 
         result = new LinkedList<>();
         for (int i = 0; i < person.getLength(); i++) {
-            NodeList firstName =
-                ((Element) person.item(i)).getElementsByTagNameNS("*", "First");
-            NodeList lastName =
-                ((Element) person.item(i)).getElementsByTagNameNS("*", "Last");
-            NodeList middleName =
-                ((Element) person.item(i)).getElementsByTagNameNS(
-                        "*",
-                        "Middle"
-                    );
+            NodeList firstName = ((Element) person.item(i)).getElementsByTagNameNS("*", "First");
+            NodeList lastName = ((Element) person.item(i)).getElementsByTagNameNS("*", "Last");
+            NodeList middleName = ((Element) person.item(i)).getElementsByTagNameNS("*", "Middle");
 
             StringBuilder sb = new StringBuilder();
 
@@ -319,12 +305,7 @@ public Element getEntryDom(Document document) {
         return rootNode;
     }
 
-    private void addField(
-        Document document,
-        Element parent,
-        String name,
-        String value
-    ) {
+    private void addField(Document document, Element parent, String name, String value) {
         if (value == null) {
             return;
         }
@@ -332,11 +313,7 @@ private void addField(
             MSBibDatabase.NAMESPACE,
             MSBibDatabase.PREFIX + name
         );
-        elem.appendChild(
-            document.createTextNode(
-                StringUtil.stripNonValidXMLCharacters(value)
-            )
-        );
+        elem.appendChild(document.createTextNode(StringUtil.stripNonValidXMLCharacters(value)));
         parent.appendChild(elem);
     }
 
@@ -401,12 +378,7 @@ private void addDateAcessedFields(Document document, Element rootNode) {
             .flatMap(Date::getMonth)
             .map(Month::getFullName)
             .ifPresent(monthAcessed -> {
-                addField(
-                    document,
-                    rootNode,
-                    "Month" + "Accessed",
-                    monthAcessed
-                );
+                addField(document, rootNode, "Month" + "Accessed", monthAcessed);
             });
         parsedDateAcesseField
             .flatMap(Date::getDay)
@@ -416,22 +388,14 @@ private void addDateAcessedFields(Document document, Element rootNode) {
             });
     }
 
-    private void addAddress(
-        Document document,
-        Element parent,
-        String addressToSplit
-    ) {
+    private void addAddress(Document document, Element parent, String addressToSplit) {
         if (addressToSplit == null) {
             return;
         }
 
         Matcher matcher = ADDRESS_PATTERN.matcher(addressToSplit);
 
-        if (
-            addressToSplit.contains(",") &&
-            matcher.matches() &&
-            (matcher.groupCount() >= 3)
-        ) {
+        if (addressToSplit.contains(",") && matcher.matches() && (matcher.groupCount() >= 3)) {
             addField(document, parent, "City", matcher.group(1));
             addField(document, parent, "StateProvince", matcher.group(2));
             addField(document, parent, "CountryRegion", matcher.group(3));
diff --git a/src/main/java/org/jabref/logic/msbib/MSBibMapping.java b/src/main/java/org/jabref/logic/msbib/MSBibMapping.java
index 6ae6fdd033a..e116f6b8595 100644
--- a/src/main/java/org/jabref/logic/msbib/MSBibMapping.java
+++ b/src/main/java/org/jabref/logic/msbib/MSBibMapping.java
@@ -21,12 +21,10 @@ public class MSBibMapping {
     private static final String BIBTEX_PREFIX = "BIBTEX_";
     private static final String MSBIB_PREFIX = "msbib-";
 
-    private static final BiMap<Field, String> BIBLATEX_TO_MS_BIB =
-        HashBiMap.create();
+    private static final BiMap<Field, String> BIBLATEX_TO_MS_BIB = HashBiMap.create();
 
     // see https://learn.microsoft.com/en-us/openspecs/office_standards/ms-oe376/6c085406-a698-4e12-9d4d-c3b0ee3dbc4a
-    private static final BiMap<String, Integer> LANG_TO_LCID =
-        HashBiMap.create();
+    private static final BiMap<String, Integer> LANG_TO_LCID = HashBiMap.create();
 
     static {
         LANG_TO_LCID.put("basque", 1609);
@@ -88,109 +86,37 @@ public class MSBibMapping {
         // BibTeX/Biblatex only fields
 
         BIBLATEX_TO_MS_BIB.put(StandardField.SERIES, BIBTEX_PREFIX + "Series");
-        BIBLATEX_TO_MS_BIB.put(
-            StandardField.ABSTRACT,
-            BIBTEX_PREFIX + "Abstract"
-        );
-        BIBLATEX_TO_MS_BIB.put(
-            StandardField.KEYWORDS,
-            BIBTEX_PREFIX + "KeyWords"
-        );
-        BIBLATEX_TO_MS_BIB.put(
-            StandardField.CROSSREF,
-            BIBTEX_PREFIX + "CrossRef"
-        );
-        BIBLATEX_TO_MS_BIB.put(
-            StandardField.HOWPUBLISHED,
-            BIBTEX_PREFIX + "HowPublished"
-        );
-        BIBLATEX_TO_MS_BIB.put(
-            StandardField.PUBSTATE,
-            BIBTEX_PREFIX + "Pubstate"
-        );
-        BIBLATEX_TO_MS_BIB.put(
-            new UnknownField("affiliation"),
-            BIBTEX_PREFIX + "Affiliation"
-        );
-        BIBLATEX_TO_MS_BIB.put(
-            new UnknownField("contents"),
-            BIBTEX_PREFIX + "Contents"
-        );
-        BIBLATEX_TO_MS_BIB.put(
-            new UnknownField("copyright"),
-            BIBTEX_PREFIX + "Copyright"
-        );
-        BIBLATEX_TO_MS_BIB.put(
-            new UnknownField("price"),
-            BIBTEX_PREFIX + "Price"
-        );
-        BIBLATEX_TO_MS_BIB.put(
-            new UnknownField("size"),
-            BIBTEX_PREFIX + "Size"
-        );
-        BIBLATEX_TO_MS_BIB.put(
-            new UnknownField("intype"),
-            BIBTEX_PREFIX + "InType"
-        );
-        BIBLATEX_TO_MS_BIB.put(
-            new UnknownField("paper"),
-            BIBTEX_PREFIX + "Paper"
-        );
+        BIBLATEX_TO_MS_BIB.put(StandardField.ABSTRACT, BIBTEX_PREFIX + "Abstract");
+        BIBLATEX_TO_MS_BIB.put(StandardField.KEYWORDS, BIBTEX_PREFIX + "KeyWords");
+        BIBLATEX_TO_MS_BIB.put(StandardField.CROSSREF, BIBTEX_PREFIX + "CrossRef");
+        BIBLATEX_TO_MS_BIB.put(StandardField.HOWPUBLISHED, BIBTEX_PREFIX + "HowPublished");
+        BIBLATEX_TO_MS_BIB.put(StandardField.PUBSTATE, BIBTEX_PREFIX + "Pubstate");
+        BIBLATEX_TO_MS_BIB.put(new UnknownField("affiliation"), BIBTEX_PREFIX + "Affiliation");
+        BIBLATEX_TO_MS_BIB.put(new UnknownField("contents"), BIBTEX_PREFIX + "Contents");
+        BIBLATEX_TO_MS_BIB.put(new UnknownField("copyright"), BIBTEX_PREFIX + "Copyright");
+        BIBLATEX_TO_MS_BIB.put(new UnknownField("price"), BIBTEX_PREFIX + "Price");
+        BIBLATEX_TO_MS_BIB.put(new UnknownField("size"), BIBTEX_PREFIX + "Size");
+        BIBLATEX_TO_MS_BIB.put(new UnknownField("intype"), BIBTEX_PREFIX + "InType");
+        BIBLATEX_TO_MS_BIB.put(new UnknownField("paper"), BIBTEX_PREFIX + "Paper");
         BIBLATEX_TO_MS_BIB.put(StandardField.KEY, BIBTEX_PREFIX + "Key");
 
         // MSBib only fields
-        BIBLATEX_TO_MS_BIB.put(
-            new UnknownField(MSBIB_PREFIX + "periodical"),
-            "PeriodicalTitle"
-        );
-        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 + "periodical"), "PeriodicalTitle");
+        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 + "theater"),
-            "Theater"
-        );
-        BIBLATEX_TO_MS_BIB.put(
-            new UnknownField(MSBIB_PREFIX + "distributor"),
-            "Distributor"
-        );
-        BIBLATEX_TO_MS_BIB.put(
-            new UnknownField(MSBIB_PREFIX + "broadcaster"),
-            "Broadcaster"
-        );
-        BIBLATEX_TO_MS_BIB.put(
-            new UnknownField(MSBIB_PREFIX + "station"),
-            "Station"
-        );
-        BIBLATEX_TO_MS_BIB.put(
-            new UnknownField(MSBIB_PREFIX + StandardField.TYPE),
-            "Type"
-        );
-        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 + "theater"), "Theater");
+        BIBLATEX_TO_MS_BIB.put(new UnknownField(MSBIB_PREFIX + "distributor"), "Distributor");
+        BIBLATEX_TO_MS_BIB.put(new UnknownField(MSBIB_PREFIX + "broadcaster"), "Broadcaster");
+        BIBLATEX_TO_MS_BIB.put(new UnknownField(MSBIB_PREFIX + "station"), "Station");
+        BIBLATEX_TO_MS_BIB.put(new UnknownField(MSBIB_PREFIX + StandardField.TYPE), "Type");
+        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"
@@ -209,14 +135,8 @@ public static EntryType getBiblatexEntryType(String msbibType) {
         entryTypeMapping.put("Book", StandardEntryType.Book);
         entryTypeMapping.put("BookSection", StandardEntryType.Book);
         entryTypeMapping.put("JournalArticle", StandardEntryType.Article);
-        entryTypeMapping.put(
-            "ArticleInAPeriodical",
-            IEEETranEntryType.Periodical
-        );
-        entryTypeMapping.put(
-            "ConferenceProceedings",
-            StandardEntryType.InProceedings
-        );
+        entryTypeMapping.put("ArticleInAPeriodical", IEEETranEntryType.Periodical);
+        entryTypeMapping.put("ConferenceProceedings", StandardEntryType.InProceedings);
         entryTypeMapping.put("Report", StandardEntryType.TechReport);
         entryTypeMapping.put("Patent", IEEETranEntryType.Patent);
         entryTypeMapping.put("InternetSite", StandardEntryType.Online);
@@ -228,65 +148,23 @@ public static MSBibEntryType getMSBibEntryType(EntryType bibtexType) {
         Map<EntryType, MSBibEntryType> entryTypeMapping = new HashMap<>();
 
         entryTypeMapping.put(StandardEntryType.Book, MSBibEntryType.Book);
-        entryTypeMapping.put(
-            StandardEntryType.InBook,
-            MSBibEntryType.BookSection
-        );
-        entryTypeMapping.put(
-            StandardEntryType.Booklet,
-            MSBibEntryType.BookSection
-        );
-        entryTypeMapping.put(
-            StandardEntryType.InCollection,
-            MSBibEntryType.BookSection
-        );
-        entryTypeMapping.put(
-            StandardEntryType.Article,
-            MSBibEntryType.JournalArticle
-        );
-        entryTypeMapping.put(
-            StandardEntryType.InProceedings,
-            MSBibEntryType.ConferenceProceedings
-        );
-        entryTypeMapping.put(
-            StandardEntryType.Conference,
-            MSBibEntryType.ConferenceProceedings
-        );
-        entryTypeMapping.put(
-            StandardEntryType.Proceedings,
-            MSBibEntryType.ConferenceProceedings
-        );
-        entryTypeMapping.put(
-            StandardEntryType.Collection,
-            MSBibEntryType.ConferenceProceedings
-        );
-        entryTypeMapping.put(
-            StandardEntryType.TechReport,
-            MSBibEntryType.Report
-        );
+        entryTypeMapping.put(StandardEntryType.InBook, MSBibEntryType.BookSection);
+        entryTypeMapping.put(StandardEntryType.Booklet, MSBibEntryType.BookSection);
+        entryTypeMapping.put(StandardEntryType.InCollection, MSBibEntryType.BookSection);
+        entryTypeMapping.put(StandardEntryType.Article, MSBibEntryType.JournalArticle);
+        entryTypeMapping.put(StandardEntryType.InProceedings, MSBibEntryType.ConferenceProceedings);
+        entryTypeMapping.put(StandardEntryType.Conference, MSBibEntryType.ConferenceProceedings);
+        entryTypeMapping.put(StandardEntryType.Proceedings, MSBibEntryType.ConferenceProceedings);
+        entryTypeMapping.put(StandardEntryType.Collection, MSBibEntryType.ConferenceProceedings);
+        entryTypeMapping.put(StandardEntryType.TechReport, MSBibEntryType.Report);
         entryTypeMapping.put(StandardEntryType.Manual, MSBibEntryType.Report);
-        entryTypeMapping.put(
-            StandardEntryType.MastersThesis,
-            MSBibEntryType.Report
-        );
-        entryTypeMapping.put(
-            StandardEntryType.PhdThesis,
-            MSBibEntryType.Report
-        );
-        entryTypeMapping.put(
-            StandardEntryType.Unpublished,
-            MSBibEntryType.Report
-        );
+        entryTypeMapping.put(StandardEntryType.MastersThesis, MSBibEntryType.Report);
+        entryTypeMapping.put(StandardEntryType.PhdThesis, MSBibEntryType.Report);
+        entryTypeMapping.put(StandardEntryType.Unpublished, MSBibEntryType.Report);
         entryTypeMapping.put(IEEETranEntryType.Patent, MSBibEntryType.Patent);
         entryTypeMapping.put(StandardEntryType.Misc, MSBibEntryType.Misc);
-        entryTypeMapping.put(
-            IEEETranEntryType.Electronic,
-            MSBibEntryType.ElectronicSource
-        );
-        entryTypeMapping.put(
-            StandardEntryType.Online,
-            MSBibEntryType.InternetSite
-        );
+        entryTypeMapping.put(IEEETranEntryType.Electronic, MSBibEntryType.ElectronicSource);
+        entryTypeMapping.put(StandardEntryType.Online, MSBibEntryType.InternetSite);
 
         return entryTypeMapping.getOrDefault(bibtexType, MSBibEntryType.Misc);
     }
diff --git a/src/main/java/org/jabref/logic/msbib/PageNumbers.java b/src/main/java/org/jabref/logic/msbib/PageNumbers.java
index 617668ccb1e..ae001b2ad78 100644
--- a/src/main/java/org/jabref/logic/msbib/PageNumbers.java
+++ b/src/main/java/org/jabref/logic/msbib/PageNumbers.java
@@ -36,12 +36,8 @@ public Element getDOMrepresentation(Document document) {
         if (freeform == null) {
             Element tmpStart = document.createElement("start");
             Element tmpEnd = document.createElement("end");
-            tmpStart.appendChild(
-                document.createTextNode(String.valueOf(this.start))
-            );
-            tmpEnd.appendChild(
-                document.createTextNode(String.valueOf(this.end))
-            );
+            tmpStart.appendChild(document.createTextNode(String.valueOf(this.start)));
+            tmpEnd.appendChild(document.createTextNode(String.valueOf(this.end)));
             result.appendChild(tmpStart);
             result.appendChild(tmpEnd);
         } else {
diff --git a/src/main/java/org/jabref/logic/net/ProxyPreferences.java b/src/main/java/org/jabref/logic/net/ProxyPreferences.java
index fda6e7eb859..1a87b51af48 100644
--- a/src/main/java/org/jabref/logic/net/ProxyPreferences.java
+++ b/src/main/java/org/jabref/logic/net/ProxyPreferences.java
@@ -133,16 +133,10 @@ public boolean equals(Object o) {
             Objects.equals(useProxy.getValue(), other.useProxy.getValue()) &&
             Objects.equals(hostname.getValue(), other.hostname.getValue()) &&
             Objects.equals(port.getValue(), other.port.getValue()) &&
-            Objects.equals(
-                useAuthentication.getValue(),
-                other.useAuthentication.getValue()
-            ) &&
+            Objects.equals(useAuthentication.getValue(), other.useAuthentication.getValue()) &&
             Objects.equals(username.getValue(), other.username.getValue()) &&
             Objects.equals(password.getValue(), other.password.getValue()) &&
-            Objects.equals(
-                persistPassword.getValue(),
-                other.persistPassword.getValue()
-            )
+            Objects.equals(persistPassword.getValue(), other.persistPassword.getValue())
         );
     }
 
diff --git a/src/main/java/org/jabref/logic/net/ProxyRegisterer.java b/src/main/java/org/jabref/logic/net/ProxyRegisterer.java
index eab0853a330..3420569bab5 100644
--- a/src/main/java/org/jabref/logic/net/ProxyRegisterer.java
+++ b/src/main/java/org/jabref/logic/net/ProxyRegisterer.java
@@ -16,16 +16,10 @@ public static void register(ProxyPreferences proxyPrefs) {
             // 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()
-                );
+                System.setProperty("http.proxyPassword", proxyPrefs.getPassword());
 
                 System.setProperty("https.proxyUser", proxyPrefs.getUsername());
-                System.setProperty(
-                    "https.proxyPassword",
-                    proxyPrefs.getPassword()
-                );
+                System.setProperty("https.proxyPassword", proxyPrefs.getPassword());
             } else {
                 System.clearProperty("http.proxyUser");
                 System.clearProperty("http.proxyPassword");
diff --git a/src/main/java/org/jabref/logic/net/URLDownload.java b/src/main/java/org/jabref/logic/net/URLDownload.java
index d290c7c291f..ba8589b22b5 100644
--- a/src/main/java/org/jabref/logic/net/URLDownload.java
+++ b/src/main/java/org/jabref/logic/net/URLDownload.java
@@ -66,12 +66,8 @@ public class URLDownload {
 
     public static final String USER_AGENT =
         "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/108.0.0.0 Safari/537.36";
-    private static final Logger LOGGER = LoggerFactory.getLogger(
-        URLDownload.class
-    );
-    private static final Duration DEFAULT_CONNECT_TIMEOUT = Duration.ofSeconds(
-        30
-    );
+    private static final Logger LOGGER = LoggerFactory.getLogger(URLDownload.class);
+    private static final Duration DEFAULT_CONNECT_TIMEOUT = Duration.ofSeconds(30);
 
     private final URL source;
     private final Map<String, String> parameters = new HashMap<>();
@@ -115,16 +111,10 @@ public static void bypassSSLVerification() {
         TrustManager[] trustAllCerts = {
             new X509TrustManager() {
                 @Override
-                public void checkClientTrusted(
-                    X509Certificate[] chain,
-                    String authType
-                ) {}
+                public void checkClientTrusted(X509Certificate[] chain, String authType) {}
 
                 @Override
-                public void checkServerTrusted(
-                    X509Certificate[] chain,
-                    String authType
-                ) {}
+                public void checkServerTrusted(X509Certificate[] chain, String authType) {}
 
                 @Override
                 public X509Certificate[] getAcceptedIssuers() {
@@ -137,18 +127,13 @@ public X509Certificate[] getAcceptedIssuers() {
             // Install all-trusting trust manager
             SSLContext context = SSLContext.getInstance("TLS");
             context.init(null, trustAllCerts, new SecureRandom());
-            HttpsURLConnection.setDefaultSSLSocketFactory(
-                context.getSocketFactory()
-            );
+            HttpsURLConnection.setDefaultSSLSocketFactory(context.getSocketFactory());
 
             // Install all-trusting host verifier
             HostnameVerifier allHostsValid = (hostname, session) -> true;
             HttpsURLConnection.setDefaultHostnameVerifier(allHostsValid);
         } catch (Exception e) {
-            LOGGER.error(
-                "A problem occurred when bypassing SSL verification",
-                e
-            );
+            LOGGER.error("A problem occurred when bypassing SSL verification", e);
         }
     }
 
@@ -185,12 +170,7 @@ public String getMimeType() {
         // Try to use HEAD request to avoid downloading the whole file
         try {
             contentType =
-                Unirest
-                    .head(source.toString())
-                    .asString()
-                    .getHeaders()
-                    .get("Content-Type")
-                    .get(0);
+                Unirest.head(source.toString()).asString().getHeaders().get("Content-Type").get(0);
             if ((contentType != null) && !contentType.isEmpty()) {
                 return contentType;
             }
@@ -201,12 +181,7 @@ public String getMimeType() {
         // Use GET request as alternative if no HEAD request is available
         try {
             contentType =
-                Unirest
-                    .get(source.toString())
-                    .asString()
-                    .getHeaders()
-                    .get("Content-Type")
-                    .get(0);
+                Unirest.get(source.toString()).asString().getHeaders().get("Content-Type").get(0);
             if ((contentType != null) && !contentType.isEmpty()) {
                 return contentType;
             }
@@ -216,8 +191,7 @@ public String getMimeType() {
 
         // Try to resolve local URIs
         try {
-            URLConnection connection = new URL(source.toString())
-                .openConnection();
+            URLConnection connection = new URL(source.toString()).openConnection();
 
             contentType = connection.getContentType();
             if ((contentType != null) && !contentType.isEmpty()) {
@@ -243,10 +217,7 @@ public boolean canBeReached() throws UnirestException {
             .httpClient(
                 new ApacheClient.Builder()
                     .withRequestConfig((c, r) ->
-                        RequestConfig
-                            .custom()
-                            .setCircularRedirectsAllowed(true)
-                            .build()
+                        RequestConfig.custom().setCircularRedirectsAllowed(true).build()
                     )
             );
 
@@ -305,8 +276,7 @@ public String asString(Charset encoding) throws IOException {
      * @param existingConnection an existing connection
      * @return the downloaded string
      */
-    public static String asString(URLConnection existingConnection)
-        throws IOException {
+    public static String asString(URLConnection existingConnection) throws IOException {
         return asString(StandardCharsets.UTF_8, existingConnection);
     }
 
@@ -317,12 +287,9 @@ public static String asString(URLConnection existingConnection)
      * @param connection an existing connection
      * @return the downloaded string
      */
-    public static String asString(Charset encoding, URLConnection connection)
-        throws IOException {
+    public static String asString(Charset encoding, URLConnection connection) throws IOException {
         try (
-            InputStream input = new BufferedInputStream(
-                connection.getInputStream()
-            );
+            InputStream input = new BufferedInputStream(connection.getInputStream());
             Writer output = new StringWriter()
         ) {
             copy(input, output, encoding);
@@ -352,11 +319,7 @@ public List<HttpCookie> getCookieFromUrl() throws IOException {
      * @param destination the destination file path.
      */
     public void toFile(Path destination) throws IOException {
-        try (
-            InputStream input = new BufferedInputStream(
-                this.openConnection().getInputStream()
-            )
-        ) {
+        try (InputStream input = new BufferedInputStream(this.openConnection().getInputStream())) {
             Files.copy(input, destination, StandardCopyOption.REPLACE_EXISTING);
         } catch (IOException e) {
             LOGGER.warn("Could not copy input", e);
@@ -368,24 +331,18 @@ public void toFile(Path destination) throws IOException {
      * Takes the web resource as the source for a monitored input stream.
      */
     public ProgressInputStream asInputStream() throws IOException {
-        HttpURLConnection urlConnection =
-            (HttpURLConnection) this.openConnection();
+        HttpURLConnection urlConnection = (HttpURLConnection) this.openConnection();
 
         if (
-            (urlConnection.getResponseCode() ==
-                HttpURLConnection.HTTP_NOT_FOUND) ||
-            (urlConnection.getResponseCode() ==
-                HttpURLConnection.HTTP_BAD_REQUEST)
+            (urlConnection.getResponseCode() == HttpURLConnection.HTTP_NOT_FOUND) ||
+            (urlConnection.getResponseCode() == HttpURLConnection.HTTP_BAD_REQUEST)
         ) {
             LOGGER.error(
                 "Response message {} returned for url {}",
                 urlConnection.getResponseMessage(),
                 urlConnection.getURL()
             );
-            return new ProgressInputStream(
-                new ByteArrayInputStream(new byte[0]),
-                0
-            );
+            return new ProgressInputStream(new ByteArrayInputStream(new byte[0]), 0);
         }
         long fileSize = urlConnection.getContentLengthLong();
         return new ProgressInputStream(
@@ -404,14 +361,9 @@ public Path toTemporaryFile() throws IOException {
         String sourcePath = source.getPath();
 
         // Take everything after the last '/' as name + extension
-        String fileNameWithExtension = sourcePath.substring(
-            sourcePath.lastIndexOf('/') + 1
-        );
-        String fileName =
-            "jabref-" + FileUtil.getBaseName(fileNameWithExtension);
-        String extension =
-            "." +
-            FileUtil.getFileExtension(fileNameWithExtension).orElse("tmp");
+        String fileNameWithExtension = sourcePath.substring(sourcePath.lastIndexOf('/') + 1);
+        String fileName = "jabref-" + FileUtil.getBaseName(fileNameWithExtension);
+        String extension = "." + FileUtil.getFileExtension(fileNameWithExtension).orElse("tmp");
 
         // Create temporary file and download to it
         Path file = Files.createTempFile(fileName, extension);
@@ -426,8 +378,7 @@ public String toString() {
         return "URLDownload{" + "source=" + this.source + '}';
     }
 
-    private static void copy(InputStream in, Writer out, Charset encoding)
-        throws IOException {
+    private static void copy(InputStream in, Writer out, Charset encoding) throws IOException {
         Reader r = new InputStreamReader(in, encoding);
         try (BufferedReader read = new BufferedReader(r)) {
             String line;
@@ -452,11 +403,7 @@ public URLConnection openConnection() throws IOException {
         }
         if (!this.postData.isEmpty()) {
             connection.setDoOutput(true);
-            try (
-                DataOutputStream wr = new DataOutputStream(
-                    connection.getOutputStream()
-                )
-            ) {
+            try (DataOutputStream wr = new DataOutputStream(connection.getOutputStream())) {
                 wr.writeBytes(this.postData);
             }
         }
@@ -477,16 +424,12 @@ public URLConnection openConnection() throws IOException {
             }
             if ((status >= 400) && (status < 500)) {
                 throw new IOException(
-                    new FetcherClientException(
-                        "Encountered HTTP Status code " + status
-                    )
+                    new FetcherClientException("Encountered HTTP Status code " + status)
                 );
             }
             if (status >= 500) {
                 throw new IOException(
-                    new FetcherServerException(
-                        "Encountered HTTP Status Code " + status
-                    )
+                    new FetcherServerException("Encountered HTTP Status Code " + status)
                 );
             }
         }
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 8324dc533b9..7b59173789d 100644
--- a/src/main/java/org/jabref/logic/net/ssl/SSLCertificate.java
+++ b/src/main/java/org/jabref/logic/net/ssl/SSLCertificate.java
@@ -17,9 +17,7 @@
 
 public class SSLCertificate {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(
-        SSLCertificate.class
-    );
+    private static final Logger LOGGER = LoggerFactory.getLogger(SSLCertificate.class);
 
     private final String sha256Thumbprint;
     private final String serialNumber;
@@ -78,9 +76,7 @@ public String getSHA256Thumbprint() {
         return sha256Thumbprint;
     }
 
-    public static Optional<SSLCertificate> fromX509(
-        X509Certificate x509Certificate
-    ) {
+    public static Optional<SSLCertificate> fromX509(X509Certificate x509Certificate) {
         Objects.requireNonNull(x509Certificate);
         try {
             return Optional.of(
@@ -109,8 +105,7 @@ public static Optional<SSLCertificate> fromX509(
     public static Optional<SSLCertificate> fromPath(Path certPath) {
         Objects.requireNonNull(certPath);
         try {
-            CertificateFactory certificateFactory =
-                CertificateFactory.getInstance("X509");
+            CertificateFactory certificateFactory = CertificateFactory.getInstance("X509");
             return fromX509(
                 (X509Certificate) certificateFactory.generateCertificate(
                     new FileInputStream(certPath.toFile())
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 8d526e552cb..5a8a1726eac 100644
--- a/src/main/java/org/jabref/logic/net/ssl/TrustStoreManager.java
+++ b/src/main/java/org/jabref/logic/net/ssl/TrustStoreManager.java
@@ -28,9 +28,7 @@
 
 public class TrustStoreManager {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(
-        TrustStoreManager.class
-    );
+    private static final Logger LOGGER = LoggerFactory.getLogger(TrustStoreManager.class);
     private static final String STORE_PASSWORD = "changeit";
 
     private final Path storePath;
@@ -42,21 +40,11 @@ public TrustStoreManager(Path storePath) {
         createTruststoreFileIfNotExist(storePath);
         try {
             store = KeyStore.getInstance(KeyStore.getDefaultType());
-            store.load(
-                new FileInputStream(storePath.toFile()),
-                STORE_PASSWORD.toCharArray()
-            );
+            store.load(new FileInputStream(storePath.toFile()), STORE_PASSWORD.toCharArray());
         } catch (
-            CertificateException
-            | IOException
-            | NoSuchAlgorithmException
-            | KeyStoreException e
+            CertificateException | IOException | NoSuchAlgorithmException | KeyStoreException e
         ) {
-            LOGGER.warn(
-                "Error while loading trust store from: {}",
-                storePath.toAbsolutePath(),
-                e
-            );
+            LOGGER.warn("Error while loading trust store from: {}", storePath.toAbsolutePath(), e);
         }
     }
 
@@ -65,20 +53,13 @@ public void addCertificate(String alias, Path certPath) {
         Objects.requireNonNull(certPath);
 
         try {
-            CertificateFactory certificateFactory =
-                CertificateFactory.getInstance("X509");
+            CertificateFactory certificateFactory = CertificateFactory.getInstance("X509");
             store.setCertificateEntry(
                 alias,
-                certificateFactory.generateCertificate(
-                    new FileInputStream(certPath.toFile())
-                )
+                certificateFactory.generateCertificate(new FileInputStream(certPath.toFile()))
             );
         } catch (KeyStoreException | CertificateException | IOException e) {
-            LOGGER.warn(
-                "Error while adding a new certificate to the truststore: {}",
-                alias,
-                e
-            );
+            LOGGER.warn("Error while adding a new certificate to the truststore: {}", alias, e);
         }
     }
 
@@ -87,11 +68,7 @@ public void deleteCertificate(String alias) {
         try {
             store.deleteEntry(alias);
         } catch (KeyStoreException e) {
-            LOGGER.warn(
-                "Error while deleting certificate entry with alias: {}",
-                alias,
-                e
-            );
+            LOGGER.warn("Error while deleting certificate entry with alias: {}", alias, e);
         }
     }
 
@@ -100,11 +77,7 @@ public boolean certificateExists(String alias) {
         try {
             return store.isCertificateEntry(alias);
         } catch (KeyStoreException e) {
-            LOGGER.warn(
-                "Error while checking certificate existence: {}",
-                alias,
-                e
-            );
+            LOGGER.warn("Error while checking certificate existence: {}", alias, e);
         }
         return false;
     }
@@ -129,15 +102,9 @@ public int certsCount() {
 
     public void flush() {
         try {
-            store.store(
-                Files.newOutputStream(storePath),
-                STORE_PASSWORD.toCharArray()
-            );
+            store.store(Files.newOutputStream(storePath), STORE_PASSWORD.toCharArray());
         } catch (
-            KeyStoreException
-            | IOException
-            | NoSuchAlgorithmException
-            | CertificateException e
+            KeyStoreException | IOException | NoSuchAlgorithmException | CertificateException e
         ) {
             LOGGER.warn("Error while flushing trust store", e);
         }
@@ -154,10 +121,7 @@ private Boolean isCustomCertificate(String alias) {
      * Deletes all custom certificates, Custom certificates are certificates with alias that ends with {@code [custom]}
      */
     public void clearCustomCertificates() {
-        aliases()
-            .stream()
-            .filter(this::isCustomCertificate)
-            .forEach(this::deleteCertificate);
+        aliases().stream().filter(this::isCustomCertificate).forEach(this::deleteCertificate);
         flush();
     }
 
@@ -175,11 +139,7 @@ public X509Certificate getCertificate(String alias) {
         try {
             return (X509Certificate) store.getCertificate(alias);
         } catch (KeyStoreException e) {
-            LOGGER.warn(
-                "Error while getting certificate of alias: {}",
-                alias,
-                e
-            );
+            LOGGER.warn("Error while getting certificate of alias: {}", alias, e);
         }
         return null;
     }
@@ -195,8 +155,7 @@ public static void createTruststoreFileIfNotExist(Path storePath) {
             LOGGER.debug("Trust store path: {}", storePath.toAbsolutePath());
             if (Files.notExists(storePath)) {
                 Path storeResourcePath = Path.of(
-                    TrustStoreManager.class.getResource("/ssl/truststore.jks")
-                        .toURI()
+                    TrustStoreManager.class.getResource("/ssl/truststore.jks").toURI()
                 );
                 Files.createDirectories(storePath.getParent());
                 Files.copy(storeResourcePath, storePath);
@@ -276,10 +235,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) {
@@ -289,10 +246,8 @@ public void checkServerTrusted(
             }
 
             @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);
@@ -300,17 +255,14 @@ public void checkClientTrusted(
         };
     }
 
-    private static void setSystemTrustManager(
-        X509TrustManager mergedTrustManager
-    ) throws NoSuchAlgorithmException, KeyManagementException {
+    private static void setSystemTrustManager(X509TrustManager mergedTrustManager)
+        throws NoSuchAlgorithmException, KeyManagementException {
         SSLContext sslContext = SSLContext.getInstance("TLS");
         sslContext.init(null, new TrustManager[] { mergedTrustManager }, null);
 
         // You don't have to set this as the default context,
         // it depends on the library you're using.
         SSLContext.setDefault(sslContext);
-        HttpsURLConnection.setDefaultSSLSocketFactory(
-            sslContext.getSocketFactory()
-        );
+        HttpsURLConnection.setDefaultSSLSocketFactory(sslContext.getSocketFactory());
     }
 }
diff --git a/src/main/java/org/jabref/logic/openoffice/OpenOfficeFileSearch.java b/src/main/java/org/jabref/logic/openoffice/OpenOfficeFileSearch.java
index fa5d1b96127..e0d383c1fe9 100644
--- a/src/main/java/org/jabref/logic/openoffice/OpenOfficeFileSearch.java
+++ b/src/main/java/org/jabref/logic/openoffice/OpenOfficeFileSearch.java
@@ -19,9 +19,7 @@
 
 public class OpenOfficeFileSearch {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(
-        OpenOfficeFileSearch.class
-    );
+    private static final Logger LOGGER = LoggerFactory.getLogger(OpenOfficeFileSearch.class);
 
     /**
      * Detects existing installation of OpenOffice and LibreOffice.
@@ -34,45 +32,32 @@ public static List<Path> detectInstallations() {
             return programDirs
                 .stream()
                 .filter(dir ->
-                    FileUtil
-                        .find(OpenOfficePreferences.WINDOWS_EXECUTABLE, dir)
-                        .isPresent()
+                    FileUtil.find(OpenOfficePreferences.WINDOWS_EXECUTABLE, dir).isPresent()
                 )
                 .collect(Collectors.toList());
         } else if (OS.OS_X) {
             List<Path> programDirs = findOSXOpenOfficeDirs();
             return programDirs
                 .stream()
-                .filter(dir ->
-                    FileUtil
-                        .find(OpenOfficePreferences.OSX_EXECUTABLE, dir)
-                        .isPresent()
-                )
+                .filter(dir -> FileUtil.find(OpenOfficePreferences.OSX_EXECUTABLE, dir).isPresent())
                 .collect(Collectors.toList());
         } else if (OS.LINUX) {
             List<Path> programDirs = findLinuxOpenOfficeDirs();
             return programDirs
                 .stream()
                 .filter(dir ->
-                    FileUtil
-                        .find(OpenOfficePreferences.LINUX_EXECUTABLE, dir)
-                        .isPresent()
+                    FileUtil.find(OpenOfficePreferences.LINUX_EXECUTABLE, dir).isPresent()
                 )
                 .collect(Collectors.toList());
         }
         return new ArrayList<>(0);
     }
 
-    private static List<Path> findOpenOfficeDirectories(
-        List<Path> programDirectories
-    ) {
+    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"));
+                path.toString().toLowerCase(Locale.ROOT).contains("libreoffice"));
 
         return programDirectories
             .stream()
@@ -109,9 +94,7 @@ private static List<Path> findWindowsOpenOfficeDirs() {
     }
 
     private static List<Path> findOSXOpenOfficeDirs() {
-        List<Path> sourceList = Collections.singletonList(
-            Path.of("/Applications")
-        );
+        List<Path> sourceList = Collections.singletonList(Path.of("/Applications"));
 
         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 e17ee9adf75..d5915daf649 100644
--- a/src/main/java/org/jabref/logic/openoffice/OpenOfficePreferences.java
+++ b/src/main/java/org/jabref/logic/openoffice/OpenOfficePreferences.java
@@ -10,18 +10,15 @@
 
 public class OpenOfficePreferences {
 
-    public static final String DEFAULT_WIN_EXEC_PATH =
-        "C:\\Program Files\\LibreOffice 5\\program";
+    public static final String DEFAULT_WIN_EXEC_PATH = "C:\\Program Files\\LibreOffice 5\\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 OSX_EXECUTABLE = "soffice";
 
-    public static final String DEFAULT_LINUX_EXEC_PATH =
-        "/usr/lib/libreoffice/program/soffice";
-    public static final String DEFAULT_LINUX_FLATPAK_EXEC_PATH =
-        "/app/bin/soffice";
+    public static final String DEFAULT_LINUX_EXEC_PATH = "/usr/lib/libreoffice/program/soffice";
+    public static final String DEFAULT_LINUX_FLATPAK_EXEC_PATH = "/app/bin/soffice";
     public static final String LINUX_EXECUTABLE = "soffice";
 
     private final StringProperty executablePath;
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 e5ba5dc03ac..0637340d708 100644
--- a/src/main/java/org/jabref/logic/openoffice/action/EditInsert.java
+++ b/src/main/java/org/jabref/logic/openoffice/action/EditInsert.java
@@ -63,16 +63,10 @@ public static void insertCitationGroup(
         String pageInfo
     )
         throws NoDocumentException, NotRemoveableException, WrappedTargetException, PropertyVetoException, CreationException, IllegalTypeException {
-        List<String> citationKeys = OOListUtil.map(
-            entries,
-            EditInsert::insertEntryGetCitationKey
-        );
+        List<String> citationKeys = OOListUtil.map(entries, EditInsert::insertEntryGetCitationKey);
 
         final int totalEntries = entries.size();
-        List<Optional<OOText>> pageInfos = OODataModel.fakePageInfos(
-            pageInfo,
-            totalEntries
-        );
+        List<Optional<OOText>> pageInfos = OODataModel.fakePageInfos(pageInfo, totalEntries);
 
         List<CitationMarkerEntry> citations = new ArrayList<>(totalEntries);
         for (int i = 0; i < totalEntries; i++) {
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 5236743c619..c0c50e08e06 100644
--- a/src/main/java/org/jabref/logic/openoffice/action/EditMerge.java
+++ b/src/main/java/org/jabref/logic/openoffice/action/EditMerge.java
@@ -29,9 +29,7 @@
 
 public class EditMerge {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(
-        EditMerge.class
-    );
+    private static final Logger LOGGER = LoggerFactory.getLogger(EditMerge.class);
 
     private EditMerge() {}
 
@@ -49,10 +47,7 @@ public static boolean mergeCitationGroups(
         try {
             UnoScreenRefresh.lockControllers(doc);
 
-            List<JoinableGroupData> joinableGroups = EditMerge.scan(
-                doc,
-                frontend
-            );
+            List<JoinableGroupData> joinableGroups = EditMerge.scan(doc, frontend);
 
             for (JoinableGroupData joinableGroupData : joinableGroups) {
                 List<CitationGroup> groups = joinableGroupData.group;
@@ -63,17 +58,13 @@ public static boolean mergeCitationGroups(
                     .collect(Collectors.toList());
 
                 CitationType citationType = groups.get(0).citationType;
-                List<Optional<OOText>> pageInfos =
-                    frontend.backend.combinePageInfos(groups);
+                List<Optional<OOText>> pageInfos = frontend.backend.combinePageInfos(groups);
 
                 frontend.removeCitationGroups(groups, doc);
                 XTextCursor textCursor = joinableGroupData.groupCursor;
                 textCursor.setString(""); // Also remove the spaces between.
 
-                List<String> citationKeys = OOListUtil.map(
-                    newCitations,
-                    Citation::getCitationKey
-                );
+                List<String> citationKeys = OOListUtil.map(newCitations, Citation::getCitationKey);
 
                 /* insertSpaceAfter: no, it is already there (or could be) */
                 boolean insertSpaceAfter = false;
@@ -188,10 +179,7 @@ private static boolean checkAddToGroup(
             }
 
             // Sanity check: the current range should start later than the previous.
-            int textOrder = UnoTextRange.compareStarts(
-                state.prevRange,
-                currentRange
-            );
+            int textOrder = UnoTextRange.compareStarts(state.prevRange, currentRange);
             if (textOrder != -1) {
                 String msg = String.format(
                     "MergeCitationGroups:" +
@@ -216,16 +204,8 @@ private static boolean checkAddToGroup(
         Objects.requireNonNull(state.currentGroupCursor);
 
         // assume: currentGroupCursor.getEnd() == cursorBetween.getEnd()
-        if (
-            UnoTextRange.compareEnds(
-                state.cursorBetween,
-                state.currentGroupCursor
-            ) !=
-            0
-        ) {
-            LOGGER.warn(
-                "MergeCitationGroups: cursorBetween.end != currentGroupCursor.end"
-            );
+        if (UnoTextRange.compareEnds(state.cursorBetween, state.currentGroupCursor) != 0) {
+            LOGGER.warn("MergeCitationGroups: cursorBetween.end != currentGroupCursor.end");
             throw new IllegalStateException("MergeCitationGroups failed");
         }
 
@@ -239,21 +219,14 @@ private static boolean checkAddToGroup(
             .getText()
             .createTextCursorByRange(state.cursorBetween.getEnd());
 
-        while (
-            couldExpand &&
-            (UnoTextRange.compareEnds(state.cursorBetween, rangeStart) < 0)
-        ) {
+        while (couldExpand && (UnoTextRange.compareEnds(state.cursorBetween, rangeStart) < 0)) {
             //
             // Check that we only walk through inline whitespace.
             //
             couldExpand = thisCharCursor.goRight((short) 1, true);
             String thisChar = thisCharCursor.getString();
             thisCharCursor.collapseToEnd();
-            if (
-                thisChar.isEmpty() ||
-                "\n".equals(thisChar) ||
-                !thisChar.trim().isEmpty()
-            ) {
+            if (thisChar.isEmpty() || "\n".equals(thisChar) || !thisChar.trim().isEmpty()) {
                 couldExpand = false;
                 if (!thisChar.isEmpty()) {
                     thisCharCursor.goLeft((short) 1, false);
@@ -264,13 +237,7 @@ private static boolean checkAddToGroup(
             state.currentGroupCursor.goRight((short) 1, true);
 
             // These two should move in sync:
-            if (
-                UnoTextRange.compareEnds(
-                    state.cursorBetween,
-                    state.currentGroupCursor
-                ) !=
-                0
-            ) {
+            if (UnoTextRange.compareEnds(state.cursorBetween, state.currentGroupCursor) != 0) {
                 LOGGER.warn(
                     "MergeCitationGroups: cursorBetween.end != currentGroupCursor.end (during expand)"
                 );
@@ -302,33 +269,19 @@ private static void addToCurrentGroup(
 
         // Set up cursorBetween to start at currentRange.getEnd()
         XTextRange rangeEnd = currentRange.getEnd();
-        state.cursorBetween =
-            currentRange.getText().createTextCursorByRange(rangeEnd);
+        state.cursorBetween = currentRange.getText().createTextCursorByRange(rangeEnd);
 
         // If new group, create currentGroupCursor
         if (isNewGroup) {
             state.currentGroupCursor =
-                currentRange
-                    .getText()
-                    .createTextCursorByRange(currentRange.getStart());
+                currentRange.getText().createTextCursorByRange(currentRange.getStart());
         }
 
         // include currentRange in currentGroupCursor
-        state.currentGroupCursor.goRight(
-            (short) (currentRange.getString().length()),
-            true
-        );
+        state.currentGroupCursor.goRight((short) (currentRange.getString().length()), true);
 
-        if (
-            UnoTextRange.compareEnds(
-                state.cursorBetween,
-                state.currentGroupCursor
-            ) !=
-            0
-        ) {
-            LOGGER.warn(
-                "MergeCitationGroups: cursorBetween.end != currentGroupCursor.end"
-            );
+        if (UnoTextRange.compareEnds(state.cursorBetween, state.currentGroupCursor) != 0) {
+            LOGGER.warn("MergeCitationGroups: cursorBetween.end != currentGroupCursor.end");
             throw new IllegalStateException("MergeCitationGroups failed");
         }
 
@@ -340,18 +293,15 @@ private static void addToCurrentGroup(
     /**
      * Scan the document for joinable groups. Return those found.
      */
-    private static List<JoinableGroupData> scan(
-        XTextDocument doc,
-        OOFrontend frontend
-    ) throws NoDocumentException, WrappedTargetException {
+    private static List<JoinableGroupData> scan(XTextDocument doc, OOFrontend frontend)
+        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;
         }
@@ -373,18 +323,12 @@ private static List<JoinableGroupData> scan(
              *
              * Can it start a new group?
              */
-            boolean canStartGroup =
-                group.citationType == CitationType.AUTHORYEAR_PAR;
+            boolean canStartGroup = group.citationType == CitationType.AUTHORYEAR_PAR;
 
             if (!addToGroup) {
                 // close currentGroup
                 if (state.currentGroup.size() > 1) {
-                    result.add(
-                        new JoinableGroupData(
-                            state.currentGroup,
-                            state.currentGroupCursor
-                        )
-                    );
+                    result.add(new JoinableGroupData(state.currentGroup, state.currentGroupCursor));
                 }
                 // Start a new, empty group
                 state.reset();
@@ -397,12 +341,7 @@ private static List<JoinableGroupData> scan(
 
         // close currentGroup
         if (state.currentGroup.size() > 1) {
-            result.add(
-                new JoinableGroupData(
-                    state.currentGroup,
-                    state.currentGroupCursor
-                )
-            );
+            result.add(new JoinableGroupData(state.currentGroup, state.currentGroupCursor));
         }
         return result;
     }
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 a06c119833e..c03a69f8ea8 100644
--- a/src/main/java/org/jabref/logic/openoffice/action/EditSeparate.java
+++ b/src/main/java/org/jabref/logic/openoffice/action/EditSeparate.java
@@ -38,12 +38,9 @@ public static boolean separateCitations(
         // style changed since refresh this is the last on the screen
         // as well.
         frontend.citationGroups.lookupCitations(databases);
-        frontend.citationGroups.imposeLocalOrder(
-            OOProcess.comparatorForMulticite(style)
-        );
+        frontend.citationGroups.imposeLocalOrder(OOProcess.comparatorForMulticite(style));
 
-        List<CitationGroup> groups =
-            frontend.citationGroups.getCitationGroupsUnordered();
+        List<CitationGroup> groups = frontend.citationGroups.getCitationGroupsUnordered();
 
         try {
             UnoScreenRefresh.lockControllers(doc);
@@ -52,9 +49,7 @@ public static boolean separateCitations(
                 XTextRange range1 = frontend
                     .getMarkRange(doc, group)
                     .orElseThrow(IllegalStateException::new);
-                XTextCursor textCursor = range1
-                    .getText()
-                    .createTextCursorByRange(range1);
+                XTextCursor textCursor = range1.getText().createTextCursorByRange(range1);
 
                 List<Citation> citations = group.citationsInStorageOrder;
                 if (citations.size() <= 1) {
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 0728e5fb4c9..3f34458a0fc 100644
--- a/src/main/java/org/jabref/logic/openoffice/action/ExportCited.java
+++ b/src/main/java/org/jabref/logic/openoffice/action/ExportCited.java
@@ -26,10 +26,7 @@ public static class GenerateDatabaseResult {
         public final List<String> unresolvedKeys;
         public final BibDatabase newDatabase;
 
-        GenerateDatabaseResult(
-            List<String> unresolvedKeys,
-            BibDatabase newDatabase
-        ) {
+        GenerateDatabaseResult(List<String> unresolvedKeys, BibDatabase newDatabase) {
             this.unresolvedKeys = unresolvedKeys;
             this.newDatabase = newDatabase;
         }
@@ -47,8 +44,7 @@ public static GenerateDatabaseResult generateDatabase(
         List<BibDatabase> databases
     ) throws NoDocumentException, WrappedTargetException {
         OOFrontend frontend = new OOFrontend(doc);
-        CitedKeys citationKeys =
-            frontend.citationGroups.getCitedKeysUnordered();
+        CitedKeys citationKeys = frontend.citationGroups.getCitedKeysUnordered();
         citationKeys.lookupInDatabases(databases);
 
         List<String> unresolvedKeys = new ArrayList<>();
@@ -62,10 +58,7 @@ public static GenerateDatabaseResult generateDatabase(
                 unresolvedKeys.add(citation.citationKey);
             } else {
                 BibEntry entry = citation.getLookupResult().get().entry;
-                BibDatabase loopDatabase = citation
-                    .getLookupResult()
-                    .get()
-                    .database;
+                BibDatabase loopDatabase = citation.getLookupResult().get().database;
 
                 // If entry found
                 BibEntry clonedEntry = (BibEntry) entry.clone();
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 9365993dc74..8e4f82df7d7 100644
--- a/src/main/java/org/jabref/logic/openoffice/action/ManageCitations.java
+++ b/src/main/java/org/jabref/logic/openoffice/action/ManageCitations.java
@@ -19,10 +19,7 @@ public static List<CitationEntry> getCitationEntries(XTextDocument doc)
         return frontend.getCitationEntries(doc);
     }
 
-    public static void applyCitationEntries(
-        XTextDocument doc,
-        List<CitationEntry> citationEntries
-    )
+    public static void applyCitationEntries(XTextDocument doc, List<CitationEntry> citationEntries)
         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 90911236186..976ae568cdd 100644
--- a/src/main/java/org/jabref/logic/openoffice/action/Update.java
+++ b/src/main/java/org/jabref/logic/openoffice/action/Update.java
@@ -37,11 +37,7 @@ private static List<String> updateDocument(
         final boolean useLockControllers = true;
 
         frontend.imposeGlobalOrder(doc, fcursor);
-        OOProcess.produceCitationMarkers(
-            frontend.citationGroups,
-            databases,
-            style
-        );
+        OOProcess.produceCitationMarkers(frontend.citationGroups, databases, style);
 
         try {
             if (useLockControllers) {
@@ -62,9 +58,7 @@ private static List<String> updateDocument(
 
             return frontend.citationGroups.getUnresolvedKeys();
         } finally {
-            if (
-                useLockControllers && UnoScreenRefresh.hasControllersLocked(doc)
-            ) {
+            if (useLockControllers && UnoScreenRefresh.hasControllersLocked(doc)) {
                 UnoScreenRefresh.unlockControllers(doc);
             }
         }
@@ -124,12 +118,6 @@ public static List<String> resyncDocument(
         throws CreationException, NoDocumentException, WrappedTargetException, com.sun.star.lang.IllegalArgumentException {
         OOFrontend frontend = new OOFrontend(doc);
 
-        return Update.synchronizeDocument(
-            doc,
-            frontend,
-            style,
-            fcursor,
-            syncOptions
-        );
+        return Update.synchronizeDocument(doc, frontend, style, fcursor, syncOptions);
     }
 }
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 eb59a417fd9..4a120ccbd49 100644
--- a/src/main/java/org/jabref/logic/openoffice/backend/Backend52.java
+++ b/src/main/java/org/jabref/logic/openoffice/backend/Backend52.java
@@ -39,9 +39,7 @@
  */
 public class Backend52 {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(
-        Backend52.class
-    );
+    private static final Logger LOGGER = LoggerFactory.getLogger(Backend52.class);
     public final OODataModel dataModel;
     private final NamedRangeManager citationStorageManager;
     private final Map<CitationGroupId, NamedRange> cgidToNamedRange;
@@ -58,8 +56,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);
     }
@@ -92,13 +89,9 @@ private List<String> findUnusedJabrefPropertyNames(
     /**
      * @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)
-                );
+            this.findUnusedJabrefPropertyNames(doc, this.getJabRefReferenceMarkNames(doc));
         if (pageInfoThrash.isEmpty()) {
             return Optional.empty();
         }
@@ -131,10 +124,8 @@ private static Optional<OOText> getPageInfoFromData(CitationGroup group) {
     /**
      * @param markName Reference mark name
      */
-    public CitationGroup readCitationGroupFromDocumentOrThrow(
-        XTextDocument doc,
-        String markName
-    ) throws WrappedTargetException, NoDocumentException {
+    public CitationGroup readCitationGroupFromDocumentOrThrow(XTextDocument doc, String markName)
+        throws WrappedTargetException, NoDocumentException {
         Codec52.ParsedMarkName parsed = Codec52
             .parseMarkName(markName)
             .orElseThrow(IllegalArgumentException::new);
@@ -200,9 +191,7 @@ public CitationGroup createCitationGroup(
             Citation cit = new Citation(citationKeys.get(i));
             citations.add(cit);
 
-            Optional<OOText> pageInfo = PageInfo.normalizePageInfo(
-                pageInfos.get(i)
-            );
+            Optional<OOText> pageInfo = PageInfo.normalizePageInfo(pageInfos.get(i));
             switch (dataModel) {
                 case JabRef52:
                     if (i == last) {
@@ -254,17 +243,11 @@ public CitationGroup createCitationGroup(
 
         switch (dataModel) {
             case JabRef52:
-                Optional<OOText> pageInfo = PageInfo.normalizePageInfo(
-                    pageInfos.get(last)
-                );
+                Optional<OOText> pageInfo = PageInfo.normalizePageInfo(pageInfos.get(last));
 
                 if (pageInfo.isPresent()) {
                     String pageInfoString = OOText.toString(pageInfo.get());
-                    UnoUserDefinedProperty.setStringProperty(
-                        doc,
-                        markName,
-                        pageInfoString
-                    );
+                    UnoUserDefinedProperty.setStringProperty(doc, markName, pageInfoString);
                 } else {
                     // do not inherit from trash
                     UnoUserDefinedProperty.removeIfExists(doc, markName);
@@ -322,17 +305,12 @@ public static List<Optional<OOText>> combinePageInfosCommon(
                 if ("".equals(singlePageInfo)) {
                     singlePageInfo = null;
                 }
-                return OODataModel.fakePageInfos(
-                    singlePageInfo,
-                    totalCitations
-                );
+                return OODataModel.fakePageInfos(singlePageInfo, totalCitations);
             case JabRef60:
                 return joinableGroup
                     .stream()
                     .flatMap(group ->
-                        (group.citationsInStorageOrder
-                                .stream()
-                                .map(Citation::getPageInfo))
+                        (group.citationsInStorageOrder.stream().map(Citation::getPageInfo))
                     )
                     .collect(Collectors.toList());
             default:
@@ -340,18 +318,14 @@ public static List<Optional<OOText>> combinePageInfosCommon(
         }
     }
 
-    public List<Optional<OOText>> combinePageInfos(
-        List<CitationGroup> joinableGroup
-    ) {
+    public List<Optional<OOText>> combinePageInfos(List<CitationGroup> joinableGroup) {
         return combinePageInfosCommon(this.dataModel, joinableGroup);
     }
 
     private NamedRange getNamedRangeOrThrow(CitationGroup group) {
         NamedRange namedRange = this.cgidToNamedRange.get(group.groupId);
         if (namedRange == null) {
-            throw new IllegalStateException(
-                "getNamedRange: could not lookup namedRange"
-            );
+            throw new IllegalStateException("getNamedRange: could not lookup namedRange");
         }
         return namedRange;
     }
@@ -368,10 +342,8 @@ 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 {
+    public Optional<XTextRange> getMarkRange(CitationGroup group, XTextDocument doc)
+        throws NoDocumentException, WrappedTargetException {
         NamedRange namedRange = getNamedRangeOrThrow(group);
         return namedRange.getMarkRange(doc);
     }
@@ -390,10 +362,8 @@ public Optional<XTextCursor> getRawCursorForCitationGroup(
     /**
      * Must be followed by call to cleanFillCursorForCitationGroup
      */
-    public XTextCursor getFillCursorForCitationGroup(
-        CitationGroup group,
-        XTextDocument doc
-    ) throws NoDocumentException, WrappedTargetException, CreationException {
+    public XTextCursor getFillCursorForCitationGroup(CitationGroup group, XTextDocument doc)
+        throws NoDocumentException, WrappedTargetException, CreationException {
         NamedRange namedRange = getNamedRangeOrThrow(group);
         return namedRange.getFillCursor(doc);
     }
@@ -401,18 +371,14 @@ public XTextCursor getFillCursorForCitationGroup(
     /**
      * To be called after getFillCursorForCitationGroup
      */
-    public void cleanFillCursorForCitationGroup(
-        CitationGroup group,
-        XTextDocument doc
-    ) throws NoDocumentException, WrappedTargetException {
+    public void cleanFillCursorForCitationGroup(CitationGroup group, XTextDocument doc)
+        throws NoDocumentException, WrappedTargetException {
         NamedRange namedRange = getNamedRangeOrThrow(group);
         namedRange.cleanFillCursor(doc);
     }
 
-    public List<CitationEntry> getCitationEntries(
-        XTextDocument doc,
-        CitationGroups citationGroups
-    ) throws WrappedTargetException, NoDocumentException {
+    public List<CitationEntry> getCitationEntries(XTextDocument doc, CitationGroups citationGroups)
+        throws WrappedTargetException, NoDocumentException {
         switch (dataModel) {
             case JabRef52:
                 // One context per CitationGroup: Backend52 (DataModel.JabRef52)
@@ -425,21 +391,11 @@ public List<CitationEntry> getCitationEntries(
                     XTextCursor cursor =
                         this.getRawCursorForCitationGroup(group, doc)
                             .orElseThrow(IllegalStateException::new);
-                    String context = GetContext.getCursorStringWithContext(
-                        cursor,
-                        30,
-                        30,
-                        true
-                    );
+                    String context = GetContext.getCursorStringWithContext(cursor, 30, 30, true);
                     Optional<String> pageInfo = group.numberOfCitations() > 0
-                        ? (getPageInfoFromData(group)
-                                .map(e -> OOText.toString(e)))
+                        ? (getPageInfoFromData(group).map(e -> OOText.toString(e)))
                         : Optional.empty();
-                    CitationEntry entry = new CitationEntry(
-                        name,
-                        context,
-                        pageInfo
-                    );
+                    CitationEntry entry = new CitationEntry(name, context, pageInfo);
                     citations.add(entry);
                 }
                 return citations;
@@ -449,26 +405,19 @@ public List<CitationEntry> getCitationEntries(
                     "getCitationEntries for JabRef60 is not implemented yet"
                 );
             default:
-                throw new IllegalStateException(
-                    "getCitationEntries: unhandled dataModel "
-                );
+                throw new IllegalStateException("getCitationEntries: unhandled dataModel ");
         }
     }
 
     /**
      * Only applies to storage. Citation markers are not changed.
      */
-    public void applyCitationEntries(
-        XTextDocument doc,
-        List<CitationEntry> citationEntries
-    )
+    public void applyCitationEntries(XTextDocument doc, List<CitationEntry> citationEntries)
         throws PropertyVetoException, IllegalTypeException, IllegalArgumentException, WrappedTargetException {
         switch (dataModel) {
             case JabRef52:
                 for (CitationEntry entry : citationEntries) {
-                    Optional<OOText> pageInfo = entry
-                        .getPageInfo()
-                        .map(OOText::fromString);
+                    Optional<OOText> pageInfo = entry.getPageInfo().map(OOText::fromString);
                     pageInfo = PageInfo.normalizePageInfo(pageInfo);
                     if (pageInfo.isPresent()) {
                         String name = entry.getRefMarkName();
@@ -486,9 +435,7 @@ public void applyCitationEntries(
                     "applyCitationEntries for JabRef60 is not implemented yet"
                 );
             default:
-                throw new IllegalStateException(
-                    "applyCitationEntries: unhandled dataModel "
-                );
+                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 989c40e730d..0282e864fff 100644
--- a/src/main/java/org/jabref/logic/openoffice/backend/Codec52.java
+++ b/src/main/java/org/jabref/logic/openoffice/backend/Codec52.java
@@ -43,11 +43,7 @@ public static class ParsedMarkName {
          */
         public final List<String> citationKeys;
 
-        ParsedMarkName(
-            String index,
-            CitationType citationType,
-            List<String> citationKeys
-        ) {
+        ParsedMarkName(String index, CitationType citationType, List<String> citationKeys) {
             Objects.requireNonNull(index);
             Objects.requireNonNull(citationKeys);
             this.index = index;
@@ -64,9 +60,7 @@ private static CitationType citationTypeFromInt(int code) {
             case 1 -> CitationType.AUTHORYEAR_PAR;
             case 2 -> CitationType.AUTHORYEAR_INTEXT;
             case 3 -> CitationType.INVISIBLE_CIT;
-            default -> throw new IllegalArgumentException(
-                "Invalid CitationType code"
-            );
+            default -> throw new IllegalArgumentException("Invalid CitationType code");
         };
     }
 
@@ -100,13 +94,7 @@ public static String getUniqueMarkName(
         int citTypeCode = citationTypeToInt(citationType);
         String name = BIB_CITATION + '_' + citTypeCode + '_' + citationKeysPart;
         while (usedNames.contains(name)) {
-            name =
-                BIB_CITATION +
-                index +
-                '_' +
-                citTypeCode +
-                '_' +
-                citationKeysPart;
+            name = BIB_CITATION + index + '_' + citTypeCode + '_' + citationKeysPart;
             index++;
         }
         return name;
@@ -127,9 +115,7 @@ public static Optional<ParsedMarkName> parseMarkName(String refMarkName) {
         String index = citeMatcher.group(1);
         int citTypeCode = Integer.parseInt(citeMatcher.group(2));
         CitationType citationType = citationTypeFromInt(citTypeCode);
-        return Optional.of(
-            new Codec52.ParsedMarkName(index, citationType, keys)
-        );
+        return Optional.of(new Codec52.ParsedMarkName(index, citationType, keys));
     }
 
     /**
@@ -144,9 +130,7 @@ public static boolean isJabRefReferenceMarkName(String name) {
      *
      * @param names The list to be filtered.
      */
-    public static List<String> filterIsJabRefReferenceMarkName(
-        List<String> names
-    ) {
+    public static List<String> filterIsJabRefReferenceMarkName(List<String> names) {
         return names
             .stream()
             .filter(Codec52::isJabRefReferenceMarkName)
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 9c31796e1fc..843ee386b97 100644
--- a/src/main/java/org/jabref/logic/openoffice/backend/GetContext.java
+++ b/src/main/java/org/jabref/logic/openoffice/backend/GetContext.java
@@ -9,9 +9,7 @@
  */
 public class GetContext {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(
-        GetContext.class
-    );
+    private static final Logger LOGGER = LoggerFactory.getLogger(GetContext.class);
 
     private GetContext() {}
 
@@ -59,11 +57,7 @@ public static String getCursorStringWithContext(
                 cursor.goRight((short) 1, true);
                 if (i >= ((charAfter + lengthWithBefore) - flex)) {
                     String strNow = cursor.getString();
-                    if (
-                        Character.isWhitespace(
-                            strNow.charAt(strNow.length() - 1)
-                        )
-                    ) {
+                    if (Character.isWhitespace(strNow.charAt(strNow.length() - 1))) {
                         break;
                     }
                 }
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 2eba2e25707..09be203bc68 100644
--- a/src/main/java/org/jabref/logic/openoffice/backend/NamedRangeManagerReferenceMark.java
+++ b/src/main/java/org/jabref/logic/openoffice/backend/NamedRangeManagerReferenceMark.java
@@ -31,18 +31,13 @@ public NamedRange createNamedRange(
     }
 
     @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);
+    public Optional<NamedRange> getNamedRangeFromDocument(XTextDocument doc, String refMarkName)
+        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 5d4bbce3d84..1e66254e41b 100644
--- a/src/main/java/org/jabref/logic/openoffice/backend/NamedRangeReferenceMark.java
+++ b/src/main/java/org/jabref/logic/openoffice/backend/NamedRangeReferenceMark.java
@@ -22,15 +22,15 @@ class NamedRangeReferenceMark implements NamedRange {
     // for debugging we may want visible bracket
     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
-    );
+    private static final Logger LOGGER = LoggerFactory.getLogger(NamedRangeReferenceMark.class);
 
     /**
      * reference mark name
@@ -85,26 +85,18 @@ private static void createReprInDocument(
         // The cursor we received: we push it before us.
         position.collapseToEnd();
 
-        XTextCursor cursor = safeInsertSpacesBetweenReferenceMarks(
-            position.getEnd(),
-            2
-        );
+        XTextCursor cursor = safeInsertSpacesBetweenReferenceMarks(position.getEnd(), 2);
 
         // cursors before the first and after the last space
-        XTextCursor cursorBefore = cursor
-            .getText()
-            .createTextCursorByRange(cursor.getStart());
-        XTextCursor cursorAfter = cursor
-            .getText()
-            .createTextCursorByRange(cursor.getEnd());
+        XTextCursor cursorBefore = cursor.getText().createTextCursorByRange(cursor.getStart());
+        XTextCursor cursorAfter = cursor.getText().createTextCursorByRange(cursor.getEnd());
 
         cursor.collapseToStart();
         cursor.goRight((short) 1, false);
         // now we are between two spaces
 
         final String left = NamedRangeReferenceMark.REFERENCE_MARK_LEFT_BRACKET;
-        final String right =
-            NamedRangeReferenceMark.REFERENCE_MARK_RIGHT_BRACKET;
+        final String right = NamedRangeReferenceMark.REFERENCE_MARK_RIGHT_BRACKET;
         String bracketedContent = withoutBrackets ? "" : left + right;
 
         cursor.getText().insertString(cursor, bracketedContent, true);
@@ -128,23 +120,15 @@ static NamedRangeReferenceMark create(
         boolean insertSpaceAfter,
         boolean withoutBrackets
     ) throws CreationException {
-        createReprInDocument(
-            doc,
-            refMarkName,
-            position,
-            insertSpaceAfter,
-            withoutBrackets
-        );
+        createReprInDocument(doc, refMarkName, position, insertSpaceAfter, withoutBrackets);
         return new NamedRangeReferenceMark(refMarkName);
     }
 
     /**
      * @return Optional.empty if there is no corresponding range.
      */
-    static Optional<NamedRangeReferenceMark> getFromDocument(
-        XTextDocument doc,
-        String refMarkName
-    ) throws NoDocumentException, WrappedTargetException {
+    static Optional<NamedRangeReferenceMark> getFromDocument(XTextDocument doc, String refMarkName)
+        throws NoDocumentException, WrappedTargetException {
         return UnoReferenceMark
             .getAnchor(doc, refMarkName)
             .map(e -> new NamedRangeReferenceMark(refMarkName));
@@ -186,8 +170,7 @@ public Optional<XTextCursor> getRawCursor(XTextDocument doc)
         throws NoDocumentException, WrappedTargetException {
         String name = this.getRangeName();
 
-        Optional<XTextContent> markAsTextContent =
-            UnoReferenceMark.getAsTextContent(doc, name);
+        Optional<XTextContent> markAsTextContent = UnoReferenceMark.getAsTextContent(doc, name);
 
         if (markAsTextContent.isEmpty()) {
             LOGGER.warn("getRawCursor: markAsTextContent({}).isEmpty()", name);
@@ -216,8 +199,7 @@ public XTextCursor getFillCursor(XTextDocument doc)
         XTextCursor full = null;
         String fullText = null;
         for (int i = 1; i <= 2; i++) {
-            Optional<XTextContent> markAsTextContent =
-                UnoReferenceMark.getAsTextContent(doc, name);
+            Optional<XTextContent> markAsTextContent = UnoReferenceMark.getAsTextContent(doc, name);
 
             if (markAsTextContent.isEmpty()) {
                 String msg = String.format(
@@ -228,15 +210,9 @@ public XTextCursor getFillCursor(XTextDocument doc)
                 throw new IllegalStateException(msg);
             }
 
-            full =
-                UnoCursor
-                    .getTextCursorOfTextContentAnchor(markAsTextContent.get())
-                    .orElse(null);
+            full = UnoCursor.getTextCursorOfTextContentAnchor(markAsTextContent.get()).orElse(null);
             if (full == null) {
-                String msg = String.format(
-                    "getFillCursor: full == null (attempt %d)",
-                    i
-                );
+                String msg = String.format("getFillCursor: full == null (attempt %d)", i);
                 throw new IllegalStateException(msg);
             }
 
@@ -267,32 +243,20 @@ public XTextCursor getFillCursor(XTextDocument doc)
 
                 final boolean insertSpaceAfter = false;
                 final boolean withoutBrackets = false;
-                createReprInDocument(
-                    doc,
-                    name,
-                    full,
-                    insertSpaceAfter,
-                    withoutBrackets
-                );
+                createReprInDocument(doc, name, full, insertSpaceAfter, withoutBrackets);
             }
         }
 
         if (full == null) {
-            throw new IllegalStateException(
-                "getFillCursorFor: full == null (after loop)"
-            );
+            throw new IllegalStateException("getFillCursorFor: full == null (after loop)");
         }
         if (fullText == null) {
-            throw new IllegalStateException(
-                "getFillCursor: fullText == null (after loop)"
-            );
+            throw new IllegalStateException("getFillCursor: fullText == null (after loop)");
         }
 
         fullText = full.getString();
         if (fullText.length() < 2) {
-            throw new IllegalStateException(
-                "getFillCursor: fullText.length() < 2 (after loop)'%n"
-            );
+            throw new IllegalStateException("getFillCursor: fullText.length() < 2 (after loop)'%n");
         }
         XTextCursor beta = full.getText().createTextCursorByRange(full);
         beta.collapseToStart();
@@ -301,16 +265,12 @@ public XTextCursor getFillCursor(XTextDocument doc)
         LOGGER.debug("getFillCursor: beta(1) covers '{}'", beta.getString());
 
         final String left = NamedRangeReferenceMark.REFERENCE_MARK_LEFT_BRACKET;
-        final String right =
-            NamedRangeReferenceMark.REFERENCE_MARK_RIGHT_BRACKET;
+        final String right = NamedRangeReferenceMark.REFERENCE_MARK_RIGHT_BRACKET;
         final short rightLength = (short) right.length();
         if (fullText.startsWith(left) && fullText.endsWith(right)) {
             beta.setString("");
         } else {
-            LOGGER.debug(
-                "getFillCursor: recreating brackets for '{}'",
-                fullText
-            );
+            LOGGER.debug("getFillCursor: recreating brackets for '{}'", fullText);
 
             // we have at least two characters inside
             XTextCursor alpha = full.getText().createTextCursorByRange(full);
@@ -325,47 +285,32 @@ public XTextCursor getFillCursor(XTextDocument doc)
             String paddingy = "y";
             String paddingz = "z";
             beta.setString(paddingx + left + paddingy + right + paddingz);
-            LOGGER.debug(
-                "getFillCursor: beta(2) covers '{}'",
-                beta.getString()
-            );
+            LOGGER.debug("getFillCursor: beta(2) covers '{}'", beta.getString());
 
             // move beta to before the right bracket
             beta.collapseToEnd();
             beta.goLeft((short) (rightLength + 1), false);
             // remove middle padding
             beta.goLeft((short) 1, true);
-            LOGGER.debug(
-                "getFillCursor: beta(3) covers '{}'",
-                beta.getString()
-            );
+            LOGGER.debug("getFillCursor: beta(3) covers '{}'", beta.getString());
 
             // only drop paddingy later: beta.setString("");
 
             // drop the initial character and paddingx
             alpha.collapseToStart();
             alpha.goRight((short) (1 + 1), true);
-            LOGGER.debug(
-                "getFillCursor: alpha(4) covers '{}'",
-                alpha.getString()
-            );
+            LOGGER.debug("getFillCursor: alpha(4) covers '{}'", alpha.getString());
 
             alpha.setString("");
             // drop the last character and paddingz
             omega.collapseToEnd();
             omega.goLeft((short) (1 + 1), true);
-            LOGGER.debug(
-                "getFillCursor: omega(5) covers '{}'",
-                omega.getString()
-            );
+            LOGGER.debug("getFillCursor: omega(5) covers '{}'", omega.getString());
 
             omega.setString("");
 
             // drop paddingy now
-            LOGGER.debug(
-                "getFillCursor: beta(6) covers '{}'",
-                beta.getString()
-            );
+            LOGGER.debug("getFillCursor: beta(6) covers '{}'", beta.getString());
 
             beta.setString("");
             // should be OK now.
@@ -449,8 +394,7 @@ public void cleanFillCursor(XTextDocument doc)
 
         String name = this.getRangeName();
 
-        XTextCursor full =
-            this.getRawCursor(doc).orElseThrow(IllegalStateException::new);
+        XTextCursor full = this.getRawCursor(doc).orElseThrow(IllegalStateException::new);
         final String fullText = full.getString();
 
         final String left = REFERENCE_MARK_LEFT_BRACKET;
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 9271cf099da..a4064d4ca00 100644
--- a/src/main/java/org/jabref/logic/openoffice/frontend/OOFrontend.java
+++ b/src/main/java/org/jabref/logic/openoffice/frontend/OOFrontend.java
@@ -44,21 +44,18 @@ 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();
 
         // Get the citationGroupNames
-        List<String> citationGroupNames =
-            this.backend.getJabRefReferenceMarkNames(doc);
-
-        Map<CitationGroupId, CitationGroup> citationGroups =
-            readCitationGroupsFromDocument(
-                this.backend,
-                doc,
-                citationGroupNames
-            );
+        List<String> citationGroupNames = this.backend.getJabRefReferenceMarkNames(doc);
+
+        Map<CitationGroupId, CitationGroup> citationGroups = readCitationGroupsFromDocument(
+            this.backend,
+            doc,
+            citationGroupNames
+        );
         this.citationGroups = new CitationGroups(citationGroups);
     }
 
@@ -66,25 +63,18 @@ 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(
+    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) {
-            CitationGroup group = backend.readCitationGroupFromDocumentOrThrow(
-                doc,
-                name
-            );
+            CitationGroup group = backend.readCitationGroupFromDocumentOrThrow(doc, name);
             citationGroups.put(group.groupId, group);
         }
         return citationGroups;
@@ -108,8 +98,7 @@ private List<RangeSortable<CitationGroup>> createVisualSortInput(
         List<RangeSortEntry<CitationGroup>> sortables = new ArrayList<>();
         for (CitationGroup group : citationGroups.getCitationGroupsUnordered()) {
             XTextRange range =
-                this.getMarkRange(doc, group)
-                    .orElseThrow(IllegalStateException::new);
+                this.getMarkRange(doc, group).orElseThrow(IllegalStateException::new);
             sortables.add(new RangeSortEntry<>(range, 0, group));
         }
 
@@ -136,15 +125,14 @@ private List<RangeSortable<CitationGroup>> createVisualSortInput(
 
         // build final list
         List<RangeSortEntry<CitationGroup>> result = new ArrayList<>();
-        for (List<
-            RangeSortEntry<CitationGroup>
-        > partition : partitions.getPartitions()) {
+        for (List<RangeSortEntry<CitationGroup>> partition : partitions.getPartitions()) {
             int indexInPartition = 0;
             for (RangeSortEntry<CitationGroup> sortable : partition) {
                 sortable.setIndexInPosition(indexInPartition++);
                 if (mapFootnotesToFootnoteMarks) {
-                    Optional<XTextRange> footnoteMarkRange =
-                        UnoTextRange.getFootnoteMarkRange(sortable.getRange());
+                    Optional<XTextRange> footnoteMarkRange = UnoTextRange.getFootnoteMarkRange(
+                        sortable.getRange()
+                    );
                     // Adjust range if we are inside a footnote:
                     footnoteMarkRange.ifPresent(sortable::setRange);
                 }
@@ -174,10 +162,7 @@ private List<CitationGroup> getVisuallySortedCitationGroups(
             fcursor
         );
 
-        return sorted
-            .stream()
-            .map(RangeSortable::getContent)
-            .collect(Collectors.toList());
+        return sorted.stream().map(RangeSortable::getContent).collect(Collectors.toList());
     }
 
     /**
@@ -196,10 +181,7 @@ public List<CitationGroup> getCitationGroupsSortedWithinPartitions(
             mapFootnotesToFootnoteMarks
         );
 
-        return sortables
-            .stream()
-            .map(RangeSortable::getContent)
-            .collect(Collectors.toList());
+        return sortables.stream().map(RangeSortable::getContent).collect(Collectors.toList());
     }
 
     /**
@@ -223,9 +205,7 @@ public CitationGroup createCitationGroup(
         throws CreationException, NoDocumentException, WrappedTargetException, NotRemoveableException, PropertyVetoException, IllegalTypeException {
         Objects.requireNonNull(pageInfos);
         if (pageInfos.size() != citationKeys.size()) {
-            throw new IllegalArgumentException(
-                "pageInfos.size != citationKeys.size"
-            );
+            throw new IllegalArgumentException("pageInfos.size != citationKeys.size");
         }
         CitationGroup group = backend.createCitationGroup(
             doc,
@@ -249,10 +229,7 @@ public void removeCitationGroup(CitationGroup group, XTextDocument doc)
         this.citationGroups.afterRemoveCitationGroup(group);
     }
 
-    public void removeCitationGroups(
-        List<CitationGroup> citationGroups,
-        XTextDocument doc
-    )
+    public void removeCitationGroups(List<CitationGroup> citationGroups, XTextDocument doc)
         throws WrappedTargetException, NoDocumentException, NotRemoveableException {
         for (CitationGroup group : citationGroups) {
             removeCitationGroup(group, doc);
@@ -264,44 +241,36 @@ public void removeCitationGroups(
      *
      * @return Optional.empty() if the reference mark is missing.
      */
-    public Optional<XTextRange> getMarkRange(
-        XTextDocument doc,
-        CitationGroup group
-    ) throws NoDocumentException, WrappedTargetException {
+    public Optional<XTextRange> getMarkRange(XTextDocument doc, CitationGroup group)
+        throws NoDocumentException, WrappedTargetException {
         return backend.getMarkRange(group, doc);
     }
 
-    public XTextCursor getFillCursorForCitationGroup(
-        XTextDocument doc,
-        CitationGroup group
-    ) throws NoDocumentException, WrappedTargetException, CreationException {
+    public XTextCursor getFillCursorForCitationGroup(XTextDocument doc, CitationGroup group)
+        throws NoDocumentException, WrappedTargetException, CreationException {
         return backend.getFillCursorForCitationGroup(group, doc);
     }
 
     /**
      * Remove brackets added by getFillCursorForCitationGroup.
      */
-    public void cleanFillCursorForCitationGroup(
-        XTextDocument doc,
-        CitationGroup group
-    ) throws NoDocumentException, WrappedTargetException {
+    public void cleanFillCursorForCitationGroup(XTextDocument doc, CitationGroup group)
+        throws NoDocumentException, WrappedTargetException {
         backend.cleanFillCursorForCitationGroup(group, doc);
     }
 
     /**
      * @return A RangeForOverlapCheck for each citation group. result.size() == nRefMarks
      */
-    public List<RangeForOverlapCheck<CitationGroupId>> citationRanges(
-        XTextDocument doc
-    ) throws NoDocumentException, WrappedTargetException {
+    public List<RangeForOverlapCheck<CitationGroupId>> citationRanges(XTextDocument doc)
+        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);
+                this.getMarkRange(doc, group).orElseThrow(IllegalStateException::new);
             String description = group.groupId.citationGroupIdAsString();
             result.add(
                 new RangeForOverlapCheck<>(
@@ -315,14 +284,11 @@ public List<RangeForOverlapCheck<CitationGroupId>> citationRanges(
         return result;
     }
 
-    public List<RangeForOverlapCheck<CitationGroupId>> bibliographyRanges(
-        XTextDocument doc
-    ) throws NoDocumentException, WrappedTargetException {
+    public List<RangeForOverlapCheck<CitationGroupId>> bibliographyRanges(XTextDocument doc)
+        throws NoDocumentException, WrappedTargetException {
         List<RangeForOverlapCheck<CitationGroupId>> result = new ArrayList<>();
 
-        Optional<XTextRange> range = UpdateBibliography.getBibliographyRange(
-            doc
-        );
+        Optional<XTextRange> range = UpdateBibliography.getBibliographyRange(doc);
         if (range.isPresent()) {
             String description = "bibliography";
             result.add(
@@ -337,9 +303,7 @@ public List<RangeForOverlapCheck<CitationGroupId>> bibliographyRanges(
         return result;
     }
 
-    public List<RangeForOverlapCheck<CitationGroupId>> viewCursorRanges(
-        XTextDocument doc
-    ) {
+    public List<RangeForOverlapCheck<CitationGroupId>> viewCursorRanges(XTextDocument doc) {
         List<RangeForOverlapCheck<CitationGroupId>> result = new ArrayList<>();
 
         Optional<XTextRange> range = UnoCursor.getViewCursor(doc).map(e -> e);
@@ -370,25 +334,21 @@ public List<RangeForOverlapCheck<CitationGroupId>> footnoteMarkRanges(
         // each partition to get at the corresponding footnotemark range.
 
         List<RangeForOverlapCheck<CitationGroupId>> result = new ArrayList<>();
-        RangeSort.RangePartitions<
-            RangeForOverlapCheck<CitationGroupId>
-        > partitions = RangeSort.partitionRanges(citationRanges);
+        RangeSort.RangePartitions<RangeForOverlapCheck<CitationGroupId>> partitions =
+            RangeSort.partitionRanges(citationRanges);
 
         // 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.
-        for (List<
-            RangeForOverlapCheck<CitationGroupId>
-        > partition : partitions.getPartitions()) {
+        for (List<RangeForOverlapCheck<CitationGroupId>> partition : partitions.getPartitions()) {
             if (partition.isEmpty()) {
                 continue;
             }
-            RangeForOverlapCheck<CitationGroupId> citationRange = partition.get(
-                0
-            );
+            RangeForOverlapCheck<CitationGroupId> citationRange = partition.get(0);
 
-            Optional<XTextRange> footnoteMarkRange =
-                UnoTextRange.getFootnoteMarkRange(citationRange.range);
+            Optional<XTextRange> footnoteMarkRange = UnoTextRange.getFootnoteMarkRange(
+                citationRange.range
+            );
 
             if (footnoteMarkRange.isEmpty()) {
                 // not in footnote
@@ -415,21 +375,15 @@ static String rangeOverlapsToMessage(
         }
 
         StringBuilder msg = new StringBuilder();
-        for (RangeOverlap<
-            RangeForOverlapCheck<CitationGroupId>
-        > overlap : overlaps) {
+        for (RangeOverlap<RangeForOverlapCheck<CitationGroupId>> overlap : overlaps) {
             String listOfRanges = overlap.valuesForOverlappingRanges
                 .stream()
                 .map(v -> String.format("'%s'", v.format()))
                 .collect(Collectors.joining(", "));
             msg.append(
                 switch (overlap.kind) {
-                    case EQUAL_RANGE -> Localization.lang(
-                        "Found identical ranges"
-                    );
-                    case OVERLAP -> Localization.lang(
-                        "Found overlapping ranges"
-                    );
+                    case EQUAL_RANGE -> Localization.lang("Found identical ranges");
+                    case OVERLAP -> Localization.lang("Found overlapping ranges");
                     case TOUCH -> Localization.lang("Found touching ranges");
                 }
             );
@@ -452,8 +406,7 @@ public OOVoidResult<JabRefException> checkRangeOverlapsWithCursor(
         List<RangeForOverlapCheck<CitationGroupId>> userRanges,
         boolean requireSeparation
     ) throws NoDocumentException, WrappedTargetException {
-        List<RangeForOverlapCheck<CitationGroupId>> citationRanges =
-            citationRanges(doc);
+        List<RangeForOverlapCheck<CitationGroupId>> citationRanges = citationRanges(doc);
         List<RangeForOverlapCheck<CitationGroupId>> ranges = new ArrayList<>();
 
         // ranges.addAll(userRanges);
@@ -462,12 +415,7 @@ public OOVoidResult<JabRefException> checkRangeOverlapsWithCursor(
         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();
@@ -490,8 +438,7 @@ public OOVoidResult<JabRefException> checkRangeOverlaps(
         boolean requireSeparation,
         int reportAtMost
     ) throws NoDocumentException, WrappedTargetException {
-        List<RangeForOverlapCheck<CitationGroupId>> citationRanges =
-            citationRanges(doc);
+        List<RangeForOverlapCheck<CitationGroupId>> citationRanges = citationRanges(doc);
         List<RangeForOverlapCheck<CitationGroupId>> ranges = new ArrayList<>();
         ranges.addAll(userRanges);
         ranges.addAll(bibliographyRanges(doc));
@@ -499,12 +446,7 @@ public OOVoidResult<JabRefException> checkRangeOverlaps(
         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();
@@ -539,25 +481,19 @@ public List<CitationEntry> getCitationEntries(XTextDocument doc)
         return this.backend.getCitationEntries(doc, citationGroups);
     }
 
-    public void applyCitationEntries(
-        XTextDocument doc,
-        List<CitationEntry> citationEntries
-    )
+    public void applyCitationEntries(XTextDocument doc, List<CitationEntry> citationEntries)
         throws PropertyVetoException, IllegalTypeException, IllegalArgumentException, WrappedTargetException {
         this.backend.applyCitationEntries(doc, citationEntries);
     }
 
-    public void imposeGlobalOrder(
-        XTextDocument doc,
-        FunctionalTextViewCursor fcursor
-    ) throws WrappedTargetException, NoDocumentException {
+    public void imposeGlobalOrder(XTextDocument doc, FunctionalTextViewCursor fcursor)
+        throws WrappedTargetException, NoDocumentException {
         boolean mapFootnotesToFootnoteMarks = true;
-        List<CitationGroup> sortedCitationGroups =
-            getVisuallySortedCitationGroups(
-                doc,
-                mapFootnotesToFootnoteMarks,
-                fcursor
-            );
+        List<CitationGroup> sortedCitationGroups = getVisuallySortedCitationGroups(
+            doc,
+            mapFootnotesToFootnoteMarks,
+            fcursor
+        );
         List<CitationGroupId> sortedCitationGroupIds = OOListUtil.map(
             sortedCitationGroups,
             group -> group.groupId
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 10857ced851..223c748c2df 100644
--- a/src/main/java/org/jabref/logic/openoffice/frontend/RangeForOverlapCheck.java
+++ b/src/main/java/org/jabref/logic/openoffice/frontend/RangeForOverlapCheck.java
@@ -23,12 +23,7 @@ public class RangeForOverlapCheck<T> implements RangeHolder {
     public final T idWithinKind;
     private final String description;
 
-    public RangeForOverlapCheck(
-        XTextRange range,
-        T idWithinKind,
-        int kind,
-        String description
-    ) {
+    public RangeForOverlapCheck(XTextRange range, T idWithinKind, int kind, String description) {
         this.range = range;
         this.kind = kind;
         this.idWithinKind = idWithinKind;
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 05201ba1293..425b7f6cc78 100644
--- a/src/main/java/org/jabref/logic/openoffice/frontend/UpdateBibliography.java
+++ b/src/main/java/org/jabref/logic/openoffice/frontend/UpdateBibliography.java
@@ -39,13 +39,7 @@ public static void rebuildBibTextSection(
     ) throws WrappedTargetException, CreationException, NoDocumentException {
         clearBibTextSectionContent2(doc);
 
-        populateBibTextSection(
-            doc,
-            frontend,
-            bibliography,
-            style,
-            alwaysAddCitedOnPages
-        );
+        populateBibTextSection(doc, frontend, bibliography, style, alwaysAddCitedOnPages);
     }
 
     /**
@@ -53,8 +47,7 @@ public static void rebuildBibTextSection(
      * <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();
@@ -75,9 +68,7 @@ private static void clearBibTextSectionContent2(XTextDocument doc)
             createBibTextSection2(doc);
         } else {
             // Clear it
-            XTextCursor cursor = doc
-                .getText()
-                .createTextCursorByRange(sectionRange.get());
+            XTextCursor cursor = doc.getText().createTextCursorByRange(sectionRange.get());
             cursor.setString("");
         }
     }
@@ -95,12 +86,9 @@ private static void populateBibTextSection(
         boolean alwaysAddCitedOnPages
     )
         throws CreationException, IllegalArgumentException, NoDocumentException, WrappedTargetException {
-        XTextRange sectionRange = getBibliographyRange(doc)
-            .orElseThrow(IllegalStateException::new);
+        XTextRange sectionRange = getBibliographyRange(doc).orElseThrow(IllegalStateException::new);
 
-        XTextCursor cursor = doc
-            .getText()
-            .createTextCursorByRange(sectionRange);
+        XTextCursor cursor = doc.getText().createTextCursorByRange(sectionRange);
 
         // emit the title of the bibliography
         OOTextIntoOO.removeDirectFormatting(cursor);
@@ -114,11 +102,8 @@ private static void populateBibTextSection(
         cursor.collapseToEnd();
 
         // remove the initial empty paragraph from the section.
-        sectionRange =
-            getBibliographyRange(doc).orElseThrow(IllegalStateException::new);
-        XTextCursor initialParagraph = doc
-            .getText()
-            .createTextCursorByRange(sectionRange);
+        sectionRange = getBibliographyRange(doc).orElseThrow(IllegalStateException::new);
+        XTextCursor initialParagraph = doc.getText().createTextCursorByRange(sectionRange);
         initialParagraph.collapseToStart();
         initialParagraph.goRight((short) 1, true);
         initialParagraph.setString("");
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 6a08733b096..b560a39b538 100644
--- a/src/main/java/org/jabref/logic/openoffice/frontend/UpdateCitationMarkers.java
+++ b/src/main/java/org/jabref/logic/openoffice/frontend/UpdateCitationMarkers.java
@@ -22,9 +22,7 @@
 
 public class UpdateCitationMarkers {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(
-        UpdateCitationMarkers.class
-    );
+    private static final Logger LOGGER = LoggerFactory.getLogger(UpdateCitationMarkers.class);
 
     private UpdateCitationMarkers() {}
 
@@ -55,17 +53,8 @@ public static void applyNewCitationMarkers(
             }
 
             if (withText && marker.isPresent()) {
-                XTextCursor cursor = frontend.getFillCursorForCitationGroup(
-                    doc,
-                    group
-                );
-                fillCitationMarkInCursor(
-                    doc,
-                    cursor,
-                    marker.get(),
-                    withText,
-                    style
-                );
+                XTextCursor cursor = frontend.getFillCursorForCitationGroup(doc, group);
+                fillCitationMarkInCursor(doc, cursor, marker.get(), withText, style);
                 frontend.cleanFillCursorForCitationGroup(doc, group);
             }
         }
@@ -77,8 +66,7 @@ public static void fillCitationMarkInCursor(
         OOText citationText,
         boolean withText,
         OOBibStyle style
-    )
-        throws WrappedTargetException, CreationException, IllegalArgumentException {
+    ) throws WrappedTargetException, CreationException, IllegalArgumentException {
         Objects.requireNonNull(cursor);
         Objects.requireNonNull(citationText);
         Objects.requireNonNull(style);
@@ -87,8 +75,7 @@ public static void fillCitationMarkInCursor(
             OOText citationText2 = style.decorateCitationMarker(citationText);
             // inject a ZERO_WIDTH_SPACE to hold the initial character format
             final String ZERO_WIDTH_SPACE = "\u200b";
-            citationText2 =
-                OOText.fromString(ZERO_WIDTH_SPACE + citationText2.toString());
+            citationText2 = OOText.fromString(ZERO_WIDTH_SPACE + citationText2.toString());
             OOTextIntoOO.write(doc, cursor, citationText2);
         } else {
             cursor.setString("");
@@ -117,9 +104,7 @@ public static void createAndFillCitationGroup(
         throws NotRemoveableException, WrappedTargetException, PropertyVetoException, IllegalArgumentException, CreationException, NoDocumentException, IllegalTypeException {
         Objects.requireNonNull(pageInfos);
         if (pageInfos.size() != citationKeys.size()) {
-            throw new IllegalArgumentException(
-                "pageInfos.size != citationKeys.size"
-            );
+            throw new IllegalArgumentException("pageInfos.size != citationKeys.size");
         }
         CitationGroup group = frontend.createCitationGroup(
             doc,
@@ -133,10 +118,7 @@ public static void createAndFillCitationGroup(
         final boolean withText = citationType.withText();
 
         if (withText) {
-            XTextCursor fillCursor = frontend.getFillCursorForCitationGroup(
-                doc,
-                group
-            );
+            XTextCursor fillCursor = frontend.getFillCursorForCitationGroup(doc, group);
 
             UpdateCitationMarkers.fillCitationMarkInCursor(
                 doc,
diff --git a/src/main/java/org/jabref/logic/openoffice/style/OOBibStyle.java b/src/main/java/org/jabref/logic/openoffice/style/OOBibStyle.java
index b4837a125e4..f219d01ac9a 100644
--- a/src/main/java/org/jabref/logic/openoffice/style/OOBibStyle.java
+++ b/src/main/java/org/jabref/logic/openoffice/style/OOBibStyle.java
@@ -56,15 +56,12 @@
 public class OOBibStyle implements Comparable<OOBibStyle> {
 
     public static final String ITALIC_ET_AL = "ItalicEtAl";
-    public static final String MULTI_CITE_CHRONOLOGICAL =
-        "MultiCiteChronological";
+    public static final String MULTI_CITE_CHRONOLOGICAL = "MultiCiteChronological";
     public static final String MINIMUM_GROUPING_COUNT = "MinimumGroupingCount";
     public static final String ET_AL_STRING = "EtAlString";
     public static final String MAX_AUTHORS_FIRST = "MaxAuthorsFirst";
-    public static final String REFERENCE_HEADER_PARAGRAPH_FORMAT =
-        "ReferenceHeaderParagraphFormat";
-    public static final String REFERENCE_PARAGRAPH_FORMAT =
-        "ReferenceParagraphFormat";
+    public static final String REFERENCE_HEADER_PARAGRAPH_FORMAT = "ReferenceHeaderParagraphFormat";
+    public static final String REFERENCE_PARAGRAPH_FORMAT = "ReferenceParagraphFormat";
 
     public static final String TITLE = "Title";
     public static final String UNDEFINED_CITATION_MARKER = "??";
@@ -83,34 +80,24 @@ public class OOBibStyle implements Comparable<OOBibStyle> {
     private static final String SUPERSCRIPT_CITATIONS = "SuperscriptCitations";
     private static final String BOLD_CITATIONS = "BoldCitations";
     private static final String ITALIC_CITATIONS = "ItalicCitations";
-    private static final String CITATION_CHARACTER_FORMAT =
-        "CitationCharacterFormat";
+    private static final String CITATION_CHARACTER_FORMAT = "CitationCharacterFormat";
     private static final String FORMAT_CITATIONS = "FormatCitations";
-    private static final String GROUPED_NUMBERS_SEPARATOR =
-        "GroupedNumbersSeparator";
+    private static final String GROUPED_NUMBERS_SEPARATOR = "GroupedNumbersSeparator";
 
     // These two can do what ItalicCitations, BoldCitations,
     // SuperscriptCitations and SubscriptCitations were supposed to do,
     // as well as underline smallcaps and strikeout.
-    private static final String CITATION_GROUP_MARKUP_BEFORE =
-        "CitationGroupMarkupBefore";
-    private static final String CITATION_GROUP_MARKUP_AFTER =
-        "CitationGroupMarkupAfter";
-
-    private static final String AUTHORS_PART_MARKUP_BEFORE =
-        "AuthorsPartMarkupBefore";
-    private static final String AUTHORS_PART_MARKUP_AFTER =
-        "AuthorsPartMarkupAfter";
-
-    private static final String AUTHOR_NAMES_LIST_MARKUP_BEFORE =
-        "AuthorNamesListMarkupBefore";
-    private static final String AUTHOR_NAMES_LIST_MARKUP_AFTER =
-        "AuthorNamesListMarkupAfter";
-
-    private static final String AUTHOR_NAME_MARKUP_BEFORE =
-        "AuthorNameMarkupBefore";
-    private static final String AUTHOR_NAME_MARKUP_AFTER =
-        "AuthorNameMarkupAfter";
+    private static final String CITATION_GROUP_MARKUP_BEFORE = "CitationGroupMarkupBefore";
+    private static final String CITATION_GROUP_MARKUP_AFTER = "CitationGroupMarkupAfter";
+
+    private static final String AUTHORS_PART_MARKUP_BEFORE = "AuthorsPartMarkupBefore";
+    private static final String AUTHORS_PART_MARKUP_AFTER = "AuthorsPartMarkupAfter";
+
+    private static final String AUTHOR_NAMES_LIST_MARKUP_BEFORE = "AuthorNamesListMarkupBefore";
+    private static final String AUTHOR_NAMES_LIST_MARKUP_AFTER = "AuthorNamesListMarkupAfter";
+
+    private static final String AUTHOR_NAME_MARKUP_BEFORE = "AuthorNameMarkupBefore";
+    private static final String AUTHOR_NAME_MARKUP_AFTER = "AuthorNameMarkupAfter";
 
     private static final String PAGE_INFO_SEPARATOR = "PageInfoSeparator";
     private static final String CITATION_SEPARATOR = "CitationSeparator";
@@ -125,17 +112,14 @@ public class OOBibStyle implements Comparable<OOBibStyle> {
     private static final String SORT_ALGORITHM = "SortAlgorithm";
     private static final String OXFORD_COMMA = "OxfordComma";
     private static final String YEAR_SEPARATOR = "YearSeparator";
-    private static final String AUTHOR_LAST_SEPARATOR_IN_TEXT =
-        "AuthorLastSeparatorInText";
+    private static final String AUTHOR_LAST_SEPARATOR_IN_TEXT = "AuthorLastSeparatorInText";
     private static final String AUTHOR_LAST_SEPARATOR = "AuthorLastSeparator";
 
     private static final String AUTHOR_SEPARATOR = "AuthorSeparator";
 
     private static final Pattern QUOTED = Pattern.compile("\".*\"");
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(
-        OOBibStyle.class
-    );
+    private static final Logger LOGGER = LoggerFactory.getLogger(OOBibStyle.class);
     private final SortedSet<String> journals = new TreeSet<>();
     // Formatter to be run on fields before they are used as part of citation marker:
     private final LayoutFormatter fieldFormatter = new OOPreFormatter();
@@ -202,10 +186,7 @@ private void setDefaultProperties() {
         // Set default properties for the citation marker:
         citProperties.put(
             AUTHOR_FIELD,
-            FieldFactory.serializeOrFields(
-                StandardField.AUTHOR,
-                StandardField.EDITOR
-            )
+            FieldFactory.serializeOrFields(StandardField.AUTHOR, StandardField.EDITOR)
         );
 
         citProperties.put(CITATION_GROUP_MARKUP_BEFORE, "");
@@ -266,12 +247,7 @@ public Set<String> getJournals() {
     private void initialize(InputStream stream) throws IOException {
         Objects.requireNonNull(stream);
 
-        try (
-            Reader reader = new InputStreamReader(
-                stream,
-                StandardCharsets.UTF_8
-            )
-        ) {
+        try (Reader reader = new InputStreamReader(stream, StandardCharsets.UTF_8)) {
             readFormatFile(reader);
         }
     }
@@ -296,8 +272,7 @@ public void ensureUpToDate() throws IOException {
      */
     private void reload() throws IOException {
         if (styleFile != null) {
-            this.styleFileModificationTime =
-                Files.getLastModifiedTime(styleFile).toMillis();
+            this.styleFileModificationTime = Files.getLastModifiedTime(styleFile).toMillis();
             try (InputStream stream = Files.newInputStream(styleFile)) {
                 initialize(stream);
             }
@@ -428,10 +403,7 @@ private void handleStructureLine(String line) {
                     .getLayoutFromText();
                 EntryType type = EntryTypeFactory.parse(typeName);
 
-                if (
-                    !isDefaultLayoutPresent &&
-                    OOBibStyle.DEFAULT_MARK.equals(typeName)
-                ) {
+                if (!isDefaultLayoutPresent && OOBibStyle.DEFAULT_MARK.equals(typeName)) {
                     isDefaultLayoutPresent = true;
                     defaultBibLayout = layout;
                 } else {
@@ -453,10 +425,7 @@ private void handlePropertiesLine(String line, Map<String, Object> map) {
         if ((index > 0) && (index <= (line.length() - 1))) {
             String propertyName = line.substring(0, index).trim();
             String value = line.substring(index + 1);
-            if (
-                (value.trim().length() > 1) &&
-                QUOTED.matcher(value.trim()).matches()
-            ) {
+            if ((value.trim().length() > 1) && QUOTED.matcher(value.trim()).matches()) {
                 value = value.trim().substring(1, value.trim().length() - 1);
             }
             Object toSet = value;
@@ -721,9 +690,7 @@ protected void setDefaultBibLayout(Layout layout) {
      *
      * @return The text for the citation.
      */
-    public OOText getNumCitationMarker2(
-        List<CitationMarkerNumericEntry> entries
-    ) {
+    public OOText getNumCitationMarker2(List<CitationMarkerNumericEntry> entries) {
         final int minGroupingCount = this.getMinimumGroupingCount();
         return OOBibStyleGetNumCitationMarker.getNumCitationMarker2(
             this,
@@ -749,13 +716,8 @@ public OOText getNumCitationMarker2(
     /**
      * Format a number-based bibliography label for the given number.
      */
-    public OOText getNumCitationMarkerForBibliography(
-        CitationMarkerNumericBibEntry entry
-    ) {
-        return OOBibStyleGetNumCitationMarker.getNumCitationMarkerForBibliography(
-            this,
-            entry
-        );
+    public OOText getNumCitationMarkerForBibliography(CitationMarkerNumericBibEntry entry) {
+        return OOBibStyleGetNumCitationMarker.getNumCitationMarkerForBibliography(this, entry);
     }
 
     public OOText getNormalizedCitationMarker(CitationMarkerNormEntry entry) {
@@ -905,8 +867,7 @@ public boolean getItalicEtAl() {
      *  non-empty field will be used.
      */
     protected OrFields getAuthorFieldNames() {
-        String authorFieldNamesString =
-            this.getStringCitProperty(OOBibStyle.AUTHOR_FIELD);
+        String authorFieldNamesString = this.getStringCitProperty(OOBibStyle.AUTHOR_FIELD);
         return FieldFactory.parseOrFields(authorFieldNamesString);
     }
 
@@ -914,8 +875,7 @@ protected OrFields getAuthorFieldNames() {
      *  @return Field containing year, with fallback fields.
      */
     protected OrFields getYearFieldNames() {
-        String yearFieldNamesString =
-            this.getStringCitProperty(OOBibStyle.YEAR_FIELD);
+        String yearFieldNamesString = this.getStringCitProperty(OOBibStyle.YEAR_FIELD);
         return FieldFactory.parseOrFields(yearFieldNamesString);
     }
 
@@ -926,12 +886,8 @@ protected String getAuthorLastSeparator() {
 
     /* As getAuthorLastSeparator, for in-text citation. */
     protected String getAuthorLastSeparatorInTextWithFallBack() {
-        String preferred = getStringCitProperty(
-            OOBibStyle.AUTHOR_LAST_SEPARATOR_IN_TEXT
-        );
-        String fallback = getStringCitProperty(
-            OOBibStyle.AUTHOR_LAST_SEPARATOR
-        );
+        String preferred = getStringCitProperty(OOBibStyle.AUTHOR_LAST_SEPARATOR_IN_TEXT);
+        String fallback = getStringCitProperty(OOBibStyle.AUTHOR_LAST_SEPARATOR);
         return Objects.requireNonNullElse(preferred, fallback);
     }
 
@@ -982,10 +938,7 @@ private String getBracketBeforeInList() {
     }
 
     public String getBracketBeforeInListWithFallBack() {
-        return Objects.requireNonNullElse(
-            getBracketBeforeInList(),
-            getBracketBefore()
-        );
+        return Objects.requireNonNullElse(getBracketBeforeInList(), getBracketBefore());
     }
 
     /** Closing parenthesis after citation marker in the bibliography */
@@ -994,18 +947,13 @@ private String getBracketAfterInList() {
     }
 
     String getBracketAfterInListWithFallBack() {
-        return Objects.requireNonNullElse(
-            getBracketAfterInList(),
-            getBracketAfter()
-        );
+        return Objects.requireNonNullElse(getBracketAfterInList(), getBracketAfter());
     }
 
     public OOText getFormattedBibliographyTitle() {
         OOBibStyle 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/OOBibStyleGetCitationMarker.java b/src/main/java/org/jabref/logic/openoffice/style/OOBibStyleGetCitationMarker.java
index 44b8a33f054..26078fb3567 100644
--- a/src/main/java/org/jabref/logic/openoffice/style/OOBibStyleGetCitationMarker.java
+++ b/src/main/java/org/jabref/logic/openoffice/style/OOBibStyleGetCitationMarker.java
@@ -53,11 +53,7 @@ private static String getAuthorLastName(AuthorList authorList, int number) {
     }
 
     private static String markupAuthorName(OOBibStyle style, String name) {
-        return (
-            style.getAuthorNameMarkupBefore() +
-            name +
-            style.getAuthorNameMarkupAfter()
-        );
+        return (style.getAuthorNameMarkupBefore() + name + style.getAuthorNameMarkupAfter());
     }
 
     /**
@@ -133,14 +129,10 @@ private static String formatAuthorList(
 
         // To reduce ambiguity, throw on unexpected values of maxAuthors
         if (maxAuthors == 0 && nAuthors != 0) {
-            throw new IllegalArgumentException(
-                "maxAuthors = 0 in formatAuthorList"
-            );
+            throw new IllegalArgumentException("maxAuthors = 0 in formatAuthorList");
         }
         if (maxAuthors < -1) {
-            throw new IllegalArgumentException(
-                "maxAuthors < -1 in formatAuthorList"
-            );
+            throw new IllegalArgumentException("maxAuthors < -1 in formatAuthorList");
         }
 
         // emitAllAuthors == false means use "et al."
@@ -240,17 +232,11 @@ private static Optional<FieldAndContent> getRawCitationMarkerField(
         Objects.requireNonNull(database, "database cannot be null");
 
         for (Field field : fields.getFields()/* FieldFactory.parseOrFields(fields)*/) {
-            Optional<String> optionalContent = entry.getResolvedFieldOrAlias(
-                field,
-                database
-            );
+            Optional<String> optionalContent = entry.getResolvedFieldOrAlias(field, database);
             final boolean foundSomething =
-                optionalContent.isPresent() &&
-                !optionalContent.get().trim().isEmpty();
+                optionalContent.isPresent() && !optionalContent.get().trim().isEmpty();
             if (foundSomething) {
-                return Optional.of(
-                    new FieldAndContent(field, optionalContent.get())
-                );
+                return Optional.of(new FieldAndContent(field, optionalContent.get()));
             }
         }
         return Optional.empty();
@@ -285,8 +271,11 @@ private static String getCitationMarkerField(
     ) {
         Objects.requireNonNull(db);
 
-        Optional<FieldAndContent> optionalFieldAndContent =
-            getRawCitationMarkerField(db.entry, db.database, fields);
+        Optional<FieldAndContent> optionalFieldAndContent = getRawCitationMarkerField(
+            db.entry,
+            db.database,
+            fields
+        );
 
         if (optionalFieldAndContent.isEmpty()) {
             // No luck? Return an empty string:
@@ -294,9 +283,7 @@ private static String getCitationMarkerField(
         }
 
         FieldAndContent fieldAndContent = optionalFieldAndContent.get();
-        String result = style
-            .getFieldFormatter()
-            .format(fieldAndContent.content);
+        String result = style.getFieldFormatter().format(fieldAndContent.content);
 
         // If the field we found is mentioned in authorFieldNames and
         // content has a pair of braces around it, we add a pair of
@@ -312,19 +299,12 @@ private static String getCitationMarkerField(
         return result;
     }
 
-    private static AuthorList getAuthorList(
-        OOBibStyle style,
-        CitationLookupResult db
-    ) {
+    private static AuthorList getAuthorList(OOBibStyle style, CitationLookupResult db) {
         // The bibtex fields providing author names, e.g. "author" or
         // "editor".
         OrFields authorFieldNames = style.getAuthorFieldNames();
 
-        String authorListAsString = getCitationMarkerField(
-            style,
-            db,
-            authorFieldNames
-        );
+        String authorListAsString = getCitationMarkerField(style, db, authorFieldNames);
         return AuthorList.parse(authorListAsString);
     }
 
@@ -340,10 +320,7 @@ private enum AuthorYearMarkerPurpose {
      *
      * If entry is unresolved, return 0.
      */
-    private static int calculateNAuthorsToEmit(
-        OOBibStyle style,
-        CitationMarkerEntry entry
-    ) {
+    private static int calculateNAuthorsToEmit(OOBibStyle style, CitationMarkerEntry entry) {
         if (entry.getLookupResult().isEmpty()) {
             // unresolved
             return 0;
@@ -353,10 +330,7 @@ private static int calculateNAuthorsToEmit(
             ? style.getMaxAuthorsFirst()
             : style.getMaxAuthors();
 
-        AuthorList authorList = getAuthorList(
-            style,
-            entry.getLookupResult().get()
-        );
+        AuthorList authorList = getAuthorList(style, entry.getLookupResult().get());
         int nAuthors = authorList.getNumberOfAuthors();
 
         if (maxAuthors == -1) {
@@ -414,9 +388,7 @@ private static OOText getAuthorYearParenthesisMarker2(
             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();
@@ -448,8 +420,7 @@ private static OOText getAuthorYearParenthesisMarker2(
         for (int j = 0; j < entries.size(); j++) {
             CitationMarkerEntry entry = entries.get(j);
             boolean startingNewGroup = startsNewGroup[j];
-            boolean endingAGroup =
-                (j + 1 == entries.size()) || startsNewGroup[j + 1];
+            boolean endingAGroup = (j + 1 == entries.size()) || startsNewGroup[j + 1];
 
             if (!startingNewGroup) {
                 // Just add our uniqueLetter
@@ -472,9 +443,7 @@ private static OOText getAuthorYearParenthesisMarker2(
 
             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()));
@@ -483,9 +452,7 @@ private static OOText getAuthorYearParenthesisMarker2(
 
             final boolean isUnresolved = entry.getLookupResult().isEmpty();
             if (isUnresolved) {
-                stringBuilder.append(
-                    String.format("Unresolved(%s)", entry.getCitationKey())
-                );
+                stringBuilder.append(String.format("Unresolved(%s)", entry.getCitationKey()));
                 if (purpose != AuthorYearMarkerPurpose.NORMALIZED) {
                     stringBuilder.append(pageInfoPart);
                 }
@@ -501,12 +468,7 @@ private static OOText getAuthorYearParenthesisMarker2(
                 }
 
                 AuthorList authorList = getAuthorList(style, db);
-                String authorString = formatAuthorList(
-                    style,
-                    authorList,
-                    maxAuthors,
-                    andString
-                );
+                String authorString = formatAuthorList(style, authorList, maxAuthors, andString);
                 stringBuilder.append(authorString);
                 stringBuilder.append(yearSep);
 
@@ -546,8 +508,7 @@ private static OOText getAuthorYearParenthesisMarker2(
     /**
      * Add / override methods for the purpose of creating a normalized citation marker.
      */
-    private static class CitationMarkerNormEntryWrap
-        implements CitationMarkerEntry {
+    private static class CitationMarkerNormEntryWrap implements CitationMarkerEntry {
 
         CitationMarkerNormEntry inner;
 
@@ -612,9 +573,7 @@ private static List<OOText> getNormalizedCitationMarkers(
         List<CitationMarkerEntry> citationMarkerEntries,
         Optional<Integer> maxAuthorsOverride
     ) {
-        List<OOText> normalizedMarkers = new ArrayList<>(
-            citationMarkerEntries.size()
-        );
+        List<OOText> normalizedMarkers = new ArrayList<>(citationMarkerEntries.size());
         for (CitationMarkerEntry citationMarkerEntry : citationMarkerEntries) {
             OOText normalized = getNormalizedCitationMarker(
                 style,
@@ -695,8 +654,7 @@ public static OOText createCitationMarker(
         }
 
         boolean[] startsNewGroup = new boolean[nEntries];
-        List<CitationMarkerEntry> filteredCitationMarkerEntries =
-            new ArrayList<>(nEntries);
+        List<CitationMarkerEntry> filteredCitationMarkerEntries = new ArrayList<>(nEntries);
         int i_out = 0;
 
         if (nEntries > 0) {
@@ -742,9 +700,7 @@ public static OOText createCitationMarker(
                     ) {
                         // we can rely on normalizedMarkers
                         nAuthorsShownInhibitsJoin = false;
-                    } else if (
-                        style.getMaxAuthors() == style.getMaxAuthorsFirst()
-                    ) {
+                    } else if (style.getMaxAuthors() == style.getMaxAuthorsFirst()) {
                         // we can rely on normalizedMarkers
                         nAuthorsShownInhibitsJoin = false;
                     } else {
@@ -779,35 +735,25 @@ public static OOText createCitationMarker(
                     .equals(ce1.getCitationKey());
                 final boolean normalizedMarkersDiffer = !nm2.equals(nm1);
 
-                Optional<OOText> pageInfo2 = PageInfo.normalizePageInfo(
-                    ce2.getPageInfo()
-                );
-                Optional<OOText> pageInfo1 = PageInfo.normalizePageInfo(
-                    ce1.getPageInfo()
-                );
-                final boolean bothPageInfosAreEmpty =
-                    pageInfo2.isEmpty() && pageInfo1.isEmpty();
+                Optional<OOText> pageInfo2 = PageInfo.normalizePageInfo(ce2.getPageInfo());
+                Optional<OOText> pageInfo1 = PageInfo.normalizePageInfo(ce1.getPageInfo());
+                final boolean bothPageInfosAreEmpty = pageInfo2.isEmpty() && pageInfo1.isEmpty();
                 final boolean pageInfosDiffer = !pageInfo2.equals(pageInfo1);
 
                 Optional<String> ul2 = ce2.getUniqueLetter();
                 Optional<String> ul1 = ce1.getUniqueLetter();
-                final boolean uniqueLetterPresenceChanged =
-                    ul2.isPresent() != ul1.isPresent();
+                final boolean uniqueLetterPresenceChanged = ul2.isPresent() != ul1.isPresent();
                 final boolean uniqueLettersDiffer = !ul2.equals(ul1);
 
                 final boolean uniqueLetterDoesNotMakeUnique =
-                    citationKeysDiffer &&
-                    !normalizedMarkersDiffer &&
-                    !uniqueLettersDiffer;
+                    citationKeysDiffer && !normalizedMarkersDiffer && !uniqueLettersDiffer;
 
                 if (
                     uniqueLetterDoesNotMakeUnique &&
-                    nonUniqueCitationMarkerHandling ==
-                        NonUniqueCitationMarker.THROWS
+                    nonUniqueCitationMarkerHandling == NonUniqueCitationMarker.THROWS
                 ) {
                     throw new IllegalArgumentException(
-                        "different citation keys," +
-                        " but same normalizedMarker and uniqueLetter"
+                        "different citation keys," + " but same normalizedMarker and uniqueLetter"
                     );
                 }
 
diff --git a/src/main/java/org/jabref/logic/openoffice/style/OOBibStyleGetNumCitationMarker.java b/src/main/java/org/jabref/logic/openoffice/style/OOBibStyleGetNumCitationMarker.java
index 0e56d49dcfa..dc9905952dd 100644
--- a/src/main/java/org/jabref/logic/openoffice/style/OOBibStyleGetNumCitationMarker.java
+++ b/src/main/java/org/jabref/logic/openoffice/style/OOBibStyleGetNumCitationMarker.java
@@ -59,8 +59,7 @@ public static OOText getNumCitationMarkerForBibliography(
         stringBuilder.append(
             current.isPresent()
                 ? String.valueOf(current.get())
-                : (OOBibStyle.UNDEFINED_CITATION_MARKER +
-                    entry.getCitationKey())
+                : (OOBibStyle.UNDEFINED_CITATION_MARKER + entry.getCitationKey())
         );
         stringBuilder.append(bracketAfter);
         stringBuilder.append(style.getCitationGroupMarkupAfter());
@@ -107,8 +106,7 @@ private static void emitBlock(
             final Optional<Integer> num = entry.getNumber();
             stringBuilder.append(
                 num.isEmpty()
-                    ? (OOBibStyle.UNDEFINED_CITATION_MARKER +
-                        entry.getCitationKey())
+                    ? (OOBibStyle.UNDEFINED_CITATION_MARKER + entry.getCitationKey())
                     : String.valueOf(num.get())
             );
             // Emit pageInfo
@@ -138,14 +136,8 @@ private static void emitBlock(
             }
 
             for (int j = 1; j < blockSize; j++) {
-                if (
-                    (block.get(j).getNumber().get() -
-                        block.get(j - 1).getNumber().get()) !=
-                    1
-                ) {
-                    throw new IllegalArgumentException(
-                        "Numbers are not consecutive"
-                    );
+                if ((block.get(j).getNumber().get() - block.get(j - 1).getNumber().get()) != 1) {
+                    throw new IllegalArgumentException("Numbers are not consecutive");
                 }
             }
 
@@ -157,9 +149,7 @@ private static void emitBlock(
                 int first = block.get(0).getNumber().get();
                 int last = block.get(blockSize - 1).getNumber().get();
                 if (last != (first + blockSize - 1)) {
-                    throw new IllegalArgumentException(
-                        "blockSize and length of num range differ"
-                    );
+                    throw new IllegalArgumentException("blockSize and length of num range differ");
                 }
 
                 // Emit: "first-last"
@@ -214,13 +204,8 @@ public static OOText getNumCitationMarker2(
         final String bracketAfter = style.getBracketAfter();
 
         // Sort a copy of entries
-        List<CitationMarkerNumericEntry> sorted = OOListUtil.map(
-            entries,
-            e -> e
-        );
-        sorted.sort(
-            OOBibStyleGetNumCitationMarker::compareCitationMarkerNumericEntry
-        );
+        List<CitationMarkerNumericEntry> sorted = OOListUtil.map(entries, e -> e);
+        sorted.sort(OOBibStyleGetNumCitationMarker::compareCitationMarkerNumericEntry);
 
         // "["
         StringBuilder stringBuilder = new StringBuilder(bracketBefore);
@@ -243,33 +228,22 @@ public static OOText getNumCitationMarker2(
 
         for (int i = 0; i < nCitations; i++) {
             final CitationMarkerNumericEntry current = sorted.get(i);
-            if (
-                current.getNumber().isPresent() && current.getNumber().get() < 0
-            ) {
-                throw new IllegalArgumentException(
-                    "getNumCitationMarker2: found negative number"
-                );
+            if (current.getNumber().isPresent() && current.getNumber().get() < 0) {
+                throw new IllegalArgumentException("getNumCitationMarker2: found negative number");
             }
 
             if (currentBlock.isEmpty()) {
                 currentBlock.add(current);
             } else {
-                CitationMarkerNumericEntry prev = currentBlock.get(
-                    currentBlock.size() - 1
-                );
-                if (
-                    current.getNumber().isEmpty() || prev.getNumber().isEmpty()
-                ) {
+                CitationMarkerNumericEntry prev = currentBlock.get(currentBlock.size() - 1);
+                if (current.getNumber().isEmpty() || prev.getNumber().isEmpty()) {
                     nextBlock.add(current); // do not join if not found
                 } else if (joinIsDisabled) {
                     nextBlock.add(current); // join disabled
-                } else if (
-                    compareCitationMarkerNumericEntry(current, prev) == 0
-                ) {
+                } else if (compareCitationMarkerNumericEntry(current, prev) == 0) {
                     // Same as prev, just forget it.
                 } else if (
-                    (current.getNumber().get() ==
-                        (prev.getNumber().get() + 1)) &&
+                    (current.getNumber().get() == (prev.getNumber().get() + 1)) &&
                     (prev.getPageInfo().isEmpty()) &&
                     (current.getPageInfo().isEmpty())
                 ) {
@@ -294,9 +268,7 @@ public static OOText getNumCitationMarker2(
         }
 
         if (!nextBlock.isEmpty()) {
-            throw new IllegalStateException(
-                "impossible: (nextBlock.size() != 0) after loop"
-            );
+            throw new IllegalStateException("impossible: (nextBlock.size() != 0) after loop");
         }
 
         if (!currentBlock.isEmpty()) {
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 640032ca5eb..60209b06024 100644
--- a/src/main/java/org/jabref/logic/openoffice/style/OOFormatBibliography.java
+++ b/src/main/java/org/jabref/logic/openoffice/style/OOFormatBibliography.java
@@ -81,24 +81,18 @@ public static OOText formatBibliographyEntry(
 
         // insert marker "[1]"
         if (style.isNumberEntries()) {
-            stringBuilder.append(
-                style.getNumCitationMarkerForBibliography(citedKey).toString()
-            );
+            stringBuilder.append(style.getNumCitationMarkerForBibliography(citedKey).toString());
         } else {
             // !style.isNumberEntries() : emit no prefix
             // Note: We might want [citationKey] prefix for style.isCitationKeyCiteMarkers();
         }
 
         // Add entry body
-        stringBuilder.append(
-            formatBibliographyEntryBody(citedKey, style).toString()
-        );
+        stringBuilder.append(formatBibliographyEntryBody(citedKey, style).toString());
 
         // Add "Cited on pages"
         if (citedKey.getLookupResult().isEmpty() || alwaysAddCitedOnPages) {
-            stringBuilder.append(
-                formatCitedOnPages(citationGroups, citedKey).toString()
-            );
+            stringBuilder.append(formatCitedOnPages(citationGroups, citedKey).toString());
         }
 
         // Add paragraph
@@ -110,15 +104,10 @@ public static OOText formatBibliographyEntry(
     /**
      * @return just the body of a bibliography entry. No label, "Cited on pages" or paragraph.
      */
-    public static OOText formatBibliographyEntryBody(
-        CitedKey citedKey,
-        OOBibStyle style
-    ) {
+    public static OOText formatBibliographyEntryBody(CitedKey citedKey, OOBibStyle style) {
         if (citedKey.getLookupResult().isEmpty()) {
             // Unresolved entry
-            return OOText.fromString(
-                String.format("Unresolved(%s)", citedKey.citationKey)
-            );
+            return OOText.fromString(String.format("Unresolved(%s)", citedKey.citationKey));
         } else {
             // Resolved entry, use the layout engine
             BibEntry bibentry = citedKey.getLookupResult().get().entry;
@@ -161,9 +150,7 @@ private static OOText formatFullReferenceOfBibEntry(
         }
 
         // Do the layout for this entry:
-        OOText formattedText = OOText.fromString(
-            layout.doLayout(entry, database)
-        );
+        OOText formattedText = OOText.fromString(layout.doLayout(entry, database));
 
         // Afterwards, reset the old value:
         if (oldUniqVal.isPresent()) {
@@ -183,31 +170,21 @@ private static OOText formatFullReferenceOfBibEntry(
      * - The links are created as references that show page numbers of the reference marks.
      *   - We do not control the text shown, that is provided by OpenOffice.
      */
-    private static OOText formatCitedOnPages(
-        CitationGroups citationGroups,
-        CitedKey citedKey
-    ) {
-        if (
-            !citationGroups.citationGroupsProvideReferenceMarkNameForLinking()
-        ) {
+    private static OOText formatCitedOnPages(CitationGroups citationGroups, CitedKey citedKey) {
+        if (!citationGroups.citationGroupsProvideReferenceMarkNameForLinking()) {
             return OOText.fromString("");
         }
 
         StringBuilder stringBuilder = new StringBuilder();
 
-        final String prefix = String.format(
-            " (%s: ",
-            Localization.lang("Cited on pages")
-        );
+        final String prefix = String.format(" (%s: ", Localization.lang("Cited on pages"));
         final String suffix = ")";
         stringBuilder.append(prefix);
 
         List<CitationGroup> filteredList = new ArrayList<>();
         for (CitationPath path : citedKey.getCitationPaths()) {
             CitationGroupId groupId = path.group;
-            Optional<CitationGroup> group = citationGroups.getCitationGroup(
-                groupId
-            );
+            Optional<CitationGroup> group = citationGroups.getCitationGroup(groupId);
             if (group.isEmpty()) {
                 throw new IllegalStateException();
             }
@@ -216,12 +193,8 @@ private static OOText formatCitedOnPages(
 
         // 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);
+            Integer aa = a.getIndexInGlobalOrder().orElseThrow(IllegalStateException::new);
+            Integer bb = b.getIndexInGlobalOrder().orElseThrow(IllegalStateException::new);
             return aa.compareTo(bb);
         });
 
@@ -233,9 +206,7 @@ private static OOText formatCitedOnPages(
             String markName = group
                 .getReferenceMarkNameForLinking()
                 .orElseThrow(IllegalStateException::new);
-            OOText xref = OOFormat.formatReferenceToPageNumberOfReferenceMark(
-                markName
-            );
+            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 9b1a3d5940a..af8c732ec4f 100644
--- a/src/main/java/org/jabref/logic/openoffice/style/OOPreFormatter.java
+++ b/src/main/java/org/jabref/logic/openoffice/style/OOPreFormatter.java
@@ -59,9 +59,7 @@ 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}
@@ -74,19 +72,13 @@ public String format(String field) {
                         c = finalResult.charAt(i);
                         String combody;
                         if (c == '{') {
-                            String part = StringUtil.getPart(
-                                finalResult,
-                                i,
-                                false
-                            );
+                            String part = StringUtil.getPart(finalResult, i, false);
                             i += part.length();
                             combody = part;
                         } else {
                             combody = finalResult.substring(i, i + 1);
                         }
-                        String result = OOPreFormatter.CHARS.get(
-                            command + combody
-                        );
+                        String result = OOPreFormatter.CHARS.get(command + combody);
 
                         if (result != null) {
                             sb.append(result);
@@ -100,9 +92,7 @@ public String format(String field) {
                             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.
-                            sb.append(
-                                Objects.requireNonNullElse(result, command)
-                            );
+                            sb.append(Objects.requireNonNullElse(result, command));
                         }
                     }
                 }
@@ -111,9 +101,7 @@ public String format(String field) {
 
                 if (!incommand) {
                     sb.append(c);
-                } else if (
-                    Character.isWhitespace(c) || (c == '{') || (c == '}')
-                ) {
+                } else if (Character.isWhitespace(c) || (c == '{') || (c == '}')) {
                     String command = currentCommand.toString();
 
                     // Test if we are dealing with a formatting command. If so, handle.
@@ -134,9 +122,7 @@ public String format(String field) {
                         i += part.length();
                         argument = part;
                         // handle common case of general latex command
-                        String result = OOPreFormatter.CHARS.get(
-                            command + argument
-                        );
+                        String result = OOPreFormatter.CHARS.get(command + argument);
                         // 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 == '}') {
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 8dd94ec1256..06c1df4e782 100644
--- a/src/main/java/org/jabref/logic/openoffice/style/OOProcess.java
+++ b/src/main/java/org/jabref/logic/openoffice/style/OOProcess.java
@@ -45,9 +45,7 @@ private static Comparator<BibEntry> makeYearAuthorTitleComparator() {
      *
      *  Yes, they are always sorted one way or another.
      */
-    public static Comparator<BibEntry> comparatorForMulticite(
-        OOBibStyle style
-    ) {
+    public static Comparator<BibEntry> comparatorForMulticite(OOBibStyle style) {
         if (style.getMultiCiteChronological()) {
             return OOProcess.YEAR_AUTHOR_TITLE_COMPARATOR;
         } else {
@@ -75,20 +73,11 @@ public static void produceCitationMarkers(
 
         // fill CitationGroup.citationMarker
         if (style.isCitationKeyCiteMarkers()) {
-            OOProcessCitationKeyMarkers.produceCitationMarkers(
-                citationGroups,
-                style
-            );
+            OOProcessCitationKeyMarkers.produceCitationMarkers(citationGroups, style);
         } else if (style.isNumberEntries()) {
-            OOProcessNumericMarkers.produceCitationMarkers(
-                citationGroups,
-                style
-            );
+            OOProcessNumericMarkers.produceCitationMarkers(citationGroups, style);
         } else {
-            OOProcessAuthorYearMarkers.produceCitationMarkers(
-                citationGroups,
-                style
-            );
+            OOProcessAuthorYearMarkers.produceCitationMarkers(citationGroups, style);
         }
     }
 }
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 eb232786898..d08c2d3a726 100644
--- a/src/main/java/org/jabref/logic/openoffice/style/OOProcessAuthorYearMarkers.java
+++ b/src/main/java/org/jabref/logic/openoffice/style/OOProcessAuthorYearMarkers.java
@@ -30,9 +30,7 @@ private static void createNormalizedCitationMarkers(
         OOBibStyle style
     ) {
         for (CitedKey ck : sortedCitedKeys.values()) {
-            ck.setNormalizedCitationMarker(
-                Optional.of(style.getNormalizedCitationMarker(ck))
-            );
+            ck.setNormalizedCitationMarker(Optional.of(style.getNormalizedCitationMarker(ck)));
         }
     }
 
@@ -63,9 +61,7 @@ private static void createUniqueLetters(
         //
         Map<String, List<String>> normCitMarkerToClachingKeys = new HashMap<>();
         for (CitedKey citedKey : sortedCitedKeys.values()) {
-            String normCitMarker = OOText.toString(
-                citedKey.getNormalizedCitationMarker().get()
-            );
+            String normCitMarker = OOText.toString(citedKey.getNormalizedCitationMarker().get());
             String citationKey = citedKey.citationKey;
 
             List<String> clashingKeys = normCitMarkerToClachingKeys.putIfAbsent(
@@ -97,9 +93,7 @@ private static void createUniqueLetters(
             int nextUniqueLetter = 'a';
             for (String citationKey : clashingKeys) {
                 String uniqueLetter = String.valueOf((char) nextUniqueLetter);
-                sortedCitedKeys
-                    .get(citationKey)
-                    .setUniqueLetter(Optional.of(uniqueLetter));
+                sortedCitedKeys.get(citationKey).setUniqueLetter(Optional.of(uniqueLetter));
                 nextUniqueLetter++;
             }
         }
@@ -118,9 +112,7 @@ private static void createUniqueLetters(
      *
      * Preconditions: globalOrder, localOrder
      */
-    private static void setIsFirstAppearanceOfSourceInCitations(
-        CitationGroups citationGroups
-    ) {
+    private static void setIsFirstAppearanceOfSourceInCitations(CitationGroups citationGroups) {
         Set<String> seenBefore = new HashSet<>();
         for (CitationGroup group : citationGroups.getCitationGroupsInGlobalOrder()) {
             for (Citation cit : group.getCitationsInLocalOrder()) {
@@ -141,16 +133,12 @@ private static void setIsFirstAppearanceOfSourceInCitations(
      *
      * @param style              Bibliography style.
      */
-    static void produceCitationMarkers(
-        CitationGroups citationGroups,
-        OOBibStyle style
-    ) {
+    static void produceCitationMarkers(CitationGroups citationGroups, OOBibStyle style) {
         assert !style.isCitationKeyCiteMarkers();
         assert !style.isNumberEntries();
         // Citations in (Au1, Au2 2000) form
 
-        CitedKeys citedKeys =
-            citationGroups.getCitedKeysSortedInOrderOfAppearance();
+        CitedKeys citedKeys = citationGroups.getCitedKeysSortedInOrderOfAppearance();
 
         createNormalizedCitationMarkers(citedKeys, style);
         createUniqueLetters(citedKeys, citationGroups);
@@ -162,16 +150,11 @@ static void produceCitationMarkers(
         setIsFirstAppearanceOfSourceInCitations(citationGroups);
 
         for (CitationGroup group : citationGroups.getCitationGroupsInGlobalOrder()) {
-            final boolean inParenthesis =
-                group.citationType == CitationType.AUTHORYEAR_PAR;
-            final NonUniqueCitationMarker strictlyUnique =
-                NonUniqueCitationMarker.THROWS;
+            final boolean inParenthesis = group.citationType == CitationType.AUTHORYEAR_PAR;
+            final NonUniqueCitationMarker strictlyUnique = NonUniqueCitationMarker.THROWS;
 
             List<Citation> cits = group.getCitationsInLocalOrder();
-            List<CitationMarkerEntry> citationMarkerEntries = OOListUtil.map(
-                cits,
-                e -> e
-            );
+            List<CitationMarkerEntry> citationMarkerEntries = OOListUtil.map(cits, e -> e);
             OOText citMarker = style.createCitationMarker(
                 citationMarkerEntries,
                 inParenthesis,
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 46b9209017b..c2a2568b93f 100644
--- a/src/main/java/org/jabref/logic/openoffice/style/OOProcessCitationKeyMarkers.java
+++ b/src/main/java/org/jabref/logic/openoffice/style/OOProcessCitationKeyMarkers.java
@@ -15,10 +15,7 @@ private OOProcessCitationKeyMarkers() {}
      *  Produce citation markers for the case when the citation
      *  markers are the citation keys themselves, separated by commas.
      */
-    static void produceCitationMarkers(
-        CitationGroups citationGroups,
-        OOBibStyle style
-    ) {
+    static void produceCitationMarkers(CitationGroups citationGroups, OOBibStyle style) {
         assert style.isCitationKeyCiteMarkers();
 
         citationGroups.createPlainBibliographySortedByComparator(
@@ -30,10 +27,7 @@ static void produceCitationMarkers(
                 style.getCitationGroupMarkupBefore() +
                 String.join(
                     ",",
-                    OOListUtil.map(
-                        group.getCitationsInLocalOrder(),
-                        Citation::getCitationKey
-                    )
+                    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 6d9dd4810c9..82bbbc7390d 100644
--- a/src/main/java/org/jabref/logic/openoffice/style/OOProcessNumericMarkers.java
+++ b/src/main/java/org/jabref/logic/openoffice/style/OOProcessNumericMarkers.java
@@ -20,10 +20,7 @@ private OOProcessNumericMarkers() {}
      * Numbering is according to first appearance.
      * Assumes global order and local order are already applied.
      */
-    static void produceCitationMarkers(
-        CitationGroups citationGroups,
-        OOBibStyle style
-    ) {
+    static void produceCitationMarkers(CitationGroups citationGroups, OOBibStyle style) {
         assert style.isNumberEntries();
 
         if (style.isSortByPosition()) {
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 e6dbfeaaa0b..a32d86f8eee 100644
--- a/src/main/java/org/jabref/logic/openoffice/style/StyleLoader.java
+++ b/src/main/java/org/jabref/logic/openoffice/style/StyleLoader.java
@@ -20,9 +20,7 @@ public class StyleLoader {
     public static final String DEFAULT_NUMERICAL_STYLE_PATH =
         "/resource/openoffice/default_numerical.jstyle";
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(
-        StyleLoader.class
-    );
+    private static final Logger LOGGER = LoggerFactory.getLogger(StyleLoader.class);
 
     // All internal styles
     private final List<String> internalStyleFiles = Arrays.asList(
@@ -44,12 +42,9 @@ public StyleLoader(
         LayoutFormatterPreferences formatterPreferences,
         JournalAbbreviationRepository abbreviationRepository
     ) {
-        this.openOfficePreferences =
-            Objects.requireNonNull(openOfficePreferences);
-        this.layoutFormatterPreferences =
-            Objects.requireNonNull(formatterPreferences);
-        this.abbreviationRepository =
-            Objects.requireNonNull(abbreviationRepository);
+        this.openOfficePreferences = Objects.requireNonNull(openOfficePreferences);
+        this.layoutFormatterPreferences = Objects.requireNonNull(formatterPreferences);
+        this.abbreviationRepository = Objects.requireNonNull(abbreviationRepository);
         loadInternalStyles();
         loadExternalStyles();
     }
@@ -75,10 +70,7 @@ public boolean addStyleIfValid(String filename) {
                 abbreviationRepository
             );
             if (externalStyles.contains(newStyle)) {
-                LOGGER.info(
-                    "External style file {} already existing.",
-                    filename
-                );
+                LOGGER.info("External style file {} already existing.", filename);
             } else if (newStyle.isValid()) {
                 externalStyles.add(newStyle);
                 storeExternalStyles();
@@ -115,11 +107,7 @@ private void loadExternalStyles() {
                 // The file couldn't be found... should we tell anyone?
                 LOGGER.info("Cannot find external style file {}", filename);
             } catch (IOException e) {
-                LOGGER.info(
-                    "Problem reading external style file {}",
-                    filename,
-                    e
-                );
+                LOGGER.info("Problem reading external style file {}", filename, e);
             }
         }
     }
@@ -129,18 +117,10 @@ private void loadInternalStyles() {
         for (String filename : internalStyleFiles) {
             try {
                 internalStyles.add(
-                    new OOBibStyle(
-                        filename,
-                        layoutFormatterPreferences,
-                        abbreviationRepository
-                    )
+                    new OOBibStyle(filename, layoutFormatterPreferences, abbreviationRepository)
                 );
             } catch (IOException e) {
-                LOGGER.info(
-                    "Problem reading internal style file {}",
-                    filename,
-                    e
-                );
+                LOGGER.info("Problem reading internal style file {}", filename, e);
             }
         }
     }
diff --git a/src/main/java/org/jabref/logic/pdf/EntryAnnotationImporter.java b/src/main/java/org/jabref/logic/pdf/EntryAnnotationImporter.java
index 4ac720ff829..3a9de0fef71 100644
--- a/src/main/java/org/jabref/logic/pdf/EntryAnnotationImporter.java
+++ b/src/main/java/org/jabref/logic/pdf/EntryAnnotationImporter.java
@@ -34,9 +34,7 @@ private List<LinkedFile> getFilteredFileList() {
         return entry
             .getFiles()
             .stream()
-            .filter(parsedFileField ->
-                "pdf".equalsIgnoreCase(parsedFileField.getFileType())
-            )
+            .filter(parsedFileField -> "pdf".equalsIgnoreCase(parsedFileField.getFileType()))
             .filter(parsedFileField -> !parsedFileField.isOnlineLink())
             .collect(Collectors.toList());
     }
@@ -58,9 +56,7 @@ public Map<Path, List<FileAnnotation>> importAnnotationsFromFiles(
         for (LinkedFile linkedFile : this.getFilteredFileList()) {
             linkedFile
                 .findIn(databaseContext, filePreferences)
-                .ifPresent(file ->
-                    annotations.put(file, importer.importAnnotations(file))
-                );
+                .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 e47361a22d7..0e5694a1d61 100644
--- a/src/main/java/org/jabref/logic/pdf/FileAnnotationCache.java
+++ b/src/main/java/org/jabref/logic/pdf/FileAnnotationCache.java
@@ -15,17 +15,12 @@
 
 public class FileAnnotationCache {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(
-        FileAnnotation.class
-    );
+    private static final Logger LOGGER = LoggerFactory.getLogger(FileAnnotation.class);
     // cache size in entries
     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;
+    private LoadingCache<BibEntry, Map<Path, List<FileAnnotation>>> annotationCache;
 
     /**
      * Creates an empty fil annotation cache. Required to allow the annotation cache to be injected into views without
@@ -33,28 +28,18 @@ public class FileAnnotationCache {
      */
     public FileAnnotationCache() {}
 
-    public FileAnnotationCache(
-        BibDatabaseContext context,
-        FilePreferences filePreferences
-    ) {
+    public FileAnnotationCache(BibDatabaseContext context, FilePreferences filePreferences) {
         annotationCache =
             CacheBuilder
                 .newBuilder()
                 .maximumSize(CACHE_SIZE)
                 .build(
-                    new CacheLoader<
-                        BibEntry,
-                        Map<Path, List<FileAnnotation>>
-                    >() {
+                    new CacheLoader<BibEntry, Map<Path, List<FileAnnotation>>>() {
                         @Override
-                        public Map<Path, List<FileAnnotation>> load(
-                            BibEntry entry
-                        ) throws Exception {
+                        public Map<Path, List<FileAnnotation>> load(BibEntry entry)
+                            throws Exception {
                             return new EntryAnnotationImporter(entry)
-                                .importAnnotationsFromFiles(
-                                    context,
-                                    filePreferences
-                                );
+                                .importAnnotationsFromFiles(context, filePreferences);
                         }
                     }
                 );
diff --git a/src/main/java/org/jabref/logic/pdf/PdfAnnotationImporter.java b/src/main/java/org/jabref/logic/pdf/PdfAnnotationImporter.java
index 22ab01d7d9b..1bbfec6dbbe 100644
--- a/src/main/java/org/jabref/logic/pdf/PdfAnnotationImporter.java
+++ b/src/main/java/org/jabref/logic/pdf/PdfAnnotationImporter.java
@@ -24,9 +24,7 @@
 
 public class PdfAnnotationImporter implements AnnotationImporter {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(
-        PdfAnnotationImporter.class
-    );
+    private static final Logger LOGGER = LoggerFactory.getLogger(PdfAnnotationImporter.class);
 
     /**
      * Imports the comments from a pdf specified by its path
@@ -44,25 +42,15 @@ public List<FileAnnotation> importAnnotations(final Path path) {
         List<FileAnnotation> annotationsList = new LinkedList<>();
         try (PDDocument document = Loader.loadPDF(path.toFile())) {
             PDPageTree pdfPages = document.getDocumentCatalog().getPages();
-            for (
-                int pageIndex = 0;
-                pageIndex < pdfPages.getCount();
-                pageIndex++
-            ) {
+            for (int pageIndex = 0; pageIndex < pdfPages.getCount(); pageIndex++) {
                 PDPage page = pdfPages.get(pageIndex);
                 for (PDAnnotation annotation : page.getAnnotations()) {
                     if (!isSupportedAnnotationType(annotation)) {
                         continue;
                     }
 
-                    if (
-                        FileAnnotationType.isMarkedFileAnnotationType(
-                            annotation.getSubtype()
-                        )
-                    ) {
-                        annotationsList.add(
-                            createMarkedAnnotations(pageIndex, page, annotation)
-                        );
+                    if (FileAnnotationType.isMarkedFileAnnotationType(annotation.getSubtype())) {
+                        annotationsList.add(createMarkedAnnotations(pageIndex, page, annotation));
                     } else {
                         FileAnnotation fileAnnotation = new FileAnnotation(
                             annotation,
@@ -87,13 +75,9 @@ private boolean isSupportedAnnotationType(PDAnnotation annotation) {
         if (annotation.getSubtype() == null) {
             return false;
         }
-        if (
-            "Link".equals(annotation.getSubtype()) ||
-            "Widget".equals(annotation.getSubtype())
-        ) {
+        if ("Link".equals(annotation.getSubtype()) || "Widget".equals(annotation.getSubtype())) {
             LOGGER.debug(
-                annotation.getSubtype() +
-                " is excluded from the supported file annotations"
+                annotation.getSubtype() + " is excluded from the supported file annotations"
             );
             return false;
         }
@@ -101,9 +85,7 @@ private boolean isSupportedAnnotationType(PDAnnotation annotation) {
             if (
                 !Arrays
                     .asList(FileAnnotationType.values())
-                    .contains(
-                        FileAnnotationType.valueOf(annotation.getSubtype())
-                    )
+                    .contains(FileAnnotationType.valueOf(annotation.getSubtype()))
             ) {
                 return false;
             }
@@ -129,46 +111,30 @@ private FileAnnotation createMarkedAnnotations(
             FileAnnotation.extractModifiedTime(annotation.getModifiedDate()),
             pageIndex + 1,
             annotation.getContents(),
-            FileAnnotationType.valueOf(
-                annotation.getSubtype().toUpperCase(Locale.ROOT)
-            ),
+            FileAnnotationType.valueOf(annotation.getSubtype().toUpperCase(Locale.ROOT)),
             Optional.empty()
         );
 
-        if (
-            annotationBelongingToMarking
-                .getAnnotationType()
-                .isLinkedFileAnnotationType()
-        ) {
+        if (annotationBelongingToMarking.getAnnotationType().isLinkedFileAnnotationType()) {
             try {
                 COSArray boundingBoxes = (COSArray) annotation
                     .getCOSObject()
                     .getDictionaryObject(COSName.getPDFName("QuadPoints"));
-                annotation.setContents(
-                    new TextExtractor(page, boundingBoxes).extractMarkedText()
-                );
+                annotation.setContents(new TextExtractor(page, boundingBoxes).extractMarkedText());
             } catch (IOException e) {
-                annotation.setContents(
-                    "JabRef: Could not extract any marked text!"
-                );
+                annotation.setContents("JabRef: Could not extract any marked text!");
             }
         }
 
         // Marked text that has a sticky note on it should be linked to the sticky note
-        return new FileAnnotation(
-            annotation,
-            pageIndex + 1,
-            annotationBelongingToMarking
-        );
+        return new FileAnnotation(annotation, pageIndex + 1, annotationBelongingToMarking);
     }
 
     private boolean validatePath(Path path) {
         Objects.requireNonNull(path);
 
         if (!path.toString().toLowerCase(Locale.ROOT).endsWith(".pdf")) {
-            LOGGER.warn(
-                String.format("File '%s' does not end with .pdf!", path)
-            );
+            LOGGER.warn(String.format("File '%s' does not end with .pdf!", path));
             return false;
         }
 
diff --git a/src/main/java/org/jabref/logic/pdf/TextExtractor.java b/src/main/java/org/jabref/logic/pdf/TextExtractor.java
index 082fb063ce6..636ae7704e7 100644
--- a/src/main/java/org/jabref/logic/pdf/TextExtractor.java
+++ b/src/main/java/org/jabref/logic/pdf/TextExtractor.java
@@ -56,10 +56,7 @@ public String extractMarkedText() throws IOException {
                 );
                 stripperByArea.extractRegions(page);
 
-                markedText =
-                    markedText.concat(
-                        stripperByArea.getTextForRegion("markedRegion")
-                    );
+                markedText = markedText.concat(stripperByArea.getTextForRegion("markedRegion"));
             } catch (IllegalArgumentException e) {
                 throw new IOException("Cannot read annotation coordinates!", e);
             }
@@ -68,10 +65,7 @@ public String extractMarkedText() throws IOException {
         return markedText.trim();
     }
 
-    private Rectangle2D calculateSegmentBoundingBox(
-        COSArray quadsArray,
-        int segmentPointer
-    ) {
+    private Rectangle2D calculateSegmentBoundingBox(COSArray quadsArray, int segmentPointer) {
         // Extract coordinate values
         float upperLeftX = toFloat(quadsArray.get(segmentPointer));
         float upperLeftY = toFloat(quadsArray.get(segmentPointer + 1));
@@ -97,8 +91,6 @@ private float toFloat(Object cosNumber) {
         if (cosNumber instanceof COSInteger) {
             return ((COSInteger) cosNumber).floatValue();
         }
-        throw new IllegalArgumentException(
-            "The number type of the annotation is not supported!"
-        );
+        throw new IllegalArgumentException("The number type of the annotation is not supported!");
     }
 }
diff --git a/src/main/java/org/jabref/logic/pdf/search/indexing/DocumentReader.java b/src/main/java/org/jabref/logic/pdf/search/indexing/DocumentReader.java
index a6966f5e15d..899947f8d5a 100644
--- a/src/main/java/org/jabref/logic/pdf/search/indexing/DocumentReader.java
+++ b/src/main/java/org/jabref/logic/pdf/search/indexing/DocumentReader.java
@@ -39,15 +39,12 @@
  */
 public final class DocumentReader {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(
-        LibraryTab.class
-    );
+    private static final Logger LOGGER = LoggerFactory.getLogger(LibraryTab.class);
 
-    private static final Pattern HYPHEN_LINEBREAK_PATTERN = Pattern.compile(
-        "\\-\n"
+    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");
 
     private final BibEntry entry;
     private final FilePreferences filePreferences;
@@ -60,9 +57,7 @@ public final class DocumentReader {
     public DocumentReader(BibEntry bibEntry, FilePreferences filePreferences) {
         this.filePreferences = filePreferences;
         if (bibEntry.getFiles().isEmpty()) {
-            throw new IllegalStateException(
-                "There are no linked PDF files to this BibEntry!"
-            );
+            throw new IllegalStateException("There are no linked PDF files to this BibEntry!");
         }
 
         this.entry = bibEntry;
@@ -100,19 +95,10 @@ public List<Document> readLinkedPdfs(BibDatabaseContext databaseContext) {
             .collect(Collectors.toList());
     }
 
-    private List<Document> readPdfContents(
-        LinkedFile pdf,
-        Path resolvedPdfPath
-    ) {
+    private List<Document> readPdfContents(LinkedFile pdf, Path resolvedPdfPath) {
         List<Document> pages = new ArrayList<>();
-        try (
-            PDDocument pdfDocument = Loader.loadPDF(resolvedPdfPath.toFile())
-        ) {
-            for (
-                int pageNumber = 0;
-                pageNumber < pdfDocument.getNumberOfPages();
-                pageNumber++
-            ) {
+        try (PDDocument pdfDocument = Loader.loadPDF(resolvedPdfPath.toFile())) {
+            for (int pageNumber = 0; pageNumber < pdfDocument.getNumberOfPages(); pageNumber++) {
                 Document newDocument = new Document();
                 addIdentifiers(newDocument, pdf.getLink());
                 addMetaData(newDocument, resolvedPdfPath, pageNumber);
@@ -129,11 +115,7 @@ private List<Document> readPdfContents(
                 pages.add(newDocument);
             }
         } catch (IOException e) {
-            LOGGER.warn(
-                "Could not read {}",
-                resolvedPdfPath.toAbsolutePath(),
-                e
-            );
+            LOGGER.warn("Could not read {}", resolvedPdfPath.toAbsolutePath(), e);
         }
         if (pages.isEmpty()) {
             Document newDocument = new Document();
@@ -144,11 +126,7 @@ private List<Document> readPdfContents(
         return pages;
     }
 
-    private void addMetaData(
-        Document newDocument,
-        Path resolvedPdfPath,
-        int pageNumber
-    ) {
+    private void addMetaData(Document newDocument, Path resolvedPdfPath, int pageNumber) {
         try {
             BasicFileAttributes attributes = Files.readAttributes(
                 resolvedPdfPath,
@@ -157,9 +135,7 @@ private void addMetaData(
             addStringField(
                 newDocument,
                 MODIFIED,
-                String.valueOf(
-                    attributes.lastModifiedTime().to(TimeUnit.SECONDS)
-                )
+                String.valueOf(attributes.lastModifiedTime().to(TimeUnit.SECONDS))
             );
         } catch (IOException e) {
             LOGGER.error("Could not read timestamp for {}", resolvedPdfPath, e);
@@ -167,11 +143,7 @@ private void addMetaData(
         addStringField(newDocument, PAGE_NUMBER, String.valueOf(pageNumber));
     }
 
-    private void addStringField(
-        Document newDocument,
-        String field,
-        String value
-    ) {
+    private void addStringField(Document newDocument, String field, String value) {
         if (!isValidField(value)) {
             return;
         }
@@ -183,19 +155,12 @@ private boolean isValidField(String value) {
     }
 
     public static String mergeLines(String text) {
-        String mergedHyphenNewlines = HYPHEN_LINEBREAK_PATTERN
-            .matcher(text)
-            .replaceAll("");
-        return LINEBREAK_WITHOUT_PERIOD_PATTERN
-            .matcher(mergedHyphenNewlines)
-            .replaceAll("$1 ");
+        String mergedHyphenNewlines = HYPHEN_LINEBREAK_PATTERN.matcher(text).replaceAll("");
+        return LINEBREAK_WITHOUT_PERIOD_PATTERN.matcher(mergedHyphenNewlines).replaceAll("$1 ");
     }
 
-    private void addContentIfNotEmpty(
-        PDDocument pdfDocument,
-        Document newDocument,
-        int pageNumber
-    ) throws IOException {
+    private void addContentIfNotEmpty(PDDocument pdfDocument, Document newDocument, int pageNumber)
+        throws IOException {
         PDFTextStripper pdfTextStripper = new PDFTextStripper();
         pdfTextStripper.setLineSeparator("\n");
         pdfTextStripper.setStartPage(pageNumber);
@@ -203,9 +168,7 @@ private void addContentIfNotEmpty(
 
         String pdfContent = pdfTextStripper.getText(pdfDocument);
         if (StringUtil.isNotBlank(pdfContent)) {
-            newDocument.add(
-                new TextField(CONTENT, mergeLines(pdfContent), Field.Store.YES)
-            );
+            newDocument.add(new TextField(CONTENT, mergeLines(pdfContent), Field.Store.YES));
         }
         PDPage page = pdfDocument.getPage(pageNumber);
         List<String> annotations = page
diff --git a/src/main/java/org/jabref/logic/pdf/search/indexing/IndexingTaskManager.java b/src/main/java/org/jabref/logic/pdf/search/indexing/IndexingTaskManager.java
index 581f40f4ed7..906f0f5390b 100644
--- a/src/main/java/org/jabref/logic/pdf/search/indexing/IndexingTaskManager.java
+++ b/src/main/java/org/jabref/logic/pdf/search/indexing/IndexingTaskManager.java
@@ -61,10 +61,7 @@ private void updateProgress() {
                     numOfIndexedFiles + taskQueue.size()
                 )
             );
-            updateProgress(
-                numOfIndexedFiles,
-                numOfIndexedFiles + taskQueue.size()
-            );
+            updateProgress(numOfIndexedFiles, numOfIndexedFiles + taskQueue.size());
         });
     }
 
@@ -97,16 +94,11 @@ public void createIndex(PdfIndexer indexer) {
         enqueueTask(indexer::createIndex);
     }
 
-    public void updateIndex(
-        PdfIndexer indexer,
-        BibDatabaseContext databaseContext
-    ) {
+    public void updateIndex(PdfIndexer indexer, BibDatabaseContext databaseContext) {
         Set<String> pathsToRemove = indexer.getListOfFilePaths();
         for (BibEntry entry : databaseContext.getEntries()) {
             for (LinkedFile file : entry.getFiles()) {
-                enqueueTask(() ->
-                    indexer.addToIndex(entry, file, databaseContext)
-                );
+                enqueueTask(() -> indexer.addToIndex(entry, file, databaseContext));
                 pathsToRemove.remove(file.getLink());
             }
         }
@@ -115,11 +107,7 @@ public void updateIndex(
         }
     }
 
-    public void addToIndex(
-        PdfIndexer indexer,
-        BibEntry entry,
-        BibDatabaseContext databaseContext
-    ) {
+    public void addToIndex(PdfIndexer indexer, BibEntry entry, BibDatabaseContext databaseContext) {
         addToIndex(indexer, entry, entry.getFiles(), databaseContext);
     }
 
@@ -134,11 +122,7 @@ public void addToIndex(
         }
     }
 
-    public void removeFromIndex(
-        PdfIndexer indexer,
-        BibEntry entry,
-        List<LinkedFile> linkedFiles
-    ) {
+    public void removeFromIndex(PdfIndexer indexer, BibEntry entry, List<LinkedFile> linkedFiles) {
         for (LinkedFile file : linkedFiles) {
             enqueueTask(() -> indexer.removeFromIndex(file.getLink()));
         }
diff --git a/src/main/java/org/jabref/logic/pdf/search/indexing/PdfIndexer.java b/src/main/java/org/jabref/logic/pdf/search/indexing/PdfIndexer.java
index daaa9a5dd16..e1326e249e8 100644
--- a/src/main/java/org/jabref/logic/pdf/search/indexing/PdfIndexer.java
+++ b/src/main/java/org/jabref/logic/pdf/search/indexing/PdfIndexer.java
@@ -39,19 +39,14 @@
  */
 public class PdfIndexer {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(
-        LibraryTab.class
-    );
+    private static final Logger LOGGER = LoggerFactory.getLogger(LibraryTab.class);
 
     private final Directory directoryToIndex;
     private BibDatabaseContext databaseContext;
 
     private final FilePreferences filePreferences;
 
-    public PdfIndexer(
-        Directory indexDirectory,
-        FilePreferences filePreferences
-    ) {
+    public PdfIndexer(Directory indexDirectory, FilePreferences filePreferences) {
         this.directoryToIndex = indexDirectory;
         this.filePreferences = filePreferences;
     }
@@ -149,9 +144,7 @@ public void removeFromIndex(String linkedFilePath) {
                     .setOpenMode(IndexWriterConfig.OpenMode.CREATE_OR_APPEND)
             )
         ) {
-            indexWriter.deleteDocuments(
-                new Term(SearchFieldConstants.PATH, linkedFilePath)
-            );
+            indexWriter.deleteDocuments(new Term(SearchFieldConstants.PATH, linkedFilePath));
             indexWriter.commit();
         } catch (IOException e) {
             LOGGER.warn("Could not initialize the IndexWriter!", e);
@@ -205,10 +198,7 @@ private void addToIndex(BibEntry entry, LinkedFile linkedFile) {
         ) {
             return;
         }
-        Optional<Path> resolvedPath = linkedFile.findIn(
-            databaseContext,
-            filePreferences
-        );
+        Optional<Path> resolvedPath = linkedFile.findIn(databaseContext, filePreferences);
         if (resolvedPath.isEmpty()) {
             LOGGER.debug("Could not find {}", linkedFile.getLink());
             return;
@@ -226,9 +216,7 @@ private void addToIndex(BibEntry entry, LinkedFile linkedFile) {
                 if (topDocs.scoreDocs.length > 0) {
                     Document doc = reader.document(topDocs.scoreDocs[0].doc);
                     long indexModificationTime = Long.parseLong(
-                        doc
-                            .getField(SearchFieldConstants.MODIFIED)
-                            .stringValue()
+                        doc.getField(SearchFieldConstants.MODIFIED).stringValue()
                     );
 
                     BasicFileAttributes attributes = Files.readAttributes(
@@ -237,8 +225,7 @@ private void addToIndex(BibEntry entry, LinkedFile linkedFile) {
                     );
 
                     if (
-                        indexModificationTime >=
-                        attributes.lastModifiedTime().to(TimeUnit.SECONDS)
+                        indexModificationTime >= attributes.lastModifiedTime().to(TimeUnit.SECONDS)
                     ) {
                         return;
                     }
@@ -247,19 +234,14 @@ private void addToIndex(BibEntry entry, LinkedFile linkedFile) {
                 // if there is no index yet, don't need to check anything!
             }
             // If no document was found, add the new one
-            Optional<List<Document>> pages = new DocumentReader(
-                entry,
-                filePreferences
-            )
+            Optional<List<Document>> pages = new DocumentReader(entry, filePreferences)
                 .readLinkedPdf(this.databaseContext, linkedFile);
             if (pages.isPresent()) {
                 try (
                     IndexWriter indexWriter = new IndexWriter(
                         directoryToIndex,
                         new IndexWriterConfig(new EnglishStemAnalyzer())
-                            .setOpenMode(
-                                IndexWriterConfig.OpenMode.CREATE_OR_APPEND
-                            )
+                            .setOpenMode(IndexWriterConfig.OpenMode.CREATE_OR_APPEND)
                     )
                 ) {
                     indexWriter.addDocuments(pages.get());
@@ -267,11 +249,7 @@ private void addToIndex(BibEntry entry, LinkedFile linkedFile) {
                 }
             }
         } catch (IOException e) {
-            LOGGER.warn(
-                "Could not add the document {} to the index!",
-                linkedFile.getLink(),
-                e
-            );
+            LOGGER.warn("Could not add the document {} to the index!", linkedFile.getLink(), e);
         }
     }
 
@@ -288,9 +266,7 @@ public Set<String> getListOfFilePaths() {
             TopDocs allDocs = searcher.search(query, Integer.MAX_VALUE);
             for (ScoreDoc scoreDoc : allDocs.scoreDocs) {
                 Document doc = reader.document(scoreDoc.doc);
-                paths.add(
-                    doc.getField(SearchFieldConstants.PATH).stringValue()
-                );
+                paths.add(doc.getField(SearchFieldConstants.PATH).stringValue());
             }
         } catch (IOException e) {
             return paths;
diff --git a/src/main/java/org/jabref/logic/pdf/search/retrieval/PdfSearcher.java b/src/main/java/org/jabref/logic/pdf/search/retrieval/PdfSearcher.java
index 79630af9f0a..a3b9cbaa6b3 100644
--- a/src/main/java/org/jabref/logic/pdf/search/retrieval/PdfSearcher.java
+++ b/src/main/java/org/jabref/logic/pdf/search/retrieval/PdfSearcher.java
@@ -27,9 +27,7 @@
 
 public final class PdfSearcher {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(
-        LibraryTab.class
-    );
+    private static final Logger LOGGER = LoggerFactory.getLogger(LibraryTab.class);
 
     private final Directory indexDirectory;
 
@@ -37,11 +35,8 @@ private PdfSearcher(Directory indexDirectory) {
         this.indexDirectory = indexDirectory;
     }
 
-    public static PdfSearcher of(BibDatabaseContext databaseContext)
-        throws IOException {
-        return new PdfSearcher(
-            new NIOFSDirectory(databaseContext.getFulltextIndexPath())
-        );
+    public static PdfSearcher of(BibDatabaseContext databaseContext) throws IOException {
+        return new PdfSearcher(new NIOFSDirectory(databaseContext.getFulltextIndexPath()));
     }
 
     /**
@@ -51,17 +46,10 @@ public static PdfSearcher of(BibDatabaseContext databaseContext)
      * @param maxHits      number of maximum search results, must be positive
      * @return a result set of all documents that have matches in any fields
      */
-    public PdfSearchResults search(
-        final String searchString,
-        final int maxHits
-    ) throws IOException {
+    public PdfSearchResults search(final String searchString, final int maxHits)
+        throws IOException {
         if (
-            StringUtil.isBlank(
-                Objects.requireNonNull(
-                    searchString,
-                    "The search string was null!"
-                )
-            )
+            StringUtil.isBlank(Objects.requireNonNull(searchString, "The search string was null!"))
         ) {
             return new PdfSearchResults();
         }
@@ -74,19 +62,13 @@ public PdfSearchResults search(
         List<SearchResult> resultDocs = new LinkedList<>();
 
         if (!DirectoryReader.indexExists(indexDirectory)) {
-            LOGGER.debug(
-                "Index directory {} does not yet exist",
-                indexDirectory
-            );
+            LOGGER.debug("Index directory {} does not yet exist", indexDirectory);
             return new PdfSearchResults();
         }
 
         try (IndexReader reader = DirectoryReader.open(indexDirectory)) {
             IndexSearcher searcher = new IndexSearcher(reader);
-            Query query = new MultiFieldQueryParser(
-                PDF_FIELDS,
-                new EnglishStemAnalyzer()
-            )
+            Query query = new MultiFieldQueryParser(PDF_FIELDS, new EnglishStemAnalyzer())
                 .parse(searchString);
             TopDocs results = searcher.search(query, maxHits);
             for (ScoreDoc scoreDoc : results.scoreDocs) {
@@ -94,11 +76,7 @@ public PdfSearchResults search(
             }
             return new PdfSearchResults(resultDocs);
         } catch (ParseException e) {
-            LOGGER.warn(
-                "Could not parse query: '{}'!\n{}",
-                searchString,
-                e.getMessage()
-            );
+            LOGGER.warn("Could not parse query: '{}'!\n{}", searchString, e.getMessage());
             return new PdfSearchResults();
         }
     }
diff --git a/src/main/java/org/jabref/logic/preferences/OwnerPreferences.java b/src/main/java/org/jabref/logic/preferences/OwnerPreferences.java
index e8ef88f8df3..05f02a8327b 100644
--- a/src/main/java/org/jabref/logic/preferences/OwnerPreferences.java
+++ b/src/main/java/org/jabref/logic/preferences/OwnerPreferences.java
@@ -11,11 +11,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/protectedterms/ProtectedTermsList.java b/src/main/java/org/jabref/logic/protectedterms/ProtectedTermsList.java
index 1b531bdc2db..85e7c2b044c 100644
--- a/src/main/java/org/jabref/logic/protectedterms/ProtectedTermsList.java
+++ b/src/main/java/org/jabref/logic/protectedterms/ProtectedTermsList.java
@@ -14,9 +14,7 @@
 
 public class ProtectedTermsList implements Comparable<ProtectedTermsList> {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(
-        ProtectedTermsList.class
-    );
+    private static final Logger LOGGER = LoggerFactory.getLogger(ProtectedTermsList.class);
 
     private String description;
     private final List<String> termsList;
@@ -36,11 +34,7 @@ public ProtectedTermsList(
         this.internalList = internalList;
     }
 
-    public ProtectedTermsList(
-        String description,
-        List<String> termList,
-        String location
-    ) {
+    public ProtectedTermsList(String description, List<String> termList, String location) {
         this(description, termList, location, false);
     }
 
diff --git a/src/main/java/org/jabref/logic/protectedterms/ProtectedTermsLoader.java b/src/main/java/org/jabref/logic/protectedterms/ProtectedTermsLoader.java
index 7dbc2c0b23f..670af33aee6 100644
--- a/src/main/java/org/jabref/logic/protectedterms/ProtectedTermsLoader.java
+++ b/src/main/java/org/jabref/logic/protectedterms/ProtectedTermsLoader.java
@@ -16,12 +16,9 @@
 
 public class ProtectedTermsLoader {
 
-    private static final Map<String, Supplier<String>> INTERNAL_LISTS =
-        new HashMap<>();
+    private static final Map<String, Supplier<String>> INTERNAL_LISTS = new HashMap<>();
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(
-        ProtectedTermsLoader.class
-    );
+    private static final Logger LOGGER = LoggerFactory.getLogger(ProtectedTermsLoader.class);
 
     private final List<ProtectedTermsList> mainList = new ArrayList<>();
 
@@ -66,19 +63,12 @@ public void update(ProtectedTermsPreferences preferences) {
                     )
                 );
             } else {
-                LOGGER.warn(
-                    "Protected terms resource '{}' is no longer available.",
-                    filename
-                );
+                LOGGER.warn("Protected terms resource '{}' is no longer available.", filename);
             }
         }
         for (String filename : preferences.getDisabledInternalTermLists()) {
             if (INTERNAL_LISTS.containsKey(filename)) {
-                if (
-                    !preferences
-                        .getEnabledInternalTermLists()
-                        .contains(filename)
-                ) {
+                if (!preferences.getEnabledInternalTermLists().contains(filename)) {
                     mainList.add(
                         readProtectedTermsListFromResource(
                             filename,
@@ -88,10 +78,7 @@ public void update(ProtectedTermsPreferences preferences) {
                     );
                 }
             } else {
-                LOGGER.warn(
-                    "Protected terms resource '{}' is no longer available.",
-                    filename
-                );
+                LOGGER.warn("Protected terms resource '{}' is no longer available.", filename);
             }
         }
 
@@ -128,9 +115,7 @@ public void update(ProtectedTermsPreferences preferences) {
 
         for (String filename : preferences.getDisabledExternalTermLists()) {
             if (!preferences.getEnabledExternalTermLists().contains(filename)) {
-                mainList.add(
-                    readProtectedTermsListFromFile(Path.of(filename), false)
-                );
+                mainList.add(readProtectedTermsListFromFile(Path.of(filename), false));
             }
         }
     }
@@ -163,13 +148,8 @@ public List<String> getProtectedTerms() {
         return new ArrayList<>(result);
     }
 
-    public void addProtectedTermsListFromFile(
-        String fileName,
-        boolean enabled
-    ) {
-        mainList.add(
-            readProtectedTermsListFromFile(Path.of(fileName), enabled)
-        );
+    public void addProtectedTermsListFromFile(String fileName, boolean enabled) {
+        mainList.add(readProtectedTermsListFromFile(Path.of(fileName), enabled));
     }
 
     public static ProtectedTermsList readProtectedTermsListFromResource(
@@ -185,10 +165,7 @@ public static ProtectedTermsList readProtectedTermsListFromResource(
         return parser.getProtectTermsList(enabled, true);
     }
 
-    public static ProtectedTermsList readProtectedTermsListFromFile(
-        Path path,
-        boolean enabled
-    ) {
+    public static ProtectedTermsList readProtectedTermsListFromFile(Path path, boolean enabled) {
         LOGGER.debug("Reading term list from file {}", path);
         ProtectedTermsParser parser = new ProtectedTermsParser();
         parser.readTermsFromFile(Objects.requireNonNull(path));
@@ -218,10 +195,7 @@ public ProtectedTermsList addNewProtectedTermsList(
         return resultingList;
     }
 
-    public ProtectedTermsList addNewProtectedTermsList(
-        String newDescription,
-        String newLocation
-    ) {
+    public ProtectedTermsList addNewProtectedTermsList(String newDescription, String newLocation) {
         return addNewProtectedTermsList(newDescription, newLocation, true);
     }
 }
diff --git a/src/main/java/org/jabref/logic/protectedterms/ProtectedTermsParser.java b/src/main/java/org/jabref/logic/protectedterms/ProtectedTermsParser.java
index 884973a27ad..68e59d6bd3b 100644
--- a/src/main/java/org/jabref/logic/protectedterms/ProtectedTermsParser.java
+++ b/src/main/java/org/jabref/logic/protectedterms/ProtectedTermsParser.java
@@ -19,9 +19,7 @@
  */
 public class ProtectedTermsParser {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(
-        ProtectedTermsParser.class
-    );
+    private static final Logger LOGGER = LoggerFactory.getLogger(ProtectedTermsParser.class);
 
     private final List<String> terms = new ArrayList<>();
     private String description = Localization.lang(
@@ -30,10 +28,7 @@ public class ProtectedTermsParser {
 
     private String location;
 
-    public void readTermsFromResource(
-        String resourceFileName,
-        String descriptionString
-    ) {
+    public void readTermsFromResource(String resourceFileName, String descriptionString) {
         try {
             Path path = Path.of(
                 Objects
@@ -87,10 +82,7 @@ private String setDescription(String line) {
         return line;
     }
 
-    public ProtectedTermsList getProtectTermsList(
-        boolean enabled,
-        boolean internal
-    ) {
+    public ProtectedTermsList getProtectTermsList(boolean enabled, boolean internal) {
         ProtectedTermsList termList = new ProtectedTermsList(
             description,
             terms,
diff --git a/src/main/java/org/jabref/logic/protectedterms/ProtectedTermsPreferences.java b/src/main/java/org/jabref/logic/protectedterms/ProtectedTermsPreferences.java
index 9c315bafad6..28c41a7c4e9 100644
--- a/src/main/java/org/jabref/logic/protectedterms/ProtectedTermsPreferences.java
+++ b/src/main/java/org/jabref/logic/protectedterms/ProtectedTermsPreferences.java
@@ -17,12 +17,10 @@ public ProtectedTermsPreferences(
         List<String> disabledInternalTermLists,
         List<String> disabledExternalTermLists
     ) {
-        this.enabledInternalTermLists =
-            FXCollections.observableArrayList(enabledInternalTermLists);
+        this.enabledInternalTermLists = FXCollections.observableArrayList(enabledInternalTermLists);
         this.disabledInternalTermLists =
             FXCollections.observableArrayList(disabledInternalTermLists);
-        this.enabledExternalTermLists =
-            FXCollections.observableArrayList(enabledExternalTermLists);
+        this.enabledExternalTermLists = FXCollections.observableArrayList(enabledExternalTermLists);
         this.disabledExternalTermLists =
             FXCollections.observableArrayList(disabledExternalTermLists);
     }
diff --git a/src/main/java/org/jabref/logic/remote/Protocol.java b/src/main/java/org/jabref/logic/remote/Protocol.java
index affc3e18ff3..9aafee4851c 100644
--- a/src/main/java/org/jabref/logic/remote/Protocol.java
+++ b/src/main/java/org/jabref/logic/remote/Protocol.java
@@ -19,9 +19,7 @@ public class Protocol implements AutoCloseable {
 
     public static final String IDENTIFIER = "jabref";
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(
-        Protocol.class
-    );
+    private static final Logger LOGGER = LoggerFactory.getLogger(Protocol.class);
 
     private final Socket socket;
     private final ObjectOutputStream out;
@@ -40,8 +38,7 @@ public void sendMessage(RemoteMessage type) throws IOException {
         out.flush();
     }
 
-    public void sendMessage(RemoteMessage type, Object argument)
-        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)
@@ -49,8 +46,7 @@ public void sendMessage(RemoteMessage type, Object argument)
         if (type == RemoteMessage.SEND_COMMAND_LINE_ARGUMENTS) {
             String[] encodedArgs = ((String[]) argument).clone();
             for (int i = 0; i < encodedArgs.length; i++) {
-                encodedArgs[i] =
-                    URLEncoder.encode(encodedArgs[i], StandardCharsets.UTF_8);
+                encodedArgs[i] = URLEncoder.encode(encodedArgs[i], StandardCharsets.UTF_8);
             }
             out.writeObject(encodedArgs);
         } else {
@@ -71,17 +67,13 @@ public Pair<RemoteMessage, Object> receiveMessage() throws IOException {
             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
-                        );
+                        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
+                    "Message didn't end on correct end of message identifier. Got " + endOfMessage
                 );
             }
 
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 0cde9817898..dcfb7dc2f01 100644
--- a/src/main/java/org/jabref/logic/remote/client/RemoteClient.java
+++ b/src/main/java/org/jabref/logic/remote/client/RemoteClient.java
@@ -13,9 +13,7 @@
 
 public class RemoteClient {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(
-        RemoteClient.class
-    );
+    private static final Logger LOGGER = LoggerFactory.getLogger(RemoteClient.class);
 
     private static final int TIMEOUT = 1000;
     private final int port;
@@ -57,10 +55,7 @@ public boolean ping() {
      */
     public boolean sendCommandLineArguments(String[] args) {
         try (Protocol protocol = openNewConnection()) {
-            protocol.sendMessage(
-                RemoteMessage.SEND_COMMAND_LINE_ARGUMENTS,
-                args
-            );
+            protocol.sendMessage(RemoteMessage.SEND_COMMAND_LINE_ARGUMENTS, args);
             Pair<RemoteMessage, Object> response = protocol.receiveMessage();
             return response.getKey() == RemoteMessage.OK;
         } catch (IOException e) {
@@ -77,10 +72,7 @@ public boolean sendCommandLineArguments(String[] args) {
     private Protocol openNewConnection() throws IOException {
         Socket socket = new Socket();
         socket.setSoTimeout(TIMEOUT);
-        socket.connect(
-            new InetSocketAddress(RemotePreferences.getIpAddress(), port),
-            TIMEOUT
-        );
+        socket.connect(new InetSocketAddress(RemotePreferences.getIpAddress(), port), TIMEOUT);
         return new Protocol(socket);
     }
 }
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 a959c311d5e..3696be6316d 100644
--- a/src/main/java/org/jabref/logic/remote/server/RemoteListenerServer.java
+++ b/src/main/java/org/jabref/logic/remote/server/RemoteListenerServer.java
@@ -13,9 +13,7 @@
 
 public class RemoteListenerServer implements Runnable {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(
-        RemoteListenerServer.class
-    );
+    private static final Logger LOGGER = LoggerFactory.getLogger(RemoteListenerServer.class);
 
     private static final int BACKLOG = 1;
 
@@ -24,10 +22,8 @@ public class RemoteListenerServer implements Runnable {
     private final RemoteMessageHandler messageHandler;
     private final ServerSocket serverSocket;
 
-    public RemoteListenerServer(RemoteMessageHandler messageHandler, int port)
-        throws IOException {
-        this.serverSocket =
-            new ServerSocket(port, BACKLOG, RemotePreferences.getIpAddress());
+    public RemoteListenerServer(RemoteMessageHandler messageHandler, int port) throws IOException {
+        this.serverSocket = new ServerSocket(port, BACKLOG, RemotePreferences.getIpAddress());
         this.messageHandler = messageHandler;
     }
 
@@ -39,13 +35,8 @@ public void run() {
                     socket.setSoTimeout(TIMEOUT);
 
                     try (Protocol protocol = new Protocol(socket)) {
-                        Pair<RemoteMessage, Object> input =
-                            protocol.receiveMessage();
-                        handleMessage(
-                            protocol,
-                            input.getKey(),
-                            input.getValue()
-                        );
+                        Pair<RemoteMessage, Object> input = protocol.receiveMessage();
+                        handleMessage(protocol, input.getKey(), input.getValue());
                     }
                 } catch (SocketException ex) {
                     return;
@@ -58,11 +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);
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 60b1e492449..bacd074646f 100644
--- a/src/main/java/org/jabref/logic/remote/server/RemoteListenerServerManager.java
+++ b/src/main/java/org/jabref/logic/remote/server/RemoteListenerServerManager.java
@@ -16,9 +16,7 @@
  */
 public class RemoteListenerServerManager implements AutoCloseable {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(
-        RemoteListenerServerManager.class
-    );
+    private static final Logger LOGGER = LoggerFactory.getLogger(RemoteListenerServerManager.class);
 
     private RemoteListenerServerThread remoteServerThread;
 
@@ -39,8 +37,7 @@ public void open(RemoteMessageHandler messageHandler, int port) {
         }
 
         try {
-            remoteServerThread =
-                new RemoteListenerServerThread(messageHandler, port);
+            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" +
@@ -61,17 +58,14 @@ public boolean isOpen() {
     public void start() {
         if (isOpen() && isNotStartedBefore()) {
             // threads can only be started when in state NEW
-            JabRefExecutorService.INSTANCE.startRemoteThread(
-                remoteServerThread
-            );
+            JabRefExecutorService.INSTANCE.startRemoteThread(remoteServerThread);
         }
     }
 
     public boolean isNotStartedBefore() {
         // threads can only be started when in state NEW
         return (
-            (remoteServerThread == null) ||
-            (remoteServerThread.getState() == Thread.State.NEW)
+            (remoteServerThread == null) || (remoteServerThread.getState() == Thread.State.NEW)
         );
     }
 
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 431b85241bb..24109243a25 100644
--- a/src/main/java/org/jabref/logic/remote/server/RemoteListenerServerThread.java
+++ b/src/main/java/org/jabref/logic/remote/server/RemoteListenerServerThread.java
@@ -9,16 +9,12 @@
  */
 public class RemoteListenerServerThread extends Thread {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(
-        RemoteListenerServerThread.class
-    );
+    private static final Logger LOGGER = LoggerFactory.getLogger(RemoteListenerServerThread.class);
 
     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 eae2b950a93..e1cf7f79f7e 100644
--- a/src/main/java/org/jabref/logic/search/DatabaseSearcher.java
+++ b/src/main/java/org/jabref/logic/search/DatabaseSearcher.java
@@ -12,9 +12,7 @@
 
 public class DatabaseSearcher {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(
-        DatabaseSearcher.class
-    );
+    private static final Logger LOGGER = LoggerFactory.getLogger(DatabaseSearcher.class);
     private final SearchQuery query;
 
     private final BibDatabase database;
diff --git a/src/main/java/org/jabref/logic/search/SearchQuery.java b/src/main/java/org/jabref/logic/search/SearchQuery.java
index ef369fb9890..1db64ed7795 100644
--- a/src/main/java/org/jabref/logic/search/SearchQuery.java
+++ b/src/main/java/org/jabref/logic/search/SearchQuery.java
@@ -38,17 +38,16 @@ String format(String regex) {
         JAVASCRIPT {
             @Override
             String format(String regex) {
-                return JAVASCRIPT_ESCAPED_CHARS_PATTERN
-                    .matcher(regex)
-                    .replaceAll("\\\\$0");
+                return JAVASCRIPT_ESCAPED_CHARS_PATTERN.matcher(regex).replaceAll("\\\\$0");
             }
         };
 
         /**
          * 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.
@@ -63,10 +62,7 @@ String format(String regex) {
     private EnumSet<SearchRules.SearchFlags> searchFlags;
     private final SearchRule rule;
 
-    public SearchQuery(
-        String query,
-        EnumSet<SearchRules.SearchFlags> searchFlags
-    ) {
+    public SearchQuery(String query, EnumSet<SearchRules.SearchFlags> searchFlags) {
         this.query = Objects.requireNonNull(query);
         this.searchFlags = searchFlags;
         this.rule = SearchRules.getSearchRuleByQuery(query, searchFlags);
@@ -194,16 +190,12 @@ private Optional<Pattern> joinWordsToPattern(EscapeMode escapeMode) {
             // Reformat string when we are looking for a literal match
             joiner = joiner.map(escapeMode::format);
         }
-        String searchPattern = joiner.collect(
-            Collectors.joining(")|(", "(", ")")
-        );
+        String searchPattern = joiner.collect(Collectors.joining(")|(", "(", ")"));
 
         if (searchFlags.contains(SearchRules.SearchFlags.CASE_SENSITIVE)) {
             return Optional.of(Pattern.compile(searchPattern));
         } else {
-            return Optional.of(
-                Pattern.compile(searchPattern, Pattern.CASE_INSENSITIVE)
-            );
+            return Optional.of(Pattern.compile(searchPattern, Pattern.CASE_INSENSITIVE));
         }
     }
 
diff --git a/src/main/java/org/jabref/logic/shared/DBMSConnection.java b/src/main/java/org/jabref/logic/shared/DBMSConnection.java
index ebf2aa2ab9a..6a0b3749da4 100644
--- a/src/main/java/org/jabref/logic/shared/DBMSConnection.java
+++ b/src/main/java/org/jabref/logic/shared/DBMSConnection.java
@@ -12,9 +12,7 @@
 
 public class DBMSConnection implements DatabaseConnection {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(
-        DBMSConnection.class
-    );
+    private static final Logger LOGGER = LoggerFactory.getLogger(DBMSConnection.class);
 
     private final Connection connection;
     private final DBMSConnectionProperties properties;
@@ -71,12 +69,7 @@ public static Set<DBMSType> getAvailableDBMSTypes() {
                 dbmsTypes.add(dbms);
             } catch (ClassNotFoundException e) {
                 // In case that the driver is not available do not perform tests for this system.
-                LOGGER.info(
-                    Localization.lang(
-                        "%0 driver not available.",
-                        dbms.toString()
-                    )
-                );
+                LOGGER.info(Localization.lang("%0 driver not available.", dbms.toString()));
             }
         }
         return dbmsTypes;
diff --git a/src/main/java/org/jabref/logic/shared/DBMSConnectionProperties.java b/src/main/java/org/jabref/logic/shared/DBMSConnectionProperties.java
index d86d074361c..75902bd8221 100644
--- a/src/main/java/org/jabref/logic/shared/DBMSConnectionProperties.java
+++ b/src/main/java/org/jabref/logic/shared/DBMSConnectionProperties.java
@@ -15,9 +15,7 @@
  */
 public class DBMSConnectionProperties implements DatabaseConnectionProperties {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(
-        DBMSConnectionProperties.class
-    );
+    private static final Logger LOGGER = LoggerFactory.getLogger(DBMSConnectionProperties.class);
 
     private DBMSType type;
     private String host;
@@ -37,27 +35,19 @@ public class DBMSConnectionProperties implements DatabaseConnectionProperties {
      */
     public DBMSConnectionProperties(SharedDatabasePreferences prefs) {
         if (prefs.getType().isPresent()) {
-            Optional<DBMSType> dbmsType = DBMSType.fromString(
-                prefs.getType().get()
-            );
+            Optional<DBMSType> dbmsType = DBMSType.fromString(prefs.getType().get());
             if (dbmsType.isPresent()) {
                 this.type = dbmsType.get();
             }
         }
 
         prefs.getHost().ifPresent(theHost -> this.host = theHost);
-        prefs
-            .getPort()
-            .ifPresent(thePort -> this.port = Integer.parseInt(thePort));
+        prefs.getPort().ifPresent(thePort -> this.port = Integer.parseInt(thePort));
         prefs.getName().ifPresent(theDatabase -> this.database = theDatabase);
-        prefs
-            .getKeyStoreFile()
-            .ifPresent(theKeystore -> this.keyStore = theKeystore);
+        prefs.getKeyStoreFile().ifPresent(theKeystore -> this.keyStore = theKeystore);
         prefs
             .getServerTimezone()
-            .ifPresent(theServerTimezone ->
-                this.serverTimezone = theServerTimezone
-            );
+            .ifPresent(theServerTimezone -> this.serverTimezone = theServerTimezone);
         this.useSSL = prefs.isUseSSL();
 
         if (prefs.getUser().isPresent()) {
@@ -65,14 +55,9 @@ public DBMSConnectionProperties(SharedDatabasePreferences prefs) {
             if (prefs.getPassword().isPresent()) {
                 try {
                     this.password =
-                        new Password(
-                            prefs.getPassword().get().toCharArray(),
-                            prefs.getUser().get()
-                        )
+                        new Password(prefs.getPassword().get().toCharArray(), prefs.getUser().get())
                             .decrypt();
-                } catch (
-                    UnsupportedEncodingException | GeneralSecurityException e
-                ) {
+                } catch (UnsupportedEncodingException | GeneralSecurityException e) {
                     LOGGER.error("Could not decrypt password", e);
                 }
             }
@@ -173,10 +158,7 @@ public Properties asProperties() {
             props.setProperty("useSSL", Boolean.toString(useSSL));
         }
         if (allowPublicKeyRetrieval) {
-            props.setProperty(
-                "allowPublicKeyRetrieval",
-                Boolean.toString(allowPublicKeyRetrieval)
-            );
+            props.setProperty("allowPublicKeyRetrieval", Boolean.toString(allowPublicKeyRetrieval));
         }
         return props;
     }
@@ -206,10 +188,7 @@ public boolean equals(Object obj) {
             Objects.equals(database, properties.getDatabase()) &&
             Objects.equals(user, properties.getUser()) &&
             Objects.equals(useSSL, properties.isUseSSL()) &&
-            Objects.equals(
-                allowPublicKeyRetrieval,
-                properties.isAllowPublicKeyRetrieval()
-            ) &&
+            Objects.equals(allowPublicKeyRetrieval, properties.isAllowPublicKeyRetrieval()) &&
             Objects.equals(serverTimezone, properties.getServerTimezone())
         );
     }
diff --git a/src/main/java/org/jabref/logic/shared/DBMSConnectionPropertiesBuilder.java b/src/main/java/org/jabref/logic/shared/DBMSConnectionPropertiesBuilder.java
index b4024b4dc6a..ad4c72855a0 100644
--- a/src/main/java/org/jabref/logic/shared/DBMSConnectionPropertiesBuilder.java
+++ b/src/main/java/org/jabref/logic/shared/DBMSConnectionPropertiesBuilder.java
@@ -55,9 +55,7 @@ public DBMSConnectionPropertiesBuilder setAllowPublicKeyRetrieval(
         return this;
     }
 
-    public DBMSConnectionPropertiesBuilder setServerTimezone(
-        String serverTimezone
-    ) {
+    public DBMSConnectionPropertiesBuilder setServerTimezone(String serverTimezone) {
         this.serverTimezone = serverTimezone;
         return this;
     }
diff --git a/src/main/java/org/jabref/logic/shared/DBMSProcessor.java b/src/main/java/org/jabref/logic/shared/DBMSProcessor.java
index 019336ce625..8db18fabc4a 100644
--- a/src/main/java/org/jabref/logic/shared/DBMSProcessor.java
+++ b/src/main/java/org/jabref/logic/shared/DBMSProcessor.java
@@ -36,9 +36,7 @@ public abstract class DBMSProcessor {
 
     public static final String PROCESSOR_ID = UUID.randomUUID().toString();
 
-    protected static final Logger LOGGER = LoggerFactory.getLogger(
-        DBMSProcessor.class
-    );
+    protected static final Logger LOGGER = LoggerFactory.getLogger(DBMSProcessor.class);
 
     protected final Connection connection;
 
@@ -63,17 +61,14 @@ public boolean checkBaseIntegrity() throws SQLException {
             String metadataVersion = metadata.get(MetaData.VERSION_DB_STRUCT);
             if (metadataVersion != null) {
                 int VERSION_DB_STRUCT = Integer.parseInt(
-                    metadata
-                        .getOrDefault(MetaData.VERSION_DB_STRUCT, "")
-                        .replace(";", "")
+                    metadata.getOrDefault(MetaData.VERSION_DB_STRUCT, "").replace(";", "")
                 );
                 if (VERSION_DB_STRUCT == getCURRENT_VERSION_DB_STRUCT()) {
                     databasePassesIntegrityCheck = true;
                 }
             }
         } else {
-            databasePassesIntegrityCheck =
-                checkTableAvailability("ENTRY", "FIELD", "METADATA");
+            databasePassesIntegrityCheck = checkTableAvailability("ENTRY", "FIELD", "METADATA");
         }
         return databasePassesIntegrityCheck;
     }
@@ -101,8 +96,7 @@ public boolean databaseIsAtMostJabRef35() throws SQLException {
      * @param tableNames Table names to be checked
      * @return <code>true</code> if <b>all</b> given tables are present, else <code>false</code>.
      */
-    protected boolean checkTableAvailability(String... tableNames)
-        throws SQLException {
+    protected boolean checkTableAvailability(String... tableNames) throws SQLException {
         List<String> requiredTables = new ArrayList<>();
         for (String name : tableNames) {
             requiredTables.add(name.toUpperCase(Locale.ENGLISH));
@@ -111,12 +105,7 @@ protected boolean checkTableAvailability(String... tableNames)
         DatabaseMetaData databaseMetaData = connection.getMetaData();
         // ...getTables(null, ...): no restrictions
         try (
-            ResultSet databaseMetaDataResultSet = databaseMetaData.getTables(
-                null,
-                null,
-                null,
-                null
-            )
+            ResultSet databaseMetaDataResultSet = databaseMetaData.getTables(null, null, null, null)
         ) {
             while (databaseMetaDataResultSet.next()) {
                 String tableName = databaseMetaDataResultSet
@@ -180,9 +169,7 @@ public void insertEntry(BibEntry bibEntry) {
      * @param bibEntries List of {@link BibEntry} to be inserted
      */
     public void insertEntries(List<BibEntry> bibEntries) {
-        List<BibEntry> notYetExistingEntries = getNotYetExistingEntries(
-            bibEntries
-        );
+        List<BibEntry> notYetExistingEntries = getNotYetExistingEntries(bibEntries);
         if (notYetExistingEntries.isEmpty()) {
             return;
         }
@@ -203,9 +190,7 @@ protected void insertIntoEntryTable(List<BibEntry> bibEntries) {
             .append(escape("TYPE"))
             .append(") VALUES(?)");
         // Number of commas is bibEntries.size() - 1
-        insertIntoEntryQuery.append(
-            ", (?)".repeat(Math.max(0, (bibEntries.size() - 1)))
-        );
+        insertIntoEntryQuery.append(", (?)".repeat(Math.max(0, (bibEntries.size() - 1))));
 
         try (
             PreparedStatement preparedEntryStatement = connection.prepareStatement(
@@ -214,23 +199,16 @@ protected void insertIntoEntryTable(List<BibEntry> bibEntries) {
             )
         ) {
             for (int i = 0; i < bibEntries.size(); i++) {
-                preparedEntryStatement.setString(
-                    i + 1,
-                    bibEntries.get(i).getType().getName()
-                );
+                preparedEntryStatement.setString(i + 1, bibEntries.get(i).getType().getName());
             }
             preparedEntryStatement.executeUpdate();
 
-            try (
-                ResultSet generatedKeys = preparedEntryStatement.getGeneratedKeys()
-            ) {
+            try (ResultSet generatedKeys = preparedEntryStatement.getGeneratedKeys()) {
                 // 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();
-                    bibEntry
-                        .getSharedBibEntryData()
-                        .setSharedID(generatedKeys.getInt(1));
+                    bibEntry.getSharedBibEntryData().setSharedID(generatedKeys.getInt(1));
                 }
                 if (generatedKeys.next()) {
                     LOGGER.error("Error: Some shared IDs left unassigned");
@@ -261,11 +239,7 @@ private List<BibEntry> getNotYetExistingEntries(List<BibEntry> bibEntries) {
         try {
             String selectQuery = "SELECT * FROM " + escape_Table("ENTRY");
 
-            try (
-                ResultSet resultSet = connection
-                    .createStatement()
-                    .executeQuery(selectQuery)
-            ) {
+            try (ResultSet resultSet = connection.createStatement().executeQuery(selectQuery)) {
                 while (resultSet.next()) {
                     int id = resultSet.getInt("SHARED_ID");
                     remoteIds.add(id);
@@ -276,9 +250,7 @@ private List<BibEntry> getNotYetExistingEntries(List<BibEntry> bibEntries) {
         }
         return bibEntries
             .stream()
-            .filter(entry ->
-                !remoteIds.contains(entry.getSharedBibEntryData().getSharedID())
-            )
+            .filter(entry -> !remoteIds.contains(entry.getSharedBibEntryData().getSharedID()))
             .collect(Collectors.toList());
     }
 
@@ -316,20 +288,14 @@ protected void insertIntoFieldTable(List<BibEntry> bibEntries) {
             }
 
             // Number of commas is fields.size() - 1
-            insertFieldQuery.append(
-                ", (?, ?, ?)".repeat(Math.max(0, (numFields - 1)))
-            );
+            insertFieldQuery.append(", (?, ?, ?)".repeat(Math.max(0, (numFields - 1))));
             try (
                 PreparedStatement preparedFieldStatement = connection.prepareStatement(
                     insertFieldQuery.toString()
                 )
             ) {
                 int fieldsCompleted = 0;
-                for (
-                    int entryIndex = 0;
-                    entryIndex < fields.size();
-                    entryIndex++
-                ) {
+                for (int entryIndex = 0; entryIndex < fields.size(); entryIndex++) {
                     for (
                         int entryFieldsIndex = 0;
                         entryFieldsIndex < fields.get(entryIndex).size();
@@ -338,25 +304,17 @@ protected void insertIntoFieldTable(List<BibEntry> bibEntries) {
                         // columnIndex starts with 1
                         preparedFieldStatement.setInt(
                             (3 * fieldsCompleted) + 1,
-                            bibEntries
-                                .get(entryIndex)
-                                .getSharedBibEntryData()
-                                .getSharedID()
+                            bibEntries.get(entryIndex).getSharedBibEntryData().getSharedID()
                         );
                         preparedFieldStatement.setString(
                             (3 * fieldsCompleted) + 2,
-                            fields
-                                .get(entryIndex)
-                                .get(entryFieldsIndex)
-                                .getName()
+                            fields.get(entryIndex).get(entryFieldsIndex).getName()
                         );
                         preparedFieldStatement.setString(
                             (3 * fieldsCompleted) + 3,
                             bibEntries
                                 .get(entryIndex)
-                                .getField(
-                                    fields.get(entryIndex).get(entryFieldsIndex)
-                                )
+                                .getField(fields.get(entryIndex).get(entryFieldsIndex))
                                 .get()
                         );
                         fieldsCompleted += 1;
@@ -375,8 +333,7 @@ protected void insertIntoFieldTable(List<BibEntry> bibEntries) {
      * @param localBibEntry {@link BibEntry} affected by changes
      * @throws SQLException in case of error
      */
-    public void updateEntry(BibEntry localBibEntry)
-        throws OfflineLockException, SQLException {
+    public void updateEntry(BibEntry localBibEntry) throws OfflineLockException, SQLException {
         connection.setAutoCommit(false); // disable auto commit due to transaction
 
         try {
@@ -446,10 +403,8 @@ public void updateEntry(BibEntry localBibEntry)
     /**
      * 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) {
@@ -481,8 +436,7 @@ private void removeSharedFieldsByDifference(
      * Helping method. Inserts a key-value pair into FIELD table for every field if not existing. Otherwise only an
      * update is performed.
      */
-    private void insertOrUpdateFields(BibEntry localBibEntry)
-        throws SQLException {
+    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!
             Optional<String> valueOptional = localBibEntry.getField(field);
@@ -511,9 +465,7 @@ private void insertOrUpdateFields(BibEntry localBibEntry)
                     localBibEntry.getSharedBibEntryData().getSharedID()
                 );
 
-                try (
-                    ResultSet selectFieldResultSet = preparedSelectFieldStatement.executeQuery()
-                ) {
+                try (ResultSet selectFieldResultSet = preparedSelectFieldStatement.executeQuery()) {
                     if (selectFieldResultSet.next()) { // check if field already exists
                         String updateFieldQuery =
                             "UPDATE " +
@@ -532,15 +484,10 @@ private void insertOrUpdateFields(BibEntry localBibEntry)
                             )
                         ) {
                             preparedUpdateFieldStatement.setString(1, value);
-                            preparedUpdateFieldStatement.setString(
-                                2,
-                                field.getName()
-                            );
+                            preparedUpdateFieldStatement.setString(2, field.getName());
                             preparedUpdateFieldStatement.setInt(
                                 3,
-                                localBibEntry
-                                    .getSharedBibEntryData()
-                                    .getSharedID()
+                                localBibEntry.getSharedBibEntryData().getSharedID()
                             );
                             preparedUpdateFieldStatement.executeUpdate();
                         }
@@ -563,14 +510,9 @@ private void insertOrUpdateFields(BibEntry localBibEntry)
                         ) {
                             preparedFieldStatement.setInt(
                                 1,
-                                localBibEntry
-                                    .getSharedBibEntryData()
-                                    .getSharedID()
-                            );
-                            preparedFieldStatement.setString(
-                                2,
-                                field.getName()
+                                localBibEntry.getSharedBibEntryData().getSharedID()
                             );
+                            preparedFieldStatement.setString(2, field.getName());
                             preparedFieldStatement.setString(3, value);
                             preparedFieldStatement.executeUpdate();
                         }
@@ -599,11 +541,7 @@ public void removeEntries(List<BibEntry> bibEntries) {
         query.append("?, ".repeat(bibEntries.size() - 1));
         query.append("?)");
 
-        try (
-            PreparedStatement preparedStatement = connection.prepareStatement(
-                query.toString()
-            )
-        ) {
+        try (PreparedStatement preparedStatement = connection.prepareStatement(query.toString())) {
             for (int j = 0; j < bibEntries.size(); j++) {
                 preparedStatement.setInt(
                     j + 1,
@@ -621,9 +559,7 @@ public void removeEntries(List<BibEntry> bibEntries) {
      * @return instance of {@link BibEntry}
      */
     public Optional<BibEntry> getSharedEntry(int sharedID) {
-        List<BibEntry> sharedEntries = getSharedEntries(
-            Collections.singletonList(sharedID)
-        );
+        List<BibEntry> sharedEntries = getSharedEntries(Collections.singletonList(sharedID));
         if (sharedEntries.isEmpty()) {
             return Optional.empty();
         } else {
@@ -637,9 +573,7 @@ public Optional<BibEntry> getSharedEntry(int sharedID) {
      *
      * @param sharedIDs the list of Ids to filter. If list is empty, then no filter is applied
      */
-    public List<BibEntry> partitionAndGetSharedEntries(
-        List<Integer> sharedIDs
-    ) {
+    public List<BibEntry> partitionAndGetSharedEntries(List<Integer> sharedIDs) {
         List<List<Integer>> partitions = Lists.partition(sharedIDs, 500);
         List<BibEntry> result = new ArrayList<>();
 
@@ -704,18 +638,12 @@ public List<BibEntry> getSharedEntries(List<Integer> sharedIDs) {
         }
         query.append(" order by ").append(escape("SHARED_ID"));
 
-        try (
-            PreparedStatement preparedStatement = connection.prepareStatement(
-                query.toString()
-            )
-        ) {
+        try (PreparedStatement preparedStatement = connection.prepareStatement(query.toString())) {
             for (int i = 0; i < sharedIDs.size(); i++) {
                 preparedStatement.setInt(i + 1, sharedIDs.get(i));
             }
 
-            try (
-                ResultSet selectEntryResultSet = preparedStatement.executeQuery()
-            ) {
+            try (ResultSet selectEntryResultSet = preparedStatement.executeQuery()) {
                 BibEntry bibEntry = null;
                 int lastId = -1;
                 while (selectEntryResultSet.next()) {
@@ -725,13 +653,9 @@ public List<BibEntry> getSharedEntries(List<Integer> sharedIDs) {
                         bibEntry = new BibEntry();
                         bibEntry
                             .getSharedBibEntryData()
-                            .setSharedID(
-                                selectEntryResultSet.getInt("SHARED_ID")
-                            );
+                            .setSharedID(selectEntryResultSet.getInt("SHARED_ID"));
                         bibEntry.setType(
-                            EntryTypeFactory.parse(
-                                selectEntryResultSet.getString("TYPE")
-                            )
+                            EntryTypeFactory.parse(selectEntryResultSet.getString("TYPE"))
                         );
                         bibEntry
                             .getSharedBibEntryData()
@@ -744,9 +668,7 @@ public List<BibEntry> getSharedEntries(List<Integer> sharedIDs) {
                     String value = selectEntryResultSet.getString("VALUE");
                     if (value != null && bibEntry != null) {
                         bibEntry.setField(
-                            FieldFactory.parseField(
-                                selectEntryResultSet.getString("NAME")
-                            ),
+                            FieldFactory.parseField(selectEntryResultSet.getString("NAME")),
                             value,
                             EntriesEventSource.SHARED
                         );
@@ -772,10 +694,7 @@ 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");
+            "SELECT * FROM " + escape_Table("ENTRY") + " ORDER BY " + escape("SHARED_ID");
 
         try (
             ResultSet selectEntryResultSet = connection
@@ -807,10 +726,7 @@ public Map<String, String> getSharedMetaData() {
                 .executeQuery("SELECT * FROM " + escape_Table("METADATA"))
         ) {
             while (resultSet.next()) {
-                data.put(
-                    resultSet.getString("KEY"),
-                    resultSet.getString("VALUE")
-                );
+                data.put(resultSet.getString("KEY"), resultSet.getString("VALUE"));
             }
         } catch (SQLException e) {
             LOGGER.error("SQL Error", e);
@@ -824,8 +740,7 @@ public Map<String, String> getSharedMetaData() {
      *
      * @param data JabRef meta data as map
      */
-    public void setSharedMetaData(Map<String, String> data)
-        throws SQLException {
+    public void setSharedMetaData(Map<String, String> data) throws SQLException {
         StringBuilder updateQuery = new StringBuilder()
             .append("UPDATE ")
             .append(escape_Table("METADATA"))
@@ -876,9 +791,7 @@ public void setSharedMetaData(Map<String, String> data)
     /**
      * Returns a new instance of the abstract type {@link DBMSProcessor}
      */
-    public static DBMSProcessor getProcessorInstance(
-        DatabaseConnection connection
-    ) {
+    public static DBMSProcessor getProcessorInstance(DatabaseConnection connection) {
         DBMSType type = connection.getProperties().getType();
         if (type == DBMSType.MYSQL) {
             return new MySQLProcessor(connection);
diff --git a/src/main/java/org/jabref/logic/shared/DBMSSynchronizer.java b/src/main/java/org/jabref/logic/shared/DBMSSynchronizer.java
index 3e8e3bf72ca..17d7288a2d9 100644
--- a/src/main/java/org/jabref/logic/shared/DBMSSynchronizer.java
+++ b/src/main/java/org/jabref/logic/shared/DBMSSynchronizer.java
@@ -40,9 +40,7 @@
  */
 public class DBMSSynchronizer implements DatabaseSynchronizer {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(
-        DBMSSynchronizer.class
-    );
+    private static final Logger LOGGER = LoggerFactory.getLogger(DBMSSynchronizer.class);
 
     private DBMSProcessor dbmsProcessor;
     private String dbName;
@@ -68,8 +66,7 @@ public DBMSSynchronizer(
         this.fileMonitor = fileMonitor;
         this.eventBus = new EventBus();
         this.keywordSeparator = keywordSeparator;
-        this.globalCiteKeyPattern =
-            Objects.requireNonNull(globalCiteKeyPattern);
+        this.globalCiteKeyPattern = Objects.requireNonNull(globalCiteKeyPattern);
         this.lastEntryChanged = Optional.empty();
     }
 
@@ -135,10 +132,7 @@ public void listen(EntriesRemovedEvent event) {
     @Subscribe
     public void listen(MetaDataChangedEvent event) {
         if (checkCurrentConnection()) {
-            synchronizeSharedMetaData(
-                event.getMetaData(),
-                globalCiteKeyPattern
-            );
+            synchronizeSharedMetaData(event.getMetaData(), globalCiteKeyPattern);
             synchronizeLocalDatabase();
             applyMetaData();
             dbmsProcessor.notifyClients();
@@ -185,35 +179,25 @@ public void synchronizeLocalDatabase() {
         }
 
         List<BibEntry> localEntries = bibDatabase.getEntries();
-        Map<Integer, Integer> idVersionMap =
-            dbmsProcessor.getSharedIDVersionMapping();
+        Map<Integer, Integer> idVersionMap = dbmsProcessor.getSharedIDVersionMapping();
 
         // remove old entries locally
         removeNotSharedEntries(localEntries, idVersionMap.keySet());
         List<Integer> entriesToInsertIntoLocalDatabase = new ArrayList<>();
         // compare versions and update local entry if needed
-        for (Map.Entry<
-            Integer,
-            Integer
-        > idVersionEntry : idVersionMap.entrySet()) {
+        for (Map.Entry<Integer, Integer> idVersionEntry : idVersionMap.entrySet()) {
             boolean remoteEntryMatchingOneLocalEntryFound = false;
             for (BibEntry localEntry : localEntries) {
                 if (
-                    idVersionEntry
-                        .getKey()
-                        .equals(
-                            localEntry.getSharedBibEntryData().getSharedID()
-                        )
+                    idVersionEntry.getKey().equals(localEntry.getSharedBibEntryData().getSharedID())
                 ) {
                     remoteEntryMatchingOneLocalEntryFound = true;
                     if (
-                        idVersionEntry.getValue() >
-                        localEntry.getSharedBibEntryData().getVersion()
+                        idVersionEntry.getValue() > localEntry.getSharedBibEntryData().getVersion()
                     ) {
-                        Optional<BibEntry> sharedEntry =
-                            dbmsProcessor.getSharedEntry(
-                                idVersionEntry.getKey()
-                            );
+                        Optional<BibEntry> sharedEntry = dbmsProcessor.getSharedEntry(
+                            idVersionEntry.getKey()
+                        );
                         if (sharedEntry.isPresent()) {
                             // update fields
                             localEntry.setType(
@@ -222,36 +206,21 @@ public void synchronizeLocalDatabase() {
                             );
                             localEntry
                                 .getSharedBibEntryData()
-                                .setVersion(
-                                    sharedEntry
-                                        .get()
-                                        .getSharedBibEntryData()
-                                        .getVersion()
-                                );
+                                .setVersion(sharedEntry.get().getSharedBibEntryData().getVersion());
                             sharedEntry
                                 .get()
                                 .getFieldMap()
-                                .forEach(// copy remote values to local entry
-                                (field, value) ->
-                                    localEntry.setField(
-                                        field,
-                                        value,
-                                        EntriesEventSource.SHARED
-                                    )
+                                .forEach((field, value) -> // copy remote values to local entry
+                                    localEntry.setField(field, value, EntriesEventSource.SHARED)
                                 );
 
                             // locally remove not existing fields
                             localEntry
                                 .getFields()
                                 .stream()
-                                .filter(field ->
-                                    !sharedEntry.get().hasField(field)
-                                )
+                                .filter(field -> !sharedEntry.get().hasField(field))
                                 .forEach(field ->
-                                    localEntry.clearField(
-                                        field,
-                                        EntriesEventSource.SHARED
-                                    )
+                                    localEntry.clearField(field, EntriesEventSource.SHARED)
                                 );
                         }
                     }
@@ -265,9 +234,7 @@ public void synchronizeLocalDatabase() {
         if (!entriesToInsertIntoLocalDatabase.isEmpty()) {
             // in case entries should be added into the local database, insert them
             bibDatabase.insertEntries(
-                dbmsProcessor.partitionAndGetSharedEntries(
-                    entriesToInsertIntoLocalDatabase
-                ),
+                dbmsProcessor.partitionAndGetSharedEntries(entriesToInsertIntoLocalDatabase),
                 EntriesEventSource.SHARED
             );
         }
@@ -279,25 +246,17 @@ public void synchronizeLocalDatabase() {
      * @param localEntries List of {@link BibEntry} the entries should be removed from
      * @param sharedIDs    Set of all IDs which are present on shared database
      */
-    private void removeNotSharedEntries(
-        List<BibEntry> localEntries,
-        Set<Integer> sharedIDs
-    ) {
+    private void removeNotSharedEntries(List<BibEntry> localEntries, Set<Integer> sharedIDs) {
         List<BibEntry> entriesToRemove = localEntries
             .stream()
             .filter(localEntry ->
-                !sharedIDs.contains(
-                    localEntry.getSharedBibEntryData().getSharedID()
-                )
+                !sharedIDs.contains(localEntry.getSharedBibEntryData().getSharedID())
             )
             .collect(Collectors.toList());
         if (!entriesToRemove.isEmpty()) {
             eventBus.post(new SharedEntriesNotPresentEvent(entriesToRemove));
             // remove all non-shared entries without triggering listeners
-            bibDatabase.removeEntries(
-                entriesToRemove,
-                EntriesEventSource.SHARED
-            );
+            bibDatabase.removeEntries(entriesToRemove, EntriesEventSource.SHARED);
         }
     }
 
@@ -336,11 +295,7 @@ public void synchronizeLocalMetaData() {
         try {
             metaData.setEventPropagation(false);
             MetaDataParser parser = new MetaDataParser(fileMonitor);
-            parser.parse(
-                metaData,
-                dbmsProcessor.getSharedMetaData(),
-                keywordSeparator
-            );
+            parser.parse(metaData, dbmsProcessor.getSharedMetaData(), keywordSeparator);
             metaData.setEventPropagation(true);
         } catch (ParseException e) {
             LOGGER.error("Parse error", e);
@@ -359,10 +314,7 @@ private void synchronizeSharedMetaData(
         }
         try {
             dbmsProcessor.setSharedMetaData(
-                MetaDataSerializer.getSerializedStringMap(
-                    data,
-                    globalCiteKeyPattern
-                )
+                MetaDataSerializer.getSerializedStringMap(data, globalCiteKeyPattern)
             );
         } catch (SQLException e) {
             LOGGER.error("SQL Error: ", e);
@@ -379,11 +331,7 @@ public void applyMetaData() {
         for (BibEntry bibEntry : bibDatabase.getEntries()) {
             try {
                 // synchronize only if changes were present
-                if (
-                    !BibDatabaseWriter
-                        .applySaveActions(bibEntry, metaData)
-                        .isEmpty()
-                ) {
+                if (!BibDatabaseWriter.applySaveActions(bibEntry, metaData).isEmpty()) {
                     dbmsProcessor.updateEntry(bibEntry);
                 }
             } catch (OfflineLockException exception) {
@@ -433,10 +381,7 @@ public void pullLastEntryChanges() {
      * Synchronizes local BibEntries and pulls remaining last entry changes
      */
     private void pullWithLastEntry() {
-        if (
-            !lastEntryChanged.isEmpty() &&
-            isPresentLocalBibEntry(lastEntryChanged.get())
-        ) {
+        if (!lastEntryChanged.isEmpty() && isPresentLocalBibEntry(lastEntryChanged.get())) {
             synchronizeSharedEntry(lastEntryChanged.get());
         }
         lastEntryChanged = Optional.empty();
@@ -472,8 +417,7 @@ public boolean checkCurrentConnection() {
     public boolean isEventSourceAccepted(EntriesEvent event) {
         EntriesEventSource eventSource = event.getEntriesEventSource();
         return (
-            (eventSource == EntriesEventSource.LOCAL) ||
-            (eventSource == EntriesEventSource.UNDO)
+            (eventSource == EntriesEventSource.LOCAL) || (eventSource == EntriesEventSource.UNDO)
         );
     }
 
diff --git a/src/main/java/org/jabref/logic/shared/DBMSType.java b/src/main/java/org/jabref/logic/shared/DBMSType.java
index ebdec682a65..82944c503b4 100644
--- a/src/main/java/org/jabref/logic/shared/DBMSType.java
+++ b/src/main/java/org/jabref/logic/shared/DBMSType.java
@@ -7,31 +7,16 @@
  * Enumerates all supported database systems (DBMS) by JabRef.
  */
 public enum DBMSType {
-    POSTGRESQL(
-        "PostgreSQL",
-        "org.postgresql.Driver",
-        "jdbc:postgresql://%s:%d/%s",
-        5432
-    ),
+    POSTGRESQL("PostgreSQL", "org.postgresql.Driver", "jdbc:postgresql://%s:%d/%s", 5432),
     MYSQL("MySQL", "org.mariadb.jdbc.Driver", "jdbc:mariadb://%s:%d/%s", 3306),
-    ORACLE(
-        "Oracle",
-        "oracle.jdbc.driver.OracleDriver",
-        "jdbc:oracle:thin:@%s:%d/%s",
-        1521
-    );
+    ORACLE("Oracle", "oracle.jdbc.driver.OracleDriver", "jdbc:oracle:thin:@%s:%d/%s", 1521);
 
     private final String type;
     private final String driverPath;
     private final String urlPattern;
     private final int defaultPort;
 
-    private DBMSType(
-        String type,
-        String driverPath,
-        String urlPattern,
-        int defaultPort
-    ) {
+    private DBMSType(String type, String driverPath, String urlPattern, int defaultPort) {
         this.type = type;
         this.driverPath = driverPath;
         this.urlPattern = urlPattern;
diff --git a/src/main/java/org/jabref/logic/shared/DatabaseSynchronizer.java b/src/main/java/org/jabref/logic/shared/DatabaseSynchronizer.java
index 009c2355684..cbbaa35da4c 100644
--- a/src/main/java/org/jabref/logic/shared/DatabaseSynchronizer.java
+++ b/src/main/java/org/jabref/logic/shared/DatabaseSynchronizer.java
@@ -11,8 +11,7 @@ public interface DatabaseSynchronizer {
 
     void registerListener(Object listener);
 
-    void openSharedDatabase(DatabaseConnection connection)
-        throws DatabaseNotSupportedException;
+    void openSharedDatabase(DatabaseConnection connection) throws DatabaseNotSupportedException;
 
     void synchronizeSharedEntry(BibEntry bibEntry);
 
diff --git a/src/main/java/org/jabref/logic/shared/MySQLProcessor.java b/src/main/java/org/jabref/logic/shared/MySQLProcessor.java
index 314a8254cd0..41a56459aa0 100644
--- a/src/main/java/org/jabref/logic/shared/MySQLProcessor.java
+++ b/src/main/java/org/jabref/logic/shared/MySQLProcessor.java
@@ -73,31 +73,22 @@ public void setUp() throws SQLException {
                 connection
                     .createStatement()
                     .executeUpdate(
-                        "INSERT INTO " +
-                        escape_Table("ENTRY") +
-                        " SELECT * FROM `ENTRY`"
+                        "INSERT INTO " + escape_Table("ENTRY") + " SELECT * FROM `ENTRY`"
                     );
                 connection
                     .createStatement()
                     .executeUpdate(
-                        "INSERT INTO " +
-                        escape_Table("FIELD") +
-                        " SELECT * FROM `FIELD`"
+                        "INSERT INTO " + escape_Table("FIELD") + " SELECT * FROM `FIELD`"
                     );
                 connection
                     .createStatement()
                     .executeUpdate(
-                        "INSERT INTO " +
-                        escape_Table("METADATA") +
-                        " SELECT * FROM `METADATA`"
+                        "INSERT INTO " + escape_Table("METADATA") + " SELECT * FROM `METADATA`"
                     );
                 metadata = getSharedMetaData();
             }
 
-            metadata.put(
-                MetaData.VERSION_DB_STRUCT,
-                CURRENT_VERSION_DB_STRUCT.toString()
-            );
+            metadata.put(MetaData.VERSION_DB_STRUCT, CURRENT_VERSION_DB_STRUCT.toString());
             setSharedMetaData(metadata);
         }
     }
diff --git a/src/main/java/org/jabref/logic/shared/OracleProcessor.java b/src/main/java/org/jabref/logic/shared/OracleProcessor.java
index d66fb72351a..368c0f5bc27 100644
--- a/src/main/java/org/jabref/logic/shared/OracleProcessor.java
+++ b/src/main/java/org/jabref/logic/shared/OracleProcessor.java
@@ -52,9 +52,7 @@ public void setUp() throws SQLException {
                 "CONSTRAINT \"ENTRY_PK\" PRIMARY KEY (\"SHARED_ID\"))"
             );
 
-        connection
-            .createStatement()
-            .executeUpdate("CREATE SEQUENCE \"ENTRY_SEQ\"");
+        connection.createStatement().executeUpdate("CREATE SEQUENCE \"ENTRY_SEQ\"");
 
         connection
             .createStatement()
@@ -97,10 +95,7 @@ public void setUp() throws SQLException {
 
         if (VERSION_DB_STRUCT_DEFAULT < CURRENT_VERSION_DB_STRUCT) {
             // We can to migrate from old table in new table
-            metadata.put(
-                MetaData.VERSION_DB_STRUCT,
-                CURRENT_VERSION_DB_STRUCT.toString()
-            );
+            metadata.put(MetaData.VERSION_DB_STRUCT, CURRENT_VERSION_DB_STRUCT.toString());
             setSharedMetaData(metadata);
         }
     }
@@ -129,10 +124,7 @@ public void startNotificationListener(DBMSSynchronizer dbmsSynchronizer) {
 
             Properties properties = new Properties();
             properties.setProperty(OracleConnection.DCN_NOTIFY_ROWIDS, "true");
-            properties.setProperty(
-                OracleConnection.DCN_QUERY_CHANGE_NOTIFICATION,
-                "true"
-            );
+            properties.setProperty(OracleConnection.DCN_QUERY_CHANGE_NOTIFICATION, "true");
 
             databaseChangeRegistration =
                 oracleConnection.registerDatabaseChangeNotification(properties);
@@ -151,10 +143,7 @@ public void startNotificationListener(DBMSSynchronizer dbmsSynchronizer) {
                 statement.executeQuery(selectQuery.toString());
             }
         } catch (SQLException e) {
-            LOGGER.error(
-                "SQL Error during starting the notification listener",
-                e
-            );
+            LOGGER.error("SQL Error during starting the notification listener", e);
         }
     }
 
@@ -163,11 +152,7 @@ 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(
@@ -175,19 +160,12 @@ protected void insertIntoEntryTable(List<BibEntry> entries) {
                         new String[] { "SHARED_ID" }
                     )
                 ) {
-                    preparedEntryStatement.setString(
-                        1,
-                        entry.getType().getName()
-                    );
+                    preparedEntryStatement.setString(1, entry.getType().getName());
                     preparedEntryStatement.executeUpdate();
 
-                    try (
-                        ResultSet generatedKeys = preparedEntryStatement.getGeneratedKeys()
-                    ) {
+                    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
                         }
                     }
                 }
@@ -206,8 +184,7 @@ protected void insertIntoFieldTable(List<BibEntry> bibEntries) {
                 .stream()
                 .map(entry -> new ArrayList<>(entry.getFields()))
                 .collect(Collectors.toList());
-            StringBuilder insertFieldQuery = new StringBuilder()
-                .append("INSERT ALL");
+            StringBuilder insertFieldQuery = new StringBuilder().append("INSERT ALL");
             int numFields = 0;
             for (List<Field> entryFields : fields) {
                 numFields += entryFields.size();
@@ -231,11 +208,7 @@ protected void insertIntoFieldTable(List<BibEntry> bibEntries) {
                 )
             ) {
                 int fieldsCompleted = 0;
-                for (
-                    int entryIndex = 0;
-                    entryIndex < fields.size();
-                    entryIndex++
-                ) {
+                for (int entryIndex = 0; entryIndex < fields.size(); entryIndex++) {
                     for (
                         int entryFieldsIndex = 0;
                         entryFieldsIndex < fields.get(entryIndex).size();
@@ -244,25 +217,17 @@ protected void insertIntoFieldTable(List<BibEntry> bibEntries) {
                         // columnIndex starts with 1
                         preparedFieldStatement.setInt(
                             (3 * fieldsCompleted) + 1,
-                            bibEntries
-                                .get(entryIndex)
-                                .getSharedBibEntryData()
-                                .getSharedID()
+                            bibEntries.get(entryIndex).getSharedBibEntryData().getSharedID()
                         );
                         preparedFieldStatement.setString(
                             (3 * fieldsCompleted) + 2,
-                            fields
-                                .get(entryIndex)
-                                .get(entryFieldsIndex)
-                                .getName()
+                            fields.get(entryIndex).get(entryFieldsIndex).getName()
                         );
                         preparedFieldStatement.setString(
                             (3 * fieldsCompleted) + 3,
                             bibEntries
                                 .get(entryIndex)
-                                .getField(
-                                    fields.get(entryIndex).get(entryFieldsIndex)
-                                )
+                                .getField(fields.get(entryIndex).get(entryFieldsIndex))
                                 .get()
                         );
                         fieldsCompleted += 1;
@@ -278,15 +243,10 @@ protected void insertIntoFieldTable(List<BibEntry> bibEntries) {
     @Override
     public void stopNotificationListener() {
         try {
-            oracleConnection.unregisterDatabaseChangeNotification(
-                databaseChangeRegistration
-            );
+            oracleConnection.unregisterDatabaseChangeNotification(databaseChangeRegistration);
             oracleConnection.close();
         } catch (SQLException e) {
-            LOGGER.error(
-                "SQL Error during stopping the notification listener",
-                e
-            );
+            LOGGER.error("SQL Error during stopping the notification listener", e);
         }
     }
 
diff --git a/src/main/java/org/jabref/logic/shared/PostgreSQLProcessor.java b/src/main/java/org/jabref/logic/shared/PostgreSQLProcessor.java
index 5459bfbe0c3..fd403b9b2fa 100644
--- a/src/main/java/org/jabref/logic/shared/PostgreSQLProcessor.java
+++ b/src/main/java/org/jabref/logic/shared/PostgreSQLProcessor.java
@@ -34,17 +34,14 @@ public PostgreSQLProcessor(DatabaseConnection connection) {
     @Override
     public void setUp() throws SQLException {
         if (
-            CURRENT_VERSION_DB_STRUCT == 1 &&
-            checkTableAvailability("ENTRY", "FIELD", "METADATA")
+            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 SCHEMA IF NOT EXISTS jabref");
 
         connection
             .createStatement()
@@ -86,11 +83,7 @@ public void setUp() throws SQLException {
             try {
                 // replace semicolon so we can parse it
                 VERSION_DB_STRUCT_DEFAULT =
-                    Integer.parseInt(
-                        metadata
-                            .get(MetaData.VERSION_DB_STRUCT)
-                            .replace(";", "")
-                    );
+                    Integer.parseInt(metadata.get(MetaData.VERSION_DB_STRUCT).replace(";", ""));
             } catch (Exception e) {
                 LOGGER.warn("[VERSION_DB_STRUCT_DEFAULT] not Integer!");
             }
@@ -100,30 +93,22 @@ 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 (
-                VERSION_DB_STRUCT_DEFAULT == 0 && CURRENT_VERSION_DB_STRUCT == 1
-            ) {
+            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\""
+                        "INSERT INTO " + escape_Table("ENTRY") + " SELECT * FROM \"ENTRY\""
                     );
                 connection
                     .createStatement()
                     .executeUpdate(
-                        "INSERT INTO " +
-                        escape_Table("FIELD") +
-                        " SELECT * FROM \"FIELD\""
+                        "INSERT INTO " + escape_Table("FIELD") + " SELECT * FROM \"FIELD\""
                     );
                 connection
                     .createStatement()
                     .executeUpdate(
-                        "INSERT INTO " +
-                        escape_Table("METADATA") +
-                        " SELECT * FROM \"METADATA\""
+                        "INSERT INTO " + escape_Table("METADATA") + " SELECT * FROM \"METADATA\""
                     );
                 connection
                     .createStatement()
@@ -133,10 +118,7 @@ public void setUp() throws SQLException {
                 metadata = getSharedMetaData();
             }
 
-            metadata.put(
-                MetaData.VERSION_DB_STRUCT,
-                String.valueOf(CURRENT_VERSION_DB_STRUCT)
-            );
+            metadata.put(MetaData.VERSION_DB_STRUCT, String.valueOf(CURRENT_VERSION_DB_STRUCT));
             setSharedMetaData(metadata);
         }
     }
@@ -150,9 +132,7 @@ protected void insertIntoEntryTable(List<BibEntry> bibEntries) {
             .append(escape("TYPE"))
             .append(") VALUES(?)");
         // Number of commas is bibEntries.size() - 1
-        insertIntoEntryQuery.append(
-            ", (?)".repeat(Math.max(0, bibEntries.size() - 1))
-        );
+        insertIntoEntryQuery.append(", (?)".repeat(Math.max(0, bibEntries.size() - 1)));
         try (
             PreparedStatement preparedEntryStatement = connection.prepareStatement(
                 insertIntoEntryQuery.toString(),
@@ -160,23 +140,16 @@ protected void insertIntoEntryTable(List<BibEntry> bibEntries) {
             )
         ) {
             for (int i = 0; i < bibEntries.size(); i++) {
-                preparedEntryStatement.setString(
-                    i + 1,
-                    bibEntries.get(i).getType().getName()
-                );
+                preparedEntryStatement.setString(i + 1, bibEntries.get(i).getType().getName());
             }
             preparedEntryStatement.executeUpdate();
 
-            try (
-                ResultSet generatedKeys = preparedEntryStatement.getGeneratedKeys()
-            ) {
+            try (ResultSet generatedKeys = preparedEntryStatement.getGeneratedKeys()) {
                 // 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();
-                    bibEntry
-                        .getSharedBibEntryData()
-                        .setSharedID(generatedKeys.getInt(1));
+                    bibEntry.getSharedBibEntryData().setSharedID(generatedKeys.getInt(1));
                 }
                 if (generatedKeys.next()) {
                     LOGGER.error("Some shared IDs left unassigned");
@@ -211,17 +184,10 @@ public void startNotificationListener(DBMSSynchronizer dbmsSynchronizer) {
             // 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
-                );
+            listener = new PostgresSQLNotificationListener(dbmsSynchronizer, pgConnection);
             JabRefExecutorService.INSTANCE.execute(listener);
         } catch (SQLException e) {
-            LOGGER.error(
-                "SQL Error during starting the notification listener",
-                e
-            );
+            LOGGER.error("SQL Error during starting the notification listener", e);
         }
     }
 
@@ -231,10 +197,7 @@ public void stopNotificationListener() {
             listener.stop();
             connection.close();
         } catch (SQLException e) {
-            LOGGER.error(
-                "SQL Error during stopping the notification listener",
-                e
-            );
+            LOGGER.error("SQL Error during stopping the notification listener", e);
         }
     }
 
diff --git a/src/main/java/org/jabref/logic/shared/exception/OfflineLockException.java b/src/main/java/org/jabref/logic/shared/exception/OfflineLockException.java
index a1b5f4fdf1f..0b91566a9ab 100644
--- a/src/main/java/org/jabref/logic/shared/exception/OfflineLockException.java
+++ b/src/main/java/org/jabref/logic/shared/exception/OfflineLockException.java
@@ -11,10 +11,7 @@ public class OfflineLockException extends Exception {
     private final BibEntry localBibEntry;
     private final BibEntry sharedBibEntry;
 
-    public OfflineLockException(
-        BibEntry localBibEntry,
-        BibEntry sharedBibEntry
-    ) {
+    public OfflineLockException(BibEntry localBibEntry, BibEntry sharedBibEntry) {
         super("Local BibEntry data is not up-to-date.");
         this.localBibEntry = localBibEntry;
         this.sharedBibEntry = sharedBibEntry;
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 955df72e8f1..b6f89f88cec 100644
--- a/src/main/java/org/jabref/logic/shared/listener/PostgresSQLNotificationListener.java
+++ b/src/main/java/org/jabref/logic/shared/listener/PostgresSQLNotificationListener.java
@@ -35,16 +35,11 @@ public void run() {
         try {
             // noinspection InfiniteLoopStatement
             while (!stop) {
-                PGNotification notifications[] =
-                    pgConnection.getNotifications();
+                PGNotification notifications[] = pgConnection.getNotifications();
 
                 if (notifications != null) {
                     for (PGNotification notification : notifications) {
-                        if (
-                            !notification
-                                .getName()
-                                .equals(DBMSProcessor.PROCESSOR_ID)
-                        ) {
+                        if (!notification.getName().equals(DBMSProcessor.PROCESSOR_ID)) {
                             dbmsSynchronizer.pullChanges();
                         }
                     }
@@ -54,10 +49,7 @@ public void run() {
                 Thread.sleep(500);
             }
         } catch (SQLException | InterruptedException exception) {
-            LOGGER.error(
-                "Error while listening for updates to PostgresSQL",
-                exception
-            );
+            LOGGER.error("Error while listening for updates to PostgresSQL", exception);
         }
     }
 
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 38bcf13495c..418e5a2ee33 100644
--- a/src/main/java/org/jabref/logic/shared/prefs/SharedDatabasePreferences.java
+++ b/src/main/java/org/jabref/logic/shared/prefs/SharedDatabasePreferences.java
@@ -12,9 +12,7 @@
 
 public class SharedDatabasePreferences {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(
-        SharedDatabasePreferences.class
-    );
+    private static final Logger LOGGER = LoggerFactory.getLogger(SharedDatabasePreferences.class);
 
     private static final String DEFAULT_NODE = "default";
     private static final String PREFERENCES_PATH_NAME = "/org/jabref-shared";
@@ -24,19 +22,14 @@ public class SharedDatabasePreferences {
     private static final String SHARED_DATABASE_PORT = "sharedDatabasePort";
     private static final String SHARED_DATABASE_NAME = "sharedDatabaseName";
     private static final String SHARED_DATABASE_USER = "sharedDatabaseUser";
-    private static final String SHARED_DATABASE_PASSWORD =
-        "sharedDatabasePassword";
+    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_AUTOSAVE = "sharedDatabaseAutosave";
     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_USE_SSL = "sharedDatabaseUseSSL";
+    private static final String SHARED_DATABASE_KEYSTORE_FILE = "sharedDatabaseKeyStoreFile";
+    private static final String SHARED_DATABASE_SERVER_TIMEZONE = "sharedDatabaseServerTimezone";
 
     // This {@link Preferences} is used only for things which should not appear in real JabRefPreferences due to security reasons.
     private final Preferences internalPrefs;
@@ -46,11 +39,7 @@ public SharedDatabasePreferences() {
     }
 
     public SharedDatabasePreferences(String sharedDatabaseID) {
-        internalPrefs =
-            Preferences
-                .userRoot()
-                .node(PREFERENCES_PATH_NAME)
-                .node(sharedDatabaseID);
+        internalPrefs = Preferences.userRoot().node(PREFERENCES_PATH_NAME).node(sharedDatabaseID);
     }
 
     public Optional<String> getType() {
@@ -86,10 +75,7 @@ public Optional<String> getServerTimezone() {
     }
 
     public boolean getRememberPassword() {
-        return internalPrefs.getBoolean(
-            SHARED_DATABASE_REMEMBER_PASSWORD,
-            false
-        );
+        return internalPrefs.getBoolean(SHARED_DATABASE_REMEMBER_PASSWORD, false);
     }
 
     public Optional<String> getFolder() {
@@ -129,10 +115,7 @@ public void setPassword(String password) {
     }
 
     public void setRememberPassword(boolean rememberPassword) {
-        internalPrefs.putBoolean(
-            SHARED_DATABASE_REMEMBER_PASSWORD,
-            rememberPassword
-        );
+        internalPrefs.putBoolean(SHARED_DATABASE_REMEMBER_PASSWORD, rememberPassword);
     }
 
     public void setFolder(String folder) {
@@ -171,9 +154,7 @@ public static void clearAll() throws BackingStoreException {
         Preferences.userRoot().node(PREFERENCES_PATH_NAME).clear();
     }
 
-    public void putAllDBMSConnectionProperties(
-        DatabaseConnectionProperties properties
-    ) {
+    public void putAllDBMSConnectionProperties(DatabaseConnectionProperties properties) {
         assert (properties.isValid());
 
         setType(properties.getType().toString());
@@ -187,17 +168,10 @@ public void putAllDBMSConnectionProperties(
 
         try {
             setPassword(
-                new Password(
-                    properties.getPassword().toCharArray(),
-                    properties.getUser()
-                )
-                    .encrypt()
+                new Password(properties.getPassword().toCharArray(), properties.getUser()).encrypt()
             );
         } catch (GeneralSecurityException | UnsupportedEncodingException e) {
-            LOGGER.error(
-                "Could not store the password due to encryption problems.",
-                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 00a31148b98..a2a07d26231 100644
--- a/src/main/java/org/jabref/logic/shared/security/Password.java
+++ b/src/main/java/org/jabref/logic/shared/security/Password.java
@@ -35,8 +35,7 @@ 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");
+        this.secretKey = new SecretKeySpec(get128BitHash(key.getBytes()), "AES");
         this.ivSpec = new IvParameterSpec("ThisIsA128BitKey".getBytes());
     }
 
@@ -45,8 +44,7 @@ public Password(String phrase, String key)
      *
      * @return Encrypted phrase/password
      */
-    public String encrypt()
-        throws GeneralSecurityException, UnsupportedEncodingException {
+    public String encrypt() throws GeneralSecurityException, UnsupportedEncodingException {
         cipher.init(Cipher.ENCRYPT_MODE, secretKey, ivSpec);
         return new String(
             Base64.getEncoder().encode(cipher.doFinal(phrase)),
@@ -59,8 +57,7 @@ public String encrypt()
      *
      * @return Decrypted phrase/password
      */
-    public String decrypt()
-        throws GeneralSecurityException, UnsupportedEncodingException {
+    public String decrypt() throws GeneralSecurityException, UnsupportedEncodingException {
         cipher.init(Cipher.DECRYPT_MODE, secretKey, ivSpec);
         return new String(
             cipher.doFinal(Base64.getDecoder().decode(phrase)),
@@ -71,8 +68,7 @@ public String decrypt()
     /**
      * Returns a 128 bit hash using SHA-256.
      */
-    private byte[] get128BitHash(byte[] byteArrayToHash)
-        throws NoSuchAlgorithmException {
+    private byte[] get128BitHash(byte[] byteArrayToHash) throws NoSuchAlgorithmException {
         MessageDigest messageDigest = MessageDigest.getInstance("SHA-256");
         messageDigest.update(byteArrayToHash);
         return Arrays.copyOf(messageDigest.digest(), 16); // return 128 bit
diff --git a/src/main/java/org/jabref/logic/texparser/DefaultLatexParser.java b/src/main/java/org/jabref/logic/texparser/DefaultLatexParser.java
index db19a3705b7..9cead585999 100644
--- a/src/main/java/org/jabref/logic/texparser/DefaultLatexParser.java
+++ b/src/main/java/org/jabref/logic/texparser/DefaultLatexParser.java
@@ -21,9 +21,7 @@
 
 public class DefaultLatexParser implements LatexParser {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(
-        DefaultLatexParser.class
-    );
+    private static final Logger LOGGER = LoggerFactory.getLogger(DefaultLatexParser.class);
     private static final String TEX_EXT = ".tex";
     private static final String BIB_EXT = ".bib";
 
@@ -48,18 +46,12 @@ public class DefaultLatexParser implements LatexParser {
 
     private static final String BIBLIOGRAPHY_GROUP = "bib";
     private static final Pattern BIBLIOGRAPHY_PATTERN = Pattern.compile(
-        String.format(
-            "\\\\(?:bibliography|addbibresource)\\{(?<%s>[^\\}]*)\\}",
-            BIBLIOGRAPHY_GROUP
-        )
+        String.format("\\\\(?:bibliography|addbibresource)\\{(?<%s>[^\\}]*)\\}", BIBLIOGRAPHY_GROUP)
     );
 
     private static final String INCLUDE_GROUP = "file";
     private static final Pattern INCLUDE_PATTERN = Pattern.compile(
-        String.format(
-            "\\\\(?:include|input)\\{(?<%s>[^\\}]*)\\}",
-            INCLUDE_GROUP
-        )
+        String.format("\\\\(?:include|input)\\{(?<%s>[^\\}]*)\\}", INCLUDE_GROUP)
     );
 
     private final LatexParserResult latexParserResult;
@@ -96,10 +88,7 @@ public LatexParserResult parse(List<Path> latexFiles) {
 
             try (
                 InputStream inputStream = Files.newInputStream(file);
-                Reader reader = new InputStreamReader(
-                    inputStream,
-                    StandardCharsets.UTF_8
-                );
+                Reader reader = new InputStreamReader(inputStream, StandardCharsets.UTF_8);
                 LineNumberReader lineNumberReader = new LineNumberReader(reader)
             ) {
                 for (
@@ -162,9 +151,7 @@ private void matchBibFile(Path file, String line) {
         Matcher bibliographyMatch = BIBLIOGRAPHY_PATTERN.matcher(line);
 
         while (bibliographyMatch.find()) {
-            for (String bibString : bibliographyMatch
-                .group(BIBLIOGRAPHY_GROUP)
-                .split(",")) {
+            for (String bibString : bibliographyMatch.group(BIBLIOGRAPHY_GROUP).split(",")) {
                 bibString = bibString.trim();
                 Path bibFile = file
                     .getParent()
@@ -198,9 +185,7 @@ private void matchNestedFile(
                 ? filenamePassedToInclude
                 : String.format("%s%s", filenamePassedToInclude, TEX_EXT);
             Path nestedFile = texFile.getParent().resolve(texFileName);
-            if (
-                nestedFile.toFile().exists() && !texFiles.contains(nestedFile)
-            ) {
+            if (nestedFile.toFile().exists() && !texFiles.contains(nestedFile)) {
                 referencedFiles.add(nestedFile);
             }
         }
diff --git a/src/main/java/org/jabref/logic/texparser/TexBibEntriesResolver.java b/src/main/java/org/jabref/logic/texparser/TexBibEntriesResolver.java
index 871af144114..d4d9a8a256a 100644
--- a/src/main/java/org/jabref/logic/texparser/TexBibEntriesResolver.java
+++ b/src/main/java/org/jabref/logic/texparser/TexBibEntriesResolver.java
@@ -22,9 +22,7 @@
 
 public class TexBibEntriesResolver {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(
-        TexBibEntriesResolver.class
-    );
+    private static final Logger LOGGER = LoggerFactory.getLogger(TexBibEntriesResolver.class);
 
     private final BibDatabase masterDatabase;
     private final LibraryPreferences libraryPreferences;
@@ -46,11 +44,10 @@ public TexBibEntriesResolver(
     /**
      * Resolve all BibTeX entries and check if they are in the given database.
      */
-    public LatexBibEntriesResolverResult resolve(
-        LatexParserResult latexParserResult
-    ) {
-        LatexBibEntriesResolverResult resolverResult =
-            new LatexBibEntriesResolverResult(latexParserResult);
+    public LatexBibEntriesResolverResult resolve(LatexParserResult latexParserResult) {
+        LatexBibEntriesResolverResult resolverResult = new LatexBibEntriesResolverResult(
+            latexParserResult
+        );
 
         // Preload databases from BIB files.
         Map<Path, BibDatabase> bibDatabases = resolverResult
@@ -64,11 +61,7 @@ public LatexBibEntriesResolverResult resolve(
                     path -> {
                         try {
                             return OpenDatabase
-                                .loadDatabase(
-                                    path,
-                                    importFormatPreferences,
-                                    fileMonitor
-                                )
+                                .loadDatabase(path, importFormatPreferences, fileMonitor)
                                 .getDatabase();
                         } catch (IOException e) {
                             LOGGER.error("Error opening file '{}'", path, e);
@@ -86,9 +79,7 @@ public LatexBibEntriesResolverResult resolve(
             .distinct();
 
         Set<BibEntry> newEntries = citationsStream
-            .flatMap(mapEntry ->
-                apply(mapEntry, latexParserResult, bibDatabases)
-            )
+            .flatMap(mapEntry -> apply(mapEntry, latexParserResult, bibDatabases))
             .collect(Collectors.toSet());
 
         // Add all new entries to the newEntries set.
@@ -118,16 +109,12 @@ private Stream<? extends BibEntry> apply(
                     .filter(entry ->
                         !entry.equals(
                             masterDatabase
-                                .getEntryByCitationKey(
-                                    entry.getCitationKey().orElse("")
-                                )
+                                .getEntryByCitationKey(entry.getCitationKey().orElse(""))
                                 .orElse(new BibEntry())
                         )
                     )
                     // Add cross-referencing data to the entry (fill empty fields).
-                    .map(entry ->
-                        addCrossReferencingData(entry, bibFile, bibDatabases)
-                    )
+                    .map(entry -> addCrossReferencingData(entry, bibFile, bibDatabases))
             );
     }
 
@@ -145,10 +132,7 @@ private BibEntry addCrossReferencingData(
                     .forEach(field ->
                         entry
                             .getFieldMap()
-                            .putIfAbsent(
-                                field,
-                                refEntry.getFieldOrAlias(field).orElse("")
-                            )
+                            .putIfAbsent(field, refEntry.getFieldOrAlias(field).orElse(""))
                     )
             );
 
diff --git a/src/main/java/org/jabref/logic/util/BuildInfo.java b/src/main/java/org/jabref/logic/util/BuildInfo.java
index 503a80a2357..570f74b6568 100644
--- a/src/main/java/org/jabref/logic/util/BuildInfo.java
+++ b/src/main/java/org/jabref/logic/util/BuildInfo.java
@@ -12,10 +12,7 @@ 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 = System.getProperty("os.name", UNKNOWN_VERSION);
     public static final String OS_VERSION = System
         .getProperty("os.version", UNKNOWN_VERSION)
         .toLowerCase(Locale.ROOT);
@@ -48,10 +45,7 @@ public BuildInfo(String path) {
         try (InputStream stream = BuildInfo.class.getResourceAsStream(path)) {
             if (stream != null) {
                 try (
-                    InputStreamReader reader = new InputStreamReader(
-                        stream,
-                        StandardCharsets.UTF_8
-                    )
+                    InputStreamReader reader = new InputStreamReader(stream, StandardCharsets.UTF_8)
                 ) {
                     properties.load(reader);
                 }
@@ -63,8 +57,7 @@ public BuildInfo(String path) {
         version = Version.parse(properties.getProperty("version"));
         year = properties.getProperty("year", "");
         maintainers = properties.getProperty("maintainers", "");
-        azureInstrumentationKey =
-            BuildInfo.getValue(properties, "azureInstrumentationKey", "");
+        azureInstrumentationKey = BuildInfo.getValue(properties, "azureInstrumentationKey", "");
         springerNatureAPIKey =
             BuildInfo.getValue(
                 properties,
@@ -77,22 +70,15 @@ public BuildInfo(String path) {
                 "astrophysicsDataSystemAPIKey",
                 "tAhPRKADc6cC26mZUnAoBt3MAjCvKbuCZsB4lI3c"
             );
-        ieeeAPIKey =
-            BuildInfo.getValue(
-                properties,
-                "ieeeAPIKey",
-                "5jv3wyt4tt2bwcwv7jjk7pc3"
-            );
+        ieeeAPIKey = BuildInfo.getValue(properties, "ieeeAPIKey", "5jv3wyt4tt2bwcwv7jjk7pc3");
         scienceDirectApiKey =
             BuildInfo.getValue(
                 properties,
                 "scienceDirectApiKey",
                 "fb82f2e692b3c72dafe5f4f1fa0ac00b"
             );
-        minRequiredJavaVersion =
-            properties.getProperty("minRequiredJavaVersion", "1.8");
-        allowJava9 =
-            "true".equals(properties.getProperty("allowJava9", "true"));
+        minRequiredJavaVersion = properties.getProperty("minRequiredJavaVersion", "1.8");
+        allowJava9 = "true".equals(properties.getProperty("allowJava9", "true"));
         biodiversityHeritageApiKey =
             BuildInfo.getValue(
                 properties,
@@ -101,11 +87,7 @@ public BuildInfo(String path) {
             );
     }
 
-    private static String getValue(
-        Properties properties,
-        String key,
-        String defaultValue
-    ) {
+    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
diff --git a/src/main/java/org/jabref/logic/util/CoarseChangeFilter.java b/src/main/java/org/jabref/logic/util/CoarseChangeFilter.java
index d24c5b38e37..70ea79bf484 100644
--- a/src/main/java/org/jabref/logic/util/CoarseChangeFilter.java
+++ b/src/main/java/org/jabref/logic/util/CoarseChangeFilter.java
@@ -34,8 +34,7 @@ public CoarseChangeFilter(BibDatabaseContext bibDatabaseContext) {
     public synchronized void listen(BibDatabaseContextChangedEvent event) {
         if (event instanceof FieldChangedEvent fieldChange) {
             // If editing has started
-            boolean isNewEdit =
-                lastFieldChanged.isEmpty() || lastEntryChanged.isEmpty();
+            boolean isNewEdit = lastFieldChanged.isEmpty() || lastEntryChanged.isEmpty();
 
             boolean isChangedField = lastFieldChanged
                 .filter(f -> !f.equals(fieldChange.getField()))
@@ -43,8 +42,7 @@ public synchronized void listen(BibDatabaseContextChangedEvent event) {
             boolean isChangedEntry = lastEntryChanged
                 .filter(e -> !e.equals(fieldChange.getBibEntry()))
                 .isPresent();
-            boolean isEditChanged =
-                !isNewEdit && (isChangedField || isChangedEntry);
+            boolean isEditChanged = !isNewEdit && (isChangedField || isChangedEntry);
             // Only deltas of 1 when typing in manually, major change means pasting something (more than one character)
             boolean isMajorChange = fieldChange.getMajorCharacterChange() > 1;
 
diff --git a/src/main/java/org/jabref/logic/util/DelayTaskThrottler.java b/src/main/java/org/jabref/logic/util/DelayTaskThrottler.java
index 210ff6e4228..9777fe0b89b 100644
--- a/src/main/java/org/jabref/logic/util/DelayTaskThrottler.java
+++ b/src/main/java/org/jabref/logic/util/DelayTaskThrottler.java
@@ -19,9 +19,7 @@
  */
 public class DelayTaskThrottler {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(
-        DelayTaskThrottler.class
-    );
+    private static final Logger LOGGER = LoggerFactory.getLogger(DelayTaskThrottler.class);
 
     private final ScheduledThreadPoolExecutor executor;
 
@@ -44,8 +42,7 @@ public ScheduledFuture<?> schedule(Runnable command) {
             cancel();
         }
         try {
-            scheduledTask =
-                executor.schedule(command, delay, TimeUnit.MILLISECONDS);
+            scheduledTask = executor.schedule(command, delay, TimeUnit.MILLISECONDS);
         } catch (RejectedExecutionException e) {
             LOGGER.debug("Rejecting while another process is already running.");
         }
@@ -57,8 +54,7 @@ public <T> ScheduledFuture<?> scheduleTask(Callable<?> command) {
             cancel();
         }
         try {
-            scheduledTask =
-                executor.schedule(command, delay, TimeUnit.MILLISECONDS);
+            scheduledTask = executor.schedule(command, delay, TimeUnit.MILLISECONDS);
         } catch (RejectedExecutionException e) {
             LOGGER.debug("Rejecting while another process is already running.");
         }
diff --git a/src/main/java/org/jabref/logic/util/MetadataSerializationConfiguration.java b/src/main/java/org/jabref/logic/util/MetadataSerializationConfiguration.java
index 9ceebadcc5b..e925c5a090f 100644
--- a/src/main/java/org/jabref/logic/util/MetadataSerializationConfiguration.java
+++ b/src/main/java/org/jabref/logic/util/MetadataSerializationConfiguration.java
@@ -52,14 +52,12 @@ public class MetadataSerializationConfiguration {
     /**
      * Identifier for {@link AutomaticPersonsGroup}.
      */
-    public static final String AUTOMATIC_PERSONS_GROUP_ID =
-        "AutomaticPersonsGroup:";
+    public static final String AUTOMATIC_PERSONS_GROUP_ID = "AutomaticPersonsGroup:";
 
     /**
      * Identifier for {@link AutomaticKeywordGroup}.
      */
-    public static final String AUTOMATIC_KEYWORD_GROUP_ID =
-        "AutomaticKeywordGroup:";
+    public static final String AUTOMATIC_KEYWORD_GROUP_ID = "AutomaticKeywordGroup:";
 
     /**
      * Identifier for {@link TexGroup}.
diff --git a/src/main/java/org/jabref/logic/util/OS.java b/src/main/java/org/jabref/logic/util/OS.java
index 55ae3fad5d0..5f888645631 100644
--- a/src/main/java/org/jabref/logic/util/OS.java
+++ b/src/main/java/org/jabref/logic/util/OS.java
@@ -51,28 +51,18 @@ public static NativeDesktop getNativeDesktop() {
     public static boolean isKeyringAvailable() {
         try (Keyring keyring = Keyring.create()) {
             keyring.setPassword("JabRef", "keyringTest", "keyringTest");
-            if (
-                !"keyringTest".equals(
-                        keyring.getPassword("JabRef", "keyringTest")
-                    )
-            ) {
+            if (!"keyringTest".equals(keyring.getPassword("JabRef", "keyringTest"))) {
                 return false;
             }
             keyring.deletePassword("JabRef", "keyringTest");
         } catch (BackendNotSupportedException ex) {
-            LoggerFactory
-                .getLogger(OS.class)
-                .warn("Credential store not supported.");
+            LoggerFactory.getLogger(OS.class).warn("Credential store not supported.");
             return false;
         } catch (PasswordAccessException ex) {
-            LoggerFactory
-                .getLogger(OS.class)
-                .warn("Password storage in credential store failed.");
+            LoggerFactory.getLogger(OS.class).warn("Password storage in credential store failed.");
             return false;
         } catch (Exception ex) {
-            LoggerFactory
-                .getLogger(OS.class)
-                .warn("Connection to credential store failed");
+            LoggerFactory.getLogger(OS.class).warn("Connection to credential store failed");
             return false;
         }
         return true;
diff --git a/src/main/java/org/jabref/logic/util/StandardFileType.java b/src/main/java/org/jabref/logic/util/StandardFileType.java
index 8ceb8b5bb78..1ec62450899 100644
--- a/src/main/java/org/jabref/logic/util/StandardFileType.java
+++ b/src/main/java/org/jabref/logic/util/StandardFileType.java
@@ -69,9 +69,7 @@ public static FileType fromExtensions(String... extensions) {
         return OptionalUtil.orElse(
             Arrays
                 .stream(StandardFileType.values())
-                .filter(field ->
-                    field.getExtensions().stream().anyMatch(exts::contains)
-                )
+                .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 5b13ffce0b0..8446a0335a8 100644
--- a/src/main/java/org/jabref/logic/util/TestEntry.java
+++ b/src/main/java/org/jabref/logic/util/TestEntry.java
@@ -12,10 +12,7 @@ private TestEntry() {}
     public static BibEntry getTestEntry() {
         BibEntry entry = new BibEntry(StandardEntryType.Article);
         entry.setCitationKey("Smith2016");
-        entry.setField(
-            StandardField.AUTHOR,
-            "Smith, Bill and Jones, Bob and Williams, Jeff"
-        );
+        entry.setField(StandardField.AUTHOR, "Smith, Bill and Jones, Bob and Williams, Jeff");
         entry.setField(StandardField.EDITOR, "Taylor, Phil");
         entry.setField(StandardField.TITLE, "Title of the test entry");
         entry.setField(StandardField.NUMBER, "3");
@@ -41,10 +38,7 @@ public static BibEntry getTestEntry() {
             "Quis aute iure reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint obcaecat cupiditat non " +
             "proident, sunt in culpa qui officia deserunt mollit anim id est laborum."
         );
-        entry.putKeywords(
-            Arrays.asList("KeyWord1", "KeyWord2", "KeyWord3", "Keyword4"),
-            ';'
-        );
+        entry.putKeywords(Arrays.asList("KeyWord1", "KeyWord2", "KeyWord3", "Keyword4"), ';');
 
         return entry;
     }
@@ -52,10 +46,7 @@ public static BibEntry getTestEntry() {
     public static BibEntry getTestEntryBook() {
         BibEntry entry = new BibEntry(StandardEntryType.Book);
         entry.setCitationKey("Harrer2018");
-        entry.setField(
-            StandardField.AUTHOR,
-            "Simon Harrer and Jörg Lenhard and Linus Dietz"
-        );
+        entry.setField(StandardField.AUTHOR, "Simon Harrer and Jörg Lenhard and Linus Dietz");
         entry.setField(StandardField.EDITOR, "Andrea Steward");
         entry.setField(StandardField.TITLE, "Java by Comparison");
         entry.setField(StandardField.YEAR, "2018");
diff --git a/src/main/java/org/jabref/logic/util/UnknownFileType.java b/src/main/java/org/jabref/logic/util/UnknownFileType.java
index cf5a0bd603c..a2b7453d261 100644
--- a/src/main/java/org/jabref/logic/util/UnknownFileType.java
+++ b/src/main/java/org/jabref/logic/util/UnknownFileType.java
@@ -13,8 +13,7 @@ public class UnknownFileType implements FileType {
     public UnknownFileType(String... extensions) {
         for (int i = 0; i < extensions.length; i++) {
             if (extensions[i].contains(".")) {
-                extensions[i] =
-                    extensions[i].substring(extensions[i].indexOf('.') + 1);
+                extensions[i] = extensions[i].substring(extensions[i].indexOf('.') + 1);
             }
             extensions[i] = extensions[i].toLowerCase(Locale.ROOT);
         }
diff --git a/src/main/java/org/jabref/logic/util/UpdateField.java b/src/main/java/org/jabref/logic/util/UpdateField.java
index 69e89c0666a..f3fd158040f 100644
--- a/src/main/java/org/jabref/logic/util/UpdateField.java
+++ b/src/main/java/org/jabref/logic/util/UpdateField.java
@@ -16,11 +16,7 @@ private UpdateField() {}
     /**
      * Updating a field will result in the entry being reformatted on save
      */
-    public static Optional<FieldChange> updateField(
-        BibEntry be,
-        Field field,
-        String newValue
-    ) {
+    public static Optional<FieldChange> updateField(BibEntry be, Field field, String newValue) {
         return updateField(be, field, newValue, false);
     }
 
@@ -33,12 +29,7 @@ public static Optional<FieldChange> updateNonDisplayableField(
         String newValue
     ) {
         boolean changed = be.hasChanged();
-        Optional<FieldChange> fieldChange = updateField(
-            be,
-            field,
-            newValue,
-            false
-        );
+        Optional<FieldChange> fieldChange = updateField(be, field, newValue, false);
         be.setChanged(changed);
         return fieldChange;
     }
@@ -58,10 +49,7 @@ public static Optional<FieldChange> updateField(
         String oldValue = null;
         if (be.hasField(field)) {
             oldValue = be.getField(field).get();
-            if (
-                (newValue == null) ||
-                (oldValue.equals(newValue) && nullFieldIfValueIsTheSame)
-            ) {
+            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
                 // Clear the field
                 be.clearField(field);
@@ -128,15 +116,8 @@ public static void setAutomaticFields(
 
         for (BibEntry curEntry : entries) {
             boolean setOwner =
-                globalSetOwner &&
-                (overwriteOwner || (!curEntry.hasField(StandardField.OWNER)));
-            setAutomaticFields(
-                curEntry,
-                setOwner,
-                defaultOwner,
-                setTimeStamp,
-                timestamp
-            );
+                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 c18e9446c1c..c9cb8a77ad5 100644
--- a/src/main/java/org/jabref/logic/util/Version.java
+++ b/src/main/java/org/jabref/logic/util/Version.java
@@ -21,17 +21,14 @@
  */
 public class Version {
 
-    public static final String JABREF_DOWNLOAD_URL =
-        "https://downloads.jabref.org";
+    public static final String JABREF_DOWNLOAD_URL = "https://downloads.jabref.org";
 
     private static final Version UNKNOWN_VERSION = new Version();
 
     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 Pattern CI_SUFFIX_PATTERN = Pattern.compile("-ci\\.\\d+");
 
     private static final String JABREF_GITHUB_RELEASES =
         "https://api.github.com/repos/JabRef/JabRef/releases";
@@ -84,12 +81,10 @@ public static Version parse(String version) {
                 parsedVersion.major = Integer.parseInt(matcher.group("major"));
 
                 String minorString = matcher.group("minor");
-                parsedVersion.minor =
-                    minorString == null ? 0 : Integer.parseInt(minorString);
+                parsedVersion.minor = minorString == null ? 0 : Integer.parseInt(minorString);
 
                 String patchString = matcher.group("patch");
-                parsedVersion.patch =
-                    patchString == null ? 0 : Integer.parseInt(patchString);
+                parsedVersion.patch = patchString == null ? 0 : Integer.parseInt(patchString);
 
                 String versionStageString = matcher.group("stage");
                 parsedVersion.developmentStage =
@@ -99,12 +94,9 @@ public static Version parse(String version) {
 
                 String stageNumString = matcher.group("num");
                 parsedVersion.developmentNum =
-                    stageNumString == null
-                        ? 0
-                        : Integer.parseInt(stageNumString);
+                    stageNumString == null ? 0 : Integer.parseInt(stageNumString);
 
-                parsedVersion.isDevelopmentVersion =
-                    matcher.group("dev") != null;
+                parsedVersion.isDevelopmentVersion = matcher.group("dev") != null;
             } catch (NumberFormatException e) {
                 getLogger().warn("Invalid version string used: {}", version, e);
                 return UNKNOWN_VERSION;
@@ -123,9 +115,7 @@ 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) new URL(
-            JABREF_GITHUB_RELEASES
-        )
+        HttpURLConnection connection = (HttpURLConnection) new URL(JABREF_GITHUB_RELEASES)
             .openConnection();
         connection.setRequestProperty("Accept-Charset", "UTF-8");
         try (
@@ -156,9 +146,7 @@ public boolean isNewerThan(Version otherVersion) {
             return false;
         } else if (this.getFullVersion().equals(BuildInfo.UNKNOWN_VERSION)) {
             return false;
-        } else if (
-            otherVersion.getFullVersion().equals(BuildInfo.UNKNOWN_VERSION)
-        ) {
+        } else if (otherVersion.getFullVersion().equals(BuildInfo.UNKNOWN_VERSION)) {
             return false;
         }
 
@@ -175,29 +163,16 @@ public boolean isNewerThan(Version otherVersion) {
                     return true;
                 } else if (this.getPatch() == otherVersion.getPatch()) {
                     // if the patch numbers are equal compare the development stages
-                    if (
-                        this.developmentStage.isMoreStableThan(
-                                otherVersion.developmentStage
-                            )
-                    ) {
+                    if (this.developmentStage.isMoreStableThan(otherVersion.developmentStage)) {
                         return true;
-                    } else if (
-                        this.developmentStage == otherVersion.developmentStage
-                    ) {
+                    } else if (this.developmentStage == otherVersion.developmentStage) {
                         // if the development stage are equal compare the development number
-                        if (
-                            this.getDevelopmentNum() >
-                            otherVersion.getDevelopmentNum()
-                        ) {
+                        if (this.getDevelopmentNum() > otherVersion.getDevelopmentNum()) {
                             return true;
-                        } else if (
-                            this.getDevelopmentNum() ==
-                            otherVersion.getDevelopmentNum()
-                        ) {
+                        } else if (this.getDevelopmentNum() == otherVersion.getDevelopmentNum()) {
                             // if the stage is equal check if this version is in development and the other is not
                             return (
-                                !this.isDevelopmentVersion &&
-                                otherVersion.isDevelopmentVersion
+                                !this.isDevelopmentVersion && otherVersion.isDevelopmentVersion
                             );
                         }
                     }
@@ -212,15 +187,12 @@ public boolean isNewerThan(Version otherVersion) {
      *
      * @return The version this one should be updated to, or an empty Optional
      */
-    public Optional<Version> shouldBeUpdatedTo(
-        List<Version> availableVersions
-    ) {
+    public Optional<Version> shouldBeUpdatedTo(List<Version> availableVersions) {
         Optional<Version> newerVersion = Optional.empty();
         for (Version version : availableVersions) {
             if (
                 this.shouldBeUpdatedTo(version) &&
-                (!newerVersion.isPresent() ||
-                    version.isNewerThan(newerVersion.get()))
+                (!newerVersion.isPresent() || version.isNewerThan(newerVersion.get()))
             ) {
                 newerVersion = Optional.of(version);
             }
diff --git a/src/main/java/org/jabref/logic/util/WebViewStore.java b/src/main/java/org/jabref/logic/util/WebViewStore.java
index 3c79e53e67d..9254d252c05 100644
--- a/src/main/java/org/jabref/logic/util/WebViewStore.java
+++ b/src/main/java/org/jabref/logic/util/WebViewStore.java
@@ -12,9 +12,7 @@
  */
 public class WebViewStore {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(
-        WebViewStore.class
-    );
+    private static final Logger LOGGER = LoggerFactory.getLogger(WebViewStore.class);
     private static final Queue<WebView> WEB_VIEWS = new ArrayDeque<>();
     private static boolean isInitialized = false;
     private static Configuration config;
@@ -73,10 +71,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 87f2ba671bf..055b5a50da3 100644
--- a/src/main/java/org/jabref/logic/util/io/AutoLinkPreferences.java
+++ b/src/main/java/org/jabref/logic/util/io/AutoLinkPreferences.java
@@ -27,8 +27,7 @@ public AutoLinkPreferences(
         boolean askAutoNamingPdfs,
         ObjectProperty<Character> keywordSeparatorProperty
     ) {
-        this.citationKeyDependency =
-            new SimpleObjectProperty<>(citationKeyDependency);
+        this.citationKeyDependency = new SimpleObjectProperty<>(citationKeyDependency);
         this.regularExpression = new SimpleStringProperty(regularExpression);
         this.askAutoNamingPdfs = new SimpleBooleanProperty(askAutoNamingPdfs);
         this.keywordSeparator = keywordSeparatorProperty;
@@ -43,8 +42,7 @@ public AutoLinkPreferences(
         boolean askAutoNamingPdfs,
         Character keywordSeparator
     ) {
-        this.citationKeyDependency =
-            new SimpleObjectProperty<>(citationKeyDependency);
+        this.citationKeyDependency = new SimpleObjectProperty<>(citationKeyDependency);
         this.regularExpression = new SimpleStringProperty(regularExpression);
         this.askAutoNamingPdfs = new SimpleBooleanProperty(askAutoNamingPdfs);
         this.keywordSeparator = new SimpleObjectProperty<>(keywordSeparator);
@@ -54,15 +52,11 @@ public CitationKeyDependency getCitationKeyDependency() {
         return citationKeyDependency.getValue();
     }
 
-    public ObjectProperty<
-        CitationKeyDependency
-    > citationKeyDependencyProperty() {
+    public ObjectProperty<CitationKeyDependency> citationKeyDependencyProperty() {
         return citationKeyDependency;
     }
 
-    public void setCitationKeyDependency(
-        CitationKeyDependency citationKeyDependency
-    ) {
+    public void setCitationKeyDependency(CitationKeyDependency citationKeyDependency) {
         this.citationKeyDependency.set(citationKeyDependency);
     }
 
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 1a111f9add3..63b7d8f27fe 100644
--- a/src/main/java/org/jabref/logic/util/io/BackupFileUtil.java
+++ b/src/main/java/org/jabref/logic/util/io/BackupFileUtil.java
@@ -15,9 +15,7 @@
 
 public class BackupFileUtil {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(
-        BackupFileUtil.class
-    );
+    private static final Logger LOGGER = LoggerFactory.getLogger(BackupFileUtil.class);
 
     private BackupFileUtil() {}
 
@@ -63,11 +61,7 @@ public static Path getPathForNewBackupFileAndCreateDirectory(
             return result;
         }
         String baseFileName =
-            getUniqueFilePrefix(targetFile) +
-            "--" +
-            targetFile.getFileName() +
-            "--" +
-            timeSuffix;
+            getUniqueFilePrefix(targetFile) + "--" + targetFile.getFileName() + "--" + timeSuffix;
         Path fileName = FileUtil.addExtension(Path.of(baseFileName), extension);
         return directory.resolve(fileName);
     }
@@ -92,8 +86,7 @@ public static Optional<Path> getPathOfLatestExistingBackupFile(
         }
 
         // Search the directory for the latest file
-        final String prefix =
-            getUniqueFilePrefix(targetFile) + "--" + targetFile.getFileName();
+        final String prefix = getUniqueFilePrefix(targetFile) + "--" + targetFile.getFileName();
         Optional<Path> mostRecentFile;
         try {
             mostRecentFile =
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 fcb9bb0f585..8b4a89e4038 100644
--- a/src/main/java/org/jabref/logic/util/io/CitationKeyBasedFileFinder.java
+++ b/src/main/java/org/jabref/logic/util/io/CitationKeyBasedFileFinder.java
@@ -46,10 +46,7 @@ public List<Path> findAssociatedFiles(
         List<Path> result = new ArrayList<>();
 
         // First scan directories
-        Set<Path> filesWithExtension = findFilesByExtension(
-            directories,
-            extensions
-        );
+        Set<Path> filesWithExtension = findFilesByExtension(directories, extensions);
 
         // Now look for keys
         for (Path file : filesWithExtension) {
@@ -71,9 +68,7 @@ public List<Path> findAssociatedFiles(
     }
 
     private boolean matches(String filename, String citeKey) {
-        boolean startsWithKey = filename.startsWith(
-            FileNameCleaner.cleanFileName(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
@@ -88,16 +83,11 @@ 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
-            ) ->
+        BiPredicate<Path, BasicFileAttributes> isFileWithCorrectExtension = (path, attributes) ->
             !Files.isDirectory(path) &&
             extensions.contains(FileUtil.getFileExtension(path).orElse(""));
 
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 047d5769f57..7de50e79fff 100644
--- a/src/main/java/org/jabref/logic/util/io/DatabaseFileLookup.java
+++ b/src/main/java/org/jabref/logic/util/io/DatabaseFileLookup.java
@@ -30,10 +30,7 @@ public class DatabaseFileLookup {
     /**
      * Creates an instance by passing a {@link BibDatabase} which will be used for the searches.
      */
-    public DatabaseFileLookup(
-        BibDatabaseContext databaseContext,
-        FilePreferences filePreferences
-    ) {
+    public DatabaseFileLookup(BibDatabaseContext databaseContext, FilePreferences filePreferences) {
         Objects.requireNonNull(databaseContext);
         possibleFilePaths =
             Optional
@@ -43,8 +40,7 @@ public DatabaseFileLookup(
         for (BibEntry entry : databaseContext.getDatabase().getEntries()) {
             fileCache.addAll(parseFileField(entry));
         }
-        this.pathOfDatabase =
-            databaseContext.getDatabasePath().orElse(Path.of(""));
+        this.pathOfDatabase = databaseContext.getDatabasePath().orElse(Path.of(""));
     }
 
     /**
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 1036bc4bbc5..e83b71cfafd 100644
--- a/src/main/java/org/jabref/logic/util/io/FileFinder.java
+++ b/src/main/java/org/jabref/logic/util/io/FileFinder.java
@@ -13,9 +13,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 69b27a94c7b..d3b62b0ea97 100644
--- a/src/main/java/org/jabref/logic/util/io/FileFinders.java
+++ b/src/main/java/org/jabref/logic/util/io/FileFinders.java
@@ -5,9 +5,7 @@ public class FileFinders {
     /**
      * Creates a preconfigurated file finder based on the given AutoLink preferences.
      */
-    public static FileFinder constructFromConfiguration(
-        AutoLinkPreferences autoLinkPreferences
-    ) {
+    public static FileFinder constructFromConfiguration(AutoLinkPreferences autoLinkPreferences) {
         return switch (autoLinkPreferences.getCitationKeyDependency()) {
             case START -> new CitationKeyBasedFileFinder(false);
             case EXACT -> new CitationKeyBasedFileFinder(true);
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 d0fe5c77b7c..58ed88ea1d1 100644
--- a/src/main/java/org/jabref/logic/util/io/FileNameUniqueness.java
+++ b/src/main/java/org/jabref/logic/util/io/FileNameUniqueness.java
@@ -12,9 +12,7 @@
 
 public class FileNameUniqueness {
 
-    private static final Pattern DUPLICATE_MARK_PATTERN = Pattern.compile(
-        "(.*) \\(\\d+\\)"
-    );
+    private static final Pattern DUPLICATE_MARK_PATTERN = Pattern.compile("(.*) \\(\\d+\\)");
 
     /**
      * Returns a file name such that it does not match any existing files in targetDirectory
@@ -23,13 +21,8 @@ public class FileNameUniqueness {
      * @param fileName        Suggested name for the file
      * @return a file name such that it does not match any existing files in targetDirectory
      */
-    public static String getNonOverWritingFileName(
-        Path targetDirectory,
-        String fileName
-    ) {
-        Optional<String> extensionOptional = FileUtil.getFileExtension(
-            fileName
-        );
+    public static String getNonOverWritingFileName(Path targetDirectory, String fileName) {
+        Optional<String> extensionOptional = FileUtil.getFileExtension(fileName);
 
         // the suffix include the '.' , if extension is present Eg: ".pdf"
         String extensionSuffix;
@@ -37,8 +30,7 @@ public static String getNonOverWritingFileName(
 
         if (extensionOptional.isPresent()) {
             extensionSuffix = '.' + extensionOptional.get();
-            fileNameWithoutExtension =
-                fileName.substring(0, fileName.lastIndexOf('.'));
+            fileNameWithoutExtension = fileName.substring(0, fileName.lastIndexOf('.'));
         } else {
             extensionSuffix = "";
             fileNameWithoutExtension = fileName;
@@ -48,12 +40,7 @@ public static String getNonOverWritingFileName(
 
         int counter = 1;
         while (Files.exists(targetDirectory.resolve(newFileName))) {
-            newFileName =
-                fileNameWithoutExtension +
-                " (" +
-                counter +
-                ")" +
-                extensionSuffix;
+            newFileName = fileNameWithoutExtension + " (" + counter + ")" + extensionSuffix;
             counter++;
         }
 
@@ -81,15 +68,10 @@ public static boolean isDuplicatedFile(
         Objects.requireNonNull(dialogService);
 
         String extensionSuffix = FileUtil.getFileExtension(fileName).orElse("");
-        extensionSuffix =
-            "".equals(extensionSuffix)
-                ? extensionSuffix
-                : "." + extensionSuffix;
+        extensionSuffix = "".equals(extensionSuffix) ? extensionSuffix : "." + extensionSuffix;
         String newFilename = FileUtil.getBaseName(fileName) + extensionSuffix;
 
-        String fileNameWithoutDuplicated = eraseDuplicateMarks(
-            FileUtil.getBaseName(fileName)
-        );
+        String fileNameWithoutDuplicated = eraseDuplicateMarks(FileUtil.getBaseName(fileName));
         String originalFileName = fileNameWithoutDuplicated + extensionSuffix;
 
         if (newFilename.equals(originalFileName)) {
@@ -101,12 +83,7 @@ public static boolean isDuplicatedFile(
         int counter = 1;
 
         while (Files.exists(originalFile)) {
-            if (
-                com.google.common.io.Files.equal(
-                    originalFile.toFile(),
-                    duplicateFile.toFile()
-                )
-            ) {
+            if (com.google.common.io.Files.equal(originalFile.toFile(), duplicateFile.toFile())) {
                 if (duplicateFile.toFile().delete()) {
                     dialogService.notify(
                         Localization.lang(
@@ -127,12 +104,7 @@ public static boolean isDuplicatedFile(
                 return true;
             }
 
-            originalFileName =
-                fileNameWithoutDuplicated +
-                " (" +
-                counter +
-                ")" +
-                extensionSuffix;
+            originalFileName = fileNameWithoutDuplicated + " (" + counter + ")" + extensionSuffix;
             counter++;
 
             if (newFilename.equals(originalFileName)) {
@@ -154,8 +126,6 @@ public static boolean isDuplicatedFile(
      */
     public static String eraseDuplicateMarks(String fileName) {
         Matcher m = DUPLICATE_MARK_PATTERN.matcher(fileName);
-        return m.find()
-            ? fileName.substring(0, fileName.lastIndexOf('(') - 1)
-            : fileName;
+        return m.find() ? fileName.substring(0, fileName.lastIndexOf('(') - 1) : fileName;
     }
 }
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 377d591ceef..d0a6253cd36 100644
--- a/src/main/java/org/jabref/logic/util/io/FileUtil.java
+++ b/src/main/java/org/jabref/logic/util/io/FileUtil.java
@@ -43,9 +43,7 @@ public class FileUtil {
         .contains("posix");
     public static final int MAXIMUM_FILE_NAME_LENGTH = 255;
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(
-        FileUtil.class
-    );
+    private static final Logger LOGGER = LoggerFactory.getLogger(FileUtil.class);
 
     /**
      * MUST ALWAYS BE A SORTED ARRAY because it is used in a binary search
@@ -74,12 +72,7 @@ private FileUtil() {}
     public static Optional<String> getFileExtension(String fileName) {
         int dotPosition = fileName.lastIndexOf('.');
         if ((dotPosition > 0) && (dotPosition < (fileName.length() - 1))) {
-            return Optional.of(
-                fileName
-                    .substring(dotPosition + 1)
-                    .trim()
-                    .toLowerCase(Locale.ROOT)
-            );
+            return Optional.of(fileName.substring(dotPosition + 1).trim().toLowerCase(Locale.ROOT));
         } else {
             return Optional.empty();
         }
@@ -98,9 +91,7 @@ public static Optional<String> getFileExtension(Path file) {
      * Returns the name part of a file name (i.e., everything in front of last ".").
      */
     public static String getBaseName(String fileNameWithExtension) {
-        return com.google.common.io.Files.getNameWithoutExtension(
-            fileNameWithExtension
-        );
+        return com.google.common.io.Files.getNameWithoutExtension(fileNameWithExtension);
     }
 
     /**
@@ -124,8 +115,7 @@ public static String getValidFileName(String fileName) {
             Optional<String> extension = getFileExtension(fileName);
             String shortName = nameWithoutExtension.substring(
                 0,
-                MAXIMUM_FILE_NAME_LENGTH -
-                extension.map(s -> s.length() + 1).orElse(0)
+                MAXIMUM_FILE_NAME_LENGTH - extension.map(s -> s.length() + 1).orElse(0)
             );
             LOGGER.info(
                 String.format(
@@ -161,10 +151,7 @@ public static Path addExtension(Path path, String extension) {
      * @param paths List of paths as Strings
      * @param comparePath The to be tested path
      */
-    public static Optional<String> getUniquePathDirectory(
-        List<String> paths,
-        Path comparePath
-    ) {
+    public static Optional<String> getUniquePathDirectory(List<String> paths, Path comparePath) {
         String fileName = comparePath.getFileName().toString();
 
         List<String> uniquePathParts = uniquePathSubstrings(paths);
@@ -185,10 +172,7 @@ public static Optional<String> getUniquePathDirectory(
      * @param paths List of paths as Strings
      * @param comparePath The to be shortened path
      */
-    public static Optional<String> getUniquePathFragment(
-        List<String> paths,
-        Path comparePath
-    ) {
+    public static Optional<String> getUniquePathFragment(List<String> paths, Path comparePath) {
         return uniquePathSubstrings(paths)
             .stream()
             .filter(part -> comparePath.toString().contains(part))
@@ -205,16 +189,12 @@ public static List<String> uniquePathSubstrings(List<String> paths) {
         List<Deque<String>> stackList = new ArrayList<>(paths.size());
         // prepare data structures
         for (String path : paths) {
-            List<String> directories = Arrays.asList(
-                path.split(Pattern.quote(File.separator))
-            );
+            List<String> directories = Arrays.asList(path.split(Pattern.quote(File.separator)));
             Deque<String> stack = new ArrayDeque<>(directories.reversed());
             stackList.add(stack);
         }
 
-        List<String> pathSubstrings = new ArrayList<>(
-            Collections.nCopies(paths.size(), "")
-        );
+        List<String> pathSubstrings = new ArrayList<>(Collections.nCopies(paths.size(), ""));
 
         // compute the shortest folder substrings
         while (!stackList.stream().allMatch(Deque::isEmpty)) {
@@ -228,10 +208,7 @@ public static List<String> uniquePathSubstrings(List<String> paths) {
                     pathSubstrings.set(i, stringFromDeque);
                 } else if (!stack.isEmpty()) {
                     String stringFromStack = stack.pop();
-                    pathSubstrings.set(
-                        i,
-                        stringFromStack + File.separator + tempPathString
-                    );
+                    pathSubstrings.set(i, stringFromStack + File.separator + tempPathString);
                 }
             }
 
@@ -264,9 +241,7 @@ public static boolean copyFile(
             return false;
         }
         if (Files.exists(pathToDestinationFile) && !replaceExisting) {
-            LOGGER.error(
-                "Path to the destination file exists but the file shouldn't be replaced."
-            );
+            LOGGER.error("Path to the destination file exists but the file shouldn't be replaced.");
             return false;
         }
         try {
@@ -315,10 +290,7 @@ public static Path relativize(Path file, List<Path> directories) {
      * @param fileDirs list of directories to try for expansion
      * @return list of files. May be empty
      */
-    public static List<Path> getListOfLinkedFiles(
-        List<BibEntry> bes,
-        List<Path> fileDirs
-    ) {
+    public static List<Path> getListOfLinkedFiles(List<BibEntry> bes, List<Path> fileDirs) {
         Objects.requireNonNull(bes);
         Objects.requireNonNull(fileDirs);
 
@@ -342,12 +314,7 @@ public static String createFileNameFromPattern(
         BibEntry entry,
         String fileNamePattern
     ) {
-        String targetName = BracketedPattern.expandBrackets(
-            fileNamePattern,
-            ';',
-            entry,
-            database
-        );
+        String targetName = BracketedPattern.expandBrackets(fileNamePattern, ';', entry, database);
 
         if (targetName.isEmpty()) {
             targetName = entry.getCitationKey().orElse("default");
@@ -395,10 +362,7 @@ public static String createDirNameFromPattern(
      * @param rootDirectory the rootDirectory that will be searched
      * @return the path to the first file that matches the defined conditions
      */
-    public static Optional<Path> findSingleFileRecursively(
-        String filename,
-        Path rootDirectory
-    ) {
+    public static Optional<Path> findSingleFileRecursively(String filename, Path rootDirectory) {
         try (Stream<Path> pathStream = Files.walk(rootDirectory)) {
             return pathStream
                 .filter(Files::isRegularFile)
@@ -421,10 +385,7 @@ public static Optional<Path> find(
         FilePreferences filePreferences
     ) {
         Objects.requireNonNull(fileName, "fileName");
-        return find(
-            fileName,
-            databaseContext.getFileDirectories(filePreferences)
-        );
+        return find(fileName, databaseContext.getFileDirectories(filePreferences));
     }
 
     /**
@@ -500,10 +461,7 @@ public static Optional<Path> find(String fileName, Path directory) {
      * @param directories the directories that will be searched
      * @return a list including all found paths to files that match the defined conditions
      */
-    public static List<Path> findListOfFiles(
-        String filename,
-        List<Path> directories
-    ) {
+    public static List<Path> findListOfFiles(String filename, List<Path> directories) {
         List<Path> files = new ArrayList<>();
         for (Path dir : directories) {
             FileUtil.find(filename, dir).ifPresent(files::add);
@@ -538,8 +496,7 @@ 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())
+            extension.isPresent() && StandardFileType.PDF.getExtensions().contains(extension.get())
         );
     }
 
@@ -550,10 +507,7 @@ public static Path getInitialDirectory(
         BibDatabaseContext databaseContext,
         Path workingDirectory
     ) {
-        return databaseContext
-            .getDatabasePath()
-            .map(Path::getParent)
-            .orElse(workingDirectory);
+        return databaseContext.getDatabasePath().map(Path::getParent).orElse(workingDirectory);
     }
 
     /**
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 1072450ebb0..fcfede57fef 100644
--- a/src/main/java/org/jabref/logic/util/io/RegExpBasedFileFinder.java
+++ b/src/main/java/org/jabref/logic/util/io/RegExpBasedFileFinder.java
@@ -24,9 +24,7 @@ class RegExpBasedFileFinder implements FileFinder {
 
     private static final String EXT_MARKER = "__EXTENSION__";
 
-    private static final Pattern ESCAPE_PATTERN = Pattern.compile(
-        "([^\\\\])\\\\([^\\\\])"
-    );
+    private static final Pattern ESCAPE_PATTERN = Pattern.compile("([^\\\\])\\\\([^\\\\])");
 
     private final String regExp;
     private final Character keywordDelimiter;
@@ -50,16 +48,14 @@ private Pattern createFileNamePattern(
         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);
+        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
-            );
+        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
@@ -74,10 +70,7 @@ private Pattern createFileNamePattern(
             .replaceAll(EXT_MARKER, extensionRegExp) // Replace the extension marker
             .replaceAll("\\\\\\\\", "\\\\");
         try {
-            return Pattern.compile(
-                '^' + fileNamePattern + '$',
-                Pattern.CASE_INSENSITIVE
-            );
+            return Pattern.compile('^' + fileNamePattern + '$', Pattern.CASE_INSENSITIVE);
         } catch (PatternSyntaxException e) {
             throw new IOException(
                 String.format(
@@ -99,11 +92,7 @@ private static String toFileNameRegex(String expandedContent) {
         var cleanedContent = FileNameCleaner.cleanFileName(expandedContent);
         return expandedContent.equals(cleanedContent)
             ? Pattern.quote(expandedContent)
-            : "(" +
-            Pattern.quote(expandedContent) +
-            ")|(" +
-            Pattern.quote(cleanedContent) +
-            ")";
+            : "(" + Pattern.quote(expandedContent) + ")|(" + Pattern.quote(cleanedContent) + ")";
     }
 
     /**
@@ -155,11 +144,8 @@ public List<Path> findAssociatedFiles(
      * @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));
@@ -228,12 +214,7 @@ private List<Path> findFile(
                     for (File subDir : subDirs) {
                         if (subDir.isDirectory()) {
                             resultFiles.addAll(
-                                findFile(
-                                    entry,
-                                    subDir.toPath(),
-                                    restOfFileString,
-                                    extensionRegExp
-                                )
+                                findFile(entry, subDir.toPath(), restOfFileString, extensionRegExp)
                             );
                         }
                     }
@@ -252,17 +233,10 @@ private List<Path> findFile(
                 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)
-                        )
+                        .filter(element -> isSubDirectory(rootDirectory, element))
                         .collect(Collectors.toList())) {
                         resultFiles.addAll(
-                            findFile(
-                                entry,
-                                path,
-                                restOfFileString,
-                                extensionRegExp
-                            )
+                            findFile(entry, path, restOfFileString, extensionRegExp)
                         );
                     }
                 } catch (UncheckedIOException ioe) {
@@ -272,11 +246,7 @@ private List<Path> findFile(
         }
 
         // Last step: check if the given file can be found in this directory
-        Pattern toMatch = createFileNamePattern(
-            fileParts,
-            extensionRegExp,
-            entry
-        );
+        Pattern toMatch = createFileNamePattern(fileParts, extensionRegExp, entry);
         BiPredicate<Path, BasicFileAttributes> matcher = (path, attributes) ->
             toMatch.matcher(path.getFileName().toString()).matches();
         try (
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 b4415484aba..75a149da4dd 100644
--- a/src/main/java/org/jabref/logic/util/io/XMLUtil.java
+++ b/src/main/java/org/jabref/logic/util/io/XMLUtil.java
@@ -50,9 +50,7 @@ public static void printDocument(Document doc) {
     }
 
     public static List<Node> asList(NodeList n) {
-        return n.getLength() == 0
-            ? Collections.emptyList()
-            : new NodeListWrapper(n);
+        return n.getLength() == 0 ? Collections.emptyList() : new NodeListWrapper(n);
     }
 
     /**
@@ -80,10 +78,7 @@ public static Optional<String> getNodeContent(Node item, String nodeName) {
      * For example,
      * <item attributeName="content" />
      */
-    public static Optional<String> getAttributeContent(
-        Node item,
-        String attributeName
-    ) {
+    public static Optional<String> getAttributeContent(Node item, String attributeName) {
         NamedNodeMap attributes = item.getAttributes();
         return Optional
             .ofNullable(attributes.getNamedItem(attributeName))
@@ -120,9 +115,7 @@ 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>.
-    private static final class NodeListWrapper
-        extends AbstractList<Node>
-        implements RandomAccess {
+    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 04cc3990e9b..8737a6037a6 100644
--- a/src/main/java/org/jabref/logic/util/strings/HTMLUnicodeConversionMaps.java
+++ b/src/main/java/org/jabref/logic/util/strings/HTMLUnicodeConversionMaps.java
@@ -9,19 +9,13 @@ public class HTMLUnicodeConversionMaps {
     // 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<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<>();
-    public static final Map<Integer, String> NUMERICAL_LATEX_CONVERSION_MAP =
-        new HashMap<>();
-    public static final Map<String, String> UNICODE_LATEX_CONVERSION_MAP =
-        new HashMap<>();
-    public static final Map<String, String> LATEX_HTML_CONVERSION_MAP =
-        new HashMap<>();
-    public static final Map<String, String> LATEX_UNICODE_CONVERSION_MAP =
-        new HashMap<>();
+    public static final Map<String, String> UNICODE_ESCAPED_ACCENTS = new HashMap<>();
+    public static final Map<Integer, String> NUMERICAL_LATEX_CONVERSION_MAP = new HashMap<>();
+    public static final Map<String, String> UNICODE_LATEX_CONVERSION_MAP = new HashMap<>();
+    public static final Map<String, String> LATEX_HTML_CONVERSION_MAP = new HashMap<>();
+    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
@@ -864,13 +858,8 @@ public class HTMLUnicodeConversionMaps {
                             "&" + aConversionList[1] + ";"
                         );
                     }
-                } else if (
-                    !(aConversionList[0].isEmpty()) && !strippedLaTeX.isEmpty()
-                ) {
-                    LATEX_HTML_CONVERSION_MAP.put(
-                        strippedLaTeX,
-                        "&#" + aConversionList[0] + ";"
-                    );
+                } else if (!(aConversionList[0].isEmpty()) && !strippedLaTeX.isEmpty()) {
+                    LATEX_HTML_CONVERSION_MAP.put(strippedLaTeX, "&#" + aConversionList[0] + ";");
                 }
                 if (!(aConversionList[0].isEmpty())) {
                     NUMERICAL_LATEX_CONVERSION_MAP.put(
@@ -879,34 +868,21 @@ public class HTMLUnicodeConversionMaps {
                     );
                     if (Integer.decode(aConversionList[0]) > 128) {
                         String unicodeSymbol = String.valueOf(
-                            Character.toChars(
-                                Integer.decode(aConversionList[0])
-                            )
-                        );
-                        UNICODE_LATEX_CONVERSION_MAP.put(
-                            unicodeSymbol,
-                            aConversionList[2]
+                            Character.toChars(Integer.decode(aConversionList[0]))
                         );
+                        UNICODE_LATEX_CONVERSION_MAP.put(unicodeSymbol, aConversionList[2]);
                         if (!strippedLaTeX.isEmpty()) {
-                            LATEX_UNICODE_CONVERSION_MAP.put(
-                                strippedLaTeX,
-                                unicodeSymbol
-                            );
+                            LATEX_UNICODE_CONVERSION_MAP.put(strippedLaTeX, unicodeSymbol);
                         }
                     }
                 }
             }
         }
         for (String[] anAccentList : ACCENT_LIST) {
-            ESCAPED_ACCENTS.put(
-                Integer.decode(anAccentList[0]),
-                anAccentList[1]
-            );
+            ESCAPED_ACCENTS.put(Integer.decode(anAccentList[0]), anAccentList[1]);
             UNICODE_ESCAPED_ACCENTS.put(
                 anAccentList[1],
-                String.valueOf(
-                    Character.toChars(Integer.decode(anAccentList[0]))
-                )
+                String.valueOf(Character.toChars(Integer.decode(anAccentList[0])))
             );
         }
         // Manually added values which are killed by cleanLaTeX
diff --git a/src/main/java/org/jabref/logic/util/strings/QuotedStringTokenizer.java b/src/main/java/org/jabref/logic/util/strings/QuotedStringTokenizer.java
index 2c97c5cc6a6..340713f5bc3 100644
--- a/src/main/java/org/jabref/logic/util/strings/QuotedStringTokenizer.java
+++ b/src/main/java/org/jabref/logic/util/strings/QuotedStringTokenizer.java
@@ -17,19 +17,13 @@ public class QuotedStringTokenizer {
      * @param delimiters     The delimiter characters.
      * @param quoteCharacter The quoting character. Every character (including, but not limited to, delimiters) that is preceded by this character is not treated as a delimiter, but as a token component.
      */
-    public QuotedStringTokenizer(
-        String content,
-        String delimiters,
-        char quoteCharacter
-    ) {
+    public QuotedStringTokenizer(String content, String delimiters, char quoteCharacter) {
         this.content = content;
         this.delimiters = delimiters;
         quoteChar = quoteCharacter;
         contentLength = this.content.length();
         // skip leading delimiters
-        while (
-            isDelimiter(this.content.charAt(index)) && index < contentLength
-        ) {
+        while (isDelimiter(this.content.charAt(index)) && index < contentLength) {
             ++index;
         }
     }
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 f3e47c9043d..7eb7b059126 100644
--- a/src/main/java/org/jabref/logic/util/strings/StringManipulator.java
+++ b/src/main/java/org/jabref/logic/util/strings/StringManipulator.java
@@ -38,11 +38,7 @@ private static ResultingStringState setWordCase(
         int caretPosition,
         LetterCase targetCase
     ) {
-        int nextWordBoundary = getNextWordBoundary(
-            caretPosition,
-            text,
-            Direction.NEXT
-        );
+        int nextWordBoundary = getNextWordBoundary(caretPosition, text, Direction.NEXT);
 
         // Preserve whitespaces
         int wordStartPosition = caretPosition;
@@ -68,9 +64,7 @@ private static ResultingStringState setWordCase(
 
         return new ResultingStringState(
             nextWordBoundary,
-            text.substring(0, wordStartPosition) +
-            result +
-            text.substring(nextWordBoundary)
+            text.substring(0, wordStartPosition) + result + text.substring(nextWordBoundary)
         );
     }
 
@@ -89,23 +83,17 @@ static ResultingStringState deleteUntilWordBoundary(
         Direction direction
     ) {
         // Define cutout range
-        int nextWordBoundary = getNextWordBoundary(
-            caretPosition,
-            text,
-            direction
-        );
+        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)
+                text.substring(0, caretPosition) + text.substring(nextWordBoundary)
             );
             case PREVIOUS -> new ResultingStringState(
                 nextWordBoundary,
-                text.substring(0, nextWordBoundary) +
-                text.substring(caretPosition)
+                text.substring(0, nextWordBoundary) + text.substring(caretPosition)
             );
         };
     }
@@ -119,41 +107,27 @@ static ResultingStringState deleteUntilWordBoundary(
      *
      * @return              The position of the next whitespace after a word
      */
-    static int getNextWordBoundary(
-        int caretPosition,
-        String text,
-        Direction direction
-    ) {
+    static int getNextWordBoundary(int caretPosition, String text, Direction direction) {
         int i = caretPosition;
 
         if (direction == Direction.PREVIOUS) {
             // Swallow whitespaces
-            while (
-                i > 0 &&
-                Character.isWhitespace((text.charAt(i + direction.OFFSET)))
-            ) {
+            while (i > 0 && Character.isWhitespace((text.charAt(i + direction.OFFSET)))) {
                 i += direction.OFFSET;
             }
 
             // Read next word
-            while (
-                i > 0 &&
-                !Character.isWhitespace(text.charAt(i + direction.OFFSET))
-            ) {
+            while (i > 0 && !Character.isWhitespace(text.charAt(i + direction.OFFSET))) {
                 i += direction.OFFSET;
             }
         } else if (direction == Direction.NEXT) {
             // Swallow whitespaces
-            while (
-                i < text.length() && Character.isWhitespace(text.charAt(i))
-            ) {
+            while (i < text.length() && Character.isWhitespace(text.charAt(i))) {
                 i += direction.OFFSET;
             }
 
             // Read next word
-            while (
-                i < text.length() && !Character.isWhitespace((text.charAt(i)))
-            ) {
+            while (i < text.length() && !Character.isWhitespace((text.charAt(i)))) {
                 i += direction.OFFSET;
             }
         }
@@ -169,10 +143,7 @@ static int getNextWordBoundary(
      *
      * @return String       The resulting text and caret position.
      */
-    public static ResultingStringState capitalize(
-        int caretPosition,
-        String text
-    ) {
+    public static ResultingStringState capitalize(int caretPosition, String text) {
         return setWordCase(text, caretPosition, LetterCase.CAPITALIZED);
     }
 
@@ -184,10 +155,7 @@ public static ResultingStringState capitalize(
      *
      * @return String       The resulting text and caret position.
      */
-    public static ResultingStringState uppercase(
-        int caretPosition,
-        String text
-    ) {
+    public static ResultingStringState uppercase(int caretPosition, String text) {
         return setWordCase(text, caretPosition, LetterCase.UPPER);
     }
 
@@ -199,10 +167,7 @@ public static ResultingStringState uppercase(
      *
      * @return String       The resulting text and caret position.
      */
-    public static ResultingStringState lowercase(
-        int caretPosition,
-        String text
-    ) {
+    public static ResultingStringState lowercase(int caretPosition, String text) {
         return setWordCase(text, caretPosition, LetterCase.LOWER);
     }
 
@@ -214,10 +179,7 @@ public static ResultingStringState lowercase(
      *
      * @return String       The resulting text and caret position.
      */
-    public static ResultingStringState killWord(
-        int caretPosition,
-        String text
-    ) {
+    public static ResultingStringState killWord(int caretPosition, String text) {
         return deleteUntilWordBoundary(caretPosition, text, Direction.NEXT);
     }
 
@@ -229,10 +191,7 @@ public static ResultingStringState killWord(
      *
      * @return String       The resulting text and caret position.
      */
-    public static ResultingStringState backwardKillWord(
-        int caretPosition,
-        String text
-    ) {
+    public static ResultingStringState backwardKillWord(int caretPosition, String text) {
         return deleteUntilWordBoundary(caretPosition, text, Direction.PREVIOUS);
     }
 }
diff --git a/src/main/java/org/jabref/logic/xmp/DocumentInformationExtractor.java b/src/main/java/org/jabref/logic/xmp/DocumentInformationExtractor.java
index af6c6834267..448bb680884 100644
--- a/src/main/java/org/jabref/logic/xmp/DocumentInformationExtractor.java
+++ b/src/main/java/org/jabref/logic/xmp/DocumentInformationExtractor.java
@@ -19,9 +19,7 @@ public class DocumentInformationExtractor {
 
     private final BibEntry bibEntry;
 
-    public DocumentInformationExtractor(
-        PDDocumentInformation documentInformation
-    ) {
+    public DocumentInformationExtractor(PDDocumentInformation documentInformation) {
         this.documentInformation = documentInformation;
 
         this.bibEntry = new BibEntry();
diff --git a/src/main/java/org/jabref/logic/xmp/DublinCoreExtractor.java b/src/main/java/org/jabref/logic/xmp/DublinCoreExtractor.java
index 9b4c763abe4..3be48e81b43 100644
--- a/src/main/java/org/jabref/logic/xmp/DublinCoreExtractor.java
+++ b/src/main/java/org/jabref/logic/xmp/DublinCoreExtractor.java
@@ -38,17 +38,14 @@ public class DublinCoreExtractor {
     public static final String DC_RIGHTS = "rights";
     public static final String DC_SOURCE = "source";
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(
-        DublinCoreExtractor.class
-    );
+    private static final Logger LOGGER = LoggerFactory.getLogger(DublinCoreExtractor.class);
 
     private final DublinCoreSchema dcSchema;
     private final XmpPreferences xmpPreferences;
 
     private final BibEntry bibEntry;
 
-    private final UnprotectTermsFormatter unprotectTermsFormatter =
-        new UnprotectTermsFormatter();
+    private final UnprotectTermsFormatter unprotectTermsFormatter = new UnprotectTermsFormatter();
 
     /**
      * @param dcSchema      Metadata in DublinCore format.
@@ -70,10 +67,7 @@ public DublinCoreExtractor(
     private void extractEditor() {
         List<String> contributors = dcSchema.getContributors();
         if ((contributors != null) && !contributors.isEmpty()) {
-            bibEntry.setField(
-                StandardField.EDITOR,
-                String.join(" and ", contributors)
-            );
+            bibEntry.setField(StandardField.EDITOR, String.join(" and ", contributors));
         }
     }
 
@@ -83,10 +77,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));
         }
     }
 
@@ -103,19 +94,13 @@ private void extractDate() {
                     dateValue
                         .getDay()
                         .ifPresent(day ->
-                            bibEntry.setField(
-                                StandardField.DAY,
-                                Integer.toString(day)
-                            )
+                            bibEntry.setField(StandardField.DAY, Integer.toString(day))
                         );
                     dateValue.getMonth().ifPresent(bibEntry::setMonth);
                     dateValue
                         .getYear()
                         .ifPresent(year ->
-                            bibEntry.setField(
-                                StandardField.YEAR,
-                                Integer.toString(year)
-                            )
+                            bibEntry.setField(StandardField.YEAR, Integer.toString(year))
                         );
                 });
         }
@@ -152,10 +137,7 @@ private void extractDOI() {
     private void extractPublisher() {
         List<String> publishers = dcSchema.getPublishers();
         if ((publishers != null) && !publishers.isEmpty()) {
-            bibEntry.setField(
-                StandardField.PUBLISHER,
-                String.join(" and ", publishers)
-            );
+            bibEntry.setField(StandardField.PUBLISHER, String.join(" and ", publishers));
         }
     }
 
@@ -189,10 +171,7 @@ private void extractBibTexFields() {
         };
         List<String> relationships = dcSchema.getRelations();
         if (relationships != null) {
-            relationships
-                .stream()
-                .filter(isBibTeXElement)
-                .forEach(splitBibTeXElement);
+            relationships.stream().filter(isBibTeXElement).forEach(splitBibTeXElement);
         }
     }
 
@@ -227,10 +206,7 @@ private void extractSource() {
     private void extractSubject() {
         List<String> subjects = dcSchema.getSubjects();
         if ((subjects != null) && !subjects.isEmpty()) {
-            bibEntry.addKeywords(
-                subjects,
-                xmpPreferences.getKeywordSeparator()
-            );
+            bibEntry.addKeywords(subjects, xmpPreferences.getKeywordSeparator());
         }
     }
 
@@ -382,9 +358,7 @@ private void fillPublisher(String publisher) {
      * BibTeX: keywords; DC: 'dc:subject'
      */
     private void fillKeywords(String value) {
-        String[] keywords = value.split(
-            xmpPreferences.getKeywordSeparator().toString()
-        );
+        String[] keywords = value.split(xmpPreferences.getKeywordSeparator().toString());
         for (String keyword : keywords) {
             dcSchema.addSubject(keyword.trim());
         }
@@ -441,10 +415,7 @@ private void fillCustomField(Field field) {
      */
     private void fillType() {
         // BibTeX: entry type; DC: 'dc:type'
-        TypedBibEntry typedEntry = new TypedBibEntry(
-            bibEntry,
-            BibDatabaseMode.BIBTEX
-        );
+        TypedBibEntry typedEntry = new TypedBibEntry(bibEntry, BibDatabaseMode.BIBTEX);
         String typeForDisplay = typedEntry.getTypeForDisplay();
         if (!typeForDisplay.isEmpty()) {
             dcSchema.addType(typeForDisplay);
@@ -461,24 +432,16 @@ private void fillType() {
      */
     public void fillDublinCoreSchema() {
         // Query privacy filter settings
-        boolean useXmpPrivacyFilter =
-            xmpPreferences.shouldUseXmpPrivacyFilter();
+        boolean useXmpPrivacyFilter = xmpPreferences.shouldUseXmpPrivacyFilter();
 
-        SortedSet<Field> fields = new TreeSet<>(
-            Comparator.comparing(Field::getName)
-        );
+        SortedSet<Field> fields = new TreeSet<>(Comparator.comparing(Field::getName));
         fields.addAll(bibEntry.getFields());
         for (Field field : fields) {
-            if (
-                useXmpPrivacyFilter &&
-                xmpPreferences.getXmpPrivacyFilter().contains(field)
-            ) {
+            if (useXmpPrivacyFilter && xmpPreferences.getXmpPrivacyFilter().contains(field)) {
                 continue;
             }
 
-            String value = unprotectTermsFormatter.format(
-                bibEntry.getField(field).get()
-            );
+            String value = unprotectTermsFormatter.format(bibEntry.getField(field).get());
             if (field instanceof StandardField standardField) {
                 switch (standardField) {
                     case EDITOR -> this.fillContributor(value);
diff --git a/src/main/java/org/jabref/logic/xmp/XmpPreferences.java b/src/main/java/org/jabref/logic/xmp/XmpPreferences.java
index ebd56c03d8b..209275b77d9 100644
--- a/src/main/java/org/jabref/logic/xmp/XmpPreferences.java
+++ b/src/main/java/org/jabref/logic/xmp/XmpPreferences.java
@@ -19,8 +19,7 @@ public XmpPreferences(
         Set<Field> xmpPrivacyFilter,
         ObjectProperty<Character> keywordSeparator
     ) {
-        this.useXmpPrivacyFilter =
-            new SimpleBooleanProperty(useXmpPrivacyFilter);
+        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 a491b8a763b..db9520e2213 100644
--- a/src/main/java/org/jabref/logic/xmp/XmpUtilReader.java
+++ b/src/main/java/org/jabref/logic/xmp/XmpUtilReader.java
@@ -22,19 +22,14 @@
 
 public class XmpUtilReader {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(
-        XmpUtilReader.class
-    );
+    private static final Logger LOGGER = LoggerFactory.getLogger(XmpUtilReader.class);
 
     private static final String START_TAG = "<rdf:Description";
     private static final String END_TAG = "</rdf:Description>";
 
     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
     }
 
     /**
@@ -60,8 +55,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<>();
 
         try (PDDocument document = loadWithAutomaticDecryption(path)) {
@@ -70,37 +64,32 @@ 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()
-                            );
-                        Optional<BibEntry> entry =
-                            dcExtractor.extractBibtexEntry();
+                        DublinCoreExtractor dcExtractor = new DublinCoreExtractor(
+                            dcSchema,
+                            xmpPreferences,
+                            new BibEntry()
+                        );
+                        Optional<BibEntry> entry = dcExtractor.extractBibtexEntry();
                         entry.ifPresent(result::add);
                     }
                 }
             }
             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);
+                PDDocumentInformation documentInformation = document.getDocumentInformation();
+                DocumentInformationExtractor diExtractor = new DocumentInformationExtractor(
+                    documentInformation
+                );
                 Optional<BibEntry> entry = diExtractor.extractBibtexEntry();
                 entry.ifPresent(result::add);
             }
         }
 
-        result.forEach(entry ->
-            entry.addFile(new LinkedFile("", path.toAbsolutePath(), "PDF"))
-        );
+        result.forEach(entry -> entry.addFile(new LinkedFile("", path.toAbsolutePath(), "PDF")));
         return result;
     }
 
@@ -154,10 +143,7 @@ private List<XMPMetadata> getXmpMetadata(PDDocument document) {
                     )
                 );
             } catch (IOException ex) {
-                LOGGER.warn(
-                    "Problem parsing XMP schema. Continuing with other schemas.",
-                    ex
-                );
+                LOGGER.warn("Problem parsing XMP schema. Continuing with other schemas.", ex);
             }
         }
         return metaList;
@@ -169,8 +155,7 @@ private List<XMPMetadata> getXmpMetadata(PDDocument document) {
      * @param path The path to load.
      * @throws IOException from the underlying @link PDDocument#load(File)
      */
-    public PDDocument loadWithAutomaticDecryption(Path path)
-        throws IOException {
+    public PDDocument loadWithAutomaticDecryption(Path path) throws IOException {
         // try to load the document
         // also uses an empty string as default password
         return Loader.loadPDF(path.toFile());
diff --git a/src/main/java/org/jabref/logic/xmp/XmpUtilShared.java b/src/main/java/org/jabref/logic/xmp/XmpUtilShared.java
index 085bef1abbf..bd898177c46 100644
--- a/src/main/java/org/jabref/logic/xmp/XmpUtilShared.java
+++ b/src/main/java/org/jabref/logic/xmp/XmpUtilShared.java
@@ -16,14 +16,11 @@
  */
 public class XmpUtilShared {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(
-        XmpUtilShared.class
-    );
+    private static final Logger LOGGER = LoggerFactory.getLogger(XmpUtilShared.class);
 
     private XmpUtilShared() {}
 
-    protected static XMPMetadata parseXmpMetadata(InputStream is)
-        throws IOException {
+    protected static XMPMetadata parseXmpMetadata(InputStream is) throws IOException {
         XMPMetadata meta;
         try {
             DomXmpParser parser = new DomXmpParser();
@@ -45,22 +42,15 @@ protected static XMPMetadata parseXmpMetadata(InputStream is)
      * @param path the path to the PDF.
      * @return whether a BibEntry was found in the given PDF.
      */
-    public static boolean hasMetadata(
-        Path path,
-        XmpPreferences xmpPreferences
-    ) {
+    public static boolean hasMetadata(Path path, XmpPreferences xmpPreferences) {
         try {
-            List<BibEntry> bibEntries = new XmpUtilReader()
-                .readXmp(path, xmpPreferences);
+            List<BibEntry> bibEntries = new XmpUtilReader().readXmp(path, xmpPreferences);
             return !bibEntries.isEmpty();
         } catch (EncryptedPdfsNotSupportedException ex) {
             LOGGER.info("Encryption not supported by XMPUtil");
             return false;
         } catch (IOException e) {
-            XmpUtilShared.LOGGER.debug(
-                "No metadata was found. Path: {}",
-                path.toString()
-            );
+            XmpUtilShared.LOGGER.debug("No metadata was found. Path: {}", path.toString());
             return false;
         }
     }
diff --git a/src/main/java/org/jabref/logic/xmp/XmpUtilWriter.java b/src/main/java/org/jabref/logic/xmp/XmpUtilWriter.java
index 3a27a017faa..a51560b281d 100644
--- a/src/main/java/org/jabref/logic/xmp/XmpUtilWriter.java
+++ b/src/main/java/org/jabref/logic/xmp/XmpUtilWriter.java
@@ -41,12 +41,9 @@ public class XmpUtilWriter {
 
     private static final String XMP_BEGIN_END_TAG = "?xpacket";
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(
-        XmpUtilWriter.class
-    );
+    private static final Logger LOGGER = LoggerFactory.getLogger(XmpUtilWriter.class);
 
-    private final UnprotectTermsFormatter unprotectTermsFormatter =
-        new UnprotectTermsFormatter();
+    private final UnprotectTermsFormatter unprotectTermsFormatter = new UnprotectTermsFormatter();
     private final XmpPreferences xmpPreferences;
 
     public XmpUtilWriter(XmpPreferences xmpPreferences) {
@@ -86,11 +83,7 @@ public void writeXmp(Path file, BibEntry entry, BibDatabase database)
      * @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);
     }
@@ -102,11 +95,7 @@ private void writeToDCSchema(
      * @param entry     The entry, which is added to the dublin core metadata.
      */
     private void writeToDCSchema(DublinCoreSchema dcSchema, BibEntry entry) {
-        DublinCoreExtractor dcExtractor = new DublinCoreExtractor(
-            dcSchema,
-            xmpPreferences,
-            entry
-        );
+        DublinCoreExtractor dcExtractor = new DublinCoreExtractor(dcSchema, xmpPreferences, entry);
         dcExtractor.fillDublinCoreSchema();
     }
 
@@ -120,11 +109,8 @@ private void writeToDCSchema(DublinCoreSchema dcSchema, BibEntry entry) {
      * @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
-    ) throws IOException, TransformerException {
+    private void writeDublinCore(PDDocument document, List<BibEntry> entries, BibDatabase database)
+        throws IOException, TransformerException {
         List<BibEntry> resolvedEntries;
         if (database == null) {
             resolvedEntries = entries;
@@ -140,8 +126,7 @@ private void writeDublinCore(
             meta = XMPMetadata.createXMPMetadata();
         } else {
             try {
-                meta =
-                    XmpUtilShared.parseXmpMetadata(metaRaw.createInputStream());
+                meta = XmpUtilShared.parseXmpMetadata(metaRaw.createInputStream());
                 // In case, that the pdf file has no namespace definition for xmp,
                 // but metadata in a different format, the parser throws an exception
                 // Creating an empty xmp metadata element solves this problem
@@ -154,10 +139,9 @@ private void writeDublinCore(
         meta.removeSchema(meta.getDublinCoreSchema());
 
         for (BibEntry entry : resolvedEntries) {
-            DublinCoreSchema dcSchema =
-                DublinCoreSchemaCustom.copyDublinCoreSchema(
-                    meta.createAndAddDublinCoreSchema()
-                );
+            DublinCoreSchema dcSchema = DublinCoreSchemaCustom.copyDublinCoreSchema(
+                meta.createAndAddDublinCoreSchema()
+            );
             writeToDCSchema(dcSchema, entry, null);
         }
 
@@ -189,16 +173,10 @@ private String generateXmpStringWithXmpDeclaration(List<BibEntry> entries) {
             serializer.serialize(meta, os, true);
             return os.toString(StandardCharsets.UTF_8);
         } catch (TransformerException e) {
-            LOGGER.warn(
-                "Transformation into XMP not possible: " + e.getMessage(),
-                e
-            );
+            LOGGER.warn("Transformation into XMP not possible: " + e.getMessage(), e);
             return "";
         } catch (UnsupportedEncodingException e) {
-            LOGGER.warn(
-                "Unsupported encoding to UTF-8 of bib entries in XMP metadata.",
-                e
-            );
+            LOGGER.warn("Unsupported encoding to UTF-8 of bib entries in XMP metadata.", e);
             return "";
         } catch (IOException e) {
             LOGGER.warn("IO Exception thrown by closing the output stream.", e);
@@ -216,9 +194,7 @@ private String generateXmpStringWithXmpDeclaration(List<BibEntry> entries) {
      * @return  If something goes wrong (e.g. an exception is thrown), the method returns an empty string,
      *          otherwise it returns the xmp metadata without metadata description as a string in dublin core format.
      */
-    public String generateXmpStringWithoutXmpDeclaration(
-        List<BibEntry> entries
-    ) {
+    public String generateXmpStringWithoutXmpDeclaration(List<BibEntry> entries) {
         String xmpContent = generateXmpStringWithXmpDeclaration(entries);
         // remove the <?xpacket *> tags to enable the usage of the CTAN package xmpincl
         Predicate<String> isBeginOrEndTag = s -> s.contains(XMP_BEGIN_END_TAG);
@@ -251,13 +227,9 @@ private void writeDocumentInformation(
         PDDocumentInformation di = document.getDocumentInformation();
         BibEntry resolvedEntry = getDefaultOrDatabaseEntry(entry, database);
 
-        boolean useXmpPrivacyFilter =
-            xmpPreferences.shouldUseXmpPrivacyFilter();
+        boolean useXmpPrivacyFilter = xmpPreferences.shouldUseXmpPrivacyFilter();
         for (Field field : resolvedEntry.getFields()) {
-            if (
-                useXmpPrivacyFilter &&
-                xmpPreferences.getXmpPrivacyFilter().contains(field)
-            ) {
+            if (useXmpPrivacyFilter && xmpPreferences.getXmpPrivacyFilter().contains(field)) {
                 // erase field instead of adding it
                 if (StandardField.AUTHOR == field) {
                     di.setAuthor(null);
@@ -274,9 +246,7 @@ private void writeDocumentInformation(
             }
 
             // LaTeX content is removed from the string for "standard" fields in the PDF
-            String value = unprotectTermsFormatter.format(
-                resolvedEntry.getField(field).get()
-            );
+            String value = unprotectTermsFormatter.format(resolvedEntry.getField(field).get());
 
             if (StandardField.AUTHOR == field) {
                 di.setAuthor(value);
@@ -288,16 +258,10 @@ private void writeDocumentInformation(
                 di.setSubject(value);
             } else {
                 // We hit the case of an PDF-unsupported field --> write it directly
-                di.setCustomMetadataValue(
-                    "bibtex/" + field,
-                    resolvedEntry.getField(field).get()
-                );
+                di.setCustomMetadataValue("bibtex/" + field, resolvedEntry.getField(field).get());
             }
         }
-        di.setCustomMetadataValue(
-            "bibtex/entrytype",
-            resolvedEntry.getType().getDisplayName()
-        );
+        di.setCustomMetadataValue("bibtex/entrytype", resolvedEntry.getType().getDisplayName());
     }
 
     /**
@@ -319,11 +283,8 @@ private void writeDocumentInformation(
      * @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
-    ) throws IOException, TransformerException {
+    public void writeXmp(Path path, List<BibEntry> bibtexEntries, BibDatabase database)
+        throws IOException, TransformerException {
         List<BibEntry> resolvedEntries;
         if (database == null) {
             resolvedEntries = bibtexEntries;
@@ -342,11 +303,7 @@ public void writeXmp(
 
             // Write schemas (PDDocumentInformation and DublinCoreSchema) to the document metadata
             if (!resolvedEntries.isEmpty()) {
-                writeDocumentInformation(
-                    document,
-                    resolvedEntries.get(0),
-                    null
-                );
+                writeDocumentInformation(document, resolvedEntries.get(0), null);
                 writeDublinCore(document, resolvedEntries, null);
             }
 
@@ -365,10 +322,7 @@ public void writeXmp(
         Files.delete(newFile);
     }
 
-    private BibEntry getDefaultOrDatabaseEntry(
-        BibEntry defaultEntry,
-        BibDatabase database
-    ) {
+    private BibEntry getDefaultOrDatabaseEntry(BibEntry defaultEntry, BibDatabase database) {
         if (database == null) {
             return defaultEntry;
         } else {
diff --git a/src/main/java/org/jabref/migrations/ConvertLegacyExplicitGroups.java b/src/main/java/org/jabref/migrations/ConvertLegacyExplicitGroups.java
index d73341c1446..71d7e978ca2 100644
--- a/src/main/java/org/jabref/migrations/ConvertLegacyExplicitGroups.java
+++ b/src/main/java/org/jabref/migrations/ConvertLegacyExplicitGroups.java
@@ -35,9 +35,7 @@ public void performMigration(ParserResult parserResult) {
         }
     }
 
-    private List<ExplicitGroup> getExplicitGroupsWithLegacyKeys(
-        GroupTreeNode node
-    ) {
+    private List<ExplicitGroup> getExplicitGroupsWithLegacyKeys(GroupTreeNode node) {
         Objects.requireNonNull(node);
         List<ExplicitGroup> findings = new ArrayList<>();
 
@@ -50,9 +48,7 @@ private List<ExplicitGroup> getExplicitGroupsWithLegacyKeys(
 
         node
             .getChildren()
-            .forEach(child ->
-                findings.addAll(getExplicitGroupsWithLegacyKeys(child))
-            );
+            .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 767cf1c08bd..8fa6a816106 100644
--- a/src/main/java/org/jabref/migrations/ConvertMarkingToGroups.java
+++ b/src/main/java/org/jabref/migrations/ConvertMarkingToGroups.java
@@ -25,39 +25,25 @@
  */
 public class ConvertMarkingToGroups implements PostOpenMigration {
 
-    private static final Pattern MARKING_PATTERN = Pattern.compile(
-        "\\[(.*):(\\d+)\\]"
-    );
+    private static final Pattern MARKING_PATTERN = Pattern.compile("\\[(.*):(\\d+)\\]");
 
     @Override
     public void performMigration(ParserResult parserResult) {
         Objects.requireNonNull(parserResult);
 
-        ObservableList<BibEntry> entries = parserResult
-            .getDatabase()
-            .getEntries();
+        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,
-                    ','
-                )
+                new ExplicitGroup(Localization.lang("Markings"), GroupHierarchyType.INCLUDING, ',')
             );
 
-            for (Map.Entry<String, Collection<BibEntry>> marking : markings
-                .asMap()
-                .entrySet()) {
+            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,
-                        ','
-                    )
+                    new ExplicitGroup(markingName, GroupHierarchyType.INCLUDING, ',')
                 );
                 markingGroup.addEntriesToGroup(markingMatchedEntries);
             }
@@ -65,11 +51,7 @@ public void performMigration(ParserResult parserResult) {
             if (!parserResult.getMetaData().getGroups().isPresent()) {
                 parserResult
                     .getMetaData()
-                    .setGroups(
-                        GroupTreeNode.fromGroup(
-                            DefaultGroupsFactory.getAllEntriesGroup()
-                        )
-                    );
+                    .setGroups(GroupTreeNode.fromGroup(DefaultGroupsFactory.getAllEntriesGroup()));
             }
             GroupTreeNode root = parserResult.getMetaData().getGroups().get();
             root.addChild(markingRoot, 0);
@@ -82,18 +64,11 @@ public void performMigration(ParserResult parserResult) {
     /**
      * Looks for markings (such as __markedentry = {[Nicolas:6]}) in the given list of entries.
      */
-    private Multimap<String, BibEntry> getMarkingWithEntries(
-        List<BibEntry> entries
-    ) {
-        Multimap<String, BibEntry> markings = MultimapBuilder
-            .treeKeys()
-            .linkedListValues()
-            .build();
+    private Multimap<String, BibEntry> getMarkingWithEntries(List<BibEntry> entries) {
+        Multimap<String, BibEntry> markings = MultimapBuilder.treeKeys().linkedListValues().build();
 
         for (BibEntry entry : entries) {
-            Optional<String> marking = entry.getField(
-                InternalField.MARKED_INTERNAL
-            );
+            Optional<String> marking = entry.getField(InternalField.MARKED_INTERNAL);
             if (!marking.isPresent()) {
                 continue;
             }
@@ -113,7 +88,6 @@ private Multimap<String, BibEntry> getMarkingWithEntries(
     }
 
     private void clearMarkings(List<BibEntry> entries) {
-        entries.forEach(entry -> entry.clearField(InternalField.MARKED_INTERNAL)
-        );
+        entries.forEach(entry -> entry.clearField(InternalField.MARKED_INTERNAL));
     }
 }
diff --git a/src/main/java/org/jabref/migrations/CustomEntryTypePreferenceMigration.java b/src/main/java/org/jabref/migrations/CustomEntryTypePreferenceMigration.java
index 1d4a5b1fe7d..eb9372d1b3c 100644
--- a/src/main/java/org/jabref/migrations/CustomEntryTypePreferenceMigration.java
+++ b/src/main/java/org/jabref/migrations/CustomEntryTypePreferenceMigration.java
@@ -32,10 +32,7 @@ static void upgradeStoredBibEntryTypes(
         int number = 0;
         Optional<BibEntryType> type;
         while ((type = getBibEntryType(number, preferences)).isPresent()) {
-            entryTypesManager.addCustomOrModifiedType(
-                type.get(),
-                defaultBibDatabaseMode
-            );
+            entryTypesManager.addCustomOrModifiedType(type.get(), defaultBibDatabaseMode);
             storedOldTypes.add(type.get());
             number++;
         }
@@ -59,25 +56,17 @@ private static Optional<BibEntryType> getBibEntryType(
         }
         List<String> req = preferences.getStringList(CUSTOM_TYPE_REQ + nr);
         List<String> opt = preferences.getStringList(CUSTOM_TYPE_OPT + nr);
-        List<String> priOpt = preferences.getStringList(
-            CUSTOM_TYPE_PRIOPT + 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.toList())
+                req.stream().map(FieldFactory::parseOrFields).collect(Collectors.toList())
             );
         if (priOpt.isEmpty()) {
             entryTypeBuilder =
                 entryTypeBuilder.withImportantFields(
-                    opt
-                        .stream()
-                        .map(FieldFactory::parseField)
-                        .collect(Collectors.toSet())
+                    opt.stream().map(FieldFactory::parseField).collect(Collectors.toSet())
                 );
             return Optional.of(entryTypeBuilder.build());
         } else {
@@ -87,16 +76,10 @@ private static Optional<BibEntryType> getBibEntryType(
             entryTypeBuilder =
                 entryTypeBuilder
                     .withImportantFields(
-                        priOpt
-                            .stream()
-                            .map(FieldFactory::parseField)
-                            .collect(Collectors.toSet())
+                        priOpt.stream().map(FieldFactory::parseField).collect(Collectors.toSet())
                     )
                     .withDetailFields(
-                        secondary
-                            .stream()
-                            .map(FieldFactory::parseField)
-                            .collect(Collectors.toSet())
+                        secondary.stream().map(FieldFactory::parseField).collect(Collectors.toSet())
                     );
             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 078defb6666..f8a3757dbbf 100644
--- a/src/main/java/org/jabref/migrations/MergeReviewIntoCommentMigration.java
+++ b/src/main/java/org/jabref/migrations/MergeReviewIntoCommentMigration.java
@@ -21,34 +21,24 @@ public static boolean needsMigration(ParserResult parserResult) {
             .getDatabase()
             .getEntries()
             .stream()
-            .anyMatch(bibEntry ->
-                bibEntry.getField(StandardField.REVIEW).isPresent()
-            );
+            .anyMatch(bibEntry -> bibEntry.getField(StandardField.REVIEW).isPresent());
     }
 
     public void performMigration(ParserResult parserResult) {
         /* This migration only handles the non-conflicting entries.
          * For the other see this.performConflictingMigration().
          */
-        List<BibEntry> entries = Objects
-            .requireNonNull(parserResult)
-            .getDatabase()
-            .getEntries();
+        List<BibEntry> entries = Objects.requireNonNull(parserResult).getDatabase().getEntries();
 
         entries
             .stream()
             .filter(MergeReviewIntoCommentMigration::hasReviewField)
-            .filter(entry ->
-                !MergeReviewIntoCommentMigration.hasCommentField(entry)
-            )
+            .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();
+        List<BibEntry> entries = Objects.requireNonNull(parserResult).getDatabase().getEntries();
 
         return entries
             .stream()
@@ -58,8 +48,7 @@ public static List<BibEntry> collectConflicts(ParserResult parserResult) {
     }
 
     public void performConflictingMigration(ParserResult parserResult) {
-        collectConflicts(parserResult)
-            .forEach(entry -> migrate(entry, parserResult));
+        collectConflicts(parserResult).forEach(entry -> migrate(entry, parserResult));
     }
 
     private static boolean hasCommentField(BibEntry entry) {
@@ -92,10 +81,7 @@ private void migrate(BibEntry entry, ParserResult parserResult) {
         if (hasReviewField(entry)) {
             updateFields(
                 entry,
-                mergeCommentFieldIfPresent(
-                    entry,
-                    entry.getField(StandardField.REVIEW).get()
-                )
+                mergeCommentFieldIfPresent(entry, entry.getField(StandardField.REVIEW).get())
             );
             parserResult.wasChangedOnMigration();
         }
diff --git a/src/main/java/org/jabref/migrations/PreferencesMigrations.java b/src/main/java/org/jabref/migrations/PreferencesMigrations.java
index 31642168b9b..0879a8eca9e 100644
--- a/src/main/java/org/jabref/migrations/PreferencesMigrations.java
+++ b/src/main/java/org/jabref/migrations/PreferencesMigrations.java
@@ -33,9 +33,7 @@
 
 public class PreferencesMigrations {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(
-        PreferencesMigrations.class
-    );
+    private static final Logger LOGGER = LoggerFactory.getLogger(PreferencesMigrations.class);
 
     private PreferencesMigrations() {}
 
@@ -53,11 +51,7 @@ public static void runMigrations(
         upgradeFaultyEncodingStrings(preferences);
         upgradeLabelPatternToCitationKeyPattern(preferences, mainPrefsNode);
         upgradeImportFileAndDirePatterns(preferences, mainPrefsNode);
-        upgradeStoredBibEntryTypes(
-            preferences,
-            mainPrefsNode,
-            entryTypesManager
-        );
+        upgradeStoredBibEntryTypes(preferences, mainPrefsNode, entryTypesManager);
         upgradeKeyBindingsToJavaFX(preferences);
         addCrossRefRelatedFieldsForAutoComplete(preferences);
         upgradePreviewStyle(preferences);
@@ -78,18 +72,11 @@ private static void upgradePrefsToOrgJabRef(Preferences mainPrefsNode) {
         try {
             if (mainPrefsNode.childrenNames().length != 0) {
                 // skip further processing as prefs already have been migrated
-                LOGGER.debug(
-                    "New prefs node already exists with content - skipping migration"
-                );
+                LOGGER.debug("New prefs node already exists with content - skipping migration");
             } else {
-                if (
-                    mainPrefsNode.parent().parent().nodeExists("net/sf/jabref")
-                ) {
+                if (mainPrefsNode.parent().parent().nodeExists("net/sf/jabref")) {
                     LOGGER.info("Migrating old preferences.");
-                    Preferences oldNode = mainPrefsNode
-                        .parent()
-                        .parent()
-                        .node("net/sf/jabref");
+                    Preferences oldNode = mainPrefsNode.parent().parent().node("net/sf/jabref");
                     copyPrefsRecursively(oldNode, mainPrefsNode);
                 }
             }
@@ -147,10 +134,7 @@ private static void upgradeFaultyEncodingStrings(JabRefPreferences prefs) {
         encodingMap.put("EUC_JP", "EUC-JP");
 
         if (encodingMap.containsKey(defaultEncoding)) {
-            prefs.put(
-                JabRefPreferences.DEFAULT_ENCODING,
-                encodingMap.get(defaultEncoding)
-            );
+            prefs.put(JabRefPreferences.DEFAULT_ENCODING, encodingMap.get(defaultEncoding));
         }
     }
 
@@ -161,14 +145,9 @@ private static void upgradeFaultyEncodingStrings(JabRefPreferences prefs) {
      * exist
      */
     private static void upgradeSortOrder(JabRefPreferences prefs) {
-        if (
-            prefs.get(JabRefPreferences.EXPORT_IN_SPECIFIED_ORDER, null) == null
-        ) {
+        if (prefs.get(JabRefPreferences.EXPORT_IN_SPECIFIED_ORDER, null) == null) {
             if (prefs.getBoolean("exportInStandardOrder", false)) {
-                prefs.putBoolean(
-                    JabRefPreferences.EXPORT_IN_SPECIFIED_ORDER,
-                    true
-                );
+                prefs.putBoolean(JabRefPreferences.EXPORT_IN_SPECIFIED_ORDER, true);
                 prefs.put(
                     JabRefPreferences.EXPORT_PRIMARY_SORT_FIELD,
                     StandardField.AUTHOR.getName()
@@ -181,24 +160,12 @@ private static void upgradeSortOrder(JabRefPreferences prefs) {
                     JabRefPreferences.EXPORT_TERTIARY_SORT_FIELD,
                     StandardField.YEAR.getName()
                 );
-                prefs.putBoolean(
-                    JabRefPreferences.EXPORT_PRIMARY_SORT_DESCENDING,
-                    false
-                );
-                prefs.putBoolean(
-                    JabRefPreferences.EXPORT_SECONDARY_SORT_DESCENDING,
-                    false
-                );
-                prefs.putBoolean(
-                    JabRefPreferences.EXPORT_TERTIARY_SORT_DESCENDING,
-                    false
-                );
+                prefs.putBoolean(JabRefPreferences.EXPORT_PRIMARY_SORT_DESCENDING, false);
+                prefs.putBoolean(JabRefPreferences.EXPORT_SECONDARY_SORT_DESCENDING, false);
+                prefs.putBoolean(JabRefPreferences.EXPORT_TERTIARY_SORT_DESCENDING, false);
             } else if (prefs.getBoolean("exportInTitleOrder", false)) {
                 // exportInTitleOrder => title, author, editor
-                prefs.putBoolean(
-                    JabRefPreferences.EXPORT_IN_SPECIFIED_ORDER,
-                    true
-                );
+                prefs.putBoolean(JabRefPreferences.EXPORT_IN_SPECIFIED_ORDER, true);
                 prefs.put(
                     JabRefPreferences.EXPORT_PRIMARY_SORT_FIELD,
                     StandardField.TITLE.getName()
@@ -211,18 +178,9 @@ private static void upgradeSortOrder(JabRefPreferences prefs) {
                     JabRefPreferences.EXPORT_TERTIARY_SORT_FIELD,
                     StandardField.EDITOR.getName()
                 );
-                prefs.putBoolean(
-                    JabRefPreferences.EXPORT_PRIMARY_SORT_DESCENDING,
-                    false
-                );
-                prefs.putBoolean(
-                    JabRefPreferences.EXPORT_SECONDARY_SORT_DESCENDING,
-                    false
-                );
-                prefs.putBoolean(
-                    JabRefPreferences.EXPORT_TERTIARY_SORT_DESCENDING,
-                    false
-                );
+                prefs.putBoolean(JabRefPreferences.EXPORT_PRIMARY_SORT_DESCENDING, false);
+                prefs.putBoolean(JabRefPreferences.EXPORT_SECONDARY_SORT_DESCENDING, false);
+                prefs.putBoolean(JabRefPreferences.EXPORT_TERTIARY_SORT_DESCENDING, false);
             }
         }
     }
@@ -237,12 +195,8 @@ private static void upgradeStoredBibEntryTypes(
     ) {
         try {
             if (
-                mainPrefsNode.nodeExists(
-                    JabRefPreferences.CUSTOMIZED_BIBTEX_TYPES
-                ) ||
-                mainPrefsNode.nodeExists(
-                    JabRefPreferences.CUSTOMIZED_BIBLATEX_TYPES
-                )
+                mainPrefsNode.nodeExists(JabRefPreferences.CUSTOMIZED_BIBTEX_TYPES) ||
+                mainPrefsNode.nodeExists(JabRefPreferences.CUSTOMIZED_BIBLATEX_TYPES)
             ) {
                 // skip further processing as prefs already have been migrated
             } else {
@@ -276,14 +230,9 @@ private static void upgradeLabelPatternToCitationKeyPattern(
 
         try {
             // Migrate default pattern
-            if (
-                mainPrefsNode.get(V3_6_DEFAULT_BIBTEX_KEYPATTERN, null) == null
-            ) {
+            if (mainPrefsNode.get(V3_6_DEFAULT_BIBTEX_KEYPATTERN, null) == null) {
                 // Check whether old defaultLabelPattern is set
-                String oldDefault = mainPrefsNode.get(
-                    V3_3_DEFAULT_LABELPATTERN,
-                    null
-                );
+                String oldDefault = mainPrefsNode.get(V3_3_DEFAULT_LABELPATTERN, null);
                 if (oldDefault != null) {
                     prefs.put(V3_6_DEFAULT_BIBTEX_KEYPATTERN, oldDefault);
                     LOGGER.info(
@@ -299,20 +248,11 @@ private static void upgradeLabelPatternToCitationKeyPattern(
 
             // Migrate type specific patterns
             if (mainPrefsNode.nodeExists(V3_3_LOGIC_LABELPATTERN)) {
-                migrateTypedKeyPrefs(
-                    prefs,
-                    mainPrefsNode.node(V3_3_LOGIC_LABELPATTERN)
-                );
+                migrateTypedKeyPrefs(prefs, mainPrefsNode.node(V3_3_LOGIC_LABELPATTERN));
             } else if (mainPrefsNode.nodeExists(V3_0_LOGIC_LABELPATTERN)) {
-                migrateTypedKeyPrefs(
-                    prefs,
-                    mainPrefsNode.node(V3_0_LOGIC_LABELPATTERN)
-                );
+                migrateTypedKeyPrefs(prefs, mainPrefsNode.node(V3_0_LOGIC_LABELPATTERN));
             } else if (mainPrefsNode.nodeExists(LEGACY_LABELPATTERN)) {
-                migrateTypedKeyPrefs(
-                    prefs,
-                    mainPrefsNode.node(LEGACY_LABELPATTERN)
-                );
+                migrateTypedKeyPrefs(prefs, mainPrefsNode.node(LEGACY_LABELPATTERN));
             }
         } catch (BackingStoreException e) {
             LOGGER.error("Migrating old bibtexKeyPatterns failed.", e);
@@ -334,14 +274,10 @@ private static void migrateFileImportPattern(
         );
 
         if (
-            (preferenceFileNamePattern != null) &&
-            oldStylePattern.equals(preferenceFileNamePattern)
+            (preferenceFileNamePattern != null) && oldStylePattern.equals(preferenceFileNamePattern)
         ) {
             // Upgrade the old-style File Name pattern to new one:
-            mainPrefsNode.put(
-                JabRefPreferences.IMPORT_FILENAMEPATTERN,
-                newStylePattern
-            );
+            mainPrefsNode.put(JabRefPreferences.IMPORT_FILENAMEPATTERN, newStylePattern);
             LOGGER.info(
                 "migrated old style " +
                 JabRefPreferences.IMPORT_FILENAMEPATTERN +
@@ -354,14 +290,9 @@ private static void migrateFileImportPattern(
 
             if (prefs.hasKey(JabRefPreferences.IMPORT_FILENAMEPATTERN)) {
                 // Update also the key in the current application settings, if necessary:
-                String fileNamePattern = prefs.get(
-                    JabRefPreferences.IMPORT_FILENAMEPATTERN
-                );
+                String fileNamePattern = prefs.get(JabRefPreferences.IMPORT_FILENAMEPATTERN);
                 if (oldStylePattern.equals(fileNamePattern)) {
-                    prefs.put(
-                        JabRefPreferences.IMPORT_FILENAMEPATTERN,
-                        newStylePattern
-                    );
+                    prefs.put(JabRefPreferences.IMPORT_FILENAMEPATTERN, newStylePattern);
                     LOGGER.info(
                         "migrated old style " +
                         JabRefPreferences.IMPORT_FILENAMEPATTERN +
@@ -382,23 +313,14 @@ static void upgradeImportFileAndDirePatterns(
     ) {
         // Migrate Import patterns
         // Check for prefs node for Version <= 4.0
-        if (
-            mainPrefsNode.get(JabRefPreferences.IMPORT_FILENAMEPATTERN, null) !=
-            null
-        ) {
+        if (mainPrefsNode.get(JabRefPreferences.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[] 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(
@@ -436,9 +358,7 @@ private static void upgradeKeyBindingsToJavaFX(JabRefPreferences prefs) {
         prefs.putStringList(JabRefPreferences.BINDINGS, keys);
     }
 
-    private static void addCrossRefRelatedFieldsForAutoComplete(
-        JabRefPreferences prefs
-    ) {
+    private static void addCrossRefRelatedFieldsForAutoComplete(JabRefPreferences prefs) {
         // LinkedHashSet because we want to retain the order and add new fields to the end
         Set<String> keys = new LinkedHashSet<>(
             prefs.getStringList(JabRefPreferences.AUTOCOMPLETER_COMPLETE_FIELDS)
@@ -446,24 +366,16 @@ private static void addCrossRefRelatedFieldsForAutoComplete(
         keys.add("crossref");
         keys.add("related");
         keys.add("entryset");
-        prefs.putStringList(
-            JabRefPreferences.AUTOCOMPLETER_COMPLETE_FIELDS,
-            new ArrayList<>(keys)
-        );
+        prefs.putStringList(JabRefPreferences.AUTOCOMPLETER_COMPLETE_FIELDS, new ArrayList<>(keys));
     }
 
-    private static void migrateTypedKeyPrefs(
-        JabRefPreferences prefs,
-        Preferences oldPatternPrefs
-    ) throws BackingStoreException {
-        LOGGER.info(
-            "Found old Bibtex Key patterns which will be migrated to new version."
-        );
+    private static void migrateTypedKeyPrefs(JabRefPreferences prefs, Preferences oldPatternPrefs)
+        throws BackingStoreException {
+        LOGGER.info("Found old Bibtex Key patterns which will be migrated to new version.");
 
-        GlobalCitationKeyPattern keyPattern =
-            GlobalCitationKeyPattern.fromPattern(
-                prefs.get(JabRefPreferences.DEFAULT_CITATION_KEY_PATTERN)
-            );
+        GlobalCitationKeyPattern keyPattern = GlobalCitationKeyPattern.fromPattern(
+            prefs.get(JabRefPreferences.DEFAULT_CITATION_KEY_PATTERN)
+        );
         for (String key : oldPatternPrefs.keys()) {
             keyPattern.addCitationKeyPattern(
                 EntryTypeFactory.parse(key),
@@ -489,10 +401,7 @@ protected static void upgradePreviewStyle(JabRefPreferences prefs) {
                 "\\begin{review}<BR><BR><b>Review: </b> \\format[HTMLChars]{\\review} \\end{review}",
                 "\\begin{comment}<BR><BR><b>Comment: </b> \\format[HTMLChars]{\\comment} \\end{comment}"
             )
-            .replace(
-                "\\format[HTMLChars]{\\comment}",
-                "\\format[Markdown,HTMLChars]{\\comment}"
-            )
+            .replace("\\format[HTMLChars]{\\comment}", "\\format[Markdown,HTMLChars]{\\comment}")
             .replace(
                 "<b><i>\\bibtextype</i><a name=\"\\bibtexkey\">\\begin{bibtexkey} (\\bibtexkey)</a>",
                 "<b><i>\\bibtextype</i><a name=\"\\citationkey\">\\begin{citationkey} (\\citationkey)</a>"
@@ -518,9 +427,7 @@ protected static void upgradePreviewStyle(JabRefPreferences prefs) {
      * Since 5.1: mainTableColumnNames, mainTableColumnWidths, mainTableColumnSortTypes, mainTableColumnSortOrder
      */
     static void upgradeColumnPreferences(JabRefPreferences preferences) {
-        List<String> columnNames = preferences.getStringList(
-            JabRefPreferences.COLUMN_NAMES
-        );
+        List<String> columnNames = preferences.getStringList(JabRefPreferences.COLUMN_NAMES);
         List<Double> columnWidths = preferences
             .getStringList(JabRefPreferences.COLUMN_WIDTHS)
             .stream()
@@ -540,22 +447,12 @@ static void upgradeColumnPreferences(JabRefPreferences preferences) {
 
         if (
             !columnNames.isEmpty() &&
-            columnNames
-                .stream()
-                .noneMatch(name -> name.contains(normalFieldTypeString))
+            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)
-            );
-            columns.add(
-                new MainTableColumnModel(
-                    MainTableColumnModel.Type.LINKED_IDENTIFIER
-                )
-            );
+            columns.add(new MainTableColumnModel(MainTableColumnModel.Type.GROUPS));
+            columns.add(new MainTableColumnModel(MainTableColumnModel.Type.FILES));
+            columns.add(new MainTableColumnModel(MainTableColumnModel.Type.LINKED_IDENTIFIER));
 
             for (int i = 0; i < columnNames.size(); i++) {
                 String name = columnNames.get(i);
@@ -575,10 +472,7 @@ static void upgradeColumnPreferences(JabRefPreferences preferences) {
 
             preferences.putStringList(
                 JabRefPreferences.COLUMN_NAMES,
-                columns
-                    .stream()
-                    .map(MainTableColumnModel::getName)
-                    .collect(Collectors.toList())
+                columns.stream().map(MainTableColumnModel::getName).collect(Collectors.toList())
             );
 
             preferences.putStringList(
@@ -615,9 +509,7 @@ static void changeColumnVariableNamesFor51(JabRefPreferences preferences) {
         final String V5_1_COLUMN_SORT_TYPES = "mainTableColumnSortTypes";
         final String V5_1_COLUMN_SORT_ORDER = "mainTableColumnSortOrder";
 
-        List<String> oldColumnNames = preferences.getStringList(
-            V5_0_COLUMN_NAMES
-        );
+        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(
@@ -645,17 +537,12 @@ static void changeColumnVariableNamesFor51(JabRefPreferences preferences) {
      * variable contents if they are unreadable, so former versions of JabRef would automatically create preferences
      * they can deal with.
      */
-    static void restoreVariablesForBackwardCompatibility(
-        JabRefPreferences preferences
-    ) {
-        List<String> oldColumnNames = preferences.getStringList(
-            JabRefPreferences.COLUMN_NAMES
-        );
+    static void restoreVariablesForBackwardCompatibility(JabRefPreferences preferences) {
+        List<String> oldColumnNames = preferences.getStringList(JabRefPreferences.COLUMN_NAMES);
         List<String> fieldColumnNames = oldColumnNames
             .stream()
             .filter(columnName ->
-                columnName.startsWith("field:") ||
-                columnName.startsWith("special:")
+                columnName.startsWith("field:") || columnName.startsWith("special:")
             )
             .map(columnName -> {
                 if (columnName.startsWith("field:")) {
@@ -669,9 +556,7 @@ static void restoreVariablesForBackwardCompatibility(
         if (!fieldColumnNames.isEmpty()) {
             preferences.putStringList("columnNames", fieldColumnNames);
 
-            List<String> fieldColumnWidths = new ArrayList<>(
-                Collections.emptyList()
-            );
+            List<String> fieldColumnWidths = new ArrayList<>(Collections.emptyList());
             for (int i = 0; i < fieldColumnNames.size(); i++) {
                 fieldColumnWidths.add("100");
             }
@@ -685,12 +570,8 @@ static void restoreVariablesForBackwardCompatibility(
         try {
             // some versions stored the font size as double to the **same** key
             // since the preference store is type-safe, we need to add this workaround
-            String fontSizeAsString = preferences.get(
-                JabRefPreferences.MAIN_FONT_SIZE
-            );
-            int fontSizeAsInt = (int) Math.round(
-                Double.parseDouble(fontSizeAsString)
-            );
+            String fontSizeAsString = preferences.get(JabRefPreferences.MAIN_FONT_SIZE);
+            int fontSizeAsInt = (int) Math.round(Double.parseDouble(fontSizeAsString));
             preferences.putInt(JabRefPreferences.MAIN_FONT_SIZE, fontSizeAsInt);
         } catch (ClassCastException e) {
             // already an integer
@@ -726,16 +607,13 @@ private static void upgradeCleanups(JabRefPreferences prefs) {
 
         final String V5_8_CLEANUP_FIELD_FORMATTERS = "CleanUpFormatters";
         final String V6_0_CLEANUP_FIELD_FORMATTERS = "CleanUpFormatters";
-        final String V6_0_CLEANUP_FIELD_FORMATTERS_ENABLED =
-            "CleanUpFormattersEnabled";
+        final String V6_0_CLEANUP_FIELD_FORMATTERS_ENABLED = "CleanUpFormattersEnabled";
 
         List<String> activeJobs = new ArrayList<>();
         for (CleanupPreferences.CleanupStep action : EnumSet.allOf(
             CleanupPreferences.CleanupStep.class
         )) {
-            Optional<String> job = prefs.getAsOptional(
-                V5_8_CLEANUP + action.name()
-            );
+            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
@@ -746,16 +624,12 @@ private static void upgradeCleanups(JabRefPreferences prefs) {
         }
 
         List<String> formatterCleanups = List.of(
-            StringUtil
-                .unifyLineBreaks(prefs.get(V5_8_CLEANUP_FIELD_FORMATTERS), "\n")
-                .split("\n")
+            StringUtil.unifyLineBreaks(prefs.get(V5_8_CLEANUP_FIELD_FORMATTERS), "\n").split("\n")
         );
         if (
             formatterCleanups.size() >= 2 &&
             (formatterCleanups.get(0).equals(FieldFormatterCleanups.ENABLED) ||
-                formatterCleanups
-                    .get(0)
-                    .equals(FieldFormatterCleanups.DISABLED))
+                formatterCleanups.get(0).equals(FieldFormatterCleanups.DISABLED))
         ) {
             prefs.putBoolean(
                 V6_0_CLEANUP_FIELD_FORMATTERS_ENABLED,
@@ -766,10 +640,7 @@ private static void upgradeCleanups(JabRefPreferences prefs) {
 
             prefs.put(
                 V6_0_CLEANUP_FIELD_FORMATTERS,
-                String.join(
-                    OS.NEWLINE,
-                    formatterCleanups.subList(1, formatterCleanups.size() - 1)
-                )
+                String.join(OS.NEWLINE, formatterCleanups.subList(1, formatterCleanups.size() - 1))
             );
         }
     }
@@ -778,9 +649,7 @@ static void moveApiKeysToKeyring(JabRefPreferences preferences) {
         final String V5_9_FETCHER_CUSTOM_KEY_NAMES = "fetcherCustomKeyNames";
         final String V5_9_FETCHER_CUSTOM_KEYS = "fetcherCustomKeys";
 
-        List<String> names = preferences.getStringList(
-            V5_9_FETCHER_CUSTOM_KEY_NAMES
-        );
+        List<String> names = preferences.getStringList(V5_9_FETCHER_CUSTOM_KEY_NAMES);
         List<String> keys = preferences.getStringList(V5_9_FETCHER_CUSTOM_KEYS);
 
         if (!keys.isEmpty() && names.size() == keys.size()) {
@@ -791,9 +660,7 @@ static void moveApiKeysToKeyring(JabRefPreferences preferences) {
                         names.get(i),
                         new Password(
                             keys.get(i),
-                            preferences
-                                .getInternalPreferences()
-                                .getUserAndHost()
+                            preferences.getInternalPreferences().getUserAndHost()
                         )
                             .encrypt()
                     );
diff --git a/src/main/java/org/jabref/migrations/SpecialFieldsToSeparateFields.java b/src/main/java/org/jabref/migrations/SpecialFieldsToSeparateFields.java
index 110685b3d82..2507aa8cc19 100644
--- a/src/main/java/org/jabref/migrations/SpecialFieldsToSeparateFields.java
+++ b/src/main/java/org/jabref/migrations/SpecialFieldsToSeparateFields.java
@@ -17,13 +17,10 @@ public class SpecialFieldsToSeparateFields implements PostOpenMigration {
 
     private final KeywordList possibleKeywordsToMigrate;
     private final Character keywordDelimiter;
-    private final Map<String, SpecialField> migrationTable =
-        getMigrationTable();
+    private final Map<String, SpecialField> migrationTable = getMigrationTable();
 
     public SpecialFieldsToSeparateFields(Character keywordDelimiter) {
-        List<SpecialFieldValue> specialFieldValues = Arrays.asList(
-            SpecialFieldValue.values()
-        );
+        List<SpecialFieldValue> specialFieldValues = Arrays.asList(SpecialFieldValue.values());
         possibleKeywordsToMigrate =
             new KeywordList(
                 specialFieldValues
@@ -47,10 +44,7 @@ private void migrateEntry(BibEntry entry) {
                 entry.getKeywords(keywordDelimiter).contains(keyword) &&
                 migrationTable.containsKey(keyword.get())
             ) {
-                entry.setField(
-                    migrationTable.get(keyword.get()),
-                    keyword.get()
-                );
+                entry.setField(migrationTable.get(keyword.get()), keyword.get());
             }
         }
 
diff --git a/src/main/java/org/jabref/model/FieldChange.java b/src/main/java/org/jabref/model/FieldChange.java
index 6191b2fa193..8b64056ce48 100644
--- a/src/main/java/org/jabref/model/FieldChange.java
+++ b/src/main/java/org/jabref/model/FieldChange.java
@@ -14,12 +14,7 @@ public class FieldChange {
     private final String oldValue;
     private final String newValue;
 
-    public FieldChange(
-        BibEntry entry,
-        Field field,
-        String oldValue,
-        String newValue
-    ) {
+    public FieldChange(BibEntry entry, Field field, String oldValue, String newValue) {
         this.entry = Objects.requireNonNull(entry);
         this.field = Objects.requireNonNull(field);
         this.oldValue = oldValue;
diff --git a/src/main/java/org/jabref/model/TreeNode.java b/src/main/java/org/jabref/model/TreeNode.java
index c64dee84e26..887c21df63c 100644
--- a/src/main/java/org/jabref/model/TreeNode.java
+++ b/src/main/java/org/jabref/model/TreeNode.java
@@ -116,10 +116,7 @@ public Optional<T> getDescendant(List<Integer> indexedPath) {
      */
     public int getPositionInParent() {
         return getParent()
-            .orElseThrow(() ->
-                new UnsupportedOperationException(
-                    "Roots have no position in parent"
-                )
+            .orElseThrow(() -> new UnsupportedOperationException("Roots have no position in parent")
             )
             .getIndexOfChild((T) this)
             .get();
@@ -281,9 +278,7 @@ protected void setParent(T parent) {
      * or an empty Optional if the index does not point to a child
      */
     public Optional<T> getChildAt(int index) {
-        return childIndexExists(index)
-            ? Optional.of(children.get(index))
-            : Optional.empty();
+        return childIndexExists(index) ? Optional.of(children.get(index)) : Optional.empty();
     }
 
     /**
@@ -517,10 +512,7 @@ public void moveAllChildrenTo(T target, int targetIndex) {
      * @param recursive  if true the whole subtree is sorted
      * @throws NullPointerException if the comparator is null
      */
-    public void sortChildren(
-        Comparator<? super T> comparator,
-        boolean recursive
-    ) {
+    public void sortChildren(Comparator<? super T> comparator, boolean recursive) {
         Objects.requireNonNull(comparator);
 
         if (this.isLeaf()) {
diff --git a/src/main/java/org/jabref/model/database/BibDatabase.java b/src/main/java/org/jabref/model/database/BibDatabase.java
index 3b26965ade4..7bdde0ba9e7 100644
--- a/src/main/java/org/jabref/model/database/BibDatabase.java
+++ b/src/main/java/org/jabref/model/database/BibDatabase.java
@@ -42,20 +42,15 @@
  */
 public class BibDatabase {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(
-        BibDatabase.class
-    );
-    private static final Pattern RESOLVE_CONTENT_PATTERN = Pattern.compile(
-        ".*#[^#]+#.*"
-    );
+    private static final Logger LOGGER = LoggerFactory.getLogger(BibDatabase.class);
+    private static final Pattern RESOLVE_CONTENT_PATTERN = Pattern.compile(".*#[^#]+#.*");
 
     /**
      * State attributes
      */
-    private final ObservableList<BibEntry> entries =
-        FXCollections.synchronizedObservableList(
-            FXCollections.observableArrayList(BibEntry::getObservables)
-        );
+    private final ObservableList<BibEntry> entries = FXCollections.synchronizedObservableList(
+        FXCollections.observableArrayList(BibEntry::getObservables)
+    );
     private Map<String, BibtexString> bibtexStrings = new ConcurrentHashMap<>();
 
     private final EventBus eventBus = new EventBus();
@@ -140,9 +135,7 @@ public ObservableList<BibEntry> getEntries() {
      * @return set of fieldnames, that are visible
      */
     public Set<Field> getAllVisibleFields() {
-        Set<Field> allFields = new TreeSet<>(
-            Comparator.comparing(Field::getName)
-        );
+        Set<Field> allFields = new TreeSet<>(Comparator.comparing(Field::getName));
         for (BibEntry e : getEntries()) {
             allFields.addAll(e.getFields());
         }
@@ -195,10 +188,7 @@ public synchronized void insertEntry(BibEntry entry) {
      * @param entry       entry to insert
      * @param eventSource source the event is sent from
      */
-    public synchronized void insertEntry(
-        BibEntry entry,
-        EntriesEventSource eventSource
-    ) {
+    public synchronized void insertEntry(BibEntry entry, EntriesEventSource eventSource) {
         insertEntries(Collections.singletonList(entry), eventSource);
     }
 
@@ -221,13 +211,7 @@ public synchronized void insertEntries(
         if (newEntries.isEmpty()) {
             eventBus.post(new EntriesAddedEvent(newEntries, eventSource));
         } else {
-            eventBus.post(
-                new EntriesAddedEvent(
-                    newEntries,
-                    newEntries.get(0),
-                    eventSource
-                )
-            );
+            eventBus.post(new EntriesAddedEvent(newEntries, newEntries.get(0), eventSource));
         }
         entries.addAll(newEntries);
     }
@@ -236,10 +220,7 @@ public synchronized void removeEntry(BibEntry bibEntry) {
         removeEntries(Collections.singletonList(bibEntry));
     }
 
-    public synchronized void removeEntry(
-        BibEntry bibEntry,
-        EntriesEventSource eventSource
-    ) {
+    public synchronized void removeEntry(BibEntry bibEntry, EntriesEventSource eventSource) {
         removeEntries(Collections.singletonList(bibEntry), eventSource);
     }
 
@@ -270,9 +251,7 @@ public synchronized void removeEntries(
         for (BibEntry entry : toBeDeleted) {
             ids.add(entry.getId());
         }
-        boolean anyRemoved = entries.removeIf(entry ->
-            ids.contains(entry.getId())
-        );
+        boolean anyRemoved = entries.removeIf(entry -> ids.contains(entry.getId()));
         if (anyRemoved) {
             eventBus.post(new EntriesRemovedEvent(toBeDeleted, eventSource));
         }
@@ -300,15 +279,11 @@ public synchronized void setPreamble(String preamble) {
     /**
      * Inserts a Bibtex String.
      */
-    public synchronized void addString(BibtexString string)
-        throws KeyCollisionException {
+    public synchronized void addString(BibtexString string) throws KeyCollisionException {
         String id = string.getId();
 
         if (hasStringByName(string.getName())) {
-            throw new KeyCollisionException(
-                "A string with that label already exists",
-                id
-            );
+            throw new KeyCollisionException("A string with that label already exists", id);
         }
 
         if (bibtexStrings.containsKey(id)) {
@@ -396,10 +371,7 @@ public void copyPreamble(BibDatabase database) {
      * Returns true if a string with the given label already exists.
      */
     public synchronized boolean hasStringByName(String label) {
-        return bibtexStrings
-            .values()
-            .stream()
-            .anyMatch(value -> value.getName().equals(label));
+        return bibtexStrings.values().stream().anyMatch(value -> value.getName().equals(label));
     }
 
     /**
@@ -407,19 +379,14 @@ public synchronized boolean hasStringByName(String label) {
      * if possible.
      */
     public String resolveForStrings(String content) {
-        Objects.requireNonNull(
-            content,
-            "Content for resolveForStrings must not be null."
-        );
+        Objects.requireNonNull(content, "Content for resolveForStrings must not be null.");
         return resolveContent(content, new HashSet<>(), new HashSet<>());
     }
 
     /**
      * Get all strings used in the entries.
      */
-    public Collection<BibtexString> getUsedStrings(
-        Collection<BibEntry> entries
-    ) {
+    public Collection<BibtexString> getUsedStrings(Collection<BibEntry> entries) {
         List<BibtexString> result = new ArrayList<>();
         Set<String> allUsedIds = new HashSet<>();
 
@@ -487,13 +454,8 @@ public BibEntry resolveForStrings(BibEntry entry, boolean inPlace) {
             resultingEntry = (BibEntry) entry.clone();
         }
 
-        for (Map.Entry<Field, String> field : resultingEntry
-            .getFieldMap()
-            .entrySet()) {
-            resultingEntry.setField(
-                field.getKey(),
-                this.resolveForStrings(field.getValue())
-            );
+        for (Map.Entry<Field, String> field : resultingEntry.getFieldMap().entrySet()) {
+            resultingEntry.setField(field.getKey(), this.resolveForStrings(field.getValue()));
         }
         return resultingEntry;
     }
@@ -504,11 +466,7 @@ public BibEntry resolveForStrings(BibEntry entry, boolean inPlace) {
      * care not to follow a circular reference pattern.
      * If the string is undefined, returns null.
      */
-    private String resolveString(
-        String label,
-        Set<String> usedIds,
-        Set<String> allUsedIds
-    ) {
+    private String resolveString(String label, Set<String> usedIds, Set<String> allUsedIds) {
         Objects.requireNonNull(label);
         Objects.requireNonNull(usedIds);
         Objects.requireNonNull(allUsedIds);
@@ -520,9 +478,7 @@ private String resolveString(
                 // circular reference, and have to stop to avoid
                 // infinite recursion.
                 if (usedIds.contains(string.getId())) {
-                    LOGGER.info(
-                        "Stopped due to circular reference in strings: " + label
-                    );
+                    LOGGER.info("Stopped due to circular reference in strings: " + label);
                     return label;
                 }
                 // If not, log this string's ID now.
@@ -550,42 +506,24 @@ private String resolveString(
         return month.map(Month::getFullName).orElse(null);
     }
 
-    private String resolveContent(
-        String result,
-        Set<String> usedIds,
-        Set<String> allUsedIds
-    ) {
+    private String resolveContent(String result, Set<String> usedIds, Set<String> allUsedIds) {
         String res = result;
         if (RESOLVE_CONTENT_PATTERN.matcher(res).matches()) {
             StringBuilder newRes = new StringBuilder();
             int piv = 0;
             int next;
-            while (
-                (next =
-                        res.indexOf(
-                            FieldWriter.BIBTEX_STRING_START_END_SYMBOL,
-                            piv
-                        )) >=
-                0
-            ) {
+            while ((next = res.indexOf(FieldWriter.BIBTEX_STRING_START_END_SYMBOL, piv)) >= 0) {
                 // We found the next string ref. Append the text
                 // up to it.
                 if (next > 0) {
                     newRes.append(res, piv, next);
                 }
-                int stringEnd = res.indexOf(
-                    FieldWriter.BIBTEX_STRING_START_END_SYMBOL,
-                    next + 1
-                );
+                int stringEnd = res.indexOf(FieldWriter.BIBTEX_STRING_START_END_SYMBOL, next + 1);
                 if (stringEnd >= 0) {
                     // We found the boundaries of the string ref,
                     // now resolve that one.
                     String refLabel = res.substring(next + 1, stringEnd);
-                    String resolved = resolveString(
-                        refLabel,
-                        usedIds,
-                        allUsedIds
-                    );
+                    String resolved = resolveString(refLabel, usedIds, allUsedIds);
 
                     if (resolved == null) {
                         // Could not resolve string. Display the #
@@ -656,9 +594,7 @@ private void relayEntryChangeEvent(FieldChangedEvent event) {
     }
 
     public Optional<BibEntry> getReferencedEntry(BibEntry entry) {
-        return entry
-            .getField(StandardField.CROSSREF)
-            .flatMap(this::getEntryByCitationKey);
+        return entry.getField(StandardField.CROSSREF).flatMap(this::getEntryByCitationKey);
     }
 
     public Optional<String> getSharedDatabaseID() {
@@ -683,8 +619,7 @@ public void clearSharedDatabaseID() {
      * @return The generated sharedDatabaseID
      */
     public String generateSharedDatabaseID() {
-        this.sharedDatabaseID =
-            new BigInteger(128, new SecureRandom()).toString(32);
+        this.sharedDatabaseID = new BigInteger(128, new SecureRandom()).toString(32);
         return this.sharedDatabaseID;
     }
 
diff --git a/src/main/java/org/jabref/model/database/BibDatabaseContext.java b/src/main/java/org/jabref/model/database/BibDatabaseContext.java
index 9c8904d7f8a..b6ea54929a9 100644
--- a/src/main/java/org/jabref/model/database/BibDatabaseContext.java
+++ b/src/main/java/org/jabref/model/database/BibDatabaseContext.java
@@ -35,9 +35,7 @@
 @AllowedToUseLogic("because it needs access to shared database features")
 public class BibDatabaseContext {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(
-        LibraryTab.class
-    );
+    private static final Logger LOGGER = LoggerFactory.getLogger(LibraryTab.class);
 
     private final BibDatabase database;
     private MetaData metaData;
@@ -65,11 +63,7 @@ public BibDatabaseContext(BibDatabase database, MetaData metaData) {
         this.location = DatabaseLocation.LOCAL;
     }
 
-    public BibDatabaseContext(
-        BibDatabase database,
-        MetaData metaData,
-        Path path
-    ) {
+    public BibDatabaseContext(BibDatabase database, MetaData metaData, Path path) {
         this(database, metaData, path, DatabaseLocation.LOCAL);
     }
 
@@ -135,15 +129,8 @@ 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
-                    )
-                )
+                path.getFileName().toString().equals(Crawler.FILENAME_STUDY_RESULT_BIB) &&
+                Files.exists(path.resolveSibling(StudyRepository.STUDY_DEFINITION_FILE_NAME))
             )
             .orElse(false);
     }
@@ -174,34 +161,24 @@ public List<Path> getFileDirectories(FilePreferences preferences) {
         // 1. Metadata user-specific directory
         metaData
             .getUserFileDirectory(preferences.getUserAndHost())
-            .ifPresent(userFileDirectory ->
-                fileDirs.add(getFileDirectoryPath(userFileDirectory))
-            );
+            .ifPresent(userFileDirectory -> fileDirs.add(getFileDirectoryPath(userFileDirectory)));
 
         // 2. Metadata general directory
         metaData
             .getDefaultFileDirectory()
-            .ifPresent(metaDataDirectory ->
-                fileDirs.add(getFileDirectoryPath(metaDataDirectory))
-            );
+            .ifPresent(metaDataDirectory -> fileDirs.add(getFileDirectoryPath(metaDataDirectory)));
 
         // 3. BIB file directory or Main file directory
         // fileDirs.isEmpty in the case, 1) no user-specific file directory and 2) no general file directory is set
         // (in the metadata of the bib file)
-        if (
-            fileDirs.isEmpty() &&
-            preferences.shouldStoreFilesRelativeToBibFile()
-        ) {
+        if (fileDirs.isEmpty() && preferences.shouldStoreFilesRelativeToBibFile()) {
             getDatabasePath()
                 .ifPresent(dbPath -> {
                     Path parentPath = dbPath.getParent();
                     if (parentPath == null) {
                         parentPath = Path.of(System.getProperty("user.dir"));
                     }
-                    Objects.requireNonNull(
-                        parentPath,
-                        "BibTeX database parent path is null"
-                    );
+                    Objects.requireNonNull(parentPath, "BibTeX database parent path is null");
                     fileDirs.add(parentPath);
                 });
         } else {
@@ -209,10 +186,7 @@ public List<Path> getFileDirectories(FilePreferences preferences) {
             preferences.getMainFileDirectory().ifPresent(fileDirs::add);
         }
 
-        return fileDirs
-            .stream()
-            .map(Path::toAbsolutePath)
-            .collect(Collectors.toList());
+        return fileDirs.stream().map(Path::toAbsolutePath).collect(Collectors.toList());
     }
 
     /**
@@ -221,10 +195,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();
     }
 
     private Path getFileDirectoryPath(String directoryName) {
@@ -233,11 +204,7 @@ private Path getFileDirectoryPath(String directoryName) {
         // the file path of this BIB file:
         Optional<Path> databaseFile = getDatabasePath();
         if (!directory.isAbsolute() && databaseFile.isPresent()) {
-            return databaseFile
-                .get()
-                .getParent()
-                .resolve(directory)
-                .normalize();
+            return databaseFile.get().getParent().resolve(directory).normalize();
         }
         return directory;
     }
@@ -264,10 +231,7 @@ public void convertToSharedDatabase(DatabaseSynchronizer dmbsSynchronizer) {
     }
 
     public void convertToLocalDatabase() {
-        if (
-            Objects.nonNull(dbmsListener) &&
-            (location == DatabaseLocation.SHARED)
-        ) {
+        if (Objects.nonNull(dbmsListener) && (location == DatabaseLocation.SHARED)) {
             dbmsListener.unregisterListener(dbmsSynchronizer);
             dbmsListener.shutdown();
         }
@@ -284,15 +248,8 @@ public Path getFulltextIndexPath() {
         Path indexPath;
 
         if (getDatabasePath().isPresent()) {
-            indexPath =
-                appData.resolve(
-                    String.valueOf(this.getDatabasePath().get().hashCode())
-                );
-            LOGGER.debug(
-                "Index path for {} is {}",
-                getDatabasePath().get(),
-                indexPath
-            );
+            indexPath = appData.resolve(String.valueOf(this.getDatabasePath().get().hashCode()));
+            LOGGER.debug("Index path for {} is {}", getDatabasePath().get(), indexPath);
             return indexPath;
         }
 
diff --git a/src/main/java/org/jabref/model/database/BibDatabaseModeDetection.java b/src/main/java/org/jabref/model/database/BibDatabaseModeDetection.java
index f0c5c0eee50..abb2c18d031 100644
--- a/src/main/java/org/jabref/model/database/BibDatabaseModeDetection.java
+++ b/src/main/java/org/jabref/model/database/BibDatabaseModeDetection.java
@@ -22,10 +22,7 @@ private BibDatabaseModeDetection() {}
      * @return the inferred database type
      */
     public static BibDatabaseMode inferMode(BibDatabase database) {
-        final Stream<EntryType> entryTypes = database
-            .getEntries()
-            .stream()
-            .map(BibEntry::getType);
+        final Stream<EntryType> entryTypes = database.getEntries().stream().map(BibEntry::getType);
 
         if (entryTypes.anyMatch(EntryTypeFactory::isExclusiveBiblatex)) {
             return BibDatabaseMode.BIBLATEX;
diff --git a/src/main/java/org/jabref/model/database/BibDatabases.java b/src/main/java/org/jabref/model/database/BibDatabases.java
index 0004038abcf..a38dbaf0ed7 100644
--- a/src/main/java/org/jabref/model/database/BibDatabases.java
+++ b/src/main/java/org/jabref/model/database/BibDatabases.java
@@ -14,9 +14,7 @@ private BibDatabases() {}
      * removes all entries that have no fields set. This is useful for rooting out
      * an unsucessful import (wrong format) that returns a number of empty entries.
      */
-    public static List<BibEntry> purgeEmptyEntries(
-        Collection<BibEntry> entries
-    ) {
+    public static List<BibEntry> purgeEmptyEntries(Collection<BibEntry> entries) {
         return entries
             .stream()
             .filter(entry -> !entry.getFields().isEmpty())
diff --git a/src/main/java/org/jabref/model/database/KeyChangeListener.java b/src/main/java/org/jabref/model/database/KeyChangeListener.java
index 8f9f2a222ad..920681e57f1 100644
--- a/src/main/java/org/jabref/model/database/KeyChangeListener.java
+++ b/src/main/java/org/jabref/model/database/KeyChangeListener.java
@@ -45,18 +45,8 @@ private void updateEntryLinks(String newKey, String oldKey) {
                 entry
                     .getField(field)
                     .ifPresent(fieldContent -> {
-                        if (
-                            field
-                                .getProperties()
-                                .contains(FieldProperty.SINGLE_ENTRY_LINK)
-                        ) {
-                            replaceSingleKeyInField(
-                                newKey,
-                                oldKey,
-                                entry,
-                                field,
-                                fieldContent
-                            );
+                        if (field.getProperties().contains(FieldProperty.SINGLE_ENTRY_LINK)) {
+                            replaceSingleKeyInField(newKey, oldKey, entry, field, fieldContent);
                         } else { // MULTIPLE_ENTRY_LINK
                             replaceKeyInMultiplesKeyField(
                                 newKey,
@@ -78,9 +68,7 @@ private void replaceKeyInMultiplesKeyField(
         Field field,
         String fieldContent
     ) {
-        List<String> keys = new ArrayList<>(
-            Arrays.asList(fieldContent.split(","))
-        );
+        List<String> keys = new ArrayList<>(Arrays.asList(fieldContent.split(",")));
         int index = keys.indexOf(oldKey);
         if (index != -1) {
             if (newKey == null) {
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 3a94aa92da2..1b07f744b05 100644
--- a/src/main/java/org/jabref/model/database/event/EntriesAddedEvent.java
+++ b/src/main/java/org/jabref/model/database/event/EntriesAddedEvent.java
@@ -33,10 +33,7 @@ public EntriesAddedEvent(
      * @param bibEntries <code>List</code> of <code>BibEntry</code> objects which are being added.
      * @param location   Location affected by this event
      */
-    public EntriesAddedEvent(
-        List<BibEntry> bibEntries,
-        EntriesEventSource location
-    ) {
+    public EntriesAddedEvent(List<BibEntry> bibEntries, EntriesEventSource location) {
         super(bibEntries, location);
         this.firstEntry = null;
     }
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 8e23ec54002..0d55f500c03 100644
--- a/src/main/java/org/jabref/model/database/event/EntriesRemovedEvent.java
+++ b/src/main/java/org/jabref/model/database/event/EntriesRemovedEvent.java
@@ -23,10 +23,7 @@ public EntriesRemovedEvent(List<BibEntry> bibEntries) {
      * @param bibEntries <code>List</code> of <code>BibEntry</code> objects which are being removed.
      * @param location   Location affected by this event
      */
-    public EntriesRemovedEvent(
-        List<BibEntry> bibEntries,
-        EntriesEventSource location
-    ) {
+    public EntriesRemovedEvent(List<BibEntry> bibEntries, EntriesEventSource location) {
         super(bibEntries, location);
     }
 }
diff --git a/src/main/java/org/jabref/model/entry/Author.java b/src/main/java/org/jabref/model/entry/Author.java
index e0f235046a5..6506dec5491 100644
--- a/src/main/java/org/jabref/model/entry/Author.java
+++ b/src/main/java/org/jabref/model/entry/Author.java
@@ -17,13 +17,7 @@ public class Author {
      * Example: <code>authors = {Oliver Kopp and others}</code>. This is then appearing as "Oliver Kopp et al.".
      * In the context of BibTeX key generation, this is "Kopp+" (<code>+</code> for "et al.") and not "KO".
      */
-    public static final Author OTHERS = new Author(
-        "",
-        "",
-        null,
-        "others",
-        null
-    );
+    public static final Author OTHERS = new Author("", "", null, "others", null);
 
     private final String firstPart;
     private final String firstAbbr;
@@ -41,13 +35,7 @@ public class Author {
      * @param last      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 jr        the junior part of the author's name (may consist of several tokens, like "Jr. III" in "Smith, Jr. III, John")
      */
-    public Author(
-        String first,
-        String firstabbr,
-        String von,
-        String last,
-        String jr
-    ) {
+    public Author(String first, String firstabbr, String von, String last, String jr) {
         firstPart = addDotIfAbbreviation(removeStartAndEndBraces(first));
         firstAbbr = removeStartAndEndBraces(firstabbr);
         vonPart = removeStartAndEndBraces(von);
@@ -79,17 +67,13 @@ public static String addDotIfAbbreviation(String name) {
 
             if (currentChar == '.') {
                 // A.A. -> A. A.
-                if (
-                    ((i + 1) < name.length()) &&
-                    Character.isUpperCase(name.charAt(i + 1))
-                ) {
+                if (((i + 1) < name.length()) && Character.isUpperCase(name.charAt(i + 1))) {
                     sb.append(' ');
                 }
             }
 
             boolean currentIsUppercaseLetter =
-                Character.isLetter(currentChar) &&
-                Character.isUpperCase(currentChar);
+                Character.isLetter(currentChar) && Character.isUpperCase(currentChar);
             if (!currentIsUppercaseLetter) {
                 // No uppercase letter, hence nothing to do
                 continue;
@@ -136,8 +120,7 @@ public static String addDotIfAbbreviation(String name) {
                 }
 
                 boolean furtherIsUppercaseLetter =
-                    Character.isLetter(furtherChar) &&
-                    Character.isUpperCase(furtherChar);
+                    Character.isLetter(furtherChar) && Character.isUpperCase(furtherChar);
                 if (!furtherIsUppercaseLetter) {
                     nextWordIsUppercase = false;
                     break;
@@ -398,18 +381,10 @@ public String getNameForAlphabetization() {
      */
     public Author latexFree() {
         if (latexFreeAuthor == null) {
-            String first = getFirst()
-                .map(LatexToUnicodeAdapter::format)
-                .orElse(null);
-            String firstabbr = getFirstAbbr()
-                .map(LatexToUnicodeAdapter::format)
-                .orElse(null);
-            String von = getVon()
-                .map(LatexToUnicodeAdapter::format)
-                .orElse(null);
-            String last = getLast()
-                .map(LatexToUnicodeAdapter::format)
-                .orElse(null);
+            String first = getFirst().map(LatexToUnicodeAdapter::format).orElse(null);
+            String firstabbr = getFirstAbbr().map(LatexToUnicodeAdapter::format).orElse(null);
+            String von = getVon().map(LatexToUnicodeAdapter::format).orElse(null);
+            String last = getLast().map(LatexToUnicodeAdapter::format).orElse(null);
             String jr = getJr().map(LatexToUnicodeAdapter::format).orElse(null);
             latexFreeAuthor = new Author(first, firstabbr, von, last, jr);
             latexFreeAuthor.latexFreeAuthor = latexFreeAuthor;
diff --git a/src/main/java/org/jabref/model/entry/AuthorList.java b/src/main/java/org/jabref/model/entry/AuthorList.java
index 84296df6731..f84876bc1e1 100644
--- a/src/main/java/org/jabref/model/entry/AuthorList.java
+++ b/src/main/java/org/jabref/model/entry/AuthorList.java
@@ -116,8 +116,9 @@
 @AllowedToUseLogic("because it needs access to AuthorList parser")
 public class AuthorList {
 
-    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;
 
@@ -142,10 +143,7 @@ public static AuthorList of(Author... authors) {
     }
 
     public static Collector<Author, ?, AuthorList> collect() {
-        return Collectors.collectingAndThen(
-            Collectors.toUnmodifiableList(),
-            AuthorList::new
-        );
+        return Collectors.collectingAndThen(Collectors.toUnmodifiableList(), AuthorList::new);
     }
 
     private static String andCoordinatedConjunction(
@@ -153,17 +151,11 @@ private static String andCoordinatedConjunction(
         Function<Author, String> style,
         boolean oxfordComma
     ) {
-        var formattedAuthors = authors
-            .stream()
-            .map(style)
-            .collect(Collectors.toUnmodifiableList());
+        var formattedAuthors = authors.stream().map(style).collect(Collectors.toUnmodifiableList());
         return andCoordinatedConjunction(formattedAuthors, oxfordComma);
     }
 
-    private static String andCoordinatedConjunction(
-        List<String> authors,
-        boolean oxfordComma
-    ) {
+    private static String andCoordinatedConjunction(List<String> authors, boolean oxfordComma) {
         String lastDelimiter = oxfordComma ? ", and " : " and ";
         int lastIndex = authors.size() - 1;
         return switch (authors.size()) {
@@ -206,9 +198,7 @@ public static String fixAuthorFirstNameFirstCommas(
         boolean abbreviate,
         boolean oxfordComma
     ) {
-        return AuthorList
-            .parse(authors)
-            .getAsFirstLastNames(abbreviate, oxfordComma);
+        return AuthorList.parse(authors).getAsFirstLastNames(abbreviate, oxfordComma);
     }
 
     /**
@@ -230,9 +220,7 @@ public static String fixAuthorLastNameFirstCommas(
         boolean abbreviate,
         boolean oxfordComma
     ) {
-        return AuthorList
-            .parse(authors)
-            .getAsLastFirstNames(abbreviate, oxfordComma);
+        return AuthorList.parse(authors).getAsLastFirstNames(abbreviate, oxfordComma);
     }
 
     /**
@@ -249,10 +237,7 @@ public static String fixAuthorLastNameFirst(String authors) {
      *
      * @see AuthorList#getAsLastFirstNamesWithAnd
      */
-    public static String fixAuthorLastNameFirst(
-        String authors,
-        boolean abbreviate
-    ) {
+    public static String fixAuthorLastNameFirst(String authors, boolean abbreviate) {
         return AuthorList.parse(authors).getAsLastFirstNamesWithAnd(abbreviate);
     }
 
@@ -261,10 +246,7 @@ public static String fixAuthorLastNameFirst(
      *
      * @see AuthorList#getAsLastNames
      */
-    public static String fixAuthorLastNameOnlyCommas(
-        String authors,
-        boolean oxfordComma
-    ) {
+    public static String fixAuthorLastNameOnlyCommas(String authors, boolean oxfordComma) {
         return AuthorList.parse(authors).getAsLastNames(oxfordComma);
     }
 
@@ -330,10 +312,7 @@ public AuthorList latexFree() {
         if (latexFreeAuthors == null) {
             latexFreeAuthors =
                 new AuthorList(
-                    authors
-                        .stream()
-                        .map(Author::latexFree)
-                        .collect(Collectors.toUnmodifiableList())
+                    authors.stream().map(Author::latexFree).collect(Collectors.toUnmodifiableList())
                 );
             latexFreeAuthors.latexFreeAuthors = latexFreeAuthors;
         }
@@ -357,9 +336,7 @@ public String getAsNatbib() {
         return switch (authors.size()) {
             case 0 -> "";
             case 1 -> authors.get(0).getLastOnly();
-            case 2 -> authors.get(0).getLastOnly() +
-            " and " +
-            authors.get(1).getLastOnly();
+            case 2 -> authors.get(0).getLastOnly() + " and " + authors.get(1).getLastOnly();
             default -> authors.get(0).getLastOnly() + " et al.";
         };
     }
@@ -380,11 +357,7 @@ public String getAsNatbib() {
      * Oxford comma.</a>
      */
     public String getAsLastNames(boolean oxfordComma) {
-        return andCoordinatedConjunction(
-            getAuthors(),
-            Author::getLastOnly,
-            oxfordComma
-        );
+        return andCoordinatedConjunction(getAuthors(), Author::getLastOnly, oxfordComma);
     }
 
     /**
diff --git a/src/main/java/org/jabref/model/entry/BibEntry.java b/src/main/java/org/jabref/model/entry/BibEntry.java
index 7636ef304f9..d7381f515d6 100644
--- a/src/main/java/org/jabref/model/entry/BibEntry.java
+++ b/src/main/java/org/jabref/model/entry/BibEntry.java
@@ -91,9 +91,7 @@
 public class BibEntry implements Cloneable {
 
     public static final EntryType DEFAULT_TYPE = StandardEntryType.Misc;
-    private static final Logger LOGGER = LoggerFactory.getLogger(
-        BibEntry.class
-    );
+    private static final Logger LOGGER = LoggerFactory.getLogger(BibEntry.class);
     private final SharedBibEntryData sharedBibEntryData;
 
     /**
@@ -104,25 +102,19 @@ public class BibEntry implements Cloneable {
     /**
      * Cache that stores latex free versions of fields.
      */
-    private final Map<Field, String> latexFreeFields =
-        new ConcurrentHashMap<>();
+    private final Map<Field, String> latexFreeFields = new ConcurrentHashMap<>();
 
     /**
      * 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();
 
     private String id;
 
-    private final ObjectProperty<EntryType> type = new SimpleObjectProperty<>(
-        DEFAULT_TYPE
-    );
+    private final ObjectProperty<EntryType> type = new SimpleObjectProperty<>(DEFAULT_TYPE);
 
     private ObservableMap<Field, String> fields = FXCollections.observableMap(
         new ConcurrentHashMap<>()
@@ -165,10 +157,7 @@ public Optional<FieldChange> setMonth(Month parsedMonth) {
         return setField(StandardField.MONTH, parsedMonth.getJabRefFormat());
     }
 
-    public Optional<String> getResolvedFieldOrAlias(
-        OrFields fields,
-        BibDatabase database
-    ) {
+    public Optional<String> getResolvedFieldOrAlias(OrFields fields, BibDatabase database) {
         for (Field field : fields.getFields()) {
             Optional<String> value = getResolvedFieldOrAlias(field, database);
             if (value.isPresent()) {
@@ -215,8 +204,7 @@ private Optional<Field> getSourceField(
                 (targetEntry == StandardEntryType.InBook)) ||
             ((sourceEntry == StandardEntryType.Book) &&
                 (targetEntry == StandardEntryType.BookInBook)) ||
-            ((sourceEntry == StandardEntryType.Book) &&
-                (targetEntry == StandardEntryType.SuppBook))
+            ((sourceEntry == StandardEntryType.Book) && (targetEntry == StandardEntryType.SuppBook))
         ) {
             if (targetField == StandardField.AUTHOR) {
                 return Optional.of(StandardField.AUTHOR);
@@ -330,10 +318,7 @@ private Optional<Field> getSourceField(
             }
 
             // 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();
             }
 
@@ -361,26 +346,12 @@ private Optional<Field> getSourceField(
      *                 The database of the bibtex entry.
      * @return The resolved field value or null if not found.
      */
-    public Optional<String> getResolvedFieldOrAlias(
-        Field field,
-        BibDatabase database
-    ) {
-        return genericGetResolvedFieldOrAlias(
-            field,
-            database,
-            BibEntry::getFieldOrAlias
-        );
+    public Optional<String> getResolvedFieldOrAlias(Field field, BibDatabase database) {
+        return genericGetResolvedFieldOrAlias(field, database, BibEntry::getFieldOrAlias);
     }
 
-    public Optional<String> getResolvedFieldOrAliasLatexFree(
-        Field field,
-        BibDatabase database
-    ) {
-        return genericGetResolvedFieldOrAlias(
-            field,
-            database,
-            BibEntry::getFieldOrAliasLatexFree
-        );
+    public Optional<String> getResolvedFieldOrAliasLatexFree(Field field, BibDatabase database) {
+        return genericGetResolvedFieldOrAlias(field, database, BibEntry::getFieldOrAliasLatexFree);
     }
 
     private Optional<String> genericGetResolvedFieldOrAlias(
@@ -388,10 +359,7 @@ private Optional<String> genericGetResolvedFieldOrAlias(
         BibDatabase database,
         BiFunction<BibEntry, Field, Optional<String>> getFieldOrAlias
     ) {
-        if (
-            (InternalField.TYPE_HEADER == field) ||
-            (InternalField.OBSOLETE_TYPE_HEADER == field)
-        ) {
+        if ((InternalField.TYPE_HEADER == field) || (InternalField.OBSOLETE_TYPE_HEADER == field)) {
             return Optional.of(type.get().getDisplayName());
         }
 
@@ -407,18 +375,10 @@ private Optional<String> genericGetResolvedFieldOrAlias(
             if (referred.isPresent()) {
                 EntryType sourceEntry = referred.get().type.get();
                 EntryType targetEntry = type.get();
-                Optional<Field> sourceField = getSourceField(
-                    field,
-                    targetEntry,
-                    sourceEntry
-                );
+                Optional<Field> sourceField = getSourceField(field, targetEntry, sourceEntry);
 
                 if (sourceField.isPresent()) {
-                    result =
-                        getFieldOrAlias.apply(
-                            referred.get(),
-                            sourceField.get()
-                        );
+                    result = getFieldOrAlias.apply(referred.get(), sourceField.get());
                 }
             }
         }
@@ -447,14 +407,7 @@ public void setId(String id) {
 
         String oldId = this.id;
 
-        eventBus.post(
-            new FieldChangedEvent(
-                this,
-                InternalField.INTERNAL_ID_FIELD,
-                id,
-                oldId
-            )
-        );
+        eventBus.post(new FieldChangedEvent(this, InternalField.INTERNAL_ID_FIELD, id, oldId));
         this.id = id;
         changed = true;
     }
@@ -510,10 +463,7 @@ public Optional<FieldChange> setType(EntryType type) {
      * Sets this entry's type and sets the changed flag to true <br>
      * If the new entry type equals the old entry type no changed flag is set.
      */
-    public Optional<FieldChange> setType(
-        EntryType newType,
-        EntriesEventSource eventSource
-    ) {
+    public Optional<FieldChange> setType(EntryType newType, EntriesEventSource eventSource) {
         Objects.requireNonNull(newType);
 
         EntryType oldType = type.get();
@@ -561,9 +511,7 @@ public Optional<String> getFieldLatexFree(Field field) {
         } else {
             Optional<String> fieldValue = getField(field);
             if (fieldValue.isPresent()) {
-                String latexFreeValue = LatexToUnicodeAdapter
-                    .format(fieldValue.get())
-                    .intern();
+                String latexFreeValue = LatexToUnicodeAdapter.format(fieldValue.get()).intern();
                 latexFreeFields.put(field, latexFreeValue);
                 return Optional.of(latexFreeValue);
             } else {
@@ -621,10 +569,7 @@ private Optional<String> genericGetFieldOrAlias(
             (StandardField.MONTH == field) ||
             (StandardField.DAY == field)
         ) {
-            Optional<String> date = getFieldValue.apply(
-                this,
-                StandardField.DATE
-            );
+            Optional<String> date = getFieldValue.apply(this, StandardField.DATE);
             if (date.isEmpty()) {
                 return Optional.empty();
             }
@@ -635,10 +580,7 @@ private Optional<String> genericGetFieldOrAlias(
                     return parsedDate.get().getYear().map(Object::toString);
                 }
                 if (StandardField.MONTH == field) {
-                    return parsedDate
-                        .get()
-                        .getMonth()
-                        .map(Month::getJabRefFormat);
+                    return parsedDate.get().getMonth().map(Month::getJabRefFormat);
                 }
                 if (StandardField.DAY == field) {
                     return parsedDate.get().getDay().map(Object::toString);
@@ -716,10 +658,7 @@ public Optional<FieldChange> setField(
     ) {
         Objects.requireNonNull(field, "field name must not be null");
         Objects.requireNonNull(value, "field value must not be null");
-        Objects.requireNonNull(
-            eventSource,
-            "field eventSource must not be null"
-        );
+        Objects.requireNonNull(eventSource, "field eventSource must not be null");
 
         if (value.isEmpty()) {
             return clearField(field);
@@ -771,10 +710,7 @@ public Optional<FieldChange> clearField(Field field) {
      * @param field       the field to clear.
      * @param eventSource the source a new {@link FieldChangedEvent} should be posten from.
      */
-    public Optional<FieldChange> clearField(
-        Field field,
-        EntriesEventSource eventSource
-    ) {
+    public Optional<FieldChange> clearField(Field field, EntriesEventSource eventSource) {
         Optional<String> oldValue = getField(field);
         if (oldValue.isEmpty()) {
             return Optional.empty();
@@ -800,15 +736,10 @@ public Optional<FieldChange> clearField(
      *                 that no attempt will be made to follow crossrefs.
      * @return true if all fields are set or could be resolved, false otherwise.
      */
-    public boolean allFieldsPresent(
-        Collection<OrFields> fields,
-        BibDatabase database
-    ) {
+    public boolean allFieldsPresent(Collection<OrFields> fields, BibDatabase database) {
         return fields
             .stream()
-            .allMatch(field ->
-                this.getResolvedFieldOrAlias(field, database).isPresent()
-            );
+            .allMatch(field -> this.getResolvedFieldOrAlias(field, database).isPresent());
     }
 
     /**
@@ -818,8 +749,7 @@ public boolean allFieldsPresent(
     @Override
     public Object clone() {
         BibEntry clone = new BibEntry(type.getValue());
-        clone.fields =
-            FXCollections.observableMap(new ConcurrentHashMap<>(fields));
+        clone.fields = FXCollections.observableMap(new ConcurrentHashMap<>(fields));
         clone.commentsBeforeEntry = commentsBeforeEntry;
         clone.parsedSerialization = parsedSerialization;
         clone.changed = changed;
@@ -916,18 +846,12 @@ public BibEntry withChanged(boolean changed) {
         return this;
     }
 
-    public Optional<FieldChange> putKeywords(
-        List<String> keywords,
-        Character delimiter
-    ) {
+    public Optional<FieldChange> putKeywords(List<String> keywords, Character delimiter) {
         Objects.requireNonNull(delimiter);
         return putKeywords(new KeywordList(keywords), delimiter);
     }
 
-    public Optional<FieldChange> putKeywords(
-        KeywordList keywords,
-        Character delimiter
-    ) {
+    public Optional<FieldChange> putKeywords(KeywordList keywords, Character delimiter) {
         Objects.requireNonNull(keywords);
         Optional<String> oldValue = this.getField(StandardField.KEYWORDS);
 
@@ -980,10 +904,7 @@ public KeywordList getKeywords(Character delimiter) {
         return getFieldAsKeywords(StandardField.KEYWORDS, delimiter);
     }
 
-    public KeywordList getResolvedKeywords(
-        Character delimiter,
-        BibDatabase database
-    ) {
+    public KeywordList getResolvedKeywords(Character delimiter, BibDatabase database) {
         Optional<String> keywordsContent = getResolvedFieldOrAlias(
             StandardField.KEYWORDS,
             database
@@ -1043,9 +964,7 @@ public BibEntry withSharedBibEntryData(int sharedId, int version) {
         return this;
     }
 
-    public BibEntry withSharedBibEntryData(
-        SharedBibEntryData sharedBibEntryData
-    ) {
+    public BibEntry withSharedBibEntryData(SharedBibEntryData sharedBibEntryData) {
         sharedBibEntryData = sharedBibEntryData;
         return this;
     }
@@ -1133,19 +1052,13 @@ public BibEntry withUserComments(String commentsBeforeEntry) {
         return this;
     }
 
-    public List<ParsedEntryLink> getEntryLinkList(
-        Field field,
-        BibDatabase database
-    ) {
+    public List<ParsedEntryLink> getEntryLinkList(Field field, BibDatabase database) {
         return getField(field)
             .map(fieldValue -> EntryLinkList.parse(fieldValue, database))
             .orElse(Collections.emptyList());
     }
 
-    public Optional<FieldChange> setEntryLinkList(
-        Field field,
-        List<ParsedEntryLink> list
-    ) {
+    public Optional<FieldChange> setEntryLinkList(Field field, List<ParsedEntryLink> list) {
         return setField(field, EntryLinkList.serialize(list));
     }
 
@@ -1158,19 +1071,14 @@ public Set<String> getFieldAsWords(Field field) {
             if (fieldValue == null) {
                 return Collections.emptySet();
             } else {
-                HashSet<String> words = new HashSet<>(
-                    StringUtil.getStringAsWords(fieldValue)
-                );
+                HashSet<String> words = new HashSet<>(StringUtil.getStringAsWords(fieldValue));
                 fieldsAsWords.put(field, words);
                 return words;
             }
         }
     }
 
-    public KeywordList getFieldAsKeywords(
-        Field field,
-        Character keywordSeparator
-    ) {
+    public KeywordList getFieldAsKeywords(Field field, Character keywordSeparator) {
         if (field instanceof StandardField standardField) {
             Optional<KeywordList> storedList = fieldsAsKeywords.get(
                 standardField,
@@ -1232,13 +1140,9 @@ public List<LinkedFile> getFiles() {
     }
 
     public void setDate(Date date) {
-        date
-            .getYear()
-            .ifPresent(year -> setField(StandardField.YEAR, year.toString()));
+        date.getYear().ifPresent(year -> setField(StandardField.YEAR, year.toString()));
         date.getMonth().ifPresent(this::setMonth);
-        date
-            .getDay()
-            .ifPresent(day -> setField(StandardField.DAY, day.toString()));
+        date.getDay().ifPresent(day -> setField(StandardField.DAY, day.toString()));
     }
 
     public Optional<Month> getMonth() {
@@ -1246,13 +1150,8 @@ public Optional<Month> getMonth() {
     }
 
     public OptionalBinding<String> getFieldBinding(Field field) {
-        if (
-            (field == InternalField.TYPE_HEADER) ||
-            (field == InternalField.OBSOLETE_TYPE_HEADER)
-        ) {
-            return EasyBind
-                .wrapNullable(type)
-                .mapOpt(EntryType::getDisplayName);
+        if ((field == InternalField.TYPE_HEADER) || (field == InternalField.OBSOLETE_TYPE_HEADER)) {
+            return EasyBind.wrapNullable(type).mapOpt(EntryType::getDisplayName);
         }
         return EasyBind.valueAt(fields, field);
     }
@@ -1293,10 +1192,7 @@ public Observable[] getObservables() {
      * @param linkToDownloadedFile the link to the file, which was downloaded
      * @param downloadedFile the path to be added to the entry
      */
-    public void replaceDownloadedFile(
-        String linkToDownloadedFile,
-        LinkedFile downloadedFile
-    ) {
+    public void replaceDownloadedFile(String linkToDownloadedFile, LinkedFile downloadedFile) {
         List<LinkedFile> linkedFiles = this.getFiles();
 
         int oldFileIndex = -1;
@@ -1336,12 +1232,8 @@ public void mergeWith(BibEntry other) {
      * @param otherPrioritizedFields collection of Fields in which 'other' has a priority into final result
      */
     public void mergeWith(BibEntry other, Set<Field> otherPrioritizedFields) {
-        Set<Field> thisFields = new TreeSet<>(
-            Comparator.comparing(Field::getName)
-        );
-        Set<Field> otherFields = new TreeSet<>(
-            Comparator.comparing(Field::getName)
-        );
+        Set<Field> thisFields = new TreeSet<>(Comparator.comparing(Field::getName));
+        Set<Field> otherFields = new TreeSet<>(Comparator.comparing(Field::getName));
 
         thisFields.addAll(this.getFields());
         otherFields.addAll(other.getFields());
diff --git a/src/main/java/org/jabref/model/entry/BibEntryType.java b/src/main/java/org/jabref/model/entry/BibEntryType.java
index b6115900e98..b42c68e79b2 100644
--- a/src/main/java/org/jabref/model/entry/BibEntryType.java
+++ b/src/main/java/org/jabref/model/entry/BibEntryType.java
@@ -53,9 +53,7 @@ public Set<BibField> getOptionalFields() {
     }
 
     public boolean isRequired(Field field) {
-        return getRequiredFields()
-            .stream()
-            .anyMatch(fields -> fields.contains(field));
+        return getRequiredFields().stream().anyMatch(fields -> fields.contains(field));
     }
 
     /**
@@ -118,15 +116,11 @@ public Set<Field> getDeprecatedFields(BibDatabaseMode mode) {
         return deprecatedFields;
     }
 
-    public Set<Field> getSecondaryOptionalNotDeprecatedFields(
-        BibDatabaseMode mode
-    ) {
+    public Set<Field> getSecondaryOptionalNotDeprecatedFields(BibDatabaseMode mode) {
         Set<Field> optionalFieldsNotPrimaryOrDeprecated = new LinkedHashSet<>(
             getSecondaryOptionalFields()
         );
-        optionalFieldsNotPrimaryOrDeprecated.removeAll(
-            getDeprecatedFields(mode)
-        );
+        optionalFieldsNotPrimaryOrDeprecated.removeAll(getDeprecatedFields(mode));
         return optionalFieldsNotPrimaryOrDeprecated;
     }
 
@@ -134,16 +128,10 @@ public Set<Field> getSecondaryOptionalNotDeprecatedFields(
      * Get list of all optional fields of this entry and all fields being source for a BibTeX to BibLaTeX conversion.
      */
     private Set<Field> getOptionalFieldsAndAliases() {
-        Set<Field> optionalFieldsAndAliases = new LinkedHashSet<>(
-            getOptionalFields().size()
-        );
+        Set<Field> optionalFieldsAndAliases = new LinkedHashSet<>(getOptionalFields().size());
         for (BibField field : getOptionalFields()) {
             optionalFieldsAndAliases.add(field.field());
-            if (
-                EntryConverter.FIELD_ALIASES_BIBTEX_TO_BIBLATEX.containsKey(
-                    field.field()
-                )
-            ) {
+            if (EntryConverter.FIELD_ALIASES_BIBTEX_TO_BIBLATEX.containsKey(field.field())) {
                 optionalFieldsAndAliases.add(field.field());
             }
         }
diff --git a/src/main/java/org/jabref/model/entry/BibEntryTypeBuilder.java b/src/main/java/org/jabref/model/entry/BibEntryTypeBuilder.java
index 548495a9fc5..480d441d4e3 100644
--- a/src/main/java/org/jabref/model/entry/BibEntryTypeBuilder.java
+++ b/src/main/java/org/jabref/model/entry/BibEntryTypeBuilder.java
@@ -35,18 +35,12 @@ public BibEntryTypeBuilder withImportantFields(Set<BibField> newFields) {
         );
     }
 
-    public BibEntryTypeBuilder withImportantFields(
-        Collection<Field> newFields
-    ) {
+    public BibEntryTypeBuilder withImportantFields(Collection<Field> newFields) {
         this.fields =
             Streams
                 .concat(
                     fields.stream(),
-                    newFields
-                        .stream()
-                        .map(field ->
-                            new BibField(field, FieldPriority.IMPORTANT)
-                        )
+                    newFields.stream().map(field -> new BibField(field, FieldPriority.IMPORTANT))
                 )
                 .collect(Collectors.toCollection(LinkedHashSet::new));
         return this;
@@ -61,9 +55,7 @@ public BibEntryTypeBuilder withDetailFields(Collection<Field> newFields) {
             Streams
                 .concat(
                     fields.stream(),
-                    newFields
-                        .stream()
-                        .map(field -> new BibField(field, FieldPriority.DETAIL))
+                    newFields.stream().map(field -> new BibField(field, FieldPriority.DETAIL))
                 )
                 .collect(Collectors.toCollection(LinkedHashSet::new));
         return this;
@@ -73,9 +65,7 @@ public BibEntryTypeBuilder withDetailFields(Field... fields) {
         return withDetailFields(Arrays.asList(fields));
     }
 
-    public BibEntryTypeBuilder withRequiredFields(
-        Set<OrFields> requiredFields
-    ) {
+    public BibEntryTypeBuilder withRequiredFields(Set<OrFields> requiredFields) {
         this.requiredFields = requiredFields;
         return this;
     }
@@ -89,30 +79,18 @@ public BibEntryTypeBuilder withRequiredFields(Field... requiredFields) {
         return this;
     }
 
-    public BibEntryTypeBuilder withRequiredFields(
-        OrFields first,
-        Field... requiredFields
-    ) {
+    public BibEntryTypeBuilder withRequiredFields(OrFields first, Field... requiredFields) {
         this.requiredFields =
             Stream
-                .concat(
-                    Stream.of(first),
-                    Arrays.stream(requiredFields).map(OrFields::new)
-                )
+                .concat(Stream.of(first), Arrays.stream(requiredFields).map(OrFields::new))
                 .collect(Collectors.toCollection(LinkedHashSet::new));
         return this;
     }
 
-    public BibEntryTypeBuilder withRequiredFields(
-        List<OrFields> first,
-        Field... requiredFields
-    ) {
+    public BibEntryTypeBuilder withRequiredFields(List<OrFields> first, Field... requiredFields) {
         this.requiredFields =
             Stream
-                .concat(
-                    first.stream(),
-                    Arrays.stream(requiredFields).map(OrFields::new)
-                )
+                .concat(first.stream(), Arrays.stream(requiredFields).map(OrFields::new))
                 .collect(Collectors.toCollection(LinkedHashSet::new));
         return this;
     }
diff --git a/src/main/java/org/jabref/model/entry/BibEntryTypesManager.java b/src/main/java/org/jabref/model/entry/BibEntryTypesManager.java
index 2363cc25c4b..d6fab80809d 100644
--- a/src/main/java/org/jabref/model/entry/BibEntryTypesManager.java
+++ b/src/main/java/org/jabref/model/entry/BibEntryTypesManager.java
@@ -28,18 +28,17 @@ public class BibEntryTypesManager {
             .collect(Collectors.toList())
     );
 
-    private final InternalEntryTypes BIBLATEX_ENTRYTYPES =
-        new InternalEntryTypes(
-            Stream
-                .concat(
-                    BiblatexEntryTypeDefinitions.ALL.stream(),
-                    Stream.concat(
-                        BiblatexSoftwareEntryTypeDefinitions.ALL.stream(),
-                        BiblatexAPAEntryTypeDefinitions.ALL.stream()
-                    )
+    private final InternalEntryTypes BIBLATEX_ENTRYTYPES = new InternalEntryTypes(
+        Stream
+            .concat(
+                BiblatexEntryTypeDefinitions.ALL.stream(),
+                Stream.concat(
+                    BiblatexSoftwareEntryTypeDefinitions.ALL.stream(),
+                    BiblatexAPAEntryTypeDefinitions.ALL.stream()
                 )
-                .collect(Collectors.toList())
-        );
+            )
+            .collect(Collectors.toList())
+    );
 
     public BibEntryTypesManager() {}
 
@@ -64,10 +63,7 @@ public List<BibEntryType> getAllCustomTypes(BibDatabaseMode mode) {
     /**
      * Returns true if the type is a custom type, or if it is a standard type which has customized fields
      */
-    public boolean isCustomOrModifiedType(
-        BibEntryType type,
-        BibDatabaseMode mode
-    ) {
+    public boolean isCustomOrModifiedType(BibEntryType type, BibDatabaseMode mode) {
         return getEntryTypes(mode).isCustomOrModifiedType(type);
     }
 
@@ -82,17 +78,11 @@ public void addCustomOrModifiedTypes(
         customizedEntryTypes.forEach(entryTypes::addCustomOrModifiedType);
     }
 
-    public void addCustomOrModifiedType(
-        BibEntryType entryType,
-        BibDatabaseMode mode
-    ) {
+    public void addCustomOrModifiedType(BibEntryType entryType, BibDatabaseMode mode) {
         getEntryTypes(mode).addCustomOrModifiedType(entryType);
     }
 
-    public void removeCustomOrModifiedEntryType(
-        BibEntryType entryType,
-        BibDatabaseMode mode
-    ) {
+    public void removeCustomOrModifiedEntryType(BibEntryType entryType, BibDatabaseMode mode) {
         getEntryTypes(mode).removeCustomOrModifiedEntryType(entryType);
     }
 
@@ -119,23 +109,14 @@ public Optional<BibEntryType> enrich(EntryType type, BibDatabaseMode mode) {
         return getEntryTypes(mode).enrich(type);
     }
 
-    public boolean isDifferentCustomOrModifiedType(
-        BibEntryType type,
-        BibDatabaseMode mode
-    ) {
-        Optional<BibEntryType> currentlyStoredType = enrich(
-            type.getType(),
-            mode
-        );
+    public boolean isDifferentCustomOrModifiedType(BibEntryType type, BibDatabaseMode mode) {
+        Optional<BibEntryType> currentlyStoredType = enrich(type.getType(), mode);
         if (currentlyStoredType.isEmpty()) {
             // new customization
             return true;
         } else {
             // different customization
-            return !EntryTypeFactory.nameAndFieldsAreEqual(
-                type,
-                currentlyStoredType.get()
-            );
+            return !EntryTypeFactory.nameAndFieldsAreEqual(type, currentlyStoredType.get());
         }
     }
 
@@ -144,8 +125,7 @@ public boolean isDifferentCustomOrModifiedType(
      */
     private static class InternalEntryTypes {
 
-        private final SortedSet<BibEntryType> customOrModifiedType =
-            new TreeSet<>();
+        private final SortedSet<BibEntryType> customOrModifiedType = new TreeSet<>();
         private final SortedSet<BibEntryType> standardTypes;
 
         private InternalEntryTypes(List<BibEntryType> standardTypes) {
@@ -159,9 +139,7 @@ private List<BibEntryType> getAllCustomTypes() {
                 .filter(bibEntryType ->
                     standardTypes
                         .stream()
-                        .noneMatch(item ->
-                            item.getType().equals(bibEntryType.getType())
-                        )
+                        .noneMatch(item -> item.getType().equals(bibEntryType.getType()))
                 )
                 .toList();
         }
@@ -178,10 +156,7 @@ private Optional<BibEntryType> enrich(EntryType type) {
             if (enrichedType.isPresent()) {
                 return enrichedType;
             } else {
-                return standardTypes
-                    .stream()
-                    .filter(typeEquals(type))
-                    .findFirst();
+                return standardTypes.stream().filter(typeEquals(type)).findFirst();
             }
         }
 
@@ -203,9 +178,7 @@ private void clearAllCustomEntryTypes() {
         }
 
         private SortedSet<BibEntryType> getAllTypes() {
-            SortedSet<BibEntryType> allTypes = new TreeSet<>(
-                customOrModifiedType
-            );
+            SortedSet<BibEntryType> allTypes = new TreeSet<>(customOrModifiedType);
             allTypes.addAll(standardTypes);
             return allTypes;
         }
diff --git a/src/main/java/org/jabref/model/entry/BibtexString.java b/src/main/java/org/jabref/model/entry/BibtexString.java
index ffda7df2b0b..b286204adff 100644
--- a/src/main/java/org/jabref/model/entry/BibtexString.java
+++ b/src/main/java/org/jabref/model/entry/BibtexString.java
@@ -148,10 +148,7 @@ public String getUserComments() {
         if (parsedSerialization != null) {
             try {
                 // get the text before the string
-                String prolog = parsedSerialization.substring(
-                    0,
-                    parsedSerialization.indexOf('@')
-                );
+                String prolog = parsedSerialization.substring(0, parsedSerialization.indexOf('@'));
                 return prolog;
             } catch (StringIndexOutOfBoundsException ignore) {
                 // if this occurs a broken parsed serialization has been set, so just do nothing
@@ -193,12 +190,6 @@ public boolean equals(Object o) {
 
     @Override
     public int hashCode() {
-        return Objects.hash(
-            hasChanged,
-            name,
-            content,
-            type,
-            parsedSerialization
-        );
+        return Objects.hash(hasChanged, name, content, type, parsedSerialization);
     }
 }
diff --git a/src/main/java/org/jabref/model/entry/CanonicalBibEntry.java b/src/main/java/org/jabref/model/entry/CanonicalBibEntry.java
index 3fa59c4765f..4433546591d 100644
--- a/src/main/java/org/jabref/model/entry/CanonicalBibEntry.java
+++ b/src/main/java/org/jabref/model/entry/CanonicalBibEntry.java
@@ -34,11 +34,7 @@ public static String getCanonicalRepresentation(BibEntry entry) {
 
         // generate first line: type and citation key
         String citeKey = entry.getCitationKey().orElse("");
-        sb
-            .append(
-                String.format("@%s{%s,", entry.getType().getName(), citeKey)
-            )
-            .append('\n');
+        sb.append(String.format("@%s{%s,", 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).
         Map<String, String> mapFieldToValue = new HashMap<>();
@@ -50,9 +46,7 @@ public static String getCanonicalRepresentation(BibEntry entry) {
             String fieldValue = field.getValue();
             // JabRef stores the key in the field KEY_FIELD, which must not be serialized
             if (!fieldName.equals(InternalField.KEY_FIELD)) {
-                String lowerCaseFieldName = fieldName
-                    .getName()
-                    .toLowerCase(Locale.US);
+                String lowerCaseFieldName = fieldName.getName().toLowerCase(Locale.US);
                 sortedFields.add(lowerCaseFieldName);
                 mapFieldToValue.put(lowerCaseFieldName, fieldValue);
             }
@@ -61,11 +55,7 @@ public static String getCanonicalRepresentation(BibEntry entry) {
         // generate field entries
         StringJoiner sj = new StringJoiner(",\n", "", "\n");
         for (String fieldName : sortedFields) {
-            String line = String.format(
-                "  %s = {%s}",
-                fieldName,
-                mapFieldToValue.get(fieldName)
-            );
+            String line = String.format("  %s = {%s}", fieldName, mapFieldToValue.get(fieldName));
             sj.add(line);
         }
 
diff --git a/src/main/java/org/jabref/model/entry/Date.java b/src/main/java/org/jabref/model/entry/Date.java
index d75c2628b45..05f44ef3812 100644
--- a/src/main/java/org/jabref/model/entry/Date.java
+++ b/src/main/java/org/jabref/model/entry/Date.java
@@ -19,8 +19,9 @@
 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);
 
@@ -65,8 +66,7 @@ public class Date {
                 .reduce(
                     new DateTimeFormatterBuilder(),
                     DateTimeFormatterBuilder::appendOptional,
-                    (builder, formatterBuilder) ->
-                        builder.append(formatterBuilder.toFormatter())
+                    (builder, formatterBuilder) -> builder.append(formatterBuilder.toFormatter())
                 )
                 .toFormatter(Locale.US);
 
@@ -145,12 +145,8 @@ public static Optional<Date> parse(String dateString) {
         ) {
             try {
                 String[] strDates = dateString.split("/");
-                TemporalAccessor parsedDate = SIMPLE_DATE_FORMATS.parse(
-                    strDates[0].strip()
-                );
-                TemporalAccessor parsedEndDate = SIMPLE_DATE_FORMATS.parse(
-                    strDates[1].strip()
-                );
+                TemporalAccessor parsedDate = SIMPLE_DATE_FORMATS.parse(strDates[0].strip());
+                TemporalAccessor parsedEndDate = SIMPLE_DATE_FORMATS.parse(strDates[1].strip());
                 return Optional.of(new Date(parsedDate, parsedEndDate));
             } catch (DateTimeParseException e) {
                 LOGGER.debug("Invalid Date format for range", e);
@@ -172,12 +168,8 @@ public static Optional<Date> parse(String dateString) {
         ) {
             try {
                 String[] strDates = dateString.split(" / ");
-                TemporalAccessor parsedDate = SIMPLE_DATE_FORMATS.parse(
-                    strDates[0].strip()
-                );
-                TemporalAccessor parsedEndDate = SIMPLE_DATE_FORMATS.parse(
-                    strDates[1].strip()
-                );
+                TemporalAccessor parsedDate = SIMPLE_DATE_FORMATS.parse(strDates[0].strip());
+                TemporalAccessor parsedEndDate = SIMPLE_DATE_FORMATS.parse(strDates[1].strip());
                 return Optional.of(new Date(parsedDate, parsedEndDate));
             } catch (DateTimeParseException e) {
                 LOGGER.debug("Invalid Date format range", e);
@@ -195,12 +187,8 @@ public static Optional<Date> parse(String dateString) {
         ) {
             try {
                 String[] strDates = dateString.split("/");
-                TemporalAccessor parsedDate = parseDateWithEraIndicator(
-                    strDates[0]
-                );
-                TemporalAccessor parsedEndDate = parseDateWithEraIndicator(
-                    strDates[1]
-                );
+                TemporalAccessor parsedDate = parseDateWithEraIndicator(strDates[0]);
+                TemporalAccessor parsedEndDate = parseDateWithEraIndicator(strDates[1]);
                 return Optional.of(new Date(parsedDate, parsedEndDate));
             } catch (DateTimeParseException e) {
                 LOGGER.debug("Invalid Date format range", e);
@@ -218,12 +206,8 @@ public static Optional<Date> parse(String dateString) {
         ) {
             try {
                 String[] strDates = dateString.split(" / ");
-                TemporalAccessor parsedDate = parseDateWithEraIndicator(
-                    strDates[0]
-                );
-                TemporalAccessor parsedEndDate = parseDateWithEraIndicator(
-                    strDates[1]
-                );
+                TemporalAccessor parsedDate = parseDateWithEraIndicator(strDates[0]);
+                TemporalAccessor parsedEndDate = parseDateWithEraIndicator(strDates[1]);
                 return Optional.of(new Date(parsedDate, parsedEndDate));
             } catch (DateTimeParseException e) {
                 LOGGER.debug("Invalid Date format range", e);
@@ -276,9 +260,7 @@ public static Optional<Date> parse(
         Optional<String> monthValue,
         Optional<String> dayValue
     ) {
-        Optional<Year> year = yearValue
-            .flatMap(Date::convertToInt)
-            .map(Year::of);
+        Optional<Year> year = yearValue.flatMap(Date::convertToInt).map(Year::of);
         Optional<Month> month = monthValue.flatMap(Month::parse);
         Optional<Integer> day = dayValue.flatMap(Date::convertToInt);
 
@@ -286,18 +268,9 @@ public static Optional<Date> parse(
             TemporalAccessor date;
             if (month.isPresent()) {
                 if (day.isPresent()) {
-                    date =
-                        LocalDate.of(
-                            year.get().getValue(),
-                            month.get().getNumber(),
-                            day.get()
-                        );
+                    date = LocalDate.of(year.get().getValue(), month.get().getNumber(), day.get());
                 } else {
-                    date =
-                        YearMonth.of(
-                            year.get().getValue(),
-                            month.get().getNumber()
-                        );
+                    date = YearMonth.of(year.get().getValue(), month.get().getNumber());
                 }
             } else {
                 date = year.get();
@@ -323,12 +296,8 @@ private static Optional<Integer> convertToInt(String value) {
      * @param dateString the string which contain era indicator to extract the date information
      * @return the date information with TemporalAccessor type
      */
-    private static TemporalAccessor parseDateWithEraIndicator(
-        String dateString
-    ) {
-        String yearString = dateString
-            .strip()
-            .substring(0, dateString.length() - 2);
+    private static TemporalAccessor parseDateWithEraIndicator(String dateString) {
+        String yearString = dateString.strip().substring(0, dateString.length() - 2);
 
         String[] parts = yearString.split("-");
         int year = Integer.parseInt(parts[0].strip());
@@ -385,22 +354,13 @@ public boolean equals(Object o) {
             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.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)
-            )
+            Objects.equals(get(ChronoField.SECOND_OF_DAY), date1.get(ChronoField.SECOND_OF_DAY)) &&
+            Objects.equals(get(ChronoField.OFFSET_SECONDS), date1.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 3f53e95de2b..158b533e8b7 100644
--- a/src/main/java/org/jabref/model/entry/EntryConverter.java
+++ b/src/main/java/org/jabref/model/entry/EntryConverter.java
@@ -54,9 +54,7 @@ public class EntryConverter {
             EntryConverter.FIELD_ALIASES_BIBTEX_TO_BIBLATEX
                 .entrySet()
                 .stream()
-                .collect(
-                    Collectors.toMap(Map.Entry::getValue, Map.Entry::getKey)
-                );
+                .collect(Collectors.toMap(Map.Entry::getValue, Map.Entry::getKey));
 
         // all aliases
         FIELD_ALIASES = new HashMap<>();
diff --git a/src/main/java/org/jabref/model/entry/EntryLinkList.java b/src/main/java/org/jabref/model/entry/EntryLinkList.java
index 494b472edba..3b24958ac9b 100644
--- a/src/main/java/org/jabref/model/entry/EntryLinkList.java
+++ b/src/main/java/org/jabref/model/entry/EntryLinkList.java
@@ -11,10 +11,7 @@ public class EntryLinkList {
 
     private EntryLinkList() {}
 
-    public static List<ParsedEntryLink> parse(
-        String fieldValue,
-        BibDatabase database
-    ) {
+    public static List<ParsedEntryLink> parse(String fieldValue, BibDatabase database) {
         List<ParsedEntryLink> result = new ArrayList<>();
         if ((fieldValue != null) && !fieldValue.isEmpty()) {
             String[] entries = fieldValue.split(SEPARATOR);
@@ -29,10 +26,7 @@ public static List<ParsedEntryLink> parse(
     public static String serialize(List<ParsedEntryLink> list) {
         return String.join(
             SEPARATOR,
-            list
-                .stream()
-                .map(ParsedEntryLink::getKey)
-                .collect(Collectors.toList())
+            list.stream().map(ParsedEntryLink::getKey).collect(Collectors.toList())
         );
     }
 }
diff --git a/src/main/java/org/jabref/model/entry/Keyword.java b/src/main/java/org/jabref/model/entry/Keyword.java
index 28f189163e7..0818e23648b 100644
--- a/src/main/java/org/jabref/model/entry/Keyword.java
+++ b/src/main/java/org/jabref/model/entry/Keyword.java
@@ -124,10 +124,7 @@ public String getPathFromRootAsString(Character hierarchicalDelimiter) {
      */
     public Set<Keyword> flatten() {
         return Stream
-            .concat(
-                Stream.of(this),
-                getChild().stream().flatMap(child -> child.flatten().stream())
-            )
+            .concat(Stream.of(this), getChild().stream().flatMap(child -> child.flatten().stream()))
             .collect(Collectors.toSet());
     }
 
@@ -135,14 +132,10 @@ public Set<Keyword> flatten() {
      * Returns all subchains starting at this node.
      * E.g., for the chain "A > B > C" the subchains {"A", "A > B", "A > B > C"} are returned.
      */
-    public Set<String> getAllSubchainsAsString(
-        Character hierarchicalDelimiter
-    ) {
+    public Set<String> getAllSubchainsAsString(Character hierarchicalDelimiter) {
         return flatten()
             .stream()
-            .map(subchain ->
-                subchain.getPathFromRootAsString(hierarchicalDelimiter)
-            )
+            .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 96af7fae926..8728243e361 100644
--- a/src/main/java/org/jabref/model/entry/KeywordList.java
+++ b/src/main/java/org/jabref/model/entry/KeywordList.java
@@ -31,21 +31,11 @@ public KeywordList(Collection<Keyword> keywordChains) {
     }
 
     public KeywordList(List<String> keywordChains) {
-        this(
-            keywordChains
-                .stream()
-                .map(Keyword::new)
-                .collect(Collectors.toList())
-        );
+        this(keywordChains.stream().map(Keyword::new).collect(Collectors.toList()));
     }
 
     public KeywordList(String... keywordChains) {
-        this(
-            Arrays
-                .stream(keywordChains)
-                .map(Keyword::new)
-                .collect(Collectors.toList())
-        );
+        this(Arrays.stream(keywordChains).map(Keyword::new).collect(Collectors.toList()));
     }
 
     public KeywordList(Keyword... keywordChains) {
@@ -66,15 +56,10 @@ public static KeywordList parse(
 
         KeywordList keywordList = new KeywordList();
 
-        StringTokenizer tok = new StringTokenizer(
-            keywordString,
-            delimiter.toString()
-        );
+        StringTokenizer tok = new StringTokenizer(keywordString, delimiter.toString());
         while (tok.hasMoreTokens()) {
             String chain = tok.nextToken();
-            Keyword chainRoot = Keyword.of(
-                chain.split(hierarchicalDelimiter.toString())
-            );
+            Keyword chainRoot = Keyword.of(chain.split(hierarchicalDelimiter.toString()));
             keywordList.add(chainRoot);
         }
         return keywordList;
@@ -88,11 +73,7 @@ public static KeywordList parse(
      * @return an parsed list containing the keywordChains
      */
     public static KeywordList parse(String keywordString, Character delimiter) {
-        return parse(
-            keywordString,
-            delimiter,
-            Keyword.DEFAULT_HIERARCHICAL_DELIMITER
-        );
+        return parse(keywordString, delimiter, Keyword.DEFAULT_HIERARCHICAL_DELIMITER);
     }
 
     public static KeywordList merge(
@@ -214,10 +195,7 @@ public String toString() {
     }
 
     public Set<String> toStringList() {
-        return keywordChains
-            .stream()
-            .map(Keyword::toString)
-            .collect(Collectors.toSet());
+        return keywordChains.stream().map(Keyword::toString).collect(Collectors.toSet());
     }
 
     @Override
@@ -229,10 +207,7 @@ public boolean equals(Object o) {
             return false;
         }
         KeywordList keywords1 = (KeywordList) o;
-        return Objects.equals(
-            new HashSet<>(keywordChains),
-            new HashSet<>(keywords1.keywordChains)
-        );
+        return Objects.equals(new HashSet<>(keywordChains), new HashSet<>(keywords1.keywordChains));
     }
 
     @Override
diff --git a/src/main/java/org/jabref/model/entry/LinkedFile.java b/src/main/java/org/jabref/model/entry/LinkedFile.java
index 8f438624cbf..c824a4610bb 100644
--- a/src/main/java/org/jabref/model/entry/LinkedFile.java
+++ b/src/main/java/org/jabref/model/entry/LinkedFile.java
@@ -31,11 +31,7 @@ public class LinkedFile implements Serializable {
         "^((?: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(""),
-        ""
-    );
+    private static final LinkedFile NULL_OBJECT = new LinkedFile("", Path.of(""), "");
 
     // We have to mark these properties as transient because they can't be serialized directly
     private transient StringProperty description = new SimpleStringProperty();
@@ -60,11 +56,7 @@ public LinkedFile(String description, String link, String fileType) {
     }
 
     public LinkedFile(URL link, String fileType) {
-        this(
-            "",
-            Objects.requireNonNull(link).toString(),
-            Objects.requireNonNull(fileType)
-        );
+        this("", Objects.requireNonNull(link).toString(), Objects.requireNonNull(fileType));
     }
 
     public LinkedFile(String description, URL link, String fileType) {
diff --git a/src/main/java/org/jabref/model/entry/ParsedEntryLink.java b/src/main/java/org/jabref/model/entry/ParsedEntryLink.java
index 88e6e68dd6e..00733086eb2 100644
--- a/src/main/java/org/jabref/model/entry/ParsedEntryLink.java
+++ b/src/main/java/org/jabref/model/entry/ParsedEntryLink.java
@@ -48,10 +48,7 @@ public boolean equals(Object obj) {
             return false;
         }
         ParsedEntryLink other = (ParsedEntryLink) obj;
-        return (
-            Objects.equals(key, other.key) &&
-            Objects.equals(linkedEntry, other.linkedEntry)
-        );
+        return (Objects.equals(key, other.key) && Objects.equals(linkedEntry, other.linkedEntry));
     }
 
     public BibDatabase getDatabase() {
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 f1a55e67b8b..50acfb0bc9f 100644
--- a/src/main/java/org/jabref/model/entry/event/EntriesEvent.java
+++ b/src/main/java/org/jabref/model/entry/event/EntriesEvent.java
@@ -24,10 +24,7 @@ public EntriesEvent(List<BibEntry> bibEntries) {
      * @param bibEntries List of BibEntry objects which are involved in this event
      * @param location   Location affected by this event
      */
-    public EntriesEvent(
-        List<BibEntry> bibEntries,
-        EntriesEventSource location
-    ) {
+    public EntriesEvent(List<BibEntry> bibEntries, EntriesEventSource location) {
         super();
         this.bibEntries = Objects.requireNonNull(bibEntries);
         this.location = Objects.requireNonNull(location);
diff --git a/src/main/java/org/jabref/model/entry/event/FieldAddedOrRemovedEvent.java b/src/main/java/org/jabref/model/entry/event/FieldAddedOrRemovedEvent.java
index ba736e9fea3..63306f6582d 100644
--- a/src/main/java/org/jabref/model/entry/event/FieldAddedOrRemovedEvent.java
+++ b/src/main/java/org/jabref/model/entry/event/FieldAddedOrRemovedEvent.java
@@ -4,10 +4,7 @@
 
 public class FieldAddedOrRemovedEvent extends FieldChangedEvent {
 
-    public FieldAddedOrRemovedEvent(
-        FieldChange fieldChange,
-        EntriesEventSource location
-    ) {
+    public FieldAddedOrRemovedEvent(FieldChange fieldChange, EntriesEventSource location) {
         super(fieldChange, location);
     }
 }
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 8a16bd3d542..2cb8afa0a95 100644
--- a/src/main/java/org/jabref/model/entry/event/FieldChangedEvent.java
+++ b/src/main/java/org/jabref/model/entry/event/FieldChangedEvent.java
@@ -32,8 +32,7 @@ public FieldChangedEvent(
         this.field = field;
         this.newValue = newValue;
         this.oldValue = oldValue;
-        this.majorCharacterChange =
-            computeMajorCharacterChange(oldValue, newValue);
+        this.majorCharacterChange = computeMajorCharacterChange(oldValue, newValue);
     }
 
     /**
@@ -41,33 +40,23 @@ public FieldChangedEvent(
      * @param field    Name of field which has been changed
      * @param newValue new field value
      */
-    public FieldChangedEvent(
-        BibEntry bibEntry,
-        Field field,
-        String newValue,
-        String oldValue
-    ) {
+    public FieldChangedEvent(BibEntry bibEntry, Field field, String newValue, String oldValue) {
         super(bibEntry);
         this.field = field;
         this.newValue = newValue;
         this.oldValue = oldValue;
-        this.majorCharacterChange =
-            computeMajorCharacterChange(oldValue, newValue);
+        this.majorCharacterChange = computeMajorCharacterChange(oldValue, newValue);
     }
 
     /**
      * @param location Location affected by this event
      */
-    public FieldChangedEvent(
-        FieldChange fieldChange,
-        EntriesEventSource location
-    ) {
+    public FieldChangedEvent(FieldChange fieldChange, EntriesEventSource location) {
         super(fieldChange.getEntry(), location);
         this.field = fieldChange.getField();
         this.newValue = fieldChange.getNewValue();
         this.oldValue = fieldChange.getOldValue();
-        this.majorCharacterChange =
-            computeMajorCharacterChange(oldValue, newValue);
+        this.majorCharacterChange = computeMajorCharacterChange(oldValue, newValue);
     }
 
     public FieldChangedEvent(FieldChange fieldChange) {
@@ -82,10 +71,7 @@ private int computeMajorCharacterChange(String oldValue, String newValue) {
             return newValue.length();
         } else if ((newValue == null) && (oldValue != null)) {
             return oldValue.length();
-        } else if (
-            (oldValue.length() == newValue.length()) &&
-            !oldValue.equals(newValue)
-        ) {
+        } else if ((oldValue.length() == newValue.length()) && !oldValue.equals(newValue)) {
             return newValue.length();
         } else {
             return Math.abs(newValue.length() - oldValue.length());
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 0934c83e353..38b29bb3dbd 100644
--- a/src/main/java/org/jabref/model/entry/field/AMSField.java
+++ b/src/main/java/org/jabref/model/entry/field/AMSField.java
@@ -24,12 +24,7 @@ public enum AMSField implements Field {
         this.properties = EnumSet.noneOf(FieldProperty.class);
     }
 
-    AMSField(
-        String name,
-        String displayName,
-        FieldProperty first,
-        FieldProperty... rest
-    ) {
+    AMSField(String name, String displayName, FieldProperty first, FieldProperty... rest) {
         this.name = name;
         this.displayName = displayName;
         this.properties = EnumSet.of(first, rest);
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 acfefe9a6d0..4968be914b3 100644
--- a/src/main/java/org/jabref/model/entry/field/BibField.java
+++ b/src/main/java/org/jabref/model/entry/field/BibField.java
@@ -2,8 +2,7 @@
 
 import java.util.Objects;
 
-public record BibField(Field field, FieldPriority priority)
-    implements Comparable<BibField> {
+public record BibField(Field field, FieldPriority priority) implements Comparable<BibField> {
     @Override
     public boolean equals(Object o) {
         if (this == o) {
@@ -23,14 +22,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 9c349fe9fe7..b65f1530936 100644
--- a/src/main/java/org/jabref/model/entry/field/BiblatexApaField.java
+++ b/src/main/java/org/jabref/model/entry/field/BiblatexApaField.java
@@ -32,12 +32,7 @@ public enum BiblatexApaField implements Field {
         this.properties = EnumSet.noneOf(FieldProperty.class);
     }
 
-    BiblatexApaField(
-        String name,
-        String displayName,
-        FieldProperty first,
-        FieldProperty... rest
-    ) {
+    BiblatexApaField(String name, String displayName, FieldProperty first, FieldProperty... rest) {
         this.name = name;
         this.displayName = displayName;
         this.properties = EnumSet.of(first, rest);
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 0ca6ba2cfca..747bf8b5b9c 100644
--- a/src/main/java/org/jabref/model/entry/field/BiblatexSoftwareField.java
+++ b/src/main/java/org/jabref/model/entry/field/BiblatexSoftwareField.java
@@ -43,20 +43,13 @@ public enum BiblatexSoftwareField implements Field {
         this.properties = EnumSet.of(first, rest);
     }
 
-    BiblatexSoftwareField(
-        String name,
-        FieldProperty first,
-        FieldProperty... rest
-    ) {
+    BiblatexSoftwareField(String name, FieldProperty first, FieldProperty... rest) {
         this.name = name;
         this.displayName = null;
         this.properties = EnumSet.of(first, rest);
     }
 
-    public static <T> Optional<BiblatexSoftwareField> fromName(
-        T type,
-        String name
-    ) {
+    public static <T> Optional<BiblatexSoftwareField> fromName(T type, String name) {
         if (!(type instanceof BiblatexSoftwareEntryType)) {
             return Optional.empty();
         }
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 1f3293f460b..b8fc23402a3 100644
--- a/src/main/java/org/jabref/model/entry/field/FieldFactory.java
+++ b/src/main/java/org/jabref/model/entry/field/FieldFactory.java
@@ -67,11 +67,7 @@ public static List<Field> getNotTextFieldNames() {
     }
 
     public static List<Field> getIdentifierFieldNames() {
-        return Arrays.asList(
-            StandardField.DOI,
-            StandardField.EPRINT,
-            StandardField.PMID
-        );
+        return Arrays.asList(StandardField.DOI, StandardField.EPRINT, StandardField.PMID);
     }
 
     public static OrFields parseOrFields(String fieldNames) {
@@ -118,10 +114,7 @@ public static String serializeFieldsList(Collection<Field> fields) {
      * Type T is an entry type and is used to direct the mapping to the Java field class.
      * 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
-    ) {
+    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
         if (fieldName.startsWith("comment-")) {
             String username = fieldName.substring("comment-".length());
@@ -166,8 +159,7 @@ 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)
         );
     }
 
@@ -177,13 +169,9 @@ public static Set<Field> getJournalNameFields() {
     public static Set<Field> getCommonFields() {
         EnumSet<StandardField> allFields = EnumSet.allOf(StandardField.class);
 
-        LinkedHashSet<Field> publicAndInternalFields = new LinkedHashSet<>(
-            allFields.size() + 3
-        );
+        LinkedHashSet<Field> publicAndInternalFields = new LinkedHashSet<>(allFields.size() + 3);
         publicAndInternalFields.add(InternalField.INTERNAL_ALL_FIELD);
-        publicAndInternalFields.add(
-            InternalField.INTERNAL_ALL_TEXT_FIELDS_FIELD
-        );
+        publicAndInternalFields.add(InternalField.INTERNAL_ALL_TEXT_FIELDS_FIELD);
         publicAndInternalFields.add(InternalField.KEY_FIELD);
         publicAndInternalFields.addAll(allFields);
 
@@ -194,9 +182,7 @@ public static Set<Field> getCommonFields() {
      * Returns a sorted Set of Fields (by {@link Field#getDisplayName} with all fields without internal ones
      */
     public static Set<Field> getAllFieldsWithOutInternal() {
-        Set<Field> fields = new TreeSet<>(
-            Comparator.comparing(Field::getDisplayName)
-        );
+        Set<Field> fields = new TreeSet<>(Comparator.comparing(Field::getDisplayName));
         fields.addAll(getAllFields());
         fields.removeAll(EnumSet.allOf(InternalField.class));
 
@@ -219,22 +205,16 @@ public static Set<Field> getStandardFieldsWithCitationKey() {
     }
 
     public static Set<Field> getBookNameFields() {
-        return getFieldsFiltered(field ->
-            field.getProperties().contains(FieldProperty.BOOK_NAME)
-        );
+        return getFieldsFiltered(field -> field.getProperties().contains(FieldProperty.BOOK_NAME));
     }
 
     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() {
@@ -275,10 +255,7 @@ public static List<Field> getDefaultGeneralFields() {
 
     // 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
-    ) {
+    public static boolean isMultiLineField(final Field field, List<Field> nonWrappableFields) {
         return (
             field.getProperties().contains(FieldProperty.MULTILINE_TEXT) ||
             nonWrappableFields.contains(field)
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 efbcf7a3f62..eedd752f630 100644
--- a/src/main/java/org/jabref/model/entry/field/OrFields.java
+++ b/src/main/java/org/jabref/model/entry/field/OrFields.java
@@ -45,9 +45,7 @@ public boolean contains(Field field) {
 
     @Override
     public int compareTo(OrFields o) {
-        return FieldFactory
-            .serializeOrFields(this)
-            .compareTo(FieldFactory.serializeOrFields(o));
+        return FieldFactory.serializeOrFields(this).compareTo(FieldFactory.serializeOrFields(o));
     }
 
     public boolean hasExactlyOne() {
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 26fd7637a81..71eeca874c4 100644
--- a/src/main/java/org/jabref/model/entry/field/SpecialField.java
+++ b/src/main/java/org/jabref/model/entry/field/SpecialField.java
@@ -54,9 +54,7 @@ public enum SpecialField implements Field {
         for (SpecialFieldValue value : values) {
             this.values.add(value);
             value.getKeyword().ifPresent(keywords::add);
-            value
-                .getFieldValue()
-                .ifPresent(fieldValue -> map.put(fieldValue, value));
+            value.getFieldValue().ifPresent(fieldValue -> map.put(fieldValue, value));
         }
     }
 
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 287b18be8c8..989ea1df476 100644
--- a/src/main/java/org/jabref/model/entry/field/SpecialFieldValue.java
+++ b/src/main/java/org/jabref/model/entry/field/SpecialFieldValue.java
@@ -43,9 +43,7 @@ public static SpecialFieldValue getRating(int ranking) {
             case 3 -> RANK_3;
             case 4 -> RANK_4;
             case 5 -> RANK_5;
-            default -> throw new UnsupportedOperationException(
-                ranking + "is not a valid ranking"
-            );
+            default -> throw new UnsupportedOperationException(ranking + "is not a valid ranking");
         };
     }
 
@@ -65,9 +63,7 @@ public int toRating() {
             case RANK_3 -> 3;
             case RANK_4 -> 4;
             case RANK_5 -> 5;
-            default -> throw new UnsupportedOperationException(
-                this + "is not a valid ranking"
-            );
+            default -> throw new UnsupportedOperationException(this + "is not a valid ranking");
         };
     }
 }
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 7d992447060..dd92b9df783 100644
--- a/src/main/java/org/jabref/model/entry/field/StandardField.java
+++ b/src/main/java/org/jabref/model/entry/field/StandardField.java
@@ -30,12 +30,7 @@ public enum StandardField implements Field {
     CHAPTER("chapter"),
     COMMENTATOR("commentator", FieldProperty.PERSON_NAMES),
     // Comments of users are handled at {@link org.jabref.model.entry.field.UserSpecificCommentField}
-    COMMENT(
-        "comment",
-        FieldProperty.COMMENT,
-        FieldProperty.MULTILINE_TEXT,
-        FieldProperty.VERBATIM
-    ),
+    COMMENT("comment", FieldProperty.COMMENT, FieldProperty.MULTILINE_TEXT, FieldProperty.VERBATIM),
     CROSSREF("crossref", FieldProperty.SINGLE_ENTRY_LINK),
     DATE("date", FieldProperty.DATE),
     DAY("day"),
@@ -164,12 +159,7 @@ public enum StandardField implements Field {
         this.properties = EnumSet.noneOf(FieldProperty.class);
     }
 
-    StandardField(
-        String name,
-        String displayName,
-        FieldProperty first,
-        FieldProperty... rest
-    ) {
+    StandardField(String name, String displayName, FieldProperty first, FieldProperty... rest) {
         this.name = name;
         this.displayName = displayName;
         this.properties = EnumSet.of(first, rest);
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 648b5e08e0c..67c65f0b05a 100644
--- a/src/main/java/org/jabref/model/entry/field/UnknownField.java
+++ b/src/main/java/org/jabref/model/entry/field/UnknownField.java
@@ -22,11 +22,7 @@ public UnknownField(String name, String displayName) {
         this.properties = EnumSet.noneOf(FieldProperty.class);
     }
 
-    public UnknownField(
-        String name,
-        FieldProperty first,
-        FieldProperty... rest
-    ) {
+    public UnknownField(String name, FieldProperty first, FieldProperty... rest) {
         this(name, StringUtil.capitalizeFirst(name), first, rest);
     }
 
@@ -42,10 +38,7 @@ public UnknownField(
     }
 
     public static UnknownField fromDisplayName(String displayName) {
-        return new UnknownField(
-            displayName.toLowerCase(Locale.ROOT),
-            displayName
-        );
+        return new UnknownField(displayName.toLowerCase(Locale.ROOT), displayName);
     }
 
     @Override
diff --git a/src/main/java/org/jabref/model/entry/identifier/ARK.java b/src/main/java/org/jabref/model/entry/identifier/ARK.java
index e8a049cbc2f..aa22d3cad5d 100644
--- a/src/main/java/org/jabref/model/entry/identifier/ARK.java
+++ b/src/main/java/org/jabref/model/entry/identifier/ARK.java
@@ -36,8 +36,6 @@ public String getNormalized() {
 
     @Override
     public Optional<URI> getExternalURI() {
-        return Optional.of(
-            URI.create("https://n2t.net/ark:/" + getNormalized())
-        );
+        return Optional.of(URI.create("https://n2t.net/ark:/" + getNormalized()));
     }
 }
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 66ab6b89095..431220ea23d 100644
--- a/src/main/java/org/jabref/model/entry/identifier/ArXivIdentifier.java
+++ b/src/main/java/org/jabref/model/entry/identifier/ArXivIdentifier.java
@@ -15,12 +15,9 @@
  */
 public class ArXivIdentifier extends EprintIdentifier {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(
-        ArXivIdentifier.class
-    );
+    private static final Logger LOGGER = LoggerFactory.getLogger(ArXivIdentifier.class);
 
-    private static final String ARXIV_PREFIX =
-        "http(s)?://arxiv.org/(abs|pdf)/|arxiv|arXiv";
+    private static final String ARXIV_PREFIX = "http(s)?://arxiv.org/(abs|pdf)/|arxiv|arXiv";
     private final String identifier;
     private final String classification;
     private final String version;
@@ -64,9 +61,7 @@ public static Optional<ArXivIdentifier> parse(String value) {
         return Optional.empty();
     }
 
-    private static Optional<ArXivIdentifier> getArXivIdentifier(
-        Matcher matcher
-    ) {
+    private static Optional<ArXivIdentifier> getArXivIdentifier(Matcher matcher) {
         String id = matcher.group("id");
         String classification = matcher.group("classification");
         if (classification == null) {
@@ -154,9 +149,7 @@ public String getNormalizedWithoutVersion() {
     @Override
     public Optional<URI> getExternalURI() {
         try {
-            return Optional.of(
-                new URI("https://arxiv.org/abs/" + getNormalized())
-            );
+            return Optional.of(new URI("https://arxiv.org/abs/" + getNormalized()));
         } catch (URISyntaxException e) {
             return Optional.empty();
         }
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 c7611eabc9e..57f4b1a32d2 100644
--- a/src/main/java/org/jabref/model/entry/identifier/DOI.java
+++ b/src/main/java/org/jabref/model/entry/identifier/DOI.java
@@ -24,9 +24,7 @@
 )
 public class DOI implements Identifier {
 
-    public static final URI AGENCY_RESOLVER = URI.create(
-        "https://doi.org/doiRA"
-    );
+    public static final URI AGENCY_RESOLVER = URI.create("https://doi.org/doiRA");
     public static final URI RESOLVER = URI.create("https://doi.org/");
 
     private static final Logger LOGGER = LoggerFactory.getLogger(DOI.class);
@@ -56,8 +54,7 @@ public class DOI implements Identifier {
 
     // 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
+        "" + "^\\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 =
@@ -92,8 +89,7 @@ public class DOI implements Identifier {
         ")"; // 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;
+    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 + "$",
@@ -153,12 +149,9 @@ public DOI(String doi) {
             try {
                 // decodes path segment
                 URI url = new URI(trimmedDoi);
-                trimmedDoi =
-                    url.getScheme() + "://" + url.getHost() + url.getPath();
+                trimmedDoi = url.getScheme() + "://" + url.getHost() + url.getPath();
             } catch (URISyntaxException e) {
-                throw new IllegalArgumentException(
-                    doi + " is not a valid HTTP DOI/Short DOI."
-                );
+                throw new IllegalArgumentException(doi + " is not a valid HTTP DOI/Short DOI.");
             }
         }
 
@@ -175,9 +168,7 @@ public DOI(String doi) {
                 isShortDoi = true;
             } else {
                 // Shortcut DOI without the "10/" as in "doi.org/d8dn"
-                Matcher shortcutDoiMatcher = EXACT_SHORT_DOI_SHORTCUT.matcher(
-                    trimmedDoi
-                );
+                Matcher shortcutDoiMatcher = EXACT_SHORT_DOI_SHORTCUT.matcher(trimmedDoi);
                 if (shortcutDoiMatcher.find()) {
                     this.doi = "10/" + shortcutDoiMatcher.group(1);
                     isShortDoi = true;
@@ -298,12 +289,7 @@ public Optional<URI> getExternalURIWithCustomBase(String customBase) {
 
     private Optional<URI> getExternalURIFromBase(URI base) {
         try {
-            URI uri = new URI(
-                base.getScheme(),
-                base.getHost(),
-                "/" + doi,
-                null
-            );
+            URI uri = new URI(base.getScheme(), base.getHost(), "/" + doi, null);
             return Optional.of(uri);
         } catch (URISyntaxException e) {
             // should never happen
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 b61a16f70a6..1a1792339b7 100644
--- a/src/main/java/org/jabref/model/entry/identifier/ISBN.java
+++ b/src/main/java/org/jabref/model/entry/identifier/ISBN.java
@@ -12,15 +12,12 @@
 
 public class ISBN implements Identifier {
 
-    private static final Pattern ISBN_PATTERN = Pattern.compile(
-        "^(\\d{9}[\\dxX]|\\d{13})$"
-    );
+    private static final Pattern ISBN_PATTERN = Pattern.compile("^(\\d{9}[\\dxX]|\\d{13})$");
 
     private final String isbnString;
 
     public ISBN(String isbnString) {
-        this.isbnString =
-            Objects.requireNonNull(isbnString).trim().replace("-", "");
+        this.isbnString = Objects.requireNonNull(isbnString).trim().replace("-", "");
     }
 
     public static Optional<ISBN> parse(String input) {
@@ -104,9 +101,7 @@ public String getNormalized() {
     @Override
     public Optional<URI> getExternalURI() {
         try {
-            return Optional.of(
-                new URI("https://www.worldcat.org/isbn/" + isbnString)
-            );
+            return Optional.of(new URI("https://www.worldcat.org/isbn/" + isbnString));
         } catch (URISyntaxException e) {
             return Optional.empty();
         }
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 37bffc5eeeb..c0b898ec83d 100644
--- a/src/main/java/org/jabref/model/entry/identifier/ISSN.java
+++ b/src/main/java/org/jabref/model/entry/identifier/ISSN.java
@@ -10,12 +10,8 @@
 
 public class ISSN implements Identifier {
 
-    private static final Pattern ISSN_PATTERN = Pattern.compile(
-        "^\\d{4}-\\d{3}[\\dxX]$"
-    );
-    private static final Pattern ISSN_PATTERN_NODASH = Pattern.compile(
-        "^(\\d{4})(\\d{3}[\\dxX])$"
-    );
+    private static final Pattern ISSN_PATTERN = Pattern.compile("^\\d{4}-\\d{3}[\\dxX]$");
+    private static final Pattern ISSN_PATTERN_NODASH = Pattern.compile("^(\\d{4})(\\d{3}[\\dxX])$");
 
     private final String issnString;
 
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 e69ef965f46..2112ff6de7d 100644
--- a/src/main/java/org/jabref/model/entry/identifier/IacrEprint.java
+++ b/src/main/java/org/jabref/model/entry/identifier/IacrEprint.java
@@ -14,9 +14,7 @@
 public class IacrEprint implements Identifier {
 
     public static final URI RESOLVER = URI.create("https://ia.cr");
-    private static final Logger LOGGER = LoggerFactory.getLogger(
-        IacrEprint.class
-    );
+    private static final Logger LOGGER = LoggerFactory.getLogger(IacrEprint.class);
 
     private static final String IACR_EPRINT_EXP = "\\d{4}\\/\\d{3,5}";
     private final String iacrEprint;
@@ -27,9 +25,7 @@ public class IacrEprint implements Identifier {
         String trimmedId = iacrEprint.trim();
 
         if (matchesExcepted(trimmedId)) {
-            Matcher matcher = Pattern
-                .compile(IACR_EPRINT_EXP)
-                .matcher(trimmedId);
+            Matcher matcher = Pattern.compile(IACR_EPRINT_EXP).matcher(trimmedId);
             matcher.find();
             this.iacrEprint = matcher.group(0);
         } else {
@@ -41,8 +37,7 @@ public class IacrEprint implements 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
         );
     }
 
@@ -68,12 +63,7 @@ public Field getDefaultField() {
     @Override
     public Optional<URI> getExternalURI() {
         try {
-            URI uri = new URI(
-                RESOLVER.getScheme(),
-                RESOLVER.getHost(),
-                "/" + iacrEprint,
-                null
-            );
+            URI uri = new URI(RESOLVER.getScheme(), RESOLVER.getHost(), "/" + iacrEprint, null);
             return Optional.of(uri);
         } catch (URISyntaxException e) {
             // should never happen
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 34b1ea9c876..1ea682c3edb 100644
--- a/src/main/java/org/jabref/model/entry/identifier/MathSciNetId.java
+++ b/src/main/java/org/jabref/model/entry/identifier/MathSciNetId.java
@@ -21,10 +21,7 @@ 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
-        String identifier = StringUtil
-            .tokenizeToList(mrNumberRaw, " (")
-            .get(0)
-            .trim();
+        String identifier = StringUtil.tokenizeToList(mrNumberRaw, " (").get(0).trim();
         return Optional.of(new MathSciNetId(identifier));
     }
 
@@ -56,11 +53,7 @@ public String toString() {
     @Override
     public Optional<URI> getExternalURI() {
         try {
-            return Optional.of(
-                new URI(
-                    "https://www.ams.org/mathscinet-getitem?mr=" + identifier
-                )
-            );
+            return Optional.of(new URI("https://www.ams.org/mathscinet-getitem?mr=" + identifier));
         } catch (URISyntaxException e) {
             return Optional.empty();
         }
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 183625242ce..bc556f56588 100644
--- a/src/main/java/org/jabref/model/entry/types/BiblatexAPAEntryTypeDefinitions.java
+++ b/src/main/java/org/jabref/model/entry/types/BiblatexAPAEntryTypeDefinitions.java
@@ -38,22 +38,21 @@ public class BiblatexAPAEntryTypeDefinitions {
         )
         .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 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)
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 cbcaf001a42..def3b7a582a 100644
--- a/src/main/java/org/jabref/model/entry/types/BiblatexEntryTypeDefinitions.java
+++ b/src/main/java/org/jabref/model/entry/types/BiblatexEntryTypeDefinitions.java
@@ -98,11 +98,7 @@ public class BiblatexEntryTypeDefinitions {
             StandardField.URL,
             StandardField.URLDATE
         )
-        .withRequiredFields(
-            StandardField.AUTHOR,
-            StandardField.TITLE,
-            StandardField.DATE
-        )
+        .withRequiredFields(StandardField.AUTHOR, StandardField.TITLE, StandardField.DATE)
         .withDetailFields(
             StandardField.EDITOR,
             StandardField.EDITORA,
@@ -162,11 +158,7 @@ public class BiblatexEntryTypeDefinitions {
             StandardField.URL,
             StandardField.URLDATE
         )
-        .withRequiredFields(
-            StandardField.AUTHOR,
-            StandardField.TITLE,
-            StandardField.DATE
-        )
+        .withRequiredFields(StandardField.AUTHOR, StandardField.TITLE, StandardField.DATE)
         .withDetailFields(
             StandardField.EDITOR,
             StandardField.EDITORA,
@@ -355,11 +347,7 @@ public class BiblatexEntryTypeDefinitions {
             StandardField.URL,
             StandardField.URLDATE
         )
-        .withRequiredFields(
-            StandardField.EDITOR,
-            StandardField.TITLE,
-            StandardField.DATE
-        )
+        .withRequiredFields(StandardField.EDITOR, StandardField.TITLE, StandardField.DATE)
         .withDetailFields(
             StandardField.EDITORA,
             StandardField.EDITORB,
@@ -417,11 +405,7 @@ public class BiblatexEntryTypeDefinitions {
             StandardField.URL,
             StandardField.URLDATE
         )
-        .withRequiredFields(
-            StandardField.EDITOR,
-            StandardField.TITLE,
-            StandardField.DATE
-        )
+        .withRequiredFields(StandardField.EDITOR, StandardField.TITLE, StandardField.DATE)
         .withDetailFields(
             StandardField.EDITORA,
             StandardField.EDITORB,
@@ -706,11 +690,7 @@ public class BiblatexEntryTypeDefinitions {
             StandardField.URL,
             StandardField.URLDATE
         )
-        .withRequiredFields(
-            StandardField.EDITOR,
-            StandardField.TITLE,
-            StandardField.DATE
-        )
+        .withRequiredFields(StandardField.EDITOR, StandardField.TITLE, StandardField.DATE)
         .withDetailFields(
             StandardField.EDITORA,
             StandardField.EDITORB,
@@ -1046,11 +1026,7 @@ public class BiblatexEntryTypeDefinitions {
             StandardField.URL,
             StandardField.URLDATE
         )
-        .withRequiredFields(
-            StandardField.AUTHOR,
-            StandardField.TITLE,
-            StandardField.DATE
-        )
+        .withRequiredFields(StandardField.AUTHOR, StandardField.TITLE, StandardField.DATE)
         .withDetailFields(
             StandardField.SUBTITLE,
             StandardField.TITLEADDON,
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 31f172e2160..ca51e223910 100644
--- a/src/main/java/org/jabref/model/entry/types/BiblatexSoftwareEntryTypeDefinitions.java
+++ b/src/main/java/org/jabref/model/entry/types/BiblatexSoftwareEntryTypeDefinitions.java
@@ -45,65 +45,64 @@ public class BiblatexSoftwareEntryTypeDefinitions {
         )
         .build();
 
-    private static final BibEntryType SOFTWAREVERSION =
-        new BibEntryTypeBuilder()
-            .withType(BiblatexSoftwareEntryType.SoftwareVersion)
-            .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
-            )
-            .withRequiredFields(
-                new OrFields(StandardField.AUTHOR, StandardField.EDITOR),
-                StandardField.TITLE,
-                StandardField.URL,
-                StandardField.YEAR,
-                StandardField.VERSION
-            )
-            .withDetailFields(
-                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
-            )
-            .withRequiredFields(
-                new OrFields(StandardField.AUTHOR, StandardField.EDITOR),
-                StandardField.TITLE,
-                StandardField.URL,
-                StandardField.YEAR
-            )
-            .build();
+    private static final BibEntryType SOFTWAREVERSION = new BibEntryTypeBuilder()
+        .withType(BiblatexSoftwareEntryType.SoftwareVersion)
+        .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
+        )
+        .withRequiredFields(
+            new OrFields(StandardField.AUTHOR, StandardField.EDITOR),
+            StandardField.TITLE,
+            StandardField.URL,
+            StandardField.YEAR,
+            StandardField.VERSION
+        )
+        .withDetailFields(
+            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
+        )
+        .withRequiredFields(
+            new OrFields(StandardField.AUTHOR, StandardField.EDITOR),
+            StandardField.TITLE,
+            StandardField.URL,
+            StandardField.YEAR
+        )
+        .build();
     private static final BibEntryType SOFTWAREMODULE = new BibEntryTypeBuilder()
         .withType(BiblatexSoftwareEntryType.SoftwareModule)
         .withImportantFields(
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 15dff1cfeba..9cd4cf47519 100644
--- a/src/main/java/org/jabref/model/entry/types/BibtexEntryTypeDefinitions.java
+++ b/src/main/java/org/jabref/model/entry/types/BibtexEntryTypeDefinitions.java
@@ -334,11 +334,7 @@ public class BibtexEntryTypeDefinitions {
      */
     private static final BibEntryType UNPUBLISHED = new BibEntryTypeBuilder()
         .withType(StandardEntryType.Unpublished)
-        .withRequiredFields(
-            StandardField.AUTHOR,
-            StandardField.TITLE,
-            StandardField.NOTE
-        )
+        .withRequiredFields(StandardField.AUTHOR, StandardField.TITLE, StandardField.NOTE)
         .withImportantFields(StandardField.MONTH, StandardField.YEAR)
         .build();
 
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 f35e7616b15..d4376b03b66 100644
--- a/src/main/java/org/jabref/model/entry/types/EntryTypeFactory.java
+++ b/src/main/java/org/jabref/model/entry/types/EntryTypeFactory.java
@@ -17,10 +17,7 @@ private EntryTypeFactory() {}
      *
      * @return returns true if the two compared entry types have the same name and equal required and optional fields
      */
-    public static boolean nameAndFieldsAreEqual(
-        BibEntryType type1,
-        BibEntryType type2
-    ) {
+    public static boolean nameAndFieldsAreEqual(BibEntryType type1, BibEntryType type2) {
         if ((type1 == null) && (type2 == null)) {
             return true;
         } else if ((type1 == null) || (type2 == null)) {
@@ -28,14 +25,8 @@ public static boolean nameAndFieldsAreEqual(
         } else {
             return (
                 Objects.equals(type1.getType(), type2.getType()) &&
-                Objects.equals(
-                    type1.getRequiredFields(),
-                    type2.getRequiredFields()
-                ) &&
-                Objects.equals(
-                    type1.getOptionalFields(),
-                    type2.getOptionalFields()
-                ) &&
+                Objects.equals(type1.getRequiredFields(), type2.getRequiredFields()) &&
+                Objects.equals(type1.getOptionalFields(), type2.getOptionalFields()) &&
                 Objects.equals(
                     type1.getSecondaryOptionalFields(),
                     type2.getSecondaryOptionalFields()
@@ -65,21 +56,13 @@ public static EntryType parse(String typeName) {
             Arrays.<EntryType>asList(StandardEntryType.values())
         );
         types.addAll(Arrays.<EntryType>asList(IEEETranEntryType.values()));
-        types.addAll(
-            Arrays.<EntryType>asList(BiblatexSoftwareEntryType.values())
-        );
+        types.addAll(Arrays.<EntryType>asList(BiblatexSoftwareEntryType.values()));
         types.addAll(Arrays.<EntryType>asList(BiblatexApaEntryType.values()));
-        types.addAll(
-            Arrays.<EntryType>asList(
-                SystematicLiteratureReviewStudyEntryType.values()
-            )
-        );
+        types.addAll(Arrays.<EntryType>asList(SystematicLiteratureReviewStudyEntryType.values()));
 
         return types
             .stream()
-            .filter(type ->
-                type.getName().equals(typeName.toLowerCase(Locale.ENGLISH))
-            )
+            .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/SystematicLiteratureReviewStudyEntryType.java b/src/main/java/org/jabref/model/entry/types/SystematicLiteratureReviewStudyEntryType.java
index b842878ada7..23964e9733c 100644
--- a/src/main/java/org/jabref/model/entry/types/SystematicLiteratureReviewStudyEntryType.java
+++ b/src/main/java/org/jabref/model/entry/types/SystematicLiteratureReviewStudyEntryType.java
@@ -15,9 +15,7 @@ public enum SystematicLiteratureReviewStudyEntryType implements EntryType {
         this.displayName = displayName;
     }
 
-    public static Optional<SystematicLiteratureReviewStudyEntryType> fromName(
-        String name
-    ) {
+    public static Optional<SystematicLiteratureReviewStudyEntryType> fromName(String name) {
         return Arrays
             .stream(SystematicLiteratureReviewStudyEntryType.values())
             .filter(field -> field.getName().equalsIgnoreCase(name))
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 df27f02427d..8799417c50c 100644
--- a/src/main/java/org/jabref/model/entry/types/SystematicLiteratureReviewStudyEntryTypeDefinitions.java
+++ b/src/main/java/org/jabref/model/entry/types/SystematicLiteratureReviewStudyEntryTypeDefinitions.java
@@ -38,13 +38,10 @@ 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
@@ -56,10 +53,7 @@ public class SystematicLiteratureReviewStudyEntryTypeDefinitions {
      */
     private static final BibEntryType LIBRARY_ENTRY = new BibEntryTypeBuilder()
         .withType(SystematicLiteratureReviewStudyEntryType.STUDY_ENTRY)
-        .withRequiredFields(
-            new UnknownField("name"),
-            new UnknownField("enabled")
-        )
+        .withRequiredFields(new UnknownField("name"), new UnknownField("enabled"))
         .withImportantFields(StandardField.COMMENT)
         .build();
 
diff --git a/src/main/java/org/jabref/model/groups/AllEntriesGroup.java b/src/main/java/org/jabref/model/groups/AllEntriesGroup.java
index c84a9582f7f..c508a69d175 100644
--- a/src/main/java/org/jabref/model/groups/AllEntriesGroup.java
+++ b/src/main/java/org/jabref/model/groups/AllEntriesGroup.java
@@ -19,10 +19,7 @@ public AbstractGroup deepCopy() {
 
     @Override
     public boolean equals(Object o) {
-        return (
-            o instanceof AllEntriesGroup aeg &&
-            Objects.equals(aeg.getName(), getName())
-        );
+        return (o instanceof AllEntriesGroup aeg && Objects.equals(aeg.getName(), getName()));
     }
 
     @Override
diff --git a/src/main/java/org/jabref/model/groups/AutomaticGroup.java b/src/main/java/org/jabref/model/groups/AutomaticGroup.java
index 191407b1384..7a4164716a5 100644
--- a/src/main/java/org/jabref/model/groups/AutomaticGroup.java
+++ b/src/main/java/org/jabref/model/groups/AutomaticGroup.java
@@ -23,9 +23,7 @@ public boolean isDynamic() {
 
     public abstract Set<GroupTreeNode> createSubgroups(BibEntry entry);
 
-    public ObservableList<GroupTreeNode> createSubgroups(
-        ObservableList<BibEntry> entries
-    ) {
+    public ObservableList<GroupTreeNode> createSubgroups(ObservableList<BibEntry> entries) {
         // TODO: Propagate changes to entry list (however: there is no flatMap and collect as TransformationList)
         return entries
             .stream()
diff --git a/src/main/java/org/jabref/model/groups/AutomaticKeywordGroup.java b/src/main/java/org/jabref/model/groups/AutomaticKeywordGroup.java
index 70ce9495159..1fbc230d670 100644
--- a/src/main/java/org/jabref/model/groups/AutomaticKeywordGroup.java
+++ b/src/main/java/org/jabref/model/groups/AutomaticKeywordGroup.java
@@ -73,10 +73,7 @@ public int hashCode() {
 
     @Override
     public Set<GroupTreeNode> createSubgroups(BibEntry entry) {
-        KeywordList keywordList = entry.getFieldAsKeywords(
-            field,
-            keywordDelimiter
-        );
+        KeywordList keywordList = entry.getFieldAsKeywords(field, keywordDelimiter);
         return keywordList
             .stream()
             .filter(keyword -> StringUtil.isNotBlank(keyword.get()))
@@ -95,10 +92,7 @@ private GroupTreeNode createGroup(Keyword keywordChain) {
             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 0beb7d4044a..710a512479e 100644
--- a/src/main/java/org/jabref/model/groups/AutomaticPersonsGroup.java
+++ b/src/main/java/org/jabref/model/groups/AutomaticPersonsGroup.java
@@ -10,11 +10,7 @@ public class AutomaticPersonsGroup extends AutomaticGroup {
 
     private final Field field;
 
-    public AutomaticPersonsGroup(
-        String name,
-        GroupHierarchyType context,
-        Field field
-    ) {
+    public AutomaticPersonsGroup(String name, GroupHierarchyType context, Field field) {
         super(name, context);
         this.field = field;
     }
@@ -38,11 +34,7 @@ public int hashCode() {
 
     @Override
     public AbstractGroup deepCopy() {
-        return new AutomaticPersonsGroup(
-            this.name.getValue(),
-            this.context,
-            this.field
-        );
+        return new AutomaticPersonsGroup(this.name.getValue(), this.context, this.field);
     }
 
     @Override
@@ -51,12 +43,7 @@ public Set<GroupTreeNode> createSubgroups(BibEntry entry) {
             .getAsLastNamesLatexFree(field, entry)
             .stream()
             .map(lastName ->
-                new LastNameGroup(
-                    lastName,
-                    GroupHierarchyType.INDEPENDENT,
-                    field,
-                    lastName
-                )
+                new LastNameGroup(lastName, GroupHierarchyType.INDEPENDENT, field, lastName)
             )
             .map(GroupTreeNode::new)
             .collect(Collectors.toSet());
diff --git a/src/main/java/org/jabref/model/groups/ExplicitGroup.java b/src/main/java/org/jabref/model/groups/ExplicitGroup.java
index 5f16c0a4c06..c810c956954 100644
--- a/src/main/java/org/jabref/model/groups/ExplicitGroup.java
+++ b/src/main/java/org/jabref/model/groups/ExplicitGroup.java
@@ -20,20 +20,8 @@ public class ExplicitGroup extends WordKeywordGroup {
      */
     private final List<String> legacyEntryKeys = new ArrayList<>();
 
-    public ExplicitGroup(
-        String name,
-        GroupHierarchyType context,
-        Character keywordSeparator
-    ) {
-        super(
-            name,
-            context,
-            StandardField.GROUPS,
-            name,
-            true,
-            keywordSeparator,
-            true
-        );
+    public ExplicitGroup(String name, GroupHierarchyType context, Character keywordSeparator) {
+        super(name, context, StandardField.GROUPS, name, true, keywordSeparator, true);
     }
 
     public void addLegacyEntryKey(String key) {
@@ -62,10 +50,7 @@ public boolean equals(Object o) {
         ExplicitGroup other = (ExplicitGroup) o;
         return (
             Objects.equals(getName(), other.getName()) &&
-            Objects.equals(
-                getHierarchicalContext(),
-                other.getHierarchicalContext()
-            ) &&
+            Objects.equals(getHierarchicalContext(), other.getHierarchicalContext()) &&
             Objects.equals(getIconName(), other.getIconName()) &&
             Objects.equals(getDescription(), other.getDescription()) &&
             Objects.equals(getColor(), other.getColor()) &&
diff --git a/src/main/java/org/jabref/model/groups/GroupTreeNode.java b/src/main/java/org/jabref/model/groups/GroupTreeNode.java
index deac1716df7..a0306ec983e 100644
--- a/src/main/java/org/jabref/model/groups/GroupTreeNode.java
+++ b/src/main/java/org/jabref/model/groups/GroupTreeNode.java
@@ -76,11 +76,9 @@ public List<FieldChange> setGroup(
 
         List<FieldChange> changes = new ArrayList<>();
         boolean shouldRemoveFromOldGroup =
-            shouldRemovePreviousAssignments &&
-            (oldGroup instanceof GroupEntryChanger);
+            shouldRemovePreviousAssignments && (oldGroup instanceof GroupEntryChanger);
         boolean shouldAddToNewGroup =
-            shouldKeepPreviousAssignments &&
-            (newGroup instanceof GroupEntryChanger);
+            shouldKeepPreviousAssignments && (newGroup instanceof GroupEntryChanger);
         if (shouldAddToNewGroup || shouldRemoveFromOldGroup) {
             List<BibEntry> entriesMatchedByOldGroup = entriesInDatabase
                 .stream()
@@ -130,9 +128,7 @@ private SearchMatcher getSearchMatcher(GroupHierarchyType originalContext) {
             (originalContext != GroupHierarchyType.INCLUDING)
         ) {
             // noinspection OptionalGetWithoutIsPresent
-            searchRule.addRule(
-                getParent().get().getSearchMatcher(originalContext)
-            );
+            searchRule.addRule(getParent().get().getSearchMatcher(originalContext));
         }
         return searchRule;
     }
@@ -147,8 +143,7 @@ public boolean equals(Object o) {
         }
         GroupTreeNode that = (GroupTreeNode) o;
         return (
-            Objects.equals(group, that.group) &&
-            Objects.equals(getChildren(), that.getChildren())
+            Objects.equals(group, that.group) && Objects.equals(getChildren(), that.getChildren())
         );
     }
 
@@ -157,10 +152,7 @@ public int hashCode() {
         return Objects.hash(group);
     }
 
-    public List<GroupTreeNode> getContainingGroups(
-        List<BibEntry> entries,
-        boolean requireAll
-    ) {
+    public List<GroupTreeNode> getContainingGroups(List<BibEntry> entries, boolean requireAll) {
         List<GroupTreeNode> groups = new ArrayList<>();
 
         // Add myself if I contain the entries
@@ -245,10 +237,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());
     }
 
     /**
diff --git a/src/main/java/org/jabref/model/groups/LastNameGroup.java b/src/main/java/org/jabref/model/groups/LastNameGroup.java
index 541dc9ab525..f9e2461378b 100644
--- a/src/main/java/org/jabref/model/groups/LastNameGroup.java
+++ b/src/main/java/org/jabref/model/groups/LastNameGroup.java
@@ -21,19 +21,10 @@ public LastNameGroup(
         Field searchField,
         String lastName
     ) {
-        super(
-            groupName,
-            context,
-            searchField,
-            LatexToUnicodeAdapter.format(lastName),
-            true
-        );
+        super(groupName, context, searchField, LatexToUnicodeAdapter.format(lastName), true);
     }
 
-    static List<String> getAsLastNamesLatexFree(
-        Field field,
-        BibEntry bibEntry
-    ) {
+    static List<String> getAsLastNamesLatexFree(Field field, BibEntry bibEntry) {
         return bibEntry
             .getField(field)
             .stream()
diff --git a/src/main/java/org/jabref/model/groups/RegexKeywordGroup.java b/src/main/java/org/jabref/model/groups/RegexKeywordGroup.java
index ed57ecf6103..7dc89cdcd3e 100644
--- a/src/main/java/org/jabref/model/groups/RegexKeywordGroup.java
+++ b/src/main/java/org/jabref/model/groups/RegexKeywordGroup.java
@@ -24,24 +24,16 @@ public RegexKeywordGroup(
         this.pattern = compilePattern(searchExpression, caseSensitive);
     }
 
-    private static Pattern compilePattern(
-        String searchExpression,
-        boolean caseSensitive
-    ) {
+    private static Pattern compilePattern(String searchExpression, boolean caseSensitive) {
         return caseSensitive
             ? Pattern.compile("\\b" + searchExpression + "\\b")
-            : Pattern.compile(
-                "\\b" + searchExpression + "\\b",
-                Pattern.CASE_INSENSITIVE
-            );
+            : Pattern.compile("\\b" + searchExpression + "\\b", Pattern.CASE_INSENSITIVE);
     }
 
     @Override
     public boolean contains(BibEntry entry) {
         Optional<String> content = entry.getField(searchField);
-        return content
-            .map(value -> pattern.matcher(value).find())
-            .orElse(false);
+        return content.map(value -> pattern.matcher(value).find()).orElse(false);
     }
 
     @Override
diff --git a/src/main/java/org/jabref/model/groups/SearchGroup.java b/src/main/java/org/jabref/model/groups/SearchGroup.java
index 67a08556cbe..69c9aeed2da 100644
--- a/src/main/java/org/jabref/model/groups/SearchGroup.java
+++ b/src/main/java/org/jabref/model/groups/SearchGroup.java
@@ -14,9 +14,7 @@
  */
 public class SearchGroup extends AbstractGroup {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(
-        SearchGroup.class
-    );
+    private static final Logger LOGGER = LoggerFactory.getLogger(SearchGroup.class);
     private final GroupSearchQuery query;
 
     public SearchGroup(
@@ -44,14 +42,8 @@ public boolean equals(Object o) {
         SearchGroup other = (SearchGroup) o;
         return (
             Objects.equals(getName(), other.getName()) &&
-            Objects.equals(
-                getHierarchicalContext(),
-                other.getHierarchicalContext()
-            ) &&
-            Objects.equals(
-                getSearchExpression(),
-                other.getSearchExpression()
-            ) &&
+            Objects.equals(getHierarchicalContext(), other.getHierarchicalContext()) &&
+            Objects.equals(getSearchExpression(), other.getSearchExpression()) &&
             Objects.equals(getSearchFlags(), other.getSearchFlags())
         );
     }
diff --git a/src/main/java/org/jabref/model/groups/TexGroup.java b/src/main/java/org/jabref/model/groups/TexGroup.java
index 013d3784cb1..dc17e07cb5f 100644
--- a/src/main/java/org/jabref/model/groups/TexGroup.java
+++ b/src/main/java/org/jabref/model/groups/TexGroup.java
@@ -22,9 +22,7 @@
 @AllowedToUseLogic("because it needs access to aux parser")
 public class TexGroup extends AbstractGroup implements FileUpdateListener {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(
-        TexGroup.class
-    );
+    private static final Logger LOGGER = LoggerFactory.getLogger(TexGroup.class);
 
     private final Path filePath;
     private Set<String> keysUsedInAux;
@@ -65,9 +63,7 @@ public class TexGroup extends AbstractGroup implements FileUpdateListener {
             auxParser,
             fileMonitor,
             metaData,
-            System.getProperty("user.name") +
-            '-' +
-            InetAddress.getLocalHost().getHostName()
+            System.getProperty("user.name") + '-' + InetAddress.getLocalHost().getHostName()
         );
     }
 
@@ -79,14 +75,7 @@ public static TexGroup create(
         FileUpdateMonitor fileMonitor,
         MetaData metaData
     ) throws IOException {
-        TexGroup group = new TexGroup(
-            name,
-            context,
-            filePath,
-            auxParser,
-            fileMonitor,
-            metaData
-        );
+        TexGroup group = new TexGroup(name, context, filePath, auxParser, fileMonitor, metaData);
         fileMonitor.addListenerForFile(group.getFilePathResolved(), group);
         return group;
     }
@@ -120,10 +109,7 @@ public boolean contains(BibEntry entry) {
             keysUsedInAux = auxResult.getUniqueKeys();
         }
 
-        return entry
-            .getCitationKey()
-            .map(keysUsedInAux::contains)
-            .orElse(false);
+        return entry.getCitationKey().map(keysUsedInAux::contains).orElse(false);
     }
 
     @Override
@@ -208,9 +194,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 4b6b48a0ba5..6556cc0f222 100644
--- a/src/main/java/org/jabref/model/groups/WordKeywordGroup.java
+++ b/src/main/java/org/jabref/model/groups/WordKeywordGroup.java
@@ -20,9 +20,7 @@
 /**
  * Matches entries if a given field contains a specified word.
  */
-public class WordKeywordGroup
-    extends KeywordGroup
-    implements GroupEntryChanger {
+public class WordKeywordGroup extends KeywordGroup implements GroupEntryChanger {
 
     protected final Character keywordSeparator;
     private final SearchStrategy searchStrategy;
@@ -64,10 +62,7 @@ private static boolean containsCaseInsensitive(
         return true;
     }
 
-    private static boolean containsCaseInsensitive(
-        Set<String> searchIn,
-        String searchFor
-    ) {
+    private static boolean containsCaseInsensitive(Set<String> searchIn, String searchFor) {
         for (String word : searchIn) {
             if (word.equalsIgnoreCase(searchFor)) {
                 return true;
@@ -84,10 +79,7 @@ public List<FieldChange> add(Collection<BibEntry> entriesToAdd) {
         for (BibEntry entry : new ArrayList<>(entriesToAdd)) {
             if (!contains(entry)) {
                 String oldContent = entry.getField(searchField).orElse("");
-                KeywordList wordlist = KeywordList.parse(
-                    oldContent,
-                    keywordSeparator
-                );
+                KeywordList wordlist = KeywordList.parse(oldContent, keywordSeparator);
                 wordlist.add(searchExpression);
                 String newContent = wordlist.getAsString(keywordSeparator);
                 entry.setField(searchField, newContent).ifPresent(changes::add);
@@ -103,10 +95,7 @@ public List<FieldChange> remove(List<BibEntry> entriesToRemove) {
         for (BibEntry entry : new ArrayList<>(entriesToRemove)) {
             if (contains(entry)) {
                 String oldContent = entry.getField(searchField).orElse("");
-                KeywordList wordlist = KeywordList.parse(
-                    oldContent,
-                    keywordSeparator
-                );
+                KeywordList wordlist = KeywordList.parse(oldContent, keywordSeparator);
                 wordlist.remove(searchExpression);
                 String newContent = wordlist.getAsString(keywordSeparator);
                 entry.setField(searchField, newContent).ifPresent(changes::add);
@@ -126,18 +115,12 @@ public boolean equals(Object o) {
         WordKeywordGroup other = (WordKeywordGroup) o;
         return (
             Objects.equals(getName(), other.getName()) &&
-            Objects.equals(
-                getHierarchicalContext(),
-                other.getHierarchicalContext()
-            ) &&
+            Objects.equals(getHierarchicalContext(), other.getHierarchicalContext()) &&
             Objects.equals(searchField, other.searchField) &&
             Objects.equals(searchExpression, other.searchExpression) &&
             Objects.equals(caseSensitive, other.caseSensitive) &&
             Objects.equals(keywordSeparator, other.keywordSeparator) &&
-            Objects.equals(
-                onlySplitWordsAtSeparator,
-                other.onlySplitWordsAtSeparator
-            )
+            Objects.equals(onlySplitWordsAtSeparator, other.onlySplitWordsAtSeparator)
         );
     }
 
@@ -181,8 +164,7 @@ class StringSearchStrategy implements SearchStrategy {
         Set<String> searchWords;
 
         StringSearchStrategy() {
-            searchWords =
-                new HashSet<>(StringUtil.getStringAsWords(searchExpression));
+            searchWords = new HashSet<>(StringUtil.getStringAsWords(searchExpression));
         }
 
         @Override
@@ -211,9 +193,7 @@ class TypeSearchStrategy implements SearchStrategy {
 
         @Override
         public boolean contains(BibEntry entry) {
-            return searchWords
-                .stream()
-                .anyMatch(word -> entry.getType().equals(word));
+            return searchWords.stream().anyMatch(word -> entry.getType().equals(word));
         }
     }
 
@@ -227,10 +207,7 @@ class KeywordListSearchStrategy implements SearchStrategy {
 
         @Override
         public boolean contains(BibEntry entry) {
-            KeywordList fieldValue = entry.getFieldAsKeywords(
-                searchField,
-                keywordSeparator
-            );
+            KeywordList fieldValue = entry.getFieldAsKeywords(searchField, keywordSeparator);
             return ListUtil.allMatch(searchWords, fieldValue::contains);
         }
     }
diff --git a/src/main/java/org/jabref/model/metadata/ContentSelector.java b/src/main/java/org/jabref/model/metadata/ContentSelector.java
index 8911d7f3a86..cc1af1a3cf1 100644
--- a/src/main/java/org/jabref/model/metadata/ContentSelector.java
+++ b/src/main/java/org/jabref/model/metadata/ContentSelector.java
@@ -30,10 +30,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/MetaData.java b/src/main/java/org/jabref/model/metadata/MetaData.java
index cd27c29d96b..309e158b1cb 100644
--- a/src/main/java/org/jabref/model/metadata/MetaData.java
+++ b/src/main/java/org/jabref/model/metadata/MetaData.java
@@ -48,22 +48,18 @@ public class MetaData {
 
     public static final char ESCAPE_CHARACTER = '\\';
     public static final char SEPARATOR_CHARACTER = ';';
-    public static final String SEPARATOR_STRING = String.valueOf(
-        SEPARATOR_CHARACTER
-    );
+    public static final String SEPARATOR_STRING = String.valueOf(SEPARATOR_CHARACTER);
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(
-        MetaData.class
-    );
+    private static final Logger LOGGER = LoggerFactory.getLogger(MetaData.class);
 
     private final EventBus eventBus = new EventBus();
     private final Map<EntryType, String> citeKeyPatterns = new HashMap<>(); // <BibType, Pattern>
     private final Map<String, String> userFileDirectory = new HashMap<>(); // <User, FilePath>
     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 ObjectProperty<GroupTreeNode> groupsRoot = new SimpleObjectProperty<>(null);
+    private final OptionalBinding<GroupTreeNode> groupsRootBinding = new OptionalWrapper<>(
+        groupsRoot
+    );
     private Charset encoding;
     private SaveOrder saveOrder;
     private String defaultCiteKeyPattern;
@@ -107,9 +103,7 @@ public OptionalBinding<GroupTreeNode> groupsBinding() {
     public void setGroups(GroupTreeNode root) {
         Objects.requireNonNull(root);
         groupsRoot.setValue(root);
-        root.subscribeToDescendantChanged(groupTreeNode ->
-            groupsRootBinding.invalidate()
-        );
+        root.subscribeToDescendantChanged(groupTreeNode -> groupsRootBinding.invalidate());
         root.subscribeToDescendantChanged(groupTreeNode ->
             eventBus.post(new GroupUpdatedEvent(this))
         );
@@ -120,12 +114,9 @@ public void setGroups(GroupTreeNode root) {
     /**
      * @return the stored label patterns
      */
-    public AbstractCitationKeyPattern getCiteKeyPattern(
-        GlobalCitationKeyPattern globalPattern
-    ) {
+    public AbstractCitationKeyPattern getCiteKeyPattern(GlobalCitationKeyPattern globalPattern) {
         Objects.requireNonNull(globalPattern);
-        AbstractCitationKeyPattern bibtexKeyPattern =
-            new DatabaseCitationKeyPattern(globalPattern);
+        AbstractCitationKeyPattern bibtexKeyPattern = new DatabaseCitationKeyPattern(globalPattern);
 
         // Add stored key patterns
         citeKeyPatterns.forEach(bibtexKeyPattern::addCitationKeyPattern);
@@ -143,8 +134,7 @@ public void setCiteKeyPattern(AbstractCitationKeyPattern bibtexKeyPattern) {
         Objects.requireNonNull(bibtexKeyPattern);
 
         List<String> defaultValue = bibtexKeyPattern.getDefaultValue();
-        Map<EntryType, List<String>> nonDefaultPatterns =
-            bibtexKeyPattern.getPatterns();
+        Map<EntryType, List<String>> nonDefaultPatterns = bibtexKeyPattern.getPatterns();
         setCiteKeyPattern(defaultValue, nonDefaultPatterns);
     }
 
@@ -156,10 +146,7 @@ public void setCiteKeyPattern(
         citeKeyPatterns.clear();
 
         // Set new value if it is not a default value
-        for (Map.Entry<
-            EntryType,
-            List<String>
-        > pattern : nonDefaultPatterns.entrySet()) {
+        for (Map.Entry<EntryType, List<String>> pattern : nonDefaultPatterns.entrySet()) {
             citeKeyPatterns.put(pattern.getKey(), pattern.getValue().get(0));
         }
 
@@ -254,10 +241,7 @@ public void clearDefaultFileDirectory() {
     }
 
     public void setUserFileDirectory(String user, String path) {
-        userFileDirectory.put(
-            Objects.requireNonNull(user),
-            Objects.requireNonNull(path)
-        );
+        userFileDirectory.put(Objects.requireNonNull(user), Objects.requireNonNull(path));
         postChange();
     }
 
@@ -271,10 +255,7 @@ public Optional<Path> getLatexFileDirectory(String user) {
     }
 
     public void setLatexFileDirectory(String user, Path path) {
-        laTexFileDirectory.put(
-            Objects.requireNonNull(user),
-            Objects.requireNonNull(path)
-        );
+        laTexFileDirectory.put(Objects.requireNonNull(user), Objects.requireNonNull(path));
         postChange();
     }
 
@@ -335,9 +316,7 @@ public boolean getEncodingExplicitlySupplied() {
     /**
      * Sets the indication whether the encoding was set using "% Encoding: ..." or whether it was detected "magically"
      */
-    public void setEncodingExplicitlySupplied(
-        boolean encodingExplicitlySupplied
-    ) {
+    public void setEncodingExplicitlySupplied(boolean encodingExplicitlySupplied) {
         this.encodingExplicitlySupplied = encodingExplicitlySupplied;
     }
 
@@ -398,29 +377,17 @@ public boolean equals(Object o) {
         MetaData metaData = (MetaData) o;
         return (
             (isProtected == metaData.isProtected) &&
-            Objects.equals(
-                groupsRoot.getValue(),
-                metaData.groupsRoot.getValue()
-            ) &&
+            Objects.equals(groupsRoot.getValue(), metaData.groupsRoot.getValue()) &&
             Objects.equals(encoding, metaData.encoding) &&
-            Objects.equals(
-                encodingExplicitlySupplied,
-                metaData.encodingExplicitlySupplied
-            ) &&
+            Objects.equals(encodingExplicitlySupplied, metaData.encodingExplicitlySupplied) &&
             Objects.equals(saveOrder, metaData.saveOrder) &&
             Objects.equals(citeKeyPatterns, metaData.citeKeyPatterns) &&
             Objects.equals(userFileDirectory, metaData.userFileDirectory) &&
             Objects.equals(laTexFileDirectory, metaData.laTexFileDirectory) &&
-            Objects.equals(
-                defaultCiteKeyPattern,
-                metaData.defaultCiteKeyPattern
-            ) &&
+            Objects.equals(defaultCiteKeyPattern, metaData.defaultCiteKeyPattern) &&
             Objects.equals(saveActions, metaData.saveActions) &&
             (mode == metaData.mode) &&
-            Objects.equals(
-                defaultFileDirectory,
-                metaData.defaultFileDirectory
-            ) &&
+            Objects.equals(defaultFileDirectory, metaData.defaultFileDirectory) &&
             Objects.equals(contentSelectors, metaData.contentSelectors) &&
             Objects.equals(versionDBStructure, metaData.versionDBStructure)
         );
diff --git a/src/main/java/org/jabref/model/metadata/SaveOrder.java b/src/main/java/org/jabref/model/metadata/SaveOrder.java
index 7f546833b3f..0aedb6862c6 100644
--- a/src/main/java/org/jabref/model/metadata/SaveOrder.java
+++ b/src/main/java/org/jabref/model/metadata/SaveOrder.java
@@ -21,9 +21,7 @@
  */
 public class SaveOrder {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(
-        SaveOrder.class
-    );
+    private static final Logger LOGGER = LoggerFactory.getLogger(SaveOrder.class);
 
     private final OrderType orderType;
     private final List<SortCriterion> sortCriteria;
@@ -62,10 +60,7 @@ 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)
-                )
+                new SortCriterion(FieldFactory.parseField(data.get(index)), data.get(index + 1))
             );
         }
         this.sortCriteria = sortCriteria;
@@ -163,13 +158,7 @@ public SortCriterion(Field field, boolean descending) {
         @Override
         public String toString() {
             return (
-                "SortCriterion{" +
-                "field='" +
-                field +
-                '\'' +
-                ", descending=" +
-                descending +
-                '}'
+                "SortCriterion{" + "field='" + field + '\'' + ", descending=" + descending + '}'
             );
         }
 
@@ -183,8 +172,7 @@ public boolean equals(Object o) {
             }
             SortCriterion that = (SortCriterion) o;
             return (
-                Objects.equals(descending, that.descending) &&
-                Objects.equals(field, that.field)
+                Objects.equals(descending, that.descending) && Objects.equals(field, that.field)
             );
         }
 
diff --git a/src/main/java/org/jabref/model/metadata/SelfContainedSaveOrder.java b/src/main/java/org/jabref/model/metadata/SelfContainedSaveOrder.java
index 0f66fdd714a..ec74038528c 100644
--- a/src/main/java/org/jabref/model/metadata/SelfContainedSaveOrder.java
+++ b/src/main/java/org/jabref/model/metadata/SelfContainedSaveOrder.java
@@ -11,20 +11,13 @@
  */
 public class SelfContainedSaveOrder extends SaveOrder {
 
-    public static final Logger LOGGER = LoggerFactory.getLogger(
-        SelfContainedSaveOrder.class
-    );
+    public static final Logger LOGGER = LoggerFactory.getLogger(SelfContainedSaveOrder.class);
 
-    public SelfContainedSaveOrder(
-        OrderType orderType,
-        List<SortCriterion> sortCriteria
-    ) {
+    public SelfContainedSaveOrder(OrderType orderType, List<SortCriterion> sortCriteria) {
         super(orderType, sortCriteria);
         if (orderType == OrderType.TABLE) {
             LOGGER.debug("TABLE with sort criteria {}", sortCriteria);
-            throw new IllegalArgumentException(
-                "TABLE might require external lookup."
-            );
+            throw new IllegalArgumentException("TABLE might require external lookup.");
         }
     }
 
@@ -43,14 +36,8 @@ public static SelfContainedSaveOrder of(SaveOrder saveOrder) {
         ) {
             // 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()
-            );
+            return new SelfContainedSaveOrder(OrderType.SPECIFIED, saveOrder.getSortCriteria());
         }
-        return new SelfContainedSaveOrder(
-            saveOrder.getOrderType(),
-            saveOrder.getSortCriteria()
-        );
+        return new SelfContainedSaveOrder(saveOrder.getOrderType(), saveOrder.getSortCriteria());
     }
 }
diff --git a/src/main/java/org/jabref/model/openoffice/CitationEntry.java b/src/main/java/org/jabref/model/openoffice/CitationEntry.java
index 036ee5dead4..a662563b0b2 100644
--- a/src/main/java/org/jabref/model/openoffice/CitationEntry.java
+++ b/src/main/java/org/jabref/model/openoffice/CitationEntry.java
@@ -17,11 +17,7 @@ public CitationEntry(String refMarkName, String context, String pageInfo) {
         this(refMarkName, context, Optional.ofNullable(pageInfo));
     }
 
-    public CitationEntry(
-        String refMarkName,
-        String context,
-        Optional<String> pageInfo
-    ) {
+    public CitationEntry(String refMarkName, String context, Optional<String> pageInfo) {
         this.refMarkName = refMarkName;
         this.context = context;
         this.pageInfo = pageInfo;
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 90aa4290435..663c4f69097 100644
--- a/src/main/java/org/jabref/model/openoffice/backend/NamedRange.java
+++ b/src/main/java/org/jabref/model/openoffice/backend/NamedRange.java
@@ -39,12 +39,10 @@ XTextCursor getFillCursor(XTextDocument doc)
     /**
      * 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 f85eff39ac6..ba5e2c706ff 100644
--- a/src/main/java/org/jabref/model/openoffice/backend/NamedRangeManager.java
+++ b/src/main/java/org/jabref/model/openoffice/backend/NamedRangeManager.java
@@ -19,8 +19,6 @@ NamedRange createNamedRange(
 
     List<String> getUsedNames(XTextDocument doc) throws NoDocumentException;
 
-    Optional<NamedRange> getNamedRangeFromDocument(
-        XTextDocument doc,
-        String markName
-    ) throws NoDocumentException, WrappedTargetException;
+    Optional<NamedRange> getNamedRangeFromDocument(XTextDocument doc, String markName)
+        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 502e91de9f4..4000a17f13d 100644
--- a/src/main/java/org/jabref/model/openoffice/ootext/OOFormat.java
+++ b/src/main/java/org/jabref/model/openoffice/ootext/OOFormat.java
@@ -24,9 +24,7 @@ private OOFormat() {}
      */
     public static OOText setLocale(OOText ootext, String locale) {
         return OOText.fromString(
-            String.format("<span lang=\"%s\">", locale) +
-            ootext.toString() +
-            "</span>"
+            String.format("<span lang=\"%s\">", locale) + ootext.toString() + "</span>"
         );
     }
 
@@ -59,10 +57,7 @@ public static OOText paragraph(OOText ootext, String paraStyle) {
         if (StringUtil.isNullOrEmpty(paraStyle)) {
             return paragraph(ootext);
         }
-        String startTag = String.format(
-            "<p oo:ParaStyleName=\"%s\">",
-            paraStyle
-        );
+        String startTag = String.format("<p oo:ParaStyleName=\"%s\">", paraStyle);
         return OOText.fromString(startTag + ootext.toString() + "</p>");
     }
 
@@ -76,9 +71,7 @@ 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
-    ) {
+    public static OOText formatReferenceToPageNumberOfReferenceMark(String referenceMarkName) {
         String string = String.format(
             "<oo:referenceToPageNumberOfReferenceMark target=\"%s\">",
             referenceMarkName
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 6bb1268936a..5267c1a9b72 100644
--- a/src/main/java/org/jabref/model/openoffice/ootext/OOTextIntoOO.java
+++ b/src/main/java/org/jabref/model/openoffice/ootext/OOTextIntoOO.java
@@ -49,9 +49,7 @@
 @AllowedToUseAwt("Requires AWT for changing document properties")
 public class OOTextIntoOO {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(
-        OOTextIntoOO.class
-    );
+    private static final Logger LOGGER = LoggerFactory.getLogger(OOTextIntoOO.class);
 
     /**
      * "ParaStyleName" is an OpenOffice Property name.
@@ -137,11 +135,8 @@ private OOTextIntoOO() {}
      * @param position The cursor giving the insert location. Not modified.
      * @param ootext   The marked-up text to insert.
      */
-    public static void write(
-        XTextDocument doc,
-        XTextCursor position,
-        OOText ootext
-    ) throws WrappedTargetException, CreationException {
+    public static void write(XTextDocument doc, XTextCursor position, OOText ootext)
+        throws WrappedTargetException, CreationException {
         Objects.requireNonNull(doc);
         Objects.requireNonNull(ootext);
         Objects.requireNonNull(position);
@@ -176,9 +171,7 @@ public static void write(
             Objects.requireNonNull(tagName);
 
             // Attibutes parsed into (name,value) pairs.
-            List<OOPair<String, String>> attributes = parseAttributes(
-                attributeListPart
-            );
+            List<OOPair<String, String>> attributes = parseAttributes(attributeListPart);
 
             // Handle tags:
             switch (tagName) {
@@ -204,15 +197,11 @@ public static void write(
                     expectEnd.push("/" + tagName);
                     break;
                 case "u":
-                    formatStack.pushLayer(
-                        setCharUnderline(FontUnderline.SINGLE)
-                    );
+                    formatStack.pushLayer(setCharUnderline(FontUnderline.SINGLE));
                     expectEnd.push("/" + tagName);
                     break;
                 case "s":
-                    formatStack.pushLayer(
-                        setCharStrikeout(FontStrikeout.SINGLE)
-                    );
+                    formatStack.pushLayer(setCharStrikeout(FontStrikeout.SINGLE));
                     expectEnd.push("/" + tagName);
                     break;
                 case "/p":
@@ -233,10 +222,7 @@ public static void write(
                                     if (setParagraphStyle(cursor, value)) {
                                         // Presumably tested already:
                                         LOGGER.debug(
-                                            String.format(
-                                                "oo:ParaStyleName=\"%s\" failed",
-                                                value
-                                            )
+                                            String.format("oo:ParaStyleName=\"%s\" failed", value)
                                         );
                                     }
                                 }
@@ -264,11 +250,7 @@ public static void write(
                                 cursor
                             );
                             default -> LOGGER.warn(
-                                String.format(
-                                    "Unexpected attribute '%s' for <%s>",
-                                    key,
-                                    tagName
-                                )
+                                String.format("Unexpected attribute '%s' for <%s>", key, tagName)
                             );
                         }
                     }
@@ -284,17 +266,13 @@ public static void write(
                         String key = pair.a;
                         String value = pair.b;
                         switch (key) {
-                            case "oo:CharStyleName" -> // <span oo:CharStyleName="Standard">
-                            settings.addAll(setCharStyleName(value));
-                            case "lang" -> // <span lang="zxx">
-                            // <span lang="en-US">
+                            case "oo:CharStyleName" -> settings.addAll(setCharStyleName(value)); // <span oo:CharStyleName="Standard">
+                            case "lang" -> // <span lang="en-US"> // <span lang="zxx">
                             settings.addAll(setCharLocale(value));
                             case "style" -> {
                                 // HTML-style small-caps
                                 if ("font-variant: small-caps".equals(value)) {
-                                    settings.addAll(
-                                        setCharCaseMap(CaseMap.SMALLCAPS)
-                                    );
+                                    settings.addAll(setCharCaseMap(CaseMap.SMALLCAPS));
                                     break;
                                 }
                                 LOGGER.warn(
@@ -307,11 +285,7 @@ public static void write(
                                 );
                             }
                             default -> LOGGER.warn(
-                                String.format(
-                                    "Unexpected attribute '%s' for <%s>",
-                                    key,
-                                    tagName
-                                )
+                                String.format("Unexpected attribute '%s' for <%s>", key, tagName)
                             );
                         }
                     }
@@ -342,9 +316,7 @@ public static void write(
                     }
                     break;
                 default:
-                    LOGGER.warn(
-                        String.format("ignoring unknown tag '<%s>'", tagName)
-                    );
+                    LOGGER.warn(String.format("ignoring unknown tag '<%s>'", tagName));
                     break;
             }
 
@@ -377,26 +349,16 @@ public static void write(
      * In particular, when filling the bibliography title and body.
      */
     public static void removeDirectFormatting(XTextCursor cursor) {
-        XMultiPropertyStates mpss = UnoCast
-            .cast(XMultiPropertyStates.class, cursor)
-            .get();
+        XMultiPropertyStates mpss = UnoCast.cast(XMultiPropertyStates.class, cursor).get();
 
-        XPropertySet propertySet = UnoCast
-            .cast(XPropertySet.class, cursor)
-            .get();
-        XPropertyState xPropertyState = UnoCast
-            .cast(XPropertyState.class, cursor)
-            .get();
+        XPropertySet propertySet = UnoCast.cast(XPropertySet.class, cursor).get();
+        XPropertyState xPropertyState = UnoCast.cast(XPropertyState.class, cursor).get();
 
         try {
             // 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);
         }
 
@@ -436,19 +398,13 @@ public static void removeDirectFormatting(XTextCursor cursor) {
                     continue;
                 }
             } catch (UnknownPropertyException ex) {
-                throw new IllegalStateException(
-                    "Unexpected UnknownPropertyException",
-                    ex
-                );
+                throw new IllegalStateException("Unexpected UnknownPropertyException", ex);
             }
             if (knownToFail.contains(p.Name)) {
                 continue;
             }
             LOGGER.warn(
-                String.format(
-                    "OOTextIntoOO.removeDirectFormatting failed on '%s'",
-                    p.Name
-                )
+                String.format("OOTextIntoOO.removeDirectFormatting failed on '%s'", p.Name)
             );
         }
     }
@@ -515,9 +471,7 @@ static class MyPropertyStack {
         final Deque<ArrayList<Optional<Object>>> layers;
 
         MyPropertyStack(XTextCursor cursor) {
-            XPropertySet propertySet = UnoCast
-                .cast(XPropertySet.class, cursor)
-                .get();
+            XPropertySet propertySet = UnoCast.cast(XPropertySet.class, cursor).get();
             XPropertySetInfo propertySetInfo = propertySet.getPropertySetInfo();
 
             // On creation, initialize the property name -- index mapping.
@@ -537,10 +491,7 @@ static class MyPropertyStack {
             this.goodSize = nextIndex;
 
             this.goodNames = new String[goodSize];
-            for (Map.Entry<
-                String,
-                Integer
-            > entry : goodNameToIndex.entrySet()) {
+            for (Map.Entry<String, Integer> entry : goodNameToIndex.entrySet()) {
                 goodNames[entry.getValue()] = entry.getKey();
             }
 
@@ -551,27 +502,18 @@ static class MyPropertyStack {
             }
 
             // Get the initial state of the properties and add the first layer.
-            XMultiPropertyStates mpss = UnoCast
-                .cast(XMultiPropertyStates.class, cursor)
-                .get();
+            XMultiPropertyStates mpss = UnoCast.cast(XMultiPropertyStates.class, cursor).get();
             PropertyState[] propertyStates;
             try {
                 propertyStates = mpss.getPropertyStates(goodNames);
             } catch (UnknownPropertyException ex) {
-                throw new IllegalStateException(
-                    "Caught unexpected UnknownPropertyException",
-                    ex
-                );
+                throw new IllegalStateException("Caught unexpected UnknownPropertyException", ex);
             }
 
-            XMultiPropertySet mps = UnoCast
-                .cast(XMultiPropertySet.class, cursor)
-                .get();
+            XMultiPropertySet mps = UnoCast.cast(XMultiPropertySet.class, cursor).get();
             Object[] initialValues = mps.getPropertyValues(goodNames);
 
-            ArrayList<Optional<Object>> initialValuesOpt = new ArrayList<>(
-                goodSize
-            );
+            ArrayList<Optional<Object>> initialValuesOpt = new ArrayList<>(goodSize);
 
             for (int i = 0; i < goodSize; i++) {
                 if (propertyStates[i] == PropertyState.DIRECT_VALUE) {
@@ -597,12 +539,7 @@ void pushLayer(List<OOPair<String, Object>> settings) {
                 String name = pair.a;
                 Integer index = goodNameToIndex.get(name);
                 if (index == null) {
-                    LOGGER.warn(
-                        String.format(
-                            "pushLayer: '%s' is not in goodNameToIndex",
-                            name
-                        )
-                    );
+                    LOGGER.warn(String.format("pushLayer: '%s' is not in goodNameToIndex", name));
                     continue;
                 }
                 Object newValue = pair.b;
@@ -628,12 +565,8 @@ void popLayer() {
          * The idea is to minimize the number of calls to OpenOffice.
          */
         void apply(XTextCursor cursor) {
-            XMultiPropertySet mps = UnoCast
-                .cast(XMultiPropertySet.class, cursor)
-                .get();
-            XMultiPropertyStates mpss = UnoCast
-                .cast(XMultiPropertyStates.class, cursor)
-                .get();
+            XMultiPropertySet mps = UnoCast.cast(XMultiPropertySet.class, cursor).get();
+            XMultiPropertyStates mpss = UnoCast.cast(XMultiPropertyStates.class, cursor).get();
             ArrayList<Optional<Object>> topLayer = layers.peek();
             try {
                 // select values to be set
@@ -655,10 +588,7 @@ void apply(XTextCursor cursor) {
                 mpss.setPropertiesToDefault(delNamesArray);
                 mps.setPropertyValues(namesArray, values.toArray());
             } catch (UnknownPropertyException ex) {
-                LOGGER.warn(
-                    "UnknownPropertyException in MyPropertyStack.apply",
-                    ex
-                );
+                LOGGER.warn("UnknownPropertyException in MyPropertyStack.apply", ex);
             } catch (PropertyVetoException ex) {
                 LOGGER.warn("PropertyVetoException in MyPropertyStack.apply");
             } catch (WrappedTargetException ex) {
@@ -680,9 +610,7 @@ Optional<Object> getPropertyValue(String name) {
     /**
      * Parse HTML-like attributes to a list of (name,value) pairs.
      */
-    private static List<OOPair<String, String>> parseAttributes(
-        String attributes
-    ) {
+    private static List<OOPair<String, String>> parseAttributes(String attributes) {
         List<OOPair<String, String>> res = new ArrayList<>();
         if (attributes == null) {
             return res;
@@ -699,18 +627,13 @@ private static List<OOPair<String, String>> parseAttributes(
     /**
      * 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 {
-        XPropertyState xPropertyState = UnoCast
-            .cast(XPropertyState.class, cursor)
-            .get();
+    private static boolean isPropertyDefault(XTextCursor cursor, String propertyName)
+        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)"
+                "PropertyState.AMBIGUOUS_VALUE" + " (expected properties for a homogeneous cursor)"
             );
         }
         return state == PropertyState.DEFAULT_VALUE;
@@ -726,9 +649,7 @@ private static List<OOPair<String, Object>> setCharWeight(float value) {
         return settings;
     }
 
-    private static List<OOPair<String, Object>> setCharPosture(
-        FontSlant value
-    ) {
+    private static List<OOPair<String, Object>> setCharPosture(FontSlant value) {
         List<OOPair<String, Object>> settings = new ArrayList<>();
         settings.add(new OOPair<>("CharPosture", value));
         return settings;
@@ -777,9 +698,7 @@ private static List<OOPair<String, Object>> setCharLocale(Locale value) {
      */
     private static List<OOPair<String, Object>> setCharLocale(String value) {
         if (StringUtil.isNullOrEmpty(value)) {
-            throw new java.lang.IllegalArgumentException(
-                "setCharLocale \"\" or null"
-            );
+            throw new java.lang.IllegalArgumentException("setCharLocale \"\" or null");
         }
         String[] parts = value.split("-");
         String language = parts.length > 0 ? parts[0] : "";
@@ -810,17 +729,12 @@ private static List<OOPair<String, Object>> setCharEscapement(
             .map(e -> (byte) e);
 
         if (relative && (value.isPresent() || height.isPresent())) {
-            double oldHeightFloat =
-                oldHeight.orElse(CHAR_ESCAPEMENT_HEIGHT_DEFAULT) * 0.01;
-            double oldValueFloat = oldValue.orElse(
-                CHAR_ESCAPEMENT_VALUE_DEFAULT
-            );
+            double oldHeightFloat = oldHeight.orElse(CHAR_ESCAPEMENT_HEIGHT_DEFAULT) * 0.01;
+            double oldValueFloat = oldValue.orElse(CHAR_ESCAPEMENT_VALUE_DEFAULT);
             double heightFloat = height.orElse(CHAR_ESCAPEMENT_HEIGHT_DEFAULT);
             double valueFloat = value.orElse(CHAR_ESCAPEMENT_VALUE_DEFAULT);
             byte newHeight = (byte) Math.round(heightFloat * oldHeightFloat);
-            short newValue = (short) Math.round(
-                valueFloat * oldHeightFloat + oldValueFloat
-            );
+            short newValue = (short) Math.round(valueFloat * oldHeightFloat + oldValueFloat);
             if (value.isPresent()) {
                 settings.add(new OOPair<>(CHAR_ESCAPEMENT, newValue));
             }
@@ -832,17 +746,13 @@ private static List<OOPair<String, Object>> setCharEscapement(
                 settings.add(new OOPair<>(CHAR_ESCAPEMENT, value.get()));
             }
             if (height.isPresent()) {
-                settings.add(
-                    new OOPair<>(CHAR_ESCAPEMENT_HEIGHT, height.get())
-                );
+                settings.add(new OOPair<>(CHAR_ESCAPEMENT_HEIGHT, height.get()));
             }
         }
         return settings;
     }
 
-    private static List<OOPair<String, Object>> setSubScript(
-        MyPropertyStack formatStack
-    ) {
+    private static List<OOPair<String, Object>> setSubScript(MyPropertyStack formatStack) {
         return setCharEscapement(
             Optional.of(SUBSCRIPT_VALUE),
             Optional.of(SUBSCRIPT_HEIGHT),
@@ -851,9 +761,7 @@ private static List<OOPair<String, Object>> setSubScript(
         );
     }
 
-    private static List<OOPair<String, Object>> setSuperScript(
-        MyPropertyStack formatStack
-    ) {
+    private static List<OOPair<String, Object>> setSuperScript(MyPropertyStack formatStack) {
         return setCharEscapement(
             Optional.of(SUPERSCRIPT_VALUE),
             Optional.of(SUPERSCRIPT_HEIGHT),
@@ -865,19 +773,12 @@ private static List<OOPair<String, Object>> setSuperScript(
     /**
      * @return true on failure
      */
-    public static boolean setParagraphStyle(
-        XTextCursor cursor,
-        String paragraphStyle
-    ) {
+    public static boolean setParagraphStyle(XTextCursor cursor, String paragraphStyle) {
         final boolean FAIL = true;
         final boolean PASS = false;
 
-        XParagraphCursor paragraphCursor = UnoCast
-            .cast(XParagraphCursor.class, cursor)
-            .get();
-        XPropertySet propertySet = UnoCast
-            .cast(XPropertySet.class, paragraphCursor)
-            .get();
+        XParagraphCursor paragraphCursor = UnoCast.cast(XParagraphCursor.class, cursor).get();
+        XPropertySet propertySet = UnoCast.cast(XPropertySet.class, paragraphCursor).get();
         try {
             propertySet.setPropertyValue(PARA_STYLE_NAME, paragraphStyle);
             return PASS;
@@ -893,11 +794,7 @@ public static boolean setParagraphStyle(
 
     private static void insertParagraphBreak(XText text, XTextCursor cursor) {
         try {
-            text.insertControlCharacter(
-                cursor,
-                ControlCharacter.PARAGRAPH_BREAK,
-                true
-            );
+            text.insertControlCharacter(cursor, ControlCharacter.PARAGRAPH_BREAK, true);
         } catch (com.sun.star.lang.IllegalArgumentException ex) {
             // Assuming it means wrong code for ControlCharacter.
             // https://api.libreoffice.org/docs/idl/ref/  does not tell.
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 54a6361cca5..b40e472fe12 100644
--- a/src/main/java/org/jabref/model/openoffice/rangesort/FunctionalTextViewCursor.java
+++ b/src/main/java/org/jabref/model/openoffice/rangesort/FunctionalTextViewCursor.java
@@ -68,26 +68,18 @@ private FunctionalTextViewCursor(
      * On failure the constructor restores the selection. On success, the caller may want to call
      * instance.restore() after finished using the cursor.
      */
-    public static OOResult<FunctionalTextViewCursor, String> get(
-        XTextDocument doc
-    ) {
+    public static OOResult<FunctionalTextViewCursor, String> get(XTextDocument doc) {
         Objects.requireNonNull(doc);
 
         XTextRange initialPosition = null;
-        XServiceInfo initialSelection = UnoSelection
-            .getSelectionAsXServiceInfo(doc)
-            .orElse(null);
+        XServiceInfo initialSelection = UnoSelection.getSelectionAsXServiceInfo(doc).orElse(null);
         XTextViewCursor viewCursor = UnoCursor.getViewCursor(doc).orElse(null);
         if (viewCursor != null) {
             try {
                 initialPosition = UnoCursor.createTextCursorByRange(viewCursor);
                 viewCursor.getStart();
                 return OOResult.ok(
-                    new FunctionalTextViewCursor(
-                        initialPosition,
-                        initialSelection,
-                        viewCursor
-                    )
+                    new FunctionalTextViewCursor(initialPosition, initialSelection, viewCursor)
                 );
             } catch (com.sun.star.uno.RuntimeException ex) {
                 // bad cursor
@@ -122,17 +114,12 @@ public static OOResult<FunctionalTextViewCursor, String> get(
             viewCursor.getStart();
         } catch (com.sun.star.uno.RuntimeException ex) {
             restore(doc, initialPosition, initialSelection);
-            String errorMessage =
-                "The view cursor failed the functionality test";
+            String errorMessage = "The view cursor failed the functionality test";
             return OOResult.error(errorMessage);
         }
 
         return OOResult.ok(
-            new FunctionalTextViewCursor(
-                initialPosition,
-                initialSelection,
-                viewCursor
-            )
+            new FunctionalTextViewCursor(initialPosition, initialSelection, viewCursor)
         );
     }
 
@@ -146,9 +133,7 @@ private static void restore(
         XServiceInfo initialSelection
     ) {
         if (initialPosition != null) {
-            XTextViewCursor viewCursor = UnoCursor
-                .getViewCursor(doc)
-                .orElse(null);
+            XTextViewCursor viewCursor = UnoCursor.getViewCursor(doc).orElse(null);
             if (viewCursor != null) {
                 viewCursor.gotoRange(initialPosition, false);
                 return;
@@ -161,10 +146,6 @@ private static void restore(
 
     /* Restore initial state of viewCursor (possibly by restoring selection) if possible. */
     public void restore(XTextDocument doc) {
-        FunctionalTextViewCursor.restore(
-            doc,
-            initialPosition,
-            initialSelection
-        );
+        FunctionalTextViewCursor.restore(doc, initialPosition, initialSelection);
     }
 }
diff --git a/src/main/java/org/jabref/model/openoffice/rangesort/RangeOverlap.java b/src/main/java/org/jabref/model/openoffice/rangesort/RangeOverlap.java
index 331fbd18335..b05c9ff5e8f 100644
--- a/src/main/java/org/jabref/model/openoffice/rangesort/RangeOverlap.java
+++ b/src/main/java/org/jabref/model/openoffice/rangesort/RangeOverlap.java
@@ -10,10 +10,7 @@ public class RangeOverlap<V> {
     public final RangeOverlapKind kind;
     public final List<V> valuesForOverlappingRanges;
 
-    public RangeOverlap(
-        RangeOverlapKind kind,
-        List<V> valuesForOverlappingRanges
-    ) {
+    public RangeOverlap(RangeOverlapKind kind, List<V> valuesForOverlappingRanges) {
         this.kind = kind;
         this.valuesForOverlappingRanges = valuesForOverlappingRanges;
     }
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 fab56e2df6f..86bc38162bb 100644
--- a/src/main/java/org/jabref/model/openoffice/rangesort/RangeOverlapBetween.java
+++ b/src/main/java/org/jabref/model/openoffice/rangesort/RangeOverlapBetween.java
@@ -37,18 +37,12 @@ public static <V extends RangeHolder> List<RangeOverlap<V>> findFirst(
          * Cache all we need to know about fewHolders. We are trying to minimize the number of calls
          * to LO.
          */
-        List<OOTuple3<XText, XTextRangeCompare, V>> fewTuples = new ArrayList<>(
-            fewHolders.size()
-        );
+        List<OOTuple3<XText, XTextRangeCompare, V>> fewTuples = new ArrayList<>(fewHolders.size());
 
         for (V aHolder : fewHolders) {
             XText aText = aHolder.getRange().getText();
             fewTuples.add(
-                new OOTuple3<>(
-                    aText,
-                    UnoCast.cast(XTextRangeCompare.class, aText).get(),
-                    aHolder
-                )
+                new OOTuple3<>(aText, UnoCast.cast(XTextRangeCompare.class, aText).get(), aHolder)
             );
         }
 
@@ -74,10 +68,7 @@ public static <V extends RangeHolder> List<RangeOverlap<V>> findFirst(
                     aRange.getEnd(),
                     bRangeStart
                 );
-                if (
-                    abEndToStart < 0 ||
-                    (!includeTouching && (abEndToStart == 0))
-                ) {
+                if (abEndToStart < 0 || (!includeTouching && (abEndToStart == 0))) {
                     continue;
                 }
                 int baEndToStart = UnoTextRange.compareStartsUnsafe(
@@ -85,20 +76,11 @@ public static <V extends RangeHolder> List<RangeOverlap<V>> findFirst(
                     bRangeEnd,
                     aRange.getStart()
                 );
-                if (
-                    baEndToStart < 0 ||
-                    (!includeTouching && (baEndToStart == 0))
-                ) {
+                if (baEndToStart < 0 || (!includeTouching && (baEndToStart == 0))) {
                     continue;
                 }
 
-                boolean equal =
-                    UnoTextRange.compareStartsThenEndsUnsafe(
-                        cmp,
-                        aRange,
-                        bRange
-                    ) ==
-                    0;
+                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 ?
@@ -106,17 +88,13 @@ public static <V extends RangeHolder> List<RangeOverlap<V>> findFirst(
                 // We return EQUAL_RANGE
                 RangeOverlapKind kind = equal
                     ? RangeOverlapKind.EQUAL_RANGE
-                    : (touching
-                            ? RangeOverlapKind.TOUCH
-                            : RangeOverlapKind.OVERLAP);
+                    : (touching ? RangeOverlapKind.TOUCH : RangeOverlapKind.OVERLAP);
 
                 List<V> valuesForOverlappingRanges = new ArrayList<>();
                 valuesForOverlappingRanges.add(aHolder);
                 valuesForOverlappingRanges.add(bHolder);
 
-                result.add(
-                    new RangeOverlap<>(kind, valuesForOverlappingRanges)
-                );
+                result.add(new RangeOverlap<>(kind, valuesForOverlappingRanges));
                 return result;
             }
         }
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 b74fb7a7526..6ac59ca6e15 100644
--- a/src/main/java/org/jabref/model/openoffice/rangesort/RangeOverlapWithin.java
+++ b/src/main/java/org/jabref/model/openoffice/rangesort/RangeOverlapWithin.java
@@ -23,16 +23,13 @@ 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(
+    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);
+        RangeSort.RangePartitions<V> partitions = RangeSort.partitionAndSortRanges(rangeHolders);
 
         return findOverlappingRanges(partitions, reportAtMost, includeTouching);
     }
@@ -45,9 +42,7 @@ > findOverlappingRanges(
      * @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(
+    public static <V extends RangeHolder> List<RangeOverlap<V>> findOverlappingRanges(
         RangeSort.RangePartitions<V> input,
         int atMost,
         boolean includeTouching
@@ -61,10 +56,7 @@ > findOverlappingRanges(
                 continue;
             }
             XTextRangeCompare cmp = UnoCast
-                .cast(
-                    XTextRangeCompare.class,
-                    partition.get(0).getRange().getText()
-                )
+                .cast(XTextRangeCompare.class, partition.get(0).getRange().getText())
                 .get();
 
             for (int i = 0; i < (partition.size() - 1); i++) {
@@ -74,11 +66,7 @@ > findOverlappingRanges(
                 XTextRange bRange = bHolder.getRange();
 
                 // check equal values
-                int cmpResult = UnoTextRange.compareStartsThenEndsUnsafe(
-                    cmp,
-                    aRange,
-                    bRange
-                );
+                int cmpResult = UnoTextRange.compareStartsThenEndsUnsafe(cmp, aRange, bRange);
                 if (cmpResult == 0) {
                     List<V> aValues = new ArrayList<>();
                     aValues.add(aHolder);
@@ -97,12 +85,7 @@ > findOverlappingRanges(
                         aValues.add(bHolder);
                         i++;
                     }
-                    result.add(
-                        new RangeOverlap<>(
-                            RangeOverlapKind.EQUAL_RANGE,
-                            aValues
-                        )
-                    );
+                    result.add(new RangeOverlap<>(RangeOverlapKind.EQUAL_RANGE, aValues));
                     if (atMost > 0 && result.size() >= atMost) {
                         return result;
                     }
@@ -112,11 +95,7 @@ > findOverlappingRanges(
                 // Not equal, and (a <= b) since sorted.
                 // Check if a.end >= b.start
                 cmpResult =
-                    UnoTextRange.compareStartsUnsafe(
-                        cmp,
-                        aRange.getEnd(),
-                        bRange.getStart()
-                    );
+                    UnoTextRange.compareStartsUnsafe(cmp, aRange.getEnd(), bRange.getStart());
                 if (cmpResult > 0 || (includeTouching && (cmpResult == 0))) {
                     // found overlap or touch
                     List<V> valuesForOverlappingRanges = new ArrayList<>();
@@ -124,9 +103,7 @@ > findOverlappingRanges(
                     valuesForOverlappingRanges.add(bHolder);
                     result.add(
                         new RangeOverlap<>(
-                            cmpResult == 0
-                                ? RangeOverlapKind.TOUCH
-                                : RangeOverlapKind.OVERLAP,
+                            cmpResult == 0 ? RangeOverlapKind.TOUCH : RangeOverlapKind.OVERLAP,
                             valuesForOverlappingRanges
                         )
                     );
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 e1006cdf035..e9c6f2d65f2 100644
--- a/src/main/java/org/jabref/model/openoffice/rangesort/RangeSort.java
+++ b/src/main/java/org/jabref/model/openoffice/rangesort/RangeSort.java
@@ -22,8 +22,7 @@ private RangeSort() {}
      * <p>
      * Note: since we only look at the ranges, this comparison is generally not consistent with `equals` on the RangeHolders. Probably should not be used for key comparison in {@code TreeMap<RangeHolder>} or {@code Set<RangeHolder>}
      */
-    private static class HolderComparatorWithinPartition
-        implements Comparator<RangeHolder> {
+    private static class HolderComparatorWithinPartition implements Comparator<RangeHolder> {
 
         private final XTextRangeCompare cmp;
 
@@ -39,11 +38,7 @@ private static class HolderComparatorWithinPartition
          */
         @Override
         public int compare(RangeHolder a, RangeHolder b) {
-            return UnoTextRange.compareStartsThenEndsUnsafe(
-                cmp,
-                a.getRange(),
-                b.getRange()
-            );
+            return UnoTextRange.compareStartsThenEndsUnsafe(cmp, a.getRange(), b.getRange());
         }
     }
 
@@ -52,9 +47,7 @@ public int compare(RangeHolder a, RangeHolder b) {
      * <p>
      * Note: RangeHolder.getRange() is called many times.
      */
-    public static <V extends RangeHolder> void sortWithinPartition(
-        List<V> rangeHolders
-    ) {
+    public static <V extends RangeHolder> void sortWithinPartition(List<V> rangeHolders) {
         if (rangeHolders.isEmpty()) {
             return;
         }
@@ -90,9 +83,7 @@ public List<List<V>> getPartitions() {
     /**
      * Partition RangeHolders by the corresponding XText.
      */
-    public static <V extends RangeHolder> RangePartitions<V> partitionRanges(
-        List<V> holders
-    ) {
+    public static <V extends RangeHolder> RangePartitions<V> partitionRanges(List<V> holders) {
         RangePartitions<V> result = new RangePartitions<>();
         for (V holder : holders) {
             result.add(holder);
@@ -103,9 +94,9 @@ public static <V extends RangeHolder> RangePartitions<V> partitionRanges(
     /**
      * 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 3ed329f3733..1be80e027bf 100644
--- a/src/main/java/org/jabref/model/openoffice/rangesort/RangeSortVisual.java
+++ b/src/main/java/org/jabref/model/openoffice/rangesort/RangeSortVisual.java
@@ -19,9 +19,7 @@
  */
 public class RangeSortVisual {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(
-        RangeSortVisual.class
-    );
+    private static final Logger LOGGER = LoggerFactory.getLogger(RangeSortVisual.class);
 
     private RangeSortVisual() {}
 
@@ -56,16 +54,11 @@ public static <T> List<RangeSortable<T>> visualSort(
         fcursor.restore(doc);
 
         // order by position
-        ArrayList<ComparableMark<RangeSortable<T>>> comparableMarks =
-            new ArrayList<>(inputSize);
+        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
-                )
+                new ComparableMark<>(positions.get(i), input.getIndexInPosition(), input)
             );
         }
         comparableMarks.sort(RangeSortVisual::compareTopToBottomLeftToRight);
@@ -77,9 +70,7 @@ public static <T> List<RangeSortable<T>> visualSort(
         }
 
         if (result.size() != inputSize) {
-            throw new IllegalStateException(
-                "visualSort: result.size() != inputSize"
-            );
+            throw new IllegalStateException("visualSort: result.size() != inputSize");
         }
 
         return result;
@@ -97,18 +88,12 @@ public static <T> List<RangeSortable<T>> visualSort(
      * @param range  Location.
      * @param cursor To get the position, we need az XTextViewCursor. It will be moved to the range.
      */
-    private static Point findPositionOfTextRange(
-        XTextRange range,
-        XTextViewCursor cursor
-    ) {
+    private static Point findPositionOfTextRange(XTextRange range, XTextViewCursor cursor) {
         cursor.gotoRange(range, false);
         return cursor.getPosition();
     }
 
-    private static <T> int compareTopToBottomLeftToRight(
-        ComparableMark<T> a,
-        ComparableMark<T> b
-    ) {
+    private static <T> int compareTopToBottomLeftToRight(ComparableMark<T> a, ComparableMark<T> b) {
         if (a.position.Y != b.position.Y) {
             return a.position.Y - b.position.Y;
         }
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 89f0071c177..c785b4ea802 100644
--- a/src/main/java/org/jabref/model/openoffice/style/Citation.java
+++ b/src/main/java/org/jabref/model/openoffice/style/Citation.java
@@ -8,8 +8,7 @@
 import org.jabref.model.openoffice.util.OOPair;
 
 public class Citation
-    implements
-        ComparableCitation, CitationMarkerEntry, CitationMarkerNumericEntry {
+    implements ComparableCitation, CitationMarkerEntry, CitationMarkerNumericEntry {
 
     /**
      * key in database
@@ -70,19 +69,13 @@ public Optional<BibEntry> getBibEntry() {
         return db.map(citationLookupResult -> citationLookupResult.entry);
     }
 
-    public static Optional<CitationLookupResult> lookup(
-        BibDatabase database,
-        String key
-    ) {
+    public static Optional<CitationLookupResult> lookup(BibDatabase database, String key) {
         return database
             .getEntryByCitationKey(key)
             .map(bibEntry -> new CitationLookupResult(bibEntry, database));
     }
 
-    public static Optional<CitationLookupResult> lookup(
-        List<BibDatabase> databases,
-        String key
-    ) {
+    public static Optional<CitationLookupResult> lookup(List<BibDatabase> databases, String key) {
         return databases
             .stream()
             .map(database -> Citation.lookup(database, key))
@@ -129,13 +122,9 @@ public void setUniqueLetter(Optional<String> uniqueLetter) {
     }
 
     public void setPageInfo(Optional<OOText> pageInfo) {
-        Optional<OOText> normalizedPageInfo = PageInfo.normalizePageInfo(
-            pageInfo
-        );
+        Optional<OOText> normalizedPageInfo = PageInfo.normalizePageInfo(pageInfo);
         if (!normalizedPageInfo.equals(pageInfo)) {
-            throw new IllegalArgumentException(
-                "setPageInfo argument is not normalized"
-            );
+            throw new IllegalArgumentException("setPageInfo argument is not normalized");
         }
         this.pageInfo = normalizedPageInfo;
     }
@@ -147,9 +136,7 @@ public void setIsFirstAppearanceOfSource(boolean value) {
     /*
      * Setters for CitationGroups.distribute()
      */
-    public static void setLookupResult(
-        OOPair<Citation, Optional<CitationLookupResult>> pair
-    ) {
+    public static void setLookupResult(OOPair<Citation, Optional<CitationLookupResult>> pair) {
         Citation citation = pair.a;
         citation.db = pair.b;
     }
@@ -159,9 +146,7 @@ public static void setNumber(OOPair<Citation, Optional<Integer>> pair) {
         citation.number = pair.b;
     }
 
-    public static void setUniqueLetter(
-        OOPair<Citation, Optional<String>> pair
-    ) {
+    public static void setUniqueLetter(OOPair<Citation, Optional<String>> pair) {
         Citation citation = pair.a;
         citation.uniqueLetter = pair.b;
     }
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 7ea971e895e..73b0a35a24c 100644
--- a/src/main/java/org/jabref/model/openoffice/style/CitationGroup.java
+++ b/src/main/java/org/jabref/model/openoffice/style/CitationGroup.java
@@ -64,10 +64,8 @@ public CitationGroup(
         this.dataModel = dataModel;
         this.groupId = groupId;
         this.citationType = citationType;
-        this.citationsInStorageOrder =
-            Collections.unmodifiableList(citationsInStorageOrder);
-        this.localOrder =
-            OOListUtil.makeIndices(citationsInStorageOrder.size());
+        this.citationsInStorageOrder = Collections.unmodifiableList(citationsInStorageOrder);
+        this.localOrder = OOListUtil.makeIndices(citationsInStorageOrder.size());
         this.referenceMarkNameForLinking = referenceMarkNameForLinking;
         this.indexInGlobalOrder = Optional.empty();
         this.citationMarker = Optional.empty();
@@ -96,10 +94,7 @@ void imposeLocalOrder(Comparator<BibEntry> entryComparator) {
         }
 
         this.localOrder =
-            OOListUtil.order(
-                citationsInStorageOrder,
-                new CompareCitation(entryComparator, true)
-            );
+            OOListUtil.order(citationsInStorageOrder, new CompareCitation(entryComparator, true));
 
         if (dataModel == OODataModel.JabRef52) {
             getCitationsInLocalOrder().get(last).setPageInfo(lastPageInfo);
@@ -138,9 +133,7 @@ public Optional<String> getReferenceMarkNameForLinking() {
         return referenceMarkNameForLinking;
     }
 
-    public void setReferenceMarkNameForLinking(
-        Optional<String> referenceMarkNameForLinking
-    ) {
+    public void setReferenceMarkNameForLinking(Optional<String> referenceMarkNameForLinking) {
         this.referenceMarkNameForLinking = referenceMarkNameForLinking;
     }
 
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 e2c6073e32a..256bc4e42d6 100644
--- a/src/main/java/org/jabref/model/openoffice/style/CitationGroups.java
+++ b/src/main/java/org/jabref/model/openoffice/style/CitationGroups.java
@@ -22,9 +22,7 @@
  */
 public class CitationGroups {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(
-        CitationGroups.class
-    );
+    private static final Logger LOGGER = LoggerFactory.getLogger(CitationGroups.class);
 
     private final Map<CitationGroupId, CitationGroup> citationGroupsUnordered;
 
@@ -63,14 +61,10 @@ public <T> void distributeToCitations(
         for (CitationPath p : where) {
             CitationGroup group = citationGroupsUnordered.get(p.group);
             if (group == null) {
-                LOGGER.warn(
-                    "CitationGroups.distributeToCitations: group missing"
-                );
+                LOGGER.warn("CitationGroups.distributeToCitations: group missing");
                 continue;
             }
-            Citation cit = group.citationsInStorageOrder.get(
-                p.storageIndexInGroup
-            );
+            Citation cit = group.citationsInStorageOrder.get(p.storageIndexInGroup);
             fun.accept(new OOPair<>(cit, value));
         }
     }
@@ -114,9 +108,7 @@ public List<CitationGroup> getCitationGroupsUnordered() {
      */
     public List<CitationGroup> getCitationGroupsInGlobalOrder() {
         if (globalOrder.isEmpty()) {
-            throw new IllegalStateException(
-                "getCitationGroupsInGlobalOrder: not ordered yet"
-            );
+            throw new IllegalStateException("getCitationGroupsInGlobalOrder: not ordered yet");
         }
         return OOListUtil.map(globalOrder.get(), citationGroupsUnordered::get);
     }
@@ -138,9 +130,7 @@ public void setGlobalOrder(List<CitationGroupId> globalOrder) {
         // Propagate to each CitationGroup
         for (int i = 0; i < globalOrder.size(); i++) {
             CitationGroupId groupId = globalOrder.get(i);
-            citationGroupsUnordered
-                .get(groupId)
-                .setIndexInGlobalOrder(Optional.of(i));
+            citationGroupsUnordered.get(groupId).setIndexInGlobalOrder(Optional.of(i));
         }
     }
 
@@ -166,10 +156,7 @@ public CitedKeys getCitedKeysUnordered() {
             int storageIndexInGroup = 0;
             for (Citation cit : group.citationsInStorageOrder) {
                 String key = cit.citationKey;
-                CitationPath path = new CitationPath(
-                    group.groupId,
-                    storageIndexInGroup
-                );
+                CitationPath path = new CitationPath(group.groupId, storageIndexInGroup);
                 if (res.containsKey(key)) {
                     res.get(key).addPath(path, cit);
                 } else {
@@ -186,9 +173,7 @@ public CitedKeys getCitedKeysUnordered() {
      */
     public CitedKeys getCitedKeysSortedInOrderOfAppearance() {
         if (!hasGlobalOrder()) {
-            throw new IllegalStateException(
-                "getSortedCitedKeys: no globalOrder"
-            );
+            throw new IllegalStateException("getSortedCitedKeys: no globalOrder");
         }
         LinkedHashMap<String, CitedKey> res = new LinkedHashMap<>();
         for (CitationGroup group : getCitationGroupsInGlobalOrder()) {
@@ -241,9 +226,7 @@ public void createNumberedBibliographySortedInOrderOfAppearance() {
     /**
      * precondition: database lookup already performed (otherwise we just sort citation keys)
      */
-    public void createPlainBibliographySortedByComparator(
-        Comparator<BibEntry> entryComparator
-    ) {
+    public void createPlainBibliographySortedByComparator(Comparator<BibEntry> entryComparator) {
         if (bibliography.isPresent()) {
             throw new IllegalStateException(
                 "createPlainBibliographySortedByComparator: already have a bibliography"
@@ -257,9 +240,7 @@ public void createPlainBibliographySortedByComparator(
     /**
      * precondition: database lookup already performed (otherwise we just sort citation keys)
      */
-    public void createNumberedBibliographySortedByComparator(
-        Comparator<BibEntry> entryComparator
-    ) {
+    public void createNumberedBibliographySortedByComparator(Comparator<BibEntry> entryComparator) {
         if (bibliography.isPresent()) {
             throw new IllegalStateException(
                 "createNumberedBibliographySortedByComparator: already have a bibliography"
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 4bfa5ef903d..e686552cc81 100644
--- a/src/main/java/org/jabref/model/openoffice/style/CitationLookupResult.java
+++ b/src/main/java/org/jabref/model/openoffice/style/CitationLookupResult.java
@@ -35,8 +35,7 @@ public boolean equals(Object otherObject) {
         }
         CitationLookupResult that = (CitationLookupResult) otherObject;
         return (
-            Objects.equals(this.entry, that.entry) &&
-            Objects.equals(this.database, that.database)
+            Objects.equals(this.entry, that.entry) && Objects.equals(this.database, that.database)
         );
     }
 
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 2cb6444b795..3367d0ec3b2 100644
--- a/src/main/java/org/jabref/model/openoffice/style/CitedKey.java
+++ b/src/main/java/org/jabref/model/openoffice/style/CitedKey.java
@@ -13,10 +13,7 @@
  * 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 {
+    implements ComparableCitedKey, CitationMarkerNormEntry, CitationMarkerNumericBibEntry {
 
     public final String citationKey;
     private final List<CitationPath> where;
@@ -101,19 +98,13 @@ void addPath(CitationPath path, Citation cit) {
 
         // Check consistency
         if (!cit.getLookupResult().equals(this.db)) {
-            throw new IllegalStateException(
-                "CitedKey.addPath: mismatch on cit.db"
-            );
+            throw new IllegalStateException("CitedKey.addPath: mismatch on cit.db");
         }
         if (!cit.getNumber().equals(this.number)) {
-            throw new IllegalStateException(
-                "CitedKey.addPath: mismatch on cit.number"
-            );
+            throw new IllegalStateException("CitedKey.addPath: mismatch on cit.number");
         }
         if (!cit.getUniqueLetter().equals(this.uniqueLetter)) {
-            throw new IllegalStateException(
-                "CitedKey.addPath: mismatch on cit.uniqueLetter"
-            );
+            throw new IllegalStateException("CitedKey.addPath: mismatch on cit.uniqueLetter");
         }
     }
 
@@ -125,11 +116,7 @@ void lookupInDatabases(List<BibDatabase> databases) {
     }
 
     void distributeLookupResult(CitationGroups citationGroups) {
-        citationGroups.distributeToCitations(
-            where,
-            Citation::setLookupResult,
-            db
-        );
+        citationGroups.distributeToCitations(where, Citation::setLookupResult, db);
     }
 
     /*
@@ -137,18 +124,10 @@ void distributeLookupResult(CitationGroups citationGroups) {
      */
 
     void distributeNumber(CitationGroups citationGroups) {
-        citationGroups.distributeToCitations(
-            where,
-            Citation::setNumber,
-            number
-        );
+        citationGroups.distributeToCitations(where, Citation::setNumber, number);
     }
 
     void distributeUniqueLetter(CitationGroups citationGroups) {
-        citationGroups.distributeToCitations(
-            where,
-            Citation::setUniqueLetter,
-            uniqueLetter
-        );
+        citationGroups.distributeToCitations(where, Citation::setUniqueLetter, uniqueLetter);
     }
 }
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 7204bfd7a50..906fd34d628 100644
--- a/src/main/java/org/jabref/model/openoffice/style/CompareCitation.java
+++ b/src/main/java/org/jabref/model/openoffice/style/CompareCitation.java
@@ -11,12 +11,8 @@ public class CompareCitation implements Comparator<ComparableCitation> {
 
     private final CompareCitedKey citedKeyComparator;
 
-    CompareCitation(
-        Comparator<BibEntry> entryComparator,
-        boolean unresolvedComesFirst
-    ) {
-        this.citedKeyComparator =
-            new CompareCitedKey(entryComparator, unresolvedComesFirst);
+    CompareCitation(Comparator<BibEntry> entryComparator, boolean unresolvedComesFirst) {
+        this.citedKeyComparator = new CompareCitedKey(entryComparator, unresolvedComesFirst);
     }
 
     public int compare(ComparableCitation a, ComparableCitation b) {
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 443a9b823ed..e2c8e68dc83 100644
--- a/src/main/java/org/jabref/model/openoffice/style/CompareCitedKey.java
+++ b/src/main/java/org/jabref/model/openoffice/style/CompareCitedKey.java
@@ -13,10 +13,7 @@ public class CompareCitedKey implements Comparator<ComparableCitedKey> {
     Comparator<BibEntry> entryComparator;
     boolean unresolvedComesFirst;
 
-    CompareCitedKey(
-        Comparator<BibEntry> entryComparator,
-        boolean unresolvedComesFirst
-    ) {
+    CompareCitedKey(Comparator<BibEntry> entryComparator, boolean unresolvedComesFirst) {
         this.entryComparator = entryComparator;
         this.unresolvedComesFirst = unresolvedComesFirst;
     }
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 0f9f6f083ce..bd1c130ca75 100644
--- a/src/main/java/org/jabref/model/openoffice/style/OODataModel.java
+++ b/src/main/java/org/jabref/model/openoffice/style/OODataModel.java
@@ -23,19 +23,14 @@ public enum OODataModel {
      * @param pageInfo Nullable.
      * @return JabRef60 style pageInfo list with pageInfo in the last slot.
      */
-    public static List<Optional<OOText>> fakePageInfos(
-        String pageInfo,
-        int nCitations
-    ) {
+    public static List<Optional<OOText>> fakePageInfos(String pageInfo, int nCitations) {
         List<Optional<OOText>> pageInfos = new ArrayList<>(nCitations);
         for (int i = 0; i < nCitations; i++) {
             pageInfos.add(Optional.empty());
         }
         if (pageInfo != null) {
             final int last = nCitations - 1;
-            Optional<OOText> optionalPageInfo = Optional.ofNullable(
-                OOText.fromString(pageInfo)
-            );
+            Optional<OOText> optionalPageInfo = Optional.ofNullable(OOText.fromString(pageInfo));
             pageInfos.set(last, PageInfo.normalizePageInfo(optionalPageInfo));
         }
         return pageInfos;
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 4ee4a4be69c..d5fd9557290 100644
--- a/src/main/java/org/jabref/model/openoffice/style/PageInfo.java
+++ b/src/main/java/org/jabref/model/openoffice/style/PageInfo.java
@@ -10,9 +10,7 @@ private PageInfo() {}
     /*
      * pageInfo normalization
      */
-    public static Optional<OOText> normalizePageInfo(
-        Optional<OOText> optionalText
-    ) {
+    public static Optional<OOText> normalizePageInfo(Optional<OOText> optionalText) {
         if (
             optionalText == null ||
             optionalText.isEmpty() ||
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 76c130c2fdd..fe541862c58 100644
--- a/src/main/java/org/jabref/model/openoffice/uno/UnoBookmark.java
+++ b/src/main/java/org/jabref/model/openoffice/uno/UnoBookmark.java
@@ -18,17 +18,12 @@ private UnoBookmark() {}
     /**
      * Provides access to bookmarks by name.
      */
-    public static XNameAccess getNameAccess(XTextDocument doc)
-        throws NoDocumentException {
-        XBookmarksSupplier supplier = UnoCast
-            .cast(XBookmarksSupplier.class, doc)
-            .get();
+    public static XNameAccess getNameAccess(XTextDocument doc) throws NoDocumentException {
+        XBookmarksSupplier supplier = UnoCast.cast(XBookmarksSupplier.class, doc).get();
         try {
             return supplier.getBookmarks();
         } catch (DisposedException ex) {
-            throw new NoDocumentException(
-                "UnoBookmark.getNameAccess failed with" + ex
-            );
+            throw new NoDocumentException("UnoBookmark.getNameAccess failed with" + ex);
         }
     }
 
@@ -38,14 +33,10 @@ public static XNameAccess getNameAccess(XTextDocument doc)
      * @param name The name of the bookmark to find.
      * @return The XTextRange for the bookmark, or Optional.empty().
      */
-    public static Optional<XTextRange> getAnchor(
-        XTextDocument doc,
-        String name
-    ) throws WrappedTargetException, NoDocumentException {
+    public static Optional<XTextRange> getAnchor(XTextDocument doc, String name)
+        throws WrappedTargetException, NoDocumentException {
         XNameAccess nameAccess = getNameAccess(doc);
-        return UnoNameAccess
-            .getTextContentByName(nameAccess, name)
-            .map(XTextContent::getAnchor);
+        return UnoNameAccess.getTextContentByName(nameAccess, name).map(XTextContent::getAnchor);
     }
 
     /**
@@ -59,12 +50,8 @@ public static Optional<XTextRange> getAnchor(
      * @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(
-        XTextDocument doc,
-        String name,
-        XTextRange range,
-        boolean absorb
-    ) throws CreationException {
+    public static XNamed create(XTextDocument doc, String name, XTextRange range, boolean absorb)
+        throws CreationException {
         return UnoNamed.insertNamedTextContent(
             doc,
             "com.sun.star.text.Bookmark",
@@ -82,10 +69,7 @@ public static void removeIfExists(XTextDocument doc, String name)
         XNameAccess marks = UnoBookmark.getNameAccess(doc);
 
         if (marks.hasByName(name)) {
-            Optional<XTextContent> mark = UnoNameAccess.getTextContentByName(
-                marks,
-                name
-            );
+            Optional<XTextContent> mark = UnoNameAccess.getTextContentByName(marks, name);
             if (mark.isEmpty()) {
                 return;
             }
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 10485fb6539..34a7ab5e404 100644
--- a/src/main/java/org/jabref/model/openoffice/uno/UnoCast.java
+++ b/src/main/java/org/jabref/model/openoffice/uno/UnoCast.java
@@ -13,8 +13,6 @@ private UnoCast() {}
      * @return A reference to the requested UNO interface type if available, otherwise Optional.empty()
      */
     public static <T> Optional<T> cast(Class<T> zInterface, Object object) {
-        return Optional.ofNullable(
-            UnoRuntime.queryInterface(zInterface, object)
-        );
+        return Optional.ofNullable(UnoRuntime.queryInterface(zInterface, object));
     }
 }
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 6776cd287f9..7a35bc13bf4 100644
--- a/src/main/java/org/jabref/model/openoffice/uno/UnoCrossRef.java
+++ b/src/main/java/org/jabref/model/openoffice/uno/UnoCrossRef.java
@@ -36,18 +36,13 @@ public static void insertReferenceToPageNumberOfReferenceMark(
         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();
+        XMultiServiceFactory msf = UnoCast.cast(XMultiServiceFactory.class, doc).get();
         // Create a 'GetReference' text field to refer to the reference mark we just inserted,
         // and get it's XPropertySet interface
         XPropertySet xFieldProps;
         try {
             String name = "com.sun.star.text.textfield.GetReference";
-            xFieldProps =
-                UnoCast
-                    .cast(XPropertySet.class, msf.createInstance(name))
-                    .get();
+            xFieldProps = UnoCast.cast(XPropertySet.class, msf.createInstance(name)).get();
         } catch (com.sun.star.uno.Exception e) {
             throw new CreationException(e.getMessage());
         }
@@ -74,8 +69,7 @@ public static void insertReferenceToPageNumberOfReferenceMark(
             );
         } catch (UnknownPropertyException ex) {
             throw new java.lang.IllegalStateException(
-                "The created GetReference does not have property" +
-                " 'ReferenceFieldSource'"
+                "The created GetReference does not have property" + " 'ReferenceFieldSource'"
             );
         } catch (PropertyVetoException ex) {
             throw new java.lang.IllegalStateException(
@@ -85,14 +79,10 @@ public static void insertReferenceToPageNumberOfReferenceMark(
 
         try {
             // We want the reference displayed as page number
-            xFieldProps.setPropertyValue(
-                "ReferenceFieldPart",
-                ReferenceFieldPart.PAGE
-            );
+            xFieldProps.setPropertyValue("ReferenceFieldPart", ReferenceFieldPart.PAGE);
         } catch (UnknownPropertyException ex) {
             throw new java.lang.IllegalStateException(
-                "The created GetReference does not have property" +
-                " 'ReferenceFieldPart'"
+                "The created GetReference does not have property" + " 'ReferenceFieldPart'"
             );
         } catch (PropertyVetoException ex) {
             throw new java.lang.IllegalStateException(
@@ -101,9 +91,7 @@ public static void insertReferenceToPageNumberOfReferenceMark(
         }
 
         // Get the XTextContent interface of the GetReference text field
-        XTextContent xRefContent = UnoCast
-            .cast(XTextContent.class, xFieldProps)
-            .get();
+        XTextContent xRefContent = UnoCast.cast(XTextContent.class, xFieldProps).get();
 
         // Insert the text field
         cursor.getText().insertTextContent(cursor.getEnd(), xRefContent, false);
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 709f748ab12..751192e63df 100644
--- a/src/main/java/org/jabref/model/openoffice/uno/UnoCursor.java
+++ b/src/main/java/org/jabref/model/openoffice/uno/UnoCursor.java
@@ -27,9 +27,7 @@ public static Optional<XTextViewCursor> getViewCursor(XTextDocument doc) {
      *
      * @return Optional.empty if mark is null, otherwise cursor.
      */
-    public static Optional<XTextCursor> getTextCursorOfTextContentAnchor(
-        XTextContent mark
-    ) {
+    public static Optional<XTextCursor> getTextCursorOfTextContentAnchor(XTextContent mark) {
         if (mark == null) {
             return Optional.empty();
         }
@@ -37,9 +35,7 @@ public static Optional<XTextCursor> getTextCursorOfTextContentAnchor(
         if (markAnchor == null) {
             return Optional.empty();
         }
-        return Optional.of(
-            markAnchor.getText().createTextCursorByRange(markAnchor)
-        );
+        return Optional.of(markAnchor.getText().createTextCursorByRange(markAnchor));
     }
 
     public static XTextCursor createTextCursorByRange(XTextRange range) {
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 107129039fb..d48c3c4cf9d 100644
--- a/src/main/java/org/jabref/model/openoffice/uno/UnoNameAccess.java
+++ b/src/main/java/org/jabref/model/openoffice/uno/UnoNameAccess.java
@@ -13,10 +13,8 @@ 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 {
+    public static Optional<XTextContent> getTextContentByName(XNameAccess nameAccess, String name)
+        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 48ff251c146..b5fef2296d5 100644
--- a/src/main/java/org/jabref/model/openoffice/uno/UnoNamed.java
+++ b/src/main/java/org/jabref/model/openoffice/uno/UnoNamed.java
@@ -28,9 +28,7 @@ static XNamed insertNamedTextContent(
         XTextRange range,
         boolean absorb
     ) throws CreationException {
-        XMultiServiceFactory msf = UnoCast
-            .cast(XMultiServiceFactory.class, doc)
-            .get();
+        XMultiServiceFactory msf = UnoCast.cast(XMultiServiceFactory.class, doc).get();
 
         Object xObject;
         try {
@@ -41,17 +39,13 @@ static XNamed insertNamedTextContent(
 
         XNamed xNamed = UnoCast
             .cast(XNamed.class, xObject)
-            .orElseThrow(() ->
-                new IllegalArgumentException("Service is not an XNamed")
-            );
+            .orElseThrow(() -> new IllegalArgumentException("Service is not an XNamed"));
         xNamed.setName(name);
 
         // get XTextContent interface
         XTextContent xTextContent = UnoCast
             .cast(XTextContent.class, xObject)
-            .orElseThrow(() ->
-                new IllegalArgumentException("Service is not an XTextContent")
-            );
+            .orElseThrow(() -> new IllegalArgumentException("Service is not an XTextContent"));
         range.getText().insertTextContent(range, xTextContent, 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 24894ebc0d2..e3e892f753a 100644
--- a/src/main/java/org/jabref/model/openoffice/uno/UnoProperties.java
+++ b/src/main/java/org/jabref/model/openoffice/uno/UnoProperties.java
@@ -20,15 +20,11 @@ public class UnoProperties {
 
     private UnoProperties() {}
 
-    public static Optional<XPropertySet> asPropertySet(
-        XPropertyContainer propertyContainer
-    ) {
+    public static Optional<XPropertySet> asPropertySet(XPropertyContainer propertyContainer) {
         return UnoCast.cast(XPropertySet.class, propertyContainer);
     }
 
-    public static Optional<XPropertySetInfo> getPropertySetInfo(
-        XPropertySet propertySet
-    ) {
+    public static Optional<XPropertySetInfo> getPropertySetInfo(XPropertySet propertySet) {
         return Optional
             .ofNullable(propertySet)
             .flatMap(e -> Optional.ofNullable(e.getPropertySetInfo()));
@@ -37,22 +33,15 @@ public static Optional<XPropertySetInfo> getPropertySetInfo(
     public static Optional<XPropertySetInfo> getPropertySetInfo(
         XPropertyContainer propertyContainer
     ) {
-        return Optional
-            .ofNullable(propertyContainer)
-            .flatMap(UnoProperties::getPropertySetInfo);
+        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
-    ) {
+    public static List<String> getPropertyNames(XPropertySetInfo propertySetInfo) {
         return getPropertyNames(propertySetInfo.getProperties());
     }
 
@@ -60,18 +49,14 @@ public static List<String> getPropertyNames(XPropertySet propertySet) {
         return getPropertyNames(propertySet.getPropertySetInfo());
     }
 
-    public static List<String> getPropertyNames(
-        XPropertyContainer propertyContainer
-    ) {
+    public static List<String> getPropertyNames(XPropertyContainer propertyContainer) {
         return asPropertySet(propertyContainer)
             .map(UnoProperties::getPropertyNames)
             .orElse(new ArrayList<>());
     }
 
-    public static Optional<Object> getValueAsObject(
-        XPropertySet propertySet,
-        String property
-    ) throws WrappedTargetException {
+    public static Optional<Object> getValueAsObject(XPropertySet propertySet, String property)
+        throws WrappedTargetException {
         Objects.requireNonNull(propertySet);
         Objects.requireNonNull(property);
         try {
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 59d99282eb8..f8855e030d7 100644
--- a/src/main/java/org/jabref/model/openoffice/uno/UnoRedlines.java
+++ b/src/main/java/org/jabref/model/openoffice/uno/UnoRedlines.java
@@ -15,8 +15,7 @@
  */
 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"
 
@@ -31,9 +30,7 @@ public static boolean getRecordChanges(XTextDocument doc)
         }
     }
 
-    private static Optional<XRedlinesSupplier> getRedlinesSupplier(
-        XTextDocument doc
-    ) {
+    private static Optional<XRedlinesSupplier> getRedlinesSupplier(XTextDocument doc) {
         return UnoCast.cast(XRedlinesSupplier.class, doc);
     }
 
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 cd1d0e8520d..30c8f8d10c2 100644
--- a/src/main/java/org/jabref/model/openoffice/uno/UnoReferenceMark.java
+++ b/src/main/java/org/jabref/model/openoffice/uno/UnoReferenceMark.java
@@ -23,18 +23,13 @@ private UnoReferenceMark() {}
      *                             <p>
      *                             Note: also used by `isDocumentConnectionMissing` to test if we have a working connection.
      */
-    public static XNameAccess getNameAccess(XTextDocument doc)
-        throws NoDocumentException {
-        XReferenceMarksSupplier supplier = UnoCast
-            .cast(XReferenceMarksSupplier.class, doc)
-            .get();
+    public static XNameAccess getNameAccess(XTextDocument doc) throws NoDocumentException {
+        XReferenceMarksSupplier supplier = UnoCast.cast(XReferenceMarksSupplier.class, doc).get();
 
         try {
             return supplier.getReferenceMarks();
         } catch (DisposedException ex) {
-            throw new NoDocumentException(
-                "UnoReferenceMarks.getNameAccess failed with" + ex
-            );
+            throw new NoDocumentException("UnoReferenceMarks.getNameAccess failed with" + ex);
         }
     }
 
@@ -43,8 +38,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();
         if (names == null) {
@@ -63,10 +57,7 @@ public static void removeIfExists(XTextDocument doc, String name)
         XNameAccess xReferenceMarks = UnoReferenceMark.getNameAccess(doc);
 
         if (xReferenceMarks.hasByName(name)) {
-            Optional<XTextContent> mark = UnoNameAccess.getTextContentByName(
-                xReferenceMarks,
-                name
-            );
+            Optional<XTextContent> mark = UnoNameAccess.getTextContentByName(xReferenceMarks, name);
             if (mark.isEmpty()) {
                 return;
             }
@@ -81,10 +72,8 @@ 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 {
+    public static Optional<XTextContent> getAsTextContent(XTextDocument doc, String name)
+        throws NoDocumentException, WrappedTargetException {
         XNameAccess nameAccess = UnoReferenceMark.getNameAccess(doc);
         return UnoNameAccess.getTextContentByName(nameAccess, name);
     }
@@ -92,13 +81,9 @@ public static Optional<XTextContent> getAsTextContent(
     /**
      * 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);
+    public static Optional<XTextRange> getAnchor(XTextDocument doc, String name)
+        throws NoDocumentException, WrappedTargetException {
+        return UnoReferenceMark.getAsTextContent(doc, name).map(XTextContent::getAnchor);
     }
 
     /**
@@ -111,12 +96,8 @@ public static Optional<XTextRange> getAnchor(
      * @param name  For the reference mark.
      * @param range Cursor marking the location or range for the reference mark.
      */
-    public static XNamed create(
-        XTextDocument doc,
-        String name,
-        XTextRange range,
-        boolean absorb
-    ) throws CreationException {
+    public static XNamed create(XTextDocument doc, String name, XTextRange range, boolean absorb)
+        throws CreationException {
         return UnoNamed.insertNamedTextContent(
             doc,
             "com.sun.star.text.ReferenceMark",
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 a2ed001a659..ee5c57059c8 100644
--- a/src/main/java/org/jabref/model/openoffice/uno/UnoSelection.java
+++ b/src/main/java/org/jabref/model/openoffice/uno/UnoSelection.java
@@ -14,22 +14,16 @@
  */
 public class UnoSelection {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(
-        UnoSelection.class
-    );
+    private static final Logger LOGGER = LoggerFactory.getLogger(UnoSelection.class);
 
     private UnoSelection() {}
 
-    private static Optional<XSelectionSupplier> getSelectionSupplier(
-        XTextDocument doc
-    ) {
+    private static Optional<XSelectionSupplier> getSelectionSupplier(XTextDocument doc) {
         if (doc == null) {
             LOGGER.warn("UnoSelection.getSelectionSupplier: doc is null");
             return Optional.empty();
         }
-        Optional<XController> controller = UnoTextDocument.getCurrentController(
-            doc
-        );
+        Optional<XController> controller = UnoTextDocument.getCurrentController(doc);
         if (controller.isEmpty()) {
             LOGGER.warn(
                 "UnoSelection.getSelectionSupplier: getCurrentController(doc) returned empty"
@@ -67,9 +61,7 @@ private static Optional<XSelectionSupplier> getSelectionSupplier(
      * <p>
      * With cursor selecting an inserted image: *** XSelectionSupplier is OK *** Object initialSelection is OK *** xserviceinfo is OK *** xserviceinfo.getImplementationName: "SwXTextGraphicObject" "com.sun.star.text.BaseFrame" "com.sun.star.text.TextContent" "com.sun.star.document.LinkTarget" "com.sun.star.text.TextGraphicObject"
      */
-    public static Optional<XServiceInfo> getSelectionAsXServiceInfo(
-        XTextDocument doc
-    ) {
+    public static Optional<XServiceInfo> getSelectionAsXServiceInfo(XTextDocument doc) {
         Objects.requireNonNull(doc);
         Optional<XSelectionSupplier> supplier = getSelectionSupplier(doc);
         if (supplier.isEmpty()) {
@@ -80,10 +72,7 @@ public static Optional<XServiceInfo> getSelectionAsXServiceInfo(
         if (selection == null) {
             return Optional.empty();
         }
-        Optional<XServiceInfo> result = UnoCast.cast(
-            XServiceInfo.class,
-            selection
-        );
+        Optional<XServiceInfo> result = UnoCast.cast(XServiceInfo.class, selection);
         if (result.isEmpty()) {
             LOGGER.warn("cast to XServiceInfo returned empty");
             return Optional.empty();
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 221e8a94f4c..1aaccf06ad8 100644
--- a/src/main/java/org/jabref/model/openoffice/uno/UnoStyle.java
+++ b/src/main/java/org/jabref/model/openoffice/uno/UnoStyle.java
@@ -24,23 +24,13 @@ private static Optional<XStyle> getStyleFromFamily(
         String familyName,
         String styleName
     ) throws WrappedTargetException {
-        XStyleFamiliesSupplier fss = UnoCast
-            .cast(XStyleFamiliesSupplier.class, doc)
-            .get();
-        XNameAccess families = UnoCast
-            .cast(XNameAccess.class, fss.getStyleFamilies())
-            .get();
+        XStyleFamiliesSupplier fss = UnoCast.cast(XStyleFamiliesSupplier.class, doc).get();
+        XNameAccess families = UnoCast.cast(XNameAccess.class, fss.getStyleFamilies()).get();
         XNameContainer xFamily;
         try {
-            xFamily =
-                UnoCast
-                    .cast(XNameContainer.class, families.getByName(familyName))
-                    .get();
+            xFamily = UnoCast.cast(XNameContainer.class, families.getByName(familyName)).get();
         } catch (NoSuchElementException ex) {
-            String msg = String.format(
-                "Style family name '%s' is not recognized",
-                familyName
-            );
+            String msg = String.format("Style family name '%s' is not recognized", familyName);
             throw new java.lang.IllegalArgumentException(msg, ex);
         }
 
@@ -52,17 +42,13 @@ private static Optional<XStyle> getStyleFromFamily(
         }
     }
 
-    public static Optional<XStyle> getParagraphStyle(
-        XTextDocument doc,
-        String styleName
-    ) throws WrappedTargetException {
+    public static Optional<XStyle> getParagraphStyle(XTextDocument doc, String styleName)
+        throws WrappedTargetException {
         return getStyleFromFamily(doc, PARAGRAPH_STYLES, styleName);
     }
 
-    public static Optional<XStyle> getCharacterStyle(
-        XTextDocument doc,
-        String styleName
-    ) throws WrappedTargetException {
+    public static Optional<XStyle> getCharacterStyle(XTextDocument doc, String styleName)
+        throws WrappedTargetException {
         return getStyleFromFamily(doc, CHARACTER_STYLES, styleName);
     }
 
@@ -74,17 +60,13 @@ public static Optional<String> getInternalNameOfStyle(
         return getStyleFromFamily(doc, familyName, name).map(XStyle::getName);
     }
 
-    public static Optional<String> getInternalNameOfParagraphStyle(
-        XTextDocument doc,
-        String name
-    ) throws WrappedTargetException {
+    public static Optional<String> getInternalNameOfParagraphStyle(XTextDocument doc, String name)
+        throws WrappedTargetException {
         return getInternalNameOfStyle(doc, PARAGRAPH_STYLES, name);
     }
 
-    public static Optional<String> getInternalNameOfCharacterStyle(
-        XTextDocument doc,
-        String name
-    ) throws WrappedTargetException {
+    public static Optional<String> getInternalNameOfCharacterStyle(XTextDocument doc, String name)
+        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 2ad2d0d1496..2bc9f837419 100644
--- a/src/main/java/org/jabref/model/openoffice/uno/UnoTextDocument.java
+++ b/src/main/java/org/jabref/model/openoffice/uno/UnoTextDocument.java
@@ -14,9 +14,7 @@
 
 public class UnoTextDocument {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(
-        UnoTextDocument.class
-    );
+    private static final Logger LOGGER = LoggerFactory.getLogger(UnoTextDocument.class);
 
     private UnoTextDocument() {}
 
@@ -37,9 +35,7 @@ public static boolean isDocumentConnectionMissing(XTextDocument doc) {
         return missing;
     }
 
-    public static Optional<XController> getCurrentController(
-        XTextDocument doc
-    ) {
+    public static Optional<XController> getCurrentController(XTextDocument doc) {
         if (doc == null) {
             return Optional.empty();
         }
@@ -56,16 +52,12 @@ public static Optional<XController> getCurrentController(
      * @return The title or Optional.empty()
      */
     public static Optional<String> getFrameTitle(XTextDocument doc) {
-        Optional<XFrame> frame = getCurrentController(doc)
-            .map(XController::getFrame);
+        Optional<XFrame> frame = getCurrentController(doc).map(XController::getFrame);
         if (frame.isEmpty()) {
             return Optional.empty();
         }
 
-        Optional<XPropertySet> propertySet = UnoCast.cast(
-            XPropertySet.class,
-            frame.get()
-        );
+        Optional<XPropertySet> propertySet = UnoCast.cast(XPropertySet.class, frame.get());
         if (propertySet.isEmpty()) {
             return Optional.empty();
         }
@@ -86,9 +78,7 @@ public static Optional<String> getFrameTitle(XTextDocument doc) {
         }
     }
 
-    static Optional<XDocumentProperties> getDocumentProperties(
-        XTextDocument doc
-    ) {
+    static Optional<XDocumentProperties> getDocumentProperties(XTextDocument doc) {
         return Optional
             .ofNullable(doc)
             .flatMap(e -> UnoCast.cast(XDocumentPropertiesSupplier.class, e))
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 167f8f20719..5b81f21cf05 100644
--- a/src/main/java/org/jabref/model/openoffice/uno/UnoTextRange.java
+++ b/src/main/java/org/jabref/model/openoffice/uno/UnoTextRange.java
@@ -15,13 +15,8 @@ private UnoTextRange() {}
      * <p>
      * Returns Optional.empty if not in a footnote.
      */
-    public static Optional<XTextRange> getFootnoteMarkRange(
-        XTextRange original
-    ) {
-        Optional<XFootnote> footer = UnoCast.cast(
-            XFootnote.class,
-            original.getText()
-        );
+    public static Optional<XTextRange> getFootnoteMarkRange(XTextRange original) {
+        Optional<XFootnote> footer = UnoCast.cast(XFootnote.class, original.getText());
         // If we are inside a footnote,
         // find the linking footnote marker:
         // The footnote's anchor gives the correct position in the text:
@@ -39,23 +34,15 @@ public static boolean comparables(XTextRange a, XTextRange b) {
      * @return follows java conventions
      * 1 if  (a &gt; b); (-1) if (a &lt; b)
      */
-    public static int compareStartsUnsafe(
-        XTextRangeCompare compare,
-        XTextRange a,
-        XTextRange b
-    ) {
+    public static int compareStartsUnsafe(XTextRangeCompare compare, XTextRange a, XTextRange b) {
         return -1 * compare.compareRegionStarts(a, b);
     }
 
     public static int compareStarts(XTextRange a, XTextRange b) {
         if (!comparables(a, b)) {
-            throw new java.lang.IllegalArgumentException(
-                "compareStarts: got incomparable regions"
-            );
+            throw new java.lang.IllegalArgumentException("compareStarts: got incomparable regions");
         }
-        final XTextRangeCompare compare = UnoCast
-            .cast(XTextRangeCompare.class, a.getText())
-            .get();
+        final XTextRangeCompare compare = UnoCast.cast(XTextRangeCompare.class, a.getText()).get();
         return compareStartsUnsafe(compare, a, b);
     }
 
@@ -65,13 +52,9 @@ public static int compareStarts(XTextRange a, XTextRange b) {
      */
     public static int compareEnds(XTextRange a, XTextRange b) {
         if (!comparables(a, b)) {
-            throw new java.lang.IllegalArgumentException(
-                "compareEnds: got incomparable regions"
-            );
+            throw new java.lang.IllegalArgumentException("compareEnds: got incomparable regions");
         }
-        final XTextRangeCompare compare = UnoCast
-            .cast(XTextRangeCompare.class, a.getText())
-            .get();
+        final XTextRangeCompare compare = UnoCast.cast(XTextRangeCompare.class, a.getText()).get();
         return -1 * compare.compareRegionEnds(a, b);
     }
 
@@ -96,9 +79,7 @@ public static int compareStartsThenEnds(XTextRange a, XTextRange b) {
                 "compareStartsThenEnds: got incomparable regions"
             );
         }
-        final XTextRangeCompare compare = UnoCast
-            .cast(XTextRangeCompare.class, a.getText())
-            .get();
+        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 d4286a2bac0..b3a1c06ccda 100644
--- a/src/main/java/org/jabref/model/openoffice/uno/UnoTextSection.java
+++ b/src/main/java/org/jabref/model/openoffice/uno/UnoTextSection.java
@@ -18,27 +18,20 @@ public class UnoTextSection {
     /**
      * @return An XNameAccess to find sections by name.
      */
-    public static XNameAccess getNameAccess(XTextDocument doc)
-        throws NoDocumentException {
-        XTextSectionsSupplier supplier = UnoCast
-            .cast(XTextSectionsSupplier.class, doc)
-            .get();
+    public static XNameAccess getNameAccess(XTextDocument doc) throws NoDocumentException {
+        XTextSectionsSupplier supplier = UnoCast.cast(XTextSectionsSupplier.class, doc).get();
         try {
             return supplier.getTextSections();
         } catch (DisposedException ex) {
-            throw new NoDocumentException(
-                "UnoTextSection.getNameAccess failed with" + ex
-            );
+            throw new NoDocumentException("UnoTextSection.getNameAccess failed with" + ex);
         }
     }
 
     /**
      * Get an XTextSection by name.
      */
-    public static Optional<XTextSection> getByName(
-        XTextDocument doc,
-        String name
-    ) throws WrappedTargetException, NoDocumentException {
+    public static Optional<XTextSection> getByName(XTextDocument doc, String name)
+        throws WrappedTargetException, NoDocumentException {
         XNameAccess nameAccess = getNameAccess(doc);
         try {
             return Optional.ofNullable(
@@ -55,14 +48,10 @@ public static Optional<XTextSection> getByName(
      * @param name The name of the section to find.
      * @return The XTextRange for the section, or Optional.empty().
      */
-    public static Optional<XTextRange> getAnchor(
-        XTextDocument doc,
-        String name
-    ) throws WrappedTargetException, NoDocumentException {
+    public static Optional<XTextRange> getAnchor(XTextDocument doc, String name)
+        throws WrappedTargetException, NoDocumentException {
         XNameAccess nameAccess = getNameAccess(doc);
-        return UnoNameAccess
-            .getTextContentByName(nameAccess, name)
-            .map(XTextContent::getAnchor);
+        return UnoNameAccess.getTextContentByName(nameAccess, name).map(XTextContent::getAnchor);
     }
 
     /**
@@ -73,12 +62,8 @@ public static Optional<XTextRange> getAnchor(
      *              <p>
      *              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(
-        XTextDocument doc,
-        String name,
-        XTextRange range,
-        boolean absorb
-    ) throws CreationException {
+    public static XNamed create(XTextDocument doc, String name, XTextRange range, boolean absorb)
+        throws CreationException {
         return UnoNamed.insertNamedTextContent(
             doc,
             "com.sun.star.text.TextSection",
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 4ae87fffef6..ec242071fa3 100644
--- a/src/main/java/org/jabref/model/openoffice/uno/UnoUndo.java
+++ b/src/main/java/org/jabref/model/openoffice/uno/UnoUndo.java
@@ -24,8 +24,7 @@ public static Optional<XUndoManager> getXUndoManager(XTextDocument doc) {
      * Each call to enterUndoContext must be paired by a call to leaveUndoContext, otherwise, the document's undo stack is left in an inconsistent state.
      */
     public static void enterUndoContext(XTextDocument doc, String title) {
-        getXUndoManager(doc)
-            .ifPresent(undoManager -> undoManager.enterUndoContext(title));
+        getXUndoManager(doc).ifPresent(undoManager -> undoManager.enterUndoContext(title));
     }
 
     public static void leaveUndoContext(XTextDocument doc) {
@@ -34,9 +33,7 @@ public static void leaveUndoContext(XTextDocument doc) {
             try {
                 undoManager.get().leaveUndoContext();
             } catch (InvalidStateException ex) {
-                throw new IllegalStateException(
-                    "leaveUndoContext reported InvalidStateException"
-                );
+                throw new IllegalStateException("leaveUndoContext reported InvalidStateException");
             }
         }
     }
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 aba35f8b2b4..8cc4e3dbd54 100644
--- a/src/main/java/org/jabref/model/openoffice/uno/UnoUserDefinedProperty.java
+++ b/src/main/java/org/jabref/model/openoffice/uno/UnoUserDefinedProperty.java
@@ -28,15 +28,11 @@
  */
 public class UnoUserDefinedProperty {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(
-        UnoUserDefinedProperty.class
-    );
+    private static final Logger LOGGER = LoggerFactory.getLogger(UnoUserDefinedProperty.class);
 
     private UnoUserDefinedProperty() {}
 
-    public static Optional<XPropertyContainer> getPropertyContainer(
-        XTextDocument doc
-    ) {
+    public static Optional<XPropertyContainer> getPropertyContainer(XTextDocument doc) {
         return UnoTextDocument
             .getDocumentProperties(doc)
             .map(XDocumentProperties::getUserDefinedProperties);
@@ -54,10 +50,8 @@ public static List<String> getListOfNames(XTextDocument doc) {
      * @return The value of the property or Optional.empty()
      * 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 {
+    public static Optional<String> getStringValue(XTextDocument doc, String property)
+        throws WrappedTargetException {
         Optional<XPropertySet> propertySet = UnoUserDefinedProperty
             .getPropertyContainer(doc)
             .flatMap(UnoProperties::asPropertySet);
@@ -67,10 +61,7 @@ public static Optional<String> getStringValue(
             );
         }
         try {
-            String value = propertySet
-                .get()
-                .getPropertyValue(property)
-                .toString();
+            String value = propertySet.get().getPropertyValue(property).toString();
             return Optional.ofNullable(value);
         } catch (UnknownPropertyException ex) {
             return Optional.empty();
@@ -81,17 +72,12 @@ public static Optional<String> getStringValue(
      * @param property Name of a custom document property in the current document. Created if does not exist yet.
      * @param value    The value to be stored.
      */
-    public static void setStringProperty(
-        XTextDocument doc,
-        String property,
-        String value
-    )
+    public static void setStringProperty(XTextDocument doc, String property, String value)
         throws IllegalTypeException, PropertyVetoException, WrappedTargetException {
         Objects.requireNonNull(property);
         Objects.requireNonNull(value);
 
-        Optional<XPropertyContainer> container =
-            UnoUserDefinedProperty.getPropertyContainer(doc);
+        Optional<XPropertyContainer> container = UnoUserDefinedProperty.getPropertyContainer(doc);
 
         if (container.isEmpty()) {
             throw new java.lang.IllegalArgumentException(
@@ -99,18 +85,12 @@ public static void setStringProperty(
             );
         }
 
-        Optional<XPropertySet> propertySet = container.flatMap(
-            UnoProperties::asPropertySet
-        );
+        Optional<XPropertySet> propertySet = container.flatMap(UnoProperties::asPropertySet);
         if (propertySet.isEmpty()) {
-            throw new java.lang.IllegalArgumentException(
-                "asPropertySet failed"
-            );
+            throw new java.lang.IllegalArgumentException("asPropertySet failed");
         }
 
-        XPropertySetInfo propertySetInfo = propertySet
-            .get()
-            .getPropertySetInfo();
+        XPropertySetInfo propertySetInfo = propertySet.get().getPropertySetInfo();
 
         if (propertySetInfo.hasPropertyByName(property)) {
             try {
@@ -124,11 +104,7 @@ public static void setStringProperty(
         try {
             container
                 .get()
-                .addProperty(
-                    property,
-                    PropertyAttribute.REMOVEABLE,
-                    new Any(Type.STRING, value)
-                );
+                .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"
@@ -141,12 +117,10 @@ public static void setStringProperty(
      *                 <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);
+        Optional<XPropertyContainer> container = UnoUserDefinedProperty.getPropertyContainer(doc);
 
         if (container.isEmpty()) {
             throw new java.lang.IllegalArgumentException(
@@ -175,8 +149,7 @@ public static void removeIfExists(XTextDocument doc, String property)
         throws NotRemoveableException {
         Objects.requireNonNull(property);
 
-        Optional<XPropertyContainer> container =
-            UnoUserDefinedProperty.getPropertyContainer(doc);
+        Optional<XPropertyContainer> container = UnoUserDefinedProperty.getPropertyContainer(doc);
 
         if (container.isEmpty()) {
             throw new java.lang.IllegalArgumentException(
diff --git a/src/main/java/org/jabref/model/openoffice/util/OOListUtil.java b/src/main/java/org/jabref/model/openoffice/util/OOListUtil.java
index ecc363628c3..c61b81655a7 100644
--- a/src/main/java/org/jabref/model/openoffice/util/OOListUtil.java
+++ b/src/main/java/org/jabref/model/openoffice/util/OOListUtil.java
@@ -16,19 +16,13 @@ public static <T, U> List<U> map(List<T> list, Function<T, U> fun) {
      * Integers 0..(len-1)
      */
     public static List<Integer> makeIndices(int len) {
-        return Stream
-            .iterate(0, i -> i + 1)
-            .limit(len)
-            .collect(Collectors.toList());
+        return Stream.iterate(0, i -> i + 1).limit(len).collect(Collectors.toList());
     }
 
     /**
      * Return indices so that list.get(indices.get(i)) is sorted.
      */
-    public static <T extends U, U> List<Integer> order(
-        List<T> list,
-        Comparator<U> comparator
-    ) {
+    public static <T extends U, U> List<Integer> order(List<T> list, Comparator<U> comparator) {
         List<Integer> indices = makeIndices(list.size());
         indices.sort((a, b) -> comparator.compare(list.get(a), list.get(b)));
         return indices;
diff --git a/src/main/java/org/jabref/model/pdf/FileAnnotation.java b/src/main/java/org/jabref/model/pdf/FileAnnotation.java
index c80a1a47475..2f942f16b43 100644
--- a/src/main/java/org/jabref/model/pdf/FileAnnotation.java
+++ b/src/main/java/org/jabref/model/pdf/FileAnnotation.java
@@ -12,14 +12,11 @@
 
 public class FileAnnotation {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(
-        FileAnnotation.class
-    );
+    private static final Logger LOGGER = LoggerFactory.getLogger(FileAnnotation.class);
 
     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 DATE_TIME_STRING_WITH_TIME_ZONE = "^D:\\d{14}.+";
     private static final String ANNOTATION_DATE_FORMAT = "yyyyMMddHHmmss";
 
     private final String author;
@@ -149,10 +146,7 @@ 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() +
-                "..."
+                annotationName.subSequence(0, ABBREVIATED_ANNOTATION_NAME_LENGTH).toString() + "..."
             );
         }
         return annotationName;
@@ -178,10 +172,7 @@ public boolean equals(Object other) {
             Objects.equals(this.author, that.author) &&
             Objects.equals(this.content, that.content) &&
             Objects.equals(this.page, that.page) &&
-            Objects.equals(
-                this.linkedFileAnnotation,
-                that.linkedFileAnnotation
-            ) &&
+            Objects.equals(this.linkedFileAnnotation, that.linkedFileAnnotation) &&
             Objects.equals(this.timeModified, that.timeModified)
         );
     }
diff --git a/src/main/java/org/jabref/model/pdf/FileAnnotationType.java b/src/main/java/org/jabref/model/pdf/FileAnnotationType.java
index a9c5a10beeb..27bea735b41 100644
--- a/src/main/java/org/jabref/model/pdf/FileAnnotationType.java
+++ b/src/main/java/org/jabref/model/pdf/FileAnnotationType.java
@@ -25,9 +25,7 @@ public enum FileAnnotationType {
     UNKNOWN("Unknown", false),
     NONE("None", false);
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(
-        FileAnnotationType.class
-    );
+    private static final Logger LOGGER = LoggerFactory.getLogger(FileAnnotationType.class);
 
     private final String name;
     private final boolean linkedFileAnnotationType;
@@ -46,9 +44,7 @@ public enum FileAnnotationType {
      */
     public static FileAnnotationType parse(PDAnnotation annotation) {
         try {
-            return FileAnnotationType.valueOf(
-                annotation.getSubtype().toUpperCase(Locale.ROOT)
-            );
+            return FileAnnotationType.valueOf(annotation.getSubtype().toUpperCase(Locale.ROOT));
         } catch (IllegalArgumentException e) {
             LOGGER.info(
                 String.format(
@@ -68,9 +64,7 @@ public static FileAnnotationType parse(PDAnnotation annotation) {
      */
     public static boolean isMarkedFileAnnotationType(String annotationType) {
         try {
-            return FileAnnotationType.valueOf(
-                annotationType.toUpperCase(Locale.ROOT)
-            )
+            return FileAnnotationType.valueOf(annotationType.toUpperCase(Locale.ROOT))
                 .linkedFileAnnotationType;
         } catch (IllegalArgumentException e) {
             return false;
diff --git a/src/main/java/org/jabref/model/pdf/search/SearchResult.java b/src/main/java/org/jabref/model/pdf/search/SearchResult.java
index de61dff3500..4f6b390ab63 100644
--- a/src/main/java/org/jabref/model/pdf/search/SearchResult.java
+++ b/src/main/java/org/jabref/model/pdf/search/SearchResult.java
@@ -33,13 +33,10 @@ public final class SearchResult {
     private List<String> contentResultStringsHtml;
     private List<String> annotationsResultStringsHtml;
 
-    public SearchResult(IndexSearcher searcher, Query query, ScoreDoc scoreDoc)
-        throws IOException {
+    public SearchResult(IndexSearcher searcher, Query query, ScoreDoc scoreDoc) throws IOException {
         this.path = getFieldContents(searcher, scoreDoc, PATH);
-        this.pageNumber =
-            Integer.parseInt(getFieldContents(searcher, scoreDoc, PAGE_NUMBER));
-        this.modified =
-            Long.parseLong(getFieldContents(searcher, scoreDoc, MODIFIED));
+        this.pageNumber = Integer.parseInt(getFieldContents(searcher, scoreDoc, PAGE_NUMBER));
+        this.modified = Long.parseLong(getFieldContents(searcher, scoreDoc, MODIFIED));
         this.luceneScore = scoreDoc.score;
 
         String content = getFieldContents(searcher, scoreDoc, CONTENT);
@@ -50,10 +47,7 @@ public SearchResult(IndexSearcher searcher, Query query, ScoreDoc scoreDoc)
             new QueryScorer(query)
         );
 
-        try (
-            TokenStream contentStream = new EnglishStemAnalyzer()
-                .tokenStream(CONTENT, content)
-        ) {
+        try (TokenStream contentStream = new EnglishStemAnalyzer().tokenStream(CONTENT, content)) {
             TextFragment[] frags = highlighter.getBestTextFragments(
                 contentStream,
                 content,
@@ -61,10 +55,7 @@ public SearchResult(IndexSearcher searcher, Query query, ScoreDoc scoreDoc)
                 10
             );
             this.contentResultStringsHtml =
-                Arrays
-                    .stream(frags)
-                    .map(TextFragment::toString)
-                    .collect(Collectors.toList());
+                Arrays.stream(frags).map(TextFragment::toString).collect(Collectors.toList());
         } catch (InvalidTokenOffsetsException e) {
             this.contentResultStringsHtml = List.of();
         }
@@ -80,23 +71,15 @@ public SearchResult(IndexSearcher searcher, Query query, ScoreDoc scoreDoc)
                 10
             );
             this.annotationsResultStringsHtml =
-                Arrays
-                    .stream(frags)
-                    .map(TextFragment::toString)
-                    .collect(Collectors.toList());
+                Arrays.stream(frags).map(TextFragment::toString).collect(Collectors.toList());
         } catch (InvalidTokenOffsetsException e) {
             this.annotationsResultStringsHtml = List.of();
         }
     }
 
-    private String getFieldContents(
-        IndexSearcher searcher,
-        ScoreDoc scoreDoc,
-        String field
-    ) throws IOException {
-        IndexableField indexableField = searcher
-            .doc(scoreDoc.doc)
-            .getField(field);
+    private String getFieldContents(IndexSearcher searcher, ScoreDoc scoreDoc, String field)
+        throws IOException {
+        IndexableField indexableField = searcher.doc(scoreDoc.doc).getField(field);
         if (indexableField == null) {
             return "";
         }
@@ -104,10 +87,7 @@ private String getFieldContents(
     }
 
     public boolean isResultFor(BibEntry entry) {
-        return entry
-            .getFiles()
-            .stream()
-            .anyMatch(linkedFile -> path.equals(linkedFile.getLink()));
+        return entry.getFiles().stream().anyMatch(linkedFile -> path.equals(linkedFile.getLink()));
     }
 
     public String getPath() {
diff --git a/src/main/java/org/jabref/model/schema/DublinCoreSchemaCustom.java b/src/main/java/org/jabref/model/schema/DublinCoreSchemaCustom.java
index 9fe032a8696..4ffb7e1148f 100644
--- a/src/main/java/org/jabref/model/schema/DublinCoreSchemaCustom.java
+++ b/src/main/java/org/jabref/model/schema/DublinCoreSchemaCustom.java
@@ -17,30 +17,24 @@
  *  A DublinCoreSchema extension Class.
  *  In case anyone intends to alter standard behaviour.
  */
-@StructuredType(
-    preferedPrefix = "dc",
-    namespace = "http://purl.org/dc/elements/1.1/"
-)
+@StructuredType(preferedPrefix = "dc", namespace = "http://purl.org/dc/elements/1.1/")
 public class DublinCoreSchemaCustom extends DublinCoreSchema {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(
-        DublinCoreSchemaCustom.class
-    );
+    private static final Logger LOGGER = LoggerFactory.getLogger(DublinCoreSchemaCustom.class);
 
     public DublinCoreSchemaCustom(XMPMetadata metadata) {
         super(metadata);
     }
 
-    public static DublinCoreSchema copyDublinCoreSchema(
-        DublinCoreSchema dcSchema
-    ) {
+    public static DublinCoreSchema copyDublinCoreSchema(DublinCoreSchema dcSchema) {
         if (Objects.isNull(dcSchema)) {
             return null;
         }
 
         try {
-            DublinCoreSchemaCustom dublinCoreSchemaCustom =
-                new DublinCoreSchemaCustom(dcSchema.getMetadata());
+            DublinCoreSchemaCustom dublinCoreSchemaCustom = new DublinCoreSchemaCustom(
+                dcSchema.getMetadata()
+            );
             FieldUtils.writeField(
                 dublinCoreSchemaCustom,
                 "container",
diff --git a/src/main/java/org/jabref/model/search/rules/ContainsBasedSearchRule.java b/src/main/java/org/jabref/model/search/rules/ContainsBasedSearchRule.java
index 2bbe269831a..b8679e5455c 100644
--- a/src/main/java/org/jabref/model/search/rules/ContainsBasedSearchRule.java
+++ b/src/main/java/org/jabref/model/search/rules/ContainsBasedSearchRule.java
@@ -32,23 +32,19 @@ public boolean applyRule(String query, BibEntry bibEntry) {
             searchString = searchString.toLowerCase(Locale.ROOT);
         }
 
-        List<String> unmatchedWords = new SentenceAnalyzer(searchString)
-            .getWords();
+        List<String> unmatchedWords = new SentenceAnalyzer(searchString).getWords();
 
         for (Field fieldKey : bibEntry.getFields()) {
             String formattedFieldContent = StringUtil.stripAccents(
                 bibEntry.getFieldLatexFree(fieldKey).get()
             );
             if (!searchFlags.contains(SearchRules.SearchFlags.CASE_SENSITIVE)) {
-                formattedFieldContent =
-                    formattedFieldContent.toLowerCase(Locale.ROOT);
+                formattedFieldContent = formattedFieldContent.toLowerCase(Locale.ROOT);
             }
 
             Iterator<String> unmatchedWordsIterator = unmatchedWords.iterator();
             while (unmatchedWordsIterator.hasNext()) {
-                String word = StringUtil.stripAccents(
-                    unmatchedWordsIterator.next()
-                );
+                String word = StringUtil.stripAccents(unmatchedWordsIterator.next());
                 if (formattedFieldContent.contains(word)) {
                     unmatchedWordsIterator.remove();
                 }
diff --git a/src/main/java/org/jabref/model/search/rules/FullTextSearchRule.java b/src/main/java/org/jabref/model/search/rules/FullTextSearchRule.java
index d4dc3016b7d..6c18e45fbda 100644
--- a/src/main/java/org/jabref/model/search/rules/FullTextSearchRule.java
+++ b/src/main/java/org/jabref/model/search/rules/FullTextSearchRule.java
@@ -23,9 +23,7 @@
 @AllowedToUseLogic("Because access to the lucene index is needed")
 public abstract class FullTextSearchRule implements SearchRule {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(
-        FullTextSearchRule.class
-    );
+    private static final Logger LOGGER = LoggerFactory.getLogger(FullTextSearchRule.class);
 
     protected final EnumSet<SearchRules.SearchFlags> searchFlags;
 
@@ -47,14 +45,8 @@ public EnumSet<SearchRules.SearchFlags> getSearchFlags() {
     }
 
     @Override
-    public PdfSearchResults getFulltextResults(
-        String query,
-        BibEntry bibEntry
-    ) {
-        if (
-            !searchFlags.contains(SearchRules.SearchFlags.FULLTEXT) ||
-            databaseContext == null
-        ) {
+    public PdfSearchResults getFulltextResults(String query, BibEntry bibEntry) {
+        if (!searchFlags.contains(SearchRules.SearchFlags.FULLTEXT) || databaseContext == null) {
             return new PdfSearchResults();
         }
 
diff --git a/src/main/java/org/jabref/model/search/rules/GrammarBasedSearchRule.java b/src/main/java/org/jabref/model/search/rules/GrammarBasedSearchRule.java
index a0c1557c45f..c9faef4f39b 100644
--- a/src/main/java/org/jabref/model/search/rules/GrammarBasedSearchRule.java
+++ b/src/main/java/org/jabref/model/search/rules/GrammarBasedSearchRule.java
@@ -45,9 +45,7 @@
 @AllowedToUseLogic("Because access to the lucene index is needed")
 public class GrammarBasedSearchRule implements SearchRule {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(
-        GrammarBasedSearchRule.class
-    );
+    private static final Logger LOGGER = LoggerFactory.getLogger(GrammarBasedSearchRule.class);
 
     private final EnumSet<SearchFlags> searchFlags;
 
@@ -59,8 +57,7 @@ public class GrammarBasedSearchRule implements SearchRule {
 
     public static class ThrowingErrorListener extends BaseErrorListener {
 
-        public static final ThrowingErrorListener INSTANCE =
-            new ThrowingErrorListener();
+        public static final ThrowingErrorListener INSTANCE = new ThrowingErrorListener();
 
         @Override
         public void syntaxError(
@@ -77,18 +74,13 @@ public void syntaxError(
         }
     }
 
-    public GrammarBasedSearchRule(EnumSet<SearchFlags> searchFlags)
-        throws RecognitionException {
+    public GrammarBasedSearchRule(EnumSet<SearchFlags> searchFlags) throws RecognitionException {
         this.searchFlags = searchFlags;
         databaseContext = Globals.stateManager.getActiveDatabase().orElse(null);
     }
 
-    public static boolean isValid(
-        EnumSet<SearchFlags> searchFlags,
-        String query
-    ) {
-        return new GrammarBasedSearchRule(searchFlags)
-            .validateSearchStrings(query);
+    public static boolean isValid(EnumSet<SearchFlags> searchFlags, String query) {
+        return new GrammarBasedSearchRule(searchFlags).validateSearchStrings(query);
     }
 
     public ParseTree getTree() {
@@ -114,10 +106,7 @@ private void init(String query) throws ParseCancellationException {
         tree = parser.start();
         this.query = query;
 
-        if (
-            !searchFlags.contains(SearchRules.SearchFlags.FULLTEXT) ||
-            (databaseContext == null)
-        ) {
+        if (!searchFlags.contains(SearchRules.SearchFlags.FULLTEXT) || (databaseContext == null)) {
             return;
         }
         try {
@@ -140,10 +129,7 @@ public boolean applyRule(String query, BibEntry bibEntry) {
     }
 
     @Override
-    public PdfSearchResults getFulltextResults(
-        String query,
-        BibEntry bibEntry
-    ) {
+    public PdfSearchResults getFulltextResults(String query, BibEntry bibEntry) {
         return new PdfSearchResults(
             searchResults
                 .stream()
@@ -175,9 +161,7 @@ public enum ComparisonOperator {
         public static ComparisonOperator build(String value) {
             if ("CONTAINS".equalsIgnoreCase(value) || "=".equals(value)) {
                 return CONTAINS;
-            } else if (
-                "MATCHES".equalsIgnoreCase(value) || "==".equals(value)
-            ) {
+            } else if ("MATCHES".equalsIgnoreCase(value) || "==".equals(value)) {
                 return EXACT;
             } else {
                 return DOES_NOT_CONTAIN;
@@ -199,25 +183,19 @@ public Comparator(
         ) {
             this.operator = operator;
 
-            int option = searchFlags.contains(
-                    SearchRules.SearchFlags.CASE_SENSITIVE
-                )
+            int option = searchFlags.contains(SearchRules.SearchFlags.CASE_SENSITIVE)
                 ? 0
                 : Pattern.CASE_INSENSITIVE;
             this.fieldPattern =
                 Pattern.compile(
-                    searchFlags.contains(
-                            SearchRules.SearchFlags.REGULAR_EXPRESSION
-                        )
+                    searchFlags.contains(SearchRules.SearchFlags.REGULAR_EXPRESSION)
                         ? StringUtil.stripAccents(field)
                         : "\\Q" + StringUtil.stripAccents(field) + "\\E",
                     option
                 );
             this.valuePattern =
                 Pattern.compile(
-                    searchFlags.contains(
-                            SearchRules.SearchFlags.REGULAR_EXPRESSION
-                        )
+                    searchFlags.contains(SearchRules.SearchFlags.REGULAR_EXPRESSION)
                         ? StringUtil.stripAccents(value)
                         : "\\Q" + StringUtil.stripAccents(value) + "\\E",
                     option
@@ -226,11 +204,7 @@ public Comparator(
 
         public boolean compare(BibEntry entry) {
             // special case for searching for entrytype=phdthesis
-            if (
-                fieldPattern
-                    .matcher(InternalField.TYPE_HEADER.getName())
-                    .matches()
-            ) {
+            if (fieldPattern.matcher(InternalField.TYPE_HEADER.getName()).matches()) {
                 return matchFieldValue(entry.getType().getName());
             }
 
@@ -250,30 +224,20 @@ public boolean compare(BibEntry entry) {
             if (!fieldPattern.matcher("anyfield").matches()) {
                 // Filter out the requested fields
                 fieldsKeys =
-                    fieldsKeys
-                        .stream()
-                        .filter(matchFieldKey())
-                        .collect(Collectors.toSet());
+                    fieldsKeys.stream().filter(matchFieldKey()).collect(Collectors.toSet());
             }
 
             for (Field field : fieldsKeys) {
                 Optional<String> fieldValue = entry.getFieldLatexFree(field);
                 if (fieldValue.isPresent()) {
-                    if (
-                        matchFieldValue(
-                            StringUtil.stripAccents(fieldValue.get())
-                        )
-                    ) {
+                    if (matchFieldValue(StringUtil.stripAccents(fieldValue.get()))) {
                         return true;
                     }
                 }
             }
 
             // special case of asdf!=whatever and entry does not contain asdf
-            return (
-                fieldsKeys.isEmpty() &&
-                (operator == ComparisonOperator.DOES_NOT_CONTAIN)
-            );
+            return (fieldsKeys.isEmpty() && (operator == ComparisonOperator.DOES_NOT_CONTAIN));
         }
 
         private Predicate<Field> matchFieldKey() {
@@ -303,21 +267,13 @@ static class BibtexSearchVisitor extends SearchBaseVisitor<Boolean> {
 
         private final BibEntry entry;
 
-        public BibtexSearchVisitor(
-            EnumSet<SearchFlags> searchFlags,
-            BibEntry bibEntry
-        ) {
+        public BibtexSearchVisitor(EnumSet<SearchFlags> searchFlags, BibEntry bibEntry) {
             this.searchFlags = searchFlags;
             this.entry = bibEntry;
         }
 
-        public boolean comparison(
-            String field,
-            ComparisonOperator operator,
-            String value
-        ) {
-            return new Comparator(field, value, operator, searchFlags)
-                .compare(entry);
+        public boolean comparison(String field, ComparisonOperator operator, String value) {
+            return new Comparator(field, value, operator, searchFlags).compare(entry);
         }
 
         @Override
@@ -333,8 +289,7 @@ public Boolean visitComparison(SearchParser.ComparisonContext context) {
                 right = right.substring(1, right.length() - 1);
             }
 
-            Optional<SearchParser.NameContext> fieldDescriptor =
-                Optional.ofNullable(context.left);
+            Optional<SearchParser.NameContext> fieldDescriptor = Optional.ofNullable(context.left);
             if (fieldDescriptor.isPresent()) {
                 return comparison(
                     fieldDescriptor.get().getText(),
@@ -342,30 +297,22 @@ public Boolean visitComparison(SearchParser.ComparisonContext context) {
                     right
                 );
             } else {
-                return SearchRules
-                    .getSearchRule(searchFlags)
-                    .applyRule(right, entry);
+                return SearchRules.getSearchRule(searchFlags).applyRule(right, entry);
             }
         }
 
         @Override
-        public Boolean visitUnaryExpression(
-            SearchParser.UnaryExpressionContext ctx
-        ) {
+        public Boolean visitUnaryExpression(SearchParser.UnaryExpressionContext ctx) {
             return !visit(ctx.expression()); // negate
         }
 
         @Override
-        public Boolean visitParenExpression(
-            SearchParser.ParenExpressionContext ctx
-        ) {
+        public Boolean visitParenExpression(SearchParser.ParenExpressionContext ctx) {
             return visit(ctx.expression()); // ignore parenthesis
         }
 
         @Override
-        public Boolean visitBinaryExpression(
-            SearchParser.BinaryExpressionContext ctx
-        ) {
+        public Boolean visitBinaryExpression(SearchParser.BinaryExpressionContext ctx) {
             if ("AND".equalsIgnoreCase(ctx.operator.getText())) {
                 return visit(ctx.left) && visit(ctx.right); // and
             } else {
diff --git a/src/main/java/org/jabref/model/search/rules/RegexBasedSearchRule.java b/src/main/java/org/jabref/model/search/rules/RegexBasedSearchRule.java
index 3dafcf31173..92b445aeb69 100644
--- a/src/main/java/org/jabref/model/search/rules/RegexBasedSearchRule.java
+++ b/src/main/java/org/jabref/model/search/rules/RegexBasedSearchRule.java
@@ -19,9 +19,7 @@
 @AllowedToUseLogic("Because access to the lucene index is needed")
 public class RegexBasedSearchRule extends FullTextSearchRule {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(
-        RegexBasedSearchRule.class
-    );
+    private static final Logger LOGGER = LoggerFactory.getLogger(RegexBasedSearchRule.class);
 
     public RegexBasedSearchRule(EnumSet<SearchFlags> searchFlags) {
         super(searchFlags);
diff --git a/src/main/java/org/jabref/model/search/rules/SearchRules.java b/src/main/java/org/jabref/model/search/rules/SearchRules.java
index 02b4649f3ab..558f86c946d 100644
--- a/src/main/java/org/jabref/model/search/rules/SearchRules.java
+++ b/src/main/java/org/jabref/model/search/rules/SearchRules.java
@@ -8,19 +8,14 @@
  */
 public class SearchRules {
 
-    private static final Pattern SIMPLE_EXPRESSION = Pattern.compile(
-        "[^\\p{Punct}]*"
-    );
+    private static final Pattern SIMPLE_EXPRESSION = Pattern.compile("[^\\p{Punct}]*");
 
     private SearchRules() {}
 
     /**
      * Returns the appropriate search rule that fits best to the given parameter.
      */
-    public static SearchRule getSearchRuleByQuery(
-        String query,
-        EnumSet<SearchFlags> searchFlags
-    ) {
+    public static SearchRule getSearchRuleByQuery(String query, EnumSet<SearchFlags> searchFlags) {
         if (isSimpleQuery(query)) {
             return new ContainsBasedSearchRule(searchFlags);
         }
diff --git a/src/main/java/org/jabref/model/strings/LatexToUnicodeAdapter.java b/src/main/java/org/jabref/model/strings/LatexToUnicodeAdapter.java
index 0a0b9fc3225..c26608c43c6 100644
--- a/src/main/java/org/jabref/model/strings/LatexToUnicodeAdapter.java
+++ b/src/main/java/org/jabref/model/strings/LatexToUnicodeAdapter.java
@@ -12,14 +12,11 @@
  */
 public class LatexToUnicodeAdapter {
 
-    private static final Pattern UNDERSCORE_MATCHER = Pattern.compile(
-        "_(?!\\{)"
-    );
+    private static final Pattern UNDERSCORE_MATCHER = Pattern.compile("_(?!\\{)");
 
     private static final String REPLACEMENT_CHAR = "\uFFFD";
 
-    private static final Pattern UNDERSCORE_PLACEHOLDER_MATCHER =
-        Pattern.compile(REPLACEMENT_CHAR);
+    private static final Pattern UNDERSCORE_PLACEHOLDER_MATCHER = Pattern.compile(REPLACEMENT_CHAR);
 
     /**
      * Attempts to resolve all LaTeX in the String.
@@ -29,8 +26,7 @@ public class LatexToUnicodeAdapter {
      */
     public static String format(String inField) {
         Objects.requireNonNull(inField);
-        return parse(inField)
-            .orElse(Normalizer.normalize(inField, Normalizer.Form.NFC));
+        return parse(inField).orElse(Normalizer.normalize(inField, Normalizer.Form.NFC));
     }
 
     /**
@@ -41,16 +37,12 @@ public static String format(String inField) {
      */
     public static Optional<String> parse(String inField) {
         Objects.requireNonNull(inField);
-        String toFormat = UNDERSCORE_MATCHER
-            .matcher(inField)
-            .replaceAll(REPLACEMENT_CHAR);
+        String toFormat = UNDERSCORE_MATCHER.matcher(inField).replaceAll(REPLACEMENT_CHAR);
         var parsingResult = LaTeX2Unicode.parse(toFormat);
         if (parsingResult instanceof Parsed.Success) {
             String text = parsingResult.get().value();
             toFormat = Normalizer.normalize(text, Normalizer.Form.NFC);
-            return Optional.of(
-                UNDERSCORE_PLACEHOLDER_MATCHER.matcher(toFormat).replaceAll("_")
-            );
+            return Optional.of(UNDERSCORE_PLACEHOLDER_MATCHER.matcher(toFormat).replaceAll("_"));
         }
         return Optional.empty();
     }
diff --git a/src/main/java/org/jabref/model/strings/StringUtil.java b/src/main/java/org/jabref/model/strings/StringUtil.java
index 54a5d7c3255..29a67a7c7db 100644
--- a/src/main/java/org/jabref/model/strings/StringUtil.java
+++ b/src/main/java/org/jabref/model/strings/StringUtil.java
@@ -21,14 +21,9 @@ public class StringUtil {
     // Non-letters which are used to denote accents in LaTeX-commands, e.g., in {\"{a}}
     public static final String SPECIAL_COMMAND_CHARS = "\"`^~'=.|";
     // contains all possible line breaks, not omitting any break such as "\\n"
-    private static final Pattern LINE_BREAKS = Pattern.compile(
-        "\\r\\n|\\r|\\n"
-    );
-    private static final Pattern BRACED_TITLE_CAPITAL_PATTERN = Pattern.compile(
-        "\\{[A-Z]+\\}"
-    );
-    private static final UnicodeToReadableCharMap UNICODE_CHAR_MAP =
-        new UnicodeToReadableCharMap();
+    private static final Pattern LINE_BREAKS = Pattern.compile("\\r\\n|\\r|\\n");
+    private static final Pattern BRACED_TITLE_CAPITAL_PATTERN = Pattern.compile("\\{[A-Z]+\\}");
+    private static final UnicodeToReadableCharMap UNICODE_CHAR_MAP = new UnicodeToReadableCharMap();
 
     public static String booleanToBinaryString(boolean expression) {
         return expression ? "1" : "0";
@@ -42,11 +37,7 @@ public static String booleanToBinaryString(boolean expression) {
      * @param quoteChar The quoting character.
      * @return A String with every special character (including the quoting character itself) quoted.
      */
-    public static String quote(
-        String toQuote,
-        String specials,
-        char quoteChar
-    ) {
+    public static String quote(String toQuote, String specials, char quoteChar) {
         if (toQuote == null) {
             return "";
         }
@@ -72,11 +63,7 @@ public static String quote(
     /**
      * Creates a substring from a text
      */
-    public static String getPart(
-        String text,
-        int startIndex,
-        boolean terminateOnEndBraceOnly
-    ) {
+    public static String getPart(String text, int startIndex, boolean terminateOnEndBraceOnly) {
         char c;
         int count = 0;
 
@@ -84,21 +71,14 @@ public static String getPart(
 
         // advance to first char and skip whitespace
         int index = startIndex + 1;
-        while (
-            (index < text.length()) &&
-            Character.isWhitespace(text.charAt(index))
-        ) {
+        while ((index < text.length()) && Character.isWhitespace(text.charAt(index))) {
             index++;
         }
 
         // then grab whatever is the first token (counting braces)
         while (index < text.length()) {
             c = text.charAt(index);
-            if (
-                !terminateOnEndBraceOnly &&
-                (count == 0) &&
-                Character.isWhitespace(c)
-            ) {
+            if (!terminateOnEndBraceOnly && (count == 0) && Character.isWhitespace(c)) {
                 // end argument and leave whitespace for further processing
                 break;
             }
@@ -139,12 +119,7 @@ public static String shaveString(String toShave) {
      *
      * @param to        Excluding strings[to]
      */
-    public static String join(
-        String[] strings,
-        String separator,
-        int from,
-        int to
-    ) {
+    public static String join(String[] strings, String separator, int from, int to) {
         if ((strings.length == 0) || (from >= to)) {
             return "";
         }
@@ -173,10 +148,7 @@ public static String stripBrackets(String toStrip) {
      * extends the filename with a default Extension, if no Extension '.x' could
      * be found
      */
-    public static String getCorrectFileName(
-        String orgName,
-        String defaultExtension
-    ) {
+    public static String getCorrectFileName(String orgName, String defaultExtension) {
         if (orgName == null) {
             return "";
         }
@@ -226,9 +198,7 @@ public static String wrap(String in, int wrapAmount, String newline) {
                 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
-                String line = CharMatcher
-                    .whitespace()
-                    .trimTrailingFrom(lines[i]);
+                String line = CharMatcher.whitespace().trimTrailingFrom(lines[i]);
                 addWrappedLine(result, line, wrapAmount, newline);
             }
         }
@@ -349,9 +319,7 @@ public static String putBracesAroundCapitals(String s) {
                 inBrace++;
             } else if (c == '}') {
                 inBrace--;
-            } else if (
-                !escaped && (c == FieldWriter.BIBTEX_STRING_START_END_SYMBOL)
-            ) {
+            } else if (!escaped && (c == FieldWriter.BIBTEX_STRING_START_END_SYMBOL)) {
                 inString = !inString;
             }
 
@@ -368,11 +336,7 @@ public static String putBracesAroundCapitals(String s) {
             }
 
             // See if we should close a brace set:
-            if (
-                isBracing &&
-                !(Character.isLetter((char) c) &&
-                    Character.isUpperCase((char) c))
-            ) {
+            if (isBracing && !(Character.isLetter((char) c) && Character.isUpperCase((char) c))) {
                 buf.append('}');
                 isBracing = false;
             }
@@ -402,10 +366,7 @@ public static String putBracesAroundCapitals(String s) {
     public static String removeBracesAroundCapitals(String s) {
         String current = s;
         String previous = s;
-        while (
-            (current = removeSingleBracesAroundCapitals(current)).length() <
-            previous.length()
-        ) {
+        while ((current = removeSingleBracesAroundCapitals(current)).length() < previous.length()) {
             previous = current;
         }
         return current;
@@ -424,10 +385,7 @@ private static String removeSingleBracesAroundCapitals(String s) {
         StringBuilder buf = new StringBuilder();
         while (mcr.find()) {
             String replaceStr = mcr.group();
-            mcr.appendReplacement(
-                buf,
-                replaceStr.substring(1, replaceStr.length() - 1)
-            );
+            mcr.appendReplacement(buf, replaceStr.substring(1, replaceStr.length() - 1));
         }
         mcr.appendTail(buf);
         return buf.toString();
@@ -463,10 +421,7 @@ public static boolean isInCurlyBrackets(String toCheck) {
         if ((toCheck == null) || toCheck.isEmpty()) {
             return false;
         } else {
-            if (
-                (toCheck.charAt(0) == '{') &&
-                (toCheck.charAt(toCheck.length() - 1) == '}')
-            ) {
+            if ((toCheck.charAt(0) == '{') && (toCheck.charAt(toCheck.length() - 1) == '}')) {
                 for (char c : toCheck.toCharArray()) {
                     if (c == '{') {
                         if (brackets == 0) {
@@ -488,10 +443,7 @@ public static boolean isInSquareBrackets(String toCheck) {
         if ((toCheck == null) || toCheck.isEmpty()) {
             return false; // In case of null or empty string
         } else {
-            return (
-                (toCheck.charAt(0) == '[') &&
-                (toCheck.charAt(toCheck.length() - 1) == ']')
-            );
+            return ((toCheck.charAt(0) == '[') && (toCheck.charAt(toCheck.length() - 1) == ']'));
         }
     }
 
@@ -499,10 +451,7 @@ public static boolean isInCitationMarks(String toCheck) {
         if ((toCheck == null) || (toCheck.length() <= 1)) {
             return false; // In case of null, empty string, or a single citation mark
         } else {
-            return (
-                (toCheck.charAt(0) == '"') &&
-                (toCheck.charAt(toCheck.length() - 1) == '"')
-            );
+            return ((toCheck.charAt(0) == '"') && (toCheck.charAt(toCheck.length() - 1) == '"'));
         }
     }
 
@@ -659,15 +608,8 @@ public static String replaceSpecialCharacters(String s) {
          * Hence, if someone debugs issues in the `UNICODE_CHAR_MAP`, they will expect NFC.
          * A more holistic approach should likely start with the <a href="http://unicode.org/reports/tr15/#Compatibility_Equivalence_Figure">compatibility equivalence</a>. */
         String result = Normalizer.normalize(s, Normalizer.Form.NFC);
-        for (Map.Entry<
-            String,
-            String
-        > chrAndReplace : UNICODE_CHAR_MAP.entrySet()) {
-            result =
-                result.replace(
-                    chrAndReplace.getKey(),
-                    chrAndReplace.getValue()
-                );
+        for (Map.Entry<String, String> chrAndReplace : UNICODE_CHAR_MAP.entrySet()) {
+            result = result.replace(chrAndReplace.getKey(), chrAndReplace.getValue());
         }
         return result;
     }
@@ -818,18 +760,12 @@ public static boolean containsIgnoreCase(String text, String searchString) {
         return StringUtils.containsIgnoreCase(text, searchString);
     }
 
-    public static String substringBetween(
-        String str,
-        String open,
-        String close
-    ) {
+    public static String substringBetween(String str, String open, String close) {
         return StringUtils.substringBetween(str, open, close);
     }
 
     public static String ignoreCurlyBracket(String title) {
-        return isNotBlank(title)
-            ? title.replace("{", "").replace("}", "")
-            : title;
+        return isNotBlank(title) ? title.replace("{", "").replace("}", "") : title;
     }
 
     /**
@@ -859,10 +795,7 @@ public static boolean containsWhitespace(String s) {
     @ApacheCommonsLang3Allowed(
         "No Guava equivalent existing - see https://stackoverflow.com/a/23825984"
     )
-    public static String removeStringAtTheEnd(
-        String string,
-        String stringToBeRemoved
-    ) {
+    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 8d1522ce6c1..c90867a0d3c 100644
--- a/src/main/java/org/jabref/model/study/Study.java
+++ b/src/main/java/org/jabref/model/study/Study.java
@@ -14,9 +14,7 @@
  *
  * The file is parsed using by {@link StudyYamlParser}
  */
-@JsonPropertyOrder(
-    { "authors", "title", "research-questions", "queries", "databases" }
-)
+@JsonPropertyOrder({ "authors", "title", "research-questions", "queries", "databases" })
 // The user might add arbitrary content to the YAML
 @JsonIgnoreProperties(ignoreUnknown = true)
 public class Study {
diff --git a/src/main/java/org/jabref/model/study/StudyDatabase.java b/src/main/java/org/jabref/model/study/StudyDatabase.java
index 8a7fe68eada..4bccbf7fe30 100644
--- a/src/main/java/org/jabref/model/study/StudyDatabase.java
+++ b/src/main/java/org/jabref/model/study/StudyDatabase.java
@@ -51,9 +51,7 @@ public boolean equals(Object o) {
         if (isEnabled() != that.isEnabled()) {
             return false;
         }
-        return getName() != null
-            ? getName().equals(that.getName())
-            : that.getName() == null;
+        return getName() != null ? getName().equals(that.getName()) : that.getName() == null;
     }
 
     @Override
@@ -65,14 +63,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 d4801d6202a..e1e48a52b86 100644
--- a/src/main/java/org/jabref/model/study/StudyQuery.java
+++ b/src/main/java/org/jabref/model/study/StudyQuery.java
@@ -32,9 +32,7 @@ public boolean equals(Object o) {
 
         StudyQuery that = (StudyQuery) o;
 
-        return getQuery() != null
-            ? getQuery().equals(that.getQuery())
-            : that.getQuery() == null;
+        return getQuery() != null ? getQuery().equals(that.getQuery()) : that.getQuery() == null;
     }
 
     @Override
diff --git a/src/main/java/org/jabref/model/texparser/Citation.java b/src/main/java/org/jabref/model/texparser/Citation.java
index 9334434aa94..a4171940555 100644
--- a/src/main/java/org/jabref/model/texparser/Citation.java
+++ b/src/main/java/org/jabref/model/texparser/Citation.java
@@ -16,23 +16,13 @@ public class Citation {
     private final int colEnd;
     private final String lineText;
 
-    public Citation(
-        Path path,
-        int line,
-        int colStart,
-        int colEnd,
-        String lineText
-    ) {
+    public Citation(Path path, int line, int colStart, int colEnd, String lineText) {
         if (line <= 0) {
-            throw new IllegalArgumentException(
-                "Line has to be greater than 0."
-            );
+            throw new IllegalArgumentException("Line has to be greater than 0.");
         }
 
         if (colStart < 0 || colEnd > lineText.length()) {
-            throw new IllegalArgumentException(
-                "Citation has to be between 0 and line length."
-            );
+            throw new IllegalArgumentException("Citation has to be between 0 and line length.");
         }
 
         this.path = Objects.requireNonNull(path);
diff --git a/src/main/java/org/jabref/model/texparser/LatexBibEntriesResolverResult.java b/src/main/java/org/jabref/model/texparser/LatexBibEntriesResolverResult.java
index f56cbe0c5d2..2c7ce101f6e 100644
--- a/src/main/java/org/jabref/model/texparser/LatexBibEntriesResolverResult.java
+++ b/src/main/java/org/jabref/model/texparser/LatexBibEntriesResolverResult.java
@@ -62,8 +62,7 @@ public boolean equals(Object obj) {
             return false;
         }
 
-        LatexBibEntriesResolverResult that =
-            (LatexBibEntriesResolverResult) obj;
+        LatexBibEntriesResolverResult that = (LatexBibEntriesResolverResult) obj;
 
         return (
             Objects.equals(latexParserResult, that.latexParserResult) &&
diff --git a/src/main/java/org/jabref/model/texparser/LatexParserResult.java b/src/main/java/org/jabref/model/texparser/LatexParserResult.java
index 27921033d60..cb32edbcd06 100644
--- a/src/main/java/org/jabref/model/texparser/LatexParserResult.java
+++ b/src/main/java/org/jabref/model/texparser/LatexParserResult.java
@@ -61,10 +61,7 @@ public Collection<Citation> getCitationsByKey(String key) {
      * Return a collection of citations using a BibEntry as reference.
      */
     public Collection<Citation> getCitationsByKey(BibEntry entry) {
-        return entry
-            .getCitationKey()
-            .map(this::getCitationsByKey)
-            .orElse(Collections.emptyList());
+        return entry.getCitationKey().map(this::getCitationsByKey).orElse(Collections.emptyList());
     }
 
     /**
@@ -88,14 +85,7 @@ public void addBibFile(Path file, Path bibFile) {
     /**
      * Add a citation to the citations multimap.
      */
-    public void addKey(
-        String key,
-        Path file,
-        int lineNumber,
-        int start,
-        int end,
-        String line
-    ) {
+    public void addKey(String key, Path file, int lineNumber, int start, int end, String line) {
         Citation citation = new Citation(file, lineNumber, start, end, line);
         citations.put(key, citation);
     }
diff --git a/src/main/java/org/jabref/model/util/FileUpdateMonitor.java b/src/main/java/org/jabref/model/util/FileUpdateMonitor.java
index f895ec5eee8..9575bf3a8d5 100644
--- a/src/main/java/org/jabref/model/util/FileUpdateMonitor.java
+++ b/src/main/java/org/jabref/model/util/FileUpdateMonitor.java
@@ -10,8 +10,7 @@ public interface FileUpdateMonitor {
      * @param file The file to monitor.
      * @throws IOException if the file does not exist.
      */
-    void addListenerForFile(Path file, FileUpdateListener listener)
-        throws IOException;
+    void addListenerForFile(Path file, FileUpdateListener listener) throws IOException;
 
     /**
      * Removes a listener from the monitor.
diff --git a/src/main/java/org/jabref/model/util/ListUtil.java b/src/main/java/org/jabref/model/util/ListUtil.java
index 38d15538dde..9f9589b05ab 100644
--- a/src/main/java/org/jabref/model/util/ListUtil.java
+++ b/src/main/java/org/jabref/model/util/ListUtil.java
@@ -10,10 +10,7 @@ public class ListUtil {
     /**
      * Equivalent to list.stream().anyMatch but with slightly better performance (especially for small lists).
      */
-    public static <T> boolean anyMatch(
-        Iterable<T> list,
-        Predicate<T> predicate
-    ) {
+    public static <T> boolean anyMatch(Iterable<T> list, Predicate<T> predicate) {
         for (T element : list) {
             if (predicate.test(element)) {
                 return true;
@@ -25,10 +22,7 @@ public static <T> boolean anyMatch(
     /**
      * Equivalent to list.stream().allMatch but with slightly better performance (especially for small lists).
      */
-    public static <T> boolean allMatch(
-        Iterable<T> list,
-        Predicate<T> predicate
-    ) {
+    public static <T> boolean allMatch(Iterable<T> list, Predicate<T> predicate) {
         for (T element : list) {
             if (!predicate.test(element)) {
                 return false;
diff --git a/src/main/java/org/jabref/model/util/OptionalUtil.java b/src/main/java/org/jabref/model/util/OptionalUtil.java
index 156de9abaab..cd4202a1c28 100644
--- a/src/main/java/org/jabref/model/util/OptionalUtil.java
+++ b/src/main/java/org/jabref/model/util/OptionalUtil.java
@@ -58,15 +58,10 @@ 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());
+        return value.stream().flatMap(element -> mapper.apply(element).stream());
     }
 
-    public static <T> Boolean isPresentAnd(
-        Optional<T> value,
-        Predicate<T> check
-    ) {
+    public static <T> Boolean isPresentAnd(Optional<T> value, Predicate<T> check) {
         return value.isPresent() && check.test(value.get());
     }
 
@@ -80,9 +75,7 @@ public static <T, S, R> Optional<R> combine(
         BiFunction<T, S, R> combine
     ) {
         if (valueOne.isPresent() && valueTwo.isPresent()) {
-            return Optional.ofNullable(
-                combine.apply(valueOne.get(), valueTwo.get())
-            );
+            return Optional.ofNullable(combine.apply(valueOne.get(), valueTwo.get()));
         } else {
             return Optional.empty();
         }
diff --git a/src/main/java/org/jabref/model/util/TreeCollector.java b/src/main/java/org/jabref/model/util/TreeCollector.java
index f2e6d4ea323..3288b673808 100644
--- a/src/main/java/org/jabref/model/util/TreeCollector.java
+++ b/src/main/java/org/jabref/model/util/TreeCollector.java
@@ -20,8 +20,7 @@
  * Nodes with a common parent are added as direct children.
  * For example, the list { A > A1, A > A2, B } is transformed into the forest { A > A1, A2, B}.
  */
-public class TreeCollector<T>
-    implements Collector<T, ObservableList<T>, ObservableList<T>> {
+public class TreeCollector<T> implements Collector<T, ObservableList<T>, ObservableList<T>> {
 
     private Function<T, List<T>> getChildren;
     private BiConsumer<T, T> addChild;
@@ -108,9 +107,6 @@ public Function<ObservableList<T>, ObservableList<T>> finisher() {
 
     @Override
     public Set<Characteristics> characteristics() {
-        return EnumSet.of(
-            Characteristics.UNORDERED,
-            Characteristics.IDENTITY_FINISH
-        );
+        return EnumSet.of(Characteristics.UNORDERED, Characteristics.IDENTITY_FINISH);
     }
 }
diff --git a/src/main/java/org/jabref/preferences/CleanupPreferences.java b/src/main/java/org/jabref/preferences/CleanupPreferences.java
index 5fb7547aa6c..7843336784b 100644
--- a/src/main/java/org/jabref/preferences/CleanupPreferences.java
+++ b/src/main/java/org/jabref/preferences/CleanupPreferences.java
@@ -31,8 +31,7 @@ public CleanupPreferences(
         FieldFormatterCleanups formatterCleanups
     ) {
         this.activeJobs = FXCollections.observableSet(activeJobs);
-        this.fieldFormatterCleanups =
-            new SimpleObjectProperty<>(formatterCleanups);
+        this.fieldFormatterCleanups = new SimpleObjectProperty<>(formatterCleanups);
     }
 
     public EnumSet<CleanupStep> getActiveJobs() {
@@ -68,15 +67,11 @@ public FieldFormatterCleanups getFieldFormatterCleanups() {
         return fieldFormatterCleanups.get();
     }
 
-    protected ObjectProperty<
-        FieldFormatterCleanups
-    > fieldFormatterCleanupsProperty() {
+    protected ObjectProperty<FieldFormatterCleanups> fieldFormatterCleanupsProperty() {
         return fieldFormatterCleanups;
     }
 
-    public void setFieldFormatterCleanups(
-        FieldFormatterCleanups fieldFormatters
-    ) {
+    public void setFieldFormatterCleanups(FieldFormatterCleanups fieldFormatters) {
         fieldFormatterCleanups.setValue(fieldFormatters);
     }
 
diff --git a/src/main/java/org/jabref/preferences/ExportPreferences.java b/src/main/java/org/jabref/preferences/ExportPreferences.java
index 20bd576852f..43a15d3d3dd 100644
--- a/src/main/java/org/jabref/preferences/ExportPreferences.java
+++ b/src/main/java/org/jabref/preferences/ExportPreferences.java
@@ -24,10 +24,8 @@ public ExportPreferences(
         SaveOrder exportSaveOrder,
         List<TemplateExporter> customExporters
     ) {
-        this.lastExportExtension =
-            new SimpleStringProperty(lastExportExtension);
-        this.exportWorkingDirectory =
-            new SimpleObjectProperty<>(exportWorkingDirectory);
+        this.lastExportExtension = new SimpleStringProperty(lastExportExtension);
+        this.exportWorkingDirectory = new SimpleObjectProperty<>(exportWorkingDirectory);
         this.exportSaveOrder = new SimpleObjectProperty<>(exportSaveOrder);
         this.customExporters = FXCollections.observableList(customExporters);
     }
diff --git a/src/main/java/org/jabref/preferences/ExternalApplicationsPreferences.java b/src/main/java/org/jabref/preferences/ExternalApplicationsPreferences.java
index f0d879054fc..81cba14d399 100644
--- a/src/main/java/org/jabref/preferences/ExternalApplicationsPreferences.java
+++ b/src/main/java/org/jabref/preferences/ExternalApplicationsPreferences.java
@@ -36,12 +36,9 @@ public ExternalApplicationsPreferences(
         this.citeCommand = new SimpleStringProperty(citeCommand);
         this.defaultCiteCommand = new SimpleStringProperty(defaultCiteCommand);
         this.useCustomTerminal = new SimpleBooleanProperty(useCustomTerminal);
-        this.customTerminalCommand =
-            new SimpleStringProperty(customTerminalCommand);
-        this.useCustomFileBrowser =
-            new SimpleBooleanProperty(useCustomFileBrowser);
-        this.customFileBrowserCommand =
-            new SimpleStringProperty(customFileBrowserCommand);
+        this.customTerminalCommand = new SimpleStringProperty(customTerminalCommand);
+        this.useCustomFileBrowser = new SimpleBooleanProperty(useCustomFileBrowser);
+        this.customFileBrowserCommand = new SimpleStringProperty(customFileBrowserCommand);
         this.kindleEmail = new SimpleStringProperty(kindleEmail);
     }
 
@@ -65,12 +62,8 @@ public BooleanProperty autoOpenEmailAttachmentsFolderProperty() {
         return shouldAutoOpenEmailAttachmentsFolder;
     }
 
-    public void setAutoOpenEmailAttachmentsFolder(
-        boolean shouldAutoOpenEmailAttachmentsFolder
-    ) {
-        this.shouldAutoOpenEmailAttachmentsFolder.set(
-                shouldAutoOpenEmailAttachmentsFolder
-            );
+    public void setAutoOpenEmailAttachmentsFolder(boolean shouldAutoOpenEmailAttachmentsFolder) {
+        this.shouldAutoOpenEmailAttachmentsFolder.set(shouldAutoOpenEmailAttachmentsFolder);
     }
 
     public String getCiteCommand() {
diff --git a/src/main/java/org/jabref/preferences/FilePreferences.java b/src/main/java/org/jabref/preferences/FilePreferences.java
index 6a2b626032f..2ad6d2a1413 100644
--- a/src/main/java/org/jabref/preferences/FilePreferences.java
+++ b/src/main/java/org/jabref/preferences/FilePreferences.java
@@ -27,26 +27,18 @@ public class FilePreferences {
     };
 
     private final StringProperty userAndHost = new SimpleStringProperty();
-    private final SimpleStringProperty mainFileDirectory =
-        new SimpleStringProperty();
-    private final BooleanProperty storeFilesRelativeToBibFile =
-        new SimpleBooleanProperty();
+    private final SimpleStringProperty mainFileDirectory = new SimpleStringProperty();
+    private final BooleanProperty storeFilesRelativeToBibFile = new SimpleBooleanProperty();
     private final StringProperty fileNamePattern = new SimpleStringProperty();
-    private final StringProperty fileDirectoryPattern =
-        new SimpleStringProperty();
-    private final BooleanProperty downloadLinkedFiles =
-        new SimpleBooleanProperty();
-    private final BooleanProperty fulltextIndexLinkedFiles =
-        new SimpleBooleanProperty();
-    private final ObjectProperty<Path> workingDirectory =
-        new SimpleObjectProperty<>();
-    private final ObservableSet<ExternalFileType> externalFileTypes =
-        FXCollections.observableSet(
-            new TreeSet<>(Comparator.comparing(ExternalFileType::getName))
-        );
+    private final StringProperty fileDirectoryPattern = new SimpleStringProperty();
+    private final BooleanProperty downloadLinkedFiles = new SimpleBooleanProperty();
+    private final BooleanProperty fulltextIndexLinkedFiles = new SimpleBooleanProperty();
+    private final ObjectProperty<Path> workingDirectory = new SimpleObjectProperty<>();
+    private final ObservableSet<ExternalFileType> externalFileTypes = FXCollections.observableSet(
+        new TreeSet<>(Comparator.comparing(ExternalFileType::getName))
+    );
     private final BooleanProperty createBackup = new SimpleBooleanProperty();
-    private final ObjectProperty<Path> backupDirectory =
-        new SimpleObjectProperty<>();
+    private final ObjectProperty<Path> backupDirectory = new SimpleObjectProperty<>();
 
     public FilePreferences(
         String userAndHost,
@@ -102,9 +94,7 @@ public BooleanProperty storeFilesRelativeToBibFileProperty() {
         return storeFilesRelativeToBibFile;
     }
 
-    public void setStoreFilesRelativeToBibFile(
-        boolean shouldStoreFilesRelativeToBibFile
-    ) {
+    public void setStoreFilesRelativeToBibFile(boolean shouldStoreFilesRelativeToBibFile) {
         this.storeFilesRelativeToBibFile.set(shouldStoreFilesRelativeToBibFile);
     }
 
@@ -152,9 +142,7 @@ public BooleanProperty fulltextIndexLinkedFilesProperty() {
         return fulltextIndexLinkedFiles;
     }
 
-    public void setFulltextIndexLinkedFiles(
-        boolean shouldFulltextIndexLinkedFiles
-    ) {
+    public void setFulltextIndexLinkedFiles(boolean shouldFulltextIndexLinkedFiles) {
         this.fulltextIndexLinkedFiles.set(shouldFulltextIndexLinkedFiles);
     }
 
diff --git a/src/main/java/org/jabref/preferences/GuiPreferences.java b/src/main/java/org/jabref/preferences/GuiPreferences.java
index 01cf4e010f3..f93dd5f0722 100644
--- a/src/main/java/org/jabref/preferences/GuiPreferences.java
+++ b/src/main/java/org/jabref/preferences/GuiPreferences.java
@@ -63,23 +63,17 @@ public GuiPreferences(
         this.sizeY = new SimpleDoubleProperty(sizeY);
         this.windowMaximised = new SimpleBooleanProperty(windowMaximised);
         this.windowFullScreen = new SimpleBooleanProperty(windowFullScreen);
-        this.lastFilesOpened =
-            FXCollections.observableArrayList(lastFilesOpened);
+        this.lastFilesOpened = FXCollections.observableArrayList(lastFilesOpened);
         this.lastFocusedFile = new SimpleObjectProperty<>(lastFocusedFile);
-        this.lastSelectedIdBasedFetcher =
-            new SimpleStringProperty(lastSelectedIdBasedFetcher);
+        this.lastSelectedIdBasedFetcher = new SimpleStringProperty(lastSelectedIdBasedFetcher);
         this.mergeDiffMode = new SimpleObjectProperty<>(mergeDiffMode);
-        this.mergeShouldShowDiff =
-            new SimpleBooleanProperty(mergeShouldShowDiff);
-        this.mergeShouldShowUnifiedDiff =
-            new SimpleBooleanProperty(mergeShouldShowUnifiedDiff);
-        this.mergeHighlightWords =
-            new SimpleBooleanProperty(mergeHighlightWords);
+        this.mergeShouldShowDiff = new SimpleBooleanProperty(mergeShouldShowDiff);
+        this.mergeShouldShowUnifiedDiff = new SimpleBooleanProperty(mergeShouldShowUnifiedDiff);
+        this.mergeHighlightWords = new SimpleBooleanProperty(mergeHighlightWords);
 
         this.sidePaneWidth = new SimpleDoubleProperty(sidePaneWidth);
         this.fileHistory = fileHistory;
-        this.mergeShowChangedFieldsOnly =
-            new SimpleBooleanProperty(mergeShowChangedFieldsOnly);
+        this.mergeShowChangedFieldsOnly = new SimpleBooleanProperty(mergeShowChangedFieldsOnly);
     }
 
     public double getPositionX() {
@@ -186,9 +180,7 @@ public StringProperty lastSelectedIdBasedFetcherProperty() {
         return lastSelectedIdBasedFetcher;
     }
 
-    public void setLastSelectedIdBasedFetcher(
-        String lastSelectedIdBasedFetcher
-    ) {
+    public void setLastSelectedIdBasedFetcher(String lastSelectedIdBasedFetcher) {
         this.lastSelectedIdBasedFetcher.set(lastSelectedIdBasedFetcher);
     }
 
@@ -224,9 +216,7 @@ public BooleanProperty mergeShouldShowUnifiedDiffProperty() {
         return mergeShouldShowUnifiedDiff;
     }
 
-    public void setMergeShouldShowUnifiedDiff(
-        boolean mergeShouldShowUnifiedDiff
-    ) {
+    public void setMergeShouldShowUnifiedDiff(boolean mergeShouldShowUnifiedDiff) {
         this.mergeShouldShowUnifiedDiff.set(mergeShouldShowUnifiedDiff);
     }
 
diff --git a/src/main/java/org/jabref/preferences/JabRefPreferences.java b/src/main/java/org/jabref/preferences/JabRefPreferences.java
index 51c002b2ce6..53a3311e486 100644
--- a/src/main/java/org/jabref/preferences/JabRefPreferences.java
+++ b/src/main/java/org/jabref/preferences/JabRefPreferences.java
@@ -141,8 +141,7 @@ public class JabRefPreferences implements PreferencesService {
 
     // Push to application preferences
     public static final String PUSH_EMACS_PATH = "emacsPath";
-    public static final String PUSH_EMACS_ADDITIONAL_PARAMETERS =
-        "emacsParameters";
+    public static final String PUSH_EMACS_ADDITIONAL_PARAMETERS = "emacsParameters";
     public static final String PUSH_LYXPIPE = "lyxpipe";
     public static final String PUSH_TEXSTUDIO_PATH = "TeXstudioPath";
     public static final String PUSH_WINEDT_PATH = "winEdtPath";
@@ -169,22 +168,16 @@ public class JabRefPreferences implements PreferencesService {
     public static final String WINDOW_MAXIMISED = "windowMaximised";
     public static final String WINDOW_FULLSCREEN = "windowFullscreen";
 
-    public static final String REFORMAT_FILE_ON_SAVE_AND_EXPORT =
-        "reformatFileOnSaveAndExport";
-    public static final String EXPORT_IN_ORIGINAL_ORDER =
-        "exportInOriginalOrder";
-    public static final String EXPORT_IN_SPECIFIED_ORDER =
-        "exportInSpecifiedOrder";
+    public static final String REFORMAT_FILE_ON_SAVE_AND_EXPORT = "reformatFileOnSaveAndExport";
+    public static final String EXPORT_IN_ORIGINAL_ORDER = "exportInOriginalOrder";
+    public static final String EXPORT_IN_SPECIFIED_ORDER = "exportInSpecifiedOrder";
 
     public static final String EXPORT_PRIMARY_SORT_FIELD = "exportPriSort";
-    public static final String EXPORT_PRIMARY_SORT_DESCENDING =
-        "exportPriDescending";
+    public static final String EXPORT_PRIMARY_SORT_DESCENDING = "exportPriDescending";
     public static final String EXPORT_SECONDARY_SORT_FIELD = "exportSecSort";
-    public static final String EXPORT_SECONDARY_SORT_DESCENDING =
-        "exportSecDescending";
+    public static final String EXPORT_SECONDARY_SORT_DESCENDING = "exportSecDescending";
     public static final String EXPORT_TERTIARY_SORT_FIELD = "exportTerSort";
-    public static final String EXPORT_TERTIARY_SORT_DESCENDING =
-        "exportTerDescending";
+    public static final String EXPORT_TERTIARY_SORT_DESCENDING = "exportTerDescending";
     public static final String NEWLINE = "newline";
 
     // Variable names have changed to ensure backward compatibility with pre 5.0 releases of JabRef
@@ -194,17 +187,13 @@ public class JabRefPreferences implements PreferencesService {
     public static final String COLUMN_SORT_TYPES = "mainTableColumnSortTypes";
     public static final String COLUMN_SORT_ORDER = "mainTableColumnSortOrder";
 
-    public static final String SEARCH_DIALOG_COLUMN_WIDTHS =
-        "searchTableColumnWidths";
-    public static final String SEARCH_DIALOG_COLUMN_SORT_TYPES =
-        "searchDialogColumnSortTypes";
-    public static final String SEARCH_DIALOG_COLUMN_SORT_ORDER =
-        "searchDalogColumnSortOrder";
+    public static final String SEARCH_DIALOG_COLUMN_WIDTHS = "searchTableColumnWidths";
+    public static final String SEARCH_DIALOG_COLUMN_SORT_TYPES = "searchDialogColumnSortTypes";
+    public static final String SEARCH_DIALOG_COLUMN_SORT_ORDER = "searchDalogColumnSortOrder";
 
     public static final String SIDE_PANE_COMPONENT_PREFERRED_POSITIONS =
         "sidePaneComponentPreferredPositions";
-    public static final String SIDE_PANE_COMPONENT_NAMES =
-        "sidePaneComponentNames";
+    public static final String SIDE_PANE_COMPONENT_NAMES = "sidePaneComponentNames";
     public static final String XMP_PRIVACY_FILTERS = "xmpPrivacyFilters";
     public static final String USE_XMP_PRIVACY_FILTER = "useXmpPrivacyFilter";
     public static final String DEFAULT_SHOW_SOURCE = "defaultShowSource";
@@ -218,11 +207,9 @@ public class JabRefPreferences implements PreferencesService {
     public static final String OPEN_LAST_EDITED = "openLastEdited";
     public static final String LAST_FOCUSED = "lastFocused";
     public static final String AUTO_OPEN_FORM = "autoOpenForm";
-    public static final String IMPORT_WORKING_DIRECTORY =
-        "importWorkingDirectory";
+    public static final String IMPORT_WORKING_DIRECTORY = "importWorkingDirectory";
     public static final String LAST_USED_EXPORT = "lastUsedExport";
-    public static final String EXPORT_WORKING_DIRECTORY =
-        "exportWorkingDirectory";
+    public static final String EXPORT_WORKING_DIRECTORY = "exportWorkingDirectory";
     public static final String WORKING_DIRECTORY = "workingDirectory";
     public static final String BACKUP_DIRECTORY = "backupDirectory";
     public static final String CREATE_BACKUP = "createBackup";
@@ -231,8 +218,7 @@ public class JabRefPreferences implements PreferencesService {
     public static final String AUTO_ASSIGN_GROUP = "autoAssignGroup";
     public static final String DISPLAY_GROUP_COUNT = "displayGroupCount";
     public static final String EXTRA_FILE_COLUMNS = "extraFileColumns";
-    public static final String OVERRIDE_DEFAULT_FONT_SIZE =
-        "overrideDefaultFontSize";
+    public static final String OVERRIDE_DEFAULT_FONT_SIZE = "overrideDefaultFontSize";
     public static final String MAIN_FONT_SIZE = "mainFontSize";
 
     public static final String RECENT_DATABASES = "recentDatabases";
@@ -258,30 +244,24 @@ public class JabRefPreferences implements PreferencesService {
     public static final String WARN_ABOUT_DUPLICATES_IN_INSPECTION =
         "warnAboutDuplicatesInInspection";
     public static final String NON_WRAPPABLE_FIELDS = "nonWrappableFields";
-    public static final String RESOLVE_STRINGS_FOR_FIELDS =
-        "resolveStringsForFields";
+    public static final String RESOLVE_STRINGS_FOR_FIELDS = "resolveStringsForFields";
     public static final String DO_NOT_RESOLVE_STRINGS = "doNotResolveStrings";
 
     // 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_DIFF = "mergeEntriesShouldShowDiff";
     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_ENTRIES_HIGHLIGHT_WORDS = "mergeEntriesHighlightWords";
 
-    public static final String MERGE_SHOW_ONLY_CHANGED_FIELDS =
-        "mergeShowOnlyChangedFields";
+    public static final String MERGE_SHOW_ONLY_CHANGED_FIELDS = "mergeShowOnlyChangedFields";
 
     public static final String CUSTOM_EXPORT_FORMAT = "customExportFormat";
     public static final String CUSTOM_IMPORT_FORMAT = "customImportFormat";
     public static final String KEY_PATTERN_REGEX = "KeyPatternRegex";
-    public static final String KEY_PATTERN_REPLACEMENT =
-        "KeyPatternReplacement";
+    public static final String KEY_PATTERN_REPLACEMENT = "KeyPatternReplacement";
     public static final String CONSOLE_COMMAND = "consoleCommand";
-    public static final String USE_DEFAULT_CONSOLE_APPLICATION =
-        "useDefaultConsoleApplication";
+    public static final String USE_DEFAULT_CONSOLE_APPLICATION = "useDefaultConsoleApplication";
     public static final String USE_DEFAULT_FILE_BROWSER_APPLICATION =
         "userDefaultFileBrowserApplication";
     public static final String FILE_BROWSER_COMMAND = "fileBrowserCommand";
@@ -304,13 +284,11 @@ public class JabRefPreferences implements PreferencesService {
 
     public static final String JOURNAL_POPUP = "journalPopup";
 
-    public static final String DEFAULT_CITATION_KEY_PATTERN =
-        "defaultBibtexKeyPattern";
+    public static final String DEFAULT_CITATION_KEY_PATTERN = "defaultBibtexKeyPattern";
     public static final String UNWANTED_CITATION_KEY_CHARACTERS =
         "defaultUnwantedBibtexKeyCharacters";
     public static final String CONFIRM_DELETE = "confirmDelete";
-    public static final String WARN_BEFORE_OVERWRITING_KEY =
-        "warnBeforeOverwritingKey";
+    public static final String WARN_BEFORE_OVERWRITING_KEY = "warnBeforeOverwritingKey";
     public static final String AVOID_OVERWRITING_KEY = "avoidOverwritingKey";
     public static final String AUTOLINK_EXACT_KEY_ONLY = "autolinkExactKeyOnly";
     public static final String AUTOLINK_FILES_ENABLED = "autoLinkFilesEnabled";
@@ -318,22 +296,16 @@ public class JabRefPreferences implements PreferencesService {
 
     public static final String CITE_COMMAND = "citeCommand";
 
-    public static final String GENERATE_KEYS_BEFORE_SAVING =
-        "generateKeysBeforeSaving";
+    public static final String GENERATE_KEYS_BEFORE_SAVING = "generateKeysBeforeSaving";
     public static final String EMAIL_SUBJECT = "emailSubject";
     public static final String KINDLE_EMAIL = "kindleEmail";
-    public static final String OPEN_FOLDERS_OF_ATTACHED_FILES =
-        "openFoldersOfAttachedFiles";
-    public static final String KEY_GEN_ALWAYS_ADD_LETTER =
-        "keyGenAlwaysAddLetter";
+    public static final String OPEN_FOLDERS_OF_ATTACHED_FILES = "openFoldersOfAttachedFiles";
+    public static final String KEY_GEN_ALWAYS_ADD_LETTER = "keyGenAlwaysAddLetter";
     public static final String KEY_GEN_FIRST_LETTER_A = "keyGenFirstLetterA";
-    public static final String ALLOW_INTEGER_EDITION_BIBTEX =
-        "allowIntegerEditionBibtex";
+    public static final String ALLOW_INTEGER_EDITION_BIBTEX = "allowIntegerEditionBibtex";
     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";
+    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
     public static final String STORE_RELATIVE_TO_BIB = "bibLocAsPrimaryDir";
     public static final String SELECTED_FETCHER_INDEX = "selectedFetcherIndex";
@@ -341,11 +313,9 @@ public class JabRefPreferences implements PreferencesService {
     public static final String GROUP_SIDEPANE_VISIBLE = "groupSidepaneVisible";
     public static final String CUSTOM_TAB_NAME = "customTabName_";
     public static final String CUSTOM_TAB_FIELDS = "customTabFields_";
-    public static final String ASK_AUTO_NAMING_PDFS_AGAIN =
-        "AskAutoNamingPDFsAgain";
+    public static final String ASK_AUTO_NAMING_PDFS_AGAIN = "AskAutoNamingPDFsAgain";
     public static final String CLEANUP_JOBS = "CleanUpJobs";
-    public static final String CLEANUP_FIELD_FORMATTERS_ENABLED =
-        "CleanUpFormattersEnabled";
+    public static final String CLEANUP_FIELD_FORMATTERS_ENABLED = "CleanUpFormattersEnabled";
     public static final String CLEANUP_FIELD_FORMATTERS = "CleanUpFormatters";
     public static final String IMPORT_FILENAMEPATTERN = "importFileNamePattern";
     public static final String IMPORT_FILEDIRPATTERN = "importFileDirPattern";
@@ -358,8 +328,7 @@ public class JabRefPreferences implements PreferencesService {
     public static final String SEND_LANGUAGE_DATA = "sendLanguageData";
     public static final String SEND_OS_DATA = "sendOSData";
     public static final String SEND_TIMEZONE_DATA = "sendTimezoneData";
-    public static final String VALIDATE_IN_ENTRY_EDITOR =
-        "validateInEntryEditor";
+    public static final String VALIDATE_IN_ENTRY_EDITOR = "validateInEntryEditor";
     public static final String SHOW_SCITE_TAB = "showSciteTab";
 
     /**
@@ -369,8 +338,7 @@ public class JabRefPreferences implements PreferencesService {
     public static final String OO_SHOW_PANEL = "showOOPanel";
     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";
+    public static final String OO_BIBLIOGRAPHY_STYLE_FILE = "ooBibliographyStyleFile";
     public static final String OO_EXTERNAL_STYLE_FILES = "ooExternalStyleFiles";
 
     // Special field preferences
@@ -379,10 +347,8 @@ public class JabRefPreferences implements PreferencesService {
     // Prefs node for CitationKeyPatterns
     public static final String CITATION_KEY_PATTERNS_NODE = "bibtexkeypatterns";
     // Prefs node for customized entry types
-    public static final String CUSTOMIZED_BIBTEX_TYPES =
-        "customizedBibtexTypes";
-    public static final String CUSTOMIZED_BIBLATEX_TYPES =
-        "customizedBiblatexTypes";
+    public static final String CUSTOMIZED_BIBTEX_TYPES = "customizedBibtexTypes";
+    public static final String CUSTOMIZED_BIBLATEX_TYPES = "customizedBiblatexTypes";
     // Version
     public static final String VERSION_IGNORED_UPDATE = "versionIgnoreUpdate";
     public static final String VERSION_CHECK_ENABLED = "versionCheck";
@@ -390,8 +356,7 @@ public class JabRefPreferences implements PreferencesService {
     public static final String BINDINGS = "bindings";
 
     // AutcompleteFields - public because needed for pref migration
-    public static final String AUTOCOMPLETER_COMPLETE_FIELDS =
-        "autoCompleteFields";
+    public static final String AUTOCOMPLETER_COMPLETE_FIELDS = "autoCompleteFields";
 
     // Id Entry Generator Preferences
     public static final String ID_ENTRY_GENERATOR = "idEntryGenerator";
@@ -412,27 +377,22 @@ public class JabRefPreferences implements PreferencesService {
     private static final String PROXY_PORT = "proxyPort";
     private static final String PROXY_HOSTNAME = "proxyHostname";
     private static final String PROXY_USE = "useProxy";
-    private static final String PROXY_USE_AUTHENTICATION =
-        "useProxyAuthentication";
+    private static final String PROXY_USE_AUTHENTICATION = "useProxyAuthentication";
     private static final String PROXY_USERNAME = "proxyUsername";
     private static final String PROXY_PASSWORD = "proxyPassword";
     private static final String PROXY_PERSIST_PASSWORD = "persistPassword";
 
     // Web search
-    private static final String FETCHER_CUSTOM_KEY_NAMES =
-        "fetcherCustomKeyNames";
-    private static final String FETCHER_CUSTOM_KEY_USES =
-        "fetcherCustomKeyUses";
-    private static final String FETCHER_CUSTOM_KEY_PERSIST =
-        "fetcherCustomKeyPersist";
+    private static final String FETCHER_CUSTOM_KEY_NAMES = "fetcherCustomKeyNames";
+    private static final String FETCHER_CUSTOM_KEY_USES = "fetcherCustomKeyUses";
+    private static final String FETCHER_CUSTOM_KEY_PERSIST = "fetcherCustomKeyPersist";
 
     // SSL
     private static final String TRUSTSTORE_PATH = "truststorePath";
 
     // Auto completion
     private static final String AUTO_COMPLETE = "autoComplete";
-    private static final String AUTOCOMPLETER_FIRSTNAME_MODE =
-        "autoCompFirstNameMode";
+    private static final String AUTOCOMPLETER_FIRSTNAME_MODE = "autoCompFirstNameMode";
     private static final String AUTOCOMPLETER_LAST_FIRST = "autoCompLF";
     private static final String AUTOCOMPLETER_FIRST_LAST = "autoCompFF";
 
@@ -446,28 +406,22 @@ public class JabRefPreferences implements PreferencesService {
 
     // Telemetry collection
     private static final String COLLECT_TELEMETRY = "collectTelemetry";
-    private static final String ALREADY_ASKED_TO_COLLECT_TELEMETRY =
-        "askedCollectTelemetry";
-    private static final String PROTECTED_TERMS_ENABLED_EXTERNAL =
-        "protectedTermsEnabledExternal";
+    private static final String ALREADY_ASKED_TO_COLLECT_TELEMETRY = "askedCollectTelemetry";
+    private static final String PROTECTED_TERMS_ENABLED_EXTERNAL = "protectedTermsEnabledExternal";
     private static final String PROTECTED_TERMS_DISABLED_EXTERNAL =
         "protectedTermsDisabledExternal";
-    private static final String PROTECTED_TERMS_ENABLED_INTERNAL =
-        "protectedTermsEnabledInternal";
+    private static final String PROTECTED_TERMS_ENABLED_INTERNAL = "protectedTermsEnabledInternal";
     private static final String PROTECTED_TERMS_DISABLED_INTERNAL =
         "protectedTermsDisabledInternal";
 
     // GroupViewMode
-    private static final String GROUP_INTERSECT_UNION_VIEW_MODE =
-        "groupIntersectUnionViewModes";
-    private static final String DEFAULT_HIERARCHICAL_CONTEXT =
-        "defaultHierarchicalContext";
+    private static final String GROUP_INTERSECT_UNION_VIEW_MODE = "groupIntersectUnionViewModes";
+    private static final String DEFAULT_HIERARCHICAL_CONTEXT = "defaultHierarchicalContext";
 
     // Dialog states
     private static final String PREFS_EXPORT_PATH = "prefsExportPath";
     private static final String DOWNLOAD_LINKED_FILES = "downloadLinkedFiles";
-    private static final String FULLTEXT_INDEX_LINKED_FILES =
-        "fulltextIndexLinkedFiles";
+    private static final String FULLTEXT_INDEX_LINKED_FILES = "fulltextIndexLinkedFiles";
 
     // Helper string
     private static final String USER_HOME = System.getProperty("user.home");
@@ -481,12 +435,8 @@ public class JabRefPreferences implements PreferencesService {
     private static final String USE_REMOTE_SERVER = "useRemoteServer";
     private static final String REMOTE_SERVER_PORT = "remoteServerPort";
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(
-        JabRefPreferences.class
-    );
-    private static final Preferences PREFS_NODE = Preferences
-        .userRoot()
-        .node("/org/jabref");
+    private static final Logger LOGGER = LoggerFactory.getLogger(JabRefPreferences.class);
+    private static final Preferences PREFS_NODE = Preferences.userRoot().node("/org/jabref");
 
     // The only instance of this class:
     private static JabRefPreferences singleton;
@@ -549,11 +499,7 @@ private JabRefPreferences() {
                 importPreferences(Path.of("jabref.xml"));
             }
         } catch (JabRefException e) {
-            LOGGER.warn(
-                "Could not import preferences from jabref.xml: " +
-                e.getMessage(),
-                e
-            );
+            LOGGER.warn("Could not import preferences from jabref.xml: " + e.getMessage(), e);
         }
 
         // load user preferences
@@ -601,9 +547,7 @@ private JabRefPreferences() {
         );
         defaults.put(
             PUSH_WINEDT_PATH,
-            OS
-                .getNativeDesktop()
-                .detectProgramPath("WinEdt", "WinEdt Team\\WinEdt")
+            OS.getNativeDesktop().detectProgramPath("WinEdt", "WinEdt Team\\WinEdt")
         );
         defaults.put(
             PUSH_TEXSTUDIO_PATH,
@@ -656,11 +600,7 @@ private JabRefPreferences() {
         // SSL
         defaults.put(
             TRUSTSTORE_PATH,
-            OS
-                .getNativeDesktop()
-                .getSslDirectory()
-                .resolve("truststore.jks")
-                .toString()
+            OS.getNativeDesktop().getSslDirectory().resolve("truststore.jks").toString()
         );
 
         defaults.put(POS_X, 0);
@@ -686,15 +626,9 @@ private JabRefPreferences() {
         defaults.put(EXPORT_IN_SPECIFIED_ORDER, Boolean.FALSE);
 
         // export order: if EXPORT_IN_SPECIFIED_ORDER, then use following criteria
-        defaults.put(
-            EXPORT_PRIMARY_SORT_FIELD,
-            InternalField.KEY_FIELD.getName()
-        );
+        defaults.put(EXPORT_PRIMARY_SORT_FIELD, InternalField.KEY_FIELD.getName());
         defaults.put(EXPORT_PRIMARY_SORT_DESCENDING, Boolean.FALSE);
-        defaults.put(
-            EXPORT_SECONDARY_SORT_FIELD,
-            StandardField.AUTHOR.getName()
-        );
+        defaults.put(EXPORT_SECONDARY_SORT_FIELD, StandardField.AUTHOR.getName());
         defaults.put(EXPORT_SECONDARY_SORT_DESCENDING, Boolean.FALSE);
         defaults.put(EXPORT_TERTIARY_SORT_FIELD, StandardField.TITLE.getName());
         defaults.put(EXPORT_TERTIARY_SORT_DESCENDING, Boolean.FALSE);
@@ -710,10 +644,7 @@ private JabRefPreferences() {
         );
         defaults.put(COLUMN_WIDTHS, "28;28;28;75;300;470;60;130;50;50;50");
 
-        defaults.put(
-            XMP_PRIVACY_FILTERS,
-            "pdf;timestamp;keywords;owner;note;review"
-        );
+        defaults.put(XMP_PRIVACY_FILTERS, "pdf;timestamp;keywords;owner;note;review");
         defaults.put(USE_XMP_PRIVACY_FILTER, Boolean.FALSE);
         defaults.put(WORKING_DIRECTORY, USER_HOME);
         defaults.put(EXPORT_WORKING_DIRECTORY, USER_HOME);
@@ -744,10 +675,7 @@ private JabRefPreferences() {
         defaults.put(SEND_TIMEZONE_DATA, Boolean.FALSE);
         defaults.put(VALIDATE_IN_ENTRY_EDITOR, Boolean.TRUE);
         defaults.put(AUTO_COMPLETE, Boolean.FALSE);
-        defaults.put(
-            AUTOCOMPLETER_FIRSTNAME_MODE,
-            AutoCompleteFirstNameMode.BOTH.name()
-        );
+        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(
@@ -756,14 +684,8 @@ private JabRefPreferences() {
         );
         defaults.put(AUTO_ASSIGN_GROUP, Boolean.TRUE);
         defaults.put(DISPLAY_GROUP_COUNT, Boolean.TRUE);
-        defaults.put(
-            GROUP_INTERSECT_UNION_VIEW_MODE,
-            GroupViewMode.INTERSECTION.name()
-        );
-        defaults.put(
-            DEFAULT_HIERARCHICAL_CONTEXT,
-            GroupHierarchyType.INDEPENDENT.name()
-        );
+        defaults.put(GROUP_INTERSECT_UNION_VIEW_MODE, GroupViewMode.INTERSECTION.name());
+        defaults.put(DEFAULT_HIERARCHICAL_CONTEXT, GroupHierarchyType.INDEPENDENT.name());
         defaults.put(KEYWORD_SEPARATOR, ", ");
         defaults.put(DEFAULT_ENCODING, StandardCharsets.UTF_8.name());
         defaults.put(DEFAULT_OWNER, System.getProperty("user.name"));
@@ -782,29 +704,17 @@ private JabRefPreferences() {
 
         // OpenOffice/LibreOffice
         if (OS.WINDOWS) {
-            defaults.put(
-                OO_EXECUTABLE_PATH,
-                OpenOfficePreferences.DEFAULT_WIN_EXEC_PATH
-            );
+            defaults.put(OO_EXECUTABLE_PATH, OpenOfficePreferences.DEFAULT_WIN_EXEC_PATH);
         } else if (OS.OS_X) {
-            defaults.put(
-                OO_EXECUTABLE_PATH,
-                OpenOfficePreferences.DEFAULT_OSX_EXEC_PATH
-            );
+            defaults.put(OO_EXECUTABLE_PATH, OpenOfficePreferences.DEFAULT_OSX_EXEC_PATH);
         } else { // Linux
-            defaults.put(
-                OO_EXECUTABLE_PATH,
-                OpenOfficePreferences.DEFAULT_LINUX_EXEC_PATH
-            );
+            defaults.put(OO_EXECUTABLE_PATH, OpenOfficePreferences.DEFAULT_LINUX_EXEC_PATH);
         }
 
         defaults.put(OO_SYNC_WHEN_CITING, Boolean.TRUE);
         defaults.put(OO_SHOW_PANEL, Boolean.FALSE);
         defaults.put(OO_USE_ALL_OPEN_BASES, Boolean.TRUE);
-        defaults.put(
-            OO_BIBLIOGRAPHY_STYLE_FILE,
-            StyleLoader.DEFAULT_AUTHORYEAR_STYLE_PATH
-        );
+        defaults.put(OO_BIBLIOGRAPHY_STYLE_FILE, StyleLoader.DEFAULT_AUTHORYEAR_STYLE_PATH);
         defaults.put(OO_EXTERNAL_STYLE_FILES, "");
 
         defaults.put(SPECIALFIELDSENABLED, Boolean.TRUE);
@@ -873,9 +783,7 @@ private JabRefPreferences() {
         defaults.put(ASK_AUTO_NAMING_PDFS_AGAIN, Boolean.TRUE);
         defaults.put(
             CLEANUP_JOBS,
-            convertListToString(
-                getDefaultCleanupJobs().stream().map(Enum::name).toList()
-            )
+            convertListToString(getDefaultCleanupJobs().stream().map(Enum::name).toList())
         );
         defaults.put(CLEANUP_FIELD_FORMATTERS_ENABLED, Boolean.FALSE);
         defaults.put(
@@ -887,10 +795,7 @@ private JabRefPreferences() {
         );
 
         // use citation key appended with filename as default pattern
-        defaults.put(
-            IMPORT_FILENAMEPATTERN,
-            FilePreferences.DEFAULT_FILENAME_PATTERNS[1]
-        );
+        defaults.put(IMPORT_FILENAMEPATTERN, FilePreferences.DEFAULT_FILENAME_PATTERNS[1]);
         // Default empty String to be backwards compatible
         defaults.put(IMPORT_FILEDIRPATTERN, "");
         // Download files by default
@@ -909,10 +814,7 @@ private JabRefPreferences() {
                 CONSOLE_COMMAND,
                 "C:\\Program Files\\ConEmu\\ConEmu64.exe /single /dir \"%DIR\""
             );
-            defaults.put(
-                FILE_BROWSER_COMMAND,
-                "explorer.exe /select, \"%DIR\""
-            );
+            defaults.put(FILE_BROWSER_COMMAND, "explorer.exe /select, \"%DIR\"");
         } else {
             defaults.put(CONSOLE_COMMAND, "");
             defaults.put(FILE_BROWSER_COMMAND, "");
@@ -965,17 +867,11 @@ public void setLanguageDependentDefaultValues() {
         defaults.put(CUSTOM_TAB_FIELDS + "_def0", fieldNames);
 
         // Entry editor tab 1:
-        defaults.put(
-            CUSTOM_TAB_FIELDS + "_def1",
-            StandardField.ABSTRACT.getName()
-        );
+        defaults.put(CUSTOM_TAB_FIELDS + "_def1", StandardField.ABSTRACT.getName());
         defaults.put(CUSTOM_TAB_NAME + "_def1", Localization.lang("Abstract"));
 
         // Entry editor tab 2: Comments Field - used for research comments, etc.
-        defaults.put(
-            CUSTOM_TAB_FIELDS + "_def2",
-            StandardField.COMMENT.getName()
-        );
+        defaults.put(CUSTOM_TAB_FIELDS + "_def2", StandardField.COMMENT.getName());
         defaults.put(CUSTOM_TAB_NAME + "_def2", Localization.lang("Comments"));
 
         defaults.put(EMAIL_SUBJECT, Localization.lang("References"));
@@ -1000,9 +896,7 @@ public static JabRefPreferences getInstance() {
     private static String convertListToString(List<String> value) {
         return value
             .stream()
-            .map(val ->
-                StringUtil.quote(val, STRINGLIST_DELIMITER.toString(), '\\')
-            )
+            .map(val -> StringUtil.quote(val, STRINGLIST_DELIMITER.toString(), '\\'))
             .collect(Collectors.joining(STRINGLIST_DELIMITER.toString()));
     }
 
@@ -1024,8 +918,7 @@ private static List<String> convertStringToList(String toConvert) {
         return result;
     }
 
-    private static Optional<String> getNextUnit(Reader data)
-        throws IOException {
+    private static Optional<String> getNextUnit(Reader data) throws IOException {
         // character last read
         // -1 if end of stream
         // initialization necessary, because of Java compiler
@@ -1221,8 +1114,7 @@ public void flush() {
                 exportPreferences(Path.of("jabref.xml"));
             } catch (JabRefException e) {
                 LOGGER.warn(
-                    "Could not export preferences for memory stick mode: " +
-                    e.getMessage(),
+                    "Could not export preferences for memory stick mode: " + e.getMessage(),
                     e
                 );
             }
@@ -1251,10 +1143,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));
         }
@@ -1358,16 +1248,11 @@ public LayoutFormatterPreferences getLayoutFormatterPreferences() {
 
     @Override
     public KeyBindingRepository getKeyBindingRepository() {
-        return new KeyBindingRepository(
-            getStringList(BIND_NAMES),
-            getStringList(BINDINGS)
-        );
+        return new KeyBindingRepository(getStringList(BIND_NAMES), getStringList(BINDINGS));
     }
 
     @Override
-    public void storeKeyBindingRepository(
-        KeyBindingRepository keyBindingRepository
-    ) {
+    public void storeKeyBindingRepository(KeyBindingRepository keyBindingRepository) {
         putStringList(BIND_NAMES, keyBindingRepository.getBindNames());
         putStringList(BINDINGS, keyBindingRepository.getBindings());
     }
@@ -1411,30 +1296,21 @@ public BibEntryTypesManager getCustomEntryTypesRepository() {
         EnumSet
             .allOf(BibDatabaseMode.class)
             .forEach(mode ->
-                bibEntryTypesManager.addCustomOrModifiedTypes(
-                    getBibEntryTypes(mode),
-                    mode
-                )
+                bibEntryTypesManager.addCustomOrModifiedTypes(getBibEntryTypes(mode), mode)
             );
         return bibEntryTypesManager;
     }
 
-    private List<BibEntryType> getBibEntryTypes(
-        BibDatabaseMode bibDatabaseMode
-    ) {
+    private List<BibEntryType> getBibEntryTypes(BibDatabaseMode bibDatabaseMode) {
         List<BibEntryType> storedEntryTypes = new ArrayList<>();
-        Preferences prefsNode = getPrefsNodeForCustomizedEntryTypes(
-            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)
+                    MetaDataParser.parseCustomEntryType(typeString).ifPresent(storedEntryTypes::add)
                 );
         } catch (BackingStoreException e) {
             LOGGER.info("Parsing customized entry types failed.", e);
@@ -1459,9 +1335,7 @@ private void clearBibEntryTypes(BibDatabaseMode mode) {
     }
 
     @Override
-    public void storeCustomEntryTypesRepository(
-        BibEntryTypesManager entryTypesManager
-    ) {
+    public void storeCustomEntryTypesRepository(BibEntryTypesManager entryTypesManager) {
         clearAllBibEntryTypes();
         storeBibEntryTypes(
             entryTypesManager.getAllTypes(BibDatabaseMode.BIBTEX),
@@ -1477,9 +1351,7 @@ private void storeBibEntryTypes(
         Collection<BibEntryType> bibEntryTypes,
         BibDatabaseMode bibDatabaseMode
     ) {
-        Preferences prefsNode = getPrefsNodeForCustomizedEntryTypes(
-            bibDatabaseMode
-        );
+        Preferences prefsNode = getPrefsNodeForCustomizedEntryTypes(bibDatabaseMode);
 
         try {
             // clear old custom types
@@ -1499,9 +1371,7 @@ private void storeBibEntryTypes(
         }
     }
 
-    private static Preferences getPrefsNodeForCustomizedEntryTypes(
-        BibDatabaseMode mode
-    ) {
+    private static Preferences getPrefsNodeForCustomizedEntryTypes(BibDatabaseMode mode) {
         return mode == BibDatabaseMode.BIBTEX
             ? PREFS_NODE.node(CUSTOMIZED_BIBTEX_TYPES)
             : PREFS_NODE.node(CUSTOMIZED_BIBLATEX_TYPES);
@@ -1532,13 +1402,11 @@ public OpenOfficePreferences getOpenOfficePreferences() {
         );
         EasyBind.listen(
             openOfficePreferences.useAllDatabasesProperty(),
-            (obs, oldValue, newValue) ->
-                putBoolean(OO_USE_ALL_OPEN_BASES, newValue)
+            (obs, oldValue, newValue) -> putBoolean(OO_USE_ALL_OPEN_BASES, newValue)
         );
         EasyBind.listen(
             openOfficePreferences.syncWhenCitingProperty(),
-            (obs, oldValue, newValue) ->
-                putBoolean(OO_SYNC_WHEN_CITING, newValue)
+            (obs, oldValue, newValue) -> putBoolean(OO_SYNC_WHEN_CITING, newValue)
         );
         openOfficePreferences
             .getExternalStyles()
@@ -1551,8 +1419,7 @@ public OpenOfficePreferences getOpenOfficePreferences() {
             );
         EasyBind.listen(
             openOfficePreferences.currentStyleProperty(),
-            (obs, oldValue, newValue) ->
-                put(OO_BIBLIOGRAPHY_STYLE_FILE, newValue)
+            (obs, oldValue, newValue) -> put(OO_BIBLIOGRAPHY_STYLE_FILE, newValue)
         );
 
         return openOfficePreferences;
@@ -1576,15 +1443,11 @@ public LibraryPreferences getLibraryPreferences() {
         EasyBind.listen(
             libraryPreferences.defaultBibDatabaseModeProperty(),
             (obs, oldValue, newValue) ->
-                putBoolean(
-                    BIBLATEX_DEFAULT_MODE,
-                    (newValue == BibDatabaseMode.BIBLATEX)
-                )
+                putBoolean(BIBLATEX_DEFAULT_MODE, (newValue == BibDatabaseMode.BIBLATEX))
         );
         EasyBind.listen(
             libraryPreferences.alwaysReformatOnSaveProperty(),
-            (obs, oldValue, newValue) ->
-                putBoolean(REFORMAT_FILE_ON_SAVE_AND_EXPORT, newValue)
+            (obs, oldValue, newValue) -> putBoolean(REFORMAT_FILE_ON_SAVE_AND_EXPORT, newValue)
         );
         EasyBind.listen(
             libraryPreferences.autoSaveProperty(),
@@ -1613,8 +1476,7 @@ public TelemetryPreferences getTelemetryPreferences() {
         );
         EasyBind.listen(
             telemetryPreferences.askToCollectTelemetryProperty(),
-            (obs, oldValue, newValue) ->
-                putBoolean(ALREADY_ASKED_TO_COLLECT_TELEMETRY, !newValue)
+            (obs, oldValue, newValue) -> putBoolean(ALREADY_ASKED_TO_COLLECT_TELEMETRY, !newValue)
         );
 
         return telemetryPreferences;
@@ -1637,16 +1499,11 @@ 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)
+            (obs, oldValue, newValue) -> putBoolean(USE_CUSTOM_DOI_URI, newValue)
         );
         EasyBind.listen(
             doiPreferences.defaultBaseURIProperty(),
@@ -1712,8 +1569,7 @@ public TimestampPreferences getTimestampPreferences() {
         );
         EasyBind.listen(
             timestampPreferences.addModificationDateProperty(),
-            (obs, oldValue, newValue) ->
-                putBoolean(ADD_MODIFICATION_DATE, newValue)
+            (obs, oldValue, newValue) -> putBoolean(ADD_MODIFICATION_DATE, newValue)
         );
 
         return timestampPreferences;
@@ -1735,8 +1591,7 @@ public GroupsPreferences getGroupsPreferences() {
 
         EasyBind.listen(
             groupsPreferences.groupViewModeProperty(),
-            (obs, oldValue, newValue) ->
-                put(GROUP_INTERSECT_UNION_VIEW_MODE, newValue.name())
+            (obs, oldValue, newValue) -> put(GROUP_INTERSECT_UNION_VIEW_MODE, newValue.name())
         );
         EasyBind.listen(
             groupsPreferences.autoAssignGroupProperty(),
@@ -1744,13 +1599,11 @@ public GroupsPreferences getGroupsPreferences() {
         );
         EasyBind.listen(
             groupsPreferences.displayGroupCountProperty(),
-            (obs, oldValue, newValue) ->
-                putBoolean(DISPLAY_GROUP_COUNT, newValue)
+            (obs, oldValue, newValue) -> putBoolean(DISPLAY_GROUP_COUNT, newValue)
         );
         EasyBind.listen(
             groupsPreferences.defaultHierarchicalContextProperty(),
-            (obs, oldValue, newValue) ->
-                put(DEFAULT_HIERARCHICAL_CONTEXT, newValue.name())
+            (obs, oldValue, newValue) -> put(DEFAULT_HIERARCHICAL_CONTEXT, newValue.name())
         );
 
         return groupsPreferences;
@@ -1778,9 +1631,7 @@ public EntryEditorPreferences getEntryEditorPreferences() {
                 getBoolean(ALLOW_INTEGER_EDITION_BIBTEX),
                 getDouble(ENTRY_EDITOR_HEIGHT),
                 getBoolean(AUTOLINK_FILES_ENABLED),
-                EntryEditorPreferences.JournalPopupEnabled.fromString(
-                    get(JOURNAL_POPUP)
-                ),
+                EntryEditorPreferences.JournalPopupEnabled.fromString(get(JOURNAL_POPUP)),
                 getBoolean(SHOW_SCITE_TAB)
             );
 
@@ -1795,38 +1646,31 @@ public EntryEditorPreferences getEntryEditorPreferences() {
         );
         EasyBind.listen(
             entryEditorPreferences.shouldShowRecommendationsTabProperty(),
-            (obs, oldValue, newValue) ->
-                putBoolean(SHOW_RECOMMENDATIONS, newValue)
+            (obs, oldValue, newValue) -> putBoolean(SHOW_RECOMMENDATIONS, newValue)
         );
         EasyBind.listen(
             entryEditorPreferences.shouldShowLatexCitationsTabProperty(),
-            (obs, oldValue, newValue) ->
-                putBoolean(SHOW_LATEX_CITATIONS, newValue)
+            (obs, oldValue, newValue) -> putBoolean(SHOW_LATEX_CITATIONS, newValue)
         );
         EasyBind.listen(
             entryEditorPreferences.showSourceTabByDefaultProperty(),
-            (obs, oldValue, newValue) ->
-                putBoolean(DEFAULT_SHOW_SOURCE, newValue)
+            (obs, oldValue, newValue) -> putBoolean(DEFAULT_SHOW_SOURCE, newValue)
         );
         EasyBind.listen(
             entryEditorPreferences.enableValidationProperty(),
-            (obs, oldValue, newValue) ->
-                putBoolean(VALIDATE_IN_ENTRY_EDITOR, newValue)
+            (obs, oldValue, newValue) -> putBoolean(VALIDATE_IN_ENTRY_EDITOR, newValue)
         );
         EasyBind.listen(
             entryEditorPreferences.allowIntegerEditionBibtexProperty(),
-            (obs, oldValue, newValue) ->
-                putBoolean(ALLOW_INTEGER_EDITION_BIBTEX, newValue)
+            (obs, oldValue, newValue) -> putBoolean(ALLOW_INTEGER_EDITION_BIBTEX, newValue)
         );
         EasyBind.listen(
             entryEditorPreferences.dividerPositionProperty(),
-            (obs, oldValue, newValue) ->
-                putDouble(ENTRY_EDITOR_HEIGHT, newValue.doubleValue())
+            (obs, oldValue, newValue) -> putDouble(ENTRY_EDITOR_HEIGHT, newValue.doubleValue())
         );
         EasyBind.listen(
             entryEditorPreferences.autoLinkEnabledProperty(),
-            (obs, oldValue, newValue) ->
-                putBoolean(AUTOLINK_FILES_ENABLED, newValue)
+            (obs, oldValue, newValue) -> putBoolean(AUTOLINK_FILES_ENABLED, newValue)
         );
         EasyBind.listen(
             entryEditorPreferences.enableJournalPopupProperty(),
@@ -1857,10 +1701,7 @@ private Map<String, Set<Field>> getEntryEditorTabs() {
         }
 
         for (int i = 0; i < tabNames.size(); i++) {
-            tabs.put(
-                tabNames.get(i),
-                FieldFactory.parseFieldList(tabFields.get(i))
-            );
+            tabs.put(tabNames.get(i), FieldFactory.parseFieldList(tabFields.get(i)));
         }
         return tabs;
     }
@@ -1879,9 +1720,7 @@ private void storeEntryEditorTabs(Map<String, Set<Field>> customTabs) {
                 set
                     .stream()
                     .map(Field::getName)
-                    .collect(
-                        Collectors.joining(STRINGLIST_DELIMITER.toString())
-                    )
+                    .collect(Collectors.joining(STRINGLIST_DELIMITER.toString()))
             )
             .toArray(String[]::new);
 
@@ -1902,26 +1741,17 @@ private Map<String, Set<Field>> getDefaultEntryEditorTabs() {
         int defNumber = 0;
         while (true) {
             // Saved as 'CUSTOMTABNAME_def{number}' and seperated by ';'
-            String name = (String) defaults.get(
-                CUSTOM_TAB_NAME + "_def" + defNumber
-            );
-            String fields = (String) defaults.get(
-                CUSTOM_TAB_FIELDS + "_def" + defNumber
-            );
+            String name = (String) defaults.get(CUSTOM_TAB_NAME + "_def" + defNumber);
+            String fields = (String) defaults.get(CUSTOM_TAB_FIELDS + "_def" + defNumber);
 
-            if (
-                StringUtil.isNullOrEmpty(name) ||
-                StringUtil.isNullOrEmpty(fields)
-            ) {
+            if (StringUtil.isNullOrEmpty(name) || StringUtil.isNullOrEmpty(fields)) {
                 break;
             }
 
             customTabsMap.put(
                 name,
                 FieldFactory.parseFieldList(
-                    (String) defaults.get(
-                        CUSTOM_TAB_FIELDS + "_def" + defNumber
-                    )
+                    (String) defaults.get(CUSTOM_TAB_FIELDS + "_def" + defNumber)
                 )
             );
             defNumber++;
@@ -1940,10 +1770,7 @@ public RemotePreferences getRemotePreferences() {
         }
 
         remotePreferences =
-            new RemotePreferences(
-                getInt(REMOTE_SERVER_PORT),
-                getBoolean(USE_REMOTE_SERVER)
-            );
+            new RemotePreferences(getInt(REMOTE_SERVER_PORT), getBoolean(USE_REMOTE_SERVER));
 
         EasyBind.listen(
             remotePreferences.portProperty(),
@@ -1988,8 +1815,7 @@ public ProxyPreferences getProxyPreferences() {
         );
         EasyBind.listen(
             proxyPreferences.useAuthenticationProperty(),
-            (obs, oldValue, newValue) ->
-                putBoolean(PROXY_USE_AUTHENTICATION, newValue)
+            (obs, oldValue, newValue) -> putBoolean(PROXY_USE_AUTHENTICATION, newValue)
         );
         EasyBind.listen(
             proxyPreferences.usernameProperty(),
@@ -2025,9 +1851,7 @@ private String getProxyPassword() {
                 )
                     .decrypt();
             } catch (PasswordAccessException ex) {
-                LOGGER.warn(
-                    "JabRef uses proxy password from key store but no password is stored"
-                );
+                LOGGER.warn("JabRef uses proxy password from key store but no password is stored");
             } catch (Exception ex) {
                 LOGGER.warn("JabRef could not open the key store");
             }
@@ -2044,10 +1868,7 @@ private void setProxyPassword(String password) {
                     keyring.setPassword(
                         "org.jabref",
                         "proxy",
-                        new Password(
-                            password.trim(),
-                            getInternalPreferences().getUserAndHost()
-                        )
+                        new Password(password.trim(), getInternalPreferences().getUserAndHost())
                             .encrypt()
                     );
                 }
@@ -2073,10 +1894,9 @@ public SSLPreferences getSSLPreferences() {
     //*************************************************************************************************************
 
     private GlobalCitationKeyPattern getGlobalCitationKeyPattern() {
-        GlobalCitationKeyPattern citationKeyPattern =
-            GlobalCitationKeyPattern.fromPattern(
-                get(DEFAULT_CITATION_KEY_PATTERN)
-            );
+        GlobalCitationKeyPattern citationKeyPattern = GlobalCitationKeyPattern.fromPattern(
+            get(DEFAULT_CITATION_KEY_PATTERN)
+        );
         Preferences preferences = PREFS_NODE.node(CITATION_KEY_PATTERNS_NODE);
         try {
             String[] keys = preferences.keys();
@@ -2087,23 +1907,15 @@ private GlobalCitationKeyPattern getGlobalCitationKeyPattern() {
                 );
             }
         } catch (BackingStoreException ex) {
-            LOGGER.info(
-                "BackingStoreException in JabRefPreferences.getKeyPattern",
-                ex
-            );
+            LOGGER.info("BackingStoreException in JabRefPreferences.getKeyPattern", ex);
         }
 
         return citationKeyPattern;
     }
 
     // public for use in PreferenceMigrations
-    public void storeGlobalCitationKeyPattern(
-        GlobalCitationKeyPattern pattern
-    ) {
-        if (
-            (pattern.getDefaultValue() == null) ||
-            pattern.getDefaultValue().isEmpty()
-        ) {
+    public void storeGlobalCitationKeyPattern(GlobalCitationKeyPattern pattern) {
+        if ((pattern.getDefaultValue() == null) || pattern.getDefaultValue().isEmpty()) {
             put(DEFAULT_CITATION_KEY_PATTERN, "");
         } else {
             put(DEFAULT_CITATION_KEY_PATTERN, pattern.getDefaultValue().get(0));
@@ -2114,19 +1926,13 @@ public void storeGlobalCitationKeyPattern(
         try {
             preferences.clear(); // We remove all old entries.
         } catch (BackingStoreException ex) {
-            LOGGER.info(
-                "BackingStoreException in JabRefPreferences::putKeyPattern",
-                ex
-            );
+            LOGGER.info("BackingStoreException in JabRefPreferences::putKeyPattern", ex);
         }
 
         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).get(0)
-                );
+                preferences.put(entryType.getName(), pattern.getValue(entryType).get(0));
             }
         }
     }
@@ -2134,8 +1940,7 @@ public void storeGlobalCitationKeyPattern(
     private void clearCitationKeyPatterns() throws BackingStoreException {
         Preferences preferences = PREFS_NODE.node(CITATION_KEY_PATTERNS_NODE);
         preferences.clear();
-        getCitationKeyPatternPreferences()
-            .setKeyPattern(getGlobalCitationKeyPattern());
+        getCitationKeyPatternPreferences().setKeyPattern(getGlobalCitationKeyPattern());
     }
 
     @Override
@@ -2160,18 +1965,15 @@ public CitationKeyPatternPreferences getCitationKeyPatternPreferences() {
 
         EasyBind.listen(
             citationKeyPatternPreferences.shouldAvoidOverwriteCiteKeyProperty(),
-            (obs, oldValue, newValue) ->
-                putBoolean(AVOID_OVERWRITING_KEY, newValue)
+            (obs, oldValue, newValue) -> putBoolean(AVOID_OVERWRITING_KEY, newValue)
         );
         EasyBind.listen(
             citationKeyPatternPreferences.shouldWarnBeforeOverwriteCiteKeyProperty(),
-            (obs, oldValue, newValue) ->
-                putBoolean(WARN_BEFORE_OVERWRITING_KEY, newValue)
+            (obs, oldValue, newValue) -> putBoolean(WARN_BEFORE_OVERWRITING_KEY, newValue)
         );
         EasyBind.listen(
             citationKeyPatternPreferences.shouldGenerateCiteKeysBeforeSavingProperty(),
-            (obs, oldValue, newValue) ->
-                putBoolean(GENERATE_KEYS_BEFORE_SAVING, newValue)
+            (obs, oldValue, newValue) -> putBoolean(GENERATE_KEYS_BEFORE_SAVING, newValue)
         );
         EasyBind.listen(
             citationKeyPatternPreferences.keySuffixProperty(),
@@ -2182,8 +1984,7 @@ public CitationKeyPatternPreferences getCitationKeyPatternPreferences() {
                 );
                 putBoolean(
                     KEY_GEN_FIRST_LETTER_A,
-                    newValue ==
-                    CitationKeyPatternPreferences.KeySuffix.SECOND_WITH_A
+                    newValue == CitationKeyPatternPreferences.KeySuffix.SECOND_WITH_A
                 );
             }
         );
@@ -2197,8 +1998,7 @@ public CitationKeyPatternPreferences getCitationKeyPatternPreferences() {
         );
         EasyBind.listen(
             citationKeyPatternPreferences.unwantedCharactersProperty(),
-            (obs, oldValue, newValue) ->
-                put(UNWANTED_CITATION_KEY_CHARACTERS, newValue)
+            (obs, oldValue, newValue) -> put(UNWANTED_CITATION_KEY_CHARACTERS, newValue)
         );
         EasyBind.listen(
             citationKeyPatternPreferences.keyPatternProperty(),
@@ -2232,23 +2032,11 @@ public PushToApplicationPreferences getPushToApplicationPreferences() {
         Map<String, String> applicationCommands = new HashMap<>();
         applicationCommands.put(PushToApplications.EMACS, get(PUSH_EMACS_PATH));
         applicationCommands.put(PushToApplications.LYX, get(PUSH_LYXPIPE));
-        applicationCommands.put(
-            PushToApplications.TEXMAKER,
-            get(PUSH_TEXMAKER_PATH)
-        );
-        applicationCommands.put(
-            PushToApplications.TEXSTUDIO,
-            get(PUSH_TEXSTUDIO_PATH)
-        );
+        applicationCommands.put(PushToApplications.TEXMAKER, get(PUSH_TEXMAKER_PATH));
+        applicationCommands.put(PushToApplications.TEXSTUDIO, get(PUSH_TEXSTUDIO_PATH));
         applicationCommands.put(PushToApplications.VIM, get(PUSH_VIM));
-        applicationCommands.put(
-            PushToApplications.WIN_EDT,
-            get(PUSH_WINEDT_PATH)
-        );
-        applicationCommands.put(
-            PushToApplications.SUBLIME_TEXT,
-            get(PUSH_SUBLIME_TEXT_PATH)
-        );
+        applicationCommands.put(PushToApplications.WIN_EDT, get(PUSH_WINEDT_PATH));
+        applicationCommands.put(PushToApplications.SUBLIME_TEXT, get(PUSH_SUBLIME_TEXT_PATH));
 
         pushToApplicationPreferences =
             new PushToApplicationPreferences(
@@ -2264,13 +2052,10 @@ public PushToApplicationPreferences getPushToApplicationPreferences() {
         );
         pushToApplicationPreferences
             .getCommandPaths()
-            .addListener((obs, oldValue, newValue) ->
-                storePushToApplicationPath(newValue)
-            );
+            .addListener((obs, oldValue, newValue) -> storePushToApplicationPath(newValue));
         EasyBind.listen(
             pushToApplicationPreferences.emacsArgumentsProperty(),
-            (obs, oldValue, newValue) ->
-                put(PUSH_EMACS_ADDITIONAL_PARAMETERS, newValue)
+            (obs, oldValue, newValue) -> put(PUSH_EMACS_ADDITIONAL_PARAMETERS, newValue)
         );
         EasyBind.listen(
             pushToApplicationPreferences.vimServerProperty(),
@@ -2284,20 +2069,11 @@ private void storePushToApplicationPath(Map<String, String> commandPair) {
             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.TEXMAKER -> put(PUSH_TEXMAKER_PATH, value);
+                case PushToApplications.TEXSTUDIO -> put(PUSH_TEXSTUDIO_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
-                );
+                case PushToApplications.SUBLIME_TEXT -> put(PUSH_SUBLIME_TEXT_PATH, value);
             }
         });
     }
@@ -2327,8 +2103,7 @@ public ExternalApplicationsPreferences getExternalApplicationsPreferences() {
         );
         EasyBind.listen(
             externalApplicationsPreferences.autoOpenEmailAttachmentsFolderProperty(),
-            (obs, oldValue, newValue) ->
-                putBoolean(OPEN_FOLDERS_OF_ATTACHED_FILES, newValue)
+            (obs, oldValue, newValue) -> putBoolean(OPEN_FOLDERS_OF_ATTACHED_FILES, newValue)
         );
         EasyBind.listen(
             externalApplicationsPreferences.citeCommandProperty(),
@@ -2336,8 +2111,7 @@ public ExternalApplicationsPreferences getExternalApplicationsPreferences() {
         );
         EasyBind.listen(
             externalApplicationsPreferences.useCustomTerminalProperty(),
-            (obs, oldValue, newValue) ->
-                putBoolean(USE_DEFAULT_CONSOLE_APPLICATION, !newValue)
+            (obs, oldValue, newValue) -> putBoolean(USE_DEFAULT_CONSOLE_APPLICATION, !newValue)
         ); // mind the !
         EasyBind.listen(
             externalApplicationsPreferences.customTerminalCommandProperty(),
@@ -2345,8 +2119,7 @@ public ExternalApplicationsPreferences getExternalApplicationsPreferences() {
         );
         EasyBind.listen(
             externalApplicationsPreferences.useCustomFileBrowserProperty(),
-            (obs, oldValue, newValue) ->
-                putBoolean(USE_DEFAULT_FILE_BROWSER_APPLICATION, !newValue)
+            (obs, oldValue, newValue) -> putBoolean(USE_DEFAULT_FILE_BROWSER_APPLICATION, !newValue)
         ); // mind the !
         EasyBind.listen(
             externalApplicationsPreferences.customFileBrowserCommandProperty(),
@@ -2383,8 +2156,7 @@ public MainTablePreferences getMainTablePreferences() {
         );
         EasyBind.listen(
             mainTablePreferences.extraFileColumnsEnabledProperty(),
-            (obs, oldValue, newValue) ->
-                putBoolean(EXTRA_FILE_COLUMNS, newValue)
+            (obs, oldValue, newValue) -> putBoolean(EXTRA_FILE_COLUMNS, newValue)
         );
 
         return mainTablePreferences;
@@ -2402,12 +2174,8 @@ public ColumnPreferences getMainTableColumnPreferences() {
             COLUMN_SORT_TYPES,
             ColumnPreferences.DEFAULT_COLUMN_WIDTH
         );
-        List<MainTableColumnModel> columnSortOrder = getColumnSortOrder(
-            COLUMN_SORT_ORDER,
-            columns
-        );
-        mainTableColumnPreferences =
-            new ColumnPreferences(columns, columnSortOrder);
+        List<MainTableColumnModel> columnSortOrder = getColumnSortOrder(COLUMN_SORT_ORDER, columns);
+        mainTableColumnPreferences = new ColumnPreferences(columns, columnSortOrder);
 
         mainTableColumnPreferences
             .getColumns()
@@ -2423,9 +2191,7 @@ public ColumnPreferences getMainTableColumnPreferences() {
                     );
                     putStringList(
                         COLUMN_SORT_TYPES,
-                        getColumnSortTypesAsStringList(
-                            mainTableColumnPreferences
-                        )
+                        getColumnSortTypesAsStringList(mainTableColumnPreferences)
                     );
                 }
             );
@@ -2435,9 +2201,7 @@ public ColumnPreferences getMainTableColumnPreferences() {
                 (InvalidationListener) change ->
                     putStringList(
                         COLUMN_SORT_ORDER,
-                        getColumnSortOrderAsStringList(
-                            mainTableColumnPreferences
-                        )
+                        getColumnSortOrderAsStringList(mainTableColumnPreferences)
                     )
             );
 
@@ -2460,8 +2224,7 @@ public ColumnPreferences getSearchDialogColumnPreferences() {
             SEARCH_DIALOG_COLUMN_SORT_ORDER,
             columns
         );
-        searchDialogColumnPreferences =
-            new ColumnPreferences(columns, columnSortOrder);
+        searchDialogColumnPreferences = new ColumnPreferences(columns, columnSortOrder);
 
         searchDialogColumnPreferences
             .getColumns()
@@ -2471,15 +2234,11 @@ public ColumnPreferences getSearchDialogColumnPreferences() {
                     // putStringList(SEARCH_DIALOG_COLUMN_NAMES, getColumnNamesAsStringList(columnPreferences));
                     putStringList(
                         SEARCH_DIALOG_COLUMN_WIDTHS,
-                        getColumnWidthsAsStringList(
-                            searchDialogColumnPreferences
-                        )
+                        getColumnWidthsAsStringList(searchDialogColumnPreferences)
                     );
                     putStringList(
                         SEARCH_DIALOG_COLUMN_SORT_TYPES,
-                        getColumnSortTypesAsStringList(
-                            searchDialogColumnPreferences
-                        )
+                        getColumnSortTypesAsStringList(searchDialogColumnPreferences)
                     );
                 }
             );
@@ -2489,9 +2248,7 @@ public ColumnPreferences getSearchDialogColumnPreferences() {
                 (InvalidationListener) change ->
                     putStringList(
                         SEARCH_DIALOG_COLUMN_SORT_ORDER,
-                        getColumnSortOrderAsStringList(
-                            searchDialogColumnPreferences
-                        )
+                        getColumnSortOrderAsStringList(searchDialogColumnPreferences)
                     )
             );
 
@@ -2513,10 +2270,7 @@ private List<MainTableColumnModel> getColumns(
                 try {
                     return Double.parseDouble(string);
                 } catch (NumberFormatException e) {
-                    LOGGER.error(
-                        "Exception while parsing column widths. Choosing default.",
-                        e
-                    );
+                    LOGGER.error("Exception while parsing column widths. Choosing default.", e);
                     return defaultWidth;
                 }
             })
@@ -2529,9 +2283,7 @@ private List<MainTableColumnModel> getColumns(
 
         List<MainTableColumnModel> columns = new ArrayList<>();
         for (int i = 0; i < columnNames.size(); i++) {
-            MainTableColumnModel columnModel = MainTableColumnModel.parse(
-                columnNames.get(i)
-            );
+            MainTableColumnModel columnModel = MainTableColumnModel.parse(columnNames.get(i));
 
             if (i < columnWidths.size()) {
                 columnModel.widthProperty().setValue(columnWidths.get(i));
@@ -2563,19 +2315,11 @@ private List<MainTableColumnModel> getColumnSortOrder(
         return columnsOrdered;
     }
 
-    private static List<String> getColumnNamesAsStringList(
-        ColumnPreferences columnPreferences
-    ) {
-        return columnPreferences
-            .getColumns()
-            .stream()
-            .map(MainTableColumnModel::getName)
-            .toList();
+    private static List<String> getColumnNamesAsStringList(ColumnPreferences columnPreferences) {
+        return columnPreferences.getColumns().stream().map(MainTableColumnModel::getName).toList();
     }
 
-    private static List<String> getColumnWidthsAsStringList(
-        ColumnPreferences columnPreferences
-    ) {
+    private static List<String> getColumnWidthsAsStringList(ColumnPreferences columnPreferences) {
         return columnPreferences
             .getColumns()
             .stream()
@@ -2614,33 +2358,21 @@ public NameDisplayPreferences getNameDisplayPreferences() {
         }
 
         nameDisplayPreferences =
-            new NameDisplayPreferences(
-                getNameDisplayStyle(),
-                getNameAbbreviationStyle()
-            );
+            new NameDisplayPreferences(getNameDisplayStyle(), getNameAbbreviationStyle());
 
         EasyBind.listen(
             nameDisplayPreferences.displayStyleProperty(),
             (obs, oldValue, newValue) -> {
                 putBoolean(NAMES_NATBIB, newValue == DisplayStyle.NATBIB);
                 putBoolean(NAMES_AS_IS, newValue == DisplayStyle.AS_IS);
-                putBoolean(
-                    NAMES_FIRST_LAST,
-                    newValue == DisplayStyle.FIRSTNAME_LASTNAME
-                );
+                putBoolean(NAMES_FIRST_LAST, newValue == DisplayStyle.FIRSTNAME_LASTNAME);
             }
         );
         EasyBind.listen(
             nameDisplayPreferences.abbreviationStyleProperty(),
             (obs, oldValue, newValue) -> {
-                putBoolean(
-                    ABBR_AUTHOR_NAMES,
-                    newValue == AbbreviationStyle.FULL
-                );
-                putBoolean(
-                    NAMES_LAST_ONLY,
-                    newValue == AbbreviationStyle.LASTNAME_ONLY
-                );
+                putBoolean(ABBR_AUTHOR_NAMES, newValue == AbbreviationStyle.FULL);
+                putBoolean(NAMES_LAST_ONLY, newValue == AbbreviationStyle.LASTNAME_ONLY);
             }
         );
 
@@ -2679,13 +2411,11 @@ 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)))
+            ((observable, oldValue, newValue) -> put(KEYWORD_SEPARATOR, String.valueOf(newValue)))
         );
 
         return bibEntryPreferences;
@@ -2705,28 +2435,22 @@ public InternalPreferences getInternalPreferences() {
             new InternalPreferences(
                 Version.parse(get(VERSION_IGNORED_UPDATE)),
                 getBoolean(VERSION_CHECK_ENABLED),
-                getPath(
-                    PREFS_EXPORT_PATH,
-                    OS.getNativeDesktop().getDefaultFileChooserDirectory()
-                ),
+                getPath(PREFS_EXPORT_PATH, OS.getNativeDesktop().getDefaultFileChooserDirectory()),
                 getUserAndHost(),
                 getBoolean(MEMORY_STICK_MODE)
             );
 
         EasyBind.listen(
             internalPreferences.ignoredVersionProperty(),
-            (obs, oldValue, newValue) ->
-                put(VERSION_IGNORED_UPDATE, newValue.toString())
+            (obs, oldValue, newValue) -> put(VERSION_IGNORED_UPDATE, newValue.toString())
         );
         EasyBind.listen(
             internalPreferences.versionCheckEnabledProperty(),
-            (obs, oldValue, newValue) ->
-                putBoolean(VERSION_CHECK_ENABLED, newValue)
+            (obs, oldValue, newValue) -> putBoolean(VERSION_CHECK_ENABLED, newValue)
         );
         EasyBind.listen(
             internalPreferences.lastPreferencesExportPathProperty(),
-            (obs, oldValue, newValue) ->
-                put(PREFS_EXPORT_PATH, newValue.toString())
+            (obs, oldValue, newValue) -> put(PREFS_EXPORT_PATH, newValue.toString())
         );
         // user is a static value, should only be changed for debugging
         EasyBind.listen(
@@ -2750,8 +2474,7 @@ private String getUserAndHost() {
         if (StringUtil.isNotBlank(userAndHost)) {
             return userAndHost;
         }
-        userAndHost =
-            get(DEFAULT_OWNER) + '-' + OS.getNativeDesktop().getHostName();
+        userAndHost = get(DEFAULT_OWNER) + '-' + OS.getNativeDesktop().getHostName();
         return userAndHost;
     }
 
@@ -2791,8 +2514,7 @@ public WorkspacePreferences getWorkspacePreferences() {
         );
         EasyBind.listen(
             workspacePreferences.shouldOverrideDefaultFontSizeProperty(),
-            (obs, oldValue, newValue) ->
-                putBoolean(OVERRIDE_DEFAULT_FONT_SIZE, newValue)
+            (obs, oldValue, newValue) -> putBoolean(OVERRIDE_DEFAULT_FONT_SIZE, newValue)
         );
         EasyBind.listen(
             workspacePreferences.mainFontSizeProperty(),
@@ -2812,13 +2534,11 @@ public WorkspacePreferences getWorkspacePreferences() {
         );
         EasyBind.listen(
             workspacePreferences.showAdvancedHintsProperty(),
-            (obs, oldValue, newValue) ->
-                putBoolean(SHOW_ADVANCED_HINTS, newValue)
+            (obs, oldValue, newValue) -> putBoolean(SHOW_ADVANCED_HINTS, newValue)
         );
         EasyBind.listen(
             workspacePreferences.warnAboutDuplicatesInInspectionProperty(),
-            (obs, oldValue, newValue) ->
-                putBoolean(WARN_ABOUT_DUPLICATES_IN_INSPECTION, newValue)
+            (obs, oldValue, newValue) -> putBoolean(WARN_ABOUT_DUPLICATES_IN_INSPECTION, newValue)
         );
         EasyBind.listen(
             workspacePreferences.confirmDeleteProperty(),
@@ -2830,8 +2550,7 @@ public WorkspacePreferences getWorkspacePreferences() {
     private Language getLanguage() {
         return Stream
             .of(Language.values())
-            .filter(language -> language.getId().equalsIgnoreCase(get(LANGUAGE))
-            )
+            .filter(language -> language.getId().equalsIgnoreCase(get(LANGUAGE)))
             .findFirst()
             .orElse(Language.ENGLISH);
     }
@@ -2857,8 +2576,7 @@ public FieldPreferences getFieldPreferences() {
 
         EasyBind.listen(
             fieldPreferences.resolveStringsProperty(),
-            (obs, oldValue, newValue) ->
-                putBoolean(DO_NOT_RESOLVE_STRINGS, !newValue)
+            (obs, oldValue, newValue) -> putBoolean(DO_NOT_RESOLVE_STRINGS, !newValue)
         );
         fieldPreferences
             .getResolvableFields()
@@ -2866,9 +2584,7 @@ public FieldPreferences getFieldPreferences() {
                 (InvalidationListener) change ->
                     put(
                         RESOLVE_STRINGS_FOR_FIELDS,
-                        FieldFactory.serializeFieldsList(
-                            fieldPreferences.getResolvableFields()
-                        )
+                        FieldFactory.serializeFieldsList(fieldPreferences.getResolvableFields())
                     )
             );
         fieldPreferences
@@ -2877,9 +2593,7 @@ public FieldPreferences getFieldPreferences() {
                 (InvalidationListener) change ->
                     put(
                         NON_WRAPPABLE_FIELDS,
-                        FieldFactory.serializeFieldsList(
-                            fieldPreferences.getNonWrappableFields()
-                        )
+                        FieldFactory.serializeFieldsList(fieldPreferences.getNonWrappableFields())
                     )
             );
 
@@ -2899,10 +2613,7 @@ public FilePreferences getFilePreferences() {
         filePreferences =
             new FilePreferences(
                 getInternalPreferences().getUserAndHost(),
-                getPath(
-                    MAIN_FILE_DIRECTORY,
-                    OS.getNativeDesktop().getDefaultFileChooserDirectory()
-                )
+                getPath(MAIN_FILE_DIRECTORY, OS.getNativeDesktop().getDefaultFileChooserDirectory())
                     .toString(),
                 getBoolean(STORE_RELATIVE_TO_BIB),
                 get(IMPORT_FILENAMEPATTERN),
@@ -2913,10 +2624,7 @@ public FilePreferences getFilePreferences() {
                 ExternalFileTypes.fromString(get(EXTERNAL_FILE_TYPES)),
                 getBoolean(CREATE_BACKUP),
                 // We choose the data directory, because a ".bak" file should survive cache cleanups
-                getPath(
-                    BACKUP_DIRECTORY,
-                    OS.getNativeDesktop().getBackupDirectory()
-                )
+                getPath(BACKUP_DIRECTORY, OS.getNativeDesktop().getBackupDirectory())
             );
 
         EasyBind.listen(
@@ -2925,8 +2633,7 @@ public FilePreferences getFilePreferences() {
         );
         EasyBind.listen(
             filePreferences.storeFilesRelativeToBibFileProperty(),
-            (obs, oldValue, newValue) ->
-                putBoolean(STORE_RELATIVE_TO_BIB, newValue)
+            (obs, oldValue, newValue) -> putBoolean(STORE_RELATIVE_TO_BIB, newValue)
         );
         EasyBind.listen(
             filePreferences.fileNamePatternProperty(),
@@ -2938,18 +2645,15 @@ public FilePreferences getFilePreferences() {
         );
         EasyBind.listen(
             filePreferences.downloadLinkedFilesProperty(),
-            (obs, oldValue, newValue) ->
-                putBoolean(DOWNLOAD_LINKED_FILES, newValue)
+            (obs, oldValue, newValue) -> putBoolean(DOWNLOAD_LINKED_FILES, newValue)
         );
         EasyBind.listen(
             filePreferences.fulltextIndexLinkedFilesProperty(),
-            (obs, oldValue, newValue) ->
-                putBoolean(FULLTEXT_INDEX_LINKED_FILES, newValue)
+            (obs, oldValue, newValue) -> putBoolean(FULLTEXT_INDEX_LINKED_FILES, newValue)
         );
         EasyBind.listen(
             filePreferences.workingDirectoryProperty(),
-            (obs, oldValue, newValue) ->
-                put(WORKING_DIRECTORY, newValue.toString())
+            (obs, oldValue, newValue) -> put(WORKING_DIRECTORY, newValue.toString())
         );
         filePreferences
             .getExternalFileTypes()
@@ -2957,9 +2661,7 @@ public FilePreferences getFilePreferences() {
                 (SetChangeListener<ExternalFileType>) c ->
                     put(
                         EXTERNAL_FILE_TYPES,
-                        ExternalFileTypes.toStringList(
-                            filePreferences.getExternalFileTypes()
-                        )
+                        ExternalFileTypes.toStringList(filePreferences.getExternalFileTypes())
                     )
             );
         EasyBind.listen(
@@ -2968,8 +2670,7 @@ public FilePreferences getFilePreferences() {
         );
         EasyBind.listen(
             filePreferences.backupDirectoryProperty(),
-            (obs, oldValue, newValue) ->
-                put(BACKUP_DIRECTORY, newValue.toString())
+            (obs, oldValue, newValue) -> put(BACKUP_DIRECTORY, newValue.toString())
         );
 
         return filePreferences;
@@ -3005,13 +2706,11 @@ public AutoLinkPreferences getAutoLinkPreferences() {
         );
         EasyBind.listen(
             autoLinkPreferences.askAutoNamingPdfsProperty(),
-            (obs, oldValue, newValue) ->
-                putBoolean(ASK_AUTO_NAMING_PDFS_AGAIN, newValue)
+            (obs, oldValue, newValue) -> putBoolean(ASK_AUTO_NAMING_PDFS_AGAIN, newValue)
         );
         EasyBind.listen(
             autoLinkPreferences.regularExpressionProperty(),
-            (obs, oldValue, newValue) ->
-                put(AUTOLINK_REG_EXP_SEARCH_EXPRESSION_KEY, newValue)
+            (obs, oldValue, newValue) -> put(AUTOLINK_REG_EXP_SEARCH_EXPRESSION_KEY, newValue)
         );
 
         return autoLinkPreferences;
@@ -3021,11 +2720,9 @@ private AutoLinkPreferences.CitationKeyDependency getAutoLinkKeyDependency() {
         AutoLinkPreferences.CitationKeyDependency citationKeyDependency =
             AutoLinkPreferences.CitationKeyDependency.START; // default
         if (getBoolean(AUTOLINK_EXACT_KEY_ONLY)) {
-            citationKeyDependency =
-                AutoLinkPreferences.CitationKeyDependency.EXACT;
+            citationKeyDependency = AutoLinkPreferences.CitationKeyDependency.EXACT;
         } else if (getBoolean(AUTOLINK_USE_REG_EXP_SEARCH_KEY)) {
-            citationKeyDependency =
-                AutoLinkPreferences.CitationKeyDependency.REGEX;
+            citationKeyDependency = AutoLinkPreferences.CitationKeyDependency.REGEX;
         }
         return citationKeyDependency;
     }
@@ -3054,8 +2751,7 @@ public ExportPreferences getExportPreferences() {
         );
         EasyBind.listen(
             exportPreferences.exportWorkingDirectoryProperty(),
-            (obs, oldValue, newValue) ->
-                put(EXPORT_WORKING_DIRECTORY, newValue.toString())
+            (obs, oldValue, newValue) -> put(EXPORT_WORKING_DIRECTORY, newValue.toString())
         );
         EasyBind.listen(
             exportPreferences.exportSaveOrderProperty(),
@@ -3065,9 +2761,7 @@ public ExportPreferences getExportPreferences() {
             .getCustomExporters()
             .addListener(
                 (InvalidationListener) c ->
-                    storeCustomExportFormats(
-                        exportPreferences.getCustomExporters()
-                    )
+                    storeCustomExportFormats(exportPreferences.getCustomExporters())
             );
 
         return exportPreferences;
@@ -3122,10 +2816,7 @@ private void storeExportSaveOrder(SaveOrder saveOrder) {
 
         long saveOrderCount = saveOrder.getSortCriteria().size();
         if (saveOrderCount >= 1) {
-            put(
-                EXPORT_PRIMARY_SORT_FIELD,
-                saveOrder.getSortCriteria().get(0).field.getName()
-            );
+            put(EXPORT_PRIMARY_SORT_FIELD, saveOrder.getSortCriteria().get(0).field.getName());
             putBoolean(
                 EXPORT_PRIMARY_SORT_DESCENDING,
                 saveOrder.getSortCriteria().get(0).descending
@@ -3135,10 +2826,7 @@ private void storeExportSaveOrder(SaveOrder saveOrder) {
             putBoolean(EXPORT_PRIMARY_SORT_DESCENDING, false);
         }
         if (saveOrderCount >= 2) {
-            put(
-                EXPORT_SECONDARY_SORT_FIELD,
-                saveOrder.getSortCriteria().get(1).field.getName()
-            );
+            put(EXPORT_SECONDARY_SORT_FIELD, saveOrder.getSortCriteria().get(1).field.getName());
             putBoolean(
                 EXPORT_SECONDARY_SORT_DESCENDING,
                 saveOrder.getSortCriteria().get(1).descending
@@ -3148,10 +2836,7 @@ private void storeExportSaveOrder(SaveOrder saveOrder) {
             putBoolean(EXPORT_SECONDARY_SORT_DESCENDING, false);
         }
         if (saveOrderCount >= 3) {
-            put(
-                EXPORT_TERTIARY_SORT_FIELD,
-                saveOrder.getSortCriteria().get(2).field.getName()
-            );
+            put(EXPORT_TERTIARY_SORT_FIELD, saveOrder.getSortCriteria().get(2).field.getName());
             putBoolean(
                 EXPORT_TERTIARY_SORT_DESCENDING,
                 saveOrder.getSortCriteria().get(2).descending
@@ -3166,14 +2851,10 @@ private void storeExportSaveOrder(SaveOrder saveOrder) {
      * For the export configuration, generates the SelfContainedSaveOrder having the reference to TABLE resolved.
      */
     public SelfContainedSaveOrder getSelfContainedTableSaveOrder() {
-        List<MainTableColumnModel> sortOrder = getMainTableColumnPreferences()
-            .getColumnSortOrder();
+        List<MainTableColumnModel> sortOrder = getMainTableColumnPreferences().getColumnSortOrder();
         return new SelfContainedSaveOrder(
             SaveOrder.OrderType.SPECIFIED,
-            sortOrder
-                .stream()
-                .flatMap(model -> model.getSortCriteria().stream())
-                .toList()
+            sortOrder.stream().flatMap(model -> model.getSortCriteria().stream()).toList()
         );
     }
 
@@ -3196,10 +2877,8 @@ public SelfContainedSaveConfiguration getSelfContainedExportConfiguration() {
     }
 
     private List<TemplateExporter> getCustomExportFormats() {
-        LayoutFormatterPreferences layoutPreferences =
-            getLayoutFormatterPreferences();
-        SelfContainedSaveConfiguration saveConfiguration =
-            getSelfContainedExportConfiguration();
+        LayoutFormatterPreferences layoutPreferences = getLayoutFormatterPreferences();
+        SelfContainedSaveConfiguration saveConfiguration = getSelfContainedExportConfiguration();
         List<TemplateExporter> formats = new ArrayList<>();
 
         for (String toImport : getSeries(CUSTOM_EXPORT_FORMAT)) {
@@ -3223,14 +2902,8 @@ private void storeCustomExportFormats(List<TemplateExporter> exporters) {
         } else {
             for (int i = 0; i < exporters.size(); i++) {
                 List<String> exporterData = new ArrayList<>();
-                exporterData.add(
-                    EXPORTER_NAME_INDEX,
-                    exporters.get(i).getName()
-                );
-                exporterData.add(
-                    EXPORTER_FILENAME_INDEX,
-                    exporters.get(i).getLayoutFileName()
-                );
+                exporterData.add(EXPORTER_NAME_INDEX, 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,
@@ -3271,8 +2944,7 @@ public PreviewPreferences getPreviewPreferences() {
         previewPreferences
             .getLayoutCycle()
             .addListener(
-                (InvalidationListener) c ->
-                    storePreviewLayouts(previewPreferences.getLayoutCycle())
+                (InvalidationListener) c -> storePreviewLayouts(previewPreferences.getLayoutCycle())
             );
         EasyBind.listen(
             previewPreferences.layoutCyclePositionProperty(),
@@ -3323,18 +2995,13 @@ private List<PreviewLayout> getPreviewLayouts(String style) {
             .collect(Collectors.toList());
     }
 
-    private void storePreviewLayouts(
-        ObservableList<PreviewLayout> previewCycle
-    ) {
+    private void storePreviewLayouts(ObservableList<PreviewLayout> previewCycle) {
         putStringList(
             CYCLE_PREVIEW,
             previewCycle
                 .stream()
                 .map(layout -> {
-                    if (
-                        layout instanceof
-                        CitationStylePreviewLayout citationStyleLayout
-                    ) {
+                    if (layout instanceof CitationStylePreviewLayout citationStyleLayout) {
                         return citationStyleLayout.getFilePath();
                     } else {
                         return layout.getDisplayName();
@@ -3380,14 +3047,11 @@ public SidePanePreferences getSidePanePreferences() {
             .getPreferredPositions()
             .addListener(
                 (InvalidationListener) listener ->
-                    storeSidePanePreferredPositions(
-                        sidePanePreferences.getPreferredPositions()
-                    )
+                    storeSidePanePreferredPositions(sidePanePreferences.getPreferredPositions())
             );
         EasyBind.listen(
             sidePanePreferences.webSearchFetcherSelectedProperty(),
-            (obs, oldValue, newValue) ->
-                putInt(SELECTED_FETCHER_INDEX, newValue)
+            (obs, oldValue, newValue) -> putInt(SELECTED_FETCHER_INDEX, newValue)
         );
 
         return sidePanePreferences;
@@ -3408,57 +3072,33 @@ private Set<SidePaneType> getVisibleSidePanes() {
     }
 
     private void storeVisibleSidePanes(Set<SidePaneType> visiblePanes) {
-        putBoolean(
-            WEB_SEARCH_VISIBLE,
-            visiblePanes.contains(SidePaneType.WEB_SEARCH)
-        );
-        putBoolean(
-            GROUP_SIDEPANE_VISIBLE,
-            visiblePanes.contains(SidePaneType.GROUPS)
-        );
-        putBoolean(
-            OO_SHOW_PANEL,
-            visiblePanes.contains(SidePaneType.OPEN_OFFICE)
-        );
+        putBoolean(WEB_SEARCH_VISIBLE, visiblePanes.contains(SidePaneType.WEB_SEARCH));
+        putBoolean(GROUP_SIDEPANE_VISIBLE, visiblePanes.contains(SidePaneType.GROUPS));
+        putBoolean(OO_SHOW_PANEL, visiblePanes.contains(SidePaneType.OPEN_OFFICE));
     }
 
     private Map<SidePaneType, Integer> getSidePanePreferredPositions() {
         Map<SidePaneType, Integer> preferredPositions = new HashMap<>();
 
         List<String> componentNames = getStringList(SIDE_PANE_COMPONENT_NAMES);
-        List<String> componentPositions = getStringList(
-            SIDE_PANE_COMPONENT_PREFERRED_POSITIONS
-        );
+        List<String> componentPositions = getStringList(SIDE_PANE_COMPONENT_PREFERRED_POSITIONS);
 
         for (int i = 0; i < componentNames.size(); ++i) {
             String name = componentNames.get(i);
             try {
                 SidePaneType type = Enum.valueOf(SidePaneType.class, name);
-                preferredPositions.put(
-                    type,
-                    Integer.parseInt(componentPositions.get(i))
-                );
+                preferredPositions.put(type, Integer.parseInt(componentPositions.get(i)));
             } catch (NumberFormatException e) {
-                LOGGER.debug(
-                    "Invalid number format for side pane component '" +
-                    name +
-                    "'",
-                    e
-                );
+                LOGGER.debug("Invalid number format for side pane component '" + name + "'", e);
             } catch (IllegalArgumentException e) {
-                LOGGER.debug(
-                    "Following component is not a side pane: '" + name + "'",
-                    e
-                );
+                LOGGER.debug("Following component is not a side pane: '" + name + "'", e);
             }
         }
 
         return preferredPositions;
     }
 
-    private void storeSidePanePreferredPositions(
-        Map<SidePaneType, Integer> preferredPositions
-    ) {
+    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()
@@ -3497,10 +3137,7 @@ public CleanupPreferences getCleanupPreferences() {
                 new FieldFormatterCleanups(
                     getBoolean(CLEANUP_FIELD_FORMATTERS_ENABLED),
                     FieldFormatterCleanups.parse(
-                        StringUtil.unifyLineBreaks(
-                            get(CLEANUP_FIELD_FORMATTERS),
-                            ""
-                        )
+                        StringUtil.unifyLineBreaks(get(CLEANUP_FIELD_FORMATTERS), "")
                     )
                 )
             );
@@ -3522,10 +3159,7 @@ public CleanupPreferences getCleanupPreferences() {
         EasyBind.listen(
             cleanupPreferences.fieldFormatterCleanupsProperty(),
             (fieldFormatters, oldValue, newValue) -> {
-                putBoolean(
-                    CLEANUP_FIELD_FORMATTERS_ENABLED,
-                    newValue.isEnabled()
-                );
+                putBoolean(CLEANUP_FIELD_FORMATTERS_ENABLED, newValue.isEnabled());
                 put(
                     CLEANUP_FIELD_FORMATTERS,
                     FieldFormatterCleanups.getMetaDataString(
@@ -3545,16 +3179,12 @@ 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() {
+    private static EnumSet<CleanupPreferences.CleanupStep> getDefaultCleanupJobs() {
         EnumSet<CleanupPreferences.CleanupStep> activeJobs = EnumSet.allOf(
             CleanupPreferences.CleanupStep.class
         );
@@ -3602,23 +3232,19 @@ public GuiPreferences getGuiPreferences() {
 
         EasyBind.listen(
             guiPreferences.positionXProperty(),
-            (obs, oldValue, newValue) ->
-                putDouble(POS_X, newValue.doubleValue())
+            (obs, oldValue, newValue) -> putDouble(POS_X, newValue.doubleValue())
         );
         EasyBind.listen(
             guiPreferences.positionYProperty(),
-            (obs, oldValue, newValue) ->
-                putDouble(POS_Y, newValue.doubleValue())
+            (obs, oldValue, newValue) -> putDouble(POS_Y, newValue.doubleValue())
         );
         EasyBind.listen(
             guiPreferences.sizeXProperty(),
-            (obs, oldValue, newValue) ->
-                putDouble(SIZE_X, newValue.doubleValue())
+            (obs, oldValue, newValue) -> putDouble(SIZE_X, newValue.doubleValue())
         );
         EasyBind.listen(
             guiPreferences.sizeYProperty(),
-            (obs, oldValue, newValue) ->
-                putDouble(SIZE_Y, newValue.doubleValue())
+            (obs, oldValue, newValue) -> putDouble(SIZE_Y, newValue.doubleValue())
         );
         EasyBind.listen(
             guiPreferences.windowMaximisedProperty(),
@@ -3635,10 +3261,7 @@ public GuiPreferences getGuiPreferences() {
                     if (change.getList().isEmpty()) {
                         prefs.remove(LAST_EDITED);
                     } else {
-                        putStringList(
-                            LAST_EDITED,
-                            guiPreferences.getLastFilesOpened()
-                        );
+                        putStringList(LAST_EDITED, guiPreferences.getLastFilesOpened());
                     }
                 }
             );
@@ -3655,8 +3278,7 @@ public GuiPreferences getGuiPreferences() {
         guiPreferences
             .getFileHistory()
             .addListener(
-                (InvalidationListener) change ->
-                    storeFileHistory(guiPreferences.getFileHistory())
+                (InvalidationListener) change -> storeFileHistory(guiPreferences.getFileHistory())
             );
         EasyBind.listen(
             guiPreferences.lastSelectedIdBasedFetcherProperty(),
@@ -3664,13 +3286,11 @@ public GuiPreferences getGuiPreferences() {
         );
         EasyBind.listen(
             guiPreferences.mergeDiffModeProperty(),
-            (obs, oldValue, newValue) ->
-                put(MERGE_ENTRIES_DIFF_MODE, newValue.name())
+            (obs, oldValue, newValue) -> put(MERGE_ENTRIES_DIFF_MODE, newValue.name())
         );
         EasyBind.listen(
             guiPreferences.mergeShouldShowDiffProperty(),
-            (obs, oldValue, newValue) ->
-                putBoolean(MERGE_ENTRIES_SHOULD_SHOW_DIFF, newValue)
+            (obs, oldValue, newValue) -> putBoolean(MERGE_ENTRIES_SHOULD_SHOW_DIFF, newValue)
         );
         EasyBind.listen(
             guiPreferences.mergeShouldShowUnifiedDiffProperty(),
@@ -3679,37 +3299,28 @@ public GuiPreferences getGuiPreferences() {
         );
         EasyBind.listen(
             guiPreferences.mergeHighlightWordsProperty(),
-            (obs, oldValue, newValue) ->
-                putBoolean(MERGE_ENTRIES_HIGHLIGHT_WORDS, newValue)
+            (obs, oldValue, newValue) -> putBoolean(MERGE_ENTRIES_HIGHLIGHT_WORDS, newValue)
         );
         EasyBind.listen(
             guiPreferences.sidePaneWidthProperty(),
-            (obs, oldValue, newValue) ->
-                putDouble(SIDE_PANE_WIDTH, newValue.doubleValue())
+            (obs, oldValue, newValue) -> putDouble(SIDE_PANE_WIDTH, newValue.doubleValue())
         );
         EasyBind.listen(
             guiPreferences.mergeShowChangedFieldOnlyProperty(),
-            (obs, oldValue, newValue) ->
-                putBoolean(MERGE_SHOW_ONLY_CHANGED_FIELDS, newValue)
+            (obs, oldValue, newValue) -> putBoolean(MERGE_SHOW_ONLY_CHANGED_FIELDS, newValue)
         );
 
         return guiPreferences;
     }
 
     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()
+            history.stream().map(Path::toAbsolutePath).map(Path::toString).toList()
         );
     }
 
@@ -3725,14 +3336,11 @@ public SearchPreferences getSearchPreferences() {
 
         SearchDisplayMode searchDisplayMode;
         try {
-            searchDisplayMode =
-                SearchDisplayMode.valueOf(get(SEARCH_DISPLAY_MODE));
+            searchDisplayMode = SearchDisplayMode.valueOf(get(SEARCH_DISPLAY_MODE));
         } catch (IllegalArgumentException ex) {
             // Should only occur when the searchmode is set directly via preferences.put and the enum was not used
             searchDisplayMode =
-                SearchDisplayMode.valueOf(
-                    (String) defaults.get(SEARCH_DISPLAY_MODE)
-                );
+                SearchDisplayMode.valueOf((String) defaults.get(SEARCH_DISPLAY_MODE));
         }
 
         searchPreferences =
@@ -3752,11 +3360,7 @@ public SearchPreferences getSearchPreferences() {
             (obs, oldValue, newValue) ->
                 put(
                     SEARCH_DISPLAY_MODE,
-                    Objects
-                        .requireNonNull(
-                            searchPreferences.getSearchDisplayMode()
-                        )
-                        .toString()
+                    Objects.requireNonNull(searchPreferences.getSearchDisplayMode()).toString()
                 )
         );
         searchPreferences
@@ -3773,9 +3377,7 @@ public SearchPreferences getSearchPreferences() {
                         SEARCH_REG_EXP,
                         searchPreferences
                             .getObservableSearchFlags()
-                            .contains(
-                                SearchRules.SearchFlags.REGULAR_EXPRESSION
-                            )
+                            .contains(SearchRules.SearchFlags.REGULAR_EXPRESSION)
                     );
                     putBoolean(
                         SEARCH_FULLTEXT,
@@ -3787,9 +3389,7 @@ public SearchPreferences getSearchPreferences() {
                         SEARCH_KEEP_SEARCH_STRING,
                         searchPreferences
                             .getObservableSearchFlags()
-                            .contains(
-                                SearchRules.SearchFlags.KEEP_SEARCH_STRING
-                            )
+                            .contains(SearchRules.SearchFlags.KEEP_SEARCH_STRING)
                     );
                 }
             );
@@ -3804,18 +3404,12 @@ public SearchPreferences getSearchPreferences() {
         EasyBind.listen(
             searchPreferences.getSearchWindowHeightProperty(),
             (obs, oldValue, newValue) ->
-                putDouble(
-                    SEARCH_WINDOW_HEIGHT,
-                    searchPreferences.getSearchWindowHeight()
-                )
+                putDouble(SEARCH_WINDOW_HEIGHT, searchPreferences.getSearchWindowHeight())
         );
         EasyBind.listen(
             searchPreferences.getSearchWindowWidthProperty(),
             (obs, oldValue, newValue) ->
-                putDouble(
-                    SEARCH_WINDOW_WIDTH,
-                    searchPreferences.getSearchWindowWidth()
-                )
+                putDouble(SEARCH_WINDOW_WIDTH, searchPreferences.getSearchWindowWidth())
         );
 
         return searchPreferences;
@@ -3839,8 +3433,7 @@ public XmpPreferences getXmpPreferences() {
 
         EasyBind.listen(
             xmpPreferences.useXmpPrivacyFilterProperty(),
-            (obs, oldValue, newValue) ->
-                putBoolean(USE_XMP_PRIVACY_FILTER, newValue)
+            (obs, oldValue, newValue) -> putBoolean(USE_XMP_PRIVACY_FILTER, newValue)
         );
         xmpPreferences
             .getXmpPrivacyFilter()
@@ -3875,10 +3468,7 @@ public NameFormatterPreferences getNameFormatterPreferences() {
             .getNameFormatterKey()
             .addListener(
                 (InvalidationListener) change ->
-                    putStringList(
-                        NAME_FORMATER_KEY,
-                        nameFormatterPreferences.getNameFormatterKey()
-                    )
+                    putStringList(NAME_FORMATER_KEY, nameFormatterPreferences.getNameFormatterKey())
             );
         nameFormatterPreferences
             .getNameFormatterValue()
@@ -3899,8 +3489,7 @@ public AutoCompletePreferences getAutoCompletePreferences() {
             return autoCompletePreferences;
         }
 
-        AutoCompletePreferences.NameFormat nameFormat =
-            AutoCompletePreferences.NameFormat.BOTH;
+        AutoCompletePreferences.NameFormat nameFormat = AutoCompletePreferences.NameFormat.BOTH;
         if (getBoolean(AUTOCOMPLETER_LAST_FIRST)) {
             nameFormat = AutoCompletePreferences.NameFormat.LAST_FIRST;
         } else if (getBoolean(AUTOCOMPLETER_FIRST_LAST)) {
@@ -3910,9 +3499,7 @@ public AutoCompletePreferences getAutoCompletePreferences() {
         autoCompletePreferences =
             new AutoCompletePreferences(
                 getBoolean(AUTO_COMPLETE),
-                AutoCompleteFirstNameMode.parse(
-                    get(AUTOCOMPLETER_FIRSTNAME_MODE)
-                ),
+                AutoCompleteFirstNameMode.parse(get(AUTOCOMPLETER_FIRSTNAME_MODE)),
                 nameFormat,
                 getStringList(AUTOCOMPLETER_COMPLETE_FIELDS)
                     .stream()
@@ -3926,8 +3513,7 @@ public AutoCompletePreferences getAutoCompletePreferences() {
         );
         EasyBind.listen(
             autoCompletePreferences.firstNameModeProperty(),
-            (obs, oldValue, newValue) ->
-                put(AUTOCOMPLETER_FIRSTNAME_MODE, newValue.name())
+            (obs, oldValue, newValue) -> put(AUTOCOMPLETER_FIRSTNAME_MODE, newValue.name())
         );
         autoCompletePreferences
             .getCompleteFields()
@@ -3973,13 +3559,11 @@ public SpecialFieldsPreferences getSpecialFieldsPreferences() {
             return specialFieldsPreferences;
         }
 
-        specialFieldsPreferences =
-            new SpecialFieldsPreferences(getBoolean(SPECIALFIELDSENABLED));
+        specialFieldsPreferences = new SpecialFieldsPreferences(getBoolean(SPECIALFIELDSENABLED));
 
         EasyBind.listen(
             specialFieldsPreferences.specialFieldsEnabledProperty(),
-            (obs, oldValue, newValue) ->
-                putBoolean(SPECIALFIELDSENABLED, newValue)
+            (obs, oldValue, newValue) -> putBoolean(SPECIALFIELDSENABLED, newValue)
         );
 
         return specialFieldsPreferences;
@@ -4001,13 +3585,11 @@ public MrDlibPreferences getMrDlibPreferences() {
 
         EasyBind.listen(
             mrDlibPreferences.acceptRecommendationsProperty(),
-            (obs, oldValue, newValue) ->
-                putBoolean(ACCEPT_RECOMMENDATIONS, newValue)
+            (obs, oldValue, newValue) -> putBoolean(ACCEPT_RECOMMENDATIONS, newValue)
         );
         EasyBind.listen(
             mrDlibPreferences.sendLanguageProperty(),
-            (obs, oldValue, newValue) ->
-                putBoolean(SEND_LANGUAGE_DATA, newValue)
+            (obs, oldValue, newValue) -> putBoolean(SEND_LANGUAGE_DATA, newValue)
         );
         EasyBind.listen(
             mrDlibPreferences.sendOsProperty(),
@@ -4015,8 +3597,7 @@ public MrDlibPreferences getMrDlibPreferences() {
         );
         EasyBind.listen(
             mrDlibPreferences.sendTimezoneProperty(),
-            (obs, oldValue, newValue) ->
-                putBoolean(SEND_TIMEZONE_DATA, newValue)
+            (obs, oldValue, newValue) -> putBoolean(SEND_TIMEZONE_DATA, newValue)
         );
 
         return mrDlibPreferences;
@@ -4104,46 +3685,36 @@ public ImporterPreferences getImporterPreferences() {
         );
         EasyBind.listen(
             importerPreferences.generateNewKeyOnImportProperty(),
-            (obs, oldValue, newValue) ->
-                putBoolean(GENERATE_KEY_ON_IMPORT, newValue)
+            (obs, oldValue, newValue) -> putBoolean(GENERATE_KEY_ON_IMPORT, newValue)
         );
         EasyBind.listen(
             importerPreferences.importWorkingDirectoryProperty(),
-            (obs, oldValue, newValue) ->
-                put(IMPORT_WORKING_DIRECTORY, newValue.toString())
+            (obs, oldValue, newValue) -> put(IMPORT_WORKING_DIRECTORY, newValue.toString())
         );
         EasyBind.listen(
             importerPreferences.warnAboutDuplicatesOnImportProperty(),
-            (obs, oldValue, newValue) ->
-                putBoolean(WARN_ABOUT_DUPLICATES_IN_INSPECTION, newValue)
+            (obs, oldValue, newValue) -> putBoolean(WARN_ABOUT_DUPLICATES_IN_INSPECTION, newValue)
         );
         EasyBind.listen(
             importerPreferences.persistCustomKeysProperty(),
-            (obs, oldValue, newValue) ->
-                putBoolean(FETCHER_CUSTOM_KEY_PERSIST, newValue)
+            (obs, oldValue, newValue) -> putBoolean(FETCHER_CUSTOM_KEY_PERSIST, newValue)
         );
         importerPreferences
             .getApiKeys()
             .addListener(
-                (InvalidationListener) c ->
-                    storeFetcherKeys(importerPreferences.getApiKeys())
+                (InvalidationListener) c -> storeFetcherKeys(importerPreferences.getApiKeys())
             );
         importerPreferences
             .getCustomImporters()
             .addListener(
                 (InvalidationListener) c ->
-                    storeCustomImportFormats(
-                        importerPreferences.getCustomImporters()
-                    )
+                    storeCustomImportFormats(importerPreferences.getCustomImporters())
             );
         importerPreferences
             .getCatalogs()
             .addListener(
                 (InvalidationListener) c ->
-                    putStringList(
-                        SEARCH_CATALOGS,
-                        importerPreferences.getCatalogs()
-                    )
+                    putStringList(SEARCH_CATALOGS, importerPreferences.getCatalogs())
             );
 
         return importerPreferences;
@@ -4157,20 +3728,10 @@ private Set<CustomImporter> getCustomImportFormats() {
             try {
                 if (importerString.size() == 2) {
                     // New format: basePath, className
-                    importers.add(
-                        new CustomImporter(
-                            importerString.get(0),
-                            importerString.get(1)
-                        )
-                    );
+                    importers.add(new CustomImporter(importerString.get(0), importerString.get(1)));
                 } else {
                     // Old format: name, cliId, className, basePath
-                    importers.add(
-                        new CustomImporter(
-                            importerString.get(3),
-                            importerString.get(2)
-                        )
-                    );
+                    importers.add(new CustomImporter(importerString.get(3), importerString.get(2)));
                 }
             } catch (Exception e) {
                 LOGGER.warn(
@@ -4186,14 +3747,9 @@ private Set<CustomImporter> getCustomImportFormats() {
 
     private void storeCustomImportFormats(Set<CustomImporter> importers) {
         purgeSeries(CUSTOM_IMPORT_FORMAT, 0);
-        CustomImporter[] importersArray = importers.toArray(
-            new CustomImporter[0]
-        );
+        CustomImporter[] importersArray = importers.toArray(new CustomImporter[0]);
         for (int i = 0; i < importersArray.length; i++) {
-            putStringList(
-                CUSTOM_IMPORT_FORMAT + i,
-                importersArray[i].getAsStringList()
-            );
+            putStringList(CUSTOM_IMPORT_FORMAT + i, importersArray[i].getAsStringList());
         }
     }
 
@@ -4226,10 +3782,7 @@ private List<String> getFetcherKeysFromKeyring(List<String> names) {
                 try {
                     keys.add(
                         new Password(
-                            keyring.getPassword(
-                                "org.jabref.customapikeys",
-                                fetcher
-                            ),
+                            keyring.getPassword("org.jabref.customapikeys", fetcher),
                             getInternalPreferences().getUserAndHost()
                         )
                             .decrypt()
@@ -4267,18 +3820,12 @@ private void storeFetcherKeys(Set<FetcherApiKey> fetcherApiKeys) {
         }
     }
 
-    private void storeFetcherKeysToKeyring(
-        List<String> names,
-        List<String> keys
-    ) {
+    private void storeFetcherKeysToKeyring(List<String> names, List<String> keys) {
         try (final Keyring keyring = Keyring.create()) {
             for (int i = 0; i < names.size(); i++) {
                 if (StringUtil.isNullOrEmpty(keys.get(i))) {
                     try {
-                        keyring.deletePassword(
-                            "org.jabref.customapikeys",
-                            names.get(i)
-                        );
+                        keyring.deletePassword("org.jabref.customapikeys", names.get(i));
                     } catch (PasswordAccessException ex) {
                         // Already removed
                     }
@@ -4286,10 +3833,7 @@ private void storeFetcherKeysToKeyring(
                     keyring.setPassword(
                         "org.jabref.customapikeys",
                         names.get(i),
-                        new Password(
-                            keys.get(i),
-                            getInternalPreferences().getUserAndHost()
-                        )
+                        new Password(keys.get(i), getInternalPreferences().getUserAndHost())
                             .encrypt()
                     );
                 }
diff --git a/src/main/java/org/jabref/preferences/LibraryPreferences.java b/src/main/java/org/jabref/preferences/LibraryPreferences.java
index 2068da27d73..b9fb689ef63 100644
--- a/src/main/java/org/jabref/preferences/LibraryPreferences.java
+++ b/src/main/java/org/jabref/preferences/LibraryPreferences.java
@@ -17,10 +17,8 @@ public LibraryPreferences(
         boolean alwaysReformatOnSave,
         boolean autoSave
     ) {
-        this.defaultBibDatabaseMode =
-            new SimpleObjectProperty<>(defaultBibDatabaseMode);
-        this.alwaysReformatOnSave =
-            new SimpleBooleanProperty(alwaysReformatOnSave);
+        this.defaultBibDatabaseMode = new SimpleObjectProperty<>(defaultBibDatabaseMode);
+        this.alwaysReformatOnSave = new SimpleBooleanProperty(alwaysReformatOnSave);
         this.autoSave = new SimpleBooleanProperty(autoSave);
     }
 
@@ -32,9 +30,7 @@ public ObjectProperty<BibDatabaseMode> defaultBibDatabaseModeProperty() {
         return defaultBibDatabaseMode;
     }
 
-    public void setDefaultBibDatabaseMode(
-        BibDatabaseMode defaultBibDatabaseMode
-    ) {
+    public void setDefaultBibDatabaseMode(BibDatabaseMode defaultBibDatabaseMode) {
         this.defaultBibDatabaseMode.set(defaultBibDatabaseMode);
     }
 
diff --git a/src/main/java/org/jabref/preferences/MrDlibPreferences.java b/src/main/java/org/jabref/preferences/MrDlibPreferences.java
index 5fca1959e99..3b65f800423 100644
--- a/src/main/java/org/jabref/preferences/MrDlibPreferences.java
+++ b/src/main/java/org/jabref/preferences/MrDlibPreferences.java
@@ -16,8 +16,7 @@ public MrDlibPreferences(
         boolean shouldSendOs,
         boolean shouldSendTimezone
     ) {
-        this.acceptRecommendations =
-            new SimpleBooleanProperty(acceptRecommendations);
+        this.acceptRecommendations = new SimpleBooleanProperty(acceptRecommendations);
         this.sendLanguage = new SimpleBooleanProperty(shouldSendLanguage);
         this.sendOs = new SimpleBooleanProperty(shouldSendOs);
         this.sendTimezone = new SimpleBooleanProperty(shouldSendTimezone);
diff --git a/src/main/java/org/jabref/preferences/PreferencesFilter.java b/src/main/java/org/jabref/preferences/PreferencesFilter.java
index 82994e880ca..86651b992ca 100644
--- a/src/main/java/org/jabref/preferences/PreferencesFilter.java
+++ b/src/main/java/org/jabref/preferences/PreferencesFilter.java
@@ -23,11 +23,7 @@ public List<PreferenceOption> getPreferenceOptions() {
             .entrySet()
             .stream()
             .map(entry ->
-                new PreferenceOption(
-                    entry.getKey(),
-                    entry.getValue(),
-                    defaults.get(entry.getKey())
-                )
+                new PreferenceOption(entry.getKey(), entry.getValue(), defaults.get(entry.getKey()))
             )
             .collect(Collectors.toList());
     }
@@ -46,8 +42,7 @@ public enum PreferenceType {
         STRING,
     }
 
-    public static class PreferenceOption
-        implements Comparable<PreferenceOption> {
+    public static class PreferenceOption implements Comparable<PreferenceOption> {
 
         private final String key;
         private final Object value;
@@ -60,13 +55,8 @@ public PreferenceOption(String key, Object value, Object defaultValue) {
             this.defaultValue = Optional.ofNullable(defaultValue);
             this.type = Objects.requireNonNull(getType(value));
 
-            if (
-                (defaultValue != null) &&
-                !Objects.equals(this.type, getType(defaultValue))
-            ) {
-                throw new IllegalStateException(
-                    "types must match between default value and value"
-                );
+            if ((defaultValue != null) && !Objects.equals(this.type, getType(defaultValue))) {
+                throw new IllegalStateException("types must match between default value and value");
             }
         }
 
@@ -90,13 +80,7 @@ public boolean isChanged() {
 
         @Override
         public String toString() {
-            return String.format(
-                "%s: %s=%s (%s)",
-                type,
-                key,
-                value,
-                defaultValue.orElse("NULL")
-            );
+            return String.format("%s: %s=%s (%s)", type, key, value, defaultValue.orElse("NULL"));
         }
 
         public String getKey() {
diff --git a/src/main/java/org/jabref/preferences/PreferencesService.java b/src/main/java/org/jabref/preferences/PreferencesService.java
index 4d222269b35..8ff3c6be240 100644
--- a/src/main/java/org/jabref/preferences/PreferencesService.java
+++ b/src/main/java/org/jabref/preferences/PreferencesService.java
@@ -77,9 +77,7 @@ public interface PreferencesService {
 
     BibEntryTypesManager getCustomEntryTypesRepository();
 
-    void storeCustomEntryTypesRepository(
-        BibEntryTypesManager entryTypesManager
-    );
+    void storeCustomEntryTypesRepository(BibEntryTypesManager entryTypesManager);
 
     CleanupPreferences getCleanupPreferences();
 
diff --git a/src/main/java/org/jabref/preferences/PreviewPreferences.java b/src/main/java/org/jabref/preferences/PreviewPreferences.java
index 70826b082c3..16d96c4ae8a 100644
--- a/src/main/java/org/jabref/preferences/PreviewPreferences.java
+++ b/src/main/java/org/jabref/preferences/PreviewPreferences.java
@@ -30,14 +30,10 @@ public PreviewPreferences(
         boolean showPreviewAsExtraTab
     ) {
         this.layoutCycle = FXCollections.observableArrayList(layoutCycle);
-        this.layoutCyclePosition =
-            new SimpleIntegerProperty(layoutCyclePosition);
-        this.customPreviewLayout =
-            new SimpleObjectProperty<>(customPreviewLayout);
-        this.defaultCustomPreviewLayout =
-            new SimpleStringProperty(defaultCustomPreviewLayout);
-        this.showPreviewAsExtraTab =
-            new SimpleBooleanProperty(showPreviewAsExtraTab);
+        this.layoutCyclePosition = new SimpleIntegerProperty(layoutCyclePosition);
+        this.customPreviewLayout = new SimpleObjectProperty<>(customPreviewLayout);
+        this.defaultCustomPreviewLayout = new SimpleStringProperty(defaultCustomPreviewLayout);
+        this.showPreviewAsExtraTab = new SimpleBooleanProperty(showPreviewAsExtraTab);
     }
 
     public ObservableList<PreviewLayout> getLayoutCycle() {
@@ -60,9 +56,7 @@ public void setLayoutCyclePosition(int position) {
             while (previewCyclePosition < 0) {
                 previewCyclePosition += layoutCycle.size();
             }
-            this.layoutCyclePosition.setValue(
-                    previewCyclePosition % layoutCycle.size()
-                );
+            this.layoutCyclePosition.setValue(previewCyclePosition % layoutCycle.size());
         }
     }
 
@@ -82,9 +76,7 @@ public TextBasedPreviewLayout getCustomPreviewLayout() {
         return customPreviewLayout.getValue();
     }
 
-    public ObjectProperty<
-        TextBasedPreviewLayout
-    > customPreviewLayoutProperty() {
+    public ObjectProperty<TextBasedPreviewLayout> customPreviewLayoutProperty() {
         return customPreviewLayout;
     }
 
diff --git a/src/main/java/org/jabref/preferences/PushToApplicationPreferences.java b/src/main/java/org/jabref/preferences/PushToApplicationPreferences.java
index 19c9befebd1..9deea172463 100644
--- a/src/main/java/org/jabref/preferences/PushToApplicationPreferences.java
+++ b/src/main/java/org/jabref/preferences/PushToApplicationPreferences.java
@@ -20,10 +20,8 @@ public PushToApplicationPreferences(
         String emacsArguments,
         String vimServer
     ) {
-        this.activeApplicationName =
-            new SimpleStringProperty(activeApplicationName);
-        this.commandPaths =
-            new SimpleMapProperty<>(FXCollections.observableMap(commandPaths));
+        this.activeApplicationName = new SimpleStringProperty(activeApplicationName);
+        this.commandPaths = new SimpleMapProperty<>(FXCollections.observableMap(commandPaths));
         this.emacsArguments = new SimpleStringProperty(emacsArguments);
         this.vimServer = new SimpleStringProperty(vimServer);
     }
diff --git a/src/main/java/org/jabref/preferences/SearchPreferences.java b/src/main/java/org/jabref/preferences/SearchPreferences.java
index 735a782d904..5f9641d9fe9 100644
--- a/src/main/java/org/jabref/preferences/SearchPreferences.java
+++ b/src/main/java/org/jabref/preferences/SearchPreferences.java
@@ -18,8 +18,7 @@ public class SearchPreferences {
     private final ObservableSet<SearchFlags> searchFlags;
     private final BooleanProperty keepWindowOnTop;
 
-    private final DoubleProperty searchWindowHeight =
-        new SimpleDoubleProperty();
+    private final DoubleProperty searchWindowHeight = new SimpleDoubleProperty();
     private final DoubleProperty searchWindowWidth = new SimpleDoubleProperty();
 
     public SearchPreferences(
@@ -35,8 +34,7 @@ public SearchPreferences(
         this.searchDisplayMode = new SimpleObjectProperty<>(searchDisplayMode);
         this.keepWindowOnTop = new SimpleBooleanProperty(keepWindowOnTop);
 
-        searchFlags =
-            FXCollections.observableSet(EnumSet.noneOf(SearchFlags.class));
+        searchFlags = FXCollections.observableSet(EnumSet.noneOf(SearchFlags.class));
         if (isCaseSensitive) {
             searchFlags.add(SearchFlags.CASE_SENSITIVE);
         }
diff --git a/src/main/java/org/jabref/preferences/SidePanePreferences.java b/src/main/java/org/jabref/preferences/SidePanePreferences.java
index 6396c24914c..d7b51467019 100644
--- a/src/main/java/org/jabref/preferences/SidePanePreferences.java
+++ b/src/main/java/org/jabref/preferences/SidePanePreferences.java
@@ -21,10 +21,8 @@ public SidePanePreferences(
         int webSearchFetcherSelected
     ) {
         this.visiblePanes = FXCollections.observableSet(visiblePanes);
-        this.preferredPositions =
-            FXCollections.observableMap(preferredPositions);
-        this.webSearchFetcherSelected =
-            new SimpleIntegerProperty(webSearchFetcherSelected);
+        this.preferredPositions = FXCollections.observableMap(preferredPositions);
+        this.webSearchFetcherSelected = new SimpleIntegerProperty(webSearchFetcherSelected);
     }
 
     public ObservableSet<SidePaneType> visiblePanes() {
diff --git a/src/main/java/org/jabref/preferences/TelemetryPreferences.java b/src/main/java/org/jabref/preferences/TelemetryPreferences.java
index 9a760fbb26b..c60e54076d1 100644
--- a/src/main/java/org/jabref/preferences/TelemetryPreferences.java
+++ b/src/main/java/org/jabref/preferences/TelemetryPreferences.java
@@ -16,10 +16,8 @@ public TelemetryPreferences(
         boolean shouldAskToCollectTelemetry,
         String userId
     ) {
-        this.collectTelemetry =
-            new SimpleBooleanProperty(shouldCollectTelemetry);
-        this.askToCollectTelemetry =
-            new SimpleBooleanProperty(shouldAskToCollectTelemetry);
+        this.collectTelemetry = new SimpleBooleanProperty(shouldCollectTelemetry);
+        this.askToCollectTelemetry = new SimpleBooleanProperty(shouldAskToCollectTelemetry);
         this.userId = new SimpleStringProperty(userId);
     }
 
diff --git a/src/main/java/org/jabref/preferences/WorkspacePreferences.java b/src/main/java/org/jabref/preferences/WorkspacePreferences.java
index 4640732adf2..23031faa1ba 100644
--- a/src/main/java/org/jabref/preferences/WorkspacePreferences.java
+++ b/src/main/java/org/jabref/preferences/WorkspacePreferences.java
@@ -41,8 +41,7 @@ public WorkspacePreferences(
         this.defaultFontSize = new SimpleIntegerProperty(defaultFontSize);
         this.theme = new SimpleObjectProperty<>(theme);
         this.themeSyncOs = new SimpleBooleanProperty(themeSyncOs);
-        this.shouldOpenLastEdited =
-            new SimpleBooleanProperty(shouldOpenLastEdited);
+        this.shouldOpenLastEdited = new SimpleBooleanProperty(shouldOpenLastEdited);
         this.showAdvancedHints = new SimpleBooleanProperty(showAdvancedHints);
         this.warnAboutDuplicatesInInspection =
             new SimpleBooleanProperty(warnAboutDuplicatesInInspection);
@@ -145,12 +144,8 @@ public BooleanProperty warnAboutDuplicatesInInspectionProperty() {
         return warnAboutDuplicatesInInspection;
     }
 
-    public void setWarnAboutDuplicatesInInspection(
-        boolean warnAboutDuplicatesInInspection
-    ) {
-        this.warnAboutDuplicatesInInspection.set(
-                warnAboutDuplicatesInInspection
-            );
+    public void setWarnAboutDuplicatesInInspection(boolean warnAboutDuplicatesInInspection) {
+        this.warnAboutDuplicatesInInspection.set(warnAboutDuplicatesInInspection);
     }
 
     public boolean shouldConfirmDelete() {
diff --git a/src/test/java/org/jabref/IconsPropertiesTest.java b/src/test/java/org/jabref/IconsPropertiesTest.java
index b42d308ce0b..1bb7020d666 100644
--- a/src/test/java/org/jabref/IconsPropertiesTest.java
+++ b/src/test/java/org/jabref/IconsPropertiesTest.java
@@ -19,26 +19,19 @@
 public class IconsPropertiesTest {
 
     @Test
-    public void testExistenceOfIconImagesReferencedFromIconsProperties()
-        throws IOException {
+    public void testExistenceOfIconImagesReferencedFromIconsProperties() throws IOException {
         String folder = "src/main/resources/images/external";
         String iconsProperties = "Icons.properties";
-        String iconsPropertiesPath =
-            "src/main/resources/images/" + iconsProperties;
+        String iconsPropertiesPath = "src/main/resources/images/" + iconsProperties;
 
         // load properties
         Properties properties = new Properties();
-        try (
-            Reader reader = Files.newBufferedReader(
-                Path.of(iconsPropertiesPath)
-            )
-        ) {
+        try (Reader reader = Files.newBufferedReader(Path.of(iconsPropertiesPath))) {
             properties.load(reader);
         }
         assertFalse(
             properties.entrySet().isEmpty(),
-            "There must be loaded properties after loading " +
-            iconsPropertiesPath
+            "There must be loaded properties after loading " + iconsPropertiesPath
         );
 
         // check that each key references an existing file
diff --git a/src/test/java/org/jabref/architecture/MainArchitectureTest.java b/src/test/java/org/jabref/architecture/MainArchitectureTest.java
index 883892f8edb..f5108fd89cc 100644
--- a/src/test/java/org/jabref/architecture/MainArchitectureTest.java
+++ b/src/test/java/org/jabref/architecture/MainArchitectureTest.java
@@ -16,8 +16,7 @@
 @AnalyzeClasses(packages = "org.jabref")
 class MainArchitectureTest {
 
-    public static final String CLASS_ORG_JABREF_GLOBALS =
-        "org.jabref.gui.Globals";
+    public static final String CLASS_ORG_JABREF_GLOBALS = "org.jabref.gui.Globals";
     private static final String PACKAGE_JAVAX_SWING = "javax.swing..";
     private static final String PACKAGE_JAVA_AWT = "java.awt..";
     private static final String PACKAGE_ORG_JABREF_GUI = "org.jabref.gui..";
@@ -60,11 +59,7 @@ public static void doNotUseSwing(JavaClasses classes) {
 
     @ArchTest
     public static void doNotUseAssertJ(JavaClasses classes) {
-        noClasses()
-            .should()
-            .accessClassesThat()
-            .resideInAPackage("org.assertj..")
-            .check(classes);
+        noClasses().should().accessClassesThat().resideInAPackage("org.assertj..").check(classes);
     }
 
     @ArchTest
@@ -111,33 +106,15 @@ public static void respectLayeredArchitecture(JavaClasses classes) {
             .whereLayer("Gui")
             .mayOnlyBeAccessedByLayers("Preferences", "Cli") // TODO: Remove preferences here
             .whereLayer("Logic")
-            .mayOnlyBeAccessedByLayers(
-                "Gui",
-                "Cli",
-                "Model",
-                "Migrations",
-                "Preferences"
-            )
+            .mayOnlyBeAccessedByLayers("Gui", "Cli", "Model", "Migrations", "Preferences")
             .whereLayer("Model")
-            .mayOnlyBeAccessedByLayers(
-                "Gui",
-                "Logic",
-                "Migrations",
-                "Cli",
-                "Preferences"
-            )
+            .mayOnlyBeAccessedByLayers("Gui", "Logic", "Migrations", "Cli", "Preferences")
             .whereLayer("Cli")
             .mayNotBeAccessedByAnyLayer()
             .whereLayer("Migrations")
             .mayOnlyBeAccessedByLayers("Logic")
             .whereLayer("Preferences")
-            .mayOnlyBeAccessedByLayers(
-                "Gui",
-                "Logic",
-                "Migrations",
-                "Styletester",
-                "Cli"
-            ) // TODO: Remove logic here
+            .mayOnlyBeAccessedByLayers("Gui", "Logic", "Migrations", "Styletester", "Cli") // TODO: Remove logic here
             .check(classes);
     }
 
@@ -160,17 +137,11 @@ public static void restrictUsagesInModel(JavaClasses classes) {
         // because the PDFSearch needs to access the index of the corresponding database
         noClasses()
             .that()
-            .areNotAssignableFrom(
-                "org.jabref.model.search.rules.ContainBasedSearchRule"
-            )
+            .areNotAssignableFrom("org.jabref.model.search.rules.ContainBasedSearchRule")
             .and()
-            .areNotAssignableFrom(
-                "org.jabref.model.search.rules.RegexBasedSearchRule"
-            )
+            .areNotAssignableFrom("org.jabref.model.search.rules.RegexBasedSearchRule")
             .and()
-            .areNotAssignableFrom(
-                "org.jabref.model.search.rules.GrammarBasedSearchRule"
-            )
+            .areNotAssignableFrom("org.jabref.model.search.rules.GrammarBasedSearchRule")
             .and()
             .resideInAPackage(PACKAGE_ORG_JABREF_MODEL)
             .should()
diff --git a/src/test/java/org/jabref/architecture/TestArchitectureTest.java b/src/test/java/org/jabref/architecture/TestArchitectureTest.java
index 543c5b38d0e..7c02b3fe87a 100644
--- a/src/test/java/org/jabref/architecture/TestArchitectureTest.java
+++ b/src/test/java/org/jabref/architecture/TestArchitectureTest.java
@@ -12,10 +12,7 @@
 /**
  * This class checks JabRef's test classes for architecture quality
  */
-@AnalyzeClasses(
-    packages = "org.jabref",
-    importOptions = ImportOption.OnlyIncludeTests.class
-)
+@AnalyzeClasses(packages = "org.jabref", importOptions = ImportOption.OnlyIncludeTests.class)
 public class TestArchitectureTest {
 
     private static final String CLASS_ORG_JABREF_PREFERENCES =
@@ -61,53 +58,31 @@ public void testNaming(JavaClasses classes) {
             .and()
             .doNotHaveFullyQualifiedName("org.jabref.http.server.TestBibFile")
             .and()
-            .doNotHaveFullyQualifiedName(
-                "org.jabref.gui.autocompleter.AutoCompleterUtil"
-            )
+            .doNotHaveFullyQualifiedName("org.jabref.gui.autocompleter.AutoCompleterUtil")
             .and()
-            .doNotHaveFullyQualifiedName(
-                "org.jabref.gui.search.TextFlowEqualityHelper"
-            )
+            .doNotHaveFullyQualifiedName("org.jabref.gui.search.TextFlowEqualityHelper")
             .and()
-            .doNotHaveFullyQualifiedName(
-                "org.jabref.logic.bibtex.BibEntryAssert"
-            )
+            .doNotHaveFullyQualifiedName("org.jabref.logic.bibtex.BibEntryAssert")
             .and()
-            .doNotHaveFullyQualifiedName(
-                "org.jabref.logic.importer.fileformat.ImporterTestEngine"
-            )
+            .doNotHaveFullyQualifiedName("org.jabref.logic.importer.fileformat.ImporterTestEngine")
             .and()
-            .doNotHaveFullyQualifiedName(
-                "org.jabref.logic.l10n.JavaLocalizationEntryParser"
-            )
+            .doNotHaveFullyQualifiedName("org.jabref.logic.l10n.JavaLocalizationEntryParser")
             .and()
-            .doNotHaveFullyQualifiedName(
-                "org.jabref.logic.l10n.LocalizationEntry"
-            )
+            .doNotHaveFullyQualifiedName("org.jabref.logic.l10n.LocalizationEntry")
             .and()
-            .doNotHaveFullyQualifiedName(
-                "org.jabref.logic.l10n.LocalizationParser"
-            )
+            .doNotHaveFullyQualifiedName("org.jabref.logic.l10n.LocalizationParser")
             .and()
-            .doNotHaveFullyQualifiedName(
-                "org.jabref.logic.openoffice.style.OOBibStyleTestHelper"
-            )
+            .doNotHaveFullyQualifiedName("org.jabref.logic.openoffice.style.OOBibStyleTestHelper")
             .and()
             .doNotHaveFullyQualifiedName("org.jabref.logic.shared.TestManager")
             .and()
-            .doNotHaveFullyQualifiedName(
-                "org.jabref.model.search.rules.MockSearchMatcher"
-            )
+            .doNotHaveFullyQualifiedName("org.jabref.model.search.rules.MockSearchMatcher")
             .and()
             .doNotHaveFullyQualifiedName("org.jabref.model.TreeNodeTestData")
             .and()
-            .doNotHaveFullyQualifiedName(
-                "org.jabref.performance.BibtexEntryGenerator"
-            )
+            .doNotHaveFullyQualifiedName("org.jabref.performance.BibtexEntryGenerator")
             .and()
-            .doNotHaveFullyQualifiedName(
-                "org.jabref.support.DisabledOnCIServer"
-            )
+            .doNotHaveFullyQualifiedName("org.jabref.support.DisabledOnCIServer")
             .and()
             .doNotHaveFullyQualifiedName("org.jabref.support.CIServerCondition")
             .and()
diff --git a/src/test/java/org/jabref/cli/ArgumentProcessorTest.java b/src/test/java/org/jabref/cli/ArgumentProcessorTest.java
index c5aa2eaf18d..202e209c922 100644
--- a/src/test/java/org/jabref/cli/ArgumentProcessorTest.java
+++ b/src/test/java/org/jabref/cli/ArgumentProcessorTest.java
@@ -38,9 +38,7 @@ class ArgumentProcessorTest {
         PreferencesService.class,
         Answers.RETURNS_DEEP_STUBS
     );
-    private final BibEntryTypesManager entryTypesManager = mock(
-        BibEntryTypesManager.class
-    );
+    private final BibEntryTypesManager entryTypesManager = mock(BibEntryTypesManager.class);
     private final ImporterPreferences importerPreferences = mock(
         ImporterPreferences.class,
         Answers.RETURNS_DEEP_STUBS
@@ -55,17 +53,11 @@ void setup() {
         when(importerPreferences.getCustomImporters())
             .thenReturn(FXCollections.emptyObservableSet());
 
-        when(preferencesService.getImporterPreferences())
-            .thenReturn(importerPreferences);
-        when(preferencesService.getImportFormatPreferences())
-            .thenReturn(importFormatPreferences);
+        when(preferencesService.getImporterPreferences()).thenReturn(importerPreferences);
+        when(preferencesService.getImportFormatPreferences()).thenReturn(importFormatPreferences);
         when(preferencesService.getSearchPreferences())
             .thenReturn(
-                new SearchPreferences(
-                    null,
-                    EnumSet.noneOf(SearchRules.SearchFlags.class),
-                    false
-                )
+                new SearchPreferences(null, EnumSet.noneOf(SearchRules.SearchFlags.class), false)
             );
     }
 
@@ -106,11 +98,7 @@ void testAuxImport(@TempDir Path tempDir) throws Exception {
     @Test
     void testExportMatches(@TempDir Path tempDir) throws Exception {
         Path originBib = Path.of(
-            Objects
-                .requireNonNull(
-                    ArgumentProcessorTest.class.getResource("origin.bib")
-                )
-                .toURI()
+            Objects.requireNonNull(ArgumentProcessorTest.class.getResource("origin.bib")).toURI()
         );
         String originBibFile = originBib.toAbsolutePath().toString();
 
@@ -158,14 +146,9 @@ void testExportMatches(@TempDir Path tempDir) throws Exception {
     }
 
     @Test
-    void convertBibtexToTablerefsabsbib(@TempDir Path tempDir)
-        throws Exception {
+    void convertBibtexToTablerefsabsbib(@TempDir Path tempDir) throws Exception {
         Path originBib = Path.of(
-            Objects
-                .requireNonNull(
-                    ArgumentProcessorTest.class.getResource("origin.bib")
-                )
-                .toURI()
+            Objects.requireNonNull(ArgumentProcessorTest.class.getResource("origin.bib")).toURI()
         );
         String originBibFile = originBib.toAbsolutePath().toString();
 
@@ -175,21 +158,19 @@ void convertBibtexToTablerefsabsbib(@TempDir Path tempDir)
         when(importerPreferences.getCustomImporters())
             .thenReturn(FXCollections.emptyObservableSet());
 
-        SaveOrder saveOrder = new SaveOrder(
-            SaveOrder.OrderType.TABLE,
-            List.of()
-        );
+        SaveOrder saveOrder = new SaveOrder(SaveOrder.OrderType.TABLE, List.of());
         ExportPreferences exportPreferences = new ExportPreferences(
             ".html",
             tempDir,
             saveOrder,
             List.of()
         );
-        when(preferencesService.getExportPreferences())
-            .thenReturn(exportPreferences);
+        when(preferencesService.getExportPreferences()).thenReturn(exportPreferences);
 
-        SelfContainedSaveOrder selfContainedSaveOrder =
-            new SelfContainedSaveOrder(SaveOrder.OrderType.ORIGINAL, List.of());
+        SelfContainedSaveOrder selfContainedSaveOrder = new SelfContainedSaveOrder(
+            SaveOrder.OrderType.ORIGINAL,
+            List.of()
+        );
         SelfContainedSaveConfiguration selfContainedSaveConfiguration =
             new SelfContainedSaveConfiguration(
                 selfContainedSaveOrder,
diff --git a/src/test/java/org/jabref/cli/AuxCommandLineTest.java b/src/test/java/org/jabref/cli/AuxCommandLineTest.java
index be8720cfc64..d258bdb7a7b 100644
--- a/src/test/java/org/jabref/cli/AuxCommandLineTest.java
+++ b/src/test/java/org/jabref/cli/AuxCommandLineTest.java
@@ -25,26 +25,21 @@ public class AuxCommandLineTest {
 
     @BeforeEach
     public void setUp() throws Exception {
-        importFormatPreferences =
-            mock(ImportFormatPreferences.class, Answers.RETURNS_DEEP_STUBS);
+        importFormatPreferences = mock(ImportFormatPreferences.class, Answers.RETURNS_DEEP_STUBS);
     }
 
     @Test
     public void test() throws URISyntaxException, IOException {
-        InputStream originalStream =
-            AuxCommandLineTest.class.getResourceAsStream("origin.bib");
+        InputStream originalStream = AuxCommandLineTest.class.getResourceAsStream("origin.bib");
 
-        File auxFile = Path
-            .of(AuxCommandLineTest.class.getResource("paper.aux").toURI())
-            .toFile();
+        File auxFile = Path.of(AuxCommandLineTest.class.getResource("paper.aux").toURI()).toFile();
         try (
             InputStreamReader originalReader = new InputStreamReader(
                 originalStream,
                 StandardCharsets.UTF_8
             )
         ) {
-            ParserResult result = new BibtexParser(importFormatPreferences)
-                .parse(originalReader);
+            ParserResult result = new BibtexParser(importFormatPreferences).parse(originalReader);
 
             AuxCommandLine auxCommandLine = new AuxCommandLine(
                 auxFile.getAbsolutePath(),
diff --git a/src/test/java/org/jabref/cli/JabRefCLITest.java b/src/test/java/org/jabref/cli/JabRefCLITest.java
index c01c9a1e639..1f9f6df2a95 100644
--- a/src/test/java/org/jabref/cli/JabRefCLITest.java
+++ b/src/test/java/org/jabref/cli/JabRefCLITest.java
@@ -15,11 +15,7 @@ class JabRefCLITest {
     @Test
     void emptyCLILeftOversLongOptions() throws Exception {
         JabRefCLI cli = new JabRefCLI(
-            new String[] {
-                "--nogui",
-                "--import=some/file",
-                "--output=some/export/file",
-            }
+            new String[] { "--nogui", "--import=some/file", "--output=some/export/file" }
         );
 
         assertEquals(Collections.emptyList(), cli.getLeftOver());
@@ -28,11 +24,7 @@ void emptyCLILeftOversLongOptions() throws Exception {
     @Test
     void guiIsDisabledLongOptions() throws Exception {
         JabRefCLI cli = new JabRefCLI(
-            new String[] {
-                "--nogui",
-                "--import=some/file",
-                "--output=some/export/file",
-            }
+            new String[] { "--nogui", "--import=some/file", "--output=some/export/file" }
         );
 
         assertTrue(cli.isDisableGui());
@@ -41,11 +33,7 @@ void guiIsDisabledLongOptions() throws Exception {
     @Test
     void successfulParsingOfFileImportCLILongOptions() throws Exception {
         JabRefCLI cli = new JabRefCLI(
-            new String[] {
-                "--nogui",
-                "--import=some/file",
-                "--output=some/export/file",
-            }
+            new String[] { "--nogui", "--import=some/file", "--output=some/export/file" }
         );
 
         assertEquals("some/file", cli.getFileImport());
@@ -54,11 +42,7 @@ void successfulParsingOfFileImportCLILongOptions() throws Exception {
     @Test
     void successfulParsingOfFileExportCLILongOptions() throws Exception {
         JabRefCLI cli = new JabRefCLI(
-            new String[] {
-                "--nogui",
-                "--import=some/file",
-                "--output=some/export/file",
-            }
+            new String[] { "--nogui", "--import=some/file", "--output=some/export/file" }
         );
 
         assertEquals("some/export/file", cli.getFileExport());
@@ -66,36 +50,28 @@ void successfulParsingOfFileExportCLILongOptions() throws Exception {
 
     @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());
     }
@@ -198,10 +174,7 @@ void wrapStringList() {
             listrefs, tablerefsabsbib, harvard, iso690rtf, iso690txt, endnote, oocsv, ris, misq, yaml, bibtexml,
             oocalc, ods, MSBib, mods, xmp, pdf, bib""";
 
-        assertEquals(
-            expected,
-            "Available export formats: " + JabRefCLI.wrapStringList(given, 26)
-        );
+        assertEquals(expected, "Available export formats: " + JabRefCLI.wrapStringList(given, 26));
     }
 
     @Test
diff --git a/src/test/java/org/jabref/gui/UpdateTimestampListenerTest.java b/src/test/java/org/jabref/gui/UpdateTimestampListenerTest.java
index 0181269d7bc..7bea6859ab3 100644
--- a/src/test/java/org/jabref/gui/UpdateTimestampListenerTest.java
+++ b/src/test/java/org/jabref/gui/UpdateTimestampListenerTest.java
@@ -35,8 +35,7 @@ void setUp() {
         preferencesMock = mock(PreferencesService.class);
         timestampPreferencesMock = mock(TimestampPreferences.class);
 
-        when(preferencesMock.getTimestampPreferences())
-            .thenReturn(timestampPreferencesMock);
+        when(preferencesMock.getTimestampPreferences()).thenReturn(timestampPreferencesMock);
     }
 
     @Test
@@ -44,8 +43,7 @@ void updateTimestampEnabled() {
         final boolean includeTimestamp = true;
 
         when(timestampPreferencesMock.now()).thenReturn(newDate);
-        when(timestampPreferencesMock.shouldAddModificationDate())
-            .thenReturn(includeTimestamp);
+        when(timestampPreferencesMock.shouldAddModificationDate()).thenReturn(includeTimestamp);
 
         bibEntry.setField(StandardField.MODIFICATIONDATE, baseDate);
 
@@ -71,8 +69,7 @@ void updateTimestampDisabled() {
         final boolean includeTimestamp = false;
 
         when(timestampPreferencesMock.now()).thenReturn(newDate);
-        when(timestampPreferencesMock.shouldAddModificationDate())
-            .thenReturn(includeTimestamp);
+        when(timestampPreferencesMock.shouldAddModificationDate()).thenReturn(includeTimestamp);
 
         bibEntry.setField(StandardField.MODIFICATIONDATE, baseDate);
 
diff --git a/src/test/java/org/jabref/gui/autocompleter/AppendPersonNamesStrategyTest.java b/src/test/java/org/jabref/gui/autocompleter/AppendPersonNamesStrategyTest.java
index fb439a5b7a7..8311220252c 100644
--- a/src/test/java/org/jabref/gui/autocompleter/AppendPersonNamesStrategyTest.java
+++ b/src/test/java/org/jabref/gui/autocompleter/AppendPersonNamesStrategyTest.java
@@ -17,9 +17,7 @@ void testWithoutParam() {
     @ParameterizedTest(name = "separationBySpace={0}, expectedResult={1}")
     @CsvSource({ "TRUE, ' '", "FALSE, ' and '" })
     void testWithParam(boolean separationBySpace, String expectedResult) {
-        AppendPersonNamesStrategy strategy = new AppendPersonNamesStrategy(
-            separationBySpace
-        );
+        AppendPersonNamesStrategy strategy = new AppendPersonNamesStrategy(separationBySpace);
         assertEquals(expectedResult, strategy.getDelimiter());
     }
 }
diff --git a/src/test/java/org/jabref/gui/autocompleter/AutoCompleterUtil.java b/src/test/java/org/jabref/gui/autocompleter/AutoCompleterUtil.java
index 2d632cbaee3..f35f08d23a2 100644
--- a/src/test/java/org/jabref/gui/autocompleter/AutoCompleterUtil.java
+++ b/src/test/java/org/jabref/gui/autocompleter/AutoCompleterUtil.java
@@ -4,9 +4,7 @@
 
 public class AutoCompleterUtil {
 
-    public static AutoCompletionBinding.ISuggestionRequest getRequest(
-        String text
-    ) {
+    public static AutoCompletionBinding.ISuggestionRequest getRequest(String text) {
         return new AutoCompletionBinding.ISuggestionRequest() {
             @Override
             public boolean isCancelled() {
diff --git a/src/test/java/org/jabref/gui/autocompleter/BibEntrySuggestionProviderTest.java b/src/test/java/org/jabref/gui/autocompleter/BibEntrySuggestionProviderTest.java
index ff18a7025f8..824c69f29a3 100644
--- a/src/test/java/org/jabref/gui/autocompleter/BibEntrySuggestionProviderTest.java
+++ b/src/test/java/org/jabref/gui/autocompleter/BibEntrySuggestionProviderTest.java
@@ -25,9 +25,7 @@ void setUp() throws Exception {
 
     @Test
     void completeWithoutAddingAnythingReturnsNothing() {
-        Collection<BibEntry> result = autoCompleter.provideSuggestions(
-            getRequest("test")
-        );
+        Collection<BibEntry> result = autoCompleter.provideSuggestions(getRequest("test"));
         assertEquals(Collections.emptyList(), result);
     }
 
@@ -36,9 +34,7 @@ void completeAfterAddingEmptyEntryReturnsNothing() {
         BibEntry entry = new BibEntry();
         database.insertEntry(entry);
 
-        Collection<BibEntry> result = autoCompleter.provideSuggestions(
-            getRequest("test")
-        );
+        Collection<BibEntry> result = autoCompleter.provideSuggestions(getRequest("test"));
         assertEquals(Collections.emptyList(), result);
     }
 
@@ -48,9 +44,7 @@ void completeKeyReturnsKey() {
         entry.setCitationKey("testKey");
         database.insertEntry(entry);
 
-        Collection<BibEntry> result = autoCompleter.provideSuggestions(
-            getRequest("testKey")
-        );
+        Collection<BibEntry> result = autoCompleter.provideSuggestions(getRequest("testKey"));
         assertEquals(Collections.singletonList(entry), result);
     }
 
@@ -60,9 +54,7 @@ void completeBeginningOfKeyReturnsKey() {
         entry.setCitationKey("testKey");
         database.insertEntry(entry);
 
-        Collection<BibEntry> result = autoCompleter.provideSuggestions(
-            getRequest("test")
-        );
+        Collection<BibEntry> result = autoCompleter.provideSuggestions(getRequest("test"));
         assertEquals(Collections.singletonList(entry), result);
     }
 
@@ -72,9 +64,7 @@ void completeLowercaseKeyReturnsKey() {
         entry.setCitationKey("testKey");
         database.insertEntry(entry);
 
-        Collection<BibEntry> result = autoCompleter.provideSuggestions(
-            getRequest("testkey")
-        );
+        Collection<BibEntry> result = autoCompleter.provideSuggestions(getRequest("testkey"));
         assertEquals(Collections.singletonList(entry), result);
     }
 
@@ -96,9 +86,7 @@ void completeEmptyStringReturnsNothing() {
         entry.setCitationKey("testKey");
         database.insertEntry(entry);
 
-        Collection<BibEntry> result = autoCompleter.provideSuggestions(
-            getRequest("")
-        );
+        Collection<BibEntry> result = autoCompleter.provideSuggestions(getRequest(""));
         assertEquals(Collections.emptyList(), result);
     }
 
@@ -111,9 +99,7 @@ void completeReturnsMultipleResults() {
         entryTwo.setCitationKey("testKeyTwo");
         database.insertEntry(entryTwo);
 
-        Collection<BibEntry> result = autoCompleter.provideSuggestions(
-            getRequest("testKey")
-        );
+        Collection<BibEntry> result = autoCompleter.provideSuggestions(getRequest("testKey"));
         assertEquals(Arrays.asList(entryTwo, entryOne), result);
     }
 
@@ -123,9 +109,7 @@ void completeShortKeyReturnsKey() {
         entry.setCitationKey("key");
         database.insertEntry(entry);
 
-        Collection<BibEntry> result = autoCompleter.provideSuggestions(
-            getRequest("k")
-        );
+        Collection<BibEntry> result = autoCompleter.provideSuggestions(getRequest("k"));
         assertEquals(Collections.singletonList(entry), result);
     }
 }
diff --git a/src/test/java/org/jabref/gui/autocompleter/ContentSelectorSuggestionProviderTest.java b/src/test/java/org/jabref/gui/autocompleter/ContentSelectorSuggestionProviderTest.java
index 28d6e3e5834..bb91b7b98b6 100644
--- a/src/test/java/org/jabref/gui/autocompleter/ContentSelectorSuggestionProviderTest.java
+++ b/src/test/java/org/jabref/gui/autocompleter/ContentSelectorSuggestionProviderTest.java
@@ -18,26 +18,19 @@ public class ContentSelectorSuggestionProviderTest {
 
     @Test
     void completeWithoutAddingAnythingReturnsNothing() {
-        SuggestionProvider<String> suggestionProvider =
-            new EmptySuggestionProvider();
+        SuggestionProvider<String> suggestionProvider = new EmptySuggestionProvider();
         autoCompleter =
-            new ContentSelectorSuggestionProvider(
-                suggestionProvider,
-                Collections.emptyList()
-            );
+            new ContentSelectorSuggestionProvider(suggestionProvider, Collections.emptyList());
 
         Collection<String> expected = Collections.emptyList();
-        Collection<String> result = autoCompleter.provideSuggestions(
-            getRequest("test")
-        );
+        Collection<String> result = autoCompleter.provideSuggestions(getRequest("test"));
 
         assertEquals(expected, result);
     }
 
     @Test
     void completeKeywordReturnsKeyword() {
-        SuggestionProvider<String> suggestionProvider =
-            new EmptySuggestionProvider();
+        SuggestionProvider<String> suggestionProvider = new EmptySuggestionProvider();
         autoCompleter =
             new ContentSelectorSuggestionProvider(
                 suggestionProvider,
@@ -45,17 +38,14 @@ void completeKeywordReturnsKeyword() {
             );
 
         Collection<String> expected = Collections.singletonList("test");
-        Collection<String> result = autoCompleter.provideSuggestions(
-            getRequest("test")
-        );
+        Collection<String> result = autoCompleter.provideSuggestions(getRequest("test"));
 
         assertEquals(expected, result);
     }
 
     @Test
     void completeBeginningOfKeywordReturnsKeyword() {
-        SuggestionProvider<String> suggestionProvider =
-            new EmptySuggestionProvider();
+        SuggestionProvider<String> suggestionProvider = new EmptySuggestionProvider();
         autoCompleter =
             new ContentSelectorSuggestionProvider(
                 suggestionProvider,
@@ -63,9 +53,7 @@ void completeBeginningOfKeywordReturnsKeyword() {
             );
 
         Collection<String> expected = Collections.singletonList("test");
-        Collection<String> result = autoCompleter.provideSuggestions(
-            getRequest("te")
-        );
+        Collection<String> result = autoCompleter.provideSuggestions(getRequest("te"));
 
         assertEquals(expected, result);
     }
@@ -77,26 +65,22 @@ void completeKeywordReturnsKeywordFromDatabase() {
         bibEntry.addKeyword("test", ',');
         database.insertEntry(bibEntry);
 
-        SuggestionProvider<String> suggestionProvider =
-            new WordSuggestionProvider(StandardField.KEYWORDS, database);
+        SuggestionProvider<String> suggestionProvider = new WordSuggestionProvider(
+            StandardField.KEYWORDS,
+            database
+        );
         autoCompleter =
-            new ContentSelectorSuggestionProvider(
-                suggestionProvider,
-                Collections.emptyList()
-            );
+            new ContentSelectorSuggestionProvider(suggestionProvider, Collections.emptyList());
 
         Collection<String> expected = Collections.singletonList("test");
-        Collection<String> result = autoCompleter.provideSuggestions(
-            getRequest("test")
-        );
+        Collection<String> result = autoCompleter.provideSuggestions(getRequest("test"));
 
         assertEquals(expected, result);
     }
 
     @Test
     void completeUppercaseBeginningOfNameReturnsName() {
-        SuggestionProvider<String> suggestionProvider =
-            new EmptySuggestionProvider();
+        SuggestionProvider<String> suggestionProvider = new EmptySuggestionProvider();
         autoCompleter =
             new ContentSelectorSuggestionProvider(
                 suggestionProvider,
@@ -104,9 +88,7 @@ void completeUppercaseBeginningOfNameReturnsName() {
             );
 
         Collection<String> expected = Collections.singletonList("test");
-        Collection<String> result = autoCompleter.provideSuggestions(
-            getRequest("TE")
-        );
+        Collection<String> result = autoCompleter.provideSuggestions(getRequest("TE"));
 
         assertEquals(expected, result);
     }
@@ -121,8 +103,7 @@ void completeNullThrowsException() {
 
     @Test
     void completeEmptyStringReturnsNothing() {
-        SuggestionProvider<String> suggestionProvider =
-            new EmptySuggestionProvider();
+        SuggestionProvider<String> suggestionProvider = new EmptySuggestionProvider();
         autoCompleter =
             new ContentSelectorSuggestionProvider(
                 suggestionProvider,
@@ -130,9 +111,7 @@ void completeEmptyStringReturnsNothing() {
             );
 
         Collection<String> expected = Collections.emptyList();
-        Collection<String> result = autoCompleter.provideSuggestions(
-            getRequest("")
-        );
+        Collection<String> result = autoCompleter.provideSuggestions(getRequest(""));
 
         assertEquals(expected, result);
     }
@@ -144,8 +123,10 @@ void completeReturnsMultipleResults() {
         bibEntry.addKeyword("testa", ',');
         database.insertEntry(bibEntry);
 
-        SuggestionProvider<String> suggestionProvider =
-            new WordSuggestionProvider(StandardField.KEYWORDS, database);
+        SuggestionProvider<String> suggestionProvider = new WordSuggestionProvider(
+            StandardField.KEYWORDS,
+            database
+        );
         autoCompleter =
             new ContentSelectorSuggestionProvider(
                 suggestionProvider,
@@ -153,9 +134,7 @@ void completeReturnsMultipleResults() {
             );
 
         Collection<String> expected = Arrays.asList("testa", "testb");
-        Collection<String> result = autoCompleter.provideSuggestions(
-            getRequest("test")
-        );
+        Collection<String> result = autoCompleter.provideSuggestions(getRequest("test"));
 
         assertEquals(expected, result);
     }
@@ -168,23 +147,18 @@ void completeReturnsKeywordsInAlphabeticalOrder() {
         bibEntry.addKeyword("testc", ',');
         database.insertEntry(bibEntry);
 
-        SuggestionProvider<String> suggestionProvider =
-            new WordSuggestionProvider(StandardField.KEYWORDS, database);
+        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")
-        );
+        Collection<String> expected = Arrays.asList("testa", "testb", "testc", "testd");
+        Collection<String> result = autoCompleter.provideSuggestions(getRequest("test"));
 
         assertEquals(expected, result);
     }
diff --git a/src/test/java/org/jabref/gui/autocompleter/DefaultAutoCompleterTest.java b/src/test/java/org/jabref/gui/autocompleter/DefaultAutoCompleterTest.java
index 6957c0d9828..be1d35374ea 100644
--- a/src/test/java/org/jabref/gui/autocompleter/DefaultAutoCompleterTest.java
+++ b/src/test/java/org/jabref/gui/autocompleter/DefaultAutoCompleterTest.java
@@ -21,23 +21,17 @@ class DefaultAutoCompleterTest {
     @BeforeEach
     void setUp() throws Exception {
         database = new BibDatabase();
-        autoCompleter =
-            new WordSuggestionProvider(StandardField.TITLE, database);
+        autoCompleter = new WordSuggestionProvider(StandardField.TITLE, database);
     }
 
     @Test
     void initAutoCompleterWithNullFieldThrowsException() {
-        assertThrows(
-            NullPointerException.class,
-            () -> new WordSuggestionProvider(null, database)
-        );
+        assertThrows(NullPointerException.class, () -> new WordSuggestionProvider(null, database));
     }
 
     @Test
     void completeWithoutAddingAnythingReturnsNothing() {
-        Collection<String> result = autoCompleter.provideSuggestions(
-            getRequest("test")
-        );
+        Collection<String> result = autoCompleter.provideSuggestions(getRequest("test"));
         assertEquals(Collections.emptyList(), result);
     }
 
@@ -46,9 +40,7 @@ void completeAfterAddingEmptyEntryReturnsNothing() {
         BibEntry entry = new BibEntry();
         database.insertEntry(entry);
 
-        Collection<String> result = autoCompleter.provideSuggestions(
-            getRequest("test")
-        );
+        Collection<String> result = autoCompleter.provideSuggestions(getRequest("test"));
         assertEquals(Collections.emptyList(), result);
     }
 
@@ -58,9 +50,7 @@ void completeAfterAddingEntryWithoutFieldReturnsNothing() {
         entry.setField(StandardField.AUTHOR, "testAuthor");
         database.insertEntry(entry);
 
-        Collection<String> result = autoCompleter.provideSuggestions(
-            getRequest("test")
-        );
+        Collection<String> result = autoCompleter.provideSuggestions(getRequest("test"));
         assertEquals(Collections.emptyList(), result);
     }
 
@@ -70,9 +60,7 @@ void completeValueReturnsValue() {
         entry.setField(StandardField.TITLE, "testValue");
         database.insertEntry(entry);
 
-        Collection<String> result = autoCompleter.provideSuggestions(
-            getRequest("testValue")
-        );
+        Collection<String> result = autoCompleter.provideSuggestions(getRequest("testValue"));
         assertEquals(Arrays.asList("testValue"), result);
     }
 
@@ -82,9 +70,7 @@ void completeBeginningOfValueReturnsValue() {
         entry.setField(StandardField.TITLE, "testValue");
         database.insertEntry(entry);
 
-        Collection<String> result = autoCompleter.provideSuggestions(
-            getRequest("test")
-        );
+        Collection<String> result = autoCompleter.provideSuggestions(getRequest("test"));
         assertEquals(Arrays.asList("testValue"), result);
     }
 
@@ -94,9 +80,7 @@ void completeLowercaseValueReturnsValue() {
         entry.setField(StandardField.TITLE, "testValue");
         database.insertEntry(entry);
 
-        Collection<String> result = autoCompleter.provideSuggestions(
-            getRequest("testvalue")
-        );
+        Collection<String> result = autoCompleter.provideSuggestions(getRequest("testvalue"));
         assertEquals(Arrays.asList("testValue"), result);
     }
 
@@ -118,9 +102,7 @@ void completeEmptyStringReturnsNothing() {
         entry.setField(StandardField.TITLE, "testKey");
         database.insertEntry(entry);
 
-        Collection<String> result = autoCompleter.provideSuggestions(
-            getRequest("")
-        );
+        Collection<String> result = autoCompleter.provideSuggestions(getRequest(""));
         assertEquals(Collections.emptyList(), result);
     }
 
@@ -133,9 +115,7 @@ void completeReturnsMultipleResults() {
         entryTwo.setField(StandardField.TITLE, "testValueTwo");
         database.insertEntry(entryTwo);
 
-        Collection<String> result = autoCompleter.provideSuggestions(
-            getRequest("testValue")
-        );
+        Collection<String> result = autoCompleter.provideSuggestions(getRequest("testValue"));
         assertEquals(Arrays.asList("testValueOne", "testValueTwo"), result);
     }
 
@@ -145,9 +125,7 @@ void completeShortStringReturnsValue() {
         entry.setField(StandardField.TITLE, "val");
         database.insertEntry(entry);
 
-        Collection<String> result = autoCompleter.provideSuggestions(
-            getRequest("va")
-        );
+        Collection<String> result = autoCompleter.provideSuggestions(getRequest("va"));
         assertEquals(Collections.singletonList("val"), result);
     }
 
@@ -157,9 +135,7 @@ void completeBeginnigOfSecondWordReturnsWord() {
         entry.setField(StandardField.TITLE, "test value");
         database.insertEntry(entry);
 
-        Collection<String> result = autoCompleter.provideSuggestions(
-            getRequest("val")
-        );
+        Collection<String> result = autoCompleter.provideSuggestions(getRequest("val"));
         assertEquals(Collections.singletonList("value"), result);
     }
 
@@ -169,9 +145,7 @@ void completePartOfWordReturnsValue() {
         entry.setField(StandardField.TITLE, "test value");
         database.insertEntry(entry);
 
-        Collection<String> result = autoCompleter.provideSuggestions(
-            getRequest("lue")
-        );
+        Collection<String> result = autoCompleter.provideSuggestions(getRequest("lue"));
         assertEquals(Collections.singletonList("value"), result);
     }
 }
diff --git a/src/test/java/org/jabref/gui/autocompleter/FieldValueSuggestionProviderTest.java b/src/test/java/org/jabref/gui/autocompleter/FieldValueSuggestionProviderTest.java
index 462947d30f2..519edf5ebcf 100644
--- a/src/test/java/org/jabref/gui/autocompleter/FieldValueSuggestionProviderTest.java
+++ b/src/test/java/org/jabref/gui/autocompleter/FieldValueSuggestionProviderTest.java
@@ -27,8 +27,7 @@ class FieldValueSuggestionProviderTest {
     @BeforeEach
     void setUp() {
         database = new BibDatabase();
-        autoCompleter =
-            new FieldValueSuggestionProvider(StandardField.TITLE, database);
+        autoCompleter = new FieldValueSuggestionProvider(StandardField.TITLE, database);
     }
 
     @Test
@@ -41,9 +40,7 @@ void initAutoCompleterWithNullFieldThrowsException() {
 
     @Test
     void completeWithoutAddingAnythingReturnsNothing() {
-        Collection<String> result = autoCompleter.provideSuggestions(
-            getRequest("test")
-        );
+        Collection<String> result = autoCompleter.provideSuggestions(getRequest("test"));
         assertEquals(Collections.emptyList(), result);
     }
 
@@ -52,9 +49,7 @@ void completeAfterAddingEmptyEntryReturnsNothing() {
         BibEntry entry = new BibEntry();
         database.insertEntry(entry);
 
-        Collection<String> result = autoCompleter.provideSuggestions(
-            getRequest("test")
-        );
+        Collection<String> result = autoCompleter.provideSuggestions(getRequest("test"));
         assertEquals(Collections.emptyList(), result);
     }
 
@@ -64,24 +59,18 @@ void completeAfterAddingEntryWithoutFieldReturnsNothing() {
         entry.setField(StandardField.AUTHOR, "testAuthor");
         database.insertEntry(entry);
 
-        Collection<String> result = autoCompleter.provideSuggestions(
-            getRequest("test")
-        );
+        Collection<String> result = autoCompleter.provideSuggestions(getRequest("test"));
         assertEquals(Collections.emptyList(), result);
     }
 
     @Test
     void completeOnIgnoredFieldReturnsNothing() {
-        AutoCompletePreferences autoCompletePreferences = mock(
-            AutoCompletePreferences.class
-        );
+        AutoCompletePreferences autoCompletePreferences = mock(AutoCompletePreferences.class);
         JournalAbbreviationRepository journalAbbreviationRepository = mock(
             JournalAbbreviationRepository.class
         );
         when(autoCompletePreferences.getCompleteFields())
-            .thenReturn(
-                FXCollections.observableSet(Set.of(StandardField.AUTHOR))
-            );
+            .thenReturn(FXCollections.observableSet(Set.of(StandardField.AUTHOR)));
         SuggestionProviders suggestionProviders = new SuggestionProviders(
             database,
             journalAbbreviationRepository,
@@ -96,9 +85,7 @@ void completeOnIgnoredFieldReturnsNothing() {
         entry.setField(StandardField.TITLE, "testValue");
         database.insertEntry(entry);
 
-        Collection<String> result = autoCompleter.provideSuggestions(
-            getRequest("testValue")
-        );
+        Collection<String> result = autoCompleter.provideSuggestions(getRequest("testValue"));
         assertEquals(Collections.emptyList(), result);
     }
 
@@ -108,9 +95,7 @@ void completeValueReturnsValue() {
         entry.setField(StandardField.TITLE, "testValue");
         database.insertEntry(entry);
 
-        Collection<String> result = autoCompleter.provideSuggestions(
-            getRequest("testValue")
-        );
+        Collection<String> result = autoCompleter.provideSuggestions(getRequest("testValue"));
         assertEquals(List.of("testValue"), result);
     }
 
@@ -120,9 +105,7 @@ void completeBeginnigOfValueReturnsValue() {
         entry.setField(StandardField.TITLE, "testValue");
         database.insertEntry(entry);
 
-        Collection<String> result = autoCompleter.provideSuggestions(
-            getRequest("test")
-        );
+        Collection<String> result = autoCompleter.provideSuggestions(getRequest("test"));
         assertEquals(List.of("testValue"), result);
     }
 
@@ -132,9 +115,7 @@ void completeLowercaseValueReturnsValue() {
         entry.setField(StandardField.TITLE, "testValue");
         database.insertEntry(entry);
 
-        Collection<String> result = autoCompleter.provideSuggestions(
-            getRequest("testvalue")
-        );
+        Collection<String> result = autoCompleter.provideSuggestions(getRequest("testvalue"));
         assertEquals(List.of("testValue"), result);
     }
 
@@ -156,9 +137,7 @@ void completeEmptyStringReturnsNothing() {
         entry.setField(StandardField.TITLE, "testKey");
         database.insertEntry(entry);
 
-        Collection<String> result = autoCompleter.provideSuggestions(
-            getRequest("")
-        );
+        Collection<String> result = autoCompleter.provideSuggestions(getRequest(""));
         assertEquals(Collections.emptyList(), result);
     }
 
@@ -171,9 +150,7 @@ void completeReturnsMultipleResults() {
         entryTwo.setField(StandardField.TITLE, "testValueTwo");
         database.insertEntry(entryTwo);
 
-        Collection<String> result = autoCompleter.provideSuggestions(
-            getRequest("testValue")
-        );
+        Collection<String> result = autoCompleter.provideSuggestions(getRequest("testValue"));
         assertEquals(Arrays.asList("testValueOne", "testValueTwo"), result);
     }
 
@@ -183,9 +160,7 @@ void completeShortStringReturnsFieldValue() {
         entry.setField(StandardField.TITLE, "val");
         database.insertEntry(entry);
 
-        Collection<String> result = autoCompleter.provideSuggestions(
-            getRequest("va")
-        );
+        Collection<String> result = autoCompleter.provideSuggestions(getRequest("va"));
         assertEquals(Collections.singletonList("val"), result);
     }
 
@@ -195,9 +170,7 @@ void completeBeginnigOfSecondWordReturnsWholeFieldValue() {
         entry.setField(StandardField.TITLE, "test value");
         database.insertEntry(entry);
 
-        Collection<String> result = autoCompleter.provideSuggestions(
-            getRequest("val")
-        );
+        Collection<String> result = autoCompleter.provideSuggestions(getRequest("val"));
         assertEquals(Collections.singletonList("test value"), result);
     }
 
@@ -207,9 +180,7 @@ void completePartOfWordReturnsWholeFieldValue() {
         entry.setField(StandardField.TITLE, "test value");
         database.insertEntry(entry);
 
-        Collection<String> result = autoCompleter.provideSuggestions(
-            getRequest("lue")
-        );
+        Collection<String> result = autoCompleter.provideSuggestions(getRequest("lue"));
         assertEquals(Collections.singletonList("test value"), result);
     }
 
@@ -219,9 +190,7 @@ void completeReturnsWholeFieldValue() {
         entry.setField(StandardField.TITLE, "test value");
         database.insertEntry(entry);
 
-        Collection<String> result = autoCompleter.provideSuggestions(
-            getRequest("te")
-        );
+        Collection<String> result = autoCompleter.provideSuggestions(getRequest("te"));
         assertEquals(Collections.singletonList("test value"), result);
     }
 }
diff --git a/src/test/java/org/jabref/gui/autocompleter/PersonNameStringConverterTest.java b/src/test/java/org/jabref/gui/autocompleter/PersonNameStringConverterTest.java
index c8323980f86..2aa29b2a1ff 100644
--- a/src/test/java/org/jabref/gui/autocompleter/PersonNameStringConverterTest.java
+++ b/src/test/java/org/jabref/gui/autocompleter/PersonNameStringConverterTest.java
@@ -81,9 +81,7 @@ void testToStringWithAutoCompletePreferences(
             nameFormat,
             Collections.emptySet()
         );
-        PersonNameStringConverter converter = new PersonNameStringConverter(
-            preferences
-        );
+        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 3fd5b13cf7b..29bb1c32ef4 100644
--- a/src/test/java/org/jabref/gui/autocompleter/PersonNameSuggestionProviderTest.java
+++ b/src/test/java/org/jabref/gui/autocompleter/PersonNameSuggestionProviderTest.java
@@ -17,13 +17,7 @@
 
 class PersonNameSuggestionProviderTest {
 
-    private final Author vassilisKostakos = new Author(
-        "Vassilis",
-        "V.",
-        "",
-        "Kostakos",
-        ""
-    );
+    private final Author vassilisKostakos = new Author("Vassilis", "V.", "", "Kostakos", "");
     private PersonNameSuggestionProvider autoCompleter;
     private BibEntry entry;
     private BibDatabase database;
@@ -31,8 +25,7 @@ class PersonNameSuggestionProviderTest {
     @BeforeEach
     void setUp() throws Exception {
         database = new BibDatabase();
-        autoCompleter =
-            new PersonNameSuggestionProvider(StandardField.AUTHOR, database);
+        autoCompleter = new PersonNameSuggestionProvider(StandardField.AUTHOR, database);
 
         entry = new BibEntry();
         entry.setField(StandardField.AUTHOR, "Vassilis Kostakos");
@@ -42,19 +35,13 @@ void setUp() throws Exception {
     void initAutoCompleterWithNullFieldThrowsException() {
         assertThrows(
             NullPointerException.class,
-            () ->
-                new PersonNameSuggestionProvider(
-                    (Field) null,
-                    new BibDatabase()
-                )
+            () -> new PersonNameSuggestionProvider((Field) null, new BibDatabase())
         );
     }
 
     @Test
     void completeWithoutAddingAnythingReturnsNothing() {
-        Collection<Author> result = autoCompleter.provideSuggestions(
-            getRequest("test")
-        );
+        Collection<Author> result = autoCompleter.provideSuggestions(getRequest("test"));
         assertEquals(Collections.emptyList(), result);
     }
 
@@ -63,9 +50,7 @@ void completeAfterAddingEmptyEntryReturnsNothing() {
         BibEntry entry = new BibEntry();
         database.insertEntry(entry);
 
-        Collection<Author> result = autoCompleter.provideSuggestions(
-            getRequest("test")
-        );
+        Collection<Author> result = autoCompleter.provideSuggestions(getRequest("test"));
         assertEquals(Collections.emptyList(), result);
     }
 
@@ -75,9 +60,7 @@ void completeAfterAddingEntryWithoutFieldReturnsNothing() {
         entry.setField(StandardField.TITLE, "testTitle");
         database.insertEntry(entry);
 
-        Collection<Author> result = autoCompleter.provideSuggestions(
-            getRequest("test")
-        );
+        Collection<Author> result = autoCompleter.provideSuggestions(getRequest("test"));
         assertEquals(Collections.emptyList(), result);
     }
 
@@ -85,9 +68,7 @@ void completeAfterAddingEntryWithoutFieldReturnsNothing() {
     void completeNameReturnsName() {
         database.insertEntry(entry);
 
-        Collection<Author> result = autoCompleter.provideSuggestions(
-            getRequest("Kostakos")
-        );
+        Collection<Author> result = autoCompleter.provideSuggestions(getRequest("Kostakos"));
         assertEquals(Collections.singletonList(vassilisKostakos), result);
     }
 
@@ -95,9 +76,7 @@ void completeNameReturnsName() {
     void completeBeginningOfNameReturnsName() {
         database.insertEntry(entry);
 
-        Collection<Author> result = autoCompleter.provideSuggestions(
-            getRequest("Kosta")
-        );
+        Collection<Author> result = autoCompleter.provideSuggestions(getRequest("Kosta"));
         assertEquals(Collections.singletonList(vassilisKostakos), result);
     }
 
@@ -105,9 +84,7 @@ void completeBeginningOfNameReturnsName() {
     void completeLowercaseBeginningOfNameReturnsName() {
         database.insertEntry(entry);
 
-        Collection<Author> result = autoCompleter.provideSuggestions(
-            getRequest("kosta")
-        );
+        Collection<Author> result = autoCompleter.provideSuggestions(getRequest("kosta"));
         assertEquals(Collections.singletonList(vassilisKostakos), result);
     }
 
@@ -123,9 +100,7 @@ void completeNullThrowsException() {
     void completeEmptyStringReturnsNothing() {
         database.insertEntry(entry);
 
-        Collection<Author> result = autoCompleter.provideSuggestions(
-            getRequest("")
-        );
+        Collection<Author> result = autoCompleter.provideSuggestions(getRequest(""));
         assertEquals(Collections.emptyList(), result);
     }
 
@@ -137,9 +112,7 @@ void completeReturnsMultipleResults() {
         database.insertEntry(entryTwo);
         Author authorTwo = new Author("", "", "", "Kosta", "");
 
-        Collection<Author> result = autoCompleter.provideSuggestions(
-            getRequest("Ko")
-        );
+        Collection<Author> result = autoCompleter.provideSuggestions(getRequest("Ko"));
         assertEquals(Arrays.asList(authorTwo, vassilisKostakos), result);
     }
 
@@ -147,9 +120,7 @@ void completeReturnsMultipleResults() {
     void completePartOfNameReturnsName() {
         database.insertEntry(entry);
 
-        Collection<Author> result = autoCompleter.provideSuggestions(
-            getRequest("osta")
-        );
+        Collection<Author> result = autoCompleter.provideSuggestions(getRequest("osta"));
         assertEquals(Collections.singletonList(vassilisKostakos), result);
     }
 
@@ -157,9 +128,7 @@ void completePartOfNameReturnsName() {
     void completeBeginningOfFirstNameReturnsName() {
         database.insertEntry(entry);
 
-        Collection<Author> result = autoCompleter.provideSuggestions(
-            getRequest("Vas")
-        );
+        Collection<Author> result = autoCompleter.provideSuggestions(getRequest("Vas"));
         assertEquals(Collections.singletonList(vassilisKostakos), result);
     }
 
@@ -170,9 +139,7 @@ void completeBeginningOfFirstNameReturnsNameWithJr() {
         database.insertEntry(entry);
         Author author = new Author("Joseph M.", "J. M.", "", "Reagle", "Jr.");
 
-        Collection<Author> result = autoCompleter.provideSuggestions(
-            getRequest("Jos")
-        );
+        Collection<Author> result = autoCompleter.provideSuggestions(getRequest("Jos"));
         assertEquals(Collections.singletonList(author), result);
     }
 
@@ -183,9 +150,7 @@ void completeBeginningOfFirstNameReturnsNameWithVon() {
         database.insertEntry(entry);
         Author author = new Author("Eric", "E.", "von", "Hippel", "");
 
-        Collection<Author> result = autoCompleter.provideSuggestions(
-            getRequest("Eric")
-        );
+        Collection<Author> result = autoCompleter.provideSuggestions(getRequest("Eric"));
         assertEquals(Collections.singletonList(author), result);
     }
 
@@ -196,9 +161,7 @@ void completeBeginningOfLastNameReturnsNameWithUmlauts() {
         database.insertEntry(entry);
         Author author = new Author("Honig", "H.", "", "Bär", "");
 
-        Collection<Author> result = autoCompleter.provideSuggestions(
-            getRequest("Bä")
-        );
+        Collection<Author> result = autoCompleter.provideSuggestions(getRequest("Bä"));
         assertEquals(Collections.singletonList(author), result);
     }
 
@@ -209,9 +172,7 @@ void completeVonReturnsName() {
         database.insertEntry(entry);
         Author author = new Author("Eric", "E.", "von", "Hippel", "");
 
-        Collection<Author> result = autoCompleter.provideSuggestions(
-            getRequest("von")
-        );
+        Collection<Author> result = autoCompleter.provideSuggestions(getRequest("von"));
         assertEquals(Collections.singletonList(author), result);
     }
 
@@ -221,9 +182,7 @@ void completeBeginningOfFullNameReturnsName() {
         entry.setField(StandardField.AUTHOR, "Vassilis Kostakos");
         database.insertEntry(entry);
 
-        Collection<Author> result = autoCompleter.provideSuggestions(
-            getRequest("Kostakos, Va")
-        );
+        Collection<Author> result = autoCompleter.provideSuggestions(getRequest("Kostakos, Va"));
         assertEquals(Collections.singletonList(vassilisKostakos), result);
     }
 }
diff --git a/src/test/java/org/jabref/gui/autocompleter/SuggestionProvidersTest.java b/src/test/java/org/jabref/gui/autocompleter/SuggestionProvidersTest.java
index 5e49640445f..45ceff52a1e 100644
--- a/src/test/java/org/jabref/gui/autocompleter/SuggestionProvidersTest.java
+++ b/src/test/java/org/jabref/gui/autocompleter/SuggestionProvidersTest.java
@@ -35,40 +35,26 @@ public void initializeSuggestionProviders() {
             StandardField.PUBLISHER,
             SpecialField.PRINTED
         );
-        AutoCompletePreferences autoCompletePreferences =
-            new AutoCompletePreferences(
-                true,
-                AutoCompleteFirstNameMode.BOTH,
-                AutoCompletePreferences.NameFormat.BOTH,
-                completeFields
-            );
+        AutoCompletePreferences autoCompletePreferences = new AutoCompletePreferences(
+            true,
+            AutoCompleteFirstNameMode.BOTH,
+            AutoCompletePreferences.NameFormat.BOTH,
+            completeFields
+        );
         this.suggestionProviders =
-            new SuggestionProviders(
-                database,
-                abbreviationRepository,
-                autoCompletePreferences
-            );
+            new SuggestionProviders(database, abbreviationRepository, autoCompletePreferences);
     }
 
     private static Stream<Arguments> getTestPairs() {
         return Stream.of(
             // a person
-            Arguments.of(
-                PersonNameSuggestionProvider.class,
-                StandardField.AUTHOR
-            ),
+            Arguments.of(PersonNameSuggestionProvider.class, StandardField.AUTHOR),
             // a single entry field
             Arguments.of(BibEntrySuggestionProvider.class, StandardField.XREF),
             // multi entry fieldg
-            Arguments.of(
-                JournalsSuggestionProvider.class,
-                StandardField.JOURNAL
-            ),
+            Arguments.of(JournalsSuggestionProvider.class, StandardField.JOURNAL),
             // TODO: We should offer pre-configured publishers
-            Arguments.of(
-                JournalsSuggestionProvider.class,
-                StandardField.PUBLISHER
-            ),
+            Arguments.of(JournalsSuggestionProvider.class, StandardField.PUBLISHER),
             // TODO: Auto completion should be aware of possible values of special fields
             Arguments.of(WordSuggestionProvider.class, SpecialField.PRINTED)
         );
@@ -80,10 +66,7 @@ public void testAppropriateCompleterReturned(
         Class<SuggestionProvider<BibEntry>> expected,
         Field field
     ) {
-        assertEquals(
-            expected,
-            suggestionProviders.getForField(field).getClass()
-        );
+        assertEquals(expected, suggestionProviders.getForField(field).getClass());
     }
 
     @Test
diff --git a/src/test/java/org/jabref/gui/autosaveandbackup/BackupManagerDiscardedTest.java b/src/test/java/org/jabref/gui/autosaveandbackup/BackupManagerDiscardedTest.java
index a1b2b0c8ec8..4c45ab922f2 100644
--- a/src/test/java/org/jabref/gui/autosaveandbackup/BackupManagerDiscardedTest.java
+++ b/src/test/java/org/jabref/gui/autosaveandbackup/BackupManagerDiscardedTest.java
@@ -58,8 +58,7 @@ public void setup(@TempDir Path tempDir) throws Exception {
                 BibDatabaseWriter.SaveType.WITH_JABREF_META_DATA,
                 false
             );
-        preferencesService =
-            mock(PreferencesService.class, Answers.RETURNS_DEEP_STUBS);
+        preferencesService = mock(PreferencesService.class, Answers.RETURNS_DEEP_STUBS);
 
         saveDatabase();
 
@@ -75,13 +74,7 @@ public void setup(@TempDir Path tempDir) throws Exception {
     }
 
     private void saveDatabase() throws IOException {
-        try (
-            Writer writer = new AtomicFileWriter(
-                testBib,
-                StandardCharsets.UTF_8,
-                false
-            )
-        ) {
+        try (Writer writer = new AtomicFileWriter(testBib, StandardCharsets.UTF_8, false)) {
             BibWriter bibWriter = new BibWriter(
                 writer,
                 bibDatabaseContext.getDatabase().getNewLineSeparator()
@@ -110,8 +103,7 @@ private void makeBackup() {
     }
 
     @Test
-    public void noDiscardingAChangeLeadsToNewerBackupBeReported()
-        throws Exception {
+    public void noDiscardingAChangeLeadsToNewerBackupBeReported() throws Exception {
         databaseModification();
         makeBackup();
         assertTrue(BackupManager.backupFileDiffers(testBib, backupDir));
@@ -126,8 +118,7 @@ public void noDiscardingASavedChange() throws Exception {
     }
 
     @Test
-    public void discardingAChangeLeadsToNewerBackupToBeIgnored()
-        throws Exception {
+    public void discardingAChangeLeadsToNewerBackupToBeIgnored() throws Exception {
         databaseModification();
         makeBackup();
         backupManager.discardBackup(backupDir);
diff --git a/src/test/java/org/jabref/gui/autosaveandbackup/BackupManagerTest.java b/src/test/java/org/jabref/gui/autosaveandbackup/BackupManagerTest.java
index 970e9a28916..10e2b019ecd 100644
--- a/src/test/java/org/jabref/gui/autosaveandbackup/BackupManagerTest.java
+++ b/src/test/java/org/jabref/gui/autosaveandbackup/BackupManagerTest.java
@@ -44,10 +44,7 @@ void setup(@TempDir Path tempDir) {
     public void backupFileNameIsCorrectlyGeneratedInAppDataDirectory() {
         Path bibPath = Path.of("tmp", "test.bib");
         backupDir = OS.getNativeDesktop().getBackupDirectory();
-        Path bakPath = BackupManager.getBackupPathForNewBackup(
-            bibPath,
-            backupDir
-        );
+        Path bakPath = BackupManager.getBackupPathForNewBackup(bibPath, backupDir);
 
         // Pattern is "27182d3c--test.bib--", but the hashing is implemented differently on Linux than on Windows
         assertNotEquals("", bakPath);
@@ -55,39 +52,29 @@ public void backupFileNameIsCorrectlyGeneratedInAppDataDirectory() {
 
     @Test
     public void backupFileIsEqualForNonExistingBackup() throws Exception {
-        Path originalFile = Path.of(
-            BackupManagerTest.class.getResource("no-autosave.bib").toURI()
-        );
+        Path originalFile = Path.of(BackupManagerTest.class.getResource("no-autosave.bib").toURI());
         assertFalse(BackupManager.backupFileDiffers(originalFile, backupDir));
     }
 
     @Test
     public 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 source = Path.of(BackupManagerTest.class.getResource("no-changes.bib.bak").toURI());
         Path target = BackupFileUtil.getPathForNewBackupFileAndCreateDirectory(
-            Path.of(
-                BackupManagerTest.class.getResource("no-changes.bib").toURI()
-            ),
+            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()
-        );
+        Path originalFile = Path.of(BackupManagerTest.class.getResource("no-changes.bib").toURI());
         assertFalse(BackupManager.backupFileDiffers(originalFile, backupDir));
     }
 
     @Test
     public void backupFileDiffers() throws Exception {
         // Prepare test: Create backup file on "right" path
-        Path source = Path.of(
-            BackupManagerTest.class.getResource("changes.bib.bak").toURI()
-        );
+        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,
@@ -95,18 +82,13 @@ public void backupFileDiffers() throws Exception {
         );
         Files.copy(source, target, StandardCopyOption.REPLACE_EXISTING);
 
-        Path originalFile = Path.of(
-            BackupManagerTest.class.getResource("changes.bib").toURI()
-        );
+        Path originalFile = Path.of(BackupManagerTest.class.getResource("changes.bib").toURI());
         assertTrue(BackupManager.backupFileDiffers(originalFile, backupDir));
     }
 
     @Test
-    public void correctBackupFileDeterminedForMultipleBakFiles()
-        throws Exception {
-        Path noChangesBib = Path.of(
-            BackupManagerTest.class.getResource("no-changes.bib").toURI()
-        );
+    public 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()
         );
@@ -118,11 +100,7 @@ public void correctBackupFileDeterminedForMultipleBakFiles()
             BackupFileType.BACKUP,
             backupDir
         );
-        Files.copy(
-            noChangesBibBak,
-            target,
-            StandardCopyOption.REPLACE_EXISTING
-        );
+        Files.copy(noChangesBibBak, target, StandardCopyOption.REPLACE_EXISTING);
 
         // create "older" .bak files containing changes
         for (int i = 0; i < 10; i++) {
@@ -137,11 +115,7 @@ public void correctBackupFileDeterminedForMultipleBakFiles()
                 timeSuffix +
                 ".bak";
             target = directory.resolve(fileName);
-            Files.copy(
-                changesBibBak,
-                target,
-                StandardCopyOption.REPLACE_EXISTING
-            );
+            Files.copy(changesBibBak, target, StandardCopyOption.REPLACE_EXISTING);
         }
 
         Path originalFile = noChangesBib;
@@ -150,9 +124,7 @@ public void correctBackupFileDeterminedForMultipleBakFiles()
 
     @Test
     public void bakFileWithNewerTimeStampLeadsToDiff() throws Exception {
-        Path changesBib = Path.of(
-            BackupManagerTest.class.getResource("changes.bib").toURI()
-        );
+        Path changesBib = Path.of(BackupManagerTest.class.getResource("changes.bib").toURI());
         Path changesBibBak = Path.of(
             BackupManagerTest.class.getResource("changes.bib.bak").toURI()
         );
@@ -169,9 +141,7 @@ public void bakFileWithNewerTimeStampLeadsToDiff() throws Exception {
 
     @Test
     public void bakFileWithOlderTimeStampDoesNotLeadToDiff() throws Exception {
-        Path changesBib = Path.of(
-            BackupManagerTest.class.getResource("changes.bib").toURI()
-        );
+        Path changesBib = Path.of(BackupManagerTest.class.getResource("changes.bib").toURI());
         Path changesBibBak = Path.of(
             BackupManagerTest.class.getResource("changes.bib.bak").toURI()
         );
@@ -190,18 +160,14 @@ public void bakFileWithOlderTimeStampDoesNotLeadToDiff() throws Exception {
     }
 
     @Test
-    public void shouldNotCreateABackup(@TempDir Path customDir)
-        throws Exception {
+    public void shouldNotCreateABackup(@TempDir Path customDir) throws Exception {
         Path backupDir = customDir.resolve("subBackupDir");
         Files.createDirectories(backupDir);
 
         var database = new BibDatabaseContext(new BibDatabase());
         database.setDatabasePath(customDir.resolve("Bibfile.bib"));
 
-        var preferences = mock(
-            PreferencesService.class,
-            Answers.RETURNS_DEEP_STUBS
-        );
+        var preferences = mock(PreferencesService.class, Answers.RETURNS_DEEP_STUBS);
         var filePreferences = mock(FilePreferences.class);
         when(preferences.getFilePreferences()).thenReturn(filePreferences);
         when(filePreferences.getBackupDirectory()).thenReturn(backupDir);
@@ -228,10 +194,7 @@ public void shouldCreateABackup(@TempDir Path customDir) throws Exception {
         var database = new BibDatabaseContext(new BibDatabase());
         database.setDatabasePath(customDir.resolve("Bibfile.bib"));
 
-        var preferences = mock(
-            PreferencesService.class,
-            Answers.RETURNS_DEEP_STUBS
-        );
+        var preferences = mock(PreferencesService.class, Answers.RETURNS_DEEP_STUBS);
         var filePreferences = mock(FilePreferences.class);
         when(preferences.getFilePreferences()).thenReturn(filePreferences);
         when(filePreferences.getBackupDirectory()).thenReturn(backupDir);
@@ -245,9 +208,7 @@ public void shouldCreateABackup(@TempDir Path customDir) throws Exception {
         );
         manager.listen(new MetaDataChangedEvent(new MetaData()));
 
-        Optional<Path> fullBackupPath = manager.determineBackupPathForNewBackup(
-            backupDir
-        );
+        Optional<Path> fullBackupPath = manager.determineBackupPathForNewBackup(backupDir);
         fullBackupPath.ifPresent(manager::performBackup);
         manager.listen(new GroupUpdatedEvent(new MetaData()));
 
diff --git a/src/test/java/org/jabref/gui/commonfxcontrols/SaveOrderPanelViewModelTest.java b/src/test/java/org/jabref/gui/commonfxcontrols/SaveOrderPanelViewModelTest.java
index 59cb20238b8..b69fd4d5f95 100644
--- a/src/test/java/org/jabref/gui/commonfxcontrols/SaveOrderPanelViewModelTest.java
+++ b/src/test/java/org/jabref/gui/commonfxcontrols/SaveOrderPanelViewModelTest.java
@@ -27,13 +27,7 @@ void setUp() {
         viewModel = new SaveOrderConfigPanelViewModel();
         viewModel
             .sortCriteriaProperty()
-            .addAll(
-                List.of(
-                    sortCriterionKey,
-                    sortCriterionAuthor,
-                    sortCriterionTitle
-                )
-            );
+            .addAll(List.of(sortCriterionKey, sortCriterionAuthor, sortCriterionTitle));
     }
 
     @Test
diff --git a/src/test/java/org/jabref/gui/documentviewer/PdfDocumentViewModelTest.java b/src/test/java/org/jabref/gui/documentviewer/PdfDocumentViewModelTest.java
index a521151db03..524e75119b4 100644
--- a/src/test/java/org/jabref/gui/documentviewer/PdfDocumentViewModelTest.java
+++ b/src/test/java/org/jabref/gui/documentviewer/PdfDocumentViewModelTest.java
@@ -19,9 +19,7 @@ void getPagesTest(@TempDir Path tempDir) throws IOException {
             mockPDF.addPage(new PDPage());
             mockPDF.save(pdfFile.toAbsolutePath().toString());
 
-            PdfDocumentViewModel PDFviewModel = new PdfDocumentViewModel(
-                mockPDF
-            );
+            PdfDocumentViewModel PDFviewModel = new PdfDocumentViewModel(mockPDF);
 
             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 2adf207a919..9ec2990cf24 100644
--- a/src/test/java/org/jabref/gui/edit/CopyMoreActionTest.java
+++ b/src/test/java/org/jabref/gui/edit/CopyMoreActionTest.java
@@ -31,12 +31,8 @@
 public class CopyMoreActionTest {
 
     private final DialogService dialogService = spy(DialogService.class);
-    private final ClipBoardManager clipBoardManager = mock(
-        ClipBoardManager.class
-    );
-    private final PreferencesService preferencesService = mock(
-        PreferencesService.class
-    );
+    private final ClipBoardManager clipBoardManager = mock(ClipBoardManager.class);
+    private final PreferencesService preferencesService = mock(PreferencesService.class);
     private final JournalAbbreviationRepository abbreviationRepository = mock(
         JournalAbbreviationRepository.class
     );
@@ -60,10 +56,7 @@ public void setUp() {
                 .withField(StandardField.TITLE, title)
                 .withField(StandardField.YEAR, "2020")
                 .withField(StandardField.DOI, "10.1145/3377811.3380330")
-                .withField(
-                    StandardField.SUBTITLE,
-                    "cognitive biases and software development"
-                )
+                .withField(StandardField.SUBTITLE, "cognitive biases and software development")
                 .withCitationKey("abc");
         titles.add(title);
         keys.add("abc");
@@ -73,8 +66,7 @@ public void setUp() {
     @Test
     public void testExecuteOnFail() {
         when(stateManager.getActiveDatabase()).thenReturn(Optional.empty());
-        when(stateManager.getSelectedEntries())
-            .thenReturn(FXCollections.emptyObservableList());
+        when(stateManager.getSelectedEntries()).thenReturn(FXCollections.emptyObservableList());
         copyMoreAction =
             new CopyMoreAction(
                 StandardActions.COPY_TITLE,
@@ -94,14 +86,14 @@ public void testExecuteOnFail() {
     public void testExecuteCopyTitleWithNoTitle() {
         BibEntry entryWithNoTitle = (BibEntry) entry.clone();
         entryWithNoTitle.clearField(StandardField.TITLE);
-        ObservableList<BibEntry> entriesWithNoTitles =
-            FXCollections.observableArrayList(entryWithNoTitle);
+        ObservableList<BibEntry> entriesWithNoTitles = FXCollections.observableArrayList(
+            entryWithNoTitle
+        );
         BibDatabaseContext databaseContext = new BibDatabaseContext(
             new BibDatabase(entriesWithNoTitles)
         );
 
-        when(stateManager.getActiveDatabase())
-            .thenReturn(Optional.ofNullable(databaseContext));
+        when(stateManager.getActiveDatabase()).thenReturn(Optional.ofNullable(databaseContext));
         when(stateManager.getSelectedEntries()).thenReturn(entriesWithNoTitles);
         copyMoreAction =
             new CopyMoreAction(
@@ -116,23 +108,20 @@ public void testExecuteCopyTitleWithNoTitle() {
 
         verify(clipBoardManager, times(0)).setContent(any(String.class));
         verify(dialogService, times(1))
-            .notify(
-                Localization.lang("None of the selected entries have titles.")
-            );
+            .notify(Localization.lang("None of the selected entries have titles."));
     }
 
     @Test
     public void testExecuteCopyTitleOnPartialSuccess() {
         BibEntry entryWithNoTitle = (BibEntry) entry.clone();
         entryWithNoTitle.clearField(StandardField.TITLE);
-        ObservableList<BibEntry> mixedEntries =
-            FXCollections.observableArrayList(entryWithNoTitle, entry);
-        BibDatabaseContext databaseContext = new BibDatabaseContext(
-            new BibDatabase(mixedEntries)
+        ObservableList<BibEntry> mixedEntries = FXCollections.observableArrayList(
+            entryWithNoTitle,
+            entry
         );
+        BibDatabaseContext databaseContext = new BibDatabaseContext(new BibDatabase(mixedEntries));
 
-        when(stateManager.getActiveDatabase())
-            .thenReturn(Optional.ofNullable(databaseContext));
+        when(stateManager.getActiveDatabase()).thenReturn(Optional.ofNullable(databaseContext));
         when(stateManager.getSelectedEntries()).thenReturn(mixedEntries);
         copyMoreAction =
             new CopyMoreAction(
@@ -159,14 +148,12 @@ public void testExecuteCopyTitleOnPartialSuccess() {
 
     @Test
     public void testExecuteCopyTitleOnSuccess() {
-        ObservableList<BibEntry> entriesWithTitles =
-            FXCollections.observableArrayList(entry);
+        ObservableList<BibEntry> entriesWithTitles = FXCollections.observableArrayList(entry);
         BibDatabaseContext databaseContext = new BibDatabaseContext(
             new BibDatabase(entriesWithTitles)
         );
 
-        when(stateManager.getActiveDatabase())
-            .thenReturn(Optional.ofNullable(databaseContext));
+        when(stateManager.getActiveDatabase()).thenReturn(Optional.ofNullable(databaseContext));
         when(stateManager.getSelectedEntries()).thenReturn(entriesWithTitles);
         copyMoreAction =
             new CopyMoreAction(
@@ -194,14 +181,14 @@ public void testExecuteCopyTitleOnSuccess() {
     public void testExecuteCopyKeyWithNoKey() {
         BibEntry entryWithNoKey = (BibEntry) entry.clone();
         entryWithNoKey.clearCiteKey();
-        ObservableList<BibEntry> entriesWithNoKeys =
-            FXCollections.observableArrayList(entryWithNoKey);
+        ObservableList<BibEntry> entriesWithNoKeys = FXCollections.observableArrayList(
+            entryWithNoKey
+        );
         BibDatabaseContext databaseContext = new BibDatabaseContext(
             new BibDatabase(entriesWithNoKeys)
         );
 
-        when(stateManager.getActiveDatabase())
-            .thenReturn(Optional.ofNullable(databaseContext));
+        when(stateManager.getActiveDatabase()).thenReturn(Optional.ofNullable(databaseContext));
         when(stateManager.getSelectedEntries()).thenReturn(entriesWithNoKeys);
         copyMoreAction =
             new CopyMoreAction(
@@ -216,25 +203,20 @@ public void testExecuteCopyKeyWithNoKey() {
 
         verify(clipBoardManager, times(0)).setContent(any(String.class));
         verify(dialogService, times(1))
-            .notify(
-                Localization.lang(
-                    "None of the selected entries have citation keys."
-                )
-            );
+            .notify(Localization.lang("None of the selected entries have citation keys."));
     }
 
     @Test
     public void testExecuteCopyKeyOnPartialSuccess() {
         BibEntry entryWithNoKey = (BibEntry) entry.clone();
         entryWithNoKey.clearCiteKey();
-        ObservableList<BibEntry> mixedEntries =
-            FXCollections.observableArrayList(entryWithNoKey, entry);
-        BibDatabaseContext databaseContext = new BibDatabaseContext(
-            new BibDatabase(mixedEntries)
+        ObservableList<BibEntry> mixedEntries = FXCollections.observableArrayList(
+            entryWithNoKey,
+            entry
         );
+        BibDatabaseContext databaseContext = new BibDatabaseContext(new BibDatabase(mixedEntries));
 
-        when(stateManager.getActiveDatabase())
-            .thenReturn(Optional.ofNullable(databaseContext));
+        when(stateManager.getActiveDatabase()).thenReturn(Optional.ofNullable(databaseContext));
         when(stateManager.getSelectedEntries()).thenReturn(mixedEntries);
         copyMoreAction =
             new CopyMoreAction(
@@ -261,14 +243,12 @@ public void testExecuteCopyKeyOnPartialSuccess() {
 
     @Test
     public void testExecuteCopyKeyOnSuccess() {
-        ObservableList<BibEntry> entriesWithKeys =
-            FXCollections.observableArrayList(entry);
+        ObservableList<BibEntry> entriesWithKeys = FXCollections.observableArrayList(entry);
         BibDatabaseContext databaseContext = new BibDatabaseContext(
             new BibDatabase(entriesWithKeys)
         );
 
-        when(stateManager.getActiveDatabase())
-            .thenReturn(Optional.ofNullable(databaseContext));
+        when(stateManager.getActiveDatabase()).thenReturn(Optional.ofNullable(databaseContext));
         when(stateManager.getSelectedEntries()).thenReturn(entriesWithKeys);
         copyMoreAction =
             new CopyMoreAction(
@@ -296,14 +276,14 @@ public void testExecuteCopyKeyOnSuccess() {
     public void testExecuteCopyDoiWithNoDoi() {
         BibEntry entryWithNoDoi = (BibEntry) entry.clone();
         entryWithNoDoi.clearField(StandardField.DOI);
-        ObservableList<BibEntry> entriesWithNoDois =
-            FXCollections.observableArrayList(entryWithNoDoi);
+        ObservableList<BibEntry> entriesWithNoDois = FXCollections.observableArrayList(
+            entryWithNoDoi
+        );
         BibDatabaseContext databaseContext = new BibDatabaseContext(
             new BibDatabase(entriesWithNoDois)
         );
 
-        when(stateManager.getActiveDatabase())
-            .thenReturn(Optional.ofNullable(databaseContext));
+        when(stateManager.getActiveDatabase()).thenReturn(Optional.ofNullable(databaseContext));
         when(stateManager.getSelectedEntries()).thenReturn(entriesWithNoDois);
         copyMoreAction =
             new CopyMoreAction(
@@ -318,23 +298,20 @@ public void testExecuteCopyDoiWithNoDoi() {
 
         verify(clipBoardManager, times(0)).setContent(any(String.class));
         verify(dialogService, times(1))
-            .notify(
-                Localization.lang("None of the selected entries have DOIs.")
-            );
+            .notify(Localization.lang("None of the selected entries have DOIs."));
     }
 
     @Test
     public void testExecuteCopyDoiOnPartialSuccess() {
         BibEntry entryWithNoDoi = (BibEntry) entry.clone();
         entryWithNoDoi.clearField(StandardField.DOI);
-        ObservableList<BibEntry> mixedEntries =
-            FXCollections.observableArrayList(entryWithNoDoi, entry);
-        BibDatabaseContext databaseContext = new BibDatabaseContext(
-            new BibDatabase(mixedEntries)
+        ObservableList<BibEntry> mixedEntries = FXCollections.observableArrayList(
+            entryWithNoDoi,
+            entry
         );
+        BibDatabaseContext databaseContext = new BibDatabaseContext(new BibDatabase(mixedEntries));
 
-        when(stateManager.getActiveDatabase())
-            .thenReturn(Optional.ofNullable(databaseContext));
+        when(stateManager.getActiveDatabase()).thenReturn(Optional.ofNullable(databaseContext));
         when(stateManager.getSelectedEntries()).thenReturn(mixedEntries);
         copyMoreAction =
             new CopyMoreAction(
@@ -361,14 +338,12 @@ public void testExecuteCopyDoiOnPartialSuccess() {
 
     @Test
     public void testExecuteCopyDoiOnSuccess() {
-        ObservableList<BibEntry> entriesWithDois =
-            FXCollections.observableArrayList(entry);
+        ObservableList<BibEntry> entriesWithDois = FXCollections.observableArrayList(entry);
         BibDatabaseContext databaseContext = new BibDatabaseContext(
             new BibDatabase(entriesWithDois)
         );
 
-        when(stateManager.getActiveDatabase())
-            .thenReturn(Optional.ofNullable(databaseContext));
+        when(stateManager.getActiveDatabase()).thenReturn(Optional.ofNullable(databaseContext));
         when(stateManager.getSelectedEntries()).thenReturn(entriesWithDois);
         copyMoreAction =
             new CopyMoreAction(
diff --git a/src/test/java/org/jabref/gui/edit/CopyOrMoveFieldContentTabViewModelTest.java b/src/test/java/org/jabref/gui/edit/CopyOrMoveFieldContentTabViewModelTest.java
index c3f931e3777..6c99a5d96ea 100644
--- a/src/test/java/org/jabref/gui/edit/CopyOrMoveFieldContentTabViewModelTest.java
+++ b/src/test/java/org/jabref/gui/edit/CopyOrMoveFieldContentTabViewModelTest.java
@@ -30,12 +30,9 @@ void setup() {
                 .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);
+        copyOrMoveFieldContentTabViewModel = newTwoFieldsViewModel(entryA, entryB);
     }
 
     @Test
@@ -43,15 +40,9 @@ void copyValueDoesNotCopyBlankValues() {
         CopyOrMoveFieldContentTabViewModel copyOrMoveFieldContentTabViewModel =
             newTwoFieldsViewModel(entryA, entryB);
 
-        copyOrMoveFieldContentTabViewModel
-            .fromFieldProperty()
-            .set(StandardField.YEAR);
-        copyOrMoveFieldContentTabViewModel
-            .toFieldProperty()
-            .set(StandardField.DATE);
-        copyOrMoveFieldContentTabViewModel
-            .overwriteFieldContentProperty()
-            .set(true);
+        copyOrMoveFieldContentTabViewModel.fromFieldProperty().set(StandardField.YEAR);
+        copyOrMoveFieldContentTabViewModel.toFieldProperty().set(StandardField.DATE);
+        copyOrMoveFieldContentTabViewModel.overwriteFieldContentProperty().set(true);
         copyOrMoveFieldContentTabViewModel.copyValue();
 
         assertEquals(
@@ -73,15 +64,9 @@ void copyValueDoesNotCopyBlankValues() {
 
     @Test
     void swapValuesShouldNotSwapFieldValuesIfOneOfTheValuesIsBlank() {
-        copyOrMoveFieldContentTabViewModel
-            .fromFieldProperty()
-            .set(StandardField.YEAR);
-        copyOrMoveFieldContentTabViewModel
-            .toFieldProperty()
-            .set(StandardField.DATE);
-        copyOrMoveFieldContentTabViewModel
-            .overwriteFieldContentProperty()
-            .set(true);
+        copyOrMoveFieldContentTabViewModel.fromFieldProperty().set(StandardField.YEAR);
+        copyOrMoveFieldContentTabViewModel.toFieldProperty().set(StandardField.DATE);
+        copyOrMoveFieldContentTabViewModel.overwriteFieldContentProperty().set(true);
 
         copyOrMoveFieldContentTabViewModel.swapValues();
 
@@ -91,39 +76,24 @@ void swapValuesShouldNotSwapFieldValuesIfOneOfTheValuesIsBlank() {
 
     @Test
     void swapValuesShouldSwapFieldValuesIfBothValuesAreNotBlank() {
-        copyOrMoveFieldContentTabViewModel
-            .fromFieldProperty()
-            .set(StandardField.YEAR);
-        copyOrMoveFieldContentTabViewModel
-            .toFieldProperty()
-            .set(StandardField.DATE);
-        copyOrMoveFieldContentTabViewModel
-            .overwriteFieldContentProperty()
-            .set(true);
+        copyOrMoveFieldContentTabViewModel.fromFieldProperty().set(StandardField.YEAR);
+        copyOrMoveFieldContentTabViewModel.toFieldProperty().set(StandardField.DATE);
+        copyOrMoveFieldContentTabViewModel.overwriteFieldContentProperty().set(true);
 
         copyOrMoveFieldContentTabViewModel.swapValues();
 
         assertEquals(
             List.of(Optional.of("2014"), Optional.of("2015")),
-            List.of(
-                entryA.getField(StandardField.YEAR),
-                entryA.getField(StandardField.DATE)
-            ),
+            List.of(entryA.getField(StandardField.YEAR), entryA.getField(StandardField.DATE)),
             "YEAR and DATE values didn't swap"
         );
     }
 
     @Test
     void moveValueShouldNotMoveValueIfToFieldIsNotBlankAndOverwriteIsNotEnabled() {
-        copyOrMoveFieldContentTabViewModel
-            .fromFieldProperty()
-            .set(StandardField.YEAR);
-        copyOrMoveFieldContentTabViewModel
-            .toFieldProperty()
-            .set(StandardField.DATE);
-        copyOrMoveFieldContentTabViewModel
-            .overwriteFieldContentProperty()
-            .set(false);
+        copyOrMoveFieldContentTabViewModel.fromFieldProperty().set(StandardField.YEAR);
+        copyOrMoveFieldContentTabViewModel.toFieldProperty().set(StandardField.DATE);
+        copyOrMoveFieldContentTabViewModel.overwriteFieldContentProperty().set(false);
 
         copyOrMoveFieldContentTabViewModel.moveValue();
 
@@ -133,15 +103,9 @@ void moveValueShouldNotMoveValueIfToFieldIsNotBlankAndOverwriteIsNotEnabled() {
 
     @Test
     void moveValueShouldMoveValueIfOverwriteIsEnabled() {
-        copyOrMoveFieldContentTabViewModel
-            .fromFieldProperty()
-            .set(StandardField.DATE);
-        copyOrMoveFieldContentTabViewModel
-            .toFieldProperty()
-            .set(StandardField.YEAR);
-        copyOrMoveFieldContentTabViewModel
-            .overwriteFieldContentProperty()
-            .set(true);
+        copyOrMoveFieldContentTabViewModel.fromFieldProperty().set(StandardField.DATE);
+        copyOrMoveFieldContentTabViewModel.toFieldProperty().set(StandardField.YEAR);
+        copyOrMoveFieldContentTabViewModel.overwriteFieldContentProperty().set(true);
 
         copyOrMoveFieldContentTabViewModel.moveValue();
 
@@ -149,9 +113,7 @@ void moveValueShouldMoveValueIfOverwriteIsEnabled() {
         assertEquals(Optional.empty(), entryB.getField(StandardField.DATE));
     }
 
-    private CopyOrMoveFieldContentTabViewModel newTwoFieldsViewModel(
-        BibEntry... selectedEntries
-    ) {
+    private CopyOrMoveFieldContentTabViewModel newTwoFieldsViewModel(BibEntry... selectedEntries) {
         return new CopyOrMoveFieldContentTabViewModel(
             List.of(selectedEntries),
             bibDatabase,
diff --git a/src/test/java/org/jabref/gui/edit/EditFieldContentTabViewModelTest.java b/src/test/java/org/jabref/gui/edit/EditFieldContentTabViewModelTest.java
index c0f7a7d7b63..251499e38f2 100644
--- a/src/test/java/org/jabref/gui/edit/EditFieldContentTabViewModelTest.java
+++ b/src/test/java/org/jabref/gui/edit/EditFieldContentTabViewModelTest.java
@@ -38,18 +38,12 @@ void setup() {
 
         bibDatabase = new BibDatabase();
         editFieldContentViewModel =
-            new EditFieldContentViewModel(
-                bibDatabase,
-                List.of(entryA, entryB),
-                stateManager
-            );
+            new EditFieldContentViewModel(bibDatabase, List.of(entryA, entryB), stateManager);
     }
 
     @Test
     void clearSelectedFieldShouldClearFieldContentEvenWhenOverwriteFieldContentIsNotEnabled() {
-        editFieldContentViewModel
-            .selectedFieldProperty()
-            .set(StandardField.YEAR);
+        editFieldContentViewModel.selectedFieldProperty().set(StandardField.YEAR);
         editFieldContentViewModel.overwriteFieldContentProperty().set(false);
         editFieldContentViewModel.clearSelectedField();
 
@@ -58,9 +52,7 @@ void clearSelectedFieldShouldClearFieldContentEvenWhenOverwriteFieldContentIsNot
 
     @Test
     void clearSelectedFieldShouldDoNothingWhenFieldDoesntExistOrIsEmpty() {
-        editFieldContentViewModel
-            .selectedFieldProperty()
-            .set(StandardField.FILE);
+        editFieldContentViewModel.selectedFieldProperty().set(StandardField.FILE);
         editFieldContentViewModel.clearSelectedField();
 
         assertEquals(Optional.empty(), entryA.getField(StandardField.FILE));
@@ -69,9 +61,7 @@ void clearSelectedFieldShouldDoNothingWhenFieldDoesntExistOrIsEmpty() {
     @Test
     void setFieldValueShouldNotDoAnythingIfOverwriteFieldContentIsNotEnabled() {
         editFieldContentViewModel.overwriteFieldContentProperty().set(false);
-        editFieldContentViewModel
-            .selectedFieldProperty()
-            .set(StandardField.YEAR);
+        editFieldContentViewModel.selectedFieldProperty().set(StandardField.YEAR);
         editFieldContentViewModel.fieldValueProperty().set("2001");
         editFieldContentViewModel.setFieldValue();
 
@@ -81,9 +71,7 @@ void setFieldValueShouldNotDoAnythingIfOverwriteFieldContentIsNotEnabled() {
     @Test
     void setFieldValueShouldSetFieldValueIfOverwriteFieldContentIsEnabled() {
         editFieldContentViewModel.overwriteFieldContentProperty().set(true);
-        editFieldContentViewModel
-            .selectedFieldProperty()
-            .set(StandardField.YEAR);
+        editFieldContentViewModel.selectedFieldProperty().set(StandardField.YEAR);
         editFieldContentViewModel.fieldValueProperty().set("2001");
         editFieldContentViewModel.setFieldValue();
 
@@ -93,9 +81,7 @@ void setFieldValueShouldSetFieldValueIfOverwriteFieldContentIsEnabled() {
     @Test
     void setFieldValueShouldSetFieldValueIfFieldContentIsEmpty() {
         editFieldContentViewModel.overwriteFieldContentProperty().set(false);
-        editFieldContentViewModel
-            .selectedFieldProperty()
-            .set(StandardField.YEAR);
+        editFieldContentViewModel.selectedFieldProperty().set(StandardField.YEAR);
         editFieldContentViewModel.fieldValueProperty().set("2001");
         editFieldContentViewModel.setFieldValue();
 
@@ -105,9 +91,7 @@ void setFieldValueShouldSetFieldValueIfFieldContentIsEmpty() {
     @Test
     void appendToFieldValueShouldDoNothingIfOverwriteFieldContentIsNotEnabled() {
         editFieldContentViewModel.overwriteFieldContentProperty().set(false);
-        editFieldContentViewModel
-            .selectedFieldProperty()
-            .set(StandardField.YEAR);
+        editFieldContentViewModel.selectedFieldProperty().set(StandardField.YEAR);
         editFieldContentViewModel.fieldValueProperty().set("0");
         editFieldContentViewModel.appendToFieldValue();
 
@@ -117,9 +101,7 @@ void appendToFieldValueShouldDoNothingIfOverwriteFieldContentIsNotEnabled() {
     @Test
     void appendToFieldValueShouldAppendFieldValueIfOverwriteFieldContentIsEnabled() {
         editFieldContentViewModel.overwriteFieldContentProperty().set(true);
-        editFieldContentViewModel
-            .selectedFieldProperty()
-            .set(StandardField.YEAR);
+        editFieldContentViewModel.selectedFieldProperty().set(StandardField.YEAR);
         editFieldContentViewModel.fieldValueProperty().set("0");
         editFieldContentViewModel.appendToFieldValue();
 
diff --git a/src/test/java/org/jabref/gui/edit/ManageKeywordsViewModelTest.java b/src/test/java/org/jabref/gui/edit/ManageKeywordsViewModelTest.java
index 2b65c61990c..b56345a79f2 100644
--- a/src/test/java/org/jabref/gui/edit/ManageKeywordsViewModelTest.java
+++ b/src/test/java/org/jabref/gui/edit/ManageKeywordsViewModelTest.java
@@ -18,18 +18,13 @@
 
 public class ManageKeywordsViewModelTest {
 
-    private final BibEntryPreferences bibEntryPreferences = mock(
-        BibEntryPreferences.class
-    );
+    private final BibEntryPreferences bibEntryPreferences = mock(BibEntryPreferences.class);
     private ManageKeywordsViewModel keywordsViewModel;
 
     @BeforeEach
     void setUp() {
         BibEntry entryOne = new BibEntry(StandardEntryType.Article)
-            .withField(
-                StandardField.AUTHOR,
-                "Prakhar Srivastava and Nishant Singh"
-            )
+            .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")
@@ -39,20 +34,14 @@ void setUp() {
             )
             .withField(StandardField.PAGES, "351--354")
             .withField(StandardField.PUBLISHER, "IEEE")
-            .withField(
-                StandardField.TITLE,
-                "Automatized Medical Chatbot (Medibot)"
-            )
+            .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.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")
@@ -60,10 +49,7 @@ void setUp() {
             .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.TITLE, "Chatbots as conversational healthcare services")
             .withField(
                 StandardField.KEYWORDS,
                 "Chatbot, Medical services, Internet, Data collection, Medical diagnostic imaging, Automation, Vocabulary"
@@ -73,8 +59,7 @@ void setUp() {
 
         when(bibEntryPreferences.getKeywordSeparator()).thenReturn(',');
 
-        keywordsViewModel =
-            new ManageKeywordsViewModel(bibEntryPreferences, entries);
+        keywordsViewModel = new ManageKeywordsViewModel(bibEntryPreferences, entries);
     }
 
     @Test
@@ -96,16 +81,12 @@ void keywordsFilledInCorrectly() {
             "Vocabulary"
         );
 
-        assertEquals(
-            FXCollections.observableList(expectedKeywordsList),
-            addedKeywords
-        );
+        assertEquals(FXCollections.observableList(expectedKeywordsList), addedKeywords);
     }
 
     @Test
     void removedKeywordNotIncludedInKeywordsList() {
-        ObservableList<String> modifiedKeywords =
-            keywordsViewModel.getKeywords();
+        ObservableList<String> modifiedKeywords = keywordsViewModel.getKeywords();
         List<String> originalKeywordsList = Arrays.asList(
             "Human-machine interaction",
             "Chatbot",
diff --git a/src/test/java/org/jabref/gui/edit/RenameFieldViewModelTest.java b/src/test/java/org/jabref/gui/edit/RenameFieldViewModelTest.java
index ae2eac63ac9..d2395fa05c0 100644
--- a/src/test/java/org/jabref/gui/edit/RenameFieldViewModelTest.java
+++ b/src/test/java/org/jabref/gui/edit/RenameFieldViewModelTest.java
@@ -42,11 +42,7 @@ void setup() {
 
         bibDatabase = new BibDatabase();
         renameFieldViewModel =
-            new RenameFieldViewModel(
-                List.of(entryA, entryB),
-                bibDatabase,
-                stateManager
-            );
+            new RenameFieldViewModel(List.of(entryA, entryB), bibDatabase, stateManager);
     }
 
     @Test
@@ -55,16 +51,10 @@ void renameFieldShouldRenameFieldIfItExist() {
         renameFieldViewModel.setNewFieldName("ETAD");
         renameFieldViewModel.renameField();
 
-        assertEquals(
-            Optional.of("2014"),
-            entryA.getField(FieldFactory.parseField("ETAD"))
-        );
+        assertEquals(Optional.of("2014"), entryA.getField(FieldFactory.parseField("ETAD")));
         assertEquals(Optional.empty(), entryA.getField(StandardField.DATE));
 
-        assertEquals(
-            Optional.of("1998"),
-            entryB.getField(FieldFactory.parseField("ETAD"))
-        );
+        assertEquals(Optional.of("1998"), entryB.getField(FieldFactory.parseField("ETAD")));
         assertEquals(Optional.empty(), entryB.getField(StandardField.DATE));
     }
 
@@ -76,16 +66,10 @@ void renameFieldShouldDoNothingIfFieldDoNotExist() {
         renameFieldViewModel.renameField();
 
         assertEquals(Optional.empty(), entryA.getField(toRenameField));
-        assertEquals(
-            Optional.empty(),
-            entryA.getField(new UnknownField("new_field_name"))
-        );
+        assertEquals(Optional.empty(), entryA.getField(new UnknownField("new_field_name")));
 
         assertEquals(Optional.empty(), entryB.getField(toRenameField));
-        assertEquals(
-            Optional.empty(),
-            entryB.getField(new UnknownField("new_field_name"))
-        );
+        assertEquals(Optional.empty(), entryB.getField(new UnknownField("new_field_name")));
     }
 
     @Test
@@ -95,19 +79,10 @@ void renameFieldShouldNotDoAnythingIfTheNewFieldNameIsEmpty() {
         renameFieldViewModel.renameField();
 
         assertEquals(Optional.of("Doe"), entryA.getField(StandardField.AUTHOR));
-        assertEquals(
-            Optional.empty(),
-            entryA.getField(FieldFactory.parseField(""))
-        );
-
-        assertEquals(
-            Optional.of("Eddie"),
-            entryB.getField(StandardField.AUTHOR)
-        );
-        assertEquals(
-            Optional.empty(),
-            entryB.getField(FieldFactory.parseField(""))
-        );
+        assertEquals(Optional.empty(), entryA.getField(FieldFactory.parseField("")));
+
+        assertEquals(Optional.of("Eddie"), entryB.getField(StandardField.AUTHOR));
+        assertEquals(Optional.empty(), entryB.getField(FieldFactory.parseField("")));
     }
 
     @Test
@@ -117,19 +92,10 @@ void renameFieldShouldNotDoAnythingIfTheNewFieldNameHasWhitespaceCharacters() {
         renameFieldViewModel.renameField();
 
         assertEquals(Optional.of("Doe"), entryA.getField(StandardField.AUTHOR));
-        assertEquals(
-            Optional.empty(),
-            entryA.getField(FieldFactory.parseField("Hello, World"))
-        );
-
-        assertEquals(
-            Optional.of("Eddie"),
-            entryB.getField(StandardField.AUTHOR)
-        );
-        assertEquals(
-            Optional.empty(),
-            entryB.getField(FieldFactory.parseField("Hello, World"))
-        );
+        assertEquals(Optional.empty(), entryA.getField(FieldFactory.parseField("Hello, World")));
+
+        assertEquals(Optional.of("Eddie"), entryB.getField(StandardField.AUTHOR));
+        assertEquals(Optional.empty(), entryB.getField(FieldFactory.parseField("Hello, World")));
     }
 
     @Test
diff --git a/src/test/java/org/jabref/gui/edit/ReplaceStringViewModelTest.java b/src/test/java/org/jabref/gui/edit/ReplaceStringViewModelTest.java
index 52dff6da386..3b519b5e7f8 100644
--- a/src/test/java/org/jabref/gui/edit/ReplaceStringViewModelTest.java
+++ b/src/test/java/org/jabref/gui/edit/ReplaceStringViewModelTest.java
@@ -25,10 +25,7 @@ public class ReplaceStringViewModelTest {
     @BeforeEach
     void setUp() {
         BibEntry entry = new BibEntry(StandardEntryType.Article)
-            .withField(
-                StandardField.AUTHOR,
-                "Shatakshi Sharma and Bhim Singh and Sukumar Mishra"
-            )
+            .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")
@@ -38,10 +35,7 @@ void setUp() {
             )
             .withField(StandardField.ISSUE, "4")
             .withField(StandardField.ISSN, "1941-0050")
-            .withField(
-                StandardField.JOURNALTITLE,
-                "IEEE Transactions on Industrial Informatics"
-            )
+            .withField(StandardField.JOURNALTITLE, "IEEE Transactions on Industrial Informatics")
             .withField(StandardField.PAGES, "2346--2356")
             .withField(StandardField.PUBLISHER, "IEEE")
             .withField(
@@ -89,21 +83,11 @@ void testReplace(
         boolean allFieldReplace,
         int expectedResult
     ) {
-        viewModel
-            .findStringProperty()
-            .bind(new SimpleStringProperty(findString));
-        viewModel
-            .replaceStringProperty()
-            .bind(new SimpleStringProperty(replaceString));
-        viewModel
-            .fieldStringProperty()
-            .bind(new SimpleStringProperty(fieldString));
-        viewModel
-            .selectOnlyProperty()
-            .bind(new SimpleBooleanProperty(selectOnly));
-        viewModel
-            .allFieldReplaceProperty()
-            .bind(new SimpleBooleanProperty(allFieldReplace));
+        viewModel.findStringProperty().bind(new SimpleStringProperty(findString));
+        viewModel.replaceStringProperty().bind(new SimpleStringProperty(replaceString));
+        viewModel.fieldStringProperty().bind(new SimpleStringProperty(fieldString));
+        viewModel.selectOnlyProperty().bind(new SimpleBooleanProperty(selectOnly));
+        viewModel.allFieldReplaceProperty().bind(new SimpleBooleanProperty(allFieldReplace));
         assertEquals(expectedResult, viewModel.replace());
     }
 }
diff --git a/src/test/java/org/jabref/gui/entryeditor/CommentsTabTest.java b/src/test/java/org/jabref/gui/entryeditor/CommentsTabTest.java
index 0a76fa7af92..ce25eec26b0 100644
--- a/src/test/java/org/jabref/gui/entryeditor/CommentsTabTest.java
+++ b/src/test/java/org/jabref/gui/entryeditor/CommentsTabTest.java
@@ -87,8 +87,7 @@ void setUp() {
         when(ownerPreferences.getDefaultOwner()).thenReturn(ownerName);
         when(databaseContext.getMode()).thenReturn(BibDatabaseMode.BIBLATEX);
         BibEntryType entryTypeMock = mock(BibEntryType.class);
-        when(entryTypesManager.enrich(any(), any()))
-            .thenReturn(Optional.of(entryTypeMock));
+        when(entryTypesManager.enrich(any(), any())).thenReturn(Optional.of(entryTypeMock));
 
         commentsTab =
             new CommentsTab(
@@ -107,8 +106,7 @@ void setUp() {
 
     @Test
     void testDetermineFieldsToShowWorksForASingleUser() {
-        final UserSpecificCommentField ownerComment =
-            new UserSpecificCommentField(ownerName);
+        final UserSpecificCommentField ownerComment = new UserSpecificCommentField(ownerName);
 
         BibEntry entry = new BibEntry(StandardEntryType.Book)
             .withField(StandardField.COMMENT, "Standard comment text")
@@ -121,10 +119,10 @@ void testDetermineFieldsToShowWorksForASingleUser() {
 
     @Test
     void testDetermineFieldsToShowWorksForMultipleUsers() {
-        final UserSpecificCommentField ownerComment =
-            new UserSpecificCommentField(ownerName);
-        final UserSpecificCommentField otherUsersComment =
-            new UserSpecificCommentField("other-user-id");
+        final UserSpecificCommentField ownerComment = new UserSpecificCommentField(ownerName);
+        final UserSpecificCommentField otherUsersComment = new UserSpecificCommentField(
+            "other-user-id"
+        );
 
         BibEntry entry = new BibEntry(StandardEntryType.Book)
             .withField(StandardField.COMMENT, "Standard comment text")
@@ -133,10 +131,7 @@ void testDetermineFieldsToShowWorksForMultipleUsers() {
 
         Set<Field> fields = commentsTab.determineFieldsToShow(entry);
 
-        assertEquals(
-            Set.of(StandardField.COMMENT, ownerComment, otherUsersComment),
-            fields
-        );
+        assertEquals(Set.of(StandardField.COMMENT, ownerComment, otherUsersComment), fields);
     }
 
     @Test
diff --git a/src/test/java/org/jabref/gui/entryeditor/SciteTabTest.java b/src/test/java/org/jabref/gui/entryeditor/SciteTabTest.java
index f59f4aeedf2..b30d00a7db6 100644
--- a/src/test/java/org/jabref/gui/entryeditor/SciteTabTest.java
+++ b/src/test/java/org/jabref/gui/entryeditor/SciteTabTest.java
@@ -41,8 +41,7 @@ void setUp() {
             Answers.RETURNS_DEEP_STUBS
         );
         when(entryEditorPreferences.shouldShowSciteTab()).thenReturn(true);
-        when(preferencesService.getEntryEditorPreferences())
-            .thenReturn(entryEditorPreferences);
+        when(preferencesService.getEntryEditorPreferences()).thenReturn(entryEditorPreferences);
     }
 
     @Test
diff --git a/src/test/java/org/jabref/gui/entryeditor/SciteTabViewModelTest.java b/src/test/java/org/jabref/gui/entryeditor/SciteTabViewModelTest.java
index b0d7366827a..76adc325d4a 100644
--- a/src/test/java/org/jabref/gui/entryeditor/SciteTabViewModelTest.java
+++ b/src/test/java/org/jabref/gui/entryeditor/SciteTabViewModelTest.java
@@ -32,8 +32,7 @@ void setUp() {
             Answers.RETURNS_DEEP_STUBS
         );
         when(entryEditorPreferences.shouldShowSciteTab()).thenReturn(true);
-        when(preferencesService.getEntryEditorPreferences())
-            .thenReturn(entryEditorPreferences);
+        when(preferencesService.getEntryEditorPreferences()).thenReturn(entryEditorPreferences);
     }
 
     @Test
diff --git a/src/test/java/org/jabref/gui/entryeditor/SourceTabTest.java b/src/test/java/org/jabref/gui/entryeditor/SourceTabTest.java
index cf86dd3900f..e21f48dc786 100644
--- a/src/test/java/org/jabref/gui/entryeditor/SourceTabTest.java
+++ b/src/test/java/org/jabref/gui/entryeditor/SourceTabTest.java
@@ -44,12 +44,9 @@ class SourceTabTest {
     @Start
     public void onStart(Stage stage) {
         area = new CodeArea();
-        area.appendText(
-            "some example\n text to go here\n across a couple of \n lines...."
-        );
+        area.appendText("some example\n text to go here\n across a couple of \n lines....");
         StateManager stateManager = mock(StateManager.class);
-        when(stateManager.activeSearchQueryProperty())
-            .thenReturn(OptionalObjectProperty.empty());
+        when(stateManager.activeSearchQueryProperty()).thenReturn(OptionalObjectProperty.empty());
         KeyBindingRepository keyBindingRepository = new KeyBindingRepository(
             Collections.emptyList(),
             Collections.emptyList()
@@ -58,10 +55,7 @@ public void onStart(Stage stage) {
             ImportFormatPreferences.class,
             Answers.RETURNS_DEEP_STUBS
         );
-        when(
-            importFormatPreferences.bibEntryPreferences().getKeywordSeparator()
-        )
-            .thenReturn(',');
+        when(importFormatPreferences.bibEntryPreferences().getKeywordSeparator()).thenReturn(',');
         FieldPreferences fieldPreferences = mock(FieldPreferences.class);
         when(fieldPreferences.getNonWrappableFields())
             .thenReturn(FXCollections.emptyObservableList());
@@ -110,9 +104,7 @@ void switchingFromSourceTabDoesNotThrowException(FxRobot robot) {
         // Switch to different tab & update entry
         robot.interact(() -> pane.getSelectionModel().select(1));
         robot.interact(() -> stage.setWidth(600));
-        robot.interact(() ->
-            entry.setField(new UnknownField("test"), "new value")
-        );
+        robot.interact(() -> entry.setField(new UnknownField("test"), "new value"));
 
         // No exception should be thrown
         robot.interrupt(100);
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 e7765235b6a..b0e2351477c 100644
--- a/src/test/java/org/jabref/gui/entryeditor/fileannotationtab/FileAnnotationViewModelTest.java
+++ b/src/test/java/org/jabref/gui/entryeditor/fileannotationtab/FileAnnotationViewModelTest.java
@@ -80,10 +80,7 @@ public void retrieveCorrectContentWithoutLinkedFileAnnotation() {
             "This is paragraph 3."
         );
 
-        assertEquals(
-            expectedMarking,
-            annotationViewModelWithoutFileAnnotation.getContent()
-        );
+        assertEquals(expectedMarking, annotationViewModelWithoutFileAnnotation.getContent());
     }
 
     @Test
diff --git a/src/test/java/org/jabref/gui/exporter/ExportToClipboardActionTest.java b/src/test/java/org/jabref/gui/exporter/ExportToClipboardActionTest.java
index 7d0e891e60f..90a52541d0c 100644
--- a/src/test/java/org/jabref/gui/exporter/ExportToClipboardActionTest.java
+++ b/src/test/java/org/jabref/gui/exporter/ExportToClipboardActionTest.java
@@ -42,12 +42,8 @@ public class ExportToClipboardActionTest {
 
     private ExportToClipboardAction exportToClipboardAction;
     private final DialogService dialogService = spy(DialogService.class);
-    private final ClipBoardManager clipBoardManager = mock(
-        ClipBoardManager.class
-    );
-    private final BibDatabaseContext databaseContext = mock(
-        BibDatabaseContext.class
-    );
+    private final ClipBoardManager clipBoardManager = mock(ClipBoardManager.class);
+    private final BibDatabaseContext databaseContext = mock(BibDatabaseContext.class);
     private final PreferencesService preferences = mock(
         PreferencesService.class,
         Answers.RETURNS_DEEP_STUBS
@@ -67,10 +63,7 @@ public void setUp() {
             .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"
-            );
+            .withField(StandardField.SUBTITLE, "cognitive biases and software development");
 
         selectedEntries = FXCollections.observableArrayList(entry);
         when(stateManager.getSelectedEntries()).thenReturn(selectedEntries);
@@ -80,8 +73,7 @@ public void setUp() {
             .thenReturn(FXCollections.observableList(List.of()));
         when(preferences.getSelfContainedExportConfiguration())
             .thenReturn(mock(SelfContainedSaveConfiguration.class));
-        when(preferences.getXmpPreferences())
-            .thenReturn(mock(XmpPreferences.class));
+        when(preferences.getXmpPreferences()).thenReturn(mock(XmpPreferences.class));
         exportToClipboardAction =
             new ExportToClipboardAction(
                 dialogService,
@@ -94,25 +86,18 @@ public void setUp() {
 
     @Test
     public void testExecuteIfNoSelectedEntries() {
-        when(stateManager.getSelectedEntries())
-            .thenReturn(FXCollections.emptyObservableList());
+        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."
-                )
+                Localization.lang("This operation requires one or more entries to be selected.")
             );
     }
 
     @Test
     public void testExecuteOnSuccess() {
-        Exporter selectedExporter = new Exporter(
-            "html",
-            "HTML",
-            StandardFileType.HTML
-        ) {
+        Exporter selectedExporter = new Exporter("html", "HTML", StandardFileType.HTML) {
             @Override
             public void export(
                 BibDatabaseContext databaseContext,
@@ -125,24 +110,16 @@ public void export(
             LibraryPreferences.class,
             Answers.RETURNS_DEEP_STUBS
         );
-        FilePreferences filePreferences = mock(
-            FilePreferences.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.getLibraryPreferences()).thenReturn(libraryPreferences);
+        when(preferences.getExportPreferences().getLastExportExtension()).thenReturn("HTML");
         when(preferences.getSelfContainedExportConfiguration().getSaveOrder())
             .thenReturn(SaveOrder.getDefaultSaveOrder());
         when(stateManager.getSelectedEntries()).thenReturn(selectedEntries);
-        when(stateManager.getActiveDatabase())
-            .thenReturn(Optional.ofNullable(databaseContext));
+        when(stateManager.getActiveDatabase()).thenReturn(Optional.ofNullable(databaseContext));
         // noinspection ConstantConditions since databaseContext is mocked
-        when(
-            databaseContext.getFileDirectories(preferences.getFilePreferences())
-        )
+        when(databaseContext.getFileDirectories(preferences.getFilePreferences()))
             .thenReturn(new ArrayList<>(List.of(Path.of("path"))));
         when(databaseContext.getMetaData()).thenReturn(new MetaData());
         when(
@@ -167,9 +144,7 @@ public void export(
             );
         verify(dialogService, times(1))
             .notify(
-                Localization.lang("Entries exported to clipboard") +
-                ": " +
-                selectedEntries.size()
+                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 5bf0c334f4b..fa19ad31fd1 100644
--- a/src/test/java/org/jabref/gui/exporter/SaveDatabaseActionTest.java
+++ b/src/test/java/org/jabref/gui/exporter/SaveDatabaseActionTest.java
@@ -63,8 +63,7 @@ public void setUp() {
         when(filePreferences.getWorkingDirectory())
             .thenReturn(Path.of(TEST_BIBTEX_LIBRARY_LOCATION));
         when(preferences.getFilePreferences()).thenReturn(filePreferences);
-        when(preferences.getExportPreferences())
-            .thenReturn(mock(ExportPreferences.class));
+        when(preferences.getExportPreferences()).thenReturn(mock(ExportPreferences.class));
         when(jabRefFrame.getDialogService()).thenReturn(dialogService);
         saveDatabaseAction =
             spy(
@@ -79,9 +78,7 @@ public void setUp() {
 
     @Test
     public void saveAsShouldSetWorkingDirectory() {
-        when(
-            dialogService.showFileSaveDialog(any(FileDialogConfiguration.class))
-        )
+        when(dialogService.showFileSaveDialog(any(FileDialogConfiguration.class)))
             .thenReturn(Optional.of(file));
         doReturn(true).when(saveDatabaseAction).saveAs(any());
 
@@ -92,9 +89,7 @@ public void saveAsShouldSetWorkingDirectory() {
 
     @Test
     public void saveAsShouldNotSetWorkingDirectoryIfNotSelected() {
-        when(
-            dialogService.showFileSaveDialog(any(FileDialogConfiguration.class))
-        )
+        when(dialogService.showFileSaveDialog(any(FileDialogConfiguration.class)))
             .thenReturn(Optional.empty());
         doReturn(false).when(saveDatabaseAction).saveAs(any());
 
@@ -107,10 +102,8 @@ public void saveAsShouldNotSetWorkingDirectoryIfNotSelected() {
     public void saveShouldShowSaveAsIfDatabaseNotSelected() {
         when(dbContext.getDatabasePath()).thenReturn(Optional.empty());
         when(dbContext.getLocation()).thenReturn(DatabaseLocation.LOCAL);
-        when(preferences.getBoolean(JabRefPreferences.LOCAL_AUTO_SAVE))
-            .thenReturn(false);
-        when(dialogService.showFileSaveDialog(any()))
-            .thenReturn(Optional.of(file));
+        when(preferences.getBoolean(JabRefPreferences.LOCAL_AUTO_SAVE)).thenReturn(false);
+        when(dialogService.showFileSaveDialog(any())).thenReturn(Optional.of(file));
         doReturn(true).when(saveDatabaseAction).saveAs(any(), any());
 
         saveDatabaseAction.save();
@@ -119,9 +112,8 @@ public void saveShouldShowSaveAsIfDatabaseNotSelected() {
             .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();
 
@@ -131,14 +123,9 @@ private SaveDatabaseAction createSaveDatabaseActionForBibDatabase(
         dbContext = mock(BibDatabaseContext.class);
         libraryTab = mock(LibraryTab.class);
         MetaData metaData = mock(MetaData.class);
-        when(
-            saveConfiguration.withSaveType(
-                any(BibDatabaseWriter.SaveType.class)
-            )
-        )
+        when(saveConfiguration.withSaveType(any(BibDatabaseWriter.SaveType.class)))
             .thenReturn(saveConfiguration);
-        when(saveConfiguration.getSaveOrder())
-            .thenReturn(SaveOrder.getDefaultSaveOrder());
+        when(saveConfiguration.getSaveOrder()).thenReturn(SaveOrder.getDefaultSaveOrder());
         GlobalCitationKeyPattern emptyGlobalCitationKeyPattern =
             GlobalCitationKeyPattern.fromPattern("");
         when(metaData.getCiteKeyPattern(any(GlobalCitationKeyPattern.class)))
@@ -148,8 +135,7 @@ private SaveDatabaseAction createSaveDatabaseActionForBibDatabase(
         when(dbContext.getDatabase()).thenReturn(database);
         when(dbContext.getMetaData()).thenReturn(metaData);
         when(dbContext.getEntries()).thenReturn(database.getEntries());
-        when(preferences.getBoolean(JabRefPreferences.LOCAL_AUTO_SAVE))
-            .thenReturn(false);
+        when(preferences.getBoolean(JabRefPreferences.LOCAL_AUTO_SAVE)).thenReturn(false);
         when(preferences.getFieldPreferences()).thenReturn(fieldPreferences);
         when(preferences.getCitationKeyPatternPreferences())
             .thenReturn(mock(CitationKeyPatternPreferences.class));
@@ -157,12 +143,10 @@ private SaveDatabaseAction createSaveDatabaseActionForBibDatabase(
             .thenReturn(emptyGlobalCitationKeyPattern);
         when(preferences.getFieldPreferences().getNonWrappableFields())
             .thenReturn(FXCollections.emptyObservableList());
-        when(preferences.getLibraryPreferences())
-            .thenReturn(mock(LibraryPreferences.class));
+        when(preferences.getLibraryPreferences()).thenReturn(mock(LibraryPreferences.class));
         when(libraryTab.frame()).thenReturn(jabRefFrame);
         when(libraryTab.getBibDatabaseContext()).thenReturn(dbContext);
-        when(libraryTab.getUndoManager())
-            .thenReturn(mock(CountingUndoManager.class));
+        when(libraryTab.getUndoManager()).thenReturn(mock(CountingUndoManager.class));
         when(libraryTab.getBibDatabaseContext()).thenReturn(dbContext);
         saveDatabaseAction =
             new SaveDatabaseAction(
@@ -176,15 +160,11 @@ private SaveDatabaseAction createSaveDatabaseActionForBibDatabase(
 
     @Test
     public void saveKeepsChangedFlag() throws Exception {
-        BibEntry firstEntry = new BibEntry()
-            .withField(StandardField.AUTHOR, "first");
+        BibEntry firstEntry = new BibEntry().withField(StandardField.AUTHOR, "first");
         firstEntry.setChanged(true);
-        BibEntry secondEntry = new BibEntry()
-            .withField(StandardField.AUTHOR, "second");
+        BibEntry secondEntry = new BibEntry().withField(StandardField.AUTHOR, "second");
         secondEntry.setChanged(true);
-        BibDatabase database = new BibDatabase(
-            List.of(firstEntry, secondEntry)
-        );
+        BibDatabase database = new BibDatabase(List.of(firstEntry, secondEntry));
 
         saveDatabaseAction = createSaveDatabaseActionForBibDatabase(database);
         saveDatabaseAction.save();
diff --git a/src/test/java/org/jabref/gui/externalfiles/AutoSetFileLinksUtilTest.java b/src/test/java/org/jabref/gui/externalfiles/AutoSetFileLinksUtilTest.java
index 72cce5d5cf5..901d91fbeba 100644
--- a/src/test/java/org/jabref/gui/externalfiles/AutoSetFileLinksUtilTest.java
+++ b/src/test/java/org/jabref/gui/externalfiles/AutoSetFileLinksUtilTest.java
@@ -31,9 +31,7 @@ public class AutoSetFileLinksUtilTest {
         false,
         ';'
     );
-    private final BibDatabaseContext databaseContext = mock(
-        BibDatabaseContext.class
-    );
+    private final BibDatabaseContext databaseContext = mock(BibDatabaseContext.class);
     private final BibEntry entry = new BibEntry(StandardEntryType.Article);
     private Path path = null;
 
@@ -45,9 +43,7 @@ public void setUp(@TempDir Path folder) throws Exception {
         when(filePreferences.getExternalFileTypes())
             .thenReturn(
                 FXCollections.observableSet(
-                    new TreeSet<>(
-                        ExternalFileTypes.getDefaultExternalFileTypes()
-                    )
+                    new TreeSet<>(ExternalFileTypes.getDefaultExternalFileTypes())
                 )
             );
     }
@@ -69,10 +65,8 @@ public void testFindAssociatedNotLinkedFilesSuccess() throws Exception {
     }
 
     @Test
-    public void testFindAssociatedNotLinkedFilesForEmptySearchDir()
-        throws Exception {
-        when(filePreferences.shouldStoreFilesRelativeToBibFile())
-            .thenReturn(false);
+    public void testFindAssociatedNotLinkedFilesForEmptySearchDir() throws Exception {
+        when(filePreferences.shouldStoreFilesRelativeToBibFile()).thenReturn(false);
         AutoSetFileLinksUtil util = new AutoSetFileLinksUtil(
             databaseContext,
             filePreferences,
diff --git a/src/test/java/org/jabref/gui/externalfiles/FileFilterUtilsTest.java b/src/test/java/org/jabref/gui/externalfiles/FileFilterUtilsTest.java
index 4183901be89..81a688fe3ff 100755
--- a/src/test/java/org/jabref/gui/externalfiles/FileFilterUtilsTest.java
+++ b/src/test/java/org/jabref/gui/externalfiles/FileFilterUtilsTest.java
@@ -24,80 +24,50 @@ public class FileFilterUtilsTest {
 
     @Test
     public void isDuringLastDayNegativeTest() {
-        assertEquals(
-            fileFilterUtils.isDuringLastDay(time.minusHours(24)),
-            false
-        );
+        assertEquals(fileFilterUtils.isDuringLastDay(time.minusHours(24)), false);
     }
 
     @Test
     public void isDuringLastDayPositiveTest() {
-        assertEquals(
-            fileFilterUtils.isDuringLastDay(time.minusHours(23)),
-            true
-        );
+        assertEquals(fileFilterUtils.isDuringLastDay(time.minusHours(23)), true);
     }
 
     @Test
     public void isDuringLastWeekNegativeTest() {
-        assertEquals(
-            fileFilterUtils.isDuringLastWeek(time.minusDays(7)),
-            false
-        );
+        assertEquals(fileFilterUtils.isDuringLastWeek(time.minusDays(7)), false);
     }
 
     @Test
     public void isDuringLastWeekPositiveTest() {
-        assertEquals(
-            fileFilterUtils.isDuringLastWeek(time.minusDays(6).minusHours(23)),
-            true
-        );
+        assertEquals(fileFilterUtils.isDuringLastWeek(time.minusDays(6).minusHours(23)), true);
     }
 
     @Test
     public void isDuringLastMonthNegativeTest() {
-        assertEquals(
-            fileFilterUtils.isDuringLastMonth(time.minusDays(30)),
-            false
-        );
+        assertEquals(fileFilterUtils.isDuringLastMonth(time.minusDays(30)), false);
     }
 
     @Test
     public void isDuringLastMonthPositiveTest() {
-        assertEquals(
-            fileFilterUtils.isDuringLastMonth(
-                time.minusDays(29).minusHours(23)
-            ),
-            true
-        );
+        assertEquals(fileFilterUtils.isDuringLastMonth(time.minusDays(29).minusHours(23)), true);
     }
 
     @Test
     public void isDuringLastYearNegativeTest() {
-        assertEquals(
-            fileFilterUtils.isDuringLastYear(time.minusDays(365)),
-            false
-        );
+        assertEquals(fileFilterUtils.isDuringLastYear(time.minusDays(365)), false);
     }
 
     @Test
     public void isDuringLastYearPositiveTest() {
-        assertEquals(
-            fileFilterUtils.isDuringLastYear(
-                time.minusDays(364).minusHours(23)
-            ),
-            true
-        );
+        assertEquals(fileFilterUtils.isDuringLastYear(time.minusDays(364).minusHours(23)), true);
     }
 
     @Nested
     class SortingTests {
 
         private final List<Path> files = new ArrayList<>();
-        private final List<String> expectedSortByDateAscending =
-            new ArrayList<>();
-        private final List<String> expectedSortByDateDescending =
-            new ArrayList<>();
+        private final List<String> expectedSortByDateAscending = new ArrayList<>();
+        private final List<String> expectedSortByDateDescending = new ArrayList<>();
         private final List<String> wrongOrder = new ArrayList<>();
 
         /* Initialize the directory and files used in the sorting tests, and change their last edited dates. */
diff --git a/src/test/java/org/jabref/gui/externalfiles/GitIgnoreFileFilterTest.java b/src/test/java/org/jabref/gui/externalfiles/GitIgnoreFileFilterTest.java
index 7e4f48a9c9f..d9366c06a1b 100644
--- a/src/test/java/org/jabref/gui/externalfiles/GitIgnoreFileFilterTest.java
+++ b/src/test/java/org/jabref/gui/externalfiles/GitIgnoreFileFilterTest.java
@@ -23,8 +23,7 @@ public void checkSimpleGitIgnore(@TempDir Path dir) throws Exception {
     }
 
     @Test
-    public void checkSimpleGitIgnoreWithAllowing(@TempDir Path dir)
-        throws Exception {
+    public void checkSimpleGitIgnoreWithAllowing(@TempDir Path dir) throws Exception {
         Files.writeString(
             dir.resolve(".gitignore"),
             """
@@ -36,8 +35,7 @@ public void checkSimpleGitIgnoreWithAllowing(@TempDir Path dir)
     }
 
     @Test
-    public void checkSimpleGitIgnoreWithOverwritingDefs(@TempDir Path dir)
-        throws Exception {
+    public void checkSimpleGitIgnoreWithOverwritingDefs(@TempDir Path dir) throws Exception {
         Files.writeString(
             dir.resolve(".gitignore"),
             """
diff --git a/src/test/java/org/jabref/gui/externalfiles/ImportHandlerTest.java b/src/test/java/org/jabref/gui/externalfiles/ImportHandlerTest.java
index 16411d36a13..581fc5171b2 100644
--- a/src/test/java/org/jabref/gui/externalfiles/ImportHandlerTest.java
+++ b/src/test/java/org/jabref/gui/externalfiles/ImportHandlerTest.java
@@ -51,10 +51,8 @@ void setUp() {
             ImportFormatPreferences.class,
             Answers.RETURNS_DEEP_STUBS
         );
-        when(preferencesService.getImportFormatPreferences())
-            .thenReturn(importFormatPreferences);
-        when(preferencesService.getFilePreferences())
-            .thenReturn(mock(FilePreferences.class));
+        when(preferencesService.getImportFormatPreferences()).thenReturn(importFormatPreferences);
+        when(preferencesService.getFilePreferences()).thenReturn(mock(FilePreferences.class));
 
         bibDatabaseContext = mock(BibDatabaseContext.class);
         BibDatabase bibDatabase = new BibDatabase();
@@ -86,10 +84,8 @@ void handleBibTeXData() {
         );
 
         PreferencesService preferencesService = mock(PreferencesService.class);
-        when(preferencesService.getImportFormatPreferences())
-            .thenReturn(importFormatPreferences);
-        when(preferencesService.getFilePreferences())
-            .thenReturn(mock(FilePreferences.class));
+        when(preferencesService.getImportFormatPreferences()).thenReturn(importFormatPreferences);
+        when(preferencesService.getFilePreferences()).thenReturn(mock(FilePreferences.class));
 
         ImportHandler importHandler = new ImportHandler(
             mock(BibDatabaseContext.class),
@@ -118,24 +114,15 @@ void handleBibTeXData() {
 
     @Test
     void cleanUpEntryTest() {
-        BibEntry entry = new BibEntry()
-            .withField(StandardField.AUTHOR, "Clear Author");
-        BibEntry cleanedEntry = importHandler.cleanUpEntry(
-            bibDatabaseContext,
-            entry
-        );
-        assertEquals(
-            new BibEntry().withField(StandardField.AUTHOR, "Clear Author"),
-            cleanedEntry
-        );
+        BibEntry entry = new BibEntry().withField(StandardField.AUTHOR, "Clear Author");
+        BibEntry cleanedEntry = importHandler.cleanUpEntry(bibDatabaseContext, entry);
+        assertEquals(new BibEntry().withField(StandardField.AUTHOR, "Clear Author"), cleanedEntry);
     }
 
     @Test
     void findDuplicateTest() {
         // Assume there is no duplicate initially
-        assertTrue(
-            importHandler.findDuplicate(bibDatabaseContext, testEntry).isEmpty()
-        );
+        assertTrue(importHandler.findDuplicate(bibDatabaseContext, testEntry).isEmpty());
     }
 
     @Test
@@ -168,11 +155,7 @@ void handleDuplicatesKeepRightTest() {
         Mockito
             .doReturn(decisionResult)
             .when(importHandler)
-            .getDuplicateDecision(
-                testEntry,
-                duplicateEntry,
-                bibDatabaseContext
-            );
+            .getDuplicateDecision(testEntry, duplicateEntry, bibDatabaseContext);
 
         // Act
         BibEntry result = importHandler
@@ -215,11 +198,7 @@ void handleDuplicatesKeepBothTest() {
         Mockito
             .doReturn(decisionResult)
             .when(importHandler)
-            .getDuplicateDecision(
-                testEntry,
-                duplicateEntry,
-                bibDatabaseContext
-            );
+            .getDuplicateDecision(testEntry, duplicateEntry, bibDatabaseContext);
 
         // Act
         BibEntry result = importHandler
@@ -265,11 +244,7 @@ void handleDuplicatesKeepMergeTest() {
         Mockito
             .doReturn(decisionResult)
             .when(importHandler)
-            .getDuplicateDecision(
-                testEntry,
-                duplicateEntry,
-                bibDatabaseContext
-            );
+            .getDuplicateDecision(testEntry, duplicateEntry, bibDatabaseContext);
 
         // Act
         BibEntry result = importHandler
diff --git a/src/test/java/org/jabref/gui/externalfiles/UnlinkedFilesCrawlerTest.java b/src/test/java/org/jabref/gui/externalfiles/UnlinkedFilesCrawlerTest.java
index b1fcc0bc524..d69edb5fe6f 100644
--- a/src/test/java/org/jabref/gui/externalfiles/UnlinkedFilesCrawlerTest.java
+++ b/src/test/java/org/jabref/gui/externalfiles/UnlinkedFilesCrawlerTest.java
@@ -31,9 +31,7 @@ public void minimalGitIgnore(@TempDir Path testRoot) throws Exception {
         Files.createDirectories(subDir);
         Files.createFile(subDir.resolve("test.png"));
 
-        UnlinkedPDFFileFilter unlinkedPDFFileFilter = mock(
-            UnlinkedPDFFileFilter.class
-        );
+        UnlinkedPDFFileFilter unlinkedPDFFileFilter = mock(UnlinkedPDFFileFilter.class);
         when(unlinkedPDFFileFilter.accept(any(Path.class))).thenReturn(true);
 
         UnlinkedFilesCrawler unlinkedFilesCrawler = new UnlinkedFilesCrawler(
@@ -45,18 +43,16 @@ public void minimalGitIgnore(@TempDir Path testRoot) throws Exception {
             mock(FilePreferences.class)
         );
 
-        FileNodeViewModel fileNodeViewModel =
-            unlinkedFilesCrawler.searchDirectory(
-                testRoot,
-                unlinkedPDFFileFilter
-            );
+        FileNodeViewModel fileNodeViewModel = unlinkedFilesCrawler.searchDirectory(
+            testRoot,
+            unlinkedPDFFileFilter
+        );
 
         assertEquals(new FileNodeViewModel(testRoot), fileNodeViewModel);
     }
 
     @Test
-    public void excludingTheCurrentLibraryTest(@TempDir Path testRoot)
-        throws IOException {
+    public void excludingTheCurrentLibraryTest(@TempDir Path testRoot) throws IOException {
         // Adding 3 files one of which is the database file
         Files.createFile(testRoot.resolve("unlinkedPdf.pdf"));
         Files.createFile(testRoot.resolve("another-unlinkedPdf.pdf"));
@@ -86,11 +82,10 @@ public void excludingTheCurrentLibraryTest(@TempDir Path testRoot)
             databaseContext,
             filePreferences
         );
-        FileNodeViewModel fileNodeViewModel =
-            unlinkedFilesCrawler.searchDirectory(
-                testRoot,
-                unlinkedPdfFileFilter
-            );
+        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 80bf8434d03..bd957c89aba 100644
--- a/src/test/java/org/jabref/gui/externalfiletype/ExternalFileTypesTest.java
+++ b/src/test/java/org/jabref/gui/externalfiletype/ExternalFileTypesTest.java
@@ -74,22 +74,15 @@ void getExternalFileTypeByExt() {
 
     @Test
     void isExternalFileTypeByExt() {
-        assertTrue(
-            ExternalFileTypes.isExternalFileTypeByExt("html", filePreferences)
-        );
-        assertFalse(
-            ExternalFileTypes.isExternalFileTypeByExt("tst", filePreferences)
-        );
+        assertTrue(ExternalFileTypes.isExternalFileTypeByExt("html", filePreferences));
+        assertFalse(ExternalFileTypes.isExternalFileTypeByExt("tst", filePreferences));
     }
 
     @Test
     void getExternalFileTypeForName() {
         assertEquals(
             Optional.of(StandardExternalFileType.JPG),
-            ExternalFileTypes.getExternalFileTypeForName(
-                "testfile.jpg",
-                filePreferences
-            )
+            ExternalFileTypes.getExternalFileTypeForName("testfile.jpg", filePreferences)
         );
     }
 
@@ -97,10 +90,7 @@ void getExternalFileTypeForName() {
     void getExternalFileTypeByMimeType() {
         assertEquals(
             Optional.of(StandardExternalFileType.TXT),
-            ExternalFileTypes.getExternalFileTypeByMimeType(
-                "text/plain",
-                filePreferences
-            )
+            ExternalFileTypes.getExternalFileTypeByMimeType("text/plain", filePreferences)
         );
     }
 
@@ -109,10 +99,7 @@ void getExternalFileTypeByFile() {
         Path testfile = Path.of("testfile.txt");
         assertEquals(
             Optional.of(StandardExternalFileType.TXT),
-            ExternalFileTypes.getExternalFileTypeByFile(
-                testfile,
-                filePreferences
-            )
+            ExternalFileTypes.getExternalFileTypeByFile(testfile, filePreferences)
         );
     }
 
@@ -125,11 +112,7 @@ void getExternalFileTypeByLinkedFile() {
         );
         assertEquals(
             Optional.of(StandardExternalFileType.PDF),
-            ExternalFileTypes.getExternalFileTypeByLinkedFile(
-                testfile,
-                false,
-                filePreferences
-            )
+            ExternalFileTypes.getExternalFileTypeByLinkedFile(testfile, false, filePreferences)
         );
     }
 
@@ -142,9 +125,7 @@ void toStringList() {
 
     @Test
     void fromString() {
-        Set<ExternalFileType> testList = ExternalFileTypes.fromString(
-            TEST_STRINGLIST
-        );
+        Set<ExternalFileType> testList = ExternalFileTypes.fromString(TEST_STRINGLIST);
 
         assertEquals(TEST_LIST, testList);
     }
diff --git a/src/test/java/org/jabref/gui/fieldeditors/LinkedFileViewModelTest.java b/src/test/java/org/jabref/gui/fieldeditors/LinkedFileViewModelTest.java
index aeb5d5a57c1..db6a9b820f7 100644
--- a/src/test/java/org/jabref/gui/fieldeditors/LinkedFileViewModelTest.java
+++ b/src/test/java/org/jabref/gui/fieldeditors/LinkedFileViewModelTest.java
@@ -61,9 +61,7 @@ class LinkedFileViewModelTest {
     private TaskExecutor taskExecutor;
     private DialogService dialogService;
     private final FilePreferences filePreferences = mock(FilePreferences.class);
-    private final PreferencesService preferences = mock(
-        PreferencesService.class
-    );
+    private final PreferencesService preferences = mock(PreferencesService.class);
     private CookieManager cookieManager;
 
     @BeforeEach
@@ -77,14 +75,11 @@ void setUp(@TempDir Path tempFolder) throws Exception {
         when(filePreferences.getExternalFileTypes())
             .thenReturn(
                 FXCollections.observableSet(
-                    new TreeSet<>(
-                        ExternalFileTypes.getDefaultExternalFileTypes()
-                    )
+                    new TreeSet<>(ExternalFileTypes.getDefaultExternalFileTypes())
                 )
             );
         when(preferences.getFilePreferences()).thenReturn(filePreferences);
-        when(preferences.getXmpPreferences())
-            .thenReturn(mock(XmpPreferences.class));
+        when(preferences.getXmpPreferences()).thenReturn(mock(XmpPreferences.class));
         tempFile = tempFolder.resolve("temporaryFile");
         Files.createFile(tempFile);
 
@@ -242,11 +237,9 @@ void deleteWhenDialogCancelledReturnsFalseAndDoesNotRemoveFile() {
 
     @Test
     void downloadHtmlFileCausesWarningDisplay() throws MalformedURLException {
-        when(filePreferences.shouldStoreFilesRelativeToBibFile())
-            .thenReturn(true);
+        when(filePreferences.shouldStoreFilesRelativeToBibFile()).thenReturn(true);
         when(filePreferences.getFileNamePattern()).thenReturn("[citationkey]");
-        when(filePreferences.getFileDirectoryPattern())
-            .thenReturn("[entrytype]");
+        when(filePreferences.getFileDirectoryPattern()).thenReturn("[entrytype]");
         databaseContext.setDatabasePath(tempFile);
 
         URL url = new URL("https://www.google.com/");
@@ -264,20 +257,17 @@ void downloadHtmlFileCausesWarningDisplay() throws MalformedURLException {
 
         viewModel.download();
 
-        verify(dialogService, atLeastOnce())
-            .notify("Downloaded website as an HTML file.");
+        verify(dialogService, atLeastOnce()).notify("Downloaded website as an HTML file.");
     }
 
     @FetcherTest
     @Test
     void downloadOfFileReplacesLink(@TempDir Path tempFolder) throws Exception {
-        linkedFile =
-            new LinkedFile(new URL("http://arxiv.org/pdf/1207.0408v1"), "");
+        linkedFile = new LinkedFile(new URL("http://arxiv.org/pdf/1207.0408v1"), "");
         entry.setFiles(new ArrayList<>(List.of(linkedFile)));
 
         databaseContext = mock(BibDatabaseContext.class);
-        when(databaseContext.getFirstExistingFileDir(any()))
-            .thenReturn(Optional.of(tempFolder));
+        when(databaseContext.getFirstExistingFileDir(any())).thenReturn(Optional.of(tempFolder));
 
         when(filePreferences.getFileNamePattern()).thenReturn("[citationkey]");
         when(filePreferences.getFileDirectoryPattern()).thenReturn("");
@@ -301,8 +291,7 @@ void downloadOfFileReplacesLink(@TempDir Path tempFolder) throws Exception {
     @FetcherTest
     @Test
     void downloadDoesNotOverwriteFileTypeExtension() throws Exception {
-        linkedFile =
-            new LinkedFile(new URL("http://arxiv.org/pdf/1207.0408v1"), "");
+        linkedFile = new LinkedFile(new URL("http://arxiv.org/pdf/1207.0408v1"), "");
 
         databaseContext = mock(BibDatabaseContext.class);
         when(filePreferences.getFileNamePattern()).thenReturn("[citationkey]");
@@ -342,11 +331,9 @@ void downloadHtmlWhenLinkedFilePointsToHtml() throws MalformedURLException {
         String fileType = StandardExternalFileType.URL.getName();
         linkedFile = new LinkedFile(new URL(url), fileType);
 
-        when(filePreferences.shouldStoreFilesRelativeToBibFile())
-            .thenReturn(true);
+        when(filePreferences.shouldStoreFilesRelativeToBibFile()).thenReturn(true);
         when(filePreferences.getFileNamePattern()).thenReturn("[citationkey]");
-        when(filePreferences.getFileDirectoryPattern())
-            .thenReturn("[entrytype]");
+        when(filePreferences.getFileDirectoryPattern()).thenReturn("[entrytype]");
 
         databaseContext.setDatabasePath(tempFile);
 
@@ -419,8 +406,7 @@ void isNotSamePathWithPattern() {
         linkedFile = new LinkedFile("desc", tempFile, "pdf");
         databaseContext = mock(BibDatabaseContext.class);
         when(filePreferences.getFileNamePattern()).thenReturn("[citationkey]");
-        when(filePreferences.getFileDirectoryPattern())
-            .thenReturn("[entrytype]");
+        when(filePreferences.getFileDirectoryPattern()).thenReturn("[entrytype]");
         when(databaseContext.getFirstExistingFileDir(filePreferences))
             .thenReturn(Optional.of(tempFile.getParent()));
 
@@ -441,8 +427,7 @@ void isSamePathWithPattern() throws IOException {
         linkedFile = new LinkedFile("desc", tempFile, "pdf");
         databaseContext = mock(BibDatabaseContext.class);
         when(filePreferences.getFileNamePattern()).thenReturn("[citationkey]");
-        when(filePreferences.getFileDirectoryPattern())
-            .thenReturn("[entrytype]");
+        when(filePreferences.getFileDirectoryPattern()).thenReturn("[entrytype]");
         when(databaseContext.getFirstExistingFileDir(filePreferences))
             .thenReturn(Optional.of(tempFile.getParent()));
 
@@ -468,27 +453,22 @@ void isSamePathWithPattern() throws IOException {
     // Tests if added parameters to mimeType gets parsed to correct format.
     @Test
     void mimeTypeStringWithParameterIsReturnedAsWithoutParameter() {
-        Optional<ExternalFileType> test =
-            ExternalFileTypes.getExternalFileTypeByMimeType(
-                "text/html; charset=UTF-8",
-                filePreferences
-            );
+        Optional<ExternalFileType> test = ExternalFileTypes.getExternalFileTypeByMimeType(
+            "text/html; charset=UTF-8",
+            filePreferences
+        );
         String actual = test.get().toString();
         assertEquals("URL", actual);
     }
 
     @Test
     @FetcherTest
-    void downloadPdfFileWhenLinkedFilePointsToPdfUrl()
-        throws MalformedURLException {
-        linkedFile =
-            new LinkedFile(new URL("http://arxiv.org/pdf/1207.0408v1"), "pdf");
+    void downloadPdfFileWhenLinkedFilePointsToPdfUrl() throws MalformedURLException {
+        linkedFile = new LinkedFile(new URL("http://arxiv.org/pdf/1207.0408v1"), "pdf");
         // Needed Mockito stubbing methods to run test
-        when(filePreferences.shouldStoreFilesRelativeToBibFile())
-            .thenReturn(true);
+        when(filePreferences.shouldStoreFilesRelativeToBibFile()).thenReturn(true);
         when(filePreferences.getFileNamePattern()).thenReturn("[citationkey]");
-        when(filePreferences.getFileDirectoryPattern())
-            .thenReturn("[entrytype]");
+        when(filePreferences.getFileDirectoryPattern()).thenReturn("[entrytype]");
 
         databaseContext.setDatabasePath(tempFile);
 
diff --git a/src/test/java/org/jabref/gui/fieldeditors/LinkedFilesEditorViewModelTest.java b/src/test/java/org/jabref/gui/fieldeditors/LinkedFilesEditorViewModelTest.java
index 07d38740622..e930019e224 100644
--- a/src/test/java/org/jabref/gui/fieldeditors/LinkedFilesEditorViewModelTest.java
+++ b/src/test/java/org/jabref/gui/fieldeditors/LinkedFilesEditorViewModelTest.java
@@ -37,23 +37,17 @@ class LinkedFilesEditorViewModelTest {
         FilePreferences.class,
         Answers.RETURNS_DEEP_STUBS
     );
-    private final BibDatabaseContext bibDatabaseContext = mock(
-        BibDatabaseContext.class
-    );
+    private final BibDatabaseContext bibDatabaseContext = mock(BibDatabaseContext.class);
     private final UndoManager undoManager = mock(UndoManager.class);
 
     @Test
     void urlFieldShouldDownloadFile(@TempDir Path tempDir) {
-        when(preferencesService.getFilePreferences())
-            .thenReturn(filePreferences);
+        when(preferencesService.getFilePreferences()).thenReturn(filePreferences);
         when(filePreferences.getExternalFileTypes())
-            .thenReturn(
-                FXCollections.observableSet(StandardExternalFileType.values())
-            );
+            .thenReturn(FXCollections.observableSet(StandardExternalFileType.values()));
         when(filePreferences.getFileNamePattern()).thenReturn("[bibtexkey]");
         when(filePreferences.getFileDirectoryPattern()).thenReturn("");
-        when(bibDatabaseContext.getFirstExistingFileDir(any()))
-            .thenReturn(Optional.of(tempDir));
+        when(bibDatabaseContext.getFirstExistingFileDir(any())).thenReturn(Optional.of(tempDir));
 
         viewModel =
             new LinkedFilesEditorViewModel(
@@ -69,10 +63,7 @@ void urlFieldShouldDownloadFile(@TempDir Path tempDir) {
 
         BibEntry entry = new BibEntry()
             .withCitationKey("test")
-            .withField(
-                StandardField.URL,
-                "https://ceur-ws.org/Vol-847/paper6.pdf"
-            );
+            .withField(StandardField.URL, "https://ceur-ws.org/Vol-847/paper6.pdf");
         viewModel.entry = entry;
         viewModel.fetchFulltext();
 
diff --git a/src/test/java/org/jabref/gui/groups/GroupDialogViewModelTest.java b/src/test/java/org/jabref/gui/groups/GroupDialogViewModelTest.java
index 5572aca3836..dccd2d1013c 100644
--- a/src/test/java/org/jabref/gui/groups/GroupDialogViewModelTest.java
+++ b/src/test/java/org/jabref/gui/groups/GroupDialogViewModelTest.java
@@ -29,14 +29,10 @@ class GroupDialogViewModelTest {
     private Path temporaryFolder;
     private BibDatabaseContext bibDatabaseContext;
     private final MetaData metaData = mock(MetaData.class);
-    private final GroupsPreferences groupsPreferences = mock(
-        GroupsPreferences.class
-    );
+    private final GroupsPreferences groupsPreferences = mock(GroupsPreferences.class);
     private final DialogService dialogService = mock(DialogService.class);
     private final AbstractGroup group = mock(AbstractGroup.class);
-    private final PreferencesService preferencesService = mock(
-        PreferencesService.class
-    );
+    private final PreferencesService preferencesService = mock(PreferencesService.class);
 
     @BeforeEach
     void setUp(@TempDir Path temporaryFolder) {
@@ -47,14 +43,11 @@ void setUp(@TempDir Path temporaryFolder) {
 
         when(preferencesService.getBibEntryPreferences())
             .thenReturn(mock(BibEntryPreferences.class));
-        when(preferencesService.getBibEntryPreferences().getKeywordSeparator())
-            .thenReturn(',');
-        when(preferencesService.getFilePreferences())
-            .thenReturn(mock(FilePreferences.class));
+        when(preferencesService.getBibEntryPreferences().getKeywordSeparator()).thenReturn(',');
+        when(preferencesService.getFilePreferences()).thenReturn(mock(FilePreferences.class));
         when(preferencesService.getFilePreferences().getUserAndHost())
             .thenReturn("MockedUser-mockedhost");
-        when(preferencesService.getGroupsPreferences())
-            .thenReturn(groupsPreferences);
+        when(preferencesService.getGroupsPreferences()).thenReturn(groupsPreferences);
 
         bibDatabaseContext.setMetaData(metaData);
 
@@ -82,9 +75,7 @@ void validateExistingAbsolutePath() throws Exception {
 
     @Test
     void validateNonExistingAbsolutePath() {
-        var notAnAuxFile = temporaryFolder
-            .resolve("notanauxfile.aux")
-            .toAbsolutePath();
+        var notAnAuxFile = temporaryFolder.resolve("notanauxfile.aux").toAbsolutePath();
         viewModel.texGroupFilePathProperty().setValue(notAnAuxFile.toString());
         assertFalse(viewModel.texGroupFilePathValidatonStatus().isValid());
     }
@@ -115,21 +106,13 @@ void testHierarchicalContextFromGroup() throws Exception {
                 new DummyFileUpdateMonitor()
             );
 
-        assertEquals(
-            groupHierarchyType,
-            viewModel.groupHierarchySelectedProperty().getValue()
-        );
+        assertEquals(groupHierarchyType, viewModel.groupHierarchySelectedProperty().getValue());
     }
 
     @Test
     void testDefaultHierarchicalContext() throws Exception {
-        GroupHierarchyType defaultHierarchicalContext =
-            GroupHierarchyType.REFINING;
-        when(
-            preferencesService
-                .getGroupsPreferences()
-                .getDefaultHierarchicalContext()
-        )
+        GroupHierarchyType defaultHierarchicalContext = GroupHierarchyType.REFINING;
+        when(preferencesService.getGroupsPreferences().getDefaultHierarchicalContext())
             .thenReturn(defaultHierarchicalContext);
         viewModel =
             new GroupDialogViewModel(
diff --git a/src/test/java/org/jabref/gui/groups/GroupNodeViewModelTest.java b/src/test/java/org/jabref/gui/groups/GroupNodeViewModelTest.java
index 80b4b7a6418..94046db9273 100644
--- a/src/test/java/org/jabref/gui/groups/GroupNodeViewModelTest.java
+++ b/src/test/java/org/jabref/gui/groups/GroupNodeViewModelTest.java
@@ -37,8 +37,7 @@ class GroupNodeViewModelTest {
     @BeforeEach
     void setUp() {
         stateManager = mock(StateManager.class);
-        when(stateManager.getSelectedEntries())
-            .thenReturn(FXCollections.emptyObservableList());
+        when(stateManager.getSelectedEntries()).thenReturn(FXCollections.emptyObservableList());
         databaseContext = new BibDatabaseContext();
         taskExecutor = new CurrentThreadTaskExecutor();
         preferencesService = mock(PreferencesService.class);
@@ -94,15 +93,10 @@ void isMatchedIfContainsPartOfSearchString() {
 
     @Test
     void treeOfAutomaticKeywordGroupIsCombined() {
-        BibEntry entryOne = new BibEntry()
-            .withField(StandardField.KEYWORDS, "A > B > B1, A > C");
-        BibEntry entryTwo = new BibEntry()
-            .withField(StandardField.KEYWORDS, "A > D, E");
-        BibEntry entryThree = new BibEntry()
-            .withField(StandardField.KEYWORDS, "A > B > B2");
-        databaseContext
-            .getDatabase()
-            .insertEntries(entryOne, entryTwo, entryThree);
+        BibEntry entryOne = new BibEntry().withField(StandardField.KEYWORDS, "A > B > B1, A > C");
+        BibEntry entryTwo = new BibEntry().withField(StandardField.KEYWORDS, "A > D, E");
+        BibEntry entryThree = new BibEntry().withField(StandardField.KEYWORDS, "A > B > B2");
+        databaseContext.getDatabase().insertEntries(entryOne, entryTwo, entryThree);
 
         AutomaticKeywordGroup group = new AutomaticKeywordGroup(
             "Keywords",
@@ -183,8 +177,10 @@ 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());
     }
@@ -297,10 +293,7 @@ void draggedOnBottomOfGroupAddsAfterIt() {
             rootViewModel.addSubgroup(groupC)
         );
 
-        groupCViewModel.draggedOn(
-            groupAViewModel,
-            DroppingMouseLocation.BOTTOM
-        );
+        groupCViewModel.draggedOn(groupAViewModel, DroppingMouseLocation.BOTTOM);
 
         assertEquals(
             Arrays.asList(groupAViewModel, groupCViewModel, groupBViewModel),
@@ -358,10 +351,7 @@ void draggedOnBottomOfGroupAddsAfterItWhenSourceGroupWasBefore() {
             rootViewModel.addSubgroup(groupC)
         );
 
-        groupAViewModel.draggedOn(
-            groupBViewModel,
-            DroppingMouseLocation.BOTTOM
-        );
+        groupAViewModel.draggedOn(groupBViewModel, DroppingMouseLocation.BOTTOM);
 
         assertEquals(
             Arrays.asList(groupBViewModel, groupAViewModel, groupCViewModel),
@@ -430,11 +420,7 @@ void draggedOnTopOfGroupAddsBeforeItWhenSourceGroupWasBefore() {
     @Test
     void entriesAreAddedCorrectly() {
         String groupName = "group";
-        ExplicitGroup group = new ExplicitGroup(
-            groupName,
-            GroupHierarchyType.INDEPENDENT,
-            ','
-        );
+        ExplicitGroup group = new ExplicitGroup(groupName, GroupHierarchyType.INDEPENDENT, ',');
         BibEntry entry = new BibEntry();
         databaseContext.getDatabase().insertEntry(entry);
 
diff --git a/src/test/java/org/jabref/gui/groups/GroupTreeViewModelTest.java b/src/test/java/org/jabref/gui/groups/GroupTreeViewModelTest.java
index 7741c7637f5..3c37eed23fc 100644
--- a/src/test/java/org/jabref/gui/groups/GroupTreeViewModelTest.java
+++ b/src/test/java/org/jabref/gui/groups/GroupTreeViewModelTest.java
@@ -38,9 +38,7 @@ class GroupTreeViewModelTest {
     void setUp() {
         databaseContext = new BibDatabaseContext();
         stateManager = new StateManager();
-        stateManager
-            .activeDatabaseProperty()
-            .setValue(Optional.of(databaseContext));
+        stateManager.activeDatabaseProperty().setValue(Optional.of(databaseContext));
         taskExecutor = new CurrentThreadTaskExecutor();
         preferencesService = mock(PreferencesService.class);
         dialogService = mock(DialogService.class, Answers.RETURNS_DEEP_STUBS);
@@ -90,11 +88,7 @@ void rootGroupIsSelectedByDefault() {
 
     @Test
     void explicitGroupsAreRemovedFromEntriesOnDelete() {
-        ExplicitGroup group = new ExplicitGroup(
-            "group",
-            GroupHierarchyType.INDEPENDENT,
-            ','
-        );
+        ExplicitGroup group = new ExplicitGroup("group", GroupHierarchyType.INDEPENDENT, ',');
         BibEntry entry = new BibEntry();
         databaseContext.getDatabase().insertEntry(entry);
 
@@ -143,11 +137,7 @@ void keywordGroupsAreNotRemovedFromEntriesOnDelete() {
 
     @Test
     void shouldNotShowDialogWhenGroupNameChanges() {
-        AbstractGroup oldGroup = new ExplicitGroup(
-            "group",
-            GroupHierarchyType.INDEPENDENT,
-            ','
-        );
+        AbstractGroup oldGroup = new ExplicitGroup("group", GroupHierarchyType.INDEPENDENT, ',');
         AbstractGroup newGroup = new ExplicitGroup(
             "newGroupName",
             GroupHierarchyType.INDEPENDENT,
diff --git a/src/test/java/org/jabref/gui/importer/NewEntryActionTest.java b/src/test/java/org/jabref/gui/importer/NewEntryActionTest.java
index e6777203f6f..fd8b9ef9ae0 100644
--- a/src/test/java/org/jabref/gui/importer/NewEntryActionTest.java
+++ b/src/test/java/org/jabref/gui/importer/NewEntryActionTest.java
@@ -26,23 +26,15 @@ public class NewEntryActionTest {
     private LibraryTab libraryTab = mock(LibraryTab.class);
     private JabRefFrame jabRefFrame = mock(JabRefFrame.class);
     private DialogService dialogService = spy(DialogService.class);
-    private PreferencesService preferencesService = mock(
-        PreferencesService.class
-    );
+    private PreferencesService preferencesService = mock(PreferencesService.class);
     private StateManager stateManager = mock(StateManager.class);
 
     @BeforeEach
     public void setUp() {
         when(jabRefFrame.getCurrentLibraryTab()).thenReturn(libraryTab);
-        when(stateManager.activeDatabaseProperty())
-            .thenReturn(OptionalObjectProperty.empty());
+        when(stateManager.activeDatabaseProperty()).thenReturn(OptionalObjectProperty.empty());
         newEntryAction =
-            new NewEntryAction(
-                jabRefFrame,
-                dialogService,
-                preferencesService,
-                stateManager
-            );
+            new NewEntryAction(jabRefFrame, dialogService, preferencesService, stateManager);
     }
 
     @Test
@@ -51,21 +43,14 @@ public void testExecuteIfNoBasePanel() {
 
         newEntryAction.execute();
         verify(libraryTab, times(0)).insertEntry(any(BibEntry.class));
-        verify(dialogService, times(0))
-            .showCustomDialogAndWait(any(EntryTypeView.class));
+        verify(dialogService, times(0)).showCustomDialogAndWait(any(EntryTypeView.class));
     }
 
     @Test
     public void testExecuteOnSuccessWithFixedType() {
         EntryType type = StandardEntryType.Article;
         newEntryAction =
-            new NewEntryAction(
-                jabRefFrame,
-                type,
-                dialogService,
-                preferencesService,
-                stateManager
-            );
+            new NewEntryAction(jabRefFrame, type, dialogService, preferencesService, stateManager);
         when(jabRefFrame.getBasePanelCount()).thenReturn(1);
 
         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 85f06873103..66e8532f81c 100644
--- a/src/test/java/org/jabref/gui/importer/fetcher/WebSearchPaneViewModelTest.java
+++ b/src/test/java/org/jabref/gui/importer/fetcher/WebSearchPaneViewModelTest.java
@@ -20,120 +20,82 @@ class WebSearchPaneViewModelTest {
 
     @BeforeEach
     void setUp() {
-        preferencesService =
-            Mockito.mock(PreferencesService.class, RETURNS_DEEP_STUBS);
+        preferencesService = Mockito.mock(PreferencesService.class, RETURNS_DEEP_STUBS);
         dialogService = Mockito.mock(DialogService.class);
         stateManager = Mockito.mock(StateManager.class);
 
-        viewModel =
-            new WebSearchPaneViewModel(
-                preferencesService,
-                dialogService,
-                stateManager
-            );
+        viewModel = new WebSearchPaneViewModel(preferencesService, dialogService, stateManager);
     }
 
     @Test
     void queryConsistingOfASingleAndIsNotValid() {
         viewModel.queryProperty().setValue("AND");
-        assertFalse(
-            viewModel.queryValidationStatus().validProperty().getValue()
-        );
+        assertFalse(viewModel.queryValidationStatus().validProperty().getValue());
     }
 
     @Test
     void falseQueryValidationStatus() {
         viewModel.queryProperty().setValue("Miami !Beach AND OR Blue");
-        assertFalse(
-            viewModel.queryValidationStatus().validProperty().getValue()
-        );
+        assertFalse(viewModel.queryValidationStatus().validProperty().getValue());
     }
 
     @Test
     void correctQueryValidationStatus() {
-        viewModel
-            .queryProperty()
-            .setValue("Miami AND Beach OR Houston AND Texas");
-        assertTrue(
-            viewModel.queryValidationStatus().validProperty().getValue()
-        );
+        viewModel.queryProperty().setValue("Miami AND Beach OR Houston AND Texas");
+        assertTrue(viewModel.queryValidationStatus().validProperty().getValue());
     }
 
     @Test
     void notFalseQueryValidationStatus() {
         viewModel.queryProperty().setValue("Miami !Beach AND OR Blue");
-        assertTrue(
-            viewModel.queryValidationStatus().validProperty().not().getValue()
-        );
+        assertTrue(viewModel.queryValidationStatus().validProperty().not().getValue());
     }
 
     @Test
     void notCorrectQueryValidationStatus() {
-        viewModel
-            .queryProperty()
-            .setValue("Miami AND Beach OR Houston AND Texas");
-        assertFalse(
-            viewModel.queryValidationStatus().validProperty().not().getValue()
-        );
+        viewModel.queryProperty().setValue("Miami AND Beach OR Houston AND Texas");
+        assertFalse(viewModel.queryValidationStatus().validProperty().not().getValue());
     }
 
     @Test
     void queryConsistingOfDOIIsValid() {
         viewModel.queryProperty().setValue("10.1007/JHEP02(2023)082");
-        assertTrue(
-            viewModel.queryValidationStatus().validProperty().getValue()
-        );
+        assertTrue(viewModel.queryValidationStatus().validProperty().getValue());
     }
 
     @Test
     void canExtractDOIFromQueryText() {
-        viewModel
-            .queryProperty()
-            .setValue("this is the DOI: 10.1007/JHEP02(2023)082, other text");
-        assertTrue(
-            viewModel.queryValidationStatus().validProperty().getValue()
-        );
+        viewModel.queryProperty().setValue("this is the DOI: 10.1007/JHEP02(2023)082, other text");
+        assertTrue(viewModel.queryValidationStatus().validProperty().getValue());
     }
 
     @Test
     void queryConsistingOfInvalidDOIIsInvalid() {
         viewModel.queryProperty().setValue("101.1007/JHEP02(2023)082");
-        assertFalse(
-            viewModel.queryValidationStatus().validProperty().getValue()
-        );
+        assertFalse(viewModel.queryValidationStatus().validProperty().getValue());
     }
 
     @Test
     void queryConsistingOfISBNIsValid() {
         viewModel.queryProperty().setValue("9780134685991");
-        assertTrue(
-            viewModel.queryValidationStatus().validProperty().getValue()
-        );
+        assertTrue(viewModel.queryValidationStatus().validProperty().getValue());
     }
 
     @Test
     void canExtractISBNFromQueryText() {
         viewModel.queryProperty().setValue(";:isbn (9780134685991), text2");
-        assertTrue(
-            viewModel.queryValidationStatus().validProperty().getValue()
-        );
+        assertTrue(viewModel.queryValidationStatus().validProperty().getValue());
     }
 
     @Test
     void queryConsistingOfArXivIdIsValid() {
         viewModel.queryProperty().setValue("arXiv:2110.02957");
-        assertTrue(
-            viewModel.queryValidationStatus().validProperty().getValue()
-        );
+        assertTrue(viewModel.queryValidationStatus().validProperty().getValue());
     }
 
     @Test
     void canExtractArXivIdFromQueryText() {
-        viewModel
-            .queryProperty()
-            .setValue("this query contains an ArXiv identifier 2110.02957");
-        assertTrue(
-            viewModel.queryValidationStatus().validProperty().getValue()
-        );
+        viewModel.queryProperty().setValue("this query contains an ArXiv identifier 2110.02957");
+        assertTrue(viewModel.queryValidationStatus().validProperty().getValue());
     }
 }
diff --git a/src/test/java/org/jabref/gui/keyboard/KeyBindingsTabModelTest.java b/src/test/java/org/jabref/gui/keyboard/KeyBindingsTabModelTest.java
index 11a23fbd03b..dddcfef2256 100644
--- a/src/test/java/org/jabref/gui/keyboard/KeyBindingsTabModelTest.java
+++ b/src/test/java/org/jabref/gui/keyboard/KeyBindingsTabModelTest.java
@@ -52,27 +52,18 @@ void testInvalidKeyBindingIsNotSaved() {
             false
         );
         assertFalse(
-            keyBindingRepository.checkKeyCombinationEquality(
-                KeyBinding.COPY,
-                shortcutKeyEvent
-            )
+            keyBindingRepository.checkKeyCombinationEquality(KeyBinding.COPY, shortcutKeyEvent)
         );
         model.setNewBindingForCurrent(shortcutKeyEvent);
         KeyCombination combination = KeyCombination.keyCombination(
             keyBindingRepository.get(KeyBinding.COPY).get()
         );
         assertFalse(
-            KeyBindingRepository.checkKeyCombinationEquality(
-                combination,
-                shortcutKeyEvent
-            )
+            KeyBindingRepository.checkKeyCombinationEquality(combination, shortcutKeyEvent)
         );
         model.storeSettings();
         assertFalse(
-            keyBindingRepository.checkKeyCombinationEquality(
-                KeyBinding.COPY,
-                shortcutKeyEvent
-            )
+            keyBindingRepository.checkKeyCombinationEquality(KeyBinding.COPY, shortcutKeyEvent)
         );
     }
 
@@ -101,12 +92,7 @@ void testSpecialKeysValidKeyBindingIsSaved() {
             keyBindingRepository.get(KeyBinding.IMPORT_INTO_NEW_DATABASE).get()
         );
 
-        assertTrue(
-            KeyBindingRepository.checkKeyCombinationEquality(
-                combination,
-                shortcutKeyEvent
-            )
-        );
+        assertTrue(KeyBindingRepository.checkKeyCombinationEquality(combination, shortcutKeyEvent));
 
         model.storeSettings();
 
@@ -136,15 +122,10 @@ void testKeyBindingCategory() {
             false
         );
         assertFalse(
-            keyBindingRepository.checkKeyCombinationEquality(
-                KeyBinding.CLEANUP,
-                shortcutKeyEvent
-            )
+            keyBindingRepository.checkKeyCombinationEquality(KeyBinding.CLEANUP, shortcutKeyEvent)
         );
         model.setNewBindingForCurrent(shortcutKeyEvent);
-        assertNull(
-            model.selectedKeyBindingProperty().get().get().getKeyBinding()
-        );
+        assertNull(model.selectedKeyBindingProperty().get().get().getKeyBinding());
     }
 
     @Test
@@ -161,10 +142,7 @@ void testRandomNewKeyKeyBindingInRepository() {
             false
         );
         assertFalse(
-            keyBindingRepository.checkKeyCombinationEquality(
-                KeyBinding.CLEANUP,
-                shortcutKeyEvent
-            )
+            keyBindingRepository.checkKeyCombinationEquality(KeyBinding.CLEANUP, shortcutKeyEvent)
         );
         model.setNewBindingForCurrent(shortcutKeyEvent);
 
@@ -172,18 +150,11 @@ void testRandomNewKeyKeyBindingInRepository() {
             keyBindingRepository.get(KeyBinding.CLEANUP).get()
         );
 
-        assertTrue(
-            KeyBindingRepository.checkKeyCombinationEquality(
-                combination,
-                shortcutKeyEvent
-            )
-        );
+        assertTrue(KeyBindingRepository.checkKeyCombinationEquality(combination, shortcutKeyEvent));
 
         assertFalse(
             KeyBindingRepository.checkKeyCombinationEquality(
-                KeyCombination.valueOf(
-                    KeyBinding.CLEANUP.getDefaultKeyBinding()
-                ),
+                KeyCombination.valueOf(KeyBinding.CLEANUP.getDefaultKeyBinding()),
                 shortcutKeyEvent
             )
         );
@@ -300,9 +271,7 @@ void testSetAllKeyBindingsToDefault() {
 
     @Test
     void testCloseEntryEditorCloseEntryKeybinding() {
-        KeyBindingViewModel viewModel = setKeyBindingViewModel(
-            KeyBinding.CLOSE
-        );
+        KeyBindingViewModel viewModel = setKeyBindingViewModel(KeyBinding.CLOSE);
         model.selectedKeyBindingProperty().set(Optional.of(viewModel));
         KeyEvent closeEditorEvent = new KeyEvent(
             KeyEvent.KEY_PRESSED,
@@ -315,21 +284,13 @@ void testCloseEntryEditorCloseEntryKeybinding() {
             false
         );
 
-        assertEquals(
-            KeyBinding.CLOSE.getDefaultKeyBinding(),
-            KeyCode.ESCAPE.getName()
-        );
+        assertEquals(KeyBinding.CLOSE.getDefaultKeyBinding(), KeyCode.ESCAPE.getName());
 
-        KeyCombination combi = KeyCombination.valueOf(
-            KeyBinding.CLOSE.getDefaultKeyBinding()
-        );
+        KeyCombination combi = KeyCombination.valueOf(KeyBinding.CLOSE.getDefaultKeyBinding());
 
         assertTrue(combi.match(closeEditorEvent));
         assertTrue(
-            keyBindingRepository.checkKeyCombinationEquality(
-                KeyBinding.CLOSE,
-                closeEditorEvent
-            )
+            keyBindingRepository.checkKeyCombinationEquality(KeyBinding.CLOSE, closeEditorEvent)
         );
     }
 
@@ -337,9 +298,7 @@ void testCloseEntryEditorCloseEntryKeybinding() {
     void testSetSingleKeyBindingToDefault() {
         assumeFalse(OS.OS_X);
 
-        KeyBindingViewModel viewModel = setKeyBindingViewModel(
-            KeyBinding.ABBREVIATE
-        );
+        KeyBindingViewModel viewModel = setKeyBindingViewModel(KeyBinding.ABBREVIATE);
         model.selectedKeyBindingProperty().set(Optional.of(viewModel));
         KeyEvent shortcutKeyEvent = new KeyEvent(
             KeyEvent.KEY_PRESSED,
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 4edb789604a..f25fd4cf36e 100644
--- a/src/test/java/org/jabref/gui/libraryproperties/constants/ConstantsPropertiesViewModelTest.java
+++ b/src/test/java/org/jabref/gui/libraryproperties/constants/ConstantsPropertiesViewModelTest.java
@@ -25,15 +25,10 @@ void setUp() {
         filePreferences = mock(FilePreferences.class);
     }
 
-    @DisplayName(
-        "Check that the list of strings is sorted according to their keys"
-    )
+    @DisplayName("Check that the list of strings is sorted according to their keys")
     @Test
     void testStringsListPropertySorting() {
-        BibtexString string1 = new BibtexString(
-            "TSE",
-            "Transactions on Software Engineering"
-        );
+        BibtexString string1 = new BibtexString("TSE", "Transactions on Software Engineering");
         BibtexString string2 = new BibtexString(
             "ICSE",
             "International Conference on Software Engineering"
@@ -73,17 +68,9 @@ void testStringsListPropertyResorting() {
             filePreferences
         );
         var stringsList = model.stringsListProperty();
+        stringsList.add(new ConstantsItemModel("TSE", "Transactions on Software Engineering"));
         stringsList.add(
-            new ConstantsItemModel(
-                "TSE",
-                "Transactions on Software Engineering"
-            )
-        );
-        stringsList.add(
-            new ConstantsItemModel(
-                "ICSE",
-                "International Conference on Software Engineering"
-            )
+            new ConstantsItemModel("ICSE", "International Conference on Software Engineering")
         );
 
         model.resortStrings();
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 9aee44f10de..0c8ae975ade 100644
--- a/src/test/java/org/jabref/gui/libraryproperties/contentselectors/ContentSelectorViewModelTest.java
+++ b/src/test/java/org/jabref/gui/libraryproperties/contentselectors/ContentSelectorViewModelTest.java
@@ -35,8 +35,7 @@ public class ContentSelectorViewModelTest {
     @BeforeEach
     void setUp() {
         databaseContext = new BibDatabaseContext();
-        viewModel =
-            new ContentSelectorViewModel(databaseContext, dialogService);
+        viewModel = new ContentSelectorViewModel(databaseContext, dialogService);
         viewModel.setValues();
     }
 
@@ -160,10 +159,7 @@ 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
-                )
+                Localization.lang("Are you sure you want to remove keyword: \"%0\"?", keyword)
             )
         )
             .thenReturn(true);
diff --git a/src/test/java/org/jabref/gui/maintable/MainTableColumnModelTest.java b/src/test/java/org/jabref/gui/maintable/MainTableColumnModelTest.java
index 2f597823090..663e92eeb7d 100644
--- a/src/test/java/org/jabref/gui/maintable/MainTableColumnModelTest.java
+++ b/src/test/java/org/jabref/gui/maintable/MainTableColumnModelTest.java
@@ -7,8 +7,7 @@
 public class MainTableColumnModelTest {
 
     private static String testName = "field:author";
-    private static MainTableColumnModel.Type testType =
-        MainTableColumnModel.Type.NORMALFIELD;
+    private static MainTableColumnModel.Type testType = MainTableColumnModel.Type.NORMALFIELD;
     private static String testQualifier = "author";
 
     private static String testTypeOnlyName = "linked_id";
@@ -17,54 +16,42 @@ public class MainTableColumnModelTest {
 
     @Test
     public void mainTableColumnModelParserRetrievesCorrectType() {
-        MainTableColumnModel testColumnModel = MainTableColumnModel.parse(
-            testQualifier
-        );
+        MainTableColumnModel testColumnModel = MainTableColumnModel.parse(testQualifier);
 
         assertEquals(testColumnModel.getType(), testType);
     }
 
     @Test
     public void mainTableColumnModelParserRetrievesCorrectQualifier() {
-        MainTableColumnModel testColumnModel = MainTableColumnModel.parse(
-            testQualifier
-        );
+        MainTableColumnModel testColumnModel = MainTableColumnModel.parse(testQualifier);
 
         assertEquals(testColumnModel.getQualifier(), testQualifier);
     }
 
     @Test
     public void fullMainTableColumnModelParserRetrievesCorrectType() {
-        MainTableColumnModel testColumnModel = MainTableColumnModel.parse(
-            testName
-        );
+        MainTableColumnModel testColumnModel = MainTableColumnModel.parse(testName);
 
         assertEquals(testColumnModel.getType(), testType);
     }
 
     @Test
     public void fullMainTableColumnModelParserRetrievesCorrectQualifier() {
-        MainTableColumnModel testColumnModel = MainTableColumnModel.parse(
-            testName
-        );
+        MainTableColumnModel testColumnModel = MainTableColumnModel.parse(testName);
 
         assertEquals(testColumnModel.getQualifier(), testQualifier);
     }
 
     @Test
     public void typeOnlyMainTableColumnModelParserRetrievesCorrectType() {
-        MainTableColumnModel testColumnModel = MainTableColumnModel.parse(
-            testTypeOnlyName
-        );
+        MainTableColumnModel testColumnModel = MainTableColumnModel.parse(testTypeOnlyName);
 
         assertEquals(testColumnModel.getType(), testTypeOnlyType);
     }
 
     @Test
     public void typeOnlyMainTableColumnModelParserRetrievesCorrectQualifier() {
-        MainTableColumnModel testColumnModel = MainTableColumnModel.parse(
-            testTypeOnlyName
-        );
+        MainTableColumnModel testColumnModel = MainTableColumnModel.parse(testTypeOnlyName);
 
         assertEquals(testColumnModel.getQualifier(), "");
     }
diff --git a/src/test/java/org/jabref/gui/maintable/MainTableDataModelTest.java b/src/test/java/org/jabref/gui/maintable/MainTableDataModelTest.java
index 661a58d1049..1d03f17cc25 100644
--- a/src/test/java/org/jabref/gui/maintable/MainTableDataModelTest.java
+++ b/src/test/java/org/jabref/gui/maintable/MainTableDataModelTest.java
@@ -25,45 +25,29 @@ class MainTableDataModelTest {
     @Test
     void additionToObservableMapTriggersUpdate() {
         BibDatabaseContext bibDatabaseContext = new BibDatabaseContext();
-        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
-            );
+        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
-                    )
+                new MainTableFieldValueFormatter(nameDisplayPreferences, bibDatabaseContext)
             );
-        FilteredList<BibEntryTableViewModel> entriesFiltered =
-            new FilteredList<>(entriesViewModel);
+        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);
-        EntryComparator entryComparator = new EntryComparator(
-            false,
-            false,
-            StandardField.AUTHOR
+        SortedList<BibEntryTableViewModel> entriesFilteredAndSorted = new SortedList<>(
+            entriesFiltered
         );
+        EntryComparator entryComparator = new EntryComparator(false, false, StandardField.AUTHOR);
         entriesFilteredAndSorted.setComparator((o1, o2) ->
             entryComparator.compare(o1.getEntry(), o2.getEntry())
         );
@@ -74,8 +58,7 @@ void additionToObservableMapTriggersUpdate() {
             (InvalidationListener) observable -> changed[0] = true
         );
 
-        BibEntry bibEntryAuthorT = new BibEntry()
-            .withField(StandardField.AUTHOR, "T");
+        BibEntry bibEntryAuthorT = new BibEntry().withField(StandardField.AUTHOR, "T");
         entries.add(bibEntryAuthorT);
 
         List<BibEntry> result = entriesFilteredAndSorted
@@ -86,21 +69,13 @@ void additionToObservableMapTriggersUpdate() {
 
         BibEntry bibEntryNothingToZ = new BibEntry();
         entries.add(bibEntryNothingToZ);
-        result =
-            entriesFilteredAndSorted
-                .stream()
-                .map(entry -> entry.getEntry())
-                .toList();
+        result = entriesFilteredAndSorted.stream().map(entry -> entry.getEntry()).toList();
         assertEquals(List.of(bibEntryNothingToZ, bibEntryAuthorT), result);
 
         changed[0] = false;
         bibEntryNothingToZ.setField(StandardField.AUTHOR, "Z");
         assertTrue(changed[0]);
-        result =
-            entriesFilteredAndSorted
-                .stream()
-                .map(entry -> entry.getEntry())
-                .toList();
+        result = entriesFilteredAndSorted.stream().map(entry -> entry.getEntry()).toList();
         assertEquals(List.of(bibEntryAuthorT, bibEntryNothingToZ), result);
     }
 }
diff --git a/src/test/java/org/jabref/gui/menus/FileHistoryMenuTest.java b/src/test/java/org/jabref/gui/menus/FileHistoryMenuTest.java
index 38aa41d0052..bc1713cf56b 100644
--- a/src/test/java/org/jabref/gui/menus/FileHistoryMenuTest.java
+++ b/src/test/java/org/jabref/gui/menus/FileHistoryMenuTest.java
@@ -17,8 +17,7 @@
 @ExtendWith(ApplicationExtension.class)
 public class FileHistoryMenuTest {
 
-    private static final String BIBTEX_LIBRARY_PATH =
-        "src/test/resources/org/jabref/";
+    private static final String BIBTEX_LIBRARY_PATH = "src/test/resources/org/jabref/";
 
     private FileHistoryMenu fileHistoryMenu;
 
@@ -34,15 +33,12 @@ public class FileHistoryMenuTest {
     @BeforeEach
     public void setUp() {
         openMocks(this);
-        fileHistoryMenu =
-            new FileHistoryMenu(fileHistory, dialogService, openDatabaseAction);
+        fileHistoryMenu = new FileHistoryMenu(fileHistory, dialogService, openDatabaseAction);
     }
 
     @Test
     void recentLibrariesAreCleared() {
-        fileHistoryMenu.newFile(
-            Path.of(BIBTEX_LIBRARY_PATH.concat("bibtexFiles/test.bib"))
-        );
+        fileHistoryMenu.newFile(Path.of(BIBTEX_LIBRARY_PATH.concat("bibtexFiles/test.bib")));
 
         fileHistoryMenu.clearLibrariesHistory();
         assertTrue(fileHistoryMenu.isDisable());
diff --git a/src/test/java/org/jabref/gui/mergeentries/DiffHighlightingTest.java b/src/test/java/org/jabref/gui/mergeentries/DiffHighlightingTest.java
index ee712fabe19..dd06620e4bd 100644
--- a/src/test/java/org/jabref/gui/mergeentries/DiffHighlightingTest.java
+++ b/src/test/java/org/jabref/gui/mergeentries/DiffHighlightingTest.java
@@ -62,10 +62,7 @@ void testGenerateDiffHighlightingNoDiff() {
     @Test
     void testGenerateDiffHighlightingSingleWordAddTextWordDiff() {
         assertEquals(
-            Arrays.asList(
-                DiffHighlighting.forRemoved("foo "),
-                DiffHighlighting.forAdded("foobar")
-            ),
+            Arrays.asList(DiffHighlighting.forRemoved("foo "), DiffHighlighting.forAdded("foobar")),
             DiffHighlighting.generateDiffHighlighting("foo", "foobar", " ")
         );
     }
@@ -86,10 +83,7 @@ void testGenerateDiffHighlightingSingleWordAddTextCharacterDiff() {
     @Test
     void testGenerateDiffHighlightingSingleWordDeleteTextWordDiff() {
         assertEquals(
-            Arrays.asList(
-                DiffHighlighting.forRemoved("foobar "),
-                DiffHighlighting.forAdded("foo")
-            ),
+            Arrays.asList(DiffHighlighting.forRemoved("foobar "), DiffHighlighting.forAdded("foo")),
             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 88579d6812a..5a0ce878b0f 100644
--- a/src/test/java/org/jabref/gui/mergeentries/FieldRowViewModelTest.java
+++ b/src/test/java/org/jabref/gui/mergeentries/FieldRowViewModelTest.java
@@ -51,10 +51,7 @@ public void setup() throws ParseException {
                 .withField(StandardField.PAGES, "515--517")
                 .withField(StandardField.VOLUME, "32")
                 .withField(StandardField.GROUPS, "Skimmed")
-                .withField(
-                    StandardField.JOURNAL,
-                    "Electron Device Letters, IEEE"
-                )
+                .withField(StandardField.JOURNAL, "Electron Device Letters, IEEE")
                 .withField(StandardField.PUBLISHER, "IEEE")
                 .withField(StandardField.YEAR, "2012");
 
@@ -104,42 +101,24 @@ public void setup() throws ParseException {
 
     @Test
     public void selectNonEmptyValueShouldSelectLeftFieldValueIfItIsNotEmpty() {
-        var numberFieldViewModel = createViewModelForField(
-            StandardField.NUMBER
-        );
+        var numberFieldViewModel = createViewModelForField(StandardField.NUMBER);
         numberFieldViewModel.selectNonEmptyValue();
-        assertEquals(
-            FieldRowViewModel.Selection.LEFT,
-            numberFieldViewModel.getSelection()
-        );
+        assertEquals(FieldRowViewModel.Selection.LEFT, numberFieldViewModel.getSelection());
 
-        var authorFieldViewModel = createViewModelForField(
-            StandardField.AUTHOR
-        );
+        var authorFieldViewModel = createViewModelForField(StandardField.AUTHOR);
         authorFieldViewModel.selectNonEmptyValue();
-        assertEquals(
-            FieldRowViewModel.Selection.LEFT,
-            authorFieldViewModel.getSelection()
-        );
+        assertEquals(FieldRowViewModel.Selection.LEFT, authorFieldViewModel.getSelection());
     }
 
     @Test
     public void selectNonEmptyValueShouldSelectRightFieldValueIfLeftValueIsEmpty() {
         var monthFieldViewModel = createViewModelForField(StandardField.MONTH);
         monthFieldViewModel.selectNonEmptyValue();
-        assertEquals(
-            FieldRowViewModel.Selection.RIGHT,
-            monthFieldViewModel.getSelection()
-        );
+        assertEquals(FieldRowViewModel.Selection.RIGHT, monthFieldViewModel.getSelection());
 
-        var addressFieldViewModel = createViewModelForField(
-            StandardField.ADDRESS
-        );
+        var addressFieldViewModel = createViewModelForField(StandardField.ADDRESS);
         addressFieldViewModel.selectNonEmptyValue();
-        assertEquals(
-            FieldRowViewModel.Selection.RIGHT,
-            addressFieldViewModel.getSelection()
-        );
+        assertEquals(FieldRowViewModel.Selection.RIGHT, addressFieldViewModel.getSelection());
     }
 
     @Test
@@ -175,10 +154,7 @@ public void hasEqualLeftAndRightValuesShouldReturnTrueIfKeywordsAreEqual() {
     public void selectLeftValueShouldBeCorrect() {
         var monthFieldViewModel = createViewModelForField(StandardField.MONTH);
         monthFieldViewModel.selectLeftValue();
-        assertEquals(
-            FieldRowViewModel.Selection.LEFT,
-            monthFieldViewModel.getSelection()
-        );
+        assertEquals(FieldRowViewModel.Selection.LEFT, monthFieldViewModel.getSelection());
         assertEquals(
             Optional.of(""),
             Optional.ofNullable(monthFieldViewModel.getMergedFieldValue())
@@ -186,24 +162,15 @@ public void selectLeftValueShouldBeCorrect() {
 
         monthFieldViewModel.selectRightValue();
         monthFieldViewModel.selectLeftValue();
-        assertEquals(
-            FieldRowViewModel.Selection.LEFT,
-            monthFieldViewModel.getSelection()
-        );
-        assertEquals(
-            Optional.of(""),
-            Optional.of(monthFieldViewModel.getMergedFieldValue())
-        );
+        assertEquals(FieldRowViewModel.Selection.LEFT, monthFieldViewModel.getSelection());
+        assertEquals(Optional.of(""), Optional.of(monthFieldViewModel.getMergedFieldValue()));
     }
 
     @Test
     public void selectRightValueShouldBeCorrect() {
         var monthFieldViewModel = createViewModelForField(StandardField.MONTH);
         monthFieldViewModel.selectRightValue();
-        assertEquals(
-            FieldRowViewModel.Selection.RIGHT,
-            monthFieldViewModel.getSelection()
-        );
+        assertEquals(FieldRowViewModel.Selection.RIGHT, monthFieldViewModel.getSelection());
         assertEquals(
             rightEntry.getField(StandardField.MONTH),
             Optional.of(monthFieldViewModel.getMergedFieldValue())
@@ -211,10 +178,7 @@ public void selectRightValueShouldBeCorrect() {
 
         monthFieldViewModel.selectLeftValue();
         monthFieldViewModel.selectRightValue();
-        assertEquals(
-            FieldRowViewModel.Selection.RIGHT,
-            monthFieldViewModel.getSelection()
-        );
+        assertEquals(FieldRowViewModel.Selection.RIGHT, monthFieldViewModel.getSelection());
         assertEquals(
             rightEntry.getField(StandardField.MONTH),
             Optional.of(monthFieldViewModel.getMergedFieldValue())
@@ -232,14 +196,10 @@ public void isFieldsMergedShouldReturnFalseIfLeftAndRightValuesAreNotEqual() {
         var monthFieldViewModel = createViewModelForField(StandardField.MONTH);
         assertFalse(monthFieldViewModel.isFieldsMerged());
 
-        var addressFieldViewModel = createViewModelForField(
-            StandardField.ADDRESS
-        );
+        var addressFieldViewModel = createViewModelForField(StandardField.ADDRESS);
         assertFalse(addressFieldViewModel.isFieldsMerged());
 
-        var authorFieldViewModel = createViewModelForField(
-            StandardField.AUTHOR
-        );
+        var authorFieldViewModel = createViewModelForField(StandardField.AUTHOR);
         assertFalse(authorFieldViewModel.isFieldsMerged());
     }
 
@@ -247,29 +207,20 @@ public void isFieldsMergedShouldReturnFalseIfLeftAndRightValuesAreNotEqual() {
     public void mergeFieldsShouldResultInLeftAndRightValuesBeingEqual() {
         var groupsField = createViewModelForField(StandardField.GROUPS);
         groupsField.mergeFields();
-        assertEquals(
-            groupsField.getLeftFieldValue(),
-            groupsField.getRightFieldValue()
-        );
+        assertEquals(groupsField.getLeftFieldValue(), groupsField.getRightFieldValue());
     }
 
     @Test
     public void mergeFieldsShouldBeCorrectEvenWhenOnOfTheValuesIsEmpty() {
         var keywordsField = createViewModelForField(StandardField.KEYWORDS);
         keywordsField.mergeFields();
-        assertEquals(
-            keywordsField.getLeftFieldValue(),
-            keywordsField.getRightFieldValue()
-        );
+        assertEquals(keywordsField.getLeftFieldValue(), keywordsField.getRightFieldValue());
     }
 
     @Test
     public void mergeFieldsShouldThrowUnsupportedOperationExceptionIfTheGivenFieldCanBeMerged() {
         var authorField = createViewModelForField(StandardField.AUTHOR);
-        assertThrows(
-            UnsupportedOperationException.class,
-            authorField::mergeFields
-        );
+        assertThrows(UnsupportedOperationException.class, authorField::mergeFields);
     }
 
     @Test
@@ -277,10 +228,7 @@ public void mergeFieldsShouldSelectLeftFieldValue() {
         var groupsField = createViewModelForField(StandardField.GROUPS);
         groupsField.mergeFields();
 
-        assertEquals(
-            FieldRowViewModel.Selection.LEFT,
-            groupsField.getSelection()
-        );
+        assertEquals(FieldRowViewModel.Selection.LEFT, groupsField.getSelection());
     }
 
     @Test
@@ -307,12 +255,6 @@ public void unmergeFieldsShouldDoNothingIfFieldsAreNotMerged() {
     }
 
     public FieldRowViewModel createViewModelForField(Field field) {
-        return new FieldRowViewModel(
-            field,
-            leftEntry,
-            rightEntry,
-            mergedEntry,
-            fieldMergerFactory
-        );
+        return new FieldRowViewModel(field, leftEntry, rightEntry, mergedEntry, fieldMergerFactory);
     }
 }
diff --git a/src/test/java/org/jabref/gui/mergeentries/GroupMergerTest.java b/src/test/java/org/jabref/gui/mergeentries/GroupMergerTest.java
index 9b5e848088f..5f6bb4f210d 100644
--- a/src/test/java/org/jabref/gui/mergeentries/GroupMergerTest.java
+++ b/src/test/java/org/jabref/gui/mergeentries/GroupMergerTest.java
@@ -33,11 +33,7 @@ private static Stream<Arguments> mergeShouldMergeGroupsCorrectly() {
 
     @ParameterizedTest
     @MethodSource
-    public void mergeShouldMergeGroupsCorrectly(
-        String groupsA,
-        String groupsB,
-        String expected
-    ) {
+    public void mergeShouldMergeGroupsCorrectly(String groupsA, String groupsB, String expected) {
         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 6fc3a5c3d37..e53377d1b6c 100644
--- a/src/test/java/org/jabref/gui/mergeentries/ThreeWayMergeCellViewModelTest.java
+++ b/src/test/java/org/jabref/gui/mergeentries/ThreeWayMergeCellViewModelTest.java
@@ -77,20 +77,15 @@ void testOddEvenLogic(
 
     @ParameterizedTest
     @MethodSource
-    void isEvenShouldReturnTrueIfRowIndexIsEven(
-        int rowIndex,
-        boolean expected
-    ) {
-        ThreeWayMergeCellViewModel newViewModel =
-            new ThreeWayMergeCellViewModel("", rowIndex);
+    void isEvenShouldReturnTrueIfRowIndexIsEven(int rowIndex, boolean expected) {
+        ThreeWayMergeCellViewModel newViewModel = new ThreeWayMergeCellViewModel("", rowIndex);
         assertEquals(expected, newViewModel.isEven());
     }
 
     @ParameterizedTest
     @MethodSource
     void isOddShouldReturnTrueIfRowIndexIsOdd(int rowIndex, boolean expected) {
-        ThreeWayMergeCellViewModel newViewModel =
-            new ThreeWayMergeCellViewModel("", rowIndex);
+        ThreeWayMergeCellViewModel newViewModel = new ThreeWayMergeCellViewModel("", rowIndex);
         assertEquals(expected, newViewModel.isOdd());
     }
 
diff --git a/src/test/java/org/jabref/gui/mergeentries/ThreeWayMergeViewModelTest.java b/src/test/java/org/jabref/gui/mergeentries/ThreeWayMergeViewModelTest.java
index b0942bc0f73..84e55ac1be0 100644
--- a/src/test/java/org/jabref/gui/mergeentries/ThreeWayMergeViewModelTest.java
+++ b/src/test/java/org/jabref/gui/mergeentries/ThreeWayMergeViewModelTest.java
@@ -28,10 +28,7 @@ public class ThreeWayMergeViewModelTest {
     void setup() {
         leftEntry =
             new BibEntry(StandardEntryType.Article)
-                .withField(
-                    StandardField.AUTHOR,
-                    "Erik G. Larsson and Oscar Gustafsson"
-                )
+                .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]}"
@@ -54,27 +51,19 @@ void setup() {
                     "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");
+        viewModel = new ThreeWayMergeViewModel(leftEntry, rightEntry, "left", "right");
         visibleFields = viewModel.getVisibleFields();
     }
 
     @Test
     void getVisibleFieldsShouldReturnASortedListOfFieldsWithEntryTypeAtTheHeadOfTheList() {
-        List<String> names = visibleFields
-            .stream()
-            .map(Field::getName)
-            .skip(1)
-            .toList();
+        List<String> names = visibleFields.stream().map(Field::getName).skip(1).toList();
         Comparators.isInOrder(names, String::compareTo);
     }
 
     @Test
     void getVisibleFieldsShouldNotHaveDuplicates() {
-        assertEquals(
-            new HashSet<>(visibleFields).size(),
-            viewModel.numberOfVisibleFields()
-        );
+        assertEquals(new HashSet<>(visibleFields).size(), viewModel.numberOfVisibleFields());
     }
 
     @Test
@@ -86,20 +75,12 @@ void getVisibleFieldsShouldHaveEntryTypeFieldAtTheHeadOfTheList() {
     void getVisibleFieldsShouldContainAllNonInternalFieldsInRightAndLeftEntry() {
         assertTrue(
             visibleFields.containsAll(
-                leftEntry
-                    .getFields()
-                    .stream()
-                    .filter(this::isNotInternalField)
-                    .toList()
+                leftEntry.getFields().stream().filter(this::isNotInternalField).toList()
             )
         );
         assertTrue(
             visibleFields.containsAll(
-                rightEntry
-                    .getFields()
-                    .stream()
-                    .filter(this::isNotInternalField)
-                    .toList()
+                rightEntry.getFields().stream().filter(this::isNotInternalField).toList()
             )
         );
     }
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 b82c6b9d5d3..c60ad6e5af2 100644
--- a/src/test/java/org/jabref/gui/preferences/journals/AbbreviationViewModelTest.java
+++ b/src/test/java/org/jabref/gui/preferences/journals/AbbreviationViewModelTest.java
@@ -13,10 +13,7 @@ class AbbreviationViewModelTest {
 
     @ParameterizedTest
     @MethodSource("provideContainsCaseIndependentContains")
-    void containsCaseIndependentContains(
-        String searchTerm,
-        AbbreviationViewModel abbreviation
-    ) {
+    void containsCaseIndependentContains(String searchTerm, AbbreviationViewModel abbreviation) {
         assertTrue(abbreviation.containsCaseIndependent(searchTerm));
     }
 
@@ -24,32 +21,21 @@ private static Stream<Arguments> provideContainsCaseIndependentContains() {
         return Stream.of(
             Arguments.of(
                 "name",
-                new AbbreviationViewModel(
-                    new Abbreviation("Long Name", "abbr", "unique")
-                )
+                new AbbreviationViewModel(new Abbreviation("Long Name", "abbr", "unique"))
             ),
             Arguments.of(
                 "bBr",
-                new AbbreviationViewModel(
-                    new Abbreviation("Long Name", "abbr", "unique")
-                )
+                new AbbreviationViewModel(new Abbreviation("Long Name", "abbr", "unique"))
             ),
             Arguments.of(
                 "Uniq",
-                new AbbreviationViewModel(
-                    new Abbreviation("Long Name", "abbr", "unique")
-                )
+                new AbbreviationViewModel(new Abbreviation("Long Name", "abbr", "unique"))
             ),
             Arguments.of(
                 "",
-                new AbbreviationViewModel(
-                    new Abbreviation("Long Name", "abbr", "unique")
-                )
+                new AbbreviationViewModel(new Abbreviation("Long Name", "abbr", "unique"))
             ),
-            Arguments.of(
-                "",
-                new AbbreviationViewModel(new Abbreviation("", "", ""))
-            )
+            Arguments.of("", new AbbreviationViewModel(new Abbreviation("", "", "")))
         );
     }
 
@@ -62,20 +48,13 @@ void containsCaseIndependentDoesNotContain(
         assertFalse(abbreviation.containsCaseIndependent(searchTerm));
     }
 
-    private static Stream<
-        Arguments
-    > provideContainsCaseIndependentDoesNotContain() {
+    private static Stream<Arguments> provideContainsCaseIndependentDoesNotContain() {
         return Stream.of(
             Arguments.of(
                 "Something else",
-                new AbbreviationViewModel(
-                    new Abbreviation("Long Name", "abbr", "unique")
-                )
+                new AbbreviationViewModel(new Abbreviation("Long Name", "abbr", "unique"))
             ),
-            Arguments.of(
-                "Something",
-                new AbbreviationViewModel(new Abbreviation("", "", ""))
-            )
+            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 d7943862bdf..8af5f909da0 100644
--- a/src/test/java/org/jabref/gui/preferences/journals/JournalAbbreviationsViewModelTabTest.java
+++ b/src/test/java/org/jabref/gui/preferences/journals/JournalAbbreviationsViewModelTabTest.java
@@ -36,50 +36,44 @@
 
 class JournalAbbreviationsViewModelTabTest {
 
-    private static final TestAbbreviation ABBREVIATION_0 = new TestAbbreviation(
+    private static final TestAbbreviation ABBREVIATION_0 = new TestAbbreviation("Full0", "Abb0");
+    private static final TestAbbreviation ABBREVIATION_0_OTHER_SHORT_UNIQUE = new TestAbbreviation(
         "Full0",
-        "Abb0"
+        "Abb0",
+        "A0"
     );
-    private static final TestAbbreviation ABBREVIATION_0_OTHER_SHORT_UNIQUE =
-        new TestAbbreviation("Full0", "Abb0", "A0");
 
-    private static final TestAbbreviation ABBREVIATION_1 = new TestAbbreviation(
+    private static final TestAbbreviation ABBREVIATION_1 = new TestAbbreviation("Full1", "Abb1");
+    private static final TestAbbreviation ABBREVIATION_1_SHOW = new TestAbbreviation(
         "Full1",
-        "Abb1"
+        "Abb1",
+        true
+    );
+    private static final TestAbbreviation ABBREVIATION_1_OTHER_SHORT_UNIQUE = new TestAbbreviation(
+        "Full1",
+        "Abb1",
+        "A1"
     );
-    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 static final TestAbbreviation ABBREVIATION_2 = new TestAbbreviation(
+    private static final TestAbbreviation ABBREVIATION_2 = new TestAbbreviation("Full2", "Abb2");
+    private static final TestAbbreviation ABBREVIATION_2_OTHER_SHORT_UNIQUE = new TestAbbreviation(
         "Full2",
-        "Abb2"
+        "Abb2",
+        "A2"
     );
-    private static final TestAbbreviation ABBREVIATION_2_OTHER_SHORT_UNIQUE =
-        new TestAbbreviation("Full2", "Abb2", "A2");
 
-    private static final TestAbbreviation ABBREVIATION_3 = new TestAbbreviation(
+    private static final TestAbbreviation ABBREVIATION_3 = new TestAbbreviation("Full3", "Abb3");
+    private static final TestAbbreviation ABBREVIATION_3_OTHER_SHORT_UNIQUE = new TestAbbreviation(
         "Full3",
-        "Abb3"
+        "Abb3",
+        "A3"
     );
-    private static final TestAbbreviation ABBREVIATION_3_OTHER_SHORT_UNIQUE =
-        new TestAbbreviation("Full3", "Abb3", "A3");
 
-    private static final TestAbbreviation ABBREVIATION_4 = new TestAbbreviation(
-        "Full4",
-        "Abb4"
-    );
+    private static final TestAbbreviation ABBREVIATION_4 = new TestAbbreviation("Full4", "Abb4");
 
-    private static final TestAbbreviation ABBREVIATION_5 = new TestAbbreviation(
-        "Full5",
-        "Abb5"
-    );
+    private static final TestAbbreviation ABBREVIATION_5 = new TestAbbreviation("Full5", "Abb5");
 
-    private static final TestAbbreviation ABBREVIATION_6 = new TestAbbreviation(
-        "Full6",
-        "Abb6"
-    );
+    private static final TestAbbreviation ABBREVIATION_6 = new TestAbbreviation("Full6", "Abb6");
 
     private JournalAbbreviationsTabViewModel viewModel;
     private Path emptyTestFile;
@@ -102,8 +96,7 @@ public TestAbbreviation(
             boolean showShortestUniqueAbbreviation
         ) {
             super(name, abbreviation);
-            this.showShortestUniqueAbbreviation =
-                showShortestUniqueAbbreviation;
+            this.showShortestUniqueAbbreviation = showShortestUniqueAbbreviation;
         }
 
         public TestAbbreviation(
@@ -130,28 +123,19 @@ public String toString() {
         }
     }
 
-    private static String csvListOfAbbreviations(
-        List<TestAbbreviation> testAbbreviations
-    ) {
+    private static String csvListOfAbbreviations(List<TestAbbreviation> testAbbreviations) {
         return testAbbreviations
             .stream()
             .map(TestAbbreviation::toString)
             .collect(Collectors.joining("\n"));
     }
 
-    private static String csvListOfAbbreviations(
-        TestAbbreviation... testAbbreviations
-    ) {
-        return csvListOfAbbreviations(
-            Arrays.stream(testAbbreviations).toList()
-        );
+    private static String csvListOfAbbreviations(TestAbbreviation... testAbbreviations) {
+        return csvListOfAbbreviations(Arrays.stream(testAbbreviations).toList());
     }
 
     private record CsvFileNameAndContent(String fileName, String content) {
-        CsvFileNameAndContent(
-            String fileName,
-            TestAbbreviation... testAbbreviations
-        ) {
+        CsvFileNameAndContent(String fileName, TestAbbreviation... testAbbreviations) {
             this(fileName, csvListOfAbbreviations(testAbbreviations));
         }
     }
@@ -174,14 +158,8 @@ public TestData(
             this(
                 csvFiles,
                 abbreviationToCheck,
-                finalContentsOfFile2
-                    .stream()
-                    .map(TestAbbreviation::toString)
-                    .toList(),
-                finalContentsOfFile3
-                    .stream()
-                    .map(TestAbbreviation::toString)
-                    .toList()
+                finalContentsOfFile2.stream().map(TestAbbreviation::toString).toList(),
+                finalContentsOfFile3.stream().map(TestAbbreviation::toString).toList()
             );
         }
     }
@@ -218,12 +196,7 @@ public static Stream<TestData> provideTestFiles() {
                         ABBREVIATION_4
                     )
                 ),
-                List.of(
-                    ABBREVIATION_0,
-                    ABBREVIATION_1,
-                    ABBREVIATION_2,
-                    ABBREVIATION_5
-                ),
+                List.of(ABBREVIATION_0, ABBREVIATION_1, ABBREVIATION_2, ABBREVIATION_5),
                 List.of(
                     ABBREVIATION_0,
                     ABBREVIATION_1,
@@ -236,10 +209,7 @@ public static Stream<TestData> provideTestFiles() {
             // Shortest unique abbreviations
             new TestData(
                 List.of(
-                    new CsvFileNameAndContent(
-                        "testFile20.csv",
-                        ABBREVIATION_1_OTHER_SHORT_UNIQUE
-                    ),
+                    new CsvFileNameAndContent("testFile20.csv", ABBREVIATION_1_OTHER_SHORT_UNIQUE),
                     new CsvFileNameAndContent(
                         "testFile21.csv",
                         ABBREVIATION_0_OTHER_SHORT_UNIQUE,
@@ -345,8 +315,7 @@ void setUpViewModel(@TempDir Path tempFolder) throws Exception {
                 repository
             );
 
-        emptyTestFile =
-            createTestFile(new CsvFileNameAndContent("emptyTestFile.csv", ""));
+        emptyTestFile = createTestFile(new CsvFileNameAndContent("emptyTestFile.csv", ""));
     }
 
     @Test
@@ -357,16 +326,14 @@ void testInitialHasNoFilesAndNoAbbreviations() {
 
     @ParameterizedTest
     @MethodSource("provideTestFiles")
-    void testInitialWithSavedFilesIncrementsFilesCounter(TestData testData)
-        throws IOException {
+    void testInitialWithSavedFilesIncrementsFilesCounter(TestData testData) throws IOException {
         addFourTestFileToViewModelAndPreferences(testData);
         assertEquals(4, viewModel.journalFilesProperty().size());
     }
 
     @ParameterizedTest
     @MethodSource("provideTestFiles")
-    void testRemoveDuplicatesWhenReadingFiles(TestData testData)
-        throws IOException {
+    void testRemoveDuplicatesWhenReadingFiles(TestData testData) throws IOException {
         addFourTestFileToViewModelAndPreferences(testData);
         viewModel.selectLastJournalFile();
 
@@ -376,8 +343,7 @@ void testRemoveDuplicatesWhenReadingFiles(TestData testData)
 
     @Test
     void addFileIncreasesCounterOfOpenFilesAndHasNoAbbreviations() {
-        when(dialogService.showFileSaveDialog(any()))
-            .thenReturn(Optional.of(emptyTestFile));
+        when(dialogService.showFileSaveDialog(any())).thenReturn(Optional.of(emptyTestFile));
         viewModel.addNewFile();
 
         assertEquals(1, viewModel.journalFilesProperty().size());
@@ -386,8 +352,7 @@ void addFileIncreasesCounterOfOpenFilesAndHasNoAbbreviations() {
 
     @ParameterizedTest
     @MethodSource("provideTestFiles")
-    void addDuplicatedFileResultsInErrorDialog(TestData testData)
-        throws IOException {
+    void addDuplicatedFileResultsInErrorDialog(TestData testData) throws IOException {
         when(dialogService.showFileSaveDialog(any()))
             .thenReturn(Optional.of(createTestFile(testData.csvFiles.get(0))));
         viewModel.addNewFile();
@@ -397,8 +362,7 @@ void addDuplicatedFileResultsInErrorDialog(TestData testData)
 
     @ParameterizedTest
     @MethodSource("provideTestFiles")
-    void testOpenDuplicatedFileResultsInAnException(TestData testData)
-        throws IOException {
+    void testOpenDuplicatedFileResultsInAnException(TestData testData) throws IOException {
         when(dialogService.showFileOpenDialog(any()))
             .thenReturn(Optional.of(createTestFile(testData.csvFiles.get(0))));
         viewModel.openFile();
@@ -408,11 +372,9 @@ void testOpenDuplicatedFileResultsInAnException(TestData testData)
 
     @ParameterizedTest
     @MethodSource("provideTestFiles")
-    void testSelectLastJournalFileSwitchesFilesAndTheirAbbreviations(
-        TestData testData
-    ) throws IOException {
-        when(dialogService.showFileSaveDialog(any()))
-            .thenReturn(Optional.of(emptyTestFile));
+    void testSelectLastJournalFileSwitchesFilesAndTheirAbbreviations(TestData testData)
+        throws IOException {
+        when(dialogService.showFileSaveDialog(any())).thenReturn(Optional.of(emptyTestFile));
         viewModel.addNewFile();
         viewModel.selectLastJournalFile();
         assertEquals(0, viewModel.abbreviationsCountProperty().get());
@@ -426,9 +388,8 @@ void testSelectLastJournalFileSwitchesFilesAndTheirAbbreviations(
 
     @ParameterizedTest
     @MethodSource("provideTestFiles")
-    void testOpenValidFileContainsTheSpecificEntryAndEnoughAbbreviations(
-        TestData testData
-    ) throws IOException {
+    void testOpenValidFileContainsTheSpecificEntryAndEnoughAbbreviations(TestData testData)
+        throws IOException {
         when(dialogService.showFileSaveDialog(any()))
             .thenReturn(Optional.of(createTestFile(testData.csvFiles.get(2))));
         viewModel.addNewFile();
@@ -440,17 +401,14 @@ void testOpenValidFileContainsTheSpecificEntryAndEnoughAbbreviations(
         assertTrue(
             viewModel
                 .abbreviationsProperty()
-                .contains(
-                    new AbbreviationViewModel(testData.abbreviationToCheck)
-                )
+                .contains(new AbbreviationViewModel(testData.abbreviationToCheck))
         );
     }
 
     @ParameterizedTest
     @MethodSource("provideTestFiles")
-    void testRemoveLastListSetsCurrentFileAndCurrentAbbreviationToNull(
-        TestData testData
-    ) throws IOException {
+    void testRemoveLastListSetsCurrentFileAndCurrentAbbreviationToNull(TestData testData)
+        throws IOException {
         when(dialogService.showFileSaveDialog(any()))
             .thenReturn(Optional.of(createTestFile(testData.csvFiles.get(0))));
         viewModel.addNewFile();
@@ -472,9 +430,7 @@ void testMixedFileUsage(TestData testData) throws IOException {
         when(dialogService.showFileSaveDialog(any()))
             .thenReturn(Optional.of(createTestFile(testData.csvFiles.get(2))));
         viewModel.addNewFile();
-        viewModel
-            .currentFileProperty()
-            .set(viewModel.journalFilesProperty().get(1));
+        viewModel.currentFileProperty().set(viewModel.journalFilesProperty().get(1));
 
         // size of the list of journal files should be incremented by two
         assertEquals(2, viewModel.journalFilesProperty().size());
@@ -486,18 +442,13 @@ void testMixedFileUsage(TestData testData) throws IOException {
         assertTrue(
             viewModel
                 .abbreviationsProperty()
-                .contains(
-                    new AbbreviationViewModel(testData.abbreviationToCheck)
-                )
+                .contains(new AbbreviationViewModel(testData.abbreviationToCheck))
         );
 
         // simulate add new file button
-        when(dialogService.showFileSaveDialog(any()))
-            .thenReturn(Optional.of(emptyTestFile));
+        when(dialogService.showFileSaveDialog(any())).thenReturn(Optional.of(emptyTestFile));
         viewModel.addNewFile();
-        viewModel
-            .currentFileProperty()
-            .set(viewModel.journalFilesProperty().get(2));
+        viewModel.currentFileProperty().set(viewModel.journalFilesProperty().get(2));
 
         // size of the list of journal files should be incremented by one
         assertEquals(3, viewModel.journalFilesProperty().size());
@@ -509,9 +460,7 @@ void testMixedFileUsage(TestData testData) throws IOException {
         when(dialogService.showFileSaveDialog(any()))
             .thenReturn(Optional.of(createTestFile(testData.csvFiles.get(3))));
         viewModel.addNewFile();
-        viewModel
-            .currentFileProperty()
-            .set(viewModel.journalFilesProperty().get(3));
+        viewModel.currentFileProperty().set(viewModel.journalFilesProperty().get(3));
 
         // size of the list of journal files should have been incremented by one
         assertEquals(4, viewModel.journalFilesProperty().size());
@@ -523,9 +472,7 @@ void testMixedFileUsage(TestData testData) throws IOException {
         assertTrue(
             viewModel
                 .abbreviationsProperty()
-                .contains(
-                    new AbbreviationViewModel(testData.abbreviationToCheck)
-                )
+                .contains(new AbbreviationViewModel(testData.abbreviationToCheck))
         );
     }
 
@@ -533,27 +480,24 @@ void testMixedFileUsage(TestData testData) throws IOException {
     void testBuiltInListsIncludeAllBuiltInAbbreviations() {
         viewModel.addBuiltInList();
         assertEquals(1, viewModel.journalFilesProperty().getSize());
-        viewModel
-            .currentFileProperty()
-            .set(viewModel.journalFilesProperty().get(0));
-        ObservableList<Abbreviation> expected =
-            FXCollections.observableArrayList(repository.getAllLoaded());
-        ObservableList<Abbreviation> actualAbbreviations =
-            FXCollections.observableArrayList(
-                viewModel
-                    .abbreviationsProperty()
-                    .stream()
-                    .map(AbbreviationViewModel::getAbbreviationObject)
-                    .collect(Collectors.toList())
-            );
+        viewModel.currentFileProperty().set(viewModel.journalFilesProperty().get(0));
+        ObservableList<Abbreviation> expected = FXCollections.observableArrayList(
+            repository.getAllLoaded()
+        );
+        ObservableList<Abbreviation> actualAbbreviations = FXCollections.observableArrayList(
+            viewModel
+                .abbreviationsProperty()
+                .stream()
+                .map(AbbreviationViewModel::getAbbreviationObject)
+                .collect(Collectors.toList())
+        );
 
         assertEquals(expected, actualAbbreviations);
     }
 
     @ParameterizedTest
     @MethodSource("provideTestFiles")
-    void testCurrentFilePropertyChangeActiveFile(TestData testData)
-        throws IOException {
+    void testCurrentFilePropertyChangeActiveFile(TestData testData) throws IOException {
         for (CsvFileNameAndContent testFile : testData.csvFiles) {
             when(dialogService.showFileSaveDialog(any()))
                 .thenReturn(Optional.of(createTestFile(testFile)));
@@ -561,18 +505,10 @@ void testCurrentFilePropertyChangeActiveFile(TestData testData)
         }
         viewModel.selectLastJournalFile();
 
-        AbbreviationsFileViewModel test1 = viewModel
-            .journalFilesProperty()
-            .get(0);
-        AbbreviationsFileViewModel test3 = viewModel
-            .journalFilesProperty()
-            .get(1);
-        AbbreviationsFileViewModel test4 = viewModel
-            .journalFilesProperty()
-            .get(2);
-        AbbreviationsFileViewModel test5 = viewModel
-            .journalFilesProperty()
-            .get(3);
+        AbbreviationsFileViewModel test1 = viewModel.journalFilesProperty().get(0);
+        AbbreviationsFileViewModel test3 = viewModel.journalFilesProperty().get(1);
+        AbbreviationsFileViewModel test4 = viewModel.journalFilesProperty().get(2);
+        AbbreviationsFileViewModel test5 = viewModel.journalFilesProperty().get(3);
 
         // test if the last opened file is active, but duplicated entry has been removed
         assertEquals(5, viewModel.abbreviationsProperty().size());
@@ -594,9 +530,8 @@ void testCurrentFilePropertyChangeActiveFile(TestData testData)
 
     @ParameterizedTest
     @MethodSource("provideTestFiles")
-    void testAddAbbreviationIncludesAbbreviationsInAbbreviationList(
-        TestData testData
-    ) throws IOException {
+    void testAddAbbreviationIncludesAbbreviationsInAbbreviationList(TestData testData)
+        throws IOException {
         when(dialogService.showFileSaveDialog(any()))
             .thenReturn(Optional.of(createTestFile(testData.csvFiles.get(2))));
         viewModel.addNewFile();
@@ -604,24 +539,18 @@ void testAddAbbreviationIncludesAbbreviationsInAbbreviationList(
             .thenReturn(Optional.of(createTestFile(testData.csvFiles.get(3))));
         viewModel.addNewFile();
         viewModel.selectLastJournalFile();
-        Abbreviation testAbbreviation = new Abbreviation(
-            "YetAnotherEntry",
-            "YAE"
-        );
+        Abbreviation testAbbreviation = new Abbreviation("YetAnotherEntry", "YAE");
         viewModel.addAbbreviation(testAbbreviation);
 
         assertEquals(6, viewModel.abbreviationsProperty().size());
         assertTrue(
-            viewModel
-                .abbreviationsProperty()
-                .contains(new AbbreviationViewModel(testAbbreviation))
+            viewModel.abbreviationsProperty().contains(new AbbreviationViewModel(testAbbreviation))
         );
     }
 
     @ParameterizedTest
     @MethodSource("provideTestFiles")
-    void testAddDuplicatedAbbreviationResultsInException(TestData testData)
-        throws IOException {
+    void testAddDuplicatedAbbreviationResultsInException(TestData testData) throws IOException {
         when(dialogService.showFileSaveDialog(any()))
             .thenReturn(Optional.of(createTestFile(testData.csvFiles.get(1))));
         viewModel.addNewFile();
@@ -633,29 +562,22 @@ void testAddDuplicatedAbbreviationResultsInException(TestData testData)
 
     @Test
     void testEditSameAbbreviationWithNoChangeDoesNotResultInException() {
-        when(dialogService.showFileSaveDialog(any()))
-            .thenReturn(Optional.of(emptyTestFile));
+        when(dialogService.showFileSaveDialog(any())).thenReturn(Optional.of(emptyTestFile));
         viewModel.addNewFile();
         viewModel.selectLastJournalFile();
-        Abbreviation testAbbreviation = new Abbreviation(
-            "YetAnotherEntry",
-            "YAE"
-        );
+        Abbreviation testAbbreviation = new Abbreviation("YetAnotherEntry", "YAE");
         viewModel.addAbbreviation(testAbbreviation);
         viewModel.editAbbreviation(testAbbreviation);
 
         assertTrue(
-            viewModel
-                .abbreviationsProperty()
-                .contains(new AbbreviationViewModel(testAbbreviation))
+            viewModel.abbreviationsProperty().contains(new AbbreviationViewModel(testAbbreviation))
         );
     }
 
     @ParameterizedTest
     @MethodSource("provideTestFiles")
-    void testEditAbbreviationIncludesNewAbbreviationInAbbreviationsList(
-        TestData testData
-    ) throws IOException {
+    void testEditAbbreviationIncludesNewAbbreviationInAbbreviationsList(TestData testData)
+        throws IOException {
         when(dialogService.showFileSaveDialog(any()))
             .thenReturn(Optional.of(createTestFile(testData.csvFiles.get(2))));
         viewModel.addNewFile();
@@ -664,37 +586,28 @@ void testEditAbbreviationIncludesNewAbbreviationInAbbreviationsList(
         viewModel.addNewFile();
         viewModel.selectLastJournalFile();
         selectLastAbbreviation();
-        Abbreviation testAbbreviation = new Abbreviation(
-            "YetAnotherEntry",
-            "YAE"
-        );
+        Abbreviation testAbbreviation = new Abbreviation("YetAnotherEntry", "YAE");
         viewModel.addAbbreviation(testAbbreviation);
 
         assertEquals(6, viewModel.abbreviationsProperty().size());
         assertTrue(
-            viewModel
-                .abbreviationsProperty()
-                .contains(new AbbreviationViewModel(testAbbreviation))
+            viewModel.abbreviationsProperty().contains(new AbbreviationViewModel(testAbbreviation))
         );
 
-        when(dialogService.showFileSaveDialog(any()))
-            .thenReturn(Optional.of(emptyTestFile));
+        when(dialogService.showFileSaveDialog(any())).thenReturn(Optional.of(emptyTestFile));
         viewModel.addNewFile();
         viewModel.selectLastJournalFile();
         // addAbbreviation(testAbbreviation);
 
         assertEquals(0, viewModel.abbreviationsProperty().size());
         assertFalse(
-            viewModel
-                .abbreviationsProperty()
-                .contains(new AbbreviationViewModel(testAbbreviation))
+            viewModel.abbreviationsProperty().contains(new AbbreviationViewModel(testAbbreviation))
         );
     }
 
     @ParameterizedTest
     @MethodSource("provideTestFiles")
-    void testEditAbbreviationToExistingOneResultsInException(TestData testData)
-        throws IOException {
+    void testEditAbbreviationToExistingOneResultsInException(TestData testData) throws IOException {
         when(dialogService.showFileSaveDialog(any()))
             .thenReturn(Optional.of(createTestFile(testData.csvFiles.get(1))));
         viewModel.addNewFile();
@@ -704,17 +617,14 @@ void testEditAbbreviationToExistingOneResultsInException(TestData testData)
         assertEquals(3, viewModel.abbreviationsProperty().size());
 
         viewModel.editAbbreviation(new Abbreviation("YetAnotherEntry", "YAE"));
-        viewModel
-            .currentAbbreviationProperty()
-            .set(viewModel.abbreviationsProperty().get(1));
+        viewModel.currentAbbreviationProperty().set(viewModel.abbreviationsProperty().get(1));
         viewModel.editAbbreviation(new Abbreviation("YetAnotherEntry", "YAE"));
         verify(dialogService).showErrorDialogAndWait(anyString(), anyString());
     }
 
     @ParameterizedTest
     @MethodSource("provideTestFiles")
-    void testEditAbbreviationToEmptyNameResultsInException(TestData testData)
-        throws IOException {
+    void testEditAbbreviationToEmptyNameResultsInException(TestData testData) throws IOException {
         when(dialogService.showFileSaveDialog(any()))
             .thenReturn(Optional.of(createTestFile(testData.csvFiles.get(1))));
         viewModel.addNewFile();
@@ -729,9 +639,8 @@ void testEditAbbreviationToEmptyNameResultsInException(TestData testData)
 
     @ParameterizedTest
     @MethodSource("provideTestFiles")
-    void testEditAbbreviationToEmptyAbbreviationResultsInException(
-        TestData testData
-    ) throws IOException {
+    void testEditAbbreviationToEmptyAbbreviationResultsInException(TestData testData)
+        throws IOException {
         when(dialogService.showFileSaveDialog(any()))
             .thenReturn(Optional.of(createTestFile(testData.csvFiles.get(1))));
         viewModel.addNewFile();
@@ -746,26 +655,21 @@ void testEditAbbreviationToEmptyAbbreviationResultsInException(
 
     @ParameterizedTest
     @MethodSource("provideTestFiles")
-    void testSaveAbbreviationsToFilesCreatesNewFilesWithWrittenAbbreviations(
-        TestData testData
-    ) throws Exception {
+    void testSaveAbbreviationsToFilesCreatesNewFilesWithWrittenAbbreviations(TestData testData)
+        throws Exception {
         Path testFile2 = createTestFile(testData.csvFiles.get(2));
-        when(dialogService.showFileSaveDialog(any()))
-            .thenReturn(Optional.of(testFile2));
+        when(dialogService.showFileSaveDialog(any())).thenReturn(Optional.of(testFile2));
         viewModel.addNewFile();
         viewModel.selectLastJournalFile();
         selectLastAbbreviation();
         viewModel.editAbbreviation(ABBREVIATION_5);
         assertEquals(4, viewModel.abbreviationsProperty().size());
         assertTrue(
-            viewModel
-                .abbreviationsProperty()
-                .contains(new AbbreviationViewModel(ABBREVIATION_5))
+            viewModel.abbreviationsProperty().contains(new AbbreviationViewModel(ABBREVIATION_5))
         );
 
         Path testFile3 = createTestFile(testData.csvFiles.get(3));
-        when(dialogService.showFileSaveDialog(any()))
-            .thenReturn(Optional.of(testFile3));
+        when(dialogService.showFileSaveDialog(any())).thenReturn(Optional.of(testFile3));
         viewModel.addNewFile();
         assertEquals(5, viewModel.abbreviationsProperty().size());
 
@@ -787,18 +691,13 @@ void testSaveAbbreviationsToFilesCreatesNewFilesWithWrittenAbbreviations(
         // deletion and addition of an entry leads to same size
         assertEquals(5, viewModel.abbreviationsProperty().size());
         assertTrue(
-            viewModel
-                .abbreviationsProperty()
-                .contains(new AbbreviationViewModel(ABBREVIATION_6))
+            viewModel.abbreviationsProperty().contains(new AbbreviationViewModel(ABBREVIATION_6))
         );
 
         // overwrite all files
         viewModel.saveJournalAbbreviationFiles();
 
-        List<String> actual = Files.readAllLines(
-            testFile2,
-            StandardCharsets.UTF_8
-        );
+        List<String> actual = Files.readAllLines(testFile2, StandardCharsets.UTF_8);
         assertEquals(testData.finalContentsOfFile2, actual);
 
         actual = Files.readAllLines(testFile3, StandardCharsets.UTF_8);
@@ -818,8 +717,7 @@ private void selectLastAbbreviation() {
             );
     }
 
-    private void addFourTestFileToViewModelAndPreferences(TestData testData)
-        throws IOException {
+    private void addFourTestFileToViewModelAndPreferences(TestData testData) throws IOException {
         for (CsvFileNameAndContent csvFile : testData.csvFiles) {
             when(dialogService.showFileSaveDialog(any()))
                 .thenReturn(Optional.of(createTestFile(csvFile)));
@@ -828,8 +726,7 @@ private void addFourTestFileToViewModelAndPreferences(TestData testData)
         viewModel.storeSettings();
     }
 
-    private Path createTestFile(CsvFileNameAndContent testFile)
-        throws IOException {
+    private Path createTestFile(CsvFileNameAndContent testFile) throws IOException {
         Path file = this.tempFolder.resolve(testFile.fileName);
         Files.writeString(file, testFile.content);
         return file;
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 e5bb438f7e7..e17ab42d515 100644
--- a/src/test/java/org/jabref/gui/preferences/keybindings/KeyBindingViewModelTest.java
+++ b/src/test/java/org/jabref/gui/preferences/keybindings/KeyBindingViewModelTest.java
@@ -19,12 +19,11 @@ class KeyBindingViewModelTest {
     void resetToDefault() {
         // Set new key binding
         KeyBindingRepository keyBindingRepository = new KeyBindingRepository();
-        KeyBindingsTabViewModel keyBindingsTabViewModel =
-            new KeyBindingsTabViewModel(
-                keyBindingRepository,
-                mock(DialogService.class),
-                mock(PreferencesService.class)
-            );
+        KeyBindingsTabViewModel keyBindingsTabViewModel = new KeyBindingsTabViewModel(
+            keyBindingRepository,
+            mock(DialogService.class),
+            mock(PreferencesService.class)
+        );
         KeyBinding binding = KeyBinding.ABBREVIATE;
 
         KeyBindingViewModel viewModel = new KeyBindingViewModel(
@@ -32,9 +31,7 @@ void resetToDefault() {
             binding,
             binding.getDefaultKeyBinding()
         );
-        keyBindingsTabViewModel
-            .selectedKeyBindingProperty()
-            .set(Optional.of(viewModel));
+        keyBindingsTabViewModel.selectedKeyBindingProperty().set(Optional.of(viewModel));
 
         KeyEvent shortcutKeyEvent = new KeyEvent(
             KeyEvent.KEY_PRESSED,
diff --git a/src/test/java/org/jabref/gui/push/PushToEmacsTest.java b/src/test/java/org/jabref/gui/push/PushToEmacsTest.java
index 1579d551932..36fba3426e2 100644
--- a/src/test/java/org/jabref/gui/push/PushToEmacsTest.java
+++ b/src/test/java/org/jabref/gui/push/PushToEmacsTest.java
@@ -24,10 +24,7 @@ class PushToEmacsTest {
 
     @BeforeEach
     public void setup() {
-        DialogService dialogService = mock(
-            DialogService.class,
-            Answers.RETURNS_DEEP_STUBS
-        );
+        DialogService dialogService = mock(DialogService.class, Answers.RETURNS_DEEP_STUBS);
         PreferencesService preferencesService = mock(PreferencesService.class);
 
         PushToApplicationPreferences pushToApplicationPreferences = mock(
@@ -38,13 +35,13 @@ public void setup() {
             ? "\"C:\\tools\\emacs\\bin\\emacsclientw.exe\""
             : "emacsclient";
         Map<String, String> emacsConfig = Map.of("Emacs", emacsClient);
-        ObservableMap<String, String> emacsConfigObservableMap =
-            FXCollections.observableMap(emacsConfig);
+        ObservableMap<String, String> emacsConfigObservableMap = FXCollections.observableMap(
+            emacsConfig
+        );
         when(pushToApplicationPreferences.getCommandPaths())
             .thenReturn(new SimpleMapProperty<>(emacsConfigObservableMap));
 
-        when(pushToApplicationPreferences.getEmacsArguments())
-            .thenReturn("-n -e");
+        when(pushToApplicationPreferences.getEmacsArguments()).thenReturn("-n -e");
 
         when(preferencesService.getPushToApplicationPreferences())
             .thenReturn(pushToApplicationPreferences);
@@ -52,8 +49,7 @@ public void setup() {
         ExternalApplicationsPreferences externalApplicationsPreferences = mock(
             ExternalApplicationsPreferences.class
         );
-        when(externalApplicationsPreferences.getCiteCommand())
-            .thenReturn("\\cite{key1,key2}");
+        when(externalApplicationsPreferences.getCiteCommand()).thenReturn("\\cite{key1,key2}");
         when(preferencesService.getExternalApplicationsPreferences())
             .thenReturn(externalApplicationsPreferences);
 
diff --git a/src/test/java/org/jabref/gui/search/GlobalSearchBarTest.java b/src/test/java/org/jabref/gui/search/GlobalSearchBarTest.java
index d3ac7e1a5e5..f0697404b9a 100644
--- a/src/test/java/org/jabref/gui/search/GlobalSearchBarTest.java
+++ b/src/test/java/org/jabref/gui/search/GlobalSearchBarTest.java
@@ -44,10 +44,7 @@ public void onStart(Stage stage) {
         SearchPreferences searchPreferences = mock(SearchPreferences.class);
         when(searchPreferences.getSearchFlags())
             .thenReturn(EnumSet.noneOf(SearchRules.SearchFlags.class));
-        PreferencesService prefs = mock(
-            PreferencesService.class,
-            Answers.RETURNS_DEEP_STUBS
-        );
+        PreferencesService prefs = mock(PreferencesService.class, Answers.RETURNS_DEEP_STUBS);
         when(prefs.getSearchPreferences()).thenReturn(searchPreferences);
 
         stateManager = new StateManager();
@@ -74,14 +71,11 @@ public void onStart(Stage stage) {
     }
 
     @Test
-    void recordingSearchQueriesOnFocusLostOnly(FxRobot robot)
-        throws InterruptedException {
+    void recordingSearchQueriesOnFocusLostOnly(FxRobot robot) throws InterruptedException {
         stateManager.clearSearchHistory();
         String searchQuery = "Smith";
         // Track the node, that the search query will be typed into
-        TextInputControl searchField = robot
-            .lookup("#searchField")
-            .queryTextInputControl();
+        TextInputControl searchField = robot.lookup("#searchField").queryTextInputControl();
 
         // The focus is on searchField node, as we click on the search box
         var searchFieldRoboto = robot.clickOn(searchField);
@@ -93,10 +87,7 @@ void recordingSearchQueriesOnFocusLostOnly(FxRobot robot)
 
         // Set the focus to another node to trigger the listener and finally record the query.
         DefaultTaskExecutor.runAndWaitInJavaFXThread(hBox::requestFocus);
-        List<String> lastSearchHistory = stateManager
-            .getWholeSearchHistory()
-            .stream()
-            .toList();
+        List<String> lastSearchHistory = stateManager.getWholeSearchHistory().stream().toList();
 
         assertEquals(List.of("Smith"), lastSearchHistory);
     }
@@ -105,18 +96,13 @@ void recordingSearchQueriesOnFocusLostOnly(FxRobot robot)
     void emptyQueryIsNotRecorded(FxRobot robot) {
         stateManager.clearSearchHistory();
         String searchQuery = "";
-        TextInputControl searchField = robot
-            .lookup("#searchField")
-            .queryTextInputControl();
+        TextInputControl searchField = robot.lookup("#searchField").queryTextInputControl();
 
         var searchFieldRoboto = robot.clickOn(searchField);
         searchFieldRoboto.write(searchQuery);
 
         DefaultTaskExecutor.runAndWaitInJavaFXThread(hBox::requestFocus);
-        List<String> lastSearchHistory = stateManager
-            .getWholeSearchHistory()
-            .stream()
-            .toList();
+        List<String> lastSearchHistory = stateManager.getWholeSearchHistory().stream().toList();
 
         assertEquals(List.of(), lastSearchHistory);
     }
diff --git a/src/test/java/org/jabref/gui/search/GrammarBasedSearchRuleDescriberTest.java b/src/test/java/org/jabref/gui/search/GrammarBasedSearchRuleDescriberTest.java
index 7fc9e353b26..95bc821a51a 100644
--- a/src/test/java/org/jabref/gui/search/GrammarBasedSearchRuleDescriberTest.java
+++ b/src/test/java/org/jabref/gui/search/GrammarBasedSearchRuleDescriberTest.java
@@ -29,18 +29,13 @@ void onStart(Stage stage) {
         stage.show();
     }
 
-    private TextFlow createDescription(
-        String query,
-        EnumSet<SearchFlags> searchFlags
-    ) {
-        GrammarBasedSearchRule grammarBasedSearchRule =
-            new GrammarBasedSearchRule(searchFlags);
+    private TextFlow createDescription(String query, EnumSet<SearchFlags> searchFlags) {
+        GrammarBasedSearchRule grammarBasedSearchRule = new GrammarBasedSearchRule(searchFlags);
         assertTrue(grammarBasedSearchRule.validateSearchStrings(query));
-        GrammarBasedSearchRuleDescriber describer =
-            new GrammarBasedSearchRuleDescriber(
-                searchFlags,
-                grammarBasedSearchRule.getTree()
-            );
+        GrammarBasedSearchRuleDescriber describer = new GrammarBasedSearchRuleDescriber(
+            searchFlags,
+            grammarBasedSearchRule.getTree()
+        );
         return describer.getDescription();
     }
 
@@ -48,9 +43,7 @@ private TextFlow createDescription(
     void testSimpleQueryCaseSensitiveRegex() {
         String query = "a=b";
         List<Text> expectedTexts = Arrays.asList(
-            TooltipTextUtil.createText(
-                "This search contains entries in which "
-            ),
+            TooltipTextUtil.createText("This search contains entries in which "),
             TooltipTextUtil.createText("the field "),
             TooltipTextUtil.createText("a", TooltipTextUtil.TextType.BOLD),
             TooltipTextUtil.createText(" contains the regular expression "),
@@ -73,9 +66,7 @@ void testSimpleQueryCaseSensitiveRegex() {
     void testSimpleQueryCaseSensitive() {
         String query = "a=b";
         List<Text> expectedTexts = Arrays.asList(
-            TooltipTextUtil.createText(
-                "This search contains entries in which "
-            ),
+            TooltipTextUtil.createText("This search contains entries in which "),
             TooltipTextUtil.createText("the field "),
             TooltipTextUtil.createText("a", TooltipTextUtil.TextType.BOLD),
             TooltipTextUtil.createText(" contains the term "),
@@ -95,9 +86,7 @@ void testSimpleQueryCaseSensitive() {
     void testSimpleQuery() {
         String query = "a=b";
         List<Text> expectedTexts = Arrays.asList(
-            TooltipTextUtil.createText(
-                "This search contains entries in which "
-            ),
+            TooltipTextUtil.createText("This search contains entries in which "),
             TooltipTextUtil.createText("the field "),
             TooltipTextUtil.createText("a", TooltipTextUtil.TextType.BOLD),
             TooltipTextUtil.createText(" contains the term "),
@@ -105,10 +94,7 @@ void testSimpleQuery() {
             TooltipTextUtil.createText(". "),
             TooltipTextUtil.createText("The search is case-insensitive.")
         );
-        TextFlow description = createDescription(
-            query,
-            EnumSet.noneOf(SearchFlags.class)
-        );
+        TextFlow description = createDescription(query, EnumSet.noneOf(SearchFlags.class));
 
         TextFlowEqualityHelper.assertEquals(expectedTexts, description);
     }
@@ -117,9 +103,7 @@ void testSimpleQuery() {
     void testSimpleQueryRegex() {
         String query = "a=b";
         List<Text> expectedTexts = Arrays.asList(
-            TooltipTextUtil.createText(
-                "This search contains entries in which "
-            ),
+            TooltipTextUtil.createText("This search contains entries in which "),
             TooltipTextUtil.createText("the field "),
             TooltipTextUtil.createText("a", TooltipTextUtil.TextType.BOLD),
             TooltipTextUtil.createText(" contains the regular expression "),
@@ -139,9 +123,7 @@ void testSimpleQueryRegex() {
     void testComplexQueryCaseSensitiveRegex() {
         String query = "not a=b and c=e or e=\"x\"";
         List<Text> expectedTexts = Arrays.asList(
-            TooltipTextUtil.createText(
-                "This search contains entries in which "
-            ),
+            TooltipTextUtil.createText("This search contains entries in which "),
             TooltipTextUtil.createText("not "),
             TooltipTextUtil.createText("the field "),
             TooltipTextUtil.createText("a", TooltipTextUtil.TextType.BOLD),
@@ -175,9 +157,7 @@ void testComplexQueryCaseSensitiveRegex() {
     void testComplexQueryRegex() {
         String query = "not a=b and c=e or e=\"x\"";
         List<Text> expectedTexts = Arrays.asList(
-            TooltipTextUtil.createText(
-                "This search contains entries in which "
-            ),
+            TooltipTextUtil.createText("This search contains entries in which "),
             TooltipTextUtil.createText("not "),
             TooltipTextUtil.createText("the field "),
             TooltipTextUtil.createText("a", TooltipTextUtil.TextType.BOLD),
@@ -208,9 +188,7 @@ void testComplexQueryRegex() {
     void testComplexQueryCaseSensitive() {
         String query = "not a=b and c=e or e=\"x\"";
         List<Text> expectedTexts = Arrays.asList(
-            TooltipTextUtil.createText(
-                "This search contains entries in which "
-            ),
+            TooltipTextUtil.createText("This search contains entries in which "),
             TooltipTextUtil.createText("not "),
             TooltipTextUtil.createText("the field "),
             TooltipTextUtil.createText("a", TooltipTextUtil.TextType.BOLD),
@@ -241,9 +219,7 @@ void testComplexQueryCaseSensitive() {
     void testComplexQuery() {
         String query = "not a=b and c=e or e=\"x\"";
         List<Text> expectedTexts = Arrays.asList(
-            TooltipTextUtil.createText(
-                "This search contains entries in which "
-            ),
+            TooltipTextUtil.createText("This search contains entries in which "),
             TooltipTextUtil.createText("not "),
             TooltipTextUtil.createText("the field "),
             TooltipTextUtil.createText("a", TooltipTextUtil.TextType.BOLD),
@@ -262,10 +238,7 @@ void testComplexQuery() {
             TooltipTextUtil.createText(". "),
             TooltipTextUtil.createText("The search is case-insensitive.")
         );
-        TextFlow description = createDescription(
-            query,
-            EnumSet.noneOf(SearchFlags.class)
-        );
+        TextFlow description = createDescription(query, EnumSet.noneOf(SearchFlags.class));
 
         TextFlowEqualityHelper.assertEquals(expectedTexts, description);
     }
diff --git a/src/test/java/org/jabref/gui/search/TextFlowEqualityHelper.java b/src/test/java/org/jabref/gui/search/TextFlowEqualityHelper.java
index 51e3060557c..383c1a7b15d 100644
--- a/src/test/java/org/jabref/gui/search/TextFlowEqualityHelper.java
+++ b/src/test/java/org/jabref/gui/search/TextFlowEqualityHelper.java
@@ -7,10 +7,7 @@
 
 public class TextFlowEqualityHelper {
 
-    public static void assertEquals(
-        List<Text> expectedTexts,
-        TextFlow description
-    ) {
+    public static void assertEquals(List<Text> expectedTexts, TextFlow description) {
         if (expectedTexts.size() != description.getChildren().size()) {
             Assertions.assertEquals(expectedTexts, description.getChildren());
             return;
@@ -21,15 +18,8 @@ public static void assertEquals(
             // the strings contain not only the text but also the font and other properties
             // so comparing them compares the Text object as a whole
             // the equals method is not implemented...
-            if (
-                !expectedText
-                    .toString()
-                    .equals(description.getChildren().get(i).toString())
-            ) {
-                Assertions.assertEquals(
-                    expectedTexts,
-                    description.getChildren()
-                );
+            if (!expectedText.toString().equals(description.getChildren().get(i).toString())) {
+                Assertions.assertEquals(expectedTexts, description.getChildren());
                 return;
             }
         }
diff --git a/src/test/java/org/jabref/gui/sidepane/SidePaneViewModelTest.java b/src/test/java/org/jabref/gui/sidepane/SidePaneViewModelTest.java
index 5815041f189..ed9af4f77bc 100644
--- a/src/test/java/org/jabref/gui/sidepane/SidePaneViewModelTest.java
+++ b/src/test/java/org/jabref/gui/sidepane/SidePaneViewModelTest.java
@@ -47,31 +47,20 @@ class SidePaneViewModelTest {
         new HashMap<>(),
         0
     );
-    ObservableList<SidePaneType> sidePaneComponents =
-        FXCollections.observableArrayList();
+    ObservableList<SidePaneType> sidePaneComponents = FXCollections.observableArrayList();
     SidePaneViewModel sidePaneViewModel;
 
     @BeforeEach
     void setUp() {
-        when(stateManager.getVisibleSidePaneComponents())
-            .thenReturn(sidePaneComponents);
-        when(stateManager.getLocalDragboard())
-            .thenReturn(mock(CustomLocalDragboard.class));
-        when(stateManager.activeDatabaseProperty())
-            .thenReturn(OptionalObjectProperty.empty());
-        when(preferencesService.getSidePanePreferences())
-            .thenReturn(sidePanePreferences);
-
-        sidePanePreferences
-            .visiblePanes()
-            .addAll(EnumSet.allOf(SidePaneType.class));
+        when(stateManager.getVisibleSidePaneComponents()).thenReturn(sidePaneComponents);
+        when(stateManager.getLocalDragboard()).thenReturn(mock(CustomLocalDragboard.class));
+        when(stateManager.activeDatabaseProperty()).thenReturn(OptionalObjectProperty.empty());
+        when(preferencesService.getSidePanePreferences()).thenReturn(sidePanePreferences);
+
+        sidePanePreferences.visiblePanes().addAll(EnumSet.allOf(SidePaneType.class));
         sidePanePreferences.getPreferredPositions().put(SidePaneType.GROUPS, 0);
-        sidePanePreferences
-            .getPreferredPositions()
-            .put(SidePaneType.WEB_SEARCH, 1);
-        sidePanePreferences
-            .getPreferredPositions()
-            .put(SidePaneType.OPEN_OFFICE, 2);
+        sidePanePreferences.getPreferredPositions().put(SidePaneType.WEB_SEARCH, 1);
+        sidePanePreferences.getPreferredPositions().put(SidePaneType.OPEN_OFFICE, 2);
 
         sidePaneViewModel =
             new SidePaneViewModel(
@@ -120,13 +109,9 @@ void moveDownFromLastPosition() {
     @Test
     void sortByPreferredPositions() {
         sidePanePreferences.getPreferredPositions().put(SidePaneType.GROUPS, 2);
-        sidePanePreferences
-            .getPreferredPositions()
-            .put(SidePaneType.OPEN_OFFICE, 0);
+        sidePanePreferences.getPreferredPositions().put(SidePaneType.OPEN_OFFICE, 0);
 
-        sidePaneComponents.sort(
-            new SidePaneViewModel.PreferredIndexSort(sidePanePreferences)
-        );
+        sidePaneComponents.sort(new SidePaneViewModel.PreferredIndexSort(sidePanePreferences));
 
         assertTrue(
             sidePaneComponents.get(0) == SidePaneType.OPEN_OFFICE &&
diff --git a/src/test/java/org/jabref/gui/slr/ManageStudyDefinitionViewModelTest.java b/src/test/java/org/jabref/gui/slr/ManageStudyDefinitionViewModelTest.java
index db89072ffc3..d538deee66f 100644
--- a/src/test/java/org/jabref/gui/slr/ManageStudyDefinitionViewModelTest.java
+++ b/src/test/java/org/jabref/gui/slr/ManageStudyDefinitionViewModelTest.java
@@ -24,10 +24,8 @@ class ManageStudyDefinitionViewModelTest {
     @BeforeEach
     void setUp() {
         // code taken from org.jabref.logic.importer.WebFetchersTest.setUp
-        importFormatPreferences =
-            mock(ImportFormatPreferences.class, Answers.RETURNS_DEEP_STUBS);
-        importerPreferences =
-            mock(ImporterPreferences.class, Answers.RETURNS_DEEP_STUBS);
+        importFormatPreferences = mock(ImportFormatPreferences.class, Answers.RETURNS_DEEP_STUBS);
+        importerPreferences = mock(ImporterPreferences.class, Answers.RETURNS_DEEP_STUBS);
         dialogService = mock(DialogService.class);
     }
 
@@ -43,10 +41,7 @@ public void emptyStudyConstructorFillsDatabasesCorrectly() {
             List.of(
                 new StudyCatalogItem("ACM Portal", true),
                 new StudyCatalogItem("ArXiv", false),
-                new StudyCatalogItem(
-                    "Bibliotheksverbund Bayern (Experimental)",
-                    false
-                ),
+                new StudyCatalogItem("Bibliotheksverbund Bayern (Experimental)", false),
                 new StudyCatalogItem("Biodiversity Heritage", false),
                 new StudyCatalogItem("CiteSeerX", false),
                 new StudyCatalogItem("Crossref", false),
@@ -78,10 +73,7 @@ public void studyConstructorFillsDatabasesCorrectly(@TempDir Path tempDir) {
             List.of(
                 new StudyCatalogItem("ACM Portal", true),
                 new StudyCatalogItem("ArXiv", false),
-                new StudyCatalogItem(
-                    "Bibliotheksverbund Bayern (Experimental)",
-                    false
-                ),
+                new StudyCatalogItem("Bibliotheksverbund Bayern (Experimental)", false),
                 new StudyCatalogItem("Biodiversity Heritage", false),
                 new StudyCatalogItem("CiteSeerX", false),
                 new StudyCatalogItem("Crossref", false),
@@ -105,19 +97,9 @@ public void studyConstructorFillsDatabasesCorrectly(@TempDir Path tempDir) {
         );
     }
 
-    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
-        );
+    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);
         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 147ef4964f6..11a633b2744 100644
--- a/src/test/java/org/jabref/gui/theme/ThemeManagerTest.java
+++ b/src/test/java/org/jabref/gui/theme/ThemeManagerTest.java
@@ -55,8 +55,7 @@ public void themeManagerUsesProvidedTheme() throws IOException {
             WorkspacePreferences.class,
             Answers.RETURNS_DEEP_STUBS
         );
-        when(workspacePreferences.getTheme())
-            .thenReturn(new Theme(testCss.toString()));
+        when(workspacePreferences.getTheme()).thenReturn(new Theme(testCss.toString()));
 
         ThemeManager themeManager = new ThemeManager(
             workspacePreferences,
@@ -64,14 +63,8 @@ public void themeManagerUsesProvidedTheme() throws IOException {
             Runnable::run
         );
 
-        assertEquals(
-            Theme.Type.CUSTOM,
-            themeManager.getActiveTheme().getType()
-        );
-        assertEquals(
-            testCss.toString(),
-            themeManager.getActiveTheme().getName()
-        );
+        assertEquals(Theme.Type.CUSTOM, themeManager.getActiveTheme().getType());
+        assertEquals(testCss.toString(), themeManager.getActiveTheme().getName());
         Optional<String> cssLocationBeforeDeletion = themeManager
             .getActiveTheme()
             .getAdditionalStylesheet()
@@ -93,8 +86,7 @@ public void customThemeAvailableEvenWhenDeleted() throws IOException {
             WorkspacePreferences.class,
             Answers.RETURNS_DEEP_STUBS
         );
-        when(workspacePreferences.getTheme())
-            .thenReturn(new Theme(testCss.toString()));
+        when(workspacePreferences.getTheme()).thenReturn(new Theme(testCss.toString()));
 
         // ActiveTheme should provide the additionalStylesheet that was created before
         ThemeManager themeManagerCreatedBeforeFileDeleted = new ThemeManager(
@@ -106,11 +98,10 @@ public void customThemeAvailableEvenWhenDeleted() throws IOException {
         Files.delete(testCss);
 
         // ActiveTheme should keep the additionalStylesheet in memory and provide it
-        Optional<String> cssLocationAfterDeletion =
-            themeManagerCreatedBeforeFileDeleted
-                .getActiveTheme()
-                .getAdditionalStylesheet()
-                .map(StyleSheet::getWebEngineStylesheet);
+        Optional<String> cssLocationAfterDeletion = themeManagerCreatedBeforeFileDeleted
+            .getActiveTheme()
+            .getAdditionalStylesheet()
+            .map(StyleSheet::getWebEngineStylesheet);
         assertTrue(
             cssLocationAfterDeletion.isPresent(),
             "expected custom theme location to be available"
@@ -128,14 +119,10 @@ public void customThemeAvailableEvenWhenDeleted() throws IOException {
      */
     @Disabled
     @Test
-    public void customThemeBecomesAvailableAfterFileIsCreated()
-        throws IOException {
+    public void customThemeBecomesAvailableAfterFileIsCreated() throws IOException {
         Path testCss = tempFolder.resolve("test.css");
-        WorkspacePreferences workspacePreferences = mock(
-            WorkspacePreferences.class
-        );
-        when(workspacePreferences.getTheme())
-            .thenReturn(new Theme(testCss.toString()));
+        WorkspacePreferences workspacePreferences = mock(WorkspacePreferences.class);
+        when(workspacePreferences.getTheme()).thenReturn(new Theme(testCss.toString()));
 
         // ActiveTheme should provide no additionalStylesheet when no file exists
         ThemeManager themeManagerCreatedBeforeFileExists = new ThemeManager(
@@ -145,20 +132,17 @@ public void customThemeBecomesAvailableAfterFileIsCreated()
         );
         assertEquals(
             Optional.empty(),
-            themeManagerCreatedBeforeFileExists
-                .getActiveTheme()
-                .getAdditionalStylesheet(),
+            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);
+        Optional<String> cssLocationAfterFileCreated = themeManagerCreatedBeforeFileExists
+            .getActiveTheme()
+            .getAdditionalStylesheet()
+            .map(StyleSheet::getWebEngineStylesheet);
         assertTrue(
             cssLocationAfterFileCreated.isPresent(),
             "expected custom theme location to be available"
@@ -173,22 +157,16 @@ public void largeCustomThemeNotHeldInMemory() throws IOException {
         Path largeCssTestFile = tempFolder.resolve("test.css");
         Files.createFile(largeCssTestFile);
         Files.writeString(largeCssTestFile, "/* ", StandardOpenOption.CREATE);
-        final String testString =
-            "ALL WORK AND NO PLAY MAKES JACK A DULL BOY\n";
+        final String testString = "ALL WORK AND NO PLAY MAKES JACK A DULL BOY\n";
         for (int i = 0; i <= (48000 / testString.length()); i++) {
-            Files.writeString(
-                largeCssTestFile,
-                testString,
-                StandardOpenOption.APPEND
-            );
+            Files.writeString(largeCssTestFile, testString, StandardOpenOption.APPEND);
         }
         Files.writeString(largeCssTestFile, " */", StandardOpenOption.APPEND);
         WorkspacePreferences workspacePreferences = mock(
             WorkspacePreferences.class,
             Answers.RETURNS_DEEP_STUBS
         );
-        when(workspacePreferences.getTheme())
-            .thenReturn(new Theme(largeCssTestFile.toString()));
+        when(workspacePreferences.getTheme()).thenReturn(new Theme(largeCssTestFile.toString()));
 
         // ActiveTheme should provide the large additionalStylesheet that was created before
         ThemeManager themeManager = new ThemeManager(
@@ -209,26 +187,16 @@ public void largeCustomThemeNotHeldInMemory() throws IOException {
             "expected large custom theme to be a file"
         );
 
-        Files.move(
-            largeCssTestFile,
-            largeCssTestFile.resolveSibling("renamed.css")
-        );
+        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(),
+            themeManager.getActiveTheme().getAdditionalStylesheet().get().getWebEngineStylesheet(),
             "",
             "didn't expect additional stylesheet after css was deleted"
         );
 
-        Files.move(
-            largeCssTestFile.resolveSibling("renamed.css"),
-            largeCssTestFile
-        );
+        Files.move(largeCssTestFile.resolveSibling("renamed.css"), largeCssTestFile);
 
         // Check that it is available once more, if the file is restored
         Optional<String> cssLocationAfterFileIsRestored = themeManager
@@ -248,8 +216,7 @@ public void largeCustomThemeNotHeldInMemory() throws IOException {
     @Test
     public void installThemeOnScene() throws IOException {
         Scene scene = mock(Scene.class);
-        when(scene.getStylesheets())
-            .thenReturn(FXCollections.observableArrayList());
+        when(scene.getStylesheets()).thenReturn(FXCollections.observableArrayList());
         when(scene.getRoot()).thenReturn(mock(Parent.class));
 
         Path testCss = tempFolder.resolve("reload.css");
@@ -258,8 +225,7 @@ public void installThemeOnScene() throws IOException {
             WorkspacePreferences.class,
             Answers.RETURNS_DEEP_STUBS
         );
-        when(workspacePreferences.getTheme())
-            .thenReturn(new Theme(testCss.toString()));
+        when(workspacePreferences.getTheme()).thenReturn(new Theme(testCss.toString()));
 
         ThemeManager themeManager = new ThemeManager(
             workspacePreferences,
@@ -270,11 +236,7 @@ public void installThemeOnScene() throws IOException {
         themeManager.installCss(scene);
 
         assertEquals(2, scene.getStylesheets().size());
-        assertTrue(
-            scene
-                .getStylesheets()
-                .contains(testCss.toUri().toURL().toExternalForm())
-        );
+        assertTrue(scene.getStylesheets().contains(testCss.toUri().toURL().toExternalForm()));
     }
 
     @Test
@@ -285,8 +247,7 @@ public void installThemeOnWebEngine() throws IOException {
             WorkspacePreferences.class,
             Answers.RETURNS_DEEP_STUBS
         );
-        when(workspacePreferences.getTheme())
-            .thenReturn(new Theme(testCss.toString()));
+        when(workspacePreferences.getTheme()).thenReturn(new Theme(testCss.toString()));
 
         ThemeManager themeManager = new ThemeManager(
             workspacePreferences,
@@ -294,16 +255,13 @@ public void installThemeOnWebEngine() throws IOException {
             Runnable::run
         );
 
-        CompletableFuture<String> webEngineStyleSheetLocation =
-            new CompletableFuture<>();
+        CompletableFuture<String> webEngineStyleSheetLocation = new CompletableFuture<>();
 
         Platform.runLater(() -> {
             WebEngine webEngine = new WebEngine();
             themeManager.installCss(webEngine);
 
-            webEngineStyleSheetLocation.complete(
-                webEngine.getUserStyleSheetLocation()
-            );
+            webEngineStyleSheetLocation.complete(webEngine.getUserStyleSheetLocation());
         });
 
         Assertions.assertDoesNotThrow(() -> {
@@ -316,37 +274,28 @@ public void installThemeOnWebEngine() throws IOException {
      * for the thread to start up and the changed css to reload.
      */
     @Test
-    public void liveReloadCssDataUrl()
-        throws IOException, InterruptedException {
+    public 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
         );
-        when(workspacePreferences.getTheme())
-            .thenReturn(new Theme(testCss.toString()));
+        when(workspacePreferences.getTheme()).thenReturn(new Theme(testCss.toString()));
 
         final ThemeManager themeManager;
 
-        DefaultFileUpdateMonitor fileUpdateMonitor =
-            new DefaultFileUpdateMonitor();
+        DefaultFileUpdateMonitor fileUpdateMonitor = new DefaultFileUpdateMonitor();
         Thread thread = new Thread(fileUpdateMonitor);
         thread.start();
 
         // Wait for the watch service to start
         Thread.sleep(500);
 
-        themeManager =
-            new ThemeManager(
-                workspacePreferences,
-                fileUpdateMonitor,
-                Runnable::run
-            );
+        themeManager = new ThemeManager(workspacePreferences, fileUpdateMonitor, Runnable::run);
 
         Scene scene = mock(Scene.class);
-        when(scene.getStylesheets())
-            .thenReturn(FXCollections.observableArrayList());
+        when(scene.getStylesheets()).thenReturn(FXCollections.observableArrayList());
         when(scene.getRoot()).thenReturn(mock(Parent.class));
 
         themeManager.installCss(scene);
@@ -371,10 +320,7 @@ public void liveReloadCssDataUrl()
             .getActiveTheme()
             .getAdditionalStylesheet()
             .map(StyleSheet::getWebEngineStylesheet);
-        assertTrue(
-            testCssLocation2.isPresent(),
-            "expected custom theme location to be available"
-        );
+        assertTrue(testCssLocation2.isPresent(), "expected custom theme location to be available");
         assertEquals(
             "data:text/css;charset=utf-8;base64,LyogQW5kIG5vdyBmb3Igc29tZXRoaW5nIHNsaWdodGx5IGRpZmZlcmVudCAqLwouY29kZS1hcmVhIC50ZXh0IHsKICAgIC1meC1mb250LWZhbWlseTogc2VyaWY7Cn0=",
             testCssLocation2.get(),
diff --git a/src/test/java/org/jabref/gui/theme/ThemeTest.java b/src/test/java/org/jabref/gui/theme/ThemeTest.java
index 6830defac32..2051f0edbce 100644
--- a/src/test/java/org/jabref/gui/theme/ThemeTest.java
+++ b/src/test/java/org/jabref/gui/theme/ThemeTest.java
@@ -40,12 +40,7 @@ public void darkThemeUsedWhenPathIsDarkCss() {
         assertTrue(theme.getAdditionalStylesheet().isPresent());
         assertEquals(
             "Dark.css",
-            theme
-                .getAdditionalStylesheet()
-                .get()
-                .getWatchPath()
-                .getFileName()
-                .toString(),
+            theme.getAdditionalStylesheet().get().getWatchPath().getFileName().toString(),
             "expected dark theme stylesheet to be available"
         );
     }
@@ -82,12 +77,7 @@ public void customThemeIfFileNotFound() {
         assertTrue(theme.getAdditionalStylesheet().isPresent());
         assertEquals(
             "Idonotexist.css",
-            theme
-                .getAdditionalStylesheet()
-                .get()
-                .getWatchPath()
-                .getFileName()
-                .toString()
+            theme.getAdditionalStylesheet().get().getWatchPath().getFileName().toString()
         );
     }
 }
diff --git a/src/test/java/org/jabref/gui/util/FileDialogConfigurationTest.java b/src/test/java/org/jabref/gui/util/FileDialogConfigurationTest.java
index 55dbf8fc69b..c73ec50fa26 100644
--- a/src/test/java/org/jabref/gui/util/FileDialogConfigurationTest.java
+++ b/src/test/java/org/jabref/gui/util/FileDialogConfigurationTest.java
@@ -18,10 +18,9 @@ class FileDialogConfigurationTest {
     void testWithValidDirectoryString(@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)),
@@ -31,63 +30,46 @@ void testWithValidDirectoryString(@TempDir Path folder) {
 
     @Test
     void testWithValidDirectoryPath(@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()
-        );
+        assertEquals(Optional.of(tempFolder), fileDialogConfiguration.getInitialDirectory());
     }
 
     @Test
     void testWithNullStringDirectory() {
-        FileDialogConfiguration fileDialogConfiguration =
-            new FileDialogConfiguration.Builder()
-                .withInitialDirectory((String) null)
-                .build();
+        FileDialogConfiguration fileDialogConfiguration = new FileDialogConfiguration.Builder()
+            .withInitialDirectory((String) null)
+            .build();
 
-        assertEquals(
-            Optional.empty(),
-            fileDialogConfiguration.getInitialDirectory()
-        );
+        assertEquals(Optional.empty(), fileDialogConfiguration.getInitialDirectory());
     }
 
     @Test
     void testWithNullPathDirectory() {
-        FileDialogConfiguration fileDialogConfiguration =
-            new FileDialogConfiguration.Builder()
-                .withInitialDirectory((Path) null)
-                .build();
+        FileDialogConfiguration fileDialogConfiguration = new FileDialogConfiguration.Builder()
+            .withInitialDirectory((Path) null)
+            .build();
 
-        assertEquals(
-            Optional.empty(),
-            fileDialogConfiguration.getInitialDirectory()
-        );
+        assertEquals(Optional.empty(), fileDialogConfiguration.getInitialDirectory());
     }
 
     @Test
     void testWithNonExistingDirectoryAndParentNull() {
         String tempFolder = "workingDirectory";
-        FileDialogConfiguration fileDialogConfiguration =
-            new FileDialogConfiguration.Builder()
-                .withInitialDirectory(tempFolder)
-                .build();
+        FileDialogConfiguration fileDialogConfiguration = new FileDialogConfiguration.Builder()
+            .withInitialDirectory(tempFolder)
+            .build();
 
-        assertEquals(
-            Optional.empty(),
-            fileDialogConfiguration.getInitialDirectory()
-        );
+        assertEquals(Optional.empty(), fileDialogConfiguration.getInitialDirectory());
     }
 
     @Test
     void testSingleExtension() {
-        FileDialogConfiguration fileDialogConfiguration =
-            new FileDialogConfiguration.Builder()
-                .withDefaultExtension(StandardFileType.BIBTEX_DB)
-                .build();
+        FileDialogConfiguration fileDialogConfiguration = new FileDialogConfiguration.Builder()
+            .withDefaultExtension(StandardFileType.BIBTEX_DB)
+            .build();
 
         FileChooser.ExtensionFilter filter = toFilter(
             String.format("%1s %2s", "BibTex", Localization.lang("Library")),
@@ -100,10 +82,7 @@ void testSingleExtension() {
         );
     }
 
-    private FileChooser.ExtensionFilter toFilter(
-        String description,
-        FileType extension
-    ) {
+    private FileChooser.ExtensionFilter toFilter(String description, FileType extension) {
         return new FileChooser.ExtensionFilter(
             description,
             extension
diff --git a/src/test/java/org/jabref/gui/util/OpenConsoleActionTest.java b/src/test/java/org/jabref/gui/util/OpenConsoleActionTest.java
index c116842a016..d74184a3f69 100644
--- a/src/test/java/org/jabref/gui/util/OpenConsoleActionTest.java
+++ b/src/test/java/org/jabref/gui/util/OpenConsoleActionTest.java
@@ -17,26 +17,19 @@
 public class OpenConsoleActionTest {
 
     private final StateManager stateManager = mock(StateManager.class);
-    private final PreferencesService preferences = mock(
-        PreferencesService.class
-    );
+    private final PreferencesService preferences = mock(PreferencesService.class);
     private final BibDatabaseContext current = mock(BibDatabaseContext.class);
     private final BibDatabaseContext other = mock(BibDatabaseContext.class);
 
     @BeforeEach
     public void setup() {
-        when(stateManager.activeDatabaseProperty())
-            .thenReturn(OptionalObjectProperty.empty());
+        when(stateManager.activeDatabaseProperty()).thenReturn(OptionalObjectProperty.empty());
         when(stateManager.getActiveDatabase()).thenReturn(Optional.of(current));
     }
 
     @Test
     public void newActionGetsCurrentDatabase() {
-        OpenConsoleAction action = new OpenConsoleAction(
-            stateManager,
-            preferences,
-            null
-        );
+        OpenConsoleAction action = new OpenConsoleAction(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 bd44b3c6bed..de2817935ad 100644
--- a/src/test/java/org/jabref/gui/util/RecursiveTreeItemTest.java
+++ b/src/test/java/org/jabref/gui/util/RecursiveTreeItemTest.java
@@ -17,9 +17,7 @@ class RecursiveTreeItemTest {
 
     private RecursiveTreeItem<TreeNodeTestData.TreeNodeMock> rootTreeItem;
     private TreeNodeTestData.TreeNodeMock root;
-    private ObjectProperty<
-        Predicate<TreeNodeTestData.TreeNodeMock>
-    > filterPredicate;
+    private ObjectProperty<Predicate<TreeNodeTestData.TreeNodeMock>> filterPredicate;
     private TreeNodeTestData.TreeNodeMock node;
 
     @BeforeEach
@@ -30,23 +28,14 @@ void setUp() throws Exception {
 
         filterPredicate = new SimpleObjectProperty<>();
 
-        rootTreeItem =
-            new RecursiveTreeItem<>(
-                root,
-                TreeNode::getChildren,
-                filterPredicate
-            );
+        rootTreeItem = new RecursiveTreeItem<>(root, TreeNode::getChildren, filterPredicate);
     }
 
     @Test
     void addsAllChildrenNodes() throws Exception {
         assertEquals(
             root.getChildren(),
-            rootTreeItem
-                .getChildren()
-                .stream()
-                .map(TreeItem::getValue)
-                .collect(Collectors.toList())
+            rootTreeItem.getChildren().stream().map(TreeItem::getValue).collect(Collectors.toList())
         );
     }
 
@@ -70,11 +59,7 @@ void respectsFilter() throws Exception {
 
         assertEquals(
             Collections.singletonList(node.getParent().get()),
-            rootTreeItem
-                .getChildren()
-                .stream()
-                .map(TreeItem::getValue)
-                .collect(Collectors.toList())
+            rootTreeItem.getChildren().stream().map(TreeItem::getValue).collect(Collectors.toList())
         );
         assertEquals(
             Collections.singletonList(node),
diff --git a/src/test/java/org/jabref/gui/util/TooltipTextUtilTest.java b/src/test/java/org/jabref/gui/util/TooltipTextUtilTest.java
index 6747a28e054..e50496f2719 100644
--- a/src/test/java/org/jabref/gui/util/TooltipTextUtilTest.java
+++ b/src/test/java/org/jabref/gui/util/TooltipTextUtilTest.java
@@ -15,10 +15,7 @@ public class TooltipTextUtilTest {
 
     @Test
     public void retrieveCorrectTextStyleNormal() {
-        Text text = TooltipTextUtil.createText(
-            testText,
-            TooltipTextUtil.TextType.NORMAL
-        );
+        Text text = TooltipTextUtil.createText(testText, TooltipTextUtil.TextType.NORMAL);
         String textStyle = "Regular";
 
         assertEquals(textStyle, text.getFont().getStyle());
@@ -26,20 +23,14 @@ public void retrieveCorrectTextStyleNormal() {
 
     @Test
     public void stringRemainsTheSameAfterTransformationToNormal() {
-        Text text = TooltipTextUtil.createText(
-            testText,
-            TooltipTextUtil.TextType.NORMAL
-        );
+        Text text = TooltipTextUtil.createText(testText, TooltipTextUtil.TextType.NORMAL);
 
         assertEquals(testText, text.getText());
     }
 
     @Test
     public void retrieveCorrectTextStyleBold() {
-        Text text = TooltipTextUtil.createText(
-            testText,
-            TooltipTextUtil.TextType.BOLD
-        );
+        Text text = TooltipTextUtil.createText(testText, TooltipTextUtil.TextType.BOLD);
         String textStyle = "tooltip-text-bold";
 
         assertEquals(textStyle, text.getStyleClass().toString());
@@ -47,20 +38,14 @@ public void retrieveCorrectTextStyleBold() {
 
     @Test
     public void stringRemainsTheSameAfterTransformationToBold() {
-        Text text = TooltipTextUtil.createText(
-            testText,
-            TooltipTextUtil.TextType.BOLD
-        );
+        Text text = TooltipTextUtil.createText(testText, TooltipTextUtil.TextType.BOLD);
 
         assertEquals(testText, text.getText());
     }
 
     @Test
     public void retrieveCorrectTextStyleItalic() {
-        Text text = TooltipTextUtil.createText(
-            testText,
-            TooltipTextUtil.TextType.ITALIC
-        );
+        Text text = TooltipTextUtil.createText(testText, TooltipTextUtil.TextType.ITALIC);
         String textStyle = "tooltip-text-italic";
 
         assertEquals(textStyle, text.getStyleClass().toString());
@@ -68,33 +53,21 @@ public void retrieveCorrectTextStyleItalic() {
 
     @Test
     public void stringRemainsTheSameAfterTransformationToItalic() {
-        Text text = TooltipTextUtil.createText(
-            testText,
-            TooltipTextUtil.TextType.ITALIC
-        );
+        Text text = TooltipTextUtil.createText(testText, TooltipTextUtil.TextType.ITALIC);
 
         assertEquals(testText, text.getText());
     }
 
     @Test
     public void testCreateTextMonospaced() {
-        Text text = TooltipTextUtil.createText(
-            testText,
-            TooltipTextUtil.TextType.MONOSPACED
-        );
-        assertEquals(
-            "tooltip-text-monospaced",
-            text.getStyleClass().toString()
-        );
+        Text text = TooltipTextUtil.createText(testText, TooltipTextUtil.TextType.MONOSPACED);
+        assertEquals("tooltip-text-monospaced", text.getStyleClass().toString());
         assertEquals(testText, text.getText());
     }
 
     @Test
     public void retrieveCorrectStyleMonospaced() {
-        Text text = TooltipTextUtil.createText(
-            testText,
-            TooltipTextUtil.TextType.MONOSPACED
-        );
+        Text text = TooltipTextUtil.createText(testText, TooltipTextUtil.TextType.MONOSPACED);
         String textStyle = "tooltip-text-monospaced";
 
         assertEquals(textStyle, text.getStyleClass().toString());
@@ -102,20 +75,14 @@ public void retrieveCorrectStyleMonospaced() {
 
     @Test
     public void stringRemainsTheSameAfterTransformationToMonospaced() {
-        Text text = TooltipTextUtil.createText(
-            testText,
-            TooltipTextUtil.TextType.MONOSPACED
-        );
+        Text text = TooltipTextUtil.createText(testText, TooltipTextUtil.TextType.MONOSPACED);
 
         assertEquals(testText, text.getText());
     }
 
     @Test
     public void transformTextToHtmlStringBold() {
-        Text text = TooltipTextUtil.createText(
-            testText,
-            TooltipTextUtil.TextType.BOLD
-        );
+        Text text = TooltipTextUtil.createText(testText, TooltipTextUtil.TextType.BOLD);
         String htmlString = TooltipTextUtil.textToHtmlString(text);
         String expectedString = "<b>" + testText + "</b>";
 
@@ -124,10 +91,7 @@ public void transformTextToHtmlStringBold() {
 
     @Test
     public void transformTextToHtmlStringItalic() {
-        Text text = TooltipTextUtil.createText(
-            testText,
-            TooltipTextUtil.TextType.ITALIC
-        );
+        Text text = TooltipTextUtil.createText(testText, TooltipTextUtil.TextType.ITALIC);
         String htmlString = TooltipTextUtil.textToHtmlString(text);
         String expectedString = "<i>" + testText + "</i>";
 
@@ -136,10 +100,7 @@ public void transformTextToHtmlStringItalic() {
 
     @Test
     public void transformTextToHtmlStringMonospaced() {
-        Text text = TooltipTextUtil.createText(
-            testText,
-            TooltipTextUtil.TextType.MONOSPACED
-        );
+        Text text = TooltipTextUtil.createText(testText, TooltipTextUtil.TextType.MONOSPACED);
         String htmlString = TooltipTextUtil.textToHtmlString(text);
         String expectedString = "<tt>" + testText + "</tt>";
 
@@ -148,10 +109,7 @@ public void transformTextToHtmlStringMonospaced() {
 
     @Test
     public void transformTextToHtmlStringMonospacedBold() {
-        Text text = TooltipTextUtil.createText(
-            testText,
-            TooltipTextUtil.TextType.MONOSPACED
-        );
+        Text text = TooltipTextUtil.createText(testText, TooltipTextUtil.TextType.MONOSPACED);
         text.getStyleClass().add("tooltip-text-bold");
         String htmlString = TooltipTextUtil.textToHtmlString(text);
         String expectedString = "<b><tt>" + testText + "</tt></b>";
@@ -162,10 +120,7 @@ public void transformTextToHtmlStringMonospacedBold() {
     @Test
     public void transformTextToHtmlStringWithLinebreaks() {
         String testText = "this\nis a\ntest text";
-        Text text = TooltipTextUtil.createText(
-            testText,
-            TooltipTextUtil.TextType.NORMAL
-        );
+        Text text = TooltipTextUtil.createText(testText, TooltipTextUtil.TextType.NORMAL);
         String htmlString = TooltipTextUtil.textToHtmlString(text);
         String expectedString = "this<br>is a<br>test text";
 
@@ -185,10 +140,7 @@ public void formatToTextsNoReplacements() {
         List<Text> textList = TooltipTextUtil.formatToTexts(test);
 
         assertTrue(
-            TextFlowEqualityHelper.checkIfTextsEqualsExpectedTexts(
-                expectedTextList,
-                textList
-            )
+            TextFlowEqualityHelper.checkIfTextsEqualsExpectedTexts(expectedTextList, textList)
         );
     }
 
@@ -201,10 +153,7 @@ public void formatToTextsEnd() {
             )
         );
         expectedTextList.add(
-            TooltipTextUtil.createText(
-                "replacing text",
-                TooltipTextUtil.TextType.BOLD
-            )
+            TooltipTextUtil.createText("replacing text", TooltipTextUtil.TextType.BOLD)
         );
         String test =
             "This search contains entries in which any field contains the regular expression <b>%0</b>";
@@ -218,10 +167,7 @@ public void formatToTextsEnd() {
         );
 
         assertTrue(
-            TextFlowEqualityHelper.checkIfTextsEqualsExpectedTexts(
-                expectedTextList,
-                textList
-            )
+            TextFlowEqualityHelper.checkIfTextsEqualsExpectedTexts(expectedTextList, textList)
         );
     }
 
@@ -229,10 +175,7 @@ public void formatToTextsEnd() {
     public void formatToTextsBegin() {
         List<Text> expectedTextList = new ArrayList<>();
         expectedTextList.add(
-            TooltipTextUtil.createText(
-                "replacing text",
-                TooltipTextUtil.TextType.BOLD
-            )
+            TooltipTextUtil.createText("replacing text", TooltipTextUtil.TextType.BOLD)
         );
         expectedTextList.add(
             TooltipTextUtil.createText(
@@ -251,29 +194,19 @@ public void formatToTextsBegin() {
         );
 
         assertTrue(
-            TextFlowEqualityHelper.checkIfTextsEqualsExpectedTexts(
-                expectedTextList,
-                textList
-            )
+            TextFlowEqualityHelper.checkIfTextsEqualsExpectedTexts(expectedTextList, textList)
         );
     }
 
     @Test
     public void formatToTextsMiddle() {
         List<Text> expectedTextList = new ArrayList<>();
+        expectedTextList.add(TooltipTextUtil.createText("This search contains entries "));
         expectedTextList.add(
-            TooltipTextUtil.createText("This search contains entries ")
+            TooltipTextUtil.createText("replacing text", TooltipTextUtil.TextType.BOLD)
         );
         expectedTextList.add(
-            TooltipTextUtil.createText(
-                "replacing text",
-                TooltipTextUtil.TextType.BOLD
-            )
-        );
-        expectedTextList.add(
-            TooltipTextUtil.createText(
-                " in which any field contains the regular expression"
-            )
+            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";
@@ -287,10 +220,7 @@ public void formatToTextsMiddle() {
         );
 
         assertTrue(
-            TextFlowEqualityHelper.checkIfTextsEqualsExpectedTexts(
-                expectedTextList,
-                textList
-            )
+            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 eb6bdbf1141..ec65246cf67 100644
--- a/src/test/java/org/jabref/gui/util/comparator/NumericFieldComparatorTest.java
+++ b/src/test/java/org/jabref/gui/util/comparator/NumericFieldComparatorTest.java
@@ -6,8 +6,7 @@
 
 public class NumericFieldComparatorTest {
 
-    private final NumericFieldComparator comparator =
-        new NumericFieldComparator();
+    private final NumericFieldComparator comparator = new NumericFieldComparator();
 
     @Test
     public void compareTwoNumericInputs() {
diff --git a/src/test/java/org/jabref/http/server/LibrariesResourceTest.java b/src/test/java/org/jabref/http/server/LibrariesResourceTest.java
index cb3f0b7c509..73a74964229 100644
--- a/src/test/java/org/jabref/http/server/LibrariesResourceTest.java
+++ b/src/test/java/org/jabref/http/server/LibrariesResourceTest.java
@@ -12,9 +12,7 @@ class LibrariesResourceTest extends ServerTest {
 
     @Override
     protected Application configure() {
-        ResourceConfig resourceConfig = new ResourceConfig(
-            LibrariesResource.class
-        );
+        ResourceConfig resourceConfig = new ResourceConfig(LibrariesResource.class);
         addPreferencesToResourceConfig(resourceConfig);
         return resourceConfig.getApplication();
     }
@@ -39,9 +37,6 @@ void twoTestLibraries() {
             .stream()
             .map(file -> file.id)
             .collect(Collectors.joining("\",\"", "[\"", "\"]"));
-        assertEquals(
-            expected,
-            target("/libraries").request().get(String.class)
-        );
+        assertEquals(expected, target("/libraries").request().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 835fa5cadae..7ef8de01c3e 100644
--- a/src/test/java/org/jabref/http/server/ServerTest.java
+++ b/src/test/java/org/jabref/http/server/ServerTest.java
@@ -53,16 +53,12 @@ protected void configure() {
         );
     }
 
-    protected void addPreferencesToResourceConfig(
-        ResourceConfig resourceConfig
-    ) {
+    protected void addPreferencesToResourceConfig(ResourceConfig resourceConfig) {
         resourceConfig.register(
             new AbstractBinder() {
                 @Override
                 protected void configure() {
-                    bind(preferencesService)
-                        .to(PreferencesService.class)
-                        .ranked(2);
+                    bind(preferencesService).to(PreferencesService.class).ranked(2);
                 }
             }
         );
@@ -72,10 +68,7 @@ protected void setAvailableLibraries(EnumSet<TestBibFile> files) {
         when(guiPreferences.getLastFilesOpened())
             .thenReturn(
                 FXCollections.observableArrayList(
-                    files
-                        .stream()
-                        .map(file -> file.path.toString())
-                        .collect(Collectors.toList())
+                    files.stream().map(file -> file.path.toString()).collect(Collectors.toList())
                 )
             );
     }
@@ -83,27 +76,23 @@ protected void setAvailableLibraries(EnumSet<TestBibFile> files) {
     private static void initializePreferencesService() {
         preferencesService = mock(PreferencesService.class);
 
-        ImportFormatPreferences importFormatPreferences = mock(
-            ImportFormatPreferences.class
-        );
-        when(preferencesService.getImportFormatPreferences())
-            .thenReturn(importFormatPreferences);
+        ImportFormatPreferences importFormatPreferences = mock(ImportFormatPreferences.class);
+        when(preferencesService.getImportFormatPreferences()).thenReturn(importFormatPreferences);
 
-        BibEntryPreferences bibEntryPreferences = mock(
-            BibEntryPreferences.class
-        );
-        when(importFormatPreferences.bibEntryPreferences())
-            .thenReturn(bibEntryPreferences);
+        BibEntryPreferences bibEntryPreferences = mock(BibEntryPreferences.class);
+        when(importFormatPreferences.bibEntryPreferences()).thenReturn(bibEntryPreferences);
         when(bibEntryPreferences.getKeywordSeparator()).thenReturn(',');
 
         FieldPreferences fieldWriterPreferences = mock(FieldPreferences.class);
-        when(preferencesService.getFieldPreferences())
-            .thenReturn(fieldWriterPreferences);
+        when(preferencesService.getFieldPreferences()).thenReturn(fieldWriterPreferences);
         when(fieldWriterPreferences.shouldResolveStrings()).thenReturn(false);
 
         // defaults are in {@link org.jabref.preferences.JabRefPreferences.NON_WRAPPABLE_FIELDS}
-        FieldPreferences fieldContentFormatterPreferences =
-            new FieldPreferences(false, List.of(), List.of());
+        FieldPreferences fieldContentFormatterPreferences = new FieldPreferences(
+            false,
+            List.of(),
+            List.of()
+        );
         // used twice, once for reading and once for writing
         when(importFormatPreferences.fieldPreferences())
             .thenReturn(fieldContentFormatterPreferences);
@@ -113,9 +102,7 @@ private static void initializePreferencesService() {
 
         when(guiPreferences.getLastFilesOpened())
             .thenReturn(
-                FXCollections.observableArrayList(
-                    TestBibFile.GENERAL_SERVER_TEST.path.toString()
-                )
+                FXCollections.observableArrayList(TestBibFile.GENERAL_SERVER_TEST.path.toString())
             );
     }
 }
diff --git a/src/test/java/org/jabref/http/server/TestBibFile.java b/src/test/java/org/jabref/http/server/TestBibFile.java
index 2906ea38493..97ec99b4c56 100644
--- a/src/test/java/org/jabref/http/server/TestBibFile.java
+++ b/src/test/java/org/jabref/http/server/TestBibFile.java
@@ -4,9 +4,7 @@
 import org.jabref.logic.util.io.BackupFileUtil;
 
 public enum TestBibFile {
-    GENERAL_SERVER_TEST(
-        "src/test/resources/org/jabref/http/server/general-server-test.bib"
-    ),
+    GENERAL_SERVER_TEST("src/test/resources/org/jabref/http/server/general-server-test.bib"),
     JABREF_AUTHORS("src/test/resources/testbib/jabref-authors.bib");
 
     public final Path path;
@@ -14,7 +12,6 @@ public enum TestBibFile {
 
     TestBibFile(String locationInSource) {
         this.path = Path.of(locationInSource).toAbsolutePath();
-        this.id =
-            path.getFileName() + "-" + BackupFileUtil.getUniqueFilePrefix(path);
+        this.id = path.getFileName() + "-" + BackupFileUtil.getUniqueFilePrefix(path);
     }
 }
diff --git a/src/test/java/org/jabref/logic/auxparser/AuxParserTest.java b/src/test/java/org/jabref/logic/auxparser/AuxParserTest.java
index 74a99e0c018..aa0b97ab544 100644
--- a/src/test/java/org/jabref/logic/auxparser/AuxParserTest.java
+++ b/src/test/java/org/jabref/logic/auxparser/AuxParserTest.java
@@ -29,8 +29,7 @@ class AuxParserTest {
 
     @BeforeEach
     void setUp() {
-        importFormatPreferences =
-            mock(ImportFormatPreferences.class, Answers.RETURNS_DEEP_STUBS);
+        importFormatPreferences = mock(ImportFormatPreferences.class, Answers.RETURNS_DEEP_STUBS);
     }
 
     @AfterEach
@@ -40,19 +39,15 @@ void tearDown() {
 
     @Test
     void testNormal() throws URISyntaxException, IOException {
-        InputStream originalStream =
-            AuxParserTest.class.getResourceAsStream("origin.bib");
-        Path auxFile = Path.of(
-            AuxParserTest.class.getResource("paper.aux").toURI()
-        );
+        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
             )
         ) {
-            ParserResult result = new BibtexParser(importFormatPreferences)
-                .parse(originalReader);
+            ParserResult result = new BibtexParser(importFormatPreferences).parse(originalReader);
 
             AuxParser auxParser = new DefaultAuxParser(result.getDatabase());
             AuxParserResult auxResult = auxParser.parse(auxFile);
@@ -67,10 +62,8 @@ void testNormal() throws URISyntaxException, IOException {
             assertEquals(2, auxResult.getResolvedKeysCount());
             assertEquals(2, auxResult.getFoundKeysInAux());
             assertEquals(
-                auxResult.getFoundKeysInAux() +
-                auxResult.getCrossRefEntriesCount(),
-                auxResult.getResolvedKeysCount() +
-                auxResult.getUnresolvedKeysCount()
+                auxResult.getFoundKeysInAux() + auxResult.getCrossRefEntriesCount(),
+                auxResult.getResolvedKeysCount() + auxResult.getUnresolvedKeysCount()
             );
             assertEquals(0, auxResult.getCrossRefEntriesCount());
         }
@@ -80,19 +73,15 @@ void testNormal() throws URISyntaxException, IOException {
     void testTwoArgMacro() throws URISyntaxException, IOException {
         // Result should be identical to that of testNormal
 
-        InputStream originalStream =
-            AuxParserTest.class.getResourceAsStream("origin.bib");
-        Path auxFile = Path.of(
-            AuxParserTest.class.getResource("papertwoargmacro.aux").toURI()
-        );
+        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
             )
         ) {
-            ParserResult result = new BibtexParser(importFormatPreferences)
-                .parse(originalReader);
+            ParserResult result = new BibtexParser(importFormatPreferences).parse(originalReader);
 
             AuxParser auxParser = new DefaultAuxParser(result.getDatabase());
             AuxParserResult auxResult = auxParser.parse(auxFile);
@@ -107,10 +96,8 @@ void testTwoArgMacro() throws URISyntaxException, IOException {
             assertEquals(2, auxResult.getResolvedKeysCount());
             assertEquals(2, auxResult.getFoundKeysInAux());
             assertEquals(
-                auxResult.getFoundKeysInAux() +
-                auxResult.getCrossRefEntriesCount(),
-                auxResult.getResolvedKeysCount() +
-                auxResult.getUnresolvedKeysCount()
+                auxResult.getFoundKeysInAux() + auxResult.getCrossRefEntriesCount(),
+                auxResult.getResolvedKeysCount() + auxResult.getUnresolvedKeysCount()
             );
             assertEquals(0, auxResult.getCrossRefEntriesCount());
         }
@@ -118,19 +105,15 @@ void testTwoArgMacro() throws URISyntaxException, IOException {
 
     @Test
     void testNotAllFound() throws URISyntaxException, IOException {
-        InputStream originalStream =
-            AuxParserTest.class.getResourceAsStream("origin.bib");
-        Path auxFile = Path.of(
-            AuxParserTest.class.getResource("badpaper.aux").toURI()
-        );
+        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
             )
         ) {
-            ParserResult result = new BibtexParser(importFormatPreferences)
-                .parse(originalReader);
+            ParserResult result = new BibtexParser(importFormatPreferences).parse(originalReader);
 
             AuxParser auxParser = new DefaultAuxParser(result.getDatabase());
             AuxParserResult auxResult = auxParser.parse(auxFile);
@@ -142,59 +125,45 @@ void testNotAllFound() throws URISyntaxException, IOException {
             assertEquals(2, auxResult.getResolvedKeysCount());
             assertEquals(3, auxResult.getFoundKeysInAux());
             assertEquals(
-                auxResult.getFoundKeysInAux() +
-                auxResult.getCrossRefEntriesCount(),
-                auxResult.getResolvedKeysCount() +
-                auxResult.getUnresolvedKeysCount()
+                auxResult.getFoundKeysInAux() + auxResult.getCrossRefEntriesCount(),
+                auxResult.getResolvedKeysCount() + auxResult.getUnresolvedKeysCount()
             );
             assertEquals(0, auxResult.getCrossRefEntriesCount());
         }
     }
 
     @Test
-    void duplicateBibDatabaseConfiguration()
-        throws URISyntaxException, IOException {
-        InputStream originalStream =
-            AuxParserTest.class.getResourceAsStream("config.bib");
-        Path auxFile = Path.of(
-            AuxParserTest.class.getResource("paper.aux").toURI()
-        );
+    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
             )
         ) {
-            ParserResult result = new BibtexParser(importFormatPreferences)
-                .parse(originalReader);
+            ParserResult result = new BibtexParser(importFormatPreferences).parse(originalReader);
 
             AuxParser auxParser = new DefaultAuxParser(result.getDatabase());
             AuxParserResult auxResult = auxParser.parse(auxFile);
             BibDatabase db = auxResult.getGeneratedBibDatabase();
 
-            assertEquals(
-                Optional.of("\"Maintained by \" # maintainer"),
-                db.getPreamble()
-            );
+            assertEquals(Optional.of("\"Maintained by \" # maintainer"), db.getPreamble());
             assertEquals(1, db.getStringCount());
         }
     }
 
     @Test
     void testNestedAux() throws URISyntaxException, IOException {
-        InputStream originalStream =
-            AuxParserTest.class.getResourceAsStream("origin.bib");
-        Path auxFile = Path.of(
-            AuxParserTest.class.getResource("nested.aux").toURI()
-        );
+        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
             )
         ) {
-            ParserResult result = new BibtexParser(importFormatPreferences)
-                .parse(originalReader);
+            ParserResult result = new BibtexParser(importFormatPreferences).parse(originalReader);
 
             AuxParser auxParser = new DefaultAuxParser(result.getDatabase());
             AuxParserResult auxResult = auxParser.parse(auxFile);
@@ -206,10 +175,8 @@ void testNestedAux() throws URISyntaxException, IOException {
             assertEquals(2, auxResult.getResolvedKeysCount());
             assertEquals(2, auxResult.getFoundKeysInAux());
             assertEquals(
-                auxResult.getFoundKeysInAux() +
-                auxResult.getCrossRefEntriesCount(),
-                auxResult.getResolvedKeysCount() +
-                auxResult.getUnresolvedKeysCount()
+                auxResult.getFoundKeysInAux() + auxResult.getCrossRefEntriesCount(),
+                auxResult.getResolvedKeysCount() + auxResult.getUnresolvedKeysCount()
             );
             assertEquals(0, auxResult.getCrossRefEntriesCount());
         }
@@ -217,19 +184,15 @@ void testNestedAux() throws URISyntaxException, IOException {
 
     @Test
     void testCrossRef() throws URISyntaxException, IOException {
-        InputStream originalStream =
-            AuxParserTest.class.getResourceAsStream("origin.bib");
-        Path auxFile = Path.of(
-            AuxParserTest.class.getResource("crossref.aux").toURI()
-        );
+        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
             )
         ) {
-            ParserResult result = new BibtexParser(importFormatPreferences)
-                .parse(originalReader);
+            ParserResult result = new BibtexParser(importFormatPreferences).parse(originalReader);
 
             AuxParser auxParser = new DefaultAuxParser(result.getDatabase());
             AuxParserResult auxResult = auxParser.parse(auxFile);
@@ -241,10 +204,8 @@ void testCrossRef() throws URISyntaxException, IOException {
             assertEquals(3, auxResult.getResolvedKeysCount());
             assertEquals(4, auxResult.getFoundKeysInAux());
             assertEquals(
-                auxResult.getFoundKeysInAux() +
-                auxResult.getCrossRefEntriesCount(),
-                auxResult.getResolvedKeysCount() +
-                auxResult.getUnresolvedKeysCount()
+                auxResult.getFoundKeysInAux() + auxResult.getCrossRefEntriesCount(),
+                auxResult.getResolvedKeysCount() + auxResult.getUnresolvedKeysCount()
             );
             assertEquals(1, auxResult.getCrossRefEntriesCount());
         }
@@ -263,8 +224,7 @@ void testFileNotFound() {
         assertEquals(0, auxResult.getFoundKeysInAux());
         assertEquals(
             auxResult.getFoundKeysInAux() + auxResult.getCrossRefEntriesCount(),
-            auxResult.getResolvedKeysCount() +
-            auxResult.getUnresolvedKeysCount()
+            auxResult.getResolvedKeysCount() + auxResult.getUnresolvedKeysCount()
         );
         assertEquals(0, auxResult.getCrossRefEntriesCount());
     }
diff --git a/src/test/java/org/jabref/logic/bibtex/BibEntryAssert.java b/src/test/java/org/jabref/logic/bibtex/BibEntryAssert.java
index dc68f22cd35..33ce0df465a 100644
--- a/src/test/java/org/jabref/logic/bibtex/BibEntryAssert.java
+++ b/src/test/java/org/jabref/logic/bibtex/BibEntryAssert.java
@@ -31,11 +31,8 @@ public class BibEntryAssert {
      * @param resourceName the resource to read
      * @param entry        the entry to compare with
      */
-    public static void assertEquals(
-        Class<?> clazz,
-        String resourceName,
-        BibEntry entry
-    ) throws IOException {
+    public static void assertEquals(Class<?> clazz, String resourceName, BibEntry entry)
+        throws IOException {
         assertNotNull(clazz);
         assertNotNull(resourceName);
         assertNotNull(entry);
@@ -65,12 +62,9 @@ public static void assertEquals(
         }
     }
 
-    private static List<BibEntry> getListFromInputStream(InputStream is)
-        throws IOException {
+    private static List<BibEntry> getListFromInputStream(InputStream is) throws IOException {
         ParserResult result;
-        try (
-            Reader reader = new InputStreamReader(is, StandardCharsets.UTF_8)
-        ) {
+        try (Reader reader = new InputStreamReader(is, StandardCharsets.UTF_8)) {
             BibtexParser parser = new BibtexParser(
                 mock(ImportFormatPreferences.class, Answers.RETURNS_DEEP_STUBS)
             );
@@ -88,30 +82,21 @@ private static List<BibEntry> getListFromInputStream(InputStream is)
      * @param expectedInputStream the inputStream reading the entry from
      * @param actualEntries       a list containing a single entry to compare with
      */
-    public static void assertEquals(
-        InputStream expectedInputStream,
-        List<BibEntry> actualEntries
-    ) throws IOException {
+    public static void assertEquals(InputStream expectedInputStream, List<BibEntry> actualEntries)
+        throws IOException {
         assertNotNull(expectedInputStream);
         assertNotNull(actualEntries);
         // explicit reference of Assertions is needed here to disambiguate from the methods defined by this class
-        List<BibEntry> expectedEntries = getListFromInputStream(
-            expectedInputStream
-        );
+        List<BibEntry> expectedEntries = getListFromInputStream(expectedInputStream);
         Assertions.assertEquals(expectedEntries, actualEntries);
     }
 
-    public static void assertEquals(
-        List<BibEntry> expectedEntries,
-        InputStream actualInputStream
-    ) throws IOException {
+    public static void assertEquals(List<BibEntry> expectedEntries, InputStream actualInputStream)
+        throws IOException {
         assertNotNull(actualInputStream);
         assertNotNull(expectedEntries);
         // explicit reference of Assertions is needed here to disambiguate from the methods defined by this class
-        Assertions.assertEquals(
-            expectedEntries,
-            getListFromInputStream(actualInputStream)
-        );
+        Assertions.assertEquals(expectedEntries, getListFromInputStream(actualInputStream));
     }
 
     /**
@@ -121,8 +106,7 @@ public static void assertEquals(
      * @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));
     }
 
@@ -135,23 +119,13 @@ public static void assertEquals(InputStream expected, BibEntry actual)
      * @param importer     The fileformat you want to use to read the passed file to get the list of expected
      *                     BibEntries
      */
-    public static void assertEquals(
-        InputStream expectedIs,
-        Path fileToImport,
-        Importer importer
-    ) throws IOException {
-        assertEquals(
-            getListFromInputStream(expectedIs),
-            fileToImport,
-            importer
-        );
+    public static void assertEquals(InputStream expectedIs, Path fileToImport, Importer importer)
+        throws IOException {
+        assertEquals(getListFromInputStream(expectedIs), fileToImport, importer);
     }
 
-    public static void assertEquals(
-        InputStream expectedIs,
-        URL fileToImport,
-        Importer importer
-    ) throws URISyntaxException, IOException {
+    public static void assertEquals(InputStream expectedIs, URL fileToImport, Importer importer)
+        throws URISyntaxException, IOException {
         assertEquals(expectedIs, Path.of(fileToImport.toURI()), importer);
     }
 
@@ -164,11 +138,8 @@ public static void assertEquals(
      * @param importer     The fileformat you want to use to read the passed file to get the list of expected
      *                     BibEntries
      */
-    public static void assertEquals(
-        List<BibEntry> expected,
-        Path fileToImport,
-        Importer importer
-    ) throws IOException {
+    public static void assertEquals(List<BibEntry> expected, Path fileToImport, Importer importer)
+        throws IOException {
         List<BibEntry> actualEntries = importer
             .importDatabase(fileToImport)
             .getDatabase()
@@ -177,11 +148,8 @@ public static void assertEquals(
         Assertions.assertEquals(expected, actualEntries);
     }
 
-    public static void assertEquals(
-        List<BibEntry> expected,
-        URL fileToImport,
-        Importer importer
-    ) throws URISyntaxException, IOException {
+    public static void assertEquals(List<BibEntry> expected, URL fileToImport, Importer importer)
+        throws URISyntaxException, IOException {
         assertEquals(expected, Path.of(fileToImport.toURI()), importer);
     }
 }
diff --git a/src/test/java/org/jabref/logic/bibtex/BibEntryWriterTest.java b/src/test/java/org/jabref/logic/bibtex/BibEntryWriterTest.java
index 7b106dcab17..04012aae035 100644
--- a/src/test/java/org/jabref/logic/bibtex/BibEntryWriterTest.java
+++ b/src/test/java/org/jabref/logic/bibtex/BibEntryWriterTest.java
@@ -45,18 +45,14 @@ class BibEntryWriterTest {
 
     @BeforeEach
     void setUpWriter() {
-        importFormatPreferences =
-            mock(ImportFormatPreferences.class, Answers.RETURNS_DEEP_STUBS);
+        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()
-            );
+            new BibEntryWriter(new FieldWriter(fieldPreferences), new BibEntryTypesManager());
     }
 
     @Test
@@ -64,10 +60,7 @@ void testSerialization() throws IOException {
         BibEntry entry = new BibEntry(StandardEntryType.Article);
         // set a required field
         entry.setField(StandardField.AUTHOR, "Foo Bar");
-        entry.setField(
-            StandardField.JOURNAL,
-            "International Journal of Something"
-        );
+        entry.setField(StandardField.JOURNAL, "International Journal of Something");
         // set an optional field
         entry.setField(StandardField.NUMBER, "1");
         entry.setField(StandardField.NOTE, "some note");
@@ -108,11 +101,7 @@ void writeOtherTypeTest() throws Exception {
     @Test
     void writeEntryWithFile() throws Exception {
         BibEntry entry = new BibEntry(StandardEntryType.Article);
-        LinkedFile file = new LinkedFile(
-            "test",
-            Path.of("/home/uers/test.pdf"),
-            "PDF"
-        );
+        LinkedFile file = new LinkedFile("test", Path.of("/home/uers/test.pdf"), "PDF");
         entry.addFile(file);
 
         bibEntryWriter.write(entry, bibWriter, BibDatabaseMode.BIBTEX);
@@ -132,10 +121,7 @@ void writeEntryWithOrField() throws Exception {
         BibEntry entry = new BibEntry(StandardEntryType.InBook);
         // set an required OR field (author/editor)
         entry.setField(StandardField.EDITOR, "Foo Bar");
-        entry.setField(
-            StandardField.JOURNAL,
-            "International Journal of Something"
-        );
+        entry.setField(StandardField.JOURNAL, "International Journal of Something");
         // set an optional field
         entry.setField(StandardField.NUMBER, "1");
         entry.setField(StandardField.NOTE, "some note");
@@ -162,10 +148,7 @@ void writeEntryWithOrFieldBothFieldsPresent() throws Exception {
         // set an required OR field with both fields(author/editor)
         entry.setField(StandardField.AUTHOR, "Foo Thor");
         entry.setField(StandardField.EDITOR, "Edi Bar");
-        entry.setField(
-            StandardField.JOURNAL,
-            "International Journal of Something"
-        );
+        entry.setField(StandardField.JOURNAL, "International Journal of Something");
         // set an optional field
         entry.setField(StandardField.NUMBER, "1");
         entry.setField(StandardField.NOTE, "some note");
@@ -404,8 +387,7 @@ void roundTripWithModification() throws IOException {
     }
 
     @Test
-    void roundTripWithCamelCasingInTheOriginalEntryAndResultInLowerCase()
-        throws IOException {
+    void roundTripWithCamelCasingInTheOriginalEntryAndResultInLowerCase() throws IOException {
         // @formatter:off
         String bibtexEntry = """
                 @Article{test,
@@ -508,10 +490,7 @@ void roundTripWithAppendedNewlines() throws IOException {
 
         // Only one appending newline is written by the writer
         // OS.NEWLINE is used, not the given one
-        assertEquals(
-            bibtexEntry.substring(0, bibtexEntry.length() - 2) + OS.NEWLINE,
-            actual
-        );
+        assertEquals(bibtexEntry.substring(0, bibtexEntry.length() - 2) + OS.NEWLINE, actual);
     }
 
     @Test
@@ -689,8 +668,7 @@ void constantMonthApril() throws Exception {
 
     @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);
 
@@ -778,12 +756,7 @@ void doNotWriteEmptyFields() throws IOException {
         bibEntryWriter.write(entry, bibWriter, BibDatabaseMode.BIBTEX);
 
         String expected =
-            "@Article{," +
-            OS.NEWLINE +
-            "  note   = {some note}," +
-            OS.NEWLINE +
-            "}" +
-            OS.NEWLINE;
+            "@Article{," + OS.NEWLINE + "  note   = {some note}," + OS.NEWLINE + "}" + OS.NEWLINE;
 
         assertEquals(expected, stringWriter.toString());
     }
@@ -791,10 +764,7 @@ void doNotWriteEmptyFields() throws IOException {
     @Test
     void writeThrowsErrorIfFieldContainsUnbalancedBraces() {
         BibEntry entry = new BibEntry(StandardEntryType.Article);
-        entry.setField(
-            StandardField.NOTE,
-            "some text with unbalanced { braces"
-        );
+        entry.setField(StandardField.NOTE, "some text with unbalanced { braces");
 
         assertThrows(
             IOException.class,
@@ -874,10 +844,7 @@ void alphabeticSerialization() throws IOException {
         BibEntry entry = new BibEntry(StandardEntryType.Article);
         // required fields
         entry.setField(StandardField.AUTHOR, "Foo Bar");
-        entry.setField(
-            StandardField.JOURNALTITLE,
-            "International Journal of Something"
-        );
+        entry.setField(StandardField.JOURNALTITLE, "International Journal of Something");
         entry.setField(StandardField.TITLE, "Title");
         entry.setField(StandardField.DATE, "2019-10-16");
         // optional fields
@@ -988,32 +955,19 @@ static Stream<Arguments> testGetFormattedFieldNameData() {
 
     @ParameterizedTest
     @MethodSource("testGetFormattedFieldNameData")
-    void testGetFormattedFieldName(
-        String expected,
-        String fieldName,
-        int indent
-    ) {
+    void testGetFormattedFieldName(String expected, String fieldName, int indent) {
         Field field = FieldFactory.parseField(fieldName);
-        assertEquals(
-            expected,
-            BibEntryWriter.getFormattedFieldName(field, indent)
-        );
+        assertEquals(expected, BibEntryWriter.getFormattedFieldName(field, indent));
     }
 
     static Stream<Arguments> testGetLengthOfLongestFieldNameData() {
         return Stream.of(
-            Arguments.of(
-                1,
-                new BibEntry().withField(FieldFactory.parseField("t"), "t")
-            ),
+            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}"
-                    )
+                    .withField(StandardField.TITLE, "International Center of Photography}")
             )
         );
     }
@@ -1021,9 +975,6 @@ static Stream<Arguments> testGetLengthOfLongestFieldNameData() {
     @ParameterizedTest
     @MethodSource("testGetLengthOfLongestFieldNameData")
     void testGetLengthOfLongestFieldName(int expected, BibEntry entry) {
-        assertEquals(
-            expected,
-            BibEntryWriter.getLengthOfLongestFieldName(entry)
-        );
+        assertEquals(expected, BibEntryWriter.getLengthOfLongestFieldName(entry));
     }
 }
diff --git a/src/test/java/org/jabref/logic/bibtex/FieldContentFormatterTest.java b/src/test/java/org/jabref/logic/bibtex/FieldContentFormatterTest.java
index 502448ce336..3708ae55fcf 100644
--- a/src/test/java/org/jabref/logic/bibtex/FieldContentFormatterTest.java
+++ b/src/test/java/org/jabref/logic/bibtex/FieldContentFormatterTest.java
@@ -16,21 +16,14 @@ class FieldContentFormatterTest {
     void setUp() {
         parser =
             new FieldContentFormatter(
-                new FieldPreferences(
-                    false,
-                    Collections.emptyList(),
-                    Collections.emptyList()
-                )
+                new FieldPreferences(false, Collections.emptyList(), Collections.emptyList())
             );
     }
 
     @Test
     void doesNotUnifyLineBreaks() {
         String original = "I\r\nunify\nline\rbreaks.";
-        String processed = parser.format(
-            new StringBuilder(original),
-            StandardField.ABSTRACT
-        );
+        String processed = parser.format(new StringBuilder(original), StandardField.ABSTRACT);
 
         // Normalization is done at org.jabref.logic.exporter.BibWriter, so no need to normalize here
         assertEquals(original, processed);
@@ -40,14 +33,8 @@ void doesNotUnifyLineBreaks() {
     void retainsWhitespaceForMultiLineFields() {
         String original = "I\nkeep\nline\nbreaks\nand\n\ttabs.";
 
-        String abstrakt = parser.format(
-            new StringBuilder(original),
-            StandardField.ABSTRACT
-        );
-        String review = parser.format(
-            new StringBuilder(original),
-            StandardField.REVIEW
-        );
+        String abstrakt = parser.format(new StringBuilder(original), StandardField.ABSTRACT);
+        String review = parser.format(new StringBuilder(original), StandardField.REVIEW);
 
         assertEquals(original, abstrakt);
         assertEquals(original, review);
@@ -55,19 +42,11 @@ void retainsWhitespaceForMultiLineFields() {
 
     @Test
     void removeWhitespaceFromNonMultiLineFields() {
-        String original =
-            "I\nshould\nnot\ninclude\nadditional\nwhitespaces  \nor\n\ttabs.";
-        String expected =
-            "I should not include additional whitespaces or tabs.";
+        String original = "I\nshould\nnot\ninclude\nadditional\nwhitespaces  \nor\n\ttabs.";
+        String expected = "I should not include additional whitespaces or tabs.";
 
-        String abstrakt = parser.format(
-            new StringBuilder(original),
-            StandardField.TITLE
-        );
-        String any = parser.format(
-            new StringBuilder(original),
-            new UnknownField("anyotherfield")
-        );
+        String abstrakt = parser.format(new StringBuilder(original), StandardField.TITLE);
+        String any = parser.format(new StringBuilder(original), new UnknownField("anyotherfield"));
 
         assertEquals(expected, abstrakt);
         assertEquals(expected, any);
diff --git a/src/test/java/org/jabref/logic/bibtex/FieldWriterTest.java b/src/test/java/org/jabref/logic/bibtex/FieldWriterTest.java
index 57db7f124e5..1f8d0ebf1a8 100644
--- a/src/test/java/org/jabref/logic/bibtex/FieldWriterTest.java
+++ b/src/test/java/org/jabref/logic/bibtex/FieldWriterTest.java
@@ -66,9 +66,7 @@ void setUp() {
     @Test
     void noNormalizationOfNewlinesInAbstractField() throws Exception {
         String text =
-            "lorem" +
-            OS.NEWLINE +
-            " ipsum lorem ipsum\nlorem ipsum \rlorem ipsum\r\ntest";
+            "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
         String expected = "{" + text + "}";
@@ -77,8 +75,7 @@ void noNormalizationOfNewlinesInAbstractField() throws Exception {
 
     @Test
     void preserveNewlineInAbstractField() throws Exception {
-        String text =
-            "lorem ipsum lorem ipsum" + OS.NEWLINE + "lorem ipsum lorem ipsum";
+        String text = "lorem ipsum lorem ipsum" + OS.NEWLINE + "lorem ipsum lorem ipsum";
 
         String result = writer.write(StandardField.ABSTRACT, text);
         String expected = "{" + text + "}";
@@ -89,10 +86,7 @@ void preserveNewlineInAbstractField() throws Exception {
     @Test
     void preserveMultipleNewlinesInAbstractField() throws Exception {
         String text =
-            "lorem ipsum lorem ipsum" +
-            OS.NEWLINE +
-            OS.NEWLINE +
-            "lorem ipsum lorem ipsum";
+            "lorem ipsum lorem ipsum" + OS.NEWLINE + OS.NEWLINE + "lorem ipsum lorem ipsum";
 
         String result = writer.write(StandardField.ABSTRACT, text);
         String expected = "{" + text + "}";
@@ -102,8 +96,7 @@ void preserveMultipleNewlinesInAbstractField() throws Exception {
 
     @Test
     void preserveNewlineInReviewField() throws Exception {
-        String text =
-            "lorem ipsum lorem ipsum" + OS.NEWLINE + "lorem ipsum lorem ipsum";
+        String text = "lorem ipsum lorem ipsum" + OS.NEWLINE + "lorem ipsum lorem ipsum";
 
         String result = writer.write(StandardField.REVIEW, text);
         String expected = "{" + text + "}";
@@ -113,10 +106,8 @@ void preserveNewlineInReviewField() throws Exception {
 
     @Test
     void removeWhitespaceFromNonMultiLineFields() throws Exception {
-        String original =
-            "I\nshould\nnot\ninclude\nadditional\nwhitespaces  \nor\n\ttabs.";
-        String expected =
-            "{I should not include additional whitespaces or tabs.}";
+        String original = "I\nshould\nnot\ninclude\nadditional\nwhitespaces  \nor\n\ttabs.";
+        String expected = "{I should not include additional whitespaces or tabs.}";
 
         String title = writer.write(StandardField.TITLE, original);
         String any = writer.write(new UnknownField("anyotherfield"), original);
@@ -147,43 +138,29 @@ void reportUnbalancedBracingWithEscapedBraces() throws Exception {
 
     @Test
     void tolerateBalancedBrace() throws Exception {
-        String text =
-            "Incorporating evolutionary {Measures into Conservation Prioritization}";
+        String text = "Incorporating evolutionary {Measures into Conservation Prioritization}";
 
-        assertEquals(
-            "{" + text + "}",
-            writer.write(new UnknownField("anyfield"), text)
-        );
+        assertEquals("{" + text + "}", writer.write(new UnknownField("anyfield"), text));
     }
 
     @Test
     void tolerateEscapeCharacters() throws Exception {
-        String text =
-            "Incorporating {\\O}evolutionary {Measures into Conservation Prioritization}";
+        String text = "Incorporating {\\O}evolutionary {Measures into Conservation Prioritization}";
 
-        assertEquals(
-            "{" + text + "}",
-            writer.write(new UnknownField("anyfield"), text)
-        );
+        assertEquals("{" + text + "}", writer.write(new UnknownField("anyfield"), text));
     }
 
     @Test
     void hashEnclosedWordsGetRealStringsInMonthField() throws Exception {
         String text = "#jan# - #feb#";
-        assertEquals(
-            "jan # { - } # feb",
-            writer.write(StandardField.MONTH, text)
-        );
+        assertEquals("jan # { - } # feb", writer.write(StandardField.MONTH, text));
     }
 
     @ParameterizedTest
     @MethodSource("getMarkdowns")
     void keepHashSignInComment(String text) throws Exception {
         String writeResult = writer.write(StandardField.COMMENT, text);
-        String resultWithLfAsNewLineSeparator = StringUtil.unifyLineBreaks(
-            writeResult,
-            "\n"
-        );
+        String resultWithLfAsNewLineSeparator = StringUtil.unifyLineBreaks(writeResult, "\n");
         assertEquals("{" + text + "}", resultWithLfAsNewLineSeparator);
     }
 }
diff --git a/src/test/java/org/jabref/logic/bibtex/FileFieldWriterTest.java b/src/test/java/org/jabref/logic/bibtex/FileFieldWriterTest.java
index 1fd0433c4d0..200b56ca312 100644
--- a/src/test/java/org/jabref/logic/bibtex/FileFieldWriterTest.java
+++ b/src/test/java/org/jabref/logic/bibtex/FileFieldWriterTest.java
@@ -35,22 +35,10 @@ public void testQuoteNull() {
 
     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" } })
         );
     }
 
@@ -62,14 +50,7 @@ public void testEncodeStringArray(String expected, String[][] values) {
 
     @Test
     public void testFileFieldWriterGetStringRepresentation() {
-        LinkedFile file = new LinkedFile(
-            "test",
-            Path.of("X:\\Users\\abc.pdf"),
-            "PDF"
-        );
-        assertEquals(
-            "test:X\\:/Users/abc.pdf:PDF",
-            FileFieldWriter.getStringRepresentation(file)
-        );
+        LinkedFile file = new LinkedFile("test", Path.of("X:\\Users\\abc.pdf"), "PDF");
+        assertEquals("test:X\\:/Users/abc.pdf:PDF", FileFieldWriter.getStringRepresentation(file));
     }
 }
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 0fec4d4be16..5c4d3473862 100644
--- a/src/test/java/org/jabref/logic/bibtex/comparator/BibDatabaseDiffTest.java
+++ b/src/test/java/org/jabref/logic/bibtex/comparator/BibDatabaseDiffTest.java
@@ -29,8 +29,7 @@ void compareOfEmptyDatabasesReportsNoDifferences() throws Exception {
 
     @Test
     void compareOfSameEntryReportsNoDifferences() throws Exception {
-        BibEntry entry = new BibEntry(BibEntry.DEFAULT_TYPE)
-            .withField(StandardField.TITLE, "test");
+        BibEntry entry = new BibEntry(BibEntry.DEFAULT_TYPE).withField(StandardField.TITLE, "test");
 
         BibDatabaseDiff diff = compareEntries(entry, entry);
 
@@ -38,8 +37,7 @@ void compareOfSameEntryReportsNoDifferences() throws Exception {
     }
 
     @Test
-    void compareOfDifferentEntriesWithSameDataReportsNoDifferences()
-        throws Exception {
+    void compareOfDifferentEntriesWithSameDataReportsNoDifferences() throws Exception {
         BibEntry entryOne = new BibEntry(BibEntry.DEFAULT_TYPE)
             .withField(StandardField.TITLE, "test");
         BibEntry entryTwo = new BibEntry(BibEntry.DEFAULT_TYPE)
@@ -51,8 +49,7 @@ void compareOfDifferentEntriesWithSameDataReportsNoDifferences()
     }
 
     @Test
-    void compareOfTwoEntriesWithSameContentAndLfEndingsReportsNoDifferences()
-        throws Exception {
+    void compareOfTwoEntriesWithSameContentAndLfEndingsReportsNoDifferences() throws Exception {
         BibEntry entryOne = new BibEntry()
             .withField(StandardField.COMMENT, "line1\n\nline3\n\nline5");
         BibEntry entryTwo = new BibEntry()
@@ -64,18 +61,11 @@ void compareOfTwoEntriesWithSameContentAndLfEndingsReportsNoDifferences()
     }
 
     @Test
-    void compareOfTwoEntriesWithSameContentAndCrLfEndingsReportsNoDifferences()
-        throws Exception {
+    void compareOfTwoEntriesWithSameContentAndCrLfEndingsReportsNoDifferences() throws Exception {
         BibEntry entryOne = new BibEntry()
-            .withField(
-                StandardField.COMMENT,
-                "line1\r\n\r\nline3\r\n\r\nline5"
-            );
+            .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"
-            );
+            .withField(StandardField.COMMENT, "line1\r\n\r\nline3\r\n\r\nline5");
 
         BibDatabaseDiff diff = compareEntries(entryOne, entryTwo);
 
@@ -88,10 +78,7 @@ void compareOfTwoEntriesWithSameContentAndMixedLineEndingsReportsNoDifferences()
         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"
-            );
+            .withField(StandardField.COMMENT, "line1\r\n\r\nline3\r\n\r\nline5");
 
         BibDatabaseDiff diff = compareEntries(entryOne, entryTwo);
 
@@ -99,8 +86,7 @@ void compareOfTwoEntriesWithSameContentAndMixedLineEndingsReportsNoDifferences()
     }
 
     @Test
-    void compareOfTwoDifferentEntriesWithDifferentDataReportsDifferences()
-        throws Exception {
+    void compareOfTwoDifferentEntriesWithDifferentDataReportsDifferences() throws Exception {
         BibEntry entryOne = new BibEntry(BibEntry.DEFAULT_TYPE)
             .withField(StandardField.TITLE, "test");
         BibEntry entryTwo = new BibEntry(BibEntry.DEFAULT_TYPE)
@@ -109,21 +95,14 @@ void compareOfTwoDifferentEntriesWithDifferentDataReportsDifferences()
         BibDatabaseDiff diff = compareEntries(entryOne, entryTwo);
 
         // two different entries between the databases
-        assertEquals(
-            2,
-            diff.getEntryDifferences().size(),
-            "incorrect amount of different entries"
-        );
+        assertEquals(2, diff.getEntryDifferences().size(), "incorrect amount of different entries");
 
         assertEquals(
             entryOne,
             diff.getEntryDifferences().get(0).getOriginalEntry(),
             "there is another value as originalEntry"
         );
-        assertNull(
-            diff.getEntryDifferences().get(0).getNewEntry(),
-            "newEntry is not null"
-        );
+        assertNull(diff.getEntryDifferences().get(0).getNewEntry(), "newEntry is not null");
         assertEquals(
             entryTwo,
             diff.getEntryDifferences().get(1).getNewEntry(),
@@ -136,8 +115,7 @@ void compareOfTwoDifferentEntriesWithDifferentDataReportsDifferences()
     }
 
     @Test
-    void compareOfThreeDifferentEntriesWithDifferentDataReportsDifferences()
-        throws Exception {
+    void compareOfThreeDifferentEntriesWithDifferentDataReportsDifferences() throws Exception {
         BibEntry entryOne = new BibEntry(BibEntry.DEFAULT_TYPE)
             .withField(StandardField.TITLE, "test");
         BibEntry entryTwo = new BibEntry(BibEntry.DEFAULT_TYPE)
@@ -151,27 +129,17 @@ void compareOfThreeDifferentEntriesWithDifferentDataReportsDifferences()
             new BibDatabase(Arrays.asList(entryTwo, entryThree))
         );
 
-        BibDatabaseDiff diff = BibDatabaseDiff.compare(
-            databaseOne,
-            databaseTwo
-        );
+        BibDatabaseDiff diff = BibDatabaseDiff.compare(databaseOne, databaseTwo);
 
         // three different entries between the databases
-        assertEquals(
-            3,
-            diff.getEntryDifferences().size(),
-            "incorrect amount of different entries"
-        );
+        assertEquals(3, diff.getEntryDifferences().size(), "incorrect amount of different entries");
 
         assertEquals(
             entryOne,
             diff.getEntryDifferences().get(0).getOriginalEntry(),
             "there is another value as originalEntry"
         );
-        assertNull(
-            diff.getEntryDifferences().get(0).getNewEntry(),
-            "newEntry is not null"
-        );
+        assertNull(diff.getEntryDifferences().get(0).getNewEntry(), "newEntry is not null");
         assertEquals(
             entryTwo,
             diff.getEntryDifferences().get(1).getNewEntry(),
@@ -208,11 +176,7 @@ void compareOfTwoEntriesWithEqualCitationKeysShouldReportsOneDifference() {
         BibDatabaseDiff diff = compareEntries(entryOne, entryTwo);
 
         // two different entries between the databases
-        assertEquals(
-            1,
-            diff.getEntryDifferences().size(),
-            "incorrect amount of different entries"
-        );
+        assertEquals(1, diff.getEntryDifferences().size(), "incorrect amount of different entries");
 
         assertEquals(
             entryOne,
@@ -226,10 +190,7 @@ void compareOfTwoEntriesWithEqualCitationKeysShouldReportsOneDifference() {
         );
     }
 
-    private BibDatabaseDiff compareEntries(
-        BibEntry entryOne,
-        BibEntry entryTwo
-    ) {
+    private BibDatabaseDiff compareEntries(BibEntry entryOne, BibEntry entryTwo) {
         BibDatabaseContext databaseOne = new BibDatabaseContext(
             new BibDatabase(Collections.singletonList(entryOne))
         );
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 80ff5732dd6..545a15b5fa0 100644
--- a/src/test/java/org/jabref/logic/bibtex/comparator/BibStringDiffTest.java
+++ b/src/test/java/org/jabref/logic/bibtex/comparator/BibStringDiffTest.java
@@ -33,42 +33,27 @@ void setUp() {
     void compareTest() {
         when(originalDataBase.getStringValues())
             .thenReturn(
-                List.of(
-                    new BibtexString("name", "content"),
-                    new BibtexString("name2", "content2")
-                )
+                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.of(new BibtexString("name", "content"), new BibtexString("name2", "content3"))
             );
 
-        List<BibStringDiff> result = BibStringDiff.compare(
-            originalDataBase,
-            newDataBase
-        );
+        List<BibStringDiff> result = BibStringDiff.compare(originalDataBase, newDataBase);
         assertEquals(List.of(diff), result);
     }
 
     @Test
     void equalTest() {
-        BibStringDiff other = new BibStringDiff(
-            diff.getOriginalString(),
-            diff.getNewString()
-        );
+        BibStringDiff other = new BibStringDiff(diff.getOriginalString(), diff.getNewString());
         assertEquals(diff, other);
         assertEquals(diff.hashCode(), other.hashCode());
     }
 
     @Test
     void notEqualTest() {
-        BibStringDiff other = new BibStringDiff(
-            diff.getNewString(),
-            diff.getOriginalString()
-        );
+        BibStringDiff other = new BibStringDiff(diff.getNewString(), diff.getOriginalString());
         assertNotEquals(diff, other);
         assertNotEquals(diff.hashCode(), other.hashCode());
     }
@@ -92,10 +77,7 @@ void compareToDifferentClassIsFalse() {
     @Test
     void testGetters() {
         BibtexString bsOne = new BibtexString("aKahle", "Kahle, Brewster");
-        BibtexString bsTwo = new BibtexString(
-            "iMIT",
-            "Institute of Technology"
-        );
+        BibtexString bsTwo = new BibtexString("iMIT", "Institute of Technology");
         BibStringDiff diff = new BibStringDiff(bsOne, bsTwo);
         assertEquals(diff.getOriginalString(), bsOne);
         assertEquals(diff.getNewString(), bsTwo);
@@ -106,10 +88,7 @@ void testCompareEmptyDatabases() {
         when(originalDataBase.hasNoStrings()).thenReturn(true);
         when(newDataBase.hasNoStrings()).thenReturn(true);
 
-        assertEquals(
-            Collections.emptyList(),
-            BibStringDiff.compare(originalDataBase, newDataBase)
-        );
+        assertEquals(Collections.emptyList(), BibStringDiff.compare(originalDataBase, newDataBase));
     }
 
     @Test
@@ -119,10 +98,7 @@ void testCompareNameChange() {
         when(newDataBase.getStringValues())
             .thenReturn(List.of(new BibtexString("name2", "content")));
 
-        List<BibStringDiff> result = BibStringDiff.compare(
-            originalDataBase,
-            newDataBase
-        );
+        List<BibStringDiff> result = BibStringDiff.compare(originalDataBase, newDataBase);
         BibStringDiff expectedDiff = new BibStringDiff(
             new BibtexString("name", "content"),
             new BibtexString("name2", "content")
@@ -137,10 +113,7 @@ void testCompareNoDiff() {
         when(newDataBase.getStringValues())
             .thenReturn(List.of(new BibtexString("name", "content")));
 
-        List<BibStringDiff> result = BibStringDiff.compare(
-            originalDataBase,
-            newDataBase
-        );
+        List<BibStringDiff> result = BibStringDiff.compare(originalDataBase, newDataBase);
         assertEquals(Collections.emptyList(), result);
     }
 
@@ -150,32 +123,19 @@ void testCompareRemovedString() {
             .thenReturn(List.of(new BibtexString("name", "content")));
         when(newDataBase.getStringValues()).thenReturn(Collections.emptyList());
 
-        List<BibStringDiff> result = BibStringDiff.compare(
-            originalDataBase,
-            newDataBase
-        );
-        BibStringDiff expectedDiff = new BibStringDiff(
-            new BibtexString("name", "content"),
-            null
-        );
+        List<BibStringDiff> result = BibStringDiff.compare(originalDataBase, newDataBase);
+        BibStringDiff expectedDiff = new BibStringDiff(new BibtexString("name", "content"), null);
         assertEquals(List.of(expectedDiff), result);
     }
 
     @Test
     void testCompareAddString() {
-        when(originalDataBase.getStringValues())
-            .thenReturn(Collections.emptyList());
+        when(originalDataBase.getStringValues()).thenReturn(Collections.emptyList());
         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")
-        );
+        List<BibStringDiff> result = BibStringDiff.compare(originalDataBase, newDataBase);
+        BibStringDiff expectedDiff = new BibStringDiff(null, new BibtexString("name", "content"));
         assertEquals(List.of(expectedDiff), result);
     }
 }
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 64f2421e9a8..3979c956d4c 100644
--- a/src/test/java/org/jabref/logic/bibtex/comparator/BibtexStringComparatorTest.java
+++ b/src/test/java/org/jabref/logic/bibtex/comparator/BibtexStringComparatorTest.java
@@ -8,28 +8,17 @@
 
 public class BibtexStringComparatorTest {
 
-    private final BibtexStringComparator bsc1 = new BibtexStringComparator(
-        false
-    );
-    private final BibtexStringComparator bsc2 = new BibtexStringComparator(
-        true
-    );
+    private final BibtexStringComparator bsc1 = new BibtexStringComparator(false);
+    private final BibtexStringComparator bsc2 = new BibtexStringComparator(true);
 
     @Test
     public void test() {
-        BibtexString bs1 = new BibtexString(
-            "VLSI",
-            "Very Large Scale Integration"
-        );
+        BibtexString bs1 = new BibtexString("VLSI", "Very Large Scale Integration");
         BibtexString bs2 = new BibtexString("DSP", "Digital Signal Processing");
         BibtexString bs3 = new BibtexString("DSP", "Digital Signal Processing");
 
         // Same string
-        assertEquals(
-            0,
-            bsc1.compare(bs1, bs1),
-            "Error when comparing the same string"
-        );
+        assertEquals(0, bsc1.compare(bs1, bs1), "Error when comparing the same string");
         // Same content
         assertEquals(
             0,
@@ -37,14 +26,8 @@ public void test() {
             "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"
-        );
+        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(
@@ -69,23 +52,14 @@ public void test() {
         // Create string with internal string
         BibtexString bs4 = new BibtexString("DSPVLSI", "#VLSI# #DSP#");
         // bs4 before bs1 if not considering that bs4 contains bs1
-        assertTrue(
-            bsc1.compare(bs1, bs4) > 0,
-            "bs1 does not lexicographically succeed bs4"
-        );
-        assertTrue(
-            bsc1.compare(bs4, bs1) < 0,
-            "bs4 does not lexicographically precede bs1"
-        );
+        assertTrue(bsc1.compare(bs1, bs4) > 0, "bs1 does not lexicographically succeed bs4");
+        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(bs4, bs1) > 0,
-            "bs4 contains 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/EntryComparatorTest.java b/src/test/java/org/jabref/logic/bibtex/comparator/EntryComparatorTest.java
index fada2fd0327..04c36e7c47e 100644
--- a/src/test/java/org/jabref/logic/bibtex/comparator/EntryComparatorTest.java
+++ b/src/test/java/org/jabref/logic/bibtex/comparator/EntryComparatorTest.java
@@ -15,22 +15,15 @@ void recognizeIdenticalObjectsAsEqual() {
         BibEntry entry = new BibEntry();
         assertEquals(
             0,
-            new EntryComparator(false, false, StandardField.TITLE)
-                .compare(entry, entry)
+            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");
-        EntryComparator entryComparator = new EntryComparator(
-            false,
-            false,
-            StandardField.AUTHOR
-        );
+        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));
     }
@@ -39,13 +32,8 @@ void compareAuthorFieldBiggerAscending() {
     void bothEntriesHaveNotSetTheFieldToCompareAscending() {
         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
-        );
+        BibEntry entry2 = new BibEntry().withField(StandardField.COMMENTATOR, "Some Commentator");
+        EntryComparator entryComparator = new EntryComparator(false, false, StandardField.TITLE);
 
         assertEquals(-1, entryComparator.compare(entry1, entry2));
     }
@@ -54,29 +42,19 @@ void bothEntriesHaveNotSetTheFieldToCompareAscending() {
     void secondEntryHasNotSetFieldToCompareAscending() {
         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
-        );
+        BibEntry entry2 = new BibEntry().withField(StandardField.COMMENTATOR, "Some Commentator");
+        EntryComparator entryComparator = new EntryComparator(false, false, StandardField.TITLE);
 
         assertEquals(1, entryComparator.compare(entry1, entry2));
     }
 
     @Test
     void firstEntryHasNotSetFieldToCompareAscending() {
-        BibEntry entry1 = new BibEntry()
-            .withField(StandardField.COMMENTATOR, "Some Commentator");
+        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
-        );
+        EntryComparator entryComparator = new EntryComparator(false, false, StandardField.TITLE);
 
         assertEquals(-1, entryComparator.compare(entry1, entry2));
     }
@@ -86,11 +64,7 @@ void bothEntriesNumericAscending() {
         BibEntry entry1 = new BibEntry().withField(StandardField.EDITION, "1");
         BibEntry entry2 = new BibEntry().withField(StandardField.EDITION, "3");
 
-        EntryComparator entryComparator = new EntryComparator(
-            false,
-            false,
-            StandardField.EDITION
-        );
+        EntryComparator entryComparator = new EntryComparator(false, false, StandardField.EDITION);
 
         assertEquals(-1, entryComparator.compare(entry1, entry2));
     }
@@ -99,15 +73,10 @@ void bothEntriesNumericAscending() {
     void compareObjectsByKeyAscending() {
         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(e1, e2));
         assertEquals(
             -1,
-            new EntryComparator(false, false, InternalField.KEY_FIELD)
-                .compare(e2, e1)
+            new EntryComparator(false, false, InternalField.KEY_FIELD).compare(e2, e1)
         );
     }
 
@@ -115,15 +84,10 @@ void compareObjectsByKeyAscending() {
     void compareObjectsByKeyWithNull() {
         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(e1, e2));
         assertEquals(
             -1,
-            new EntryComparator(false, false, InternalField.KEY_FIELD)
-                .compare(e2, e1)
+            new EntryComparator(false, false, InternalField.KEY_FIELD).compare(e2, e1)
         );
     }
 
@@ -131,99 +95,58 @@ void compareObjectsByKeyWithNull() {
     void compareObjectsByKeyWithBlank() {
         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(e1, e2));
         assertEquals(
             -1,
-            new EntryComparator(false, false, InternalField.KEY_FIELD)
-                .compare(e2, e1)
+            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"
-            );
+            .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)
-        );
+            .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");
-        assertEquals(
-            0,
-            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\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 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"
-            );
+            .withField(StandardField.COMMENT, "line1\r\n\r\nline3\r\n\r\nline5");
         assertEquals(
             -1,
-            new EntryComparator(false, false, InternalField.KEY_FIELD)
-                .compare(e1, e2)
+            new EntryComparator(false, false, InternalField.KEY_FIELD).compare(e1, e2)
         );
     }
 
     @Test
     void withAuthorIsBeforeWithEmptyAuthorWhenSortingWithNonExistentKey() {
-        BibEntry e1 = new BibEntry()
-            .withField(StandardField.AUTHOR, "Stephen King");
+        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)
-        );
+        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 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)
-        );
+        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)
-        );
+        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 f3fd23b6d4f..66154c8e1b0 100644
--- a/src/test/java/org/jabref/logic/bibtex/comparator/FieldComparatorTest.java
+++ b/src/test/java/org/jabref/logic/bibtex/comparator/FieldComparatorTest.java
@@ -43,10 +43,7 @@ public void compareMonthFieldBiggerAscending() throws Exception {
 
     @Test
     public void compareMonthFieldBiggerDescending() throws Exception {
-        FieldComparator comparator = new FieldComparator(
-            new OrFields(StandardField.MONTH),
-            true
-        );
+        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");
 
@@ -81,10 +78,7 @@ public void compareYearFieldBiggerAscending() throws Exception {
 
     @Test
     public void compareYearFieldBiggerDescending() throws Exception {
-        FieldComparator comparator = new FieldComparator(
-            new OrFields(StandardField.YEAR),
-            true
-        );
+        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");
 
@@ -93,9 +87,7 @@ public void compareYearFieldBiggerDescending() throws Exception {
 
     @Test
     public void compareTypeFieldIdentity() throws Exception {
-        FieldComparator comparator = new FieldComparator(
-            InternalField.TYPE_HEADER
-        );
+        FieldComparator comparator = new FieldComparator(InternalField.TYPE_HEADER);
         BibEntry equal = new BibEntry(StandardEntryType.Article);
 
         assertEquals(0, comparator.compare(equal, equal));
@@ -103,9 +95,7 @@ public void compareTypeFieldIdentity() throws Exception {
 
     @Test
     public void compareTypeFieldEquality() throws Exception {
-        FieldComparator comparator = new FieldComparator(
-            InternalField.TYPE_HEADER
-        );
+        FieldComparator comparator = new FieldComparator(InternalField.TYPE_HEADER);
         BibEntry equal = new BibEntry(StandardEntryType.Article);
         equal.setId("1");
         BibEntry equal2 = new BibEntry(StandardEntryType.Article);
@@ -116,9 +106,7 @@ public void compareTypeFieldEquality() throws Exception {
 
     @Test
     public void compareTypeFieldBiggerAscending() throws Exception {
-        FieldComparator comparator = new FieldComparator(
-            InternalField.TYPE_HEADER
-        );
+        FieldComparator comparator = new FieldComparator(InternalField.TYPE_HEADER);
         BibEntry smaller = new BibEntry(StandardEntryType.Article);
         BibEntry bigger = new BibEntry(StandardEntryType.Book);
 
@@ -149,8 +137,7 @@ public void compareStringFieldsIdentity() throws Exception {
     public 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 equal2 = new BibEntry().withField(StandardField.TITLE, "title");
 
         assertEquals(0, comparator.compare(equal, equal2));
     }
@@ -166,10 +153,7 @@ public void compareStringFieldsBiggerAscending() throws Exception {
 
     @Test
     public void compareStringFieldsBiggerDescending() throws Exception {
-        FieldComparator comparator = new FieldComparator(
-            new OrFields(StandardField.TITLE),
-            true
-        );
+        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");
 
@@ -178,29 +162,18 @@ public void compareStringFieldsBiggerDescending() throws Exception {
 
     @Test
     public 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");
+        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");
 
         assertEquals(1, comparator.compare(bigger, smaller));
     }
 
     @Test
-    public 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");
+    public 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");
 
         assertEquals(1, comparator.compare(parsable, unparsable));
     }
@@ -217,21 +190,12 @@ public void compareNumericalValues(
         BibEntry entry1 = new BibEntry().withField(StandardField.PMID, id1);
         BibEntry entry2 = new BibEntry().withField(StandardField.PMID, id2);
 
-        assertEquals(
-            comparisonResult,
-            comparator.compare(entry1, entry2),
-            message
-        );
+        assertEquals(comparisonResult, comparator.compare(entry1, entry2), message);
     }
 
     private static Stream<Arguments> compareNumericalValues() {
         return Stream.of(
-            Arguments.of(
-                0,
-                "123456",
-                "123456",
-                "IDs should be lexicographically equal"
-            ),
+            Arguments.of(0, "123456", "123456", "IDs should be lexicographically equal"),
             Arguments.of(
                 1,
                 "234567",
@@ -244,34 +208,15 @@ private static Stream<Arguments> compareNumericalValues() {
                 "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(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")
         );
     }
 
     @ParameterizedTest
     @MethodSource
-    public void nullTests(
-        int comparisonResult,
-        String firstValue,
-        String secondValue
-    ) {
+    public void nullTests(int comparisonResult, String firstValue, String secondValue) {
         FieldComparator comparator = new FieldComparator(StandardField.TITLE);
 
         BibEntry entry1 = new BibEntry();
@@ -299,10 +244,8 @@ private static Stream<Arguments> nullTests() {
     @Test
     public 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 21350e93db9..f817269e054 100644
--- a/src/test/java/org/jabref/logic/bibtex/comparator/GroupDiffTest.java
+++ b/src/test/java/org/jabref/logic/bibtex/comparator/GroupDiffTest.java
@@ -21,21 +21,12 @@ public class GroupDiffTest {
 
     @BeforeEach
     void setup() {
-        rootOriginal =
-            GroupTreeNode.fromGroup(new AllEntriesGroup("All entries"));
-        rootOriginal.addSubgroup(
-            new ExplicitGroup("ExplicitA", GroupHierarchyType.INCLUDING, ',')
-        );
+        rootOriginal = GroupTreeNode.fromGroup(new AllEntriesGroup("All entries"));
+        rootOriginal.addSubgroup(new ExplicitGroup("ExplicitA", GroupHierarchyType.INCLUDING, ','));
         GroupTreeNode parent = rootOriginal.addSubgroup(
-            new ExplicitGroup(
-                "ExplicitParent",
-                GroupHierarchyType.INDEPENDENT,
-                ','
-            )
-        );
-        parent.addSubgroup(
-            new ExplicitGroup("ExplicitNode", GroupHierarchyType.REFINING, ',')
+            new ExplicitGroup("ExplicitParent", GroupHierarchyType.INDEPENDENT, ',')
         );
+        parent.addSubgroup(new ExplicitGroup("ExplicitNode", GroupHierarchyType.REFINING, ','));
     }
 
     @Test
@@ -43,53 +34,32 @@ void compareEmptyGroups() {
         when(originalMetaData.getGroups()).thenReturn(Optional.empty());
         when(newMetaData.getGroups()).thenReturn(Optional.empty());
 
-        assertEquals(
-            Optional.empty(),
-            GroupDiff.compare(originalMetaData, newMetaData)
-        );
+        assertEquals(Optional.empty(), GroupDiff.compare(originalMetaData, newMetaData));
     }
 
     @Test
     void compareGroupWithItself() {
-        when(originalMetaData.getGroups())
-            .thenReturn(Optional.of(rootOriginal));
+        when(originalMetaData.getGroups()).thenReturn(Optional.of(rootOriginal));
         when(newMetaData.getGroups()).thenReturn(Optional.of(rootOriginal));
 
-        assertEquals(
-            Optional.empty(),
-            GroupDiff.compare(originalMetaData, newMetaData)
-        );
+        assertEquals(Optional.empty(), GroupDiff.compare(originalMetaData, newMetaData));
     }
 
     @Test
     void compareWithChangedGroup() {
-        GroupTreeNode rootModified = GroupTreeNode.fromGroup(
-            new AllEntriesGroup("All entries")
-        );
-        rootModified.addSubgroup(
-            new ExplicitGroup("ExplicitA", GroupHierarchyType.INCLUDING, ',')
-        );
+        GroupTreeNode rootModified = GroupTreeNode.fromGroup(new AllEntriesGroup("All entries"));
+        rootModified.addSubgroup(new ExplicitGroup("ExplicitA", GroupHierarchyType.INCLUDING, ','));
 
-        when(originalMetaData.getGroups())
-            .thenReturn(Optional.of(rootOriginal));
+        when(originalMetaData.getGroups()).thenReturn(Optional.of(rootOriginal));
         when(newMetaData.getGroups()).thenReturn(Optional.of(rootModified));
 
-        Optional<GroupDiff> groupDiff = GroupDiff.compare(
-            originalMetaData,
-            newMetaData
-        );
+        Optional<GroupDiff> groupDiff = GroupDiff.compare(originalMetaData, newMetaData);
 
         Optional<GroupDiff> expectedGroupDiff = Optional.of(
-            new GroupDiff(
-                originalMetaData.getGroups().get(),
-                newMetaData.getGroups().get()
-            )
+            new GroupDiff(originalMetaData.getGroups().get(), newMetaData.getGroups().get())
         );
 
-        assertEquals(
-            expectedGroupDiff.get().getNewGroupRoot(),
-            groupDiff.get().getNewGroupRoot()
-        );
+        assertEquals(expectedGroupDiff.get().getNewGroupRoot(), groupDiff.get().getNewGroupRoot());
         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 b0c06348858..b3f39a2f79d 100644
--- a/src/test/java/org/jabref/logic/bibtex/comparator/MetaDataDiffTest.java
+++ b/src/test/java/org/jabref/logic/bibtex/comparator/MetaDataDiffTest.java
@@ -11,16 +11,11 @@
 public class MetaDataDiffTest {
 
     @Test
-    public void compareWithSameContentSelectorsDoesNotReportAnyDiffs()
-        throws Exception {
+    public void compareWithSameContentSelectorsDoesNotReportAnyDiffs() throws Exception {
         MetaData one = new MetaData();
-        one.addContentSelector(
-            new ContentSelector(StandardField.AUTHOR, "first", "second")
-        );
+        one.addContentSelector(new ContentSelector(StandardField.AUTHOR, "first", "second"));
         MetaData two = new MetaData();
-        two.addContentSelector(
-            new ContentSelector(StandardField.AUTHOR, "first", "second")
-        );
+        two.addContentSelector(new ContentSelector(StandardField.AUTHOR, "first", "second"));
 
         assertEquals(Optional.empty(), MetaDataDiff.compare(one, two));
     }
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 88c18a7e886..1de6a4d2258 100644
--- a/src/test/java/org/jabref/logic/bibtex/comparator/PreambleDiffTest.java
+++ b/src/test/java/org/jabref/logic/bibtex/comparator/PreambleDiffTest.java
@@ -12,26 +12,20 @@
 
 public class PreambleDiffTest {
 
-    private final BibDatabaseContext originalDataBaseContext = mock(
-        BibDatabaseContext.class
-    );
-    private final BibDatabaseContext newDataBaseContext = mock(
-        BibDatabaseContext.class
-    );
+    private final BibDatabaseContext originalDataBaseContext = mock(BibDatabaseContext.class);
+    private final BibDatabaseContext newDataBaseContext = mock(BibDatabaseContext.class);
     private final BibDatabase originalDataBase = mock(BibDatabase.class);
     private final BibDatabase newDataBase = mock(BibDatabase.class);
 
     @BeforeEach
     void setUp() {
-        when(originalDataBaseContext.getDatabase())
-            .thenReturn(originalDataBase);
+        when(originalDataBaseContext.getDatabase()).thenReturn(originalDataBase);
         when(newDataBaseContext.getDatabase()).thenReturn(newDataBase);
     }
 
     @Test
     void compareSamePreambleTest() {
-        when(originalDataBase.getPreamble())
-            .thenReturn(Optional.of("preamble"));
+        when(originalDataBase.getPreamble()).thenReturn(Optional.of("preamble"));
         when(newDataBase.getPreamble()).thenReturn(Optional.of("preamble"));
 
         assertEquals(
@@ -42,10 +36,8 @@ void compareSamePreambleTest() {
 
     @Test
     void compareDifferentPreambleTest() {
-        when(originalDataBase.getPreamble())
-            .thenReturn(Optional.of("preamble"));
-        when(newDataBase.getPreamble())
-            .thenReturn(Optional.of("otherPreamble"));
+        when(originalDataBase.getPreamble()).thenReturn(Optional.of("preamble"));
+        when(newDataBase.getPreamble()).thenReturn(Optional.of("otherPreamble"));
 
         Optional<PreambleDiff> expected = Optional.of(
             new PreambleDiff("preamble", "otherPreamble")
diff --git a/src/test/java/org/jabref/logic/bst/BstFunctionsTest.java b/src/test/java/org/jabref/logic/bst/BstFunctionsTest.java
index 028832c7008..bb3c50aecee 100644
--- a/src/test/java/org/jabref/logic/bst/BstFunctionsTest.java
+++ b/src/test/java/org/jabref/logic/bst/BstFunctionsTest.java
@@ -87,8 +87,7 @@ public void testArithmeticFunctions() throws RecognitionException {
     }
 
     @Test
-    public void testArithmeticFunctionTypeMismatch()
-        throws RecognitionException {
+    public void testArithmeticFunctionTypeMismatch() throws RecognitionException {
         BstVM vm = new BstVM(
             """
             FUNCTION { test } {
@@ -98,10 +97,7 @@ public void testArithmeticFunctionTypeMismatch()
             """
         );
 
-        assertThrows(
-            BstVMException.class,
-            () -> vm.render(Collections.emptyList())
-        );
+        assertThrows(BstVMException.class, () -> vm.render(Collections.emptyList()));
     }
 
     @Test
@@ -235,9 +231,7 @@ public void testEmpty() throws RecognitionException {
             ITERATE { test }
             """
         );
-        List<BibEntry> testEntry = List.of(
-            new BibEntry(StandardEntryType.Article)
-        );
+        List<BibEntry> testEntry = List.of(new BibEntry(StandardEntryType.Article));
 
         vm.render(testEntry);
 
@@ -261,10 +255,7 @@ public void testFormatNameStatic() throws RecognitionException {
 
         vm.render(v);
 
-        assertEquals(
-            "de~la Vall{\\'e}e~Poussin, C.~L. X.~J?",
-            vm.getStack().pop()
-        );
+        assertEquals("de~la Vall{\\'e}e~Poussin, C.~L. X.~J?", vm.getStack().pop());
         assertEquals(0, vm.getStack().size());
     }
 
@@ -293,10 +284,7 @@ public void testFormatNameInEntries() throws RecognitionException {
 
         vm.render(testEntries);
 
-        assertEquals(
-            "de~la Vall{\\'e}e~Poussin, C.~L. X.~J?",
-            vm.getStack().pop()
-        );
+        assertEquals("de~la Vall{\\'e}e~Poussin, C.~L. X.~J?", vm.getStack().pop());
         assertEquals("Annabi, H?", vm.getStack().pop());
         assertEquals(0, vm.getStack().size());
     }
@@ -500,8 +488,7 @@ void testAssignFunction() {
 
         vm.render(Collections.emptyList());
 
-        Map<String, BstFunctions.BstFunction> functions =
-            vm.latestContext.functions();
+        Map<String, BstFunctions.BstFunction> functions = vm.latestContext.functions();
         assertTrue(functions.containsKey("test.func"));
         assertNotNull(functions.get("test.func"));
         assertEquals(1, vm.latestContext.integers().get("test.var"));
@@ -684,9 +671,7 @@ public void testWidth() throws RecognitionException {
 
         vm.render(testEntries);
 
-        assertTrue(
-            vm.latestContext.integers().containsKey("longest.label.width")
-        );
+        assertTrue(vm.latestContext.integers().containsKey("longest.label.width"));
         assertEquals("\\begin{thebibliography}{1}", vm.getStack().pop());
     }
 
diff --git a/src/test/java/org/jabref/logic/bst/BstPreviewLayoutTest.java b/src/test/java/org/jabref/logic/bst/BstPreviewLayoutTest.java
index 9b453077cf1..7ef181f481e 100644
--- a/src/test/java/org/jabref/logic/bst/BstPreviewLayoutTest.java
+++ b/src/test/java/org/jabref/logic/bst/BstPreviewLayoutTest.java
@@ -13,8 +13,7 @@
 
 class BstPreviewLayoutTest {
 
-    private final BibDatabaseContext bibDatabaseContext =
-        new BibDatabaseContext();
+    private final BibDatabaseContext bibDatabaseContext = new BibDatabaseContext();
 
     @Test
     public void generatePreviewForSimpleEntryUsingAbbr() throws Exception {
@@ -25,10 +24,7 @@ public void generatePreviewForSimpleEntryUsingAbbr() throws Exception {
             .withField(StandardField.AUTHOR, "Oliver Kopp")
             .withField(StandardField.TITLE, "Thoughts on Development");
         BibDatabase bibDatabase = mock(BibDatabase.class);
-        String preview = bstPreviewLayout.generatePreview(
-            entry,
-            bibDatabaseContext
-        );
+        String preview = bstPreviewLayout.generatePreview(entry, bibDatabaseContext);
         assertEquals("O. Kopp. Thoughts on development.", preview);
     }
 
@@ -42,16 +38,12 @@ public void monthMayIsCorrectlyRendered() throws Exception {
             .withField(StandardField.TITLE, "Thoughts on Development")
             .withField(StandardField.MONTH, "#May#");
         BibDatabase bibDatabase = mock(BibDatabase.class);
-        String preview = bstPreviewLayout.generatePreview(
-            entry,
-            bibDatabaseContext
-        );
+        String preview = bstPreviewLayout.generatePreview(entry, bibDatabaseContext);
         assertEquals("O. Kopp. Thoughts on development, May.", preview);
     }
 
     @Test
-    public void generatePreviewForSliceTheoremPaperUsingAbbr()
-        throws Exception {
+    public void generatePreviewForSliceTheoremPaperUsingAbbr() throws Exception {
         BstPreviewLayout bstPreviewLayout = new BstPreviewLayout(
             Path.of(BstPreviewLayoutTest.class.getResource("abbrv.bst").toURI())
         );
@@ -66,8 +58,7 @@ public void generatePreviewForSliceTheoremPaperUsingAbbr()
     }
 
     @Test
-    public void generatePreviewForSliceTheoremPaperUsingIEEE()
-        throws Exception {
+    public void generatePreviewForSliceTheoremPaperUsingIEEE() throws Exception {
         BstPreviewLayout bstPreviewLayout = new BstPreviewLayout(
             Path.of(ClassLoader.getSystemResource("bst/IEEEtran.bst").toURI())
         );
@@ -94,10 +85,7 @@ private static BibEntry getSliceTheoremPaper() {
                 "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.FILE, ":http\\://arxiv.org/pdf/1405.2249v1:PDF")
             .withField(StandardField.EPRINTTYPE, "arXiv")
             .withField(StandardField.EPRINTCLASS, "math-ph")
             .withField(
diff --git a/src/test/java/org/jabref/logic/bst/BstVMTest.java b/src/test/java/org/jabref/logic/bst/BstVMTest.java
index 27b5aafead4..f14d29a90f2 100644
--- a/src/test/java/org/jabref/logic/bst/BstVMTest.java
+++ b/src/test/java/org/jabref/logic/bst/BstVMTest.java
@@ -33,27 +33,19 @@ public static BibEntry defaultTestEntry() {
             .withField(StandardField.YEAR, "2005")
             .withField(StandardField.OWNER, "oezbek")
             .withField(StandardField.TIMESTAMP, "2006.05.29")
-            .withField(
-                StandardField.URL,
-                "http://james.howison.name/publications.html"
-            );
+            .withField(StandardField.URL, "http://james.howison.name/publications.html");
     }
 
     @Test
     public void testAbbrv() throws RecognitionException, IOException {
-        BstVM vm = new BstVM(
-            Path.of("src/test/resources/org/jabref/logic/bst/abbrv.bst")
-        );
+        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 result = vm.render(testEntries);
 
-        assertEquals(
-            expected.replaceAll("\\s", ""),
-            result.replaceAll("\\s", "")
-        );
+        assertEquals(expected.replaceAll("\\s", ""), result.replaceAll("\\s", ""));
     }
 
     @Test
@@ -147,9 +139,7 @@ public void testVariables() throws RecognitionException {
 
     @Test
     public void testHypthenatedName() throws RecognitionException, IOException {
-        BstVM vm = new BstVM(
-            Path.of("src/test/resources/org/jabref/logic/bst/abbrv.bst")
-        );
+        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")
diff --git a/src/test/java/org/jabref/logic/bst/BstVMVisitorTest.java b/src/test/java/org/jabref/logic/bst/BstVMVisitorTest.java
index 915a4c769f1..4f4265b9953 100644
--- a/src/test/java/org/jabref/logic/bst/BstVMVisitorTest.java
+++ b/src/test/java/org/jabref/logic/bst/BstVMVisitorTest.java
@@ -20,9 +20,7 @@ class BstVMVisitorTest {
 
     @Test
     public void testVisitStringsCommand() {
-        BstVM vm = new BstVM(
-            "STRINGS { test.string1 test.string2 test.string3 }"
-        );
+        BstVM vm = new BstVM("STRINGS { test.string1 test.string2 test.string3 }");
 
         vm.render(Collections.emptyList());
 
@@ -61,8 +59,7 @@ void testVisitFunctionCommand() {
 
         vm.render(Collections.emptyList());
 
-        Map<String, BstFunctions.BstFunction> functions =
-            vm.latestContext.functions();
+        Map<String, BstFunctions.BstFunction> functions = vm.latestContext.functions();
         assertTrue(functions.containsKey("test.func"));
         assertNotNull(functions.get("test.func"));
     }
@@ -78,8 +75,7 @@ void testVisitMacroCommand() {
 
         vm.render(Collections.emptyList());
 
-        Map<String, BstFunctions.BstFunction> functions =
-            vm.latestContext.functions();
+        Map<String, BstFunctions.BstFunction> functions = vm.latestContext.functions();
         assertTrue(functions.containsKey("jan"));
         assertNotNull(functions.get("jan"));
         assertEquals("January", vm.latestContext.stack().pop());
@@ -88,9 +84,7 @@ void testVisitMacroCommand() {
 
     @Test
     void testVisitEntryCommand() {
-        BstVM vm = new BstVM(
-            "ENTRY { address author title type } { variable } { label }"
-        );
+        BstVM vm = new BstVM("ENTRY { address author title type } { variable } { label }");
         List<BibEntry> testEntries = List.of(BstVMTest.defaultTestEntry());
 
         vm.render(testEntries);
@@ -133,10 +127,7 @@ void testVisitReadCommand() {
         assertEquals("2005", fields.get("year"));
         assertEquals("oezbek", fields.get("owner"));
         assertEquals("2006.05.29", fields.get("timestamp"));
-        assertEquals(
-            "http://james.howison.name/publications.html",
-            fields.get("url")
-        );
+        assertEquals("http://james.howison.name/publications.html", fields.get("url"));
     }
 
     @Test
@@ -218,22 +209,10 @@ public void testVisitSortCommand() throws RecognitionException {
         vm.render(testEntries);
 
         List<BstEntry> sortedEntries = vm.latestContext.entries();
-        assertEquals(
-            Optional.of("a"),
-            sortedEntries.get(0).entry.getCitationKey()
-        );
-        assertEquals(
-            Optional.of("b"),
-            sortedEntries.get(1).entry.getCitationKey()
-        );
-        assertEquals(
-            Optional.of("c"),
-            sortedEntries.get(2).entry.getCitationKey()
-        );
-        assertEquals(
-            Optional.of("d"),
-            sortedEntries.get(3).entry.getCitationKey()
-        );
+        assertEquals(Optional.of("a"), sortedEntries.get(0).entry.getCitationKey());
+        assertEquals(Optional.of("b"), sortedEntries.get(1).entry.getCitationKey());
+        assertEquals(Optional.of("c"), sortedEntries.get(2).entry.getCitationKey());
+        assertEquals(Optional.of("d"), sortedEntries.get(3).entry.getCitationKey());
     }
 
     @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 06f60c88cfb..b7bb8b9275e 100644
--- a/src/test/java/org/jabref/logic/bst/util/BstCaseChangersTest.java
+++ b/src/test/java/org/jabref/logic/bst/util/BstCaseChangersTest.java
@@ -14,14 +14,8 @@ public class BstCaseChangersTest {
 
     @ParameterizedTest
     @MethodSource("provideStringsForTitleLowers")
-    public void testChangeCaseTitleLowers(
-        String expected,
-        String toBeFormatted
-    ) {
-        assertEquals(
-            expected,
-            BstCaseChanger.changeCase(toBeFormatted, FormatMode.TITLE_LOWERS)
-        );
+    public void testChangeCaseTitleLowers(String expected, String toBeFormatted) {
+        assertEquals(expected, BstCaseChanger.changeCase(toBeFormatted, FormatMode.TITLE_LOWERS));
     }
 
     private static Stream<Arguments> provideStringsForTitleLowers() {
@@ -63,28 +57,16 @@ private static Stream<Arguments> provideStringsForTitleLowers() {
             Arguments.of("Hallo world; how", "HAllo WORLD; HOW"),
             Arguments.of("Hallo world- how", "HAllo WORLD- HOW"),
             // 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 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")
         );
     }
 
     @ParameterizedTest
     @MethodSource("provideStringsForAllLowers")
     public void testChangeCaseAllLowers(String expected, String toBeFormatted) {
-        assertEquals(
-            expected,
-            BstCaseChanger.changeCase(toBeFormatted, FormatMode.ALL_LOWERS)
-        );
+        assertEquals(expected, BstCaseChanger.changeCase(toBeFormatted, FormatMode.ALL_LOWERS));
     }
 
     private static Stream<Arguments> provideStringsForAllLowers() {
@@ -125,10 +107,7 @@ private static Stream<Arguments> provideStringsForAllLowers() {
     @ParameterizedTest
     @MethodSource("provideStringsForAllUppers")
     public void testChangeCaseAllUppers(String expected, String toBeFormatted) {
-        assertEquals(
-            expected,
-            BstCaseChanger.changeCase(toBeFormatted, FormatMode.ALL_UPPERS)
-        );
+        assertEquals(expected, BstCaseChanger.changeCase(toBeFormatted, FormatMode.ALL_UPPERS));
     }
 
     private static Stream<Arguments> provideStringsForAllUppers() {
@@ -169,10 +148,7 @@ private static Stream<Arguments> provideStringsForAllUppers() {
     @ParameterizedTest
     @MethodSource("provideTitleCaseAllLowers")
     public void testTitleCaseAllLowers(String expected, String toBeFormatted) {
-        assertEquals(
-            expected,
-            BstCaseChanger.changeCase(toBeFormatted, FormatMode.ALL_LOWERS)
-        );
+        assertEquals(expected, BstCaseChanger.changeCase(toBeFormatted, FormatMode.ALL_LOWERS));
     }
 
     private static Stream<Arguments> provideTitleCaseAllLowers() {
@@ -180,10 +156,7 @@ private static Stream<Arguments> provideTitleCaseAllLowers() {
             // 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 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}"
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 ee7ad59c887..6566748e477 100644
--- a/src/test/java/org/jabref/logic/bst/util/BstNameFormatterTest.java
+++ b/src/test/java/org/jabref/logic/bst/util/BstNameFormatterTest.java
@@ -9,9 +9,7 @@ public class BstNameFormatterTest {
 
     @Test
     public void testUmlautsFullNames() {
-        AuthorList list = AuthorList.parse(
-            "Charles Louis Xavier Joseph de la Vall{\\'e}e Poussin"
-        );
+        AuthorList list = AuthorList.parse("Charles Louis Xavier Joseph de la Vall{\\'e}e Poussin");
 
         assertEquals(
             "de~laVall{\\'e}e~PoussinCharles Louis Xavier~Joseph",
@@ -21,44 +19,29 @@ public void testUmlautsFullNames() {
 
     @Test
     public void testUmlautsAbbreviations() {
-        AuthorList list = AuthorList.parse(
-            "Charles Louis Xavier Joseph de la Vall{\\'e}e Poussin"
-        );
+        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.",
-            BstNameFormatter.formatName(
-                list.getAuthor(0),
-                "{vv~}{ll}{, jj}{, f.}"
-            )
+            BstNameFormatter.formatName(list.getAuthor(0), "{vv~}{ll}{, jj}{, f.}")
         );
     }
 
     @Test
     public void testUmlautsAbbreviationsWithQuestionMark() {
-        AuthorList list = AuthorList.parse(
-            "Charles Louis Xavier Joseph de la Vall{\\'e}e Poussin"
-        );
+        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?",
-            BstNameFormatter.formatName(
-                list.getAuthor(0),
-                "{vv~}{ll}{, jj}{, f}?"
-            )
+            BstNameFormatter.formatName(list.getAuthor(0), "{vv~}{ll}{, jj}{, f}?")
         );
     }
 
     @Test
     public void testFormatName() {
-        AuthorList list = AuthorList.parse(
-            "Charles Louis Xavier Joseph de la Vall{\\'e}e Poussin"
-        );
+        AuthorList list = AuthorList.parse("Charles Louis Xavier Joseph de la Vall{\\'e}e Poussin");
 
-        assertEquals(
-            "dlVP",
-            BstNameFormatter.formatName(list.getAuthor(0), "{v{}}{l{}}")
-        );
+        assertEquals("dlVP", BstNameFormatter.formatName(list.getAuthor(0), "{v{}}{l{}}"));
 
         assertNameFormatA(
             "Meyer, J?",
@@ -101,16 +84,8 @@ public void testFormatName() {
         );
     }
 
-    private void assertNameFormat(
-        String string,
-        String string2,
-        int which,
-        String format
-    ) {
-        assertEquals(
-            string,
-            BstNameFormatter.formatName(string2, which, format)
-        );
+    private void assertNameFormat(String string, String string2, int which, String format) {
+        assertEquals(string, BstNameFormatter.formatName(string2, which, format));
     }
 
     private void assertNameFormatC(String string, String string2) {
@@ -130,11 +105,7 @@ public void matchingBraceConsumedForCompleteWords() {
         StringBuilder sb = new StringBuilder();
         assertEquals(
             6,
-            BstNameFormatter.consumeToMatchingBrace(
-                sb,
-                "{HELLO} {WORLD}".toCharArray(),
-                0
-            )
+            BstNameFormatter.consumeToMatchingBrace(sb, "{HELLO} {WORLD}".toCharArray(), 0)
         );
         assertEquals("{HELLO}", sb.toString());
     }
@@ -144,11 +115,7 @@ public void matchingBraceConsumedForBracesInWords() {
         StringBuilder sb = new StringBuilder();
         assertEquals(
             18,
-            BstNameFormatter.consumeToMatchingBrace(
-                sb,
-                "{HE{L{}L}O} {WORLD}".toCharArray(),
-                12
-            )
+            BstNameFormatter.consumeToMatchingBrace(sb, "{HE{L{}L}O} {WORLD}".toCharArray(), 12)
         );
         assertEquals("{WORLD}", sb.toString());
     }
@@ -158,11 +125,7 @@ public void testConsumeToMatchingBrace() {
         StringBuilder sb = new StringBuilder();
         assertEquals(
             10,
-            BstNameFormatter.consumeToMatchingBrace(
-                sb,
-                "{HE{L{}L}O} {WORLD}".toCharArray(),
-                0
-            )
+            BstNameFormatter.consumeToMatchingBrace(sb, "{HE{L{}L}O} {WORLD}".toCharArray(), 0)
         );
         assertEquals("{HE{L{}L}O}", sb.toString());
     }
@@ -184,12 +147,6 @@ public void testNumberOfChars() {
         assertEquals(6, BstNameFormatter.numberOfChars("Vall{\\'e}e", 6));
         assertEquals(6, BstNameFormatter.numberOfChars("Vall{\\'e}e", 7));
         assertEquals(8, BstNameFormatter.numberOfChars("Vall{e}e", -1));
-        assertEquals(
-            6,
-            BstNameFormatter.numberOfChars(
-                "Vall{\\'e this will be skipped}e",
-                -1
-            )
-        );
+        assertEquals(6, BstNameFormatter.numberOfChars("Vall{\\'e this will be skipped}e", -1));
     }
 }
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 6b8385c5078..abbfb7a4070 100644
--- a/src/test/java/org/jabref/logic/bst/util/BstTextPrefixerTest.java
+++ b/src/test/java/org/jabref/logic/bst/util/BstTextPrefixerTest.java
@@ -19,16 +19,10 @@ public void testPrefix() {
         );
         assertPrefix("{\\'e}", "{\\'e}");
         assertPrefix("{\\'{E}}doua", "{\\'{E}}douard Masterly");
-        assertPrefix(
-            "Ulric",
-            "Ulrich {\\\"{U}}nderwood and Ned {\\~N}et and Paul {\\={P}}ot"
-        );
+        assertPrefix("Ulric", "Ulrich {\\\"{U}}nderwood and Ned {\\~N}et and Paul {\\={P}}ot");
     }
 
-    private static void assertPrefix(
-        final String string,
-        final String string2
-    ) {
+    private static void assertPrefix(final String string, final String string2) {
         assertEquals(string, BstTextPrefixer.textPrefix(5, string2));
     }
 }
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 83497f91dac..0172f1c4338 100644
--- a/src/test/java/org/jabref/logic/bst/util/BstWidthCalculatorTest.java
+++ b/src/test/java/org/jabref/logic/bst/util/BstWidthCalculatorTest.java
@@ -50,10 +50,7 @@ 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,
diff --git a/src/test/java/org/jabref/logic/citationkeypattern/BracketedPatternTest.java b/src/test/java/org/jabref/logic/citationkeypattern/BracketedPatternTest.java
index d1468dfe82e..eeb52ca6b18 100644
--- a/src/test/java/org/jabref/logic/citationkeypattern/BracketedPatternTest.java
+++ b/src/test/java/org/jabref/logic/citationkeypattern/BracketedPatternTest.java
@@ -41,10 +41,7 @@ void setUp() {
         dbentry =
             new BibEntry(StandardEntryType.Article)
                 .withCitationKey("HipKro03")
-                .withField(
-                    StandardField.AUTHOR,
-                    "Eric von Hippel and Georg von Krogh"
-                )
+                .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"
@@ -58,10 +55,7 @@ void setUp() {
                     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.DOI, "http://dx.doi.org/10.1287/orsc.14.2.209.14992")
                 .withField(StandardField.ISSN, "1526-5455")
                 .withField(StandardField.PUBLISHER, "INFORMS");
 
@@ -74,10 +68,7 @@ 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("AachenBerlinChemnitzEtAl", "Aachen and Berlin and Chemnitz and others"),
             Arguments.of(
                 "AachenBerlinChemnitzDüsseldorf",
                 "Aachen and Berlin and Chemnitz and Düsseldorf"
@@ -109,18 +100,9 @@ static Stream<Arguments> authorsAlpha() {
             Arguments.of("A+", "Aachen and others"),
             Arguments.of("AB+", "Aachen and Berlin and others"),
             Arguments.of("ABC+", "Aachen and Berlin and Chemnitz and others"),
-            Arguments.of(
-                "ABCD",
-                "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("ABCD", "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"
@@ -144,10 +126,7 @@ static Stream<Arguments> oneAuthorPlusInitials() {
             Arguments.of("Newto", "I. Newton"),
             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("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"
@@ -156,22 +135,10 @@ static Stream<Arguments> oneAuthorPlusInitials() {
             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("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"
@@ -189,32 +156,17 @@ static Stream<Arguments> authShort() {
         return Stream.of(
             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"),
+            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"),
             Arguments.of("AB+", "Aachen and Berlin and others"),
             Arguments.of("ABC", "Aachen and Berlin and Chemnitz"),
             Arguments.of("ABC+", "Aachen and Berlin and Chemnitz and others"),
-            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"),
+            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"
@@ -232,14 +184,8 @@ static Stream<Arguments> authIni1() {
         return Stream.of(
             Arguments.of("N", "Isaac Newton"),
             Arguments.of("N", "Isaac Newton and James Maxwell"),
-            Arguments.of(
-                "N",
-                "Isaac Newton and James Maxwell and Albert Einstein"
-            ),
-            Arguments.of(
-                "N",
-                "Isaac Newton and James Maxwell and Albert Einstein and N. Bohr"
-            ),
+            Arguments.of("N", "Isaac Newton and James Maxwell and Albert Einstein"),
+            Arguments.of("N", "Isaac Newton and James Maxwell and Albert Einstein and N. Bohr"),
             Arguments.of("A", "Aachen"),
             Arguments.of("A", "Aachen and others"),
             Arguments.of("A", "Aachen and Berlin"),
@@ -247,18 +193,9 @@ static Stream<Arguments> authIni1() {
             Arguments.of("A", "Aachen and Berlin and Chemnitz"),
             Arguments.of("A", "Aachen and Berlin and Chemnitz and others"),
             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 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")
         );
     }
 
@@ -272,14 +209,8 @@ static Stream<Arguments> authIni2() {
         return Stream.of(
             Arguments.of("Ne", "Isaac Newton"),
             Arguments.of("NM", "Isaac Newton and James Maxwell"),
-            Arguments.of(
-                "N+",
-                "Isaac Newton and James Maxwell and Albert Einstein"
-            ),
-            Arguments.of(
-                "N+",
-                "Isaac Newton and James Maxwell and Albert Einstein and N. Bohr"
-            ),
+            Arguments.of("N+", "Isaac Newton and James Maxwell and Albert Einstein"),
+            Arguments.of("N+", "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"),
@@ -288,18 +219,9 @@ static Stream<Arguments> authIni2() {
             Arguments.of("D+", "John Doe and Donald Smith and Will Wonder"),
             Arguments.of("A+", "Aachen and Berlin and Chemnitz and others"),
             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 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")
         );
     }
 
@@ -313,32 +235,17 @@ static Stream<Arguments> authIni4() {
         return Stream.of(
             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("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("Aach", "Aachen"),
             Arguments.of("Aac+", "Aachen and others"),
             Arguments.of("AaBe", "Aachen and Berlin"),
             Arguments.of("AaB+", "Aachen and Berlin and others"),
             Arguments.of("AaBC", "Aachen and Berlin and Chemnitz"),
             Arguments.of("ABC+", "Aachen and Berlin and Chemnitz and others"),
-            Arguments.of(
-                "ABCD",
-                "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("ABCD", "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"
@@ -356,10 +263,7 @@ static Stream<Arguments> authEtAlDotDotEal() {
         return Stream.of(
             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"),
             Arguments.of(
                 "Newton.etal",
                 "Isaac Newton and James Maxwell and Albert Einstein and N. Bohr"
@@ -369,22 +273,10 @@ static Stream<Arguments> authEtAlDotDotEal() {
             Arguments.of("Aachen.Berlin", "Aachen and Berlin"),
             Arguments.of("Aachen.etal", "Aachen and Berlin and others"),
             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 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"
@@ -402,10 +294,7 @@ 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"),
             Arguments.of(
                 "Newton.Maxwell.ea",
                 "Isaac Newton and James Maxwell and Albert Einstein and N. Bohr"
@@ -415,14 +304,8 @@ static Stream<Arguments> authAuthEa() {
             Arguments.of("Aachen.Berlin", "Aachen and Berlin"),
             Arguments.of("Aachen.Berlin.ea", "Aachen and Berlin and others"),
             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 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"
@@ -466,13 +349,8 @@ void authShort(String expected, AuthorList list) {
             "'EUASA', '[authors]', '{European Union Aviation Safety Agency}'",
         }
     )
-    void testAuthorFieldMarkers(
-        String expectedCitationKey,
-        String pattern,
-        String author
-    ) {
-        BibEntry bibEntry = new BibEntry()
-            .withField(StandardField.AUTHOR, author);
+    void testAuthorFieldMarkers(String expectedCitationKey, String pattern, String author) {
+        BibEntry bibEntry = new BibEntry().withField(StandardField.AUTHOR, author);
         BracketedPattern bracketedPattern = new BracketedPattern(pattern);
         assertEquals(expectedCitationKey, bracketedPattern.expand(bibEntry));
     }
@@ -502,22 +380,15 @@ void expandBracketsWithFallback(String expandResult, String pattern) {
 
     @Test
     void bibentryExpansionTest() {
-        BracketedPattern pattern = new BracketedPattern(
-            "[year]_[auth]_[firstpage]"
-        );
+        BracketedPattern pattern = new BracketedPattern("[year]_[auth]_[firstpage]");
         assertEquals("2017_Kitsune_213", pattern.expand(bibentry));
     }
 
     @Test
     void nullDatabaseExpansionTest() {
         BibDatabase another_database = null;
-        BracketedPattern pattern = new BracketedPattern(
-            "[year]_[auth]_[firstpage]"
-        );
-        assertEquals(
-            "2017_Kitsune_213",
-            pattern.expand(bibentry, another_database)
-        );
+        BracketedPattern pattern = new BracketedPattern("[year]_[auth]_[firstpage]");
+        assertEquals("2017_Kitsune_213", pattern.expand(bibentry, another_database));
     }
 
     @Test
@@ -531,10 +402,7 @@ void pureauthReturnsAuthorIfEditorIsAbsent() {
     void pureauthReturnsAuthorIfEditorIsPresent() {
         BibDatabase emptyDatabase = new BibDatabase();
         BracketedPattern pattern = new BracketedPattern("[pureauth]");
-        bibentry.setField(
-            StandardField.EDITOR,
-            "Editorlastname, Editorfirstname"
-        );
+        bibentry.setField(StandardField.EDITOR, "Editorlastname, Editorfirstname");
         assertEquals("Kitsune", pattern.expand(bibentry, emptyDatabase));
     }
 
@@ -551,23 +419,15 @@ void pureauthReturnsEmptyStringIfAuthorIsAbsentAndEditorIsPresent() {
         BibDatabase emptyDatabase = new BibDatabase();
         BracketedPattern pattern = new BracketedPattern("[pureauth]");
         bibentry.clearField(StandardField.AUTHOR);
-        bibentry.setField(
-            StandardField.EDITOR,
-            "Editorlastname, Editorfirstname"
-        );
+        bibentry.setField(StandardField.EDITOR, "Editorlastname, Editorfirstname");
         assertEquals("", pattern.expand(bibentry, emptyDatabase));
     }
 
     @Test
     void emptyDatabaseExpansionTest() {
         BibDatabase another_database = new BibDatabase();
-        BracketedPattern pattern = new BracketedPattern(
-            "[year]_[auth]_[firstpage]"
-        );
-        assertEquals(
-            "2017_Kitsune_213",
-            pattern.expand(bibentry, another_database)
-        );
+        BracketedPattern pattern = new BracketedPattern("[year]_[auth]_[firstpage]");
+        assertEquals("2017_Kitsune_213", pattern.expand(bibentry, another_database));
     }
 
     @Test
@@ -580,36 +440,25 @@ void databaseWithStringsExpansionTest() {
                 .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)
-        );
+        BracketedPattern pattern = new BracketedPattern("[year]_[auth]_[firstpage]");
+        assertEquals("2017_Gražulis_213", pattern.expand(bibentry, another_database));
     }
 
     @Test
     void unbalancedBracketsExpandToSomething() {
-        BracketedPattern pattern = new BracketedPattern(
-            "[year]_[auth_[firstpage]"
-        );
+        BracketedPattern pattern = new BracketedPattern("[year]_[auth_[firstpage]");
         assertNotEquals("", pattern.expand(bibentry));
     }
 
     @Test
     void unbalancedLastBracketExpandsToSomething() {
-        BracketedPattern pattern = new BracketedPattern(
-            "[year]_[auth]_[firstpage"
-        );
+        BracketedPattern pattern = new BracketedPattern("[year]_[auth]_[firstpage");
         assertNotEquals("", pattern.expand(bibentry));
     }
 
     @Test
     void entryTypeExpansionTest() {
-        BracketedPattern pattern = new BracketedPattern(
-            "[entrytype]:[year]_[auth]_[pages]"
-        );
+        BracketedPattern pattern = new BracketedPattern("[entrytype]:[year]_[auth]_[pages]");
         assertEquals("Misc:2017_Kitsune_213--216", pattern.expand(bibentry));
     }
 
@@ -624,26 +473,19 @@ void entryTypeExpansionLowercaseTest() {
     @Test
     void suppliedBibentryBracketExpansionTest() {
         BibDatabase another_database = null;
-        BracketedPattern pattern = new BracketedPattern(
-            "[year]_[auth]_[firstpage]"
-        );
+        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");
-        assertEquals(
-            "2017_Gražulis_213",
-            pattern.expand(another_bibentry, ';', another_database)
-        );
+        assertEquals("2017_Gražulis_213", pattern.expand(another_bibentry, ';', another_database));
     }
 
     @Test
     void nullBibentryBracketExpansionTest() {
         BibDatabase another_database = null;
         BibEntry another_bibentry = null;
-        BracketedPattern pattern = new BracketedPattern(
-            "[year]_[auth]_[firstpage]"
-        );
+        BracketedPattern pattern = new BracketedPattern("[year]_[auth]_[firstpage]");
         assertThrows(
             NullPointerException.class,
             () -> pattern.expand(another_bibentry, ';', another_database)
@@ -662,37 +504,18 @@ void bracketedExpressionDefaultConstructorTest() {
 
     @Test
     void unknownKeyExpandsToEmptyString() {
-        assertEquals(
-            "",
-            BracketedPattern.expandBrackets(
-                "[unknownkey]",
-                ';',
-                dbentry,
-                database
-            )
-        );
+        assertEquals("", BracketedPattern.expandBrackets("[unknownkey]", ';', dbentry, database));
     }
 
     @Test
     void emptyPatternAndEmptyModifierExpandsToEmptyString() {
-        assertEquals(
-            "",
-            BracketedPattern.expandBrackets("[:]", ';', dbentry, database)
-        );
+        assertEquals("", BracketedPattern.expandBrackets("[:]", ';', dbentry, database));
     }
 
     @Test
     void emptyPatternAndValidModifierExpandsToEmptyString() {
         Character separator = ';';
-        assertEquals(
-            "",
-            BracketedPattern.expandBrackets(
-                "[:lower]",
-                separator,
-                dbentry,
-                database
-            )
-        );
+        assertEquals("", BracketedPattern.expandBrackets("[:lower]", separator, dbentry, database));
     }
 
     @Test
@@ -700,12 +523,7 @@ void bibtexkeyPatternExpandsToCitationKey() {
         Character separator = ';';
         assertEquals(
             "HipKro03",
-            BracketedPattern.expandBrackets(
-                "[bibtexkey]",
-                separator,
-                dbentry,
-                database
-            )
+            BracketedPattern.expandBrackets("[bibtexkey]", separator, dbentry, database)
         );
     }
 
@@ -714,12 +532,7 @@ void citationKeyPatternExpandsToCitationKey() {
         Character separator = ';';
         assertEquals(
             "HipKro03",
-            BracketedPattern.expandBrackets(
-                "[citationkey]",
-                separator,
-                dbentry,
-                database
-            )
+            BracketedPattern.expandBrackets("[citationkey]", separator, dbentry, database)
         );
     }
 
@@ -727,12 +540,7 @@ void citationKeyPatternExpandsToCitationKey() {
     void citationKeyPatternWithEmptyModifierExpandsToBibTeXKey() {
         assertEquals(
             "HipKro03",
-            BracketedPattern.expandBrackets(
-                "[citationkey:]",
-                ';',
-                dbentry,
-                database
-            )
+            BracketedPattern.expandBrackets("[citationkey:]", ';', dbentry, database)
         );
     }
 
@@ -748,100 +556,54 @@ void authorPatternTreatsVonNamePrefixCorrectly() {
     void lowerFormatterWorksOnVonNamePrefixes() {
         assertEquals(
             "eric von hippel and georg von krogh",
-            BracketedPattern.expandBrackets(
-                "[author:lower]",
-                ';',
-                dbentry,
-                database
-            )
+            BracketedPattern.expandBrackets("[author:lower]", ';', dbentry, database)
         );
     }
 
     @Test
     void testResolvedFieldAndFormat() {
-        BibEntry child = new BibEntry()
-            .withField(StandardField.CROSSREF, "HipKro03");
+        BibEntry child = new BibEntry().withField(StandardField.CROSSREF, "HipKro03");
         database.insertEntry(child);
 
         Character separator = ';';
         assertEquals(
             "Eric von Hippel and Georg von Krogh",
-            BracketedPattern.expandBrackets(
-                "[author]",
-                separator,
-                child,
-                database
-            )
+            BracketedPattern.expandBrackets("[author]", separator, child, database)
         );
 
         assertEquals(
             "",
-            BracketedPattern.expandBrackets(
-                "[unknownkey]",
-                separator,
-                child,
-                database
-            )
+            BracketedPattern.expandBrackets("[unknownkey]", separator, child, database)
         );
 
-        assertEquals(
-            "",
-            BracketedPattern.expandBrackets("[:]", separator, child, database)
-        );
+        assertEquals("", BracketedPattern.expandBrackets("[:]", separator, child, database));
 
-        assertEquals(
-            "",
-            BracketedPattern.expandBrackets(
-                "[:lower]",
-                separator,
-                child,
-                database
-            )
-        );
+        assertEquals("", BracketedPattern.expandBrackets("[:lower]", separator, child, database));
 
         assertEquals(
             "eric von hippel and georg von krogh",
-            BracketedPattern.expandBrackets(
-                "[author:lower]",
-                separator,
-                child,
-                database
-            )
+            BracketedPattern.expandBrackets("[author:lower]", separator, child, database)
         );
 
         // the citation key is not inherited
         assertEquals(
             "",
-            BracketedPattern.expandBrackets(
-                "[citationkey]",
-                separator,
-                child,
-                database
-            )
+            BracketedPattern.expandBrackets("[citationkey]", separator, child, database)
         );
 
         assertEquals(
             "",
-            BracketedPattern.expandBrackets(
-                "[citationkey:]",
-                separator,
-                child,
-                database
-            )
+            BracketedPattern.expandBrackets("[citationkey:]", separator, child, database)
         );
     }
 
     @Test
     void testResolvedParentNotInDatabase() {
-        BibEntry child = new BibEntry()
-            .withField(StandardField.CROSSREF, "HipKro03");
+        BibEntry child = new BibEntry().withField(StandardField.CROSSREF, "HipKro03");
         database.removeEntry(dbentry);
         database.insertEntry(child);
 
-        assertEquals(
-            "",
-            BracketedPattern.expandBrackets("[author]", ';', child, database)
-        );
+        assertEquals("", BracketedPattern.expandBrackets("[author]", ';', child, database));
     }
 
     @Test
@@ -874,12 +636,7 @@ void regularExpressionWithBrackets() {
     void testEmptyBrackets() {
         assertEquals(
             "2003-Organization Science",
-            BracketedPattern.expandBrackets(
-                "[year][]-[journal]",
-                ';',
-                dbentry,
-                database
-            )
+            BracketedPattern.expandBrackets("[year][]-[journal]", ';', dbentry, database)
         );
     }
 
@@ -903,12 +660,7 @@ void expandBracketsChainsTwoTruncateModifiers() {
     void expandBracketsDoesNotTruncateWithoutAnArgumentToTruncateModifier() {
         assertEquals(
             "Open Source Software and the \"Private-Collective\" Innovation Model: Issues for Organization Science",
-            BracketedPattern.expandBrackets(
-                "[fulltitle:truncate]",
-                ';',
-                dbentry,
-                database
-            )
+            BracketedPattern.expandBrackets("[fulltitle:truncate]", ';', dbentry, database)
         );
     }
 
@@ -922,28 +674,17 @@ void expandBracketsWithAuthorStartingWithBrackets() {
             );
         assertEquals(
             "ŠpanělEtAl",
-            BracketedPattern.expandBrackets(
-                "[authEtAl:latex_to_unicode]",
-                null,
-                bibEntry,
-                null
-            )
+            BracketedPattern.expandBrackets("[authEtAl:latex_to_unicode]", null, bibEntry, null)
         );
     }
 
     @Test
     void expandBracketsWithModifierContainingRegexCharacterClass() {
-        BibEntry bibEntry = new BibEntry()
-            .withField(StandardField.TITLE, "Wickedness:Managing");
+        BibEntry bibEntry = new BibEntry().withField(StandardField.TITLE, "Wickedness:Managing");
 
         assertEquals(
             "Wickedness.Managing",
-            BracketedPattern.expandBrackets(
-                "[title:regex(\"[:]+\",\".\")]",
-                null,
-                bibEntry,
-                null
-            )
+            BracketedPattern.expandBrackets("[title:regex(\"[:]+\",\".\")]", null, bibEntry, null)
         );
     }
 
@@ -951,10 +692,7 @@ void expandBracketsWithModifierContainingRegexCharacterClass() {
     void expandBracketsEmptyStringFromEmptyBrackets() {
         BibEntry bibEntry = new BibEntry();
 
-        assertEquals(
-            "",
-            BracketedPattern.expandBrackets("[]", null, bibEntry, null)
-        );
+        assertEquals("", BracketedPattern.expandBrackets("[]", null, bibEntry, null));
     }
 
     @Test
@@ -974,43 +712,28 @@ void expandBracketsInstitutionAbbreviationFromProvidedAbbreviation() {
     @Test
     void expandBracketsInstitutionAbbreviationForAuthorContainingUnion() {
         BibEntry bibEntry = new BibEntry()
-            .withField(
-                StandardField.AUTHOR,
-                "{European Union Aviation Safety Agency}"
-            );
+            .withField(StandardField.AUTHOR, "{European Union Aviation Safety Agency}");
 
-        assertEquals(
-            "EUASA",
-            BracketedPattern.expandBrackets("[auth]", null, bibEntry, null)
-        );
+        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)
-        );
+        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)
-        );
+        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",
@@ -1020,8 +743,7 @@ void expandBracketsUnmodifiedStringFromLongFirstPageNumber() {
 
     @Test
     void expandBracketsUnmodifiedStringFromLongLastPageNumber() {
-        BibEntry bibEntry = new BibEntry()
-            .withField(StandardField.PAGES, "2325967120921344");
+        BibEntry bibEntry = new BibEntry().withField(StandardField.PAGES, "2325967120921344");
 
         assertEquals(
             "2325967120921344",
@@ -1033,10 +755,7 @@ void expandBracketsUnmodifiedStringFromLongLastPageNumber() {
     void expandBracketsWithTestCasesFromRegExpBasedFileFinder() {
         BibEntry entry = new BibEntry(StandardEntryType.Article)
             .withCitationKey("HipKro03")
-            .withField(
-                StandardField.AUTHOR,
-                "Eric von Hippel and Georg von Krogh"
-            )
+            .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"
@@ -1050,29 +769,18 @@ void expandBracketsWithTestCasesFromRegExpBasedFileFinder() {
                 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.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("", BracketedPattern.expandBrackets("", ',', entry, database));
 
         assertEquals(
             "dropped",
-            BracketedPattern.expandBrackets(
-                "drop[unknownkey]ped",
-                ',',
-                entry,
-                database
-            )
+            BracketedPattern.expandBrackets("drop[unknownkey]ped", ',', entry, database)
         );
 
         assertEquals(
@@ -1124,18 +832,10 @@ void expandBracketsWithTestCasesFromRegExpBasedFileFinder() {
     @Test
     void expandBracketsWithoutProtectiveBracesUsingUnprotectTermsModifier() {
         BibEntry bibEntry = new BibEntry()
-            .withField(
-                StandardField.JOURNAL,
-                "{ACS} Medicinal Chemistry Letters"
-            );
+            .withField(StandardField.JOURNAL, "{ACS} Medicinal Chemistry Letters");
         assertEquals(
             "ACS Medicinal Chemistry Letters",
-            BracketedPattern.expandBrackets(
-                "[JOURNAL:unprotect_terms]",
-                null,
-                bibEntry,
-                null
-            )
+            BracketedPattern.expandBrackets("[JOURNAL:unprotect_terms]", null, bibEntry, null)
         );
     }
 
@@ -1156,13 +856,8 @@ void expandBracketsWithoutProtectiveBracesUsingUnprotectTermsModifier() {
             "'EUASA', '[editors]', '{European Union Aviation Safety Agency}'",
         }
     )
-    void testEditorFieldMarkers(
-        String expectedCitationKey,
-        String pattern,
-        String editor
-    ) {
-        BibEntry bibEntry = new BibEntry()
-            .withField(StandardField.EDITOR, editor);
+    void testEditorFieldMarkers(String expectedCitationKey, String pattern, String editor) {
+        BibEntry bibEntry = new BibEntry().withField(StandardField.EDITOR, editor);
         BracketedPattern bracketedPattern = new BracketedPattern(pattern);
         assertEquals(expectedCitationKey, bracketedPattern.expand(bibEntry));
     }
diff --git a/src/test/java/org/jabref/logic/citationkeypattern/CitationKeyGeneratorTest.java b/src/test/java/org/jabref/logic/citationkeypattern/CitationKeyGeneratorTest.java
index 24f1b1ffa03..96c2c454d06 100644
--- a/src/test/java/org/jabref/logic/citationkeypattern/CitationKeyGeneratorTest.java
+++ b/src/test/java/org/jabref/logic/citationkeypattern/CitationKeyGeneratorTest.java
@@ -31,12 +31,9 @@ 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 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
-        );
+        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");
@@ -44,16 +41,12 @@ class CitationKeyGeneratorTest {
     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
-        );
+        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
-        );
+        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");
@@ -67,9 +60,7 @@ class CitationKeyGeneratorTest {
     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"
-        );
+        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"
@@ -109,8 +100,7 @@ class CitationKeyGeneratorTest {
 
     @BeforeEach
     void setUp() {
-        importFormatPreferences =
-            mock(ImportFormatPreferences.class, Answers.RETURNS_DEEP_STUBS);
+        importFormatPreferences = mock(ImportFormatPreferences.class, Answers.RETURNS_DEEP_STUBS);
     }
 
     private static BibEntry createABibEntryAuthor(String author) {
@@ -121,32 +111,22 @@ static String generateKey(BibEntry entry, String pattern) {
         return generateKey(entry, pattern, new BibDatabase());
     }
 
-    static String generateKey(
-        BibEntry entry,
-        String pattern,
-        BibDatabase database
-    ) {
-        GlobalCitationKeyPattern keyPattern =
-            GlobalCitationKeyPattern.fromPattern(pattern);
-        CitationKeyPatternPreferences patternPreferences =
-            new CitationKeyPatternPreferences(
-                false,
-                false,
-                false,
-                CitationKeyPatternPreferences.KeySuffix.SECOND_WITH_A,
-                "",
-                "",
-                DEFAULT_UNWANTED_CHARACTERS,
-                keyPattern,
-                "",
-                ','
-            );
-
-        return new CitationKeyGenerator(
+    static String generateKey(BibEntry entry, String pattern, BibDatabase database) {
+        GlobalCitationKeyPattern keyPattern = GlobalCitationKeyPattern.fromPattern(pattern);
+        CitationKeyPatternPreferences patternPreferences = new CitationKeyPatternPreferences(
+            false,
+            false,
+            false,
+            CitationKeyPatternPreferences.KeySuffix.SECOND_WITH_A,
+            "",
+            "",
+            DEFAULT_UNWANTED_CHARACTERS,
             keyPattern,
-            database,
-            patternPreferences
-        )
+            "",
+            ','
+        );
+
+        return new CitationKeyGenerator(keyPattern, database, patternPreferences)
             .generateKey(entry);
     }
 
@@ -168,8 +148,7 @@ void testAndInAuthorName() throws ParseException {
     @Test
     void testCrossrefAndInAuthorNames() {
         BibDatabase database = new BibDatabase();
-        BibEntry entry1 = new BibEntry()
-            .withField(StandardField.CROSSREF, "entry2");
+        BibEntry entry1 = new BibEntry().withField(StandardField.CROSSREF, "entry2");
         BibEntry entry2 = new BibEntry()
             .withCitationKey("entry2")
             .withField(StandardField.AUTHOR, "Simon Holland");
@@ -196,11 +175,7 @@ void testAndAuthorNames() throws ParseException {
         assertEquals(
             "HerlandHaugeHelgeland",
             CitationKeyGenerator.cleanKey(
-                generateKey(
-                    entry.orElse(null),
-                    "[authors3]",
-                    new BibDatabase()
-                ),
+                generateKey(entry.orElse(null), "[authors3]", new BibDatabase()),
                 DEFAULT_UNWANTED_CHARACTERS
             )
         );
@@ -209,8 +184,7 @@ void testAndAuthorNames() throws ParseException {
     @Test
     void testCrossrefAndAuthorNames() {
         BibDatabase database = new BibDatabase();
-        BibEntry entry1 = new BibEntry()
-            .withField(StandardField.CROSSREF, "entry2");
+        BibEntry entry1 = new BibEntry().withField(StandardField.CROSSREF, "entry2");
         BibEntry entry2 = new BibEntry()
             .withCitationKey("entry2")
             .withField(
@@ -277,24 +251,15 @@ void testSpecialLatexCharacterInAuthorName() throws ParseException {
         "@ARTICLE{kohn, author={Andrés Aʹrnold}, year={2000}}", "Arn"
         """
     )
-    void testMakeLabelAndCheckLegalKeys(
-        String bibtexString,
-        String expectedResult
-    ) throws ParseException {
+    void testMakeLabelAndCheckLegalKeys(String bibtexString, String expectedResult)
+        throws ParseException {
         Optional<BibEntry> bibEntry = BibtexParser.singleFromString(
             bibtexString,
             importFormatPreferences
         );
-        String citationKey = generateKey(
-            bibEntry.orElse(null),
-            "[auth3]",
-            new BibDatabase()
-        );
+        String citationKey = generateKey(bibEntry.orElse(null), "[auth3]", new BibDatabase());
 
-        String cleanedKey = CitationKeyGenerator.cleanKey(
-            citationKey,
-            DEFAULT_UNWANTED_CHARACTERS
-        );
+        String cleanedKey = CitationKeyGenerator.cleanKey(citationKey, DEFAULT_UNWANTED_CHARACTERS);
 
         assertEquals(expectedResult, cleanedKey);
     }
@@ -303,24 +268,15 @@ void testMakeLabelAndCheckLegalKeys(
     void testFirstAuthor() {
         assertEquals(
             "Newton",
-            generateKey(
-                AUTHOR_FIRSTNAME_INITIAL_LASTNAME_FULL_COUNT_5,
-                "[auth]"
-            )
+            generateKey(AUTHOR_FIRSTNAME_INITIAL_LASTNAME_FULL_COUNT_5, "[auth]")
         );
         assertEquals(
             "Newton",
-            generateKey(
-                AUTHOR_FIRSTNAME_INITIAL_LASTNAME_FULL_COUNT_1,
-                "[auth]"
-            )
+            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]")
-        );
+        assertEquals("Koening", generateKey(createABibEntryAuthor("K{\\\"o}ning"), "[auth]"));
 
         assertEquals("", generateKey(createABibEntryAuthor(""), "[auth]"));
     }
@@ -390,8 +346,7 @@ void testCheckLegalKey(String accents, String expectedResult) {
     @Test
     void testcrossrefUniversity() {
         BibDatabase database = new BibDatabase();
-        BibEntry entry1 = new BibEntry()
-            .withField(StandardField.CROSSREF, "entry2");
+        BibEntry entry1 = new BibEntry().withField(StandardField.CROSSREF, "entry2");
         BibEntry entry2 = new BibEntry()
             .withCitationKey("entry2")
             .withField(StandardField.AUTHOR, "{Link{\\\"{o}}ping University}");
@@ -425,8 +380,7 @@ void testDepartment() throws ParseException {
     @Test
     void testcrossrefDepartment() {
         BibDatabase database = new BibDatabase();
-        BibEntry entry1 = new BibEntry()
-            .withField(StandardField.CROSSREF, "entry2");
+        BibEntry entry1 = new BibEntry().withField(StandardField.CROSSREF, "entry2");
         BibEntry entry2 = new BibEntry()
             .withCitationKey("entry2")
             .withField(
@@ -495,8 +449,7 @@ void generateKeyAbbreviateCorporateAuthorSchoolWithoutAcademicInstitute()
     @Test
     void testcrossrefSchool() {
         BibDatabase database = new BibDatabase();
-        BibEntry entry1 = new BibEntry()
-            .withField(StandardField.CROSSREF, "entry2");
+        BibEntry entry1 = new BibEntry().withField(StandardField.CROSSREF, "entry2");
         BibEntry entry2 = new BibEntry()
             .withCitationKey("entry2")
             .withField(
@@ -533,14 +486,10 @@ void testInstituteOfTechnology() throws ParseException {
     @Test
     void testcrossrefInstituteOfTechnology() {
         BibDatabase database = new BibDatabase();
-        BibEntry entry1 = new BibEntry()
-            .withField(StandardField.CROSSREF, "entry2");
+        BibEntry entry1 = new BibEntry().withField(StandardField.CROSSREF, "entry2");
         BibEntry entry2 = new BibEntry()
             .withCitationKey("entry2")
-            .withField(
-                StandardField.AUTHOR,
-                "{Massachusetts Institute of Technology}"
-            );
+            .withField(StandardField.AUTHOR, "{Massachusetts Institute of Technology}");
         database.insertEntry(entry1);
         database.insertEntry(entry2);
 
@@ -558,68 +507,38 @@ void testAuthIniN() {
         assertEquals("", generateKey(AUTHOR_EMPTY, "[authIni4]"));
         assertEquals(
             "Newt",
-            generateKey(
-                AUTHOR_FIRSTNAME_INITIAL_LASTNAME_FULL_COUNT_1,
-                "[authIni4]"
-            )
+            generateKey(AUTHOR_FIRSTNAME_INITIAL_LASTNAME_FULL_COUNT_1, "[authIni4]")
         );
         assertEquals(
             "NeMa",
-            generateKey(
-                AUTHOR_FIRSTNAME_INITIAL_LASTNAME_FULL_COUNT_2,
-                "[authIni4]"
-            )
+            generateKey(AUTHOR_FIRSTNAME_INITIAL_LASTNAME_FULL_COUNT_2, "[authIni4]")
         );
         assertEquals(
             "NeME",
-            generateKey(
-                AUTHOR_FIRSTNAME_INITIAL_LASTNAME_FULL_COUNT_3,
-                "[authIni4]"
-            )
+            generateKey(AUTHOR_FIRSTNAME_INITIAL_LASTNAME_FULL_COUNT_3, "[authIni4]")
         );
         assertEquals(
             "NMEB",
-            generateKey(
-                AUTHOR_FIRSTNAME_INITIAL_LASTNAME_FULL_COUNT_4,
-                "[authIni4]"
-            )
+            generateKey(AUTHOR_FIRSTNAME_INITIAL_LASTNAME_FULL_COUNT_4, "[authIni4]")
         );
         assertEquals(
             "NME+",
-            generateKey(
-                AUTHOR_FIRSTNAME_INITIAL_LASTNAME_FULL_COUNT_5,
-                "[authIni4]"
-            )
+            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]"
-            )
+            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]"
-            )
+            generateKey(AUTHOR_FIRSTNAME_INITIAL_LASTNAME_FULL_COUNT_1, "[authIni6]")
         );
         assertEquals(
             "Newton",
-            generateKey(
-                AUTHOR_FIRSTNAME_INITIAL_LASTNAME_FULL_COUNT_1,
-                "[authIni7]"
-            )
+            generateKey(AUTHOR_FIRSTNAME_INITIAL_LASTNAME_FULL_COUNT_1, "[authIni7]")
         );
     }
 
@@ -688,31 +607,13 @@ void testAuthShort() {
         // 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_3,
-                AUTHSHORT
-            )
-        );
-        assertEquals(
-            "NM",
-            generateKey(
-                AUTHOR_FIRSTNAME_INITIAL_LASTNAME_FULL_COUNT_2,
-                AUTHSHORT
-            )
+            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
-            )
+            generateKey(AUTHOR_FIRSTNAME_INITIAL_LASTNAME_FULL_COUNT_1, AUTHSHORT)
         );
     }
 
@@ -777,10 +678,7 @@ void authNM() {
             )
         );
 
-        assertEquals(
-            "",
-            generateKey(AUTHOR_EMPTY, String.format(AUTHNOFMTH, 2, 4))
-        );
+        assertEquals("", generateKey(AUTHOR_EMPTY, String.format(AUTHNOFMTH, 2, 4)));
     }
 
     /**
@@ -788,34 +686,10 @@ void authNM() {
      */
     @Test
     void firstAuthorForenameInitials() {
-        assertEquals(
-            "I",
-            generateKey(
-                AUTHOR_FIRSTNAME_INITIAL_LASTNAME_FULL_COUNT_1,
-                AUTHFOREINI
-            )
-        );
-        assertEquals(
-            "I",
-            generateKey(
-                AUTHOR_FIRSTNAME_INITIAL_LASTNAME_FULL_COUNT_2,
-                AUTHFOREINI
-            )
-        );
-        assertEquals(
-            "I",
-            generateKey(
-                AUTHOR_FIRSTNAME_FULL_LASTNAME_FULL_COUNT_1,
-                AUTHFOREINI
-            )
-        );
-        assertEquals(
-            "I",
-            generateKey(
-                AUTHOR_FIRSTNAME_FULL_LASTNAME_FULL_COUNT_2,
-                AUTHFOREINI
-            )
-        );
+        assertEquals("I", generateKey(AUTHOR_FIRSTNAME_INITIAL_LASTNAME_FULL_COUNT_1, AUTHFOREINI));
+        assertEquals("I", generateKey(AUTHOR_FIRSTNAME_INITIAL_LASTNAME_FULL_COUNT_2, AUTHFOREINI));
+        assertEquals("I", generateKey(AUTHOR_FIRSTNAME_FULL_LASTNAME_FULL_COUNT_1, AUTHFOREINI));
+        assertEquals("I", generateKey(AUTHOR_FIRSTNAME_FULL_LASTNAME_FULL_COUNT_2, AUTHFOREINI));
     }
 
     /**
@@ -825,17 +699,11 @@ void firstAuthorForenameInitials() {
     void firstAuthorVonAndLast() {
         assertEquals(
             "vanderAalst",
-            generateKey(
-                AUTHOR_FIRSTNAME_FULL_LASTNAME_FULL_WITH_VAN_COUNT_1,
-                AUTHFIRSTFULL
-            )
+            generateKey(AUTHOR_FIRSTNAME_FULL_LASTNAME_FULL_WITH_VAN_COUNT_1, AUTHFIRSTFULL)
         );
         assertEquals(
             "vanderAalst",
-            generateKey(
-                AUTHOR_FIRSTNAME_FULL_LASTNAME_FULL_WITH_VAN_COUNT_2,
-                AUTHFIRSTFULL
-            )
+            generateKey(AUTHOR_FIRSTNAME_FULL_LASTNAME_FULL_WITH_VAN_COUNT_2, AUTHFIRSTFULL)
         );
     }
 
@@ -843,17 +711,11 @@ void firstAuthorVonAndLast() {
     void firstAuthorVonAndLastNoVonInName() {
         assertEquals(
             "Newton",
-            generateKey(
-                AUTHOR_FIRSTNAME_FULL_LASTNAME_FULL_COUNT_1,
-                AUTHFIRSTFULL
-            )
+            generateKey(AUTHOR_FIRSTNAME_FULL_LASTNAME_FULL_COUNT_1, AUTHFIRSTFULL)
         );
         assertEquals(
             "Newton",
-            generateKey(
-                AUTHOR_FIRSTNAME_FULL_LASTNAME_FULL_COUNT_2,
-                AUTHFIRSTFULL
-            )
+            generateKey(AUTHOR_FIRSTNAME_FULL_LASTNAME_FULL_COUNT_2, AUTHFIRSTFULL)
         );
     }
 
@@ -878,31 +740,11 @@ void testAllAuthors() {
 
     static Stream<Arguments> testAuthorsAlpha() {
         return Stream.of(
-            Arguments.of(
-                "New",
-                AUTHOR_FIRSTNAME_INITIAL_LASTNAME_FULL_COUNT_1,
-                AUTHORSALPHA
-            ),
-            Arguments.of(
-                "NM",
-                AUTHOR_FIRSTNAME_INITIAL_LASTNAME_FULL_COUNT_2,
-                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(
-                "NME+",
-                AUTHOR_FIRSTNAME_INITIAL_LASTNAME_FULL_COUNT_5,
-                AUTHORSALPHA
-            ),
+            Arguments.of("New", AUTHOR_FIRSTNAME_INITIAL_LASTNAME_FULL_COUNT_1, AUTHORSALPHA),
+            Arguments.of("NM", AUTHOR_FIRSTNAME_INITIAL_LASTNAME_FULL_COUNT_2, 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("NME+", AUTHOR_FIRSTNAME_INITIAL_LASTNAME_FULL_COUNT_5, AUTHORSALPHA),
             Arguments.of(
                 "vdAal",
                 AUTHOR_FIRSTNAME_FULL_LASTNAME_FULL_WITH_VAN_COUNT_1,
@@ -934,53 +776,32 @@ void testAuthorsAlpha(String expected, BibEntry entry, String pattern) {
     void lastAuthor() {
         assertEquals(
             "Newton",
-            generateKey(
-                AUTHOR_FIRSTNAME_INITIAL_LASTNAME_FULL_COUNT_1,
-                AUTHORLAST
-            )
+            generateKey(AUTHOR_FIRSTNAME_INITIAL_LASTNAME_FULL_COUNT_1, AUTHORLAST)
         );
         assertEquals(
             "Maxwell",
-            generateKey(
-                AUTHOR_FIRSTNAME_INITIAL_LASTNAME_FULL_COUNT_2,
-                AUTHORLAST
-            )
+            generateKey(AUTHOR_FIRSTNAME_INITIAL_LASTNAME_FULL_COUNT_2, AUTHORLAST)
         );
         assertEquals(
             "Einstein",
-            generateKey(
-                AUTHOR_FIRSTNAME_INITIAL_LASTNAME_FULL_COUNT_3,
-                AUTHORLAST
-            )
+            generateKey(AUTHOR_FIRSTNAME_INITIAL_LASTNAME_FULL_COUNT_3, AUTHORLAST)
         );
         assertEquals(
             "Bohr",
-            generateKey(
-                AUTHOR_FIRSTNAME_INITIAL_LASTNAME_FULL_COUNT_4,
-                AUTHORLAST
-            )
+            generateKey(AUTHOR_FIRSTNAME_INITIAL_LASTNAME_FULL_COUNT_4, AUTHORLAST)
         );
         assertEquals(
             "Unknown",
-            generateKey(
-                AUTHOR_FIRSTNAME_INITIAL_LASTNAME_FULL_COUNT_5,
-                AUTHORLAST
-            )
+            generateKey(AUTHOR_FIRSTNAME_INITIAL_LASTNAME_FULL_COUNT_5, AUTHORLAST)
         );
 
         assertEquals(
             "Aalst",
-            generateKey(
-                AUTHOR_FIRSTNAME_FULL_LASTNAME_FULL_WITH_VAN_COUNT_1,
-                AUTHORLAST
-            )
+            generateKey(AUTHOR_FIRSTNAME_FULL_LASTNAME_FULL_WITH_VAN_COUNT_1, AUTHORLAST)
         );
         assertEquals(
             "Lessen",
-            generateKey(
-                AUTHOR_FIRSTNAME_FULL_LASTNAME_FULL_WITH_VAN_COUNT_2,
-                AUTHORLAST
-            )
+            generateKey(AUTHOR_FIRSTNAME_FULL_LASTNAME_FULL_WITH_VAN_COUNT_2, AUTHORLAST)
         );
     }
 
@@ -991,53 +812,32 @@ void lastAuthor() {
     void lastAuthorForenameInitials() {
         assertEquals(
             "I",
-            generateKey(
-                AUTHOR_FIRSTNAME_INITIAL_LASTNAME_FULL_COUNT_1,
-                AUTHORLASTFOREINI
-            )
+            generateKey(AUTHOR_FIRSTNAME_INITIAL_LASTNAME_FULL_COUNT_1, AUTHORLASTFOREINI)
         );
         assertEquals(
             "J",
-            generateKey(
-                AUTHOR_FIRSTNAME_INITIAL_LASTNAME_FULL_COUNT_2,
-                AUTHORLASTFOREINI
-            )
+            generateKey(AUTHOR_FIRSTNAME_INITIAL_LASTNAME_FULL_COUNT_2, AUTHORLASTFOREINI)
         );
         assertEquals(
             "A",
-            generateKey(
-                AUTHOR_FIRSTNAME_INITIAL_LASTNAME_FULL_COUNT_3,
-                AUTHORLASTFOREINI
-            )
+            generateKey(AUTHOR_FIRSTNAME_INITIAL_LASTNAME_FULL_COUNT_3, AUTHORLASTFOREINI)
         );
         assertEquals(
             "N",
-            generateKey(
-                AUTHOR_FIRSTNAME_INITIAL_LASTNAME_FULL_COUNT_4,
-                AUTHORLASTFOREINI
-            )
+            generateKey(AUTHOR_FIRSTNAME_INITIAL_LASTNAME_FULL_COUNT_4, AUTHORLASTFOREINI)
         );
         assertEquals(
             "H",
-            generateKey(
-                AUTHOR_FIRSTNAME_INITIAL_LASTNAME_FULL_COUNT_5,
-                AUTHORLASTFOREINI
-            )
+            generateKey(AUTHOR_FIRSTNAME_INITIAL_LASTNAME_FULL_COUNT_5, AUTHORLASTFOREINI)
         );
 
         assertEquals(
             "W",
-            generateKey(
-                AUTHOR_FIRSTNAME_FULL_LASTNAME_FULL_WITH_VAN_COUNT_1,
-                AUTHORLASTFOREINI
-            )
+            generateKey(AUTHOR_FIRSTNAME_FULL_LASTNAME_FULL_WITH_VAN_COUNT_1, AUTHORLASTFOREINI)
         );
         assertEquals(
             "T",
-            generateKey(
-                AUTHOR_FIRSTNAME_FULL_LASTNAME_FULL_WITH_VAN_COUNT_2,
-                AUTHORLASTFOREINI
-            )
+            generateKey(AUTHOR_FIRSTNAME_FULL_LASTNAME_FULL_WITH_VAN_COUNT_2, AUTHORLASTFOREINI)
         );
     }
 
@@ -1048,53 +848,32 @@ void lastAuthorForenameInitials() {
     void oneAuthorPlusIni() {
         assertEquals(
             "Newto",
-            generateKey(
-                AUTHOR_FIRSTNAME_INITIAL_LASTNAME_FULL_COUNT_1,
-                AUTHORINI
-            )
+            generateKey(AUTHOR_FIRSTNAME_INITIAL_LASTNAME_FULL_COUNT_1, AUTHORINI)
         );
         assertEquals(
             "NewtoM",
-            generateKey(
-                AUTHOR_FIRSTNAME_INITIAL_LASTNAME_FULL_COUNT_2,
-                AUTHORINI
-            )
+            generateKey(AUTHOR_FIRSTNAME_INITIAL_LASTNAME_FULL_COUNT_2, AUTHORINI)
         );
         assertEquals(
             "NewtoME",
-            generateKey(
-                AUTHOR_FIRSTNAME_INITIAL_LASTNAME_FULL_COUNT_3,
-                AUTHORINI
-            )
+            generateKey(AUTHOR_FIRSTNAME_INITIAL_LASTNAME_FULL_COUNT_3, AUTHORINI)
         );
         assertEquals(
             "NewtoMEB",
-            generateKey(
-                AUTHOR_FIRSTNAME_INITIAL_LASTNAME_FULL_COUNT_4,
-                AUTHORINI
-            )
+            generateKey(AUTHOR_FIRSTNAME_INITIAL_LASTNAME_FULL_COUNT_4, AUTHORINI)
         );
         assertEquals(
             "NewtoMEBU",
-            generateKey(
-                AUTHOR_FIRSTNAME_INITIAL_LASTNAME_FULL_COUNT_5,
-                AUTHORINI
-            )
+            generateKey(AUTHOR_FIRSTNAME_INITIAL_LASTNAME_FULL_COUNT_5, AUTHORINI)
         );
 
         assertEquals(
             "Aalst",
-            generateKey(
-                AUTHOR_FIRSTNAME_FULL_LASTNAME_FULL_WITH_VAN_COUNT_1,
-                AUTHORINI
-            )
+            generateKey(AUTHOR_FIRSTNAME_FULL_LASTNAME_FULL_WITH_VAN_COUNT_1, AUTHORINI)
         );
         assertEquals(
             "AalstL",
-            generateKey(
-                AUTHOR_FIRSTNAME_FULL_LASTNAME_FULL_WITH_VAN_COUNT_2,
-                AUTHORINI
-            )
+            generateKey(AUTHOR_FIRSTNAME_FULL_LASTNAME_FULL_WITH_VAN_COUNT_2, AUTHORINI)
         );
     }
 
@@ -1105,31 +884,19 @@ void oneAuthorPlusIni() {
     void testNAuthors1() {
         assertEquals(
             "Newton",
-            generateKey(
-                AUTHOR_FIRSTNAME_INITIAL_LASTNAME_FULL_COUNT_1,
-                String.format(AUTHORN, 1)
-            )
+            generateKey(AUTHOR_FIRSTNAME_INITIAL_LASTNAME_FULL_COUNT_1, String.format(AUTHORN, 1))
         );
         assertEquals(
             "NewtonEtAl",
-            generateKey(
-                AUTHOR_FIRSTNAME_INITIAL_LASTNAME_FULL_COUNT_2,
-                String.format(AUTHORN, 1)
-            )
+            generateKey(AUTHOR_FIRSTNAME_INITIAL_LASTNAME_FULL_COUNT_2, String.format(AUTHORN, 1))
         );
         assertEquals(
             "NewtonEtAl",
-            generateKey(
-                AUTHOR_FIRSTNAME_INITIAL_LASTNAME_FULL_COUNT_3,
-                String.format(AUTHORN, 1)
-            )
+            generateKey(AUTHOR_FIRSTNAME_INITIAL_LASTNAME_FULL_COUNT_3, String.format(AUTHORN, 1))
         );
         assertEquals(
             "NewtonEtAl",
-            generateKey(
-                AUTHOR_FIRSTNAME_INITIAL_LASTNAME_FULL_COUNT_4,
-                String.format(AUTHORN, 1)
-            )
+            generateKey(AUTHOR_FIRSTNAME_INITIAL_LASTNAME_FULL_COUNT_4, String.format(AUTHORN, 1))
         );
     }
 
@@ -1145,31 +912,19 @@ void testNAuthors1EmptyReturnEmpty() {
     void testNAuthors3() {
         assertEquals(
             "Newton",
-            generateKey(
-                AUTHOR_FIRSTNAME_INITIAL_LASTNAME_FULL_COUNT_1,
-                String.format(AUTHORN, 3)
-            )
+            generateKey(AUTHOR_FIRSTNAME_INITIAL_LASTNAME_FULL_COUNT_1, String.format(AUTHORN, 3))
         );
         assertEquals(
             "NewtonMaxwell",
-            generateKey(
-                AUTHOR_FIRSTNAME_INITIAL_LASTNAME_FULL_COUNT_2,
-                String.format(AUTHORN, 3)
-            )
+            generateKey(AUTHOR_FIRSTNAME_INITIAL_LASTNAME_FULL_COUNT_2, String.format(AUTHORN, 3))
         );
         assertEquals(
             "NewtonMaxwellEinstein",
-            generateKey(
-                AUTHOR_FIRSTNAME_INITIAL_LASTNAME_FULL_COUNT_3,
-                String.format(AUTHORN, 3)
-            )
+            generateKey(AUTHOR_FIRSTNAME_INITIAL_LASTNAME_FULL_COUNT_3, String.format(AUTHORN, 3))
         );
         assertEquals(
             "NewtonMaxwellEinsteinEtAl",
-            generateKey(
-                AUTHOR_FIRSTNAME_INITIAL_LASTNAME_FULL_COUNT_4,
-                String.format(AUTHORN, 3)
-            )
+            generateKey(AUTHOR_FIRSTNAME_INITIAL_LASTNAME_FULL_COUNT_4, String.format(AUTHORN, 3))
         );
     }
 
@@ -1187,10 +942,7 @@ void testFirstPage() {
     @SuppressWarnings("ConstantConditions")
     @Test
     void testFirstPageNull() {
-        assertThrows(
-            NullPointerException.class,
-            () -> CitationKeyGenerator.firstPage(null)
-        );
+        assertThrows(NullPointerException.class, () -> CitationKeyGenerator.firstPage(null));
     }
 
     @Test
@@ -1214,10 +966,7 @@ void testPagePrefix() {
     @SuppressWarnings("ConstantConditions")
     @Test
     void testPagePrefixNull() {
-        assertThrows(
-            NullPointerException.class,
-            () -> CitationKeyGenerator.pagePrefix(null)
-        );
+        assertThrows(NullPointerException.class, () -> CitationKeyGenerator.pagePrefix(null));
     }
 
     @Test
@@ -1236,10 +985,7 @@ void testLastPage() {
     @SuppressWarnings("ConstantConditions")
     @Test
     void testLastPageNull() {
-        assertThrows(
-            NullPointerException.class,
-            () -> CitationKeyGenerator.lastPage(null)
-        );
+        assertThrows(NullPointerException.class, () -> CitationKeyGenerator.lastPage(null));
     }
 
     /**
@@ -1424,9 +1170,7 @@ void camel() {
         );
         assertEquals(
             "BPMNConformanceInOpenSourceEngines",
-            CitationKeyGenerator.getCamelizedTitle(
-                TITLE_STRING_CASED_ONE_UPPER_WORD_ONE_SMALL_WORD
-            )
+            CitationKeyGenerator.getCamelizedTitle(TITLE_STRING_CASED_ONE_UPPER_WORD_ONE_SMALL_WORD)
         );
         assertEquals(
             "TheDifferenceBetweenGraphBasedAndBlockStructuredBusinessProcessModellingLanguages",
@@ -1475,9 +1219,7 @@ void title() {
         );
         assertEquals(
             "Process Viewing Patterns",
-            CitationKeyGenerator.camelizeSignificantWordsInTitle(
-                TITLE_STRING_CASED
-            )
+            CitationKeyGenerator.camelizeSignificantWordsInTitle(TITLE_STRING_CASED)
         );
         assertEquals(
             "BPMN Conformance in Open Source Engines",
@@ -1513,8 +1255,7 @@ void title() {
 
     @Test
     void keywordNKeywordsSeparatedBySpace() {
-        BibEntry entry = new BibEntry()
-            .withField(StandardField.KEYWORDS, "w1, w2a w2b, w3");
+        BibEntry entry = new BibEntry().withField(StandardField.KEYWORDS, "w1, w2a w2b, w3");
 
         assertEquals("w1", generateKey(entry, "[keyword1]"));
 
@@ -1528,8 +1269,7 @@ void keywordNKeywordsSeparatedBySpace() {
     @Test
     void crossrefkeywordNKeywordsSeparatedBySpace() {
         BibDatabase database = new BibDatabase();
-        BibEntry entry1 = new BibEntry()
-            .withField(StandardField.CROSSREF, "entry2");
+        BibEntry entry1 = new BibEntry().withField(StandardField.CROSSREF, "entry2");
         BibEntry entry2 = new BibEntry().withCitationKey("entry2");
         database.insertEntry(entry2);
         database.insertEntry(entry1);
@@ -1540,8 +1280,7 @@ void crossrefkeywordNKeywordsSeparatedBySpace() {
 
     @Test
     void keywordsNKeywordsSeparatedBySpace() {
-        BibEntry entry = new BibEntry()
-            .withField(StandardField.KEYWORDS, "w1, w2a w2b, w3");
+        BibEntry entry = new BibEntry().withField(StandardField.KEYWORDS, "w1, w2a w2b, w3");
 
         // all keywords
         assertEquals("w1w2aw2bw3", generateKey(entry, "[keywords]"));
@@ -1556,8 +1295,7 @@ void keywordsNKeywordsSeparatedBySpace() {
     @Test
     void crossrefkeywordsNKeywordsSeparatedBySpace() {
         BibDatabase database = new BibDatabase();
-        BibEntry entry1 = new BibEntry()
-            .withField(StandardField.CROSSREF, "entry2");
+        BibEntry entry1 = new BibEntry().withField(StandardField.CROSSREF, "entry2");
         BibEntry entry2 = new BibEntry()
             .withCitationKey("entry2")
             .withField(StandardField.KEYWORDS, "w1, w2a w2b, w3");
@@ -1569,30 +1307,18 @@ void crossrefkeywordsNKeywordsSeparatedBySpace() {
 
     @Test
     void testCheckLegalKeyUnwantedCharacters() {
-        assertEquals(
-            "AAAA",
-            CitationKeyGenerator.cleanKey("AA AA", DEFAULT_UNWANTED_CHARACTERS)
-        );
+        assertEquals("AAAA", CitationKeyGenerator.cleanKey("AA AA", DEFAULT_UNWANTED_CHARACTERS));
         assertEquals(
             "SPECIALCHARS",
-            CitationKeyGenerator.cleanKey(
-                "SPECIAL CHARS#{\\\"}~,",
-                DEFAULT_UNWANTED_CHARACTERS
-            )
-        );
-        assertEquals(
-            "",
-            CitationKeyGenerator.cleanKey("\n\t\r", DEFAULT_UNWANTED_CHARACTERS)
+            CitationKeyGenerator.cleanKey("SPECIAL CHARS#{\\\"}~,", DEFAULT_UNWANTED_CHARACTERS)
         );
+        assertEquals("", CitationKeyGenerator.cleanKey("\n\t\r", DEFAULT_UNWANTED_CHARACTERS));
     }
 
     @Test
     void testCheckLegalKeyNoUnwantedCharacters() {
         assertEquals("AAAA", CitationKeyGenerator.cleanKey("AA AA", ""));
-        assertEquals(
-            "SPECIALCHARS^",
-            CitationKeyGenerator.cleanKey("SPECIAL CHARS#{\\\"}~,^", "")
-        );
+        assertEquals("SPECIALCHARS^", CitationKeyGenerator.cleanKey("SPECIAL CHARS#{\\\"}~,^", ""));
         assertEquals("", CitationKeyGenerator.cleanKey("\n\t\r", ""));
     }
 
@@ -1600,13 +1326,11 @@ void testCheckLegalKeyNoUnwantedCharacters() {
     void testCheckLegalNullInNullOut() {
         assertThrows(
             NullPointerException.class,
-            () ->
-                CitationKeyGenerator.cleanKey(null, DEFAULT_UNWANTED_CHARACTERS)
+            () -> CitationKeyGenerator.cleanKey(null, DEFAULT_UNWANTED_CHARACTERS)
         );
         assertThrows(
             NullPointerException.class,
-            () ->
-                CitationKeyGenerator.cleanKey(null, DEFAULT_UNWANTED_CHARACTERS)
+            () -> CitationKeyGenerator.cleanKey(null, DEFAULT_UNWANTED_CHARACTERS)
         );
     }
 
@@ -1624,25 +1348,20 @@ void testApplyModifiers() {
     @Test
     void testcrossrefShorttitle() {
         BibDatabase database = new BibDatabase();
-        BibEntry entry1 = new BibEntry()
-            .withField(StandardField.CROSSREF, "entry2");
+        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 testcrossrefShorttitleInitials() {
         BibDatabase database = new BibDatabase();
-        BibEntry entry1 = new BibEntry()
-            .withField(StandardField.CROSSREF, "entry2");
+        BibEntry entry1 = new BibEntry().withField(StandardField.CROSSREF, "entry2");
         BibEntry entry2 = new BibEntry()
             .withCitationKey("entry2")
             .withField(StandardField.TITLE, "Green Scheduling of Whatever");
@@ -1656,49 +1375,32 @@ void testcrossrefShorttitleInitials() {
     void generateKeyStripsColonFromTitle() {
         BibEntry entry = new BibEntry()
             .withField(StandardField.TITLE, "Green Scheduling of: Whatever");
-        assertEquals(
-            "GreenSchedulingOfWhatever",
-            generateKey(entry, "[title]")
-        );
+        assertEquals("GreenSchedulingOfWhatever", generateKey(entry, "[title]"));
     }
 
     @Test
     void generateKeyStripsApostropheFromTitle() {
         BibEntry entry = new BibEntry()
             .withField(StandardField.TITLE, "Green Scheduling of `Whatever`");
-        assertEquals(
-            "GreenSchedulingofWhatever",
-            generateKey(entry, "[title]")
-        );
+        assertEquals("GreenSchedulingofWhatever", generateKey(entry, "[title]"));
     }
 
     @Test
     void generateKeyWithOneModifier() {
-        BibEntry entry = new BibEntry()
-            .withField(StandardField.TITLE, "The Interesting Title");
-        assertEquals(
-            "theinterestingtitle",
-            generateKey(entry, "[title:lower]")
-        );
+        BibEntry entry = new BibEntry().withField(StandardField.TITLE, "The Interesting Title");
+        assertEquals("theinterestingtitle", generateKey(entry, "[title:lower]"));
     }
 
     @Test
     void generateKeyWithTwoModifiers() {
-        BibEntry entry = new BibEntry()
-            .withField(StandardField.TITLE, "The Interesting Title");
-        assertEquals(
-            "theinterestingtitle",
-            generateKey(entry, "[title:lower:(_)]")
-        );
+        BibEntry entry = new BibEntry().withField(StandardField.TITLE, "The Interesting Title");
+        assertEquals("theinterestingtitle", generateKey(entry, "[title:lower:(_)]"));
     }
 
     @Test
     void generateKeyWithTitleCapitalizeModifier() {
         BibEntry entry = new BibEntry()
-            .withField(
-                StandardField.TITLE,
-                "the InTeresting title longer than THREE words"
-            );
+            .withField(StandardField.TITLE, "the InTeresting title longer than THREE words");
         assertEquals(
             "TheInterestingTitleLongerThanThreeWords",
             generateKey(entry, "[title:capitalize]")
@@ -1708,67 +1410,37 @@ void generateKeyWithTitleCapitalizeModifier() {
     @Test
     void generateKeyWithShortTitleCapitalizeModifier() {
         BibEntry entry = new BibEntry()
-            .withField(
-                StandardField.TITLE,
-                "the InTeresting title longer than THREE words"
-            );
-        assertEquals(
-            "InterestingTitleLonger",
-            generateKey(entry, "[shorttitle:capitalize]")
-        );
+            .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"
-            );
-        assertEquals(
-            "ATitlewithSomeoftheKeyWords",
-            generateKey(entry, "[title:titlecase]")
-        );
+            .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"
-            );
-        assertEquals(
-            "InterestingTitleLonger",
-            generateKey(entry, "[shorttitle:titlecase]")
-        );
+            .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"
-            );
-        assertEquals(
-            "Atitlewithsomeofthekeywords",
-            generateKey(entry, "[title:sentencecase]")
-        );
+            .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.AUTHOR, AUTHOR_STRING_FIRSTNAME_FULL_LASTNAME_FULL_COUNT_1)
             .withField(StandardField.YEAR, "2019")
-            .withField(
-                StandardField.TITLE,
-                "the InTeresting title longer than THREE words"
-            );
+            .withField(StandardField.TITLE, "the InTeresting title longer than THREE words");
 
         assertEquals(
             "NEWTON2019InterestingTitleLonger",
@@ -1779,15 +1451,9 @@ void generateKeyWithAuthUpperYearShortTitleCapitalizeModifier() {
     @Test
     void generateKeyWithYearAuthUpperTitleSentenceCaseModifier() {
         BibEntry entry = new BibEntry()
-            .withField(
-                StandardField.AUTHOR,
-                AUTHOR_STRING_FIRSTNAME_FULL_LASTNAME_FULL_COUNT_3
-            )
+            .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"
-            );
+            .withField(StandardField.TITLE, "the InTeresting title longer than THREE words");
 
         assertEquals(
             "NewtonMaxwellEtAl_2019_TheInterestingTitleLongerThanThreeWords",
@@ -1798,10 +1464,7 @@ void generateKeyWithYearAuthUpperTitleSentenceCaseModifier() {
     @Test
     void generateKeyWithMinusInCitationStyleOutsideAField() {
         BibEntry entry = new BibEntry()
-            .withField(
-                StandardField.AUTHOR,
-                AUTHOR_STRING_FIRSTNAME_FULL_LASTNAME_FULL_COUNT_1
-            )
+            .withField(StandardField.AUTHOR, AUTHOR_STRING_FIRSTNAME_FULL_LASTNAME_FULL_COUNT_1)
             .withField(StandardField.YEAR, "2019");
 
         assertEquals("Newton2019", generateKey(entry, "[auth]-[year]"));
@@ -1818,16 +1481,14 @@ void generateKeyWithWithFirstNCharacters() {
 
     @Test
     void generateKeyCorrectKeyLengthWithTruncateModifierAndUnicode() {
-        BibEntry bibEntry = new BibEntry()
-            .withField(StandardField.AUTHOR, "Gödel, Kurt");
+        BibEntry bibEntry = new BibEntry().withField(StandardField.AUTHOR, "Gödel, Kurt");
 
         assertEquals(2, generateKey(bibEntry, "[auth:truncate2]").length());
     }
 
     @Test
     void generateKeyCorrectKeyLengthWithAuthNofMthAndUnicode() {
-        BibEntry bibEntry = new BibEntry()
-            .withField(StandardField.AUTHOR, "Gödel, Kurt");
+        BibEntry bibEntry = new BibEntry().withField(StandardField.AUTHOR, "Gödel, Kurt");
 
         assertEquals(4, generateKey(bibEntry, "[auth4_1]").length());
     }
@@ -1845,56 +1506,41 @@ void generateKeyWithNonNormalizedUnicode() {
 
     @Test
     void generateKeyWithModifierContainingRegexCharacterClass() {
-        BibEntry bibEntry = new BibEntry()
-            .withField(StandardField.TITLE, "Wickedness Managing");
+        BibEntry bibEntry = new BibEntry().withField(StandardField.TITLE, "Wickedness Managing");
 
-        assertEquals(
-            "WM",
-            generateKey(bibEntry, "[title:regex(\"[a-z]+\",\"\")]")
-        );
+        assertEquals("WM", generateKey(bibEntry, "[title:regex(\"[a-z]+\",\"\")]"));
     }
 
     @Test
     void generateKeyDoesNotModifyTheKeyWithIncorrectRegexReplacement() {
         String pattern = "[title]";
-        GlobalCitationKeyPattern keyPattern =
-            GlobalCitationKeyPattern.fromPattern(pattern);
-        CitationKeyPatternPreferences patternPreferences =
-            new CitationKeyPatternPreferences(
-                false,
-                false,
-                false,
-                CitationKeyPatternPreferences.KeySuffix.SECOND_WITH_A,
-                "[", // Invalid regexp
-                "",
-                DEFAULT_UNWANTED_CHARACTERS,
-                keyPattern,
-                "",
-                ','
-            );
+        GlobalCitationKeyPattern keyPattern = GlobalCitationKeyPattern.fromPattern(pattern);
+        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");
+        BibEntry bibEntry = new BibEntry().withField(StandardField.TITLE, "Wickedness Managing");
         assertEquals(
             "WickednessManaging",
-            new CitationKeyGenerator(
-                keyPattern,
-                new BibDatabase(),
-                patternPreferences
-            )
+            new CitationKeyGenerator(keyPattern, new BibDatabase(), patternPreferences)
                 .generateKey(bibEntry)
         );
     }
 
     @Test
     void generateKeyWithFallbackField() {
-        BibEntry bibEntry = new BibEntry()
-            .withField(StandardField.YEAR, "2021");
+        BibEntry bibEntry = new BibEntry().withField(StandardField.YEAR, "2021");
 
-        assertEquals(
-            "2021",
-            generateKey(bibEntry, "[title:([EPRINT:([YEAR])])]")
-        );
+        assertEquals("2021", generateKey(bibEntry, "[title:([EPRINT:([YEAR])])]"));
     }
 
     @Test
@@ -1913,9 +1559,7 @@ void generateKeyWithLowercaseAuthorWithVonAndLastname() {
 
     @Test
     void generateKeyCorrectKeyWithAndOthersAtTheEnd() {
-        BibEntry entry = createABibEntryAuthor(
-            "Alexander Artemenko and others"
-        );
+        BibEntry entry = createABibEntryAuthor("Alexander Artemenko and others");
         entry.setField(StandardField.YEAR, "2019");
         assertEquals("Artemenko2019", generateKey(entry, "[auth][year]"));
     }
diff --git a/src/test/java/org/jabref/logic/citationkeypattern/MakeLabelWithDatabaseTest.java b/src/test/java/org/jabref/logic/citationkeypattern/MakeLabelWithDatabaseTest.java
index 0ae5e69beb6..8cbe7786346 100644
--- a/src/test/java/org/jabref/logic/citationkeypattern/MakeLabelWithDatabaseTest.java
+++ b/src/test/java/org/jabref/logic/citationkeypattern/MakeLabelWithDatabaseTest.java
@@ -49,8 +49,7 @@ void setUp() {
 
     @Test
     void generateDefaultKey() {
-        new CitationKeyGenerator(bibtexKeyPattern, database, preferences)
-            .generateAndSetKey(entry);
+        new CitationKeyGenerator(bibtexKeyPattern, database, preferences).generateAndSetKey(entry);
         assertEquals(Optional.of("Doe2016"), entry.getCitationKey());
     }
 
@@ -85,8 +84,7 @@ void generateDefaultKeyAlwaysLetter() {
                 ','
             );
 
-        new CitationKeyGenerator(bibtexKeyPattern, database, preferences)
-            .generateAndSetKey(entry);
+        new CitationKeyGenerator(bibtexKeyPattern, database, preferences).generateAndSetKey(entry);
         assertEquals(Optional.of("Doe2016a"), entry.getCitationKey());
     }
 
@@ -135,8 +133,7 @@ void generateDefaultKeyStartDuplicatesAtB() {
                 ','
             );
 
-        new CitationKeyGenerator(bibtexKeyPattern, database, preferences)
-            .generateAndSetKey(entry);
+        new CitationKeyGenerator(bibtexKeyPattern, database, preferences).generateAndSetKey(entry);
         assertEquals(Optional.of("Doe2016"), entry.getCitationKey());
     }
 
@@ -218,80 +215,70 @@ void generateDefaultKeyFirstTwoAlreadyExists() {
     @Test
     void generateKeyAuthLowerModified() {
         bibtexKeyPattern.setDefaultValue("[auth:lower][year]");
-        new CitationKeyGenerator(bibtexKeyPattern, database, preferences)
-            .generateAndSetKey(entry);
+        new CitationKeyGenerator(bibtexKeyPattern, database, preferences).generateAndSetKey(entry);
         assertEquals(Optional.of("doe2016"), entry.getCitationKey());
     }
 
     @Test
     void generateKeyAuthUpperModified() {
         bibtexKeyPattern.setDefaultValue("[auth:upper][year]");
-        new CitationKeyGenerator(bibtexKeyPattern, database, preferences)
-            .generateAndSetKey(entry);
+        new CitationKeyGenerator(bibtexKeyPattern, database, preferences).generateAndSetKey(entry);
         assertEquals(Optional.of("DOE2016"), entry.getCitationKey());
     }
 
     @Test
     void generateKeyAuthTitleCaseModified() {
         bibtexKeyPattern.setDefaultValue("[auth:title_case][year]");
-        new CitationKeyGenerator(bibtexKeyPattern, database, preferences)
-            .generateAndSetKey(entry);
+        new CitationKeyGenerator(bibtexKeyPattern, database, preferences).generateAndSetKey(entry);
         assertEquals(Optional.of("Doe2016"), entry.getCitationKey());
     }
 
     @Test
     void generateKeyAuthSentenceCaseModified() {
         bibtexKeyPattern.setDefaultValue("[auth:sentence_case][year]");
-        new CitationKeyGenerator(bibtexKeyPattern, database, preferences)
-            .generateAndSetKey(entry);
+        new CitationKeyGenerator(bibtexKeyPattern, database, preferences).generateAndSetKey(entry);
         assertEquals(Optional.of("Doe2016"), entry.getCitationKey());
     }
 
     @Test
     void generateKeyAuthCapitalizeModified() {
         bibtexKeyPattern.setDefaultValue("[auth:capitalize][year]");
-        new CitationKeyGenerator(bibtexKeyPattern, database, preferences)
-            .generateAndSetKey(entry);
+        new CitationKeyGenerator(bibtexKeyPattern, database, preferences).generateAndSetKey(entry);
         assertEquals(Optional.of("Doe2016"), entry.getCitationKey());
     }
 
     @Test
     void generateDefaultKeyFixedValue() {
         bibtexKeyPattern.setDefaultValue("[auth]Test[year]");
-        new CitationKeyGenerator(bibtexKeyPattern, database, preferences)
-            .generateAndSetKey(entry);
+        new CitationKeyGenerator(bibtexKeyPattern, database, preferences).generateAndSetKey(entry);
         assertEquals(Optional.of("DoeTest2016"), entry.getCitationKey());
     }
 
     @Test
     void generateKeyShortYear() {
         bibtexKeyPattern.setDefaultValue("[shortyear]");
-        new CitationKeyGenerator(bibtexKeyPattern, database, preferences)
-            .generateAndSetKey(entry);
+        new CitationKeyGenerator(bibtexKeyPattern, database, preferences).generateAndSetKey(entry);
         assertEquals(Optional.of("16"), entry.getCitationKey());
     }
 
     @Test
     void generateKeyAuthN() {
         bibtexKeyPattern.setDefaultValue("[auth2]");
-        new CitationKeyGenerator(bibtexKeyPattern, database, preferences)
-            .generateAndSetKey(entry);
+        new CitationKeyGenerator(bibtexKeyPattern, database, preferences).generateAndSetKey(entry);
         assertEquals(Optional.of("Do"), entry.getCitationKey());
     }
 
     @Test
     void generateKeyAuthNShortName() {
         bibtexKeyPattern.setDefaultValue("[auth10]");
-        new CitationKeyGenerator(bibtexKeyPattern, database, preferences)
-            .generateAndSetKey(entry);
+        new CitationKeyGenerator(bibtexKeyPattern, database, preferences).generateAndSetKey(entry);
         assertEquals(Optional.of("Doe"), entry.getCitationKey());
     }
 
     @Test
     void generateKeyEmptyField() {
         entry = new BibEntry();
-        new CitationKeyGenerator(bibtexKeyPattern, database, preferences)
-            .generateAndSetKey(entry);
+        new CitationKeyGenerator(bibtexKeyPattern, database, preferences).generateAndSetKey(entry);
         assertEquals(Optional.empty(), entry.getCitationKey());
     }
 
@@ -299,49 +286,36 @@ void generateKeyEmptyField() {
     void generateKeyEmptyFieldDefaultText() {
         bibtexKeyPattern.setDefaultValue("[author:(No Author Provided)]");
         entry.clearField(StandardField.AUTHOR);
-        new CitationKeyGenerator(bibtexKeyPattern, database, preferences)
-            .generateAndSetKey(entry);
+        new CitationKeyGenerator(bibtexKeyPattern, database, preferences).generateAndSetKey(entry);
         assertEquals(Optional.of("NoAuthorProvided"), entry.getCitationKey());
     }
 
     @Test
     void generateKeyEmptyFieldNoColonInDefaultText() {
-        bibtexKeyPattern.setDefaultValue(
-            "[author:(Problem:No Author Provided)]"
-        );
+        bibtexKeyPattern.setDefaultValue("[author:(Problem:No Author Provided)]");
         entry.clearField(StandardField.AUTHOR);
-        new CitationKeyGenerator(bibtexKeyPattern, database, preferences)
-            .generateAndSetKey(entry);
-        assertEquals(
-            Optional.of("ProblemNoAuthorProvided"),
-            entry.getCitationKey()
-        );
+        new CitationKeyGenerator(bibtexKeyPattern, database, preferences).generateAndSetKey(entry);
+        assertEquals(Optional.of("ProblemNoAuthorProvided"), entry.getCitationKey());
     }
 
     @Test
     void generateKeyTitle() {
         bibtexKeyPattern.setDefaultValue("[title]");
-        new CitationKeyGenerator(bibtexKeyPattern, database, preferences)
-            .generateAndSetKey(entry);
-        assertEquals(
-            Optional.of("AnAwesomePaperonJabRef"),
-            entry.getCitationKey()
-        );
+        new CitationKeyGenerator(bibtexKeyPattern, database, preferences).generateAndSetKey(entry);
+        assertEquals(Optional.of("AnAwesomePaperonJabRef"), entry.getCitationKey());
     }
 
     @Test
     void generateKeyTitleAbbr() {
         bibtexKeyPattern.setDefaultValue("[title:abbr]");
-        new CitationKeyGenerator(bibtexKeyPattern, database, preferences)
-            .generateAndSetKey(entry);
+        new CitationKeyGenerator(bibtexKeyPattern, database, preferences).generateAndSetKey(entry);
         assertEquals(Optional.of("AAPoJ"), entry.getCitationKey());
     }
 
     @Test
     void generateKeyShorttitle() {
         bibtexKeyPattern.setDefaultValue("[shorttitle]");
-        new CitationKeyGenerator(bibtexKeyPattern, database, preferences)
-            .generateAndSetKey(entry);
+        new CitationKeyGenerator(bibtexKeyPattern, database, preferences).generateAndSetKey(entry);
         assertEquals(Optional.of("awesomepaperJabRef"), entry.getCitationKey());
     }
 
@@ -349,8 +323,7 @@ void generateKeyShorttitle() {
     void generateKeyShorttitleLowerModified() {
         bibtexKeyPattern.setDefaultValue("[shorttitle:lower]");
         entry.setField(StandardField.TITLE, "An aweSOme Paper on JabRef");
-        new CitationKeyGenerator(bibtexKeyPattern, database, preferences)
-            .generateAndSetKey(entry);
+        new CitationKeyGenerator(bibtexKeyPattern, database, preferences).generateAndSetKey(entry);
         assertEquals(Optional.of("awesomepaperjabref"), entry.getCitationKey());
     }
 
@@ -358,8 +331,7 @@ void generateKeyShorttitleLowerModified() {
     void generateKeyShorttitleUpperModified() {
         bibtexKeyPattern.setDefaultValue("[shorttitle:upper]");
         entry.setField(StandardField.TITLE, "An aweSOme Paper on JabRef");
-        new CitationKeyGenerator(bibtexKeyPattern, database, preferences)
-            .generateAndSetKey(entry);
+        new CitationKeyGenerator(bibtexKeyPattern, database, preferences).generateAndSetKey(entry);
         assertEquals(Optional.of("AWESOMEPAPERJABREF"), entry.getCitationKey());
     }
 
@@ -367,8 +339,7 @@ void generateKeyShorttitleUpperModified() {
     void generateKeyShorttitleTitleCaseModified() {
         bibtexKeyPattern.setDefaultValue("[shorttitle:title_case]");
         entry.setField(StandardField.TITLE, "An aweSOme Paper on JabRef");
-        new CitationKeyGenerator(bibtexKeyPattern, database, preferences)
-            .generateAndSetKey(entry);
+        new CitationKeyGenerator(bibtexKeyPattern, database, preferences).generateAndSetKey(entry);
         assertEquals(Optional.of("AwesomePaperJabref"), entry.getCitationKey());
     }
 
@@ -376,8 +347,7 @@ void generateKeyShorttitleTitleCaseModified() {
     void generateKeyShorttitleSentenceCaseModified() {
         bibtexKeyPattern.setDefaultValue("[shorttitle:sentence_case]");
         entry.setField(StandardField.TITLE, "An aweSOme Paper on JabRef");
-        new CitationKeyGenerator(bibtexKeyPattern, database, preferences)
-            .generateAndSetKey(entry);
+        new CitationKeyGenerator(bibtexKeyPattern, database, preferences).generateAndSetKey(entry);
         assertEquals(Optional.of("Awesomepaperjabref"), entry.getCitationKey());
     }
 
@@ -385,16 +355,14 @@ void generateKeyShorttitleSentenceCaseModified() {
     void generateKeyShorttitleCapitalizeModified() {
         bibtexKeyPattern.setDefaultValue("[shorttitle:capitalize]");
         entry.setField(StandardField.TITLE, "An aweSOme Paper on JabRef");
-        new CitationKeyGenerator(bibtexKeyPattern, database, preferences)
-            .generateAndSetKey(entry);
+        new CitationKeyGenerator(bibtexKeyPattern, database, preferences).generateAndSetKey(entry);
         assertEquals(Optional.of("AwesomePaperJabref"), entry.getCitationKey());
     }
 
     @Test
     void generateKeyVeryshorttitle() {
         bibtexKeyPattern.setDefaultValue("[veryshorttitle]");
-        new CitationKeyGenerator(bibtexKeyPattern, database, preferences)
-            .generateAndSetKey(entry);
+        new CitationKeyGenerator(bibtexKeyPattern, database, preferences).generateAndSetKey(entry);
         assertEquals(Optional.of("awesome"), entry.getCitationKey());
     }
 
@@ -402,8 +370,7 @@ void generateKeyVeryshorttitle() {
     void generateKeyVeryshorttitleLowerModified() {
         bibtexKeyPattern.setDefaultValue("[veryshorttitle:lower]");
         entry.setField(StandardField.TITLE, "An aweSOme Paper on JabRef");
-        new CitationKeyGenerator(bibtexKeyPattern, database, preferences)
-            .generateAndSetKey(entry);
+        new CitationKeyGenerator(bibtexKeyPattern, database, preferences).generateAndSetKey(entry);
         assertEquals(Optional.of("awesome"), entry.getCitationKey());
     }
 
@@ -411,8 +378,7 @@ void generateKeyVeryshorttitleLowerModified() {
     void generateKeyVeryshorttitleUpperModified() {
         bibtexKeyPattern.setDefaultValue("[veryshorttitle:upper]");
         entry.setField(StandardField.TITLE, "An aweSOme Paper on JabRef");
-        new CitationKeyGenerator(bibtexKeyPattern, database, preferences)
-            .generateAndSetKey(entry);
+        new CitationKeyGenerator(bibtexKeyPattern, database, preferences).generateAndSetKey(entry);
         assertEquals(Optional.of("AWESOME"), entry.getCitationKey());
     }
 
@@ -420,8 +386,7 @@ void generateKeyVeryshorttitleUpperModified() {
     void generateKeyVeryshorttitleTitleCaseModified() {
         bibtexKeyPattern.setDefaultValue("[veryshorttitle:title_case]");
         entry.setField(StandardField.TITLE, "An aweSOme Paper on JabRef");
-        new CitationKeyGenerator(bibtexKeyPattern, database, preferences)
-            .generateAndSetKey(entry);
+        new CitationKeyGenerator(bibtexKeyPattern, database, preferences).generateAndSetKey(entry);
         assertEquals(Optional.of("Awesome"), entry.getCitationKey());
     }
 
@@ -429,8 +394,7 @@ void generateKeyVeryshorttitleTitleCaseModified() {
     void generateKeyVeryshorttitleSentenceCaseModified() {
         bibtexKeyPattern.setDefaultValue("[veryshorttitle:sentence_case]");
         entry.setField(StandardField.TITLE, "An aweSOme Paper on JabRef");
-        new CitationKeyGenerator(bibtexKeyPattern, database, preferences)
-            .generateAndSetKey(entry);
+        new CitationKeyGenerator(bibtexKeyPattern, database, preferences).generateAndSetKey(entry);
         assertEquals(Optional.of("Awesome"), entry.getCitationKey());
     }
 
@@ -438,75 +402,53 @@ void generateKeyVeryshorttitleSentenceCaseModified() {
     void generateKeyVeryshorttitleCapitalizeModified() {
         bibtexKeyPattern.setDefaultValue("[veryshorttitle:capitalize]");
         entry.setField(StandardField.TITLE, "An aweSOme Paper on JabRef");
-        new CitationKeyGenerator(bibtexKeyPattern, database, preferences)
-            .generateAndSetKey(entry);
+        new CitationKeyGenerator(bibtexKeyPattern, database, preferences).generateAndSetKey(entry);
         assertEquals(Optional.of("Awesome"), entry.getCitationKey());
     }
 
     @Test
     void generateKeyShorttitleINI() {
         bibtexKeyPattern.setDefaultValue("[shorttitleINI]");
-        new CitationKeyGenerator(bibtexKeyPattern, database, preferences)
-            .generateAndSetKey(entry);
+        new CitationKeyGenerator(bibtexKeyPattern, database, preferences).generateAndSetKey(entry);
         assertEquals(Optional.of("Aap"), entry.getCitationKey());
     }
 
     @Test
     void generateKeyCamel() {
         bibtexKeyPattern.setDefaultValue("[camel]");
-        new CitationKeyGenerator(bibtexKeyPattern, database, preferences)
-            .generateAndSetKey(entry);
-        assertEquals(
-            Optional.of("AnAwesomePaperOnJabRef"),
-            entry.getCitationKey()
-        );
+        new CitationKeyGenerator(bibtexKeyPattern, database, preferences).generateAndSetKey(entry);
+        assertEquals(Optional.of("AnAwesomePaperOnJabRef"), entry.getCitationKey());
     }
 
     @Test
     void generateKeyAuthNM() {
         bibtexKeyPattern.setDefaultValue("[auth4_3]");
-        entry.setField(
-            StandardField.AUTHOR,
-            "John Doe and Donald Smith and Will Wonder"
-        );
-        new CitationKeyGenerator(bibtexKeyPattern, database, preferences)
-            .generateAndSetKey(entry);
+        entry.setField(StandardField.AUTHOR, "John Doe and Donald Smith and Will Wonder");
+        new CitationKeyGenerator(bibtexKeyPattern, database, preferences).generateAndSetKey(entry);
         assertEquals(Optional.of("Wond"), entry.getCitationKey());
     }
 
     @Test
     void generateKeyAuthNMLargeN() {
         bibtexKeyPattern.setDefaultValue("[auth20_3]");
-        entry.setField(
-            StandardField.AUTHOR,
-            "John Doe and Donald Smith and Will Wonder"
-        );
-        new CitationKeyGenerator(bibtexKeyPattern, database, preferences)
-            .generateAndSetKey(entry);
+        entry.setField(StandardField.AUTHOR, "John Doe and Donald Smith and Will Wonder");
+        new CitationKeyGenerator(bibtexKeyPattern, database, preferences).generateAndSetKey(entry);
         assertEquals(Optional.of("Wonder"), entry.getCitationKey());
     }
 
     @Test
     void generateKeyAuthNMLargeM() {
         bibtexKeyPattern.setDefaultValue("[auth2_4]");
-        entry.setField(
-            StandardField.AUTHOR,
-            "John Doe and Donald Smith and Will Wonder"
-        );
-        new CitationKeyGenerator(bibtexKeyPattern, database, preferences)
-            .generateAndSetKey(entry);
+        entry.setField(StandardField.AUTHOR, "John Doe and Donald Smith and Will Wonder");
+        new CitationKeyGenerator(bibtexKeyPattern, database, preferences).generateAndSetKey(entry);
         assertEquals(Optional.empty(), entry.getCitationKey());
     }
 
     @Test
     void generateKeyAuthNMLargeMReallyReturnsEmptyString() {
         bibtexKeyPattern.setDefaultValue("[auth2_4][year]");
-        entry.setField(
-            StandardField.AUTHOR,
-            "John Doe and Donald Smith and Will Wonder"
-        );
-        new CitationKeyGenerator(bibtexKeyPattern, database, preferences)
-            .generateAndSetKey(entry);
+        entry.setField(StandardField.AUTHOR, "John Doe and Donald Smith and Will Wonder");
+        new CitationKeyGenerator(bibtexKeyPattern, database, preferences).generateAndSetKey(entry);
         assertEquals(Optional.of("2016"), entry.getCitationKey());
     }
 
@@ -527,36 +469,24 @@ void generateKeyRegExReplace() {
             );
 
         bibtexKeyPattern.setDefaultValue("[auth][year]");
-        entry.setField(
-            StandardField.AUTHOR,
-            "John Doe and Donald Smith and Will Wonder"
-        );
-        new CitationKeyGenerator(bibtexKeyPattern, database, preferences)
-            .generateAndSetKey(entry);
+        entry.setField(StandardField.AUTHOR, "John Doe and Donald Smith and Will Wonder");
+        new CitationKeyGenerator(bibtexKeyPattern, database, preferences).generateAndSetKey(entry);
         assertEquals(Optional.of("Doe3016"), entry.getCitationKey());
     }
 
     @Test
     void generateKeyAuthIni() {
         bibtexKeyPattern.setDefaultValue("[authIni2]");
-        entry.setField(
-            StandardField.AUTHOR,
-            "John Doe and Donald Smith and Will Wonder"
-        );
-        new CitationKeyGenerator(bibtexKeyPattern, database, preferences)
-            .generateAndSetKey(entry);
+        entry.setField(StandardField.AUTHOR, "John Doe and Donald Smith and Will Wonder");
+        new CitationKeyGenerator(bibtexKeyPattern, database, preferences).generateAndSetKey(entry);
         assertEquals(Optional.of("D+"), entry.getCitationKey());
     }
 
     @Test
     void generateKeyAuthIniMany() {
         bibtexKeyPattern.setDefaultValue("[authIni10]");
-        entry.setField(
-            StandardField.AUTHOR,
-            "John Doe and Donald Smith and Will Wonder"
-        );
-        new CitationKeyGenerator(bibtexKeyPattern, database, preferences)
-            .generateAndSetKey(entry);
+        entry.setField(StandardField.AUTHOR, "John Doe and Donald Smith and Will Wonder");
+        new CitationKeyGenerator(bibtexKeyPattern, database, preferences).generateAndSetKey(entry);
         assertEquals(Optional.of("DoeSmiWon"), entry.getCitationKey());
     }
 
@@ -564,68 +494,49 @@ void generateKeyAuthIniMany() {
     void generateKeyTitleRegexe() {
         bibtexKeyPattern.setDefaultValue("[title:regex(\" \",\"-\")]");
         entry.setField(StandardField.TITLE, "Please replace the spaces");
-        new CitationKeyGenerator(bibtexKeyPattern, database, preferences)
-            .generateAndSetKey(entry);
-        assertEquals(
-            Optional.of("PleaseReplacetheSpaces"),
-            entry.getCitationKey()
-        );
+        new CitationKeyGenerator(bibtexKeyPattern, database, preferences).generateAndSetKey(entry);
+        assertEquals(Optional.of("PleaseReplacetheSpaces"), entry.getCitationKey());
     }
 
     @Test
     void generateKeyTitleTitleCase() {
         bibtexKeyPattern.setDefaultValue("[title:title_case]");
-        new CitationKeyGenerator(bibtexKeyPattern, database, preferences)
-            .generateAndSetKey(entry);
-        assertEquals(
-            Optional.of("AnAwesomePaperonJabref"),
-            entry.getCitationKey()
-        );
+        new CitationKeyGenerator(bibtexKeyPattern, database, preferences).generateAndSetKey(entry);
+        assertEquals(Optional.of("AnAwesomePaperonJabref"), entry.getCitationKey());
     }
 
     @Test
     void generateKeyTitleCapitalize() {
         bibtexKeyPattern.setDefaultValue("[title:capitalize]");
-        new CitationKeyGenerator(bibtexKeyPattern, database, preferences)
-            .generateAndSetKey(entry);
-        assertEquals(
-            Optional.of("AnAwesomePaperOnJabref"),
-            entry.getCitationKey()
-        );
+        new CitationKeyGenerator(bibtexKeyPattern, database, preferences).generateAndSetKey(entry);
+        assertEquals(Optional.of("AnAwesomePaperOnJabref"), entry.getCitationKey());
     }
 
     @Test
     void generateKeyTitleSentenceCase() {
         bibtexKeyPattern.setDefaultValue("[title:sentence_case]");
-        new CitationKeyGenerator(bibtexKeyPattern, database, preferences)
-            .generateAndSetKey(entry);
-        assertEquals(
-            Optional.of("Anawesomepaperonjabref"),
-            entry.getCitationKey()
-        );
+        new CitationKeyGenerator(bibtexKeyPattern, database, preferences).generateAndSetKey(entry);
+        assertEquals(Optional.of("Anawesomepaperonjabref"), entry.getCitationKey());
     }
 
     @Test
     void generateKeyTitleTitleCaseAbbr() {
         bibtexKeyPattern.setDefaultValue("[title:title_case:abbr]");
-        new CitationKeyGenerator(bibtexKeyPattern, database, preferences)
-            .generateAndSetKey(entry);
+        new CitationKeyGenerator(bibtexKeyPattern, database, preferences).generateAndSetKey(entry);
         assertEquals(Optional.of("AAPoJ"), entry.getCitationKey());
     }
 
     @Test
     void generateKeyTitleCapitalizeAbbr() {
         bibtexKeyPattern.setDefaultValue("[title:capitalize:abbr]");
-        new CitationKeyGenerator(bibtexKeyPattern, database, preferences)
-            .generateAndSetKey(entry);
+        new CitationKeyGenerator(bibtexKeyPattern, database, preferences).generateAndSetKey(entry);
         assertEquals(Optional.of("AAPOJ"), entry.getCitationKey());
     }
 
     @Test
     void generateKeyTitleSentenceCaseAbbr() {
         bibtexKeyPattern.setDefaultValue("[title:sentence_case:abbr]");
-        new CitationKeyGenerator(bibtexKeyPattern, database, preferences)
-            .generateAndSetKey(entry);
+        new CitationKeyGenerator(bibtexKeyPattern, database, preferences).generateAndSetKey(entry);
         assertEquals(Optional.of("Aapoj"), entry.getCitationKey());
     }
 }
diff --git a/src/test/java/org/jabref/logic/citationkeypattern/MakeLabelWithoutDatabaseTest.java b/src/test/java/org/jabref/logic/citationkeypattern/MakeLabelWithoutDatabaseTest.java
index 0e190451052..4e42ba3a09f 100644
--- a/src/test/java/org/jabref/logic/citationkeypattern/MakeLabelWithoutDatabaseTest.java
+++ b/src/test/java/org/jabref/logic/citationkeypattern/MakeLabelWithoutDatabaseTest.java
@@ -19,30 +19,23 @@ class MakeLabelWithoutDatabaseTest {
 
     @BeforeEach
     void setUp() {
-        GlobalCitationKeyPattern keyPattern = new GlobalCitationKeyPattern(
-            Collections.emptyList()
-        );
+        GlobalCitationKeyPattern keyPattern = new GlobalCitationKeyPattern(Collections.emptyList());
         keyPattern.setDefaultValue("[auth]");
-        CitationKeyPatternPreferences patternPreferences =
-            new CitationKeyPatternPreferences(
-                false,
-                false,
-                false,
-                CitationKeyPatternPreferences.KeySuffix.SECOND_WITH_A,
-                "",
-                "",
-                CitationKeyGenerator.DEFAULT_UNWANTED_CHARACTERS,
-                keyPattern,
-                "",
-                new SimpleObjectProperty<>(',')
-            );
+        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
-            );
+            new CitationKeyGenerator(keyPattern, new BibDatabase(), patternPreferences);
     }
 
     @Test
diff --git a/src/test/java/org/jabref/logic/citationstyle/CitationStyleGeneratorTest.java b/src/test/java/org/jabref/logic/citationstyle/CitationStyleGeneratorTest.java
index 4ef10bea3f2..f747a7ef553 100644
--- a/src/test/java/org/jabref/logic/citationstyle/CitationStyleGeneratorTest.java
+++ b/src/test/java/org/jabref/logic/citationstyle/CitationStyleGeneratorTest.java
@@ -20,8 +20,7 @@
 
 class CitationStyleGeneratorTest {
 
-    private final BibEntryTypesManager bibEntryTypesManager =
-        new BibEntryTypesManager();
+    private final BibEntryTypesManager bibEntryTypesManager = new BibEntryTypesManager();
 
     @Test
     void testACMCitation() {
@@ -62,11 +61,7 @@ void testAPACitation() {
         List<CitationStyle> styleList = CitationStyle.discoverCitationStyles();
         CitationStyle style = styleList
             .stream()
-            .filter(e ->
-                "American Psychological Association 7th edition".equals(
-                        e.getTitle()
-                    )
-            )
+            .filter(e -> "American Psychological Association 7th edition".equals(e.getTitle()))
             .findAny()
             .orElse(null);
         String citation = CitationStyleGenerator.generateCitation(
@@ -200,10 +195,7 @@ void testHandleAmpersand() {
         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";
         BibEntry entry = TestEntry.getTestEntry();
-        entry.setField(
-            StandardField.TITLE,
-            "Famous quote: “&TitleTest&” - that is it"
-        );
+        entry.setField(StandardField.TITLE, "Famous quote: “&TitleTest&” - that is it");
         String style = CitationStyle.getDefault().getSource();
         CitationStyleOutputFormat format = CitationStyleOutputFormat.TEXT;
 
@@ -258,10 +250,7 @@ static Stream<Arguments> testCslMapping() {
                 "[1]F. Last and J. Doe, no. 28.\n",
                 BibDatabaseMode.BIBTEX,
                 new BibEntry(StandardEntryType.Article)
-                    .withField(
-                        StandardField.AUTHOR,
-                        "Last, First and\nDoe, Jane"
-                    )
+                    .withField(StandardField.AUTHOR, "Last, First and\nDoe, Jane")
                     .withField(StandardField.NUMBER, "28"),
                 "ieee.csl"
             ),
@@ -269,10 +258,7 @@ static Stream<Arguments> testCslMapping() {
                 "[1]F. Last and J. Doe, no. 7.\n",
                 BibDatabaseMode.BIBLATEX,
                 new BibEntry(StandardEntryType.Article)
-                    .withField(
-                        StandardField.AUTHOR,
-                        "Last, First and\nDoe, Jane"
-                    )
+                    .withField(StandardField.AUTHOR, "Last, First and\nDoe, Jane")
                     .withField(StandardField.ISSUE, "7"),
                 "ieee.csl"
             ),
@@ -280,10 +266,7 @@ static Stream<Arguments> testCslMapping() {
                 "[1]F. Last and J. Doe, no. 28.\n",
                 BibDatabaseMode.BIBLATEX,
                 new BibEntry(StandardEntryType.Article)
-                    .withField(
-                        StandardField.AUTHOR,
-                        "Last, First and Doe, Jane"
-                    )
+                    .withField(StandardField.AUTHOR, "Last, First and Doe, Jane")
                     .withField(StandardField.NUMBER, "28"),
                 "ieee.csl"
             ),
@@ -291,10 +274,7 @@ static Stream<Arguments> testCslMapping() {
                 "[1]F. Last and J. Doe, no. 28.\n",
                 BibDatabaseMode.BIBLATEX,
                 new BibEntry(StandardEntryType.Article)
-                    .withField(
-                        StandardField.AUTHOR,
-                        "Last, First and\nDoe, Jane"
-                    )
+                    .withField(StandardField.AUTHOR, "Last, First and\nDoe, Jane")
                     .withField(StandardField.ISSUE, "7")
                     .withField(StandardField.NUMBER, "28"),
                 "ieee.csl"
@@ -303,10 +283,7 @@ static Stream<Arguments> testCslMapping() {
                 "[1]F. Last and J. Doe, no. 7, Art. no. e0270533.\n",
                 BibDatabaseMode.BIBLATEX,
                 new BibEntry(StandardEntryType.Article)
-                    .withField(
-                        StandardField.AUTHOR,
-                        "Last, First and\nDoe, Jane"
-                    )
+                    .withField(StandardField.AUTHOR, "Last, First and\nDoe, Jane")
                     .withField(StandardField.ISSUE, "7")
                     .withField(StandardField.EID, "e0270533"),
                 "ieee.csl"
@@ -315,10 +292,7 @@ static Stream<Arguments> testCslMapping() {
                 "[1]F. Last and J. Doe, no. 33, pp. 7–8.\n",
                 BibDatabaseMode.BIBLATEX,
                 new BibEntry(StandardEntryType.Article)
-                    .withField(
-                        StandardField.AUTHOR,
-                        "Last, First and\nDoe, Jane"
-                    )
+                    .withField(StandardField.AUTHOR, "Last, First and\nDoe, Jane")
                     .withField(StandardField.PAGES, "7--8")
                     .withField(StandardField.ISSUE, "33"),
                 "ieee.csl"
@@ -331,10 +305,7 @@ static Stream<Arguments> testCslMapping() {
                     .withField(StandardField.JOURNAL, "Bib(La)TeX Journal")
                     .withField(StandardField.NUMBER, "3number")
                     .withField(StandardField.PAGES, "45--67")
-                    .withField(
-                        StandardField.TITLE,
-                        "volume + issue + number + pages"
-                    )
+                    .withField(StandardField.TITLE, "volume + issue + number + pages")
                     .withField(StandardField.VOLUME, "1")
                     .withField(
                         StandardField.COMMENT,
@@ -480,10 +451,7 @@ static Stream<Arguments> testCslMapping() {
                     .withField(StandardField.JOURNAL, "BibTeX Journal")
                     .withField(StandardField.NUMBER, "3number")
                     .withField(StandardField.PAGES, "45--67")
-                    .withField(
-                        StandardField.TITLE,
-                        "eid + issue + number + pages"
-                    )
+                    .withField(StandardField.TITLE, "eid + issue + number + pages")
                     .withField(StandardField.EID, "6eid")
                     .withField(StandardField.ISSUE, "9issue"),
                 "apa.csl"
@@ -518,10 +486,7 @@ static Stream<Arguments> testCslMapping() {
                 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")
@@ -536,10 +501,7 @@ static Stream<Arguments> testCslMapping() {
                 new BibEntry(StandardEntryType.Article)
                     .withField(StandardField.AUTHOR, "Foo, Bar")
                     .withField(StandardField.JOURNALTITLE, "Bib(La)TeX Journal")
-                    .withField(
-                        StandardField.TITLE,
-                        "volume + issue + pages + eid"
-                    )
+                    .withField(StandardField.TITLE, "volume + issue + pages + eid")
                     .withField(StandardField.EID, "Article 6eid")
                     .withField(StandardField.ISSUE, "9issue")
                     .withField(StandardField.PAGES, "45--67")
@@ -552,10 +514,7 @@ static Stream<Arguments> testCslMapping() {
                 new BibEntry(StandardEntryType.Article)
                     .withField(StandardField.AUTHOR, "Foo, Bar")
                     .withField(StandardField.JOURNALTITLE, "Bib(La)TeX Journal")
-                    .withField(
-                        StandardField.TITLE,
-                        "volume + number + pages + eid"
-                    )
+                    .withField(StandardField.TITLE, "volume + number + pages + eid")
                     .withField(StandardField.EID, "6eid")
                     .withField(StandardField.NUMBER, "3number")
                     .withField(StandardField.PAGES, "45--67")
@@ -603,10 +562,7 @@ static Stream<Arguments> testCslMapping() {
                 new BibEntry(StandardEntryType.Article)
                     .withField(StandardField.AUTHOR, "Foo, Bar")
                     .withField(StandardField.JOURNALTITLE, "Bib(La)TeX Journal")
-                    .withField(
-                        StandardField.TITLE,
-                        "eid + issue + number + pages"
-                    )
+                    .withField(StandardField.TITLE, "eid + issue + number + pages")
                     .withField(StandardField.EID, "6eid")
                     .withField(StandardField.ISSUE, "9issue")
                     .withField(StandardField.NUMBER, "3number")
@@ -711,12 +667,8 @@ static Stream<Arguments> testCslMapping() {
 
     @ParameterizedTest
     @MethodSource
-    void testCslMapping(
-        String expected,
-        BibDatabaseMode mode,
-        BibEntry entry,
-        String cslFileName
-    ) throws Exception {
+    void testCslMapping(String expected, BibDatabaseMode mode, BibEntry entry, String cslFileName)
+        throws Exception {
         BibDatabaseContext bibDatabaseContext = new BibDatabaseContext(
             new BibDatabase(List.of(entry))
         );
@@ -724,10 +676,7 @@ void testCslMapping(
 
         String citation = CitationStyleGenerator.generateCitation(
             entry,
-            CitationStyle
-                .createCitationStyleFromFile(cslFileName)
-                .orElseThrow()
-                .getSource(),
+            CitationStyle.createCitationStyleFromFile(cslFileName).orElseThrow().getSource(),
             CitationStyleOutputFormat.TEXT,
             bibDatabaseContext,
             bibEntryTypesManager
diff --git a/src/test/java/org/jabref/logic/citationstyle/JabRefItemDataProviderTest.java b/src/test/java/org/jabref/logic/citationstyle/JabRefItemDataProviderTest.java
index 138c44e4448..ad9a14936e6 100644
--- a/src/test/java/org/jabref/logic/citationstyle/JabRefItemDataProviderTest.java
+++ b/src/test/java/org/jabref/logic/citationstyle/JabRefItemDataProviderTest.java
@@ -16,20 +16,12 @@ class JabRefItemDataProviderTest {
     void toJsonOneEntry() {
         BibDatabase bibDatabase = new BibDatabase(
             List.of(
-                new BibEntry()
-                    .withCitationKey("key")
-                    .withField(StandardField.AUTHOR, "Test Author")
+                new BibEntry().withCitationKey("key").withField(StandardField.AUTHOR, "Test Author")
             )
         );
-        BibDatabaseContext bibDatabaseContext = new BibDatabaseContext(
-            bibDatabase
-        );
-        JabRefItemDataProvider jabRefItemDataProvider =
-            new JabRefItemDataProvider();
-        jabRefItemDataProvider.setData(
-            bibDatabaseContext,
-            new BibEntryTypesManager()
-        );
+        BibDatabaseContext bibDatabaseContext = new BibDatabaseContext(bibDatabase);
+        JabRefItemDataProvider jabRefItemDataProvider = new JabRefItemDataProvider();
+        jabRefItemDataProvider.setData(bibDatabaseContext, new BibEntryTypesManager());
         assertEquals(
             """
             [{"id":"key","type":"article","author":[{"family":"Author","given":"Test"}]}]""",
@@ -49,15 +41,9 @@ void toJsonTwoEntries() {
                     .withField(StandardField.AUTHOR, "Second Author")
             )
         );
-        BibDatabaseContext bibDatabaseContext = new BibDatabaseContext(
-            bibDatabase
-        );
-        JabRefItemDataProvider jabRefItemDataProvider =
-            new JabRefItemDataProvider();
-        jabRefItemDataProvider.setData(
-            bibDatabaseContext,
-            new BibEntryTypesManager()
-        );
+        BibDatabaseContext bibDatabaseContext = new BibDatabaseContext(bibDatabase);
+        JabRefItemDataProvider jabRefItemDataProvider = new JabRefItemDataProvider();
+        jabRefItemDataProvider.setData(bibDatabaseContext, new BibEntryTypesManager());
         assertEquals(
             """
             [{"id":"key","type":"article","author":[{"family":"Author","given":"Test"}]},{"id":"key2","type":"article","author":[{"family":"Author","given":"Second"}]}]""",
diff --git a/src/test/java/org/jabref/logic/cleanup/BibtexBiblatexRoundtripTest.java b/src/test/java/org/jabref/logic/cleanup/BibtexBiblatexRoundtripTest.java
index bc2dfc694be..40d9adda318 100644
--- a/src/test/java/org/jabref/logic/cleanup/BibtexBiblatexRoundtripTest.java
+++ b/src/test/java/org/jabref/logic/cleanup/BibtexBiblatexRoundtripTest.java
@@ -22,10 +22,7 @@ void setUp() {
                     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.TITLE, "The hook graphs of the symmetric groups")
                 .withField(StandardField.JOURNAL, "Canadian J. Math.")
                 .withField(
                     new UnknownField("fjournal"),
@@ -45,10 +42,7 @@ void setUp() {
                     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.TITLE, "The hook graphs of the symmetric groups")
                 .withField(StandardField.JOURNALTITLE, "Canadian J. Math.")
                 .withField(
                     new UnknownField("fjournal"),
diff --git a/src/test/java/org/jabref/logic/cleanup/CleanupWorkerTest.java b/src/test/java/org/jabref/logic/cleanup/CleanupWorkerTest.java
index 5e310896d34..20f9e65f848 100644
--- a/src/test/java/org/jabref/logic/cleanup/CleanupWorkerTest.java
+++ b/src/test/java/org/jabref/logic/cleanup/CleanupWorkerTest.java
@@ -62,55 +62,34 @@ void setUp(@TempDir Path bibFolder) throws IOException {
 
         MetaData metaData = new MetaData();
         metaData.setDefaultFileDirectory(pdfPath.toAbsolutePath().toString());
-        BibDatabaseContext context = new BibDatabaseContext(
-            new BibDatabase(),
-            metaData
-        );
+        BibDatabaseContext context = new BibDatabaseContext(new BibDatabase(), metaData);
         Files.createFile(bibFolder.resolve("test.bib"));
         context.setDatabasePath(bibFolder.resolve("test.bib"));
 
-        FilePreferences fileDirPrefs = mock(
-            FilePreferences.class,
-            Answers.RETURNS_SMART_NULLS
-        );
+        FilePreferences fileDirPrefs = mock(FilePreferences.class, Answers.RETURNS_SMART_NULLS);
         // Search and store files relative to bib file overwrites all other dirs
         when(fileDirPrefs.shouldStoreFilesRelativeToBibFile()).thenReturn(true);
 
-        worker =
-            new CleanupWorker(
-                context,
-                fileDirPrefs,
-                mock(TimestampPreferences.class)
-            );
+        worker = new CleanupWorker(context, fileDirPrefs, mock(TimestampPreferences.class));
     }
 
     @Test
     void cleanupWithNullPresetThrowsException() {
-        assertThrows(
-            NullPointerException.class,
-            () -> worker.cleanup(null, new BibEntry())
-        );
+        assertThrows(NullPointerException.class, () -> worker.cleanup(null, new BibEntry()));
     }
 
     @Test
     void cleanupNullEntryThrowsException() {
-        assertThrows(
-            NullPointerException.class,
-            () -> worker.cleanup(emptyPreset, null)
-        );
+        assertThrows(NullPointerException.class, () -> worker.cleanup(emptyPreset, null));
     }
 
     @Test
-    void cleanupDoesNothingByDefault(@TempDir Path bibFolder)
-        throws IOException {
+    void cleanupDoesNothingByDefault(@TempDir Path bibFolder) throws IOException {
         BibEntry entry = new BibEntry();
         entry.setCitationKey("Toot");
         entry.setField(StandardField.PDF, "aPdfFile");
         entry.setField(new UnknownField("some"), "1st");
-        entry.setField(
-            StandardField.DOI,
-            "http://dx.doi.org/10.1016/0001-8708(80)90035-3"
-        );
+        entry.setField(StandardField.DOI, "http://dx.doi.org/10.1016/0001-8708(80)90035-3");
         entry.setField(StandardField.MONTH, "01");
         entry.setField(StandardField.PAGES, "1-2");
         entry.setField(StandardField.DATE, "01/1999");
@@ -126,10 +105,7 @@ void cleanupDoesNothingByDefault(@TempDir Path bibFolder)
         Path path = bibFolder.resolve("ARandomlyNamedFile");
         Files.createFile(path);
         LinkedFile fileField = new LinkedFile("", path.toAbsolutePath(), "");
-        entry.setField(
-            StandardField.FILE,
-            FileFieldWriter.getStringRepresentation(fileField)
-        );
+        entry.setField(StandardField.FILE, FileFieldWriter.getStringRepresentation(fileField));
 
         List<FieldChange> changes = worker.cleanup(emptyPreset, entry);
         assertEquals(Collections.emptyList(), changes);
@@ -145,10 +121,7 @@ void upgradeExternalLinksMoveFromPdfToFile() {
 
         worker.cleanup(preset, entry);
         assertEquals(Optional.empty(), entry.getField(StandardField.PDF));
-        assertEquals(
-            Optional.of("aPdfFile:aPdfFile:PDF"),
-            entry.getField(StandardField.FILE)
-        );
+        assertEquals(Optional.of("aPdfFile:aPdfFile:PDF"), entry.getField(StandardField.FILE));
     }
 
     @Test
@@ -161,10 +134,7 @@ void upgradeExternalLinksMoveFromPsToFile() {
 
         worker.cleanup(preset, entry);
         assertEquals(Optional.empty(), entry.getField(StandardField.PDF));
-        assertEquals(
-            Optional.of("aPsFile:aPsFile:PostScript"),
-            entry.getField(StandardField.FILE)
-        );
+        assertEquals(Optional.of("aPsFile:aPsFile:PostScript"), entry.getField(StandardField.FILE));
     }
 
     @Test
@@ -173,10 +143,7 @@ void cleanupDoiRemovesLeadingHttp() {
             CleanupPreferences.CleanupStep.CLEAN_UP_DOI
         );
         BibEntry entry = new BibEntry();
-        entry.setField(
-            StandardField.DOI,
-            "http://dx.doi.org/10.1016/0001-8708(80)90035-3"
-        );
+        entry.setField(StandardField.DOI, "http://dx.doi.org/10.1016/0001-8708(80)90035-3");
 
         worker.cleanup(preset, entry);
         assertEquals(
@@ -191,10 +158,7 @@ void cleanupDoiReturnsChanges() {
             CleanupPreferences.CleanupStep.CLEAN_UP_DOI
         );
         BibEntry entry = new BibEntry();
-        entry.setField(
-            StandardField.DOI,
-            "http://dx.doi.org/10.1016/0001-8708(80)90035-3"
-        );
+        entry.setField(StandardField.DOI, "http://dx.doi.org/10.1016/0001-8708(80)90035-3");
 
         List<FieldChange> changes = worker.cleanup(preset, entry);
 
@@ -213,10 +177,7 @@ void cleanupDoiFindsDoiInURLFieldAndMoveItToDOIField() {
             CleanupPreferences.CleanupStep.CLEAN_UP_DOI
         );
         BibEntry entry = new BibEntry();
-        entry.setField(
-            StandardField.URL,
-            "http://dx.doi.org/10.1016/0001-8708(80)90035-3"
-        );
+        entry.setField(StandardField.URL, "http://dx.doi.org/10.1016/0001-8708(80)90035-3");
 
         worker.cleanup(preset, entry);
         assertEquals(
@@ -232,20 +193,12 @@ void cleanupDoiReturnsChangeWhenDoiInURLField() {
             CleanupPreferences.CleanupStep.CLEAN_UP_DOI
         );
         BibEntry entry = new BibEntry();
-        entry.setField(
-            StandardField.URL,
-            "http://dx.doi.org/10.1016/0001-8708(80)90035-3"
-        );
+        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"
-            )
+            new FieldChange(entry, StandardField.DOI, null, "10.1016/0001-8708(80)90035-3")
         );
         changeList.add(
             new FieldChange(
@@ -264,10 +217,7 @@ void cleanupMonthChangesNumberToBibtex() {
             new FieldFormatterCleanups(
                 true,
                 Collections.singletonList(
-                    new FieldFormatterCleanup(
-                        StandardField.MONTH,
-                        new NormalizeMonthFormatter()
-                    )
+                    new FieldFormatterCleanup(StandardField.MONTH, new NormalizeMonthFormatter())
                 )
             )
         );
@@ -284,10 +234,7 @@ void cleanupPageNumbersConvertsSingleDashToDouble() {
             new FieldFormatterCleanups(
                 true,
                 Collections.singletonList(
-                    new FieldFormatterCleanup(
-                        StandardField.PAGES,
-                        new NormalizePagesFormatter()
-                    )
+                    new FieldFormatterCleanup(StandardField.PAGES, new NormalizePagesFormatter())
                 )
             )
         );
@@ -304,10 +251,7 @@ void cleanupDatesConvertsToCorrectFormat() {
             new FieldFormatterCleanups(
                 true,
                 Collections.singletonList(
-                    new FieldFormatterCleanup(
-                        StandardField.DATE,
-                        new NormalizeDateFormatter()
-                    )
+                    new FieldFormatterCleanup(StandardField.DATE, new NormalizeDateFormatter())
                 )
             )
         );
@@ -315,10 +259,7 @@ void cleanupDatesConvertsToCorrectFormat() {
         entry.setField(StandardField.DATE, "01/1999");
 
         worker.cleanup(preset, entry);
-        assertEquals(
-            Optional.of("1999-01"),
-            entry.getField(StandardField.DATE)
-        );
+        assertEquals(Optional.of("1999-01"), entry.getField(StandardField.DATE));
     }
 
     @Test
@@ -334,32 +275,18 @@ void cleanupFixFileLinksMovesSingleDescriptionToLink() {
     }
 
     @Test
-    void cleanupMoveFilesMovesFileFromSubfolder(@TempDir Path bibFolder)
-        throws IOException {
-        CleanupPreferences preset = new CleanupPreferences(
-            CleanupPreferences.CleanupStep.MOVE_PDF
-        );
+    void cleanupMoveFilesMovesFileFromSubfolder(@TempDir Path bibFolder) throws IOException {
+        CleanupPreferences preset = new CleanupPreferences(CleanupPreferences.CleanupStep.MOVE_PDF);
 
         Path path = bibFolder.resolve("AnotherRandomlyNamedFolder");
         Files.createDirectory(path);
         Path tempFile = Files.createFile(path.resolve("test.pdf"));
         BibEntry entry = new BibEntry();
-        LinkedFile fileField = new LinkedFile(
-            "",
-            tempFile.toAbsolutePath(),
-            ""
-        );
-        entry.setField(
-            StandardField.FILE,
-            FileFieldWriter.getStringRepresentation(fileField)
-        );
+        LinkedFile fileField = new LinkedFile("", tempFile.toAbsolutePath(), "");
+        entry.setField(StandardField.FILE, FileFieldWriter.getStringRepresentation(fileField));
 
         worker.cleanup(preset, entry);
-        LinkedFile newFileField = new LinkedFile(
-            "",
-            tempFile.getFileName(),
-            ""
-        );
+        LinkedFile newFileField = new LinkedFile("", tempFile.getFileName(), "");
         assertEquals(
             Optional.of(FileFieldWriter.getStringRepresentation(newFileField)),
             entry.getField(StandardField.FILE)
@@ -367,8 +294,7 @@ void cleanupMoveFilesMovesFileFromSubfolder(@TempDir Path bibFolder)
     }
 
     @Test
-    void cleanupRelativePathsConvertAbsoluteToRelativePath()
-        throws IOException {
+    void cleanupRelativePathsConvertAbsoluteToRelativePath() throws IOException {
         CleanupPreferences preset = new CleanupPreferences(
             CleanupPreferences.CleanupStep.MAKE_PATHS_RELATIVE
         );
@@ -377,10 +303,7 @@ void cleanupRelativePathsConvertAbsoluteToRelativePath()
         Files.createFile(path);
         BibEntry entry = new BibEntry();
         LinkedFile fileField = new LinkedFile("", path.toAbsolutePath(), "");
-        entry.setField(
-            StandardField.FILE,
-            FileFieldWriter.getStringRepresentation(fileField)
-        );
+        entry.setField(StandardField.FILE, FileFieldWriter.getStringRepresentation(fileField));
 
         worker.cleanup(preset, entry);
         LinkedFile newFileField = new LinkedFile("", path.getFileName(), "");
@@ -400,10 +323,7 @@ void cleanupRenamePdfRenamesRelativeFile() throws IOException {
         Files.createFile(path);
         BibEntry entry = new BibEntry().withCitationKey("Toot");
         LinkedFile fileField = new LinkedFile("", path.toAbsolutePath(), "");
-        entry.setField(
-            StandardField.FILE,
-            FileFieldWriter.getStringRepresentation(fileField)
-        );
+        entry.setField(StandardField.FILE, FileFieldWriter.getStringRepresentation(fileField));
 
         worker.cleanup(preset, entry);
         LinkedFile newFileField = new LinkedFile("", Path.of("Toot.tmp"), "");
@@ -419,10 +339,7 @@ void cleanupHtmlToLatexConvertsEpsilonToLatex() {
             new FieldFormatterCleanups(
                 true,
                 Collections.singletonList(
-                    new FieldFormatterCleanup(
-                        StandardField.TITLE,
-                        new HtmlToLatexFormatter()
-                    )
+                    new FieldFormatterCleanup(StandardField.TITLE, new HtmlToLatexFormatter())
                 )
             )
         );
@@ -430,10 +347,7 @@ void cleanupHtmlToLatexConvertsEpsilonToLatex() {
         entry.setField(StandardField.TITLE, "&Epsilon;");
 
         worker.cleanup(preset, entry);
-        assertEquals(
-            Optional.of("{{$\\Epsilon$}}"),
-            entry.getField(StandardField.TITLE)
-        );
+        assertEquals(Optional.of("{{$\\Epsilon$}}"), entry.getField(StandardField.TITLE));
     }
 
     @Test
@@ -442,10 +356,7 @@ void cleanupUnitsConvertsOneAmpereToLatex() {
             new FieldFormatterCleanups(
                 true,
                 Collections.singletonList(
-                    new FieldFormatterCleanup(
-                        StandardField.TITLE,
-                        new UnitsToLatexFormatter()
-                    )
+                    new FieldFormatterCleanup(StandardField.TITLE, new UnitsToLatexFormatter())
                 )
             )
         );
@@ -466,10 +377,7 @@ void cleanupCasesAddsBracketAroundAluminiumGalliumArsenid() {
                 Collections.emptyList()
             )
         );
-        assertNotEquals(
-            Collections.emptyList(),
-            protectedTermsLoader.getProtectedTerms()
-        );
+        assertNotEquals(Collections.emptyList(), protectedTermsLoader.getProtectedTerms());
         CleanupPreferences preset = new CleanupPreferences(
             new FieldFormatterCleanups(
                 true,
@@ -485,10 +393,7 @@ void cleanupCasesAddsBracketAroundAluminiumGalliumArsenid() {
         entry.setField(StandardField.TITLE, "AlGaAs");
 
         worker.cleanup(preset, entry);
-        assertEquals(
-            Optional.of("{AlGaAs}"),
-            entry.getField(StandardField.TITLE)
-        );
+        assertEquals(Optional.of("{AlGaAs}"), entry.getField(StandardField.TITLE));
     }
 
     @Test
@@ -497,10 +402,7 @@ void cleanupLatexMergesTwoLatexMathEnvironments() {
             new FieldFormatterCleanups(
                 true,
                 Collections.singletonList(
-                    new FieldFormatterCleanup(
-                        StandardField.TITLE,
-                        new LatexCleanupFormatter()
-                    )
+                    new FieldFormatterCleanup(StandardField.TITLE, new LatexCleanupFormatter())
                 )
             )
         );
@@ -508,10 +410,7 @@ void cleanupLatexMergesTwoLatexMathEnvironments() {
         entry.setField(StandardField.TITLE, "$\\alpha$$\\beta$");
 
         worker.cleanup(preset, entry);
-        assertEquals(
-            Optional.of("$\\alpha\\beta$"),
-            entry.getField(StandardField.TITLE)
-        );
+        assertEquals(Optional.of("$\\alpha\\beta$"), entry.getField(StandardField.TITLE));
     }
 
     @Test
@@ -524,10 +423,7 @@ void convertToBiblatexMovesAddressToLocation() {
 
         worker.cleanup(preset, entry);
         assertEquals(Optional.empty(), entry.getField(StandardField.ADDRESS));
-        assertEquals(
-            Optional.of("test"),
-            entry.getField(StandardField.LOCATION)
-        );
+        assertEquals(Optional.of("test"), entry.getField(StandardField.LOCATION));
     }
 
     @Test
@@ -540,10 +436,7 @@ void convertToBiblatexMovesJournalToJournalTitle() {
 
         worker.cleanup(preset, entry);
         assertEquals(Optional.empty(), entry.getField(StandardField.JOURNAL));
-        assertEquals(
-            Optional.of("test"),
-            entry.getField(StandardField.JOURNALTITLE)
-        );
+        assertEquals(Optional.of("test"), entry.getField(StandardField.JOURNALTITLE));
     }
 
     @Test
@@ -552,10 +445,7 @@ void cleanupWithDisabledFieldFormatterChangesNothing() {
             new FieldFormatterCleanups(
                 false,
                 Collections.singletonList(
-                    new FieldFormatterCleanup(
-                        StandardField.MONTH,
-                        new NormalizeMonthFormatter()
-                    )
+                    new FieldFormatterCleanup(StandardField.MONTH, new NormalizeMonthFormatter())
                 )
             )
         );
diff --git a/src/test/java/org/jabref/logic/cleanup/ConvertToBiblatexCleanupTest.java b/src/test/java/org/jabref/logic/cleanup/ConvertToBiblatexCleanupTest.java
index 8bf3d72df35..9019afd4158 100644
--- a/src/test/java/org/jabref/logic/cleanup/ConvertToBiblatexCleanupTest.java
+++ b/src/test/java/org/jabref/logic/cleanup/ConvertToBiblatexCleanupTest.java
@@ -27,10 +27,7 @@ public void cleanupMovesYearMonthToDate() {
 
         assertEquals(Optional.empty(), entry.getField(StandardField.YEAR));
         assertEquals(Optional.empty(), entry.getField(StandardField.MONTH));
-        assertEquals(
-            Optional.of("2011-01"),
-            entry.getField(StandardField.DATE)
-        );
+        assertEquals(Optional.of("2011-01"), entry.getField(StandardField.DATE));
     }
 
     @Test
@@ -44,10 +41,7 @@ public void cleanupWithDateAlreadyPresentAndDifferentFromYearDoesNothing() {
 
         assertEquals(Optional.of("2011"), entry.getField(StandardField.YEAR));
         assertEquals(Optional.of("#jan#"), entry.getField(StandardField.MONTH));
-        assertEquals(
-            Optional.of("2012-01"),
-            entry.getField(StandardField.DATE)
-        );
+        assertEquals(Optional.of("2012-01"), entry.getField(StandardField.DATE));
     }
 
     @Test
@@ -61,10 +55,7 @@ public void cleanupWithDateAlreadyPresentAndDifferentFromMonthDoesNothing() {
 
         assertEquals(Optional.of("2011"), entry.getField(StandardField.YEAR));
         assertEquals(Optional.of("#jan#"), entry.getField(StandardField.MONTH));
-        assertEquals(
-            Optional.of("2011-02"),
-            entry.getField(StandardField.DATE)
-        );
+        assertEquals(Optional.of("2011-02"), entry.getField(StandardField.DATE));
     }
 
     @Test
@@ -92,23 +83,16 @@ public void cleanupWithDateAlreadyPresentAndEqualsToYearAndMonth() {
 
         assertEquals(Optional.empty(), entry.getField(StandardField.YEAR));
         assertEquals(Optional.empty(), entry.getField(StandardField.MONTH));
-        assertEquals(
-            Optional.of("2011-01"),
-            entry.getField(StandardField.DATE)
-        );
+        assertEquals(Optional.of("2011-01"), entry.getField(StandardField.DATE));
     }
 
     @Test
     public void cleanupMovesJournalToJournaltitle() {
-        BibEntry entry = new BibEntry()
-            .withField(StandardField.JOURNAL, "Best of JabRef");
+        BibEntry entry = new BibEntry().withField(StandardField.JOURNAL, "Best of JabRef");
 
         worker.cleanup(entry);
 
         assertEquals(Optional.empty(), entry.getField(StandardField.JOURNAL));
-        assertEquals(
-            Optional.of("Best of JabRef"),
-            entry.getField(StandardField.JOURNALTITLE)
-        );
+        assertEquals(Optional.of("Best of JabRef"), entry.getField(StandardField.JOURNALTITLE));
     }
 }
diff --git a/src/test/java/org/jabref/logic/cleanup/ConvertToBibtexCleanupTest.java b/src/test/java/org/jabref/logic/cleanup/ConvertToBibtexCleanupTest.java
index 9c8fdced1b1..0e06d9194c1 100644
--- a/src/test/java/org/jabref/logic/cleanup/ConvertToBibtexCleanupTest.java
+++ b/src/test/java/org/jabref/logic/cleanup/ConvertToBibtexCleanupTest.java
@@ -19,8 +19,7 @@ public void setUp() {
 
     @Test
     public void cleanupMovesDateToYearAndMonth() {
-        BibEntry entry = new BibEntry()
-            .withField(StandardField.DATE, "2011-01");
+        BibEntry entry = new BibEntry().withField(StandardField.DATE, "2011-01");
 
         worker.cleanup(entry);
 
@@ -43,33 +42,22 @@ public void cleanupWithYearAlreadyPresentDoesNothing() {
 
     @Test
     public void cleanupMovesJournaltitleToJournal() {
-        BibEntry entry = new BibEntry()
-            .withField(StandardField.JOURNALTITLE, "Best of JabRef");
+        BibEntry entry = new BibEntry().withField(StandardField.JOURNALTITLE, "Best of JabRef");
 
         worker.cleanup(entry);
 
-        assertEquals(
-            Optional.empty(),
-            entry.getField(StandardField.JOURNALTITLE)
-        );
-        assertEquals(
-            Optional.of("Best of JabRef"),
-            entry.getField(StandardField.JOURNAL)
-        );
+        assertEquals(Optional.empty(), entry.getField(StandardField.JOURNALTITLE));
+        assertEquals(Optional.of("Best of JabRef"), entry.getField(StandardField.JOURNAL));
     }
 
     @Test
     public void cleanUpDoesntMoveFileField() {
         String fileField =
             ":Ambriola2006 - On the Systematic Analysis of Natural Language Requirements with CIRCE.pdf:PDF";
-        BibEntry entry = new BibEntry()
-            .withField(StandardField.FILE, fileField);
+        BibEntry entry = new BibEntry().withField(StandardField.FILE, fileField);
 
         worker.cleanup(entry);
 
-        assertEquals(
-            Optional.of(fileField),
-            entry.getField(StandardField.FILE)
-        );
+        assertEquals(Optional.of(fileField), entry.getField(StandardField.FILE));
     }
 }
diff --git a/src/test/java/org/jabref/logic/cleanup/DoiCleanupTest.java b/src/test/java/org/jabref/logic/cleanup/DoiCleanupTest.java
index ae63b5150b0..237d93b0772 100644
--- a/src/test/java/org/jabref/logic/cleanup/DoiCleanupTest.java
+++ b/src/test/java/org/jabref/logic/cleanup/DoiCleanupTest.java
@@ -23,56 +23,33 @@ public void testChangeDoi(BibEntry expected, BibEntry doiInfoField) {
 
     private static Stream<Arguments> provideDoiForAllLowers() {
         UnknownField unknownField = new UnknownField("ee");
-        BibEntry doiResult = new BibEntry()
-            .withField(StandardField.DOI, "10.1145/2594455");
+        BibEntry doiResult = new BibEntry().withField(StandardField.DOI, "10.1145/2594455");
 
         return Stream.of(
             // cleanup for Doi field only
             Arguments.of(
                 doiResult,
-                new BibEntry()
-                    .withField(
-                        StandardField.URL,
-                        "https://doi.org/10.1145/2594455"
-                    )
+                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(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.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.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(
@@ -82,17 +59,12 @@ private static Stream<Arguments> provideDoiForAllLowers() {
             // cleanup just Note field with URL
             Arguments.of(
                 doiResult,
-                new BibEntry()
-                    .withField(
-                        StandardField.NOTE,
-                        "https://doi.org/10.1145/2594455"
-                    )
+                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")
+                new BibEntry().withField(unknownField, "https://doi.org/10.1145/2594455")
             ),
             // cleanup of url encoded chars
             Arguments.of(
diff --git a/src/test/java/org/jabref/logic/cleanup/DoiDecodeCleanupTest.java b/src/test/java/org/jabref/logic/cleanup/DoiDecodeCleanupTest.java
index 2b66034374b..c428d50b7c2 100644
--- a/src/test/java/org/jabref/logic/cleanup/DoiDecodeCleanupTest.java
+++ b/src/test/java/org/jabref/logic/cleanup/DoiDecodeCleanupTest.java
@@ -23,8 +23,7 @@ public void testChangeDoi(BibEntry expected, BibEntry doiInfoField) {
 
     private static Stream<Arguments> provideDoiForAllLowers() {
         UnknownField unknownField = new UnknownField("ee");
-        BibEntry doiResult = new BibEntry()
-            .withField(StandardField.DOI, "10.18726/2018_3");
+        BibEntry doiResult = new BibEntry().withField(StandardField.DOI, "10.18726/2018_3");
 
         return Stream.of(
             // cleanup for Doi field only
@@ -40,10 +39,7 @@ private static Stream<Arguments> provideDoiForAllLowers() {
             Arguments.of(
                 doiResult,
                 new BibEntry()
-                    .withField(
-                        StandardField.DOI,
-                        "10.18726/2018%7B%5Ctextunderscore%7D3"
-                    )
+                    .withField(StandardField.DOI, "10.18726/2018%7B%5Ctextunderscore%7D3")
                     .withField(
                         StandardField.URL,
                         "https://doi.org/10.18726/2018%7B%5Ctextunderscore%7D3"
@@ -61,33 +57,17 @@ private static Stream<Arguments> provideDoiForAllLowers() {
             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.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.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"
-                    )
+                new BibEntry().withField(StandardField.DOI, "10.18726/2018%7B%5Ctextunderscore%7D3")
             ),
             // cleanup just Note field with URL
             Arguments.of(
diff --git a/src/test/java/org/jabref/logic/cleanup/FieldFormatterCleanupTest.java b/src/test/java/org/jabref/logic/cleanup/FieldFormatterCleanupTest.java
index 29766a952c0..1a880658f74 100644
--- a/src/test/java/org/jabref/logic/cleanup/FieldFormatterCleanupTest.java
+++ b/src/test/java/org/jabref/logic/cleanup/FieldFormatterCleanupTest.java
@@ -89,26 +89,14 @@ public void testInternalAllTextFieldsField() throws Exception {
             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.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.DOI),
-            entry.getField(StandardField.DOI).get()
-        );
-        assertEquals(
-            fieldMap.get(StandardField.ISSN),
-            entry.getField(StandardField.ISSN).get()
-        );
+        assertEquals(fieldMap.get(StandardField.DOI), entry.getField(StandardField.DOI).get());
+        assertEquals(fieldMap.get(StandardField.ISSN), entry.getField(StandardField.ISSN).get());
     }
 
     @Test
@@ -120,10 +108,7 @@ public void testCleanupAllFieldsIgnoresKeyField() throws Exception {
         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()
-        );
+        assertEquals("François-Marie Arouet", entry.getField(InternalField.KEY_FIELD).get());
     }
 
     @Test
@@ -135,10 +120,7 @@ public void testCleanupAllTextFieldsIgnoresKeyField() throws Exception {
         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()
-        );
+        assertEquals("François-Marie Arouet", entry.getField(InternalField.KEY_FIELD).get());
     }
 
     @Test
@@ -150,9 +132,6 @@ public void testCleanupKeyFieldCleansUpKeyField() throws Exception {
         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()
-        );
+        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 20d68b591a6..2e82b4c8161 100644
--- a/src/test/java/org/jabref/logic/cleanup/FieldFormatterCleanupsTest.java
+++ b/src/test/java/org/jabref/logic/cleanup/FieldFormatterCleanupsTest.java
@@ -60,17 +60,11 @@ public void checkSimpleUseCase() {
             StandardField.TITLE,
             new IdentityFormatter()
         );
-        assertEquals(
-            Collections.singletonList(identityInTitle),
-            actions.getConfiguredActions()
-        );
+        assertEquals(Collections.singletonList(identityInTitle), actions.getConfiguredActions());
 
         actions.applySaveActions(entry);
 
-        assertEquals(
-            Optional.of("Educational session 1"),
-            entry.getField(StandardField.TITLE)
-        );
+        assertEquals(Optional.of("Educational session 1"), entry.getField(StandardField.TITLE));
     }
 
     @Test
@@ -84,10 +78,7 @@ public void invalidSaveActionSting() {
 
         actions.applySaveActions(entry);
 
-        assertEquals(
-            Optional.of("Educational session 1"),
-            entry.getField(StandardField.TITLE)
-        );
+        assertEquals(Optional.of("Educational session 1"), entry.getField(StandardField.TITLE));
     }
 
     @Test
@@ -101,17 +92,11 @@ public void checkLowerCaseSaveAction() {
             StandardField.TITLE,
             new LowerCaseFormatter()
         );
-        assertEquals(
-            Collections.singletonList(lowerCaseTitle),
-            actions.getConfiguredActions()
-        );
+        assertEquals(Collections.singletonList(lowerCaseTitle), actions.getConfiguredActions());
 
         actions.applySaveActions(entry);
 
-        assertEquals(
-            Optional.of("educational session 1"),
-            entry.getField(StandardField.TITLE)
-        );
+        assertEquals(Optional.of("educational session 1"), entry.getField(StandardField.TITLE));
     }
 
     @Test
@@ -136,19 +121,14 @@ public void checkTwoSaveActionsForOneField() {
 
         actions.applySaveActions(entry);
 
-        assertEquals(
-            Optional.of("educational session 1"),
-            entry.getField(StandardField.TITLE)
-        );
+        assertEquals(Optional.of("educational session 1"), entry.getField(StandardField.TITLE));
     }
 
     @Test
     public void checkThreeSaveActionsForOneField() {
         FieldFormatterCleanups actions = new FieldFormatterCleanups(
             true,
-            FieldFormatterCleanups.parse(
-                "title[lower_case,identity,normalize_date]"
-            )
+            FieldFormatterCleanups.parse("title[lower_case,identity,normalize_date]")
         );
 
         FieldFormatterCleanup lowerCaseTitle = new FieldFormatterCleanup(
@@ -164,32 +144,22 @@ public void checkThreeSaveActionsForOneField() {
             new NormalizeDateFormatter()
         );
         assertEquals(
-            Arrays.asList(
-                lowerCaseTitle,
-                identityInTitle,
-                normalizeDatesInTitle
-            ),
+            Arrays.asList(lowerCaseTitle, identityInTitle, normalizeDatesInTitle),
             actions.getConfiguredActions()
         );
 
         actions.applySaveActions(entry);
 
-        assertEquals(
-            Optional.of("educational session 1"),
-            entry.getField(StandardField.TITLE)
-        );
+        assertEquals(Optional.of("educational session 1"), entry.getField(StandardField.TITLE));
     }
 
     @Test
     public void checkMultipleSaveActions() {
         FieldFormatterCleanups actions = new FieldFormatterCleanups(
             true,
-            FieldFormatterCleanups.parse(
-                "pages[normalize_page_numbers]title[lower_case]"
-            )
+            FieldFormatterCleanups.parse("pages[normalize_page_numbers]title[lower_case]")
         );
-        List<FieldFormatterCleanup> formatterCleanups =
-            actions.getConfiguredActions();
+        List<FieldFormatterCleanup> formatterCleanups = actions.getConfiguredActions();
 
         FieldFormatterCleanup normalizePages = new FieldFormatterCleanup(
             StandardField.PAGES,
@@ -199,17 +169,11 @@ public void checkMultipleSaveActions() {
             StandardField.TITLE,
             new LowerCaseFormatter()
         );
-        assertEquals(
-            Arrays.asList(normalizePages, lowerCaseTitle),
-            formatterCleanups
-        );
+        assertEquals(Arrays.asList(normalizePages, lowerCaseTitle), formatterCleanups);
 
         actions.applySaveActions(entry);
 
-        assertEquals(
-            Optional.of("educational session 1"),
-            entry.getField(StandardField.TITLE)
-        );
+        assertEquals(Optional.of("educational session 1"), entry.getField(StandardField.TITLE));
         assertEquals(Optional.of("1--7"), entry.getField(StandardField.PAGES));
     }
 
@@ -221,8 +185,7 @@ public void checkMultipleSaveActionsWithMultipleFormatters() {
                 "pages[normalize_page_numbers,normalize_date]title[lower_case]"
             )
         );
-        List<FieldFormatterCleanup> formatterCleanups =
-            actions.getConfiguredActions();
+        List<FieldFormatterCleanup> formatterCleanups = actions.getConfiguredActions();
 
         FieldFormatterCleanup normalizePages = new FieldFormatterCleanup(
             StandardField.PAGES,
@@ -237,20 +200,13 @@ public void checkMultipleSaveActionsWithMultipleFormatters() {
             new LowerCaseFormatter()
         );
         assertEquals(
-            Arrays.asList(
-                normalizePages,
-                normalizeDatesInPages,
-                lowerCaseTitle
-            ),
+            Arrays.asList(normalizePages, normalizeDatesInPages, lowerCaseTitle),
             formatterCleanups
         );
 
         actions.applySaveActions(entry);
 
-        assertEquals(
-            Optional.of("educational session 1"),
-            entry.getField(StandardField.TITLE)
-        );
+        assertEquals(Optional.of("educational session 1"), entry.getField(StandardField.TITLE));
         assertEquals(Optional.of("1--7"), entry.getField(StandardField.PAGES));
     }
 
@@ -267,32 +223,21 @@ public void clearFormatterRemovesField() {
 
     @Test
     void parserKeepsSaveActions() {
-        List<FieldFormatterCleanup> fieldFormatterCleanups =
-            FieldFormatterCleanups.parse(
-                """
-                month[normalize_month]
-                pages[normalize_page_numbers]
-                title[escapeAmpersands,escapeDollarSign,escapeUnderscores,latex_cleanup]
-                booktitle[escapeAmpersands,escapeDollarSign,escapeUnderscores,latex_cleanup]
-                publisher[escapeAmpersands,escapeDollarSign,escapeUnderscores,latex_cleanup]
-                journal[escapeAmpersands,escapeDollarSign,escapeUnderscores,latex_cleanup]
-                abstract[escapeAmpersands,escapeDollarSign,escapeUnderscores,latex_cleanup]
-                """
-            );
+        List<FieldFormatterCleanup> fieldFormatterCleanups = FieldFormatterCleanups.parse(
+            """
+            month[normalize_month]
+            pages[normalize_page_numbers]
+            title[escapeAmpersands,escapeDollarSign,escapeUnderscores,latex_cleanup]
+            booktitle[escapeAmpersands,escapeDollarSign,escapeUnderscores,latex_cleanup]
+            publisher[escapeAmpersands,escapeDollarSign,escapeUnderscores,latex_cleanup]
+            journal[escapeAmpersands,escapeDollarSign,escapeUnderscores,latex_cleanup]
+            abstract[escapeAmpersands,escapeDollarSign,escapeUnderscores,latex_cleanup]
+            """
+        );
 
         List<FieldFormatterCleanup> expected = new ArrayList<>(30);
-        expected.add(
-            new FieldFormatterCleanup(
-                StandardField.MONTH,
-                new NormalizeMonthFormatter()
-            )
-        );
-        expected.add(
-            new FieldFormatterCleanup(
-                StandardField.PAGES,
-                new NormalizePagesFormatter()
-            )
-        );
+        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,
@@ -300,27 +245,10 @@ void parserKeepsSaveActions() {
             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()
-                )
-            );
-            expected.add(
-                new FieldFormatterCleanup(field, new LatexCleanupFormatter())
-            );
+            expected.add(new FieldFormatterCleanup(field, new EscapeAmpersandsFormatter()));
+            expected.add(new FieldFormatterCleanup(field, new EscapeDollarSignFormatter()));
+            expected.add(new FieldFormatterCleanup(field, new EscapeUnderscoresFormatter()));
+            expected.add(new FieldFormatterCleanup(field, new LatexCleanupFormatter()));
         }
 
         assertEquals(expected, fieldFormatterCleanups);
@@ -328,41 +256,28 @@ void parserKeepsSaveActions() {
 
     @Test
     void parserParsesLatexCleanupFormatter() {
-        List<FieldFormatterCleanup> fieldFormatterCleanups =
-            FieldFormatterCleanups.parse(
-                """
-                title[latex_cleanup]
-                """
-            );
+        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(
-                """
-                title[escapeUnderscores,latex_cleanup]
-                """
-            );
+        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
         );
@@ -370,30 +285,17 @@ void parserParsesTwoFormatters() {
 
     @Test
     void parserParsesFourFormatters() {
-        List<FieldFormatterCleanup> fieldFormatterCleanups =
-            FieldFormatterCleanups.parse(
-                """
-                title[escapeAmpersands,escapeDollarSign,escapeUnderscores,latex_cleanup]
-                """
-            );
+        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
         );
@@ -401,31 +303,18 @@ void parserParsesFourFormatters() {
 
     @Test
     void parserParsesTwoFormattersWithCommas() {
-        List<FieldFormatterCleanup> fieldFormatterCleanups =
-            FieldFormatterCleanups.parse(
-                """
-                title[escapeUnderscores,latex_cleanup]
-                booktitle[escapeAmpersands,escapeDollarSign]
-                """
-            );
+        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 LatexCleanupFormatter()
-                ),
-                new FieldFormatterCleanup(
-                    StandardField.BOOKTITLE,
-                    new EscapeAmpersandsFormatter()
-                ),
-                new FieldFormatterCleanup(
-                    StandardField.BOOKTITLE,
-                    new EscapeDollarSignFormatter()
-                )
+                new FieldFormatterCleanup(StandardField.TITLE, new EscapeUnderscoresFormatter()),
+                new FieldFormatterCleanup(StandardField.TITLE, new LatexCleanupFormatter()),
+                new FieldFormatterCleanup(StandardField.BOOKTITLE, new EscapeAmpersandsFormatter()),
+                new FieldFormatterCleanup(StandardField.BOOKTITLE, new EscapeDollarSignFormatter())
             ),
             fieldFormatterCleanups
         );
@@ -433,27 +322,17 @@ void parserParsesTwoFormattersWithCommas() {
 
     @Test
     void parserParsesTwoFormattersOneWithComma() {
-        List<FieldFormatterCleanup> fieldFormatterCleanups =
-            FieldFormatterCleanups.parse(
-                """
-                pages[normalize_page_numbers]
-                booktitle[escapeAmpersands,escapeDollarSign]
-                """
-            );
+        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
         );
@@ -461,36 +340,20 @@ void parserParsesTwoFormattersOneWithComma() {
 
     @Test
     void parserParsesThreeFormattersTwoWithComma() {
-        List<FieldFormatterCleanup> fieldFormatterCleanups =
-            FieldFormatterCleanups.parse(
-                """
-                pages[normalize_page_numbers]
-                title[escapeUnderscores,latex_cleanup]
-                booktitle[escapeAmpersands,escapeDollarSign]
-                """
-            );
+        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.TITLE,
-                    new LatexCleanupFormatter()
-                ),
-                new FieldFormatterCleanup(
-                    StandardField.BOOKTITLE,
-                    new EscapeAmpersandsFormatter()
-                ),
-                new FieldFormatterCleanup(
-                    StandardField.BOOKTITLE,
-                    new EscapeDollarSignFormatter()
-                )
+                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())
             ),
             fieldFormatterCleanups
         );
@@ -498,34 +361,18 @@ void parserParsesThreeFormattersTwoWithComma() {
 
     @Test
     void parserWithTwoAndThree() {
-        List<FieldFormatterCleanup> fieldFormatterCleanups =
-            FieldFormatterCleanups.parse(
-                """
-                title[escapeAmpersands,escapeUnderscores,latex_cleanup]
-                booktitle[escapeAmpersands,escapeUnderscores,latex_cleanup]
-                """
-            );
+        List<FieldFormatterCleanup> fieldFormatterCleanups = FieldFormatterCleanups.parse(
+            """
+            title[escapeAmpersands,escapeUnderscores,latex_cleanup]
+            booktitle[escapeAmpersands,escapeUnderscores,latex_cleanup]
+            """
+        );
 
         List<FieldFormatterCleanup> expected = new ArrayList<>(30);
-        for (Field field : List.of(
-            StandardField.TITLE,
-            StandardField.BOOKTITLE
-        )) {
-            expected.add(
-                new FieldFormatterCleanup(
-                    field,
-                    new EscapeAmpersandsFormatter()
-                )
-            );
-            expected.add(
-                new FieldFormatterCleanup(
-                    field,
-                    new EscapeUnderscoresFormatter()
-                )
-            );
-            expected.add(
-                new FieldFormatterCleanup(field, new LatexCleanupFormatter())
-            );
+        for (Field field : List.of(StandardField.TITLE, StandardField.BOOKTITLE)) {
+            expected.add(new FieldFormatterCleanup(field, new EscapeAmpersandsFormatter()));
+            expected.add(new FieldFormatterCleanup(field, new EscapeUnderscoresFormatter()));
+            expected.add(new FieldFormatterCleanup(field, new LatexCleanupFormatter()));
         }
 
         assertEquals(expected, fieldFormatterCleanups);
@@ -533,35 +380,22 @@ void parserWithTwoAndThree() {
 
     @Test
     void parserWithFourEntries() {
-        List<FieldFormatterCleanup> fieldFormatterCleanups =
-            FieldFormatterCleanups.parse(
-                """
-                title[escapeUnderscores,latex_cleanup]
-                booktitle[escapeAmpersands,escapeUnderscores,latex_cleanup]
-                """
-            );
+        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 LatexCleanupFormatter()
-                ),
-                new FieldFormatterCleanup(
-                    StandardField.BOOKTITLE,
-                    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 EscapeUnderscoresFormatter()
                 ),
-                new FieldFormatterCleanup(
-                    StandardField.BOOKTITLE,
-                    new LatexCleanupFormatter()
-                )
+                new FieldFormatterCleanup(StandardField.BOOKTITLE, new LatexCleanupFormatter())
             ),
             fieldFormatterCleanups
         );
@@ -569,35 +403,19 @@ void parserWithFourEntries() {
 
     @Test
     void parserTest() {
-        List<FieldFormatterCleanup> fieldFormatterCleanups =
-            FieldFormatterCleanups.parse(
-                """
-                title[escapeAmpersands,escapeUnderscores,latex_cleanup]
-                booktitle[escapeAmpersands,latex_cleanup]
-                """
-            );
+        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 LatexCleanupFormatter()
-                ),
-                new FieldFormatterCleanup(
-                    StandardField.BOOKTITLE,
-                    new EscapeAmpersandsFormatter()
-                ),
-                new FieldFormatterCleanup(
-                    StandardField.BOOKTITLE,
-                    new LatexCleanupFormatter()
-                )
+                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())
             ),
             fieldFormatterCleanups
         );
@@ -638,9 +456,7 @@ void parsingOfDefaultSaveActions() {
     void formatterFromString() {
         assertEquals(
             new ReplaceUnicodeLigaturesFormatter(),
-            FieldFormatterCleanups.getFormatterFromString(
-                "replace_unicode_ligatures"
-            )
+            FieldFormatterCleanups.getFormatterFromString("replace_unicode_ligatures")
         );
     }
 }
diff --git a/src/test/java/org/jabref/logic/cleanup/ISSNCleanupTest.java b/src/test/java/org/jabref/logic/cleanup/ISSNCleanupTest.java
index 2a373b4dd36..101f9eb18a3 100644
--- a/src/test/java/org/jabref/logic/cleanup/ISSNCleanupTest.java
+++ b/src/test/java/org/jabref/logic/cleanup/ISSNCleanupTest.java
@@ -36,10 +36,7 @@ public void cleanupISSNReturnsCorrectISSN() {
         entry.setField(StandardField.ISSN, "0123-4567");
 
         worker.cleanup(preset, entry);
-        assertEquals(
-            Optional.of("0123-4567"),
-            entry.getField(StandardField.ISSN)
-        );
+        assertEquals(Optional.of("0123-4567"), entry.getField(StandardField.ISSN));
     }
 
     @Test
@@ -51,10 +48,7 @@ public void cleanupISSNAddsMissingDash() {
         entry.setField(StandardField.ISSN, "01234567");
 
         worker.cleanup(preset, entry);
-        assertEquals(
-            Optional.of("0123-4567"),
-            entry.getField(StandardField.ISSN)
-        );
+        assertEquals(Optional.of("0123-4567"), entry.getField(StandardField.ISSN));
     }
 
     @Test
diff --git a/src/test/java/org/jabref/logic/cleanup/MoveFilesCleanupTest.java b/src/test/java/org/jabref/logic/cleanup/MoveFilesCleanupTest.java
index f31910fbece..15301f2ec7e 100644
--- a/src/test/java/org/jabref/logic/cleanup/MoveFilesCleanupTest.java
+++ b/src/test/java/org/jabref/logic/cleanup/MoveFilesCleanupTest.java
@@ -48,9 +48,7 @@ void setUp(@TempDir Path bibFolder) throws IOException {
         Files.createFile(fileBefore);
 
         MetaData metaData = new MetaData();
-        metaData.setDefaultFileDirectory(
-            defaultFileFolder.toAbsolutePath().toString()
-        );
+        metaData.setDefaultFileDirectory(defaultFileFolder.toAbsolutePath().toString());
         databaseContext = new BibDatabaseContext(new BibDatabase(), metaData);
         Files.createFile(bibFolder.resolve("test.bib"));
         databaseContext.setDatabasePath(bibFolder.resolve("test.bib"));
@@ -59,19 +57,11 @@ void setUp(@TempDir Path bibFolder) throws IOException {
         entry.setCitationKey("Toot");
         entry.setField(StandardField.TITLE, "test title");
         entry.setField(StandardField.YEAR, "1989");
-        LinkedFile fileField = new LinkedFile(
-            "",
-            fileBefore.toAbsolutePath(),
-            ""
-        );
-        entry.setField(
-            StandardField.FILE,
-            FileFieldWriter.getStringRepresentation(fileField)
-        );
+        LinkedFile fileField = new LinkedFile("", fileBefore.toAbsolutePath(), "");
+        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);
     }
 
@@ -83,9 +73,7 @@ void movesFile() {
         Path fileAfter = defaultFileFolder.resolve("test.pdf");
         assertEquals(
             Optional.of(
-                FileFieldWriter.getStringRepresentation(
-                    new LinkedFile("", Path.of("test.pdf"), "")
-                )
+                FileFieldWriter.getStringRepresentation(new LinkedFile("", Path.of("test.pdf"), ""))
             ),
             entry.getField(StandardField.FILE)
         );
@@ -95,11 +83,7 @@ void movesFile() {
 
     @Test
     void movesFileWithMulitpleLinked() {
-        LinkedFile fileField = new LinkedFile(
-            "",
-            fileBefore.toAbsolutePath(),
-            ""
-        );
+        LinkedFile fileField = new LinkedFile("", fileBefore.toAbsolutePath(), "");
         entry.setField(
             StandardField.FILE,
             FileFieldWriter.getStringRepresentation(
@@ -133,8 +117,7 @@ void movesFileWithMulitpleLinked() {
 
     @Test
     void movesFileWithFileDirPattern() {
-        when(filePreferences.getFileDirectoryPattern())
-            .thenReturn("[entrytype]");
+        when(filePreferences.getFileDirectoryPattern()).thenReturn("[entrytype]");
         cleanup.cleanup(entry);
 
         Path fileAfter = defaultFileFolder.resolve("Misc").resolve("test.pdf");
@@ -158,9 +141,7 @@ void doesNotMoveFileWithEmptyFileDirPattern() {
         Path fileAfter = defaultFileFolder.resolve("test.pdf");
         assertEquals(
             Optional.of(
-                FileFieldWriter.getStringRepresentation(
-                    new LinkedFile("", Path.of("test.pdf"), "")
-                )
+                FileFieldWriter.getStringRepresentation(new LinkedFile("", Path.of("test.pdf"), ""))
             ),
             entry.getField(StandardField.FILE)
         );
@@ -170,14 +151,10 @@ void doesNotMoveFileWithEmptyFileDirPattern() {
 
     @Test
     void movesFileWithSubdirectoryPattern() {
-        when(filePreferences.getFileDirectoryPattern())
-            .thenReturn("[entrytype]/[year]/[auth]");
+        when(filePreferences.getFileDirectoryPattern()).thenReturn("[entrytype]/[year]/[auth]");
         cleanup.cleanup(entry);
 
-        Path fileAfter = defaultFileFolder
-            .resolve("Misc")
-            .resolve("1989")
-            .resolve("test.pdf");
+        Path fileAfter = defaultFileFolder.resolve("Misc").resolve("1989").resolve("test.pdf");
         assertEquals(
             Optional.of(
                 FileFieldWriter.getStringRepresentation(
diff --git a/src/test/java/org/jabref/logic/cleanup/RenamePdfCleanupTest.java b/src/test/java/org/jabref/logic/cleanup/RenamePdfCleanupTest.java
index e2406d95e6f..a5a13665da3 100644
--- a/src/test/java/org/jabref/logic/cleanup/RenamePdfCleanupTest.java
+++ b/src/test/java/org/jabref/logic/cleanup/RenamePdfCleanupTest.java
@@ -36,18 +36,14 @@ void setUp(@TempDir Path testFolder) {
         this.testFolder = testFolder;
         Path path = testFolder.resolve("test.bib");
         MetaData metaData = new MetaData();
-        BibDatabaseContext context = new BibDatabaseContext(
-            new BibDatabase(),
-            metaData
-        );
+        BibDatabaseContext context = new BibDatabaseContext(new BibDatabase(), metaData);
         context.setDatabasePath(path);
 
         entry = new BibEntry();
         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);
     }
 
@@ -55,16 +51,12 @@ void setUp(@TempDir Path testFolder) {
      * Test for #466
      */
     @Test
-    void cleanupRenamePdfRenamesFileEvenIfOnlyDifferenceIsCase()
-        throws IOException {
+    void cleanupRenamePdfRenamesFileEvenIfOnlyDifferenceIsCase() throws IOException {
         Path path = testFolder.resolve("toot.tmp");
         Files.createFile(path);
 
         LinkedFile fileField = new LinkedFile("", path.toAbsolutePath(), "");
-        entry.setField(
-            StandardField.FILE,
-            FileFieldWriter.getStringRepresentation(fileField)
-        );
+        entry.setField(StandardField.FILE, FileFieldWriter.getStringRepresentation(fileField));
 
         when(filePreferences.getFileNamePattern()).thenReturn("[citationkey]");
         cleanup.cleanup(entry);
@@ -93,8 +85,7 @@ void cleanupRenamePdfRenamesWithMultipleFiles() throws IOException {
             )
         );
 
-        when(filePreferences.getFileNamePattern())
-            .thenReturn("[citationkey] - [fulltitle]");
+        when(filePreferences.getFileNamePattern()).thenReturn("[citationkey] - [fulltitle]");
         cleanup.cleanup(entry);
 
         assertEquals(
@@ -102,11 +93,7 @@ void cleanupRenamePdfRenamesWithMultipleFiles() throws IOException {
                 FileFieldWriter.getStringRepresentation(
                     Arrays.asList(
                         new LinkedFile("", Path.of(""), ""),
-                        new LinkedFile(
-                            "",
-                            Path.of("Toot - test title.tmp"),
-                            ""
-                        ),
+                        new LinkedFile("", Path.of("Toot - test title.tmp"), ""),
                         new LinkedFile("", Path.of(""), "")
                     )
                 )
@@ -116,27 +103,18 @@ void cleanupRenamePdfRenamesWithMultipleFiles() throws IOException {
     }
 
     @Test
-    void cleanupRenamePdfRenamesFileStartingWithCitationKey()
-        throws IOException {
+    void cleanupRenamePdfRenamesFileStartingWithCitationKey() throws IOException {
         Path path = testFolder.resolve("Toot.tmp");
         Files.createFile(path);
 
         LinkedFile fileField = new LinkedFile("", path.toAbsolutePath(), "");
-        entry.setField(
-            StandardField.FILE,
-            FileFieldWriter.getStringRepresentation(fileField)
-        );
+        entry.setField(StandardField.FILE, FileFieldWriter.getStringRepresentation(fileField));
         entry.setField(StandardField.TITLE, "test title");
 
-        when(filePreferences.getFileNamePattern())
-            .thenReturn("[citationkey] - [fulltitle]");
+        when(filePreferences.getFileNamePattern()).thenReturn("[citationkey] - [fulltitle]");
         cleanup.cleanup(entry);
 
-        LinkedFile newFileField = new LinkedFile(
-            "",
-            Path.of("Toot - test title.tmp"),
-            ""
-        );
+        LinkedFile newFileField = new LinkedFile("", Path.of("Toot - test title.tmp"), "");
         assertEquals(
             Optional.of(FileFieldWriter.getStringRepresentation(newFileField)),
             entry.getField(StandardField.FILE)
@@ -148,21 +126,13 @@ void cleanupRenamePdfRenamesFileInSameFolder() throws IOException {
         Path path = testFolder.resolve("Toot.pdf");
         Files.createFile(path);
         LinkedFile fileField = new LinkedFile("", Path.of("Toot.pdf"), "PDF");
-        entry.setField(
-            StandardField.FILE,
-            FileFieldWriter.getStringRepresentation(fileField)
-        );
+        entry.setField(StandardField.FILE, FileFieldWriter.getStringRepresentation(fileField));
         entry.setField(StandardField.TITLE, "test title");
 
-        when(filePreferences.getFileNamePattern())
-            .thenReturn("[citationkey] - [fulltitle]");
+        when(filePreferences.getFileNamePattern()).thenReturn("[citationkey] - [fulltitle]");
         cleanup.cleanup(entry);
 
-        LinkedFile newFileField = new LinkedFile(
-            "",
-            Path.of("Toot - test title.pdf"),
-            "PDF"
-        );
+        LinkedFile newFileField = new LinkedFile("", Path.of("Toot - test title.pdf"), "PDF");
         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 94c8b00d2b0..50646d86048 100644
--- a/src/test/java/org/jabref/logic/cleanup/TimeStampToCreationDateTest.java
+++ b/src/test/java/org/jabref/logic/cleanup/TimeStampToCreationDateTest.java
@@ -17,9 +17,7 @@
 
 class TimeStampToCreationDateTest {
 
-    private static final Field CUSTOM_TIME_STAMP_FIELD = new UnknownField(
-        "dateOfCreation"
-    );
+    private static final Field CUSTOM_TIME_STAMP_FIELD = new UnknownField("dateOfCreation");
 
     private final TimestampPreferences timestampPreferences = Mockito.mock(
         TimestampPreferences.class
@@ -40,27 +38,15 @@ public void makeMockReturnStandardField() {
     public static Stream<Arguments> standardFieldToCreationDate() {
         return Stream.of(
             Arguments.of(
-                new BibEntry()
-                    .withField(
-                        StandardField.CREATIONDATE,
-                        "2018-09-10T00:00:00"
-                    ),
+                new BibEntry().withField(StandardField.CREATIONDATE, "2018-09-10T00:00:00"),
                 new BibEntry().withField(StandardField.TIMESTAMP, "2018-09-10")
             ),
             Arguments.of(
-                new BibEntry()
-                    .withField(
-                        StandardField.CREATIONDATE,
-                        "2020-12-24T00:00:00"
-                    ),
+                new BibEntry().withField(StandardField.CREATIONDATE, "2020-12-24T00:00:00"),
                 new BibEntry().withField(StandardField.TIMESTAMP, "2020-12-24")
             ),
             Arguments.of(
-                new BibEntry()
-                    .withField(
-                        StandardField.CREATIONDATE,
-                        "2020-12-31T00:00:00"
-                    ),
+                new BibEntry().withField(StandardField.CREATIONDATE, "2020-12-31T00:00:00"),
                 new BibEntry().withField(StandardField.TIMESTAMP, "2020-12-31")
             )
         );
@@ -71,14 +57,9 @@ public static Stream<Arguments> standardFieldToCreationDate() {
      */
     @ParameterizedTest
     @MethodSource("standardFieldToCreationDate")
-    public void withStandardFieldToCreationDate(
-        BibEntry expected,
-        BibEntry input
-    ) {
+    public void withStandardFieldToCreationDate(BibEntry expected, BibEntry input) {
         makeMockReturnStandardField();
-        TimeStampToCreationDate migrator = new TimeStampToCreationDate(
-            timestampPreferences
-        );
+        TimeStampToCreationDate migrator = new TimeStampToCreationDate(timestampPreferences);
         migrator.cleanup(input);
         assertEquals(expected, input);
     }
@@ -86,27 +67,15 @@ public void withStandardFieldToCreationDate(
     public static Stream<Arguments> customFieldToCreationDate() {
         return Stream.of(
             Arguments.of(
-                new BibEntry()
-                    .withField(
-                        StandardField.CREATIONDATE,
-                        "2018-09-10T00:00:00"
-                    ),
+                new BibEntry().withField(StandardField.CREATIONDATE, "2018-09-10T00:00:00"),
                 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(StandardField.CREATIONDATE, "2020-12-24T00:00:00"),
                 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(StandardField.CREATIONDATE, "2020-12-31T00:00:00"),
                 new BibEntry().withField(CUSTOM_TIME_STAMP_FIELD, "2020-12-31")
             )
         );
@@ -117,137 +86,75 @@ public static Stream<Arguments> customFieldToCreationDate() {
      */
     @ParameterizedTest
     @MethodSource("customFieldToCreationDate")
-    public void withCustomFieldToCreationDate(
-        BibEntry expected,
-        BibEntry input
-    ) {
+    public void withCustomFieldToCreationDate(BibEntry expected, BibEntry input) {
         makeMockReturnCustomField();
-        TimeStampToCreationDate migrator = new TimeStampToCreationDate(
-            timestampPreferences
-        );
+        TimeStampToCreationDate migrator = new TimeStampToCreationDate(timestampPreferences);
         migrator.cleanup(input);
         assertEquals(expected, input);
     }
 
-    public static Stream<
-        Arguments
-    > entriesMigratedToCreationDateFromDifferentFormats() {
+    public static Stream<Arguments> entriesMigratedToCreationDateFromDifferentFormats() {
         return Stream.of(
             // M/y
             Arguments.of(
-                new BibEntry()
-                    .withField(
-                        StandardField.CREATIONDATE,
-                        "2018-01-01T00:00:00"
-                    ),
+                new BibEntry().withField(StandardField.CREATIONDATE, "2018-01-01T00:00:00"),
                 new BibEntry().withField(StandardField.TIMESTAMP, "1/18")
             ),
             Arguments.of(
-                new BibEntry()
-                    .withField(
-                        StandardField.CREATIONDATE,
-                        "2018-02-01T00:00:00"
-                    ),
+                new BibEntry().withField(StandardField.CREATIONDATE, "2018-02-01T00:00:00"),
                 new BibEntry().withField(StandardField.TIMESTAMP, "2/2018")
             ),
             Arguments.of(
-                new BibEntry()
-                    .withField(
-                        StandardField.CREATIONDATE,
-                        "2018-03-01T00:00:00"
-                    ),
+                new BibEntry().withField(StandardField.CREATIONDATE, "2018-03-01T00:00:00"),
                 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.CREATIONDATE, "2018-01-01T00:00:00"),
+                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.CREATIONDATE, "2018-01-02T00:00:00"),
+                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.CREATIONDATE, "2018-01-12T00:00:00"),
+                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.CREATIONDATE, "2018-01-02T00:00:00"),
                 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.CREATIONDATE, "2018-01-12T00:00:00"),
                 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.CREATIONDATE, "2018-01-02T00:00:00"),
                 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.CREATIONDATE, "2018-01-12T00:00:00"),
                 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.CREATIONDATE, "2018-01-02T00:00:00"),
                 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.CREATIONDATE, "2018-01-12T00:00:00"),
                 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.CREATIONDATE, "2018-01-01T00:00:00"),
                 new BibEntry().withField(StandardField.TIMESTAMP, "Jan, 2018")
             )
         );
@@ -260,9 +167,7 @@ > entriesMigratedToCreationDateFromDifferentFormats() {
     @MethodSource("entriesMigratedToCreationDateFromDifferentFormats")
     public void withDifferentFormats(BibEntry expected, BibEntry input) {
         makeMockReturnStandardField();
-        TimeStampToCreationDate migrator = new TimeStampToCreationDate(
-            timestampPreferences
-        );
+        TimeStampToCreationDate migrator = new TimeStampToCreationDate(timestampPreferences);
         ParserResult parserResult = new ParserResult(List.of(input));
         migrator.cleanup(input);
         assertEquals(expected, input);
diff --git a/src/test/java/org/jabref/logic/cleanup/TimeStampToModificationDateTest.java b/src/test/java/org/jabref/logic/cleanup/TimeStampToModificationDateTest.java
index 84a39220d3e..11ced86fc7d 100644
--- a/src/test/java/org/jabref/logic/cleanup/TimeStampToModificationDateTest.java
+++ b/src/test/java/org/jabref/logic/cleanup/TimeStampToModificationDateTest.java
@@ -15,13 +15,9 @@
 
 class TimeStampToModificationDateTest {
 
-    private static Field customTimeStampField = new UnknownField(
-        "dateOfCreation"
-    );
+    private static Field customTimeStampField = new UnknownField("dateOfCreation");
 
-    private TimestampPreferences timestampPreferences = Mockito.mock(
-        TimestampPreferences.class
-    );
+    private TimestampPreferences timestampPreferences = Mockito.mock(TimestampPreferences.class);
 
     public void makeMockReturnCustomField() {
         Mockito
@@ -38,27 +34,15 @@ public void makeMockReturnStandardField() {
     public static Stream<Arguments> standardFieldToModificationDate() {
         return Stream.of(
             Arguments.of(
-                new BibEntry()
-                    .withField(
-                        StandardField.MODIFICATIONDATE,
-                        "2018-09-10T00:00:00"
-                    ),
+                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.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.MODIFICATIONDATE, "2020-12-31T00:00:00"),
                 new BibEntry().withField(StandardField.TIMESTAMP, "2020-12-31")
             )
         );
@@ -69,10 +53,7 @@ public static Stream<Arguments> standardFieldToModificationDate() {
      */
     @ParameterizedTest
     @MethodSource("standardFieldToModificationDate")
-    public void withStandardFieldToModificationDate(
-        BibEntry expected,
-        BibEntry input
-    ) {
+    public void withStandardFieldToModificationDate(BibEntry expected, BibEntry input) {
         makeMockReturnStandardField();
         TimeStampToModificationDate migrator = new TimeStampToModificationDate(
             timestampPreferences
@@ -84,27 +65,15 @@ public void withStandardFieldToModificationDate(
     public static Stream<Arguments> customFieldToModificationDate() {
         return Stream.of(
             Arguments.of(
-                new BibEntry()
-                    .withField(
-                        StandardField.MODIFICATIONDATE,
-                        "2018-09-10T00:00:00"
-                    ),
+                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(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(StandardField.MODIFICATIONDATE, "2020-12-31T00:00:00"),
                 new BibEntry().withField(customTimeStampField, "2020-12-31")
             )
         );
@@ -115,10 +84,7 @@ public static Stream<Arguments> customFieldToModificationDate() {
      */
     @ParameterizedTest
     @MethodSource("customFieldToModificationDate")
-    public void withCustomFieldToModificationDate(
-        BibEntry expected,
-        BibEntry input
-    ) {
+    public void withCustomFieldToModificationDate(BibEntry expected, BibEntry input) {
         makeMockReturnCustomField();
         TimeStampToModificationDate migrator = new TimeStampToModificationDate(
             timestampPreferences
diff --git a/src/test/java/org/jabref/logic/cleanup/URLCleanupTest.java b/src/test/java/org/jabref/logic/cleanup/URLCleanupTest.java
index 664f2ecec1c..a280d72dcb8 100644
--- a/src/test/java/org/jabref/logic/cleanup/URLCleanupTest.java
+++ b/src/test/java/org/jabref/logic/cleanup/URLCleanupTest.java
@@ -25,10 +25,7 @@ private static Stream<Arguments> provideURL() {
             // 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.URL, "https://hdl.handle.net/10442/hedi/6089")
                     .withField(StandardField.NOTE, "this is a note"),
                 new BibEntry()
                     .withField(
@@ -39,10 +36,7 @@ private static Stream<Arguments> provideURL() {
             // 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.URL, "https://hdl.handle.net/10442/hedi/6089")
                     .withField(StandardField.NOTE, "this is a note"),
                 new BibEntry()
                     .withField(
@@ -53,14 +47,8 @@ private static Stream<Arguments> provideURL() {
             // 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}"
-                    ),
+                    .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,
@@ -71,19 +59,10 @@ private static Stream<Arguments> provideURL() {
             // 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"
-                    ),
+                    .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"
-                    )
+                    .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(
@@ -102,57 +81,29 @@ private static Stream<Arguments> provideURL() {
              */
             Arguments.of(
                 new BibEntry()
-                    .withField(
-                        StandardField.URL,
-                        "https://hdl.handle.net/10442/hedi/6089"
-                    ),
+                    .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.NOTE, "\\url{https://hdl.handle.net/10442/hedi/6089}")
             ),
             Arguments.of(
                 new BibEntry()
-                    .withField(
-                        StandardField.URL,
-                        "http://hdl.handle.net/10442/hedi/6089"
-                    ),
+                    .withField(StandardField.URL, "http://hdl.handle.net/10442/hedi/6089"),
                 new BibEntry()
-                    .withField(
-                        StandardField.NOTE,
-                        "\\url{http://hdl.handle.net/10442/hedi/6089}"
-                    )
+                    .withField(StandardField.NOTE, "\\url{http://hdl.handle.net/10442/hedi/6089}")
             ),
             Arguments.of(
                 new BibEntry()
-                    .withField(
-                        StandardField.URL,
-                        "http://userid:password@example.com:8080"
-                    ),
+                    .withField(StandardField.URL, "http://userid:password@example.com:8080"),
                 new BibEntry()
-                    .withField(
-                        StandardField.NOTE,
-                        "\\url{http://userid:password@example.com:8080}"
-                    )
+                    .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}"
-                    )
+                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}"
-                    )
+                new BibEntry().withField(StandardField.URL, "http://☺.damowmow.com"),
+                new BibEntry().withField(StandardField.NOTE, "\\url{http://☺.damowmow.com}")
             ),
             Arguments.of(
                 new BibEntry()
@@ -203,20 +154,15 @@ private static Stream<Arguments> provideURL() {
             ),
             // 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")
+                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"
-                    ),
+                    .withField(StandardField.NOTE, "visited on February 12, 2017"),
                 new BibEntry()
                     .withField(
                         StandardField.NOTE,
diff --git a/src/test/java/org/jabref/logic/crawler/CrawlerTest.java b/src/test/java/org/jabref/logic/crawler/CrawlerTest.java
index 2cdd204f88b..b8d0ed5f00f 100644
--- a/src/test/java/org/jabref/logic/crawler/CrawlerTest.java
+++ b/src/test/java/org/jabref/logic/crawler/CrawlerTest.java
@@ -42,14 +42,9 @@ class CrawlerTest {
     ImporterPreferences importerPreferences;
     SaveConfiguration saveConfiguration;
     BibEntryTypesManager entryTypesManager;
-    SlrGitHandler gitHandler = mock(
-        SlrGitHandler.class,
-        Answers.RETURNS_DEFAULTS
-    );
+    SlrGitHandler gitHandler = mock(SlrGitHandler.class, Answers.RETURNS_DEFAULTS);
     String hashCodeQuantum = String.valueOf("Quantum".hashCode());
-    String hashCodeCloudComputing = String.valueOf(
-        "Cloud Computing".hashCode()
-    );
+    String hashCodeCloudComputing = String.valueOf("Cloud Computing".hashCode());
 
     PreferencesService preferencesService = mock(
         PreferencesService.class,
@@ -77,19 +72,12 @@ public void setUp() throws Exception {
                 ','
             );
 
-        importFormatPreferences =
-            mock(ImportFormatPreferences.class, Answers.RETURNS_DEEP_STUBS);
+        importFormatPreferences = mock(ImportFormatPreferences.class, Answers.RETURNS_DEEP_STUBS);
         importerPreferences = mock(ImporterPreferences.class);
-        saveConfiguration =
-            mock(SaveConfiguration.class, Answers.RETURNS_DEEP_STUBS);
-        when(saveConfiguration.getSaveOrder())
-            .thenReturn(SaveOrder.getDefaultSaveOrder());
-        when(importerPreferences.getApiKeys())
-            .thenReturn(FXCollections.emptyObservableSet());
-        when(
-            importFormatPreferences.bibEntryPreferences().getKeywordSeparator()
-        )
-            .thenReturn(',');
+        saveConfiguration = mock(SaveConfiguration.class, Answers.RETURNS_DEEP_STUBS);
+        when(saveConfiguration.getSaveOrder()).thenReturn(SaveOrder.getDefaultSaveOrder());
+        when(importerPreferences.getApiKeys()).thenReturn(FXCollections.emptyObservableSet());
+        when(importFormatPreferences.bibEntryPreferences().getKeywordSeparator()).thenReturn(',');
 
         when(preferencesService.getCitationKeyPatternPreferences())
             .thenReturn(citationKeyPatternPreferences);
@@ -98,10 +86,7 @@ public void setUp() throws Exception {
     }
 
     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();
@@ -113,8 +98,7 @@ private void setUpTestStudyDefinitionFile() throws Exception {
             StudyRepository.STUDY_DEFINITION_FILE_NAME
         );
         URL studyDefinition =
-            this.getClass()
-                .getResource(StudyRepository.STUDY_DEFINITION_FILE_NAME);
+            this.getClass().getResource(StudyRepository.STUDY_DEFINITION_FILE_NAME);
         FileUtil.copyFile(Path.of(studyDefinition.toURI()), destination, false);
     }
 
@@ -132,10 +116,7 @@ public void testWhetherAllFilesAreCreated() throws Exception {
 
         assertTrue(
             Files.exists(
-                Path.of(
-                    tempRepositoryDirectory.toString(),
-                    hashCodeQuantum + " - Quantum"
-                )
+                Path.of(tempRepositoryDirectory.toString(), hashCodeQuantum + " - Quantum")
             )
         );
         assertTrue(
@@ -173,11 +154,7 @@ public void testWhetherAllFilesAreCreated() throws Exception {
                 )
             );
         });
-        assertTrue(
-            Files.exists(
-                Path.of(tempRepositoryDirectory.toString(), "studyResult.bib")
-            )
-        );
+        assertTrue(Files.exists(Path.of(tempRepositoryDirectory.toString(), "studyResult.bib")));
     }
 
     private Path getPathToStudyDefinitionFile() {
diff --git a/src/test/java/org/jabref/logic/crawler/StudyCatalogToFetcherConverterTest.java b/src/test/java/org/jabref/logic/crawler/StudyCatalogToFetcherConverterTest.java
index e62eeb1e757..cca58516c17 100644
--- a/src/test/java/org/jabref/logic/crawler/StudyCatalogToFetcherConverterTest.java
+++ b/src/test/java/org/jabref/logic/crawler/StudyCatalogToFetcherConverterTest.java
@@ -36,14 +36,10 @@ class StudyCatalogToFetcherConverterTest {
 
     @BeforeEach
     void setUpMocks() {
-        preferencesService =
-            mock(PreferencesService.class, Answers.RETURNS_DEEP_STUBS);
-        saveConfiguration =
-            mock(SaveConfiguration.class, Answers.RETURNS_DEEP_STUBS);
-        when(saveConfiguration.getSaveOrder())
-            .thenReturn(SaveOrder.getDefaultSaveOrder());
-        when(preferencesService.getBibEntryPreferences().getKeywordSeparator())
-            .thenReturn(',');
+        preferencesService = mock(PreferencesService.class, Answers.RETURNS_DEEP_STUBS);
+        saveConfiguration = mock(SaveConfiguration.class, Answers.RETURNS_DEEP_STUBS);
+        when(saveConfiguration.getSaveOrder()).thenReturn(SaveOrder.getDefaultSaveOrder());
+        when(preferencesService.getBibEntryPreferences().getKeywordSeparator()).thenReturn(',');
         when(preferencesService.getImporterPreferences().getApiKeys())
             .thenReturn(FXCollections.emptyObservableSet());
 
@@ -65,28 +61,22 @@ public void getActiveFetcherInstances() throws Exception {
             new DummyFileUpdateMonitor(),
             entryTypesManager
         );
-        StudyCatalogToFetcherConverter converter =
-            new StudyCatalogToFetcherConverter(
-                studyRepository.getActiveLibraryEntries(),
-                mock(ImportFormatPreferences.class, Answers.RETURNS_DEEP_STUBS),
-                mock(ImporterPreferences.class, Answers.RETURNS_DEEP_STUBS)
-            );
+        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();
 
         Assertions.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 {
+    private void copyTestStudyDefinitionFileIntoDirectory(Path destination) throws Exception {
         URL studyDefinition =
-            this.getClass()
-                .getResource(StudyRepository.STUDY_DEFINITION_FILE_NAME);
+            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 cc0a51f878f..bcc5de1e3a3 100644
--- a/src/test/java/org/jabref/logic/crawler/StudyRepositoryTest.java
+++ b/src/test/java/org/jabref/logic/crawler/StudyRepositoryTest.java
@@ -42,8 +42,7 @@
 
 class StudyRepositoryTest {
 
-    private static final String NON_EXISTING_DIRECTORY =
-        "nonExistingTestRepositoryDirectory";
+    private static final String NON_EXISTING_DIRECTORY = "nonExistingTestRepositoryDirectory";
     CitationKeyPatternPreferences citationKeyPatternPreferences;
     PreferencesService preferencesService;
     LibraryPreferences libraryPreferences;
@@ -55,31 +54,20 @@ class StudyRepositoryTest {
     Path tempRepositoryDirectory;
 
     StudyRepository studyRepository;
-    SlrGitHandler gitHandler = mock(
-        SlrGitHandler.class,
-        Answers.RETURNS_DEFAULTS
-    );
+    SlrGitHandler gitHandler = mock(SlrGitHandler.class, Answers.RETURNS_DEFAULTS);
     String hashCodeQuantum = String.valueOf("Quantum".hashCode());
-    String hashCodeCloudComputing = String.valueOf(
-        "Cloud Computing".hashCode()
-    );
-    String hashCodeSoftwareEngineering = String.valueOf(
-        "\"Software Engineering\"".hashCode()
-    );
+    String hashCodeCloudComputing = String.valueOf("Cloud Computing".hashCode());
+    String hashCodeSoftwareEngineering = String.valueOf("\"Software Engineering\"".hashCode());
 
     /**
      * Set up mocks
      */
     @BeforeEach
     public void setUpMocks() throws Exception {
-        libraryPreferences =
-            mock(LibraryPreferences.class, Answers.RETURNS_DEEP_STUBS);
-        saveConfiguration =
-            mock(SaveConfiguration.class, Answers.RETURNS_DEEP_STUBS);
-        importFormatPreferences =
-            mock(ImportFormatPreferences.class, Answers.RETURNS_DEEP_STUBS);
-        preferencesService =
-            mock(PreferencesService.class, Answers.RETURNS_DEEP_STUBS);
+        libraryPreferences = mock(LibraryPreferences.class, Answers.RETURNS_DEEP_STUBS);
+        saveConfiguration = mock(SaveConfiguration.class, Answers.RETURNS_DEEP_STUBS);
+        importFormatPreferences = mock(ImportFormatPreferences.class, Answers.RETURNS_DEEP_STUBS);
+        preferencesService = mock(PreferencesService.class, Answers.RETURNS_DEEP_STUBS);
         citationKeyPatternPreferences =
             new CitationKeyPatternPreferences(
                 false,
@@ -97,12 +85,8 @@ public void setUpMocks() throws Exception {
             .thenReturn(citationKeyPatternPreferences);
         when(preferencesService.getImporterPreferences().getApiKeys())
             .thenReturn(FXCollections.emptyObservableSet());
-        when(
-            importFormatPreferences.bibEntryPreferences().getKeywordSeparator()
-        )
-            .thenReturn(',');
-        when(preferencesService.getImportFormatPreferences())
-            .thenReturn(importFormatPreferences);
+        when(importFormatPreferences.bibEntryPreferences().getKeywordSeparator()).thenReturn(',');
+        when(preferencesService.getImportFormatPreferences()).thenReturn(importFormatPreferences);
         when(preferencesService.getTimestampPreferences().getTimestampField())
             .then(invocation -> StandardField.TIMESTAMP);
         entryTypesManager = new BibEntryTypesManager();
@@ -136,10 +120,7 @@ void repositoryStructureCorrectlyCreated() {
         // When repository is instantiated the directory structure is created
         assertTrue(
             Files.exists(
-                Path.of(
-                    tempRepositoryDirectory.toString(),
-                    hashCodeQuantum + " - Quantum"
-                )
+                Path.of(tempRepositoryDirectory.toString(), hashCodeQuantum + " - Quantum")
             )
         );
         assertTrue(
@@ -261,15 +242,11 @@ void fetcherResultsPersistedCorrectly() throws Exception {
 
         assertEquals(
             getArXivQuantumMockResults(),
-            getTestStudyRepository()
-                .getFetcherResultEntries("Quantum", "ArXiv")
-                .getEntries()
+            getTestStudyRepository().getFetcherResultEntries("Quantum", "ArXiv").getEntries()
         );
         assertEquals(
             getSpringerQuantumMockResults(),
-            getTestStudyRepository()
-                .getFetcherResultEntries("Quantum", "Springer")
-                .getEntries()
+            getTestStudyRepository().getFetcherResultEntries("Quantum", "Springer").getEntries()
         );
         assertEquals(
             getSpringerCloudComputingMockResults(),
@@ -292,15 +269,11 @@ void mergedResultsPersistedCorrectly() throws Exception {
         // All Springer results are duplicates for "Quantum"
         assertEquals(
             expected,
-            getTestStudyRepository()
-                .getQueryResultEntries("Quantum")
-                .getEntries()
+            getTestStudyRepository().getQueryResultEntries("Quantum").getEntries()
         );
         assertEquals(
             getSpringerCloudComputingMockResults(),
-            getTestStudyRepository()
-                .getQueryResultEntries("Cloud Computing")
-                .getEntries()
+            getTestStudyRepository().getQueryResultEntries("Cloud Computing").getEntries()
         );
     }
 
@@ -310,9 +283,7 @@ void studyResultsPersistedCorrectly() throws Exception {
         studyRepository.persist(mockResults);
         assertEquals(
             new HashSet<>(getNonDuplicateBibEntryResult().getEntries()),
-            new HashSet<>(
-                getTestStudyRepository().getStudyResultEntries().getEntries()
-            )
+            new HashSet<>(getTestStudyRepository().getStudyResultEntries().getEntries())
         );
     }
 
@@ -337,8 +308,7 @@ private void setUpTestStudyDefinitionFile() throws Exception {
             StudyRepository.STUDY_DEFINITION_FILE_NAME
         );
         URL studyDefinition =
-            this.getClass()
-                .getResource(StudyRepository.STUDY_DEFINITION_FILE_NAME);
+            this.getClass().getResource(StudyRepository.STUDY_DEFINITION_FILE_NAME);
         FileUtil.copyFile(Path.of(studyDefinition.toURI()), destination, false);
     }
 
@@ -351,41 +321,21 @@ private void setUpTestResultFile() throws Exception {
             tempRepositoryDirectory.toString(),
             hashCodeQuantum + " - Quantum"
         );
-        Path resultFileLocation = Path.of(
-            queryDirectory.toString(),
-            "ArXiv" + ".bib"
-        );
+        Path resultFileLocation = Path.of(queryDirectory.toString(), "ArXiv" + ".bib");
         URL resultFile = this.getClass().getResource("ArXivQuantumMock.bib");
-        FileUtil.copyFile(
-            Path.of(resultFile.toURI()),
-            resultFileLocation,
-            true
-        );
-        resultFileLocation =
-            Path.of(queryDirectory.toString(), "Springer" + ".bib");
+        FileUtil.copyFile(Path.of(resultFile.toURI()), resultFileLocation, true);
+        resultFileLocation = Path.of(queryDirectory.toString(), "Springer" + ".bib");
         resultFile = this.getClass().getResource("SpringerQuantumMock.bib");
-        FileUtil.copyFile(
-            Path.of(resultFile.toURI()),
-            resultFileLocation,
-            true
-        );
+        FileUtil.copyFile(Path.of(resultFile.toURI()), resultFileLocation, true);
     }
 
     private BibDatabase getNonDuplicateBibEntryResult() {
-        BibDatabase mockResults = new BibDatabase(
-            getSpringerCloudComputingMockResults()
-        );
+        BibDatabase mockResults = new BibDatabase(getSpringerCloudComputingMockResults());
         DatabaseMerger merger = new DatabaseMerger(
             importFormatPreferences.bibEntryPreferences().getKeywordSeparator()
         );
-        merger.merge(
-            mockResults,
-            new BibDatabase(getSpringerQuantumMockResults())
-        );
-        merger.merge(
-            mockResults,
-            new BibDatabase(getArXivQuantumMockResults())
-        );
+        merger.merge(mockResults, new BibDatabase(getSpringerQuantumMockResults()));
+        merger.merge(mockResults, new BibDatabase(getArXivQuantumMockResults()));
         return mockResults;
     }
 
@@ -395,25 +345,18 @@ private List<QueryResult> getMockResults() {
             List.of(
                 new FetchResult(
                     "ArXiv",
-                    new BibDatabase(
-                        stripCitationKeys(getArXivQuantumMockResults())
-                    )
+                    new BibDatabase(stripCitationKeys(getArXivQuantumMockResults()))
                 ),
                 new FetchResult(
                     "Springer",
-                    new BibDatabase(
-                        stripCitationKeys(getSpringerQuantumMockResults())
-                    )
+                    new BibDatabase(stripCitationKeys(getSpringerQuantumMockResults()))
                 )
             )
         );
         QueryResult resultCloudComputing = new QueryResult(
             "Cloud Computing",
             List.of(
-                new FetchResult(
-                    "Springer",
-                    new BibDatabase(getSpringerCloudComputingMockResults())
-                )
+                new FetchResult("Springer", new BibDatabase(getSpringerCloudComputingMockResults()))
             )
         );
         return List.of(resultQuantum, resultCloudComputing);
@@ -502,10 +445,7 @@ private List<BibEntry> getSpringerCloudComputingMockResults() {
         entry1.setType(StandardEntryType.Article);
         BibEntry entry2 = new BibEntry()
             .withCitationKey("Rangras")
-            .withField(
-                StandardField.AUTHOR,
-                "Rangras, Jimit and Bhavsar, Sejal"
-            )
+            .withField(StandardField.AUTHOR, "Rangras, Jimit and Bhavsar, Sejal")
             .withField(
                 StandardField.TITLE,
                 "Design of Framework for Disaster Recovery in Cloud Computing"
diff --git a/src/test/java/org/jabref/logic/crawler/StudyYamlParserTest.java b/src/test/java/org/jabref/logic/crawler/StudyYamlParserTest.java
index 7fd98b71487..f1c91031dd1 100644
--- a/src/test/java/org/jabref/logic/crawler/StudyYamlParserTest.java
+++ b/src/test/java/org/jabref/logic/crawler/StudyYamlParserTest.java
@@ -22,13 +22,9 @@ class StudyYamlParserTest {
 
     @BeforeEach
     void setupStudy() throws Exception {
-        Path destination = testDirectory.resolve(
-            StudyRepository.STUDY_DEFINITION_FILE_NAME
-        );
+        Path destination = testDirectory.resolve(StudyRepository.STUDY_DEFINITION_FILE_NAME);
         URL studyDefinition =
-            StudyYamlParser.class.getResource(
-                    StudyRepository.STUDY_DEFINITION_FILE_NAME
-                );
+            StudyYamlParser.class.getResource(StudyRepository.STUDY_DEFINITION_FILE_NAME);
         FileUtil.copyFile(Path.of(studyDefinition.toURI()), destination, true);
 
         List<String> authors = List.of("Jab Ref");
@@ -47,23 +43,13 @@ void setupStudy() throws Exception {
         );
 
         expectedStudy =
-            new Study(
-                authors,
-                studyName,
-                researchQuestions,
-                queryEntries,
-                libraryEntries
-            );
+            new Study(authors, studyName, researchQuestions, queryEntries, libraryEntries);
     }
 
     @Test
     public void parseStudyFileSuccessfully() throws Exception {
         Study study = new StudyYamlParser()
-            .parseStudyYamlFile(
-                testDirectory.resolve(
-                    StudyRepository.STUDY_DEFINITION_FILE_NAME
-                )
-            );
+            .parseStudyYamlFile(testDirectory.resolve(StudyRepository.STUDY_DEFINITION_FILE_NAME));
         assertEquals(expectedStudy, study);
     }
 
@@ -72,16 +58,10 @@ public void writeStudyFileSuccessfully() throws Exception {
         new StudyYamlParser()
             .writeStudyYamlFile(
                 expectedStudy,
-                testDirectory.resolve(
-                    StudyRepository.STUDY_DEFINITION_FILE_NAME
-                )
+                testDirectory.resolve(StudyRepository.STUDY_DEFINITION_FILE_NAME)
             );
         Study study = new StudyYamlParser()
-            .parseStudyYamlFile(
-                testDirectory.resolve(
-                    StudyRepository.STUDY_DEFINITION_FILE_NAME
-                )
-            );
+            .parseStudyYamlFile(testDirectory.resolve(StudyRepository.STUDY_DEFINITION_FILE_NAME));
         assertEquals(expectedStudy, study);
     }
 
@@ -91,10 +71,8 @@ public void readsJabRef57StudySuccessfully() throws Exception {
         // 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"])
         // 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()));
+        URL studyDefinition = StudyYamlParser.class.getResource("study-jabref-5.7.yml");
+        Study study = new StudyYamlParser().parseStudyYamlFile(Path.of(studyDefinition.toURI()));
         assertEquals(expectedStudy, study);
     }
 }
diff --git a/src/test/java/org/jabref/logic/database/DatabaseMergerTest.java b/src/test/java/org/jabref/logic/database/DatabaseMergerTest.java
index c99217f6c82..fb6fa052f03 100644
--- a/src/test/java/org/jabref/logic/database/DatabaseMergerTest.java
+++ b/src/test/java/org/jabref/logic/database/DatabaseMergerTest.java
@@ -29,12 +29,8 @@ class DatabaseMergerTest {
 
     @BeforeEach
     void setUp() {
-        importFormatPreferences =
-            mock(ImportFormatPreferences.class, Answers.RETURNS_DEEP_STUBS);
-        when(
-            importFormatPreferences.bibEntryPreferences().getKeywordSeparator()
-        )
-            .thenReturn(',');
+        importFormatPreferences = mock(ImportFormatPreferences.class, Answers.RETURNS_DEEP_STUBS);
+        when(importFormatPreferences.bibEntryPreferences().getKeywordSeparator()).thenReturn(',');
     }
 
     @Test
@@ -61,9 +57,7 @@ void mergeAddsNonDuplicateEntries() {
 
         BibDatabase database = new BibDatabase(List.of(entry1));
         BibDatabase other = new BibDatabase(List.of(entry2, entry3));
-        new DatabaseMerger(
-            importFormatPreferences.bibEntryPreferences().getKeywordSeparator()
-        )
+        new DatabaseMerger(importFormatPreferences.bibEntryPreferences().getKeywordSeparator())
             .merge(database, other);
 
         assertEquals(List.of(entry1, entry3), database.getEntries());
@@ -78,10 +72,7 @@ void mergeAddsWithDuplicateEntries() {
             .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.TITLE, "Effective Java:Programming Language Guide")
             .withField(StandardField.ISBN, "0-201-31005-8")
             .withField(StandardField.YEAR, "2001")
             .withField(StandardField.EDITION, "1");
@@ -93,17 +84,12 @@ void mergeAddsWithDuplicateEntries() {
             .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.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()
-        )
+        new DatabaseMerger(importFormatPreferences.bibEntryPreferences().getKeywordSeparator())
             .merge(database, other);
         assertEquals(List.of(entry1, entry4), database.getEntries());
     }
@@ -117,14 +103,8 @@ void mergeBibTexStringsWithSameNameAreImportedWithModifiedName() {
         BibtexString sourceString2 = new BibtexString("name", "content3");
 
         // The expected source BibTeXStrings after import (different name, different content)
-        BibtexString importedBibTeXString1 = new BibtexString(
-            "name_1",
-            "content2"
-        );
-        BibtexString importedBibTeXString2 = new BibtexString(
-            "name_2",
-            "content3"
-        );
+        BibtexString importedBibTeXString1 = new BibtexString("name_1", "content2");
+        BibtexString importedBibTeXString2 = new BibtexString("name_2", "content3");
 
         BibDatabase target = new BibDatabase();
         BibDatabase source1 = new BibDatabase();
@@ -133,13 +113,9 @@ void mergeBibTexStringsWithSameNameAreImportedWithModifiedName() {
         source1.addString(sourceString1);
         source2.addString(sourceString2);
 
-        new DatabaseMerger(
-            importFormatPreferences.bibEntryPreferences().getKeywordSeparator()
-        )
+        new DatabaseMerger(importFormatPreferences.bibEntryPreferences().getKeywordSeparator())
             .mergeStrings(target, source1);
-        new DatabaseMerger(
-            importFormatPreferences.bibEntryPreferences().getKeywordSeparator()
-        )
+        new DatabaseMerger(importFormatPreferences.bibEntryPreferences().getKeywordSeparator())
             .mergeStrings(target, source2);
         // Use string representation to compare since the id will not match
         List<String> resultStringsSorted = target
@@ -175,9 +151,7 @@ void mergeBibTexStringsWithSameNameAndContentAreIgnored() {
         source.addString(sourceString1);
         source.addString(sourceString2);
 
-        new DatabaseMerger(
-            importFormatPreferences.bibEntryPreferences().getKeywordSeparator()
-        )
+        new DatabaseMerger(importFormatPreferences.bibEntryPreferences().getKeywordSeparator())
             .mergeStrings(target, source);
         List<BibtexString> resultStringsSorted = target
             .getStringValues()
@@ -185,10 +159,7 @@ void mergeBibTexStringsWithSameNameAndContentAreIgnored() {
             .sorted(new BibtexStringComparator(false)::compare)
             .collect(Collectors.toList());
 
-        assertEquals(
-            List.of(targetString1, targetString2),
-            resultStringsSorted
-        );
+        assertEquals(List.of(targetString1, targetString2), resultStringsSorted);
     }
 
     @Test
@@ -198,11 +169,7 @@ void mergeMetaDataWithoutAllEntriesGroup() {
             new ContentSelector(StandardField.AUTHOR, List.of("Test Author"))
         );
         GroupTreeNode targetRootGroup = new GroupTreeNode(
-            new ExplicitGroup(
-                "targetGroup",
-                GroupHierarchyType.INDEPENDENT,
-                ','
-            )
+            new ExplicitGroup("targetGroup", GroupHierarchyType.INDEPENDENT, ',')
         );
         target.setGroups(targetRootGroup);
         MetaData other = new MetaData();
@@ -210,17 +177,13 @@ void mergeMetaDataWithoutAllEntriesGroup() {
             new ExplicitGroup("otherGroup", GroupHierarchyType.INCLUDING, ',')
         );
         other.setGroups(otherRootGroup);
-        other.addContentSelector(
-            new ContentSelector(StandardField.TITLE, List.of("Test Title"))
-        );
+        other.addContentSelector(new ContentSelector(StandardField.TITLE, List.of("Test Title")));
         List<ContentSelector> expectedContentSelectors = List.of(
             new ContentSelector(StandardField.AUTHOR, List.of("Test Author")),
             new ContentSelector(StandardField.TITLE, List.of("Test Title"))
         );
 
-        new DatabaseMerger(
-            importFormatPreferences.bibEntryPreferences().getKeywordSeparator()
-        )
+        new DatabaseMerger(importFormatPreferences.bibEntryPreferences().getKeywordSeparator())
             .mergeMetaData(target, other, "unknown", List.of());
 
         // Assert that content selectors are all merged
@@ -229,10 +192,7 @@ void mergeMetaDataWithoutAllEntriesGroup() {
         // Assert that groups of other are children of root node of target
         assertEquals(targetRootGroup, target.getGroups().get());
         assertEquals(target.getGroups().get().getChildren().size(), 1);
-        assertEquals(
-            otherRootGroup,
-            target.getGroups().get().getChildren().get(0)
-        );
+        assertEquals(otherRootGroup, target.getGroups().get().getChildren().get(0));
     }
 
     @Test
@@ -241,42 +201,27 @@ void mergeMetaDataWithAllEntriesGroup() {
         target.addContentSelector(
             new ContentSelector(StandardField.AUTHOR, List.of("Test Author"))
         );
-        GroupTreeNode targetRootGroup = new GroupTreeNode(
-            new AllEntriesGroup("targetGroup")
-        );
+        GroupTreeNode targetRootGroup = new GroupTreeNode(new AllEntriesGroup("targetGroup"));
         target.setGroups(targetRootGroup);
         MetaData other = new MetaData();
-        GroupTreeNode otherRootGroup = new GroupTreeNode(
-            new AllEntriesGroup("otherGroup")
-        );
+        GroupTreeNode otherRootGroup = new GroupTreeNode(new AllEntriesGroup("otherGroup"));
         other.setGroups(otherRootGroup);
-        other.addContentSelector(
-            new ContentSelector(StandardField.TITLE, List.of("Test Title"))
-        );
+        other.addContentSelector(new ContentSelector(StandardField.TITLE, List.of("Test Title")));
         List<ContentSelector> expectedContentSelectors = 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,
-                ';'
-            )
+            new ExplicitGroup("Imported unknown", GroupHierarchyType.INDEPENDENT, ';')
         );
 
-        new DatabaseMerger(
-            importFormatPreferences.bibEntryPreferences().getKeywordSeparator()
-        )
+        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(target.getGroups().get().getChildren().size(), 1);
-        assertEquals(
-            expectedImportedGroupNode,
-            target.getGroups().get().getChildren().get(0)
-        );
+        assertEquals(expectedImportedGroupNode, target.getGroups().get().getChildren().get(0));
         assertEquals(expectedContentSelectors, target.getContentSelectorList());
     }
 }
diff --git a/src/test/java/org/jabref/logic/database/DuplicateCheckTest.java b/src/test/java/org/jabref/logic/database/DuplicateCheckTest.java
index 20cb6d2bc33..d851f58c78f 100644
--- a/src/test/java/org/jabref/logic/database/DuplicateCheckTest.java
+++ b/src/test/java/org/jabref/logic/database/DuplicateCheckTest.java
@@ -35,15 +35,9 @@ private static BibEntry getSimpleArticle() {
 
     private static BibEntry getSimpleIncollection() {
         return new BibEntry(StandardEntryType.InCollection)
-            .withField(
-                StandardField.TITLE,
-                "Innovation and Intellectual Property Rights"
-            )
+            .withField(StandardField.TITLE, "Innovation and Intellectual Property Rights")
             .withField(StandardField.AUTHOR, "Ove Grandstrand")
-            .withField(
-                StandardField.BOOKTITLE,
-                "The Oxford Handbook of Innovation"
-            )
+            .withField(StandardField.BOOKTITLE, "The Oxford Handbook of Innovation")
             .withField(StandardField.PUBLISHER, "Oxford University Press")
             .withField(StandardField.YEAR, "2004");
     }
@@ -52,10 +46,7 @@ private static BibEntry getSimpleInbook() {
         return new BibEntry(StandardEntryType.InBook)
             .withField(StandardField.TITLE, "Alice in Wonderland")
             .withField(StandardField.AUTHOR, "Charles Lutwidge Dodgson")
-            .withField(
-                StandardField.CHAPTER,
-                "Chapter One – Down the Rabbit Hole"
-            )
+            .withField(StandardField.CHAPTER, "Chapter One – Down the Rabbit Hole")
             .withField(StandardField.LANGUAGE, "English")
             .withField(StandardField.PUBLISHER, "Macmillan")
             .withField(StandardField.YEAR, "1865");
@@ -84,9 +75,7 @@ public void testDuplicateDetectionWithSameAuthor() {
         BibEntry two = new BibEntry(StandardEntryType.Article)
             .withField(StandardField.AUTHOR, "Billy Bob");
 
-        assertTrue(
-            duplicateChecker.isDuplicate(one, two, BibDatabaseMode.BIBTEX)
-        );
+        assertTrue(duplicateChecker.isDuplicate(one, two, BibDatabaseMode.BIBTEX));
     }
 
     @Test
@@ -96,9 +85,7 @@ public void testDuplicateDetectionWithDifferentAuthors() {
         BibEntry two = new BibEntry(StandardEntryType.Article)
             .withField(StandardField.AUTHOR, "James Joyce");
 
-        assertFalse(
-            duplicateChecker.isDuplicate(one, two, BibDatabaseMode.BIBTEX)
-        );
+        assertFalse(duplicateChecker.isDuplicate(one, two, BibDatabaseMode.BIBTEX));
     }
 
     @Test
@@ -108,9 +95,7 @@ public void testDuplicateDetectionWithDifferentTypes() {
         BibEntry two = new BibEntry(StandardEntryType.Book)
             .withField(StandardField.AUTHOR, "Billy Bob");
 
-        assertFalse(
-            duplicateChecker.isDuplicate(one, two, BibDatabaseMode.BIBTEX)
-        );
+        assertFalse(duplicateChecker.isDuplicate(one, two, BibDatabaseMode.BIBTEX));
     }
 
     @Test
@@ -127,14 +112,8 @@ public void testDuplicateDetectionWithSameYearTitleJournal() {
             .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
-        );
+        assertTrue(duplicateChecker.isDuplicate(one, two, BibDatabaseMode.BIBTEX));
+        assertEquals(1.01, DuplicateCheck.compareEntriesStrictly(one, two), 0.01);
     }
 
     @Test
@@ -151,14 +130,8 @@ public void testDuplicateDetectionWithDifferentJournal() {
             .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
-        );
+        assertTrue(duplicateChecker.isDuplicate(one, two, BibDatabaseMode.BIBTEX));
+        assertEquals(0.75, DuplicateCheck.compareEntriesStrictly(one, two), 0.01);
     }
 
     @Test
@@ -179,9 +152,7 @@ public void testDuplicateDetectionWithDifferentVolume() {
             .withField(StandardField.NUMBER, "1")
             .withField(StandardField.VOLUME, "22");
 
-        assertTrue(
-            duplicateChecker.isDuplicate(one, two, BibDatabaseMode.BIBTEX)
-        );
+        assertTrue(duplicateChecker.isDuplicate(one, two, BibDatabaseMode.BIBTEX));
     }
 
     @Test
@@ -202,9 +173,7 @@ public void testDuplicateDetectionWithDifferentTitleSameVolume() {
             .withField(StandardField.NUMBER, "1")
             .withField(StandardField.VOLUME, "21");
 
-        assertFalse(
-            duplicateChecker.isDuplicate(one, two, BibDatabaseMode.BIBTEX)
-        );
+        assertFalse(duplicateChecker.isDuplicate(one, two, BibDatabaseMode.BIBTEX));
     }
 
     @Test
@@ -227,9 +196,7 @@ public void testDuplicateDetectionWithSamePages() {
             .withField(StandardField.NUMBER, "1")
             .withField(StandardField.PAGES, "334--337");
 
-        assertTrue(
-            duplicateChecker.isDuplicate(one, two, BibDatabaseMode.BIBTEX)
-        );
+        assertTrue(duplicateChecker.isDuplicate(one, two, BibDatabaseMode.BIBTEX));
     }
 
     @Test
@@ -251,9 +218,7 @@ public void testDuplicateDetectionWithSamePagesOneEntryNoVolume() {
             .withField(StandardField.NUMBER, "1")
             .withField(StandardField.PAGES, "334--337");
 
-        assertTrue(
-            duplicateChecker.isDuplicate(one, two, BibDatabaseMode.BIBTEX)
-        );
+        assertTrue(duplicateChecker.isDuplicate(one, two, BibDatabaseMode.BIBTEX));
     }
 
     @Test
@@ -274,9 +239,7 @@ public void testDuplicateDetectionDifferentVolumeNoJournal() {
             .withField(StandardField.NUMBER, "1")
             .withField(StandardField.PAGES, "334--337");
 
-        assertTrue(
-            duplicateChecker.isDuplicate(one, two, BibDatabaseMode.BIBTEX)
-        );
+        assertTrue(duplicateChecker.isDuplicate(one, two, BibDatabaseMode.BIBTEX));
     }
 
     @Test
@@ -297,9 +260,7 @@ public void testDuplicateDetectionDifferentTitleNoJournal() {
             .withField(StandardField.NUMBER, "1")
             .withField(StandardField.PAGES, "334--337");
 
-        assertFalse(
-            duplicateChecker.isDuplicate(one, two, BibDatabaseMode.BIBTEX)
-        );
+        assertFalse(duplicateChecker.isDuplicate(one, two, BibDatabaseMode.BIBTEX));
     }
 
     @Test
@@ -322,9 +283,7 @@ public void testDuplicateDetectionDifferentVolumeAllOthersEqual() {
             .withField(StandardField.NUMBER, "1")
             .withField(StandardField.PAGES, "334--337");
 
-        assertTrue(
-            duplicateChecker.isDuplicate(one, two, BibDatabaseMode.BIBTEX)
-        );
+        assertTrue(duplicateChecker.isDuplicate(one, two, BibDatabaseMode.BIBTEX));
     }
 
     @Test
@@ -347,19 +306,14 @@ public void testDuplicateDetectionDifferentVolumeDifferentJournalAllOthersEqual(
             .withField(StandardField.NUMBER, "1")
             .withField(StandardField.PAGES, "334--337");
 
-        assertTrue(
-            duplicateChecker.isDuplicate(one, two, BibDatabaseMode.BIBTEX)
-        );
+        assertTrue(duplicateChecker.isDuplicate(one, two, BibDatabaseMode.BIBTEX));
     }
 
     @Test
     public void testWordCorrelation() {
-        String d1 =
-            "Characterization of Calanus finmarchicus habitat in the North Sea";
-        String d2 =
-            "Characterization of Calunus finmarchicus habitat in the North Sea";
-        String d3 =
-            "Characterization of Calanus glacialissss habitat in the South Sea";
+        String d1 = "Characterization of Calanus finmarchicus habitat in the North Sea";
+        String d2 = "Characterization of Calunus finmarchicus habitat in the North Sea";
+        String d3 = "Characterization of Calanus glacialissss habitat in the South Sea";
 
         assertEquals(1.0, (DuplicateCheck.correlateByWords(d1, d2)), 0.01);
         assertEquals(0.78, (DuplicateCheck.correlateByWords(d1, d3)), 0.01);
@@ -369,45 +323,27 @@ public void testWordCorrelation() {
     @Test
     public void twoUnrelatedEntriesAreNoDuplicates() {
         assertFalse(
-            duplicateChecker.isDuplicate(
-                simpleArticle,
-                unrelatedArticle,
-                BibDatabaseMode.BIBTEX
-            )
+            duplicateChecker.isDuplicate(simpleArticle, unrelatedArticle, BibDatabaseMode.BIBTEX)
         );
     }
 
     @Test
     public void twoUnrelatedEntriesWithDifferentDoisAreNoDuplicates() {
         simpleArticle.setField(StandardField.DOI, "10.1016/j.is.2004.02.002");
-        unrelatedArticle.setField(
-            StandardField.DOI,
-            "10.1016/j.is.2004.02.00X"
-        );
+        unrelatedArticle.setField(StandardField.DOI, "10.1016/j.is.2004.02.00X");
 
         assertFalse(
-            duplicateChecker.isDuplicate(
-                simpleArticle,
-                unrelatedArticle,
-                BibDatabaseMode.BIBTEX
-            )
+            duplicateChecker.isDuplicate(simpleArticle, unrelatedArticle, BibDatabaseMode.BIBTEX)
         );
     }
 
     @Test
     public void twoUnrelatedEntriesWithEqualDoisAreDuplicates() {
         simpleArticle.setField(StandardField.DOI, "10.1016/j.is.2004.02.002");
-        unrelatedArticle.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
-            )
+            duplicateChecker.isDuplicate(simpleArticle, unrelatedArticle, BibDatabaseMode.BIBTEX)
         );
     }
 
@@ -417,11 +353,7 @@ public void twoUnrelatedEntriesWithEqualPmidAreDuplicates() {
         unrelatedArticle.setField(StandardField.PMID, "12345678");
 
         assertTrue(
-            duplicateChecker.isDuplicate(
-                simpleArticle,
-                unrelatedArticle,
-                BibDatabaseMode.BIBTEX
-            )
+            duplicateChecker.isDuplicate(simpleArticle, unrelatedArticle, BibDatabaseMode.BIBTEX)
         );
     }
 
@@ -431,11 +363,7 @@ public void twoUnrelatedEntriesWithEqualEprintAreDuplicates() {
         unrelatedArticle.setField(StandardField.EPRINT, "12345678");
 
         assertTrue(
-            duplicateChecker.isDuplicate(
-                simpleArticle,
-                unrelatedArticle,
-                BibDatabaseMode.BIBTEX
-            )
+            duplicateChecker.isDuplicate(simpleArticle, unrelatedArticle, BibDatabaseMode.BIBTEX)
         );
     }
 
@@ -458,10 +386,7 @@ public void twoEntriesWithSameDoiButDifferentTypesAreDuplicates() {
     public void twoEntriesWithDoiContainingUnderscoresAreNotEqual() {
         simpleArticle.setField(StandardField.DOI, "10.1016/j.is.2004.02.002");
         // An underscore in a DOI can indicate a totally different DOI
-        unrelatedArticle.setField(
-            StandardField.DOI,
-            "10.1016/j.is.2004.02.0_02"
-        );
+        unrelatedArticle.setField(StandardField.DOI, "10.1016/j.is.2004.02.0_02");
         BibEntry duplicateWithDifferentType = unrelatedArticle;
         duplicateWithDifferentType.setType(StandardEntryType.InCollection);
 
@@ -490,9 +415,7 @@ public void twoEntriesWithSameISBNButDifferentTypesAreDuplicates() {
         );
     }
 
-    public static Stream<
-        Arguments
-    > twoEntriesWithDifferentSpecificFieldsAreNotDuplicates() {
+    public static Stream<Arguments> twoEntriesWithDifferentSpecificFieldsAreNotDuplicates() {
         return Stream.of(
             // twoInbooksWithDifferentChaptersAreNotDuplicates
             Arguments.of(
@@ -502,26 +425,11 @@ > twoEntriesWithDifferentSpecificFieldsAreNotDuplicates() {
                 "Chapter Two – The Pool of Tears"
             ),
             // twoInbooksWithDifferentPagesAreNotDuplicates
-            Arguments.of(
-                getSimpleInbook(),
-                StandardField.PAGES,
-                "1-20",
-                "21-40"
-            ),
+            Arguments.of(getSimpleInbook(), StandardField.PAGES, "1-20", "21-40"),
             // twoIncollectionsWithDifferentChaptersAreNotDuplicates
-            Arguments.of(
-                getSimpleIncollection(),
-                StandardField.CHAPTER,
-                "10",
-                "9"
-            ),
+            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")
         );
     }
 
@@ -533,30 +441,17 @@ private void twoEntriesWithDifferentSpecificFieldsAreNotDuplicates(
         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)
-        );
+        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));
     }
 
     @Test
     public void inbookWithoutChapterCouldBeDuplicateOfInbookWithChapter() {
         final BibEntry inbook2 =
-            ((BibEntry) simpleInbook.clone()).withField(
-                    StandardField.CHAPTER,
-                    ""
-                );
+            ((BibEntry) simpleInbook.clone()).withField(StandardField.CHAPTER, "");
 
-        assertTrue(
-            duplicateChecker.isDuplicate(
-                simpleInbook,
-                inbook2,
-                BibDatabaseMode.BIBTEX
-            )
-        );
+        assertTrue(duplicateChecker.isDuplicate(simpleInbook, inbook2, BibDatabaseMode.BIBTEX));
     }
 
     @Test
@@ -575,13 +470,7 @@ public void twoBooksWithDifferentEditionsAreNotDuplicates() {
             .withField(StandardField.DATE, "2008")
             .withField(StandardField.EDITION, "2");
 
-        assertFalse(
-            duplicateChecker.isDuplicate(
-                editionOne,
-                editionTwo,
-                BibDatabaseMode.BIBTEX
-            )
-        );
+        assertFalse(duplicateChecker.isDuplicate(editionOne, editionTwo, BibDatabaseMode.BIBTEX));
     }
 
     @Test
@@ -598,13 +487,7 @@ public void sameBooksWithMissingEditionAreDuplicates() {
             .withField(StandardField.PUBLISHER, "Prentice Hall")
             .withField(StandardField.DATE, "2008");
 
-        assertTrue(
-            duplicateChecker.isDuplicate(
-                editionOne,
-                editionTwo,
-                BibDatabaseMode.BIBTEX
-            )
-        );
+        assertTrue(duplicateChecker.isDuplicate(editionOne, editionTwo, BibDatabaseMode.BIBTEX));
     }
 
     @Test
@@ -622,29 +505,17 @@ public void sameBooksWithPartiallyMissingEditionAreDuplicates() {
             .withField(StandardField.DATE, "2008")
             .withField(StandardField.EDITION, "2");
 
-        assertTrue(
-            duplicateChecker.isDuplicate(
-                editionOne,
-                editionTwo,
-                BibDatabaseMode.BIBTEX
-            )
-        );
+        assertTrue(duplicateChecker.isDuplicate(editionOne, editionTwo, BibDatabaseMode.BIBTEX));
     }
 
     @Test
     public void sameBooksWithDifferentEditionsAreNotDuplicates() {
         BibEntry editionTwo = new BibEntry(StandardEntryType.Book)
             .withCitationKey("Sutton17reinfLrnIntroBook")
-            .withField(
-                StandardField.TITLE,
-                "Reinforcement learning:An introduction"
-            )
+            .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.AUTHOR, "Sutton, Richard S and Barto, Andrew G")
             .withField(StandardField.ADDRESS, "Cambridge, MA.USA")
             .withField(StandardField.EDITION, "Second")
             .withField(StandardField.JOURNAL, "MIT Press")
@@ -655,65 +526,33 @@ public void sameBooksWithDifferentEditionsAreNotDuplicates() {
 
         BibEntry editionOne = new BibEntry(StandardEntryType.Book)
             .withCitationKey("Sutton98reinfLrnIntroBook")
-            .withField(
-                StandardField.TITLE,
-                "Reinforcement learning: An introduction"
-            )
+            .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.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
-            )
-        );
+        assertFalse(duplicateChecker.isDuplicate(editionOne, editionTwo, BibDatabaseMode.BIBTEX));
     }
 
     @Test
-    void compareOfTwoEntriesWithSameContentAndLfEndingsReportsNoDifferences()
-        throws Exception {
+    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");
-        assertTrue(
-            duplicateChecker.isDuplicate(
-                entryOne,
-                entryTwo,
-                BibDatabaseMode.BIBTEX
-            )
-        );
+        assertTrue(duplicateChecker.isDuplicate(entryOne, entryTwo, BibDatabaseMode.BIBTEX));
     }
 
     @Test
-    void compareOfTwoEntriesWithSameContentAndCrLfEndingsReportsNoDifferences()
-        throws Exception {
+    void compareOfTwoEntriesWithSameContentAndCrLfEndingsReportsNoDifferences() throws Exception {
         BibEntry entryOne = new BibEntry()
-            .withField(
-                StandardField.COMMENT,
-                "line1\r\n\r\nline3\r\n\r\nline5"
-            );
+            .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
-            )
-        );
+            .withField(StandardField.COMMENT, "line1\r\n\r\nline3\r\n\r\nline5");
+        assertTrue(duplicateChecker.isDuplicate(entryOne, entryTwo, BibDatabaseMode.BIBTEX));
     }
 
     @Test
@@ -722,17 +561,8 @@ void compareOfTwoEntriesWithSameContentAndMixedLineEndingsReportsNoDifferences()
         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
-            )
-        );
+            .withField(StandardField.COMMENT, "line1\r\n\r\nline3\r\n\r\nline5");
+        assertTrue(duplicateChecker.isDuplicate(entryOne, entryTwo, BibDatabaseMode.BIBTEX));
     }
 
     @Disabled(
@@ -764,12 +594,6 @@ void differentArticlesFromTheSameBookAreNotDuplicates() {
             .withField(StandardField.ISBN, "978-1-4684-8585-1")
             .withField(StandardField.YEAR, "1993");
 
-        assertFalse(
-            duplicateChecker.isDuplicate(
-                entryOne,
-                entryTwo,
-                BibDatabaseMode.BIBTEX
-            )
-        );
+        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 2b4828231c9..eca58603cbe 100644
--- a/src/test/java/org/jabref/logic/exporter/AtomicFileOutputStreamTest.java
+++ b/src/test/java/org/jabref/logic/exporter/AtomicFileOutputStreamTest.java
@@ -20,24 +20,15 @@
 class AtomicFileOutputStreamTest {
 
     private static final String FIFTY_CHARS = Strings.repeat("1234567890", 5);
-    private static final String FIVE_THOUSAND_CHARS = Strings.repeat(
-        "A",
-        5_000
-    );
+    private static final String FIVE_THOUSAND_CHARS = Strings.repeat("A", 5_000);
 
     @Test
     public void normalSaveWorks(@TempDir Path tempDir) throws Exception {
         Path out = tempDir.resolve("normal-save.txt");
         Files.writeString(out, FIFTY_CHARS);
 
-        try (
-            AtomicFileOutputStream atomicFileOutputStream = new AtomicFileOutputStream(
-                out
-            )
-        ) {
-            InputStream inputStream = new ByteArrayInputStream(
-                FIVE_THOUSAND_CHARS.getBytes()
-            );
+        try (AtomicFileOutputStream atomicFileOutputStream = new AtomicFileOutputStream(out)) {
+            InputStream inputStream = new ByteArrayInputStream(FIVE_THOUSAND_CHARS.getBytes());
             inputStream.transferTo(atomicFileOutputStream);
         }
 
@@ -46,24 +37,17 @@ public void normalSaveWorks(@TempDir Path tempDir) throws Exception {
     }
 
     @Test
-    public void originalContentExistsAtWriteError(@TempDir Path tempDir)
-        throws Exception {
+    public void originalContentExistsAtWriteError(@TempDir Path tempDir) throws Exception {
         Path pathToTestFile = tempDir.resolve("error-during-save.txt");
         Files.writeString(pathToTestFile, FIFTY_CHARS);
 
         Path pathToTmpFile = tempDir.resolve("error-during-save.txt.tmp");
 
-        try (
-            FileOutputStream outputStream = new FileOutputStream(
-                pathToTmpFile.toFile()
-            )
-        ) {
+        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.write(((byte[]) invocation.getRawArguments()[0])[0]);
                     outputStream.flush();
                     throw new IOException();
                 })
diff --git a/src/test/java/org/jabref/logic/exporter/BibtexDatabaseWriterTest.java b/src/test/java/org/jabref/logic/exporter/BibtexDatabaseWriterTest.java
index d3918f60ce4..0d0b8bfa0f1 100644
--- a/src/test/java/org/jabref/logic/exporter/BibtexDatabaseWriterTest.java
+++ b/src/test/java/org/jabref/logic/exporter/BibtexDatabaseWriterTest.java
@@ -80,11 +80,7 @@ public class BibtexDatabaseWriterTest {
     @BeforeEach
     void setUp() {
         fieldPreferences =
-            new FieldPreferences(
-                true,
-                Collections.emptyList(),
-                Collections.emptyList()
-            );
+            new FieldPreferences(true, Collections.emptyList(), Collections.emptyList());
         saveConfiguration =
             new SelfContainedSaveConfiguration(
                 SaveOrder.getDefaultSaveOrder(),
@@ -93,10 +89,7 @@ void setUp() {
                 false
             );
         citationKeyPatternPreferences =
-            mock(
-                CitationKeyPatternPreferences.class,
-                Answers.RETURNS_DEEP_STUBS
-            );
+            mock(CitationKeyPatternPreferences.class, Answers.RETURNS_DEEP_STUBS);
         entryTypesManager = new BibEntryTypesManager();
         stringWriter = new StringWriter();
         bibWriter = new BibWriter(stringWriter, OS.NEWLINE);
@@ -104,10 +97,8 @@ void setUp() {
         database = new BibDatabase();
         metaData = new MetaData();
         bibtexContext = new BibDatabaseContext(database, metaData);
-        importFormatPreferences =
-            mock(ImportFormatPreferences.class, Answers.RETURNS_DEEP_STUBS);
-        when(importFormatPreferences.fieldPreferences())
-            .thenReturn(fieldPreferences);
+        importFormatPreferences = mock(ImportFormatPreferences.class, Answers.RETURNS_DEEP_STUBS);
+        when(importFormatPreferences.fieldPreferences()).thenReturn(fieldPreferences);
     }
 
     private void initializeDatabaseWriter() {
@@ -125,8 +116,7 @@ private void initializeDatabaseWriter() {
     void writeWithNullContextThrowsException() throws Exception {
         assertThrows(
             NullPointerException.class,
-            () ->
-                databaseWriter.savePartOfDatabase(null, Collections.emptyList())
+            () -> databaseWriter.savePartOfDatabase(null, Collections.emptyList())
         );
     }
 
@@ -142,46 +132,27 @@ void writeWithNullEntriesThrowsException() throws Exception {
     void writeEncodingUsAsciiWhenSetInPreferencesAndHeader() throws Exception {
         metaData.setEncoding(StandardCharsets.US_ASCII);
 
-        databaseWriter.savePartOfDatabase(
-            bibtexContext,
-            Collections.emptyList()
-        );
+        databaseWriter.savePartOfDatabase(bibtexContext, Collections.emptyList());
 
-        assertEquals(
-            "% Encoding: US-ASCII" + OS.NEWLINE,
-            stringWriter.toString()
-        );
+        assertEquals("% Encoding: US-ASCII" + OS.NEWLINE, stringWriter.toString());
     }
 
     @Test
-    void writeEncodingWindows1252WhenSetInPreferencesAndHeader()
-        throws Exception {
+    void writeEncodingWindows1252WhenSetInPreferencesAndHeader() throws Exception {
         metaData.setEncoding(Charset.forName("windows-1252"));
 
-        databaseWriter.savePartOfDatabase(
-            bibtexContext,
-            Collections.emptyList()
-        );
+        databaseWriter.savePartOfDatabase(bibtexContext, Collections.emptyList());
 
-        assertEquals(
-            "% Encoding: windows-1252" + OS.NEWLINE,
-            stringWriter.toString()
-        );
+        assertEquals("% Encoding: windows-1252" + OS.NEWLINE, stringWriter.toString());
     }
 
     @Test
     void writePreamble() throws Exception {
         database.setPreamble("Test preamble");
 
-        databaseWriter.savePartOfDatabase(
-            bibtexContext,
-            Collections.emptyList()
-        );
+        databaseWriter.savePartOfDatabase(bibtexContext, Collections.emptyList());
 
-        assertEquals(
-            "@Preamble{Test preamble}" + OS.NEWLINE,
-            stringWriter.toString()
-        );
+        assertEquals("@Preamble{Test preamble}" + OS.NEWLINE, stringWriter.toString());
     }
 
     @Test
@@ -189,10 +160,7 @@ void writePreambleAndEncoding() throws Exception {
         metaData.setEncoding(StandardCharsets.US_ASCII);
         database.setPreamble("Test preamble");
 
-        databaseWriter.savePartOfDatabase(
-            bibtexContext,
-            Collections.emptyList()
-        );
+        databaseWriter.savePartOfDatabase(bibtexContext, Collections.emptyList());
 
         assertEquals(
             "% Encoding: US-ASCII" +
@@ -210,15 +178,9 @@ void writeEntry() throws Exception {
         entry.setType(StandardEntryType.Article);
         database.insertEntry(entry);
 
-        databaseWriter.savePartOfDatabase(
-            bibtexContext,
-            Collections.singletonList(entry)
-        );
+        databaseWriter.savePartOfDatabase(bibtexContext, Collections.singletonList(entry));
 
-        assertEquals(
-            "@Article{," + OS.NEWLINE + "}" + OS.NEWLINE,
-            stringWriter.toString()
-        );
+        assertEquals("@Article{," + OS.NEWLINE + "}" + OS.NEWLINE, stringWriter.toString());
     }
 
     @Test
@@ -228,10 +190,7 @@ void writeEntryWithDuplicateKeywords() throws Exception {
         entry.setField(StandardField.KEYWORDS, "asdf,asdf,asdf");
         database.insertEntry(entry);
 
-        databaseWriter.savePartOfDatabase(
-            bibtexContext,
-            Collections.singletonList(entry)
-        );
+        databaseWriter.savePartOfDatabase(bibtexContext, Collections.singletonList(entry));
 
         assertEquals(
             "@Article{," +
@@ -245,26 +204,17 @@ void writeEntryWithDuplicateKeywords() throws Exception {
     }
 
     @Test
-    void putKeyWordsRemovesDuplicateKeywordsIsVisibleDuringWrite()
-        throws Exception {
+    void putKeyWordsRemovesDuplicateKeywordsIsVisibleDuringWrite() throws Exception {
         BibEntry entry = new BibEntry();
         entry.setType(StandardEntryType.Article);
         entry.putKeywords(List.of("asdf", "asdf", "asdf"), ',');
 
         database.insertEntry(entry);
 
-        databaseWriter.savePartOfDatabase(
-            bibtexContext,
-            Collections.singletonList(entry)
-        );
+        databaseWriter.savePartOfDatabase(bibtexContext, Collections.singletonList(entry));
 
         assertEquals(
-            "@Article{," +
-            OS.NEWLINE +
-            "  keywords = {asdf}," +
-            OS.NEWLINE +
-            "}" +
-            OS.NEWLINE,
+            "@Article{," + OS.NEWLINE + "  keywords = {asdf}," + OS.NEWLINE + "}" + OS.NEWLINE,
             stringWriter.toString()
         );
     }
@@ -276,10 +226,7 @@ void writeEncodingAndEntry() throws Exception {
         database.insertEntry(entry);
         metaData.setEncoding(StandardCharsets.US_ASCII);
 
-        databaseWriter.savePartOfDatabase(
-            bibtexContext,
-            Collections.singletonList(entry)
-        );
+        databaseWriter.savePartOfDatabase(bibtexContext, Collections.singletonList(entry));
 
         assertEquals(
             "% Encoding: US-ASCII" +
@@ -297,10 +244,7 @@ void writeEncodingAndEntry() throws Exception {
     void writeEpilogue() throws Exception {
         database.setEpilog("Test epilog");
 
-        databaseWriter.savePartOfDatabase(
-            bibtexContext,
-            Collections.emptyList()
-        );
+        databaseWriter.savePartOfDatabase(bibtexContext, Collections.emptyList());
 
         assertEquals("Test epilog" + OS.NEWLINE, stringWriter.toString());
     }
@@ -310,17 +254,10 @@ void writeEpilogueAndEncoding() throws Exception {
         database.setEpilog("Test epilog");
         metaData.setEncoding(StandardCharsets.US_ASCII);
 
-        databaseWriter.savePartOfDatabase(
-            bibtexContext,
-            Collections.emptyList()
-        );
+        databaseWriter.savePartOfDatabase(bibtexContext, Collections.emptyList());
 
         assertEquals(
-            "% Encoding: US-ASCII" +
-            OS.NEWLINE +
-            OS.NEWLINE +
-            "Test epilog" +
-            OS.NEWLINE,
+            "% Encoding: US-ASCII" + OS.NEWLINE + OS.NEWLINE + "Test epilog" + OS.NEWLINE,
             stringWriter.toString()
         );
     }
@@ -330,10 +267,7 @@ void utf8EncodingWrittenIfExplicitlyDefined() throws Exception {
         metaData.setEncoding(StandardCharsets.UTF_8);
         metaData.setEncodingExplicitlySupplied(true);
 
-        databaseWriter.savePartOfDatabase(
-            bibtexContext,
-            Collections.emptyList()
-        );
+        databaseWriter.savePartOfDatabase(bibtexContext, Collections.emptyList());
 
         assertEquals("% Encoding: UTF-8" + OS.NEWLINE, stringWriter.toString());
     }
@@ -343,27 +277,20 @@ void utf8EncodingNotWrittenIfNotExplicitlyDefined() throws Exception {
         metaData.setEncoding(StandardCharsets.UTF_8);
         metaData.setEncodingExplicitlySupplied(false);
 
-        databaseWriter.savePartOfDatabase(
-            bibtexContext,
-            Collections.emptyList()
-        );
+        databaseWriter.savePartOfDatabase(bibtexContext, Collections.emptyList());
 
         assertEquals("", stringWriter.toString());
     }
 
     @Test
     void writeMetadata() throws Exception {
-        DatabaseCitationKeyPattern bibtexKeyPattern =
-            new DatabaseCitationKeyPattern(
-                mock(GlobalCitationKeyPattern.class)
-            );
+        DatabaseCitationKeyPattern bibtexKeyPattern = new DatabaseCitationKeyPattern(
+            mock(GlobalCitationKeyPattern.class)
+        );
         bibtexKeyPattern.setDefaultValue("test");
         metaData.setCiteKeyPattern(bibtexKeyPattern);
 
-        databaseWriter.savePartOfDatabase(
-            bibtexContext,
-            Collections.emptyList()
-        );
+        databaseWriter.savePartOfDatabase(bibtexContext, Collections.emptyList());
 
         assertEquals(
             "@Comment{jabref-meta: keypatterndefault:test;}" + OS.NEWLINE,
@@ -373,18 +300,14 @@ void writeMetadata() throws Exception {
 
     @Test
     void writeMetadataAndEncoding() throws Exception {
-        DatabaseCitationKeyPattern bibtexKeyPattern =
-            new DatabaseCitationKeyPattern(
-                mock(GlobalCitationKeyPattern.class)
-            );
+        DatabaseCitationKeyPattern bibtexKeyPattern = new DatabaseCitationKeyPattern(
+            mock(GlobalCitationKeyPattern.class)
+        );
         bibtexKeyPattern.setDefaultValue("test");
         metaData.setCiteKeyPattern(bibtexKeyPattern);
         metaData.setEncoding(StandardCharsets.US_ASCII);
 
-        databaseWriter.savePartOfDatabase(
-            bibtexContext,
-            Collections.emptyList()
-        );
+        databaseWriter.savePartOfDatabase(bibtexContext, Collections.emptyList());
 
         assertEquals(
             "% Encoding: US-ASCII" +
@@ -398,18 +321,11 @@ void writeMetadataAndEncoding() throws Exception {
 
     @Test
     void writeGroups() throws Exception {
-        GroupTreeNode groupRoot = GroupTreeNode.fromGroup(
-            new AllEntriesGroup("")
-        );
-        groupRoot.addSubgroup(
-            new ExplicitGroup("test", GroupHierarchyType.INCLUDING, ',')
-        );
+        GroupTreeNode groupRoot = GroupTreeNode.fromGroup(new AllEntriesGroup(""));
+        groupRoot.addSubgroup(new ExplicitGroup("test", GroupHierarchyType.INCLUDING, ','));
         metaData.setGroups(groupRoot);
 
-        databaseWriter.savePartOfDatabase(
-            bibtexContext,
-            Collections.emptyList()
-        );
+        databaseWriter.savePartOfDatabase(bibtexContext, Collections.emptyList());
 
         // @formatter:off
         assertEquals("@Comment{jabref-meta: grouping:" + OS.NEWLINE
@@ -421,21 +337,14 @@ void writeGroups() throws Exception {
 
     @Test
     void writeGroupsAndEncoding() throws Exception {
-        GroupTreeNode groupRoot = GroupTreeNode.fromGroup(
-            new AllEntriesGroup("")
-        );
+        GroupTreeNode groupRoot = GroupTreeNode.fromGroup(new AllEntriesGroup(""));
         groupRoot.addChild(
-            GroupTreeNode.fromGroup(
-                new ExplicitGroup("test", GroupHierarchyType.INCLUDING, ',')
-            )
+            GroupTreeNode.fromGroup(new ExplicitGroup("test", GroupHierarchyType.INCLUDING, ','))
         );
         metaData.setGroups(groupRoot);
         metaData.setEncoding(StandardCharsets.US_ASCII);
 
-        databaseWriter.savePartOfDatabase(
-            bibtexContext,
-            Collections.emptyList()
-        );
+        databaseWriter.savePartOfDatabase(bibtexContext, Collections.emptyList());
 
         // @formatter:off
         assertEquals(
@@ -452,15 +361,9 @@ void writeGroupsAndEncoding() throws Exception {
     void writeString() throws Exception {
         database.addString(new BibtexString("name", "content"));
 
-        databaseWriter.savePartOfDatabase(
-            bibtexContext,
-            Collections.emptyList()
-        );
+        databaseWriter.savePartOfDatabase(bibtexContext, Collections.emptyList());
 
-        assertEquals(
-            "@String{name = {content}}" + OS.NEWLINE,
-            stringWriter.toString()
-        );
+        assertEquals("@String{name = {content}}" + OS.NEWLINE, stringWriter.toString());
     }
 
     @Test
@@ -468,10 +371,7 @@ void writeStringAndEncoding() throws Exception {
         metaData.setEncoding(StandardCharsets.US_ASCII);
         database.addString(new BibtexString("name", "content"));
 
-        databaseWriter.savePartOfDatabase(
-            bibtexContext,
-            Collections.emptyList()
-        );
+        databaseWriter.savePartOfDatabase(bibtexContext, Collections.emptyList());
 
         assertEquals(
             "% Encoding: US-ASCII" +
@@ -487,20 +387,13 @@ void writeStringAndEncoding() throws Exception {
     void doNotWriteUtf8StringAndEncoding() throws Exception {
         database.addString(new BibtexString("name", "content"));
 
-        databaseWriter.savePartOfDatabase(
-            bibtexContext,
-            Collections.emptyList()
-        );
+        databaseWriter.savePartOfDatabase(bibtexContext, Collections.emptyList());
 
-        assertEquals(
-            "@String{name = {content}}" + OS.NEWLINE,
-            stringWriter.toString()
-        );
+        assertEquals("@String{name = {content}}" + OS.NEWLINE, stringWriter.toString());
     }
 
     @Test
-    void writeEntryWithCustomizedTypeAlsoWritesTypeDeclaration()
-        throws Exception {
+    void writeEntryWithCustomizedTypeAlsoWritesTypeDeclaration() throws Exception {
         EntryType customizedType = new UnknownEntryType("customizedType");
         BibEntryType customizedBibType = new BibEntryType(
             customizedType,
@@ -518,10 +411,7 @@ void writeEntryWithCustomizedTypeAlsoWritesTypeDeclaration()
                 new OrFields(StandardField.DATE)
             )
         );
-        entryTypesManager.addCustomOrModifiedType(
-            customizedBibType,
-            BibDatabaseMode.BIBTEX
-        );
+        entryTypesManager.addCustomOrModifiedType(customizedBibType, BibDatabaseMode.BIBTEX);
         BibEntry entry = new BibEntry(customizedType).withCitationKey("key");
         // needed to get a proper serialization
         entry.setChanged(true);
@@ -548,41 +438,26 @@ void writeEntryWithCustomizedTypeAlsoWritesTypeDeclaration()
     @Test
     void writeCustomizedTypesInAlphabeticalOrder() throws Exception {
         EntryType customizedType = new UnknownEntryType("customizedType");
-        EntryType otherCustomizedType = new UnknownEntryType(
-            "otherCustomizedType"
-        );
+        EntryType otherCustomizedType = new UnknownEntryType("otherCustomizedType");
         BibEntryType customizedBibType = new BibEntryType(
             customizedType,
-            Collections.singletonList(
-                new BibField(StandardField.TITLE, FieldPriority.IMPORTANT)
-            ),
+            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 BibField(StandardField.TITLE, FieldPriority.IMPORTANT)),
             Collections.singletonList(new OrFields(StandardField.TITLE))
         );
-        entryTypesManager.addCustomOrModifiedType(
-            otherCustomizedBibType,
-            BibDatabaseMode.BIBTEX
-        );
-        entryTypesManager.addCustomOrModifiedType(
-            customizedBibType,
-            BibDatabaseMode.BIBTEX
-        );
+        entryTypesManager.addCustomOrModifiedType(otherCustomizedBibType, BibDatabaseMode.BIBTEX);
+        entryTypesManager.addCustomOrModifiedType(customizedBibType, BibDatabaseMode.BIBTEX);
         BibEntry entry = new BibEntry(customizedType);
         BibEntry otherEntry = new BibEntry(otherCustomizedType);
         database.insertEntry(otherEntry);
         database.insertEntry(entry);
         bibtexContext.setMode(BibDatabaseMode.BIBTEX);
 
-        databaseWriter.savePartOfDatabase(
-            bibtexContext,
-            List.of(entry, otherEntry)
-        );
+        databaseWriter.savePartOfDatabase(bibtexContext, List.of(entry, otherEntry));
 
         assertEquals(
             "@Customizedtype{," +
@@ -609,9 +484,7 @@ void writeCustomizedTypesInAlphabeticalOrder() throws Exception {
 
     @Test
     void roundtripWithArticleMonths() throws Exception {
-        Path testBibtexFile = Path.of(
-            "src/test/resources/testbib/articleWithMonths.bib"
-        );
+        Path testBibtexFile = Path.of("src/test/resources/testbib/articleWithMonths.bib");
         Charset encoding = StandardCharsets.UTF_8;
         ParserResult result = new BibtexParser(importFormatPreferences)
             .parse(Importer.getReader(testBibtexFile));
@@ -621,14 +494,8 @@ void roundtripWithArticleMonths() throws Exception {
             result.getMetaData()
         );
 
-        databaseWriter.savePartOfDatabase(
-            context,
-            result.getDatabase().getEntries()
-        );
-        assertEquals(
-            Files.readString(testBibtexFile, encoding),
-            stringWriter.toString()
-        );
+        databaseWriter.savePartOfDatabase(context, result.getDatabase().getEntries());
+        assertEquals(Files.readString(testBibtexFile, encoding), stringWriter.toString());
     }
 
     @Test
@@ -664,10 +531,7 @@ void roundtripUtf8EncodingHeaderRemoved() throws Exception {
     @Test
     void roundtripWin1252HeaderKept(@TempDir Path bibFolder) throws Exception {
         Path testFile = Path.of(
-            BibtexImporterTest.class.getResource(
-                    "encoding-windows-1252-with-header.bib"
-                )
-                .toURI()
+            BibtexImporterTest.class.getResource("encoding-windows-1252-with-header.bib").toURI()
         );
         ParserResult result = new BibtexImporter(
             importFormatPreferences,
@@ -683,9 +547,7 @@ void roundtripWin1252HeaderKept(@TempDir Path bibFolder) throws Exception {
         Path file = Files.createFile(pathToFile);
         Charset charset = Charset.forName("windows-1252");
 
-        try (
-            BufferedWriter fileWriter = Files.newBufferedWriter(file, charset)
-        ) {
+        try (BufferedWriter fileWriter = Files.newBufferedWriter(file, charset)) {
             BibWriter bibWriter = new BibWriter(
                 fileWriter,
                 context.getDatabase().getNewLineSeparator()
@@ -700,10 +562,7 @@ void roundtripWin1252HeaderKept(@TempDir Path bibFolder) throws Exception {
             databaseWriter.saveDatabase(context);
         }
 
-        assertEquals(
-            Files.readString(testFile, charset),
-            Files.readString(file, charset)
-        );
+        assertEquals(Files.readString(testFile, charset), Files.readString(file, charset));
     }
 
     @Test
@@ -728,9 +587,7 @@ void roundtripUtf8HeaderKept(@TempDir Path bibFolder) throws Exception {
         Path file = Files.createFile(pathToFile);
         Charset charset = StandardCharsets.UTF_8;
 
-        try (
-            BufferedWriter fileWriter = Files.newBufferedWriter(file, charset)
-        ) {
+        try (BufferedWriter fileWriter = Files.newBufferedWriter(file, charset)) {
             BibWriter bibWriter = new BibWriter(
                 fileWriter,
                 context.getDatabase().getNewLineSeparator()
@@ -745,16 +602,12 @@ void roundtripUtf8HeaderKept(@TempDir Path bibFolder) throws Exception {
             databaseWriter.saveDatabase(context);
         }
 
-        assertEquals(
-            Files.readString(testFile, charset),
-            Files.readString(file, charset)
-        );
+        assertEquals(Files.readString(testFile, charset), Files.readString(file, charset));
     }
 
     @Test
-    void roundtripNotExplicitUtf8HeaderNotInsertedDuringWrite(
-        @TempDir Path bibFolder
-    ) throws Exception {
+    void roundtripNotExplicitUtf8HeaderNotInsertedDuringWrite(@TempDir Path bibFolder)
+        throws Exception {
         Path testFile = Path.of(
             BibtexImporterTest.class.getResource(
                     "encoding-utf-8-without-header-with-databasetypecomment.bib"
@@ -775,9 +628,7 @@ void roundtripNotExplicitUtf8HeaderNotInsertedDuringWrite(
         Path file = Files.createFile(pathToFile);
         Charset charset = StandardCharsets.UTF_8;
 
-        try (
-            BufferedWriter fileWriter = Files.newBufferedWriter(file, charset)
-        ) {
+        try (BufferedWriter fileWriter = Files.newBufferedWriter(file, charset)) {
             BibWriter bibWriter = new BibWriter(
                 fileWriter,
                 context.getDatabase().getNewLineSeparator()
@@ -792,10 +643,7 @@ void roundtripNotExplicitUtf8HeaderNotInsertedDuringWrite(
             databaseWriter.saveDatabase(context);
         }
 
-        assertEquals(
-            Files.readString(testFile, charset),
-            Files.readString(file, charset)
-        );
+        assertEquals(Files.readString(testFile, charset), Files.readString(file, charset));
     }
 
     @Test
@@ -821,21 +669,13 @@ void roundtripWithComplexBib() throws Exception {
             citationKeyPatternPreferences,
             entryTypesManager
         );
-        databaseWriter.savePartOfDatabase(
-            context,
-            result.getDatabase().getEntries()
-        );
-        assertEquals(
-            Files.readString(testBibtexFile, encoding),
-            stringWriter.toString()
-        );
+        databaseWriter.savePartOfDatabase(context, result.getDatabase().getEntries());
+        assertEquals(Files.readString(testBibtexFile, encoding), stringWriter.toString());
     }
 
     @Test
     void roundtripWithUserComment() throws Exception {
-        Path testBibtexFile = Path.of(
-            "src/test/resources/testbib/bibWithUserComments.bib"
-        );
+        Path testBibtexFile = Path.of("src/test/resources/testbib/bibWithUserComments.bib");
         Charset encoding = StandardCharsets.UTF_8;
         ParserResult result = new BibtexParser(importFormatPreferences)
             .parse(Importer.getReader(testBibtexFile));
@@ -845,14 +685,8 @@ void roundtripWithUserComment() throws Exception {
             result.getMetaData()
         );
 
-        databaseWriter.savePartOfDatabase(
-            context,
-            result.getDatabase().getEntries()
-        );
-        assertEquals(
-            Files.readString(testBibtexFile, encoding),
-            stringWriter.toString()
-        );
+        databaseWriter.savePartOfDatabase(context, result.getDatabase().getEntries());
+        assertEquals(Files.readString(testBibtexFile, encoding), stringWriter.toString());
     }
 
     @Test
@@ -874,10 +708,7 @@ void roundtripWithOneUserCommentAndEntryChange() throws Exception {
         ParserResult result = new BibtexParser(importFormatPreferences)
             .parse(new StringReader(bibEntry));
 
-        BibEntry entry = result
-            .getDatabase()
-            .getEntryByCitationKey("1137631")
-            .get();
+        BibEntry entry = result.getDatabase().getEntryByCitationKey("1137631").get();
         entry.setField(StandardField.AUTHOR, "Mr. Author");
 
         BibDatabaseContext context = new BibDatabaseContext(
@@ -895,16 +726,12 @@ void roundtripWithOneUserCommentAndEntryChange() throws Exception {
                 citationKeyPatternPreferences,
                 entryTypesManager
             );
-        databaseWriter.savePartOfDatabase(
-            context,
-            result.getDatabase().getEntries()
-        );
+        databaseWriter.savePartOfDatabase(context, result.getDatabase().getEntries());
         assertEquals(bibEntry, stringWriter.toString());
     }
 
     @Test
-    void roundtripWithTwoEntriesAndOneUserCommentAndEntryChange()
-        throws Exception {
+    void roundtripWithTwoEntriesAndOneUserCommentAndEntryChange() throws Exception {
         String bibEntry =
             "@Article{test,}\n" +
             "\n" +
@@ -924,10 +751,7 @@ void roundtripWithTwoEntriesAndOneUserCommentAndEntryChange()
         ParserResult result = new BibtexParser(importFormatPreferences)
             .parse(new StringReader(bibEntry));
 
-        BibEntry entry = result
-            .getDatabase()
-            .getEntryByCitationKey("1137631")
-            .get();
+        BibEntry entry = result.getDatabase().getEntryByCitationKey("1137631").get();
         entry.setField(StandardField.AUTHOR, "Mr. Author");
 
         BibDatabaseContext context = new BibDatabaseContext(
@@ -945,26 +769,18 @@ void roundtripWithTwoEntriesAndOneUserCommentAndEntryChange()
                 citationKeyPatternPreferences,
                 entryTypesManager
             );
-        databaseWriter.savePartOfDatabase(
-            context,
-            result.getDatabase().getEntries()
-        );
+        databaseWriter.savePartOfDatabase(context, result.getDatabase().getEntries());
         assertEquals(bibEntry, stringWriter.toString());
     }
 
     @Test
     void roundtripWithUserCommentAndEntryChange() throws Exception {
-        Path testBibtexFile = Path.of(
-            "src/test/resources/testbib/bibWithUserComments.bib"
-        );
+        Path testBibtexFile = Path.of("src/test/resources/testbib/bibWithUserComments.bib");
         Charset encoding = StandardCharsets.UTF_8;
         ParserResult result = new BibtexParser(importFormatPreferences)
             .parse(Importer.getReader(testBibtexFile));
 
-        BibEntry entry = result
-            .getDatabase()
-            .getEntryByCitationKey("1137631")
-            .get();
+        BibEntry entry = result.getDatabase().getEntryByCitationKey("1137631").get();
         entry.setField(StandardField.AUTHOR, "Mr. Author");
 
         BibDatabaseContext context = new BibDatabaseContext(
@@ -972,15 +788,10 @@ void roundtripWithUserCommentAndEntryChange() throws Exception {
             result.getMetaData()
         );
 
-        databaseWriter.savePartOfDatabase(
-            context,
-            result.getDatabase().getEntries()
-        );
+        databaseWriter.savePartOfDatabase(context, result.getDatabase().getEntries());
         assertEquals(
             Files.readString(
-                Path.of(
-                    "src/test/resources/testbib/bibWithUserCommentAndEntryChange.bib"
-                ),
+                Path.of("src/test/resources/testbib/bibWithUserCommentAndEntryChange.bib"),
                 encoding
             ),
             stringWriter.toString()
@@ -1004,22 +815,14 @@ void roundtripWithUserCommentBeforeStringAndChange() throws Exception {
             result.getMetaData()
         );
 
-        databaseWriter.savePartOfDatabase(
-            context,
-            result.getDatabase().getEntries()
-        );
+        databaseWriter.savePartOfDatabase(context, result.getDatabase().getEntries());
 
-        assertEquals(
-            Files.readString(testBibtexFile, encoding),
-            stringWriter.toString()
-        );
+        assertEquals(Files.readString(testBibtexFile, encoding), stringWriter.toString());
     }
 
     @Test
     void roundtripWithUnknownMetaData() throws Exception {
-        Path testBibtexFile = Path.of(
-            "src/test/resources/testbib/unknownMetaData.bib"
-        );
+        Path testBibtexFile = Path.of("src/test/resources/testbib/unknownMetaData.bib");
         Charset encoding = StandardCharsets.UTF_8;
         ParserResult result = new BibtexParser(importFormatPreferences)
             .parse(Importer.getReader(testBibtexFile));
@@ -1029,14 +832,8 @@ void roundtripWithUnknownMetaData() throws Exception {
             result.getMetaData()
         );
 
-        databaseWriter.savePartOfDatabase(
-            context,
-            result.getDatabase().getEntries()
-        );
-        assertEquals(
-            Files.readString(testBibtexFile, encoding),
-            stringWriter.toString()
-        );
+        databaseWriter.savePartOfDatabase(context, result.getDatabase().getEntries());
+        assertEquals(Files.readString(testBibtexFile, encoding), stringWriter.toString());
     }
 
     @Test
@@ -1048,15 +845,9 @@ void writeSavedSerializationOfEntryIfUnchanged() throws Exception {
         entry.setChanged(false);
         database.insertEntry(entry);
 
-        databaseWriter.savePartOfDatabase(
-            bibtexContext,
-            Collections.singletonList(entry)
-        );
+        databaseWriter.savePartOfDatabase(bibtexContext, Collections.singletonList(entry));
 
-        assertEquals(
-            "presaved serialization" + OS.NEWLINE,
-            stringWriter.toString()
-        );
+        assertEquals("presaved serialization" + OS.NEWLINE, stringWriter.toString());
     }
 
     @Test
@@ -1075,18 +866,10 @@ void reformatEntryIfAskedToDoSo() throws Exception {
                 true
             );
         initializeDatabaseWriter();
-        databaseWriter.savePartOfDatabase(
-            bibtexContext,
-            Collections.singletonList(entry)
-        );
+        databaseWriter.savePartOfDatabase(bibtexContext, Collections.singletonList(entry));
 
         assertEquals(
-            "@Article{," +
-            OS.NEWLINE +
-            "  author = {Mr. author}," +
-            OS.NEWLINE +
-            "}" +
-            OS.NEWLINE,
+            "@Article{," + OS.NEWLINE + "  author = {Mr. author}," + OS.NEWLINE + "}" + OS.NEWLINE,
             stringWriter.toString()
         );
     }
@@ -1097,10 +880,7 @@ void writeSavedSerializationOfStringIfUnchanged() throws Exception {
         string.setParsedSerialization("serialization");
         database.addString(string);
 
-        databaseWriter.savePartOfDatabase(
-            bibtexContext,
-            Collections.emptyList()
-        );
+        databaseWriter.savePartOfDatabase(bibtexContext, Collections.emptyList());
 
         assertEquals("serialization" + OS.NEWLINE, stringWriter.toString());
     }
@@ -1119,15 +899,9 @@ void reformatStringIfAskedToDoSo() throws Exception {
                 true
             );
         initializeDatabaseWriter();
-        databaseWriter.savePartOfDatabase(
-            bibtexContext,
-            Collections.emptyList()
-        );
+        databaseWriter.savePartOfDatabase(bibtexContext, Collections.emptyList());
 
-        assertEquals(
-            "@String{name = {content}}" + OS.NEWLINE,
-            stringWriter.toString()
-        );
+        assertEquals("@String{name = {content}}" + OS.NEWLINE, stringWriter.toString());
     }
 
     @Test
@@ -1135,26 +909,14 @@ 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()
-                )
+                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()
-        );
+        databaseWriter.savePartOfDatabase(bibtexContext, Collections.emptyList());
 
         // The order should be kept (the cleanups are a list, not a set)
         assertEquals(
@@ -1184,10 +946,7 @@ void writeSaveOrderConfig() throws Exception {
         );
         metaData.setSaveOrder(saveOrder);
 
-        databaseWriter.savePartOfDatabase(
-            bibtexContext,
-            Collections.emptyList()
-        );
+        databaseWriter.savePartOfDatabase(bibtexContext, Collections.emptyList());
 
         assertEquals(
             "@Comment{jabref-meta: saveOrderConfig:specified;author;false;year;true;abstract;false;}" +
@@ -1205,10 +964,7 @@ void writeCustomKeyPattern() throws Exception {
         pattern.addCitationKeyPattern(StandardEntryType.Article, "articleTest");
         metaData.setCiteKeyPattern(pattern);
 
-        databaseWriter.savePartOfDatabase(
-            bibtexContext,
-            Collections.emptyList()
-        );
+        databaseWriter.savePartOfDatabase(bibtexContext, Collections.emptyList());
 
         assertEquals(
             "@Comment{jabref-meta: keypattern_article:articleTest;}" +
@@ -1224,10 +980,7 @@ void writeCustomKeyPattern() throws Exception {
     void writeBiblatexMode() throws Exception {
         metaData.setMode(BibDatabaseMode.BIBLATEX);
 
-        databaseWriter.savePartOfDatabase(
-            bibtexContext,
-            Collections.emptyList()
-        );
+        databaseWriter.savePartOfDatabase(bibtexContext, Collections.emptyList());
 
         assertEquals(
             "@Comment{jabref-meta: databaseType:biblatex;}" + OS.NEWLINE,
@@ -1239,10 +992,7 @@ void writeBiblatexMode() throws Exception {
     void writeProtectedFlag() throws Exception {
         metaData.markAsProtected();
 
-        databaseWriter.savePartOfDatabase(
-            bibtexContext,
-            Collections.emptyList()
-        );
+        databaseWriter.savePartOfDatabase(bibtexContext, Collections.emptyList());
 
         assertEquals(
             "@Comment{jabref-meta: protectedFlag:true;}" + OS.NEWLINE,
@@ -1254,15 +1004,9 @@ void writeProtectedFlag() throws Exception {
     void writeFileDirectories() throws Exception {
         metaData.setDefaultFileDirectory("\\Literature\\");
         metaData.setUserFileDirectory("defaultOwner-user", "D:\\Documents");
-        metaData.setLatexFileDirectory(
-            "defaultOwner-user",
-            Path.of("D:\\Latex")
-        );
+        metaData.setLatexFileDirectory("defaultOwner-user", Path.of("D:\\Latex"));
 
-        databaseWriter.savePartOfDatabase(
-            bibtexContext,
-            Collections.emptyList()
-        );
+        databaseWriter.savePartOfDatabase(bibtexContext, Collections.emptyList());
 
         assertEquals(
             "@Comment{jabref-meta: fileDirectory:\\\\Literature\\\\;}" +
@@ -1343,8 +1087,7 @@ void writeEntriesSorted() throws Exception {
     }
 
     @Test
-    void writeEntriesInOriginalOrderWhenNoSaveOrderConfigIsSetInMetadata()
-        throws Exception {
+    void writeEntriesInOriginalOrderWhenNoSaveOrderConfigIsSetInMetadata() throws Exception {
         BibEntry firstEntry = new BibEntry();
         firstEntry.setType(StandardEntryType.Article);
         firstEntry.setField(StandardField.AUTHOR, "A");
@@ -1406,20 +1149,14 @@ void trimFieldContents() throws IOException {
         databaseWriter.saveDatabase(bibtexContext);
 
         assertEquals(
-            "@Article{," +
-            OS.NEWLINE +
-            "  note = {some note}," +
-            OS.NEWLINE +
-            "}" +
-            OS.NEWLINE,
+            "@Article{," + OS.NEWLINE + "  note = {some note}," + OS.NEWLINE + "}" + OS.NEWLINE,
             stringWriter.toString()
         );
     }
 
     @Test
     void newlineAtEndOfAbstractFieldIsDeleted() throws Exception {
-        String text =
-            "lorem ipsum lorem ipsum" + OS.NEWLINE + "lorem ipsum lorem ipsum";
+        String text = "lorem ipsum lorem ipsum" + OS.NEWLINE + "lorem ipsum lorem ipsum";
 
         BibEntry entry = new BibEntry(StandardEntryType.Article);
         entry.setField(StandardField.ABSTRACT, text + OS.NEWLINE);
@@ -1444,8 +1181,7 @@ void newlineAtEndOfAbstractFieldIsDeleted() throws Exception {
     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;
+            "@Comment{jabref-meta: selector_journal:Test {\\\\\"U}mlaut;}" + OS.NEWLINE;
         String fileContent = encodingHeader + commentEntry;
         Charset encoding = StandardCharsets.UTF_8;
 
@@ -1457,10 +1193,7 @@ void roundtripWithContentSelectorsAndUmlauts() throws Exception {
             firstParse.getMetaData()
         );
 
-        databaseWriter.savePartOfDatabase(
-            context,
-            firstParse.getDatabase().getEntries()
-        );
+        databaseWriter.savePartOfDatabase(context, firstParse.getDatabase().getEntries());
 
         assertEquals(commentEntry, stringWriter.toString());
     }
@@ -1495,10 +1228,7 @@ void saveAlsoSavesSecondModification() throws Exception {
         );
         context.setMode(BibDatabaseMode.BIBTEX);
 
-        databaseWriter.savePartOfDatabase(
-            context,
-            firstParse.getDatabase().getEntries()
-        );
+        databaseWriter.savePartOfDatabase(context, firstParse.getDatabase().getEntries());
 
         // modify entry a second time
         entry.setField(StandardField.AUTHOR, "Test");
@@ -1514,10 +1244,7 @@ void saveAlsoSavesSecondModification() throws Exception {
                 citationKeyPatternPreferences,
                 entryTypesManager
             );
-        databaseWriter.savePartOfDatabase(
-            context,
-            firstParse.getDatabase().getEntries()
-        );
+        databaseWriter.savePartOfDatabase(context, firstParse.getDatabase().getEntries());
 
         assertEquals(
             "@Article{test," +
@@ -1541,8 +1268,7 @@ void saveAlsoSavesSecondModification() throws Exception {
     }
 
     @Test
-    void saveReturnsToOriginalEntryWhenEntryIsFlaggedUnchanged()
-        throws Exception {
+    void saveReturnsToOriginalEntryWhenEntryIsFlaggedUnchanged() throws Exception {
         // @formatter:off
         String bibtexEntry = "@Article{test," + OS.NEWLINE +
                 "  Author                   = {Foo Bar}," + OS.NEWLINE +
@@ -1576,10 +1302,7 @@ void saveReturnsToOriginalEntryWhenEntryIsFlaggedUnchanged()
             firstParse.getDatabase(),
             firstParse.getMetaData()
         );
-        databaseWriter.savePartOfDatabase(
-            context,
-            firstParse.getDatabase().getEntries()
-        );
+        databaseWriter.savePartOfDatabase(context, firstParse.getDatabase().getEntries());
 
         assertEquals(bibtexEntry, stringWriter.toString());
     }
@@ -1617,10 +1340,7 @@ void saveReturnsToOriginalEntryWhenEntryIsFlaggedUnchangedEvenInThePresenceOfSav
             firstParse.getMetaData()
         );
 
-        databaseWriter.savePartOfDatabase(
-            context,
-            firstParse.getDatabase().getEntries()
-        );
+        databaseWriter.savePartOfDatabase(context, firstParse.getDatabase().getEntries());
 
         // modify entry a second time
         entry.setField(StandardField.AUTHOR, "Test");
@@ -1638,10 +1358,7 @@ void saveReturnsToOriginalEntryWhenEntryIsFlaggedUnchangedEvenInThePresenceOfSav
                 citationKeyPatternPreferences,
                 entryTypesManager
             );
-        databaseWriter.savePartOfDatabase(
-            context,
-            firstParse.getDatabase().getEntries()
-        );
+        databaseWriter.savePartOfDatabase(context, firstParse.getDatabase().getEntries());
 
         // returns tu original entry, not to the last saved one
         assertEquals(bibtexEntry, stringWriter.toString());
diff --git a/src/test/java/org/jabref/logic/exporter/CsvExportFormatTest.java b/src/test/java/org/jabref/logic/exporter/CsvExportFormatTest.java
index 952319cf8b3..94b11e0e00b 100644
--- a/src/test/java/org/jabref/logic/exporter/CsvExportFormatTest.java
+++ b/src/test/java/org/jabref/logic/exporter/CsvExportFormatTest.java
@@ -33,10 +33,7 @@ public void setUp() {
                 "openoffice-csv",
                 "openoffice",
                 StandardFileType.CSV,
-                mock(
-                    LayoutFormatterPreferences.class,
-                    Answers.RETURNS_DEEP_STUBS
-                ),
+                mock(LayoutFormatterPreferences.class, Answers.RETURNS_DEEP_STUBS),
                 SaveOrder.getDefaultSaveOrder()
             );
 
@@ -49,12 +46,10 @@ public void tearDown() {
     }
 
     @Test
-    public void testPerformExportForSingleAuthor(@TempDir Path testFolder)
-        throws Exception {
+    public void testPerformExportForSingleAuthor(@TempDir Path testFolder) throws Exception {
         Path path = testFolder.resolve("ThisIsARandomlyNamedFile");
 
-        BibEntry entry = new BibEntry()
-            .withField(StandardField.AUTHOR, "Someone, Van Something");
+        BibEntry entry = new BibEntry().withField(StandardField.AUTHOR, "Someone, Van Something");
         List<BibEntry> entries = List.of(entry);
 
         exportFormat.export(databaseContext, path, entries);
@@ -68,8 +63,7 @@ public void testPerformExportForSingleAuthor(@TempDir Path testFolder)
     }
 
     @Test
-    public void testPerformExportForMultipleAuthors(@TempDir Path testFolder)
-        throws Exception {
+    public void testPerformExportForMultipleAuthors(@TempDir Path testFolder) throws Exception {
         Path path = testFolder.resolve("ThisIsARandomlyNamedFile");
 
         BibEntry entry = new BibEntry()
@@ -90,12 +84,10 @@ public void testPerformExportForMultipleAuthors(@TempDir Path testFolder)
     }
 
     @Test
-    public void testPerformExportForSingleEditor(@TempDir Path testFolder)
-        throws Exception {
+    public void testPerformExportForSingleEditor(@TempDir Path testFolder) throws Exception {
         Path path = testFolder.resolve("ThisIsARandomlyNamedFile");
         File tmpFile = path.toFile();
-        BibEntry entry = new BibEntry()
-            .withField(StandardField.EDITOR, "Someone, Van Something");
+        BibEntry entry = new BibEntry().withField(StandardField.EDITOR, "Someone, Van Something");
         List<BibEntry> entries = List.of(entry);
 
         exportFormat.export(databaseContext, tmpFile.toPath(), entries);
@@ -109,8 +101,7 @@ public void testPerformExportForSingleEditor(@TempDir Path testFolder)
     }
 
     @Test
-    public void testPerformExportForMultipleEditors(@TempDir Path testFolder)
-        throws Exception {
+    public void testPerformExportForMultipleEditors(@TempDir Path testFolder) throws Exception {
         Path path = testFolder.resolve("ThisIsARandomlyNamedFile");
         File tmpFile = path.toFile();
         BibEntry entry = new BibEntry()
diff --git a/src/test/java/org/jabref/logic/exporter/DocBook5ExporterTest.java b/src/test/java/org/jabref/logic/exporter/DocBook5ExporterTest.java
index d983ec3460d..4e92d18d21d 100644
--- a/src/test/java/org/jabref/logic/exporter/DocBook5ExporterTest.java
+++ b/src/test/java/org/jabref/logic/exporter/DocBook5ExporterTest.java
@@ -47,22 +47,14 @@ void setUp() throws URISyntaxException {
                 "docbook5",
                 null,
                 StandardFileType.XML,
-                mock(
-                    LayoutFormatterPreferences.class,
-                    Answers.RETURNS_DEEP_STUBS
-                ),
+                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()
-            );
+            Path.of(DocBook5ExporterTest.class.getResource("Docbook5ExportFormat.xml").toURI());
         databaseContext = new BibDatabaseContext();
         charset = StandardCharsets.UTF_8;
         BibEntry entry = new BibEntry(StandardEntryType.Book)
@@ -75,8 +67,7 @@ void setUp() throws URISyntaxException {
     }
 
     @Test
-    void testPerformExportForSingleEntry(@TempDir Path testFolder)
-        throws Exception {
+    void testPerformExportForSingleEntry(@TempDir Path testFolder) throws Exception {
         Path path = testFolder.resolve("ThisIsARandomlyNamedFile");
 
         exporter.export(databaseContext, path, entries);
@@ -89,9 +80,7 @@ void testPerformExportForSingleEntry(@TempDir Path testFolder)
             CompareMatcher
                 .isSimilarTo(control)
                 .normalizeWhitespace()
-                .withNodeMatcher(
-                    new DefaultNodeMatcher(ElementSelectors.byNameAndText)
-                )
+                .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 2989cfb98e4..64e4650c268 100644
--- a/src/test/java/org/jabref/logic/exporter/DocbookExporterTest.java
+++ b/src/test/java/org/jabref/logic/exporter/DocbookExporterTest.java
@@ -36,17 +36,13 @@ public void setUp() {
                 "docbook4",
                 null,
                 StandardFileType.XML,
-                mock(
-                    LayoutFormatterPreferences.class,
-                    Answers.RETURNS_DEEP_STUBS
-                ),
+                mock(LayoutFormatterPreferences.class, Answers.RETURNS_DEEP_STUBS),
                 SaveOrder.getDefaultSaveOrder()
             );
     }
 
     @Test
-    public void testCorruptedTitleBraces(@TempDir Path testFolder)
-        throws Exception {
+    public void testCorruptedTitleBraces(@TempDir Path testFolder) throws Exception {
         Path tmpFile = testFolder.resolve("testBraces");
 
         BibEntry entry = new BibEntry();
@@ -68,8 +64,7 @@ public void testCorruptedTitleBraces(@TempDir Path testFolder)
     }
 
     @Test
-    public void testCorruptedTitleUnicode(@TempDir Path testFolder)
-        throws Exception {
+    public void testCorruptedTitleUnicode(@TempDir Path testFolder) throws Exception {
         Path tmpFile = testFolder.resolve("testBraces");
 
         BibEntry entry = new BibEntry();
diff --git a/src/test/java/org/jabref/logic/exporter/EmbeddedBibFilePdfExporterTest.java b/src/test/java/org/jabref/logic/exporter/EmbeddedBibFilePdfExporterTest.java
index 5ac56b04fb4..0b0a613cc61 100644
--- a/src/test/java/org/jabref/logic/exporter/EmbeddedBibFilePdfExporterTest.java
+++ b/src/test/java/org/jabref/logic/exporter/EmbeddedBibFilePdfExporterTest.java
@@ -42,9 +42,7 @@ class EmbeddedBibFilePdfExporterTest {
 
     private static BibEntry olly2018 = new BibEntry(StandardEntryType.Article);
     private static BibEntry toral2006 = new BibEntry(StandardEntryType.Article);
-    private static BibEntry vapnik2000 = new BibEntry(
-        StandardEntryType.Article
-    );
+    private static BibEntry vapnik2000 = new BibEntry(StandardEntryType.Article);
 
     private EmbeddedBibFilePdfExporter exporter;
 
@@ -76,16 +74,10 @@ private static void initBibEntries() throws IOException {
         olly2018.setField(StandardField.REVIEW, "review");
         olly2018.setField(StandardField.URL, "https://www.olly2018.edu");
 
-        LinkedFile linkedFile = createDefaultLinkedFile(
-            "existing.pdf",
-            tempDir
-        );
+        LinkedFile linkedFile = createDefaultLinkedFile("existing.pdf", tempDir);
         olly2018.setFiles(List.of(linkedFile));
 
-        toral2006.setField(
-            StandardField.AUTHOR,
-            "Toral, Antonio and Munoz, Rafael"
-        );
+        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"
@@ -96,21 +88,11 @@ private static void initBibEntries() throws IOException {
         toral2006.setField(StandardField.OWNER, "Ich");
         toral2006.setField(StandardField.URL, "www.url.de");
 
-        toral2006.setFiles(
-            List.of(
-                new LinkedFile("non-existing", "path/to/nowhere.pdf", "PDF")
-            )
-        );
+        toral2006.setFiles(List.of(new LinkedFile("non-existing", "path/to/nowhere.pdf", "PDF")));
 
         vapnik2000.setCitationKey("vapnik2000");
-        vapnik2000.setField(
-            StandardField.TITLE,
-            "The Nature of Statistical Learning Theory"
-        );
-        vapnik2000.setField(
-            StandardField.PUBLISHER,
-            "Springer Science + Business Media"
-        );
+        vapnik2000.setField(StandardField.TITLE, "The Nature of Statistical Learning Theory");
+        vapnik2000.setField(StandardField.PUBLISHER, "Springer Science + Business Media");
         vapnik2000.setField(StandardField.AUTHOR, "Vladimir N. Vapnik");
         vapnik2000.setField(StandardField.DOI, "10.1007/978-1-4757-3264-1");
         vapnik2000.setField(StandardField.OWNER, "Ich");
@@ -124,10 +106,8 @@ void setUp() throws IOException {
         abbreviationRepository = mock(JournalAbbreviationRepository.class);
 
         filePreferences = mock(FilePreferences.class);
-        when(filePreferences.getUserAndHost())
-            .thenReturn(tempDir.toAbsolutePath().toString());
-        when(filePreferences.shouldStoreFilesRelativeToBibFile())
-            .thenReturn(false);
+        when(filePreferences.getUserAndHost()).thenReturn(tempDir.toAbsolutePath().toString());
+        when(filePreferences.shouldStoreFilesRelativeToBibFile()).thenReturn(false);
 
         BibDatabaseMode bibDatabaseMode = BibDatabaseMode.BIBTEX;
         BibEntryTypesManager bibEntryTypesManager = new BibEntryTypesManager();
@@ -138,11 +118,7 @@ void setUp() throws IOException {
         );
 
         exporter =
-            new EmbeddedBibFilePdfExporter(
-                bibDatabaseMode,
-                bibEntryTypesManager,
-                fieldPreferences
-            );
+            new EmbeddedBibFilePdfExporter(bibDatabaseMode, bibEntryTypesManager, fieldPreferences);
 
         ImportFormatPreferences importFormatPreferences = mock(
             ImportFormatPreferences.class,
@@ -163,9 +139,7 @@ void setUp() throws IOException {
 
     @ParameterizedTest
     @MethodSource("provideBibEntriesWithValidPdfFileLinks")
-    void successfulExportToAllFilesOfEntry(
-        BibEntry bibEntryWithValidPdfFileLink
-    ) throws Exception {
+    void successfulExportToAllFilesOfEntry(BibEntry bibEntryWithValidPdfFileLink) throws Exception {
         assertTrue(
             exporter.exportToAllFilesOfEntry(
                 databaseContext,
@@ -179,9 +153,8 @@ void successfulExportToAllFilesOfEntry(
 
     @ParameterizedTest
     @MethodSource("provideBibEntriesWithInvalidPdfFileLinks")
-    void unsuccessfulExportToAllFilesOfEntry(
-        BibEntry bibEntryWithValidPdfFileLink
-    ) throws Exception {
+    void unsuccessfulExportToAllFilesOfEntry(BibEntry bibEntryWithValidPdfFileLink)
+        throws Exception {
         assertFalse(
             exporter.exportToAllFilesOfEntry(
                 databaseContext,
@@ -228,36 +201,24 @@ void unsuccessfulExportToFileByPath(Path path) throws Exception {
     }
 
     public static Stream<Arguments> providePathToNewPDFs() {
-        return Stream.of(
-            Arguments.of(tempDir.resolve("original.pdf").toAbsolutePath())
-        );
+        return Stream.of(Arguments.of(tempDir.resolve("original.pdf").toAbsolutePath()));
     }
 
     public static Stream<Arguments> providePathsToValidPDFs() {
-        return Stream.of(
-            Arguments.of(tempDir.resolve("existing.pdf").toAbsolutePath())
-        );
+        return Stream.of(Arguments.of(tempDir.resolve("existing.pdf").toAbsolutePath()));
     }
 
-    public static Stream<Arguments> providePathsToInvalidPDFs()
-        throws IOException {
-        LinkedFile existingFileThatIsNotLinked = createDefaultLinkedFile(
-            "notlinked.pdf",
-            tempDir
-        );
+    public static Stream<Arguments> providePathsToInvalidPDFs() throws IOException {
+        LinkedFile existingFileThatIsNotLinked = createDefaultLinkedFile("notlinked.pdf", tempDir);
         return Stream.of(
             Arguments.of(Path.of("")),
-            Arguments.of(
-                tempDir.resolve("path/to/nowhere.pdf").toAbsolutePath()
-            ),
+            Arguments.of(tempDir.resolve("path/to/nowhere.pdf").toAbsolutePath()),
             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());
@@ -282,10 +243,7 @@ public void testRoundtripExportImport(Path path) throws Exception {
 
         exporter.export(databaseContext, path, expectedEntries);
 
-        List<BibEntry> importedEntries = importer
-            .importDatabase(path)
-            .getDatabase()
-            .getEntries();
+        List<BibEntry> importedEntries = importer.importDatabase(path).getDatabase().getEntries();
 
         assertEquals(expectedEntries, importedEntries);
     }
diff --git a/src/test/java/org/jabref/logic/exporter/GroupSerializerTest.java b/src/test/java/org/jabref/logic/exporter/GroupSerializerTest.java
index c16526df379..f4b97ded2ec 100644
--- a/src/test/java/org/jabref/logic/exporter/GroupSerializerTest.java
+++ b/src/test/java/org/jabref/logic/exporter/GroupSerializerTest.java
@@ -41,13 +41,8 @@ void setUp() throws Exception {
     @Test
     void serializeSingleAllEntriesGroup() {
         AllEntriesGroup group = new AllEntriesGroup("");
-        List<String> serialization = groupSerializer.serializeTree(
-            GroupTreeNode.fromGroup(group)
-        );
-        assertEquals(
-            Collections.singletonList("0 AllEntriesGroup:"),
-            serialization
-        );
+        List<String> serialization = groupSerializer.serializeTree(GroupTreeNode.fromGroup(group));
+        assertEquals(Collections.singletonList("0 AllEntriesGroup:"), serialization);
     }
 
     @Test
@@ -57,9 +52,7 @@ void serializeSingleExplicitGroup() {
             GroupHierarchyType.INDEPENDENT,
             ','
         );
-        List<String> serialization = groupSerializer.serializeTree(
-            GroupTreeNode.fromGroup(group)
-        );
+        List<String> serialization = groupSerializer.serializeTree(GroupTreeNode.fromGroup(group));
         assertEquals(
             Collections.singletonList("0 StaticGroup:myExplicitGroup;0;1;;;;"),
             serialization
@@ -77,9 +70,7 @@ void serializeSingleExplicitGroupWithIconAndDescription() {
         group.setExpanded(true);
         group.setColor(Color.ALICEBLUE);
         group.setDescription("test description");
-        List<String> serialization = groupSerializer.serializeTree(
-            GroupTreeNode.fromGroup(group)
-        );
+        List<String> serialization = groupSerializer.serializeTree(GroupTreeNode.fromGroup(group));
         assertEquals(
             Collections.singletonList(
                 "0 StaticGroup:myExplicitGroup;0;1;0xf0f8ffff;test icon;test description;"
@@ -96,9 +87,7 @@ void serializeSingleExplicitGroupWithEscapedSlash() {
             GroupHierarchyType.INDEPENDENT,
             ','
         );
-        List<String> serialization = groupSerializer.serializeTree(
-            GroupTreeNode.fromGroup(group)
-        );
+        List<String> serialization = groupSerializer.serializeTree(GroupTreeNode.fromGroup(group));
         assertEquals(
             Collections.singletonList("0 StaticGroup:B{\\\\\"{o}}hmer;0;1;;;;"),
             serialization
@@ -116,13 +105,9 @@ void serializeSingleSimpleKeywordGroup() {
             ',',
             false
         );
-        List<String> serialization = groupSerializer.serializeTree(
-            GroupTreeNode.fromGroup(group)
-        );
+        List<String> serialization = groupSerializer.serializeTree(GroupTreeNode.fromGroup(group));
         assertEquals(
-            Collections.singletonList(
-                "0 KeywordGroup:name;0;keywords;test;0;0;1;;;;"
-            ),
+            Collections.singletonList("0 KeywordGroup:name;0;keywords;test;0;0;1;;;;"),
             serialization
         );
     }
@@ -136,13 +121,9 @@ void serializeSingleRegexKeywordGroup() {
             "asdf",
             false
         );
-        List<String> serialization = groupSerializer.serializeTree(
-            GroupTreeNode.fromGroup(group)
-        );
+        List<String> serialization = groupSerializer.serializeTree(GroupTreeNode.fromGroup(group));
         assertEquals(
-            Collections.singletonList(
-                "0 KeywordGroup:myExplicitGroup;1;author;asdf;0;1;1;;;;"
-            ),
+            Collections.singletonList("0 KeywordGroup:myExplicitGroup;1;author;asdf;0;1;1;;;;"),
             serialization
         );
     }
@@ -158,13 +139,9 @@ void serializeSingleSearchGroup() {
                 SearchRules.SearchFlags.REGULAR_EXPRESSION
             )
         );
-        List<String> serialization = groupSerializer.serializeTree(
-            GroupTreeNode.fromGroup(group)
-        );
+        List<String> serialization = groupSerializer.serializeTree(GroupTreeNode.fromGroup(group));
         assertEquals(
-            Collections.singletonList(
-                "0 SearchGroup:myExplicitGroup;0;author=harrer;1;1;1;;;;"
-            ),
+            Collections.singletonList("0 SearchGroup:myExplicitGroup;0;author=harrer;1;1;1;;;;"),
             serialization
         );
     }
@@ -177,9 +154,7 @@ void serializeSingleSearchGroupWithRegex() {
             "author=\"harrer\"",
             EnumSet.of(SearchRules.SearchFlags.CASE_SENSITIVE)
         );
-        List<String> serialization = groupSerializer.serializeTree(
-            GroupTreeNode.fromGroup(group)
-        );
+        List<String> serialization = groupSerializer.serializeTree(GroupTreeNode.fromGroup(group));
         assertEquals(
             Collections.singletonList(
                 "0 SearchGroup:myExplicitGroup;2;author=\"harrer\";1;0;1;;;;"
@@ -197,9 +172,7 @@ void serializeSingleAutomaticKeywordGroup() {
             ',',
             '>'
         );
-        List<String> serialization = groupSerializer.serializeTree(
-            GroupTreeNode.fromGroup(group)
-        );
+        List<String> serialization = groupSerializer.serializeTree(GroupTreeNode.fromGroup(group));
         assertEquals(
             Collections.singletonList(
                 "0 AutomaticKeywordGroup:myAutomaticGroup;0;keywords;,;>;1;;;;"
@@ -215,13 +188,9 @@ void serializeSingleAutomaticPersonGroup() {
             GroupHierarchyType.INDEPENDENT,
             StandardField.AUTHOR
         );
-        List<String> serialization = groupSerializer.serializeTree(
-            GroupTreeNode.fromGroup(group)
-        );
+        List<String> serialization = groupSerializer.serializeTree(GroupTreeNode.fromGroup(group));
         assertEquals(
-            Collections.singletonList(
-                "0 AutomaticPersonsGroup:myAutomaticGroup;0;author;1;;;;"
-            ),
+            Collections.singletonList("0 AutomaticPersonsGroup:myAutomaticGroup;0;author;1;;;;"),
             serialization
         );
     }
@@ -235,13 +204,9 @@ void serializeSingleTexGroup() throws Exception {
             new DefaultAuxParser(new BibDatabase()),
             new MetaData()
         );
-        List<String> serialization = groupSerializer.serializeTree(
-            GroupTreeNode.fromGroup(group)
-        );
+        List<String> serialization = groupSerializer.serializeTree(GroupTreeNode.fromGroup(group));
         assertEquals(
-            Collections.singletonList(
-                "0 TexGroup:myTexGroup;0;path/To/File;1;;;;"
-            ),
+            Collections.singletonList("0 TexGroup:myTexGroup;0;path/To/File;1;;;;"),
             serialization
         );
     }
diff --git a/src/test/java/org/jabref/logic/exporter/HayagrivaYamlExporterTest.java b/src/test/java/org/jabref/logic/exporter/HayagrivaYamlExporterTest.java
index 260efd98c85..f97f26352cb 100644
--- a/src/test/java/org/jabref/logic/exporter/HayagrivaYamlExporterTest.java
+++ b/src/test/java/org/jabref/logic/exporter/HayagrivaYamlExporterTest.java
@@ -33,10 +33,7 @@ static void setUp() {
                 "hayagrivayaml",
                 null,
                 StandardFileType.YAML,
-                mock(
-                    LayoutFormatterPreferences.class,
-                    Answers.RETURNS_DEEP_STUBS
-                ),
+                mock(LayoutFormatterPreferences.class, Answers.RETURNS_DEEP_STUBS),
                 SaveOrder.getDefaultSaveOrder(),
                 BlankLineBehaviour.DELETE_BLANKS
             );
@@ -45,21 +42,15 @@ static void setUp() {
     }
 
     @Test
-    public final void exportForNoEntriesWritesNothing(@TempDir Path tempFile)
-        throws Exception {
+    public final void exportForNoEntriesWritesNothing(@TempDir Path tempFile) throws Exception {
         Path file = tempFile.resolve("ThisIsARandomlyNamedFile");
         Files.createFile(file);
-        hayagrivaYamlExporter.export(
-            databaseContext,
-            tempFile,
-            Collections.emptyList()
-        );
+        hayagrivaYamlExporter.export(databaseContext, tempFile, Collections.emptyList());
         assertEquals(Collections.emptyList(), Files.readAllLines(file));
     }
 
     @Test
-    public final void exportsCorrectContent(@TempDir Path tempFile)
-        throws Exception {
+    public final void exportsCorrectContent(@TempDir Path tempFile) throws Exception {
         BibEntry entry = new BibEntry(StandardEntryType.Article)
             .withCitationKey("test")
             .withField(StandardField.AUTHOR, "Test Author")
@@ -69,11 +60,7 @@ public final void exportsCorrectContent(@TempDir Path tempFile)
 
         Path file = tempFile.resolve("RandomFileName");
         Files.createFile(file);
-        hayagrivaYamlExporter.export(
-            databaseContext,
-            file,
-            Collections.singletonList(entry)
-        );
+        hayagrivaYamlExporter.export(databaseContext, file, Collections.singletonList(entry));
 
         List<String> expected = List.of(
             "---",
@@ -91,8 +78,7 @@ public final void exportsCorrectContent(@TempDir Path tempFile)
     }
 
     @Test
-    public final void exportsCorrectMultipleAuthors(@TempDir Path tempFile)
-        throws Exception {
+    public final void exportsCorrectMultipleAuthors(@TempDir Path tempFile) throws Exception {
         BibEntry entry = new BibEntry(StandardEntryType.Article)
             .withCitationKey("test")
             .withField(StandardField.AUTHOR, "Test Author and Other One")
@@ -102,11 +88,7 @@ public final void exportsCorrectMultipleAuthors(@TempDir Path tempFile)
 
         Path file = tempFile.resolve("RandomFileName");
         Files.createFile(file);
-        hayagrivaYamlExporter.export(
-            databaseContext,
-            file,
-            Collections.singletonList(entry)
-        );
+        hayagrivaYamlExporter.export(databaseContext, file, Collections.singletonList(entry));
 
         List<String> expected = List.of(
             "---",
@@ -125,8 +107,7 @@ public final void exportsCorrectMultipleAuthors(@TempDir Path tempFile)
     }
 
     @Test
-    public final void formatsContentCorrect(@TempDir Path tempFile)
-        throws Exception {
+    public final void formatsContentCorrect(@TempDir Path tempFile) throws Exception {
         BibEntry entry = new BibEntry(StandardEntryType.Misc)
             .withCitationKey("test")
             .withField(StandardField.AUTHOR, "Test Author")
@@ -136,11 +117,7 @@ public final void formatsContentCorrect(@TempDir Path tempFile)
 
         Path file = tempFile.resolve("RandomFileName");
         Files.createFile(file);
-        hayagrivaYamlExporter.export(
-            databaseContext,
-            file,
-            Collections.singletonList(entry)
-        );
+        hayagrivaYamlExporter.export(databaseContext, file, Collections.singletonList(entry));
 
         List<String> expected = List.of(
             "---",
@@ -168,11 +145,7 @@ void passesModifiedCharset(@TempDir Path tempFile) throws Exception {
 
         Path file = tempFile.resolve("RandomFileName");
         Files.createFile(file);
-        hayagrivaYamlExporter.export(
-            databaseContext,
-            file,
-            Collections.singletonList(entry)
-        );
+        hayagrivaYamlExporter.export(databaseContext, file, Collections.singletonList(entry));
 
         List<String> expected = List.of(
             "---",
@@ -200,11 +173,7 @@ void passesModifiedCharsetNull(@TempDir Path tempFile) throws Exception {
 
         Path file = tempFile.resolve("RandomFileName");
         Files.createFile(file);
-        hayagrivaYamlExporter.export(
-            databaseContext,
-            file,
-            Collections.singletonList(entry)
-        );
+        hayagrivaYamlExporter.export(databaseContext, file, Collections.singletonList(entry));
 
         List<String> expected = List.of(
             "---",
@@ -221,8 +190,7 @@ void passesModifiedCharsetNull(@TempDir Path tempFile) throws Exception {
     }
 
     @Test
-    public final void exportsCorrectParentField(@TempDir Path tempFile)
-        throws Exception {
+    public final void exportsCorrectParentField(@TempDir Path tempFile) throws Exception {
         BibEntry entry = new BibEntry(StandardEntryType.Article)
             .withCitationKey("test")
             .withField(StandardField.AUTHOR, "Test Author")
@@ -233,11 +201,7 @@ public final void exportsCorrectParentField(@TempDir Path tempFile)
 
         Path file = tempFile.resolve("RandomFileName");
         Files.createFile(file);
-        hayagrivaYamlExporter.export(
-            databaseContext,
-            file,
-            Collections.singletonList(entry)
-        );
+        hayagrivaYamlExporter.export(databaseContext, file, Collections.singletonList(entry));
 
         List<String> expected = List.of(
             "---",
diff --git a/src/test/java/org/jabref/logic/exporter/HtmlExportFormatTest.java b/src/test/java/org/jabref/logic/exporter/HtmlExportFormatTest.java
index b414f77e6c4..a7515dcd61b 100644
--- a/src/test/java/org/jabref/logic/exporter/HtmlExportFormatTest.java
+++ b/src/test/java/org/jabref/logic/exporter/HtmlExportFormatTest.java
@@ -36,10 +36,7 @@ public void setUp() {
                 "html",
                 null,
                 StandardFileType.HTML,
-                mock(
-                    LayoutFormatterPreferences.class,
-                    Answers.RETURNS_DEEP_STUBS
-                ),
+                mock(LayoutFormatterPreferences.class, Answers.RETURNS_DEEP_STUBS),
                 SaveOrder.getDefaultSaveOrder()
             );
 
diff --git a/src/test/java/org/jabref/logic/exporter/MSBibExportFormatFilesTest.java b/src/test/java/org/jabref/logic/exporter/MSBibExportFormatFilesTest.java
index d1a56a4ab04..85f91e975f5 100644
--- a/src/test/java/org/jabref/logic/exporter/MSBibExportFormatFilesTest.java
+++ b/src/test/java/org/jabref/logic/exporter/MSBibExportFormatFilesTest.java
@@ -40,9 +40,7 @@ static Stream<String> fileNames() throws IOException, URISyntaxException {
         resourceDir =
             Path
                 .of(
-                    MSBibExportFormatFilesTest.class.getResource(
-                            "MsBibExportFormatTest1.bib"
-                        )
+                    MSBibExportFormatFilesTest.class.getResource("MsBibExportFormatTest1.bib")
                         .toURI()
                 )
                 .getParent();
@@ -99,9 +97,7 @@ void testPerformExport(String filename) throws IOException, SaveException {
             isSimilarTo(actual)
                 .ignoreWhitespace()
                 .normalizeWhitespace()
-                .withNodeMatcher(
-                    new DefaultNodeMatcher(ElementSelectors.byNameAndText)
-                )
+                .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 94910bb9c01..793bd4ba1d8 100644
--- a/src/test/java/org/jabref/logic/exporter/MetaDataSerializerTest.java
+++ b/src/test/java/org/jabref/logic/exporter/MetaDataSerializerTest.java
@@ -33,9 +33,7 @@
 
 public class MetaDataSerializerTest {
 
-    private static final EntryType CUSTOM_TYPE = new UnknownEntryType(
-        "customType"
-    );
+    private static final EntryType CUSTOM_TYPE = new UnknownEntryType("customType");
 
     private MetaData metaData;
     private GlobalCitationKeyPattern pattern;
@@ -48,9 +46,7 @@ public void setUp() {
         newCustomType =
             new BibEntryType(
                 CUSTOM_TYPE,
-                List.of(
-                    new BibField(StandardField.AUTHOR, FieldPriority.IMPORTANT)
-                ),
+                List.of(new BibField(StandardField.AUTHOR, FieldPriority.IMPORTANT)),
                 Collections.emptySet()
             );
     }
@@ -68,10 +64,7 @@ public void serializeSingleSaveAction() {
         FieldFormatterCleanups saveActions = new FieldFormatterCleanups(
             true,
             Collections.singletonList(
-                new FieldFormatterCleanup(
-                    StandardField.TITLE,
-                    new LowerCaseFormatter()
-                )
+                new FieldFormatterCleanup(StandardField.TITLE, new LowerCaseFormatter())
             )
         );
         metaData.setSaveActions(saveActions);
@@ -89,22 +82,12 @@ public void serializeSingleSaveAction() {
 
     @Test
     public 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)
-        );
+        metaData.addContentSelector(new ContentSelector(StandardField.PUBSTATE, values));
 
         Map<String, String> expectedSerialization = new TreeMap<>();
-        expectedSerialization.put(
-            "selector_pubstate",
-            "approved;captured;received;status;"
-        );
+        expectedSerialization.put("selector_pubstate", "approved;captured;received;status;");
         assertEquals(
             expectedSerialization,
             MetaDataSerializer.getSerializedStringMap(metaData, pattern)
@@ -113,12 +96,8 @@ public void serializeSingleContentSelectors() {
 
     @Test
     void testParsingEmptyOrFieldsReturnsEmptyCollections() {
-        String serialized = MetaDataSerializer.serializeCustomEntryTypes(
-            newCustomType
-        );
-        Optional<BibEntryType> type = MetaDataParser.parseCustomEntryType(
-            serialized
-        );
+        String serialized = MetaDataSerializer.serializeCustomEntryTypes(newCustomType);
+        Optional<BibEntryType> type = MetaDataParser.parseCustomEntryType(serialized);
         assertEquals(Collections.emptySet(), type.get().getRequiredFields());
     }
 
@@ -131,12 +110,8 @@ void testParsingEmptyOptionalFieldsFieldsReturnsEmptyCollections() {
                 Collections.singleton(new OrFields(StandardField.AUTHOR))
             );
 
-        String serialized = MetaDataSerializer.serializeCustomEntryTypes(
-            newCustomType
-        );
-        Optional<BibEntryType> type = MetaDataParser.parseCustomEntryType(
-            serialized
-        );
+        String serialized = MetaDataSerializer.serializeCustomEntryTypes(newCustomType);
+        Optional<BibEntryType> type = MetaDataParser.parseCustomEntryType(serialized);
         assertEquals(Collections.emptySet(), type.get().getOptionalFields());
     }
 
@@ -148,10 +123,7 @@ public static Stream<Arguments> serializeCustomizedEntryType() {
             Arguments.of(
                 new BibEntryTypeBuilder()
                     .withType(new UnknownEntryType("test"))
-                    .withRequiredFields(
-                        StandardField.AUTHOR,
-                        StandardField.TITLE
-                    ),
+                    .withRequiredFields(StandardField.AUTHOR, StandardField.TITLE),
                 "jabref-entrytype: test: req[author;title] opt[]"
             ),
             Arguments.of(
@@ -184,15 +156,10 @@ public static Stream<Arguments> serializeCustomizedEntryType() {
 
     @ParameterizedTest
     @MethodSource
-    void serializeCustomizedEntryType(
-        BibEntryTypeBuilder bibEntryTypeBuilder,
-        String expected
-    ) {
+    void serializeCustomizedEntryType(BibEntryTypeBuilder bibEntryTypeBuilder, String expected) {
         assertEquals(
             expected,
-            MetaDataSerializer.serializeCustomEntryTypes(
-                bibEntryTypeBuilder.build()
-            )
+            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 9c79f167f28..d44d627999e 100644
--- a/src/test/java/org/jabref/logic/exporter/ModsExportFormatFilesTest.java
+++ b/src/test/java/org/jabref/logic/exporter/ModsExportFormatFilesTest.java
@@ -28,9 +28,7 @@
 
 public class ModsExportFormatFilesTest {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(
-        ModsExportFormatFilesTest.class
-    );
+    private static final Logger LOGGER = LoggerFactory.getLogger(ModsExportFormatFilesTest.class);
     private static Path resourceDir;
 
     public Charset charset;
@@ -72,19 +70,12 @@ public void setUp(@TempDir Path testFolder) throws Exception {
         );
         when(importFormatPreferences.bibEntryPreferences())
             .thenReturn(mock(BibEntryPreferences.class));
-        when(
-            importFormatPreferences.bibEntryPreferences().getKeywordSeparator()
-        )
-            .thenReturn(',');
+        when(importFormatPreferences.bibEntryPreferences().getKeywordSeparator()).thenReturn(',');
 
         databaseContext = new BibDatabaseContext();
         charset = StandardCharsets.UTF_8;
         exporter = new ModsExporter();
-        bibtexImporter =
-            new BibtexImporter(
-                importFormatPreferences,
-                new DummyFileUpdateMonitor()
-            );
+        bibtexImporter = new BibtexImporter(importFormatPreferences, new DummyFileUpdateMonitor());
         modsImporter = new ModsImporter(importFormatPreferences);
 
         Path path = testFolder.resolve("ARandomlyNamedFile.tmp");
@@ -95,10 +86,7 @@ public void setUp(@TempDir Path testFolder) throws Exception {
     @ParameterizedTest
     @MethodSource("fileNames")
     public final void testPerformExport(String filename) throws Exception {
-        importFile =
-            Path.of(
-                ModsExportFormatFilesTest.class.getResource(filename).toURI()
-            );
+        importFile = Path.of(ModsExportFormatFilesTest.class.getResource(filename).toURI());
         String xmlFileName = filename.replace(".bib", ".xml");
         List<BibEntry> entries = bibtexImporter
             .importDatabase(importFile)
@@ -118,12 +106,8 @@ public final void testPerformExport(String filename) throws Exception {
 
     @ParameterizedTest
     @MethodSource("fileNames")
-    public final void testExportAsModsAndThenImportAsMods(String filename)
-        throws Exception {
-        importFile =
-            Path.of(
-                ModsExportFormatFilesTest.class.getResource(filename).toURI()
-            );
+    public final void testExportAsModsAndThenImportAsMods(String filename) throws Exception {
+        importFile = Path.of(ModsExportFormatFilesTest.class.getResource(filename).toURI());
         List<BibEntry> entries = bibtexImporter
             .importDatabase(importFile)
             .getDatabase()
@@ -135,21 +119,12 @@ public final void testExportAsModsAndThenImportAsMods(String filename)
 
     @ParameterizedTest
     @MethodSource("fileNames")
-    public final void testImportAsModsAndExportAsMods(String filename)
-        throws Exception {
-        importFile =
-            Path.of(
-                ModsExportFormatFilesTest.class.getResource(filename).toURI()
-            );
+    public final void testImportAsModsAndExportAsMods(String filename) throws Exception {
+        importFile = Path.of(ModsExportFormatFilesTest.class.getResource(filename).toURI());
         String xmlFileName = filename.replace(".bib", ".xml");
-        Path xmlFile = Path.of(
-            ModsExportFormatFilesTest.class.getResource(xmlFileName).toURI()
-        );
+        Path xmlFile = Path.of(ModsExportFormatFilesTest.class.getResource(xmlFileName).toURI());
 
-        List<BibEntry> entries = modsImporter
-            .importDatabase(xmlFile)
-            .getDatabase()
-            .getEntries();
+        List<BibEntry> entries = modsImporter.importDatabase(xmlFile).getDatabase().getEntries();
 
         exporter.export(databaseContext, exportedFile, entries);
 
diff --git a/src/test/java/org/jabref/logic/exporter/ModsExportFormatTest.java b/src/test/java/org/jabref/logic/exporter/ModsExportFormatTest.java
index d80ada10f31..2673e2e3abc 100644
--- a/src/test/java/org/jabref/logic/exporter/ModsExportFormatTest.java
+++ b/src/test/java/org/jabref/logic/exporter/ModsExportFormatTest.java
@@ -29,23 +29,15 @@ public void setUp() throws Exception {
             new DummyFileUpdateMonitor()
         );
         Path.of(
-            ModsExportFormatTest.class.getResource(
-                    "ModsExportFormatTestAllFields.bib"
-                )
-                .toURI()
+            ModsExportFormatTest.class.getResource("ModsExportFormatTestAllFields.bib").toURI()
         );
     }
 
     @Test
-    public final void exportForNoEntriesWritesNothing(@TempDir Path tempFile)
-        throws Exception {
+    public final void exportForNoEntriesWritesNothing(@TempDir Path tempFile) throws Exception {
         Path file = tempFile.resolve("ThisIsARandomlyNamedFile");
         Files.createFile(file);
-        modsExportFormat.export(
-            databaseContext,
-            tempFile,
-            Collections.emptyList()
-        );
+        modsExportFormat.export(databaseContext, tempFile, Collections.emptyList());
         assertEquals(Collections.emptyList(), Files.readAllLines(file));
     }
 }
diff --git a/src/test/java/org/jabref/logic/exporter/OpenOfficeDocumentCreatorTest.java b/src/test/java/org/jabref/logic/exporter/OpenOfficeDocumentCreatorTest.java
index c7a6dc015f1..bc777f1086e 100644
--- a/src/test/java/org/jabref/logic/exporter/OpenOfficeDocumentCreatorTest.java
+++ b/src/test/java/org/jabref/logic/exporter/OpenOfficeDocumentCreatorTest.java
@@ -58,10 +58,7 @@ void setUp() throws URISyntaxException {
         );
         entry.setField(StandardField.AUTHOR, "Tony Clear");
         entry.setField(StandardField.ISSN, "0097-8418");
-        entry.setField(
-            StandardField.DOI,
-            "http://doi.acm.org/10.1145/820127.820136"
-        );
+        entry.setField(StandardField.DOI, "http://doi.acm.org/10.1145/820127.820136");
         entry.setField(StandardField.JOURNAL, "SIGCSE Bull.");
         entry.setField(StandardField.NUMBER, "4");
         entry.setField(StandardField.PAGES, "13--14");
@@ -73,8 +70,7 @@ void setUp() throws URISyntaxException {
     }
 
     @Test
-    void testPerformExportForSingleEntry(@TempDir Path testFolder)
-        throws Exception {
+    void testPerformExportForSingleEntry(@TempDir Path testFolder) throws Exception {
         Path zipPath = testFolder.resolve("OpenOfficeRandomNamedFile");
 
         exporter.export(databaseContext, zipPath, entries);
@@ -95,20 +91,13 @@ void testPerformExportForSingleEntry(@TempDir Path testFolder)
             CompareMatcher
                 .isSimilarTo(control)
                 .normalizeWhitespace()
-                .withNodeMatcher(
-                    new DefaultNodeMatcher(ElementSelectors.byNameAndText)
-                )
+                .withNodeMatcher(new DefaultNodeMatcher(ElementSelectors.byNameAndText))
                 .throwComparisonFailure()
         );
     }
 
-    private static void unzipContentXml(Path zipFile, Path unzipFolder)
-        throws IOException {
-        try (
-            ZipInputStream zis = new ZipInputStream(
-                new FileInputStream(zipFile.toFile())
-            )
-        ) {
+    private static void unzipContentXml(Path zipFile, Path unzipFolder) throws IOException {
+        try (ZipInputStream zis = new ZipInputStream(new FileInputStream(zipFile.toFile()))) {
             ZipEntry zipEntry = zis.getNextEntry();
 
             while (zipEntry != null) {
@@ -122,11 +111,7 @@ private static void unzipContentXml(Path zipFile, Path unzipFolder)
                             Files.createDirectories(newPath.getParent());
                         }
                     }
-                    Files.copy(
-                        zis,
-                        newPath,
-                        StandardCopyOption.REPLACE_EXISTING
-                    );
+                    Files.copy(zis, newPath, StandardCopyOption.REPLACE_EXISTING);
                 }
 
                 zipEntry = zis.getNextEntry();
@@ -136,8 +121,7 @@ private static void unzipContentXml(Path zipFile, Path unzipFolder)
     }
 
     // protect zip slip attack: https://snyk.io/research/zip-slip-vulnerability
-    private static Path zipSlipProtect(ZipEntry zipEntry, Path targetDir)
-        throws IOException {
+    private static Path zipSlipProtect(ZipEntry zipEntry, Path targetDir) throws IOException {
         Path targetDirResolved = targetDir.resolve(zipEntry.getName());
         Path normalizePath = targetDirResolved.normalize();
         if (!normalizePath.startsWith(targetDir)) {
diff --git a/src/test/java/org/jabref/logic/exporter/XmpExporterTest.java b/src/test/java/org/jabref/logic/exporter/XmpExporterTest.java
index 2a940fba07d..682536e99a1 100644
--- a/src/test/java/org/jabref/logic/exporter/XmpExporterTest.java
+++ b/src/test/java/org/jabref/logic/exporter/XmpExporterTest.java
@@ -37,11 +37,7 @@ public void exportSingleEntry(@TempDir Path testFolder) throws Exception {
         BibEntry entry = new BibEntry();
         entry.setField(StandardField.AUTHOR, "Alan Turing");
 
-        exporter.export(
-            databaseContext,
-            file,
-            Collections.singletonList(entry)
-        );
+        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 =
             """
@@ -65,8 +61,7 @@ public void exportSingleEntry(@TempDir Path testFolder) throws Exception {
     }
 
     @Test
-    public void writeMultipleEntriesInASingleFile(@TempDir Path testFolder)
-        throws Exception {
+    public void writeMultipleEntriesInASingleFile(@TempDir Path testFolder) throws Exception {
         Path file = testFolder.resolve("ThisIsARandomlyNamedFile");
         Files.createFile(file);
 
@@ -77,11 +72,7 @@ public void writeMultipleEntriesInASingleFile(@TempDir Path testFolder)
         entryArmbrust.setField(StandardField.AUTHOR, "Michael Armbrust");
         entryArmbrust.setCitationKey("Armbrust2010");
 
-        exporter.export(
-            databaseContext,
-            file,
-            Arrays.asList(entryTuring, entryArmbrust)
-        );
+        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
 
@@ -125,35 +116,24 @@ public void writeMultipleEntriesInASingleFile(@TempDir Path testFolder)
     }
 
     @Test
-    public void writeMultipleEntriesInDifferentFiles(@TempDir Path testFolder)
-        throws Exception {
+    public void writeMultipleEntriesInDifferentFiles(@TempDir Path testFolder) throws Exception {
         // set path to the one where the exporter produces several files
-        Path file = testFolder.resolve(
-            XmpExporter.XMP_SPLIT_DIRECTORY_INDICATOR
-        );
+        Path file = testFolder.resolve(XmpExporter.XMP_SPLIT_DIRECTORY_INDICATOR);
         Files.createFile(file);
 
-        BibEntry entryTuring = new BibEntry()
-            .withField(StandardField.AUTHOR, "Alan Turing");
+        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)
-        );
+        exporter.export(databaseContext, file, List.of(entryTuring, entryArmbrust));
 
         // Nothing written in given file
         List<String> lines = Files.readAllLines(file);
         assertEquals(Collections.emptyList(), lines);
 
         // turing contains the turing entry only
-        Path fileTuring = Path.of(
-            file.getParent().toString(),
-            entryTuring.getId() + "_null.xmp"
-        );
+        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 =
@@ -182,10 +162,7 @@ public void writeMultipleEntriesInDifferentFiles(@TempDir Path testFolder)
             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 actualArmbrust = String.join("\n", Files.readAllLines(fileArmbrust));
         String expectedArmbrust =
             """
               <rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
@@ -213,27 +190,17 @@ public void writeMultipleEntriesInDifferentFiles(@TempDir Path testFolder)
     }
 
     @Test
-    public void exportSingleEntryWithPrivacyFilter(@TempDir Path testFolder)
-        throws Exception {
+    public void exportSingleEntryWithPrivacyFilter(@TempDir Path testFolder) throws Exception {
         when(xmpPreferences.getXmpPrivacyFilter())
-            .thenReturn(
-                FXCollections.observableSet(
-                    Collections.singleton(StandardField.AUTHOR)
-                )
-            );
+            .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)
-        );
+        exporter.export(databaseContext, file, Collections.singletonList(entry));
 
         String actual = String.join("\n", Files.readAllLines(file));
         String expected =
diff --git a/src/test/java/org/jabref/logic/exporter/XmpPdfExporterTest.java b/src/test/java/org/jabref/logic/exporter/XmpPdfExporterTest.java
index 62caf8b5687..533d45c6c94 100644
--- a/src/test/java/org/jabref/logic/exporter/XmpPdfExporterTest.java
+++ b/src/test/java/org/jabref/logic/exporter/XmpPdfExporterTest.java
@@ -48,9 +48,7 @@ class XmpPdfExporterTest {
 
     private static BibEntry olly2018 = new BibEntry(StandardEntryType.Article);
     private static BibEntry toral2006 = new BibEntry(StandardEntryType.Article);
-    private static BibEntry vapnik2000 = new BibEntry(
-        StandardEntryType.Article
-    );
+    private static BibEntry vapnik2000 = new BibEntry(StandardEntryType.Article);
 
     private XmpPdfExporter exporter;
     private PdfXmpImporter importer;
@@ -82,16 +80,10 @@ private static void initBibEntries() throws IOException {
         olly2018.setField(StandardField.REVIEW, "review");
         olly2018.setField(StandardField.URL, "https://www.olly2018.edu");
 
-        LinkedFile linkedFile = createDefaultLinkedFile(
-            "existing.pdf",
-            tempDir
-        );
+        LinkedFile linkedFile = createDefaultLinkedFile("existing.pdf", tempDir);
         olly2018.setFiles(List.of(linkedFile));
 
-        toral2006.setField(
-            StandardField.AUTHOR,
-            "Toral, Antonio and Munoz, Rafael"
-        );
+        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"
@@ -102,21 +94,11 @@ private static void initBibEntries() throws IOException {
         toral2006.setField(StandardField.OWNER, "Ich");
         toral2006.setField(StandardField.URL, "www.url.de");
 
-        toral2006.setFiles(
-            List.of(
-                new LinkedFile("non-existing", "path/to/nowhere.pdf", "PDF")
-            )
-        );
+        toral2006.setFiles(List.of(new LinkedFile("non-existing", "path/to/nowhere.pdf", "PDF")));
 
         vapnik2000.setCitationKey("vapnik2000");
-        vapnik2000.setField(
-            StandardField.TITLE,
-            "The Nature of Statistical Learning Theory"
-        );
-        vapnik2000.setField(
-            StandardField.PUBLISHER,
-            "Springer Science + Business Media"
-        );
+        vapnik2000.setField(StandardField.TITLE, "The Nature of Statistical Learning Theory");
+        vapnik2000.setField(StandardField.PUBLISHER, "Springer Science + Business Media");
         vapnik2000.setField(StandardField.AUTHOR, "Vapnik, Vladimir N.");
         vapnik2000.setField(StandardField.DOI, "10.1007/978-1-4757-3264-1");
         vapnik2000.setField(StandardField.OWNER, "Ich");
@@ -129,17 +111,11 @@ private static void initBibEntries() throws IOException {
     void setUp() throws IOException {
         abbreviationRepository = mock(JournalAbbreviationRepository.class);
         filePreferences = mock(FilePreferences.class);
-        when(filePreferences.getUserAndHost())
-            .thenReturn(tempDir.toAbsolutePath().toString());
-        when(filePreferences.shouldStoreFilesRelativeToBibFile())
-            .thenReturn(false);
+        when(filePreferences.getUserAndHost()).thenReturn(tempDir.toAbsolutePath().toString());
+        when(filePreferences.shouldStoreFilesRelativeToBibFile()).thenReturn(false);
 
         xmpPreferences =
-            new XmpPreferences(
-                false,
-                Collections.emptySet(),
-                new SimpleObjectProperty<>(',')
-            );
+            new XmpPreferences(false, Collections.emptySet(), new SimpleObjectProperty<>(','));
         exporter = new XmpPdfExporter(xmpPreferences);
 
         ImportFormatPreferences importFormatPreferences = mock(
@@ -165,23 +141,14 @@ void reset() throws IOException {
         for (BibEntry entry : expectedEntries) {
             entry.clearField(StandardField.FILE);
         }
-        LinkedFile linkedFile = createDefaultLinkedFile(
-            "existing.pdf",
-            tempDir
-        );
+        LinkedFile linkedFile = createDefaultLinkedFile("existing.pdf", tempDir);
         olly2018.setFiles(List.of(linkedFile));
-        toral2006.setFiles(
-            List.of(
-                new LinkedFile("non-existing", "path/to/nowhere.pdf", "PDF")
-            )
-        );
+        toral2006.setFiles(List.of(new LinkedFile("non-existing", "path/to/nowhere.pdf", "PDF")));
     }
 
     @ParameterizedTest
     @MethodSource("provideBibEntriesWithValidPdfFileLinks")
-    void successfulExportToAllFilesOfEntry(
-        BibEntry bibEntryWithValidPdfFileLink
-    ) throws Exception {
+    void successfulExportToAllFilesOfEntry(BibEntry bibEntryWithValidPdfFileLink) throws Exception {
         assertTrue(
             exporter.exportToAllFilesOfEntry(
                 databaseContext,
@@ -195,9 +162,8 @@ void successfulExportToAllFilesOfEntry(
 
     @ParameterizedTest
     @MethodSource("provideBibEntriesWithInvalidPdfFileLinks")
-    void unsuccessfulExportToAllFilesOfEntry(
-        BibEntry bibEntryWithValidPdfFileLink
-    ) throws Exception {
+    void unsuccessfulExportToAllFilesOfEntry(BibEntry bibEntryWithValidPdfFileLink)
+        throws Exception {
         assertFalse(
             exporter.exportToAllFilesOfEntry(
                 databaseContext,
@@ -250,18 +216,10 @@ public void testRoundtripExportImport(Path path) throws Exception {
             PDPage page = new PDPage();
             document.addPage(page);
 
-            try (
-                PDPageContentStream contentStream = new PDPageContentStream(
-                    document,
-                    page
-                )
-            ) {
+            try (PDPageContentStream contentStream = new PDPageContentStream(document, page)) {
                 contentStream.beginText();
                 contentStream.newLineAtOffset(25, 500);
-                contentStream.setFont(
-                    new PDType1Font(Standard14Fonts.FontName.HELVETICA),
-                    12
-                );
+                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."
                 );
@@ -270,21 +228,11 @@ public void testRoundtripExportImport(Path path) throws Exception {
             document.save(path.toString());
         }
         new XmpUtilWriter(xmpPreferences)
-            .writeXmp(
-                path,
-                databaseContext.getEntries(),
-                databaseContext.getDatabase()
-            );
-
-        List<BibEntry> importedEntries = importer
-            .importDatabase(path)
-            .getDatabase()
-            .getEntries();
+            .writeXmp(path, databaseContext.getEntries(), databaseContext.getDatabase());
+
+        List<BibEntry> importedEntries = importer.importDatabase(path).getDatabase().getEntries();
         importedEntries.forEach(bibEntry ->
-            new FieldFormatterCleanup(
-                StandardField.AUTHOR,
-                new NormalizeNamesFormatter()
-            )
+            new FieldFormatterCleanup(StandardField.AUTHOR, new NormalizeNamesFormatter())
                 .cleanup(bibEntry)
         );
 
@@ -297,36 +245,24 @@ public void testRoundtripExportImport(Path path) throws Exception {
     }
 
     public static Stream<Arguments> providePathToNewPDFs() {
-        return Stream.of(
-            Arguments.of(tempDir.resolve("original.pdf").toAbsolutePath())
-        );
+        return Stream.of(Arguments.of(tempDir.resolve("original.pdf").toAbsolutePath()));
     }
 
     public static Stream<Arguments> providePathsToValidPDFs() {
-        return Stream.of(
-            Arguments.of(tempDir.resolve("existing.pdf").toAbsolutePath())
-        );
+        return Stream.of(Arguments.of(tempDir.resolve("existing.pdf").toAbsolutePath()));
     }
 
-    public static Stream<Arguments> providePathsToInvalidPDFs()
-        throws IOException {
-        LinkedFile existingFileThatIsNotLinked = createDefaultLinkedFile(
-            "notlinked.pdf",
-            tempDir
-        );
+    public static Stream<Arguments> providePathsToInvalidPDFs() throws IOException {
+        LinkedFile existingFileThatIsNotLinked = createDefaultLinkedFile("notlinked.pdf", tempDir);
         return Stream.of(
             Arguments.of(Path.of("")),
-            Arguments.of(
-                tempDir.resolve("path/to/nowhere.pdf").toAbsolutePath()
-            ),
+            Arguments.of(tempDir.resolve("path/to/nowhere.pdf").toAbsolutePath()),
             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 {
         return createDefaultLinkedFile("", fileName, tempDir);
     }
 
diff --git a/src/test/java/org/jabref/logic/exporter/YamlExporterTest.java b/src/test/java/org/jabref/logic/exporter/YamlExporterTest.java
index 43414b40e2b..c43ac67f841 100644
--- a/src/test/java/org/jabref/logic/exporter/YamlExporterTest.java
+++ b/src/test/java/org/jabref/logic/exporter/YamlExporterTest.java
@@ -33,10 +33,7 @@ static void setUp() {
                 "yaml",
                 null,
                 StandardFileType.YAML,
-                mock(
-                    LayoutFormatterPreferences.class,
-                    Answers.RETURNS_DEEP_STUBS
-                ),
+                mock(LayoutFormatterPreferences.class, Answers.RETURNS_DEEP_STUBS),
                 SaveOrder.getDefaultSaveOrder(),
                 BlankLineBehaviour.DELETE_BLANKS
             );
@@ -45,8 +42,7 @@ static void setUp() {
     }
 
     @Test
-    public final void exportForNoEntriesWritesNothing(@TempDir Path tempFile)
-        throws Exception {
+    public final void exportForNoEntriesWritesNothing(@TempDir Path tempFile) throws Exception {
         Path file = tempFile.resolve("ThisIsARandomlyNamedFile");
         Files.createFile(file);
         yamlExporter.export(databaseContext, tempFile, Collections.emptyList());
@@ -54,8 +50,7 @@ public final void exportForNoEntriesWritesNothing(@TempDir Path tempFile)
     }
 
     @Test
-    public final void exportsCorrectContent(@TempDir Path tempFile)
-        throws Exception {
+    public final void exportsCorrectContent(@TempDir Path tempFile) throws Exception {
         BibEntry entry = new BibEntry(StandardEntryType.Article)
             .withCitationKey("test")
             .withField(StandardField.AUTHOR, "Test Author")
@@ -65,11 +60,7 @@ public final void exportsCorrectContent(@TempDir Path tempFile)
 
         Path file = tempFile.resolve("RandomFileName");
         Files.createFile(file);
-        yamlExporter.export(
-            databaseContext,
-            file,
-            Collections.singletonList(entry)
-        );
+        yamlExporter.export(databaseContext, file, Collections.singletonList(entry));
 
         List<String> expected = List.of(
             "---",
@@ -88,8 +79,7 @@ public final void exportsCorrectContent(@TempDir Path tempFile)
     }
 
     @Test
-    public final void formatsContentCorrect(@TempDir Path tempFile)
-        throws Exception {
+    public final void formatsContentCorrect(@TempDir Path tempFile) throws Exception {
         BibEntry entry = new BibEntry(StandardEntryType.Misc)
             .withCitationKey("test")
             .withField(StandardField.AUTHOR, "Test Author")
@@ -99,11 +89,7 @@ public final void formatsContentCorrect(@TempDir Path tempFile)
 
         Path file = tempFile.resolve("RandomFileName");
         Files.createFile(file);
-        yamlExporter.export(
-            databaseContext,
-            file,
-            Collections.singletonList(entry)
-        );
+        yamlExporter.export(databaseContext, file, Collections.singletonList(entry));
 
         List<String> expected = List.of(
             "---",
@@ -132,11 +118,7 @@ void passesModifiedCharset(@TempDir Path tempFile) throws Exception {
 
         Path file = tempFile.resolve("RandomFileName");
         Files.createFile(file);
-        yamlExporter.export(
-            databaseContext,
-            file,
-            Collections.singletonList(entry)
-        );
+        yamlExporter.export(databaseContext, file, Collections.singletonList(entry));
 
         List<String> expected = List.of(
             "---",
@@ -165,11 +147,7 @@ void passesModifiedCharsetNull(@TempDir Path tempFile) throws Exception {
 
         Path file = tempFile.resolve("RandomFileName");
         Files.createFile(file);
-        yamlExporter.export(
-            databaseContext,
-            file,
-            Collections.singletonList(entry)
-        );
+        yamlExporter.export(databaseContext, file, Collections.singletonList(entry));
 
         List<String> expected = List.of(
             "---",
diff --git a/src/test/java/org/jabref/logic/formatter/FormatterTest.java b/src/test/java/org/jabref/logic/formatter/FormatterTest.java
index 8ebab2c54b4..cf072ee8e3e 100644
--- a/src/test/java/org/jabref/logic/formatter/FormatterTest.java
+++ b/src/test/java/org/jabref/logic/formatter/FormatterTest.java
@@ -47,12 +47,7 @@ public void allFormatterKeysAreUnique() {
         assertEquals(
             Collections.emptyList(),
             getFormatters()
-                .collect(
-                    Collectors.groupingBy(
-                        Formatter::getKey,
-                        Collectors.counting()
-                    )
-                )
+                .collect(Collectors.groupingBy(Formatter::getKey, Collectors.counting()))
                 .entrySet()
                 .stream()
                 .filter(e -> e.getValue() > 1)
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 c4208c39323..424c53bf3f9 100644
--- a/src/test/java/org/jabref/logic/formatter/bibtexfields/AddBracesFormatterTest.java
+++ b/src/test/java/org/jabref/logic/formatter/bibtexfields/AddBracesFormatterTest.java
@@ -70,10 +70,7 @@ public void formatDoesNotRemoveBracesInBrokenString() {
 
     @Test
     public void formatExample() {
-        assertEquals(
-            "{In CDMA}",
-            formatter.format(formatter.getExampleInput())
-        );
+        assertEquals("{In CDMA}", formatter.format(formatter.getExampleInput()));
     }
 
     @Test
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 acb7f435a1c..bfa9fea3076 100644
--- a/src/test/java/org/jabref/logic/formatter/bibtexfields/CleanupUrlFormatterTest.java
+++ b/src/test/java/org/jabref/logic/formatter/bibtexfields/CleanupUrlFormatterTest.java
@@ -19,10 +19,7 @@ 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
@@ -35,10 +32,7 @@ void extractURLFormLink() {
 
     @Test
     void validUrlUnmodified() {
-        assertEquals(
-            "http://wikipedia.org",
-            formatter.format("http://wikipedia.org")
-        );
+        assertEquals("http://wikipedia.org", formatter.format("http://wikipedia.org"));
     }
 
     @Test
@@ -54,10 +48,7 @@ void latexCommandsNotRemoved() {
     @Test
     void urlencodedSlashesAreAlsoConverted() {
         // the caller has to pay attention that this does not happen
-        assertEquals(
-            "jabref.org/test/test",
-            formatter.format("jabref.org/test%2Ftest")
-        );
+        assertEquals("jabref.org/test/test", formatter.format("jabref.org/test%2Ftest"));
     }
 
     @Test
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 47a17496b0c..7419dfb7ef4 100644
--- a/src/test/java/org/jabref/logic/formatter/bibtexfields/EscapeAmpersandsFormatterTest.java
+++ b/src/test/java/org/jabref/logic/formatter/bibtexfields/EscapeAmpersandsFormatterTest.java
@@ -26,15 +26,11 @@ void formatEscapesAmpersandsIfPresent() throws Exception {
 
     @Test
     void formatExample() {
-        assertEquals(
-            "Text \\& with \\&ampersands",
-            formatter.format(formatter.getExampleInput())
-        );
+        assertEquals("Text \\& with \\&ampersands", formatter.format(formatter.getExampleInput()));
     }
 
     @Test
-    void formatReturnsSameTextInNewUserDefinedLatexCommandIfNoAmpersandsPresent()
-        throws Exception {
+    void formatReturnsSameTextInNewUserDefinedLatexCommandIfNoAmpersandsPresent() throws Exception {
         assertEquals(
             "\\newcommand[1]{Lorem ipsum}",
             formatter.format("\\newcommand[1]{Lorem ipsum}")
@@ -42,11 +38,7 @@ void formatReturnsSameTextInNewUserDefinedLatexCommandIfNoAmpersandsPresent()
     }
 
     @Test
-    void formatReturnsSameTextInLatexCommandIfOneAmpersandPresent()
-        throws Exception {
-        assertEquals(
-            "\\textbf{Lorem\\&ipsum}",
-            formatter.format("\\textbf{Lorem\\&ipsum}")
-        );
+    void formatReturnsSameTextInLatexCommandIfOneAmpersandPresent() throws Exception {
+        assertEquals("\\textbf{Lorem\\&ipsum}", formatter.format("\\textbf{Lorem\\&ipsum}"));
     }
 }
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 faa11d40ff3..d082c8faee2 100644
--- a/src/test/java/org/jabref/logic/formatter/bibtexfields/EscapeDollarSignFormatterTest.java
+++ b/src/test/java/org/jabref/logic/formatter/bibtexfields/EscapeDollarSignFormatterTest.java
@@ -10,8 +10,7 @@
 
 class EscapeDollarSignFormatterTest {
 
-    private EscapeDollarSignFormatter formatter =
-        new EscapeDollarSignFormatter();
+    private EscapeDollarSignFormatter formatter = new EscapeDollarSignFormatter();
 
     private static Stream<Arguments> correctlyFormats() {
         return Stream.of(
@@ -41,9 +40,6 @@ void correctlyFormats(String expected, String input) throws Exception {
 
     @Test
     void formatExample() {
-        assertEquals(
-            "Text\\$with\\$dollar\\$sign",
-            formatter.format(formatter.getExampleInput())
-        );
+        assertEquals("Text\\$with\\$dollar\\$sign", formatter.format(formatter.getExampleInput()));
     }
 }
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 3f08e933ee6..5eaad8cd684 100644
--- a/src/test/java/org/jabref/logic/formatter/bibtexfields/EscapeUnderscoresFormatterTest.java
+++ b/src/test/java/org/jabref/logic/formatter/bibtexfields/EscapeUnderscoresFormatterTest.java
@@ -26,9 +26,6 @@ void formatEscapesUnderscoresIfPresent() throws Exception {
 
     @Test
     void formatExample() {
-        assertEquals(
-            "Text\\_with\\_underscores",
-            formatter.format(formatter.getExampleInput())
-        );
+        assertEquals("Text\\_with\\_underscores", formatter.format(formatter.getExampleInput()));
     }
 }
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 fd2d296242e..4649b59c9fb 100644
--- a/src/test/java/org/jabref/logic/formatter/bibtexfields/HtmlToLatexFormatterTest.java
+++ b/src/test/java/org/jabref/logic/formatter/bibtexfields/HtmlToLatexFormatterTest.java
@@ -24,10 +24,7 @@ public void formatWithoutHtmlCharactersReturnsSameString() {
 
     @Test
     public void formatMultipleHtmlCharacters() {
-        assertEquals(
-            "{{\\aa}}{\\\"{a}}{\\\"{o}}",
-            formatter.format("&aring;&auml;&ouml;")
-        );
+        assertEquals("{{\\aa}}{\\\"{a}}{\\\"{o}}", formatter.format("&aring;&auml;&ouml;"));
     }
 
     @Test
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 a4aeccf6770..7c2f41380c1 100644
--- a/src/test/java/org/jabref/logic/formatter/bibtexfields/LatexCleanupFormatterTest.java
+++ b/src/test/java/org/jabref/logic/formatter/bibtexfields/LatexCleanupFormatterTest.java
@@ -18,15 +18,10 @@ void setUp() {
     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("\\textbf{VLSI} {DSP}", formatter.format("\\textbf{VLSI} {DSP}"));
         assertEquals(
             "A ${\\Delta\\Sigma}$ modulator for {FPGA DSP}",
-            formatter.format(
-                "A ${\\Delta}$${\\Sigma}$ modulator for {FPGA} {DSP}"
-            )
+            formatter.format("A ${\\Delta}$${\\Sigma}$ modulator for {FPGA} {DSP}")
         );
     }
 
@@ -47,9 +42,6 @@ void escapePercentSignOnlnyOnceWithNumber() {
 
     @Test
     void formatExample() {
-        assertEquals(
-            "{VLSI DSP}",
-            formatter.format(formatter.getExampleInput())
-        );
+        assertEquals("{VLSI DSP}", formatter.format(formatter.getExampleInput()));
     }
 }
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 df1e016d419..e53cdbf1b71 100644
--- a/src/test/java/org/jabref/logic/formatter/bibtexfields/NormalizeDateFormatterTest.java
+++ b/src/test/java/org/jabref/logic/formatter/bibtexfields/NormalizeDateFormatterTest.java
@@ -134,9 +134,6 @@ public void formatDateDDdotMdotYYYY() {
 
     @Test
     public void formatExample() {
-        assertEquals(
-            "2003-11-29",
-            formatter.format(formatter.getExampleInput())
-        );
+        assertEquals("2003-11-29", formatter.format(formatter.getExampleInput()));
     }
 }
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 be7af68262c..e88fa11f850 100644
--- a/src/test/java/org/jabref/logic/formatter/bibtexfields/NormalizeEnDashesFormatterTest.java
+++ b/src/test/java/org/jabref/logic/formatter/bibtexfields/NormalizeEnDashesFormatterTest.java
@@ -27,34 +27,22 @@ public void formatExample() {
 
     @Test
     public void formatExampleOfChangelog() {
-        assertEquals(
-            "Example -- illustrative",
-            formatter.format("Example - illustrative")
-        );
+        assertEquals("Example -- illustrative", formatter.format("Example - illustrative"));
     }
 
     @Test
     public void dashesWithinWordsAreKept() {
-        assertEquals(
-            "Example-illustrative",
-            formatter.format("Example-illustrative")
-        );
+        assertEquals("Example-illustrative", formatter.format("Example-illustrative"));
     }
 
     @Test
     public void dashesPreceededByASpaceAreKept() {
-        assertEquals(
-            "Example -illustrative",
-            formatter.format("Example -illustrative")
-        );
+        assertEquals("Example -illustrative", formatter.format("Example -illustrative"));
     }
 
     @Test
     public void dashesFollowedByASpaceAreKept() {
-        assertEquals(
-            "Example- illustrative",
-            formatter.format("Example- illustrative")
-        );
+        assertEquals("Example- illustrative", formatter.format("Example- illustrative"));
     }
 
     @Test
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 4aa69aea4d4..81c23a0d9e2 100644
--- a/src/test/java/org/jabref/logic/formatter/bibtexfields/NormalizeNamesFormatterTest.java
+++ b/src/test/java/org/jabref/logic/formatter/bibtexfields/NormalizeNamesFormatterTest.java
@@ -45,9 +45,7 @@ public void testNormalizeAuthorList() {
 
         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."
-            )
+            formatter.format("Alver, Morten and Alver, Morten O and Alfredsen, JA and Olsen, Y.Y.")
         );
 
         assertEquals(
@@ -57,9 +55,7 @@ public void testNormalizeAuthorList() {
 
         assertEquals(
             "Kolb, Stefan and Lenhard, J{\\\"o}rg and Wirtz, Guido",
-            formatter.format(
-                "Kolb, Stefan and J{\\\"o}rg Lenhard and Wirtz, Guido"
-            )
+            formatter.format("Kolb, Stefan and J{\\\"o}rg Lenhard and Wirtz, Guido")
         );
     }
 
@@ -84,9 +80,7 @@ public void threeAuthorsSeperatedByColon() {
     public 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"
-            )
+            formatter.format("Stefan Kolb and J{\\\"o}rg Lenhard and Guido Wirtz")
         );
     }
 
@@ -137,19 +131,14 @@ public void initialsThenLast() {
 
     @Test
     public void lastThenJuniorThenFirst() {
-        assertEquals(
-            "Name, della, first",
-            formatter.format("Name, della, first")
-        );
+        assertEquals("Name, della, first", formatter.format("Name, della, first"));
     }
 
     @Test
     public void testConcatenationOfAuthorsWithCommas() {
         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."
-            )
+            formatter.format("Ali Babar, M., Dingsøyr, T., Lago, P., van der Vliet, H.")
         );
         assertEquals("Ali Babar, M.", formatter.format("Ali Babar, M."));
     }
@@ -226,9 +215,7 @@ public void testMultipleSpaces() {
     public void testAvoidPreposition() {
         assertEquals(
             "von Zimmer, Hans and van Oberbergern, Michael and zu Berger, Kevin",
-            formatter.format(
-                "Hans von Zimmer, Michael van Oberbergern, Kevin zu Berger"
-            )
+            formatter.format("Hans von Zimmer, Michael van Oberbergern, Kevin zu Berger")
         );
     }
 
@@ -236,9 +223,7 @@ public void testAvoidPreposition() {
     public void testPreposition() {
         assertEquals(
             "von Zimmer, Hans and van Oberbergern, Michael and zu Berger, Kevin",
-            formatter.format(
-                "Hans von Zimmer, Michael van Oberbergern, Kevin zu Berger"
-            )
+            formatter.format("Hans von Zimmer, Michael van Oberbergern, Kevin zu Berger")
         );
     }
 
@@ -254,9 +239,7 @@ public void testOneCommaUntouched() {
     public void testAvoidNameAffixes() {
         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"
-            )
+            formatter.format("Canon der Barbar, Alexander der Große, Peter der Alexander")
         );
     }
 
@@ -288,15 +271,11 @@ public void testSemiCorrectNamesWithSemicolon() {
         );
         assertEquals(
             "Last, First and Last2, First2 and Last3, First3 and Last4, First4",
-            formatter.format(
-                "Last, First; Last2, First2; Last3, First3; First4 Last4"
-            )
+            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"
-            )
+            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 8b470e78ff7..996efec4f71 100644
--- a/src/test/java/org/jabref/logic/formatter/bibtexfields/NormalizePagesFormatterTest.java
+++ b/src/test/java/org/jabref/logic/formatter/bibtexfields/NormalizePagesFormatterTest.java
@@ -76,10 +76,7 @@ private static Stream<Arguments> tests() {
             // This appears in https://doi.org/10.1145/1658373.1658375
             Arguments.of("2:1--2:33", "2:1--2:33"),
             // formatExample
-            Arguments.of(
-                "1--2",
-                new NormalizePagesFormatter().getExampleInput()
-            ),
+            Arguments.of("1--2", new NormalizePagesFormatter().getExampleInput()),
             // replaceDashWithMinus
             Arguments.of("R404--R405", "R404–R405")
         );
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 e6fb3816c76..51eb06f036a 100644
--- a/src/test/java/org/jabref/logic/formatter/bibtexfields/OrdinalsToSuperscriptFormatterTest.java
+++ b/src/test/java/org/jabref/logic/formatter/bibtexfields/OrdinalsToSuperscriptFormatterTest.java
@@ -59,10 +59,7 @@ public void ignoreSuperscriptsInsideWords() {
 
     @Test
     public void formatExample() {
-        assertEquals(
-            "11\\textsuperscript{th}",
-            formatter.format(formatter.getExampleInput())
-        );
+        assertEquals("11\\textsuperscript{th}", formatter.format(formatter.getExampleInput()));
     }
 
     private void expectCorrect(String input, String expected) {
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 381644d1da8..6ce2f9f084a 100644
--- a/src/test/java/org/jabref/logic/formatter/bibtexfields/RegexFormatterTest.java
+++ b/src/test/java/org/jabref/logic/formatter/bibtexfields/RegexFormatterTest.java
@@ -11,10 +11,7 @@ class RegexFormatterTest {
     @Test
     void spacesReplacedCorrectly() {
         formatter = new RegexFormatter("(\" \",\"-\")");
-        assertEquals(
-            "replace-all-spaces",
-            formatter.format("replace all spaces")
-        );
+        assertEquals("replace-all-spaces", formatter.format("replace all spaces"));
     }
 
     @Test
@@ -31,9 +28,7 @@ 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"
-            )
+            formatter.format("replace spaces {not these ones} {or these ones} but these ones")
         );
     }
 
@@ -51,9 +46,7 @@ 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\\}"
-            )
+            formatter.format("replace spaces \\{ these ones\\}, these ones, and \\{ these ones\\}")
         );
     }
 
@@ -62,19 +55,14 @@ 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\\}"
-            )
+            formatter.format("replace spaces {not these ones}, these ones, and \\{ these ones\\}")
         );
     }
 
     @Test
     void formatExample() {
         formatter = new RegexFormatter("(\" \",\"-\")");
-        assertEquals(
-            "Please-replace-the-spaces",
-            formatter.format(formatter.getExampleInput())
-        );
+        assertEquals("Please-replace-the-spaces", formatter.format(formatter.getExampleInput()));
     }
 
     @Test
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 36bb43f65b4..2f8561e9581 100644
--- a/src/test/java/org/jabref/logic/formatter/bibtexfields/ReplaceWithEscapedDoubleQuotesTest.java
+++ b/src/test/java/org/jabref/logic/formatter/bibtexfields/ReplaceWithEscapedDoubleQuotesTest.java
@@ -17,10 +17,7 @@ public void setUp() {
 
     @Test
     public void replacingSingleDoubleQuote() {
-        assertEquals(
-            "single \"\"double quote",
-            formatter.format("single \"double quote")
-        );
+        assertEquals("single \"\"double quote", formatter.format("single \"double quote"));
     }
 
     @Test
@@ -33,10 +30,7 @@ public void replacingMultipleDoubleQuote() {
 
     @Test
     public void replacingSingleDoubleQuoteHavingCommas() {
-        assertEquals(
-            "this \"\"is\"\", a test",
-            formatter.format("this \"is\", a test")
-        );
+        assertEquals("this \"\"is\"\", a test", formatter.format("this \"is\", a test"));
     }
 
     @Test
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 295d9f6daf7..e891578be87 100644
--- a/src/test/java/org/jabref/logic/formatter/bibtexfields/TrimWhitespaceFormatterTest.java
+++ b/src/test/java/org/jabref/logic/formatter/bibtexfields/TrimWhitespaceFormatterTest.java
@@ -53,9 +53,6 @@ public void removeSeparatorSpaces() {
     public void removeMixedWhitespaceChars() {
         assertEquals("whitespace", formatter.format(" \r\t\fwhitespace"));
         assertEquals("whitespace", formatter.format("whitespace \n \r"));
-        assertEquals(
-            "whitespace",
-            formatter.format("   \f\t whitespace  \r \n")
-        );
+        assertEquals("whitespace", formatter.format("   \f\t whitespace  \r \n"));
     }
 }
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 137bd48e064..a889771769d 100644
--- a/src/test/java/org/jabref/logic/formatter/bibtexfields/UnicodeToLatexFormatterTest.java
+++ b/src/test/java/org/jabref/logic/formatter/bibtexfields/UnicodeToLatexFormatterTest.java
@@ -24,10 +24,7 @@ private static Stream<Arguments> testCases() {
             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("M{\\\"{o}}nch", new UnicodeToLatexFormatter().getExampleInput())
         );
     }
 
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 c887c6cc330..4d48631f100 100644
--- a/src/test/java/org/jabref/logic/formatter/casechanger/CapitalizeFormatterTest.java
+++ b/src/test/java/org/jabref/logic/formatter/casechanger/CapitalizeFormatterTest.java
@@ -21,10 +21,7 @@ public void setUp() {
 
     @Test
     public void formatExample() {
-        assertEquals(
-            "I Have {a} Dream",
-            formatter.format(formatter.getExampleInput())
-        );
+        assertEquals("I Have {a} Dream", formatter.format(formatter.getExampleInput()));
     }
 
     @ParameterizedTest(name = "input={0}, formattedStr={1}")
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 2b763b053ca..9fadc721256 100644
--- a/src/test/java/org/jabref/logic/formatter/casechanger/LowerCaseFormatterTest.java
+++ b/src/test/java/org/jabref/logic/formatter/casechanger/LowerCaseFormatterTest.java
@@ -38,9 +38,6 @@ private static Stream<Arguments> provideStringsForFormat() {
 
     @Test
     public void formatExample() {
-        assertEquals(
-            "kde {Amarok}",
-            formatter.format(formatter.getExampleInput())
-        );
+        assertEquals("kde {Amarok}", formatter.format(formatter.getExampleInput()));
     }
 }
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 218bfbf0525..6dd9d78d1cf 100644
--- a/src/test/java/org/jabref/logic/formatter/casechanger/ProtectTermsFormatterTest.java
+++ b/src/test/java/org/jabref/logic/formatter/casechanger/ProtectTermsFormatterTest.java
@@ -47,10 +47,7 @@ public void testCaseSensitivity() {
 
     @Test
     public void formatExample() {
-        assertEquals(
-            "In {CDMA}",
-            formatter.format(formatter.getExampleInput())
-        );
+        assertEquals("In {CDMA}", formatter.format(formatter.getExampleInput()));
     }
 
     @Test
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 3a64e1bb888..ebe66b331e3 100644
--- a/src/test/java/org/jabref/logic/formatter/casechanger/SentenceCaseFormatterTest.java
+++ b/src/test/java/org/jabref/logic/formatter/casechanger/SentenceCaseFormatterTest.java
@@ -47,10 +47,7 @@ private static Stream<Arguments> testData() {
                 "Example case. {EXCLUDED SENTENCE.}",
                 "Example case. {EXCLUDED SENTENCE.}"
             ),
-            Arguments.of(
-                "I have {Aa} dream",
-                new SentenceCaseFormatter().getExampleInput()
-            )
+            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 ad719e866e7..0059ce65612 100644
--- a/src/test/java/org/jabref/logic/formatter/casechanger/TitleCaseFormatterTest.java
+++ b/src/test/java/org/jabref/logic/formatter/casechanger/TitleCaseFormatterTest.java
@@ -62,10 +62,7 @@ private static Stream<Arguments> testData() {
                 "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 Characters", "--test~ing dash--like characters"),
             Arguments.of(
                 "-⸗Test⸗Ing Dash〰Like Cha᐀᐀Racters",
                 "-⸗test⸗ing dash〰like cha᐀᐀racters"
@@ -74,10 +71,7 @@ private static Stream<Arguments> testData() {
                 "︲︲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 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"
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 0eb8a3b50a6..652876a1321 100644
--- a/src/test/java/org/jabref/logic/formatter/casechanger/UnprotectTermsFormatterTest.java
+++ b/src/test/java/org/jabref/logic/formatter/casechanger/UnprotectTermsFormatterTest.java
@@ -43,10 +43,7 @@ private static Stream<Arguments> terms() throws IOException {
                 "Testing BPEL Engine Performance: A Survey",
                 "{Testing {BPEL} Engine Performance: A Survey}"
             ),
-            Arguments.of(
-                "In CDMA",
-                new UnprotectTermsFormatter().getExampleInput()
-            )
+            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 13d0ba750d7..9a0ecc2a2c0 100644
--- a/src/test/java/org/jabref/logic/formatter/casechanger/UpperCaseFormatterTest.java
+++ b/src/test/java/org/jabref/logic/formatter/casechanger/UpperCaseFormatterTest.java
@@ -35,9 +35,6 @@ private static Stream<Arguments> upperCaseTests() {
 
     @Test
     public void formatExample() {
-        assertEquals(
-            "KDE {Amarok}",
-            formatter.format(formatter.getExampleInput())
-        );
+        assertEquals("KDE {Amarok}", formatter.format(formatter.getExampleInput()));
     }
 }
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 bb23a6f2856..16157095045 100644
--- a/src/test/java/org/jabref/logic/formatter/minifier/MinifyNameListFormatterTest.java
+++ b/src/test/java/org/jabref/logic/formatter/minifier/MinifyNameListFormatterTest.java
@@ -22,24 +22,15 @@ public void setUp() {
 
     @ParameterizedTest
     @MethodSource("provideAuthorNames")
-    void minifyAuthorNames(
-        String expectedAuthorNames,
-        String originalAuthorNames
-    ) {
-        assertEquals(
-            expectedAuthorNames,
-            formatter.format(originalAuthorNames)
-        );
+    void minifyAuthorNames(String expectedAuthorNames, String originalAuthorNames) {
+        assertEquals(expectedAuthorNames, formatter.format(originalAuthorNames));
     }
 
     private static Stream<Arguments> provideAuthorNames() {
         return Stream.of(
             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 Jörg Lenhard", "Simon Harrer and Jörg Lenhard"),
             Arguments.of(
                 "Simon Harrer and others",
                 "Simon Harrer and Jörg Lenhard and Guido Wirtz"
@@ -48,10 +39,7 @@ private static Stream<Arguments> provideAuthorNames() {
                 "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("Stefan Kolb and others", new MinifyNameListFormatter().getExampleInput())
         );
     }
 }
diff --git a/src/test/java/org/jabref/logic/git/SlrGitHandlerTest.java b/src/test/java/org/jabref/logic/git/SlrGitHandlerTest.java
index 66f076ea12b..cd63159db17 100644
--- a/src/test/java/org/jabref/logic/git/SlrGitHandlerTest.java
+++ b/src/test/java/org/jabref/logic/git/SlrGitHandlerTest.java
@@ -16,9 +16,7 @@
 
 class SlrGitHandlerTest {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(
-        SlrGitHandlerTest.class
-    );
+    private static final Logger LOGGER = LoggerFactory.getLogger(SlrGitHandlerTest.class);
 
     @TempDir
     Path repositoryPath;
@@ -43,9 +41,7 @@ void calculateDiffOnBranch() throws IOException, GitAPIException {
 
         gitHandler.checkoutBranch("branch1");
         Files.createDirectory(Path.of(repositoryPath.toString(), "TestFolder"));
-        Files.createFile(
-            Path.of(repositoryPath.toString(), "TestFolder", "Test1.txt")
-        );
+        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"
@@ -56,17 +52,12 @@ void calculateDiffOnBranch() throws IOException, GitAPIException {
         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.readString(Path.of(repositoryPath.toString(), "TestFolder", "Test1.txt"))
         );
         gitHandler.createCommitOnCurrentBranch("Commit 2 on branch1", false);
 
         LOGGER.debug(gitHandler.calculatePatchOfNewSearchResults("branch1"));
-        assertEquals(
-            expectedPatch,
-            gitHandler.calculatePatchOfNewSearchResults("branch1")
-        );
+        assertEquals(expectedPatch, gitHandler.calculatePatchOfNewSearchResults("branch1"));
     }
 
     @Test
@@ -104,10 +95,7 @@ void applyPatch() throws IOException, GitAPIException {
         gitHandler.createCommitOnCurrentBranch("Commit on branch2.", false);
 
         gitHandler.checkoutBranch("branch1");
-        gitHandler.appendLatestSearchResultsOntoCurrentBranch(
-            "TestMessage",
-            "branch2"
-        );
+        gitHandler.appendLatestSearchResultsOntoCurrentBranch("TestMessage", "branch2");
 
         assertEquals(
             "This is a new line of text",
diff --git a/src/test/java/org/jabref/logic/help/HelpFileTest.java b/src/test/java/org/jabref/logic/help/HelpFileTest.java
index 60d6d17463d..91bcc98dd05 100644
--- a/src/test/java/org/jabref/logic/help/HelpFileTest.java
+++ b/src/test/java/org/jabref/logic/help/HelpFileTest.java
@@ -25,10 +25,6 @@ void referToValidPage(HelpFile help) throws IOException {
         URL url = new URL(jabrefHelp + help.getPageName());
         HttpURLConnection http = (HttpURLConnection) url.openConnection();
         http.setRequestProperty("User-Agent", URLDownload.USER_AGENT);
-        assertEquals(
-            200,
-            http.getResponseCode(),
-            "Wrong URL: " + url.toString()
-        );
+        assertEquals(200, http.getResponseCode(), "Wrong URL: " + url.toString());
     }
 }
diff --git a/src/test/java/org/jabref/logic/importer/AuthorListParserTest.java b/src/test/java/org/jabref/logic/importer/AuthorListParserTest.java
index c778c99311d..e62c33321b2 100644
--- a/src/test/java/org/jabref/logic/importer/AuthorListParserTest.java
+++ b/src/test/java/org/jabref/logic/importer/AuthorListParserTest.java
@@ -16,19 +16,10 @@ class AuthorListParserTest {
     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("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
-                )
+                new Author("Johann Gottfried", "J. G.", "von", "Berlichingen zu Hornberg", null)
             ),
             Arguments.of(
                 "{Robert and Sons, Inc.}",
@@ -40,23 +31,11 @@ private static Stream<Arguments> parseSingleAuthorCorrectly() {
             ),
             Arguments.of(
                 "de la Vallée Poussin, Jean Charles Gabriel",
-                new Author(
-                    "Jean Charles Gabriel",
-                    "J. C. G.",
-                    "de la",
-                    "Vallée Poussin",
-                    null
-                )
+                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
-                )
+                new Author("J. C. G.", "J. C. G.", "de la", "Vallée Poussin", null)
             ),
             Arguments.of(
                 "{K}ent-{B}oswell, E. S.",
@@ -80,10 +59,7 @@ private static Stream<Arguments> parseSingleAuthorCorrectly() {
 
     @ParameterizedTest
     @MethodSource
-    void parseSingleAuthorCorrectly(
-        String authorsString,
-        Author authorsParsed
-    ) {
+    void parseSingleAuthorCorrectly(String authorsString, Author authorsParsed) {
         assertEquals(AuthorList.of(authorsParsed), parser.parse(authorsString));
     }
 
diff --git a/src/test/java/org/jabref/logic/importer/BibDatabaseFilesTest.java b/src/test/java/org/jabref/logic/importer/BibDatabaseFilesTest.java
index 1d06879317f..1e97091db78 100644
--- a/src/test/java/org/jabref/logic/importer/BibDatabaseFilesTest.java
+++ b/src/test/java/org/jabref/logic/importer/BibDatabaseFilesTest.java
@@ -19,8 +19,7 @@ public class BibDatabaseFilesTest {
 
     @BeforeEach
     public void setUp() {
-        importFormatPreferences =
-            mock(ImportFormatPreferences.class, Answers.RETURNS_DEEP_STUBS);
+        importFormatPreferences = mock(ImportFormatPreferences.class, Answers.RETURNS_DEEP_STUBS);
     }
 
     @Test
@@ -29,21 +28,14 @@ public void resolveStrings() throws IOException {
             FileInputStream stream = new FileInputStream(
                 "src/test/resources/org/jabref/util/twente.bib"
             );
-            InputStreamReader fr = new InputStreamReader(
-                stream,
-                StandardCharsets.UTF_8
-            )
+            InputStreamReader fr = new InputStreamReader(stream, StandardCharsets.UTF_8)
         ) {
-            ParserResult result = new BibtexParser(importFormatPreferences)
-                .parse(fr);
+            ParserResult result = new BibtexParser(importFormatPreferences).parse(fr);
 
             BibDatabase db = result.getDatabase();
 
             assertEquals("Arvind", db.resolveForStrings("#Arvind#"));
-            assertEquals(
-                "Patterson, David",
-                db.resolveForStrings("#Patterson#")
-            );
+            assertEquals("Patterson, David", db.resolveForStrings("#Patterson#"));
             assertEquals(
                 "Arvind and Patterson, David",
                 db.resolveForStrings("#Arvind# and #Patterson#")
diff --git a/src/test/java/org/jabref/logic/importer/FulltextFetchersTest.java b/src/test/java/org/jabref/logic/importer/FulltextFetchersTest.java
index b008591b881..9301224ab86 100644
--- a/src/test/java/org/jabref/logic/importer/FulltextFetchersTest.java
+++ b/src/test/java/org/jabref/logic/importer/FulltextFetchersTest.java
@@ -22,9 +22,7 @@ public class FulltextFetchersTest {
 
     @Test
     public void acceptPdfUrls() throws MalformedURLException {
-        URL pdfUrl = new URL(
-            "http://docs.oasis-open.org/wsbpel/2.0/OS/wsbpel-v2.0-OS.pdf"
-        );
+        URL pdfUrl = new URL("http://docs.oasis-open.org/wsbpel/2.0/OS/wsbpel-v2.0-OS.pdf");
         FulltextFetcher finder = e -> Optional.of(pdfUrl);
         FulltextFetchers fetcher = new FulltextFetchers(Set.of(finder));
         assertEquals(Optional.of(pdfUrl), fetcher.findFullTextPDF(entry));
@@ -32,9 +30,7 @@ public void acceptPdfUrls() throws MalformedURLException {
 
     @Test
     public void rejectNonPdfUrls() throws MalformedURLException {
-        URL pdfUrl = new URL(
-            "https://github.com/JabRef/jabref/blob/master/README.md"
-        );
+        URL pdfUrl = new URL("https://github.com/JabRef/jabref/blob/master/README.md");
         FulltextFetcher finder = e -> Optional.of(pdfUrl);
         FulltextFetchers fetcher = new FulltextFetchers(Set.of(finder));
 
@@ -43,9 +39,7 @@ public void rejectNonPdfUrls() throws MalformedURLException {
 
     @Test
     public void noTrustLevel() throws MalformedURLException {
-        URL pdfUrl = new URL(
-            "http://docs.oasis-open.org/wsbpel/2.0/OS/wsbpel-v2.0-OS.pdf"
-        );
+        URL pdfUrl = new URL("http://docs.oasis-open.org/wsbpel/2.0/OS/wsbpel-v2.0-OS.pdf");
         FulltextFetcher finder = e -> Optional.of(pdfUrl);
         FulltextFetchers fetcher = new FulltextFetchers(Set.of(finder));
 
@@ -56,9 +50,7 @@ public void noTrustLevel() throws MalformedURLException {
     public void higherTrustLevelWins() throws IOException, FetcherException {
         FulltextFetcher finderHigh = mock(FulltextFetcher.class);
         when(finderHigh.getTrustLevel()).thenReturn(TrustLevel.SOURCE);
-        final URL highUrl = new URL(
-            "http://docs.oasis-open.org/wsbpel/2.0/OS/wsbpel-v2.0-OS.pdf"
-        );
+        final URL highUrl = new URL("http://docs.oasis-open.org/wsbpel/2.0/OS/wsbpel-v2.0-OS.pdf");
         when(finderHigh.findFullText(entry)).thenReturn(Optional.of(highUrl));
 
         FulltextFetcher finderLow = mock(FulltextFetcher.class);
@@ -68,9 +60,7 @@ public void higherTrustLevelWins() throws IOException, FetcherException {
         );
         when(finderLow.findFullText(entry)).thenReturn(Optional.of(lowUrl));
 
-        FulltextFetchers fetcher = new FulltextFetchers(
-            Set.of(finderLow, finderHigh)
-        );
+        FulltextFetchers fetcher = new FulltextFetchers(Set.of(finderLow, finderHigh));
 
         // set an (arbitrary) DOI to the test entry to skip side effects inside the "findFullTextPDF" method
         entry.setField(StandardField.DOI, "10.5220/0007903201120130");
diff --git a/src/test/java/org/jabref/logic/importer/ImportDataTest.java b/src/test/java/org/jabref/logic/importer/ImportDataTest.java
index 6624c85469d..f7f390c46f7 100644
--- a/src/test/java/org/jabref/logic/importer/ImportDataTest.java
+++ b/src/test/java/org/jabref/logic/importer/ImportDataTest.java
@@ -31,10 +31,7 @@ public class ImportDataTest {
      */
     @Test
     void testTestingEnvironment() {
-        assertTrue(
-            Files.exists(ImportDataTest.EXISTING_FOLDER),
-            "EXISTING_FOLDER does not exist"
-        );
+        assertTrue(Files.exists(ImportDataTest.EXISTING_FOLDER), "EXISTING_FOLDER does not exist");
         assertTrue(
             Files.isDirectory(ImportDataTest.EXISTING_FOLDER),
             "EXISTING_FOLDER is not a directory"
@@ -58,13 +55,7 @@ void testTestingEnvironment() {
             "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"
-        );
+        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 957e69c161a..fa7d5808d29 100644
--- a/src/test/java/org/jabref/logic/importer/ImportFormatReaderIntegrationTest.java
+++ b/src/test/java/org/jabref/logic/importer/ImportFormatReaderIntegrationTest.java
@@ -38,95 +38,46 @@ void setUp() {
 
     @ParameterizedTest
     @MethodSource("importFormats")
-    void testImportUnknownFormat(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());
-        assertEquals(
-            count,
-            unknownFormat.parserResult().getDatabase().getEntryCount()
+    void testImportUnknownFormat(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()
         );
+        assertEquals(count, unknownFormat.parserResult().getDatabase().getEntryCount());
     }
 
     @ParameterizedTest
     @MethodSource("importFormats")
-    void testImportFormatFromFile(String resource, String format, int count)
-        throws Exception {
-        Path file = Path.of(
-            ImportFormatReaderIntegrationTest.class.getResource(resource)
-                .toURI()
-        );
-        assertEquals(
-            count,
-            reader
-                .importFromFile(format, file)
-                .getDatabase()
-                .getEntries()
-                .size()
-        );
+    void testImportFormatFromFile(String resource, String format, int count) throws Exception {
+        Path file = Path.of(ImportFormatReaderIntegrationTest.class.getResource(resource).toURI());
+        assertEquals(count, reader.importFromFile(format, file).getDatabase().getEntries().size());
     }
 
     @ParameterizedTest
     @MethodSource("importFormats")
-    void testImportUnknownFormatFromString(
-        String resource,
-        String format,
-        int count
-    ) throws Exception {
-        Path file = Path.of(
-            ImportFormatReaderIntegrationTest.class.getResource(resource)
-                .toURI()
-        );
+    void testImportUnknownFormatFromString(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()
+            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/RisImporterTest1.ris", "ris", 1 }
-        );
-        result.add(
-            new Object[] { "fileformat/IsiImporterTest1.isi", "isi", 1 }
-        );
-        result.add(
-            new Object[] {
-                "fileformat/SilverPlatterImporterTest1.txt",
-                "silverplatter",
-                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 }
+            new Object[] { "fileformat/SilverPlatterImporterTest1.txt", "silverplatter", 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 0ebba1baa75..dbb2d07eb6a 100644
--- a/src/test/java/org/jabref/logic/importer/ImportFormatReaderParameterlessTest.java
+++ b/src/test/java/org/jabref/logic/importer/ImportFormatReaderParameterlessTest.java
@@ -29,27 +29,16 @@ void setUp() {
             ImportFormatPreferences.class,
             Answers.RETURNS_DEEP_STUBS
         );
-        reader =
-            new ImportFormatReader(
-                importerPreferences,
-                importFormatPreferences,
-                fileMonitor
-            );
+        reader = new ImportFormatReader(importerPreferences, importFormatPreferences, fileMonitor);
     }
 
     @Test
-    void importUnknownFormatThrowsExceptionIfNoMatchingImporterWasFound()
-        throws Exception {
+    void importUnknownFormatThrowsExceptionIfNoMatchingImporterWasFound() throws Exception {
         Path file = Path.of(
-            ImportFormatReaderParameterlessTest.class.getResource(
-                    "fileformat/emptyFile.xml"
-                )
+            ImportFormatReaderParameterlessTest.class.getResource("fileformat/emptyFile.xml")
                 .toURI()
         );
-        assertThrows(
-            ImportException.class,
-            () -> reader.importUnknownFormat(file, fileMonitor)
-        );
+        assertThrows(ImportException.class, () -> reader.importUnknownFormat(file, fileMonitor));
     }
 
     @Test
@@ -62,18 +51,14 @@ void importUnknownFormatThrowsExceptionIfPathIsNull() {
 
     @Test
     void importUnknownFormatThrowsExceptionIfDataIsNull() {
-        assertThrows(
-            NullPointerException.class,
-            () -> reader.importUnknownFormat(null)
-        );
+        assertThrows(NullPointerException.class, () -> reader.importUnknownFormat(null));
     }
 
     @Test
     void importFromFileWithUnknownFormatThrowsException() {
         assertThrows(
             ImportException.class,
-            () ->
-                reader.importFromFile("someunknownformat", Path.of("somepath"))
+            () -> 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 ef0cd60e5ad..09c78dc3128 100644
--- a/src/test/java/org/jabref/logic/importer/ImporterTest.java
+++ b/src/test/java/org/jabref/logic/importer/ImporterTest.java
@@ -38,9 +38,7 @@ public class ImporterTest {
 
     @ParameterizedTest
     @MethodSource("instancesToTest")
-    public void isRecognizedFormatWithNullForBufferedReaderThrowsException(
-        Importer format
-    ) {
+    public void isRecognizedFormatWithNullForBufferedReaderThrowsException(Importer format) {
         assertThrows(
             NullPointerException.class,
             () -> format.isRecognizedFormat((BufferedReader) null)
@@ -49,20 +47,13 @@ public void isRecognizedFormatWithNullForBufferedReaderThrowsException(
 
     @ParameterizedTest
     @MethodSource("instancesToTest")
-    public void isRecognizedFormatWithNullForStringThrowsException(
-        Importer format
-    ) {
-        assertThrows(
-            NullPointerException.class,
-            () -> format.isRecognizedFormat((String) null)
-        );
+    public void isRecognizedFormatWithNullForStringThrowsException(Importer format) {
+        assertThrows(NullPointerException.class, () -> format.isRecognizedFormat((String) null));
     }
 
     @ParameterizedTest
     @MethodSource("instancesToTest")
-    public void importDatabaseWithNullForBufferedReaderThrowsException(
-        Importer format
-    ) {
+    public void importDatabaseWithNullForBufferedReaderThrowsException(Importer format) {
         assertThrows(
             NullPointerException.class,
             () -> format.importDatabase((BufferedReader) null)
@@ -71,13 +62,8 @@ public void importDatabaseWithNullForBufferedReaderThrowsException(
 
     @ParameterizedTest
     @MethodSource("instancesToTest")
-    public void importDatabaseWithNullForStringThrowsException(
-        Importer format
-    ) {
-        assertThrows(
-            NullPointerException.class,
-            () -> format.importDatabase((String) null)
-        );
+    public void importDatabaseWithNullForStringThrowsException(Importer format) {
+        assertThrows(NullPointerException.class, () -> format.importDatabase((String) null));
     }
 
     @ParameterizedTest
@@ -107,9 +93,7 @@ public void getIdDoesNotContainWhitespace(Importer format) {
 
     @ParameterizedTest
     @MethodSource("instancesToTest")
-    public void getIdStripsSpecialCharactersAndConvertsToLowercase(
-        Importer format
-    ) {
+    public void getIdStripsSpecialCharactersAndConvertsToLowercase(Importer format) {
         Importer importer = mock(Importer.class, Mockito.CALLS_REAL_METHODS);
         when(importer.getName()).thenReturn("*Test-Importer");
         assertEquals("testimporter", importer.getId());
@@ -129,10 +113,7 @@ public static Stream<Importer> instancesToTest() {
             ImportFormatPreferences.class,
             Answers.RETURNS_DEEP_STUBS
         );
-        when(
-            importFormatPreferences.bibEntryPreferences().getKeywordSeparator()
-        )
-            .thenReturn(',');
+        when(importFormatPreferences.bibEntryPreferences().getKeywordSeparator()).thenReturn(',');
         XmpPreferences xmpPreferences = mock(XmpPreferences.class);
         // @formatter:off
         return Stream.of(
diff --git a/src/test/java/org/jabref/logic/importer/OpenDatabaseTest.java b/src/test/java/org/jabref/logic/importer/OpenDatabaseTest.java
index f027520a2a9..f312b3c6b9b 100644
--- a/src/test/java/org/jabref/logic/importer/OpenDatabaseTest.java
+++ b/src/test/java/org/jabref/logic/importer/OpenDatabaseTest.java
@@ -33,36 +33,19 @@ class OpenDatabaseTest {
     private final FileUpdateMonitor fileMonitor = new DummyFileUpdateMonitor();
 
     OpenDatabaseTest() throws URISyntaxException {
-        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()
-            );
+        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()
-            );
+            Path.of(OpenDatabaseTest.class.getResource("jabref-header.bib").toURI());
         bibEncodingWithoutNewline =
-            Path.of(
-                OpenDatabaseTest.class.getResource("encodingWithoutNewline.bib")
-                    .toURI()
-            );
+            Path.of(OpenDatabaseTest.class.getResource("encodingWithoutNewline.bib").toURI());
     }
 
     @BeforeEach
     void setUp() {
-        libraryPreferences =
-            mock(LibraryPreferences.class, Answers.RETURNS_DEEP_STUBS);
-        importFormatPreferences =
-            mock(ImportFormatPreferences.class, Answers.RETURNS_DEEP_STUBS);
+        libraryPreferences = mock(LibraryPreferences.class, Answers.RETURNS_DEEP_STUBS);
+        importFormatPreferences = mock(ImportFormatPreferences.class, Answers.RETURNS_DEEP_STUBS);
     }
 
     @Test
@@ -166,10 +149,7 @@ void correctlyParseEncodingWithoutNewline() throws IOException {
             importFormatPreferences,
             fileMonitor
         );
-        assertEquals(
-            StandardCharsets.US_ASCII,
-            result.getMetaData().getEncoding().get()
-        );
+        assertEquals(StandardCharsets.US_ASCII, result.getMetaData().getEncoding().get());
 
         BibDatabase db = result.getDatabase();
         assertEquals(Optional.of("testPreamble"), db.getPreamble());
diff --git a/src/test/java/org/jabref/logic/importer/QueryParserTest.java b/src/test/java/org/jabref/logic/importer/QueryParserTest.java
index c6cd1cc670f..63a57d42c92 100644
--- a/src/test/java/org/jabref/logic/importer/QueryParserTest.java
+++ b/src/test/java/org/jabref/logic/importer/QueryParserTest.java
@@ -60,9 +60,7 @@ public void convertJournalField() {
     @Test
     public void convertAlphabeticallyFirstJournalField() {
         ComplexSearchQuery searchQuery = parser
-            .parseQueryStringIntoComplexQuery(
-                "journal:Nature journal:\"Complex Networks\""
-            )
+            .parseQueryStringIntoComplexQuery("journal:Nature journal:\"Complex Networks\"")
             .get();
         ComplexSearchQuery expectedQuery = ComplexSearchQuery
             .builder()
@@ -73,13 +71,8 @@ public void convertAlphabeticallyFirstJournalField() {
 
     @Test
     public void convertYearField() {
-        ComplexSearchQuery searchQuery = parser
-            .parseQueryStringIntoComplexQuery("year:2015")
-            .get();
-        ComplexSearchQuery expectedQuery = ComplexSearchQuery
-            .builder()
-            .singleYear(2015)
-            .build();
+        ComplexSearchQuery searchQuery = parser.parseQueryStringIntoComplexQuery("year:2015").get();
+        ComplexSearchQuery expectedQuery = ComplexSearchQuery.builder().singleYear(2015).build();
         assertEquals(expectedQuery, searchQuery);
     }
 
@@ -88,10 +81,7 @@ public void convertNumericallyFirstYearField() {
         ComplexSearchQuery searchQuery = parser
             .parseQueryStringIntoComplexQuery("year:2015 year:2014")
             .get();
-        ComplexSearchQuery expectedQuery = ComplexSearchQuery
-            .builder()
-            .singleYear(2014)
-            .build();
+        ComplexSearchQuery expectedQuery = ComplexSearchQuery.builder().singleYear(2014).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 1e088468781..367d7fbf06b 100644
--- a/src/test/java/org/jabref/logic/importer/WebFetchersTest.java
+++ b/src/test/java/org/jabref/logic/importer/WebFetchersTest.java
@@ -32,12 +32,8 @@
 
 class WebFetchersTest {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(
-        WebFetchersTest.class
-    );
-    private static final Set<String> IGNORED_INACCESSIBLE_FETCHERS = Set.of(
-        "ArXivFetcher$ArXiv"
-    );
+    private static final Logger LOGGER = LoggerFactory.getLogger(WebFetchersTest.class);
+    private static final Set<String> IGNORED_INACCESSIBLE_FETCHERS = Set.of("ArXivFetcher$ArXiv");
 
     private ImportFormatPreferences importFormatPreferences;
     private ImporterPreferences importerPreferences;
@@ -47,10 +43,8 @@ class WebFetchersTest {
 
     @BeforeEach
     void setUp() {
-        importFormatPreferences =
-            mock(ImportFormatPreferences.class, Answers.RETURNS_DEEP_STUBS);
-        importerPreferences =
-            mock(ImporterPreferences.class, Answers.RETURNS_DEEP_STUBS);
+        importFormatPreferences = mock(ImportFormatPreferences.class, Answers.RETURNS_DEEP_STUBS);
+        importerPreferences = mock(ImporterPreferences.class, Answers.RETURNS_DEEP_STUBS);
     }
 
     private Set<Class<?>> getIgnoredInaccessibleClasses() {
@@ -61,10 +55,7 @@ private Set<Class<?>> getIgnoredInaccessibleClasses() {
                 try {
                     return Class.forName(classPath);
                 } catch (ClassNotFoundException e) {
-                    LOGGER.error(
-                        "Some of the ignored classes were not found",
-                        e
-                    );
+                    LOGGER.error("Some of the ignored classes were not found", e);
                     return null;
                 }
             })
@@ -83,9 +74,7 @@ void getIdBasedFetchersReturnsAllFetcherDerivingFromIdBasedFetcher() {
             ClassInfoList controlClasses = scanResult.getClassesImplementing(
                 IdBasedFetcher.class.getCanonicalName()
             );
-            Set<Class<?>> expected = new HashSet<>(
-                controlClasses.loadClasses()
-            );
+            Set<Class<?>> expected = new HashSet<>(controlClasses.loadClasses());
 
             // Some classes implement IdBasedFetcher, but are only accessible to other fetcher, so ignore them
             expected.removeAll(getIgnoredInaccessibleClasses());
@@ -103,9 +92,7 @@ void getIdBasedFetchersReturnsAllFetcherDerivingFromIdBasedFetcher() {
             // Remove the following, because they don't work at the moment
             expected.remove(JstorFetcher.class);
             expected.remove(GoogleScholar.class);
-            expected.remove(
-                CollectionOfComputerScienceBibliographiesFetcher.class
-            );
+            expected.remove(CollectionOfComputerScienceBibliographiesFetcher.class);
 
             assertEquals(expected, getClasses(idFetchers));
         }
@@ -124,9 +111,7 @@ void getEntryBasedFetchersReturnsAllFetcherDerivingFromEntryBasedFetcher() {
             ClassInfoList controlClasses = scanResult.getClassesImplementing(
                 EntryBasedFetcher.class.getCanonicalName()
             );
-            Set<Class<?>> expected = new HashSet<>(
-                controlClasses.loadClasses()
-            );
+            Set<Class<?>> expected = new HashSet<>(controlClasses.loadClasses());
 
             expected.remove(EntryBasedParserFetcher.class);
             expected.remove(MrDLibFetcher.class);
@@ -136,18 +121,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()
             );
-            Set<Class<?>> expected = new HashSet<>(
-                controlClasses.loadClasses()
-            );
+            Set<Class<?>> expected = new HashSet<>(controlClasses.loadClasses());
 
             // Some classes implement SearchBasedFetcher, but are only accessible to other fetcher, so ignore them
             expected.removeAll(getIgnoredInaccessibleClasses());
@@ -158,9 +140,7 @@ void getSearchBasedFetchersReturnsAllFetcherDerivingFromSearchBasedFetcher() {
             // Remove the following, because they don't work atm
             expected.remove(JstorFetcher.class);
             expected.remove(GoogleScholar.class);
-            expected.remove(
-                CollectionOfComputerScienceBibliographiesFetcher.class
-            );
+            expected.remove(CollectionOfComputerScienceBibliographiesFetcher.class);
 
             expected.remove(PagedSearchBasedParserFetcher.class);
             expected.remove(PagedSearchBasedFetcher.class);
@@ -183,9 +163,7 @@ void getFullTextFetchersReturnsAllFetcherDerivingFromFullTextFetcher() {
             ClassInfoList controlClasses = scanResult.getClassesImplementing(
                 FulltextFetcher.class.getCanonicalName()
             );
-            Set<Class<?>> expected = new HashSet<>(
-                controlClasses.loadClasses()
-            );
+            Set<Class<?>> expected = new HashSet<>(controlClasses.loadClasses());
 
             // Some classes implement FulltextFetcher, but are only accessible to other fetcher, so ignore them
             expected.removeAll(getIgnoredInaccessibleClasses());
@@ -200,17 +178,13 @@ void getFullTextFetchersReturnsAllFetcherDerivingFromFullTextFetcher() {
 
     @Test
     void getIdFetchersReturnsAllFetcherDerivingFromIdFetcher() {
-        Set<IdFetcher<?>> idFetchers = WebFetchers.getIdFetchers(
-            importFormatPreferences
-        );
+        Set<IdFetcher<?>> idFetchers = WebFetchers.getIdFetchers(importFormatPreferences);
 
         try (ScanResult scanResult = classGraph.scan()) {
             ClassInfoList controlClasses = scanResult.getClassesImplementing(
                 IdFetcher.class.getCanonicalName()
             );
-            Set<Class<?>> expected = new HashSet<>(
-                controlClasses.loadClasses()
-            );
+            Set<Class<?>> expected = new HashSet<>(controlClasses.loadClasses());
 
             // Some classes implement IdFetcher, but are only accessible to other fetcher, so ignore them
             expected.removeAll(getIgnoredInaccessibleClasses());
@@ -224,9 +198,6 @@ void getIdFetchersReturnsAllFetcherDerivingFromIdFetcher() {
     }
 
     private Set<? extends Class<?>> getClasses(Collection<?> objects) {
-        return objects
-            .stream()
-            .map(Object::getClass)
-            .collect(Collectors.toSet());
+        return objects.stream().map(Object::getClass).collect(Collectors.toSet());
     }
 }
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 8c22cf7803e..67c383816a0 100644
--- a/src/test/java/org/jabref/logic/importer/fetcher/ACMPortalFetcherTest.java
+++ b/src/test/java/org/jabref/logic/importer/fetcher/ACMPortalFetcherTest.java
@@ -52,19 +52,13 @@ void searchByQueryFindsEntry() throws Exception {
                 StandardField.KEYWORDS,
                 "conformance checking, repository data mining, software architecture"
             )
-            .withField(
-                StandardField.PUBLISHER,
-                "Association for Computing Machinery"
-            )
+            .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.URL, "https://doi.org/10.1145/3129790.3129810")
             .withField(StandardField.PAGETOTAL, "7")
             .withField(StandardField.PAGES, "152–158");
 
@@ -75,10 +69,7 @@ void searchByQueryFindsEntry() throws Exception {
         for (BibEntry bibEntry : fetchedEntries) {
             bibEntry.clearField(StandardField.ABSTRACT);
         }
-        assertEquals(
-            Optional.of(searchEntry),
-            fetchedEntries.stream().findFirst()
-        );
+        assertEquals(Optional.of(searchEntry), fetchedEntries.stream().findFirst());
     }
 
     @Test
@@ -86,11 +77,8 @@ void testGetURLForQuery()
         throws FetcherException, MalformedURLException, URISyntaxException, QueryNodeParseException {
         String testQuery = "test query url";
         SyntaxParser parser = new StandardSyntaxParser();
-        URL url = fetcher.getURLForQuery(
-            parser.parse(testQuery, NO_EXPLICIT_FIELD)
-        );
-        String expected =
-            "https://dl.acm.org/action/doSearch?AllField=test+query+url";
+        URL url = fetcher.getURLForQuery(parser.parse(testQuery, NO_EXPLICIT_FIELD));
+        String expected = "https://dl.acm.org/action/doSearch?AllField=test+query+url";
         assertEquals(expected, url.toString());
     }
 
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 21021ce7f41..e29bd6af3b0 100644
--- a/src/test/java/org/jabref/logic/importer/fetcher/ACSTest.java
+++ b/src/test/java/org/jabref/logic/importer/fetcher/ACSTest.java
@@ -30,11 +30,7 @@ void findByDOI() throws IOException {
         entry.setField(StandardField.DOI, "10.1021/bk-2006-STYG.ch014");
 
         assertEquals(
-            Optional.of(
-                new URL(
-                    "https://pubs.acs.org/doi/pdf/10.1021/bk-2006-STYG.ch014"
-                )
-            ),
+            Optional.of(new URL("https://pubs.acs.org/doi/pdf/10.1021/bk-2006-STYG.ch014")),
             finder.findFullText(entry)
         );
     }
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 70d17bd6d48..4f7ff66d1b7 100644
--- a/src/test/java/org/jabref/logic/importer/fetcher/AbstractIsbnFetcherTest.java
+++ b/src/test/java/org/jabref/logic/importer/fetcher/AbstractIsbnFetcherTest.java
@@ -19,14 +19,11 @@ public abstract class AbstractIsbnFetcherTest {
 
     public abstract void authorsAreCorrectlyFormatted() throws Exception;
 
-    public abstract void searchByIdSuccessfulWithShortISBN()
-        throws FetcherException;
+    public abstract void searchByIdSuccessfulWithShortISBN() throws FetcherException;
 
     @Test
     public void searchByIdSuccessfulWithLongISBN() throws FetcherException {
-        Optional<BibEntry> fetchedEntry = fetcher.performSearchById(
-            "978-0321356680"
-        );
+        Optional<BibEntry> fetchedEntry = fetcher.performSearchById("978-0321356680");
         assertEquals(Optional.of(bibEntryEffectiveJava), fetchedEntry);
     }
 
@@ -38,25 +35,16 @@ public void searchByIdReturnsEmptyWithEmptyISBN() throws FetcherException {
 
     @Test
     public void searchByIdThrowsExceptionForShortInvalidISBN() {
-        assertThrows(
-            FetcherException.class,
-            () -> fetcher.performSearchById("123456789")
-        );
+        assertThrows(FetcherException.class, () -> fetcher.performSearchById("123456789"));
     }
 
     @Test
     public void searchByIdThrowsExceptionForLongInvalidISB() {
-        assertThrows(
-            FetcherException.class,
-            () -> fetcher.performSearchById("012345678910")
-        );
+        assertThrows(FetcherException.class, () -> fetcher.performSearchById("012345678910"));
     }
 
     @Test
     public void searchByIdThrowsExceptionForInvalidISBN() {
-        assertThrows(
-            FetcherException.class,
-            () -> fetcher.performSearchById("jabref-4-ever")
-        );
+        assertThrows(FetcherException.class, () -> fetcher.performSearchById("jabref-4-ever"));
     }
 }
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 5f7d09e8507..b83d8c62c32 100644
--- a/src/test/java/org/jabref/logic/importer/fetcher/ApsFetcherTest.java
+++ b/src/test/java/org/jabref/logic/importer/fetcher/ApsFetcherTest.java
@@ -25,11 +25,7 @@ void findFullTextFromDoi() throws Exception {
         BibEntry entry = new BibEntry()
             .withField(StandardField.DOI, "10.1103/PhysRevLett.116.061102");
         assertEquals(
-            Optional.of(
-                new URL(
-                    "https://journals.aps.org/prl/pdf/10.1103/PhysRevLett.116.061102"
-                )
-            ),
+            Optional.of(new URL("https://journals.aps.org/prl/pdf/10.1103/PhysRevLett.116.061102")),
             finder.findFullText(entry)
         );
     }
@@ -39,11 +35,7 @@ void findFullTextFromLowercaseDoi() throws Exception {
         BibEntry entry = new BibEntry()
             .withField(StandardField.DOI, "10.1103/physrevlett.124.029002");
         assertEquals(
-            Optional.of(
-                new URL(
-                    "https://journals.aps.org/prl/pdf/10.1103/PhysRevLett.124.029002"
-                )
-            ),
+            Optional.of(new URL("https://journals.aps.org/prl/pdf/10.1103/PhysRevLett.124.029002")),
             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 b10d0176ad8..256c12a0c07 100644
--- a/src/test/java/org/jabref/logic/importer/fetcher/ArXivFetcherTest.java
+++ b/src/test/java/org/jabref/logic/importer/fetcher/ArXivFetcherTest.java
@@ -38,8 +38,7 @@
 import org.mockito.Mockito;
 
 @FetcherTest
-class ArXivFetcherTest
-    implements SearchBasedFetcherCapabilityTest, PagedSearchFetcherTest {
+class ArXivFetcherTest implements SearchBasedFetcherCapabilityTest, PagedSearchFetcherTest {
 
     private static ImportFormatPreferences importFormatPreferences;
 
@@ -54,12 +53,8 @@ class ArXivFetcherTest
 
     @BeforeAll
     static void setUp() {
-        importFormatPreferences =
-            mock(ImportFormatPreferences.class, Answers.RETURNS_DEEP_STUBS);
-        when(
-            importFormatPreferences.bibEntryPreferences().getKeywordSeparator()
-        )
-            .thenReturn(',');
+        importFormatPreferences = mock(ImportFormatPreferences.class, Answers.RETURNS_DEEP_STUBS);
+        when(importFormatPreferences.bibEntryPreferences().getKeywordSeparator()).thenReturn(',');
         // Used during DOI fetch process
         when(importFormatPreferences.fieldPreferences().getNonWrappableFields())
             .thenReturn(
@@ -86,10 +81,7 @@ void eachSetUp() {
         mainOriginalPaper =
             new BibEntry(StandardEntryType.Article)
                 // ArXiv-original fields
-                .withField(
-                    StandardField.AUTHOR,
-                    "Joeran Beel and Andrew Collins and Akiko Aizawa"
-                )
+                .withField(StandardField.AUTHOR, "Joeran Beel and Andrew Collins and Akiko Aizawa")
                 .withField(
                     StandardField.TITLE,
                     "The Architecture of Mr. DLib's Scientific Recommender-System API"
@@ -100,16 +92,10 @@ void eachSetUp() {
                     "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.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"
-                );
+                .withField(StandardField.KEYWORDS, "cs.IR, cs.AI, cs.DL, cs.LG");
 
         mainResultPaper =
             new BibEntry(StandardEntryType.Article)
@@ -125,10 +111,7 @@ void eachSetUp() {
                     "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.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")
@@ -139,10 +122,7 @@ void eachSetUp() {
                     new UnknownField("copyright"),
                     "arXiv.org perpetual, non-exclusive license"
                 )
-                .withField(
-                    (InternalField.KEY_FIELD),
-                    "https://doi.org/10.48550/arxiv.1811.10364"
-                )
+                .withField((InternalField.KEY_FIELD), "https://doi.org/10.48550/arxiv.1811.10364")
                 .withField(StandardField.YEAR, "2018")
                 .withField(
                     StandardField.KEYWORDS,
@@ -181,10 +161,7 @@ void eachSetUp() {
                 )
                 .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.FILE, ":http\\://arxiv.org/pdf/2003.04601v1:PDF")
                 .withField(StandardField.EPRINTTYPE, "arXiv")
                 .withField(StandardField.EPRINTCLASS, "q-bio.TO")
                 .withField(
@@ -215,18 +192,12 @@ void eachSetUp() {
                 .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.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(InternalField.KEY_FIELD, "https://doi.org/10.48550/arxiv.1405.2249")
                 .withField(
                     new UnknownField("copyright"),
                     "arXiv.org perpetual, non-exclusive license"
@@ -240,12 +211,7 @@ public SearchBasedFetcher getFetcher() {
 
     public List<String> getInputTestAuthors() {
         return Arrays
-            .stream(
-                mainOriginalPaper
-                    .getField(StandardField.AUTHOR)
-                    .get()
-                    .split("and")
-            )
+            .stream(mainOriginalPaper.getField(StandardField.AUTHOR).get().split("and"))
             .map(String::trim)
             .collect(Collectors.toList());
     }
@@ -253,12 +219,7 @@ public List<String> getInputTestAuthors() {
     @Override
     public List<String> getTestAuthors() {
         return Arrays
-            .stream(
-                mainResultPaper
-                    .getField(StandardField.AUTHOR)
-                    .get()
-                    .split("and")
-            )
+            .stream(mainResultPaper.getField(StandardField.AUTHOR).get().split("and"))
             .map(String::trim)
             .collect(Collectors.toList());
     }
@@ -276,15 +237,10 @@ public PagedSearchBasedFetcher getPagedFetcher() {
     @Test
     @Override
     public void supportsAuthorSearch() throws FetcherException {
-        StringJoiner queryBuilder = new StringJoiner(
-            "\" AND author:\"",
-            "author:\"",
-            "\""
-        );
+        StringJoiner queryBuilder = new StringJoiner("\" AND author:\"", "author:\"", "\"");
         getInputTestAuthors().forEach(queryBuilder::add);
 
-        List<BibEntry> result = getFetcher()
-            .performSearch(queryBuilder.toString());
+        List<BibEntry> result = getFetcher().performSearch(queryBuilder.toString());
         ImportCleanup.targeting(BibDatabaseMode.BIBTEX).doPostCleanup(result);
 
         assertFalse(result.isEmpty());
@@ -294,25 +250,17 @@ public void supportsAuthorSearch() throws FetcherException {
             // The co-authors differ, thus we check for the author present at all papers
             getTestAuthors()
                 .forEach(expectedAuthor ->
-                    Assertions.assertTrue(
-                        author.contains(expectedAuthor.replace("\"", ""))
-                    )
+                    Assertions.assertTrue(author.contains(expectedAuthor.replace("\"", "")))
                 );
         });
     }
 
     @Test
-    public void noSupportsAuthorSearchWithLastFirstName()
-        throws FetcherException {
-        StringJoiner queryBuilder = new StringJoiner(
-            "\" AND author:\"",
-            "author:\"",
-            "\""
-        );
+    public void noSupportsAuthorSearchWithLastFirstName() throws FetcherException {
+        StringJoiner queryBuilder = new StringJoiner("\" AND author:\"", "author:\"", "\"");
         getTestAuthors().forEach(queryBuilder::add);
 
-        List<BibEntry> result = getFetcher()
-            .performSearch(queryBuilder.toString());
+        List<BibEntry> result = getFetcher().performSearch(queryBuilder.toString());
         ImportCleanup.targeting(BibDatabaseMode.BIBTEX).doPostCleanup(result);
 
         assertEquals(List.of(), result);
@@ -325,19 +273,13 @@ void findFullTextForEmptyEntryResultsEmptyOptional() throws IOException {
 
     @Test
     void findFullTextRejectsNullParameter() {
-        assertThrows(
-            NullPointerException.class,
-            () -> fetcher.findFullText(null)
-        );
+        assertThrows(NullPointerException.class, () -> fetcher.findFullText(null));
     }
 
     @Test
     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"
-        );
+        entry.setField(StandardField.TITLE, "Pause Point Spectra in DNA Constant-Force Unzipping");
 
         assertEquals(
             Optional.of(new URL("http://arxiv.org/pdf/cond-mat/0406246v1")),
@@ -376,10 +318,7 @@ void findFullTextByEprintWithUnknownDOI() throws IOException {
 
     @Test
     void findFullTextByTitle() throws IOException {
-        entry.setField(
-            StandardField.TITLE,
-            "Pause Point Spectra in DNA Constant-Force Unzipping"
-        );
+        entry.setField(StandardField.TITLE, "Pause Point Spectra in DNA Constant-Force Unzipping");
 
         assertEquals(
             Optional.of(new URL("http://arxiv.org/pdf/cond-mat/0406246v1")),
@@ -401,8 +340,7 @@ void findFullTextByTitleWithCurlyBracket() throws IOException {
     }
 
     @Test
-    void findFullTextByTitleWithColonAndJournalWithoutEprint()
-        throws IOException {
+    void findFullTextByTitleWithColonAndJournalWithoutEprint() throws IOException {
         entry.setField(
             StandardField.TITLE,
             "Bayes-TrEx: a Bayesian Sampling Approach to Model Transparency by Example"
@@ -431,10 +369,7 @@ void findFullTextByTitleWithColonAndUrlWithoutEprint() throws IOException {
 
     @Test
     void findFullTextByTitleAndPartOfAuthor() throws IOException {
-        entry.setField(
-            StandardField.TITLE,
-            "Pause Point Spectra in DNA Constant-Force Unzipping"
-        );
+        entry.setField(StandardField.TITLE, "Pause Point Spectra in DNA Constant-Force Unzipping");
         entry.setField(StandardField.AUTHOR, "Weeks and Lucks");
 
         assertEquals(
@@ -444,8 +379,7 @@ void findFullTextByTitleAndPartOfAuthor() throws IOException {
     }
 
     @Test
-    void findFullTextByTitleWithCurlyBracketAndPartOfAuthor()
-        throws IOException {
+    void findFullTextByTitleWithCurlyBracketAndPartOfAuthor() throws IOException {
         entry.setField(
             StandardField.TITLE,
             "Machine versus {Human} {Attention} in {Deep} {Reinforcement} {Learning} {Tasks}"
@@ -473,10 +407,7 @@ void notFindFullTextByUnknownId() throws IOException {
     @Test
     void findFullTextByDOINotAvailableInCatalog() throws IOException {
         entry.setField(StandardField.DOI, "10.1016/0370-2693(77)90015-6");
-        entry.setField(
-            StandardField.TITLE,
-            "Superspace formulation of supergravity"
-        );
+        entry.setField(StandardField.TITLE, "Superspace formulation of supergravity");
 
         assertEquals(Optional.empty(), fetcher.findFullText(entry));
     }
@@ -525,15 +456,9 @@ void searchEntryByOldId() throws Exception {
                 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.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.FILE, ":http\\://arxiv.org/pdf/hep-ex/0307015v1:PDF")
             .withField(StandardField.EPRINTTYPE, "arXiv")
             .withField(StandardField.EPRINTCLASS, "hep-ex")
             .withField(
@@ -548,34 +473,22 @@ void searchEntryByOldId() throws Exception {
                 "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")
-        );
+        assertEquals(Optional.of(expected), fetcher.performSearchById("hep-ex/0307015"));
     }
 
     @Test
     void searchEntryByIdWith4DigitsAndVersion() throws Exception {
-        assertEquals(
-            Optional.of(sliceTheoremPaper),
-            fetcher.performSearchById("1405.2249v1")
-        );
+        assertEquals(Optional.of(sliceTheoremPaper), fetcher.performSearchById("1405.2249v1"));
     }
 
     @Test
     void searchEntryByIdWith4Digits() throws Exception {
-        assertEquals(
-            Optional.of(sliceTheoremPaper),
-            fetcher.performSearchById("1405.2249")
-        );
+        assertEquals(Optional.of(sliceTheoremPaper), fetcher.performSearchById("1405.2249"));
     }
 
     @Test
     void searchEntryByIdWith4DigitsAndPrefix() throws Exception {
-        assertEquals(
-            Optional.of(sliceTheoremPaper),
-            fetcher.performSearchById("arXiv:1405.2249")
-        );
+        assertEquals(Optional.of(sliceTheoremPaper), fetcher.performSearchById("arXiv:1405.2249"));
     }
 
     @Test
@@ -607,10 +520,7 @@ void searchWithMalformedIdReturnsEmpty() throws Exception {
     void searchIdentifierForSlicePaper() throws Exception {
         sliceTheoremPaper.clearField(StandardField.EPRINT);
 
-        assertEquals(
-            ArXivIdentifier.parse("1405.2249"),
-            fetcher.findIdentifier(sliceTheoremPaper)
-        );
+        assertEquals(ArXivIdentifier.parse("1405.2249"), fetcher.findIdentifier(sliceTheoremPaper));
     }
 
     @Test
@@ -638,9 +548,7 @@ void searchWithHttpsUrl() throws Exception {
     void searchWithHttpsUrlNotTrimmed() throws Exception {
         assertEquals(
             Optional.of(sliceTheoremPaper),
-            fetcher.performSearchById(
-                "https : // arxiv . org / abs / 1405 . 2249 "
-            )
+            fetcher.performSearchById("https : // arxiv . org / abs / 1405 . 2249 ")
         );
     }
 
@@ -667,9 +575,7 @@ public void supportsPhraseSearch() throws Exception {
             "title:Taxonomy AND title:of AND title:Distributed"
         );
         // Phrase search result has to be subset of the default search result
-        assertTrue(
-            resultWithOutPhraseSearch.containsAll(resultWithPhraseSearch)
-        );
+        assertTrue(resultWithOutPhraseSearch.containsAll(resultWithPhraseSearch));
     }
 
     /**
@@ -679,10 +585,7 @@ public void supportsPhraseSearch() throws Exception {
     @Test
     public void supportsPhraseSearchAndMatchesExact() throws Exception {
         BibEntry expected = new BibEntry(StandardEntryType.Article)
-            .withField(
-                StandardField.AUTHOR,
-                "Rafrastara, Fauzi Adi and Deyu, Qi"
-            )
+            .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"
@@ -696,34 +599,22 @@ public void supportsPhraseSearchAndMatchesExact() throws Exception {
             )
             .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.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"
-            );
+            .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(
-            Collections.singletonList(expected),
-            resultWithPhraseSearch
-        );
+        assertEquals(Collections.singletonList(expected), resultWithPhraseSearch);
     }
 
     @Test
@@ -751,10 +642,7 @@ public void supportsBooleanANDSearch() throws Exception {
             )
             .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.FILE, ":http\\://arxiv.org/pdf/2003.04601v1:PDF")
             .withField(StandardField.EPRINTTYPE, "arXiv")
             .withField(StandardField.EPRINTCLASS, "q-bio.TO")
             .withField(
@@ -762,10 +650,7 @@ public void supportsBooleanANDSearch() throws Exception {
                 "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"
-            );
+            .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\""
@@ -776,8 +661,7 @@ public void supportsBooleanANDSearch() throws Exception {
     }
 
     @Test
-    public void retrievePureArxivEntryWhenAllDOIFetchingFails()
-        throws FetcherException {
+    public void retrievePureArxivEntryWhenAllDOIFetchingFails() throws FetcherException {
         BibEntry expected = new BibEntry(StandardEntryType.Article)
             .withField(
                 StandardField.AUTHOR,
@@ -788,48 +672,32 @@ public void retrievePureArxivEntryWhenAllDOIFetchingFails()
                 "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.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.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)
-        );
+        DoiFetcher modifiedDoiFetcher = Mockito.spy(new DoiFetcher(importFormatPreferences));
         when(modifiedDoiFetcher.performSearchById("10.1073/pnas.1617932114"))
-            .thenThrow(
-                new FetcherException("Could not fetch user-assigned DOI")
-            );
+            .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")
-            );
+            .thenThrow(new FetcherException("Could not fetch ArXiv-assigned DOI"));
 
         ArXivFetcher modifiedArXivFetcher = Mockito.spy(
             new ArXivFetcher(importFormatPreferences, modifiedDoiFetcher)
         );
-        assertEquals(
-            Optional.of(expected),
-            modifiedArXivFetcher.performSearchById("1701.00587")
-        );
+        assertEquals(Optional.of(expected), modifiedArXivFetcher.performSearchById("1701.00587"));
     }
 
     @Test
-    public void canReplicateArXivOnlySearchByPassingNullParameter()
-        throws FetcherException {
+    public void canReplicateArXivOnlySearchByPassingNullParameter() throws FetcherException {
         BibEntry expected = new BibEntry(StandardEntryType.Article)
             .withField(
                 StandardField.AUTHOR,
@@ -840,32 +708,20 @@ public void canReplicateArXivOnlySearchByPassingNullParameter()
                 "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.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.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")
-        );
+        ArXivFetcher modifiedArXivFetcher = new ArXivFetcher(importFormatPreferences, null);
+        assertEquals(Optional.of(expected), modifiedArXivFetcher.performSearchById("1701.00587"));
     }
 
     @Test
@@ -881,52 +737,30 @@ public void retrievePartialResultWhenCannotGetInformationFromUserAssignedDOI()
                 "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.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.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.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)
-        );
+        DoiFetcher modifiedDoiFetcher = Mockito.spy(new DoiFetcher(importFormatPreferences));
         when(modifiedDoiFetcher.performSearchById("10.1073/pnas.1617932114"))
-            .thenThrow(
-                new FetcherException("Could not fetch user-assigned DOI")
-            );
+            .thenThrow(new FetcherException("Could not fetch user-assigned DOI"));
 
         ArXivFetcher modifiedArXivFetcher = Mockito.spy(
             new ArXivFetcher(importFormatPreferences, modifiedDoiFetcher)
         );
-        assertEquals(
-            Optional.of(expected),
-            modifiedArXivFetcher.performSearchById("1701.00587")
-        );
+        assertEquals(Optional.of(expected), modifiedArXivFetcher.performSearchById("1701.00587"));
     }
 
     @Test
@@ -942,20 +776,14 @@ public void retrievePartialResultWhenCannotGetInformationFromArXivAssignedDOI()
                 "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.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.FILE, ":http\\://arxiv.org/pdf/1701.00587v1:PDF")
             .withField(StandardField.EPRINTTYPE, "arXiv")
             .withField(StandardField.EPRINTCLASS, "q-bio.CB")
             .withField(StandardField.KEYWORDS, "q-bio.CB")
@@ -963,27 +791,17 @@ public void retrievePartialResultWhenCannotGetInformationFromArXivAssignedDOI()
             .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.PUBLISHER, "Proceedings of the National Academy of Sciences")
             .withField(StandardField.PAGES, "15000--15005")
             .withField(StandardField.NUMBER, "52");
 
-        DoiFetcher modifiedDoiFetcher = Mockito.spy(
-            new DoiFetcher(importFormatPreferences)
-        );
+        DoiFetcher modifiedDoiFetcher = Mockito.spy(new DoiFetcher(importFormatPreferences));
         when(modifiedDoiFetcher.performSearchById("10.48550/arXiv.1701.00587"))
-            .thenThrow(
-                new FetcherException("Could not fetch ArXiv-assigned DOI")
-            );
+            .thenThrow(new FetcherException("Could not fetch ArXiv-assigned DOI"));
 
         ArXivFetcher modifiedArXivFetcher = Mockito.spy(
             new ArXivFetcher(importFormatPreferences, modifiedDoiFetcher)
         );
-        assertEquals(
-            Optional.of(expected),
-            modifiedArXivFetcher.performSearchById("1701.00587")
-        );
+        assertEquals(Optional.of(expected), modifiedArXivFetcher.performSearchById("1701.00587"));
     }
 }
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 2e1e6943cf5..13d7b929d30 100644
--- a/src/test/java/org/jabref/logic/importer/fetcher/AstrophysicsDataSystemTest.java
+++ b/src/test/java/org/jabref/logic/importer/fetcher/AstrophysicsDataSystemTest.java
@@ -38,25 +38,15 @@ public void setUp() throws Exception {
             ImportFormatPreferences.class,
             Answers.RETURNS_DEEP_STUBS
         );
-        ImporterPreferences importerPreferences = mock(
-            ImporterPreferences.class
-        );
-        when(importerPreferences.getApiKeys())
-            .thenReturn(FXCollections.emptyObservableSet());
+        ImporterPreferences importerPreferences = mock(ImporterPreferences.class);
+        when(importerPreferences.getApiKeys()).thenReturn(FXCollections.emptyObservableSet());
 
-        fetcher =
-            new AstrophysicsDataSystem(
-                importFormatPreferences,
-                importerPreferences
-            );
+        fetcher = new AstrophysicsDataSystem(importFormatPreferences, importerPreferences);
 
         diezSliceTheoremEntry =
             new BibEntry(StandardEntryType.Article)
                 .withCitationKey("2018arXiv181204698D")
-                .withField(
-                    StandardField.AUTHOR,
-                    "Diez, Tobias and Rudolph, Gerd"
-                )
+                .withField(StandardField.AUTHOR, "Diez, Tobias and Rudolph, Gerd")
                 .withField(
                     StandardField.TITLE,
                     "Slice theorem and orbit type stratification in infinite dimensions"
@@ -86,18 +76,12 @@ public void setUp() throws Exception {
         famaeyMcGaughEntry =
             new BibEntry(StandardEntryType.Article)
                 .withCitationKey("2012LRR....15...10F")
-                .withField(
-                    StandardField.AUTHOR,
-                    "Famaey, Beno{\\^\\i}t and McGaugh, Stacy S."
-                )
+                .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.JOURNAL, "Living Reviews in Relativity")
                 .withField(StandardField.YEAR, "2012")
                 .withField(StandardField.VOLUME, "15")
                 .withField(StandardField.MONTH, "#sep#")
@@ -174,10 +158,7 @@ public void setUp() throws Exception {
                     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.AUTHOR, "Ingersoll, A.~P. and Pollard, D.")
                 .withField(StandardField.DOI, "10.1016/0019-1035(82)90169-5")
                 .withField(StandardField.JOURNAL, "\\icarus")
                 .withField(
@@ -237,9 +218,7 @@ public void testGetName() {
 
     @Test
     public void searchByQueryFindsEntry() throws Exception {
-        List<BibEntry> fetchedEntries = fetcher.performSearch(
-            "Diez slice theorem Lie"
-        );
+        List<BibEntry> fetchedEntries = fetcher.performSearch("Diez slice theorem Lie");
         assertFalse(fetchedEntries.isEmpty());
         assertTrue(fetchedEntries.contains(diezSliceTheoremEntry));
     }
@@ -259,11 +238,8 @@ public void searchByEntryFindsEntry() throws Exception {
 
     @Test
     public void testPerformSearchByFamaeyMcGaughEntry() throws Exception {
-        Optional<BibEntry> fetchedEntry = fetcher.performSearchById(
-            "10.12942/lrr-2012-10"
-        );
-        fetchedEntry.ifPresent(entry -> entry.clearField(StandardField.ABSTRACT)
-        ); // Remove abstract due to copyright
+        Optional<BibEntry> fetchedEntry = fetcher.performSearchById("10.12942/lrr-2012-10");
+        fetchedEntry.ifPresent(entry -> entry.clearField(StandardField.ABSTRACT)); // Remove abstract due to copyright
         assertEquals(Optional.of(famaeyMcGaughEntry), fetchedEntry);
     }
 
@@ -275,77 +251,46 @@ public void testPerformSearchByIdEmptyDOI() throws Exception {
 
     @Test
     public void testPerformSearchByIdInvalidDoi() throws Exception {
-        assertEquals(
-            Optional.empty(),
-            fetcher.performSearchById("this.doi.will.fail")
-        );
+        assertEquals(Optional.empty(), fetcher.performSearchById("this.doi.will.fail"));
     }
 
     @Test
     public void testPerformSearchBySunWelchEntry() throws Exception {
-        Optional<BibEntry> fetchedEntry = fetcher.performSearchById(
-            "10.1038/nmat3160"
-        );
-        fetchedEntry.ifPresent(entry -> entry.clearField(StandardField.ABSTRACT)
-        ); // Remove abstract due to copyright
+        Optional<BibEntry> fetchedEntry = fetcher.performSearchById("10.1038/nmat3160");
+        fetchedEntry.ifPresent(entry -> entry.clearField(StandardField.ABSTRACT)); // Remove abstract due to copyright
         assertEquals(Optional.of(sunWelchEntry), fetchedEntry);
     }
 
     @Test
     public void testPerformSearchByXiongSunEntry() throws Exception {
-        Optional<BibEntry> fetchedEntry = fetcher.performSearchById(
-            "10.1109/TGRS.2006.890567"
-        );
+        Optional<BibEntry> fetchedEntry = fetcher.performSearchById("10.1109/TGRS.2006.890567");
         assertEquals(Optional.of(xiongSunEntry), fetchedEntry);
     }
 
     @Test
     public void testPerformSearchByIngersollPollardEntry() throws Exception {
-        Optional<BibEntry> fetchedEntry = fetcher.performSearchById(
-            "10.1016/0019-1035(82)90169-5"
-        );
+        Optional<BibEntry> fetchedEntry = fetcher.performSearchById("10.1016/0019-1035(82)90169-5");
         assertEquals(Optional.of(ingersollPollardEntry), fetchedEntry);
     }
 
     @Test
     public void testPerformSearchByLuceyPaulEntry() throws Exception {
-        Optional<BibEntry> fetchedEntry = fetcher.performSearchById(
-            "2000JGR...10520297L"
-        );
+        Optional<BibEntry> fetchedEntry = fetcher.performSearchById("2000JGR...10520297L");
         assertEquals(Optional.of(luceyPaulEntry), fetchedEntry);
     }
 
     @Test
     public void performSearchByQueryPaged_searchLimitsSize() throws Exception {
         Page<BibEntry> page = fetcher.performSearchPaged("author:\"A\"", 0);
-        assertEquals(
-            fetcher.getPageSize(),
-            page.getSize(),
-            "fetcher return wrong page size"
-        );
+        assertEquals(fetcher.getPageSize(), page.getSize(), "fetcher return wrong page size");
     }
 
     @Test
-    public void performSearchByQueryPaged_invalidAuthorsReturnEmptyPages()
-        throws Exception {
-        Page<BibEntry> page = fetcher.performSearchPaged(
-            "author:\"ThisAuthorWillNotBeFound\"",
-            0
-        );
-        Page<BibEntry> page5 = fetcher.performSearchPaged(
-            "author:\"ThisAuthorWillNotBeFound\"",
-            5
-        );
-        assertEquals(
-            0,
-            page.getSize(),
-            "fetcher doesnt return empty pages for invalid author"
-        );
-        assertEquals(
-            0,
-            page5.getSize(),
-            "fetcher doesnt return empty pages for invalid author"
-        );
+    public void performSearchByQueryPaged_invalidAuthorsReturnEmptyPages() throws Exception {
+        Page<BibEntry> page = fetcher.performSearchPaged("author:\"ThisAuthorWillNotBeFound\"", 0);
+        Page<BibEntry> page5 = fetcher.performSearchPaged("author:\"ThisAuthorWillNotBeFound\"", 5);
+        assertEquals(0, page.getSize(), "fetcher doesnt return empty pages for invalid author");
+        assertEquals(0, page5.getSize(), "fetcher doesnt return empty pages for invalid author");
     }
 
     @Override
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 276eadfdae3..81902f9442c 100644
--- a/src/test/java/org/jabref/logic/importer/fetcher/BiodiversityLibraryTest.java
+++ b/src/test/java/org/jabref/logic/importer/fetcher/BiodiversityLibraryTest.java
@@ -33,11 +33,8 @@ public class BiodiversityLibraryTest {
 
     @BeforeEach
     void setUp() {
-        ImporterPreferences importerPreferences = mock(
-            ImporterPreferences.class
-        );
-        when(importerPreferences.getApiKeys())
-            .thenReturn(FXCollections.emptyObservableSet());
+        ImporterPreferences importerPreferences = mock(ImporterPreferences.class);
+        when(importerPreferences.getApiKeys()).thenReturn(FXCollections.emptyObservableSet());
         fetcher = new BiodiversityLibrary(importerPreferences);
     }
 
@@ -55,8 +52,7 @@ public void biodiversityHeritageApiKeyIsNotEmpty() {
     }
 
     @Test
-    public void baseURLConstruction()
-        throws MalformedURLException, URISyntaxException {
+    public void baseURLConstruction() throws MalformedURLException, URISyntaxException {
         String expected = fetcher
             .getTestUrl()
             .concat(buildInfo.biodiversityHeritageApiKey)
@@ -67,8 +63,7 @@ public void baseURLConstruction()
 
     @ParameterizedTest
     @ValueSource(strings = { "1234", "331", "121" })
-    public void getPartMetadaUrl(String id)
-        throws MalformedURLException, URISyntaxException {
+    public void getPartMetadaUrl(String id) throws MalformedURLException, URISyntaxException {
         String expected = fetcher
             .getTestUrl()
             .concat(buildInfo.biodiversityHeritageApiKey)
@@ -76,16 +71,12 @@ public void getPartMetadaUrl(String id)
             .concat("&op=GetPartMetadata&pages=f&names=f")
             .concat("&id=");
 
-        assertEquals(
-            expected.concat(id),
-            fetcher.getPartMetadataURL(id).toString()
-        );
+        assertEquals(expected.concat(id), fetcher.getPartMetadataURL(id).toString());
     }
 
     @ParameterizedTest
     @ValueSource(strings = { "1234", "4321", "331" })
-    public void getItemMetadaUrl(String id)
-        throws MalformedURLException, URISyntaxException {
+    public void getItemMetadaUrl(String id) throws MalformedURLException, URISyntaxException {
         String expected = fetcher
             .getTestUrl()
             .concat(buildInfo.biodiversityHeritageApiKey)
@@ -93,19 +84,13 @@ public void getItemMetadaUrl(String id)
             .concat("&op=GetItemMetadata&pages=f&ocr=f&ocr=f")
             .concat("&id=");
 
-        assertEquals(
-            expected.concat(id),
-            fetcher.getItemMetadataURL(id).toString()
-        );
+        assertEquals(expected.concat(id), fetcher.getItemMetadataURL(id).toString());
     }
 
     @Test
     public void testPerformSearch() throws FetcherException {
         BibEntry expected = new BibEntry(StandardEntryType.Article)
-            .withField(
-                StandardField.AUTHOR,
-                "Clark, John L. (John Littner)  and Neill, David A. "
-            )
+            .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")
@@ -113,19 +98,13 @@ public void testPerformSearch() throws FetcherException {
                 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.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)").get(0)
-        );
+        assertEquals(expected, fetcher.performSearch("Amanoa condorensis (Phyllanthaceae)").get(0));
     }
 
     @Test
@@ -134,10 +113,7 @@ public void jsonResultToBibEntry() {
             "{\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.TITLE, "The Cocoons of Cionus Scrophulariae")
             .withField(StandardField.AUTHOR, "Dimmock, George, ")
             .withField(StandardField.PAGES, "411--413")
             .withField(StandardField.DATE, "1882")
@@ -206,20 +182,11 @@ public void jsonResultToBibEntry() {
             );
         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.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,"
-                );
+                .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 d8e5b7363d9..473724a92f4 100644
--- a/src/test/java/org/jabref/logic/importer/fetcher/BvbFetcherTest.java
+++ b/src/test/java/org/jabref/logic/importer/fetcher/BvbFetcherTest.java
@@ -43,10 +43,7 @@ public void setUp() {
             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.SUBTITLE, "best practices für die Java-Plattform")
                 .withField(StandardField.AUTHOR, "Bloch, Joshua")
                 .withField(StandardField.TITLEADDON, "Joshua Bloch")
                 .withField(
@@ -84,17 +81,13 @@ public void setUp() {
 
     @Test
     public void testGetName() {
-        assertEquals(
-            "Bibliotheksverbund Bayern (Experimental)",
-            fetcher.getName()
-        );
+        assertEquals("Bibliotheksverbund Bayern (Experimental)", fetcher.getName());
     }
 
     @Test
     public void simpleSearchQueryURLCorrect() throws Exception {
         String query = "java jdk";
-        QueryNode luceneQuery = new StandardSyntaxParser()
-            .parse(query, NO_EXPLICIT_FIELD);
+        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+jdk&maximumRecords=30",
@@ -105,8 +98,7 @@ public void simpleSearchQueryURLCorrect() throws Exception {
     @Test
     public void complexSearchQueryURLCorrect() throws Exception {
         String query = "title:jdk";
-        QueryNode luceneQuery = new StandardSyntaxParser()
-            .parse(query, NO_EXPLICIT_FIELD);
+        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",
@@ -115,11 +107,8 @@ public void complexSearchQueryURLCorrect() throws Exception {
     }
 
     @Test
-    public void testPerformSearchMatchingMultipleEntries()
-        throws FetcherException {
-        List<BibEntry> searchResult = fetcher.performSearch(
-            "effective java bloch"
-        );
+    public void testPerformSearchMatchingMultipleEntries() throws FetcherException {
+        List<BibEntry> searchResult = fetcher.performSearch("effective java bloch");
         assertEquals(bibEntryISBN9783960886402, searchResult.get(0));
         assertEquals(bibEntryISBN0134685997, searchResult.get(1));
     }
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 9a91c0e26ed..b01b21bc002 100644
--- a/src/test/java/org/jabref/logic/importer/fetcher/CiteSeerTest.java
+++ b/src/test/java/org/jabref/logic/importer/fetcher/CiteSeerTest.java
@@ -24,17 +24,10 @@ class CiteSeerTest {
 
     @Test
     void searchByQueryFindsEntryRigorousDerivation() throws Exception {
-        String title =
-            "RIGOROUS DERIVATION FROM LANDAU-DE GENNES THEORY TO ERICKSEN-LESLIE THEORY";
+        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.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")
@@ -49,15 +42,9 @@ void searchByQueryFindsEntryRigorousDerivation() throws Exception {
     @Test
     void searchByQueryFindsEntryCopingTheoryAndResearch() throws Exception {
         BibEntry expected = new BibEntry(StandardEntryType.Misc)
-            .withField(
-                StandardField.DOI,
-                "c16e0888b17cb2c689e5dfa4e2be4fdffb23869e"
-            )
+            .withField(StandardField.DOI, "c16e0888b17cb2c689e5dfa4e2be4fdffb23869e")
             .withField(StandardField.AUTHOR, "Lazarus, Richard S.")
-            .withField(
-                StandardField.TITLE,
-                "Coping theory and research: Past, present, and future"
-            )
+            .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"
@@ -103,8 +90,7 @@ void searchWithSortingByYearAndYearRange() throws FetcherException {
         while (fetchedEntriesIter.hasNext()) {
             BibEntry laterEntry = fetchedEntriesIter.next();
             if (
-                recentEntry.hasField(StandardField.YEAR) &&
-                laterEntry.hasField(StandardField.YEAR)
+                recentEntry.hasField(StandardField.YEAR) && laterEntry.hasField(StandardField.YEAR)
             ) {
                 Integer recentYear = Integer.parseInt(
                     recentEntry.getField(StandardField.YEAR).orElse("0")
@@ -121,10 +107,7 @@ void searchWithSortingByYearAndYearRange() throws FetcherException {
     @Test
     void findByIdAsDOI() throws FetcherException, IOException {
         BibEntry entry = new BibEntry(StandardEntryType.Misc)
-            .withField(
-                StandardField.DOI,
-                "c16e0888b17cb2c689e5dfa4e2be4fdffb23869e"
-            );
+            .withField(StandardField.DOI, "c16e0888b17cb2c689e5dfa4e2be4fdffb23869e");
         Optional<URL> expected = Optional.of(
             new URL(
                 "https://citeseerx.ist.psu.edu/document?repid=rep1&type=pdf&doi=c16e0888b17cb2c689e5dfa4e2be4fdffb23869e"
@@ -142,9 +125,7 @@ void findBySourceURL() throws FetcherException, IOException {
                 "http://intl.psychosomaticmedicine.org/content/55/3/234.full.pdf"
             );
         Optional<URL> expected = Optional.of(
-            new URL(
-                "http://intl.psychosomaticmedicine.org/content/55/3/234.full.pdf"
-            )
+            new URL("http://intl.psychosomaticmedicine.org/content/55/3/234.full.pdf")
         );
         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 45f1e2ac72f..68130e53dfa 100644
--- a/src/test/java/org/jabref/logic/importer/fetcher/CollectionOfComputerScienceBibliographiesFetcherTest.java
+++ b/src/test/java/org/jabref/logic/importer/fetcher/CollectionOfComputerScienceBibliographiesFetcherTest.java
@@ -38,22 +38,13 @@ public void setUp() {
             ImportFormatPreferences.class,
             Answers.RETURNS_DEEP_STUBS
         );
-        when(
-            importFormatPreferences.bibEntryPreferences().getKeywordSeparator()
-        )
-            .thenReturn(',');
-        fetcher =
-            new CollectionOfComputerScienceBibliographiesFetcher(
-                importFormatPreferences
-            );
+        when(importFormatPreferences.bibEntryPreferences().getKeywordSeparator()).thenReturn(',');
+        fetcher = new CollectionOfComputerScienceBibliographiesFetcher(importFormatPreferences);
     }
 
     @Test
     public void getNameReturnsCorrectName() {
-        assertEquals(
-            "Collection of Computer Science Bibliographies",
-            fetcher.getName()
-        );
+        assertEquals("Collection of Computer Science Bibliographies", fetcher.getName());
     }
 
     @Test
@@ -61,8 +52,7 @@ public void getUrlForQueryReturnsCorrectUrl()
         throws MalformedURLException, URISyntaxException, FetcherException, QueryNodeParseException {
         String query = "java jdk";
         URL url = fetcher.getURLForQuery(
-            new StandardSyntaxParser()
-                .parse(query, AbstractQueryTransformer.NO_EXPLICIT_FIELD)
+            new StandardSyntaxParser().parse(query, AbstractQueryTransformer.NO_EXPLICIT_FIELD)
         );
         assertEquals(
             "http://liinwww.ira.uka.de/bibliography/rss?query=java+jdk&sort=score",
@@ -71,8 +61,7 @@ public void getUrlForQueryReturnsCorrectUrl()
     }
 
     @Test
-    public void performSearchReturnsMatchingMultipleEntries()
-        throws FetcherException {
+    public void performSearchReturnsMatchingMultipleEntries() throws FetcherException {
         List<BibEntry> searchResult = fetcher.performSearch("jabref");
 
         BibEntry secondBibEntry = new BibEntry(StandardEntryType.Article)
@@ -114,27 +103,12 @@ public void performSearchReturnsMatchingMultipleEntries()
                 " 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.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("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,
@@ -145,10 +119,7 @@ public void performSearchReturnsMatchingMultipleEntries()
                 "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.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
@@ -158,17 +129,14 @@ public void performSearchReturnsMatchingMultipleEntries()
                 .stream()
                 .filter(bibEntry -> {
                     String citeKey = bibEntry.getCitationKey().get();
-                    return citeKey.equals(
-                        secondBibEntry.getCitationKey().get()
-                    );
+                    return citeKey.equals(secondBibEntry.getCitationKey().get());
                 })
                 .collect(Collectors.toSet())
         );
     }
 
     @Test
-    public void performSearchReturnsEmptyListForEmptySearch()
-        throws FetcherException {
+    public void performSearchReturnsEmptyListForEmptySearch() throws FetcherException {
         List<BibEntry> searchResult = fetcher.performSearch("");
         assertEquals(Collections.emptyList(), searchResult);
     }
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 b1ff7b2b73a..00715e3a60b 100644
--- a/src/test/java/org/jabref/logic/importer/fetcher/CollectionOfComputerScienceBibliographiesParserTest.java
+++ b/src/test/java/org/jabref/logic/importer/fetcher/CollectionOfComputerScienceBibliographiesParserTest.java
@@ -22,20 +22,16 @@
 public class CollectionOfComputerScienceBibliographiesParserTest {
 
     @Test
-    public void parseEntriesReturnsEmptyListIfXmlHasNoResults()
-        throws Exception {
+    public void parseEntriesReturnsEmptyListIfXmlHasNoResults() throws Exception {
         parseXmlAndCheckResults(
             "collection_of_computer_science_bibliographies_empty_result.xml",
             Collections.emptyList()
         );
     }
 
-    @Disabled(
-        "Parse/fetcher remote side does not return anything valid for the link"
-    )
+    @Disabled("Parse/fetcher remote side does not return anything valid for the link")
     @Test
-    public void parseEntriesReturnsOneBibEntryInListIfXmlHasSingleResult()
-        throws Exception {
+    public void parseEntriesReturnsOneBibEntryInListIfXmlHasSingleResult() throws Exception {
         parseXmlAndCheckResults(
             "collection_of_computer_science_bibliographies_single_result.xml",
             Collections.singletonList(
@@ -56,27 +52,18 @@ public void parseEntriesReturnsMultipleBibEntriesInListIfXmlHasMultipleResults()
         );
     }
 
-    private void parseXmlAndCheckResults(
-        String xmlName,
-        List<String> resourceNames
-    ) throws Exception {
+    private void parseXmlAndCheckResults(String xmlName, List<String> resourceNames)
+        throws Exception {
         ImportFormatPreferences importFormatPreferences = mock(
             ImportFormatPreferences.class,
             Answers.RETURNS_DEEP_STUBS
         );
-        when(
-            importFormatPreferences.bibEntryPreferences().getKeywordSeparator()
-        )
-            .thenReturn(',');
+        when(importFormatPreferences.bibEntryPreferences().getKeywordSeparator()).thenReturn(',');
 
         InputStream is =
-            CollectionOfComputerScienceBibliographiesParserTest.class.getResourceAsStream(
-                    xmlName
-                );
+            CollectionOfComputerScienceBibliographiesParserTest.class.getResourceAsStream(xmlName);
         CollectionOfComputerScienceBibliographiesParser parser =
-            new CollectionOfComputerScienceBibliographiesParser(
-                importFormatPreferences
-            );
+            new CollectionOfComputerScienceBibliographiesParser(importFormatPreferences);
         List<BibEntry> entries = parser.parseEntries(is);
         assertEquals(resourceNames.size(), entries.size());
         assertNotNull(entries);
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 110ea4fb8ac..7613a96df47 100644
--- a/src/test/java/org/jabref/logic/importer/fetcher/CompositeIdFetcherTest.java
+++ b/src/test/java/org/jabref/logic/importer/fetcher/CompositeIdFetcherTest.java
@@ -31,9 +31,7 @@ class CompositeIdFetcherTest {
 
     private CompositeIdFetcher compositeIdFetcher;
 
-    public static Stream<
-        Arguments
-    > performSearchByIdReturnsCorrectEntryForIdentifier() {
+    public static Stream<Arguments> performSearchByIdReturnsCorrectEntryForIdentifier() {
         return Stream.of(
             Arguments.arguments(
                 "performSearchByIdReturnsCorrectEntryForArXivId",
@@ -51,14 +49,8 @@ > performSearchByIdReturnsCorrectEntryForIdentifier() {
                     .withField(StandardField.MONTH, "aug")
                     .withField(StandardField.NUMBER, "2")
                     .withField(StandardField.VOLUME, "934")
-                    .withField(
-                        StandardField.PUBLISHER,
-                        "American Astronomical Society"
-                    )
-                    .withField(
-                        StandardField.JOURNAL,
-                        "The Astrophysical Journal"
-                    )
+                    .withField(StandardField.PUBLISHER, "American Astronomical Society")
+                    .withField(StandardField.JOURNAL, "The Astrophysical Journal")
                     .withField(StandardField.PAGES, "172")
                     .withField(
                         StandardField.ABSTRACT,
@@ -67,10 +59,7 @@ > performSearchByIdReturnsCorrectEntryForIdentifier() {
                     .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(
@@ -143,10 +132,7 @@ void setUp() throws Exception {
             Answers.RETURNS_DEEP_STUBS
         );
         // Needed for ArXiv Fetcher keyword processing
-        when(
-            importFormatPreferences.bibEntryPreferences().getKeywordSeparator()
-        )
-            .thenReturn(',');
+        when(importFormatPreferences.bibEntryPreferences().getKeywordSeparator()).thenReturn(',');
         compositeIdFetcher = new CompositeIdFetcher(importFormatPreferences);
     }
 
@@ -154,10 +140,7 @@ void setUp() throws Exception {
     @ValueSource(strings = "arZiv:2110.02957")
     void performSearchByIdReturnsEmptyForInvalidId(String groundInvalidArXivId)
         throws FetcherException {
-        assertEquals(
-            Optional.empty(),
-            compositeIdFetcher.performSearchById(groundInvalidArXivId)
-        );
+        assertEquals(Optional.empty(), compositeIdFetcher.performSearchById(groundInvalidArXivId));
     }
 
     @ParameterizedTest(name = "{index} {0}")
@@ -167,9 +150,6 @@ void performSearchByIdReturnsCorrectEntryForIdentifier(
         BibEntry bibEntry,
         String identifier
     ) throws FetcherException {
-        assertEquals(
-            Optional.of(bibEntry),
-            compositeIdFetcher.performSearchById(identifier)
-        );
+        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 9cf20a14455..c89626d3b26 100644
--- a/src/test/java/org/jabref/logic/importer/fetcher/CompositeSearchBasedFetcherTest.java
+++ b/src/test/java/org/jabref/logic/importer/fetcher/CompositeSearchBasedFetcherTest.java
@@ -65,14 +65,12 @@ public void performSearchWithoutFetchers() throws Exception {
 
     @ParameterizedTest(name = "Perform Search on empty query.")
     @MethodSource("performSearchParameters")
-    public void performSearchOnEmptyQuery(Set<SearchBasedFetcher> fetchers)
-        throws Exception {
-        CompositeSearchBasedFetcher compositeFetcher =
-            new CompositeSearchBasedFetcher(
-                fetchers,
-                importerPreferences,
-                Integer.MAX_VALUE
-            );
+    public void performSearchOnEmptyQuery(Set<SearchBasedFetcher> fetchers) throws Exception {
+        CompositeSearchBasedFetcher compositeFetcher = new CompositeSearchBasedFetcher(
+            fetchers,
+            importerPreferences,
+            Integer.MAX_VALUE
+        );
 
         List<BibEntry> queryResult = compositeFetcher.performSearch("");
 
@@ -84,26 +82,20 @@ public void performSearchOnEmptyQuery(Set<SearchBasedFetcher> fetchers)
         "Fetchers: {arguments}"
     )
     @MethodSource("performSearchParameters")
-    public void performSearchOnNonEmptyQuery(Set<SearchBasedFetcher> fetchers)
-        throws Exception {
-        CompositeSearchBasedFetcher compositeFetcher =
-            new CompositeSearchBasedFetcher(
-                fetchers,
-                importerPreferences,
-                Integer.MAX_VALUE
-            );
+    public void performSearchOnNonEmptyQuery(Set<SearchBasedFetcher> fetchers) throws Exception {
+        CompositeSearchBasedFetcher compositeFetcher = new CompositeSearchBasedFetcher(
+            fetchers,
+            importerPreferences,
+            Integer.MAX_VALUE
+        );
         ImportCleanup cleanup = ImportCleanup.targeting(BibDatabaseMode.BIBTEX);
 
-        List<BibEntry> compositeResult = compositeFetcher.performSearch(
-            "quantum"
-        );
+        List<BibEntry> compositeResult = compositeFetcher.performSearch("quantum");
         for (SearchBasedFetcher fetcher : fetchers) {
             try {
                 List<BibEntry> fetcherResult = fetcher.performSearch("quantum");
                 fetcherResult.forEach(cleanup::doPostCleanup);
-                Assertions.assertTrue(
-                    compositeResult.containsAll(fetcherResult)
-                );
+                Assertions.assertTrue(compositeResult.containsAll(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
@@ -124,21 +116,15 @@ static Stream<Arguments> performSearchParameters() {
             ImportFormatPreferences.class,
             Answers.RETURNS_DEEP_STUBS
         );
-        ImporterPreferences importerPreferences = mock(
-            ImporterPreferences.class
-        );
-        when(importerPreferences.getApiKeys())
-            .thenReturn(FXCollections.emptyObservableSet());
+        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 AstrophysicsDataSystem(importFormatPreferences, importerPreferences),
             new MathSciNet(importFormatPreferences),
             new ZbMATH(importFormatPreferences),
             new GoogleScholar(importFormatPreferences),
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 784ee7b1711..10c39d72c00 100644
--- a/src/test/java/org/jabref/logic/importer/fetcher/CrossRefTest.java
+++ b/src/test/java/org/jabref/logic/importer/fetcher/CrossRefTest.java
@@ -26,19 +26,13 @@ public void setUp() throws Exception {
         fetcher = new CrossRef();
 
         barrosEntry = new BibEntry();
-        barrosEntry.setField(
-            StandardField.TITLE,
-            "Service Interaction Patterns"
-        );
+        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.YEAR, "2005");
-        barrosEntry.setField(
-            StandardField.PUBLISHER,
-            "Springer Berlin Heidelberg"
-        );
+        barrosEntry.setField(StandardField.PUBLISHER, "Springer Berlin Heidelberg");
         barrosEntry.setField(StandardField.DOI, "10.1007/11538394_20");
         barrosEntry.setField(StandardField.ISSN, "0302-9743");
         barrosEntry.setField(StandardField.PAGES, "302-318");
@@ -55,11 +49,7 @@ public void findExactData() throws Exception {
         entry.setField(StandardField.YEAR, "2005");
         assertEquals(
             "10.1007/11538394_20",
-            fetcher
-                .findIdentifier(entry)
-                .get()
-                .getDOI()
-                .toLowerCase(Locale.ENGLISH)
+            fetcher.findIdentifier(entry).get().getDOI().toLowerCase(Locale.ENGLISH)
         );
     }
 
@@ -73,11 +63,7 @@ public void findMissingAuthor() throws Exception {
         entry.setField(StandardField.AUTHOR, "Stefan Kolb");
         assertEquals(
             "10.1109/sose.2014.26",
-            fetcher
-                .findIdentifier(entry)
-                .get()
-                .getDOI()
-                .toLowerCase(Locale.ENGLISH)
+            fetcher.findIdentifier(entry).get().getDOI().toLowerCase(Locale.ENGLISH)
         );
     }
 
@@ -90,11 +76,7 @@ public void findTitleOnly() throws Exception {
         );
         assertEquals(
             "10.1109/sose.2014.26",
-            fetcher
-                .findIdentifier(entry)
-                .get()
-                .getDOI()
-                .toLowerCase(Locale.ENGLISH)
+            fetcher.findIdentifier(entry).get().getDOI().toLowerCase(Locale.ENGLISH)
         );
     }
 
@@ -116,11 +98,7 @@ public void acceptTitleUnderThreshold() throws Exception {
         entry.setField(StandardField.AUTHOR, "Stefan Kolb and Guido Wirtz");
         assertEquals(
             "10.1109/sose.2014.26",
-            fetcher
-                .findIdentifier(entry)
-                .get()
-                .getDOI()
-                .toLowerCase(Locale.ENGLISH)
+            fetcher.findIdentifier(entry).get().getDOI().toLowerCase(Locale.ENGLISH)
         );
     }
 
@@ -145,11 +123,7 @@ public void findWrongAuthor() throws Exception {
         entry.setField(StandardField.AUTHOR, "Stefan Kolb and Simon Harrer");
         assertEquals(
             "10.1109/sose.2014.26",
-            fetcher
-                .findIdentifier(entry)
-                .get()
-                .getDOI()
-                .toLowerCase(Locale.ENGLISH)
+            fetcher.findIdentifier(entry).get().getDOI().toLowerCase(Locale.ENGLISH)
         );
     }
 
@@ -157,26 +131,16 @@ public void findWrongAuthor() throws Exception {
     public void findWithSubtitle() throws Exception {
         BibEntry entry = new BibEntry();
         // 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"
-        );
+        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)
+            fetcher.findIdentifier(entry).get().getDOI().toLowerCase(Locale.ENGLISH)
         );
     }
 
     @Test
     public void findByDOI() throws Exception {
-        assertEquals(
-            Optional.of(barrosEntry),
-            fetcher.performSearchById("10.1007/11538394_20")
-        );
+        assertEquals(Optional.of(barrosEntry), fetcher.performSearchById("10.1007/11538394_20"));
     }
 
     @Test
@@ -201,10 +165,7 @@ public void findByEntry() throws Exception {
             "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()
-        );
+        assertEquals(Optional.of(barrosEntry), fetcher.performSearch(entry).stream().findFirst());
     }
 
     @Test
@@ -224,10 +185,7 @@ public void performSearchByIdFindsPaperWithoutTitle() throws Exception {
             "Political Science and International Relations, Linguistics and Language, Philosophy"
         );
 
-        assertEquals(
-            Optional.of(entry),
-            fetcher.performSearchById("10.1023/a:1003473214310")
-        );
+        assertEquals(Optional.of(entry), fetcher.performSearchById("10.1023/a:1003473214310"));
     }
 
     @Test
@@ -244,8 +202,7 @@ public void performSearchByEmptyQuery() throws Exception {
      * reveal fetching error on crossref performSearchById
      */
     @Test
-    public void testPerformSearchValidReturnNothingDOI()
-        throws FetcherException {
+    public void testPerformSearchValidReturnNothingDOI() throws FetcherException {
         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 cb1b78bf4a4..b07e39e8017 100644
--- a/src/test/java/org/jabref/logic/importer/fetcher/DBLPFetcherTest.java
+++ b/src/test/java/org/jabref/logic/importer/fetcher/DBLPFetcherTest.java
@@ -25,9 +25,7 @@ public class DBLPFetcherTest {
     @BeforeEach
     public void setUp() {
         dblpFetcher =
-            new DBLPFetcher(
-                mock(ImportFormatPreferences.class, Answers.RETURNS_DEEP_STUBS)
-            );
+            new DBLPFetcher(mock(ImportFormatPreferences.class, Answers.RETURNS_DEEP_STUBS));
         entry = new BibEntry();
 
         entry.setType(StandardEntryType.Article);
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 105c39b1b8e..79325f7cf32 100644
--- a/src/test/java/org/jabref/logic/importer/fetcher/DOABFetcherTest.java
+++ b/src/test/java/org/jabref/logic/importer/fetcher/DOABFetcherTest.java
@@ -52,14 +52,8 @@ public static Stream<Arguments> testPerformSearch() {
                 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")
@@ -77,18 +71,12 @@ public static Stream<Arguments> testPerformSearch() {
                         "Open Access, Monographs, OAPEN Library, " +
                         "Directory of Open Access Books"
                     )
-                    .withField(
-                        StandardField.PUBLISHER,
-                        "Amsterdam University Press"
-                    ),
+                    .withField(StandardField.PUBLISHER, "Amsterdam University Press"),
                 "the deliverance of open access books"
             ),
             Arguments.of(
                 new BibEntry(StandardEntryType.Book)
-                    .withField(
-                        StandardField.EDITOR,
-                        "Andrew Perrin and Loren T. Stuckenbruck"
-                    )
+                    .withField(StandardField.EDITOR, "Andrew Perrin and Loren T. Stuckenbruck")
                     .withField(
                         StandardField.TITLE,
                         "Four Kingdom Motifs before and beyond the Book of Daniel"
@@ -111,18 +99,9 @@ public static Stream<Arguments> testPerformSearch() {
             ),
             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.DOI,
-                        "10.3390/books978-3-03842-754-4"
-                    )
+                    .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(
@@ -174,8 +153,7 @@ public static Stream<Arguments> testPerformSearch() {
 
     @ParameterizedTest
     @MethodSource
-    public void testPerformSearch(BibEntry expected, String query)
-        throws FetcherException {
+    public void testPerformSearch(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
         entries.forEach(entry -> entry.clearField(StandardField.ABSTRACT));
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 3c8b7c8c28c..9a80f1e1347 100644
--- a/src/test/java/org/jabref/logic/importer/fetcher/DOAJFetcherTest.java
+++ b/src/test/java/org/jabref/logic/importer/fetcher/DOAJFetcherTest.java
@@ -29,10 +29,7 @@ void setUp() {
             ImportFormatPreferences.class,
             Answers.RETURNS_DEEP_STUBS
         );
-        when(
-            importFormatPreferences.bibEntryPreferences().getKeywordSeparator()
-        )
-            .thenReturn(',');
+        when(importFormatPreferences.bibEntryPreferences().getKeywordSeparator()).thenReturn(',');
         fetcher = new DOAJFetcher(importFormatPreferences);
     }
 
@@ -43,10 +40,7 @@ void searchByQueryFindsEntry() throws Exception {
                 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.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")
@@ -54,10 +48,7 @@ void searchByQueryFindsEntry() throws Exception {
                 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.URL, "http://www.revistas.usp.br/rmrp/article/view/127443")
             .withField(StandardField.VOLUME, "49")
             .withField(StandardField.NUMBER, "6")
             .withField(StandardField.YEAR, "2016")
@@ -83,14 +74,8 @@ void testBibJSONConverter() {
         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("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)
@@ -101,10 +86,7 @@ void testBibJSONConverter() {
             ),
             bibEntry.getField(StandardField.TITLE)
         );
-        assertEquals(
-            Optional.of("2014"),
-            bibEntry.getField(StandardField.YEAR)
-        );
+        assertEquals(Optional.of("2014"), bibEntry.getField(StandardField.YEAR));
     }
 
     @Test
@@ -116,39 +98,27 @@ public void searchByEmptyQuery() throws Exception {
     void appendSingleWord() throws Exception {
         URIBuilder builder = new URIBuilder("http://example.com/test");
         DOAJFetcher.addPath(builder, "/example");
-        assertEquals(
-            "http://example.com/test/example",
-            builder.build().toASCIIString()
-        );
+        assertEquals("http://example.com/test/example", builder.build().toASCIIString());
     }
 
     @Test
     void appendSingleWordWithSlash() throws Exception {
         URIBuilder builder = new URIBuilder("http://example.com/test");
         DOAJFetcher.addPath(builder, "/example");
-        assertEquals(
-            "http://example.com/test/example",
-            builder.build().toASCIIString()
-        );
+        assertEquals("http://example.com/test/example", builder.build().toASCIIString());
     }
 
     @Test
     void appendSlash() throws Exception {
         URIBuilder builder = new URIBuilder("http://example.com/test");
         DOAJFetcher.addPath(builder, "/");
-        assertEquals(
-            "http://example.com/test",
-            builder.build().toASCIIString()
-        );
+        assertEquals("http://example.com/test", builder.build().toASCIIString());
     }
 
     @Test
     void appendTwoWords() throws Exception {
         URIBuilder builder = new URIBuilder("http://example.com/test");
         DOAJFetcher.addPath(builder, "example two");
-        assertEquals(
-            "http://example.com/test/example%20two",
-            builder.build().toASCIIString()
-        );
+        assertEquals("http://example.com/test/example%20two", builder.build().toASCIIString());
     }
 }
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 5581ff454dc..8cf54daae4c 100644
--- a/src/test/java/org/jabref/logic/importer/fetcher/DiVATest.java
+++ b/src/test/java/org/jabref/logic/importer/fetcher/DiVATest.java
@@ -22,10 +22,7 @@ public class DiVATest {
 
     @BeforeEach
     public void setUp() {
-        fetcher =
-            new DiVA(
-                mock(ImportFormatPreferences.class, Answers.RETURNS_DEEP_STUBS)
-            );
+        fetcher = new DiVA(mock(ImportFormatPreferences.class, Answers.RETURNS_DEEP_STUBS));
     }
 
     @Test
@@ -39,20 +36,14 @@ public void testPerformSearchById() throws Exception {
         entry.setType(StandardEntryType.Article);
         entry.setCitationKey("Gustafsson260746");
         entry.setField(StandardField.AUTHOR, "Gustafsson, Oscar");
-        entry.setField(
-            StandardField.INSTITUTION,
-            "The Institute of Technology"
-        );
+        entry.setField(StandardField.INSTITUTION, "The Institute of Technology");
         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.TITLE, "Lower bounds for constant multiplication problems");
         entry.setField(StandardField.VOLUME, "54");
         entry.setField(StandardField.YEAR, "2007");
         entry.setField(
@@ -61,10 +52,7 @@ public void testPerformSearchById() throws Exception {
         );
         entry.setField(StandardField.DOI, "10.1109/TCSII.2007.903212");
 
-        assertEquals(
-            Optional.of(entry),
-            fetcher.performSearchById("diva2:260746")
-        );
+        assertEquals(Optional.of(entry), fetcher.performSearchById("diva2:260746"));
     }
 
     @Test
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 13dd74ef6f1..b58a83dc289 100644
--- a/src/test/java/org/jabref/logic/importer/fetcher/DoiFetcherTest.java
+++ b/src/test/java/org/jabref/logic/importer/fetcher/DoiFetcherTest.java
@@ -21,22 +21,15 @@ public class DoiFetcherTest {
         mock(ImportFormatPreferences.class, Answers.RETURNS_DEEP_STUBS)
     );
 
-    private final BibEntry bibEntryBurd2011 = new BibEntry(
-        StandardEntryType.Book
-    )
+    private final BibEntry bibEntryBurd2011 = new BibEntry(StandardEntryType.Book)
         .withCitationKey("Burd_2011")
-        .withField(
-            StandardField.TITLE,
-            "Java{\\textregistered} For Dummies{\\textregistered}"
-        )
+        .withField(StandardField.TITLE, "Java{\\textregistered} For Dummies{\\textregistered}")
         .withField(StandardField.PUBLISHER, "Wiley")
         .withField(StandardField.YEAR, "2011")
         .withField(StandardField.AUTHOR, "Barry Burd")
         .withField(StandardField.MONTH, "jul")
         .withField(StandardField.DOI, "10.1002/9781118257517");
-    private final BibEntry bibEntryDecker2007 = new BibEntry(
-        StandardEntryType.InProceedings
-    )
+    private final BibEntry bibEntryDecker2007 = new BibEntry(StandardEntryType.InProceedings)
         .withCitationKey("Decker_2007")
         .withField(
             StandardField.AUTHOR,
@@ -48,15 +41,10 @@ public class DoiFetcherTest {
         )
         .withField(StandardField.MONTH, "jul")
         .withField(StandardField.PUBLISHER, "{IEEE}")
-        .withField(
-            StandardField.TITLE,
-            "{BPEL}4Chor: Extending {BPEL} for Modeling Choreographies"
-        )
+        .withField(StandardField.TITLE, "{BPEL}4Chor: 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
-    )
+    private final BibEntry bibEntryIannarelli2019 = new BibEntry(StandardEntryType.Article)
         .withField(
             StandardField.AUTHOR,
             "" +
@@ -68,10 +56,7 @@ public class DoiFetcherTest {
             "Telib Haysam  and " +
             "Meyer Thierry "
         )
-        .withField(
-            StandardField.PUBLISHER,
-            "AIDIC: Italian Association of Chemical Engineering"
-        )
+        .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"
@@ -81,9 +66,7 @@ public class DoiFetcherTest {
         .withField(StandardField.JOURNAL, "Chemical Engineering Transactions")
         .withField(StandardField.PAGES, "871-876")
         .withField(StandardField.VOLUME, "77");
-    private final BibEntry bibEntryStenzel2020 = new BibEntry(
-        StandardEntryType.Article
-    )
+    private final BibEntry bibEntryStenzel2020 = new BibEntry(StandardEntryType.Article)
         .withCitationKey("Stenzel_2020")
         .withField(
             StandardField.AUTHOR,
@@ -109,34 +92,25 @@ public void testGetName() {
 
     @Test
     public void testPerformSearchBurd2011() throws FetcherException {
-        Optional<BibEntry> fetchedEntry = fetcher.performSearchById(
-            "10.1002/9781118257517"
-        );
+        Optional<BibEntry> fetchedEntry = fetcher.performSearchById("10.1002/9781118257517");
         assertEquals(Optional.of(bibEntryBurd2011), fetchedEntry);
     }
 
     @Test
     public void testPerformSearchDecker2007() throws FetcherException {
-        Optional<BibEntry> fetchedEntry = fetcher.performSearchById(
-            "10.1109/ICWS.2007.59"
-        );
+        Optional<BibEntry> fetchedEntry = fetcher.performSearchById("10.1109/ICWS.2007.59");
         assertEquals(Optional.of(bibEntryDecker2007), fetchedEntry);
     }
 
     @Test
     public void testPerformSearchIannarelli2019() throws FetcherException {
-        Optional<BibEntry> fetchedEntry = fetcher.performSearchById(
-            "10.3303/CET1977146"
-        );
+        Optional<BibEntry> fetchedEntry = fetcher.performSearchById("10.3303/CET1977146");
         assertEquals(Optional.of(bibEntryIannarelli2019), fetchedEntry);
     }
 
     @Test
     public void testPerformSearchEmptyDOI() {
-        assertThrows(
-            FetcherException.class,
-            () -> fetcher.performSearchById("")
-        );
+        assertThrows(FetcherException.class, () -> fetcher.performSearchById(""));
     }
 
     @Test
@@ -157,10 +131,7 @@ public void testPerformSearchInvalidDOIClientResultsinFetcherClientException() {
 
     @Test
     public void testPerformSearchInvalidDOIClientResultsinFetcherClientException2() {
-        assertThrows(
-            FetcherException.class,
-            () -> fetcher.performSearchById("10.1002/9781517F")
-        );
+        assertThrows(FetcherException.class, () -> fetcher.performSearchById("10.1002/9781517F"));
     }
 
     @Test
@@ -172,11 +143,8 @@ public void testPerformSearchNonTrimmedDOI() throws FetcherException {
     }
 
     @Test
-    public void testAPSJournalCopiesArticleIdToPageField()
-        throws FetcherException {
-        Optional<BibEntry> fetchedEntry = fetcher.performSearchById(
-            "10.1103/physreva.102.023315"
-        );
+    public void testAPSJournalCopiesArticleIdToPageField() throws FetcherException {
+        Optional<BibEntry> fetchedEntry = fetcher.performSearchById("10.1103/physreva.102.023315");
         assertEquals(Optional.of(bibEntryStenzel2020), 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 dd73a263d5f..ed81e3884e7 100644
--- a/src/test/java/org/jabref/logic/importer/fetcher/DoiResolutionTest.java
+++ b/src/test/java/org/jabref/logic/importer/fetcher/DoiResolutionTest.java
@@ -33,11 +33,7 @@ void setup() {
     void linkWithPdfInTitleTag() throws IOException {
         entry.setField(StandardField.DOI, "10.1051/0004-6361/201527330");
         assertEquals(
-            Optional.of(
-                new URL(
-                    "https://www.aanda.org/articles/aa/pdf/2016/01/aa27330-15.pdf"
-                )
-            ),
+            Optional.of(new URL("https://www.aanda.org/articles/aa/pdf/2016/01/aa27330-15.pdf")),
             finder.findFullText(entry)
         );
     }
@@ -47,11 +43,7 @@ void linkWithPdfInTitleTag() throws IOException {
     void linkWithPdfStringLeadsToFulltext() throws IOException {
         entry.setField(StandardField.DOI, "10.1002/acr2.11101");
         assertEquals(
-            Optional.of(
-                new URL(
-                    "https://onlinelibrary.wiley.com/doi/pdf/10.1002/acr2.11101"
-                )
-            ),
+            Optional.of(new URL("https://onlinelibrary.wiley.com/doi/pdf/10.1002/acr2.11101")),
             finder.findFullText(entry)
         );
     }
@@ -61,9 +53,7 @@ void citationMetaTagLeadsToFulltext() throws IOException {
         entry.setField(StandardField.DOI, "10.1007/978-3-319-89963-3_28");
         assertEquals(
             Optional.of(
-                new URL(
-                    "https://link.springer.com/content/pdf/10.1007/978-3-319-89963-3_28.pdf"
-                )
+                new URL("https://link.springer.com/content/pdf/10.1007/978-3-319-89963-3_28.pdf")
             ),
             finder.findFullText(entry)
         );
@@ -83,9 +73,7 @@ void returnAnythingWhenBehindSpringerPayWall() throws IOException {
         entry.setField(StandardField.DOI, "10.1007/978-3-319-62594-2_12");
         assertEquals(
             Optional.of(
-                new URL(
-                    "https://link.springer.com/content/pdf/10.1007/978-3-319-62594-2_12.pdf"
-                )
+                new URL("https://link.springer.com/content/pdf/10.1007/978-3-319-62594-2_12.pdf")
             ),
             finder.findFullText(entry)
         );
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 17b65afb63c..da23a3f58c6 100644
--- a/src/test/java/org/jabref/logic/importer/fetcher/FulltextFetcherTest.java
+++ b/src/test/java/org/jabref/logic/importer/fetcher/FulltextFetcherTest.java
@@ -27,16 +27,12 @@ private static Set<FulltextFetcher> fetcherProvider() {
     @ParameterizedTest
     @MethodSource("fetcherProvider")
     void findFullTextRejectsNullParameter(FulltextFetcher fetcher) {
-        assertThrows(
-            NullPointerException.class,
-            () -> fetcher.findFullText(null)
-        );
+        assertThrows(NullPointerException.class, () -> fetcher.findFullText(null));
     }
 
     @ParameterizedTest
     @MethodSource("fetcherProvider")
-    void findFullTextWithEmptyEntryFindsNothing(FulltextFetcher fetcher)
-        throws Exception {
+    void findFullTextWithEmptyEntryFindsNothing(FulltextFetcher fetcher) throws Exception {
         assertEquals(Optional.empty(), fetcher.findFullText(new BibEntry()));
     }
 }
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 27c0195eec4..b35e7509fc5 100644
--- a/src/test/java/org/jabref/logic/importer/fetcher/GoogleScholarTest.java
+++ b/src/test/java/org/jabref/logic/importer/fetcher/GoogleScholarTest.java
@@ -23,8 +23,7 @@
 
 @FetcherTest
 @DisabledOnCIServer("CI server is blocked by Google")
-class GoogleScholarTest
-    implements SearchBasedFetcherCapabilityTest, PagedSearchFetcherTest {
+class GoogleScholarTest implements SearchBasedFetcherCapabilityTest, PagedSearchFetcherTest {
 
     private GoogleScholar finder;
     private BibEntry entry;
@@ -74,10 +73,7 @@ void findSingleEntry() throws FetcherException {
             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.AUTHOR, "Geiger, Matthias and Wirtz, Guido");
         entry.setField(StandardField.BOOKTITLE, "ZEUS");
         entry.setField(StandardField.YEAR, "2013");
         entry.setField(StandardField.PAGES, "41--44");
@@ -91,9 +87,7 @@ void findSingleEntry() throws FetcherException {
 
     @Test
     void findManyEntries() throws FetcherException {
-        List<BibEntry> foundEntries = finder.performSearch(
-            "random test string"
-        );
+        List<BibEntry> foundEntries = finder.performSearch("random test string");
 
         assertEquals(20, foundEntries.size());
     }
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 892e8e915ad..40090f9a15a 100644
--- a/src/test/java/org/jabref/logic/importer/fetcher/GrobidCitationFetcherTest.java
+++ b/src/test/java/org/jabref/logic/importer/fetcher/GrobidCitationFetcherTest.java
@@ -38,25 +38,21 @@ public class GrobidCitationFetcherTest {
         false,
         "http://grobid.jabref.org:8070"
     );
-    static GrobidCitationFetcher grobidCitationFetcher =
-        new GrobidCitationFetcher(grobidPreferences, importFormatPreferences);
+    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.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.JOURNAL, "Journal of Multilingual and Multicultural Development")
         .withField(StandardField.DOI, "10.1080/01434630208666468")
         .withField(StandardField.DATE, "2002-09")
         .withField(StandardField.MONTH, "9")
@@ -84,10 +80,7 @@ public class GrobidCitationFetcherTest {
         "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.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")
@@ -103,10 +96,7 @@ public class GrobidCitationFetcherTest {
     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.BOOKTITLE, "Statutes and conventions on international trade law")
         .withField(StandardField.PUBLISHER, "Cavendish")
         .withField(StandardField.DATE, "2003")
         .withField(StandardField.YEAR, "2003")
@@ -123,10 +113,7 @@ public static Stream<Arguments> provideExamplesForCorrectResultTest() {
     }
 
     public static Stream<Arguments> provideInvalidInput() {
-        return Stream.of(
-            Arguments.of("😋😋😋"),
-            Arguments.of("¦@#¦@#¦@#¦@#¦@#¦@#¦@°#¦@¦°¦@°")
-        );
+        return Stream.of(Arguments.of("😋😋😋"), Arguments.of("¦@#¦@#¦@#¦@#¦@#¦@#¦@°#¦@¦°¦@°"));
     }
 
     @ParameterizedTest(name = "{0}")
@@ -136,41 +123,24 @@ public void grobidPerformSearchCorrectResultTest(
         BibEntry expectedBibEntry,
         String searchQuery
     ) throws FetcherException {
-        List<BibEntry> entries = grobidCitationFetcher.performSearch(
-            searchQuery
-        );
+        List<BibEntry> entries = grobidCitationFetcher.performSearch(searchQuery);
         assertEquals(List.of(expectedBibEntry), entries);
     }
 
     @Test
-    public void grobidPerformSearchCorrectlySplitsStringTest()
-        throws FetcherException {
+    public void grobidPerformSearchCorrectlySplitsStringTest() throws FetcherException {
         List<BibEntry> entries = grobidCitationFetcher.performSearch(
-            example1 +
-            "\n\n" +
-            example2 +
-            "\r\n\r\n" +
-            example3 +
-            "\r\r" +
-            example4
+            example1 + "\n\n" + example2 + "\r\n\r\n" + example3 + "\r\r" + example4
         );
         assertEquals(
-            List.of(
-                example1AsBibEntry,
-                example2AsBibEntry,
-                example3AsBibEntry,
-                example4AsBibEntry
-            ),
+            List.of(example1AsBibEntry, example2AsBibEntry, example3AsBibEntry, example4AsBibEntry),
             entries
         );
     }
 
     @Test
-    public void grobidPerformSearchWithEmptyStringsTest()
-        throws FetcherException {
-        List<BibEntry> entries = grobidCitationFetcher.performSearch(
-            "   \n   "
-        );
+    public void grobidPerformSearchWithEmptyStringsTest() throws FetcherException {
+        List<BibEntry> entries = grobidCitationFetcher.performSearch("   \n   ");
         assertEquals(Collections.emptyList(), entries);
     }
 
@@ -178,9 +148,7 @@ public void grobidPerformSearchWithEmptyStringsTest()
     @MethodSource("provideInvalidInput")
     public void grobidPerformSearchWithInvalidDataTest(String invalidInput)
         throws FetcherException {
-        List<BibEntry> entries = grobidCitationFetcher.performSearch(
-            invalidInput
-        );
+        List<BibEntry> entries = grobidCitationFetcher.performSearch(invalidInput);
         assertEquals(Collections.emptyList(), entries);
     }
 
@@ -191,10 +159,7 @@ public void performSearchThrowsExceptionInCaseOfConnectionIssues()
         when(grobidServiceMock.processCitation(anyString(), any(), any()))
             .thenThrow(new SocketTimeoutException("Timeout"));
         grobidCitationFetcher =
-            new GrobidCitationFetcher(
-                importFormatPreferences,
-                grobidServiceMock
-            );
+            new GrobidCitationFetcher(importFormatPreferences, grobidServiceMock);
 
         assertThrows(
             FetcherException.class,
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 d69440ec30e..31a41c5a7da 100644
--- a/src/test/java/org/jabref/logic/importer/fetcher/GvkFetcherTest.java
+++ b/src/test/java/org/jabref/logic/importer/fetcher/GvkFetcherTest.java
@@ -30,10 +30,7 @@ public class GvkFetcherTest {
 
     @BeforeEach
     public void setUp() {
-        fetcher =
-            new GvkFetcher(
-                mock(ImportFormatPreferences.class, Answers.RETURNS_DEEP_STUBS)
-            );
+        fetcher = new GvkFetcher(mock(ImportFormatPreferences.class, Answers.RETURNS_DEEP_STUBS));
 
         bibEntryPPN591166003 =
             new BibEntry(StandardEntryType.Book)
@@ -41,10 +38,7 @@ public void setUp() {
                 .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.SERIES, "The Java series ... from the source")
                 .withField(StandardField.ADDRESS, "Upper Saddle River, NJ")
                 .withField(StandardField.EDITION, "2. ed., 5. print.")
                 .withField(
@@ -54,10 +48,7 @@ public void setUp() {
                 .withField(StandardField.ISBN, "9780321356680")
                 .withField(StandardField.PAGETOTAL, "346")
                 .withField(new UnknownField("ppn_gvk"), "591166003")
-                .withField(
-                    StandardField.SUBTITLE,
-                    "[revised and updated for JAVA SE 6]"
-                );
+                .withField(StandardField.SUBTITLE, "[revised and updated for JAVA SE 6]");
 
         bibEntryPPN66391437X =
             new BibEntry(StandardEntryType.Book)
@@ -69,10 +60,7 @@ public void setUp() {
                 .withField(StandardField.ISBN, "9781935182573")
                 .withField(StandardField.PAGETOTAL, "223")
                 .withField(new UnknownField("ppn_gvk"), "66391437X")
-                .withField(
-                    StandardField.SUBTITLE,
-                    "A guide for Java developers"
-                );
+                .withField(StandardField.SUBTITLE, "A guide for Java developers");
     }
 
     @Test
@@ -105,11 +93,8 @@ public void complexSearchQueryURLCorrect() throws Exception {
     }
 
     @Test
-    public void testPerformSearchMatchingMultipleEntries()
-        throws FetcherException {
-        List<BibEntry> searchResult = fetcher.performSearch(
-            "title:\"effective java\""
-        );
+    public void testPerformSearchMatchingMultipleEntries() throws FetcherException {
+        List<BibEntry> searchResult = fetcher.performSearch("title:\"effective java\"");
         assertTrue(searchResult.contains(bibEntryPPN591166003));
         assertTrue(searchResult.contains(bibEntryPPN66391437X));
     }
@@ -117,19 +102,13 @@ public void testPerformSearchMatchingMultipleEntries()
     @Test
     public void testPerformSearch591166003() throws FetcherException {
         List<BibEntry> searchResult = fetcher.performSearch("ppn:591166003");
-        assertEquals(
-            Collections.singletonList(bibEntryPPN591166003),
-            searchResult
-        );
+        assertEquals(Collections.singletonList(bibEntryPPN591166003), searchResult);
     }
 
     @Test
     public void testPerformSearch66391437X() throws FetcherException {
         List<BibEntry> searchResult = fetcher.performSearch("ppn:66391437X");
-        assertEquals(
-            Collections.singletonList(bibEntryPPN66391437X),
-            searchResult
-        );
+        assertEquals(Collections.singletonList(bibEntryPPN66391437X), searchResult);
     }
 
     @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 16b171c33dd..9035ddc50a7 100644
--- a/src/test/java/org/jabref/logic/importer/fetcher/IEEETest.java
+++ b/src/test/java/org/jabref/logic/importer/fetcher/IEEETest.java
@@ -22,12 +22,9 @@
 import org.mockito.Answers;
 
 @FetcherTest
-class IEEETest
-    implements SearchBasedFetcherCapabilityTest, PagedSearchFetcherTest {
+class IEEETest implements SearchBasedFetcherCapabilityTest, PagedSearchFetcherTest {
 
-    private final BibEntry IGOR_NEWCOMERS = new BibEntry(
-        StandardEntryType.InProceedings
-    )
+    private 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"
@@ -68,16 +65,10 @@ void setUp() {
             ImportFormatPreferences.class,
             Answers.RETURNS_DEEP_STUBS
         );
-        when(
-            importFormatPreferences.bibEntryPreferences().getKeywordSeparator()
-        )
-            .thenReturn(',');
+        when(importFormatPreferences.bibEntryPreferences().getKeywordSeparator()).thenReturn(',');
 
-        ImporterPreferences importerPreferences = mock(
-            ImporterPreferences.class
-        );
-        when(importerPreferences.getApiKeys())
-            .thenReturn(FXCollections.emptyObservableSet());
+        ImporterPreferences importerPreferences = mock(ImporterPreferences.class);
+        when(importerPreferences.getApiKeys()).thenReturn(FXCollections.emptyObservableSet());
 
         fetcher = new IEEE(importFormatPreferences, importerPreferences);
         entry = new BibEntry();
@@ -98,10 +89,7 @@ void findByDOI() throws Exception {
 
     @Test
     void findByDocumentUrl() throws Exception {
-        entry.setField(
-            StandardField.URL,
-            "https://ieeexplore.ieee.org/document/7421926/"
-        );
+        entry.setField(StandardField.URL, "https://ieeexplore.ieee.org/document/7421926/");
         assertEquals(
             Optional.of(
                 new URL(
@@ -147,10 +135,7 @@ void findByOldURL() throws Exception {
     @Test
     void findByDOIButNotURL() throws Exception {
         entry.setField(StandardField.DOI, "10.1109/ACCESS.2016.2535486");
-        entry.setField(
-            StandardField.URL,
-            "http://dx.doi.org/10.1109/ACCESS.2016.2535486"
-        );
+        entry.setField(StandardField.URL, "http://dx.doi.org/10.1109/ACCESS.2016.2535486");
         assertEquals(
             Optional.of(
                 new URL(
@@ -163,10 +148,7 @@ void findByDOIButNotURL() throws Exception {
 
     @Test
     void notFoundByURL() throws Exception {
-        entry.setField(
-            StandardField.URL,
-            "http://dx.doi.org/10.1109/ACCESS.2016.2535486"
-        );
+        entry.setField(StandardField.URL, "http://dx.doi.org/10.1109/ACCESS.2016.2535486");
         assertEquals(Optional.empty(), fetcher.findFullText(entry));
     }
 
@@ -179,10 +161,7 @@ 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.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")
@@ -192,10 +171,7 @@ void searchResultHasNoKeywordTerms() throws Exception {
             )
             .withField(StandardField.ISSUE, "4")
             .withField(StandardField.ISSN, "1941-0050")
-            .withField(
-                StandardField.JOURNALTITLE,
-                "IEEE Transactions on Industrial Informatics"
-            )
+            .withField(StandardField.JOURNALTITLE, "IEEE Transactions on Industrial Informatics")
             .withField(StandardField.PAGES, "2346--2356")
             .withField(StandardField.PUBLISHER, "IEEE")
             .withField(
@@ -208,11 +184,8 @@ void searchResultHasNoKeywordTerms() throws Exception {
                 "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"
-        ); // article number
-        fetchedEntries.forEach(entry -> entry.clearField(StandardField.ABSTRACT)
-        ); // Remove abstract due to copyright);
+        List<BibEntry> fetchedEntries = fetcher.performSearch("article_number:8801912"); // article number
+        fetchedEntries.forEach(entry -> entry.clearField(StandardField.ABSTRACT)); // Remove abstract due to copyright);
         assertEquals(Collections.singletonList(expected), fetchedEntries);
     }
 
@@ -222,8 +195,7 @@ void searchByPlainQueryFindsEntry() throws Exception {
             "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)
-        );
+        fetchedEntries.forEach(entry -> entry.clearField(StandardField.ABSTRACT));
         assertEquals(Collections.singletonList(IGOR_NEWCOMERS), fetchedEntries);
     }
 
@@ -233,8 +205,7 @@ void searchByQuotedQueryFindsEntry() throws Exception {
             "\"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)
-        );
+        fetchedEntries.forEach(entry -> entry.clearField(StandardField.ABSTRACT));
         assertEquals(Collections.singletonList(IGOR_NEWCOMERS), fetchedEntries);
     }
 
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 56335d2fe3b..410c98077c5 100644
--- a/src/test/java/org/jabref/logic/importer/fetcher/INSPIREFetcherTest.java
+++ b/src/test/java/org/jabref/logic/importer/fetcher/INSPIREFetcherTest.java
@@ -43,9 +43,7 @@ void searchByQueryFindsEntry() throws Exception {
             .withField(StandardField.EPRINT, "1405.2249")
             .withField(StandardField.ARCHIVEPREFIX, "arXiv")
             .withField(StandardField.PRIMARYCLASS, "math-ph");
-        List<BibEntry> fetchedEntries = fetcher.performSearch(
-            "Fréchet group actions field"
-        );
+        List<BibEntry> fetchedEntries = fetcher.performSearch("Fréchet group actions field");
         assertEquals(Collections.singletonList(master), fetchedEntries);
     }
 
@@ -53,10 +51,7 @@ void searchByQueryFindsEntry() throws Exception {
     public void searchByIdentifierFindsEntry() throws Exception {
         BibEntry article = new BibEntry(StandardEntryType.Article)
             .withCitationKey("Melnikov:1998pr")
-            .withField(
-                StandardField.AUTHOR,
-                "Melnikov, Kirill and Yelkhovsky, Alexander"
-            )
+            .withField(StandardField.AUTHOR, "Melnikov, Kirill and Yelkhovsky, Alexander")
             .withField(
                 StandardField.TITLE,
                 "Top quark production at threshold with O(alpha-s**2) accuracy"
@@ -68,13 +63,8 @@ public void searchByIdentifierFindsEntry() throws Exception {
             .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\""
-        );
+            .withField(new UnknownField("reportnumber"), "BUDKER-INP-1998-7, TTP-98-10");
+        List<BibEntry> fetchedEntries = fetcher.performSearch("\"hep-ph/9802379\"");
         assertEquals(Collections.singletonList(article), fetchedEntries);
     }
 
@@ -82,10 +72,7 @@ public void searchByIdentifierFindsEntry() throws Exception {
     public void searchByExistingEntry() throws Exception {
         BibEntry article = new BibEntry(StandardEntryType.Article)
             .withCitationKey("Melnikov:1998pr")
-            .withField(
-                StandardField.AUTHOR,
-                "Melnikov, Kirill and Yelkhovsky, Alexander"
-            )
+            .withField(StandardField.AUTHOR, "Melnikov, Kirill and Yelkhovsky, Alexander")
             .withField(
                 StandardField.TITLE,
                 "Top quark production at threshold with O(alpha-s**2) accuracy"
@@ -97,10 +84,7 @@ public void searchByExistingEntry() throws Exception {
             .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"
-            );
+            .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/IacrEprintFetcherTest.java b/src/test/java/org/jabref/logic/importer/fetcher/IacrEprintFetcherTest.java
index a93362fd962..192c6007966 100644
--- a/src/test/java/org/jabref/logic/importer/fetcher/IacrEprintFetcherTest.java
+++ b/src/test/java/org/jabref/logic/importer/fetcher/IacrEprintFetcherTest.java
@@ -45,9 +45,7 @@ public class IacrEprintFetcherTest {
     @BeforeEach
     public void setUp() {
         fetcher =
-            new IacrEprintFetcher(
-                mock(ImportFormatPreferences.class, Answers.RETURNS_DEEP_STUBS)
-            );
+            new IacrEprintFetcher(mock(ImportFormatPreferences.class, Answers.RETURNS_DEEP_STUBS));
 
         abram2017 =
             new BibEntry(StandardEntryType.Misc)
@@ -58,22 +56,13 @@ public void setUp() {
                     "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.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.URL, "https://eprint.iacr.org/2017/1118/20171124:064527")
                 .withField(StandardField.VERSION, "20171124:064527")
                 .withField(StandardField.YEAR, "2017");
 
@@ -86,22 +75,13 @@ public void setUp() {
                     "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.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.URL, "https://eprint.iacr.org/2017/1118")
                 .withField(StandardField.YEAR, "2017");
 
         beierle2016 =
@@ -114,22 +94,13 @@ public void setUp() {
                 )
                 .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.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.URL, "https://eprint.iacr.org/2016/119/20170217:150415")
                 .withField(StandardField.VERSION, "20170217:150415")
                 .withField(StandardField.YEAR, "2016");
 
@@ -142,101 +113,63 @@ public void setUp() {
                     "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.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
     public void searchByIdWithValidId1() throws FetcherException {
-        Optional<BibEntry> fetchedEntry = fetcher.performSearchById(
-            "Report 2017/1118 "
-        );
-        assertFalse(
-            fetchedEntry.get().getField(StandardField.ABSTRACT).get().isEmpty()
-        );
+        Optional<BibEntry> fetchedEntry = fetcher.performSearchById("Report 2017/1118 ");
+        assertFalse(fetchedEntry.get().getField(StandardField.ABSTRACT).get().isEmpty());
         fetchedEntry.get().setField(StandardField.ABSTRACT, "dummy");
         assertEquals(Optional.of(abram2017), fetchedEntry);
     }
 
     @Test
     public void searchByIdWithValidId2() throws FetcherException {
-        Optional<BibEntry> fetchedEntry = fetcher.performSearchById(
-            "iacr ePrint 2016/119"
-        );
-        assertFalse(
-            fetchedEntry.get().getField(StandardField.ABSTRACT).get().isEmpty()
-        );
+        Optional<BibEntry> fetchedEntry = fetcher.performSearchById("iacr ePrint 2016/119");
+        assertFalse(fetchedEntry.get().getField(StandardField.ABSTRACT).get().isEmpty());
         fetchedEntry.get().setField(StandardField.ABSTRACT, "dummy");
         assertEquals(Optional.of(beierle2016), fetchedEntry);
     }
 
     @Test
-    public void searchByIdWithValidIdAndNonAsciiChars()
-        throws FetcherException {
+    public void searchByIdWithValidIdAndNonAsciiChars() throws FetcherException {
         Optional<BibEntry> fetchedEntry = fetcher.performSearchById(
             "some random 2017/1095 stuff around the id"
         );
-        assertFalse(
-            fetchedEntry.get().getField(StandardField.ABSTRACT).get().isEmpty()
-        );
+        assertFalse(fetchedEntry.get().getField(StandardField.ABSTRACT).get().isEmpty());
         fetchedEntry.get().setField(StandardField.ABSTRACT, "dummy");
         assertEquals(Optional.of(delgado2017), fetchedEntry);
     }
 
     @Test
     public void searchByIdWithEmptyIdFails() {
-        assertThrows(
-            FetcherException.class,
-            () -> fetcher.performSearchById("")
-        );
+        assertThrows(FetcherException.class, () -> fetcher.performSearchById(""));
     }
 
     @Test
     public void searchByIdWithInvalidReportNumberFails() {
-        assertThrows(
-            FetcherException.class,
-            () -> fetcher.performSearchById("2016/1")
-        );
+        assertThrows(FetcherException.class, () -> fetcher.performSearchById("2016/1"));
     }
 
     @Test
     public void searchByIdWithInvalidYearFails() {
-        assertThrows(
-            FetcherException.class,
-            () -> fetcher.performSearchById("16/115")
-        );
+        assertThrows(FetcherException.class, () -> fetcher.performSearchById("16/115"));
     }
 
     @Test
     public void searchByIdWithInvalidIdFails() {
-        assertThrows(
-            FetcherException.class,
-            () -> fetcher.performSearchById("asdf")
-        );
+        assertThrows(FetcherException.class, () -> fetcher.performSearchById("asdf"));
     }
 
     @Test
     public void searchForNonexistentIdFails() {
-        assertThrows(
-            FetcherException.class,
-            () -> fetcher.performSearchById("2016/6425")
-        );
+        assertThrows(FetcherException.class, () -> fetcher.performSearchById("2016/6425"));
     }
 
     @Test
@@ -246,50 +179,35 @@ public void testGetName() {
 
     @Test
     public void searchByIdForWithdrawnPaperFails() {
-        assertThrows(
-            FetcherException.class,
-            () -> fetcher.performSearchById("1998/016")
-        );
+        assertThrows(FetcherException.class, () -> fetcher.performSearchById("1998/016"));
     }
 
     @Test
-    public void searchByIdWithOldHtmlFormatAndCheckDate()
-        throws FetcherException {
+    public void searchByIdWithOldHtmlFormatAndCheckDate() throws FetcherException {
         Optional<BibEntry> fetchedEntry = fetcher.performSearchById("1997/006");
-        assertEquals(
-            Optional.of("1997-05-04"),
-            fetchedEntry.get().getField(StandardField.DATE)
-        );
+        assertEquals(Optional.of("1997-05-04"), fetchedEntry.get().getField(StandardField.DATE));
     }
 
     @DisplayName("Get all entries with old HTML format (except withdrawn ones)")
     @ParameterizedTest(name = "Fetch for id: {0}")
     @MethodSource("allNonWithdrawnIdsWithOldHtmlFormat")
     @Disabled("Takes a lot of time - should only be called manually")
-    public void searchByIdWithOldHtmlFormatWithoutDateCheck(String id)
-        throws FetcherException {
+    public void searchByIdWithOldHtmlFormatWithoutDateCheck(String id) throws FetcherException {
         Optional<BibEntry> fetchedEntry = fetcher.performSearchById(id);
-        assertTrue(
-            fetchedEntry.isPresent(),
-            "Expected to get an entry for id " + 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()
+            "Expected non empty date field, entry is\n" + fetchedEntry.toString()
         );
         assertTrue(
-            fetchedEntry.get().getField(StandardField.DATE).get().length() ==
-            10,
-            "Expected yyyy-MM-dd date format, entry is\n" +
-            fetchedEntry.toString()
+            fetchedEntry.get().getField(StandardField.DATE).get().length() == 10,
+            "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()
+            "Expected non empty abstract field, entry is\n" + fetchedEntry.toString()
         );
     }
 
@@ -325,16 +243,13 @@ private static Stream<String> allNonWithdrawnIdsWithOldHtmlFormat() {
     public void getFulltextWithVersion() throws FetcherException, IOException {
         Optional<URL> pdfUrl = fetcher.findFullText(abram2017);
         assertEquals(
-            Optional.of(
-                "https://eprint.iacr.org/archive/2017/1118/1511505927.pdf"
-            ),
+            Optional.of("https://eprint.iacr.org/archive/2017/1118/1511505927.pdf"),
             pdfUrl.map(URL::toString)
         );
     }
 
     @Test
-    public void getFulltextWithoutVersion()
-        throws FetcherException, IOException {
+    public void getFulltextWithoutVersion() throws FetcherException, IOException {
         Optional<URL> pdfUrl = fetcher.findFullText(abram2017noVersion);
         assertEquals(
             Optional.of("https://eprint.iacr.org/2017/1118.pdf"),
@@ -353,13 +268,7 @@ public void getFulltextWithoutUrl() throws FetcherException, IOException {
     @Test
     public void getFulltextWithNonIACRUrl() throws IOException {
         BibEntry abram2017WithNonIACRUrl = abram2017;
-        abram2017WithNonIACRUrl.setField(
-            StandardField.URL,
-            "https://example.com"
-        );
-        assertThrows(
-            FetcherException.class,
-            () -> fetcher.findFullText(abram2017WithNonIACRUrl)
-        );
+        abram2017WithNonIACRUrl.setField(StandardField.URL, "https://example.com");
+        assertThrows(FetcherException.class, () -> fetcher.findFullText(abram2017WithNonIACRUrl));
     }
 }
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 6438cb9e634..0ac4ac8d901 100644
--- a/src/test/java/org/jabref/logic/importer/fetcher/IssnFetcherTest.java
+++ b/src/test/java/org/jabref/logic/importer/fetcher/IssnFetcherTest.java
@@ -23,9 +23,7 @@ class IssnFetcherTest {
 
     @BeforeEach
     void setUp() {
-        ImportFormatPreferences importPrefs = mock(
-            ImportFormatPreferences.class
-        );
+        ImportFormatPreferences importPrefs = mock(ImportFormatPreferences.class);
         BibEntryPreferences bibEntryPrefs = mock(BibEntryPreferences.class);
         when(importPrefs.bibEntryPreferences()).thenReturn(bibEntryPrefs);
 
@@ -34,10 +32,7 @@ void setUp() {
         bibEntry =
             new BibEntry()
                 .withField(StandardField.ISSN, "15454509")
-                .withField(
-                    StandardField.JOURNALTITLE,
-                    "Annual Review of Biochemistry"
-                )
+                .withField(StandardField.JOURNALTITLE, "Annual Review of Biochemistry")
                 .withField(StandardField.PUBLISHER, "Annual Reviews Inc.");
     }
 
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 94189329a0e..09be61126d9 100644
--- a/src/test/java/org/jabref/logic/importer/fetcher/JstorFetcherTest.java
+++ b/src/test/java/org/jabref/logic/importer/fetcher/JstorFetcherTest.java
@@ -36,10 +36,7 @@ public class JstorFetcherTest implements SearchBasedFetcherCapabilityTest {
             "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.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."
@@ -71,10 +68,7 @@ public class JstorFetcherTest implements SearchBasedFetcherCapabilityTest {
         .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.URL, "http://www.jstor.org/stable/10.1086/501484")
         .withField(StandardField.YEAR, "2006");
 
     @Test
@@ -101,21 +95,14 @@ void searchByUrlUsingId() throws Exception {
         );
         assertEquals(
             Optional.of(doiEntry),
-            fetcher.performSearchById(
-                "https://www.jstor.org/stable/10.1086/501484?seq=1"
-            )
+            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(
-                new URL("https://www.jstor.org/stable/pdf/90002164.pdf")
-            ),
-            url
-        );
+        assertEquals(Optional.of(new URL("https://www.jstor.org/stable/pdf/90002164.pdf")), url);
     }
 
     @Override
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 e3e668a6cba..8e938b33605 100644
--- a/src/test/java/org/jabref/logic/importer/fetcher/LOBIDFetcherTest.java
+++ b/src/test/java/org/jabref/logic/importer/fetcher/LOBIDFetcherTest.java
@@ -17,8 +17,7 @@
 import org.junit.jupiter.api.Test;
 
 @FetcherTest
-class LOBIDFetcherTest
-    implements SearchBasedFetcherCapabilityTest, PagedSearchFetcherTest {
+class LOBIDFetcherTest implements SearchBasedFetcherCapabilityTest, PagedSearchFetcherTest {
 
     ImporterPreferences importerPreferences = mock(ImporterPreferences.class);
     LOBIDFetcher fetcher;
@@ -47,10 +46,7 @@ void searchByQueryFindsEntry() throws Exception {
             .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.URL, "http://lobid.org/resources/991002500969706485")
             .withField(StandardField.YEAR, "2016");
 
         BibEntry secondArticle = new BibEntry(StandardEntryType.Article)
@@ -64,10 +60,7 @@ void searchByQueryFindsEntry() throws Exception {
             .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.URL, "http://lobid.org/resources/990173112890206441")
             .withField(StandardField.YEAR, "2008");
 
         BibEntry thirdArticle = new BibEntry(StandardEntryType.Book)
@@ -90,24 +83,13 @@ void searchByQueryFindsEntry() throws Exception {
             .withField(StandardField.LANGUAGE, "Deutsch")
             .withField(StandardField.LOCATION, "Dortmund")
             .withField(StandardField.TITLE, "Das Kapital")
-            .withField(
-                StandardField.TITLEADDON,
-                "Schuld - Territorium - Utopie"
-            )
+            .withField(StandardField.TITLEADDON, "Schuld - Territorium - Utopie")
             .withField(StandardField.TYPE, "BibliographicResource, Book")
-            .withField(
-                StandardField.URL,
-                "http://lobid.org/resources/990212549810206441"
-            )
+            .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
-        );
+        List<BibEntry> fetchedEntries = fetcher.performSearch("Cathrine Nichols");
+        assertEquals(List.of(firstArticle, secondArticle, thirdArticle), fetchedEntries);
     }
 
     @Test
@@ -117,9 +99,7 @@ void searchByEmptyQueryFindsNothing() throws Exception {
 
     @Test
     @Override
-    @Disabled(
-        "Results returned contain a few incorrect years. The majority are accurate"
-    )
+    @Disabled("Results returned contain a few incorrect years. The majority are accurate")
     public void supportsYearSearch() {}
 
     @Override
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 25d9181ce87..b0b31fb3bf8 100644
--- a/src/test/java/org/jabref/logic/importer/fetcher/LibraryOfCongressTest.java
+++ b/src/test/java/org/jabref/logic/importer/fetcher/LibraryOfCongressTest.java
@@ -23,15 +23,10 @@ public class LibraryOfCongressTest {
 
     @BeforeEach
     public void setUp() {
-        ImportFormatPreferences importFormatPreferences = mock(
-            ImportFormatPreferences.class
-        );
+        ImportFormatPreferences importFormatPreferences = mock(ImportFormatPreferences.class);
         when(importFormatPreferences.bibEntryPreferences())
             .thenReturn(mock(BibEntryPreferences.class));
-        when(
-            importFormatPreferences.bibEntryPreferences().getKeywordSeparator()
-        )
-            .thenReturn(',');
+        when(importFormatPreferences.bibEntryPreferences().getKeywordSeparator()).thenReturn(',');
 
         fetcher = new LibraryOfCongress(importFormatPreferences);
     }
@@ -53,16 +48,10 @@ public void performSearchById() throws Exception {
             .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.TITLE, "Developing high quality data models")
             .withField(StandardField.YEAR, "2011");
 
-        assertEquals(
-            Optional.of(expected),
-            fetcher.performSearchById("2010045158")
-        );
+        assertEquals(Optional.of(expected), fetcher.performSearchById("2010045158"));
     }
 
     @Test
@@ -72,9 +61,6 @@ public void performSearchByEmptyId() throws Exception {
 
     @Test
     public void performSearchByInvalidId() {
-        assertThrows(
-            FetcherClientException.class,
-            () -> fetcher.performSearchById("xxx")
-        );
+        assertThrows(FetcherClientException.class, () -> fetcher.performSearchById("xxx"));
     }
 }
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 32b39167a92..5681d831ac6 100644
--- a/src/test/java/org/jabref/logic/importer/fetcher/MathSciNetTest.java
+++ b/src/test/java/org/jabref/logic/importer/fetcher/MathSciNetTest.java
@@ -30,10 +30,7 @@ void setUp() throws Exception {
             ImportFormatPreferences.class,
             Answers.RETURNS_DEEP_STUBS
         );
-        when(
-            importFormatPreferences.bibEntryPreferences().getKeywordSeparator()
-        )
-            .thenReturn(',');
+        when(importFormatPreferences.bibEntryPreferences().getKeywordSeparator()).thenReturn(',');
 
         fetcher = new MathSciNet(importFormatPreferences);
 
@@ -48,19 +45,13 @@ void setUp() throws Exception {
             StandardField.TITLE,
             "Existence and uniqueness theorems for the two-dimensional {E}ricksen-{L}eslie system"
         );
-        ratiuEntry.setField(
-            StandardField.JOURNAL,
-            "Journal of Mathematical Fluid Mechanics"
-        );
+        ratiuEntry.setField(StandardField.JOURNAL, "Journal of Mathematical Fluid Mechanics");
         ratiuEntry.setField(StandardField.VOLUME, "18");
         ratiuEntry.setField(StandardField.YEAR, "2016");
         ratiuEntry.setField(StandardField.NUMBER, "3");
         ratiuEntry.setField(StandardField.PAGES, "571--589");
         ratiuEntry.setField(StandardField.ISSN, "1422-6928,1422-6952");
-        ratiuEntry.setField(
-            StandardField.KEYWORDS,
-            "76A15 (35A01 35A02 35K61 82D30)"
-        );
+        ratiuEntry.setField(StandardField.KEYWORDS, "76A15 (35A01 35A02 35K61 82D30)");
         ratiuEntry.setField(StandardField.MR_NUMBER, "3537908");
         ratiuEntry.setField(StandardField.DOI, "10.1007/s00021-016-0250-0");
     }
@@ -77,9 +68,7 @@ void searchByEntryFindsEntry() throws Exception {
     }
 
     @Test
-    @DisabledOnCIServer(
-        "CI server has no subscription to MathSciNet and thus gets 401 response"
-    )
+    @DisabledOnCIServer("CI server has no subscription to MathSciNet and thus gets 401 response")
     void searchByIdInEntryFindsEntry() throws Exception {
         BibEntry searchEntry = new BibEntry();
         searchEntry.setField(StandardField.MR_NUMBER, "3537908");
@@ -89,9 +78,7 @@ void searchByIdInEntryFindsEntry() throws Exception {
     }
 
     @Test
-    @DisabledOnCIServer(
-        "CI server has no subscription to MathSciNet and thus gets 401 response"
-    )
+    @DisabledOnCIServer("CI server has no subscription to MathSciNet and thus gets 401 response")
     void searchByQueryFindsEntry() throws Exception {
         List<BibEntry> fetchedEntries = fetcher.performSearch(
             "Existence and uniqueness theorems Two-Dimensional Ericksen Leslie System"
@@ -101,9 +88,7 @@ void searchByQueryFindsEntry() throws Exception {
     }
 
     @Test
-    @DisabledOnCIServer(
-        "CI server has no subscription to MathSciNet and thus gets 401 response"
-    )
+    @DisabledOnCIServer("CI server has no subscription to MathSciNet and thus gets 401 response")
     void searchByIdFindsEntry() throws Exception {
         Optional<BibEntry> fetchedEntry = fetcher.performSearchById("3537908");
         assertEquals(Optional.of(ratiuEntry), fetchedEntry);
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 b979d6a928c..3d4d2e816df 100644
--- a/src/test/java/org/jabref/logic/importer/fetcher/MedlineFetcherTest.java
+++ b/src/test/java/org/jabref/logic/importer/fetcher/MedlineFetcherTest.java
@@ -76,10 +76,7 @@ public void setUp() throws InterruptedException {
                 .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.JOURNAL, "BMC complementary and alternative medicine")
                 .withField(
                     StandardField.KEYWORDS,
                     "CAC; Dendrophtoe pentandra; IL-22; MPO; Proliferation; p53"
@@ -223,18 +220,14 @@ public void testMultipleEntries() throws Exception {
 
     @Test
     public void testWithLuceneQueryAuthorDate() throws Exception {
-        List<BibEntry> entryList = fetcher.performSearch(
-            "author:vigmond AND year:2021"
-        );
+        List<BibEntry> entryList = fetcher.performSearch("author:vigmond AND year:2021");
         entryList.forEach(entry -> entry.clearField(StandardField.ABSTRACT)); // Remove abstract due to copyright);
         assertEquals(18, entryList.size());
     }
 
     @Test
     public void testWithLuceneQueryAuthorDateRange() throws Exception {
-        List<BibEntry> entryList = fetcher.performSearch(
-            "author:vigmond AND year-range:2020-2021"
-        );
+        List<BibEntry> entryList = fetcher.performSearch("author:vigmond AND year-range:2020-2021");
         entryList.forEach(entry -> entry.clearField(StandardField.ABSTRACT)); // Remove abstract due to copyright);
         assertEquals(28, entryList.size());
     }
@@ -243,18 +236,13 @@ public void testWithLuceneQueryAuthorDateRange() throws Exception {
     public void testInvalidSearchTerm() throws Exception {
         assertThrows(
             FetcherClientException.class,
-            () ->
-                fetcher.performSearchById(
-                    "this.is.a.invalid.search.term.for.the.medline.fetcher"
-                )
+            () -> fetcher.performSearchById("this.is.a.invalid.search.term.for.the.medline.fetcher")
         );
     }
 
     @Test
     public void testEmptyEntryList() throws Exception {
-        List<BibEntry> entryList = fetcher.performSearch(
-            "java is fantastic and awesome "
-        );
+        List<BibEntry> entryList = fetcher.performSearch("java is fantastic and awesome ");
         assertEquals(Collections.emptyList(), entryList);
     }
 
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 3d06819d640..8e2af7a67a6 100644
--- a/src/test/java/org/jabref/logic/importer/fetcher/MedraTest.java
+++ b/src/test/java/org/jabref/logic/importer/fetcher/MedraTest.java
@@ -28,21 +28,12 @@ private static Stream<Arguments> getDoiBibEntryPairs() {
                 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.DOI, "10.2143/TVF.80.3.3285690")
                         .withField(StandardField.ISSN, "2031-8952, 2031-8952")
-                        .withField(
-                            StandardField.JOURNAL,
-                            "Tijdschrift voor Filosofie"
-                        )
+                        .withField(StandardField.JOURNAL, "Tijdschrift voor Filosofie")
                         .withField(StandardField.PAGES, "625-629")
                 )
             ),
@@ -71,10 +62,7 @@ private static Stream<Arguments> getDoiBibEntryPairs() {
                         )
                         .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")
                 )
@@ -84,10 +72,7 @@ private static Stream<Arguments> getDoiBibEntryPairs() {
                 Optional.of(
                     new BibEntry(StandardEntryType.Article)
                         .withField(StandardField.AUTHOR, "Paola Cisternino")
-                        .withField(
-                            StandardField.PUBLISHER,
-                            "Edizioni Otto Novecento"
-                        )
+                        .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"
@@ -124,10 +109,8 @@ public void testPerformNonExistent() throws FetcherException {
 
     @ParameterizedTest
     @MethodSource("getDoiBibEntryPairs")
-    public void testDoiBibEntryPairs(
-        String identifier,
-        Optional<BibEntry> expected
-    ) throws FetcherException {
+    public void testDoiBibEntryPairs(String identifier, Optional<BibEntry> expected)
+        throws FetcherException {
         Optional<BibEntry> fetchedEntry = fetcher.performSearchById(identifier);
         assertEquals(expected, fetchedEntry);
     }
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 ad32e61619b..762695c451c 100644
--- a/src/test/java/org/jabref/logic/importer/fetcher/MrDLibFetcherTest.java
+++ b/src/test/java/org/jabref/logic/importer/fetcher/MrDLibFetcherTest.java
@@ -20,12 +20,7 @@ public class MrDLibFetcherTest {
 
     @BeforeEach
     public void setUp() {
-        MrDlibPreferences mrDlibPreferences = new MrDlibPreferences(
-            true,
-            false,
-            false,
-            false
-        );
+        MrDlibPreferences mrDlibPreferences = new MrDlibPreferences(true, false, false, false);
         fetcher = new MrDLibFetcher("", Version.parse(""), mrDlibPreferences);
     }
 
@@ -42,10 +37,7 @@ public void testPerformSearchForHornecker2006() throws FetcherException {
         BibEntry bibEntry = new BibEntry();
         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.AUTHOR, "Hornecker, Eva and Buur, Jacob");
         bibEntry.setField(
             StandardField.BOOKTITLE,
             "Proceedings of the SIGCHI Conference on Human Factors in Computing Systems"
@@ -63,10 +55,7 @@ public void testPerformSearchForHornecker2006() throws FetcherException {
             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.URL, "http://doi.acm.org/10.1145/1124772.1124838");
         bibEntry.setField(StandardField.YEAR, "2006");
 
         List<BibEntry> bibEntrys = fetcher.performSearch(bibEntry);
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 3fe5b90623a..b1f763e5b7b 100644
--- a/src/test/java/org/jabref/logic/importer/fetcher/PagedSearchFetcherTest.java
+++ b/src/test/java/org/jabref/logic/importer/fetcher/PagedSearchFetcherTest.java
@@ -17,10 +17,8 @@ public interface PagedSearchFetcherTest {
     @Test
     default void pageSearchReturnsUniqueResultsPerPage() throws Exception {
         String query = "Software";
-        Page<BibEntry> firstPage = getPagedFetcher()
-            .performSearchPaged(query, 0);
-        Page<BibEntry> secondPage = getPagedFetcher()
-            .performSearchPaged(query, 1);
+        Page<BibEntry> firstPage = getPagedFetcher().performSearchPaged(query, 0);
+        Page<BibEntry> secondPage = getPagedFetcher().performSearchPaged(query, 1);
 
         for (BibEntry entry : firstPage.getContent()) {
             assertFalse(secondPage.getContent().contains(entry));
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 d433c596ea1..a1c220965a3 100644
--- a/src/test/java/org/jabref/logic/importer/fetcher/PicaXmlParserTest.java
+++ b/src/test/java/org/jabref/logic/importer/fetcher/PicaXmlParserTest.java
@@ -18,27 +18,16 @@
 @FetcherTest
 public class PicaXmlParserTest {
 
-    private void doTest(
-        String xmlName,
-        int expectedSize,
-        List<String> resourceNames
-    ) throws Exception {
-        try (
-            InputStream is = PicaXmlParserTest.class.getResourceAsStream(
-                    xmlName
-                )
-        ) {
+    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);
             assertNotNull(entries);
             assertEquals(expectedSize, entries.size());
             int i = 0;
             for (String resourceName : resourceNames) {
-                BibEntryAssert.assertEquals(
-                    PicaXmlParserTest.class,
-                    resourceName,
-                    entries.get(i)
-                );
+                BibEntryAssert.assertEquals(PicaXmlParserTest.class, resourceName, entries.get(i));
                 i++;
             }
         }
@@ -46,11 +35,7 @@ private void doTest(
 
     @Test
     public void emptyResult() throws Exception {
-        doTest(
-            "gvk_empty_result_because_of_bad_query.xml",
-            0,
-            Collections.emptyList()
-        );
+        doTest("gvk_empty_result_because_of_bad_query.xml", 0, Collections.emptyList());
     }
 
     @Test
@@ -64,11 +49,7 @@ public void resultFor797485368() throws Exception {
 
     @Test
     public void testGMP() throws Exception {
-        doTest(
-            "gvk_gmp.xml",
-            2,
-            Arrays.asList("gvk_gmp.1.bib", "gvk_gmp.2.bib")
-        );
+        doTest("gvk_gmp.xml", 2, Arrays.asList("gvk_gmp.1.bib", "gvk_gmp.2.bib"));
     }
 
     @Test
@@ -83,18 +64,9 @@ public void subTitleTest() throws Exception {
             assertNotNull(entries);
             assertEquals(5, entries.size());
 
-            assertEquals(
-                Optional.empty(),
-                entries.get(0).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.empty(), entries.get(0).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)
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 6f628a674f2..0fb6e1a9a0d 100644
--- a/src/test/java/org/jabref/logic/importer/fetcher/ResearchGateTest.java
+++ b/src/test/java/org/jabref/logic/importer/fetcher/ResearchGateTest.java
@@ -36,40 +36,28 @@ public class ResearchGateTest {
 
     @BeforeEach
     public void setUp() {
-        fetcher =
-            new ResearchGate(
-                mock(ImportFormatPreferences.class, Answers.RETURNS_DEEP_STUBS)
-            );
+        fetcher = new ResearchGate(mock(ImportFormatPreferences.class, Answers.RETURNS_DEEP_STUBS));
         entry = new BibEntry(StandardEntryType.InProceedings);
         entry.setField(StandardField.DOI, "10.1109/CSAC.2005.42");
-        entry.setField(
-            StandardField.TITLE,
-            "Paranoid: a global secure file access control system"
-        );
+        entry.setField(StandardField.TITLE, "Paranoid: a global secure file access control system");
     }
 
     @Test
     @DisabledOnCIServer("CI server is unreliable")
     void fullTextFoundByDOI() throws IOException, FetcherException {
-        assertEquals(
-            Optional.of(new URL(URL_PDF)),
-            fetcher.findFullText(entry)
-        );
+        assertEquals(Optional.of(new URL(URL_PDF)), fetcher.findFullText(entry));
     }
 
     @Test
     @DisabledOnCIServer("CI server is unreliable")
     void fullTextNotFoundByDOI() throws IOException, FetcherException {
-        BibEntry entry2 = new BibEntry()
-            .withField(StandardField.DOI, "10.1021/bk-2006-WWW.ch014");
+        BibEntry entry2 = new BibEntry().withField(StandardField.DOI, "10.1021/bk-2006-WWW.ch014");
         assertEquals(Optional.empty(), fetcher.findFullText(entry2));
     }
 
     @Test
     void getDocumentByTitle() throws IOException, NullPointerException {
-        Optional<String> source = fetcher.getURLByString(
-            entry.getTitle().get()
-        );
+        Optional<String> source = fetcher.getURLByString(entry.getTitle().get());
         assertTrue(source.isPresent() && source.get().startsWith(URL_PAGE));
     }
 
@@ -128,10 +116,7 @@ void performSearchWithLuceneQuery() throws Exception {
                 "Microbiology: A Short Overview on Application, and Perspectives",
                 NO_EXPLICIT_FIELD
             );
-        assertEquals(
-            Optional.of(master),
-            fetcher.performSearch(queryNode).stream().findFirst()
-        );
+        assertEquals(Optional.of(master), fetcher.performSearch(queryNode).stream().findFirst());
     }
 
     @Test
@@ -139,10 +124,7 @@ 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.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")
@@ -184,10 +166,7 @@ void performSearchWithTitleWithCurlyBraces() throws FetcherException {
                 .withField(StandardField.DOI, "10.13140/RG.2.2.36822.78406")
         );
 
-        Optional<BibEntry> actual = fetcher
-            .performSearch(entryInput)
-            .stream()
-            .findFirst();
+        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 3ee75b5a5b0..019eb63eea6 100644
--- a/src/test/java/org/jabref/logic/importer/fetcher/RfcFetcherTest.java
+++ b/src/test/java/org/jabref/logic/importer/fetcher/RfcFetcherTest.java
@@ -31,14 +31,8 @@ public class RfcFetcherTest {
         .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.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#")
@@ -53,8 +47,7 @@ public void getNameReturnsEqualIdName() {
     }
 
     @Test
-    public void performSearchByIdFindsEntryWithDraftIdentifier()
-        throws Exception {
+    public void performSearchByIdFindsEntryWithDraftIdentifier() throws Exception {
         BibEntry bibDraftEntry = new BibEntry(StandardEntryType.TechReport)
             .withField(InternalField.KEY_FIELD, "fielding-http-spec-01")
             .withField(
@@ -62,22 +55,13 @@ public void performSearchByIdFindsEntryWithDraftIdentifier()
                 "Henrik Nielsen and Roy T. Fielding and Tim Berners-Lee"
             )
             .withField(StandardField.DAY, "20")
-            .withField(
-                StandardField.INSTITUTION,
-                "Internet Engineering Task Force"
-            )
+            .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.PUBLISHER, "Internet Engineering Task Force")
+            .withField(StandardField.TITLE, "{Hypertext Transfer Protocol -- HTTP/1.0}")
             .withField(StandardField.TYPE, "Internet-Draft")
             .withField(
                 StandardField.URL,
@@ -100,17 +84,12 @@ public void performSearchByIdFindsEntryWithDraftIdentifier()
 
     @ParameterizedTest
     @CsvSource({ "rfc1945", "RFC1945", "1945" })
-    public void performSearchByIdFindsEntry(String identifier)
-        throws Exception {
-        assertEquals(
-            Optional.of(bibEntry),
-            fetcher.performSearchById(identifier)
-        );
+    public void performSearchByIdFindsEntry(String identifier) throws Exception {
+        assertEquals(Optional.of(bibEntry), fetcher.performSearchById(identifier));
     }
 
     @Test
-    public void performSearchByIdFindsNothingWithoutIdentifier()
-        throws Exception {
+    public void performSearchByIdFindsNothingWithoutIdentifier() throws Exception {
         assertEquals(Optional.empty(), fetcher.performSearchById(""));
     }
 
@@ -124,12 +103,8 @@ public void performSearchByIdFindsNothingWithoutIdentifier()
             "banana",
         }
     )
-    public void performSearchByIdFindsNothingWithValidDraftIdentifier(
-        String identifier
-    ) throws Exception {
-        assertThrows(
-            FetcherClientException.class,
-            () -> fetcher.performSearchById(identifier)
-        );
+    public 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 aa7f9a7b835..e7247833111 100644
--- a/src/test/java/org/jabref/logic/importer/fetcher/ScholarArchiveFetcherTest.java
+++ b/src/test/java/org/jabref/logic/importer/fetcher/ScholarArchiveFetcherTest.java
@@ -23,10 +23,7 @@ public void setUp() {
         fetcher = new ScholarArchiveFetcher();
         bibEntry =
             new BibEntry(StandardEntryType.InCollection)
-                .withField(
-                    StandardField.TITLE,
-                    "Query expansion using associated queries"
-                )
+                .withField(StandardField.TITLE, "Query expansion using associated queries")
                 .withField(
                     StandardField.AUTHOR,
                     "Billerbeck, Bodo and Scholer, Falk and Williams, Hugh E. and Zobel, Justin"
@@ -54,8 +51,7 @@ public void getNameReturnsCorrectName() {
     @Test
     public void performSearchReturnsExpectedResults() throws FetcherException {
         List<BibEntry> fetchedEntries = fetcher.performSearch("query");
-        fetchedEntries.forEach(entry -> entry.clearField(StandardField.ABSTRACT)
-        );
+        fetchedEntries.forEach(entry -> entry.clearField(StandardField.ABSTRACT));
         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 cb82e53a469..d511bd0527b 100644
--- a/src/test/java/org/jabref/logic/importer/fetcher/ScienceDirectTest.java
+++ b/src/test/java/org/jabref/logic/importer/fetcher/ScienceDirectTest.java
@@ -19,16 +19,13 @@
 @FetcherTest
 class ScienceDirectTest {
 
-    private final ImporterPreferences importerPreferences = mock(
-        ImporterPreferences.class
-    );
+    private final ImporterPreferences importerPreferences = mock(ImporterPreferences.class);
     private ScienceDirect finder;
     private BibEntry entry;
 
     @BeforeEach
     void setUp() {
-        when(importerPreferences.getApiKeys())
-            .thenReturn(FXCollections.emptyObservableSet());
+        when(importerPreferences.getApiKeys()).thenReturn(FXCollections.emptyObservableSet());
         finder = new ScienceDirect(importerPreferences);
         entry = new BibEntry();
     }
@@ -67,10 +64,7 @@ void findByDoiNewPage() throws IOException {
     @DisabledOnCIServer("CI server is blocked")
     void findByDoiWorksForBoneArticle() throws IOException {
         // The DOI is an example by a user taken from https://github.com/JabRef/jabref/issues/5860
-        entry.setField(
-            StandardField.DOI,
-            "https://doi.org/10.1016/j.bone.2020.115226"
-        );
+        entry.setField(StandardField.DOI, "https://doi.org/10.1016/j.bone.2020.115226");
 
         assertEquals(
             Optional.of(
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 ef5cddf528a..044651c49d8 100644
--- a/src/test/java/org/jabref/logic/importer/fetcher/SearchBasedFetcherCapabilityTest.java
+++ b/src/test/java/org/jabref/logic/importer/fetcher/SearchBasedFetcherCapabilityTest.java
@@ -29,15 +29,10 @@ interface SearchBasedFetcherCapabilityTest {
      */
     @Test
     default void supportsAuthorSearch() throws Exception {
-        StringJoiner queryBuilder = new StringJoiner(
-            "\" AND author:\"",
-            "author:\"",
-            "\""
-        );
+        StringJoiner queryBuilder = new StringJoiner("\" AND author:\"", "author:\"", "\"");
         getTestAuthors().forEach(queryBuilder::add);
 
-        List<BibEntry> result = getFetcher()
-            .performSearch(queryBuilder.toString());
+        List<BibEntry> result = getFetcher().performSearch(queryBuilder.toString());
         ImportCleanup.targeting(BibDatabaseMode.BIBTEX).doPostCleanup(result);
 
         assertFalse(result.isEmpty());
@@ -47,9 +42,7 @@ default void supportsAuthorSearch() throws Exception {
             // The co-authors differ, thus we check for the author present at all papers
             getTestAuthors()
                 .forEach(expectedAuthor ->
-                    Assertions.assertTrue(
-                        author.contains(expectedAuthor.replace("\"", ""))
-                    )
+                    Assertions.assertTrue(author.contains(expectedAuthor.replace("\"", "")))
                 );
         });
     }
@@ -59,8 +52,7 @@ default void supportsAuthorSearch() throws Exception {
      */
     @Test
     default void supportsYearSearch() throws Exception {
-        List<BibEntry> result = getFetcher()
-            .performSearch("year:" + getTestYear());
+        List<BibEntry> result = getFetcher().performSearch("year:" + getTestYear());
         ImportCleanup.targeting(BibDatabaseMode.BIBTEX).doPostCleanup(result);
         List<String> differentYearsInResult = result
             .stream()
@@ -70,10 +62,7 @@ default void supportsYearSearch() throws Exception {
             .distinct()
             .collect(Collectors.toList());
 
-        assertEquals(
-            Collections.singletonList(getTestYear().toString()),
-            differentYearsInResult
-        );
+        assertEquals(Collections.singletonList(getTestYear().toString()), differentYearsInResult);
     }
 
     /**
@@ -83,8 +72,7 @@ default void supportsYearSearch() throws Exception {
     default void supportsYearRangeSearch() throws Exception {
         List<String> yearsInYearRange = List.of("2018", "2019", "2020");
 
-        List<BibEntry> result = getFetcher()
-            .performSearch("year-range:2018-2020");
+        List<BibEntry> result = getFetcher().performSearch("year-range:2018-2020");
         ImportCleanup.targeting(BibDatabaseMode.BIBTEX).doPostCleanup(result);
         List<String> differentYearsInResult = result
             .stream()
@@ -105,16 +93,13 @@ default void supportsYearRangeSearch() throws Exception {
      */
     @Test
     default void supportsJournalSearch() throws Exception {
-        List<BibEntry> result = getFetcher()
-            .performSearch("journal:\"" + getTestJournal() + "\"");
+        List<BibEntry> result = getFetcher().performSearch("journal:\"" + getTestJournal() + "\"");
         ImportCleanup.targeting(BibDatabaseMode.BIBTEX).doPostCleanup(result);
 
         assertFalse(result.isEmpty());
         result.forEach(bibEntry -> {
             assertTrue(bibEntry.hasField(StandardField.JOURNAL));
-            String journal = bibEntry
-                .getField(StandardField.JOURNAL)
-                .orElse("");
+            String journal = bibEntry.getField(StandardField.JOURNAL).orElse("");
             assertTrue(journal.contains(getTestJournal().replace("\"", "")));
         });
     }
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 422c34b99c7..f16cbedccb8 100644
--- a/src/test/java/org/jabref/logic/importer/fetcher/SemanticScholarTest.java
+++ b/src/test/java/org/jabref/logic/importer/fetcher/SemanticScholarTest.java
@@ -28,16 +28,11 @@
 @FetcherTest
 public class SemanticScholarTest implements PagedSearchFetcherTest {
 
-    private static final String DOI =
-        "10.23919/IFIPNetworking52078.2021.9472772";
+    private static final String DOI = "10.23919/IFIPNetworking52078.2021.9472772";
 
-    private final ImporterPreferences importerPreferences = mock(
-        ImporterPreferences.class
-    );
+    private final ImporterPreferences importerPreferences = mock(ImporterPreferences.class);
 
-    private final BibEntry IGOR_NEWCOMERS = new BibEntry(
-        StandardEntryType.Article
-    )
+    private final BibEntry IGOR_NEWCOMERS = new BibEntry(StandardEntryType.Article)
         .withField(
             StandardField.AUTHOR,
             "Igor Steinmacher and T. Conte and Christoph Treude and M. Gerosa"
@@ -52,10 +47,7 @@ public class SemanticScholarTest implements PagedSearchFetcherTest {
             StandardField.URL,
             "https://www.semanticscholar.org/paper/4bea2b4029a895bf898701329409e5a784fc2090"
         )
-        .withField(
-            StandardField.VENUE,
-            "International Conference on Software Engineering"
-        );
+        .withField(StandardField.VENUE, "International Conference on Software Engineering");
 
     private SemanticScholar fetcher;
     private BibEntry entry;
@@ -83,10 +75,7 @@ void getDocument() throws IOException, FetcherException {
     void fullTextFindByDOI() throws Exception {
         entry.withField(StandardField.DOI, "10.1038/nrn3241");
         assertEquals(
-            Optional.of(
-                new URI("https://europepmc.org/articles/pmc4907333?pdf=render")
-                    .toURL()
-            ),
+            Optional.of(new URI("https://europepmc.org/articles/pmc4907333?pdf=render").toURL()),
             fetcher.findFullText(entry)
         );
     }
@@ -102,8 +91,7 @@ void fullTextFindByDOIAlternate() throws Exception {
                     .toURL()
             ),
             fetcher.findFullText(
-                new BibEntry()
-                    .withField(StandardField.DOI, "10.3390/healthcare9020206")
+                new BibEntry().withField(StandardField.DOI, "10.3390/healthcare9020206")
             )
         );
     }
@@ -182,8 +170,7 @@ void searchByQueryFindsEntry() throws Exception {
             "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)
-        );
+        fetchedEntries.forEach(entry -> entry.clearField(StandardField.ABSTRACT));
         assertEquals(Collections.singletonList(master), fetchedEntries);
     }
 
@@ -193,8 +180,7 @@ void searchByPlainQueryFindsEntry() throws Exception {
             "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)
-        );
+        fetchedEntries.forEach(entry -> entry.clearField(StandardField.ABSTRACT));
         assertEquals(Collections.singletonList(IGOR_NEWCOMERS), fetchedEntries);
     }
 
@@ -204,8 +190,7 @@ void searchByQuotedQueryFindsEntry() throws Exception {
             "\"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)
-        );
+        fetchedEntries.forEach(entry -> entry.clearField(StandardField.ABSTRACT));
         assertEquals(Collections.singletonList(IGOR_NEWCOMERS), fetchedEntries);
     }
 
@@ -217,10 +202,7 @@ public void performSearchByEmptyQuery() throws Exception {
     @Test
     public void findByEntry() throws Exception {
         BibEntry barrosEntry = new BibEntry(StandardEntryType.Article)
-            .withField(
-                StandardField.TITLE,
-                "Formalising BPMN Service Interaction Patterns"
-            )
+            .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"
@@ -231,15 +213,9 @@ public void findByEntry() throws Exception {
                 StandardField.URL,
                 "https://www.semanticscholar.org/paper/3bb026fd67db7d8e0e25de3189d6b7031b12783e"
             )
-            .withField(
-                StandardField.VENUE,
-                "The Practice of Enterprise Modeling"
-            );
+            .withField(StandardField.VENUE, "The Practice of Enterprise Modeling");
 
-        entry.withField(
-            StandardField.TITLE,
-            "Formalising BPMN Service Interaction Patterns"
-        );
+        entry.withField(StandardField.TITLE, "Formalising BPMN Service Interaction Patterns");
         BibEntry actual = fetcher.performSearch(entry).get(0);
         // 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 823ac3ec7f7..88b8aedad2b 100644
--- a/src/test/java/org/jabref/logic/importer/fetcher/SpringerFetcherTest.java
+++ b/src/test/java/org/jabref/logic/importer/fetcher/SpringerFetcherTest.java
@@ -23,16 +23,14 @@
 import org.junit.jupiter.api.Test;
 
 @FetcherTest
-class SpringerFetcherTest
-    implements SearchBasedFetcherCapabilityTest, PagedSearchFetcherTest {
+class SpringerFetcherTest implements SearchBasedFetcherCapabilityTest, PagedSearchFetcherTest {
 
     ImporterPreferences importerPreferences = mock(ImporterPreferences.class);
     SpringerFetcher fetcher;
 
     @BeforeEach
     void setUp() {
-        when(importerPreferences.getApiKeys())
-            .thenReturn(FXCollections.emptyObservableSet());
+        when(importerPreferences.getApiKeys()).thenReturn(FXCollections.emptyObservableSet());
         fetcher = new SpringerFetcher(importerPreferences);
     }
 
@@ -74,19 +72,13 @@ void searchByQueryFindsEntry() throws Exception {
             .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.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.TITLE, "Being a Mentor in open source projects")
             .withField(StandardField.YEAR, "2021")
             .withField(
                 StandardField.FILE,
@@ -105,10 +97,7 @@ void searchByQueryFindsEntry() throws Exception {
             .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.JOURNAL, "Computer Supported Cooperative Work (CSCW)")
             .withField(StandardField.MONTH, "#apr#")
             .withField(StandardField.PAGES, "247--290")
             .withField(StandardField.NUMBER, "1-2")
@@ -181,17 +170,9 @@ void searchByQueryFindsEntry() throws Exception {
                 "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"
-        );
+        List<BibEntry> fetchedEntries = fetcher.performSearch("JabRef Social Barriers Steinmacher");
         assertEquals(
-            List.of(
-                articleTagThatIssue,
-                fourthArticle,
-                thirdArticle,
-                firstArticle,
-                secondArticle
-            ),
+            List.of(articleTagThatIssue, fourthArticle, thirdArticle, firstArticle, secondArticle),
             fetchedEntries
         );
     }
@@ -216,31 +197,14 @@ void testSpringerJSONToBibtex() {
                     }""";
 
         JSONObject jsonObject = new JSONObject(jsonString);
-        BibEntry bibEntry = SpringerFetcher.parseSpringerJSONtoBibtex(
-            jsonObject
-        );
-        assertEquals(
-            Optional.of("1992"),
-            bibEntry.getField(StandardField.YEAR)
-        );
+        BibEntry bibEntry = SpringerFetcher.parseSpringerJSONtoBibtex(jsonObject);
+        assertEquals(Optional.of("1992"), bibEntry.getField(StandardField.YEAR));
         assertEquals(Optional.of("5"), bibEntry.getField(StandardField.NUMBER));
-        assertEquals(
-            Optional.of("#sep#"),
-            bibEntry.getField(StandardField.MONTH)
-        );
-        assertEquals(
-            Optional.of("10.1007/BF01201962"),
-            bibEntry.getField(StandardField.DOI)
-        );
+        assertEquals(Optional.of("#sep#"), bibEntry.getField(StandardField.MONTH));
+        assertEquals(Optional.of("10.1007/BF01201962"), bibEntry.getField(StandardField.DOI));
         assertEquals(Optional.of("8"), bibEntry.getField(StandardField.VOLUME));
-        assertEquals(
-            Optional.of("Springer"),
-            bibEntry.getField(StandardField.PUBLISHER)
-        );
-        assertEquals(
-            Optional.of("1992-09-01"),
-            bibEntry.getField(StandardField.DATE)
-        );
+        assertEquals(Optional.of("Springer"), bibEntry.getField(StandardField.PUBLISHER));
+        assertEquals(Optional.of("1992-09-01"), bibEntry.getField(StandardField.DATE));
     }
 
     @Test
@@ -249,9 +213,7 @@ void searchByEmptyQueryFindsNothing() throws Exception {
     }
 
     @Test
-    @Disabled(
-        "Year search is currently broken, because the API returns mutliple years."
-    )
+    @Disabled("Year search is currently broken, because the API returns mutliple years.")
     @Override
     public void supportsYearSearch() {}
 
@@ -290,9 +252,7 @@ public void supportsPhraseSearch() throws Exception {
                 "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> resultPhrase = fetcher.performSearch("author:\"Redmiles David\"");
         List<BibEntry> result = fetcher.performSearch("author:Redmiles David");
 
         // Phrase search should be a subset of the normal search result.
@@ -303,9 +263,7 @@ public void supportsPhraseSearch() throws Exception {
 
     @Test
     public void supportsBooleanANDSearch() throws Exception {
-        List<BibEntry> resultJustByAuthor = fetcher.performSearch(
-            "author:\"Redmiles, David\""
-        );
+        List<BibEntry> resultJustByAuthor = fetcher.performSearch("author:\"Redmiles, David\"");
         List<BibEntry> result = fetcher.performSearch(
             "author:\"Redmiles, David\" AND journal:\"Computer Supported Cooperative Work\""
         );
@@ -324,8 +282,7 @@ public void supportsBooleanANDSearch() throws Exception {
             .map(bibEntry -> bibEntry.getField(StandardField.AUTHOR))
             .filter(Optional::isPresent)
             .map(Optional::get)
-            .forEach(authorField -> assertTrue(authorField.contains("Redmiles"))
-            );
+            .forEach(authorField -> assertTrue(authorField.contains("Redmiles")));
     }
 
     @Override
@@ -335,11 +292,7 @@ public SearchBasedFetcher getFetcher() {
 
     @Override
     public List<String> getTestAuthors() {
-        return List.of(
-            "Steinmacher, Igor",
-            "Gerosa, Marco",
-            "Conte, Tayana U."
-        );
+        return List.of("Steinmacher, Igor", "Gerosa, Marco", "Conte, Tayana U.");
     }
 
     @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 4f9e1449b66..86ea9e98184 100644
--- a/src/test/java/org/jabref/logic/importer/fetcher/SpringerLinkTest.java
+++ b/src/test/java/org/jabref/logic/importer/fetcher/SpringerLinkTest.java
@@ -20,26 +20,20 @@
 @FetcherTest
 public class SpringerLinkTest {
 
-    private final ImporterPreferences importerPreferences = mock(
-        ImporterPreferences.class
-    );
+    private final ImporterPreferences importerPreferences = mock(ImporterPreferences.class);
     private SpringerLink finder;
     private BibEntry entry;
 
     @BeforeEach
     public void setUp() {
-        when(importerPreferences.getApiKeys())
-            .thenReturn(FXCollections.emptyObservableSet());
+        when(importerPreferences.getApiKeys()).thenReturn(FXCollections.emptyObservableSet());
         finder = new SpringerLink(importerPreferences);
         entry = new BibEntry();
     }
 
     @Test
     public void rejectNullParameter() {
-        assertThrows(
-            NullPointerException.class,
-            () -> finder.findFullText(null)
-        );
+        assertThrows(NullPointerException.class, () -> finder.findFullText(null));
     }
 
     @Test
@@ -53,9 +47,7 @@ public void findByDOI() throws IOException {
         entry.setField(StandardField.DOI, "10.1186/s13677-015-0042-8");
         assertEquals(
             Optional.of(
-                new URL(
-                    "http://link.springer.com/content/pdf/10.1186/s13677-015-0042-8.pdf"
-                )
+                new URL("http://link.springer.com/content/pdf/10.1186/s13677-015-0042-8.pdf")
             ),
             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 fcd134323a7..f8bac002533 100644
--- a/src/test/java/org/jabref/logic/importer/fetcher/TitleFetcherTest.java
+++ b/src/test/java/org/jabref/logic/importer/fetcher/TitleFetcherTest.java
@@ -22,10 +22,7 @@ public class TitleFetcherTest {
 
     @BeforeEach
     public void setUp() {
-        fetcher =
-            new TitleFetcher(
-                mock(ImportFormatPreferences.class, Answers.RETURNS_DEEP_STUBS)
-            );
+        fetcher = new TitleFetcher(mock(ImportFormatPreferences.class, Answers.RETURNS_DEEP_STUBS));
 
         bibEntryBischof2009 = new BibEntry();
         bibEntryBischof2009.setType(StandardEntryType.InProceedings);
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 2f6bad455a9..cd4c1c6e571 100644
--- a/src/test/java/org/jabref/logic/importer/fetcher/ZbMATHTest.java
+++ b/src/test/java/org/jabref/logic/importer/fetcher/ZbMATHTest.java
@@ -29,10 +29,7 @@ void setUp() throws Exception {
             ImportFormatPreferences.class,
             Answers.RETURNS_DEEP_STUBS
         );
-        when(
-            importFormatPreferences.bibEntryPreferences().getKeywordSeparator()
-        )
-            .thenReturn(',');
+        when(importFormatPreferences.bibEntryPreferences().getKeywordSeparator()).thenReturn(',');
 
         fetcher = new ZbMATH(importFormatPreferences);
 
@@ -40,17 +37,11 @@ void setUp() throws Exception {
         donaldsonEntry.setType(StandardEntryType.Article);
         donaldsonEntry.setCitationKey("zbMATH03800580");
         donaldsonEntry.setField(StandardField.AUTHOR, "Donaldson, S. K.");
-        donaldsonEntry.setField(
-            StandardField.JOURNAL,
-            "Journal of Differential Geometry"
-        );
+        donaldsonEntry.setField(StandardField.JOURNAL, "Journal of Differential Geometry");
         donaldsonEntry.setField(StandardField.DOI, "10.4310/jdg/1214437665");
         donaldsonEntry.setField(StandardField.ISSN, "0022-040X");
         donaldsonEntry.setField(StandardField.LANGUAGE, "English");
-        donaldsonEntry.setField(
-            StandardField.KEYWORDS,
-            "57N13,57R10,53C05,58J99,57R65"
-        );
+        donaldsonEntry.setField(StandardField.KEYWORDS, "57N13,57R10,53C05,58J99,57R65");
         donaldsonEntry.setField(StandardField.PAGES, "279--315");
         donaldsonEntry.setField(
             StandardField.TITLE,
@@ -70,9 +61,7 @@ void searchByQueryFindsEntry() throws Exception {
 
     @Test
     void searchByIdFindsEntry() throws Exception {
-        Optional<BibEntry> fetchedEntry = fetcher.performSearchById(
-            "0507.57010"
-        );
+        Optional<BibEntry> fetchedEntry = fetcher.performSearchById("0507.57010");
         assertEquals(Optional.of(donaldsonEntry), fetchedEntry);
     }
 
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 eb3efc5d15b..40b82f2bf7f 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
@@ -20,8 +20,7 @@
 
 @Disabled("Page https://doi-to-bibtex-converter.herokuapp.com is down")
 @FetcherTest
-public class DoiToBibtexConverterComIsbnFetcherTest
-    extends AbstractIsbnFetcherTest {
+public class DoiToBibtexConverterComIsbnFetcherTest extends AbstractIsbnFetcherTest {
 
     @BeforeEach
     public void setUp() {
@@ -46,10 +45,7 @@ public void setUp() {
     @Test
     @Override
     public void testName() {
-        assertEquals(
-            "ISBN (doi-to-bibtex-converter.herokuapp.com)",
-            fetcher.getName()
-        );
+        assertEquals("ISBN (doi-to-bibtex-converter.herokuapp.com)", fetcher.getName());
     }
 
     @Test
@@ -72,17 +68,12 @@ 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.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"
-        );
+        Optional<BibEntry> fetchedEntry = fetcher.performSearchById("9783110702125");
         assertEquals(Optional.of(bibEntry), fetchedEntry);
     }
 
@@ -104,9 +95,6 @@ public void searchByIdFailedWithLongISBN() {
 
     @Test
     public void searchByIdFailedWithShortISBN() throws FetcherException {
-        assertThrows(
-            FetcherClientException.class,
-            () -> fetcher.performSearchById("0321356683")
-        );
+        assertThrows(FetcherClientException.class, () -> fetcher.performSearchById("0321356683"));
     }
 }
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 ef274a98811..4dd00ca8237 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
@@ -41,9 +41,7 @@ public void setUp() {
                 );
 
         fetcher =
-            new EbookDeIsbnFetcher(
-                mock(ImportFormatPreferences.class, Answers.RETURNS_DEEP_STUBS)
-            );
+            new EbookDeIsbnFetcher(mock(ImportFormatPreferences.class, Answers.RETURNS_DEEP_STUBS));
     }
 
     @Test
@@ -55,18 +53,14 @@ public void testName() {
     @Test
     @Override
     public void searchByIdSuccessfulWithShortISBN() throws FetcherException {
-        Optional<BibEntry> fetchedEntry = fetcher.performSearchById(
-            "0134685997"
-        );
+        Optional<BibEntry> fetchedEntry = fetcher.performSearchById("0134685997");
         assertEquals(Optional.of(bibEntryEffectiveJava), fetchedEntry);
     }
 
     @Test
     @Override
     public void searchByIdSuccessfulWithLongISBN() throws FetcherException {
-        Optional<BibEntry> fetchedEntry = fetcher.performSearchById(
-            "9780134685991"
-        );
+        Optional<BibEntry> fetchedEntry = fetcher.performSearchById("9780134685991");
         assertEquals(Optional.of(bibEntryEffectiveJava), fetchedEntry);
     }
 
@@ -75,10 +69,7 @@ public void searchByIdSuccessfulWithLongISBN() throws FetcherException {
     public void authorsAreCorrectlyFormatted() throws Exception {
         BibEntry bibEntry = new BibEntry(StandardEntryType.Book)
             .withCitationKey("9783662585856")
-            .withField(
-                StandardField.TITLE,
-                "Fundamentals of Business Process Management"
-            )
+            .withField(StandardField.TITLE, "Fundamentals of Business Process Management")
             .withField(StandardField.PUBLISHER, "Springer Berlin Heidelberg")
             .withField(StandardField.YEAR, "2019")
             .withField(
@@ -94,9 +85,7 @@ public void authorsAreCorrectlyFormatted() throws Exception {
                 "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"
-        );
+        Optional<BibEntry> fetchedEntry = fetcher.performSearchById("3662585855");
         assertEquals(Optional.of(bibEntry), fetchedEntry);
     }
 
@@ -106,9 +95,6 @@ public void authorsAreCorrectlyFormatted() throws Exception {
      */
     @Test
     public void searchForValidButNotFoundISBN() throws Exception {
-        assertThrows(
-            FetcherClientException.class,
-            () -> fetcher.performSearchById("3728128155")
-        );
+        assertThrows(FetcherClientException.class, () -> fetcher.performSearchById("3728128155"));
     }
 }
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 0080c9925a1..ea11cb66ca4 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
@@ -41,14 +41,8 @@ public void setUp() {
                 .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.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*"
@@ -56,15 +50,9 @@ public void setUp() {
                 .withField(StandardField.ISBN, "9780321356680")
                 .withField(StandardField.PAGETOTAL, "346")
                 .withField(new UnknownField("ppn_gvk"), "67954951X")
-                .withField(
-                    StandardField.SUBTITLE,
-                    "[revised and updated for Java SE 6]"
-                );
+                .withField(StandardField.SUBTITLE, "[revised and updated for Java SE 6]");
 
-        fetcher =
-            new GvkFetcher(
-                mock(ImportFormatPreferences.class, Answers.RETURNS_DEEP_STUBS)
-            );
+        fetcher = new GvkFetcher(mock(ImportFormatPreferences.class, Answers.RETURNS_DEEP_STUBS));
     }
 
     @Test
@@ -76,18 +64,14 @@ public void testName() {
     @Test
     @Override
     public void searchByIdSuccessfulWithShortISBN() throws FetcherException {
-        Optional<BibEntry> fetchedEntry = fetcher.performSearchById(
-            "0321356683"
-        );
+        Optional<BibEntry> fetchedEntry = fetcher.performSearchById("0321356683");
         assertEquals(Optional.of(bibEntryEffectiveJavaLongISBN), fetchedEntry);
     }
 
     @Test
     @Override
     public void searchByIdSuccessfulWithLongISBN() throws FetcherException {
-        Optional<BibEntry> fetchedEntry = fetcher.performSearchById(
-            "9780321356680"
-        );
+        Optional<BibEntry> fetchedEntry = fetcher.performSearchById("9780321356680");
         assertEquals(Optional.of(bibEntryEffectiveJavaLongISBN), fetchedEntry);
     }
 
@@ -109,9 +93,7 @@ public void authorsAreCorrectlyFormatted() throws Exception {
             .withField(StandardField.SERIES, "Handbuch der Informatik")
             .withField(new UnknownField("ppn_gvk"), "1738076555");
 
-        Optional<BibEntry> fetchedEntry = fetcher.performSearchById(
-            "9783110702125"
-        );
+        Optional<BibEntry> fetchedEntry = fetcher.performSearchById("9783110702125");
         assertEquals(Optional.of(bibEntry), fetchedEntry);
     }
 
@@ -119,23 +101,17 @@ public void authorsAreCorrectlyFormatted() throws Exception {
      * Checks whether the given ISBN is <emph>NOT</emph> available at any ISBN fetcher
      */
     @Test
-    public void testIsbnNeitherAvailableOnEbookDeNorOrViaOpenLibrary()
-        throws Exception {
+    public void testIsbnNeitherAvailableOnEbookDeNorOrViaOpenLibrary() 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 testEResourceIsbnIsReturnedAsBoook() throws Exception {
         assertEquals(
             Optional.of(StandardEntryType.Book),
-            fetcher
-                .performSearchById("978-0-8229-4557-4")
-                .map(BibEntry::getType)
+            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 861f7470913..a55c553a1f6 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
@@ -27,10 +27,7 @@ class IsbnFetcherTest {
 
     @BeforeEach
     void setUp() {
-        fetcher =
-            new IsbnFetcher(
-                mock(ImportFormatPreferences.class, Answers.RETURNS_DEEP_STUBS)
-            );
+        fetcher = new IsbnFetcher(mock(ImportFormatPreferences.class, Answers.RETURNS_DEEP_STUBS));
 
         bibEntry =
             new BibEntry(StandardEntryType.Book)
@@ -56,17 +53,13 @@ void testName() {
 
     @Test
     void searchByIdSuccessfulWithShortISBN() throws FetcherException {
-        Optional<BibEntry> fetchedEntry = fetcher.performSearchById(
-            "0134685997"
-        );
+        Optional<BibEntry> fetchedEntry = fetcher.performSearchById("0134685997");
         assertEquals(Optional.of(bibEntry), fetchedEntry);
     }
 
     @Test
     void searchByIdSuccessfulWithLongISBN() throws FetcherException {
-        Optional<BibEntry> fetchedEntry = fetcher.performSearchById(
-            "9780134685991"
-        );
+        Optional<BibEntry> fetchedEntry = fetcher.performSearchById("9780134685991");
         assertEquals(Optional.of(bibEntry), fetchedEntry);
     }
 
@@ -78,32 +71,22 @@ void searchByIdReturnsEmptyWithEmptyISBN() throws FetcherException {
 
     @Test
     void searchByIdThrowsExceptionForShortInvalidISBN() {
-        assertThrows(
-            FetcherException.class,
-            () -> fetcher.performSearchById("123456789")
-        );
+        assertThrows(FetcherException.class, () -> fetcher.performSearchById("123456789"));
     }
 
     @Test
     void searchByIdThrowsExceptionForLongInvalidISB() {
-        assertThrows(
-            FetcherException.class,
-            () -> fetcher.performSearchById("012345678910")
-        );
+        assertThrows(FetcherException.class, () -> fetcher.performSearchById("012345678910"));
     }
 
     @Test
     void searchByIdThrowsExceptionForInvalidISBN() {
-        assertThrows(
-            FetcherException.class,
-            () -> fetcher.performSearchById("jabref-4-ever")
-        );
+        assertThrows(FetcherException.class, () -> fetcher.performSearchById("jabref-4-ever"));
     }
 
     @Test
     void searchByEntryWithISBNSuccessful() throws FetcherException {
-        BibEntry input = new BibEntry()
-            .withField(StandardField.ISBN, "0134685997");
+        BibEntry input = new BibEntry().withField(StandardField.ISBN, "0134685997");
 
         List<BibEntry> fetchedEntry = fetcher.performSearch(input);
         assertEquals(Collections.singletonList(bibEntry), fetchedEntry);
@@ -114,11 +97,8 @@ void searchByEntryWithISBNSuccessful() throws FetcherException {
      * not available on ebook.de. The fetcher should something as it falls back to OttoBib
      */
     @Test
-    void searchForIsbnAvailableAtOttoBibButNonOnEbookDe()
-        throws FetcherException {
-        Optional<BibEntry> fetchedEntry = fetcher.performSearchById(
-            "3728128155"
-        );
+    void searchForIsbnAvailableAtOttoBibButNonOnEbookDe() throws FetcherException {
+        Optional<BibEntry> fetchedEntry = fetcher.performSearchById("3728128155");
         assertNotEquals(Optional.empty(), fetchedEntry);
     }
 }
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 6139494de62..cb4b4becad7 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
@@ -47,18 +47,14 @@ public void testName() {
     @Test
     @Override
     public void searchByIdSuccessfulWithShortISBN() throws FetcherException {
-        Optional<BibEntry> fetchedEntry = fetcher.performSearchById(
-            "0321356683"
-        );
+        Optional<BibEntry> fetchedEntry = fetcher.performSearchById("0321356683");
         assertEquals(Optional.of(bibEntryEffectiveJava), fetchedEntry);
     }
 
     @Test
     @Override
     public void searchByIdSuccessfulWithLongISBN() throws FetcherException {
-        Optional<BibEntry> fetchedEntry = fetcher.performSearchById(
-            "9780321356680"
-        );
+        Optional<BibEntry> fetchedEntry = fetcher.performSearchById("9780321356680");
         assertEquals(Optional.of(bibEntryEffectiveJava), fetchedEntry);
     }
 
@@ -69,15 +65,10 @@ public void authorsAreCorrectlyFormatted() throws Exception {
             .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.AUTHOR, "Habermann, Hans-Joachim and Leymann, Frank")
             .withField(StandardField.ISBN, "9783110702125")
             .withField(StandardField.YEAR, "2020");
-        Optional<BibEntry> fetchedEntry = fetcher.performSearchById(
-            "9783110702125"
-        );
+        Optional<BibEntry> fetchedEntry = fetcher.performSearchById("9783110702125");
         assertEquals(Optional.of(bibEntry), fetchedEntry);
     }
 
@@ -85,8 +76,7 @@ public void authorsAreCorrectlyFormatted() throws Exception {
      * Checks whether the given ISBN is <emph>NOT</emph> available at any ISBN fetcher
      */
     @Test
-    public void testIsbnNeitherAvailableOnEbookDeNorOrViaOpenLibrary()
-        throws Exception {
+    public void testIsbnNeitherAvailableOnEbookDeNorOrViaOpenLibrary() 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(
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 ea531f7693f..a77452a9d4e 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
@@ -18,8 +18,7 @@
 import org.junit.jupiter.params.provider.Arguments;
 import org.junit.jupiter.params.provider.MethodSource;
 
-class CiteSeerQueryTransformerTest
-    extends InfixTransformerTest<CiteSeerQueryTransformer> {
+class CiteSeerQueryTransformerTest extends InfixTransformerTest<CiteSeerQueryTransformer> {
 
     @Override
     protected CiteSeerQueryTransformer getTransformer() {
@@ -34,12 +33,8 @@ public void convertYearField() throws Exception {
         CiteSeerQueryTransformer transformer = getTransformer();
         transformer.transformLuceneQuery(luceneQuery);
 
-        Optional<Integer> start = Optional.of(
-            transformer.getJSONPayload().getInt("yearStart")
-        );
-        Optional<Integer> end = Optional.of(
-            transformer.getJSONPayload().getInt("yearEnd")
-        );
+        Optional<Integer> start = Optional.of(transformer.getJSONPayload().getInt("yearStart"));
+        Optional<Integer> end = Optional.of(transformer.getJSONPayload().getInt("yearEnd"));
         assertEquals(Optional.of(2023), start);
         assertEquals(Optional.of(2023), end);
     }
@@ -52,12 +47,8 @@ public void convertYearRangeField() throws Exception {
         CiteSeerQueryTransformer transformer = getTransformer();
         transformer.transformLuceneQuery(luceneQuery);
 
-        Optional<Integer> start = Optional.of(
-            transformer.getJSONPayload().getInt("yearStart")
-        );
-        Optional<Integer> end = Optional.of(
-            transformer.getJSONPayload().getInt("yearEnd")
-        );
+        Optional<Integer> start = Optional.of(transformer.getJSONPayload().getInt("yearStart"));
+        Optional<Integer> end = Optional.of(transformer.getJSONPayload().getInt("yearEnd"));
         assertEquals(Optional.of(2019), start);
         assertEquals(Optional.of(2023), end);
     }
@@ -70,9 +61,7 @@ public void convertPageField() throws Exception {
         CiteSeerQueryTransformer transformer = getTransformer();
         transformer.transformLuceneQuery(luceneQuery);
 
-        Optional<Integer> page = Optional.of(
-            transformer.getJSONPayload().getInt("page")
-        );
+        Optional<Integer> page = Optional.of(transformer.getJSONPayload().getInt("page"));
         assertEquals(Optional.of(2), page);
     }
 
@@ -84,9 +73,7 @@ public void convertPageSizeField() throws Exception {
         CiteSeerQueryTransformer transformer = getTransformer();
         transformer.transformLuceneQuery(luceneQuery);
 
-        Optional<Integer> pageSize = Optional.of(
-            transformer.getJSONPayload().getInt("pageSize")
-        );
+        Optional<Integer> pageSize = Optional.of(transformer.getJSONPayload().getInt("pageSize"));
         assertEquals(Optional.of(20), pageSize);
     }
 
@@ -106,42 +93,23 @@ public void convertSortByField() throws Exception {
 
     @Test
     public void convertMultipleAuthors() throws Exception {
-        String queryString =
-            "author:\"Wang Wei\" author:\"Zhang Pingwen\" author:\"Zhang Zhifei\"";
+        String queryString = "author:\"Wang Wei\" author:\"Zhang Pingwen\" author:\"Zhang Zhifei\"";
         QueryNode luceneQuery = new StandardSyntaxParser()
             .parse(queryString, AbstractQueryTransformer.NO_EXPLICIT_FIELD);
         CiteSeerQueryTransformer transformer = getTransformer();
         transformer.transformLuceneQuery(luceneQuery);
 
-        List<String> authorsActual = transformer
-            .getJSONPayload()
-            .getJSONArray("author")
-            .toList();
-        List<String> authorsExpected = List.of(
-            "Wang Wei",
-            "Zhang Pingwen",
-            "Zhang Zhifei"
-        );
+        List<String> authorsActual = transformer.getJSONPayload().getJSONArray("author").toList();
+        List<String> authorsExpected = List.of("Wang Wei", "Zhang Pingwen", "Zhang Zhifei");
         assertEquals(authorsExpected, authorsActual);
     }
 
-    private static Stream<Arguments> getJSONWithYearVariations()
-        throws FetcherException {
+    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
-            )
+            StringUtil.join(new String[] { baseString, "year:2020" }, " ", 0, 2),
+            StringUtil.join(new String[] { baseString, "year-range:2019-2023" }, " ", 0, 2)
         );
 
         JSONObject expectedJson = new JSONObject();
@@ -157,15 +125,11 @@ private static Stream<Arguments> getJSONWithYearVariations()
             try {
                 luceneQuery =
                     new StandardSyntaxParser()
-                        .parse(
-                            requestStr,
-                            AbstractQueryTransformer.NO_EXPLICIT_FIELD
-                        );
+                        .parse(requestStr, AbstractQueryTransformer.NO_EXPLICIT_FIELD);
             } catch (QueryNodeParseException e) {
                 throw new RuntimeException(e);
             }
-            CiteSeerQueryTransformer transformer =
-                new CiteSeerQueryTransformer();
+            CiteSeerQueryTransformer transformer = new CiteSeerQueryTransformer();
             transformer.transformLuceneQuery(luceneQuery);
             actualJSONObjects.add(transformer.getJSONPayload());
         });
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 1a9ea9d9847..dd35783475f 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
@@ -7,9 +7,7 @@
 import org.apache.lucene.queryparser.flexible.standard.parser.StandardSyntaxParser;
 
 class CollectionOfComputerScienceBibliographiesQueryTransformerTest
-    extends InfixTransformerTest<
-        CollectionOfComputerScienceBibliographiesQueryTransformer
-    > {
+    extends InfixTransformerTest<CollectionOfComputerScienceBibliographiesQueryTransformer> {
 
     @Override
     public CollectionOfComputerScienceBibliographiesQueryTransformer getTransformer() {
@@ -41,8 +39,7 @@ public void convertYearField() throws Exception {
         String queryString = "2018";
         QueryNode luceneQuery = new StandardSyntaxParser()
             .parse(queryString, AbstractQueryTransformer.NO_EXPLICIT_FIELD);
-        Optional<String> query = getTransformer()
-            .transformLuceneQuery(luceneQuery);
+        Optional<String> query = getTransformer().transformLuceneQuery(luceneQuery);
         assertEquals(Optional.of("year:2018"), query);
     }
 
@@ -51,11 +48,7 @@ public void convertYearRangeField() throws Exception {
         String queryString = "year-range:2018-2021";
         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
-        );
+        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 792a8498204..c1473106c32 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
@@ -6,8 +6,7 @@
 import org.apache.lucene.queryparser.flexible.core.nodes.QueryNode;
 import org.apache.lucene.queryparser.flexible.standard.parser.StandardSyntaxParser;
 
-class DBLPQueryTransformerTest
-    extends InfixTransformerTest<DBLPQueryTransformer> {
+class DBLPQueryTransformerTest extends InfixTransformerTest<DBLPQueryTransformer> {
 
     @Override
     public DBLPQueryTransformer getTransformer() {
@@ -39,8 +38,7 @@ public void convertYearField() throws Exception {
         String queryString = "year:2015";
         QueryNode luceneQuery = new StandardSyntaxParser()
             .parse(queryString, AbstractQueryTransformer.NO_EXPLICIT_FIELD);
-        Optional<String> searchQuery = getTransformer()
-            .transformLuceneQuery(luceneQuery);
+        Optional<String> searchQuery = getTransformer().transformLuceneQuery(luceneQuery);
         Optional<String> expected = Optional.of("2015");
         assertEquals(expected, searchQuery);
     }
@@ -50,8 +48,7 @@ public void convertYearRangeField() throws Exception {
         String queryString = "year-range:2012-2015";
         QueryNode luceneQuery = new StandardSyntaxParser()
             .parse(queryString, AbstractQueryTransformer.NO_EXPLICIT_FIELD);
-        Optional<String> searchQuery = getTransformer()
-            .transformLuceneQuery(luceneQuery);
+        Optional<String> searchQuery = getTransformer().transformLuceneQuery(luceneQuery);
         Optional<String> expected = Optional.of("2012|2013|2014|2015");
         assertEquals(expected, 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 c6027238713..5529b4e4403 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,9 +1,7 @@
 package org.jabref.logic.importer.fetcher.transformers;
 
 class DefaultQueryTransformerTest
-    extends YearAndYearRangeByFilteringQueryTransformerTest<
-        DefaultQueryTransformer
-    > {
+    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 af5c1db430e..8d52691f499 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
@@ -7,8 +7,7 @@
 import org.apache.lucene.queryparser.flexible.standard.parser.StandardSyntaxParser;
 import org.junit.jupiter.api.Disabled;
 
-class GVKQueryTransformerTest
-    extends InfixTransformerTest<GVKQueryTransformer> {
+class GVKQueryTransformerTest extends InfixTransformerTest<GVKQueryTransformer> {
 
     @Override
     public GVKQueryTransformer getTransformer() {
@@ -40,8 +39,7 @@ public void convertYearField() throws Exception {
         String queryString = "year:2018";
         QueryNode luceneQuery = new StandardSyntaxParser()
             .parse(queryString, AbstractQueryTransformer.NO_EXPLICIT_FIELD);
-        Optional<String> query = getTransformer()
-            .transformLuceneQuery(luceneQuery);
+        Optional<String> query = getTransformer().transformLuceneQuery(luceneQuery);
 
         Optional<String> expected = Optional.of("ver:2018");
         assertEquals(expected, query);
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 09f9cec7a04..765bc38f0ff 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
@@ -10,8 +10,7 @@
 import org.junit.jupiter.params.provider.Arguments;
 import org.junit.jupiter.params.provider.MethodSource;
 
-class IEEEQueryTransformerTest
-    extends InfixTransformerTest<IEEEQueryTransformer> {
+class IEEEQueryTransformerTest extends InfixTransformerTest<IEEEQueryTransformer> {
 
     @Override
     public IEEEQueryTransformer getTransformer() {
@@ -95,12 +94,10 @@ private static Stream<Arguments> getTitleTestData() {
 
     @ParameterizedTest
     @MethodSource("getTitleTestData")
-    public void testStopWordRemoval(String expected, String queryString)
-        throws Exception {
+    public void testStopWordRemoval(String expected, String queryString) throws Exception {
         QueryNode luceneQuery = new StandardSyntaxParser()
             .parse(queryString, AbstractQueryTransformer.NO_EXPLICIT_FIELD);
-        Optional<String> result = getTransformer()
-            .transformLuceneQuery(luceneQuery);
+        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 e71b8da7e7a..928a031050e 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
@@ -39,11 +39,8 @@ public void convertAuthorFieldPrefix() throws Exception {
         String queryString = "author:\"Igor Steinmacher\"";
         QueryNode luceneQuery = new StandardSyntaxParser()
             .parse(queryString, AbstractQueryTransformer.NO_EXPLICIT_FIELD);
-        Optional<String> searchQuery = getTransformer()
-            .transformLuceneQuery(luceneQuery);
-        Optional<String> expected = Optional.of(
-            getAuthorPrefix() + "\"Igor Steinmacher\""
-        );
+        Optional<String> searchQuery = getTransformer().transformLuceneQuery(luceneQuery);
+        Optional<String> expected = Optional.of(getAuthorPrefix() + "\"Igor Steinmacher\"");
         assertEquals(expected, searchQuery);
     }
 
@@ -52,11 +49,8 @@ public void convertUnFieldedTermPrefix() throws Exception {
         String queryString = "\"default value\"";
         QueryNode luceneQuery = new StandardSyntaxParser()
             .parse(queryString, AbstractQueryTransformer.NO_EXPLICIT_FIELD);
-        Optional<String> searchQuery = getTransformer()
-            .transformLuceneQuery(luceneQuery);
-        Optional<String> expected = Optional.of(
-            getUnFieldedPrefix() + queryString
-        );
+        Optional<String> searchQuery = getTransformer().transformLuceneQuery(luceneQuery);
+        Optional<String> expected = Optional.of(getUnFieldedPrefix() + queryString);
         assertEquals(expected, searchQuery);
     }
 
@@ -65,11 +59,8 @@ public void convertExplicitUnFieldedTermPrefix() throws Exception {
         String queryString = "default:\"default value\"";
         QueryNode luceneQuery = new StandardSyntaxParser()
             .parse(queryString, AbstractQueryTransformer.NO_EXPLICIT_FIELD);
-        Optional<String> searchQuery = getTransformer()
-            .transformLuceneQuery(luceneQuery);
-        Optional<String> expected = Optional.of(
-            getUnFieldedPrefix() + "\"default value\""
-        );
+        Optional<String> searchQuery = getTransformer().transformLuceneQuery(luceneQuery);
+        Optional<String> expected = Optional.of(getUnFieldedPrefix() + "\"default value\"");
         assertEquals(expected, searchQuery);
     }
 
@@ -78,8 +69,7 @@ public void convertJournalFieldPrefix() throws Exception {
         String queryString = "journal:Nature";
         QueryNode luceneQuery = new StandardSyntaxParser()
             .parse(queryString, AbstractQueryTransformer.NO_EXPLICIT_FIELD);
-        Optional<String> searchQuery = getTransformer()
-            .transformLuceneQuery(luceneQuery);
+        Optional<String> searchQuery = getTransformer().transformLuceneQuery(luceneQuery);
         Optional<String> expected = Optional.of(getJournalPrefix() + "Nature");
         assertEquals(expected, searchQuery);
     }
@@ -92,12 +82,10 @@ public void convertJournalFieldPrefix() throws Exception {
 
     @Test
     public void convertMultipleValuesWithTheSameFieldPrefix() throws Exception {
-        String queryString =
-            "author:\"Igor Steinmacher\" author:\"Christoph Treude\"";
+        String queryString = "author:\"Igor Steinmacher\" author:\"Christoph Treude\"";
         QueryNode luceneQuery = new StandardSyntaxParser()
             .parse(queryString, AbstractQueryTransformer.NO_EXPLICIT_FIELD);
-        Optional<String> searchQuery = getTransformer()
-            .transformLuceneQuery(luceneQuery);
+        Optional<String> searchQuery = getTransformer().transformLuceneQuery(luceneQuery);
         Optional<String> expected = Optional.of(
             getAuthorPrefix() +
             "\"Igor Steinmacher\"" +
@@ -114,8 +102,7 @@ public void groupedOperationsPrefix() throws Exception {
             "(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> searchQuery = getTransformer().transformLuceneQuery(luceneQuery);
         Optional<String> expected = Optional.of(
             "(" +
             getAuthorPrefix() +
@@ -136,12 +123,10 @@ public void groupedOperationsPrefix() throws Exception {
 
     @Test
     public void notOperatorPrefix() throws Exception {
-        String queryString =
-            "!(author:\"Igor Steinmacher\" OR author:\"Christoph Treude\")";
+        String queryString = "!(author:\"Igor Steinmacher\" OR author:\"Christoph Treude\")";
         QueryNode luceneQuery = new StandardSyntaxParser()
             .parse(queryString, AbstractQueryTransformer.NO_EXPLICIT_FIELD);
-        Optional<String> searchQuery = getTransformer()
-            .transformLuceneQuery(luceneQuery);
+        Optional<String> searchQuery = getTransformer().transformLuceneQuery(luceneQuery);
         Optional<String> expected = Optional.of(
             getTransformer().getLogicalNotOperator() +
             "(" +
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 ac963c2a975..0f004a4de95 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
@@ -6,8 +6,7 @@
 import org.apache.lucene.queryparser.flexible.core.nodes.QueryNode;
 import org.apache.lucene.queryparser.flexible.standard.parser.StandardSyntaxParser;
 
-class JstorQueryTransformerTest
-    extends InfixTransformerTest<JstorQueryTransformer> {
+class JstorQueryTransformerTest extends InfixTransformerTest<JstorQueryTransformer> {
 
     @Override
     public JstorQueryTransformer getTransformer() {
@@ -39,8 +38,7 @@ public void convertYearField() throws Exception {
         String queryString = "year:2018";
         QueryNode luceneQuery = new StandardSyntaxParser()
             .parse(queryString, AbstractQueryTransformer.NO_EXPLICIT_FIELD);
-        Optional<String> query = getTransformer()
-            .transformLuceneQuery(luceneQuery);
+        Optional<String> query = getTransformer().transformLuceneQuery(luceneQuery);
         assertEquals(Optional.of("sd:2018 AND ed:2018"), query);
     }
 
@@ -49,8 +47,7 @@ public void convertYearRangeField() throws Exception {
         String queryString = "year-range:2018-2021";
         QueryNode luceneQuery = new StandardSyntaxParser()
             .parse(queryString, AbstractQueryTransformer.NO_EXPLICIT_FIELD);
-        Optional<String> query = getTransformer()
-            .transformLuceneQuery(luceneQuery);
+        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 5a778c49e26..249e797088d 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,9 +1,7 @@
 package org.jabref.logic.importer.fetcher.transformers;
 
 class ScholarQueryTransformerTest
-    extends YearAndYearRangeByFilteringQueryTransformerTest<
-        ScholarQueryTransformer
-    > {
+    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 84e401ae6d3..d89510254f6 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
@@ -6,8 +6,7 @@
 import org.apache.lucene.queryparser.flexible.core.nodes.QueryNode;
 import org.apache.lucene.queryparser.flexible.standard.parser.StandardSyntaxParser;
 
-class SpringerQueryTransformerTest
-    extends InfixTransformerTest<SpringerQueryTransformer> {
+class SpringerQueryTransformerTest extends InfixTransformerTest<SpringerQueryTransformer> {
 
     @Override
     public String getAuthorPrefix() {
@@ -39,8 +38,7 @@ public void convertYearField() throws Exception {
         String queryString = "year:2015";
         QueryNode luceneQuery = new StandardSyntaxParser()
             .parse(queryString, AbstractQueryTransformer.NO_EXPLICIT_FIELD);
-        Optional<String> searchQuery = getTransformer()
-            .transformLuceneQuery(luceneQuery);
+        Optional<String> searchQuery = getTransformer().transformLuceneQuery(luceneQuery);
 
         Optional<String> expected = Optional.of("date:2015*");
         assertEquals(expected, searchQuery);
@@ -51,8 +49,7 @@ public void convertYearRangeField() throws Exception {
         String queryString = "year-range:2012-2015";
         QueryNode luceneQuery = new StandardSyntaxParser()
             .parse(queryString, AbstractQueryTransformer.NO_EXPLICIT_FIELD);
-        Optional<String> searchQuery = getTransformer()
-            .transformLuceneQuery(luceneQuery);
+        Optional<String> searchQuery = getTransformer().transformLuceneQuery(luceneQuery);
 
         Optional<String> expected = Optional.of(
             "date:2012* OR date:2013* OR date:2014* OR date:2015*"
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 cc01ab89c21..adff9a5261e 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
@@ -10,9 +10,7 @@
 /**
  * Test Interface for all transformers that use suffix notation for their logical binary operators
  */
-public abstract class SuffixTransformerTest<
-    T extends AbstractQueryTransformer
-> {
+public abstract class SuffixTransformerTest<T extends AbstractQueryTransformer> {
 
     protected abstract T getTransformer();
 
@@ -29,11 +27,8 @@ public void convertAuthorFieldSuffix() throws Exception {
         String queryString = "author:\"Igor Steinmacher\"";
         QueryNode luceneQuery = new StandardSyntaxParser()
             .parse(queryString, AbstractQueryTransformer.NO_EXPLICIT_FIELD);
-        Optional<String> searchQuery = getTransformer()
-            .transformLuceneQuery(luceneQuery);
-        Optional<String> expected = Optional.of(
-            "\"Igor Steinmacher\"" + getAuthorSuffix()
-        );
+        Optional<String> searchQuery = getTransformer().transformLuceneQuery(luceneQuery);
+        Optional<String> expected = Optional.of("\"Igor Steinmacher\"" + getAuthorSuffix());
         assertEquals(expected, searchQuery);
     }
 
@@ -42,11 +37,8 @@ public void convertUnFieldedTermSuffix() throws Exception {
         String queryString = "\"default value\"";
         QueryNode luceneQuery = new StandardSyntaxParser()
             .parse(queryString, AbstractQueryTransformer.NO_EXPLICIT_FIELD);
-        Optional<String> searchQuery = getTransformer()
-            .transformLuceneQuery(luceneQuery);
-        Optional<String> expected = Optional.of(
-            queryString + getUnFieldedSuffix()
-        );
+        Optional<String> searchQuery = getTransformer().transformLuceneQuery(luceneQuery);
+        Optional<String> expected = Optional.of(queryString + getUnFieldedSuffix());
         assertEquals(expected, searchQuery);
     }
 
@@ -55,11 +47,8 @@ public void convertExplicitUnFieldedTermSuffix() throws Exception {
         String queryString = "default:\"default value\"";
         QueryNode luceneQuery = new StandardSyntaxParser()
             .parse(queryString, AbstractQueryTransformer.NO_EXPLICIT_FIELD);
-        Optional<String> searchQuery = getTransformer()
-            .transformLuceneQuery(luceneQuery);
-        Optional<String> expected = Optional.of(
-            "\"default value\"" + getUnFieldedSuffix()
-        );
+        Optional<String> searchQuery = getTransformer().transformLuceneQuery(luceneQuery);
+        Optional<String> expected = Optional.of("\"default value\"" + getUnFieldedSuffix());
         assertEquals(expected, searchQuery);
     }
 
@@ -68,8 +57,7 @@ public void convertJournalFieldSuffix() throws Exception {
         String queryString = "journal:Nature";
         QueryNode luceneQuery = new StandardSyntaxParser()
             .parse(queryString, AbstractQueryTransformer.NO_EXPLICIT_FIELD);
-        Optional<String> searchQuery = getTransformer()
-            .transformLuceneQuery(luceneQuery);
+        Optional<String> searchQuery = getTransformer().transformLuceneQuery(luceneQuery);
         Optional<String> expected = Optional.of("Nature" + getJournalSuffix());
         assertEquals(expected, searchQuery);
     }
@@ -82,12 +70,10 @@ public void convertJournalFieldSuffix() throws Exception {
 
     @Test
     public void convertMultipleValuesWithTheSameSuffix() throws Exception {
-        String queryString =
-            "author:\"Igor Steinmacher\" author:\"Christoph Treude\"";
+        String queryString = "author:\"Igor Steinmacher\" author:\"Christoph Treude\"";
         QueryNode luceneQuery = new StandardSyntaxParser()
             .parse(queryString, AbstractQueryTransformer.NO_EXPLICIT_FIELD);
-        Optional<String> searchQuery = getTransformer()
-            .transformLuceneQuery(luceneQuery);
+        Optional<String> searchQuery = getTransformer().transformLuceneQuery(luceneQuery);
         Optional<String> expected = Optional.of(
             "\"Igor Steinmacher\"" +
             getAuthorSuffix() +
@@ -104,8 +90,7 @@ public void groupedOperationsSuffix() throws Exception {
             "(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> searchQuery = getTransformer().transformLuceneQuery(luceneQuery);
         Optional<String> expected = Optional.of(
             "(" +
             "\"Igor Steinmacher\"" +
@@ -127,12 +112,10 @@ public void groupedOperationsSuffix() throws Exception {
 
     @Test
     public void notOperatorSufix() throws Exception {
-        String queryString =
-            "!(author:\"Igor Steinmacher\" OR author:\"Christoph Treude\")";
+        String queryString = "!(author:\"Igor Steinmacher\" OR author:\"Christoph Treude\")";
         QueryNode luceneQuery = new StandardSyntaxParser()
             .parse(queryString, AbstractQueryTransformer.NO_EXPLICIT_FIELD);
-        Optional<String> searchQuery = getTransformer()
-            .transformLuceneQuery(luceneQuery);
+        Optional<String> searchQuery = getTransformer().transformLuceneQuery(luceneQuery);
         Optional<String> expected = Optional.of(
             getTransformer().getLogicalNotOperator() +
             "(" +
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 9b87f497eaa..f32beee2484 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
@@ -13,8 +13,7 @@ public abstract class YearAndYearRangeByFilteringQueryTransformerTest<
 
     @Override
     public void convertYearField() throws Exception {
-        YearAndYearRangeByFilteringQueryTransformer transformer =
-            getTransformer();
+        YearAndYearRangeByFilteringQueryTransformer transformer = getTransformer();
         String queryString = "year:2021";
         QueryNode luceneQuery = new StandardSyntaxParser()
             .parse(queryString, AbstractQueryTransformer.NO_EXPLICIT_FIELD);
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 c2dfe72f6ff..062490fe0ca 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
@@ -6,8 +6,7 @@
 import org.apache.lucene.queryparser.flexible.core.nodes.QueryNode;
 import org.apache.lucene.queryparser.flexible.standard.parser.StandardSyntaxParser;
 
-class ZbMathQueryTransformerTest
-    extends InfixTransformerTest<ZbMathQueryTransformer> {
+class ZbMathQueryTransformerTest extends InfixTransformerTest<ZbMathQueryTransformer> {
 
     @Override
     public ZbMathQueryTransformer getTransformer() {
@@ -39,8 +38,7 @@ public void convertYearField() throws Exception {
         String queryString = "year:2015";
         QueryNode luceneQuery = new StandardSyntaxParser()
             .parse(queryString, AbstractQueryTransformer.NO_EXPLICIT_FIELD);
-        Optional<String> searchQuery = getTransformer()
-            .transformLuceneQuery(luceneQuery);
+        Optional<String> searchQuery = getTransformer().transformLuceneQuery(luceneQuery);
         Optional<String> expected = Optional.of("py:2015");
         assertEquals(expected, searchQuery);
     }
@@ -50,8 +48,7 @@ public void convertYearRangeField() throws Exception {
         String queryString = "year-range:2012-2015";
         QueryNode luceneQuery = new StandardSyntaxParser()
             .parse(queryString, AbstractQueryTransformer.NO_EXPLICIT_FIELD);
-        Optional<String> searchQuery = getTransformer()
-            .transformLuceneQuery(luceneQuery);
+        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 a542f5f946b..fc76846451d 100644
--- a/src/test/java/org/jabref/logic/importer/fileformat/ACMPortalParserTest.java
+++ b/src/test/java/org/jabref/logic/importer/fileformat/ACMPortalParserTest.java
@@ -58,28 +58,19 @@ void setUp() throws URISyntaxException, MalformedURLException {
                         "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.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.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.URL, "https://doi.org/10.1145/3129790.3129810")
                     .withField(StandardField.PAGETOTAL, "7")
                     .withField(StandardField.PAGES, "152–158"),
                 new BibEntry(StandardEntryType.Book)
@@ -91,10 +82,7 @@ void setUp() throws URISyntaxException, MalformedURLException {
                     )
                     .withField(StandardField.LOCATION, "Seattle, WA, USA")
                     .withField(StandardField.ISBN, "9781450342186")
-                    .withField(
-                        StandardField.PUBLISHER,
-                        "Association for Computing Machinery"
-                    )
+                    .withField(StandardField.PUBLISHER, "Association for Computing Machinery")
                     .withField(StandardField.ADDRESS, "New York, NY, USA")
             );
     }
@@ -102,16 +90,11 @@ void setUp() throws URISyntaxException, MalformedURLException {
     @Test
     void testParseEntries() throws IOException, ParseException {
         CookieHandler.setDefault(new CookieManager());
-        List<BibEntry> bibEntries = parser.parseEntries(
-            new URLDownload(searchUrl).asInputStream()
-        );
+        List<BibEntry> bibEntries = parser.parseEntries(new URLDownload(searchUrl).asInputStream());
         for (BibEntry bibEntry : bibEntries) {
             bibEntry.clearField(StandardField.ABSTRACT);
         }
-        assertEquals(
-            Optional.of(searchEntryList.get(0)),
-            bibEntries.stream().findFirst()
-        );
+        assertEquals(Optional.of(searchEntryList.get(0)), bibEntries.stream().findFirst());
     }
 
     @Test
@@ -127,13 +110,8 @@ void testParseDoiSearchPage() throws ParseException, IOException {
 
     @Test
     void testGetBibEntriesFromDoiList() throws FetcherException {
-        List<String> testDoiList = List.of(
-            "10.1145/3129790.3129810",
-            "10.1145/2950290"
-        );
-        List<BibEntry> bibEntries = parser.getBibEntriesFromDoiList(
-            testDoiList
-        );
+        List<String> testDoiList = List.of("10.1145/3129790.3129810", "10.1145/2950290");
+        List<BibEntry> bibEntries = parser.getBibEntriesFromDoiList(testDoiList);
         for (BibEntry bibEntry : bibEntries) {
             bibEntry.clearField(StandardField.ABSTRACT);
         }
@@ -141,15 +119,11 @@ void testGetBibEntriesFromDoiList() throws FetcherException {
     }
 
     @Test
-    void testGetUrlFromDoiList()
-        throws MalformedURLException, URISyntaxException {
+    void testGetUrlFromDoiList() throws MalformedURLException, URISyntaxException {
         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"
-        );
+        List<String> doiList = List.of("10.1145/3129790.3129810", "10.1145/2950290");
         URL url = parser.getUrlFromDoiList(doiList);
         assertEquals(target, url.toString());
     }
@@ -183,10 +157,7 @@ void testParseBibEntryWithFamilyAuthorOnly() {
             .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.PUBLISHER, "Association for Computing Machinery")
             .withField(StandardField.LOCATION, "Ho Chi Minh City, Vietnam")
             .withField(StandardField.ISBN, "9781450348157")
             .withField(StandardField.DAY, "8")
@@ -196,27 +167,21 @@ void testParseBibEntryWithFamilyAuthorOnly() {
                 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"
-            );
+            .withField(StandardField.URL, "https://doi.org/10.1145/3011077.3011113");
 
         BibEntry parsedEntry = parser.parseBibEntry(json);
         assertEquals(expectedEntry, parsedEntry);
     }
 
     @Test
-    void testNoEntryFound()
-        throws URISyntaxException, IOException, ParseException {
+    void testNoEntryFound() throws URISyntaxException, IOException, ParseException {
         CookieHandler.setDefault(new CookieManager());
         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()
-        );
+        List<BibEntry> bibEntries = parser.parseEntries(new URLDownload(url).asInputStream());
         assertEquals(Collections.emptyList(), bibEntries);
     }
 }
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 a0a44d5b47e..7d4417ac7a1 100644
--- a/src/test/java/org/jabref/logic/importer/fileformat/BiblioscapeImporterFilesTest.java
+++ b/src/test/java/org/jabref/logic/importer/fileformat/BiblioscapeImporterFilesTest.java
@@ -21,19 +21,12 @@ private static Stream<String> fileNames() throws IOException {
     @ParameterizedTest
     @MethodSource("fileNames")
     public void testIsRecognizedFormat(String fileName) throws IOException {
-        ImporterTestEngine.testIsRecognizedFormat(
-            new BiblioscapeImporter(),
-            fileName
-        );
+        ImporterTestEngine.testIsRecognizedFormat(new BiblioscapeImporter(), fileName);
     }
 
     @ParameterizedTest
     @MethodSource("fileNames")
     public void testImportEntries(String fileName) throws Exception {
-        ImporterTestEngine.testImportEntries(
-            new BiblioscapeImporter(),
-            fileName,
-            FILE_ENDING
-        );
+        ImporterTestEngine.testImportEntries(new BiblioscapeImporter(), fileName, FILE_ENDING);
     }
 }
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 07dc83ee7ff..59aa031f299 100644
--- a/src/test/java/org/jabref/logic/importer/fileformat/BiblioscapeImporterTest.java
+++ b/src/test/java/org/jabref/logic/importer/fileformat/BiblioscapeImporterTest.java
@@ -44,10 +44,7 @@ public void testGetCLIID() {
     @Test
     public void testImportEntriesAbortion() throws Throwable {
         Path file = Path.of(
-            BiblioscapeImporter.class.getResource(
-                    "BiblioscapeImporterTestCorrupt.txt"
-                )
-                .toURI()
+            BiblioscapeImporter.class.getResource("BiblioscapeImporterTestCorrupt.txt").toURI()
         );
         assertEquals(
             Collections.emptyList(),
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 638e4358d66..1aa73580435 100644
--- a/src/test/java/org/jabref/logic/importer/fileformat/BiblioscapeImporterTypesTest.java
+++ b/src/test/java/org/jabref/logic/importer/fileformat/BiblioscapeImporterTypesTest.java
@@ -33,10 +33,8 @@ private static Stream<Arguments> types() {
 
     @ParameterizedTest
     @MethodSource("types")
-    void importConvertsToCorrectBibType(
-        String biblioscapeType,
-        EntryType bibtexType
-    ) throws IOException {
+    void importConvertsToCorrectBibType(String biblioscapeType, EntryType bibtexType)
+        throws IOException {
         String bsInput =
             "--AU-- Baklouti, F.\n" +
             "--YP-- 1999\n" +
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 66ebaaebd85..5e6e42756b1 100644
--- a/src/test/java/org/jabref/logic/importer/fileformat/BibtexImporterTest.java
+++ b/src/test/java/org/jabref/logic/importer/fileformat/BibtexImporterTest.java
@@ -49,11 +49,9 @@ public void setUp() {
     }
 
     @Test
-    public void testIsRecognizedFormat()
-        throws IOException, URISyntaxException {
+    public void testIsRecognizedFormat() throws IOException, URISyntaxException {
         Path file = Path.of(
-            BibtexImporterTest.class.getResource("BibtexImporter.examples.bib")
-                .toURI()
+            BibtexImporterTest.class.getResource("BibtexImporter.examples.bib").toURI()
         );
         assertTrue(importer.isRecognizedFormat(file));
     }
@@ -61,13 +59,9 @@ public void testIsRecognizedFormat()
     @Test
     public void testImportEntries() throws IOException, URISyntaxException {
         Path file = Path.of(
-            BibtexImporterTest.class.getResource("BibtexImporter.examples.bib")
-                .toURI()
+            BibtexImporterTest.class.getResource("BibtexImporter.examples.bib").toURI()
         );
-        List<BibEntry> bibEntries = importer
-            .importDatabase(file)
-            .getDatabase()
-            .getEntries();
+        List<BibEntry> bibEntries = importer.importDatabase(file).getDatabase().getEntries();
 
         assertEquals(4, bibEntries.size());
 
@@ -81,28 +75,14 @@ public void testImportEntries() throws IOException, URISyntaxException {
                     entry.getField(StandardField.AUTHOR)
                 );
                 assertEquals(Optional.of("aksin"), entry.getCitationKey());
+                assertEquals(Optional.of("2006"), entry.getField(StandardField.DATE));
                 assertEquals(
-                    Optional.of("2006"),
-                    entry.getField(StandardField.DATE)
-                );
-                assertEquals(
-                    Optional.of(
-                        "Effect of immobilization on catalytic characteristics"
-                    ),
+                    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("#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(
                         "Effect of immobilization on catalytic characteristics of saturated {Pd-N}-heterocyclic " +
@@ -110,10 +90,7 @@ public void testImportEntries() throws IOException, URISyntaxException {
                     ),
                     entry.getField(StandardField.TITLE)
                 );
-                assertEquals(
-                    Optional.of("691"),
-                    entry.getField(StandardField.VOLUME)
-                );
+                assertEquals(Optional.of("691"), entry.getField(StandardField.VOLUME));
             } else if ("stdmodel".equals(entry.getCitationKey().get())) {
                 assertEquals(
                     Optional.of(
@@ -143,38 +120,20 @@ public void testImportEntries() throws IOException, URISyntaxException {
                     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("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"),
                     entry.getField(StandardField.EDITION)
                 );
-                assertEquals(
-                    Optional.of("978-3-86490-311-3"),
-                    entry.getField(StandardField.ISBN)
-                );
+                assertEquals(Optional.of("978-3-86490-311-3"), entry.getField(StandardField.ISBN));
                 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("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"
@@ -185,10 +144,7 @@ public void testImportEntries() throws IOException, URISyntaxException {
                     Optional.of("http://d-nb.info/107601965X"),
                     entry.getField(StandardField.URL)
                 );
-                assertEquals(
-                    Optional.of("2016"),
-                    entry.getField(StandardField.YEAR)
-                );
+                assertEquals(Optional.of("2016"), entry.getField(StandardField.YEAR));
             }
         }
     }
@@ -214,8 +170,7 @@ public void testGetDescription() {
     @Test
     public void testRecognizesDatabaseID() throws Exception {
         Path file = Path.of(
-            BibtexImporterTest.class.getResource("AutosavedSharedDatabase.bib")
-                .toURI()
+            BibtexImporterTest.class.getResource("AutosavedSharedDatabase.bib").toURI()
         );
         String sharedDatabaseID = importer
             .importDatabase(file)
@@ -227,61 +182,36 @@ public void testRecognizesDatabaseID() throws Exception {
 
     static Stream<Arguments> testParsingOfEncodedFileWithHeader() {
         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(
-                StandardCharsets.UTF_16BE,
-                "encoding-utf-16BE-with-header.bib"
-            ),
-            Arguments.of(
-                StandardCharsets.UTF_16BE,
-                "encoding-utf-16BE-without-header.bib"
-            )
+            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(StandardCharsets.UTF_16BE, "encoding-utf-16BE-with-header.bib"),
+            Arguments.of(StandardCharsets.UTF_16BE, "encoding-utf-16BE-without-header.bib")
         );
     }
 
     @ParameterizedTest
     @MethodSource
-    public void testParsingOfEncodedFileWithHeader(
-        Charset charset,
-        String fileName
-    ) throws Exception {
+    public void testParsingOfEncodedFileWithHeader(Charset charset, String fileName)
+        throws Exception {
         ParserResult parserResult = importer.importDatabase(
             Path.of(BibtexImporterTest.class.getResource(fileName).toURI())
         );
-        assertEquals(
-            Optional.of(charset),
-            parserResult.getMetaData().getEncoding()
-        );
+        assertEquals(Optional.of(charset), parserResult.getMetaData().getEncoding());
     }
 
     @ParameterizedTest
     @CsvSource(
-        {
-            "encoding-windows-1252-with-header.bib",
-            "encoding-windows-1252-without-header.bib",
-        }
+        { "encoding-windows-1252-with-header.bib", "encoding-windows-1252-without-header.bib" }
     )
-    public void testParsingOfWindows1252EncodedFileReadsDegreeCharacterCorrectly(
-        String filename
-    ) throws Exception {
+    public void testParsingOfWindows1252EncodedFileReadsDegreeCharacterCorrectly(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")
+                new BibEntry(StandardEntryType.Article).withField(StandardField.ABSTRACT, "25° C")
             ),
             parserResult.getDatabase().getEntries()
         );
@@ -296,8 +226,7 @@ public void testParsingOfWindows1252EncodedFileReadsDegreeCharacterCorrectly(
             "encoding-utf-16BE-without-header.bib",
         }
     )
-    public void testParsingFilesReadsUmlautCharacterCorrectly(String filename)
-        throws Exception {
+    public void testParsingFilesReadsUmlautCharacterCorrectly(String filename) throws Exception {
         ParserResult parserResult = importer.importDatabase(
             Path.of(BibtexImporterTest.class.getResource(filename).toURI())
         );
@@ -310,9 +239,7 @@ public void testParsingFilesReadsUmlautCharacterCorrectly(String filename)
         );
     }
 
-    private static Stream<
-        Arguments
-    > encodingExplicitlySuppliedCorrectlyDetermined() {
+    private static Stream<Arguments> encodingExplicitlySuppliedCorrectlyDetermined() {
         return Stream.of(
             Arguments.of("encoding-utf-8-with-header.bib", true),
             Arguments.of("encoding-utf-8-without-header.bib", false),
@@ -361,10 +288,7 @@ public void wrongEncodingSupplied() throws Exception {
     public void encodingNotSupplied() throws Exception {
         ParserResult parserResult = importer.importDatabase(
             Path.of(
-                BibtexImporterTest.class.getResource(
-                        "encoding-utf-8-without-header.bib"
-                    )
-                    .toURI()
+                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 7696a1bb57e..001c974ff6e 100644
--- a/src/test/java/org/jabref/logic/importer/fileformat/BibtexParserTest.java
+++ b/src/test/java/org/jabref/logic/importer/fileformat/BibtexParserTest.java
@@ -78,12 +78,8 @@ class BibtexParserTest {
 
     @BeforeEach
     void setUp() {
-        importFormatPreferences =
-            mock(ImportFormatPreferences.class, Answers.RETURNS_DEEP_STUBS);
-        when(
-            importFormatPreferences.bibEntryPreferences().getKeywordSeparator()
-        )
-            .thenReturn(',');
+        importFormatPreferences = mock(ImportFormatPreferences.class, Answers.RETURNS_DEEP_STUBS);
+        when(importFormatPreferences.bibEntryPreferences().getKeywordSeparator()).thenReturn(',');
         parser = new BibtexParser(importFormatPreferences);
     }
 
@@ -95,9 +91,7 @@ void parseWithNullThrowsNullPointerException() throws Exception {
 
     @Test
     void fromStringRecognizesEntry() throws ParseException {
-        List<BibEntry> result = parser.parseEntries(
-            "@article{test,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");
@@ -149,16 +143,12 @@ void singleFromStringRecognizesEntryInMultiple() throws ParseException {
 
     @Test
     void singleFromStringReturnsEmptyFromEmptyString() throws ParseException {
-        Optional<BibEntry> parsed = BibtexParser.singleFromString(
-            "",
-            importFormatPreferences
-        );
+        Optional<BibEntry> parsed = BibtexParser.singleFromString("", importFormatPreferences);
         assertEquals(Optional.empty(), parsed);
     }
 
     @Test
-    void singleFromStringReturnsEmptyIfNoEntryRecognized()
-        throws ParseException {
+    void singleFromStringReturnsEmptyIfNoEntryRecognized() throws ParseException {
         Optional<BibEntry> parsed = BibtexParser.singleFromString(
             "@@article@@{{{{{{}",
             importFormatPreferences
@@ -168,9 +158,7 @@ void singleFromStringReturnsEmptyIfNoEntryRecognized()
 
     @Test
     void parseRecognizesEntry() throws IOException {
-        ParserResult result = parser.parse(
-            new StringReader("@article{test,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");
@@ -191,8 +179,7 @@ void parseRecognizesFieldValuesInQuotationMarks() throws IOException {
     @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());
     }
 
@@ -232,9 +219,7 @@ void parseRecognizesEntryWithNewlines() throws IOException {
 
     @Test
     void parseRecognizesEntryWithUnknownType() throws IOException {
-        ParserResult result = parser.parse(
-            new StringReader("@unknown{test,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");
@@ -249,9 +234,7 @@ void parseRecognizesEntryWithVeryLongType() throws IOException {
             )
         );
         BibEntry expected = new BibEntry(
-            new UnknownEntryType(
-                "thisisalongstringtotestmaybeitistolongwhoknowsnotme"
-            )
+            new UnknownEntryType("thisisalongstringtotestmaybeitistolongwhoknowsnotme")
         )
             .withCitationKey("test")
             .withField(StandardField.AUTHOR, "Ed von Test");
@@ -260,9 +243,7 @@ void parseRecognizesEntryWithVeryLongType() throws IOException {
 
     @Test
     void parseRecognizesEntryInParenthesis() throws IOException {
-        ParserResult result = parser.parse(
-            new StringReader("@article(test,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");
@@ -291,9 +272,7 @@ void parseRecognizesEntryWithBigNumbers() throws IOException {
     @Test
     void parseRecognizesCitationKeyWithSpecialCharacters() throws IOException {
         ParserResult result = parser.parse(
-            new StringReader(
-                "@article{te_st:with-special(characters),author={Ed von Test}}"
-            )
+            new StringReader("@article{te_st:with-special(characters),author={Ed von Test}}")
         );
         BibEntry expected = new BibEntry(StandardEntryType.Article)
             .withCitationKey("te_st:with-special(characters)")
@@ -302,8 +281,7 @@ void parseRecognizesCitationKeyWithSpecialCharacters() throws IOException {
     }
 
     @Test
-    void parseRecognizesEntryWhereLastFieldIsFinishedWithComma()
-        throws IOException {
+    void parseRecognizesEntryWhereLastFieldIsFinishedWithComma() throws IOException {
         ParserResult result = parser.parse(
             new StringReader("@article{test,author={Ed von Test},}")
         );
@@ -315,9 +293,7 @@ void parseRecognizesEntryWhereLastFieldIsFinishedWithComma()
 
     @Test
     void parseRecognizesEntryWithAtInField() throws IOException {
-        ParserResult result = parser.parse(
-            new StringReader("@article{test,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");
@@ -333,8 +309,7 @@ void parseRecognizesEntryPrecedingComment() throws IOException {
             OS.NEWLINE +
             "}" +
             OS.NEWLINE;
-        String entryWithComment =
-            comment + "@article{test,author={Ed von T@st}}";
+        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");
@@ -344,10 +319,7 @@ void parseRecognizesEntryPrecedingComment() throws IOException {
         List<BibEntry> parsed = result.getDatabase().getEntries();
 
         assertEquals(List.of(expected), parsed);
-        assertEquals(
-            expected.getUserComments(),
-            parsed.get(0).getUserComments()
-        );
+        assertEquals(expected.getUserComments(), parsed.get(0).getUserComments());
     }
 
     @Test
@@ -386,10 +358,7 @@ void parseSetsParsedSerialization() throws IOException {
             .getDatabase()
             .getEntries();
         assertEquals(firstEntry, parsedEntries.get(0).getParsedSerialization());
-        assertEquals(
-            secondEntry,
-            parsedEntries.get(1).getParsedSerialization()
-        );
+        assertEquals(secondEntry, parsedEntries.get(1).getParsedSerialization());
     }
 
     @Test
@@ -413,10 +382,7 @@ void parseCombinesMultipleAuthorFields() throws IOException {
         );
         BibEntry expected = new BibEntry(StandardEntryType.Article)
             .withCitationKey("test")
-            .withField(
-                StandardField.AUTHOR,
-                "Ed von Test and Second Author and Third Author"
-            );
+            .withField(StandardField.AUTHOR, "Ed von Test and Second Author and Third Author");
         assertEquals(List.of(expected), result.getDatabase().getEntries());
     }
 
@@ -429,10 +395,7 @@ void parseCombinesMultipleEditorFields() throws IOException {
         );
         BibEntry expected = new BibEntry(StandardEntryType.Article)
             .withCitationKey("test")
-            .withField(
-                StandardField.EDITOR,
-                "Ed von Test and Second Author and Third Author"
-            );
+            .withField(StandardField.EDITOR, "Ed von Test and Second Author and Third Author");
         assertEquals(List.of(expected), result.getDatabase().getEntries());
     }
 
@@ -445,10 +408,7 @@ void parseCombinesMultipleKeywordsFields() throws IOException {
         );
         BibEntry expected = new BibEntry(StandardEntryType.Article)
             .withCitationKey("test")
-            .withField(
-                StandardField.KEYWORDS,
-                "Test, Second Keyword, Third Keyword"
-            );
+            .withField(StandardField.KEYWORDS, "Test, Second Keyword, Third Keyword");
         assertEquals(List.of(expected), result.getDatabase().getEntries());
     }
 
@@ -481,32 +441,20 @@ void parseRecognizesHeaderButIgnoresEncoding() throws IOException {
         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."
-            ),
+            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"
-            ),
+            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)"
-            ),
+            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("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)
@@ -538,32 +486,20 @@ void parseRecognizesFormatedEntry() throws IOException {
         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."
-            ),
+            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"
-            ),
+            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)"
-            ),
+            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("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)
@@ -571,11 +507,8 @@ void parseRecognizesFormatedEntry() throws IOException {
     }
 
     @Test
-    void parseRecognizesNumbersWithoutBracketsOrQuotationMarks()
-        throws IOException {
-        ParserResult result = parser.parse(
-            new StringReader("@article{test,year = 2005}")
-        );
+    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");
@@ -584,9 +517,7 @@ void parseRecognizesNumbersWithoutBracketsOrQuotationMarks()
 
     @Test
     void parseRecognizesUppercaseFields() throws IOException {
-        ParserResult result = parser.parse(
-            new StringReader("@article{test,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");
@@ -602,10 +533,7 @@ void parseRecognizesAbsoluteFile() throws IOException {
         );
         BibEntry expected = new BibEntry(StandardEntryType.Article)
             .withCitationKey("test")
-            .withField(
-                StandardField.FILE,
-                "D:\\Documents\\literature\\Tansel-PRL2006.pdf"
-            );
+            .withField(StandardField.FILE, "D:\\Documents\\literature\\Tansel-PRL2006.pdf");
         assertEquals(List.of(expected), result.getDatabase().getEntries());
     }
 
@@ -621,9 +549,7 @@ void parseRecognizesFinalSlashAsSlash() throws Exception {
             )
         );
         assertEquals(
-            List.of(
-                new BibEntry().withField(new UnknownField("test"), "wired\\")
-            ),
+            List.of(new BibEntry().withField(new UnknownField("test"), "wired\\")),
             result.getDatabase().getEntries()
         );
     }
@@ -633,18 +559,14 @@ void parseRecognizesFinalSlashAsSlash() throws Exception {
      */
     @Test
     void parseFailsWithFinalSlashAsSlashWhenSingleLine() throws Exception {
-        ParserResult parserResult = parser.parse(
-            new StringReader("@misc{, test = {wired\\}}")
-        );
+        ParserResult parserResult = parser.parse(new StringReader("@misc{, test = {wired\\}}"));
         // In case JabRef was more relaxed, `assertFalse` would be provided here.
         assertTrue(parserResult.hasWarnings());
     }
 
     @Test
     void parseRecognizesDateFieldWithConcatenation() throws IOException {
-        ParserResult result = parser.parse(
-            new StringReader("@article{test,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#");
@@ -687,9 +609,7 @@ 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");
@@ -697,8 +617,7 @@ void parseNotWarnsAboutEntryWithoutCitationKey() throws IOException {
     }
 
     @Test
-    void parseIgnoresAndWarnsAboutEntryWithUnmatchedOpenBracket()
-        throws IOException {
+    void parseIgnoresAndWarnsAboutEntryWithUnmatchedOpenBracket() throws IOException {
         ParserResult result = parser.parse(
             new StringReader("@article{test,author={author missing bracket}")
         );
@@ -718,10 +637,7 @@ void parseAddsEscapedOpenBracketToFieldValue() throws IOException {
         assertEquals(1, parsed.size());
         assertEquals(StandardEntryType.Article, entry.getType());
         assertEquals(Optional.of("test"), entry.getCitationKey());
-        assertEquals(
-            Optional.of("escaped \\{ bracket"),
-            entry.getField(StandardField.REVIEW)
-        );
+        assertEquals(Optional.of("escaped \\{ bracket"), entry.getField(StandardField.REVIEW));
         assertFalse(result.hasWarnings());
     }
 
@@ -737,10 +653,7 @@ void parseAddsEscapedClosingBracketToFieldValue() throws IOException {
         assertEquals(1, parsed.size());
         assertEquals(StandardEntryType.Article, entry.getType());
         assertEquals(Optional.of("test"), entry.getCitationKey());
-        assertEquals(
-            Optional.of("escaped \\} bracket"),
-            entry.getField(StandardField.REVIEW)
-        );
+        assertEquals(Optional.of("escaped \\} bracket"), entry.getField(StandardField.REVIEW));
         assertFalse(result.hasWarnings());
     }
 
@@ -748,9 +661,7 @@ void parseAddsEscapedClosingBracketToFieldValue() throws IOException {
     void parseIgnoresAndWarnsAboutEntryWithUnmatchedOpenBracketInQuotationMarks()
         throws IOException {
         ParserResult result = parser.parse(
-            new StringReader(
-                "@article{test,author=\"author {missing bracket\"}"
-            )
+            new StringReader("@article{test,author=\"author {missing bracket\"}")
         );
 
         Collection<BibEntry> parsed = result.getDatabase().getEntries();
@@ -767,21 +678,12 @@ void parseIgnoresArbitraryContentAfterEntry() throws IOException {
 
         Collection<BibEntry> parsed = result.getDatabase().getEntries();
 
-        assertEquals(
-            1,
-            parsed.size(),
-            "Size should be one, but was " + parsed.size()
-        );
-        assertEquals(
-            "}",
-            result.getDatabase().getEpilog(),
-            "Epilog should be preserved"
-        );
+        assertEquals(1, parsed.size(), "Size should be one, but was " + parsed.size());
+        assertEquals("}", result.getDatabase().getEpilog(), "Epilog should be preserved");
     }
 
     @Test
-    void parseWarnsAboutUnmatchedContentInEntryWithoutComma()
-        throws IOException {
+    void parseWarnsAboutUnmatchedContentInEntryWithoutComma() throws IOException {
         ParserResult result = parser.parse(
             new StringReader("@article{test,author={author bracket } too much}")
         );
@@ -797,19 +699,13 @@ void parseWarnsAboutUnmatchedContentInEntryWithoutComma()
     @Test
     void parseWarnsAboutUnmatchedContentInEntry() throws IOException {
         ParserResult result = parser.parse(
-            new StringReader(
-                "@article{test,author={author bracket }, too much}"
-            )
+            new StringReader("@article{test,author={author bracket }, too much}")
         );
 
         List<BibEntry> entries = result.getDatabase().getEntries();
 
         assertTrue(result.hasWarnings(), "There should be warnings");
-        assertEquals(
-            0,
-            entries.size(),
-            "Size should be zero, but was " + entries.size()
-        );
+        assertEquals(0, entries.size(), "Size should be zero, but was " + entries.size());
     }
 
     @Test
@@ -821,10 +717,7 @@ void parseAcceptsEntryWithAtSymbolInBrackets() throws IOException {
         List<BibEntry> entries = result.getDatabase().getEntries();
 
         assertEquals(1, entries.size());
-        assertEquals(
-            Optional.of("author @ good"),
-            entries.get(0).getField(StandardField.AUTHOR)
-        );
+        assertEquals(Optional.of("author @ good"), entries.get(0).getField(StandardField.AUTHOR));
     }
 
     @Test
@@ -840,15 +733,11 @@ void parseRecognizesEntryWithAtSymbolInQuotationMarks() throws IOException {
         assertEquals(StandardEntryType.Article, entry.getType());
         assertEquals(Optional.of("test"), entry.getCitationKey());
         assertEquals(2, entry.getFields().size());
-        assertEquals(
-            Optional.of("author @ good"),
-            entry.getField(StandardField.AUTHOR)
-        );
+        assertEquals(Optional.of("author @ good"), entry.getField(StandardField.AUTHOR));
     }
 
     @Test
-    void parseRecognizesFieldsWithBracketsEnclosedInQuotationMarks()
-        throws IOException {
+    void parseRecognizesFieldsWithBracketsEnclosedInQuotationMarks() throws IOException {
         ParserResult result = parser.parse(
             new StringReader("@article{test,author=\"Test {Ed {von} Test}\"}")
         );
@@ -860,10 +749,7 @@ void parseRecognizesFieldsWithBracketsEnclosedInQuotationMarks()
         assertEquals(StandardEntryType.Article, entry.getType());
         assertEquals(Optional.of("test"), entry.getCitationKey());
         assertEquals(2, entry.getFields().size());
-        assertEquals(
-            Optional.of("Test {Ed {von} Test}"),
-            entry.getField(StandardField.AUTHOR)
-        );
+        assertEquals(Optional.of("Test {Ed {von} Test}"), entry.getField(StandardField.AUTHOR));
     }
 
     @Test
@@ -880,15 +766,11 @@ void parseRecognizesFieldsWithEscapedQuotationMarks() throws IOException {
         assertEquals(StandardEntryType.Article, entry.getType());
         assertEquals(Optional.of("test"), entry.getCitationKey());
         assertEquals(2, entry.getFields().size());
-        assertEquals(
-            Optional.of("Test {\" Test}"),
-            entry.getField(StandardField.AUTHOR)
-        );
+        assertEquals(Optional.of("Test {\" Test}"), entry.getField(StandardField.AUTHOR));
     }
 
     @Test
-    void parseIgnoresAndWarnsAboutEntryWithFieldsThatAreNotSeperatedByComma()
-        throws IOException {
+    void parseIgnoresAndWarnsAboutEntryWithFieldsThatAreNotSeperatedByComma() throws IOException {
         ParserResult result = parser.parse(
             new StringReader("@article{test,author={Ed von Test} year=2005}")
         );
@@ -900,8 +782,7 @@ void parseIgnoresAndWarnsAboutEntryWithFieldsThatAreNotSeperatedByComma()
     }
 
     @Test
-    void parseIgnoresAndWarnsAboutCorruptedEntryButRecognizeOthers()
-        throws IOException {
+    void parseIgnoresAndWarnsAboutCorruptedEntryButRecognizeOthers() throws IOException {
         ParserResult result = parser.parse(
             new StringReader(
                 "@article{test,author={author missing bracket}" +
@@ -916,10 +797,7 @@ void parseIgnoresAndWarnsAboutCorruptedEntryButRecognizeOthers()
         assertEquals(StandardEntryType.Article, entry.getType());
         assertEquals(Optional.of("test"), entry.getCitationKey());
         assertEquals(2, entry.getFields().size());
-        assertEquals(
-            Optional.of("Ed von Test"),
-            entry.getField(StandardField.AUTHOR)
-        );
+        assertEquals(Optional.of("Ed von Test"), entry.getField(StandardField.AUTHOR));
         assertTrue(result.hasWarnings());
     }
 
@@ -936,59 +814,36 @@ void parseRecognizesMonthFieldsWithFollowingComma() throws IOException {
         assertEquals(StandardEntryType.Article, entry.getType());
         assertEquals(Optional.of("test"), entry.getCitationKey());
         assertEquals(3, entry.getFields().size());
-        assertEquals(
-            Optional.of("Ed von Test"),
-            entry.getField(StandardField.AUTHOR)
-        );
+        assertEquals(Optional.of("Ed von Test"), entry.getField(StandardField.AUTHOR));
         assertEquals(Optional.of("8,"), entry.getField(StandardField.MONTH));
     }
 
     @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()
-        );
+        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()
-        );
+        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()
-        );
+        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()
-        );
+        assertEquals(Optional.of("some text and \\latex"), result.getDatabase().getPreamble());
     }
 
     @Test
@@ -1009,11 +864,7 @@ void parseRecognizesString() throws IOException {
             new StringReader("@string{bourdieu = {Bourdieu, Pierre}}")
         );
 
-        BibtexString string = result
-            .getDatabase()
-            .getStringValues()
-            .iterator()
-            .next();
+        BibtexString string = result.getDatabase().getStringValues().iterator().next();
 
         assertEquals(1, result.getDatabase().getStringCount());
         assertEquals("bourdieu", string.getName());
@@ -1021,18 +872,11 @@ void parseRecognizesString() throws IOException {
     }
 
     @Test
-    void parseSavesOneNewlineAfterStringInParsedSerialization()
-        throws IOException {
+    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();
+        BibtexString parsedString = result.getDatabase().getStringValues().iterator().next();
 
         assertEquals(1, result.getDatabase().getStringCount());
         assertEquals(string, parsedString.getParsedSerialization());
@@ -1044,11 +888,7 @@ void parseRecognizesStringWithWhitespace() throws IOException {
             new StringReader("@string {bourdieu = {Bourdieu, Pierre}}")
         );
 
-        BibtexString parsedString = result
-            .getDatabase()
-            .getStringValues()
-            .iterator()
-            .next();
+        BibtexString parsedString = result.getDatabase().getStringValues().iterator().next();
 
         assertEquals(1, result.getDatabase().getStringCount());
         assertEquals("bourdieu", parsedString.getName());
@@ -1061,11 +901,7 @@ void parseRecognizesStringInParenthesis() throws IOException {
             new StringReader("@string(bourdieu = {Bourdieu, Pierre})")
         );
 
-        BibtexString parsedString = result
-            .getDatabase()
-            .getStringValues()
-            .iterator()
-            .next();
+        BibtexString parsedString = result.getDatabase().getStringValues().iterator().next();
 
         assertEquals(1, result.getDatabase().getStringCount());
         assertEquals("bourdieu", parsedString.getName());
@@ -1076,15 +912,11 @@ void parseRecognizesStringInParenthesis() throws IOException {
     void parseRecognizesMultipleStrings() throws IOException {
         ParserResult result = parser.parse(
             new StringReader(
-                "@string{bourdieu = {Bourdieu, Pierre}}" +
-                "@string{adieu = {Adieu, Pierre}}"
+                "@string{bourdieu = {Bourdieu, Pierre}}" + "@string{adieu = {Adieu, Pierre}}"
             )
         );
 
-        Iterator<BibtexString> iterator = result
-            .getDatabase()
-            .getStringValues()
-            .iterator();
+        Iterator<BibtexString> iterator = result.getDatabase().getStringValues().iterator();
         BibtexString first = iterator.next();
         BibtexString second = iterator.next();
         // Sort them because we can't be sure about the order
@@ -1118,11 +950,7 @@ void parseRecognizesStringAndEntry() throws IOException {
             )
         );
 
-        BibtexString parsedString = result
-            .getDatabase()
-            .getStringValues()
-            .iterator()
-            .next();
+        BibtexString parsedString = result.getDatabase().getStringValues().iterator().next();
         Collection<BibEntry> parsedEntries = result.getDatabase().getEntries();
         BibEntry parsedEntry = parsedEntries.iterator().next();
 
@@ -1135,39 +963,22 @@ void parseRecognizesStringAndEntry() throws IOException {
             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("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("2002"),
-            parsedEntry.getField(StandardField.YEAR)
-        );
+        assertEquals(Optional.of("2002"), parsedEntry.getField(StandardField.YEAR));
     }
 
     @Test
-    void parseWarnsAboutStringsWithSameNameAndOnlyKeepsOne()
-        throws IOException {
+    void parseWarnsAboutStringsWithSameNameAndOnlyKeepsOne() throws IOException {
         ParserResult result = parser.parse(
             new StringReader(
-                "@string{bourdieu = {Bourdieu, Pierre}}" +
-                "@string{bourdieu = {Other}}"
+                "@string{bourdieu = {Bourdieu, Pierre}}" + "@string{bourdieu = {Other}}"
             )
         );
 
@@ -1177,18 +988,14 @@ void parseWarnsAboutStringsWithSameNameAndOnlyKeepsOne()
 
     @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(0, result.getDatabase().getEntries().size());
     }
 
     @Test
     void parseIgnoresUpercaseComments() 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());
     }
@@ -1197,8 +1004,7 @@ void parseIgnoresUpercaseComments() throws IOException {
     void parseIgnoresCommentsBeforeEntry() throws IOException {
         ParserResult result = parser.parse(
             new StringReader(
-                "@comment{some text and \\latex}" +
-                "@article{test,author={Ed von Test}}"
+                "@comment{some text and \\latex}" + "@article{test,author={Ed von Test}}"
             )
         );
 
@@ -1209,18 +1015,14 @@ void parseIgnoresCommentsBeforeEntry() throws IOException {
         assertEquals(StandardEntryType.Article, parsedEntry.getType());
         assertEquals(Optional.of("test"), parsedEntry.getCitationKey());
         assertEquals(2, parsedEntry.getFields().size());
-        assertEquals(
-            Optional.of("Ed von Test"),
-            parsedEntry.getField(StandardField.AUTHOR)
-        );
+        assertEquals(Optional.of("Ed von Test"), parsedEntry.getField(StandardField.AUTHOR));
     }
 
     @Test
     void parseIgnoresCommentsAfterEntry() throws IOException {
         ParserResult result = parser.parse(
             new StringReader(
-                "@article{test,author={Ed von Test}}" +
-                "@comment{some text and \\latex}"
+                "@article{test,author={Ed von Test}}" + "@comment{some text and \\latex}"
             )
         );
 
@@ -1231,17 +1033,12 @@ void parseIgnoresCommentsAfterEntry() throws IOException {
         assertEquals(StandardEntryType.Article, parsedEntry.getType());
         assertEquals(Optional.of("test"), parsedEntry.getCitationKey());
         assertEquals(2, parsedEntry.getFields().size());
-        assertEquals(
-            Optional.of("Ed von Test"),
-            parsedEntry.getField(StandardField.AUTHOR)
-        );
+        assertEquals(Optional.of("Ed von Test"), parsedEntry.getField(StandardField.AUTHOR));
     }
 
     @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());
     }
@@ -1250,8 +1047,7 @@ void parseIgnoresText() throws IOException {
     void parseIgnoresTextBeforeEntry() throws IOException {
         ParserResult result = parser.parse(
             new StringReader(
-                "comment{some text and \\latex" +
-                "@article{test,author={Ed von Test}}"
+                "comment{some text and \\latex" + "@article{test,author={Ed von Test}}"
             )
         );
 
@@ -1262,18 +1058,14 @@ void parseIgnoresTextBeforeEntry() throws IOException {
         assertEquals(StandardEntryType.Article, parsedEntry.getType());
         assertEquals(Optional.of("test"), parsedEntry.getCitationKey());
         assertEquals(2, parsedEntry.getFields().size());
-        assertEquals(
-            Optional.of("Ed von Test"),
-            parsedEntry.getField(StandardField.AUTHOR)
-        );
+        assertEquals(Optional.of("Ed von Test"), parsedEntry.getField(StandardField.AUTHOR));
     }
 
     @Test
     void parseIgnoresTextAfterEntry() throws IOException {
         ParserResult result = parser.parse(
             new StringReader(
-                "@article{test,author={Ed von Test}}" +
-                "comment{some text and \\latex"
+                "@article{test,author={Ed von Test}}" + "comment{some text and \\latex"
             )
         );
 
@@ -1284,114 +1076,68 @@ void parseIgnoresTextAfterEntry() throws IOException {
         assertEquals(StandardEntryType.Article, parsedEntry.getType());
         assertEquals(Optional.of("test"), parsedEntry.getCitationKey());
         assertEquals(2, parsedEntry.getFields().size());
-        assertEquals(
-            Optional.of("Ed von Test"),
-            parsedEntry.getField(StandardField.AUTHOR)
-        );
+        assertEquals(Optional.of("Ed von Test"), parsedEntry.getField(StandardField.AUTHOR));
     }
 
     @Test
     void parseConvertsNewlineToSpace() 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();
 
-        assertEquals(
-            Optional.of("a b"),
-            parsedEntry.getField(new UnknownField("a"))
-        );
+        assertEquals(Optional.of("a b"), parsedEntry.getField(new UnknownField("a")));
     }
 
     @Test
     void parseConvertsMultipleNewlinesToSpace() throws IOException {
         ParserResult result = parser.parse(
-            new StringReader(
-                "@article{test,a = {a\n\nb}," +
-                "b = {a\n \nb}," +
-                "c = {a \n \n b}}"
-            )
+            new StringReader("@article{test,a = {a\n\nb}," + "b = {a\n \nb}," + "c = {a \n \n b}}")
         );
 
         Collection<BibEntry> parsedEntries = result.getDatabase().getEntries();
         BibEntry parsedEntry = parsedEntries.iterator().next();
 
-        assertEquals(
-            Optional.of("a b"),
-            parsedEntry.getField(new UnknownField("a"))
-        );
-        assertEquals(
-            Optional.of("a b"),
-            parsedEntry.getField(new UnknownField("b"))
-        );
-        assertEquals(
-            Optional.of("a b"),
-            parsedEntry.getField(new UnknownField("c"))
-        );
+        assertEquals(Optional.of("a b"), parsedEntry.getField(new UnknownField("a")));
+        assertEquals(Optional.of("a b"), parsedEntry.getField(new UnknownField("b")));
+        assertEquals(Optional.of("a b"), parsedEntry.getField(new UnknownField("c")));
     }
 
     @Test
     void parseConvertsTabToSpace() 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();
 
-        assertEquals(
-            Optional.of("a b"),
-            parsedEntry.getField(new UnknownField("a"))
-        );
+        assertEquals(Optional.of("a b"), parsedEntry.getField(new UnknownField("a")));
     }
 
     @Test
     void parseConvertsMultipleTabsToSpace() throws IOException {
         ParserResult result = parser.parse(
-            new StringReader(
-                "@article{test,a = {a\t\tb}," +
-                "b = {a\t \tb}," +
-                "c = {a \t \t b}}"
-            )
+            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();
 
-        assertEquals(
-            Optional.of("a b"),
-            parsedEntry.getField(new UnknownField("a"))
-        );
-        assertEquals(
-            Optional.of("a b"),
-            parsedEntry.getField(new UnknownField("b"))
-        );
-        assertEquals(
-            Optional.of("a b"),
-            parsedEntry.getField(new UnknownField("c"))
-        );
+        assertEquals(Optional.of("a b"), parsedEntry.getField(new UnknownField("a")));
+        assertEquals(Optional.of("a b"), parsedEntry.getField(new UnknownField("b")));
+        assertEquals(Optional.of("a b"), parsedEntry.getField(new UnknownField("c")));
     }
 
     @Test
     void parsePreservesMultipleSpacesInNonWrappableField() throws IOException {
         when(importFormatPreferences.fieldPreferences().getNonWrappableFields())
-            .thenReturn(
-                FXCollections.observableArrayList(List.of(StandardField.FILE))
-            );
+            .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();
 
-        assertEquals(
-            Optional.of("ups  sala"),
-            parsedEntry.getField(StandardField.FILE)
-        );
+        assertEquals(Optional.of("ups  sala"), parsedEntry.getField(StandardField.FILE));
     }
 
     @Test
@@ -1403,10 +1149,7 @@ void parsePreservesTabsInAbstractField() throws IOException {
         Collection<BibEntry> parsedEntries = result.getDatabase().getEntries();
         BibEntry parsedEntry = parsedEntries.iterator().next();
 
-        assertEquals(
-            Optional.of("ups  \tsala"),
-            parsedEntry.getField(StandardField.ABSTRACT)
-        );
+        assertEquals(Optional.of("ups  \tsala"), parsedEntry.getField(StandardField.ABSTRACT));
     }
 
     @Test
@@ -1418,10 +1161,7 @@ void parsePreservesNewlineInAbstractField() throws IOException {
         Collection<BibEntry> parsedEntries = result.getDatabase().getEntries();
         BibEntry parsedEntry = parsedEntries.iterator().next();
 
-        assertEquals(
-            Optional.of("ups \nsala"),
-            parsedEntry.getField(StandardField.ABSTRACT)
-        );
+        assertEquals(Optional.of("ups \nsala"), parsedEntry.getField(StandardField.ABSTRACT));
     }
 
     @Test
@@ -1437,10 +1177,7 @@ void parseHandlesAccentsCorrectly() throws IOException {
         assertEquals(1, parsedEntries.size());
         assertEquals(StandardEntryType.Article, parsedEntry.getType());
         assertEquals(Optional.of("test"), parsedEntry.getCitationKey());
-        assertEquals(
-            Optional.of("H'{e}lne Fiaux"),
-            parsedEntry.getField(StandardField.AUTHOR)
-        );
+        assertEquals(Optional.of("H'{e}lne Fiaux"), parsedEntry.getField(StandardField.AUTHOR));
     }
 
     /**
@@ -1458,32 +1195,21 @@ void parsePreambleAndEntryWithoutNewLine() throws IOException {
         BibEntry parsedEntry = parsedEntries.iterator().next();
 
         assertFalse(result.hasWarnings());
-        assertEquals(
-            Optional.of("some text and \\latex"),
-            result.getDatabase().getPreamble()
-        );
+        assertEquals(Optional.of("some text and \\latex"), result.getDatabase().getPreamble());
         assertEquals(1, parsedEntries.size());
         assertEquals(StandardEntryType.Article, parsedEntry.getType());
         assertEquals(Optional.of("test"), parsedEntry.getCitationKey());
-        assertEquals(
-            Optional.of("H'{e}lne Fiaux"),
-            parsedEntry.getField(StandardField.AUTHOR)
-        );
+        assertEquals(Optional.of("H'{e}lne Fiaux"), parsedEntry.getField(StandardField.AUTHOR));
     }
 
     @Test
     void parseFileHeaderAndPreambleWithoutNewLine() throws IOException {
         ParserResult result = parser.parse(
-            new StringReader(
-                "\\% Encoding: US-ASCII@preamble{some text and \\latex}"
-            )
+            new StringReader("\\% Encoding: US-ASCII@preamble{some text and \\latex}")
         );
 
         assertFalse(result.hasWarnings());
-        assertEquals(
-            Optional.of("some text and \\latex"),
-            result.getDatabase().getPreamble()
-        );
+        assertEquals(Optional.of("some text and \\latex"), result.getDatabase().getPreamble());
     }
 
     @Test
@@ -1499,26 +1225,19 @@ void parseSavesEntryInParsedSerialization() throws IOException {
     }
 
     @Test
-    void parseSavesOneNewlineAfterEntryInParsedSerialization()
-        throws IOException {
+    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();
 
         assertEquals(1, parsedEntries.size());
-        assertEquals(
-            testEntry + OS.NEWLINE,
-            parsedEntry.getParsedSerialization()
-        );
+        assertEquals(testEntry + OS.NEWLINE, parsedEntry.getParsedSerialization());
     }
 
     @Test
-    void parseSavesAllButOneNewlinesBeforeEntryInParsedSerialization()
-        throws IOException {
+    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)
@@ -1529,23 +1248,15 @@ void parseSavesAllButOneNewlinesBeforeEntryInParsedSerialization()
 
         assertEquals(1, parsedEntries.size());
         // The first newline is removed, because JabRef interprets that always as block separator
-        assertEquals(
-            OS.NEWLINE + OS.NEWLINE + testEntry,
-            parsedEntry.getParsedSerialization()
-        );
+        assertEquals(OS.NEWLINE + OS.NEWLINE + testEntry, parsedEntry.getParsedSerialization());
     }
 
     @Test
-    void parseRemovesEncodingLineAndSeparatorInParsedSerialization()
-        throws IOException {
+    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
+                SaveConfiguration.ENCODING_PREFIX + OS.NEWLINE + OS.NEWLINE + OS.NEWLINE + testEntry
             )
         );
 
@@ -1559,18 +1270,11 @@ void parseRemovesEncodingLineAndSeparatorInParsedSerialization()
     }
 
     @Test
-    void parseSavesNewlinesBetweenEntriesInParsedSerialization()
-        throws IOException {
+    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
-            )
+            new StringReader(testEntryOne + OS.NEWLINE + OS.NEWLINE + OS.NEWLINE + testEntryTwo)
         );
 
         Collection<BibEntry> parsedEntries = result.getDatabase().getEntries();
@@ -1587,17 +1291,12 @@ void parseSavesNewlinesBetweenEntriesInParsedSerialization()
         assertEquals(2, parsedEntries.size());
         assertEquals(testEntryOne + OS.NEWLINE, first.getParsedSerialization());
         // one newline is removed, because it is written by JabRef's block functionality
-        assertEquals(
-            OS.NEWLINE + testEntryTwo,
-            second.getParsedSerialization()
-        );
+        assertEquals(OS.NEWLINE + testEntryTwo, second.getParsedSerialization());
     }
 
     @Test
     void parseIgnoresWhitespaceInEpilogue() throws IOException {
-        ParserResult result = parser.parse(
-            new StringReader("   " + OS.NEWLINE)
-        );
+        ParserResult result = parser.parse(new StringReader("   " + OS.NEWLINE));
 
         assertEquals("", result.getDatabase().getEpilog());
     }
@@ -1606,24 +1305,14 @@ void parseIgnoresWhitespaceInEpilogue() throws IOException {
     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
-            )
+            new StringReader(testEntry + OS.NEWLINE + OS.NEWLINE + OS.NEWLINE + "  " + OS.NEWLINE)
         );
 
         Collection<BibEntry> parsedEntries = result.getDatabase().getEntries();
         BibEntry parsedEntry = parsedEntries.iterator().next();
 
         assertEquals(1, parsedEntries.size());
-        assertEquals(
-            testEntry + OS.NEWLINE,
-            parsedEntry.getParsedSerialization()
-        );
+        assertEquals(testEntry + OS.NEWLINE, parsedEntry.getParsedSerialization());
         assertEquals("", result.getDatabase().getEpilog());
     }
 
@@ -1632,12 +1321,7 @@ 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
+                testEntry + OS.NEWLINE + OS.NEWLINE + OS.NEWLINE + " epilogue " + OS.NEWLINE
             )
         );
 
@@ -1645,10 +1329,7 @@ void parseTrimsWhitespaceInEpilogueAfterEntry() throws IOException {
         BibEntry parsedEntry = parsedEntries.iterator().next();
 
         assertEquals(1, parsedEntries.size());
-        assertEquals(
-            testEntry + OS.NEWLINE,
-            parsedEntry.getParsedSerialization()
-        );
+        assertEquals(testEntry + OS.NEWLINE, parsedEntry.getParsedSerialization());
         assertEquals("epilogue", result.getDatabase().getEpilog());
     }
 
@@ -1672,19 +1353,11 @@ void parseRecognizesSaveActionsAfterEntry() throws IOException {
             )
         );
 
-        FieldFormatterCleanups saveActions = parserResult
-            .getMetaData()
-            .getSaveActions()
-            .get();
+        FieldFormatterCleanups saveActions = parserResult.getMetaData().getSaveActions().get();
 
         assertTrue(saveActions.isEnabled());
         assertEquals(
-            List.of(
-                new FieldFormatterCleanup(
-                    StandardField.TITLE,
-                    new LowerCaseFormatter()
-                )
-            ),
+            List.of(new FieldFormatterCleanup(StandardField.TITLE, new LowerCaseFormatter())),
             saveActions.getConfiguredActions()
         );
     }
@@ -1718,26 +1391,13 @@ void parserKeepsSaveActions() throws IOException {
             )
         );
 
-        FieldFormatterCleanups saveActions = parserResult
-            .getMetaData()
-            .getSaveActions()
-            .get();
+        FieldFormatterCleanups saveActions = parserResult.getMetaData().getSaveActions().get();
 
         assertTrue(saveActions.isEnabled());
 
         List<FieldFormatterCleanup> expected = new ArrayList<>(30);
-        expected.add(
-            new FieldFormatterCleanup(
-                StandardField.MONTH,
-                new NormalizeMonthFormatter()
-            )
-        );
-        expected.add(
-            new FieldFormatterCleanup(
-                StandardField.PAGES,
-                new NormalizePagesFormatter()
-            )
-        );
+        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,
@@ -1745,27 +1405,10 @@ void parserKeepsSaveActions() throws IOException {
             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()
-                )
-            );
-            expected.add(
-                new FieldFormatterCleanup(field, new LatexCleanupFormatter())
-            );
+            expected.add(new FieldFormatterCleanup(field, new EscapeAmpersandsFormatter()));
+            expected.add(new FieldFormatterCleanup(field, new EscapeDollarSignFormatter()));
+            expected.add(new FieldFormatterCleanup(field, new EscapeUnderscoresFormatter()));
+            expected.add(new FieldFormatterCleanup(field, new LatexCleanupFormatter()));
         }
         assertEquals(expected, saveActions.getConfiguredActions());
     }
@@ -1811,24 +1454,14 @@ void parseRecognizesLFLineBreak() throws IOException {
     @Test
     void integrationTestSaveActions() throws IOException {
         ParserResult parserResult = parser.parse(
-            new StringReader(
-                "@comment{jabref-meta: saveActions:enabled;title[lower_case]}"
-            )
+            new StringReader("@comment{jabref-meta: saveActions:enabled;title[lower_case]}")
         );
 
-        FieldFormatterCleanups saveActions = parserResult
-            .getMetaData()
-            .getSaveActions()
-            .get();
+        FieldFormatterCleanups saveActions = parserResult.getMetaData().getSaveActions().get();
 
         assertTrue(saveActions.isEnabled());
         assertEquals(
-            List.of(
-                new FieldFormatterCleanup(
-                    StandardField.TITLE,
-                    new LowerCaseFormatter()
-                )
-            ),
+            List.of(new FieldFormatterCleanup(StandardField.TITLE, new LowerCaseFormatter())),
             saveActions.getConfiguredActions()
         );
     }
@@ -1849,16 +1482,10 @@ void integrationTestBibEntryType() throws IOException {
                 new BibField(StandardField.LANGUAGE, FieldPriority.IMPORTANT),
                 new BibField(StandardField.URL, FieldPriority.IMPORTANT)
             ),
-            Arrays.asList(
-                new OrFields(StandardField.AUTHOR),
-                new OrFields(StandardField.TITLE)
-            )
+            Arrays.asList(new OrFields(StandardField.AUTHOR), new OrFields(StandardField.TITLE))
         );
 
-        assertEquals(
-            Collections.singleton(expectedEntryType),
-            result.getEntryTypes()
-        );
+        assertEquals(Collections.singleton(expectedEntryType), result.getEntryTypes());
     }
 
     @Test
@@ -1869,9 +1496,7 @@ void integrationTestSaveOrderConfig() throws IOException {
             )
         );
 
-        Optional<SaveOrder> saveOrderConfig = result
-            .getMetaData()
-            .getSaveOrder();
+        Optional<SaveOrder> saveOrderConfig = result.getMetaData().getSaveOrder();
 
         assertEquals(
             new SaveOrder(
@@ -1900,13 +1525,9 @@ void integrationTestCustomKeyPattern() throws IOException {
         AbstractCitationKeyPattern bibtexKeyPattern = result
             .getMetaData()
             .getCiteKeyPattern(pattern);
-        AbstractCitationKeyPattern expectedPattern =
-            new DatabaseCitationKeyPattern(pattern);
+        AbstractCitationKeyPattern expectedPattern = new DatabaseCitationKeyPattern(pattern);
         expectedPattern.setDefaultValue("test");
-        expectedPattern.addCitationKeyPattern(
-            StandardEntryType.Article,
-            "articleTest"
-        );
+        expectedPattern.addCitationKeyPattern(StandardEntryType.Article, "articleTest");
 
         assertEquals(expectedPattern, bibtexKeyPattern);
     }
@@ -1964,10 +1585,7 @@ void integrationTestGroupTree() throws IOException, ParseException {
         );
         assertEquals(
             Arrays.asList("Key1", "Key2"),
-            ((ExplicitGroup) root
-                    .getChildren()
-                    .get(2)
-                    .getGroup()).getLegacyEntryKeys()
+            ((ExplicitGroup) root.getChildren().get(2).getGroup()).getLegacyEntryKeys()
         );
     }
 
@@ -2090,10 +1708,7 @@ void parseRecognizesDatabaseID() throws Exception {
         ParserResult parserResult = parser.parse(
             new StringReader(sharedDatabaseFileContent.toString())
         );
-        String actualDatabaseID = parserResult
-            .getDatabase()
-            .getSharedDatabaseID()
-            .get();
+        String actualDatabaseID = parserResult.getDatabase().getSharedDatabaseID().get();
 
         assertEquals(expectedDatabaseID, actualDatabaseID);
     }
@@ -2126,21 +1741,14 @@ void integrationTestFileDirectories() throws IOException {
             )
         );
 
-        assertEquals(
-            "\\Literature\\",
-            result.getMetaData().getDefaultFileDirectory().get()
-        );
+        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()
+            result.getMetaData().getLatexFileDirectory("defaultOwner-user").get().toString()
         );
     }
 
@@ -2148,22 +1756,14 @@ void integrationTestFileDirectories() throws IOException {
     @CsvSource(
         {
             // single backslash kept
-            "C:\\temp\\test",
-            "\\\\servername\\path\\to\\file",
-            "//servername/path/to/file",
-            ".",
+            "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 + "}"
-            )
-        );
-        assertEquals(
-            directory,
-            result.getMetaData().getDefaultFileDirectory().get()
+            new StringReader("@comment{jabref-meta: fileDirectory:" + directory + "}")
         );
+        assertEquals(directory, result.getMetaData().getDefaultFileDirectory().get());
     }
 
     @ParameterizedTest
@@ -2173,17 +1773,11 @@ void fileDirectoriesUnmodified(String directory) throws IOException {
             "\\\\servername\\path\\to\\file, \\\\\\\\servername\\\\path\\\\to\\\\file",
         }
     )
-    void fileDirectoryWithDoubleEscapeIsRead(String expected, String provided)
-        throws IOException {
+    void fileDirectoryWithDoubleEscapeIsRead(String expected, String provided) throws IOException {
         ParserResult result = parser.parse(
-            new StringReader(
-                "@comment{jabref-meta: fileDirectory: " + provided + "}"
-            )
-        );
-        assertEquals(
-            expected,
-            result.getMetaData().getDefaultFileDirectory().get()
+            new StringReader("@comment{jabref-meta: fileDirectory: " + provided + "}")
         );
+        assertEquals(expected, result.getMetaData().getDefaultFileDirectory().get());
     }
 
     @Test
@@ -2237,10 +1831,7 @@ void parsePrecedingComment() throws IOException {
         assertEquals(Optional.of("test"), entry.getCitationKey());
         assertEquals(5, entry.getFields().size());
         assertTrue(entry.getFields().contains(StandardField.AUTHOR));
-        assertEquals(
-            Optional.of("Foo Bar"),
-            entry.getField(StandardField.AUTHOR)
-        );
+        assertEquals(Optional.of("Foo Bar"), entry.getField(StandardField.AUTHOR));
         assertEquals(bibtexEntry, entry.getParsedSerialization());
     }
 
@@ -2264,10 +1855,7 @@ void parseCommentAndEntryInOneLine() throws IOException {
         assertEquals(Optional.of("test"), entry.getCitationKey());
         assertEquals(5, entry.getFields().size());
         assertTrue(entry.getFields().contains(StandardField.AUTHOR));
-        assertEquals(
-            Optional.of("Foo Bar"),
-            entry.getField(StandardField.AUTHOR)
-        );
+        assertEquals(Optional.of("Foo Bar"), entry.getField(StandardField.AUTHOR));
         assertEquals(bibtexEntry, entry.getParsedSerialization());
     }
 
@@ -2276,10 +1864,7 @@ void preserveEncodingPrefixInsideEntry() throws ParseException {
         BibEntry expected = new BibEntry();
         expected.setType(StandardEntryType.Article);
         expected.setCitationKey("test");
-        expected.setField(
-            StandardField.AUTHOR,
-            SaveConfiguration.ENCODING_PREFIX
-        );
+        expected.setField(StandardField.AUTHOR, SaveConfiguration.ENCODING_PREFIX);
 
         List<BibEntry> parsed = parser.parseEntries(
             "@article{test,author={" + SaveConfiguration.ENCODING_PREFIX + "}}"
@@ -2408,10 +1993,7 @@ void parseYearWithMonthString() throws Exception {
             "@ARTICLE{HipKro03, year = {2003}, month = feb }"
         );
 
-        assertEquals(
-            new Date(2003, 2),
-            result.get().getPublicationDate().get()
-        );
+        assertEquals(new Date(2003, 2), result.get().getPublicationDate().get());
     }
 
     @Test
@@ -2420,10 +2002,7 @@ void parseYearWithIllFormattedMonthString() throws Exception {
             "@ARTICLE{HipKro03, year = {2003}, month = #FEB# }"
         );
 
-        assertEquals(
-            new Date(2003, 2),
-            result.get().getPublicationDate().get()
-        );
+        assertEquals(new Date(2003, 2), result.get().getPublicationDate().get());
     }
 
     @Test
@@ -2432,24 +2011,18 @@ void parseYearWithMonthNumber() throws Exception {
             "@ARTICLE{HipKro03, year = {2003}, month = 2 }"
         );
 
-        assertEquals(
-            new Date(2003, 2),
-            result.get().getPublicationDate().get()
-        );
+        assertEquals(new Date(2003, 2), result.get().getPublicationDate().get());
     }
 
     @Test
     void parseYear() throws Exception {
-        Optional<BibEntry> result = parser.parseSingleEntry(
-            "@ARTICLE{HipKro03, year = {2003} }"
-        );
+        Optional<BibEntry> result = parser.parseSingleEntry("@ARTICLE{HipKro03, year = {2003} }");
 
         assertEquals(new Date(2003), result.get().getPublicationDate().get());
     }
 
     @Test
-    void parseEntryUsingStringConstantsForTwoAuthorsWithEtAsStringConstant()
-        throws ParseException {
+    void parseEntryUsingStringConstantsForTwoAuthorsWithEtAsStringConstant() throws ParseException {
         // source of the example: https://docs.jabref.org/fields/strings
         Collection<BibEntry> parsed = parser.parseEntries(
             "@String { kopp = \"Kopp, Oliver\" }" +
@@ -2466,8 +2039,7 @@ void parseEntryUsingStringConstantsForTwoAuthorsWithEtAsStringConstant()
     }
 
     @Test
-    void parseStringConstantsForTwoAuthorsHasCorrectBibTeXEntry()
-        throws ParseException {
+    void parseStringConstantsForTwoAuthorsHasCorrectBibTeXEntry() throws ParseException {
         // source of the example: https://docs.jabref.org/fields/strings
         Collection<BibEntry> parsed = parser.parseEntries(
             "@String { kopp = \"Kopp, Oliver\" }" +
@@ -2501,51 +2073,37 @@ void parseStringConstantsForTwoAuthors() throws ParseException {
 
     @Test
     void textAprilIsParsedAsMonthApril() throws ParseException {
-        Optional<BibEntry> result = parser.parseSingleEntry(
-            "@Misc{m, month = \"apr\" }"
-        );
+        Optional<BibEntry> result = parser.parseSingleEntry("@Misc{m, month = \"apr\" }");
 
         assertEquals(Month.APRIL, result.get().getMonth().get());
     }
 
     @Test
     void textAprilIsDisplayedAsConstant() throws ParseException {
-        Optional<BibEntry> result = parser.parseSingleEntry(
-            "@Misc{m, month = \"apr\" }"
-        );
+        Optional<BibEntry> result = parser.parseSingleEntry("@Misc{m, month = \"apr\" }");
 
         assertEquals("apr", result.get().getField(StandardField.MONTH).get());
     }
 
     @Test
     void bibTeXConstantAprilIsParsedAsMonthApril() throws ParseException {
-        Optional<BibEntry> result = parser.parseSingleEntry(
-            "@Misc{m, month = apr }"
-        );
+        Optional<BibEntry> result = parser.parseSingleEntry("@Misc{m, month = apr }");
 
         assertEquals(Month.APRIL, result.get().getMonth().get());
     }
 
     @Test
     void bibTeXConstantAprilIsDisplayedAsConstant() throws ParseException {
-        Optional<BibEntry> result = parser.parseSingleEntry(
-            "@Misc{m, month = apr }"
-        );
+        Optional<BibEntry> result = parser.parseSingleEntry("@Misc{m, month = apr }");
 
         assertEquals("#apr#", result.get().getField(StandardField.MONTH).get());
     }
 
     @Test
-    void bibTeXConstantAprilIsParsedAsStringMonthAprilWhenReadingTheField()
-        throws ParseException {
-        Optional<BibEntry> result = parser.parseSingleEntry(
-            "@Misc{m, month = apr }"
-        );
+    void bibTeXConstantAprilIsParsedAsStringMonthAprilWhenReadingTheField() throws ParseException {
+        Optional<BibEntry> result = parser.parseSingleEntry("@Misc{m, month = apr }");
 
-        assertEquals(
-            Optional.of("#apr#"),
-            result.get().getField(StandardField.MONTH)
-        );
+        assertEquals(Optional.of("#apr#"), result.get().getField(StandardField.MONTH));
     }
 
     @Test
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 b7176d50c64..a27ef9cb25a 100644
--- a/src/test/java/org/jabref/logic/importer/fileformat/CffImporterTest.java
+++ b/src/test/java/org/jabref/logic/importer/fileformat/CffImporterTest.java
@@ -51,63 +51,41 @@ public void testGetDescription() {
     }
 
     @Test
-    public void testIsRecognizedFormat()
-        throws IOException, URISyntaxException {
-        Path file = Path.of(
-            CffImporterTest.class.getResource("CffImporterTestValid.cff")
-                .toURI()
-        );
+    public void testIsRecognizedFormat() throws IOException, URISyntaxException {
+        Path file = Path.of(CffImporterTest.class.getResource("CffImporterTestValid.cff").toURI());
         assertTrue(importer.isRecognizedFormat(file));
     }
 
     @Test
-    public void testIsRecognizedFormatReject()
-        throws IOException, URISyntaxException {
+    public void testIsRecognizedFormatReject() throws IOException, URISyntaxException {
         List<String> list = Arrays.asList(
             "CffImporterTestInvalid1.cff",
             "CffImporterTestInvalid2.cff"
         );
 
         for (String string : list) {
-            Path file = Path.of(
-                CffImporterTest.class.getResource(string).toURI()
-            );
+            Path file = Path.of(CffImporterTest.class.getResource(string).toURI());
             assertFalse(importer.isRecognizedFormat(file));
         }
     }
 
     @Test
-    public void testImportEntriesBasic()
-        throws IOException, URISyntaxException {
-        Path file = Path.of(
-            CffImporterTest.class.getResource("CffImporterTestValid.cff")
-                .toURI()
-        );
-        List<BibEntry> bibEntries = importer
-            .importDatabase(file)
-            .getDatabase()
-            .getEntries();
+    public void testImportEntriesBasic() throws IOException, URISyntaxException {
+        Path file = Path.of(CffImporterTest.class.getResource("CffImporterTestValid.cff").toURI());
+        List<BibEntry> bibEntries = importer.importDatabase(file).getDatabase().getEntries();
         BibEntry entry = bibEntries.get(0);
 
-        BibEntry expected = getPopulatedEntry()
-            .withField(StandardField.AUTHOR, "Joe van Smith");
+        BibEntry expected = getPopulatedEntry().withField(StandardField.AUTHOR, "Joe van Smith");
 
         assertEquals(entry, expected);
     }
 
     @Test
-    public void testImportEntriesMultipleAuthors()
-        throws IOException, URISyntaxException {
+    public void testImportEntriesMultipleAuthors() throws IOException, URISyntaxException {
         Path file = Path.of(
-            CffImporterTest.class.getResource(
-                    "CffImporterTestValidMultAuthors.cff"
-                )
-                .toURI()
+            CffImporterTest.class.getResource("CffImporterTestValidMultAuthors.cff").toURI()
         );
-        List<BibEntry> bibEntries = importer
-            .importDatabase(file)
-            .getDatabase()
-            .getEntries();
+        List<BibEntry> bibEntries = importer.importDatabase(file).getDatabase().getEntries();
         BibEntry entry = bibEntries.get(0);
 
         BibEntry expected = getPopulatedEntry();
@@ -116,18 +94,11 @@ public void testImportEntriesMultipleAuthors()
     }
 
     @Test
-    public void testImportEntriesSwhIdSelect1()
-        throws IOException, URISyntaxException {
+    public void testImportEntriesSwhIdSelect1() throws IOException, URISyntaxException {
         Path file = Path.of(
-            CffImporterTest.class.getResource(
-                    "CffImporterTestValidSwhIdSelect1.cff"
-                )
-                .toURI()
+            CffImporterTest.class.getResource("CffImporterTestValidSwhIdSelect1.cff").toURI()
         );
-        List<BibEntry> bibEntries = importer
-            .importDatabase(file)
-            .getDatabase()
-            .getEntries();
+        List<BibEntry> bibEntries = importer.importDatabase(file).getDatabase().getEntries();
         BibEntry entry = bibEntries.get(0);
 
         BibEntry expected = getPopulatedEntry()
@@ -140,18 +111,11 @@ public void testImportEntriesSwhIdSelect1()
     }
 
     @Test
-    public void testImportEntriesSwhIdSelect2()
-        throws IOException, URISyntaxException {
+    public void testImportEntriesSwhIdSelect2() throws IOException, URISyntaxException {
         Path file = Path.of(
-            CffImporterTest.class.getResource(
-                    "CffImporterTestValidSwhIdSelect2.cff"
-                )
-                .toURI()
+            CffImporterTest.class.getResource("CffImporterTestValidSwhIdSelect2.cff").toURI()
         );
-        List<BibEntry> bibEntries = importer
-            .importDatabase(file)
-            .getDatabase()
-            .getEntries();
+        List<BibEntry> bibEntries = importer.importDatabase(file).getDatabase().getEntries();
         BibEntry entry = bibEntries.get(0);
 
         BibEntry expected = getPopulatedEntry()
@@ -164,16 +128,11 @@ public void testImportEntriesSwhIdSelect2()
     }
 
     @Test
-    public void testImportEntriesDataset()
-        throws IOException, URISyntaxException {
+    public void testImportEntriesDataset() throws IOException, URISyntaxException {
         Path file = Path.of(
-            CffImporterTest.class.getResource("CffImporterTestDataset.cff")
-                .toURI()
+            CffImporterTest.class.getResource("CffImporterTestDataset.cff").toURI()
         );
-        List<BibEntry> bibEntries = importer
-            .importDatabase(file)
-            .getDatabase()
-            .getEntries();
+        List<BibEntry> bibEntries = importer.importDatabase(file).getDatabase().getEntries();
         BibEntry entry = bibEntries.get(0);
 
         BibEntry expected = getPopulatedEntry();
@@ -183,16 +142,11 @@ public void testImportEntriesDataset()
     }
 
     @Test
-    public void testImportEntriesDoiSelect()
-        throws IOException, URISyntaxException {
+    public void testImportEntriesDoiSelect() throws IOException, URISyntaxException {
         Path file = Path.of(
-            CffImporterTest.class.getResource("CffImporterTestDoiSelect.cff")
-                .toURI()
+            CffImporterTest.class.getResource("CffImporterTestDoiSelect.cff").toURI()
         );
-        List<BibEntry> bibEntries = importer
-            .importDatabase(file)
-            .getDatabase()
-            .getEntries();
+        List<BibEntry> bibEntries = importer.importDatabase(file).getDatabase().getEntries();
         BibEntry entry = bibEntries.get(0);
 
         BibEntry expected = getPopulatedEntry();
@@ -201,22 +155,14 @@ public void testImportEntriesDoiSelect()
     }
 
     @Test
-    public void testImportEntriesUnknownFields()
-        throws IOException, URISyntaxException {
+    public void testImportEntriesUnknownFields() throws IOException, URISyntaxException {
         Path file = Path.of(
-            CffImporterTest.class.getResource(
-                    "CffImporterTestUnknownFields.cff"
-                )
-                .toURI()
+            CffImporterTest.class.getResource("CffImporterTestUnknownFields.cff").toURI()
         );
-        List<BibEntry> bibEntries = importer
-            .importDatabase(file)
-            .getDatabase()
-            .getEntries();
+        List<BibEntry> bibEntries = importer.importDatabase(file).getDatabase().getEntries();
         BibEntry entry = bibEntries.get(0);
 
-        BibEntry expected = getPopulatedEntry()
-            .withField(new UnknownField("commit"), "10ad");
+        BibEntry expected = getPopulatedEntry().withField(new UnknownField("commit"), "10ad");
 
         assertEquals(entry, expected);
     }
@@ -225,10 +171,7 @@ public BibEntry getPopulatedEntry() {
         BibEntry entry = new BibEntry();
         entry.setType(StandardEntryType.Software);
 
-        entry.setField(
-            StandardField.AUTHOR,
-            "Joe van Smith and Bob Jones, Jr."
-        );
+        entry.setField(StandardField.AUTHOR, "Joe van Smith and Bob Jones, Jr.");
         entry.setField(StandardField.TITLE, "Test");
         entry.setField(StandardField.URL, "www.google.com");
         entry.setField(BiblatexSoftwareField.REPOSITORY, "www.github.com");
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 ff25a94e91f..e66eb90cd23 100644
--- a/src/test/java/org/jabref/logic/importer/fileformat/CitaviXmlImporterFilesTest.java
+++ b/src/test/java/org/jabref/logic/importer/fileformat/CitaviXmlImporterFilesTest.java
@@ -13,14 +13,12 @@ public class CitaviXmlImporterFilesTest {
 
     private static Stream<String> fileNames() throws IOException {
         Predicate<String> fileName = name ->
-            name.startsWith("CitaviXmlImporterTest") &&
-            name.endsWith(FILE_ENDING);
+            name.startsWith("CitaviXmlImporterTest") && name.endsWith(FILE_ENDING);
         return ImporterTestEngine.getTestFiles(fileName).stream();
     }
 
     private static Stream<String> invalidFileNames() throws IOException {
-        Predicate<String> fileName = name ->
-            !name.startsWith("CitaviXmlImporterTest");
+        Predicate<String> fileName = name -> !name.startsWith("CitaviXmlImporterTest");
         return ImporterTestEngine.getTestFiles(fileName).stream();
     }
 
@@ -33,19 +31,12 @@ void testIsRecognizedFormat(String fileName) throws IOException {
     @ParameterizedTest
     @MethodSource("invalidFileNames")
     void testIsNotRecognizedFormat(String fileName) throws IOException {
-        ImporterTestEngine.testIsNotRecognizedFormat(
-            citaviXmlImporter,
-            fileName
-        );
+        ImporterTestEngine.testIsNotRecognizedFormat(citaviXmlImporter, fileName);
     }
 
     @ParameterizedTest
     @MethodSource("fileNames")
     void testImportEntries(String fileName) throws Exception {
-        ImporterTestEngine.testImportEntries(
-            citaviXmlImporter,
-            fileName,
-            FILE_ENDING
-        );
+        ImporterTestEngine.testImportEntries(citaviXmlImporter, fileName, FILE_ENDING);
     }
 }
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 5d9793e8f74..879cc0386a8 100644
--- a/src/test/java/org/jabref/logic/importer/fileformat/CopacImporterFilesTest.java
+++ b/src/test/java/org/jabref/logic/importer/fileformat/CopacImporterFilesTest.java
@@ -17,36 +17,25 @@ private static Stream<String> fileNames() throws IOException {
     }
 
     private static Stream<String> nonCopacfileNames() throws IOException {
-        Predicate<String> fileName = name ->
-            !name.startsWith("CopacImporterTest");
+        Predicate<String> fileName = name -> !name.startsWith("CopacImporterTest");
         return ImporterTestEngine.getTestFiles(fileName).stream();
     }
 
     @ParameterizedTest
     @MethodSource("fileNames")
     public void testIsRecognizedFormat(String fileName) throws IOException {
-        ImporterTestEngine.testIsRecognizedFormat(
-            new CopacImporter(),
-            fileName
-        );
+        ImporterTestEngine.testIsRecognizedFormat(new CopacImporter(), fileName);
     }
 
     @ParameterizedTest
     @MethodSource("nonCopacfileNames")
     public void testIsNotRecognizedFormat(String fileName) throws IOException {
-        ImporterTestEngine.testIsNotRecognizedFormat(
-            new CopacImporter(),
-            fileName
-        );
+        ImporterTestEngine.testIsNotRecognizedFormat(new CopacImporter(), fileName);
     }
 
     @ParameterizedTest
     @MethodSource("fileNames")
     public void testImportEntries(String fileName) throws Exception {
-        ImporterTestEngine.testImportEntries(
-            new CopacImporter(),
-            fileName,
-            FILE_ENDING
-        );
+        ImporterTestEngine.testImportEntries(new CopacImporter(), fileName, FILE_ENDING);
     }
 }
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 15ddc00baf5..dc9b24e23ea 100644
--- a/src/test/java/org/jabref/logic/importer/fileformat/CopacImporterTest.java
+++ b/src/test/java/org/jabref/logic/importer/fileformat/CopacImporterTest.java
@@ -31,13 +31,8 @@ public void testGetDescription() {
 
     @Test
     public void testImportEmptyEntries() throws Exception {
-        Path path = Path.of(
-            CopacImporterTest.class.getResource("Empty.txt").toURI()
-        );
-        List<BibEntry> entries = importer
-            .importDatabase(path)
-            .getDatabase()
-            .getEntries();
+        Path path = Path.of(CopacImporterTest.class.getResource("Empty.txt").toURI());
+        List<BibEntry> entries = importer.importDatabase(path).getDatabase().getEntries();
         assertEquals(Collections.emptyList(), entries);
     }
 }
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 0b9e6e4b7e4..7a54a78c729 100644
--- a/src/test/java/org/jabref/logic/importer/fileformat/CustomImporterTest.java
+++ b/src/test/java/org/jabref/logic/importer/fileformat/CustomImporterTest.java
@@ -30,18 +30,13 @@ public void testGetId() {
 
     @Test
     public void testGetClassName() {
-        assertEquals(
-            "org.jabref.logic.importer.fileformat.CopacImporter",
-            importer.getClassName()
-        );
+        assertEquals("org.jabref.logic.importer.fileformat.CopacImporter", importer.getClassName());
     }
 
     @Test
     public void testGetBasePath() {
         assertEquals(
-            Path.of(
-                "src/main/java/org/jabref/logic/importer/fileformat/CopacImporter.java"
-            ),
+            Path.of("src/main/java/org/jabref/logic/importer/fileformat/CopacImporter.java"),
             importer.getBasePath()
         );
     }
@@ -77,10 +72,7 @@ public void testCompareToSmaller() throws Exception {
 
     @Test
     public void testCompareToEven() throws Exception {
-        assertEquals(
-            0,
-            importer.compareTo(asCustomImporter(new CopacImporter()))
-        );
+        assertEquals(0, importer.compareTo(asCustomImporter(new CopacImporter())));
     }
 
     @Test
@@ -98,8 +90,7 @@ public void testClassicConstructor() throws Exception {
         assertEquals(importer, customImporter);
     }
 
-    private CustomImporter asCustomImporter(Importer importer)
-        throws Exception {
+    private CustomImporter asCustomImporter(Importer importer) throws Exception {
         return new CustomImporter(
             "src/main/java/org/jabref/logic/importer/fileformat/" +
             importer.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 a26eb2b045f..b43baa8dc7d 100644
--- a/src/test/java/org/jabref/logic/importer/fileformat/EndnoteImporterTest.java
+++ b/src/test/java/org/jabref/logic/importer/fileformat/EndnoteImporterTest.java
@@ -53,8 +53,7 @@ public void testGetDescription() {
     }
 
     @Test
-    public void testIsRecognizedFormat()
-        throws IOException, URISyntaxException {
+    public void testIsRecognizedFormat() throws IOException, URISyntaxException {
         List<String> list = Arrays.asList(
             "Endnote.pattern.A.enw",
             "Endnote.pattern.E.enw",
@@ -62,16 +61,13 @@ public void testIsRecognizedFormat()
         );
 
         for (String string : list) {
-            Path file = Path.of(
-                EndnoteImporterTest.class.getResource(string).toURI()
-            );
+            Path file = Path.of(EndnoteImporterTest.class.getResource(string).toURI());
             assertTrue(importer.isRecognizedFormat(file));
         }
     }
 
     @Test
-    public void testIsRecognizedFormatReject()
-        throws IOException, URISyntaxException {
+    public void testIsRecognizedFormatReject() throws IOException, URISyntaxException {
         List<String> list = Arrays.asList(
             "IEEEImport1.txt",
             "IsiImporterTest1.isi",
@@ -85,109 +81,59 @@ public void testIsRecognizedFormatReject()
         );
 
         for (String string : list) {
-            Path file = Path.of(
-                EndnoteImporterTest.class.getResource(string).toURI()
-            );
+            Path file = Path.of(EndnoteImporterTest.class.getResource(string).toURI());
             assertFalse(importer.isRecognizedFormat(file));
         }
     }
 
     @Test
     public void testImportEntries0() throws IOException, URISyntaxException {
-        Path file = Path.of(
-            EndnoteImporterTest.class.getResource("Endnote.entries.enw").toURI()
-        );
-        List<BibEntry> bibEntries = importer
-            .importDatabase(file)
-            .getDatabase()
-            .getEntries();
+        Path file = Path.of(EndnoteImporterTest.class.getResource("Endnote.entries.enw").toURI());
+        List<BibEntry> bibEntries = importer.importDatabase(file).getDatabase().getEntries();
 
         assertEquals(5, bibEntries.size());
 
         BibEntry first = bibEntries.get(0);
         assertEquals(StandardEntryType.Misc, first.getType());
-        assertEquals(
-            Optional.of("testA0 and testA1"),
-            first.getField(StandardField.AUTHOR)
-        );
-        assertEquals(
-            Optional.of("testE0 and testE1"),
-            first.getField(StandardField.EDITOR)
-        );
+        assertEquals(Optional.of("testA0 and testA1"), first.getField(StandardField.AUTHOR));
+        assertEquals(Optional.of("testE0 and testE1"), first.getField(StandardField.EDITOR));
         assertEquals(Optional.of("testT"), first.getField(StandardField.TITLE));
 
         BibEntry second = bibEntries.get(1);
         assertEquals(StandardEntryType.Misc, second.getType());
-        assertEquals(
-            Optional.of("testC"),
-            second.getField(StandardField.ADDRESS)
-        );
-        assertEquals(
-            Optional.of("testB2"),
-            second.getField(StandardField.BOOKTITLE)
-        );
+        assertEquals(Optional.of("testC"), second.getField(StandardField.ADDRESS));
+        assertEquals(Optional.of("testB2"), second.getField(StandardField.BOOKTITLE));
         assertEquals(Optional.of("test8"), second.getField(StandardField.DATE));
-        assertEquals(
-            Optional.of("test7"),
-            second.getField(StandardField.EDITION)
-        );
-        assertEquals(
-            Optional.of("testJ"),
-            second.getField(StandardField.JOURNAL)
-        );
+        assertEquals(Optional.of("test7"), second.getField(StandardField.EDITION));
+        assertEquals(Optional.of("testJ"), second.getField(StandardField.JOURNAL));
         assertEquals(Optional.of("testD"), second.getField(StandardField.YEAR));
 
         BibEntry third = bibEntries.get(2);
         assertEquals(StandardEntryType.Article, third.getType());
-        assertEquals(
-            Optional.of("testB0"),
-            third.getField(StandardField.JOURNAL)
-        );
+        assertEquals(Optional.of("testB0"), third.getField(StandardField.JOURNAL));
 
         BibEntry fourth = bibEntries.get(3);
         assertEquals(StandardEntryType.Book, fourth.getType());
-        assertEquals(
-            Optional.of("testI0"),
-            fourth.getField(StandardField.PUBLISHER)
-        );
-        assertEquals(
-            Optional.of("testB1"),
-            fourth.getField(StandardField.SERIES)
-        );
+        assertEquals(Optional.of("testI0"), fourth.getField(StandardField.PUBLISHER));
+        assertEquals(Optional.of("testB1"), fourth.getField(StandardField.SERIES));
 
         BibEntry fifth = bibEntries.get(4);
         assertEquals(StandardEntryType.MastersThesis, fifth.getType());
-        assertEquals(
-            Optional.of("testX"),
-            fifth.getField(StandardField.ABSTRACT)
-        );
+        assertEquals(Optional.of("testX"), fifth.getField(StandardField.ABSTRACT));
         assertEquals(Optional.of("testF"), fifth.getCitationKey());
         assertEquals(Optional.of("testR"), fifth.getField(StandardField.DOI));
-        assertEquals(
-            Optional.of("testK"),
-            fifth.getField(StandardField.KEYWORDS)
-        );
+        assertEquals(Optional.of("testK"), fifth.getField(StandardField.KEYWORDS));
         assertEquals(Optional.of("testO1"), fifth.getField(StandardField.NOTE));
-        assertEquals(
-            Optional.of("testN"),
-            fifth.getField(StandardField.NUMBER)
-        );
+        assertEquals(Optional.of("testN"), fifth.getField(StandardField.NUMBER));
         assertEquals(Optional.of("testP"), fifth.getField(StandardField.PAGES));
-        assertEquals(
-            Optional.of("testI1"),
-            fifth.getField(StandardField.SCHOOL)
-        );
+        assertEquals(Optional.of("testI1"), fifth.getField(StandardField.SCHOOL));
         assertEquals(Optional.of("testU"), fifth.getField(StandardField.URL));
-        assertEquals(
-            Optional.of("testV"),
-            fifth.getField(StandardField.VOLUME)
-        );
+        assertEquals(Optional.of("testV"), fifth.getField(StandardField.VOLUME));
     }
 
     @Test
     public void testImportEntries1() throws IOException {
-        String medlineString =
-            "%O Artn\\\\s testO\n%A testA,\n%E testE0, testE1";
+        String medlineString = "%O Artn\\\\s testO\n%A testA,\n%E testE0, testE1";
         List<BibEntry> bibEntries = importer
             .importDatabase(new BufferedReader(new StringReader(medlineString)))
             .getDatabase()
@@ -197,37 +143,23 @@ public void testImportEntries1() throws IOException {
 
         assertEquals(1, bibEntries.size());
         assertEquals(StandardEntryType.Misc, entry.getType());
-        assertEquals(
-            Optional.of("testA"),
-            entry.getField(StandardField.AUTHOR)
-        );
-        assertEquals(
-            Optional.of("testE0, testE1"),
-            entry.getField(StandardField.EDITOR)
-        );
+        assertEquals(Optional.of("testA"), entry.getField(StandardField.AUTHOR));
+        assertEquals(Optional.of("testE0, testE1"), entry.getField(StandardField.EDITOR));
         assertEquals(Optional.of("testO"), entry.getField(StandardField.PAGES));
     }
 
     @Test
-    public void testImportEntriesBookExample()
-        throws IOException, URISyntaxException {
+    public void testImportEntriesBookExample() throws IOException, URISyntaxException {
         Path file = Path.of(
-            EndnoteImporterTest.class.getResource("Endnote.book.example.enw")
-                .toURI()
+            EndnoteImporterTest.class.getResource("Endnote.book.example.enw").toURI()
         );
-        List<BibEntry> bibEntries = importer
-            .importDatabase(file)
-            .getDatabase()
-            .getEntries();
+        List<BibEntry> bibEntries = importer.importDatabase(file).getDatabase().getEntries();
 
         BibEntry entry = bibEntries.get(0);
 
         assertEquals(1, bibEntries.size());
         assertEquals(StandardEntryType.Book, entry.getType());
-        assertEquals(
-            Optional.of("Heidelberg"),
-            entry.getField(StandardField.ADDRESS)
-        );
+        assertEquals(Optional.of("Heidelberg"), entry.getField(StandardField.ADDRESS));
         assertEquals(
             Optional.of("Preißel, René and Stachmann, Bjørn"),
             entry.getField(StandardField.AUTHOR)
@@ -236,28 +168,14 @@ public void testImportEntriesBookExample()
             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("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"
-            ),
+            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));
     }
 }
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 2aa556f67b6..989ed68afff 100644
--- a/src/test/java/org/jabref/logic/importer/fileformat/EndnoteXmlImporterFilesTest.java
+++ b/src/test/java/org/jabref/logic/importer/fileformat/EndnoteXmlImporterFilesTest.java
@@ -19,25 +19,19 @@ public class EndnoteXmlImporterFilesTest {
 
     private static Stream<String> fileNames() throws IOException {
         Predicate<String> fileName = name ->
-            name.startsWith("EndnoteXmlImporterTest") &&
-            name.endsWith(FILE_ENDING);
+            name.startsWith("EndnoteXmlImporterTest") && name.endsWith(FILE_ENDING);
         return ImporterTestEngine.getTestFiles(fileName).stream();
     }
 
     private static Stream<String> invalidFileNames() throws IOException {
-        Predicate<String> fileName = name ->
-            !name.startsWith("EndnoteXmlImporterTest");
+        Predicate<String> fileName = name -> !name.startsWith("EndnoteXmlImporterTest");
         return ImporterTestEngine.getTestFiles(fileName).stream();
     }
 
     @BeforeEach
     void setUp() {
-        importFormatPreferences =
-            mock(ImportFormatPreferences.class, Answers.RETURNS_DEEP_STUBS);
-        when(
-            importFormatPreferences.bibEntryPreferences().getKeywordSeparator()
-        )
-            .thenReturn(';');
+        importFormatPreferences = mock(ImportFormatPreferences.class, Answers.RETURNS_DEEP_STUBS);
+        when(importFormatPreferences.bibEntryPreferences().getKeywordSeparator()).thenReturn(';');
     }
 
     @ParameterizedTest
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 e71203cc1d7..a2f2c6c9743 100644
--- a/src/test/java/org/jabref/logic/importer/fileformat/ImporterTestEngine.java
+++ b/src/test/java/org/jabref/logic/importer/fileformat/ImporterTestEngine.java
@@ -29,9 +29,8 @@ public class ImporterTestEngine {
      * @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())
@@ -40,25 +39,18 @@ public static Collection<String> getTestFiles(
         }
     }
 
-    public static void testIsRecognizedFormat(
-        Importer importer,
-        String fileName
-    ) throws IOException {
+    public static void testIsRecognizedFormat(Importer importer, String fileName)
+        throws IOException {
         Assertions.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 {
         Assertions.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());
@@ -73,18 +65,14 @@ public static void testImportEntries(
 
     private static Path getPath(String fileName) throws IOException {
         try {
-            return Path.of(
-                ImporterTestEngine.class.getResource(fileName).toURI()
-            );
+            return Path.of(ImporterTestEngine.class.getResource(fileName).toURI());
         } catch (URISyntaxException e) {
             throw new IOException(e);
         }
     }
 
-    public static void testImportMalformedFiles(
-        Importer importer,
-        String fileName
-    ) throws IOException {
+    public static void testImportMalformedFiles(Importer importer, String fileName)
+        throws IOException {
         List<BibEntry> entries = importer
             .importDatabase(getPath(fileName))
             .getDatabase()
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 94544203e44..1b9faea7fa7 100644
--- a/src/test/java/org/jabref/logic/importer/fileformat/InspecImporterTest.java
+++ b/src/test/java/org/jabref/logic/importer/fileformat/InspecImporterTest.java
@@ -34,8 +34,7 @@ private static Stream<String> fileNames() throws IOException {
     }
 
     private static Stream<String> nonInspecfileNames() throws IOException {
-        Predicate<String> fileName = name ->
-            !name.startsWith("InspecImportTest");
+        Predicate<String> fileName = name -> !name.startsWith("InspecImportTest");
         return ImporterTestEngine.getTestFiles(fileName).stream();
     }
 
@@ -46,15 +45,13 @@ public void setUp() throws Exception {
 
     @ParameterizedTest
     @MethodSource("fileNames")
-    public void testIsRecognizedFormatAccept(String fileName)
-        throws IOException {
+    public void testIsRecognizedFormatAccept(String fileName) throws IOException {
         ImporterTestEngine.testIsRecognizedFormat(importer, fileName);
     }
 
     @ParameterizedTest
     @MethodSource("nonInspecfileNames")
-    public void testIsRecognizedFormatReject(String fileName)
-        throws IOException {
+    public void testIsRecognizedFormatReject(String fileName) throws IOException {
         ImporterTestEngine.testIsNotRecognizedFormat(importer, fileName);
     }
 
@@ -84,45 +81,24 @@ public void testCompleteBibtexEntryOnJournalPaperImport()
     @Test
     public void importConferencePaperGivesInproceedings() throws IOException {
         String testInput =
-            "Record.*INSPEC.*\n" +
-            "\n" +
-            "RT ~ Conference-Paper\n" +
-            "AU ~ Prechelt, Lutz";
+            "Record.*INSPEC.*\n" + "\n" + "RT ~ Conference-Paper\n" + "AU ~ Prechelt, Lutz";
         BibEntry expectedEntry = new BibEntry(StandardEntryType.InProceedings);
         expectedEntry.setField(StandardField.AUTHOR, "Prechelt, Lutz");
 
-        try (
-            BufferedReader reader = new BufferedReader(
-                new StringReader(testInput)
-            )
-        ) {
-            List<BibEntry> entries = importer
-                .importDatabase(reader)
-                .getDatabase()
-                .getEntries();
+        try (BufferedReader reader = new BufferedReader(new StringReader(testInput))) {
+            List<BibEntry> entries = importer.importDatabase(reader).getDatabase().getEntries();
             assertEquals(Collections.singletonList(expectedEntry), entries);
         }
     }
 
     @Test
     public 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");
 
-        try (
-            BufferedReader reader = new BufferedReader(
-                new StringReader(testInput)
-            )
-        ) {
-            List<BibEntry> entries = importer
-                .importDatabase(reader)
-                .getDatabase()
-                .getEntries();
+        try (BufferedReader reader = new BufferedReader(new StringReader(testInput))) {
+            List<BibEntry> entries = importer.importDatabase(reader).getDatabase().getEntries();
             assertEquals(1, entries.size());
             BibEntry entry = entries.get(0);
             assertEquals(expectedEntry, entry);
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 a69d5e5e7da..a17ed4ddbce 100644
--- a/src/test/java/org/jabref/logic/importer/fileformat/IsiImporterTest.java
+++ b/src/test/java/org/jabref/logic/importer/fileformat/IsiImporterTest.java
@@ -35,8 +35,7 @@ private static Stream<String> fileNames() throws IOException {
     }
 
     private static Stream<String> invalidFileNames() throws IOException {
-        Predicate<String> fileName = name ->
-            !name.startsWith("IsiImporterTest");
+        Predicate<String> fileName = name -> !name.startsWith("IsiImporterTest");
         return ImporterTestEngine.getTestFiles(fileName).stream();
     }
 
@@ -70,15 +69,13 @@ public void testGetDescription() {
 
     @ParameterizedTest
     @MethodSource("fileNames")
-    public void testIsRecognizedFormatAccepted(String fileName)
-        throws IOException {
+    public void testIsRecognizedFormatAccepted(String fileName) throws IOException {
         ImporterTestEngine.testIsRecognizedFormat(importer, fileName);
     }
 
     @ParameterizedTest
     @MethodSource("invalidFileNames")
-    public void testIsRecognizedFormatRejected(String fileName)
-        throws IOException {
+    public void testIsRecognizedFormatRejected(String fileName) throws IOException {
         ImporterTestEngine.testIsNotRecognizedFormat(importer, fileName);
     }
 
@@ -129,20 +126,13 @@ public void testProcessSubSup() {
 
     @Test
     public void testImportEntries1() throws IOException, URISyntaxException {
-        Path file = Path.of(
-            IsiImporterTest.class.getResource("IsiImporterTest1.isi").toURI()
-        );
-        List<BibEntry> entries = importer
-            .importDatabase(file)
-            .getDatabase()
-            .getEntries();
+        Path file = Path.of(IsiImporterTest.class.getResource("IsiImporterTest1.isi").toURI());
+        List<BibEntry> entries = importer.importDatabase(file).getDatabase().getEntries();
         BibEntry entry = entries.get(0);
 
         assertEquals(1, entries.size());
         assertEquals(
-            Optional.of(
-                "Optical properties of MgO doped LiNbO$_3$ single crystals"
-            ),
+            Optional.of("Optical properties of MgO doped LiNbO$_3$ single crystals"),
             entry.getField(StandardField.TITLE)
         );
         assertEquals(
@@ -152,62 +142,36 @@ public void testImportEntries1() throws IOException, URISyntaxException {
             entry.getField(StandardField.AUTHOR)
         );
         assertEquals(StandardEntryType.Article, entry.getType());
-        assertEquals(
-            Optional.of("Optical Materials"),
-            entry.getField(StandardField.JOURNAL)
-        );
+        assertEquals(Optional.of("Optical Materials"), entry.getField(StandardField.JOURNAL));
         assertEquals(Optional.of("2006"), entry.getField(StandardField.YEAR));
         assertEquals(Optional.of("28"), entry.getField(StandardField.VOLUME));
         assertEquals(Optional.of("5"), entry.getField(StandardField.NUMBER));
-        assertEquals(
-            Optional.of("467--72"),
-            entry.getField(StandardField.PAGES)
-        );
+        assertEquals(Optional.of("467--72"), entry.getField(StandardField.PAGES));
     }
 
     @Test
     public void testImportEntries2() throws IOException, URISyntaxException {
-        Path file = Path.of(
-            IsiImporterTest.class.getResource("IsiImporterTest2.isi").toURI()
-        );
-        List<BibEntry> entries = importer
-            .importDatabase(file)
-            .getDatabase()
-            .getEntries();
+        Path file = Path.of(IsiImporterTest.class.getResource("IsiImporterTest2.isi").toURI());
+        List<BibEntry> entries = importer.importDatabase(file).getDatabase().getEntries();
         BibEntry entry = entries.get(0);
 
         assertEquals(3, entries.size());
         assertEquals(
-            Optional.of(
-                "Optical properties of MgO doped LiNbO$_3$ single crystals"
-            ),
+            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)
-        );
+        assertEquals(Optional.of("Optical Materials"), entry.getField(StandardField.JOURNAL));
         assertEquals(Optional.of("2006"), entry.getField(StandardField.YEAR));
         assertEquals(Optional.of("28"), entry.getField(StandardField.VOLUME));
         assertEquals(Optional.of("5"), entry.getField(StandardField.NUMBER));
-        assertEquals(
-            Optional.of("467-72"),
-            entry.getField(StandardField.PAGES)
-        );
+        assertEquals(Optional.of("467-72"), entry.getField(StandardField.PAGES));
     }
 
     @Test
-    public void testImportEntriesINSPEC()
-        throws IOException, URISyntaxException {
-        Path file = Path.of(
-            IsiImporterTest.class.getResource("IsiImporterTestInspec.isi")
-                .toURI()
-        );
-        List<BibEntry> entries = importer
-            .importDatabase(file)
-            .getDatabase()
-            .getEntries();
+    public void testImportEntriesINSPEC() throws IOException, URISyntaxException {
+        Path file = Path.of(IsiImporterTest.class.getResource("IsiImporterTestInspec.isi").toURI());
+        List<BibEntry> entries = importer.importDatabase(file).getDatabase().getEntries();
 
         BibEntry first = entries.get(0);
         BibEntry second = entries.get(1);
@@ -236,27 +200,16 @@ public void testImportEntriesINSPEC()
         assertEquals(StandardEntryType.Article, first.getType());
 
         assertEquals(
-            Optional.of(
-                "Degl'Innocenti, R. and Guarino, A. and Poberaj, G. and Gunter, P."
-            ),
+            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("Applied Physics Letters"), first.getField(StandardField.JOURNAL));
         assertEquals(Optional.of("2006"), first.getField(StandardField.YEAR));
         assertEquals(Optional.of(Month.JULY), first.getMonth());
         assertEquals(Optional.of("89"), first.getField(StandardField.VOLUME));
         assertEquals(Optional.of("4"), first.getField(StandardField.NUMBER));
-        assertEquals(
-            Optional.of("Lorem ipsum abstract"),
-            first.getField(StandardField.ABSTRACT)
-        );
-        assertEquals(
-            Optional.of("Aip"),
-            first.getField(StandardField.PUBLISHER)
-        );
+        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"
@@ -268,13 +221,8 @@ public void testImportEntriesINSPEC()
 
     @Test
     public void testImportEntriesWOS() throws IOException, URISyntaxException {
-        Path file = Path.of(
-            IsiImporterTest.class.getResource("IsiImporterTestWOS.isi").toURI()
-        );
-        List<BibEntry> entries = importer
-            .importDatabase(file)
-            .getDatabase()
-            .getEntries();
+        Path file = Path.of(IsiImporterTest.class.getResource("IsiImporterTestWOS.isi").toURI());
+        List<BibEntry> entries = importer.importDatabase(file).getDatabase().getEntries();
 
         BibEntry first = entries.get(0);
         BibEntry second = entries.get(1);
@@ -288,9 +236,7 @@ public void testImportEntriesWOS() throws IOException, URISyntaxException {
             first.getField(StandardField.TITLE)
         );
         assertEquals(
-            Optional.of(
-                "Optical waveguides in Sn2P2S6 by low fluence MeV He+ ion implantation"
-            ),
+            Optional.of("Optical waveguides in Sn2P2S6 by low fluence MeV He+ ion implantation"),
             second.getField(StandardField.TITLE)
         );
 
@@ -331,41 +277,21 @@ public void testMonthConvert() {
 
     @Test
     public void testIsiAuthorConvert() {
-        assertEquals(
-            "James Brown",
-            IsiImporter.isiAuthorConvert("James Brown")
-        );
-        assertEquals(
-            "James Marc Brown",
-            IsiImporter.isiAuthorConvert("James Marc Brown")
-        );
-        assertEquals(
-            "Brown, J. M.",
-            IsiImporter.isiAuthorConvert("Brown, J.M.")
-        );
+        assertEquals("James Brown", IsiImporter.isiAuthorConvert("James Brown"));
+        assertEquals("James Marc Brown", IsiImporter.isiAuthorConvert("James Marc Brown"));
+        assertEquals("Brown, J. M.", IsiImporter.isiAuthorConvert("Brown, J.M."));
         assertEquals("Brown, J.", IsiImporter.isiAuthorConvert("Brown, J."));
         assertEquals("Brown, J. M.", IsiImporter.isiAuthorConvert("Brown, JM"));
         assertEquals("Brown, J.", IsiImporter.isiAuthorConvert("Brown, J"));
-        assertEquals(
-            "Brown, James",
-            IsiImporter.isiAuthorConvert("Brown, James")
-        );
-        assertEquals(
-            "Hall, Janet E.",
-            IsiImporter.isiAuthorConvert("Hall, Janet E")
-        );
+        assertEquals("Brown, James", IsiImporter.isiAuthorConvert("Brown, James"));
+        assertEquals("Hall, Janet E.", IsiImporter.isiAuthorConvert("Hall, Janet E"));
         assertEquals("", IsiImporter.isiAuthorConvert(""));
     }
 
     @Test
     public void testImportIEEEExport() throws IOException, URISyntaxException {
-        Path file = Path.of(
-            IsiImporterTest.class.getResource("IEEEImport1.txt").toURI()
-        );
-        List<BibEntry> entries = importer
-            .importDatabase(file)
-            .getDatabase()
-            .getEntries();
+        Path file = Path.of(IsiImporterTest.class.getResource("IEEEImport1.txt").toURI());
+        List<BibEntry> entries = importer.importDatabase(file).getDatabase().getEntries();
         BibEntry entry = entries.get(0);
 
         assertEquals(1, entries.size());
@@ -384,40 +310,24 @@ public void testImportIEEEExport() throws IOException, URISyntaxException {
         );
         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("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("2006"), entry.getField(StandardField.YEAR));
         assertEquals(
-            Optional.of(
-                "Perceptual grouping, street extraction, urban remote sensing"
-            ),
+            Optional.of("Perceptual grouping, street extraction, urban remote sensing"),
             entry.getField(StandardField.KEYWORDS)
         );
-        assertEquals(
-            Optional.of("Lorem ipsum abstract"),
-            entry.getField(StandardField.ABSTRACT)
-        );
+        assertEquals(Optional.of("Lorem ipsum abstract"), entry.getField(StandardField.ABSTRACT));
     }
 
     @Test
     public void testIEEEImport() throws IOException, URISyntaxException {
-        Path file = Path.of(
-            IsiImporterTest.class.getResource("IEEEImport1.txt").toURI()
-        );
-        List<BibEntry> entries = importer
-            .importDatabase(file)
-            .getDatabase()
-            .getEntries();
+        Path file = Path.of(IsiImporterTest.class.getResource("IEEEImport1.txt").toURI());
+        List<BibEntry> entries = importer.importDatabase(file).getDatabase().getEntries();
         BibEntry entry = entries.get(0);
 
         assertEquals(1, entries.size());
@@ -434,42 +344,26 @@ public void testIEEEImport() throws IOException, URISyntaxException {
         );
         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("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("2006"), entry.getField(StandardField.YEAR));
         assertEquals(
-            Optional.of(
-                "Perceptual grouping, street extraction, urban remote sensing"
-            ),
+            Optional.of("Perceptual grouping, street extraction, urban remote sensing"),
             entry.getField(StandardField.KEYWORDS)
         );
-        assertEquals(
-            Optional.of("Lorem ipsum abstract"),
-            entry.getField(StandardField.ABSTRACT)
-        );
+        assertEquals(Optional.of("Lorem ipsum abstract"), entry.getField(StandardField.ABSTRACT));
     }
 
     @Test
-    public void testImportEntriesMedline()
-        throws IOException, URISyntaxException {
+    public void testImportEntriesMedline() throws IOException, URISyntaxException {
         Path file = Path.of(
-            IsiImporterTest.class.getResource("IsiImporterTestMedline.isi")
-                .toURI()
+            IsiImporterTest.class.getResource("IsiImporterTestMedline.isi").toURI()
         );
-        List<BibEntry> entries = importer
-            .importDatabase(file)
-            .getDatabase()
-            .getEntries();
+        List<BibEntry> entries = importer.importDatabase(file).getDatabase().getEntries();
 
         BibEntry first = entries.get(0);
         BibEntry second = entries.get(1);
@@ -481,22 +375,13 @@ public void testImportEntriesMedline()
             ),
             first.getField(StandardField.TITLE)
         );
-        assertEquals(
-            Optional.of("Wesensten, Nancy J."),
-            first.getField(StandardField.AUTHOR)
-        );
-        assertEquals(
-            Optional.of("Curr Pharm Des"),
-            first.getField(StandardField.JOURNAL)
-        );
+        assertEquals(Optional.of("Wesensten, Nancy J."), first.getField(StandardField.AUTHOR));
+        assertEquals(Optional.of("Curr Pharm Des"), first.getField(StandardField.JOURNAL));
         assertEquals(Optional.of("2006"), first.getField(StandardField.YEAR));
         assertEquals(Optional.empty(), first.getField(StandardField.MONTH));
         assertEquals(Optional.of("12"), first.getField(StandardField.VOLUME));
         assertEquals(Optional.of("20"), first.getField(StandardField.NUMBER));
-        assertEquals(
-            Optional.of("2457--71"),
-            first.getField(StandardField.PAGES)
-        );
+        assertEquals(Optional.of("2457--71"), first.getField(StandardField.PAGES));
         assertEquals(StandardEntryType.Article, first.getType());
         assertEquals(
             Optional.of(
@@ -514,25 +399,15 @@ public void testImportEntriesMedline()
         assertEquals(Optional.of(Month.MAY), second.getMonth());
         assertEquals(Optional.of("13"), second.getField(StandardField.VOLUME));
         assertEquals(Optional.of("3"), second.getField(StandardField.NUMBER));
-        assertEquals(
-            Optional.of("411--22"),
-            second.getField(StandardField.PAGES)
-        );
+        assertEquals(Optional.of("411--22"), second.getField(StandardField.PAGES));
         assertEquals(StandardEntryType.Article, second.getType());
     }
 
     @Test
-    public void testImportEntriesEmpty()
-        throws IOException, URISyntaxException {
-        Path file = Path.of(
-            IsiImporterTest.class.getResource("IsiImporterTestEmpty.isi")
-                .toURI()
-        );
+    public void testImportEntriesEmpty() throws IOException, URISyntaxException {
+        Path file = Path.of(IsiImporterTest.class.getResource("IsiImporterTestEmpty.isi").toURI());
 
-        List<BibEntry> entries = importer
-            .importDatabase(file)
-            .getDatabase()
-            .getEntries();
+        List<BibEntry> entries = importer.importDatabase(file).getDatabase().getEntries();
 
         assertEquals(1, entries.size());
     }
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 62a2d2721da..a36b85a72f6 100644
--- a/src/test/java/org/jabref/logic/importer/fileformat/MarcXmlParserTest.java
+++ b/src/test/java/org/jabref/logic/importer/fileformat/MarcXmlParserTest.java
@@ -24,19 +24,11 @@ private static Stream<String> fileNames() throws IOException {
     }
 
     private void doTest(String xmlName, String bibName) throws Exception {
-        try (
-            InputStream is = MarcXmlParserTest.class.getResourceAsStream(
-                    xmlName
-                )
-        ) {
+        try (InputStream is = MarcXmlParserTest.class.getResourceAsStream(xmlName)) {
             MarcXmlParser parser = new MarcXmlParser();
             List<BibEntry> entries = parser.parseEntries(is);
             assertNotNull(entries);
-            BibEntryAssert.assertEquals(
-                MarcXmlParserTest.class,
-                bibName,
-                entries.get(0)
-            );
+            BibEntryAssert.assertEquals(MarcXmlParserTest.class, bibName, entries.get(0));
         }
     }
 
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 320154468fa..a851d5a7993 100644
--- a/src/test/java/org/jabref/logic/importer/fileformat/MedlineImporterFilesTest.java
+++ b/src/test/java/org/jabref/logic/importer/fileformat/MedlineImporterFilesTest.java
@@ -21,37 +21,26 @@ private static Stream<String> fileNames() throws IOException {
     }
 
     private static Stream<String> invalidFileNames() throws IOException {
-        Predicate<String> fileName = name ->
-            !name.startsWith("MedlineImporterTest");
+        Predicate<String> fileName = name -> !name.startsWith("MedlineImporterTest");
         return ImporterTestEngine.getTestFiles(fileName).stream();
     }
 
     @ParameterizedTest
     @MethodSource("fileNames")
     public void testIsRecognizedFormat(String fileName) throws IOException {
-        ImporterTestEngine.testIsRecognizedFormat(
-            new MedlineImporter(),
-            fileName
-        );
+        ImporterTestEngine.testIsRecognizedFormat(new MedlineImporter(), fileName);
     }
 
     @ParameterizedTest
     @MethodSource("invalidFileNames")
     public void testIsNotRecognizedFormat(String fileName) throws IOException {
-        ImporterTestEngine.testIsNotRecognizedFormat(
-            new MedlineImporter(),
-            fileName
-        );
+        ImporterTestEngine.testIsNotRecognizedFormat(new MedlineImporter(), fileName);
     }
 
     @ParameterizedTest
     @MethodSource("fileNames")
     public void testImportEntries(String fileName) throws Exception {
-        ImporterTestEngine.testImportEntries(
-            new MedlineImporter(),
-            fileName,
-            FILE_ENDING
-        );
+        ImporterTestEngine.testImportEntries(new MedlineImporter(), fileName, FILE_ENDING);
     }
 
     private static Stream<String> malformedFileNames() throws IOException {
@@ -64,9 +53,6 @@ private static Stream<String> malformedFileNames() throws IOException {
     @ParameterizedTest
     @MethodSource("malformedFileNames")
     public void testImportMalfomedFiles(String fileName) throws IOException {
-        ImporterTestEngine.testImportMalformedFiles(
-            new MedlineImporter(),
-            fileName
-        );
+        ImporterTestEngine.testImportMalformedFiles(new MedlineImporter(), fileName);
     }
 }
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 7cf445f442f..65b29b331be 100644
--- a/src/test/java/org/jabref/logic/importer/fileformat/MedlineImporterTest.java
+++ b/src/test/java/org/jabref/logic/importer/fileformat/MedlineImporterTest.java
@@ -42,9 +42,6 @@ public void testsGetExtensions() {
 
     @Test
     public void testGetDescription() {
-        assertEquals(
-            "Importer for the Medline format.",
-            importer.getDescription()
-        );
+        assertEquals("Importer for the Medline format.", importer.getDescription());
     }
 }
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 61547cfb4e1..7d20918c4b9 100644
--- a/src/test/java/org/jabref/logic/importer/fileformat/MedlinePlainImporterTest.java
+++ b/src/test/java/org/jabref/logic/importer/fileformat/MedlinePlainImporterTest.java
@@ -36,8 +36,7 @@ class MedlinePlainImporterTest {
 
     private static Stream<String> fileNames() throws IOException {
         Predicate<String> fileName = name ->
-            name.startsWith("MedlinePlainImporterTest") &&
-            name.endsWith(FILE_ENDING);
+            name.startsWith("MedlinePlainImporterTest") && name.endsWith(FILE_ENDING);
         return ImporterTestEngine.getTestFiles(fileName).stream();
     }
 
@@ -57,10 +56,7 @@ void testsGetExtensions() {
 
     @Test
     void testGetDescription() {
-        assertEquals(
-            "Importer for the MedlinePlain format.",
-            importer.getDescription()
-        );
+        assertEquals("Importer for the MedlinePlain format.", importer.getDescription());
     }
 
     @ParameterizedTest
@@ -75,19 +71,13 @@ void doesNotRecognizeEmptyFiles() throws IOException {
     }
 
     @Test
-    void testImportMultipleEntriesInSingleFile()
-        throws IOException, URISyntaxException {
+    void testImportMultipleEntriesInSingleFile() throws IOException, URISyntaxException {
         Path inputFile = Path.of(
-            MedlinePlainImporter.class.getResource(
-                    "MedlinePlainImporterTestMultipleEntries.txt"
-                )
+            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.get(0);
 
         assertEquals(7, entries.size());
@@ -106,14 +96,8 @@ void testImportMultipleEntriesInSingleFile()
 
         testEntry = entries.get(1);
         assertEquals(StandardEntryType.Conference, testEntry.getType());
-        assertEquals(
-            Optional.of("06"),
-            testEntry.getField(StandardField.MONTH)
-        );
-        assertEquals(
-            Optional.empty(),
-            testEntry.getField(StandardField.AUTHOR)
-        );
+        assertEquals(Optional.of("06"), testEntry.getField(StandardField.MONTH));
+        assertEquals(Optional.empty(), testEntry.getField(StandardField.AUTHOR));
         assertEquals(Optional.empty(), testEntry.getField(StandardField.TITLE));
 
         testEntry = entries.get(2);
@@ -157,8 +141,7 @@ void testEmptyFileImport() throws IOException {
     }
 
     @Test
-    void testImportSingleEntriesInSingleFiles()
-        throws IOException, URISyntaxException {
+    void testImportSingleEntriesInSingleFiles() throws IOException, URISyntaxException {
         List<String> testFiles = Arrays.asList(
             "MedlinePlainImporterTestCompleteEntry",
             "MedlinePlainImporterTestMultiAbstract",
@@ -174,23 +157,12 @@ void testImportSingleEntriesInSingleFiles()
         }
     }
 
-    private void assertImportOfMedlineFileEqualsBibtexFile(
-        String medlineFile,
-        String bibtexFile
-    ) throws IOException, URISyntaxException {
-        Path file = Path.of(
-            MedlinePlainImporter.class.getResource(medlineFile).toURI()
-        );
+    private void assertImportOfMedlineFileEqualsBibtexFile(String medlineFile, String bibtexFile)
+        throws IOException, URISyntaxException {
+        Path file = Path.of(MedlinePlainImporter.class.getResource(medlineFile).toURI());
 
-        try (
-            InputStream nis = MedlinePlainImporter.class.getResourceAsStream(
-                    bibtexFile
-                )
-        ) {
-            List<BibEntry> entries = importer
-                .importDatabase(file)
-                .getDatabase()
-                .getEntries();
+        try (InputStream nis = MedlinePlainImporter.class.getResourceAsStream(bibtexFile)) {
+            List<BibEntry> entries = importer.importDatabase(file).getDatabase().getEntries();
             assertNotNull(entries);
             assertEquals(1, entries.size());
             BibEntryAssert.assertEquals(nis, entries.get(0));
@@ -276,10 +248,7 @@ void testMultiLineComments() throws IOException {
                 "\n" +
                 "Comment16"
             );
-            assertEquals(
-                Collections.singletonList(expectedEntry),
-                actualEntries
-            );
+            assertEquals(Collections.singletonList(expectedEntry), actualEntries);
         }
     }
 
@@ -298,45 +267,29 @@ void testKeyWords() throws IOException {
             BibEntry expectedEntry = new BibEntry();
             expectedEntry.setField(StandardField.KEYWORDS, "Female, Male");
 
-            assertEquals(
-                Collections.singletonList(expectedEntry),
-                actualEntries
-            );
+            assertEquals(Collections.singletonList(expectedEntry), actualEntries);
         }
     }
 
     @Test
     void testWithNbibFile() throws IOException, URISyntaxException {
         Path file = Path.of(
-            MedlinePlainImporter.class.getResource("NbibImporterTest.nbib")
-                .toURI()
+            MedlinePlainImporter.class.getResource("NbibImporterTest.nbib").toURI()
         );
 
-        List<BibEntry> entries = importer
-            .importDatabase(file)
-            .getDatabase()
-            .getEntries();
+        List<BibEntry> entries = importer.importDatabase(file).getDatabase().getEntries();
 
-        BibEntryAssert.assertEquals(
-            MedlinePlainImporter.class,
-            "NbibImporterTest.bib",
-            entries
-        );
+        BibEntryAssert.assertEquals(MedlinePlainImporter.class, "NbibImporterTest.bib", entries);
     }
 
     @Test
     void testWithMultipleEntries() throws IOException, URISyntaxException {
         Path file = Path.of(
-            MedlinePlainImporter.class.getResource(
-                    "MedlinePlainImporterStringOutOfBounds.txt"
-                )
+            MedlinePlainImporter.class.getResource("MedlinePlainImporterStringOutOfBounds.txt")
                 .toURI()
         );
 
-        List<BibEntry> entries = importer
-            .importDatabase(file)
-            .getDatabase()
-            .getEntries();
+        List<BibEntry> entries = importer.importDatabase(file).getDatabase().getEntries();
 
         BibEntryAssert.assertEquals(
             MedlinePlainImporter.class,
@@ -348,16 +301,11 @@ void testWithMultipleEntries() throws IOException, URISyntaxException {
     @Test
     void testInvalidFormat() throws URISyntaxException, IOException {
         Path file = Path.of(
-            MedlinePlainImporter.class.getResource(
-                    "MedlinePlainImporterTestInvalidFormat.xml"
-                )
+            MedlinePlainImporter.class.getResource("MedlinePlainImporterTestInvalidFormat.xml")
                 .toURI()
         );
 
-        List<BibEntry> entries = importer
-            .importDatabase(file)
-            .getDatabase()
-            .getEntries();
+        List<BibEntry> entries = importer.importDatabase(file).getDatabase().getEntries();
 
         assertEquals(Collections.emptyList(), entries);
     }
@@ -399,10 +347,7 @@ void testAllArticleTypes() throws IOException {
             expectedEntry.setType(StandardEntryType.Article);
             expectedEntry.setField(StandardField.KEYWORDS, "Female");
 
-            assertEquals(
-                Collections.singletonList(expectedEntry),
-                actualEntries
-            );
+            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 41e804b78d6..3964ce22ce1 100644
--- a/src/test/java/org/jabref/logic/importer/fileformat/ModsImporterFilesTest.java
+++ b/src/test/java/org/jabref/logic/importer/fileformat/ModsImporterFilesTest.java
@@ -18,19 +18,14 @@ class ModsImporterFilesTest {
     private ImportFormatPreferences importFormatPreferences;
 
     private static Stream<String> fileNames() throws IOException {
-        Predicate<String> fileName = name ->
-            name.startsWith("MODS") && name.endsWith(FILE_ENDING);
+        Predicate<String> fileName = name -> name.startsWith("MODS") && name.endsWith(FILE_ENDING);
         return ImporterTestEngine.getTestFiles(fileName).stream();
     }
 
     @BeforeEach
     void setUp() {
-        importFormatPreferences =
-            mock(ImportFormatPreferences.class, Answers.RETURNS_DEEP_STUBS);
-        when(
-            importFormatPreferences.bibEntryPreferences().getKeywordSeparator()
-        )
-            .thenReturn(',');
+        importFormatPreferences = mock(ImportFormatPreferences.class, Answers.RETURNS_DEEP_STUBS);
+        when(importFormatPreferences.bibEntryPreferences().getKeywordSeparator()).thenReturn(',');
     }
 
     @ParameterizedTest
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 d2a4613aa8d..37431369139 100644
--- a/src/test/java/org/jabref/logic/importer/fileformat/MrDLibImporterTest.java
+++ b/src/test/java/org/jabref/logic/importer/fileformat/MrDLibImporterTest.java
@@ -51,10 +51,7 @@ public void testImportDatabaseIsYearSetCorrectly() throws IOException {
 
         List<BibEntry> resultList = parserResult.getDatabase().getEntries();
 
-        assertEquals(
-            "2006",
-            resultList.get(0).getFieldLatexFree(StandardField.YEAR).get()
-        );
+        assertEquals("2006", resultList.get(0).getFieldLatexFree(StandardField.YEAR).get());
     }
 
     @Test
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 82f21613e8e..d211d70fe6d 100644
--- a/src/test/java/org/jabref/logic/importer/fileformat/MsBibImporterFilesTest.java
+++ b/src/test/java/org/jabref/logic/importer/fileformat/MsBibImporterFilesTest.java
@@ -11,8 +11,7 @@ public 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();
     }
 
@@ -24,28 +23,18 @@ private static Stream<String> invalidFileNames() throws IOException {
     @ParameterizedTest
     @MethodSource("fileNames")
     public void testIsRecognizedFormat(String fileName) throws IOException {
-        ImporterTestEngine.testIsRecognizedFormat(
-            new MsBibImporter(),
-            fileName
-        );
+        ImporterTestEngine.testIsRecognizedFormat(new MsBibImporter(), fileName);
     }
 
     @ParameterizedTest
     @MethodSource("invalidFileNames")
     public void testIsNotRecognizedFormat(String fileName) throws IOException {
-        ImporterTestEngine.testIsNotRecognizedFormat(
-            new MsBibImporter(),
-            fileName
-        );
+        ImporterTestEngine.testIsNotRecognizedFormat(new MsBibImporter(), fileName);
     }
 
     @ParameterizedTest
     @MethodSource("fileNames")
     public void testImportEntries(String fileName) throws Exception {
-        ImporterTestEngine.testImportEntries(
-            new MsBibImporter(),
-            fileName,
-            FILE_ENDING
-        );
+        ImporterTestEngine.testImportEntries(new MsBibImporter(), fileName, FILE_ENDING);
     }
 }
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 d938b6a8e27..fc87ba994e9 100644
--- a/src/test/java/org/jabref/logic/importer/fileformat/MsBibImporterTest.java
+++ b/src/test/java/org/jabref/logic/importer/fileformat/MsBibImporterTest.java
@@ -47,16 +47,10 @@ public final void testIsNotRecognizedFormat() throws Exception {
     }
 
     @Test
-    public final void testImportEntriesEmpty()
-        throws IOException, URISyntaxException {
+    public final void testImportEntriesEmpty() throws IOException, URISyntaxException {
         MsBibImporter testImporter = new MsBibImporter();
-        Path file = Path.of(
-            MsBibImporter.class.getResource("EmptyMsBib_Test.xml").toURI()
-        );
-        List<BibEntry> entries = testImporter
-            .importDatabase(file)
-            .getDatabase()
-            .getEntries();
+        Path file = Path.of(MsBibImporter.class.getResource("EmptyMsBib_Test.xml").toURI());
+        List<BibEntry> entries = testImporter.importDatabase(file).getDatabase().getEntries();
         assertEquals(Collections.emptyList(), entries);
     }
 
@@ -64,13 +58,8 @@ public final void testImportEntriesEmpty()
     public final void testImportEntriesNotRecognizedFormat()
         throws IOException, URISyntaxException {
         MsBibImporter testImporter = new MsBibImporter();
-        Path file = Path.of(
-            MsBibImporter.class.getResource("CopacImporterTest1.txt").toURI()
-        );
-        List<BibEntry> entries = testImporter
-            .importDatabase(file)
-            .getDatabase()
-            .getEntries();
+        Path file = Path.of(MsBibImporter.class.getResource("CopacImporterTest1.txt").toURI());
+        List<BibEntry> entries = testImporter.importDatabase(file).getDatabase().getEntries();
         assertEquals(0, entries.size());
     }
 
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 58382a98f2b..f51e8b90100 100644
--- a/src/test/java/org/jabref/logic/importer/fileformat/OvidImporterTest.java
+++ b/src/test/java/org/jabref/logic/importer/fileformat/OvidImporterTest.java
@@ -82,25 +82,15 @@ public void testIsRecognizedFormatRejected(String fileName)
 
     @Test
     public void testImportEmpty() throws IOException, URISyntaxException {
-        Path file = Path.of(
-            OvidImporter.class.getResource("Empty.txt").toURI()
-        );
-        List<BibEntry> entries = importer
-            .importDatabase(file)
-            .getDatabase()
-            .getEntries();
+        Path file = Path.of(OvidImporter.class.getResource("Empty.txt").toURI());
+        List<BibEntry> entries = importer.importDatabase(file).getDatabase().getEntries();
         assertEquals(Collections.emptyList(), entries);
     }
 
     @Test
     public void testImportEntries1() throws IOException, URISyntaxException {
-        Path file = Path.of(
-            OvidImporter.class.getResource("OvidImporterTest1.txt").toURI()
-        );
-        List<BibEntry> entries = importer
-            .importDatabase(file)
-            .getDatabase()
-            .getEntries();
+        Path file = Path.of(OvidImporter.class.getResource("OvidImporterTest1.txt").toURI());
+        List<BibEntry> entries = importer.importDatabase(file).getDatabase().getEntries();
         assertEquals(5, entries.size());
 
         BibEntry entry = entries.get(0);
@@ -109,125 +99,69 @@ public void testImportEntries1() throws IOException, URISyntaxException {
             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"))
-        );
+        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")));
 
         entry = entries.get(1);
         assertEquals(StandardEntryType.InProceedings, entry.getType());
         assertEquals(Optional.of("Max"), entry.getField(StandardField.EDITOR));
-        assertEquals(
-            Optional.of("Max the Editor"),
-            entry.getField(StandardField.TITLE)
-        );
-        assertEquals(
-            Optional.of("Very Long Title"),
-            entry.getField(StandardField.JOURNAL)
-        );
+        assertEquals(Optional.of("Max the Editor"), entry.getField(StandardField.TITLE));
+        assertEquals(Optional.of("Very Long Title"), entry.getField(StandardField.JOURNAL));
         assertEquals(Optional.of("28"), entry.getField(StandardField.VOLUME));
         assertEquals(Optional.of("2"), entry.getField(StandardField.ISSUE));
         assertEquals(Optional.of("2015"), entry.getField(StandardField.YEAR));
-        assertEquals(
-            Optional.of("103--106"),
-            entry.getField(StandardField.PAGES)
-        );
+        assertEquals(Optional.of("103--106"), entry.getField(StandardField.PAGES));
 
         entry = entries.get(2);
         assertEquals(StandardEntryType.InCollection, entry.getType());
         assertEquals(Optional.of("Max"), entry.getField(StandardField.AUTHOR));
         assertEquals(Optional.of("Test"), entry.getField(StandardField.TITLE));
-        assertEquals(
-            Optional.of("Very Long Title"),
-            entry.getField(StandardField.JOURNAL)
-        );
+        assertEquals(Optional.of("Very Long Title"), entry.getField(StandardField.JOURNAL));
         assertEquals(Optional.of("28"), entry.getField(StandardField.VOLUME));
         assertEquals(Optional.of("2"), entry.getField(StandardField.ISSUE));
         assertEquals(Optional.of("April"), entry.getField(StandardField.MONTH));
         assertEquals(Optional.of("2015"), entry.getField(StandardField.YEAR));
-        assertEquals(
-            Optional.of("103--106"),
-            entry.getField(StandardField.PAGES)
-        );
+        assertEquals(Optional.of("103--106"), entry.getField(StandardField.PAGES));
 
         entry = entries.get(3);
         assertEquals(StandardEntryType.Book, entry.getType());
         assertEquals(Optional.of("Max"), entry.getField(StandardField.AUTHOR));
         assertEquals(Optional.of("2015"), entry.getField(StandardField.YEAR));
-        assertEquals(
-            Optional.of("Editor"),
-            entry.getField(StandardField.EDITOR)
-        );
-        assertEquals(
-            Optional.of("Very Long Title"),
-            entry.getField(StandardField.BOOKTITLE)
-        );
-        assertEquals(
-            Optional.of("103--106"),
-            entry.getField(StandardField.PAGES)
-        );
-        assertEquals(
-            Optional.of("Address"),
-            entry.getField(StandardField.ADDRESS)
-        );
-        assertEquals(
-            Optional.of("Publisher"),
-            entry.getField(StandardField.PUBLISHER)
-        );
+        assertEquals(Optional.of("Editor"), entry.getField(StandardField.EDITOR));
+        assertEquals(Optional.of("Very Long Title"), entry.getField(StandardField.BOOKTITLE));
+        assertEquals(Optional.of("103--106"), entry.getField(StandardField.PAGES));
+        assertEquals(Optional.of("Address"), entry.getField(StandardField.ADDRESS));
+        assertEquals(Optional.of("Publisher"), entry.getField(StandardField.PUBLISHER));
 
         entry = entries.get(4);
         assertEquals(StandardEntryType.Article, entry.getType());
         assertEquals(Optional.of("2014"), entry.getField(StandardField.YEAR));
         assertEquals(Optional.of("58"), entry.getField(StandardField.PAGES));
-        assertEquals(
-            Optional.of("Test"),
-            entry.getField(StandardField.ADDRESS)
-        );
+        assertEquals(Optional.of("Test"), entry.getField(StandardField.ADDRESS));
         assertEquals(Optional.empty(), entry.getField(StandardField.TITLE));
-        assertEquals(
-            Optional.of("TestPublisher"),
-            entry.getField(StandardField.PUBLISHER)
-        );
+        assertEquals(Optional.of("TestPublisher"), entry.getField(StandardField.PUBLISHER));
     }
 
     @Test
     public void testImportEntries2() throws IOException, URISyntaxException {
-        Path file = Path.of(
-            OvidImporter.class.getResource("OvidImporterTest2Invalid.txt")
-                .toURI()
-        );
-        List<BibEntry> entries = importer
-            .importDatabase(file)
-            .getDatabase()
-            .getEntries();
+        Path file = Path.of(OvidImporter.class.getResource("OvidImporterTest2Invalid.txt").toURI());
+        List<BibEntry> entries = importer.importDatabase(file).getDatabase().getEntries();
         assertEquals(Collections.emptyList(), entries);
     }
 
     @Test
-    public void testImportSingleEntries()
-        throws IOException, URISyntaxException {
+    public void testImportSingleEntries() throws IOException, URISyntaxException {
         for (int n = 3; n <= 7; n++) {
             Path file = Path.of(
-                OvidImporter.class.getResource("OvidImporterTest" + n + ".txt")
-                    .toURI()
+                OvidImporter.class.getResource("OvidImporterTest" + n + ".txt").toURI()
             );
             try (
                 InputStream nis = OvidImporter.class.getResourceAsStream(
                         "OvidImporterTestBib" + n + ".bib"
                     )
             ) {
-                List<BibEntry> entries = importer
-                    .importDatabase(file)
-                    .getDatabase()
-                    .getEntries();
+                List<BibEntry> entries = importer.importDatabase(file).getDatabase().getEntries();
                 assertNotNull(entries);
                 assertEquals(1, entries.size());
                 BibEntryAssert.assertEquals(nis, entries.get(0));
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 c76ce9f3558..5d49b34098f 100644
--- a/src/test/java/org/jabref/logic/importer/fileformat/PdfContentImporterFilesTest.java
+++ b/src/test/java/org/jabref/logic/importer/fileformat/PdfContentImporterFilesTest.java
@@ -20,20 +20,13 @@ private static Stream<String> fileNames() throws IOException {
     @ParameterizedTest
     @MethodSource("fileNames")
     void testIsRecognizedFormat(String fileName) throws IOException {
-        ImporterTestEngine.testIsRecognizedFormat(
-            new PdfContentImporter(),
-            fileName
-        );
+        ImporterTestEngine.testIsRecognizedFormat(new PdfContentImporter(), fileName);
     }
 
     @ParameterizedTest
     @MethodSource("fileNames")
     @Disabled("bib file does not contain linked file")
     void testImportEntries(String fileName) throws Exception {
-        ImporterTestEngine.testImportEntries(
-            new PdfContentImporter(),
-            fileName,
-            FILE_ENDING
-        );
+        ImporterTestEngine.testImportEntries(new PdfContentImporter(), fileName, FILE_ENDING);
     }
 }
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 415084820ca..40a62fd04ab 100644
--- a/src/test/java/org/jabref/logic/importer/fileformat/PdfContentImporterTest.java
+++ b/src/test/java/org/jabref/logic/importer/fileformat/PdfContentImporterTest.java
@@ -38,33 +38,21 @@ void testGetDescription() {
 
     @Test
     void doesNotHandleEncryptedPdfs() throws Exception {
-        Path file = Path.of(
-            PdfContentImporter.class.getResource("/pdfs/encrypted.pdf").toURI()
-        );
-        List<BibEntry> result = importer
-            .importDatabase(file)
-            .getDatabase()
-            .getEntries();
+        Path file = Path.of(PdfContentImporter.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(
-            PdfContentImporter.class.getResource("/pdfs/minimal.pdf").toURI()
-        );
-        List<BibEntry> result = importer
-            .importDatabase(file)
-            .getDatabase()
-            .getEntries();
+        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);
         expected.setField(StandardField.AUTHOR, "1 ");
         expected.setField(StandardField.TITLE, "Hello World");
         expected.setFiles(
-            Collections.singletonList(
-                new LinkedFile("", file.toAbsolutePath(), "PDF")
-            )
+            Collections.singletonList(new LinkedFile("", file.toAbsolutePath(), "PDF"))
         );
 
         List<BibEntry> resultSecondImport = importer
@@ -78,10 +66,7 @@ void importTwiceWorksAsExpected() throws Exception {
     @Test
     void testParsingEditorWithoutPagesorSeriesInformation() {
         BibEntry entry = new BibEntry(StandardEntryType.InProceedings);
-        entry.setField(
-            StandardField.AUTHOR,
-            "Anke Lüdeling and Merja Kytö (Eds.)"
-        );
+        entry.setField(StandardField.AUTHOR, "Anke Lüdeling and Merja Kytö (Eds.)");
         entry.setField(StandardField.EDITOR, "Anke Lüdeling and Merja Kytö");
         entry.setField(StandardField.PUBLISHER, "Springer");
         entry.setField(
@@ -106,10 +91,7 @@ void testParsingEditorWithoutPagesorSeriesInformation() {
             "vii, 578 pages\n" +
             "Corpus linguistics investigates human language by starting out from large\n";
 
-        assertEquals(
-            Optional.of(entry),
-            importer.getEntryFromPDFContent(firstPageContents, "\n")
-        );
+        assertEquals(Optional.of(entry), importer.getEntryFromPDFContent(firstPageContents, "\n"));
     }
 
     @Test
@@ -138,9 +120,6 @@ void testParsingWithoutActualDOINumber() {
             "UNSPECIFIED\n" +
             "Master of Research (MRes) thesis, University of Kent,.";
 
-        assertEquals(
-            Optional.of(entry),
-            importer.getEntryFromPDFContent(firstPageContents, "\n")
-        );
+        assertEquals(Optional.of(entry), importer.getEntryFromPDFContent(firstPageContents, "\n"));
     }
 }
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 6a2facf234f..64a2e5926f1 100644
--- a/src/test/java/org/jabref/logic/importer/fileformat/PdfEmbeddedBibFileImporterTest.java
+++ b/src/test/java/org/jabref/logic/importer/fileformat/PdfEmbeddedBibFileImporterTest.java
@@ -48,28 +48,18 @@ void testGetDescription() {
     @Test
     void doesNotHandleEncryptedPdfs() throws Exception {
         Path file = Path.of(
-            PdfEmbeddedBibFileImporter.class.getResource("/pdfs/encrypted.pdf")
-                .toURI()
+            PdfEmbeddedBibFileImporter.class.getResource("/pdfs/encrypted.pdf").toURI()
         );
-        List<BibEntry> result = importer
-            .importDatabase(file)
-            .getDatabase()
-            .getEntries();
+        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()
+            PdfEmbeddedBibFileImporterTest.class.getResource("mixedMetadata.pdf").toURI()
         );
-        List<BibEntry> result = importer
-            .importDatabase(file)
-            .getDatabase()
-            .getEntries();
+        List<BibEntry> result = importer.importDatabase(file).getDatabase().getEntries();
 
         BibEntry expected = new BibEntry(StandardEntryType.Misc);
         expected.setCitationKey("jabreftext2021");
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 d238e6455b1..1c1c86080e3 100644
--- a/src/test/java/org/jabref/logic/importer/fileformat/PdfGrobidImporterTest.java
+++ b/src/test/java/org/jabref/logic/importer/fileformat/PdfGrobidImporterTest.java
@@ -33,19 +33,14 @@ public void setUp() {
             Answers.RETURNS_DEEP_STUBS
         );
         when(grobidPreferences.isGrobidEnabled()).thenReturn(true);
-        when(grobidPreferences.getGrobidURL())
-            .thenReturn("http://grobid.jabref.org:8070");
+        when(grobidPreferences.getGrobidURL()).thenReturn("http://grobid.jabref.org:8070");
 
         ImportFormatPreferences importFormatPreferences = mock(
             ImportFormatPreferences.class,
             Answers.RETURNS_DEEP_STUBS
         );
-        when(
-            importFormatPreferences.bibEntryPreferences().getKeywordSeparator()
-        )
-            .thenReturn(',');
-        when(importFormatPreferences.grobidPreferences())
-            .thenReturn(grobidPreferences);
+        when(importFormatPreferences.bibEntryPreferences().getKeywordSeparator()).thenReturn(',');
+        when(importFormatPreferences.grobidPreferences()).thenReturn(grobidPreferences);
 
         importer = new PdfGrobidImporter(importFormatPreferences);
     }
@@ -57,44 +52,26 @@ public void testsGetExtensions() {
 
     @Test
     public void testImportEntries() throws URISyntaxException {
-        Path file = Path.of(
-            PdfGrobidImporterTest.class.getResource("LNCS-minimal.pdf").toURI()
-        );
-        List<BibEntry> bibEntries = importer
-            .importDatabase(file)
-            .getDatabase()
-            .getEntries();
+        Path file = Path.of(PdfGrobidImporterTest.class.getResource("LNCS-minimal.pdf").toURI());
+        List<BibEntry> bibEntries = importer.importDatabase(file).getDatabase().getEntries();
 
         assertEquals(1, bibEntries.size());
 
         BibEntry be0 = bibEntries.get(0);
-        assertEquals(
-            Optional.of("Lastname, Firstname"),
-            be0.getField(StandardField.AUTHOR)
-        );
-        assertEquals(
-            Optional.of("Paper Title"),
-            be0.getField(StandardField.TITLE)
-        );
+        assertEquals(Optional.of("Lastname, Firstname"), be0.getField(StandardField.AUTHOR));
+        assertEquals(Optional.of("Paper Title"), be0.getField(StandardField.TITLE));
     }
 
     @Test
-    public void testIsRecognizedFormat()
-        throws IOException, URISyntaxException {
-        Path file = Path.of(
-            PdfGrobidImporterTest.class.getResource("annotated.pdf").toURI()
-        );
+    public void testIsRecognizedFormat() throws IOException, URISyntaxException {
+        Path file = Path.of(PdfGrobidImporterTest.class.getResource("annotated.pdf").toURI());
         assertTrue(importer.isRecognizedFormat(file));
     }
 
     @Test
-    public void testIsRecognizedFormatReject()
-        throws IOException, URISyntaxException {
+    public void testIsRecognizedFormatReject() throws IOException, URISyntaxException {
         Path file = Path.of(
-            PdfGrobidImporterTest.class.getResource(
-                    "BibtexImporter.examples.bib"
-                )
-                .toURI()
+            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 4255b132bf6..d7f7b16490a 100644
--- a/src/test/java/org/jabref/logic/importer/fileformat/PdfMergeMetadataImporterTest.java
+++ b/src/test/java/org/jabref/logic/importer/fileformat/PdfMergeMetadataImporterTest.java
@@ -34,8 +34,7 @@ void setUp() {
             Answers.RETURNS_DEEP_STUBS
         );
         when(grobidPreferences.isGrobidEnabled()).thenReturn(true);
-        when(grobidPreferences.getGrobidURL())
-            .thenReturn("http://grobid.jabref.org:8070");
+        when(grobidPreferences.getGrobidURL()).thenReturn("http://grobid.jabref.org:8070");
 
         ImportFormatPreferences importFormatPreferences = mock(
             ImportFormatPreferences.class,
@@ -43,8 +42,7 @@ void setUp() {
         );
         when(importFormatPreferences.fieldPreferences().getNonWrappableFields())
             .thenReturn(FXCollections.emptyObservableList());
-        when(importFormatPreferences.grobidPreferences())
-            .thenReturn(grobidPreferences);
+        when(importFormatPreferences.grobidPreferences()).thenReturn(grobidPreferences);
 
         importer = new PdfMergeMetadataImporter(importFormatPreferences);
     }
@@ -65,13 +63,9 @@ void testGetDescription() {
     @Test
     void doesNotHandleEncryptedPdfs() throws Exception {
         Path file = Path.of(
-            PdfMergeMetadataImporter.class.getResource("/pdfs/encrypted.pdf")
-                .toURI()
+            PdfMergeMetadataImporter.class.getResource("/pdfs/encrypted.pdf").toURI()
         );
-        List<BibEntry> result = importer
-            .importDatabase(file)
-            .getDatabase()
-            .getEntries();
+        List<BibEntry> result = importer.importDatabase(file).getDatabase().getEntries();
         assertEquals(Collections.emptyList(), result);
     }
 
@@ -79,13 +73,9 @@ void doesNotHandleEncryptedPdfs() throws Exception {
     @Disabled("Switch from ottobib to OpenLibraryFetcher changed the results")
     void importWorksAsExpected() throws Exception {
         Path file = Path.of(
-            PdfMergeMetadataImporterTest.class.getResource("mixedMetadata.pdf")
-                .toURI()
+            PdfMergeMetadataImporterTest.class.getResource("mixedMetadata.pdf").toURI()
         );
-        List<BibEntry> result = importer
-            .importDatabase(file)
-            .getDatabase()
-            .getEntries();
+        List<BibEntry> result = importer.importDatabase(file).getDatabase().getEntries();
 
         // From DOI (contained in embedded bib file)
         BibEntry expected = new BibEntry(StandardEntryType.Book);
@@ -115,13 +105,7 @@ void importWorksAsExpected() throws Exception {
 
         // From merge
         expected.setFiles(
-            List.of(
-                new LinkedFile(
-                    "",
-                    file.toAbsolutePath(),
-                    StandardFileType.PDF.getName()
-                )
-            )
+            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 540dfaeef88..93e4101a312 100644
--- a/src/test/java/org/jabref/logic/importer/fileformat/PdfVerbatimBibTextImporterTest.java
+++ b/src/test/java/org/jabref/logic/importer/fileformat/PdfVerbatimBibTextImporterTest.java
@@ -49,28 +49,18 @@ void testGetDescription() {
     @Test
     void doesNotHandleEncryptedPdfs() throws Exception {
         Path file = Path.of(
-            PdfVerbatimBibTextImporter.class.getResource("/pdfs/encrypted.pdf")
-                .toURI()
+            PdfVerbatimBibTextImporter.class.getResource("/pdfs/encrypted.pdf").toURI()
         );
-        List<BibEntry> result = importer
-            .importDatabase(file)
-            .getDatabase()
-            .getEntries();
+        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()
+            PdfVerbatimBibTextImporterTest.class.getResource("mixedMetadata.pdf").toURI()
         );
-        List<BibEntry> result = importer
-            .importDatabase(file)
-            .getDatabase()
-            .getEntries();
+        List<BibEntry> result = importer.importDatabase(file).getDatabase().getEntries();
 
         BibEntry expected = new BibEntry(StandardEntryType.Article);
         expected.setCitationKey("jabreftest2021");
@@ -81,9 +71,7 @@ void importTwiceWorksAsExpected() throws Exception {
         expected.setField(StandardField.YEAR, "2021");
         expected.setField(StandardField.ISBN, "0134685997");
         expected.setFiles(
-            Collections.singletonList(
-                new LinkedFile("", file.toAbsolutePath(), "PDF")
-            )
+            Collections.singletonList(new LinkedFile("", file.toAbsolutePath(), "PDF"))
         );
 
         List<BibEntry> resultSecondImport = importer
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 286912256ae..066857cca22 100644
--- a/src/test/java/org/jabref/logic/importer/fileformat/PdfXmpImporterTest.java
+++ b/src/test/java/org/jabref/logic/importer/fileformat/PdfXmpImporterTest.java
@@ -54,52 +54,31 @@ public void testGetDescription() {
         );
     }
 
-    @Disabled(
-        "XMP reader prints warnings to the logger when parsing does not work"
-    )
+    @Disabled("XMP reader prints warnings to the logger when parsing does not work")
     @Test
     public void importEncryptedFileReturnsError() throws URISyntaxException {
-        Path file = Path.of(
-            PdfXmpImporterTest.class.getResource("/pdfs/encrypted.pdf").toURI()
-        );
+        Path file = Path.of(PdfXmpImporterTest.class.getResource("/pdfs/encrypted.pdf").toURI());
         ParserResult result = importer.importDatabase(file);
         assertTrue(result.hasWarnings());
     }
 
     @Test
     public void testImportEntries() throws URISyntaxException {
-        Path file = Path.of(
-            PdfXmpImporterTest.class.getResource("annotated.pdf").toURI()
-        );
-        List<BibEntry> bibEntries = importer
-            .importDatabase(file)
-            .getDatabase()
-            .getEntries();
+        Path file = Path.of(PdfXmpImporterTest.class.getResource("annotated.pdf").toURI());
+        List<BibEntry> bibEntries = importer.importDatabase(file).getDatabase().getEntries();
 
         assertEquals(1, bibEntries.size());
 
         BibEntry be0 = bibEntries.get(0);
-        assertEquals(
-            Optional.of("how to annotate a pdf"),
-            be0.getField(StandardField.ABSTRACT)
-        );
+        assertEquals(Optional.of("how to annotate a pdf"), be0.getField(StandardField.ABSTRACT));
         assertEquals(Optional.of("Chris"), be0.getField(StandardField.AUTHOR));
-        assertEquals(
-            Optional.of("pdf, annotation"),
-            be0.getField(StandardField.KEYWORDS)
-        );
-        assertEquals(
-            Optional.of("The best Pdf ever"),
-            be0.getField(StandardField.TITLE)
-        );
+        assertEquals(Optional.of("pdf, annotation"), be0.getField(StandardField.KEYWORDS));
+        assertEquals(Optional.of("The best Pdf ever"), be0.getField(StandardField.TITLE));
     }
 
     @Test
-    public void testIsRecognizedFormat()
-        throws IOException, URISyntaxException {
-        Path file = Path.of(
-            PdfXmpImporterTest.class.getResource("annotated.pdf").toURI()
-        );
+    public void testIsRecognizedFormat() throws IOException, URISyntaxException {
+        Path file = Path.of(PdfXmpImporterTest.class.getResource("annotated.pdf").toURI());
         assertTrue(importer.isRecognizedFormat(file));
     }
 
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 80dbbabb524..60644f04371 100644
--- a/src/test/java/org/jabref/logic/importer/fileformat/RISImporterFilesTest.java
+++ b/src/test/java/org/jabref/logic/importer/fileformat/RISImporterFilesTest.java
@@ -25,10 +25,6 @@ void testIsRecognizedFormat(String fileName) throws IOException {
     @ParameterizedTest
     @MethodSource("fileNames")
     void testImportEntries(String fileName) throws Exception {
-        ImporterTestEngine.testImportEntries(
-            new RisImporter(),
-            fileName,
-            FILE_ENDING
-        );
+        ImporterTestEngine.testImportEntries(new RisImporter(), fileName, FILE_ENDING);
     }
 }
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 08a08f9c77d..71c1d9b4388 100644
--- a/src/test/java/org/jabref/logic/importer/fileformat/RISImporterTest.java
+++ b/src/test/java/org/jabref/logic/importer/fileformat/RISImporterTest.java
@@ -36,19 +36,12 @@ public void testsGetExtensions() {
 
     @Test
     public void testGetDescription() {
-        assertEquals(
-            "Imports a Biblioscape Tag File.",
-            importer.getDescription()
-        );
+        assertEquals("Imports a Biblioscape Tag File.", importer.getDescription());
     }
 
     @Test
-    public void testIfNotRecognizedFormat()
-        throws IOException, URISyntaxException {
-        Path file = Path.of(
-            RISImporterTest.class.getResource("RisImporterCorrupted.ris")
-                .toURI()
-        );
+    public void testIfNotRecognizedFormat() throws IOException, URISyntaxException {
+        Path file = Path.of(RISImporterTest.class.getResource("RisImporterCorrupted.ris").toURI());
         assertFalse(importer.isRecognizedFormat(file));
     }
 }
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 8f07a39d2e5..e9f8868c75b 100644
--- a/src/test/java/org/jabref/logic/importer/fileformat/RepecNepImporterTest.java
+++ b/src/test/java/org/jabref/logic/importer/fileformat/RepecNepImporterTest.java
@@ -27,10 +27,7 @@ public void setUp() {
             ImportFormatPreferences.class,
             Answers.RETURNS_DEEP_STUBS
         );
-        when(
-            importFormatPreferences.bibEntryPreferences().getKeywordSeparator()
-        )
-            .thenReturn(',');
+        when(importFormatPreferences.bibEntryPreferences().getKeywordSeparator()).thenReturn(',');
 
         testImporter = new RepecNepImporter(importFormatPreferences);
     }
@@ -61,11 +58,7 @@ public void testIsNotRecognizedFormat(String fileName) throws IOException {
     @ParameterizedTest
     @MethodSource("fileNames")
     public void testImportEntries(String fileName) throws Exception {
-        ImporterTestEngine.testImportEntries(
-            testImporter,
-            fileName,
-            FILE_ENDING
-        );
+        ImporterTestEngine.testImportEntries(testImporter, fileName, FILE_ENDING);
     }
 
     @Test
diff --git a/src/test/java/org/jabref/logic/importer/fileformat/SilverPlatterImporterTest.java b/src/test/java/org/jabref/logic/importer/fileformat/SilverPlatterImporterTest.java
index 052fa378b2e..0cf78755d94 100644
--- a/src/test/java/org/jabref/logic/importer/fileformat/SilverPlatterImporterTest.java
+++ b/src/test/java/org/jabref/logic/importer/fileformat/SilverPlatterImporterTest.java
@@ -25,14 +25,12 @@ void setUp() throws Exception {
 
     private static Stream<String> fileNames() throws IOException {
         Predicate<String> fileName = name ->
-            name.startsWith("SilverPlatterImporterTest") &&
-            name.endsWith(FILE_ENDING);
+            name.startsWith("SilverPlatterImporterTest") && name.endsWith(FILE_ENDING);
         return ImporterTestEngine.getTestFiles(fileName).stream();
     }
 
     private static Stream<String> invalidFileNames() throws IOException {
-        Predicate<String> fileName = name ->
-            !name.startsWith("SilverPlatterImporterTest");
+        Predicate<String> fileName = name -> !name.startsWith("SilverPlatterImporterTest");
         return ImporterTestEngine.getTestFiles(fileName).stream();
     }
 
@@ -51,26 +49,16 @@ void testIsNotRecognizedFormat(String fileName) throws IOException {
     @ParameterizedTest
     @MethodSource("fileNames")
     void testImportEntries(String fileName) throws Exception {
-        ImporterTestEngine.testImportEntries(
-            testImporter,
-            fileName,
-            FILE_ENDING
-        );
+        ImporterTestEngine.testImportEntries(testImporter, fileName, FILE_ENDING);
     }
 
     @Test
     void testsGetExtensions() {
-        assertEquals(
-            StandardFileType.SILVER_PLATTER,
-            testImporter.getFileType()
-        );
+        assertEquals(StandardFileType.SILVER_PLATTER, testImporter.getFileType());
     }
 
     @Test
     void testGetDescription() {
-        assertEquals(
-            "Imports a SilverPlatter exported file.",
-            testImporter.getDescription()
-        );
+        assertEquals("Imports a SilverPlatter exported file.", testImporter.getDescription());
     }
 }
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 6a610ae41e9..f76c9ad27e0 100644
--- a/src/test/java/org/jabref/logic/importer/util/FileFieldParserTest.java
+++ b/src/test/java/org/jabref/logic/importer/util/FileFieldParserTest.java
@@ -59,9 +59,7 @@ private static Stream<Arguments> stringsToParseTest() throws Exception {
             Arguments.of(Collections.emptyList(), ""),
             // correct input
             Arguments.of(
-                Collections.singletonList(
-                    new LinkedFile("Desc", Path.of("File.PDF"), "PDF")
-                ),
+                Collections.singletonList(new LinkedFile("Desc", Path.of("File.PDF"), "PDF")),
                 "Desc:File.PDF:PDF"
             ),
             // Mendeley input
@@ -80,21 +78,14 @@ private static Stream<Arguments> stringsToParseTest() throws Exception {
             // parseCorrectOnlineInput
             Arguments.of(
                 Collections.singletonList(
-                    new LinkedFile(
-                        new URL("http://arxiv.org/pdf/2010.08497v1"),
-                        "PDF"
-                    )
+                    new LinkedFile(new URL("http://arxiv.org/pdf/2010.08497v1"), "PDF")
                 ),
                 ":http\\://arxiv.org/pdf/2010.08497v1:PDF"
             ),
             // parseFaultyOnlineInput
             Arguments.of(
                 Collections.singletonList(
-                    new LinkedFile(
-                        "",
-                        "htt://arxiv.org/pdf/2010.08497v1",
-                        "PDF"
-                    )
+                    new LinkedFile("", "htt://arxiv.org/pdf/2010.08497v1", "PDF")
                 ),
                 ":htt\\://arxiv.org/pdf/2010.08497v1:PDF"
             ),
@@ -111,16 +102,12 @@ private static Stream<Arguments> stringsToParseTest() throws Exception {
             ),
             // ignoreMissingDescription
             Arguments.of(
-                Collections.singletonList(
-                    new LinkedFile("", Path.of("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"), "")
-                ),
+                Collections.singletonList(new LinkedFile("", Path.of("wei2005ahp.pdf"), "")),
                 "wei2005ahp.pdf"
             ),
             // interpretLinkAsOnlyMandatoryField: multiple
@@ -141,26 +128,18 @@ private static Stream<Arguments> stringsToParseTest() throws Exception {
             // handleXmlCharacters
             Arguments.of(
                 Collections.singletonList(
-                    new LinkedFile(
-                        "test&#44;st:;",
-                        Path.of("wei2005ahp.pdf"),
-                        "PDF"
-                    )
+                    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")
-                ),
+                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")
-                ),
+                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
@@ -176,30 +155,22 @@ private static Stream<Arguments> stringsToParseTest() throws Exception {
             ),
             // subsetOfFieldsResultsInFileLink: description only
             Arguments.of(
-                Collections.singletonList(
-                    new LinkedFile("", Path.of("file.pdf"), "")
-                ),
+                Collections.singletonList(new LinkedFile("", Path.of("file.pdf"), "")),
                 "file.pdf::"
             ),
             // subsetOfFieldsResultsInFileLink: file only
             Arguments.of(
-                Collections.singletonList(
-                    new LinkedFile("", Path.of("file.pdf"), "")
-                ),
+                Collections.singletonList(new LinkedFile("", Path.of("file.pdf"), "")),
                 ":file.pdf"
             ),
             // subsetOfFieldsResultsInFileLink: type only
             Arguments.of(
-                Collections.singletonList(
-                    new LinkedFile("", Path.of("file.pdf"), "")
-                ),
+                Collections.singletonList(new LinkedFile("", Path.of("file.pdf"), "")),
                 "::file.pdf"
             ),
             // tooManySeparators
             Arguments.of(
-                Collections.singletonList(
-                    new LinkedFile("desc", Path.of("file.pdf"), "PDF")
-                ),
+                Collections.singletonList(new LinkedFile("desc", Path.of("file.pdf"), "PDF")),
                 "desc:file.pdf:PDF:asdf"
             ),
             // www inside filename
@@ -211,37 +182,25 @@ private static Stream<Arguments> stringsToParseTest() throws Exception {
             ),
             // url
             Arguments.of(
-                Collections.singletonList(
-                    new LinkedFile(new URL("https://books.google.de/"), "")
-                ),
+                Collections.singletonList(new LinkedFile(new URL("https://books.google.de/"), "")),
                 "https://books.google.de/"
             ),
             // url with www
             Arguments.of(
-                Collections.singletonList(
-                    new LinkedFile(new URL("https://www.google.de/"), "")
-                ),
+                Collections.singletonList(new LinkedFile(new URL("https://www.google.de/"), "")),
                 "https://www.google.de/"
             ),
             // url as file
             Arguments.of(
                 Collections.singletonList(
-                    new LinkedFile(
-                        "",
-                        new URL("http://ceur-ws.org/Vol-438"),
-                        "URL"
-                    )
+                    new LinkedFile("", new URL("http://ceur-ws.org/Vol-438"), "URL")
                 ),
                 ":http\\://ceur-ws.org/Vol-438:URL"
             ),
             // url as file with desc
             Arguments.of(
                 Collections.singletonList(
-                    new LinkedFile(
-                        "desc",
-                        new URL("http://ceur-ws.org/Vol-438"),
-                        "URL"
-                    )
+                    new LinkedFile("desc", new URL("http://ceur-ws.org/Vol-438"), "URL")
                 ),
                 "desc:http\\://ceur-ws.org/Vol-438:URL"
             )
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 a23dc088b4a..e40f37f56aa 100644
--- a/src/test/java/org/jabref/logic/importer/util/GrobidServiceTest.java
+++ b/src/test/java/org/jabref/logic/importer/util/GrobidServiceTest.java
@@ -32,12 +32,8 @@ public class GrobidServiceTest {
 
     @BeforeAll
     public static void setup() {
-        importFormatPreferences =
-            mock(ImportFormatPreferences.class, Answers.RETURNS_DEEP_STUBS);
-        when(
-            importFormatPreferences.bibEntryPreferences().getKeywordSeparator()
-        )
-            .thenReturn(',');
+        importFormatPreferences = mock(ImportFormatPreferences.class, Answers.RETURNS_DEEP_STUBS);
+        when(importFormatPreferences.bibEntryPreferences().getKeywordSeparator()).thenReturn(',');
 
         GrobidPreferences grobidPreferences = new GrobidPreferences(
             true,
@@ -108,12 +104,11 @@ public void processInvalidCitationTest() {
 
     @Test
     public void failsWhenGrobidDisabled() {
-        GrobidPreferences importSettingsWithGrobidDisabled =
-            new GrobidPreferences(
-                false,
-                false,
-                "http://grobid.jabref.org:8070"
-            );
+        GrobidPreferences importSettingsWithGrobidDisabled = new GrobidPreferences(
+            false,
+            false,
+            "http://grobid.jabref.org:8070"
+        );
         assertThrows(
             UnsupportedOperationException.class,
             () -> new GrobidService(importSettingsWithGrobidDisabled)
@@ -121,21 +116,12 @@ public void failsWhenGrobidDisabled() {
     }
 
     @Test
-    public void processPdfTest()
-        throws IOException, ParseException, URISyntaxException {
-        Path file = Path.of(
-            PdfGrobidImporterTest.class.getResource("LNCS-minimal.pdf").toURI()
-        );
-        List<BibEntry> response = grobidService.processPDF(
-            file,
-            importFormatPreferences
-        );
+    public void processPdfTest() throws IOException, ParseException, URISyntaxException {
+        Path file = Path.of(PdfGrobidImporterTest.class.getResource("LNCS-minimal.pdf").toURI());
+        List<BibEntry> response = grobidService.processPDF(file, importFormatPreferences);
         assertEquals(1, response.size());
         BibEntry be0 = response.get(0);
-        assertEquals(
-            Optional.of("Lastname, Firstname"),
-            be0.getField(StandardField.AUTHOR)
-        );
+        assertEquals(Optional.of("Lastname, Firstname"), be0.getField(StandardField.AUTHOR));
         // assertEquals(Optional.of("Paper Title"), be0.getField(StandardField.TITLE));
         // assertEquals(Optional.of("2014-10-05"), be0.getField(StandardField.DATE));
     }
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 128f82d01d3..7cccb8b93a3 100644
--- a/src/test/java/org/jabref/logic/importer/util/GroupsParserTest.java
+++ b/src/test/java/org/jabref/logic/importer/util/GroupsParserTest.java
@@ -41,8 +41,7 @@ void setUp() throws Exception {
 
     @Test
     // For https://github.com/JabRef/jabref/issues/1681
-    void fromStringParsesExplicitGroupWithEscapedCharacterInName()
-        throws Exception {
+    void fromStringParsesExplicitGroupWithEscapedCharacterInName() throws Exception {
         ExplicitGroup expected = new ExplicitGroup(
             "B{\\\"{o}}hmer",
             GroupHierarchyType.INDEPENDENT,
@@ -95,8 +94,7 @@ void hierarchicalDelimiterThatNeedsToBeEscaped() throws Exception {
     }
 
     @Test
-    void fromStringThrowsParseExceptionForNotEscapedGroupName()
-        throws Exception {
+    void fromStringThrowsParseExceptionForNotEscapedGroupName() throws Exception {
         assertThrows(
             ParseException.class,
             () ->
@@ -124,32 +122,16 @@ void testImportSubGroups() throws Exception {
         //  Level 1 Name: 3
 
         GroupTreeNode rootNode = new GroupTreeNode(
-            new ExplicitGroup(
-                "All entries",
-                GroupHierarchyType.INDEPENDENT,
-                ','
-            )
+            new ExplicitGroup("All entries", GroupHierarchyType.INDEPENDENT, ',')
         );
 
-        AbstractGroup firstSubGrpLvl1 = new ExplicitGroup(
-            "1",
-            GroupHierarchyType.INDEPENDENT,
-            ','
-        );
+        AbstractGroup firstSubGrpLvl1 = new ExplicitGroup("1", GroupHierarchyType.INDEPENDENT, ',');
         rootNode.addSubgroup(firstSubGrpLvl1);
 
-        AbstractGroup subLvl2 = new ExplicitGroup(
-            "2",
-            GroupHierarchyType.INDEPENDENT,
-            ','
-        );
+        AbstractGroup subLvl2 = new ExplicitGroup("2", GroupHierarchyType.INDEPENDENT, ',');
         rootNode.getFirstChild().ifPresent(c -> c.addSubgroup(subLvl2));
 
-        AbstractGroup thirdSubGrpLvl1 = new ExplicitGroup(
-            "3",
-            GroupHierarchyType.INDEPENDENT,
-            ','
-        );
+        AbstractGroup thirdSubGrpLvl1 = new ExplicitGroup("3", GroupHierarchyType.INDEPENDENT, ',');
         rootNode.addSubgroup(thirdSubGrpLvl1);
 
         GroupTreeNode parsedNode = GroupsParser.importGroups(
@@ -162,8 +144,7 @@ void testImportSubGroups() throws Exception {
     }
 
     @Test
-    void fromStringParsesExplicitGroupWithIconAndDescription()
-        throws Exception {
+    void fromStringParsesExplicitGroupWithIconAndDescription() throws Exception {
         ExplicitGroup expected = new ExplicitGroup(
             "myExplicitGroup",
             GroupHierarchyType.INDEPENDENT,
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 1fb536dd76b..85ae7a7b391 100644
--- a/src/test/java/org/jabref/logic/importer/util/JsonReaderTest.java
+++ b/src/test/java/org/jabref/logic/importer/util/JsonReaderTest.java
@@ -25,18 +25,14 @@ void invalidJsonThrowsParserException() {
         Assertions.assertThrows(
             ParseException.class,
             () -> {
-                JsonReader.toJsonObject(
-                    new ByteArrayInputStream("invalid JSON".getBytes())
-                );
+                JsonReader.toJsonObject(new ByteArrayInputStream("invalid JSON".getBytes()));
             }
         );
     }
 
     @Test
     void emptyStringResultsInEmptyObject() throws Exception {
-        JSONObject result = JsonReader.toJsonObject(
-            new ByteArrayInputStream("".getBytes())
-        );
+        JSONObject result = JsonReader.toJsonObject(new ByteArrayInputStream("".getBytes()));
         assertEquals("{}", result.toString());
     }
 
@@ -46,9 +42,7 @@ void arrayThrowsParserException() {
         Assertions.assertThrows(
             ParseException.class,
             () -> {
-                JsonReader.toJsonObject(
-                    new ByteArrayInputStream("[]".getBytes())
-                );
+                JsonReader.toJsonObject(new ByteArrayInputStream("[]".getBytes()));
             }
         );
     }
@@ -56,9 +50,7 @@ void arrayThrowsParserException() {
     @Test
     void exampleJsonResultsInSameJson() throws Exception {
         String input = "{\"name\":\"test\"}";
-        JSONObject result = JsonReader.toJsonObject(
-            new ByteArrayInputStream(input.getBytes())
-        );
+        JSONObject result = JsonReader.toJsonObject(new ByteArrayInputStream(input.getBytes()));
         assertEquals(input, result.toString());
     }
 }
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 3ade8302a07..ec4e2701e90 100644
--- a/src/test/java/org/jabref/logic/importer/util/MathMLParserTest.java
+++ b/src/test/java/org/jabref/logic/importer/util/MathMLParserTest.java
@@ -24,11 +24,8 @@ public static void setUp() {
 
     @ParameterizedTest
     @MethodSource("tests")
-    void parserConvertsMathMLIntoLatex(String expected, String input)
-        throws XMLStreamException {
-        XMLStreamReader reader = xmlInputFactory.createXMLStreamReader(
-            new StringReader(input)
-        );
+    void parserConvertsMathMLIntoLatex(String expected, String input) throws XMLStreamException {
+        XMLStreamReader reader = xmlInputFactory.createXMLStreamReader(new StringReader(input));
         assertEquals(expected, MathMLParser.parse(reader));
     }
 
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 f311072c214..fd6d9778493 100644
--- a/src/test/java/org/jabref/logic/importer/util/MetaDataParserTest.java
+++ b/src/test/java/org/jabref/logic/importer/util/MetaDataParserTest.java
@@ -60,9 +60,6 @@ public static Stream<Arguments> parseCustomizedEntryType() {
     @ParameterizedTest
     @MethodSource
     void parseCustomizedEntryType(BibEntryTypeBuilder expected, String source) {
-        assertEquals(
-            Optional.of(expected.build()),
-            MetaDataParser.parseCustomEntryType(source)
-        );
+        assertEquals(Optional.of(expected.build()), MetaDataParser.parseCustomEntryType(source));
     }
 }
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 3a543f72eea..64fa23d0b4a 100644
--- a/src/test/java/org/jabref/logic/importer/util/ShortDOIServiceTest.java
+++ b/src/test/java/org/jabref/logic/importer/util/ShortDOIServiceTest.java
@@ -29,11 +29,7 @@ void getShortDOI() throws ShortDOIServiceException {
     }
 
     @Test
-    void shouldThrowExceptionWhenDOIWasNotFound()
-        throws ShortDOIServiceException {
-        assertThrows(
-            ShortDOIServiceException.class,
-            () -> sut.getShortDOI(notExistingDoi)
-        );
+    void shouldThrowExceptionWhenDOIWasNotFound() throws ShortDOIServiceException {
+        assertThrows(ShortDOIServiceException.class, () -> sut.getShortDOI(notExistingDoi));
     }
 }
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 d20e5fea67a..825adaedd13 100644
--- a/src/test/java/org/jabref/logic/importer/util/StaxParserTest.java
+++ b/src/test/java/org/jabref/logic/importer/util/StaxParserTest.java
@@ -24,11 +24,8 @@ public static void setUp() {
 
     @ParameterizedTest
     @MethodSource("tests")
-    void getsCompleteXMLContent(String expected, String input)
-        throws XMLStreamException {
-        XMLStreamReader reader = xmlInputFactory.createXMLStreamReader(
-            new StringReader(input)
-        );
+    void getsCompleteXMLContent(String expected, String input) throws XMLStreamException {
+        XMLStreamReader reader = xmlInputFactory.createXMLStreamReader(new StringReader(input));
         assertEquals(expected, StaxParser.getXMLContent(reader));
     }
 
diff --git a/src/test/java/org/jabref/logic/integrity/AbbreviationCheckerTest.java b/src/test/java/org/jabref/logic/integrity/AbbreviationCheckerTest.java
index d042c1deaae..a8f79d5354e 100644
--- a/src/test/java/org/jabref/logic/integrity/AbbreviationCheckerTest.java
+++ b/src/test/java/org/jabref/logic/integrity/AbbreviationCheckerTest.java
@@ -21,11 +21,8 @@ class AbbreviationCheckerTest {
 
     @BeforeEach
     void setUp() {
-        abbreviationRepository =
-            JournalAbbreviationLoader.loadBuiltInRepository();
-        abbreviationRepository.addCustomAbbreviation(
-            new Abbreviation("Test Journal", "T. J.")
-        );
+        abbreviationRepository = JournalAbbreviationLoader.loadBuiltInRepository();
+        abbreviationRepository.addCustomAbbreviation(new Abbreviation("Test Journal", "T. J."));
         entry = new BibEntry(StandardEntryType.InProceedings);
         checker = new AbbreviationChecker(abbreviationRepository);
     }
@@ -39,9 +36,7 @@ void checkEntryComplainsAboutAbbreviatedJournalName() {
     @Test
     void checkEntryDoesNotComplainAboutJournalNameThatHasSameAbbreviation() {
         entry.setField(StandardField.BOOKTITLE, "Journal");
-        abbreviationRepository.addCustomAbbreviation(
-            new Abbreviation("Journal", "Journal")
-        );
+        abbreviationRepository.addCustomAbbreviation(new Abbreviation("Journal", "Journal"));
         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 cc5343f0b8e..272ff3e8769 100644
--- a/src/test/java/org/jabref/logic/integrity/AmpersandCheckerTest.java
+++ b/src/test/java/org/jabref/logic/integrity/AmpersandCheckerTest.java
@@ -27,38 +27,22 @@ private static Stream<Arguments> provideAcceptedInputs() {
         return Stream.of(
             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.AUTHOR, "\\& Multiple properly escaped \\&"),
+            Arguments.of(StandardField.BOOKTITLE, "\\\\\\& With multiple backslashes"),
             Arguments.of(
                 StandardField.COMMENT,
                 "\\\\\\& With multiple backslashes multiple times \\\\\\\\\\&"
             ),
-            Arguments.of(
-                StandardField.NOTE,
-                "In the \\& middle of \\\\\\& something"
-            ),
+            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
-    ) {
+    void rejectsDisallowedInputs(String expectedMessage, Field field, String value) {
         entry.setField(field, value);
         assertEquals(
             List.of(new IntegrityMessage(expectedMessage, entry, field)),
@@ -68,11 +52,7 @@ void rejectsDisallowedInputs(
 
     private static Stream<Arguments> provideUnacceptedInputs() {
         return Stream.of(
-            Arguments.of(
-                "Found 1 unescaped '&'",
-                StandardField.SUBTITLE,
-                "A single &"
-            ),
+            Arguments.of("Found 1 unescaped '&'", StandardField.SUBTITLE, "A single &"),
             Arguments.of(
                 "Found 2 unescaped '&'",
                 StandardField.ABSTRACT,
@@ -89,11 +69,7 @@ private static Stream<Arguments> provideUnacceptedInputs() {
                 "\\\\\\\\& Multiple times \\\\& multiple backslashes"
             ),
             // entryWithEscapedAndUnescapedAmpersand
-            Arguments.of(
-                "Found 1 unescaped '&'",
-                StandardField.TITLE,
-                "Jack \\& Jill & more"
-            ),
+            Arguments.of("Found 1 unescaped '&'", StandardField.TITLE, "Jack \\& Jill & more"),
             // entryWithMultipleEscapedAndUnescapedAmpersands
             Arguments.of(
                 "Found 4 unescaped '&'",
diff --git a/src/test/java/org/jabref/logic/integrity/BibStringCheckerTest.java b/src/test/java/org/jabref/logic/integrity/BibStringCheckerTest.java
index 28e80a727cb..07fad8da0c1 100644
--- a/src/test/java/org/jabref/logic/integrity/BibStringCheckerTest.java
+++ b/src/test/java/org/jabref/logic/integrity/BibStringCheckerTest.java
@@ -20,28 +20,16 @@ public class BibStringCheckerTest {
 
     @ParameterizedTest
     @MethodSource("provideAcceptedInputs")
-    void acceptsAllowedInputs(
-        List<IntegrityMessage> expected,
-        Field field,
-        String value
-    ) {
+    void acceptsAllowedInputs(List<IntegrityMessage> expected, Field field, String value) {
         entry.setField(field, value);
         assertEquals(expected, checker.check(entry));
     }
 
     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#")
         );
     }
 
@@ -50,11 +38,7 @@ void monthDoesNotAcceptOddNumberOfHashMarks() {
         entry.setField(StandardField.MONTH, "#jan");
         assertEquals(
             List.of(
-                new IntegrityMessage(
-                    "odd number of unescaped '#'",
-                    entry,
-                    StandardField.MONTH
-                )
+                new IntegrityMessage("odd number of unescaped '#'", entry, StandardField.MONTH)
             ),
             checker.check(entry)
         );
@@ -65,11 +49,7 @@ void authorDoesNotAcceptOddNumberOfHashMarks() {
         entry.setField(StandardField.AUTHOR, "#einstein# #amp; #newton#");
         assertEquals(
             List.of(
-                new IntegrityMessage(
-                    "odd number of unescaped '#'",
-                    entry,
-                    StandardField.AUTHOR
-                )
+                new IntegrityMessage("odd number of unescaped '#'", entry, StandardField.AUTHOR)
             ),
             checker.check(entry)
         );
diff --git a/src/test/java/org/jabref/logic/integrity/BracesCorrectorTest.java b/src/test/java/org/jabref/logic/integrity/BracesCorrectorTest.java
index 4d22911288e..700f4b32144 100644
--- a/src/test/java/org/jabref/logic/integrity/BracesCorrectorTest.java
+++ b/src/test/java/org/jabref/logic/integrity/BracesCorrectorTest.java
@@ -44,9 +44,6 @@ public void inputWithMaskedBraces() {
 
     @Test
     public void inputWithMixedBraces() {
-        assertEquals(
-            "{b{anana\\\\\\}}}",
-            BracesCorrector.apply("{b{anana\\\\\\}")
-        );
+        assertEquals("{b{anana\\\\\\}}}", BracesCorrector.apply("{b{anana\\\\\\}"));
     }
 }
diff --git a/src/test/java/org/jabref/logic/integrity/CitationKeyCheckerTest.java b/src/test/java/org/jabref/logic/integrity/CitationKeyCheckerTest.java
index 9ef36d03e18..8601d809bf3 100644
--- a/src/test/java/org/jabref/logic/integrity/CitationKeyCheckerTest.java
+++ b/src/test/java/org/jabref/logic/integrity/CitationKeyCheckerTest.java
@@ -49,9 +49,7 @@ void emptyCitationKey() {
             .withField(StandardField.YEAR, "2021");
         List<IntegrityMessage> expected = Collections.singletonList(
             new IntegrityMessage(
-                Localization.lang("empty citation key") +
-                ": " +
-                entry.getAuthorTitleYear(100),
+                Localization.lang("empty citation key") + ": " + entry.getAuthorTitleYear(100),
                 entry,
                 InternalField.KEY_FIELD
             )
diff --git a/src/test/java/org/jabref/logic/integrity/CitationKeyDeviationCheckerTest.java b/src/test/java/org/jabref/logic/integrity/CitationKeyDeviationCheckerTest.java
index 72930677fc4..a4c6cfc75ac 100644
--- a/src/test/java/org/jabref/logic/integrity/CitationKeyDeviationCheckerTest.java
+++ b/src/test/java/org/jabref/logic/integrity/CitationKeyDeviationCheckerTest.java
@@ -21,9 +21,7 @@
 
 public class CitationKeyDeviationCheckerTest {
 
-    private final BibDatabaseContext bibDatabaseContext = mock(
-        BibDatabaseContext.class
-    );
+    private final BibDatabaseContext bibDatabaseContext = mock(BibDatabaseContext.class);
     private final BibDatabase bibDatabase = mock(BibDatabase.class);
     private final MetaData metaData = mock(MetaData.class);
     private final AbstractCitationKeyPattern abstractCitationKeyPattern = mock(
@@ -32,24 +30,19 @@ public class CitationKeyDeviationCheckerTest {
     private final GlobalCitationKeyPattern globalCitationKeyPattern = mock(
         GlobalCitationKeyPattern.class
     );
-    private final CitationKeyPatternPreferences citationKeyPatternPreferences =
-        mock(CitationKeyPatternPreferences.class);
-    private final CitationKeyDeviationChecker checker =
-        new CitationKeyDeviationChecker(
-            bibDatabaseContext,
-            citationKeyPatternPreferences
-        );
+    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.getKeyPattern())
-            .thenReturn(globalCitationKeyPattern);
-        when(
-            metaData.getCiteKeyPattern(
-                citationKeyPatternPreferences.getKeyPattern()
-            )
-        )
+        when(citationKeyPatternPreferences.getKeyPattern()).thenReturn(globalCitationKeyPattern);
+        when(metaData.getCiteKeyPattern(citationKeyPatternPreferences.getKeyPattern()))
             .thenReturn(abstractCitationKeyPattern);
         when(bibDatabaseContext.getDatabase()).thenReturn(bibDatabase);
     }
diff --git a/src/test/java/org/jabref/logic/integrity/CitationKeyDuplicationCheckerTest.java b/src/test/java/org/jabref/logic/integrity/CitationKeyDuplicationCheckerTest.java
index ebc653faa52..91092e6bec7 100644
--- a/src/test/java/org/jabref/logic/integrity/CitationKeyDuplicationCheckerTest.java
+++ b/src/test/java/org/jabref/logic/integrity/CitationKeyDuplicationCheckerTest.java
@@ -20,8 +20,7 @@ void emptyCitationKey() {
             .withField(StandardField.AUTHOR, "Knuth")
             .withField(StandardField.YEAR, "2014");
         BibDatabase bibDatabase = new BibDatabase(List.of(entry));
-        CitationKeyDuplicationChecker checker =
-            new CitationKeyDuplicationChecker(bibDatabase);
+        CitationKeyDuplicationChecker checker = new CitationKeyDuplicationChecker(bibDatabase);
 
         List<IntegrityMessage> expected = Collections.emptyList();
         assertEquals(expected, checker.check(entry));
@@ -38,8 +37,7 @@ void hasDuplicateCitationKey() {
             .withField(StandardField.AUTHOR, "Knuth")
             .withField(StandardField.YEAR, "2014");
         BibDatabase bibDatabase = new BibDatabase(List.of(entry, entry2));
-        CitationKeyDuplicationChecker checker =
-            new CitationKeyDuplicationChecker(bibDatabase);
+        CitationKeyDuplicationChecker checker = new CitationKeyDuplicationChecker(bibDatabase);
 
         List<IntegrityMessage> expected = Collections.singletonList(
             new IntegrityMessage(
diff --git a/src/test/java/org/jabref/logic/integrity/DoiDuplicationCheckerTest.java b/src/test/java/org/jabref/logic/integrity/DoiDuplicationCheckerTest.java
index bb595f3e0cd..2d7fa01456b 100644
--- a/src/test/java/org/jabref/logic/integrity/DoiDuplicationCheckerTest.java
+++ b/src/test/java/org/jabref/logic/integrity/DoiDuplicationCheckerTest.java
@@ -16,16 +16,11 @@ public class DoiDuplicationCheckerTest {
     private String doiA = "10.1023/A:1022883727209";
     private String doiB = "10.1177/1461444811422887";
     private String doiC = "10.1145/2568225.2568315";
-    private BibEntry doiA_entry1 = new BibEntry()
-        .withField(StandardField.DOI, doiA);
-    private BibEntry doiA_entry2 = new BibEntry()
-        .withField(StandardField.DOI, doiA);
-    private BibEntry doiB_entry1 = new BibEntry()
-        .withField(StandardField.DOI, doiB);
-    private BibEntry doiB_entry2 = new BibEntry()
-        .withField(StandardField.DOI, doiB);
-    private BibEntry doiC_entry1 = new BibEntry()
-        .withField(StandardField.DOI, doiC);
+    private BibEntry doiA_entry1 = new BibEntry().withField(StandardField.DOI, doiA);
+    private BibEntry doiA_entry2 = new BibEntry().withField(StandardField.DOI, doiA);
+    private BibEntry doiB_entry1 = new BibEntry().withField(StandardField.DOI, doiB);
+    private BibEntry doiB_entry2 = new BibEntry().withField(StandardField.DOI, doiB);
+    private BibEntry doiC_entry1 = new BibEntry().withField(StandardField.DOI, doiC);
 
     @Test
     public void testOnePairDuplicateDOI() {
diff --git a/src/test/java/org/jabref/logic/integrity/DoiValidityCheckerTest.java b/src/test/java/org/jabref/logic/integrity/DoiValidityCheckerTest.java
index b77e29cc6e4..4d3dd66ff1c 100644
--- a/src/test/java/org/jabref/logic/integrity/DoiValidityCheckerTest.java
+++ b/src/test/java/org/jabref/logic/integrity/DoiValidityCheckerTest.java
@@ -14,10 +14,7 @@ class DoiValidityCheckerTest {
 
     @Test
     void doiAcceptsValidInput() {
-        assertEquals(
-            Optional.empty(),
-            checker.checkValue("10.1023/A:1022883727209")
-        );
+        assertEquals(Optional.empty(), checker.checkValue("10.1023/A:1022883727209"));
     }
 
     @Test
@@ -34,9 +31,7 @@ void doiAcceptsValidInputWithNotOnlyNumbers() {
     void doiAcceptsValidInputNoMatterTheLengthOfTheDOIName() {
         assertEquals(
             Optional.empty(),
-            checker.checkValue(
-                "10.1002/(SICI)1097-4571(199205)43:4<284::AID-ASI3>3.0.CO;2-0"
-            )
+            checker.checkValue("10.1002/(SICI)1097-4571(199205)43:4<284::AID-ASI3>3.0.CO;2-0")
         );
     }
 
diff --git a/src/test/java/org/jabref/logic/integrity/EditionCheckerTest.java b/src/test/java/org/jabref/logic/integrity/EditionCheckerTest.java
index 93d4bf8967c..42c843b6f91 100644
--- a/src/test/java/org/jabref/logic/integrity/EditionCheckerTest.java
+++ b/src/test/java/org/jabref/logic/integrity/EditionCheckerTest.java
@@ -24,8 +24,7 @@ void isFirstCharacterANumber() {
     @Test
     void isFirstCharacterANumberFalseForEmptyString() {
         assertFalse(
-            createSimpleEditionChecker(new BibDatabaseContext(), false)
-                .isFirstCharDigit("")
+            createSimpleEditionChecker(new BibDatabaseContext(), false).isFirstCharDigit("")
         );
     }
 
@@ -41,65 +40,44 @@ void isFirstCharacterNotANumber() {
     void editionCheckerDoesNotComplainIfAllowIntegerEditionIsEnabled() {
         assertEquals(
             Optional.empty(),
-            createSimpleEditionChecker(new BibDatabaseContext(), true)
-                .checkValue("2")
+            createSimpleEditionChecker(new BibDatabaseContext(), true).checkValue("2")
         );
     }
 
     @Test
     void bibTexAcceptsOrdinalNumberInWordsWithCapitalFirstLetter() {
-        assertEquals(
-            Optional.empty(),
-            createBibtexEditionChecker(true).checkValue("Second")
-        );
+        assertEquals(Optional.empty(), createBibtexEditionChecker(true).checkValue("Second"));
     }
 
     @Test
     void bibTexDoesNotAcceptOrdinalNumberInWordsWithNonCapitalFirstLetter() {
-        assertNotEquals(
-            Optional.empty(),
-            createBibtexEditionChecker(true).checkValue("second")
-        );
+        assertNotEquals(Optional.empty(), createBibtexEditionChecker(true).checkValue("second"));
     }
 
     @Test
     void bibTexAcceptsIntegerInputInEdition() {
-        assertEquals(
-            Optional.empty(),
-            createBibtexEditionChecker(true).checkValue("2")
-        );
+        assertEquals(Optional.empty(), createBibtexEditionChecker(true).checkValue("2"));
     }
 
     @Test
     void bibTexAcceptsOrdinalNumberInNumbers() {
-        assertEquals(
-            Optional.empty(),
-            createBibtexEditionChecker(true).checkValue("2nd")
-        );
+        assertEquals(Optional.empty(), createBibtexEditionChecker(true).checkValue("2nd"));
     }
 
     @Test
     void bibTexEmptyValueAsInput() {
-        assertEquals(
-            Optional.empty(),
-            createBibtexEditionChecker(false).checkValue("")
-        );
+        assertEquals(Optional.empty(), createBibtexEditionChecker(false).checkValue(""));
     }
 
     @Test
     void bibTexNullValueAsInput() {
-        assertEquals(
-            Optional.empty(),
-            createBibtexEditionChecker(false).checkValue(null)
-        );
+        assertEquals(Optional.empty(), createBibtexEditionChecker(false).checkValue(null));
     }
 
     @Test
     void bibTexDoesNotAcceptIntegerOnly() {
         assertEquals(
-            Optional.of(
-                Localization.lang("no integer as values for edition allowed")
-            ),
+            Optional.of(Localization.lang("no integer as values for edition allowed")),
             createBibtexEditionChecker(false).checkValue("3")
         );
     }
@@ -107,9 +85,7 @@ void bibTexDoesNotAcceptIntegerOnly() {
     @Test
     void bibTexAcceptsFirstEditionAlsoIfIntegerEditionDisallowed() {
         assertEquals(
-            Optional.of(
-                Localization.lang("edition of book reported as just 1")
-            ),
+            Optional.of(Localization.lang("edition of book reported as just 1")),
             createBibtexEditionChecker(false).checkValue("1")
         );
     }
@@ -124,40 +100,29 @@ void bibLaTexAcceptsEditionWithCapitalFirstLetter() {
 
     @Test
     void bibLaTexAcceptsIntegerInputInEdition() {
-        assertEquals(
-            Optional.empty(),
-            createBiblatexEditionChecker(true).checkValue("2")
-        );
+        assertEquals(Optional.empty(), createBiblatexEditionChecker(true).checkValue("2"));
     }
 
     @Test
     void bibLaTexAcceptsEditionAsLiteralString() {
         assertEquals(
             Optional.empty(),
-            createBiblatexEditionChecker(true)
-                .checkValue("Third, revised and expanded edition")
+            createBiblatexEditionChecker(true).checkValue("Third, revised and expanded edition")
         );
     }
 
     @Test
     void bibLaTexDoesNotAcceptOrdinalNumberInNumbers() {
-        assertNotEquals(
-            Optional.empty(),
-            createBiblatexEditionChecker(true).checkValue("2nd")
-        );
+        assertNotEquals(Optional.empty(), createBiblatexEditionChecker(true).checkValue("2nd"));
     }
 
-    private EditionChecker createBibtexEditionChecker(
-        Boolean allowIntegerEdition
-    ) {
+    private EditionChecker createBibtexEditionChecker(Boolean allowIntegerEdition) {
         BibDatabaseContext bibtex = new BibDatabaseContext();
         bibtex.setMode(BibDatabaseMode.BIBTEX);
         return new EditionChecker(bibtex, allowIntegerEdition);
     }
 
-    private EditionChecker createBiblatexEditionChecker(
-        Boolean allowIntegerEdition
-    ) {
+    private EditionChecker createBiblatexEditionChecker(Boolean allowIntegerEdition) {
         BibDatabaseContext biblatex = new BibDatabaseContext();
         biblatex.setMode(BibDatabaseMode.BIBLATEX);
         return new EditionChecker(biblatex, allowIntegerEdition);
@@ -167,9 +132,6 @@ private EditionChecker createSimpleEditionChecker(
         BibDatabaseContext bibDatabaseContextEdition,
         boolean allowIntegerEdition
     ) {
-        return new EditionChecker(
-            bibDatabaseContextEdition,
-            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 c975606daab..dea543a53d9 100644
--- a/src/test/java/org/jabref/logic/integrity/EntryLinkCheckerTest.java
+++ b/src/test/java/org/jabref/logic/integrity/EntryLinkCheckerTest.java
@@ -28,10 +28,7 @@ void setUp() {
 
     @Test
     void testEntryLinkChecker() {
-        assertThrows(
-            NullPointerException.class,
-            () -> new EntryLinkChecker(null)
-        );
+        assertThrows(NullPointerException.class, () -> new EntryLinkChecker(null));
     }
 
     @Test
diff --git a/src/test/java/org/jabref/logic/integrity/HTMLCharacterCheckerTest.java b/src/test/java/org/jabref/logic/integrity/HTMLCharacterCheckerTest.java
index fd27f5fc501..d456f018605 100644
--- a/src/test/java/org/jabref/logic/integrity/HTMLCharacterCheckerTest.java
+++ b/src/test/java/org/jabref/logic/integrity/HTMLCharacterCheckerTest.java
@@ -21,10 +21,7 @@ public class HTMLCharacterCheckerTest {
 
     @Test
     void testSettingNullThrowsNPE() {
-        assertThrows(
-            NullPointerException.class,
-            () -> entry.setField(StandardField.AUTHOR, null)
-        );
+        assertThrows(NullPointerException.class, () -> entry.setField(StandardField.AUTHOR, null));
     }
 
     @Test
@@ -59,11 +56,7 @@ void authorDoesNotAcceptHTMLEncodedCharacters() {
         entry.setField(StandardField.AUTHOR, "Lenhard, J&#227;rg");
         assertEquals(
             List.of(
-                new IntegrityMessage(
-                    "HTML encoded character found",
-                    entry,
-                    StandardField.AUTHOR
-                )
+                new IntegrityMessage("HTML encoded character found", entry, StandardField.AUTHOR)
             ),
             checker.check(entry)
         );
@@ -71,17 +64,10 @@ void authorDoesNotAcceptHTMLEncodedCharacters() {
 
     @Test
     void journalDoesNotAcceptHTMLEncodedCharacters() {
-        entry.setField(
-            StandardField.JOURNAL,
-            "&Auml;rling Str&ouml;m for &#8211; &#x2031;"
-        );
+        entry.setField(StandardField.JOURNAL, "&Auml;rling Str&ouml;m for &#8211; &#x2031;");
         assertEquals(
             List.of(
-                new IntegrityMessage(
-                    "HTML encoded character found",
-                    entry,
-                    StandardField.JOURNAL
-                )
+                new IntegrityMessage("HTML encoded character found", entry, StandardField.JOURNAL)
             ),
             checker.check(entry)
         );
@@ -90,10 +76,7 @@ void journalDoesNotAcceptHTMLEncodedCharacters() {
     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")
         );
     }
 
diff --git a/src/test/java/org/jabref/logic/integrity/HowPublishedCheckerTest.java b/src/test/java/org/jabref/logic/integrity/HowPublishedCheckerTest.java
index b38b573dfea..407c585d9a1 100644
--- a/src/test/java/org/jabref/logic/integrity/HowPublishedCheckerTest.java
+++ b/src/test/java/org/jabref/logic/integrity/HowPublishedCheckerTest.java
@@ -46,17 +46,11 @@ void bibTexAcceptsUrl() {
 
     @Test
     void bibLaTexAcceptsStringWithCapitalFirstLetter() {
-        assertEquals(
-            Optional.empty(),
-            checkerBiblatex.checkValue("Lorem ipsum")
-        );
+        assertEquals(Optional.empty(), checkerBiblatex.checkValue("Lorem ipsum"));
     }
 
     @Test
     void bibLaTexAcceptsStringWithLowercaseFirstLetter() {
-        assertEquals(
-            Optional.empty(),
-            checkerBiblatex.checkValue("lorem ipsum")
-        );
+        assertEquals(Optional.empty(), checkerBiblatex.checkValue("lorem ipsum"));
     }
 }
diff --git a/src/test/java/org/jabref/logic/integrity/ISBNCheckerTest.java b/src/test/java/org/jabref/logic/integrity/ISBNCheckerTest.java
index 41d0a9054ca..a851d93c722 100644
--- a/src/test/java/org/jabref/logic/integrity/ISBNCheckerTest.java
+++ b/src/test/java/org/jabref/logic/integrity/ISBNCheckerTest.java
@@ -27,10 +27,7 @@ void isbnAcceptsNumbersAndCharacters() {
 
     @Test
     void isbnDoesNotAcceptRandomInput() {
-        assertNotEquals(
-            Optional.empty(),
-            checker.checkValue("Some other stuff")
-        );
+        assertNotEquals(Optional.empty(), checker.checkValue("Some other stuff"));
     }
 
     @Test
@@ -51,10 +48,7 @@ private static Stream<Arguments> provideBoundaryArgumentsForISBN13() {
                 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 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 fef241244fd..607d83163b9 100644
--- a/src/test/java/org/jabref/logic/integrity/ISSNCheckerTest.java
+++ b/src/test/java/org/jabref/logic/integrity/ISSNCheckerTest.java
@@ -27,10 +27,7 @@ void issnAcceptsNumbersAndCharacters() {
 
     @Test
     void issnDoesNotAcceptRandomInput() {
-        assertNotEquals(
-            Optional.empty(),
-            checker.checkValue("Some other stuff")
-        );
+        assertNotEquals(Optional.empty(), checker.checkValue("Some other stuff"));
     }
 
     @Test
diff --git a/src/test/java/org/jabref/logic/integrity/IntegrityCheckTest.java b/src/test/java/org/jabref/logic/integrity/IntegrityCheckTest.java
index a0644ac2535..e177e8cc720 100644
--- a/src/test/java/org/jabref/logic/integrity/IntegrityCheckTest.java
+++ b/src/test/java/org/jabref/logic/integrity/IntegrityCheckTest.java
@@ -47,11 +47,7 @@ class IntegrityCheckTest {
     void bibTexAcceptsStandardEntryType() {
         assertCorrect(
             withMode(
-                createContext(
-                    StandardField.TITLE,
-                    "sometitle",
-                    StandardEntryType.Article
-                ),
+                createContext(StandardField.TITLE, "sometitle", StandardEntryType.Article),
                 BibDatabaseMode.BIBTEX
             )
         );
@@ -61,11 +57,7 @@ void bibTexAcceptsStandardEntryType() {
     void bibTexDoesNotAcceptIEEETranEntryType() {
         assertWrong(
             withMode(
-                createContext(
-                    StandardField.TITLE,
-                    "sometitle",
-                    IEEETranEntryType.Patent
-                ),
+                createContext(StandardField.TITLE, "sometitle", IEEETranEntryType.Patent),
                 BibDatabaseMode.BIBTEX
             )
         );
@@ -75,11 +67,7 @@ void bibTexDoesNotAcceptIEEETranEntryType() {
     void bibLaTexAcceptsIEEETranEntryType() {
         assertCorrect(
             (withMode(
-                    createContext(
-                        StandardField.TITLE,
-                        "sometitle",
-                        IEEETranEntryType.Patent
-                    ),
+                    createContext(StandardField.TITLE, "sometitle", IEEETranEntryType.Patent),
                     BibDatabaseMode.BIBLATEX
                 ))
         );
@@ -89,11 +77,7 @@ void bibLaTexAcceptsIEEETranEntryType() {
     void bibLaTexAcceptsStandardEntryType() {
         assertCorrect(
             withMode(
-                createContext(
-                    StandardField.TITLE,
-                    "sometitle",
-                    StandardEntryType.Article
-                ),
+                createContext(StandardField.TITLE, "sometitle", StandardEntryType.Article),
                 BibDatabaseMode.BIBLATEX
             )
         );
@@ -103,9 +87,7 @@ void bibLaTexAcceptsStandardEntryType() {
     @MethodSource("provideCorrectFormat")
     void authorNameChecksCorrectFormat(String input) {
         for (Field field : FieldFactory.getPersonNameFields()) {
-            assertCorrect(
-                withMode(createContext(field, input), BibDatabaseMode.BIBLATEX)
-            );
+            assertCorrect(withMode(createContext(field, input), BibDatabaseMode.BIBLATEX));
         }
     }
 
@@ -113,18 +95,12 @@ void authorNameChecksCorrectFormat(String input) {
     @MethodSource("provideIncorrectFormat")
     void authorNameChecksIncorrectFormat(String input) {
         for (Field field : FieldFactory.getPersonNameFields()) {
-            assertWrong(
-                withMode(createContext(field, input), BibDatabaseMode.BIBLATEX)
-            );
+            assertWrong(withMode(createContext(field, input), BibDatabaseMode.BIBLATEX));
         }
     }
 
     private static Stream<String> provideCorrectFormat() {
-        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> provideIncorrectFormat() {
@@ -141,44 +117,26 @@ private static Stream<String> provideIncorrectFormat() {
     @Test
     void testFileChecks() {
         MetaData metaData = mock(MetaData.class);
-        Mockito
-            .when(metaData.getDefaultFileDirectory())
-            .thenReturn(Optional.of("."));
-        Mockito
-            .when(metaData.getUserFileDirectory(any(String.class)))
-            .thenReturn(Optional.empty());
+        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
-        Mockito
-            .when(metaData.getMode())
-            .thenReturn(Optional.of(BibDatabaseMode.BIBTEX));
+        Mockito.when(metaData.getMode()).thenReturn(Optional.of(BibDatabaseMode.BIBTEX));
 
+        assertCorrect(createContext(StandardField.FILE, ":build.gradle:gradle", metaData));
         assertCorrect(
-            createContext(StandardField.FILE, ":build.gradle:gradle", metaData)
-        );
-        assertCorrect(
-            createContext(
-                StandardField.FILE,
-                "description:build.gradle:gradle",
-                metaData
-            )
-        );
-        assertWrong(
-            createContext(StandardField.FILE, ":asflakjfwofja:PDF", metaData)
+            createContext(StandardField.FILE, "description:build.gradle:gradle", metaData)
         );
+        assertWrong(createContext(StandardField.FILE, ":asflakjfwofja:PDF", metaData));
     }
 
     @Test
-    void fileCheckFindsFilesRelativeToBibFile(@TempDir Path testFolder)
-        throws IOException {
+    void fileCheckFindsFilesRelativeToBibFile(@TempDir Path testFolder) throws IOException {
         Path bibFile = testFolder.resolve("lit.bib");
         Files.createFile(bibFile);
         Path pdfFile = testFolder.resolve("file.pdf");
         Files.createFile(pdfFile);
 
-        BibDatabaseContext databaseContext = createContext(
-            StandardField.FILE,
-            ":file.pdf:PDF"
-        );
+        BibDatabaseContext databaseContext = createContext(StandardField.FILE, ":file.pdf:PDF");
         databaseContext.setDatabasePath(bibFile);
 
         assertCorrect(databaseContext);
@@ -214,22 +172,14 @@ void testEntryIsUnchangedAfterChecks() {
         assertEquals(clonedEntry, entry);
     }
 
-    private BibDatabaseContext createContext(
-        Field field,
-        String value,
-        EntryType type
-    ) {
+    private BibDatabaseContext createContext(Field field, String value, EntryType type) {
         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
-    ) {
+    private BibDatabaseContext createContext(Field field, String value, MetaData metaData) {
         BibEntry entry = new BibEntry().withField(field, value);
         BibDatabase bibDatabase = new BibDatabase();
         bibDatabase.insertEntry(entry);
@@ -256,8 +206,7 @@ private void assertWrong(BibDatabaseContext context) {
 
     private void assertCorrect(BibDatabaseContext context) {
         FilePreferences filePreferencesMock = mock(FilePreferences.class);
-        when(filePreferencesMock.shouldStoreFilesRelativeToBibFile())
-            .thenReturn(true);
+        when(filePreferencesMock.shouldStoreFilesRelativeToBibFile()).thenReturn(true);
         List<IntegrityMessage> messages = new IntegrityCheck(
             context,
             filePreferencesMock,
@@ -284,10 +233,7 @@ private CitationKeyPatternPreferences createCitationKeyPatternPreferences() {
         );
     }
 
-    private BibDatabaseContext withMode(
-        BibDatabaseContext context,
-        BibDatabaseMode mode
-    ) {
+    private BibDatabaseContext withMode(BibDatabaseContext context, BibDatabaseMode mode) {
         context.setMode(mode);
         return context;
     }
diff --git a/src/test/java/org/jabref/logic/integrity/JournalInAbbreviationListCheckerTest.java b/src/test/java/org/jabref/logic/integrity/JournalInAbbreviationListCheckerTest.java
index 382af138aef..67a64cd2820 100644
--- a/src/test/java/org/jabref/logic/integrity/JournalInAbbreviationListCheckerTest.java
+++ b/src/test/java/org/jabref/logic/integrity/JournalInAbbreviationListCheckerTest.java
@@ -21,16 +21,10 @@ public class JournalInAbbreviationListCheckerTest {
 
     @BeforeEach
     void setUp() {
-        abbreviationRepository =
-            JournalAbbreviationLoader.loadBuiltInRepository();
-        abbreviationRepository.addCustomAbbreviation(
-            new Abbreviation("IEEE Software", "IEEE SW")
-        );
+        abbreviationRepository = JournalAbbreviationLoader.loadBuiltInRepository();
+        abbreviationRepository.addCustomAbbreviation(new Abbreviation("IEEE Software", "IEEE SW"));
         checker =
-            new JournalInAbbreviationListChecker(
-                StandardField.JOURNAL,
-                abbreviationRepository
-            );
+            new JournalInAbbreviationListChecker(StandardField.JOURNAL, abbreviationRepository);
         checkerb =
             new JournalInAbbreviationListChecker(
                 StandardField.JOURNALTITLE,
diff --git a/src/test/java/org/jabref/logic/integrity/LatexIntegrityCheckerTest.java b/src/test/java/org/jabref/logic/integrity/LatexIntegrityCheckerTest.java
index cad16c29a03..08918872daa 100644
--- a/src/test/java/org/jabref/logic/integrity/LatexIntegrityCheckerTest.java
+++ b/src/test/java/org/jabref/logic/integrity/LatexIntegrityCheckerTest.java
@@ -44,10 +44,7 @@ private static Stream<Arguments> provideAcceptedInputs() {
             // Special characters and symbols
             Arguments.of(StandardField.TITLE, "Café"),
             Arguments.of(StandardField.TITLE, "αβγδε"),
-            Arguments.of(
-                StandardField.TITLE,
-                "\\# \\$ \\% \\& \\{ \\} \\_ \\^ \\\\"
-            ),
+            Arguments.of(StandardField.TITLE, "\\# \\$ \\% \\& \\{ \\} \\_ \\^ \\\\"),
             // Fonts and sizes
             Arguments.of(StandardField.TITLE, "\\tiny Tiny Text"),
             Arguments.of(StandardField.TITLE, "\\small Small Text"),
@@ -57,22 +54,13 @@ private static Stream<Arguments> provideAcceptedInputs() {
             Arguments.of(StandardField.TITLE, "$\\widetilde{i}$"),
             Arguments.of(StandardField.TITLE, "\\ldots"),
             // Simple environments
-            Arguments.of(
-                StandardField.TITLE,
-                "\\begin{quote}Quoted Text\\end{quote}\n"
-            ),
-            Arguments.of(
-                StandardField.TITLE,
-                "\\begin{center}Centered Text\\end{center}\n"
-            ),
+            Arguments.of(StandardField.TITLE, "\\begin{quote}Quoted Text\\end{quote}\n"),
+            Arguments.of(StandardField.TITLE, "\\begin{center}Centered Text\\end{center}\n"),
             // Math environment inputs
             Arguments.of(StandardField.TITLE, "$x + y = z$"),
             Arguments.of(StandardField.TITLE, "\\(a^2 + b^2 = c^2\\)"),
             Arguments.of(StandardField.TITLE, "\\[E = mc^2\\]"),
-            Arguments.of(
-                StandardField.TITLE,
-                "\\begin{math} V = I \\cdot R \\end{math}"
-            ),
+            Arguments.of(StandardField.TITLE, "\\begin{math} V = I \\cdot R \\end{math}"),
             // Equations and alignment
             // Currently Unsupported
             // Arguments.of(StandardField.TITLE, "\\begin{align} x + y &= z \\\\ a &= b + c \\end{align}"),
@@ -121,10 +109,7 @@ 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, "\\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}"
@@ -155,22 +140,13 @@ private static Stream<Arguments> 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.AUTHOR, "\\& Multiple properly escaped \\&"),
+            Arguments.of(StandardField.BOOKTITLE, "\\\\\\& With multiple backslashes"),
             Arguments.of(
                 StandardField.COMMENT,
                 "\\\\\\& With multiple backslashes multiple times \\\\\\\\\\&"
             ),
-            Arguments.of(
-                StandardField.NOTE,
-                "In the \\& middle of \\\\\\& something"
-            ),
+            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"),
@@ -181,11 +157,7 @@ private static Stream<Arguments> provideAcceptedInputs() {
 
     @ParameterizedTest
     @MethodSource("provideUnacceptedInputs")
-    void rejectsDisallowedInputs(
-        String expectedMessage,
-        Field field,
-        String value
-    ) {
+    void rejectsDisallowedInputs(String expectedMessage, Field field, String value) {
         entry.setField(field, value);
         assertEquals(
             List.of(new IntegrityMessage(expectedMessage, entry, field)),
@@ -203,18 +175,13 @@ private static Stream<Arguments> provideUnacceptedInputs() {
             // ------------------------------------ LATEX PARSING/TOKENISATION ERRORS ------------------------------------
             // TTEG00: Finished reading document before finding required terminator "{0}"
             Arguments.of(
-                LatexIntegrityChecker.errorMessageFormatHelper(
-                    CoreErrorCode.TTEG00,
-                    "}"
-                ),
+                LatexIntegrityChecker.errorMessageFormatHelper(CoreErrorCode.TTEG00, "}"),
                 StandardField.ABSTRACT,
                 "Unbalanced braces {"
             ),
             // TTEG01: Nothing following \
             Arguments.of(
-                LatexIntegrityChecker.errorMessageFormatHelper(
-                    CoreErrorCode.TTEG01
-                ),
+                LatexIntegrityChecker.errorMessageFormatHelper(CoreErrorCode.TTEG01),
                 StandardField.ABSTRACT,
                 "\\"
             ),
@@ -224,10 +191,7 @@ private static Stream<Arguments> provideUnacceptedInputs() {
 
             // TTEG03: Delimiter {0} closing Math mode followed no matching opener
             Arguments.of(
-                LatexIntegrityChecker.errorMessageFormatHelper(
-                    CoreErrorCode.TTEG03,
-                    "\\]"
-                ),
+                LatexIntegrityChecker.errorMessageFormatHelper(CoreErrorCode.TTEG03, "\\]"),
                 StandardField.TITLE,
                 "1+1=2\\]"
             ),
@@ -237,17 +201,13 @@ private static Stream<Arguments> provideUnacceptedInputs() {
 
             // TTEM00: Already in math mode - cannot use \( or \[
             Arguments.of(
-                LatexIntegrityChecker.errorMessageFormatHelper(
-                    CoreErrorCode.TTEM00
-                ),
+                LatexIntegrityChecker.errorMessageFormatHelper(CoreErrorCode.TTEM00),
                 StandardField.ABSTRACT,
                 "Braces inside: $\\(1+1\\)=2$"
             ),
             // TTEM01: $ was ended by $$
             Arguments.of(
-                LatexIntegrityChecker.errorMessageFormatHelper(
-                    CoreErrorCode.TTEM01
-                ),
+                LatexIntegrityChecker.errorMessageFormatHelper(CoreErrorCode.TTEM01),
                 StandardField.TITLE,
                 "$1+1=2$$"
             ),
@@ -256,25 +216,19 @@ private static Stream<Arguments> provideUnacceptedInputs() {
 
             // TTEM03: Math superscript (^) and subscript (_) characters are not allowed in text mode
             Arguments.of(
-                LatexIntegrityChecker.errorMessageFormatHelper(
-                    CoreErrorCode.TTEM03
-                ),
+                LatexIntegrityChecker.errorMessageFormatHelper(CoreErrorCode.TTEM03),
                 StandardField.SUBTITLE,
                 "_ or ^ Outside Math-Environment"
             ),
             // TTEM04: $ characters cannot be used inside math mode
             Arguments.of(
-                LatexIntegrityChecker.errorMessageFormatHelper(
-                    CoreErrorCode.TTEM04
-                ),
+                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
-                ),
+                LatexIntegrityChecker.errorMessageFormatHelper(CoreErrorCode.TTEV00),
                 StandardField.KEYWORDS,
                 "\\verb "
             ),
@@ -292,21 +246,13 @@ private static Stream<Arguments> provideUnacceptedInputs() {
             ),
             // TTEC01: Command \{0} cannot be used in {1} mode
             Arguments.of(
-                LatexIntegrityChecker.errorMessageFormatHelper(
-                    CoreErrorCode.TTEC01,
-                    "par",
-                    "MATH"
-                ),
+                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"
-                ),
+                LatexIntegrityChecker.errorMessageFormatHelper(CoreErrorCode.TTEC02, "textbf", "1"),
                 StandardField.KEYWORDS,
                 "\\textbf"
             ),
@@ -328,9 +274,7 @@ private static Stream<Arguments> provideUnacceptedInputs() {
             ),
             // TTEE01: Expected to read valid environment name enclosed in braces without whitespace
             Arguments.of(
-                LatexIntegrityChecker.errorMessageFormatHelper(
-                    CoreErrorCode.TTEE01
-                ),
+                LatexIntegrityChecker.errorMessageFormatHelper(CoreErrorCode.TTEE01),
                 StandardField.TITLE,
                 "\\begin{ align }"
             ),
@@ -355,18 +299,13 @@ private static Stream<Arguments> provideUnacceptedInputs() {
             ),
             // TTEE04: Environment {0} was still open at end of input document
             Arguments.of(
-                LatexIntegrityChecker.errorMessageFormatHelper(
-                    CoreErrorCode.TTEE04,
-                    "itemize"
-                ),
+                LatexIntegrityChecker.errorMessageFormatHelper(CoreErrorCode.TTEE04, "itemize"),
                 StandardField.ABSTRACT,
                 "\\begin{itemize}"
             ),
             // TTEE05: Unexpected \end - no environment is currently open
             Arguments.of(
-                LatexIntegrityChecker.errorMessageFormatHelper(
-                    CoreErrorCode.TTEE05
-                ),
+                LatexIntegrityChecker.errorMessageFormatHelper(CoreErrorCode.TTEE05),
                 StandardField.KEYWORDS,
                 "\\end{itemize}"
             ),
@@ -385,34 +324,25 @@ private static Stream<Arguments> provideUnacceptedInputs() {
 
             // TTEUC0: Input ended before name of new command was found
             Arguments.of(
-                LatexIntegrityChecker.errorMessageFormatHelper(
-                    CoreErrorCode.TTEUC0
-                ),
+                LatexIntegrityChecker.errorMessageFormatHelper(CoreErrorCode.TTEUC0),
                 StandardField.TITLE,
                 "\\newcommand{\\"
             ),
             // TTEUC1: Name of new command must be preceded by \
             Arguments.of(
-                LatexIntegrityChecker.errorMessageFormatHelper(
-                    CoreErrorCode.TTEUC1
-                ),
+                LatexIntegrityChecker.errorMessageFormatHelper(CoreErrorCode.TTEUC1),
                 StandardField.TITLE,
                 "\\newcommand{MyCommand}"
             ),
             // TTEUC2: Input ended before end of new command definition
             Arguments.of(
-                LatexIntegrityChecker.errorMessageFormatHelper(
-                    CoreErrorCode.TTEUC2
-                ),
+                LatexIntegrityChecker.errorMessageFormatHelper(CoreErrorCode.TTEUC2),
                 StandardField.TITLE,
                 "\\newcommand{\\MyCommand}{"
             ),
             // TTEUC3: No definition provided for new command {0}
             Arguments.of(
-                LatexIntegrityChecker.errorMessageFormatHelper(
-                    CoreErrorCode.TTEUC3,
-                    "MyCommand"
-                ),
+                LatexIntegrityChecker.errorMessageFormatHelper(CoreErrorCode.TTEUC3, "MyCommand"),
                 StandardField.TITLE,
                 "\\newcommand{\\MyCommand}"
             ),
@@ -424,9 +354,7 @@ private static Stream<Arguments> provideUnacceptedInputs() {
 
             // TTEUC6: No ’}’ found after new command name
             Arguments.of(
-                LatexIntegrityChecker.errorMessageFormatHelper(
-                    CoreErrorCode.TTEUC6
-                ),
+                LatexIntegrityChecker.errorMessageFormatHelper(CoreErrorCode.TTEUC6),
                 StandardField.TITLE,
                 "\\newcommand{\\MyCommand"
             ),
@@ -442,18 +370,13 @@ private static Stream<Arguments> provideUnacceptedInputs() {
             ),
             // TTEUC8: Reserved command {0} cannot be redefined
             Arguments.of(
-                LatexIntegrityChecker.errorMessageFormatHelper(
-                    CoreErrorCode.TTEUC8,
-                    "begin"
-                ),
+                LatexIntegrityChecker.errorMessageFormatHelper(CoreErrorCode.TTEUC8, "begin"),
                 StandardField.TITLE,
                 "\\renewcommand{\\begin}{}"
             ),
             // TTEUC9: Input ended before end of argument count specification
             Arguments.of(
-                LatexIntegrityChecker.errorMessageFormatHelper(
-                    CoreErrorCode.TTEUC9
-                ),
+                LatexIntegrityChecker.errorMessageFormatHelper(CoreErrorCode.TTEUC9),
                 StandardField.TITLE,
                 "\\newcommand{\\MyCommand}["
             ),
@@ -470,9 +393,7 @@ private static Stream<Arguments> provideUnacceptedInputs() {
             ),
             // TTEUE0: Expected to read name of new environment enclosed in braces
             Arguments.of(
-                LatexIntegrityChecker.errorMessageFormatHelper(
-                    CoreErrorCode.TTEUE0
-                ),
+                LatexIntegrityChecker.errorMessageFormatHelper(CoreErrorCode.TTEUE0),
                 StandardField.TITLE,
                 "\\newenvironment{}"
             ),
@@ -519,49 +440,37 @@ private static Stream<Arguments> provideUnacceptedInputs() {
 
             // TFEL00: Found content before first \item
             Arguments.of(
-                LatexIntegrityChecker.errorMessageFormatHelper(
-                    CoreErrorCode.TFEL00
-                ),
+                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
-                ),
+                LatexIntegrityChecker.errorMessageFormatHelper(CoreErrorCode.TFEM00),
                 StandardField.TITLE,
                 "$1 \\over \\over 3$"
             ),
             // TFEM01: Trailing subscript/superscript token
             Arguments.of(
-                LatexIntegrityChecker.errorMessageFormatHelper(
-                    CoreErrorCode.TFEM01
-                ),
+                LatexIntegrityChecker.errorMessageFormatHelper(CoreErrorCode.TFEM01),
                 StandardField.TITLE,
                 "$x_$"
             ),
             // TFEM02: Double subscript/superscript token is ambiguous - use curly brackets
             Arguments.of(
-                LatexIntegrityChecker.errorMessageFormatHelper(
-                    CoreErrorCode.TFEM02
-                ),
+                LatexIntegrityChecker.errorMessageFormatHelper(CoreErrorCode.TFEM02),
                 StandardField.TITLE,
                 "$x_i_j$"
             ),
             // TFEM03: \right had no preceding \left
             Arguments.of(
-                LatexIntegrityChecker.errorMessageFormatHelper(
-                    CoreErrorCode.TFEM03
-                ),
+                LatexIntegrityChecker.errorMessageFormatHelper(CoreErrorCode.TFEM03),
                 StandardField.TITLE,
                 "$\\right)$"
             ),
             // TFEM04: \left had no following \right
             Arguments.of(
-                LatexIntegrityChecker.errorMessageFormatHelper(
-                    CoreErrorCode.TFEM04
-                ),
+                LatexIntegrityChecker.errorMessageFormatHelper(CoreErrorCode.TFEM04),
                 StandardField.TITLE,
                 "$\\left($"
             )
diff --git a/src/test/java/org/jabref/logic/integrity/MonthCheckerTest.java b/src/test/java/org/jabref/logic/integrity/MonthCheckerTest.java
index d20b0043240..86064c029ff 100644
--- a/src/test/java/org/jabref/logic/integrity/MonthCheckerTest.java
+++ b/src/test/java/org/jabref/logic/integrity/MonthCheckerTest.java
@@ -66,10 +66,7 @@ void bibLaTexDoesNotAcceptThreeLetterAbbreviationsWithNoHashMarks() {
 
     @Test
     void bibLaTexDoesNotAcceptFullInput() {
-        assertNotEquals(
-            Optional.empty(),
-            checkerBiblatex.checkValue("January")
-        );
+        assertNotEquals(Optional.empty(), checkerBiblatex.checkValue("January"));
     }
 
     @Test
diff --git a/src/test/java/org/jabref/logic/integrity/NoBibTexFieldCheckerTest.java b/src/test/java/org/jabref/logic/integrity/NoBibTexFieldCheckerTest.java
index 85220b570c6..c5fb0c26c5c 100644
--- a/src/test/java/org/jabref/logic/integrity/NoBibTexFieldCheckerTest.java
+++ b/src/test/java/org/jabref/logic/integrity/NoBibTexFieldCheckerTest.java
@@ -45,11 +45,7 @@ void nonBiblatexOnlyField(Field field) {
     @CsvSource({ "AFTERWORD", "JOURNALTITLE", "LOCATION" })
     void biblatexOnlyField(StandardField field) {
         BibEntry entry = new BibEntry().withField(field, "test");
-        IntegrityMessage message = new IntegrityMessage(
-            "biblatex field only",
-            entry,
-            field
-        );
+        IntegrityMessage message = new IntegrityMessage("biblatex field only", entry, field);
         List<IntegrityMessage> messages = checker.check(entry);
         assertEquals(Collections.singletonList(message), messages);
     }
diff --git a/src/test/java/org/jabref/logic/integrity/NoteCheckerTest.java b/src/test/java/org/jabref/logic/integrity/NoteCheckerTest.java
index 2aabe0e3fd5..13adf164f51 100644
--- a/src/test/java/org/jabref/logic/integrity/NoteCheckerTest.java
+++ b/src/test/java/org/jabref/logic/integrity/NoteCheckerTest.java
@@ -41,10 +41,7 @@ void bibTexDoesNotAcceptFirstLowercaseLetter() {
 
     @Test
     void bibLaTexAcceptsNoteWithFirstCapitalLetter() {
-        assertEquals(
-            Optional.empty(),
-            checkerBiblatex.checkValue("Lorem ipsum")
-        );
+        assertEquals(Optional.empty(), checkerBiblatex.checkValue("Lorem ipsum"));
     }
 
     @Test
@@ -54,9 +51,6 @@ void bibTexAcceptsUrl() {
 
     @Test
     void bibLaTexAcceptsFirstLowercaseLetter() {
-        assertEquals(
-            Optional.empty(),
-            checkerBiblatex.checkValue("lorem ipsum")
-        );
+        assertEquals(Optional.empty(), checkerBiblatex.checkValue("lorem ipsum"));
     }
 }
diff --git a/src/test/java/org/jabref/logic/integrity/PersonNamesCheckerTest.java b/src/test/java/org/jabref/logic/integrity/PersonNamesCheckerTest.java
index f933ae41f72..980646f3478 100644
--- a/src/test/java/org/jabref/logic/integrity/PersonNamesCheckerTest.java
+++ b/src/test/java/org/jabref/logic/integrity/PersonNamesCheckerTest.java
@@ -68,11 +68,7 @@ public 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 43d5e67da47..72f39f767f4 100644
--- a/src/test/java/org/jabref/logic/integrity/TitleCheckerTest.java
+++ b/src/test/java/org/jabref/logic/integrity/TitleCheckerTest.java
@@ -31,20 +31,14 @@ public void setUp() {
         @MethodSource("validTitle")
         void titleShouldNotRaiseWarning(String message, String title) {
             assertEquals(Optional.empty(), checker.checkValue(title));
-            assertEquals(
-                Optional.empty(),
-                checker.checkValue(translatedTitle(title))
-            );
+            assertEquals(Optional.empty(), checker.checkValue(translatedTitle(title)));
         }
 
         @ParameterizedTest(name = "{index}. Title: \"{1}\" {0}")
         @MethodSource("invalidTitle")
         void titleShouldRaiseWarning(String message, String title) {
             assertNotEquals(Optional.empty(), checker.checkValue(title));
-            assertNotEquals(
-                Optional.empty(),
-                checker.checkValue(translatedTitle(title))
-            );
+            assertNotEquals(Optional.empty(), checker.checkValue(translatedTitle(title)));
         }
 
         static Stream<Arguments> validTitle() {
@@ -77,22 +71,13 @@ static Stream<Arguments> validTitle() {
                     "firstLetterAsOnlyCapitalLetterInEverySubTitleWithRandomDelimiters ",
                     "This!is!!A!Title??"
                 ),
-                Arguments.of(
-                    "bibTexAcceptsTitleWithOnlyFirstCapitalLetter ",
-                    "This is a title"
-                ),
-                Arguments.of(
-                    "bibTexRemovesCapitalLetterInsideTitle ",
-                    "This is a {T}itle"
-                ),
+                Arguments.of("bibTexAcceptsTitleWithOnlyFirstCapitalLetter ", "This is a title"),
+                Arguments.of("bibTexRemovesCapitalLetterInsideTitle ", "This is a {T}itle"),
                 Arguments.of(
                     "bibTexRemovesEverythingInBracketsAndAcceptsNoTitleInput ",
                     "{This is a Title}"
                 ),
-                Arguments.of(
-                    "bibTexRemovesEverythingInBrackets ",
-                    "This is a {Title}"
-                ),
+                Arguments.of("bibTexRemovesEverythingInBrackets ", "This is a {Title}"),
                 Arguments.of(
                     "bibTexAcceptsTitleWithLowercaseFirstLetter ",
                     "{C}urrent {C}hronicle"
@@ -122,10 +107,7 @@ static Stream<Arguments> invalidTitle() {
                     "moreThanOneCapitalLetterInSubTitleWithoutCurlyBrackets ",
                     "This!is!!A!TitlE??"
                 ),
-                Arguments.of(
-                    "bibTexDoesNotAcceptCapitalLettersInsideTitle ",
-                    "This is a Title"
-                ),
+                Arguments.of("bibTexDoesNotAcceptCapitalLettersInsideTitle ", "This is a Title"),
                 Arguments.of(
                     "bibTexDoesNotAcceptsLeadingTranslatedTitleWithOriginal ",
                     "[This is translated title] This is a title"
@@ -150,34 +132,19 @@ public void setUp() {
         @MethodSource("validTitle")
         void titleShouldNotRaiseWarning(String message, String title) {
             assertEquals(Optional.empty(), checkerBiblatex.checkValue(title));
-            assertEquals(
-                Optional.empty(),
-                checkerBiblatex.checkValue(translatedTitle(title))
-            );
+            assertEquals(Optional.empty(), checkerBiblatex.checkValue(translatedTitle(title)));
         }
 
         static Stream<Arguments> validTitle() {
             return Stream.of(
-                Arguments.of(
-                    "bibLaTexAcceptsTitleWithOnlyFirstCapitalLetter",
-                    "This is a title"
-                ),
-                Arguments.of(
-                    "bibLaTexAcceptsCapitalLettersInsideTitle",
-                    "This is a Title"
-                ),
-                Arguments.of(
-                    "bibLaTexRemovesCapitalLetterInsideTitle",
-                    "This is a {T}itle"
-                ),
+                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(
-                    "bibLaTexRemovesEverythingInBrackets",
-                    "This is a {Title}"
-                ),
+                Arguments.of("bibLaTexRemovesEverythingInBrackets", "This is a {Title}"),
                 Arguments.of(
                     "bibLaTexAcceptsTitleWithLowercaseFirstLetter",
                     "{C}urrent {C}hronicle"
diff --git a/src/test/java/org/jabref/logic/integrity/UTF8CheckerTest.java b/src/test/java/org/jabref/logic/integrity/UTF8CheckerTest.java
index e4fe61f9969..06be6e8aec9 100644
--- a/src/test/java/org/jabref/logic/integrity/UTF8CheckerTest.java
+++ b/src/test/java/org/jabref/logic/integrity/UTF8CheckerTest.java
@@ -48,11 +48,7 @@ void fieldDoesNotAcceptUmlauts() throws UnsupportedEncodingException {
         entry.setField(StandardField.MONTH, NonUTF8);
         assertEquals(
             List.of(
-                new IntegrityMessage(
-                    "Non-UTF-8 encoded field found",
-                    entry,
-                    StandardField.MONTH
-                )
+                new IntegrityMessage("Non-UTF-8 encoded field found", entry, StandardField.MONTH)
             ),
             checker.check(entry)
         );
@@ -84,10 +80,6 @@ void UTF8EncodingCheckerTest() {
             "你好，这条语句使用GBK字符集".getBytes(StandardCharsets.UTF_8),
             StandardCharsets.UTF_8
         );
-        assertTrue(
-            UTF8Checker.UTF8EncodingChecker(
-                UTF8Demo.getBytes(StandardCharsets.UTF_8)
-            )
-        );
+        assertTrue(UTF8Checker.UTF8EncodingChecker(UTF8Demo.getBytes(StandardCharsets.UTF_8)));
     }
 }
diff --git a/src/test/java/org/jabref/logic/integrity/UrlCheckerTest.java b/src/test/java/org/jabref/logic/integrity/UrlCheckerTest.java
index 62f9972061c..9531ef3504a 100644
--- a/src/test/java/org/jabref/logic/integrity/UrlCheckerTest.java
+++ b/src/test/java/org/jabref/logic/integrity/UrlCheckerTest.java
@@ -12,18 +12,12 @@ public class UrlCheckerTest {
 
     @Test
     void urlFieldAcceptsHttpAddress() {
-        assertEquals(
-            Optional.empty(),
-            checker.checkValue("http://www.google.com")
-        );
+        assertEquals(Optional.empty(), checker.checkValue("http://www.google.com"));
     }
 
     @Test
     void urlFieldAcceptsFullLocalPath() {
-        assertEquals(
-            Optional.empty(),
-            checker.checkValue("file://c:/asdf/asdf")
-        );
+        assertEquals(Optional.empty(), checker.checkValue("file://c:/asdf/asdf"));
     }
 
     @Test
diff --git a/src/test/java/org/jabref/logic/integrity/ValidCitationKeyCheckerTest.java b/src/test/java/org/jabref/logic/integrity/ValidCitationKeyCheckerTest.java
index 64d43ae0948..50af074755b 100644
--- a/src/test/java/org/jabref/logic/integrity/ValidCitationKeyCheckerTest.java
+++ b/src/test/java/org/jabref/logic/integrity/ValidCitationKeyCheckerTest.java
@@ -11,8 +11,7 @@
 
 public class ValidCitationKeyCheckerTest {
 
-    private final ValidCitationKeyChecker checker =
-        new ValidCitationKeyChecker();
+    private final ValidCitationKeyChecker checker = new ValidCitationKeyChecker();
 
     @ParameterizedTest
     @MethodSource("provideCitationKeys")
@@ -22,15 +21,9 @@ void citationKeyValidity(Optional optionalArgument, String citationKey) {
 
     private static Stream<Arguments> provideCitationKeys() {
         return Stream.of(
-            Arguments.of(
-                Optional.of(Localization.lang("empty citation key")),
-                ""
-            ),
+            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 0711ea3361e..be58c33fee9 100644
--- a/src/test/java/org/jabref/logic/integrity/YearCheckerTest.java
+++ b/src/test/java/org/jabref/logic/integrity/YearCheckerTest.java
@@ -42,10 +42,7 @@ void yearFieldRemovesBraceAndPercentageFromYear() {
 
     @Test
     void yearFieldRemovesSpecialCharactersFromYear() {
-        assertEquals(
-            Optional.empty(),
-            checker.checkValue("1986(){},.;!?<>%&$")
-        );
+        assertEquals(Optional.empty(), checker.checkValue("1986(){},.;!?<>%&$"));
     }
 
     @Test
@@ -85,10 +82,7 @@ void yearFieldDoesNotRemoveStringInsideBraceAndPercentage() {
 
     @Test
     void yearFieldDoesNotRemoveStringBeforeSpecialCharacters() {
-        assertNotEquals(
-            Optional.empty(),
-            checker.checkValue("1986a(){},.;!?<>%&$")
-        );
+        assertNotEquals(Optional.empty(), checker.checkValue("1986a(){},.;!?<>%&$"));
     }
 
     @Test
diff --git a/src/test/java/org/jabref/logic/journals/AbbreviationParserTest.java b/src/test/java/org/jabref/logic/journals/AbbreviationParserTest.java
index 8e5ed4e90e8..ecb8a52792f 100644
--- a/src/test/java/org/jabref/logic/journals/AbbreviationParserTest.java
+++ b/src/test/java/org/jabref/logic/journals/AbbreviationParserTest.java
@@ -16,11 +16,7 @@ public class AbbreviationParserTest {
     private Path csvFile;
     private final AbbreviationParser parser = new AbbreviationParser();
 
-    private final Abbreviation abbreviation = new Abbreviation(
-        "Long Name",
-        "L.N.",
-        "L.N."
-    );
+    private final Abbreviation abbreviation = new Abbreviation("Long Name", "L.N.", "L.N.");
 
     @BeforeEach
     void setup(@TempDir Path tempDir) {
@@ -31,12 +27,7 @@ void setup(@TempDir Path tempDir) {
     void testReadingFileFromCSVWithSemicolon() throws Exception {
         // String name, String abbreviation, String shortestUniqueAbbreviation
         String testAbbrev = "Long Name;L.N.;L.N.";
-        try (
-            BufferedWriter writer = Files.newBufferedWriter(
-                csvFile,
-                StandardCharsets.UTF_8
-            )
-        ) {
+        try (BufferedWriter writer = Files.newBufferedWriter(csvFile, StandardCharsets.UTF_8)) {
             writer.write(testAbbrev);
         }
         parser.readJournalListFromFile(csvFile);
@@ -46,12 +37,7 @@ void testReadingFileFromCSVWithSemicolon() throws Exception {
     @Test
     void testReadingFileFromCSVWithComma() throws Exception {
         String testAbbrev = "Long Name,L.N.,L.N.";
-        try (
-            BufferedWriter writer = Files.newBufferedWriter(
-                csvFile,
-                StandardCharsets.UTF_8
-            )
-        ) {
+        try (BufferedWriter writer = Files.newBufferedWriter(csvFile, StandardCharsets.UTF_8)) {
             writer.write(testAbbrev);
         }
         parser.readJournalListFromFile(csvFile);
diff --git a/src/test/java/org/jabref/logic/journals/AbbreviationTest.java b/src/test/java/org/jabref/logic/journals/AbbreviationTest.java
index 9318de2efe5..08154400bf7 100644
--- a/src/test/java/org/jabref/logic/journals/AbbreviationTest.java
+++ b/src/test/java/org/jabref/logic/journals/AbbreviationTest.java
@@ -19,11 +19,7 @@ void testAbbreviationsWithTrailingSpaces() {
 
     @Test
     void testAbbreviationsWithTrailingSpacesWithShortestUniqueAbbreviation() {
-        Abbreviation abbreviation = new Abbreviation(
-            "Long Name",
-            "L. N.",
-            "LN"
-        );
+        Abbreviation abbreviation = new Abbreviation("Long Name", "L. N.", "LN");
 
         assertEquals("Long Name", abbreviation.getName());
         assertEquals("L. N.", abbreviation.getAbbreviation());
@@ -38,19 +34,12 @@ void testAbbreviationsWithSemicolons() {
         assertEquals("Long Name", abbreviation.getName());
         assertEquals("L. N.;LN;M", abbreviation.getAbbreviation());
         assertEquals("L N ;LN;M", abbreviation.getDotlessAbbreviation());
-        assertEquals(
-            "L. N.;LN;M",
-            abbreviation.getShortestUniqueAbbreviation()
-        );
+        assertEquals("L. N.;LN;M", abbreviation.getShortestUniqueAbbreviation());
     }
 
     @Test
     void testAbbreviationsWithSemicolonsWithShortestUniqueAbbreviation() {
-        Abbreviation abbreviation = new Abbreviation(
-            "Long Name",
-            "L. N.;LN;M",
-            "LNLNM"
-        );
+        Abbreviation abbreviation = new Abbreviation("Long Name", "L. N.;LN;M", "LNLNM");
 
         assertEquals("Long Name", abbreviation.getName());
         assertEquals("L. N.;LN;M", abbreviation.getAbbreviation());
@@ -69,11 +58,7 @@ void testGetNextElement() {
 
     @Test
     void testGetNextElementWithShortestUniqueAbbreviation() {
-        Abbreviation abbreviation = new Abbreviation(
-            "Long Name",
-            "L. N.",
-            "LN"
-        );
+        Abbreviation abbreviation = new Abbreviation("Long Name", "L. N.", "LN");
 
         assertEquals("L. N.", abbreviation.getNext("Long Name"));
         assertEquals("L N", abbreviation.getNext("L. N."));
@@ -92,11 +77,7 @@ void testGetNextElementWithTrailingSpaces() {
 
     @Test
     void testGetNextElementWithTrailingSpacesWithShortestUniqueAbbreviation() {
-        Abbreviation abbreviation = new Abbreviation(
-            "Long Name",
-            "L. N.",
-            "LN"
-        );
+        Abbreviation abbreviation = new Abbreviation("Long Name", "L. N.", "LN");
 
         assertEquals("L. N.", abbreviation.getNext("Long Name"));
         assertEquals("L N", abbreviation.getNext("L. N."));
@@ -107,54 +88,33 @@ void testGetNextElementWithTrailingSpacesWithShortestUniqueAbbreviation() {
     @Test
     void testDefaultAndMedlineAbbreviationsAreSame() {
         Abbreviation abbreviation = new Abbreviation("Long Name", "L N");
-        assertEquals(
-            abbreviation.getAbbreviation(),
-            abbreviation.getDotlessAbbreviation()
-        );
+        assertEquals(abbreviation.getAbbreviation(), abbreviation.getDotlessAbbreviation());
     }
 
     @Test
     void testDefaultAndMedlineAbbreviationsAreSameWithShortestUniqueAbbreviation() {
         Abbreviation abbreviation = new Abbreviation("Long Name", "L N", "LN");
-        assertEquals(
-            abbreviation.getAbbreviation(),
-            abbreviation.getDotlessAbbreviation()
-        );
+        assertEquals(abbreviation.getAbbreviation(), abbreviation.getDotlessAbbreviation());
     }
 
     @Test
     void testDefaultAndShortestUniqueAbbreviationsAreSame() {
         Abbreviation abbreviation = new Abbreviation("Long Name", "L N");
-        assertEquals(
-            abbreviation.getAbbreviation(),
-            abbreviation.getShortestUniqueAbbreviation()
-        );
+        assertEquals(abbreviation.getAbbreviation(), abbreviation.getShortestUniqueAbbreviation());
     }
 
     @Test
     void testEquals() {
         Abbreviation abbreviation = new Abbreviation("Long Name", "L N", "LN");
-        Abbreviation otherAbbreviation = new Abbreviation(
-            "Long Name",
-            "L N",
-            "LN"
-        );
+        Abbreviation otherAbbreviation = new Abbreviation("Long Name", "L N", "LN");
         assertEquals(abbreviation, otherAbbreviation);
         assertNotEquals(abbreviation, "String");
     }
 
     @Test
     void equalAbbrevationsWithFourComponentsAreAlsoCompareZero() {
-        Abbreviation abbreviation1 = new Abbreviation(
-            "Long Name",
-            "L. N.",
-            "LN"
-        );
-        Abbreviation abbreviation2 = new Abbreviation(
-            "Long Name",
-            "L. N.",
-            "LN"
-        );
+        Abbreviation abbreviation1 = new Abbreviation("Long Name", "L. N.", "LN");
+        Abbreviation abbreviation2 = new Abbreviation("Long Name", "L. N.", "LN");
         assertEquals(0, abbreviation1.compareTo(abbreviation2));
     }
 }
diff --git a/src/test/java/org/jabref/logic/journals/AbbreviationWriterTest.java b/src/test/java/org/jabref/logic/journals/AbbreviationWriterTest.java
index 0887758a2e2..0b62c3de80b 100644
--- a/src/test/java/org/jabref/logic/journals/AbbreviationWriterTest.java
+++ b/src/test/java/org/jabref/logic/journals/AbbreviationWriterTest.java
@@ -14,8 +14,7 @@
 class AbbreviationWriterTest {
 
     @Test
-    void shortestUniqueAbbreviationWrittenIfItDiffers(@TempDir Path tempDir)
-        throws Exception {
+    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));
@@ -23,9 +22,8 @@ void shortestUniqueAbbreviationWrittenIfItDiffers(@TempDir Path tempDir)
     }
 
     @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));
diff --git a/src/test/java/org/jabref/logic/journals/AbbreviationsTest.java b/src/test/java/org/jabref/logic/journals/AbbreviationsTest.java
index abade182bcb..0b83056f6db 100644
--- a/src/test/java/org/jabref/logic/journals/AbbreviationsTest.java
+++ b/src/test/java/org/jabref/logic/journals/AbbreviationsTest.java
@@ -16,17 +16,11 @@ void setUp() {
 
     @Test
     void getNextAbbreviationAbbreviatesJournalTitle() {
-        assertEquals(
-            "2D Mater.",
-            repository.getNextAbbreviation("2D Materials").get()
-        );
+        assertEquals("2D Mater.", repository.getNextAbbreviation("2D Materials").get());
     }
 
     @Test
     void getNextAbbreviationConvertsAbbreviationToDotlessAbbreviation() {
-        assertEquals(
-            "2D Mater",
-            repository.getNextAbbreviation("2D Mater.").get()
-        );
+        assertEquals("2D Mater", repository.getNextAbbreviation("2D Mater.").get());
     }
 }
diff --git a/src/test/java/org/jabref/logic/journals/JournalAbbreviationRepositoryTest.java b/src/test/java/org/jabref/logic/journals/JournalAbbreviationRepositoryTest.java
index 96438ea59d1..3b26a108cf3 100644
--- a/src/test/java/org/jabref/logic/journals/JournalAbbreviationRepositoryTest.java
+++ b/src/test/java/org/jabref/logic/journals/JournalAbbreviationRepositoryTest.java
@@ -41,50 +41,25 @@ void empty() {
 
     @Test
     void oneElement() {
-        repository.addCustomAbbreviation(
-            new Abbreviation("Long Name", "L. N.")
-        );
+        repository.addCustomAbbreviation(new Abbreviation("Long Name", "L. N."));
         assertEquals(1, repository.getCustomAbbreviations().size());
 
-        assertEquals(
-            "L. N.",
-            repository.getDefaultAbbreviation("Long Name").orElse("WRONG")
-        );
-        assertEquals(
-            "UNKNOWN",
-            repository.getDefaultAbbreviation("?").orElse("UNKNOWN")
-        );
+        assertEquals("L. N.", repository.getDefaultAbbreviation("Long Name").orElse("WRONG"));
+        assertEquals("UNKNOWN", repository.getDefaultAbbreviation("?").orElse("UNKNOWN"));
 
         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(
-            "UNKNOWN",
-            repository.getShortestUniqueAbbreviation("?").orElse("UNKNOWN")
+            repository.getShortestUniqueAbbreviation("Long Name").orElse("WRONG")
         );
+        assertEquals("UNKNOWN", repository.getShortestUniqueAbbreviation("?").orElse("UNKNOWN"));
 
-        assertEquals(
-            "L. N.",
-            repository.getNextAbbreviation("Long Name").orElse("WRONG")
-        );
-        assertEquals(
-            "L N",
-            repository.getNextAbbreviation("L. N.").orElse("WRONG")
-        );
-        assertEquals(
-            "Long Name",
-            repository.getNextAbbreviation("L N").orElse("WRONG")
-        );
-        assertEquals(
-            "UNKNOWN",
-            repository.getNextAbbreviation("?").orElse("UNKNOWN")
-        );
+        assertEquals("L. N.", repository.getNextAbbreviation("Long Name").orElse("WRONG"));
+        assertEquals("L N", repository.getNextAbbreviation("L. N.").orElse("WRONG"));
+        assertEquals("Long Name", repository.getNextAbbreviation("L N").orElse("WRONG"));
+        assertEquals("UNKNOWN", repository.getNextAbbreviation("?").orElse("UNKNOWN"));
 
         assertTrue(repository.isKnownName("Long Name"));
         assertTrue(repository.isKnownName("L. N."));
@@ -94,54 +69,23 @@ void oneElement() {
 
     @Test
     void oneElementWithShortestUniqueAbbreviation() {
-        repository.addCustomAbbreviation(
-            new Abbreviation("Long Name", "L. N.", "LN")
-        );
+        repository.addCustomAbbreviation(new Abbreviation("Long Name", "L. N.", "LN"));
         assertEquals(1, repository.getCustomAbbreviations().size());
 
-        assertEquals(
-            "L. N.",
-            repository.getDefaultAbbreviation("Long Name").orElse("WRONG")
-        );
-        assertEquals(
-            "UNKNOWN",
-            repository.getDefaultAbbreviation("?").orElse("UNKNOWN")
-        );
+        assertEquals("L. N.", repository.getDefaultAbbreviation("Long Name").orElse("WRONG"));
+        assertEquals("UNKNOWN", repository.getDefaultAbbreviation("?").orElse("UNKNOWN"));
 
         assertEquals("L N", repository.getDotless("Long Name").orElse("WRONG"));
         assertEquals("UNKNOWN", repository.getDotless("?").orElse("UNKNOWN"));
 
-        assertEquals(
-            "LN",
-            repository
-                .getShortestUniqueAbbreviation("Long Name")
-                .orElse("WRONG")
-        );
-        assertEquals(
-            "UNKNOWN",
-            repository.getShortestUniqueAbbreviation("?").orElse("UNKNOWN")
-        );
+        assertEquals("LN", repository.getShortestUniqueAbbreviation("Long Name").orElse("WRONG"));
+        assertEquals("UNKNOWN", repository.getShortestUniqueAbbreviation("?").orElse("UNKNOWN"));
 
-        assertEquals(
-            "L. N.",
-            repository.getNextAbbreviation("Long Name").orElse("WRONG")
-        );
-        assertEquals(
-            "L N",
-            repository.getNextAbbreviation("L. N.").orElse("WRONG")
-        );
-        assertEquals(
-            "LN",
-            repository.getNextAbbreviation("L N").orElse("WRONG")
-        );
-        assertEquals(
-            "Long Name",
-            repository.getNextAbbreviation("LN").orElse("WRONG")
-        );
-        assertEquals(
-            "UNKNOWN",
-            repository.getNextAbbreviation("?").orElse("UNKNOWN")
-        );
+        assertEquals("L. N.", repository.getNextAbbreviation("Long Name").orElse("WRONG"));
+        assertEquals("L N", repository.getNextAbbreviation("L. N.").orElse("WRONG"));
+        assertEquals("LN", repository.getNextAbbreviation("L N").orElse("WRONG"));
+        assertEquals("Long Name", repository.getNextAbbreviation("LN").orElse("WRONG"));
+        assertEquals("UNKNOWN", repository.getNextAbbreviation("?").orElse("UNKNOWN"));
 
         assertTrue(repository.isKnownName("Long Name"));
         assertTrue(repository.isKnownName("L. N."));
@@ -152,45 +96,29 @@ void oneElementWithShortestUniqueAbbreviation() {
 
     @Test
     void testDuplicates() {
-        repository.addCustomAbbreviation(
-            new Abbreviation("Long Name", "L. N.")
-        );
-        repository.addCustomAbbreviation(
-            new Abbreviation("Long Name", "L. N.")
-        );
+        repository.addCustomAbbreviation(new Abbreviation("Long Name", "L. N."));
+        repository.addCustomAbbreviation(new Abbreviation("Long Name", "L. N."));
         assertEquals(1, repository.getCustomAbbreviations().size());
     }
 
     @Test
     void testDuplicatesWithShortestUniqueAbbreviation() {
-        repository.addCustomAbbreviation(
-            new Abbreviation("Long Name", "L. N.", "LN")
-        );
-        repository.addCustomAbbreviation(
-            new Abbreviation("Long Name", "L. N.", "LN")
-        );
+        repository.addCustomAbbreviation(new Abbreviation("Long Name", "L. N.", "LN"));
+        repository.addCustomAbbreviation(new Abbreviation("Long Name", "L. N.", "LN"));
         assertEquals(1, repository.getCustomAbbreviations().size());
     }
 
     @Test
     void testDuplicatesIsoOnly() {
-        repository.addCustomAbbreviation(
-            new Abbreviation("Old Long Name", "L. N.")
-        );
-        repository.addCustomAbbreviation(
-            new Abbreviation("New Long Name", "L. N.")
-        );
+        repository.addCustomAbbreviation(new Abbreviation("Old Long Name", "L. N."));
+        repository.addCustomAbbreviation(new Abbreviation("New Long Name", "L. N."));
         assertEquals(2, repository.getCustomAbbreviations().size());
     }
 
     @Test
     void testDuplicatesIsoOnlyWithShortestUniqueAbbreviation() {
-        repository.addCustomAbbreviation(
-            new Abbreviation("Old Long Name", "L. N.", "LN")
-        );
-        repository.addCustomAbbreviation(
-            new Abbreviation("New Long Name", "L. N.", "LN")
-        );
+        repository.addCustomAbbreviation(new Abbreviation("Old Long Name", "L. N.", "LN"));
+        repository.addCustomAbbreviation(new Abbreviation("New Long Name", "L. N.", "LN"));
         assertEquals(2, repository.getCustomAbbreviations().size());
     }
 
@@ -198,85 +126,40 @@ void testDuplicatesIsoOnlyWithShortestUniqueAbbreviation() {
     void testDuplicateKeys() {
         Abbreviation abbreviationOne = new Abbreviation("Long Name", "L. N.");
         repository.addCustomAbbreviation(abbreviationOne);
-        assertEquals(
-            Set.of(abbreviationOne),
-            repository.getCustomAbbreviations()
-        );
-        assertEquals(
-            "L. N.",
-            repository.getDefaultAbbreviation("Long Name").orElse("WRONG")
-        );
+        assertEquals(Set.of(abbreviationOne), repository.getCustomAbbreviations());
+        assertEquals("L. N.", repository.getDefaultAbbreviation("Long Name").orElse("WRONG"));
 
         Abbreviation abbreviationTwo = new Abbreviation("Long Name", "LA. N.");
         repository.addCustomAbbreviation(abbreviationTwo);
-        assertEquals(
-            Set.of(abbreviationOne, abbreviationTwo),
-            repository.getCustomAbbreviations()
-        );
+        assertEquals(Set.of(abbreviationOne, abbreviationTwo), repository.getCustomAbbreviations());
 
         // Both abbreviations are kept in the repository
         // "L. N." is smaller than "LA. N.", therefore "L. N." is returned
-        assertEquals(
-            "L. N.",
-            repository.getDefaultAbbreviation("Long Name").orElse("WRONG")
-        );
+        assertEquals("L. N.", repository.getDefaultAbbreviation("Long Name").orElse("WRONG"));
     }
 
     @Test
     void testDuplicateKeysWithShortestUniqueAbbreviation() {
-        Abbreviation abbreviationOne = new Abbreviation(
-            "Long Name",
-            "L. N.",
-            "LN"
-        );
+        Abbreviation abbreviationOne = new Abbreviation("Long Name", "L. N.", "LN");
         repository.addCustomAbbreviation(abbreviationOne);
-        assertEquals(
-            Set.of(abbreviationOne),
-            repository.getCustomAbbreviations()
-        );
-        assertEquals(
-            "L. N.",
-            repository.getDefaultAbbreviation("Long Name").orElse("WRONG")
-        );
-        assertEquals(
-            "LN",
-            repository
-                .getShortestUniqueAbbreviation("Long Name")
-                .orElse("WRONG")
-        );
+        assertEquals(Set.of(abbreviationOne), repository.getCustomAbbreviations());
+        assertEquals("L. N.", repository.getDefaultAbbreviation("Long Name").orElse("WRONG"));
+        assertEquals("LN", repository.getShortestUniqueAbbreviation("Long Name").orElse("WRONG"));
 
-        Abbreviation abbreviationTwo = new Abbreviation(
-            "Long Name",
-            "LA. N.",
-            "LAN"
-        );
+        Abbreviation abbreviationTwo = new Abbreviation("Long Name", "LA. N.", "LAN");
         repository.addCustomAbbreviation(abbreviationTwo);
-        assertEquals(
-            Set.of(abbreviationOne, abbreviationTwo),
-            repository.getCustomAbbreviations()
-        );
+        assertEquals(Set.of(abbreviationOne, abbreviationTwo), repository.getCustomAbbreviations());
 
         // Both abbreviations are kept in the repository
         // "L. N." is smaller than "LA. N.", therefore "L. N." is returned
-        assertEquals(
-            "L. N.",
-            repository.getDefaultAbbreviation("Long Name").orElse("WRONG")
-        );
-        assertEquals(
-            "LN",
-            repository
-                .getShortestUniqueAbbreviation("Long Name")
-                .orElse("WRONG")
-        );
+        assertEquals("L. N.", repository.getDefaultAbbreviation("Long Name").orElse("WRONG"));
+        assertEquals("LN", repository.getShortestUniqueAbbreviation("Long Name").orElse("WRONG"));
     }
 
     @Test
     void getFromFullName() {
         assertEquals(
-            new Abbreviation(
-                "American Journal of Public Health",
-                "Am. J. Public Health"
-            ),
+            new Abbreviation("American Journal of Public Health", "Am. J. Public Health"),
             repository.get("American Journal of Public Health").get()
         );
     }
@@ -284,10 +167,7 @@ void getFromFullName() {
     @Test
     void getFromAbbreviatedName() {
         assertEquals(
-            new Abbreviation(
-                "American Journal of Public Health",
-                "Am. J. Public Health"
-            ),
+            new Abbreviation("American Journal of Public Health", "Am. J. Public Health"),
             repository.get("Am. J. Public Health").get()
         );
     }
@@ -295,37 +175,23 @@ void getFromAbbreviatedName() {
     @Test
     void testAbbreviationsWithEscapedAmpersand() {
         assertEquals(
-            new Abbreviation(
-                "ACS Applied Materials & Interfaces",
-                "ACS Appl. Mater. Interfaces"
-            ),
+            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"
-            ),
+            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."
-            ),
+            new Abbreviation("Antioxidants & Redox Signaling", "Antioxid. Redox Sign."),
             repository.get("Antioxidants & Redox Signaling").get()
         );
         assertEquals(
-            new Abbreviation(
-                "Antioxidants & Redox Signaling",
-                "Antioxid. Redox Sign."
-            ),
+            new Abbreviation("Antioxidants & Redox Signaling", "Antioxid. Redox Sign."),
             repository.get("Antioxidants \\& Redox Signaling").get()
         );
 
-        repository.addCustomAbbreviation(
-            new Abbreviation("Long & Name", "L. N.", "LN")
-        );
+        repository.addCustomAbbreviation(new Abbreviation("Long & Name", "L. N.", "LN"));
         assertEquals(
             new Abbreviation("Long & Name", "L. N.", "LN"),
             repository.get("Long & Name").get()
@@ -344,9 +210,7 @@ void testJournalAbbreviationWithEscapedAmpersand() {
             false
         );
 
-        BibEntry entryWithEscapedAmpersandInJournal = new BibEntry(
-            StandardEntryType.Article
-        );
+        BibEntry entryWithEscapedAmpersandInJournal = new BibEntry(StandardEntryType.Article);
         entryWithEscapedAmpersandInJournal.setField(
             StandardField.JOURNAL,
             "ACS Applied Materials \\& Interfaces"
@@ -358,25 +222,15 @@ void testJournalAbbreviationWithEscapedAmpersand() {
             StandardField.JOURNAL,
             new CompoundEdit()
         );
-        BibEntry expectedAbbreviatedJournalEntry = new BibEntry(
-            StandardEntryType.Article
-        )
+        BibEntry expectedAbbreviatedJournalEntry = new BibEntry(StandardEntryType.Article)
             .withField(StandardField.JOURNAL, "ACS Appl. Mater. Interfaces");
-        assertEquals(
-            expectedAbbreviatedJournalEntry,
-            entryWithEscapedAmpersandInJournal
-        );
+        assertEquals(expectedAbbreviatedJournalEntry, entryWithEscapedAmpersandInJournal);
     }
 
     @Test
     void testJournalUnabbreviate() {
-        BibEntry abbreviatedJournalEntry = new BibEntry(
-            StandardEntryType.Article
-        );
-        abbreviatedJournalEntry.setField(
-            StandardField.JOURNAL,
-            "ACS Appl. Mater. Interfaces"
-        );
+        BibEntry abbreviatedJournalEntry = new BibEntry(StandardEntryType.Article);
+        abbreviatedJournalEntry.setField(StandardField.JOURNAL, "ACS Appl. Mater. Interfaces");
 
         undoableUnabbreviator.unabbreviate(
             bibDatabase,
@@ -384,13 +238,8 @@ void testJournalUnabbreviate() {
             StandardField.JOURNAL,
             new CompoundEdit()
         );
-        BibEntry expectedAbbreviatedJournalEntry = new BibEntry(
-            StandardEntryType.Article
-        )
-            .withField(
-                StandardField.JOURNAL,
-                "ACS Applied Materials & Interfaces"
-            );
+        BibEntry expectedAbbreviatedJournalEntry = new BibEntry(StandardEntryType.Article)
+            .withField(StandardField.JOURNAL, "ACS Applied Materials & Interfaces");
         assertEquals(expectedAbbreviatedJournalEntry, abbreviatedJournalEntry);
     }
 
@@ -402,13 +251,8 @@ void testJournalAbbreviateWithoutEscapedAmpersand() {
             false
         );
 
-        BibEntry entryWithoutEscapedAmpersandInJournal = new BibEntry(
-            StandardEntryType.Article
-        )
-            .withField(
-                StandardField.JOURNAL,
-                "ACS Applied Materials & Interfaces"
-            );
+        BibEntry entryWithoutEscapedAmpersandInJournal = new BibEntry(StandardEntryType.Article)
+            .withField(StandardField.JOURNAL, "ACS Applied Materials & Interfaces");
 
         undoableAbbreviator.abbreviate(
             bibDatabase,
@@ -416,14 +260,9 @@ void testJournalAbbreviateWithoutEscapedAmpersand() {
             StandardField.JOURNAL,
             new CompoundEdit()
         );
-        BibEntry expectedAbbreviatedJournalEntry = new BibEntry(
-            StandardEntryType.Article
-        )
+        BibEntry expectedAbbreviatedJournalEntry = new BibEntry(StandardEntryType.Article)
             .withField(StandardField.JOURNAL, "ACS Appl. Mater. Interfaces");
-        assertEquals(
-            expectedAbbreviatedJournalEntry,
-            entryWithoutEscapedAmpersandInJournal
-        );
+        assertEquals(expectedAbbreviatedJournalEntry, entryWithoutEscapedAmpersandInJournal);
     }
 
     @Test
@@ -434,13 +273,8 @@ void testJournalAbbreviateWithEmptyFJournal() {
             true
         );
 
-        BibEntry entryWithoutEscapedAmpersandInJournal = new BibEntry(
-            StandardEntryType.Article
-        )
-            .withField(
-                StandardField.JOURNAL,
-                "ACS Applied Materials & Interfaces"
-            )
+        BibEntry entryWithoutEscapedAmpersandInJournal = new BibEntry(StandardEntryType.Article)
+            .withField(StandardField.JOURNAL, "ACS Applied Materials & Interfaces")
             .withField(AMSField.FJOURNAL, "&nbsp;");
 
         undoableAbbreviator.abbreviate(
@@ -449,22 +283,15 @@ void testJournalAbbreviateWithEmptyFJournal() {
             StandardField.JOURNAL,
             new CompoundEdit()
         );
-        BibEntry expectedAbbreviatedJournalEntry = new BibEntry(
-            StandardEntryType.Article
-        )
+        BibEntry expectedAbbreviatedJournalEntry = new BibEntry(StandardEntryType.Article)
             .withField(StandardField.JOURNAL, "ACS Appl. Mater. Interfaces")
             .withField(AMSField.FJOURNAL, "ACS Applied Materials & Interfaces");
-        assertEquals(
-            expectedAbbreviatedJournalEntry,
-            entryWithoutEscapedAmpersandInJournal
-        );
+        assertEquals(expectedAbbreviatedJournalEntry, entryWithoutEscapedAmpersandInJournal);
     }
 
     @Test
     void testUnabbreviateWithJournalExistsAndFJournalNot() {
-        BibEntry abbreviatedJournalEntry = new BibEntry(
-            StandardEntryType.Article
-        )
+        BibEntry abbreviatedJournalEntry = new BibEntry(StandardEntryType.Article)
             .withField(StandardField.JOURNAL, "ACS Appl. Mater. Interfaces");
 
         undoableUnabbreviator.unabbreviate(
@@ -473,21 +300,14 @@ void testUnabbreviateWithJournalExistsAndFJournalNot() {
             StandardField.JOURNAL,
             new CompoundEdit()
         );
-        BibEntry expectedAbbreviatedJournalEntry = new BibEntry(
-            StandardEntryType.Article
-        )
-            .withField(
-                StandardField.JOURNAL,
-                "ACS Applied Materials & Interfaces"
-            );
+        BibEntry expectedAbbreviatedJournalEntry = new BibEntry(StandardEntryType.Article)
+            .withField(StandardField.JOURNAL, "ACS Applied Materials & Interfaces");
         assertEquals(expectedAbbreviatedJournalEntry, abbreviatedJournalEntry);
     }
 
     @Test
     void testUnabbreviateWithJournalExistsAndFJournalExists() {
-        BibEntry abbreviatedJournalEntry = new BibEntry(
-            StandardEntryType.Article
-        )
+        BibEntry abbreviatedJournalEntry = new BibEntry(StandardEntryType.Article)
             .withField(StandardField.JOURNAL, "ACS Appl. Mater. Interfaces")
             .withField(AMSField.FJOURNAL, "ACS Applied Materials & Interfaces");
 
@@ -497,21 +317,14 @@ void testUnabbreviateWithJournalExistsAndFJournalExists() {
             StandardField.JOURNAL,
             new CompoundEdit()
         );
-        BibEntry expectedAbbreviatedJournalEntry = new BibEntry(
-            StandardEntryType.Article
-        )
-            .withField(
-                StandardField.JOURNAL,
-                "ACS Applied Materials & Interfaces"
-            );
+        BibEntry expectedAbbreviatedJournalEntry = new BibEntry(StandardEntryType.Article)
+            .withField(StandardField.JOURNAL, "ACS Applied Materials & Interfaces");
         assertEquals(expectedAbbreviatedJournalEntry, abbreviatedJournalEntry);
     }
 
     @Test
     void testJournalDotlessAbbreviation() {
-        BibEntry abbreviatedJournalEntry = new BibEntry(
-            StandardEntryType.Article
-        )
+        BibEntry abbreviatedJournalEntry = new BibEntry(StandardEntryType.Article)
             .withField(StandardField.JOURNAL, "ACS Appl Mater Interfaces");
 
         undoableUnabbreviator.unabbreviate(
@@ -520,21 +333,14 @@ void testJournalDotlessAbbreviation() {
             StandardField.JOURNAL,
             new CompoundEdit()
         );
-        BibEntry expectedAbbreviatedJournalEntry = new BibEntry(
-            StandardEntryType.Article
-        )
-            .withField(
-                StandardField.JOURNAL,
-                "ACS Applied Materials & Interfaces"
-            );
+        BibEntry expectedAbbreviatedJournalEntry = new BibEntry(StandardEntryType.Article)
+            .withField(StandardField.JOURNAL, "ACS Applied Materials & Interfaces");
         assertEquals(expectedAbbreviatedJournalEntry, abbreviatedJournalEntry);
     }
 
     @Test
     void testJournalDotlessAbbreviationWithCurlyBraces() {
-        BibEntry abbreviatedJournalEntry = new BibEntry(
-            StandardEntryType.Article
-        )
+        BibEntry abbreviatedJournalEntry = new BibEntry(StandardEntryType.Article)
             .withField(StandardField.JOURNAL, "{ACS Appl Mater Interfaces}");
 
         undoableUnabbreviator.unabbreviate(
@@ -543,13 +349,8 @@ void testJournalDotlessAbbreviationWithCurlyBraces() {
             StandardField.JOURNAL,
             new CompoundEdit()
         );
-        BibEntry expectedAbbreviatedJournalEntry = new BibEntry(
-            StandardEntryType.Article
-        )
-            .withField(
-                StandardField.JOURNAL,
-                "ACS Applied Materials & Interfaces"
-            );
+        BibEntry expectedAbbreviatedJournalEntry = new BibEntry(StandardEntryType.Article)
+            .withField(StandardField.JOURNAL, "ACS Applied Materials & Interfaces");
         assertEquals(expectedAbbreviatedJournalEntry, abbreviatedJournalEntry);
     }
 
@@ -558,9 +359,7 @@ void testJournalDotlessAbbreviationWithCurlyBraces() {
      */
     @Test
     void testTitleEmbeddedWithCurlyBracesHavingNoChangesKeepsBraces() {
-        BibEntry abbreviatedJournalEntry = new BibEntry(
-            StandardEntryType.InCollection
-        )
+        BibEntry abbreviatedJournalEntry = new BibEntry(StandardEntryType.InCollection)
             .withField(StandardField.JOURNAL, "{The Visualization Handbook}");
 
         undoableUnabbreviator.unabbreviate(
@@ -570,9 +369,7 @@ void testTitleEmbeddedWithCurlyBracesHavingNoChangesKeepsBraces() {
             new CompoundEdit()
         );
 
-        BibEntry expectedAbbreviatedJournalEntry = new BibEntry(
-            StandardEntryType.InCollection
-        )
+        BibEntry expectedAbbreviatedJournalEntry = new BibEntry(StandardEntryType.InCollection)
             .withField(StandardField.JOURNAL, "{The Visualization Handbook}");
         assertEquals(expectedAbbreviatedJournalEntry, abbreviatedJournalEntry);
     }
@@ -582,9 +379,7 @@ void testTitleEmbeddedWithCurlyBracesHavingNoChangesKeepsBraces() {
      */
     @Test
     void testTitleWithNestedCurlyBracesHavingNoChangesKeepsBraces() {
-        BibEntry abbreviatedJournalEntry = new BibEntry(
-            StandardEntryType.InProceedings
-        )
+        BibEntry abbreviatedJournalEntry = new BibEntry(StandardEntryType.InProceedings)
             .withField(
                 StandardField.BOOKTITLE,
                 "2015 {IEEE} International Conference on Digital Signal Processing, {DSP} 2015, Singapore, July 21-24, 2015"
@@ -597,9 +392,7 @@ void testTitleWithNestedCurlyBracesHavingNoChangesKeepsBraces() {
             new CompoundEdit()
         );
 
-        BibEntry expectedAbbreviatedJournalEntry = new BibEntry(
-            StandardEntryType.InProceedings
-        )
+        BibEntry expectedAbbreviatedJournalEntry = new BibEntry(StandardEntryType.InProceedings)
             .withField(
                 StandardField.BOOKTITLE,
                 "2015 {IEEE} International Conference on Digital Signal Processing, {DSP} 2015, Singapore, July 21-24, 2015"
@@ -609,9 +402,7 @@ void testTitleWithNestedCurlyBracesHavingNoChangesKeepsBraces() {
 
     @Test
     void testDotlessForPhysRevB() {
-        BibEntry abbreviatedJournalEntry = new BibEntry(
-            StandardEntryType.Article
-        )
+        BibEntry abbreviatedJournalEntry = new BibEntry(StandardEntryType.Article)
             .withField(StandardField.JOURNAL, "Phys Rev B");
 
         undoableUnabbreviator.unabbreviate(
@@ -621,9 +412,7 @@ void testDotlessForPhysRevB() {
             new CompoundEdit()
         );
 
-        BibEntry expectedAbbreviatedJournalEntry = new BibEntry(
-            StandardEntryType.Article
-        )
+        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 e6ba76c0421..9409eef0cc5 100644
--- a/src/test/java/org/jabref/logic/journals/JournalInformationFetcherTest.java
+++ b/src/test/java/org/jabref/logic/journals/JournalInformationFetcherTest.java
@@ -14,231 +14,229 @@
 @FetcherTest
 class JournalInformationFetcherTest {
 
-    private final JournalInformationFetcher fetcher =
-        new JournalInformationFetcher();
+    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
     public void getsName() {
@@ -270,8 +268,7 @@ public void sameEntryReturnedFromISSNOrName() throws FetcherException {
     }
 
     @Test
-    public void getsJournalInfoValidISSNWithoutHyphen()
-        throws FetcherException {
+    public void getsJournalInfoValidISSNWithoutHyphen() throws FetcherException {
         assertEquals(
             Optional.of(journalInformation),
             fetcher.getJournalInformation("15454509", "")
@@ -296,41 +293,26 @@ public void getJournalInfoExtraSpaceISSN() {
 
     @Test
     public void getJournalInfoEmptyISSN() {
-        assertThrows(
-            FetcherException.class,
-            () -> fetcher.getJournalInformation("", "")
-        );
+        assertThrows(FetcherException.class, () -> fetcher.getJournalInformation("", ""));
     }
 
     @Test
     public void getJournalInfoInvalidISSN() {
-        assertThrows(
-            FetcherException.class,
-            () -> fetcher.getJournalInformation("123-123", "")
-        );
+        assertThrows(FetcherException.class, () -> fetcher.getJournalInformation("123-123", ""));
     }
 
     @Test
     public void getJournalInfoInvalidISSNAndNoName() {
-        assertThrows(
-            FetcherException.class,
-            () -> fetcher.getJournalInformation("123-123", "")
-        );
+        assertThrows(FetcherException.class, () -> fetcher.getJournalInformation("123-123", ""));
     }
 
     @Test
     public void getJournalInfoNoISSNAndNoName() {
-        assertThrows(
-            FetcherException.class,
-            () -> fetcher.getJournalInformation("", "")
-        );
+        assertThrows(FetcherException.class, () -> fetcher.getJournalInformation("", ""));
     }
 
     @Test
     public void getJournalInfoNoISSNAndInvalidName() {
-        assertThrows(
-            FetcherException.class,
-            () -> fetcher.getJournalInformation("", "zzz")
-        );
+        assertThrows(FetcherException.class, () -> fetcher.getJournalInformation("", "zzz"));
     }
 }
diff --git a/src/test/java/org/jabref/logic/l10n/JavaLocalizationEntryParser.java b/src/test/java/org/jabref/logic/l10n/JavaLocalizationEntryParser.java
index dd482ece2c8..d13308138d2 100644
--- a/src/test/java/org/jabref/logic/l10n/JavaLocalizationEntryParser.java
+++ b/src/test/java/org/jabref/logic/l10n/JavaLocalizationEntryParser.java
@@ -19,24 +19,19 @@ class JavaLocalizationEntryParser {
         "\\("
     );
 
-    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 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
-    );
+    private static final Pattern QUOTATION_SYMBOL_PATTERN = Pattern.compile(QUOTATION_PLACEHOLDER);
 
     public static List<String> getLanguageKeysInString(
         String content,
diff --git a/src/test/java/org/jabref/logic/l10n/JavaLocalizationEntryParserTest.java b/src/test/java/org/jabref/logic/l10n/JavaLocalizationEntryParserTest.java
index 3f8f0480d8e..2b5b12072f5 100644
--- a/src/test/java/org/jabref/logic/l10n/JavaLocalizationEntryParserTest.java
+++ b/src/test/java/org/jabref/logic/l10n/JavaLocalizationEntryParserTest.java
@@ -23,22 +23,13 @@ public static Stream<Arguments> singleLineChecks() {
             // " is kept unescaped
             Arguments.of("Localization.lang(\"\\\"Hey\\\"\")", "\"Hey\""),
             // \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(\"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(\"Search %0\", \"Springer\")",
-                "Search %0"
-            ),
+            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')"
@@ -73,18 +64,9 @@ public static Stream<Arguments> multiLineChecks() {
 
     public static Stream<Arguments> singleLineParameterChecks() {
         return Stream.of(
-            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(\"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\""
@@ -102,38 +84,27 @@ public static Stream<String> causesRuntimeExceptions() {
 
     @ParameterizedTest
     @MethodSource("singleLineChecks")
-    public void testLocalizationKeyParsing(
-        String code,
-        String expectedLanguageKeys
-    ) {
+    public void testLocalizationKeyParsing(String code, String expectedLanguageKeys) {
         testLocalizationKeyParsing(code, List.of(expectedLanguageKeys));
     }
 
     @ParameterizedTest
     @MethodSource("multiLineChecks")
-    public void testLocalizationKeyParsing(
-        String code,
-        List<String> expectedLanguageKeys
-    ) {
-        List<String> languageKeysInString =
-            JavaLocalizationEntryParser.getLanguageKeysInString(
-                code,
-                LocalizationBundleForTest.LANG
-            );
+    public void testLocalizationKeyParsing(String code, List<String> expectedLanguageKeys) {
+        List<String> languageKeysInString = JavaLocalizationEntryParser.getLanguageKeysInString(
+            code,
+            LocalizationBundleForTest.LANG
+        );
         assertEquals(expectedLanguageKeys, languageKeysInString);
     }
 
     @ParameterizedTest
     @MethodSource("singleLineParameterChecks")
-    public void testLocalizationParameterParsing(
-        String code,
-        String expectedParameter
-    ) {
-        List<String> languageKeysInString =
-            JavaLocalizationEntryParser.getLocalizationParameter(
-                code,
-                LocalizationBundleForTest.LANG
-            );
+    public void testLocalizationParameterParsing(String code, String expectedParameter) {
+        List<String> languageKeysInString = JavaLocalizationEntryParser.getLocalizationParameter(
+            code,
+            LocalizationBundleForTest.LANG
+        );
         assertEquals(List.of(expectedParameter), languageKeysInString);
     }
 
diff --git a/src/test/java/org/jabref/logic/l10n/LanguageTest.java b/src/test/java/org/jabref/logic/l10n/LanguageTest.java
index 1f3fc51190b..4546bf93bae 100644
--- a/src/test/java/org/jabref/logic/l10n/LanguageTest.java
+++ b/src/test/java/org/jabref/logic/l10n/LanguageTest.java
@@ -28,9 +28,6 @@ void convertKnownLanguageAndCountryCorrect() {
 
     @Test
     void convertToKnownLocaleNull() {
-        assertThrows(
-            NullPointerException.class,
-            () -> Language.convertToSupportedLocale(null)
-        );
+        assertThrows(NullPointerException.class, () -> Language.convertToSupportedLocale(null));
     }
 }
diff --git a/src/test/java/org/jabref/logic/l10n/LocalizationConsistencyTest.java b/src/test/java/org/jabref/logic/l10n/LocalizationConsistencyTest.java
index 3e5ae5802ac..add89d19b16 100644
--- a/src/test/java/org/jabref/logic/l10n/LocalizationConsistencyTest.java
+++ b/src/test/java/org/jabref/logic/l10n/LocalizationConsistencyTest.java
@@ -38,9 +38,7 @@ class LocalizationConsistencyTest {
     void allFilesMustBeInLanguages() throws IOException {
         String bundle = "JabRef";
         // e.g., "<bundle>_en.properties", where <bundle> is [JabRef, Menu]
-        Pattern propertiesFile = Pattern.compile(
-            String.format("%s_.{2,}.properties", bundle)
-        );
+        Pattern propertiesFile = Pattern.compile(String.format("%s_.{2,}.properties", bundle));
         Set<String> localizationFiles = new HashSet<>();
         try (
             DirectoryStream<Path> directoryStream = Files.newDirectoryStream(
@@ -75,23 +73,15 @@ void allFilesMustBeInLanguages() throws IOException {
     void ensureNoDuplicates() {
         String bundle = "JabRef";
         for (Language lang : Language.values()) {
-            String propertyFilePath = String.format(
-                "/l10n/%s_%s.properties",
-                bundle,
-                lang.getId()
-            );
+            String propertyFilePath = String.format("/l10n/%s_%s.properties", bundle, lang.getId());
 
             // read in
-            DuplicationDetectionProperties properties =
-                new DuplicationDetectionProperties();
+            DuplicationDetectionProperties properties = new DuplicationDetectionProperties();
             try (
                 InputStream is = LocalizationConsistencyTest.class.getResourceAsStream(
                         propertyFilePath
                     );
-                InputStreamReader reader = new InputStreamReader(
-                    is,
-                    StandardCharsets.UTF_8
-                )
+                InputStreamReader reader = new InputStreamReader(is, StandardCharsets.UTF_8)
             ) {
                 properties.load(reader);
             } catch (IOException e) {
@@ -131,9 +121,7 @@ void keyValueShouldBeEqualForEnglishPropertiesMessages() {
     @Test
     void languageKeysShouldNotContainUnderscoresForSpaces() throws IOException {
         final List<LocalizationEntry> quotedEntries = LocalizationParser
-            .findLocalizationParametersStringsInJavaFiles(
-                LocalizationBundleForTest.LANG
-            )
+            .findLocalizationParametersStringsInJavaFiles(LocalizationBundleForTest.LANG)
             .stream()
             .filter(key -> key.getKey().contains("\\_"))
             .collect(Collectors.toList());
@@ -144,9 +132,7 @@ void languageKeysShouldNotContainUnderscoresForSpaces() throws IOException {
             "Please correct the following entries:\n" +
             quotedEntries
                 .stream()
-                .map(key ->
-                    String.format("\n%s (%s)\n", key.getKey(), key.getPath())
-                )
+                .map(key -> String.format("\n%s (%s)\n", key.getKey(), key.getPath()))
                 .toList()
         );
     }
@@ -154,13 +140,9 @@ void languageKeysShouldNotContainUnderscoresForSpaces() throws IOException {
     @Test
     void languageKeysShouldNotContainHtmlBrAndHtmlP() throws IOException {
         final List<LocalizationEntry> entriesWithHtml = LocalizationParser
-            .findLocalizationParametersStringsInJavaFiles(
-                LocalizationBundleForTest.LANG
-            )
+            .findLocalizationParametersStringsInJavaFiles(LocalizationBundleForTest.LANG)
             .stream()
-            .filter(key ->
-                key.getKey().contains("<br>") || key.getKey().contains("<p>")
-            )
+            .filter(key -> key.getKey().contains("<br>") || key.getKey().contains("<p>"))
             .collect(Collectors.toList());
         assertEquals(
             Collections.emptyList(),
@@ -169,9 +151,7 @@ void languageKeysShouldNotContainHtmlBrAndHtmlP() throws IOException {
             "Please correct the following entries:\n" +
             entriesWithHtml
                 .stream()
-                .map(key ->
-                    String.format("\n%s (%s)\n", key.getKey(), key.getPath())
-                )
+                .map(key -> String.format("\n%s (%s)\n", key.getKey(), key.getPath()))
                 .toList()
         );
     }
@@ -211,9 +191,7 @@ void findMissingLocalizationKeys() throws IOException {
 
     @Test
     void findObsoleteLocalizationKeys() throws IOException {
-        Set<String> obsoleteKeys = LocalizationParser.findObsolete(
-            LocalizationBundleForTest.LANG
-        );
+        Set<String> obsoleteKeys = LocalizationParser.findObsolete(LocalizationBundleForTest.LANG);
         assertEquals(
             Collections.emptySet(),
             obsoleteKeys,
@@ -274,12 +252,7 @@ private static Language[] installedLanguages() {
     void resourceBundleExists(Language language) {
         Path messagesPropertyFile = Path
             .of("src/main/resources")
-            .resolve(
-                Localization.RESOURCE_PREFIX +
-                "_" +
-                language.getId() +
-                ".properties"
-            );
+            .resolve(Localization.RESOURCE_PREFIX + "_" + language.getId() + ".properties");
         assertTrue(Files.exists(messagesPropertyFile));
     }
 
diff --git a/src/test/java/org/jabref/logic/l10n/LocalizationKeyParamsTest.java b/src/test/java/org/jabref/logic/l10n/LocalizationKeyParamsTest.java
index 1328501d30e..4c0efcc61c4 100644
--- a/src/test/java/org/jabref/logic/l10n/LocalizationKeyParamsTest.java
+++ b/src/test/java/org/jabref/logic/l10n/LocalizationKeyParamsTest.java
@@ -13,27 +13,15 @@ public class LocalizationKeyParamsTest {
 
     @ParameterizedTest
     @MethodSource("provideTestData")
-    public void testReplacePlaceholders(
-        String expected,
-        LocalizationKeyParams input
-    ) {
+    public void testReplacePlaceholders(String expected, LocalizationKeyParams input) {
         assertEquals(expected, input.replacePlaceholders());
     }
 
     private static Stream<Arguments> provideTestData() {
         return Stream.of(
-            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("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")
diff --git a/src/test/java/org/jabref/logic/l10n/LocalizationKeyTest.java b/src/test/java/org/jabref/logic/l10n/LocalizationKeyTest.java
index 741e9416ab2..0d4d7bd63f6 100644
--- a/src/test/java/org/jabref/logic/l10n/LocalizationKeyTest.java
+++ b/src/test/java/org/jabref/logic/l10n/LocalizationKeyTest.java
@@ -16,34 +16,23 @@ 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.
-            Arguments.of(
-                "Copy\\ \\\\cite{citation\\ key}",
-                "Copy \\\\cite{citation key}"
-            ),
+            Arguments.of("Copy\\ \\\\cite{citation\\ key}", "Copy \\\\cite{citation key}"),
             // Java code: Newline follows\n
             // String representation: "Newline follows\\n"
             Arguments.of("Newline\\ follows\\n", "Newline follows\\n"),
             // 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"
-            )
+            Arguments.of("First\\ line\\nSecond\\ line", "First line\\nSecond line")
         );
     }
 
     @ParameterizedTest
     @MethodSource("propertiesKeyTestCases")
-    public void getPropertiesKeyReturnsCorrectValue(
-        String expected,
-        String input
-    ) {
+    public void getPropertiesKeyReturnsCorrectValue(String expected, String input) {
         assertEquals(
             expected,
-            LocalizationKey
-                .fromEscapedJavaString(input)
-                .getEscapedPropertiesKey()
+            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 994b663798a..9f0e5ce0c8e 100644
--- a/src/test/java/org/jabref/logic/l10n/LocalizationParser.java
+++ b/src/test/java/org/jabref/logic/l10n/LocalizationParser.java
@@ -28,9 +28,8 @@
 
 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()
@@ -52,9 +51,8 @@ public static SortedSet<LocalizationEntry> findMissingKeys(
             .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");
@@ -82,17 +80,13 @@ private static Set<LocalizationEntry> findLocalizationEntriesInFiles(
         }
     }
 
-    public static Set<
-        LocalizationEntry
-    > findLocalizationParametersStringsInJavaFiles(
+    public static Set<LocalizationEntry> findLocalizationParametersStringsInJavaFiles(
         LocalizationBundleForTest type
     ) throws IOException {
         try (Stream<Path> pathStream = Files.walk(Path.of("src/main"))) {
             return pathStream
                 .filter(LocalizationParser::isJavaFile)
-                .flatMap(path ->
-                    getLocalizationParametersInJavaFile(path, type).stream()
-                )
+                .flatMap(path -> getLocalizationParametersInJavaFile(path, type).stream())
                 .collect(Collectors.toSet());
         } catch (UncheckedIOException ioe) {
             throw new IOException(ioe);
@@ -147,13 +141,8 @@ public static SortedSet<String> getKeysInPropertiesFile(String path) {
     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
-            )
+            InputStream is = LocalizationConsistencyTest.class.getResourceAsStream(path);
+            InputStreamReader reader = new InputStreamReader(is, StandardCharsets.UTF_8)
         ) {
             properties.load(reader);
         } catch (IOException e) {
@@ -241,10 +230,7 @@ public boolean containsKey(String key) {
         };
 
         try {
-            FXMLLoader loader = new FXMLLoader(
-                path.toUri().toURL(),
-                registerUsageResourceBundle
-            );
+            FXMLLoader loader = new FXMLLoader(path.toUri().toURL(), registerUsageResourceBundle);
             // We don't want to initialize controller
             loader.setControllerFactory(Mockito::mock);
 
@@ -270,11 +256,7 @@ private static void setStaticLoad(FXMLLoader loader) {
         //   - 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 method = FXMLLoader.class.getDeclaredMethod("setStaticLoad", boolean.class);
             method.setAccessible(true);
             method.invoke(loader, true);
         } catch (
diff --git a/src/test/java/org/jabref/logic/l10n/LocalizationTest.java b/src/test/java/org/jabref/logic/l10n/LocalizationTest.java
index 96539ed3ba7..8dafaae9e6e 100644
--- a/src/test/java/org/jabref/logic/l10n/LocalizationTest.java
+++ b/src/test/java/org/jabref/logic/l10n/LocalizationTest.java
@@ -44,10 +44,7 @@ void testKnownEnglishTranslationOfUndo() {
     @Test
     void testKnownGermanTranslation() {
         Localization.setLanguage(Language.GERMAN);
-        assertEquals(
-            "Zeige Einstellungen",
-            Localization.lang("Show preferences")
-        );
+        assertEquals("Zeige Einstellungen", Localization.lang("Show preferences"));
     }
 
     @Test
diff --git a/src/test/java/org/jabref/logic/layout/LayoutEntryTest.java b/src/test/java/org/jabref/logic/layout/LayoutEntryTest.java
index 824b568b6a1..65dbc9e64f9 100644
--- a/src/test/java/org/jabref/logic/layout/LayoutEntryTest.java
+++ b/src/test/java/org/jabref/logic/layout/LayoutEntryTest.java
@@ -40,10 +40,7 @@ public void setUp() {
             "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(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");
@@ -57,17 +54,11 @@ public void setUp() {
             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.URL, "http://dx.doi.org/10.1145/1554339.1554341");
         mBTE.setField(StandardField.PUBLISHER, "ACM");
         mBTE.setField(StandardField.TIMESTAMP, "2010.11.11");
         mBTE.setField(StandardField.AUTHOR, "Chaudhuri, Avik");
-        mBTE.setField(
-            StandardField.TITLE,
-            "Language-based security on Android"
-        );
+        mBTE.setField(StandardField.TITLE, "Language-based security on Android");
         mBTE.setField(StandardField.ADDRESS, "New York, NY, USA");
         mBTE.setField(SpecialField.PRIORITY, "2");
         mBTE.setField(StandardField.ISBN, "978-1-60558-645-8");
@@ -81,9 +72,7 @@ public void setUp() {
     }
 
     public String layout(String layoutFile, BibEntry entry) throws IOException {
-        StringReader sr = new StringReader(
-            layoutFile.replace("__NEWLINE__", "\n")
-        );
+        StringReader sr = new StringReader(layoutFile.replace("__NEWLINE__", "\n"));
         Layout layout = new LayoutHelper(
             sr,
             mock(LayoutFormatterPreferences.class),
@@ -97,16 +86,10 @@ public String layout(String layoutFile, BibEntry entry) throws IOException {
     @Test
     public void testParseMethodCalls() {
         assertEquals(1, LayoutEntry.parseMethodsCalls("bla").size());
-        assertEquals(
-            "bla",
-            (LayoutEntry.parseMethodsCalls("bla").get(0)).get(0)
-        );
+        assertEquals("bla", (LayoutEntry.parseMethodsCalls("bla").get(0)).get(0));
 
         assertEquals(1, LayoutEntry.parseMethodsCalls("bla,").size());
-        assertEquals(
-            "bla",
-            (LayoutEntry.parseMethodsCalls("bla,").get(0)).get(0)
-        );
+        assertEquals("bla", (LayoutEntry.parseMethodsCalls("bla,").get(0)).get(0));
 
         assertEquals(1, LayoutEntry.parseMethodsCalls("_bla.bla.blub,").size());
         assertEquals(
@@ -115,63 +98,31 @@ public void testParseMethodCalls() {
         );
 
         assertEquals(2, LayoutEntry.parseMethodsCalls("bla,foo").size());
-        assertEquals(
-            "bla",
-            (LayoutEntry.parseMethodsCalls("bla,foo").get(0)).get(0)
-        );
-        assertEquals(
-            "foo",
-            (LayoutEntry.parseMethodsCalls("bla,foo").get(1)).get(0)
-        );
+        assertEquals("bla", (LayoutEntry.parseMethodsCalls("bla,foo").get(0)).get(0));
+        assertEquals("foo", (LayoutEntry.parseMethodsCalls("bla,foo").get(1)).get(0));
 
-        assertEquals(
-            2,
-            LayoutEntry.parseMethodsCalls("bla(\"test\"),foo(\"fark\")").size()
-        );
+        assertEquals(2, LayoutEntry.parseMethodsCalls("bla(\"test\"),foo(\"fark\")").size());
         assertEquals(
             "bla",
-            (LayoutEntry
-                    .parseMethodsCalls("bla(\"test\"),foo(\"fark\")")
-                    .get(0)).get(0)
+            (LayoutEntry.parseMethodsCalls("bla(\"test\"),foo(\"fark\")").get(0)).get(0)
         );
         assertEquals(
             "foo",
-            (LayoutEntry
-                    .parseMethodsCalls("bla(\"test\"),foo(\"fark\")")
-                    .get(1)).get(0)
+            (LayoutEntry.parseMethodsCalls("bla(\"test\"),foo(\"fark\")").get(1)).get(0)
         );
         assertEquals(
             "test",
-            (LayoutEntry
-                    .parseMethodsCalls("bla(\"test\"),foo(\"fark\")")
-                    .get(0)).get(1)
+            (LayoutEntry.parseMethodsCalls("bla(\"test\"),foo(\"fark\")").get(0)).get(1)
         );
         assertEquals(
             "fark",
-            (LayoutEntry
-                    .parseMethodsCalls("bla(\"test\"),foo(\"fark\")")
-                    .get(1)).get(1)
+            (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)").get(0)).get(0)
-        );
-        assertEquals(
-            "foo",
-            (LayoutEntry.parseMethodsCalls("bla(test),foo(fark)").get(1)).get(0)
-        );
-        assertEquals(
-            "test",
-            (LayoutEntry.parseMethodsCalls("bla(test),foo(fark)").get(0)).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)").get(0)).get(0));
+        assertEquals("foo", (LayoutEntry.parseMethodsCalls("bla(test),foo(fark)").get(1)).get(0));
+        assertEquals("test", (LayoutEntry.parseMethodsCalls("bla(test),foo(fark)").get(0)).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 eae162e46df..b7cf1178acd 100644
--- a/src/test/java/org/jabref/logic/layout/LayoutHelperTest.java
+++ b/src/test/java/org/jabref/logic/layout/LayoutHelperTest.java
@@ -31,9 +31,7 @@ public void backslashDoesNotTriggerException() {
 
     @Test
     public void unbalancedBeginEndIsParsed() throws Exception {
-        StringReader stringReader = new StringReader(
-            "\\begin{doi}, DOI: \\doi"
-        );
+        StringReader stringReader = new StringReader("\\begin{doi}, DOI: \\doi");
         LayoutHelper layoutHelper = new LayoutHelper(
             stringReader,
             layoutFormatterPreferences,
@@ -45,9 +43,7 @@ public void unbalancedBeginEndIsParsed() throws Exception {
 
     @Test
     public void minimalExampleWithDoiGetsParsed() throws Exception {
-        StringReader stringReader = new StringReader(
-            "\\begin{doi}, DOI: \\doi\\end{doi}"
-        );
+        StringReader stringReader = new StringReader("\\begin{doi}, DOI: \\doi\\end{doi}");
         LayoutHelper layoutHelper = new LayoutHelper(
             stringReader,
             layoutFormatterPreferences,
diff --git a/src/test/java/org/jabref/logic/layout/LayoutTest.java b/src/test/java/org/jabref/logic/layout/LayoutTest.java
index f9f843563ea..2cfab71eb39 100644
--- a/src/test/java/org/jabref/logic/layout/LayoutTest.java
+++ b/src/test/java/org/jabref/logic/layout/LayoutTest.java
@@ -33,14 +33,9 @@ void setUp() {
         abbreviationRepository = mock(JournalAbbreviationRepository.class);
     }
 
-    private String layout(
-        String layout,
-        List<Path> fileDirForDatabase,
-        BibEntry entry
-    ) throws IOException {
-        StringReader layoutStringReader = new StringReader(
-            layout.replace("__NEWLINE__", "\n")
-        );
+    private String layout(String layout, List<Path> fileDirForDatabase, BibEntry entry)
+        throws IOException {
+        StringReader layoutStringReader = new StringReader(layout.replace("__NEWLINE__", "\n"));
 
         return new LayoutHelper(
             layoutStringReader,
@@ -85,10 +80,7 @@ void HTMLChar() throws IOException {
         BibEntry entry = new BibEntry(StandardEntryType.Article)
             .withField(StandardField.AUTHOR, "This\nis\na\ntext");
 
-        String actual = layout(
-            "\\begin{author}\\format[HTMLChars]{\\author}\\end{author}",
-            entry
-        );
+        String actual = layout("\\begin{author}\\format[HTMLChars]{\\author}\\end{author}", entry);
 
         assertEquals("This<br>is<br>a<br>text", actual);
     }
@@ -158,11 +150,7 @@ void beginConditionals() throws IOException {
         assertEquals("", layoutText);
 
         // ! (NOT)
-        layoutText =
-            layout(
-                "\\begin{!year}\\format[HTMLChars]{(no year)}\\end{!year}",
-                entry
-            );
+        layoutText = layout("\\begin{!year}\\format[HTMLChars]{(no year)}\\end{!year}", entry);
 
         assertEquals("(no year)", layoutText);
 
@@ -183,9 +171,7 @@ void beginConditionals() throws IOException {
     @Test
     void wrapFileLinksExpandFile() throws IOException {
         BibEntry entry = new BibEntry(StandardEntryType.Article);
-        entry.addFile(
-            new LinkedFile("Test file", Path.of("encrypted.pdf"), "PDF")
-        );
+        entry.addFile(new LinkedFile("Test file", Path.of("encrypted.pdf"), "PDF"));
 
         String layoutText = layout(
             "\\begin{file}\\format[WrapFileLinks(\\i. \\d (\\p))]{\\file}\\end{file}",
@@ -195,8 +181,7 @@ void wrapFileLinksExpandFile() throws IOException {
 
         assertEquals(
             "1. Test file (" +
-            new File("src/test/resources/pdfs/encrypted.pdf")
-                .getCanonicalPath() +
+            new File("src/test/resources/pdfs/encrypted.pdf").getCanonicalPath() +
             ")",
             layoutText
         );
@@ -226,10 +211,7 @@ void customNameFormatter() throws IOException {
         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
-        );
+        String layoutText = layout("\\begin{author}\\format[DCA]{\\author}\\end{author}", entry);
 
         assertEquals("JoeDoe and MaryJ", layoutText);
     }
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 e8bb63169d7..ecdcacf1085 100644
--- a/src/test/java/org/jabref/logic/layout/format/AuthorAbbreviatorTest.java
+++ b/src/test/java/org/jabref/logic/layout/format/AuthorAbbreviatorTest.java
@@ -16,15 +16,10 @@ public void testFormat() {
         LayoutFormatter b = new AuthorAbbreviator();
 
         assertEquals(b.format(""), a.format(""));
-        assertEquals(
-            b.format("Someone, Van Something"),
-            a.format("Someone, Van Something")
-        );
+        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"
-            ),
+            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 30fbade259e..95e62731bf8 100644
--- a/src/test/java/org/jabref/logic/layout/format/AuthorAndToSemicolonReplacerTest.java
+++ b/src/test/java/org/jabref/logic/layout/format/AuthorAndToSemicolonReplacerTest.java
@@ -14,10 +14,7 @@ private static Stream<Arguments> data() {
         return Stream.of(
             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("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"
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 716ac415769..09e3ec95216 100644
--- a/src/test/java/org/jabref/logic/layout/format/AuthorAndsCommaReplacerTest.java
+++ b/src/test/java/org/jabref/logic/layout/format/AuthorAndsCommaReplacerTest.java
@@ -18,10 +18,7 @@ public void testFormat() {
         assertEquals("", a.format(""));
 
         // Single Names don't change
-        assertEquals(
-            "Someone, Van Something",
-            a.format("Someone, Van Something")
-        );
+        assertEquals("Someone, Van Something", a.format("Someone, Van Something"));
 
         // Two names just an &
         assertEquals(
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 c5a38a30c42..f10f8b12768 100644
--- a/src/test/java/org/jabref/logic/layout/format/AuthorAndsReplacerTest.java
+++ b/src/test/java/org/jabref/logic/layout/format/AuthorAndsReplacerTest.java
@@ -18,10 +18,7 @@ public void testFormat() {
         assertEquals("", a.format(""));
 
         // Single Names don't change
-        assertEquals(
-            "Someone, Van Something",
-            a.format("Someone, Van Something")
-        );
+        assertEquals("Someone, Van Something", a.format("Someone, Van Something"));
 
         // Two names just an &
         assertEquals(
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 df6d5de0a99..a13f9d652b9 100644
--- a/src/test/java/org/jabref/logic/layout/format/AuthorFirstFirstCommasTest.java
+++ b/src/test/java/org/jabref/logic/layout/format/AuthorFirstFirstCommasTest.java
@@ -14,9 +14,7 @@ public void testFormat() {
         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"
-                )
+                .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 1087adeb2c6..bdeeaa4687d 100644
--- a/src/test/java/org/jabref/logic/layout/format/AuthorFirstFirstTest.java
+++ b/src/test/java/org/jabref/logic/layout/format/AuthorFirstFirstTest.java
@@ -14,9 +14,7 @@ public void testFormat() {
         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"
-                )
+                .format("von Neumann,,John and John Smith and Black Brown, Jr, Peter")
         );
     }
 }
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 21fda5fc9ac..d631768ac16 100644
--- a/src/test/java/org/jabref/logic/layout/format/AuthorFirstLastOxfordCommasTest.java
+++ b/src/test/java/org/jabref/logic/layout/format/AuthorFirstLastOxfordCommasTest.java
@@ -18,10 +18,7 @@ public void testFormat() {
         assertEquals("", a.format(""));
 
         // Single Names
-        assertEquals(
-            "Van Something Someone",
-            a.format("Someone, Van Something")
-        );
+        assertEquals("Van Something Someone", a.format("Someone, Van Something"));
 
         // Two names
         assertEquals(
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 969ebc83693..01812822152 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
@@ -14,9 +14,7 @@ public void testFormat() {
         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"
-                )
+                .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 6e14f528f69..428e1239eaa 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
@@ -13,10 +13,7 @@ public class AuthorLF_FFTest {
     public void testFormat() {
         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"
-                )
+            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/AuthorLastFirstAbbreviatorTest.java b/src/test/java/org/jabref/logic/layout/format/AuthorLastFirstAbbreviatorTest.java
index 423cedec55a..4fe15e42bfd 100644
--- a/src/test/java/org/jabref/logic/layout/format/AuthorLastFirstAbbreviatorTest.java
+++ b/src/test/java/org/jabref/logic/layout/format/AuthorLastFirstAbbreviatorTest.java
@@ -26,10 +26,7 @@ void testOneAuthorSimpleName() {
      */
     @Test
     void testOneAuthorCommonName() {
-        assertEquals(
-            "Lastname, N. M.",
-            abbreviate("Lastname, Name Middlename")
-        );
+        assertEquals("Lastname, N. M.", abbreviate("Lastname, Name Middlename"));
     }
 
     /**
@@ -39,9 +36,7 @@ void testOneAuthorCommonName() {
      */
     @Test
     void testTwoAuthorsCommonName() {
-        String result = abbreviate(
-            "Lastname, Name Middlename and Sobrenome, Nome Nomedomeio"
-        );
+        String result = abbreviate("Lastname, Name Middlename and Sobrenome, Nome Nomedomeio");
         String expectedResult = "Lastname, N. M. and Sobrenome, N. N.";
 
         assertEquals(expectedResult, result);
@@ -59,9 +54,7 @@ void testFormat() {
         assertEquals("Smith, J.", abbreviate("Smith, John"));
         assertEquals(
             "von Neumann, J. and Smith, J. and Black Brown, P.",
-            abbreviate(
-                "von Neumann, John and Smith, John and Black Brown, Peter"
-            )
+            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 64a06e08803..b588eb11590 100644
--- a/src/test/java/org/jabref/logic/layout/format/AuthorLastFirstCommasTest.java
+++ b/src/test/java/org/jabref/logic/layout/format/AuthorLastFirstCommasTest.java
@@ -18,10 +18,7 @@ public void testFormat() {
         assertEquals("", a.format(""));
 
         // Single Names
-        assertEquals(
-            "Someone, Van Something",
-            a.format("Van Something Someone")
-        );
+        assertEquals("Someone, Van Something", a.format("Van Something Someone"));
 
         // Two names
         assertEquals(
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 9773589481f..c28bd98b061 100644
--- a/src/test/java/org/jabref/logic/layout/format/AuthorLastFirstOxfordCommasTest.java
+++ b/src/test/java/org/jabref/logic/layout/format/AuthorLastFirstOxfordCommasTest.java
@@ -18,10 +18,7 @@ public void testFormat() {
         assertEquals("", a.format(""));
 
         // Single Names
-        assertEquals(
-            "Someone, Van Something",
-            a.format("Van Something Someone")
-        );
+        assertEquals("Someone, Van Something", a.format("Van Something Someone"));
 
         // Two names
         assertEquals(
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 8ca9629cb2b..615a145e254 100644
--- a/src/test/java/org/jabref/logic/layout/format/AuthorLastFirstTest.java
+++ b/src/test/java/org/jabref/logic/layout/format/AuthorLastFirstTest.java
@@ -15,10 +15,7 @@ public void testFormat() {
         assertEquals("", a.format(""));
 
         // Single Names
-        assertEquals(
-            "Someone, Van Something",
-            a.format("Van Something Someone")
-        );
+        assertEquals("Someone, Van Something", a.format("Van Something Someone"));
 
         // Two names
         assertEquals(
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 8609e5426d2..4c71c39e03e 100644
--- a/src/test/java/org/jabref/logic/layout/format/AuthorNatBibTest.java
+++ b/src/test/java/org/jabref/logic/layout/format/AuthorNatBibTest.java
@@ -26,10 +26,7 @@ private static Stream<Arguments> formatTests() {
                 "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 and Smith", "von Neumann,,John and John Smith"),
             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 242042fc498..4a2c2b6bde3 100644
--- a/src/test/java/org/jabref/logic/layout/format/AuthorOrgSciTest.java
+++ b/src/test/java/org/jabref/logic/layout/format/AuthorOrgSciTest.java
@@ -24,22 +24,13 @@ void paramLayoutFormatTest(String expectedString, String inputString) {
 
     @ParameterizedTest
     @MethodSource("formatTestsComposite")
-    void paramLayoutFormatTestComposite(
-        String expectedString,
-        String inputString
-    ) {
-        assertEquals(
-            expectedString,
-            authorOrgNatFormatterComposite.format(inputString)
-        );
+    void paramLayoutFormatTestComposite(String expectedString, String inputString) {
+        assertEquals(expectedString, authorOrgNatFormatterComposite.format(inputString));
     }
 
     private static Stream<Arguments> formatTests() {
         return Stream.of(
-            Arguments.of(
-                "Flynn, J., S. Gartska",
-                "John Flynn and Sabine Gartska"
-            ),
+            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",
@@ -50,10 +41,7 @@ private static Stream<Arguments> formatTests() {
 
     private static Stream<Arguments> formatTestsComposite() {
         return Stream.of(
-            Arguments.of(
-                "Flynn, J., S. Gartska",
-                "John Flynn and Sabine Gartska"
-            ),
+            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",
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 982fcfb4898..06fb61d9415 100644
--- a/src/test/java/org/jabref/logic/layout/format/AuthorsTest.java
+++ b/src/test/java/org/jabref/logic/layout/format/AuthorsTest.java
@@ -15,9 +15,7 @@ public class AuthorsTest {
     public void testStandardUsage() {
         assertEquals(
             "B. C. Bruce, C. Manson and J. Jumper",
-            authorsLayoutFormatter.format(
-                "Bob Croydon Bruce and Charles Manson and Jolly Jumper"
-            )
+            authorsLayoutFormatter.format("Bob Croydon Bruce and Charles Manson and Jolly Jumper")
         );
     }
 
@@ -44,9 +42,7 @@ public void testStandardUsageThree() {
         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"
-            )
+            authorsLayoutFormatter.format("Bob Croydon Bruce and Charles Manson and Jolly Jumper")
         );
     }
 
@@ -55,9 +51,7 @@ public void testStandardUsageFour() {
         authorsLayoutFormatter.setArgument("fullname, LastFirst, Comma, 2");
         assertEquals(
             "Bruce, Bob Croydon et al.",
-            authorsLayoutFormatter.format(
-                "Bob Croydon Bruce and Charles Manson and Jolly Jumper"
-            )
+            authorsLayoutFormatter.format("Bob Croydon Bruce and Charles Manson and Jolly Jumper")
         );
     }
 
@@ -85,9 +79,7 @@ public void testStandardUsageSix() {
 
     @Test
     public void testSpecialEtAl() {
-        authorsLayoutFormatter.setArgument(
-            "fullname, LastFirst, Comma, 3, etal= and a few more"
-        );
+        authorsLayoutFormatter.setArgument("fullname, LastFirst, Comma, 3, etal= and a few more");
         assertEquals(
             "Bruce, Bob Croydon and a few more",
             authorsLayoutFormatter.format(
@@ -106,9 +98,7 @@ public void testStandardOxford() {
         authorsLayoutFormatter.setArgument("Oxford");
         assertEquals(
             "B. C. Bruce, C. Manson, and J. Jumper",
-            authorsLayoutFormatter.format(
-                "Bob Croydon Bruce and Charles Manson and Jolly Jumper"
-            )
+            authorsLayoutFormatter.format("Bob Croydon Bruce and Charles Manson and Jolly Jumper")
         );
     }
 
@@ -117,9 +107,7 @@ public void testStandardOxfordFullName() {
         authorsLayoutFormatter.setArgument("FullName,Oxford");
         assertEquals(
             "Bob Croydon Bruce, Charles Manson, and Jolly Jumper",
-            authorsLayoutFormatter.format(
-                "Bruce, Bob Croydon and Charles Manson and Jolly Jumper"
-            )
+            authorsLayoutFormatter.format("Bruce, Bob Croydon and Charles Manson and Jolly Jumper")
         );
     }
 
@@ -128,9 +116,7 @@ public void testStandardCommaFullName() {
         authorsLayoutFormatter.setArgument("FullName,Comma,Comma");
         assertEquals(
             "Bob Croydon Bruce, Charles Manson, Jolly Jumper",
-            authorsLayoutFormatter.format(
-                "Bruce, Bob Croydon and Charles Manson and Jolly Jumper"
-            )
+            authorsLayoutFormatter.format("Bruce, Bob Croydon and Charles Manson and Jolly Jumper")
         );
     }
 
@@ -139,9 +125,7 @@ public void testStandardAmpFullName() {
         authorsLayoutFormatter.setArgument("FullName,Amp");
         assertEquals(
             "Bob Croydon Bruce, Charles Manson & Jolly Jumper",
-            authorsLayoutFormatter.format(
-                "Bruce, Bob Croydon and Charles Manson and Jolly Jumper"
-            )
+            authorsLayoutFormatter.format("Bruce, Bob Croydon and Charles Manson and Jolly Jumper")
         );
     }
 
@@ -194,17 +178,13 @@ public void testEtAlNotEnoughAuthors() {
         authorsLayoutFormatter.setArgument("2,1");
         assertEquals(
             "B. C. Bruce and C. K. von Manson",
-            authorsLayoutFormatter.format(
-                "Bruce, Bob Croydon and Charles Kermit von Manson"
-            )
+            authorsLayoutFormatter.format("Bruce, Bob Croydon and Charles Kermit von Manson")
         );
     }
 
     @Test
     public void testEmptyEtAl() {
-        authorsLayoutFormatter.setArgument(
-            "fullname, LastFirst, Comma, 3, etal="
-        );
+        authorsLayoutFormatter.setArgument("fullname, LastFirst, Comma, 3, etal=");
         assertEquals(
             "Bruce, Bob Croydon",
             authorsLayoutFormatter.format(
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 273c31056bd..517bb94c164 100644
--- a/src/test/java/org/jabref/logic/layout/format/CompositeFormatTest.java
+++ b/src/test/java/org/jabref/logic/layout/format/CompositeFormatTest.java
@@ -40,11 +40,7 @@ public void testDoubleComposite() {
             f.format("John Flynn and Sabine Gartska")
         );
         assertEquals(
-            second.format(
-                first.format(
-                    "Sa Makridakis and Sa Ca Wheelwright and Va Ea McGee"
-                )
-            ),
+            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 1fb3c409827..95e8530f1a3 100644
--- a/src/test/java/org/jabref/logic/layout/format/DOICheckTest.java
+++ b/src/test/java/org/jabref/logic/layout/format/DOICheckTest.java
@@ -22,10 +22,7 @@ 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", "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"
@@ -38,14 +35,8 @@ private static Stream<Arguments> provideDOI() {
                 "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("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")
         );
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 5b69a89ec18..5c9c956e54f 100644
--- a/src/test/java/org/jabref/logic/layout/format/DOIStripTest.java
+++ b/src/test/java/org/jabref/logic/layout/format/DOIStripTest.java
@@ -22,10 +22,7 @@ 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", "10.1000/ISBN1-900512-44-0"),
             Arguments.of(
                 "10.1000/ISBN1-900512-44-0",
                 "http://dx.doi.org/10.1000/ISBN1-900512-44-0"
@@ -34,10 +31,7 @@ private static Stream<Arguments> provideDOI() {
                 "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.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 2432c4464d3..325bada15d4 100644
--- a/src/test/java/org/jabref/logic/layout/format/DateFormatterTest.java
+++ b/src/test/java/org/jabref/logic/layout/format/DateFormatterTest.java
@@ -38,11 +38,7 @@ public void testRequestedFormat() {
             "yyyy/MM, 2016-07-15, 2016/07", // yyyy/MM
         }
     )
-    public void testOtherFormats(
-        String formatArg,
-        String input,
-        String expectedResult
-    ) {
+    public void testOtherFormats(String formatArg, String input, String expectedResult) {
         formatter.setArgument(formatArg);
         String formattedStr = formatter.format(input);
         assertEquals(expectedResult, formattedStr);
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 f3779fb0192..73b9cd7a597 100644
--- a/src/test/java/org/jabref/logic/layout/format/DefaultTest.java
+++ b/src/test/java/org/jabref/logic/layout/format/DefaultTest.java
@@ -30,11 +30,7 @@ private static Stream<Arguments> formatTests() {
             Arguments.of("Bob Bruce", "Bob Bruce", "DEFAULT TEXT"),
             Arguments.of("DEFAULT TEXT", null, "DEFAULT TEXT"),
             Arguments.of("DEFAULT TEXT", "", "DEFAULT TEXT"),
-            Arguments.of(
-                "Bob Bruce and Jolly Jumper",
-                "Bob Bruce and Jolly Jumper",
-                ""
-            ),
+            Arguments.of("Bob Bruce and Jolly Jumper", "Bob Bruce and Jolly Jumper", ""),
             Arguments.of("", null, ""),
             Arguments.of("", "", "")
         );
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 3265fa5dcf9..da74cd789ee 100644
--- a/src/test/java/org/jabref/logic/layout/format/FileLinkTest.java
+++ b/src/test/java/org/jabref/logic/layout/format/FileLinkTest.java
@@ -21,18 +21,11 @@ public void setUp() throws Exception {
 
     @ParameterizedTest
     @MethodSource("provideFileLinks")
-    void formatFileLinks(
-        String formattedFileLink,
-        String originalFileLink,
-        String desiredDocType
-    ) {
+    void formatFileLinks(String formattedFileLink, String originalFileLink, String desiredDocType) {
         if (!desiredDocType.isEmpty()) {
             fileLinkLayoutFormatter.setArgument(desiredDocType);
         }
-        assertEquals(
-            formattedFileLink,
-            fileLinkLayoutFormatter.format(originalFileLink)
-        );
+        assertEquals(formattedFileLink, fileLinkLayoutFormatter.format(originalFileLink));
     }
 
     private static Stream<Arguments> provideFileLinks() {
@@ -41,21 +34,9 @@ private static Stream<Arguments> provideFileLinks() {
             Arguments.of("", null, ""),
             Arguments.of("test.pdf", "test.pdf", ""),
             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("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")
         );
     }
 }
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 2f753358851..81a1497e58e 100644
--- a/src/test/java/org/jabref/logic/layout/format/FirstPageTest.java
+++ b/src/test/java/org/jabref/logic/layout/format/FirstPageTest.java
@@ -15,10 +15,7 @@ public class FirstPageTest {
     @ParameterizedTest
     @MethodSource("providePages")
     void formatPages(String formattedFirstPage, String originalPages) {
-        assertEquals(
-            formattedFirstPage,
-            firstPageLayoutFormatter.format(originalPages)
-        );
+        assertEquals(formattedFirstPage, firstPageLayoutFormatter.format(originalPages));
     }
 
     private static Stream<Arguments> providePages() {
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 bf662755a52..83128857aa7 100644
--- a/src/test/java/org/jabref/logic/layout/format/HTMLCharsTest.java
+++ b/src/test/java/org/jabref/logic/layout/format/HTMLCharsTest.java
@@ -67,14 +67,8 @@ public void testLaTeXHighlighting() {
         assertEquals("<b>hallo</b>", layout.format("{\\textbf hallo}"));
         assertEquals("<b>hallo</b>", layout.format("{\\bf hallo}"));
 
-        assertEquals(
-            "<sup>hallo</sup>",
-            layout.format("\\textsuperscript{hallo}")
-        );
-        assertEquals(
-            "<sub>hallo</sub>",
-            layout.format("\\textsubscript{hallo}")
-        );
+        assertEquals("<sup>hallo</sup>", layout.format("\\textsuperscript{hallo}"));
+        assertEquals("<sub>hallo</sub>", layout.format("\\textsubscript{hallo}"));
 
         assertEquals("<u>hallo</u>", layout.format("\\underline{hallo}"));
         assertEquals("<s>hallo</s>", layout.format("\\sout{hallo}"));
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 49b55cbbf27..35b9778e1f1 100644
--- a/src/test/java/org/jabref/logic/layout/format/LastPageTest.java
+++ b/src/test/java/org/jabref/logic/layout/format/LastPageTest.java
@@ -15,10 +15,7 @@ public class LastPageTest {
     @ParameterizedTest
     @MethodSource("provideArguments")
     void formatLastPage(String formattedText, String originalText) {
-        assertEquals(
-            formattedText,
-            lastPageLayoutFormatter.format(originalText)
-        );
+        assertEquals(formattedText, lastPageLayoutFormatter.format(originalText));
     }
 
     private static Stream<Arguments> provideArguments() {
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 d670493e70e..9502865ba81 100644
--- a/src/test/java/org/jabref/logic/layout/format/LatexToUnicodeFormatterTest.java
+++ b/src/test/java/org/jabref/logic/layout/format/LatexToUnicodeFormatterTest.java
@@ -105,9 +105,7 @@ void testCombiningAccentsCase1() {
         assertEquals("ḩ", formatter.format("{\\c{h}}"));
     }
 
-    @Disabled(
-        "This is not a standard LaTeX command. It is debatable why we should convert this."
-    )
+    @Disabled("This is not a standard LaTeX command. It is debatable why we should convert this.")
     @Test
     void testCombiningAccentsCase2() {
         assertEquals("a͍", formatter.format("\\spreadlips{a}"));
@@ -163,18 +161,12 @@ void testApostrophC() {
 
     @Test
     void testPreservationOfSingleUnderscore() {
-        assertEquals(
-            "Lorem ipsum_lorem ipsum",
-            formatter.format("Lorem ipsum_lorem ipsum")
-        );
+        assertEquals("Lorem ipsum_lorem ipsum", formatter.format("Lorem ipsum_lorem ipsum"));
     }
 
     @Test
     void testConversionOfUnderscoreWithBraces() {
-        assertEquals(
-            "Lorem ipsum_(lorem ipsum)",
-            formatter.format("Lorem ipsum_{lorem ipsum}")
-        );
+        assertEquals("Lorem ipsum_(lorem ipsum)", formatter.format("Lorem ipsum_{lorem ipsum}"));
     }
 
     @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 e5e789fca9c..b899e755fe2 100644
--- a/src/test/java/org/jabref/logic/layout/format/MarkdownFormatterTest.java
+++ b/src/test/java/org/jabref/logic/layout/format/MarkdownFormatterTest.java
@@ -18,10 +18,7 @@ void setUp() {
 
     @Test
     void formatWhenFormattingPlainTextThenReturnsTextWrappedInParagraph() {
-        assertEquals(
-            "<p>Hello World</p>",
-            markdownFormatter.format("Hello World")
-        );
+        assertEquals("<p>Hello World</p>", markdownFormatter.format("Hello World"));
     }
 
     @Test
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 47a6e27ce3e..4b86fd70a47 100644
--- a/src/test/java/org/jabref/logic/layout/format/NameFormatterTest.java
+++ b/src/test/java/org/jabref/logic/layout/format/NameFormatterTest.java
@@ -22,10 +22,7 @@ public void testFormatStringStringBibtexEntry() {
 
         assertEquals(
             "Doe",
-            l.format(
-                "Joe Doe",
-                "1@*@{ll}@@2@1..1@{ff}{ll}@2..2@ and {ff}{last}@@*@*@more"
-            )
+            l.format("Joe Doe", "1@*@{ll}@@2@1..1@{ff}{ll}@2..2@ and {ff}{last}@@*@*@more")
         );
 
         assertEquals(
@@ -64,10 +61,7 @@ public void testFormat() {
             "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)
-        );
+        assertEquals("Vandekamp Mary~Ann", a.format("Mary Ann Vandekamp", formatString));
 
         // Two names
         assertEquals(
@@ -78,18 +72,12 @@ public void testFormat() {
         // Three names
         assertEquals(
             "von Neumann John, Smith, John and Black~Brown, Peter",
-            a.format(
-                "von Neumann, John and Smith, John and Black Brown, Peter",
-                formatString
-            )
+            a.format("von Neumann, John and Smith, John and Black Brown, Peter", formatString)
         );
 
         assertEquals(
             "von Neumann John, Smith, John and Black~Brown, Peter",
-            a.format(
-                "John von Neumann and John Smith and Black Brown, Peter",
-                formatString
-            )
+            a.format("John von Neumann and John Smith and Black Brown, Peter", formatString)
         );
 
         // Four names
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 ab42fb02395..baff452d858 100644
--- a/src/test/java/org/jabref/logic/layout/format/NoSpaceBetweenAbbreviationsTest.java
+++ b/src/test/java/org/jabref/logic/layout/format/NoSpaceBetweenAbbreviationsTest.java
@@ -10,19 +10,12 @@
 
 public class NoSpaceBetweenAbbreviationsTest {
 
-    private LayoutFormatter nsbaLayoutFormatter =
-        new NoSpaceBetweenAbbreviations();
+    private LayoutFormatter nsbaLayoutFormatter = new NoSpaceBetweenAbbreviations();
 
     @ParameterizedTest
     @MethodSource("provideAbbreviations")
-    void formatAbbreviations(
-        String formattedAbbreviation,
-        String originalAbbreviation
-    ) {
-        assertEquals(
-            formattedAbbreviation,
-            nsbaLayoutFormatter.format(originalAbbreviation)
-        );
+    void formatAbbreviations(String formattedAbbreviation, String originalAbbreviation) {
+        assertEquals(formattedAbbreviation, nsbaLayoutFormatter.format(originalAbbreviation));
     }
 
     private static Stream<Arguments> provideAbbreviations() {
@@ -31,10 +24,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/RTFCharsTest.java b/src/test/java/org/jabref/logic/layout/format/RTFCharsTest.java
index 1ffa2cc3351..9ff3d0890e1 100644
--- a/src/test/java/org/jabref/logic/layout/format/RTFCharsTest.java
+++ b/src/test/java/org/jabref/logic/layout/format/RTFCharsTest.java
@@ -44,9 +44,7 @@ void testLaTeXHighlighting() {
         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"
-            )
+            formatter.format("An article title with \\emph{a book title} emphasized")
         );
 
         assertEquals("{\\i hallo}", formatter.format("\\textit{hallo}"));
@@ -60,9 +58,7 @@ void testLaTeXHighlighting() {
     void testComplicated() {
         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 æ"
-            )
+            formatter.format("Réflexions sur le timing de la quantité {\\ae} should be æ")
         );
     }
 
@@ -207,10 +203,7 @@ void testSpecialCharacters() {
             "¡, \\u161!", // !
         }
     )
-    public void testMoreSpecialCharacters(
-        String specialChar,
-        String expectedResult
-    ) {
+    public void testMoreSpecialCharacters(String specialChar, String expectedResult) {
         String formattedStr = formatter.format(specialChar);
         assertEquals(expectedResult, formattedStr);
     }
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 580c50a8252..68c3ce6371d 100644
--- a/src/test/java/org/jabref/logic/layout/format/RemoveBracketsTest.java
+++ b/src/test/java/org/jabref/logic/layout/format/RemoveBracketsTest.java
@@ -31,8 +31,7 @@ public void singleClosingBraceCorrectlyRemoved() throws Exception {
     }
 
     @Test
-    public void bracePairWithEscapedBackslashCorrectlyRemoved()
-        throws Exception {
+    public void bracePairWithEscapedBackslashCorrectlyRemoved() throws Exception {
         assertEquals("\\some text\\", formatter.format("\\{some text\\}"));
     }
 
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 8eea03afb0f..cee4d19cabf 100644
--- a/src/test/java/org/jabref/logic/layout/format/RemoveWhitespaceTest.java
+++ b/src/test/java/org/jabref/logic/layout/format/RemoveWhitespaceTest.java
@@ -29,9 +29,6 @@ public void testTab() {
 
     @Test
     public void testNewLineCombo() {
-        assertEquals(
-            "abcd EFG",
-            new RemoveWhitespace().format("abcd\r E\nFG\r\n")
-        );
+        assertEquals("abcd EFG", new RemoveWhitespace().format("abcd\r E\nFG\r\n"));
     }
 }
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 4aa5e2f88ff..8a2ad122e59 100644
--- a/src/test/java/org/jabref/logic/layout/format/ReplaceTest.java
+++ b/src/test/java/org/jabref/logic/layout/format/ReplaceTest.java
@@ -38,19 +38,13 @@ public void testFormatEmpty() {
     @Test
     public void testNoArgumentSet() {
         ParamLayoutFormatter a = new Replace();
-        assertEquals(
-            "Bob Bruce and Jolly Jumper",
-            a.format("Bob Bruce and Jolly Jumper")
-        );
+        assertEquals("Bob Bruce and Jolly Jumper", a.format("Bob Bruce and Jolly Jumper"));
     }
 
     @Test
     public void testNoProperArgument() {
         ParamLayoutFormatter a = new Replace();
         a.setArgument("Eds.");
-        assertEquals(
-            "Bob Bruce and Jolly Jumper",
-            a.format("Bob Bruce and Jolly Jumper")
-        );
+        assertEquals("Bob Bruce and Jolly Jumper", a.format("Bob Bruce and Jolly Jumper"));
     }
 }
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 064937cbc75..73917ba20b7 100644
--- a/src/test/java/org/jabref/logic/layout/format/ShortMonthFormatterTest.java
+++ b/src/test/java/org/jabref/logic/layout/format/ShortMonthFormatterTest.java
@@ -26,10 +26,7 @@ public void formatNullInput() {
 
     @ParameterizedTest
     @MethodSource("provideArguments")
-    public void formatDifferentInputs(
-        String formattedString,
-        String originalString
-    ) {
+    public void formatDifferentInputs(String formattedString, String originalString) {
         assertEquals(formattedString, formatter.format(originalString));
     }
 
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 1e6748bb739..30225a73702 100644
--- a/src/test/java/org/jabref/logic/layout/format/ToLowerCaseTest.java
+++ b/src/test/java/org/jabref/logic/layout/format/ToLowerCaseTest.java
@@ -18,10 +18,7 @@ public void testNull() {
 
     @ParameterizedTest
     @MethodSource("provideArguments")
-    public void toLowerCaseWithDifferentInputs(
-        String expectedString,
-        String originalString
-    ) {
+    public void toLowerCaseWithDifferentInputs(String expectedString, String originalString) {
         assertEquals(expectedString, new ToLowerCase().format(originalString));
     }
 
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 3cf5bcb8f38..c4a0a8ffbb2 100644
--- a/src/test/java/org/jabref/logic/layout/format/WrapContentTest.java
+++ b/src/test/java/org/jabref/logic/layout/format/WrapContentTest.java
@@ -10,24 +10,16 @@
 
 public class WrapContentTest {
 
-    private ParamLayoutFormatter wrapContentParamLayoutFormatter =
-        new WrapContent();
+    private ParamLayoutFormatter wrapContentParamLayoutFormatter = new WrapContent();
 
     @ParameterizedTest
     @MethodSource("provideContent")
-    void formatContent(
-        String formattedContent,
-        String originalContent,
-        String desiredFormat
-    ) {
+    void formatContent(String formattedContent, String originalContent, String desiredFormat) {
         if (!desiredFormat.isEmpty()) {
             wrapContentParamLayoutFormatter.setArgument(desiredFormat);
         }
 
-        assertEquals(
-            formattedContent,
-            wrapContentParamLayoutFormatter.format(originalContent)
-        );
+        assertEquals(formattedContent, wrapContentParamLayoutFormatter.format(originalContent));
     }
 
     private static Stream<Arguments> provideContent() {
@@ -35,23 +27,11 @@ private static Stream<Arguments> provideContent() {
             Arguments.of("<Bob>", "Bob", "<,>"),
             Arguments.of("Bob:", "Bob", ",:"),
             Arguments.of("Content: Bob", "Bob", "Content: ,"),
-            Arguments.of(
-                "Name,Field,Bob,Author",
-                "Bob",
-                "Name\\,Field\\,,\\,Author"
-            ),
+            Arguments.of("Name,Field,Bob,Author", "Bob", "Name\\,Field\\,,\\,Author"),
             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", ""),
+            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 28b06c8ad57..64135a36029 100644
--- a/src/test/java/org/jabref/logic/layout/format/WrapFileLinksTest.java
+++ b/src/test/java/org/jabref/logic/layout/format/WrapFileLinksTest.java
@@ -31,10 +31,7 @@ void testNull() {
 
     @Test
     void testNoFormatSetNonEmptyString() {
-        assertThrows(
-            NullPointerException.class,
-            () -> formatter.format("test.pdf")
-        );
+        assertThrows(NullPointerException.class, () -> formatter.format("test.pdf"));
     }
 
     @Test
@@ -88,10 +85,7 @@ void testIterator() {
     @Test
     void testIteratorTwoItems() {
         formatter.setArgument("\\i\n");
-        assertEquals(
-            "1\n2\n",
-            formatter.format("Test file:test.pdf:PDF;test2.pdf")
-        );
+        assertEquals("1\n2\n", formatter.format("Test file:test.pdf:PDF;test2.pdf"));
     }
 
     @Test
@@ -103,29 +97,20 @@ void testEndingBracket() {
     @Test
     void testPath() throws IOException {
         formatter =
-            new WrapFileLinks(
-                Collections.singletonList(Path.of("src/test/resources/pdfs/")),
-                ""
-            );
+            new WrapFileLinks(Collections.singletonList(Path.of("src/test/resources/pdfs/")), "");
         formatter.setArgument("\\p");
         assertEquals(
-            new File("src/test/resources/pdfs/encrypted.pdf")
-                .getCanonicalPath(),
+            new File("src/test/resources/pdfs/encrypted.pdf").getCanonicalPath(),
             formatter.format("Preferences:encrypted.pdf:PDF")
         );
     }
 
     @Test
     void testPathFallBackToGeneratedDir() throws IOException {
-        formatter =
-            new WrapFileLinks(
-                Collections.emptyList(),
-                "src/test/resources/pdfs/"
-            );
+        formatter = new WrapFileLinks(Collections.emptyList(), "src/test/resources/pdfs/");
         formatter.setArgument("\\p");
         assertEquals(
-            new File("src/test/resources/pdfs/encrypted.pdf")
-                .getCanonicalPath(),
+            new File("src/test/resources/pdfs/encrypted.pdf").getCanonicalPath(),
             formatter.format("Preferences:encrypted.pdf:PDF")
         );
     }
@@ -133,10 +118,7 @@ void testPathFallBackToGeneratedDir() throws IOException {
     @Test
     void testPathReturnsRelativePathIfNotFound() {
         formatter =
-            new WrapFileLinks(
-                Collections.singletonList(Path.of("src/test/resources/pdfs/")),
-                ""
-            );
+            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 66a6ce33d33..99cfc314351 100644
--- a/src/test/java/org/jabref/logic/msbib/MSBibConverterTest.java
+++ b/src/test/java/org/jabref/logic/msbib/MSBibConverterTest.java
@@ -10,9 +10,7 @@
 
 class MSBibConverterTest {
 
-    private final BibEntry BIB_ENTRY_TEST = new BibEntry(
-        StandardEntryType.InProceedings
-    )
+    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"
@@ -52,9 +50,6 @@ void convert() {
         entry = BIB_ENTRY_TEST;
         MSBibConverter.convert(entry);
 
-        assertEquals(
-            Optional.of("english"),
-            entry.getField(StandardField.LANGUAGE)
-        );
+        assertEquals(Optional.of("english"), entry.getField(StandardField.LANGUAGE));
     }
 }
diff --git a/src/test/java/org/jabref/logic/msbib/MsBibAuthorTest.java b/src/test/java/org/jabref/logic/msbib/MsBibAuthorTest.java
index c6387c41d69..04a36b64bae 100644
--- a/src/test/java/org/jabref/logic/msbib/MsBibAuthorTest.java
+++ b/src/test/java/org/jabref/logic/msbib/MsBibAuthorTest.java
@@ -9,26 +9,14 @@ public class MsBibAuthorTest {
 
     @Test
     public void testGetFirstName() {
-        Author author = new Author(
-            "Gustav Peter Johann",
-            null,
-            null,
-            "Bach",
-            null
-        );
+        Author author = new Author("Gustav Peter Johann", null, null, "Bach", null);
         MsBibAuthor msBibAuthor = new MsBibAuthor(author);
         assertEquals("Gustav", msBibAuthor.getFirstName());
     }
 
     @Test
     public void testGetMiddleName() {
-        Author author = new Author(
-            "Gustav Peter Johann",
-            null,
-            null,
-            "Bach",
-            null
-        );
+        Author author = new Author("Gustav Peter Johann", null, null, "Bach", null);
         MsBibAuthor msBibAuthor = new MsBibAuthor(author);
         assertEquals("Peter Johann", msBibAuthor.getMiddleName());
     }
@@ -49,13 +37,7 @@ public void testGetNoFirstName() {
 
     @Test
     public void testGetLastName() {
-        Author author = new Author(
-            "Gustav Peter Johann",
-            null,
-            null,
-            "Bach",
-            null
-        );
+        Author author = new Author("Gustav Peter Johann", null, null, "Bach", null);
         MsBibAuthor msBibAuthor = new MsBibAuthor(author);
         assertEquals("Bach", msBibAuthor.getLastName());
     }
diff --git a/src/test/java/org/jabref/logic/net/URLDownloadTest.java b/src/test/java/org/jabref/logic/net/URLDownloadTest.java
index e049a1212a7..0c3adf7b0ad 100644
--- a/src/test/java/org/jabref/logic/net/URLDownloadTest.java
+++ b/src/test/java/org/jabref/logic/net/URLDownloadTest.java
@@ -23,18 +23,13 @@
 @FetcherTest
 public class URLDownloadTest {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(
-        URLDownloadTest.class
-    );
+    private static final Logger LOGGER = LoggerFactory.getLogger(URLDownloadTest.class);
 
     @Test
     public void testStringDownloadWithSetEncoding() throws IOException {
         URLDownload dl = new URLDownload(new URL("http://www.google.com"));
 
-        assertTrue(
-            dl.asString().contains("Google"),
-            "google.com should contain google"
-        );
+        assertTrue(dl.asString().contains("Google"), "google.com should contain google");
     }
 
     @Test
@@ -70,8 +65,7 @@ public void testDetermineMimeType() throws IOException {
     }
 
     @Test
-    public void downloadToTemporaryFilePathWithoutFileSavesAsTmpFile()
-        throws IOException {
+    public void downloadToTemporaryFilePathWithoutFileSavesAsTmpFile() throws IOException {
         URLDownload google = new URLDownload(new URL("http://www.google.com"));
 
         String path = google.toTemporaryFile().toString();
@@ -126,55 +120,36 @@ public void testCheckConnectionSuccess() throws MalformedURLException {
 
     @Test
     public void testCheckConnectionFail() throws MalformedURLException {
-        URLDownload nonsense = new URLDownload(
-            new URL("http://nonsenseadddress")
-        );
+        URLDownload nonsense = new URLDownload(new URL("http://nonsenseadddress"));
 
         assertThrows(UnirestException.class, nonsense::canBeReached);
     }
 
     @Test
     public void connectTimeoutIsNeverNull() throws MalformedURLException {
-        URLDownload urlDownload = new URLDownload(
-            new URL("http://www.example.com")
-        );
+        URLDownload urlDownload = new URLDownload(new URL("http://www.example.com"));
         assertNotNull(
             urlDownload.getConnectTimeout(),
             "there's a non-null default by the constructor"
         );
 
         urlDownload.setConnectTimeout(null);
-        assertNotNull(
-            urlDownload.getConnectTimeout(),
-            "no null value can be set"
-        );
+        assertNotNull(urlDownload.getConnectTimeout(), "no null value can be set");
     }
 
     @Test
-    public void test503ErrorThrowsNestedIOExceptionWithFetcherServerException()
-        throws Exception {
-        URLDownload urlDownload = new URLDownload(
-            new URL("http://httpstat.us/503")
-        );
+    public void test503ErrorThrowsNestedIOExceptionWithFetcherServerException() throws Exception {
+        URLDownload urlDownload = new URLDownload(new URL("http://httpstat.us/503"));
 
-        Exception exception = assertThrows(
-            IOException.class,
-            urlDownload::asString
-        );
+        Exception exception = assertThrows(IOException.class, urlDownload::asString);
         assertInstanceOf(FetcherServerException.class, exception.getCause());
     }
 
     @Test
-    public void test429ErrorThrowsNestedIOExceptionWithFetcherServerException()
-        throws Exception {
-        URLDownload urlDownload = new URLDownload(
-            new URL("http://httpstat.us/429")
-        );
+    public void test429ErrorThrowsNestedIOExceptionWithFetcherServerException() throws Exception {
+        URLDownload urlDownload = new URLDownload(new URL("http://httpstat.us/429"));
 
-        Exception exception = assertThrows(
-            IOException.class,
-            urlDownload::asString
-        );
+        Exception exception = assertThrows(IOException.class, urlDownload::asString);
         assertInstanceOf(FetcherClientException.class, exception.getCause());
     }
 }
diff --git a/src/test/java/org/jabref/logic/net/URLUtilTest.java b/src/test/java/org/jabref/logic/net/URLUtilTest.java
index 8547ad90299..c1719035d3a 100644
--- a/src/test/java/org/jabref/logic/net/URLUtilTest.java
+++ b/src/test/java/org/jabref/logic/net/URLUtilTest.java
@@ -15,16 +15,11 @@ void cleanGoogleSearchURL() throws Exception {
         assertEquals("", URLUtil.cleanGoogleSearchURL(""));
         assertEquals(" ", URLUtil.cleanGoogleSearchURL(" "));
         // no URL
-        assertEquals(
-            "this is no url!",
-            URLUtil.cleanGoogleSearchURL("this is 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"
-            )
+            URLUtil.cleanGoogleSearchURL("http://dl.acm.org/citation.cfm?id=321811")
         );
         // malformed Google URL
         assertEquals(
@@ -61,9 +56,7 @@ void cleanGoogleSearchURL() throws Exception {
         // no url param
         assertEquals(
             "https://www.google.de/url?key=value&key2=value2",
-            URLUtil.cleanGoogleSearchURL(
-                "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(
@@ -73,9 +66,7 @@ void cleanGoogleSearchURL() throws Exception {
         // 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"
-            )
+            URLUtil.cleanGoogleSearchURL("https://www.google.de/url?url=this+is+no+url")
         );
         // Http
         assertEquals(
@@ -135,8 +126,6 @@ void isURLshouldRejectInvalidURL() {
 
     @Test
     void isURLshouldRejectEmbeddedURL() {
-        assertFalse(
-            URLUtil.isURL("dblp computer science bibliography, http://dblp.org")
-        );
+        assertFalse(URLUtil.isURL("dblp computer science bibliography, http://dblp.org"));
     }
 }
diff --git a/src/test/java/org/jabref/logic/openoffice/style/OOBibStyleTest.java b/src/test/java/org/jabref/logic/openoffice/style/OOBibStyleTest.java
index 58f4e37d87e..a6c8b841578 100644
--- a/src/test/java/org/jabref/logic/openoffice/style/OOBibStyleTest.java
+++ b/src/test/java/org/jabref/logic/openoffice/style/OOBibStyleTest.java
@@ -64,10 +64,7 @@ void testAuthorYear() throws IOException {
     @Test
     void testAuthorYearAsFile() throws URISyntaxException, IOException {
         Path defFile = Path.of(
-            OOBibStyleTest.class.getResource(
-                    StyleLoader.DEFAULT_AUTHORYEAR_STYLE_PATH
-                )
-                .toURI()
+            OOBibStyleTest.class.getResource(StyleLoader.DEFAULT_AUTHORYEAR_STYLE_PATH).toURI()
         );
 
         OOBibStyle style = new OOBibStyle(
@@ -110,26 +107,14 @@ static String runGetNumCitationMarker2a(
         int minGroupingCount,
         boolean inList
     ) {
-        return OOBibStyleTestHelper.runGetNumCitationMarker2a(
-            style,
-            num,
-            minGroupingCount,
-            inList
-        );
+        return OOBibStyleTestHelper.runGetNumCitationMarker2a(style, num, minGroupingCount, inList);
     }
 
-    static CitationMarkerNumericEntry numEntry(
-        String key,
-        int num,
-        String pageInfoOrNull
-    ) {
+    static CitationMarkerNumericEntry numEntry(String key, int num, String pageInfoOrNull) {
         return OOBibStyleTestHelper.numEntry(key, num, pageInfoOrNull);
     }
 
-    static CitationMarkerNumericBibEntry numBibEntry(
-        String key,
-        Optional<Integer> num
-    ) {
+    static CitationMarkerNumericBibEntry numBibEntry(String key, Optional<Integer> num) {
         return OOBibStyleTestHelper.numBibEntry(key, num);
     }
 
@@ -138,9 +123,7 @@ static String runGetNumCitationMarker2b(
         int minGroupingCount,
         CitationMarkerNumericEntry... s
     ) {
-        List<CitationMarkerNumericEntry> input = Stream
-            .of(s)
-            .collect(Collectors.toList());
+        List<CitationMarkerNumericEntry> input = Stream.of(s).collect(Collectors.toList());
         OOText res = style.getNumCitationMarker2(input, minGroupingCount);
         return res.toString();
     }
@@ -216,24 +199,12 @@ void testGetNumCitationMarker() throws IOException {
             layoutFormatterPreferences,
             abbreviationRepository
         );
-        assertEquals(
-            "[1] ",
-            runGetNumCitationMarker2a(style, List.of(1), -1, true)
-        );
+        assertEquals("[1] ", runGetNumCitationMarker2a(style, List.of(1), -1, true));
 
-        assertEquals(
-            "[1]",
-            runGetNumCitationMarker2a(style, List.of(1), -1, false)
-        );
-        assertEquals(
-            "[1]",
-            runGetNumCitationMarker2b(style, -1, numEntry("key", 1, null))
-        );
+        assertEquals("[1]", runGetNumCitationMarker2a(style, List.of(1), -1, false));
+        assertEquals("[1]", runGetNumCitationMarker2b(style, -1, numEntry("key", 1, null)));
 
-        assertEquals(
-            "[1] ",
-            runGetNumCitationMarker2a(style, List.of(1), 0, true)
-        );
+        assertEquals("[1] ", runGetNumCitationMarker2a(style, List.of(1), 0, true));
 
         CitationMarkerNumericEntry e2 = numEntry("key", 1, "pp. 55-56");
         assertTrue(e2.getPageInfo().isPresent());
@@ -329,9 +300,7 @@ void testGetCitProperty() throws IOException {
 
         // old
         assertEquals(3, style.getIntCitProperty("MaxAuthors"));
-        assertTrue(
-            style.getBooleanCitProperty(OOBibStyle.MULTI_CITE_CHRONOLOGICAL)
-        );
+        assertTrue(style.getBooleanCitProperty(OOBibStyle.MULTI_CITE_CHRONOLOGICAL));
         // new
         assertEquals(3, style.getMaxAuthors());
         assertTrue(style.getMultiCiteChronological());
@@ -529,15 +498,7 @@ void testInstitutionAuthorMarker() throws IOException {
 
         assertEquals(
             "[JabRef Development Team, 2016]",
-            getCitationMarker2(
-                style,
-                entries,
-                entryDBMap,
-                true,
-                null,
-                null,
-                null
-            )
+            getCitationMarker2(style, entries, entryDBMap, true, null, null, null)
         );
     }
 
@@ -564,15 +525,7 @@ void testVonAuthorMarker() throws IOException {
         entryDBMap.put(entry, database);
         assertEquals(
             "[von Beta, 2016]",
-            getCitationMarker2(
-                style,
-                entries,
-                entryDBMap,
-                true,
-                null,
-                null,
-                null
-            )
+            getCitationMarker2(style, entries, entryDBMap, true, null, null, null)
         );
     }
 
@@ -597,15 +550,7 @@ void testNullAuthorMarker() throws IOException {
         entryDBMap.put(entry, database);
         assertEquals(
             "[, 2016]",
-            getCitationMarker2(
-                style,
-                entries,
-                entryDBMap,
-                true,
-                null,
-                null,
-                null
-            )
+            getCitationMarker2(style, entries, entryDBMap, true, null, null, null)
         );
     }
 
@@ -630,15 +575,7 @@ void testNullYearMarker() throws IOException {
         entryDBMap.put(entry, database);
         assertEquals(
             "[von Beta, ]",
-            getCitationMarker2(
-                style,
-                entries,
-                entryDBMap,
-                true,
-                null,
-                null,
-                null
-            )
+            getCitationMarker2(style, entries, entryDBMap, true, null, null, null)
         );
     }
 
@@ -662,15 +599,7 @@ void testEmptyEntryMarker() throws IOException {
         entryDBMap.put(entry, database);
         assertEquals(
             "[, ]",
-            getCitationMarker2(
-                style,
-                entries,
-                entryDBMap,
-                true,
-                null,
-                null,
-                null
-            )
+            getCitationMarker2(style, entries, entryDBMap, true, null, null, null)
         );
     }
 
@@ -712,15 +641,7 @@ void testGetCitationMarkerInParenthesisUniquefiers() throws IOException {
 
         assertEquals(
             "[Beta, 2000; Beta, 2000; Epsilon, 2001]",
-            getCitationMarker2b(
-                style,
-                entries,
-                entryDBMap,
-                true,
-                null,
-                null,
-                null
-            )
+            getCitationMarker2b(style, entries, entryDBMap, true, null, null, null)
         );
         assertEquals(
             "[Beta, 2000a,b; Epsilon, 2001]",
@@ -774,15 +695,7 @@ void testGetCitationMarkerInTextUniquefiers() throws IOException {
 
         assertEquals(
             "Beta [2000]; Beta [2000]; Epsilon [2001]",
-            getCitationMarker2b(
-                style,
-                entries,
-                entryDBMap,
-                false,
-                null,
-                null,
-                null
-            )
+            getCitationMarker2b(style, entries, entryDBMap, false, null, null, null)
         );
         assertEquals(
             "Beta [2000a,b]; Epsilon [2001]",
@@ -799,8 +712,7 @@ void testGetCitationMarkerInTextUniquefiers() throws IOException {
     }
 
     @Test
-    void testGetCitationMarkerInParenthesisUniquefiersThreeSameAuthor()
-        throws IOException {
+    void testGetCitationMarkerInParenthesisUniquefiersThreeSameAuthor() throws IOException {
         OOBibStyle style = new OOBibStyle(
             StyleLoader.DEFAULT_NUMERICAL_STYLE_PATH,
             layoutFormatterPreferences,
@@ -851,8 +763,7 @@ void testGetCitationMarkerInParenthesisUniquefiersThreeSameAuthor()
     }
 
     @Test
-    void testGetCitationMarkerInTextUniquefiersThreeSameAuthor()
-        throws IOException {
+    void testGetCitationMarkerInTextUniquefiersThreeSameAuthor() throws IOException {
         OOBibStyle style = new OOBibStyle(
             StyleLoader.DEFAULT_NUMERICAL_STYLE_PATH,
             layoutFormatterPreferences,
@@ -978,10 +889,7 @@ void testEmptyStringPropertyAndOxfordComma() throws Exception {
 
         BibEntry entry = new BibEntry();
         entry.setType(StandardEntryType.Article);
-        entry.setField(
-            StandardField.AUTHOR,
-            "Alpha von Beta and Gamma Epsilon and Ypsilon Tau"
-        );
+        entry.setField(StandardField.AUTHOR, "Alpha von Beta and Gamma Epsilon and Ypsilon Tau");
         entry.setField(StandardField.TITLE, "JabRef Manual");
         entry.setField(StandardField.YEAR, "2016");
         entry.setCitationKey("a1");
@@ -990,15 +898,7 @@ void testEmptyStringPropertyAndOxfordComma() throws Exception {
         entryDBMap.put(entry, database);
         assertEquals(
             "von Beta, Epsilon, & Tau, 2016",
-            getCitationMarker2(
-                style,
-                entries,
-                entryDBMap,
-                true,
-                null,
-                null,
-                null
-            )
+            getCitationMarker2(style, entries, entryDBMap, true, null, null, null)
         );
     }
 
@@ -1083,29 +983,11 @@ void testGetCitationMarkerJoinFirst() 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(
@@ -1138,29 +1020,11 @@ void testGetCitationMarkerJoinFirst() 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(
@@ -1181,29 +1045,11 @@ void testGetCitationMarkerJoinFirst() 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(
@@ -1226,29 +1072,11 @@ void testGetCitationMarkerJoinFirst() 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(
@@ -1267,29 +1095,11 @@ void testGetCitationMarkerJoinFirst() throws IOException {
         // 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(
@@ -1311,29 +1121,11 @@ void testGetCitationMarkerJoinFirst() 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(
@@ -1351,37 +1143,13 @@ void testGetCitationMarkerJoinFirst() throws IOException {
         // 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(
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 1947b5fccb2..304f2f0d0fb 100644
--- a/src/test/java/org/jabref/logic/openoffice/style/OOBibStyleTestHelper.java
+++ b/src/test/java/org/jabref/logic/openoffice/style/OOBibStyleTestHelper.java
@@ -25,8 +25,7 @@ class OOBibStyleTestHelper {
     /*
      * Minimal implementation for CitationMarkerNumericEntry
      */
-    static class CitationMarkerNumericEntryImpl
-        implements CitationMarkerNumericEntry {
+    static class CitationMarkerNumericEntryImpl implements CitationMarkerNumericEntry {
 
         /*
          * The number encoding "this entry is unresolved" for the constructor.
@@ -43,10 +42,7 @@ public CitationMarkerNumericEntryImpl(
             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);
         }
 
@@ -66,16 +62,12 @@ public Optional<OOText> getPageInfo() {
         }
     }
 
-    static class CitationMarkerNumericBibEntryImpl
-        implements CitationMarkerNumericBibEntry {
+    static class CitationMarkerNumericBibEntryImpl implements CitationMarkerNumericBibEntry {
 
         String key;
         Optional<Integer> number;
 
-        public CitationMarkerNumericBibEntryImpl(
-            String key,
-            Optional<Integer> number
-        ) {
+        public CitationMarkerNumericBibEntryImpl(String key, Optional<Integer> number) {
             this.key = key;
             this.number = number;
         }
@@ -91,10 +83,7 @@ public Optional<Integer> getNumber() {
         }
     }
 
-    static CitationMarkerNumericBibEntry numBibEntry(
-        String key,
-        Optional<Integer> number
-    ) {
+    static CitationMarkerNumericBibEntry numBibEntry(String key, Optional<Integer> number) {
         return new CitationMarkerNumericBibEntryImpl(key, number);
     }
 
@@ -112,46 +101,29 @@ static String runGetNumCitationMarker2a(
         if (inList) {
             if (num.size() != 1) {
                 throw new IllegalArgumentException(
-                    "Numeric label for the bibliography with " +
-                    num.size() +
-                    " numbers?"
+                    "Numeric label for the bibliography with " + num.size() + " numbers?"
                 );
             }
             int n = num.get(0);
-            CitationMarkerNumericBibEntryImpl x =
-                new CitationMarkerNumericBibEntryImpl(
-                    "key",
-                    n == 0 ? Optional.empty() : Optional.of(n)
-                );
+            CitationMarkerNumericBibEntryImpl x = 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()
-                    )
-                )
+                .map(n -> new CitationMarkerNumericEntryImpl("key" + n, n, Optional.empty()))
                 .collect(Collectors.toList());
-            return style
-                .getNumCitationMarker2(input, minGroupingCount)
-                .toString();
+            return style.getNumCitationMarker2(input, minGroupingCount).toString();
         }
     }
 
     /*
      * Unlike getNumCitationMarker, getNumCitationMarker2 can handle pageInfo.
      */
-    static CitationMarkerNumericEntry numEntry(
-        String key,
-        int num,
-        String pageInfoOrNull
-    ) {
-        Optional<OOText> pageInfo = Optional.ofNullable(
-            OOText.fromString(pageInfoOrNull)
-        );
+    static CitationMarkerNumericEntry numEntry(String key, int num, String pageInfoOrNull) {
+        Optional<OOText> pageInfo = Optional.ofNullable(OOText.fromString(pageInfoOrNull));
         return new CitationMarkerNumericEntryImpl(key, num, pageInfo);
     }
 
@@ -160,9 +132,7 @@ static String runGetNumCitationMarker2b(
         int minGroupingCount,
         CitationMarkerNumericEntry... s
     ) {
-        List<CitationMarkerNumericEntry> input = Stream
-            .of(s)
-            .collect(Collectors.toList());
+        List<CitationMarkerNumericEntry> input = Stream.of(s).collect(Collectors.toList());
         OOText res = style.getNumCitationMarker2(input, minGroupingCount);
         return res.toString();
     }
@@ -182,19 +152,13 @@ static CitationMarkerEntry makeCitationMarkerEntry(
         boolean isFirstAppearanceOfSource
     ) {
         if (entry.getCitationKey().isEmpty()) {
-            throw new IllegalArgumentException(
-                "entry.getCitationKey() is empty"
-            );
+            throw new IllegalArgumentException("entry.getCitationKey() is empty");
         }
         String citationKey = entry.getCitationKey().get();
         Citation result = new Citation(citationKey);
-        result.setLookupResult(
-            Optional.of(new CitationLookupResult(entry, database))
-        );
+        result.setLookupResult(Optional.of(new CitationLookupResult(entry, database)));
         result.setUniqueLetter(Optional.ofNullable(uniqueLetterQ));
-        Optional<OOText> pageInfo = Optional.ofNullable(
-            OOText.fromString(pageInfoQ)
-        );
+        Optional<OOText> pageInfo = Optional.ofNullable(OOText.fromString(pageInfoQ));
         result.setPageInfo(PageInfo.normalizePageInfo(pageInfo));
         result.setIsFirstAppearanceOfSource(isFirstAppearanceOfSource);
         return result;
@@ -239,11 +203,7 @@ static String getCitationMarker2ab(
             citationMarkerEntries.add(e);
         }
         return style
-            .createCitationMarker(
-                citationMarkerEntries,
-                inParenthesis,
-                nonunique
-            )
+            .createCitationMarker(citationMarkerEntries, inParenthesis, nonunique)
             .toString();
     }
 
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 8a371b9b753..3aa90d91fea 100644
--- a/src/test/java/org/jabref/logic/openoffice/style/OOPreFormatterTest.java
+++ b/src/test/java/org/jabref/logic/openoffice/style/OOPreFormatterTest.java
@@ -50,36 +50,15 @@ public void testFormatStripLatexCommands() {
 
     @Test
     public void testFormatting() {
-        assertEquals(
-            "<i>kkk</i>",
-            new OOPreFormatter().format("\\textit{kkk}")
-        );
+        assertEquals("<i>kkk</i>", new OOPreFormatter().format("\\textit{kkk}"));
         assertEquals("<i>kkk</i>", new OOPreFormatter().format("{\\it kkk}"));
         assertEquals("<i>kkk</i>", new OOPreFormatter().format("\\emph{kkk}"));
-        assertEquals(
-            "<b>kkk</b>",
-            new OOPreFormatter().format("\\textbf{kkk}")
-        );
-        assertEquals(
-            "<smallcaps>kkk</smallcaps>",
-            new OOPreFormatter().format("\\textsc{kkk}")
-        );
+        assertEquals("<b>kkk</b>", new OOPreFormatter().format("\\textbf{kkk}"));
+        assertEquals("<smallcaps>kkk</smallcaps>", new OOPreFormatter().format("\\textsc{kkk}"));
         assertEquals("<s>kkk</s>", new OOPreFormatter().format("\\sout{kkk}"));
-        assertEquals(
-            "<u>kkk</u>",
-            new OOPreFormatter().format("\\underline{kkk}")
-        );
-        assertEquals(
-            "<tt>kkk</tt>",
-            new OOPreFormatter().format("\\texttt{kkk}")
-        );
-        assertEquals(
-            "<sup>kkk</sup>",
-            new OOPreFormatter().format("\\textsuperscript{kkk}")
-        );
-        assertEquals(
-            "<sub>kkk</sub>",
-            new OOPreFormatter().format("\\textsubscript{kkk}")
-        );
+        assertEquals("<u>kkk</u>", new OOPreFormatter().format("\\underline{kkk}"));
+        assertEquals("<tt>kkk</tt>", new OOPreFormatter().format("\\texttt{kkk}"));
+        assertEquals("<sup>kkk</sup>", new OOPreFormatter().format("\\textsuperscript{kkk}"));
+        assertEquals("<sub>kkk</sub>", new OOPreFormatter().format("\\textsubscript{kkk}"));
     }
 }
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 6e8a4e74570..163e5562577 100644
--- a/src/test/java/org/jabref/logic/openoffice/style/StyleLoaderTest.java
+++ b/src/test/java/org/jabref/logic/openoffice/style/StyleLoaderTest.java
@@ -31,10 +31,8 @@ public class StyleLoaderTest {
 
     @BeforeEach
     public void setUp() {
-        preferences =
-            mock(OpenOfficePreferences.class, Answers.RETURNS_DEEP_STUBS);
-        layoutPreferences =
-            mock(LayoutFormatterPreferences.class, Answers.RETURNS_DEEP_STUBS);
+        preferences = mock(OpenOfficePreferences.class, Answers.RETURNS_DEEP_STUBS);
+        layoutPreferences = mock(LayoutFormatterPreferences.class, Answers.RETURNS_DEEP_STUBS);
         abbreviationRepository = mock(JournalAbbreviationRepository.class);
     }
 
@@ -42,13 +40,7 @@ public void setUp() {
     public void throwNPEWithNullPreferences() {
         assertThrows(
             NullPointerException.class,
-            () ->
-                loader =
-                    new StyleLoader(
-                        null,
-                        layoutPreferences,
-                        abbreviationRepository
-                    )
+            () -> loader = new StyleLoader(null, layoutPreferences, abbreviationRepository)
         );
     }
 
@@ -58,11 +50,7 @@ public void throwNPEWithNullLayoutPreferences() {
             NullPointerException.class,
             () ->
                 loader =
-                    new StyleLoader(
-                        mock(OpenOfficePreferences.class),
-                        null,
-                        abbreviationRepository
-                    )
+                    new StyleLoader(mock(OpenOfficePreferences.class), null, abbreviationRepository)
         );
     }
 
@@ -71,24 +59,14 @@ public void throwNPEWithNullAbbreviationRepository() {
         assertThrows(
             NullPointerException.class,
             () ->
-                loader =
-                    new StyleLoader(
-                        mock(OpenOfficePreferences.class),
-                        layoutPreferences,
-                        null
-                    )
+                loader = new StyleLoader(mock(OpenOfficePreferences.class), layoutPreferences, null)
         );
     }
 
     @Test
     public void testGetStylesWithEmptyExternal() {
         preferences.setExternalStyles(Collections.emptyList());
-        loader =
-            new StyleLoader(
-                preferences,
-                layoutPreferences,
-                abbreviationRepository
-            );
+        loader = new StyleLoader(preferences, layoutPreferences, abbreviationRepository);
 
         assertEquals(2, loader.getStyles().size());
     }
@@ -96,20 +74,10 @@ public void testGetStylesWithEmptyExternal() {
     @Test
     public void testAddStyleLeadsToOneMoreStyle() throws URISyntaxException {
         preferences.setExternalStyles(Collections.emptyList());
-        loader =
-            new StyleLoader(
-                preferences,
-                layoutPreferences,
-                abbreviationRepository
-            );
+        loader = new StyleLoader(preferences, layoutPreferences, abbreviationRepository);
 
         String filename = Path
-            .of(
-                StyleLoader.class.getResource(
-                        StyleLoader.DEFAULT_AUTHORYEAR_STYLE_PATH
-                    )
-                    .toURI()
-            )
+            .of(StyleLoader.class.getResource(StyleLoader.DEFAULT_AUTHORYEAR_STYLE_PATH).toURI())
             .toFile()
             .getPath();
         loader.addStyleIfValid(filename);
@@ -119,79 +87,44 @@ public void testAddStyleLeadsToOneMoreStyle() throws URISyntaxException {
     @Test
     public void testAddInvalidStyleLeadsToNoMoreStyle() {
         preferences.setExternalStyles(Collections.emptyList());
-        loader =
-            new StyleLoader(
-                preferences,
-                layoutPreferences,
-                abbreviationRepository
-            );
+        loader = new StyleLoader(preferences, layoutPreferences, abbreviationRepository);
         int beforeAdding = loader.getStyles().size();
-        loader.addStyleIfValid(
-            "DefinitelyNotAValidFileNameOrWeAreExtremelyUnlucky"
-        );
+        loader.addStyleIfValid("DefinitelyNotAValidFileNameOrWeAreExtremelyUnlucky");
         assertEquals(beforeAdding, loader.getStyles().size());
     }
 
     @Test
     public void testInitalizeWithOneExternalFile() throws URISyntaxException {
         String filename = Path
-            .of(
-                StyleLoader.class.getResource(
-                        StyleLoader.DEFAULT_AUTHORYEAR_STYLE_PATH
-                    )
-                    .toURI()
-            )
+            .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
-            );
+        loader = new StyleLoader(preferences, layoutPreferences, abbreviationRepository);
         assertEquals(NUMBER_OF_INTERNAL_STYLES + 1, loader.getStyles().size());
     }
 
     @Test
     public void testInitalizeWithIncorrectExternalFile() {
         preferences.setExternalStyles(
-            Collections.singletonList(
-                "DefinitelyNotAValidFileNameOrWeAreExtremelyUnlucky"
-            )
+            Collections.singletonList("DefinitelyNotAValidFileNameOrWeAreExtremelyUnlucky")
         );
 
-        loader =
-            new StyleLoader(
-                preferences,
-                layoutPreferences,
-                abbreviationRepository
-            );
+        loader = new StyleLoader(preferences, layoutPreferences, abbreviationRepository);
         assertEquals(NUMBER_OF_INTERNAL_STYLES, loader.getStyles().size());
     }
 
     @Test
-    public void testInitalizeWithOneExternalFileRemoveStyle()
-        throws URISyntaxException {
+    public void testInitalizeWithOneExternalFileRemoveStyle() throws URISyntaxException {
         String filename = Path
-            .of(
-                StyleLoader.class.getResource(
-                        StyleLoader.DEFAULT_AUTHORYEAR_STYLE_PATH
-                    )
-                    .toURI()
-            )
+            .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
-            );
+        loader = new StyleLoader(preferences, layoutPreferences, abbreviationRepository);
         List<OOBibStyle> toremove = new ArrayList<>();
         int beforeRemoving = loader.getStyles().size();
         for (OOBibStyle style : loader.getStyles()) {
@@ -210,23 +143,13 @@ public void testInitalizeWithOneExternalFileRemoveStyle()
     public void testInitalizeWithOneExternalFileRemoveStyleUpdatesPreferences()
         throws URISyntaxException {
         String filename = Path
-            .of(
-                StyleLoader.class.getResource(
-                        StyleLoader.DEFAULT_AUTHORYEAR_STYLE_PATH
-                    )
-                    .toURI()
-            )
+            .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
-            );
+        loader = new StyleLoader(preferences, layoutPreferences, abbreviationRepository);
         List<OOBibStyle> toremove = new ArrayList<>();
         for (OOBibStyle style : loader.getStyles()) {
             if (!style.isInternalStyle()) {
@@ -242,23 +165,12 @@ public void testInitalizeWithOneExternalFileRemoveStyleUpdatesPreferences()
     }
 
     @Test
-    public void testAddSameStyleTwiceLeadsToOneMoreStyle()
-        throws URISyntaxException {
+    public void testAddSameStyleTwiceLeadsToOneMoreStyle() throws URISyntaxException {
         preferences.setExternalStyles(Collections.emptyList());
-        loader =
-            new StyleLoader(
-                preferences,
-                layoutPreferences,
-                abbreviationRepository
-            );
+        loader = new StyleLoader(preferences, layoutPreferences, abbreviationRepository);
         int beforeAdding = loader.getStyles().size();
         String filename = Path
-            .of(
-                StyleLoader.class.getResource(
-                        StyleLoader.DEFAULT_AUTHORYEAR_STYLE_PATH
-                    )
-                    .toURI()
-            )
+            .of(StyleLoader.class.getResource(StyleLoader.DEFAULT_AUTHORYEAR_STYLE_PATH).toURI())
             .toFile()
             .getPath();
         loader.addStyleIfValid(filename);
@@ -268,88 +180,46 @@ public void testAddSameStyleTwiceLeadsToOneMoreStyle()
 
     @Test
     public void testAddNullStyleThrowsNPE() {
-        loader =
-            new StyleLoader(
-                preferences,
-                layoutPreferences,
-                abbreviationRepository
-            );
-        assertThrows(
-            NullPointerException.class,
-            () -> loader.addStyleIfValid(null)
-        );
+        loader = new StyleLoader(preferences, layoutPreferences, abbreviationRepository);
+        assertThrows(NullPointerException.class, () -> loader.addStyleIfValid(null));
     }
 
     @Test
     public void testGetDefaultUsedStyleWhenEmpty() {
-        when(preferences.getCurrentStyle())
-            .thenReturn(StyleLoader.DEFAULT_AUTHORYEAR_STYLE_PATH);
+        when(preferences.getCurrentStyle()).thenReturn(StyleLoader.DEFAULT_AUTHORYEAR_STYLE_PATH);
         preferences.clearCurrentStyle();
-        loader =
-            new StyleLoader(
-                preferences,
-                layoutPreferences,
-                abbreviationRepository
-            );
+        loader = new StyleLoader(preferences, layoutPreferences, abbreviationRepository);
         OOBibStyle style = loader.getUsedStyle();
         assertTrue(style.isValid());
-        assertEquals(
-            StyleLoader.DEFAULT_AUTHORYEAR_STYLE_PATH,
-            style.getPath()
-        );
-        assertEquals(
-            StyleLoader.DEFAULT_AUTHORYEAR_STYLE_PATH,
-            preferences.getCurrentStyle()
-        );
+        assertEquals(StyleLoader.DEFAULT_AUTHORYEAR_STYLE_PATH, style.getPath());
+        assertEquals(StyleLoader.DEFAULT_AUTHORYEAR_STYLE_PATH, preferences.getCurrentStyle());
     }
 
     @Test
     public void testGetStoredUsedStyle() {
-        when(preferences.getCurrentStyle())
-            .thenReturn(StyleLoader.DEFAULT_NUMERICAL_STYLE_PATH);
-        loader =
-            new StyleLoader(
-                preferences,
-                layoutPreferences,
-                abbreviationRepository
-            );
+        when(preferences.getCurrentStyle()).thenReturn(StyleLoader.DEFAULT_NUMERICAL_STYLE_PATH);
+        loader = new StyleLoader(preferences, layoutPreferences, abbreviationRepository);
         OOBibStyle style = loader.getUsedStyle();
         assertTrue(style.isValid());
         assertEquals(StyleLoader.DEFAULT_NUMERICAL_STYLE_PATH, style.getPath());
-        assertEquals(
-            StyleLoader.DEFAULT_NUMERICAL_STYLE_PATH,
-            preferences.getCurrentStyle()
-        );
+        assertEquals(StyleLoader.DEFAULT_NUMERICAL_STYLE_PATH, preferences.getCurrentStyle());
     }
 
     @Test
     public void testGetDefaultUsedStyleWhenIncorrect() {
         when(preferences.getCurrentStyle())
             .thenReturn("ljlkjlkjnljnvdlsjniuhwelfhuewfhlkuewhfuwhelu");
-        loader =
-            new StyleLoader(
-                preferences,
-                layoutPreferences,
-                abbreviationRepository
-            );
+        loader = new StyleLoader(preferences, layoutPreferences, abbreviationRepository);
         OOBibStyle style = loader.getUsedStyle();
         assertTrue(style.isValid());
-        assertEquals(
-            StyleLoader.DEFAULT_AUTHORYEAR_STYLE_PATH,
-            style.getPath()
-        );
+        assertEquals(StyleLoader.DEFAULT_AUTHORYEAR_STYLE_PATH, style.getPath());
     }
 
     @Test
     public void testRemoveInternalStyleReturnsFalseAndDoNotRemove() {
         preferences.setExternalStyles(Collections.emptyList());
 
-        loader =
-            new StyleLoader(
-                preferences,
-                layoutPreferences,
-                abbreviationRepository
-            );
+        loader = new StyleLoader(preferences, layoutPreferences, abbreviationRepository);
         List<OOBibStyle> toremove = new ArrayList<>();
         for (OOBibStyle style : loader.getStyles()) {
             if (style.isInternalStyle()) {
diff --git a/src/test/java/org/jabref/logic/pdf/EntryAnnotationImporterTest.java b/src/test/java/org/jabref/logic/pdf/EntryAnnotationImporterTest.java
index fd00336cad4..cc49b8d9baf 100644
--- a/src/test/java/org/jabref/logic/pdf/EntryAnnotationImporterTest.java
+++ b/src/test/java/org/jabref/logic/pdf/EntryAnnotationImporterTest.java
@@ -19,26 +19,21 @@
 
 public class EntryAnnotationImporterTest {
 
-    private final BibDatabaseContext databaseContext = mock(
-        BibDatabaseContext.class
-    );
+    private final BibDatabaseContext databaseContext = mock(BibDatabaseContext.class);
     private BibEntry entry;
 
     @BeforeEach
     public void setUp() {
         entry = new BibEntry();
         when(databaseContext.getFileDirectories(any()))
-            .thenReturn(
-                Collections.singletonList(Path.of("src/test/resources/pdfs/"))
-            );
+            .thenReturn(Collections.singletonList(Path.of("src/test/resources/pdfs/")));
     }
 
     @Test
     public void readEntryExampleThesis() {
         // given
         entry.setField(StandardField.FILE, ":thesis-example.pdf:PDF");
-        EntryAnnotationImporter entryAnnotationImporter =
-            new EntryAnnotationImporter(entry);
+        EntryAnnotationImporter entryAnnotationImporter = new EntryAnnotationImporter(entry);
 
         // when
         Map<Path, List<FileAnnotation>> annotations =
diff --git a/src/test/java/org/jabref/logic/pdf/PdfAnnotationImporterTest.java b/src/test/java/org/jabref/logic/pdf/PdfAnnotationImporterTest.java
index 92781cd9c12..1be1e75f67e 100644
--- a/src/test/java/org/jabref/logic/pdf/PdfAnnotationImporterTest.java
+++ b/src/test/java/org/jabref/logic/pdf/PdfAnnotationImporterTest.java
@@ -34,9 +34,7 @@ public void invalidDirectory() {
     public void invalidDocumentType() {
         assertEquals(
             Collections.emptyList(),
-            importer.importAnnotations(
-                Path.of("src/test/resources/pdfs/write-protected.docx")
-            )
+            importer.importAnnotations(Path.of("src/test/resources/pdfs/write-protected.docx"))
         );
     }
 
@@ -44,9 +42,7 @@ public void invalidDocumentType() {
     public void noAnnotationsWriteProtected() {
         assertEquals(
             Collections.emptyList(),
-            importer.importAnnotations(
-                Path.of("src/test/resources/pdfs/write-protected.pdf")
-            )
+            importer.importAnnotations(Path.of("src/test/resources/pdfs/write-protected.pdf"))
         );
     }
 
@@ -54,9 +50,7 @@ public void noAnnotationsWriteProtected() {
     public void noAnnotationsEncrypted() {
         assertEquals(
             Collections.emptyList(),
-            importer.importAnnotations(
-                Path.of("src/test/resources/pdfs/encrypted.pdf")
-            )
+            importer.importAnnotations(Path.of("src/test/resources/pdfs/encrypted.pdf"))
         );
     }
 
@@ -64,11 +58,7 @@ public void noAnnotationsEncrypted() {
     public void twoAnnotationsThesisExample() {
         assertEquals(
             2,
-            importer
-                .importAnnotations(
-                    Path.of("src/test/resources/pdfs/thesis-example.pdf")
-                )
-                .size()
+            importer.importAnnotations(Path.of("src/test/resources/pdfs/thesis-example.pdf")).size()
         );
     }
 
@@ -76,9 +66,7 @@ public void twoAnnotationsThesisExample() {
     public void noAnnotationsMinimal() {
         assertEquals(
             Collections.emptyList(),
-            importer.importAnnotations(
-                Path.of("src/test/resources/pdfs/minimal.pdf")
-            )
+            importer.importAnnotations(Path.of("src/test/resources/pdfs/minimal.pdf"))
         );
     }
 
@@ -95,9 +83,7 @@ public void inlineNoteMinimal() {
 
         assertEquals(
             Collections.singletonList(expected),
-            importer.importAnnotations(
-                Path.of("src/test/resources/pdfs/minimal-inlinenote.pdf")
-            )
+            importer.importAnnotations(Path.of("src/test/resources/pdfs/minimal-inlinenote.pdf"))
         );
     }
 
@@ -114,9 +100,7 @@ public void popupNoteMinimal() {
 
         assertEquals(
             Collections.singletonList(expected),
-            importer.importAnnotations(
-                Path.of("src/test/resources/pdfs/minimal-popup.pdf")
-            )
+            importer.importAnnotations(Path.of("src/test/resources/pdfs/minimal-popup.pdf"))
         );
     }
 
@@ -194,9 +178,7 @@ public void squigglyWithNoteMinimal() {
 
         assertEquals(
             Collections.singletonList(expected),
-            importer.importAnnotations(
-                Path.of("src/test/resources/pdfs/minimal-squiggly.pdf")
-            )
+            importer.importAnnotations(Path.of("src/test/resources/pdfs/minimal-squiggly.pdf"))
         );
     }
 
@@ -221,9 +203,7 @@ public void strikeoutWithNoteMinimal() {
 
         assertEquals(
             Collections.singletonList(expected),
-            importer.importAnnotations(
-                Path.of("src/test/resources/pdfs/minimal-strikeout.pdf")
-            )
+            importer.importAnnotations(Path.of("src/test/resources/pdfs/minimal-strikeout.pdf"))
         );
     }
 
@@ -249,9 +229,7 @@ public void highlightWithNoteMinimal() {
         assertEquals(
             Collections.singletonList(expected),
             importer.importAnnotations(
-                Path.of(
-                    "src/test/resources/pdfs/minimal-highlight-with-note.pdf"
-                )
+                Path.of("src/test/resources/pdfs/minimal-highlight-with-note.pdf")
             )
         );
     }
@@ -277,9 +255,7 @@ public void underlineWithNoteMinimal() {
 
         assertEquals(
             Collections.singletonList(expected),
-            importer.importAnnotations(
-                Path.of("src/test/resources/pdfs/minimal-underline.pdf")
-            )
+            importer.importAnnotations(Path.of("src/test/resources/pdfs/minimal-underline.pdf"))
         );
     }
 
@@ -296,9 +272,7 @@ public void polygonNoNoteMinimal() {
 
         assertEquals(
             Collections.singletonList(expected),
-            importer.importAnnotations(
-                Path.of("src/test/resources/pdfs/minimal-polygon.pdf")
-            )
+            importer.importAnnotations(Path.of("src/test/resources/pdfs/minimal-polygon.pdf"))
         );
     }
 }
diff --git a/src/test/java/org/jabref/logic/pdf/search/indexing/DocumentReaderTest.java b/src/test/java/org/jabref/logic/pdf/search/indexing/DocumentReaderTest.java
index dcaec3d701c..5edf15ec564 100644
--- a/src/test/java/org/jabref/logic/pdf/search/indexing/DocumentReaderTest.java
+++ b/src/test/java/org/jabref/logic/pdf/search/indexing/DocumentReaderTest.java
@@ -30,15 +30,11 @@ public class DocumentReaderTest {
     public void setup() {
         this.databaseContext = mock(BibDatabaseContext.class);
         when(databaseContext.getFileDirectories(Mockito.any()))
-            .thenReturn(
-                Collections.singletonList(Path.of("src/test/resources/pdfs"))
-            );
+            .thenReturn(Collections.singletonList(Path.of("src/test/resources/pdfs")));
         this.filePreferences = mock(FilePreferences.class);
         when(filePreferences.getUserAndHost()).thenReturn("testuser-testhost");
-        when(filePreferences.getMainFileDirectory())
-            .thenReturn(Optional.empty());
-        when(filePreferences.shouldStoreFilesRelativeToBibFile())
-            .thenReturn(true);
+        when(filePreferences.getMainFileDirectory()).thenReturn(Optional.empty());
+        when(filePreferences.shouldStoreFilesRelativeToBibFile()).thenReturn(true);
     }
 
     @Test
@@ -46,16 +42,11 @@ public void unknownFileTestShouldReturnEmptyList() {
         // given
         BibEntry entry = new BibEntry();
         entry.setFiles(
-            Collections.singletonList(
-                new LinkedFile("Wrong path", "NOT_PRESENT.pdf", "Type")
-            )
+            Collections.singletonList(new LinkedFile("Wrong path", "NOT_PRESENT.pdf", "Type"))
         );
 
         // when
-        final List<Document> emptyDocumentList = new DocumentReader(
-            entry,
-            filePreferences
-        )
+        final List<Document> emptyDocumentList = new DocumentReader(entry, filePreferences)
             .readLinkedPdfs(databaseContext);
 
         // then
@@ -64,18 +55,12 @@ public void unknownFileTestShouldReturnEmptyList() {
 
     private static Stream<Arguments> getLinesToMerge() {
         return Stream.of(
-            Arguments.of(
-                "Sentences end with periods.",
-                "Sentences end\nwith periods."
-            ),
+            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(
-                "Longer texts often have both.",
-                "Longer te-\nxts often\nhave both."
-            ),
+            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")
         );
     }
diff --git a/src/test/java/org/jabref/logic/pdf/search/indexing/PdfIndexerTest.java b/src/test/java/org/jabref/logic/pdf/search/indexing/PdfIndexerTest.java
index e83365a1d26..4a40e1ef658 100644
--- a/src/test/java/org/jabref/logic/pdf/search/indexing/PdfIndexerTest.java
+++ b/src/test/java/org/jabref/logic/pdf/search/indexing/PdfIndexerTest.java
@@ -38,9 +38,7 @@ public void setUp(@TempDir Path indexDir) throws IOException {
         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"))
-            );
+            .thenReturn(Collections.singletonList(Path.of("src/test/resources/pdfs")));
         when(context.getFulltextIndexPath()).thenReturn(indexDir);
         when(context.getDatabase()).thenReturn(database);
         when(context.getEntries()).thenReturn(database.getEntries());
@@ -170,11 +168,7 @@ public void metaDataIndex() throws IOException {
         BibEntry entry = new BibEntry(StandardEntryType.Article);
         entry.setFiles(
             Collections.singletonList(
-                new LinkedFile(
-                    "Example Thesis",
-                    "metaData.pdf",
-                    StandardFileType.PDF.getName()
-                )
+                new LinkedFile("Example Thesis", "metaData.pdf", StandardFileType.PDF.getName())
             )
         );
 
@@ -265,11 +259,7 @@ public void exampleThesisIndexAppendMetaData() throws IOException {
         metadata.setCitationKey("MetaData2017");
         metadata.setFiles(
             Collections.singletonList(
-                new LinkedFile(
-                    "Metadata file",
-                    "metaData.pdf",
-                    StandardFileType.PDF.getName()
-                )
+                new LinkedFile("Metadata file", "metaData.pdf", StandardFileType.PDF.getName())
             )
         );
 
diff --git a/src/test/java/org/jabref/logic/pdf/search/retrieval/PdfSearcherTest.java b/src/test/java/org/jabref/logic/pdf/search/retrieval/PdfSearcherTest.java
index 6f0a5eeca11..6e0dc210a37 100644
--- a/src/test/java/org/jabref/logic/pdf/search/retrieval/PdfSearcherTest.java
+++ b/src/test/java/org/jabref/logic/pdf/search/retrieval/PdfSearcherTest.java
@@ -34,20 +34,14 @@ public void setUp(@TempDir Path indexDir) throws IOException {
         BibDatabase database = new BibDatabase();
         BibDatabaseContext context = mock(BibDatabaseContext.class);
         when(context.getFileDirectories(Mockito.any()))
-            .thenReturn(
-                Collections.singletonList(Path.of("src/test/resources/pdfs"))
-            );
+            .thenReturn(Collections.singletonList(Path.of("src/test/resources/pdfs")));
         when(context.getFulltextIndexPath()).thenReturn(indexDir);
         when(context.getDatabase()).thenReturn(database);
         when(context.getEntries()).thenReturn(database.getEntries());
         BibEntry examplePdf = new BibEntry(StandardEntryType.Article);
         examplePdf.setFiles(
             Collections.singletonList(
-                new LinkedFile(
-                    "Example Entry",
-                    "example.pdf",
-                    StandardFileType.PDF.getName()
-                )
+                new LinkedFile("Example Entry", "example.pdf", StandardFileType.PDF.getName())
             )
         );
         database.insertEntry(examplePdf);
@@ -55,11 +49,7 @@ public void setUp(@TempDir Path indexDir) throws IOException {
         BibEntry metaDataEntry = new BibEntry(StandardEntryType.Article);
         metaDataEntry.setFiles(
             Collections.singletonList(
-                new LinkedFile(
-                    "Metadata Entry",
-                    "metaData.pdf",
-                    StandardFileType.PDF.getName()
-                )
+                new LinkedFile("Metadata Entry", "metaData.pdf", StandardFileType.PDF.getName())
             )
         );
         metaDataEntry.setCitationKey("MetaData2017");
@@ -128,9 +118,6 @@ public void searchWithNullString() throws IOException {
 
     @Test
     public void searchForZeroResults() throws IOException {
-        assertThrows(
-            IllegalArgumentException.class,
-            () -> search.search("test", 0)
-        );
+        assertThrows(IllegalArgumentException.class, () -> search.search("test", 0));
     }
 }
diff --git a/src/test/java/org/jabref/logic/protectedterms/ProtectedTermsLoaderTest.java b/src/test/java/org/jabref/logic/protectedterms/ProtectedTermsLoaderTest.java
index fb92d645712..5b478428b13 100644
--- a/src/test/java/org/jabref/logic/protectedterms/ProtectedTermsLoaderTest.java
+++ b/src/test/java/org/jabref/logic/protectedterms/ProtectedTermsLoaderTest.java
@@ -33,9 +33,7 @@ void setUp() {
 
     @Test
     void testGetProtectedTerms() throws URISyntaxException {
-        List<ProtectedTermsList> backupList = new ArrayList<>(
-            loader.getProtectedTermsLists()
-        );
+        List<ProtectedTermsList> backupList = new ArrayList<>(loader.getProtectedTermsLists());
 
         for (ProtectedTermsList list : backupList) {
             loader.removeProtectedTermsList(list);
@@ -77,8 +75,7 @@ void testAddProtectedTermsListFromFile() throws URISyntaxException {
     }
 
     @Test
-    void testReadProtectedTermsListFromFileReadsDescription()
-        throws URISyntaxException {
+    void testReadProtectedTermsListFromFileReadsDescription() throws URISyntaxException {
         Path file = Path.of(
             ProtectedTermsLoader.class.getResource(
                     "/org/jabref/logic/protectedterms/namedterms.terms"
@@ -86,14 +83,12 @@ void testReadProtectedTermsListFromFileReadsDescription()
                 .toURI()
         );
 
-        ProtectedTermsList list =
-            ProtectedTermsLoader.readProtectedTermsListFromFile(file, true);
+        ProtectedTermsList list = ProtectedTermsLoader.readProtectedTermsListFromFile(file, true);
         assertEquals("Term list", list.getDescription());
     }
 
     @Test
-    void testReadProtectedTermsListFromFileDisabledWorks()
-        throws URISyntaxException {
+    void testReadProtectedTermsListFromFileDisabledWorks() throws URISyntaxException {
         Path file = Path.of(
             ProtectedTermsLoader.class.getResource(
                     "/org/jabref/logic/protectedterms/namedterms.terms"
@@ -101,14 +96,12 @@ void testReadProtectedTermsListFromFileDisabledWorks()
                 .toURI()
         );
 
-        ProtectedTermsList list =
-            ProtectedTermsLoader.readProtectedTermsListFromFile(file, false);
+        ProtectedTermsList list = ProtectedTermsLoader.readProtectedTermsListFromFile(file, false);
         assertFalse(list.isEnabled());
     }
 
     @Test
-    void testReadProtectedTermsListFromFileEnabledWorks()
-        throws URISyntaxException {
+    void testReadProtectedTermsListFromFileEnabledWorks() throws URISyntaxException {
         Path file = Path.of(
             ProtectedTermsLoader.class.getResource(
                     "/org/jabref/logic/protectedterms/namedterms.terms"
@@ -116,14 +109,12 @@ void testReadProtectedTermsListFromFileEnabledWorks()
                 .toURI()
         );
 
-        ProtectedTermsList list =
-            ProtectedTermsLoader.readProtectedTermsListFromFile(file, true);
+        ProtectedTermsList list = ProtectedTermsLoader.readProtectedTermsListFromFile(file, true);
         assertTrue(list.isEnabled());
     }
 
     @Test
-    void testReadProtectedTermsListFromFileIsNotInternalList()
-        throws URISyntaxException {
+    void testReadProtectedTermsListFromFileIsNotInternalList() throws URISyntaxException {
         Path file = Path.of(
             ProtectedTermsLoader.class.getResource(
                     "/org/jabref/logic/protectedterms/namedterms.terms"
@@ -131,8 +122,7 @@ void testReadProtectedTermsListFromFileIsNotInternalList()
                 .toURI()
         );
 
-        ProtectedTermsList list =
-            ProtectedTermsLoader.readProtectedTermsListFromFile(file, true);
+        ProtectedTermsList list = ProtectedTermsLoader.readProtectedTermsListFromFile(file, true);
         assertFalse(list.isInternalList());
     }
 
@@ -145,12 +135,9 @@ void testReadProtectedTermsListFromFileNoDescriptionGivesDefaultDescription()
                 )
                 .toURI()
         );
-        ProtectedTermsList list =
-            ProtectedTermsLoader.readProtectedTermsListFromFile(file, true);
+        ProtectedTermsList list = ProtectedTermsLoader.readProtectedTermsListFromFile(file, true);
         assertEquals(
-            Localization.lang(
-                "The text after the last line starting with # will be used"
-            ),
+            Localization.lang("The text after the last line starting with # will be used"),
             list.getDescription()
         );
     }
diff --git a/src/test/java/org/jabref/logic/remote/RemoteCommunicationTest.java b/src/test/java/org/jabref/logic/remote/RemoteCommunicationTest.java
index 7064d02f88e..52b68404e7d 100644
--- a/src/test/java/org/jabref/logic/remote/RemoteCommunicationTest.java
+++ b/src/test/java/org/jabref/logic/remote/RemoteCommunicationTest.java
@@ -65,10 +65,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);
 
diff --git a/src/test/java/org/jabref/logic/remote/RemoteSetupTest.java b/src/test/java/org/jabref/logic/remote/RemoteSetupTest.java
index 16b5089c9cd..cfc304802ac 100644
--- a/src/test/java/org/jabref/logic/remote/RemoteSetupTest.java
+++ b/src/test/java/org/jabref/logic/remote/RemoteSetupTest.java
@@ -36,15 +36,11 @@ void testGoodCase() {
         final int port = 34567;
         final String[] message = new String[] { "MYMESSAGE" };
 
-        try (
-            RemoteListenerServerManager server = new RemoteListenerServerManager()
-        ) {
+        try (RemoteListenerServerManager server = new RemoteListenerServerManager()) {
             assertFalse(server.isOpen());
             server.openAndStart(messageHandler, port);
             assertTrue(server.isOpen());
-            assertTrue(
-                new RemoteClient(port).sendCommandLineArguments(message)
-            );
+            assertTrue(new RemoteClient(port).sendCommandLineArguments(message));
             verify(messageHandler).handleCommandLineArguments(message);
             server.stop();
             assertFalse(server.isOpen());
@@ -56,9 +52,7 @@ void testGoodCaseWithAllLifecycleMethods() {
         final int port = 34567;
         final String[] message = new String[] { "MYMESSAGE" };
 
-        try (
-            RemoteListenerServerManager server = new RemoteListenerServerManager()
-        ) {
+        try (RemoteListenerServerManager server = new RemoteListenerServerManager()) {
             assertFalse(server.isOpen());
             assertTrue(server.isNotStartedBefore());
             server.stop();
@@ -71,9 +65,7 @@ void testGoodCaseWithAllLifecycleMethods() {
             assertTrue(server.isOpen());
             assertFalse(server.isNotStartedBefore());
 
-            assertTrue(
-                new RemoteClient(port).sendCommandLineArguments(message)
-            );
+            assertTrue(new RemoteClient(port).sendCommandLineArguments(message));
             verify(messageHandler).handleCommandLineArguments(message);
             server.stop();
             assertFalse(server.isOpen());
@@ -90,14 +82,11 @@ void testPortAlreadyInUse() throws IOException {
         try (ServerSocket socket = new ServerSocket(port)) {
             assertTrue(socket.isBound());
 
-            try (
-                RemoteListenerServerManager server = new RemoteListenerServerManager()
-            ) {
+            try (RemoteListenerServerManager server = new RemoteListenerServerManager()) {
                 assertFalse(server.isOpen());
                 server.openAndStart(messageHandler, port);
                 assertFalse(server.isOpen());
-                verify(messageHandler, never())
-                    .handleCommandLineArguments(any());
+                verify(messageHandler, never()).handleCommandLineArguments(any());
             }
         }
     }
@@ -107,15 +96,11 @@ void testClientTimeout() {
         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
-    void pingReturnsFalseForWrongServerListening()
-        throws IOException, InterruptedException {
+    void pingReturnsFalseForWrongServerListening() throws IOException, InterruptedException {
         final int port = 34567;
 
         try (ServerSocket socket = new ServerSocket(port)) {
@@ -138,8 +123,7 @@ void pingReturnsFalseForWrongServerListening()
     }
 
     @Test
-    void pingReturnsFalseForNoServerListening()
-        throws IOException, InterruptedException {
+    void pingReturnsFalseForNoServerListening() throws IOException, InterruptedException {
         final int port = 34567;
 
         assertFalse(new RemoteClient(port).ping());
@@ -149,9 +133,7 @@ void pingReturnsFalseForNoServerListening()
     void pingReturnsTrueWhenServerIsRunning() {
         final int port = 34567;
 
-        try (
-            RemoteListenerServerManager server = new RemoteListenerServerManager()
-        ) {
+        try (RemoteListenerServerManager server = new RemoteListenerServerManager()) {
             server.openAndStart(messageHandler, port);
 
             assertTrue(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 40f1b2d7547..33af32c3100 100644
--- a/src/test/java/org/jabref/logic/remote/RemoteUtilTest.java
+++ b/src/test/java/org/jabref/logic/remote/RemoteUtilTest.java
@@ -9,10 +9,7 @@ public class RemoteUtilTest {
 
     @Test
     public void rejectPortNumberBelowZero() {
-        assertFalse(
-            RemoteUtil.isUserPort(-55),
-            "Port number must be non negative."
-        );
+        assertFalse(RemoteUtil.isUserPort(-55), "Port number must be non negative.");
     }
 
     @Test
@@ -30,10 +27,7 @@ public void rejectReservedSystemPorts() {
     @Test
     public void rejectPortsAbove16Bits() {
         // 2 ^ 16 - 1 => 65535
-        assertFalse(
-            RemoteUtil.isUserPort(65536),
-            "Port number should be below 65535."
-        );
+        assertFalse(RemoteUtil.isUserPort(65536), "Port number should be below 65535.");
     }
 
     @Test
diff --git a/src/test/java/org/jabref/logic/search/DatabaseSearcherTest.java b/src/test/java/org/jabref/logic/search/DatabaseSearcherTest.java
index 00c66d0c6c1..be4611f645a 100644
--- a/src/test/java/org/jabref/logic/search/DatabaseSearcherTest.java
+++ b/src/test/java/org/jabref/logic/search/DatabaseSearcherTest.java
@@ -48,11 +48,7 @@ public void testNoMatchesFromEmptyDatabase() {
 
     @Test
     public void testNoMatchesFromEmptyDatabaseWithInvalidSearchExpression() {
-        List<BibEntry> matches = new DatabaseSearcher(
-            INVALID_SEARCH_QUERY,
-            database
-        )
-            .getMatches();
+        List<BibEntry> matches = new DatabaseSearcher(INVALID_SEARCH_QUERY, database).getMatches();
         assertEquals(Collections.emptyList(), matches);
     }
 
@@ -121,10 +117,7 @@ public void testNoMatchesFromEmptyDatabaseWithInvalidQuery() {
             )
         );
 
-        DatabaseSearcher databaseSearcher = new DatabaseSearcher(
-            query,
-            database
-        );
+        DatabaseSearcher databaseSearcher = new DatabaseSearcher(query, database);
 
         assertEquals(Collections.emptyList(), databaseSearcher.getMatches());
     }
@@ -142,8 +135,7 @@ public void testCorrectMatchFromDatabaseWithIncollectionTypeEntry() {
                 SearchRules.SearchFlags.REGULAR_EXPRESSION
             )
         );
-        List<BibEntry> matches = new DatabaseSearcher(query, database)
-            .getMatches();
+        List<BibEntry> matches = new DatabaseSearcher(query, database).getMatches();
 
         assertEquals(Collections.singletonList(entry), matches);
     }
@@ -164,15 +156,9 @@ public void testNoMatchesFromDatabaseWithTwoEntries() {
                 SearchRules.SearchFlags.REGULAR_EXPRESSION
             )
         );
-        DatabaseSearcher databaseSearcher = new DatabaseSearcher(
-            query,
-            database
-        );
+        DatabaseSearcher databaseSearcher = new DatabaseSearcher(query, database);
 
-        assertEquals(
-            Collections.singletonList(entry),
-            databaseSearcher.getMatches()
-        );
+        assertEquals(Collections.singletonList(entry), databaseSearcher.getMatches());
     }
 
     @Test
@@ -188,10 +174,7 @@ public void testNoMatchesFromDabaseWithIncollectionTypeEntry() {
                 SearchRules.SearchFlags.REGULAR_EXPRESSION
             )
         );
-        DatabaseSearcher databaseSearcher = new DatabaseSearcher(
-            query,
-            database
-        );
+        DatabaseSearcher databaseSearcher = new DatabaseSearcher(query, database);
 
         assertEquals(Collections.emptyList(), databaseSearcher.getMatches());
     }
@@ -208,10 +191,7 @@ public void testNoMatchFromDatabaseWithEmptyEntry() {
                 SearchRules.SearchFlags.REGULAR_EXPRESSION
             )
         );
-        DatabaseSearcher databaseSearcher = new DatabaseSearcher(
-            query,
-            database
-        );
+        DatabaseSearcher databaseSearcher = new DatabaseSearcher(query, database);
 
         assertEquals(Collections.emptyList(), databaseSearcher.getMatches());
     }
diff --git a/src/test/java/org/jabref/logic/search/SearchQueryTest.java b/src/test/java/org/jabref/logic/search/SearchQueryTest.java
index cb8684ce7e0..cb460723809 100644
--- a/src/test/java/org/jabref/logic/search/SearchQueryTest.java
+++ b/src/test/java/org/jabref/logic/search/SearchQueryTest.java
@@ -31,18 +31,14 @@ public void testToString() {
         );
         assertEquals(
             "\"asdf\" (case insensitive, plain text)",
-            new SearchQuery("asdf", EnumSet.noneOf(SearchFlags.class))
-                .toString()
+            new SearchQuery("asdf", EnumSet.noneOf(SearchFlags.class)).toString()
         );
     }
 
     @Test
     public void testIsContainsBasedSearch() {
         assertTrue(
-            new SearchQuery(
-                "asdf",
-                EnumSet.of(SearchRules.SearchFlags.CASE_SENSITIVE)
-            )
+            new SearchQuery("asdf", EnumSet.of(SearchRules.SearchFlags.CASE_SENSITIVE))
                 .isContainsBasedSearch()
         );
         assertTrue(
@@ -56,10 +52,7 @@ public void testIsContainsBasedSearch() {
                 .isContainsBasedSearch()
         );
         assertFalse(
-            new SearchQuery(
-                "author=asdf",
-                EnumSet.of(SearchRules.SearchFlags.CASE_SENSITIVE)
-            )
+            new SearchQuery("author=asdf", EnumSet.of(SearchRules.SearchFlags.CASE_SENSITIVE))
                 .isContainsBasedSearch()
         );
     }
@@ -67,10 +60,7 @@ public void testIsContainsBasedSearch() {
     @Test
     public void testIsGrammarBasedSearch() {
         assertFalse(
-            new SearchQuery(
-                "asdf",
-                EnumSet.of(SearchRules.SearchFlags.CASE_SENSITIVE)
-            )
+            new SearchQuery("asdf", EnumSet.of(SearchRules.SearchFlags.CASE_SENSITIVE))
                 .isGrammarBasedSearch()
         );
         assertFalse(
@@ -84,10 +74,7 @@ public void testIsGrammarBasedSearch() {
                 .isGrammarBasedSearch()
         );
         assertTrue(
-            new SearchQuery(
-                "author=asdf",
-                EnumSet.of(SearchRules.SearchFlags.CASE_SENSITIVE)
-            )
+            new SearchQuery("author=asdf", EnumSet.of(SearchRules.SearchFlags.CASE_SENSITIVE))
                 .isGrammarBasedSearch()
         );
     }
@@ -241,22 +228,14 @@ public void testIsMatch() {
     @Test
     public void testIsValidQueryNotAsRegEx() {
         assertTrue(
-            new SearchQuery(
-                "asdf",
-                EnumSet.of(SearchRules.SearchFlags.CASE_SENSITIVE)
-            )
-                .isValid()
+            new SearchQuery("asdf", EnumSet.of(SearchRules.SearchFlags.CASE_SENSITIVE)).isValid()
         );
     }
 
     @Test
     public void testIsValidQueryContainsBracketNotAsRegEx() {
         assertTrue(
-            new SearchQuery(
-                "asdf[",
-                EnumSet.of(SearchRules.SearchFlags.CASE_SENSITIVE)
-            )
-                .isValid()
+            new SearchQuery("asdf[", EnumSet.of(SearchRules.SearchFlags.CASE_SENSITIVE)).isValid()
         );
     }
 
@@ -347,10 +326,7 @@ public void testIsValidQueryWithNumbersAndEqualSignAsRegEx() {
     @Test
     public void testIsValidQueryWithEqualSignNotAsRegEx() {
         assertTrue(
-            new SearchQuery(
-                "author=asdf",
-                EnumSet.of(SearchRules.SearchFlags.CASE_SENSITIVE)
-            )
+            new SearchQuery("author=asdf", EnumSet.of(SearchRules.SearchFlags.CASE_SENSITIVE))
                 .isValid()
         );
     }
@@ -358,10 +334,7 @@ public void testIsValidQueryWithEqualSignNotAsRegEx() {
     @Test
     public void testIsValidQueryWithNumbersAndEqualSignNotAsRegEx() {
         assertTrue(
-            new SearchQuery(
-                "author=123",
-                EnumSet.of(SearchRules.SearchFlags.CASE_SENSITIVE)
-            )
+            new SearchQuery("author=123", EnumSet.of(SearchRules.SearchFlags.CASE_SENSITIVE))
                 .isValid()
         );
     }
@@ -389,20 +362,14 @@ public void isMatchedForNormalAndFieldBasedSearchMixed() {
     public void testSimpleTerm() {
         String query = "progress";
 
-        SearchQuery result = new SearchQuery(
-            query,
-            EnumSet.noneOf(SearchFlags.class)
-        );
+        SearchQuery result = new SearchQuery(query, EnumSet.noneOf(SearchFlags.class));
         assertFalse(result.isGrammarBasedSearch());
     }
 
     @Test
     public void testGetPattern() {
         String query = "progress";
-        SearchQuery result = new SearchQuery(
-            query,
-            EnumSet.noneOf(SearchFlags.class)
-        );
+        SearchQuery result = new SearchQuery(query, EnumSet.noneOf(SearchFlags.class));
         Pattern pattern = Pattern.compile("(\\Qprogress\\E)");
         // We can't directly compare the pattern objects
         assertEquals(
@@ -447,13 +414,10 @@ public void testEscapingInPattern() {
             queryText,
             EnumSet.noneOf(SearchFlags.class)
         );
-        String pattern =
-            "(\\Q<([{\\^-=$!|]})?*+.>\\E)|(\\Qword1\\E)|(\\Qword2.\\E)";
+        String pattern = "(\\Q<([{\\^-=$!|]})?*+.>\\E)|(\\Qword1\\E)|(\\Qword2.\\E)";
         assertEquals(
             Optional.of(pattern),
-            textQueryWithSpecialChars
-                .getPatternForWords()
-                .map(Pattern::toString)
+            textQueryWithSpecialChars.getPatternForWords().map(Pattern::toString)
         );
     }
 
@@ -465,13 +429,10 @@ public void testEscapingInJavascriptPattern() {
             queryText,
             EnumSet.noneOf(SearchFlags.class)
         );
-        String pattern =
-            "(\\(\\[\\{\\\\\\^\\$\\|\\]\\}\\)\\?\\*\\+\\.\\/)|(word1)|(word2\\.)";
+        String pattern = "(\\(\\[\\{\\\\\\^\\$\\|\\]\\}\\)\\?\\*\\+\\.\\/)|(word1)|(word2\\.)";
         assertEquals(
             Optional.of(pattern),
-            textQueryWithSpecialChars
-                .getJavaScriptPatternForWords()
-                .map(Pattern::toString)
+            textQueryWithSpecialChars.getJavaScriptPatternForWords().map(Pattern::toString)
         );
     }
 }
diff --git a/src/test/java/org/jabref/logic/shared/ConnectorTest.java b/src/test/java/org/jabref/logic/shared/ConnectorTest.java
index f5d56d3ce99..41ead0350fe 100644
--- a/src/test/java/org/jabref/logic/shared/ConnectorTest.java
+++ b/src/test/java/org/jabref/logic/shared/ConnectorTest.java
@@ -12,15 +12,11 @@ public class ConnectorTest {
 
     public static DBMSConnection getTestDBMSConnection(DBMSType dbmsType)
         throws SQLException, InvalidDBMSConnectionPropertiesException {
-        DBMSConnectionProperties properties = getTestConnectionProperties(
-            dbmsType
-        );
+        DBMSConnectionProperties properties = getTestConnectionProperties(dbmsType);
         return new DBMSConnection(properties);
     }
 
-    public static DBMSConnectionProperties getTestConnectionProperties(
-        DBMSType dbmsType
-    ) {
+    public static DBMSConnectionProperties getTestConnectionProperties(DBMSType dbmsType) {
         switch (dbmsType) {
             case MYSQL:
                 return new DBMSConnectionPropertiesBuilder()
@@ -54,8 +50,7 @@ public static DBMSConnectionProperties getTestConnectionProperties(
                     .setUseSSL(false)
                     .createDBMSConnectionProperties();
             default:
-                return new DBMSConnectionPropertiesBuilder()
-                    .createDBMSConnectionProperties();
+                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 38d627527fb..15d335584d7 100644
--- a/src/test/java/org/jabref/logic/shared/DBMSConnectionPropertiesTest.java
+++ b/src/test/java/org/jabref/logic/shared/DBMSConnectionPropertiesTest.java
@@ -8,40 +8,32 @@ 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();
-        assertEquals(
-            "jdbc:mariadb://localhost:3108/jabref",
-            connectionProperties.getUrl()
-        );
+        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();
-        assertEquals(
-            "jdbc:oracle:thin:@localhost:3108/jabref",
-            connectionProperties.getUrl()
-        );
+        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 9b170e55579..8194fcc8f73 100644
--- a/src/test/java/org/jabref/logic/shared/DBMSConnectionTest.java
+++ b/src/test/java/org/jabref/logic/shared/DBMSConnectionTest.java
@@ -12,9 +12,7 @@ public class DBMSConnectionTest {
 
     @ParameterizedTest
     @EnumSource(DBMSType.class)
-    public void getConnectionFailsWhenconnectingToInvalidHost(
-        DBMSType dbmsType
-    ) {
+    public void getConnectionFailsWhenconnectingToInvalidHost(DBMSType dbmsType) {
         assertThrows(
             SQLException.class,
             () ->
diff --git a/src/test/java/org/jabref/logic/shared/DBMSProcessorTest.java b/src/test/java/org/jabref/logic/shared/DBMSProcessorTest.java
index f23eea96b2a..52574154cd7 100644
--- a/src/test/java/org/jabref/logic/shared/DBMSProcessorTest.java
+++ b/src/test/java/org/jabref/logic/shared/DBMSProcessorTest.java
@@ -43,9 +43,7 @@ public void setup() throws Exception {
         this.dbmsType = TestManager.getDBMSTypeTestParameter();
         this.dbmsConnection = ConnectorTest.getTestDBMSConnection(dbmsType);
         this.dbmsProcessor =
-            DBMSProcessor.getProcessorInstance(
-                ConnectorTest.getTestDBMSConnection(dbmsType)
-            );
+            DBMSProcessor.getProcessorInstance(ConnectorTest.getTestDBMSConnection(dbmsType));
         TestManager.clearTables(this.dbmsConnection);
         dbmsProcessor.setupSharedDatabase();
     }
@@ -78,26 +76,14 @@ void testInsertEntry() throws SQLException {
 
         Map<String, String> actualFieldMap = new HashMap<>();
 
-        try (
-            ResultSet entryResultSet = selectFrom(
-                "ENTRY",
-                dbmsConnection,
-                dbmsProcessor
-            )
-        ) {
+        try (ResultSet entryResultSet = selectFrom("ENTRY", dbmsConnection, dbmsProcessor)) {
             assertTrue(entryResultSet.next());
             assertEquals(1, entryResultSet.getInt("SHARED_ID"));
             assertEquals("inproceedings", entryResultSet.getString("TYPE"));
             assertEquals(1, entryResultSet.getInt("VERSION"));
             assertFalse(entryResultSet.next());
 
-            try (
-                ResultSet fieldResultSet = selectFrom(
-                    "FIELD",
-                    dbmsConnection,
-                    dbmsProcessor
-                )
-            ) {
+            try (ResultSet fieldResultSet = selectFrom("FIELD", dbmsConnection, dbmsProcessor)) {
                 while (fieldResultSet.next()) {
                     actualFieldMap.put(
                         fieldResultSet.getString("NAME"),
@@ -111,12 +97,7 @@ void testInsertEntry() throws SQLException {
             .getFieldMap()
             .entrySet()
             .stream()
-            .collect(
-                Collectors.toMap(
-                    entry -> entry.getKey().getName(),
-                    Map.Entry::getValue
-                )
-            );
+            .collect(Collectors.toMap(entry -> entry.getKey().getName(), Map.Entry::getValue));
 
         assertEquals(expectedFieldMap, actualFieldMap);
     }
@@ -127,13 +108,7 @@ void testInsertEntryWithEmptyFields() throws SQLException {
 
         dbmsProcessor.insertEntry(expectedEntry);
 
-        try (
-            ResultSet entryResultSet = selectFrom(
-                "ENTRY",
-                dbmsConnection,
-                dbmsProcessor
-            )
-        ) {
+        try (ResultSet entryResultSet = selectFrom("ENTRY", dbmsConnection, dbmsProcessor)) {
             assertTrue(entryResultSet.next());
             assertEquals(1, entryResultSet.getInt("SHARED_ID"));
             assertEquals("article", entryResultSet.getString("TYPE"));
@@ -141,13 +116,7 @@ void testInsertEntryWithEmptyFields() throws SQLException {
             assertFalse(entryResultSet.next());
 
             // Adding an empty entry should not create an entry in field table, only in entry table
-            try (
-                ResultSet fieldResultSet = selectFrom(
-                    "FIELD",
-                    dbmsConnection,
-                    dbmsProcessor
-                )
-            ) {
+            try (ResultSet fieldResultSet = selectFrom("FIELD", dbmsConnection, dbmsProcessor)) {
                 assertFalse(fieldResultSet.next());
             }
         }
@@ -214,9 +183,7 @@ void testGetEntriesByIdList() throws Exception {
         dbmsProcessor.insertEntry(firstEntry);
         dbmsProcessor.insertEntry(secondEntry);
 
-        List<BibEntry> sharedEntriesByIdList = dbmsProcessor.getSharedEntries(
-            Arrays.asList(1, 2)
-        );
+        List<BibEntry> sharedEntriesByIdList = dbmsProcessor.getSharedEntries(Arrays.asList(1, 2));
 
         assertEquals(List.of(firstEntry, secondEntry), sharedEntriesByIdList);
     }
@@ -231,10 +198,7 @@ void testUpdateNewerEntry() {
         bibEntry.getSharedBibEntryData().setVersion(0);
         bibEntry.setField(StandardField.YEAR, "1993");
 
-        assertThrows(
-            OfflineLockException.class,
-            () -> dbmsProcessor.updateEntry(bibEntry)
-        );
+        assertThrows(OfflineLockException.class, () -> dbmsProcessor.updateEntry(bibEntry));
     }
 
     @Test
@@ -246,10 +210,9 @@ void testUpdateEqualEntry() 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);
     }
@@ -263,13 +226,7 @@ void testRemoveAllEntries() throws SQLException {
         dbmsProcessor.insertEntry(secondEntry);
         dbmsProcessor.removeEntries(entriesToRemove);
 
-        try (
-            ResultSet resultSet = selectFrom(
-                "ENTRY",
-                dbmsConnection,
-                dbmsProcessor
-            )
-        ) {
+        try (ResultSet resultSet = selectFrom("ENTRY", dbmsConnection, dbmsProcessor)) {
             assertFalse(resultSet.next());
         }
     }
@@ -288,13 +245,7 @@ void testRemoveSomeEntries() throws SQLException {
         dbmsProcessor.insertEntry(thirdEntry);
         dbmsProcessor.removeEntries(entriesToRemove);
 
-        try (
-            ResultSet entryResultSet = selectFrom(
-                "ENTRY",
-                dbmsConnection,
-                dbmsProcessor
-            )
-        ) {
+        try (ResultSet entryResultSet = selectFrom("ENTRY", dbmsConnection, dbmsProcessor)) {
             assertTrue(entryResultSet.next());
             assertEquals(2, entryResultSet.getInt("SHARED_ID"));
             assertFalse(entryResultSet.next());
@@ -307,36 +258,21 @@ void testRemoveSingleEntry() throws SQLException {
         dbmsProcessor.insertEntry(entryToRemove);
         dbmsProcessor.removeEntries(Collections.singletonList(entryToRemove));
 
-        try (
-            ResultSet entryResultSet = selectFrom(
-                "ENTRY",
-                dbmsConnection,
-                dbmsProcessor
-            )
-        ) {
+        try (ResultSet entryResultSet = selectFrom("ENTRY", dbmsConnection, dbmsProcessor)) {
             assertFalse(entryResultSet.next());
         }
     }
 
     @Test
     void testRemoveEntriesOnNullThrows() {
-        assertThrows(
-            NullPointerException.class,
-            () -> dbmsProcessor.removeEntries(null)
-        );
+        assertThrows(NullPointerException.class, () -> dbmsProcessor.removeEntries(null));
     }
 
     @Test
     void testRemoveEmptyEntryList() throws SQLException {
         dbmsProcessor.removeEntries(Collections.emptyList());
 
-        try (
-            ResultSet entryResultSet = selectFrom(
-                "ENTRY",
-                dbmsConnection,
-                dbmsProcessor
-            )
-        ) {
+        try (ResultSet entryResultSet = selectFrom("ENTRY", dbmsConnection, dbmsProcessor)) {
             assertFalse(entryResultSet.next());
         }
     }
@@ -358,24 +294,21 @@ void testGetSharedEntry() {
 
         dbmsProcessor.insertEntry(expectedBibEntry);
 
-        Optional<BibEntry> actualBibEntryOptional =
-            dbmsProcessor.getSharedEntry(
-                expectedBibEntry.getSharedBibEntryData().getSharedID()
-            );
+        Optional<BibEntry> actualBibEntryOptional = dbmsProcessor.getSharedEntry(
+            expectedBibEntry.getSharedBibEntryData().getSharedID()
+        );
 
         assertEquals(Optional.of(expectedBibEntry), actualBibEntryOptional);
     }
 
     @Test
     void testGetNotExistingSharedEntry() {
-        Optional<BibEntry> actualBibEntryOptional =
-            dbmsProcessor.getSharedEntry(1);
+        Optional<BibEntry> actualBibEntryOptional = dbmsProcessor.getSharedEntry(1);
         assertFalse(actualBibEntryOptional.isPresent());
     }
 
     @Test
-    void testGetSharedIDVersionMapping()
-        throws OfflineLockException, SQLException {
+    void testGetSharedIDVersionMapping() throws OfflineLockException, SQLException {
         BibEntry firstEntry = getBibEntryExample();
         BibEntry secondEntry = getBibEntryExample();
 
@@ -384,29 +317,17 @@ void testGetSharedIDVersionMapping()
         dbmsProcessor.updateEntry(secondEntry);
 
         Map<Integer, Integer> expectedIDVersionMap = new HashMap<>();
-        expectedIDVersionMap.put(
-            firstEntry.getSharedBibEntryData().getSharedID(),
-            1
-        );
-        expectedIDVersionMap.put(
-            secondEntry.getSharedBibEntryData().getSharedID(),
-            2
-        );
+        expectedIDVersionMap.put(firstEntry.getSharedBibEntryData().getSharedID(), 1);
+        expectedIDVersionMap.put(secondEntry.getSharedBibEntryData().getSharedID(), 2);
 
-        Map<Integer, Integer> actualIDVersionMap =
-            dbmsProcessor.getSharedIDVersionMapping();
+        Map<Integer, Integer> actualIDVersionMap = dbmsProcessor.getSharedIDVersionMapping();
 
         assertEquals(expectedIDVersionMap, actualIDVersionMap);
     }
 
     @Test
     void testGetSharedMetaData() {
-        insertMetaData(
-            "databaseType",
-            "bibtex;",
-            dbmsConnection,
-            dbmsProcessor
-        );
+        insertMetaData("databaseType", "bibtex;", dbmsConnection, dbmsProcessor);
         insertMetaData("protectedFlag", "true;", dbmsConnection, dbmsProcessor);
         insertMetaData(
             "saveActions",
@@ -420,12 +341,7 @@ void testGetSharedMetaData() {
             dbmsConnection,
             dbmsProcessor
         );
-        insertMetaData(
-            "VersionDBStructure",
-            "1",
-            dbmsConnection,
-            dbmsProcessor
-        );
+        insertMetaData("VersionDBStructure", "1", dbmsConnection, dbmsProcessor);
 
         Map<String, String> expectedMetaData = getMetaDataExample();
         Map<String, String> actualMetaData = dbmsProcessor.getSharedMetaData();
@@ -452,10 +368,7 @@ private static Map<String, String> getMetaDataExample() {
             "saveActions",
             "enabled;\nauthor[capitalize,html_to_latex]\ntitle[title_case]\n;"
         );
-        expectedMetaData.put(
-            "saveOrderConfig",
-            "specified;author;false;title;false;year;true;"
-        );
+        expectedMetaData.put("saveOrderConfig", "specified;author;false;title;false;year;true;");
         expectedMetaData.put("VersionDBStructure", "1");
 
         return expectedMetaData;
@@ -472,14 +385,8 @@ private static BibEntry getBibEntryExampleWithEmptyFields() {
 
     private static BibEntry getBibEntryExample2() {
         return new BibEntry(StandardEntryType.InProceedings)
-            .withField(
-                StandardField.AUTHOR,
-                "Shelah, Saharon and Ziegler, Martin"
-            )
-            .withField(
-                StandardField.TITLE,
-                "Algebraically closed groups of large cardinality"
-            )
+            .withField(StandardField.AUTHOR, "Shelah, Saharon and Ziegler, Martin")
+            .withField(StandardField.TITLE, "Algebraically closed groups of large cardinality")
             .withField(StandardField.JOURNAL, "The Journal of Symbolic Logic")
             .withField(StandardField.YEAR, "1979")
             .withCitationKey("algegrou1979");
@@ -487,14 +394,8 @@ private static BibEntry getBibEntryExample2() {
 
     private static BibEntry getBibEntryExample3() {
         return new BibEntry(StandardEntryType.InProceedings)
-            .withField(
-                StandardField.AUTHOR,
-                "Hodges, Wilfrid and Shelah, Saharon"
-            )
-            .withField(
-                StandardField.TITLE,
-                "Infinite games and reduced products"
-            )
+            .withField(StandardField.AUTHOR, "Hodges, Wilfrid and Shelah, Saharon")
+            .withField(StandardField.TITLE, "Infinite games and reduced products")
             .withField(StandardField.JOURNAL, "Annals of Mathematical Logic")
             .withField(StandardField.YEAR, "1981")
             .withCitationKey("infigame1981");
@@ -515,13 +416,7 @@ void testInsertMultipleEntries() throws SQLException {
 
         Map<Integer, Map<String, String>> actualFieldMap = new HashMap<>();
 
-        try (
-            ResultSet entryResultSet = selectFrom(
-                "ENTRY",
-                dbmsConnection,
-                dbmsProcessor
-            )
-        ) {
+        try (ResultSet entryResultSet = selectFrom("ENTRY", dbmsConnection, dbmsProcessor)) {
             assertTrue(entryResultSet.next());
             assertEquals(1, entryResultSet.getInt("SHARED_ID"));
             assertEquals("article", entryResultSet.getString("TYPE"));
@@ -544,19 +439,9 @@ void testInsertMultipleEntries() throws SQLException {
             assertEquals(1, entryResultSet.getInt("VERSION"));
             assertFalse(entryResultSet.next());
 
-            try (
-                ResultSet fieldResultSet = selectFrom(
-                    "FIELD",
-                    dbmsConnection,
-                    dbmsProcessor
-                )
-            ) {
+            try (ResultSet fieldResultSet = selectFrom("FIELD", dbmsConnection, dbmsProcessor)) {
                 while (fieldResultSet.next()) {
-                    if (
-                        actualFieldMap.containsKey(
-                            fieldResultSet.getInt("ENTRY_SHARED_ID")
-                        )
-                    ) {
+                    if (actualFieldMap.containsKey(fieldResultSet.getInt("ENTRY_SHARED_ID"))) {
                         actualFieldMap
                             .get(fieldResultSet.getInt("ENTRY_SHARED_ID"))
                             .put(
@@ -607,9 +492,7 @@ private ResultSet selectFrom(
             return dbmsConnection
                 .getConnection()
                 .createStatement()
-                .executeQuery(
-                    "SELECT * FROM " + escape_Table(table, dbmsProcessor)
-                );
+                .executeQuery("SELECT * FROM " + escape_Table(table, dbmsProcessor));
         } catch (SQLException e) {
             fail(e.getMessage());
             return null;
@@ -644,17 +527,11 @@ private void insertMetaData(
         });
     }
 
-    private static String escape(
-        String expression,
-        DBMSProcessor dbmsProcessor
-    ) {
+    private static String escape(String expression, DBMSProcessor dbmsProcessor) {
         return dbmsProcessor.escape(expression);
     }
 
-    private static String escape_Table(
-        String expression,
-        DBMSProcessor dbmsProcessor
-    ) {
+    private static String escape_Table(String expression, DBMSProcessor dbmsProcessor) {
         return dbmsProcessor.escape_Table(expression);
     }
 
diff --git a/src/test/java/org/jabref/logic/shared/DBMSSynchronizerTest.java b/src/test/java/org/jabref/logic/shared/DBMSSynchronizerTest.java
index 4fce410f20f..8cfafb66c85 100644
--- a/src/test/java/org/jabref/logic/shared/DBMSSynchronizerTest.java
+++ b/src/test/java/org/jabref/logic/shared/DBMSSynchronizerTest.java
@@ -35,8 +35,9 @@ public class DBMSSynchronizerTest {
 
     private DBMSSynchronizer dbmsSynchronizer;
     private BibDatabase bibDatabase;
-    private final GlobalCitationKeyPattern pattern =
-        GlobalCitationKeyPattern.fromPattern("[auth][year]");
+    private final GlobalCitationKeyPattern pattern = GlobalCitationKeyPattern.fromPattern(
+        "[auth][year]"
+    );
     private DBMSConnection dbmsConnection;
     private DBMSProcessor dbmsProcessor;
     private DBMSType dbmsType;
@@ -53,8 +54,7 @@ private BibEntry createExampleBibEntry(int index) {
     public void setup() throws Exception {
         this.dbmsType = TestManager.getDBMSTypeTestParameter();
         this.dbmsConnection = ConnectorTest.getTestDBMSConnection(dbmsType);
-        this.dbmsProcessor =
-            DBMSProcessor.getProcessorInstance(this.dbmsConnection);
+        this.dbmsProcessor = DBMSProcessor.getProcessorInstance(this.dbmsConnection);
         TestManager.clearTables(this.dbmsConnection);
         this.dbmsProcessor.setupSharedDatabase();
 
@@ -62,12 +62,7 @@ public void setup() throws Exception {
         BibDatabaseContext context = new BibDatabaseContext(bibDatabase);
 
         dbmsSynchronizer =
-            new DBMSSynchronizer(
-                context,
-                ',',
-                pattern,
-                new DummyFileUpdateMonitor()
-            );
+            new DBMSSynchronizer(context, ',', pattern, new DummyFileUpdateMonitor());
         bibDatabase.registerListener(dbmsSynchronizer);
 
         dbmsSynchronizer.openSharedDatabase(dbmsConnection);
@@ -93,8 +88,7 @@ public void testEntryAddedEventListener() throws Exception {
     }
 
     @Test
-    public void twoLocalFieldChangesAreSynchronizedCorrectly()
-        throws Exception {
+    public void twoLocalFieldChangesAreSynchronizedCorrectly() throws Exception {
         BibEntry expectedEntry = createExampleBibEntry(1);
         expectedEntry.registerListener(dbmsSynchronizer);
 
@@ -107,8 +101,7 @@ public void twoLocalFieldChangesAreSynchronizedCorrectly()
     }
 
     @Test
-    public void oneLocalAndOneSharedFieldChangeIsSynchronizedCorrectly()
-        throws Exception {
+    public void oneLocalAndOneSharedFieldChangeIsSynchronizedCorrectly() throws Exception {
         BibEntry exampleBibEntry = createExampleBibEntry(1);
         exampleBibEntry.registerListener(dbmsSynchronizer);
 
@@ -126,10 +119,7 @@ public void oneLocalAndOneSharedFieldChangeIsSynchronizedCorrectly()
         BibEntry expectedBibEntry = createExampleBibEntry(1)
             .withField(StandardField.AUTHOR, "Brad L and Gilson");
 
-        assertEquals(
-            Collections.singletonList(expectedBibEntry),
-            actualEntries
-        );
+        assertEquals(Collections.singletonList(expectedBibEntry), actualEntries);
     }
 
     @Test
@@ -161,8 +151,10 @@ public void testMetaDataChangedEventListener() 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");
 
@@ -178,8 +170,7 @@ public void testInitializeDatabases() throws Exception {
     }
 
     @Test
-    public void testSynchronizeLocalDatabaseWithEntryRemoval()
-        throws Exception {
+    public void testSynchronizeLocalDatabaseWithEntryRemoval() throws Exception {
         List<BibEntry> expectedBibEntries = Arrays.asList(
             createExampleBibEntry(1),
             createExampleBibEntry(2)
@@ -194,12 +185,9 @@ public void testSynchronizeLocalDatabaseWithEntryRemoval()
 
         assertEquals(expectedBibEntries, bibDatabase.getEntries());
 
-        dbmsProcessor.removeEntries(
-            Collections.singletonList(expectedBibEntries.get(0))
-        );
+        dbmsProcessor.removeEntries(Collections.singletonList(expectedBibEntries.get(0)));
 
-        expectedBibEntries =
-            Collections.singletonList(expectedBibEntries.get(1));
+        expectedBibEntries = Collections.singletonList(expectedBibEntries.get(1));
 
         dbmsSynchronizer.synchronizeLocalDatabase();
 
@@ -222,10 +210,7 @@ public void testSynchronizeLocalDatabaseWithEntryUpdate() throws Exception {
         dbmsSynchronizer.synchronizeLocalDatabase();
 
         assertEquals(List.of(modifiedBibEntry), bibDatabase.getEntries());
-        assertEquals(
-            List.of(modifiedBibEntry),
-            dbmsProcessor.getSharedEntries()
-        );
+        assertEquals(List.of(modifiedBibEntry), dbmsProcessor.getSharedEntries());
     }
 
     @Test
@@ -242,10 +227,7 @@ public void updateEntryDoesNotModifyLocalDatabase() throws Exception {
         dbmsProcessor.updateEntry(modifiedBibEntry);
 
         assertEquals(List.of(bibEntry), bibDatabase.getEntries());
-        assertEquals(
-            List.of(modifiedBibEntry),
-            dbmsProcessor.getSharedEntries()
-        );
+        assertEquals(List.of(modifiedBibEntry), dbmsProcessor.getSharedEntries());
     }
 
     @Test
@@ -258,10 +240,7 @@ public void testApplyMetaData() throws Exception {
             new FieldFormatterCleanups(
                 true,
                 Collections.singletonList(
-                    new FieldFormatterCleanup(
-                        StandardField.AUTHOR,
-                        new LowerCaseFormatter()
-                    )
+                    new FieldFormatterCleanup(StandardField.AUTHOR, new LowerCaseFormatter())
                 )
             )
         );
@@ -269,9 +248,6 @@ public void testApplyMetaData() throws Exception {
 
         dbmsSynchronizer.applyMetaData();
 
-        assertEquals(
-            "wirthlin, michael j1",
-            bibEntry.getField(StandardField.AUTHOR).get()
-        );
+        assertEquals("wirthlin, michael j1", bibEntry.getField(StandardField.AUTHOR).get());
     }
 }
diff --git a/src/test/java/org/jabref/logic/shared/DBMSTypeTest.java b/src/test/java/org/jabref/logic/shared/DBMSTypeTest.java
index 224c21a4764..c86dbf2f8b8 100644
--- a/src/test/java/org/jabref/logic/shared/DBMSTypeTest.java
+++ b/src/test/java/org/jabref/logic/shared/DBMSTypeTest.java
@@ -32,10 +32,7 @@ public void fromStringWorksForMySQL() {
 
     @Test
     public void fromStringWorksForPostgreSQL() {
-        assertEquals(
-            Optional.of(DBMSType.POSTGRESQL),
-            DBMSType.fromString("PostgreSQL")
-        );
+        assertEquals(Optional.of(DBMSType.POSTGRESQL), DBMSType.fromString("PostgreSQL"));
     }
 
     @Test
@@ -55,26 +52,17 @@ public void fromStringWorksForUnkownString() {
 
     @Test
     public void driverClassForMysqlIsCorrect() {
-        assertEquals(
-            "org.mariadb.jdbc.Driver",
-            DBMSType.MYSQL.getDriverClassPath()
-        );
+        assertEquals("org.mariadb.jdbc.Driver", DBMSType.MYSQL.getDriverClassPath());
     }
 
     @Test
     public void driverClassForOracleIsCorrect() {
-        assertEquals(
-            "oracle.jdbc.driver.OracleDriver",
-            DBMSType.ORACLE.getDriverClassPath()
-        );
+        assertEquals("oracle.jdbc.driver.OracleDriver", DBMSType.ORACLE.getDriverClassPath());
     }
 
     @Test
     public void driverClassForPostgresIsCorrect() {
-        assertEquals(
-            "org.postgresql.Driver",
-            DBMSType.POSTGRESQL.getDriverClassPath()
-        );
+        assertEquals("org.postgresql.Driver", DBMSType.POSTGRESQL.getDriverClassPath());
     }
 
     @Test
@@ -89,10 +77,7 @@ public void fromStringForOracleRturnsCorrectValue() {
 
     @Test
     public void fromStringForPostgresReturnsCorrectValue() {
-        assertEquals(
-            DBMSType.POSTGRESQL,
-            DBMSType.fromString("PostgreSQL").get()
-        );
+        assertEquals(DBMSType.POSTGRESQL, DBMSType.fromString("PostgreSQL").get());
     }
 
     @Test
diff --git a/src/test/java/org/jabref/logic/shared/SynchronizationSimulatorTest.java b/src/test/java/org/jabref/logic/shared/SynchronizationSimulatorTest.java
index 924ae510d5f..89b14309227 100644
--- a/src/test/java/org/jabref/logic/shared/SynchronizationSimulatorTest.java
+++ b/src/test/java/org/jabref/logic/shared/SynchronizationSimulatorTest.java
@@ -29,25 +29,23 @@ public class SynchronizationSimulatorTest {
     private BibDatabaseContext clientContextA;
     private BibDatabaseContext clientContextB;
     private SynchronizationEventListenerTest eventListenerB; // used to monitor occurring events
-    private final GlobalCitationKeyPattern pattern =
-        GlobalCitationKeyPattern.fromPattern("[auth][year]");
+    private final GlobalCitationKeyPattern pattern = GlobalCitationKeyPattern.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
+                "Wirthlin, Michael J and Hutchings, Brad L and Gilson, Kent L " + index
             )
             .withField(
                 StandardField.TITLE,
-                "The nano processor: a low resource reconfigurable processor " +
-                index
+                "The nano processor: a low resource reconfigurable processor " + index
             )
             .withField(
                 StandardField.BOOKTITLE,
-                "FPGAs for Custom Computing Machines, 1994. Proceedings. IEEE Workshop on " +
-                index
+                "FPGAs for Custom Computing Machines, 1994. Proceedings. IEEE Workshop on " + index
             )
             .withField(StandardField.YEAR, "199" + index)
             .withCitationKey("nanoproc199" + index);
@@ -82,9 +80,7 @@ public void setup() throws Exception {
         clientContextB
             .getDBMSSynchronizer()
             .openSharedDatabase(
-                ConnectorTest.getTestDBMSConnection(
-                    TestManager.getDBMSTypeTestParameter()
-                )
+                ConnectorTest.getTestDBMSConnection(TestManager.getDBMSTypeTestParameter())
             );
         eventListenerB = new SynchronizationEventListenerTest();
         clientContextB.getDBMSSynchronizer().registerListener(eventListenerB);
@@ -174,10 +170,7 @@ public void simulateUpdateOnNoLongerExistingEntry() throws Exception {
         assertFalse(clientContextB.getDatabase().getEntries().isEmpty());
         assertNull(eventListenerB.getSharedEntriesNotPresentEvent());
         // client B tries to update the entry
-        BibEntry bibEntryOfClientB = clientContextB
-            .getDatabase()
-            .getEntries()
-            .get(0);
+        BibEntry bibEntryOfClientB = clientContextB.getDatabase().getEntries().get(0);
         bibEntryOfClientB.setField(StandardField.YEAR, "2009");
 
         // here a new SharedEntryNotPresentEvent has been thrown. In this case the user B would get an pop-up window.
@@ -203,10 +196,7 @@ public void simulateEntryChangeConflicts() {
         assertFalse(clientContextB.getDatabase().getEntries().isEmpty());
         assertNull(eventListenerB.getUpdateRefusedEvent());
 
-        BibEntry bibEntryOfClientB = clientContextB
-            .getDatabase()
-            .getEntries()
-            .get(0);
+        BibEntry bibEntryOfClientB = clientContextB.getDatabase().getEntries().get(0);
         // B also tries to change something
         bibEntryOfClientB.setField(StandardField.YEAR, "2016");
 
diff --git a/src/test/java/org/jabref/logic/shared/TestManager.java b/src/test/java/org/jabref/logic/shared/TestManager.java
index 46aa35256f5..59fcde2ebe2 100644
--- a/src/test/java/org/jabref/logic/shared/TestManager.java
+++ b/src/test/java/org/jabref/logic/shared/TestManager.java
@@ -13,13 +13,10 @@ public class TestManager {
      * Determine the DBMSType to test from the environment variable "DMBS". In case that variable is not set, use "PostgreSQL" as default
      */
     public static DBMSType getDBMSTypeTestParameter() {
-        return DBMSType
-            .fromString(System.getenv("DBMS"))
-            .orElse(DBMSType.POSTGRESQL);
+        return DBMSType.fromString(System.getenv("DBMS")).orElse(DBMSType.POSTGRESQL);
     }
 
-    public static void clearTables(DBMSConnection dbmsConnection)
-        throws SQLException {
+    public static void clearTables(DBMSConnection dbmsConnection) throws SQLException {
         Objects.requireNonNull(dbmsConnection);
         DBMSType dbmsType = dbmsConnection.getProperties().getType();
 
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 baa90304d4e..35a045791aa 100644
--- a/src/test/java/org/jabref/logic/shared/security/PasswordTest.java
+++ b/src/test/java/org/jabref/logic/shared/security/PasswordTest.java
@@ -10,8 +10,7 @@
 class PasswordTest {
 
     @Test
-    void passwordAESTest()
-        throws GeneralSecurityException, UnsupportedEncodingException {
+    void passwordAESTest() throws GeneralSecurityException, UnsupportedEncodingException {
         String phrase = "Password";
         Password password = new Password(phrase, "someKey");
         String encryptedPassword = password.encrypt();
@@ -19,8 +18,7 @@ void passwordAESTest()
     }
 
     @Test
-    void passwordAsCharTest()
-        throws GeneralSecurityException, UnsupportedEncodingException {
+    void passwordAsCharTest() throws GeneralSecurityException, UnsupportedEncodingException {
         char[] charPhrase = "Password".toCharArray();
         Password charPassword = new Password(charPhrase, "someKey");
         String charEncryptedPassword = charPassword.encrypt();
diff --git a/src/test/java/org/jabref/logic/texparser/DefaultTexParserTest.java b/src/test/java/org/jabref/logic/texparser/DefaultTexParserTest.java
index d90c46cb2bb..34f6a1f5a37 100644
--- a/src/test/java/org/jabref/logic/texparser/DefaultTexParserTest.java
+++ b/src/test/java/org/jabref/logic/texparser/DefaultTexParserTest.java
@@ -19,25 +19,16 @@ public class DefaultTexParserTest {
     private static final String UNKNOWN = "UnknownKey";
 
     private void testMatchCite(String key, String citeString) {
-        LatexParserResult latexParserResult = new DefaultLatexParser()
-            .parse(citeString);
+        LatexParserResult latexParserResult = new DefaultLatexParser().parse(citeString);
         LatexParserResult expectedParserResult = new LatexParserResult();
 
-        expectedParserResult.addKey(
-            key,
-            Path.of(""),
-            1,
-            0,
-            citeString.length(),
-            citeString
-        );
+        expectedParserResult.addKey(key, Path.of(""), 1, 0, citeString.length(), citeString);
 
         assertEquals(expectedParserResult, latexParserResult);
     }
 
     private void testNonMatchCite(String citeString) {
-        LatexParserResult latexParserResult = new DefaultLatexParser()
-            .parse(citeString);
+        LatexParserResult latexParserResult = new DefaultLatexParser().parse(citeString);
         LatexParserResult expectedParserResult = new LatexParserResult();
 
         assertEquals(expectedParserResult, latexParserResult);
@@ -65,38 +56,20 @@ public void testCiteCommands() {
     public void testTwoCitationsSameLine() {
         String citeString = "\\citep{Einstein1920c} and \\citep{Einstein1920a}";
 
-        LatexParserResult latexParserResult = new DefaultLatexParser()
-            .parse(citeString);
+        LatexParserResult latexParserResult = new DefaultLatexParser().parse(citeString);
         LatexParserResult expectedParserResult = new LatexParserResult();
 
-        expectedParserResult.addKey(
-            EINSTEIN_C,
-            Path.of(""),
-            1,
-            0,
-            21,
-            citeString
-        );
-        expectedParserResult.addKey(
-            EINSTEIN_A,
-            Path.of(""),
-            1,
-            26,
-            47,
-            citeString
-        );
+        expectedParserResult.addKey(EINSTEIN_C, Path.of(""), 1, 0, 21, citeString);
+        expectedParserResult.addKey(EINSTEIN_A, Path.of(""), 1, 26, 47, citeString);
 
         assertEquals(expectedParserResult, latexParserResult);
     }
 
     @Test
     public void testFileEncodingUtf8() throws URISyntaxException {
-        Path texFile = Path.of(
-            DefaultTexParserTest.class.getResource("utf-8.tex").toURI()
-        );
+        Path texFile = Path.of(DefaultTexParserTest.class.getResource("utf-8.tex").toURI());
 
-        LatexParserResult parserResult = new DefaultLatexParser()
-            .parse(texFile);
+        LatexParserResult parserResult = new DefaultLatexParser().parse(texFile);
         LatexParserResult expectedParserResult = new LatexParserResult();
 
         expectedParserResult.getFileList().add(texFile);
@@ -114,12 +87,9 @@ public void testFileEncodingUtf8() throws URISyntaxException {
 
     @Test
     public void testFileEncodingIso88591() throws URISyntaxException {
-        Path texFile = Path.of(
-            DefaultTexParserTest.class.getResource("iso-8859-1.tex").toURI()
-        );
+        Path texFile = Path.of(DefaultTexParserTest.class.getResource("iso-8859-1.tex").toURI());
 
-        LatexParserResult parserResult = new DefaultLatexParser()
-            .parse(texFile);
+        LatexParserResult parserResult = new DefaultLatexParser().parse(texFile);
         LatexParserResult expectedParserResult = new LatexParserResult();
 
         expectedParserResult.getFileList().add(texFile);
@@ -138,12 +108,9 @@ public void testFileEncodingIso88591() throws URISyntaxException {
 
     @Test
     public void testFileEncodingIso885915() throws URISyntaxException {
-        Path texFile = Path.of(
-            DefaultTexParserTest.class.getResource("iso-8859-15.tex").toURI()
-        );
+        Path texFile = Path.of(DefaultTexParserTest.class.getResource("iso-8859-15.tex").toURI());
 
-        LatexParserResult parserResult = new DefaultLatexParser()
-            .parse(texFile);
+        LatexParserResult parserResult = new DefaultLatexParser().parse(texFile);
         LatexParserResult expectedParserResult = new LatexParserResult();
 
         expectedParserResult.getFileList().add(texFile);
@@ -162,23 +129,15 @@ public void testFileEncodingIso885915() throws URISyntaxException {
 
     @Test
     public void testFileEncodingForThreeFiles() throws URISyntaxException {
-        Path texFile = Path.of(
-            DefaultTexParserTest.class.getResource("utf-8.tex").toURI()
-        );
-        Path texFile2 = Path.of(
-            DefaultTexParserTest.class.getResource("iso-8859-1.tex").toURI()
-        );
-        Path texFile3 = Path.of(
-            DefaultTexParserTest.class.getResource("iso-8859-15.tex").toURI()
-        );
+        Path texFile = Path.of(DefaultTexParserTest.class.getResource("utf-8.tex").toURI());
+        Path texFile2 = Path.of(DefaultTexParserTest.class.getResource("iso-8859-1.tex").toURI());
+        Path texFile3 = Path.of(DefaultTexParserTest.class.getResource("iso-8859-15.tex").toURI());
 
         LatexParserResult parserResult = new DefaultLatexParser()
             .parse(Arrays.asList(texFile, texFile2, texFile3));
         LatexParserResult expectedParserResult = new LatexParserResult();
 
-        expectedParserResult
-            .getFileList()
-            .addAll(Arrays.asList(texFile, texFile2, texFile3));
+        expectedParserResult.getFileList().addAll(Arrays.asList(texFile, texFile2, texFile3));
         expectedParserResult.addKey(
             "anykey",
             texFile,
@@ -209,35 +168,15 @@ public void testFileEncodingForThreeFiles() throws URISyntaxException {
 
     @Test
     public void testSingleFile() throws URISyntaxException {
-        Path texFile = Path.of(
-            DefaultTexParserTest.class.getResource("paper.tex").toURI()
-        );
+        Path texFile = Path.of(DefaultTexParserTest.class.getResource("paper.tex").toURI());
 
-        LatexParserResult parserResult = new DefaultLatexParser()
-            .parse(texFile);
+        LatexParserResult parserResult = new DefaultLatexParser().parse(texFile);
         LatexParserResult expectedParserResult = new LatexParserResult();
 
         expectedParserResult.getFileList().add(texFile);
-        expectedParserResult.addBibFile(
-            texFile,
-            texFile.getParent().resolve("origin.bib")
-        );
-        expectedParserResult.addKey(
-            EINSTEIN,
-            texFile,
-            4,
-            0,
-            19,
-            "\\cite{Einstein1920}"
-        );
-        expectedParserResult.addKey(
-            DARWIN,
-            texFile,
-            5,
-            0,
-            17,
-            "\\cite{Darwin1888}."
-        );
+        expectedParserResult.addBibFile(texFile, 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,
@@ -260,44 +199,18 @@ public void testSingleFile() throws URISyntaxException {
 
     @Test
     public void testTwoFiles() throws URISyntaxException {
-        Path texFile = Path.of(
-            DefaultTexParserTest.class.getResource("paper.tex").toURI()
-        );
-        Path texFile2 = Path.of(
-            DefaultTexParserTest.class.getResource("paper2.tex").toURI()
-        );
+        Path texFile = Path.of(DefaultTexParserTest.class.getResource("paper.tex").toURI());
+        Path texFile2 = Path.of(DefaultTexParserTest.class.getResource("paper2.tex").toURI());
 
         LatexParserResult parserResult = new DefaultLatexParser()
             .parse(Arrays.asList(texFile, texFile2));
         LatexParserResult expectedParserResult = new LatexParserResult();
 
-        expectedParserResult
-            .getFileList()
-            .addAll(Arrays.asList(texFile, texFile2));
-        expectedParserResult.addBibFile(
-            texFile,
-            texFile.getParent().resolve("origin.bib")
-        );
-        expectedParserResult.addBibFile(
-            texFile2,
-            texFile2.getParent().resolve("origin.bib")
-        );
-        expectedParserResult.addKey(
-            EINSTEIN,
-            texFile,
-            4,
-            0,
-            19,
-            "\\cite{Einstein1920}"
-        );
-        expectedParserResult.addKey(
-            DARWIN,
-            texFile,
-            5,
-            0,
-            17,
-            "\\cite{Darwin1888}."
-        );
+        expectedParserResult.getFileList().addAll(Arrays.asList(texFile, texFile2));
+        expectedParserResult.addBibFile(texFile, texFile.getParent().resolve("origin.bib"));
+        expectedParserResult.addBibFile(texFile2, texFile2.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,
@@ -344,37 +257,16 @@ public void testTwoFiles() throws URISyntaxException {
 
     @Test
     public void testDuplicateFiles() throws URISyntaxException {
-        Path texFile = Path.of(
-            DefaultTexParserTest.class.getResource("paper.tex").toURI()
-        );
+        Path texFile = Path.of(DefaultTexParserTest.class.getResource("paper.tex").toURI());
 
         LatexParserResult parserResult = new DefaultLatexParser()
             .parse(Arrays.asList(texFile, texFile));
         LatexParserResult expectedParserResult = new LatexParserResult();
 
-        expectedParserResult
-            .getFileList()
-            .addAll(Arrays.asList(texFile, texFile));
-        expectedParserResult.addBibFile(
-            texFile,
-            texFile.getParent().resolve("origin.bib")
-        );
-        expectedParserResult.addKey(
-            EINSTEIN,
-            texFile,
-            4,
-            0,
-            19,
-            "\\cite{Einstein1920}"
-        );
-        expectedParserResult.addKey(
-            DARWIN,
-            texFile,
-            5,
-            0,
-            17,
-            "\\cite{Darwin1888}."
-        );
+        expectedParserResult.getFileList().addAll(Arrays.asList(texFile, texFile));
+        expectedParserResult.addBibFile(texFile, 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,
@@ -397,19 +289,13 @@ public void testDuplicateFiles() throws URISyntaxException {
 
     @Test
     public void testUnknownKey() throws URISyntaxException {
-        Path texFile = Path.of(
-            DefaultTexParserTest.class.getResource("unknown_key.tex").toURI()
-        );
+        Path texFile = Path.of(DefaultTexParserTest.class.getResource("unknown_key.tex").toURI());
 
-        LatexParserResult parserResult = new DefaultLatexParser()
-            .parse(texFile);
+        LatexParserResult parserResult = new DefaultLatexParser().parse(texFile);
         LatexParserResult expectedParserResult = new LatexParserResult();
 
         expectedParserResult.getFileList().add(texFile);
-        expectedParserResult.addBibFile(
-            texFile,
-            texFile.getParent().resolve("origin.bib")
-        );
+        expectedParserResult.addBibFile(texFile, texFile.getParent().resolve("origin.bib"));
         expectedParserResult.addKey(
             DARWIN,
             texFile,
@@ -442,8 +328,7 @@ public void testUnknownKey() throws URISyntaxException {
     public void testFileNotFound() {
         Path texFile = Path.of("file_not_found.tex");
 
-        LatexParserResult parserResult = new DefaultLatexParser()
-            .parse(texFile);
+        LatexParserResult parserResult = new DefaultLatexParser().parse(texFile);
         LatexParserResult expectedParserResult = new LatexParserResult();
 
         expectedParserResult.getFileList().add(texFile);
@@ -453,52 +338,20 @@ public void testFileNotFound() {
 
     @Test
     public void testNestedFiles() throws URISyntaxException {
-        Path texFile = Path.of(
-            DefaultTexParserTest.class.getResource("nested.tex").toURI()
-        );
-        Path texFile2 = Path.of(
-            DefaultTexParserTest.class.getResource("nested2.tex").toURI()
-        );
-        Path texFile3 = Path.of(
-            DefaultTexParserTest.class.getResource("paper.tex").toURI()
-        );
+        Path texFile = Path.of(DefaultTexParserTest.class.getResource("nested.tex").toURI());
+        Path texFile2 = Path.of(DefaultTexParserTest.class.getResource("nested2.tex").toURI());
+        Path texFile3 = Path.of(DefaultTexParserTest.class.getResource("paper.tex").toURI());
 
-        LatexParserResult parserResult = new DefaultLatexParser()
-            .parse(texFile);
+        LatexParserResult parserResult = new DefaultLatexParser().parse(texFile);
         LatexParserResult expectedParserResult = new LatexParserResult();
 
         expectedParserResult.getFileList().add(texFile);
-        expectedParserResult
-            .getNestedFiles()
-            .addAll(Arrays.asList(texFile2, texFile3));
-        expectedParserResult.addBibFile(
-            texFile,
-            texFile.getParent().resolve("origin.bib")
-        );
-        expectedParserResult.addBibFile(
-            texFile2,
-            texFile2.getParent().resolve("origin.bib")
-        );
-        expectedParserResult.addBibFile(
-            texFile3,
-            texFile3.getParent().resolve("origin.bib")
-        );
-        expectedParserResult.addKey(
-            EINSTEIN,
-            texFile3,
-            4,
-            0,
-            19,
-            "\\cite{Einstein1920}"
-        );
-        expectedParserResult.addKey(
-            DARWIN,
-            texFile3,
-            5,
-            0,
-            17,
-            "\\cite{Darwin1888}."
-        );
+        expectedParserResult.getNestedFiles().addAll(Arrays.asList(texFile2, texFile3));
+        expectedParserResult.addBibFile(texFile, texFile.getParent().resolve("origin.bib"));
+        expectedParserResult.addBibFile(texFile2, texFile2.getParent().resolve("origin.bib"));
+        expectedParserResult.addBibFile(texFile3, texFile3.getParent().resolve("origin.bib"));
+        expectedParserResult.addKey(EINSTEIN, texFile3, 4, 0, 19, "\\cite{Einstein1920}");
+        expectedParserResult.addKey(DARWIN, texFile3, 5, 0, 17, "\\cite{Darwin1888}.");
         expectedParserResult.addKey(
             EINSTEIN,
             texFile3,
diff --git a/src/test/java/org/jabref/logic/texparser/LatexParserTest.java b/src/test/java/org/jabref/logic/texparser/LatexParserTest.java
index 8afcc086118..ca21da25746 100644
--- a/src/test/java/org/jabref/logic/texparser/LatexParserTest.java
+++ b/src/test/java/org/jabref/logic/texparser/LatexParserTest.java
@@ -37,20 +37,15 @@ public class LatexParserTest {
 
     @BeforeEach
     void setUp() {
-        libraryPreferences =
-            mock(LibraryPreferences.class, Answers.RETURNS_DEEP_STUBS);
-        importFormatPreferences =
-            mock(ImportFormatPreferences.class, Answers.RETURNS_DEEP_STUBS);
+        libraryPreferences = mock(LibraryPreferences.class, Answers.RETURNS_DEEP_STUBS);
+        importFormatPreferences = mock(ImportFormatPreferences.class, Answers.RETURNS_DEEP_STUBS);
 
         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.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");
@@ -58,10 +53,7 @@ void setUp() {
 
         BibEntry einstein = new BibEntry(StandardEntryType.Book)
             .withCitationKey(EINSTEIN)
-            .withField(
-                StandardField.TITLE,
-                "Relativity: The special and general theory"
-            )
+            .withField(StandardField.TITLE, "Relativity: The special and general theory")
             .withField(StandardField.PUBLISHER, "Penguin")
             .withField(StandardField.YEAR, "1920")
             .withField(StandardField.AUTHOR, "Einstein, Albert");
@@ -100,35 +92,15 @@ void setUp() {
 
     @Test
     public void testSameFileDifferentDatabases() throws URISyntaxException {
-        Path texFile = Path.of(
-            LatexParserTest.class.getResource("paper.tex").toURI()
-        );
+        Path texFile = Path.of(LatexParserTest.class.getResource("paper.tex").toURI());
 
-        LatexParserResult parserResult = new DefaultLatexParser()
-            .parse(texFile);
+        LatexParserResult parserResult = new DefaultLatexParser().parse(texFile);
         LatexParserResult expectedParserResult = new LatexParserResult();
 
         expectedParserResult.getFileList().add(texFile);
-        expectedParserResult.addBibFile(
-            texFile,
-            texFile.getParent().resolve("origin.bib")
-        );
-        expectedParserResult.addKey(
-            EINSTEIN,
-            texFile,
-            4,
-            0,
-            19,
-            "\\cite{Einstein1920}"
-        );
-        expectedParserResult.addKey(
-            DARWIN,
-            texFile,
-            5,
-            0,
-            17,
-            "\\cite{Darwin1888}."
-        );
+        expectedParserResult.addBibFile(texFile, 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,
@@ -146,80 +118,50 @@ public void testSameFileDifferentDatabases() throws URISyntaxException {
             "Nunc ultricies leo nec libero rhoncus, eu vehicula enim efficitur. \\cite{Darwin1888}"
         );
 
-        LatexBibEntriesResolverResult crossingResult =
-            new TexBibEntriesResolver(
-                database,
-                libraryPreferences,
-                importFormatPreferences,
-                fileMonitor
-            )
-                .resolve(parserResult);
-        LatexBibEntriesResolverResult expectedCrossingResult =
-            new LatexBibEntriesResolverResult(expectedParserResult);
+        LatexBibEntriesResolverResult crossingResult = new TexBibEntriesResolver(
+            database,
+            libraryPreferences,
+            importFormatPreferences,
+            fileMonitor
+        )
+            .resolve(parserResult);
+        LatexBibEntriesResolverResult expectedCrossingResult = new LatexBibEntriesResolverResult(
+            expectedParserResult
+        );
 
         assertEquals(expectedCrossingResult, crossingResult);
 
-        LatexBibEntriesResolverResult crossingResult2 =
-            new TexBibEntriesResolver(
-                database2,
-                libraryPreferences,
-                importFormatPreferences,
-                fileMonitor
-            )
-                .resolve(parserResult);
-        LatexBibEntriesResolverResult expectedCrossingResult2 =
-            new LatexBibEntriesResolverResult(expectedParserResult);
-
-        expectedCrossingResult2.addEntry(
-            database.getEntryByCitationKey(EINSTEIN).get()
-        );
-        expectedCrossingResult2.addEntry(
-            database.getEntryByCitationKey(DARWIN).get()
+        LatexBibEntriesResolverResult crossingResult2 = new TexBibEntriesResolver(
+            database2,
+            libraryPreferences,
+            importFormatPreferences,
+            fileMonitor
+        )
+            .resolve(parserResult);
+        LatexBibEntriesResolverResult expectedCrossingResult2 = new LatexBibEntriesResolverResult(
+            expectedParserResult
         );
 
+        expectedCrossingResult2.addEntry(database.getEntryByCitationKey(EINSTEIN).get());
+        expectedCrossingResult2.addEntry(database.getEntryByCitationKey(DARWIN).get());
+
         assertEquals(expectedCrossingResult2, crossingResult2);
     }
 
     @Test
     public void testTwoFilesDifferentDatabases() throws URISyntaxException {
-        Path texFile = Path.of(
-            LatexParserTest.class.getResource("paper.tex").toURI()
-        );
-        Path texFile2 = Path.of(
-            LatexParserTest.class.getResource("paper2.tex").toURI()
-        );
+        Path texFile = Path.of(LatexParserTest.class.getResource("paper.tex").toURI());
+        Path texFile2 = Path.of(LatexParserTest.class.getResource("paper2.tex").toURI());
 
         LatexParserResult parserResult = new DefaultLatexParser()
             .parse(Arrays.asList(texFile, texFile2));
         LatexParserResult expectedParserResult = new LatexParserResult();
 
-        expectedParserResult
-            .getFileList()
-            .addAll(Arrays.asList(texFile, texFile2));
-        expectedParserResult.addBibFile(
-            texFile,
-            texFile.getParent().resolve("origin.bib")
-        );
-        expectedParserResult.addBibFile(
-            texFile2,
-            texFile2.getParent().resolve("origin.bib")
-        );
-        expectedParserResult.addKey(
-            EINSTEIN,
-            texFile,
-            4,
-            0,
-            19,
-            "\\cite{Einstein1920}"
-        );
-        expectedParserResult.addKey(
-            DARWIN,
-            texFile,
-            5,
-            0,
-            17,
-            "\\cite{Darwin1888}."
-        );
+        expectedParserResult.getFileList().addAll(Arrays.asList(texFile, texFile2));
+        expectedParserResult.addBibFile(texFile, texFile.getParent().resolve("origin.bib"));
+        expectedParserResult.addBibFile(texFile2, texFile2.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,
@@ -261,37 +203,33 @@ public void testTwoFilesDifferentDatabases() throws URISyntaxException {
             "This is some content trying to cite a bib file: \\cite{Newton1999}"
         );
 
-        LatexBibEntriesResolverResult crossingResult =
-            new TexBibEntriesResolver(
-                database,
-                libraryPreferences,
-                importFormatPreferences,
-                fileMonitor
-            )
-                .resolve(parserResult);
-        LatexBibEntriesResolverResult expectedCrossingResult =
-            new LatexBibEntriesResolverResult(expectedParserResult);
+        LatexBibEntriesResolverResult crossingResult = new TexBibEntriesResolver(
+            database,
+            libraryPreferences,
+            importFormatPreferences,
+            fileMonitor
+        )
+            .resolve(parserResult);
+        LatexBibEntriesResolverResult expectedCrossingResult = new LatexBibEntriesResolverResult(
+            expectedParserResult
+        );
 
         assertEquals(expectedCrossingResult, crossingResult);
 
-        LatexBibEntriesResolverResult crossingResult2 =
-            new TexBibEntriesResolver(
-                database2,
-                libraryPreferences,
-                importFormatPreferences,
-                fileMonitor
-            )
-                .resolve(parserResult);
-        LatexBibEntriesResolverResult expectedCrossingResult2 =
-            new LatexBibEntriesResolverResult(expectedParserResult);
-
-        expectedCrossingResult2.addEntry(
-            database.getEntryByCitationKey(EINSTEIN).get()
-        );
-        expectedCrossingResult2.addEntry(
-            database.getEntryByCitationKey(DARWIN).get()
+        LatexBibEntriesResolverResult crossingResult2 = new TexBibEntriesResolver(
+            database2,
+            libraryPreferences,
+            importFormatPreferences,
+            fileMonitor
+        )
+            .resolve(parserResult);
+        LatexBibEntriesResolverResult expectedCrossingResult2 = new LatexBibEntriesResolverResult(
+            expectedParserResult
         );
 
+        expectedCrossingResult2.addEntry(database.getEntryByCitationKey(EINSTEIN).get());
+        expectedCrossingResult2.addEntry(database.getEntryByCitationKey(DARWIN).get());
+
         assertEquals(expectedCrossingResult2, crossingResult2);
     }
 }
diff --git a/src/test/java/org/jabref/logic/texparser/TexBibEntriesResolverTest.java b/src/test/java/org/jabref/logic/texparser/TexBibEntriesResolverTest.java
index d856ad22680..df859bfcedf 100644
--- a/src/test/java/org/jabref/logic/texparser/TexBibEntriesResolverTest.java
+++ b/src/test/java/org/jabref/logic/texparser/TexBibEntriesResolverTest.java
@@ -38,20 +38,15 @@ public class TexBibEntriesResolverTest {
 
     @BeforeEach
     void setUp() {
-        libraryPreferences =
-            mock(LibraryPreferences.class, Answers.RETURNS_DEEP_STUBS);
-        importFormatPreferences =
-            mock(ImportFormatPreferences.class, Answers.RETURNS_DEEP_STUBS);
+        libraryPreferences = mock(LibraryPreferences.class, Answers.RETURNS_DEEP_STUBS);
+        importFormatPreferences = mock(ImportFormatPreferences.class, Answers.RETURNS_DEEP_STUBS);
 
         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.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");
@@ -59,10 +54,7 @@ void setUp() {
 
         BibEntry einstein = new BibEntry(StandardEntryType.Book)
             .withCitationKey(EINSTEIN)
-            .withField(
-                StandardField.TITLE,
-                "Relativity: The special and general theory"
-            )
+            .withField(StandardField.TITLE, "Relativity: The special and general theory")
             .withField(StandardField.PUBLISHER, "Penguin")
             .withField(StandardField.YEAR, "1920")
             .withField(StandardField.AUTHOR, "Einstein, Albert");
@@ -100,10 +92,7 @@ void setUp() {
         bibEntry =
             new BibEntry(StandardEntryType.InBook)
                 .withCitationKey(EINSTEIN_A)
-                .withField(
-                    StandardField.TITLE,
-                    "Relativity: The special and general theory"
-                )
+                .withField(StandardField.TITLE, "Relativity: The special and general theory")
                 .withField(StandardField.PUBLISHER, "Penguin")
                 .withField(StandardField.YEAR, "1920")
                 .withField(StandardField.AUTHOR, "Einstein, Albert")
@@ -113,69 +102,59 @@ void setUp() {
 
     @Test
     public void testSingleFile() throws URISyntaxException {
-        Path texFile = Path.of(
-            TexBibEntriesResolverTest.class.getResource("paper.tex").toURI()
+        Path texFile = Path.of(TexBibEntriesResolverTest.class.getResource("paper.tex").toURI());
+        LatexParserResult parserResult = new DefaultLatexParser().parse(texFile);
+
+        LatexBibEntriesResolverResult crossingResult = new TexBibEntriesResolver(
+            database,
+            libraryPreferences,
+            importFormatPreferences,
+            fileMonitor
+        )
+            .resolve(parserResult);
+        LatexBibEntriesResolverResult expectedCrossingResult = new LatexBibEntriesResolverResult(
+            parserResult
         );
-        LatexParserResult parserResult = new DefaultLatexParser()
-            .parse(texFile);
-
-        LatexBibEntriesResolverResult crossingResult =
-            new TexBibEntriesResolver(
-                database,
-                libraryPreferences,
-                importFormatPreferences,
-                fileMonitor
-            )
-                .resolve(parserResult);
-        LatexBibEntriesResolverResult expectedCrossingResult =
-            new LatexBibEntriesResolverResult(parserResult);
 
         assertEquals(expectedCrossingResult, crossingResult);
     }
 
     @Test
     public void testTwoFiles() throws URISyntaxException {
-        Path texFile = Path.of(
-            TexBibEntriesResolverTest.class.getResource("paper.tex").toURI()
-        );
-        Path texFile2 = Path.of(
-            TexBibEntriesResolverTest.class.getResource("paper2.tex").toURI()
-        );
+        Path texFile = Path.of(TexBibEntriesResolverTest.class.getResource("paper.tex").toURI());
+        Path texFile2 = Path.of(TexBibEntriesResolverTest.class.getResource("paper2.tex").toURI());
         LatexParserResult parserResult = new DefaultLatexParser()
             .parse(Arrays.asList(texFile, texFile2));
 
-        LatexBibEntriesResolverResult crossingResult =
-            new TexBibEntriesResolver(
-                database,
-                libraryPreferences,
-                importFormatPreferences,
-                fileMonitor
-            )
-                .resolve(parserResult);
-        LatexBibEntriesResolverResult expectedCrossingResult =
-            new LatexBibEntriesResolverResult(parserResult);
+        LatexBibEntriesResolverResult crossingResult = new TexBibEntriesResolver(
+            database,
+            libraryPreferences,
+            importFormatPreferences,
+            fileMonitor
+        )
+            .resolve(parserResult);
+        LatexBibEntriesResolverResult expectedCrossingResult = new LatexBibEntriesResolverResult(
+            parserResult
+        );
 
         assertEquals(expectedCrossingResult, crossingResult);
     }
 
     @Test
     public void testDuplicateFiles() throws URISyntaxException {
-        Path texFile = Path.of(
-            TexBibEntriesResolverTest.class.getResource("paper.tex").toURI()
+        Path texFile = Path.of(TexBibEntriesResolverTest.class.getResource("paper.tex").toURI());
+        LatexParserResult parserResult = new DefaultLatexParser().parse(texFile);
+
+        LatexBibEntriesResolverResult crossingResult = new TexBibEntriesResolver(
+            database,
+            libraryPreferences,
+            importFormatPreferences,
+            fileMonitor
+        )
+            .resolve(parserResult);
+        LatexBibEntriesResolverResult expectedCrossingResult = new LatexBibEntriesResolverResult(
+            parserResult
         );
-        LatexParserResult parserResult = new DefaultLatexParser()
-            .parse(texFile);
-
-        LatexBibEntriesResolverResult crossingResult =
-            new TexBibEntriesResolver(
-                database,
-                libraryPreferences,
-                importFormatPreferences,
-                fileMonitor
-            )
-                .resolve(parserResult);
-        LatexBibEntriesResolverResult expectedCrossingResult =
-            new LatexBibEntriesResolverResult(parserResult);
 
         assertEquals(expectedCrossingResult, crossingResult);
     }
@@ -183,66 +162,58 @@ public void testDuplicateFiles() throws URISyntaxException {
     @Test
     public void testUnknownKey() throws URISyntaxException {
         Path texFile = Path.of(
-            TexBibEntriesResolverTest.class.getResource("unknown_key.tex")
-                .toURI()
+            TexBibEntriesResolverTest.class.getResource("unknown_key.tex").toURI()
+        );
+        LatexParserResult parserResult = new DefaultLatexParser().parse(texFile);
+
+        LatexBibEntriesResolverResult crossingResult = new TexBibEntriesResolver(
+            database,
+            libraryPreferences,
+            importFormatPreferences,
+            fileMonitor
+        )
+            .resolve(parserResult);
+        LatexBibEntriesResolverResult expectedCrossingResult = new LatexBibEntriesResolverResult(
+            parserResult
         );
-        LatexParserResult parserResult = new DefaultLatexParser()
-            .parse(texFile);
-
-        LatexBibEntriesResolverResult crossingResult =
-            new TexBibEntriesResolver(
-                database,
-                libraryPreferences,
-                importFormatPreferences,
-                fileMonitor
-            )
-                .resolve(parserResult);
-        LatexBibEntriesResolverResult expectedCrossingResult =
-            new LatexBibEntriesResolverResult(parserResult);
 
         assertEquals(expectedCrossingResult, crossingResult);
     }
 
     @Test
     public void testNestedFiles() throws URISyntaxException {
-        Path texFile = Path.of(
-            TexBibEntriesResolverTest.class.getResource("nested.tex").toURI()
+        Path texFile = Path.of(TexBibEntriesResolverTest.class.getResource("nested.tex").toURI());
+        LatexParserResult parserResult = new DefaultLatexParser().parse(texFile);
+
+        LatexBibEntriesResolverResult crossingResult = new TexBibEntriesResolver(
+            database,
+            libraryPreferences,
+            importFormatPreferences,
+            fileMonitor
+        )
+            .resolve(parserResult);
+        LatexBibEntriesResolverResult expectedCrossingResult = new LatexBibEntriesResolverResult(
+            parserResult
         );
-        LatexParserResult parserResult = new DefaultLatexParser()
-            .parse(texFile);
-
-        LatexBibEntriesResolverResult crossingResult =
-            new TexBibEntriesResolver(
-                database,
-                libraryPreferences,
-                importFormatPreferences,
-                fileMonitor
-            )
-                .resolve(parserResult);
-        LatexBibEntriesResolverResult expectedCrossingResult =
-            new LatexBibEntriesResolverResult(parserResult);
 
         assertEquals(expectedCrossingResult, crossingResult);
     }
 
     @Test
     public void testCrossRef() throws URISyntaxException {
-        Path texFile = Path.of(
-            TexBibEntriesResolverTest.class.getResource("crossref.tex").toURI()
+        Path texFile = Path.of(TexBibEntriesResolverTest.class.getResource("crossref.tex").toURI());
+        LatexParserResult parserResult = new DefaultLatexParser().parse(texFile);
+
+        LatexBibEntriesResolverResult crossingResult = new TexBibEntriesResolver(
+            database,
+            libraryPreferences,
+            importFormatPreferences,
+            fileMonitor
+        )
+            .resolve(parserResult);
+        LatexBibEntriesResolverResult expectedCrossingResult = new LatexBibEntriesResolverResult(
+            parserResult
         );
-        LatexParserResult parserResult = new DefaultLatexParser()
-            .parse(texFile);
-
-        LatexBibEntriesResolverResult crossingResult =
-            new TexBibEntriesResolver(
-                database,
-                libraryPreferences,
-                importFormatPreferences,
-                fileMonitor
-            )
-                .resolve(parserResult);
-        LatexBibEntriesResolverResult expectedCrossingResult =
-            new LatexBibEntriesResolverResult(parserResult);
 
         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 ecf5ce4f517..b81844c1944 100644
--- a/src/test/java/org/jabref/logic/util/BuildInfoTest.java
+++ b/src/test/java/org/jabref/logic/util/BuildInfoTest.java
@@ -15,9 +15,7 @@ public void testDefaults() {
 
     @Test
     public void testFileImport() {
-        BuildInfo buildInfo = new BuildInfo(
-            "/org/jabref/util/build.properties"
-        );
+        BuildInfo buildInfo = new BuildInfo("/org/jabref/util/build.properties");
         assertEquals("42", buildInfo.version.getFullVersion());
     }
 
diff --git a/src/test/java/org/jabref/logic/util/DevelopmentStageTest.java b/src/test/java/org/jabref/logic/util/DevelopmentStageTest.java
index 16a62edace3..2f85cb674e3 100644
--- a/src/test/java/org/jabref/logic/util/DevelopmentStageTest.java
+++ b/src/test/java/org/jabref/logic/util/DevelopmentStageTest.java
@@ -10,20 +10,10 @@ public class DevelopmentStageTest {
     @Test
     public void checkStabilityOrder() {
         assertTrue(
-            Version.DevelopmentStage.ALPHA.isMoreStableThan(
-                Version.DevelopmentStage.UNKNOWN
-            )
-        );
-        assertTrue(
-            Version.DevelopmentStage.BETA.isMoreStableThan(
-                Version.DevelopmentStage.ALPHA
-            )
-        );
-        assertTrue(
-            Version.DevelopmentStage.STABLE.isMoreStableThan(
-                Version.DevelopmentStage.BETA
-            )
+            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,
@@ -34,33 +24,18 @@ public void checkStabilityOrder() {
 
     @Test
     public void parseStages() {
-        assertEquals(
-            Version.DevelopmentStage.ALPHA,
-            Version.DevelopmentStage.parse("-alpha")
-        );
-        assertEquals(
-            Version.DevelopmentStage.BETA,
-            Version.DevelopmentStage.parse("-beta")
-        );
-        assertEquals(
-            Version.DevelopmentStage.STABLE,
-            Version.DevelopmentStage.parse("")
-        );
+        assertEquals(Version.DevelopmentStage.ALPHA, Version.DevelopmentStage.parse("-alpha"));
+        assertEquals(Version.DevelopmentStage.BETA, Version.DevelopmentStage.parse("-beta"));
+        assertEquals(Version.DevelopmentStage.STABLE, Version.DevelopmentStage.parse(""));
     }
 
     @Test
     public void parseNull() {
-        assertEquals(
-            Version.DevelopmentStage.UNKNOWN,
-            Version.DevelopmentStage.parse(null)
-        );
+        assertEquals(Version.DevelopmentStage.UNKNOWN, Version.DevelopmentStage.parse(null));
     }
 
     @Test
     public void parseUnknownString() {
-        assertEquals(
-            Version.DevelopmentStage.UNKNOWN,
-            Version.DevelopmentStage.parse("asdf")
-        );
+        assertEquals(Version.DevelopmentStage.UNKNOWN, Version.DevelopmentStage.parse("asdf"));
     }
 }
diff --git a/src/test/java/org/jabref/logic/util/FileNameCleanerTest.java b/src/test/java/org/jabref/logic/util/FileNameCleanerTest.java
index 8ce76811f4d..bb9a2920751 100644
--- a/src/test/java/org/jabref/logic/util/FileNameCleanerTest.java
+++ b/src/test/java/org/jabref/logic/util/FileNameCleanerTest.java
@@ -9,26 +9,17 @@ public class FileNameCleanerTest {
 
     @Test
     public void testCleanFileName() {
-        assertEquals(
-            "legalFilename.txt",
-            FileNameCleaner.cleanFileName("legalFilename.txt")
-        );
+        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
     public void testCleanDirectoryName() {
-        assertEquals(
-            "legalFilename.txt",
-            FileNameCleaner.cleanDirectoryName("legalFilename.txt")
-        );
+        assertEquals("legalFilename.txt", FileNameCleaner.cleanDirectoryName("legalFilename.txt"));
         assertEquals(
             "subdir/legalFilename.txt",
             FileNameCleaner.cleanDirectoryName("subdir/legalFilename.txt")
@@ -41,10 +32,7 @@ public void testCleanDirectoryName() {
 
     @Test
     public void testCleanDirectoryNameForWindows() {
-        assertEquals(
-            "legalFilename.txt",
-            FileNameCleaner.cleanDirectoryName("legalFilename.txt")
-        );
+        assertEquals("legalFilename.txt", FileNameCleaner.cleanDirectoryName("legalFilename.txt"));
         assertEquals(
             "subdir\\legalFilename.txt",
             FileNameCleaner.cleanDirectoryName("subdir\\legalFilename.txt")
diff --git a/src/test/java/org/jabref/logic/util/UpdateFieldTest.java b/src/test/java/org/jabref/logic/util/UpdateFieldTest.java
index e07920d04e0..451152a281b 100644
--- a/src/test/java/org/jabref/logic/util/UpdateFieldTest.java
+++ b/src/test/java/org/jabref/logic/util/UpdateFieldTest.java
@@ -51,21 +51,13 @@ public void testUpdateFieldHasChanged() {
 
     @Test
     public void testUpdateFieldValidFieldChange() {
-        Optional<FieldChange> change = UpdateField.updateField(
-            entry,
-            StandardField.YEAR,
-            "2016"
-        );
+        Optional<FieldChange> change = UpdateField.updateField(entry, StandardField.YEAR, "2016");
         assertTrue(change.isPresent());
     }
 
     @Test
     public void testUpdateFieldCorrectFieldChangeContentsEmptyField() {
-        Optional<FieldChange> change = UpdateField.updateField(
-            entry,
-            StandardField.YEAR,
-            "2016"
-        );
+        Optional<FieldChange> change = UpdateField.updateField(entry, StandardField.YEAR, "2016");
         assertNull(change.get().getOldValue());
         assertEquals(StandardField.YEAR, change.get().getField());
         assertEquals("2016", change.get().getNewValue());
@@ -75,11 +67,7 @@ public void testUpdateFieldCorrectFieldChangeContentsEmptyField() {
     @Test
     public void testUpdateFieldCorrectFieldChangeContentsNonEmptyField() {
         entry.setField(StandardField.YEAR, "2015");
-        Optional<FieldChange> change = UpdateField.updateField(
-            entry,
-            StandardField.YEAR,
-            "2016"
-        );
+        Optional<FieldChange> change = UpdateField.updateField(entry, StandardField.YEAR, "2016");
         assertEquals("2015", change.get().getOldValue());
         assertEquals(StandardField.YEAR, change.get().getField());
         assertEquals("2016", change.get().getNewValue());
@@ -89,11 +77,7 @@ public void testUpdateFieldCorrectFieldChangeContentsNonEmptyField() {
     @Test
     public void testUpdateFieldSameValueNoChange() {
         entry.setField(StandardField.YEAR, "2016");
-        Optional<FieldChange> change = UpdateField.updateField(
-            entry,
-            StandardField.YEAR,
-            "2016"
-        );
+        Optional<FieldChange> change = UpdateField.updateField(entry, StandardField.YEAR, "2016");
         assertFalse(change.isPresent());
     }
 
@@ -121,32 +105,20 @@ public void testUpdateFieldSetEmptyToNullClears() {
     @Test
     public void testUpdateFieldSetToNullHasFieldChangeContents() {
         entry.setField(StandardField.YEAR, "2016");
-        Optional<FieldChange> change = UpdateField.updateField(
-            entry,
-            StandardField.YEAR,
-            null
-        );
+        Optional<FieldChange> change = UpdateField.updateField(entry, StandardField.YEAR, null);
         assertTrue(change.isPresent());
     }
 
     @Test
     public void testUpdateFieldSetRmptyToNullHasNoFieldChangeContents() {
-        Optional<FieldChange> change = UpdateField.updateField(
-            entry,
-            StandardField.YEAR,
-            null
-        );
+        Optional<FieldChange> change = UpdateField.updateField(entry, StandardField.YEAR, null);
         assertFalse(change.isPresent());
     }
 
     @Test
     public void testUpdateFieldSetToNullCorrectFieldChangeContents() {
         entry.setField(StandardField.YEAR, "2016");
-        Optional<FieldChange> change = UpdateField.updateField(
-            entry,
-            StandardField.YEAR,
-            null
-        );
+        Optional<FieldChange> change = UpdateField.updateField(entry, StandardField.YEAR, null);
         assertNull(change.get().getNewValue());
         assertEquals(StandardField.YEAR, change.get().getField());
         assertEquals("2016", change.get().getOldValue());
@@ -198,11 +170,7 @@ public void testUpdateFieldSameContentHasCorrectFieldChange() {
     @Test
     public void testUpdateNonDisplayableFieldUpdates() {
         assertFalse(entry.hasField(StandardField.YEAR));
-        UpdateField.updateNonDisplayableField(
-            entry,
-            StandardField.YEAR,
-            "2016"
-        );
+        UpdateField.updateNonDisplayableField(entry, StandardField.YEAR, "2016");
         assertTrue(entry.hasField(StandardField.YEAR));
         assertEquals(Optional.of("2016"), entry.getField(StandardField.YEAR));
     }
@@ -210,29 +178,17 @@ public void testUpdateNonDisplayableFieldUpdates() {
     @Test
     public void testUpdateNonDisplayableFieldHasNotChanged() {
         assertFalse(entry.hasChanged());
-        UpdateField.updateNonDisplayableField(
-            entry,
-            StandardField.YEAR,
-            "2016"
-        );
+        UpdateField.updateNonDisplayableField(entry, StandardField.YEAR, "2016");
         assertFalse(entry.hasChanged());
     }
 
     @Test
     public void emptyOwnerFieldNowPresentAfterAutomaticSet() {
-        assertEquals(
-            Optional.empty(),
-            entry.getField(StandardField.OWNER),
-            "Owner is present"
-        );
+        assertEquals(Optional.empty(), entry.getField(StandardField.OWNER), "Owner is present");
 
         OwnerPreferences ownerPreferences = createOwnerPreference(true, true);
         TimestampPreferences timestampPreferences = createTimestampPreference();
-        UpdateField.setAutomaticFields(
-            List.of(entry),
-            ownerPreferences,
-            timestampPreferences
-        );
+        UpdateField.setAutomaticFields(List.of(entry), ownerPreferences, timestampPreferences);
 
         assertEquals(
             Optional.of("testDefaultOwner"),
@@ -245,16 +201,9 @@ public void emptyOwnerFieldNowPresentAfterAutomaticSet() {
     public void ownerAssignedCorrectlyAfterAutomaticSet() {
         OwnerPreferences ownerPreferences = createOwnerPreference(true, true);
         TimestampPreferences timestampPreferences = createTimestampPreference();
-        UpdateField.setAutomaticFields(
-            List.of(entry),
-            ownerPreferences,
-            timestampPreferences
-        );
+        UpdateField.setAutomaticFields(List.of(entry), ownerPreferences, timestampPreferences);
 
-        assertEquals(
-            Optional.of("testDefaultOwner"),
-            entry.getField(StandardField.OWNER)
-        );
+        assertEquals(Optional.of("testDefaultOwner"), entry.getField(StandardField.OWNER));
     }
 
     @Test
@@ -262,18 +211,11 @@ public void ownerIsNotResetAfterAutomaticSetIfOverwriteOwnerFalse() {
         String alreadySetOwner = "alreadySetOwner";
         entry.setField(StandardField.OWNER, alreadySetOwner);
 
-        assertEquals(
-            Optional.of(alreadySetOwner),
-            entry.getField(StandardField.OWNER)
-        );
+        assertEquals(Optional.of(alreadySetOwner), entry.getField(StandardField.OWNER));
 
         OwnerPreferences ownerPreferences = createOwnerPreference(true, false);
         TimestampPreferences timestampPreferences = createTimestampPreference();
-        UpdateField.setAutomaticFields(
-            List.of(entry),
-            ownerPreferences,
-            timestampPreferences
-        );
+        UpdateField.setAutomaticFields(List.of(entry), ownerPreferences, timestampPreferences);
 
         assertNotEquals(
             Optional.of("testDefaultOwner"),
@@ -297,11 +239,7 @@ public void emptyCreationDateFieldNowPresentAfterAutomaticSet() {
 
         OwnerPreferences ownerPreferences = createOwnerPreference(true, true);
         TimestampPreferences timestampPreferences = createTimestampPreference();
-        UpdateField.setAutomaticFields(
-            List.of(entry),
-            ownerPreferences,
-            timestampPreferences
-        );
+        UpdateField.setAutomaticFields(List.of(entry), ownerPreferences, timestampPreferences);
 
         String creationDate = timestampPreferences.now();
 
@@ -316,11 +254,7 @@ public void emptyCreationDateFieldNowPresentAfterAutomaticSet() {
     public void creationDateAssignedCorrectlyAfterAutomaticSet() {
         OwnerPreferences ownerPreferences = createOwnerPreference(true, true);
         TimestampPreferences timestampPreferences = createTimestampPreference();
-        UpdateField.setAutomaticFields(
-            List.of(entry),
-            ownerPreferences,
-            timestampPreferences
-        );
+        UpdateField.setAutomaticFields(List.of(entry), ownerPreferences, timestampPreferences);
 
         String creationDate = timestampPreferences.now();
 
@@ -356,11 +290,7 @@ public void ownerSetToDefaultValueForCollectionOfBibEntries() {
 
         OwnerPreferences ownerPreferences = createOwnerPreference(true, true);
         TimestampPreferences timestampPreferences = createTimestampPreference();
-        UpdateField.setAutomaticFields(
-            bibs,
-            ownerPreferences,
-            timestampPreferences
-        );
+        UpdateField.setAutomaticFields(bibs, ownerPreferences, timestampPreferences);
 
         String defaultOwner = "testDefaultOwner";
 
@@ -404,11 +334,7 @@ public void ownerNotChangedForCollectionOfBibEntriesIfOptionsDisabled() {
 
         OwnerPreferences ownerPreferences = createOwnerPreference(true, false);
         TimestampPreferences timestampPreferences = createTimestampPreference();
-        UpdateField.setAutomaticFields(
-            bibs,
-            ownerPreferences,
-            timestampPreferences
-        );
+        UpdateField.setAutomaticFields(bibs, ownerPreferences, timestampPreferences);
 
         assertEquals(
             Optional.of(initialOwner),
@@ -422,21 +348,12 @@ public void ownerNotChangedForCollectionOfBibEntriesIfOptionsDisabled() {
         );
     }
 
-    private OwnerPreferences createOwnerPreference(
-        boolean useOwner,
-        boolean overwriteOwner
-    ) {
+    private OwnerPreferences createOwnerPreference(boolean useOwner, boolean overwriteOwner) {
         String defaultOwner = "testDefaultOwner";
         return new OwnerPreferences(useOwner, defaultOwner, overwriteOwner);
     }
 
     private TimestampPreferences createTimestampPreference() {
-        return new TimestampPreferences(
-            true,
-            true,
-            true,
-            StandardField.CREATIONDATE,
-            "dd.mm.yyyy"
-        );
+        return new TimestampPreferences(true, true, true, StandardField.CREATIONDATE, "dd.mm.yyyy");
     }
 }
diff --git a/src/test/java/org/jabref/logic/util/VersionTest.java b/src/test/java/org/jabref/logic/util/VersionTest.java
index 9c747be65ba..8a807d00ff7 100644
--- a/src/test/java/org/jabref/logic/util/VersionTest.java
+++ b/src/test/java/org/jabref/logic/util/VersionTest.java
@@ -332,14 +332,8 @@ public void stableShouldNotBeUpdatedToBeta() {
     public void alphaShouldBeUpdatedToStables() {
         Version alpha = Version.parse("2.8-alpha");
         Version stable = Version.parse("2.8");
-        List<Version> availableVersions = Arrays.asList(
-            Version.parse("2.8-beta"),
-            stable
-        );
-        assertEquals(
-            Optional.of(stable),
-            alpha.shouldBeUpdatedTo(availableVersions)
-        );
+        List<Version> availableVersions = Arrays.asList(Version.parse("2.8-beta"), stable);
+        assertEquals(Optional.of(stable), alpha.shouldBeUpdatedTo(availableVersions));
     }
 
     @Test
@@ -358,9 +352,6 @@ public void ciSuffixShouldBeRemovedIfDateIsPresent() {
     @FetcherTest
     @DisabledOnCIServer("GitHub puts a low rate limit on unauthenticated calls")
     public void getAllAvailableVersionsReturnsSomething() throws Exception {
-        assertNotEquals(
-            Collections.emptyList(),
-            Version.getAllAvailableVersions()
-        );
+        assertNotEquals(Collections.emptyList(), Version.getAllAvailableVersions());
     }
 }
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 61031578098..4091919e81f 100644
--- a/src/test/java/org/jabref/logic/util/io/BackupFileUtilTest.java
+++ b/src/test/java/org/jabref/logic/util/io/BackupFileUtilTest.java
@@ -27,10 +27,7 @@ void setup(@TempDir Path tempDir) {
     @Test
     void uniqueFilePrefix() {
         // We cannot test for a concrete hash code, because hashing implementation differs from environment to environment
-        assertNotEquals(
-            "",
-            BackupFileUtil.getUniqueFilePrefix(Path.of("test.bib"))
-        );
+        assertNotEquals("", BackupFileUtil.getUniqueFilePrefix(Path.of("test.bib")));
     }
 
     @Test
@@ -52,25 +49,17 @@ void getPathOfBackupFileAndCreateDirectoryReturnsAppDirectoryInCaseOfNoError() {
     void getPathOfBackupFileAndCreateDirectoryReturnsSameDirectoryInCaseOfException() {
         backupDir = OS.getNativeDesktop().getBackupDirectory();
         try (
-            MockedStatic<Files> files = Mockito.mockStatic(
-                Files.class,
-                Answers.RETURNS_DEEP_STUBS
-            )
+            MockedStatic<Files> files = Mockito.mockStatic(Files.class, Answers.RETURNS_DEEP_STUBS)
         ) {
             files
-                .when(() ->
-                    Files.createDirectories(
-                        OS.getNativeDesktop().getBackupDirectory()
-                    )
-                )
+                .when(() -> Files.createDirectories(OS.getNativeDesktop().getBackupDirectory()))
                 .thenThrow(new IOException());
             Path testPath = Path.of("tmp", "test.bib");
-            Path result =
-                BackupFileUtil.getPathForNewBackupFileAndCreateDirectory(
-                    testPath,
-                    BackupFileType.BACKUP,
-                    backupDir
-                );
+            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 9b50c888612..33ce143ec70 100644
--- a/src/test/java/org/jabref/logic/util/io/CitationKeyBasedFileFinderTest.java
+++ b/src/test/java/org/jabref/logic/util/io/CitationKeyBasedFileFinderTest.java
@@ -31,9 +31,7 @@ void setUp(@TempDir Path temporaryFolder) throws IOException {
 
         rootDir = temporaryFolder;
 
-        Path subDir = Files.createDirectory(
-            rootDir.resolve("Organization Science")
-        );
+        Path subDir = Files.createDirectory(rootDir.resolve("Organization Science"));
         pdfsDir = Files.createDirectory(rootDir.resolve("pdfs"));
 
         Files.createFile(subDir.resolve("HipKro03 - Hello.pdf"));
@@ -53,9 +51,7 @@ void setUp(@TempDir Path temporaryFolder) throws IOException {
         Files.createFile(dirTest.resolve("foo.dat"));
 
         graphicsDir = Files.createDirectory(rootDir.resolve("graphicsDir"));
-        Path graphicsSubDir = Files.createDirectories(
-            graphicsDir.resolve("subDir")
-        );
+        Path graphicsSubDir = Files.createDirectories(graphicsDir.resolve("subDir"));
 
         jpgFile = Files.createFile(graphicsSubDir.resolve("HipKro03 test.jpg"));
         Files.createFile(graphicsSubDir.resolve("HipKro03 test.png"));
@@ -67,18 +63,13 @@ void findAssociatedFilesInSubDirectories() throws Exception {
         List<Path> dirs = Arrays.asList(graphicsDir, pdfsDir);
         FileFinder fileFinder = new CitationKeyBasedFileFinder(false);
 
-        List<Path> results = fileFinder.findAssociatedFiles(
-            entry,
-            dirs,
-            extensions
-        );
+        List<Path> results = fileFinder.findAssociatedFiles(entry, dirs, extensions);
 
         assertEquals(Arrays.asList(jpgFile, pdfFile), results);
     }
 
     @Test
-    void findAssociatedFilesIgnoresFilesStartingWithKeyButContinueWithText()
-        throws Exception {
+    void findAssociatedFilesIgnoresFilesStartingWithKeyButContinueWithText() throws Exception {
         Files.createFile(pdfsDir.resolve("HipKro03a - Hello second paper.pdf"));
         FileFinder fileFinder = new CitationKeyBasedFileFinder(false);
 
@@ -93,9 +84,7 @@ void findAssociatedFilesIgnoresFilesStartingWithKeyButContinueWithText()
 
     @Test
     void findAssociatedFilesFindsFilesStartingWithKey() throws Exception {
-        Path secondPdfFile = Files.createFile(
-            pdfsDir.resolve("HipKro03_Hello second paper.pdf")
-        );
+        Path secondPdfFile = Files.createFile(pdfsDir.resolve("HipKro03_Hello second paper.pdf"));
         FileFinder fileFinder = new CitationKeyBasedFileFinder(false);
 
         List<Path> results = fileFinder.findAssociatedFiles(
@@ -108,31 +97,19 @@ void findAssociatedFilesFindsFilesStartingWithKey() throws Exception {
     }
 
     @Test
-    void findAssociatedFilesInNonExistingDirectoryFindsNothing()
-        throws Exception {
+    void findAssociatedFilesInNonExistingDirectoryFindsNothing() throws Exception {
         List<String> extensions = Arrays.asList("jpg", "pdf");
-        List<Path> dirs = Collections.singletonList(
-            rootDir.resolve("asdfasdf/asdfasdf")
-        );
-        CitationKeyBasedFileFinder fileFinder = new CitationKeyBasedFileFinder(
-            false
-        );
+        List<Path> dirs = Collections.singletonList(rootDir.resolve("asdfasdf/asdfasdf"));
+        CitationKeyBasedFileFinder fileFinder = new CitationKeyBasedFileFinder(false);
 
-        List<Path> results = fileFinder.findAssociatedFiles(
-            entry,
-            dirs,
-            extensions
-        );
+        List<Path> results = fileFinder.findAssociatedFiles(entry, dirs, extensions);
 
         assertEquals(Collections.emptyList(), results);
     }
 
     @Test
-    void findAssociatedFilesWithUnsafeCharactersStartWithSearch()
-        throws Exception {
-        BibEntry entryWithUnsafeCitationKey = new BibEntry(
-            StandardEntryType.Article
-        );
+    void findAssociatedFilesWithUnsafeCharactersStartWithSearch() throws Exception {
+        BibEntry entryWithUnsafeCitationKey = new BibEntry(StandardEntryType.Article);
         entryWithUnsafeCitationKey.setCitationKey("?test");
 
         Path testFile = Files.createFile(pdfsDir.resolve("_test_file.pdf"));
@@ -149,14 +126,10 @@ void findAssociatedFilesWithUnsafeCharactersStartWithSearch()
 
     @Test
     void findAssociatedFilesWithUnsafeCharactersExactSearch() throws Exception {
-        BibEntry entryWithUnsafeCitationKey = new BibEntry(
-            StandardEntryType.Article
-        );
+        BibEntry entryWithUnsafeCitationKey = new BibEntry(StandardEntryType.Article);
         entryWithUnsafeCitationKey.setCitationKey("test:test/*test?");
 
-        Path testFile = Files.createFile(
-            pdfsDir.resolve("test_test__test_.pdf")
-        );
+        Path testFile = Files.createFile(pdfsDir.resolve("test_test__test_.pdf"));
         FileFinder fileFinder = new CitationKeyBasedFileFinder(true);
 
         List<Path> results = fileFinder.findAssociatedFiles(
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 1d98375acb7..e32b5f454d2 100644
--- a/src/test/java/org/jabref/logic/util/io/FileNameUniquenessTest.java
+++ b/src/test/java/org/jabref/logic/util/io/FileNameUniquenessTest.java
@@ -18,8 +18,7 @@ public class FileNameUniquenessTest {
     protected Path tempDir;
 
     @Test
-    public void testGetNonOverWritingFileNameReturnsSameName()
-        throws IOException {
+    public void testGetNonOverWritingFileNameReturnsSameName() throws IOException {
         assertFalse(Files.exists(tempDir.resolve("sameFile.txt")));
 
         String outputFileName = FileNameUniqueness.getNonOverWritingFileName(
@@ -30,8 +29,7 @@ public void testGetNonOverWritingFileNameReturnsSameName()
     }
 
     @Test
-    public void testGetNonOverWritingFileNameReturnsUniqueNameOver1Conflict()
-        throws IOException {
+    public void testGetNonOverWritingFileNameReturnsUniqueNameOver1Conflict() throws IOException {
         Path dummyFilePath1 = tempDir.resolve("differentFile.txt");
 
         Files.createFile(dummyFilePath1);
@@ -44,8 +42,7 @@ public void testGetNonOverWritingFileNameReturnsUniqueNameOver1Conflict()
     }
 
     @Test
-    public void testGetNonOverWritingFileNameReturnsUniqueNameOverNConflicts()
-        throws IOException {
+    public void testGetNonOverWritingFileNameReturnsUniqueNameOverNConflicts() throws IOException {
         Path dummyFilePath1 = tempDir.resolve("manyfiles.txt");
         Path dummyFilePath2 = tempDir.resolve("manyfiles (1).txt");
 
@@ -93,16 +90,14 @@ public void testIsDuplicatedFileWithOneSimilarNames() throws IOException {
     }
 
     @Test
-    public void testTaseDuplicateMarksReturnsOrignalFileName1()
-        throws IOException {
+    public void testTaseDuplicateMarksReturnsOrignalFileName1() throws IOException {
         String fileName1 = "abc def (1)";
         String fileName2 = FileNameUniqueness.eraseDuplicateMarks(fileName1);
         assertEquals("abc def", fileName2);
     }
 
     @Test
-    public void testTaseDuplicateMarksReturnsOrignalFileName2()
-        throws IOException {
+    public void testTaseDuplicateMarksReturnsOrignalFileName2() throws IOException {
         String fileName1 = "abc (def) gh (1)";
         String fileName2 = FileNameUniqueness.eraseDuplicateMarks(fileName1);
         assertEquals("abc (def) gh", fileName2);
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 036f00931c6..8492ce687b8 100644
--- a/src/test/java/org/jabref/logic/util/io/FileUtilTest.java
+++ b/src/test/java/org/jabref/logic/util/io/FileUtilTest.java
@@ -57,10 +57,7 @@ void setUpViewModel(@TempDir Path temporaryFolder) throws IOException {
 
     @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
@@ -104,10 +101,7 @@ void testGetLinkedFileNameBibTeXKey() {
         entry.setCitationKey("1234");
         entry.setField(StandardField.TITLE, "mytitle");
 
-        assertEquals(
-            "1234",
-            FileUtil.createFileNameFromPattern(null, entry, fileNamePattern)
-        );
+        assertEquals("1234", FileUtil.createFileNameFromPattern(null, entry, fileNamePattern));
     }
 
     @Test
@@ -117,10 +111,7 @@ void testGetLinkedFileNameNoPattern() {
         entry.setCitationKey("1234");
         entry.setField(StandardField.TITLE, "mytitle");
 
-        assertEquals(
-            "1234",
-            FileUtil.createFileNameFromPattern(null, entry, fileNamePattern)
-        );
+        assertEquals("1234", FileUtil.createFileNameFromPattern(null, entry, fileNamePattern));
     }
 
     @Test
@@ -129,10 +120,7 @@ void testGetDefaultFileNameNoPatternNoBibTeXKey() {
         BibEntry entry = new BibEntry();
         entry.setField(StandardField.TITLE, "mytitle");
 
-        assertEquals(
-            "default",
-            FileUtil.createFileNameFromPattern(null, entry, fileNamePattern)
-        );
+        assertEquals("default", FileUtil.createFileNameFromPattern(null, entry, fileNamePattern));
     }
 
     @Test
@@ -141,10 +129,7 @@ void testGetLinkedFileNameGetKeyIfEmptyField() {
         BibEntry entry = new BibEntry();
         entry.setCitationKey("1234");
 
-        assertEquals(
-            "1234",
-            FileUtil.createFileNameFromPattern(null, entry, fileNamePattern)
-        );
+        assertEquals("1234", FileUtil.createFileNameFromPattern(null, entry, fileNamePattern));
     }
 
     @Test
@@ -152,10 +137,7 @@ void testGetLinkedFileNameGetDefaultIfEmptyFieldNoKey() {
         String fileNamePattern = "[title]";
         BibEntry entry = new BibEntry();
 
-        assertEquals(
-            "default",
-            FileUtil.createFileNameFromPattern(null, entry, fileNamePattern)
-        );
+        assertEquals("default", FileUtil.createFileNameFromPattern(null, entry, fileNamePattern));
     }
 
     @Test
@@ -174,35 +156,23 @@ void testGetLinkedFileNameByYearAuthorFirstpage() {
 
     @Test
     void testGetFileExtensionSimpleFile() {
-        assertEquals(
-            "pdf",
-            FileUtil.getFileExtension(Path.of("test.pdf")).get()
-        );
+        assertEquals("pdf", FileUtil.getFileExtension(Path.of("test.pdf")).get());
     }
 
     @Test
     void testGetFileExtensionMultipleDotsFile() {
-        assertEquals(
-            "pdf",
-            FileUtil.getFileExtension(Path.of("te.st.PdF")).get()
-        );
+        assertEquals("pdf", FileUtil.getFileExtension(Path.of("te.st.PdF")).get());
     }
 
     @Test
     void testGetFileExtensionNoExtensionFile() {
-        assertFalse(
-            FileUtil
-                .getFileExtension(Path.of("JustTextNotASingleDot"))
-                .isPresent()
-        );
+        assertFalse(FileUtil.getFileExtension(Path.of("JustTextNotASingleDot")).isPresent());
     }
 
     @Test
     void testGetFileExtensionNoExtension2File() {
         assertFalse(
-            FileUtil
-                .getFileExtension(Path.of(".StartsWithADotIsNotAnExtension"))
-                .isPresent()
+            FileUtil.getFileExtension(Path.of(".StartsWithADotIsNotAnExtension")).isPresent()
         );
     }
 
@@ -223,10 +193,7 @@ void getFileExtensionWithMultipleDotsString() {
 
     @Test
     void getFileExtensionWithNoDotReturnsEmptyExtension() {
-        assertEquals(
-            Optional.empty(),
-            FileUtil.getFileExtension("JustTextNotASingleDot")
-        );
+        assertEquals(Optional.empty(), FileUtil.getFileExtension("JustTextNotASingleDot"));
     }
 
     @Test
@@ -276,10 +243,7 @@ void testUniquePathFragmentWithSameSuffix() {
         );
         assertEquals(
             Optional.of("bibliography.bib"),
-            FileUtil.getUniquePathFragment(
-                dirs,
-                Path.of("/users/jabref/bibliography.bib")
-            )
+            FileUtil.getUniquePathFragment(dirs, Path.of("/users/jabref/bibliography.bib"))
         );
     }
 
@@ -291,39 +255,28 @@ void testUniquePathFragmentWithSameSuffixAndLongerName() {
         );
         assertEquals(
             Optional.of("koppor-bibliography.bib"),
-            FileUtil.getUniquePathFragment(
-                dirs,
-                Path.of("/users/jabref/koppor-bibliography.bib")
-            )
+            FileUtil.getUniquePathFragment(dirs, Path.of("/users/jabref/koppor-bibliography.bib"))
         );
     }
 
     @Test
     void testCopyFileFromEmptySourcePathToEmptyDestinationPathWithOverrideExistFile() {
-        assertFalse(
-            FileUtil.copyFile(nonExistingTestPath, nonExistingTestPath, true)
-        );
+        assertFalse(FileUtil.copyFile(nonExistingTestPath, nonExistingTestPath, true));
     }
 
     @Test
     void testCopyFileFromEmptySourcePathToEmptyDestinationPathWithoutOverrideExistFile() {
-        assertFalse(
-            FileUtil.copyFile(nonExistingTestPath, nonExistingTestPath, false)
-        );
+        assertFalse(FileUtil.copyFile(nonExistingTestPath, nonExistingTestPath, false));
     }
 
     @Test
     void testCopyFileFromEmptySourcePathToExistDestinationPathWithOverrideExistFile() {
-        assertFalse(
-            FileUtil.copyFile(nonExistingTestPath, existingTestFile, true)
-        );
+        assertFalse(FileUtil.copyFile(nonExistingTestPath, existingTestFile, true));
     }
 
     @Test
     void testCopyFileFromEmptySourcePathToExistDestinationPathWithoutOverrideExistFile() {
-        assertFalse(
-            FileUtil.copyFile(nonExistingTestPath, existingTestFile, false)
-        );
+        assertFalse(FileUtil.copyFile(nonExistingTestPath, existingTestFile, false));
     }
 
     @Test
@@ -333,23 +286,17 @@ void testCopyFileFromExistSourcePathToExistDestinationPathWithOverrideExistFile(
 
     @Test
     void testCopyFileFromExistSourcePathToExistDestinationPathWithoutOverrideExistFile() {
-        assertFalse(
-            FileUtil.copyFile(existingTestFile, existingTestFile, false)
-        );
+        assertFalse(FileUtil.copyFile(existingTestFile, existingTestFile, false));
     }
 
     @Test
     void testCopyFileFromExistSourcePathToOtherExistDestinationPathWithOverrideExistFile() {
-        assertTrue(
-            FileUtil.copyFile(existingTestFile, otherExistingTestFile, true)
-        );
+        assertTrue(FileUtil.copyFile(existingTestFile, otherExistingTestFile, true));
     }
 
     @Test
     void testCopyFileFromExistSourcePathToOtherExistDestinationPathWithoutOverrideExistFile() {
-        assertFalse(
-            FileUtil.copyFile(existingTestFile, otherExistingTestFile, false)
-        );
+        assertFalse(FileUtil.copyFile(existingTestFile, otherExistingTestFile, false));
     }
 
     @Test
@@ -397,15 +344,9 @@ void validFilenameShouldBeMaximum255Chars() {
                 .collect(Collectors.joining()) +
             ".pdf";
         String longerFilename =
-            Stream
-                .generate(() -> String.valueOf('1'))
-                .limit(260)
-                .collect(Collectors.joining()) +
+            Stream.generate(() -> String.valueOf('1')).limit(260).collect(Collectors.joining()) +
             ".pdf";
-        assertEquals(
-            longestValidFilename,
-            FileUtil.getValidFileName(longerFilename)
-        );
+        assertEquals(longestValidFilename, FileUtil.getValidFileName(longerFilename));
     }
 
     @Test
@@ -418,10 +359,7 @@ void invalidFilenameWithoutExtension() {
             .generate(() -> String.valueOf('1'))
             .limit(260)
             .collect(Collectors.joining());
-        assertEquals(
-            longestValidFilename,
-            FileUtil.getValidFileName(longerFilename)
-        );
+        assertEquals(longestValidFilename, FileUtil.getValidFileName(longerFilename));
     }
 
     @Test
@@ -475,23 +413,15 @@ void testFindinPath() {
     @Test
     void testFindInListOfPath() {
         // 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> paths = List.of(existingTestFile, otherExistingTestFile, rootDir);
         List<Path> resultPaths = List.of(existingTestFile);
-        List<Path> result = FileUtil.findListOfFiles(
-            "existingTestFile.txt",
-            paths
-        );
+        List<Path> result = FileUtil.findListOfFiles("existingTestFile.txt", paths);
         assertEquals(resultPaths, result);
     }
 
     @Test
     public void extractFileExtension() {
-        final String filePath =
-            FileUtilTest.class.getResource("pdffile.pdf").getPath();
+        final String filePath = FileUtilTest.class.getResource("pdffile.pdf").getPath();
         assertEquals(Optional.of("pdf"), FileUtil.getFileExtension(filePath));
     }
 
@@ -521,15 +451,11 @@ public void testFindsFileInDirectory(@TempDir Path temp) throws Exception {
         Files.createDirectories(firstFilePath);
         Path firstFile = Files.createFile(firstFilePath.resolve("test.pdf"));
 
-        assertEquals(
-            Optional.of(firstFile),
-            FileUtil.find("test.pdf", temp.resolve("files"))
-        );
+        assertEquals(Optional.of(firstFile), FileUtil.find("test.pdf", temp.resolve("files")));
     }
 
     @Test
-    public void testFindsFileStartingWithTheSameDirectory(@TempDir Path temp)
-        throws Exception {
+    public void testFindsFileStartingWithTheSameDirectory(@TempDir Path temp) throws Exception {
         Path firstFilePath = temp.resolve("files");
         Files.createDirectories(firstFilePath);
         Path firstFile = Files.createFile(firstFilePath.resolve("test.pdf"));
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 ba07352a326..0aefbbc9f8c 100644
--- a/src/test/java/org/jabref/logic/util/io/RegExpBasedFileFinderTest.java
+++ b/src/test/java/org/jabref/logic/util/io/RegExpBasedFileFinderTest.java
@@ -16,9 +16,7 @@
 
 class RegExpBasedFileFinderTest {
 
-    private static final List<String> PDF_EXTENSION = Collections.singletonList(
-        "pdf"
-    );
+    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",
@@ -36,10 +34,7 @@ void setUp(@TempDir Path tempDir) throws Exception {
         entry = new BibEntry();
         entry.setType(StandardEntryType.Article);
         entry.setCitationKey("HipKro03");
-        entry.setField(
-            StandardField.AUTHOR,
-            "Eric von Hippel and Georg von Krogh"
-        );
+        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"
@@ -53,10 +48,7 @@ void setUp(@TempDir Path tempDir) throws Exception {
             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.DOI, "http://dx.doi.org/10.1287/orsc.14.2.209.14992");
         entry.setField(StandardField.ISSN, "1526-5455");
         entry.setField(StandardField.PUBLISHER, "INFORMS");
 
@@ -114,10 +106,8 @@ void testYearAuthFirstPageFindFiles() throws Exception {
     }
 
     @Test
-    void findAssociatedFilesFindFileContainingBracketsFromBracketedExpression()
-        throws Exception {
-        var bibEntry = new BibEntry()
-            .withField(StandardField.TITLE, "Regexp from [A-Z]");
+    void findAssociatedFilesFindFileContainingBracketsFromBracketedExpression() throws Exception {
+        var bibEntry = new BibEntry().withField(StandardField.TITLE, "Regexp from [A-Z]");
 
         RegExpBasedFileFinder fileFinder = new RegExpBasedFileFinder(
             "[TITLE]\\\\.[extension]",
@@ -129,18 +119,14 @@ void findAssociatedFilesFindFileContainingBracketsFromBracketedExpression()
             List.of(directory),
             PDF_EXTENSION
         );
-        List<Path> pdfFile = List.of(
-            directory.resolve("Regexp from [A-Z].pdf")
-        );
+        List<Path> pdfFile = List.of(directory.resolve("Regexp from [A-Z].pdf"));
 
         assertEquals(pdfFile, result);
     }
 
     @Test
-    void findAssociatedFilesFindCleanedFileFromBracketedExpression()
-        throws Exception {
-        var bibEntry = new BibEntry()
-            .withField(StandardField.JOURNAL, "ACM/IEEE-CS");
+    void findAssociatedFilesFindCleanedFileFromBracketedExpression() throws Exception {
+        var bibEntry = new BibEntry().withField(StandardField.JOURNAL, "ACM/IEEE-CS");
 
         RegExpBasedFileFinder fileFinder = new RegExpBasedFileFinder(
             "[JOURNAL]\\\\.[extension]",
@@ -162,18 +148,9 @@ 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.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(
@@ -201,10 +178,7 @@ void testAuthorWithDiacritics() throws Exception {
         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.AUTHOR, "Gražulis, Saulius and O. Kitsune");
         localEntry.setField(StandardField.PAGES, "726--729");
 
         RegExpBasedFileFinder fileFinder = new RegExpBasedFileFinder(
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 bce3329bcf7..498fb125c9f 100644
--- a/src/test/java/org/jabref/logic/util/strings/StringLengthComparatorTest.java
+++ b/src/test/java/org/jabref/logic/util/strings/StringLengthComparatorTest.java
@@ -19,11 +19,7 @@ public void setUp() {
 
     @ParameterizedTest
     @MethodSource("tests")
-    void compareStringLength(
-        int comparisonResult,
-        String firstString,
-        String secondString
-    ) {
+    void compareStringLength(int comparisonResult, String firstString, String secondString) {
         assertEquals(comparisonResult, slc.compare(firstString, secondString));
     }
 
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 67ae1deda99..8bd44b24375 100644
--- a/src/test/java/org/jabref/logic/util/strings/StringManipulatorTest.java
+++ b/src/test/java/org/jabref/logic/util/strings/StringManipulatorTest.java
@@ -16,10 +16,7 @@ public void testCapitalizePreservesNewlines() {
         int caretPosition = 5; // Position of the caret, between the two ll in the first hellO"
         String input = "hello\n\nhELLO";
         String expectedResult = "hello\n\nHello";
-        ResultingStringState textOutput = StringManipulator.capitalize(
-            caretPosition,
-            input
-        );
+        ResultingStringState textOutput = StringManipulator.capitalize(caretPosition, input);
         assertEquals(expectedResult, textOutput.text);
     }
 
@@ -28,10 +25,7 @@ public void testUppercasePreservesSpace() {
         int caretPosition = 3; // Position of the caret, between the two ll in the first hello
         String input = "hello hello";
         String expectedResult = "helLO hello";
-        ResultingStringState textOutput = StringManipulator.uppercase(
-            caretPosition,
-            input
-        );
+        ResultingStringState textOutput = StringManipulator.uppercase(caretPosition, input);
         assertEquals(expectedResult, textOutput.text);
     }
 
@@ -40,10 +34,7 @@ public void testUppercasePreservesNewlines() {
         int caretPosition = 3; // Position of the caret, between the two ll in the first hello
         String input = "hello\nhello";
         String expectedResult = "helLO\nhello";
-        ResultingStringState textOutput = StringManipulator.uppercase(
-            caretPosition,
-            input
-        );
+        ResultingStringState textOutput = StringManipulator.uppercase(caretPosition, input);
         assertEquals(expectedResult, textOutput.text);
     }
 
@@ -52,10 +43,7 @@ public void testUppercasePreservesTab() {
         int caretPosition = 3; // Position of the caret, between the two ll in the first hello
         String input = "hello\thello";
         String expectedResult = "helLO\thello";
-        ResultingStringState textOutput = StringManipulator.uppercase(
-            caretPosition,
-            input
-        );
+        ResultingStringState textOutput = StringManipulator.uppercase(caretPosition, input);
         assertEquals(expectedResult, textOutput.text);
     }
 
@@ -64,10 +52,7 @@ public void testUppercasePreservesDoubleSpace() {
         int caretPosition = 5; // Position of the caret, at the first space
         String input = "hello  hello";
         String expectedResult = "hello  HELLO";
-        ResultingStringState textOutput = StringManipulator.uppercase(
-            caretPosition,
-            input
-        );
+        ResultingStringState textOutput = StringManipulator.uppercase(caretPosition, input);
         assertEquals(expectedResult, textOutput.text);
     }
 
@@ -76,10 +61,7 @@ public void testUppercaseIgnoresTrailingWhitespace() {
         int caretPosition = 5; // First space
         String input = "hello  ";
         String expectedResult = "hello  ";
-        ResultingStringState textOutput = StringManipulator.uppercase(
-            caretPosition,
-            input
-        );
+        ResultingStringState textOutput = StringManipulator.uppercase(caretPosition, input);
         assertEquals(expectedResult, textOutput.text);
         // Expected caret position is right after the last space, which is index 7
         assertEquals(7, textOutput.caretPosition);
@@ -90,10 +72,7 @@ public void testKillWordTrimsTrailingWhitespace() {
         int caretPosition = 5; // First space
         String input = "hello  ";
         String expectedResult = "hello";
-        ResultingStringState textOutput = StringManipulator.killWord(
-            caretPosition,
-            input
-        );
+        ResultingStringState textOutput = StringManipulator.killWord(caretPosition, input);
         assertEquals(expectedResult, textOutput.text);
         assertEquals(caretPosition, textOutput.caretPosition);
     }
@@ -104,10 +83,7 @@ public void testBackwardsKillWordTrimsPreceedingWhitespace() {
         String input = "  hello";
         // One space should be preserved since we are deleting everything preceding the second space.
         String expectedResult = " hello";
-        ResultingStringState textOutput = StringManipulator.backwardKillWord(
-            caretPosition,
-            input
-        );
+        ResultingStringState textOutput = StringManipulator.backwardKillWord(caretPosition, input);
         assertEquals(expectedResult, textOutput.text);
         // The caret should have been moved to the start.
         assertEquals(0, textOutput.caretPosition);
@@ -118,10 +94,7 @@ public void testUppercasePreservesMixedSpaceNewLineTab() {
         int caretPosition = 5; // Position of the caret, after first hello
         String input = "hello \n\thello";
         String expectedResult = "hello \n\tHELLO";
-        ResultingStringState textOutput = StringManipulator.uppercase(
-            caretPosition,
-            input
-        );
+        ResultingStringState textOutput = StringManipulator.uppercase(caretPosition, input);
         assertEquals(expectedResult, textOutput.text);
     }
 
@@ -130,10 +103,7 @@ public void testLowercaseEditsTheNextWord() {
         int caretPosition = 5; // Position of the caret, right at the space
         String input = "hello HELLO";
         String expectedResult = "hello hello";
-        ResultingStringState textOutput = StringManipulator.lowercase(
-            caretPosition,
-            input
-        );
+        ResultingStringState textOutput = StringManipulator.lowercase(caretPosition, input);
         assertEquals(expectedResult, textOutput.text);
     }
 
@@ -142,10 +112,7 @@ public void testKillWordRemovesFromPositionUpToNextWord() {
         int caretPosition = 3; // Position of the caret, between the two "ll in the first hello"
         String input = "hello hello";
         String expectedResult = "hel hello";
-        ResultingStringState textOutput = StringManipulator.killWord(
-            caretPosition,
-            input
-        );
+        ResultingStringState textOutput = StringManipulator.killWord(caretPosition, input);
         assertEquals(expectedResult, textOutput.text);
     }
 
@@ -154,10 +121,7 @@ public void testKillWordRemovesNextWordIfPositionIsInSpace() {
         int caretPosition = 5; // Position of the caret, after the first hello"
         String input = "hello person";
         String expectedResult = "hello";
-        ResultingStringState textOutput = StringManipulator.killWord(
-            caretPosition,
-            input
-        );
+        ResultingStringState textOutput = StringManipulator.killWord(caretPosition, input);
         assertEquals(expectedResult, textOutput.text);
     }
 
@@ -167,10 +131,7 @@ public void testKillPreviousWord() {
         int expectedPosition = 6;
         String input = "hello person";
         String expectedResult = "hello rson";
-        ResultingStringState result = StringManipulator.backwardKillWord(
-            caretPosition,
-            input
-        );
+        ResultingStringState result = StringManipulator.backwardKillWord(caretPosition, input);
         assertEquals(expectedResult, result.text);
         assertEquals(expectedPosition, result.caretPosition);
     }
@@ -183,52 +144,18 @@ void testGetNextWordBoundary(
         int expectedPosition,
         StringManipulator.Direction direction
     ) {
-        int result = StringManipulator.getNextWordBoundary(
-            caretPosition,
-            text,
-            direction
-        );
+        int result = StringManipulator.getNextWordBoundary(caretPosition, text, direction);
         assertEquals(expectedPosition, result);
     }
 
     private static Stream<Arguments> wordBoundaryTestData() {
         return Stream.of(
-            Arguments.of(
-                "hello person",
-                3,
-                0,
-                StringManipulator.Direction.PREVIOUS
-            ),
-            Arguments.of(
-                "hello person",
-                12,
-                6,
-                StringManipulator.Direction.PREVIOUS
-            ),
-            Arguments.of(
-                "hello person",
-                0,
-                0,
-                StringManipulator.Direction.PREVIOUS
-            ),
-            Arguments.of(
-                "hello person",
-                0,
-                5,
-                StringManipulator.Direction.NEXT
-            ),
-            Arguments.of(
-                "hello person",
-                5,
-                12,
-                StringManipulator.Direction.NEXT
-            ),
-            Arguments.of(
-                "hello person",
-                12,
-                12,
-                StringManipulator.Direction.NEXT
-            )
+            Arguments.of("hello person", 3, 0, StringManipulator.Direction.PREVIOUS),
+            Arguments.of("hello person", 12, 6, StringManipulator.Direction.PREVIOUS),
+            Arguments.of("hello person", 0, 0, StringManipulator.Direction.PREVIOUS),
+            Arguments.of("hello person", 0, 5, StringManipulator.Direction.NEXT),
+            Arguments.of("hello person", 5, 12, StringManipulator.Direction.NEXT),
+            Arguments.of("hello person", 12, 12, StringManipulator.Direction.NEXT)
         );
     }
 }
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 8278d50e8c1..8a0900074c7 100644
--- a/src/test/java/org/jabref/logic/util/strings/StringSimilarityTest.java
+++ b/src/test/java/org/jabref/logic/util/strings/StringSimilarityTest.java
@@ -26,14 +26,7 @@ public class StringSimilarityTest {
             "abcdef, a, false", // no empty string sand similarity > threshold (4)
         }
     )
-    public void testStringSimilarity(
-        String a,
-        String b,
-        String expectedResult
-    ) {
-        assertEquals(
-            Boolean.valueOf(expectedResult),
-            similarityChecker.isSimilar(a, b)
-        );
+    public void testStringSimilarity(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 8b99337783e..9e69024ca60 100644
--- a/src/test/java/org/jabref/logic/xmp/XmpUtilReaderTest.java
+++ b/src/test/java/org/jabref/logic/xmp/XmpUtilReaderTest.java
@@ -51,13 +51,9 @@ void setUp() {
      * Tests reading of dublinCore metadata.
      */
     @Test
-    void testReadArticleDublinCoreReadRawXmp()
-        throws IOException, URISyntaxException {
+    void testReadArticleDublinCoreReadRawXmp() throws IOException, URISyntaxException {
         Path path = Path.of(
-            XmpUtilShared.class.getResource(
-                    "article_dublinCore_without_day.pdf"
-                )
-                .toURI()
+            XmpUtilShared.class.getResource("article_dublinCore_without_day.pdf").toURI()
         );
         List<XMPMetadata> meta = xmpUtilReader.readRawXmp(path);
 
@@ -72,15 +68,9 @@ void testReadArticleDublinCoreReadRawXmp()
         Optional<BibEntry> entry = dcExtractor.extractBibtexEntry();
 
         Path bibFile = Path.of(
-            XmpUtilShared.class.getResource(
-                    "article_dublinCore_without_day.bib"
-                )
-                .toURI()
+            XmpUtilShared.class.getResource("article_dublinCore_without_day.bib").toURI()
         );
-        List<BibEntry> expected = testImporter
-            .importDatabase(bibFile)
-            .getDatabase()
-            .getEntries();
+        List<BibEntry> expected = testImporter.importDatabase(bibFile).getDatabase().getEntries();
 
         assertEquals(expected, Collections.singletonList(entry.get()));
     }
@@ -89,19 +79,11 @@ void testReadArticleDublinCoreReadRawXmp()
      * Tests reading of dublinCore metadata.
      */
     @Test
-    void testReadArticleDublinCoreReadXmp()
-        throws IOException, URISyntaxException {
-        Path pathPdf = Path.of(
-            XmpUtilShared.class.getResource("article_dublinCore.pdf").toURI()
-        );
+    void testReadArticleDublinCoreReadXmp() throws IOException, URISyntaxException {
+        Path pathPdf = Path.of(XmpUtilShared.class.getResource("article_dublinCore.pdf").toURI());
         List<BibEntry> entries = xmpUtilReader.readXmp(pathPdf, xmpPreferences);
-        Path bibFile = Path.of(
-            XmpUtilShared.class.getResource("article_dublinCore.bib").toURI()
-        );
-        List<BibEntry> expected = testImporter
-            .importDatabase(bibFile)
-            .getDatabase()
-            .getEntries();
+        Path bibFile = Path.of(XmpUtilShared.class.getResource("article_dublinCore.bib").toURI());
+        List<BibEntry> expected = testImporter.importDatabase(bibFile).getDatabase().getEntries();
 
         expected.forEach(bibEntry ->
             bibEntry.setFiles(
@@ -116,30 +98,18 @@ void testReadArticleDublinCoreReadXmp()
     }
 
     @Test
-    void testReadArticleDublinCoreReadXmpPartialDate()
-        throws IOException, URISyntaxException {
+    void testReadArticleDublinCoreReadXmpPartialDate() throws IOException, URISyntaxException {
         Path pathPdf = Path.of(
-            XmpUtilShared.class.getResource(
-                    "article_dublinCore_partial_date.pdf"
-                )
-                .toURI()
+            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()
+            XmpUtilShared.class.getResource("article_dublinCore_partial_date.bib").toURI()
         );
-        List<BibEntry> expected = testImporter
-            .importDatabase(bibFile)
-            .getDatabase()
-            .getEntries();
+        List<BibEntry> expected = testImporter.importDatabase(bibFile).getDatabase().getEntries();
 
         expected.forEach(bibEntry ->
-            bibEntry.setFiles(
-                List.of(new LinkedFile("", pathPdf.toAbsolutePath(), "PDF"))
-            )
+            bibEntry.setFiles(List.of(new LinkedFile("", pathPdf.toAbsolutePath(), "PDF")))
         );
 
         assertEquals(expected, entries);
@@ -151,9 +121,7 @@ void testReadArticleDublinCoreReadXmpPartialDate()
     @Test
     void testReadEmtpyMetadata() throws IOException, URISyntaxException {
         List<BibEntry> entries = xmpUtilReader.readXmp(
-            Path.of(
-                XmpUtilShared.class.getResource("empty_metadata.pdf").toURI()
-            ),
+            Path.of(XmpUtilShared.class.getResource("empty_metadata.pdf").toURI()),
             xmpPreferences
         );
         assertEquals(Collections.emptyList(), entries);
@@ -164,23 +132,14 @@ void testReadEmtpyMetadata() throws IOException, URISyntaxException {
      */
     @Test
     void testReadPDMetadata() throws IOException, URISyntaxException {
-        Path pathPdf = Path.of(
-            XmpUtilShared.class.getResource("PD_metadata.pdf").toURI()
-        );
+        Path pathPdf = Path.of(XmpUtilShared.class.getResource("PD_metadata.pdf").toURI());
         List<BibEntry> entries = xmpUtilReader.readXmp(pathPdf, xmpPreferences);
 
-        Path bibFile = Path.of(
-            XmpUtilShared.class.getResource("PD_metadata.bib").toURI()
-        );
-        List<BibEntry> expected = testImporter
-            .importDatabase(bibFile)
-            .getDatabase()
-            .getEntries();
+        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"))
-            )
+            bibEntry.setFiles(List.of(new LinkedFile("", pathPdf.toAbsolutePath(), "PDF")))
         );
 
         assertEquals(expected, entries);
@@ -190,13 +149,9 @@ void testReadPDMetadata() throws IOException, URISyntaxException {
      * Tests an pdf file with metadata which has no description section.
      */
     @Test
-    void testReadNoDescriptionMetadata()
-        throws IOException, URISyntaxException {
+    void testReadNoDescriptionMetadata() throws IOException, URISyntaxException {
         List<BibEntry> entries = xmpUtilReader.readXmp(
-            Path.of(
-                XmpUtilShared.class.getResource("no_description_metadata.pdf")
-                    .toURI()
-            ),
+            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 8a95466e187..854fad5301d 100644
--- a/src/test/java/org/jabref/logic/xmp/XmpUtilWriterTest.java
+++ b/src/test/java/org/jabref/logic/xmp/XmpUtilWriterTest.java
@@ -52,9 +52,7 @@ class XmpUtilWriterTest {
         .withField(StandardField.REVIEW, "review")
         .withField(StandardField.URL, "https://www.olly2018.edu");
 
-    private final BibEntry toral2006 = new BibEntry(
-        StandardEntryType.InProceedings
-    )
+    private final BibEntry toral2006 = new BibEntry(StandardEntryType.InProceedings)
         .withField(StandardField.AUTHOR, "Antonio Toral and Rafael Munoz")
         .withField(
             StandardField.TITLE,
@@ -67,10 +65,7 @@ class XmpUtilWriterTest {
         .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.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")
@@ -94,14 +89,11 @@ void setUp() {
      * Test for writing a PDF file with a single DublinCore metadata entry.
      */
     void singleEntryWorks(BibEntry entry) throws Exception {
-        Path pdfFile =
-            this.createDefaultFile("JabRef_writeSingle.pdf", tempDir);
+        Path pdfFile = this.createDefaultFile("JabRef_writeSingle.pdf", tempDir);
 
-        new XmpUtilWriter(xmpPreferences)
-            .writeXmp(pdfFile.toAbsolutePath(), entry, null);
+        new XmpUtilWriter(xmpPreferences).writeXmp(pdfFile.toAbsolutePath(), entry, null);
 
-        List<BibEntry> entriesWritten = new XmpUtilReader()
-            .readXmp(pdfFile, xmpPreferences);
+        List<BibEntry> entriesWritten = new XmpUtilReader().readXmp(pdfFile, xmpPreferences);
 
         BibEntry entryWritten = entriesWritten.get(0);
         entryWritten.clearField(StandardField.FILE);
@@ -129,8 +121,7 @@ void vapnik2000Works() throws Exception {
     void testWriteTwoBibEntries(@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);
+        new XmpUtilWriter(xmpPreferences).writeXmp(pdfFile.toAbsolutePath(), entries, null);
         List<BibEntry> entryList = new XmpUtilReader()
             .readXmp(pdfFile.toAbsolutePath(), xmpPreferences);
 
@@ -146,8 +137,7 @@ void testWriteTwoBibEntries(@TempDir Path tempDir) throws Exception {
     void testWriteThreeBibEntries(@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);
+        new XmpUtilWriter(xmpPreferences).writeXmp(pdfFile.toAbsolutePath(), entries, null);
         List<BibEntry> entryList = new XmpUtilReader()
             .readXmp(pdfFile.toAbsolutePath(), xmpPreferences);
 
@@ -160,10 +150,8 @@ void testWriteThreeBibEntries(@TempDir Path tempDir) throws Exception {
     }
 
     @Test
-    void proctingBracesAreRemovedAtTitle(@TempDir Path tempDir)
-        throws Exception {
-        Path pdfFile =
-            this.createDefaultFile("JabRef_writeBraces.pdf", tempDir);
+    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)
@@ -173,17 +161,14 @@ void proctingBracesAreRemovedAtTitle(@TempDir Path tempDir)
 
         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}");
+        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()
@@ -196,10 +181,8 @@ 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");
+        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()
@@ -226,8 +209,7 @@ void singleEntry(@TempDir Path tempDir) throws Exception {
     /**
      * Creates a temporary PDF-file with a single empty page.
      */
-    private Path createDefaultFile(String fileName, Path tempDir)
-        throws Exception {
+    private Path createDefaultFile(String fileName, Path tempDir) throws Exception {
         // create a default PDF
         Path pdfFile = tempDir.resolve(fileName);
         try (PDDocument pdf = new PDDocument()) {
diff --git a/src/test/java/org/jabref/migrations/ConvertLegacyExplicitGroupsTest.java b/src/test/java/org/jabref/migrations/ConvertLegacyExplicitGroupsTest.java
index 37bd8baac3a..9c76f582aa1 100644
--- a/src/test/java/org/jabref/migrations/ConvertLegacyExplicitGroupsTest.java
+++ b/src/test/java/org/jabref/migrations/ConvertLegacyExplicitGroupsTest.java
@@ -26,30 +26,22 @@ void setUp() throws Exception {
 
         entry = new BibEntry();
         entry.setCitationKey("Entry1");
-        group =
-            new ExplicitGroup("TestGroup", GroupHierarchyType.INCLUDING, ',');
+        group = new ExplicitGroup("TestGroup", GroupHierarchyType.INCLUDING, ',');
         group.addLegacyEntryKey("Entry1");
     }
 
     @Test
     void performActionWritesGroupMembershipInEntry() throws Exception {
-        ParserResult parserResult = generateParserResult(
-            GroupTreeNode.fromGroup(group)
-        );
+        ParserResult parserResult = generateParserResult(GroupTreeNode.fromGroup(group));
 
         action.performMigration(parserResult);
 
-        assertEquals(
-            Optional.of("TestGroup"),
-            entry.getField(StandardField.GROUPS)
-        );
+        assertEquals(Optional.of("TestGroup"), entry.getField(StandardField.GROUPS));
     }
 
     @Test
     void performActionClearsLegacyKeys() throws Exception {
-        ParserResult parserResult = generateParserResult(
-            GroupTreeNode.fromGroup(group)
-        );
+        ParserResult parserResult = generateParserResult(GroupTreeNode.fromGroup(group));
 
         action.performMigration(parserResult);
 
@@ -57,27 +49,19 @@ void performActionClearsLegacyKeys() throws Exception {
     }
 
     @Test
-    void performActionWritesGroupMembershipInEntryForComplexGroupTree()
-        throws Exception {
+    void performActionWritesGroupMembershipInEntryForComplexGroupTree() throws Exception {
         GroupTreeNode root = GroupTreeNode.fromGroup(new AllEntriesGroup(""));
-        root.addSubgroup(
-            new ExplicitGroup("TestGroup2", GroupHierarchyType.INCLUDING, ',')
-        );
+        root.addSubgroup(new ExplicitGroup("TestGroup2", GroupHierarchyType.INCLUDING, ','));
         root.addSubgroup(group);
         ParserResult parserResult = generateParserResult(root);
 
         action.performMigration(parserResult);
 
-        assertEquals(
-            Optional.of("TestGroup"),
-            entry.getField(StandardField.GROUPS)
-        );
+        assertEquals(Optional.of("TestGroup"), entry.getField(StandardField.GROUPS));
     }
 
     private ParserResult generateParserResult(GroupTreeNode groupRoot) {
-        ParserResult parserResult = new ParserResult(
-            Collections.singletonList(entry)
-        );
+        ParserResult parserResult = new ParserResult(Collections.singletonList(entry));
         parserResult.getMetaData().setGroups(groupRoot);
         return parserResult;
     }
diff --git a/src/test/java/org/jabref/migrations/ConvertMarkingToGroupsTest.java b/src/test/java/org/jabref/migrations/ConvertMarkingToGroupsTest.java
index 501e54d4a23..bbf2e5b4f22 100644
--- a/src/test/java/org/jabref/migrations/ConvertMarkingToGroupsTest.java
+++ b/src/test/java/org/jabref/migrations/ConvertMarkingToGroupsTest.java
@@ -17,11 +17,8 @@ class ConvertMarkingToGroupsTest {
 
     @Test
     void performMigrationForSingleEntry() {
-        BibEntry entry = new BibEntry()
-            .withField(InternalField.MARKED_INTERNAL, "[Nicolas:6]");
-        ParserResult parserResult = new ParserResult(
-            Collections.singleton(entry)
-        );
+        BibEntry entry = new BibEntry().withField(InternalField.MARKED_INTERNAL, "[Nicolas:6]");
+        ParserResult parserResult = new ParserResult(Collections.singleton(entry));
 
         new ConvertMarkingToGroups().performMigration(parserResult);
 
@@ -31,17 +28,9 @@ void performMigrationForSingleEntry() {
         GroupTreeNode markings = rootExpected.addSubgroup(
             new ExplicitGroup("Markings", GroupHierarchyType.INCLUDING, ',')
         );
-        markings.addSubgroup(
-            new ExplicitGroup("Nicolas:6", GroupHierarchyType.INCLUDING, ',')
-        );
+        markings.addSubgroup(new ExplicitGroup("Nicolas:6", GroupHierarchyType.INCLUDING, ','));
 
-        assertEquals(
-            Optional.empty(),
-            entry.getField(InternalField.MARKED_INTERNAL)
-        );
-        assertEquals(
-            Optional.of(rootExpected),
-            parserResult.getMetaData().getGroups()
-        );
+        assertEquals(Optional.empty(), entry.getField(InternalField.MARKED_INTERNAL));
+        assertEquals(Optional.of(rootExpected), parserResult.getMetaData().getGroups());
     }
 }
diff --git a/src/test/java/org/jabref/migrations/MergeReviewIntoCommentActionMigrationTest.java b/src/test/java/org/jabref/migrations/MergeReviewIntoCommentActionMigrationTest.java
index 08162b621da..b41f152ae85 100644
--- a/src/test/java/org/jabref/migrations/MergeReviewIntoCommentActionMigrationTest.java
+++ b/src/test/java/org/jabref/migrations/MergeReviewIntoCommentActionMigrationTest.java
@@ -26,27 +26,17 @@ public void setUp() {
 
     @Test
     public void noFields() {
-        ParserResult actualParserResult = new ParserResult(
-            Collections.singletonList(entry)
-        );
+        ParserResult actualParserResult = new ParserResult(Collections.singletonList(entry));
 
         action.performMigration(actualParserResult);
 
-        assertEquals(
-            entry,
-            actualParserResult
-                .getDatabase()
-                .getEntryByCitationKey("Entry1")
-                .get()
-        );
+        assertEquals(entry, actualParserResult.getDatabase().getEntryByCitationKey("Entry1").get());
     }
 
     @Test
     public void reviewField() {
         entry.setField(StandardField.REVIEW, "My Review");
-        ParserResult actualParserResult = new ParserResult(
-            Collections.singletonList(entry)
-        );
+        ParserResult actualParserResult = new ParserResult(Collections.singletonList(entry));
 
         expectedEntry.setField(StandardField.COMMENT, "My Review");
 
@@ -54,40 +44,26 @@ public void reviewField() {
 
         assertEquals(
             expectedEntry,
-            actualParserResult
-                .getDatabase()
-                .getEntryByCitationKey("Entry1")
-                .get()
+            actualParserResult.getDatabase().getEntryByCitationKey("Entry1").get()
         );
     }
 
     @Test
     public void commentField() {
         entry.setField(StandardField.COMMENT, "My Comment");
-        ParserResult actualParserResult = new ParserResult(
-            Collections.singletonList(entry)
-        );
+        ParserResult actualParserResult = new ParserResult(Collections.singletonList(entry));
 
         action.performMigration(actualParserResult);
 
-        assertEquals(
-            entry,
-            actualParserResult
-                .getDatabase()
-                .getEntryByCitationKey("Entry1")
-                .get()
-        );
+        assertEquals(entry, actualParserResult.getDatabase().getEntryByCitationKey("Entry1").get());
     }
 
     @Test
     public void multiLineReviewField() {
-        String commentString =
-            "My Review\n\nSecond Paragraph\n\nThird Paragraph";
+        String commentString = "My Review\n\nSecond Paragraph\n\nThird Paragraph";
 
         entry.setField(StandardField.REVIEW, commentString);
-        ParserResult actualParserResult = new ParserResult(
-            Collections.singletonList(entry)
-        );
+        ParserResult actualParserResult = new ParserResult(Collections.singletonList(entry));
 
         expectedEntry.setField(StandardField.COMMENT, commentString);
 
@@ -95,10 +71,7 @@ public void multiLineReviewField() {
 
         assertEquals(
             expectedEntry,
-            actualParserResult
-                .getDatabase()
-                .getEntryByCitationKey("Entry1")
-                .get()
+            actualParserResult.getDatabase().getEntryByCitationKey("Entry1").get()
         );
     }
 
@@ -110,9 +83,7 @@ public void reviewAndCommentField() {
         entry.setField(StandardField.REVIEW, "My Review");
         entry.setField(StandardField.COMMENT, "My Comment");
 
-        ParserResult actualParserResult = new ParserResult(
-            Collections.singletonList(entry)
-        );
+        ParserResult actualParserResult = new ParserResult(Collections.singletonList(entry));
 
         expectedEntry.setField(
             StandardField.COMMENT,
@@ -123,10 +94,7 @@ public void reviewAndCommentField() {
 
         assertEquals(
             expectedEntry,
-            actualParserResult
-                .getDatabase()
-                .getEntryByCitationKey("Entry1")
-                .get()
+            actualParserResult.getDatabase().getEntryByCitationKey("Entry1").get()
         );
     }
 
diff --git a/src/test/java/org/jabref/migrations/PreferencesMigrationsTest.java b/src/test/java/org/jabref/migrations/PreferencesMigrationsTest.java
index d86cc56e65b..24dd9ed00cd 100644
--- a/src/test/java/org/jabref/migrations/PreferencesMigrationsTest.java
+++ b/src/test/java/org/jabref/migrations/PreferencesMigrationsTest.java
@@ -41,60 +41,41 @@ void setUp() {
 
     @Test
     void testOldStyleBibtexkeyPattern0() {
-        when(prefs.get(JabRefPreferences.IMPORT_FILENAMEPATTERN))
-            .thenReturn(oldStylePatterns[0]);
+        when(prefs.get(JabRefPreferences.IMPORT_FILENAMEPATTERN)).thenReturn(oldStylePatterns[0]);
         when(mainPrefsNode.get(JabRefPreferences.IMPORT_FILENAMEPATTERN, null))
             .thenReturn(oldStylePatterns[0]);
-        when(prefs.hasKey(JabRefPreferences.IMPORT_FILENAMEPATTERN))
-            .thenReturn(true);
+        when(prefs.hasKey(JabRefPreferences.IMPORT_FILENAMEPATTERN)).thenReturn(true);
 
-        PreferencesMigrations.upgradeImportFileAndDirePatterns(
-            prefs,
-            mainPrefsNode
-        );
+        PreferencesMigrations.upgradeImportFileAndDirePatterns(prefs, mainPrefsNode);
 
-        verify(prefs)
-            .put(JabRefPreferences.IMPORT_FILENAMEPATTERN, newStylePatterns[0]);
-        verify(mainPrefsNode)
-            .put(JabRefPreferences.IMPORT_FILENAMEPATTERN, newStylePatterns[0]);
+        verify(prefs).put(JabRefPreferences.IMPORT_FILENAMEPATTERN, newStylePatterns[0]);
+        verify(mainPrefsNode).put(JabRefPreferences.IMPORT_FILENAMEPATTERN, newStylePatterns[0]);
     }
 
     @Test
     void testOldStyleBibtexkeyPattern1() {
-        when(prefs.get(JabRefPreferences.IMPORT_FILENAMEPATTERN))
-            .thenReturn(oldStylePatterns[1]);
+        when(prefs.get(JabRefPreferences.IMPORT_FILENAMEPATTERN)).thenReturn(oldStylePatterns[1]);
         when(mainPrefsNode.get(JabRefPreferences.IMPORT_FILENAMEPATTERN, null))
             .thenReturn(oldStylePatterns[1]);
-        when(prefs.hasKey(JabRefPreferences.IMPORT_FILENAMEPATTERN))
-            .thenReturn(true);
+        when(prefs.hasKey(JabRefPreferences.IMPORT_FILENAMEPATTERN)).thenReturn(true);
 
-        PreferencesMigrations.upgradeImportFileAndDirePatterns(
-            prefs,
-            mainPrefsNode
-        );
+        PreferencesMigrations.upgradeImportFileAndDirePatterns(prefs, mainPrefsNode);
 
-        verify(prefs)
-            .put(JabRefPreferences.IMPORT_FILENAMEPATTERN, newStylePatterns[1]);
-        verify(mainPrefsNode)
-            .put(JabRefPreferences.IMPORT_FILENAMEPATTERN, newStylePatterns[1]);
+        verify(prefs).put(JabRefPreferences.IMPORT_FILENAMEPATTERN, newStylePatterns[1]);
+        verify(mainPrefsNode).put(JabRefPreferences.IMPORT_FILENAMEPATTERN, newStylePatterns[1]);
     }
 
     @Test
     void testArbitraryBibtexkeyPattern() {
         String arbitraryPattern = "[anyUserPrividedString]";
 
-        when(prefs.get(JabRefPreferences.IMPORT_FILENAMEPATTERN))
-            .thenReturn(arbitraryPattern);
+        when(prefs.get(JabRefPreferences.IMPORT_FILENAMEPATTERN)).thenReturn(arbitraryPattern);
         when(mainPrefsNode.get(JabRefPreferences.IMPORT_FILENAMEPATTERN, null))
             .thenReturn(arbitraryPattern);
 
-        PreferencesMigrations.upgradeImportFileAndDirePatterns(
-            prefs,
-            mainPrefsNode
-        );
+        PreferencesMigrations.upgradeImportFileAndDirePatterns(prefs, mainPrefsNode);
 
-        verify(prefs, never())
-            .put(JabRefPreferences.IMPORT_FILENAMEPATTERN, arbitraryPattern);
+        verify(prefs, never()).put(JabRefPreferences.IMPORT_FILENAMEPATTERN, arbitraryPattern);
         verify(mainPrefsNode, never())
             .put(JabRefPreferences.IMPORT_FILENAMEPATTERN, arbitraryPattern);
     }
@@ -115,8 +96,7 @@ void testPreviewStyleReviewToComment() {
             "\\begin{comment} Something: \\format[Markdown,HTMLChars]{\\comment} special \\end{comment}__NEWLINE__" +
             "</font>__NEWLINE__";
 
-        when(prefs.get(JabRefPreferences.PREVIEW_STYLE))
-            .thenReturn(oldPreviewStyle);
+        when(prefs.get(JabRefPreferences.PREVIEW_STYLE)).thenReturn(oldPreviewStyle);
 
         PreferencesMigrations.upgradePreviewStyle(prefs);
 
@@ -134,26 +114,15 @@ void testUpgradeColumnPreferencesAlreadyMigrated() {
             "citationkey",
             "printed"
         );
-        List<String> columnWidths = Arrays.asList(
-            "75",
-            "300",
-            "470",
-            "60",
-            "130",
-            "100",
-            "30"
-        );
+        List<String> columnWidths = Arrays.asList("75", "300", "470", "60", "130", "100", "30");
 
-        when(prefs.getStringList(JabRefPreferences.COLUMN_NAMES))
-            .thenReturn(columnNames);
-        when(prefs.getStringList(JabRefPreferences.COLUMN_WIDTHS))
-            .thenReturn(columnWidths);
+        when(prefs.getStringList(JabRefPreferences.COLUMN_NAMES)).thenReturn(columnNames);
+        when(prefs.getStringList(JabRefPreferences.COLUMN_WIDTHS)).thenReturn(columnWidths);
 
         PreferencesMigrations.upgradeColumnPreferences(prefs);
 
         verify(prefs, never()).put(JabRefPreferences.COLUMN_NAMES, "anyString");
-        verify(prefs, never())
-            .put(JabRefPreferences.COLUMN_WIDTHS, "anyString");
+        verify(prefs, never()).put(JabRefPreferences.COLUMN_WIDTHS, "anyString");
     }
 
     @Test
@@ -167,15 +136,7 @@ void testUpgradeColumnPreferencesFromWithoutTypes() {
             "citationkey",
             "printed"
         );
-        List<String> columnWidths = Arrays.asList(
-            "75",
-            "300",
-            "470",
-            "60",
-            "130",
-            "100",
-            "30"
-        );
+        List<String> columnWidths = Arrays.asList("75", "300", "470", "60", "130", "100", "30");
         List<String> updatedNames = Arrays.asList(
             "groups",
             "files",
@@ -213,19 +174,14 @@ void testUpgradeColumnPreferencesFromWithoutTypes() {
             "ASCENDING"
         );
 
-        when(prefs.getStringList(JabRefPreferences.COLUMN_NAMES))
-            .thenReturn(columnNames);
-        when(prefs.getStringList(JabRefPreferences.COLUMN_WIDTHS))
-            .thenReturn(columnWidths);
+        when(prefs.getStringList(JabRefPreferences.COLUMN_NAMES)).thenReturn(columnNames);
+        when(prefs.getStringList(JabRefPreferences.COLUMN_WIDTHS)).thenReturn(columnWidths);
 
         PreferencesMigrations.upgradeColumnPreferences(prefs);
 
-        verify(prefs)
-            .putStringList(JabRefPreferences.COLUMN_NAMES, updatedNames);
-        verify(prefs)
-            .putStringList(JabRefPreferences.COLUMN_WIDTHS, updatedWidths);
-        verify(prefs)
-            .putStringList(JabRefPreferences.COLUMN_SORT_TYPES, newSortTypes);
+        verify(prefs).putStringList(JabRefPreferences.COLUMN_NAMES, updatedNames);
+        verify(prefs).putStringList(JabRefPreferences.COLUMN_WIDTHS, updatedWidths);
+        verify(prefs).putStringList(JabRefPreferences.COLUMN_SORT_TYPES, newSortTypes);
     }
 
     @Test
@@ -239,23 +195,13 @@ void testChangeColumnPreferencesVariableNamesFor51() {
             "citationkey",
             "printed"
         );
-        List<String> columnWidths = Arrays.asList(
-            "75",
-            "300",
-            "470",
-            "60",
-            "130",
-            "100",
-            "30"
-        );
+        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
         when(prefs.getStringList("columnNames")).thenReturn(columnNames);
         when(prefs.getStringList("columnWidths")).thenReturn(columnWidths);
-        when(prefs.getStringList("mainTableColumnSortTypes"))
-            .thenReturn(columnNames);
-        when(prefs.getStringList("mainTableColumnSortOrder"))
-            .thenReturn(columnWidths);
+        when(prefs.getStringList("mainTableColumnSortTypes")).thenReturn(columnNames);
+        when(prefs.getStringList("mainTableColumnSortOrder")).thenReturn(columnWidths);
 
         when(prefs.getStringList(JabRefPreferences.COLUMN_NAMES))
             .thenReturn(Collections.emptyList());
@@ -268,14 +214,10 @@ void testChangeColumnPreferencesVariableNamesFor51() {
 
         PreferencesMigrations.changeColumnVariableNamesFor51(prefs);
 
-        verify(prefs)
-            .putStringList(JabRefPreferences.COLUMN_NAMES, columnNames);
-        verify(prefs)
-            .putStringList(JabRefPreferences.COLUMN_WIDTHS, columnWidths);
-        verify(prefs)
-            .putStringList(JabRefPreferences.COLUMN_NAMES, columnNames);
-        verify(prefs)
-            .putStringList(JabRefPreferences.COLUMN_WIDTHS, columnWidths);
+        verify(prefs).putStringList(JabRefPreferences.COLUMN_NAMES, columnNames);
+        verify(prefs).putStringList(JabRefPreferences.COLUMN_WIDTHS, columnWidths);
+        verify(prefs).putStringList(JabRefPreferences.COLUMN_NAMES, columnNames);
+        verify(prefs).putStringList(JabRefPreferences.COLUMN_WIDTHS, columnWidths);
     }
 
     @Test
@@ -289,23 +231,13 @@ void testChangeColumnPreferencesVariableNamesBackwardsCompatibility() {
             "citationkey",
             "printed"
         );
-        List<String> columnWidths = Arrays.asList(
-            "75",
-            "300",
-            "470",
-            "60",
-            "130",
-            "100",
-            "30"
-        );
+        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
         when(prefs.getStringList("columnNames")).thenReturn(columnNames);
         when(prefs.getStringList("columnWidths")).thenReturn(columnWidths);
-        when(prefs.getStringList("mainTableColumnSortTypes"))
-            .thenReturn(columnNames);
-        when(prefs.getStringList("mainTableColumnSortOrder"))
-            .thenReturn(columnWidths);
+        when(prefs.getStringList("mainTableColumnSortTypes")).thenReturn(columnNames);
+        when(prefs.getStringList("mainTableColumnSortOrder")).thenReturn(columnWidths);
 
         when(prefs.getStringList(JabRefPreferences.COLUMN_NAMES))
             .thenReturn(Collections.emptyList());
@@ -347,18 +279,9 @@ void testRestoreColumnVariablesForBackwardCompatibility() {
             "citationkey",
             "printed"
         );
-        List<String> columnWidths = Arrays.asList(
-            "100",
-            "100",
-            "100",
-            "100",
-            "100",
-            "100",
-            "100"
-        );
+        List<String> columnWidths = Arrays.asList("100", "100", "100", "100", "100", "100", "100");
 
-        when(prefs.getStringList(JabRefPreferences.COLUMN_NAMES))
-            .thenReturn(updatedNames);
+        when(prefs.getStringList(JabRefPreferences.COLUMN_NAMES)).thenReturn(updatedNames);
 
         when(prefs.get(JabRefPreferences.MAIN_FONT_SIZE)).thenReturn("11.2");
 
@@ -382,8 +305,7 @@ void testMoveApiKeysToKeyRing() throws Exception {
             .thenReturn(List.of("FetcherA", "FetcherB", "FetcherC"));
         when(prefs.getStringList(V5_9_FETCHER_CUSTOM_KEYS))
             .thenReturn(List.of("KeyA", "KeyB", "KeyC"));
-        when(prefs.getInternalPreferences().getUserAndHost())
-            .thenReturn("user-host");
+        when(prefs.getInternalPreferences().getUserAndHost()).thenReturn("user-host");
 
         try (
             MockedStatic<Keyring> keyringFactory = Mockito.mockStatic(
@@ -395,24 +317,9 @@ void testMoveApiKeysToKeyRing() throws Exception {
 
             PreferencesMigrations.moveApiKeysToKeyring(prefs);
 
-            verify(keyring)
-                .setPassword(
-                    eq("org.jabref.customapikeys"),
-                    eq("FetcherA"),
-                    any()
-                );
-            verify(keyring)
-                .setPassword(
-                    eq("org.jabref.customapikeys"),
-                    eq("FetcherB"),
-                    any()
-                );
-            verify(keyring)
-                .setPassword(
-                    eq("org.jabref.customapikeys"),
-                    eq("FetcherC"),
-                    any()
-                );
+            verify(keyring).setPassword(eq("org.jabref.customapikeys"), eq("FetcherA"), any());
+            verify(keyring).setPassword(eq("org.jabref.customapikeys"), eq("FetcherB"), any());
+            verify(keyring).setPassword(eq("org.jabref.customapikeys"), eq("FetcherC"), any());
             verify(prefs).deleteKey(V5_9_FETCHER_CUSTOM_KEYS);
         }
     }
diff --git a/src/test/java/org/jabref/migrations/SpecialFieldsToSeparateFieldsTest.java b/src/test/java/org/jabref/migrations/SpecialFieldsToSeparateFieldsTest.java
index 3f191bd4b97..ee4f29d98c3 100644
--- a/src/test/java/org/jabref/migrations/SpecialFieldsToSeparateFieldsTest.java
+++ b/src/test/java/org/jabref/migrations/SpecialFieldsToSeparateFieldsTest.java
@@ -22,11 +22,9 @@ public void migrateToCorrectField(
         String fieldInKeyword,
         BibEntry expected
     ) {
-        BibEntry entry = new BibEntry()
-            .withField(StandardField.KEYWORDS, fieldInKeyword);
+        BibEntry entry = new BibEntry().withField(StandardField.KEYWORDS, fieldInKeyword);
 
-        new SpecialFieldsToSeparateFields(',')
-            .performMigration(new ParserResult(List.of(entry)));
+        new SpecialFieldsToSeparateFields(',').performMigration(new ParserResult(List.of(entry)));
 
         assertEquals(expected, entry);
     }
@@ -40,8 +38,7 @@ public void noKewordToMigrate() {
             .withField(StandardField.AUTHOR, "JabRef")
             .withField(StandardField.KEYWORDS, "tdd");
 
-        new SpecialFieldsToSeparateFields(',')
-            .performMigration(new ParserResult(List.of(entry)));
+        new SpecialFieldsToSeparateFields(',').performMigration(new ParserResult(List.of(entry)));
 
         assertEquals(expected, entry);
     }
@@ -55,8 +52,7 @@ public void noKeywordToMigrateButDuplicateKeywords() {
             .withField(StandardField.AUTHOR, "JabRef")
             .withField(StandardField.KEYWORDS, "asdf, asdf, asdf");
 
-        new SpecialFieldsToSeparateFields(',')
-            .performMigration(new ParserResult(List.of(entry)));
+        new SpecialFieldsToSeparateFields(',').performMigration(new ParserResult(List.of(entry)));
 
         assertEquals(expected, entry);
     }
@@ -71,8 +67,7 @@ public void migrateMultipleSpecialFields() {
             .withField(SpecialField.PRINTED, "printed")
             .withField(SpecialField.PRIORITY, "prio1");
 
-        new SpecialFieldsToSeparateFields(',')
-            .performMigration(new ParserResult(List.of(entry)));
+        new SpecialFieldsToSeparateFields(',').performMigration(new ParserResult(List.of(entry)));
 
         assertEquals(expected, entry);
     }
@@ -88,8 +83,7 @@ public void migrateSpecialFieldsMixedWithKeyword() {
             .withField(StandardField.KEYWORDS, "tdd, SE")
             .withField(SpecialField.PRIORITY, "prio1");
 
-        new SpecialFieldsToSeparateFields(',')
-            .performMigration(new ParserResult(List.of(entry)));
+        new SpecialFieldsToSeparateFields(',').performMigration(new ParserResult(List.of(entry)));
 
         assertEquals(expected, entry);
     }
diff --git a/src/test/java/org/jabref/model/FieldChangeTest.java b/src/test/java/org/jabref/model/FieldChangeTest.java
index fc2f1d4050a..f5ab0e7acd6 100644
--- a/src/test/java/org/jabref/model/FieldChangeTest.java
+++ b/src/test/java/org/jabref/model/FieldChangeTest.java
@@ -12,12 +12,7 @@ class FieldChangeTest {
 
     private BibEntry entry = new BibEntry().withField(StandardField.DOI, "foo");
     private BibEntry entryOther = new BibEntry();
-    private FieldChange fc = new FieldChange(
-        entry,
-        StandardField.DOI,
-        "foo",
-        "bar"
-    );
+    private FieldChange fc = new FieldChange(entry, StandardField.DOI, "foo", "bar");
 
     @Test
     void fieldChangeOnNullEntryNotAllowed() {
@@ -29,61 +24,35 @@ void fieldChangeOnNullEntryNotAllowed() {
 
     @Test
     void fieldChangeOnNullFieldNotAllowed() {
-        assertThrows(
-            NullPointerException.class,
-            () -> new FieldChange(entry, null, "foo", "bar")
-        );
+        assertThrows(NullPointerException.class, () -> new FieldChange(entry, null, "foo", "bar"));
     }
 
     @Test
     void blankFieldChangeNotAllowed() {
-        assertThrows(
-            NullPointerException.class,
-            () -> new FieldChange(null, null, null, null)
-        );
+        assertThrows(NullPointerException.class, () -> new FieldChange(null, null, null, null));
     }
 
     @Test
     void equalFieldChange() {
-        FieldChange fcBlankNewValue = new FieldChange(
-            entry,
-            StandardField.DOI,
-            "foo",
-            null
-        );
+        FieldChange fcBlankNewValue = new FieldChange(entry, StandardField.DOI, "foo", null);
         assertNotEquals(fc, fcBlankNewValue);
     }
 
     @Test
     void selfEqualsFieldchangeSameParameters() {
-        FieldChange fcBlankNewValue = new FieldChange(
-            entry,
-            StandardField.DOI,
-            "foo",
-            "bar"
-        );
+        FieldChange fcBlankNewValue = new FieldChange(entry, StandardField.DOI, "foo", "bar");
         assertEquals(fc, fcBlankNewValue);
     }
 
     @Test
     void selfEqualsFieldchangeDifferentOldValue() {
-        FieldChange fcBlankNewValue = new FieldChange(
-            entry,
-            StandardField.DOI,
-            null,
-            "bar"
-        );
+        FieldChange fcBlankNewValue = new FieldChange(entry, StandardField.DOI, null, "bar");
         assertNotEquals(fc, fcBlankNewValue);
     }
 
     @Test
     void selfEqualsFieldchangeDifferentEntry() {
-        FieldChange fcBlankNewValue = new FieldChange(
-            entryOther,
-            StandardField.DOI,
-            "foo",
-            "bar"
-        );
+        FieldChange fcBlankNewValue = new FieldChange(entryOther, StandardField.DOI, "foo", "bar");
         assertNotEquals(fc, fcBlankNewValue);
     }
 
@@ -99,12 +68,7 @@ void fieldChangeEqualsItSelf() {
 
     @Test
     void differentFieldChangeIsNotEqual() {
-        FieldChange fcOther = new FieldChange(
-            entryOther,
-            StandardField.DOI,
-            "fooX",
-            "barX"
-        );
+        FieldChange fcOther = new FieldChange(entryOther, StandardField.DOI, "fooX", "barX");
         assertNotEquals(fc, fcOther);
     }
 }
diff --git a/src/test/java/org/jabref/model/TreeNodeTest.java b/src/test/java/org/jabref/model/TreeNodeTest.java
index 38b7e678c56..a59e247b1f7 100644
--- a/src/test/java/org/jabref/model/TreeNodeTest.java
+++ b/src/test/java/org/jabref/model/TreeNodeTest.java
@@ -27,23 +27,18 @@ public void setUp() {
 
     @Test
     public void constructorChecksThatClassImplementsCorrectInterface() {
-        assertThrows(
-            UnsupportedOperationException.class,
-            WrongTreeNodeImplementation::new
-        );
+        assertThrows(UnsupportedOperationException.class, WrongTreeNodeImplementation::new);
     }
 
     @Test
     public void constructorExceptsCorrectImplementation() {
-        TreeNodeTestData.TreeNodeMock treeNode =
-            new TreeNodeTestData.TreeNodeMock();
+        TreeNodeTestData.TreeNodeMock treeNode = new TreeNodeTestData.TreeNodeMock();
         assertNotNull(treeNode);
     }
 
     @Test
     public void newTreeNodeHasNoParentOrChildren() {
-        TreeNodeTestData.TreeNodeMock treeNode =
-            new TreeNodeTestData.TreeNodeMock();
+        TreeNodeTestData.TreeNodeMock treeNode = new TreeNodeTestData.TreeNodeMock();
         assertEquals(Optional.empty(), treeNode.getParent());
         assertEquals(Collections.emptyList(), treeNode.getChildren());
         assertNotNull(treeNode);
@@ -51,8 +46,7 @@ public void newTreeNodeHasNoParentOrChildren() {
 
     @Test
     public void getIndexedPathFromRootReturnsEmptyListForRoot() {
-        TreeNodeTestData.TreeNodeMock root =
-            new TreeNodeTestData.TreeNodeMock();
+        TreeNodeTestData.TreeNodeMock root = new TreeNodeTestData.TreeNodeMock();
         assertEquals(Collections.emptyList(), root.getIndexedPathFromRoot());
     }
 
@@ -74,77 +68,54 @@ public void getIndexedPathFromRootComplexPath() {
 
     @Test
     public void getDescendantSimplePath() {
-        TreeNodeTestData.TreeNodeMock root =
-            new TreeNodeTestData.TreeNodeMock();
-        TreeNodeTestData.TreeNodeMock node =
-            TreeNodeTestData.getNodeInSimpleTree(root);
+        TreeNodeTestData.TreeNodeMock root = new TreeNodeTestData.TreeNodeMock();
+        TreeNodeTestData.TreeNodeMock node = TreeNodeTestData.getNodeInSimpleTree(root);
         assertEquals(node, root.getDescendant(Arrays.asList(1, 0)).get());
     }
 
     @Test
     public void getDescendantComplexPath() {
-        TreeNodeTestData.TreeNodeMock root =
-            new TreeNodeTestData.TreeNodeMock();
-        TreeNodeTestData.TreeNodeMock node =
-            TreeNodeTestData.getNodeInComplexTree(root);
+        TreeNodeTestData.TreeNodeMock root = new TreeNodeTestData.TreeNodeMock();
+        TreeNodeTestData.TreeNodeMock node = TreeNodeTestData.getNodeInComplexTree(root);
         assertEquals(node, root.getDescendant(Arrays.asList(2, 1, 0)).get());
     }
 
     @Test
     public void getDescendantNonExistentReturnsEmpty() {
-        TreeNodeTestData.TreeNodeMock root =
-            new TreeNodeTestData.TreeNodeMock();
+        TreeNodeTestData.TreeNodeMock root = new TreeNodeTestData.TreeNodeMock();
         TreeNodeTestData.getNodeInComplexTree(root);
-        assertEquals(
-            Optional.empty(),
-            root.getDescendant(Arrays.asList(1, 100, 0))
-        );
+        assertEquals(Optional.empty(), root.getDescendant(Arrays.asList(1, 100, 0)));
     }
 
     @Test
     public void getPositionInParentForRootThrowsException() {
-        TreeNodeTestData.TreeNodeMock root =
-            new TreeNodeTestData.TreeNodeMock();
-        assertThrows(
-            UnsupportedOperationException.class,
-            root::getPositionInParent
-        );
+        TreeNodeTestData.TreeNodeMock root = new TreeNodeTestData.TreeNodeMock();
+        assertThrows(UnsupportedOperationException.class, root::getPositionInParent);
     }
 
     @Test
     public void getPositionInParentSimpleTree() {
-        TreeNodeTestData.TreeNodeMock root =
-            new TreeNodeTestData.TreeNodeMock();
-        TreeNodeTestData.TreeNodeMock node = TreeNodeTestData.getNodeAsChild(
-            root
-        );
+        TreeNodeTestData.TreeNodeMock root = new TreeNodeTestData.TreeNodeMock();
+        TreeNodeTestData.TreeNodeMock node = TreeNodeTestData.getNodeAsChild(root);
         assertEquals(2, node.getPositionInParent());
     }
 
     @Test
     public void getIndexOfNonExistentChildReturnsEmpty() {
-        TreeNodeTestData.TreeNodeMock root =
-            new TreeNodeTestData.TreeNodeMock();
-        assertEquals(
-            Optional.empty(),
-            root.getIndexOfChild(new TreeNodeTestData.TreeNodeMock())
-        );
+        TreeNodeTestData.TreeNodeMock root = new TreeNodeTestData.TreeNodeMock();
+        assertEquals(Optional.empty(), root.getIndexOfChild(new TreeNodeTestData.TreeNodeMock()));
     }
 
     @Test
     public void getIndexOfChild() {
-        TreeNodeTestData.TreeNodeMock root =
-            new TreeNodeTestData.TreeNodeMock();
-        TreeNodeTestData.TreeNodeMock node = TreeNodeTestData.getNodeAsChild(
-            root
-        );
+        TreeNodeTestData.TreeNodeMock root = new TreeNodeTestData.TreeNodeMock();
+        TreeNodeTestData.TreeNodeMock node = TreeNodeTestData.getNodeAsChild(root);
         assertEquals((Integer) 2, root.getIndexOfChild(node).get());
     }
 
     @Test
     public void getLevelOfRoot() {
-        TreeNodeTestData.TreeNodeMock root =
-            new TreeNodeTestData.TreeNodeMock();
+        TreeNodeTestData.TreeNodeMock root = new TreeNodeTestData.TreeNodeMock();
         assertEquals(0, root.getLevel());
     }
 
@@ -160,58 +131,47 @@ public void getLevelInComplexTree() {
 
     @Test
     public void getChildCountInSimpleTree() {
-        TreeNodeTestData.TreeNodeMock root =
-            new TreeNodeTestData.TreeNodeMock();
+        TreeNodeTestData.TreeNodeMock root = new TreeNodeTestData.TreeNodeMock();
         TreeNodeTestData.getNodeInSimpleTree(root);
         assertEquals(2, root.getNumberOfChildren());
     }
 
     @Test
     public void getChildCountInComplexTree() {
-        TreeNodeTestData.TreeNodeMock root =
-            new TreeNodeTestData.TreeNodeMock();
+        TreeNodeTestData.TreeNodeMock root = new TreeNodeTestData.TreeNodeMock();
         TreeNodeTestData.getNodeInComplexTree(root);
         assertEquals(4, root.getNumberOfChildren());
     }
 
     @Test
     public void moveToAddsAsLastChildInSimpleTree() {
-        TreeNodeTestData.TreeNodeMock root =
-            new TreeNodeTestData.TreeNodeMock();
-        TreeNodeTestData.TreeNodeMock node =
-            TreeNodeTestData.getNodeInSimpleTree(root);
+        TreeNodeTestData.TreeNodeMock root = new TreeNodeTestData.TreeNodeMock();
+        TreeNodeTestData.TreeNodeMock node = TreeNodeTestData.getNodeInSimpleTree(root);
         node.moveTo(root);
         assertEquals((Integer) 2, root.getIndexOfChild(node).get());
     }
 
     @Test
     public void moveToAddsAsLastChildInComplexTree() {
-        TreeNodeTestData.TreeNodeMock root =
-            new TreeNodeTestData.TreeNodeMock();
-        TreeNodeTestData.TreeNodeMock node =
-            TreeNodeTestData.getNodeInComplexTree(root);
+        TreeNodeTestData.TreeNodeMock root = new TreeNodeTestData.TreeNodeMock();
+        TreeNodeTestData.TreeNodeMock node = TreeNodeTestData.getNodeInComplexTree(root);
         node.moveTo(root);
         assertEquals((Integer) 4, root.getIndexOfChild(node).get());
     }
 
     @Test
     public void moveToChangesParent() {
-        TreeNodeTestData.TreeNodeMock root =
-            new TreeNodeTestData.TreeNodeMock();
-        TreeNodeTestData.TreeNodeMock node =
-            TreeNodeTestData.getNodeInSimpleTree(root);
+        TreeNodeTestData.TreeNodeMock root = new TreeNodeTestData.TreeNodeMock();
+        TreeNodeTestData.TreeNodeMock node = TreeNodeTestData.getNodeInSimpleTree(root);
         node.moveTo(root);
         assertEquals(root, node.getParent().get());
     }
 
     @Test
     public void moveToInSameLevelAddsAtEnd() {
-        TreeNodeTestData.TreeNodeMock root =
-            new TreeNodeTestData.TreeNodeMock();
-        TreeNodeTestData.TreeNodeMock child1 =
-            new TreeNodeTestData.TreeNodeMock();
-        TreeNodeTestData.TreeNodeMock child2 =
-            new TreeNodeTestData.TreeNodeMock();
+        TreeNodeTestData.TreeNodeMock root = new TreeNodeTestData.TreeNodeMock();
+        TreeNodeTestData.TreeNodeMock child1 = new TreeNodeTestData.TreeNodeMock();
+        TreeNodeTestData.TreeNodeMock child2 = new TreeNodeTestData.TreeNodeMock();
         root.addChild(child1);
         root.addChild(child2);
 
@@ -222,14 +182,10 @@ public void moveToInSameLevelAddsAtEnd() {
 
     @Test
     public void moveToInSameLevelWhenNodeWasBeforeTargetIndex() {
-        TreeNodeTestData.TreeNodeMock root =
-            new TreeNodeTestData.TreeNodeMock();
-        TreeNodeTestData.TreeNodeMock child1 =
-            new TreeNodeTestData.TreeNodeMock();
-        TreeNodeTestData.TreeNodeMock child2 =
-            new TreeNodeTestData.TreeNodeMock();
-        TreeNodeTestData.TreeNodeMock child3 =
-            new TreeNodeTestData.TreeNodeMock();
+        TreeNodeTestData.TreeNodeMock root = new TreeNodeTestData.TreeNodeMock();
+        TreeNodeTestData.TreeNodeMock child1 = new TreeNodeTestData.TreeNodeMock();
+        TreeNodeTestData.TreeNodeMock child2 = new TreeNodeTestData.TreeNodeMock();
+        TreeNodeTestData.TreeNodeMock child3 = new TreeNodeTestData.TreeNodeMock();
         root.addChild(child1);
         root.addChild(child2);
         root.addChild(child3);
@@ -241,14 +197,10 @@ public void moveToInSameLevelWhenNodeWasBeforeTargetIndex() {
 
     @Test
     public void moveToInSameLevelWhenNodeWasAfterTargetIndex() {
-        TreeNodeTestData.TreeNodeMock root =
-            new TreeNodeTestData.TreeNodeMock();
-        TreeNodeTestData.TreeNodeMock child1 =
-            new TreeNodeTestData.TreeNodeMock();
-        TreeNodeTestData.TreeNodeMock child2 =
-            new TreeNodeTestData.TreeNodeMock();
-        TreeNodeTestData.TreeNodeMock child3 =
-            new TreeNodeTestData.TreeNodeMock();
+        TreeNodeTestData.TreeNodeMock root = new TreeNodeTestData.TreeNodeMock();
+        TreeNodeTestData.TreeNodeMock child1 = new TreeNodeTestData.TreeNodeMock();
+        TreeNodeTestData.TreeNodeMock child2 = new TreeNodeTestData.TreeNodeMock();
+        TreeNodeTestData.TreeNodeMock child3 = new TreeNodeTestData.TreeNodeMock();
         root.addChild(child1);
         root.addChild(child2);
         root.addChild(child3);
@@ -260,10 +212,8 @@ public void moveToInSameLevelWhenNodeWasAfterTargetIndex() {
 
     @Test
     public void getPathFromRootInSimpleTree() {
-        TreeNodeTestData.TreeNodeMock root =
-            new TreeNodeTestData.TreeNodeMock();
-        TreeNodeTestData.TreeNodeMock node =
-            TreeNodeTestData.getNodeInSimpleTree(root);
+        TreeNodeTestData.TreeNodeMock root = new TreeNodeTestData.TreeNodeMock();
+        TreeNodeTestData.TreeNodeMock node = TreeNodeTestData.getNodeInSimpleTree(root);
 
         List<TreeNodeTestData.TreeNodeMock> path = node.getPathFromRoot();
         assertEquals(3, path.size());
@@ -273,10 +223,8 @@ public void getPathFromRootInSimpleTree() {
 
     @Test
     public void getPathFromRootInComplexTree() {
-        TreeNodeTestData.TreeNodeMock root =
-            new TreeNodeTestData.TreeNodeMock();
-        TreeNodeTestData.TreeNodeMock node =
-            TreeNodeTestData.getNodeInComplexTree(root);
+        TreeNodeTestData.TreeNodeMock root = new TreeNodeTestData.TreeNodeMock();
+        TreeNodeTestData.TreeNodeMock node = TreeNodeTestData.getNodeInComplexTree(root);
 
         List<TreeNodeTestData.TreeNodeMock> path = node.getPathFromRoot();
         assertEquals(4, path.size());
@@ -286,14 +234,11 @@ public void getPathFromRootInComplexTree() {
 
     @Test
     public void getPreviousSiblingReturnsCorrect() {
-        TreeNodeTestData.TreeNodeMock root =
-            new TreeNodeTestData.TreeNodeMock();
+        TreeNodeTestData.TreeNodeMock root = new TreeNodeTestData.TreeNodeMock();
         root.addChild(new TreeNodeTestData.TreeNodeMock());
-        TreeNodeTestData.TreeNodeMock previous =
-            new TreeNodeTestData.TreeNodeMock();
+        TreeNodeTestData.TreeNodeMock previous = new TreeNodeTestData.TreeNodeMock();
         root.addChild(previous);
-        TreeNodeTestData.TreeNodeMock node =
-            new TreeNodeTestData.TreeNodeMock();
+        TreeNodeTestData.TreeNodeMock node = new TreeNodeTestData.TreeNodeMock();
         root.addChild(node);
         root.addChild(new TreeNodeTestData.TreeNodeMock());
 
@@ -302,31 +247,25 @@ public void getPreviousSiblingReturnsCorrect() {
 
     @Test
     public void getPreviousSiblingForRootReturnsEmpty() {
-        TreeNodeTestData.TreeNodeMock root =
-            new TreeNodeTestData.TreeNodeMock();
+        TreeNodeTestData.TreeNodeMock root = new TreeNodeTestData.TreeNodeMock();
         assertEquals(Optional.empty(), root.getPreviousSibling());
     }
 
     @Test
     public void getPreviousSiblingForNonexistentReturnsEmpty() {
-        TreeNodeTestData.TreeNodeMock root =
-            new TreeNodeTestData.TreeNodeMock();
-        TreeNodeTestData.TreeNodeMock node =
-            new TreeNodeTestData.TreeNodeMock();
+        TreeNodeTestData.TreeNodeMock root = new TreeNodeTestData.TreeNodeMock();
+        TreeNodeTestData.TreeNodeMock node = new TreeNodeTestData.TreeNodeMock();
         root.addChild(node);
         assertEquals(Optional.empty(), node.getPreviousSibling());
     }
 
     @Test
     public void getNextSiblingReturnsCorrect() {
-        TreeNodeTestData.TreeNodeMock root =
-            new TreeNodeTestData.TreeNodeMock();
+        TreeNodeTestData.TreeNodeMock root = new TreeNodeTestData.TreeNodeMock();
         root.addChild(new TreeNodeTestData.TreeNodeMock());
-        TreeNodeTestData.TreeNodeMock node =
-            new TreeNodeTestData.TreeNodeMock();
+        TreeNodeTestData.TreeNodeMock node = new TreeNodeTestData.TreeNodeMock();
         root.addChild(node);
-        TreeNodeTestData.TreeNodeMock next =
-            new TreeNodeTestData.TreeNodeMock();
+        TreeNodeTestData.TreeNodeMock next = new TreeNodeTestData.TreeNodeMock();
         root.addChild(next);
         root.addChild(new TreeNodeTestData.TreeNodeMock());
 
@@ -335,54 +274,43 @@ public void getNextSiblingReturnsCorrect() {
 
     @Test
     public void getNextSiblingForRootReturnsEmpty() {
-        TreeNodeTestData.TreeNodeMock root =
-            new TreeNodeTestData.TreeNodeMock();
+        TreeNodeTestData.TreeNodeMock root = new TreeNodeTestData.TreeNodeMock();
         assertEquals(Optional.empty(), root.getNextSibling());
     }
 
     @Test
     public void getNextSiblingForNonexistentReturnsEmpty() {
-        TreeNodeTestData.TreeNodeMock root =
-            new TreeNodeTestData.TreeNodeMock();
-        TreeNodeTestData.TreeNodeMock node =
-            new TreeNodeTestData.TreeNodeMock();
+        TreeNodeTestData.TreeNodeMock root = new TreeNodeTestData.TreeNodeMock();
+        TreeNodeTestData.TreeNodeMock node = new TreeNodeTestData.TreeNodeMock();
         root.addChild(node);
         assertEquals(Optional.empty(), node.getPreviousSibling());
     }
 
     @Test
     public void getParentReturnsCorrect() {
-        TreeNodeTestData.TreeNodeMock root =
-            new TreeNodeTestData.TreeNodeMock();
-        TreeNodeTestData.TreeNodeMock node = TreeNodeTestData.getNodeAsChild(
-            root
-        );
+        TreeNodeTestData.TreeNodeMock root = new TreeNodeTestData.TreeNodeMock();
+        TreeNodeTestData.TreeNodeMock node = TreeNodeTestData.getNodeAsChild(root);
 
         assertEquals(root, node.getParent().get());
     }
 
     @Test
     public void getParentForRootReturnsEmpty() {
-        TreeNodeTestData.TreeNodeMock root =
-            new TreeNodeTestData.TreeNodeMock();
+        TreeNodeTestData.TreeNodeMock root = new TreeNodeTestData.TreeNodeMock();
         assertEquals(Optional.empty(), root.getParent());
     }
 
     @Test
     public void getChildAtReturnsCorrect() {
-        TreeNodeTestData.TreeNodeMock root =
-            new TreeNodeTestData.TreeNodeMock();
-        TreeNodeTestData.TreeNodeMock node = TreeNodeTestData.getNodeAsChild(
-            root
-        );
+        TreeNodeTestData.TreeNodeMock root = new TreeNodeTestData.TreeNodeMock();
+        TreeNodeTestData.TreeNodeMock node = TreeNodeTestData.getNodeAsChild(root);
 
         assertEquals(node, root.getChildAt(2).get());
     }
 
     @Test
     public void getChildAtInvalidIndexReturnsEmpty() {
-        TreeNodeTestData.TreeNodeMock root =
-            new TreeNodeTestData.TreeNodeMock();
+        TreeNodeTestData.TreeNodeMock root = new TreeNodeTestData.TreeNodeMock();
         root.addChild(new TreeNodeTestData.TreeNodeMock());
         root.addChild(new TreeNodeTestData.TreeNodeMock());
         assertEquals(Optional.empty(), root.getChildAt(10));
@@ -390,8 +318,7 @@ public void getChildAtInvalidIndexReturnsEmpty() {
 
     @Test
     public void getRootReturnsTrueForRoot() {
-        TreeNodeTestData.TreeNodeMock root =
-            new TreeNodeTestData.TreeNodeMock();
+        TreeNodeTestData.TreeNodeMock root = new TreeNodeTestData.TreeNodeMock();
         assertTrue(root.isRoot());
     }
 
@@ -402,68 +329,54 @@ public void getRootReturnsFalseForChild() {
 
     @Test
     public void nodeIsAncestorOfItself() {
-        TreeNodeTestData.TreeNodeMock root =
-            new TreeNodeTestData.TreeNodeMock();
+        TreeNodeTestData.TreeNodeMock root = new TreeNodeTestData.TreeNodeMock();
         assertTrue(root.isAncestorOf(root));
     }
 
     @Test
     public void isAncestorOfInSimpleTree() {
-        TreeNodeTestData.TreeNodeMock root =
-            new TreeNodeTestData.TreeNodeMock();
-        TreeNodeTestData.TreeNodeMock node =
-            TreeNodeTestData.getNodeInSimpleTree(root);
+        TreeNodeTestData.TreeNodeMock root = new TreeNodeTestData.TreeNodeMock();
+        TreeNodeTestData.TreeNodeMock node = TreeNodeTestData.getNodeInSimpleTree(root);
         assertTrue(root.isAncestorOf(node));
     }
 
     @Test
     public void isAncestorOfInComplexTree() {
-        TreeNodeTestData.TreeNodeMock root =
-            new TreeNodeTestData.TreeNodeMock();
-        TreeNodeTestData.TreeNodeMock node =
-            TreeNodeTestData.getNodeInComplexTree(root);
+        TreeNodeTestData.TreeNodeMock root = new TreeNodeTestData.TreeNodeMock();
+        TreeNodeTestData.TreeNodeMock node = TreeNodeTestData.getNodeInComplexTree(root);
         assertTrue(root.isAncestorOf(node));
     }
 
     @Test
     public void getRootOfSingleNode() {
-        TreeNodeTestData.TreeNodeMock root =
-            new TreeNodeTestData.TreeNodeMock();
+        TreeNodeTestData.TreeNodeMock root = new TreeNodeTestData.TreeNodeMock();
         assertEquals(root, root.getRoot());
     }
 
     @Test
     public void getRootInSimpleTree() {
-        TreeNodeTestData.TreeNodeMock root =
-            new TreeNodeTestData.TreeNodeMock();
-        TreeNodeTestData.TreeNodeMock node =
-            TreeNodeTestData.getNodeInSimpleTree(root);
+        TreeNodeTestData.TreeNodeMock root = new TreeNodeTestData.TreeNodeMock();
+        TreeNodeTestData.TreeNodeMock node = TreeNodeTestData.getNodeInSimpleTree(root);
         assertEquals(root, node.getRoot());
     }
 
     @Test
     public void getRootInComplexTree() {
-        TreeNodeTestData.TreeNodeMock root =
-            new TreeNodeTestData.TreeNodeMock();
-        TreeNodeTestData.TreeNodeMock node =
-            TreeNodeTestData.getNodeInComplexTree(root);
+        TreeNodeTestData.TreeNodeMock root = new TreeNodeTestData.TreeNodeMock();
+        TreeNodeTestData.TreeNodeMock node = TreeNodeTestData.getNodeInComplexTree(root);
         assertEquals(root, node.getRoot());
     }
 
     @Test
     public void isLeafIsCorrectForRootWithoutChildren() {
-        TreeNodeTestData.TreeNodeMock root =
-            new TreeNodeTestData.TreeNodeMock();
+        TreeNodeTestData.TreeNodeMock root = new TreeNodeTestData.TreeNodeMock();
         assertTrue(root.isLeaf());
     }
 
     @Test
     public void removeFromParentSetsParentToEmpty() {
-        TreeNodeTestData.TreeNodeMock root =
-            new TreeNodeTestData.TreeNodeMock();
-        TreeNodeTestData.TreeNodeMock node = TreeNodeTestData.getNodeAsChild(
-            root
-        );
+        TreeNodeTestData.TreeNodeMock root = new TreeNodeTestData.TreeNodeMock();
+        TreeNodeTestData.TreeNodeMock node = TreeNodeTestData.getNodeAsChild(root);
 
         node.removeFromParent();
         assertEquals(Optional.empty(), node.getParent());
@@ -471,11 +384,8 @@ public void removeFromParentSetsParentToEmpty() {
 
     @Test
     public void removeFromParentRemovesNodeFromChildrenCollection() {
-        TreeNodeTestData.TreeNodeMock root =
-            new TreeNodeTestData.TreeNodeMock();
-        TreeNodeTestData.TreeNodeMock node = TreeNodeTestData.getNodeAsChild(
-            root
-        );
+        TreeNodeTestData.TreeNodeMock root = new TreeNodeTestData.TreeNodeMock();
+        TreeNodeTestData.TreeNodeMock node = TreeNodeTestData.getNodeAsChild(root);
 
         node.removeFromParent();
         assertFalse(root.getChildren().contains(node));
@@ -483,11 +393,8 @@ public void removeFromParentRemovesNodeFromChildrenCollection() {
 
     @Test
     public void removeAllChildrenSetsParentOfChildToEmpty() {
-        TreeNodeTestData.TreeNodeMock root =
-            new TreeNodeTestData.TreeNodeMock();
-        TreeNodeTestData.TreeNodeMock node = TreeNodeTestData.getNodeAsChild(
-            root
-        );
+        TreeNodeTestData.TreeNodeMock root = new TreeNodeTestData.TreeNodeMock();
+        TreeNodeTestData.TreeNodeMock node = TreeNodeTestData.getNodeAsChild(root);
 
         root.removeAllChildren();
         assertEquals(Optional.empty(), node.getParent());
@@ -495,8 +402,7 @@ public void removeAllChildrenSetsParentOfChildToEmpty() {
 
     @Test
     public void removeAllChildrenRemovesAllNodesFromChildrenCollection() {
-        TreeNodeTestData.TreeNodeMock root =
-            new TreeNodeTestData.TreeNodeMock();
+        TreeNodeTestData.TreeNodeMock root = new TreeNodeTestData.TreeNodeMock();
         TreeNodeTestData.getNodeAsChild(root);
 
         root.removeAllChildren();
@@ -505,10 +411,8 @@ public void removeAllChildrenRemovesAllNodesFromChildrenCollection() {
 
     @Test
     public void getFirstChildAtReturnsCorrect() {
-        TreeNodeTestData.TreeNodeMock root =
-            new TreeNodeTestData.TreeNodeMock();
-        TreeNodeTestData.TreeNodeMock node =
-            new TreeNodeTestData.TreeNodeMock();
+        TreeNodeTestData.TreeNodeMock root = new TreeNodeTestData.TreeNodeMock();
+        TreeNodeTestData.TreeNodeMock node = new TreeNodeTestData.TreeNodeMock();
         root.addChild(node);
 
         assertEquals(node, root.getFirstChild().get());
@@ -516,41 +420,30 @@ public void getFirstChildAtReturnsCorrect() {
 
     @Test
     public void getFirstChildAtLeafReturnsEmpty() {
-        TreeNodeTestData.TreeNodeMock root =
-            new TreeNodeTestData.TreeNodeMock();
-        TreeNodeTestData.TreeNodeMock leaf = TreeNodeTestData.getNodeAsChild(
-            root
-        );
+        TreeNodeTestData.TreeNodeMock root = new TreeNodeTestData.TreeNodeMock();
+        TreeNodeTestData.TreeNodeMock leaf = TreeNodeTestData.getNodeAsChild(root);
         assertEquals(Optional.empty(), leaf.getFirstChild());
     }
 
     @Test
     public void isNodeDescendantInFirstLevel() {
-        TreeNodeTestData.TreeNodeMock root =
-            new TreeNodeTestData.TreeNodeMock();
-        TreeNodeTestData.TreeNodeMock child = TreeNodeTestData.getNodeAsChild(
-            root
-        );
+        TreeNodeTestData.TreeNodeMock root = new TreeNodeTestData.TreeNodeMock();
+        TreeNodeTestData.TreeNodeMock child = TreeNodeTestData.getNodeAsChild(root);
         assertTrue(root.isNodeDescendant(child));
     }
 
     @Test
     public void isNodeDescendantInComplex() {
-        TreeNodeTestData.TreeNodeMock root =
-            new TreeNodeTestData.TreeNodeMock();
-        TreeNodeTestData.TreeNodeMock descendant =
-            TreeNodeTestData.getNodeInComplexTree(root);
+        TreeNodeTestData.TreeNodeMock root = new TreeNodeTestData.TreeNodeMock();
+        TreeNodeTestData.TreeNodeMock descendant = TreeNodeTestData.getNodeInComplexTree(root);
         assertTrue(root.isNodeDescendant(descendant));
     }
 
     @Test
     public void getChildrenReturnsAllChildren() {
-        TreeNodeTestData.TreeNodeMock root =
-            new TreeNodeTestData.TreeNodeMock();
-        TreeNodeTestData.TreeNodeMock child1 =
-            new TreeNodeTestData.TreeNodeMock();
-        TreeNodeTestData.TreeNodeMock child2 =
-            new TreeNodeTestData.TreeNodeMock();
+        TreeNodeTestData.TreeNodeMock root = new TreeNodeTestData.TreeNodeMock();
+        TreeNodeTestData.TreeNodeMock child1 = new TreeNodeTestData.TreeNodeMock();
+        TreeNodeTestData.TreeNodeMock child2 = new TreeNodeTestData.TreeNodeMock();
         root.addChild(child1);
         root.addChild(child2);
 
@@ -559,11 +452,8 @@ public void getChildrenReturnsAllChildren() {
 
     @Test
     public void removeChildSetsParentToEmpty() {
-        TreeNodeTestData.TreeNodeMock root =
-            new TreeNodeTestData.TreeNodeMock();
-        TreeNodeTestData.TreeNodeMock node = TreeNodeTestData.getNodeAsChild(
-            root
-        );
+        TreeNodeTestData.TreeNodeMock root = new TreeNodeTestData.TreeNodeMock();
+        TreeNodeTestData.TreeNodeMock node = TreeNodeTestData.getNodeAsChild(root);
 
         root.removeChild(node);
         assertEquals(Optional.empty(), node.getParent());
@@ -571,11 +461,8 @@ public void removeChildSetsParentToEmpty() {
 
     @Test
     public void removeChildRemovesNodeFromChildrenCollection() {
-        TreeNodeTestData.TreeNodeMock root =
-            new TreeNodeTestData.TreeNodeMock();
-        TreeNodeTestData.TreeNodeMock node = TreeNodeTestData.getNodeAsChild(
-            root
-        );
+        TreeNodeTestData.TreeNodeMock root = new TreeNodeTestData.TreeNodeMock();
+        TreeNodeTestData.TreeNodeMock node = TreeNodeTestData.getNodeAsChild(root);
 
         root.removeChild(node);
         assertFalse(root.getChildren().contains(node));
@@ -583,11 +470,8 @@ public void removeChildRemovesNodeFromChildrenCollection() {
 
     @Test
     public void removeChildIndexSetsParentToEmpty() {
-        TreeNodeTestData.TreeNodeMock root =
-            new TreeNodeTestData.TreeNodeMock();
-        TreeNodeTestData.TreeNodeMock node = TreeNodeTestData.getNodeAsChild(
-            root
-        );
+        TreeNodeTestData.TreeNodeMock root = new TreeNodeTestData.TreeNodeMock();
+        TreeNodeTestData.TreeNodeMock node = TreeNodeTestData.getNodeAsChild(root);
 
         root.removeChild(2);
         assertEquals(Optional.empty(), node.getParent());
@@ -595,11 +479,8 @@ public void removeChildIndexSetsParentToEmpty() {
 
     @Test
     public void removeChildIndexRemovesNodeFromChildrenCollection() {
-        TreeNodeTestData.TreeNodeMock root =
-            new TreeNodeTestData.TreeNodeMock();
-        TreeNodeTestData.TreeNodeMock node = TreeNodeTestData.getNodeAsChild(
-            root
-        );
+        TreeNodeTestData.TreeNodeMock root = new TreeNodeTestData.TreeNodeMock();
+        TreeNodeTestData.TreeNodeMock node = TreeNodeTestData.getNodeAsChild(root);
 
         root.removeChild(2);
         assertFalse(root.getChildren().contains(node));
@@ -607,28 +488,18 @@ public void removeChildIndexRemovesNodeFromChildrenCollection() {
 
     @Test
     public void addThrowsExceptionIfNodeHasParent() {
-        TreeNodeTestData.TreeNodeMock root =
-            new TreeNodeTestData.TreeNodeMock();
-        TreeNodeTestData.TreeNodeMock node = TreeNodeTestData.getNodeAsChild(
-            root
-        );
-        assertThrows(
-            UnsupportedOperationException.class,
-            () -> root.addChild(node)
-        );
+        TreeNodeTestData.TreeNodeMock root = new TreeNodeTestData.TreeNodeMock();
+        TreeNodeTestData.TreeNodeMock node = TreeNodeTestData.getNodeAsChild(root);
+        assertThrows(UnsupportedOperationException.class, () -> root.addChild(node));
     }
 
     @Test
     public void moveAllChildrenToAddsAtSpecifiedPosition() {
-        TreeNodeTestData.TreeNodeMock root =
-            new TreeNodeTestData.TreeNodeMock();
-        TreeNodeTestData.TreeNodeMock node =
-            new TreeNodeTestData.TreeNodeMock();
+        TreeNodeTestData.TreeNodeMock root = new TreeNodeTestData.TreeNodeMock();
+        TreeNodeTestData.TreeNodeMock node = new TreeNodeTestData.TreeNodeMock();
         root.addChild(node);
-        TreeNodeTestData.TreeNodeMock child1 =
-            new TreeNodeTestData.TreeNodeMock();
-        TreeNodeTestData.TreeNodeMock child2 =
-            new TreeNodeTestData.TreeNodeMock();
+        TreeNodeTestData.TreeNodeMock child1 = new TreeNodeTestData.TreeNodeMock();
+        TreeNodeTestData.TreeNodeMock child2 = new TreeNodeTestData.TreeNodeMock();
         node.addChild(child1);
         node.addChild(child2);
 
@@ -638,15 +509,11 @@ public void moveAllChildrenToAddsAtSpecifiedPosition() {
 
     @Test
     public void moveAllChildrenToChangesParent() {
-        TreeNodeTestData.TreeNodeMock root =
-            new TreeNodeTestData.TreeNodeMock();
-        TreeNodeTestData.TreeNodeMock node =
-            new TreeNodeTestData.TreeNodeMock();
+        TreeNodeTestData.TreeNodeMock root = new TreeNodeTestData.TreeNodeMock();
+        TreeNodeTestData.TreeNodeMock node = new TreeNodeTestData.TreeNodeMock();
         root.addChild(node);
-        TreeNodeTestData.TreeNodeMock child1 =
-            new TreeNodeTestData.TreeNodeMock();
-        TreeNodeTestData.TreeNodeMock child2 =
-            new TreeNodeTestData.TreeNodeMock();
+        TreeNodeTestData.TreeNodeMock child1 = new TreeNodeTestData.TreeNodeMock();
+        TreeNodeTestData.TreeNodeMock child2 = new TreeNodeTestData.TreeNodeMock();
         node.addChild(child1);
         node.addChild(child2);
 
@@ -657,85 +524,56 @@ public void moveAllChildrenToChangesParent() {
 
     @Test
     public void moveAllChildrenToDescendantThrowsException() {
-        TreeNodeTestData.TreeNodeMock root =
-            new TreeNodeTestData.TreeNodeMock();
-        TreeNodeTestData.TreeNodeMock node = TreeNodeTestData.getNodeAsChild(
-            root
-        );
+        TreeNodeTestData.TreeNodeMock root = new TreeNodeTestData.TreeNodeMock();
+        TreeNodeTestData.TreeNodeMock node = TreeNodeTestData.getNodeAsChild(root);
 
-        assertThrows(
-            UnsupportedOperationException.class,
-            () -> root.moveAllChildrenTo(node, 0)
-        );
+        assertThrows(UnsupportedOperationException.class, () -> root.moveAllChildrenTo(node, 0));
     }
 
     @Test
     public void sortChildrenSortsInFirstLevel() {
-        TreeNodeTestData.TreeNodeMock root =
-            new TreeNodeTestData.TreeNodeMock();
-        TreeNodeTestData.TreeNodeMock child1 =
-            new TreeNodeTestData.TreeNodeMock("a");
-        TreeNodeTestData.TreeNodeMock child2 =
-            new TreeNodeTestData.TreeNodeMock("b");
-        TreeNodeTestData.TreeNodeMock child3 =
-            new TreeNodeTestData.TreeNodeMock("c");
+        TreeNodeTestData.TreeNodeMock root = new TreeNodeTestData.TreeNodeMock();
+        TreeNodeTestData.TreeNodeMock child1 = new TreeNodeTestData.TreeNodeMock("a");
+        TreeNodeTestData.TreeNodeMock child2 = new TreeNodeTestData.TreeNodeMock("b");
+        TreeNodeTestData.TreeNodeMock child3 = new TreeNodeTestData.TreeNodeMock("c");
         root.addChild(child2);
         root.addChild(child3);
         root.addChild(child1);
 
-        root.sortChildren(
-            (o1, o2) -> o1.getName().compareToIgnoreCase(o2.getName()),
-            false
-        );
+        root.sortChildren((o1, o2) -> o1.getName().compareToIgnoreCase(o2.getName()), false);
         assertEquals(Arrays.asList(child1, child2, child3), root.getChildren());
     }
 
     @Test
     public void sortChildrenRecursiveSortsInDeeperLevel() {
-        TreeNodeTestData.TreeNodeMock root =
-            new TreeNodeTestData.TreeNodeMock();
-        TreeNodeTestData.TreeNodeMock node =
-            TreeNodeTestData.getNodeInSimpleTree(root);
-        TreeNodeTestData.TreeNodeMock child1 =
-            new TreeNodeTestData.TreeNodeMock("a");
-        TreeNodeTestData.TreeNodeMock child2 =
-            new TreeNodeTestData.TreeNodeMock("b");
-        TreeNodeTestData.TreeNodeMock child3 =
-            new TreeNodeTestData.TreeNodeMock("c");
+        TreeNodeTestData.TreeNodeMock root = new TreeNodeTestData.TreeNodeMock();
+        TreeNodeTestData.TreeNodeMock node = TreeNodeTestData.getNodeInSimpleTree(root);
+        TreeNodeTestData.TreeNodeMock child1 = new TreeNodeTestData.TreeNodeMock("a");
+        TreeNodeTestData.TreeNodeMock child2 = new TreeNodeTestData.TreeNodeMock("b");
+        TreeNodeTestData.TreeNodeMock child3 = new TreeNodeTestData.TreeNodeMock("c");
         node.addChild(child2);
         node.addChild(child3);
         node.addChild(child1);
 
-        root.sortChildren(
-            (o1, o2) -> o1.getName().compareToIgnoreCase(o2.getName()),
-            true
-        );
+        root.sortChildren((o1, o2) -> o1.getName().compareToIgnoreCase(o2.getName()), true);
         assertEquals(Arrays.asList(child1, child2, child3), node.getChildren());
     }
 
     @Test
     public void copySubtreeCopiesChildren() {
-        TreeNodeTestData.TreeNodeMock root =
-            new TreeNodeTestData.TreeNodeMock();
-        TreeNodeTestData.TreeNodeMock node = TreeNodeTestData.getNodeAsChild(
-            root
-        );
+        TreeNodeTestData.TreeNodeMock root = new TreeNodeTestData.TreeNodeMock();
+        TreeNodeTestData.TreeNodeMock node = TreeNodeTestData.getNodeAsChild(root);
 
         TreeNodeTestData.TreeNodeMock copiedRoot = root.copySubtree();
         assertEquals(Optional.empty(), copiedRoot.getParent());
         assertFalse(copiedRoot.getChildren().contains(node));
-        assertEquals(
-            root.getNumberOfChildren(),
-            copiedRoot.getNumberOfChildren()
-        );
+        assertEquals(root.getNumberOfChildren(), copiedRoot.getNumberOfChildren());
     }
 
     @Test
     public void addChildSomewhereInTreeInvokesChangeEvent() {
-        TreeNodeTestData.TreeNodeMock root =
-            new TreeNodeTestData.TreeNodeMock();
-        TreeNodeTestData.TreeNodeMock node =
-            TreeNodeTestData.getNodeInComplexTree(root);
+        TreeNodeTestData.TreeNodeMock root = new TreeNodeTestData.TreeNodeMock();
+        TreeNodeTestData.TreeNodeMock node = TreeNodeTestData.getNodeInComplexTree(root);
 
         root.subscribeToDescendantChanged(subscriber);
 
@@ -745,10 +583,8 @@ public void addChildSomewhereInTreeInvokesChangeEvent() {
 
     @Test
     public void moveNodeSomewhereInTreeInvokesChangeEvent() {
-        TreeNodeTestData.TreeNodeMock root =
-            new TreeNodeTestData.TreeNodeMock();
-        TreeNodeTestData.TreeNodeMock node =
-            TreeNodeTestData.getNodeInComplexTree(root);
+        TreeNodeTestData.TreeNodeMock root = new TreeNodeTestData.TreeNodeMock();
+        TreeNodeTestData.TreeNodeMock node = TreeNodeTestData.getNodeInComplexTree(root);
         TreeNodeTestData.TreeNodeMock oldParent = node.getParent().get();
 
         root.subscribeToDescendantChanged(subscriber);
@@ -760,13 +596,9 @@ public void moveNodeSomewhereInTreeInvokesChangeEvent() {
 
     @Test
     public void removeChildSomewhereInTreeInvokesChangeEvent() {
-        TreeNodeTestData.TreeNodeMock root =
-            new TreeNodeTestData.TreeNodeMock();
-        TreeNodeTestData.TreeNodeMock node =
-            TreeNodeTestData.getNodeInComplexTree(root);
-        TreeNodeTestData.TreeNodeMock child = node.addChild(
-            new TreeNodeTestData.TreeNodeMock()
-        );
+        TreeNodeTestData.TreeNodeMock root = new TreeNodeTestData.TreeNodeMock();
+        TreeNodeTestData.TreeNodeMock node = TreeNodeTestData.getNodeInComplexTree(root);
+        TreeNodeTestData.TreeNodeMock child = node.addChild(new TreeNodeTestData.TreeNodeMock());
 
         root.subscribeToDescendantChanged(subscriber);
 
@@ -776,10 +608,8 @@ public void removeChildSomewhereInTreeInvokesChangeEvent() {
 
     @Test
     public void removeChildIndexSomewhereInTreeInvokesChangeEvent() {
-        TreeNodeTestData.TreeNodeMock root =
-            new TreeNodeTestData.TreeNodeMock();
-        TreeNodeTestData.TreeNodeMock node =
-            TreeNodeTestData.getNodeInComplexTree(root);
+        TreeNodeTestData.TreeNodeMock root = new TreeNodeTestData.TreeNodeMock();
+        TreeNodeTestData.TreeNodeMock node = TreeNodeTestData.getNodeInComplexTree(root);
         node.addChild(new TreeNodeTestData.TreeNodeMock());
 
         root.subscribeToDescendantChanged(subscriber);
@@ -790,9 +620,7 @@ public void removeChildIndexSomewhereInTreeInvokesChangeEvent() {
 
     @Test
     public void findChildrenWithSameName() throws Exception {
-        TreeNodeTestData.TreeNodeMock root = new TreeNodeTestData.TreeNodeMock(
-            "A"
-        );
+        TreeNodeTestData.TreeNodeMock root = new TreeNodeTestData.TreeNodeMock("A");
         TreeNodeTestData.TreeNodeMock childB = root.addChild(
             new TreeNodeTestData.TreeNodeMock("B")
         );
@@ -805,9 +633,7 @@ public void findChildrenWithSameName() throws Exception {
 
         assertEquals(
             Arrays.asList(root, node, childA),
-            root.findChildrenSatisfying(treeNode ->
-                "A".equals(treeNode.getName())
-            )
+            root.findChildrenSatisfying(treeNode -> "A".equals(treeNode.getName()))
         );
     }
 
diff --git a/src/test/java/org/jabref/model/database/BibDatabaseContextTest.java b/src/test/java/org/jabref/model/database/BibDatabaseContextTest.java
index 0416a08994e..47371b666b7 100644
--- a/src/test/java/org/jabref/model/database/BibDatabaseContextTest.java
+++ b/src/test/java/org/jabref/model/database/BibDatabaseContextTest.java
@@ -48,9 +48,7 @@ void getFileDirectoriesWithRelativeDbParent() {
         BibDatabaseContext database = new BibDatabaseContext();
         database.setDatabasePath(file);
         assertEquals(
-            Collections.singletonList(
-                currentWorkingDir.resolve(file.getParent())
-            ),
+            Collections.singletonList(currentWorkingDir.resolve(file.getParent())),
             database.getFileDirectories(fileDirPrefs)
         );
     }
@@ -62,9 +60,7 @@ void getFileDirectoriesWithRelativeDottedDbParent() {
         BibDatabaseContext database = new BibDatabaseContext();
         database.setDatabasePath(file);
         assertEquals(
-            Collections.singletonList(
-                currentWorkingDir.resolve(file.getParent())
-            ),
+            Collections.singletonList(currentWorkingDir.resolve(file.getParent())),
             database.getFileDirectories(fileDirPrefs)
         );
     }
@@ -76,9 +72,7 @@ void getFileDirectoriesWithAbsoluteDbParent() {
         BibDatabaseContext database = new BibDatabaseContext();
         database.setDatabasePath(file);
         assertEquals(
-            Collections.singletonList(
-                currentWorkingDir.resolve(file.getParent())
-            ),
+            Collections.singletonList(currentWorkingDir.resolve(file.getParent())),
             database.getFileDirectories(fileDirPrefs)
         );
     }
@@ -115,14 +109,10 @@ void getFileDirectoriesWithMetadata() {
 
     @Test
     void getUserFileDirectoryIfAllAreEmpty() {
-        when(fileDirPrefs.shouldStoreFilesRelativeToBibFile())
-            .thenReturn(false);
-        Path userDirJabRef = OS
-            .getNativeDesktop()
-            .getDefaultFileChooserDirectory();
+        when(fileDirPrefs.shouldStoreFilesRelativeToBibFile()).thenReturn(false);
+        Path userDirJabRef = OS.getNativeDesktop().getDefaultFileChooserDirectory();
 
-        when(fileDirPrefs.getMainFileDirectory())
-            .thenReturn(Optional.of(userDirJabRef));
+        when(fileDirPrefs.getMainFileDirectory()).thenReturn(Optional.of(userDirJabRef));
         BibDatabaseContext database = new BibDatabaseContext();
         database.setDatabasePath(Path.of("biblio.bib"));
         assertEquals(
diff --git a/src/test/java/org/jabref/model/database/BibDatabaseModeDetectionTest.java b/src/test/java/org/jabref/model/database/BibDatabaseModeDetectionTest.java
index 0c0b087433a..86ab5fa0b07 100644
--- a/src/test/java/org/jabref/model/database/BibDatabaseModeDetectionTest.java
+++ b/src/test/java/org/jabref/model/database/BibDatabaseModeDetectionTest.java
@@ -13,15 +13,11 @@
 
 public class BibDatabaseModeDetectionTest {
 
-    private static final EntryType UNKNOWN_TYPE = new UnknownEntryType(
-        "unknowntype"
-    );
+    private static final EntryType UNKNOWN_TYPE = new UnknownEntryType("unknowntype");
 
     @Test
     public void detectBiblatex() {
-        List<BibEntry> entries = Arrays.asList(
-            new BibEntry(StandardEntryType.MvBook)
-        );
+        List<BibEntry> entries = Arrays.asList(new BibEntry(StandardEntryType.MvBook));
 
         assertEquals(
             BibDatabaseMode.BIBLATEX,
@@ -44,10 +40,7 @@ public void detectUndistinguishableAsBibtex() {
     @Test
     public void detectMixedModeAsBiblatex() {
         BibEntry bibtex = new BibEntry(StandardEntryType.Article);
-        bibtex.setField(
-            StandardField.JOURNAL,
-            "IEEE Trans. Services Computing"
-        );
+        bibtex.setField(StandardField.JOURNAL, "IEEE Trans. Services Computing");
         BibEntry biblatex = new BibEntry(StandardEntryType.Article);
         biblatex.setField(StandardField.TRANSLATOR, "Stefan Kolb");
         List<BibEntry> entries = Arrays.asList(bibtex, biblatex);
diff --git a/src/test/java/org/jabref/model/database/BibDatabaseTest.java b/src/test/java/org/jabref/model/database/BibDatabaseTest.java
index 1673e6912e1..9edfea3ed2e 100644
--- a/src/test/java/org/jabref/model/database/BibDatabaseTest.java
+++ b/src/test/java/org/jabref/model/database/BibDatabaseTest.java
@@ -27,10 +27,7 @@
 class BibDatabaseTest {
 
     private BibDatabase database;
-    private final BibtexString bibtexString = new BibtexString(
-        "DSP",
-        "Digital Signal Processing"
-    );
+    private final BibtexString bibtexString = new BibtexString("DSP", "Digital Signal Processing");
 
     @BeforeEach
     void setUp() {
@@ -108,18 +105,12 @@ void removeAllEntriesRemovesAllEntriesFromEntriesList() {
 
     @Test
     void insertNullEntryThrowsException() {
-        assertThrows(
-            NullPointerException.class,
-            () -> database.insertEntry(null)
-        );
+        assertThrows(NullPointerException.class, () -> database.insertEntry(null));
     }
 
     @Test
     void removeNullEntryThrowsException() {
-        assertThrows(
-            NullPointerException.class,
-            () -> database.removeEntry(null)
-        );
+        assertThrows(NullPointerException.class, () -> database.removeEntry(null));
     }
 
     @Test
@@ -237,69 +228,42 @@ void hasStringLabelFindsString() {
     void setSingleStringAsCollection() {
         List<BibtexString> strings = Arrays.asList(bibtexString);
         database.setStrings(strings);
-        assertEquals(
-            Optional.of(bibtexString),
-            database.getStringByName("DSP")
-        );
+        assertEquals(Optional.of(bibtexString), database.getStringByName("DSP"));
     }
 
     @Test
     void setStringAsCollectionWithUpdatedContentThrowsKeyCollisionException() {
         BibtexString newContent = new BibtexString("DSP", "ABCD");
         List<BibtexString> strings = Arrays.asList(bibtexString, newContent);
-        assertThrows(
-            KeyCollisionException.class,
-            () -> database.setStrings(strings)
-        );
+        assertThrows(KeyCollisionException.class, () -> database.setStrings(strings));
     }
 
     @Test
     void setStringAsCollectionWithNewContent() {
-        BibtexString vlsi = new BibtexString(
-            "VLSI",
-            "Very Large Scale Integration"
-        );
+        BibtexString vlsi = new BibtexString("VLSI", "Very Large Scale Integration");
         List<BibtexString> strings = Arrays.asList(bibtexString, vlsi);
         database.setStrings(strings);
-        assertEquals(
-            Optional.of(bibtexString),
-            database.getStringByName("DSP")
-        );
+        assertEquals(Optional.of(bibtexString), database.getStringByName("DSP"));
         assertEquals(Optional.of(vlsi), database.getStringByName("VLSI"));
     }
 
     @Test
     void addSameStringLabelTwiceThrowsKeyCollisionException() {
         database.addString(bibtexString);
-        final BibtexString finalString = new BibtexString(
-            "DSP",
-            "Digital Signal Processor"
-        );
+        final BibtexString finalString = new BibtexString("DSP", "Digital Signal Processor");
 
-        assertThrows(
-            KeyCollisionException.class,
-            () -> database.addString(finalString)
-        );
+        assertThrows(KeyCollisionException.class, () -> database.addString(finalString));
     }
 
     @Test
     void addSameStringIdTwiceThrowsKeyCollisionException() {
-        BibtexString string = new BibtexString(
-            "DSP",
-            "Digital Signal Processing"
-        );
+        BibtexString string = new BibtexString("DSP", "Digital Signal Processing");
         string.setId("duplicateid");
         database.addString(string);
-        final BibtexString finalString = new BibtexString(
-            "VLSI",
-            "Very Large Scale Integration"
-        );
+        final BibtexString finalString = new BibtexString("VLSI", "Very Large Scale Integration");
         finalString.setId("duplicateid");
 
-        assertThrows(
-            KeyCollisionException.class,
-            () -> database.addString(finalString)
-        );
+        assertThrows(KeyCollisionException.class, () -> database.addString(finalString));
     }
 
     @Test
@@ -308,10 +272,7 @@ void insertEntryPostsAddedEntryEvent() {
         EventListenerTest tel = new EventListenerTest();
         database.registerListener(tel);
         database.insertEntry(expectedEntry);
-        assertEquals(
-            Collections.singletonList(expectedEntry),
-            tel.getAddedEntries()
-        );
+        assertEquals(Collections.singletonList(expectedEntry), tel.getAddedEntries());
         assertEquals(expectedEntry, tel.getFirstInsertedEntry());
     }
 
@@ -323,10 +284,7 @@ void insertMultipleEntriesPostsAddedEntryEvent() {
         database.registerListener(tel);
         database.insertEntries(firstEntry, secondEntry);
         assertEquals(firstEntry, tel.getFirstInsertedEntry());
-        assertEquals(
-            Arrays.asList(firstEntry, secondEntry),
-            tel.getAddedEntries()
-        );
+        assertEquals(Arrays.asList(firstEntry, secondEntry), tel.getAddedEntries());
     }
 
     @Test
@@ -465,9 +423,9 @@ void getUsedStringsSingleString() {
         database.addString(tripleB);
         database.insertEntry(entry);
 
-        List<BibtexString> usedStrings = (List<
-                BibtexString
-            >) database.getUsedStrings(Arrays.asList(entry));
+        List<BibtexString> usedStrings = (List<BibtexString>) database.getUsedStrings(
+            Arrays.asList(entry)
+        );
         assertEquals(strings, usedStrings);
     }
 
@@ -478,9 +436,7 @@ void getUsedStringsNoString() {
         BibtexString string = new BibtexString("AAA", "Some other text");
         database.addString(string);
         database.insertEntry(entry);
-        Collection<BibtexString> usedStrings = database.getUsedStrings(
-            Arrays.asList(entry)
-        );
+        Collection<BibtexString> usedStrings = database.getUsedStrings(Arrays.asList(entry));
         assertEquals(Collections.emptyList(), usedStrings);
     }
 
diff --git a/src/test/java/org/jabref/model/database/KeyChangeListenerTest.java b/src/test/java/org/jabref/model/database/KeyChangeListenerTest.java
index e5ad56df408..1e1a0c2d42a 100644
--- a/src/test/java/org/jabref/model/database/KeyChangeListenerTest.java
+++ b/src/test/java/org/jabref/model/database/KeyChangeListenerTest.java
@@ -45,41 +45,23 @@ public void setUp() {
 
     @Test
     public void testCrossrefChanged() {
-        assertEquals(
-            Optional.of("Entry4"),
-            entry1.getField(StandardField.CROSSREF)
-        );
+        assertEquals(Optional.of("Entry4"), entry1.getField(StandardField.CROSSREF));
         entry4.setCitationKey("Banana");
-        assertEquals(
-            Optional.of("Banana"),
-            entry1.getField(StandardField.CROSSREF)
-        );
+        assertEquals(Optional.of("Banana"), entry1.getField(StandardField.CROSSREF));
     }
 
     @Test
     public void testRelatedChanged() {
-        assertEquals(
-            Optional.of("Entry1,Entry3"),
-            entry2.getField(StandardField.RELATED)
-        );
+        assertEquals(Optional.of("Entry1,Entry3"), entry2.getField(StandardField.RELATED));
         entry1.setCitationKey("Banana");
-        assertEquals(
-            Optional.of("Banana,Entry3"),
-            entry2.getField(StandardField.RELATED)
-        );
+        assertEquals(Optional.of("Banana,Entry3"), entry2.getField(StandardField.RELATED));
     }
 
     @Test
     public void testRelatedChangedInSameEntry() {
-        assertEquals(
-            Optional.of("Entry1,Entry2,Entry3"),
-            entry3.getField(StandardField.RELATED)
-        );
+        assertEquals(Optional.of("Entry1,Entry2,Entry3"), entry3.getField(StandardField.RELATED));
         entry3.setCitationKey("Banana");
-        assertEquals(
-            Optional.of("Entry1,Entry2,Banana"),
-            entry3.getField(StandardField.RELATED)
-        );
+        assertEquals(Optional.of("Entry1,Entry2,Banana"), entry3.getField(StandardField.RELATED));
     }
 
     @Test
@@ -97,10 +79,7 @@ public void testCrossrefEntryRemoved() {
     @Test
     public void testRelatedEntryRemoved() {
         db.removeEntry(entry1);
-        assertEquals(
-            Optional.of("Entry3"),
-            entry2.getField(StandardField.RELATED)
-        );
+        assertEquals(Optional.of("Entry3"), entry2.getField(StandardField.RELATED));
     }
 
     @Test
diff --git a/src/test/java/org/jabref/model/entry/AuthorListTest.java b/src/test/java/org/jabref/model/entry/AuthorListTest.java
index 89714327bec..79931c3e564 100644
--- a/src/test/java/org/jabref/model/entry/AuthorListTest.java
+++ b/src/test/java/org/jabref/model/entry/AuthorListTest.java
@@ -33,13 +33,7 @@ public class AuthorListTest {
         "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,
@@ -47,12 +41,8 @@ public class AuthorListTest {
         "{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 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
@@ -62,19 +52,18 @@ public class AuthorListTest {
         CORRADO_BOHM,
         KURT_GODEL
     );
-    private static final AuthorList ONE_INSTITUTION_WITH_LATEX = AuthorList.of(
-        BANU_MOSA
+    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 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 MIXED_AUTHOR_AND_INSTITUTION_WITH_LATEX = AuthorList.of(
+        BANU_MOSA,
+        CORRADO_BOHM
+    );
 
     public static int size(String bibtex) {
         return AuthorList.parse(bibtex).getNumberOfAuthors();
@@ -90,9 +79,7 @@ public void testFixAuthorNatbib() {
         );
         assertEquals(
             "von Neumann et al.",
-            AuthorList.fixAuthorNatbib(
-                "John von Neumann and John Smith and Black Brown, Peter"
-            )
+            AuthorList.fixAuthorNatbib("John von Neumann and John Smith and Black Brown, Peter")
         );
     }
 
@@ -103,26 +90,17 @@ public void getAsNatbibLatexFreeEmptyAuthorStringForEmptyInput() {
 
     @Test
     public void getAsNatbibLatexFreeUnicodeOneAuthorNameFromLatex() {
-        assertEquals(
-            "al-Khwārizmī",
-            ONE_AUTHOR_WITH_LATEX.latexFree().getAsNatbib()
-        );
+        assertEquals("al-Khwārizmī", ONE_AUTHOR_WITH_LATEX.latexFree().getAsNatbib());
     }
 
     @Test
     public 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
     public 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
@@ -176,14 +154,8 @@ public void parseCachesOneLatexFreeAuthor() {
     @Test
     public void testFixAuthorFirstNameFirstCommas() {
         // No Commas
-        assertEquals(
-            "",
-            AuthorList.fixAuthorFirstNameFirstCommas("", true, false)
-        );
-        assertEquals(
-            "",
-            AuthorList.fixAuthorFirstNameFirstCommas("", false, false)
-        );
+        assertEquals("", AuthorList.fixAuthorFirstNameFirstCommas("", true, false));
+        assertEquals("", AuthorList.fixAuthorFirstNameFirstCommas("", false, false));
 
         assertEquals(
             "John Smith",
@@ -246,21 +218,11 @@ public void testFixAuthorFirstNameFirstCommas() {
 
         assertEquals(
             "J. P. von Neumann",
-            AuthorList.fixAuthorFirstNameFirstCommas(
-                "John Peter von Neumann",
-                true,
-                false
-            )
+            AuthorList.fixAuthorFirstNameFirstCommas("John Peter von Neumann", true, false)
         );
         // Oxford Commas
-        assertEquals(
-            "",
-            AuthorList.fixAuthorFirstNameFirstCommas("", true, true)
-        );
-        assertEquals(
-            "",
-            AuthorList.fixAuthorFirstNameFirstCommas("", false, true)
-        );
+        assertEquals("", AuthorList.fixAuthorFirstNameFirstCommas("", true, true));
+        assertEquals("", AuthorList.fixAuthorFirstNameFirstCommas("", false, true));
 
         assertEquals(
             "John Smith",
@@ -323,20 +285,13 @@ public void testFixAuthorFirstNameFirstCommas() {
 
         assertEquals(
             "J. P. von Neumann",
-            AuthorList.fixAuthorFirstNameFirstCommas(
-                "John Peter von Neumann",
-                true,
-                true
-            )
+            AuthorList.fixAuthorFirstNameFirstCommas("John Peter von Neumann", true, true)
         );
     }
 
     @Test
     public void getAsFirstLastNamesLatexFreeEmptyAuthorStringForEmptyInputAbbreviate() {
-        assertEquals(
-            "",
-            EMPTY_AUTHOR.latexFree().getAsFirstLastNames(true, false)
-        );
+        assertEquals("", EMPTY_AUTHOR.latexFree().getAsFirstLastNames(true, false));
     }
 
     @Test
@@ -367,9 +322,7 @@ public void getAsFirstLastNamesLatexFreeUnicodeTwoAuthorNamesFromLatexAbbreviate
     public void getAsFirstLastNamesLatexFreeThreeUnicodeAuthorsFromLatexAbbreviate() {
         assertEquals(
             "M. al-Khwārizmī, C. Böhm and K. Gödel",
-            THREE_AUTHORS_WITH_LATEX
-                .latexFree()
-                .getAsFirstLastNames(true, false)
+            THREE_AUTHORS_WITH_LATEX.latexFree().getAsFirstLastNames(true, false)
         );
     }
 
@@ -385,9 +338,7 @@ public void getAsFirstLastNamesLatexFreeThreeUnicodeAuthorsFromLatexAbbreviateAn
     public void getAsFirstLastNamesLatexFreeUnicodeOneInsitutionNameFromLatexAbbreviate() {
         assertEquals(
             "The Banū Mūsā brothers",
-            ONE_INSTITUTION_WITH_LATEX
-                .latexFree()
-                .getAsFirstLastNames(true, false)
+            ONE_INSTITUTION_WITH_LATEX.latexFree().getAsFirstLastNames(true, false)
         );
     }
 
@@ -395,9 +346,7 @@ public void getAsFirstLastNamesLatexFreeUnicodeOneInsitutionNameFromLatexAbbrevi
     public void getAsFirstLastNamesLatexFreeUnicodeTwoInsitutionNameFromLatexAbbreviate() {
         assertEquals(
             "The Banū Mūsā brothers and The Banū Mūsā brothers",
-            TWO_INSTITUTIONS_WITH_LATEX
-                .latexFree()
-                .getAsFirstLastNames(true, false)
+            TWO_INSTITUTIONS_WITH_LATEX.latexFree().getAsFirstLastNames(true, false)
         );
     }
 
@@ -405,9 +354,7 @@ public void getAsFirstLastNamesLatexFreeUnicodeTwoInsitutionNameFromLatexAbbrevi
     public void getAsFirstLastNamesLatexFreeUnicodeMixedAuthorsFromLatexAbbreviate() {
         assertEquals(
             "The Banū Mūsā brothers and C. Böhm",
-            MIXED_AUTHOR_AND_INSTITUTION_WITH_LATEX
-                .latexFree()
-                .getAsFirstLastNames(true, false)
+            MIXED_AUTHOR_AND_INSTITUTION_WITH_LATEX.latexFree().getAsFirstLastNames(true, false)
         );
     }
 
@@ -415,18 +362,13 @@ public void getAsFirstLastNamesLatexFreeUnicodeMixedAuthorsFromLatexAbbreviate()
     public void getAsFirstLastNamesLatexFreeOneInstitutionWithParanthesisAtStartAbbreviate() {
         assertEquals(
             "Łukasz Michał",
-            ONE_INSTITUTION_WITH_STARTING_PARANTHESIS
-                .latexFree()
-                .getAsFirstLastNames(true, false)
+            ONE_INSTITUTION_WITH_STARTING_PARANTHESIS.latexFree().getAsFirstLastNames(true, false)
         );
     }
 
     @Test
     public void getAsFirstLastNamesLatexFreeEmptyAuthorStringForEmptyInput() {
-        assertEquals(
-            "",
-            EMPTY_AUTHOR.latexFree().getAsFirstLastNames(false, false)
-        );
+        assertEquals("", EMPTY_AUTHOR.latexFree().getAsFirstLastNames(false, false));
     }
 
     @Test
@@ -449,9 +391,7 @@ public void getAsFirstLastNamesLatexFreeUnicodeTwoAuthorNamesFromLatex() {
     public void getAsFirstLastNamesLatexFreeThreeUnicodeAuthorsFromLatex() {
         assertEquals(
             "Muḥammad al-Khwārizmī, Corrado Böhm and Kurt Gödel",
-            THREE_AUTHORS_WITH_LATEX
-                .latexFree()
-                .getAsFirstLastNames(false, false)
+            THREE_AUTHORS_WITH_LATEX.latexFree().getAsFirstLastNames(false, false)
         );
     }
 
@@ -459,9 +399,7 @@ public void getAsFirstLastNamesLatexFreeThreeUnicodeAuthorsFromLatex() {
     public void getAsFirstLastNamesLatexFreeUnicodeOneInsitutionNameFromLatex() {
         assertEquals(
             "The Banū Mūsā brothers",
-            ONE_INSTITUTION_WITH_LATEX
-                .latexFree()
-                .getAsFirstLastNames(false, false)
+            ONE_INSTITUTION_WITH_LATEX.latexFree().getAsFirstLastNames(false, false)
         );
     }
 
@@ -469,9 +407,7 @@ public void getAsFirstLastNamesLatexFreeUnicodeOneInsitutionNameFromLatex() {
     public void getAsFirstLastNamesLatexFreeUnicodeTwoInsitutionNameFromLatex() {
         assertEquals(
             "The Banū Mūsā brothers and The Banū Mūsā brothers",
-            TWO_INSTITUTIONS_WITH_LATEX
-                .latexFree()
-                .getAsFirstLastNames(false, false)
+            TWO_INSTITUTIONS_WITH_LATEX.latexFree().getAsFirstLastNames(false, false)
         );
     }
 
@@ -479,9 +415,7 @@ public void getAsFirstLastNamesLatexFreeUnicodeTwoInsitutionNameFromLatex() {
     public void getAsFirstLastNamesLatexFreeUnicodeMixedAuthorsFromLatex() {
         assertEquals(
             "The Banū Mūsā brothers and Corrado Böhm",
-            MIXED_AUTHOR_AND_INSTITUTION_WITH_LATEX
-                .latexFree()
-                .getAsFirstLastNames(false, false)
+            MIXED_AUTHOR_AND_INSTITUTION_WITH_LATEX.latexFree().getAsFirstLastNames(false, false)
         );
     }
 
@@ -489,24 +423,17 @@ public void getAsFirstLastNamesLatexFreeUnicodeMixedAuthorsFromLatex() {
     public void getAsFirstLastNamesLatexFreeOneInstitutionWithParanthesisAtStart() {
         assertEquals(
             "Łukasz Michał",
-            ONE_INSTITUTION_WITH_STARTING_PARANTHESIS
-                .latexFree()
-                .getAsFirstLastNames(false, false)
+            ONE_INSTITUTION_WITH_STARTING_PARANTHESIS.latexFree().getAsFirstLastNames(false, false)
         );
     }
 
     @Test
     public void testFixAuthorFirstNameFirst() {
-        assertEquals(
-            "John Smith",
-            AuthorList.fixAuthorFirstNameFirst("John Smith")
-        );
+        assertEquals("John Smith", AuthorList.fixAuthorFirstNameFirst("John Smith"));
 
         assertEquals(
             "John Smith and Peter Black Brown",
-            AuthorList.fixAuthorFirstNameFirst(
-                "John Smith and Black Brown, Peter"
-            )
+            AuthorList.fixAuthorFirstNameFirst("John Smith and Black Brown, Peter")
         );
 
         assertEquals(
@@ -535,14 +462,8 @@ public void testFixAuthorFirstNameFirst() {
     @Test
     public void testFixAuthorLastNameFirstCommasNoComma() {
         // No commas before and
-        assertEquals(
-            "",
-            AuthorList.fixAuthorLastNameFirstCommas("", true, false)
-        );
-        assertEquals(
-            "",
-            AuthorList.fixAuthorLastNameFirstCommas("", false, false)
-        );
+        assertEquals("", AuthorList.fixAuthorLastNameFirstCommas("", true, false));
+        assertEquals("", AuthorList.fixAuthorLastNameFirstCommas("", false, false));
 
         assertEquals(
             "Smith, John",
@@ -603,25 +524,15 @@ public void testFixAuthorLastNameFirstCommasNoComma() {
 
         assertEquals(
             "von Neumann, J. P.",
-            AuthorList.fixAuthorLastNameFirstCommas(
-                "John Peter von Neumann",
-                true,
-                false
-            )
+            AuthorList.fixAuthorLastNameFirstCommas("John Peter von Neumann", true, false)
         );
     }
 
     @Test
     public void testFixAuthorLastNameFirstCommasOxfordComma() {
         // Oxford Commas
-        assertEquals(
-            "",
-            AuthorList.fixAuthorLastNameFirstCommas("", true, true)
-        );
-        assertEquals(
-            "",
-            AuthorList.fixAuthorLastNameFirstCommas("", false, true)
-        );
+        assertEquals("", AuthorList.fixAuthorLastNameFirstCommas("", true, true));
+        assertEquals("", AuthorList.fixAuthorLastNameFirstCommas("", false, true));
 
         assertEquals(
             "Smith, John",
@@ -657,11 +568,7 @@ public void testFixAuthorLastNameFirstCommasOxfordComma() {
         );
         assertEquals(
             "Smith, J. and Black Brown, P.",
-            AuthorList.fixAuthorLastNameFirstCommas(
-                "John Smith and Black Brown, Peter",
-                true,
-                true
-            )
+            AuthorList.fixAuthorLastNameFirstCommas("John Smith and Black Brown, Peter", true, true)
         );
 
         assertEquals(
@@ -683,20 +590,13 @@ public void testFixAuthorLastNameFirstCommasOxfordComma() {
 
         assertEquals(
             "von Neumann, J. P.",
-            AuthorList.fixAuthorLastNameFirstCommas(
-                "John Peter von Neumann",
-                true,
-                true
-            )
+            AuthorList.fixAuthorLastNameFirstCommas("John Peter von Neumann", true, true)
         );
     }
 
     @Test
     public void getAsLastFirstNamesLatexFreeEmptyAuthorStringForEmptyInputAbbr() {
-        assertEquals(
-            "",
-            EMPTY_AUTHOR.latexFree().getAsLastFirstNames(true, false)
-        );
+        assertEquals("", EMPTY_AUTHOR.latexFree().getAsLastFirstNames(true, false));
     }
 
     @Test
@@ -719,9 +619,7 @@ public void getAsLastFirstNamesLatexFreeUnicodeTwoAuthorNamesFromLatexAbbr() {
     public void getAsLastFirstNamesLatexFreeThreeUnicodeAuthorsFromLatexAbbr() {
         assertEquals(
             "al-Khwārizmī, M., Böhm, C. and Gödel, K.",
-            THREE_AUTHORS_WITH_LATEX
-                .latexFree()
-                .getAsLastFirstNames(true, false)
+            THREE_AUTHORS_WITH_LATEX.latexFree().getAsLastFirstNames(true, false)
         );
     }
 
@@ -729,9 +627,7 @@ public void getAsLastFirstNamesLatexFreeThreeUnicodeAuthorsFromLatexAbbr() {
     public void getAsLastFirstNamesLatexFreeUnicodeOneInsitutionNameFromLatexAbbr() {
         assertEquals(
             "The Banū Mūsā brothers",
-            ONE_INSTITUTION_WITH_LATEX
-                .latexFree()
-                .getAsLastFirstNames(true, false)
+            ONE_INSTITUTION_WITH_LATEX.latexFree().getAsLastFirstNames(true, false)
         );
     }
 
@@ -739,9 +635,7 @@ public void getAsLastFirstNamesLatexFreeUnicodeOneInsitutionNameFromLatexAbbr()
     public void getAsLastFirstNamesLatexFreeUnicodeTwoInsitutionNameFromLatexAbbr() {
         assertEquals(
             "The Banū Mūsā brothers and The Banū Mūsā brothers",
-            TWO_INSTITUTIONS_WITH_LATEX
-                .latexFree()
-                .getAsLastFirstNames(true, false)
+            TWO_INSTITUTIONS_WITH_LATEX.latexFree().getAsLastFirstNames(true, false)
         );
     }
 
@@ -749,9 +643,7 @@ public void getAsLastFirstNamesLatexFreeUnicodeTwoInsitutionNameFromLatexAbbr()
     public void getAsLastFirstNamesLatexFreeUnicodeMixedAuthorsFromLatexAbbr() {
         assertEquals(
             "The Banū Mūsā brothers and Böhm, C.",
-            MIXED_AUTHOR_AND_INSTITUTION_WITH_LATEX
-                .latexFree()
-                .getAsLastFirstNames(true, false)
+            MIXED_AUTHOR_AND_INSTITUTION_WITH_LATEX.latexFree().getAsLastFirstNames(true, false)
         );
     }
 
@@ -759,18 +651,13 @@ public void getAsLastFirstNamesLatexFreeUnicodeMixedAuthorsFromLatexAbbr() {
     public void getAsLastFirstNamesLatexFreeOneInstitutionWithParanthesisAtStartAbbr() {
         assertEquals(
             "Łukasz Michał",
-            ONE_INSTITUTION_WITH_STARTING_PARANTHESIS
-                .latexFree()
-                .getAsLastFirstNames(true, false)
+            ONE_INSTITUTION_WITH_STARTING_PARANTHESIS.latexFree().getAsLastFirstNames(true, false)
         );
     }
 
     @Test
     public void getAsLastFirstNamesLatexFreeEmptyAuthorStringForEmptyInput() {
-        assertEquals(
-            "",
-            EMPTY_AUTHOR.latexFree().getAsLastFirstNames(false, false)
-        );
+        assertEquals("", EMPTY_AUTHOR.latexFree().getAsLastFirstNames(false, false));
     }
 
     @Test
@@ -793,9 +680,7 @@ public void getAsLastFirstNamesLatexFreeUnicodeTwoAuthorNamesFromLatex() {
     public void getAsLastFirstNamesLatexFreeThreeUnicodeAuthorsFromLatex() {
         assertEquals(
             "al-Khwārizmī, Muḥammad, Böhm, Corrado and Gödel, Kurt",
-            THREE_AUTHORS_WITH_LATEX
-                .latexFree()
-                .getAsLastFirstNames(false, false)
+            THREE_AUTHORS_WITH_LATEX.latexFree().getAsLastFirstNames(false, false)
         );
     }
 
@@ -803,9 +688,7 @@ public void getAsLastFirstNamesLatexFreeThreeUnicodeAuthorsFromLatex() {
     public void getAsLastFirstNamesLatexFreeUnicodeOneInsitutionNameFromLatex() {
         assertEquals(
             "The Banū Mūsā brothers",
-            ONE_INSTITUTION_WITH_LATEX
-                .latexFree()
-                .getAsLastFirstNames(false, false)
+            ONE_INSTITUTION_WITH_LATEX.latexFree().getAsLastFirstNames(false, false)
         );
     }
 
@@ -813,9 +696,7 @@ public void getAsLastFirstNamesLatexFreeUnicodeOneInsitutionNameFromLatex() {
     public void getAsLastFirstNamesLatexFreeUnicodeTwoInsitutionNameFromLatex() {
         assertEquals(
             "The Banū Mūsā brothers and The Banū Mūsā brothers",
-            TWO_INSTITUTIONS_WITH_LATEX
-                .latexFree()
-                .getAsLastFirstNames(false, false)
+            TWO_INSTITUTIONS_WITH_LATEX.latexFree().getAsLastFirstNames(false, false)
         );
     }
 
@@ -823,9 +704,7 @@ public void getAsLastFirstNamesLatexFreeUnicodeTwoInsitutionNameFromLatex() {
     public void getAsLastFirstNamesLatexFreeUnicodeMixedAuthorsFromLatex() {
         assertEquals(
             "The Banū Mūsā brothers and Böhm, Corrado",
-            MIXED_AUTHOR_AND_INSTITUTION_WITH_LATEX
-                .latexFree()
-                .getAsLastFirstNames(false, false)
+            MIXED_AUTHOR_AND_INSTITUTION_WITH_LATEX.latexFree().getAsLastFirstNames(false, false)
         );
     }
 
@@ -833,18 +712,13 @@ public void getAsLastFirstNamesLatexFreeUnicodeMixedAuthorsFromLatex() {
     public void getAsLastFirstNamesLatexFreeOneInstitutionWithParanthesisAtStart() {
         assertEquals(
             "Łukasz Michał",
-            ONE_INSTITUTION_WITH_STARTING_PARANTHESIS
-                .latexFree()
-                .getAsLastFirstNames(false, false)
+            ONE_INSTITUTION_WITH_STARTING_PARANTHESIS.latexFree().getAsLastFirstNames(false, false)
         );
     }
 
     @Test
     public void getAsLastFirstNamesLatexFreeEmptyAuthorStringForEmptyInputAbbrOxfordComma() {
-        assertEquals(
-            "",
-            EMPTY_AUTHOR.latexFree().getAsLastFirstNames(true, true)
-        );
+        assertEquals("", EMPTY_AUTHOR.latexFree().getAsLastFirstNames(true, true));
     }
 
     @Test
@@ -875,9 +749,7 @@ public void getAsLastFirstNamesLatexFreeThreeUnicodeAuthorsFromLatexAbbrOxfordCo
     public void getAsLastFirstNamesLatexFreeUnicodeOneInsitutionNameFromLatexAbbrOxfordComma() {
         assertEquals(
             "The Banū Mūsā brothers",
-            ONE_INSTITUTION_WITH_LATEX
-                .latexFree()
-                .getAsLastFirstNames(true, true)
+            ONE_INSTITUTION_WITH_LATEX.latexFree().getAsLastFirstNames(true, true)
         );
     }
 
@@ -885,9 +757,7 @@ public void getAsLastFirstNamesLatexFreeUnicodeOneInsitutionNameFromLatexAbbrOxf
     public void getAsLastFirstNamesLatexFreeUnicodeTwoInsitutionNameFromLatexAbbrOxfordComma() {
         assertEquals(
             "The Banū Mūsā brothers and The Banū Mūsā brothers",
-            TWO_INSTITUTIONS_WITH_LATEX
-                .latexFree()
-                .getAsLastFirstNames(true, true)
+            TWO_INSTITUTIONS_WITH_LATEX.latexFree().getAsLastFirstNames(true, true)
         );
     }
 
@@ -895,9 +765,7 @@ public void getAsLastFirstNamesLatexFreeUnicodeTwoInsitutionNameFromLatexAbbrOxf
     public void getAsLastFirstNamesLatexFreeUnicodeMixedAuthorsFromLatexAbbrOxfordComma() {
         assertEquals(
             "The Banū Mūsā brothers and Böhm, C.",
-            MIXED_AUTHOR_AND_INSTITUTION_WITH_LATEX
-                .latexFree()
-                .getAsLastFirstNames(true, true)
+            MIXED_AUTHOR_AND_INSTITUTION_WITH_LATEX.latexFree().getAsLastFirstNames(true, true)
         );
     }
 
@@ -905,18 +773,13 @@ public void getAsLastFirstNamesLatexFreeUnicodeMixedAuthorsFromLatexAbbrOxfordCo
     public void getAsLastFirstNamesLatexFreeOneInstitutionWithParanthesisAtStartAbbrOxfordComma() {
         assertEquals(
             "Łukasz Michał",
-            ONE_INSTITUTION_WITH_STARTING_PARANTHESIS
-                .latexFree()
-                .getAsLastFirstNames(true, true)
+            ONE_INSTITUTION_WITH_STARTING_PARANTHESIS.latexFree().getAsLastFirstNames(true, true)
         );
     }
 
     @Test
     public void getAsLastFirstNamesLatexFreeEmptyAuthorStringForEmptyInputOxfordComma() {
-        assertEquals(
-            "",
-            EMPTY_AUTHOR.latexFree().getAsLastFirstNames(false, true)
-        );
+        assertEquals("", EMPTY_AUTHOR.latexFree().getAsLastFirstNames(false, true));
     }
 
     @Test
@@ -939,9 +802,7 @@ public void getAsLastFirstNamesLatexFreeUnicodeTwoAuthorNamesFromLatexOxfordComm
     public void getAsLastFirstNamesLatexFreeThreeUnicodeAuthorsFromLatexOxfordComma() {
         assertEquals(
             "al-Khwārizmī, Muḥammad, Böhm, Corrado, and Gödel, Kurt",
-            THREE_AUTHORS_WITH_LATEX
-                .latexFree()
-                .getAsLastFirstNames(false, true)
+            THREE_AUTHORS_WITH_LATEX.latexFree().getAsLastFirstNames(false, true)
         );
     }
 
@@ -949,9 +810,7 @@ public void getAsLastFirstNamesLatexFreeThreeUnicodeAuthorsFromLatexOxfordComma(
     public void getAsLastFirstNamesLatexFreeUnicodeOneInsitutionNameFromLatexOxfordComma() {
         assertEquals(
             "The Banū Mūsā brothers",
-            ONE_INSTITUTION_WITH_LATEX
-                .latexFree()
-                .getAsLastFirstNames(false, true)
+            ONE_INSTITUTION_WITH_LATEX.latexFree().getAsLastFirstNames(false, true)
         );
     }
 
@@ -959,9 +818,7 @@ public void getAsLastFirstNamesLatexFreeUnicodeOneInsitutionNameFromLatexOxfordC
     public void getAsLastFirstNamesLatexFreeUnicodeTwoInsitutionNameFromLatexOxfordComma() {
         assertEquals(
             "The Banū Mūsā brothers and The Banū Mūsā brothers",
-            TWO_INSTITUTIONS_WITH_LATEX
-                .latexFree()
-                .getAsLastFirstNames(false, true)
+            TWO_INSTITUTIONS_WITH_LATEX.latexFree().getAsLastFirstNames(false, true)
         );
     }
 
@@ -969,9 +826,7 @@ public void getAsLastFirstNamesLatexFreeUnicodeTwoInsitutionNameFromLatexOxfordC
     public void getAsLastFirstNamesLatexFreeUnicodeMixedAuthorsFromLatexOxfordComma() {
         assertEquals(
             "The Banū Mūsā brothers and Böhm, Corrado",
-            MIXED_AUTHOR_AND_INSTITUTION_WITH_LATEX
-                .latexFree()
-                .getAsLastFirstNames(false, true)
+            MIXED_AUTHOR_AND_INSTITUTION_WITH_LATEX.latexFree().getAsLastFirstNames(false, true)
         );
     }
 
@@ -979,9 +834,7 @@ public void getAsLastFirstNamesLatexFreeUnicodeMixedAuthorsFromLatexOxfordComma(
     public void getAsLastFirstNamesLatexFreeOneInstitutionWithParanthesisAtStartOxfordComma() {
         assertEquals(
             "Łukasz Michał",
-            ONE_INSTITUTION_WITH_STARTING_PARANTHESIS
-                .latexFree()
-                .getAsLastFirstNames(false, true)
+            ONE_INSTITUTION_WITH_STARTING_PARANTHESIS.latexFree().getAsLastFirstNames(false, true)
         );
     }
 
@@ -989,16 +842,11 @@ public void getAsLastFirstNamesLatexFreeOneInstitutionWithParanthesisAtStartOxfo
     public void testFixAuthorLastNameFirst() {
         // Test helper method
 
-        assertEquals(
-            "Smith, John",
-            AuthorList.fixAuthorLastNameFirst("John Smith")
-        );
+        assertEquals("Smith, John", AuthorList.fixAuthorLastNameFirst("John Smith"));
 
         assertEquals(
             "Smith, John and Black Brown, Peter",
-            AuthorList.fixAuthorLastNameFirst(
-                "John Smith and Black Brown, Peter"
-            )
+            AuthorList.fixAuthorLastNameFirst("John Smith and Black Brown, Peter")
         );
 
         assertEquals(
@@ -1023,17 +871,11 @@ public void testFixAuthorLastNameFirst() {
         );
 
         // Test Abbreviation == false
-        assertEquals(
-            "Smith, John",
-            AuthorList.fixAuthorLastNameFirst("John Smith", 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
-            )
+            AuthorList.fixAuthorLastNameFirst("John Smith and Black Brown, Peter", false)
         );
 
         assertEquals(
@@ -1061,17 +903,11 @@ public void testFixAuthorLastNameFirst() {
         );
 
         // Test Abbreviate == true
-        assertEquals(
-            "Smith, J.",
-            AuthorList.fixAuthorLastNameFirst("John Smith", 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
-            )
+            AuthorList.fixAuthorLastNameFirst("John Smith and Black Brown, Peter", true)
         );
 
         assertEquals(
@@ -1103,14 +939,8 @@ public void testFixAuthorLastNameFirst() {
     public void testFixAuthorLastNameOnlyCommas() {
         // No comma before and
         assertEquals("", AuthorList.fixAuthorLastNameOnlyCommas("", false));
-        assertEquals(
-            "Smith",
-            AuthorList.fixAuthorLastNameOnlyCommas("John Smith", false)
-        );
-        assertEquals(
-            "Smith",
-            AuthorList.fixAuthorLastNameOnlyCommas("Smith, Jr, John", false)
-        );
+        assertEquals("Smith", AuthorList.fixAuthorLastNameOnlyCommas("John Smith", false));
+        assertEquals("Smith", AuthorList.fixAuthorLastNameOnlyCommas("Smith, Jr, John", false));
 
         assertEquals(
             AuthorList.fixAuthorLastNameOnlyCommas(
@@ -1132,14 +962,8 @@ public void testFixAuthorLastNameOnlyCommas() {
         );
         // Oxford Comma
         assertEquals("", AuthorList.fixAuthorLastNameOnlyCommas("", true));
-        assertEquals(
-            "Smith",
-            AuthorList.fixAuthorLastNameOnlyCommas("John Smith", true)
-        );
-        assertEquals(
-            "Smith",
-            AuthorList.fixAuthorLastNameOnlyCommas("Smith, Jr, John", true)
-        );
+        assertEquals("Smith", AuthorList.fixAuthorLastNameOnlyCommas("John Smith", true));
+        assertEquals("Smith", AuthorList.fixAuthorLastNameOnlyCommas("Smith, Jr, John", true));
 
         assertEquals(
             AuthorList.fixAuthorLastNameOnlyCommas(
@@ -1163,10 +987,7 @@ public void testFixAuthorLastNameOnlyCommas() {
 
     @Test
     public void getAsLastNamesLatexFreeUnicodeOneAuthorNameFromLatex() {
-        assertEquals(
-            "al-Khwārizmī",
-            ONE_AUTHOR_WITH_LATEX.latexFree().getAsLastNames(false)
-        );
+        assertEquals("al-Khwārizmī", ONE_AUTHOR_WITH_LATEX.latexFree().getAsLastNames(false));
     }
 
     @Test
@@ -1221,9 +1042,7 @@ public void getAsLastNamesLatexFreeUnicodeTwoInsitutionNameFromLatex() {
     public void getAsLastNamesLatexFreeUnicodeMixedAuthorsFromLatex() {
         assertEquals(
             "The Banū Mūsā brothers and Böhm",
-            MIXED_AUTHOR_AND_INSTITUTION_WITH_LATEX
-                .latexFree()
-                .getAsLastNames(false)
+            MIXED_AUTHOR_AND_INSTITUTION_WITH_LATEX.latexFree().getAsLastNames(false)
         );
     }
 
@@ -1231,26 +1050,15 @@ public void getAsLastNamesLatexFreeUnicodeMixedAuthorsFromLatex() {
     public void getAsLastNamesLatexFreeOneInstitutionWithParanthesisAtStart() {
         assertEquals(
             "Łukasz Michał",
-            ONE_INSTITUTION_WITH_STARTING_PARANTHESIS
-                .latexFree()
-                .getAsLastNames(false)
+            ONE_INSTITUTION_WITH_STARTING_PARANTHESIS.latexFree().getAsLastNames(false)
         );
     }
 
     @Test
     public void testFixAuthorForAlphabetization() {
-        assertEquals(
-            "Smith, J.",
-            AuthorList.fixAuthorForAlphabetization("John Smith")
-        );
-        assertEquals(
-            "Neumann, J.",
-            AuthorList.fixAuthorForAlphabetization("John von Neumann")
-        );
-        assertEquals(
-            "Neumann, J.",
-            AuthorList.fixAuthorForAlphabetization("J. von Neumann")
-        );
+        assertEquals("Smith, J.", AuthorList.fixAuthorForAlphabetization("John Smith"));
+        assertEquals("Neumann, J.", AuthorList.fixAuthorForAlphabetization("John von Neumann"));
+        assertEquals("Neumann, J.", AuthorList.fixAuthorForAlphabetization("J. von Neumann"));
         assertEquals(
             "Neumann, J. and Smith, J. and Black Brown, Jr., P.",
             AuthorList.fixAuthorForAlphabetization(
@@ -1270,16 +1078,11 @@ public void testSize() {
         assertEquals(1, AuthorListTest.size("Bar, Jr., Foo"));
         assertEquals(1, AuthorListTest.size("Bar, Foo"));
         assertEquals(2, AuthorListTest.size("John Neumann and Foo Bar"));
-        assertEquals(
-            2,
-            AuthorListTest.size("John von Neumann and Bar, Jr, Foo")
-        );
+        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"
-            )
+            AuthorListTest.size("John von Neumann and John Smith and Black Brown, Peter")
         );
 
         StringBuilder s = new StringBuilder("John von Neumann");
@@ -1302,9 +1105,7 @@ public void testGetEmptyAuthor() {
 
     @Test
     public void testGetAuthor() {
-        Author author = AuthorList
-            .parse("John Smith and von Neumann, Jr, John")
-            .getAuthor(0);
+        Author author = AuthorList.parse("John Smith and von Neumann, Jr, John").getAuthor(0);
         assertEquals(Optional.of("John"), author.getFirst());
         assertEquals(Optional.of("J."), author.getFirstAbbr());
         assertEquals("John Smith", author.getFirstLast(false));
@@ -1325,10 +1126,7 @@ public void testGetAuthor() {
         assertEquals(Optional.empty(), author.getJr());
         assertEquals(Optional.empty(), author.getVon());
 
-        author =
-            AuthorList
-                .parse("John Smith and von Neumann, Jr, John")
-                .getAuthor(1);
+        author = AuthorList.parse("John Smith and von Neumann, Jr, John").getAuthor(1);
         assertEquals(Optional.of("John"), author.getFirst());
         assertEquals(Optional.of("J."), author.getFirstAbbr());
         assertEquals("John von Neumann, Jr", author.getFirstLast(false));
@@ -1345,25 +1143,13 @@ public void testGetAuthor() {
     @Test
     public void testCompanyAuthor() {
         Author author = AuthorList.parse("{JabRef Developers}").getAuthor(0);
-        Author expected = new Author(
-            null,
-            null,
-            null,
-            "JabRef Developers",
-            null
-        );
+        Author expected = new Author(null, null, null, "JabRef Developers", null);
         assertEquals(expected, author);
     }
 
     @Test
     public void testCompanyAuthorAndPerson() {
-        Author company = new Author(
-            null,
-            null,
-            null,
-            "JabRef Developers",
-            null
-        );
+        Author company = new Author(null, null, null, "JabRef Developers", null);
         Author person = new Author("Stefan", "S.", null, "Kolb", null);
         assertEquals(
             Arrays.asList(company, person),
@@ -1373,31 +1159,15 @@ public void testCompanyAuthorAndPerson() {
 
     @Test
     public void testCompanyAuthorWithLowerCaseWord() {
-        Author author = AuthorList
-            .parse("{JabRef Developers on Fire}")
-            .getAuthor(0);
-        Author expected = new Author(
-            null,
-            null,
-            null,
-            "JabRef Developers on Fire",
-            null
-        );
+        Author author = AuthorList.parse("{JabRef Developers on Fire}").getAuthor(0);
+        Author expected = new Author(null, null, null, "JabRef Developers on Fire", null);
         assertEquals(expected, author);
     }
 
     @Test
     public void testAbbreviationWithRelax() {
-        Author author = AuthorList
-            .parse("{\\relax Ch}ristoph Cholera")
-            .getAuthor(0);
-        Author expected = new Author(
-            "{\\relax Ch}ristoph",
-            "{\\relax Ch}.",
-            null,
-            "Cholera",
-            null
-        );
+        Author author = AuthorList.parse("{\\relax Ch}ristoph Cholera").getAuthor(0);
+        Author expected = new Author("{\\relax Ch}ristoph", "{\\relax Ch}.", null, "Cholera", null);
         assertEquals(expected, author);
     }
 
@@ -1411,9 +1181,7 @@ public void testGetAuthorsNatbib() {
         );
         assertEquals(
             "von Neumann et al.",
-            AuthorList
-                .parse("John von Neumann and John Smith and Black Brown, Peter")
-                .getAsNatbib()
+            AuthorList.parse("John von Neumann and John Smith and Black Brown, Peter").getAsNatbib()
         );
 
         /*
@@ -1422,17 +1190,12 @@ public void testGetAuthorsNatbib() {
         assertEquals(
             "Last-Name et al.",
             AuthorList
-                .parse(
-                    "First Second Last-Name" +
-                    " and John Smith and Black Brown, Peter"
-                )
+                .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());
     }
 
@@ -1440,14 +1203,8 @@ public void testGetAuthorsNatbib() {
     public void testGetAuthorsLastOnly() {
         // 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("John Smith").getAsLastNames(false));
+        assertEquals("Smith", AuthorList.parse("Smith, Jr, John").getAsLastNames(false));
 
         assertEquals(
             "von Neumann, Smith and Black Brown",
@@ -1457,14 +1214,8 @@ public void testGetAuthorsLastOnly() {
         );
         // 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("John Smith").getAsLastNames(true));
+        assertEquals("Smith", AuthorList.parse("Smith, Jr, John").getAsLastNames(true));
 
         assertEquals(
             "von Neumann, Smith, and Black Brown",
@@ -1475,9 +1226,7 @@ public void testGetAuthorsLastOnly() {
 
         assertEquals(
             "von Neumann and Smith",
-            AuthorList
-                .parse("John von Neumann and John Smith")
-                .getAsLastNames(false)
+            AuthorList.parse("John von Neumann and John Smith").getAsLastNames(false)
         );
     }
 
@@ -1495,19 +1244,10 @@ public void testGetAuthorsLastFirstNoComma() {
         assertEquals("Smith, J.", al.getAsLastFirstNames(true, false));
 
         al = AuthorList.parse("John Smith and Black Brown, Peter");
-        assertEquals(
-            "Smith, John and Black Brown, Peter",
-            al.getAsLastFirstNames(false, false)
-        );
-        assertEquals(
-            "Smith, J. and Black Brown, P.",
-            al.getAsLastFirstNames(true, false)
-        );
+        assertEquals("Smith, John and Black Brown, Peter", al.getAsLastFirstNames(false, false));
+        assertEquals("Smith, J. and Black Brown, P.", al.getAsLastFirstNames(true, false));
 
-        al =
-            AuthorList.parse(
-                "John von Neumann and John Smith and Black Brown, Peter"
-            );
+        al = AuthorList.parse("John von Neumann and John Smith and Black Brown, Peter");
         // Method description is different than code -> additional comma
         // there
         assertEquals(
@@ -1537,19 +1277,10 @@ public void testGetAuthorsLastFirstOxfordComma() {
         assertEquals("Smith, J.", al.getAsLastFirstNames(true, true));
 
         al = AuthorList.parse("John Smith and Black Brown, Peter");
-        assertEquals(
-            "Smith, John and Black Brown, Peter",
-            al.getAsLastFirstNames(false, true)
-        );
-        assertEquals(
-            "Smith, J. and Black Brown, P.",
-            al.getAsLastFirstNames(true, true)
-        );
+        assertEquals("Smith, John and Black Brown, Peter", al.getAsLastFirstNames(false, true));
+        assertEquals("Smith, J. and Black Brown, P.", al.getAsLastFirstNames(true, true));
 
-        al =
-            AuthorList.parse(
-                "John von Neumann and John Smith and Black Brown, Peter"
-            );
+        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)
@@ -1571,9 +1302,7 @@ public void testGetAuthorsLastFirstAnds() {
         );
         assertEquals(
             "Smith, John and Black Brown, Peter",
-            AuthorList
-                .parse("John Smith and Black Brown, Peter")
-                .getAsLastFirstNamesWithAnd(false)
+            AuthorList.parse("John Smith and Black Brown, Peter").getAsLastFirstNamesWithAnd(false)
         );
         assertEquals(
             "von Neumann, John and Smith, John and Black Brown, Peter",
@@ -1583,20 +1312,13 @@ public void testGetAuthorsLastFirstAnds() {
         );
         assertEquals(
             "von Last, Jr, First",
-            AuthorList
-                .parse("von Last, Jr ,First")
-                .getAsLastFirstNamesWithAnd(false)
+            AuthorList.parse("von Last, Jr ,First").getAsLastFirstNamesWithAnd(false)
         );
 
-        assertEquals(
-            "Smith, J.",
-            AuthorList.parse("John Smith").getAsLastFirstNamesWithAnd(true)
-        );
+        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)
+            AuthorList.parse("John Smith and Black Brown, Peter").getAsLastFirstNamesWithAnd(true)
         );
         assertEquals(
             "von Neumann, J. and Smith, J. and Black Brown, P.",
@@ -1606,9 +1328,7 @@ public void testGetAuthorsLastFirstAnds() {
         );
         assertEquals(
             "von Last, Jr, F.",
-            AuthorList
-                .parse("von Last, Jr ,First")
-                .getAsLastFirstNamesWithAnd(true)
+            AuthorList.parse("von Last, Jr ,First").getAsLastFirstNamesWithAnd(true)
         );
     }
 
@@ -1629,27 +1349,12 @@ public void testGetAuthorsFirstFirst() {
         assertEquals("J. Smith", al.getAsFirstLastNames(true, true));
 
         al = AuthorList.parse("John Smith and Black Brown, Peter");
-        assertEquals(
-            "John Smith and Peter Black Brown",
-            al.getAsFirstLastNames(false, false)
-        );
-        assertEquals(
-            "J. Smith and P. Black Brown",
-            al.getAsFirstLastNames(true, false)
-        );
-        assertEquals(
-            "John Smith and Peter Black Brown",
-            al.getAsFirstLastNames(false, true)
-        );
-        assertEquals(
-            "J. Smith and P. Black Brown",
-            al.getAsFirstLastNames(true, true)
-        );
+        assertEquals("John Smith and Peter Black Brown", al.getAsFirstLastNames(false, false));
+        assertEquals("J. Smith and P. Black Brown", al.getAsFirstLastNames(true, false));
+        assertEquals("John Smith and Peter Black Brown", al.getAsFirstLastNames(false, true));
+        assertEquals("J. Smith and P. Black Brown", al.getAsFirstLastNames(true, true));
 
-        al =
-            AuthorList.parse(
-                "John von Neumann and John Smith and Black Brown, Peter"
-            );
+        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)
@@ -1668,29 +1373,18 @@ public void testGetAuthorsFirstFirst() {
         );
 
         al = AuthorList.parse("John Peter von Neumann");
-        assertEquals(
-            "John Peter von Neumann",
-            al.getAsFirstLastNames(false, false)
-        );
-        assertEquals(
-            "John Peter von Neumann",
-            al.getAsFirstLastNames(false, true)
-        );
+        assertEquals("John Peter von Neumann", al.getAsFirstLastNames(false, false));
+        assertEquals("John Peter von Neumann", al.getAsFirstLastNames(false, true));
         assertEquals("J. P. von Neumann", al.getAsFirstLastNames(true, false));
         assertEquals("J. P. von Neumann", al.getAsFirstLastNames(true, true));
     }
 
     @Test
     public void testGetAuthorsFirstFirstAnds() {
-        assertEquals(
-            "John Smith",
-            AuthorList.parse("John Smith").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()
+            AuthorList.parse("John Smith and Black Brown, Peter").getAsFirstLastNamesWithAnd()
         );
         assertEquals(
             "John von Neumann and John Smith and Peter Black Brown",
@@ -1700,58 +1394,33 @@ public void testGetAuthorsFirstFirstAnds() {
         );
         assertEquals(
             "First von Last, Jr. III",
-            AuthorList
-                .parse("von Last, Jr. III, First")
-                .getAsFirstLastNamesWithAnd()
+            AuthorList.parse("von Last, Jr. III, First").getAsFirstLastNamesWithAnd()
         );
     }
 
     @Test
     public void testGetAuthorsForAlphabetization() {
-        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("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"
-                )
+                .parse("John von Neumann and John Smith and de Black Brown, Jr., Peter")
                 .getForAlphabetization()
         );
     }
 
     @Test
     public void testRemoveStartAndEndBraces() {
-        assertEquals(
-            "{A}bbb{c}",
-            AuthorList.parse("{A}bbb{c}").getAsLastNames(false)
-        );
+        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(
-            "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("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)
@@ -1762,42 +1431,21 @@ public void testRemoveStartAndEndBraces() {
     public void createCorrectInitials() {
         assertEquals(
             Optional.of("J. G."),
-            AuthorList
-                .parse("Hornberg, Johann Gottfried")
-                .getAuthor(0)
-                .getFirstAbbr()
+            AuthorList.parse("Hornberg, Johann Gottfried").getAuthor(0).getFirstAbbr()
         );
     }
 
     @Test
     public void parseNameWithBracesAroundFirstName() throws Exception {
         // TODO: Be more intelligent and abbreviate the first name correctly
-        Author expected = new Author(
-            "Tse-tung",
-            "{Tse-tung}.",
-            null,
-            "Mao",
-            null
-        );
-        assertEquals(
-            AuthorList.of(expected),
-            AuthorList.parse("{Tse-tung} Mao")
-        );
+        Author expected = new Author("Tse-tung", "{Tse-tung}.", null, "Mao", null);
+        assertEquals(AuthorList.of(expected), AuthorList.parse("{Tse-tung} Mao"));
     }
 
     @Test
     public void parseNameWithBracesAroundLastName() throws Exception {
-        Author expected = new Author(
-            "Hans",
-            "H.",
-            null,
-            "van den Bergen",
-            null
-        );
-        assertEquals(
-            AuthorList.of(expected),
-            AuthorList.parse("{van den Bergen}, Hans")
-        );
+        Author expected = new Author("Hans", "H.", null, "van den Bergen", null);
+        assertEquals(AuthorList.of(expected), AuthorList.parse("{van den Bergen}, Hans"));
     }
 
     @Test
@@ -1808,78 +1456,41 @@ public void parseNameWithHyphenInFirstName() throws Exception {
 
     @Test
     public void parseNameWithHyphenInLastName() throws Exception {
-        Author expected = new Author(
-            "Firstname",
-            "F.",
-            null,
-            "Bailey-Jones",
-            null
-        );
-        assertEquals(
-            AuthorList.of(expected),
-            AuthorList.parse("Firstname Bailey-Jones")
-        );
+        Author expected = new Author("Firstname", "F.", null, "Bailey-Jones", null);
+        assertEquals(AuthorList.of(expected), AuthorList.parse("Firstname Bailey-Jones"));
     }
 
     @Test
     public void parseNameWithHyphenInLastNameWithInitials() throws Exception {
-        Author expected = new Author(
-            "E. S.",
-            "E. S.",
-            null,
-            "El-{M}allah",
-            null
-        );
-        assertEquals(
-            AuthorList.of(expected),
-            AuthorList.parse("E. S. El-{M}allah")
-        );
+        Author expected = new Author("E. S.", "E. S.", null, "El-{M}allah", null);
+        assertEquals(AuthorList.of(expected), AuthorList.parse("E. S. El-{M}allah"));
     }
 
     @Test
     public void parseNameWithHyphenInLastNameWithEscaped() throws Exception {
-        Author expected = new Author(
-            "E. S.",
-            "E. S.",
-            null,
-            "{K}ent-{B}oswell",
-            null
-        );
-        assertEquals(
-            AuthorList.of(expected),
-            AuthorList.parse("E. S. {K}ent-{B}oswell")
-        );
+        Author expected = new Author("E. S.", "E. S.", null, "{K}ent-{B}oswell", null);
+        assertEquals(AuthorList.of(expected), AuthorList.parse("E. S. {K}ent-{B}oswell"));
     }
 
     @Test
-    public void parseNameWithHyphenInLastNameWhenLastNameGivenFirst()
-        throws Exception {
+    public void parseNameWithHyphenInLastNameWhenLastNameGivenFirst() throws Exception {
         // TODO: Fix abbreviation to be "A."
         Author expected = new Author("ʿAbdallāh", "ʿ.", null, "al-Ṣāliḥ", null);
-        assertEquals(
-            AuthorList.of(expected),
-            AuthorList.parse("al-Ṣāliḥ, ʿAbdallāh")
-        );
+        assertEquals(AuthorList.of(expected), AuthorList.parse("al-Ṣāliḥ, ʿAbdallāh"));
     }
 
     @Test
     public void parseNameWithBraces() throws Exception {
         Author expected = new Author("H{e}lene", "H.", null, "Fiaux", null);
-        assertEquals(
-            AuthorList.of(expected),
-            AuthorList.parse("H{e}lene Fiaux")
-        );
+        assertEquals(AuthorList.of(expected), AuthorList.parse("H{e}lene Fiaux"));
     }
 
     @Test
-    public void parseFirstNameFromFirstAuthorMultipleAuthorsWithLatexNames()
-        throws Exception {
+    public 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"
-                )
+                .parse("Mu{\\d{h}}ammad al-Khw{\\={a}}rizm{\\={i}} and Corrado B{\\\"o}hm")
                 .getAuthor(0)
                 .getFirst()
                 .orElse(null)
@@ -1887,14 +1498,11 @@ public void parseFirstNameFromFirstAuthorMultipleAuthorsWithLatexNames()
     }
 
     @Test
-    public void parseFirstNameFromSecondAuthorMultipleAuthorsWithLatexNames()
-        throws Exception {
+    public void parseFirstNameFromSecondAuthorMultipleAuthorsWithLatexNames() throws Exception {
         assertEquals(
             "Corrado",
             AuthorList
-                .parse(
-                    "Mu{\\d{h}}ammad al-Khw{\\={a}}rizm{\\={i}} and Corrado B{\\\"o}hm"
-                )
+                .parse("Mu{\\d{h}}ammad al-Khw{\\={a}}rizm{\\={i}} and Corrado B{\\\"o}hm")
                 .getAuthor(1)
                 .getFirst()
                 .orElse(null)
@@ -1902,14 +1510,11 @@ public void parseFirstNameFromSecondAuthorMultipleAuthorsWithLatexNames()
     }
 
     @Test
-    public void parseLastNameFromFirstAuthorMultipleAuthorsWithLatexNames()
-        throws Exception {
+    public 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"
-                )
+                .parse("Mu{\\d{h}}ammad al-Khw{\\={a}}rizm{\\={i}} and Corrado B{\\\"o}hm")
                 .getAuthor(0)
                 .getLast()
                 .orElse(null)
@@ -1917,14 +1522,11 @@ public void parseLastNameFromFirstAuthorMultipleAuthorsWithLatexNames()
     }
 
     @Test
-    public void parseLastNameFromSecondAuthorMultipleAuthorsWithLatexNames()
-        throws Exception {
+    public void parseLastNameFromSecondAuthorMultipleAuthorsWithLatexNames() throws Exception {
         assertEquals(
             "B{\\\"o}hm",
             AuthorList
-                .parse(
-                    "Mu{\\d{h}}ammad al-Khw{\\={a}}rizm{\\={i}} and Corrado B{\\\"o}hm"
-                )
+                .parse("Mu{\\d{h}}ammad al-Khw{\\={a}}rizm{\\={i}} and Corrado B{\\\"o}hm")
                 .getAuthor(1)
                 .getLast()
                 .orElse(null)
@@ -1944,8 +1546,7 @@ public void parseInstitutionAuthorWithLatexNames() throws Exception {
     }
 
     @Test
-    public void parseRetrieveCachedAuthorListAfterGarbageCollection()
-        throws Exception {
+    public void parseRetrieveCachedAuthorListAfterGarbageCollection() throws Exception {
         final String uniqueAuthorName = "Osvaldo Iongi";
         AuthorList author = AuthorList.parse(uniqueAuthorName);
         System.gc();
@@ -1953,13 +1554,10 @@ public void parseRetrieveCachedAuthorListAfterGarbageCollection()
     }
 
     @Test
-    public void parseGarbageCollectAuthorListForUnreachableKey()
-        throws Exception {
+    public void parseGarbageCollectAuthorListForUnreachableKey() throws Exception {
         final String uniqueAuthorName = "Fleur Hornbach";
         // Note that "new String()" is needed, uniqueAuthorName is a reference to a String literal
-        AuthorList uniqueAuthor = AuthorList.parse(
-            new String(uniqueAuthorName)
-        );
+        AuthorList uniqueAuthor = AuthorList.parse(new String(uniqueAuthorName));
         System.gc();
         assertNotSame(uniqueAuthor, AuthorList.parse(uniqueAuthorName));
     }
@@ -1968,24 +1566,17 @@ public void parseGarbageCollectAuthorListForUnreachableKey()
     public void parseGarbageCollectUnreachableInstitution() throws Exception {
         final String uniqueInstitutionName = "{Unique LLC}";
         // Note that "new String()" is needed, uniqueAuthorName is a reference to a String literal
-        AuthorList uniqueInstitution = AuthorList.parse(
-            new String(uniqueInstitutionName)
-        );
+        AuthorList uniqueInstitution = AuthorList.parse(new String(uniqueInstitutionName));
         System.gc();
-        assertNotSame(
-            uniqueInstitution,
-            AuthorList.parse(uniqueInstitutionName)
-        );
+        assertNotSame(uniqueInstitution, AuthorList.parse(uniqueInstitutionName));
     }
 
     /**
      * This tests an unreachable key issue addressed in [#6552](https://github.com/JabRef/jabref/pull/6552). The test is incorrect BibTeX but is handled by the parser and common in practice.
      */
     @Test
-    public void parseCacheAuthorsWithTwoOrMoreCommasAndWithSpaceInAllParts()
-        throws Exception {
-        final String uniqueAuthorsNames =
-            "Basil Dankworth, Gianna Birdwhistle, Cosmo Berrycloth";
+    public void parseCacheAuthorsWithTwoOrMoreCommasAndWithSpaceInAllParts() throws Exception {
+        final String uniqueAuthorsNames = "Basil Dankworth, Gianna Birdwhistle, Cosmo Berrycloth";
         AuthorList uniqueAuthors = AuthorList.parse(uniqueAuthorsNames);
         System.gc();
         assertSame(uniqueAuthors, AuthorList.parse(uniqueAuthorsNames));
@@ -1995,8 +1586,7 @@ public void parseCacheAuthorsWithTwoOrMoreCommasAndWithSpaceInAllParts()
      * This tests an unreachable key issue addressed in [#6552](https://github.com/JabRef/jabref/pull/6552).
      */
     @Test
-    public void parseCacheAuthorsWithTwoOrMoreCommasAndWithoutSpaceInAllParts()
-        throws Exception {
+    public void parseCacheAuthorsWithTwoOrMoreCommasAndWithoutSpaceInAllParts() throws Exception {
         final String uniqueAuthorsNames = "Dankworth, Jr., Braelynn";
         AuthorList uniqueAuthors = AuthorList.parse(uniqueAuthorsNames);
         System.gc();
@@ -2020,44 +1610,17 @@ public void correctNamesWithOneComma() throws Exception {
             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 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
-            );
+        expected = new Author("Alexander Hendrik George", "A. H. G.", null, "Rinnooy Kan", null);
         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")
-        );
+        expected = new Author("José María", "J. M.", null, "Rodriguez Fernandez", null);
+        assertEquals(AuthorList.of(expected), AuthorList.parse("Rodriguez Fernandez, José María"));
     }
 
     @Test
@@ -2079,35 +1642,23 @@ public void equalsFalseWhenNotAuthorList() {
 
     @Test
     public void equalsTrueReflexive() {
-        AuthorList authorList = AuthorList.of(
-            new Author(null, null, null, null, null)
-        );
+        AuthorList authorList = AuthorList.of(new Author(null, null, null, null, null));
         assertEquals(authorList, authorList);
     }
 
     @Test
     public void equalsTrueSymmetric() {
-        AuthorList firstAuthorList = AuthorList.of(
-            new Author("A", null, null, null, null)
-        );
-        AuthorList secondAuthorList = AuthorList.of(
-            new Author("A", null, null, null, null)
-        );
+        AuthorList firstAuthorList = AuthorList.of(new Author("A", null, null, null, null));
+        AuthorList secondAuthorList = AuthorList.of(new Author("A", null, null, null, null));
         assertEquals(firstAuthorList, secondAuthorList);
         assertEquals(secondAuthorList, firstAuthorList);
     }
 
     @Test
     public void equalsTrueTransitive() {
-        AuthorList firstAuthorList = AuthorList.of(
-            new Author("A", null, null, null, null)
-        );
-        AuthorList secondAuthorList = AuthorList.of(
-            new Author("A", null, null, null, null)
-        );
-        AuthorList thirdAuthorList = AuthorList.of(
-            new Author("A", null, null, null, null)
-        );
+        AuthorList firstAuthorList = AuthorList.of(new Author("A", null, null, null, null));
+        AuthorList secondAuthorList = AuthorList.of(new Author("A", null, null, null, null));
+        AuthorList thirdAuthorList = AuthorList.of(new Author("A", null, null, null, null));
         assertEquals(firstAuthorList, secondAuthorList);
         assertEquals(secondAuthorList, thirdAuthorList);
         assertEquals(firstAuthorList, thirdAuthorList);
@@ -2115,12 +1666,8 @@ public void equalsTrueTransitive() {
 
     @Test
     public void equalsTrueConsistent() {
-        AuthorList firstAuthorList = AuthorList.of(
-            new Author("A", null, null, null, null)
-        );
-        AuthorList secondAuthorList = AuthorList.of(
-            new Author("A", null, null, null, null)
-        );
+        AuthorList firstAuthorList = AuthorList.of(new Author("A", null, null, null, null));
+        AuthorList secondAuthorList = AuthorList.of(new Author("A", null, null, null, null));
         assertEquals(firstAuthorList, secondAuthorList);
         assertEquals(firstAuthorList, secondAuthorList);
         assertEquals(firstAuthorList, secondAuthorList);
@@ -2128,40 +1675,25 @@ public void equalsTrueConsistent() {
 
     @Test
     public void equalsFalseForNull() {
-        assertNotEquals(
-            null,
-            AuthorList.of(new Author(null, null, null, null, null))
-        );
+        assertNotEquals(null, AuthorList.of(new Author(null, null, null, null, null)));
     }
 
     @Test
     public void hashCodeConsistent() {
-        AuthorList authorList = AuthorList.of(
-            new Author(null, null, null, null, null)
-        );
+        AuthorList authorList = AuthorList.of(new Author(null, null, null, null, null));
         assertEquals(authorList.hashCode(), authorList.hashCode());
     }
 
     @Test
     public void hashCodeNotConstant() {
-        AuthorList firstAuthorList = AuthorList.of(
-            new Author("A", null, null, null, null)
-        );
-        AuthorList secondAuthorList = AuthorList.of(
-            new Author("B", null, null, null, null)
-        );
-        assertNotEquals(
-            firstAuthorList.hashCode(),
-            secondAuthorList.hashCode()
-        );
+        AuthorList firstAuthorList = AuthorList.of(new Author("A", null, null, null, null));
+        AuthorList secondAuthorList = AuthorList.of(new Author("B", null, null, null, null));
+        assertNotEquals(firstAuthorList.hashCode(), secondAuthorList.hashCode());
     }
 
     @Test
     public void getAsLastFirstFirstLastNamesWithAndEmptyAuthor() {
-        assertEquals(
-            "",
-            EMPTY_AUTHOR.getAsLastFirstFirstLastNamesWithAnd(true)
-        );
+        assertEquals("", EMPTY_AUTHOR.getAsLastFirstFirstLastNamesWithAnd(true));
     }
 
     @Test
diff --git a/src/test/java/org/jabref/model/entry/BibEntryTest.java b/src/test/java/org/jabref/model/entry/BibEntryTest.java
index 83535751392..c30f8ef8b69 100644
--- a/src/test/java/org/jabref/model/entry/BibEntryTest.java
+++ b/src/test/java/org/jabref/model/entry/BibEntryTest.java
@@ -60,10 +60,7 @@ void setNullFieldThrowsNPE() {
     @Test
     void getFieldIsCaseInsensitive() throws Exception {
         entry.setField(new UnknownField("TeSt"), "value");
-        assertEquals(
-            Optional.of("value"),
-            entry.getField(new UnknownField("tEsT"))
-        );
+        assertEquals(Optional.of("value"), entry.getField(new UnknownField("tEsT")));
     }
 
     @Test
@@ -71,10 +68,7 @@ void getFieldWorksWithBibFieldAsWell() throws Exception {
         entry.setField(StandardField.AUTHOR, "value");
         assertEquals(
             Optional.of("value"),
-            entry.getField(
-                new BibField(StandardField.AUTHOR, FieldPriority.IMPORTANT)
-                    .field()
-            )
+            entry.getField(new BibField(StandardField.AUTHOR, FieldPriority.IMPORTANT).field())
         );
     }
 
@@ -95,10 +89,7 @@ void setFieldWorksWithBibFieldAsWell() throws Exception {
             new BibField(StandardField.AUTHOR, FieldPriority.IMPORTANT).field(),
             "value"
         );
-        assertEquals(
-            Optional.of("value"),
-            entry.getField(StandardField.AUTHOR)
-        );
+        assertEquals(Optional.of("value"), entry.getField(StandardField.AUTHOR));
     }
 
     @Test
@@ -114,11 +105,8 @@ void clonedBibEntryWithMiscTypeHasOriginalChangedFlag() throws Exception {
     }
 
     @Test
-    void clonedBibEntryWithBookTypeAndOneFieldHasOriginalChangedFlag()
-        throws Exception {
-        entry =
-            new BibEntry(StandardEntryType.Book)
-                .withField(StandardField.AUTHOR, "value");
+    void clonedBibEntryWithBookTypeAndOneFieldHasOriginalChangedFlag() throws Exception {
+        entry = new BibEntry(StandardEntryType.Book).withField(StandardField.AUTHOR, "value");
         BibEntry entryClone = (BibEntry) entry.clone();
         assertFalse(entryClone.hasChanged());
     }
@@ -175,101 +163,68 @@ void monthFieldCorrectlyReturnedForMonthMay() throws Exception {
     void getFieldOrAliasDateWithYearNumericalMonthString() {
         entry.setField(StandardField.YEAR, "2003");
         entry.setField(StandardField.MONTH, "3");
-        assertEquals(
-            Optional.of("2003-03"),
-            entry.getFieldOrAlias(StandardField.DATE)
-        );
+        assertEquals(Optional.of("2003-03"), entry.getFieldOrAlias(StandardField.DATE));
     }
 
     @Test
     void getFieldOrAliasDateWithYearAbbreviatedMonth() {
         entry.setField(StandardField.YEAR, "2003");
         entry.setField(StandardField.MONTH, "#mar#");
-        assertEquals(
-            Optional.of("2003-03"),
-            entry.getFieldOrAlias(StandardField.DATE)
-        );
+        assertEquals(Optional.of("2003-03"), entry.getFieldOrAlias(StandardField.DATE));
     }
 
     @Test
     void getFieldOrAliasDateWithYearAbbreviatedMonthString() {
         entry.setField(StandardField.YEAR, "2003");
         entry.setField(StandardField.MONTH, "mar");
-        assertEquals(
-            Optional.of("2003-03"),
-            entry.getFieldOrAlias(StandardField.DATE)
-        );
+        assertEquals(Optional.of("2003-03"), entry.getFieldOrAlias(StandardField.DATE));
     }
 
     @Test
     void getFieldOrAliasDateWithOnlyYear() {
         entry.setField(StandardField.YEAR, "2003");
-        assertEquals(
-            Optional.of("2003"),
-            entry.getFieldOrAlias(StandardField.DATE)
-        );
+        assertEquals(Optional.of("2003"), entry.getFieldOrAlias(StandardField.DATE));
     }
 
     @Test
     void getFieldOrAliasYearWithDateYYYY() {
         entry.setField(StandardField.DATE, "2003");
-        assertEquals(
-            Optional.of("2003"),
-            entry.getFieldOrAlias(StandardField.YEAR)
-        );
+        assertEquals(Optional.of("2003"), entry.getFieldOrAlias(StandardField.YEAR));
     }
 
     @Test
     void getFieldOrAliasYearWithDateYYYYMM() {
         entry.setField(StandardField.DATE, "2003-03");
-        assertEquals(
-            Optional.of("2003"),
-            entry.getFieldOrAlias(StandardField.YEAR)
-        );
+        assertEquals(Optional.of("2003"), entry.getFieldOrAlias(StandardField.YEAR));
     }
 
     @Test
     void getFieldOrAliasYearWithDateYYYYMMDD() {
         entry.setField(StandardField.DATE, "2003-03-30");
-        assertEquals(
-            Optional.of("2003"),
-            entry.getFieldOrAlias(StandardField.YEAR)
-        );
+        assertEquals(Optional.of("2003"), entry.getFieldOrAlias(StandardField.YEAR));
     }
 
     @Test
     void getFieldOrAliasMonthWithDateYYYYReturnsNull() {
         entry.setField(StandardField.DATE, "2003");
-        assertEquals(
-            Optional.empty(),
-            entry.getFieldOrAlias(StandardField.MONTH)
-        );
+        assertEquals(Optional.empty(), entry.getFieldOrAlias(StandardField.MONTH));
     }
 
     @Test
     void getFieldOrAliasMonthWithDateYYYYMM() {
         entry.setField(StandardField.DATE, "2003-03");
-        assertEquals(
-            Optional.of("#mar#"),
-            entry.getFieldOrAlias(StandardField.MONTH)
-        );
+        assertEquals(Optional.of("#mar#"), entry.getFieldOrAlias(StandardField.MONTH));
     }
 
     @Test
     void getFieldOrAliasMonthWithDateYYYYMMDD() {
         entry.setField(StandardField.DATE, "2003-03-30");
-        assertEquals(
-            Optional.of("#mar#"),
-            entry.getFieldOrAlias(StandardField.MONTH)
-        );
+        assertEquals(Optional.of("#mar#"), entry.getFieldOrAlias(StandardField.MONTH));
     }
 
     @Test
     void getFieldOrAliasLatexFreeAlreadyFreeValueIsUnchanged() {
-        entry.setField(
-            StandardField.TITLE,
-            "A Title Without any LaTeX commands"
-        );
+        entry.setField(StandardField.TITLE, "A Title Without any LaTeX commands");
         assertEquals(
             Optional.of("A Title Without any LaTeX commands"),
             entry.getFieldOrAliasLatexFree(StandardField.TITLE)
@@ -278,10 +233,7 @@ void getFieldOrAliasLatexFreeAlreadyFreeValueIsUnchanged() {
 
     @Test
     void getFieldOrAliasLatexFreeAlreadyFreeAliasValueIsUnchanged() {
-        entry.setField(
-            StandardField.JOURNAL,
-            "A Title Without any LaTeX commands"
-        );
+        entry.setField(StandardField.JOURNAL, "A Title Without any LaTeX commands");
         assertEquals(
             Optional.of("A Title Without any LaTeX commands"),
             entry.getFieldOrAliasLatexFree(StandardField.JOURNALTITLE)
@@ -308,10 +260,7 @@ void getFieldOrAliasLatexFreeBracesAreRemovedFromAlias() {
 
     @Test
     void getFieldOrAliasLatexFreeComplexConversionInAlias() {
-        entry.setField(
-            StandardField.JOURNAL,
-            "A 32~{mA} {$\\Sigma\\Delta$}-modulator"
-        );
+        entry.setField(StandardField.JOURNAL, "A 32~{mA} {$\\Sigma\\Delta$}-modulator");
         assertEquals(
             Optional.of("A 32 mA ΣΔ-modulator"),
             entry.getFieldOrAliasLatexFree(StandardField.JOURNALTITLE)
@@ -323,10 +272,7 @@ void testGetAndAddToLinkedFileList() {
         List<LinkedFile> files = entry.getFiles();
         files.add(new LinkedFile("", Path.of(""), ""));
         entry.setFiles(files);
-        assertEquals(
-            Arrays.asList(new LinkedFile("", Path.of(""), "")),
-            entry.getFiles()
-        );
+        assertEquals(Arrays.asList(new LinkedFile("", Path.of(""), "")), entry.getFiles());
     }
 
     @Test
@@ -380,10 +326,7 @@ void clearFieldWorksForAuthor() {
     @Test
     void setFieldWorksForAuthor() {
         entry.setField(StandardField.AUTHOR, "Albert Einstein");
-        assertEquals(
-            Optional.of("Albert Einstein"),
-            entry.getField(StandardField.AUTHOR)
-        );
+        assertEquals(Optional.of("Albert Einstein"), entry.getField(StandardField.AUTHOR));
     }
 
     @Test
@@ -410,14 +353,10 @@ void allFieldsPresentOr() {
         e.setField(StandardField.JOURNAL, "abc");
 
         List<OrFields> requiredFields = new ArrayList<>();
-        requiredFields.add(
-            new OrFields(StandardField.JOURNAL, StandardField.YEAR)
-        );
+        requiredFields.add(new OrFields(StandardField.JOURNAL, StandardField.YEAR));
         assertTrue(e.allFieldsPresent(requiredFields, null));
 
-        requiredFields.add(
-            new OrFields(StandardField.YEAR, StandardField.ADDRESS)
-        );
+        requiredFields.add(new OrFields(StandardField.YEAR, StandardField.ADDRESS));
         assertFalse(e.allFieldsPresent(requiredFields, null));
     }
 
@@ -472,19 +411,13 @@ void compareIsTrueWhenIdAndFieldsAreEqual() throws Exception {
     @Test
     void addNullKeywordThrowsNPE() {
         entry.setField(StandardField.KEYWORDS, "Foo, Bar");
-        assertThrows(
-            NullPointerException.class,
-            () -> entry.addKeyword((Keyword) null, ',')
-        );
+        assertThrows(NullPointerException.class, () -> entry.addKeyword((Keyword) null, ','));
     }
 
     @Test
     void putNullKeywordListThrowsNPE() {
         entry.setField(StandardField.KEYWORDS, "Foo, Bar");
-        assertThrows(
-            NullPointerException.class,
-            () -> entry.putKeywords((KeywordList) null, ',')
-        );
+        assertThrows(NullPointerException.class, () -> entry.putKeywords((KeywordList) null, ','));
     }
 
     @Test
@@ -506,10 +439,7 @@ void testGetSeparatedKeywordsAreCorrect() {
     void testAddKeywordIsCorrect() {
         entry.setField(StandardField.KEYWORDS, "Foo, Bar");
         entry.addKeyword("FooBar", ',');
-        assertEquals(
-            new KeywordList("Foo", "Bar", "FooBar"),
-            entry.getKeywords(',')
-        );
+        assertEquals(new KeywordList("Foo", "Bar", "FooBar"), entry.getKeywords(','));
     }
 
     @Test
@@ -524,20 +454,14 @@ void testAddKeywordTwiceYiedsOnlyOne() {
         entry.setField(StandardField.KEYWORDS, "Foo, Bar");
         entry.addKeyword("FooBar", ',');
         entry.addKeyword("FooBar", ',');
-        assertEquals(
-            new KeywordList("Foo", "Bar", "FooBar"),
-            entry.getKeywords(',')
-        );
+        assertEquals(new KeywordList("Foo", "Bar", "FooBar"), entry.getKeywords(','));
     }
 
     @Test
     void addKeywordIsCaseSensitive() {
         entry.setField(StandardField.KEYWORDS, "Foo, Bar");
         entry.addKeyword("FOO", ',');
-        assertEquals(
-            new KeywordList("Foo", "Bar", "FOO"),
-            entry.getKeywords(',')
-        );
+        assertEquals(new KeywordList("Foo", "Bar", "FOO"), entry.getKeywords(','));
     }
 
     @Test
@@ -627,24 +551,16 @@ void testPutKeywordsPutEmpyListToEmptyBibentryNotChanged() {
 
     @Test
     void putKeywordsToEmptyReturnsNoChange() {
-        Optional<FieldChange> change = entry.putKeywords(
-            Collections.emptyList(),
-            ','
-        );
+        Optional<FieldChange> change = entry.putKeywords(Collections.emptyList(), ',');
         assertEquals(Optional.empty(), change);
     }
 
     @Test
     void clearKeywordsReturnsChange() {
         entry.setField(StandardField.KEYWORDS, "Foo, Bar");
-        Optional<FieldChange> change = entry.putKeywords(
-            Collections.emptyList(),
-            ','
-        );
+        Optional<FieldChange> change = entry.putKeywords(Collections.emptyList(), ',');
         assertEquals(
-            Optional.of(
-                new FieldChange(entry, StandardField.KEYWORDS, "Foo, Bar", null)
-            ),
+            Optional.of(new FieldChange(entry, StandardField.KEYWORDS, "Foo, Bar", null)),
             change
         );
     }
@@ -652,18 +568,10 @@ void clearKeywordsReturnsChange() {
     @Test
     void changeKeywordsReturnsChange() {
         entry.setField(StandardField.KEYWORDS, "Foo, Bar");
-        Optional<FieldChange> change = entry.putKeywords(
-            Arrays.asList("Test", "FooTest"),
-            ','
-        );
+        Optional<FieldChange> change = entry.putKeywords(Arrays.asList("Test", "FooTest"), ',');
         assertEquals(
             Optional.of(
-                new FieldChange(
-                    entry,
-                    StandardField.KEYWORDS,
-                    "Foo, Bar",
-                    "Test, FooTest"
-                )
+                new FieldChange(entry, StandardField.KEYWORDS, "Foo, Bar", "Test, FooTest")
             ),
             change
         );
@@ -672,20 +580,14 @@ void changeKeywordsReturnsChange() {
     @Test
     void putKeywordsToSameReturnsNoChange() {
         entry.setField(StandardField.KEYWORDS, "Foo, Bar");
-        Optional<FieldChange> change = entry.putKeywords(
-            Arrays.asList("Foo", "Bar"),
-            ','
-        );
+        Optional<FieldChange> change = entry.putKeywords(Arrays.asList("Foo", "Bar"), ',');
         assertEquals(Optional.empty(), change);
     }
 
     @Test
     void getKeywordsReturnsParsedKeywordListFromKeywordsField() {
         entry.setField(StandardField.KEYWORDS, "w1, w2a w2b, w3");
-        assertEquals(
-            new KeywordList("w1", "w2a w2b", "w3"),
-            entry.getKeywords(',')
-        );
+        assertEquals(new KeywordList("w1", "w2a w2b", "w3"), entry.getKeywords(','));
     }
 
     @Test
@@ -701,10 +603,7 @@ void removeKeywordsOnEntryWithoutKeywordsDoesNothing() {
     void removeKeywordsWithEmptyListDoesNothing() {
         entry.setField(StandardField.KEYWORDS, "Foo, Bar");
         entry.putKeywords(Arrays.asList("kw1", "kw2"), ',');
-        Optional<FieldChange> change = entry.removeKeywords(
-            new KeywordList(),
-            ','
-        );
+        Optional<FieldChange> change = entry.removeKeywords(new KeywordList(), ',');
         assertEquals(Optional.empty(), change);
     }
 
@@ -717,10 +616,7 @@ void removeKeywordsWithNonExistingKeywordsDoesNothing() {
             ','
         );
         assertEquals(Optional.empty(), change);
-        assertEquals(
-            Sets.newHashSet("kw1", "kw2"),
-            entry.getKeywords(',').toStringList()
-        );
+        assertEquals(Sets.newHashSet("kw1", "kw2"), entry.getKeywords(',').toStringList());
     }
 
     @Test
@@ -742,11 +638,7 @@ void keywordListCorrectlyConstructedForThreeKeywords() {
         entry.addKeyword("kw3", ',');
         KeywordList actual = entry.getKeywords(',');
         assertEquals(
-            new KeywordList(
-                new Keyword("kw"),
-                new Keyword("kw2"),
-                new Keyword("kw3")
-            ),
+            new KeywordList(new Keyword("kw"), new Keyword("kw2"), new Keyword("kw3")),
             actual
         );
     }
@@ -800,11 +692,7 @@ void testGetResolvedKeywords() {
         KeywordList actual = entry.getResolvedKeywords(',', database);
 
         assertEquals(
-            new KeywordList(
-                new Keyword("kw"),
-                new Keyword("kw2"),
-                new Keyword("kw3")
-            ),
+            new KeywordList(new Keyword("kw"), new Keyword("kw2"), new Keyword("kw3")),
             actual
         );
     }
@@ -833,21 +721,11 @@ void mergeEntriesWithNoOverlap() {
         BibEntry otherEntry = new BibEntry();
 
         copyEntry.setField(
-            Map.of(
-                StandardField.AUTHOR,
-                "Test Author",
-                StandardField.TITLE,
-                "Test Title"
-            )
+            Map.of(StandardField.AUTHOR, "Test Author", StandardField.TITLE, "Test Title")
         );
 
         otherEntry.setField(
-            Map.of(
-                StandardField.EPRINT,
-                "1234.56789",
-                StandardField.DATE,
-                "1970-01-01"
-            )
+            Map.of(StandardField.EPRINT, "1234.56789", StandardField.DATE, "1970-01-01")
         );
 
         copyEntry.mergeWith(otherEntry);
@@ -865,21 +743,11 @@ void mergeEntriesWithOverlap() {
         BibEntry otherEntry = new BibEntry();
 
         copyEntry.setField(
-            Map.of(
-                StandardField.AUTHOR,
-                "Test Author",
-                StandardField.TITLE,
-                "Test Title"
-            )
+            Map.of(StandardField.AUTHOR, "Test Author", StandardField.TITLE, "Test Title")
         );
 
         otherEntry.setField(
-            Map.of(
-                StandardField.AUTHOR,
-                "Another Test Author",
-                StandardField.DATE,
-                "1970-01-01"
-            )
+            Map.of(StandardField.AUTHOR, "Another Test Author", StandardField.DATE, "1970-01-01")
         );
 
         copyEntry.mergeWith(otherEntry);
@@ -898,27 +766,14 @@ void mergeEntriesWithNoOverlapAndNonExistingPriorityFields() {
         BibEntry otherEntry = new BibEntry();
 
         copyEntry.setField(
-            Map.of(
-                StandardField.AUTHOR,
-                "Test Author",
-                StandardField.TITLE,
-                "Test Title"
-            )
+            Map.of(StandardField.AUTHOR, "Test Author", StandardField.TITLE, "Test Title")
         );
 
         otherEntry.setField(
-            Map.of(
-                StandardField.EPRINT,
-                "1234.56789",
-                StandardField.DATE,
-                "1970-01-01"
-            )
+            Map.of(StandardField.EPRINT, "1234.56789", StandardField.DATE, "1970-01-01")
         );
 
-        Set<Field> otherPrioritizedFields = Set.of(
-            StandardField.VOLUME,
-            StandardField.KEYWORDS
-        );
+        Set<Field> otherPrioritizedFields = Set.of(StandardField.VOLUME, StandardField.KEYWORDS);
 
         copyEntry.mergeWith(otherEntry, otherPrioritizedFields);
         assertEquals(expected.getFields(), copyEntry.getFields());
@@ -936,27 +791,14 @@ void mergeEntriesWithNoOverlapAndExistingPriorityFields() {
         BibEntry otherEntry = new BibEntry();
 
         copyEntry.setField(
-            Map.of(
-                StandardField.AUTHOR,
-                "Test Author",
-                StandardField.TITLE,
-                "Test Title"
-            )
+            Map.of(StandardField.AUTHOR, "Test Author", StandardField.TITLE, "Test Title")
         );
 
         otherEntry.setField(
-            Map.of(
-                StandardField.EPRINT,
-                "1234.56789",
-                StandardField.DATE,
-                "1970-01-01"
-            )
+            Map.of(StandardField.EPRINT, "1234.56789", StandardField.DATE, "1970-01-01")
         );
 
-        Set<Field> otherPrioritizedFields = Set.of(
-            StandardField.AUTHOR,
-            StandardField.EPRINT
-        );
+        Set<Field> otherPrioritizedFields = Set.of(StandardField.AUTHOR, StandardField.EPRINT);
 
         copyEntry.mergeWith(otherEntry, otherPrioritizedFields);
         assertEquals(expected.getFields(), copyEntry.getFields());
@@ -973,27 +815,14 @@ void mergeEntriesWithOverlapAndPriorityGivenToNonOverlappingField() {
         BibEntry otherEntry = new BibEntry();
 
         copyEntry.setField(
-            Map.of(
-                StandardField.AUTHOR,
-                "Test Author",
-                StandardField.TITLE,
-                "Test Title"
-            )
+            Map.of(StandardField.AUTHOR, "Test Author", StandardField.TITLE, "Test Title")
         );
 
         otherEntry.setField(
-            Map.of(
-                StandardField.AUTHOR,
-                "Another Test Author",
-                StandardField.DATE,
-                "1970-01-01"
-            )
+            Map.of(StandardField.AUTHOR, "Another Test Author", StandardField.DATE, "1970-01-01")
         );
 
-        Set<Field> otherPrioritizedFields = Set.of(
-            StandardField.TITLE,
-            StandardField.DATE
-        );
+        Set<Field> otherPrioritizedFields = Set.of(StandardField.TITLE, StandardField.DATE);
 
         copyEntry.mergeWith(otherEntry, otherPrioritizedFields);
         assertEquals(expected.getFields(), copyEntry.getFields());
@@ -1010,27 +839,14 @@ void mergeEntriesWithOverlapAndPriorityGivenToOverlappingField() {
         BibEntry otherEntry = new BibEntry();
 
         copyEntry.setField(
-            Map.of(
-                StandardField.AUTHOR,
-                "Test Author",
-                StandardField.TITLE,
-                "Test Title"
-            )
+            Map.of(StandardField.AUTHOR, "Test Author", StandardField.TITLE, "Test Title")
         );
 
         otherEntry.setField(
-            Map.of(
-                StandardField.AUTHOR,
-                "Another Test Author",
-                StandardField.DATE,
-                "1970-01-01"
-            )
+            Map.of(StandardField.AUTHOR, "Another Test Author", StandardField.DATE, "1970-01-01")
         );
 
-        Set<Field> otherPrioritizedFields = Set.of(
-            StandardField.AUTHOR,
-            StandardField.DATE
-        );
+        Set<Field> otherPrioritizedFields = Set.of(StandardField.AUTHOR, StandardField.DATE);
 
         copyEntry.mergeWith(otherEntry, otherPrioritizedFields);
         assertEquals(expected.getFields(), copyEntry.getFields());
diff --git a/src/test/java/org/jabref/model/entry/BibEntryTypesManagerTest.java b/src/test/java/org/jabref/model/entry/BibEntryTypesManagerTest.java
index 65e4d56cffb..76629f72563 100644
--- a/src/test/java/org/jabref/model/entry/BibEntryTypesManagerTest.java
+++ b/src/test/java/org/jabref/model/entry/BibEntryTypesManagerTest.java
@@ -30,17 +30,11 @@
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.EnumSource;
 
-@AllowedToUseLogic(
-    "Requires MetaDataSerializer and MetaDataParser for parsing tests"
-)
+@AllowedToUseLogic("Requires MetaDataSerializer and MetaDataParser for parsing tests")
 class BibEntryTypesManagerTest {
 
-    private static final EntryType UNKNOWN_TYPE = new UnknownEntryType(
-        "unknownType"
-    );
-    private static final EntryType CUSTOM_TYPE = new UnknownEntryType(
-        "customType"
-    );
+    private static final EntryType UNKNOWN_TYPE = new UnknownEntryType("unknownType");
+    private static final EntryType CUSTOM_TYPE = new UnknownEntryType("customType");
     private BibEntryType newCustomType;
     private BibEntryType overwrittenStandardType;
     private BibEntryTypesManager entryTypesManager;
@@ -50,17 +44,13 @@ void setUp() {
         newCustomType =
             new BibEntryType(
                 CUSTOM_TYPE,
-                List.of(
-                    new BibField(StandardField.AUTHOR, FieldPriority.IMPORTANT)
-                ),
+                List.of(new BibField(StandardField.AUTHOR, FieldPriority.IMPORTANT)),
                 Collections.emptySet()
             );
         overwrittenStandardType =
             new BibEntryType(
                 StandardEntryType.Article,
-                List.of(
-                    new BibField(StandardField.TITLE, FieldPriority.IMPORTANT)
-                ),
+                List.of(new BibField(StandardField.TITLE, FieldPriority.IMPORTANT)),
                 Collections.emptySet()
             );
         entryTypesManager = new BibEntryTypesManager();
@@ -68,55 +58,32 @@ void setUp() {
 
     @ParameterizedTest
     @EnumSource(BibDatabaseMode.class)
-    void isCustomOrModifiedTypeReturnsTrueForModifiedStandardEntryType(
-        BibDatabaseMode mode
-    ) {
-        entryTypesManager.addCustomOrModifiedType(
-            overwrittenStandardType,
-            mode
-        );
-        assertTrue(
-            entryTypesManager.isCustomOrModifiedType(
-                overwrittenStandardType,
-                mode
-            )
-        );
+    void isCustomOrModifiedTypeReturnsTrueForModifiedStandardEntryType(BibDatabaseMode mode) {
+        entryTypesManager.addCustomOrModifiedType(overwrittenStandardType, mode);
+        assertTrue(entryTypesManager.isCustomOrModifiedType(overwrittenStandardType, mode));
     }
 
     @Test
     void allTypesBibtexAreCorrect() {
-        TreeSet<BibEntryType> defaultTypes = new TreeSet<>(
-            BibtexEntryTypeDefinitions.ALL
-        );
+        TreeSet<BibEntryType> defaultTypes = new TreeSet<>(BibtexEntryTypeDefinitions.ALL);
         defaultTypes.addAll(IEEETranEntryTypeDefinitions.ALL);
 
-        assertEquals(
-            defaultTypes,
-            entryTypesManager.getAllTypes(BibDatabaseMode.BIBTEX)
-        );
+        assertEquals(defaultTypes, entryTypesManager.getAllTypes(BibDatabaseMode.BIBTEX));
     }
 
     @Test
     void allTypesBiblatexAreCorrect() {
-        TreeSet<BibEntryType> defaultTypes = new TreeSet<>(
-            BiblatexEntryTypeDefinitions.ALL
-        );
+        TreeSet<BibEntryType> defaultTypes = new TreeSet<>(BiblatexEntryTypeDefinitions.ALL);
         defaultTypes.addAll(BiblatexSoftwareEntryTypeDefinitions.ALL);
         defaultTypes.addAll(BiblatexAPAEntryTypeDefinitions.ALL);
 
-        assertEquals(
-            defaultTypes,
-            entryTypesManager.getAllTypes(BibDatabaseMode.BIBLATEX)
-        );
+        assertEquals(defaultTypes, entryTypesManager.getAllTypes(BibDatabaseMode.BIBLATEX));
     }
 
     @ParameterizedTest
     @EnumSource(BibDatabaseMode.class)
     void unknownTypeIsNotFound(BibDatabaseMode mode) {
-        assertEquals(
-            Optional.empty(),
-            entryTypesManager.enrich(UNKNOWN_TYPE, mode)
-        );
+        assertEquals(Optional.empty(), entryTypesManager.enrich(UNKNOWN_TYPE, mode));
         assertFalse(entryTypesManager.isCustomType(UNKNOWN_TYPE, mode));
     }
 
@@ -124,17 +91,12 @@ void unknownTypeIsNotFound(BibDatabaseMode mode) {
     @EnumSource(BibDatabaseMode.class)
     void newCustomEntryTypeFound(BibDatabaseMode mode) {
         entryTypesManager.addCustomOrModifiedType(newCustomType, mode);
-        assertEquals(
-            Optional.of(newCustomType),
-            entryTypesManager.enrich(CUSTOM_TYPE, mode)
-        );
+        assertEquals(Optional.of(newCustomType), entryTypesManager.enrich(CUSTOM_TYPE, mode));
     }
 
     @ParameterizedTest
     @EnumSource(BibDatabaseMode.class)
-    void registeredBibEntryTypeIsContainedInListOfCustomizedEntryTypes(
-        BibDatabaseMode mode
-    ) {
+    void registeredBibEntryTypeIsContainedInListOfCustomizedEntryTypes(BibDatabaseMode mode) {
         entryTypesManager.addCustomOrModifiedType(newCustomType, mode);
         assertEquals(
             Collections.singletonList(newCustomType),
@@ -144,14 +106,9 @@ void registeredBibEntryTypeIsContainedInListOfCustomizedEntryTypes(
 
     @Test
     void registerBibEntryTypeDoesNotAffectOtherMode() {
-        entryTypesManager.addCustomOrModifiedType(
-            newCustomType,
-            BibDatabaseMode.BIBTEX
-        );
+        entryTypesManager.addCustomOrModifiedType(newCustomType, BibDatabaseMode.BIBTEX);
         assertFalse(
-            entryTypesManager
-                .getAllTypes(BibDatabaseMode.BIBLATEX)
-                .contains(newCustomType)
+            entryTypesManager.getAllTypes(BibDatabaseMode.BIBLATEX).contains(newCustomType)
         );
     }
 
@@ -161,9 +118,7 @@ void overwriteBibEntryTypeFields(BibDatabaseMode mode) {
         entryTypesManager.addCustomOrModifiedType(newCustomType, mode);
         BibEntryType newBibEntryTypeTitle = new BibEntryType(
             CUSTOM_TYPE,
-            Collections.singleton(
-                new BibField(StandardField.TITLE, FieldPriority.IMPORTANT)
-            ),
+            Collections.singleton(new BibField(StandardField.TITLE, FieldPriority.IMPORTANT)),
             Collections.emptySet()
         );
         entryTypesManager.addCustomOrModifiedType(newBibEntryTypeTitle, mode);
@@ -176,10 +131,7 @@ void overwriteBibEntryTypeFields(BibDatabaseMode mode) {
     @ParameterizedTest
     @EnumSource(BibDatabaseMode.class)
     void overwriteStandardTypeRequiredFields(BibDatabaseMode mode) {
-        entryTypesManager.addCustomOrModifiedType(
-            overwrittenStandardType,
-            mode
-        );
+        entryTypesManager.addCustomOrModifiedType(overwrittenStandardType, mode);
         assertEquals(
             Optional.of(overwrittenStandardType),
             entryTypesManager.enrich(overwrittenStandardType.getType(), mode)
@@ -191,29 +143,15 @@ void overwriteStandardTypeRequiredFields(BibDatabaseMode mode) {
     void registeredCustomizedStandardEntryTypeIsNotContainedInListOfCustomEntryTypes(
         BibDatabaseMode mode
     ) {
-        entryTypesManager.addCustomOrModifiedType(
-            overwrittenStandardType,
-            mode
-        );
-        assertEquals(
-            Collections.emptyList(),
-            entryTypesManager.getAllCustomTypes(mode)
-        );
+        entryTypesManager.addCustomOrModifiedType(overwrittenStandardType, mode);
+        assertEquals(Collections.emptyList(), entryTypesManager.getAllCustomTypes(mode));
     }
 
     @ParameterizedTest
     @EnumSource(BibDatabaseMode.class)
     void standardTypeIsStillAccessibleIfOverwritten(BibDatabaseMode mode) {
-        entryTypesManager.addCustomOrModifiedType(
-            overwrittenStandardType,
-            mode
-        );
-        assertFalse(
-            entryTypesManager.isCustomType(
-                overwrittenStandardType.getType(),
-                mode
-            )
-        );
+        entryTypesManager.addCustomOrModifiedType(overwrittenStandardType, mode);
+        assertFalse(entryTypesManager.isCustomType(overwrittenStandardType.getType(), mode));
     }
 
     @ParameterizedTest
@@ -225,19 +163,13 @@ void testsModifyingArticle(BibDatabaseMode mode) {
                 List.of(
                     new BibField(StandardField.TITLE, FieldPriority.IMPORTANT),
                     new BibField(StandardField.NUMBER, FieldPriority.IMPORTANT),
-                    new BibField(
-                        new UnknownField("langid"),
-                        FieldPriority.IMPORTANT
-                    ),
+                    new BibField(new UnknownField("langid"), FieldPriority.IMPORTANT),
                     new BibField(StandardField.COMMENT, FieldPriority.IMPORTANT)
                 ),
                 Collections.emptySet()
             );
 
-        entryTypesManager.addCustomOrModifiedType(
-            overwrittenStandardType,
-            mode
-        );
+        entryTypesManager.addCustomOrModifiedType(overwrittenStandardType, mode);
         assertEquals(
             Collections.singletonList(overwrittenStandardType),
             entryTypesManager
@@ -257,25 +189,15 @@ void testsModifyingArticleWithParsing(BibDatabaseMode mode) {
                 List.of(
                     new BibField(StandardField.TITLE, FieldPriority.IMPORTANT),
                     new BibField(StandardField.NUMBER, FieldPriority.IMPORTANT),
-                    new BibField(
-                        new UnknownField("langid"),
-                        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
-        );
-        Optional<BibEntryType> type = MetaDataParser.parseCustomEntryType(
-            serialized
-        );
+        entryTypesManager.addCustomOrModifiedType(overwrittenStandardType, mode);
+        String serialized = MetaDataSerializer.serializeCustomEntryTypes(overwrittenStandardType);
+        Optional<BibEntryType> type = MetaDataParser.parseCustomEntryType(serialized);
 
         assertEquals(Optional.of(overwrittenStandardType), type);
     }
@@ -289,29 +211,16 @@ void testsModifyingArticleWithParsingKeepsListOrder(BibDatabaseMode mode) {
                 List.of(
                     new BibField(StandardField.TITLE, FieldPriority.IMPORTANT),
                     new BibField(StandardField.NUMBER, FieldPriority.IMPORTANT),
-                    new BibField(
-                        new UnknownField("langid"),
-                        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
-        );
-        Optional<BibEntryType> type = MetaDataParser.parseCustomEntryType(
-            serialized
-        );
+        entryTypesManager.addCustomOrModifiedType(overwrittenStandardType, mode);
+        String serialized = MetaDataSerializer.serializeCustomEntryTypes(overwrittenStandardType);
+        Optional<BibEntryType> type = MetaDataParser.parseCustomEntryType(serialized);
 
-        assertEquals(
-            overwrittenStandardType.getOptionalFields(),
-            type.get().getOptionalFields()
-        );
+        assertEquals(overwrittenStandardType.getOptionalFields(), type.get().getOptionalFields());
     }
 }
diff --git a/src/test/java/org/jabref/model/entry/BibtexStringTest.java b/src/test/java/org/jabref/model/entry/BibtexStringTest.java
index 940d0b135a9..872f5c0ff45 100644
--- a/src/test/java/org/jabref/model/entry/BibtexStringTest.java
+++ b/src/test/java/org/jabref/model/entry/BibtexStringTest.java
@@ -40,10 +40,7 @@ public void cloningDoesNotChangeContents() {
 
     @Test
     public void clonedBibtexStringEqualsOriginalString() {
-        BibtexString bibtexString = new BibtexString(
-            "AAA",
-            "An alternative action"
-        );
+        BibtexString bibtexString = new BibtexString("AAA", "An alternative action");
         bibtexString.setId("ID");
 
         BibtexString clone = (BibtexString) bibtexString.clone();
@@ -80,10 +77,7 @@ public void settingFieldsInACloneWorks() {
     @Test
     public void modifyingACloneDoesNotModifyTheOriginalEntry() {
         // Instantiate
-        BibtexString original = new BibtexString(
-            "AAA",
-            "An alternative action"
-        );
+        BibtexString original = new BibtexString("AAA", "An alternative action");
         original.setId("ID");
 
         BibtexString clone = (BibtexString) original.clone();
diff --git a/src/test/java/org/jabref/model/entry/CanonicalBibEntryTest.java b/src/test/java/org/jabref/model/entry/CanonicalBibEntryTest.java
index f402d1f977f..c16eebf8212 100644
--- a/src/test/java/org/jabref/model/entry/CanonicalBibEntryTest.java
+++ b/src/test/java/org/jabref/model/entry/CanonicalBibEntryTest.java
@@ -28,8 +28,7 @@ public void simpleCanonicalRepresentation() {
         e.setField(StandardField.AUTHOR, "abc");
         e.setField(StandardField.TITLE, "def");
         e.setField(StandardField.JOURNAL, "hij");
-        String canonicalRepresentation =
-            CanonicalBibEntry.getCanonicalRepresentation(e);
+        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}",
             canonicalRepresentation
@@ -41,8 +40,7 @@ public void canonicalRepresentationWithNewlines() {
         BibEntry e = new BibEntry(StandardEntryType.Article);
         e.setCitationKey("key");
         e.setField(StandardField.ABSTRACT, "line 1\nline 2");
-        String canonicalRepresentation =
-            CanonicalBibEntry.getCanonicalRepresentation(e);
+        String canonicalRepresentation = CanonicalBibEntry.getCanonicalRepresentation(e);
         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 ee42abedb89..3bcaa4e6b9d 100644
--- a/src/test/java/org/jabref/model/entry/CrossrefTest.java
+++ b/src/test/java/org/jabref/model/entry/CrossrefTest.java
@@ -76,10 +76,7 @@ void authorInheritance(EntryType parentType, EntryType childType) {
     private static Stream<Arguments> authorInheritanceSource() {
         return Stream.of(
             Arguments.of(StandardEntryType.MvBook, StandardEntryType.InBook),
-            Arguments.of(
-                StandardEntryType.MvBook,
-                StandardEntryType.BookInBook
-            ),
+            Arguments.of(StandardEntryType.MvBook, StandardEntryType.BookInBook),
             Arguments.of(StandardEntryType.MvBook, StandardEntryType.SuppBook),
             Arguments.of(StandardEntryType.Book, StandardEntryType.InBook),
             Arguments.of(StandardEntryType.Book, StandardEntryType.BookInBook),
@@ -111,39 +108,15 @@ private static Stream<Arguments> mainTitleInheritanceSource() {
         return Stream.of(
             Arguments.of(StandardEntryType.MvBook, StandardEntryType.Book),
             Arguments.of(StandardEntryType.MvBook, StandardEntryType.InBook),
-            Arguments.of(
-                StandardEntryType.MvBook,
-                StandardEntryType.BookInBook
-            ),
+            Arguments.of(StandardEntryType.MvBook, StandardEntryType.BookInBook),
             Arguments.of(StandardEntryType.MvBook, StandardEntryType.SuppBook),
-            Arguments.of(
-                StandardEntryType.MvCollection,
-                StandardEntryType.Collection
-            ),
-            Arguments.of(
-                StandardEntryType.MvCollection,
-                StandardEntryType.InCollection
-            ),
-            Arguments.of(
-                StandardEntryType.MvCollection,
-                StandardEntryType.SuppCollection
-            ),
-            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.MvCollection, StandardEntryType.Collection),
+            Arguments.of(StandardEntryType.MvCollection, StandardEntryType.InCollection),
+            Arguments.of(StandardEntryType.MvCollection, StandardEntryType.SuppCollection),
+            Arguments.of(StandardEntryType.MvProceedings, StandardEntryType.Proceedings),
+            Arguments.of(StandardEntryType.MvProceedings, StandardEntryType.InProceedings),
+            Arguments.of(StandardEntryType.MvReference, StandardEntryType.Reference),
+            Arguments.of(StandardEntryType.MvReference, StandardEntryType.InReference)
         );
     }
 
@@ -172,22 +145,10 @@ private static Stream<Arguments> bookTitleInheritanceSource() {
             Arguments.of(StandardEntryType.Book, StandardEntryType.InBook),
             Arguments.of(StandardEntryType.Book, StandardEntryType.BookInBook),
             Arguments.of(StandardEntryType.Book, StandardEntryType.SuppBook),
-            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.Collection, StandardEntryType.InCollection),
+            Arguments.of(StandardEntryType.Collection, StandardEntryType.SuppCollection),
+            Arguments.of(StandardEntryType.Reference, StandardEntryType.InReference),
+            Arguments.of(StandardEntryType.Proceedings, StandardEntryType.InProceedings)
         );
     }
 
@@ -209,14 +170,8 @@ void journalTitleInheritance(EntryType parentType, EntryType childType) {
 
     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.Article),
+            Arguments.of(IEEETranEntryType.Periodical, StandardEntryType.SuppPeriodical)
         );
     }
 
@@ -226,90 +181,38 @@ void noTitleInheritance(EntryType parentType, EntryType childType) {
         parent.setType(parentType);
         child.setType(childType);
 
-        assertTrue(
-            child.getResolvedFieldOrAlias(StandardField.TITLE, db).isEmpty()
-        );
-        assertTrue(
-            child.getResolvedFieldOrAlias(StandardField.SUBTITLE, db).isEmpty()
-        );
-        assertTrue(
-            child
-                .getResolvedFieldOrAlias(StandardField.TITLEADDON, db)
-                .isEmpty()
-        );
-        assertTrue(
-            child
-                .getResolvedFieldOrAlias(StandardField.SHORTTITLE, db)
-                .isEmpty()
-        );
+        assertTrue(child.getResolvedFieldOrAlias(StandardField.TITLE, db).isEmpty());
+        assertTrue(child.getResolvedFieldOrAlias(StandardField.SUBTITLE, db).isEmpty());
+        assertTrue(child.getResolvedFieldOrAlias(StandardField.TITLEADDON, db).isEmpty());
+        assertTrue(child.getResolvedFieldOrAlias(StandardField.SHORTTITLE, db).isEmpty());
     }
 
     private static Stream<Arguments> noTitleInheritanceSource() {
         return Stream.of(
             Arguments.of(StandardEntryType.MvBook, StandardEntryType.Book),
             Arguments.of(StandardEntryType.MvBook, StandardEntryType.InBook),
-            Arguments.of(
-                StandardEntryType.MvBook,
-                StandardEntryType.BookInBook
-            ),
+            Arguments.of(StandardEntryType.MvBook, StandardEntryType.BookInBook),
             Arguments.of(StandardEntryType.MvBook, StandardEntryType.SuppBook),
-            Arguments.of(
-                StandardEntryType.MvCollection,
-                StandardEntryType.Collection
-            ),
-            Arguments.of(
-                StandardEntryType.MvCollection,
-                StandardEntryType.InCollection
-            ),
-            Arguments.of(
-                StandardEntryType.MvCollection,
-                StandardEntryType.SuppCollection
-            ),
-            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.MvCollection, StandardEntryType.Collection),
+            Arguments.of(StandardEntryType.MvCollection, StandardEntryType.InCollection),
+            Arguments.of(StandardEntryType.MvCollection, StandardEntryType.SuppCollection),
+            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.Book, StandardEntryType.InBook),
             Arguments.of(StandardEntryType.Book, StandardEntryType.BookInBook),
             Arguments.of(StandardEntryType.Book, StandardEntryType.SuppBook),
-            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.Collection, StandardEntryType.InCollection),
+            Arguments.of(StandardEntryType.Collection, StandardEntryType.SuppCollection),
+            Arguments.of(StandardEntryType.Reference, StandardEntryType.InReference),
+            Arguments.of(StandardEntryType.Proceedings, StandardEntryType.InProceedings)
         );
     }
 
     @ParameterizedTest
     @MethodSource("sameNameInheritance")
-    void sameNameInheritance(
-        EntryType parentType,
-        EntryType childType,
-        StandardField field
-    ) {
+    void sameNameInheritance(EntryType parentType, EntryType childType, StandardField field) {
         parent.setType(parentType);
         child.setType(childType);
 
diff --git a/src/test/java/org/jabref/model/entry/DateTest.java b/src/test/java/org/jabref/model/entry/DateTest.java
index 6ac42808a89..a632d3790b6 100644
--- a/src/test/java/org/jabref/model/entry/DateTest.java
+++ b/src/test/java/org/jabref/model/entry/DateTest.java
@@ -24,30 +24,12 @@ class DateTest {
 
     private static Stream<Arguments> validDates() {
         return Stream.of(
-            Arguments.of(
-                LocalDateTime.of(2018, Month.OCTOBER, 3, 7, 24),
-                "2018-10-03T07:24"
-            ),
-            Arguments.of(
-                LocalDateTime.of(2018, Month.OCTOBER, 3, 17, 2),
-                "2018-10-03T17:2"
-            ),
-            Arguments.of(
-                LocalDateTime.of(2018, Month.OCTOBER, 3, 7, 24),
-                "2018-10-03T7:24"
-            ),
-            Arguments.of(
-                LocalDateTime.of(2018, Month.OCTOBER, 3, 7, 7),
-                "2018-10-03T7:7"
-            ),
-            Arguments.of(
-                LocalDateTime.of(2018, Month.OCTOBER, 3, 7, 0),
-                "2018-10-03T07"
-            ),
-            Arguments.of(
-                LocalDateTime.of(2018, Month.OCTOBER, 3, 7, 0),
-                "2018-10-03T7"
-            ),
+            Arguments.of(LocalDateTime.of(2018, Month.OCTOBER, 3, 7, 24), "2018-10-03T07:24"),
+            Arguments.of(LocalDateTime.of(2018, Month.OCTOBER, 3, 17, 2), "2018-10-03T17:2"),
+            Arguments.of(LocalDateTime.of(2018, Month.OCTOBER, 3, 7, 24), "2018-10-03T7:24"),
+            Arguments.of(LocalDateTime.of(2018, Month.OCTOBER, 3, 7, 7), "2018-10-03T7:7"),
+            Arguments.of(LocalDateTime.of(2018, Month.OCTOBER, 3, 7, 0), "2018-10-03T07"),
+            Arguments.of(LocalDateTime.of(2018, Month.OCTOBER, 3, 7, 0), "2018-10-03T7"),
             Arguments.of(LocalDate.of(2009, Month.JANUARY, 15), "2009-1-15"),
             Arguments.of(YearMonth.of(2009, Month.NOVEMBER), "2009-11"),
             Arguments.of(LocalDate.of(2012, Month.JANUARY, 15), "15-1-2012"),
@@ -55,28 +37,16 @@ private static Stream<Arguments> validDates() {
             Arguments.of(YearMonth.of(2015, Month.SEPTEMBER), "9/2015"),
             Arguments.of(YearMonth.of(2015, Month.SEPTEMBER), "09/2015"),
             Arguments.of(YearMonth.of(2015, Month.SEPTEMBER), "9/15"),
-            Arguments.of(
-                LocalDate.of(2015, Month.SEPTEMBER, 1),
-                "September 1, 2015"
-            ),
-            Arguments.of(
-                YearMonth.of(2015, Month.SEPTEMBER),
-                "September, 2015"
-            ),
+            Arguments.of(LocalDate.of(2015, Month.SEPTEMBER, 1), "September 1, 2015"),
+            Arguments.of(YearMonth.of(2015, Month.SEPTEMBER), "September, 2015"),
             Arguments.of(LocalDate.of(2015, Month.JANUARY, 15), "15.1.2015"),
             Arguments.of(LocalDate.of(2015, Month.JANUARY, 15), "2015.1.15"),
             Arguments.of(Year.of(2015), "2015"),
             Arguments.of(YearMonth.of(2020, Month.JANUARY), "Jan, 2020"),
             Arguments.of(LocalDate.of(2015, Month.OCTOBER, 15), "2015.10.15"),
-            Arguments.of(
-                LocalDate.of(-10000, Month.OCTOBER, 15),
-                "-10000-10-15"
-            ),
+            Arguments.of(LocalDate.of(-10000, Month.OCTOBER, 15), "-10000-10-15"),
             Arguments.of(YearMonth.of(2015, Month.NOVEMBER), "2015/11"),
-            Arguments.of(
-                LocalDate.of(2015, Month.JANUARY, 15),
-                "15 January 2015"
-            ),
+            Arguments.of(LocalDate.of(2015, Month.JANUARY, 15), "15 January 2015"),
             Arguments.of(Year.of(2015), "2015-"),
             Arguments.of(Year.of(2015), "2015?"),
             Arguments.of(Year.of(-29), "30 BC"),
diff --git a/src/test/java/org/jabref/model/entry/EntryLinkListTest.java b/src/test/java/org/jabref/model/entry/EntryLinkListTest.java
index 94de93bd172..5497852e0ca 100644
--- a/src/test/java/org/jabref/model/entry/EntryLinkListTest.java
+++ b/src/test/java/org/jabref/model/entry/EntryLinkListTest.java
@@ -59,9 +59,7 @@ public void givenFieldValueAndDatabaseWhenParsingThenExpectLink() {
 
     @Test
     public void givenBibEntryWhenParsingThenExpectLink() {
-        ParsedEntryLink expected = new ParsedEntryLink(
-            new BibEntry().withCitationKey("key")
-        );
+        ParsedEntryLink expected = new ParsedEntryLink(new BibEntry().withCitationKey("key"));
         assertFalse(expected.getLinkedEntry().isEmpty());
     }
 
@@ -78,9 +76,7 @@ public void givenTargetAndSourceWhenSourceCrossrefTargetThenSourceCrossrefsTarge
     }
 
     private void assertSourceCrossrefsTarget(BibEntry target, BibEntry source) {
-        Optional<String> sourceCrossref = source.getField(
-            StandardField.CROSSREF
-        );
+        Optional<String> sourceCrossref = source.getField(StandardField.CROSSREF);
         Optional<String> targetCiteKey = target.getCitationKey();
         assertEquals(sourceCrossref, targetCiteKey);
     }
diff --git a/src/test/java/org/jabref/model/entry/KeywordListTest.java b/src/test/java/org/jabref/model/entry/KeywordListTest.java
index a91b7b7f131..8dc6e0fa400 100644
--- a/src/test/java/org/jabref/model/entry/KeywordListTest.java
+++ b/src/test/java/org/jabref/model/entry/KeywordListTest.java
@@ -23,10 +23,7 @@ public void parseEmptyStringReturnsEmptyList() throws Exception {
 
     @Test
     public void parseOneWordReturnsOneKeyword() throws Exception {
-        assertEquals(
-            new KeywordList("keywordOne"),
-            KeywordList.parse("keywordOne", ',')
-        );
+        assertEquals(new KeywordList("keywordOne"), KeywordList.parse("keywordOne", ','));
     }
 
     @Test
@@ -46,8 +43,7 @@ public void parseTwoWordReturnsTwoKeywordsWithoutSpace() throws Exception {
     }
 
     @Test
-    public void parseTwoWordReturnsTwoKeywordsWithDifferentDelimiter()
-        throws Exception {
+    public void parseTwoWordReturnsTwoKeywordsWithDifferentDelimiter() throws Exception {
         assertEquals(
             new KeywordList("keywordOne", "keywordTwo"),
             KeywordList.parse("keywordOne| keywordTwo", '|')
@@ -56,15 +52,11 @@ public void parseTwoWordReturnsTwoKeywordsWithDifferentDelimiter()
 
     @Test
     public 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
-    public void parseWordsWithWhitespaceAndCommaReturnsTwoKeyword()
-        throws Exception {
+    public void parseWordsWithWhitespaceAndCommaReturnsTwoKeyword() throws Exception {
         assertEquals(
             new KeywordList("keyword and one", "and two"),
             KeywordList.parse("keyword and one, and two", ',')
@@ -89,10 +81,7 @@ public void parseTakeDelimiterNotRegexWhite() throws Exception {
 
     @Test
     public void parseWordsWithBracketsReturnsOneKeyword() throws Exception {
-        assertEquals(
-            new KeywordList("[a] keyword"),
-            KeywordList.parse("[a] keyword", ',')
-        );
+        assertEquals(new KeywordList("[a] keyword"), KeywordList.parse("[a] keyword", ','));
     }
 
     @Test
@@ -117,51 +106,31 @@ public void parseTwoHierarchicalChains() throws Exception {
 
         assertEquals(
             new KeywordList(expectedOne, expectedTwo),
-            KeywordList.parse(
-                "Parent1 > Node1 > Child1, Parent2 > Node2 > Child2",
-                ',',
-                '>'
-            )
+            KeywordList.parse("Parent1 > Node1 > Child1, Parent2 > Node2 > Child2", ',', '>')
         );
     }
 
     @Test
     public void mergeTwoIdenticalKeywordsShouldReturnOnKeyword() {
-        assertEquals(
-            new KeywordList("JabRef"),
-            KeywordList.merge("JabRef", "JabRef", ',')
-        );
+        assertEquals(new KeywordList("JabRef"), KeywordList.merge("JabRef", "JabRef", ','));
     }
 
     @Test
     public void mergeOneEmptyKeywordAnAnotherNonEmptyShouldReturnTheNonEmptyKeyword() {
-        assertEquals(
-            new KeywordList("JabRef"),
-            KeywordList.merge("", "JabRef", ',')
-        );
+        assertEquals(new KeywordList("JabRef"), KeywordList.merge("", "JabRef", ','));
     }
 
     @Test
     public void mergeTwoDistinctKeywordsShouldReturnTheTwoKeywordsMerged() {
-        assertEquals(
-            new KeywordList("Figma", "JabRef"),
-            KeywordList.merge("Figma", "JabRef", ',')
-        );
-        assertEquals(
-            new KeywordList("JabRef", "Figma"),
-            KeywordList.merge("Figma", "JabRef", ',')
-        );
+        assertEquals(new KeywordList("Figma", "JabRef"), KeywordList.merge("Figma", "JabRef", ','));
+        assertEquals(new KeywordList("JabRef", "Figma"), KeywordList.merge("Figma", "JabRef", ','));
     }
 
     @Test
     public void mergeTwoListsOfKeywordsShouldReturnTheKeywordsMerged() {
         assertEquals(
             new KeywordList("Figma", "Adobe", "JabRef", "Eclipse", "JetBrains"),
-            KeywordList.merge(
-                "Figma, Adobe, JetBrains, Eclipse",
-                "Adobe, JabRef",
-                ','
-            )
+            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 809072ba3dd..1f88106897b 100644
--- a/src/test/java/org/jabref/model/entry/KeywordTest.java
+++ b/src/test/java/org/jabref/model/entry/KeywordTest.java
@@ -11,10 +11,7 @@ public class KeywordTest {
     @Test
     public void getPathFromRootAsStringForSimpleChain() throws Exception {
         Keyword keywordChain = Keyword.of("A", "B", "C");
-        assertEquals(
-            "A > B",
-            keywordChain.getChild().get().getPathFromRootAsString('>')
-        );
+        assertEquals("A > B", keywordChain.getChild().get().getPathFromRootAsString('>'));
     }
 
     @Test
diff --git a/src/test/java/org/jabref/model/entry/MonthTest.java b/src/test/java/org/jabref/model/entry/MonthTest.java
index 35b9d23a642..3d099b9d6ed 100644
--- a/src/test/java/org/jabref/model/entry/MonthTest.java
+++ b/src/test/java/org/jabref/model/entry/MonthTest.java
@@ -180,10 +180,7 @@ private static Stream<Arguments> parseSpecialCases() {
 
     @ParameterizedTest
     @MethodSource("parseGermanShortMonthTest")
-    public void parseGermanShortMonthTest(
-        Optional<Month> expected,
-        String input
-    ) {
+    public void parseGermanShortMonthTest(Optional<Month> expected, String input) {
         assertEquals(expected, Month.parseGermanShortMonth(input));
     }
 
@@ -246,10 +243,7 @@ private static Stream<Arguments> getMonthByNumberTest() {
 
     @ParameterizedTest
     @MethodSource({ "parseShortName", "getMonthByShortNameSpecialCases" })
-    public void getMonthByShortNameLowercaseTest(
-        Optional<Month> expected,
-        String input
-    ) {
+    public void getMonthByShortNameLowercaseTest(Optional<Month> expected, String input) {
         assertEquals(expected, Month.getMonthByShortName(input));
     }
 
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 79135a7e3f2..e4527203ad0 100644
--- a/src/test/java/org/jabref/model/entry/field/FieldFactoryTest.java
+++ b/src/test/java/org/jabref/model/entry/field/FieldFactoryTest.java
@@ -16,10 +16,7 @@ class FieldFactoryTest {
     void testOrFieldsTwoTerms() {
         assertEquals(
             "Aaa/Bbb",
-            FieldFactory.serializeOrFields(
-                new UnknownField("aaa"),
-                new UnknownField("bbb")
-            )
+            FieldFactory.serializeOrFields(new UnknownField("aaa"), new UnknownField("bbb"))
         );
     }
 
@@ -38,14 +35,8 @@ void testOrFieldsThreeTerms() {
     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("user1"), "comment-user1"),
+            Arguments.of(new UserSpecificCommentField("other-user-id"), "comment-other-user-id"),
             // unknown field
             Arguments.of(new UnknownField("cased", "cAsEd"), "cAsEd")
         );
@@ -59,20 +50,14 @@ void fieldsWithoutFieldProperties(Field expected, String name) {
 
     @Test
     void testDoesNotParseApaFieldWithoutEntryType() {
-        assertNotEquals(
-            BiblatexApaField.ARTICLE,
-            FieldFactory.parseField("article")
-        );
+        assertNotEquals(BiblatexApaField.ARTICLE, FieldFactory.parseField("article"));
     }
 
     @Test
     void testDoesParseApaFieldWithEntryType() {
         assertEquals(
             BiblatexApaField.ARTICLE,
-            FieldFactory.parseField(
-                BiblatexApaEntryType.Constitution,
-                "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 db95c43df9d..d22d306f3fb 100644
--- a/src/test/java/org/jabref/model/entry/field/SpecialFieldTest.java
+++ b/src/test/java/org/jabref/model/entry/field/SpecialFieldTest.java
@@ -9,10 +9,7 @@ public class SpecialFieldTest {
 
     @Test
     public 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/identifier/ArXivIdentifierTest.java b/src/test/java/org/jabref/model/entry/identifier/ArXivIdentifierTest.java
index 3e3a49cfac1..0eac3343dca 100644
--- a/src/test/java/org/jabref/model/entry/identifier/ArXivIdentifierTest.java
+++ b/src/test/java/org/jabref/model/entry/identifier/ArXivIdentifierTest.java
@@ -17,104 +17,66 @@ void parse() throws Exception {
 
     @Test
     void parseWithArXivPrefix() throws Exception {
-        Optional<ArXivIdentifier> parsed = ArXivIdentifier.parse(
-            "arXiv:0710.0994"
-        );
+        Optional<ArXivIdentifier> parsed = ArXivIdentifier.parse("arXiv:0710.0994");
 
         assertEquals(Optional.of(new ArXivIdentifier("0710.0994")), parsed);
     }
 
     @Test
     void parseWithArxivPrefix() throws Exception {
-        Optional<ArXivIdentifier> parsed = ArXivIdentifier.parse(
-            "arxiv:0710.0994"
-        );
+        Optional<ArXivIdentifier> parsed = ArXivIdentifier.parse("arxiv:0710.0994");
 
         assertEquals(Optional.of(new ArXivIdentifier("0710.0994")), parsed);
     }
 
     @Test
     void parseWithClassification() throws Exception {
-        Optional<ArXivIdentifier> parsed = ArXivIdentifier.parse(
-            "0706.0001v1 [q-bio.CB]"
-        );
+        Optional<ArXivIdentifier> parsed = ArXivIdentifier.parse("0706.0001v1 [q-bio.CB]");
 
-        assertEquals(
-            Optional.of(new ArXivIdentifier("0706.0001", "1", "q-bio.CB")),
-            parsed
-        );
+        assertEquals(Optional.of(new ArXivIdentifier("0706.0001", "1", "q-bio.CB")), parsed);
     }
 
     @Test
     void parseWithArXivPrefixAndClassification() throws Exception {
-        Optional<ArXivIdentifier> parsed = ArXivIdentifier.parse(
-            "arXiv:0706.0001v1 [q-bio.CB]"
-        );
+        Optional<ArXivIdentifier> parsed = ArXivIdentifier.parse("arXiv:0706.0001v1 [q-bio.CB]");
 
-        assertEquals(
-            Optional.of(new ArXivIdentifier("0706.0001", "1", "q-bio.CB")),
-            parsed
-        );
+        assertEquals(Optional.of(new ArXivIdentifier("0706.0001", "1", "q-bio.CB")), parsed);
     }
 
     @Test
     void parseOldIdentifier() throws Exception {
-        Optional<ArXivIdentifier> parsed = ArXivIdentifier.parse(
-            "math.GT/0309136"
-        );
+        Optional<ArXivIdentifier> parsed = ArXivIdentifier.parse("math.GT/0309136");
 
-        assertEquals(
-            Optional.of(new ArXivIdentifier("math.GT/0309136", "math.GT")),
-            parsed
-        );
+        assertEquals(Optional.of(new ArXivIdentifier("math.GT/0309136", "math.GT")), parsed);
     }
 
     @Test
     public void acceptLegacyEprint() {
-        Optional<ArXivIdentifier> parsed = ArXivIdentifier.parse(
-            "astro-ph.GT/1234567"
-        );
+        Optional<ArXivIdentifier> parsed = ArXivIdentifier.parse("astro-ph.GT/1234567");
         assertEquals(
-            Optional.of(
-                new ArXivIdentifier("astro-ph.GT/1234567", "astro-ph.GT")
-            ),
+            Optional.of(new ArXivIdentifier("astro-ph.GT/1234567", "astro-ph.GT")),
             parsed
         );
     }
 
     @Test
     public void acceptLegacyMathEprint() {
-        Optional<ArXivIdentifier> parsed = ArXivIdentifier.parse(
-            "math/1234567"
-        );
-        assertEquals(
-            Optional.of(new ArXivIdentifier("math/1234567", "math")),
-            parsed
-        );
+        Optional<ArXivIdentifier> parsed = ArXivIdentifier.parse("math/1234567");
+        assertEquals(Optional.of(new ArXivIdentifier("math/1234567", "math")), parsed);
     }
 
     @Test
     void parseOldIdentifierWithArXivPrefix() throws Exception {
-        Optional<ArXivIdentifier> parsed = ArXivIdentifier.parse(
-            "arXiv:math.GT/0309136"
-        );
+        Optional<ArXivIdentifier> parsed = ArXivIdentifier.parse("arXiv:math.GT/0309136");
 
-        assertEquals(
-            Optional.of(new ArXivIdentifier("math.GT/0309136", "math.GT")),
-            parsed
-        );
+        assertEquals(Optional.of(new ArXivIdentifier("math.GT/0309136", "math.GT")), parsed);
     }
 
     @Test
     void parseUrl() throws Exception {
-        Optional<ArXivIdentifier> parsed = ArXivIdentifier.parse(
-            "http://arxiv.org/abs/1502.05795"
-        );
+        Optional<ArXivIdentifier> parsed = ArXivIdentifier.parse("http://arxiv.org/abs/1502.05795");
 
-        assertEquals(
-            Optional.of(new ArXivIdentifier("1502.05795", "")),
-            parsed
-        );
+        assertEquals(Optional.of(new ArXivIdentifier("1502.05795", "")), parsed);
     }
 
     @Test
@@ -123,22 +85,14 @@ void parseHttpsUrl() throws Exception {
             "https://arxiv.org/abs/1502.05795"
         );
 
-        assertEquals(
-            Optional.of(new ArXivIdentifier("1502.05795", "")),
-            parsed
-        );
+        assertEquals(Optional.of(new ArXivIdentifier("1502.05795", "")), parsed);
     }
 
     @Test
     void parsePdfUrl() throws Exception {
-        Optional<ArXivIdentifier> parsed = ArXivIdentifier.parse(
-            "http://arxiv.org/pdf/1502.05795"
-        );
+        Optional<ArXivIdentifier> parsed = ArXivIdentifier.parse("http://arxiv.org/pdf/1502.05795");
 
-        assertEquals(
-            Optional.of(new ArXivIdentifier("1502.05795", "")),
-            parsed
-        );
+        assertEquals(Optional.of(new ArXivIdentifier("1502.05795", "")), parsed);
     }
 
     @Test
@@ -147,10 +101,7 @@ void parseUrlWithVersion() throws Exception {
             "http://arxiv.org/abs/1502.05795v1"
         );
 
-        assertEquals(
-            Optional.of(new ArXivIdentifier("1502.05795", "1", "")),
-            parsed
-        );
+        assertEquals(Optional.of(new ArXivIdentifier("1502.05795", "1", "")), parsed);
     }
 
     @Test
@@ -159,10 +110,7 @@ void parseOldUrlWithVersion() throws Exception {
             "http://arxiv.org/pdf/hep-ex/0307015v1"
         );
 
-        assertEquals(
-            Optional.of(new ArXivIdentifier("hep-ex/0307015", "1", "hep-ex")),
-            parsed
-        );
+        assertEquals(Optional.of(new ArXivIdentifier("hep-ex/0307015", "1", "hep-ex")), parsed);
     }
 
     @Test
@@ -180,47 +128,30 @@ public void acceptPlainEprint() {
     @Test
     public void acceptPlainEprintWithVersion() {
         Optional<ArXivIdentifier> parsed = ArXivIdentifier.parse("0706.0001v1");
-        assertEquals(
-            Optional.of(new ArXivIdentifier("0706.0001", "v1", "")),
-            parsed
-        );
+        assertEquals(Optional.of(new ArXivIdentifier("0706.0001", "v1", "")), parsed);
     }
 
     @Test
     public void acceptArxivPrefix() {
-        Optional<ArXivIdentifier> parsed = ArXivIdentifier.parse(
-            "arXiv:0706.0001v1"
-        );
-        assertEquals(
-            Optional.of(new ArXivIdentifier("0706.0001", "v1", "")),
-            parsed
-        );
+        Optional<ArXivIdentifier> parsed = ArXivIdentifier.parse("arXiv:0706.0001v1");
+        assertEquals(Optional.of(new ArXivIdentifier("0706.0001", "v1", "")), parsed);
     }
 
     @Test
     public void ignoreLeadingAndTrailingWhitespaces() {
-        Optional<ArXivIdentifier> parsed = ArXivIdentifier.parse(
-            "  0706.0001v1 "
-        );
-        assertEquals(
-            Optional.of(new ArXivIdentifier("0706.0001", "v1", "")),
-            parsed
-        );
+        Optional<ArXivIdentifier> parsed = ArXivIdentifier.parse("  0706.0001v1 ");
+        assertEquals(Optional.of(new ArXivIdentifier("0706.0001", "v1", "")), parsed);
     }
 
     @Test
     public void rejectEmbeddedEprint() {
-        Optional<ArXivIdentifier> parsed = ArXivIdentifier.parse(
-            "other stuff 0706.0001v1 end"
-        );
+        Optional<ArXivIdentifier> parsed = ArXivIdentifier.parse("other stuff 0706.0001v1 end");
         assertEquals(Optional.empty(), parsed);
     }
 
     @Test
     public void rejectInvalidEprint() {
-        Optional<ArXivIdentifier> parsed = ArXivIdentifier.parse(
-            "https://thisisnouri"
-        );
+        Optional<ArXivIdentifier> parsed = ArXivIdentifier.parse("https://thisisnouri");
         assertEquals(Optional.empty(), parsed);
     }
 
@@ -229,10 +160,7 @@ public void acceptUrlHttpEprint() {
         Optional<ArXivIdentifier> parsed = ArXivIdentifier.parse(
             "http://arxiv.org/abs/0706.0001v1"
         );
-        assertEquals(
-            Optional.of(new ArXivIdentifier("0706.0001", "v1", "")),
-            parsed
-        );
+        assertEquals(Optional.of(new ArXivIdentifier("0706.0001", "v1", "")), parsed);
     }
 
     @Test
@@ -240,10 +168,7 @@ public void acceptUrlHttpsEprint() {
         Optional<ArXivIdentifier> parsed = ArXivIdentifier.parse(
             "https://arxiv.org/abs/0706.0001v1"
         );
-        assertEquals(
-            Optional.of(new ArXivIdentifier("0706.0001", "v1", "")),
-            parsed
-        );
+        assertEquals(Optional.of(new ArXivIdentifier("0706.0001", "v1", "")), parsed);
     }
 
     @Test
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 6e20e30394e..13b99329200 100644
--- a/src/test/java/org/jabref/model/entry/identifier/DOITest.java
+++ b/src/test/java/org/jabref/model/entry/identifier/DOITest.java
@@ -17,51 +17,33 @@ public class DOITest {
     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.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.1126/sciadv.1500214",
-                new DOI("10.1126/sciadv.1500214").getDOI()
+                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
             Arguments.of("10/gf4gqc", new DOI("10/gf4gqc").getDOI()),
             Arguments.of("10/1000", new DOI("10/1000").getDOI()),
             Arguments.of("10/aaaa", new DOI("10/aaaa").getDOI()),
             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()),
             // acceptURNPrefix
             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()
-            ),
+            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",
@@ -69,10 +51,7 @@ private static Stream<Arguments> testData() {
             ),
             // acceptShortcutShortDoi
             Arguments.of("10/d8dn", new DOI("https://doi.org/d8dn").getDOI()),
-            Arguments.of(
-                "10/d8dn",
-                new DOI(" https://doi.org/d8dn  ").getDOI()
-            ),
+            Arguments.of("10/d8dn", new DOI(" https://doi.org/d8dn  ").getDOI()),
             Arguments.of("10/d8dn", new DOI("doi.org/d8dn").getDOI()),
             Arguments.of("10/d8dn", new DOI("www.doi.org/d8dn").getDOI()),
             Arguments.of("10/d8dn", new DOI("  doi.org/d8dn ").getDOI()),
@@ -80,15 +59,9 @@ private static Stream<Arguments> testData() {
             Arguments.of("10/gf4gqc", new DOI("urn:10/gf4gqc").getDOI()),
             Arguments.of("10/gf4gqc", new DOI("doi:10/gf4gqc").getDOI()),
             Arguments.of("10/gf4gqc", new DOI("urn:doi:10/gf4gqc").getDOI()),
-            Arguments.of(
-                "10/gf4gqc",
-                new DOI("http://doi.org/urn:doi:10/gf4gqc").getDOI()
-            ),
+            Arguments.of("10/gf4gqc", new DOI("http://doi.org/urn:doi:10/gf4gqc").getDOI()),
             // : is also allowed as divider, will be replaced by RESOLVER
-            Arguments.of(
-                "10:gf4gqc",
-                new DOI("http://doi.org/urn:doi:10:gf4gqc").getDOI()
-            ),
+            Arguments.of("10:gf4gqc", new DOI("http://doi.org/urn:doi:10:gf4gqc").getDOI()),
             // acceptURLDoi
             // http
             Arguments.of(
@@ -124,103 +97,51 @@ private static Stream<Arguments> testData() {
             ),
             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()
+                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",
-                new DOI("http://dx.doi.net/10.1007/978-3-642-15618-2_19")
-                    .getDOI()
+                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",
-                new DOI("http://dx.doi.com/10.1007/978-3-642-15618-2_19")
-                    .getDOI()
+                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",
-                new DOI("http://dx.doi.de/10.1007/978-3-642-15618-2_19")
-                    .getDOI()
+                new DOI("http://dx.doi.de/10.1007/978-3-642-15618-2_19").getDOI()
             ),
             Arguments.of(
                 "10.4108/ICST.COLLABORATECOM2009.8275",
-                new DOI(
-                    "http://dx.doi.org/10.4108/ICST.COLLABORATECOM2009.8275"
-                )
-                    .getDOI()
+                new DOI("http://dx.doi.org/10.4108/ICST.COLLABORATECOM2009.8275").getDOI()
             ),
             Arguments.of(
                 "10.1109/MIC.2012.43",
-                new DOI(
-                    "http://doi.ieeecomputersociety.org/10.1109/MIC.2012.43"
-                )
-                    .getDOI()
+                new DOI("http://doi.ieeecomputersociety.org/10.1109/MIC.2012.43").getDOI()
             ),
             // acceptURLShortDoi
             // http
-            Arguments.of(
-                "10/gf4gqc",
-                new DOI("http://doi.org/10/gf4gqc").getDOI()
-            ),
+            Arguments.of("10/gf4gqc", new DOI("http://doi.org/10/gf4gqc").getDOI()),
             // https
-            Arguments.of(
-                "10/gf4gqc",
-                new DOI("https://doi.org/10/gf4gqc").getDOI()
-            ),
+            Arguments.of("10/gf4gqc", new DOI("https://doi.org/10/gf4gqc").getDOI()),
             // https with % divider
-            Arguments.of(
-                "10/gf4gqc",
-                new DOI("https://dx.doi.org/10%2Fgf4gqc").getDOI()
-            ),
+            Arguments.of("10/gf4gqc", new DOI("https://dx.doi.org/10%2Fgf4gqc").getDOI()),
             // other domains
-            Arguments.of(
-                "10/gf4gqc",
-                new DOI("http://doi.acm.org/10/gf4gqc").getDOI()
-            ),
-            Arguments.of(
-                "10/gf4gqc",
-                new DOI("www.doi.acm.org/10/gf4gqc").getDOI()
-            ),
-            Arguments.of(
-                "10/gf4gqc",
-                new DOI("doi.acm.org/10/gf4gqc").getDOI()
-            ),
+            Arguments.of("10/gf4gqc", new DOI("http://doi.acm.org/10/gf4gqc").getDOI()),
+            Arguments.of("10/gf4gqc", new DOI("www.doi.acm.org/10/gf4gqc").getDOI()),
+            Arguments.of("10/gf4gqc", new DOI("doi.acm.org/10/gf4gqc").getDOI()),
             Arguments.of("10/gf4gqc", new DOI("10/gf4gqc").getDOI()),
             Arguments.of("10/gf4gqc", new DOI("/10/gf4gqc").getDOI()),
             Arguments.of("10/gf4gqc", new DOI(" /10/gf4gqc").getDOI()),
             Arguments.of("10/gf4gqc", new DOI(" 10/gf4gqc").getDOI()),
-            Arguments.of(
-                "10/gf4gqc",
-                new DOI("http://doi.acm.net/10/gf4gqc").getDOI()
-            ),
-            Arguments.of(
-                "10/gf4gqc",
-                new DOI("http://doi.acm.com/10/gf4gqc").getDOI()
-            ),
-            Arguments.of(
-                "10/gf4gqc",
-                new DOI("http://doi.acm.de/10/gf4gqc").getDOI()
-            ),
-            Arguments.of(
-                "10/gf4gqc",
-                new DOI("http://dx.doi.org/10/gf4gqc").getDOI()
-            ),
-            Arguments.of(
-                "10/gf4gqc",
-                new DOI("http://dx.doi.net/10/gf4gqc").getDOI()
-            ),
-            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.acm.net/10/gf4gqc").getDOI()),
+            Arguments.of("10/gf4gqc", new DOI("http://doi.acm.com/10/gf4gqc").getDOI()),
+            Arguments.of("10/gf4gqc", new DOI("http://doi.acm.de/10/gf4gqc").getDOI()),
+            Arguments.of("10/gf4gqc", new DOI("http://dx.doi.org/10/gf4gqc").getDOI()),
+            Arguments.of("10/gf4gqc", new DOI("http://dx.doi.net/10/gf4gqc").getDOI()),
+            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()
@@ -236,10 +157,7 @@ private static Stream<Arguments> testData() {
             // parse short DOI with whitespace
             Arguments.of(
                 "https://doi.org/10/gf4gqc",
-                DOI
-                    .parse("https : / / doi.org / 10 / gf4gqc")
-                    .get()
-                    .getURIAsASCIIString()
+                DOI.parse("https : / / doi.org / 10 / gf4gqc").get().getURIAsASCIIString()
             ),
             // parse DOI with non-ASCII characters and whitespace
             Arguments.of(
@@ -251,55 +169,38 @@ private static Stream<Arguments> testData() {
             ),
             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()
+                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 already-cleaned DOI
-            Arguments.of(
-                "10.3218/3846-0",
-                DOI.parse("10.3218/3846-0").get().getDOI()
-            ),
+            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",
-                new DOI("https://doi.org/10.1006/rwei.1999%25.0001")
-                    .getURIAsASCIIString()
+                new DOI("https://doi.org/10.1006/rwei.1999%25.0001").getURIAsASCIIString()
             ),
             // " -> (%22)
             Arguments.of(
                 "https://doi.org/10.1006/rwei.1999%22.0001",
-                new DOI("https://doi.org/10.1006/rwei.1999%22.0001")
-                    .getURIAsASCIIString()
+                new DOI("https://doi.org/10.1006/rwei.1999%22.0001").getURIAsASCIIString()
             ),
             // # -> (%23)
             Arguments.of(
                 "https://doi.org/10.1006/rwei.1999%23.0001",
-                new DOI("https://doi.org/10.1006/rwei.1999%23.0001")
-                    .getURIAsASCIIString()
+                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",
-                new DOI("https://doi.org/10.1006/rwei.1999%20.0001")
-                    .getURIAsASCIIString()
+                new DOI("https://doi.org/10.1006/rwei.1999%20.0001").getURIAsASCIIString()
             ),
             // ? -> (%3F)
             Arguments.of(
                 "https://doi.org/10.1006/rwei.1999%3F.0001",
-                new DOI("https://doi.org/10.1006/rwei.1999%3F.0001")
-                    .getURIAsASCIIString()
+                new DOI("https://doi.org/10.1006/rwei.1999%3F.0001").getURIAsASCIIString()
             ),
             // constructCorrectURLForDoi
             // add / to RESOLVER url if missing
@@ -309,18 +210,14 @@ private static Stream<Arguments> testData() {
             ),
             Arguments.of(
                 "https://doi.org/10.1006/jmbi.1998.2354",
-                new DOI("https://doi.org/10.1006/jmbi.1998.2354")
-                    .getURIAsASCIIString()
+                new DOI("https://doi.org/10.1006/jmbi.1998.2354").getURIAsASCIIString()
             ),
             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)
@@ -351,10 +248,7 @@ private static Stream<Arguments> testData() {
             // findDoiInsideArbitraryText
             Arguments.of(
                 "10.1006/jmbi.1998.2354",
-                DOI
-                    .findInText("other stuff 10.1006/jmbi.1998.2354 end")
-                    .get()
-                    .getDOI()
+                DOI.findInText("other stuff 10.1006/jmbi.1998.2354 end").get().getDOI()
             ),
             Arguments.of(
                 "10.1007/s10549-018-4743-9",
@@ -386,54 +280,26 @@ private static Stream<Arguments> testData() {
             Arguments.of(
                 "10.1007/s10549-018-4743-9.1234",
                 DOI
-                    .findInText(
-                        "bla doi:10.1007/s10549-018-4743-9.1234 with . in 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 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()
+                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 "
+                        "10/B(C)/15 \n" + " \n" + "10:51 \n" + " \n" + " \n" + "doi.org/10/1234 "
                     )
                     .get()
                     .getDOI()
@@ -445,31 +311,20 @@ private static Stream<Arguments> testData() {
             ),
             Arguments.of(
                 "10/76543",
-                DOI
-                    .findInText("other stuff www.doi.org/76543 end")
-                    .get()
-                    .getDOI()
+                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()
+                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()
+                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"
-                    )
+                    .findInText("https://www.scitepress.org/Link.aspx?doi=10.5220/0010404301780189")
                     .get()
                     .getDOI()
             ),
@@ -488,10 +343,7 @@ public void testEquals(String expected, String input) {
 
     @Test
     public void equalsWorksFor2017Doi() {
-        assertEquals(
-            new DOI("10.1109/cloud.2017.89"),
-            new DOI("10.1109/CLOUD.2017.89")
-        );
+        assertEquals(new DOI("10.1109/cloud.2017.89"), new DOI("10.1109/CLOUD.2017.89"));
     }
 
     @Test
@@ -501,19 +353,10 @@ public void isShortDoiShouldReturnTrueWhenItIsShortDoi() {
 
     @Test
     public void noDOIFoundInsideArbitraryText() {
-        assertEquals(
-            Optional.empty(),
-            DOI.findInText("text without 28282 a doi")
-        );
+        assertEquals(Optional.empty(), DOI.findInText("text without 28282 a doi"));
         assertEquals(Optional.empty(), DOI.findInText("It's 10:30 o'clock"));
-        assertEquals(
-            Optional.empty(),
-            DOI.findInText("...archive number 10/XYZ/123...")
-        );
-        assertEquals(
-            Optional.empty(),
-            DOI.findInText("some website poi.org/ab123 end")
-        );
+        assertEquals(Optional.empty(), DOI.findInText("...archive number 10/XYZ/123..."));
+        assertEquals(Optional.empty(), DOI.findInText("some website poi.org/ab123 end"));
     }
 
     @Test
@@ -553,31 +396,16 @@ public void rejectEmbeddedDoi() {
 
     @Test
     public void rejectEmbeddedShortDoi() {
-        assertThrows(
-            IllegalArgumentException.class,
-            () -> new DOI("other stuff 10/gf4gqc end")
-        );
-        assertThrows(
-            IllegalArgumentException.class,
-            () -> new DOI("10/2021/01")
-        );
-        assertThrows(
-            IllegalArgumentException.class,
-            () -> new DOI("01/10/2021")
-        );
-        assertThrows(
-            IllegalArgumentException.class,
-            () -> new DOI("https://www.abc.de/10/abcd")
-        );
+        assertThrows(IllegalArgumentException.class, () -> new DOI("other stuff 10/gf4gqc end"));
+        assertThrows(IllegalArgumentException.class, () -> new DOI("10/2021/01"));
+        assertThrows(IllegalArgumentException.class, () -> new DOI("01/10/2021"));
+        assertThrows(IllegalArgumentException.class, () -> new DOI("https://www.abc.de/10/abcd"));
     }
 
     @Test
     public void rejectInvalidDirectoryIndicator() {
         // wrong directory indicator
-        assertThrows(
-            IllegalArgumentException.class,
-            () -> new DOI("12.1006/jmbi.1998.2354 end")
-        );
+        assertThrows(IllegalArgumentException.class, () -> new DOI("12.1006/jmbi.1998.2354 end"));
     }
 
     @Test
@@ -594,26 +422,17 @@ public void emptyOrUndescoreOnlyReturnsEmpty() {
 
     @Test
     public void rejectInvalidDoiUri() {
-        assertThrows(
-            IllegalArgumentException.class,
-            () -> new DOI("https://thisisnouri")
-        );
+        assertThrows(IllegalArgumentException.class, () -> new DOI("https://thisisnouri"));
     }
 
     @Test
     public void rejectMissingDivider() {
         // missing divider
-        assertThrows(
-            IllegalArgumentException.class,
-            () -> new DOI("10.1006jmbi.1998.2354 end")
-        );
+        assertThrows(IllegalArgumentException.class, () -> new DOI("10.1006jmbi.1998.2354 end"));
     }
 
     @Test
     public void rejectMissingDividerInShortDoi() {
-        assertThrows(
-            IllegalArgumentException.class,
-            () -> new DOI("10gf4gqc end")
-        );
+        assertThrows(IllegalArgumentException.class, () -> new DOI("10gf4gqc end"));
     }
 }
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 cc04fec863f..f2af68185be 100644
--- a/src/test/java/org/jabref/model/entry/identifier/IacrEprintTest.java
+++ b/src/test/java/org/jabref/model/entry/identifier/IacrEprintTest.java
@@ -14,51 +14,27 @@ public 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("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
     public void rejectInvalidIacrEprint() {
-        assertThrows(
-            IllegalArgumentException.class,
-            () -> new IacrEprint("2021/12")
-        );
+        assertThrows(IllegalArgumentException.class, () -> new IacrEprint("2021/12"));
     }
 
     @ParameterizedTest(name = "{index} {0}")
     @MethodSource("provideTestData")
-    public void acceptCorrectIacrEprintIdentifier(
-        String name,
-        String identifier
-    ) {
+    public void acceptCorrectIacrEprintIdentifier(String name, String identifier) {
         assertEquals("2019/001", new IacrEprint(identifier).getNormalized());
     }
 
     @Test
     public void constructValidIacrEprintUrl() {
-        assertEquals(
-            "https://ia.cr/2019/001",
-            new IacrEprint("2019/001").getAsciiUrl()
-        );
+        assertEquals("https://ia.cr/2019/001", new IacrEprint("2019/001").getAsciiUrl());
     }
 }
diff --git a/src/test/java/org/jabref/model/groups/AutomaticKeywordGroupTest.java b/src/test/java/org/jabref/model/groups/AutomaticKeywordGroupTest.java
index 74fba4a5bc9..6a520e174b4 100644
--- a/src/test/java/org/jabref/model/groups/AutomaticKeywordGroupTest.java
+++ b/src/test/java/org/jabref/model/groups/AutomaticKeywordGroupTest.java
@@ -19,8 +19,7 @@ void createSubgroupsForTwoKeywords() throws Exception {
             ',',
             '>'
         );
-        BibEntry entry = new BibEntry()
-            .withField(StandardField.KEYWORDS, "A, B");
+        BibEntry entry = new BibEntry().withField(StandardField.KEYWORDS, "A, B");
 
         Set<GroupTreeNode> expected = createIncludingKeywordsSubgroup();
 
@@ -36,8 +35,7 @@ void createSubgroupsIgnoresEmptyKeyword() throws Exception {
             ',',
             '>'
         );
-        BibEntry entry = new BibEntry()
-            .withField(StandardField.KEYWORDS, "A, ,B");
+        BibEntry entry = new BibEntry().withField(StandardField.KEYWORDS, "A, ,B");
 
         Set<GroupTreeNode> expected = createIncludingKeywordsSubgroup();
 
diff --git a/src/test/java/org/jabref/model/groups/AutomaticPersonsGroupTest.java b/src/test/java/org/jabref/model/groups/AutomaticPersonsGroupTest.java
index 765857de613..7fe36e08890 100644
--- a/src/test/java/org/jabref/model/groups/AutomaticPersonsGroupTest.java
+++ b/src/test/java/org/jabref/model/groups/AutomaticPersonsGroupTest.java
@@ -12,9 +12,7 @@
 
 class AutomaticPersonsGroupTest {
 
-    private static GroupTreeNode[] createPersonSubGroupFrom(
-        String... lastNames
-    ) {
+    private static GroupTreeNode[] createPersonSubGroupFrom(String... lastNames) {
         return Arrays
             .stream(lastNames)
             .map(lastName ->
@@ -60,8 +58,7 @@ void createSubgroupsContainingSpaceSeparatedNames() {
 
     @Test
     void createSubgroupFromLatex() {
-        BibEntry bibEntry = new BibEntry()
-            .withField(StandardField.AUTHOR, "Kurt G{\\\"{o}}del");
+        BibEntry bibEntry = new BibEntry().withField(StandardField.AUTHOR, "Kurt G{\\\"{o}}del");
         var subgroup = new AutomaticPersonsGroup(
             "",
             GroupHierarchyType.INDEPENDENT,
@@ -74,8 +71,7 @@ void createSubgroupFromLatex() {
 
     @Test
     void createSubgroupFromUnicode() {
-        BibEntry bibEntry = new BibEntry()
-            .withField(StandardField.AUTHOR, "Kurt Gödel");
+        BibEntry bibEntry = new BibEntry().withField(StandardField.AUTHOR, "Kurt Gödel");
         var subgroup = new AutomaticPersonsGroup(
             "",
             GroupHierarchyType.INDEPENDENT,
diff --git a/src/test/java/org/jabref/model/groups/ExplicitGroupTest.java b/src/test/java/org/jabref/model/groups/ExplicitGroupTest.java
index b5e7c2a6a11..2eddb05d431 100644
--- a/src/test/java/org/jabref/model/groups/ExplicitGroupTest.java
+++ b/src/test/java/org/jabref/model/groups/ExplicitGroupTest.java
@@ -19,28 +19,15 @@ class ExplicitGroupTest {
 
     @BeforeEach
     void setUp() {
-        group =
-            new ExplicitGroup(
-                "myExplicitGroup",
-                GroupHierarchyType.INDEPENDENT,
-                ','
-            );
-        group2 =
-            new ExplicitGroup(
-                "myExplicitGroup2",
-                GroupHierarchyType.INCLUDING,
-                ','
-            );
+        group = new ExplicitGroup("myExplicitGroup", GroupHierarchyType.INDEPENDENT, ',');
+        group2 = new ExplicitGroup("myExplicitGroup2", GroupHierarchyType.INCLUDING, ',');
         entry = new BibEntry();
     }
 
     @Test
     void addSingleGroupToEmptyBibEntryChangesGroupsField() {
         group.add(entry);
-        assertEquals(
-            Optional.of("myExplicitGroup"),
-            entry.getField(StandardField.GROUPS)
-        );
+        assertEquals(Optional.of("myExplicitGroup"), entry.getField(StandardField.GROUPS));
     }
 
     @Test
@@ -67,10 +54,7 @@ void addTwoGroupsToBibEntryChangesGroupsField() {
     void addDuplicateGroupDoesNotChangeGroupsField() throws Exception {
         entry.setField(StandardField.GROUPS, "myExplicitGroup");
         group.add(entry);
-        assertEquals(
-            Optional.of("myExplicitGroup"),
-            entry.getField(StandardField.GROUPS)
-        );
+        assertEquals(Optional.of("myExplicitGroup"), entry.getField(StandardField.GROUPS));
     }
 
     @Test
diff --git a/src/test/java/org/jabref/model/groups/GroupTreeNodeTest.java b/src/test/java/org/jabref/model/groups/GroupTreeNodeTest.java
index 2a69fa5ab75..db8c1e67be2 100644
--- a/src/test/java/org/jabref/model/groups/GroupTreeNodeTest.java
+++ b/src/test/java/org/jabref/model/groups/GroupTreeNodeTest.java
@@ -33,15 +33,9 @@ public class GroupTreeNodeTest {
      *          B ExplicitNode, Refining (<-- this)
      */
     public static GroupTreeNode getNodeInSimpleTree(GroupTreeNode root) {
-        root.addSubgroup(
-            new ExplicitGroup("ExplicitA", GroupHierarchyType.INCLUDING, ',')
-        );
+        root.addSubgroup(new ExplicitGroup("ExplicitA", GroupHierarchyType.INCLUDING, ','));
         GroupTreeNode parent = root.addSubgroup(
-            new ExplicitGroup(
-                "ExplicitParent",
-                GroupHierarchyType.INDEPENDENT,
-                ','
-            )
+            new ExplicitGroup("ExplicitParent", GroupHierarchyType.INDEPENDENT, ',')
         );
         return parent.addSubgroup(
             new ExplicitGroup("ExplicitNode", GroupHierarchyType.REFINING, ',')
@@ -67,22 +61,14 @@ public static GroupTreeNode getNodeInSimpleTree(GroupTreeNode root) {
      */
     public static GroupTreeNode getNodeInComplexTree(GroupTreeNode root) {
         root.addSubgroup(getSearchGroup("SearchA"));
-        root.addSubgroup(
-            new ExplicitGroup("ExplicitA", GroupHierarchyType.INCLUDING, ',')
-        );
+        root.addSubgroup(new ExplicitGroup("ExplicitA", GroupHierarchyType.INCLUDING, ','));
         GroupTreeNode grandParent = root.addSubgroup(
-            new ExplicitGroup(
-                "ExplicitGrandParent",
-                GroupHierarchyType.INDEPENDENT,
-                ','
-            )
+            new ExplicitGroup("ExplicitGrandParent", GroupHierarchyType.INDEPENDENT, ',')
         );
         root.addSubgroup(getKeywordGroup("KeywordA"));
 
         grandParent.addSubgroup(getExplict("ExplicitB"));
-        GroupTreeNode parent = grandParent.addSubgroup(
-            getKeywordGroup("KeywordParent")
-        );
+        GroupTreeNode parent = grandParent.addSubgroup(getKeywordGroup("KeywordParent"));
         grandParent.addSubgroup(getSearchGroup("SearchB"));
         grandParent.addSubgroup(getKeywordGroup("KeywordB"));
 
@@ -147,10 +133,7 @@ void setUp() {
         entries.clear();
         entry = new BibEntry();
         entries.add(entry);
-        entries.add(
-            new BibEntry()
-                .withField(StandardField.AUTHOR, "author1 and author2")
-        );
+        entries.add(new BibEntry().withField(StandardField.AUTHOR, "author1 and author2"));
         entries.add(new BibEntry().withField(StandardField.AUTHOR, "author1"));
     }
 
@@ -303,11 +286,7 @@ void findMatchesWorksForHierarchyOfIndependentGroups() {
     @Test
     void setGroupChangesUnderlyingGroup() {
         GroupTreeNode node = getNodeInSimpleTree();
-        AbstractGroup newGroup = new ExplicitGroup(
-            "NewGroup",
-            GroupHierarchyType.INDEPENDENT,
-            ','
-        );
+        AbstractGroup newGroup = new ExplicitGroup("NewGroup", GroupHierarchyType.INDEPENDENT, ',');
 
         node.setGroup(newGroup, true, true, entries);
 
@@ -316,18 +295,10 @@ void setGroupChangesUnderlyingGroup() {
 
     @Test
     void setGroupAddsPreviousAssignmentsExplicitToExplicit() {
-        ExplicitGroup oldGroup = new ExplicitGroup(
-            "OldGroup",
-            GroupHierarchyType.INDEPENDENT,
-            ','
-        );
+        ExplicitGroup oldGroup = new ExplicitGroup("OldGroup", GroupHierarchyType.INDEPENDENT, ',');
         oldGroup.add(entry);
         GroupTreeNode node = GroupTreeNode.fromGroup(oldGroup);
-        AbstractGroup newGroup = new ExplicitGroup(
-            "NewGroup",
-            GroupHierarchyType.INDEPENDENT,
-            ','
-        );
+        AbstractGroup newGroup = new ExplicitGroup("NewGroup", GroupHierarchyType.INDEPENDENT, ',');
 
         node.setGroup(newGroup, true, true, entries);
 
@@ -336,18 +307,10 @@ void setGroupAddsPreviousAssignmentsExplicitToExplicit() {
 
     @Test
     void setGroupWithFalseDoesNotAddsPreviousAssignments() {
-        ExplicitGroup oldGroup = new ExplicitGroup(
-            "OldGroup",
-            GroupHierarchyType.INDEPENDENT,
-            ','
-        );
+        ExplicitGroup oldGroup = new ExplicitGroup("OldGroup", GroupHierarchyType.INDEPENDENT, ',');
         oldGroup.add(entry);
         GroupTreeNode node = GroupTreeNode.fromGroup(oldGroup);
-        AbstractGroup newGroup = new ExplicitGroup(
-            "NewGroup",
-            GroupHierarchyType.INDEPENDENT,
-            ','
-        );
+        AbstractGroup newGroup = new ExplicitGroup("NewGroup", GroupHierarchyType.INDEPENDENT, ',');
 
         node.setGroup(newGroup, false, false, entries);
 
@@ -356,18 +319,10 @@ void setGroupWithFalseDoesNotAddsPreviousAssignments() {
 
     @Test
     void setGroupAddsOnlyPreviousAssignments() {
-        ExplicitGroup oldGroup = new ExplicitGroup(
-            "OldGroup",
-            GroupHierarchyType.INDEPENDENT,
-            ','
-        );
+        ExplicitGroup oldGroup = new ExplicitGroup("OldGroup", GroupHierarchyType.INDEPENDENT, ',');
         assertFalse(oldGroup.isMatch(entry));
         GroupTreeNode node = GroupTreeNode.fromGroup(oldGroup);
-        AbstractGroup newGroup = new ExplicitGroup(
-            "NewGroup",
-            GroupHierarchyType.INDEPENDENT,
-            ','
-        );
+        AbstractGroup newGroup = new ExplicitGroup("NewGroup", GroupHierarchyType.INDEPENDENT, ',');
 
         node.setGroup(newGroup, true, true, entries);
 
@@ -376,11 +331,7 @@ void setGroupAddsOnlyPreviousAssignments() {
 
     @Test
     void setGroupExplicitToSearchDoesNotKeepPreviousAssignments() {
-        ExplicitGroup oldGroup = new ExplicitGroup(
-            "OldGroup",
-            GroupHierarchyType.INDEPENDENT,
-            ','
-        );
+        ExplicitGroup oldGroup = new ExplicitGroup("OldGroup", GroupHierarchyType.INDEPENDENT, ',');
         oldGroup.add(entry);
         GroupTreeNode node = GroupTreeNode.fromGroup(oldGroup);
         AbstractGroup newGroup = new SearchGroup(
@@ -397,18 +348,10 @@ void setGroupExplicitToSearchDoesNotKeepPreviousAssignments() {
 
     @Test
     void setGroupExplicitToExplicitIsRenameAndSoRemovesPreviousAssignment() {
-        ExplicitGroup oldGroup = new ExplicitGroup(
-            "OldGroup",
-            GroupHierarchyType.INDEPENDENT,
-            ','
-        );
+        ExplicitGroup oldGroup = new ExplicitGroup("OldGroup", GroupHierarchyType.INDEPENDENT, ',');
         oldGroup.add(entry);
         GroupTreeNode node = GroupTreeNode.fromGroup(oldGroup);
-        AbstractGroup newGroup = new ExplicitGroup(
-            "NewGroup",
-            GroupHierarchyType.INDEPENDENT,
-            ','
-        );
+        AbstractGroup newGroup = new ExplicitGroup("NewGroup", GroupHierarchyType.INDEPENDENT, ',');
 
         node.setGroup(newGroup, true, true, entries);
 
@@ -420,10 +363,7 @@ void getChildByPathFindsCorrectChildInSecondLevel() {
         GroupTreeNode root = getRoot();
         GroupTreeNode child = getNodeInSimpleTree(root);
 
-        assertEquals(
-            Optional.of(child),
-            root.getChildByPath("ExplicitParent > ExplicitNode")
-        );
+        assertEquals(Optional.of(child), root.getChildByPath("ExplicitParent > ExplicitNode"));
     }
 
     @Test
@@ -433,10 +373,7 @@ void getChildByPathDoesNotFindChildWhenInvalidPath() {
         // use side effect of method, which builds the group tree
         getNodeInSimpleTree(root);
 
-        assertEquals(
-            Optional.empty(),
-            root.getChildByPath("ExplicitParent > ExplicitChildNode")
-        );
+        assertEquals(Optional.empty(), root.getChildByPath("ExplicitParent > ExplicitChildNode"));
     }
 
     @Test
@@ -449,60 +386,36 @@ void getPathSimpleTree() {
     @Test
     void onlyRootAndChildNodeContainAtLeastOneEntry() {
         GroupTreeNode rootNode = getRoot();
-        rootNode.addSubgroup(
-            new ExplicitGroup("ExplicitA", GroupHierarchyType.INCLUDING, ',')
-        );
+        rootNode.addSubgroup(new ExplicitGroup("ExplicitA", GroupHierarchyType.INCLUDING, ','));
         GroupTreeNode parent = rootNode.addSubgroup(
-            new ExplicitGroup(
-                "ExplicitParent",
-                GroupHierarchyType.INDEPENDENT,
-                ','
-            )
+            new ExplicitGroup("ExplicitParent", GroupHierarchyType.INDEPENDENT, ',')
         );
         GroupTreeNode child = parent.addSubgroup(
             new ExplicitGroup("ExplicitNode", GroupHierarchyType.REFINING, ',')
         );
 
-        BibEntry newEntry = new BibEntry()
-            .withField(StandardField.AUTHOR, "Stephen King");
+        BibEntry newEntry = new BibEntry().withField(StandardField.AUTHOR, "Stephen King");
         child.addEntriesToGroup(Collections.singletonList(newEntry));
         entries.add(newEntry);
 
-        assertEquals(
-            rootNode.getContainingGroups(entries, false),
-            Arrays.asList(rootNode, child)
-        );
+        assertEquals(rootNode.getContainingGroups(entries, false), Arrays.asList(rootNode, child));
     }
 
     @Test
     void onlySubgroupsContainAllEntries() {
         GroupTreeNode rootNode = getRoot();
-        rootNode.addSubgroup(
-            new ExplicitGroup("ExplicitA", GroupHierarchyType.INCLUDING, ',')
-        );
+        rootNode.addSubgroup(new ExplicitGroup("ExplicitA", GroupHierarchyType.INCLUDING, ','));
         GroupTreeNode parent = rootNode.addSubgroup(
-            new ExplicitGroup(
-                "ExplicitParent",
-                GroupHierarchyType.INDEPENDENT,
-                ','
-            )
+            new ExplicitGroup("ExplicitParent", GroupHierarchyType.INDEPENDENT, ',')
         );
         GroupTreeNode firstChild = parent.addSubgroup(
             new ExplicitGroup("ExplicitNode", GroupHierarchyType.REFINING, ',')
         );
         GroupTreeNode secondChild = parent.addSubgroup(
-            new ExplicitGroup(
-                "ExplicitSecondNode",
-                GroupHierarchyType.REFINING,
-                ','
-            )
+            new ExplicitGroup("ExplicitSecondNode", GroupHierarchyType.REFINING, ',')
         );
         GroupTreeNode grandChild = secondChild.addSubgroup(
-            new ExplicitGroup(
-                "ExplicitNodeThirdLevel",
-                GroupHierarchyType.REFINING,
-                ','
-            )
+            new ExplicitGroup("ExplicitNodeThirdLevel", GroupHierarchyType.REFINING, ',')
         );
 
         parent.addEntriesToGroup(Collections.singletonList(entry));
@@ -540,9 +453,7 @@ void removeEntriesFromGroupWorksNotForGroupsNotSupportingExplicitRemovalOfEntrie
                 EnumSet.of(SearchRules.SearchFlags.CASE_SENSITIVE)
             )
         );
-        List<FieldChange> fieldChanges = searchGroup.removeEntriesFromGroup(
-            entries
-        );
+        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 4f12b1af2f0..aa8287bc8b3 100644
--- a/src/test/java/org/jabref/model/groups/TexGroupTest.java
+++ b/src/test/java/org/jabref/model/groups/TexGroupTest.java
@@ -26,9 +26,7 @@ public void setUp() throws Exception {
 
     @Test
     public void containsReturnsTrueForEntryInAux() throws Exception {
-        Path auxFile = Path.of(
-            TexGroupTest.class.getResource("paper.aux").toURI()
-        );
+        Path auxFile = Path.of(TexGroupTest.class.getResource("paper.aux").toURI());
         TexGroup group = new TexGroup(
             "paper",
             GroupHierarchyType.INDEPENDENT,
@@ -45,9 +43,7 @@ public void containsReturnsTrueForEntryInAux() throws Exception {
 
     @Test
     public void containsReturnsTrueForEntryNotInAux() throws Exception {
-        Path auxFile = Path.of(
-            TexGroupTest.class.getResource("paper.aux").toURI()
-        );
+        Path auxFile = Path.of(TexGroupTest.class.getResource("paper.aux").toURI());
         TexGroup group = new TexGroup(
             "paper",
             GroupHierarchyType.INDEPENDENT,
@@ -64,9 +60,7 @@ public void containsReturnsTrueForEntryNotInAux() throws Exception {
 
     @Test
     public void getFilePathReturnsRelativePath() throws Exception {
-        Path auxFile = Path.of(
-            TexGroupTest.class.getResource("paper.aux").toURI()
-        );
+        Path auxFile = Path.of(TexGroupTest.class.getResource("paper.aux").toURI());
         String user = "Darwin";
         metaData.setLatexFileDirectory(user, auxFile.getParent());
         TexGroup group = new TexGroup(
diff --git a/src/test/java/org/jabref/model/groups/WordKeywordGroupTest.java b/src/test/java/org/jabref/model/groups/WordKeywordGroupTest.java
index 74d1541f262..fdc1f70d21b 100644
--- a/src/test/java/org/jabref/model/groups/WordKeywordGroupTest.java
+++ b/src/test/java/org/jabref/model/groups/WordKeywordGroupTest.java
@@ -61,30 +61,21 @@ public void containsFindsSameWord() {
 
     @Test
     public void containsFindsWordInSentence() throws Exception {
-        entry.setField(
-            StandardField.KEYWORDS,
-            "Some sentence containing test word"
-        );
+        entry.setField(StandardField.KEYWORDS, "Some sentence containing test word");
 
         assertTrue(testGroup.contains(entry));
     }
 
     @Test
     public void containsFindsWordInCommaSeparatedList() throws Exception {
-        entry.setField(
-            StandardField.KEYWORDS,
-            "Some,list,containing,test,word"
-        );
+        entry.setField(StandardField.KEYWORDS, "Some,list,containing,test,word");
 
         assertTrue(testGroup.contains(entry));
     }
 
     @Test
     public void containsFindsWordInSemicolonSeparatedList() throws Exception {
-        entry.setField(
-            StandardField.KEYWORDS,
-            "Some;list;containing;test;word"
-        );
+        entry.setField(StandardField.KEYWORDS, "Some;list;containing;test;word");
 
         assertTrue(testGroup.contains(entry));
     }
@@ -98,10 +89,7 @@ public void containsFindsSameComplexWord() throws Exception {
 
     @Test
     public void containsFindsComplexWordInSentence() throws Exception {
-        entry.setField(
-            StandardField.KEYWORDS,
-            "Some sentence containing \\H2O word"
-        );
+        entry.setField(StandardField.KEYWORDS, "Some sentence containing \\H2O word");
 
         assertTrue(waterGroup.contains(entry));
     }
@@ -114,12 +102,8 @@ public void containsDoesNotFindWordIfCaseDiffers() throws Exception {
     }
 
     @Test
-    public void containsDoesNotFindsWordInSentenceIfCaseDiffers()
-        throws Exception {
-        entry.setField(
-            StandardField.KEYWORDS,
-            "Some sentence containing Test word"
-        );
+    public void containsDoesNotFindsWordInSentenceIfCaseDiffers() throws Exception {
+        entry.setField(StandardField.KEYWORDS, "Some sentence containing Test word");
 
         assertFalse(testCaseSensitiveGroup.contains(entry));
     }
@@ -128,10 +112,7 @@ public void containsDoesNotFindsWordInSentenceIfCaseDiffers()
     public void addChangesFieldIfEmptyBefore() throws Exception {
         testGroup.add(entry);
 
-        assertEquals(
-            Optional.of("test"),
-            entry.getField(StandardField.KEYWORDS)
-        );
+        assertEquals(Optional.of("test"), entry.getField(StandardField.KEYWORDS));
     }
 
     @Test
@@ -139,10 +120,7 @@ public void addChangesFieldIfNotEmptyBefore() throws Exception {
         entry.setField(StandardField.KEYWORDS, "bla, blubb");
         testGroup.add(entry);
 
-        assertEquals(
-            Optional.of("bla, blubb, test"),
-            entry.getField(StandardField.KEYWORDS)
-        );
+        assertEquals(Optional.of("bla, blubb, test"), entry.getField(StandardField.KEYWORDS));
     }
 
     @Test
@@ -150,10 +128,7 @@ public void addDoesNotAddDuplicate() throws Exception {
         entry.setField(StandardField.KEYWORDS, "test, blubb");
         testGroup.add(entry);
 
-        assertEquals(
-            Optional.of("test, blubb"),
-            entry.getField(StandardField.KEYWORDS)
-        );
+        assertEquals(Optional.of("test, blubb"), entry.getField(StandardField.KEYWORDS));
     }
 
     @Test
@@ -161,10 +136,7 @@ public void removeDoesNothingIfEntryNotMatched() throws Exception {
         entry.setField(StandardField.KEYWORDS, "something");
         testGroup.remove(entry);
 
-        assertEquals(
-            Optional.of("something"),
-            entry.getField(StandardField.KEYWORDS)
-        );
+        assertEquals(Optional.of("something"), entry.getField(StandardField.KEYWORDS));
     }
 
     @Test
@@ -172,9 +144,6 @@ public void removeRemovesNameFromField() throws Exception {
         entry.setField(StandardField.KEYWORDS, "test, blubb");
         testGroup.remove(entry);
 
-        assertEquals(
-            Optional.of("blubb"),
-            entry.getField(StandardField.KEYWORDS)
-        );
+        assertEquals(Optional.of("blubb"), entry.getField(StandardField.KEYWORDS));
     }
 }
diff --git a/src/test/java/org/jabref/model/openoffice/CitationEntryTest.java b/src/test/java/org/jabref/model/openoffice/CitationEntryTest.java
index b422b86479b..81ebbbf31f9 100644
--- a/src/test/java/org/jabref/model/openoffice/CitationEntryTest.java
+++ b/src/test/java/org/jabref/model/openoffice/CitationEntryTest.java
@@ -11,11 +11,7 @@ class CitationEntryTest {
 
     @Test
     void testCitationEntryInitialPageInfo() {
-        CitationEntry citationEntry = new CitationEntry(
-            "RefMark",
-            "Context",
-            "Info"
-        );
+        CitationEntry citationEntry = new CitationEntry("RefMark", "Context", "Info");
         assertTrue(citationEntry.getPageInfo().isPresent());
         assertEquals("Info", citationEntry.getPageInfo().get());
         assertEquals("RefMark", citationEntry.getRefMarkName());
@@ -24,11 +20,7 @@ void testCitationEntryInitialPageInfo() {
 
     @Test
     void testCitationEntryOptionalInitialPageInfo() {
-        CitationEntry citationEntry = new CitationEntry(
-            "RefMark",
-            "Context",
-            Optional.of("Info")
-        );
+        CitationEntry citationEntry = new CitationEntry("RefMark", "Context", Optional.of("Info"));
 
         assertEquals(Optional.of("Info"), citationEntry.getPageInfo());
         assertEquals("RefMark", citationEntry.getRefMarkName());
@@ -37,11 +29,7 @@ void testCitationEntryOptionalInitialPageInfo() {
 
     @Test
     void testCitationEntryInitalPageInfoChanged() {
-        CitationEntry citationEntry = new CitationEntry(
-            "RefMark",
-            "Context",
-            "Info"
-        );
+        CitationEntry citationEntry = new CitationEntry("RefMark", "Context", "Info");
         assertEquals(Optional.of("Info"), citationEntry.getPageInfo());
     }
 
@@ -53,21 +41,9 @@ void testCitationEntryNoInitialPageInfo() {
 
     @Test
     void testCitationEntryEquals() {
-        CitationEntry citationEntry1 = new CitationEntry(
-            "RefMark",
-            "Context",
-            "Info"
-        );
-        CitationEntry citationEntry2 = new CitationEntry(
-            "RefMark2",
-            "Context",
-            "Info"
-        );
-        CitationEntry citationEntry3 = new CitationEntry(
-            "RefMark",
-            "Other Context",
-            "Other Info"
-        );
+        CitationEntry citationEntry1 = new CitationEntry("RefMark", "Context", "Info");
+        CitationEntry citationEntry2 = new CitationEntry("RefMark2", "Context", "Info");
+        CitationEntry citationEntry3 = new CitationEntry("RefMark", "Other Context", "Other Info");
         assertEquals(citationEntry1, citationEntry1);
         assertEquals(citationEntry1, citationEntry3);
         assertNotEquals(citationEntry1, citationEntry2);
@@ -76,21 +52,9 @@ void testCitationEntryEquals() {
 
     @Test
     void testCitationEntryCompareTo() {
-        CitationEntry citationEntry1 = new CitationEntry(
-            "RefMark",
-            "Context",
-            "Info"
-        );
-        CitationEntry citationEntry2 = new CitationEntry(
-            "RefMark2",
-            "Context",
-            "Info"
-        );
-        CitationEntry citationEntry3 = new CitationEntry(
-            "RefMark",
-            "Other Context",
-            "Other Info"
-        );
+        CitationEntry citationEntry1 = new CitationEntry("RefMark", "Context", "Info");
+        CitationEntry citationEntry2 = new CitationEntry("RefMark2", "Context", "Info");
+        CitationEntry citationEntry3 = new CitationEntry("RefMark", "Other Context", "Other Info");
         assertEquals(0, citationEntry1.compareTo(citationEntry3));
         assertEquals(-1, citationEntry1.compareTo(citationEntry2));
         assertEquals(1, citationEntry2.compareTo(citationEntry1));
diff --git a/src/test/java/org/jabref/model/pdf/FileAnnotationTest.java b/src/test/java/org/jabref/model/pdf/FileAnnotationTest.java
index 2e1e9885396..85d263d3cb1 100644
--- a/src/test/java/org/jabref/model/pdf/FileAnnotationTest.java
+++ b/src/test/java/org/jabref/model/pdf/FileAnnotationTest.java
@@ -49,9 +49,6 @@ public void testAbbreviateAnnotationName() {
             Optional.empty()
         );
 
-        assertEquals(
-            "this is an annotation that is very long and g...",
-            fileAnnotation.toString()
-        );
+        assertEquals("this is an annotation that is very long and g...", fileAnnotation.toString());
     }
 }
diff --git a/src/test/java/org/jabref/model/search/rules/ContainsBasedSearchRuleTest.java b/src/test/java/org/jabref/model/search/rules/ContainsBasedSearchRuleTest.java
index 7e552c579f9..37a6887073e 100644
--- a/src/test/java/org/jabref/model/search/rules/ContainsBasedSearchRuleTest.java
+++ b/src/test/java/org/jabref/model/search/rules/ContainsBasedSearchRuleTest.java
@@ -19,28 +19,24 @@ public class ContainsBasedSearchRuleTest {
         .withField(StandardField.TITLE, "Marine finfish larviculture in Europe")
         .withField(StandardField.YEAR, "2001")
         .withField(StandardField.AUTHOR, "Kevin Shields");
-    private final ContainsBasedSearchRule bsCaseSensitive =
-        new ContainsBasedSearchRule(
-            EnumSet.of(
-                SearchRules.SearchFlags.CASE_SENSITIVE,
-                SearchRules.SearchFlags.REGULAR_EXPRESSION
-            )
-        );
-    private final ContainsBasedSearchRule bsCaseInsensitive =
-        new ContainsBasedSearchRule(
-            EnumSet.of(SearchRules.SearchFlags.REGULAR_EXPRESSION)
-        );
-    private final RegexBasedSearchRule bsCaseSensitiveRegexp =
-        new RegexBasedSearchRule(
-            EnumSet.of(
-                SearchRules.SearchFlags.CASE_SENSITIVE,
-                SearchRules.SearchFlags.REGULAR_EXPRESSION
-            )
-        );
-    private final RegexBasedSearchRule bsCaseInsensitiveRegexp =
-        new RegexBasedSearchRule(
-            EnumSet.of(SearchRules.SearchFlags.REGULAR_EXPRESSION)
-        );
+    private final ContainsBasedSearchRule bsCaseSensitive = new ContainsBasedSearchRule(
+        EnumSet.of(
+            SearchRules.SearchFlags.CASE_SENSITIVE,
+            SearchRules.SearchFlags.REGULAR_EXPRESSION
+        )
+    );
+    private final ContainsBasedSearchRule bsCaseInsensitive = new ContainsBasedSearchRule(
+        EnumSet.of(SearchRules.SearchFlags.REGULAR_EXPRESSION)
+    );
+    private final RegexBasedSearchRule bsCaseSensitiveRegexp = new RegexBasedSearchRule(
+        EnumSet.of(
+            SearchRules.SearchFlags.CASE_SENSITIVE,
+            SearchRules.SearchFlags.REGULAR_EXPRESSION
+        )
+    );
+    private final RegexBasedSearchRule bsCaseInsensitiveRegexp = new RegexBasedSearchRule(
+        EnumSet.of(SearchRules.SearchFlags.REGULAR_EXPRESSION)
+    );
 
     @Test
     public void testContentOfSingleField() {
diff --git a/src/test/java/org/jabref/model/search/rules/GrammarBasedSearchRuleTest.java b/src/test/java/org/jabref/model/search/rules/GrammarBasedSearchRuleTest.java
index b995377abf9..cb9f4870386 100644
--- a/src/test/java/org/jabref/model/search/rules/GrammarBasedSearchRuleTest.java
+++ b/src/test/java/org/jabref/model/search/rules/GrammarBasedSearchRuleTest.java
@@ -81,10 +81,7 @@ void searchForAnyFieldWorks() {
         String query = "anyfield:fruit";
         assertTrue(searchRule.validateSearchStrings(query));
         assertTrue(
-            searchRule.applyRule(
-                query,
-                new BibEntry().withField(StandardField.KEYWORDS, "fruit")
-            )
+            searchRule.applyRule(query, new BibEntry().withField(StandardField.KEYWORDS, "fruit"))
         );
     }
 
@@ -98,10 +95,7 @@ void searchForAnyKeywordWorks() {
         String query = "anykeyword:apple";
         assertTrue(searchRule.validateSearchStrings(query));
         assertTrue(
-            searchRule.applyRule(
-                query,
-                new BibEntry().withField(StandardField.KEYWORDS, "apple")
-            )
+            searchRule.applyRule(query, new BibEntry().withField(StandardField.KEYWORDS, "apple"))
         );
         assertFalse(
             searchRule.applyRule(
@@ -118,12 +112,7 @@ void searchForCitationKeyWorks() {
         );
         String query = "citationkey==miller2005";
         assertTrue(searchRule.validateSearchStrings(query));
-        assertTrue(
-            searchRule.applyRule(
-                query,
-                new BibEntry().withCitationKey("miller2005")
-            )
-        );
+        assertTrue(searchRule.applyRule(query, new BibEntry().withCitationKey("miller2005")));
     }
 
     @Test
@@ -133,21 +122,13 @@ void searchForThesisEntryTypeWorks() {
         );
         String query = "entrytype=thesis";
         assertTrue(searchRule.validateSearchStrings(query));
-        assertTrue(
-            searchRule.applyRule(
-                query,
-                new BibEntry(StandardEntryType.PhdThesis)
-            )
-        );
+        assertTrue(searchRule.applyRule(query, new BibEntry(StandardEntryType.PhdThesis)));
     }
 
     public BibEntry makeBibtexEntry() {
         return new BibEntry(StandardEntryType.InCollection)
             .withCitationKey("shields01")
-            .withField(
-                StandardField.TITLE,
-                "Marine finfish larviculture in Europe"
-            )
+            .withField(StandardField.TITLE, "Marine finfish larviculture in Europe")
             .withField(StandardField.YEAR, "2001")
             .withField(StandardField.AUTHOR, "Kevin Shields");
     }
diff --git a/src/test/java/org/jabref/model/strings/StringUtilTest.java b/src/test/java/org/jabref/model/strings/StringUtilTest.java
index 732add4a438..5a70765f170 100644
--- a/src/test/java/org/jabref/model/strings/StringUtilTest.java
+++ b/src/test/java/org/jabref/model/strings/StringUtilTest.java
@@ -85,10 +85,7 @@ void testUnifyLineBreaks() {
     @Test
     void testGetCorrectFileName() {
         assertEquals("aa.bib", StringUtil.getCorrectFileName("aa", "bib"));
-        assertEquals(
-            ".login.bib",
-            StringUtil.getCorrectFileName(".login", "bib")
-        );
+        assertEquals(".login.bib", StringUtil.getCorrectFileName(".login", "bib"));
         assertEquals("a.bib", StringUtil.getCorrectFileName("a.bib", "bib"));
         assertEquals("a.bib", StringUtil.getCorrectFileName("a.bib", "BIB"));
         assertEquals("a.bib", StringUtil.getCorrectFileName("a", "bib"));
@@ -107,10 +104,7 @@ void testRemoveBracesAroundCapitals() {
         assertEquals("ABC", StringUtil.removeBracesAroundCapitals("{ABC}"));
         assertEquals("ABC", StringUtil.removeBracesAroundCapitals("{{ABC}}"));
         assertEquals("{abc}", StringUtil.removeBracesAroundCapitals("{abc}"));
-        assertEquals(
-            "ABCDEF",
-            StringUtil.removeBracesAroundCapitals("{ABC}{DEF}")
-        );
+        assertEquals("ABCDEF", StringUtil.removeBracesAroundCapitals("{ABC}{DEF}"));
     }
 
     @Test
@@ -119,10 +113,7 @@ void testPutBracesAroundCapitals() {
         assertEquals("{ABC}", StringUtil.putBracesAroundCapitals("{ABC}"));
         assertEquals("abc", StringUtil.putBracesAroundCapitals("abc"));
         assertEquals("#ABC#", StringUtil.putBracesAroundCapitals("#ABC#"));
-        assertEquals(
-            "{ABC} def {EFG}",
-            StringUtil.putBracesAroundCapitals("ABC def EFG")
-        );
+        assertEquals("{ABC} def {EFG}", StringUtil.putBracesAroundCapitals("ABC def EFG"));
     }
 
     @Test
@@ -166,22 +157,13 @@ void testStripBrackets() {
     @Test
     void testGetPart() {
         // Get word between braces
-        assertEquals(
-            "{makes}",
-            StringUtil.getPart("Practice {makes} perfect", 8, false)
-        );
+        assertEquals("{makes}", StringUtil.getPart("Practice {makes} perfect", 8, false));
         // When the string is empty and start Index equal zero
         assertEquals("", StringUtil.getPart("", 0, false));
         // When the word are in between close curly bracket
-        assertEquals(
-            "",
-            StringUtil.getPart("A closed mouth catches no }flies}", 25, false)
-        );
+        assertEquals("", StringUtil.getPart("A closed mouth catches no }flies}", 25, false));
         // Get the word from the end of the sentence
-        assertEquals(
-            "bite",
-            StringUtil.getPart("Barking dogs seldom bite", 19, true)
-        );
+        assertEquals("bite", StringUtil.getPart("Barking dogs seldom bite", 19, true));
     }
 
     @Test
@@ -204,20 +186,9 @@ void testWrap() {
             "aaaaa bbbbb" + newline + "\tccccc",
             StringUtil.wrap("aaaaa bbbbb ccccc", 11, newline)
         );
+        assertEquals("aaaaa bbbbb ccccc", StringUtil.wrap("aaaaa bbbbb ccccc", 12, newline));
         assertEquals(
-            "aaaaa bbbbb ccccc",
-            StringUtil.wrap("aaaaa bbbbb ccccc", 12, newline)
-        );
-        assertEquals(
-            "aaaaa" +
-            newline +
-            "\t" +
-            newline +
-            "\tbbbbb" +
-            newline +
-            "\t" +
-            newline +
-            "\tccccc",
+            "aaaaa" + newline + "\t" + newline + "\tbbbbb" + newline + "\t" + newline + "\tccccc",
             StringUtil.wrap("aaaaa\nbbbbb\nccccc", 12, newline)
         );
         assertEquals(
@@ -235,15 +206,7 @@ void testWrap() {
             StringUtil.wrap("aaaaa\n\nbbbbb\nccccc", 12, newline)
         );
         assertEquals(
-            "aaaaa" +
-            newline +
-            "\t" +
-            newline +
-            "\tbbbbb" +
-            newline +
-            "\t" +
-            newline +
-            "\tccccc",
+            "aaaaa" + newline + "\t" + newline + "\tbbbbb" + newline + "\t" + newline + "\tccccc",
             StringUtil.wrap("aaaaa\r\nbbbbb\r\nccccc", 12, newline)
         );
     }
@@ -320,26 +283,17 @@ void testIntValueOfStartWithZeros() {
 
     @Test
     void testIntValueOfExceptionIfStringContainsLetter() {
-        assertThrows(
-            NumberFormatException.class,
-            () -> StringUtil.intValueOf("12A2")
-        );
+        assertThrows(NumberFormatException.class, () -> StringUtil.intValueOf("12A2"));
     }
 
     @Test
     void testIntValueOfExceptionIfStringNull() {
-        assertThrows(
-            NumberFormatException.class,
-            () -> StringUtil.intValueOf(null)
-        );
+        assertThrows(NumberFormatException.class, () -> StringUtil.intValueOf(null));
     }
 
     @Test
     void testIntValueOfExceptionfIfStringEmpty() {
-        assertThrows(
-            NumberFormatException.class,
-            () -> StringUtil.intValueOf("")
-        );
+        assertThrows(NumberFormatException.class, () -> StringUtil.intValueOf(""));
     }
 
     @Test
@@ -351,18 +305,12 @@ void testIntValueOfWithNullSingleDigit() {
 
     @Test
     void testIntValueOfWithNullLongString() {
-        assertEquals(
-            Optional.of(1234567890),
-            StringUtil.intValueOfOptional("1234567890")
-        );
+        assertEquals(Optional.of(1234567890), StringUtil.intValueOfOptional("1234567890"));
     }
 
     @Test
     void testIntValueOfWithNullStartWithZeros() {
-        assertEquals(
-            Optional.of(1234),
-            StringUtil.intValueOfOptional("001234")
-        );
+        assertEquals(Optional.of(1234), StringUtil.intValueOfOptional("001234"));
     }
 
     @Test
@@ -387,14 +335,8 @@ void testLimitStringLengthShort() {
 
     @Test
     void testLimitStringLengthLimiting() {
-        assertEquals(
-            "TestTes...",
-            StringUtil.limitStringLength("TestTestTestTestTest", 10)
-        );
-        assertEquals(
-            10,
-            StringUtil.limitStringLength("TestTestTestTestTest", 10).length()
-        );
+        assertEquals("TestTes...", StringUtil.limitStringLength("TestTestTestTestTest", 10));
+        assertEquals(10, StringUtil.limitStringLength("TestTestTestTestTest", 10).length());
     }
 
     @Test
@@ -404,14 +346,8 @@ void testLimitStringLengthNullInput() {
 
     @Test
     void testReplaceSpecialCharacters() {
-        assertEquals(
-            "Hallo Arger",
-            StringUtil.replaceSpecialCharacters("Hallo Arger")
-        );
-        assertEquals(
-            "aaAeoeeee",
-            StringUtil.replaceSpecialCharacters("åÄöéèë")
-        );
+        assertEquals("Hallo Arger", StringUtil.replaceSpecialCharacters("Hallo Arger"));
+        assertEquals("aaAeoeeee", StringUtil.replaceSpecialCharacters("åÄöéèë"));
     }
 
     @Test
@@ -483,10 +419,7 @@ private static Stream<Arguments> getQuoteStringIfSpaceIsContainedData() {
     @ParameterizedTest
     @MethodSource("getQuoteStringIfSpaceIsContainedData")
     void testGuoteStringIfSpaceIsContained(String expected, String source) {
-        assertEquals(
-            expected,
-            StringUtil.quoteStringIfSpaceIsContained(source)
-        );
+        assertEquals(expected, StringUtil.quoteStringIfSpaceIsContained(source));
     }
 
     @Test
diff --git a/src/test/java/org/jabref/model/texparser/CitationTest.java b/src/test/java/org/jabref/model/texparser/CitationTest.java
index 06be74a7918..34d739faac3 100644
--- a/src/test/java/org/jabref/model/texparser/CitationTest.java
+++ b/src/test/java/org/jabref/model/texparser/CitationTest.java
@@ -51,33 +51,18 @@ public void constructorLineLargerZeroTest(int line) {
 
     @ParameterizedTest
     @MethodSource("colStartColEndNotInBounds")
-    public void constructorColStartColEndNotInBoundsTest(
-        int colStart,
-        int colEnd
-    ) {
+    public void constructorColStartColEndNotInBoundsTest(int colStart, int colEnd) {
         Exception e = assertThrows(
             IllegalArgumentException.class,
             () -> new Citation(path, 10, colStart, colEnd, "lineText")
         );
-        assertEquals(
-            "Citation has to be between 0 and line length.",
-            e.getMessage()
-        );
+        assertEquals("Citation has to be between 0 and line length.", e.getMessage());
     }
 
     @ParameterizedTest
     @MethodSource("colStartColEndInBounds")
-    public void constructorColStartColEndInBoundsTest(
-        int colStart,
-        int colEnd
-    ) {
-        Citation citation = new Citation(
-            path,
-            10,
-            colStart,
-            colEnd,
-            "lineText"
-        );
+    public void constructorColStartColEndInBoundsTest(int colStart, int colEnd) {
+        Citation citation = new Citation(path, 10, colStart, colEnd, "lineText");
     }
 
     @Test
diff --git a/src/test/java/org/jabref/support/CIServerCondition.java b/src/test/java/org/jabref/support/CIServerCondition.java
index 3d8cd771fd2..1fc48f0ad34 100644
--- a/src/test/java/org/jabref/support/CIServerCondition.java
+++ b/src/test/java/org/jabref/support/CIServerCondition.java
@@ -10,8 +10,9 @@
 
 public class CIServerCondition implements ExecutionCondition {
 
-    private static final ConditionEvaluationResult ENABLED =
-        ConditionEvaluationResult.enabled("not on CI server");
+    private static final ConditionEvaluationResult ENABLED = ConditionEvaluationResult.enabled(
+        "not on CI server"
+    );
 
     private static boolean isCIServer() {
         // See http://docs.travis-ci.com/user/environment-variables/#Default-Environment-Variables
@@ -24,16 +25,16 @@ private static boolean isCIServer() {
      * the CI server.
      */
     @Override
-    public ConditionEvaluationResult evaluateExecutionCondition(
-        ExtensionContext context
-    ) {
+    public ConditionEvaluationResult evaluateExecutionCondition(ExtensionContext context) {
         if (!isCIServer()) {
             return ENABLED;
         }
 
         Optional<AnnotatedElement> element = context.getElement();
-        Optional<DisabledOnCIServer> disabled =
-            AnnotationSupport.findAnnotation(element, DisabledOnCIServer.class);
+        Optional<DisabledOnCIServer> disabled = AnnotationSupport.findAnnotation(
+            element,
+            DisabledOnCIServer.class
+        );
         if (disabled.isPresent()) {
             String reason = disabled
                 .map(DisabledOnCIServer::value)
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 e59995246c1..ecff7b11689 100644
--- a/src/test/java/org/jabref/testutils/interactive/styletester/StyleTesterMain.java
+++ b/src/test/java/org/jabref/testutils/interactive/styletester/StyleTesterMain.java
@@ -21,8 +21,7 @@ public static void main(String[] args) {
     @Override
     public void start(Stage stage) throws JabRefException {
         StyleTesterView view = new StyleTesterView();
-        DefaultFileUpdateMonitor fileUpdateMonitor =
-            new DefaultFileUpdateMonitor();
+        DefaultFileUpdateMonitor fileUpdateMonitor = new DefaultFileUpdateMonitor();
         JabRefExecutorService.INSTANCE.executeInterruptableTask(
             fileUpdateMonitor,
             "FileUpdateMonitor"